Merge pull request #3088 from keszybz/man

One man fix and unicodification of dashes

8 files changed, 20 insertions, 12 deletions

diff --git a/man/daemon.xml b/man/daemon.xml
index b6125cb5c7..fed1ca1f49 100644
--- a/man/daemon.xml
+++ b/man/daemon.xml
@@ -234,7 +234,7 @@
         bus-activatable by supplying a D-Bus service activation
         configuration file. This has multiple advantages: your daemon
         may be started lazily on-demand; it may be started in parallel
-        to other daemons requiring it -- which maximizes
+        to other daemons requiring it — which maximizes
         parallelization and boot-up speed; your daemon can be
         restarted on failure without losing any bus requests, as the
         bus queues requests for activatable services. See below for
diff --git a/man/sd_event_source_set_priority.xml b/man/sd_event_source_set_priority.xml
index 9234f4233e..8c9b39fe5e 100644
--- a/man/sd_event_source_set_priority.xml
+++ b/man/sd_event_source_set_priority.xml
@@ -97,7 +97,7 @@
     <constant>SD_EVENT_PRIORITY_IDLE</constant> (100) may be used to
     indicate event sources that shall be dispatched early, normally or
     late. It is recommended to specify priorities based on these
-    definitions, and relative to them -- however, the full 64bit
+    definitions, and relative to them — however, the full 64bit
     signed integer range is available for ordering event
     sources.</para>
 
diff --git a/man/sd_journal_add_match.xml b/man/sd_journal_add_match.xml
index 3b27444f8d..98415d53fd 100644
--- a/man/sd_journal_add_match.xml
+++ b/man/sd_journal_add_match.xml
@@ -88,11 +88,19 @@
     <citerefentry><refentrytitle>sd_journal_next</refentrytitle><manvolnum>3</manvolnum></citerefentry>
     and
     <citerefentry><refentrytitle>sd_journal_get_data</refentrytitle><manvolnum>3</manvolnum></citerefentry>.
-    Matches are of the form <literal>FIELD=value</literal>, where the
-    field part is a short uppercase string consisting only of 0–9, A–Z
-    and the underscore. It may not begin with two underscores or be
-    the empty string. The value part may be any value, including
-    binary. If a match is applied, only entries with this field set
+    Parameter <parameter>data</parameter> must be of the form
+    <literal><replaceable>FIELD</replaceable>=<replaceable>value</replaceable></literal>,
+    where the <replaceable>FIELD</replaceable> part is a short uppercase string consisting only
+    of 0–9, A–Z and the underscore; it may not begin with two underscores or be the empty
+    string. The <replaceable>value</replaceable> part may be anything, including binary. Parameter
+    <parameter>size</parameter> specifies the number of bytes in <parameter>data</parameter>
+    (i.e. the length of <replaceable>FIELD</replaceable>, plus one, plus the length of
+    <replaceable>value</replaceable>). Parameter <parameter>size</parameter> may also be
+    specified as <constant>0</constant>, in which case <parameter>data</parameter>
+    must be a <constant>NUL</constant>-terminated string, and the bytes before the terminating
+    zero are used as the match.</para>
+
+    <para>If a match is applied, only entries with this field set
     will be iterated. Multiple matches may be active at the same time:
     If they apply to different fields, only entries with both fields
     set like this will be iterated. If they apply to the same fields,
diff --git a/man/sd_journal_get_data.xml b/man/sd_journal_get_data.xml
index 1f25d068d7..908ee7db16 100644
--- a/man/sd_journal_get_data.xml
+++ b/man/sd_journal_get_data.xml
@@ -148,7 +148,7 @@
     <function>sd_journal_enumerate_unique()</function>. This threshold
     is a hint only: it indicates that the client program is interested
     only in the initial parts of the data fields, up to the threshold
-    in size -- but the library might still return larger data objects.
+    in size — but the library might still return larger data objects.
     That means applications should not rely exclusively on this
     setting to limit the size of the data fields returned, but need to
     apply a explicit size limit on the returned data as well. This
diff --git a/man/systemd-ask-password.xml b/man/systemd-ask-password.xml
index e84a15c554..2b6fb5a82f 100644
--- a/man/systemd-ask-password.xml
+++ b/man/systemd-ask-password.xml
@@ -67,7 +67,7 @@
     processes.</para>
 
     <para>The purpose of this tool is to query system-wide passwords
-    -- that is passwords not attached to a specific user account.
+    — that is passwords not attached to a specific user account.
     Examples include: unlocking encrypted hard disks when they are
     plugged in or at boot, entering an SSL certificate passphrase for
     web and VPN servers.</para>
diff --git a/man/systemd-journal-gatewayd.service.xml b/man/systemd-journal-gatewayd.service.xml
index e32ac26850..9ed85c3950 100644
--- a/man/systemd-journal-gatewayd.service.xml
+++ b/man/systemd-journal-gatewayd.service.xml
@@ -262,7 +262,7 @@
         <term><uri>boot</uri></term>
 
         <listitem><para>Limit events to the current boot of the system
-        (like <command>journalctl --this--boot</command>).</para></listitem>
+        (like <command>journalctl --this-boot</command>).</para></listitem>
       </varlistentry>
 
       <varlistentry>
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 6732b9d7be..a0376ed3e0 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -502,7 +502,7 @@
         host interface name and container interface name. The latter
         may be omitted in which case the container and host sides will
         be assigned the same name. This switch is independent of
-        <option>--network-veth</option>, and -- in contrast -- may be
+        <option>--network-veth</option>, and — in contrast — may be
         used multiple times, and allows configuration of the network
         interface names. Note that <option>--network-bridge=</option>
         has no effect on interfaces created with
diff --git a/man/systemd.special.xml b/man/systemd.special.xml
index 80c15b700d..14998b9647 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -742,7 +742,7 @@
           defined what that is supposed to mean, with one exception:
           at shutdown, a unit that is ordered after
           <filename>network.target</filename> will be stopped before
-          the network -- to whatever level it might be set up then --
+          the network — to whatever level it might be set up then —
           is shut down. It is hence useful when writing service files
           that require network access on shutdown, which should order
           themselves after this target, but not pull it in. Also see