[SCM] live-helper branch, upstream, updated. upstream/2.0_a10-1-g93c1b9b

Fri Apr 30 15:19:00 UTC 2010

The following commit has been merged in the upstream branch:
commit 93c1b9b558a8566e7c486a74853e4b1ad7f5a8eb
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Apr 30 17:12:58 2010 +0200

    Adding upstream version 2.0~a11.

diff --git a/cgi/Makefile b/cgi/Makefile
index 2bd7477..f3ee40f 100644
--- a/cgi/Makefile
+++ b/cgi/Makefile
@@ -9,3 +9,11 @@ install:
 	install -d -m 0755 $(DESTDIR)/var/log
 	touch $(DESTDIR)/var/log/live
 	chown www-data:www-data $(DESTDIR)/var/log/live
+
+uninstall:
+	rm -f $(DESTDIR)/usr/lib/cgi-bin/live-helper
+	rm -f $(DESTDIR)/etc/cron.d/live-helper.cgi
+	rm -f $(DESTDIR)/etc/default/live-helper.cgi
+	rm -f $(DESTDIR)/etc/logrotate.d/live-helper.cgi
+
+reinstall: uninstall install
diff --git a/functions/common.sh b/functions/common.sh
index 9fbb21c..cbb4085 100755
--- a/functions/common.sh
+++ b/functions/common.sh
@@ -9,7 +9,7 @@
 
 PROGRAM="$(basename ${0})"
 PACKAGE="live-helper"
-VERSION="2.0~a10-1"
+VERSION="2.0~a11-1"
 CONFIG_VERSION="$(echo ${VERSION} | awk -F- '{ print $1 }')"
 
 PATH="${PWD}/auto/helpers:${PATH}"
diff --git a/helpers/build b/helpers/build
index 9f619b1..a4b8802 100755
--- a/helpers/build
+++ b/helpers/build
@@ -20,12 +20,13 @@ then
 fi
 
 # Read meta config
-if [ "${1}" != "noautoconfig" ] && [ -x auto/build ]
+if [ "${1}" != "noauto" ] && [ -x auto/build ]
 then
+	Echo_message "Executing auto/build script."
 	./auto/build ${@}
 fi
 
-if [ "${1}" = "noautoconfig" ]
+if [ "${1}" = "noauto" ]
 then
 	shift
 fi
diff --git a/helpers/chroot_dpkg b/helpers/chroot_dpkg
index 1f1d57a..98ca282 100755
--- a/helpers/chroot_dpkg
+++ b/helpers/chroot_dpkg
@@ -85,7 +85,7 @@ EOF
 		elif [ -d /var/state/samhain ]
 		then
 			rm -f /var/state/samhain/samhain_file
-			rmdir --ignore-fail-on-non-empty /var/state/samhain
+			rmdir --ignore-fail-on-non-empty /var/state/samhain || true
 		fi
 
 		# Restore start-stop-daemon program
diff --git a/helpers/clean b/helpers/clean
index 2348b0f..6cafc6d 100755
--- a/helpers/clean
+++ b/helpers/clean
@@ -9,20 +9,21 @@
 
 set -e
 
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+
 # Read meta config
-if [ "${1}" != "noautoconfig" ] && [ -x auto/clean ]
+if [ "${1}" != "noauto" ] && [ -x auto/clean ]
 then
+	Echo_message "Executing auto/clean script."
 	./auto/clean ${@}
 fi
 
-if [ "${1}" = "noautoconfig" ]
+if [ "${1}" = "noauto" ]
 then
 	shift
 fi
 
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
 # Setting static variables
 DESCRIPTION="$(Echo 'clean up system build directories')"
 HELP=""
@@ -54,10 +55,10 @@ for ARGUMENT in ${ARGUMENTS}
 do
 	case "${ARGUMENT}" in
 		--all)
-			LH=1 "${0}" noautoconfig --chroot
-			LH=1 "${0}" noautoconfig --binary
-			LH=1 "${0}" noautoconfig --stage
-			LH=1 "${0}" noautoconfig --source
+			LH=1 "${0}" noauto --chroot
+			LH=1 "${0}" noauto --binary
+			LH=1 "${0}" noauto --stage
+			LH=1 "${0}" noauto --source
 
 			if [ -d auto ]
 			then
diff --git a/helpers/config b/helpers/config
index bab31b5..a341af6 100755
--- a/helpers/config
+++ b/helpers/config
@@ -9,20 +9,21 @@
 
 set -e
 
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+
 # Read meta config
-if [ "${1}" != "noautoconfig" ] && [ -x auto/config ]
+if [ "${1}" != "noauto" ] && [ -x auto/config ]
 then
+	Echo_message "Executing auto/config script."
 	./auto/config ${@}
 fi
 
-if [ "${1}" = "noautoconfig" ]
+if [ "${1}" = "noauto" ]
 then
 	shift
 fi
 
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
 # Setting static variables
 SYSTEM_LH_CONFFILE="/etc/default/live-helper"
 DESCRIPTION="$(Echo 'create configuration for live-helper(7)')"
diff --git a/manpages/lh.en.1 b/manpages/lh.en.1
index 53d27fd..8624908 100644
--- a/manpages/lh.en.1
+++ b/manpages/lh.en.1
@@ -20,7 +20,7 @@ lh has no specific options but understands all generic live\-helper options. See
 This program is part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_binary.en.1 b/manpages/lh_binary.en.1
