From: Shawn Routhier <sar@isc.org>
Date: Wed, 13 Jul 2016 19:20:50 +0000 (-0700)
Subject: [master] Uncomment the example column from some rows in the list of classifciation... 
X-Git-Tag: trac4551_base~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dee442a64f57c8d9dd87636f9e39084ed1b11e03;p=thirdparty%2Fkea.git

[master] Uncomment the example column from some rows in the list of classifciation values
---

diff --git a/ChangeLog b/ChangeLog
index 16ec828d5a..83305b860b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1142.	[doc]		sar
+	Uncomment the example columns in some rows in the table
+	listing the classificaiton examples.
+	(None, git TBD)
+
 1141.	[func]		marcin
 	Pkt4, Pkt6 and Pkt4o6 objects passed to hooks libraries
 	return copies of DHCP options to avoid unintended modification
diff --git a/doc/guide/classify.xml b/doc/guide/classify.xml
index 869218de7f..322cb46797 100644
--- a/doc/guide/classify.xml
+++ b/doc/guide/classify.xml
@@ -217,21 +217,21 @@
             <row>
               <entry>DHCPv6 Relay Options</entry>
               <entry>relay6[nest].option[code].hex</entry>
-              <!--  <entry>Value of the option</entry> -->
+              <entry>Value of the option</entry>
               <entry>The value of the option with code "code" from the
               relay encapsulation "nest"</entry>
             </row>
             <row>
               <entry>DHCPv6 Relay Peer Address</entry>
               <entry>relay6[nest].peeraddr</entry>
-              <!-- <entry>2001:DB8::1</entry> -->n
+              <entry>2001:DB8::1</entry>
               <entry>The value of the peer address field from the
               relay encapsulation "nest"</entry>
             </row>
             <row>
               <entry>DHCPv6 Relay Link Address</entry>
               <entry>relay6[nest].linkaddr</entry>
-              <!-- <entry>2001:DB8::1</entry> -->n
+              <entry>2001:DB8::1</entry>
               <entry>The value of the link address field from the
               relay encapsulation "nest"</entry>
             </row>
@@ -280,14 +280,14 @@
             <row>
               <entry>Message Type in DHCPv6 packet</entry>
               <entry>pkt6.msgtype</entry>
-              <!--  <entry>1</entry> -->
+              <entry>1</entry>
               <entry>The value of the message type field in the DHCPv6
               packet.</entry>
             </row>
             <row>
               <entry>Transaction ID in DHCPv6 packet</entry>
               <entry>pkt6.transid</entry>
-              <!--  <entry>12345</entry> -->
+              <entry>12345</entry>
               <entry>The value of the transaction id in the DHCPv6
               packet.</entry>
             </row>