[systemd-commits] 10 commits - man/busctl.xml man/crypttab.xml man/daemon.xml man/journalctl.xml man/journald.conf.xml man/localtime.xml man/machine-info.xml man/pam_systemd.xml man/sd_bus_creds_get_pid.xml man/sd_bus_creds_new_from_pid.xml man/sd_bus_error.xml man/sd_bus_label_escape.xml man/sd_bus_message_get_monotonic_usec.xml man/sd_bus_new.xml man/sd_bus_open_user.xml man/sd_journal_print.xml man/systemctl.xml man/systemd-cat.xml man/systemd-coredumpctl.xml man/systemd.exec.xml man/systemd-journald.service.xml man/systemd.journal-fields.xml man/systemd.kill.xml man/systemd-networkd.service.xml man/systemd-nspawn.xml man/systemd.service.xml man/systemd.socket.xml man/systemd.special.xml man/systemd-system.conf.xml man/systemd.timer.xml man/systemd-udevd.service.xml man/systemd.xml man/udev.xml rules/60-persistent-storage.rules src/backlight src/core src/journal src/libsystemd src/shared src/udev

Zbigniew Jędrzejewski-Szmek zbyszek at kemper.freedesktop.org
Tue Feb 18 01:04:19 CET 2014


 man/busctl.xml                            |    2 -
 man/crypttab.xml                          |    6 +--
 man/daemon.xml                            |    6 +--
 man/journalctl.xml                        |    8 ++--
 man/journald.conf.xml                     |    6 +--
 man/localtime.xml                         |    2 -
 man/machine-info.xml                      |    6 +--
 man/pam_systemd.xml                       |    2 -
 man/sd_bus_creds_get_pid.xml              |   60 +++++++++++++++---------------
 man/sd_bus_creds_new_from_pid.xml         |   12 +++---
 man/sd_bus_error.xml                      |   20 +++++-----
 man/sd_bus_label_escape.xml               |    8 ++--
 man/sd_bus_message_get_monotonic_usec.xml |   14 +++----
 man/sd_bus_new.xml                        |   12 +++---
 man/sd_bus_open_user.xml                  |   22 +++++------
 man/sd_journal_print.xml                  |    2 -
 man/systemctl.xml                         |   12 +++---
 man/systemd-cat.xml                       |    2 -
 man/systemd-coredumpctl.xml               |    2 -
 man/systemd-journald.service.xml          |    4 +-
 man/systemd-networkd.service.xml          |   20 +++++-----
 man/systemd-nspawn.xml                    |   24 ++++++------
 man/systemd-system.conf.xml               |   16 ++++----
 man/systemd-udevd.service.xml             |   10 ++---
 man/systemd.exec.xml                      |   18 ++++-----
 man/systemd.journal-fields.xml            |    2 -
 man/systemd.kill.xml                      |    4 +-
 man/systemd.service.xml                   |   46 +++++++++++------------
 man/systemd.socket.xml                    |   12 +++---
 man/systemd.special.xml                   |    2 -
 man/systemd.timer.xml                     |    2 -
 man/systemd.xml                           |    2 -
 man/udev.xml                              |    2 -
 rules/60-persistent-storage.rules         |    2 -
 src/backlight/backlight.c                 |    2 -
 src/core/cgroup.c                         |    2 -
 src/core/umount.c                         |    2 -
 src/journal/journalctl.c                  |    2 -
 src/journal/sd-journal.c                  |    4 +-
 src/libsystemd/sd-bus/bus-kernel.c        |    4 +-
 src/shared/cgroup-util.c                  |    4 +-
 src/udev/udev-builtin-usb_id.c            |    4 +-
 42 files changed, 197 insertions(+), 197 deletions(-)

New commits:
commit ed7e5fe37d7e3392538844abadbb2903f4d2540f
Author: Jan Engelhardt <jengelh at inai.de>
Date:   Mon Feb 17 15:43:36 2014 +0100

    doc: utilize the DocBook markup for some literals

diff --git a/man/systemd-networkd.service.xml b/man/systemd-networkd.service.xml
index 48521df..527742c 100644
--- a/man/systemd-networkd.service.xml
+++ b/man/systemd-networkd.service.xml
@@ -105,13 +105,13 @@
                                 <varlistentry>
                                         <term><varname>Kind</varname></term>
                                         <listitem>
-                                                <para>The netdev kind. Currently, 'bridge', 'bond' and 'vlan'
+                                                <para>The netdev kind. Currently, <literal>bridge</literal>, <literal>bond</literal> and <literal>vlan</literal>
                                                 are supported. This option is compulsory.</para>
                                         </listitem>
                                 </varlistentry>
                         </variablelist>
 
-                        <para>The <literal>[VLAN]</literal> section only applies for netdevs of kind 'vlan',
+                        <para>The <literal>[VLAN]</literal> section only applies for netdevs of kind <literal>vlan</literal>,
                         and accepts the following keys:</para>
 
                         <variablelist class='network-directives'>
@@ -199,7 +199,7 @@
                                         <term><varname>Address</varname></term>
                                         <listitem>
                                                 <para>A static IPv4 or IPv6 address and its prefix length,
-                                                separated by a '/' character. The format of the address must
+                                                separated by a <literal>/</literal> character. The format of the address must
                                                 be as described in
                                                 <citerefentry><refentrytitle>inet_pton</refentrytitle><manvolnum>3</manvolnum></citerefentry>
                                                 . This is a short-hand for an [Address] section only containing an Address key (see below).</para>
diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml
index bb04694..cd679a4 100644
--- a/man/systemd-udevd.service.xml
+++ b/man/systemd-udevd.service.xml
@@ -148,7 +148,7 @@
         <term><varname>udev.exec-delay=</varname></term>
         <term><varname>rd.udev.exec-delay=</varname></term>
         <listitem>
-          <para>Delay the execution of RUN instructions by the given
+          <para>Delay the execution of <varname>RUN</varname> 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>

commit deb480d1a7c3f3178c44f0aa73765181c0e2317f
Author: Jan Engelhardt <jengelh at inai.de>
Date:   Mon Feb 17 15:31:28 2014 +0100

    doc: reword "shared per-thread" wording
    
    Either it is shared across threads, or it is per-thread: decide.
    
    Reading the source code, I see a thread_local identifier, so that's
    that. But that does not yet preclude that a program may pass around
    the pointer returned from the function among its own threads.
    
    Do a best effort at saying so.

diff --git a/man/sd_bus_open_user.xml b/man/sd_bus_open_user.xml
index 9ddf2b8..07b9aad 100644
--- a/man/sd_bus_open_user.xml
+++ b/man/sd_bus_open_user.xml
@@ -129,8 +129,8 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
     for more information about "machines".</para>
 
     <para><function>sd_bus_default_user()</function> returns a bus
-    object connected to the user bus. This bus object is shared
-    per-thread. It is created on the first invocation of
+    object connected to the user bus. Each thread has its own object, but it
+    may be passed around. It is created on the first invocation of
     <function>sd_bus_default_user()</function>, and subsequent
     invocations returns a reference to the same object.</para>
 

commit 8dc385e7701726be69b681e2738a1d74a21b24f1
Author: Jan Engelhardt <jengelh at inai.de>
Date:   Sun Feb 16 13:55:27 2014 +0100

    doc: balance C indirections in function prototypes
    
    Shift the asterisks in the documentation's prototypes such that they
    are consistent among each other. Use the right side to match source code.

