From: Witold Krecicki <wpk@isc.org>
Date: Fri, 19 Jun 2015 08:23:53 +0000 (+0200)
Subject: fix rpz-client-ip documentation [RT #39783]
X-Git-Tag: v9.11.0a1~720
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=6a3249533aab706c30f8cd65956f2f963e857f8f;p=thirdparty%2Fbind9.git

fix rpz-client-ip documentation [RT #39783]
---

diff --git a/CHANGES b/CHANGES
index 65ff4cd3087..1d02ba214a3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+4139.	[doc]		fix rpz-client-ip documentation [RT #39783]
+
 4138.	[bug]		An uninitialized value in validator.c could result
 			in an assertion failure. (CVE-2015-4620) [RT #39795]
 
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 27cc9a597eb..633ff0d169f 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -9862,7 +9862,7 @@ deny-answer-aliases { "example.net"; };
 		    policy zone origin name
 		    and encode an address or address block.
 		    IPv4 addresses are represented as
-		    <userinput>prefixlength.B4.B3.B2.B1.rpz-ip</userinput>.
+		    <userinput>prefixlength.B4.B3.B2.B1.rpz-client-ip</userinput>.
 		    The IPv4 prefix length must be between 1 and 32.
 		    All four bytes, B4, B3, B2, and B1, must be present.
 		    B4 is the decimal value of the least significant byte of the
@@ -9872,16 +9872,18 @@ deny-answer-aliases { "example.net"; };
 		  <para>
 		    IPv6 addresses are encoded in a format similar
 		    to the standard IPv6 text representation,
-		    <userinput>prefixlength.W8.W7.W6.W5.W4.W3.W2.W1.rpz-ip</userinput>.
+		    <userinput>prefixlength.W8.W7.W6.W5.W4.W3.W2.W1.rpz-client-ip</userinput>.
 		    Each of W8,...,W1 is a one to four digit hexadecimal number
 		    representing 16 bits of the IPv6 address as in the standard 
-		    text representation of IPv6 addresses,
-		    but reversed as in IN-ADDR.ARPA.
+		    text representation of IPv6 addresses, but reversed as in
+		    IP6.ARPA. (Note that this representation of IPv6
+		    address is different from IP6.ARPA where each hex
+		    digit occupies a label.)
 		    All 8 words must be present except when one set of consecutive
 		    zero words is replaced with <userinput>.zz.</userinput>
 		    analogous to double colons (::) in standard IPv6 text
 		    encodings.
-		    The IPv6 prefix length must be between 64 and 128.
+		    The IPv6 prefix length must be between 1 and 128.
 		  </para>
 		</listitem>
 	      </varlistentry>