Skip to content

Commit

Permalink
man: use unicode ellipsis in more places
Browse files Browse the repository at this point in the history
As requested in
systemd#4864 (review).

docbook will substitute triple dots for the ellipsis in man output, so this has
no effect on the troff output, only on HTML, making it infinitesimally nicer.

In some places we show output from programs, which use dots, and those places
should not be changed. In some tables, the alignment would change if dots were
changed to the ellipsis which is only one character. Since docbook replaces the
ellipsis automatically, we should leave those be. This patch changes all other
places.
  • Loading branch information
keszybz committed Dec 11, 2016
1 parent 15ffcc3 commit 1eecafb
Show file tree
Hide file tree
Showing 29 changed files with 135 additions and 135 deletions.
8 changes: 4 additions & 4 deletions man/journalctl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@
<term><option>--quiet</option></term>

<listitem><para>Suppresses all info messages
(i.e. "-- Logs begin at ...", "-- Reboot --"),
(i.e. "-- Logs begin at ", "-- Reboot --"),
any warning messages regarding
inaccessible system journals when run as a normal
user.</para></listitem>
Expand Down Expand Up @@ -573,7 +573,7 @@

<listitem><para>The cursor is shown after the last entry after
two dashes:</para>
<programlisting>-- cursor: s=0639...</programlisting>
<programlisting>-- cursor: s=0639</programlisting>
<para>The format of the cursor is private
and subject to change.</para></listitem>
</varlistentry>
Expand Down Expand Up @@ -731,7 +731,7 @@

<varlistentry>
<term><option>--list-catalog
<optional><replaceable>128-bit-ID...</replaceable></optional>
<optional><replaceable>128-bit-ID</replaceable></optional>
</option></term>

<listitem><para>List the contents of the message catalog as a
Expand All @@ -745,7 +745,7 @@

<varlistentry>
<term><option>--dump-catalog
<optional><replaceable>128-bit-ID...</replaceable></optional>
<optional><replaceable>128-bit-ID</replaceable></optional>
</option></term>

<listitem><para>Show the contents of the message catalog, with
Expand Down
2 changes: 1 addition & 1 deletion man/journald.conf.xml
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@
rotated journal files are kept as history.</para>

<para>Specify values in bytes or use K, M, G, T, P, E as
units for the specified sizes (equal to 1024, 1024², ... bytes).
units for the specified sizes (equal to 1024, 1024², bytes).
Note that size limits are enforced synchronously when journal
files are extended, and no explicit rotation step triggered by
time is needed.</para>
Expand Down
2 changes: 1 addition & 1 deletion man/localectl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
</varlistentry>

<varlistentry>
<term><command>set-locale LOCALE...</command></term>
<term><command>set-locale LOCALE</command></term>

<listitem><para>Set the system locale. This takes one or more
assignments such as "LANG=de_DE.utf8",
Expand Down
36 changes: 18 additions & 18 deletions man/loginctl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
</varlistentry>

<varlistentry>
<term><command>session-status</command> <optional><replaceable>ID</replaceable>...</optional></term>
<term><command>session-status</command> <optional><replaceable>ID</replaceable></optional></term>

<listitem><para>Show terse runtime status information about
one or more sessions, followed by the most recent log data
Expand All @@ -204,7 +204,7 @@
</varlistentry>

<varlistentry>
<term><command>show-session</command> <optional><replaceable>ID</replaceable>...</optional></term>
<term><command>show-session</command> <optional><replaceable>ID</replaceable></optional></term>

<listitem><para>Show properties of one or more sessions or the
manager itself. If no argument is specified, properties of the
Expand All @@ -229,8 +229,8 @@
</varlistentry>

<varlistentry>
<term><command>lock-session</command> <optional><replaceable>ID</replaceable>...</optional></term>
<term><command>unlock-session</command> <optional><replaceable>ID</replaceable>...</optional></term>
<term><command>lock-session</command> <optional><replaceable>ID</replaceable></optional></term>
<term><command>unlock-session</command> <optional><replaceable>ID</replaceable></optional></term>

