From b7f71444c01a9b4ac6f7072bf4f7d6d8098cb982 Mon Sep 17 00:00:00 2001
From: Vinay Kulkarni <vskibum@gmail.com>
Date: Mon, 4 Apr 2016 15:13:06 -0700
Subject: Address code-review items for pull-request #2890 1. Replace strtol
 with unhexchar, verified with valid and invalid DUID strings. 2. Fix logging
 to use log_syntax instead of log_error. 3. On error reading DUID, ignore read
 and preserve previous state. 4. Fix man-pages to use markup, remove options
 not yet implemented. 5. Remove spurious header line in new files.

---
 man/networkd.conf.xml | 53 +++++++++++----------------------------------------
 1 file changed, 11 insertions(+), 42 deletions(-)

(limited to 'man/networkd.conf.xml')

diff --git a/man/networkd.conf.xml b/man/networkd.conf.xml
index 30674e12bc..4f423b2b61 100644
--- a/man/networkd.conf.xml
+++ b/man/networkd.conf.xml
@@ -95,21 +95,17 @@
         <term><varname>Type=</varname></term>
         <listitem><para>The type of DUID specified in this section. The following values are
         supported:</para>
-        <para>raw : If <literal>Type=raw</literal>, then <literal>RawData=</literal> specifies
-        the entire DUID. For e.g: <literal>RawData=00:02:00:00:ab:11:f9:2a:c2:77:29:f9:5c:00</literal>
-        specifies a 14 byte long DUID-EN ("00:02"), with enterprise number 43793 ("00:00:ab:11"),
-        and identifier value "f9:2a:c2:77:29:f9:5c:00".</para><para>If Type is not specified and
-        RawData is specified, Type defaults to 'raw'.</para>
-        <para>Type will support the following values in the future:</para>
-        <para>link-layer-and-time : If <literal>Type=link-layer-and-time</literal>, then
-        <literal>MACAddress=</literal> and <literal>TimeStamp=</literal> specify the hardware
-        address and time-stamp for DUID-LLT.</para>
-        <para>vendor : If <literal>Type=vendor</literal>, then <literal>EnterpriseNumber=</literal>
-        and <literal>RawData=</literal> specify the enterprise number and identifier for DUID-EN.</para>
-        <para>link-layer : If <literal>Type=link-layer</literal>, then <literal>MACAddress=</literal>
-        specifies the hardware address for DUID-LL.</para>
-        <para>uuid : If <literal>Type=uuid</literal>, then <literal>UUID=</literal> specifies DUID-UUID.
-        </para></listitem>
+        <variablelist>
+          <varlistentry>
+            <term><option>raw</option> </term>
+            <listitem><para>If <literal>Type=raw</literal>, then <literal>RawData=</literal> specifies the
+            entire DUID. For example, <literal>RawData=00:02:00:00:ab:11:f9:2a:c2:77:29:f9:5c:00</literal>
+            specifies a 14 byte long DUID-EN ("00:02"), with enterprise number 43793 ("00:00:ab:11"),
+            and identifier value "f9:2a:c2:77:29:f9:5c:00".</para><para>If Type is not specified and
+            RawData is specified, Type defaults to 'raw'.</para></listitem>
+          </varlistentry>
+        </variablelist>
+        </listitem>
       </varlistentry>
 
       <varlistentry>
@@ -120,33 +116,6 @@
     </variablelist>
   </refsect1>
 
-  <refsect1>
-    <para>The following options will be supported in the future:
-    </para>
-    <variablelist>
-      <varlistentry>
-        <term><varname>MACAddress=</varname></term>
-        <listitem><para>Specifies the link-layer address for DUID Type <option>link-layer
-        </option> or <option>link-layer-and-time</option>.</para></listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><varname>TimeStamp=</varname></term>
-        <listitem><para>Specifies the DUID generation time for DUID Type <option>
-        link-layer-and-time</option>.</para></listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><varname>EnterpriseNumber=</varname></term>
-        <listitem><para>Specifies the enterprise number for DUID Type
-        <option>vendor</option>.</para></listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><varname>UUID=</varname></term>
-        <listitem><para>Specifies the UUID for DUID Type <option>uuid</option>.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-
   <refsect1>
       <title>See Also</title>
       <para>
-- 
cgit v1.2.3-54-g00ecf


From f38e0cce75ff2ffbd99f7e382ed39c160bb7d799 Mon Sep 17 00:00:00 2001
From: Vinay Kulkarni <kulkarniv@vmware.com>
Date: Mon, 4 Apr 2016 21:05:45 -0700
Subject: Drop description of 'Type' field from docs.

---
 man/networkd.conf.xml   | 17 -----------------
 man/systemd.network.xml | 17 -----------------
 2 files changed, 34 deletions(-)

(limited to 'man/networkd.conf.xml')

diff --git a/man/networkd.conf.xml b/man/networkd.conf.xml
index 4f423b2b61..59a53d8893 100644
--- a/man/networkd.conf.xml
+++ b/man/networkd.conf.xml
@@ -91,23 +91,6 @@
 
     <variablelist class='network-directives'>
 
-      <varlistentry>
-        <term><varname>Type=</varname></term>
-        <listitem><para>The type of DUID specified in this section. The following values are
-        supported:</para>
-        <variablelist>
-          <varlistentry>
-            <term><option>raw</option> </term>
-            <listitem><para>If <literal>Type=raw</literal>, then <literal>RawData=</literal> specifies the
-            entire DUID. For example, <literal>RawData=00:02:00:00:ab:11:f9:2a:c2:77:29:f9:5c:00</literal>
-            specifies a 14 byte long DUID-EN ("00:02"), with enterprise number 43793 ("00:00:ab:11"),
-            and identifier value "f9:2a:c2:77:29:f9:5c:00".</para><para>If Type is not specified and
-            RawData is specified, Type defaults to 'raw'.</para></listitem>
-          </varlistentry>
-        </variablelist>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term><varname>RawData=</varname></term>
         <listitem><para>Specifies the DUID bytes as a single newline-terminated, hexadecimal
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index a6d290cfb3..bcd437d349 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -852,23 +852,6 @@
 
     <variablelist class='network-directives'>
 
-      <varlistentry>
-        <term><varname>Type=</varname></term>
-        <listitem><para>The type of DUID specified in this section. The following values are
-        supported:</para>
-        <variablelist>
-          <varlistentry>
-            <term><option>raw</option> </term>
-            <listitem><para>If <literal>Type=raw</literal>, then <literal>RawData=</literal> specifies the
-            entire DUID. For example, <literal>RawData=00:02:00:00:ab:11:f9:2a:c2:77:29:f9:5c:00</literal>
-            specifies a 14 byte long DUID-EN ("00:02"), with enterprise number 43793 ("00:00:ab:11"),
-            and identifier value "f9:2a:c2:77:29:f9:5c:00".</para><para>If Type is not specified and
-            RawData is specified, Type defaults to 'raw'.</para></listitem>
-          </varlistentry>
-        </variablelist>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term><varname>RawData=</varname></term>
         <listitem><para>Specifies the DUID bytes as a single newline-terminated, hexadecimal
-- 
cgit v1.2.3-54-g00ecf