index fc40183..6b262fd 100644
--- a/manpages/lh_binary.en.1
+++ b/manpages/lh_binary.en.1
@@ -18,7 +18,7 @@ lh_binary has no specific options but understands all generic live\-helper optio
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_binary_chroot.en.1 b/manpages/lh_binary_chroot.en.1
index 8dbdfe8..be820ba 100644
--- a/manpages/lh_binary_chroot.en.1
+++ b/manpages/lh_binary_chroot.en.1
@@ -20,7 +20,7 @@ lh_binary_chroot has no specific options but understands all generic live\-helpe
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_binary_debian-installer.en.1 b/manpages/lh_binary_debian-installer.en.1
index fdf8d8e..c3d20b0 100644
--- a/manpages/lh_binary_debian-installer.en.1
+++ b/manpages/lh_binary_debian-installer.en.1
@@ -20,7 +20,7 @@ lh_binary_debian\-installer has no specific options but understands all generic
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_binary_disk.en.1 b/manpages/lh_binary_disk.en.1
index 8e563e3..7c94b32 100644
--- a/manpages/lh_binary_disk.en.1
+++ b/manpages/lh_binary_disk.en.1
@@ -20,7 +20,7 @@ lh_binary_disk has no specific options but understands all generic live\-helper
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_binary_encryption.en.1 b/manpages/lh_binary_encryption.en.1
index df7059a..62309f3 100644
--- a/manpages/lh_binary_encryption.en.1
+++ b/manpages/lh_binary_encryption.en.1
@@ -20,7 +20,7 @@ lh_binary_encryption has no specific options but understands all generic live\-h
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_binary_grub.en.1 b/manpages/lh_binary_grub.en.1
index 4500452..56b23de 100644
--- a/manpages/lh_binary_grub.en.1
+++ b/manpages/lh_binary_grub.en.1
@@ -20,7 +20,7 @@ lh_binary_grub has no specific options but understands all generic live\-helper
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_binary_grub2.en.1 b/manpages/lh_binary_grub2.en.1
index 26149dd..735201a 100644
--- a/manpages/lh_binary_grub2.en.1
+++ b/manpages/lh_binary_grub2.en.1
@@ -20,7 +20,7 @@ lh_binary_grub2 has no specific options but understands all generic live\-helper
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_binary_includes.en.1 b/manpages/lh_binary_includes.en.1
index e0f57d5..42fd361 100644
--- a/manpages/lh_binary_includes.en.1
+++ b/manpages/lh_binary_includes.en.1
@@ -20,7 +20,7 @@ lh_binary_includes has no specific options but understands all generic live\-hel
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_binary_iso.en.1 b/manpages/lh_binary_iso.en.1
index b59262a..3e0ecee 100644
--- a/manpages/lh_binary_iso.en.1
+++ b/manpages/lh_binary_iso.en.1
@@ -20,7 +20,7 @@ lh_binary_iso has no specific options but understands all generic live\-helper o
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_binary_linux-image.en.1 b/manpages/lh_binary_linux-image.en.1
index c3cec80..05e1a6c 100644
--- a/manpages/lh_binary_linux-image.en.1
+++ b/manpages/lh_binary_linux-image.en.1
@@ -20,7 +20,7 @@ lh_binary_linux\-image has no specific options but understands all generic live\
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_binary_local-hooks.en.1 b/manpages/lh_binary_local-hooks.en.1
index e6e78d1..766c059 100644
--- a/manpages/lh_binary_local-hooks.en.1
+++ b/manpages/lh_binary_local-hooks.en.1
@@ -20,7 +20,7 @@ lh_binary_local\-hooks has no specific options but understands all generic live\
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_binary_local-includes.en.1 b/manpages/lh_binary_local-includes.en.1
index 018d70d..5d5c6fb 100644
--- a/manpages/lh_binary_local-includes.en.1
+++ b/manpages/lh_binary_local-includes.en.1
@@ -20,7 +20,7 @@ lh_binary_local\-includes has no specific options but understands all generic li
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_binary_local-packageslists.en.1 b/manpages/lh_binary_local-packageslists.en.1
index 37679bf..1c26710 100644
--- a/manpages/lh_binary_local-packageslists.en.1
+++ b/manpages/lh_binary_local-packageslists.en.1
@@ -20,7 +20,7 @@ lh_binary_local\-packageslists has no specific options but understands all gener
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_binary_manifest.en.1 b/manpages/lh_binary_manifest.en.1
index 740965a..8fd5abf 100644
--- a/manpages/lh_binary_manifest.en.1
+++ b/manpages/lh_binary_manifest.en.1
@@ -20,7 +20,7 @@ lh_binary_manifest has no specific options but understands all generic live\-hel
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_binary_md5sum.en.1 b/manpages/lh_binary_md5sum.en.1
index 84e2bfe..e8304f2 100644
--- a/manpages/lh_binary_md5sum.en.1
+++ b/manpages/lh_binary_md5sum.en.1
@@ -20,7 +20,7 @@ lh_binary_md5sum has no specific options but understands all generic live\-helpe
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_binary_memtest.en.1 b/manpages/lh_binary_memtest.en.1
index cf13734..8b0fb26 100644
--- a/manpages/lh_binary_memtest.en.1
+++ b/manpages/lh_binary_memtest.en.1
@@ -20,7 +20,7 @@ lh_binary_memtest has no specific options but understands all generic live\-help
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_binary_net.en.1 b/manpages/lh_binary_net.en.1
index f1ebe18..7dd4d7d 100644
--- a/manpages/lh_binary_net.en.1
+++ b/manpages/lh_binary_net.en.1
@@ -20,7 +20,7 @@ lh_binary_net has no specific options but understands all generic live\-helper o
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_binary_rootfs.en.1 b/manpages/lh_binary_rootfs.en.1
index f53ec60..2d9d6e5 100644
--- a/manpages/lh_binary_rootfs.en.1
+++ b/manpages/lh_binary_rootfs.en.1
@@ -20,7 +20,7 @@ lh_binary_rootfs has no specific options but understands all generic live\-helpe
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_binary_silo.en.1 b/manpages/lh_binary_silo.en.1
index 66620fe..a2f2a98 100644
--- a/manpages/lh_binary_silo.en.1
+++ b/manpages/lh_binary_silo.en.1
@@ -20,7 +20,7 @@ lh_binary_silo has no specific options but understands all generic live\-helper
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_binary_syslinux.en.1 b/manpages/lh_binary_syslinux.en.1
index f64bf84..f372d58 100644
--- a/manpages/lh_binary_syslinux.en.1
+++ b/manpages/lh_binary_syslinux.en.1
@@ -20,7 +20,7 @@ lh_binary_syslinux has no specific options but understands all generic live\-hel
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_binary_tar.en.1 b/manpages/lh_binary_tar.en.1
index a835bcb..48a060e 100644
--- a/manpages/lh_binary_tar.en.1
+++ b/manpages/lh_binary_tar.en.1
@@ -20,7 +20,7 @@ lh_binary_tar has no specific options but understands all generic live\-helper o
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_binary_usb.en.1 b/manpages/lh_binary_usb.en.1
index 87290d9..5f1592d 100644
--- a/manpages/lh_binary_usb.en.1
+++ b/manpages/lh_binary_usb.en.1
@@ -20,7 +20,7 @@ lh_binary_usb\-hdd has no specific options but understands all generic live\-hel
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_binary_virtual-hdd.en.1 b/manpages/lh_binary_virtual-hdd.en.1
index 2e9fc16..495c91d 100644
--- a/manpages/lh_binary_virtual-hdd.en.1
+++ b/manpages/lh_binary_virtual-hdd.en.1
@@ -20,7 +20,7 @@ lh_binary_virtual\-hdd has no specific options but understands all generic live\
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_binary_win32-loader.en.1 b/manpages/lh_binary_win32-loader.en.1
index 45fc2f5..b3d792c 100644
--- a/manpages/lh_binary_win32-loader.en.1
+++ b/manpages/lh_binary_win32-loader.en.1
@@ -20,7 +20,7 @@ lh_binary_win32\-loader has no specific options but understands all generic live
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_binary_yaboot.en.1 b/manpages/lh_binary_yaboot.en.1
index 0df7682..d3195de 100644
--- a/manpages/lh_binary_yaboot.en.1
+++ b/manpages/lh_binary_yaboot.en.1
@@ -20,7 +20,7 @@ lh_binary_yaboot has no specific options but understands all generic live\-helpe
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_bootstrap.en.1 b/manpages/lh_bootstrap.en.1
index d458eb6..e6aa93a 100644
--- a/manpages/lh_bootstrap.en.1
+++ b/manpages/lh_bootstrap.en.1
@@ -18,7 +18,7 @@ lh_bootstrap has no specific options but understands all generic live\-helper op
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_bootstrap_cache.en.1 b/manpages/lh_bootstrap_cache.en.1
index affd98a..0b9484d 100644
--- a/manpages/lh_bootstrap_cache.en.1
+++ b/manpages/lh_bootstrap_cache.en.1
@@ -20,7 +20,7 @@ lh_bootstrap_cache has no specific options but understands all generic live\-hel
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_bootstrap_cdebootstrap.en.1 b/manpages/lh_bootstrap_cdebootstrap.en.1
index 987a5b6..268f161 100644
--- a/manpages/lh_bootstrap_cdebootstrap.en.1
+++ b/manpages/lh_bootstrap_cdebootstrap.en.1
@@ -22,7 +22,7 @@ lh_bootstrap_cdebootstrap has no specific options but understands all generic li
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_bootstrap_copy.en.1 b/manpages/lh_bootstrap_copy.en.1
index 5a9e07d..5cd3389 100644
--- a/manpages/lh_bootstrap_copy.en.1
+++ b/manpages/lh_bootstrap_copy.en.1
@@ -22,7 +22,7 @@ lh_bootstrap_copy has no specific options but understands all generic live\-help
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_bootstrap_debootstrap.en.1 b/manpages/lh_bootstrap_debootstrap.en.1
index a860f70..052deeb 100644
--- a/manpages/lh_bootstrap_debootstrap.en.1
+++ b/manpages/lh_bootstrap_debootstrap.en.1
@@ -22,7 +22,7 @@ lh_bootstrap_debootstrap has no specific options but understands all generic liv
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_build.en.1 b/manpages/lh_build.en.1
index d158f73..d4eb6bf 100644
--- a/manpages/lh_build.en.1
+++ b/manpages/lh_build.en.1
@@ -18,7 +18,7 @@ lh_build has no specific options but understands all generic live\-helper option
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot.en.1 b/manpages/lh_chroot.en.1
index d84d08f..0d49c7e 100644
--- a/manpages/lh_chroot.en.1
+++ b/manpages/lh_chroot.en.1
@@ -18,7 +18,7 @@ lh_chroot has no specific options but understands all generic live\-helper optio
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot_apt.en.1 b/manpages/lh_chroot_apt.en.1
index 8289b15..16e5223 100644
--- a/manpages/lh_chroot_apt.en.1
+++ b/manpages/lh_chroot_apt.en.1
@@ -20,7 +20,7 @@ lh_chroot_copy has no specific options but understands all generic live\-helper
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot_cache.en.1 b/manpages/lh_chroot_cache.en.1
index 2086a5e..d3b69e0 100644
--- a/manpages/lh_chroot_cache.en.1
+++ b/manpages/lh_chroot_cache.en.1
@@ -20,7 +20,7 @@ lh_chroot_cache has no specific options but understands all generic live\-helper
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot_debianchroot.en.1 b/manpages/lh_chroot_debianchroot.en.1
index 09bf75d..1b44364 100644
--- a/manpages/lh_chroot_debianchroot.en.1
+++ b/manpages/lh_chroot_debianchroot.en.1
@@ -20,7 +20,7 @@ lh_chroot_debianchroot has no specific options but understands all generic live\
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot_devpts.en.1 b/manpages/lh_chroot_devpts.en.1
index f6cb0c9..d95703c 100644
--- a/manpages/lh_chroot_devpts.en.1
+++ b/manpages/lh_chroot_devpts.en.1
@@ -20,7 +20,7 @@ lh_chroot_devpts has no specific options but understands all generic live\-helpe
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot_dpkg.en.1 b/manpages/lh_chroot_dpkg.en.1
index 2f2fb5a..ae1c419 100644
--- a/manpages/lh_chroot_dpkg.en.1
+++ b/manpages/lh_chroot_dpkg.en.1
@@ -20,7 +20,7 @@ lh_chroot_dpkg has no specific options but understands all generic live\-helper
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot_hacks.en.1 b/manpages/lh_chroot_hacks.en.1
index 76117c5..d87aab1 100644
--- a/manpages/lh_chroot_hacks.en.1
+++ b/manpages/lh_chroot_hacks.en.1
@@ -20,7 +20,7 @@ lh_chroot_hacks has no specific options but understands all generic live\-helper
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot_hooks.en.1 b/manpages/lh_chroot_hooks.en.1
index 8a93205..d9e73d2 100644
--- a/manpages/lh_chroot_hooks.en.1
+++ b/manpages/lh_chroot_hooks.en.1
@@ -20,7 +20,7 @@ lh_chroot_hooks has no specific options but understands all generic live\-helper
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot_hostname.en.1 b/manpages/lh_chroot_hostname.en.1
index 75ca242..4615987 100644
--- a/manpages/lh_chroot_hostname.en.1
+++ b/manpages/lh_chroot_hostname.en.1
@@ -20,7 +20,7 @@ lh_chroot_hostname has no specific options but understands all generic live\-hel
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot_hosts.en.1 b/manpages/lh_chroot_hosts.en.1
index 3c47f2e..cba695a 100644
--- a/manpages/lh_chroot_hosts.en.1
+++ b/manpages/lh_chroot_hosts.en.1
@@ -20,7 +20,7 @@ lh_chroot_hosts has no specific options but understands all generic live\-helper
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot_install-packages.en.1 b/manpages/lh_chroot_install-packages.en.1
index 7fd4ff3..65715a7 100644
--- a/manpages/lh_chroot_install-packages.en.1
+++ b/manpages/lh_chroot_install-packages.en.1
@@ -20,7 +20,7 @@ lh_chroot_install-packages has no specific options but understands all generic l
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot_interactive.en.1 b/manpages/lh_chroot_interactive.en.1
index 60f1c1e..a40b834 100644
--- a/manpages/lh_chroot_interactive.en.1
+++ b/manpages/lh_chroot_interactive.en.1
@@ -20,7 +20,7 @@ lh_chroot_interactive has no specific options but understands all generic live\-
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot_linux-image.en.1 b/manpages/lh_chroot_linux-image.en.1
index 734089d..6728694 100644
--- a/manpages/lh_chroot_linux-image.en.1
+++ b/manpages/lh_chroot_linux-image.en.1
@@ -20,7 +20,7 @@ lh_chroot_linux-image has no specific options but understands all generic live\-
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot_local-hooks.en.1 b/manpages/lh_chroot_local-hooks.en.1
index 78fe7dd..7d6c5b3 100644
--- a/manpages/lh_chroot_local-hooks.en.1
+++ b/manpages/lh_chroot_local-hooks.en.1
@@ -20,7 +20,7 @@ lh_chroot_local-hooks has no specific options but understands all generic live\-
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot_local-includes.en.1 b/manpages/lh_chroot_local-includes.en.1
index 07420c6..03d055b 100644
--- a/manpages/lh_chroot_local-includes.en.1
+++ b/manpages/lh_chroot_local-includes.en.1
@@ -20,7 +20,7 @@ lh_chroot_local-includes has no specific options but understands all generic liv
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot_local-packages.en.1 b/manpages/lh_chroot_local-packages.en.1
index 12aaa95..86d4317 100644
--- a/manpages/lh_chroot_local-packages.en.1
+++ b/manpages/lh_chroot_local-packages.en.1
@@ -20,7 +20,7 @@ lh_chroot_local-packages has no specific options but understands all generic liv
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot_local-patches.en.1 b/manpages/lh_chroot_local-patches.en.1
index 3dcf8b2..4587b92 100644
--- a/manpages/lh_chroot_local-patches.en.1
+++ b/manpages/lh_chroot_local-patches.en.1
@@ -20,7 +20,7 @@ lh_chroot_local-patches has no specific options but understands all generic live
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot_local-preseed.en.1 b/manpages/lh_chroot_local-preseed.en.1
index 8c302d2..f8bc7c0 100644
--- a/manpages/lh_chroot_local-preseed.en.1
+++ b/manpages/lh_chroot_local-preseed.en.1
@@ -20,7 +20,7 @@ lh_chroot_local-preseed has no specific options but understands all generic live
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot_localization.en.1 b/manpages/lh_chroot_localization.en.1
index df19a2b..1e0f2e0 100644
--- a/manpages/lh_chroot_localization.en.1
+++ b/manpages/lh_chroot_localization.en.1
@@ -20,7 +20,7 @@ lh_chroot_localization has no specific options but understands all generic live\
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot_packages.en.1 b/manpages/lh_chroot_packages.en.1
index 33c89cc..69b5c9b 100644
--- a/manpages/lh_chroot_packages.en.1
+++ b/manpages/lh_chroot_packages.en.1
@@ -20,7 +20,7 @@ lh_chroot_packages has no specific options but understands all generic live\-hel
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot_packageslists.en.1 b/manpages/lh_chroot_packageslists.en.1
index 3d1bc6e..04528a8 100644
--- a/manpages/lh_chroot_packageslists.en.1
+++ b/manpages/lh_chroot_packageslists.en.1
@@ -20,7 +20,7 @@ lh_chroot_packageslists has no specific options but understands all generic live
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot_preseed.en.1 b/manpages/lh_chroot_preseed.en.1
index 895d789..f22694d 100644
--- a/manpages/lh_chroot_preseed.en.1
+++ b/manpages/lh_chroot_preseed.en.1
@@ -20,7 +20,7 @@ lh_chroot_preseed has no specific options but understands all generic live\-help
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot_proc.en.1 b/manpages/lh_chroot_proc.en.1
index 0a3b933..7ed12f7 100644
--- a/manpages/lh_chroot_proc.en.1
+++ b/manpages/lh_chroot_proc.en.1
@@ -20,7 +20,7 @@ lh_chroot_proc has no specific options but understands all generic live\-helper
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot_resolv.en.1 b/manpages/lh_chroot_resolv.en.1
index 5ef595f..31b2080 100644
--- a/manpages/lh_chroot_resolv.en.1
+++ b/manpages/lh_chroot_resolv.en.1
@@ -20,7 +20,7 @@ lh_chroot_resolv has no specific options but understands all generic live\-helpe
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot_selinuxfs.en.1 b/manpages/lh_chroot_selinuxfs.en.1
index 6bddcd5..589fa4f 100644
--- a/manpages/lh_chroot_selinuxfs.en.1
+++ b/manpages/lh_chroot_selinuxfs.en.1
@@ -20,7 +20,7 @@ lh_chroot_selinuxfs has no specific options but understands all generic live\-he
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot_sources.en.1 b/manpages/lh_chroot_sources.en.1
index 63a5ab9..7cddf42 100644
--- a/manpages/lh_chroot_sources.en.1
+++ b/manpages/lh_chroot_sources.en.1
@@ -20,7 +20,7 @@ lh_chroot_sources has no specific options but understands all generic live\-help
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot_symlinks.en.1 b/manpages/lh_chroot_symlinks.en.1
index b7987ef..3ce2401 100644
--- a/manpages/lh_chroot_symlinks.en.1
+++ b/manpages/lh_chroot_symlinks.en.1
@@ -20,7 +20,7 @@ lh_chroot_symlinks has no specific options but understands all generic live\-hel
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot_sysfs.en.1 b/manpages/lh_chroot_sysfs.en.1
index 53db130..7641550 100644
--- a/manpages/lh_chroot_sysfs.en.1
+++ b/manpages/lh_chroot_sysfs.en.1
@@ -20,7 +20,7 @@ lh_chroot_sysfs has no specific options but understands all generic live\-helper
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot_sysv-rc.en.1 b/manpages/lh_chroot_sysv-rc.en.1
index 12859d8..02a0c1c 100644
--- a/manpages/lh_chroot_sysv-rc.en.1
+++ b/manpages/lh_chroot_sysv-rc.en.1
@@ -20,7 +20,7 @@ lh_chroot_sysvrc has no specific options but understands all generic live\-helpe
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot_sysvinit.en.1 b/manpages/lh_chroot_sysvinit.en.1
index 989a061..a4ba9d2 100644
--- a/manpages/lh_chroot_sysvinit.en.1
+++ b/manpages/lh_chroot_sysvinit.en.1
@@ -20,7 +20,7 @@ lh_chroot_sysvinit has no specific options but understands all generic live\-hel
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot_tasks.en.1 b/manpages/lh_chroot_tasks.en.1
index 3e0d29b..7c40dae 100644
--- a/manpages/lh_chroot_tasks.en.1
+++ b/manpages/lh_chroot_tasks.en.1
@@ -20,7 +20,7 @@ lh_chroot_tasks has no specific options but understands all generic live\-helper
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_chroot_upstart.en.1 b/manpages/lh_chroot_upstart.en.1
index 1f45127..2fe2e1d 100644
--- a/manpages/lh_chroot_upstart.en.1
+++ b/manpages/lh_chroot_upstart.en.1
@@ -20,7 +20,7 @@ lh_chroot_upstart has no specific options but understands all generic live\-help
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_clean.en.1 b/manpages/lh_clean.en.1
index a24faa9..e695038 100644
--- a/manpages/lh_clean.en.1
+++ b/manpages/lh_clean.en.1
@@ -37,7 +37,7 @@ removes all source related caches, directories, and stage files.
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_config.en.1 b/manpages/lh_config.en.1
index cbe5b63..b4c0ef9 100644
--- a/manpages/lh_config.en.1
+++ b/manpages/lh_config.en.1
@@ -156,7 +156,7 @@ lh_config \- create configuration for live\-helper
 .br
 	[\fB\-\-net\-tarball\fR bzip2|gzip|tar|none]
 .br