diff --git a/man/sd_bus_creds_get_pid.xml b/man/sd_bus_creds_get_pid.xml
index a35efef..0a9b5d0 100644
--- a/man/sd_bus_creds_get_pid.xml
+++ b/man/sd_bus_creds_get_pid.xml
@@ -77,145 +77,145 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
       <funcprototype>
         <funcdef>int <function>sd_bus_creds_get_pid</function></funcdef>
-        <paramdef>sd_bus_creds* <parameter>c</parameter></paramdef>
+        <paramdef>sd_bus_creds *<parameter>c</parameter></paramdef>
         <paramdef>pid_t *<parameter>pid</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
         <funcdef>int <function>sd_bus_creds_get_pid_starttime</function></funcdef>
-        <paramdef>sd_bus_creds* <parameter>c</parameter></paramdef>
+        <paramdef>sd_bus_creds *<parameter>c</parameter></paramdef>
         <paramdef>uint64_t *<parameter>usec</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
         <funcdef>int <function>sd_bus_creds_get_tid</function></funcdef>
-        <paramdef>sd_bus_creds* <parameter>c</parameter></paramdef>
+        <paramdef>sd_bus_creds *<parameter>c</parameter></paramdef>
         <paramdef>pid_t *<parameter>tid</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
         <funcdef>int <function>sd_bus_creds_get_pid</function></funcdef>
-        <paramdef>sd_bus_creds* <parameter>c</parameter></paramdef>
+        <paramdef>sd_bus_creds *<parameter>c</parameter></paramdef>
         <paramdef>uid_t *<parameter>uid</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
         <funcdef>int <function>sd_bus_creds_get_gid</function></funcdef>
-        <paramdef>sd_bus_creds* <parameter>c</parameter></paramdef>
+        <paramdef>sd_bus_creds *<parameter>c</parameter></paramdef>
         <paramdef>gid_t *<parameter>gid</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
         <funcdef>int <function>sd_bus_creds_get_comm</function></funcdef>
-        <paramdef>sd_bus_creds* <parameter>c</parameter></paramdef>
+        <paramdef>sd_bus_creds *<parameter>c</parameter></paramdef>
         <paramdef>const char **<parameter>comm</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
         <funcdef>int <function>sd_bus_creds_get_tid_comm</function></funcdef>
-        <paramdef>sd_bus_creds* <parameter>c</parameter></paramdef>
+        <paramdef>sd_bus_creds *<parameter>c</parameter></paramdef>
         <paramdef>const char **<parameter>comm</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
         <funcdef>int <function>sd_bus_creds_get_exe</function></funcdef>
-        <paramdef>sd_bus_creds* <parameter>c</parameter></paramdef>
+        <paramdef>sd_bus_creds *<parameter>c</parameter></paramdef>
         <paramdef>const char **<parameter>exe</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
         <funcdef>int <function>sd_bus_creds_get_cmdline</function></funcdef>
-        <paramdef>sd_bus_creds* <parameter>c</parameter></paramdef>
+        <paramdef>sd_bus_creds *<parameter>c</parameter></paramdef>
         <paramdef>char ***<parameter>cmdline</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
         <funcdef>int <function>sd_bus_creds_get_cgroup</function></funcdef>
-        <paramdef>sd_bus_creds* <parameter>c</parameter></paramdef>
+        <paramdef>sd_bus_creds *<parameter>c</parameter></paramdef>
         <paramdef>const char **<parameter>cgroup</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
         <funcdef>int <function>sd_bus_creds_get_unit</function></funcdef>
-        <paramdef>sd_bus_creds* <parameter>c</parameter></paramdef>
+        <paramdef>sd_bus_creds *<parameter>c</parameter></paramdef>
         <paramdef>const char **<parameter>unit</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
         <funcdef>int <function>sd_bus_creds_get_user_unit</function></funcdef>
-        <paramdef>sd_bus_creds* <parameter>c</parameter></paramdef>
+        <paramdef>sd_bus_creds *<parameter>c</parameter></paramdef>
         <paramdef>const char **<parameter>unit</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
         <funcdef>int <function>sd_bus_creds_get_slice</function></funcdef>
-        <paramdef>sd_bus_creds* <parameter>c</parameter></paramdef>
+        <paramdef>sd_bus_creds *<parameter>c</parameter></paramdef>
         <paramdef>const char **<parameter>slice</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
         <funcdef>int <function>sd_bus_creds_get_session</function></funcdef>
-        <paramdef>sd_bus_creds* <parameter>c</parameter></paramdef>
+        <paramdef>sd_bus_creds *<parameter>c</parameter></paramdef>
         <paramdef>const char **<parameter>slice</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
         <funcdef>int <function>sd_bus_creds_get_owner_uid</function></funcdef>
-        <paramdef>sd_bus_creds* <parameter>c</parameter></paramdef>
+        <paramdef>sd_bus_creds *<parameter>c</parameter></paramdef>
         <paramdef>uid_t *<parameter>uid</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
         <funcdef>int <function>sd_bus_creds_has_effective_cap</function></funcdef>
-        <paramdef>sd_bus_creds* <parameter>c</parameter></paramdef>
+        <paramdef>sd_bus_creds *<parameter>c</parameter></paramdef>
         <paramdef>int <parameter>capability</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
         <funcdef>int <function>sd_bus_creds_has_permitted_cap</function></funcdef>
-        <paramdef>sd_bus_creds* <parameter>c</parameter></paramdef>
+        <paramdef>sd_bus_creds *<parameter>c</parameter></paramdef>
         <paramdef>int <parameter>capability</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
         <funcdef>int <function>sd_bus_creds_has_inheritable_cap</function></funcdef>
-        <paramdef>sd_bus_creds* <parameter>c</parameter></paramdef>
+        <paramdef>sd_bus_creds *<parameter>c</parameter></paramdef>
         <paramdef>int <parameter>capability</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
         <funcdef>int <function>sd_bus_creds_has_bounding_cap</function></funcdef>
-        <paramdef>sd_bus_creds* <parameter>c</parameter></paramdef>
+        <paramdef>sd_bus_creds *<parameter>c</parameter></paramdef>
         <paramdef>int <parameter>capability</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
         <funcdef>int <function>sd_bus_creds_get_selinux_context</function></funcdef>
-        <paramdef>sd_bus_creds* <parameter>c</parameter></paramdef>
+        <paramdef>sd_bus_creds *<parameter>c</parameter></paramdef>
         <paramdef>const char **<parameter>context</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
         <funcdef>int <function>sd_bus_creds_get_audit_session_id</function></funcdef>
-        <paramdef>sd_bus_creds* <parameter>c</parameter></paramdef>
+        <paramdef>sd_bus_creds *<parameter>c</parameter></paramdef>
         <paramdef>uint32_t *<parameter>sessionid</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
         <funcdef>int <function>sd_bus_creds_get_audit_login_uid</function></funcdef>
-        <paramdef>sd_bus_creds* <parameter>c</parameter></paramdef>
+        <paramdef>sd_bus_creds *<parameter>c</parameter></paramdef>
         <paramdef>uid_t *<parameter>loginuid</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
         <funcdef>int <function>sd_bus_creds_get_unique_name</function></funcdef>