<listitem><para>Activates/deactivates the screen lock on one
or more sessions, if the session supports it. Takes one or
Expand All @@ -248,15 +248,15 @@
</varlistentry>

<varlistentry>
<term><command>terminate-session</command> <replaceable>ID</replaceable>...</term>
<term><command>terminate-session</command> <replaceable>ID</replaceable></term>

<listitem><para>Terminates a session. This kills all processes
of the session and deallocates all resources attached to the
session. </para></listitem>
</varlistentry>

<varlistentry>
<term><command>kill-session</command> <replaceable>ID</replaceable>...</term>
<term><command>kill-session</command> <replaceable>ID</replaceable></term>

<listitem><para>Send a signal to one or more processes of the
session. Use <option>--kill-who=</option> to select which
Expand All @@ -274,7 +274,7 @@
</varlistentry>

<varlistentry>
<term><command>user-status</command> <optional><replaceable>USER</replaceable>...</optional></term>
<term><command>user-status</command> <optional><replaceable>USER</replaceable></optional></term>

<listitem><para>Show terse runtime status information about
one or more logged in users, followed by the most recent log
Expand All @@ -288,7 +288,7 @@
</varlistentry>

<varlistentry>
<term><command>show-user</command> <optional><replaceable>USER</replaceable>...</optional></term>
<term><command>show-user</command> <optional><replaceable>USER</replaceable></optional></term>

<listitem><para>Show properties of one or more users or the
manager itself. If no argument is specified, properties of the
Expand All @@ -303,8 +303,8 @@
</varlistentry>

<varlistentry>
<term><command>enable-linger</command> <optional><replaceable>USER</replaceable>...</optional></term>
<term><command>disable-linger</command> <optional><replaceable>USER</replaceable>...</optional></term>
<term><command>enable-linger</command> <optional><replaceable>USER</replaceable></optional></term>
<term><command>disable-linger</command> <optional><replaceable>USER</replaceable></optional></term>

<listitem><para>Enable/disable user lingering for one or more
users. If enabled for a specific user, a user manager is
Expand All @@ -320,15 +320,15 @@
</varlistentry>

<varlistentry>
<term><command>terminate-user</command> <replaceable>USER</replaceable>...</term>
<term><command>terminate-user</command> <replaceable>USER</replaceable></term>

<listitem><para>Terminates all sessions of a user. This kills
all processes of all sessions of the user and deallocates all
runtime resources attached to the user.</para></listitem>
</varlistentry>

<varlistentry>
<term><command>kill-user</command> <replaceable>USER</replaceable>...</term>
<term><command>kill-user</command> <replaceable>USER</replaceable></term>

<listitem><para>Send a signal to all processes of a user. Use
<option>--signal=</option> to select the signal to send.
Expand All @@ -345,7 +345,7 @@
</varlistentry>

<varlistentry>
<term><command>seat-status</command> <optional><replaceable>NAME</replaceable>...</optional></term>
<term><command>seat-status</command> <optional><replaceable>NAME</replaceable></optional></term>

<listitem><para>Show terse runtime status information about
one or more seats. Takes one or more seat names as parameters.
Expand All @@ -357,7 +357,7 @@
</varlistentry>

<varlistentry>
<term><command>show-seat</command> <optional><replaceable>NAME</replaceable>...</optional></term>
<term><command>show-seat</command> <optional><replaceable>NAME</replaceable></optional></term>

<listitem><para>Show properties of one or more seats or the
manager itself. If no argument is specified, properties of the
Expand All @@ -372,7 +372,7 @@
</varlistentry>

<varlistentry>
<term><command>attach</command> <replaceable>NAME</replaceable> <replaceable>DEVICE</replaceable>...</term>
<term><command>attach</command> <replaceable>NAME</replaceable> <replaceable>DEVICE</replaceable></term>

<listitem><para>Persistently attach one or more devices to a
seat. The devices should be specified via device paths in the
Expand All @@ -396,7 +396,7 @@
</varlistentry>

<varlistentry>
<term><command>terminate-seat</command> <replaceable>NAME</replaceable>...</term>
<term><command>terminate-seat</command> <replaceable>NAME</replaceable></term>

