man: fix grammatical errors and other formatting issues

[elogind.git] / man / os-release.xml

diff --git a/man/os-release.xml b/man/os-release.xml
index 0d7925f07a2a14810960493cc9e6b64e346212bb..c1dd62f7156d2c1c978eab7229d522d0681cf565 100644 (file)
--- a/man/os-release.xml
+++ b/man/os-release.xml
@@ -9,16 +9,16 @@
   Copyright 2010 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
   Copyright 2010 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it

-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or

   (at your option) any later version.
 
   systemd is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   (at your option) any later version.
 
   systemd is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

-  General Public License for more details.
+  Lesser General Public License for more details.

 
 

-  You should have received a copy of the GNU General Public License
+  You should have received a copy of the GNU Lesser General Public License

   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 


@@ -62,7 +62,7 @@
                 list of environment-like shell-compatible variable
                 assignments. It is possible to source the
                 configuration from shell scripts, however, beyond mere
                 list of environment-like shell-compatible variable
                 assignments. It is possible to source the
                 configuration from shell scripts, however, beyond mere

-                variable assignments no shell features are supported
+                variable assignments, no shell features are supported

                 (this means variable expansion is explicitly not
                 supported), allowing applications to read the file
                 without implementing a shell compatible execution
                 (this means variable expansion is explicitly not
                 supported), allowing applications to read the file
                 without implementing a shell compatible execution


@@ -72,7 +72,7 @@
                 a-z, 0-9. All strings should be in UTF-8 format, and
                 non-printable characters should not be used. If double
                 or single quotes or backslashes are to be used within
                 a-z, 0-9. All strings should be in UTF-8 format, and
                 non-printable characters should not be used. If double
                 or single quotes or backslashes are to be used within

-                variable assignments they should be escaped with
+                variable assignments, they should be escaped with

                 backslashes, following shell style. It is not
                 supported to concatenate multiple individually quoted
                 strings. Lines beginning with "#" shall be ignored as
                 backslashes, following shell style. It is not
                 supported to concatenate multiple individually quoted
                 strings. Lines beginning with "#" shall be ignored as


@@ -85,6 +85,11 @@
                 <para>As this file only encodes names and identifiers
                 it should not be localized.</para>
 
                 <para>As this file only encodes names and identifiers
                 it should not be localized.</para>
 

+                <para>The file <filename>/etc/os-release</filename> might
+                be a symlink to another file, but it is important that
+                the file is available from earliest boot on, and hence
+                must be located on the root file system.</para>
+

                 <para>For a longer rationale for
                 <filename>/etc/os-release</filename> please refer to
                 the <ulink
                 <para>For a longer rationale for
                 <filename>/etc/os-release</filename> please refer to
                 the <ulink


@@ -105,7 +110,7 @@
                                 <listitem><para>A string identifying
                                 the operating system, without a
                                 version component, and suitable for
                                 <listitem><para>A string identifying
                                 the operating system, without a
                                 version component, and suitable for

-                                presentation to the user. If not set
+                                presentation to the user. If not set,

                                 defaults to
                                 <literal>NAME=Linux</literal>. Example:
                                 <literal>NAME=Fedora</literal> or
                                 defaults to
                                 <literal>NAME=Linux</literal>. Example:
                                 <literal>NAME=Fedora</literal> or


@@ -137,8 +142,8 @@
                                 identifying the operating system,
                                 excluding any version information and
                                 suitable for processing by scripts or
                                 identifying the operating system,
                                 excluding any version information and
                                 suitable for processing by scripts or

-                                usage in generated file names. If not
-                                set defaults to
+                                usage in generated filenames. If not
+                                set, defaults to

                                 <literal>ID=linux</literal>. Example:
                                 <literal>ID=fedora</literal> or
                                 <literal>ID=debian</literal>.</para></listitem>
                                 <literal>ID=linux</literal>. Example:
                                 <literal>ID=fedora</literal> or
                                 <literal>ID=debian</literal>.</para></listitem>


@@ -150,19 +155,23 @@
                                 <listitem><para>A space-separated list
                                 of operating system identifiers in the
                                 same syntax as the
                                 <listitem><para>A space-separated list
                                 of operating system identifiers in the
                                 same syntax as the

-                                <varname>ID=</varname> setting. Should
+                                <varname>ID=</varname> setting. It should

                                 list identifiers of operating systems
                                 that are closely related to the local
                                 operating system in regards to
                                 packaging and programming interfaces,
                                 for example listing one or more
                                 list identifiers of operating systems
                                 that are closely related to the local
                                 operating system in regards to
                                 packaging and programming interfaces,
                                 for example listing one or more

