Removing dedicated emdebian mode, this can entirely be handled with different defaults.

42 files changed, 98 insertions, 134 deletions

diff --git a/functions/defaults.sh b/functions/defaults.sh
index f48f3684c..64a02c4e7 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -96,7 +96,7 @@ Set_defaults ()
 	# Setting system type
 	LB_SYSTEM="${LB_SYSTEM:-live}"
 
-	# Setting mode (currently: debian, emdebian, progress-linux, and ubuntu)
+	# Setting mode (currently: debian, progress-linux, and ubuntu)
 	if [ -x /usr/bin/lsb_release ]
 	then
 		_DISTRIBUTOR="$(lsb_release -is | tr [A-Z] [a-z])"
@@ -197,7 +197,7 @@ Set_defaults ()
 
 	# Setting apt recommends
 	case "${LB_MODE}" in
-		emdebian|progress-linux)
+		progress-linux)
 			LB_APT_RECOMMENDS="${LB_APT_RECOMMENDS:-false}"
 			;;
 
@@ -369,11 +369,6 @@ Set_defaults ()
 			LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-${LB_MIRROR_BOOTSTRAP}}"
 			;;
 
-		emdebian)
-			LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://www.emdebian.org/grip/}"
-			LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-${LB_MIRROR_BOOTSTRAP}}"
-			;;
-
 		progress-linux)
 			LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-http://ftp.debian.org/debian/}"
 			LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://cdn.archive.progress-linux.org/progress/}"
@@ -404,11 +399,6 @@ Set_defaults ()
 			LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY:-${LB_MIRROR_CHROOT_SECURITY}}"
 			;;
 
-		emdebian)
-			LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-none}"
-			LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY:-${LB_MIRROR_CHROOT_SECURITY}}"
-			;;
-
 		progress-linux)
 			LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY:-http://security.debian.org/}"
 			LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-${LB_MIRROR_CHROOT}}"
@@ -441,11 +431,6 @@ Set_defaults ()
 			LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-${LB_MIRROR_CHROOT}}"
 			;;
 
-		emdebian)
-			LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://www.emdebian.org/grip/}"
-			LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-${LB_MIRROR_BINARY}}"
-			;;
-
 		ubuntu)
 			case "${LIVE_IMAGE_ARCHITECTURE}" in
 				amd64|i386)
@@ -468,11 +453,6 @@ Set_defaults ()
 			LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-${LB_MIRROR_BINARY_SECURITY}}"
 			;;
 
-		emdebian)
-			LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-none}"
-			LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-${LB_MIRROR_BINARY_SECURITY}}"
-			;;
-
 		progress-linux)
 			LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-http://security.debian.org/}"
 			LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-${LB_MIRROR_CHROOT}}"
@@ -871,10 +851,6 @@ Set_defaults ()
 			LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Debian Live}"
 			;;
 
-		emdebian)
-			LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Emdebian Live}"
-			;;
-
 		progress-linux)
 			LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Progress Linux}"
 			;;
@@ -904,10 +880,6 @@ Set_defaults ()
 			LB_HDD_LABEL="${LB_HDD_LABEL:-DEBIAN_LIVE}"
 			;;
 
-		emdebian)
-			LB_HDD_LABEL="${LB_HDD_LABEL:-EMDEBIAN_LIVE}"
-			;;
-
 		progress-linux)
 			LB_HDD_LABEL="${LB_HDD_LABEL:-PROGRESS_$(echo ${LB_DISTRIBUTION} | tr [a-z] [A-Z])}"
 			;;
@@ -926,10 +898,6 @@ Set_defaults ()
 			LB_ISO_VOLUME="${LB_ISO_VOLUME:-Debian ${LB_DISTRIBUTION} \$(date +%Y%m%d-%H:%M)}"
 			;;
 
-		emdebian)
-			LB_ISO_VOLUME="${LB_ISO_VOLUME:-Emdebian ${LB_DISTRIBUTION} \$(date +%Y%m%d-%H:%M)}"
-			;;
-
 		progress-linux)
 			LB_ISO_VOLUME="${LB_ISO_VOLUME:-Progress ${LB_DISTRIBUTION}}"
 			;;
diff --git a/manpages/de/lb.de.1 b/manpages/de/lb.de.1
index f2ff7536e..ea802a38a 100644
--- a/manpages/de/lb.de.1
+++ b/manpages/de/lb.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 11.03.2013 4.0~a15\-1 "Live Systems Project"
+.TH LIVE\-BUILD 1 21.03.2013 4.0~a15\-1 "Live Systems Project"
 
 .SH NAME
 \fBlb\fP \- wrapper for live\-build programs