-	[\-p|\fB\-\-packages\-lists\fR \fIFILE\fR]
+	[\-p|\fB\-\-packages\-lists\fR \fILIST\fR|\fI"LISTS"\fR]
 .br
 	[\fB\-\-packages\fR \fIPACKAGE\fR|\fI"PACKAGES"\fR]
 .br
@@ -236,9 +236,9 @@ defines the image type to build. By default this is set to iso to build CD/DVD i
 defines the filesystem to be used in the image type. This only has an effect if the selected binary image type does allow to choose a filesystem. For example, when selection iso the resulting CD/DVD has always the filesystem ISO9660. When building usb-hdd images for usb sticks, this is active. Note that it defaults to fat16 on all architectures except sparc where it defaults to ext2. Also note that if you choose fat16 and your resulting binary image gets bigger than 2GB, the binary filesystem automatically gets switched to fat32.
 .IP "\fB\-\-binary\-indices\fR true|false|none" 4
 defines if the resulting images should have binary indices or not and defaults to true. If set to none, no indices are included at all.
-.IP "\fB\-\-bootappend\-install\fR \fIPARAMETER\fR|\fI""PARAMETERS""\fR" 4
+.IP "\fB\-\-bootappend\-install\fR \fIPARAMETER\fR|""\fIPARAMETERS\fR""" 4
 sets boot parameters specific to debian-installer, if included.
