diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-02-09 09:18:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-09 09:18:41 -0500 |
| commit | bc7e815445d84f26e81d3883c1b707fc0bf825ba (patch) | |
| tree | ee5dd98503dd5410f47d9467c0b3c57ab816a43a /man/systemd.swap.xml | |
| parent | 6f844e3a3f97d2b3fce9d37714575177b9ff3f4c (diff) | |
| parent | 19d0833bead317dc099c10b472c23e665ff76cfd (diff) | |
| download | systemd-bc7e815445d84f26e81d3883c1b707fc0bf825ba.tar.gz | |
Merge pull request #5255 from poettering/percent-escape
fstab-generator: Options= applies specifier expansion
Diffstat (limited to 'man/systemd.swap.xml')
| -rw-r--r-- | man/systemd.swap.xml | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml index 33349eb0b1..184abff260 100644 --- a/man/systemd.swap.xml +++ b/man/systemd.swap.xml @@ -170,17 +170,15 @@ <varlistentry> <term><varname>What=</varname></term> - <listitem><para>Takes an absolute path of a device node or - file to use for paging. See - <citerefentry project='man-pages'><refentrytitle>swapon</refentrytitle><manvolnum>8</manvolnum></citerefentry> - for details. If this refers to a device node, a dependency on - the respective device unit is automatically created. (See - <citerefentry><refentrytitle>systemd.device</refentrytitle><manvolnum>5</manvolnum></citerefentry> - for more information.) If this refers to a file, a dependency - on the respective mount unit is automatically created. (See - <citerefentry><refentrytitle>systemd.mount</refentrytitle><manvolnum>5</manvolnum></citerefentry> - for more information.) This option is - mandatory.</para></listitem> + <listitem><para>Takes an absolute path of a device node or file to use for paging. See <citerefentry + project='man-pages'><refentrytitle>swapon</refentrytitle><manvolnum>8</manvolnum></citerefentry> for + details. If this refers to a device node, a dependency on the respective device unit is automatically + created. (See + <citerefentry><refentrytitle>systemd.device</refentrytitle><manvolnum>5</manvolnum></citerefentry> for more + information.) If this refers to a file, a dependency on the respective mount unit is automatically + created. (See <citerefentry><refentrytitle>systemd.mount</refentrytitle><manvolnum>5</manvolnum></citerefentry> + for more information.) This option is mandatory. 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> @@ -195,12 +193,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> |