trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject git commit: Documentation - Added domain, updated for ts:confvar -> ts:cv
Date Thu, 08 Aug 2013 21:02:52 GMT
Updated Branches:
  refs/heads/master c8725baf3 -> 8d7122339


Documentation - Added domain, updated for ts:confvar -> ts:cv


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

Branch: refs/heads/master
Commit: 8d71223391f192970503ed9afae8ccfef31dc982
Parents: c8725ba
Author: Alan M. Carroll <amc@network-geographics.com>
Authored: Thu Aug 8 16:46:41 2013 -0400
Committer: Alan M. Carroll <amc@network-geographics.com>
Committed: Thu Aug 8 17:02:24 2013 -0400

----------------------------------------------------------------------
 doc/admin/transparent-proxy.en.rst              |   6 +-
 doc/conf.py                                     |   2 +
 doc/ext/traffic-server.py                       |  98 ++++-
 .../configuration/log_hosts.config.en.rst       |   4 +-
 .../configuration/records.config.en.rst         | 436 ++++++++++---------
 .../configuration/splitdns.config.en.rst        |   5 +-
 6 files changed, 312 insertions(+), 239 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8d712233/doc/admin/transparent-proxy.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/transparent-proxy.en.rst b/doc/admin/transparent-proxy.en.rst
index aa91e38..f78ecab 100644
--- a/doc/admin/transparent-proxy.en.rst
+++ b/doc/admin/transparent-proxy.en.rst
@@ -8,9 +8,9 @@ Transparent Proxying
   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
@@ -83,7 +83,7 @@ not consult these `more detailed instructions <build>`_
 
 Transparency is configured per server port not globally. This is done
 via the configuration values ``proxy.config.http.server_port_attr``.
-In addition, ``proxy.config.reverse_proxy_enabled`` must be enabled if the
+In addition, :ts:cv:`proxy.config.reverse_proxy.enabled` must be enabled if the
 client side is transparent. That should be fixed in a future patch.
 
 In the first case use the attribute character (replacing the default

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8d712233/doc/conf.py
----------------------------------------------------------------------
diff --git a/doc/conf.py b/doc/conf.py
index 7cb2f0e..026583f 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -103,6 +103,8 @@ pygments_style = 'sphinx'
 # A list of ignored prefixes for module index sorting.
 #modindex_common_prefix = []
 
+nitpicky=1
+
 # -- Options for HTML output ---------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8d712233/doc/ext/traffic-server.py
----------------------------------------------------------------------
diff --git a/doc/ext/traffic-server.py b/doc/ext/traffic-server.py
index fc88ae5..5ce8371 100644
--- a/doc/ext/traffic-server.py
+++ b/doc/ext/traffic-server.py
@@ -11,16 +11,19 @@
 
 from docutils import nodes
 from docutils.parsers import rst
-from sphinx import addnodes
+from sphinx.domains import Domain, ObjType, std
+from sphinx.roles import XRefRole
 from sphinx.locale import l_, _
+import sphinx
 
-class TSConfVar(rst.Directive):
+class TSConfVar(std.Target):
     """
     Description of a traffic server configuration variable.
+
     Argument is the variable as defined in records.config.
 
     Descriptive text should follow, indented.
-    
+
     Then the bulk description (if any) undented. This should be considered equivalent to the Doxygen
     short and long description.
     """
@@ -31,7 +34,7 @@ class TSConfVar(rst.Directive):
         'deprecated' : rst.directives.flag,
     }
     required_arguments = 3
-    optional_arguments = 1
+    optional_arguments = 1 # default is optional, special case if omitted
     final_argument_whitespace = True
     has_content = True
 
@@ -40,7 +43,7 @@ class TSConfVar(rst.Directive):
         field.append(nodes.field_name(text=tag))
         body = nodes.field_body()
         if (isinstance(value, basestring)):
-            body.append(addnodes.compact_paragraph(text=value))
+            body.append(sphinx.addnodes.compact_paragraph(text=value))
         else:
             body.append(value)
         field.append(body)
@@ -48,28 +51,31 @@ class TSConfVar(rst.Directive):
 
     # External entry point
     def run(self):
+        env = self.state.document.settings.env
         cv_default = None
         cv_scope, cv_name, cv_type = self.arguments[0:3]
         if (len(self.arguments) > 3):
             cv_default = self.arguments[3]
-        title = addnodes.desc_name(text=cv_name)
-        title.set_class('ts-confvar-title')
+        title = sphinx.addnodes.desc_name(text=cv_name)
+        self.add_name(title)
+        title.set_class('ts-cv-title')
         if ('class' in self.options):
             title.set_class(self.options.get('class'))
-        # Must have empty strings or it assumes it is attached to another node.
-        target = nodes.target('', '', names=[cv_name])
+        # This has to be a distinct node before the title. if nested then
+        # the browser will scroll forward to just past the title.
+        anchor = nodes.target('', '', names=[cv_name])
         # Second (optional) arg is 'msgNode' - no idea what I should pass for that
         # or if it even matters, although I now think it should not be used.
-        self.state.document.note_explicit_target(target);
+        self.state.document.note_explicit_target(anchor);
+        env.domaindata['ts']['cv'][cv_name] = env.docname
 
-        # Do the property fields
-        fl = nodes.field_list();
+        fl = nodes.field_list()
         fl.append(self.make_field('Scope', cv_scope))
         fl.append(self.make_field('Type', cv_type))
         if (cv_default):
             fl.append(self.make_field('Default', cv_default))
         else:
-            fl.append(self.make_field('Default', addnodes.literal_emphasis(text='*NONE*')))
+            fl.append(self.make_field('Default', sphinx.addnodes.literal_emphasis(text='*NONE*')))
         if ('reloadable' in self.options):
             fl.append(self.make_field('Reloadable', 'Yes'))
         if ('deprecated' in self.options):
@@ -79,10 +85,72 @@ class TSConfVar(rst.Directive):
         nn = nodes.compound();
         self.state.nested_parse(self.content, self.content_offset, nn)
 
-        return [ target, title, fl, nn ]
+        return [ anchor, title, fl, nn ]
+
+class TSConfVarRef(XRefRole):
+    def process_link(self, env, ref_node, explicit_title_p, title, target):
+        return title, target
+
+
+class TrafficServerDomain(Domain):
+    """
+    Apache Traffic Server Documentation.
+    """
+
+    name = 'ts'
+    label = 'Traffic Server'
+    data_version = 2
+
+    object_types = {
+        'cv': ObjType(l_('configuration variable'), 'cv')
+    }
+
+    directives = {
+        'cv' : TSConfVar
+    }
+
+    roles = {
+        'cv' : TSConfVarRef()
+    }
+
+    initial_data = {
+        'cv' : {} # full name -> docname
+    }
+
+    dangling_warnings = {
+        'cv' : "No definition found for configuration variable '%(target)s'"
+    }
+
+    def clear_doc(self, docname):
+        cv_list = self.data['cv']
+        for var, doc in cv_list.items():
+            if doc == docname:
+                del cv_list[var]
+
+    def find_doc(self, key, obj_type):
+        zret = None
+
+        if obj_type == 'cv' :
+            obj_list = self.data['cv']
+        else:
+            obj_list = None
+
+        if obj_list and key in obj_list:
+            zret = obj_list[key]
+
+        return zret
+
+    def resolve_xref(self, env, src_doc, builder, obj_type, target, node, cont_node):
+        dst_doc = self.find_doc(target, obj_type)
+        if (dst_doc):
+            return sphinx.util.nodes.make_refnode(builder, src_doc, dst_doc, nodes.make_id(target), cont_node, 'records.config')
+
+    def get_objects(self):
+        for var, doc in self.data['cv'].iteritems():
+            yield var, var, 'cv', doc, var, 1
 
 def setup(app):
     app.add_crossref_type('configfile', 'file',
                         objname='Configuration file',
                         indextemplate='pair: %s; Configuration files')
-    app.add_directive('ts:confvar', TSConfVar)
+    app.add_domain(TrafficServerDomain)

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8d712233/doc/reference/configuration/log_hosts.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/configuration/log_hosts.config.en.rst b/doc/reference/configuration/log_hosts.config.en.rst
index dcb74e9..a89959b 100644
--- a/doc/reference/configuration/log_hosts.config.en.rst
+++ b/doc/reference/configuration/log_hosts.config.en.rst
@@ -5,9 +5,9 @@
   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

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8d712233/doc/reference/configuration/records.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/configuration/records.config.en.rst b/doc/reference/configuration/records.config.en.rst
index 510e681..1ca3cfb 100644
--- a/doc/reference/configuration/records.config.en.rst
+++ b/doc/reference/configuration/records.config.en.rst
@@ -103,49 +103,49 @@ the :file:`records.config` file.
 System Variables
 ----------------
 
-.. ts:confvar:: CONFIG proxy.config.product_company STRING Apache Software Foundation
+.. ts:cv:: CONFIG proxy.config.product_company STRING Apache Software Foundation
 
    The name of the organization developing Traffic Server.
 
-.. ts:confvar:: CONFIG proxy.config.product_vendor STRING Apache
+.. ts:cv:: CONFIG proxy.config.product_vendor STRING Apache
 
    The name of the vendor providing Traffic Server.
 
-.. ts:confvar:: CONFIG proxy.config.product_name STRING Traffic Server
+.. ts:cv:: CONFIG proxy.config.product_name STRING Traffic Server
 
    The name of the product.
 
-.. ts:confvar:: CONFIG proxy.config.proxy_name STRING ``build_machine``
+.. ts:cv:: CONFIG proxy.config.proxy_name STRING ``build_machine``
    :reloadable:
 
    The name of the Traffic Server node.
 
-.. ts:confvar:: CONFIG proxy.config.bin_path STRING bin
+.. ts:cv:: CONFIG proxy.config.bin_path STRING bin
 
    The location of the Traffic Server ``bin`` directory.
 
-.. ts:confvar:: CONFIG proxy.config.proxy_binary STRING traffic_server
+.. ts:cv:: CONFIG proxy.config.proxy_binary STRING traffic_server
 
    The name of the executable that runs the ``traffic_server`` process.
 
-.. ts:confvar:: CONFIG proxy.config.proxy_binary_opts STRING -M
+.. ts:cv:: CONFIG proxy.config.proxy_binary_opts STRING -M
 
    The command-line options for starting Traffic Server.
 
-.. ts:confvar:: CONFIG proxy.config.manager_binary STRING traffic_manager
+.. ts:cv:: CONFIG proxy.config.manager_binary STRING traffic_manager
 
    The name of the executable that runs the ``traffic_manager`` process.
 
