You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by su...@apache.org on 2015/06/18 20:57:54 UTC
[1/2] trafficserver git commit: fix the image filename
Repository: trafficserver
Updated Branches:
refs/heads/master d9ebd4b5b -> faa286ed6
fix the image filename
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f7103424
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f7103424
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f7103424
Branch: refs/heads/master
Commit: f710342460b1d1c6e12736f6874c235a85f52df4
Parents: d9ebd4b
Author: Sudheer Vinukonda <su...@yahoo-inc.com>
Authored: Thu Jun 18 18:56:23 2015 +0000
Committer: Sudheer Vinukonda <su...@yahoo-inc.com>
Committed: Thu Jun 18 18:57:00 2015 +0000
----------------------------------------------------------------------
doc/admin/faqs.en.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f7103424/doc/admin/faqs.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/faqs.en.rst b/doc/admin/faqs.en.rst
index 71e4f5b..b05dd4a 100644
--- a/doc/admin/faqs.en.rst
+++ b/doc/admin/faqs.en.rst
@@ -606,7 +606,7 @@ other on the Origin side). Traffic Server supports two kinds of timers "Active"
"Inactive" timers for each side respectively, as applicable at a given state. The below
picture illustrates the specific timers run at various states in the current implementation.
-.. figure:: ../static/images/admin/transaction_states_timers.jpg
+.. figure:: ../static/images/admin/transaction_states_timers.png
:align: center
:alt: Active and Inactive Timers in various states
[2/2] trafficserver git commit: fix docs
Posted by su...@apache.org.
fix docs
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/faa286ed
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/faa286ed
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/faa286ed
Branch: refs/heads/master
Commit: faa286ed6c24d5821c1ff24d13d72999555ca61e
Parents: f710342
Author: Sudheer Vinukonda <su...@yahoo-inc.com>
Authored: Thu Jun 18 18:57:41 2015 +0000
Committer: Sudheer Vinukonda <su...@yahoo-inc.com>
Committed: Thu Jun 18 18:57:41 2015 +0000
----------------------------------------------------------------------
doc/admin/faqs.en.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/faa286ed/doc/admin/faqs.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/faqs.en.rst b/doc/admin/faqs.en.rst
index b05dd4a..a22c163 100644
--- a/doc/admin/faqs.en.rst
+++ b/doc/admin/faqs.en.rst
@@ -601,7 +601,7 @@ Timers applicable to various states in the transaction
-----------------------------------------------------
Traffic Server runs a variety of timers at various states of a transaction. Typically,
-a given transaction may involve upto two connections (one on the UA/client side and the
+a given transaction may include upto two connections (one on the UA/client side and the
other on the Origin side). Traffic Server supports two kinds of timers "Active" and
"Inactive" timers for each side respectively, as applicable at a given state. The below
picture illustrates the specific timers run at various states in the current implementation.