diff --git a/CHANGES b/CHANGES
index 16124a4ef7..5f2b357b75 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3511. [doc] Improve documentation of redirect zones. [RT #32756]
+
3510. [func] "rndc status" and XML statistics channel now report
server start and reconfiguration times. [RT #21048]
diff --git a/REDIRECT-NOTES b/REDIRECT-NOTES
deleted file mode 100644
index fece4ba9f8..0000000000
--- a/REDIRECT-NOTES
+++ /dev/null
@@ -1,35 +0,0 @@
-Redirect zones are used to find answers to queries when normal resolution
-would result in NXDOMAIN being returned. Only one redirect zone per view
-is currently supported.
-
-To redirect to 100.100.100.2 and 2001:ffff:ffff::100.100.100.2 on NXDOMAIN
-one would configure the redirect zone like this.
-
-zone "." {
- type redirect;
- file "redirect.db";
-};
-
-redirect.db:
-$TTL 300
-@ IN SOA ns.example.net hostmaster.example.net 0 0 0 0 0
-@ IN NS ns.example.net
-;
-; NS records do not need address records in this zone as it is not in the
-; normal namespace.
-;
-*. IN A 100.100.100.2
-*. IN AAAA 2001:ffff:ffff::100.100.100.2
-
-To redirect all Spanish names (under .ES) one would use entries like these:
-
-*.ES. IN A 100.100.100.3
-*.ES. IN AAAA 2001:ffff:ffff::100.100.100.3
-
-To redirect all commercial Spanish names (under COM.ES) one would use
-entries like these:
-*.COM.ES. IN A 100.100.100.4
-*.COM.ES. IN AAAA 2001:ffff:ffff::100.100.100.4
-
-The redirect zone supports all possible types. It is not limited to
-A and AAAA record.
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 393534233a..22e1230109 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -11297,16 +11297,67 @@ zone zone_name class
- Provides a source of answers when the normal resolution
- returns NXDOMAIN. Only one redirect zone is supported
- per view. allow-query can be used
- to restrict which clients see these answers.
+ Redirect zones are used to provide answers to
+ queries when normal resolution would result in
+ NXDOMAIN being returned.
+ Only one redirect zone is supported
+ per view. allow-query can be
+ used to restrict which clients see these answers.
If the client has requested DNSSEC records (DO=1) and
the NXDOMAIN response is signed then no substitution
will occur.
+
+ To redirect all NXDOMAIN responses to
+ 100.100.100.2 and
+ 2001:ffff:ffff::100.100.100.2, one would
+ configure the redirect zone like this:
+
+
+zone "." {
+ type redirect;
+ file "redirect.db";
+};
+
+
+ ...with the zone file
+ redirect.db containing the
+ following:
+
+
+$TTL 300
+@ IN SOA ns.example.net hostmaster.example.net 0 0 0 0 0
+@ IN NS ns.example.net
+;
+; NS records do not need address records in this zone as it is not in the
+; normal namespace.
+;
+*. IN A 100.100.100.2
+*. IN AAAA 2001:ffff:ffff::100.100.100.2
+
+
+ To redirect all Spanish names (under .ES) one
+ would use entries like these:
+
+
+*.ES. IN A 100.100.100.3
+*.ES. IN AAAA 2001:ffff:ffff::100.100.100.3
+
+
+ And to redirect all commercial Spanish names
+ (under COM.ES) one would use entries like these:
+
+
+*.COM.ES. IN A 100.100.100.4
+*.COM.ES. IN AAAA 2001:ffff:ffff::100.100.100.4
+
+
+ Note that the redirect zone supports all
+ possible types; it is not limited to A and
+ AAAA record.
+