You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2015/08/28 06:33:41 UTC
trafficserver git commit: doc: refer to traffic_ctl instead of
traffic_line
Repository: trafficserver
Updated Branches:
refs/heads/master b1f81f881 -> d028eda23
doc: refer to traffic_ctl instead of traffic_line
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/d028eda2
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d028eda2
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d028eda2
Branch: refs/heads/master
Commit: d028eda23880ab9a22d9f47a42640046efba764b
Parents: b1f81f8
Author: James Peach <jp...@apache.org>
Authored: Thu Aug 27 21:33:14 2015 -0700
Committer: James Peach <jp...@apache.org>
Committed: Thu Aug 27 21:33:14 2015 -0700
----------------------------------------------------------------------
doc/admin/cluster-howto.en.rst | 8 ++---
doc/admin/configuring-cache.en.rst | 8 ++---
doc/admin/configuring-traffic-server.en.rst | 6 ++--
doc/admin/faqs.en.rst | 2 +-
doc/admin/getting-started.en.rst | 20 +++++-------
doc/admin/hierachical-caching.en.rst | 4 +--
doc/admin/http-proxy-caching.en.rst | 32 ++++++++++----------
doc/admin/index.en.rst | 4 +--
doc/admin/monitoring-traffic.en.rst | 10 +++---
doc/admin/performance-tuning.en.rst | 2 +-
doc/admin/reverse-proxy-http-redirects.en.rst | 8 ++---
doc/admin/security-options.en.rst | 14 ++++-----
doc/admin/working-log-files.en.rst | 20 ++++++------
doc/arch/hacking/config-var-impl.en.rst | 2 +-
.../LC_MESSAGES/admin/configuring-cache.en.po | 4 +--
.../admin/configuring-traffic-server.en.po | 4 +--
.../LC_MESSAGES/admin/hierachical-caching.en.po | 2 +-
.../LC_MESSAGES/admin/http-proxy-caching.en.po | 8 ++---
.../LC_MESSAGES/admin/monitoring-traffic.en.po | 2 +-
.../admin/reverse-proxy-http-redirects.en.po | 8 ++---
.../ja/LC_MESSAGES/admin/security-options.en.po | 4 +--
.../LC_MESSAGES/admin/working-log-files.en.po | 6 ++--
.../reference/configuration/cache.config.en.po | 2 +-
.../configuration/congestion.config.en.po | 4 +--
.../configuration/hosting.config.en.po | 2 +-
.../reference/configuration/icp.config.en.po | 2 +-
.../configuration/ip_allow.config.en.po | 2 +-
.../configuration/log_hosts.config.en.po | 2 +-
.../reference/configuration/parent.config.en.po | 2 +-
.../configuration/records.config.en.po | 4 +--
.../reference/configuration/remap.config.en.po | 8 ++---
.../configuration/splitdns.config.en.po | 2 +-
.../configuration/ssl_multicert.config.en.po | 4 +--
.../reference/plugins/balancer.en.po | 2 +-
.../ja/LC_MESSAGES/reference/plugins/gzip.en.po | 4 +--
doc/reference/commands/traffic_ctl.en.rst | 4 +--
doc/reference/commands/traffic_line.en.rst | 2 +-
doc/reference/commands/traffic_manager.en.rst | 4 +--
doc/reference/configuration/cache.config.en.rst | 2 +-
.../configuration/congestion.config.en.rst | 2 +-
.../configuration/hosting.config.en.rst | 2 +-
doc/reference/configuration/icp.config.en.rst | 2 +-
.../configuration/ip_allow.config.en.rst | 2 +-
.../configuration/log_hosts.config.en.rst | 2 +-
.../configuration/parent.config.en.rst | 2 +-
.../configuration/records.config.en.rst | 10 +++---
doc/reference/configuration/remap.config.en.rst | 4 +--
.../configuration/splitdns.config.en.rst | 2 +-
.../configuration/ssl_multicert.config.en.rst | 2 +-
doc/reference/plugins/balancer.en.rst | 2 +-
doc/reference/plugins/gzip.en.rst | 6 ++--
doc/reference/plugins/regex_remap.en.rst | 2 +-
52 files changed, 132 insertions(+), 138 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/admin/cluster-howto.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/cluster-howto.en.rst b/doc/admin/cluster-howto.en.rst
index 6ee1f8e..aa37530 100644
--- a/doc/admin/cluster-howto.en.rst
+++ b/doc/admin/cluster-howto.en.rst
@@ -114,11 +114,11 @@ Value Description
4. Enable configuration changes::
- traffic_line -x
+ traffic_ctl config reload
5. Restart traffic server::
- traffic_line -L
+ traffic_ctl server restart
The :program:`traffic_server` and :program:`traffic_manager` processes will need to
restart after the change of :ts:cv:`proxy.local.cluster.type` and
@@ -127,7 +127,7 @@ Value Description
Traffic Server will join the cluster in about 10 seconds. To verify the hosts in the
cluster, you can run::
- traffic_line -r proxy.process.cluster.nodes
+ traffic_ctl metric get proxy.process.cluster.nodes
Cluster node status is also tracked in ``cluster.config`` in the configuration
directory. This configuration is generated by the system and should not be
@@ -176,5 +176,5 @@ example, if you are running a system with 10 network processing threads,
you can set the number of cluster threads by modifying
:ts:cv:`proxy.config.cluster.threads` to ``10``::
- traffic_line -s proxy.config.cluster.threads -v 10
+ traffic_ctl config set proxy.config.cluster.threads 10
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/admin/configuring-cache.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/configuring-cache.en.rst b/doc/admin/configuring-cache.en.rst
index 22a31e0..e96b3a0 100644
--- a/doc/admin/configuring-cache.en.rst
+++ b/doc/admin/configuring-cache.en.rst
@@ -142,7 +142,7 @@ Changing Cache Capacity
You can increase or reduce the total amount of disk space allocated to
the cache without clearing the content. To check the size of the cache
-(in bytes), enter the command :option:`traffic_line -r` ``proxy.process.cache.bytes_total``.
+(in bytes), enter the command :option:`traffic_ctl metric get` ``proxy.process.cache.bytes_total``.
Increasing Cache Capacity
-------------------------
@@ -273,7 +273,7 @@ To partition the cache according to hostname and domain:
volumes for a particular origin server become corrupt, then Traffic
Server will also use the generic volume to store content for that
origin server as per :file:`hosting.config`.
-#. Run the command :option:`traffic_line -x` to apply the configuration
+#. Run the command :option:`traffic_ctl config reload` to apply the configuration
changes.
Configuring the Cache Object Size Limit
@@ -286,7 +286,7 @@ the cache via the steps below:
#. Set :ts:cv:`proxy.config.cache.max_doc_size`
to specify the maximum size in bytes allowed for objects in the cache.
A setting of ``0`` (zero) will permit cache objects to be unlimited in size.
-#. Run the command :option:`traffic_line -x` to apply the configuration
+#. Run the command :option:`traffic_ctl config reload` to apply the configuration
changes.
.. _clearing-the-cache:
@@ -379,7 +379,7 @@ To access the Cache Inspector utility:
map http://yourhost.com/myCI/ http://{cache} @action=allow @src_ip=172.28.56.1-172.28.56.254
-#. Reload the Traffic Server configuration by running :option:`traffic_line -x`.
+#. Reload the Traffic Server configuration by running :option:`traffic_ctl config reload`.
#. Open your web browser and configure it to use your Traffic Server as
a proxy server. Type the following URL::
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/admin/configuring-traffic-server.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/configuring-traffic-server.en.rst b/doc/admin/configuring-traffic-server.en.rst
index 54e7898..60c50de 100644
--- a/doc/admin/configuring-traffic-server.en.rst
+++ b/doc/admin/configuring-traffic-server.en.rst
@@ -38,7 +38,7 @@ View Configuration Options in Traffic Line
To view a configuration setting, enter the following command::
- traffic_line -r var
+ traffic_ctl config get VARIABLE
where *var* is the variable associated with the configuration
option. For a list of variables, refer to :ref:`configuration-variables`.
@@ -49,7 +49,7 @@ Change Configuration Options in Traffic Line
To change the value of a configuration setting, enter the following
command::
- traffic_line -s var -v value
+ traffic_config set VARIABLE VALUE
where *var* is the variable associated with the configuration option
and *value* is the value you want to use. For a list of the
@@ -63,7 +63,7 @@ Traffic Server configuration options by manually editing specific
variables in :file:`records.config`.
Traffic Server must reread the configuration files for any changes to take effect.
-This is done with :option:`traffic_line -x`. Some configuration changes require a
+This is done with :option:`traffic_ctl config reload`. Some configuration changes require a
full restart of Traffic Server.
The following is a sample portion of :file:`records.config`:
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/admin/faqs.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/faqs.en.rst b/doc/admin/faqs.en.rst
index b7e528d..3dc6bc2 100644
--- a/doc/admin/faqs.en.rst
+++ b/doc/admin/faqs.en.rst
@@ -378,7 +378,7 @@ Traffic Line commands do not execute under the following conditions:
**When you are not executing the command from $TSHome/bin**
If the Traffic Server ``bin`` directory is not in your path, then prepend the
- Traffic Line commands with ``./`` (for example, ``./traffic_line -h``).
+ Traffic Line commands with ``./`` (for example, ``./traffic_ctl -h``).
**When multiple Traffic Server installations are present and you are not
executing the Traffic Line command from the active Traffic Server path
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/admin/getting-started.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/getting-started.en.rst b/doc/admin/getting-started.en.rst
index f6327a5..16c6f47 100644
--- a/doc/admin/getting-started.en.rst
+++ b/doc/admin/getting-started.en.rst
@@ -177,25 +177,19 @@ as manage, control, and monitor the health of the Traffic Server system. ::
bin/trafficserver start
-.. _start-straffic-line:
-Start Traffic Line
-==================
+The :program:`traffic_ctl` provides a quick way of viewing Traffic Server statistics
+and configuring the Traffic Server system via a command-line interface.
-Traffic Line provides a quick way of viewing Traffic Server statistics
-and configuring the Traffic Server system via a command-line interface. To
-execute individual commands or script multiple commands, refer to
-:program:`traffic_line`.
+:program:`traffic_ctl` commands take the following form::
-Traffic Line commands take the following form::
+ bin/traffic_ctl COMMAND COMMAND ...
- bin/traffic_line -command argument
+For a list of :program:`traffic_ctl` commands, enter::
-For a list of :program:`traffic_line` commands, enter::
+ bin/traffic_ctl
- bin/traffic_line -h
-
-Please note that :program:`traffic_line`, while a fine tool for an
+Please note that :program:`traffic_ctl`, while a fine tool for an
administrator, is a poor choice for automation, especially that of
monitoring. See our chapter on :ref:`monitoring-traffic`
for how to do that more efficiently and effectively.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/admin/hierachical-caching.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/hierachical-caching.en.rst b/doc/admin/hierachical-caching.en.rst
index 5c4443e..3f71394 100644
--- a/doc/admin/hierachical-caching.en.rst
+++ b/doc/admin/hierachical-caching.en.rst
@@ -168,7 +168,7 @@ address.::
dest_host=host1 scheme=http parent="parent1;parent2" round-robin=strict
-Run the command :option:`traffic_line -x` to apply the configuration changes.
+Run the command :option:`traffic_ctl config reload` to apply the configuration changes.
.. _admin-icp-peering:
@@ -216,4 +216,4 @@ To configure Traffic Server to use an ICP cache hierarchy edit the following var
Edit :file:`icp.config` file located in the Traffic Server `config` directory:
For each ICP peer you want to identify, enter a separate rule in the :file:`icp.config` file.
-Run the command :option:`traffic_line -x` to apply the configuration changes.
+Run the command :option:`traffic_ctl config reload` to apply the configuration changes.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/admin/http-proxy-caching.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/http-proxy-caching.en.rst b/doc/admin/http-proxy-caching.en.rst
index 9c86609..0debf91 100644
--- a/doc/admin/http-proxy-caching.en.rst
+++ b/doc/admin/http-proxy-caching.en.rst
@@ -155,7 +155,7 @@ To modify the aging factor for freshness computations:
#. Change the value for :ts:cv:`proxy.config.http.cache.heuristic_lm_factor`.
-#. Run the :option:`traffic_line -x` command to apply the configuration changes.
+#. Run the :option:`traffic_ctl config reload` command to apply the configuration changes.
Setting Absolute Freshness Limits
---------------------------------
@@ -171,7 +171,7 @@ To specify an absolute freshness limit:
and :ts:cv:`proxy.config.http.cache.heuristic_max_lifetime` in
:file:`records.config`.
-#. Run the :option:`traffic_line -x` command to apply the configuration changes.
+#. Run the :option:`traffic_ctl config reload` command to apply the configuration changes.
Specifying Header Requirements
------------------------------
@@ -190,7 +190,7 @@ To configure Traffic Server to cache objects with specific headers:
#. Change the value for :ts:cv:`proxy.config.http.cache.required_headers`
in :file:`records.config`.
-#. Run the :option:`traffic_line -x` command to apply the configuration changes.
+#. Run the :option:`traffic_ctl config reload` command to apply the configuration changes.
Cache-Control Headers
---------------------
@@ -276,7 +276,7 @@ To configure revalidation options
#. Edit the variable :ts:cv:`proxy.config.http.cache.when_to_revalidate`
in :file:`records.config`.
-#. Run the :option:`traffic_line -x` command to apply the configuration changes.
+#. Run the :option:`traffic_ctl config reload` command to apply the configuration changes.
.. _pushing-content-into-the-cache:
@@ -300,7 +300,7 @@ must configure Traffic Server to accept ``PUSH`` requests.
CONFIG proxy.config.http.push_method_enabled INT 1
-#. Run the command :option:`traffic_line -x` to apply the configuration changes.
+#. Run the command :option:`traffic_ctl config reload` to apply the configuration changes.
Understanding HTTP PUSH
-----------------------
@@ -355,7 +355,7 @@ To set cache pinning rules:
url_regex=^https?://(www.)?apache.org/dev/ pin-in-cache=12h
-#. Run the command :option:`traffic_line -x` to apply the configuration changes.
+#. Run the command :option:`traffic_ctl config reload` to apply the configuration changes.
Caching HTTP Objects
====================
@@ -408,7 +408,7 @@ from its cache.
CONFIG proxy.config.http.cache.ignore_client_no_cache INT 1
-#. Run the command :option:`traffic_line -x` to apply the configuration changes.
+#. Run the command :option:`traffic_ctl config reload` to apply the configuration changes.
Origin Server Directives
------------------------
@@ -452,7 +452,7 @@ To configure Traffic Server to ignore server ``no-cache`` headers:
CONFIG proxy.config.http.cache.ignore_server_no_cache INT 1
-#. Run the command :option:`traffic_line -x` to apply the configuration changes.
+#. Run the command :option:`traffic_ctl config reload` to apply the configuration changes.
Configuring Traffic Server to Ignore WWW-Authenticate Headers
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -478,7 +478,7 @@ headers:
CONFIG proxy.config.http.cache.ignore_authentication INT 1
-#. Run the command :option:`traffic_line -x` to apply the configuration changes.
+#. Run the command :option:`traffic_ctl config reload` to apply the configuration changes.
Configuration Directives
------------------------
@@ -515,7 +515,7 @@ To disable HTTP object caching manually:
CONFIG proxy.config.http.enabled INT 0
-#. Run the command :option:`traffic_line -x` to apply the configuration changes.
+#. Run the command :option:`traffic_ctl config reload` to apply the configuration changes.
Caching Dynamic Content
~~~~~~~~~~~~~~~~~~~~~~~
@@ -536,7 +536,7 @@ content:
CONFIG proxy.config.http.cache.cache_urls_that_look_dynamic INT 0
-#. Run the command :option:`traffic_line -x` to apply the configuration changes.
+#. Run the command :option:`traffic_ctl config reload` to apply the configuration changes.
Caching Cookied Objects
~~~~~~~~~~~~~~~~~~~~~~~
@@ -563,7 +563,7 @@ To configure how Traffic Server caches cookied content:
#. Edit :ts:cv:`proxy.config.http.cache.cache_responses_to_cookies` in
:file:`records.config`.
-#. Run the command :option:`traffic_line -x` to apply the configuration changes.
+#. Run the command :option:`traffic_ctl config reload` to apply the configuration changes.
Forcing Object Caching
======================
@@ -579,7 +579,7 @@ To force document caching:
url_regex=^https?://(www.)?apache.org/dev/ ttl-in-cache=6h
-#. Run the command :option:`traffic_line -x` to apply the configuration changes.
+#. Run the command :option:`traffic_ctl config reload` to apply the configuration changes.
Caching HTTP Alternates
=======================
@@ -607,7 +607,7 @@ To configure how Traffic Server caches alternates:
- :ts:cv:`proxy.config.http.cache.vary_default_images`
- :ts:cv:`proxy.config.http.cache.vary_default_other`
-#. Run the command :option:`traffic_line -x` to apply the configuration changes.
+#. Run the command :option:`traffic_ctl config reload` to apply the configuration changes.
.. note::
@@ -635,7 +635,7 @@ To alter the limit on the number of alternates:
CONFIG proxy.config.cache.limits.http.max_alts INT 5
-#. Run the command :option:`traffic_line -x` to apply the configuration changes.
+#. Run the command :option:`traffic_ctl config reload` to apply the configuration changes.
.. _using-congestion-control:
@@ -667,7 +667,7 @@ To enable this option:
- Whether Traffic Server tracks the origin servers by IP address or by
hostname.
-#. Run the command :option:`traffic_line -x` to apply the configuration changes.
+#. Run the command :option:`traffic_ctl config reload` to apply the configuration changes.
.. _transaction-buffering-control:
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/admin/index.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/index.en.rst b/doc/admin/index.en.rst
index 6886b4e..44d87f9 100644
--- a/doc/admin/index.en.rst
+++ b/doc/admin/index.en.rst
@@ -245,7 +245,7 @@ Administration Tools
Traffic Server offers the following administration options:
-- The Traffic Line (:program:`traffic_line`) command-line interface is a
+- The :program:`traffic_ctl` command-line interface is a
text-based interface from which you can monitor Traffic Server performance
and network traffic, as well as configure the Traffic Server system. From
Traffic Line, you can execute individual commands or script a series of
@@ -266,7 +266,7 @@ Traffic Analysis Options
Traffic Server provides several options for network traffic analysis and
monitoring:
-- Traffic Line enables you to collect and process
+- :program:`traffic_ctl` enables you to collect and process
statistics obtained from network traffic information.
- Transaction logging enables you to record information (in a log file)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/admin/monitoring-traffic.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/monitoring-traffic.en.rst b/doc/admin/monitoring-traffic.en.rst
index f416ca0..df13047 100644
--- a/doc/admin/monitoring-traffic.en.rst
+++ b/doc/admin/monitoring-traffic.en.rst
@@ -58,7 +58,7 @@ whenever an alarm occurs, follow the steps below:
CONFIG proxy.config.alarm_email STRING "alerts@example.com"
-#. Run the command :option:`traffic_line -x` to apply the configuration changes.
+#. Run the command :option:`traffic_ctl config reload` to apply the configuration changes.
Using a Script File for Alarms
------------------------------
@@ -83,20 +83,20 @@ see.
To view a statistic, enter the following command:::
- traffic_line -r variable
+ traffic_ctl metric get VARIABLE
where ``variable`` is the variable representing the information you
want to view. For a list of variables you can specify, refer to :ref:`Traffic
-Line Variables <traffic-line-performance-statistics>`.
+Server Metrics <traffic-line-performance-statistics>`.
For example, the following command displays the document hit rate for
the Traffic Server node:::
- traffic_line -r proxy.node.cache_hit_ratio
+ traffic_ctl metric get proxy.node.cache_hit_ratio
If the Traffic Server ``bin`` directory is not in your path, then
prepend the Traffic Line command with ``./`` (for example:
-:option:`traffic_line -r` ``variable``).
+:option:`traffic_ctl metric get` ``VARIABLE``).
Viewing Statistics with Traffic Top
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/admin/performance-tuning.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/performance-tuning.en.rst b/doc/admin/performance-tuning.en.rst
index c81dae7..c0a6d82 100644
--- a/doc/admin/performance-tuning.en.rst
+++ b/doc/admin/performance-tuning.en.rst
@@ -174,7 +174,7 @@ Traffic Server Tuning
|TS| itself, of course, has many options you may want to consider adjusting to
achieve optimal performance in your environment. Many of these settings are
recorded in :file:`records.config` and may be adjusted with the
-:option:`traffic_line -s` command line utility while the server is operating.
+:option:`traffic_ctl config set` command line utility while the server is operating.
CPU and Thread Optimization
---------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/admin/reverse-proxy-http-redirects.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/reverse-proxy-http-redirects.en.rst b/doc/admin/reverse-proxy-http-redirects.en.rst
index 73ebcd2..65e6742 100644
--- a/doc/admin/reverse-proxy-http-redirects.en.rst
+++ b/doc/admin/reverse-proxy-http-redirects.en.rst
@@ -262,7 +262,7 @@ To create mapping rules:
#. Enter the map and reverse-map rules into :file:`remap.config`.
-#. Run the command :option:`traffic_line -x` to apply the configuration changes.
+#. Run the command :option:`traffic_ctl config reload` to apply the configuration changes.
Enabling HTTP Reverse Proxy
---------------------------
@@ -273,7 +273,7 @@ To enable HTTP reverse proxy:
CONFIG proxy.config.reverse_proxy.enabled INT 1
-#. Run the command :option:`traffic_line -x` to apply the configuration changes.
+#. Run the command :option:`traffic_ctl config reload` to apply the configuration changes.
Setting Optional HTTP Reverse Proxy Options
-------------------------------------------
@@ -294,7 +294,7 @@ Traffic Server provides several reverse proxy configuration options in
as ones that do not provide ``Host`` headers, are directed.
See :ts:cv:`proxy.config.header.parse.no_host_url_redirect`.
-Run the command :option:`traffic_line -x` to apply any of these configuration
+Run the command :option:`traffic_ctl config reload` to apply any of these configuration
changes.
Redirecting HTTP Requests
@@ -318,7 +318,7 @@ To set redirect rules:
#. For each redirect you want to set enter a mapping rule in :file:`remap.config`.
-#. Run the command :option:`traffic_line -x` to apply the configuration changes.
+#. Run the command :option:`traffic_ctl config reload` to apply the configuration changes.
Example
-------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/admin/security-options.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/security-options.en.rst b/doc/admin/security-options.en.rst
index a2afccb..659facd 100644
--- a/doc/admin/security-options.en.rst
+++ b/doc/admin/security-options.en.rst
@@ -31,7 +31,7 @@ the proxy cache.
#. Add a line to :file:`ip_allow.config` for each IP address or
range of IP addresses allowed to access Traffic Server.
-#. Run the command :option:`traffic_line -x` to apply the configuration
+#. Run the command :option:`traffic_ctl config reload` to apply the configuration
changes.
.. _configuring-dns-server-selection-split-dns:
@@ -58,7 +58,7 @@ To configure Split DNS:
CONFIG proxy.config.dns.splitDNS.enabled INT 1
-#. Run the command :option:`traffic_line -x` to apply the configuration changes.
+#. Run the command :option:`traffic_ctl config reload` to apply the configuration changes.
.. _configuring-ssl-termination:
@@ -169,8 +169,8 @@ Client/Traffic Server connections, you must do the following:
CONFIG proxy.config.ssl.CA.cert.path STRING "/opt/CA/certs/private-ca.pem"
-#. Run the command :option:`traffic_line -L` to restart Traffic Server on the
- local node or :option:`traffic_line -M` to restart Traffic Server on all
+#. Run the command :option:`traffic_ctl server restart` to restart Traffic Server on the
+ local node or :option:`traffic_ctl cluster restart` to restart Traffic Server on all
the nodes in a cluster.
.. _traffic-server-and-origin-server-connections:
@@ -256,8 +256,8 @@ and origin server connections, you must do the following:
CONFIG proxy.config.ssl.client.CA.cert.path STRING "/opt/ts/etc/ssl/certs/"
CONFIG proxy.config.ssl.client.CA.cert.filename STRING "CAs.pem"
-#. Run the command :option:`traffic_line -L` to restart Traffic Server on the
- local node or :option:`traffic_line -M` to restart Traffic Server on all
+#. Run the command :option:`traffic_ctl server restart` to restart Traffic Server on the
+ local node or :option:`traffic_ctl cluster restart` to restart Traffic Server on all
the nodes in a cluster.
Rotating TLS Session Ticket Keys
@@ -274,4 +274,4 @@ a ticket key file as a reverse queue in 48-byte chunks.
#. Touch :file:`ssl_multicert.config` to indicate that the SSL configuration is stale.
-#. Run the command :option:`traffic_line -x` to apply the new ticket key.
+#. Run the command :option:`traffic_ctl config reload` to apply the new ticket key.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/admin/working-log-files.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/working-log-files.en.rst b/doc/admin/working-log-files.en.rst
index ab26d1d..006b2b0 100644
--- a/doc/admin/working-log-files.en.rst
+++ b/doc/admin/working-log-files.en.rst
@@ -194,7 +194,7 @@ To set log management options, follow the steps below:
- :ts:cv:`proxy.config.log.max_space_mb_for_logs`
- :ts:cv:`proxy.config.log.max_space_mb_headroom`
-#. Run the command :option:`traffic_line -x` to apply the configuration
+#. Run the command :option:`traffic_ctl config reload` to apply the configuration
changes.
Choosing Event Log File Formats
@@ -235,7 +235,7 @@ extended (Netscape Extended), or extended2 (Netscape Extended 2).
Note that the squid log object is created by default, and will be used if logging is enabled.
Users can use any number of log formats and create any number of log objects via the XML config.
-#. Run the command :option:`traffic_line -x` to apply the configuration
+#. Run the command :option:`traffic_ctl config reload` to apply the configuration
changes.
.. _using-custom-log-formats:
@@ -306,7 +306,7 @@ In order to accomplish this, we:
#. Add :ref:`LogFormat`, :ref:`LogFilter`, and :ref:`LogObject`
specifications to the configuration file :file:`logs_xml.config`.
-#. Run the command :option:`traffic_line -x` to apply your configuration
+#. Run the command :option:`traffic_ctl config reload` to apply your configuration
changes.
ASCII_PIPE File Mode
@@ -363,7 +363,7 @@ To create a summary log file format:
You can specify more than one ``operator`` in the format line. For more
information, refer to :file:`logs_xml.config`.
-#. Run the command :option:`traffic_line -x` to apply configuration changes .
+#. Run the command :option:`traffic_ctl config reload` to apply configuration changes .
The following example format generates one entry every 10 seconds. Each entry
contains the timestamp of the last entry of the interval, a count of the number
@@ -569,7 +569,7 @@ log files when they reach a certain size, adjust the following setting in
CONFIG proxy.config.log.rolling_interval_sec INT 21600
-#. Run the command :option:`traffic_line -x` to apply the configuration
+#. Run the command :option:`traffic_ctl config reload` to apply the configuration
changes.
You can fine-tune log file rolling settings for a custom log file in the
@@ -664,7 +664,7 @@ To edit the log hosts list:
webserver2
webserver3
-#. Run the command :option:`traffic_line -x` to apply the configuration
+#. Run the command :option:`traffic_ctl config reload` to apply the configuration
changes.
Collating Event Log Files
@@ -744,7 +744,7 @@ following configuration adjustments in :file:`records.config`:
CONFIG proxy.config.log.collation_secret STRING "seekrit"
-#. Run the command :option:`traffic_line -x` to apply the configuration
+#. Run the command :option:`traffic_ctl config reload` to apply the configuration
changes.
.. note::
@@ -826,7 +826,7 @@ been established, then you must restart Traffic Server.
- :ts:cv:`proxy.config.log.collation_host_tagged`
- :ts:cv:`proxy.config.log.max_space_mb_for_orphan_logs`
-#. Run the command :option:`traffic_line -x` to apply the configuration
+#. Run the command :option:`traffic_ctl config reload` to apply the configuration
changes.
Collating Custom Event Log Files
@@ -854,8 +854,8 @@ To collate custom event log files:
``port`` is the port number for communication between the collation
server and collation clients.
-#. Run the command :option:`traffic_line -L` to restart Traffic Server on the
- local node or :option:`traffic_line -M` to restart Traffic Server on all
+#. Run the command :option:`traffic_ctl server restart` to restart Traffic Server on the
+ local node or :option:`traffic_ctl cluster restart` to restart Traffic Server on all
the nodes in a cluster.
Viewing Logging Statistics
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/arch/hacking/config-var-impl.en.rst
----------------------------------------------------------------------
diff --git a/doc/arch/hacking/config-var-impl.en.rst b/doc/arch/hacking/config-var-impl.en.rst
index 9f52d7c..af247c3 100644
--- a/doc/arch/hacking/config-var-impl.en.rst
+++ b/doc/arch/hacking/config-var-impl.en.rst
@@ -179,7 +179,7 @@ Variable Infrastructure
=======================
The primary effort in defining a configuration variable is handling updates,
-generally via :option:`traffic_line -x`. This is handled in a generic way, as
+generally via :option:`traffic_ctl config reload`. This is handled in a generic way, as
described in the next section, or in a :ref:`more specialized way <http-config-var-impl>`
(built on top of the generic mechanism) for HTTP related configuration
variables. This is only needed if the variable is marked as dynamically
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/locale/ja/LC_MESSAGES/admin/configuring-cache.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/admin/configuring-cache.en.po b/doc/locale/ja/LC_MESSAGES/admin/configuring-cache.en.po
index 9aadb00..79165d4 100644
--- a/doc/locale/ja/LC_MESSAGES/admin/configuring-cache.en.po
+++ b/doc/locale/ja/LC_MESSAGES/admin/configuring-cache.en.po
@@ -373,7 +373,7 @@ msgstr ""
#: ../../admin/configuring-cache.en.rst:249
#: ../../admin/configuring-cache.en.rst:262
msgid ""
-"Run the command :option:`traffic_line -x` to apply the configuration "
+"Run the command :option:`traffic_ctl config reload` to apply the configuration "
"changes."
msgstr ""
@@ -494,7 +494,7 @@ msgstr ""
#: ../../admin/configuring-cache.en.rst:348
msgid ""
"From the Traffic Server ``bin`` directory, enter the following command to "
-"re-read the configuration file: ``traffic_line -x``"
+"re-read the configuration file: ``traffic_ctl config reload``"
msgstr ""
#: ../../admin/configuring-cache.en.rst:350
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/locale/ja/LC_MESSAGES/admin/configuring-traffic-server.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/admin/configuring-traffic-server.en.po b/doc/locale/ja/LC_MESSAGES/admin/configuring-traffic-server.en.po
index 88195bd..dd54a12 100644
--- a/doc/locale/ja/LC_MESSAGES/admin/configuring-traffic-server.en.po
+++ b/doc/locale/ja/LC_MESSAGES/admin/configuring-traffic-server.en.po
@@ -92,14 +92,14 @@ msgid ""
"Traffic Server configuration options by manually editing specific variables "
"in the :file:`records.config` file. After modifying the :file:`records."
"config` file, Traffic Server must reread the configuration files: enter "
-"the Traffic Line command :option:`traffic_line -x`. You may need to restart "
+"the Traffic Line command :option:`traffic_ctl config reload`. You may need to restart "
"Traffic Server to apply some of the configuration changes."
msgstr ""
"Traffic Line や Traffic Shell を使用する代わりに、:file:`records.config` "
"ファイルの具体的な変数を手動で編集することで Traffic Server の設定項目を変更"
"することができます。:file:`records.config` ファイルの修正後、Traffic Server "
"は必ず設定ファイルを再読み込みしなくてはなりません。Traffic Line コマンド :"
-"option:`traffic_line -x` を入力してください。いくつかの設定の変更を適用する"
+"option:`traffic_ctl config reload` を入力してください。いくつかの設定の変更を適用する"
"には Traffic Server を再起動する必要があるかもしれません。"
#: ../../admin/configuring-traffic-server.en.rst:71
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/locale/ja/LC_MESSAGES/admin/hierachical-caching.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/admin/hierachical-caching.en.po b/doc/locale/ja/LC_MESSAGES/admin/hierachical-caching.en.po
index 86cdbf5..45f7a5e 100644
--- a/doc/locale/ja/LC_MESSAGES/admin/hierachical-caching.en.po
+++ b/doc/locale/ja/LC_MESSAGES/admin/hierachical-caching.en.po
@@ -171,7 +171,7 @@ msgstr ""
#: ../../admin/hierachical-caching.en.rst:132
msgid ""
-"Run the command :option:`traffic_line -x` to apply the configuration "
+"Run the command :option:`traffic_ctl config reload` to apply the configuration "
"changes."
msgstr ""
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/locale/ja/LC_MESSAGES/admin/http-proxy-caching.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/admin/http-proxy-caching.en.po b/doc/locale/ja/LC_MESSAGES/admin/http-proxy-caching.en.po
index 43bd1dd..d4f8b76 100644
--- a/doc/locale/ja/LC_MESSAGES/admin/http-proxy-caching.en.po
+++ b/doc/locale/ja/LC_MESSAGES/admin/http-proxy-caching.en.po
@@ -295,10 +295,10 @@ msgstr ""
#: ../../admin/http-proxy-caching.en.rst:281
#: ../../admin/http-proxy-caching.en.rst:332
msgid ""
-"Run the :option:`traffic_line -x` command to apply the configuration "
+"Run the :option:`traffic_ctl config reload` command to apply the configuration "
"changes."
msgstr ""
-"設定変更を適用するために :option:`traffic_line -x` コマンドを実行してくださ"
+"設定変更を適用するために :option:`traffic_ctl config reload` コマンドを実行してくださ"
"い。"
#: ../../admin/http-proxy-caching.en.rst:159
@@ -723,10 +723,10 @@ msgstr ""
#: ../../admin/http-proxy-caching.en.rst:708
#: ../../admin/http-proxy-caching.en.rst:735
msgid ""
-"Run the command :option:`traffic_line -x` to apply the configuration "
+"Run the command :option:`traffic_ctl config reload` to apply the configuration "
"changes."
msgstr ""
-"設定変更を適用するために :option:`traffic_line -x` を実行してください。"
+"設定変更を適用するために :option:`traffic_ctl config reload` を実行してください。"
#: ../../admin/http-proxy-caching.en.rst:356
msgid ""
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/locale/ja/LC_MESSAGES/admin/monitoring-traffic.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/admin/monitoring-traffic.en.po b/doc/locale/ja/LC_MESSAGES/admin/monitoring-traffic.en.po
index c027626..8e13af2 100644
--- a/doc/locale/ja/LC_MESSAGES/admin/monitoring-traffic.en.po
+++ b/doc/locale/ja/LC_MESSAGES/admin/monitoring-traffic.en.po
@@ -100,7 +100,7 @@ msgstr ""
#: ../../admin/monitoring-traffic.en.rst:62
msgid ""
-"Run the command :option:`traffic_line -x` to apply the configuration "
+"Run the command :option:`traffic_ctl config reload` to apply the configuration "
"changes."
msgstr ""
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/locale/ja/LC_MESSAGES/admin/reverse-proxy-http-redirects.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/admin/reverse-proxy-http-redirects.en.po b/doc/locale/ja/LC_MESSAGES/admin/reverse-proxy-http-redirects.en.po
index 03b141a..a24b01e 100644
--- a/doc/locale/ja/LC_MESSAGES/admin/reverse-proxy-http-redirects.en.po
+++ b/doc/locale/ja/LC_MESSAGES/admin/reverse-proxy-http-redirects.en.po
@@ -495,10 +495,10 @@ msgstr ""
#: ../../admin/reverse-proxy-http-redirects.en.rst:263
#: ../../admin/reverse-proxy-http-redirects.en.rst:306
msgid ""
-"Run the command :option:`traffic_line -x` to apply the configuration "
+"Run the command :option:`traffic_ctl config reload` to apply the configuration "
"changes."
msgstr ""
-"設定の変更を適用するために :option:`traffic_line -x` コマンドを実行してくだ"
+"設定の変更を適用するために :option:`traffic_ctl config reload` コマンドを実行してくだ"
"さい。"
#: ../../admin/reverse-proxy-http-redirects.en.rst:255
@@ -562,10 +562,10 @@ msgstr ""
#: ../../admin/reverse-proxy-http-redirects.en.rst:282
msgid ""
-"Don't forget to run the command :option:`traffic_line -x` to apply the "
+"Don't forget to run the command :option:`traffic_ctl config reload` to apply the "
"configuration changes."
msgstr ""
-"設定の変更を適用するために :option:`traffic_line -x` コマンドを実行するのを"
+"設定の変更を適用するために :option:`traffic_ctl config reload` コマンドを実行するのを"
"忘れないでください。"
#: ../../admin/reverse-proxy-http-redirects.en.rst:286
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/locale/ja/LC_MESSAGES/admin/security-options.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/admin/security-options.en.po b/doc/locale/ja/LC_MESSAGES/admin/security-options.en.po
index a099dfc..8f75243 100644
--- a/doc/locale/ja/LC_MESSAGES/admin/security-options.en.po
+++ b/doc/locale/ja/LC_MESSAGES/admin/security-options.en.po
@@ -57,9 +57,9 @@ msgstr ""
#: ../../admin/security-options.en.rst:35
#: ../../admin/security-options.en.rst:63
msgid ""
-"Run the command :option:`traffic_line -x` to apply the configuration "
+"Run the command :option:`traffic_ctl config reload` to apply the configuration "
"changes."
-msgstr ":option:`traffic_line -x` を実行して設定の変更を適用してください。"
+msgstr ":option:`traffic_ctl config reload` を実行して設定の変更を適用してください。"
#: ../../admin/security-options.en.rst:41
msgid "Configuring DNS Server Selection (Split DNS)"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/locale/ja/LC_MESSAGES/admin/working-log-files.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/admin/working-log-files.en.po b/doc/locale/ja/LC_MESSAGES/admin/working-log-files.en.po
index 86754ef..e3f4388 100644
--- a/doc/locale/ja/LC_MESSAGES/admin/working-log-files.en.po
+++ b/doc/locale/ja/LC_MESSAGES/admin/working-log-files.en.po
@@ -335,7 +335,7 @@ msgstr ""
#: ../../admin/working-log-files.en.rst:767
#: ../../admin/working-log-files.en.rst:834
msgid ""
-"Run the command :option:`traffic_line -x` to apply the configuration "
+"Run the command :option:`traffic_ctl config reload` to apply the configuration "
"changes."
msgstr ""
@@ -518,7 +518,7 @@ msgstr ""
#: ../../admin/working-log-files.en.rst:340
msgid ""
-"Run the command :option:`traffic_line -x` to apply your configuration "
+"Run the command :option:`traffic_ctl config reload` to apply your configuration "
"changes."
msgstr ""
@@ -583,7 +583,7 @@ msgstr ""
#: ../../admin/working-log-files.en.rst:387
msgid ""
-"Run the command :option:`traffic_line -x` to apply configuration changes ."
+"Run the command :option:`traffic_ctl config reload` to apply configuration changes ."
msgstr ""
#: ../../admin/working-log-files.en.rst:389
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/locale/ja/LC_MESSAGES/reference/configuration/cache.config.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/reference/configuration/cache.config.en.po b/doc/locale/ja/LC_MESSAGES/reference/configuration/cache.config.en.po
index d9c6e74..5537d7e 100644
--- a/doc/locale/ja/LC_MESSAGES/reference/configuration/cache.config.en.po
+++ b/doc/locale/ja/LC_MESSAGES/reference/configuration/cache.config.en.po
@@ -42,7 +42,7 @@ msgstr ""
#: ../../reference/configuration/cache.config.en.rst:32
msgid ""
"After you modify the :file:`cache.config` file, navigate to the Traffic "
-"Server bin directory; then run the :option:`traffic_line -x` command to "
+"Server bin directory; then run the :option:`traffic_ctl config reload` command to "
"apply changes. When you apply the changes to a node in a cluster, Traffic "
"Server automatically applies the changes to all other nodes in the cluster."
msgstr ""
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/locale/ja/LC_MESSAGES/reference/configuration/congestion.config.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/reference/configuration/congestion.config.en.po b/doc/locale/ja/LC_MESSAGES/reference/configuration/congestion.config.en.po
index 55bf7c9..10a5ee4 100644
--- a/doc/locale/ja/LC_MESSAGES/reference/configuration/congestion.config.en.po
+++ b/doc/locale/ja/LC_MESSAGES/reference/configuration/congestion.config.en.po
@@ -36,7 +36,7 @@ msgid ""
"to stop forwarding HTTP requests to origin servers when they become "
"congested, and then send the client a message to retry the congested origin "
"server later. After you modify the :file:`congestion.config` file, navigate "
-"to the Traffic Server bin directory; then run the :option:`traffic_line -x` "
+"to the Traffic Server bin directory; then run the :option:`traffic_ctl config reload` "
"command to apply changes. When you apply the changes to a node in a "
"cluster, Traffic Server automatically applies the changes to all other "
"nodes in the cluster. Traffic Server uses the :file:`congestion.config` "
@@ -47,7 +47,7 @@ msgstr ""
"Server が HTTP リクエストを転送しないように設定することを可能にし、後で輻輳"
"したオリジンサーバーにリトライさせるためにクライアントへメッセージを送信しま"
"す。:file:`congestion.config` ファイルを変更した後には Traffic Server の "
-"bin ディレクトリに移動し、コマンド :option:`traffic_line -x` を実行して変更"
+"bin ディレクトリに移動し、コマンド :option:`traffic_ctl config reload` を実行して変更"
"を適用してください。クラスター内の一つのノードに変更を適用すると、Traffic "
"Server は自動的にクラスター内のすべてのノードに変更を適用します。Traffic "
"Server は `Congestion Control <http#UsingCongestionControl>`_ オプションを有"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/locale/ja/LC_MESSAGES/reference/configuration/hosting.config.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/reference/configuration/hosting.config.en.po b/doc/locale/ja/LC_MESSAGES/reference/configuration/hosting.config.en.po
index 6f23e7e..989bc36 100644
--- a/doc/locale/ja/LC_MESSAGES/reference/configuration/hosting.config.en.po
+++ b/doc/locale/ja/LC_MESSAGES/reference/configuration/hosting.config.en.po
@@ -47,7 +47,7 @@ msgstr ""
#: ../../reference/configuration/hosting.config.en.rst:35
msgid ""
"After you modify hosting.config, navigate to the Traffic Server bin "
-"directory and run :option:`traffic_line -x` to apply your changes."
+"directory and run :option:`traffic_ctl config reload` to apply your changes."
msgstr ""
#: ../../reference/configuration/hosting.config.en.rst:38
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/locale/ja/LC_MESSAGES/reference/configuration/icp.config.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/reference/configuration/icp.config.en.po b/doc/locale/ja/LC_MESSAGES/reference/configuration/icp.config.en.po
index 738b2a8..737475f 100644
--- a/doc/locale/ja/LC_MESSAGES/reference/configuration/icp.config.en.po
+++ b/doc/locale/ja/LC_MESSAGES/reference/configuration/icp.config.en.po
@@ -42,7 +42,7 @@ msgstr ""
#: ../../reference/configuration/icp.config.en.rst:32
msgid ""
"After you modify the icp.config file, navigate to the Traffic Server bin "
-"directory and run the :option:`traffic_line -x` command to apply the "
+"directory and run the :option:`traffic_ctl config reload` command to apply the "
"changes. When you apply the changes to a node in a cluster, Traffic Server "
"automatically applies the changes to all other nodes in the cluster."
msgstr ""
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/locale/ja/LC_MESSAGES/reference/configuration/ip_allow.config.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/reference/configuration/ip_allow.config.en.po b/doc/locale/ja/LC_MESSAGES/reference/configuration/ip_allow.config.en.po
index 51cc057..eae8ab9 100644
--- a/doc/locale/ja/LC_MESSAGES/reference/configuration/ip_allow.config.en.po
+++ b/doc/locale/ja/LC_MESSAGES/reference/configuration/ip_allow.config.en.po
@@ -36,7 +36,7 @@ msgid ""
"Server proxy cache. You can specify ranges of IP addresses that are allowed "
"to use the Traffic Server as a web proxy cache. After you modify the :file:"
"`ip_allow.config` file, navigate to the Traffic Server bin directory and "
-"run the :option:`traffic_line -x` command to apply changes. When you apply "
+"run the :option:`traffic_ctl config reload` command to apply changes. When you apply "
"the changes to a node in a cluster, Traffic Server automatically applies "
"the changes to all other nodes in the cluster."
msgstr ""
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/locale/ja/LC_MESSAGES/reference/configuration/log_hosts.config.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/reference/configuration/log_hosts.config.en.po b/doc/locale/ja/LC_MESSAGES/reference/configuration/log_hosts.config.en.po
index 687ba09..eb56881 100644
--- a/doc/locale/ja/LC_MESSAGES/reference/configuration/log_hosts.config.en.po
+++ b/doc/locale/ja/LC_MESSAGES/reference/configuration/log_hosts.config.en.po
@@ -38,7 +38,7 @@ msgid ""
"working-log-files#HTTPHostLogSplitting>`_ option. You should use the same :"
"file:`log_hosts.config` file on every Traffic Server node in your cluster. "
"After you modify the :file:`log_hosts.config` file, run the :option:"
-"`traffic_line -x` command to apply the changes. When you apply the changes "
+"`traffic_ctl config reload` command to apply the changes. When you apply the changes "
"to a node in a cluster, Traffic Server automatically applies the changes to "
"all other nodes in the cluster."
msgstr ""
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/locale/ja/LC_MESSAGES/reference/configuration/parent.config.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/reference/configuration/parent.config.en.po b/doc/locale/ja/LC_MESSAGES/reference/configuration/parent.config.en.po
index 00e76fe..8176ff4 100644
--- a/doc/locale/ja/LC_MESSAGES/reference/configuration/parent.config.en.po
+++ b/doc/locale/ja/LC_MESSAGES/reference/configuration/parent.config.en.po
@@ -55,7 +55,7 @@ msgstr ""
#: ../../reference/configuration/parent.config.en.rst:34
msgid ""
"After you modify the :file:`parent.config` file, run the :option:"
-"`traffic_line -x` command to apply your changes. When you apply the changes "
+"`traffic_ctl config reload` command to apply your changes. When you apply the changes "
"to one node in a cluster, Traffic Server automatically applies the changes "
"to all other nodes in the cluster."
msgstr ""
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/locale/ja/LC_MESSAGES/reference/configuration/records.config.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/reference/configuration/records.config.en.po b/doc/locale/ja/LC_MESSAGES/reference/configuration/records.config.en.po
index cfb8fe1..f9cb280 100644
--- a/doc/locale/ja/LC_MESSAGES/reference/configuration/records.config.en.po
+++ b/doc/locale/ja/LC_MESSAGES/reference/configuration/records.config.en.po
@@ -36,14 +36,14 @@ msgid ""
"the Traffic Server software. Many of the variables in the :file:`records."
"config` file are set automatically when you set configuration options in "
"Traffic Line or Traffic Shell. After you modify the :file:`records.config` "
-"file, run the command :option:`traffic_line -x` to apply the changes. When "
+"file, run the command :option:`traffic_ctl config reload` to apply the changes. When "
"you apply changes to one node in a cluster, Traffic Server automatically "
"applies the changes to all other nodes in the cluster."
msgstr ""
":file:`records.config` ファイルは Traffic Server で使用される設定変数の一覧"
"です。 :file:`records.config` ファイル内の多くの変数は Traffic Line や "
"Traffic Shell でオプションの調整を行うと自動的に設定されます。:file:"
-"`records.config` ファイルに変更を加えた後は、:option:`traffic_line -x` を実"
+"`records.config` ファイルに変更を加えた後は、:option:`traffic_ctl config reload` を実"
"行して変更を適用します。クラスター内の一つのノードに変更を適用すると "
"Traffic Server は自動的にクラスター内の他のすべてのノードに変更を適用しま"
"す。"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/locale/ja/LC_MESSAGES/reference/configuration/remap.config.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/reference/configuration/remap.config.en.po b/doc/locale/ja/LC_MESSAGES/reference/configuration/remap.config.en.po
index 5182b36..3158cd7 100644
--- a/doc/locale/ja/LC_MESSAGES/reference/configuration/remap.config.en.po
+++ b/doc/locale/ja/LC_MESSAGES/reference/configuration/remap.config.en.po
@@ -76,12 +76,12 @@ msgstr ""
#: ../../reference/configuration/remap.config.en.rst:43
msgid ""
-"After you modify the :file:`remap.config` run the :option:`traffic_line -x` "
+"After you modify the :file:`remap.config` run the :option:`traffic_ctl config reload` "
"to apply the changes. When you apply the changes to one node in a cluster, "
"Traffic Server automatically applies the changes to all other nodes in the "
"cluster."
msgstr ""
-":file:`remap.config` ファイルを修正した後は :option:`traffic_line -x` を実行"
+":file:`remap.config` ファイルを修正した後は :option:`traffic_ctl config reload` を実行"
"し変更を適用してください。クラスター内の1つのノードに変更を適用すると "
"Traffic Server は自動的にクラスター内の他のすべてのノードに変更を適用しま"
"す。"
@@ -703,12 +703,12 @@ msgstr ""
msgid ""
"Included remap files are not currently tracked by the configuration "
"subsystem. Changes to included remap files will not be noticed by online "
-"configuration changes applied by :option:`traffic_line -x` unless :file:"
+"configuration changes applied by :option:`traffic_ctl config reload` unless :file:"
"`remap.config` has also changed."
msgstr ""
"取り込まれたリマップファイルは現在は設定サブシステムによって監視されていませ"
"ん。取り込まれたリマップファイルの変更は :file:`remap.config` も変更されない"
-"限りは :option:`traffic_line -x` で適用されるオンラインでの設定の変更によっ"
+"限りは :option:`traffic_ctl config reload` で適用されるオンラインでの設定の変更によっ"
"て通知されません。"
#: ../../reference/configuration/remap.config.en.rst:435
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/locale/ja/LC_MESSAGES/reference/configuration/splitdns.config.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/reference/configuration/splitdns.config.en.po b/doc/locale/ja/LC_MESSAGES/reference/configuration/splitdns.config.en.po
index 2b69e9d..c657b5e 100644
--- a/doc/locale/ja/LC_MESSAGES/reference/configuration/splitdns.config.en.po
+++ b/doc/locale/ja/LC_MESSAGES/reference/configuration/splitdns.config.en.po
@@ -75,7 +75,7 @@ msgstr ""
#: ../../reference/configuration/splitdns.config.en.rst:43
msgid ""
"After you modify the :file:`splitdns.config` file, run the :option:"
-"`traffic_line -x` command to apply the changes. When you apply changes to a "
+"`traffic_ctl config reload` command to apply the changes. When you apply changes to a "
"node in a cluster, Traffic Server automatically applies the changes to all "
"other nodes in the cluster."
msgstr ""
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/locale/ja/LC_MESSAGES/reference/configuration/ssl_multicert.config.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/reference/configuration/ssl_multicert.config.en.po b/doc/locale/ja/LC_MESSAGES/reference/configuration/ssl_multicert.config.en.po
index 83ad670..230c17b 100644
--- a/doc/locale/ja/LC_MESSAGES/reference/configuration/ssl_multicert.config.en.po
+++ b/doc/locale/ja/LC_MESSAGES/reference/configuration/ssl_multicert.config.en.po
@@ -62,9 +62,9 @@ msgstr ""
#: ../../reference/configuration/ssl_multicert.config.en.rst:39
msgid ""
"Changes to :file:`ssl_multicert.config` can be applied to a running Traffic "
-"Server using :option:`traffic_line -x`."
+"Server using :option:`traffic_ctl config reload`."
msgstr ""
-":file:`ssl_multicert.config` への変更は :option:`traffic_line -x` の使用によ"
+":file:`ssl_multicert.config` への変更は :option:`traffic_ctl config reload` の使用によ"
"り実行中の Traffic Server に適用できます。"
#: ../../reference/configuration/ssl_multicert.config.en.rst:43
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/locale/ja/LC_MESSAGES/reference/plugins/balancer.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/reference/plugins/balancer.en.po b/doc/locale/ja/LC_MESSAGES/reference/plugins/balancer.en.po
index 6e4af20..552a336 100644
--- a/doc/locale/ja/LC_MESSAGES/reference/plugins/balancer.en.po
+++ b/doc/locale/ja/LC_MESSAGES/reference/plugins/balancer.en.po
@@ -112,6 +112,6 @@ msgid ""
"to implement. Most production environments already have mechanisms to check "
"service health. It is recommended that you write a simple script to monitor "
"this information and rewrite :file:`remap.config` when appropriate. "
-"Running :option:`traffic_line -x` will reload the ``balancer`` plugin with "
+"Running :option:`traffic_ctl config reload` will reload the ``balancer`` plugin with "
"the new set of origin servers."
msgstr ""
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/locale/ja/LC_MESSAGES/reference/plugins/gzip.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/reference/plugins/gzip.en.po b/doc/locale/ja/LC_MESSAGES/reference/plugins/gzip.en.po
index 965a001..31681df 100644
--- a/doc/locale/ja/LC_MESSAGES/reference/plugins/gzip.en.po
+++ b/doc/locale/ja/LC_MESSAGES/reference/plugins/gzip.en.po
@@ -82,11 +82,11 @@ msgstr "もしくは、設定を指定することも可能です。"
msgid ""
"After modifying plugin.config, restart traffic server (sudo traffic_line -"
"L) the configuration is re-read when a management update is given (sudo "
-"traffic_line -x)"
+"traffic_ctl config reload)"
msgstr ""
"plugin.config を修正後、Traffic Server をリスタート (sudo traffic_line -L) "
"設定ファイルは管理アップデートが行われた際に再読み込みされます。(sudo "
-"traffic_line -x)"
+"traffic_ctl config reload)"
#: ../../reference/plugins/gzip.en.rst:56
msgid "Options"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/reference/commands/traffic_ctl.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/commands/traffic_ctl.en.rst b/doc/reference/commands/traffic_ctl.en.rst
index f40e2bf..5ac8a7b 100644
--- a/doc/reference/commands/traffic_ctl.en.rst
+++ b/doc/reference/commands/traffic_ctl.en.rst
@@ -238,8 +238,8 @@ Examples
Configure Traffic Server to log in Squid format::
$ traffic_ctl config set proxy.config.log.squid_log_enabled 1
- $ traffic_line config proxy.config.log.squid_log_is_ascii 1
- $ traffic_line config reload
+ $ traffic_ctl config set proxy.config.log.squid_log_is_ascii 1
+ $ traffic_ctl config reload
See also
========
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/reference/commands/traffic_line.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/commands/traffic_line.en.rst b/doc/reference/commands/traffic_line.en.rst
index bf74fae..b61c763 100644
--- a/doc/reference/commands/traffic_line.en.rst
+++ b/doc/reference/commands/traffic_line.en.rst
@@ -290,7 +290,7 @@ Configure Traffic Server to log in Squid format::
$ traffic_line -s proxy.config.log.squid_log_enabled -v 1
$ traffic_line -s proxy.config.log.squid_log_is_ascii -v 1
- $ traffic_line -x
+ $ traffic_ctl config reload
See also
========
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/reference/commands/traffic_manager.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/commands/traffic_manager.en.rst b/doc/reference/commands/traffic_manager.en.rst
index 1974fc9..65960c8 100644
--- a/doc/reference/commands/traffic_manager.en.rst
+++ b/doc/reference/commands/traffic_manager.en.rst
@@ -54,9 +54,9 @@ Signals
=======
SIGHUP
- This signal causes a reconfiguration event, equivalent to running :program:`traffic_line -x`.
+ This signal causes a reconfiguration event, equivalent to running :program:`traffic_ctl config reload`.
See also
========
-:manpage:`traffic_line(8)`
+:manpage:`traffic_ctl(8)`
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/reference/configuration/cache.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/configuration/cache.config.en.rst b/doc/reference/configuration/cache.config.en.rst
index 397fb2b..0472151 100644
--- a/doc/reference/configuration/cache.config.en.rst
+++ b/doc/reference/configuration/cache.config.en.rst
@@ -33,7 +33,7 @@ web objects. You can add caching rules to specify the following:
.. important::
After you modify the :file:`cache.config` file, navigate to
- the Traffic Server bin directory; then run the :option:`traffic_line -x`
+ the Traffic Server bin directory; then run the :option:`traffic_ctl config reload`
command to apply changes. When you apply the changes to a node in a
cluster, Traffic Server automatically applies the changes to all other
nodes in the cluster.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/reference/configuration/congestion.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/configuration/congestion.config.en.rst b/doc/reference/configuration/congestion.config.en.rst
index 143c46f..47af214 100644
--- a/doc/reference/configuration/congestion.config.en.rst
+++ b/doc/reference/configuration/congestion.config.en.rst
@@ -27,7 +27,7 @@ to stop forwarding HTTP requests to origin servers when they become
congested, and then send the client a message to retry the congested
origin server later. After you modify the :file:`congestion.config` file,
navigate to the Traffic Server bin directory; then run the
-:option:`traffic_line -x` command to apply changes. When you apply the changes
+:option:`traffic_ctl config reload` command to apply changes. When you apply the changes
to a node in a cluster, Traffic Server automatically applies the changes
to all other nodes in the cluster. Traffic Server uses the
:file:`congestion.config` file only if you enable the
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/reference/configuration/hosting.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/configuration/hosting.config.en.rst b/doc/reference/configuration/hosting.config.en.rst
index 91b5031..3052264 100644
--- a/doc/reference/configuration/hosting.config.en.rst
+++ b/doc/reference/configuration/hosting.config.en.rst
@@ -34,7 +34,7 @@ according to size and protocol in the :file:`volume.config`
file.
After you modify hosting.config, navigate to the Traffic Server bin
-directory and run :option:`traffic_line -x` to apply your changes.
+directory and run :option:`traffic_ctl config reload` to apply your changes.
When you apply the changes to a node in a cluster, Traffic Server
automatically applies the changes to all other nodes in the cluster.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/reference/configuration/icp.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/configuration/icp.config.en.rst b/doc/reference/configuration/icp.config.en.rst
index 11a57c0..24a5704 100644
--- a/doc/reference/configuration/icp.config.en.rst
+++ b/doc/reference/configuration/icp.config.en.rst
@@ -26,7 +26,7 @@ The :file:`icp.config` file defines ICP peers (parent and sibling caches).
.. important::
After you modify the icp.config file, navigate to the
- Traffic Server bin directory and run the :option:`traffic_line -x` command to
+ Traffic Server bin directory and run the :option:`traffic_ctl config reload` command to
apply the changes. When you apply the changes to a node in a cluster,
Traffic Server automatically applies the changes to all other nodes in
the cluster.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/reference/configuration/ip_allow.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/configuration/ip_allow.config.en.rst b/doc/reference/configuration/ip_allow.config.en.rst
index 857e3e6..9f9a4fc 100644
--- a/doc/reference/configuration/ip_allow.config.en.rst
+++ b/doc/reference/configuration/ip_allow.config.en.rst
@@ -25,7 +25,7 @@ The :file:`ip_allow.config` file controls client access to the Traffic
Server proxy cache. You can specify ranges of IP addresses that are
allowed to use the Traffic Server as a web proxy cache. After you modify
the :file:`ip_allow.config` file, navigate to the Traffic Server bin
-directory and run the :option:`traffic_line -x` command to apply changes. When
+directory and run the :option:`traffic_ctl config reload` command to apply changes. When
you apply the changes to a node in a cluster, Traffic Server
automatically applies the changes to all other nodes in the cluster.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/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 6610dcf..659030d 100644
--- a/doc/reference/configuration/log_hosts.config.en.rst
+++ b/doc/reference/configuration/log_hosts.config.en.rst
@@ -26,7 +26,7 @@ files, you must list each origin server hostname in the
:file:`log_hosts.config` file. In addition, you must enable the :ref:`httphostlogsplitting` foo! ... <../working-log-files#HTTPHostLogSplitting>`_ option. You
should use the same :file:`log_hosts.config` file on every Traffic Server
node in your cluster. After you modify the :file:`log_hosts.config` file,
-run the :option:`traffic_line -x` command to apply the changes.
+run the :option:`traffic_ctl config reload` command to apply the changes.
When you apply the changes to a node in a cluster, Traffic Server automatically applies the
changes to all other nodes in the cluster.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/reference/configuration/parent.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/configuration/parent.config.en.rst b/doc/reference/configuration/parent.config.en.rst
index 5e3eacc..9578713 100644
--- a/doc/reference/configuration/parent.config.en.rst
+++ b/doc/reference/configuration/parent.config.en.rst
@@ -31,7 +31,7 @@ cache hierarchy. Use this file to perform the following configuration:
Traffic Server uses the :file:`parent.config` file only when the parent
caching option is enabled (refer to :ref:`configuring-traffic-server-to-use-a-parent-cache`).
-After you modify the :file:`parent.config` file, run the :option:`traffic_line -x`
+After you modify the :file:`parent.config` file, run the :option:`traffic_ctl config reload`
command to apply your changes. When you apply the changes to one node in
a cluster, Traffic Server automatically applies the changes to all other
nodes in the cluster.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/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 1f615a6..f124a79 100644
--- a/doc/reference/configuration/records.config.en.rst
+++ b/doc/reference/configuration/records.config.en.rst
@@ -27,7 +27,7 @@ the Traffic Server software. Many of the variables in the
:file:`records.config` file are set automatically when you set configuration
options in Traffic Line. After you modify the
:file:`records.config` file,
-run the command :option:`traffic_line -x` to apply the changes.
+run the command :option:`traffic_ctl config reload` to apply the changes.
When you apply changes to one node in a cluster, Traffic Server
automatically applies the changes to all other nodes in the cluster.
@@ -51,7 +51,7 @@ as it may be removed in a future release without warning.
A variable marked as ``Reloadable`` can be updated via the command::
- traffic_line -x
+ traffic_ctl config reload
A variable marked as ``Overridable`` can be changed on a per-remap basis using plugins
(like the :ref:`conf-remap-plugin`).
@@ -112,13 +112,13 @@ case, and replacing any dot separators with an underscore.
Overriding a variable from the environment is permanent and will
not be affected by future configuration changes made in
-:file:`records.config` or applied with :program:`traffic_line`.
+:file:`records.config` or applied with :program:`traffic_ctl`.
For example, we could override the `proxy.config.product_company`_ variable
like this::
$ PROXY_CONFIG_PRODUCT_COMPANY=example traffic_cop &
- $ traffic_line -r proxy.config.product_company
+ $ traffic_ctl config get proxy.config.product_company
.. _configuration-variables:
@@ -282,7 +282,7 @@ Value Effect
:reloadable:
This setting specifies the number of active client connections
- for use by :option:`traffic_line --drain`.
+ for use by :option:`traffic_ctl server restart --drain`.
Network
=======
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/reference/configuration/remap.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/configuration/remap.config.en.rst b/doc/reference/configuration/remap.config.en.rst
index 7355f16..828fdf5 100644
--- a/doc/reference/configuration/remap.config.en.rst
+++ b/doc/reference/configuration/remap.config.en.rst
@@ -44,7 +44,7 @@ Refer to :ref:`reverse-proxy-and-http-redirects`, for information about
redirecting HTTP requests and using reverse proxy.
After you modify the :file:`remap.config` run the
-:option:`traffic_line -x` to apply the changes. When you apply the
+:option:`traffic_ctl config reload` to apply the changes. When you apply the
changes to one node in a cluster, Traffic Server automatically applies
the changes to all other nodes in the cluster.
@@ -464,7 +464,7 @@ directives are allowed.
Included remap files are not currently tracked by the configuration
subsystem. Changes to included remap files will not be noticed
- by online configuration changes applied by :option:`traffic_line -x`
+ by online configuration changes applied by :option:`traffic_ctl config reload`
unless :file:`remap.config` has also changed.
Examples
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/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 91894d8..8bc690b 100644
--- a/doc/reference/configuration/splitdns.config.en.rst
+++ b/doc/reference/configuration/splitdns.config.en.rst
@@ -41,7 +41,7 @@ server specification:
domains are specified
After you modify the :file:`splitdns.config` file,
-run the :option:`traffic_line -x`
+run the :option:`traffic_ctl config reload`
command to apply the changes. When you apply changes to a node in a
cluster, Traffic Server automatically applies the changes to all other
nodes in the cluster.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/reference/configuration/ssl_multicert.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/configuration/ssl_multicert.config.en.rst b/doc/reference/configuration/ssl_multicert.config.en.rst
index 0eb57b1..0be58e6 100644
--- a/doc/reference/configuration/ssl_multicert.config.en.rst
+++ b/doc/reference/configuration/ssl_multicert.config.en.rst
@@ -37,7 +37,7 @@ of the form `*.domain.com`, ie. where `*` is the leftmost domain
component.
Changes to :file:`ssl_multicert.config` can be applied to a running
-Traffic Server using :option:`traffic_line -x`.
+Traffic Server using :option:`traffic_ctl config reload`.
Format
======
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/reference/plugins/balancer.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/plugins/balancer.en.rst b/doc/reference/plugins/balancer.en.rst
index 6d443a5..b156028 100644
--- a/doc/reference/plugins/balancer.en.rst
+++ b/doc/reference/plugins/balancer.en.rst
@@ -79,5 +79,5 @@ servers, however the plugin is fully reloadable so health checking
is usualy simple to implement. Most production environments already
have mechanisms to check service health. It is recommended that you
write a simple script to monitor this information and rewrite
-:file:`remap.config` when appropriate. Running :option:`traffic_line -x`
+:file:`remap.config` when appropriate. Running :option:`traffic_ctl config reload`
will reload the ``balancer`` plugin with the new set of origin servers.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/reference/plugins/gzip.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/plugins/gzip.en.rst b/doc/reference/plugins/gzip.en.rst
index 2c7e59d..bf93688 100644
--- a/doc/reference/plugins/gzip.en.rst
+++ b/doc/reference/plugins/gzip.en.rst
@@ -49,9 +49,9 @@ Alternatively, a configuration can also be specified::
gzip.so <path-to-plugin>/sample.gzip.config
-After modifying plugin.config, restart traffic server (sudo
-traffic_line -L) the configuration is re-read when a management update
-is given (sudo traffic_line -x)
+After modifying plugin.config, restart traffic server (sudo traffic_ctl
+server restart) the configuration is also re-read when a management
+update is given (sudo traffic_ctl config reload)
Options
=======
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d028eda2/doc/reference/plugins/regex_remap.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/plugins/regex_remap.en.rst b/doc/reference/plugins/regex_remap.en.rst
index cb9d9f0..5a11047 100644
--- a/doc/reference/plugins/regex_remap.en.rst
+++ b/doc/reference/plugins/regex_remap.en.rst
@@ -51,7 +51,7 @@ most common matches appears early in the file. In order to force a
profile dump, you can do ::
$ sudo touch remap.config
- $ sudo traffic_line -x
+ $ sudo traffic_ctl config reload
By default, only the path and query string of the URL are provided for
the regular expressions to match. The following optional parameters can