From 8763b96ddf8c100bc9cc3782488a8156f8498d69 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Thu, 2 Sep 2010 14:39:52 +0200
Subject: Replacing some references to live-helper with live-build in
 templates.

---
 templates/cgi/debian-official/form.html     | 4 ++--
 templates/cgi/debian-official/header.html   | 2 +-
 templates/cgi/debian-official/mail.txt      | 6 +++---
 templates/cgi/debian-unofficial/form.html   | 4 ++--
 templates/cgi/debian-unofficial/header.html | 2 +-
 templates/cgi/debian-unofficial/mail.txt    | 6 +++---
 templates/silo/debian.txt                   | 2 +-
 templates/silo/debian.txt.install           | 2 +-
 templates/syslinux/ca/f10.txt               | 2 +-
 templates/syslinux/en/f10.txt               | 2 +-
 templates/syslinux/es/f10.txt               | 2 +-
 templates/syslinux/pt_BR/f10.txt            | 2 +-
 12 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/templates/cgi/debian-official/form.html b/templates/cgi/debian-official/form.html
index 923477e..fca9d2d 100644
--- a/templates/cgi/debian-official/form.html
+++ b/templates/cgi/debian-official/form.html
@@ -1,7 +1,7 @@
 
 <h3>Submit your parameters (<b>working</b> email address is required) to generate your very own Debian Live system.</h3>
 
-<form action="live-helper" method="get">
+<form action="live-build" method="get">
 
 <fieldset>
 
@@ -261,7 +261,7 @@
 		</tr>
 		<tr>
 			<td><label for="Iso_Preparer">--iso-preparer:</label> </td>
-			<td><input id="Iso_Preparer" name="iso_preparer" maxlength="128" size="50" type="text" value="live-helper; http://packages.qa.debian.org/live-helper" /></td>
+			<td><input id="Iso_Preparer" name="iso_preparer" maxlength="128" size="50" type="text" value="live-build; http://packages.qa.debian.org/live-build" /></td>
 		</tr>
 		<tr>
 			<td><label for="Iso_Publisher">--iso-publisher:</label> </td>
diff --git a/templates/cgi/debian-official/header.html b/templates/cgi/debian-official/header.html
index d90ddc9..009650f 100644
--- a/templates/cgi/debian-official/header.html
+++ b/templates/cgi/debian-official/header.html
@@ -33,6 +33,6 @@
 <body>
 
 <div id="maincontent" style="margin: 0 0 0 0;">
-	<h1 id="title">live-helper web-frontend of the <a href="http://live.debian.net/">Debian Live Project</a></h1>
+	<h1 id="title">live-build web-frontend of the <a href="http://live.debian.net/">Debian Live Project</a></h1>
 	<h2 id="subtitle"><a href="http://live.debian.net/">Live Debian systems!</a></h2>
 </div>
diff --git a/templates/cgi/debian-official/mail.txt b/templates/cgi/debian-official/mail.txt
index 829d1fd..37834b3 100644
--- a/templates/cgi/debian-official/mail.txt
+++ b/templates/cgi/debian-official/mail.txt
@@ -1,10 +1,10 @@
-Subject: Debian Live, live-helper web-frontend - Build BUILD
-From: Debian Live live-helper web-frontend <debian-live@lists.debian.org>
+Subject: Debian Live, live-build web-frontend - Build BUILD
+From: Debian Live live-build web-frontend <debian-live@lists.debian.org>
 To: EMAIL
 
 Hi,
 
-This is live-helper web-frontend <http://live-helper.debian.net/> of the Debian Live project <http://live.debian.net/>.
+This is live-build web-frontend <http://live-build.debian.net/> of the Debian Live project <http://live.debian.net/>.
 
 Your build BUILD was started DATE_START and ended DATE_END with status 'STATUS'.
 
diff --git a/templates/cgi/debian-unofficial/form.html b/templates/cgi/debian-unofficial/form.html
index 2356501..df11f67 100644
--- a/templates/cgi/debian-unofficial/form.html
+++ b/templates/cgi/debian-unofficial/form.html
@@ -1,6 +1,6 @@
 <h3>Submit your parameters (<b>working</b> email address is required) to generate your very own Debian Live system.</h3>
 
-<form action="live-helper" method="get">
+<form action="live-build" method="get">
 
 <fieldset>
 
@@ -260,7 +260,7 @@
 		</tr>
 		<tr>
 			<td><label for="Iso_Preparer">--iso-preparer:</label> </td>
-			<td><input id="Iso_Preparer" name="iso_preparer" maxlength="128" size="50" type="text" value="live-helper; http://packages.qa.debian.org/live-helper" /></td>
+			<td><input id="Iso_Preparer" name="iso_preparer" maxlength="128" size="50" type="text" value="live-build; http://packages.qa.debian.org/live-build" /></td>
 		</tr>
 		<tr>
 			<td><label for="Iso_Publisher">--iso-publisher:</label> </td>
diff --git a/templates/cgi/debian-unofficial/header.html b/templates/cgi/debian-unofficial/header.html
index d90ddc9..009650f 100644
--- a/templates/cgi/debian-unofficial/header.html
+++ b/templates/cgi/debian-unofficial/header.html
@@ -33,6 +33,6 @@
 <body>
 
 <div id="maincontent" style="margin: 0 0 0 0;">
