3 files changed, 39 insertions, 12 deletions
diff --git a/doc/faq.txt b/doc/faq.txt
new file mode 100644
index 0000000..e83dcd6
--- /dev/null
+++ b/doc/faq.txt
@@ -0,0 +1,9 @@
+Debian Live Framework: Frequently Asked Questions (FAQ)
+=======================================================
+
+Q: What is the root password?
+A: There is none. You can switch to root with 'sudo su -' or set a password with
+   'sudo passwd'.
+
+Q: What is the user password?
+A: The user password for casper is 'live'.
diff --git a/doc/man/make-live.8 b/doc/man/make-live.8
index d4585f0..5331cd1 100644
--- a/doc/man/make-live.8
+++ b/doc/man/make-live.8
@@ -1,4 +1,4 @@
-.TH MAKE-LIVE 8 "Mon, 28 Aug 2006" "0.99.4" "Debian Live framework"
+.TH MAKE-LIVE 8 "Mon,  4 Sep 2006" "0.99.5" "Debian Live framework"
 
 .SH NAME
 make-live \- utility to build Debian Live systems
@@ -31,10 +31,10 @@ make-live \- utility to build Debian Live systems
 .IR URL \|]
 .RB [\| \-\-mirror-security
 .IR URL \|]
-.RB [\| \-p \||\| \-\-packages
+.RB [\| \-\-packages
 .IR PACKAGE \||\| \|"PACKAGES\|" \|]
-.RB [\| \-\-package-list
-.IR FILE \|]
+.RB [\| \-p \||\| \-\-package-list
+.IR LIST \||\| FILE \|]
 .RB [\| \-\-proxy-ftp
 .IR URL \|]
 .RB [\| \-\-proxy-http
@@ -51,7 +51,10 @@ make-live \- utility to build Debian Live systems
 .IR DIRECTORY \|]
 .RB [\| \-t \||\| \-\-type
 .IR TYPE \|]
-.RI [\| LIST \|]
+.RB [\| \-\-with-generic-indices \|]
+.RB [\| \-\-without-generic-indices \|]
+.RB [\| \-\-with-source \|]
+.RB [\| \-\-without-source \|]
 .PP
 .B make-live
 .RB \-h \||\| \-\-help
@@ -106,11 +109,11 @@ specifies the debian mirror where make-live will download the packages from. Ins
 .BI "\-\-mirror-security" URL
 specifies the debian security mirror where make-live will download the packages from. Instead of this flag, the environment variable LIVE_MIRROR_SECURITY can be used (Default: http://security.debian.org/debian).
 .TP
-.BI "\-p, \-\-packages " PACKAGE \||\| \|"PACKAGES\|"
+.BI "\-\-packages " PACKAGE \||\| \|"PACKAGES\|"
 specifies a list of packages to install into the chroot. Instead of this flag, the environment variable LIVE_PACKAGES can be used (Default: empty).
 .TP
-.BI "\-\-package-list " FILE
-specifies an external package list file, one package for each line. It overrides list option. Instead of this flag, the environment variable LIVE_PACKAGE_LIST can be used (Default: empty).
+.BI "\-p, \-\-package-list " FILE
+specifies an external package list file, one package for each line. It overrides list option. Instead of this flag, the environment variable LIVE_PACKAGE_LIST can be used (Default: standard).
 .TP
 .BI "\-\-proxy-ftp " URL
 specifies the value of ftp_proxy inside the chrooted environment. Instead of this flag, the environment variable LIVE_PROXY_FTP can be used (Default: empty).
@@ -136,6 +139,19 @@ specifies a templates directory to use instead of the default one. Instead of th
 .BI "\-t, \-\-type " TYPE
 specifies the image type to generate. Currently, only iso and net are available. Instead of this flag, the environment variable LIVE_TYPE can be used (Default: iso).
 .TP
+.B \-\-with-generic-indices
+enables use of generic Debian package indices. Instead of this flag, the environment variable LIVE_GENERIC_INDICES can be used (Default: yes).
+.TP
+.B \-\-without-generic-indices
+disables use of generic Debian package indices. Instead of this flag, the environment variable LIVE_GENERIC_INDICES can be used (Default: yes).
+.TP
+.B \-\-with-source
+enables generation of source images. Instead of this flag, the environment variable LIVE_SOURCE can be used (Default: no).
+.TP
+.B \-\-without-source
+disables generation of source images. Instead of this flag, the environment variable LIVE_SOURCE can be used (Default: no).
+.PP
+.TP
 .B \-h, \-\-help
 display help and exit
 .TP
diff --git a/doc/man/make-live.conf.8 b/doc/man/make-live.conf.8
index 30b6bd3..f761da3 100644
--- a/doc/man/make-live.conf.8
+++ b/doc/man/make-live.conf.8
@@ -1,4 +1,4 @@
-.TH MAKE-LIVE.CONF 8 "Mon, 28 Aug 2006" "0.99.4" "Debian Live framework"
+.TH MAKE-LIVE.CONF 8 "Mon,  4 Sep 2006" "0.99.5" "Debian Live framework"
 
 .SH NAME
 make-live.conf \- configuration file for make-live(8)
@@ -27,6 +27,9 @@ specifies the bootstrap flavour. This can be either standard (default) or minima
 specifies the filesystem to be used for the root filesystem image
 (Default: squashfs).
 .TP
+.B LIVE_GENERIC_INDICES
+specifies if generic Debian indices should be used (Default: enable).
+.TP
 .B LIVE_FTPPROXY
 specifies the value of ftp_proxy inside the chrooted environment. Instead of this environment variable, the flag \-\-ftp-proxy can be used (Default: empty).
 .TP
@@ -45,11 +48,10 @@ specifies the debian mirror where make-live will download the packages from. Ins
 specifies the archive signing key. Instead of this environment variable, the flav \-\-mirror-key can be used (Default: http://ftp-master.debian.org/ziyi_key_2006.asc).
 .TP
 .B LIVE_PACKAGES
-specifies a list of packages to install into the chroot. Instead of this environment variable, the flag \-p, \-\-packakges can be used (Default: empty).
+specifies a list of packages to install into the chroot. Instead of this environment variable, the flag \-\-packakges can be used (Default: empty).
 .TP
 .B LIVE_PACKAGE_LIST
-specifies a file which contains a list of packages to install, separated by
-newlines, if LIVE_PACKAGE_LIST exists, default LIST option will be ignored.
+specifies a file which contains a list of packages to install.
 .TP
 .B LIVE_PROXY_FTP
 specifies the value of ftp_proxy inside the chrooted environment. Instead of this environment variable, the flag \-\-ftp-proxy can be used (Default: empty).