man: update systemd-nspawn regarding new --slice= logic

[elogind.git] / man / hostnamectl.xml

diff --git a/man/hostnamectl.xml b/man/hostnamectl.xml
index 9efe22011983674b4d187728c843186e55811e1f..f28e430a421bda3b0977982e2e1e883e82c1a627 100644 (file)
--- a/man/hostnamectl.xml
+++ b/man/hostnamectl.xml
@@ -60,9 +60,9 @@
                 query and change the system hostname and related
                 settings.</para>
 
                 query and change the system hostname and related
                 settings.</para>
 

-                <para>This tool distinguishes three different host
-                names: the high-level "pretty" hostname which might
-                include all kinds of special characters
+                <para>This tool distinguishes three different
+                hostnames: the high-level "pretty" hostname which
+                might include all kinds of special characters

                 (e.g. "Lennart's Laptop"), the static hostname which
                 is used to initialize the kernel hostname at boot
                 (e.g. "lennarts-laptop"), and the transient hostname
                 (e.g. "Lennart's Laptop"), the static hostname which
                 is used to initialize the kernel hostname at boot
                 (e.g. "lennarts-laptop"), and the transient hostname


@@ -75,12 +75,12 @@
                 <para>Note that the pretty hostname has little
                 restrictions on the characters used, while the static
                 and transient hostnames are limited to the usually
                 <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 host name is stored in
+                <para>The static hostname is stored in

                 <filename>/etc/hostname</filename>, see
                 <citerefentry><refentrytitle>hostname</refentrytitle><manvolnum>5</manvolnum></citerefentry>
                 <filename>/etc/hostname</filename>, see
                 <citerefentry><refentrytitle>hostname</refentrytitle><manvolnum>5</manvolnum></citerefentry>

-                for more information. The pretty host name, chassis
+                for more information. The pretty hostname, chassis

                 type and icon name are stored in
                 <filename>/etc/machine-info</filename>, see
                 <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
                 type and icon name are stored in
                 <filename>/etc/machine-info</filename>, see
                 <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>


@@ -110,18 +110,26 @@
                         <varlistentry>
                                 <term><option>--no-ask-password</option></term>
 
                         <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>
 
                                 for authentication for privileged
                                 operations.</para></listitem>
                         </varlistentry>
 

+                        <varlistentry>
+                                <term><option>-P</option></term>
+                                <term><option>--privileged</option></term>
+
+                                <listitem><para>Acquire privileges via PolicyKit
+                                before executing the operation.</para></listitem>
+                        </varlistentry>
+

                         <varlistentry>
                                 <term><option>-H</option></term>
                                 <term><option>--host</option></term>
 
                                 <listitem><para>Execute the operation
                                 remotely. Specify a hostname, or
                         <varlistentry>
                                 <term><option>-H</option></term>
                                 <term><option>--host</option></term>
 
                                 <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
                                 system.</para></listitem>
                                 to connect to. This will use SSH to
                                 talk to a remote
                                 system.</para></listitem>


@@ -135,8 +143,8 @@
                                 <listitem><para>If
                                 <command>set-hostname</command> is
                                 invoked and one or more of these
                                 <listitem><para>If
                                 <command>set-hostname</command> is
                                 invoked and one or more of these

-                                options are passed only the selected
-                                hostnames is
+                                options are passed, only the selected
+                                hostname(s) is/are

                                 updated.</para></listitem>
                         </varlistentry>
                 </variablelist>
                                 updated.</para></listitem>
                         </varlistentry>
                 </variablelist>


@@ -156,34 +164,35 @@
                                 <term><command>set-hostname [NAME]</command></term>
 
                                 <listitem><para>Set the system
                                 <term><command>set-hostname [NAME]</command></term>
 
                                 <listitem><para>Set the system

-                                hostname. By default this will alter
+                                hostname. By default, this will alter

                                 the pretty, the static, and the
                                 the pretty, the static, and the

-                                transient hostname alike, however if
+                                transient hostname alike; however, if

                                 one or more of
                                 <option>--static</option>,
                                 <option>--transient</option>,
                                 one or more of
                                 <option>--static</option>,
                                 <option>--transient</option>,

-                                <option>--pretty</option> are used
+                                <option>--pretty</option> are used,

                                 only the selected hostnames are
                                 changed. If the pretty hostname is
                                 being set, and static or transient are
                                 only the selected hostnames are
                                 changed. If the pretty hostname is
                                 being set, and static or transient are

-                                being set as well the specified host
-                                name will be simplified in regards to
-                                the character set used before the
+                                being set as well, the specified
+                                hostname will be simplified in regards
+                                to the character set used before the

                                 latter are updated. This is done by
                                 latter are updated. This is done by

-                                replacing spaces by "-" and removing
+                                replacing spaces with
+                                <literal>-</literal> and removing

                                 special characters. This ensures that
                                 special characters. This ensures that

-                                the pretty and the static hostname
-                                are always closely related while still
+                                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 host
                                 names are set, and the pretty host
                                 name is left untouched. Pass the empty
                                 following the validity rules of the
                                 specific name. This simplification of
                                 the hostname string is not done if
                                 only the transient and/or static host
                                 names are set, and the pretty host
                                 name is left untouched. Pass the empty

-                                string "" as hostname to reset the
-                                selected hostnames to their default
-                                (usually
-                                "localhost").</para></listitem>
+                                string <literal></literal> as the
+                                hostname to reset the selected
+                                hostnames to their default (usually
+                                <literal>localhost</literal>).</para></listitem>

                         </varlistentry>
 
                         <varlistentry>
                         </varlistentry>
 
                         <varlistentry>


@@ -198,7 +207,7 @@
                                 Naming Specification</ulink>. Pass an
                                 empty string to this operation to
                                 reset the icon name to the default
                                 Naming Specification</ulink>. Pass an
                                 empty string to this operation to
                                 reset the icon name to the default

-                                value which is determined from chassis
+                                value, which is determined from chassis

                                 type (see below) and possibly other
                                 parameters.</para></listitem>
                         </varlistentry>
                                 type (see below) and possibly other
                                 parameters.</para></listitem>
                         </varlistentry>