Zbigniew Jędrzejewski-Szmek b12ff7
From 07e7e0378c3f2b73e56e886f7a4b59068dbbbc55 Mon Sep 17 00:00:00 2001
Zbigniew Jędrzejewski-Szmek b12ff7
From: "Jason St. John" <jstjohn@purdue.edu>
Zbigniew Jędrzejewski-Szmek b12ff7
Date: Tue, 10 Dec 2013 00:10:03 -0500
Zbigniew Jędrzejewski-Szmek b12ff7
Subject: [PATCH] man: improve wording and comma usage in
Zbigniew Jędrzejewski-Szmek b12ff7
 systemd.journal-fields(7)
Zbigniew Jędrzejewski-Szmek b12ff7
Zbigniew Jędrzejewski-Szmek b12ff7
Improve wording under "Description" and "_KERNEL_DEVICE="
Zbigniew Jędrzejewski-Szmek b12ff7
---
Zbigniew Jędrzejewski-Szmek b12ff7
 man/systemd.journal-fields.xml | 16 ++++++++--------
Zbigniew Jędrzejewski-Szmek b12ff7
 1 file changed, 8 insertions(+), 8 deletions(-)
Zbigniew Jędrzejewski-Szmek b12ff7
Zbigniew Jędrzejewski-Szmek b12ff7
diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml
Zbigniew Jędrzejewski-Szmek b12ff7
index 8a15598..bb89ed5 100644
Zbigniew Jędrzejewski-Szmek b12ff7
--- a/man/systemd.journal-fields.xml
Zbigniew Jędrzejewski-Szmek b12ff7
+++ b/man/systemd.journal-fields.xml
Zbigniew Jędrzejewski-Szmek b12ff7
@@ -51,14 +51,14 @@
Zbigniew Jędrzejewski-Szmek b12ff7
                 <title>Description</title>
Zbigniew Jędrzejewski-Szmek b12ff7
 
Zbigniew Jędrzejewski-Szmek b12ff7
                 <para>Entries in the journal resemble an environment
Zbigniew Jędrzejewski-Szmek b12ff7
-                block in their syntax, however with fields that can
Zbigniew Jędrzejewski-Szmek b12ff7
+                block in their syntax but with fields that can
Zbigniew Jędrzejewski-Szmek b12ff7
                 include binary data. Primarily, fields are formatted
Zbigniew Jędrzejewski-Szmek b12ff7
                 UTF-8 text strings, and binary formatting is used only
Zbigniew Jędrzejewski-Szmek b12ff7
                 where formatting as UTF-8 text strings makes little
Zbigniew Jędrzejewski-Szmek b12ff7
                 sense. New fields may freely be defined by
Zbigniew Jędrzejewski-Szmek b12ff7
                 applications, but a few fields have special
Zbigniew Jędrzejewski-Szmek b12ff7
                 meaning. All fields with special meanings are
Zbigniew Jędrzejewski-Szmek b12ff7
-                optional. In some cases fields may appear more than
Zbigniew Jędrzejewski-Szmek b12ff7
+                optional. In some cases, fields may appear more than
Zbigniew Jędrzejewski-Szmek b12ff7
                 once per entry.</para>
Zbigniew Jędrzejewski-Szmek b12ff7
         </refsect1>
Zbigniew Jędrzejewski-Szmek b12ff7
 
Zbigniew Jędrzejewski-Szmek b12ff7
@@ -176,7 +176,7 @@
Zbigniew Jędrzejewski-Szmek b12ff7
                                 <term><varname>_UID=</varname></term>
Zbigniew Jędrzejewski-Szmek b12ff7
                                 <term><varname>_GID=</varname></term>
Zbigniew Jędrzejewski-Szmek b12ff7
                                 <listitem>
Zbigniew Jędrzejewski-Szmek b12ff7
-                                        <para>The process, user and
Zbigniew Jędrzejewski-Szmek b12ff7
+                                        <para>The process, user, and
Zbigniew Jędrzejewski-Szmek b12ff7
                                         group ID of the process the
Zbigniew Jędrzejewski-Szmek b12ff7
                                         journal entry originates from
Zbigniew Jędrzejewski-Szmek b12ff7
                                         formatted as a decimal
Zbigniew Jędrzejewski-Szmek b12ff7
@@ -190,7 +190,7 @@
Zbigniew Jędrzejewski-Szmek b12ff7
                                 <term><varname>_CMDLINE=</varname></term>
Zbigniew Jędrzejewski-Szmek b12ff7
                                 <listitem>
Zbigniew Jędrzejewski-Szmek b12ff7
                                         <para>The name, the executable
Zbigniew Jędrzejewski-Szmek b12ff7
-                                        path and the command line of
Zbigniew Jędrzejewski-Szmek b12ff7
+                                        path, and the command line of
Zbigniew Jędrzejewski-Szmek b12ff7
                                         the process the journal entry
Zbigniew Jędrzejewski-Szmek b12ff7
                                         originates from.</para>
Zbigniew Jędrzejewski-Szmek b12ff7
                                 </listitem>
Zbigniew Jędrzejewski-Szmek b12ff7
@@ -389,12 +389,12 @@
Zbigniew Jędrzejewski-Szmek b12ff7
                                         the major and minor of the
Zbigniew Jędrzejewski-Szmek b12ff7
                                         device node, separated by <literal>:</literal>
Zbigniew Jędrzejewski-Szmek b12ff7
                                         and prefixed by <literal>b</literal>. Similar
Zbigniew Jędrzejewski-Szmek b12ff7
-                                        for character devices, but
Zbigniew Jędrzejewski-Szmek b12ff7
+                                        for character devices but
Zbigniew Jędrzejewski-Szmek b12ff7
                                         prefixed by <literal>c</literal>. For network
Zbigniew Jędrzejewski-Szmek b12ff7
-                                        devices the interface index,
Zbigniew Jędrzejewski-Szmek b12ff7
+                                        devices, this is the interface index
Zbigniew Jędrzejewski-Szmek b12ff7
                                         prefixed by <literal>n</literal>. For all other
Zbigniew Jędrzejewski-Szmek b12ff7
-                                        devices <literal>+</literal> followed by the
Zbigniew Jędrzejewski-Szmek b12ff7
-                                        subsystem name, followed by
Zbigniew Jędrzejewski-Szmek b12ff7
+                                        devices, this is the subsystem name
Zbigniew Jędrzejewski-Szmek b12ff7
+                                        prefixed by <literal>+</literal>, followed by
Zbigniew Jędrzejewski-Szmek b12ff7
                                         <literal>:</literal>, followed by the kernel
Zbigniew Jędrzejewski-Szmek b12ff7
                                         device name.</para>
Zbigniew Jędrzejewski-Szmek b12ff7
                                 </listitem>