-	<h1 id="title">live-helper web-frontend of the <a href="http://live.debian.net/">Debian Live Project</a></h1>
+	<h1 id="title">live-build web-frontend of the <a href="http://live.debian.net/">Debian Live Project</a></h1>
 	<h2 id="subtitle"><a href="http://live.debian.net/">Live Debian systems!</a></h2>
 </div>
diff --git a/templates/cgi/debian-unofficial/mail.txt b/templates/cgi/debian-unofficial/mail.txt
index 829d1fd..37834b3 100644
--- a/templates/cgi/debian-unofficial/mail.txt
+++ b/templates/cgi/debian-unofficial/mail.txt
@@ -1,10 +1,10 @@
-Subject: Debian Live, live-helper web-frontend - Build BUILD
-From: Debian Live live-helper web-frontend <debian-live@lists.debian.org>
+Subject: Debian Live, live-build web-frontend - Build BUILD
+From: Debian Live live-build web-frontend <debian-live@lists.debian.org>
 To: EMAIL
 
 Hi,
 
-This is live-helper web-frontend <http://live-helper.debian.net/> of the Debian Live project <http://live.debian.net/>.
+This is live-build web-frontend <http://live-build.debian.net/> of the Debian Live project <http://live.debian.net/>.
 
 Your build BUILD was started DATE_START and ended DATE_END with status 'STATUS'.
 
diff --git a/templates/silo/debian.txt b/templates/silo/debian.txt
index 55771c1..fb2a49c 100644
--- a/templates/silo/debian.txt
+++ b/templates/silo/debian.txt
@@ -2,7 +2,7 @@
                        Welcome to Debian GNU/Linux!
 
 This is a Debian LH_DISTRIBUTION live image.
-It was built on LH_DATE by live-helper LH_VERSION.
+It was built on LH_DATE by live-build LH_VERSION.
 
 You must have at least 64 megabytes of RAM to run this Debian Live system.
 
diff --git a/templates/silo/debian.txt.install b/templates/silo/debian.txt.install
index d0960c2..be095f9 100644
--- a/templates/silo/debian.txt.install
+++ b/templates/silo/debian.txt.install
@@ -2,7 +2,7 @@
                        Welcome to Debian GNU/Linux!
 
 This is a Debian LH_DISTRIBUTION combined live and installation image.
-It was built on LH_DATE by live-helper LH_VERSION.
+It was built on LH_DATE by live-build LH_VERSION.
 
 You must have at least 64 megabytes of RAM to run this Debian Live system.
 
diff --git a/templates/syslinux/ca/f10.txt b/templates/syslinux/ca/f10.txt
index b35593f..3f438a9 100644
--- a/templates/syslinux/ca/f10.txt
+++ b/templates/syslinux/ca/f10.txt
@@ -12,7 +12,7 @@ la llei aplicable.
 
 ---
 
-Aquest sistema Debian Live ha estat constru�t amb live-helper, versi� {$LH_VERSION}.
+Aquest sistema Debian Live ha estat constru�t amb live-build, versi� {$LH_VERSION}.
 
 M�s informaci� del projecte Debian Live es pot trobar a 
 <http://live.debian.net/>.
diff --git a/templates/syslinux/en/f10.txt b/templates/syslinux/en/f10.txt
index 26a150a..d24850b 100644
--- a/templates/syslinux/en/f10.txt
+++ b/templates/syslinux/en/f10.txt
@@ -12,7 +12,7 @@ permitted by applicable law.
 
 ---
 
-This Debian Live system was built with live-helper, version {$LH_VERSION}.
+This Debian Live system was built with live-build, version {$LH_VERSION}.
 
 More information about the Debian Live project can be found at
 <http://live.debian.net/>.
diff --git a/templates/syslinux/es/f10.txt b/templates/syslinux/es/f10.txt
index 6c8ad35..b281306 100644
--- a/templates/syslinux/es/f10.txt
+++ b/templates/syslinux/es/f10.txt
@@ -12,7 +12,7 @@ permitido por la ley.
 
 ---
 
-Este sistema Debian Live se construy� con live-helper, versi�n {$LH_VERSION}.
+Este sistema Debian Live se construy� con live-build, versi�n {$LH_VERSION}.
 
 M�s informaci�n en sobre el proyecto Debian Live puede encontrarse en 
 <http://live.debian.net/>.
diff --git a/templates/syslinux/pt_BR/f10.txt b/templates/syslinux/pt_BR/f10.txt
index 44deef0..245420e 100644
--- a/templates/syslinux/pt_BR/f10.txt
+++ b/templates/syslinux/pt_BR/f10.txt
@@ -13,7 +13,7 @@ permitido pela lei aplicável.
 
 ---
 
-Este sistema Live do Debian foi construído com live-helper, versão {$LH_VERSION}.
+Este sistema Live do Debian foi construído com live-build, versão {$LH_VERSION}.
 
 Mais informações sobre o projeto Debian Live podem ser encontrada em
 <http://live.debian.net/>.
-- 
cgit v1.0