You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bc...@apache.org on 2026/09/28 21:59:01 UTC
(trafficserver) branch master updated: Docs: add traffic shaping page and drop Confluence links (#13731)
This is an automated email from the ASF dual-hosted git repository.
bryancall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 4f176aceeb Docs: add traffic shaping page and drop Confluence links (#13731)
4f176aceeb is described below
commit 4f176aceeb126a850400a9a301c88d162930dcb0
Author: Bryan Call <bc...@apache.org>
AuthorDate: Mon Sep 28 14:58:54 2026 -0700
Docs: add traffic shaping page and drop Confluence links (#13731)
Add an admin guide page on marking packets with SO_MARK and DSCP and
shaping them with Linux tc, covering the socket option flags that enable
marking, the records.yaml settings, the plugin API, header_rewrite
operators, pooled connection behavior, and connmark-based shaping of
responses. Point the records.yaml and packet marking API pages at it, and
replace the remaining links to the retired Confluence wiki and Jira with
the docs site, the GitHub wiki, GitHub issues, and the users mailing list.
---
.claude/CLAUDE.md | 2 +-
AGENTS.md | 2 +-
INSTALL | 12 +-
README-EC2 | 2 +-
README.md | 2 +-
STATUS | 18 +-
doc/admin-guide/configuration/index.en.rst | 1 +
.../configuration/traffic-shaping.en.rst | 299 +++++++++++++++++++++
doc/admin-guide/files/records.yaml.en.rst | 11 +-
doc/admin-guide/installation/index.en.rst | 6 +-
.../functions/TSHttpTxnClientPacketDscpSet.en.rst | 5 +-
.../functions/TSHttpTxnClientPacketMarkSet.en.rst | 4 +-
.../functions/TSHttpTxnServerPacketDscpSet.en.rst | 5 +-
.../functions/TSHttpTxnServerPacketMarkSet.en.rst | 4 +-
doc/developer-guide/index.en.rst | 4 +-
src/iocore/cache/RamCacheCLFUS.cc | 2 +-
src/iocore/cache/RamCacheCLFUS.h | 2 +-
17 files changed, 335 insertions(+), 46 deletions(-)
diff --git a/.claude/CLAUDE.md b/.claude/CLAUDE.md
index 5c7194682a..b4d9b0fbd7 100644
--- a/.claude/CLAUDE.md
+++ b/.claude/CLAUDE.md
@@ -246,7 +246,7 @@ MIOBuffer *buffer = (MIOBuffer*)malloc(sizeof(MIOBuffer));
## Resources
- Official docs: https://trafficserver.apache.org/
-- Developer wiki: https://cwiki.apache.org/confluence/display/TS/
+- Developer wiki: https://github.com/apache/trafficserver/wiki
- CI dashboard: https://ci.trafficserver.apache.org/
- AuTest framework: https://autestsuite.bitbucket.io/
- Proxy Verifier: https://github.com/yahoo/proxy-verifier
diff --git a/AGENTS.md b/AGENTS.md
index d866f1845f..d3dff5df45 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -408,7 +408,7 @@ scope, and vulnerability reporting process.
## Resources
- Official docs: https://trafficserver.apache.org/
-- Developer wiki: https://cwiki.apache.org/confluence/display/TS/
+- Developer wiki: https://github.com/apache/trafficserver/wiki
- CI dashboard: https://ci.trafficserver.apache.org/
- AuTest framework: https://autestsuite.bitbucket.io/
- Proxy Verifier: https://github.com/yahoo/proxy-verifier
diff --git a/INSTALL b/INSTALL
index 167b36b792..91ee2152dd 100644
--- a/INSTALL
+++ b/INSTALL
@@ -9,7 +9,7 @@ For complete installation documentation, see the on-line documentation at
Various popular platforms have up-to-date build instructions available
online, at
- https://cwiki.apache.org/confluence/display/TS/Building
+ https://docs.trafficserver.apache.org/en/latest/admin-guide/installation/index.en.html
BUILD AND INSTALLATION
@@ -58,9 +58,15 @@ INSTALLATION HELP
The Apache Traffic Server group cannot field user's installation
questions. There are many valuable forums to help you get started.
Please refer your questions to the appropriate forum, such as the
-Users Mailing List at
+users mailing list at users@trafficserver.apache.org. To join it, send
+an empty email to users-subscribe@trafficserver.apache.org. The list
+archive is at
- https://cwiki.apache.org/confluence/display/TS/Apache+Traffic+Server
+ https://lists.apache.org/list.html?users@trafficserver.apache.org
+
+and how ASF mailing lists work is described at
+
+ https://www.apache.org/foundation/mailinglists.html
Thanks for using the Apache Traffic Server.
diff --git a/README-EC2 b/README-EC2
index 6c5931b4c1..0b9bbd6e37 100644
--- a/README-EC2
+++ b/README-EC2
@@ -114,7 +114,7 @@ Author: Jason Giedymin
you will have to backup and/or optimize your configuration (see 3.2).
To further setup ATS see the TrafficServer wiki @
- http://cwiki.apache.org/confluence/display/TS/
+ https://github.com/apache/trafficserver/wiki
4.2 What is EC2?
See http://aws.amazon.com/
diff --git a/README.md b/README.md
index d0bbaaac30..3b5171e7aa 100644
--- a/README.md
+++ b/README.md
@@ -205,7 +205,7 @@ trafficserver ............. Top src dir
distributions. This may be out of date compared to the on-line
requirements at
- <https://cwiki.apache.org/confluence/display/TS/Building>.
+ <https://docs.trafficserver.apache.org/en/latest/admin-guide/installation/index.en.html>.
As of ATS v9.0.0 and later, gcc 7 or later is required, since we now use and require the C++17 standard.
diff --git a/STATUS b/STATUS
index ecc0d58f71..d39e032081 100644
--- a/STATUS
+++ b/STATUS
@@ -88,27 +88,25 @@ Contributors looking for a mission:
* Just do an egrep on "TODO" or "XXX" in the source.
- * Review the bug database at: https://issues.apache.org/jira/browse/TS
+ * Review the open issues at: https://github.com/apache/trafficserver/issues
- - Download, test and review patches attached to open bugs
+ - Test and review open pull requests at
+ https://github.com/apache/trafficserver/pulls
- * Open bugs in the bug database.
+ * File new issues at: https://github.com/apache/trafficserver/issues/new
UPCOMING WORK:
-A list of all bugs open for the next release can be found at
+Issues and pull requests planned for upcoming releases are tracked on the
+GitHub milestones at
- http://s.apache.org/ats-next
+ https://github.com/apache/trafficserver/milestones
RELEASE PROCESS
The Traffic Server release process and support cycles are documented at
- https://cwiki.apache.org/confluence/display/TS/ReleaseProcess
-
-and
-
- https://cwiki.apache.org/confluence/display/TS/New+Release+Processes
+ https://github.com/apache/trafficserver/wiki/Release-Process
Current status of all build systems is available at
diff --git a/doc/admin-guide/configuration/index.en.rst b/doc/admin-guide/configuration/index.en.rst
index 520e0e9543..37876c345c 100644
--- a/doc/admin-guide/configuration/index.en.rst
+++ b/doc/admin-guide/configuration/index.en.rst
@@ -33,5 +33,6 @@ Proxy Cache Configuration
transparent-forward-proxying.en
hierarchical-caching.en
proxy-protocol.en
+ traffic-shaping.en
hrw4u.en
regex-best-practices.en
diff --git a/doc/admin-guide/configuration/traffic-shaping.en.rst b/doc/admin-guide/configuration/traffic-shaping.en.rst
new file mode 100644
index 0000000000..5422b23a22
--- /dev/null
+++ b/doc/admin-guide/configuration/traffic-shaping.en.rst
@@ -0,0 +1,299 @@
+.. 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.
+
+.. include:: ../../common.defs
+
+.. default-domain:: cpp
+
+.. _admin-traffic-shaping:
+
+Traffic Shaping
+***************
+
+|TS| does not shape traffic itself. Instead, it marks the packets it sends,
+and a separate traffic shaper acts on those marks. On Linux the shaper is
+usually the ``tc`` command from `iproute2
+<https://wiki.linuxfoundation.org/networking/iproute2>`_, often together with
+``iptables`` or ``nftables``. On BSD systems it is ALTQ, typically configured
+through ``pf``. The shaper can also be a separate router or switch that
+understands DSCP. This split lets you use the full feature set of the standard
+tools and shape |TS| traffic together with everything else on the host or
+network.
+
+|TS| can apply two kinds of marks:
+
+Packet mark (``SO_MARK``)
+ A 32-bit value attached to each packet inside the Linux kernel. It never
+ leaves the host, so the shaper must run on the same machine as |TS|. Linux
+ requires ``CAP_NET_ADMIN`` to set it, or ``CAP_NET_RAW`` on Linux 5.17 and
+ later. When |TS| is built with POSIX capability support it keeps
+ ``CAP_NET_ADMIN`` after switching to its unprivileged user. On platforms
+ without ``SO_MARK`` the setting is ignored.
+
+DSCP (``IP_TOS`` / ``IPV6_TCLASS``)
+ The Differentiated Services field in the IPv4 or IPv6 header. It travels
+ with the packet, so a shaper on another device can act on it.
+
+Marks apply to packets that |TS| sends. The *client* side covers responses
+sent to user agents. The *origin* side covers requests sent to origin servers.
+Packets that |TS| receives, such as origin responses, carry whatever marking
+the sender chose. See `Classifying received traffic`_ for how to shape
+those.
+
+Enabling marking
+================
+
+The mark and DSCP values are only applied to a socket when the matching bit is
+set in the socket option flags. This is true for the configuration variables,
+the plugin API and the :ref:`admin-plugins-header-rewrite` operators alike.
+Both flag variables default to ``0x1`` (``TCP_NODELAY`` only), so marking is
+off until you turn it on.
+
+============================================== =========== ==========
+Variable PACKET_MARK PACKET_TOS
+============================================== =========== ==========
+:ts:cv:`proxy.config.net.sock_option_flag_in` ``16`` ``32``
+:ts:cv:`proxy.config.net.sock_option_flag_out` ``16`` ``32``
+============================================== =========== ==========
+
+The flags are a bitmask, so add these bits to the ones you already use. For
+example, to keep ``TCP_NODELAY`` and enable both kinds of marking on client and
+origin connections:
+
+.. code-block:: yaml
+
+ records:
+ net:
+ sock_option_flag_in: 49 # TCP_NODELAY (1) + PACKET_MARK (16) + PACKET_TOS (32)
+ sock_option_flag_out: 49
+
+:ts:cv:`proxy.config.net.sock_option_flag_in` is read when the listening
+sockets are created and requires a restart.
+:ts:cv:`proxy.config.net.sock_option_flag_out` is overridable, but keep the
+marking bits on globally and vary only the values per transaction (see below).
+|TS| only touches a socket's mark when the bit is set, so an origin connection
+reused by a transaction with the bit off keeps whatever mark it already had.
+
+Setting marks
+=============
+
+Configuration variables
+-----------------------
+
+============================================== =========== ========================
+Variable Applies to Scope
+============================================== =========== ========================
+:ts:cv:`proxy.config.net.sock_packet_mark_in` Client side Global, restart
+:ts:cv:`proxy.config.net.sock_packet_tos_in` Client side Global, restart
+:ts:cv:`proxy.config.net.sock_packet_mark_out` Origin side Global or per transaction
+:ts:cv:`proxy.config.net.sock_packet_tos_out` Origin side Global or per transaction
+============================================== =========== ========================
+
+The ``_in`` variables set the marks on every accepted client connection. The
+``_out`` variables are overridable. Override them per remap rule with
+:ref:`admin-plugins-conf-remap`, with the ``set-config`` operator of
+:ref:`admin-plugins-header-rewrite`, or from a plugin with
+:func:`TSHttpTxnConfigIntSet` (keys ``TS_CONFIG_NET_SOCK_PACKET_MARK_OUT`` and
+``TS_CONFIG_NET_SOCK_PACKET_TOS_OUT``). The origin side values are applied when
+the transaction opens a new origin connection or picks up a pooled one, so set
+them no later than the remap or read request header stage.
+
+Plugin API
+----------
+
+====================================== =========== ===========
+Function Applies to Argument
+====================================== =========== ===========
+:func:`TSHttpTxnClientPacketMarkSet` Client side Packet mark
+:func:`TSHttpTxnClientPacketDscpSet` Client side DSCP value
+:func:`TSHttpTxnServerPacketMarkSet` Origin side Packet mark
+:func:`TSHttpTxnServerPacketDscpSet` Origin side DSCP value
+====================================== =========== ===========
+
+The client side functions change the live client connection immediately. The
+origin side functions change the current origin connection if there is one,
+and also override the ``_out`` variable for the transaction so that a later
+origin connection gets the same value.
+
+A client side mark is a socket option, so it stays on the client connection
+after the transaction ends. Later requests on the same keep-alive connection,
+and other HTTP/2 streams sharing it, go out with the same marking until
+something changes it again. An origin connection taken from the pool gets the
+``_out`` values of the transaction that uses it, but only when that
+transaction has the matching bit set in
+:ts:cv:`proxy.config.net.sock_option_flag_out`. Otherwise it keeps the marking
+from its previous use. To send some traffic unmarked, leave the bit on and set
+the value to ``0``, which clears the mark or DSCP.
+
+To set a socket option that |TS| does not manage, such as ``SO_PRIORITY`` for
+the 802.1Q priority code point, get the descriptor with
+``TSHttpTxnClientFdGet()``, ``TSHttpSsnClientFdGet()`` or
+``TSHttpTxnServerFdGet()`` and call ``setsockopt()`` yourself.
+
+The :ref:`Lua plugin <admin-plugins-ts-lua>` exposes the same four functions as
+``ts.http.client_packet_mark_set``, ``ts.http.client_packet_dscp_set``,
+``ts.http.server_packet_mark_set`` and ``ts.http.server_packet_dscp_set``.
+
+header_rewrite operators
+------------------------
+
+:ref:`admin-plugins-header-rewrite` provides ``set-conn-mark`` and
+``set-conn-dscp``, which call the client side functions above. They can be used
+in the remap, read request header and send response header hooks. Combined
+with the ``CACHE`` condition, they can mark cache hits differently from misses.
+For the origin side, use ``set-config`` with the ``_out`` variables.
+
+Choosing values
+===============
+
+The ``sock_packet_tos_*`` variables take the whole 8-bit field. The DSCP
+functions and ``set-conn-dscp`` take the 6-bit DSCP code point and shift it
+left by two bits. For example, DSCP ``CS1`` (8) is
+``sock_packet_tos_out: 32`` (``0x20``) but ``set-conn-dscp 8``. The two low
+bits of the field are used for Explicit Congestion Notification. Standard code
+points are listed in the `IANA DSCP registry
+<https://www.iana.org/assignments/dscp-registry/dscp-registry.xhtml>`_.
+
+:ref:`admin-plugins-conf-remap` and ``set-config`` parse integers as decimal,
+so write ``32`` rather than ``0x20`` there.
+
+Shaping with Linux tc
+=====================
+
+The examples below assume that |TS| sends client and origin traffic out of
+``eth0`` and that ``tc`` runs on the same host. Adjust interface names and
+rates to your network.
+
+Shaping client responses by packet mark
+---------------------------------------
+
+This gives bulk downloads a guaranteed 1 Gbit/s that can grow to 2 Gbit/s,
+while everything else shares the rest of a 10 Gbit/s link.
+
+Enable the packet mark on client connections in :file:`records.yaml`:
+
+.. code-block:: yaml
+
+ records:
+ net:
+ sock_option_flag_in: 17 # TCP_NODELAY (1) + PACKET_MARK (16)
+
+Mark responses for one host with :ref:`admin-plugins-header-rewrite` in
+:file:`remap.config`::
+
+ map http://downloads.example.com/ http://origin.example.com/ \
+ @plugin=header_rewrite.so @pparam=bulk.conf
+
+where ``bulk.conf`` contains::
+
+ set-conn-mark 2
+
+Then send packets with mark ``2`` to a separate HTB class using the ``fw``
+classifier::
+
+ tc qdisc add dev eth0 root handle 1: htb default 10
+ tc class add dev eth0 parent 1: classid 1:1 htb rate 10gbit
+ tc class add dev eth0 parent 1:1 classid 1:10 htb rate 9gbit ceil 10gbit prio 0
+ tc class add dev eth0 parent 1:1 classid 1:20 htb rate 1gbit ceil 2gbit prio 1
+ tc filter add dev eth0 parent 1: protocol all handle 2 fw classid 1:20
+
+Shaping origin requests by DSCP
+-------------------------------
+
+When the shaper is a separate router, use DSCP instead of the packet mark.
+Enable DSCP marking on origin connections:
+
+.. code-block:: yaml
+
+ records:
+ net:
+ sock_option_flag_out: 33 # TCP_NODELAY (1) + PACKET_TOS (32)
+
+Mark traffic to a low priority origin as ``CS1`` with
+:ref:`admin-plugins-conf-remap`::
+
+ map http://backup.example.com/ http://backup-origin.example.com/ \
+ @plugin=conf_remap.so @pparam=proxy.config.net.sock_packet_tos_out=32
+
+On a Linux shaper, match the field with the ``u32`` classifier. The mask
+``0xfc`` ignores the ECN bits::
+
+ tc filter add dev eth0 parent 1: protocol ip u32 \
+ match ip tos 0x20 0xfc classid 1:20
+ tc filter add dev eth0 parent 1: protocol ipv6 u32 \
+ match ip6 priority 0x20 0xfc classid 1:20
+
+Classifying received traffic
+----------------------------
+
+Most of the bytes on the origin side are responses, which |TS| receives rather
+than sends, so its marks are not on them. Connection tracking can carry the
+mark from the request to the response. Save the packet mark that |TS| set on
+outgoing packets into the connection mark, and do it for every packet |TS|
+sends, including unmarked ones. A pooled origin connection can pass from a
+marked transaction to an unmarked one, and saving only nonzero marks would
+leave the old mark on the connection, so its responses would keep landing in
+the old class. Match on the user |TS| runs as
+(:ts:cv:`proxy.config.admin.user_id`, ``nobody`` here)::
+
+ iptables -t mangle -A OUTPUT -m owner --uid-owner nobody -j CONNMARK --save-mark
+ ip6tables -t mangle -A OUTPUT -m owner --uid-owner nobody -j CONNMARK --save-mark
+
+Incoming traffic can only be shaped after it is redirected to an ``ifb``
+device. The ``connmark`` action copies the connection mark back onto each
+packet before the redirect, so the same ``fw`` filters work on ``ifb0``::
+
+ ip link add ifb0 type ifb
+ ip link set dev ifb0 up
+ tc qdisc add dev eth0 handle ffff: ingress
+ tc filter add dev eth0 parent ffff: protocol all matchall \
+ action connmark action mirred egress redirect dev ifb0
+
+Then add an HTB tree and ``fw`` filters to ``ifb0`` as in the first example.
+If the shaper is on another device, have it copy the DSCP value of the request
+into its connection mark instead, for example with ``-m dscp --dscp`` and
+``CONNMARK --set-mark``.
+
+Shaping per client
+------------------
+
+Without transparency, every origin connection comes from the |TS| address, so a
+shaper on the origin side cannot tell clients apart. With outbound
+transparency (``tr-out`` in :ts:cv:`proxy.config.http.server_ports`), origin
+connections use the client's address, so the shaper can divide bandwidth by
+client. The queuing discipline has to be keyed on that address: by default
+``sfq`` and ``fq_codel`` hash each connection separately, so a client with many
+connections still gets more. For example, with ``sfq`` and a ``flow`` filter
+keyed on the source address::
+
+ tc qdisc add dev eth0 root handle 1: sfq divisor 1024
+ tc filter add dev eth0 parent 1: protocol all handle 1 \
+ flow hash keys src divisor 1024
+
+``cake`` does the same with its ``dual-srchost`` mode. See
+:ref:`transparent-proxy` for the required host setup.
+
+See Also
+========
+
+* :file:`records.yaml`
+* :ref:`ts-overridable-config`
+* :ref:`admin-plugins-conf-remap`
+* :ref:`admin-plugins-header-rewrite`
+* :ref:`transparent-proxy`
+* ``tc(8)``, ``tc-htb(8)``, ``tc-fw(8)``, ``tc-u32(8)``, ``tc-connmark(8)``,
+ ``tc-mirred(8)`` and ``iptables-extensions(8)``
diff --git a/doc/admin-guide/files/records.yaml.en.rst b/doc/admin-guide/files/records.yaml.en.rst
index 08eff524c2..49d777ed99 100644
--- a/doc/admin-guide/files/records.yaml.en.rst
+++ b/doc/admin-guide/files/records.yaml.en.rst
@@ -6110,7 +6110,7 @@ Sockets
Set the packet mark on traffic destined for the client
(the packets that make up a client response).
- .. seealso:: `Traffic Shaping`_
+ .. seealso:: :ref:`admin-traffic-shaping`
.. ts:cv:: CONFIG proxy.config.net.sock_packet_mark_out INT 0x0
:overridable:
@@ -6118,14 +6118,14 @@ Sockets
Set the packet mark on traffic destined for the origin
(the packets that make up an origin request).
- .. seealso:: `Traffic Shaping`_
+ .. seealso:: :ref:`admin-traffic-shaping`
.. ts:cv:: CONFIG proxy.config.net.sock_packet_tos_in INT 0x0
Set the ToS/DiffServ Field on packets sent to the client
(the packets that make up a client response).
- .. seealso:: `Traffic Shaping`_
+ .. seealso:: :ref:`admin-traffic-shaping`
.. ts:cv:: CONFIG proxy.config.net.sock_packet_tos_out INT 0x0
:overridable:
@@ -6133,7 +6133,7 @@ Sockets
Set the ToS/DiffServ Field on packets sent to the origin
(the packets that make up an origin request).
- .. seealso:: `Traffic Shaping`_
+ .. seealso:: :ref:`admin-traffic-shaping`
.. ts:cv:: CONFIG proxy.config.net.sock_notsent_lowat INT 16384
:overridable:
@@ -6344,9 +6344,6 @@ Sockets
down.
===== ======================================================================
-.. _Traffic Shaping:
- https://cwiki.apache.org/confluence/display/TS/Traffic+Shaping
-
IO_URING
========
diff --git a/doc/admin-guide/installation/index.en.rst b/doc/admin-guide/installation/index.en.rst
index d94f996025..15b6127451 100644
--- a/doc/admin-guide/installation/index.en.rst
+++ b/doc/admin-guide/installation/index.en.rst
@@ -43,10 +43,8 @@ A complete version number is made of a version-triplet: ``MAJOR.MINOR.PATCH``.
As of v4.0.0, there are no longer any development (or unstable) releases.
All releases are considered stable and ready for production use. Releases
-within a major version are always upgrade compatible. More details are
-available on the `New Release Processes
-<https://cwiki.apache.org/confluence/display/TS/Release+Process>`_ wiki
-page.
+within a major version are always upgrade compatible. How a release is
+prepared and approved is described in :ref:`developer-release-process`.
Sometimes we speak of *trunk*, *master* or *HEAD*, all of which are used
interchangeably. Trunk and master, or sometimes TIP or HEAD, refer to the
diff --git a/doc/developer-guide/api/functions/TSHttpTxnClientPacketDscpSet.en.rst b/doc/developer-guide/api/functions/TSHttpTxnClientPacketDscpSet.en.rst
index 6dca8a9bab..c90aa45e23 100644
--- a/doc/developer-guide/api/functions/TSHttpTxnClientPacketDscpSet.en.rst
+++ b/doc/developer-guide/api/functions/TSHttpTxnClientPacketDscpSet.en.rst
@@ -41,7 +41,4 @@ Change packet :arg:`dscp` for the client side connection.
See Also
========
-`Traffic Shaping`_
-
-.. _Traffic Shaping:
- https://cwiki.apache.org/confluence/display/TS/Traffic+Shaping
+:ref:`admin-traffic-shaping`
diff --git a/doc/developer-guide/api/functions/TSHttpTxnClientPacketMarkSet.en.rst b/doc/developer-guide/api/functions/TSHttpTxnClientPacketMarkSet.en.rst
index e0752c2dcf..9017ea29a1 100644
--- a/doc/developer-guide/api/functions/TSHttpTxnClientPacketMarkSet.en.rst
+++ b/doc/developer-guide/api/functions/TSHttpTxnClientPacketMarkSet.en.rst
@@ -54,6 +54,4 @@ Returns :const:`TS_SUCCESS` when the client connection was modified, and
See Also
========
-.. _Traffic Shaping:
- https://cwiki.apache.org/confluence/display/TS/Traffic+Shaping
- :ts:cv:`proxy.config.net.sock_packet_mark_in` and TS-1090
+:ref:`admin-traffic-shaping` and :ts:cv:`proxy.config.net.sock_packet_mark_in`
diff --git a/doc/developer-guide/api/functions/TSHttpTxnServerPacketDscpSet.en.rst b/doc/developer-guide/api/functions/TSHttpTxnServerPacketDscpSet.en.rst
index 9acb1ff8c3..5c59b16e13 100644
--- a/doc/developer-guide/api/functions/TSHttpTxnServerPacketDscpSet.en.rst
+++ b/doc/developer-guide/api/functions/TSHttpTxnServerPacketDscpSet.en.rst
@@ -46,7 +46,4 @@ Description
See Also
========
-`Traffic Shaping`_
-
-.. _Traffic Shaping:
- https://cwiki.apache.org/confluence/display/TS/Traffic+Shaping
+:ref:`admin-traffic-shaping`
diff --git a/doc/developer-guide/api/functions/TSHttpTxnServerPacketMarkSet.en.rst b/doc/developer-guide/api/functions/TSHttpTxnServerPacketMarkSet.en.rst
index 8940f04e05..baa35a38c3 100644
--- a/doc/developer-guide/api/functions/TSHttpTxnServerPacketMarkSet.en.rst
+++ b/doc/developer-guide/api/functions/TSHttpTxnServerPacketMarkSet.en.rst
@@ -55,6 +55,4 @@ established yet.
See Also
========
-.. _Traffic Shaping:
- https://cwiki.apache.org/confluence/display/TS/Traffic+Shaping
- :ts:cv:`proxy.config.net.sock_packet_mark_out` and TS-1090
+:ref:`admin-traffic-shaping` and :ts:cv:`proxy.config.net.sock_packet_mark_out`
diff --git a/doc/developer-guide/index.en.rst b/doc/developer-guide/index.en.rst
index e4f16a9ea7..db573a0a8e 100644
--- a/doc/developer-guide/index.en.rst
+++ b/doc/developer-guide/index.en.rst
@@ -29,9 +29,9 @@ current version. As a result, some of the sections may refer to
functionality that no longer exists.
If you find any such issues, you may want to submit a `bug or a
-patch <https://issues.apache.org/jira/secure/CreateIssue!default.jspa?pid=12310963>`__.
+patch <https://github.com/apache/trafficserver/issues/new>`__.
We also have a Wiki page explaining how to `create useful bug reports
-<https://cwiki.apache.org/confluence/display/TS/Filing+useful+bug+reports>`__.
+<https://github.com/apache/trafficserver/wiki/Contributing#writing-a-useful-bug-report>`__.
We encourage everyone to file tickets, early and often. Looking for existing,
duplicate bugs is encouraged, but not required.
diff --git a/src/iocore/cache/RamCacheCLFUS.cc b/src/iocore/cache/RamCacheCLFUS.cc
index 90254841b7..4a436011b4 100644
--- a/src/iocore/cache/RamCacheCLFUS.cc
+++ b/src/iocore/cache/RamCacheCLFUS.cc
@@ -22,7 +22,7 @@
*/
// Clocked Least Frequently Used by Size (CLFUS) replacement policy
-// See https://cwiki.apache.org/confluence/display/TS/RamCache
+// See https://docs.trafficserver.apache.org/en/latest/developer-guide/cache-architecture/ram-cache.en.html
#include "RamCacheCLFUS.h"
#include "P_RamCache.h"
diff --git a/src/iocore/cache/RamCacheCLFUS.h b/src/iocore/cache/RamCacheCLFUS.h
index d4c13836d0..5db7363109 100644
--- a/src/iocore/cache/RamCacheCLFUS.h
+++ b/src/iocore/cache/RamCacheCLFUS.h
@@ -23,7 +23,7 @@
#pragma once
-// See https://cwiki.apache.org/confluence/display/TS/RamCache
+// See https://docs.trafficserver.apache.org/en/latest/developer-guide/cache-architecture/ram-cache.en.html
#include "P_RamCache.h"