X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd.xml;h=47d6438939a12020142aa3db9ab86521f3f363ad;hp=06d2ecf6f8ae7886894a71f8662bb662e1b5babe;hb=0b429ab7fca2aa139ffbeeac8bdcfbbd21cc1a60;hpb=1ec96668dd0dcb19cc2f7b99cbf73df0d769c97d

diff --git a/man/systemd.xml b/man/systemd.xml
index 06d2ecf6f..47d643893 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -294,18 +294,18 @@
                 <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
                 however some are created automatically from other
                 configuration, dynamically from system state or
-                programmatically at runtime. Units may be 'active'
-                (meaning started, bound, plugged in, ...  depending on
-                the unit type, see below), or 'inactive' (meaning
+                programmatically at runtime. Units may be "active"
+                (meaning started, bound, plugged in, ..., depending on
+                the unit type, see below), or "inactive" (meaning
                 stopped, unbound, unplugged, ...), as well as in the
                 process of being activated or deactivated,
                 i.e. between the two states (these states are called
-                'activating', 'deactivating'). A special 'failed'
-                state is available as well which is very similar to
-                'inactive' and is entered when the service failed in
+                "activating", "deactivating"). A special "failed"
+                state is available as well, which is very similar to
+                "inactive" and is entered when the service failed in
                 some way (process returned error code on exit, or
                 crashed, or an operation timed out). If this state is
-                entered the cause will be logged, for later
+                entered, the cause will be logged, for later
                 reference. Note that the various unit types may have a
                 number of additional substates, which are mapped to
                 the five generalized unit states described
@@ -374,7 +374,7 @@
                         <listitem><para>Slice units may be used to
                         group units which manage system processes
                         (such as service and scope units) in a
-                        hierachial tree for resource management
+                        hierarchical tree for resource management
                         purposes. See
                         <citerefentry><refentrytitle>systemd.slice</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para></listitem>
 
@@ -1022,7 +1022,7 @@
                                 option prefixed with
                                 <literal>rd.</literal> is honored
                                 only in the initial RAM disk (initrd),
-                                while the one that isn't prefixed only
+                                while the one that is not prefixed only
                                 in the main system.</para></listitem>
                         </varlistentry>
 
@@ -1113,16 +1113,11 @@
                                 <term><varname>systemd.setenv=</varname></term>
 
                                 <listitem><para>Takes a string
-                                argument in the form
-                                VARIABLE=VALUE. May be used to set
-                                environment variables for the init
-                                process and all its children at boot
-                                time. May be used more than once to
-                                set multiple variables. If the equal
-                                sign and variable are missing it unsets
-                                an environment variable which might be
-                                passed in from the initial ram
-                                disk.</para></listitem>
+                                argument in the form VARIABLE=VALUE.
+                                May be used to set default environment
+                                variables to add to forked child processes.
+                                May be used more than once to set multiple
+                                variables.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>