diff --git a/manpages/de/lb_binary.de.1 b/manpages/de/lb_binary.de.1
index 556ee7b94..fc89e2177 100644
--- a/manpages/de/lb_binary.de.1
+++ b/manpages/de/lb_binary.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 11.03.2013 4.0~a15\-1 "Live Systems Project"
+.TH LIVE\-BUILD 1 21.03.2013 4.0~a15\-1 "Live Systems Project"
 
 .SH NAME
 \fBlb binary\fP \- Complete the binary stage
diff --git a/manpages/de/lb_bootstrap.de.1 b/manpages/de/lb_bootstrap.de.1
index b9024e759..889294258 100644
--- a/manpages/de/lb_bootstrap.de.1
+++ b/manpages/de/lb_bootstrap.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 11.03.2013 4.0~a15\-1 "Live Systems Project"
+.TH LIVE\-BUILD 1 21.03.2013 4.0~a15\-1 "Live Systems Project"
 
 .SH NAME
 \fBlb bootstrap\fP \- Complete the bootstrap stage
diff --git a/manpages/de/lb_build.de.1 b/manpages/de/lb_build.de.1
index f1411480e..11e55c643 100644
--- a/manpages/de/lb_build.de.1
+++ b/manpages/de/lb_build.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 11.03.2013 4.0~a15\-1 "Live Systems Project"
+.TH LIVE\-BUILD 1 21.03.2013 4.0~a15\-1 "Live Systems Project"
 
 .SH NAME
 \fBlb build\fP \- Complete the bootstrap, chroot, binary, and source stages
diff --git a/manpages/de/lb_chroot.de.1 b/manpages/de/lb_chroot.de.1
index 61b62c3c2..648c44078 100644
--- a/manpages/de/lb_chroot.de.1
+++ b/manpages/de/lb_chroot.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 11.03.2013 4.0~a15\-1 "Live Systems Project"
+.TH LIVE\-BUILD 1 21.03.2013 4.0~a15\-1 "Live Systems Project"
 
 .SH NAME
 \fBlb chroot\fP \- Complete the chroot stage
diff --git a/manpages/de/lb_clean.de.1 b/manpages/de/lb_clean.de.1
index e2080772c..9276d145c 100644
--- a/manpages/de/lb_clean.de.1
+++ b/manpages/de/lb_clean.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 11.03.2013 4.0~a15\-1 "Live Systems Project"
+.TH LIVE\-BUILD 1 21.03.2013 4.0~a15\-1 "Live Systems Project"
 
 .SH NAME
 \fBlb clean\fP \- Clean build directory
diff --git a/manpages/de/lb_config.de.1 b/manpages/de/lb_config.de.1
index 2c96ec9a8..9c5391561 100644
--- a/manpages/de/lb_config.de.1
+++ b/manpages/de/lb_config.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 11.03.2013 4.0~a15\-1 "Live Systems Project"
+.TH LIVE\-BUILD 1 21.03.2013 4.0~a15\-1 "Live Systems Project"
 
 .SH NAME
 \fBlb config\fP \- Create config directory
@@ -178,7 +178,7 @@
 .br
   [\fB\-\-mirror\-debian\-installer\fP \fIURL\fP]
 .br
-  [\fB\-\-mode\fP debian|emdebian|progress\-linux|ubuntu]
+  [\fB\-\-mode\fP debian|progress\-linux|ubuntu]
 .br
   [\fB\-\-system\fP live|normal]
 .br
@@ -293,7 +293,7 @@ which require this are in violation of RFC 2068. By default, live\-build does
 not set this option.
 .IP "\fB\-\-apt\-recommends\fP true|false" 4
 defines if apt should install recommended packages automatically. By
-default, this is true except in emdebian mode.
+default, this is true.
 .IP "\fB\-\-apt\-secure\fP true|false" 4
 defines if apt should check repository signatures. This is true by default.
 .IP "\fB\-\-apt\-source\-archives\fP true|false" 4
@@ -489,8 +489,7 @@ default, this is of course false.
 defines options to pass to isohybrid.
 .IP "\fB\-\-iso\-application\fP \fINAME\fP" 4
 sets the APPLICATION field in the header of a resulting CD/DVD image and
-defaults to "Debian Live" in debian mode, and to "Emdebian Live" in emdebian
-mode, and "Ubuntu Live" in ubuntu mode.
+defaults to "Debian Live" in debian mode, and "Ubuntu Live" in ubuntu mode.
 .IP "\fB\-\-iso\-preparer\fP \fINAME\fP" 4
 sets the PREPARER field in the header of a resulting CD/DVD image. By
 default this is set to "live\-build \fIVERSION\fP;
