3 files changed, 48 insertions, 47 deletions
diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 3268b42..85cd150 100644
--- a/manpages/de/live-boot.de.7
+++ b/manpages/de/live-boot.de.7
@@ -157,9 +157,9 @@ This parameter disables the default disabling of filesystem checks in
 /etc/fstab. If you have static filesystems on your harddisk and you want
 them to be checked at boot time, use this parameter, otherwise they are
 skipped.
-.IP \fBnopersistent\fP 4
-disables the "persistent" feature, useful if the bootloader (like syslinux)
-has been installed with persistent enabled.
+.IP \fBnopersistence\fP 4
+disables the "persistence" feature, useful if the bootloader (like syslinux)
+has been installed with persistence enabled.
 .IP \fBnoprompt\fP 4
 Do not prompt to eject the CD or remove the USB flash drive on reboot.
 .IP \fBnoprompt\fP=\fITYPE\fP 4
@@ -172,8 +172,8 @@ default of mount applies (currently 50% of available RAM). Note that this
 option has no currently no effect when booting with toram.
 .IP \fBswapon\fP 4
 This parameter enables usage of local swap partitions.
-.IP \fBpersistent\fP 4
-live\-boot will probe devices for persistent media. These can be partitions
+.IP \fBpersistence\fP 4
+live\-boot will probe devices for persistence media. These can be partitions
 (with the correct GPT name), filesystems (with the correct label) or
 image/archive files (with the correct file name). Overlays are labeled/named
 either "full\-ov", which will be mounted on /, or "custom\-ov", which can be
@@ -183,42 +183,42 @@ respectively (see \fIlive\-snapshot\fP(1) for more information). The order these
 are handled are: full\-ov, custom\-ov, live\-sn, home\-sn. Overlay image files
 and snapshot archive files have extensions which determines their filesystem
 or archive type, e.g. "custom\-ov.ext4" and "\home\-sn.squashfs".
-.IP "\fBpersistent\-encryption\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4
+.IP "\fBpersistence\-encryption\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4
 This option determines which types of encryption that we allow to be used
-when probing devices for persistent media. If "none" is in the list, we
+when probing devices for persistence media. If "none" is in the list, we
 allow unencrypted media; if "luks" is in the list, we allow LUKS\-encrypted
 media. Whenever a device containing encrypted media is probed the user will
 be prompted for the passphrase. The default value is "none".
-.IP \fBpersistent\-media\fP={\fIremovable\fP|\fIremovable\-usb\fP} 4
+.IP \fBpersistence\-media\fP={\fIremovable\fP|\fIremovable\-usb\fP} 4
 If you specify the keyword 'removable', live\-boot will try to find
-persistent and snapshot partitions on removable media only. Note that if you
-want to further restrict the media to usb mass storage only, you can use the
-\&'removable\-usb' keyword.
-.IP "\fBpersistent\-method\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4
-This option determines which types of persistent media we allow. If
+persistence and snapshot partitions on removable media only. Note that if
+you want to further restrict the media to usb mass storage only, you can use
+the 'removable\-usb' keyword.
+.IP "\fBpersistence\-method\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4
+This option determines which types of persistence media we allow. If
 "overlay" is in the list, we consider overlays (i.e. "live\-rw" and
 "home\-rw"); if "snapshot" is in the list, we consider snapshots
 (i.e. "live\-sn" and "home\-sn"). The default is "overlay,snapshot".
-.IP \fBpersistent\-path\fP=\fIPATH\fP 4
+.IP \fBpersistence\-path\fP=\fIPATH\fP 4
 live\-boot will look for persistency files in the root directory of a
 partition, with this parameter, the path can be configured so that you can
 have multiple directories on the same partition to store persistency files.
-.IP \fBpersistent\-read\-only\fP 4
-Filesystem changes are not saved back to persistent media. In particular,
+.IP \fBpersistence\-read\-only\fP 4
+Filesystem changes are not saved back to persistence media. In particular,
 overlays and netboot NFS mounts are mounted read\-only, and snapshots are not
 resynced on shutdown.
-.IP "\fBpersistent\-storage\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4
-This option determines which types of persistent storage to consider when
-probing for persistent media. If "filesystem" is in the list, filesystems
+.IP "\fBpersistence\-storage\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 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 \fBpersistent\-subtext\fP=\fISUFFIX\fP 4
+.IP \fBpersistence\-subtext\fP=\fISUFFIX\fP 4
 Add a suffix when searching for the image filenames or partition labels to
-use for the above mentioned persistent feature, the SUFFIX will be added
+use for the above mentioned persistence feature, the SUFFIX will be added
 after a dash (e.g.: "live\-sn" would transform to "live\-sn\-SUFFIX"). This is
 handy to test multiple live\-boot based live\-systems with different
-persistent storage choices.
+persistence storage choices.
 .IP \fBquickreboot\fP 4
 This option causes live\-boot to reboot without attempting to eject the media
 and without asking the user to remove the boot media.
diff --git a/manpages/de/live-snapshot.de.1 b/manpages/de/live-snapshot.de.1
index 3661451..72ca829 100644
--- a/manpages/de/live-snapshot.de.1
+++ b/manpages/de/live-snapshot.de.1
@@ -22,8 +22,9 @@
 
 .SH DESCRIPTION
 live\-snapshot is a script which can be used to build the right types of
