From: Matthijs Mekking <matthijs@isc.org>
Date: Mon, 13 Jan 2020 09:42:21 +0000 (+0100)
Subject: Document forwarders config port and dscp param
X-Git-Tag: v9.16.0~27^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be3a11029a336f6a3d66bbd89ab72c3eb7b3caa1;p=thirdparty%2Fbind9.git

Document forwarders config port and dscp param
---

diff --git a/CHANGES b/CHANGES
index b2cbd80795e..4fd06eefae8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5353.	[doc]		Document port and dscp parameters in forwarders
+			configuration option. [GL !914]
+
 5352.	[bug]		Correctly handle catalog zone entries containing
 			characters that aren't legal in filenames. [GL #1592]
 
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 224c6f8944e..75731470c21 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -6866,9 +6866,11 @@ options {
 	      <term><command>forwarders</command></term>
 	      <listitem>
 		<para>
-		  Specifies the IP addresses to be used
-		  for forwarding. The default is the empty list (no
-		  forwarding).
+		  Specifies a list of IP addresses to which queries shall be
+		  forwarded. The default is the empty list (no forwarding).
+		  Each address in the list can be associated with an optional
+		  port number and/or DSCP value, and a default port number and
+		  DSCP value can be set for the entire list.
 		</para>
 	      </listitem>
 	    </varlistentry>