diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-11-09 18:16:21 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-11-09 18:16:21 +0100 |
| commit | 6c9e781ebadda6c92ef88c4c5348948076f16340 (patch) | |
| tree | cc888be56de70a309cf89dbea0e2b07012ba4586 /man/systemd.swap.xml | |
| parent | e8b4b135e5940a76d66af013b69234bc5d2db6a4 (diff) | |
| parent | 7ca4155737730ece73ae4b4ac80571005cb99b69 (diff) | |
Merge pull request #1799 from jengelh/doc
doc: typo and ortho fixes
Diffstat (limited to 'man/systemd.swap.xml')
| -rw-r--r-- | man/systemd.swap.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml index d9a39577d5..bc9ef826e1 100644 --- a/man/systemd.swap.xml +++ b/man/systemd.swap.xml @@ -111,7 +111,7 @@ <filename>/etc/fstab</filename> and a unit file, the configuration in the latter takes precedence.</para> - <para>When reading <filename>/etc/fstab</filename> a few special + <para>When reading <filename>/etc/fstab</filename>, a few special options are understood by systemd which influence how dependencies are created for swap units.</para> @@ -120,11 +120,11 @@ <term><option>noauto</option></term> <term><option>auto</option></term> - <listitem><para>With <option>noauto</option> the swap unit + <listitem><para>With <option>noauto</option>, the swap unit will not be added as a dependency for <filename>swap.target</filename>. This means that it will not be activated automatically during boot, unless it is pulled in - by some other unit. Option <option>auto</option> has the + by some other unit. The <option>auto</option> option has the opposite meaning and is the default.</para> </listitem> </varlistentry> @@ -132,7 +132,7 @@ <varlistentry> <term><option>nofail</option></term> - <listitem><para>With <option>nofail</option> the swap unit + <listitem><para>With <option>nofail</option>, the swap unit will be only wanted, not required by <filename>swap.target</filename>. This means that the boot will continue even if this swap device is not activated @@ -177,8 +177,8 @@ <listitem><para>Swap priority to use when activating the swap device or file. This takes an integer. This setting is - optional and ignored when priority is set by <option>pri=</option> in the - <varname>Options=</varname> option.</para></listitem> + optional and ignored when the priority is set by <option>pri=</option> in the + <varname>Options=</varname> key.</para></listitem> </varlistentry> <varlistentry> |