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/4c6f0aeb Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/4c6f0aeb Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/4c6f0aeb Branch: refs/heads/master Commit: 4c6f0aeb8070305b2dd897b34ce0885db8308018 Parents: 0db4ce9 a4fc1df Author: Manjesh Nilange <manjeshnila...@yahoo.com> Authored: Wed May 21 11:56:32 2014 -0700 Committer: Manjesh Nilange <manjeshnila...@yahoo.com> Committed: Wed May 21 11:56:32 2014 -0700 ---------------------------------------------------------------------- doc/arch/hacking/config-var-impl.en.rst | 26 ++++++++++------------ doc/reference/commands/traffic_cop.en.rst | 2 ++ doc/reference/commands/traffic_manager.en.rst | 2 ++ doc/reference/commands/traffic_server.en.rst | 2 ++ 4 files changed, 18 insertions(+), 14 deletions(-) ----------------------------------------------------------------------