Updating manpages for union= boot parameter.

diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index eb6aa27..16d11ab 100644 (file)
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2014\-12\-10 4.0.2-1 "Live Systems Project"
+.TH LIVE\-BOOT 7 2015\-01\-04 4.0.2-1 "Live Systems Project"
 
 .SH NAME
 \fBlive\-boot\fR \- System Boot Components
@@ -132,8 +132,8 @@ If you boot with the normal quiet parameter, live\-boot hides most messages of i
 Adding this parameter, live\-boot will try to copy the entire read\-only media to the specified device before mounting the root filesystem. It probably needs a lot of free space. Subsequent boots should then skip this step and just specify the "live\-media=DEVICE" boot parameter with the same DEVICE used this time.
 .IP "\fBtoram\fR" 4
 Adding this parameter, live\-boot will try to copy the whole read\-only media to the computer's RAM before mounting the root filesystem. This could need a lot of ram, according to the space used by the read\-only media.
-.IP "\fBunion\fR=aufs|unionfs\fR" 4
-By default, live\-boot uses aufs. With this parameter, you can switch to unionfs.
+.IP "\fBunion\fR=aufs|overlay\fR" 4
+By default, live\-boot uses aufs. With this parameter, you can switch to overlay.
 .\" FIXME
 
 .\" FIXME

diff --git a/manpages/en/persistence.conf.5 b/manpages/en/persistence.conf.5
index 297a624..c0ff914 100644 (file)
--- a/manpages/en/persistence.conf.5
+++ b/manpages/en/persistence.conf.5
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT conf 2014\-12\-10 4.0.2-1 "Live Systems Project"
+.TH LIVE\-BOOT conf 2015\-01\-04 4.0.2-1 "Live Systems Project"
 
 .SH NAME
 \fBpersistence.conf\fR \- Configuration file for persistence media in
@@ -96,8 +96,7 @@ read-only media. One caveat is that the union will use \fIDIR\fR from
 the image's read-only file system, not the real file system root, so
 files created after boot (e.g. by live-config) will not appear in the
 union. This option will use the union file system specified by
-live-boot's \fBunion\fR boot parameter, but is not supported with
-\fBunion=unionmount\fR.
+live-boot's \fBunion\fR boot parameter.
 
 .SH DIRECTORIES
 .IP "\fB/live/persistence\fR" 4

diff --git a/manpages/es/live-boot.es.7 b/manpages/es/live-boot.es.7
index f83ce79..5f0cec4 100644 (file)
--- a/manpages/es/live-boot.es.7
+++ b/manpages/es/live-boot.es.7
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 2014\-12\-10 4.0.2\-1 "Proyecto Live Systems"
+.TH LIVE\-BOOT 7 2015\-01\-04 4.0.2\-1 "Proyecto Live Systems"
 
 .SH NOMBRE
 \fBlive\-boot\fP \- Componentes de Arranque del Sistema
@@ -248,10 +248,10 @@ Al añadir este parámetro, live\-boot trata de copiar los medios de sólo
 lectura enteros en la memoria RAM del ordenador antes de montar el sistema
 de ficheros raíz. Para esto puede ser necesaria mucha memoria RAM, según el
 espacio utilizado por los medios de sólo lectura.
-.IP \fBunion\fP=aufs|unionfs 4
+.IP \fBunion\fP=aufs|overlay 4
 .\" FIXME
 Por defecto, live\-boot usa aufs. Con este parámetro, se puede cambiar a
-unionfs.
+overlay.
 
 .\" FIXME
 .SH "FICHEROS (antiguos)"

diff --git a/manpages/es/persistence.conf.es.5 b/manpages/es/persistence.conf.es.5
index 46e7378..9176791 100644 (file)
--- a/manpages/es/persistence.conf.es.5
+++ b/manpages/es/persistence.conf.es.5
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT conf 2014\-12\-10 4.0.2\-1 "Proyecto Live Systems"
+.TH LIVE\-BOOT conf 2015\-01\-04 4.0.2\-1 "Proyecto Live Systems"
 
 .SH NOMBRE
 \fBpersistence.conf\fP \- Fichero para configurar medios de almacenamiento con
@@ -106,8 +106,7 @@ es que la unión utilizará el \fIDIR\fP del sistema de ficheros de sólo lectur
 de la imagen y no de la raíz del sistema de ficheros real, por eso los
 ficheros que se crean después del arranque (por ejemplo live\-config) no
 aparecerán en la unión. Esta opción utilizará el sistema de ficheros unión
-especificado por el parámetro de arranque \fBunion\fP de live\-boot pero no
-tiene soporte si se utiliza \fBunion=unionmount\fP.
+especificado por el parámetro de arranque \fBunion\fP de live\-boot.
 
 .SH DIRECTORIOS
 .IP \fB/live/persistence\fP 4

diff --git a/manpages/ja/live-boot.ja.7 b/manpages/ja/live-boot.ja.7
index 8bcd142..dec688d 100644 (file)
--- a/manpages/ja/live-boot.ja.7
+++ b/manpages/ja/live-boot.ja.7
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 2014\-12\-10 4.0.2\-1 "Live システムプロジェクト"
+.TH LIVE\-BOOT 7 2015\-01\-04 4.0.2\-1 "Live システムプロジェクト"
 
 .SH 名前
 \fBlive\-boot\fP \- システム起動構成要素
@@ -183,9 +183,9 @@ live\-boot
 .IP \fBtoram\fP 4
 このパラメータを追加すると、live\-boot はルートファイルシステムをマウントする前に読み取り専用メディア全体をそのコンピュータの RAM
 にコピーしようとします。その読み取り専用メディアで利用している容量により、これには多くの RAM が必要となるかもしれません。
-.IP \fBunion\fP=aufs|unionfs 4
+.IP \fBunion\fP=aufs|overlay 4
 .\" FIXME
