Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/8b5f4ead Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/8b5f4ead Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/8b5f4ead Branch: refs/heads/master Commit: 8b5f4ead642ace5cafd108e59d16310b45fdc7c3 Parents: 98981da bbdd3ee Author: Brian Geffon <bri...@apache.org> Authored: Wed Oct 22 17:49:49 2014 -0700 Committer: Brian Geffon <bri...@apache.org> Committed: Wed Oct 22 17:49:49 2014 -0700 ---------------------------------------------------------------------- CHANGES | 2 + doc/admin/cluster-howto.en.rst | 111 ++-- doc/admin/configuring-cache.en.rst | 213 +++--- doc/admin/configuring-traffic-server.en.rst | 22 +- doc/admin/event-logging-formats.en.rst | 228 +++++-- doc/admin/explicit-proxy-caching.en.rst | 34 +- doc/admin/faqs.en.rst | 385 ++++++++--- doc/admin/forward-proxy.en.rst | 146 +++-- doc/admin/getting-started.en.rst | 155 ++--- doc/admin/hierachical-caching.en.rst | 137 ++-- doc/admin/http-proxy-caching.en.rst | 657 +++++++++++-------- doc/admin/index.en.rst | 114 ++-- doc/admin/monitoring-traffic.en.rst | 54 +- doc/admin/performance-tuning.en.rst | 30 +- doc/admin/reverse-proxy-http-redirects.en.rst | 190 +++--- doc/admin/security-options.en.rst | 268 ++++---- doc/admin/session-protocol.en.rst | 50 +- doc/admin/traffic-server-error-messages.en.rst | 99 +-- doc/admin/transparent-proxy.en.rst | 69 +- doc/admin/working-log-files.en.rst | 574 ++++++++-------- .../api/TSHttpConnectWithPluginId.en.rst | 81 ++- doc/reference/commands/index.en.rst | 20 +- .../configuration/logs_xml.config.en.rst | 6 +- 23 files changed, 2133 insertions(+), 1512 deletions(-) ----------------------------------------------------------------------