-.IP "\fB\-\-bootappend\-live\fR \fIPARAMETER\fR|\fI""PARAMETERS""\fR" 4
+.IP "\fB\-\-bootappend\-live\fR \fIPARAMETER\fR|""\fIPARAMETERS\fR""" 4
 sets boot parameters specific to debian-live. A complete list of boot parameters can be found, for etch, in the manpage of casper, for all other distributions in the manpage of live-initramfs. On the images, a list of all parameters (without comments) is included in the /parameters.txt.
 .IP "\fB\-\-bootloader\fR grub|syslinux|yaboot" 4
 defines which bootloader is beeing used in the generated image. This has only an effect if the selected binary image type does allow to choose the bootloader. For example, if you build a iso, always syslinux (or more precise, isolinux) is being used. Also note that some combinations of binary images types and bootloaders may be possible but live\-helper does not support them yet. lh_config will fail to create such a not yet supported configuration and give a explanation about it. For usb-hdd images on amd64 and i386, the default is syslinux. yaboot is only used on powerpc.
@@ -256,7 +256,7 @@ defines globally if any cache should be used at all. Different caches can be con
 defines if downloaded package indices and lists should be cached which is false by default. Enabling it would allow to rebuild an image completely offline, however, you would not get updates anymore then.
 .IP "\fB\-\-cache\-packages\fR true|false" 4
 defines if downloaded packages files should be cached which is true by default. Disabling it does save space consumtion in your build directory, but remember that you will cause much unnecessary traffic if you do a couple of rebuilds. In general you should always leave it true, however, in some particular rare build setups, it can be faster to refetch packages from the local network mirror rather than to utilize the local disk.