-                                distribution identifiers the local
-                                distribution is a derivative
-                                from. Build scripts and similar should
-                                check this variable if they need to
-                                identify the local operating system
-                                and the value of
-                                <varname>ID=</varname> is not
+                                OS identifiers the local
+                                OS is a derivative from. An
+                                OS should generally only list other OS
+                                identifiers it itself is a derivative
+                                of, and not any OSes that
+                                are derived from it, though symmetric
+                                relationships are possible. Build
+                                scripts and similar should check this
+                                variable if they need to identify the
+                                local operating system and the value
+                                of <varname>ID=</varname> is not

                                 recognized. Operating systems should
                                 be listed in order of how closely the
                                 local operating system relates to the
                                 recognized. Operating systems should
                                 be listed in order of how closely the
                                 local operating system relates to the


@@ -170,11 +179,11 @@
                                 closest. This field is
                                 optional. Example: for an operating
                                 system with
                                 closest. This field is
                                 optional. Example: for an operating
                                 system with

-                                <literal>ID=centos</literal> an
+                                <literal>ID=centos</literal>, an

                                 assignment of <literal>ID_LIKE="rhel
                                 fedora"</literal> would be
                                 assignment of <literal>ID_LIKE="rhel
                                 fedora"</literal> would be

-                                appropriate. For an operating systemd
-                                with <literal>ID=ubuntu</literal> an
+                                appropriate. For an operating system
+                                with <literal>ID=ubuntu</literal>, an

                                 assignment of
                                 <literal>ID_LIKE=debian</literal> is
                                 appropriate.</para></listitem>
                                 assignment of
                                 <literal>ID_LIKE=debian</literal> is
                                 appropriate.</para></listitem>


@@ -190,7 +199,7 @@
                                 system version, excluding any OS name
                                 information or release code name, and
                                 suitable for processing by scripts or
                                 system version, excluding any OS name
                                 information or release code name, and
                                 suitable for processing by scripts or

-                                usage in generated file names. This
+                                usage in generated filenames. This

                                 field is optional. Example:
                                 <literal>VERSION_ID=17</literal> or
                                 <literal>VERSION_ID=11.04</literal>.</para></listitem>
                                 field is optional. Example:
                                 <literal>VERSION_ID=17</literal> or
                                 <literal>VERSION_ID=11.04</literal>.</para></listitem>


@@ -204,7 +213,7 @@
                                 presentation to the user. May or may
                                 not contain a release code name or OS
                                 version of some kind, as suitable. If
                                 presentation to the user. May or may
                                 not contain a release code name or OS
                                 version of some kind, as suitable. If

-                                not set defaults to
+                                not set, defaults to

                                 <literal>PRETTY_NAME="Linux"</literal>. Example:
                                 <literal>PRETTY_NAME="Fedora 17 (Beefy
                                 Miracle)"</literal>.</para></listitem>
                                 <literal>PRETTY_NAME="Linux"</literal>. Example:
                                 <literal>PRETTY_NAME="Fedora 17 (Beefy
                                 Miracle)"</literal>.</para></listitem>


@@ -215,7 +224,7 @@
 
                                 <listitem><para>A suggested
                                 presentation color when showing the
 
                                 <listitem><para>A suggested
                                 presentation color when showing the

