summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2017-02-07 13:08:56 +0100
committerLennart Poettering <lennart@poettering.net>2017-02-08 17:20:35 +0100
commitd5cc4be28f9d678dab441e7cf332fedf47917ea5 (patch)
tree4aa1be6ea8a8f335da97c5c57491d0c1aa7a301d /man
parentb53ede699cdc5233041a22591f18863fb3fe2672 (diff)
fstab-generator: Options= applies specifier expansion
Let's document that this is the case, and properly escape % when we generate Options= in the generator. Fixes: #5086
Diffstat (limited to 'man')
-rw-r--r--man/systemd.mount.xml6
-rw-r--r--man/systemd.swap.xml9
2 files changed, 7 insertions, 8 deletions
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index 2117433bf0..8d9517a913 100644
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -366,9 +366,9 @@
<varlistentry>
<term><varname>Options=</varname></term>
- <listitem><para>Mount options to use when mounting. This takes
- a comma-separated list of options. This setting is
- optional.</para></listitem>
+ <listitem><para>Mount options to use when mounting. This takes a comma-separated list of options. This setting
+ is optional. Note that the usual specifier expansion is applied to this setting, literal percent characters
+ should hence be written as <literal>%%</literal>.</para></listitem>
</varlistentry>
<varlistentry>
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index cf4e1ba839..7f82d69725 100644
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -195,12 +195,11 @@
<varlistentry>
<term><varname>Options=</varname></term>
- <listitem><para>May contain an option string for the swap
- device. This may be used for controlling discard options among
- other functionality, if the swap backing device supports the
- discard or trim operation. (See
+ <listitem><para>May contain an option string for the swap device. This may be used for controlling discard
+ options among other functionality, if the swap backing device supports the discard or trim operation. (See
<citerefentry project='man-pages'><refentrytitle>swapon</refentrytitle><manvolnum>8</manvolnum></citerefentry>
- for more information.) </para></listitem>
+ for more information.) Note that the usual specifier expansion is applied to this setting, literal percent
+ characters should hence be written as <literal>%%</literal>.</para></listitem>
</varlistentry>
<varlistentry>