X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fhostnamectl.xml;h=4bc05f52ce79cc4e1088c817eea4903b9c2e2c1c;hp=d7a9e92879b45b042d7a68385dedc1bbf86cbbfa;hb=3c8fa0fd0f99996088e42c5d48e164fdae4ada40;hpb=e9dd9f9547350c7dc0473583b5c2228dc8f0ab76

diff --git a/man/hostnamectl.xml b/man/hostnamectl.xml
index d7a9e9287..4bc05f52c 100644
--- a/man/hostnamectl.xml
+++ b/man/hostnamectl.xml
@@ -49,7 +49,9 @@
 
         <refsynopsisdiv>
                 <cmdsynopsis>
-                        <command>hostnamectl <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="req">COMMAND</arg></command>
+                        <command>hostnamectl</command>
+                        <arg choice="opt" rep="repeat">OPTIONS</arg>
+                        <arg choice="req">COMMAND</arg>
                 </cmdsynopsis>
         </refsynopsisdiv>
 
@@ -75,13 +77,13 @@
                 <para>Note that the pretty hostname has little
                 restrictions on the characters used, while the static
                 and transient hostnames are limited to the usually
-                accepted characters of internet domain names.</para>
+                accepted characters of Internet domain names.</para>
 
                 <para>The static hostname is stored in
                 <filename>/etc/hostname</filename>, see
                 <citerefentry><refentrytitle>hostname</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                 for more information. The pretty hostname, chassis
-                type and icon name are stored in
+                type, and icon name are stored in
                 <filename>/etc/machine-info</filename>, see
                 <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
         </refsect1>
@@ -110,7 +112,7 @@
                         <varlistentry>
                                 <term><option>--no-ask-password</option></term>
 
-                                <listitem><para>Don't query the user
+                                <listitem><para>Do not query the user
                                 for authentication for privileged
                                 operations.</para></listitem>
                         </varlistentry>
@@ -129,9 +131,9 @@
 
                                 <listitem><para>Execute the operation
                                 remotely. Specify a hostname, or
-                                username and hostname separated by @,
+                                username and hostname separated by <literal>@</literal>,
                                 to connect to. This will use SSH to
-                                talk to a remote
+                                talk to the remote
                                 system.</para></listitem>
                         </varlistentry>
 
@@ -141,11 +143,20 @@
                                 <term><option>--pretty</option></term>
 
                                 <listitem><para>If
-                                <command>set-hostname</command> is
-                                invoked and one or more of these
-                                options are passed, only the selected
-                                hostname(s) is/are
-                                updated.</para></listitem>
+                                <command>status</command> is used (or
+                                no explicit command is given) and one
+                                of those fields is given,
+                                <command>hostnamectl</command> will
+                                print out just this selected
+                                hostname.</para>
+
+                                <para>If used with
+                                <command>set-hostname</command>, only
+                                the selected hostname(s) will be
+                                updated. When more than one of those
+                                options is used, all the specified
+                                hostnames will be updated.
+                                </para></listitem>
                         </varlistentry>
                 </variablelist>
 
@@ -178,20 +189,21 @@
                                 hostname will be simplified in regards
                                 to the character set used before the
                                 latter are updated. This is done by
-                                replacing spaces with "-" and removing
+                                replacing spaces with
+                                <literal>-</literal> and removing
                                 special characters. This ensures that
                                 the pretty and the static hostname are
                                 always closely related while still
                                 following the validity rules of the
                                 specific name. This simplification of
                                 the hostname string is not done if
-                                only the transient and/or static
-                                hostnames are set, and the pretty
-                                hostname is left untouched. Pass the
-                                empty string "" as the hostname to
-                                reset the selected hostnames to their
-                                default (usually "localhost").
-                                </para></listitem>
+                                only the transient and/or static host
+                                names are set, and the pretty host
+                                name is left untouched. Pass the empty
+                                string <literal></literal> as the
+                                hostname to reset the selected
+                                hostnames to their default (usually
+                                <literal>localhost</literal>).</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
@@ -243,7 +255,7 @@
         <refsect1>
                 <title>Exit status</title>
 
-                <para>On success 0 is returned, a non-zero failure
+                <para>On success, 0 is returned, a non-zero failure
                 code otherwise.</para>
         </refsect1>