X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fhostnamectl.xml;h=de154020d6a29572cf1ff9c2211e0b8b0d302a04;hp=a158e67519c322ccba35a7992cc57f77b5befd3e;hb=ebf4e8013b2928fdcfa6008ee6559e8c7e1fd60b;hpb=1ed774956406941d4812a3fb4493d2915f130f12

diff --git a/man/hostnamectl.xml b/man/hostnamectl.xml
index a158e6751..de154020d 100644
--- a/man/hostnamectl.xml
+++ b/man/hostnamectl.xml
@@ -129,6 +129,7 @@
                         </varlistentry>
 
                         <xi:include href="user-system-options.xml" xpointer="host" />
+                        <xi:include href="user-system-options.xml" xpointer="machine" />
 
                         <xi:include href="standard-options.xml" xpointer="help" />
                         <xi:include href="standard-options.xml" xpointer="version" />
@@ -217,7 +218,8 @@
                                 <literal>server</literal>,
                                 <literal>tablet</literal>,
                                 <literal>handset</literal>,
-                                <literal>watch</literal>, as well as
+                                <literal>watch</literal>,
+                                <literal>embedded</literal> as well as
                                 the special chassis types
                                 <literal>vm</literal> and
                                 <literal>container</literal> for
@@ -231,6 +233,44 @@
                                 </listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><command>set-deployment <replaceable>ENVIRONMENT</replaceable></command></term>
+
+                                <listitem><para>Set the deployment
+                                environment
+                                description. <replaceable>ENVIRONMENT</replaceable>
+                                must be a single word without any
+                                control characters. One of the
+                                following is suggested:
+                                <literal>development</literal>,
+                                <literal>integration</literal>,
+                                <literal>staging</literal>,
+                                <literal>production</literal>.
+                                </para>
+
+                                <para>Pass an empty string to reset to
+                                the default empty value.</para>
+                                </listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><command>set-location <replaceable>LOCATION</replaceable></command></term>
+
+                                <listitem><para>Set the location
+                                string for the system, if it is
+                                known. <replaceable>LOCATION</replaceable>
+                                should be a human-friendly, free-form
+                                string describing the physical
+                                location of the system, if it is known
+                                and applicable. This may be as generic
+                                as <literal>Berlin, Germany</literal>
+                                or as specific as <literal>Left Rack,
+                                2nd Shelf</literal>.</para>
+
+                                <para>Pass an empty string to reset to
+                                the default empty value.</para>
+                                </listitem>
+                        </varlistentry>
                 </variablelist>
         </refsect1>