diff --git a/doc/arm/dns-ops.inc.rst b/doc/arm/dns-ops.inc.rst
index ff9670ab45..9984c6e1cd 100644
--- a/doc/arm/dns-ops.inc.rst
+++ b/doc/arm/dns-ops.inc.rst
@@ -165,12 +165,27 @@ server.
 
 .. rndcconf:statement:: server
 
-   The ``server`` statement associates a key defined using the ``key``
-   statement with a server. The keyword ``server`` is followed by a host
-   name or address. The ``server`` statement has two clauses: ``key``
-   and ``port``. The ``key`` clause specifies the name of the key to be
-   used when communicating with this server, and the ``port`` clause can
-   be used to specify the port :iscman:`rndc` should connect to on the server.
+   The ``server`` statement specifies connection parameters for a given server.
+   The server can be specified as a host name or address.
+
+   .. rndcconf:statement:: addresses
+
+      Specifies one or more addresses to use when communicating with this
+      server.
+
+   :rndcconf:ref:`key`
+      Associates a key defined using the :rndcconf:ref:`key` statement with a
+      server.
+
+   .. rndcconf:statement:: port
+
+      Specifes the port :iscman:`rndc` should connect to on the server.
+
+   .. rndcconf:statement:: source-address
+   .. rndcconf:statement:: source-address-v6
+
+      Overrides :rndcconf:ref:`default-source-address` and
+      :rndcconf:ref:`default-source-address-v6` for this specific server.
 
    A sample minimal configuration file is as follows:
 
diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst
index 4e5cda53bc..58bf7f217f 100644
--- a/doc/arm/reference.rst
+++ b/doc/arm/reference.rst
@@ -44,8 +44,8 @@ The file :file:`named.conf` may contain three types of entities:
       - Statements define and control specific BIND behaviors.
       - Statements may have a single parameter (a **Value**) or multiple parameters
         (**Argument/Value** pairs). For example, the :any:`recursion` statement takes a
-        single value parameter which, in this case, is the string ``yes`` or ``no``
-        (``recursion yes;``) whereas the :any:`port` statement takes a  numeric value
+        single value parameter - in this case, the string ``yes`` or ``no``
+        (``recursion yes;``) - while the :namedconf:ref:`port` statement takes a  numeric value
         defining the DNS port number (``port 53;``). More complex statements take one or
         more argument/value pairs. The :any:`also-notify` statement may take a number
         of such argument/value pairs, such as ``also-notify port 5353;``,