-        <paramdef>sd_bus_creds* <parameter>c</parameter></paramdef>
+        <paramdef>sd_bus_creds *<parameter>c</parameter></paramdef>
         <paramdef>const char **<parameter>name</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
         <funcdef>int <function>sd_bus_creds_get_well_known_names</function></funcdef>
-        <paramdef>sd_bus_creds* <parameter>c</parameter></paramdef>
+        <paramdef>sd_bus_creds *<parameter>c</parameter></paramdef>
         <paramdef>char ***<parameter>name</parameter></paramdef>
       </funcprototype>
 
diff --git a/man/sd_bus_creds_new_from_pid.xml b/man/sd_bus_creds_new_from_pid.xml
index 9415dc7..5faee9e 100644
--- a/man/sd_bus_creds_new_from_pid.xml
+++ b/man/sd_bus_creds_new_from_pid.xml
@@ -59,22 +59,22 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
         <funcdef>int <function>sd_bus_creds_new_from_pid</function></funcdef>
         <paramdef>pid_t <parameter>pid</parameter></paramdef>
         <paramdef>uint64_t <parameter>creds_mask</parameter></paramdef>
-        <paramdef>sd_bus_creds** <parameter>ret</parameter></paramdef>
+        <paramdef>sd_bus_creds **<parameter>ret</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
         <funcdef>uint64_t <function>sd_bus_creds_get_mask</function></funcdef>
-        <paramdef>const sd_bus_creds* <parameter>c</parameter></paramdef>
+        <paramdef>const sd_bus_creds *<parameter>c</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
-        <funcdef>sd_bus_creds* <function>sd_bus_creds_ref</function></funcdef>
-        <paramdef>sd_bus_creds* <parameter>c</parameter></paramdef>
+        <funcdef>sd_bus_creds *<function>sd_bus_creds_ref</function></funcdef>
+        <paramdef>sd_bus_creds *<parameter>c</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
-        <funcdef>sd_bus_creds* <function>sd_bus_creds_unref</function></funcdef>
-        <paramdef>sd_bus_creds* <parameter>c</parameter></paramdef>
+        <funcdef>sd_bus_creds *<function>sd_bus_creds_unref</function></funcdef>
+        <paramdef>sd_bus_creds *<parameter>c</parameter></paramdef>
       </funcprototype>
     </funcsynopsis>
 
diff --git a/man/sd_bus_label_escape.xml b/man/sd_bus_label_escape.xml
index fb964ba..ef4b7e2 100644
--- a/man/sd_bus_label_escape.xml
+++ b/man/sd_bus_label_escape.xml
@@ -54,13 +54,13 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
       <funcsynopsisinfo>#include <systemd/sd-bus.h></funcsynopsisinfo>
 
       <funcprototype>
-        <funcdef>char* <function>sd_bus_label_escape</function></funcdef>
-        <paramdef>const char* <parameter>s</parameter></paramdef>
+        <funcdef>char *<function>sd_bus_label_escape</function></funcdef>
+        <paramdef>const char *<parameter>s</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
-        <funcdef>char* <function>sd_bus_label_unescape</function></funcdef>
-        <paramdef>const char* <parameter>f</parameter></paramdef>
+        <funcdef>char *<function>sd_bus_label_unescape</function></funcdef>
+        <paramdef>const char *<parameter>f</parameter></paramdef>
       </funcprototype>
     </funcsynopsis>
   </refsynopsisdiv>
diff --git a/man/sd_bus_message_get_monotonic_usec.xml b/man/sd_bus_message_get_monotonic_usec.xml
index b9437ff..e0ee909 100644
--- a/man/sd_bus_message_get_monotonic_usec.xml
+++ b/man/sd_bus_message_get_monotonic_usec.xml
@@ -55,20 +55,20 @@
 
                         <funcprototype>
                                 <funcdef>int <function>sd_bus_message_get_monotonic_usec</function></funcdef>
-                                <paramdef>sd_bus_message* <parameter>message</parameter></paramdef>
-                                <paramdef>uint64_t* <parameter>usec</parameter></paramdef>
+                                <paramdef>sd_bus_message *<parameter>message</parameter></paramdef>
+                                <paramdef>uint64_t *<parameter>usec</parameter></paramdef>
                         </funcprototype>
 
                         <funcprototype>
                                 <funcdef>int <function>sd_bus_message_get_realtime_usec</function></funcdef>
-                                <paramdef>sd_bus_message* <parameter>message</parameter></paramdef>
-                                <paramdef>uint64_t* <parameter>usec</parameter></paramdef>
+                                <paramdef>sd_bus_message *<parameter>message</parameter></paramdef>
+                                <paramdef>uint64_t *<parameter>usec</parameter></paramdef>
                         </funcprototype>
 
                         <funcprototype>
                                 <funcdef>int <function>sd_bus_message_get_seqnum</function></funcdef>
-                                <paramdef>sd_bus_message* <parameter>message</parameter></paramdef>
-                                <paramdef>uint64_t* <parameter>seqnum</parameter></paramdef>
+                                <paramdef>sd_bus_message *<parameter>message</parameter></paramdef>
+                                <paramdef>uint64_t *<parameter>seqnum</parameter></paramdef>
                         </funcprototype>
                 </funcsynopsis>
         </refsynopsisdiv>
diff --git a/man/sd_bus_new.xml b/man/sd_bus_new.xml
index 573def7..4e43872 100644
--- a/man/sd_bus_new.xml
+++ b/man/sd_bus_new.xml
@@ -56,17 +56,17 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
       <funcprototype>
         <funcdef>int <function>sd_bus_new</function></funcdef>
-        <paramdef>sd_bus** <parameter>bus</parameter></paramdef>
+        <paramdef>sd_bus **<parameter>bus</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
-        <funcdef>sd_bus* <function>sd_bus_ref</function></funcdef>
-        <paramdef>sd_bus* <parameter>bus</parameter></paramdef>
+        <funcdef>sd_bus *<function>sd_bus_ref</function></funcdef>
+        <paramdef>sd_bus *<parameter>bus</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
-        <funcdef>sd_bus* <function>sd_bus_unref</function></funcdef>
-        <paramdef>sd_bus* <parameter>bus</parameter></paramdef>
+        <funcdef>sd_bus *<function>sd_bus_unref</function></funcdef>
+        <paramdef>sd_bus *<parameter>bus</parameter></paramdef>
       </funcprototype>
     </funcsynopsis>
   </refsynopsisdiv>
diff --git a/man/sd_bus_open_user.xml b/man/sd_bus_open_user.xml
index 22a4f61..9ddf2b8 100644
--- a/man/sd_bus_open_user.xml
+++ b/man/sd_bus_open_user.xml
@@ -60,34 +60,34 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
       <funcprototype>
         <funcdef>int <function>sd_bus_open_user</function></funcdef>
-        <paramdef>sd_bus** <parameter>bus</parameter></paramdef>
+        <paramdef>sd_bus **<parameter>bus</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
         <funcdef>int <function>sd_bus_open_system</function></funcdef>
-        <paramdef>sd_bus** <parameter>bus</parameter></paramdef>
+        <paramdef>sd_bus **<parameter>bus</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
         <funcdef>int <function>sd_bus_open_system_remote</function></funcdef>
         <paramdef>const char *<parameter>host</parameter></paramdef>