-.IP "\fB\-\-cache\-stages\fR true|false|\fISTAGE\fR|\fI""STAGES""\fR" 4
+.IP "\fB\-\-cache\-stages\fR true|false|\fISTAGE\fR|""\fISTAGES\fR""" 4
 sets which stages should be cached. By default set to bootstrap. As an exception to the normal stage names, also rootfs can be used here which does only cache the generated root filesystem in filesystem.{dir,ext*,squashfs}. This is useful during development if you want to rebuild the binary stage but not regenerate the root filesystem all the time.
 .IP "\fB\-\-checksums\fR true|false" 4
 defines if the binary image should contain a file called md5sums.txt that lists all files on the image together with their md5 checksums. This in turn can be used by live-initramfs' built-in integrity-check to verify the medium if specified at boot prompt. In general, this should not be false and is an important feature of live system released to the public. However, during development of very big images it can save some time by not calculating the checksums.
@@ -311,18 +311,18 @@ sets the APPLICATION field in the header of a resulting CD/DVD image and default
 .IP "\fB\-\-iso\-preparer\fR \fINAME\fR" 4
 sets the PREPARER field in the header of a resulting CD/DVD image. By default this is set to "live-helper \fIVERSION\fR; http://packages.qa.debian.org/live-helper", whereas VERSION is expanded to the version of live-helper that was used to build the image.
 .IP "\fB\-\-iso\-publisher\fR \fINAME\fR" 4
-sets the PUBLISHED field in the header of a resulting CD/DVD image. By default, this is set to 'Debian Live project; http://debian-live.alioth.debian.org/; debian-live at lists.debian.org'. Remember to change this to the appropriate values at latest when you distributing custom and unofficial images.
+sets the PUBLISHED field in the header of a resulting CD/DVD image. By default, this is set to 'Debian Live project; http:/live.debian.net/; debian-live at lists.debian.org'. Remember to change this to the appropriate values at latest when you distributing custom and unofficial images.
 .IP "\fB\-\-iso\-volume\fR \fINAME\fR" 4
 sets the VOLUME field in the header of a resulting CD/DVD and defaults to '(\fIMODE\fR) (\fIDISTRIBUTION\fR) (\fIDATE\fR)' whereas MODE is expanded to the name of the mode in use, DISTRIBUTION the distribution name, and DATE with the current date and time of the generation. When running in debian-release mode however, it will instead default to 'Debian (\fIVERSION\fR) (\fIARCHITECTURE\fR) live' where VERSION becomes the numerical version of the release being built and ARCHITECTURE becomes the name of the architecture.
 .IP "\fB\-\-jffs2\-eraseblock\fR \fISIZE\fR" 4
 sets the eraseblock size for a JFFS2 (Second Journalling Flash File System) filesystem. The default is 64 KiB. If you use an erase block size different than the erase block size of the target MTD device, JFFS2 may not perform optimally. If the SIZE specified is below 4096, the units are assumed to be KiB.
-.IP "[\fB\-\-keyring\-packages\fR \fIPACKAGE\fI|\fI"PACKAGES"\fR" 4
+.IP "\fB\-\-keyring\-packages\fR \fIPACKAGE\fI|""\fIPACKAGES\fR""" 4
 sets the keyring package or additional keyring packages. By default this is set to debian-archive-keyring.
 .IP "\-l|\fB\-\-language\fR \fILANGUAGE\fR" 4
 sets the language of a live system by installing l10n related packages and enables generation of the correct locales through automatically setting the right boot parameters.
