Updating lb config --help and man page.

1 files changed, 95 insertions, 39 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