-        <paramdef>sd_bus** <parameter>bus</parameter></paramdef>
+        <paramdef>sd_bus **<parameter>bus</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
         <funcdef>int <function>sd_bus_open_system_container</function></funcdef>
         <paramdef>const char *<parameter>machine</parameter></paramdef>
-        <paramdef>sd_bus** <parameter>bus</parameter></paramdef>
+        <paramdef>sd_bus **<parameter>bus</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
         <funcdef>int <function>sd_bus_default_user</function></funcdef>
-        <paramdef>sd_bus** <parameter>bus</parameter></paramdef>
+        <paramdef>sd_bus **<parameter>bus</parameter></paramdef>
       </funcprototype>
 
       <funcprototype>
         <funcdef>int <function>sd_bus_default_system</function></funcdef>
-        <paramdef>sd_bus** <parameter>bus</parameter></paramdef>
+        <paramdef>sd_bus **<parameter>bus</parameter></paramdef>
       </funcprototype>
     </funcsynopsis>
   </refsynopsisdiv>

commit 3c8fa0fd0f99996088e42c5d48e164fdae4ada40
Author: Jan Engelhardt <jengelh at inai.de>
Date:   Mon Feb 17 03:58:37 2014 +0100

    doc: properly use XML entities

diff --git a/man/localtime.xml b/man/localtime.xml
index b7fd1ba..dbf2379 100644
--- a/man/localtime.xml
+++ b/man/localtime.xml
@@ -55,7 +55,7 @@
         </refnamediv>
 
         <refsynopsisdiv>
-                <para><filename>/etc/localtime</filename> -> <filename>../usr/share/zoneinfo/…</filename></para>
+                <para><filename>/etc/localtime</filename> -> <filename>../usr/share/zoneinfo/…</filename></para>
         </refsynopsisdiv>
 
         <refsect1>
diff --git a/man/sd_bus_error.xml b/man/sd_bus_error.xml
index 671df44..f3abd28 100644
--- a/man/sd_bus_error.xml
+++ b/man/sd_bus_error.xml
@@ -297,7 +297,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
     <parameter>format</parameter> and the arguments.</para>
 
     <para><function>sd_bus_error_get_errno</function> is will convert
-    <structname>e->name</structname> to an errno-like value using the
+    <structname>e->name</structname> to an errno-like value using the
     same rules as <function>sd_bus_error_set</function>.  If
     <parameter>e</parameter> is <constant>NULL</constant>, 0 will be
     returned.</para>
@@ -343,7 +343,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
     <para><function>sd_bus_error_get_errno</function> returns
     <constant>false</constant> when <parameter>e</parameter> is
     <constant>NULL</constant>, and a positive errno value mapped from
-    <parameter>e->name</parameter> otherwise.</para>
+    <parameter>e->name</parameter> otherwise.</para>
 
     <para><function>sd_bus_error_copy</function> returns 0 or a
     positive integer on success, and one of the negative error values
@@ -351,12 +351,12 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
     <para><function>sd_bus_error_is_set</function> returns
     <constant>true</constant> when <parameter>e</parameter> and
-    <parameter>e->name</parameter> are non-<constant>NULL</constant>,
+    <parameter>e->name</parameter> are non-<constant>NULL</constant>,
     <constant>false</constant> otherwise.</para>
 
     <para><function>sd_bus_error_has_name</function> returns
     <constant>true</constant> when <parameter>e</parameter> is
-    non-<constant>NULL</constant> and <parameter>e->name</parameter>
+    non-<constant>NULL</constant> and <parameter>e->name</parameter>
     is equal to <parameter>name</parameter>,
     <constant>false</constant> otherwise.</para>
   </refsect1>

commit dc968941bfc9be464e1df15afa05693dec3ec192
Author: Jan Engelhardt <jengelh at inai.de>
Date:   Mon Feb 17 02:49:45 2014 +0100

    doc: choose different words to improve clarity
    
    I suggest the following changes to improve the way the text reads
    ("flows").

diff --git a/man/crypttab.xml b/man/crypttab.xml
index 2d41500..668e51d 100644
--- a/man/crypttab.xml
+++ b/man/crypttab.xml
@@ -171,7 +171,7 @@
                                 If the key slot does not match the given
                                 passphrase or key, but another would, the
                                 setup of the device will fail regardless.
-                                This implies <varname>luks</varname>. See
+                                This option implies <varname>luks</varname>. See
                                 <citerefentry><refentrytitle>cryptsetup</refentrytitle><manvolnum>8</manvolnum></citerefentry>
                                 for possible values. The default is to try
                                 all key slots in sequential order.</para></listitem>
@@ -275,7 +275,7 @@
                                 <term><varname>tcrypt-hidden</varname></term>
 
                                 <listitem><para>Use the hidden TrueCrypt volume.
-                                This implies <varname>tcrypt</varname>.</para>
+                                This option implies <varname>tcrypt</varname>.</para>
 
                                 <para>This will map the hidden volume that is
                                 inside of the volume provided in the second
@@ -304,7 +304,7 @@
                                 <term><varname>tcrypt-system</varname></term>
 
                                 <listitem><para>Use TrueCrypt in system
-                                encryption mode. This implies
+                                encryption mode. This option implies
                                 <varname>tcrypt</varname>.</para></listitem>
                         </varlistentry>
 
diff --git a/man/sd_bus_creds_get_pid.xml b/man/sd_bus_creds_get_pid.xml
index 25978a2..a35efef 100644
--- a/man/sd_bus_creds_get_pid.xml
+++ b/man/sd_bus_creds_get_pid.xml
@@ -252,7 +252,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
     numeric GID (group identifier).</para>
 
     <para><function>sd_bus_creds_get_comm</function> will retrieve the
