service: drop the per-distro ifdefs in service.c

[elogind.git] / man / systemd.conf.xml

diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index 7776c8f4f739808e13b17173eb9855a7628f0d02..a6be932c73ad64137c61d54fbaee26800afdf634 100644 (file)
--- a/man/systemd.conf.xml
+++ b/man/systemd.conf.xml
@@ -201,7 +201,7 @@
                                 capabilities will be included, the
                                 effect of the assignment
                                 inverted. Note that this option also
                                 capabilities will be included, the
                                 effect of the assignment
                                 inverted. Note that this option also

-                                effects the respective capabilities in
+                                affects the respective capabilities in

                                 the effective, permitted and
                                 inheritable capability sets. The
                                 capability bounding set may also be
                                 the effective, permitted and
                                 inheritable capability sets. The
                                 capability bounding set may also be


@@ -220,7 +220,7 @@
                                 <listitem><para>Sets the timer slack
                                 in nanoseconds for PID 1 which is then
                                 inherited to all executed processes,
                                 <listitem><para>Sets the timer slack
                                 in nanoseconds for PID 1 which is then
                                 inherited to all executed processes,

-                                unless overriden individually, for
+                                unless overridden individually, for

                                 example with the
                                 <varname>TimerSlackNSec=</varname>
                                 setting in service units (for details
                                 example with the
                                 <varname>TimerSlackNSec=</varname>
                                 setting in service units (for details


@@ -264,7 +264,7 @@
                                 <varname>infinity</varname> to
                                 configure no limit on a specific
                                 resource. These settings may be
                                 <varname>infinity</varname> to
                                 configure no limit on a specific
                                 resource. These settings may be

-                                overriden in individual units
+                                overridden in individual units

                                 using the corresponding LimitXXX=
                                 directives. Note that these resource
                                 limits are only defaults for units,
                                 using the corresponding LimitXXX=
                                 directives. Note that these resource
                                 limits are only defaults for units,