summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorJóhann B. Guðmundsson <johannbg@gmail.com>2014-07-08 21:26:05 +0000
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-07-11 09:22:01 -0400
commit799298d6513e7d40125c19d46578bb870d047db4 (patch)
tree0e3b7a7c700ac3d4b266ba87ea30b26ab0783360 /man
parent1ed774956406941d4812a3fb4493d2915f130f12 (diff)
Add DEPLOYMENT to hostnamectl
[zj: remove the check against a fixed list of environments.]
Diffstat (limited to 'man')
-rw-r--r--man/hostnamectl.xml21
-rw-r--r--man/machine-info.xml17
2 files changed, 37 insertions, 1 deletions
diff --git a/man/hostnamectl.xml b/man/hostnamectl.xml
index a158e67519..99f984f2ce 100644
--- a/man/hostnamectl.xml
+++ b/man/hostnamectl.xml
@@ -231,6 +231,27 @@
</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>
+
+
</variablelist>
</refsect1>
diff --git a/man/machine-info.xml b/man/machine-info.xml
index 244e9b69cf..a2ad4e6d11 100644
--- a/man/machine-info.xml
+++ b/man/machine-info.xml
@@ -157,6 +157,20 @@
available.</para></listitem>
</varlistentry>
+ <varlistentry>
+ <term><varname>DEPLOYMENT=</varname></term>
+
+ <listitem><para>Describes the system
+ deployment environment. One of the
+ following is suggested:
+ <literal>development</literal>,
+ <literal>integration</literal>,
+ <literal>staging</literal>,
+ <literal>production</literal>.
+ </para></listitem>
+ </varlistentry>
+
+
</variablelist>
</refsect1>
@@ -166,7 +180,8 @@
<programlisting>PRETTY_HOSTNAME="Lennart's Tablet"
ICON_NAME=computer-tablet
-CHASSIS=tablet</programlisting>
+CHASSIS=tablet
+DEPLOYMENT=production</programlisting>
</refsect1>
<refsect1>