-    comm field (name of the executable, as stored in
+    comm field (truncated name of the executable, as stored in
     <filename>/proc/<replaceable>pid</replaceable>/comm</filename>).
     </para>
 
diff --git a/man/sd_bus_message_get_monotonic_usec.xml b/man/sd_bus_message_get_monotonic_usec.xml
index 57b115c..b9437ff 100644
--- a/man/sd_bus_message_get_monotonic_usec.xml
+++ b/man/sd_bus_message_get_monotonic_usec.xml
@@ -104,7 +104,7 @@
 
                 <para>These timestamps and the sequence number are
                 attached to each message by the kernel and cannot be
-                manipulated by the sending userspace.</para>
+                manipulated by the sender.</para>
 
                 <para>Note that these timestamps are only available on
                 some bus transports, and only after support for them

commit 66f756d437658cc464bfb5647c97efd0cf77f933
Author: Jan Engelhardt <jengelh at inai.de>
Date:   Mon Feb 17 03:37:18 2014 +0100

    doc: resolve missing/extraneous words or inappropriate forms
    
    Issues fixed:
    * missing words required by grammar
    * duplicated or extraneous words
    * inappropriate forms (e.g. singular/plural), and declinations
    * orthographic misspellings

diff --git a/man/busctl.xml b/man/busctl.xml
index 3fdef7b..ab18a49 100644
--- a/man/busctl.xml
+++ b/man/busctl.xml
@@ -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>
diff --git a/man/journalctl.xml b/man/journalctl.xml
index 626d820..50027b4 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -380,7 +380,7 @@
                                                         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>
diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index 9516432..a814ec1 100644
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -269,12 +269,12 @@
                                 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>
 
diff --git a/man/machine-info.xml b/man/machine-info.xml
index ddf8f8b..7448e68 100644
--- a/man/machine-info.xml
+++ b/man/machine-info.xml
@@ -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>
 
diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml
index 66d40fc..3022cdb 100644
--- a/man/pam_systemd.xml
+++ b/man/pam_systemd.xml
@@ -227,7 +227,7 @@
 
                 <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>
diff --git a/man/sd_bus_creds_get_pid.xml b/man/sd_bus_creds_get_pid.xml
index 740082e..25978a2 100644
--- a/man/sd_bus_creds_get_pid.xml
+++ b/man/sd_bus_creds_get_pid.xml
@@ -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>
diff --git a/man/sd_bus_error.xml b/man/sd_bus_error.xml
index 642b0b9..671df44 100644
--- a/man/sd_bus_error.xml
+++ b/man/sd_bus_error.xml
@@ -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
diff --git a/man/sd_bus_open_user.xml b/man/sd_bus_open_user.xml
index 0effee4..22a4f61 100644
--- a/man/sd_bus_open_user.xml
+++ b/man/sd_bus_open_user.xml
@@ -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>
diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml
index 7b08733..6386577 100644
--- a/man/sd_journal_print.xml
+++ b/man/sd_journal_print.xml
@@ -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
diff --git a/man/systemctl.xml b/man/systemctl.xml
index 418e71f..d6d2c76 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -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 at .service</filename> instances.
diff --git a/man/systemd-coredumpctl.xml b/man/systemd-coredumpctl.xml
index 286ff14..4318a2f 100644
--- a/man/systemd-coredumpctl.xml
+++ b/man/systemd-coredumpctl.xml
@@ -135,7 +135,7 @@
 
                                 <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>
diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml
index 0a20e21..4d2cb40 100644
--- a/man/systemd-journald.service.xml
+++ b/man/systemd-journald.service.xml
@@ -66,10 +66,10 @@
                 <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
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 5bddd89..b34d38c 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -179,8 +179,8 @@
 
                                 <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>
 
@@ -303,14 +303,14 @@
                                 <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>
@@ -322,7 +322,7 @@
                                 <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>
@@ -540,13 +540,13 @@
                                 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>
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 6c1b1e7..f3a89ad 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -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>
@@ -216,7 +216,7 @@
 
                                 <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
diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml
index 0e49fa0..bb04694 100644
--- a/man/systemd-udevd.service.xml
+++ b/man/systemd-udevd.service.xml
@@ -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>
@@ -148,7 +148,7 @@
         <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>
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index c08feba..252992b 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -248,7 +248,7 @@
                                 <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
@@ -1041,14 +1041,14 @@
                                 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
diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml
index c93b5da..d77e6eb 100644
--- a/man/systemd.journal-fields.xml
+++ b/man/systemd.journal-fields.xml
@@ -529,7 +529,7 @@
                 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
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index f495fe3..5e9b39f 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -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
@@ -135,7 +135,7 @@
                 <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
diff --git a/man/udev.xml b/man/udev.xml
index 1bf0b08..da4ff22 100644
--- a/man/udev.xml
+++ b/man/udev.xml
@@ -874,7 +874,7 @@
           <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>,

commit 73e231abde39f22097df50542c745e01de879836
Author: Jan Engelhardt <jengelh at inai.de>
Date:   Mon Feb 17 03:37:13 2014 +0100

    doc: update punctuation
    
    Resolve spotted issues related to missing or extraneous commas, dashes.

diff --git a/man/journalctl.xml b/man/journalctl.xml
index 8890c64..626d820 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -521,16 +521,16 @@
                                 unit names found in the journal is
                                 compared with the specified pattern
                                 and all that match are used. For each
-                                unit name a match is added for
+                                unit name, a match is added for
                                 messages from the unit
-                                (<literal>_SYSTEMD_UNIT=<replaceable>UNIT</replaceable></literal>)
+                                (<literal>_SYSTEMD_UNIT=<replaceable>UNIT</replaceable></literal>),
                                 along with additional matches for
                                 messages from systemd and messages
                                 about coredumps for the specified
                                 unit.</para>
 
                                 <para>This parameter can be specified
-                                multiple times. </para></listitem>
+                                multiple times.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
diff --git a/man/sd_bus_error.xml b/man/sd_bus_error.xml
index 99a08c7..642b0b9 100644
--- a/man/sd_bus_error.xml
+++ b/man/sd_bus_error.xml
@@ -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>
+    Otherwie, they wil be copied.</para>
 
     <para><function>sd_bus_error_is_set</function> will return
     <constant>true</constant> if <parameter>e</parameter> is
diff --git a/man/sd_bus_new.xml b/man/sd_bus_new.xml
index 3ac297a..573def7 100644
--- a/man/sd_bus_new.xml
+++ b/man/sd_bus_new.xml
@@ -75,7 +75,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
     <title>Description</title>
 
     <para><function>sd_bus_new()</function> creates a new bus
-    object. This object is reference counted, and will be destroyed
+    object. This object is reference-counted, and will be destroyed
     when all references are gone. Initially, the caller of this
     function owns the sole reference.</para>
 
diff --git a/man/systemctl.xml b/man/systemctl.xml
index a80d372..418e71f 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -591,7 +591,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
             failed state usually are not loaded, and would not be
             matched by any pattern. In addition, in case of
             instantiated units, systemd is often unaware of the
-            instance name until the instance has been started. Therefore
+            instance name until the instance has been started. Therefore,
             using glob patterns with <command>start</command>
             has limited usefulness.</para>
           </listitem>
@@ -1199,9 +1199,9 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
           <listitem>
             <para>Import all, one or more environment variables set on
             the client into the systemd manager environment block. If
-            no arguments are passed the entire environment block is
-            imported. Otherwise a list of one or more environment
-            variable names should be passed, whose client side values
+            no arguments are passed, the entire environment block is
+            imported. Otherwise, a list of one or more environment
+            variable names should be passed, whose client-side values
             are then imported into the manager's environment
             block.</para>
           </listitem>
@@ -1432,7 +1432,7 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service
       <programlisting># systemctl status dev-sda.device
 # systemctl status home.mount</programlisting>
       In the second case, shell-style globs will be matched against
-      currently loaded units, and literal unit names, with or without
+      currently loaded units; literal unit names, with or without
       a suffix, will be treated as in the first case. This means that
       literal unit names always refer to exactly one unit, but globs
       may match zero units and this is not considered an error.</para>
diff --git a/man/systemd-cat.xml b/man/systemd-cat.xml
index 16a8eb4..e61a6ac 100644
--- a/man/systemd-cat.xml
+++ b/man/systemd-cat.xml
@@ -189,7 +189,7 @@
                 <para>Even though the two examples have very similar
                 effects the first is preferable since only one process
                 is running at a time, and both stdout and stderr are
-                captured while in the second example only stdout is
+                captured while in the second example, only stdout is
                 captured.</para>
         </refsect1>
 
diff --git a/man/systemd-networkd.service.xml b/man/systemd-networkd.service.xml
index 1b1ea4c..48521df 100644
--- a/man/systemd-networkd.service.xml
+++ b/man/systemd-networkd.service.xml
@@ -118,7 +118,7 @@
                                 <varlistentry>
                                         <term><varname>Id</varname></term>
                                         <listitem>
-                                                <para>The VLAN ID to use. An integer in the range 0-4094.
+                                                <para>The VLAN ID to use. An integer in the range 0–4094.
                                                 This option is compulsory.</para>
                                         </listitem>
                                 </varlistentry>
@@ -192,7 +192,7 @@
                                 <varlistentry>
                                         <term><varname>DHCP</varname></term>
                                         <listitem>
-                                                <para>A boolean. When true enables basic DHCPv4 support.</para>
+                                                <para>A boolean. When true, enables basic DHCPv4 support.</para>
                                         </listitem>
                                 </varlistentry>
                                 <varlistentry>
@@ -283,28 +283,28 @@
                                 <varlistentry>
                                         <term><varname>UseDNS</varname></term>
                                         <listitem>
-                                                <para>When true (the default) the DNS servers received from the DHCP server will
-                                                be used, and take precedence over any statically configured ones.</para>
+                                                <para>When true (the default), the DNS servers received from the DHCP server will
+                                                be used and take precedence over any statically configured ones.</para>
                                         </listitem>
                                 </varlistentry>
                                 <varlistentry>
                                         <term><varname>UseMTU</varname></term>
                                         <listitem>
-                                                <para>When true the interface maximum transmission unit from the DHCP server will
+                                                <para>When true, the interface maximum transmission unit from the DHCP server will
                                                 be used on the current link. Defaults to false.</para>
                                         </listitem>
                                 </varlistentry>
                                 <varlistentry>
                                         <term><varname>UseHostname</varname></term>
                                         <listitem>
-                                                <para>When true (the default) the hostname received from the DHCP server
+                                                <para>When true (the default), the hostname received from the DHCP server
                                                 will be used as the transient hostname.</para>
                                         </listitem>
                                 </varlistentry>
                                 <varlistentry>
                                         <term><varname>CriticalConnection</varname></term>
                                         <listitem>
-                                                <para>When true the connection will never be torn down even if the DHCP lease
+                                                <para>When true, the connection will never be torn down even if the DHCP lease
                                                 expires. This is contrary to the DHCP specification, but may be the best choice
                                                 if, say, the root filesystem relies on this connection. Defaults to false.</para>
                                         </listitem>
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 665518d..5bddd89 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -272,7 +272,7 @@
                                 <option>--network-interface=</option>
                                 and configured with
                                 <option>--network-veth</option>. If
-                                this option is specified the
+                                this option is specified, the
                                 CAP_NET_ADMIN capability will be added
                                 to the set of capabilities the
                                 container retains. The latter may be
@@ -289,7 +289,7 @@
                                 specified interface from the calling
                                 namespace and place it in the
                                 container. When the container
-                                terminates it is moved back to the
+                                terminates, it is moved back to the
                                 host namespace. Note that
                                 <option>--network-interface=</option>
                                 implies
@@ -378,7 +378,7 @@
                                 is retained if
                                 <option>--private-network</option> is
                                 specified. If the special value
-                                <literal>all</literal> is passed all
+                                <literal>all</literal> is passed, all
                                 capabilities are
                                 retained.</para></listitem>
                         </varlistentry>
@@ -524,7 +524,7 @@
                                 and shown by tools such as
                                 <citerefentry><refentrytitle>ps</refentrytitle><manvolnum>1</manvolnum></citerefentry>. If
                                 the container does not run an init
-                                system it is recommended to set this
+                                system, it is recommended to set this
                                 option to <literal>no</literal>. Note
                                 that <option>--share-system</option>
                                 implies
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index c33e010..6c1b1e7 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -222,15 +222,15 @@
                                 used as an effective way to disable
                                 invocation of non-native binaries
                                 system-wide, for example to prohibit
-                                execution of 32bit x86 binaries on
-                                64bit x86-64 systems. This option
-                                operates system wide, and acts
+                                execution of 32-bit x86 binaries on
+                                64-bit x86-64 systems. This option
+                                operates system-wide, and acts
                                 similar to the
                                 <varname>SystemCallArchitectures=</varname>
                                 setting of unit files, see
                                 <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                                 for details. This setting defaults to
-                                the empty list in which case no
+                                the empty list, in which case no
                                 filtering of system calls based on
                                 architecture is applied. Known
                                 architecture identifiers are
@@ -249,7 +249,7 @@
                                 execution of any non-native
                                 binaries. When a binary executes a
                                 system call of an architecture that is
-                                not listed in this setting it will be
+                                not listed in this setting, it will be
                                 immediately terminated with the SIGSYS
                                 signal.</para></listitem>
                         </varlistentry>
@@ -285,7 +285,7 @@
                                 <term><varname>DefaultRestartSec=</varname></term>
 
                                 <listitem><para>Configures the default
-                                time-outs for starting and stopping of
+                                timeouts for starting and stopping of
                                 units, as well as the default time to
                                 sleep between automatic restarts of
                                 units, as configured per-unit in
diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml
index b3bca2f..0e49fa0 100644
--- a/man/systemd-udevd.service.xml
+++ b/man/systemd-udevd.service.xml
@@ -93,10 +93,10 @@
         <term><option>--resolve-names=</option></term>
         <listitem>
           <para>Specify when systemd-udevd should resolve names of users and groups.
-          When set to <option>early</option> (the default) names will be
+          When set to <option>early</option> (the default), names will be
           resolved when the rules are parsed.  When set to
-          <option>late</option> names will be resolved for every event.
-          When set to <option>never</option> names will never be resolved
+          <option>late</option>, names will be resolved for every event.
+          When set to <option>never</option>, names will never be resolved
           and all devices will be owned by root.</para>
         </listitem>
       </varlistentry>
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index a9e54cb..c08feba 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -1033,7 +1033,7 @@
 
                                 <para>If you specify both types of
                                 this option (i.e. whitelisting and
-                                blacklisting) the first encountered
+                                blacklisting), the first encountered
                                 will take precedence and will dictate
                                 the default action (termination or
                                 approval of a system call). Then the
