trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bc...@apache.org
Subject [trafficserver] branch master updated: Removing traffic_cop reference in Admin Guide introduction.
Date Tue, 10 Dec 2019 21:20:19 GMT
This is an automated email from the ASF dual-hosted git repository.

bcall pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new f6dadd5  Removing traffic_cop reference in Admin Guide introduction.
f6dadd5 is described below

commit f6dadd5de44a994c0b0920ef171eaaa92d94e3b8
Author: bneradt <bneradt@riverbed.com>
AuthorDate: Fri Oct 4 15:15:50 2019 +0000

    Removing traffic_cop reference in Admin Guide introduction.
    
    The introduction to our Administrator's Guide referenced three processes but
    only described two: traffic_manager and traffic_server. The third process was
    probably traffic_cop. But we currently now only run with traffic_server and
    traffic_manager. This adjusts the number of referenced processes from three to
    two and removes the image which is not as helpful anymore with only two
    processes that collaborate.
---
 doc/admin-guide/introduction.en.rst |  14 +++-----------
 doc/static/images/admin/process.jpg | Bin 136229 -> 0 bytes
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/doc/admin-guide/introduction.en.rst b/doc/admin-guide/introduction.en.rst
index 06effa3..e006ed7 100644
--- a/doc/admin-guide/introduction.en.rst
+++ b/doc/admin-guide/introduction.en.rst
@@ -165,15 +165,15 @@ bindings in memory, DNS traffic is reduced.
 |TS| Processes
 --------------
 
-|TS| contains three processes that work together to serve
+|TS| contains two processes that work together to serve
 requests and manage, control, and monitor the health of the system.
 
--  The :program:`traffic_server` process is the transaction processing engine
+#. The :program:`traffic_server` process is the transaction processing engine
    of |TS|. It is responsible for accepting connections,
    processing protocol requests, and serving documents from the cache or
    origin server.
 
--  The :program:`traffic_manager` process is the command and control facility
+#. The :program:`traffic_manager` process is the command and control facility
    of the |TS|, responsible for launching, monitoring, and
    reconfiguring the :program:`traffic_server` process. The :program:`traffic_manager`
    process is also responsible for the proxy autoconfiguration port, the
@@ -187,14 +187,6 @@ requests and manage, control, and monitor the health of the system.
    first-served order. This connection queueing shields users from any
    server restart downtime.
 
-The figure below illustrates the |TS| processes.
-
-.. figure:: ../static/images/admin/process.jpg
-   :align: center
-   :alt: Illustration of the |TS| Processes
-
-   Illustration of the |TS| Processes
-
 Administration Tools
 --------------------
 
diff --git a/doc/static/images/admin/process.jpg b/doc/static/images/admin/process.jpg
deleted file mode 100644
index f683ac7..0000000
Binary files a/doc/static/images/admin/process.jpg and /dev/null differ


Mime
View raw message