-.. ts:confvar:: CONFIG proxy.config.env_prep STRING
+.. ts:cv:: CONFIG proxy.config.env_prep STRING
 
    The script executed before the ``traffic_manager`` process spawns
    the ``traffic_server`` process.
 
-.. ts:confvar:: CONFIG proxy.config.config_dir STRING config
+.. ts:cv:: CONFIG proxy.config.config_dir STRING config
 
    The directory that contains Traffic Server configuration files.
 
-.. ts:confvar:: CONFIG proxy.config.alarm_email STRING
+.. ts:cv:: CONFIG proxy.config.alarm_email STRING
    :reloadable:
 
    The email address to which Traffic Server sends alarm messages.
@@ -153,57 +153,57 @@ System Variables
 During a custom Traffic Server installation, you can specify the email address;
 otherwise, Traffic Server uses the Traffic Server user account name as the default value for this variable.
 
-.. ts:confvar:: CONFIG proxy.config.syslog_facility STRING LOG_DAEMON
+.. ts:cv:: CONFIG proxy.config.syslog_facility STRING LOG_DAEMON
 
    The facility used to record system log files. Refer to
    `Understanding Traffic Server Log Files <../working-log-files#UnderstandingTrafficServerLogFiles>`_.
 
-.. ts:confvar:: CONFIG proxy.config.cop.core_signal INT 0
+.. ts:cv:: CONFIG proxy.config.cop.core_signal INT 0
 
    The signal sent to ``traffic_cop``'s managed processes to stop them.
 
 A value of ``0`` means no signal will be sent.
 
-.. ts:confvar:: CONFIG proxy.config.cop.linux_min_swapfree_kb INT 10240
+.. ts:cv:: CONFIG proxy.config.cop.linux_min_swapfree_kb INT 10240
 
    The minimum amount of free swap space allowed before Traffic Server stops the ``traffic_server`` and ``traffic_manager`` processes to
    prevent the system from hanging. This configuration variable applies if swap is enabled in Linux 2.2 only.
 
-.. ts:confvar:: CONFIG proxy.config.output.logfile  STRING traffic.out
+.. ts:cv:: CONFIG proxy.config.output.logfile  STRING traffic.out
 
    The name and location of the file that contains warnings, status messages, and error messages produced by the Traffic Server
    processes. If no path is specified, then Traffic Server creates the file in its logging directory.
 
-.. ts:confvar:: CONFIG proxy.config.snapshot_dir STRING snapshots
+.. ts:cv:: CONFIG proxy.config.snapshot_dir STRING snapshots
 
    The directory in which Traffic Server stores configuration snapshots on the local system. Unless you specify an absolute path, this
    directory is located in the Traffic Server ``config`` directory.
 
-.. ts:confvar:: CONFIG proxy.config.exec_thread.autoconfig INT 1
+.. ts:cv:: CONFIG proxy.config.exec_thread.autoconfig INT 1
 
    When enabled (the default, ``1``), Traffic Server scales threads according to the available CPU cores. See the config option below.
 
-.. ts:confvar:: CONFIG proxy.config.exec_thread.autoconfig.scale FLOAT 1.5
+.. ts:cv:: CONFIG proxy.config.exec_thread.autoconfig.scale FLOAT 1.5
 
    Factor by which Traffic Server scales the number of threads. The multiplier is usually the number of available CPU cores. By default
    this is scaling factor is ``1.5``.
 
-.. ts:confvar:: CONFIG proxy.config.exec_thread.limit INT 2
+.. ts:cv:: CONFIG proxy.config.exec_thread.limit INT 2
 
    *XXX* What does this do?
 
-.. ts:confvar:: CONFIG proxy.config.accept_threads INT 0
+.. ts:cv:: CONFIG proxy.config.accept_threads INT 0
 
    When enabled (``1``), runs a separate thread for accept processing. If disabled (``0``), then only 1 thread can be created.
 
-.. ts:confvar:: CONFIG proxy.config.thread.default.stacksize  INT 1096908
+.. ts:cv:: CONFIG proxy.config.thread.default.stacksize  INT 1096908
 
    The new default thread stack size, for all threads. The original default is set at 1 MB.
 
 Network
 =======
 
-.. ts:confvar:: LOCAL proxy.local.incoming_ip_to_bind STRING 0.0.0.0 ::
+.. ts:cv:: LOCAL proxy.local.incoming_ip_to_bind STRING 0.0.0.0 ::
 
    Controls the global default IP addresses to which to bind proxy server ports. The value is a space separated list of IP addresses, one per supported IP address family (currently IPv4 and IPv6).
 
@@ -223,7 +223,7 @@ Unless explicitly specified in `proxy.config.http.server_ports`_ the server port
 
       LOCAL proxy.local.incoming_ip_to_bind STRING 192.168.101.18 fc07:192:168:101::17
 
-.. ts:confvar:: LOCAL proxy.local.outgoing_ip_to_bind STRING 0.0.0.0 ::
+.. ts:cv:: LOCAL proxy.local.outgoing_ip_to_bind STRING 0.0.0.0 ::
 
    This controls the global default for the local IP address for outbound connections to origin servers. The value is a list of space separated IP addresses, one per supported IP address family (currently IPv4 and IPv6).
 
@@ -246,7 +246,7 @@ Unless explicitly specified in `proxy.config.http.server_ports`_ the server port
 Cluster
 =======
 
-.. ts:confvar:: LOCAL proxy.local.cluster.type INT 3
+.. ts:cv:: LOCAL proxy.local.cluster.type INT 3
 
    Sets the clustering mode:
 
@@ -258,12 +258,12 @@ Value Effect
 3     no clustering
 ===== ====================
 
-.. ts:confvar:: CONFIG proxy.config.cluster.rsport INT 8088
+.. ts:cv:: CONFIG proxy.config.cluster.rsport INT 8088
 
    The reliable service port. The reliable service port is used to send configuration information between the nodes in a cluster. All nodes
    in a cluster must use the same reliable service port.
 
-.. ts:confvar:: CONFIG proxy.config.cluster.threads INT 1
+.. ts:cv:: CONFIG proxy.config.cluster.threads INT 1
 
    The number of threads for cluster communication. On heavy cluster, the number should be adjusted. It is recommend that take the thread
    CPU usage as a reference when adjusting.
@@ -271,19 +271,19 @@ Value Effect
 Local Manager
 =============
 
-.. ts:confvar:: CONFIG proxy.config.lm.sem_id INT 11452
+.. ts:cv:: CONFIG proxy.config.lm.sem_id INT 11452
 
    The semaphore ID for the local manager.
 
-.. ts:confvar:: CONFIG proxy.config.admin.autoconf_port INT 8083
+.. ts:cv:: CONFIG proxy.config.admin.autoconf_port INT 8083
 
    The autoconfiguration port.
 
-.. ts:confvar:: CONFIG proxy.config.admin.number_config_bak INT 3
+.. ts:cv:: CONFIG proxy.config.admin.number_config_bak INT 3
 
    The maximum number of copies of rolled configuration files to keep.
 
-.. ts:confvar:: CONFIG proxy.config.admin.user_id STRING nobody
+.. ts:cv:: CONFIG proxy.config.admin.user_id STRING nobody
 
    Option used to specify who to run the ``traffic_server`` process as; also used to specify ownership of config and log files.
 
@@ -303,26 +303,26 @@ trafficserver as root.
 Process Manager
 ===============
 
-.. ts:confvar:: CONFIOG proxy.config.process_manager.mgmt_port  INT 8084
+.. ts:cv:: CONFIOG proxy.config.process_manager.mgmt_port  INT 8084
 
    The port used for internal communication between the ``traffic_manager`` and ``traffic_server`` processes.
 
 Alarm Configuration
 ===================
 
-.. ts:confvar:: CONFIG proxy.config.alarm.bin STRING example_alarm_bin.sh
+.. ts:cv:: CONFIG proxy.config.alarm.bin STRING example_alarm_bin.sh
 
    Name of the script file that can execute certain actions when an alarm is signaled. The default file is a sample script named
    ``example_alarm_bin.sh`` located in the ``bin`` directory. You must dit the script to suit your needs.
 
-.. ts:confvar:: CONFIG proxy.config.alarm.abs_path STRING NULL
+.. ts:cv:: CONFIG proxy.config.alarm.abs_path STRING NULL
 
    The full path to the script file that sends email to alert someone bout Traffic Server problems.
 
 HTTP Engine
 ===========
 
-.. ts:confvar:: CONFIG proxy.config.http.server_ports STRING 8080
+.. ts:cv:: CONFIG proxy.config.http.server_ports STRING 8080
 
    Ports used for proxying HTTP traffic.
 
@@ -423,7 +423,7 @@ compress
 
       8080:ipv6:tr-full 443:ssl ip-in=192.168.17.1:80:ip-out=[fc01:10:10:1::1]:ip-out=10.10.10.1
 
-.. ts:confvar:: CONFIG proxy.config.http.connect_ports STRING 443 563
+.. ts:cv:: CONFIG proxy.config.http.connect_ports STRING 443 563
 
    The range of origin server ports that can be used for tunneling via ``CONNECT``.
 
@@ -432,7 +432,7 @@ Supports both wildcards ('\*') and ranges ("0-1023").
 
 .. note:: These are the ports on the *origin server*, not `server ports <#proxy-config-http-server-ports>`_.
 
-.. ts:confvar:: CONFIG proxy.config.http.insert_request_via_str INT 1
+.. ts:cv:: CONFIG proxy.config.http.insert_request_via_str INT 1
    :reloadable:
 
    Set how the ``Via`` field is handled on a request to the origin server.
@@ -447,7 +447,7 @@ Value Effect
 
 .. note:: the ``Via`` header string interpretation can be `decoded here. </tools/via>`_
 
-.. ts:confvar:: CONFIG proxy.config.http.insert_response_via_str INT 1
+.. ts:cv:: CONFIG proxy.config.http.insert_response_via_str INT 1
    :reloadable:
 
    Set how the ``Via`` field is handled on the response to the client.
@@ -460,7 +460,7 @@ Value Effect
 2     some extra information is added.
 ===== ======================
 
-.. ts:confvar:: CONFIG proxy.config.http.response_server_enabled INT 1
+.. ts:cv:: CONFIG proxy.config.http.response_server_enabled INT 1
    :reloadable:
 
    You can specify one of the following:
@@ -469,7 +469,7 @@ Value Effect
    -  ``1`` the Server: header is added (see string below).
    -  ``2`` the Server: header is added only if the response from rigin does not have one already.
 
-.. ts:confvar:: CONFIG proxy.config.http.insert_age_in_response INT 1
+.. ts:cv:: CONFIG proxy.config.http.insert_age_in_response INT 1
    :reloadable:
 
    This option specifies whether Traffic Server should insert an ``Age`` header in the response. The Age field value is the cache's