@@ -1044,7 +1044,7 @@
                                 default action (e.g. You have started
                                 with a whitelisting of
                                 <function>read</function> and
-                                <function>write</function> and right
+                                <function>write</function>, and right
                                 after it add a blacklisting of
                                 <function>write</function>, then
                                 <function>write</function> will be
@@ -1075,7 +1075,7 @@
                                 <literal>EACCES</literal> or
                                 <literal>EUCLEAN</literal>. When this
                                 setting is not used, or when the empty
-                                string is assigned the process will be
+                                string is assigned, the process will be
                                 terminated immediately when the filter
                                 is triggered.</para></listitem>
                         </varlistentry>
@@ -1099,8 +1099,8 @@
                                 unit. This is an effective way to
                                 disable compatibility with non-native
                                 architectures for processes, for
-                                example to prohibit execution of 32bit
-                                x86 binaries on 64bit x86-64
+                                example to prohibit execution of 32-bit
+                                x86 binaries on 64-bit x86-64
                                 systems. The special
                                 <literal>native</literal> identifier
                                 implicitly maps to the native
@@ -1110,7 +1110,7 @@
                                 that setting this option to a
                                 non-empty list implies that
                                 <literal>native</literal> is included
-                                too. By default this option is set to
+                                too. By default, this option is set to
                                 the empty list, i.e. no architecture
                                 system call filtering is applied. Note
                                 that configuring a system call filter
diff --git a/man/systemd.kill.xml b/man/systemd.kill.xml
index a4009aa..3979647 100644
--- a/man/systemd.kill.xml
+++ b/man/systemd.kill.xml
@@ -109,7 +109,7 @@
                                 <varname>ExecStop=</varname>). If set
                                 to <option>process</option>, only the
                                 main process itself is killed. If set