-.IP "\-k|\fB\-\-linux\-flavours\fR \fIFLAVOUR\fR|\fI"FLAVOURS"\fR" 4
+.IP "\-k|\fB\-\-linux\-flavours\fR \fIFLAVOUR\fR|""\fIFLAVOURS\fR""" 4
 sets the kernel flavours to be installed. Note that in case you specify more than that the first will be configured the default kernel that gets booted.
-.IP "\fB\-\-linux\-packages\fR \fI"PACKAGES"\fR" 4
+.IP "\fB\-\-linux\-packages\fR ""\fIPACKAGES\fR""" 4
 sets the internal name of the kernel packages naming scheme. If you use debian kernel packages, you will not have to adjust it. If you decide to use custom kernel packages that do not follow the debian naming scheme, remember to set this option to the stub of the packages only (for debian this is linux-image-2.6), so that \fISTUB\fR-\fIFLAVOUR\fR results in a valid package name (for debian e.g. linux-image-2.6-486). Preferably you use the meta package name, if any, for the stub, so that your configuration is ABI independent. Also don't forget that you have to include stubs of the binary modules packages for unionfs or aufs, and squashfs if you built them out-of-tree.
 .IP "\fB\-\-losetup\fR losetup|losetup.orig" 4
 sets the filename of the losetup binary from the host system that should be used. This is autodetected and does generally not need any customization.
@@ -367,17 +367,17 @@ Example:
 sets the IP or hostname that will be configured in the bootloader configuration for the copy-on-write filesystem of your netboot image and is by default empty.
 .IP "\fB\-\-net\-tarball\fR bzip2|gzip|tar|none" 4
 defines the format of the netboot image. Choosing tar results in a not compressed tarball, bzip2 and gzip in a bzip2 resp. gzip compressed tarball. Choosing none leads to no tarball at all, the plain binary directory is considered the output in this case. Default is gzip.
-.IP "\-p|\fB\-\-packages\-lists\fR \fIFILE\fR" 4
+.IP "\-p|\fB\-\-packages\-lists\fR \fILIST\fR|""\fILISTS\fR""" 4
 defines which lists available in /usr/share/live-helper/lists should be used. By default, this is set to standard. Note that in case you have local packages lists, you don't need to list them here. Putting them into config/chroot_local-packageslists is enough (the filename needs to have the .list suffix though).
-.IP "\fB\-\-packages\fR \fIPACKAGE\fR|\fI""PACKAGES""\fR" 4
+.IP "\fB\-\-packages\fR \fIPACKAGE\fR|""\fIPACKAGES\fR""" 4
 defines one or more packages to be installed in the live system. This is a quick and convenient place to add a few packages when building an image (limited by the max length of shell). Packages that should be permanently installed should be put into a local packages list.
-.IP "\fB\-r, \-\-repositories\fR \fIREPOSITORY\fR|\fI""REPOSITORIES""\fR" 4
+.IP "\fB\-r, \-\-repositories\fR \fIREPOSITORY\fR|""\fIREPOSITORIES\fR""" 4
 enables one of available third-party repository configurations in /usr/share/live-helper/repositories.
 .IP "\fB\-\-root-command\fR sudo" 4
 controls if live-helper should use sudo internally to build the live image. Note that this is not well tested and that you should, when relying on sudo, call the individual live\-helper command with sudo itself.
 .IP "\fB\-\-use-fakeroot\fR true|false" 4
 controls if live-helper should utilize fakeroot and fakechroot to try and avoid requiring root privillages where possible. By default, this option is false.
-.IP "\fB\-\-archive\-areas\fR \fIARCHIVE_AREA\fR|\fI""ARCHIVE_AREAS""\fR" 4
+.IP "\fB\-\-archive\-areas\fR \fIARCHIVE_AREA\fR|""\fIARCHIVE_AREAS\fR""" 4
 defines which package archive areas of a debian packages archive should be used for configured debian package mirrors. By default, this is set to main. Remember to check the licenses of each packages with respect to their redistributability in your juristiction when enabling contrib or non-free with this mechanism.
 .IP "\fB\-\-security\fR true|false" 4
 defines if the security repositories specified in the security mirror options should be used or not.
@@ -426,7 +426,7 @@ An optional, global configuration file for lh_config variables. It is useful to
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_local.en.1 b/manpages/lh_local.en.1
index bb6b896..a819d40 100644
--- a/manpages/lh_local.en.1
+++ b/manpages/lh_local.en.1
@@ -18,7 +18,7 @@ lh_local has no specific options but understands all generic live\-helper option
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_source.en.1 b/manpages/lh_source.en.1
index d5db3ce..7e0811e 100644
--- a/manpages/lh_source.en.1
+++ b/manpages/lh_source.en.1
@@ -18,7 +18,7 @@ lh_source has no specific options but understands all generic live\-helper optio
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_source_debian-live.en.1 b/manpages/lh_source_debian-live.en.1
index 063092a..8d2425b 100644
--- a/manpages/lh_source_debian-live.en.1
+++ b/manpages/lh_source_debian-live.en.1
@@ -20,7 +20,7 @@ lh_source_debian-live has no specific options but understands all generic live\-
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_source_debian.en.1 b/manpages/lh_source_debian.en.1
index 673fff6..8845d86 100644
--- a/manpages/lh_source_debian.en.1
+++ b/manpages/lh_source_debian.en.1
@@ -20,7 +20,7 @@ lh_source_debian has no specific options but understands all generic live\-helpe
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_source_disk.en.1 b/manpages/lh_source_disk.en.1
index 45ba1b1..a9a97e1 100644
--- a/manpages/lh_source_disk.en.1
+++ b/manpages/lh_source_disk.en.1
@@ -20,7 +20,7 @@ lh_source_disk has no specific options but understands all generic live\-helper
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_source_iso.en.1 b/manpages/lh_source_iso.en.1
index 9176984..6cdee86 100644
--- a/manpages/lh_source_iso.en.1
+++ b/manpages/lh_source_iso.en.1
@@ -20,7 +20,7 @@ lh_source_iso has no specific options but understands all generic live\-helper o
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_source_md5sum.en.1 b/manpages/lh_source_md5sum.en.1
index 2645da5..ac6d295 100644
--- a/manpages/lh_source_md5sum.en.1
+++ b/manpages/lh_source_md5sum.en.1
@@ -20,7 +20,7 @@ lh_source_md5sum sources has no specific options but understands all generic liv
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_source_net.en.1 b/manpages/lh_source_net.en.1
index 5ed03a6..1e0d90c 100644
--- a/manpages/lh_source_net.en.1
+++ b/manpages/lh_source_net.en.1
@@ -20,7 +20,7 @@ lh_source_net has no specific options but understands all generic live\-helper o
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_source_tar.en.1 b/manpages/lh_source_tar.en.1
index 807b631..81021d8 100644
--- a/manpages/lh_source_tar.en.1
+++ b/manpages/lh_source_tar.en.1
@@ -20,7 +20,7 @@ lh_source_tar has no specific options but understands all generic live\-helper o
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_source_usb.en.1 b/manpages/lh_source_usb.en.1
index 716656c..053f008 100644
--- a/manpages/lh_source_usb.en.1
+++ b/manpages/lh_source_usb.en.1
@@ -20,7 +20,7 @@ lh_source_usb\-hdd has no specific options but understands all generic live\-hel
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_source_virtual-hdd.en.1 b/manpages/lh_source_virtual-hdd.en.1
index e6727e0..e282ea5 100644
--- a/manpages/lh_source_virtual-hdd.en.1
+++ b/manpages/lh_source_virtual-hdd.en.1
@@ -20,7 +20,7 @@ lh_source_virtual\-hdd has no specific options but understands all generic live\
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/lh_testroot.en.1 b/manpages/lh_testroot.en.1
index 119713d..8c9085c 100644
--- a/manpages/lh_testroot.en.1
+++ b/manpages/lh_testroot.en.1
@@ -20,7 +20,7 @@ lh_testroot has no specific options but understands all generic live\-helper opt
 This program is a part of live\-helper.
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/manpages/live-helper.en.7 b/manpages/live-helper.en.7
index dba08f1..f119dfa 100644
--- a/manpages/live-helper.en.7
+++ b/manpages/live-helper.en.7
@@ -232,7 +232,7 @@ All config files are shell scripts which are sourced by a live\-helper program.
 \fIlive\-initramfs\fR(7)
 
 .SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://debian\-live.alioth.debian.org/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
