trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject [37/50] [abbrv] git commit: Separate the Admin and SDK guides.
Date Tue, 04 Jun 2013 16:46:31 GMT
Separate the Admin and SDK guides.


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/a782694b
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/a782694b
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/a782694b

Branch: refs/heads/3.3.x
Commit: a782694ba2c907df46c66f69a6a4bd2ba853d1f3
Parents: 7b175f0
Author: James Peach <jpeach@apache.org>
Authored: Sat Jun 1 18:53:45 2013 -0700
Committer: James Peach <jpeach@apache.org>
Committed: Sat Jun 1 22:00:34 2013 -0700

----------------------------------------------------------------------
 doc/Makefile.am                                    |   74 +-
 doc/admin/cluster-howto.en.rst                     |  170 +
 doc/admin/configuration-files.en.rst               |   43 +
 doc/admin/configuration-files/cache.config.en.rst  |  133 +
 .../configuration-files/congestion.config.en.rst   |  197 ++
 .../configuration-files/hosting.config.en.rst      |  101 +
 doc/admin/configuration-files/icp.config.en.rst    |   99 +
 .../configuration-files/ip_allow.config.en.rst     |   89 +
 .../configuration-files/log_hosts.config.en.rst    |   68 +
 .../configuration-files/logs_xml.config.en.rst     |  363 +++
 doc/admin/configuration-files/parent.config.en.rst |  141 +
 doc/admin/configuration-files/plugin.config.en.rst |   48 +
 .../configuration-files/records.config.en.rst      | 2501 +++++++++++++++
 doc/admin/configuration-files/remap.config.en.rst  |  284 ++
 .../configuration-files/splitdns.config.en.rst     |  124 +
 .../ssl_multicert.config.en.rst                    |   78 +
 .../configuration-files/storage.config.en.rst      |  135 +
 doc/admin/configuration-files/update.config.en.rst |  200 ++
 doc/admin/configuration-files/volume.config.en.rst |   72 +
 doc/admin/configuring-cache.en.rst                 |  365 +++
 doc/admin/configuring-traffic-server.en.rst        |   88 +
 doc/admin/event-logging-formats.en.rst             |  364 +++
 doc/admin/explicit-proxy-caching.en.rst            |   93 +
 doc/admin/faqs.en.rst                              |  408 +++
 doc/admin/forward-proxy.en.rst                     |   90 +
 doc/admin/getting-started.en.rst                   |  206 ++
 doc/admin/hierachical-caching.en.rst               |  188 ++
 doc/admin/http-proxy-caching.en.rst                |  793 +++++
 doc/admin/index.en.rst                             |  314 ++
 doc/admin/monitoring-traffic.en.rst                |  110 +
 doc/admin/plugins.en.rst                           |   81 +
 doc/admin/plugins/balancer.en.rst                  |   92 +
 doc/admin/plugins/buffer_upload.en.rst             |   89 +
 doc/admin/plugins/cacheurl.en.rst                  |   58 +
 doc/admin/plugins/combo_handler.en.rst             |   74 +
 doc/admin/plugins/esi.en.rst                       |   22 +
 doc/admin/plugins/geoip_acl.en.rst                 |  111 +
 doc/admin/plugins/gzip.en.rst                      |   98 +
 doc/admin/plugins/header_filter.en.rst             |  143 +
 doc/admin/plugins/hipes.en.rst                     |   64 +
 doc/admin/plugins/mysql_remap.en.rst               |   93 +
 doc/admin/plugins/regex_remap.en.rst               |  162 +
 doc/admin/plugins/stale_while_revalidate.en.rst    |   21 +
 doc/admin/plugins/stats_over_http.en.rst           |   37 +
 doc/admin/reverse-proxy-http-redirects.en.rst      |  329 ++
 doc/admin/security-options.en.rst                  |  248 ++
 doc/admin/traffic-line-commands.en.rst             |  763 +++++
 doc/admin/traffic-server-error-messages.en.rst     |  396 +++
 doc/admin/transparent-proxy.en.rst                 |  117 +
 doc/admin/transparent-proxy/bridge.en.rst          |  204 ++
 doc/admin/transparent-proxy/build.en.rst           |   58 +
 doc/admin/transparent-proxy/router-inline.en.rst   |   92 +
 .../transparent-proxy/wccp-configuration.en.rst    |  155 +
 doc/admin/working-log-files.en.rst                 | 1004 ++++++
 doc/admin/working-log-files/log-formats.en.rst     |  360 +++
 doc/conf.py                                        |  285 ++
 doc/sdk/actions-guide.en.rst                       |  180 ++
 doc/sdk/actions-guide/hosts-lookup-api.en.rst      |   28 +
 doc/sdk/adding-statistics.en.rst                   |   72 +
 .../adding-statistics/coupled-statistics.en.rst    |  121 +
 .../viewing-statistics-using-traffic-line.en.rst   |   33 +
 doc/sdk/continuations.en.rst                       |  135 +
 .../how-to-activate-continuations.en.rst           |   36 +
 .../continuations/writing-handler-functions.en.rst |  109 +
 doc/sdk/getting-started.en.rst                     |  249 ++
 doc/sdk/getting-started/a-simple-plugin.en.rst     |  118 +
 doc/sdk/getting-started/naming-conventions.en.rst  |   51 +
 ...plugin-registration-and-version-checking.en.rst |   86 +
 doc/sdk/header-based-plugin-examples.en.rst        |   68 +
 .../basic-authorization-plugin.en.rst              |   43 +
 ...-and-getting-a-handle-to-the-transaction.en.rst |   45 +
 .../setting-a-transaction-hook.en.rst              |   56 +
 .../working-with-http-headers.en.rst               |   98 +
 .../blacklist-plugin.en.rst                        |  107 +
 ...ccessing-the-transaction-being-processed.en.rst |   61 +
 .../blacklist-plugin/setting-a-global-hook.en.rst  |   37 +
 .../setting-up-a-transaction-hook.en.rst           |   81 +
 .../working-with-http-header-functions.en.rst      |   63 +
 doc/sdk/how-to-create-trafficserver-plugins.en.rst |  227 ++
 .../roadmap-for-creating-plugins.en.rst            |   90 +
 doc/sdk/http-headers.en.rst                        |  141 +
 ...uide-to-trafficserver-http-header-system.en.rst |   63 +
 .../duplicate-mime-fields-are-not-coalesced.en.rst |   30 +
 ...ways-belong-to-an-associated-mime-header.en.rst |   70 +
 .../release-marshal-buffer-handles.en.rst          |   88 +
 doc/sdk/http-headers/http-headers.en.rst           |  172 +
 doc/sdk/http-headers/marshal-buffers.en.rst        |   56 +
 doc/sdk/http-headers/mime-headers.en.rst           |  437 +++
 doc/sdk/http-headers/urls.en.rst                   |  134 +
 doc/sdk/http-hooks-and-transactions.en.rst         |   83 +
 .../adding-hooks.en.rst                            |  149 +
 .../http-alternate-selection.en.rst                |  192 ++
 .../http-sessions.en.rst                           |   52 +
 .../http-transactions.en.rst                       |  205 ++
 .../initiate-http-connection.en.rst                |   25 +
 .../intercepting-http-transactions.en.rst          |   30 +
 doc/sdk/http-transformation-plugin.en.rst          |  159 +
 .../append-transform-plugin.en.rst                 |  145 +
 ...mple-buffered-null-transformation-plugin.en.rst |  213 ++
 .../sample-null-transformation-plugin.en.rst       |  231 ++
 doc/sdk/index.en.rst                               |   71 +
 doc/sdk/io-guide.en.rst                            |  194 ++
 doc/sdk/io-guide/guide-to-cache-api.en.rst         |   69 +
 doc/sdk/io-guide/guide-to-cache-api/errors.en.rst  |   31 +
 doc/sdk/io-guide/guide-to-cache-api/example.en.rst |   76 +
 .../how-to-do-a-cache-remove.en.rst                |   31 +
 .../how-to-do-a-cache-write.en.rst                 |   34 +
 doc/sdk/io-guide/io-buffers.en.rst                 |   52 +
 doc/sdk/io-guide/net-vconnections.en.rst           |   31 +
 doc/sdk/io-guide/transformations.en.rst            |  182 ++
 doc/sdk/io-guide/vios.en.rst                       |   59 +
 doc/sdk/misc-interface-guide.en.rst                |   60 +
 .../misc-interface-guide/memory-allocation.en.rst  |   46 +
 .../misc-interface-guide/thread-functions.en.rst   |   34 +
 doc/sdk/misc-interface-guide/tsfopen-family.en.rst |   54 +
 doc/sdk/mutex-guide.en.rst                         |  411 +++
 doc/sdk/new-protocol-plugins.en.rst                |  359 +++
 doc/sdk/plugin-configurations.en.rst               |  116 +
 doc/sdk/plugin-management.en.rst                   |   28 +
 .../guide-to-the-logging-api.en.rst                |  103 +
 ...ng-trafficserver-settings-and-statistics.en.rst |   59 +
 doc/sdk/preface.en.rst                             |   49 +
 doc/sdk/preface/how-to-use-this-book.en.rst        |  132 +
 doc/sdk/preface/typographical-conventions.en.rst   |   36 +
 doc/sdk/remap-plugin.en.rst                        |   75 +
 doc/sdk/remap-plugin/example-query-remap.en.rst    |  152 +
 doc/sdk/sample-source-code.en.rst                  |  309 ++
 doc/sdk/troubleshooting-tips.en.rst                |   57 +
 .../debugging-memory-leaks.en.rst                  |   32 +
 .../unable-to-debug-tags.en.rst                    |  113 +
 .../unable-to-load-plugins.en.rst                  |   36 +
 .../troubleshooting-tips/using-a-debugger.en.rst   |   40 +
 doc/source/_static/images/admin/alarm.jpg          |  Bin 95132 -> 0 bytes
 .../_static/images/admin/ats-basic-traffic.png     |  Bin 31464 -> 0 bytes
 .../_static/images/admin/ats-traffic-bridge.png    |  Bin 22915 -> 0 bytes
 doc/source/_static/images/admin/cache_hit.jpg      |  Bin 79909 -> 0 bytes
 doc/source/_static/images/admin/cache_miss.jpg     |  Bin 108282 -> 0 bytes
 doc/source/_static/images/admin/cachehrc.jpg       |  Bin 76254 -> 0 bytes
 doc/source/_static/images/admin/configur.jpg       |  Bin 102958 -> 0 bytes
 doc/source/_static/images/admin/dash.jpg           |  Bin 111902 -> 0 bytes
 doc/source/_static/images/admin/dash3.jpg          |  Bin 105424 -> 0 bytes
 doc/source/_static/images/admin/firewall.jpg       |  Bin 54553 -> 0 bytes
 doc/source/_static/images/admin/httprvs.jpg        |  Bin 78185 -> 0 bytes
 doc/source/_static/images/admin/logcolat.jpg       |  Bin 112020 -> 0 bytes
 doc/source/_static/images/admin/monitor.jpg        |  Bin 95403 -> 0 bytes
 .../images/admin/netscape_common_format.jpg        |  Bin 29378 -> 0 bytes
 .../images/admin/netscape_extended2_format.jpg     |  Bin 42918 -> 0 bytes
 .../images/admin/netscape_extended_format.jpg      |  Bin 37438 -> 0 bytes
 doc/source/_static/images/admin/process.jpg        |  Bin 136229 -> 0 bytes
 doc/source/_static/images/admin/records.jpg        |  Bin 166227 -> 0 bytes
 doc/source/_static/images/admin/revproxy.jpg       |  Bin 141814 -> 0 bytes
 doc/source/_static/images/admin/squid_format.jpg   |  Bin 30949 -> 0 bytes
 doc/source/_static/images/admin/ssl_c.jpg          |  Bin 71033 -> 0 bytes
 doc/source/_static/images/admin/ssl_os.jpg         |  Bin 75656 -> 0 bytes
 doc/source/_static/images/admin/stat.jpg           |  Bin 48740 -> 0 bytes
 .../_static/images/admin/summary-mixt.log_file.jpg |  Bin 32797 -> 0 bytes
 .../_static/images/admin/wccp-shared-outer.png     |  Bin 54957 -> 0 bytes
 doc/source/_static/images/companies/akamai.png     |  Bin 7655 -> 0 bytes
 doc/source/_static/images/companies/betfair.png    |  Bin 4329 -> 0 bytes
 doc/source/_static/images/companies/brainswear.png |  Bin 6452 -> 0 bytes
 doc/source/_static/images/companies/comcast.png    |  Bin 5504 -> 0 bytes
 doc/source/_static/images/companies/devaus.png     |  Bin 3545 -> 0 bytes
 doc/source/_static/images/companies/frisch.png     |  Bin 7873 -> 0 bytes
 doc/source/_static/images/companies/godaddy.png    |  Bin 9593 -> 0 bytes
 doc/source/_static/images/companies/guruve.png     |  Bin 3124 -> 0 bytes
 doc/source/_static/images/companies/internode.png  |  Bin 8323 -> 0 bytes
 doc/source/_static/images/companies/linkedin.png   |  Bin 7665 -> 0 bytes
 doc/source/_static/images/companies/omniti.png     |  Bin 5032 -> 0 bytes
 doc/source/_static/images/companies/powerhttp.png  |  Bin 5340 -> 0 bytes
 doc/source/_static/images/companies/sic.png        |  Bin 9999 -> 0 bytes
 doc/source/_static/images/companies/suomen.png     |  Bin 7851 -> 0 bytes
 doc/source/_static/images/companies/taobao.png     |  Bin 7951 -> 0 bytes
 doc/source/_static/images/companies/vng.png        |  Bin 4258 -> 0 bytes
 doc/source/_static/images/companies/yahoo.png      |  Bin 5014 -> 0 bytes
 doc/source/_static/images/docbook/caution.png      |  Bin 1250 -> 0 bytes
 doc/source/_static/images/docbook/important.png    |  Bin 722 -> 0 bytes
 doc/source/_static/images/docbook/note.png         |  Bin 490 -> 0 bytes
 doc/source/_static/images/docbook/tip.png          |  Bin 449 -> 0 bytes
 doc/source/_static/images/docbook/ts75.png         |  Bin 9520 -> 0 bytes
 doc/source/_static/images/download_background.png  |  Bin 290 -> 0 bytes
 doc/source/_static/images/download_ts.png          |  Bin 4560 -> 0 bytes
 doc/source/_static/images/grey_paper.jpg           |  Bin 7290 -> 0 bytes
 doc/source/_static/images/press/trafficserver.svg  |  164 -
 .../_static/images/press/ts_logo_tm_1024x196.png   |  Bin 21235 -> 0 bytes
 .../_static/images/press/ts_logo_tm_1960x375.png   |  Bin 41128 -> 0 bytes
 .../_static/images/press/ts_logo_tm_380x73.png     |  Bin 7500 -> 0 bytes
 doc/source/_static/images/press/tsicon.png         |  Bin 4328 -> 0 bytes
 doc/source/_static/images/press/tsicon_large.png   |  Bin 8307 -> 0 bytes
 doc/source/_static/images/press/tsicon_small.png   |  Bin 2132 -> 0 bytes
 .../_static/images/sdk/Protocol_state_diagram.jpg  |  Bin 62342 -> 0 bytes
 doc/source/_static/images/sdk/Uses.jpg             |  Bin 96105 -> 0 bytes
 doc/source/_static/images/sdk/blacklist75.jpg      |  Bin 93834 -> 0 bytes
 doc/source/_static/images/sdk/event_sys80.jpg      |  Bin 70729 -> 0 bytes
 doc/source/_static/images/sdk/evt_plugin120.jpg    |  Bin 82354 -> 0 bytes
 .../_static/images/sdk/http_header_struct.jpg      |  Bin 41668 -> 0 bytes
 doc/source/_static/images/sdk/http_headers.jpg     |  Bin 83292 -> 0 bytes
 doc/source/_static/images/sdk/http_state2.jpg      |  Bin 147802 -> 0 bytes
 doc/source/_static/images/sdk/marshall_buffers.jpg |  Bin 90358 -> 0 bytes
 doc/source/_static/images/sdk/plugin_process.jpg   |  Bin 34531 -> 0 bytes
 doc/source/_static/images/sdk/protocol_evt.jpg     |  Bin 61809 -> 0 bytes
 doc/source/_static/images/sdk/protocol_sm_big.jpg  |  Bin 59301 -> 0 bytes
 doc/source/_static/images/sdk/transact75.jpg       |  Bin 49702 -> 0 bytes
 doc/source/_static/images/sdk/transact_hook75.jpg  |  Bin 84733 -> 0 bytes
 doc/source/_static/images/sdk/txn_sm.jpg           |  Bin 94051 -> 0 bytes
 doc/source/_static/images/sdk/vconn_buf_output.jpg |  Bin 44215 -> 0 bytes
 doc/source/_static/images/sdk/vconn_buffer.jpg     |  Bin 64914 -> 0 bytes
 doc/source/_static/images/sdk/vconnection.jpg      |  Bin 50918 -> 0 bytes
 doc/source/_static/images/sdk/vconnection1.jpg     |  Bin 81340 -> 0 bytes
 doc/source/_static/images/sdk/vconnection2.jpg     |  Bin 57055 -> 0 bytes
 doc/source/_static/images/trans_logo_148x132.png   |  Bin 2356 -> 0 bytes
 doc/source/_static/images/trans_logo_150x30.gif    |  Bin 1514 -> 0 bytes
 doc/source/_static/images/trans_logo_150x30.png    |  Bin 1285 -> 0 bytes
 doc/source/_static/images/trans_logo_150x32.png    |  Bin 2080 -> 0 bytes
 doc/source/_static/images/trans_logo_160x35.png    |  Bin 2090 -> 0 bytes
 doc/source/_static/images/trans_logo_250x49.gif    |  Bin 2287 -> 0 bytes
 doc/source/_static/images/trans_logo_250x49.png    |  Bin 2072 -> 0 bytes
 doc/source/_static/images/trans_logo_350x69.gif    |  Bin 3180 -> 0 bytes
 doc/source/_static/images/trans_logo_350x69.png    |  Bin 2910 -> 0 bytes
 doc/source/_static/images/trans_logo_420x95.png    |  Bin 4213 -> 0 bytes
 doc/source/_static/images/trans_logo_603x132.png   |  Bin 5665 -> 0 bytes
 doc/source/_static/images/trans_logo_tm_380x69.png |  Bin 4192 -> 0 bytes
 doc/source/_static/images/ts75.png                 |  Bin 7340 -> 0 bytes
 doc/source/_static/images/warning.png              |  Bin 394 -> 0 bytes
 doc/source/admin/cluster-howto.en.rst              |  170 -
 doc/source/admin/configuration-files.en.rst        |   43 -
 .../admin/configuration-files/cache.config.en.rst  |  133 -
 .../configuration-files/congestion.config.en.rst   |  197 --
 .../configuration-files/hosting.config.en.rst      |  101 -
 .../admin/configuration-files/icp.config.en.rst    |   99 -
 .../configuration-files/ip_allow.config.en.rst     |   89 -
 .../configuration-files/log_hosts.config.en.rst    |   68 -
 .../configuration-files/logs_xml.config.en.rst     |  363 ---
 .../admin/configuration-files/parent.config.en.rst |  141 -
 .../admin/configuration-files/plugin.config.en.rst |   48 -
 .../configuration-files/records.config.en.rst      | 2501 ---------------
 .../admin/configuration-files/remap.config.en.rst  |  284 --
 .../configuration-files/splitdns.config.en.rst     |  124 -
 .../ssl_multicert.config.en.rst                    |   78 -
 .../configuration-files/storage.config.en.rst      |  135 -
 .../admin/configuration-files/update.config.en.rst |  200 --
 .../admin/configuration-files/volume.config.en.rst |   72 -
 doc/source/admin/configuring-cache.en.rst          |  365 ---
 doc/source/admin/configuring-traffic-server.en.rst |   88 -
 doc/source/admin/event-logging-formats.en.rst      |  364 ---
 doc/source/admin/explicit-proxy-caching.en.rst     |   93 -
 doc/source/admin/faqs.en.rst                       |  408 ---
 doc/source/admin/forward-proxy.en.rst              |   90 -
 doc/source/admin/getting-started.en.rst            |  206 --
 doc/source/admin/hierachical-caching.en.rst        |  188 --
 doc/source/admin/http-proxy-caching.en.rst         |  793 -----
 doc/source/admin/index.en.rst                      |  314 --
 doc/source/admin/monitoring-traffic.en.rst         |  110 -
 doc/source/admin/plugins.en.rst                    |   81 -
 doc/source/admin/plugins/balancer.en.rst           |   92 -
 doc/source/admin/plugins/buffer_upload.en.rst      |   89 -
 doc/source/admin/plugins/cacheurl.en.rst           |   58 -
 doc/source/admin/plugins/combo_handler.en.rst      |   74 -
 doc/source/admin/plugins/esi.en.rst                |   22 -
 doc/source/admin/plugins/geoip_acl.en.rst          |  111 -
 doc/source/admin/plugins/gzip.en.rst               |   98 -
 doc/source/admin/plugins/header_filter.en.rst      |  143 -
 doc/source/admin/plugins/hipes.en.rst              |   64 -
 doc/source/admin/plugins/mysql_remap.en.rst        |   93 -
 doc/source/admin/plugins/regex_remap.en.rst        |  162 -
 .../admin/plugins/stale_while_revalidate.en.rst    |   21 -
 doc/source/admin/plugins/stats_over_http.en.rst    |   37 -
 .../admin/reverse-proxy-http-redirects.en.rst      |  329 --
 doc/source/admin/security-options.en.rst           |  248 --
 doc/source/admin/traffic-line-commands.en.rst      |  763 -----
 .../admin/traffic-server-error-messages.en.rst     |  396 ---
 doc/source/admin/transparent-proxy.en.rst          |  117 -
 doc/source/admin/transparent-proxy/bridge.en.rst   |  204 --
 doc/source/admin/transparent-proxy/build.en.rst    |   58 -
 .../admin/transparent-proxy/router-inline.en.rst   |   92 -
 .../transparent-proxy/wccp-configuration.en.rst    |  155 -
 doc/source/admin/working-log-files.en.rst          | 1004 ------
 .../admin/working-log-files/log-formats.en.rst     |  360 ---
 doc/source/conf.py                                 |  285 --
 doc/source/index.en.rst                            |   37 -
 doc/source/sdk/actions-guide.en.rst                |  180 --
 .../sdk/actions-guide/hosts-lookup-api.en.rst      |   28 -
 doc/source/sdk/adding-statistics.en.rst            |   72 -
 .../adding-statistics/coupled-statistics.en.rst    |  122 -
 .../viewing-statistics-using-traffic-line.en.rst   |   33 -
 doc/source/sdk/continuations.en.rst                |  135 -
 .../how-to-activate-continuations.en.rst           |   36 -
 .../continuations/writing-handler-functions.en.rst |  109 -
 doc/source/sdk/getting-started.en.rst              |  249 --
 .../sdk/getting-started/a-simple-plugin.en.rst     |  118 -
 .../sdk/getting-started/naming-conventions.en.rst  |   51 -
 ...plugin-registration-and-version-checking.en.rst |   86 -
 doc/source/sdk/header-based-plugin-examples.en.rst |   68 -
 .../basic-authorization-plugin.en.rst              |   43 -
 ...-and-getting-a-handle-to-the-transaction.en.rst |   45 -
 .../setting-a-transaction-hook.en.rst              |   56 -
 .../working-with-http-headers.en.rst               |   98 -
 .../blacklist-plugin.en.rst                        |  107 -
 ...ccessing-the-transaction-being-processed.en.rst |   61 -
 .../blacklist-plugin/setting-a-global-hook.en.rst  |   37 -
 .../setting-up-a-transaction-hook.en.rst           |   81 -
 .../working-with-http-header-functions.en.rst      |   63 -
 .../sdk/how-to-create-trafficserver-plugins.en.rst |  227 --
 .../roadmap-for-creating-plugins.en.rst            |   90 -
 doc/source/sdk/http-headers.en.rst                 |  141 -
 ...uide-to-trafficserver-http-header-system.en.rst |   63 -
 .../duplicate-mime-fields-are-not-coalesced.en.rst |   30 -
 ...ways-belong-to-an-associated-mime-header.en.rst |   70 -
 .../release-marshal-buffer-handles.en.rst          |   88 -
 doc/source/sdk/http-headers/http-headers.en.rst    |  172 -
 doc/source/sdk/http-headers/marshal-buffers.en.rst |   56 -
 doc/source/sdk/http-headers/mime-headers.en.rst    |  437 ---
 doc/source/sdk/http-headers/urls.en.rst            |  134 -
 doc/source/sdk/http-hooks-and-transactions.en.rst  |   83 -
 .../adding-hooks.en.rst                            |  149 -
 .../http-alternate-selection.en.rst                |  192 --
 .../http-sessions.en.rst                           |   52 -
 .../http-transactions.en.rst                       |  205 --
 .../initiate-http-connection.en.rst                |   25 -
 .../intercepting-http-transactions.en.rst          |   30 -
 doc/source/sdk/http-transformation-plugin.en.rst   |  159 -
 .../append-transform-plugin.en.rst                 |  145 -
 ...mple-buffered-null-transformation-plugin.en.rst |  213 --
 .../sample-null-transformation-plugin.en.rst       |  231 --
 doc/source/sdk/index.en.rst                        |   63 -
 doc/source/sdk/io-guide.en.rst                     |  194 --
 doc/source/sdk/io-guide/guide-to-cache-api.en.rst  |   69 -
 .../sdk/io-guide/guide-to-cache-api/errors.en.rst  |   31 -
 .../sdk/io-guide/guide-to-cache-api/example.en.rst |   76 -
 .../how-to-do-a-cache-remove.en.rst                |   31 -
 .../how-to-do-a-cache-write.en.rst                 |   34 -
 doc/source/sdk/io-guide/io-buffers.en.rst          |   52 -
 doc/source/sdk/io-guide/net-vconnections.en.rst    |   31 -
 doc/source/sdk/io-guide/transformations.en.rst     |  182 --
 doc/source/sdk/io-guide/vios.en.rst                |   59 -
 doc/source/sdk/misc-interface-guide.en.rst         |   60 -
 .../misc-interface-guide/memory-allocation.en.rst  |   46 -
 .../misc-interface-guide/thread-functions.en.rst   |   34 -
 .../sdk/misc-interface-guide/tsfopen-family.en.rst |   54 -
 doc/source/sdk/mutex-guide.en.rst                  |  411 ---
 doc/source/sdk/new-protocol-plugins.en.rst         |  359 ---
 doc/source/sdk/plugin-configurations.en.rst        |  116 -
 doc/source/sdk/plugin-management.en.rst            |   28 -
 .../guide-to-the-logging-api.en.rst                |  103 -
 ...ng-trafficserver-settings-and-statistics.en.rst |   59 -
 doc/source/sdk/preface.en.rst                      |   49 -
 doc/source/sdk/preface/how-to-use-this-book.en.rst |  132 -
 .../sdk/preface/typographical-conventions.en.rst   |   36 -
 doc/source/sdk/remap-plugin.en.rst                 |   75 -
 .../sdk/remap-plugin/example-query-remap.en.rst    |  152 -
 doc/source/sdk/sample-source-code.en.rst           |  309 --
 doc/source/sdk/troubleshooting-tips.en.rst         |   57 -
 .../debugging-memory-leaks.en.rst                  |   32 -
 .../unable-to-debug-tags.en.rst                    |  113 -
 .../unable-to-load-plugins.en.rst                  |   36 -
 .../troubleshooting-tips/using-a-debugger.en.rst   |   40 -
 doc/static/images/admin/alarm.jpg                  |  Bin 0 -> 95132 bytes
 doc/static/images/admin/ats-basic-traffic.png      |  Bin 0 -> 31464 bytes
 doc/static/images/admin/ats-traffic-bridge.png     |  Bin 0 -> 22915 bytes
 doc/static/images/admin/cache_hit.jpg              |  Bin 0 -> 79909 bytes
 doc/static/images/admin/cache_miss.jpg             |  Bin 0 -> 108282 bytes
 doc/static/images/admin/cachehrc.jpg               |  Bin 0 -> 76254 bytes
 doc/static/images/admin/configur.jpg               |  Bin 0 -> 102958 bytes
 doc/static/images/admin/dash.jpg                   |  Bin 0 -> 111902 bytes
 doc/static/images/admin/dash3.jpg                  |  Bin 0 -> 105424 bytes
 doc/static/images/admin/firewall.jpg               |  Bin 0 -> 54553 bytes
 doc/static/images/admin/httprvs.jpg                |  Bin 0 -> 78185 bytes
 doc/static/images/admin/logcolat.jpg               |  Bin 0 -> 112020 bytes
 doc/static/images/admin/monitor.jpg                |  Bin 0 -> 95403 bytes
 doc/static/images/admin/netscape_common_format.jpg |  Bin 0 -> 29378 bytes
 .../images/admin/netscape_extended2_format.jpg     |  Bin 0 -> 42918 bytes
 .../images/admin/netscape_extended_format.jpg      |  Bin 0 -> 37438 bytes
 doc/static/images/admin/process.jpg                |  Bin 0 -> 136229 bytes
 doc/static/images/admin/records.jpg                |  Bin 0 -> 166227 bytes
 doc/static/images/admin/revproxy.jpg               |  Bin 0 -> 141814 bytes
 doc/static/images/admin/squid_format.jpg           |  Bin 0 -> 30949 bytes
 doc/static/images/admin/ssl_c.jpg                  |  Bin 0 -> 71033 bytes
 doc/static/images/admin/ssl_os.jpg                 |  Bin 0 -> 75656 bytes
 doc/static/images/admin/stat.jpg                   |  Bin 0 -> 48740 bytes
 doc/static/images/admin/summary-mixt.log_file.jpg  |  Bin 0 -> 32797 bytes
 doc/static/images/admin/wccp-shared-outer.png      |  Bin 0 -> 54957 bytes
 doc/static/images/companies/akamai.png             |  Bin 0 -> 7655 bytes
 doc/static/images/companies/betfair.png            |  Bin 0 -> 4329 bytes
 doc/static/images/companies/brainswear.png         |  Bin 0 -> 6452 bytes
 doc/static/images/companies/comcast.png            |  Bin 0 -> 5504 bytes
 doc/static/images/companies/devaus.png             |  Bin 0 -> 3545 bytes
 doc/static/images/companies/frisch.png             |  Bin 0 -> 7873 bytes
 doc/static/images/companies/godaddy.png            |  Bin 0 -> 9593 bytes
 doc/static/images/companies/guruve.png             |  Bin 0 -> 3124 bytes
 doc/static/images/companies/internode.png          |  Bin 0 -> 8323 bytes
 doc/static/images/companies/linkedin.png           |  Bin 0 -> 7665 bytes
 doc/static/images/companies/omniti.png             |  Bin 0 -> 5032 bytes
 doc/static/images/companies/powerhttp.png          |  Bin 0 -> 5340 bytes
 doc/static/images/companies/sic.png                |  Bin 0 -> 9999 bytes
 doc/static/images/companies/suomen.png             |  Bin 0 -> 7851 bytes
 doc/static/images/companies/taobao.png             |  Bin 0 -> 7951 bytes
 doc/static/images/companies/vng.png                |  Bin 0 -> 4258 bytes
 doc/static/images/companies/yahoo.png              |  Bin 0 -> 5014 bytes
 doc/static/images/docbook/caution.png              |  Bin 0 -> 1250 bytes
 doc/static/images/docbook/important.png            |  Bin 0 -> 722 bytes
 doc/static/images/docbook/note.png                 |  Bin 0 -> 490 bytes
 doc/static/images/docbook/tip.png                  |  Bin 0 -> 449 bytes
 doc/static/images/docbook/ts75.png                 |  Bin 0 -> 9520 bytes
 doc/static/images/download_background.png          |  Bin 0 -> 290 bytes
 doc/static/images/download_ts.png                  |  Bin 0 -> 4560 bytes
 doc/static/images/grey_paper.jpg                   |  Bin 0 -> 7290 bytes
 doc/static/images/press/trafficserver.svg          |  164 +
 doc/static/images/press/ts_logo_tm_1024x196.png    |  Bin 0 -> 21235 bytes
 doc/static/images/press/ts_logo_tm_1960x375.png    |  Bin 0 -> 41128 bytes
 doc/static/images/press/ts_logo_tm_380x73.png      |  Bin 0 -> 7500 bytes
 doc/static/images/press/tsicon.png                 |  Bin 0 -> 4328 bytes
 doc/static/images/press/tsicon_large.png           |  Bin 0 -> 8307 bytes
 doc/static/images/press/tsicon_small.png           |  Bin 0 -> 2132 bytes
 doc/static/images/sdk/Protocol_state_diagram.jpg   |  Bin 0 -> 62342 bytes
 doc/static/images/sdk/Uses.jpg                     |  Bin 0 -> 96105 bytes
 doc/static/images/sdk/blacklist75.jpg              |  Bin 0 -> 93834 bytes
 doc/static/images/sdk/event_sys80.jpg              |  Bin 0 -> 70729 bytes
 doc/static/images/sdk/evt_plugin120.jpg            |  Bin 0 -> 82354 bytes
 doc/static/images/sdk/http_header_struct.jpg       |  Bin 0 -> 41668 bytes
 doc/static/images/sdk/http_headers.jpg             |  Bin 0 -> 83292 bytes
 doc/static/images/sdk/http_state2.jpg              |  Bin 0 -> 147802 bytes
 doc/static/images/sdk/marshall_buffers.jpg         |  Bin 0 -> 90358 bytes
 doc/static/images/sdk/plugin_process.jpg           |  Bin 0 -> 34531 bytes
 doc/static/images/sdk/protocol_evt.jpg             |  Bin 0 -> 61809 bytes
 doc/static/images/sdk/protocol_sm_big.jpg          |  Bin 0 -> 59301 bytes
 doc/static/images/sdk/transact75.jpg               |  Bin 0 -> 49702 bytes
 doc/static/images/sdk/transact_hook75.jpg          |  Bin 0 -> 84733 bytes
 doc/static/images/sdk/txn_sm.jpg                   |  Bin 0 -> 94051 bytes
 doc/static/images/sdk/vconn_buf_output.jpg         |  Bin 0 -> 44215 bytes
 doc/static/images/sdk/vconn_buffer.jpg             |  Bin 0 -> 64914 bytes
 doc/static/images/sdk/vconnection.jpg              |  Bin 0 -> 50918 bytes
 doc/static/images/sdk/vconnection1.jpg             |  Bin 0 -> 81340 bytes
 doc/static/images/sdk/vconnection2.jpg             |  Bin 0 -> 57055 bytes
 doc/static/images/trans_logo_148x132.png           |  Bin 0 -> 2356 bytes
 doc/static/images/trans_logo_150x30.gif            |  Bin 0 -> 1514 bytes
 doc/static/images/trans_logo_150x30.png            |  Bin 0 -> 1285 bytes
 doc/static/images/trans_logo_150x32.png            |  Bin 0 -> 2080 bytes
 doc/static/images/trans_logo_160x35.png            |  Bin 0 -> 2090 bytes
 doc/static/images/trans_logo_250x49.gif            |  Bin 0 -> 2287 bytes
 doc/static/images/trans_logo_250x49.png            |  Bin 0 -> 2072 bytes
 doc/static/images/trans_logo_350x69.gif            |  Bin 0 -> 3180 bytes
 doc/static/images/trans_logo_350x69.png            |  Bin 0 -> 2910 bytes
 doc/static/images/trans_logo_420x95.png            |  Bin 0 -> 4213 bytes
 doc/static/images/trans_logo_603x132.png           |  Bin 0 -> 5665 bytes
 doc/static/images/trans_logo_tm_380x69.png         |  Bin 0 -> 4192 bytes
 doc/static/images/ts75.png                         |  Bin 0 -> 7340 bytes
 doc/static/images/warning.png                      |  Bin 0 -> 394 bytes
 446 files changed, 21206 insertions(+), 21268 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a782694b/doc/Makefile.am