@@ -618,7 +617,7 @@ end up configured in the final image.
 sets the location of the mirror that will be used to fetch the debian
 installer images of the derivative. By default, this points to the same
 mirror used to build the live system, i.e. the value of \-\-mirror\-bootstrap.
-.IP "\fB\-\-mode\fP debian|emdebian|progress|ubuntu" 4
+.IP "\fB\-\-mode\fP debian|progress|ubuntu" 4
 defines a global mode to load project specific defaults. By default this is
 set to debian.
 .IP "\fB\-\-system\fP live|normal" 4
@@ -632,9 +631,8 @@ sets additional options for mounting the root filesystem in netboot images
 and is by default empty.
 .IP "\fB\-\-net\-root\-path\fP \fIPATH\fP" 4
 sets the file path that will be configured in the bootloader configuration
-for your netboot image. This defaults to /srv/debian\-live in debian mode and
-to /srv/emebian\-live when being in emdebian mode, and /srv/ubuntu\-live when
-in ubuntu mode.
+for your netboot image. This defaults to /srv/debian\-live in debian mode,
+and /srv/ubuntu\-live when in ubuntu mode.
 .IP "\fB\-\-net\-root\-server\fP \fIIP\fP|\fIHOSTNAME\fP" 4
 sets the IP or hostname that will be configured in the bootloader
 configuration for the root filesystem of your netboot image. This defaults
diff --git a/manpages/de/lb_source.de.1 b/manpages/de/lb_source.de.1
index 11acca8cf..2c70a70c0 100644
--- a/manpages/de/lb_source.de.1
+++ b/manpages/de/lb_source.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 11.03.2013 4.0~a15\-1 "Live Systems Project"
+.TH LIVE\-BUILD 1 21.03.2013 4.0~a15\-1 "Live Systems Project"
 
 .SH NAME
 \fBlb source\fP \- Complete the source stage
diff --git a/manpages/de/lb_testroot.de.1 b/manpages/de/lb_testroot.de.1
index 43074d738..f964419fa 100644
--- a/manpages/de/lb_testroot.de.1
+++ b/manpages/de/lb_testroot.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 11.03.2013 4.0~a15\-1 "Live Systems Project"
+.TH LIVE\-BUILD 1 21.03.2013 4.0~a15\-1 "Live Systems Project"
 
 .SH NAME
 \fBlb testroot\fP \- Ensure that a system is built as root
diff --git a/manpages/de/live-build.de.7 b/manpages/de/live-build.de.7
index 34df87eee..889cf2484 100644
--- a/manpages/de/live-build.de.7
+++ b/manpages/de/live-build.de.7
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 7 11.03.2013 4.0~a15\-1 "Live Systems Project"
+.TH LIVE\-BUILD 7 21.03.2013 4.0~a15\-1 "Live Systems Project"
 
 .SH NAME
 \fBlive\-build\fP \- the live systems tool suite
diff --git a/manpages/en/lb.1 b/manpages/en/lb.1
index 3172c5bbe..60d5fc784 100644
--- a/manpages/en/lb.1
+++ b/manpages/en/lb.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2013\-03\-11 4.0~a15-1 "Live Systems Project"
+.TH LIVE\-BUILD 1 2013\-03\-21 4.0~a15-1 "Live Systems Project"
 
 .SH NAME
 \fBlb\fR \- wrapper for live\-build programs
diff --git a/manpages/en/lb_binary.1 b/manpages/en/lb_binary.1
index 0f0d1d0aa..98e73d94f 100644
--- a/manpages/en/lb_binary.1
+++ b/manpages/en/lb_binary.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2013\-03\-11 4.0~a15-1 "Live Systems Project"
+.TH LIVE\-BUILD 1 2013\-03\-21 4.0~a15-1 "Live Systems Project"
 
 .SH NAME
 \fBlb binary\fR \- Complete the binary stage
diff --git a/manpages/en/lb_bootstrap.1 b/manpages/en/lb_bootstrap.1
index 71f88e28b..c27b024b4 100644
--- a/manpages/en/lb_bootstrap.1
+++ b/manpages/en/lb_bootstrap.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2013\-03\-11 4.0~a15-1 "Live Systems Project"
+.TH LIVE\-BUILD 1 2013\-03\-21 4.0~a15-1 "Live Systems Project"
 
 .SH NAME
 \fBlb bootstrap\fR \- Complete the bootstrap stage
