summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorConrad Meyer <cemeyer@cs.washington.edu>2010-07-06 18:24:38 -0700
committerLennart Poettering <lennart@poettering.net>2010-07-07 03:40:12 +0200
commitad678a066b4ba5d8914dd7d5a4093572841205cf (patch)
tree86ba4f1da18735719d50cab2b325c13a5939f1bd /man
parent7b97f4773207d9e1301f5263229ceba26b515756 (diff)
man: minor edits to daemon, sd_listen_fds, sd_notify, systemctl, systemd.exec, systemd, and systemd.timer pages
Just some minor grammar fixes.
Diffstat (limited to 'man')
-rw-r--r--man/daemon.xml10
-rw-r--r--man/sd_listen_fds.xml4
-rw-r--r--man/sd_notify.xml2
-rw-r--r--man/systemctl.xml2
-rw-r--r--man/systemd.exec.xml6
-rw-r--r--man/systemd.timer.xml4
-rw-r--r--man/systemd.xml2
7 files changed, 15 insertions, 15 deletions
diff --git a/man/daemon.xml b/man/daemon.xml
index 8e9e939532..dfee390164 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -384,7 +384,7 @@
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>
@@ -726,7 +726,7 @@
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
diff --git a/man/sd_listen_fds.xml b/man/sd_listen_fds.xml
index 06403ecaa3..6fb8d27f24 100644
--- a/man/sd_listen_fds.xml
+++ b/man/sd_listen_fds.xml
@@ -109,8 +109,8 @@
<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,
diff --git a/man/sd_notify.xml b/man/sd_notify.xml
index 80856a22d5..7c1d982d85 100644
--- a/man/sd_notify.xml
+++ b/man/sd_notify.xml
@@ -252,7 +252,7 @@
<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>
diff --git a/man/systemctl.xml b/man/systemctl.xml
index c0b8d7927d..a7065f98ae 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -381,7 +381,7 @@
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
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 68495dcaf7..a47a62daec 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -374,13 +374,13 @@
<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
@@ -617,7 +617,7 @@
<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
diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml
index 518ae2a9f1..9b6b486bf4 100644
--- a/man/systemd.timer.xml
+++ b/man/systemd.timer.xml
@@ -170,10 +170,10 @@
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>
diff --git a/man/systemd.xml b/man/systemd.xml
index ba775c5c91..4f4a588a98 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -117,7 +117,7 @@
<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