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/07/09 18:53:36 UTC
trafficserver git commit: another attempt at getting the docs
formatting right.
Repository: trafficserver
Updated Branches:
refs/heads/master c8c5ba881 -> 53282ff4a
another attempt at getting the docs formatting right.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/53282ff4
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/53282ff4
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/53282ff4
Branch: refs/heads/master
Commit: 53282ff4a92cfcf4474a2562e6918f0b9196c74a
Parents: c8c5ba8
Author: Sudheer Vinukonda <su...@yahoo-inc.com>
Authored: Thu Jul 9 16:52:40 2015 +0000
Committer: Sudheer Vinukonda <su...@yahoo-inc.com>
Committed: Thu Jul 9 16:53:26 2015 +0000
----------------------------------------------------------------------
doc/admin/faqs.en.rst | 6 ------
doc/sdk/http-hooks-and-transactions.en.rst | 7 ++++++-
doc/sdk/trafficserver-timers.en.rst | 20 ++++++++++++++++++++
3 files changed, 26 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/53282ff4/doc/admin/faqs.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/faqs.en.rst b/doc/admin/faqs.en.rst
index bcf30c3..add1888 100644
--- a/doc/admin/faqs.en.rst
+++ b/doc/admin/faqs.en.rst
@@ -607,9 +607,3 @@ performance on your origin servers, you may adjust the origin connection timeout
in Traffic Server by changing :ts:cv:`proxy.config.http.connect_attempts_timeout`
in :file:`records.config` to a larger value.
-Timers applicable to various states in a transaction
------------------------------------------------------
-
-For an overview of HTTP transaction timers, refer to the transaction timer diagram
-in :file:`trafficserver-timers`.
-
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/53282ff4/doc/sdk/http-hooks-and-transactions.en.rst
----------------------------------------------------------------------
diff --git a/doc/sdk/http-hooks-and-transactions.en.rst b/doc/sdk/http-hooks-and-transactions.en.rst
index 944f02d..3809465 100644
--- a/doc/sdk/http-hooks-and-transactions.en.rst
+++ b/doc/sdk/http-hooks-and-transactions.en.rst
@@ -146,5 +146,10 @@ Timers applicable to various states in a transaction
-----------------------------------------------------
For an overview of HTTP transaction timers, refer to the transaction timer diagram
-in :file:`trafficserver-timers`.
+below.
+
+.. toctree::
+ :maxdepth: 1
+
+ Transaction Timers: <trafficserver-timers.en>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/53282ff4/doc/sdk/trafficserver-timers.en.rst
----------------------------------------------------------------------
diff --git a/doc/sdk/trafficserver-timers.en.rst b/doc/sdk/trafficserver-timers.en.rst
index fe64a34..fed0cc8 100644
--- a/doc/sdk/trafficserver-timers.en.rst
+++ b/doc/sdk/trafficserver-timers.en.rst
@@ -1,3 +1,23 @@
+Transaction Timers
+******************
+
+.. Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
Timers applicable to various states in a transaction
-----------------------------------------------------