diff --git a/manpages/en/lb_build.1 b/manpages/en/lb_build.1
index cd227c81d..f89696262 100644
--- a/manpages/en/lb_build.1
+++ b/manpages/en/lb_build.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2013\-03\-11 4.0~a15-1 "Live Systems Project"
+.TH LIVE\-BUILD 1 2013\-03\-21 4.0~a15-1 "Live Systems Project"
 
 .SH NAME
 \fBlb build\fR \- Complete the bootstrap, chroot, binary, and source stages
diff --git a/manpages/en/lb_chroot.1 b/manpages/en/lb_chroot.1
index 6c8de0811..f1ae04a57 100644
--- a/manpages/en/lb_chroot.1
+++ b/manpages/en/lb_chroot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2013\-03\-11 4.0~a15-1 "Live Systems Project"
+.TH LIVE\-BUILD 1 2013\-03\-21 4.0~a15-1 "Live Systems Project"
 
 .SH NAME
 \fBlb chroot\fR \- Complete the chroot stage
diff --git a/manpages/en/lb_clean.1 b/manpages/en/lb_clean.1
index 466f3506f..5c36bfe81 100644
--- a/manpages/en/lb_clean.1
+++ b/manpages/en/lb_clean.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2013\-03\-11 4.0~a15-1 "Live Systems Project"
+.TH LIVE\-BUILD 1 2013\-03\-21 4.0~a15-1 "Live Systems Project"
 
 .SH NAME
 \fBlb clean\fR \- Clean build directory
diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1
index 5b72f364c..9a8fe3ad2 100644
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2013\-03\-11 4.0~a15-1 "Live Systems Project"
+.TH LIVE\-BUILD 1 2013\-03\-21 4.0~a15-1 "Live Systems Project"
 
 .SH NAME
 \fBlb config\fR \- Create config directory
@@ -173,7 +173,7 @@
 .br
 	[\fB\-\-mirror\-debian\-installer\fR \fIURL\fR]
 .br
-	[\fB\-\-mode\fR debian|emdebian|progress-linux|ubuntu]
+	[\fB\-\-mode\fR debian|progress-linux|ubuntu]
 .br
 	[\fB\-\-system\fR live|normal]
 .br
@@ -254,7 +254,7 @@ defines the default options that will be appended to every aptitude call that is
 .IP "\fB\-\-apt\-pipeline\fR \fIDEPTH\fR" 4
 sets the depth of the apt/aptitude pipeline. In cases where the remote server is not RFC conforming or buggy (such as Squid 2.0.2) this option can be a value from 0 to 5 indicating how many outstanding requests APT should send. A value of zero MUST be specified if the remote host does not properly linger on TCP connections \- otherwise data corruption will occur. Hosts which require this are in violation of RFC 2068. By default, live\-build does not set this option.
 .IP "\fB\-\-apt\-recommends\fR true|false" 4
-defines if apt should install recommended packages automatically. By default, this is true except in emdebian mode.
+defines if apt should install recommended packages automatically. By default, this is true.
 .IP "\fB\-\-apt\-secure\fR true|false" 4
 defines if apt should check repository signatures. This is true by default.
 .IP "\fB\-\-apt\-source\-archives\fR true|false" 4
@@ -338,7 +338,7 @@ defines if after the chroot stage and before the beginning of the binary stage,
 .IP "\fB\-\-isohybrid\-options\fR \fIOPTION\fR|""\fIOPTIONS\fR""" 4
 defines options to pass to isohybrid.
 .IP "\fB\-\-iso\-application\fR \fINAME\fR" 4
-sets the APPLICATION field in the header of a resulting CD/DVD image and defaults to "Debian Live" in debian mode, and to "Emdebian Live" in emdebian mode, and "Ubuntu Live" in ubuntu mode.
+sets the APPLICATION field in the header of a resulting CD/DVD image and defaults to "Debian Live" in debian mode, and "Ubuntu Live" in ubuntu mode.
 .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\-build \fIVERSION\fR; http://packages.qa.debian.org/live\-build", whereas VERSION is expanded to the version of live\-build that was used to build the image.
 .IP "\fB\-\-iso\-publisher\fR \fINAME\fR" 4
@@ -397,7 +397,7 @@ sets the location of the derivatives updates package mirror that should end up c
 sets the location of the derivatives backports package mirror that should end up configured in the final image.
 .IP "\fB\-\-mirror\-debian\-installer\fR \fIURL\fR" 4
 sets the location of the mirror that will be used to fetch the debian installer images of the derivative. By default, this points to the same mirror used to build the live system, i.e. the value of \-\-mirror\-bootstrap.
