chiark / gitweb /
man: minor edits to daemon, sd_listen_fds, sd_notify, systemctl, systemd.exec, system...
authorConrad Meyer <cemeyer@cs.washington.edu>
Wed, 7 Jul 2010 01:24:38 +0000 (18:24 -0700)
committerLennart Poettering <lennart@poettering.net>
Wed, 7 Jul 2010 01:40:12 +0000 (03:40 +0200)
Just some minor grammar fixes.

man/daemon.xml
man/sd_listen_fds.xml
man/sd_notify.xml
man/systemctl.xml
man/systemd.exec.xml
man/systemd.timer.xml
man/systemd.xml

index 8e9e939..dfee390 100644 (file)
                 communication channels are established already, and no
                 request is lost because client requests will be queued
                 by the bus system (in case of D-Bus) or the kernel (in
-                case of sockets), until the activation
+                case of sockets), until the activation is
                 completed.</para>
 
                 <refsect2>
                         install their systemd unit files in the
                         directory returned by <command>pkg-config
                         systemd
-                        --variable=systemdsystemnunitdir</command>
+                        --variable=systemdsystemunitdir</command>
                         (for system services),
                         resp. <command>pkg-config systemd
                         --variable=systemdsessionunitdir</command>
@@ -809,8 +809,8 @@ fi</programlisting>
                 <para>Since new-style init systems such as systemd are
                 compatible with traditional SysV init systems it is
                 not strictly necessary to port existing daemons to the
-                new style. However doing this offers additional
-                functionality to the daemons as well as it simplifies
+                new style. However doing so offers additional
+                functionality to the daemons as well as simplifying
                 integration into new-style init systems.</para>
 
                 <para>To port an existing SysV compatible daemon the
@@ -849,7 +849,7 @@ fi</programlisting>
                         left-over file descriptors are passed to
                         executed processes, it might be a good choice
                         to simply skip the closing of all remaining
-                        open file descriptors if file descriptors are
+                        open file descriptors if sockets are
                         passed.</para></listitem>
 
                         <listitem><para>Write and install a systemd
index 06403ec..6fb8d27 100644 (file)
                 <para>On failure, this call returns a negative
                 errno-style error code. If
                 <varname>$LISTEN_FDS</varname>/<varname>$LISTEN_PID</varname>
-                was not set or not correctly set for this daemon and
-                hence no file descriptors received, 0 is
+                was not set or was not correctly set for this daemon and
+                hence no file descriptors were received, 0 is
                 returned. Otherwise the number of file descriptors
                 passed is returned. The application may find them
                 starting with file descriptor SD_LISTEN_FDS_START,
index 80856a2..7c1d982 100644 (file)
                         <title>Start-up Notification</title>
 
                         <para>When a daemon finished starting up, it
-                        might issue the following call call to notify
+                        might issue the following call to notify
                         the init system:</para>
 
                         <programlisting>sd_notify(0, "READY=1");</programlisting>
index c0b8d79..a7065f9 100644 (file)
                                 unit files and recreate the entire
                                 dependency tree. While the daemon is
                                 reloaded, all sockets systemd listens
-                                on on behalf of user configuration, will
+                                on on behalf of user configuration will
                                 stay accessible.</para> <para>This
                                 command should not be confused with
                                 the <command>load</command> or
index 68495dc..a47a62d 100644 (file)
                                 <option>inherit</option>.</para></listitem>
                         </varlistentry>
                         <varlistentry>
-                                <term><varname>StandardOutput=</varname></term>
+                                <term><varname>StandardError=</varname></term>
                                 <listitem><para>Controls where file
                                 descriptor 2 (STDERR) of the executed
                                 processes is connected to. The
                                 available options are identical to
                                 those of
-                                <varname>StandardError=</varname>,
+                                <varname>StandardOutput=</varname>,
                                 whith one exception: if set to
                                 <option>inherit</option> the file
                                 descriptor used for standard output is
 
                                 <listitem><para>Controls the control
                                 groups the executed processes shall be
-                                made member of. Takes a
+                                made members of. Takes a
                                 space-seperated list of cgroup
                                 identifiers. A cgroup identifier has a
                                 format like
index 518ae2a..9b6b486 100644 (file)
                                 specified, this value defaults to a
                                 service that has the same name as the
                                 timer unit, except for the
-                                suffix. (See above.) It is recommended,
+                                suffix. (See above.) It is recommended
                                 that the unit name that is activated
                                 and the unit name of the timer unit
-                                are named identical, except for the
+                                are named identically, except for the
                                 suffix.</para></listitem>
                         </varlistentry>
                 </variablelist>
index ba775c5..4f4a588 100644 (file)
 
                                 <listitem><para>Extract D-Bus
                                 interface introspection data. This is
-                                mostly useful at build at install time
+                                mostly useful at install time
                                 to generate data suitable for the
                                 D-Bus interfaces
                                 repository. Optionally the interface