<listitem><para>Terminates all sessions on a seat. This kills
all processes of all sessions on the seat and deallocates all
Expand Down Expand Up @@ -426,9 +426,9 @@ fatima (1005)
Sessions: 5 *3
Unit: user-1005.slice
├─user@1005.service
...
├─session-3.scope
...
└─session-5.scope
├─3473 login -- fatima
└─3515 -zsh
Expand Down
28 changes: 14 additions & 14 deletions man/machinectl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@
</varlistentry>

<varlistentry>
<term><command>status</command> <replaceable>NAME</replaceable>...</term>
<term><command>status</command> <replaceable>NAME</replaceable></term>

<listitem><para>Show runtime status information about
one or more virtual machines and containers, followed by the
Expand All @@ -341,7 +341,7 @@
</varlistentry>

<varlistentry>
<term><command>show</command> [<replaceable>NAME</replaceable>...]</term>
<term><command>show</command> [<replaceable>NAME</replaceable>]</term>

<listitem><para>Show properties of one or more registered virtual machines or containers or the manager
itself. If no argument is specified, properties of the manager will be shown. If a NAME is specified,
Expand All @@ -353,7 +353,7 @@
</varlistentry>

<varlistentry>
<term><command>start</command> <replaceable>NAME</replaceable>...</term>
<term><command>start</command> <replaceable>NAME</replaceable></term>

<listitem><para>Start a container as a system service, using
<citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
Expand Down Expand Up @@ -410,7 +410,7 @@
</varlistentry>

<varlistentry>
<term><command>shell</command> [[<replaceable>NAME</replaceable>@]<replaceable>NAME</replaceable> [<replaceable>PATH</replaceable> [<replaceable>ARGUMENTS</replaceable>...]]] </term>
<term><command>shell</command> [[<replaceable>NAME</replaceable>@]<replaceable>NAME</replaceable> [<replaceable>PATH</replaceable> [<replaceable>ARGUMENTS</replaceable>]]] </term>

<listitem><para>Open an interactive shell session in a
container or on the local host. The first argument refers to
Expand Down Expand Up @@ -449,8 +449,8 @@
</varlistentry>

<varlistentry>
<term><command>enable</command> <replaceable>NAME</replaceable>...</term>
<term><command>disable</command> <replaceable>NAME</replaceable>...</term>
<term><command>enable</command> <replaceable>NAME</replaceable></term>
<term><command>disable</command> <replaceable>NAME</replaceable></term>

<listitem><para>Enable or disable a container as a system
service to start at system boot, using
Expand All @@ -463,7 +463,7 @@
</varlistentry>

<varlistentry>
<term><command>poweroff</command> <replaceable>NAME</replaceable>...</term>
<term><command>poweroff</command> <replaceable>NAME</replaceable></term>

<listitem><para>Power off one or more containers. This will
trigger a reboot by sending SIGRTMIN+4 to the container's init
Expand All @@ -478,7 +478,7 @@
</varlistentry>

<varlistentry>
<term><command>reboot</command> <replaceable>NAME</replaceable>...</term>
<term><command>reboot</command> <replaceable>NAME</replaceable></term>

<listitem><para>Reboot one or more containers. This will
trigger a reboot by sending SIGINT to the container's init
Expand All @@ -488,7 +488,7 @@
</varlistentry>

<varlistentry>
<term><command>terminate</command> <replaceable>NAME</replaceable>...</term>
<term><command>terminate</command> <replaceable>NAME</replaceable></term>

<listitem><para>Immediately terminates a virtual machine or
container, without cleanly shutting it down. This kills all
Expand All @@ -499,7 +499,7 @@
</varlistentry>

<varlistentry>
<term><command>kill</command> <replaceable>NAME</replaceable>...</term>
<term><command>kill</command> <replaceable>NAME</replaceable></term>

<listitem><para>Send a signal to one or more processes of the
virtual machine or container. This means processes as seen by
Expand Down Expand Up @@ -568,7 +568,7 @@
</varlistentry>

