You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by sh...@apache.org on 2019/01/17 16:41:20 UTC

[trafficserver] branch master updated: Fix a content issue and a couple format issues.

This is an automated email from the ASF dual-hosted git repository.

shinrich pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new c3c3a9c  Fix a content issue and a couple format issues.
c3c3a9c is described below

commit c3c3a9c667120ab044b3c23938989f4a7bbaa497
Author: Susan Hinrichs <sh...@oath.com>
AuthorDate: Wed Jan 16 21:58:39 2019 +0000

    Fix a content issue and a couple format issues.
---
 doc/admin-guide/files/records.config.en.rst | 8 ++++----
 doc/admin-guide/plugins/index.en.rst        | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/admin-guide/files/records.config.en.rst b/doc/admin-guide/files/records.config.en.rst
index b7d85c9..ab81401 100644
--- a/doc/admin-guide/files/records.config.en.rst
+++ b/doc/admin-guide/files/records.config.en.rst
@@ -1759,7 +1759,7 @@ Proxy User Variables
    ``10.0.2.123``          A single IP Address.
    ``10.0.3.1-10.0.3.254`` A range of IP address.
    ``10.0.4.0/24``         A range of IP address specified by CIDR notation.
-   ======================= ============================================================
+   ======================= ===========================================================
 
    .. important::
 
@@ -1768,7 +1768,7 @@ Proxy User Variables
        information.
        See :ts:cv:`proxy.config.http.server_ports` for information on how to enable Proxy Protocol on a port.
 
-   See :ref:`proxy-protocol` for more discussion on how |TS| tranforms the `Forwarded: header.
+   See :ref:`proxy-protocol` for more discussion on how |TS| tranforms the `Forwarded: header`.
 
 .. ts:cv:: CONFIG proxy.config.http.normalize_ae INT 1
    :reloadable:
@@ -3507,9 +3507,9 @@ Client-Related Configuration
 :code:`DISABLED`
    Server Certificate will not be verified
 :code:`PERMISSIVE`
-   Certificate will be verified and the connection will not be established if verification fails.
-:code:`ENFORCED`
    The provided certificate will be verified and the connection will be established irrespective of the verification result. If verification fails the name of the server will be logged.
+:code:`ENFORCED`
+   Certificate will be verified and the connection will not be established if verification fails.
 
 .. ts:cv:: CONFIG proxy.config.ssl.client.verify.server.properties STRING ALL
    :reloadable:
diff --git a/doc/admin-guide/plugins/index.en.rst b/doc/admin-guide/plugins/index.en.rst
index 9d8d9b0..4f750a3 100644
--- a/doc/admin-guide/plugins/index.en.rst
+++ b/doc/admin-guide/plugins/index.en.rst
@@ -62,6 +62,7 @@ Plugins that are considered stable are installed by default in |TS| releases.
    Regex Remap <regex_remap.en>
    Regex Revalidate <regex_revalidate.en>
    Remap Purge <remap_purge.en>
+   Slice <slice.en>
    Stats over HTTP <stats_over_http.en>
    TCPInfo <tcpinfo.en>
    XDebug <xdebug.en>