@@ -478,20 +478,20 @@ Value Effect
    -  ``0`` no ``Age`` header is added
    -  ``1`` the ``Age`` header is added
 
-.. ts:confvar:: CONFIG proxy.config.http.response_server_str STRING ATS/
+.. ts:cv:: CONFIG proxy.config.http.response_server_str STRING ATS/
    :reloadable:
 
    The Server: string that ATS will insert in a response header (if requested, see above). Note that the current version number is
    always appended to this string.
 
-.. ts:confvar:: CONFIG proxy.config.http.enable_url_expandomatic INT 1
+.. ts:cv:: CONFIG proxy.config.http.enable_url_expandomatic INT 1
    :reloadable:
 
    Enables (``1``) or disables (``0``) ``.com`` domain expansion. This configures the Traffic Server to resolve unqualified hostnames by
    prepending with ``www.`` and appending with ``.com`` before redirecting to the expanded address. For example: if a client makes
    a request to ``host``, then Traffic Server redirects the request to ``www.host.com``.
 
-.. ts:confvar:: CONFIG proxy.config.http.chunking_enabled INT 1
+.. ts:cv:: CONFIG proxy.config.http.chunking_enabled INT 1
    :reloadable:
 
    Specifies whether Traffic Sever can generate a chunked response:
@@ -508,16 +508,16 @@ Value Effect
    Server can use ``keep-alive`` connections without pipelining to
    origin servers.
 
-.. ts:confvar:: CONFIG proxy.config.http.share_server_sessions INT 1
+.. ts:cv:: CONFIG proxy.config.http.share_server_sessions INT 1
 
    Enables (``1``) or disables (``0``) the reuse of server sessions.
 
-.. ts:confvar:: CONFIG proxy.config.http.record_heartbeat INT 0
+.. ts:cv:: CONFIG proxy.config.http.record_heartbeat INT 0
    :reloadable:
 
    Enables (``1``) or disables (``0``) ``traffic_cop`` heartbeat ogging.
 
-.. ts:confvar:: CONFIG proxy.config.http.use_client_target_addr  INT 0
+.. ts:cv:: CONFIG proxy.config.http.use_client_target_addr  INT 0
 
    For fully transparent ports use the same origin server address as the client.
 
@@ -571,38 +571,38 @@ specific domains.
 Parent Proxy Configuration
 ==========================
 
-.. ts:confvar:: CONFIG proxy.config.http.parent_proxy_routing_enable INT 0
+.. ts:cv:: CONFIG proxy.config.http.parent_proxy_routing_enable INT 0
    :reloadable:
 
    Enables (``1``) or disables (``0``) the parent caching option. Refer to Hierarchical Caching <../hierachical-caching>_.
 
-.. ts:confvar:: CONFIG proxy.config.http.parent_proxy.retry_time INT 300
+.. ts:cv:: CONFIG proxy.config.http.parent_proxy.retry_time INT 300
    :reloadable:
 
    The amount of time allowed between connection retries to a parent cache that is unavailable.
 
-.. ts:confvar:: CONFIG proxy.config.http.parent_proxy.fail_threshold INT 10
+.. ts:cv:: CONFIG proxy.config.http.parent_proxy.fail_threshold INT 10
    :reloadable:
 
    The number of times the connection to the parent cache can fail before Traffic Server considers the parent unavailable.
 
-.. ts:confvar:: CONFIG proxy.config.http.parent_proxy.total_connect_attempts INT 4
+.. ts:cv:: CONFIG proxy.config.http.parent_proxy.total_connect_attempts INT 4
    :reloadable:
 
    The total number of connection attempts allowed to a parent cache before Traffic Server bypasses the parent or fails the request
-   (depending on the ``go_direct`` option in the :file:`bypass.config` file).
+   (depending on the ``go_direct`` option in the :file:`parent.config` file).
 
-.. ts:confvar:: CONFIG proxy.config.http.parent_proxy.per_parent_connect_attempts INT 2
+.. ts:cv:: CONFIG proxy.config.http.parent_proxy.per_parent_connect_attempts INT 2
    :reloadable:
 
    The total number of connection attempts allowed per parent, if multiple parents are used.
 
-.. ts:confvar:: CONFIG proxy.config.http.parent_proxy.connect_attempts_timeout INT 30
+.. ts:cv:: CONFIG proxy.config.http.parent_proxy.connect_attempts_timeout INT 30
    :reloadable:
 
    The timeout value (in seconds) for parent cache connection attempts.
 
-.. ts:confvar:: CONFIG proxy.config.http.forward.proxy_auth_to_parent INT 0
+.. ts:cv:: CONFIG proxy.config.http.forward.proxy_auth_to_parent INT 0
    :reloadable:
 
    Configures Traffic Server to send proxy authentication headers on to the parent cache.
@@ -610,27 +610,27 @@ Parent Proxy Configuration
 HTTP Connection Timeouts
 ========================
 
-.. ts:confvar:: CONFIG proxy.config.http.keep_alive_no_activity_timeout_in INT 10
+.. ts:cv:: CONFIG proxy.config.http.keep_alive_no_activity_timeout_in INT 10
    :reloadable:
 
    Specifies how long Traffic Server keeps connections to clients open for a subsequent request after a transaction ends.
 
-.. ts:confvar:: CONFIG proxy.config.http.keep_alive_no_activity_timeout_out INT 10
+.. ts:cv:: CONFIG proxy.config.http.keep_alive_no_activity_timeout_out INT 10
    :reloadable:
 
    Specifies how long Traffic Server keeps connections to origin servers open for a subsequent transfer of data after a transaction ends.
 
-.. ts:confvar:: CONFIG proxy.config.http.transaction_no_activity_timeout_in INT 120
+.. ts:cv:: CONFIG proxy.config.http.transaction_no_activity_timeout_in INT 120
    :reloadable:
 
    Specifies how long Traffic Server keeps connections to clients open if a transaction stalls.
 
-.. ts:confvar:: CONFIG proxy.config.http.transaction_no_activity_timeout_out INT 120
+.. ts:cv:: CONFIG proxy.config.http.transaction_no_activity_timeout_out INT 120
    :reloadable:
 
    Specifies how long Traffic Server keeps connections to origin servers open if the transaction stalls.
 
-.. ts:confvar:: CONFIG proxy.config.http.transaction_active_timeout_in INT 0
+.. ts:cv:: CONFIG proxy.config.http.transaction_active_timeout_in INT 0
    :reloadable:
 
    The maximum amount of time Traffic Server can remain connected to a client. If the transfer to the client is not complete before this
@@ -638,7 +638,7 @@ HTTP Connection Timeouts
 
 The default value of ``0`` specifies that there is no timeout.
 
-.. ts:confvar:: CONFIG proxy.config.http.transaction_active_timeout_out INT 0
+.. ts:cv:: CONFIG proxy.config.http.transaction_active_timeout_out INT 0
    :reloadable:
 
    The maximum amount of time Traffic Server waits for fulfillment of a connection request to an origin server. If Traffic Server does not
@@ -646,17 +646,17 @@ The default value of ``0`` specifies that there is no timeout.
 
 The default value of ``0`` specifies that there is no timeout.
 
-.. ts:confvar:: CONFIG proxy.config.http.accept_no_activity_timeout INT 120
+.. ts:cv:: CONFIG proxy.config.http.accept_no_activity_timeout INT 120
    :reloadable:
 
    The timeout interval in seconds before Traffic Server closes a connection that has no activity.
 
-.. ts:confvar:: CONFIG proxy.config.http.background_fill_active_timeout INT 60
+.. ts:cv:: CONFIG proxy.config.http.background_fill_active_timeout INT 60
    :reloadable:
 
    Specifies how long Traffic Server continues a background fill before giving up and dropping the origin server connection.
 
-.. ts:confvar:: CONFIG proxy.config.http.background_fill_completed_threshold FLOAT 0.50000
+.. ts:cv:: CONFIG proxy.config.http.background_fill_completed_threshold FLOAT 0.50000
    :reloadable:
 
    The proportion of total document size already transferred when a client aborts at which the proxy continues fetching the document
@@ -665,54 +665,54 @@ The default value of ``0`` specifies that there is no timeout.
 Origin Server Connect Attempts
 ==============================
 
-.. ts:confvar:: CONFIG proxy.config.http.connect_attempts_max_retries INT 6
+.. ts:cv:: CONFIG proxy.config.http.connect_attempts_max_retries INT 6
    :reloadable:
 
    The maximum number of connection retries Traffic Server can make when the origin server is not responding.
 
-.. ts:confvar:: CONFIG proxy.config.http.connect_attempts_max_retries_dead_server INT 2
+.. ts:cv:: CONFIG proxy.config.http.connect_attempts_max_retries_dead_server INT 2
    :reloadable:
 
    The maximum number of connection retries Traffic Server can make when the origin server is unavailable.
 
-.. ts:confvar:: CONFIG proxy.config.http.server_max_connections INT 0
+.. ts:cv:: CONFIG proxy.config.http.server_max_connections INT 0
    :reloadable:
 
    Limits the number of socket connections across all origin servers to the value specified. To disable, set to zero (``0``).
 
-.. ts:confvar:: CONFIG proxy.config.http.origin_max_connections INT 0
+.. ts:cv:: CONFIG proxy.config.http.origin_max_connections INT 0
    :reloadable:
 
    Limits the number of socket connections per origin server to the value specified. To enable, set to one (``1``).
 
-.. ts:confvar:: CONFIG proxy.config.http.origin_min_keep_alive_connections INT 0
+.. ts:cv:: CONFIG proxy.config.http.origin_min_keep_alive_connections INT 0
    :reloadable:
 
    As connection to an origin server are opened, keep at least 'n' number of connections open to that origin, even if the connection
    isn't used for a long time period. Useful when the origin supports keep-alive, removing the time needed to set up a new connection from
    the next request at the expense of added (inactive) connections. To enable, set to one (``1``).
 
-.. ts:confvar:: CONFIG proxy.config.http.connect_attempts_rr_retries INT 2
+.. ts:cv:: CONFIG proxy.config.http.connect_attempts_rr_retries INT 2
    :reloadable:
 
    The maximum number of failed connection attempts allowed before a round-robin entry is marked as 'down' if a server has round-robin DNS entries.
 
-.. ts:confvar:: CONFIG proxy.config.http.connect_attempts_timeout INT 30
+.. ts:cv:: CONFIG proxy.config.http.connect_attempts_timeout INT 30
    :reloadable:
 
    The timeout value (in seconds) for an origin server connection.
 
