Updating lb config --help and man page.

7 files changed, 1245 insertions, 784 deletions

diff --git a/manpages/de/lb_config.de.1 b/manpages/de/lb_config.de.1
index 647594b..d0fc2fc 100644
--- a/manpages/de/lb_config.de.1
+++ b/manpages/de/lb_config.de.1
@@ -14,7 +14,7 @@
 .\" FIXME
 \fBlb config\fP
 .br
-\fB	[\-\-apt\fP apt|aptitude]
+  [\fB\-\-apt\fP apt|aptitude]
 .br
   [\fB\-\-apt\-ftp\-proxy\fP \fIURL\fP]
 .br
@@ -68,9 +68,9 @@
 .br
   [\fB\-\-chroot\-filesystem\fP ext2|ext3|squashfs|plain|jffs2]
 .br
-  [\fB\-\-clean]\fP
+  [\fB\-\-clean\fP]
 .br
-\fB	[\-c|\-\-conffile\fP \fIFILE\fP]
+  [\-c|\fB\-\-conffile\fP \fIFILE\fP]
 .br
   [\fB\-\-debconf\-frontend\fP dialog|editor|noninteractive|readline]
 .br
@@ -86,14 +86,18 @@
 .br
   [\fB\-\-debian\-installer\-gui\fP true|false]
 .br
+  [\fB\-\-debug\fP]
+.br
   [\-d|\fB\-\-distribution\fP \fICODENAME\fP]
 .br
-  [\-\-\fBdump\fP]
+  [\fB\-\-dump\fP]
 .br
   [\-e|\fB\-\-encryption\fP false|aes128|aes192|aes256]
 .br
   [\fB\-\-fdisk\fP fdisk|fdisk.dist]
 .br
+  [\fB\-\-force\fP]
+.br
   [\fB\-\-grub\-splash\fP \fIFILE\fP]
 .br
   [\fB\-\-gzip\-options\fP \fIOPTION\fP|"\fIOPTIONS\fP"]
@@ -110,6 +114,8 @@
 .br
   [\fB\-\-interactive\fP shell]
 .br
+  [\fB\-\-isohybrid\-options\fP \fIOPTION\fP|"\fIOPTIONS\fP"]
+.br
   [\fB\-\-iso\-application\fP \fINAME\fP]
 .br
   [\fB\-\-iso\-preparer\fP \fINAME\fP]
@@ -134,13 +140,21 @@
 .br
   [\-m|\fB\-\-mirror\-bootstrap\fP \fIURL\fP]
 .br
+  [\fB\-\-mirror\-chroot\fP \fIURL\fP]
+.br
+  [\fB\-\-mirror\-chroot\-security\fP \fIURL\fP]
+.br
+  [\fB\-\-mirror\-chroot\-volatile\fP \fIURL\fP]
+.br
+  [\fB\-\-mirror\-chroot\-backports\fP \fIURL\fP]
+.br
   [\fB\-\-mirror\-binary\fP \fIURL\fP]
 .br
   [\fB\-\-mirror\-binary\-security\fP \fIURL\fP]
 .br
-  [\fB\-\-mirror\-chroot\fP \fIURL\fP]
+  [\fB\-\-mirror\-binary\-volatile\fP \fIURL\fP]
 .br
-  [\fB\-\-mirror\-chroot\-security\fP \fIURL\fP]
+  [\fB\-\-mirror\-binary\-backports\fP \fIURL\fP]
 .br
   [\fB\-\-mirror\-debian\-installer\fP \fIURL\fP]
 .br
@@ -168,7 +182,9 @@
 .br
   [\fB\-\-packages\fP \fIPACKAGE\fP|\fI"PACKAGES"\fP]
 .br
-  [\fB\-r, \-\-repositories \fP\fIREPOSITORY\fP|\fI"REPOSITORIES"\fP]
+  [\fB\-\-quiet\fP]
+.br
+  [\-r|\fB\-\-repositories \fP\fIREPOSITORY\fP|\fI"REPOSITORIES"\fP]
 .br
   [\fB\-\-root\-command\fP sudo]
 .br
@@ -198,14 +214,18 @@
 .br
   [\fB\-\-templates\fP \fIPATH\fP]
 .br
-  [\fB\-\-virtual\-root\-filesystem\fP ext3]
-.br
   [\fB\-\-virtual\-root\-size \fP\fIMB\fP]
 .br
+  [\fB\-\-volatile\fP true|false]
+.br
+  [\fB\-\-backports\fP true|false]
+.br
   [\fB\-\-exposed\-root\fP true|false]
 .br
   [\fB\-\-username\fP \fINAME\fP]
 .br
+  [\fB\-\-verbose\fP]
+.br
 .\" FIXME
   [\fB\-\-win32\-loader true|false]\fP
 
@@ -240,8 +260,7 @@ vollständige Liste aller allgemeinen live\-build Optionen.
 .\" FIXME
 .IP "\fB\-\-apt\fP apt|aptitude" 4
 defines if apt\-get or aptitude is used to install packages when building the
-image. When building etch images, this defaults to aptitude. Every other
-distribution defaults to apt.
+image. The default is apt.
 .IP "\fB\-\-apt\-ftp\-proxy\fP \fIURL\fP" 4
 sets the ftp proxy to be used by apt. By default, this is empty but if the
 host has the environment variable ftp_proxy set, apt\-ftp\-proxy gets
@@ -282,8 +301,10 @@ target architecture natively. For example, building amd64 images on i386 and
 vice versa is possile if you have a 64bit capable i386 processor and the
 right kernel. But building powerpc images on an i386 system is not possible.
 .IP "\-b|\fB\-\-binary\-images\fP iso|iso\-hybrid|net|tar|usb\-hdd" 4
-defines the image type to build. By default this is set to iso to build
-CD/DVD images, for squeeze and newer it defaults to iso\-hybrid.
+defines the image type to build. By default, for images using syslinux this
+is set to iso\-hybrid to build CD/DVD images that may also be used like
+usb\-hdd images, for legacy lenny and non\-syslinux images, it defaults to
+iso.
 .IP "\fB\-\-binary\-filesystem\fP fat16|fat32|ext2" 4
 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
@@ -416,9 +437,11 @@ for debian\-installer.
 defines if the debian\-installer graphical GTK interface should be true or
 not. In Debian mode and for most versions of Ubuntu, this option is true,
 whereas otherwise false, by default.
+.IP \fB\-\-debug\fP 4
+turn on debugging informational messages.
 .IP "\-d|\fB\-\-distribution\fP \fICODENAME\fP" 4
 defines the distribution of the resulting live system.
-.IP \-\-\fBdump\fP 4
+.IP \fB\-\-dump\fP 4
 prepares a report of the currently present live system configuration and the
 version of live\-build used. This is useful to provide if you submit bug
 reports, we do get all informations required for us to locate and replicate
@@ -429,6 +452,10 @@ is false.
 .IP "\fB\-\-fdisk\fP fdisk|fdisk.dist" 4
 sets the filename of the fdisk binary from the host system that should be
 used. This is autodetected and does generally not need any customization.
+.IP \fB\-\-force\fP 4
+forces re\-execution of already run stages. Use only if you know what you are
+doing. It is generally safer to use \fBlb clean\fP to clean up before
+re\-executing \fBlb build\fP.
 .IP "\fB\-\-grub\-splash\fP \fIFILE\fP" 4
 defines the name of an optional to be included splash screen graphic for the
 grub bootloader.
@@ -456,10 +483,9 @@ systems. By default, this is set to /usr/share/live/build/includes/.
 sets the name of package that contains the live system specific initramfs
 modification. By default, auto is used, which means that at build time of
 the image rather than on configuration time, the value will be expanded to
-casper when building etch systems or ubuntu systems, to live\-initramfs for
-all other systems up to squeeze, and to live\-boot for wheezy and
-newer. Using 'none' is usefull if the resulting system image should not be a
-live image (experimental).
+casper when building ubuntu systems, to live\-initramfs for legacy lenny, and
+to live\-boot for squeeze and newer. Using 'none' is useful if the resulting
+system image should not be a live image (experimental).
 .IP "\fB\-\-interactive\fP shell" 4
 defines if after the chroot stage and before the beginning of the binary
 stage, a interactive shell login should be spawned in the chroot in order to
@@ -470,6 +496,8 @@ should be present in all builds of a live system should be properly made
 through hooks. Everything else destroys the beauty of being able to
 completely automatise the build process and making it non interactive. By
 default, this is of course false.
+.IP "\fB\-\-isohybrid\-options\fP \fIOPTION\fP|\(dq\fIOPTIONS\fP\(dq" 4
+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
@@ -529,7 +557,24 @@ as secondary bootloader configuration. This is only available on amd64 and
 i386 and defaults to memtest86+.
 .IP "\-m|\fB\-\-mirror\-bootstrap\fP \fIURL\fP" 4
 sets the location of the debian package mirror that should be used to
-bootstrap from.
+bootstrap from. This defaults to http://ftp.de.debian.org/debian/ which may
+not be a good default if you live outside of Europe.
+.IP "\fB\-\-mirror\-chroot\fP \fIURL\fP" 4
+sets the location of the debian package mirror that will be used to fetch
+the packages in order to build the live system. By default, this is set to
+the value of \-\-mirror\-bootstrap.
+.IP "\fB\-\-mirror\-chroot\-security\fP \fIURL\fP" 4
+sets the location of the debian security package mirror that will be used to
+fetch the packages in order to build the live system. By default, this
+points to http://security.debian.org/debian/.
+.IP "\fB\-\-mirror\-chroot\-volatile\fP \fIURL\fP" 4
+sets the location of the debian volatile package mirror that will be used to
+fetch packages in order to build the live system. By default, this is set to
+the value of \-\-mirror\-chroot.
+.IP "\fB\-\-mirror\-chroot\-backports\fP \fIURL\fP" 4
+sets the location of the debian backports package mirror that will be used
+to fetch packages in order to build the live system. By default, this points
+to http://backports.debian.org/debian\-backports/.
 .IP "\fB\-\-mirror\-binary\fP \fIURL\fP" 4
 sets the location of the debian package mirror that should end up configured
 in the final image and which is the one a user would see and use. This has
@@ -538,21 +583,20 @@ use a local mirror but want to have an official mirror in the image. By
 default, 'http://cdn.debian.net/debian/' is used.
 .IP "\fB\-\-mirror\-binary\-security\fP \fIURL\fP" 4
 sets the location of the debian security package mirror that should end up
-configuered in the final image. By default,
+configured in the final image. By default,
 \&'http://cdn.debian.net/debian\-security/' is used.
-.IP "\fB\-\-mirror\-chroot\fP \fIURL\fP" 4
-sets the location of the debian package mirror that will be used to fetch
-the packages in order to build the live system. By default, this points to
-http://ftp.de.debian.org/debian/ which may not be a good default if you live
-outside the U.S.
-.IP "\fB\-\-mirror\-chroot\-security\fP \fIURL\fP" 4
-sets the location of the debian security package mirror that will be used to
-fetch the packages in order to build the live system. By default, this
-points to http://security.debian.org/debian/.
+.IP "\fB\-\-mirror\-binary\-volatile\fP \fIURL\fP" 4
+sets the location of the debian volatile package mirror that should end up
+configured in the final image. By default, the value of \-\-mirror\-binary is
+used.
+.IP "\fB\-\-mirror\-binary\-backports\fP \fIURL\fP" 4
+sets the location of the debian backports package mirror that should end up
+configured in the final image. By default,
+\&'http://backports.debian.org/debian\-backports/' is used.
 .IP "\fB\-\-mirror\-debian\-installer\fP \fIURL\fP" 4
 sets the location of the mirror that will be used to fetch the debian
 installer images. By default, this points to the same mirror used to build
-the live system.
+the live system, i.e. the value of \-\-mirror\-bootstrap.
 .IP "\fB\-\-mode\fP debian|emdebian|ubuntu" 4
 defines a global mode to load project specific defaults. By default this is
 set to debian.
