X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=man%2Fos-release.xml;h=4557abc4a32a620d7fd3561a2519fccd9b3f991c;hb=4c80d201ace0377312c27143afab04e9c9f1ee64;hp=6ce5885812ed3dc6cf2c91e06d606c57aa0d7500;hpb=ad2274289b36961c6c397f9d22dff55185b13c18;p=thirdparty%2Fsystemd.git

diff --git a/man/os-release.xml b/man/os-release.xml
index 6ce5885812e..4557abc4a32 100644
--- a/man/os-release.xml
+++ b/man/os-release.xml
@@ -1,9 +1,6 @@
 <?xml version='1.0'?> <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY % entities SYSTEM "custom-entities.ent" >
-%entities;
-]>
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
   This file is part of systemd.
@@ -70,7 +67,7 @@
     without implementing a shell compatible execution engine. Variable
     assignment values must be enclosed in double or single quotes if
     they include spaces, semicolons or other special characters
-    outside of A-Z, a-z, 0-9. Shell special characters ("$", quotes,
+    outside of A–Z, a–z, 0–9. Shell special characters ("$", quotes,
     backslash, backtick) must be escaped with backslashes, following
     shell style. All strings should be in UTF-8 format, and
     non-printable characters should not be used. It is not supported
@@ -144,7 +141,7 @@
         <term><varname>ID=</varname></term>
 
         <listitem><para>A lower-case string (no spaces or other
-        characters outside of 0-9, a-z, ".", "_" and "-") identifying
+        characters outside of 0–9, a–z, ".", "_" and "-") identifying
         the operating system, excluding any version information and
         suitable for processing by scripts or usage in generated
         filenames. If not set, defaults to
@@ -182,7 +179,7 @@
         <term><varname>VERSION_ID=</varname></term>
 
         <listitem><para>A lower-case string (mostly numeric, no spaces
-        or other characters outside of 0-9, a-z, ".", "_" and "-")
+        or other characters outside of 0–9, a–z, ".", "_" and "-")
         identifying the operating system version, excluding any OS
         name information or release code name, and suitable for
         processing by scripts or usage in generated filenames. This
@@ -217,10 +214,11 @@
       <varlistentry>
         <term><varname>CPE_NAME=</varname></term>
 
-        <listitem><para>A CPE name for the operating system, following
-        the <ulink url="https://cpe.mitre.org/specification/">Common
+        <listitem><para>A CPE name for the operating system, in URI
+        binding syntax, following the
+        <ulink url="http://scap.nist.gov/specifications/cpe/">Common
         Platform Enumeration Specification</ulink> as proposed by the
-        MITRE Corporation. This field is optional. Example:
+        NIST. This field is optional. Example:
         <literal>CPE_NAME="cpe:/o:fedoraproject:fedora:17"</literal>
         </para></listitem>
       </varlistentry>
@@ -300,7 +298,7 @@
 
         <listitem><para>
         A lower-case string (no spaces or other characters outside of
-        0-9, a-z, ".", "_" and "-"), identifying a specific variant or
+        0–9, a–z, ".", "_" and "-"), identifying a specific variant or
         edition of the operating system. This may be interpreted by
         other packages in order to determine a divergent default
         configuration. This field is optional and may not be