-.. ts:confvar:: CONFIG proxy.config.http.post_connect_attempts_timeout INT 1800
+.. ts:cv:: CONFIG proxy.config.http.post_connect_attempts_timeout INT 1800
    :reloadable:
 
    The timeout value (in seconds) for an origin server connection when the client request is a ``POST`` or ``PUT`` request.
 
-.. ts:confvar:: CONFIG proxy.config.http.down_server.cache_time INT 900
+.. ts:cv:: CONFIG proxy.config.http.down_server.cache_time INT 900
    :reloadable:
 
    Specifies how long (in seconds) Traffic Server remembers that an origin server was unreachable.
 
-.. ts:confvar:: CONFIG proxy.config.http.down_server.abort_threshold INT 10
+.. ts:cv:: CONFIG proxy.config.http.down_server.abort_threshold INT 10
    :reloadable:
 
    The number of seconds before Traffic Server marks an origin server as unavailable after a client abandons a request because the origin
@@ -721,7 +721,7 @@ Origin Server Connect Attempts
 Congestion Control
 ==================
 
-.. ts:confvar:: CONFIG proxy.config.http.congestion_control.enabled INT 0
+.. ts:cv:: CONFIG proxy.config.http.congestion_control.enabled INT 0
 
    Enables (``1``) or disables (``0``) the Congestion Control option, which configures Traffic Server to stop forwarding HTTP requests to
    origin servers when they become congested. Traffic Server sends the client a message to retry the congested origin server later. Refer
@@ -730,7 +730,7 @@ Congestion Control
 Negative Response Caching
 =========================
 
-.. ts:confvar:: CONFIG proxy.config.http.negative_caching_enabled INT 0
+.. ts:cv:: CONFIG proxy.config.http.negative_caching_enabled INT 0
    :reloadable:
 
    When enabled (``1``), Traffic Server caches negative responses (such as ``404 Not Found``) when a requested page does not exist. The next
@@ -752,57 +752,57 @@ Negative Response Caching
         503  Service Unavailable
         504  Gateway Timeout
 
-    The cache lifetime for objects cached from this setting is controlled via 
+    The cache lifetime for objects cached from this setting is controlled via
     ``proxy.config.http.negative_caching_lifetime``.
 
 Proxy User Variables
 ====================
 
-.. ts:confvar:: CONFIG proxy.config.http.anonymize_remove_from INT 0
+.. ts:cv:: CONFIG proxy.config.http.anonymize_remove_from INT 0
    :reloadable:
 
    When enabled (``1``), Traffic Server removes the ``From`` header to protect the privacy of your users.
 
-.. ts:confvar:: CONFIG proxy.config.http.anonymize_remove_referer INT 0
+.. ts:cv:: CONFIG proxy.config.http.anonymize_remove_referer INT 0
    :reloadable:
 
    When enabled (``1``), Traffic Server removes the ``Referrer`` header to protect the privacy of your site and users.
 
-.. ts:confvar:: CONFIG proxy.config.http.anonymize_remove_user_agent INT 0
+.. ts:cv:: CONFIG proxy.config.http.anonymize_remove_user_agent INT 0
    :reloadable:
 
    When enabled (``1``), Traffic Server removes the ``User-agent`` header to protect the privacy of your site and users.
 
-.. ts:confvar:: CONFIG proxy.config.http.anonymize_remove_cookie INT 0
+.. ts:cv:: CONFIG proxy.config.http.anonymize_remove_cookie INT 0
    :reloadable:
 
    When enabled (``1``), Traffic Server removes the ``Cookie`` header to protect the privacy of your site and users.
 
-.. ts:confvar:: CONFIG proxy.config.http.anonymize_remove_client_ip INT 0
+.. ts:cv:: CONFIG proxy.config.http.anonymize_remove_client_ip INT 0
    :reloadable:
 
    When enabled (``1``), Traffic Server removes ``Client-IP`` headers for more privacy.
 
-.. ts:confvar:: CONFIG proxy.config.http.anonymize_insert_client_ip INT 1
+.. ts:cv:: CONFIG proxy.config.http.anonymize_insert_client_ip INT 1
    :reloadable:
 
    When enabled (``1``), Traffic Server inserts ``Client-IP`` headers to retain the client IP address.
 
-.. ts:confvar:: CONFIG proxy.config.http.append_xforwards_header INT 0
+.. ts:cv:: CONFIG proxy.config.http.append_xforwards_header INT 0
 
    When enabled (``1``), Traffic Server appends ``X-Forwards`` headers to outgoing requests.
 
-.. ts:confvar:: CONFIG proxy.config.http.anonymize_other_header_list STRING NULL
+.. ts:cv:: CONFIG proxy.config.http.anonymize_other_header_list STRING NULL
    :reloadable:
 
    The headers Traffic Server should remove from outgoing requests.
 
-.. ts:confvar:: CONFIG proxy.config.http.insert_squid_x_forwarded_for INT 0
+.. ts:cv:: CONFIG proxy.config.http.insert_squid_x_forwarded_for INT 0
    :reloadable:
 
    When enabled (``1``), Traffic Server adds the client IP address to the ``X-Forwarded-For`` header.
 
-.. ts:confvar:: CONFIG proxy.config.http.normalize_ae_gzip INT 0
+.. ts:cv:: CONFIG proxy.config.http.normalize_ae_gzip INT 0
    :reloadable:
 
    Enable (``1``) to normalize all ``Accept-Encoding:`` headers to one of the following:
@@ -816,7 +816,7 @@ Proxy User Variables
 Security
 ========
 
-.. ts:confvar:: CONFIG proxy.config.http.push_method_enabled INT 0
+.. ts:cv:: CONFIG proxy.config.http.push_method_enabled INT 0
    :reloadable:
 
    Enables (``1``) or disables (``0``) the HTTP ``PUSH`` option, which allows you to deliver content directly to the cache without a user
@@ -829,38 +829,38 @@ Security
 Cache Control
 =============
 
-.. ts:confvar:: CONFIG proxy.config.cache.enable_read_while_writer INT 0
+.. ts:cv:: CONFIG proxy.config.cache.enable_read_while_writer INT 0
    :reloadable:
 
    Enables (``1``) or disables (``0``) ability to a read cached object while the another connection is completing the write to cache for
    the same object.
 
-.. ts:confvar:: CONFIG proxy.config.cache.force_sector_size INT 512
+.. ts:cv:: CONFIG proxy.config.cache.force_sector_size INT 512
    :reloadable:
 
    Forces the use of a specific hardware sector size (512 - 8192 bytes).
 
-.. ts:confvar:: CONFIG proxy.config.http.cache.http INT 1
+.. ts:cv:: CONFIG proxy.config.http.cache.http INT 1
    :reloadable:
 
    Enables (``1``) or disables (``0``) caching of HTTP requests.
 
-.. ts:confvar:: CONFIG proxy.config.http.cache.ignore_client_no_cache INT 0
+.. ts:cv:: CONFIG proxy.config.http.cache.ignore_client_no_cache INT 0
    :reloadable:
 
    When enabled (``1``), Traffic Server ignores client requests to bypass the cache.
 
-.. ts:confvar:: CONFIG proxy.config.http.cache.ims_on_client_no_cache INT 0
+.. ts:cv:: CONFIG proxy.config.http.cache.ims_on_client_no_cache INT 0
    :reloadable:
 
    When enabled (``1``), Traffic Server issues a conditional request to the origin server if an incoming request has a ``No-Cache`` header.
 
-.. ts:confvar:: CONFIG proxy.config.http.cache.ignore_server_no_cache INT 0
+.. ts:cv:: CONFIG proxy.config.http.cache.ignore_server_no_cache INT 0
    :reloadable:
 
    When enabled (``1``), Traffic Server ignores origin server requests to bypass the cache.
 
-.. ts:confvar:: CONFIG proxy.config.http.cache.cache_responses_to_cookies INT 3
+.. ts:cv:: CONFIG proxy.config.http.cache.cache_responses_to_cookies INT 3
    :reloadable:
 
    Specifies how cookies are cached:
@@ -870,24 +870,24 @@ Cache Control
    -  ``2`` = cache only for image types
    -  ``3`` = cache for all but text content-types
 
-.. ts:confvar:: CONFIG proxy.config.http.cache.ignore_authentication INT 0
+.. ts:cv:: CONFIG proxy.config.http.cache.ignore_authentication INT 0
 
    When enabled (``1``), Traffic Server ignores ``WWW-Authentication`` headers in responses ``WWW-Authentication`` headers are removed and
    not cached.
 
-.. ts:confvar:: CONFIG proxy.config.http.cache.cache_urls_that_look_dynamic INT 1
+.. ts:cv:: CONFIG proxy.config.http.cache.cache_urls_that_look_dynamic INT 1
    :reloadable:
 
    Enables (``1``) or disables (``0``) caching of URLs that look dynamic, i.e.: URLs that end in *``.asp``* or contain a question
    mark (*``?``*), a semicolon (*``;``*), or *``cgi``*. For a full list, please refer to
    `HttpTransact::url_looks_dynamic </link/to/doxygen>`_
 
-.. ts:confvar:: CONFIG proxy.config.http.cache.enable_default_vary_headers INT 0
+.. ts:cv:: CONFIG proxy.config.http.cache.enable_default_vary_headers INT 0
    :reloadable:
 
    Enables (``1``) or disables (``0``) caching of alternate versions of HTTP objects that do not contain the ``Vary`` header.
 
-.. ts:confvar:: CONFIG proxy.config.http.cache.when_to_revalidate INT 0
+.. ts:cv:: CONFIG proxy.config.http.cache.when_to_revalidate INT 0
    :reloadable:
 
    Specifies when to revalidate content:
@@ -903,7 +903,7 @@ Cache Control
    Traffic Server always revalidates the cached content and uses the
    client's ``If-Modified-Since`` header for the proxy request.
 
-.. ts:confvar:: CONFIG proxy.config.http.cache.when_to_add_no_cache_to_msie_requests INT 0
+.. ts:cv:: CONFIG proxy.config.http.cache.when_to_add_no_cache_to_msie_requests INT 0
    :reloadable:
 
    Specifies when to add ``no-cache`` directives to Microsoft Internet Explorer requests. You can specify the following:
@@ -912,7 +912,7 @@ Cache Control
    -  ``1`` = ``no-cache`` is added to IMS MSIE requests
    -  ``2`` = ``no-cache`` is added to all MSIE requests
 
-.. ts:confvar:: CONFIG proxy.config.http.cache.required_headers INT 0
+.. ts:cv:: CONFIG proxy.config.http.cache.required_headers INT 0
    :reloadable:
 
    The type of headers required in a request for the request to be cacheable.
