[trafficserver] branch master updated: Minor doc fix since combo handler is part of ESI that got moved out of experimental

[ki...@apache.org]

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

kichan 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  73421db   Minor doc fix since combo handler is part of ESI that got moved out of experimental
73421db is described below

commit 73421dbe4cf2382eb3ef4f921e2e5d140e4881cf
Author: Kit Chan <ki...@apache.org>
AuthorDate: Thu Oct 20 23:44:37 2016 -0700

    Minor doc fix since combo handler is part of ESI that got moved out of experimental
---
 doc/admin-guide/plugins/index.en.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/admin-guide/plugins/index.en.rst b/doc/admin-guide/plugins/index.en.rst
index 32918ce..e35765f 100644
--- a/doc/admin-guide/plugins/index.en.rst
+++ b/doc/admin-guide/plugins/index.en.rst
@@ -48,6 +48,7 @@ Plugins that are considered stable are installed by default in |TS| releases.
    AWS S3 Authentication <s3_auth.en>
    AuthProxy <authproxy.en>
    Background Fetch <background_fetch.en>
+   Combo Handler <combo_handler.en>
    Configuration Remap <conf_remap.en>
    ESI <esi.en>
    GZip <gzip.en>
@@ -70,6 +71,9 @@ Plugins that are considered stable are installed by default in |TS| releases.
 :doc:`Background Fetch <background_fetch.en>`
    Proactively fetch content from Origin in a way that it will fill the object into cache.
 
+:doc:`Combo Handler <combo_handler.en>`
+   Provides an intelligent way to combine multiple URLs into a single URL, and have Apache Traffic Server combine the components into one response.
+
 :doc:`Configuration Remap <conf_remap.en>`
     Override configuration directives on a per-rule basis.
 
@@ -124,7 +128,6 @@ directory of the |TS| source tree. Experimental plugins can be compiled by passi
    Cache Key Manipulation <cachekey.en>
    Cache Promote <cache_promote.en>
    Collapsed-Forwarding <collapsed_forwarding.en>
-   Combo Handler <combo_handler.en>
    Epic <epic.en>
    Escalate <escalate.en>
    GeoIP ACL <geoip_acl.en>
@@ -157,9 +160,6 @@ directory of the |TS| source tree. Experimental plugins can be compiled by passi
    Allows to Collapse multiple Concurrent requests by downloading once from the Origin and serving
    all clients in parallel.
 
-:doc:`Combo Handler <combo_handler.en>`
-   Provides an intelligent way to combine multiple URLs into a single URL, and have Apache Traffic Server combine the components into one response.
-
 :doc:`Epic <epic.en>`
    Emits Traffic Server metrics in a format that is consumed by the Epic Network Monitoring System.
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].