<varlistentry>
<term><command>image-status</command> [<replaceable>NAME</replaceable>...]</term>
<term><command>image-status</command> [<replaceable>NAME</replaceable>]</term>

<listitem><para>Show terse status information about one or
more container or VM images. This function is intended to
Expand All @@ -578,7 +578,7 @@
</varlistentry>

<varlistentry>
<term><command>show-image</command> [<replaceable>NAME</replaceable>...]</term>
<term><command>show-image</command> [<replaceable>NAME</replaceable>]</term>

<listitem><para>Show properties of one or more registered
virtual machine or container images, or the manager itself. If
Expand Down Expand Up @@ -630,7 +630,7 @@
</varlistentry>

<varlistentry>
<term><command>remove</command> <replaceable>NAME</replaceable>...</term>
<term><command>remove</command> <replaceable>NAME</replaceable></term>

<listitem><para>Removes one or more container or VM images.
The special image <literal>.host</literal>, which refers to
Expand Down Expand Up @@ -849,7 +849,7 @@
</varlistentry>

<varlistentry>
<term><command>cancel-transfers</command> <replaceable>ID</replaceable>...</term>
<term><command>cancel-transfers</command> <replaceable>ID</replaceable></term>

<listitem><para>Aborts a download, import or export of the
container or VM image with the specified ID. To list ongoing
Expand Down
6 changes: 3 additions & 3 deletions man/networkctl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<varlistentry>
<term>
<command>list</command>
<optional><replaceable>LINK...</replaceable></optional>
<optional><replaceable>LINK</replaceable></optional>
</term>

<listitem>
Expand All @@ -122,7 +122,7 @@
<varlistentry>
<term>
<command>status</command>
<optional><replaceable>LINK...</replaceable></optional>
<optional><replaceable>LINK</replaceable></optional>
</term>

<listitem>
Expand Down Expand Up @@ -150,7 +150,7 @@
<varlistentry>
<term>
<command>lldp</command>
<optional><replaceable>LINK...</replaceable></optional>
<optional><replaceable>LINK</replaceable></optional>
</term>

<listitem>
Expand Down
6 changes: 3 additions & 3 deletions man/sd_bus_error.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<funcsynopsisinfo>typedef struct {
const char *name;
const char *message;
...
} sd_bus_error;</funcsynopsisinfo>

<para>
Expand All @@ -95,7 +95,7 @@
<paramdef>sd_bus_error *<parameter>e</parameter></paramdef>
<paramdef>const char *<parameter>name</parameter></paramdef>
<paramdef>const char *<parameter>format</parameter></paramdef>
<paramdef>...</paramdef>
<paramdef></paramdef>
</funcprototype>

<funcprototype>
Expand All @@ -116,7 +116,7 @@
<paramdef>sd_bus_error *<parameter>e</parameter></paramdef>
<paramdef>int <parameter>error</parameter></paramdef>
<paramdef>const char *<parameter>format</parameter></paramdef>
<paramdef>...</paramdef>
<paramdef></paramdef>
</funcprototype>

<funcprototype>
Expand Down
2 changes: 1 addition & 1 deletion man/sd_bus_error_add_map.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<funcsynopsisinfo>typedef struct {
const char *name;
int code;
...
} sd_bus_error_map;</funcsynopsisinfo>

</funcsynopsis>
Expand Down
4 changes: 2 additions & 2 deletions man/sd_bus_message_append.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<funcdef>int sd_bus_message_append</funcdef>
<paramdef>sd_bus_message *<parameter>m</parameter></paramdef>
<paramdef>const char *<parameter>types</parameter></paramdef>
<paramdef>...</paramdef>
<paramdef></paramdef>
</funcprototype>
</funcsynopsis>
</refsynopsisdiv>
Expand Down Expand Up @@ -198,7 +198,7 @@ dictionary ::= "a" "{" basic_type complete_type "}"
</para>

<programlisting>sd_bus_message *m;
...
sd_bus_message_append(m, "s", "a string");</programlisting>

<para>Append all types of integers:</para>
Expand Down
Loading

0 comments on commit 1eecafb

Please sign in to comment.