-.IP "\fB\-\-mode\fR debian|emdebian|progress|ubuntu" 4
+.IP "\fB\-\-mode\fR debian|progress|ubuntu" 4
 defines a global mode to load project specific defaults. By default this is set to debian.
 .IP "\fB\-\-system\fR live|normal" 4
 defines if the resulting system image should a live system or a normal, non-live system.
@@ -406,7 +406,7 @@ defines the filesystem that will be configured in the bootloader configuration f
 .IP "\fB\-\-net\-root\-mountoptions\fR \fIOPTIONS\fR" 4
 sets additional options for mounting the root filesystem in netboot images and is by default empty.
 .IP "\fB\-\-net\-root\-path\fR \fIPATH\fR" 4
-sets the file path that will be configured in the bootloader configuration for your netboot image. This defaults to /srv/debian\-live in debian mode and to /srv/emebian-live when being in emdebian mode, and /srv/ubuntu-live when in ubuntu mode.
+sets the file path that will be configured in the bootloader configuration for your netboot image. This defaults to /srv/debian\-live in debian mode, and /srv/ubuntu-live when in ubuntu mode.
 .IP "\fB\-\-net\-root\-server\fR \fIIP\fR|\fIHOSTNAME\fR" 4
 sets the IP or hostname that will be configured in the bootloader configuration for the root filesystem of your netboot image. This defaults to 192.168.1.1.
 .IP "\fB\-\-net\-cow\-filesystem\fR nfs|cfs" 4
diff --git a/manpages/en/lb_source.1 b/manpages/en/lb_source.1
index 7bb7e8349..fe5d409e0 100644
--- a/manpages/en/lb_source.1
+++ b/manpages/en/lb_source.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2013\-03\-11 4.0~a15-1 "Live Systems Project"
+.TH LIVE\-BUILD 1 2013\-03\-21 4.0~a15-1 "Live Systems Project"
 
 .SH NAME
 \fBlb source\fR \- Complete the source stage
diff --git a/manpages/en/lb_testroot.1 b/manpages/en/lb_testroot.1
index 7620efc97..ed3f5c9be 100644
--- a/manpages/en/lb_testroot.1
+++ b/manpages/en/lb_testroot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2013\-03\-11 4.0~a15-1 "Live Systems Project"
+.TH LIVE\-BUILD 1 2013\-03\-21 4.0~a15-1 "Live Systems Project"
 
 .SH NAME
 \fBlb testroot\fR \- Ensure that a system is built as root
diff --git a/manpages/en/live-build.7 b/manpages/en/live-build.7
index 3303258ba..c6dee1905 100644
--- a/manpages/en/live-build.7
+++ b/manpages/en/live-build.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 7 2013\-03\-11 4.0~a15-1 "Live Systems Project"
+.TH LIVE\-BUILD 7 2013\-03\-21 4.0~a15-1 "Live Systems Project"
 
 .SH NAME
 \fBlive\-build\fR \- the live systems tool suite
diff --git a/manpages/po/de/lb.1.po b/manpages/po/de/lb.1.po
index 3defdc8f2..7c130fef6 100644
--- a/manpages/po/de/lb.1.po
+++ b/manpages/po/de/lb.1.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 4.0~a15-1\n"
-"POT-Creation-Date: 2013-03-11 06:26+0100\n"
+"POT-Creation-Date: 2013-03-21 17:35+0100\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
 "Language-Team: none\n"
@@ -28,8 +28,8 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2013-03-11"
-msgstr "11.03.2013"
+msgid "2013-03-21"
+msgstr "21.03.2013"
 
 #. type: TH
 #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1
diff --git a/manpages/po/de/lb_binary.1.po b/manpages/po/de/lb_binary.1.po
index 3e6f7ee54..3e3b8f301 100644
--- a/manpages/po/de/lb_binary.1.po
+++ b/manpages/po/de/lb_binary.1.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 4.0~a15-1\n"
-"POT-Creation-Date: 2013-03-11 06:26+0100\n"
+"POT-Creation-Date: 2013-03-21 17:35+0100\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
 "Language-Team: none\n"
@@ -28,8 +28,8 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2013-03-11"
-msgstr "11.03.2013"
+msgid "2013-03-21"
+msgstr "21.03.2013"
 
 #. type: TH
 #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1
