chiark / gitweb /
man: grammar and wording improvements
authorJan Engelhardt <jengelh@inai.de>
Thu, 26 Dec 2013 01:47:45 +0000 (02:47 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 26 Dec 2013 03:53:46 +0000 (22:53 -0500)
This is a recurring submission and includes corrections to:
- missing words, preposition choice.
- change of /lib to /usr/lib, because that is what most distros are
  using as the system-wide location for systemd/udev files.

13 files changed:
man/daemon.xml
man/journalctl.xml
man/sd_bus_message_get_cookie.xml
man/sd_bus_request_name.xml
man/sd_is_fifo.xml
man/systemctl.xml
man/systemd-networkd.service.xml
man/systemd.device.xml
man/systemd.exec.xml
man/systemd.service.xml
man/systemd.timer.xml
man/systemd.unit.xml
man/udev.xml

index 7790420c6eb7154cfa80625f24fdb9db43cb0e2b..1fe4546f009519576fb2f8ec58e63e5b88f21a10 100644 (file)
                         description files.</para>
 
                         <para>In systemd, if the developer or
                         description files.</para>
 
                         <para>In systemd, if the developer or
-                        administrator wants to make sure a service or
+                        administrator wants to make sure that a service or
                         other unit is activated automatically on boot,
                         it is recommended to place a symlink to the
                         unit file in the <filename>.wants/</filename>
                         other unit is activated automatically on boot,
                         it is recommended to place a symlink to the
                         unit file in the <filename>.wants/</filename>
index 6a972109c5dd5f043f697d68ee81b39ea6d1d1d4..55474c53d9e198b9410a0721215970e4040951e1 100644 (file)
                 <para>When outputing to a tty, lines are colored
                 according to priority: lines of level ERROR and higher
                 are colored red; lines of level NOTICE and higher are
                 <para>When outputing to a tty, lines are colored
                 according to priority: lines of level ERROR and higher
                 are colored red; lines of level NOTICE and higher are
-                highlighted; and other lines are displayed normally.
+                highlighted; other lines are displayed normally.
                 </para>
         </refsect1>
 
                 </para>
         </refsect1>
 
                                 <term><option>-r</option></term>
                                 <term><option>--reverse</option></term>
 
                                 <term><option>-r</option></term>
                                 <term><option>--reverse</option></term>
 
-                                <listitem><para>Reverse output so the newest
+                                <listitem><para>Reverse output so that the newest
                                 entries are displayed first.</para></listitem>
                         </varlistentry>
 
                                 entries are displayed first.</para></listitem>
                         </varlistentry>
 
index 0e3c4ba723a4eaf1ebee3ec7acc9ae2775569a7d..bf403a222f3aec0ec61bc6f68fc934802463b3cf 100644 (file)
@@ -85,7 +85,7 @@
                 field.</para>
 
                 <para>Both functions take a message object as first
                 field.</para>
 
                 <para>Both functions take a message object as first
-                parameter and a place to store the 64bit cookie
+                parameter and a place to store the 64-bit cookie
                 in.</para>
         </refsect1>
 
                 in.</para>
         </refsect1>
 
@@ -97,7 +97,7 @@
                 errno-style error code.</para>
 
                 <para>On success, the cookie/reply cookie is returned
                 errno-style error code.</para>
 
                 <para>On success, the cookie/reply cookie is returned
-                in the specified 64bit unsigned integer variable.</para>
+                in the specified 64-bit unsigned integer variable.</para>
         </refsect1>
 
         <refsect1>
         </refsect1>
 
         <refsect1>
                                 been sent yet and hence has no cookie
                                 assigned, or that the message is not a
                                 method response message and hence
                                 been sent yet and hence has no cookie
                                 assigned, or that the message is not a
                                 method response message and hence
-                                carries to reply cookie
+                                carries a reply cookie
                                 field.</para></listitem>
                         </varlistentry>
                 </variablelist>
                                 field.</para></listitem>
                         </varlistentry>
                 </variablelist>
index c84b0b62fa94b38191f049a33151a06c9270c06e..7393fdd90e403c039555c45e34baabcff46f6f0f 100644 (file)
@@ -81,7 +81,7 @@
                                 <term><varname>SD_BUS_NAME_ALLOW_REPLACEMENT</varname></term>
 
                                 <listitem><para>After acquiring the
                                 <term><varname>SD_BUS_NAME_ALLOW_REPLACEMENT</varname></term>
 
                                 <listitem><para>After acquiring the
-                                name successuflly, permit other peers
+                                name successfully, permit other peers
                                 to take over the name when they try to
                                 acquire it with the
                                 <varname>SD_BUS_NAME_REPLACE_EXISTING</varname>
                                 to take over the name when they try to
                                 acquire it with the
                                 <varname>SD_BUS_NAME_REPLACE_EXISTING</varname>
                         <varlistentry>
                                 <term><varname>SD_BUS_NAME_REPLACE_EXISTING</varname></term>
 
                         <varlistentry>
                                 <term><varname>SD_BUS_NAME_REPLACE_EXISTING</varname></term>
 
-                                <listitem><para>Take over the name
-                                if it is already acquired by a another
-                                peer, and that other peer permitted
-                                taking it over by setting
+                                <listitem><para>Take over the name
+                                if it is already acquired by another
+                                peer, and that other peer has permitted
+                                takeover by setting
                                 <varname>SD_BUS_NAME_ALLOW_REPLACEMENT</varname>
                                 while acquiring it.</para></listitem>
                         </varlistentry>
                                 <varname>SD_BUS_NAME_ALLOW_REPLACEMENT</varname>
                                 while acquiring it.</para></listitem>
                         </varlistentry>
                         <varlistentry>
                                 <term><varname>SD_BUS_NAME_QUEUE</varname></term>
 
                         <varlistentry>
                                 <term><varname>SD_BUS_NAME_QUEUE</varname></term>
 
-                                <listitem><para>Queue name
-                                acquisition when the name is already
+                                <listitem><para>Queue the acquisition
+                                of the name when the name is already
                                 taken.</para></listitem>
                         </varlistentry>
                 </variablelist>
                                 taken.</para></listitem>
                         </varlistentry>
                 </variablelist>
                         <varlistentry>
                                 <term><varname>-ESRCH</varname></term>
 
                         <varlistentry>
                                 <term><varname>-ESRCH</varname></term>
 
-                                <listitem><para>It was attemted to
+                                <listitem><para>It was attempted to
                                 release a name that is currently not
                                 registered on the
                                 bus.</para></listitem>
                                 release a name that is currently not
                                 registered on the
                                 bus.</para></listitem>
                         <varlistentry>
                                 <term><varname>-EADDRINUSE</varname></term>
 
                         <varlistentry>
                                 <term><varname>-EADDRINUSE</varname></term>
 
-                                <listitem><para>It was attemted to
+                                <listitem><para>It was attempted to
                                 release a name that is owned by a
                                 different peer on the
                                 bus.</para></listitem>
                                 release a name that is owned by a
                                 different peer on the
                                 bus.</para></listitem>
 
                                 <listitem><para>The bus connection has
                                 been created in a different process
 
                                 <listitem><para>The bus connection has
                                 been created in a different process
-                                than the current.</para></listitem>
+                                than the current one.</para></listitem>
                         </varlistentry>
                 </variablelist>
         </refsect1>
                         </varlistentry>
                 </variablelist>
         </refsect1>
index 4bb2236fceb4a398ddf48874bfca3bcd344a7f2a..58cd1c91bb10513ac950d4de35f1dafe62ea79bc 100644 (file)
                 called to check whether the specified file descriptor
                 refers to a special file. If the
                 <parameter>path</parameter> parameter is not
                 called to check whether the specified file descriptor
                 refers to a special file. If the
                 <parameter>path</parameter> parameter is not
-                <constant>NULL</constant>, it is checked whether file
+                <constant>NULL</constant>, it is checked whether the file
                 descriptor is bound to the specified file
                 name. Special files in this context are character
                 device nodes and files in <filename>/proc</filename>
                 descriptor is bound to the specified file
                 name. Special files in this context are character
                 device nodes and files in <filename>/proc</filename>
index 7c9ffc81a3fa9d890db42a50da201c520cbc1a99..250866a875ec754d24ffcb26d20136dd05cec9c5 100644 (file)
@@ -194,8 +194,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
         <term><option>--job-mode=</option></term>
 
         <listitem>
         <term><option>--job-mode=</option></term>
 
         <listitem>
-        <para>When queuing a new job, control how to deal with already
-        queued jobs. Takes one of <literal>fail</literal>,
+        <para>When queuing a new job, this option controls how to deal with
+        already queued jobs. It takes one of <literal>fail</literal>,
         <literal>replace</literal>,
         <literal>replace-irreversibly</literal>,
         <literal>isolate</literal>,
         <literal>replace</literal>,
         <literal>replace-irreversibly</literal>,
         <literal>isolate</literal>,
@@ -543,7 +543,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
           <term><command>list-sockets <optional><replaceable>PATTERN</replaceable>...</optional></command></term>
 
           <listitem>
           <term><command>list-sockets <optional><replaceable>PATTERN</replaceable>...</optional></command></term>
 
           <listitem>
-            <para>List socket units ordered by the listening address.
+            <para>List socket units ordered by listening address.
             If one or more <replaceable>PATTERN</replaceable>s are
             specified, only socket units matching one of them are
             shown. Produces output similar to
             If one or more <replaceable>PATTERN</replaceable>s are
             specified, only socket units matching one of them are
             shown. Produces output similar to
@@ -692,7 +692,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
           <listitem>
             <para>Check whether any of the specified units are active
             (i.e. running). Returns an exit code 0 if at least one is
           <listitem>
             <para>Check whether any of the specified units are active
             (i.e. running). Returns an exit code 0 if at least one is
-            active, non-zero otherwise. Unless <option>--quiet</option>
+            active, or non-zero otherwise. Unless <option>--quiet</option>
             is specified, this will also print the current unit state to
             STDOUT.</para>
           </listitem>
             is specified, this will also print the current unit state to
             STDOUT.</para>
           </listitem>
index 6c65fbaefe1210d7224270c817758ae9fb4f302f..908354c5875463c4fe39712ff1c30e4ffc99b6b1 100644 (file)
@@ -64,8 +64,8 @@
                 <para>Network configurations applied before networkd is started
                 are not removed, and configuration applied by networkd are not
                 removed when networkd exits. This ensures restarting networkd
                 <para>Network configurations applied before networkd is started
                 are not removed, and configuration applied by networkd are not
                 removed when networkd exits. This ensures restarting networkd
-                does not cut the network connection, and in particular that it
-                is safe to transition between the initrd and the real root,
+                does not cut the network connection, and, in particular, that
+                it is safe to transition between the initrd and the real root,
                 and back.</para>
         </refsect1>
 
                 and back.</para>
         </refsect1>
 
                 identical filenames replace each other. Files in
                 <filename>/etc</filename> have the highest priority, files in
                 <filename>/run</filename> take precedence over files with the same
                 identical filenames replace each other. Files in
                 <filename>/etc</filename> have the highest priority, files in
                 <filename>/run</filename> take precedence over files with the same
-                name in <filename>/lib</filename>. This can be used to override a
+                name in <filename>/usr/lib</filename>. This can be used to override a
                 system-supplied configuration file with a local file if needed; a symlink in
                 <filename>/etc</filename> with the same name as a configuration file in
                 system-supplied configuration file with a local file if needed; a symlink in
                 <filename>/etc</filename> with the same name as a configuration file in
-                <filename>/lib</filename>, pointing to <filename>/dev/null</filename>,
+                <filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
                 disables the configuration file entirely.</para>
 
                 <refsect2><title>Virtual Network Devices</title>
                 disables the configuration file entirely.</para>
 
                 <refsect2><title>Virtual Network Devices</title>
index fa7074aaf1950ffa03828bfe4214c3a5ad09c64e..619fe1968046bfab9b6930a291179c53ccaeed10 100644 (file)
                                 even if it shows up in the udev
                                 tree. If this property is unset or set
                                 to 1, the device will be considered
                                 even if it shows up in the udev
                                 tree. If this property is unset or set
                                 to 1, the device will be considered
-                                plugged if it visible in the
+                                plugged if it is visible in the
                                 udev tree. This property has no
                                 influence on the behavior when a
                                 device disappears from the udev
                                 udev tree. This property has no
                                 influence on the behavior when a
                                 device disappears from the udev
index 2778497647e5dcaf75b77875e25ff14b748f8e7b..17748d4066cf21561aae03fe3e7f0c39e9b4ab9b 100644 (file)
                                 processes and mounts private
                                 <filename>/tmp</filename> and
                                 <filename>/var/tmp</filename>
                                 processes and mounts private
                                 <filename>/tmp</filename> and
                                 <filename>/var/tmp</filename>
-                                directories inside it that are not
+                                directories inside it that is not
                                 shared by processes outside of the
                                 namespace. This is useful to secure
                                 access to temporary files of the
                                 shared by processes outside of the
                                 namespace. This is useful to secure
                                 access to temporary files of the
                                 <filename>/var/tmp</filename>
                                 impossible. All temporary data created
                                 by service will be removed after
                                 <filename>/var/tmp</filename>
                                 impossible. All temporary data created
                                 by service will be removed after
-                                service is stopped. Defaults to
+                                the service is stopped. Defaults to
                                 false. Note that it is possible to run
                                 two or more units within the same
                                 private <filename>/tmp</filename> and
                                 false. Note that it is possible to run
                                 two or more units within the same
                                 private <filename>/tmp</filename> and
index 8e6c20550dbe49f7bfc0c9525e7c266b2c7e4698..5afeffa23e758e3fa4f11ad92e0d10a9306a3115 100644 (file)
                                 <programlisting>ExecStart=/bin/sh -c 'dmesg | tac'
                                 </programlisting>
 
                                 <programlisting>ExecStart=/bin/sh -c 'dmesg | tac'
                                 </programlisting>
 
-                                <para>Only select environment variables
+                                <para>Only select environment variables that
                                 are set for executed commands. See
                                 <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
                                 </para>
                                 are set for executed commands. See
                                 <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
                                 </para>
index 7143f9f931990e8bd269450f6ff2a7d8c5126b59..bb3a6d138650d18e262a716ed284c7bb8db17802 100644 (file)
                                 assignments will have no
                                 effect.</para>
 
                                 assignments will have no
                                 effect.</para>
 
-                                <para>Note that timers are not
-                                necessarily expired at the precise
+                                <para>Note that timers do not
+                                necessarily expire at the precise
                                 time configured with these settings,
                                 as they are subject to the
                                 <varname>AccuracySec=</varname>
                                 time configured with these settings,
                                 as they are subject to the
                                 <varname>AccuracySec=</varname>
                                 <varname>OnActiveSec=</varname> and
                                 related settings.</para>
 
                                 <varname>OnActiveSec=</varname> and
                                 related settings.</para>
 
-                                <para>Note that timers are not
-                                necessarily expired at the precise
+                                <para>Note that timers do not
+                                necessarily expire at the precise
                                 time configured with this setting,
                                 as it is subject to the
                                 <varname>AccuracySec=</varname>
                                 time configured with this setting,
                                 as it is subject to the
                                 <varname>AccuracySec=</varname>
                                 <listitem><para>Specify the accuracy
                                 the timer shall elapse with. Defaults
                                 to 1min. The timer is scheduled to
                                 <listitem><para>Specify the accuracy
                                 the timer shall elapse with. Defaults
                                 to 1min. The timer is scheduled to
-                                expire within a time window starting
+                                elapse within a time window starting
                                 with the time specified in
                                 <varname>OnCalendar=</varname>,
                                 <varname>OnActiveSec=</varname>,
                                 with the time specified in
                                 <varname>OnCalendar=</varname>,
                                 <varname>OnActiveSec=</varname>,
index 02445703617bbf962ed29d4e26e7510597ee8cda..487827cdde93d200e5828837b24ebb22d97c3988 100644 (file)
                                 of units. When systemd stops or restarts
                                 the units listed here, the action is
                                 propagated to this unit.
                                 of units. When systemd stops or restarts
                                 the units listed here, the action is
                                 propagated to this unit.
-                                Note that this is a one way dependency 
+                                Note that this is a one-way dependency 
                                 changes to this unit do not affect the
                                 listed units.
                                 </para></listitem>
                                 changes to this unit do not affect the
                                 listed units.
                                 </para></listitem>
index bd071e17709414db21e51e51ea657f269b6acb10..32a520e7b8c5b0be2ecb5c55bad0c39d2c4ac0c4 100644 (file)
       regardless of the directories in which they live. However, files with
       identical filenames replace each other. Files in <filename>/etc</filename>
       have the highest priority, files in <filename>/run</filename> take precedence
       regardless of the directories in which they live. However, files with
       identical filenames replace each other. Files in <filename>/etc</filename>
       have the highest priority, files in <filename>/run</filename> take precedence
-      over files with the same name in <filename>/lib</filename>. This can be
+      over files with the same name in <filename>/usr/lib</filename>. This can be
       used to override a system-supplied rules file with a local file if needed;
       a symlink in <filename>/etc</filename> with the same name as a rules file in
       used to override a system-supplied rules file with a local file if needed;
       a symlink in <filename>/etc</filename> with the same name as a rules file in
-      <filename>/lib</filename>, pointing to <filename>/dev/null</filename>,
+      <filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
       disables the rules file entirely. Rule files must have the extension
       <filename>.rules</filename>; other extensions are ignored.</para>
 
       disables the rules file entirely. Rule files must have the extension
       <filename>.rules</filename>; other extensions are ignored.</para>
 
       regardless of the directories in which they live. However, files with
       identical filenames replace each other. Files in <filename>/etc</filename>
       have the highest priority, files in <filename>/run</filename> take precedence
       regardless of the directories in which they live. However, files with
       identical filenames replace each other. Files in <filename>/etc</filename>
       have the highest priority, files in <filename>/run</filename> take precedence
-      over files with the same name in <filename>/lib</filename>. This can be
+      over files with the same name in <filename>/usr/lib</filename>. This can be
       used to override a system-supplied hwdb file with a local file if needed;
       a symlink in <filename>/etc</filename> with the same name as a hwdb file in
       used to override a system-supplied hwdb file with a local file if needed;
       a symlink in <filename>/etc</filename> with the same name as a hwdb file in
-      <filename>/lib</filename>, pointing to <filename>/dev/null</filename>,
+      <filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
       disables the hwdb file entirely. hwdb files must have the extension
       <filename>.hwdb</filename>; other extensions are ignored.</para>
 
       disables the hwdb file entirely. hwdb files must have the extension
       <filename>.hwdb</filename>; other extensions are ignored.</para>
 
       regardless of the directories in which they live. However, files with
       identical filenames replace each other. Files in <filename>/etc</filename>
       have the highest priority, files in <filename>/run</filename> take precedence
       regardless of the directories in which they live. However, files with
       identical filenames replace each other. Files in <filename>/etc</filename>
       have the highest priority, files in <filename>/run</filename> take precedence
-      over files with the same name in <filename>/lib</filename>. This can be
+      over files with the same name in <filename>/usr/lib</filename>. This can be
       used to override a system-supplied link file with a local file if needed;
       a symlink in <filename>/etc</filename> with the same name as a link file in
       used to override a system-supplied link file with a local file if needed;
       a symlink in <filename>/etc</filename> with the same name as a link file in
-      <filename>/lib</filename>, pointing to <filename>/dev/null</filename>,
+      <filename>/usr/lib</filename>, pointing to <filename>/dev/null</filename>,
       disables the link file entirely.</para>
 
       <para>The link file contains a <literal>[Match]</literal> section, which
       disables the link file entirely.</para>
 
       <para>The link file contains a <literal>[Match]</literal> section, which