You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by su...@apache.org on 2015/02/12 23:58:11 UTC
trafficserver git commit: docs: Cross-reference packet mark and
TOS/DSCP field API and configuration
Repository: trafficserver
Updated Branches:
refs/heads/master 74aea907a -> 16e9d0f79
docs: Cross-reference packet mark and TOS/DSCP field API and configuration
Conflicts:
doc/reference/api/TSHttpTxnClientPacketMarkSet.en.rst
doc/reference/api/TSHttpTxnClientPacketTosSet.en.rst
doc/reference/api/TSHttpTxnServerPacketMarkSet.en.rst
doc/reference/api/TSHttpTxnServerPacketTosSet.en.rst
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/16e9d0f7
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/16e9d0f7
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/16e9d0f7
Branch: refs/heads/master
Commit: 16e9d0f791960d811c850f10db12d7ca5107dde1
Parents: 74aea90
Author: Jack Bates <ja...@nottheoilrig.com>
Authored: Mon Aug 11 10:47:04 2014 -0700
Committer: Sudheer Vinukonda <su...@yahoo-inc.com>
Committed: Thu Feb 12 22:58:02 2015 +0000
----------------------------------------------------------------------
doc/reference/api/TSHttpTxnClientPacketMarkSet.en.rst | 3 +--
doc/reference/api/TSHttpTxnClientPacketTosSet.en.rst | 3 +--
doc/reference/api/TSHttpTxnServerPacketMarkSet.en.rst | 3 +--
doc/reference/api/TSHttpTxnServerPacketTosSet.en.rst | 3 +--
4 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/16e9d0f7/doc/reference/api/TSHttpTxnClientPacketMarkSet.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/api/TSHttpTxnClientPacketMarkSet.en.rst b/doc/reference/api/TSHttpTxnClientPacketMarkSet.en.rst
index c7cba28..25c35ae 100644
--- a/doc/reference/api/TSHttpTxnClientPacketMarkSet.en.rst
+++ b/doc/reference/api/TSHttpTxnClientPacketMarkSet.en.rst
@@ -39,7 +39,6 @@ Description
See Also
--------
-`Traffic Shaping`_
-
.. _Traffic Shaping:
https://cwiki.apache.org/confluence/display/TS/Traffic+Shaping
+:ts:cv:`proxy.config.net.sock_packet_mark_in` and TS-1090
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/16e9d0f7/doc/reference/api/TSHttpTxnClientPacketTosSet.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/api/TSHttpTxnClientPacketTosSet.en.rst b/doc/reference/api/TSHttpTxnClientPacketTosSet.en.rst
index c211406..25d7777 100644
--- a/doc/reference/api/TSHttpTxnClientPacketTosSet.en.rst
+++ b/doc/reference/api/TSHttpTxnClientPacketTosSet.en.rst
@@ -43,7 +43,6 @@ Description
See Also
--------
-`Traffic Shaping`_
-
.. _Traffic Shaping:
https://cwiki.apache.org/confluence/display/TS/Traffic+Shaping
+:ts:cv:`proxy.config.net.sock_packet_tos_in` and TS-1090
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/16e9d0f7/doc/reference/api/TSHttpTxnServerPacketMarkSet.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/api/TSHttpTxnServerPacketMarkSet.en.rst b/doc/reference/api/TSHttpTxnServerPacketMarkSet.en.rst
index 773c5e3..d4d253c 100644
--- a/doc/reference/api/TSHttpTxnServerPacketMarkSet.en.rst
+++ b/doc/reference/api/TSHttpTxnServerPacketMarkSet.en.rst
@@ -41,7 +41,6 @@ Description
See Also
--------
-`Traffic Shaping`_
-
.. _Traffic Shaping:
https://cwiki.apache.org/confluence/display/TS/Traffic+Shaping
+:ts:cv:`proxy.config.net.sock_packet_mark_out` and TS-1090
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/16e9d0f7/doc/reference/api/TSHttpTxnServerPacketTosSet.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/api/TSHttpTxnServerPacketTosSet.en.rst b/doc/reference/api/TSHttpTxnServerPacketTosSet.en.rst
index c0f7473..76137a0 100644
--- a/doc/reference/api/TSHttpTxnServerPacketTosSet.en.rst
+++ b/doc/reference/api/TSHttpTxnServerPacketTosSet.en.rst
@@ -45,7 +45,6 @@ Description
See Also
--------
-`Traffic Shaping`_
-
.. _Traffic Shaping:
https://cwiki.apache.org/confluence/display/TS/Traffic+Shaping
+:ts:cv:`proxy.config.net.sock_packet_tos_out` and TS-1090