Merge branch 'debian': Imported 3.0~b6-1 from Debian Live

[live-boot-grml.git] / manpages / en / live-boot.7

diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index 8fd08a4..cebe297 100644 (file)
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2012\-09\-26 3.0~b3-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2012\-10\-02 3.0~b6-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-boot\fR \- System Boot Scripts
@@ -109,7 +109,7 @@ This parameters allows to set a custom ramdisk size (it's the '\-o size' option
 .IP "\fBswapon\fR" 4
 This parameter enables usage of local swap partitions.
 .IP "\fBpersistence\fR" 4
-live\-boot will probe devices for persistence media. These can be partitions (with the correct GPT name), filesystems (with the correct label) or image files (with the correct file name). Overlays are labeled/named "persistence" (see \fIlive-persistence.conf\fR(5)). Overlay image files have extensions which determines their filesystem, e.g. "persistence.ext4".
+live\-boot will probe devices for persistence media. These can be partitions (with the correct GPT name), filesystems (with the correct label) or image files (with the correct file name). Overlays are labeled/named "persistence" (see \fIpersistence.conf\fR(5)). Overlay image files have extensions which determines their filesystem, e.g. "persistence.ext4".
 .IP "\fBpersistence\-encryption\fR=\fITYPE1\fR,\fITYPE2\fR ... \fITYPEn\fR" 4
 This option determines which types of encryption that we allow to be used when probing devices for persistence media. If "none" is in the list, we allow unencrypted media; if "luks" is in the list, we allow LUKS\-encrypted media. Whenever a device containing encrypted media is probed the user will be prompted for the passphrase. The default value is "none".
 .IP "\fBpersistence\-media\fR={\fIremovable\fR|\fIremovable\-usb\fR}" 4
@@ -127,7 +127,7 @@ Add a suffix when searching for the image filenames or partition labels to use f
 .IP "\fBquickreboot\fR" 4
 This option causes live\-boot to reboot without attempting to eject the media and without asking the user to remove the boot media.
 .IP "\fBshowmounts\fR" 4
-This parameter will make live\-boot to show on "/" the ro filesystems (mostly compressed) on "/live". This is not enabled by default because could lead to problems by applications like "mono" which store binary paths on installation.
+This parameter will make live\-boot to show on "/" the ro filesystems (mostly compressed) on "/lib/live". This is not enabled by default because could lead to problems by applications like "mono" which store binary paths on installation.
 .IP "\fBsilent\fR" 4
 If you boot with the normal quiet parameter, live\-boot hides most messages of its own. When adding silent, it hides all.
 .IP "\fBtodisk\fR=\fIDEVICE\fR" 4
@@ -151,10 +151,10 @@ This optional file (inside the live media) contains a list of white\-space or ca
 .IP "\fB/etc/live/boot/*\fR" 4
 .IP "\fBlive/boot.conf\fR" 4
 .IP "\fBlive/boot/*\fR" 4
-.IP "\fBlive-persistence.conf\fR" 4
+.IP "\fBpersistence.conf\fR" 4
 
 .SH SEE ALSO
-\fIlive-persistence.conf\fR(5)
+\fIpersistence.conf\fR(5)
 .PP
 \fIlive\-build\fR(7)
 .PP