Switching to final name for the persistence configuration file 'persistence.conf' in line with boot parameter.

2 files changed, 31 insertions, 33 deletions

diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index d2b0e5f..0c77340 100644
--- a/manpages/de/live-boot.de.7
+++ b/manpages/de/live-boot.de.7
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 26.09.2012 3.0~b3\-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 27.09.2012 3.0~b3\-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-boot\fP \- System Boot Scripts
@@ -180,7 +180,7 @@ This parameter enables usage of local swap partitions.
 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\fP(5)). Overlay image files have extensions which
+(see \fIpersistence.conf\fP(5)). Overlay image files have extensions which
 determines their filesystem, e.g. "persistence.ext4".
 .IP "\fBpersistence\-encryption\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4
 This option determines which types of encryption that we allow to be used
@@ -263,10 +263,10 @@ loaded in alphanumeric order.
 .IP \fB/etc/live/boot/*\fP 4
 .IP \fBlive/boot.conf\fP 4
 .IP \fBlive/boot/*\fP 4
-.IP \fBlive\-persistence.conf\fP 4
+.IP \fBpersistence.conf\fP 4
 
 .SH "SEE ALSO"
-\fIlive\-persistence.conf\fP(5)
+\fIpersistence.conf\fP(5)
 .PP
 \fIlive\-build\fP(7)
 .PP
diff --git a/manpages/de/live-persistence.conf.de.5 b/manpages/de/persistence.conf.de.5
index f160b4e..18e6b4f 100644
--- a/manpages/de/live-persistence.conf.de.5
+++ b/manpages/de/persistence.conf.de.5
@@ -3,22 +3,21 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT conf 26.09.2012 3.0~b3\-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 27.09.2012 3.0~b3\-1 "Debian Live Project"
 
 .SH NAME
-\fBlive\-persistence.conf\fP \- Configuration file for persistence media in
-live\-boot
+\fBpersistence.conf\fP \- Configuration file for persistence media in live\-boot
 
 .SH DESCRIPTION
 If live\-boot probes a persistence volume with the label (or GPT name, or
 file name, but from now on we will just say "label") "persistence", that
-volume's persistence is fully customizable through the
-\fBlive\-persistence.conf\fP file stored on the root of its file system. Any
-such labeled volume must have such a file, or it will be ignored.
+volume's persistence is fully customizable through the \fBpersistence.conf\fP
+file stored on the root of its file system. Any such labeled volume must
+have such a file, or it will be ignored.
 .PP
-The format of \fBlive\-persistence.conf\fP allows empty lines and lines starting
-with a "#" (used for comments), both which will be ignored. A so called
-"custom mount" has the format:
+The format of \fBpersistence.conf\fP allows empty lines and lines starting with
+a "#" (used for comments), both which will be ignored. A so called "custom
+mount" has the format:
 .PP
 .RS
 \fIDIR\fP [\fIOPTION\fP]...
@@ -39,14 +38,14 @@ be changed through the use of \fIOPTION\fPs.
 All custom mounts will be done in an order so that no two custom mounts can
 "hide" each other. For instance, if we have the two \fIDIR\fP:s /a and /a/b it
 would always be the case that /a is mounted first, then /a/b. This remains
-true no matter how the lines in \fBlive\-persistence.conf\fP are ordered, or if
-several \fBlive\-persistence.conf\fP files on different persistence media are
-used at the same time. However, it is forbidden for custom mounts to have
-their source directory inside the source directory of another custom mount,
-so the source directories that are auto\-created by live\-boot does not
-support "nested" mounts like /a and /a/b on the same media. In this case you
-must use the \fBsource\fP option (see below) to make sure that they are stored
-in different source directories.
+true no matter how the lines in \fBpersistence.conf\fP are ordered, or if
+several \fBpersistence.conf\fP files on different persistence media are used at
+the same time. However, it is forbidden for custom mounts to have their
+source directory inside the source directory of another custom mount, so the
+source directories that are auto\-created by live\-boot does not support
+"nested" mounts like /a and /a/b on the same media. In this case you must
+use the \fBsource\fP option (see below) to make sure that they are stored in
+different source directories.
 .PP
 When a source directory doesn't exist on the persistence media for a certain
 custom mount, it will be created automatically, and permissions and
@@ -56,8 +55,8 @@ on the persistence media. The bootstrapping will not happen when the \fBlink\fP
 or \fBunion\fP options are used (see below).
 
 .SH OPTIONS
-Custom mounts defined in \fBlive\-persistence.conf\fP accept the following
-options in a coma\-separated list:
+Custom mounts defined in \fBpersistence.conf\fP accept the following options in
+a coma\-separated list:
 .IP \fBsource\fP=\fIPATH\fP 4
 When given, store the persistence changes into \fIPATH\fP on the persistence
 media. \fIPATH\fP must be a relative path (with respect to the persistence
@@ -100,15 +99,14 @@ supported with \fBunion=unionmount\fP.
 .SH DIRECTORIES
 .IP \fB/live/persistence\fP 4
 All persistence volumes will be mounted here (in a directory corresponding
-to the device name). The \fBlive\-persistence.conf\fP file can easily be edited
+to the device name). The \fBpersistence.conf\fP file can easily be edited
 through this mount, as well as any source directories (which is especially
 practical for custom mounts using the \fBlink\fP option).
 
 .SH EXAMPLES
 
-Let's say we have a persistence volume \fIVOL\fP with the a
-\fBlive\-persistence.conf\fP file containing the following four lines (numbered
-for ease of reference):
+Let's say we have a persistence volume \fIVOL\fP with the a \fBpersistence.conf\fP
+file containing the following four lines (numbered for ease of reference):
 .TP  7
 1.
 /home/user1 link,source=config\-files/user1
@@ -171,10 +169,10 @@ Link:
 c)
 .PP
 One could argue, though, that lines 1 and 2 in the example
-\fBlive\-persistence.conf\fP file above are unnecessary since line 3 already
-would make all of /home persistent. The \fBlink\fP option is intended for
-situations where you don't want a complete directory to be persistent, only
-certain files in it or its sub\-directories.
+\fBpersistence.conf\fP file above are unnecessary since line 3 already would
+make all of /home persistent. The \fBlink\fP option is intended for situations
+where you don't want a complete directory to be persistent, only certain
+files in it or its sub\-directories.
 .PP
 Line 4 can be mounted at any time since its \fIDIR\fP (and source directory) is
 completely disjoint from all the other custom mounts. When mounted,
@@ -205,5 +203,5 @@ writing a mail to the Debian Live mailing list at
 <\fIdebian\-live@lists.debian.org\fP>.
 
 .SH AUTHOR
-live\-persistence.conf was written by anonym <\fIanonym@lavabit.com\fP>
-for the Debian project.
+persistence.conf was written by anonym <\fIanonym@lavabit.com\fP> for
+the Debian project.