diff --git a/manpages/po/de/lb_bootstrap.1.po b/manpages/po/de/lb_bootstrap.1.po
index 1c02a84b2..34a3be284 100644
--- a/manpages/po/de/lb_bootstrap.1.po
+++ b/manpages/po/de/lb_bootstrap.1.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 4.0~a15-1\n"
-"POT-Creation-Date: 2013-03-11 06:26+0100\n"
+"POT-Creation-Date: 2013-03-21 17:35+0100\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
 "Language-Team: none\n"
@@ -28,8 +28,8 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2013-03-11"
-msgstr "11.03.2013"
+msgid "2013-03-21"
+msgstr "21.03.2013"
 
 #. type: TH
 #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1
diff --git a/manpages/po/de/lb_build.1.po b/manpages/po/de/lb_build.1.po
index ee4c0f01b..83b2bd6ce 100644
--- a/manpages/po/de/lb_build.1.po
+++ b/manpages/po/de/lb_build.1.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 4.0~a15-1\n"
-"POT-Creation-Date: 2013-03-11 06:26+0100\n"
+"POT-Creation-Date: 2013-03-21 17:35+0100\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
 "Language-Team: none\n"
@@ -28,8 +28,8 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2013-03-11"
-msgstr "11.03.2013"
+msgid "2013-03-21"
+msgstr "21.03.2013"
 
 #. type: TH
 #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1
diff --git a/manpages/po/de/lb_chroot.1.po b/manpages/po/de/lb_chroot.1.po
index 111ac6c39..c869c668c 100644
--- a/manpages/po/de/lb_chroot.1.po
+++ b/manpages/po/de/lb_chroot.1.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 4.0~a15-1\n"
-"POT-Creation-Date: 2013-03-11 06:26+0100\n"
+"POT-Creation-Date: 2013-03-21 17:35+0100\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
 "Language-Team: none\n"
@@ -28,8 +28,8 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2013-03-11"
-msgstr "11.03.2013"
+msgid "2013-03-21"
+msgstr "21.03.2013"
 
 #. type: TH
 #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1
diff --git a/manpages/po/de/lb_clean.1.po b/manpages/po/de/lb_clean.1.po
index cd8d97895..cce72a944 100644
--- a/manpages/po/de/lb_clean.1.po
+++ b/manpages/po/de/lb_clean.1.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 4.0~a15-1\n"
-"POT-Creation-Date: 2013-03-11 06:26+0100\n"
+"POT-Creation-Date: 2013-03-21 17:35+0100\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
 "Language-Team: none\n"
@@ -28,8 +28,8 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2013-03-11"
-msgstr "11.03.2013"
+msgid "2013-03-21"
+msgstr "21.03.2013"
 
 #. type: TH
 #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1
diff --git a/manpages/po/de/lb_config.1.po b/manpages/po/de/lb_config.1.po
index c7053b101..426ac1747 100644
--- a/manpages/po/de/lb_config.1.po
+++ b/manpages/po/de/lb_config.1.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 4.0~a15-1\n"
-"POT-Creation-Date: 2013-03-11 06:26+0100\n"
+"POT-Creation-Date: 2013-03-21 17:35+0100\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
 "Language-Team: none\n"
@@ -28,8 +28,8 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2013-03-11"
-msgstr "11.03.2013"
+msgid "2013-03-21"
+msgstr "21.03.2013"
 
 #. type: TH
 #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1
@@ -591,7 +591,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:177
-msgid "  [B<--mode> debian|emdebian|progress-linux|ubuntu]"
+msgid "  [B<--mode> debian|progress-linux|ubuntu]"
 msgstr ""
 
 #. type: Plain text
@@ -874,7 +874,7 @@ msgstr ""
 #: en/lb_config.1:258
 msgid ""
 "defines if apt should install recommended packages automatically. By "
-"default, this is true except in emdebian mode."
+"default, this is true."
 msgstr ""
 
 #. type: IP
@@ -1483,8 +1483,8 @@ msgstr ""
 #: en/lb_config.1:342
 msgid ""
 "sets the APPLICATION field in the header of a resulting CD/DVD image and "
-"defaults to \"Debian Live\" in debian mode, and to \"Emdebian Live\" in "
-"emdebian mode, and \"Ubuntu Live\" in ubuntu mode."
+"defaults to \"Debian Live\" in debian mode, and \"Ubuntu Live\" in ubuntu "
+"mode."
 msgstr ""
 
 #. type: IP
@@ -1905,7 +1905,7 @@ msgstr ""
 #. type: IP
 #: en/lb_config.1:400
 #, no-wrap
-msgid "B<--mode> debian|emdebian|progress|ubuntu"
+msgid "B<--mode> debian|progress|ubuntu"
 msgstr ""
 
 #. type: Plain text
