trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject [trafficserver] branch 9.0.x updated: Fixes a few Sphinx build warnings (#6290)
Date Mon, 23 Dec 2019 23:30:03 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
     new f4623de  Fixes a few Sphinx build warnings (#6290)
f4623de is described below

commit f4623de40e61152468571960b150e84a02e4377b
Author: Leif Hedstrom <zwoop@apache.org>
AuthorDate: Mon Dec 23 15:29:03 2019 -0800

    Fixes a few Sphinx build warnings (#6290)
    
    (cherry picked from commit 35f352c2bb7a6399a8908bf051dfb576bea4122c)
---
 doc/admin-guide/plugins/header_rewrite.en.rst     | 14 ++++++--------
 doc/appendices/command-line/traffic_server.en.rst |  1 +
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/doc/admin-guide/plugins/header_rewrite.en.rst b/doc/admin-guide/plugins/header_rewrite.en.rst
index 527852e..93f134d 100644
--- a/doc/admin-guide/plugins/header_rewrite.en.rst
+++ b/doc/admin-guide/plugins/header_rewrite.en.rst
@@ -562,7 +562,7 @@ be specified multiple times, such as ``Set-Cookie``, but for headers which
may
 only be specified once you may prefer to use `set-header`_ instead.
 
 The header's ``<value>`` may be specified as a literal string, or it may take
-advantage of :ref:`header-rewrite-concatenations` to calculate a dynamic value
+advantage of `String concatenations`_ to calculate a dynamic value
 for the header.
 
 counter
@@ -675,9 +675,8 @@ set-header
 Replaces the value of header ``<name>`` with ``<value>``, creating the header
 if necessary.
 
-The header's ``<value>`` may be specified according to `Header Values`_ or take
-advantage of :ref:`header-rewrite-concatenations` to calculate a dynamic value
-for the header.
+The header's ``<value>`` may be a literal string, or take advantage of
+`String concatenations`_ to calculate a dynamic value for the header.
 
 set-redirect
 ~~~~~~~~~~~~
@@ -689,7 +688,7 @@ When invoked, sends a redirect response to the client, with HTTP status
 ``<code>``, and a new location of ``<destination>``. If the ``QSA`` flag is
 enabled, the original query string will be preserved and added to the new
 location automatically. This operator supports
-:ref:`header-rewrite-concatenations` for ``<destination>``.
+`String concatenations`_ for ``<destination>``.
 
 set-status
 ~~~~~~~~~~
@@ -760,8 +759,6 @@ L      Last rule, do not continue.
 QSA    Append the results of the rule to the query string.
 ====== ========================================================================
 
-.. _header-rewrite-concatenations:
-
 String concatenations
 ---------------------
 
@@ -769,7 +766,8 @@ You can concatenate values using strings, condition values and variable
expansio
 
     add-header CustomHeader "Hello from %{IP:SERVER}:%{INBOUND:LOCAL-PORT}"
 
-String concatenation is not yet supported in condition testing.
+This is the new, generic form of setting header values. Unfortunately, string
+concatenation is not yet supported in conditionals.
 
 Note: In versions prior to ATS v9.0.0, an alternative string expansion was available. those
 expansions are no longer available, but the following table can help migrations:
diff --git a/doc/appendices/command-line/traffic_server.en.rst b/doc/appendices/command-line/traffic_server.en.rst
index 165267c..7cf4a29 100644
--- a/doc/appendices/command-line/traffic_server.en.rst
+++ b/doc/appendices/command-line/traffic_server.en.rst
@@ -79,6 +79,7 @@ actions or queries against |TS|. Note that some commands (such as ``help``
and
 argument, surround the ``CMD`` and its argument in quotes. For instance, to
 request help for the ``verify_global_plugin`` command, format your command like
 so::
+
     traffic_server -C "help verify_global_plugin"
 
 The following commands are supported:


Mime
View raw message