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

2 files changed, 123 insertions, 125 deletions

diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index 1054a7a..7fb5d4e 100644
--- a/manpages/pot/live-boot.7.pot
+++ b/manpages/pot/live-boot.7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2012-09-26 14:38+0300\n"
+"POT-Creation-Date: 2012-09-27 11:01+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,31 +17,31 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: TH
-#: en/live-boot.7:1 en/live-persistence.conf.5:1
+#: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
 msgid "LIVE-BOOT"
 msgstr ""
 
 #. type: TH
-#: en/live-boot.7:1 en/live-persistence.conf.5:1
+#: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2012-09-26"
+msgid "2012-09-27"
 msgstr ""
 
 #. type: TH
-#: en/live-boot.7:1 en/live-persistence.conf.5:1
+#: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
 msgid "3.0~b3-1"
 msgstr ""
 
 #. type: TH
-#: en/live-boot.7:1 en/live-persistence.conf.5:1
+#: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
 msgid "Debian Live Project"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:3 en/live-persistence.conf.5:3
+#: en/live-boot.7:3 en/persistence.conf.5:3
 #, no-wrap
 msgid "NAME"
 msgstr ""
@@ -52,7 +52,7 @@ msgid "B<live-boot> - System Boot Scripts"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:6 en/live-persistence.conf.5:7
+#: en/live-boot.7:6 en/persistence.conf.5:7
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr ""
@@ -138,7 +138,7 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:28 en/live-persistence.conf.5:57
+#: en/live-boot.7:28 en/persistence.conf.5:57
 #, no-wrap
 msgid "OPTIONS"
 msgstr ""
@@ -574,8 +574,8 @@ msgid ""
 "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 I<live-persistence.conf>(5)). Overlay image files have extensions "
-"which determines their filesystem, e.g. \"persistence.ext4\"."
+"\" (see I<persistence.conf>(5)). Overlay image files have extensions which "
+"determines their filesystem, e.g. \"persistence.ext4\"."
 msgstr ""
 
 #. type: IP
@@ -840,43 +840,43 @@ msgstr ""
 #. type: IP
 #: en/live-boot.7:154
 #, no-wrap
-msgid "B<live-persistence.conf>"
+msgid "B<persistence.conf>"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:156 en/live-persistence.conf.5:191
+#: en/live-boot.7:156 en/persistence.conf.5:191
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
 #: en/live-boot.7:158
-msgid "I<live-persistence.conf>(5)"
+msgid "I<persistence.conf>(5)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:160 en/live-persistence.conf.5:195
+#: en/live-boot.7:160 en/persistence.conf.5:195
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:162 en/live-persistence.conf.5:197
+#: en/live-boot.7:162 en/persistence.conf.5:197
 msgid "I<live-config>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:164 en/live-persistence.conf.5:199
+#: en/live-boot.7:164 en/persistence.conf.5:199
 msgid "I<live-tools>(7)"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:165 en/live-persistence.conf.5:200
+#: en/live-boot.7:165 en/persistence.conf.5:200
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:167 en/live-persistence.conf.5:204
+#: en/live-boot.7:167 en/persistence.conf.5:204
 msgid ""
 "More information about live-boot and the Debian Live project can be found on "
 "the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -884,13 +884,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:168 en/live-persistence.conf.5:205
+#: en/live-boot.7:168 en/persistence.conf.5:205
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:170 en/live-persistence.conf.5:210
+#: en/live-boot.7:170 en/persistence.conf.5:210
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-boot package in "
 "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -899,7 +899,7 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:171 en/live-persistence.conf.5:211
+#: en/live-boot.7:171 en/persistence.conf.5:211
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
diff --git a/manpages/pot/live-persistence.conf.5.pot b/manpages/pot/persistence.conf.5.pot
index 227f5c7..d537884 100644
--- a/manpages/pot/live-persistence.conf.5.pot
+++ b/manpages/pot/persistence.conf.5.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2012-09-26 14:38+0300\n"
+"POT-Creation-Date: 2012-09-27 11:01+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,76 +17,76 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: TH
-#: en/live-boot.7:1 en/live-persistence.conf.5:1
+#: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
 msgid "LIVE-BOOT"
 msgstr ""
 
 #. type: TH
-#: en/live-boot.7:1 en/live-persistence.conf.5:1
+#: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2012-09-26"
+msgid "2012-09-27"
 msgstr ""
 
 #. type: TH
