trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bc...@apache.org
Subject [trafficserver] branch 8.0.x updated: Fix hostdb.ip_resolve's documentation for none/only option.
Date Tue, 26 Jun 2018 16:03:45 GMT
This is an automated email from the ASF dual-hosted git repository.

bcall pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/8.0.x by this push:
     new 97e71ff  Fix hostdb.ip_resolve's documentation for none/only option.
97e71ff is described below

commit 97e71ff8b433009b87d4bacac7a5367738e1ec59
Author: Nick Muerdter <nick.muerdter@nrel.gov>
AuthorDate: Mon Jun 25 16:50:23 2018 -0600

    Fix hostdb.ip_resolve's documentation for none/only option.
    
    The previously documented option of a `none` keyword didn't actually exist.
    Instead, this functionality is provided by the `only` keyword.
    
    Fixes https://github.com/apache/trafficserver/issues/3880
    
    (cherry picked from commit 3e57b434143e27c6154f1778826924db9263ac94)
---
 doc/admin-guide/files/records.config.en.rst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/admin-guide/files/records.config.en.rst b/doc/admin-guide/files/records.config.en.rst
index 8bc17b9..93684d6 100644
--- a/doc/admin-guide/files/records.config.en.rst
+++ b/doc/admin-guide/files/records.config.en.rst
@@ -2539,16 +2539,16 @@ HostDB
    ``ipv4``   Resolve to an IPv4 address.
    ``ipv6``   Resolve to an IPv6 address.
    ``client`` Resolve to the same family as the client IP address.
-   ``none``   Stop resolving.
+   ``only``   Stop resolving.
    ========== ====================================================
 
    The order of the keywords is critical. When a host name needs to be resolved
    it is resolved in same order as the keywords. If a resolution fails, the
-   next option in the list is tried. The keyword ``none`` means to give up
+   next option in the list is tried. The keyword ``only`` means to give up
    resolution entirely. The keyword list has a maximum length of three
    keywords, more are never needed. By default there is an implicit
    ``ipv4;ipv6`` attached to the end of the string unless the keyword
-   ``none`` appears.
+   ``only`` appears.
 
 .. topic:: Example
 
@@ -2564,13 +2564,13 @@ HostDB
 
    Resolve only to IPv4. ::
 
-      ipv4;none
+      ipv4;only
 
 .. topic:: Example
 
    Resolve only to the same family as the client (do not permit cross family transactions).
::
 
-      client;none
+      client;only
 
    This value is a global default that can be overridden by :ts:cv:`proxy.config.http.server_ports`.
 


Mime
View raw message