-persistent image files supported by \fIlive\-boot\fP(7). It is also used on exit
-by the live\-boot init script to resync the boot\-found snapshots devices.
+persistence image files supported by \fIlive\-boot\fP(7). It is also used on
+exit by the live\-boot init script to resync the boot\-found snapshots
+devices.
 
 .SH OPTIONS
 .IP "\-c, \-\-cow \fIDIRECTORY\fP" 4
diff --git a/manpages/de/live.persist.5.de.persist b/manpages/de/live.persist.5.de.persist
index 91e1213..e7a09f9 100644
--- a/manpages/de/live.persist.5.de.persist
+++ b/manpages/de/live.persist.5.de.persist
@@ -6,14 +6,14 @@
 .TH LIVE\-BOOT persist 2012\-04\-08 3.0~a26\-1 "Debian Live Project"
 
 .SH NAME
-\fBlive.persist\fP \- Configuration file for persistent media in live\-boot
+\fBlive.persist\fP \- Configuration file for persistence media in live\-boot
 
 .SH DESCRIPTION
-If live\-boot probes a persistent volume with the label (or GPT name, or file
-name, but from now on we will just say "label") "custom\-ov", that volume's
-persistence is fully customizable through the \fBlive.persist\fP file stored on
-the root of its file system. Any such labeled volume must have such a file,
-or it will be ignored.
+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
+volume's persistence is fully customizable through the \fBlive.persist\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.persist\fP allow empty lines and lines starting with a
 "#" (used for comments), both which will be ignored. A so called "custom
@@ -23,7 +23,7 @@ mount" has the format:
 \fIDIR\fP [\fIOPTION\fP]...
 .RE
 .PP
-which roughly translates to "make \fIDIR\fP persistent in the way described by
+which roughly translates to "make \fIDIR\fP persistence in the way described by
 the list of \fIOPTION\fPs".
 .PP
 For each custom mount \fIDIR\fP must be an absolute path that cannot contain
@@ -31,7 +31,7 @@ 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 \fIDIR\fP on the live file system are stored persistently
-into a path equivalent to \fIDIR\fP on the persistent media, called the source
+into a path equivalent to \fIDIR\fP on the persistence media, called the source
 directory. The default way to achieve persistence is to simply bind\-mount
 the corresponding source directory to \fIDIR\fP, but this can be changed
 through the use of \fIOPTION\fPs.
@@ -40,7 +40,7 @@ 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.persist\fP are ordered, or if several
-\fBlive.persist\fP files on different persistent media are used at the same
+\fBlive.persist\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"
@@ -48,21 +48,21 @@ 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 persistent media for a certain
+When a source directory doesn't exist on the persistence media for a certain
 custom mount, it will be created automatically, and permissions and
 ownership will be optimistically set according to \fIDIR\fP. It will also be
 bootstrapped by copying the contents of the \fIDIR\fP into its source directory
-on the persistent media. The bootstrapping will not happen when the
+on the persistence media. The bootstrapping will not happen when the
 \fBlinkfiles\fP or \fBunion\fP options are used (see below).
 
 .SH OPTIONS
 Custom mounts defined in \fBlive.persist\fP accept the following options in a
 coma\-separated list:
 .IP \fBsource\fP=\fIPATH\fP 4
-When given, store the persistent changes into \fIPATH\fP on the persistent
-media. \fIPATH\fP must be a relative path (w.r.t. the persistent media root)
+When given, store the persistence changes into \fIPATH\fP on the persistence
+media. \fIPATH\fP must be a relative path (w.r.t. the persistence media root)
 that cannot contain white spaces or the special . or .. path components,
-with the exception that it can be just . which means the persistent media
+with the exception that it can be just . which means the persistence media
 root. This option is mostly relevant if you want to nest custom mounts,
 which otherwise would cause errors, or if you want to make the whole media
 root available (similar to the now deprecated \fBhome\-rw\fP type of
@@ -73,7 +73,7 @@ be in effect):
 .IP \fBbind\fP 4
 Bind\-mount the source directory to \fIDIR\fP. This is the default.
 .IP \fBlinkfiles\fP 4
-Create the directory structure of the source directory on the persistent
+Create the directory structure of the source directory on the persistence
 media in \fIDIR\fP and create symbolic links from the corresponding place in
 \fIDIR\fP to each file in the source directory.  Existing files or directories
 with the same name as any link will be overwritten. Note that deleting the
@@ -89,7 +89,7 @@ useful when only certain files need to be persistent, not the whole
 directory they're in, e.g. some configuration files in a user's home
 directory.
 .IP \fBunion\fP 4
-Save the rw branch of a union on the persistent media, so only the changes
+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
@@ -99,16 +99,16 @@ file system specified by live\-boot's \fBunion\fP boot parameter, but is not
 supported with \fBunion=unionmount\fP.
 
 .SH DIRECTORIES
-.IP \fB/live/persistent\fP 4
-All persistent volumes will be mounted here (in a directory corresponding to
-the device name). The \fBlive.persist\fP file can easily be edited through this
-mount, as well as any source directories (which is especially practical for
-custom mounts using the \fBlinkfiles\fP option).
+.IP \fB/live/persistence\fP 4
+All persistence volumes will be mounted here (in a directory corresponding
+to the device name). The \fBlive.persist\fP file can easily be edited through
+this mount, as well as any source directories (which is especially practical
+for custom mounts using the \fBlinkfiles\fP option).
 
 .SH EXAMPLES
 
-Let's say we have a persistent volume \fIVOL\fP with the a \fBlive.persist\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 \fBlive.persist\fP
+file containing the following four lines (numbered for ease of reference):
 .TP  7
 1.
 /home/user1 linkfiles,source=config\-files/user1