-#: en/live-boot.7:1 en/live-persistence.conf.5:1
+#: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
 msgid "3.0~b3-1"
 msgstr ""
 
 #. type: TH
-#: en/live-boot.7:1 en/live-persistence.conf.5:1
+#: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
 msgid "Debian Live Project"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:3 en/live-persistence.conf.5:3
+#: en/live-boot.7:3 en/persistence.conf.5:3
 #, no-wrap
 msgid "NAME"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:6 en/live-persistence.conf.5:7
+#: en/live-boot.7:6 en/persistence.conf.5:7
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:28 en/live-persistence.conf.5:57
+#: en/live-boot.7:28 en/persistence.conf.5:57
 #, no-wrap
 msgid "OPTIONS"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:156 en/live-persistence.conf.5:191
+#: en/live-boot.7:156 en/persistence.conf.5:191
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:160 en/live-persistence.conf.5:195
+#: en/live-boot.7:160 en/persistence.conf.5:195
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:162 en/live-persistence.conf.5:197
+#: en/live-boot.7:162 en/persistence.conf.5:197
 msgid "I<live-config>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:164 en/live-persistence.conf.5:199
+#: en/live-boot.7:164 en/persistence.conf.5:199
 msgid "I<live-tools>(7)"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:165 en/live-persistence.conf.5:200
+#: en/live-boot.7:165 en/persistence.conf.5:200
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:167 en/live-persistence.conf.5:204
+#: en/live-boot.7:167 en/persistence.conf.5:204
 msgid ""
 "More information about live-boot and the Debian Live project can be found on "
 "the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -94,13 +94,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:168 en/live-persistence.conf.5:205
+#: en/live-boot.7:168 en/persistence.conf.5:205
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:170 en/live-persistence.conf.5:210
+#: en/live-boot.7:170 en/persistence.conf.5:210
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-boot package in "
 "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -109,50 +109,49 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:171 en/live-persistence.conf.5:211
+#: en/live-boot.7:171 en/persistence.conf.5:211
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:6
+#: en/persistence.conf.5:6
 msgid ""
-"B<live-persistence.conf> - Configuration file for persistence media in live-"
-"boot"
+"B<persistence.conf> - Configuration file for persistence media in live-boot"
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:13
+#: en/persistence.conf.5:13
 msgid ""
 "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 B<live-persistence."
-"conf> 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 B<persistence.conf> "
+"file stored on the root of its file system. Any such labeled volume must "
+"have such a file, or it will be ignored."
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:17
+#: en/persistence.conf.5:17
 msgid ""
-"The format of B<live-persistence.conf> allows empty lines and lines starting "
-"with a \"#\" (used for comments), both which will be ignored. A so called "
+"The format of B<persistence.conf> allows empty lines and lines starting with "
+"a \"#\" (used for comments), both which will be ignored. A so called "
 "\"custom mount\" has the format:"
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:20
+#: en/persistence.conf.5:20
 msgid "I<DIR> [I<OPTION>]..."
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:24
+#: en/persistence.conf.5:24
 msgid ""
 "which roughly translates to \"make I<DIR> persistence in the way described "
 "by the list of I<OPTION>s\"."
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:35
+#: en/persistence.conf.5:35
 msgid ""
 "For each custom mount I<DIR> must be an absolute path that cannot contain "
 "white spaces or the special . and .. path components, and cannot be /live "
@@ -165,23 +164,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:48
+#: en/persistence.conf.5:48
 msgid ""
 "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 I<DIR>: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 B<live-persistence.conf> are "
-"ordered, or if several B<live-persistence.conf> 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 B<source> option (see below) to make "
-"sure that they are stored in different source directories."
+"remains true no matter how the lines in B<persistence.conf> are ordered, or "
+"if several B<persistence.conf> 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 B<source> option (see below) to make sure that they are stored in "
+"different source directories."
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:56
+#: en/persistence.conf.5:56
 msgid ""
 "When a source directory doesn't exist on the persistence media for a certain "
 "custom mount, it will be created automatically, and permissions and "
@@ -192,20 +191,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:60
+#: en/persistence.conf.5:60
 msgid ""
-"Custom mounts defined in B<live-persistence.conf> accept the following "
-"options in a coma-separated list:"
+"Custom mounts defined in B<persistence.conf> accept the following options in "
+"a coma-separated list:"
 msgstr ""
 
 #. type: IP
