X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fmachine-info.xml;h=c654daa856dd71be8bae4c0cb966075f03f8b210;hb=203af57fcdced5debfc26e1083eaefa031e322f4;hp=ddf8f8b3d029a6cfa73b5b5bdc0637565c1ebe47;hpb=79640424059328268b9fb6c5fa8eb777b27a177e;p=elogind.git
diff --git a/man/machine-info.xml b/man/machine-info.xml
index ddf8f8b3d..c654daa85 100644
--- a/man/machine-info.xml
+++ b/man/machine-info.xml
@@ -55,7 +55,7 @@
Description
The /etc/machine-info file
- contains machine meta data.
+ contains machine metadata.
The basic file format of
machine-info is a
@@ -68,7 +68,7 @@
execution engine.
/etc/machine-info contains
- meta data about the machine that is set by the user or
+ metadata about the machine that is set by the user or
administrator.
Depending on the operating system other
@@ -84,7 +84,7 @@
Options
- The following machine meta data parameters may
+ The following machine metadata parameters may
be set using
/etc/machine-info:
@@ -138,7 +138,8 @@
laptop,
server,
tablet,
- handset, as well as
+ handset,
+ watch, as well as
the special chassis types
vm and
container for
@@ -156,8 +157,32 @@
available.
-
+
+ DEPLOYMENT=
+
+ Describes the system
+ deployment environment. One of the
+ following is suggested:
+ development,
+ integration,
+ staging,
+ production.
+
+
+
+ LOCATION=
+
+ Describes the system
+ location if applicable and
+ known. Takes a human-friendly,
+ free-form string. This may be as
+ generic as Berlin,
+ Germany or as specific as
+ Left Rack, 2nd
+ Shelf.
+
+
@@ -165,7 +190,8 @@
PRETTY_HOSTNAME="Lennart's Tablet"
ICON_NAME=computer-tablet
-CHASSIS=tablet
+CHASSIS=tablet
+DEPLOYMENT=production