@@ -921,27 +921,27 @@ Cache Control
    -  ``1`` = either the ``Last-Modified`` header, or an explicit lifetime header, ``Expires`` or ``Cache-Control: max-age``, is required
    -  ``2`` = explicit lifetime is required, ``Expires`` or ``Cache-Control: max-age``
 
-.. ts:confvar:: CONFIG proxy.config.http.cache.max_stale_age INT 604800
+.. ts:cv:: CONFIG proxy.config.http.cache.max_stale_age INT 604800
    :reloadable:
 
    The maximum age allowed for a stale response before it cannot be cached.
 
-.. ts:confvar:: CONFIG proxy.config.http.cache.range.lookup INT 1
+.. ts:cv:: CONFIG proxy.config.http.cache.range.lookup INT 1
 
    When enabled (``1``), Traffic Server looks up range requests in the cache.
 
-.. ts:confvar:: CONFIG proxy.config.http.cache.enable_read_while_writer INT 0
+.. ts:cv:: CONFIG proxy.config.http.cache.enable_read_while_writer INT 0
 
    Enables (``1``) or disables (``0``) the ability to read a cached object while another connection is completing a write to cache
    for the same object.
 
-.. ts:confvar:: CONFIG proxy.config.http.cache.fuzz.min_time INT 0
+.. ts:cv:: CONFIG proxy.config.http.cache.fuzz.min_time INT 0
    :reloadable:
 
    Sets a minimum fuzz time; the default value is ``0``. **Effective fuzz time** is a calculation in the range
    (``fuzz.min_time`` - ``fuzz.min_time``).
 
-.. ts:confvar:: CONFIG proxy.config.http.cache.ignore_accept_mismatch INT 0
+.. ts:cv:: CONFIG proxy.config.http.cache.ignore_accept_mismatch INT 0
    :reloadable:
 
    When enabled (``1``), Traffic Server serves documents from cache with a ``Content-Type:`` header that does not match the ``Accept:``
@@ -953,7 +953,7 @@ Cache Control
    -  Your origin server sets ``Vary: Accept`` when doing content negotiation with ``Accept`` *OR*
    -  The server does not send a ``406 (Not Acceptable)`` response for types that it cannot serve.
 
-.. ts:confvar:: CONFIG proxy.config.http.cache.ignore_accept_language_mismatch INT 0
+.. ts:cv:: CONFIG proxy.config.http.cache.ignore_accept_language_mismatch INT 0
    :reloadable:
 
    When enabled (``1``), Traffic Server serves documents from cache with a ``Content-Language:`` header that does not match the
@@ -964,7 +964,7 @@ Cache Control
    ``Vary: Accept-Language`` when doing content negotiation with
    ``Accept-Language``.
 
-.. ts:confvar:: CONFIG proxy.config.http.cache.ignore_accept_charset_mismatch INT 0
+.. ts:cv:: CONFIG proxy.config.http.cache.ignore_accept_charset_mismatch INT 0
    :reloadable:
 
    When enabled (``1``), Traffic Server serves documents from cache with a ``Content-Type:`` header that does not match the
@@ -975,12 +975,12 @@ Cache Control
    ``Vary: Accept-Charset`` when doing content negotiation with
    ``Accept-Charset``.
 
-.. ts:confvar:: CONFIG proxy.config.http.cache.ignore_client_cc_max_age INT 1
+.. ts:cv:: CONFIG proxy.config.http.cache.ignore_client_cc_max_age INT 1
    :reloadable:
 
    When enabled (``1``), Traffic Server ignores any ``Cache-Control:  max-age`` headers from the client.
 
-.. ts:confvar:: CONFIG proxy.config.cache.permit.pinning INT 0
+.. ts:cv:: CONFIG proxy.config.cache.permit.pinning INT 0
    :reloadable:
 
    When enabled (``1``), Traffic Server will keep certain HTTP objects in the cache for a certain time as specified in cache.config.
@@ -998,19 +998,19 @@ Heuristic Expiration
 
    The maximum amount of time an HTTP object without an expiration date can remain fresh in the cache before is considered to be stale.
 
-.. ts:confvar:: CONFIG proxy.config.http.cache.heuristic_lm_factor FLOAT 0.10000
+.. ts:cv:: CONFIG proxy.config.http.cache.heuristic_lm_factor FLOAT 0.10000
    :reloadable:
 
    The aging factor for freshness computations. Traffic Server stores an object for this percentage of the time that elapsed since it last
    changed.
 
-.. ts:confvar:: CONFIG proxy.config.http.cache.fuzz.time INT 240
+.. ts:cv:: CONFIG proxy.config.http.cache.fuzz.time INT 240
    :reloadable:
 
    How often Traffic Server checks for an early refresh, during the period before the document stale time. The interval specified must
    be in seconds.
 
-.. ts:confvar:: CONFIG proxy.config.http.cache.fuzz.probability FLOAT 0.00500
+.. ts:cv:: CONFIG proxy.config.http.cache.fuzz.probability FLOAT 0.00500
    :reloadable:
 
    The probability that a refresh is made on a document during the specified fuzz time.
@@ -1018,7 +1018,7 @@ Heuristic Expiration
 Dynamic Content & Content Negotiation
 =====================================
 
-.. ts:confvar:: CONFIG proxy.config.http.cache.vary_default_text STRING NULL
+.. ts:cv:: CONFIG proxy.config.http.cache.vary_default_text STRING NULL
    :reloadable:
 
    The header on which Traffic Server varies for text documents.
@@ -1026,12 +1026,12 @@ Dynamic Content & Content Negotiation
 For example: if you specify ``User-agent``, then Traffic Server caches
 all the different user-agent versions of documents it encounters.
 
-.. ts:confvar:: CONFIG proxy.config.http.cache.vary_default_images STRING NULL
+.. ts:cv:: CONFIG proxy.config.http.cache.vary_default_images STRING NULL
    :reloadable:
 
    The header on which Traffic Server varies for images.
 
-.. ts:confvar:: CONFIG proxy.config.http.cache.vary_default_other STRING NULL
+.. ts:cv:: CONFIG proxy.config.http.cache.vary_default_other STRING NULL
    :reloadable:
 
    The header on which Traffic Server varies for anything other than text and images.
@@ -1039,7 +1039,7 @@ all the different user-agent versions of documents it encounters.
 Customizable User Response Pages
 ================================
 
-.. ts:confvar:: CONFIG proxy.config.body_factory.enable_customizations INT 0
+.. ts:cv:: CONFIG proxy.config.body_factory.enable_customizations INT 0
    Specifies whether customizable response pages are enabled or
    disabled and which response pages are used:
 
@@ -1047,16 +1047,16 @@ Customizable User Response Pages
    -  ``1`` = enable customizable user response pages in the default directory only
    -  ``2`` = enable language-targeted user response pages
 
-.. ts:confvar:: CONFIG proxy.config.body_factory.enable_logging INT 1
+.. ts:cv:: CONFIG proxy.config.body_factory.enable_logging INT 1
 
    Enables (``1``) or disables (``0``) logging for customizable response pages. When enabled, Traffic Server records a message in
    the error log each time a customized response page is used or modified.
 
-.. ts:confvar:: CONFIG proxy.config.body_factory.template_sets_dir STRING config/body_factory
+.. ts:cv:: CONFIG proxy.config.body_factory.template_sets_dir STRING config/body_factory
 
    The customizable response page default directory.
 
-.. ts:confvar:: CONFIG proxy.config.body_factory.response_suppression_mode INT 0
+.. ts:cv:: CONFIG proxy.config.body_factory.response_suppression_mode INT 0
 
    Specifies when Traffic Server suppresses generated response pages:
 
@@ -1067,7 +1067,7 @@ Customizable User Response Pages
 DNS
 ===
 
-.. ts:confvar:: CONFIG proxy.config.dns.search_default_domains INT 1
+.. ts:cv:: CONFIG proxy.config.dns.search_default_domains INT 1
    :Reloadable:
 
    Enables (``1``) or disables (``0``) local domain expansion.
@@ -1078,13 +1078,13 @@ request to an unqualified host (``host_x``) and the Traffic Server
 local domain is ``y.com`` , then Traffic Server will expand the
 hostname to ``host_x.y.com``.
 
-.. ts:confvar:: CONFIG proxy.config.dns.splitDNS.enabled INT 0
+.. ts:cv:: CONFIG proxy.config.dns.splitDNS.enabled INT 0
    :reloadable:
 
    Enables (``1``) or disables (``0``) DNS server selection. When enabled, Traffic Server refers to the :file:`splitdns.config` file for
    the selection specification. Refer to `Configuring DNS Server Selection (Split DNS) <../security-options#ConfiguringDNSServerSelectionSplit>`_.
 