-#: en/live-persistence.conf.5:60
+#: en/persistence.conf.5:60
 #, no-wrap
 msgid "B<source>=I<PATH>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:69
+#: en/persistence.conf.5:69
 msgid ""
 "When given, store the persistence changes into I<PATH> on the persistence "
 "media. I<PATH> must be a relative path (with respect to the persistence "
@@ -218,31 +217,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:72
+#: en/persistence.conf.5:72
 msgid ""
 "The following options are mutually exclusive (only the last given one will "
 "be in effect):"
 msgstr ""
 
 #. type: IP
-#: en/live-persistence.conf.5:72
+#: en/persistence.conf.5:72
 #, no-wrap
 msgid "B<bind>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:74
+#: en/persistence.conf.5:74
 msgid "Bind-mount the source directory to I<DIR>. This is the default."
 msgstr ""
 
 #. type: IP
-#: en/live-persistence.conf.5:74
+#: en/persistence.conf.5:74
 #, no-wrap
 msgid "B<link>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:83
+#: en/persistence.conf.5:83
 msgid ""
 "Create the directory structure of the source directory on the persistence "
 "media in I<DIR> and create symbolic links from the corresponding place in "
@@ -254,7 +253,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:91
+#: en/persistence.conf.5:91
 msgid ""
 "Effectively B<link> will make only files already in the source directory "
 "persistent, not any other files in I<DIR>. These files must be manually "
@@ -265,13 +264,13 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/live-persistence.conf.5:91
+#: en/persistence.conf.5:91
 #, no-wrap
 msgid "B<union>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:101
+#: en/persistence.conf.5:101
 msgid ""
 "Save the rw branch of a union on the persistence media, so only the changes "
 "are stored persistently. This can potentially reduce disk usage compared to "
@@ -284,122 +283,121 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-persistence.conf.5:102
+#: en/persistence.conf.5:102
 #, no-wrap
 msgid "DIRECTORIES"
 msgstr ""
 
 #. type: IP
-#: en/live-persistence.conf.5:103
+#: en/persistence.conf.5:103
 #, no-wrap
 msgid "B</live/persistence>"
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:109
+#: en/persistence.conf.5:109
 msgid ""
 "All persistence volumes will be mounted here (in a directory corresponding "
-"to the device name). The B<live-persistence.conf> file can easily be edited "
+"to the device name). The B<persistence.conf> file can easily be edited "
 "through this mount, as well as any source directories (which is especially "
 "practical for custom mounts using the B<link> option)."
 msgstr ""
 
 #. type: SH
-#: en/live-persistence.conf.5:110
+#: en/persistence.conf.5:110
 #, no-wrap
 msgid "EXAMPLES"
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:115
+#: en/persistence.conf.5:115
 msgid ""
-"Let's say we have a persistence volume I<VOL> with the a B<live-persistence."
-"conf> file containing the following four lines (numbered for ease of "
-"reference):"
+"Let's say we have a persistence volume I<VOL> with the a B<persistence.conf> "
+"file containing the following four lines (numbered for ease of reference):"
 msgstr ""
 
 #. type: TP
-#: en/live-persistence.conf.5:115 en/live-persistence.conf.5:129
+#: en/persistence.conf.5:115 en/persistence.conf.5:129
 #, no-wrap
 msgid "1."
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:118
+#: en/persistence.conf.5:118
 msgid "/home/user1 link,source=config-files/user1"
 msgstr ""
 
 #. type: TP
-#: en/live-persistence.conf.5:118 en/live-persistence.conf.5:133
+#: en/persistence.conf.5:118 en/persistence.conf.5:133
 #, no-wrap
 msgid "2."
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:121
+#: en/persistence.conf.5:121
 msgid "/home/user2 link,source=config-files/user2"
 msgstr ""
 
 #. type: TP
-#: en/live-persistence.conf.5:121 en/live-persistence.conf.5:137
+#: en/persistence.conf.5:121 en/persistence.conf.5:137
 #, no-wrap
 msgid "3."
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:124
+#: en/persistence.conf.5:124
 msgid "/home"
 msgstr ""
 
 #. type: TP
