chiark / gitweb /
man: wording and grammar updates
authorJan Engelhardt <jengelh@inai.de>
Tue, 15 Oct 2013 06:58:51 +0000 (08:58 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 15 Oct 2013 12:19:49 +0000 (08:19 -0400)
This is a recurring submission and includes corrections to various
issue spotted. I guess I can just skip over reporting ubiquitous comma
placement fixes…

man/journalctl.xml
man/systemctl.xml
man/systemd-cgtop.xml
man/systemd-cryptsetup-generator.xml
man/systemd.exec.xml
man/systemd.resource-control.xml
man/systemd.scope.xml
man/systemd.service.xml
man/systemd.unit.xml
man/tmpfiles.d.xml
man/udevadm.xml

index 2ce81a0..508f1dd 100644 (file)
                                 <term><option>-l</option></term>
 
                                 <listitem><para>Ellipsize fields when
-                                they don't fit in available columns.
+                                they do not fit in available columns.
                                 The default is to show full fields,
                                 allowing them to wrap or be truncated
                                 by the pager if one is used.</para>
 
-                                <para>Old options
+                                <para>The old options
                                 <option>-l</option>/<option>--full</option>
-                                not useful anymore, except to undo
+                                are not useful anymore, except to undo
                                 <option>--no-full</option>.</para></listitem>
                         </varlistentry>
 
index e789d4b..be6b5ea 100644 (file)
@@ -831,7 +831,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
 
             <para>Depending on whether <option>--system</option>,
             <option>--user</option>, <option>--runtime</option>,
-            or<option>--global</option>, is specified, this enables the unit
+            or <option>--global</option> is specified, this enables the unit
             for the system, for the calling user only, for only this boot of
             the system, or for all future logins of all users, or only this
             boot.  Note that in the last case, no systemd daemon
@@ -861,7 +861,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
             </para>
 
             <para>This command honors <option>--system</option>,
-            <option>--user</option>, <option>--runtime</option>,
+            <option>--user</option>, <option>--runtime</option> and
             <option>--global</option> in a similar way as
             <command>enable</command>.</para>
           </listitem>
@@ -921,7 +921,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
             <command>disable</command>, since it prohibits all kinds of
             activation of the unit, including manual activation. Use
             this option with care. This honors the
-            <option>--runtime</option> option, to only mask temporarily
+            <option>--runtime</option> option to only mask temporarily
             until the next reoobt of the system.</para>
           </listitem>
         </varlistentry>
index 7faedfb..01a0ae2 100644 (file)
                 <varname>CPUAccounting=1</varname>,
                 <varname>MemoryAccounting=1</varname> and
                 <varname>BlockIOAccounting=1</varname> settings in the
-                unit files in question (See
+                unit files in questionSee
                 <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-                for details).</para>
+                for details.</para>
 
                 <para>To emphasize this: unless
                 <literal>CPUAccounting=1</literal>,
                 <literal>MemoryAccounting=1</literal> and
                 <literal>BlockIOAccounting=1</literal> are enabled for
-                the services in question no resource accounting will
+                the services in question, no resource accounting will
                 be available for system services and the data shown by
                 <command>systemd-cgtop</command> will be
                 incomplete.</para>
index d6b7e49..3abb39d 100644 (file)
                                 <term><varname>luks.uuid=</varname></term>
                                 <term><varname>rd.luks.uuid=</varname></term>
 
-                                <listitem><para>Takes a LUKS super
-                                block UUID as argument. This will
+                                <listitem><para>Takes a LUKS superblock
+                                UUID as argument. This will
                                 activate the specified device as part
                                 of the boot process as if it was
                                 listed in
index e213ec4..8c44071 100644 (file)
 
                                 <listitem><para>User name (twice), home
                                 directory, and the login shell.
-                                Set for the units which
+                                The variables are set for the units that
                                 have <varname>User=</varname> set,
                                 which includes user
                                 <command>systemd</command> instances.
                                 <term><varname>$XDG_VTNR</varname></term>
 
                                 <listitem><para>The identifier of the
-                                session, and the seat name, and
+                                session, the seat name, and
                                 virtual terminal of the session. Set
                                 by
                                 <citerefentry><refentrytitle>pam_systemd</refentrytitle><manvolnum>8</manvolnum></citerefentry>
                                 for login sessions.
                                 <varname>$XDG_SEAT</varname> and
-                                <varname>$XDG_VTNR</varname> will be
-                                only set when attached to a seat and a
+                                <varname>$XDG_VTNR</varname> will
+                                only be set when attached to a seat and a
                                 tty.</para></listitem>
                         </varlistentry>
 
index 8688905..fcfe861 100644 (file)
@@ -64,7 +64,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
     <para>Unit configuration files for services, slices, scopes,
     sockets, mount points, and swap devices share a subset of
     configuration options for resource control of spawned
-    processes. Internally, this relies on the the Control Groups
+    processes. Internally, this relies on the Control Groups
     kernel concept for organizing processes in a hierarchial tree of
     named groups for the purpose of resource management.</para>
 
@@ -86,7 +86,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
     <para>See the <ulink
     url="http://www.freedesktop.org/wiki/Software/systemd/ControlGroupInterface/">New
-    Control Group Interfaces</ulink> for an introduction how to make
+    Control Group Interfaces</ulink> for an introduction on how to make
     use of resource control APIs from programs.</para>
   </refsect1>
 
@@ -199,7 +199,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
           path and a weight value to specify the device specific
           weight value, between 10 and 1000. (Example: "/dev/sda
           500"). The file path may be specified as path to a block
-          device node or as any other file in which case the backing
+          device node or as any other file, in which case the backing
           block device of the file system of the file is
           determined. This controls the
           <literal>blkio.weight_device</literal> control group
index 392abbf..e047f4b 100644 (file)
@@ -71,7 +71,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
     <para>See the <ulink
     url="http://www.freedesktop.org/wiki/Software/systemd/ControlGroupInterface/">New
-    Control Group Interfaces</ulink> for an introduction how to make
+    Control Group Interfaces</ulink> for an introduction on how to make
     use of scope units from programs.</para>
 
     <para>Unless <varname>DefaultDependencies=false</varname>
index 5e1ddf7..81a4078 100644 (file)
                                 case it will be replaced by the value
                                 of the environment variable split up
                                 at whitespace, resulting in zero or
-                                more arguments. To pass literal dollar sign
+                                more arguments. To pass a literal dollar sign,
                                 use <literal>$$</literal>. Note that the first
                                 argument (i.e. the program to execute)
                                 may not be a variable, since it must
index 5c8b8e8..baf44ad 100644 (file)
                       <row>
                         <entry><literal>%r</literal></entry>
                         <entry>Root control group path where units are placed.</entry>
-                        <entry>For system instances this usually resolves to <filename>/system</filename>, except in containers, where the path might be prefixed with the container's root control group.</entry>
+                        <entry>For system instances, this usually resolves to <filename>/system</filename>, except in containers, where the path might be prefixed with the container's root control group.</entry>
                       </row>
                       <row>
                         <entry><literal>%R</literal></entry>
                         <entry>Parent directory of the control group path where units are placed.</entry>
-                        <entry>For system instances this usually
+                        <entry>For system instances, this usually
                         resolves to <filename>/</filename>, except in
                         containers, where this resolves to the
                         container's root directory.</entry>
index e8b630d..1c079f6 100644 (file)
@@ -158,11 +158,11 @@ L    /tmp/foobar -    -    -    -   /dev/null</programlisting>
                                 <varlistentry>
                                         <term><varname>m</varname></term>
                                         <listitem><para>If the
-                                        specified file path exists
+                                        specified file path exists,
                                         adjust its access mode, group
                                         and user to the specified
                                         values and reset the SELinux
-                                        label. If it doesn't exist do
+                                        label. If it does not exist, do
                                         nothing.</para></listitem>
                                 </varlistentry>
 
@@ -187,7 +187,7 @@ L    /tmp/foobar -    -    -    -   /dev/null</programlisting>
                                         during cleaning. Use this type
                                         to exclude paths from clean-up
                                         as controlled with the Age
-                                        parameter. Unlike x this
+                                        parameter. Unlike x, this
                                         parameter will not exclude the
                                         content if path is a directory,
                                         but only directory itself.
index a1ffe42..30a6ac4 100644 (file)
@@ -98,7 +98,7 @@
         <varlistentry>
           <term><option>--query=<replaceable>type</replaceable></option></term>
           <listitem>
-            <para>Query the database for specified type of device
+            <para>Query the database for the specified type of device
             data. It needs the <option>--path</option> or
             <option>--name</option> to identify the specified
             device. Valid queries are: <constant>name</constant>,
             <para>The <filename>/sys</filename> path of the device to
             query, e.g.
             <filename><optional>/sys</optional>/class/block/sda</filename>.
-            Note that this option usually isn't very useful, since
+            Note that this option usually is not very useful, since
             <command>udev</command> can guess the type of the
             argument, so <command>udevadm
             --devpath=/class/block/sda</command> is equivalent to
           <listitem>
             <para>The name of the device node or a symlink to query,
             e.g. <filename><optional>/dev</optional>/sda</filename>.
-            Note that this option usually isn't very useful, since
+            Note that this option usually is not very useful, since
             <command>udev</command> can guess the type of the
             argument, so <command>udevadm --name=sda</command> is
             equivalent to <command>udevadm /dev/sda</command>.</para>
           <listitem>
             <para>Specify when udevadm should resolve names of users
             and groups.  When set to <constant>early</constant> (the
-            default) names will be resolved when the rules are
-            parsed. When set to <constant>late</constant> names will
+            default), names will be resolved when the rules are
+            parsed. When set to <constant>late</constant>, names will
             be resolved for every event. When set to
-            <constant>never</constant> names will never be resolved
+            <constant>never</constant>, names will never be resolved
             and all devices will be owned by root.</para>
           </listitem>
         </varlistentry>