This is an automated email from the ASF dual-hosted git repository. amc 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 0ec4f64 Doc: Cleanup warnings. 0ec4f64 is described below commit 0ec4f643af03b34c3f7dfd81f69ef0ae7b69c254 Author: Alan M. Carroll <a...@apache.org> AuthorDate: Thu Dec 6 12:33:54 2018 -0600 Doc: Cleanup warnings. --- doc/admin-guide/files/parent.config.en.rst | 2 +- doc/admin-guide/plugins/header_rewrite.en.rst | 36 ++++++++++++---------- .../api/functions/TSContCall.en.rst | 2 +- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/doc/admin-guide/files/parent.config.en.rst b/doc/admin-guide/files/parent.config.en.rst index ca54825..4f4de28 100644 --- a/doc/admin-guide/files/parent.config.en.rst +++ b/doc/admin-guide/files/parent.config.en.rst @@ -143,7 +143,7 @@ The following list shows the possible actions and their allowed values. If ``round_robin`` is set to ``consistent_hash``, you may add a ``unique hash string`` following the ``weight`` for each parent. The ``hash string`` must start with ``&`` - and is used to build both the primary and secondary rings using the ``hash string`` + and is used to build both the primary and secondary rings using the ``hash string`` for each parent insted of the parents ``hostname`` or ``ip address``. This can be useful so that two different hosts may be used to cache the same requests. Example:: diff --git a/doc/admin-guide/plugins/header_rewrite.en.rst b/doc/admin-guide/plugins/header_rewrite.en.rst index edb3935..e0eeec3 100644 --- a/doc/admin-guide/plugins/header_rewrite.en.rst +++ b/doc/admin-guide/plugins/header_rewrite.en.rst @@ -1,18 +1,14 @@ -.. Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at +.. Licensed to the Apache Software Foundation (ASF) under one or more contributor license + agreements. See the NOTICE file distributed with this work for additional information regarding + copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with the License. You may obtain + a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations + Unless required by applicable law or agreed to in writing, software distributed under the License + is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + or implied. See the License for the specific language governing permissions and limitations under the License. .. include:: ../../common.defs @@ -820,9 +816,9 @@ String concatenation is not yet supported in condition testing. 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: -======================== ================================================================================== +======================== ========================================================================== Old expansion variable Condition variable to use with concatenatinos -======================== ================================================================================== +======================== ========================================================================== %<proto> %{CLIENT-URL:SCHEME} %<port> %{CLIENT-URL:PORT} %<chi> %{IP:CLIENT}, %{INBOUND:REMOTE-ADDR} or e.g. %{CIDR:24,48} @@ -830,6 +826,7 @@ Old expansion variable Condition variable to use with concatenatinos %<cqhm> %{METHOD} %<cque> %[CLIENT-URL} %<cquup> %{CLIENT-URL:PATH} +======================== ========================================================================== Header Values ------------- @@ -865,13 +862,18 @@ The URL part names which may be used for these conditions and actions are: Part Description ======== ====================================================================== HOST Full hostname. -PATH URL substring beginning with (but not including) the first ``/`` after the hostname up to, - but not including, the query string. + +PATH URL substring beginning with (but not including) the first ``/`` after + the hostname up to, but not including, the query string. + PORT Port number. + QUERY URL substring from the ``?``, signifying the beginning of the query parameters, until the end of the URL. Empty string if there were no - quuery parameters. + query parameters. + SCHEME URL scheme in use (e.g. ``http`` and ``https``). + URL The complete URL. ======== ====================================================================== diff --git a/doc/developer-guide/api/functions/TSContCall.en.rst b/doc/developer-guide/api/functions/TSContCall.en.rst index 5453bb3..8f99332 100644 --- a/doc/developer-guide/api/functions/TSContCall.en.rst +++ b/doc/developer-guide/api/functions/TSContCall.en.rst @@ -44,7 +44,7 @@ As a result :func:`TSContCall` will effectively do:: return CallbackHandler(contp, event, edata); -If there is a mutex associated with :arg:`contp`, :func:`TSComtCall` assumes that mutex is held already. +If there is a mutex associated with :arg:`contp`, :func:`TSContCall` assumes that mutex is held already. :func:`TSContCall` will directly call the handler associated with the continuation. It will return the value returned by the handler in :arg:`contp`.