@@ -1964,9 +1964,8 @@ msgstr ""
 #: en/lb_config.1:410
 msgid ""
 "sets the file path that will be configured in the bootloader configuration "
-"for your netboot image. This defaults to /srv/debian-live in debian mode and "
-"to /srv/emebian-live when being in emdebian mode, and /srv/ubuntu-live when "
-"in ubuntu mode."
+"for your netboot image. This defaults to /srv/debian-live in debian mode, "
+"and /srv/ubuntu-live when in ubuntu mode."
 msgstr ""
 
 #. type: IP
diff --git a/manpages/po/de/lb_source.1.po b/manpages/po/de/lb_source.1.po
index 8dad42a47..9a0ab20be 100644
--- a/manpages/po/de/lb_source.1.po
+++ b/manpages/po/de/lb_source.1.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 4.0~a15-1\n"
-"POT-Creation-Date: 2013-03-11 06:26+0100\n"
+"POT-Creation-Date: 2013-03-21 17:35+0100\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
 "Language-Team: none\n"
@@ -28,8 +28,8 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2013-03-11"
-msgstr "11.03.2013"
+msgid "2013-03-21"
+msgstr "21.03.2013"
 
 #. type: TH
 #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1
diff --git a/manpages/po/de/lb_testroot.1.po b/manpages/po/de/lb_testroot.1.po
index bf4a90c22..e5b1a4887 100644
--- a/manpages/po/de/lb_testroot.1.po
+++ b/manpages/po/de/lb_testroot.1.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 4.0~a15-1\n"
-"POT-Creation-Date: 2013-03-11 06:26+0100\n"
+"POT-Creation-Date: 2013-03-21 17:35+0100\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
 "Language-Team: none\n"
@@ -28,8 +28,8 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2013-03-11"
-msgstr "11.03.2013"
+msgid "2013-03-21"
+msgstr "21.03.2013"
 
 #. type: TH
 #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1
diff --git a/manpages/po/de/live-build.7.po b/manpages/po/de/live-build.7.po
index 41cf84f61..7daa5291d 100644
--- a/manpages/po/de/live-build.7.po
+++ b/manpages/po/de/live-build.7.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build 4.0~a15-1\n"
-"POT-Creation-Date: 2013-03-11 06:26+0100\n"
+"POT-Creation-Date: 2013-03-21 17:35+0100\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
 "Language-Team: none\n"
@@ -28,8 +28,8 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2013-03-11"
-msgstr "11.03.2013"
+msgid "2013-03-21"
+msgstr "21.03.2013"
 
 #. type: TH
 #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1
diff --git a/manpages/pot/lb.1.pot b/manpages/pot/lb.1.pot
index 7b0e7f4c8..acb388578 100644
--- a/manpages/pot/lb.1.pot
+++ b/manpages/pot/lb.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-03-11 06:26+0100\n"
+"POT-Creation-Date: 2013-03-21 17:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2013-03-11"
+msgid "2013-03-21"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lb_binary.1.pot b/manpages/pot/lb_binary.1.pot
index 2bcdc7126..ad9f6f43a 100644
--- a/manpages/pot/lb_binary.1.pot
+++ b/manpages/pot/lb_binary.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-03-11 06:26+0100\n"
+"POT-Creation-Date: 2013-03-21 17:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2013-03-11"
+msgid "2013-03-21"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lb_bootstrap.1.pot b/manpages/pot/lb_bootstrap.1.pot
index 4fcf49a4e..a48ff9d8e 100644
--- a/manpages/pot/lb_bootstrap.1.pot
+++ b/manpages/pot/lb_bootstrap.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-03-11 06:26+0100\n"
+"POT-Creation-Date: 2013-03-21 17:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2013-03-11"
+msgid "2013-03-21"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lb_build.1.pot b/manpages/pot/lb_build.1.pot
index c6f107783..9f7a81de7 100644
--- a/manpages/pot/lb_build.1.pot
+++ b/manpages/pot/lb_build.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-03-11 06:26+0100\n"
+"POT-Creation-Date: 2013-03-21 17:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2013-03-11"
+msgid "2013-03-21"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lb_chroot.1.pot b/manpages/pot/lb_chroot.1.pot
index 47a63ca21..3a733cf3c 100644
--- a/manpages/pot/lb_chroot.1.pot
+++ b/manpages/pot/lb_chroot.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-03-11 06:26+0100\n"
+"POT-Creation-Date: 2013-03-21 17:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2013-03-11"
+msgid "2013-03-21"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lb_clean.1.pot b/manpages/pot/lb_clean.1.pot
index bea3e6737..7e1d45523 100644
--- a/manpages/pot/lb_clean.1.pot
+++ b/manpages/pot/lb_clean.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-03-11 06:26+0100\n"
+"POT-Creation-Date: 2013-03-21 17:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2013-03-11"
+msgid "2013-03-21"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lb_config.1.pot b/manpages/pot/lb_config.1.pot
index 7ac15ac4f..b634debc7 100644
--- a/manpages/pot/lb_config.1.pot
+++ b/manpages/pot/lb_config.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-03-11 06:26+0100\n"
+"POT-Creation-Date: 2013-03-21 17:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2013-03-11"
+msgid "2013-03-21"
 msgstr ""
 
 #. type: TH
