From ce0f1493c399178a3c7796415bfe5abd105ad610 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 11 Jul 2014 15:50:32 +0200
Subject: hostnamed: introduce new location machin-info field, too

---
 man/hostnamectl.xml  | 21 +++++++++++++++++++--
 man/machine-info.xml | 12 +++++++++++-
 2 files changed, 30 insertions(+), 3 deletions(-)

(limited to 'man')

diff --git a/man/hostnamectl.xml b/man/hostnamectl.xml
index 99f984f2ce..128d92f576 100644
--- a/man/hostnamectl.xml
+++ b/man/hostnamectl.xml
@@ -235,8 +235,8 @@
                                 <term><command>set-deployment <replaceable>ENVIRONMENT</replaceable></command></term>
 
                                 <listitem><para>Set the deployment
-                                environment description.
-                                <replaceable>ENVIRONMENT</replaceable>
+                                environment
+                                description. <replaceable>ENVIRONMENT</replaceable>
                                 must be a single word without any
                                 control characters. One of the
                                 following is suggested:
@@ -251,7 +251,24 @@
                                 </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>
 
diff --git a/man/machine-info.xml b/man/machine-info.xml
index a2ad4e6d11..c654daa856 100644
--- a/man/machine-info.xml
+++ b/man/machine-info.xml
@@ -170,9 +170,19 @@
                                 </para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><varname>LOCATION=</varname></term>
 
+                                <listitem><para>Describes the system
+                                location if applicable and
+                                known. Takes a human-friendly,
+                                free-form string. This may be as
+                                generic as <literal>Berlin,
+                                Germany</literal> or as specific as
+                                <literal>Left Rack, 2nd
+                                Shelf</literal>.</para></listitem>
+                        </varlistentry>
                 </variablelist>
-
         </refsect1>
 
         <refsect1>
-- 
cgit v1.2.3-54-g00ecf