-                                distribution name on the console. This
+                                OS name on the console. This

                                 should be specified as string suitable
                                 for inclusion in the ESC [ m
                                 ANSI/ECMA-48 escape code for setting
                                 should be specified as string suitable
                                 for inclusion in the ESC [ m
                                 ANSI/ECMA-48 escape code for setting


@@ -232,7 +241,7 @@
 
                                 <listitem><para>A CPE name for the
                                 operating system, following the <ulink
 
                                 <listitem><para>A CPE name for the
                                 operating system, following the <ulink

-                                url="http://cpe.mitre.org/specification/">Common
+                                url="https://cpe.mitre.org/specification/">Common

                                 Platform Enumeration
                                 Specification</ulink> as proposed by
                                 the MITRE Corporation. This field
                                 Platform Enumeration
                                 Specification</ulink> as proposed by
                                 the MITRE Corporation. This field


@@ -240,19 +249,99 @@
                                 <literal>CPE_NAME="cpe:/o:fedoraproject:fedora:17"</literal>
                                 </para></listitem>
                         </varlistentry>
                                 <literal>CPE_NAME="cpe:/o:fedoraproject:fedora:17"</literal>
                                 </para></listitem>
                         </varlistentry>

+
+                        <varlistentry>
+                                <term><varname>HOME_URL=</varname></term>
+                                <term><varname>SUPPORT_URL=</varname></term>
+                                <term><varname>BUG_REPORT_URL=</varname></term>
+
+                                <listitem><para>Links to resources on
+                                the Internet related the operating
+                                system. <varname>HOME_URL=</varname>
+                                should refer to the homepage of the
+                                operating system, or alternatively
+                                some homepage of the specific version
+                                of the operating
+                                system. <varname>SUPPORT_URL=</varname>
+                                should refer to the main support page
+                                for the operating system, if there is
+                                any. This is primarily intended for
+                                operating systems which vendors
+                                provide support
+                                for. <varname>BUG_REPORT_URL=</varname>
+                                should refer to the main bug reporting
+                                page for the operating system, if
+                                there is any. This is primarily
+                                intended for operating systems that
+                                rely on community QA. These settings
+                                are optional, and providing only some
+                                of these settings is common. These
+                                URLs are intended to be exposed in
+                                "About this system" UIs behind links
+                                with captions such as "About this
+                                Operating System", "Obtain Support",
+                                and "Report a Bug". The values should
+                                be in <ulink
+                                url="https://tools.ietf.org/html/rfc3986">RFC3986
+                                format</ulink>, and should be
+                                <literal>http:</literal> or
+                                <literal>https:</literal> URLs, and
+                                possibly <literal>mailto:</literal> or
+                                <literal>tel:</literal>. Only one URL
+                                shall be listed in each setting. If
+                                multiple resources need to be
+                                referenced, it is recommended to
+                                provide an online landing page linking
+                                all available resources. Examples:
+                                <literal>HOME_URL="https://fedoraproject.org/"</literal>
+                                and
+                                <literal>BUG_REPORT_URL="https://bugzilla.redhat.com/"</literal></para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><varname>BUILD_ID=</varname></term>
+
+                                <listitem><para>A string uniquely
+                                identifying the system image used as
+                                the origin for a distribution (it is
+                                not updated with system updates). The
+                                field can be identical between
+                                different VERSION_IDs as BUILD_ID is
+                                an only a unique identifier to a
+                                specific version. Distributions that
+                                release each update as a new version
+                                would only need to use VERSION_ID as
+                                each build is already distinct based
+                                on the VERSION_ID. This field is
+                                optional. Example:
+                                <literal>BUILD_ID="2013-03-20.3"</literal>
+                                or
+                                <literal>BUILD_ID=201303203</literal>.
+
+                                </para></listitem>
+                        </varlistentry>
+

                 </variablelist>
 
                 <para>If you are reading this file from C code or a
                 shell script to determine the OS or a specific version
                 </variablelist>
 
                 <para>If you are reading this file from C code or a
                 shell script to determine the OS or a specific version

-                of it, use the ID and VERSION_ID fields. When looking
-                for an OS identification string for presentation to
-                the user use the PRETTY_NAME field.</para>
+                of it, use the ID and VERSION_ID fields, possibly with
+                ID_LIKE as fallback for ID. When looking for an OS
+                identification string for presentation to the user use
+                the PRETTY_NAME field.</para>

 
                 <para>Note that operating system vendors may choose
                 not to provide version information, for example to
 
                 <para>Note that operating system vendors may choose
                 not to provide version information, for example to

-                accommodate for rolling releases. In this case VERSION
+                accommodate for rolling releases. In this case, VERSION

                 and VERSION_ID may be unset. Applications should not
                 rely on these fields to be set.</para>
                 and VERSION_ID may be unset. Applications should not
                 rely on these fields to be set.</para>

+
+                <para>Operating system vendors may extend the file
+                format and introduce new fields. It is highly
+                recommended to prefix new fields with an OS specific
+                name in order to avoid name clashes. Applications
+                reading this file must ignore unknown fields. Example:
+                <literal>DEBIAN_BTS="debbugs://bugs.debian.org/"</literal></para>

         </refsect1>
 
         <refsect1>
         </refsect1>
 
         <refsect1>


@@ -264,7 +353,9 @@ ID=fedora
 VERSION_ID=17
 PRETTY_NAME="Fedora 17 (Beefy Miracle)"
 ANSI_COLOR="0;34"
 VERSION_ID=17
 PRETTY_NAME="Fedora 17 (Beefy Miracle)"
 ANSI_COLOR="0;34"

-CPE_NAME="cpe:/o:fedoraproject:fedora:17"</programlisting>
+CPE_NAME="cpe:/o:fedoraproject:fedora:17"
+HOME_URL="https://fedoraproject.org/"
+BUG_REPORT_URL="https://bugzilla.redhat.com/"</programlisting>

         </refsect1>
 
         <refsect1>
         </refsect1>
 
         <refsect1>