-#: en/live-persistence.conf.5:124 en/live-persistence.conf.5:140
+#: en/persistence.conf.5:124 en/persistence.conf.5:140
 #, no-wrap
 msgid "4."
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:127
+#: en/persistence.conf.5:127
 msgid "/usr union"
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:129
+#: en/persistence.conf.5:129
 msgid "The corresponding source directories are:"
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:133
+#: en/persistence.conf.5:133
 msgid ""
 "I<VOL>/config-files/user1 (but it would be I<VOL>/home/user1 without the "
 "B<source> option)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:137
+#: en/persistence.conf.5:137
 msgid ""
 "I<VOL>/config-files/user2 (but it would be I<VOL>/home/user2 without the "
 "B<source> option)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:140
+#: en/persistence.conf.5:140
 msgid "I<VOL>/home"
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:143
+#: en/persistence.conf.5:143
 msgid "I<VOL>/usr"
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:146
+#: en/persistence.conf.5:146
 msgid ""
 "It was necessary to set the B<source> options for 1 and 2, since they "
 "otherwise would become nested with 3's source, which is invalid."
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:151
+#: en/persistence.conf.5:151
 msgid ""
 "Line 3 will be taken care of before line 1 and 2 in order to prevent custom "
 "mounts 1 and 2 from being hidden by 3. When line 3 is handled, I<VOL>/home "
@@ -408,89 +406,89 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: en/live-persistence.conf.5:151
+#: en/persistence.conf.5:151
 #, no-wrap
 msgid "a."
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:154
+#: en/persistence.conf.5:154
 msgid "I<VOL>/config-files/user1/.emacs"
 msgstr ""
 
 #. type: TP
-#: en/live-persistence.conf.5:154
+#: en/persistence.conf.5:154
 #, no-wrap
 msgid "b."
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:157
+#: en/persistence.conf.5:157
 msgid "I<VOL>/config-files/user2/.bashrc"
 msgstr ""
 
 #. type: TP
-#: en/live-persistence.conf.5:157
+#: en/persistence.conf.5:157
 #, no-wrap
 msgid "c."
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:160
+#: en/persistence.conf.5:160
 msgid "I<VOL>/config-files/user2/.ssh/config"
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:162
+#: en/persistence.conf.5:162
 msgid "Then the following links and directories will be created:"
 msgstr ""
 
 #. type: TP
-#: en/live-persistence.conf.5:162 en/live-persistence.conf.5:165
-#: en/live-persistence.conf.5:171
+#: en/persistence.conf.5:162 en/persistence.conf.5:165
+#: en/persistence.conf.5:171
 #, no-wrap
 msgid "Link:"
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:165
+#: en/persistence.conf.5:165
 msgid "/home/user1/.emacs -E<gt> I<VOL>/config-files/user1/.emacs (from a)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:168
+#: en/persistence.conf.5:168
 msgid "/home/user2/.bashrc -E<gt> I<VOL>/config-files/user2/.bashrc (from b)"
 msgstr ""
 
 #. type: TP
-#: en/live-persistence.conf.5:168
+#: en/persistence.conf.5:168
 #, no-wrap
 msgid "Dir:"
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:171
+#: en/persistence.conf.5:171
 msgid "/homea/user2/.ssh (from c)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:175
+#: en/persistence.conf.5:175
 msgid ""
 "/home/user2/.ssh/config -E<gt> I<VOL>/config-files/user2/.ssh/config (from c)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:181
+#: en/persistence.conf.5:181
 msgid ""
-"One could argue, though, that lines 1 and 2 in the example B<live-"
-"persistence.conf> file above are unnecessary since line 3 already would make "
-"all of /home persistent. The B<link> 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."
+"One could argue, though, that lines 1 and 2 in the example B<persistence."
+"conf> file above are unnecessary since line 3 already would make all of /"
+"home persistent. The B<link> 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."
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:190
+#: en/persistence.conf.5:190
 msgid ""
 "Line 4 can be mounted at any time since its I<DIR> (and source directory) is "
 "completely disjoint from all the other custom mounts. When mounted, I<VOL>/"
@@ -502,13 +500,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:193
+#: en/persistence.conf.5:193
 msgid "I<live-boot>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-persistence.conf.5:213
+#: en/persistence.conf.5:213
 msgid ""
-"live-persistence.conf was written by anonym E<lt>I<anonym@lavabit.com>E<gt> "
-"for the Debian project."
+"persistence.conf was written by anonym E<lt>I<anonym@lavabit.com>E<gt> for "
+"the Debian project."
 msgstr ""