-デフォルトで live\-boot は aufs を利用します。このパラメータにより unionfs に切り替えることができます。
+デフォルトで live\-boot は aufs を利用します。このパラメータにより overlay に切り替えることができます。
 
 .\" FIXME
 .SH "ファイル (古い情報)"

diff --git a/manpages/ja/persistence.conf.ja.5 b/manpages/ja/persistence.conf.ja.5
index 9a2c482..f67042e 100644 (file)
--- a/manpages/ja/persistence.conf.ja.5
+++ b/manpages/ja/persistence.conf.ja.5
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT conf 2014\-12\-10 4.0.2\-1 "Live システムプロジェクト"
+.TH LIVE\-BOOT conf 2015\-01\-04 4.0.2\-1 "Live システムプロジェクト"
 
 .SH 名前
 \fBpersistence.conf\fP \- live\-boot 状態保持用メディアの設定ファイル
@@ -52,10 +52,13 @@ live\-boot が「persistence」というラベル (GPT の名前やファイル
 事実上、\fBlink\fP
 は既にソースディレクトリにあるファイルだけを保持し、\fIディレクトリ\fPにあるそれ以外のファイルは保持しません。保持するファイルをこのオプションの対象とするには手作業によりソースディレクトリに追加する必要があり、そうすることで\fIディレクトリ\fPに、既にそこにあるファイルに加えて現れるようになります。このオプションは特定のファイルだけを保持する必要があり、それがあるディレクトリ全体が必要ではない場合、例えばユーザのホームディレクトリにある設定ファイルの一部を保持する場合に有用です。
 .IP \fBunion\fP 4
-結合ファイルシステムの rw
-ブランチを保持用メディアに保存するため、変更点だけを持続的に保管します。バインドマウントと比較するとこの方法は潜在的にディスク使用量を減らせる可能性があり、また読み取り専用メディアに追加したファイルを隠しません。1つ注意があり、結合後に実際のファイルシステムのルートではなくイメージの読み取り専用ファイルシステムから\fIディレクトリ\fPを使うため、(例えば
-live\-config により) ブート後に作成されたファイルは結合後には見えなくなります。このオプションは live\-boot の \fBunion\fP
-ブートパラメータにより指定された結合ファイルシステムを使いますが、\fBunion=unionmount\fP ではサポートしていません。
+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
+bind\-mounts, and will not hide files added to the read\-only media. One
+caveat is that the union will use \fIDIR\fP from the image's read\-only file
+system, not the real file system root, so files created after boot (e.g. by
+live\-config) will not appear in the union. This option will use the union
+file system specified by live\-boot's \fBunion\fP boot parameter.
 
 .SH ディレクトリ
 .IP \fB/live/persistence\fP 4

diff --git a/manpages/po/es/live-boot.7.po b/manpages/po/es/live-boot.7.po
index e88e9f8..82e3509 100644 (file)
--- a/manpages/po/es/live-boot.7.po
+++ b/manpages/po/es/live-boot.7.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot\n"
-"POT-Creation-Date: 2014-12-10 10:35+0100\n"
+"POT-Creation-Date: 2015-01-04 21:31+0100\n"
 "PO-Revision-Date: 2013-11-10 20:10+0900\n"
 "Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
 "Language-Team: none\n"
@@ -25,7 +25,7 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2014-12-10"
+msgid "2015-01-04"
 msgstr ""
 
 #. type: TH
@@ -901,18 +901,18 @@ msgstr ""
 #. type: IP
 #: en/live-boot.7:135
 #, no-wrap
-msgid "B<union>=aufs|unionfs"
-msgstr "B<union>=aufs|unionfs"
+msgid "B<union>=aufs|overlay"
+msgstr "B<union>=aufs|overlay"
 
 #.  FIXME
 #. type: Plain text
 #: en/live-boot.7:138
 msgid ""
 "By default, live-boot uses aufs. With this parameter, you can switch to "
-"unionfs."
+"overlay."
 msgstr ""
 "Por defecto, live-boot usa aufs. Con este parámetro, se puede cambiar a "
-"unionfs."
+"overlay."
 
 #.  FIXME
 #. type: SH

diff --git a/manpages/po/es/persistence.conf.5.po b/manpages/po/es/persistence.conf.5.po
index 81afe76..845bcf9 100644 (file)
--- a/manpages/po/es/persistence.conf.5.po
+++ b/manpages/po/es/persistence.conf.5.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot\n"
-"POT-Creation-Date: 2014-12-10 10:35+0100\n"
+"POT-Creation-Date: 2015-01-04 21:37+0100\n"
 "PO-Revision-Date: 2013-11-10 20:10+0900\n"
 "Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
 "Language-Team: none\n"
@@ -23,7 +23,7 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2014-12-10"
+msgid "2015-01-04"
 msgstr ""
 
 #. type: TH
@@ -57,34 +57,34 @@ msgid "OPTIONS"
 msgstr "OPCIONES"
 
 #. type: SH
-#: en/live-boot.7:154 en/persistence.conf.5:191
+#: en/live-boot.7:154 en/persistence.conf.5:190
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VER ADEMÁS"
 
 #. type: Plain text
-#: en/live-boot.7:158 en/persistence.conf.5:195
+#: en/live-boot.7:158 en/persistence.conf.5:194
 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: Plain text
-#: en/live-boot.7:160 en/persistence.conf.5:197
+#: en/live-boot.7:160 en/persistence.conf.5:196
 msgid "I<live-config>(7)"
 msgstr "I<live-config>(7)"
 
 #. type: Plain text
-#: en/live-boot.7:162 en/persistence.conf.5:199
+#: en/live-boot.7:162 en/persistence.conf.5:198
 msgid "I<live-tools>(7)"
 msgstr "I<live-tools>(7)"
 
 #. type: SH
-#: en/live-boot.7:163 en/persistence.conf.5:200
+#: en/live-boot.7:163 en/persistence.conf.5:199
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "PÁGINA WEB"
 
 #. type: Plain text
-#: en/live-boot.7:165 en/persistence.conf.5:202
+#: en/live-boot.7:165 en/persistence.conf.5:201
 msgid ""
 "More information about live-boot and the Live Systems project can be found "
 "on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
@@ -95,13 +95,13 @@ msgstr ""
 "manual en E<lt>I<http://live-systems.org/manual/>E<gt>."
 
 #. type: SH
-#: en/live-boot.7:166 en/persistence.conf.5:203
+#: en/live-boot.7:166 en/persistence.conf.5:202
 #, no-wrap
 msgid "BUGS"
 msgstr "ERRORES"
 
 #. type: Plain text
-#: en/live-boot.7:168 en/persistence.conf.5:205
+#: en/live-boot.7:168 en/persistence.conf.5:204
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-boot package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -114,13 +114,13 @@ msgstr ""
 "Systems a la dirección E<lt>I<debian-live@lists.debian.org>E<gt>."
 
 #. type: SH
-#: en/live-boot.7:169 en/persistence.conf.5:206
+#: en/live-boot.7:169 en/persistence.conf.5:205
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: Plain text
-#: en/live-boot.7:170 en/persistence.conf.5:207
+#: en/live-boot.7:170 en/persistence.conf.5:206
 msgid ""
 "live-boot was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
@@ -357,7 +357,7 @@ msgid "B<union>"
 msgstr "B<union>"
 
 #. type: Plain text
-#: en/persistence.conf.5:101
+#: en/persistence.conf.5:100
 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 "
@@ -365,8 +365,7 @@ msgid ""
 "caveat is that the union will use I<DIR> from the image's read-only file "
 "system, not the real file system root, so files created after boot (e.g. by "
 "live-config) will not appear in the union. This option will use the union "
-"file system specified by live-boot's B<union> boot parameter, but is not "
-"supported with B<union=unionmount>."
+"file system specified by live-boot's B<union> boot parameter."
 msgstr ""
 "Guardar la rama rw de una unión en un medio persistente, de modo que los "
 "cambios son guardados de forma persistente. Potencialmente esto puede "
@@ -376,23 +375,22 @@ msgstr ""
 "de la imagen y no de la raíz del sistema de ficheros real, por eso los "
 "ficheros que se crean después del arranque (por ejemplo live-config) no "
 "aparecerán en la unión. Esta opción utilizará el sistema de ficheros unión "
-"especificado por el parámetro de arranque B<union> de live-boot pero no "
-"tiene soporte si se utiliza B<union=unionmount>."
+"especificado por el parámetro de arranque B<union> de live-boot."
 
 #. type: SH
-#: en/persistence.conf.5:102
+#: en/persistence.conf.5:101
 #, no-wrap
 msgid "DIRECTORIES"
 msgstr "DIRECTORIOS"
 
 #. type: IP
-#: en/persistence.conf.5:103
+#: en/persistence.conf.5:102
 #, no-wrap
 msgid "B</live/persistence>"
 msgstr "B</live/persistence>"
 
 #. type: Plain text
-#: en/persistence.conf.5:109
+#: en/persistence.conf.5:108
 msgid ""
 "All persistence volumes will be mounted here (in a directory corresponding "
 "to the device name). The B<persistence.conf> file can easily be edited "
@@ -406,13 +404,13 @@ msgstr ""
 "personalizados usando la opción B<link>)."
 
 #. type: SH
-#: en/persistence.conf.5:110
+#: en/persistence.conf.5:109
 #, no-wrap
 msgid "EXAMPLES"
 msgstr "EJEMPLOS"
 
 #. type: Plain text
-#: en/persistence.conf.5:115
+#: en/persistence.conf.5:114
 msgid ""
 "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):"
@@ -422,56 +420,56 @@ msgstr ""
 "referencia):"
 
 #. type: TP
-#: en/persistence.conf.5:115 en/persistence.conf.5:129
+#: en/persistence.conf.5:114 en/persistence.conf.5:128
 #, no-wrap
 msgid "1."
 msgstr "1."
 
 #. type: Plain text
-#: en/persistence.conf.5:118
+#: en/persistence.conf.5:117
 msgid "/home/user1 link,source=config-files/user1"
 msgstr "/home/user1 link,source=config-files/user1"
 
 #. type: TP
-#: en/persistence.conf.5:118 en/persistence.conf.5:133
+#: en/persistence.conf.5:117 en/persistence.conf.5:132
 #, no-wrap
 msgid "2."
 msgstr "2."
 
 #. type: Plain text
-#: en/persistence.conf.5:121
+#: en/persistence.conf.5:120
 msgid "/home/user2 link,source=config-files/user2"
 msgstr "/home/user2 link,source=config-files/user2"
 
 #. type: TP
-#: en/persistence.conf.5:121 en/persistence.conf.5:137
+#: en/persistence.conf.5:120 en/persistence.conf.5:136
 #, no-wrap
 msgid "3."
 msgstr "3."
 
 #. type: Plain text
-#: en/persistence.conf.5:124
+#: en/persistence.conf.5:123
 msgid "/home"
 msgstr "/home"
 
 #. type: TP
-#: en/persistence.conf.5:124 en/persistence.conf.5:140
+#: en/persistence.conf.5:123 en/persistence.conf.5:139
 #, no-wrap
 msgid "4."
 msgstr "4."
 
 #. type: Plain text
-#: en/persistence.conf.5:127
+#: en/persistence.conf.5:126
 msgid "/usr union"
 msgstr "/usr union"
 
 #. type: Plain text
-#: en/persistence.conf.5:129
+#: en/persistence.conf.5:128
 msgid "The corresponding source directories are:"
 msgstr "Los directorios de origen correspondientes son:"
 
 #. type: Plain text
-#: en/persistence.conf.5:133
+#: en/persistence.conf.5:132
 msgid ""
 "I<VOL>/config-files/user1 (but it would be I<VOL>/home/user1 without the "
 "B<source> option)"
@@ -480,7 +478,7 @@ msgstr ""
 "B<source>)"
 
 #. type: Plain text
-#: en/persistence.conf.5:137
+#: en/persistence.conf.5:136
 msgid ""
 "I<VOL>/config-files/user2 (but it would be I<VOL>/home/user2 without the "
 "B<source> option)"
@@ -489,17 +487,17 @@ msgstr ""
 "B<source>)"
 
 #. type: Plain text
-#: en/persistence.conf.5:140
+#: en/persistence.conf.5:139
 msgid "I<VOL>/home"
 msgstr "I<VOL>/home"
 
 #. type: Plain text
-#: en/persistence.conf.5:143
+#: en/persistence.conf.5:142
 msgid "I<VOL>/usr"
 msgstr "I<VOL>/usr"
 
 #. type: Plain text
-#: en/persistence.conf.5:146
+#: en/persistence.conf.5:145
 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."
@@ -508,7 +506,7 @@ msgstr ""
 "modo resultarían anidados con el origen de 3, lo cual no es válido."
 
 #. type: Plain text
-#: en/persistence.conf.5:151
+#: en/persistence.conf.5:150
 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 "
@@ -522,80 +520,80 @@ msgstr ""
 "ficheros existen: "
 
 #. type: TP
-#: en/persistence.conf.5:151
+#: en/persistence.conf.5:150
 #, no-wrap
 msgid "a."
 msgstr "a."
 
 #. type: Plain text
-#: en/persistence.conf.5:154
+#: en/persistence.conf.5:153
 msgid "I<VOL>/config-files/user1/.emacs"
 msgstr "I<VOL>/config-files/user1/.emacs"
 
 #. type: TP
-#: en/persistence.conf.5:154
+#: en/persistence.conf.5:153
 #, no-wrap
 msgid "b."
 msgstr "b."
 
 #. type: Plain text
-#: en/persistence.conf.5:157
+#: en/persistence.conf.5:156
 msgid "I<VOL>/config-files/user2/.bashrc"
 msgstr "I<VOL>/config-files/user2/.bashrc"
 
 #. type: TP
-#: en/persistence.conf.5:157
+#: en/persistence.conf.5:156
 #, no-wrap
 msgid "c."
 msgstr "c."
 
 #. type: Plain text
-#: en/persistence.conf.5:160
+#: en/persistence.conf.5:159
 msgid "I<VOL>/config-files/user2/.ssh/config"
 msgstr "I<VOL>/config-files/user2/.ssh/config"
 
 #. type: Plain text
-#: en/persistence.conf.5:162
+#: en/persistence.conf.5:161
 msgid "Then the following links and directories will be created:"
 msgstr "Entonces se crearán los siguientes enlaces y directorios:"
 
 #. type: TP
-#: en/persistence.conf.5:162 en/persistence.conf.5:165
-#: en/persistence.conf.5:171
+#: en/persistence.conf.5:161 en/persistence.conf.5:164
+#: en/persistence.conf.5:170
 #, no-wrap
 msgid "Link:"
 msgstr "Enlace:"
 
 #. type: Plain text
-#: en/persistence.conf.5:165
+#: en/persistence.conf.5:164
 msgid "/home/user1/.emacs -E<gt> I<VOL>/config-files/user1/.emacs (from a)"
 msgstr "/home/user1/.emacs -E<gt> I<VOL>/config-files/user1/.emacs (de a)"
 
 #. type: Plain text
-#: en/persistence.conf.5:168
+#: en/persistence.conf.5:167
 msgid "/home/user2/.bashrc -E<gt> I<VOL>/config-files/user2/.bashrc (from b)"
 msgstr "/home/user2/.bashrc -E<gt> I<VOL>/config-files/user2/.bashrc (de b)"
 
 #. type: TP
-#: en/persistence.conf.5:168
+#: en/persistence.conf.5:167
 #, no-wrap
 msgid "Dir:"
 msgstr "Directorio:"
 
 #. type: Plain text
-#: en/persistence.conf.5:171
+#: en/persistence.conf.5:170
 msgid "/homea/user2/.ssh (from c)"
 msgstr "/homea/user2/.ssh (de c)"
 
 #. type: Plain text
-#: en/persistence.conf.5:175
+#: en/persistence.conf.5:174
 msgid ""
 "/home/user2/.ssh/config -E<gt> I<VOL>/config-files/user2/.ssh/config (from c)"
 msgstr ""
 "/home/user2/.ssh/config -E<gt> I<VOL>/config-files/user2/.ssh/config (de c)"
 
 #. type: Plain text
-#: en/persistence.conf.5:181
+#: en/persistence.conf.5:180
 msgid ""
 "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 /"
@@ -611,7 +609,7 @@ msgstr ""
 "incluidos en él."
 
 #. type: Plain text
-#: en/persistence.conf.5:190
+#: en/persistence.conf.5:189
 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>/"
@@ -631,6 +629,6 @@ msgstr ""
 "tendría que ser copiado en I<VOL>/usr durante la preinstalación inicial."
 
 #. type: Plain text
-#: en/persistence.conf.5:193
+#: en/persistence.conf.5:192
 msgid "I<live-boot>(7)"
 msgstr "I<live-boot>(7)"

diff --git a/manpages/po/ja/live-boot.7.po b/manpages/po/ja/live-boot.7.po
index 8906674..a278461 100644 (file)
--- a/manpages/po/ja/live-boot.7.po
+++ b/manpages/po/ja/live-boot.7.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot\n"
-"POT-Creation-Date: 2014-12-10 10:35+0100\n"
+"POT-Creation-Date: 2015-01-04 21:31+0100\n"
 "PO-Revision-Date: 2014-08-28 02:52+0900\n"
 "Last-Translator: victory <victory.deb@gmail.com>\n"
 "Language-Team: none\n"
@@ -23,7 +23,7 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2014-12-10"
+msgid "2015-01-04"
 msgstr ""
 
 #. type: TH
@@ -885,17 +885,17 @@ msgstr ""
 #. type: IP
 #: en/live-boot.7:135
 #, no-wrap
-msgid "B<union>=aufs|unionfs"
-msgstr "B<union>=aufs|unionfs"
+msgid "B<union>=aufs|overlay"
+msgstr "B<union>=aufs|overlay"
 
 #.  FIXME
 #. type: Plain text
 #: en/live-boot.7:138
 msgid ""
 "By default, live-boot uses aufs. With this parameter, you can switch to "
-"unionfs."
+"overlay."
 msgstr ""
-"デフォルトで live-boot は aufs を利用します。このパラメータにより unionfs に"
+"デフォルトで live-boot は aufs を利用します。このパラメータにより overlay に"
 "切り替えることができます。"
 
 #.  FIXME

diff --git a/manpages/po/ja/persistence.conf.5.po b/manpages/po/ja/persistence.conf.5.po
index 62c3c63..ccf7cbf 100644 (file)
--- a/manpages/po/ja/persistence.conf.5.po
+++ b/manpages/po/ja/persistence.conf.5.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot\n"
-"POT-Creation-Date: 2014-12-10 10:35+0100\n"
+"POT-Creation-Date: 2015-01-04 21:37+0100\n"
 "PO-Revision-Date: 2014-08-28 02:52+0900\n"
 "Last-Translator: victory <victory.deb@gmail.com>\n"
 "Language-Team: none\n"
@@ -23,7 +23,7 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2014-12-10"
+msgid "2015-01-04"
 msgstr ""
 
 #. type: TH
@@ -57,34 +57,34 @@ msgid "OPTIONS"
 msgstr "オプション"
 
 #. type: SH
-#: en/live-boot.7:154 en/persistence.conf.5:191
+#: en/live-boot.7:154 en/persistence.conf.5:190
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "関連項目"
 
 #. type: Plain text
-#: en/live-boot.7:158 en/persistence.conf.5:195
+#: en/live-boot.7:158 en/persistence.conf.5:194
 msgid "I<live-build>(7)"
 msgstr "I<live-build>(7)"
 
 #. type: Plain text
-#: en/live-boot.7:160 en/persistence.conf.5:197
+#: en/live-boot.7:160 en/persistence.conf.5:196
 msgid "I<live-config>(7)"
 msgstr "I<live-config>(7)"
 
 #. type: Plain text
-#: en/live-boot.7:162 en/persistence.conf.5:199
+#: en/live-boot.7:162 en/persistence.conf.5:198
 msgid "I<live-tools>(7)"
 msgstr "I<live-tools>(7)"
 
 #. type: SH
-#: en/live-boot.7:163 en/persistence.conf.5:200
+#: en/live-boot.7:163 en/persistence.conf.5:199
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "ホームページ"
 
 #. type: Plain text
-#: en/live-boot.7:165 en/persistence.conf.5:202
+#: en/live-boot.7:165 en/persistence.conf.5:201
 msgid ""
 "More information about live-boot and the Live Systems project can be found "
 "on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
@@ -95,13 +95,13 @@ msgstr ""
 "systems.org/manual/>E<gt> のマニュアルにあります。"
 
 #. type: SH
-#: en/live-boot.7:166 en/persistence.conf.5:203
+#: en/live-boot.7:166 en/persistence.conf.5:202
 #, no-wrap
 msgid "BUGS"
 msgstr "バグ"
 
 #. type: Plain text
-#: en/live-boot.7:168 en/persistence.conf.5:205
+#: en/live-boot.7:168 en/persistence.conf.5:204
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-boot package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -114,13 +114,13 @@ msgstr ""
 "報告できます。"
 
 #. type: SH
-#: en/live-boot.7:169 en/persistence.conf.5:206
+#: en/live-boot.7:169 en/persistence.conf.5:205
 #, no-wrap
 msgid "AUTHOR"
 msgstr "作者"
 
 #. type: Plain text
-#: en/live-boot.7:170 en/persistence.conf.5:207
+#: en/live-boot.7:170 en/persistence.conf.5:206
 msgid ""
 "live-boot was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
@@ -342,7 +342,17 @@ msgid "B<union>"
 msgstr "B<union>"
 
 #. type: Plain text
-#: en/persistence.conf.5:101
+#: en/persistence.conf.5:100
+#, fuzzy
+#| 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 bind-mounts, and will not hide files added to the read-only "
+#| "media. One caveat is that the union will use I<DIR> from the image's read-"
+#| "only file system, not the real file system root, so files created after "
+#| "boot (e.g. by live-config) will not appear in the union. This option will "
+#| "use the union file system specified by live-boot's B<union> boot "
+#| "parameter, but is not supported with B<union=unionmount>."
 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 "
@@ -350,8 +360,7 @@ msgid ""
 "caveat is that the union will use I<DIR> from the image's read-only file "
 "system, not the real file system root, so files created after boot (e.g. by "
 "live-config) will not appear in the union. This option will use the union "
-"file system specified by live-boot's B<union> boot parameter, but is not "
-"supported with B<union=unionmount>."
+"file system specified by live-boot's B<union> boot parameter."
 msgstr ""
 "結合ファイルシステムの rw ブランチを保持用メディアに保存するため、変更点だけ"
 "を持続的に保管します。バインドマウントと比較するとこの方法は潜在的にディスク"
@@ -363,19 +372,19 @@ msgstr ""
 "ルシステムを使いますが、B<union=unionmount> ではサポートしていません。"
 
 #. type: SH
-#: en/persistence.conf.5:102
+#: en/persistence.conf.5:101
 #, no-wrap
 msgid "DIRECTORIES"
 msgstr "ディレクトリ"
 
 #. type: IP
-#: en/persistence.conf.5:103
+#: en/persistence.conf.5:102
 #, no-wrap
 msgid "B</live/persistence>"
 msgstr "B</live/persistence>"
 
 #. type: Plain text
-#: en/persistence.conf.5:109
+#: en/persistence.conf.5:108
 msgid ""
 "All persistence volumes will be mounted here (in a directory corresponding "
 "to the device name). The B<persistence.conf> file can easily be edited "
@@ -388,13 +397,13 @@ msgstr ""
 "集できます。"
 
 #. type: SH
-#: en/persistence.conf.5:110
+#: en/persistence.conf.5:109
 #, no-wrap
 msgid "EXAMPLES"
 msgstr "例"
 
 #. type: Plain text
-#: en/persistence.conf.5:115
+#: en/persistence.conf.5:114
 msgid ""
 "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):"
@@ -403,56 +412,56 @@ msgstr ""
 "を収録しているものとしましょう (番号は参照しやすいように付加しています):"
 
 #. type: TP
-#: en/persistence.conf.5:115 en/persistence.conf.5:129
+#: en/persistence.conf.5:114 en/persistence.conf.5:128
 #, no-wrap
 msgid "1."
 msgstr "1."
 
 #. type: Plain text
-#: en/persistence.conf.5:118
+#: en/persistence.conf.5:117
 msgid "/home/user1 link,source=config-files/user1"
 msgstr "/home/user1 link,source=config-files/user1"
 
 #. type: TP
-#: en/persistence.conf.5:118 en/persistence.conf.5:133
+#: en/persistence.conf.5:117 en/persistence.conf.5:132
 #, no-wrap
 msgid "2."
 msgstr "2."
 
 #. type: Plain text
-#: en/persistence.conf.5:121
+#: en/persistence.conf.5:120
 msgid "/home/user2 link,source=config-files/user2"
 msgstr "/home/user2 link,source=config-files/user2"
 
 #. type: TP
-#: en/persistence.conf.5:121 en/persistence.conf.5:137
+#: en/persistence.conf.5:120 en/persistence.conf.5:136
 #, no-wrap
 msgid "3."
 msgstr "3."
 
 #. type: Plain text
-#: en/persistence.conf.5:124
+#: en/persistence.conf.5:123
 msgid "/home"
 msgstr "/home"
 
 #. type: TP
-#: en/persistence.conf.5:124 en/persistence.conf.5:140
+#: en/persistence.conf.5:123 en/persistence.conf.5:139
 #, no-wrap
 msgid "4."
 msgstr "4."
 
 #. type: Plain text
-#: en/persistence.conf.5:127
+#: en/persistence.conf.5:126
 msgid "/usr union"
 msgstr "/usr union"
 
 #. type: Plain text
-#: en/persistence.conf.5:129
+#: en/persistence.conf.5:128
 msgid "The corresponding source directories are:"
 msgstr "それぞれに対応するディレクトリ:"
 
 #. type: Plain text
-#: en/persistence.conf.5:133
+#: en/persistence.conf.5:132
 msgid ""
 "I<VOL>/config-files/user1 (but it would be I<VOL>/home/user1 without the "
 "B<source> option)"
@@ -461,7 +470,7 @@ msgstr ""
 "I<VOL>/home/user1)"
 
 #. type: Plain text
-#: en/persistence.conf.5:137
+#: en/persistence.conf.5:136
 msgid ""
 "I<VOL>/config-files/user2 (but it would be I<VOL>/home/user2 without the "
 "B<source> option)"
@@ -470,17 +479,17 @@ msgstr ""
 "I<VOL>/home/user2)"
 
 #. type: Plain text
-#: en/persistence.conf.5:140
+#: en/persistence.conf.5:139
 msgid "I<VOL>/home"
 msgstr "I<VOL>/home"
 
 #. type: Plain text
-#: en/persistence.conf.5:143
+#: en/persistence.conf.5:142
 msgid "I<VOL>/usr"
 msgstr "I<VOL>/usr"
 
 #. type: Plain text
-#: en/persistence.conf.5:146
+#: en/persistence.conf.5:145
 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."
@@ -489,7 +498,7 @@ msgstr ""
 "ソースと入り組んでしまい不正となるためです。"
 
 #. type: Plain text
-#: en/persistence.conf.5:151
+#: en/persistence.conf.5:150
 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 "
@@ -502,74 +511,74 @@ msgstr ""
 "明するため、以下のファイルが存在するとしましょう:"
 
 #. type: TP
-#: en/persistence.conf.5:151
+#: en/persistence.conf.5:150
 #, no-wrap
 msgid "a."
 msgstr "a."
 
 #. type: Plain text
-#: en/persistence.conf.5:154
+#: en/persistence.conf.5:153
 msgid "I<VOL>/config-files/user1/.emacs"
 msgstr "I<VOL>/config-files/user1/.emacs"
 
 #. type: TP
-#: en/persistence.conf.5:154
+#: en/persistence.conf.5:153
 #, no-wrap
 msgid "b."
 msgstr "b."
 
 #. type: Plain text
-#: en/persistence.conf.5:157
+#: en/persistence.conf.5:156
 msgid "I<VOL>/config-files/user2/.bashrc"
 msgstr "I<VOL>/config-files/user2/.bashrc"
 
 #. type: TP
-#: en/persistence.conf.5:157
+#: en/persistence.conf.5:156
 #, no-wrap
 msgid "c."
 msgstr "c."
 
 #. type: Plain text
-#: en/persistence.conf.5:160
+#: en/persistence.conf.5:159
 msgid "I<VOL>/config-files/user2/.ssh/config"
 msgstr "I<VOL>/config-files/user2/.ssh/config"
 
 #. type: Plain text
-#: en/persistence.conf.5:162
+#: en/persistence.conf.5:161
 msgid "Then the following links and directories will be created:"
 msgstr "それにより作成されるリンクやディレクトリ:"
 
 #. type: TP
-#: en/persistence.conf.5:162 en/persistence.conf.5:165
-#: en/persistence.conf.5:171
+#: en/persistence.conf.5:161 en/persistence.conf.5:164
+#: en/persistence.conf.5:170
 #, no-wrap
 msgid "Link:"
 msgstr "リンク:"
 
 #. type: Plain text
-#: en/persistence.conf.5:165
+#: en/persistence.conf.5:164
 msgid "/home/user1/.emacs -E<gt> I<VOL>/config-files/user1/.emacs (from a)"
 msgstr "/home/user1/.emacs -E<gt> I<VOL>/config-files/user1/.emacs (a の場合)"
 
 #. type: Plain text
-#: en/persistence.conf.5:168
+#: en/persistence.conf.5:167
 msgid "/home/user2/.bashrc -E<gt> I<VOL>/config-files/user2/.bashrc (from b)"
 msgstr ""
 "/home/user2/.bashrc -E<gt> I<VOL>/config-files/user2/.bashrc (b の場合)"
 
 #. type: TP
-#: en/persistence.conf.5:168
+#: en/persistence.conf.5:167
 #, no-wrap
 msgid "Dir:"
 msgstr "ディレクトリ:"
 
 #. type: Plain text
-#: en/persistence.conf.5:171
+#: en/persistence.conf.5:170
 msgid "/homea/user2/.ssh (from c)"
 msgstr "/homea/user2/.ssh (c の場合)"
 
 #. type: Plain text
-#: en/persistence.conf.5:175
+#: en/persistence.conf.5:174
 msgid ""
 "/home/user2/.ssh/config -E<gt> I<VOL>/config-files/user2/.ssh/config (from c)"
 msgstr ""
@@ -577,7 +586,7 @@ msgstr ""
 "合)"
 
 #. type: Plain text
-#: en/persistence.conf.5:181
+#: en/persistence.conf.5:180
 msgid ""
 "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 /"
@@ -592,7 +601,7 @@ msgstr ""
 "ます。"
 
 #. type: Plain text
-#: en/persistence.conf.5:190
+#: en/persistence.conf.5:189
 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>/"
@@ -611,6 +620,6 @@ msgstr ""
 "あるためです。"
 
 #. type: Plain text
-#: en/persistence.conf.5:193
+#: en/persistence.conf.5:192
 msgid "I<live-boot>(7)"
 msgstr "I<live-boot>(7)"

diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index 7e591e9..51b853b 100644 (file)
--- 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 4.0.2-1\n"
-"POT-Creation-Date: 2014-12-10 10:35+0100\n"
+"POT-Creation-Date: 2015-01-04 21:31+0100\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"
@@ -25,7 +25,7 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2014-12-10"
+msgid "2015-01-04"
 msgstr ""
 
 #. type: TH
@@ -735,7 +735,7 @@ msgstr ""
 #. type: IP
 #: en/live-boot.7:135
 #, no-wrap
-msgid "B<union>=aufs|unionfs"
+msgid "B<union>=aufs|overlay"
 msgstr ""
 
 #.  FIXME
@@ -743,7 +743,7 @@ msgstr ""
 #: en/live-boot.7:138
 msgid ""
 "By default, live-boot uses aufs. With this parameter, you can switch to "
-"unionfs."
+"overlay."
 msgstr ""
 
 #.  FIXME

diff --git a/manpages/pot/persistence.conf.5.pot b/manpages/pot/persistence.conf.5.pot
index 01cbc8e..302c5f3 100644 (file)
--- a/manpages/pot/persistence.conf.5.pot
+++ b/manpages/pot/persistence.conf.5.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot 4.0.2-1\n"
-"POT-Creation-Date: 2014-12-10 10:35+0100\n"
+"POT-Creation-Date: 2015-01-04 21:37+0100\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"
@@ -25,7 +25,7 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2014-12-10"
+msgid "2015-01-04"
 msgstr ""
 
 #. type: TH
@@ -59,34 +59,34 @@ msgid "OPTIONS"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:154 en/persistence.conf.5:191
+#: en/live-boot.7:154 en/persistence.conf.5:190
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:158 en/persistence.conf.5:195
+#: en/live-boot.7:158 en/persistence.conf.5:194
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:160 en/persistence.conf.5:197
+#: en/live-boot.7:160 en/persistence.conf.5:196
 msgid "I<live-config>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:162 en/persistence.conf.5:199
+#: en/live-boot.7:162 en/persistence.conf.5:198
 msgid "I<live-tools>(7)"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:163 en/persistence.conf.5:200
+#: en/live-boot.7:163 en/persistence.conf.5:199
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:165 en/persistence.conf.5:202
+#: en/live-boot.7:165 en/persistence.conf.5:201
 msgid ""
 "More information about live-boot and the Live Systems project can be found "
 "on the homepage at E<lt>I<http://live-systems.org/>E<gt> and in the manual "
@@ -94,13 +94,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:166 en/persistence.conf.5:203
+#: en/live-boot.7:166 en/persistence.conf.5:202
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:168 en/persistence.conf.5:205
+#: en/live-boot.7:168 en/persistence.conf.5:204
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-boot package in "
 "the Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -109,13 +109,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:169 en/persistence.conf.5:206
+#: en/live-boot.7:169 en/persistence.conf.5:205
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:170 en/persistence.conf.5:207
+#: en/live-boot.7:170 en/persistence.conf.5:206
 msgid ""
 "live-boot was written by Daniel Baumann E<lt>I<mail@daniel-baumann.ch>E<gt>."
 msgstr ""
@@ -276,7 +276,7 @@ msgid "B<union>"
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:101
+#: en/persistence.conf.5:100
 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,24 +284,23 @@ msgid ""
 "caveat is that the union will use I<DIR> from the image's read-only file "
 "system, not the real file system root, so files created after boot (e.g. by "
 "live-config) will not appear in the union. This option will use the union "
-"file system specified by live-boot's B<union> boot parameter, but is not "
-"supported with B<union=unionmount>."
+"file system specified by live-boot's B<union> boot parameter."
 msgstr ""
 
 #. type: SH
-#: en/persistence.conf.5:102
+#: en/persistence.conf.5:101
 #, no-wrap
 msgid "DIRECTORIES"
 msgstr ""
 
 #. type: IP
-#: en/persistence.conf.5:103
+#: en/persistence.conf.5:102
 #, no-wrap
 msgid "B</live/persistence>"
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:109
+#: en/persistence.conf.5:108
 msgid ""
 "All persistence volumes will be mounted here (in a directory corresponding "
 "to the device name). The B<persistence.conf> file can easily be edited "
@@ -310,100 +309,100 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/persistence.conf.5:110
+#: en/persistence.conf.5:109
 #, no-wrap
 msgid "EXAMPLES"
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:115
+#: en/persistence.conf.5:114
 msgid ""
 "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/persistence.conf.5:115 en/persistence.conf.5:129
+#: en/persistence.conf.5:114 en/persistence.conf.5:128
 #, no-wrap
 msgid "1."
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:118
+#: en/persistence.conf.5:117
 msgid "/home/user1 link,source=config-files/user1"
 msgstr ""
 
 #. type: TP
-#: en/persistence.conf.5:118 en/persistence.conf.5:133
+#: en/persistence.conf.5:117 en/persistence.conf.5:132
 #, no-wrap
 msgid "2."
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:121
+#: en/persistence.conf.5:120
 msgid "/home/user2 link,source=config-files/user2"
 msgstr ""
 
 #. type: TP
-#: en/persistence.conf.5:121 en/persistence.conf.5:137
+#: en/persistence.conf.5:120 en/persistence.conf.5:136
 #, no-wrap
 msgid "3."
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:124
+#: en/persistence.conf.5:123
 msgid "/home"
 msgstr ""
 
 #. type: TP
-#: en/persistence.conf.5:124 en/persistence.conf.5:140
+#: en/persistence.conf.5:123 en/persistence.conf.5:139
 #, no-wrap
 msgid "4."
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:127
+#: en/persistence.conf.5:126
 msgid "/usr union"
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:129
+#: en/persistence.conf.5:128
 msgid "The corresponding source directories are:"
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:133
+#: en/persistence.conf.5:132
 msgid ""
 "I<VOL>/config-files/user1 (but it would be I<VOL>/home/user1 without the "
 "B<source> option)"
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:137
+#: en/persistence.conf.5:136
 msgid ""
 "I<VOL>/config-files/user2 (but it would be I<VOL>/home/user2 without the "
 "B<source> option)"
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:140
+#: en/persistence.conf.5:139
 msgid "I<VOL>/home"
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:143
+#: en/persistence.conf.5:142
 msgid "I<VOL>/usr"
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:146
+#: en/persistence.conf.5:145
 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/persistence.conf.5:151
+#: en/persistence.conf.5:150
 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 "
@@ -412,79 +411,79 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: en/persistence.conf.5:151
+#: en/persistence.conf.5:150
 #, no-wrap
 msgid "a."
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:154
+#: en/persistence.conf.5:153
 msgid "I<VOL>/config-files/user1/.emacs"
 msgstr ""
 
 #. type: TP
-#: en/persistence.conf.5:154
+#: en/persistence.conf.5:153
 #, no-wrap
 msgid "b."
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:157
+#: en/persistence.conf.5:156
 msgid "I<VOL>/config-files/user2/.bashrc"
 msgstr ""
 
 #. type: TP
-#: en/persistence.conf.5:157
+#: en/persistence.conf.5:156
 #, no-wrap
 msgid "c."
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:160
+#: en/persistence.conf.5:159
 msgid "I<VOL>/config-files/user2/.ssh/config"
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:162
+#: en/persistence.conf.5:161
 msgid "Then the following links and directories will be created:"
 msgstr ""
 
 #. type: TP
-#: en/persistence.conf.5:162 en/persistence.conf.5:165
-#: en/persistence.conf.5:171
+#: en/persistence.conf.5:161 en/persistence.conf.5:164
+#: en/persistence.conf.5:170
 #, no-wrap
 msgid "Link:"
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:165
+#: en/persistence.conf.5:164
 msgid "/home/user1/.emacs -E<gt> I<VOL>/config-files/user1/.emacs (from a)"
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:168
+#: en/persistence.conf.5:167
 msgid "/home/user2/.bashrc -E<gt> I<VOL>/config-files/user2/.bashrc (from b)"
 msgstr ""
 
 #. type: TP
-#: en/persistence.conf.5:168
+#: en/persistence.conf.5:167
 #, no-wrap
 msgid "Dir:"
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:171
+#: en/persistence.conf.5:170
 msgid "/homea/user2/.ssh (from c)"
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:175
+#: en/persistence.conf.5:174
 msgid ""
 "/home/user2/.ssh/config -E<gt> I<VOL>/config-files/user2/.ssh/config (from c)"
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:181
+#: en/persistence.conf.5:180
 msgid ""
 "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 /"
@@ -494,7 +493,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:190
+#: en/persistence.conf.5:189
 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>/"
@@ -506,6 +505,6 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/persistence.conf.5:193
+#: en/persistence.conf.5:192
 msgid "I<live-boot>(7)"
 msgstr ""