Merge remote-tracking branch 'upstream/master'

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

diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index 012788f..788e351 100644 (file)
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2015\-09\-22 5.0~a5-1 "Live Systems Project"
+.TH LIVE\-BOOT 7 2015\-09\-22 5.0~a5-1 "Debian Live Project"

 
 .SH NAME
 \fBlive\-boot\fR \- System Boot Components
 
 .SH NAME
 \fBlive\-boot\fR \- System Boot Components


@@ -159,8 +159,8 @@ live\-boot will look for persistency files in the root directory of a partition,
 Filesystem changes are not saved back to persistence media. In particular, overlays and netboot NFS mounts are mounted read-only.
 .IP "\fBpersistence\-storage\fR=\fITYPE1\fR,\fITYPE2\fR ... \fITYPEn\fR" 4
 This option determines which types of persistence storage to consider when probing for persistence media. If "filesystem" is in the list, filesystems with matching labels will be used; if "file" is in the list, all filesystems will be probed for archives and image files with matching filenames. The default is "file,filesystem".
 Filesystem changes are not saved back to persistence media. In particular, overlays and netboot NFS mounts are mounted read-only.
 .IP "\fBpersistence\-storage\fR=\fITYPE1\fR,\fITYPE2\fR ... \fITYPEn\fR" 4
 This option determines which types of persistence storage to consider when probing for persistence media. If "filesystem" is in the list, filesystems with matching labels will be used; if "file" is in the list, all filesystems will be probed for archives and image files with matching filenames. The default is "file,filesystem".

-.IP "\fBpersistence\-label\fR=\fILABEL\fR" 4
-live-boot will use the name "LABEL" instead of "persistence" when searching for persistent storage. LABEL can be any valid filename, partition label, or GPT name.
+.IP "\fBpersistence\-label\fR=\fILABEL1\fR,\fILABEL2\fR ... \fILABELn\fR" 4
+live-boot will use the names in this list (instead of "persistence") when searching for persistent storage. Each LABEL can be a valid filename, partition label, or GPT name. The default is "persistence".

 .IP "\fBnoeject\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
 .IP "\fBnoeject\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


@@ -200,10 +200,10 @@ This optional file (inside the live media) contains a list of white\-space or ca
 \fIlive\-tools\fR(7)
 
 .SH HOMEPAGE
 \fIlive\-tools\fR(7)
 
 .SH HOMEPAGE

-More information about live\-boot and the Live Systems project can be found on the homepage at <\fIhttps://wiki.debian.org/DebianLive\fR> and in the manual at <\fIhttps://live-team.pages.debian.net/live-manual/\fR>.
+More information about live\-boot and the Debian Live project can be found on the homepage at <\fIhttps://wiki.debian.org/DebianLive\fR> and in the manual at <\fIhttps://live-team.pages.debian.net/live-manual/\fR>.

 
 .SH BUGS
 
 .SH BUGS

-Bugs can be reported by submitting a bugreport for the live\-boot package in the Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or by writing a mail to the Live Systems mailing list at <\fIdebian-live@lists.debian.org\fR>.
+Bugs can be reported by submitting a bugreport for the live\-boot package in the Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or by writing a mail to the Debian Live mailing list at <\fIdebian-live@lists.debian.org\fR>.

 
 .SH AUTHOR
 
 .SH AUTHOR

-live\-boot was written by Daniel Baumann <\fImail@daniel-baumann.ch\fR>.
+live\-boot was originally written by Daniel Baumann <\fImail@daniel-baumann.ch\fR>. Since 2016 development has been continued by the Debian Live team.