+More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
 
 .SH BUGS
 Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
diff --git a/templates/cgi/debian-official/mail.txt b/templates/cgi/debian-official/mail.txt
index 5be98b2..6206945 100644
--- a/templates/cgi/debian-official/mail.txt
+++ b/templates/cgi/debian-official/mail.txt
@@ -8,7 +8,7 @@ This is live-helper web-frontend of the Debian Live project <http://live.debian.
 
 Your build BUILD was started DATE_START and ended DATE_END with status 'STATUS'.
 
-You can see the log file and download the images from <SERVER/BUILD/>.
+You can see the log file and download the image from <SERVER/BUILD/>.
 
 Note that builds are removed after 24 hours.
 
diff --git a/templates/cgi/debian-unofficial/mail.txt b/templates/cgi/debian-unofficial/mail.txt
index 5be98b2..6206945 100644
--- a/templates/cgi/debian-unofficial/mail.txt
+++ b/templates/cgi/debian-unofficial/mail.txt
@@ -8,7 +8,7 @@ This is live-helper web-frontend of the Debian Live project <http://live.debian.
 
 Your build BUILD was started DATE_START and ended DATE_END with status 'STATUS'.
 
-You can see the log file and download the images from <SERVER/BUILD/>.
+You can see the log file and download the image from <SERVER/BUILD/>.
 
 Note that builds are removed after 24 hours.
 
diff --git a/templates/silo/debian.txt b/templates/silo/debian.txt
index c393af2..55771c1 100644
--- a/templates/silo/debian.txt
+++ b/templates/silo/debian.txt
@@ -7,7 +7,7 @@ It was built on LH_DATE by live-helper LH_VERSION.
 You must have at least 64 megabytes of RAM to run this Debian Live system.
 
 See the Live Manual or the FAQ for more information; both documents are
-available at the Debian Live web site, http://debian-live.alioth.debian.org/
+available at the Debian Live web site, http://live.debian.net/
 
 Debian GNU/Linux comes with ABSOLUTELY NO WARRANTY, to the extent permitted
 by applicable law.
diff --git a/templates/silo/debian.txt.install b/templates/silo/debian.txt.install
index 366e996..d0960c2 100644
--- a/templates/silo/debian.txt.install
+++ b/templates/silo/debian.txt.install
@@ -7,7 +7,7 @@ It was built on LH_DATE by live-helper LH_VERSION.
 You must have at least 64 megabytes of RAM to run this Debian Live system.
 
 See the Live Manual or the FAQ for more information; both documents are
-available at the Debian Live web site, http://debian-live.alioth.debian.org/
+available at the Debian Live web site, http://live.debian.net/
 
 You must have at least 32 megabytes of RAM to use the Debian installer.
 
diff --git a/templates/syslinux/ca/f10.txt b/templates/syslinux/ca/f10.txt
index 7836c18..b35593f 100644
--- a/templates/syslinux/ca/f10.txt
+++ b/templates/syslinux/ca/f10.txt
@@ -15,7 +15,7 @@ la llei aplicable.
 Aquest sistema Debian Live ha estat constru‹t amb live-helper, versi¢ {$LH_VERSION}.
 
 M‚s informaci¢ del projecte Debian Live es pot trobar a 
-<http://debian-live.alioth.debian.org/>.
+<http://live.debian.net/>.
 
 
 
diff --git a/templates/syslinux/ca/f2.txt.install b/templates/syslinux/ca/f2.txt.install
index 26e9733..32a3ac1 100644
--- a/templates/syslinux/ca/f2.txt.install
+++ b/templates/syslinux/ca/f2.txt.install
@@ -3,7 +3,7 @@
 Heu de tenir un m¡nim de 64MB de RAM per usar aquest sistema Debian Live.
 
 Vegeu el Manual Live o el PUF (FAQ) per a m‚s informarci¢; tot dos disponibles
-a la web de Debian Live, 0fhttp://debian-live.alioth.debian.org/07
+a la web de Debian Live, 0fhttp://live.debian.net/07
 
 
 Heu de tenir al manco 32 megabytes de RAM per a usar el instalúlador de Debian.
diff --git a/templates/syslinux/ca/f2.txt.live b/templates/syslinux/ca/f2.txt.live
index aa6097b..c1c595d 100644
--- a/templates/syslinux/ca/f2.txt.live
+++ b/templates/syslinux/ca/f2.txt.live
@@ -3,7 +3,7 @@
 Heu de tenir un m¡nim de 64MB de RAM per usar aquest sistema Debian Live.
 
 Vegeu el Manual Live o el PUF (FAQ) per a m‚s informarci¢; tot dos disponibles
-a la web de Debian Live, 0fhttp://debian-live.alioth.debian.org/07
+a la web de Debian Live, 0fhttp://live.debian.net/07
 
 Gr…cies per seleccionar Debian!
 
diff --git a/templates/syslinux/ca/f9.txt.install b/templates/syslinux/ca/f9.txt.install
index 2bbfe91..5c7cf2b 100644
--- a/templates/syslinux/ca/f9.txt.install
+++ b/templates/syslinux/ca/f9.txt.install
@@ -14,7 +14,7 @@ Aquests documents estan disponibles al lloc web de Debian:
 
 Si no pot executar el sistema Debian Live, vegeu el manual de instalúlaci¢
 o les PMF (FAQ) per a m‚s informaci¢. Aquests documents estan disponibles
-en la web de Debian, 0fhttp://debian-live.alioth.debian.org/07
+en la web de Debian, 0fhttp://live.debian.net/07
 
 
 
