Rename ip_port to port

The old name was used only in couple places, and was inconsistent with
doc/misc grammar.

diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst
index 19fce29db11f7e156439b259af7a866e32cdb1c5..e89e98df3a05cc115550383a91c9437a44001532 100644 (file)
--- a/doc/arm/reference.rst
+++ b/doc/arm/reference.rst
@@ -282,7 +282,7 @@ file documentation:
         A list of one or more :term:`ip_address`, :term:`netprefix`, ``key_id``, or :term:`acl_name` elements; see :ref:`address_match_lists`.
 
     ``remote-servers``
-        A named list of one or more :term:`ip_address` s with optional ``tls_id``, ``key_id``, and/or ``ip_port``. A ``remote-servers`` list may include other ``remote-servers`` lists. See :any:`primaries` block.
+        A named list of one or more :term:`ip_address` s with optional ``tls_id``, ``key_id``, and/or ``port``. A ``remote-servers`` list may include other ``remote-servers`` lists. See :any:`primaries` block.
 
     ``domain_name``
         A quoted string which is used as a DNS name; for example: ``my.test.domain``.
@@ -301,7 +301,7 @@ file documentation:
     ``dscp``
         A ``number`` between 0 and 63, used to select a differentiated services code point (DSCP) value for use with outgoing traffic on operating systems that support DSCP.
 
-    ``ip_port``
+    ``port``
         An IP port ``number``. The ``number`` is limited to 0 through 65535, with values below 1024 typically restricted to use by processes running as root. In some cases, an asterisk (``*``) character can be used as a placeholder to select a random high-numbered port.
 
     ``netprefix``
@@ -329,7 +329,7 @@ file documentation:
         A quoted string which is used as a pathname, such as ``zones/master/my.test.domain``.
 
     ``port_list``
-        A list of an ``ip_port`` or a port range. A port range is specified in the form of ``range`` followed by two ``ip_port`` s, ``port_low`` and ``port_high``, which represents port numbers from ``port_low`` through ``port_high``, inclusive. ``port_low`` must not be larger than ``port_high``. For example, ``range 1024 65535`` represents ports from 1024 through 65535. The asterisk (``*``) character is not allowed as a valid ``ip_port`` or as a port range boundary.
+        A list of an ``port`` or a port range. A port range is specified in the form of ``range`` followed by two ``port`` s, ``port_low`` and ``port_high``, which represents port numbers from ``port_low`` through ``port_high``, inclusive. ``port_low`` must not be larger than ``port_high``. For example, ``range 1024 65535`` represents ports from 1024 through 65535. The asterisk (``*``) character is not allowed as a valid ``port`` or as a port range boundary.
 
     ``size_spec``
         A 64-bit unsigned integer, or the keywords ``unlimited`` or ``default``. Integers may take values 0 <= value <= 18446744073709551615, though certain parameters (such as :any:`max-journal-size`) may use a more limited range within these extremes. In most cases, setting a value to 0 does not literally mean zero; it means "undefined" or "as big as possible," depending on the context. See the explanations of particular parameters that use ``size_spec`` for details on how they interpret its use. Numeric values can optionally be followed by a scaling factor: ``K`` or ``k`` for kilobytes, ``M`` or ``m`` for megabytes, and ``G`` or ``g`` for gigabytes, which scale by 1024, 1024*1024, and 1024*1024*1024 respectively.
@@ -468,7 +468,7 @@ and retrieve non-DNS results from a name server.
 .. namedconf:statement:: inet
 
    An :any:`inet` control channel is a TCP socket listening at the specified
-   ``ip_port`` on the specified :term:`ip_address`, which can be an IPv4 or IPv6
+   ``port`` on the specified :term:`ip_address`, which can be an IPv4 or IPv6
    address. An :term:`ip_address` of ``*`` (asterisk) is interpreted as the IPv4
    wildcard address; connections are accepted on any of the system's
    IPv4 addresses. To listen on the IPv6 wildcard address, use an
@@ -477,7 +477,7 @@ and retrieve non-DNS results from a name server.
    maximum security.
 
    If no port is specified, port 953 is used. The asterisk ``*`` cannot
-   be used for ``ip_port``.
+   be used for ``port``.
 
    The ability to issue commands over the control channel is restricted by
    the ``allow`` and :any:`keys` clauses.
@@ -5325,14 +5325,14 @@ even if it is built without the library, but any HTTP access fails
 with an error.
 
 An :any:`inet` control channel is a TCP socket listening at the specified
-``ip_port`` on the specified :term:`ip_address`, which can be an IPv4 or IPv6
+``port`` on the specified :term:`ip_address`, which can be an IPv4 or IPv6
 address. An :term:`ip_address` of ``*`` (asterisk) is interpreted as the IPv4
 wildcard address; connections are accepted on any of the system's
 IPv4 addresses. To listen on the IPv6 wildcard address, use an
 :term:`ip_address` of ``::``.
 
 If no port is specified, port 80 is used for HTTP channels. The asterisk
-(``*``) cannot be used for ``ip_port``.
+(``*``) cannot be used for ``port``.
 
 Attempts to open a statistics channel are restricted by the
 optional ``allow`` clause. Connections to the statistics channel are