@@ -592,7 +592,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:177
-msgid "  [B<--mode> debian|emdebian|progress-linux|ubuntu]"
+msgid "  [B<--mode> debian|progress-linux|ubuntu]"
 msgstr ""
 
 #. type: Plain text
@@ -875,7 +875,7 @@ msgstr ""
 #: en/lb_config.1:258
 msgid ""
 "defines if apt should install recommended packages automatically. By "
-"default, this is true except in emdebian mode."
+"default, this is true."
 msgstr ""
 
 #. type: IP
@@ -1484,8 +1484,8 @@ msgstr ""
 #: en/lb_config.1:342
 msgid ""
 "sets the APPLICATION field in the header of a resulting CD/DVD image and "
-"defaults to \"Debian Live\" in debian mode, and to \"Emdebian Live\" in "
-"emdebian mode, and \"Ubuntu Live\" in ubuntu mode."
+"defaults to \"Debian Live\" in debian mode, and \"Ubuntu Live\" in ubuntu "
+"mode."
 msgstr ""
 
 #. type: IP
@@ -1906,7 +1906,7 @@ msgstr ""
 #. type: IP
 #: en/lb_config.1:400
 #, no-wrap
-msgid "B<--mode> debian|emdebian|progress|ubuntu"
+msgid "B<--mode> debian|progress|ubuntu"
 msgstr ""
 
 #. type: Plain text
@@ -1965,9 +1965,8 @@ msgstr ""
 #: en/lb_config.1:410
 msgid ""
 "sets the file path that will be configured in the bootloader configuration "
-"for your netboot image. This defaults to /srv/debian-live in debian mode and "
-"to /srv/emebian-live when being in emdebian mode, and /srv/ubuntu-live when "
-"in ubuntu mode."
+"for your netboot image. This defaults to /srv/debian-live in debian mode, "
+"and /srv/ubuntu-live when in ubuntu mode."
 msgstr ""
 
 #. type: IP
diff --git a/manpages/pot/lb_source.1.pot b/manpages/pot/lb_source.1.pot
index c05c44465..be75f5645 100644
--- a/manpages/pot/lb_source.1.pot
+++ b/manpages/pot/lb_source.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-03-11 06:26+0100\n"
+"POT-Creation-Date: 2013-03-21 17:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2013-03-11"
+msgid "2013-03-21"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lb_testroot.1.pot b/manpages/pot/lb_testroot.1.pot
index 5a9c17ed6..7e6b2990b 100644
--- a/manpages/pot/lb_testroot.1.pot
+++ b/manpages/pot/lb_testroot.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-03-11 06:26+0100\n"
+"POT-Creation-Date: 2013-03-21 17:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2013-03-11"
+msgid "2013-03-21"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/live-build.7.pot b/manpages/pot/live-build.7.pot
index 0a04d28c8..fc0b2b821 100644
--- a/manpages/pot/live-build.7.pot
+++ b/manpages/pot/live-build.7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2013-03-11 06:26+0100\n"
+"POT-Creation-Date: 2013-03-21 17:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "2013-03-11"
+msgid "2013-03-21"
 msgstr ""
 
 #. type: TH
diff --git a/scripts/build/config b/scripts/build/config
index 60396253c..6d3e4dbd4 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -93,7 +93,7 @@ USAGE="${PROGRAM}   [--apt apt|aptitude]\n\
 \t    [--mirror-binary URL]\n\
 \t    [--mirror-binary-security URL]\n\
 \t    [--mirror-debian-installer URL]\n\
-\t    [--mode debian|emdebian|ubuntu]\n\
+\t    [--mode debian|ubuntu]\n\
 \t    [--system live|normal]\n\
 \t    [--net-root-filesystem nfs|cfs]\n\
 \t    [--net-root-mountoptions OPTIONS]\n\