diff --git a/templates/syslinux/ca/f9.txt.live b/templates/syslinux/ca/f9.txt.live
index ceb3170..dbb04a5 100644
--- a/templates/syslinux/ca/f9.txt.live
+++ b/templates/syslinux/ca/f9.txt.live
@@ -10,7 +10,7 @@ beneficiar-se de la vostra experi
 
 Vegeu el manual del Debian Live o les PMF (FAQ) per a m‚s informaci¢; 
 Aquests documents estan disponibles al lloc web de Debian:
-0fhttp://debian-live.alioth.debian.org/07
+0fhttp://live.debian.net/07
 
 
 
diff --git a/templates/syslinux/en/f10.txt b/templates/syslinux/en/f10.txt
index 9f8e481..26a150a 100644
--- a/templates/syslinux/en/f10.txt
+++ b/templates/syslinux/en/f10.txt
@@ -15,7 +15,7 @@ permitted by applicable law.
 This Debian Live system was built with live-helper, version {$LH_VERSION}.
 
 More information about the Debian Live project can be found at
-<http://debian-live.alioth.debian.org/>.
+<http://live.debian.net/>.
 
 
 
diff --git a/templates/syslinux/en/f2.txt.install b/templates/syslinux/en/f2.txt.install
index d34d6e1..a67118b 100644
--- a/templates/syslinux/en/f2.txt.install
+++ b/templates/syslinux/en/f2.txt.install
@@ -3,7 +3,7 @@
 You must have at least 64 megabytes of RAM to run this Debian Live system.
 
 See the Live Manual or the FAQ for more information; both documents are
-available at the Debian Live web site, 0fhttp://debian-live.alioth.debian.org/07
+available at the Debian Live web site, 0fhttp://live.debian.net/07
 
 
 You must have at least 44 megabytes of RAM to use the Debian installer.
diff --git a/templates/syslinux/en/f2.txt.live b/templates/syslinux/en/f2.txt.live
index ec2430e..3c0fea0 100644
--- a/templates/syslinux/en/f2.txt.live
+++ b/templates/syslinux/en/f2.txt.live
@@ -3,7 +3,7 @@
 You must have at least 64 megabytes of RAM to run this Debian Live system.
 
 See the Live Manual or the FAQ for more information; both documents are
-available at the Debian Live web site, 0fhttp://debian-live.alioth.debian.org/07
+available at the Debian Live web site, 0fhttp://live.debian.net/07
 
 Thank you for choosing Debian!
 
diff --git a/templates/syslinux/en/f9.txt.install b/templates/syslinux/en/f9.txt.install
index 919d371..ba125bf 100644
--- a/templates/syslinux/en/f9.txt.install
+++ b/templates/syslinux/en/f9.txt.install
@@ -13,7 +13,7 @@ documents are available at the Debian web site, 0fhttp://www.debian.org/07
 
 If you can't run the Debian Live system, see the manual or
 the FAQ for more information; both documents are available at
-the Debian web site, 0fhttp://debian-live.alioth.debian.org/07
+the Debian web site, 0fhttp://live.debian.net/07
 
 
 
diff --git a/templates/syslinux/en/f9.txt.live b/templates/syslinux/en/f9.txt.live
index cab7f20..d0b6c12 100644
--- a/templates/syslinux/en/f9.txt.live
+++ b/templates/syslinux/en/f9.txt.live
@@ -10,7 +10,7 @@ experience!
 
 See the Live Manual or the FAQ for more information; both
 documents are available at the Debian web site,
-0fhttp://debian-live.alioth.debian.org/07
+0fhttp://live.debian.net/07
 
 
 
diff --git a/templates/syslinux/es/f10.txt b/templates/syslinux/es/f10.txt
index c70ba98..6c8ad35 100644
--- a/templates/syslinux/es/f10.txt
+++ b/templates/syslinux/es/f10.txt
@@ -15,7 +15,7 @@ permitido por la ley.
 Este sistema Debian Live se construy¢ con live-helper, versi¢n {$LH_VERSION}.
 
 M s informaci¢n en sobre el proyecto Debian Live puede encontrarse en 
-<http://debian-live.alioth.debian.org/>.
+<http://live.debian.net/>.
 
 
 
diff --git a/templates/syslinux/es/f2.txt.install b/templates/syslinux/es/f2.txt.install
index eef62ad..d1417cf 100644
--- a/templates/syslinux/es/f2.txt.install
+++ b/templates/syslinux/es/f2.txt.install
@@ -3,7 +3,7 @@
 Debe tener al menos 64 megabytes de RAM para ejecutar este sistema Debian Live.
 
 Lea el manual Live o el FAQ para m s informaci¢n; ambos documentos est n
-disponibles en la web de Debian, 0fhttp://debian-live.alioth.debian.org/07
+disponibles en la web de Debian, 0fhttp://live.debian.net/07
 
 
 Debe tener al menos 32 megabytes de RAM para usar el instalador de Debian.
diff --git a/templates/syslinux/es/f2.txt.live b/templates/syslinux/es/f2.txt.live
index ecb2e13..67fab12 100644
--- a/templates/syslinux/es/f2.txt.live
+++ b/templates/syslinux/es/f2.txt.live
@@ -3,7 +3,7 @@
 Debe tener al menos 64 megabytes de RAM para ejecutar este sistema Debian Live.
 
 Lea el manual Live o el FAQ para m s informaci¢n; ambos documentos est n
-disponibles en la web de Debian, 0fhttp://debian-live.alioth.debian.org/07
+disponibles en la web de Debian, 0fhttp://live.debian.net/07
 
 Gracias por elegir Debian!
 
diff --git a/templates/syslinux/es/f9.txt.install b/templates/syslinux/es/f9.txt.install
index aba63cf..09bf93d 100644
--- a/templates/syslinux/es/f9.txt.install
+++ b/templates/syslinux/es/f9.txt.install
@@ -14,7 +14,7 @@ estos documentos est
 
 Si no puede executar el sistema Debian Live, vea el manual de instalaci¢n o
 las PUF (FAQ) para m s informaci¢n; estos documentos est n disponibles en 
-la web de Debian, 0fhttp://debian-live.alioth.debian.org/07
+la web de Debian, 0fhttp://live.debian.net/07
 
 
 
diff --git a/templates/syslinux/es/f9.txt.live b/templates/syslinux/es/f9.txt.live
index 113b50e..1ed589f 100644
--- a/templates/syslinux/es/f9.txt.live
+++ b/templates/syslinux/es/f9.txt.live
@@ -10,7 +10,7 @@ beneficiarse de su esperiencia!
 
 Vea el manual del Debian Live o las PUF (FAQ) para obtener m s informaci¢n;
 estos documentos est n disponibles en la web de Debian:
-0fhttp://debian-live.alioth.debian.org/07
+0fhttp://live.debian.net/07
 
 
 

-- 
live-helper

