Adding live-package 0.99.6-1.

2 files changed, 12 insertions, 4 deletions

diff --git a/doc/man/make-live.8 b/doc/man/make-live.8
index 5331cd1b5..405c70faf 100644
--- a/doc/man/make-live.8
+++ b/doc/man/make-live.8
@@ -1,4 +1,4 @@
-.TH MAKE-LIVE 8 "Mon,  4 Sep 2006" "0.99.5" "Debian Live framework"
+.TH MAKE-LIVE 8 "Mon,  4 Sep 2006" "0.99" "Debian Live framework"
 
 .SH NAME
 make-live \- utility to build Debian Live systems
@@ -20,13 +20,15 @@ make-live \- utility to build Debian Live systems
 .RB [\| \-f \||\| \-\-flavour
 .IR BOOTSTRAP_FLAVOUR \|]
 .RB [\| \-\-hook
-.IR COMMAND \||\| \|"COMMANDS\|" \|]
+.IR COMMAND \||\| \|"COMMANDS\|" \||\|| FILE \|]
 .RB [\| \-\-include-chroot
 .IR FILE \||\| DIRECTORY \|]
 .RB [\| \-\-include-image
 .IR FILE \||\| DIRECTORY \|]
 .RB [\| \-k \||\| \-\-kernel
 .IR KERNEL_FLAVOUR \|]
+.RB [ \-\-manifest
+.IR PACKAGE \|]
 .RB [\| \-m \||\| \-\-mirror
 .IR URL \|]
 .RB [\| \-\-mirror-security
@@ -91,7 +93,7 @@ Specifies the filesystem for the compressed image. At the moment, ext2, plain an
 .BI "\-f, \-\-flavour " BOOTSTRAP_FLAVOUR
 specifies the bootstrap flavour. This can be either standard or minimal. Instead of this flag, the environment variable LIVE_FLAVOUR can be used (Default: standard).
 .TP
-.BI "\-\-hook " COMMANDS
+.BI "\-\-hook " COMMAND \||\| \|"COMMANDS\|" \||\|| FILE
 specifies one or more commands to be executed in the chroot. Instead of this flag, the environment variable LIVE_HOOK can be used (Default: empty).
 .TP
 .BI "\-\-include-chroot " FILE \||\| DIRECTORY
@@ -103,6 +105,9 @@ specifies a file or directory which will be copied inside the image. Instead of
 .BI "\-k, \-\-kernel " KERNEL_FLAVOUR
 specifies the kernel image flavour. Instead of this flag, the environment variable LIVE_KERNEL can be used (Default: auto-detected).
 .TP
+.BI "\-\-manifest " PACKAGE
+specifies the last package to install before creating the filesystem.manifest-desktop list, mainly used with ubuntu live, PACKAGE should probably be "ubuntu-live" for ubuntu desktop livecd's. Instead of this flag, the environment variable LIVE_MANIFEST can be used (Default: do not create filesystem.manifest-desktop).
+.TP
 .BI "\-m, \-\-mirror " URL
 specifies the debian mirror where make-live will download the packages from. Instead of this flag, the environment variable LIVE_MIRROR can be used (Default: http://ftp.debian.org/debian).
 .TP
diff --git a/doc/man/make-live.conf.8 b/doc/man/make-live.conf.8
index f761da3d9..312ea8c8f 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,  4 Sep 2006" "0.99.5" "Debian Live framework"
+.TH MAKE-LIVE.CONF 8 "Mon,  4 Sep 2006" "0.99" "Debian Live framework"
 
 .SH NAME
 make-live.conf \- configuration file for make-live(8)
@@ -42,6 +42,9 @@ specifies a file or a directory to be included into the chroot. Instead of this
 .B LIVE_KERNEL
 specifies the kernel image flavour. Instead of this environment variable, the flag \-k, \-\-kernel can be used.
 .TP
+.BI LIVE_MANIFEST
+specifies the last package to install before creating the filesystem.manifest-desktop list, mainly used with ubuntu live, in those system it should probably be set to "ubuntu-live" for ubuntu desktop livecd's (Default: do not create filesystem.manifest-desktop).
+.TP
 .B LIVE_MIRROR
 specifies the debian mirror where make-live will download the packages from. Instead of this environment variable, the flag \-m, \-\-mirror LIVE_MIRROR can be used (Default: http://ftp.debian.org/debian).
 .B LIVE_MIRROR_KEY