Setting persistence label for live-* 3.x persistency to 'persistence', we're not making any difference between full-ov and custom-ov anymore on the filesystem and partition label (it's determined by the contents of live-persistence.conf).

2 files changed, 21 insertions, 24 deletions

diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index 57d8a13..3fe106a 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-06-06 18:40+0300\n"
+"POT-Creation-Date: 2012-06-06 18:54+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"
@@ -573,11 +573,9 @@ msgstr ""
 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 either \"full-"
-"ov\", which will be mounted on /, or \"custom-ov\", which can be completely "
-"customized (see I<live-persistence.conf>(5)). The order these are handled "
-"are: full-ov, custom-ov. Overlay image files have extensions which "
-"determines their filesystem, e.g. \"custom-ov.ext4\"."
+"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\"."
 msgstr ""
 
 #. type: IP
diff --git a/manpages/pot/live-persistence.conf.5.pot b/manpages/pot/live-persistence.conf.5.pot
index 45c1570..1027567 100644
--- a/manpages/pot/live-persistence.conf.5.pot
+++ b/manpages/pot/live-persistence.conf.5.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2012-06-06 18:26+0300\n"
+"POT-Creation-Date: 2012-06-06 18:55+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"
@@ -59,34 +59,34 @@ msgid "OPTIONS"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:160 en/live-persistence.conf.5:191
+#: en/live-boot.7:156 en/live-persistence.conf.5:191
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:164 en/live-persistence.conf.5:195
+#: en/live-boot.7:160 en/live-persistence.conf.5:195
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:166 en/live-persistence.conf.5:197
+#: en/live-boot.7:162 en/live-persistence.conf.5:197
 msgid "I<live-config>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:168 en/live-persistence.conf.5:199
+#: en/live-boot.7:164 en/live-persistence.conf.5:199
 msgid "I<live-tools>(7)"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:169 en/live-persistence.conf.5:200
+#: en/live-boot.7:165 en/live-persistence.conf.5:200
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:171 en/live-persistence.conf.5:204
+#: en/live-boot.7:167 en/live-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:172 en/live-persistence.conf.5:205
+#: en/live-boot.7:168 en/live-persistence.conf.5:205
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:174 en/live-persistence.conf.5:210
+#: en/live-boot.7:170 en/live-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,7 +109,7 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:175 en/live-persistence.conf.5:211
+#: en/live-boot.7:171 en/live-persistence.conf.5:211
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
@@ -125,7 +125,7 @@ msgstr ""
 #: en/live-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\") \"custom-ov\", that "
+"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."
@@ -156,13 +156,12 @@ msgstr ""
 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 "
-"(or any of its sub-directories), or / (for the latter, use \"full-ov\" "
-"persistence instead). Once activated all changes (file deletion, creation "
-"and modification) to I<DIR> on the live file system are stored persistently "
-"into a path equivalent to I<DIR> on the persistence media, called the source "
-"directory. The default way to achieve persistence is to simply bind-mount "
-"the corresponding source directory to I<DIR>, but this can be changed "
-"through the use of I<OPTION>s."
+"(or any of its sub-directories).  Once activated all changes (file deletion, "
+"creation and modification) to I<DIR> on the live file system are stored "
+"persistently into a path equivalent to I<DIR> on the persistence media, "
+"called the source directory. The default way to achieve persistence is to "
+"simply bind-mount the corresponding source directory to I<DIR>, but this can "
+"be changed through the use of I<OPTION>s."
 msgstr ""
 
 #. type: Plain text