-                                to <option>mixed</option> the
+                                to <option>mixed</option>, the
                                 <constant>SIGTERM</constant> signal
                                 (see below) is sent to the main
                                 process while the subsequent
@@ -118,7 +118,7 @@
                                 processes of the unit's control
                                 group. If set to
                                 <option>none</option>, no process is
-                                killed. In this case only the stop
+                                killed. In this case, only the stop
                                 command will be executed on unit stop,
                                 but no process be killed
                                 otherwise. Processes remaining alive
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index f3ba657..3b2a7cf 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -748,29 +748,29 @@ ExecStart=/bin/echo $ONE $TWO ${TWO}</programlisting>
                                 definitions can either be numeric exit
                                 codes or termination signal names,
                                 separated by spaces. For example:
-				<programlisting>SuccessExitStatus=1 2 8 <constant>SIGKILL</constant></programlisting>
-				ensures that exit codes 1, 2, 8 and
-				the termination signal
-				<constant>SIGKILL</constant> are
-				considered clean service terminations.
-			        </para>
-
-				<para>Note that if a process has a
-				signal handler installed and exits by
-				calling
-				<citerefentry><refentrytitle>_exit</refentrytitle><manvolnum>2</manvolnum></citerefentry>
-				in response to a signal, the
-				information about the signal is lost.
-				Programs should instead perform cleanup and kill themselves with the same signal instead. See
-				<ulink url="http://www.cons.org/cracauer/sigint.html">Proper handling of SIGINT/SIGQUIT — How to be a proper program</ulink>.</para>
-
-				<para>This option may appear more than once
-				in which case the list of successful
-				exit statuses is merged. If the empty
-				string is assigned to this option, the
-				list is reset, all prior assignments
-				of this option will have no
-				effect.</para></listitem>
+                                <programlisting>SuccessExitStatus=1 2 8 <constant>SIGKILL</constant></programlisting>
+                                ensures that exit codes 1, 2, 8 and
+                                the termination signal
+                                <constant>SIGKILL</constant> are
+                                considered clean service terminations.
+                                </para>
+
+                                <para>Note that if a process has a
+                                signal handler installed and exits by
+                                calling
+                                <citerefentry><refentrytitle>_exit</refentrytitle><manvolnum>2</manvolnum></citerefentry>
+                                in response to a signal, the
+                                information about the signal is lost.
+                                Programs should instead perform cleanup and kill themselves with the same signal instead. See
+                                <ulink url="http://www.cons.org/cracauer/sigint.html">Proper handling of SIGINT/SIGQUIT — How to be a proper program</ulink>.</para>
+
+                                <para>This option may appear more than once,
+                                in which case the list of successful
+                                exit statuses is merged. If the empty
+                                string is assigned to this option, the
+                                list is reset, all prior assignments
+                                of this option will have no
+                                effect.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index 71d1ab9..f495fe3 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -84,7 +84,7 @@
                 which configure resource control settings for the
                 processes of the socket.</para>
 
-                <para>For each socket file a matching service file
+                <para>For each socket file, a matching service file
                 must exist, describing the service to start on
                 incoming traffic on the socket (see
                 <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
@@ -254,7 +254,7 @@
                                 before the interface it is configured
                                 on is up and running, and even
                                 regardless of whether it will be up and
-                                running at any point. To deal with this
+                                running at any point. To deal with this,
                                 it is recommended to set the
                                 <varname>FreeBind=</varname> option
                                 described below.</para></listitem>
@@ -720,7 +720,7 @@
                                 <varname>Accept=no</varname>. It
                                 defaults to the service that bears the
                                 same name as the socket (with the
-                                suffix replaced). In most cases it
+                                suffix replaced). In most cases, it
                                 should not be necessary to use this
                                 option.</para></listitem>
                         </varlistentry>
diff --git a/man/systemd.special.xml b/man/systemd.special.xml
index 76bb5cd..8ccccc2 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -820,7 +820,7 @@
                 services. These targets are generally not part of the
                 initial boot transaction, unless they are explicitly
                 pulled in by one of the implementing services. Note
-                specifically, that these <emphasis>passive</emphasis>
+                specifically that these <emphasis>passive</emphasis>
                 target units are generally not pulled in by the
                 consumer of a service, but by the provider of the
                 service. This means: a consuming service should order
diff --git a/man/systemd.timer.xml b/man/systemd.timer.xml
index bb3a6d1..98d4f7b 100644
--- a/man/systemd.timer.xml
+++ b/man/systemd.timer.xml
@@ -214,7 +214,7 @@
                                 later. Within this time window, the
                                 expiry time will be placed at a
                                 host-specific, randomized but stable
-                                position, that is synchronized between
+                                position that is synchronized between
                                 all local timer units. This is done in
                                 order to distribute the wake-up time
                                 in networked installations, as well as
diff --git a/man/systemd.xml b/man/systemd.xml
index 4e35c96..4abd890 100644
--- a/man/systemd.xml
+++ b/man/systemd.xml
@@ -393,7 +393,7 @@
                 and ordering dependencies are placed between two
                 units. Also note that the majority of dependencies are
                 implicitly created and maintained by systemd. In most
-                cases it should be unnecessary to declare additional
+                cases, it should be unnecessary to declare additional
                 dependencies manually, however it is possible to do
                 this.</para>
 
diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules
index 154ffd9..4f7163d 100644
--- a/rules/60-persistent-storage.rules
+++ b/rules/60-persistent-storage.rules
@@ -33,7 +33,7 @@ KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="scsi", ATTRS{type}==
 
 # Run ata_id on non-removable USB Mass Storage (SATA/PATA disks in enclosures)
 KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", ATTR{removable}=="0", SUBSYSTEMS=="usb", IMPORT{program}="ata_id --export $devnode"
-# Otherwise fall back to using usb_id for USB devices
+# Otherwise, fall back to using usb_id for USB devices
 KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="usb", IMPORT{builtin}="usb_id"
 
 # scsi devices
diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
index bf76703..7d7c084 100644
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -285,7 +285,7 @@ int main(int argc, char *argv[]) {
          * their probing at boot-time might happen in any order. This
          * means the validity checking of the device then is not
          * reliable, since it might not see other devices conflicting
-         * with a specific backlight. To deal with this we will
+         * with a specific backlight. To deal with this, we will
          * actively delete backlight state files at shutdown (where
          * device probing should be complete), so that the validity
          * check at boot time doesn't have to be reliable. */
diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 24d6ff6..6c51235 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -629,7 +629,7 @@ int unit_realize_cgroup(Unit *u) {
          * unit, we need to first create all parents, but there's more
          * actually: for the weight-based controllers we also need to
          * make sure that all our siblings (i.e. units that are in the
-         * same slice as we are) have cgroups, too. Otherwise things
+         * same slice as we are) have cgroups, too. Otherwise, things
          * would become very uneven as each of their processes would
          * get as much resources as all our group together. This call
          * will synchronously create the parent cgroups, but will
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 482795b..d406dae 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -727,7 +727,7 @@ static int add_matches(sd_journal *j, char **args) {
                                         t = strappend("_COMM=", comm);
 
                                         /* Append _EXE only if the interpreter is not a link.
-                                           Otherwise it might be outdated often. */
+                                           Otherwise, it might be outdated often. */
                                         if (lstat(interpreter, &st) == 0 &&
                                             !S_ISLNK(st.st_mode)) {
                                                 t2 = strappend("_EXE=", interpreter);
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index 7466006..6abbacf 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -464,7 +464,7 @@ static int compare_entry_order(JournalFile *af, Object *_ao,
 
         if (sd_id128_equal(ao->entry.boot_id, bo->entry.boot_id)) {
 
-                /* If the boot id matches compare monotonic time */
+                /* If the boot id matches, compare monotonic time */
                 a = le64toh(ao->entry.monotonic);
                 b = le64toh(bo->entry.monotonic);
 
@@ -474,7 +474,7 @@ static int compare_entry_order(JournalFile *af, Object *_ao,
                         return 1;
         }
 
-        /* Otherwise compare UTC time */
+        /* Otherwise, compare UTC time */
         a = le64toh(ao->entry.realtime);
         b = le64toh(bo->entry.realtime);
 
diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c
index 712ef00..8699d30 100644
--- a/src/libsystemd/sd-bus/bus-kernel.c
+++ b/src/libsystemd/sd-bus/bus-kernel.c
@@ -299,8 +299,8 @@ static int bus_message_setup_kmsg(sd_bus *b, sd_bus_message *m) {
                         continue;
                 }
 
-                /* Otherwise let's send a vector to the actual data,
-                 * for that we need to map it first. */
+                /* Otherwise, let's send a vector to the actual data.
+                 * For that, we need to map it first. */
                 r = bus_body_part_map(part);
                 if (r < 0)
                         goto fail;
diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c
index 1aa81c2..06eb453 100644
--- a/src/shared/cgroup-util.c
+++ b/src/shared/cgroup-util.c
@@ -1041,7 +1041,7 @@ int cg_mangle_path(const char *path, char **result) {
         assert(path);
         assert(result);
 
-        /* First check if it already is a filesystem path */
+        /* First, check if it already is a filesystem path */
         if (path_startswith(path, "/sys/fs/cgroup")) {
 
                 t = strdup(path);
@@ -1053,7 +1053,7 @@ int cg_mangle_path(const char *path, char **result) {
                 return 0;
         }
 
-        /* Otherwise treat it as cg spec */
+        /* Otherwise, treat it as cg spec */
         r = cg_split_spec(path, &c, &p);
         if (r < 0)
                 return r;
diff --git a/src/udev/udev-builtin-usb_id.c b/src/udev/udev-builtin-usb_id.c
index 1b9f824..883e11e 100644
--- a/src/udev/udev-builtin-usb_id.c
+++ b/src/udev/udev-builtin-usb_id.c
@@ -219,9 +219,9 @@ static int dev_if_packed_info(struct udev_device *dev, char *ifs_str, size_t len
  * A unique USB identification is generated like this:
  *
  * 1.) Get the USB device type from InterfaceClass and InterfaceSubClass
- * 2.) If the device type is 'Mass-Storage/SPC-2' or 'Mass-Storage/RBC'
+ * 2.) If the device type is 'Mass-Storage/SPC-2' or 'Mass-Storage/RBC',
  *     use the SCSI vendor and model as USB-Vendor and USB-model.
- * 3.) Otherwise use the USB manufacturer and product as
+ * 3.) Otherwise, use the USB manufacturer and product as
  *     USB-Vendor and USB-model. Any non-printable characters
  *     in those strings will be skipped; a slash '/' will be converted
  *     into a full stop '.'.

commit 48b5804a48b2b629fa793cc93bcb4a9c6edf9962
Author: Jan Engelhardt <jengelh at inai.de>
Date:   Sun Feb 16 14:01:31 2014 +0100

    doc: detail what "UID" is

diff --git a/man/sd_bus_creds_get_pid.xml b/man/sd_bus_creds_get_pid.xml
index 299c05a..740082e 100644
--- a/man/sd_bus_creds_get_pid.xml
+++ b/man/sd_bus_creds_get_pid.xml
@@ -246,10 +246,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
     TID (thread identifier).</para>
 
     <para><function>sd_bus_creds_get_uid</function> will retrieve the
-    UID (user identifier).</para>
+    numeric UID (user identifier).</para>
 
     <para><function>sd_bus_creds_get_gid</function> will retrieve the
-    GID (group identifier).</para>
+    numeric GID (group identifier).</para>
 
     <para><function>sd_bus_creds_get_comm</function> will retrieve the
     comm field (name of the executable, as stored in
@@ -301,7 +301,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
     </para>
 
     <para><function>sd_bus_creds_get_owner_uid</function> will retrieve
-    the UID (user identifier) of the user who owns the slice
+    the numeric UID (user identifier) of the user who owns the slice
     that the process is part of. See
     <citerefentry><refentrytitle>systemd.slice</refentrytitle><manvolnum>5</manvolnum></citerefentry>
     <!-- and

commit fc9acf252ffd0992a6bb0870f76c8d87cead2088
Author: Jan Engelhardt <jengelh at inai.de>
Date:   Sun Feb 16 13:42:17 2014 +0100

    doc: quote consistently in autoconf code
    
    AS_HELP_STRING has been observed to expand such that the surround
    function complains; play it safe and consistenly quote the example
    code throughout.

diff --git a/man/daemon.xml b/man/daemon.xml
index 26ba600..88dd082 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -766,7 +766,7 @@
 
                         <programlisting>PKG_PROG_PKG_CONFIG
 AC_ARG_WITH([systemdsystemunitdir],
-     AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),,
+     [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],,
      [with_systemdsystemunitdir=auto])
 AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [
      def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
@@ -775,10 +775,10 @@ AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitd
          [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],
                 [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])])
           with_systemdsystemunitdir=no],
-         [with_systemdsystemunitdir=$def_systemdsystemunitdir])])
+         [with_systemdsystemunitdir="$def_systemdsystemunitdir"])])
 AS_IF([test "x$with_systemdsystemunitdir" != "xno"],
       [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])
-AM_CONDITIONAL(HAVE_SYSTEMD, [test "x$with_systemdsystemunitdir" != "xno"])</programlisting>
+AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])</programlisting>
 
                         <para>This snippet allows automatic
                         installation of the unit files on systemd

commit a87f0f726ca6dc9fde11eea6591a244e77d2d182
Author: Jan Engelhardt <jengelh at inai.de>
Date:   Sun Feb 16 13:58:18 2014 +0100

    core: more exact test on the procfs special string "(deleted)"
    
    In other parts of systemd, the code checks for " (deleted)",
    but in one instance, it did not (yet). Make it do the same.

diff --git a/src/core/umount.c b/src/core/umount.c
index 30111be..2d166c1 100644
--- a/src/core/umount.c
+++ b/src/core/umount.c
@@ -170,7 +170,7 @@ static int swap_list_get(MountPoint **head) {
                         continue;
                 }
 
-                if (endswith(dev, "(deleted)")) {
+                if (endswith(dev, " (deleted)")) {
                         free(dev);
                         continue;
                 }



More information about the systemd-commits mailing list