@@ -607,7 +651,9 @@ 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\fP \fIREPOSITORY\fP|\(dq\fIREPOSITORIES\fP\(dq" 4
+.IP \fB\-\-quiet\fP 4
+reduces the verbosity of messages output by \fBlb build\fP.
+.IP "\-r|\fB\-\-repositories\fP \fIREPOSITORY\fP|\(dq\fIREPOSITORIES\fP\(dq" 4
 enables one of available third\-party repository configurations in
 /usr/share/live/build/repositories.
 .IP "\fB\-\-root\-command\fP sudo" 4
@@ -666,31 +712,41 @@ local packages lists should be used instead.
 .IP "\fB\-\-templates\fP \fIPATH\fP" 4
 sets the path to the templates that live\-build is going to use, e.g. for
 bootloaders. By default, this is set to /usr/share/live/build/templates/.
-.IP "\fB\-\-virtual\-root\-filesystem\fP ext3" 4
-defines what filesystem to format the root filesystem when building
-virtual\-hdd images.
 .IP "\fB\-\-virtual\-root\-size\fP MB" 4
 defines what size the virtual\-hdd image should be. Note that although the
 default is set to 10000 (= 10GB), it will not need 10GB space on your
 harddisk as the files are created as sparse files.
+.IP "\fB\-\-volatile\fP true|false" 4
+defines if debian volatile package archives should be included in the image
+or not.
+.IP "\fB\-\-backports\fP true|false" 4
+defines if debian backports package archives should be included in the image
+or not.
 .IP "\fB\-\-exposed\-root\fP true|false" 4
 defines whether to expose the root filesystem as read only and not covered
 by the union filesystem. This has useful implications for certain speciality
 setups such as LTSP. By default, this option is false.
 .IP "\fB\-\-username\fP \fINAME\fP" 4
 sets the name of the account of the default user in the live system.
+.IP \fB\-\-verbose\fP 4
+increases the verbosity of messages output by \fBlb build\fP.
 .IP "\fB\-\-win32\-loader true|false\fP" 4
 .\" FIXME
 defines if win32\-loader should be included in the binary image or not.
 
 .SH ENVIRONMENT
 .\" FIXME
-.\" FIXME
-All command line switches can also be specified through the corresponding
-environment variable. Environment variables are name LB_FOO, means,
-e.g. \-\-apt\-ftp\-proxy becomes LB_APT_FTP_PROXY. However, this generally
-should not be used.
+Currently, command line switches can also be specified through the
+corresponding environment variable. However, this generally should not be
+relied upon, as it is an implementation detail that is subject to change in
+future releases. For options applying directly to live\-build, environment
+variables are named LB_FOO, meaning, e.g. \fB\-\-apt\-ftp\-proxy\fP becomes
+LB_APT_FTP_PROXY (the exception being internal options such as
+\fB\-\-debug\fP). For options passed to another program, as in APT_OPTIONS or
+GZIP_OPTIONS, no LB_ prefix is used.
+
 
+.\" FIXME
 .SH DATEIEN
 .\" FIXME
 .IP \fBauto/config\fP 4
diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1
index e598054..1a017e3 100644
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -7,7 +7,7 @@
 \fBlb config\fR [\fIlive\-build options\fR]
 .PP
 .\" FIXME
-\fBlb config\fB
+\fBlb config\fR
 .br
 	[\fB\-\-apt\fR apt|aptitude]
 .br
@@ -63,7 +63,7 @@
 .br
 	[\fB\-\-chroot\-filesystem\fR ext2|ext3|squashfs|plain|jffs2]
 .br
-	[\fB\-\-clean]
+	[\fB\-\-clean\fR]
 .br
 	[\-c|\fB\-\-conffile\fR \fIFILE\fR]
 .br
@@ -81,14 +81,18 @@
 .br
 	[\fB\-\-debian\-installer\-gui\fR true|false]
 .br
+	[\fB\-\-debug\fR]
+.br
 	[\-d|\fB\-\-distribution\fR \fICODENAME\fR]
 .br
-	[\-\-\fBdump\fR]
+	[\fB\-\-dump\fR]
 .br
 	[\-e|\fB\-\-encryption\fR false|aes128|aes192|aes256]
 .br
 	[\fB\-\-fdisk\fR fdisk|fdisk.dist]
 .br
+	[\fB\-\-force\fR]
+.br
 	[\fB\-\-grub\-splash\fR \fIFILE\fR]
 .br
 	[\fB\-\-gzip\-options\fR \fIOPTION\fR|"\fIOPTIONS\fR"]
@@ -105,6 +109,8 @@
 .br
 	[\fB\-\-interactive\fR shell]
 .br
+	[\fB\-\-isohybrid\-options\fR \fIOPTION\fR|"\fIOPTIONS\fR"]
+.br
 	[\fB\-\-iso\-application\fR \fINAME\fR]
 .br
 	[\fB\-\-iso\-preparer\fR \fINAME\fR]
@@ -129,13 +135,21 @@
 .br
 	[\-m|\fB\-\-mirror\-bootstrap\fR \fIURL\fR]
 .br
+	[\fB\-\-mirror\-chroot\fR \fIURL\fR]
+.br
+	[\fB\-\-mirror\-chroot\-security\fR \fIURL\fR]
+.br
+	[\fB\-\-mirror\-chroot\-volatile\fR \fIURL\fR]
+.br
+	[\fB\-\-mirror\-chroot\-backports\fR \fIURL\fR]
+.br
 	[\fB\-\-mirror\-binary\fR \fIURL\fR]
 .br
 	[\fB\-\-mirror\-binary\-security\fR \fIURL\fR]
 .br
-	[\fB\-\-mirror\-chroot\fR \fIURL\fR]
+	[\fB\-\-mirror\-binary\-volatile\fR \fIURL\fR]
 .br
-	[\fB\-\-mirror\-chroot\-security\fR \fIURL\fR]
+	[\fB\-\-mirror\-binary\-backports\fR \fIURL\fR]
 .br
 	[\fB\-\-mirror\-debian\-installer\fR \fIURL\fR]
 .br
@@ -163,7 +177,9 @@
 .br
 	[\fB\-\-packages\fR \fIPACKAGE\fR|\fI"PACKAGES"\fR]
 .br
-	[\fB\-r, \-\-repositories \fIREPOSITORY\fR|\fI"REPOSITORIES"\fR]
+	[\fB\-\-quiet\fR]
+.br
+	[\-r|\fB\-\-repositories \fIREPOSITORY\fR|\fI"REPOSITORIES"\fR]
 .br
 	[\fB\-\-root-command\fR sudo]
 .br
@@ -193,14 +209,18 @@
 .br
 	[\fB\-\-templates\fR \fIPATH\fR]
 .br
-	[\fB\-\-virtual\-root\-filesystem\fR ext3]
-.br
 	[\fB\-\-virtual\-root\-size \fIMB\fR]
 .br
+	[\fB\-\-volatile\fR true|false]
+.br
+	[\fB\-\-backports\fR true|false]
+.br
 	[\fB\-\-exposed\-root\fR true|false]
 .br
 	[\fB\-\-username\fR \fINAME\fR]
 .br
+	[\fB\-\-verbose\fR]
+.br
 	[\fB\-\-win32\-loader true|false]
 .\" FIXME
 
@@ -218,7 +238,7 @@ In addition to its specific options \fBlb config\fR understands all generic live
 .PP
 .\" FIXME
 .IP "\fB\-\-apt\fR apt|aptitude" 4
-defines if apt\-get or aptitude is used to install packages when building the image. When building etch images, this defaults to aptitude. Every other distribution defaults to apt.
+defines if apt\-get or aptitude is used to install packages when building the image. The default is apt.
 .IP "\fB\-\-apt\-ftp\-proxy\fR \fIURL\fR" 4
 sets the ftp proxy to be used by apt. By default, this is empty but if the host has the environment variable ftp_proxy set, apt\-ftp\-proxy gets automatically set to the value of ftp_proxy.
 .IP "\fB\-\-apt\-http\-proxy\fR \fIURL\fR" 4
@@ -238,7 +258,7 @@ defines if apt should check repository signatures. This is true by default.
 .IP "\-a|\fB\-\-architecture\fR \fIARCHITECTURE\fR" 4
 defines the architecture of the to be build image. By default, this is set to the host architecture. Note that you cannot crossbuild for another architecture if your host system is not able to execute binaries for the target architecture natively. For example, building amd64 images on i386 and vice versa is possile if you have a 64bit capable i386 processor and the right kernel. But building powerpc images on an i386 system is not possible.
 .IP "\-b|\fB\-\-binary\-images\fR iso|iso\-hybrid|net|tar|usb\-hdd" 4
-defines the image type to build. By default this is set to iso to build CD/DVD images, for squeeze and newer it defaults to iso\-hybrid.
+defines the image type to build. By default, for images using syslinux this is set to iso\-hybrid to build CD/DVD images that may also be used like usb\-hdd images, for legacy lenny and non\-syslinux images, it defaults to iso.
 .IP "\fB\-\-binary\-filesystem\fR fat16|fat32|ext2" 4
 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
@@ -289,14 +309,18 @@ defines the distribution where the debian\-installer files should be taken out f
 sets the filename or URL for an optionally used and included preseeding file for debian\-installer.
 .IP "\fB\-\-debian\-installer\-gui\fR true|false" 4
 defines if the debian\-installer graphical GTK interface should be true or not. In Debian mode and for most versions of Ubuntu, this option is true, whereas otherwise false, by default.
+.IP "\fB\-\-debug\fR" 4
+turn on debugging informational messages.
 .IP "\-d|\fB\-\-distribution\fR \fICODENAME\fR" 4
 defines the distribution of the resulting live system.
-.IP "\-\-\fBdump\fR" 4
+.IP "\fB\-\-dump\fR" 4
 prepares a report of the currently present live system configuration and the version of live\-build used. This is useful to provide if you submit bug reports, we do get all informations required for us to locate and replicate an error.
 .IP "\-e|\fB\-\-encryption\fR false|aes128|aes192|aes256" 4
 defines if the root filesystem should be encrypted or not. By default, this is false.
 .IP "\fB\-\-fdisk\fR fdisk|fdisk.dist" 4
 sets the filename of the fdisk binary from the host system that should be used. This is autodetected and does generally not need any customization.
+.IP "\fB\-\-force\fR" 4
+forces re\-execution of already run stages. Use only if you know what you are doing. It is generally safer to use \fBlb clean\fR to clean up before re\-executing \fBlb build\fR.
 .IP "\fB\-\-grub\-splash\fR \fIFILE\fR" 4
 defines the name of an optional to be included splash screen graphic for the grub bootloader.
 .IP "\fB\-\-gzip\-options\fR \fIOPTION\fR|""\fIOPTIONS\fR""" 4
@@ -310,9 +334,11 @@ sets the hostname of the live system.
 .IP "\fB\-\-includes\fR \fIPATH\fR" 4
 sets the path to the includes that live\-build is going to use, e.g. additional minimal documentation that you want to have on all live systems. By default, this is set to /usr/share/live/build/includes/.
 .IP "\fB\-\-initramfs\fR auto|none|live\-boot|live\-initramfs|casper" 4
-sets the name of package that contains the live system specific initramfs modification. By default, auto is used, which means that at build time of the image rather than on configuration time, the value will be expanded to casper when building etch systems or ubuntu systems, to live\-initramfs for all other systems up to squeeze, and to live\-boot for wheezy and newer. Using 'none' is usefull if the resulting system image should not be a live image (experimental).
+sets the name of package that contains the live system specific initramfs modification. By default, auto is used, which means that at build time of the image rather than on configuration time, the value will be expanded to casper when building ubuntu systems, to live\-initramfs for legacy lenny, and to live\-boot for squeeze and newer. Using 'none' is useful if the resulting system image should not be a live image (experimental).
 .IP "\fB\-\-interactive\fR shell" 4
 defines if after the chroot stage and before the beginning of the binary stage, a interactive shell login should be spawned in the chroot in order to allow you to do manual customizations. Once you close the shell with logout or exit, the build will continue as usual. Note that it's strongly discouraged to use this for anything else than testing. Modifications that should be present in all builds of a live system should be properly made through hooks. Everything else destroys the beauty of being able to completely automatise the build process and making it non interactive. By default, this is of course false.
+.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.
 .IP "\fB\-\-iso\-preparer\fR \fINAME\fR" 4
@@ -336,17 +362,25 @@ sets the filename of the losetup binary from the host system that should be used
 .IP "\fB\-\-memtest\fR memtest86+|memtest86|none" 4
 defines if memtest, memtest86+ or no memory tester at all should be included as secondary bootloader configuration. This is only available on amd64 and i386 and defaults to memtest86+.
 .IP "\-m|\fB\-\-mirror\-bootstrap\fR \fIURL\fR" 4
-sets the location of the debian package mirror that should be used to bootstrap from.
-.IP "\fB\-\-mirror\-binary\fR \fIURL\fR" 4
-sets the location of the debian package mirror that should end up configured in the final image and which is the one a user would see and use. This has not necessarily to be the same that is used to build the image, e.g. if you use a local mirror but want to have an official mirror in the image. By default, 'http://cdn.debian.net/debian/' is used.
-.IP "\fB\-\-mirror\-binary\-security\fR \fIURL\fR" 4
-sets the location of the debian security package mirror that should end up configuered in the final image. By default, 'http://cdn.debian.net/debian-security/' is used.
+sets the location of the debian package mirror that should be used to bootstrap from. This defaults to http://ftp.de.debian.org/debian/ which may not be a good default if you live outside of Europe.
 .IP "\fB\-\-mirror\-chroot\fR \fIURL\fR" 4
-sets the location of the debian package mirror that will be used to fetch the packages in order to build the live system. By default, this points to http://ftp.de.debian.org/debian/ which may not be a good default if you live outside the U.S.
+sets the location of the debian package mirror that will be used to fetch the packages in order to build the live system. By default, this is set to the value of \-\-mirror\-bootstrap.
 .IP "\fB\-\-mirror\-chroot\-security\fR \fIURL\fR" 4
 sets the location of the debian security package mirror that will be used to fetch the packages in order to build the live system. By default, this points to http://security.debian.org/debian/.
+.IP "\fB\-\-mirror\-chroot\-volatile\fR \fIURL\fR" 4
+sets the location of the debian volatile package mirror that will be used to fetch packages in order to build the live system. By default, this is set to the value of \-\-mirror\-chroot.
+.IP "\fB\-\-mirror\-chroot\-backports\fR \fIURL\fR" 4
+sets the location of the debian backports package mirror that will be used to fetch packages in order to build the live system. By default, this points to http://backports.debian.org/debian-backports/.
+.IP "\fB\-\-mirror\-binary\fR \fIURL\fR" 4
+sets the location of the debian package mirror that should end up configured in the final image and which is the one a user would see and use. This has not necessarily to be the same that is used to build the image, e.g. if you use a local mirror but want to have an official mirror in the image. By default, 'http://cdn.debian.net/debian/' is used.
+.IP "\fB\-\-mirror\-binary\-security\fR \fIURL\fR" 4
+sets the location of the debian security package mirror that should end up configured in the final image. By default, 'http://cdn.debian.net/debian-security/' is used.
+.IP "\fB\-\-mirror\-binary\-volatile\fR \fIURL\fR" 4
+sets the location of the debian volatile package mirror that should end up configured in the final image. By default, the value of \-\-mirror\-binary is used.
+.IP "\fB\-\-mirror\-binary\-backports\fR \fIURL\fR" 4
+sets the location of the debian backports package mirror that should end up configured in the final image. By default, 'http://backports.debian.org/debian-backports/' is used.
 .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. By default, this points to the same mirror used to build the live system.
+sets the location of the mirror that will be used to fetch the debian installer images. 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|ubuntu" 4
 defines a global mode to load project specific defaults. By default this is set to debian.
 .IP "\fB\-\-net\-root\-filesystem\fR nfs|cfs" 4
@@ -378,7 +412,9 @@ defines the format of the netboot image. Choosing tar results in a not compresse
 defines which lists available in /usr/share/live/build/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|""\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|""\fIREPOSITORIES\fR""" 4
+.IP "\fB\-\-quiet\fR" 4
+reduces the verbosity of messages output by \fBlb build\fR.
+.IP "-r|\fB\-\-repositories\fR \fIREPOSITORY\fR|""\fIREPOSITORIES\fR""" 4
 enables one of available third-party repository configurations in /usr/share/live/build/repositories.
 .IP "\fB\-\-root-command\fR sudo" 4
 controls if live\-build 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\-build command with sudo itself.
@@ -408,22 +444,26 @@ selects which program is used to install tasks. By default, this is set to tasks
 defines one or more package tasks to be installed in the live system. This is a quick and convenient way to get a reasonable default selection of packages suitable for most users when building an image, but it results in quite big images. If you want to have finer grained package selections,  local packages lists should be used instead.
 .IP "\fB\-\-templates\fR \fIPATH\fR" 4
 sets the path to the templates that live\-build is going to use, e.g. for bootloaders. By default, this is set to /usr/share/live/build/templates/.
-.IP "\fB\-\-virtual\-root\-filesystem\fR ext3" 4
-defines what filesystem to format the root filesystem when building virtual\-hdd images.
 .IP "\fB\-\-virtual\-root\-size\fR MB" 4
 defines what size the virtual\-hdd image should be. Note that although the default is set to 10000 (= 10GB), it will not need 10GB space on your harddisk as the files are created as sparse files.
+.IP "\fB\-\-volatile\fR true|false" 4
+defines if debian volatile package archives should be included in the image or not.
+.IP "\fB\-\-backports\fR true|false" 4
+defines if debian backports package archives should be included in the image or not.
 .IP "\fB\-\-exposed\-root\fR true|false" 4
 defines whether to expose the root filesystem as read only and not covered by the union filesystem. This has useful implications for certain speciality setups such as LTSP. By default, this option is false.
 .IP "\fB\-\-username\fR \fINAME\fR" 4
 sets the name of the account of the default user in the live system.
+.IP "\fB\-\-verbose\fR" 4
+increases the verbosity of messages output by \fBlb build\fR.
 .IP "\fB\-\-win32\-loader true|false" 4
 defines if win32\-loader should be included in the binary image or not.
 .\" FIXME
 
 .SH ENVIRONMENT
 .\" FIXME
-All command line switches can also be specified through the corresponding environment variable. Environment variables are name LB_FOO, means, e.g. \-\-apt\-ftp\-proxy becomes LB_APT_FTP_PROXY. However, this generally should not be used.
-.\" FIXME
+Currently, command line switches can also be specified through the corresponding environment variable. However, this generally should not be relied upon, as it is an implementation detail that is subject to change in future releases. For options applying directly to live\-build, environment variables are named LB_FOO, meaning, e.g. \fB\-\-apt\-ftp\-proxy\fR becomes LB_APT_FTP_PROXY (the exception being internal options such as \fB\-\-debug\fR). For options passed to another program, as in APT_OPTIONS or GZIP_OPTIONS, no LB_ prefix is used.
+\" FIXME
 
 .SH FILES
 .\" FIXME
diff --git a/manpages/po/de/lb_config.1.po b/manpages/po/de/lb_config.1.po
index ebe4b5b..e40b1a5 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 2.0.7\n"
-"POT-Creation-Date: 2010-11-29 23:13+0100\n"
+"POT-Creation-Date: 2010-12-05 16:39-0400\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -251,7 +251,7 @@ msgstr "ÜBERSICHT"
 #: en/lb_chroot_proc.1:9 en/lb_chroot_resolv.1:9 en/lb_chroot_selinuxfs.1:9
 #: en/lb_chroot_sources.1:9 en/lb_chroot_symlinks.1:9 en/lb_chroot_sysfs.1:9
 #: en/lb_chroot_sysv-rc.1:9 en/lb_chroot_sysvinit.1:9 en/lb_chroot_tasks.1:9
-#: en/lb_chroot_upstart.1:9 en/lb_clean.1:9 en/lb_config.1:207 en/lb_local.1:9
+#: en/lb_chroot_upstart.1:9 en/lb_clean.1:9 en/lb_config.1:227 en/lb_local.1:9
 #: en/lb_source.1:9 en/lb_source_checksums.1:9 en/lb_source_debian-live.1:9
 #: en/lb_source_debian.1:9 en/lb_source_disk.1:9 en/lb_source_iso.1:9
 #: en/lb_source_net.1:9 en/lb_source_tar.1:9 en/lb_source_usb.1:9
@@ -289,7 +289,7 @@ msgstr "BESCHREIBUNG"
 #: en/lb_chroot_symlinks.1:14 en/lb_chroot_sysfs.1:14
 #: en/lb_chroot_sysv-rc.1:14 en/lb_chroot_sysvinit.1:14
 #: en/lb_chroot_tasks.1:14 en/lb_chroot_upstart.1:14 en/lb_clean.1:16
-#: en/lb_config.1:216 en/lb_local.1:14 en/lb_source.1:14
+#: en/lb_config.1:236 en/lb_local.1:14 en/lb_source.1:14
 #: en/lb_source_checksums.1:14 en/lb_source_debian-live.1:14
 #: en/lb_source_debian.1:14 en/lb_source_disk.1:14 en/lb_source_iso.1:14
 #: en/lb_source_net.1:14 en/lb_source_tar.1:14 en/lb_source_usb.1:14
@@ -327,7 +327,7 @@ msgstr "OPTIONEN"
 #: en/lb_chroot_symlinks.1:17 en/lb_chroot_sysfs.1:17
 #: en/lb_chroot_sysv-rc.1:17 en/lb_chroot_sysvinit.1:17
 #: en/lb_chroot_tasks.1:17 en/lb_chroot_upstart.1:17 en/lb_clean.1:38
-#: en/lb_config.1:428 en/lb_local.1:17 en/lb_source.1:17
+#: en/lb_config.1:468 en/lb_local.1:17 en/lb_source.1:17
 #: en/lb_source_checksums.1:17 en/lb_source_debian-live.1:17
 #: en/lb_source_debian.1:17 en/lb_source_disk.1:17 en/lb_source_iso.1:17
 #: en/lb_source_net.1:17 en/lb_source_tar.1:17 en/lb_source_usb.1:17
@@ -366,7 +366,7 @@ msgstr "DATEIEN"
 #: en/lb_chroot_symlinks.1:21 en/lb_chroot_sysfs.1:21
 #: en/lb_chroot_sysv-rc.1:21 en/lb_chroot_sysvinit.1:21
 #: en/lb_chroot_tasks.1:21 en/lb_chroot_upstart.1:21 en/lb_clean.1:43
-#: en/lb_config.1:435 en/lb_local.1:20 en/lb_source.1:20
+#: en/lb_config.1:475 en/lb_local.1:20 en/lb_source.1:20
 #: en/lb_source_checksums.1:21 en/lb_source_debian-live.1:21
 #: en/lb_source_debian.1:21 en/lb_source_disk.1:21 en/lb_source_iso.1:21
 #: en/lb_source_net.1:21 en/lb_source_tar.1:21 en/lb_source_usb.1:21
@@ -404,7 +404,7 @@ msgstr "SIEHE AUCH"
 #: en/lb_chroot_symlinks.1:23 en/lb_chroot_sysfs.1:23
 #: en/lb_chroot_sysv-rc.1:23 en/lb_chroot_sysvinit.1:23
 #: en/lb_chroot_tasks.1:23 en/lb_chroot_upstart.1:23 en/lb_clean.1:45
-#: en/lb_config.1:437 en/lb_local.1:22 en/lb_source.1:22
+#: en/lb_config.1:477 en/lb_local.1:22 en/lb_source.1:22
 #: en/lb_source_checksums.1:23 en/lb_source_debian-live.1:23
 #: en/lb_source_debian.1:23 en/lb_source_disk.1:23 en/lb_source_iso.1:23
 #: en/lb_source_net.1:23 en/lb_source_tar.1:23 en/lb_source_usb.1:23
@@ -441,7 +441,7 @@ msgstr "I<live-build>(7)"
 #: en/lb_chroot_symlinks.1:25 en/lb_chroot_sysfs.1:25
 #: en/lb_chroot_sysv-rc.1:25 en/lb_chroot_sysvinit.1:25
 #: en/lb_chroot_tasks.1:25 en/lb_chroot_upstart.1:25 en/lb_clean.1:47
-#: en/lb_config.1:439 en/lb_local.1:24 en/lb_source.1:24
+#: en/lb_config.1:479 en/lb_local.1:24 en/lb_source.1:24
 #: en/lb_source_checksums.1:25 en/lb_source_debian-live.1:25
 #: en/lb_source_debian.1:25 en/lb_source_disk.1:25 en/lb_source_iso.1:25
 #: en/lb_source_net.1:25 en/lb_source_tar.1:25 en/lb_source_usb.1:25
@@ -478,7 +478,7 @@ msgstr "Dieses Programm ist Teil von live-build."
 #: en/lb_chroot_symlinks.1:26 en/lb_chroot_sysfs.1:26
 #: en/lb_chroot_sysv-rc.1:26 en/lb_chroot_sysvinit.1:26
 #: en/lb_chroot_tasks.1:26 en/lb_chroot_upstart.1:26 en/lb_clean.1:48
-#: en/lb_config.1:440 en/lb_local.1:25 en/lb_source.1:25
+#: en/lb_config.1:480 en/lb_local.1:25 en/lb_source.1:25
 #: en/lb_source_checksums.1:26 en/lb_source_debian-live.1:26
 #: en/lb_source_debian.1:26 en/lb_source_disk.1:26 en/lb_source_iso.1:26
 #: en/lb_source_net.1:26 en/lb_source_tar.1:26 en/lb_source_usb.1:26
@@ -516,7 +516,7 @@ msgstr "HOMEPAGE"
 #: en/lb_chroot_symlinks.1:28 en/lb_chroot_sysfs.1:28
 #: en/lb_chroot_sysv-rc.1:28 en/lb_chroot_sysvinit.1:28
 #: en/lb_chroot_tasks.1:28 en/lb_chroot_upstart.1:28 en/lb_clean.1:50
-#: en/lb_config.1:442 en/lb_local.1:27 en/lb_source.1:27
+#: en/lb_config.1:482 en/lb_local.1:27 en/lb_source.1:27
 #: en/lb_source_checksums.1:28 en/lb_source_debian-live.1:28
 #: en/lb_source_debian.1:28 en/lb_source_disk.1:28 en/lb_source_iso.1:28
 #: en/lb_source_net.1:28 en/lb_source_tar.1:28 en/lb_source_usb.1:28
@@ -559,7 +559,7 @@ msgstr ""
 #: en/lb_chroot_symlinks.1:29 en/lb_chroot_sysfs.1:29
 #: en/lb_chroot_sysv-rc.1:29 en/lb_chroot_sysvinit.1:29
 #: en/lb_chroot_tasks.1:29 en/lb_chroot_upstart.1:29 en/lb_clean.1:51
-#: en/lb_config.1:443 en/lb_local.1:28 en/lb_source.1:28
+#: en/lb_config.1:483 en/lb_local.1:28 en/lb_source.1:28
 #: en/lb_source_checksums.1:29 en/lb_source_debian-live.1:29
 #: en/lb_source_debian.1:29 en/lb_source_disk.1:29 en/lb_source_iso.1:29
 #: en/lb_source_net.1:29 en/lb_source_tar.1:29 en/lb_source_usb.1:29
@@ -597,7 +597,7 @@ msgstr "FEHLER"
 #: en/lb_chroot_symlinks.1:31 en/lb_chroot_sysfs.1:31
 #: en/lb_chroot_sysv-rc.1:31 en/lb_chroot_sysvinit.1:31
 #: en/lb_chroot_tasks.1:31 en/lb_chroot_upstart.1:31 en/lb_clean.1:53
-#: en/lb_config.1:445 en/lb_local.1:30 en/lb_source.1:30
+#: en/lb_config.1:485 en/lb_local.1:30 en/lb_source.1:30
 #: en/lb_source_checksums.1:31 en/lb_source_debian-live.1:31
 #: en/lb_source_debian.1:31 en/lb_source_disk.1:31 en/lb_source_iso.1:31
 #: en/lb_source_net.1:31 en/lb_source_tar.1:31 en/lb_source_usb.1:31
@@ -643,7 +643,7 @@ msgstr ""
 #: en/lb_chroot_symlinks.1:32 en/lb_chroot_sysfs.1:32
 #: en/lb_chroot_sysv-rc.1:32 en/lb_chroot_sysvinit.1:32
 #: en/lb_chroot_tasks.1:32 en/lb_chroot_upstart.1:32 en/lb_clean.1:54
-#: en/lb_config.1:446 en/lb_local.1:31 en/lb_source.1:31
+#: en/lb_config.1:486 en/lb_local.1:31 en/lb_source.1:31
 #: en/lb_source_checksums.1:32 en/lb_source_debian-live.1:32
 #: en/lb_source_debian.1:32 en/lb_source_disk.1:32 en/lb_source_iso.1:32
 #: en/lb_source_net.1:32 en/lb_source_tar.1:32 en/lb_source_usb.1:32
@@ -681,7 +681,7 @@ msgstr "AUTOR"
 #: en/lb_chroot_symlinks.1:33 en/lb_chroot_sysfs.1:33
 #: en/lb_chroot_sysv-rc.1:33 en/lb_chroot_sysvinit.1:33
 #: en/lb_chroot_tasks.1:33 en/lb_chroot_upstart.1:33 en/lb_clean.1:55
-#: en/lb_config.1:447 en/lb_local.1:32 en/lb_source.1:32
+#: en/lb_config.1:487 en/lb_local.1:32 en/lb_source.1:32
 #: en/lb_source_checksums.1:33 en/lb_source_debian-live.1:33
 #: en/lb_source_debian.1:33 en/lb_source_disk.1:33 en/lb_source_iso.1:33
 #: en/lb_source_net.1:33 en/lb_source_tar.1:33 en/lb_source_usb.1:33
@@ -711,7 +711,7 @@ msgstr "B<lb config>"
 
 #. type: Plain text
 #: en/lb_config.1:13
-msgid "B<\t[--apt> apt|aptitude]"
+msgid "  [B<--apt> apt|aptitude]"
 msgstr ""
 
 #. type: Plain text
@@ -846,12 +846,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:67
-msgid "  [B<--clean]>"
+msgid "  [B<--clean>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:69
-msgid "B<\t[-c|--conffile> I<FILE>]"
+msgid "  [-c|B<--conffile> I<FILE>]"
 msgstr ""
 
 #. type: Plain text
@@ -892,312 +892,368 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:85
-msgid "  [-d|B<--distribution> I<CODENAME>]"
+msgid "  [B<--debug>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:87
-msgid "  [--B<dump>]"
+msgid "  [-d|B<--distribution> I<CODENAME>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:89
-msgid "  [-e|B<--encryption> false|aes128|aes192|aes256]"
+msgid "  [B<--dump>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:91
-msgid "  [B<--fdisk> fdisk|fdisk.dist]"
+msgid "  [-e|B<--encryption> false|aes128|aes192|aes256]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:93
-msgid "  [B<--grub-splash> I<FILE>]"
+msgid "  [B<--fdisk> fdisk|fdisk.dist]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:95
-msgid "  [B<--gzip-options> I<OPTION>|\"I<OPTIONS>\"]"
-msgstr ""
+#, fuzzy
+#| msgid "B<--source>"
+msgid "  [B<--force>]"
+msgstr "B<--source>"
 
 #. type: Plain text
 #: en/lb_config.1:97
-msgid "  [B<--hooks> I<FILE>]"
+msgid "  [B<--grub-splash> I<FILE>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:99
-msgid "  [B<--hostname> I<NAME>]"
+msgid "  [B<--gzip-options> I<OPTION>|\"I<OPTIONS>\"]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:101
-msgid "  [B<--ignore-system-defaults>]"
+msgid "  [B<--hooks> I<FILE>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:103
-msgid "  [B<--includes> I<PATH>]"
+msgid "  [B<--hostname> I<NAME>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:105
-msgid "  [B<--initramfs> auto|none|live-boot|live-initramfs|casper]"
+msgid "  [B<--ignore-system-defaults>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:107
-msgid "  [B<--interactive> shell]"
+msgid "  [B<--includes> I<PATH>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:109
-msgid "  [B<--iso-application> I<NAME>]"
+msgid "  [B<--initramfs> auto|none|live-boot|live-initramfs|casper]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:111
-msgid "  [B<--iso-preparer> I<NAME>]"
+msgid "  [B<--interactive> shell]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:113
-msgid "  [B<--iso-publisher> I<NAME>]"
+msgid "  [B<--isohybrid-options> I<OPTION>|\"I<OPTIONS>\"]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:115
-msgid "  [B<--iso-volume> I<NAME>]"
+msgid "  [B<--iso-application> I<NAME>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:117
-msgid "  [B<--jffs2-eraseblock> I<SIZE>]"
+msgid "  [B<--iso-preparer> I<NAME>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:119
-msgid "  [B<--keyring-packages> I<PACKAGE|\"PACKAGES\">]"
+msgid "  [B<--iso-publisher> I<NAME>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:121
-msgid "  [-l|B<--language> I<LANGUAGE>]"
+msgid "  [B<--iso-volume> I<NAME>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:123
-msgid "  [-k|B<--linux-flavours> I<FLAVOUR>|I<\"FLAVOURS\">]"
+msgid "  [B<--jffs2-eraseblock> I<SIZE>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:125
-msgid "  [B<--linux-packages> I<\"PACKAGES\">]"
+msgid "  [B<--keyring-packages> I<PACKAGE|\"PACKAGES\">]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:127
-msgid "  [B<--losetup> losetup|losetup.orig]"
+msgid "  [-l|B<--language> I<LANGUAGE>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:129
-msgid "  [B<--memtest> memtest86+|memtest86|none]"
+msgid "  [-k|B<--linux-flavours> I<FLAVOUR>|I<\"FLAVOURS\">]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:131
-msgid "  [-m|B<--mirror-bootstrap> I<URL>]"
+msgid "  [B<--linux-packages> I<\"PACKAGES\">]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:133
-msgid "  [B<--mirror-binary> I<URL>]"
+msgid "  [B<--losetup> losetup|losetup.orig]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:135
-msgid "  [B<--mirror-binary-security> I<URL>]"
+msgid "  [B<--memtest> memtest86+|memtest86|none]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:137
-msgid "  [B<--mirror-chroot> I<URL>]"
+msgid "  [-m|B<--mirror-bootstrap> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:139
-msgid "  [B<--mirror-chroot-security> I<URL>]"
+msgid "  [B<--mirror-chroot> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:141
-msgid "  [B<--mirror-debian-installer> I<URL>]"
+msgid "  [B<--mirror-chroot-security> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:143
-msgid "  [B<--mode> debian|emdebian|ubuntu]"
+msgid "  [B<--mirror-chroot-volatile> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:145
-msgid "  [B<--net-root-filesystem> nfs|cfs]"
+msgid "  [B<--mirror-chroot-backports> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:147
-msgid "  [B<--net-root-mountoptions> I<OPTIONS>]"
+msgid "  [B<--mirror-binary> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:149
-msgid "  [B<--net-root-path> I<PATH>]"
+msgid "  [B<--mirror-binary-security> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:151
-msgid "  [B<--net-root-server> I<IP>|I<HOSTNAME>]"
+msgid "  [B<--mirror-binary-volatile> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:153
-msgid "  [B<--net-cow-filesystem> nfs|cfs]"
+msgid "  [B<--mirror-binary-backports> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:155
-msgid "  [B<--net-cow-mountoptions> I<OPTIONS>]"
+msgid "  [B<--mirror-debian-installer> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:157
-msgid "  [B<--net-cow-path> I<PATH>]"
+msgid "  [B<--mode> debian|emdebian|ubuntu]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:159
-msgid "  [B<--net-cow-server> I<IP>|I<HOSTNAME>]"
+msgid "  [B<--net-root-filesystem> nfs|cfs]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:161
-msgid "  [B<--net-tarball> bzip2|gzip|tar|none]"
+msgid "  [B<--net-root-mountoptions> I<OPTIONS>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:163
-msgid "  [-p|B<--packages-lists> I<LIST>|I<\"LISTS\">]"
+msgid "  [B<--net-root-path> I<PATH>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:165
-msgid "  [B<--packages> I<PACKAGE>|I<\"PACKAGES\">]"
+msgid "  [B<--net-root-server> I<IP>|I<HOSTNAME>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:167
-msgid "  [B<-r, --repositories >I<REPOSITORY>|I<\"REPOSITORIES\">]"
+msgid "  [B<--net-cow-filesystem> nfs|cfs]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:169
-msgid "  [B<--root-command> sudo]"
+msgid "  [B<--net-cow-mountoptions> I<OPTIONS>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:171
-msgid "  [B<--use-fakeroot> true|false]"
+msgid "  [B<--net-cow-path> I<PATH>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:173
-msgid "  [B<--archive-areas> I<ARCHIVE_AREA>|I<\"ARCHIVE_AREAS\">]"
+msgid "  [B<--net-cow-server> I<IP>|I<HOSTNAME>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:175
-msgid "  [B<--security> true|false]"
+msgid "  [B<--net-tarball> bzip2|gzip|tar|none]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:177
-msgid "  [B<--source> true|false]"
+msgid "  [-p|B<--packages-lists> I<LIST>|I<\"LISTS\">]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:179
-msgid "  [-s|B<--source-images> iso|net|tar|usb-hdd]"
+msgid "  [B<--packages> I<PACKAGE>|I<\"PACKAGES\">]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:181
-msgid "  [B<--symlinks> true|false]"
-msgstr ""
+#, fuzzy
+#| msgid "B<--source>"
+msgid "  [B<--quiet>]"
+msgstr "B<--source>"
 
 #. type: Plain text
 #: en/lb_config.1:183
-msgid "  [B<--syslinux-splash> I<FILE>]"
+msgid "  [-r|B<--repositories >I<REPOSITORY>|I<\"REPOSITORIES\">]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:185
-msgid "  [B<--syslinux-timeout> I<SECONDS>]"
+msgid "  [B<--root-command> sudo]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:187
-msgid "  [B<--syslinux-menu> true|false]"
+msgid "  [B<--use-fakeroot> true|false]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:189
-msgid "  [B<--sysvinit> true|false]"
+msgid "  [B<--archive-areas> I<ARCHIVE_AREA>|I<\"ARCHIVE_AREAS\">]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:191
-msgid "  [B<--tasksel> aptitude|tasksel]"
+msgid "  [B<--security> true|false]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:193
-msgid "  [B<--tasks> I<TASK>|\"I<TASKS>\"]"
+msgid "  [B<--source> true|false]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:195
-msgid "  [B<--templates> I<PATH>]"
+msgid "  [-s|B<--source-images> iso|net|tar|usb-hdd]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:197
-msgid "  [B<--virtual-root-filesystem> ext3]"
+msgid "  [B<--symlinks> true|false]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:199
-msgid "  [B<--virtual-root-size >I<MB>]"
+msgid "  [B<--syslinux-splash> I<FILE>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:201
-msgid "  [B<--exposed-root> true|false]"
+msgid "  [B<--syslinux-timeout> I<SECONDS>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:203
+msgid "  [B<--syslinux-menu> true|false]"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:205
+msgid "  [B<--sysvinit> true|false]"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:207
+msgid "  [B<--tasksel> aptitude|tasksel]"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:209
+msgid "  [B<--tasks> I<TASK>|\"I<TASKS>\"]"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:211
+msgid "  [B<--templates> I<PATH>]"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:213
+msgid "  [B<--virtual-root-size >I<MB>]"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:215
+msgid "  [B<--volatile> true|false]"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:217
+msgid "  [B<--backports> true|false]"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:219
+msgid "  [B<--exposed-root> true|false]"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:221
 msgid "  [B<--username> I<NAME>]"
 msgstr ""
 
+#. type: Plain text
+#: en/lb_config.1:223
+#, fuzzy
+#| msgid "B<--source>"
+msgid "  [B<--verbose>]"
+msgstr "B<--source>"
+
 #.  FIXME
 #. type: Plain text
-#: en/lb_config.1:206
+#: en/lb_config.1:226
 msgid "  [B<--win32-loader true|false]>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:209
+#: en/lb_config.1:229
 msgid ""
 "B<lb config> is a high-level command (porcelain) of I<live-build>(7), the "
 "Debian Live tool suite."
@@ -1207,7 +1263,7 @@ msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/lb_config.1:212
+#: en/lb_config.1:232
 msgid ""
 "B<lb config> populates the configuration directory for live-build. By "
 "default, this directory is named 'config' and is created in the current "
@@ -1216,7 +1272,7 @@ msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/lb_config.1:215
+#: en/lb_config.1:235
 msgid ""
 "Note: Currently B<lb config> tries to be smart and sets defaults for some "
 "options depending on the setting of other options (e.g. which linux packages "
@@ -1232,7 +1288,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:218
+#: en/lb_config.1:238
 msgid ""
 "In addition to its specific options B<lb config> understands all generic "
 "live-build options. See I<live-build>(7) for a complete list of all generic "
@@ -1244,27 +1300,26 @@ msgstr ""
 
 #.  FIXME
 #. type: IP
-#: en/lb_config.1:220
+#: en/lb_config.1:240
 #, no-wrap
 msgid "B<--apt> apt|aptitude"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:222
+#: en/lb_config.1:242
 msgid ""
 "defines if apt-get or aptitude is used to install packages when building the "
-"image. When building etch images, this defaults to aptitude. Every other "
-"distribution defaults to apt."
+"image. The default is apt."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:222
+#: en/lb_config.1:242
 #, no-wrap
 msgid "B<--apt-ftp-proxy> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:224
+#: en/lb_config.1:244
 msgid ""
 "sets the ftp proxy to be used by apt. By default, this is empty but if the "
 "host has the environment variable ftp_proxy set, apt-ftp-proxy gets "
@@ -1272,13 +1327,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:224
+#: en/lb_config.1:244
 #, no-wrap
 msgid "B<--apt-http-proxy> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:226
+#: en/lb_config.1:246
 msgid ""
 "sets the http proxy to be used by apt. By default, this is empty but if the "
 "host has the environment variable http_proxy set, apt-http-proxy gets "
@@ -1286,26 +1341,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:226
+#: en/lb_config.1:246
 #, no-wrap
 msgid "B<--apt-pdiffs> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:228
+#: en/lb_config.1:248
 msgid ""
 "defines whetever apt should use incremental package indices feature or not. "
 "This is true by default."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:228
+#: en/lb_config.1:248
 #, no-wrap
 msgid "B<--apt-options> I<OPTION>|\"I<OPTIONS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:230
+#: en/lb_config.1:250
 msgid ""
 "defines the default options that will be appended to every apt call that is "
 "made inside chroot during the building of the image. By default, this is set "
@@ -1313,13 +1368,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:230
+#: en/lb_config.1:250
 #, no-wrap
 msgid "B<--aptitude-options> I<OPTION>|\"I<OPTIONS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:232
+#: en/lb_config.1:252
 msgid ""
 "defines the default options that will be appended to every aptitude call "
 "that is made inside chroot during building of the image. By default, this is "
@@ -1327,13 +1382,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:232
+#: en/lb_config.1:252
 #, no-wrap
 msgid "B<--apt-pipeline> I<DEPTH>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:234
+#: en/lb_config.1:254
 msgid ""
 "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 "
@@ -1345,38 +1400,38 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:234
+#: en/lb_config.1:254
 #, no-wrap
 msgid "B<--apt-recommends> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:236
+#: en/lb_config.1:256
 msgid ""
 "defines if apt should install recommended packages automatically. By "
 "default, this is true except in emdebian mode."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:236
+#: en/lb_config.1:256
 #, no-wrap
 msgid "B<--apt-secure> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:238
+#: en/lb_config.1:258
 msgid ""
 "defines if apt should check repository signatures. This is true by default."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:238
+#: en/lb_config.1:258
 #, no-wrap
 msgid "-a|B<--architecture> I<ARCHITECTURE>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:240
+#: en/lb_config.1:260
 msgid ""
 "defines the architecture of the to be build image. By default, this is set "
 "to the host architecture. Note that you cannot crossbuild for another "
@@ -1387,26 +1442,27 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:240
+#: en/lb_config.1:260
 #, no-wrap
 msgid "-b|B<--binary-images> iso|iso-hybrid|net|tar|usb-hdd"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:242
+#: en/lb_config.1:262
 msgid ""
-"defines the image type to build. By default this is set to iso to build CD/"
-"DVD images, for squeeze and newer it defaults to iso-hybrid."
+"defines the image type to build. By default, for images using syslinux this "
+"is set to iso-hybrid to build CD/DVD images that may also be used like usb-"
+"hdd images, for legacy lenny and non-syslinux images, it defaults to iso."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:242
+#: en/lb_config.1:262
 #, no-wrap
 msgid "B<--binary-filesystem> fat16|fat32|ext2"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:244
+#: en/lb_config.1:264
 msgid ""
 "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 "
@@ -1419,37 +1475,37 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:244
+#: en/lb_config.1:264
 #, no-wrap
 msgid "B<--binary-indices> true|false|none"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:246
+#: en/lb_config.1:266
 msgid ""
 "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."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:246
+#: en/lb_config.1:266
 #, no-wrap
 msgid "B<--bootappend-install> I<PARAMETER>|\"I<PARAMETERS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:248
+#: en/lb_config.1:268
 msgid "sets boot parameters specific to debian-installer, if included."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:248
+#: en/lb_config.1:268
 #, no-wrap
 msgid "B<--bootappend-live> I<PARAMETER>|\"I<PARAMETERS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:250
+#: en/lb_config.1:270
 msgid ""
 "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 "
@@ -1458,13 +1514,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:250
+#: en/lb_config.1:270
 #, no-wrap
 msgid "B<--bootloader> grub|syslinux|yaboot"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:252
+#: en/lb_config.1:272
 msgid ""
 "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 "
@@ -1477,13 +1533,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:252
+#: en/lb_config.1:272
 #, no-wrap
 msgid "B<--bootstrap> cdebootstrap|cdebootstrap-static|debootstrap|copy"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:254
+#: en/lb_config.1:274
 msgid ""
 "defines which program is used to bootstrap the debian chroot, default is "
 "debootstrap. Note that if you set the bootstrap program to copy, then your "
@@ -1493,13 +1549,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:254
+#: en/lb_config.1:274
 #, no-wrap
 msgid "B<--bootstrap-config> I<FILE>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:256
+#: en/lb_config.1:276
 msgid ""
 "sets a custom configuration file for the boostrap programm of choice and is "
 "empty by default. Refere to the documentation of debootstrap or cdebootstrap "
@@ -1508,13 +1564,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:256
+#: en/lb_config.1:276
 #, no-wrap
 msgid "-f|B<--bootstrap-flavour> minimal|standard"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:258
+#: en/lb_config.1:278
 msgid ""
 "defines if the bootstrap program should bootstrap the standard system (all "
 "packages of priority required and important, which is the default) or a "
@@ -1522,39 +1578,39 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:258
+#: en/lb_config.1:278
 #, no-wrap
 msgid "B<--bootstrap-keyring> I<PACKAGE>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:260
+#: en/lb_config.1:280
 msgid ""
 "sets the archive keyring package to be used. Default is debian-archive-"
 "keyring."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:260
+#: en/lb_config.1:280
 #, no-wrap
 msgid "B<--cache> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:262
+#: en/lb_config.1:282
 msgid ""
 "defines globally if any cache should be used at all. Different caches can be "
 "controled through the their own options."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:262
+#: en/lb_config.1:282
 #, no-wrap
 msgid "B<--cache-indices> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:264
+#: en/lb_config.1:284
 msgid ""
 "defines if downloaded package indices and lists should be cached which is "
 "false by default. Enabling it would allow to rebuild an image completely "
@@ -1562,13 +1618,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:264
+#: en/lb_config.1:284
 #, no-wrap
 msgid "B<--cache-packages> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:266
+#: en/lb_config.1:286
 msgid ""
 "defines if downloaded packages files should be cached which is true by "
 "default. Disabling it does save space consumtion in your build directory, "
@@ -1579,13 +1635,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:266
+#: en/lb_config.1:286
 #, no-wrap
 msgid "B<--cache-stages> true|false|I<STAGE>|\"I<STAGES>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:268
+#: en/lb_config.1:288
 msgid ""
 "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 "
@@ -1595,13 +1651,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:268
+#: en/lb_config.1:288
 #, no-wrap
 msgid "B<--checksums> md5|sha1|sha256|none"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:270
+#: en/lb_config.1:290
 msgid ""
 "defines if the binary image should contain a file called md5sums.txt, "
 "sha1sums.txt and/or sha256sums.txt. These lists all files on the image "
@@ -1613,13 +1669,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:270
+#: en/lb_config.1:290
 #, no-wrap
 msgid "B<--build-with-chroot> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:272
+#: en/lb_config.1:292
 msgid ""
 "defines whetever live-build should use the tools from within the chroot to "
 "build the binary image or not by using and including the host systems tools. "
@@ -1634,13 +1690,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:272
+#: en/lb_config.1:292
 #, no-wrap
 msgid "B<--chroot-filesystem> ext2|ext3|squashfs|plain|jffs2"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:274
+#: en/lb_config.1:294
 msgid ""
 "defines which filesystem type should be used for the root filesystem image. "
 "If you use plain, then no filesystem image is created and the root "
@@ -1651,39 +1707,39 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:274
+#: en/lb_config.1:294
 #, no-wrap
 msgid "B<--clean>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:276
+#: en/lb_config.1:296
 msgid ""
 "minimizes config directory by automatically removing unused and thus empty "
 "subdirectories."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:276
+#: en/lb_config.1:296
 #, no-wrap
 msgid "-c|B<--conffile> I<FILE>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:278
+#: en/lb_config.1:298
 msgid ""
 "using a user specified alternative configuration file in addition to the "
 "normally used one in the config directory."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:278
+#: en/lb_config.1:298
 #, no-wrap
 msgid "B<--debconf-frontend> dialog|editor|noninteractive|readline"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:280
+#: en/lb_config.1:300
 msgid ""
 "defines what value the debconf frontend should be set to inside the chroot. "
 "Note that setting it to anything by noninteractive, which is the default, "
@@ -1691,13 +1747,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:280
+#: en/lb_config.1:300
 #, no-wrap
 msgid "B<--debconf-nowarnings> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:282
+#: en/lb_config.1:302
 msgid ""
 "defines if warnings of debconf should be displayed or not. Warnings from "
 "debconf are generally very rare and by default, we skipp them, if any, in "
@@ -1705,13 +1761,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:282
+#: en/lb_config.1:302
 #, no-wrap
 msgid "B<--debconf-priority> low|medium|high|critical"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:284
+#: en/lb_config.1:304
 msgid ""
 "defines what value the debconf priority shoul dbe set to inside the chroot. "
 "By default, it is set to critical, which means that almost no questions are "
@@ -1720,13 +1776,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:284
+#: en/lb_config.1:304
 #, no-wrap
 msgid "B<--debian-installer> true|cdrom|netinst|netboot|businesscard|live|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:286
+#: en/lb_config.1:306
 msgid ""
 "defines which type, if any, of the debian-installer should be included in "
 "the resulting binary image. By default, no installer is included. All "
@@ -1738,13 +1794,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:286
+#: en/lb_config.1:306
 #, no-wrap
 msgid "B<--debian-installer-distribution> daily|I<CODENAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:288
+#: en/lb_config.1:308
 msgid ""
 "defines the distribution where the debian-installer files should be taken "
 "out from. Normally, this should be set to the same distribution as the live "
@@ -1753,26 +1809,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:288
+#: en/lb_config.1:308
 #, no-wrap
 msgid "B<--debian-installer-preseedfile> I<FILE>|I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:290
+#: en/lb_config.1:310
 msgid ""
 "sets the filename or URL for an optionally used and included preseeding file "
 "for debian-installer."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:290
+#: en/lb_config.1:310
 #, no-wrap
 msgid "B<--debian-installer-gui> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:292
+#: en/lb_config.1:312
 msgid ""
 "defines if the debian-installer graphical GTK interface should be true or "
 "not. In Debian mode and for most versions of Ubuntu, this option is true, "
@@ -1780,24 +1836,36 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:292
+#: en/lb_config.1:312 en/live-build.7:36
 #, no-wrap
-msgid "-d|B<--distribution> I<CODENAME>"
+msgid "B<--debug>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:294
-msgid "defines the distribution of the resulting live system."
+#: en/lb_config.1:314
+msgid "turn on debugging informational messages."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:294
+#: en/lb_config.1:314
 #, no-wrap
-msgid "--B<dump>"
+msgid "-d|B<--distribution> I<CODENAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:296
+#: en/lb_config.1:316
+msgid "defines the distribution of the resulting live system."
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:316
+#, fuzzy, no-wrap
+#| msgid "B<--purge>"
+msgid "B<--dump>"
+msgstr "B<--purge>"
+
+#. type: Plain text
+#: en/lb_config.1:318
 msgid ""
 "prepares a report of the currently present live system configuration and the "
 "version of live-build used. This is useful to provide if you submit bug "
@@ -1806,52 +1874,66 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:296
+#: en/lb_config.1:318
 #, no-wrap
 msgid "-e|B<--encryption> false|aes128|aes192|aes256"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:298
+#: en/lb_config.1:320
 msgid ""
 "defines if the root filesystem should be encrypted or not. By default, this "
 "is false."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:298
+#: en/lb_config.1:320
 #, no-wrap
 msgid "B<--fdisk> fdisk|fdisk.dist"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:300
+#: en/lb_config.1:322
 msgid ""
 "sets the filename of the fdisk binary from the host system that should be "
 "used. This is autodetected and does generally not need any customization."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:300
+#: en/lb_config.1:322 en/live-build.7:38
+#, no-wrap
+msgid "B<--force>"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:324
+msgid ""
+"forces re-execution of already run stages. Use only if you know what you are "
+"doing. It is generally safer to use B<lb clean> to clean up before re-"
+"executing B<lb build>."
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:324
 #, no-wrap
 msgid "B<--grub-splash> I<FILE>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:302
+#: en/lb_config.1:326
 msgid ""
 "defines the name of an optional to be included splash screen graphic for the "
 "grub bootloader."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:302
+#: en/lb_config.1:326
 #, no-wrap
 msgid "B<--gzip-options> I<OPTION>|\"I<OPTIONS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:304
+#: en/lb_config.1:328
 msgid ""
 "defines the default options that will be appended to (almost) every gzip "
 "call during the building of the image. By default, this is set to --best to "
@@ -1860,13 +1942,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:304
+#: en/lb_config.1:328
 #, no-wrap
 msgid "B<--hooks> I<FILE>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:306
+#: en/lb_config.1:330
 msgid ""
 "defines which hooks available in /usr/share/live/build/examples/hooks should "
 "be activated. Normally, there are no hooks executed. Make sure you know and "
@@ -1874,24 +1956,24 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:306
+#: en/lb_config.1:330
 #, no-wrap
 msgid "B<--hostname> I<NAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:308
+#: en/lb_config.1:332
 msgid "sets the hostname of the live system."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:308
+#: en/lb_config.1:332
 #, no-wrap
 msgid "B<--ignore-system-defaults>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:310
+#: en/lb_config.1:334
 msgid ""
 "B<lb config> by default reads system defaults from /etc/live/build.conf and /"
 "etc/live/build.d when generating a new live system config directory. This is "
@@ -1900,13 +1982,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:310
+#: en/lb_config.1:334
 #, no-wrap
 msgid "B<--includes> I<PATH>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:312
+#: en/lb_config.1:336
 msgid ""
 "sets the path to the includes that live-build is going to use, e.g. "
 "additional minimal documentation that you want to have on all live systems. "
@@ -1914,31 +1996,30 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:312
+#: en/lb_config.1:336
 #, no-wrap
 msgid "B<--initramfs> auto|none|live-boot|live-initramfs|casper"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:314
+#: en/lb_config.1:338
 msgid ""
 "sets the name of package that contains the live system specific initramfs "
 "modification. By default, auto is used, which means that at build time of "
 "the image rather than on configuration time, the value will be expanded to "
-"casper when building etch systems or ubuntu systems, to live-initramfs for "
-"all other systems up to squeeze, and to live-boot for wheezy and newer. "
-"Using 'none' is usefull if the resulting system image should not be a live "
-"image (experimental)."
+"casper when building ubuntu systems, to live-initramfs for legacy lenny, and "
+"to live-boot for squeeze and newer. Using 'none' is useful if the resulting "
+"system image should not be a live image (experimental)."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:314
+#: en/lb_config.1:338
 #, no-wrap
 msgid "B<--interactive> shell"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:316
+#: en/lb_config.1:340
 msgid ""
 "defines if after the chroot stage and before the beginning of the binary "
 "stage, a interactive shell login should be spawned in the chroot in order to "
@@ -1952,13 +2033,24 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:316
+#: en/lb_config.1:340
+#, no-wrap
+msgid "B<--isohybrid-options> I<OPTION>|\"I<OPTIONS>\""
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:342
+msgid "defines options to pass to isohybrid."
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:342
 #, no-wrap
 msgid "B<--iso-application> I<NAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:318
+#: en/lb_config.1:344
 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 "
@@ -1966,13 +2058,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:318
+#: en/lb_config.1:344
 #, no-wrap
 msgid "B<--iso-preparer> I<NAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:320
+#: en/lb_config.1:346
 msgid ""
 "sets the PREPARER field in the header of a resulting CD/DVD image. By "
 "default this is set to \"live-build I<VERSION>; http://packages.qa.debian."
@@ -1981,13 +2073,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:320
+#: en/lb_config.1:346
 #, no-wrap
 msgid "B<--iso-publisher> I<NAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:322
+#: en/lb_config.1:348
 msgid ""
 "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-"
@@ -1996,13 +2088,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:322
+#: en/lb_config.1:348
 #, no-wrap
 msgid "B<--iso-volume> I<NAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:324
+#: en/lb_config.1:350
 msgid ""
 "sets the VOLUME field in the header of a resulting CD/DVD and defaults to "
 "'(I<MODE>) (I<DISTRIBUTION>) (I<DATE>)' whereas MODE is expanded to the name "
@@ -2014,13 +2106,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:324
+#: en/lb_config.1:350
 #, no-wrap
 msgid "B<--jffs2-eraseblock> I<SIZE>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:326
+#: en/lb_config.1:352
 msgid ""
 "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 "
@@ -2030,26 +2122,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:326
+#: en/lb_config.1:352
 #, no-wrap
 msgid "B<--keyring-packages> I<PACKAGE|\"PACKAGES>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:328
+#: en/lb_config.1:354
 msgid ""
 "sets the keyring package or additional keyring packages. By default this is "
 "set to debian-archive-keyring."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:328
+#: en/lb_config.1:354
 #, no-wrap
 msgid "-l|B<--language> I<LANGUAGE>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:330
+#: en/lb_config.1:356
 msgid ""
 "sets the language of a live system by installing l10n related packages. It "
 "doesn't enable generation of the correct locales through setting the right "
@@ -2057,26 +2149,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:330
+#: en/lb_config.1:356
 #, no-wrap
 msgid "-k|B<--linux-flavours> I<FLAVOUR>|\"I<FLAVOURS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:332
+#: en/lb_config.1:358
 msgid ""
 "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."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:332
+#: en/lb_config.1:358
 #, no-wrap
 msgid "B<--linux-packages> \"I<PACKAGES>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:334
+#: en/lb_config.1:360
 msgid ""
 "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 "
@@ -2090,26 +2182,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:334
+#: en/lb_config.1:360
 #, no-wrap
 msgid "B<--losetup> losetup|losetup.orig"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:336
+#: en/lb_config.1:362
 msgid ""
 "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."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:336
+#: en/lb_config.1:362
 #, no-wrap
 msgid "B<--memtest> memtest86+|memtest86|none"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:338
+#: en/lb_config.1:364
 msgid ""
 "defines if memtest, memtest86+ or no memory tester at all should be included "
 "as secondary bootloader configuration. This is only available on amd64 and "
@@ -2117,26 +2209,83 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:338
+#: en/lb_config.1:364
 #, no-wrap
 msgid "-m|B<--mirror-bootstrap> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:340
+#: en/lb_config.1:366
 msgid ""
 "sets the location of the debian package mirror that should be used to "
-"bootstrap from."
+"bootstrap from. This defaults to http://ftp.de.debian.org/debian/ which may "
+"not be a good default if you live outside of Europe."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:340
+#: en/lb_config.1:366
+#, no-wrap
+msgid "B<--mirror-chroot> I<URL>"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:368
+msgid ""
+"sets the location of the debian package mirror that will be used to fetch "
+"the packages in order to build the live system. By default, this is set to "
+"the value of --mirror-bootstrap."
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:368
+#, no-wrap
+msgid "B<--mirror-chroot-security> I<URL>"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:370
+msgid ""
+"sets the location of the debian security package mirror that will be used to "
+"fetch the packages in order to build the live system. By default, this "
+"points to http://security.debian.org/debian/."
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:370
+#, no-wrap
+msgid "B<--mirror-chroot-volatile> I<URL>"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:372
+msgid ""
+"sets the location of the debian volatile package mirror that will be used to "
+"fetch packages in order to build the live system. By default, this is set to "
+"the value of --mirror-chroot."
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:372
+#, no-wrap
+msgid "B<--mirror-chroot-backports> I<URL>"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:374
+msgid ""
+"sets the location of the debian backports package mirror that will be used "
+"to fetch packages in order to build the live system. By default, this points "
+"to http://backports.debian.org/debian-backports/."
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:374
 #, no-wrap
 msgid "B<--mirror-binary> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:342
+#: en/lb_config.1:376
 msgid ""
 "sets the location of the debian package mirror that should end up configured "
 "in the final image and which is the one a user would see and use. This has "
@@ -2146,109 +2295,108 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:342
+#: en/lb_config.1:376
 #, no-wrap
 msgid "B<--mirror-binary-security> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:344
+#: en/lb_config.1:378
 msgid ""
 "sets the location of the debian security package mirror that should end up "
-"configuered in the final image. By default, 'http://cdn.debian.net/debian-"
+"configured in the final image. By default, 'http://cdn.debian.net/debian-"
 "security/' is used."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:344
+#: en/lb_config.1:378
 #, no-wrap
-msgid "B<--mirror-chroot> I<URL>"
+msgid "B<--mirror-binary-volatile> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:346
+#: en/lb_config.1:380
 msgid ""
-"sets the location of the debian package mirror that will be used to fetch "
-"the packages in order to build the live system. By default, this points to "
-"http://ftp.de.debian.org/debian/ which may not be a good default if you live "
-"outside the U.S."
+"sets the location of the debian volatile package mirror that should end up "
+"configured in the final image. By default, the value of --mirror-binary is "
+"used."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:346
+#: en/lb_config.1:380
 #, no-wrap
-msgid "B<--mirror-chroot-security> I<URL>"
+msgid "B<--mirror-binary-backports> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:348
+#: en/lb_config.1:382
 msgid ""
-"sets the location of the debian security package mirror that will be used to "
-"fetch the packages in order to build the live system. By default, this "
-"points to http://security.debian.org/debian/."
+"sets the location of the debian backports package mirror that should end up "
+"configured in the final image. By default, 'http://backports.debian.org/"
+"debian-backports/' is used."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:348
+#: en/lb_config.1:382
 #, no-wrap
 msgid "B<--mirror-debian-installer> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:350
+#: en/lb_config.1:384
 msgid ""
 "sets the location of the mirror that will be used to fetch the debian "
 "installer images. By default, this points to the same mirror used to build "
-"the live system."
+"the live system, i.e. the value of --mirror-bootstrap."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:350
+#: en/lb_config.1:384
 #, no-wrap
 msgid "B<--mode> debian|emdebian|ubuntu"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:352
+#: en/lb_config.1:386
 msgid ""
 "defines a global mode to load project specific defaults. By default this is "
 "set to debian."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:352
+#: en/lb_config.1:386
 #, no-wrap
 msgid "B<--net-root-filesystem> nfs|cfs"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:354
+#: en/lb_config.1:388
 msgid ""
 "defines the filesystem that will be configured in the bootloader "
 "configuration for your netboot image. This defaults to nfs."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:354
+#: en/lb_config.1:388
 #, no-wrap
 msgid "B<--net-root-mountoptions> I<OPTIONS>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:356
+#: en/lb_config.1:390
 msgid ""
 "sets additional options for mounting the root filesystem in netboot images "
 "and is by default empty."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:356
+#: en/lb_config.1:390
 #, no-wrap
 msgid "B<--net-root-path> I<PATH>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:358
+#: en/lb_config.1:392
 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 "
@@ -2257,13 +2405,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:358
+#: en/lb_config.1:392
 #, no-wrap
 msgid "B<--net-root-server> I<IP>|I<HOSTNAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:360
+#: en/lb_config.1:394
 msgid ""
 "sets the IP or hostname that will be configured in the bootloader "
 "configuration for the root filesystem of your netboot image. This defaults "
@@ -2271,38 +2419,38 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:360
+#: en/lb_config.1:394
 #, no-wrap
 msgid "B<--net-cow-filesystem> nfs|cfs"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:362
+#: en/lb_config.1:396
 msgid ""
 "defines the filesystem type for the copy-on-write layer and defaults to nfs."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:362
+#: en/lb_config.1:396
 #, no-wrap
 msgid "B<--net-cow-mountoptions> I<OPTIONS>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:364
+#: en/lb_config.1:398
 msgid ""
 "sets additional options for mounting the copy-on-write layer in netboot "
 "images and is by default empty."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:364
+#: en/lb_config.1:398
 #, no-wrap
 msgid "B<--net-cow-path> I<PATH>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:366
+#: en/lb_config.1:400
 msgid ""
 "defines the path to client writable filesystem. Anywhere that "
 "I<client_mac_address> is specified in the path live-initramfs will "
@@ -2310,28 +2458,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:369
+#: en/lb_config.1:403
 msgid "Example:"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:371
+#: en/lb_config.1:405
 msgid "/export/hosts/client_mac_address"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:373
+#: en/lb_config.1:407
 msgid "/export/hosts/00-16-D3-33-92-E8"
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:373
+#: en/lb_config.1:407
 #, no-wrap
 msgid "B<--net-cow-server> I<IP>|I<HOSTNAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:375
+#: en/lb_config.1:409
 msgid ""
 "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 "
@@ -2339,13 +2487,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:375
+#: en/lb_config.1:409
 #, no-wrap
 msgid "B<--net-tarball> bzip2|gzip|tar|none"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:377
+#: en/lb_config.1:411
 msgid ""
 "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. "
@@ -2354,13 +2502,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:377
+#: en/lb_config.1:411
 #, no-wrap
 msgid "-p|B<--packages-lists> I<LIST>|\"I<LISTS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:379
+#: en/lb_config.1:413
 msgid ""
 "defines which lists available in /usr/share/live/build/lists should be used. "
 "By default, this is set to standard. Note that in case you have local "
@@ -2370,13 +2518,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:379
+#: en/lb_config.1:413
 #, no-wrap
 msgid "B<--packages> I<PACKAGE>|\"I<PACKAGES>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:381
+#: en/lb_config.1:415
 msgid ""
 "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 "
@@ -2385,26 +2533,37 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:381
+#: en/lb_config.1:415 en/live-build.7:40
 #, no-wrap
-msgid "B<-r, --repositories> I<REPOSITORY>|\"I<REPOSITORIES>\""
+msgid "B<--quiet>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:383
+#: en/lb_config.1:417
+msgid "reduces the verbosity of messages output by B<lb build>."
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:417
+#, no-wrap
+msgid "-r|B<--repositories> I<REPOSITORY>|\"I<REPOSITORIES>\""
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:419
 msgid ""
 "enables one of available third-party repository configurations in /usr/share/"
 "live/build/repositories."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:383
+#: en/lb_config.1:419
 #, no-wrap
 msgid "B<--root-command> sudo"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:385
+#: en/lb_config.1:421
 msgid ""
 "controls if live-build should use sudo internally to build the live image. "
 "Note that this is not well tested and that you should, when relying on sudo, "
@@ -2412,13 +2571,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:385
+#: en/lb_config.1:421
 #, no-wrap
 msgid "B<--use-fakeroot> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:387
+#: en/lb_config.1:423
 msgid ""
 "controls if live-build should utilize fakeroot and fakechroot to try and "
 "avoid requiring root privillages where possible. By default, this option is "
@@ -2426,13 +2585,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:387
+#: en/lb_config.1:423
 #, no-wrap
 msgid "B<--archive-areas> I<ARCHIVE_AREA>|\"I<ARCHIVE_AREAS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:389
+#: en/lb_config.1:425
 msgid ""
 "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. "
@@ -2442,26 +2601,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:389
+#: en/lb_config.1:425
 #, no-wrap
 msgid "B<--security> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:391
+#: en/lb_config.1:427
 msgid ""
 "defines if the security repositories specified in the security mirror "
 "options should be used or not."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:391
+#: en/lb_config.1:427
 #, no-wrap
 msgid "B<--source> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:393
+#: en/lb_config.1:429
 msgid ""
 "defines if a corresponding source image to the binary image should be build. "
 "By default this is false because most people do not require this and would "
@@ -2471,24 +2630,24 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:393
+#: en/lb_config.1:429
 #, no-wrap
 msgid "-s|B<--source-images> iso|net|tar|usb-hdd"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:395
+#: en/lb_config.1:431
 msgid "defines the image type for the source image. Default is tar."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:395
+#: en/lb_config.1:431
 #, no-wrap
 msgid "B<--symlinks> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:397
+#: en/lb_config.1:433
 msgid ""
 "defines if the symlink hack should be true or false. The symlink hack "
 "converts all absolute symlinks to relative ones. By default this is false "
@@ -2497,26 +2656,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:397
+#: en/lb_config.1:433
 #, no-wrap
 msgid "B<--syslinux-splash> I<FILE>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:399
+#: en/lb_config.1:435
 msgid ""
 "defines the file of the syslinux splash graphic that should be used instead "
 "of the default one."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:399
+#: en/lb_config.1:435
 #, no-wrap
 msgid "B<--syslinux-timeout> I<SECONDS>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:401
+#: en/lb_config.1:437
 msgid ""
 "defines the timeout the syslinux bootloader should wait for input from the "
 "user at the bootprompt prior booting the default kernel. This defaults to 0 "
@@ -2524,25 +2683,25 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:401
+#: en/lb_config.1:437
 #, no-wrap
 msgid "B<--syslinux-menu> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:403
+#: en/lb_config.1:439
 msgid ""
 "defines if syslinux should be make use of the vgamenu capabilities or not."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:403
+#: en/lb_config.1:439
 #, no-wrap
 msgid "B<--sysvinit> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:405
+#: en/lb_config.1:441
 msgid ""
 "defines if the sysvinit hack should be true or false. The sysvinit hack "
 "disables all non-essential services from starting up at bootup in order to "
@@ -2551,26 +2710,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:405
+#: en/lb_config.1:441
 #, no-wrap
 msgid "B<--tasksel> aptitude|tasksel"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:407
+#: en/lb_config.1:443
 msgid ""
 "selects which program is used to install tasks. By default, this is set to "
 "tasksel."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:407
+#: en/lb_config.1:443
 #, no-wrap
 msgid "B<--tasks> I<TASK>|\"I<TASKS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:409
+#: en/lb_config.1:445
 msgid ""
 "defines one or more package tasks to be installed in the live system. This "
 "is a quick and convenient way to get a reasonable default selection of "
@@ -2580,53 +2739,66 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:409
+#: en/lb_config.1:445
 #, no-wrap
 msgid "B<--templates> I<PATH>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:411
+#: en/lb_config.1:447
 msgid ""
 "sets the path to the templates that live-build is going to use, e.g. for "
 "bootloaders. By default, this is set to /usr/share/live/build/templates/."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:411
+#: en/lb_config.1:447
+#, no-wrap
+msgid "B<--virtual-root-size> MB"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:449
+msgid ""
+"defines what size the virtual-hdd image should be. Note that although the "
+"default is set to 10000 (= 10GB), it will not need 10GB space on your "
+"harddisk as the files are created as sparse files."
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:449
 #, no-wrap
-msgid "B<--virtual-root-filesystem> ext3"
+msgid "B<--volatile> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:413
+#: en/lb_config.1:451
 msgid ""
-"defines what filesystem to format the root filesystem when building virtual-"
-"hdd images."
+"defines if debian volatile package archives should be included in the image "
+"or not."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:413
+#: en/lb_config.1:451
 #, no-wrap
-msgid "B<--virtual-root-size> MB"
+msgid "B<--backports> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:415
+#: en/lb_config.1:453
 msgid ""
-"defines what size the virtual-hdd image should be. Note that although the "
-"default is set to 10000 (= 10GB), it will not need 10GB space on your "
-"harddisk as the files are created as sparse files."
+"defines if debian backports package archives should be included in the image "
+"or not."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:415
+#: en/lb_config.1:453
 #, no-wrap
 msgid "B<--exposed-root> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:417
+#: en/lb_config.1:455
 msgid ""
 "defines whether to expose the root filesystem as read only and not covered "
 "by the union filesystem. This has useful implications for certain speciality "
@@ -2634,61 +2806,75 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:417
+#: en/lb_config.1:455
 #, no-wrap
 msgid "B<--username> I<NAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:419
+#: en/lb_config.1:457
 msgid "sets the name of the account of the default user in the live system."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:419
+#: en/lb_config.1:457 en/live-build.7:42
+#, no-wrap
+msgid "B<--verbose>"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:459
+msgid "increases the verbosity of messages output by B<lb build>."
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:459
 #, no-wrap
 msgid "B<--win32-loader true|false>"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/lb_config.1:422
+#: en/lb_config.1:462
 msgid "defines if win32-loader should be included in the binary image or not."
 msgstr ""
 
 #. type: SH
-#: en/lb_config.1:423
+#: en/lb_config.1:463
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr ""
 
 #.  FIXME
-#.  FIXME
 #. type: Plain text
-#: en/lb_config.1:427
+#: en/lb_config.1:466
 msgid ""
-"All command line switches can also be specified through the corresponding "
-"environment variable. Environment variables are name LB_FOO, means, e.g. --"
-"apt-ftp-proxy becomes LB_APT_FTP_PROXY. However, this generally should not "
-"be used."
+"Currently, command line switches can also be specified through the "
+"corresponding environment variable. However, this generally should not be "
+"relied upon, as it is an implementation detail that is subject to change in "
+"future releases. For options applying directly to live-build, environment "
+"variables are named LB_FOO, meaning, e.g. B<--apt-ftp-proxy> becomes "
+"LB_APT_FTP_PROXY (the exception being internal options such as B<--debug>). "
+"For options passed to another program, as in APT_OPTIONS or GZIP_OPTIONS, no "
+"LB_ prefix is used."
 msgstr ""
 
 #.  FIXME
 #. type: IP
-#: en/lb_config.1:430
+#: en/lb_config.1:470
 #, no-wrap
 msgid "B<auto/config>"
 msgstr "B<auto/config>"
 
 #. type: IP
-#: en/lb_config.1:431
+#: en/lb_config.1:471
 #, no-wrap
 msgid "B</etc/live/build.conf, /etc/live/build.d>"
 msgstr "B</etc/live/build.conf, /etc/live/build.d>"
 
 #.  FIXME
 #. type: Plain text
-#: en/lb_config.1:434
+#: en/lb_config.1:474
 msgid ""
 "An optional, global configuration file for B<lb config> variables. It is "
 "useful to specify a few system wide defaults, like LB_MIRROR_BOOTSTRAP. This "
diff --git a/manpages/po/de/live-build.7.po b/manpages/po/de/live-build.7.po
index dfb6dd4..73c226a 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 2.0.7\n"
-"POT-Creation-Date: 2010-11-29 23:13+0100\n"
+"POT-Creation-Date: 2010-12-05 16:39-0400\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -251,7 +251,7 @@ msgstr "ÜBERSICHT"
 #: en/lb_chroot_proc.1:9 en/lb_chroot_resolv.1:9 en/lb_chroot_selinuxfs.1:9
 #: en/lb_chroot_sources.1:9 en/lb_chroot_symlinks.1:9 en/lb_chroot_sysfs.1:9
 #: en/lb_chroot_sysv-rc.1:9 en/lb_chroot_sysvinit.1:9 en/lb_chroot_tasks.1:9
-#: en/lb_chroot_upstart.1:9 en/lb_clean.1:9 en/lb_config.1:207 en/lb_local.1:9
+#: en/lb_chroot_upstart.1:9 en/lb_clean.1:9 en/lb_config.1:227 en/lb_local.1:9
 #: en/lb_source.1:9 en/lb_source_checksums.1:9 en/lb_source_debian-live.1:9
 #: en/lb_source_debian.1:9 en/lb_source_disk.1:9 en/lb_source_iso.1:9
 #: en/lb_source_net.1:9 en/lb_source_tar.1:9 en/lb_source_usb.1:9
@@ -289,7 +289,7 @@ msgstr "BESCHREIBUNG"
 #: en/lb_chroot_symlinks.1:14 en/lb_chroot_sysfs.1:14
 #: en/lb_chroot_sysv-rc.1:14 en/lb_chroot_sysvinit.1:14
 #: en/lb_chroot_tasks.1:14 en/lb_chroot_upstart.1:14 en/lb_clean.1:16
-#: en/lb_config.1:216 en/lb_local.1:14 en/lb_source.1:14
+#: en/lb_config.1:236 en/lb_local.1:14 en/lb_source.1:14
 #: en/lb_source_checksums.1:14 en/lb_source_debian-live.1:14
 #: en/lb_source_debian.1:14 en/lb_source_disk.1:14 en/lb_source_iso.1:14
 #: en/lb_source_net.1:14 en/lb_source_tar.1:14 en/lb_source_usb.1:14
@@ -327,7 +327,7 @@ msgstr "OPTIONEN"
 #: en/lb_chroot_symlinks.1:17 en/lb_chroot_sysfs.1:17
 #: en/lb_chroot_sysv-rc.1:17 en/lb_chroot_sysvinit.1:17
 #: en/lb_chroot_tasks.1:17 en/lb_chroot_upstart.1:17 en/lb_clean.1:38
-#: en/lb_config.1:428 en/lb_local.1:17 en/lb_source.1:17
+#: en/lb_config.1:468 en/lb_local.1:17 en/lb_source.1:17
 #: en/lb_source_checksums.1:17 en/lb_source_debian-live.1:17
 #: en/lb_source_debian.1:17 en/lb_source_disk.1:17 en/lb_source_iso.1:17
 #: en/lb_source_net.1:17 en/lb_source_tar.1:17 en/lb_source_usb.1:17
@@ -366,7 +366,7 @@ msgstr "DATEIEN"
 #: en/lb_chroot_symlinks.1:21 en/lb_chroot_sysfs.1:21
 #: en/lb_chroot_sysv-rc.1:21 en/lb_chroot_sysvinit.1:21
 #: en/lb_chroot_tasks.1:21 en/lb_chroot_upstart.1:21 en/lb_clean.1:43
-#: en/lb_config.1:435 en/lb_local.1:20 en/lb_source.1:20
+#: en/lb_config.1:475 en/lb_local.1:20 en/lb_source.1:20
 #: en/lb_source_checksums.1:21 en/lb_source_debian-live.1:21
 #: en/lb_source_debian.1:21 en/lb_source_disk.1:21 en/lb_source_iso.1:21
 #: en/lb_source_net.1:21 en/lb_source_tar.1:21 en/lb_source_usb.1:21
@@ -404,7 +404,7 @@ msgstr "SIEHE AUCH"
 #: en/lb_chroot_symlinks.1:25 en/lb_chroot_sysfs.1:25
 #: en/lb_chroot_sysv-rc.1:25 en/lb_chroot_sysvinit.1:25
 #: en/lb_chroot_tasks.1:25 en/lb_chroot_upstart.1:25 en/lb_clean.1:47
-#: en/lb_config.1:439 en/lb_local.1:24 en/lb_source.1:24
+#: en/lb_config.1:479 en/lb_local.1:24 en/lb_source.1:24
 #: en/lb_source_checksums.1:25 en/lb_source_debian-live.1:25
 #: en/lb_source_debian.1:25 en/lb_source_disk.1:25 en/lb_source_iso.1:25
 #: en/lb_source_net.1:25 en/lb_source_tar.1:25 en/lb_source_usb.1:25
@@ -441,7 +441,7 @@ msgstr "Dieses Programm ist Teil von live-build."
 #: en/lb_chroot_symlinks.1:26 en/lb_chroot_sysfs.1:26
 #: en/lb_chroot_sysv-rc.1:26 en/lb_chroot_sysvinit.1:26
 #: en/lb_chroot_tasks.1:26 en/lb_chroot_upstart.1:26 en/lb_clean.1:48
-#: en/lb_config.1:440 en/lb_local.1:25 en/lb_source.1:25
+#: en/lb_config.1:480 en/lb_local.1:25 en/lb_source.1:25
 #: en/lb_source_checksums.1:26 en/lb_source_debian-live.1:26
 #: en/lb_source_debian.1:26 en/lb_source_disk.1:26 en/lb_source_iso.1:26
 #: en/lb_source_net.1:26 en/lb_source_tar.1:26 en/lb_source_usb.1:26
@@ -479,7 +479,7 @@ msgstr "HOMEPAGE"
 #: en/lb_chroot_symlinks.1:28 en/lb_chroot_sysfs.1:28
 #: en/lb_chroot_sysv-rc.1:28 en/lb_chroot_sysvinit.1:28
 #: en/lb_chroot_tasks.1:28 en/lb_chroot_upstart.1:28 en/lb_clean.1:50
-#: en/lb_config.1:442 en/lb_local.1:27 en/lb_source.1:27
+#: en/lb_config.1:482 en/lb_local.1:27 en/lb_source.1:27
 #: en/lb_source_checksums.1:28 en/lb_source_debian-live.1:28
 #: en/lb_source_debian.1:28 en/lb_source_disk.1:28 en/lb_source_iso.1:28
 #: en/lb_source_net.1:28 en/lb_source_tar.1:28 en/lb_source_usb.1:28
@@ -522,7 +522,7 @@ msgstr ""
 #: en/lb_chroot_symlinks.1:29 en/lb_chroot_sysfs.1:29
 #: en/lb_chroot_sysv-rc.1:29 en/lb_chroot_sysvinit.1:29
 #: en/lb_chroot_tasks.1:29 en/lb_chroot_upstart.1:29 en/lb_clean.1:51
-#: en/lb_config.1:443 en/lb_local.1:28 en/lb_source.1:28
+#: en/lb_config.1:483 en/lb_local.1:28 en/lb_source.1:28
 #: en/lb_source_checksums.1:29 en/lb_source_debian-live.1:29
 #: en/lb_source_debian.1:29 en/lb_source_disk.1:29 en/lb_source_iso.1:29
 #: en/lb_source_net.1:29 en/lb_source_tar.1:29 en/lb_source_usb.1:29
@@ -560,7 +560,7 @@ msgstr "FEHLER"
 #: en/lb_chroot_symlinks.1:31 en/lb_chroot_sysfs.1:31
 #: en/lb_chroot_sysv-rc.1:31 en/lb_chroot_sysvinit.1:31
 #: en/lb_chroot_tasks.1:31 en/lb_chroot_upstart.1:31 en/lb_clean.1:53
-#: en/lb_config.1:445 en/lb_local.1:30 en/lb_source.1:30
+#: en/lb_config.1:485 en/lb_local.1:30 en/lb_source.1:30
 #: en/lb_source_checksums.1:31 en/lb_source_debian-live.1:31
 #: en/lb_source_debian.1:31 en/lb_source_disk.1:31 en/lb_source_iso.1:31
 #: en/lb_source_net.1:31 en/lb_source_tar.1:31 en/lb_source_usb.1:31
@@ -606,7 +606,7 @@ msgstr ""
 #: en/lb_chroot_symlinks.1:32 en/lb_chroot_sysfs.1:32
 #: en/lb_chroot_sysv-rc.1:32 en/lb_chroot_sysvinit.1:32
 #: en/lb_chroot_tasks.1:32 en/lb_chroot_upstart.1:32 en/lb_clean.1:54
-#: en/lb_config.1:446 en/lb_local.1:31 en/lb_source.1:31
+#: en/lb_config.1:486 en/lb_local.1:31 en/lb_source.1:31
 #: en/lb_source_checksums.1:32 en/lb_source_debian-live.1:32
 #: en/lb_source_debian.1:32 en/lb_source_disk.1:32 en/lb_source_iso.1:32
 #: en/lb_source_net.1:32 en/lb_source_tar.1:32 en/lb_source_usb.1:32
@@ -644,7 +644,7 @@ msgstr "AUTOR"
 #: en/lb_chroot_symlinks.1:33 en/lb_chroot_sysfs.1:33
 #: en/lb_chroot_sysv-rc.1:33 en/lb_chroot_sysvinit.1:33
 #: en/lb_chroot_tasks.1:33 en/lb_chroot_upstart.1:33 en/lb_clean.1:55
-#: en/lb_config.1:447 en/lb_local.1:32 en/lb_source.1:32
+#: en/lb_config.1:487 en/lb_local.1:32 en/lb_source.1:32
 #: en/lb_source_checksums.1:33 en/lb_source_debian-live.1:33
 #: en/lb_source_debian.1:33 en/lb_source_disk.1:33 en/lb_source_iso.1:33
 #: en/lb_source_net.1:33 en/lb_source_tar.1:33 en/lb_source_usb.1:33
@@ -693,6 +693,30 @@ msgstr ""
 msgid "B<n/a>"
 msgstr "B<n/a>"
 
+#. type: IP
+#: en/lb_config.1:312 en/live-build.7:36
+#, no-wrap
+msgid "B<--debug>"
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:322 en/live-build.7:38
+#, no-wrap
+msgid "B<--force>"
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:415 en/live-build.7:40
+#, no-wrap
+msgid "B<--quiet>"
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:457 en/live-build.7:42
+#, no-wrap
+msgid "B<--verbose>"
+msgstr ""
+
 #. type: Plain text
 #: en/live-build.7:5
 msgid "B<live-build> - the Debian Live tool suite"
@@ -819,45 +843,21 @@ msgstr ""
 msgid "use custom configuration file."
 msgstr ""
 
-#. type: IP
-#: en/live-build.7:36
-#, no-wrap
-msgid "B<--debug>"
-msgstr ""
-
 #. type: Plain text
 #: en/live-build.7:38
 msgid "show debug information."
 msgstr ""
 
-#. type: IP
-#: en/live-build.7:38
-#, no-wrap
-msgid "B<--force>"
-msgstr ""
-
 #. type: Plain text
 #: en/live-build.7:40
 msgid "force helper execution, even if stage file exists."
 msgstr ""
 
-#. type: IP
-#: en/live-build.7:40
-#, no-wrap
-msgid "B<--quiet>"
-msgstr ""
-
 #. type: Plain text
 #: en/live-build.7:42
 msgid "be quiet."
 msgstr ""
 
-#. type: IP
-#: en/live-build.7:42
-#, no-wrap
-msgid "B<--verbose>"
-msgstr ""
-
 #.  FIXME
 #. type: Plain text
 #: en/live-build.7:45
diff --git a/manpages/pot/lb_config.1.pot b/manpages/pot/lb_config.1.pot
index e88128d..7121f60 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: 2010-11-29 23:13+0100\n"
+"POT-Creation-Date: 2010-12-05 16:39-0400\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"
@@ -252,7 +252,7 @@ msgstr ""
 #: en/lb_chroot_proc.1:9 en/lb_chroot_resolv.1:9 en/lb_chroot_selinuxfs.1:9
 #: en/lb_chroot_sources.1:9 en/lb_chroot_symlinks.1:9 en/lb_chroot_sysfs.1:9
 #: en/lb_chroot_sysv-rc.1:9 en/lb_chroot_sysvinit.1:9 en/lb_chroot_tasks.1:9
-#: en/lb_chroot_upstart.1:9 en/lb_clean.1:9 en/lb_config.1:207 en/lb_local.1:9
+#: en/lb_chroot_upstart.1:9 en/lb_clean.1:9 en/lb_config.1:227 en/lb_local.1:9
 #: en/lb_source.1:9 en/lb_source_checksums.1:9 en/lb_source_debian-live.1:9
 #: en/lb_source_debian.1:9 en/lb_source_disk.1:9 en/lb_source_iso.1:9
 #: en/lb_source_net.1:9 en/lb_source_tar.1:9 en/lb_source_usb.1:9
@@ -290,7 +290,7 @@ msgstr ""
 #: en/lb_chroot_symlinks.1:14 en/lb_chroot_sysfs.1:14
 #: en/lb_chroot_sysv-rc.1:14 en/lb_chroot_sysvinit.1:14
 #: en/lb_chroot_tasks.1:14 en/lb_chroot_upstart.1:14 en/lb_clean.1:16
-#: en/lb_config.1:216 en/lb_local.1:14 en/lb_source.1:14
+#: en/lb_config.1:236 en/lb_local.1:14 en/lb_source.1:14
 #: en/lb_source_checksums.1:14 en/lb_source_debian-live.1:14
 #: en/lb_source_debian.1:14 en/lb_source_disk.1:14 en/lb_source_iso.1:14
 #: en/lb_source_net.1:14 en/lb_source_tar.1:14 en/lb_source_usb.1:14
@@ -328,7 +328,7 @@ msgstr ""
 #: en/lb_chroot_symlinks.1:17 en/lb_chroot_sysfs.1:17
 #: en/lb_chroot_sysv-rc.1:17 en/lb_chroot_sysvinit.1:17
 #: en/lb_chroot_tasks.1:17 en/lb_chroot_upstart.1:17 en/lb_clean.1:38
-#: en/lb_config.1:428 en/lb_local.1:17 en/lb_source.1:17
+#: en/lb_config.1:468 en/lb_local.1:17 en/lb_source.1:17
 #: en/lb_source_checksums.1:17 en/lb_source_debian-live.1:17
 #: en/lb_source_debian.1:17 en/lb_source_disk.1:17 en/lb_source_iso.1:17
 #: en/lb_source_net.1:17 en/lb_source_tar.1:17 en/lb_source_usb.1:17
@@ -367,7 +367,7 @@ msgstr ""
 #: en/lb_chroot_symlinks.1:21 en/lb_chroot_sysfs.1:21
 #: en/lb_chroot_sysv-rc.1:21 en/lb_chroot_sysvinit.1:21
 #: en/lb_chroot_tasks.1:21 en/lb_chroot_upstart.1:21 en/lb_clean.1:43
-#: en/lb_config.1:435 en/lb_local.1:20 en/lb_source.1:20
+#: en/lb_config.1:475 en/lb_local.1:20 en/lb_source.1:20
 #: en/lb_source_checksums.1:21 en/lb_source_debian-live.1:21
 #: en/lb_source_debian.1:21 en/lb_source_disk.1:21 en/lb_source_iso.1:21
 #: en/lb_source_net.1:21 en/lb_source_tar.1:21 en/lb_source_usb.1:21
@@ -405,7 +405,7 @@ msgstr ""
 #: en/lb_chroot_symlinks.1:23 en/lb_chroot_sysfs.1:23
 #: en/lb_chroot_sysv-rc.1:23 en/lb_chroot_sysvinit.1:23
 #: en/lb_chroot_tasks.1:23 en/lb_chroot_upstart.1:23 en/lb_clean.1:45
-#: en/lb_config.1:437 en/lb_local.1:22 en/lb_source.1:22
+#: en/lb_config.1:477 en/lb_local.1:22 en/lb_source.1:22
 #: en/lb_source_checksums.1:23 en/lb_source_debian-live.1:23
 #: en/lb_source_debian.1:23 en/lb_source_disk.1:23 en/lb_source_iso.1:23
 #: en/lb_source_net.1:23 en/lb_source_tar.1:23 en/lb_source_usb.1:23
@@ -442,7 +442,7 @@ msgstr ""
 #: en/lb_chroot_symlinks.1:25 en/lb_chroot_sysfs.1:25
 #: en/lb_chroot_sysv-rc.1:25 en/lb_chroot_sysvinit.1:25
 #: en/lb_chroot_tasks.1:25 en/lb_chroot_upstart.1:25 en/lb_clean.1:47
-#: en/lb_config.1:439 en/lb_local.1:24 en/lb_source.1:24
+#: en/lb_config.1:479 en/lb_local.1:24 en/lb_source.1:24
 #: en/lb_source_checksums.1:25 en/lb_source_debian-live.1:25
 #: en/lb_source_debian.1:25 en/lb_source_disk.1:25 en/lb_source_iso.1:25
 #: en/lb_source_net.1:25 en/lb_source_tar.1:25 en/lb_source_usb.1:25
@@ -479,7 +479,7 @@ msgstr ""
 #: en/lb_chroot_symlinks.1:26 en/lb_chroot_sysfs.1:26
 #: en/lb_chroot_sysv-rc.1:26 en/lb_chroot_sysvinit.1:26
 #: en/lb_chroot_tasks.1:26 en/lb_chroot_upstart.1:26 en/lb_clean.1:48
-#: en/lb_config.1:440 en/lb_local.1:25 en/lb_source.1:25
+#: en/lb_config.1:480 en/lb_local.1:25 en/lb_source.1:25
 #: en/lb_source_checksums.1:26 en/lb_source_debian-live.1:26
 #: en/lb_source_debian.1:26 en/lb_source_disk.1:26 en/lb_source_iso.1:26
 #: en/lb_source_net.1:26 en/lb_source_tar.1:26 en/lb_source_usb.1:26
@@ -517,7 +517,7 @@ msgstr ""
 #: en/lb_chroot_symlinks.1:28 en/lb_chroot_sysfs.1:28
 #: en/lb_chroot_sysv-rc.1:28 en/lb_chroot_sysvinit.1:28
 #: en/lb_chroot_tasks.1:28 en/lb_chroot_upstart.1:28 en/lb_clean.1:50
-#: en/lb_config.1:442 en/lb_local.1:27 en/lb_source.1:27
+#: en/lb_config.1:482 en/lb_local.1:27 en/lb_source.1:27
 #: en/lb_source_checksums.1:28 en/lb_source_debian-live.1:28
 #: en/lb_source_debian.1:28 en/lb_source_disk.1:28 en/lb_source_iso.1:28
 #: en/lb_source_net.1:28 en/lb_source_tar.1:28 en/lb_source_usb.1:28
@@ -557,7 +557,7 @@ msgstr ""
 #: en/lb_chroot_symlinks.1:29 en/lb_chroot_sysfs.1:29
 #: en/lb_chroot_sysv-rc.1:29 en/lb_chroot_sysvinit.1:29
 #: en/lb_chroot_tasks.1:29 en/lb_chroot_upstart.1:29 en/lb_clean.1:51
-#: en/lb_config.1:443 en/lb_local.1:28 en/lb_source.1:28
+#: en/lb_config.1:483 en/lb_local.1:28 en/lb_source.1:28
 #: en/lb_source_checksums.1:29 en/lb_source_debian-live.1:29
 #: en/lb_source_debian.1:29 en/lb_source_disk.1:29 en/lb_source_iso.1:29
 #: en/lb_source_net.1:29 en/lb_source_tar.1:29 en/lb_source_usb.1:29
@@ -595,7 +595,7 @@ msgstr ""
 #: en/lb_chroot_symlinks.1:31 en/lb_chroot_sysfs.1:31
 #: en/lb_chroot_sysv-rc.1:31 en/lb_chroot_sysvinit.1:31
 #: en/lb_chroot_tasks.1:31 en/lb_chroot_upstart.1:31 en/lb_clean.1:53
-#: en/lb_config.1:445 en/lb_local.1:30 en/lb_source.1:30
+#: en/lb_config.1:485 en/lb_local.1:30 en/lb_source.1:30
 #: en/lb_source_checksums.1:31 en/lb_source_debian-live.1:31
 #: en/lb_source_debian.1:31 en/lb_source_disk.1:31 en/lb_source_iso.1:31
 #: en/lb_source_net.1:31 en/lb_source_tar.1:31 en/lb_source_usb.1:31
@@ -636,7 +636,7 @@ msgstr ""
 #: en/lb_chroot_symlinks.1:32 en/lb_chroot_sysfs.1:32
 #: en/lb_chroot_sysv-rc.1:32 en/lb_chroot_sysvinit.1:32
 #: en/lb_chroot_tasks.1:32 en/lb_chroot_upstart.1:32 en/lb_clean.1:54
-#: en/lb_config.1:446 en/lb_local.1:31 en/lb_source.1:31
+#: en/lb_config.1:486 en/lb_local.1:31 en/lb_source.1:31
 #: en/lb_source_checksums.1:32 en/lb_source_debian-live.1:32
 #: en/lb_source_debian.1:32 en/lb_source_disk.1:32 en/lb_source_iso.1:32
 #: en/lb_source_net.1:32 en/lb_source_tar.1:32 en/lb_source_usb.1:32
@@ -674,7 +674,7 @@ msgstr ""
 #: en/lb_chroot_symlinks.1:33 en/lb_chroot_sysfs.1:33
 #: en/lb_chroot_sysv-rc.1:33 en/lb_chroot_sysvinit.1:33
 #: en/lb_chroot_tasks.1:33 en/lb_chroot_upstart.1:33 en/lb_clean.1:55
-#: en/lb_config.1:447 en/lb_local.1:32 en/lb_source.1:32
+#: en/lb_config.1:487 en/lb_local.1:32 en/lb_source.1:32
 #: en/lb_source_checksums.1:33 en/lb_source_debian-live.1:33
 #: en/lb_source_debian.1:33 en/lb_source_disk.1:33 en/lb_source_iso.1:33
 #: en/lb_source_net.1:33 en/lb_source_tar.1:33 en/lb_source_usb.1:33
@@ -702,7 +702,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:13
-msgid "B<\t[--apt> apt|aptitude]"
+msgid "  [B<--apt> apt|aptitude]"
 msgstr ""
 
 #. type: Plain text
@@ -837,12 +837,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:67
-msgid "  [B<--clean]>"
+msgid "  [B<--clean>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:69
-msgid "B<\t[-c|--conffile> I<FILE>]"
+msgid "  [-c|B<--conffile> I<FILE>]"
 msgstr ""
 
 #. type: Plain text
@@ -883,312 +883,362 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:85
-msgid "  [-d|B<--distribution> I<CODENAME>]"
+msgid "  [B<--debug>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:87
-msgid "  [--B<dump>]"
+msgid "  [-d|B<--distribution> I<CODENAME>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:89
-msgid "  [-e|B<--encryption> false|aes128|aes192|aes256]"
+msgid "  [B<--dump>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:91
-msgid "  [B<--fdisk> fdisk|fdisk.dist]"
+msgid "  [-e|B<--encryption> false|aes128|aes192|aes256]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:93
-msgid "  [B<--grub-splash> I<FILE>]"
+msgid "  [B<--fdisk> fdisk|fdisk.dist]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:95
-msgid "  [B<--gzip-options> I<OPTION>|\"I<OPTIONS>\"]"
+msgid "  [B<--force>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:97
-msgid "  [B<--hooks> I<FILE>]"
+msgid "  [B<--grub-splash> I<FILE>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:99
-msgid "  [B<--hostname> I<NAME>]"
+msgid "  [B<--gzip-options> I<OPTION>|\"I<OPTIONS>\"]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:101
-msgid "  [B<--ignore-system-defaults>]"
+msgid "  [B<--hooks> I<FILE>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:103
-msgid "  [B<--includes> I<PATH>]"
+msgid "  [B<--hostname> I<NAME>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:105
-msgid "  [B<--initramfs> auto|none|live-boot|live-initramfs|casper]"
+msgid "  [B<--ignore-system-defaults>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:107
-msgid "  [B<--interactive> shell]"
+msgid "  [B<--includes> I<PATH>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:109
-msgid "  [B<--iso-application> I<NAME>]"
+msgid "  [B<--initramfs> auto|none|live-boot|live-initramfs|casper]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:111
-msgid "  [B<--iso-preparer> I<NAME>]"
+msgid "  [B<--interactive> shell]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:113
-msgid "  [B<--iso-publisher> I<NAME>]"
+msgid "  [B<--isohybrid-options> I<OPTION>|\"I<OPTIONS>\"]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:115
-msgid "  [B<--iso-volume> I<NAME>]"
+msgid "  [B<--iso-application> I<NAME>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:117
-msgid "  [B<--jffs2-eraseblock> I<SIZE>]"
+msgid "  [B<--iso-preparer> I<NAME>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:119
-msgid "  [B<--keyring-packages> I<PACKAGE|\"PACKAGES\">]"
+msgid "  [B<--iso-publisher> I<NAME>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:121
-msgid "  [-l|B<--language> I<LANGUAGE>]"
+msgid "  [B<--iso-volume> I<NAME>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:123
-msgid "  [-k|B<--linux-flavours> I<FLAVOUR>|I<\"FLAVOURS\">]"
+msgid "  [B<--jffs2-eraseblock> I<SIZE>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:125
-msgid "  [B<--linux-packages> I<\"PACKAGES\">]"
+msgid "  [B<--keyring-packages> I<PACKAGE|\"PACKAGES\">]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:127
-msgid "  [B<--losetup> losetup|losetup.orig]"
+msgid "  [-l|B<--language> I<LANGUAGE>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:129
-msgid "  [B<--memtest> memtest86+|memtest86|none]"
+msgid "  [-k|B<--linux-flavours> I<FLAVOUR>|I<\"FLAVOURS\">]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:131
-msgid "  [-m|B<--mirror-bootstrap> I<URL>]"
+msgid "  [B<--linux-packages> I<\"PACKAGES\">]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:133
-msgid "  [B<--mirror-binary> I<URL>]"
+msgid "  [B<--losetup> losetup|losetup.orig]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:135
-msgid "  [B<--mirror-binary-security> I<URL>]"
+msgid "  [B<--memtest> memtest86+|memtest86|none]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:137
-msgid "  [B<--mirror-chroot> I<URL>]"
+msgid "  [-m|B<--mirror-bootstrap> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:139
-msgid "  [B<--mirror-chroot-security> I<URL>]"
+msgid "  [B<--mirror-chroot> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:141
-msgid "  [B<--mirror-debian-installer> I<URL>]"
+msgid "  [B<--mirror-chroot-security> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:143
-msgid "  [B<--mode> debian|emdebian|ubuntu]"
+msgid "  [B<--mirror-chroot-volatile> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:145
-msgid "  [B<--net-root-filesystem> nfs|cfs]"
+msgid "  [B<--mirror-chroot-backports> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:147
-msgid "  [B<--net-root-mountoptions> I<OPTIONS>]"
+msgid "  [B<--mirror-binary> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:149
-msgid "  [B<--net-root-path> I<PATH>]"
+msgid "  [B<--mirror-binary-security> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:151
-msgid "  [B<--net-root-server> I<IP>|I<HOSTNAME>]"
+msgid "  [B<--mirror-binary-volatile> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:153
-msgid "  [B<--net-cow-filesystem> nfs|cfs]"
+msgid "  [B<--mirror-binary-backports> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:155
-msgid "  [B<--net-cow-mountoptions> I<OPTIONS>]"
+msgid "  [B<--mirror-debian-installer> I<URL>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:157
-msgid "  [B<--net-cow-path> I<PATH>]"
+msgid "  [B<--mode> debian|emdebian|ubuntu]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:159
-msgid "  [B<--net-cow-server> I<IP>|I<HOSTNAME>]"
+msgid "  [B<--net-root-filesystem> nfs|cfs]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:161
-msgid "  [B<--net-tarball> bzip2|gzip|tar|none]"
+msgid "  [B<--net-root-mountoptions> I<OPTIONS>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:163
-msgid "  [-p|B<--packages-lists> I<LIST>|I<\"LISTS\">]"
+msgid "  [B<--net-root-path> I<PATH>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:165
-msgid "  [B<--packages> I<PACKAGE>|I<\"PACKAGES\">]"
+msgid "  [B<--net-root-server> I<IP>|I<HOSTNAME>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:167
-msgid "  [B<-r, --repositories >I<REPOSITORY>|I<\"REPOSITORIES\">]"
+msgid "  [B<--net-cow-filesystem> nfs|cfs]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:169
-msgid "  [B<--root-command> sudo]"
+msgid "  [B<--net-cow-mountoptions> I<OPTIONS>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:171
-msgid "  [B<--use-fakeroot> true|false]"
+msgid "  [B<--net-cow-path> I<PATH>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:173
-msgid "  [B<--archive-areas> I<ARCHIVE_AREA>|I<\"ARCHIVE_AREAS\">]"
+msgid "  [B<--net-cow-server> I<IP>|I<HOSTNAME>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:175
-msgid "  [B<--security> true|false]"
+msgid "  [B<--net-tarball> bzip2|gzip|tar|none]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:177
-msgid "  [B<--source> true|false]"
+msgid "  [-p|B<--packages-lists> I<LIST>|I<\"LISTS\">]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:179
-msgid "  [-s|B<--source-images> iso|net|tar|usb-hdd]"
+msgid "  [B<--packages> I<PACKAGE>|I<\"PACKAGES\">]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:181
-msgid "  [B<--symlinks> true|false]"
+msgid "  [B<--quiet>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:183
-msgid "  [B<--syslinux-splash> I<FILE>]"
+msgid "  [-r|B<--repositories >I<REPOSITORY>|I<\"REPOSITORIES\">]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:185
-msgid "  [B<--syslinux-timeout> I<SECONDS>]"
+msgid "  [B<--root-command> sudo]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:187
-msgid "  [B<--syslinux-menu> true|false]"
+msgid "  [B<--use-fakeroot> true|false]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:189
-msgid "  [B<--sysvinit> true|false]"
+msgid "  [B<--archive-areas> I<ARCHIVE_AREA>|I<\"ARCHIVE_AREAS\">]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:191
-msgid "  [B<--tasksel> aptitude|tasksel]"
+msgid "  [B<--security> true|false]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:193
-msgid "  [B<--tasks> I<TASK>|\"I<TASKS>\"]"
+msgid "  [B<--source> true|false]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:195
-msgid "  [B<--templates> I<PATH>]"
+msgid "  [-s|B<--source-images> iso|net|tar|usb-hdd]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:197
-msgid "  [B<--virtual-root-filesystem> ext3]"
+msgid "  [B<--symlinks> true|false]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:199
-msgid "  [B<--virtual-root-size >I<MB>]"
+msgid "  [B<--syslinux-splash> I<FILE>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:201
-msgid "  [B<--exposed-root> true|false]"
+msgid "  [B<--syslinux-timeout> I<SECONDS>]"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:203
+msgid "  [B<--syslinux-menu> true|false]"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:205
+msgid "  [B<--sysvinit> true|false]"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:207
+msgid "  [B<--tasksel> aptitude|tasksel]"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:209
+msgid "  [B<--tasks> I<TASK>|\"I<TASKS>\"]"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:211
+msgid "  [B<--templates> I<PATH>]"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:213
+msgid "  [B<--virtual-root-size >I<MB>]"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:215
+msgid "  [B<--volatile> true|false]"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:217
+msgid "  [B<--backports> true|false]"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:219
+msgid "  [B<--exposed-root> true|false]"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:221
 msgid "  [B<--username> I<NAME>]"
 msgstr ""
 
+#. type: Plain text
+#: en/lb_config.1:223
+msgid "  [B<--verbose>]"
+msgstr ""
+
 #.  FIXME
 #. type: Plain text
-#: en/lb_config.1:206
+#: en/lb_config.1:226
 msgid "  [B<--win32-loader true|false]>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:209
+#: en/lb_config.1:229
 msgid ""
 "B<lb config> is a high-level command (porcelain) of I<live-build>(7), the "
 "Debian Live tool suite."
@@ -1196,7 +1246,7 @@ msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/lb_config.1:212
+#: en/lb_config.1:232
 msgid ""
 "B<lb config> populates the configuration directory for live-build. By "
 "default, this directory is named 'config' and is created in the current "
@@ -1205,7 +1255,7 @@ msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/lb_config.1:215
+#: en/lb_config.1:235
 msgid ""
 "Note: Currently B<lb config> tries to be smart and sets defaults for some "
 "options depending on the setting of other options (e.g. which linux packages "
@@ -1221,7 +1271,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:218
+#: en/lb_config.1:238
 msgid ""
 "In addition to its specific options B<lb config> understands all generic "
 "live-build options. See I<live-build>(7) for a complete list of all generic "
@@ -1230,27 +1280,26 @@ msgstr ""
 
 #.  FIXME
 #. type: IP
-#: en/lb_config.1:220
+#: en/lb_config.1:240
 #, no-wrap
 msgid "B<--apt> apt|aptitude"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:222
+#: en/lb_config.1:242
 msgid ""
 "defines if apt-get or aptitude is used to install packages when building the "
-"image. When building etch images, this defaults to aptitude. Every other "
-"distribution defaults to apt."
+"image. The default is apt."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:222
+#: en/lb_config.1:242
 #, no-wrap
 msgid "B<--apt-ftp-proxy> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:224
+#: en/lb_config.1:244
 msgid ""
 "sets the ftp proxy to be used by apt. By default, this is empty but if the "
 "host has the environment variable ftp_proxy set, apt-ftp-proxy gets "
@@ -1258,13 +1307,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:224
+#: en/lb_config.1:244
 #, no-wrap
 msgid "B<--apt-http-proxy> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:226
+#: en/lb_config.1:246
 msgid ""
 "sets the http proxy to be used by apt. By default, this is empty but if the "
 "host has the environment variable http_proxy set, apt-http-proxy gets "
@@ -1272,26 +1321,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:226
+#: en/lb_config.1:246
 #, no-wrap
 msgid "B<--apt-pdiffs> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:228
+#: en/lb_config.1:248
 msgid ""
 "defines whetever apt should use incremental package indices feature or not. "
 "This is true by default."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:228
+#: en/lb_config.1:248
 #, no-wrap
 msgid "B<--apt-options> I<OPTION>|\"I<OPTIONS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:230
+#: en/lb_config.1:250
 msgid ""
 "defines the default options that will be appended to every apt call that is "
 "made inside chroot during the building of the image. By default, this is set "
@@ -1299,13 +1348,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:230
+#: en/lb_config.1:250
 #, no-wrap
 msgid "B<--aptitude-options> I<OPTION>|\"I<OPTIONS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:232
+#: en/lb_config.1:252
 msgid ""
 "defines the default options that will be appended to every aptitude call "
 "that is made inside chroot during building of the image. By default, this is "
@@ -1313,13 +1362,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:232
+#: en/lb_config.1:252
 #, no-wrap
 msgid "B<--apt-pipeline> I<DEPTH>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:234
+#: en/lb_config.1:254
 msgid ""
 "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 "
@@ -1331,38 +1380,38 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:234
+#: en/lb_config.1:254
 #, no-wrap
 msgid "B<--apt-recommends> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:236
+#: en/lb_config.1:256
 msgid ""
 "defines if apt should install recommended packages automatically. By "
 "default, this is true except in emdebian mode."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:236
+#: en/lb_config.1:256
 #, no-wrap
 msgid "B<--apt-secure> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:238
+#: en/lb_config.1:258
 msgid ""
 "defines if apt should check repository signatures. This is true by default."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:238
+#: en/lb_config.1:258
 #, no-wrap
 msgid "-a|B<--architecture> I<ARCHITECTURE>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:240
+#: en/lb_config.1:260
 msgid ""
 "defines the architecture of the to be build image. By default, this is set "
 "to the host architecture. Note that you cannot crossbuild for another "
@@ -1373,26 +1422,27 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:240
+#: en/lb_config.1:260
 #, no-wrap
 msgid "-b|B<--binary-images> iso|iso-hybrid|net|tar|usb-hdd"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:242
+#: en/lb_config.1:262
 msgid ""
-"defines the image type to build. By default this is set to iso to build CD/"
-"DVD images, for squeeze and newer it defaults to iso-hybrid."
+"defines the image type to build. By default, for images using syslinux this "
+"is set to iso-hybrid to build CD/DVD images that may also be used like usb-"
+"hdd images, for legacy lenny and non-syslinux images, it defaults to iso."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:242
+#: en/lb_config.1:262
 #, no-wrap
 msgid "B<--binary-filesystem> fat16|fat32|ext2"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:244
+#: en/lb_config.1:264
 msgid ""
 "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 "
@@ -1405,37 +1455,37 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:244
+#: en/lb_config.1:264
 #, no-wrap
 msgid "B<--binary-indices> true|false|none"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:246
+#: en/lb_config.1:266
 msgid ""
 "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."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:246
+#: en/lb_config.1:266
 #, no-wrap
 msgid "B<--bootappend-install> I<PARAMETER>|\"I<PARAMETERS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:248
+#: en/lb_config.1:268
 msgid "sets boot parameters specific to debian-installer, if included."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:248
+#: en/lb_config.1:268
 #, no-wrap
 msgid "B<--bootappend-live> I<PARAMETER>|\"I<PARAMETERS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:250
+#: en/lb_config.1:270
 msgid ""
 "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 "
@@ -1444,13 +1494,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:250
+#: en/lb_config.1:270
 #, no-wrap
 msgid "B<--bootloader> grub|syslinux|yaboot"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:252
+#: en/lb_config.1:272
 msgid ""
 "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 "
@@ -1463,13 +1513,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:252
+#: en/lb_config.1:272
 #, no-wrap
 msgid "B<--bootstrap> cdebootstrap|cdebootstrap-static|debootstrap|copy"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:254
+#: en/lb_config.1:274
 msgid ""
 "defines which program is used to bootstrap the debian chroot, default is "
 "debootstrap. Note that if you set the bootstrap program to copy, then your "
@@ -1479,13 +1529,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:254
+#: en/lb_config.1:274
 #, no-wrap
 msgid "B<--bootstrap-config> I<FILE>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:256
+#: en/lb_config.1:276
 msgid ""
 "sets a custom configuration file for the boostrap programm of choice and is "
 "empty by default. Refere to the documentation of debootstrap or cdebootstrap "
@@ -1494,13 +1544,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:256
+#: en/lb_config.1:276
 #, no-wrap
 msgid "-f|B<--bootstrap-flavour> minimal|standard"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:258
+#: en/lb_config.1:278
 msgid ""
 "defines if the bootstrap program should bootstrap the standard system (all "
 "packages of priority required and important, which is the default) or a "
@@ -1508,39 +1558,39 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:258
+#: en/lb_config.1:278
 #, no-wrap
 msgid "B<--bootstrap-keyring> I<PACKAGE>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:260
+#: en/lb_config.1:280
 msgid ""
 "sets the archive keyring package to be used. Default is debian-archive-"
 "keyring."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:260
+#: en/lb_config.1:280
 #, no-wrap
 msgid "B<--cache> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:262
+#: en/lb_config.1:282
 msgid ""
 "defines globally if any cache should be used at all. Different caches can be "
 "controled through the their own options."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:262
+#: en/lb_config.1:282
 #, no-wrap
 msgid "B<--cache-indices> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:264
+#: en/lb_config.1:284
 msgid ""
 "defines if downloaded package indices and lists should be cached which is "
 "false by default. Enabling it would allow to rebuild an image completely "
@@ -1548,13 +1598,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:264
+#: en/lb_config.1:284
 #, no-wrap
 msgid "B<--cache-packages> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:266
+#: en/lb_config.1:286
 msgid ""
 "defines if downloaded packages files should be cached which is true by "
 "default. Disabling it does save space consumtion in your build directory, "
@@ -1565,13 +1615,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:266
+#: en/lb_config.1:286
 #, no-wrap
 msgid "B<--cache-stages> true|false|I<STAGE>|\"I<STAGES>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:268
+#: en/lb_config.1:288
 msgid ""
 "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 "
@@ -1581,13 +1631,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:268
+#: en/lb_config.1:288
 #, no-wrap
 msgid "B<--checksums> md5|sha1|sha256|none"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:270
+#: en/lb_config.1:290
 msgid ""
 "defines if the binary image should contain a file called md5sums.txt, "
 "sha1sums.txt and/or sha256sums.txt. These lists all files on the image "
@@ -1599,13 +1649,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:270
+#: en/lb_config.1:290
 #, no-wrap
 msgid "B<--build-with-chroot> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:272
+#: en/lb_config.1:292
 msgid ""
 "defines whetever live-build should use the tools from within the chroot to "
 "build the binary image or not by using and including the host systems tools. "
@@ -1620,13 +1670,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:272
+#: en/lb_config.1:292
 #, no-wrap
 msgid "B<--chroot-filesystem> ext2|ext3|squashfs|plain|jffs2"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:274
+#: en/lb_config.1:294
 msgid ""
 "defines which filesystem type should be used for the root filesystem image. "
 "If you use plain, then no filesystem image is created and the root "
@@ -1637,39 +1687,39 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:274
+#: en/lb_config.1:294
 #, no-wrap
 msgid "B<--clean>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:276
+#: en/lb_config.1:296
 msgid ""
 "minimizes config directory by automatically removing unused and thus empty "
 "subdirectories."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:276
+#: en/lb_config.1:296
 #, no-wrap
 msgid "-c|B<--conffile> I<FILE>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:278
+#: en/lb_config.1:298
 msgid ""
 "using a user specified alternative configuration file in addition to the "
 "normally used one in the config directory."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:278
+#: en/lb_config.1:298
 #, no-wrap
 msgid "B<--debconf-frontend> dialog|editor|noninteractive|readline"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:280
+#: en/lb_config.1:300
 msgid ""
 "defines what value the debconf frontend should be set to inside the chroot. "
 "Note that setting it to anything by noninteractive, which is the default, "
@@ -1677,13 +1727,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:280
+#: en/lb_config.1:300
 #, no-wrap
 msgid "B<--debconf-nowarnings> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:282
+#: en/lb_config.1:302
 msgid ""
 "defines if warnings of debconf should be displayed or not. Warnings from "
 "debconf are generally very rare and by default, we skipp them, if any, in "
@@ -1691,13 +1741,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:282
+#: en/lb_config.1:302
 #, no-wrap
 msgid "B<--debconf-priority> low|medium|high|critical"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:284
+#: en/lb_config.1:304
 msgid ""
 "defines what value the debconf priority shoul dbe set to inside the chroot. "
 "By default, it is set to critical, which means that almost no questions are "
@@ -1706,13 +1756,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:284
+#: en/lb_config.1:304
 #, no-wrap
 msgid "B<--debian-installer> true|cdrom|netinst|netboot|businesscard|live|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:286
+#: en/lb_config.1:306
 msgid ""
 "defines which type, if any, of the debian-installer should be included in "
 "the resulting binary image. By default, no installer is included. All "
@@ -1724,13 +1774,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:286
+#: en/lb_config.1:306
 #, no-wrap
 msgid "B<--debian-installer-distribution> daily|I<CODENAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:288
+#: en/lb_config.1:308
 msgid ""
 "defines the distribution where the debian-installer files should be taken "
 "out from. Normally, this should be set to the same distribution as the live "
@@ -1739,26 +1789,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:288
+#: en/lb_config.1:308
 #, no-wrap
 msgid "B<--debian-installer-preseedfile> I<FILE>|I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:290
+#: en/lb_config.1:310
 msgid ""
 "sets the filename or URL for an optionally used and included preseeding file "
 "for debian-installer."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:290
+#: en/lb_config.1:310
 #, no-wrap
 msgid "B<--debian-installer-gui> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:292
+#: en/lb_config.1:312
 msgid ""
 "defines if the debian-installer graphical GTK interface should be true or "
 "not. In Debian mode and for most versions of Ubuntu, this option is true, "
@@ -1766,24 +1816,35 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:292
+#: en/lb_config.1:312 en/live-build.7:36
+#, no-wrap
+msgid "B<--debug>"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:314
+msgid "turn on debugging informational messages."
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:314
 #, no-wrap
 msgid "-d|B<--distribution> I<CODENAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:294
+#: en/lb_config.1:316
 msgid "defines the distribution of the resulting live system."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:294
+#: en/lb_config.1:316
 #, no-wrap
-msgid "--B<dump>"
+msgid "B<--dump>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:296
+#: en/lb_config.1:318
 msgid ""
 "prepares a report of the currently present live system configuration and the "
 "version of live-build used. This is useful to provide if you submit bug "
@@ -1792,52 +1853,66 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:296
+#: en/lb_config.1:318
 #, no-wrap
 msgid "-e|B<--encryption> false|aes128|aes192|aes256"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:298
+#: en/lb_config.1:320
 msgid ""
 "defines if the root filesystem should be encrypted or not. By default, this "
 "is false."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:298
+#: en/lb_config.1:320
 #, no-wrap
 msgid "B<--fdisk> fdisk|fdisk.dist"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:300
+#: en/lb_config.1:322
 msgid ""
 "sets the filename of the fdisk binary from the host system that should be "
 "used. This is autodetected and does generally not need any customization."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:300
+#: en/lb_config.1:322 en/live-build.7:38
+#, no-wrap
+msgid "B<--force>"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:324
+msgid ""
+"forces re-execution of already run stages. Use only if you know what you are "
+"doing. It is generally safer to use B<lb clean> to clean up before re-"
+"executing B<lb build>."
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:324
 #, no-wrap
 msgid "B<--grub-splash> I<FILE>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:302
+#: en/lb_config.1:326
 msgid ""
 "defines the name of an optional to be included splash screen graphic for the "
 "grub bootloader."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:302
+#: en/lb_config.1:326
 #, no-wrap
 msgid "B<--gzip-options> I<OPTION>|\"I<OPTIONS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:304
+#: en/lb_config.1:328
 msgid ""
 "defines the default options that will be appended to (almost) every gzip "
 "call during the building of the image. By default, this is set to --best to "
@@ -1846,13 +1921,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:304
+#: en/lb_config.1:328
 #, no-wrap
 msgid "B<--hooks> I<FILE>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:306
+#: en/lb_config.1:330
 msgid ""
 "defines which hooks available in /usr/share/live/build/examples/hooks should "
 "be activated. Normally, there are no hooks executed. Make sure you know and "
@@ -1860,24 +1935,24 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:306
+#: en/lb_config.1:330
 #, no-wrap
 msgid "B<--hostname> I<NAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:308
+#: en/lb_config.1:332
 msgid "sets the hostname of the live system."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:308
+#: en/lb_config.1:332
 #, no-wrap
 msgid "B<--ignore-system-defaults>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:310
+#: en/lb_config.1:334
 msgid ""
 "B<lb config> by default reads system defaults from /etc/live/build.conf and /"
 "etc/live/build.d when generating a new live system config directory. This is "
@@ -1886,13 +1961,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:310
+#: en/lb_config.1:334
 #, no-wrap
 msgid "B<--includes> I<PATH>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:312
+#: en/lb_config.1:336
 msgid ""
 "sets the path to the includes that live-build is going to use, e.g. "
 "additional minimal documentation that you want to have on all live systems. "
@@ -1900,31 +1975,30 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:312
+#: en/lb_config.1:336
 #, no-wrap
 msgid "B<--initramfs> auto|none|live-boot|live-initramfs|casper"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:314
+#: en/lb_config.1:338
 msgid ""
 "sets the name of package that contains the live system specific initramfs "
 "modification. By default, auto is used, which means that at build time of "
 "the image rather than on configuration time, the value will be expanded to "
-"casper when building etch systems or ubuntu systems, to live-initramfs for "
-"all other systems up to squeeze, and to live-boot for wheezy and newer. "
-"Using 'none' is usefull if the resulting system image should not be a live "
-"image (experimental)."
+"casper when building ubuntu systems, to live-initramfs for legacy lenny, and "
+"to live-boot for squeeze and newer. Using 'none' is useful if the resulting "
+"system image should not be a live image (experimental)."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:314
+#: en/lb_config.1:338
 #, no-wrap
 msgid "B<--interactive> shell"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:316
+#: en/lb_config.1:340
 msgid ""
 "defines if after the chroot stage and before the beginning of the binary "
 "stage, a interactive shell login should be spawned in the chroot in order to "
@@ -1938,13 +2012,24 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:316
+#: en/lb_config.1:340
+#, no-wrap
+msgid "B<--isohybrid-options> I<OPTION>|\"I<OPTIONS>\""
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:342
+msgid "defines options to pass to isohybrid."
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:342
 #, no-wrap
 msgid "B<--iso-application> I<NAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:318
+#: en/lb_config.1:344
 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 "
@@ -1952,13 +2037,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:318
+#: en/lb_config.1:344
 #, no-wrap
 msgid "B<--iso-preparer> I<NAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:320
+#: en/lb_config.1:346
 msgid ""
 "sets the PREPARER field in the header of a resulting CD/DVD image. By "
 "default this is set to \"live-build I<VERSION>; http://packages.qa.debian."
@@ -1967,13 +2052,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:320
+#: en/lb_config.1:346
 #, no-wrap
 msgid "B<--iso-publisher> I<NAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:322
+#: en/lb_config.1:348
 msgid ""
 "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-"
@@ -1982,13 +2067,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:322
+#: en/lb_config.1:348
 #, no-wrap
 msgid "B<--iso-volume> I<NAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:324
+#: en/lb_config.1:350
 msgid ""
 "sets the VOLUME field in the header of a resulting CD/DVD and defaults to "
 "'(I<MODE>) (I<DISTRIBUTION>) (I<DATE>)' whereas MODE is expanded to the name "
@@ -2000,13 +2085,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:324
+#: en/lb_config.1:350
 #, no-wrap
 msgid "B<--jffs2-eraseblock> I<SIZE>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:326
+#: en/lb_config.1:352
 msgid ""
 "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 "
@@ -2016,26 +2101,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:326
+#: en/lb_config.1:352
 #, no-wrap
 msgid "B<--keyring-packages> I<PACKAGE|\"PACKAGES>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:328
+#: en/lb_config.1:354
 msgid ""
 "sets the keyring package or additional keyring packages. By default this is "
 "set to debian-archive-keyring."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:328
+#: en/lb_config.1:354
 #, no-wrap
 msgid "-l|B<--language> I<LANGUAGE>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:330
+#: en/lb_config.1:356
 msgid ""
 "sets the language of a live system by installing l10n related packages. It "
 "doesn't enable generation of the correct locales through setting the right "
@@ -2043,26 +2128,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:330
+#: en/lb_config.1:356
 #, no-wrap
 msgid "-k|B<--linux-flavours> I<FLAVOUR>|\"I<FLAVOURS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:332
+#: en/lb_config.1:358
 msgid ""
 "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."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:332
+#: en/lb_config.1:358
 #, no-wrap
 msgid "B<--linux-packages> \"I<PACKAGES>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:334
+#: en/lb_config.1:360
 msgid ""
 "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 "
@@ -2076,26 +2161,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:334
+#: en/lb_config.1:360
 #, no-wrap
 msgid "B<--losetup> losetup|losetup.orig"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:336
+#: en/lb_config.1:362
 msgid ""
 "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."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:336
+#: en/lb_config.1:362
 #, no-wrap
 msgid "B<--memtest> memtest86+|memtest86|none"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:338
+#: en/lb_config.1:364
 msgid ""
 "defines if memtest, memtest86+ or no memory tester at all should be included "
 "as secondary bootloader configuration. This is only available on amd64 and "
@@ -2103,26 +2188,83 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:338
+#: en/lb_config.1:364
 #, no-wrap
 msgid "-m|B<--mirror-bootstrap> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:340
+#: en/lb_config.1:366
 msgid ""
 "sets the location of the debian package mirror that should be used to "
-"bootstrap from."
+"bootstrap from. This defaults to http://ftp.de.debian.org/debian/ which may "
+"not be a good default if you live outside of Europe."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:340
+#: en/lb_config.1:366
+#, no-wrap
+msgid "B<--mirror-chroot> I<URL>"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:368
+msgid ""
+"sets the location of the debian package mirror that will be used to fetch "
+"the packages in order to build the live system. By default, this is set to "
+"the value of --mirror-bootstrap."
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:368
+#, no-wrap
+msgid "B<--mirror-chroot-security> I<URL>"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:370
+msgid ""
+"sets the location of the debian security package mirror that will be used to "
+"fetch the packages in order to build the live system. By default, this "
+"points to http://security.debian.org/debian/."
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:370
+#, no-wrap
+msgid "B<--mirror-chroot-volatile> I<URL>"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:372
+msgid ""
+"sets the location of the debian volatile package mirror that will be used to "
+"fetch packages in order to build the live system. By default, this is set to "
+"the value of --mirror-chroot."
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:372
+#, no-wrap
+msgid "B<--mirror-chroot-backports> I<URL>"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:374
+msgid ""
+"sets the location of the debian backports package mirror that will be used "
+"to fetch packages in order to build the live system. By default, this points "
+"to http://backports.debian.org/debian-backports/."
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:374
 #, no-wrap
 msgid "B<--mirror-binary> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:342
+#: en/lb_config.1:376
 msgid ""
 "sets the location of the debian package mirror that should end up configured "
 "in the final image and which is the one a user would see and use. This has "
@@ -2132,109 +2274,108 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:342
+#: en/lb_config.1:376
 #, no-wrap
 msgid "B<--mirror-binary-security> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:344
+#: en/lb_config.1:378
 msgid ""
 "sets the location of the debian security package mirror that should end up "
-"configuered in the final image. By default, 'http://cdn.debian.net/debian-"
+"configured in the final image. By default, 'http://cdn.debian.net/debian-"
 "security/' is used."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:344
+#: en/lb_config.1:378
 #, no-wrap
-msgid "B<--mirror-chroot> I<URL>"
+msgid "B<--mirror-binary-volatile> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:346
+#: en/lb_config.1:380
 msgid ""
-"sets the location of the debian package mirror that will be used to fetch "
-"the packages in order to build the live system. By default, this points to "
-"http://ftp.de.debian.org/debian/ which may not be a good default if you live "
-"outside the U.S."
+"sets the location of the debian volatile package mirror that should end up "
+"configured in the final image. By default, the value of --mirror-binary is "
+"used."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:346
+#: en/lb_config.1:380
 #, no-wrap
-msgid "B<--mirror-chroot-security> I<URL>"
+msgid "B<--mirror-binary-backports> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:348
+#: en/lb_config.1:382
 msgid ""
-"sets the location of the debian security package mirror that will be used to "
-"fetch the packages in order to build the live system. By default, this "
-"points to http://security.debian.org/debian/."
+"sets the location of the debian backports package mirror that should end up "
+"configured in the final image. By default, 'http://backports.debian.org/"
+"debian-backports/' is used."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:348
+#: en/lb_config.1:382
 #, no-wrap
 msgid "B<--mirror-debian-installer> I<URL>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:350
+#: en/lb_config.1:384
 msgid ""
 "sets the location of the mirror that will be used to fetch the debian "
 "installer images. By default, this points to the same mirror used to build "
-"the live system."
+"the live system, i.e. the value of --mirror-bootstrap."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:350
+#: en/lb_config.1:384
 #, no-wrap
 msgid "B<--mode> debian|emdebian|ubuntu"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:352
+#: en/lb_config.1:386
 msgid ""
 "defines a global mode to load project specific defaults. By default this is "
 "set to debian."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:352
+#: en/lb_config.1:386
 #, no-wrap
 msgid "B<--net-root-filesystem> nfs|cfs"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:354
+#: en/lb_config.1:388
 msgid ""
 "defines the filesystem that will be configured in the bootloader "
 "configuration for your netboot image. This defaults to nfs."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:354
+#: en/lb_config.1:388
 #, no-wrap
 msgid "B<--net-root-mountoptions> I<OPTIONS>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:356
+#: en/lb_config.1:390
 msgid ""
 "sets additional options for mounting the root filesystem in netboot images "
 "and is by default empty."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:356
+#: en/lb_config.1:390
 #, no-wrap
 msgid "B<--net-root-path> I<PATH>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:358
+#: en/lb_config.1:392
 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 "
@@ -2243,13 +2384,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:358
+#: en/lb_config.1:392
 #, no-wrap
 msgid "B<--net-root-server> I<IP>|I<HOSTNAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:360
+#: en/lb_config.1:394
 msgid ""
 "sets the IP or hostname that will be configured in the bootloader "
 "configuration for the root filesystem of your netboot image. This defaults "
@@ -2257,38 +2398,38 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:360
+#: en/lb_config.1:394
 #, no-wrap
 msgid "B<--net-cow-filesystem> nfs|cfs"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:362
+#: en/lb_config.1:396
 msgid ""
 "defines the filesystem type for the copy-on-write layer and defaults to nfs."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:362
+#: en/lb_config.1:396
 #, no-wrap
 msgid "B<--net-cow-mountoptions> I<OPTIONS>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:364
+#: en/lb_config.1:398
 msgid ""
 "sets additional options for mounting the copy-on-write layer in netboot "
 "images and is by default empty."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:364
+#: en/lb_config.1:398
 #, no-wrap
 msgid "B<--net-cow-path> I<PATH>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:366
+#: en/lb_config.1:400
 msgid ""
 "defines the path to client writable filesystem. Anywhere that "
 "I<client_mac_address> is specified in the path live-initramfs will "
@@ -2296,28 +2437,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:369
+#: en/lb_config.1:403
 msgid "Example:"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:371
+#: en/lb_config.1:405
 msgid "/export/hosts/client_mac_address"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:373
+#: en/lb_config.1:407
 msgid "/export/hosts/00-16-D3-33-92-E8"
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:373
+#: en/lb_config.1:407
 #, no-wrap
 msgid "B<--net-cow-server> I<IP>|I<HOSTNAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:375
+#: en/lb_config.1:409
 msgid ""
 "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 "
@@ -2325,13 +2466,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:375
+#: en/lb_config.1:409
 #, no-wrap
 msgid "B<--net-tarball> bzip2|gzip|tar|none"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:377
+#: en/lb_config.1:411
 msgid ""
 "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. "
@@ -2340,13 +2481,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:377
+#: en/lb_config.1:411
 #, no-wrap
 msgid "-p|B<--packages-lists> I<LIST>|\"I<LISTS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:379
+#: en/lb_config.1:413
 msgid ""
 "defines which lists available in /usr/share/live/build/lists should be used. "
 "By default, this is set to standard. Note that in case you have local "
@@ -2356,13 +2497,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:379
+#: en/lb_config.1:413
 #, no-wrap
 msgid "B<--packages> I<PACKAGE>|\"I<PACKAGES>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:381
+#: en/lb_config.1:415
 msgid ""
 "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 "
@@ -2371,26 +2512,37 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:381
+#: en/lb_config.1:415 en/live-build.7:40
 #, no-wrap
-msgid "B<-r, --repositories> I<REPOSITORY>|\"I<REPOSITORIES>\""
+msgid "B<--quiet>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:383
+#: en/lb_config.1:417
+msgid "reduces the verbosity of messages output by B<lb build>."
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:417
+#, no-wrap
+msgid "-r|B<--repositories> I<REPOSITORY>|\"I<REPOSITORIES>\""
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:419
 msgid ""
 "enables one of available third-party repository configurations in /usr/share/"
 "live/build/repositories."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:383
+#: en/lb_config.1:419
 #, no-wrap
 msgid "B<--root-command> sudo"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:385
+#: en/lb_config.1:421
 msgid ""
 "controls if live-build should use sudo internally to build the live image. "
 "Note that this is not well tested and that you should, when relying on sudo, "
@@ -2398,13 +2550,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:385
+#: en/lb_config.1:421
 #, no-wrap
 msgid "B<--use-fakeroot> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:387
+#: en/lb_config.1:423
 msgid ""
 "controls if live-build should utilize fakeroot and fakechroot to try and "
 "avoid requiring root privillages where possible. By default, this option is "
@@ -2412,13 +2564,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:387
+#: en/lb_config.1:423
 #, no-wrap
 msgid "B<--archive-areas> I<ARCHIVE_AREA>|\"I<ARCHIVE_AREAS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:389
+#: en/lb_config.1:425
 msgid ""
 "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. "
@@ -2428,26 +2580,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:389
+#: en/lb_config.1:425
 #, no-wrap
 msgid "B<--security> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:391
+#: en/lb_config.1:427
 msgid ""
 "defines if the security repositories specified in the security mirror "
 "options should be used or not."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:391
+#: en/lb_config.1:427
 #, no-wrap
 msgid "B<--source> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:393
+#: en/lb_config.1:429
 msgid ""
 "defines if a corresponding source image to the binary image should be build. "
 "By default this is false because most people do not require this and would "
@@ -2457,24 +2609,24 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:393
+#: en/lb_config.1:429
 #, no-wrap
 msgid "-s|B<--source-images> iso|net|tar|usb-hdd"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:395
+#: en/lb_config.1:431
 msgid "defines the image type for the source image. Default is tar."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:395
+#: en/lb_config.1:431
 #, no-wrap
 msgid "B<--symlinks> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:397
+#: en/lb_config.1:433
 msgid ""
 "defines if the symlink hack should be true or false. The symlink hack "
 "converts all absolute symlinks to relative ones. By default this is false "
@@ -2483,26 +2635,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:397
+#: en/lb_config.1:433
 #, no-wrap
 msgid "B<--syslinux-splash> I<FILE>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:399
+#: en/lb_config.1:435
 msgid ""
 "defines the file of the syslinux splash graphic that should be used instead "
 "of the default one."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:399
+#: en/lb_config.1:435
 #, no-wrap
 msgid "B<--syslinux-timeout> I<SECONDS>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:401
+#: en/lb_config.1:437
 msgid ""
 "defines the timeout the syslinux bootloader should wait for input from the "
 "user at the bootprompt prior booting the default kernel. This defaults to 0 "
@@ -2510,25 +2662,25 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:401
+#: en/lb_config.1:437
 #, no-wrap
 msgid "B<--syslinux-menu> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:403
+#: en/lb_config.1:439
 msgid ""
 "defines if syslinux should be make use of the vgamenu capabilities or not."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:403
+#: en/lb_config.1:439
 #, no-wrap
 msgid "B<--sysvinit> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:405
+#: en/lb_config.1:441
 msgid ""
 "defines if the sysvinit hack should be true or false. The sysvinit hack "
 "disables all non-essential services from starting up at bootup in order to "
@@ -2537,26 +2689,26 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:405
+#: en/lb_config.1:441
 #, no-wrap
 msgid "B<--tasksel> aptitude|tasksel"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:407
+#: en/lb_config.1:443
 msgid ""
 "selects which program is used to install tasks. By default, this is set to "
 "tasksel."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:407
+#: en/lb_config.1:443
 #, no-wrap
 msgid "B<--tasks> I<TASK>|\"I<TASKS>\""
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:409
+#: en/lb_config.1:445
 msgid ""
 "defines one or more package tasks to be installed in the live system. This "
 "is a quick and convenient way to get a reasonable default selection of "
@@ -2566,53 +2718,66 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:409
+#: en/lb_config.1:445
 #, no-wrap
 msgid "B<--templates> I<PATH>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:411
+#: en/lb_config.1:447
 msgid ""
 "sets the path to the templates that live-build is going to use, e.g. for "
 "bootloaders. By default, this is set to /usr/share/live/build/templates/."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:411
+#: en/lb_config.1:447
+#, no-wrap
+msgid "B<--virtual-root-size> MB"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:449
+msgid ""
+"defines what size the virtual-hdd image should be. Note that although the "
+"default is set to 10000 (= 10GB), it will not need 10GB space on your "
+"harddisk as the files are created as sparse files."
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:449
 #, no-wrap
-msgid "B<--virtual-root-filesystem> ext3"
+msgid "B<--volatile> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:413
+#: en/lb_config.1:451
 msgid ""
-"defines what filesystem to format the root filesystem when building virtual-"
-"hdd images."
+"defines if debian volatile package archives should be included in the image "
+"or not."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:413
+#: en/lb_config.1:451
 #, no-wrap
-msgid "B<--virtual-root-size> MB"
+msgid "B<--backports> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:415
+#: en/lb_config.1:453
 msgid ""
-"defines what size the virtual-hdd image should be. Note that although the "
-"default is set to 10000 (= 10GB), it will not need 10GB space on your "
-"harddisk as the files are created as sparse files."
+"defines if debian backports package archives should be included in the image "
+"or not."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:415
+#: en/lb_config.1:453
 #, no-wrap
 msgid "B<--exposed-root> true|false"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:417
+#: en/lb_config.1:455
 msgid ""
 "defines whether to expose the root filesystem as read only and not covered "
 "by the union filesystem. This has useful implications for certain speciality "
@@ -2620,61 +2785,75 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:417
+#: en/lb_config.1:455
 #, no-wrap
 msgid "B<--username> I<NAME>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:419
+#: en/lb_config.1:457
 msgid "sets the name of the account of the default user in the live system."
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:419
+#: en/lb_config.1:457 en/live-build.7:42
+#, no-wrap
+msgid "B<--verbose>"
+msgstr ""
+
+#. type: Plain text
+#: en/lb_config.1:459
+msgid "increases the verbosity of messages output by B<lb build>."
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:459
 #, no-wrap
 msgid "B<--win32-loader true|false>"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/lb_config.1:422
+#: en/lb_config.1:462
 msgid "defines if win32-loader should be included in the binary image or not."
 msgstr ""
 
 #. type: SH
-#: en/lb_config.1:423
+#: en/lb_config.1:463
 #, no-wrap
 msgid "ENVIRONMENT"
 msgstr ""
 
 #.  FIXME
-#.  FIXME
 #. type: Plain text
-#: en/lb_config.1:427
+#: en/lb_config.1:466
 msgid ""
-"All command line switches can also be specified through the corresponding "
-"environment variable. Environment variables are name LB_FOO, means, e.g. --"
-"apt-ftp-proxy becomes LB_APT_FTP_PROXY. However, this generally should not "
-"be used."
+"Currently, command line switches can also be specified through the "
+"corresponding environment variable. However, this generally should not be "
+"relied upon, as it is an implementation detail that is subject to change in "
+"future releases. For options applying directly to live-build, environment "
+"variables are named LB_FOO, meaning, e.g. B<--apt-ftp-proxy> becomes "
+"LB_APT_FTP_PROXY (the exception being internal options such as B<--debug>). "
+"For options passed to another program, as in APT_OPTIONS or GZIP_OPTIONS, no "
+"LB_ prefix is used."
 msgstr ""
 
 #.  FIXME
 #. type: IP
-#: en/lb_config.1:430
+#: en/lb_config.1:470
 #, no-wrap
 msgid "B<auto/config>"
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:431
+#: en/lb_config.1:471
 #, no-wrap
 msgid "B</etc/live/build.conf, /etc/live/build.d>"
 msgstr ""
 
 #.  FIXME
 #. type: Plain text
-#: en/lb_config.1:434
+#: en/lb_config.1:474
 msgid ""
 "An optional, global configuration file for B<lb config> variables. It is "
 "useful to specify a few system wide defaults, like LB_MIRROR_BOOTSTRAP. This "
diff --git a/manpages/pot/live-build.7.pot b/manpages/pot/live-build.7.pot
index b2fc635..a49c989 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: 2010-11-29 23:13+0100\n"
+"POT-Creation-Date: 2010-12-05 16:39-0400\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"
@@ -252,7 +252,7 @@ msgstr ""
 #: en/lb_chroot_proc.1:9 en/lb_chroot_resolv.1:9 en/lb_chroot_selinuxfs.1:9
 #: en/lb_chroot_sources.1:9 en/lb_chroot_symlinks.1:9 en/lb_chroot_sysfs.1:9
 #: en/lb_chroot_sysv-rc.1:9 en/lb_chroot_sysvinit.1:9 en/lb_chroot_tasks.1:9
-#: en/lb_chroot_upstart.1:9 en/lb_clean.1:9 en/lb_config.1:207 en/lb_local.1:9
+#: en/lb_chroot_upstart.1:9 en/lb_clean.1:9 en/lb_config.1:227 en/lb_local.1:9
 #: en/lb_source.1:9 en/lb_source_checksums.1:9 en/lb_source_debian-live.1:9
 #: en/lb_source_debian.1:9 en/lb_source_disk.1:9 en/lb_source_iso.1:9
 #: en/lb_source_net.1:9 en/lb_source_tar.1:9 en/lb_source_usb.1:9
@@ -290,7 +290,7 @@ msgstr ""
 #: en/lb_chroot_symlinks.1:14 en/lb_chroot_sysfs.1:14
 #: en/lb_chroot_sysv-rc.1:14 en/lb_chroot_sysvinit.1:14
 #: en/lb_chroot_tasks.1:14 en/lb_chroot_upstart.1:14 en/lb_clean.1:16
-#: en/lb_config.1:216 en/lb_local.1:14 en/lb_source.1:14
+#: en/lb_config.1:236 en/lb_local.1:14 en/lb_source.1:14
 #: en/lb_source_checksums.1:14 en/lb_source_debian-live.1:14
 #: en/lb_source_debian.1:14 en/lb_source_disk.1:14 en/lb_source_iso.1:14
 #: en/lb_source_net.1:14 en/lb_source_tar.1:14 en/lb_source_usb.1:14
@@ -328,7 +328,7 @@ msgstr ""
 #: en/lb_chroot_symlinks.1:17 en/lb_chroot_sysfs.1:17
 #: en/lb_chroot_sysv-rc.1:17 en/lb_chroot_sysvinit.1:17
 #: en/lb_chroot_tasks.1:17 en/lb_chroot_upstart.1:17 en/lb_clean.1:38
-#: en/lb_config.1:428 en/lb_local.1:17 en/lb_source.1:17
+#: en/lb_config.1:468 en/lb_local.1:17 en/lb_source.1:17
 #: en/lb_source_checksums.1:17 en/lb_source_debian-live.1:17
 #: en/lb_source_debian.1:17 en/lb_source_disk.1:17 en/lb_source_iso.1:17
 #: en/lb_source_net.1:17 en/lb_source_tar.1:17 en/lb_source_usb.1:17
@@ -367,7 +367,7 @@ msgstr ""
 #: en/lb_chroot_symlinks.1:21 en/lb_chroot_sysfs.1:21
 #: en/lb_chroot_sysv-rc.1:21 en/lb_chroot_sysvinit.1:21
 #: en/lb_chroot_tasks.1:21 en/lb_chroot_upstart.1:21 en/lb_clean.1:43
-#: en/lb_config.1:435 en/lb_local.1:20 en/lb_source.1:20
+#: en/lb_config.1:475 en/lb_local.1:20 en/lb_source.1:20
 #: en/lb_source_checksums.1:21 en/lb_source_debian-live.1:21
 #: en/lb_source_debian.1:21 en/lb_source_disk.1:21 en/lb_source_iso.1:21
 #: en/lb_source_net.1:21 en/lb_source_tar.1:21 en/lb_source_usb.1:21
@@ -405,7 +405,7 @@ msgstr ""
 #: en/lb_chroot_symlinks.1:25 en/lb_chroot_sysfs.1:25
 #: en/lb_chroot_sysv-rc.1:25 en/lb_chroot_sysvinit.1:25
 #: en/lb_chroot_tasks.1:25 en/lb_chroot_upstart.1:25 en/lb_clean.1:47
-#: en/lb_config.1:439 en/lb_local.1:24 en/lb_source.1:24
+#: en/lb_config.1:479 en/lb_local.1:24 en/lb_source.1:24
 #: en/lb_source_checksums.1:25 en/lb_source_debian-live.1:25
 #: en/lb_source_debian.1:25 en/lb_source_disk.1:25 en/lb_source_iso.1:25
 #: en/lb_source_net.1:25 en/lb_source_tar.1:25 en/lb_source_usb.1:25
@@ -442,7 +442,7 @@ msgstr ""
 #: en/lb_chroot_symlinks.1:26 en/lb_chroot_sysfs.1:26
 #: en/lb_chroot_sysv-rc.1:26 en/lb_chroot_sysvinit.1:26
 #: en/lb_chroot_tasks.1:26 en/lb_chroot_upstart.1:26 en/lb_clean.1:48
-#: en/lb_config.1:440 en/lb_local.1:25 en/lb_source.1:25
+#: en/lb_config.1:480 en/lb_local.1:25 en/lb_source.1:25
 #: en/lb_source_checksums.1:26 en/lb_source_debian-live.1:26
 #: en/lb_source_debian.1:26 en/lb_source_disk.1:26 en/lb_source_iso.1:26
 #: en/lb_source_net.1:26 en/lb_source_tar.1:26 en/lb_source_usb.1:26
@@ -480,7 +480,7 @@ msgstr ""
 #: en/lb_chroot_symlinks.1:28 en/lb_chroot_sysfs.1:28
 #: en/lb_chroot_sysv-rc.1:28 en/lb_chroot_sysvinit.1:28
 #: en/lb_chroot_tasks.1:28 en/lb_chroot_upstart.1:28 en/lb_clean.1:50
-#: en/lb_config.1:442 en/lb_local.1:27 en/lb_source.1:27
+#: en/lb_config.1:482 en/lb_local.1:27 en/lb_source.1:27
 #: en/lb_source_checksums.1:28 en/lb_source_debian-live.1:28
 #: en/lb_source_debian.1:28 en/lb_source_disk.1:28 en/lb_source_iso.1:28
 #: en/lb_source_net.1:28 en/lb_source_tar.1:28 en/lb_source_usb.1:28
@@ -520,7 +520,7 @@ msgstr ""
 #: en/lb_chroot_symlinks.1:29 en/lb_chroot_sysfs.1:29
 #: en/lb_chroot_sysv-rc.1:29 en/lb_chroot_sysvinit.1:29
 #: en/lb_chroot_tasks.1:29 en/lb_chroot_upstart.1:29 en/lb_clean.1:51
-#: en/lb_config.1:443 en/lb_local.1:28 en/lb_source.1:28
+#: en/lb_config.1:483 en/lb_local.1:28 en/lb_source.1:28
 #: en/lb_source_checksums.1:29 en/lb_source_debian-live.1:29
 #: en/lb_source_debian.1:29 en/lb_source_disk.1:29 en/lb_source_iso.1:29
 #: en/lb_source_net.1:29 en/lb_source_tar.1:29 en/lb_source_usb.1:29
@@ -558,7 +558,7 @@ msgstr ""
 #: en/lb_chroot_symlinks.1:31 en/lb_chroot_sysfs.1:31
 #: en/lb_chroot_sysv-rc.1:31 en/lb_chroot_sysvinit.1:31
 #: en/lb_chroot_tasks.1:31 en/lb_chroot_upstart.1:31 en/lb_clean.1:53
-#: en/lb_config.1:445 en/lb_local.1:30 en/lb_source.1:30
+#: en/lb_config.1:485 en/lb_local.1:30 en/lb_source.1:30
 #: en/lb_source_checksums.1:31 en/lb_source_debian-live.1:31
 #: en/lb_source_debian.1:31 en/lb_source_disk.1:31 en/lb_source_iso.1:31
 #: en/lb_source_net.1:31 en/lb_source_tar.1:31 en/lb_source_usb.1:31
@@ -599,7 +599,7 @@ msgstr ""
 #: en/lb_chroot_symlinks.1:32 en/lb_chroot_sysfs.1:32
 #: en/lb_chroot_sysv-rc.1:32 en/lb_chroot_sysvinit.1:32
 #: en/lb_chroot_tasks.1:32 en/lb_chroot_upstart.1:32 en/lb_clean.1:54
-#: en/lb_config.1:446 en/lb_local.1:31 en/lb_source.1:31
+#: en/lb_config.1:486 en/lb_local.1:31 en/lb_source.1:31
 #: en/lb_source_checksums.1:32 en/lb_source_debian-live.1:32
 #: en/lb_source_debian.1:32 en/lb_source_disk.1:32 en/lb_source_iso.1:32
 #: en/lb_source_net.1:32 en/lb_source_tar.1:32 en/lb_source_usb.1:32
@@ -637,7 +637,7 @@ msgstr ""
 #: en/lb_chroot_symlinks.1:33 en/lb_chroot_sysfs.1:33
 #: en/lb_chroot_sysv-rc.1:33 en/lb_chroot_sysvinit.1:33
 #: en/lb_chroot_tasks.1:33 en/lb_chroot_upstart.1:33 en/lb_clean.1:55
-#: en/lb_config.1:447 en/lb_local.1:32 en/lb_source.1:32
+#: en/lb_config.1:487 en/lb_local.1:32 en/lb_source.1:32
 #: en/lb_source_checksums.1:33 en/lb_source_debian-live.1:33
 #: en/lb_source_debian.1:33 en/lb_source_disk.1:33 en/lb_source_iso.1:33
 #: en/lb_source_net.1:33 en/lb_source_tar.1:33 en/lb_source_usb.1:33
@@ -684,6 +684,30 @@ msgstr ""
 msgid "B<n/a>"
 msgstr ""
 
+#. type: IP
+#: en/lb_config.1:312 en/live-build.7:36
+#, no-wrap
+msgid "B<--debug>"
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:322 en/live-build.7:38
+#, no-wrap
+msgid "B<--force>"
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:415 en/live-build.7:40
+#, no-wrap
+msgid "B<--quiet>"
+msgstr ""
+
+#. type: IP
+#: en/lb_config.1:457 en/live-build.7:42
+#, no-wrap
+msgid "B<--verbose>"
+msgstr ""
+
 #. type: Plain text
 #: en/live-build.7:5
 msgid "B<live-build> - the Debian Live tool suite"
@@ -804,45 +828,21 @@ msgstr ""
 msgid "use custom configuration file."
 msgstr ""
 
-#. type: IP
-#: en/live-build.7:36
-#, no-wrap
-msgid "B<--debug>"
-msgstr ""
-
 #. type: Plain text
 #: en/live-build.7:38
 msgid "show debug information."
 msgstr ""
 
-#. type: IP
-#: en/live-build.7:38
-#, no-wrap
-msgid "B<--force>"
-msgstr ""
-
 #. type: Plain text
 #: en/live-build.7:40
 msgid "force helper execution, even if stage file exists."
 msgstr ""
 
-#. type: IP
-#: en/live-build.7:40
-#, no-wrap
-msgid "B<--quiet>"
-msgstr ""
-
 #. type: Plain text
 #: en/live-build.7:42
 msgid "be quiet."
 msgstr ""
 
-#. type: IP
-#: en/live-build.7:42
-#, no-wrap
-msgid "B<--verbose>"
-msgstr ""
-
 #.  FIXME
 #. type: Plain text
 #: en/live-build.7:45
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 390efc3..d21f79f 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -27,19 +27,20 @@ then
 fi
 
 # Setting static variables
+PROGRAM="lb config"
 DESCRIPTION="$(Echo 'create configuration for live-build(7)')"
-USAGE="${PROGRAM} [--apt apt|aptitude]\n\
+USAGE="${PROGRAM}   [--apt apt|aptitude]\n\
 \t    [--apt-ftp-proxy URL]\n\
 \t    [--apt-http-proxy URL]\n\
 \t    [--apt-pdiffs true|false]\n\
 \t    [--apt-options OPTION|\"OPTIONS\"]\n\
 \t    [--aptitude-options OPTION|\"OPTIONS\"]\n\
-\t    [--apt-pipeline FIXME]\n\
+\t    [--apt-pipeline DEPTH]\n\
 \t    [--apt-recommends true|false]\n\
 \t    [--apt-secure true|false]\n\
 \t    [-a|--architecture ARCHITECTURE]\n\
-\t    [-b|--binary-images iso|net|tar|usb-hdd]\n\
-\t    [--binary-filesystem fat16|fat32]\n\
+\t    [-b|--binary-images iso|iso-hybrid|net|tar|usb-hdd]\n\
+\t    [--binary-filesystem fat16|fat32|ext2]\n\
 \t    [--binary-indices true|false|none]\n\
 \t    [--bootappend-install PARAMETER|\"PARAMETERS\"]\n\
 \t    [--bootappend-live PARAMETER|\"PARAMETERS\"]\n\
@@ -48,7 +49,6 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
 \t    [--bootstrap-config FILE]\n\
 \t    [-f|--bootstrap-flavour minimal|standard]\n\
 \t    [--bootstrap-keyring PACKAGE]\n\
-\t    [--breakpoints]\n\
 \t    [--cache true|false]\n\
 \t    [--cache-indices true|false]\n\
 \t    [--cache-packages true|false]\n\
@@ -56,13 +56,13 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
 \t    [--checksums md5|sha1|sha256|none]\n\
 \t    [--build-with-chroot true|false]\n\
 \t    [--chroot-filesystem ext2|ext3|squashfs|plain|jffs2]\n\
+\t    [--clean]\n\
 \t    [-c|--conffile FILE]\n\
-\t    [--clean\n\
 \t    [--debconf-frontend dialog|editor|noninteractive|readline]\n\
 \t    [--debconf-nowarnings true|false]\n\
 \t    [--debconf-priority low|medium|high|critical]\n\
 \t    [--debian-installer true|cdrom|netinst|netboot|businesscard|live|false]\n\
-\t    [--debian-installer-distribution CODENAME|daily]\n\
+\t    [--debian-installer-distribution daily|CODENAME]\n\
 \t    [--debian-installer-preseedfile FILE|URL]\n\
 \t    [--debian-installer-gui true|false]\n\
 \t    [--debug]\n\
@@ -77,7 +77,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
 \t    [--hostname NAME]\n\
 \t    [--ignore-system-defaults]\n\
 \t    [--includes PATH]\n\
-\t    [--initramfs auto|live-initramfs|casper]\n\
+\t    [--initramfs auto|none|live-boot|live-initramfs|casper]\n\
 \t    [--interactive shell]\n\
 \t    [--isohybrid-options OPTION|\"OPTIONS\"]\n\
 \t    [--iso-application NAME]\n\
@@ -90,7 +90,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
 \t    [-k|--linux-flavours FLAVOUR|\"FLAVOURS\"]\n\
 \t    [--linux-packages \"PACKAGES\"]\n\
 \t    [--losetup losetup|losetup.orig]\n\
-\t    [--memtest memtest86+|memtest86]\n\
+\t    [--memtest memtest86+|memtest86|none]\n\
 \t    [-m|--mirror-bootstrap URL]\n\
 \t    [--mirror-chroot URL]\n\
 \t    [--mirror-chroot-security URL]\n\
@@ -101,7 +101,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
 \t    [--mirror-binary-volatile URL]\n\
 \t    [--mirror-binary-backports URL]\n\
 \t    [--mirror-debian-installer URL]\n\
-\t    [--mode debian|emdebian]\n\
+\t    [--mode debian|emdebian|ubuntu]\n\
 \t    [--net-root-filesystem nfs|cfs]\n\
 \t    [--net-root-mountoptions OPTIONS]\n\
 \t    [--net-root-path PATH]\n\
@@ -111,7 +111,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
 \t    [--net-cow-path PATH]\n\
 \t    [--net-cow-server IP|HOSTNAME]\n\
 \t    [--net-tarball bzip2|gzip|tar|none]\n\
-\t    [-p|--packages-lists FILE]\n\
+\t    [-p|--packages-lists LIST|\"LISTS\"]\n\
 \t    [--packages PACKAGE|\"PACKAGES\"]\n\
 \t    [--quiet]\n\
 \t    [-r|--repositories REPOSITORY|\"REPOSITORIES\"]\n\
@@ -127,7 +127,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
 \t    [--syslinux-menu true|false]\n\
 \t    [--sysvinit true|false]\n\
 \t    [--tasksel aptitude|tasksel]\n\
-\t    [--tasks TASK]\n\
+\t    [--tasks TASK|\"TASKS\"]\n\
 \t    [--templates PATH]\n\
 \t    [--virtual-root-size MB]\n\
 \t    [--volatile true|false]\n\
@@ -158,7 +158,7 @@ Local_arguments ()
 		help,ignore-system-defaults,quiet,usage,verbose,version"
 	# Remove spaces added by indentation
 	LONG_OPTIONS="$(echo ${LONG_OPTIONS} | tr -d ' ')"
-	ARGUMENTS="$(getopt --longoptions ${LONG_OPTIONS} --name=${PROGRAM} --options a:f:d:m:l:k:p:b:e:r:s:c:huv --shell sh -- "${@}")"
+	ARGUMENTS="$(getopt --longoptions ${LONG_OPTIONS} --name="${PROGRAM}" --options a:f:d:m:l:k:p:b:e:r:s:c:huv --shell sh -- "${@}")"
 
 	if [ "${?}" != "0" ]
 	then