man: clarify wording of os-release.CPE_NAME

We expect the CPE_NAME to be formatted in URI binding syntax. Make that
clear in the documentation. Furthermore, the CPE-spec has been taken over
by NIST, so adjust the links as well.

Reported by: Ben Harris <bjh21@cam.ac.uk>

diff --git a/man/os-release.xml b/man/os-release.xml
index 4ca2e597063fc5ce0b9df484b662f00e18e66963..d2e2598204df7a08e213fe22b518763c54960f17 100644 (file)
--- a/man/os-release.xml
+++ b/man/os-release.xml
@@ -214,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>