chiark / gitweb /
doc: resolve missing/extraneous words or inappropriate forms
authorJan Engelhardt <jengelh@inai.de>
Mon, 17 Feb 2014 02:37:18 +0000 (03:37 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 18 Feb 2014 00:03:07 +0000 (19:03 -0500)
Issues fixed:
* missing words required by grammar
* duplicated or extraneous words
* inappropriate forms (e.g. singular/plural), and declinations
* orthographic misspellings

19 files changed:
man/busctl.xml
man/journalctl.xml
man/journald.conf.xml
man/machine-info.xml
man/pam_systemd.xml
man/sd_bus_creds_get_pid.xml
man/sd_bus_error.xml
man/sd_bus_open_user.xml
man/sd_journal_print.xml
man/systemctl.xml
man/systemd-coredumpctl.xml
man/systemd-journald.service.xml
man/systemd-nspawn.xml
man/systemd-system.conf.xml
man/systemd-udevd.service.xml
man/systemd.exec.xml
man/systemd.journal-fields.xml
man/systemd.socket.xml
man/udev.xml

index 3fdef7bd4d6d4e65c5cf381eb1f900cb8919ebb9..ab18a49d0ad23d0c98a436e3cb0d485cb447935c 100644 (file)
@@ -171,7 +171,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
           <term><option>--activatable</option></term>
 
           <listitem><para>When showing the list of endpoints, show
-          only endpoints which haven't actually been activated yet,
+          only endpoints which have actually not been activated yet,
           but may be started automatically if accessed.</para>
           </listitem>
       </varlistentry>
index 626d820151275fe5f027ce48042e56dda6054e91..50027b44dd4264d8f4d8b0b8721ec1b9ef8f555a 100644 (file)
                                                         terse output, only
                                                         showing the actual
                                                         message of each journal
-                                                        entry with no meta data,
+                                                        entry with no metadata,
                                                         not even a timestamp.
                                                         </para>
                                                 </listitem>
index 95164322f727f8424a221dccb95ca07e4d7625ff..a814ec1ec3570212f4c2a5fba07a1de67787940d 100644 (file)
                                 violated when systemd-journald is
                                 started, the value will be raised to
                                 percentage that is actually free. This
-                                means that if before there was enough
-                                free space and journal files were
+                                means that if there was enough
+                                free space before and journal files were
                                 created, and subsequently something
                                 else causes the file system to fill
                                 up, journald will stop using more
-                                space, but it'll will not removing
+                                space, but it will not be removing
                                 existing files to go reduce footprint
                                 either.</para>
 
index ddf8f8b3d029a6cfa73b5b5bdc0637565c1ebe47..7448e68fd4421fd715bbf00f32141a3e2f38c315 100644 (file)
@@ -55,7 +55,7 @@
                 <title>Description</title>
 
                 <para>The <filename>/etc/machine-info</filename> file
-                contains machine meta data.</para>
+                contains machine metadata.</para>
 
                 <para>The basic file format of
                 <filename>machine-info</filename> is a
@@ -68,7 +68,7 @@
                 execution engine.</para>
 
                 <para><filename>/etc/machine-info</filename> contains
-                meta data about the machine that is set by the user or
+                metadata about the machine that is set by the user or
                 administrator.</para>
 
                 <para>Depending on the operating system other
@@ -84,7 +84,7 @@
         <refsect1>
                 <title>Options</title>
 
-                <para>The following machine meta data parameters may
+                <para>The following machine metadata parameters may
                 be set using
                 <filename>/etc/machine-info</filename>:</para>
 
index 66d40fca451d6088f92ebe9ae00df3292c81b69d..3022cdb6f5fbbb2be047965466afb5956b064c72 100644 (file)
 
                 <para>The following environment variables are read by
                 the module and may be used by the PAM service to pass
-                meta data to the module:</para>
+                metadata to the module:</para>
 
                 <variablelist class='environment-variables'>
                         <varlistentry>
index 740082e47851131d05b3b3bc17d57db4bdc5b518..25978a28957491f542cfde655820c031ae0bd2fb 100644 (file)
@@ -225,7 +225,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
   <refsect1>
     <title>Description</title>
 
-    <para>Those functions return information from an
+    <para>These functions return information from an
     <parameter>sd_bus_creds</parameter> object. It may be created with
     <citerefentry><refentrytitle>sd_bus_creds_new_from_pid</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
     in which case it will describe the specified process, or it may be
@@ -311,7 +311,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
     <para><function>sd_bus_creds_has_effective_cap</function> will
     check whether the capability specified by
     <parameter>capability</parameter> was set in the effective
-    capabilities mask. A positive return value means that is were
+    capabilities mask. A positive return value means that is was
     set, zero means that it was not set, and a negative return
     value signifies an error. See
     <citerefentry><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry>
index 642b0b96d03338989bf28079f91298e29bc311f2..671df441ea408546c404c42de9c6ad587b9fe96e 100644 (file)
@@ -231,10 +231,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
   <refsect1>
     <title>Description</title>
 
-    <para><structname>sd_bus_error</structname> structure carries
+    <para>The <structname>sd_bus_error</structname> structure carries
     information for a <filename>sd-bus</filename> error.
     Functions described below can be used to set and query fields in
-    this structure. Field <structfield>name</structfield> contains a
+    this structure. The <structfield>name</structfield> field contains a
     short identifier of an error. It should follow the rules for error
     names described in the D-Bus specification, subsection <ulink
     url="http://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-names">Valid
@@ -251,16 +251,16 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
     and the remaining ones to <constant>-ENXIO</constant>. Well-known
     D-Bus error names are available as constants
     <constant>SD_BUS_ERROR_FAILED</constant>, etc., listed above. If
-    <parameter>name</parameter> is <constant>NULL</constant>, it is is
+    <parameter>name</parameter> is <constant>NULL</constant>, it is
     assumed that no error occured, and 0 is returned. This means that
     this function may be conveniently used in a
     <function>return</function> statement.</para>
 
     <para>If <parameter>e</parameter> is not
     <constant>NULL</constant>, <structfield>name</structfield> and
-    <structfield>message</structfield> will be filled-in in the
+    <structfield>message</structfield> in the
     <structname>sd_bus_error</structname> structure
-    <parameter>e</parameter> points at. As described above,
+    <parameter>e</parameter> points at will be filled in. As described above,
     <parameter>name</parameter> may be <constant>NULL</constant>,
     which is treated as no error. Parameter
     <parameter>message</parameter> may also be
@@ -307,7 +307,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
     <parameter>e</parameter>. If the strings in
     <parameter>e</parameter> were set using
     <function>sd_bus_set_error_const</function>, they will be shared.
-    Otherwie, they wil be copied.</para>
+    Otherwise, they will be copied.</para>
 
     <para><function>sd_bus_error_is_set</function> will return
     <constant>true</constant> if <parameter>e</parameter> is
index 0effee461d2b2296c84ea5acf2004e7bd437cda5..22a4f616f0b0b3480a668a3b8137426e345ffad9 100644 (file)
@@ -100,7 +100,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
     <function>sd_bus_open_system()</function> does the same, but
     connects to the system bus.</para>
 
-    <para>If <varname>$DBUS_SESSION_BUS_ADDRESS</varname> environment
+    <para>If the <varname>$DBUS_SESSION_BUS_ADDRESS</varname> environment
     variable is set
     (c.f. <citerefentry><refentrytitle>environ</refentrytitle><manvolnum>7</manvolnum></citerefentry>),
     it will be used as the address of the user bus. This variable can
@@ -108,7 +108,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
     this variable is not set, a suitable default for the default user
     D-Bus instance will be used.</para>
 
-    <para>If <varname>$DBUS_SYSTEM_BUS_ADDRESS</varname> environment
+    <para>If the <varname>$DBUS_SYSTEM_BUS_ADDRESS</varname> environment
     variable is set, it will be used as the address of the system
     bus. This variable uses the same syntax as
     <varname>$DBUS_SESSION_BUS_ADDRESS</varname>/. If this variable is
@@ -158,7 +158,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
     <citerefentry><refentrytitle>sd_bus_unref</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
     </para>
 
-    <para>Functions <function>sd_bus_default_user()</function> and
+    <para>The functions <function>sd_bus_default_user()</function> and
     <function>sd_bus_default_system()</function> do not create a new
     reference.</para>
   </refsect1>
index 7b08733171751262f71ef5f740f4f174c4cf192a..638657721f7c0c8a86baccf031bba90921854765 100644 (file)
@@ -203,7 +203,7 @@ sd_journal_send("MESSAGE=Hello World, this is PID %lu!", (unsigned long) getpid(
                 be guaranteed. Using
                 <function>sd_journal_print()</function> has the
                 benefit of logging source code line, filenames, and
-                functions as meta data along all entries, and
+                functions as metadata along all entries, and
                 guaranteeing chronological ordering with structured
                 log entries that are generated via
                 <function>sd_journal_send()</function>. Using
index 418e71f7793eb7b6f28b48c9204cbfb0f976c6d9..d6d2c76f2eb9559ad02a8b847135499682a919ce 100644 (file)
@@ -1444,7 +1444,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
       <literal>[]</literal> may be used. See
       <citerefentry><refentrytitle>glob</refentrytitle><manvolnum>7</manvolnum></citerefentry>
       for more details. The patterns are matched against the names of
-      currently loaded units, and patterns which don't match anything
+      currently loaded units, and patterns which do not match anything
       are silently skipped. For example:
       <programlisting># systemctl stop sshd@*.service</programlisting>
       will stop all <filename>sshd@.service</filename> instances.
index 286ff146396c930b834cd36fdabc62e5f3ae50ae..4318a2fd44c04c645ee943cdf2023a4cee328c4a 100644 (file)
 
                                 <listitem><para>Extract the last coredump
                                 matching specified characteristics.
-                                Coredump will be written on standard output,
+                                The coredump will be written on standard output,
                                 unless an output file is specified with
                                 <option>-o/--output</option>.
                                 </para></listitem>
index 0a20e211597ba24db58ca2055a0ff7c723aa0cd1..4d2cb40805d411e1f45e4d018ad5b5f1d58f78ea 100644 (file)
                 <citerefentry><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>
                 call, from standard input and standard error of system
                 services or via its native API. It will implicitly
-                collect numerous meta data fields for each log
+                collect numerous metadata fields for each log
                 messages in a secure and unfakeable way. See
                 <citerefentry><refentrytitle>systemd.journal-fields</refentrytitle><manvolnum>7</manvolnum></citerefentry>
-                for more information about the collected meta data.
+                for more information about the collected metadata.
                 </para>
 
                 <para>Log data collected by the journal is primarily
index 5bddd895036d6be33a2e8c87e53216435b4953dd..b34d38c9b53638926654675739c714bf0ecff1de 100644 (file)
 
                                 <listitem><para>Turns off any status
                                 output by the tool itself. When this
-                                switch is used, then the only output
-                                by nspawn will be the console output
+                                switch is used, the only output
+                                from nspawn will be the console output
                                 of the container OS itself.</para></listitem>
                         </varlistentry>
 
                                 <term><option>--network-veth</option></term>
 
                                 <listitem><para>Create a virtual
-                                ethernet link between host and
+                                Ethernet link between host and
                                 container. The host side of the
-                                ethernet link will be available as
+                                Ethernet link will be available as a
                                 network interface named after the
                                 container's name (as specified with
                                 <option>--machine=</option>), prefixed
                                 with <literal>ve-</literal>. The
-                                container side of the the ethernet
+                                container side of the the Ethernet
                                 link will be named
                                 <literal>host0</literal>. Note that
                                 <option>--network-veth</option>
                                 <term><option>--network-bridge=</option></term>
 
                                 <listitem><para>Adds the host side of the
-                                ethernet link created with
+                                Ethernet link created with
                                 <option>--network-veth</option>
                                 to the specified bridge. Note that
                                 <option>--network-bridge</option>
                                 container in, simply register the
                                 service or scope unit
                                 <command>systemd-nspawn</command> has
-                                been invoked in in
+                                been invoked in with
                                 <citerefentry><refentrytitle>systemd-machined</refentrytitle><manvolnum>8</manvolnum></citerefentry>. This
                                 has no effect if
                                 <option>--register=no</option> is
                                 used. This switch should be used if
                                 <command>systemd-nspawn</command> is
-                                invoked from within an a service unit,
+                                invoked from within a service unit,
                                 and the service unit's sole purpose
                                 is to run a single
                                 <command>systemd-nspawn</command>
index 6c1b1e7ee7d415c01f15944103963115bc247464..f3a89ad45903bee63a0efbbd2c7a4ddeb456a88f 100644 (file)
@@ -99,7 +99,7 @@
                                 <listitem><para>Configures the initial
                                 CPU affinity for the init
                                 process. Takes a space-separated list
-                                of CPU indexes.</para></listitem>
+                                of CPU indices.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
 
                                 <listitem><para>Takes a
                                 space-separated list of architecture
-                                identifiers. Selects of which
+                                identifiers. Selects from which
                                 architectures system calls may be
                                 invoked on this system. This may be
                                 used as an effective way to disable
index 0e49fa07f692c4b0b0d6e4f6c5b93458a7ff9add..bb04694342cb85f1eeef57b839d343488a262613 100644 (file)
@@ -83,7 +83,7 @@
         <term><option>--exec-delay=</option></term>
         <listitem>
           <para>Delay the execution of <varname>RUN</varname>
-          instruction by the given number of seconds. This option
+          instructions by the given number of seconds. This option
           might be useful when debugging system crashes during
           coldplug caused by loading non-working kernel
           modules.</para>
         <term><varname>udev.exec-delay=</varname></term>
         <term><varname>rd.udev.exec-delay=</varname></term>
         <listitem>
-          <para>Delay the execution of RUN instruction by the given
+          <para>Delay the execution of RUN instructions by the given
           number of seconds. This option might be useful when
           debugging system crashes during coldplug caused by loading
           non-working kernel modules.</para>
index c08feba27e2fa13be636ce9718e46f1e134aa118..252992bc600e1516c020ca74c211894060aa4b51 100644 (file)
                                 <listitem><para>Controls the CPU
                                 affinity of the executed
                                 processes. Takes a space-separated
-                                list of CPU indexes. This option may
+                                list of CPU indices. This option may
                                 be specified more than once in which
                                 case the specificed CPU affinity masks
                                 are merged. If the empty string is
                                 add or delete the listed system calls
                                 from the set of the filtered system
                                 calls, depending of its type and the
-                                default action (e.g. You have started
+                                default action. (For example, if you have started
                                 with a whitelisting of
                                 <function>read</function> and
                                 <function>write</function>, and right
                                 after it add a blacklisting of
                                 <function>write</function>, then
                                 <function>write</function> will be
-                                removed from the set).
+                                removed from the set.)
                                 </para></listitem>
 
                                 <para>Note that setting
index c93b5da1dcba7b63abde9a9d4e9dc0a951f3ca04..d77e6eb1b6e7e807035d127e653e3bb940e00262 100644 (file)
                 JSON Format</ulink>, the addresses of journal entries
                 are serialized into fields prefixed with double
                 underscores. Note that these are not proper fields when
-                stored in the journal but for addressing meta data of
+                stored in the journal but for addressing metadata of
                 entries. They cannot be written as part of structured
                 log entries via calls such as
                 <citerefentry><refentrytitle>sd_journal_send</refentrytitle><manvolnum>3</manvolnum></citerefentry>. They
index f495fe3666117e137c66139a5f1440b3db6d81d6..5e9b39f38f1856370cada543a4dc099c6e16d53d 100644 (file)
@@ -90,9 +90,9 @@
                 <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                 for more information about .service files). The name
                 of the .service unit is by default the same as the
-                name of the .socket unit, but can be altered with
+                name of the .socket unit, but can be altered with the
                 <option>Service=</option> option described below.
-                Depending on the setting of <option>Accept=</option>
+                Depending on the setting of the <option>Accept=</option>
                 option described below, this .service unit must either
                 be named like the .socket unit, but with the suffix
                 replaced, unless overridden with
                 <para>Socket units may be used to implement on-demand
                 starting of services, as well as parallelized starting
                 of services. See the blog stories linked at the end
-                for introduction.</para>
+                for an introduction.</para>
 
                 <para>Note that the daemon software configured for
                 socket activation with socket units needs to be able
index 1bf0b089e24359d85d189c7958aca08603f76070..da4ff220b92d8cc4b77c1a44a1ec33cd5a332f5b 100644 (file)
           <listitem>
             <para>An ordered, space-separated list of policies by which the
               interface name should be set. <literal>NamePolicy</literal> may
-              be disabeld by specifying <literal>net.ifnames=0</literal> on the
+              be disabeled by specifying <literal>net.ifnames=0</literal> on the
               kernel commandline. Each of the policies may fail, and the first
               successfull one is used. The name is not set directly, but
               is exported to udev as the property <literal>ID_NET_NAME</literal>,