X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fmachine-info.xml;h=c654daa856dd71be8bae4c0cb966075f03f8b210;hb=b12942e67ecbea0b852d4ab8df1d34b04e9853f8;hp=7f396aafdeecb248bef0e216fa2ee8ebbf1d19ab;hpb=e9dd9f9547350c7dc0473583b5c2228dc8f0ab76;p=elogind.git
diff --git a/man/machine-info.xml b/man/machine-info.xml
index 7f396aafd..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:
@@ -94,13 +94,13 @@
PRETTY_HOSTNAME=
A pretty
- human-readable UTF8 machine identifier
+ human-readable UTF-8 machine identifier
string. This should contain a name
like Lennart's
Laptop which is useful to
present to the user and does not
suffer by the syntax limitations of
- internet domain names. If possible the
+ internet domain names. If possible, the
internet hostname as configured in
/etc/hostname
should be kept similar to this
@@ -109,7 +109,7 @@
an Internet hostname of
lennarts-computer
might be a good choice. If this
- parameter is not set an application
+ parameter is not set, an application
should fall back to the Internet host
name for presentation
purposes.
@@ -122,7 +122,7 @@
this machine according to the XDG
Icon Naming Specification. If
- this parameter is not set an
+ this parameter is not set, an
application should fall back to
computer or a
similar icon name.
@@ -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