----------------------------------------------------------------------
diff --git a/doc/Makefile.am b/doc/Makefile.am
index b2e1a4e..77007e5 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -99,7 +99,7 @@ EXTRA_DIST = \
 
 clean-local:
 	-rm -rf html warn.log
-	-rm -rf $(BUILDDIR)/*
+	-rm -rf doctrees $(BUILDDIR)/html $(BUILDDIR)/dirhtml $(BUILDDIR)/singlehtml $(BUILDDIR)/epub $(BUILDDIR)/latex
 
 doxygen: Doxyfile
 	$(DOXYGEN)
@@ -111,96 +111,64 @@ doxygen: Doxyfile
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
 PAPER         = letter
-BUILDDIR      = build
+BUILDDIR      = .
 
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(SPHINXOPTS)
+ALLSPHINXOPTS   = $(SPHINXOPTS)
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS  = $(SPHINXOPTS)
 
 # The PAPER setting variables requires recursive make variable expansion, which automake
 # detects as non-portable. We bounce this through a shell script and do the expansion there.
 SBUILD = PAPEROPT_a4="$(PAPEROPT_a4)" PAPEROPT_letter="$(PAPEROPT_letter)" PAPER="$(PAPER)" \
-	 $(srcdir)/sbuild $(SPHINXBUILD) $(ALLSPHINXOPTS)
+	 $(srcdir)/sbuild $(SPHINXBUILD) -c $(srcdir) $(ALLSPHINXOPTS)
 
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
 	@echo "  html       to make standalone HTML files"
 	@echo "  dirhtml    to make HTML files named index.html in directories"
 	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
 	@echo "  epub       to make an epub"
 	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
 	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  text       to make text files"
 	@echo "  man        to make manual pages"
-	@echo "  texinfo    to make Texinfo files"
-	@echo "  info       to make Texinfo files and run them through makeinfo"
-	@echo "  gettext    to make PO message catalogs"
 	@echo "  changes    to make an overview of all changed/added/deprecated items"
 	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
 
 html-local:
-	$(SBUILD) -b html $(srcdir)/source $(BUILDDIR)/html
+	$(SBUILD) -d $(BUILDDIR)/doctrees/admin -b html $(srcdir)/admin $(BUILDDIR)/html/admin
+	$(SBUILD) -d $(BUILDDIR)/doctrees/sdk -b  html $(srcdir)/sdk $(BUILDDIR)/html/sdk
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
 
 dirhtml:
-	$(SBUILD) -b dirhtml $(srcdir)/source $(BUILDDIR)/dirhtml
+	$(SBUILD) -d $(BUILDDIR)/doctrees/admin -b dirhtml $(srcdir)/admin $(BUILDDIR)/dirhtml/admin
+	$(SBUILD) -d $(BUILDDIR)/doctrees/sdk -b dirhtml $(srcdir)/sdk $(BUILDDIR)/dirhtml/sdk
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
 
 singlehtml:
-	$(SBUILD) -b singlehtml $(srcdir)/source $(BUILDDIR)/singlehtml
+	$(SBUILD) -d $(BUILDDIR)/doctrees/admin -b singlehtml $(srcdir)/admin $(BUILDDIR)/singlehtml/admin
+	$(SBUILD) -d $(BUILDDIR)/doctrees/sdk -b singlehtml $(srcdir)/sdk $(BUILDDIR)/singlehtml/sdk
 	@echo
 	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
 
-pickle:
-	$(SBUILD) -b pickle $(srcdir)/source $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-json:
-	$(SBUILD) -b json $(srcdir)/source $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
-	$(SBUILD) -b htmlhelp $(srcdir)/source $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-qthelp:
-	$(SBUILD) -b qthelp $(srcdir)/source $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/ApacheTrafficServer.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/ApacheTrafficServer.qhc"
-
-devhelp:
-	$(SBUILD) -b devhelp $(srcdir)/source $(BUILDDIR)/devhelp
-	@echo
-	@echo "Build finished."
-	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/ApacheTrafficServer"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/ApacheTrafficServer"
-	@echo "# devhelp"
-
 epub:
-	$(SBUILD) -b epub $(srcdir)/source $(BUILDDIR)/epub
+	$(SBUILD) -d $(BUILDDIR)/doctrees/admin -b epub $(srcdir)/admin $(BUILDDIR)/epub/admin
+	$(SBUILD) -d $(BUILDDIR)/doctrees/sdk -b epub $(srcdir)/admin $(BUILDDIR)/epub/sdk
 	@echo
 	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
 
 latex:
-	$(SBUILD) -b latex $(srcdir)/source $(BUILDDIR)/latex
+	$(SBUILD) -d $(BUILDDIR)/doctrees/admin -b latex $(srcdir)/admin $(BUILDDIR)/latex/admin
+	$(SBUILD) -d $(BUILDDIR)/doctrees/sdk -b latex $(srcdir)/sdk $(BUILDDIR)/latex/sdk
 	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/latex."
+
+changes:
+	@echo FIXME
+
+linkcheck:
+	@echo FIXME

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a782694b/doc/admin/cluster-howto.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/cluster-howto.en.rst b/doc/admin/cluster-howto.en.rst
new file mode 100644
index 0000000..0f43565
--- /dev/null
+++ b/doc/admin/cluster-howto.en.rst
@@ -0,0 +1,170 @@
+Traffic Server Cluster
+**********************
+
+.. 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
+  under the License.
+
+
+
+Traffic Server scales from a single node to multiple nodes that form a
+cluster allowing you to improve system performance and reliability. This
+chapter discusses the following topics:
+
+.. toctree::
+   :maxdepth: 1
+
+Understanding Traffic Server Clusters
+=====================================
+
+A Traffic Server cluster consists of multiple Traffic Server nodes. The
+nodes in a cluster share configuration information and can form a single
+logical cache. Traffic Server detects the addition and deletion of nodes
+in the cluster automatically and can detect when a node is unavailable.
+Traffic Server uses its own protocol for clustering, which is multicast
+for node location and heartbeat, but unicast for all data exchange
+within the cluster. Traffic Server has two clustering modes:
+
+-  Management-only mode; refer to Management-Only Clustering below.
+-  Full-clustering mode; refer to Full Clustering
+
+Management-Only Clustering
+==========================
+
+In management-only clustering mode, Traffic Server cluster nodes share
+configuration information. You can administer all the nodes at the same
+time. Traffic Server uses a multicast management protocol to provide a
+single system image of your Traffic Server cluster. Information about
+cluster membership, configuration, and exceptions is shared across all
+nodes, and the ``traffic_manager`` process automatically propagates
+configuration changes to all the nodes.
+
+Full Clustering
+===============
+
+In full-clustering mode, as well as sharing configuration information, a
+Traffic Server cluster distributes its cache across its nodes into a
+single, virtual object store, rather than replicating the cache node by
+node. Traffic Server can provide an enormous aggregate cache size and
+can maximize cache hit rate by storing objects only once across the
+entire cluster.
+
+A fully clustered Traffic Server maps objects to specific nodes in the
+cluster. When a node receives a request, it checks to see if the request
+is a hit somewhere in the cluster. If the request is a hit on a
+different node, the node handling the request obtains the object from
+the hit node and serves it to the client. Traffic Server uses its own
+communication protocol to obtain an object from sibling cluster nodes.
+
+If a node fails or is shut down and removed, Traffic Server removes
+references to the missing node on all nodes in the cluster.
+
+Full clustering recommends a dedicated network interface for cluster
+communication to get better performance.
+
+Enabling Clustering Mode
+========================
+
+Before you put a node into a cluster, please make sure the following
+things are in order:
+
+-  You are using the same operation system on all nodes:
+
+   -  Using the same distribution, fx: RHEL 5.5
+   -  Have same kernel, fx: 2.6.18-194.17.1.el5
+   -  The same architecture, fx: ``x86_64``
+
+-  You have the same version of Traffic Server installed
+-  The same hardware
+-  On the same switch or same VLAN.
+
+Traffic Server does not apply the clustering mode change to all the
+nodes in the cluster. You must change the clustering mode on each node
+individually. You may following these instructions:
+
+1. setup the same cluster name, or proxy name, e.g. MyCluster:
+
+   ::
+       traffic_line -s proxy.config.proxy_name -v MyCluster
+
+2. enable cluster mode:
+
+   ::
+       traffic_line -s proxy.local.cluster.type -v 1
+       traffic_line -s proxy.config.cluster.ethernet_interface -v eth0
+
+   ``eth0`` should be replaced by your real interface, we recommends a
+   dedicated interface here. Refer to
+   ```proxy.local.cluster.type`` <../configuration-files/records.config#proxy.local.cluster.type>`_
+   for a full description.
+
+3. enable:
+
+   ::
+       traffic_line -x
+
+4. restart:
+
+   ::
+       traffic_line -L
+
+   The ``traffic_server`` and ``traffic_manager`` processes will need to
+   restart after the change of 'proxy.local.cluster.type' and
+   'proxy.config.cluster.ethernet_interface' have taken place.
+
+Traffic Server will join the cluster in about 10 seconds, and you can
+run ``traffic_line -r proxy.process.cluster.nodes`` to check the hosts
+in the cluster, or check out the
+```cluster.config`` <../configuration-files/cluster.configcluster.config>`_
+in the configuration directory.
+
+After a successful join of the cluster, all changes of global
+configurations on any node, will take effect on **all** nodes.
+
+Deleting Nodes from a Cluster
+=============================
+
+To delete a node from the Traffic Server cluster, just roll back
+``proxy.config.cluster.type`` to the default value 3 and reload.
+
+Performance tweak for busy Cluster
+==================================
+
+Starting from v3.2.0, Apache Traffic Server can handle multiple internal
+cluster connections, and we can tweak for the Cluster threads and
+connections:
+
+-  Increasing Cluster threads:
+
+   In the cluster env, the current performance of the Cluster threads
+   will consume the same cpu usage as net threads, so you may adapt the
+   ET_NET & ET_CLUSTER at about 1:1. For example, on a 24 cores
+   system, set ET_NET threads to 10, ET_CLUSTER threads to 10.
+
+   ::
+       traffic_line -s proxy.config.cluster.threads -v 10
+
+-  Setup the Cluster connections:
+
+   In the Cluster, the internal connections is TCP and limited by
+   ET_CLUSTER threads and network performance, we can increase the
+   connections to archive better performance.
+
+   ::
+       traffic_line -s proxy.config.cluster.num_of_cluster_connections -v 10
+
+with these tweaks, we can archive about 10gbps traffic for the internal
+cluster transfer speed.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a782694b/doc/admin/configuration-files.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/configuration-files.en.rst b/doc/admin/configuration-files.en.rst
new file mode 100644
index 0000000..ad1ea81
--- /dev/null
+++ b/doc/admin/configuration-files.en.rst
@@ -0,0 +1,43 @@
+Configuration Files
+*******************
+
+.. 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
+  under the License.
+
+This section describes Traffic Server configuration files that you can
+edit.
+
+
+.. toctree::
+   :maxdepth: 1
+
+   configuration-files/records.config.en
+   configuration-files/ip_allow.config.en
+   configuration-files/update.config.en
+   configuration-files/logs_xml.config.en
+   configuration-files/remap.config.en
+   configuration-files/cache.config.en
+   configuration-files/volume.config.en
+   configuration-files/parent.config.en
+   configuration-files/storage.config.en
+   configuration-files/splitdns.config.en
+   configuration-files/icp.config.en
+   configuration-files/congestion.config.en
+   configuration-files/plugin.config.en
+   configuration-files/log_hosts.config.en
+   configuration-files/hosting.config.en
+   configuration-files/ssl_multicert.config.en

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a782694b/doc/admin/configuration-files/cache.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/configuration-files/cache.config.en.rst b/doc/admin/configuration-files/cache.config.en.rst
new file mode 100644
index 0000000..856f24a
--- /dev/null
+++ b/doc/admin/configuration-files/cache.config.en.rst
@@ -0,0 +1,133 @@
+cache.config
+************
+
+.. 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
+  under the License.
+
+
+The cache.config file defines how Traffic Server caches web objects. You
+can add caching rules to specify the following: - Not to cache objects
+from specific IP addresses - How long to pin particular objects in the
+cache - How long to consider cached objects as fresh - Whether to ignore
+no-cache directives from the server
+
+**IMPORTANT:** After you modify the ``cache.config file``, navigate to
+the Traffic Server bin directory; then run the ``traffic_line -x``
+command to apply changes. When you apply the changes to a node in a
+cluster, Traffic Server automatically applies the changes to all other
+nodes in the cluster.
+
+Format
+======
+
+Each line in the cache.config file contains a caching rule. Traffic
+Server recognizes three space-delimited tags:
+
+::
+
+    primary_destination=value secondary_specifier=value action=value
+
+You can use more than one secondary specifier in a rule. However, you
+cannot repeat a secondary specifier. The following list shows the
+possible primary destinations with allowed values.
+
+*``dest_domain``* {#dest_domain}
+    A requested domain name. Traffic Server matches the domain name of
+    the destination from the URL in the request.
+
+*``dest_host``* {#dest_host}
+    A requested hostname. Traffic Server matches the hostname of the
+    destination from the URL in the request.
+
+*``dest_ip``* {#dest_ip}
+    A requested IP address. Traffic Server matches the IP address of the
+    destination in the request.
+
+*``url_regex``* {#url_regex}
+    A regular expression (regex) to be found in a URL.
+
+The secondary specifiers are optional in the cache.config file. The
+following list shows possible secondary specifiers with allowed values.
+
+*``port``* {#port}
+    A requested URL port.
+
+*``scheme``* {#scheme}
+    A request URL protocol: http or https.
+
+*``prefix``* {#prefix}
+    A prefix in the path part of a URL.
+
+*``suffix``* {#suffix}
+    A file suffix in the URL.
+
+*``method``* {#method}
+    A request URL method: get, put, post, trace.
+
+*``time``* {#time}
+    A time range, such as 08:00-14:00.
+
+*``src_ip``* {#src_ip}
+    A client IP address.
+
+The following list shows possible actions and their allowed values.
+
+*``action``* {#action}
+    One of the following values:
+
+    -  ``never-cache`` configures Traffic Server to never cache
+       specified objects.
+    -  ``ignore-no-cache`` configures Traffic Server to ignore all
+       ``Cache-Control: no-cache`` headers.
+    -  ``ignore-client-no-cache`` configures Traffic Server to ignore
+       ``Cache-Control: no-cache`` headers from client requests.
+    -  ``ignore-server-no-cache`` configures Traffic Server to ignore
+       ``Cache-Control: no-cache`` headers from origin server responses.
+
+*``pin-in-cache``* {#pin-in-cache}
+    The amount of time you want to keep the object(s) in the cache. The
+    following time formats are allowed:
+
+    -  ``d`` for days; for example: 2d
+    -  ``h`` for hours; for example: 10h
+    -  ``m`` for minutes; for example: 5m
+    -  ``s`` for seconds; for example: 20s
+    -  mixed units; for example: 1h15m20s
+
+*``revalidate``* {#revalidate}
+    The amount of time object(s) are to be considered fresh. Use the
+    same time formats as ``pin-in-cache``.
+
+*``ttl-in-cache``* {#ttl-in-cache}
+    The amount of time object(s) are to be kept in the cache, regardless
+    of Cache-Control response headers. Use the same time formats as
+    pin-in-cache and revalidate .
+
+Examples
+========
+
+The following example configures Traffic Server to revalidate ``gif``
+and ``jpeg`` objects in the domain ``mydomain.com`` every 6 hours, and
+all other objects in ``mydomain.com`` every hour. The rules are applied
+in the order listed.
+
+::
+
+    dest_domain=mydomain.com suffix=gif revalidate=6h
+    dest_domain=mydomain.com suffix=jpeg revalidate=6h
+    dest_domain=mydomain.com revalidate=1h
+

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a782694b/doc/admin/configuration-files/congestion.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/configuration-files/congestion.config.en.rst b/doc/admin/configuration-files/congestion.config.en.rst
new file mode 100644
index 0000000..f755874
--- /dev/null
+++ b/doc/admin/configuration-files/congestion.config.en.rst
@@ -0,0 +1,197 @@
+congestion.config
+*****************
+
+.. 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
+  under the License.
+
+
+The ``congestion.config`` file enables you to configure Traffic Server
+to stop forwarding HTTP requests to origin servers when they become
+congested, and then send the client a message to retry the congested
+origin server later. After you modify the ``congestion.control`` file,
+navigate to the Traffic Server bin directory; then run the
+``traffic_line -x`` command to apply changes. When you apply the changes
+to a node in a cluster, Traffic Server automatically applies the changes
+to all other nodes in the cluster. Traffic Server uses the
+``congestion.config`` file only if you enable the `Congestion
+Control <http#UsingCongestionControl>`_ option.
+
+You can create rules in the congestion.config file to specify:
+
+-  Which origin servers Traffic Server tracks for congestion.
+-  The timeouts Traffic Server uses, depending on whether a server is
+   congested.
+-  The page Traffic Server sends to the client when a server becomes
+   congested.
+-  If Traffic Server tracks the origin servers per IP address or per
+   hostname.
+
+Format
+======
+
+Each line in ``congestion.config`` must follow the format below. Traffic
+Server applies the rules in the order listed, starting at the top of the
+file. Traffic Server recognizes three space-delimited tags:
+
+::
+
+    primary_destination=value secondary_specifier=value action=value
+
+The following list shows possible primary destinations with allowed
+values.
+
+*``dest_domain``* {#dest_domain}
+    A requested domain name.
+
+*``dest_host``* {#dest_host}
+    A requested hostname.
+
+*``dest_ip``* {#dest_ip}
+    A requested IP address.
+
+*``url_regex``* {#url_regex}
+    A regular expression (regex) to be found in a URL.
+
+The secondary specifiers are optional in the congestion.config file. The
+following list shows possible secondary specifiers with allowed values.
+You can use more than one secondary specifier in a rule; however, you
+cannot repeat a secondary specifier.
+
+*``port``* {#port}
+    A requested URL port or range of ports.
+
+*``prefix``* {#prefix}
+    A prefix in the path part of a URL.
+
+The following list shows the possible tags and their allowed values.
+
+*``max_connection_failures``* {#max_connection_failures}
+    Default: ``5``
+    The maximum number of connection failures allowed within the fail
+    window described below before Traffic Server marks the origin server
+    as congested.
+
+*``fail_window``* {#fail_window}
+    Default: ``120`` seconds.
+    The time period during which the maximum number of connection
+    failures can occur before Traffic Server marks the origin server as
+    congested.
+
+*``proxy_retry_interval``* {#proxy_retry_interval}
+    Default: ``10`` seconds.
+    The number of seconds that Traffic Server waits before contacting a
+    congested origin server again.
+
+*``client_wait_interval``* {#client_wait_interval}
+    Default: ``300`` seconds.
+    The number of seconds that the client is advised to wait before
+    retrying the congested origin server.
+
+*``wait_interval_alpha``* {#wait_interval_alpha}
+    Default: ``30`` seconds
+    The upper limit for a random number that is added to the wait
+    interval.
+
+*``live_os_conn_timeout``* {#live_os_conn_timeout}
+    Default: ``60`` seconds.
+    The connection timeout to the live (uncongested) origin server. If a
+    client stops a request before the timeout occurs, then Traffic
+    Server does not record a connection failure.
+
+*``live_os_conn_retries``* {#live_os_conn_retries}
+    Default: ``2``
+    The maximum number of retries allowed to the live (uncongested)
+    origin server.
+
+*``dead_os_conn_timeout``* {#dead_os_conn_timeout}
+    Default: ``15`` secondsj
+    The connection timeout to the congested origin server.
+
+*``dead_os_conn_retries``* {#dead_os_conn_retries}
+    Default: ``1``
+    The maximum number of retries allowed to the congested origin
+    server.
+
+*``max_connection``* {#max_connection}
+    Default: ``-1``
+    The maximum number of connections allowed from Traffic Server to the
+    origin server.
+
+*``error_page``* {#error_page}
+    Default: ``"congestion#retryAfter"``
+    The error page sent to the client when a server is congested. You
+    must enclose the value in quotes;
+
+*``congestion_scheme``* {#congestion_scheme}
+    Default: ``"per_ip"``
+    Specifies if Traffic Server applies the rule on a per-host
+    (``"per_host"``) or per-IP basis (``"per_ip"``). You must enclose
+    the value in quotes.
+
+    For example: if the server ``www.host1.com`` has two IP addresses
+    and you use the tag value ``"per_ip"``, then each IP address has its
+    own number of connection failures and is marked as congested
+    independently. If you use the tag value ``"per_host"`` and the
+    server ``www.host1.com`` is marked as congested, then both IP
+    addresses are marked as congested.
+
+Examples
+========
+
+The following ``congestion.config`` rule configures Traffic Server to
+stop forwarding requests to the server ``www.host.com`` on port 80 (HTTP
+traffic) if the server is congested, according to the timeouts
+specified. Traffic Server uses the default tag values because no tag has
+been specified.
+
+::
+
+    dest_host=www.host.com port=80
+
+You can use one or more tags in a rule, but each tag must have one value
+only. If you specify no tags in the rule, then Traffic Server uses the
+default values.
+
+You can override any of the default tag values by adding configuration
+variables at the end of ``records.config`` as follows:
+
+::
+
+    CONFIG proxy.config.http.congestion_control.default.tag INT|STRING value
+
+where tag is one of the tags described in the list under
+`congestion.config <#congestion.config>`_ and value is the value you
+want to use.
+
+For example:
+
+::
+
+    CONFIG proxy.config.http.congestion_control.default.congestion_scheme STRING per_host
+
+**IMPORTANT:** Rules in the congestion.config file override the
+following variables in the records.config file:
+
+::
+
+    proxy.config.http.connect_attempts_max_retries
+    proxy.config.http.connect_attempts_max_retries_dead_server
+    proxy.config.http.connect_attempts_rr_retries
+    proxy.config.http.connect_attempts_timeout
+    proxy.config.http.down_server.cache_time
+    proxy.config.http.down_server.abort_threshold
+

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a782694b/doc/admin/configuration-files/hosting.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/configuration-files/hosting.config.en.rst b/doc/admin/configuration-files/hosting.config.en.rst
new file mode 100644
index 0000000..ccf003f
--- /dev/null
+++ b/doc/admin/configuration-files/hosting.config.en.rst
@@ -0,0 +1,101 @@
+hosting.config
+**************
+
+.. 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
+  under the License.
+
+
+The ``hosting.config`` file enables you to assign cache partitions to
+specific origin servers and/or domains so that you can manage cache
+space efficiently and restrict disk usage. For step-by-step instructions
+on partitioning the cache according to origin servers and/or domains,
+refer to `Partitioning the
+Cache <../configuring-cache#PartitoningCache>`_ According to Origin
+Server or Domain. Before you can assign cache partitions to specific
+origin servers and/or domains, you must first partition your cache
+according to size and protocol in the `volume.config <volume.config>`_
+file. For step-by-step instructions about partitioning your cache, refer
+to `Partitioning the Cache <../configuring-cache#PartitioningCache>`_.
+For a description of the ``volume.config`` file, refer to
+`volume.config <volume.config>`_.
+
+After you modify hosting.config, navigate to the Traffic Server bin
+directory and run the ``traffic_line -x`` command to apply your changes.
+When you apply the changes to a node in a cluster, Traffic Server
+automatically applies the changes to all other nodes in the cluster.
+
+**IMPORTANT:** The volume.configuration must be the same on all nodes in
+a cluster.
+
+Format
+======
+
+Each line in the ``hosting.config`` file must have one of the following
+formats:
+
+::
+
+    hostname= hostname partition= partition_numbers
+    domain= domain_name partition= partition_numbers
+
+where hostname is the fully-qualified hostname of the origin server
+whose content you want to store on a particular partition (for example,
+``www.myhost.com``); ``domain_name`` is the domain whose content you
+want to store on a particular partition(for example, ``mydomain.com``);
+and ``partition_numbers`` is a comma-separated list of the partitions on
+which you want to store the content that belongs to the origin server or
+domain listed. The partition numbers must be valid numbers listed in the
+`volume.config <volume.config>`_ file.
+
+**Note:** To allocate more than one partition to an origin server or
+domain, you must enter the partitions in a comma-separated list on one
+line, as shown in the example below. The
+`hosting.config <hosting.config>`_ file cannot contain multiple entries
+for the same origin server or domain.
+
+Generic Partition
+=================
+
+When configuring the hosting.config file, you must assign a generic
+partition to use for content that does not belong to any of the origin
+servers or domains listed. If all partitions for a particular origin
+server become corrupt, Traffic Server will also use the generic
+partition to store content for that origin server.
+
+The generic partition must have the following format:
+
+::
+
+    hostname=* partition=partition_numbers
+
+where ``partition_numbers`` is a comma-separated list of generic
+partitions.
+
+Examples
+========
+
+The following example configures Traffic Server to store content from
+the domain ``mydomain.com`` in partition 1 and content from
+``www.myhost.com`` in partition 2. Traffic Server stores content from
+all other origin servers in partitions 3 and 4.
+
+::
+
+    domain=mydomain.com partition=1
+    hostname=www.myhost.com partition=2
+    hostname=* partition=3,
+

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a782694b/doc/admin/configuration-files/icp.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/configuration-files/icp.config.en.rst b/doc/admin/configuration-files/icp.config.en.rst
new file mode 100644
index 0000000..d441bb4
--- /dev/null
+++ b/doc/admin/configuration-files/icp.config.en.rst
@@ -0,0 +1,99 @@
+icp.config
+**********
+
+.. 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
+  under the License.
+
+
+The ``icp.config`` file defines ICP peers (parent and sibling caches).
+
+**IMPORTANT:** After you modify the icp.config file, navigate to the
+Traffic Server bin directory and run the ``traffic_line -x`` command to
+apply the changes. When you apply the changes to a node in a cluster,
+Traffic Server automatically applies the changes to all other nodes in
+the cluster.
+
+Format
+======
+
+Each line in the icp.config file contains the name and configuration
+information for a single ICP peer in the following format:
+
+::
+
+    :::text
+    host : host_IP : peer_type : proxy_port : icp_port : MC_on : MC_IP : MC_TTL :
+
+Each field is described in the following list.
+
+*``host``* {#host}
+    The hostname of the ICP peer.
+
+    This field is optional; if you do not specify the hostname of the
+    ICP peer, you must specify the IP address.
+
+*``host_IP``* {#host_IP}
+    The IP address of the ICP peer.
+
+    This field is optional; if you do not specify the IP address of the
+    ICP peer, you must specify the hostname.
+
+*``ctype``* {#ctype}
+    Use the following options:
+
+    -  1 to indicate an ICP parent cache
+    -  2 to indicate an ICP sibling cache
+
+*``proxy_port``* {#proxy_port}
+    The port number of the TCP port used by the ICP peer for proxy
+    communication.
+
+*``icp_port``* {#icp_port}
+    The port number of the UDP port used by the ICP peer for ICP
+    communication.
+
+*``MC_on``* {#mc_on}
+    Enable or disable MultiCast:
+
+    -  0 if multicast is disabled
+    -  1 if multicast is enabled
+
+*``MC_ip``* {#mc_ip}
+    The MultiCast IP address.
+
+*``MC_ttl``* {#mc_ttl}
+    The multicast time to live. Use the following options:
+
+    -  1 if IP multicast datagrams will not be forwarded beyond a single
+       subnetwork
+    -  2 to allow delivery of IP multicast datagrams to more than one
+       subnet (if there are one or more multicast routers attached to
+       the first hop subnet).
+
+Examples
+========
+
+The following example configuration is for three nodes: the local host,
+one parent, and one sibling.
+
+::
+
+    :::text
+    localhost:0.0.0.0:3:8080:3130:0:0.0.0.0:1
+    host1:123.12.1.23:1:8080:3131:0:0.0.0.0:1
+    host2:123.12.1.24:2:8080:3131:0:0.0.0.0:1
+

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a782694b/doc/admin/configuration-files/ip_allow.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/configuration-files/ip_allow.config.en.rst b/doc/admin/configuration-files/ip_allow.config.en.rst
new file mode 100644
index 0000000..15f64ec
--- /dev/null
+++ b/doc/admin/configuration-files/ip_allow.config.en.rst
@@ -0,0 +1,89 @@
+ip_allow.config
+***************
+
+.. 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
+  under the License.
+
+The ``ip_allow.config`` file controls client access to the Traffic
+Server proxy cache. You can specify ranges of IP addresses that are
+allowed to use the Traffic Server as a web proxy cache. After you modify
+the ``ip_allow.config`` file, navigate to the Traffic Server bin
+directory and run the ``traffic_line -x`` command to apply changes. When
+you apply the changes to a node in a cluster, Traffic Server
+automatically applies the changes to all other nodes in the cluster.
+
+Format
+======
+
+Each line in the ``ip_allow.config`` file must have the following
+format:
+
+::
+
+    :::text
+    src_ip=<range of IP addresses> action=<action> [method=<list of methods separated by '|'>]
+
+where src_ip is the IP address or range of IP addresses of the
+client(s). The action ``ip_allow`` enables the specified client(s) to
+access the Traffic Server proxy cache, and ``ip_deny`` denies the
+specified client(s) to access the Traffic Server proxy cache. Multiple
+method keywords can be specified (method=GET method=HEAD), or multiple
+methods can be separated by an '\|' (method=GET\|HEAD). The method
+keyword is optional and it is defaulted to ALL. Available methods: ALL,
+GET, CONNECT, DELETE, HEAD, ICP_QUERY, OPTIONS, POST, PURGE, PUT,
+TRACE, PUSH
+
+By default, the ``ip_allow.config`` file contains the following lines,
+which allows all methods to localhost to access the Traffic Server proxy
+cache and denies PUSH, PURGE and DELETE to all IPs (note this allows all
+other methods to all IPs):
+
+::
+
+    :::text
+    src_ip=127.0.0.1                                  action=ip_allow method=ALL
+    src_ip=::1                                        action=ip_allow method=ALL
+    src_ip=0.0.0.0-255.255.255.255                    action=ip_deny  method=PUSH|PURGE|DELETE
+    src_ip=::-ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff action=ip_deny  method=PUSH|PURGE|DELETE
+
+Examples
+========
+
+The following example enables all clients to access the Traffic Server
+proxy cache:
+
+::
+
+    :::text
+    src_ip=0.0.0.0-255.255.255.255 action=ip_allow
+
+The following example allows all clients on a specific subnet to access
+the Traffic Server proxy cache:
+
+::
+
+    :::text
+    src_ip=123.12.3.000-123.12.3.123 action=ip_allow
+
+The following example denies all clients on a specific subnet to access
+the Traffic Server proxy cache:
+
+::
+
+    :::text
+    src_ip=123.45.6.0-123.45.6.123 action=ip_deny
+

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a782694b/doc/admin/configuration-files/log_hosts.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/configuration-files/log_hosts.config.en.rst b/doc/admin/configuration-files/log_hosts.config.en.rst
new file mode 100644
index 0000000..9c99907
--- /dev/null
+++ b/doc/admin/configuration-files/log_hosts.config.en.rst
@@ -0,0 +1,68 @@
+log_hosts.config
+****************
+
+.. 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
+  under the License.
+
+To record HTTP transactions for different origin servers in separate log
+files, you must list each origin server hostname in the
+``log_hosts.config`` file. In addition, you must enable the `HTTP Host
+Log Splitting <../working-log-files#HTTPHostLogSplitting>`_ option. You
+should use the same ``log_hosts.config`` file on every Traffic Server
+node in your cluster. After you modify the ``log_hosts.config`` file,
+navigate to the Traffic Server\ ``bin`` directory and run the
+``traffic_line -x`` command to apply the changes. When you apply the
+changes to a node in a cluster, Traffic Server automatically applies the
+changes to all other nodes in the cluster.
+
+Format
+======
+
+Each line in the ``log_hosts.config`` file has the following format:
+
+::
+
+    hostname
+
+where *``hostname``* is the hostname of the origin server.
+
+**Tip:** You can specify keywords in the ``log_hosts.config`` file to
+record all transactions from origin servers with the specified keyword
+in their names in a separate log file. See the example below.
+
+Examples
+========
+
+The following example configures Traffic Server to create separate log
+files containing all HTTP transactions for the origin servers
+``webserver1``, ``webserver2``, and ``webserver3``.
+
+::
+
+    webserver1
+    webserver2
+    webserver3
+
+The following example records all HTTP transactions from origin servers
+that contain ``sports`` in their names. For example:
+``sports.yahoo.com`` and ``www.foxsports.com`` in a log file called
+``squid-sport.log`` (the Squid format is enabled).
+
+::
+
+    sports
+

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a782694b/doc/admin/configuration-files/logs_xml.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/configuration-files/logs_xml.config.en.rst b/doc/admin/configuration-files/logs_xml.config.en.rst
new file mode 100644
index 0000000..05d8bde
--- /dev/null
+++ b/doc/admin/configuration-files/logs_xml.config.en.rst
@@ -0,0 +1,363 @@
+logs_xml.config
+***************
+
+.. 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
+  under the License.
+
+
+The ``logs_xml.config`` file defines the custom log file formats,
+filters, and processing options. The format of this file is modeled
+after **XML**, the Extensible Markup Language.
+
+Format
+======
+
+The ``logs_xml.config`` file contains the specifications below:
+
+-  ``LogFormat`` specifies the fields to be gathered from each protocol
+   event access.
+-  ``LogFilter`` specifies the filters that are used to include or
+   exclude certain entries being logged based on the value of a field
+   within that entry.
+-  ``LogObject`` specifies an object that contains a particular format,
+   a local filename, filters, and collation servers.
+
+The ``logs_xml.config`` file ignores extra white space, blank lines, and
+all comments.
+
+LogFormat
+=========
+
+The following list shows **``LogFormat``** specifications.
+
+*``&lt;Name = "valid_format_name"/&gt;``* {#LogsXMLFormatName}
+    Required
+    Valid format names include any name except ``squid``, ``common``,
+    ``extended``, or ``extended2``, which are pre-defined formats. There
+    is no default for this tag.
+
+*``&lt;Format = "valid_format_specification"/&gt;``* {#LogsXMLFormat}
+    Required
+    A valid format specification is a printf-style string describing
+    each log entry when formatted for ASCII output. Use ``%<``
+    *``field``* ``>`` as a placeholder for valid field names. For more
+    information, refer to `Custom Logging
+    Fields <../event-logging-formats#CustomLoggingFields>`_.
+
+    The specified field can be one of the following types:
+
+    Simple. For example: ``%<cqu>``
+     A field within a container, such as an HTTP header or a statistic.
+    Fields of this type have the syntax:
+
+    ::
+
+         %<{ field } container>
+
+    Aggregates, such as ``COUNT``, ``SUM``, ``AVG``, ``FIRST``,
+    ``LAST``. Fields of this type have the syntax: ``%<operator (``
+    *``field``* ``)>``
+     **Note:** You cannot create a format specification that contains
+    both aggregate operators and regular fields.
+
+*``&lt;Interval = "aggregate_interval_secs"/&gt;``* {#LogsXMLInterval}
+    Optional
+    Use this tag when the format contains aggregate operators. The value
+    "``aggregate_interval_secs``\ " represents the number of seconds
+    between individual aggregate values being produced.
+
+    The valid set of aggregate operators are:
+
+    -  COUNT
+    -  SUM
+    -  AVG
+    -  FIRST
+    -  LAST
+
+LogFilters
+----------
+
+The following list shows the ``LogFilter`` specifications.
+
+*``&lt;Name = "valid_filter_name"/&gt;``* {#LogsXMLFilterName}
+    Required
+    All filters must be uniquely named.
+
+*``&lt;Condition = "valid_log_field valid_operator valid_comparison_value"/&gt;``*
+{#LogsXMLFilterCondition}
+    Required
+    This field contains the following elements:
+
+    **``valid_log_field``** - the field that will be compared against
+    the given value. For more information, refer to `Logging Format
+    Cross-Reference <../event-logging-formats#LoggingFormatCrossReference>`_.
+
+    **``valid_operator_field``** - any one of the following: ``MATCH``,
+    ``CASE_INSENSITIVE_MATCH``, ``CONTAIN``,
+    ``CASE_INSENSITIVE_CONTAIN``.
+
+    -  ``MATCH`` is true if the field and value are identical
+       (case-sensitive).
+    -  ``CASE_INSENSITIVE_MATCH`` is similar to ``MATCH``, except that
+       it is case-**insensitive**.
+    -  ``CONTAIN`` is true if the field contains the value (the value is
+       a substring of the field).
+    -  ``CASE_INSENSITIVE_CONTAIN`` is a case-insensitive version of
+       ``CONTAIN``.
+
+    **``valid_comparison_value``** - any string or integer matching the
+    field type. For integer values, all of the operators are equivalent
+    and mean that the field must be equal to the specified value.
+
+    **Note:** There are no negative comparison operators. If you want to
+    specify a negative condition, then use the ``Action`` field to
+    ``REJECT`` the record.
+
+*``&lt;Action = "valid_action_field"/&gt;``* {#LogsXMLFilterAction}
+    Required: ``ACCEPT`` or ``REJECT`` .
+    This instructs Traffic Server to either accept or reject records
+    that satisfy the filter condition.
+
+LogObject
+---------
+
+The following list shows the ``LogObject`` specifications.
+
+*``&lt;Format = "valid_format_name"/&gt;``* {#LogsXMLObjectFormat}
+    Required
+    Valid format names include the predefined logging formats:
+    ``squid``, ``common``, ``extended``, and ``extended2``, as well as
+    any previously-defined custom log formats. There is no default for
+    this tag.
+
+*``&lt;Filename = "file_name"/&gt;``* {#LogsXMLObjectFilename}
+    Required
+    The filename to which the given log file is written on the local
+    file system or on a remote collation server. No local log file will
+    be created if you fail to specify this tag. All filenames are
+    relative to the default logging directory.
+
+    If the name does not contain an extension (for example, ``squid``),
+    then the extension ``.log`` is automatically appended to it for
+    ASCII logs and ``.blog`` for binary logs (refer to `Mode =
+    "valid_logging_mode" <#LogsXMLOjbectMode>`_).
+
+    If you do not want an extension to be added, then end the filename
+    with a single (.) dot (for example: ``squid.`` ).
+
+*``&lt;Mode = "valid_logging_mode"/&gt;``* {#LogsXMLOjbectMode}
+    Optional
+    Valid logging modes include ``ascii`` , ``binary`` , and
+    ``ascii_pipe`` . The default is ``ascii`` .
+
+    -  Use ``ascii`` to create event log files in human-readable form
+       (plain ASCII).
+    -  Use ``binary`` to create event log files in binary format. Binary
+       log files generate lower system overhead and occupy less space on
+       the disk (depending on the information being logged). You must
+       use the ``logcat`` utility to translate binary log files to ASCII
+       format before you can read them.
+    -  Use ``ascii_pipe`` to write log entries to a UNIX named pipe (a
+       buffer in memory). Other processes can then read the data using
+       standard I/O functions. The advantage of using this option is
+       that Traffic Server does not have to write to disk, which frees
+       disk space and bandwidth for other tasks. In addition, writing to
+       a pipe does not stop when logging space is exhausted because the
+       pipe does not use disk space.
+
+    If you are using a collation server, then the log is written to a
+    pipe on the collation server. A local pipe is created even before a
+    transaction is processed, so you can see the pipe right after
+    Traffic Server starts. Pipes on a collation server, however, *are*
+    created when Traffic Server starts.
+
+*``&lt;Filters = "list_of_valid_filter_names"/&gt;``*
+{#LogsXMLObjectFilters}
+    Optional
+    A comma-separated list of names of any previously-defined log
+    filters. If more than one filter is specified, then all filters must
+    accept a record for the record to be logged.
+
+*``&lt;Protocols = "list_of_valid_protocols"/&gt;``*
+{#LogsXMLObjectProtocols}
+    Optional
+    A comma-separated list of the protocols this object should log.
+    Valid protocol names for this release are ``HTTP`` (FTP is
+    deprecated).
+
+*``&lt;ServerHosts = "list_of_valid_servers"/&gt;``*
+{#LogsXMLObjectServerHosts}
+    Optional
+    A comma-separated list of valid hostnames.This tag indicates that
+    only entries from the named servers will be included in the file.
+
+*``&lt;CollationHosts = "list_of_valid_hostnames"/&gt;``*
+{#LogsXMLObjectCollationHosts}
+    Optional
+    A comma-separated list of collation servers to which all log entries
+    (for this object) are forwarded. Collation servers can be specified
+    by name or IP address. Specify the collation port with a colon after
+    the name; for example, ``host:port`` .
+
+*``&lt;Header = "header"/&gt;``* {#LogsXMLObjectHeader}
+    Optional
+    The header text you want the log files to contain. The header text
+    appears at the beginning of the log file, just before the first
+    record.
+
+*``&lt;RollingEnabled = "truth value"/&gt;``*
+{#LogsXMLObjectRollingEnabled}
+    Optional
+    Enables or disables log file rolling for the ``LogObject``. This
+    setting overrides the value for the
+    *``proxy.config.log.rolling_enabled``* variable in the
+    ``records.config`` file. Set *``truth value``* to one of the
+    following values:
+
+    -  ``0`` to disable rolling for this particular ``LogObject``.
+    -  ``1`` to roll log files at specific intervals during the day (you
+       specify time intervals with the ``RollingIntervalSec`` and
+       ``RollingOffsetHr`` fields).
+    -  ``2`` to roll log files when they reach a certain size (you
+       specify the size with the\ ``RollingSizeMb`` field).
+    -  ``3`` to roll log files at specific intervals during the day or
+       when they reach a certain size (whichever occurs first).
+    -  ``4`` to roll log files at specific intervals during the day when
+       log files reach a specific size (at a specified time if the file
+       is of the specified size).
+
+*``&lt;RollingIntervalSec = "seconds"/&gt;``*
+{#LogsXMLObjectRollingIntervalSec}
+    Optional
+    The seconds between log file rolling for the ``LogObject``; enables
+    you to specify different rolling intervals for different
+    ``LogObjects``.
+
+    This setting overrides the value for
+    *``proxy.config.log.rolling_interval_sec``* in the
+    ``records.config`` file.
+
+*``&lt;RollingOffsetHr = "hour"/&gt;``* {#LogsXMLObjectRollingOffsetHr}
+    Optional
+    Specifies an hour (from 0 to 23) at which rolling is guaranteed to
+    align. Rolling might start before then, but a rolled file will be
+    produced only at that time. The impact of this setting is only
+    noticeable if the rolling interval is larger than one hour. This
+    setting overrides the configuration setting for
+    *``proxy.config.log.rolling_offset_hr``* in the ``records.config``
+    file.
+
+*``&lt;RollingSizeMb = "size_in_MB"/&gt;``*
+{#LogsXMLObjectRollingSizeMb}
+    Optional
+    The size at which log files are rolled.
+
+Examples
+========
+
+The following is an example of a **``LogFormat``** specification that
+collects information using three common fields:
+
+::
+
+         <LogFormat>
+             <Name="minimal"/>
+             <Format = "%<chi> : %<cqu> : %<pssc>"/>
+         </LogFormat>
+
+The following is an example of a **``LogFormat``** specification that
+uses aggregate operators:
+
+::
+
+         <LogFormat>
+             <Name = "summary"/>
+             <Format = "%<LAST(cqts)> : %<COUNT(*)> : %<SUM(psql)>"/>
+             <Interval = "10"/>
+         </LogFormat>
+
+The following is an example of a **``LogFilter``** that will cause only
+``REFRESH_HIT`` entries to be logged:
+
+::
+
+         <LogFilter>
+              <Name = "only_refresh_hits"/>
+              <Action = "ACCEPT"/>
+              <Condition = "%<pssc> MATCH REFRESH_HIT"/>
+         </LogFilter>
+
+**Note:** When specifying the field in the filter condition, you can
+omit the\ ``%<>``. This means that the filter below is equivalent to the
+example directly above:
+
+::
+
+         <LogFilter>
+             <Name = "only_refresh_hits"/>
+             <Action = "ACCEPT"/>
+             <Condition = "pssc MATCH REFRESH_HIT"/>
+         </LogFilter>
+
+The following is an example of a **``LogObject``** specification that
+creates a local log file for the minimal format defined earlier. The log
+filename will be ``minimal.log`` because this is an ASCII log file (the
+default).
+
+::
+
+         <LogObject>
+             <Format = "minimal"/>
+             <Filename = "minimal"/>
+         </LogObject>
+
+The following is an example of a **``LogObject``** specification that
+includes only HTTP requests served by hosts in the domain
+``company.com`` or by the specific server ``server.somewhere.com``. Log
+entries are sent to port 4000 of the collation host ``logs.company.com``
+and to port 5000 of the collation host ``209.131.52.129.``
+
+::
+
+         <LogObject>
+              <Format = "minimal"/>
+              <Filename = "minimal"/>
+              <ServerHosts = "company.com,server.somewhere.com"/>
+              <Protocols = "http"/>
+              <CollationHosts = "logs.company.com:4000,209.131.52.129:5000"/>
+         </LogObject>
+
+WELF
+====
+
+Traffic Server supports WELF (WebTrends Enhanced Log Format) so you can
+analyze Traffic Server log files with WebTrends reporting tools. A
+predefined ``<LogFormat>`` that is compatible with WELF is provided in
+the ``logs_xml.config`` file (shown below). To create a WELF format log
+file, create a ``<LogObject>`` that uses this predefined format.
+
+::
+
+         <LogFormat>
+             <Name = "welf"/>
+             <Format = "id=firewall time=\"%<cqtd> %<cqtt>\" fw=%<phn> pri=6
+                proto=%<cqus> duration=%<ttmsf> sent=%<psql> rcvd=%<cqhl>
+                src=%<chi> dst=%<shi> dstname=%<shn> user=%<caun> op=%<cqhm>
+                arg=\"%<cqup>\" result=%<pssc> ref=\"%<{Referer}cqh>\"
+                agent=\"%<{user-agent}cqh>\" cache=%<crc>"/>
+         </LogFormat>
+


Mime
View raw message