This is an automated email from the ASF dual-hosted git repository.
mlibbey pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new f821eb5 Minor rst formatting to reduce build errors
f821eb5 is described below
commit f821eb58ae63f71bd79679b19982f6ed30b25c32
Author: Miles Libbey <[email protected]>
AuthorDate: Thu Nov 24 09:21:03 2016 -0800
Minor rst formatting to reduce build errors
---
doc/admin-guide/files/parent.config.en.rst | 4 ++--
doc/admin-guide/monitoring/diagnostic-files.en.rst | 2 ++
doc/admin-guide/plugins/header_rewrite.en.rst | 2 +-
doc/admin-guide/plugins/ts_lua.en.rst | 2 +-
doc/developer-guide/api/functions/TSHttpOverridableConfig.en.rst | 1 +
5 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/doc/admin-guide/files/parent.config.en.rst
b/doc/admin-guide/files/parent.config.en.rst
index 9f8ff9d..f6a3d67 100644
--- a/doc/admin-guide/files/parent.config.en.rst
+++ b/doc/admin-guide/files/parent.config.en.rst
@@ -231,8 +231,8 @@ The following list shows the possible actions and their
allowed values.
- ``consider`` - Use the query string when finding a parent.
- ``ignore`` - Do not consider the query string when finding a parent.
This
- is especially useful when using the ``consistent_hash`` selection
strategy,
- and a random query string would prevent a consistent parent selection.
+ is especially useful when using the ``consistent_hash`` selection
strategy,
+ and a random query string would prevent a consistent parent selection.
Examples
========
diff --git a/doc/admin-guide/monitoring/diagnostic-files.en.rst
b/doc/admin-guide/monitoring/diagnostic-files.en.rst
index 8f5eba8..44091cc 100644
--- a/doc/admin-guide/monitoring/diagnostic-files.en.rst
+++ b/doc/admin-guide/monitoring/diagnostic-files.en.rst
@@ -15,6 +15,8 @@
specific language governing permissions and limitations
under the License.
+.. include:: ../common.defs
+
=============
traffic.out
=============
diff --git a/doc/admin-guide/plugins/header_rewrite.en.rst
b/doc/admin-guide/plugins/header_rewrite.en.rst
index a340ec0..4e0b4a4 100644
--- a/doc/admin-guide/plugins/header_rewrite.en.rst
+++ b/doc/admin-guide/plugins/header_rewrite.en.rst
@@ -604,7 +604,7 @@ 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 Value`_ or take
+The header's ``<value>`` may be specified according to `Header Values`_ or take
advantage of `Variable Expansion`_ to calculate a dynamic value for the header.
set-redirect
diff --git a/doc/admin-guide/plugins/ts_lua.en.rst
b/doc/admin-guide/plugins/ts_lua.en.rst
index 33993f8..f5760fe 100644
--- a/doc/admin-guide/plugins/ts_lua.en.rst
+++ b/doc/admin-guide/plugins/ts_lua.en.rst
@@ -417,7 +417,7 @@ Additional Information:
| TS_HTTP_READ | TS_LUA_HOOK | YES |
NO | YES |
| _CACHE_HDR_HOOK | _READ_CACHE_HDR | |
| |
+-----------------------+---------------------------+----------------------+--------------------+----------------------+
-| TS_HTTP_OS | TS_LUA_HOOK_ | YES |
NO | YES |
+| TS_HTTP_OS | TS_LUA_HOOK | YES |
NO | YES |
| _DNS_HOOK | _OS_DNS | |
| |
+-----------------------+---------------------------+----------------------+--------------------+----------------------+
| TS_HTTP_CACHE | TS_LUA_HOOK | YES |
NO | YES |
diff --git a/doc/developer-guide/api/functions/TSHttpOverridableConfig.en.rst
b/doc/developer-guide/api/functions/TSHttpOverridableConfig.en.rst
index 9755d3d..3248bcd 100644
--- a/doc/developer-guide/api/functions/TSHttpOverridableConfig.en.rst
+++ b/doc/developer-guide/api/functions/TSHttpOverridableConfig.en.rst
@@ -167,6 +167,7 @@ c:member:`TS_CONFIG_SSL_HSTS_MAX_AGE`
:ts:cv:`prox
c:member:`TS_CONFIG_URL_REMAP_PRISTINE_HOST_HDR`
:ts:cv:`proxy.config.url_remap.pristine_host_hdr`
c:member:`TS_CONFIG_WEBSOCKET_ACTIVE_TIMEOUT`
:ts:cv:`proxy.config.websocket.active_timeout`
c:member:`TS_CONFIG_WEBSOCKET_NO_ACTIVITY_TIMEOUT`
:ts:cv:`proxy.config.websocket.no_activity_timeout`
+==================================================================
====================================================================
Examples
========
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