-.. ts:confvar:: CONFIG proxy.config.dns.url_expansions STRING NULL
+.. ts:cv:: CONFIG proxy.config.dns.url_expansions STRING NULL
 
    Specifies a list of hostname extensions that are automatically added to the hostname after a failed lookup. For example: if you want
    Traffic Server to add the hostname extension .org, then specify ``org`` as the value for this variable (Traffic Server automatically
@@ -1094,23 +1094,23 @@ hostname to ``host_x.y.com``.
    `proxy.config.http.enable_url_expandomatic`_ is set to ``1`` (the default value), then you do not have to add *``www.``* and
    *``.com``* to this list because Traffic Server automatically tries www. and .com after trying the values you've specified.
 
-.. ts:confvar:: CONFIG proxy.config.dns.resolv_conf STRING /etc/resolv.conf
+.. ts:cv:: CONFIG proxy.config.dns.resolv_conf STRING /etc/resolv.conf
 
    Allows to specify which ``resolv.conf`` file to use for finding resolvers. While the format of this file must be the same as the
    standard ``resolv.conf`` file, this option allows an administrator to manage the set of resolvers in an external configuration file,
    without affecting how the rest of the operating system uses DNS.
 
-.. ts:confvar:: CONFIG proxy.config.dns.round_robin_nameservers INT 0
+.. ts:cv:: CONFIG proxy.config.dns.round_robin_nameservers INT 0
    :reloadable:
 
    Enables (``1``) or disables (``0``) DNS server round-robin.
 
-.. ts:confvar:: CONFIG proxy.config.dns.nameservers STRING NULL
+.. ts:cv:: CONFIG proxy.config.dns.nameservers STRING NULL
    :reloadable:
 
    The DNS servers.
 
-.. ts:confvar:: CONFIG proxy.config.srv_enabled INT 0
+.. ts:cv:: CONFIG proxy.config.srv_enabled INT 0
    :reloadable:
 
    Indicates whether to use SRV records for orgin server lookup.
@@ -1118,17 +1118,17 @@ hostname to ``host_x.y.com``.
 HostDB
 ======
 
-.. ts:confvar:: CONFIG proxy.config.hostdb.serve_stale_for INT
+.. ts:cv:: CONFIG proxy.config.hostdb.serve_stale_for INT
 
    The number of seconds for which to use a stale NS record while initiating a background fetch for the new data.
 
-.. ts:confvar:: CONFIG proxy.config.hostdb.storage_size INT 33554432
+.. ts:cv:: CONFIG proxy.config.hostdb.storage_size INT 33554432
 
    The amount of space (in bytes) used to store ``hostdb``.
    The value of this variable must be increased if you increase the size of the
    `proxy.config.hostdb.size`_ variable.
 
-.. ts:confvar:: CONFIG proxy.config.hostdb.size INT 200000
+.. ts:cv:: CONFIG proxy.config.hostdb.size INT 200000
 
    The maximum number of entries that can be stored in the database.
 
@@ -1136,7 +1136,7 @@ HostDB
 
    For values above ``200000``, you must increase the value of the `proxy.config.hostdb.storage_size`_   variable by at least 44 bytes per entry.
 
-.. ts:confvar:: CONFIG proxy.config.hostdb.ttl_mode INT 0
+.. ts:cv:: CONFIG proxy.config.hostdb.ttl_mode INT 0
    :reloadable:
 
    The host database time to live mode. You can specify one of the
@@ -1147,12 +1147,12 @@ HostDB
    -  ``2`` = min(X,ttl)
    -  ``3`` = max(X,ttl)
 
-.. ts:confvar:: CONFIG proxy.config.hostdb.timeout INT 1440
+.. ts:cv:: CONFIG proxy.config.hostdb.timeout INT 1440
    :reloadable:
 
    The foreground timeout (in minutes).
 
-.. ts:confvar:: CONFIG proxy.config.hostdb.strict_round_robin INT 0
+.. ts:cv:: CONFIG proxy.config.hostdb.strict_round_robin INT 0
    :reloadable:
 
    When disabled (``0``), Traffic Server always uses the same origin
@@ -1162,7 +1162,7 @@ HostDB
 Logging Configuration
 =====================
 
-.. ts:confvar:: CONFIG proxy.config.log.logging_enabled INT 3
+.. ts:cv:: CONFIG proxy.config.log.logging_enabled INT 3
    :reloadable:
 
    Enables and disables event logging:
@@ -1174,12 +1174,12 @@ Logging Configuration
 
    Refer to `Working with Log Files <../working-log-files>`_.
 
-.. ts:confvar:: CONFIG proxy.config.log.max_secs_per_buffer INT 5
+.. ts:cv:: CONFIG proxy.config.log.max_secs_per_buffer INT 5
    :reloadable:
 
    The maximum amount of time before data in the buffer is flushed to disk.
 
-.. ts:confvar:: CONFIG proxy.config.log.max_space_mb_for_logs INT 2000
+.. ts:cv:: CONFIG proxy.config.log.max_space_mb_for_logs INT 2000
    :reloadable:
 
    The amount of space allocated to the logging directory (in MB).
@@ -1187,7 +1187,7 @@ Logging Configuration
    there is no local disk logging, or max_space_mb_for_orphan_logs is set to a higher value than max_space_mb_for_logs, TS will
    take proxy.config.log.max_space_mb_for_orphan_logs for maximum allowed log space.
 
-.. ts:confvar:: CONFIG proxy.config.log.max_space_mb_for_orphan_logs INT 25
+.. ts:cv:: CONFIG proxy.config.log.max_space_mb_for_orphan_logs INT 25
    :reloadable:
 
    The amount of space allocated to the logging directory (in MB) if this node is acting as a collation client.
@@ -1197,26 +1197,26 @@ Logging Configuration
    the logging directory contribute to the space used, even if they are not log files. you may need to consider this when you enable full
    remote logging, and bump to the same size as proxy.config.log.max_space_mb_for_logs.
 
-.. ts:confvar:: CONFIG proxy.config.log.max_space_mb_headroom INT 10
+.. ts:cv:: CONFIG proxy.config.log.max_space_mb_headroom INT 10
    :reloadable:
 
    The tolerance for the log space limit (in bytes). If the variable `proxy.config.log.auto_delete_rolled_files`_ is set to ``1``
    (enabled), then autodeletion of log files is triggered when the amount of free space available in the logging directory is less than
    the value specified here.
 
-.. ts:confvar:: CONFIG proxy.config.log.hostname STRING localhost
+.. ts:cv:: CONFIG proxy.config.log.hostname STRING localhost
    :reloadable:
 
    The hostname of the machine running Traffic Server.
 
-.. ts:confvar:: CONFIG proxy.config.log.logfile_dir STRING install_dir\ ``/logs``
+.. ts:cv:: CONFIG proxy.config.log.logfile_dir STRING install_dir\ ``/logs``
    :reloadable:
 
    The full path to the logging directory. This can be an absolute path or a path relative to the directory in which Traffic Server is installed.
 
    **Note:** The directory you specify must already exist.
 
-.. ts:confvar:: CONFIG proxy.config.log.logfile_perm STRING rw-r--r--
+.. ts:cv:: CONFIG proxy.config.log.logfile_perm STRING rw-r--r--
    :reloadable:
 
    The log file permissions. The standard UNIX file permissions are used (owner, group, other). Permissible values are:
@@ -1227,17 +1227,17 @@ Logging Configuration
    write permission for others, even if specified in the configuration file. Permissions for existing log files are not changed when the
    configuration is changed.
 
-.. ts:confvar:: CONFIG proxy.config.log.custom_logs_enabled INT 0
+.. ts:cv:: CONFIG proxy.config.log.custom_logs_enabled INT 0
    :reloadable:
 
    Enables (``1``) or disables (``0``) custom logging.
 
-.. ts:confvar:: CONFIG proxy.config.log.squid_log_enabled INT 1
+.. ts:cv:: CONFIG proxy.config.log.squid_log_enabled INT 1
    :reloadable:
 
    Enables (``1``) or disables (``0``) the `squid log file format <../working-log-files/log-formats#SquidFormat>`_.
 
-.. ts:confvar:: CONFIG proxy.config.log.squid_log_is_ascii INT 1
+.. ts:cv:: CONFIG proxy.config.log.squid_log_is_ascii INT 1
    :reloadable:
 
    The squid log file type:
@@ -1245,21 +1245,21 @@ Logging Configuration
    -  ``1`` = ASCII
    -  ``0`` = binary
 
-.. ts:confvar:: CONFIG proxy.config.log.squid_log_name STRING squid
+.. ts:cv:: CONFIG proxy.config.log.squid_log_name STRING squid
    :reloadable:
 
    The `squid log <../working-log-files/log-formats#SquidFormat>`_ filename.
 
-.. ts:confvar:: CONFIG proxy.config.log.squid_log_header STRING NULL
+.. ts:cv:: CONFIG proxy.config.log.squid_log_header STRING NULL
 
    The `squid log <../working-log-files/log-formats#SquidFormat>`_ file header text.
 
-.. ts:confvar:: CONFIG proxy.config.log.common_log_enabled INT 0
+.. ts:cv:: CONFIG proxy.config.log.common_log_enabled INT 0
    :reloadable:
 
    Enables (``1``) or disables (``0``) the `Netscape common log file format <../working-log-files/log-formats#NetscapeFormats>`_.
 
-.. ts:confvar:: CONFIG proxy.config.log.common_log_is_ascii INT 1
+.. ts:cv:: CONFIG proxy.config.log.common_log_is_ascii INT 1
    :reloadable:
 
    The `Netscape common log <../working-log-files/log-formats#NetscapeFormats>`_ file type:
@@ -1267,43 +1267,43 @@ Logging Configuration
    -  ``1`` = ASCII
    -  ``0`` = binary
 
-.. ts:confvar:: CONFIG proxy.config.log.common_log_name STRING common
+.. ts:cv:: CONFIG proxy.config.log.common_log_name STRING common
    :reloadable:
 
    The `Netscape common log <../working-log-files/log-formats#NetscapeFormats>`_ filename.
 
-.. ts:confvar:: CONFIG proxy.config.log.common_log_header STRING NULL
+.. ts:cv:: CONFIG proxy.config.log.common_log_header STRING NULL
    :reloadable:
 
    The `Netscape common log <../working-log-files/log-formats#NetscapeFormats>`_ file header text.
 
-.. ts:confvar:: CONFIG proxy.config.log.extended_log_enabled INT 0
+.. ts:cv:: CONFIG proxy.config.log.extended_log_enabled INT 0
    :reloadable:
 
    Enables (``1``) or disables (``0``) the `Netscape extended log file format <../working-log-files/log-formats#NetscapeFormats>`_.
 
-.. ts:confvar:: CONFIG proxy.confg.log.extended_log_is_ascii INT 1
+.. ts:cv:: CONFIG proxy.confg.log.extended_log_is_ascii INT 1
 
    The `Netscape extended log <../working-log-files/log-formats#NetscapeFormats>`_ file type:
 
    -  ``1`` = ASCII
    -  ``0`` = binary
 
-.. ts:confvar:: CONFIG proxy.config.log.extended_log_name STRING extended
+.. ts:cv:: CONFIG proxy.config.log.extended_log_name STRING extended
 
    The `Netscape extended log <../working-log-files/log-formats#NetscapeFormats>`_ filename.
 
-.. ts:confvar:: CONFIG proxy.config.log.extended_log_header STRING NULL
+.. ts:cv:: CONFIG proxy.config.log.extended_log_header STRING NULL
    :reloadable:
 
    The `Netscape extended log <../working-log-files/log-formats#NetscapeFormats>`_ file header text.
 
-.. ts:confvar:: CONFIG proxy.config.log.extended2_log_enabled INT 0
+.. ts:cv:: CONFIG proxy.config.log.extended2_log_enabled INT 0
    :reloadable:
 
    Enables (``1``) or disables (``0``) the `Netscape Extended-2 log file format <../working-log-files/log-formats#NetscapeFormats>`_.
 
-.. ts:confvar:: CONFIG proxy.config.log.extended2_log_is_ascii INT 1
+.. ts:cv:: CONFIG proxy.config.log.extended2_log_is_ascii INT 1
    :reloadable:
 
    The `Netscape Extended-2 log <../working-log-files/log-formats#NetscapeFormats>`_ file type:
@@ -1311,17 +1311,17 @@ Logging Configuration
    -  ``1`` = ASCII
    -  ``0`` = binary
 
-.. ts:confvar:: CONFIG proxy.config.log.extended2_log_name STRING extended2
+.. ts:cv:: CONFIG proxy.config.log.extended2_log_name STRING extended2
    :reloadable:
 
    The `Netscape Extended-2 log <../working-log-files/log-formats#NetscapeFormats>`_ filename.
 
-.. ts:confvar:: CONFIG proxy.config.log.extended2_log_header STRING NULL
+.. ts:cv:: CONFIG proxy.config.log.extended2_log_header STRING NULL
    :reloadable:
 
    The `Netscape Extended-2 log <../working-log-files/log-formats#NetscapeFormats>`_ file header text.
 
-.. ts:confvar:: CONFIG proxy.config.log.separate_icp_logs INT 0
+.. ts:cv:: CONFIG proxy.config.log.separate_icp_logs INT 0
    :reloadable:
 
    When enabled (``1``), configures Traffic Server to store ICP transactions in a separate log file.
@@ -1330,13 +1330,13 @@ Logging Configuration
    -  ``1`` = all ICP transactions are recorded in a separate log file.
    -  ``-1`` = filter all ICP transactions from the default log files; ICP transactions are not logged anywhere.
 
-.. ts:confvar:: CONFIG proxy.config.log.separate_host_logs INT 0
+.. ts:cv:: CONFIG proxy.config.log.separate_host_logs INT 0
    :reloadable:
 
    When enabled (``1``), configures Traffic Server to create a separate log file for HTTP transactions for each origin server listed in the
    :file:`log_hosts.config` file. Refer to `HTTP Host Log Splitting <../working-log-files#HTTPHostLogSplitting>`_.
 
-.. ts:confvar:: LOCAL proxy.local.log.collation_mode INT 0
+.. ts:cv:: LOCAL proxy.local.log.collation_mode INT 0
    :reloadable:
 
    Set the log collation mode.
@@ -1356,31 +1356,31 @@ server, refer to `logs_xml.config <logs_xml.config>`_.
 
 .. note:: Although Traffic Server supports traditional custom logging, you should use the more versatile XML-based custom formats.
 
-.. ts:confvar:: proxy.confg.log.collation_host STRING NULL
+.. ts:cv:: proxy.confg.log.collation_host STRING NULL
 
    The hostname of the log collation server.
 
-.. ts:confvar:: CONFIG proxy.config.log.collation_port INT 8085
+.. ts:cv:: CONFIG proxy.config.log.collation_port INT 8085
    :reloadable:
 
    The port used for communication between the collation server and client.
 
-.. ts:confvar:: CONFIG proxy.config.log.collation_secret STRING foobar
+.. ts:cv:: CONFIG proxy.config.log.collation_secret STRING foobar
    :reloadable:
 
    The password used to validate logging data and prevent the exchange of unauthorized information when a collation server is being used.
 
-.. ts:confvar:: CONFIG proxy.config.log.collation_host_tagged INT 0
+.. ts:cv:: CONFIG proxy.config.log.collation_host_tagged INT 0
    :reloadable:
 
    When enabled (``1``), configures Traffic Server to include the hostname of the collation client that generated the log entry in each entry.
 
-.. ts:confvar:: CONFIG proxy.config.log.collation_retry_sec INT 5
+.. ts:cv:: CONFIG proxy.config.log.collation_retry_sec INT 5
    :reloadable:
 
    The number of seconds between collation server connection retries.
 
-.. ts:confvar:: CONFIG proxy.config.log.rolling_enabled INT 1
+.. ts:cv:: CONFIG proxy.config.log.rolling_enabled INT 1
    :reloadable:
 
    Specifies how log files are rolled. You can specify the following values:
@@ -1393,29 +1393,29 @@ server, refer to `logs_xml.config <logs_xml.config>`_.
    -  ``4`` = enables log file rolling at specific intervals during the day when log files reach a specific size (i.e., at a specified
        time if the file is of the specified size)
 
-.. ts:confvar:: CONFIG proxy.config.log.rolling_interval_sec INT 86400
+.. ts:cv:: CONFIG proxy.config.log.rolling_interval_sec INT 86400
    :reloadable:
 
    The log file rolling interval, in seconds. The minimum value is ``300`` (5 minutes). The maximum, and default, value is 86400 seconds (one day).
 
    **Note:** If you start Traffic Server within a few minutes of the next rolling time, then rolling might not occur until the next rolling time.
 
-.. ts:confvar:: CONFIG proxy.config.log.rolling_offset_hr INT 0
+.. ts:cv:: CONFIG proxy.config.log.rolling_offset_hr INT 0
    :reloadable:
 
    The file rolling offset hour. The hour of the day that starts the log rolling period.
 
-.. ts:confvar:: CONFIG proxy.config.log.rolling_size_mb INT 10
+.. ts:cv:: CONFIG proxy.config.log.rolling_size_mb INT 10
    :reloadable:
 
    The size that log files must reach before rolling takes place.
 
-.. ts:confvar:: CONFIG proxy.config.log.auto_delete_rolled_files INT 1
+.. ts:cv:: CONFIG proxy.config.log.auto_delete_rolled_files INT 1
    :reloadable:
 
    Enables (``1``) or disables (``0``) automatic deletion of rolled files.
 
-.. ts:confvar:: CONFIG proxy.config.log.sampling_frequency INT 1
+.. ts:cv:: CONFIG proxy.config.log.sampling_frequency INT 1
    :reloadable:
 
    Configures Traffic Server to log only a sample of transactions rather than every transaction. You can specify the following values:
@@ -1424,7 +1424,7 @@ server, refer to `logs_xml.config <logs_xml.config>`_.
    -  ``2`` = log every second transaction
    -  ``3`` = log every third transaction and so on...
 
-.. ts:confvar:: CONFIG proxy.config.http.slow.log.threshold INT 0
+.. ts:cv:: CONFIG proxy.config.http.slow.log.threshold INT 0
    :reloadable:
 
    The number of milliseconds before a slow connection's debugging stats are dumped. Specify ``1`` to enable or ``0`` to disable.
@@ -1432,9 +1432,11 @@ server, refer to `logs_xml.config <logs_xml.config>`_.
 Diagnostic Logging Configuration
 ================================
 
-.. ts:confvar:: CONFIG proxy.config.diags.output.status STRING
-.. ts:confvar:: CONFIG proxy.config.diags.output.warning STRING
-.. ts:confvar:: CONFIG proxy.config.diags.output.emergency STRING
+.. ts:cv:: CONFIG proxy.config.diags.output.status STRING
+
+.. ts:cv:: CONFIG proxy.config.diags.output.warning STRING
+
+.. ts:cv:: CONFIG proxy.config.diags.output.emergency STRING
 
    control where Traffic Server should log diagnostic output. Messages at diagnostic level can be directed to any combination of diagnostic
    destinations. Valid diagnostic message destinations are:::
@@ -1453,12 +1455,12 @@ Diagnostic Logging Configuration
 Reverse Proxy
 =============
 
-.. ts:confvar:: CONFIG proxy.config.reverse_proxy.enabled INT 1
+.. ts:cv:: CONFIG proxy.config.reverse_proxy.enabled INT 1
    :reloadable:
 
    Enables (``1``) or disables (``0``) HTTP reverse proxy.
 
-.. ts:confvar:: CONFIG proxy.config.header.parse.no_host_url_redirect STRING NULL
+.. ts:cv:: CONFIG proxy.config.header.parse.no_host_url_redirect STRING NULL
    :reloadable:
 
    The URL to which to redirect requests with no host headers (reverse
@@ -1467,13 +1469,13 @@ Reverse Proxy
 URL Remap Rules
 ===============
 
-.. ts:confvar:: CONFIG proxy.config.url_remap.default_to_server_pac INT 0
+.. ts:cv:: CONFIG proxy.config.url_remap.default_to_server_pac INT 0
    :reloadable:
 
    Enables (``1``) or disables (``0``) requests for a PAC file on the proxy service port (8080 by default) to be redirected to the PAC
    port. For this type of redirection to work, the variable `proxy.config.reverse_proxy.enabled`_ must be set to ``1``.
 
-.. ts:confvar:: CONFIG proxy.config.url_remap.default_to_server_pac_port INT -1
+.. ts:cv:: CONFIG proxy.config.url_remap.default_to_server_pac_port INT -1
    :reloadable:
 
    Sets the PAC port so that PAC requests made to the Traffic Server
@@ -1488,7 +1490,7 @@ URL Remap Rules
    to ``9000``. Browsers that request the PAC file from a proxy server
    on port 8080 will get the PAC file served by the Perl script.
 
-.. ts:confvar:: CONFIG proxy.config.url_remap.remap_required INT 1
+.. ts:cv:: CONFIG proxy.config.url_remap.remap_required INT 1
    :reloadable:
 
    Set this variable to ``1`` if you want Traffic Server to serve
@@ -1496,7 +1498,7 @@ URL Remap Rules
    :file:`remap.config` file. If a request does not match, then the browser
    will receive an error.
 
-.. ts:confvar:: CONFIG proxy.config.url_remap.pristine_host_hdr INT 1
+.. ts:cv:: CONFIG proxy.config.url_remap.pristine_host_hdr INT 1
    :reloadable:
 
    Set this variable to ``1`` if you want to retain the client host
@@ -1505,19 +1507,19 @@ URL Remap Rules
 SSL Termination
 ===============
 
-.. ts:confvar:: CONFIG proxy.config.ssl.SSLv2 INT 0
+.. ts:cv:: CONFIG proxy.config.ssl.SSLv2 INT 0
 
    Enables (``1``) or disables (``0``) SSLv2. Please don't enable it.
 
-.. ts:confvar:: CONFIG proxy.config.ssl.SSLv3 INT 1
+.. ts:cv:: CONFIG proxy.config.ssl.SSLv3 INT 1
 
    Enables (``1``) or disables (``0``) SSLv3.
 
-.. ts:confvar:: CONFIG proxy.config.ssl.TLSv1 INT 1
+.. ts:cv:: CONFIG proxy.config.ssl.TLSv1 INT 1
 
    Enables (``1``) or disables (``0``) TLSv1.
 
-.. ts:confvar:: CONFIG proxy.config.ssl.client.certification_level INT 0
+.. ts:cv:: CONFIG proxy.config.ssl.client.certification_level INT 0
 
    Sets the client certification level:
 
@@ -1536,7 +1538,7 @@ SSL Termination
        authenticated during the SSL handshake. Clients without a
        certificate are not allowed to access Traffic Server.
 
-.. ts:confvar:: CONFIG proxy.config.ssl.server.cert.path STRING /config
+.. ts:cv:: CONFIG proxy.config.ssl.server.cert.path STRING /config
 
    The location of the SSL certificates and chains used for accepting
    and validation new SSL sessions. If this is a relative path,
@@ -1544,7 +1546,7 @@ SSL Termination
    certificates and certificate chains listed in
    :file:`ssl_multicert.config` will be loaded relative to this path.
 
-.. ts:confvar:: CONFIG proxy.config.ssl.server.private_key.path STRING NULL
+.. ts:cv:: CONFIG proxy.config.ssl.server.private_key.path STRING NULL
 
    The location of the SSL certificate private keys. Change this
    variable only if the private key is not located in the SSL
@@ -1552,20 +1554,20 @@ SSL Termination
    :file:`ssl_multicert.config` will be loaded relative to this
    path.
 
-.. ts:confvar:: CONFIG proxy.config.ssl.server.cert_chain.filename STRING NULL
+.. ts:cv:: CONFIG proxy.config.ssl.server.cert_chain.filename STRING NULL
 
    The name of a file containing a global certificate chain that
    should be used with every server certificate. This file is only
-   used if there are certificates defined in :file:`ssl_multicert.conf`.
+   used if there are certificates defined in :file:`ssl_multicert.config`.
    Unless this is an absolute path, it is loaded relative to the
-   path specified by `proxy.config.ssl.server.cert.path`_.
+   path specified by :ts:cv:`proxy.config.ssl.server.cert.path`.
 
-.. ts:confvar:: CONFIG proxy.config.ssl.CA.cert.path STRING NULL
+.. ts:cv:: CONFIG proxy.config.ssl.CA.cert.path STRING NULL
 
    The location of the certificate authority file that client
    certificates will be verified against.
 
-.. ts:confvar:: CONFIG proxy.config.ssl.CA.cert.filename STRING NULL
+.. ts:cv:: CONFIG proxy.config.ssl.CA.cert.filename STRING NULL
 
    The filename of the certificate authority that client certificates
    will be verified against.
@@ -1573,38 +1575,38 @@ SSL Termination
 Client-Related Configuration
 ----------------------------
 
-.. ts:confvar:: CONFIG proxy.config.ssl.client.verify.server INT 0
+.. ts:cv:: CONFIG proxy.config.ssl.client.verify.server INT 0
 
    Configures Traffic Server to verify the origin server certificate
    with the Certificate Authority (CA).
 
-.. ts:confvar:: CONFIG proxy.config.ssl.client.cert.filename STRING NULL
+.. ts:cv:: CONFIG proxy.config.ssl.client.cert.filename STRING NULL
 
    The filename of SSL client certificate installed on Traffic Server.
 
-.. ts:confvar:: CONFIG proxy.config.ssl.client.cert.path STRING /config
+.. ts:cv:: CONFIG proxy.config.ssl.client.cert.path STRING /config
 
    The location of the SSL client certificate installed on Traffic
    Server.
 
-.. ts:confvar:: CONFIG proxy.config.ssl.client.private_key.filename STRING NULL
+.. ts:cv:: CONFIG proxy.config.ssl.client.private_key.filename STRING NULL
 
    The filename of the Traffic Server private key. Change this variable
    only if the private key is not located in the Traffic Server SSL
    client certificate file.
 
-.. ts:confvar:: CONFIG proxy.config.ssl.client.private_key.path STRING NULL
+.. ts:cv:: CONFIG proxy.config.ssl.client.private_key.path STRING NULL
 
    The location of the Traffic Server private key. Change this variable
    only if the private key is not located in the SSL client certificate
    file.
 
-.. ts:confvar:: CONFIG proxy.config.ssl.client.CA.cert.filename STRING NULL
+.. ts:cv:: CONFIG proxy.config.ssl.client.CA.cert.filename STRING NULL
 
    The filename of the certificate authority against which the origin
    server will be verified.
 
-.. ts:confvar:: CONFIG proxy.config.ssl.client.CA.cert.path STRING NULL
+.. ts:cv:: CONFIG proxy.config.ssl.client.CA.cert.path STRING NULL
 
    Specifies the location of the certificate authority file against
    which the origin server will be verified.
@@ -1612,7 +1614,7 @@ Client-Related Configuration
 ICP Configuration
 =================
 
-.. ts:confvar:: CONFIG proxy.config.icp.enabled INT 0
+.. ts:cv:: CONFIG proxy.config.icp.enabled INT 0
 
    Sets ICP mode for hierarchical caching:
 
@@ -1622,7 +1624,7 @@ ICP Configuration
 
    Refer to `ICP Peering <../hierachical-caching#ICPPeering>`_.
 
-.. ts:confvar:: CONFIG proxy.config.icp.icp_interface STRING your_interface
+.. ts:cv:: CONFIG proxy.config.icp.icp_interface STRING your_interface
 
    Specifies the network interface used for ICP traffic.
 
@@ -1631,12 +1633,12 @@ ICP Configuration
    system has multiple network interfaces, check that this variable
    specifies the correct interface.
 
-.. ts:confvar:: CONFIG proxy.config.icp.icp_port INT 3130
+.. ts:cv:: CONFIG proxy.config.icp.icp_port INT 3130
    :reloadable:
 
    Specifies the UDP port that you want to use for ICP messages.
 
-.. ts:confvar:: CONFIG proxy.config.icp.query_timeout INT 2
+.. ts:cv:: CONFIG proxy.config.icp.query_timeout INT 2
    :reloadable:
 
    Specifies the timeout used for ICP queries.
@@ -1650,7 +1652,7 @@ Scheduled Update Configuration
    ``0``
    Enables (``1``) or disables (``0``) the Scheduled Update option.
 
-.. ts:confvar:: CONFIG proxy.config.update.force INT 0
+.. ts:cv:: CONFIG proxy.config.update.force INT 0
    :reloadable:
 
    Enables (``1``) or disables (``0``) a force immediate update. When
@@ -1658,19 +1660,19 @@ Scheduled Update Configuration
    all scheduled update entries and initiates updates until this option
    is disabled.
 
-.. ts:confvar:: CONFIG proxy.config.update.retry_count INT 10
+.. ts:cv:: CONFIG proxy.config.update.retry_count INT 10
    :reloadable:
 
    Specifies the number of times Traffic Server can retry the scheduled
    update of a URL in the event of failure.
 
-.. ts:confvar:: CONFIG proxy.config.update.retry_interval INT 2
+.. ts:cv:: CONFIG proxy.config.update.retry_interval INT 2
    :reloadable:
 
    Specifies the delay (in seconds) between each scheduled update retry
    for a URL in the event of failure.
 
-.. ts:confvar:: CONFIG proxy.config.update.concurrent_updates INT 100
+.. ts:cv:: CONFIG proxy.config.update.concurrent_updates INT 100
    :reloadable:
 
    Specifies the maximum simultaneous update requests allowed at any
@@ -1680,40 +1682,40 @@ Scheduled Update Configuration
 Remap Plugin Processor
 ======================
 
-.. ts:confvar:: CONFIG proxy.config.remap.use_remap_processor INT 0
+.. ts:cv:: CONFIG proxy.config.remap.use_remap_processor INT 0
 
    Enables (``1``) or disables (``0``) the ability to run separate threads for remap plugin processing.
 
-.. ts:confvar:: CONFIG proxy.config.remap.num_remap_threads INT 1
+.. ts:cv:: CONFIG proxy.config.remap.num_remap_threads INT 1
 
    Specifies the number of threads that will be used for remap plugin rocessing.
 
 Plug-in Configuration
 =====================
 
-.. ts:confvar:: CONFIG proxy.config.plugin.plugin_dir STRING config/plugins
+.. ts:cv:: CONFIG proxy.config.plugin.plugin_dir STRING config/plugins
 
    Specifies the location of Traffic Server plugins.
 
 Sockets
 =======
 
-.. ts:confvar:: CONFIG proxy.config.net.defer_accept INT `1`
+.. ts:cv:: CONFIG proxy.config.net.defer_accept INT `1`
 
    default: ``1`` meaning ``on`` all Platforms except Linux: ``45`` seconds
 
    This directive enables operating system specific optimizations for a listening socket. ``defer_accept`` holds a call to ``accept(2)``
    back until data has arrived. In Linux' special case this is up to a maximum of 45 seconds.
 
-.. ts:confvar:: CONFIG proxy.config.net.sock_send_buffer_size_in INT 0
+.. ts:cv:: CONFIG proxy.config.net.sock_send_buffer_size_in INT 0
 
    Sets the send buffer size for connections from the client to Traffic Server.
 
-.. ts:confvar:: CONFIG proxy.config.net.sock_recv_buffer_size_in INT 0
+.. ts:cv:: CONFIG proxy.config.net.sock_recv_buffer_size_in INT 0
 
    Sets the receive buffer size for connections from the client to Traffic Server.
 
-.. ts:confvar:: CONFIG proxy.config.net.sock_option_flag_in INT 0
+.. ts:cv:: CONFIG proxy.config.net.sock_option_flag_in INT 0
 
    Turns different options "on" for the socket handling client connections:::
 
@@ -1724,16 +1726,16 @@ Sockets
    you must set the value to ``3`` if you want to enable both options
    above.
 
-.. ts:confvar:: CONFIG proxy.config.net.sock_send_buffer_size_out INT 0
+.. ts:cv:: CONFIG proxy.config.net.sock_send_buffer_size_out INT 0
 
    Sets the send buffer size for connections from Traffic Server to the origin server.
 
-.. ts:confvar:: CONFIG proxy.config.net.sock_recv_buffer_size_out INT 0
+.. ts:cv:: CONFIG proxy.config.net.sock_recv_buffer_size_out INT 0
 
    Sets the receive buffer size for connections from Traffic Server to
    the origin server.
 
-.. ts:confvar:: CONFIG proxy.config.net.sock_option_flag_out INT 0
+.. ts:cv:: CONFIG proxy.config.net.sock_option_flag_out INT 0
 
    Turns different options "on" for the origin server socket:::
 
@@ -1744,6 +1746,6 @@ Sockets
    you must set the value to ``3`` if you want to enable both options
    above.
 
-.. ts:confvar:: CONFIG proxy.config.net.sock_mss_in INT 0
+.. ts:cv:: CONFIG proxy.config.net.sock_mss_in INT 0
 
    Same as the command line option ``--accept_mss`` that sets the MSS for all incoming requests.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8d712233/doc/reference/configuration/splitdns.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/configuration/splitdns.config.en.rst b/doc/reference/configuration/splitdns.config.en.rst
index 4298a45..343e795 100644
--- a/doc/reference/configuration/splitdns.config.en.rst
+++ b/doc/reference/configuration/splitdns.config.en.rst
@@ -5,9 +5,9 @@
   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
@@ -19,6 +19,7 @@
 splitdns.config
 ===============
 
+.. configfile:: splitdns.config
 
 The :file:`splitdns.config` file enables you to specify the DNS server that
 Traffic Server should use for resolving hosts under specific conditions.


Mime
View raw message