trafficcontrol-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dang...@apache.org
Subject [44/51] [abbrv] [partial] incubator-trafficcontrol-website git commit: copy 1.8.1 docs to latest
Date Wed, 07 Jun 2017 23:28:58 GMT
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/9c7fc09d/docs/latest/_sources/admin/traffic_vault.rst.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/admin/traffic_vault.rst.txt b/docs/latest/_sources/admin/traffic_vault.rst.txt
new file mode 100644
index 0000000..35be160
--- /dev/null
+++ b/docs/latest/_sources/admin/traffic_vault.rst.txt
@@ -0,0 +1,195 @@
+..
+..
+.. Licensed 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.
+..
+
+****************************
+Traffic Vault Administration
+****************************
+Installing Traffic Vault
+========================
+In order to successfully store private keys you will need to install Riak.
+The latest version of Riak can be downloaded on the Riak `website <http://docs.basho.com/riak/latest/downloads/>`_.
+The installation instructions for Riak can be found `here <http://docs.basho.com/riak/latest/ops/building/installing/>`_.
+
+Production is currently running version 2.0.5 of Riak, but the latest version should suffice.
+
+
+Configuring Traffic Vault
+=========================
+The following steps were taken to configure Riak in our environments.
+
+Riak configuration file configuration
+-------------------------------------
+
+The following steps need to be performed on each Riak server in the cluster:
+
+* Log into riak server as root
+
+* cd to /etc/riak/
+
+* Update the following in riak.conf to reflect your IP:
+	- nodename = riak@a-host.sys.kabletown.net
+	- listener.http.internal = a-host.sys.kabletown.net:8098 (can be 80 - This endpoint will not work with sec enabled)
+	- listener.protobuf.internal = a-host.sys.kabletown.net:8087 (can be different port if you want)
+	- listener.https.internal = a-host.sys.kabletown.net:8088 (can be 443)
+
+* Updated the following conf file to point to your cert files
+	- ssl.certfile = /etc/riak/certs/server.crt
+	- ssl.keyfile = /etc/riak/certs/server.key
+	- ssl.cacertfile = /etc/pki/tls/certs/ca-bundle.crt
+
+* Add a line at the bottom of the config for tlsv1
+	- tls_protocols.tlsv1 = on
+
+* Once the config file has been updated restart riak
+	- ``/etc/init.d/riak restart``
+
+* Validate server is running by going to the following URL:
+ 	- https://<serverHostname>:8088/ping
+
+Riak-admin configuration
+-------------------------
+
+Riak-admin is a command line utility that needs to be run as root on a server in the riak cluster.
+
+Assumptions:
+	* Riak 2.0.2 or greater is installed
+	* SSL Certificates have been generated (signed or self-signed)
+	* Root access to riak servers
+
+Add admin user and riakuser to riak
+	* Admin user will be a super user
+	* Riakuser will be the application user
+
+Login to one of the riak servers in the cluster as root (any will do)
+
+	1. Enable security
+
+		``riak-admin security enable``
+
+	2. Add groups
+
+		``riak-admin security add-group admins``
+
+		``riak-admin security add-group keysusers``
+	3. Add users
+
+	 .. Note:: username and password should be stored in /opt/traffic_ops/app/conf/<environment>/riak.conf
+	 ..
+
+		``riak-admin security add-user admin password=<AdminPassword> groups=admins``
+
+		``riak-admin security add-user riakuser password=<RiakUserPassword> groups=keysusers``
+
+	4. Grant access for admin and riakuser
+
+		``riak-admin security add-source riakuser 0.0.0.0/0 password``
+
+		``riak-admin security add-source admin 0.0.0.0/0 password``
+
+	5. Grant privs to admins for everything
+
+		``riak-admin security grant riak_kv.list_buckets,riak_kv.list_keys,riak_kv.get,riak_kv.put,riak_kv.delete on any to admins``
+
+	6. Grant privs to keysuser for ssl, dnssec, and url_sig_keys buckets only
+
+		``riak-admin security grant riak_kv.get,riak_kv.put,riak_kv.delete on default ssl to keysusers``
+
+		``riak-admin security grant riak_kv.get,riak_kv.put,riak_kv.delete on default dnssec to keysusers``
+
+		``riak-admin security grant riak_kv.get,riak_kv.put,riak_kv.delete on default url_sig_keys to keysusers``
+
+.. seealso:: For more information on security in Riak, see the `Riak Security documentation <http://docs.basho.com/riak/2.0.4/ops/advanced/security/>`_.
+.. seealso:: For more information on authentication and authorization in Riak, see the `Riak Authentication and Authorization documentation <http://docs.basho.com/riak/2.0.4/ops/running/authz/>`_.
+
+
+Traffic Ops Configuration
+-------------------------
+
+There are a couple configurations that are necessary in Traffic Ops.
+
+1. Database Updates
+	* A new profile for Riak needs to be added to the profile table
+	* A new type of Riak needs to be added to the type table
+	* The servers in the Riak cluster need to be added to the server table
+
+	 .. Note:: profile and type data should be pre-loaded by seeds sql script.
+	 ..
+
+2. Configuration updates
+	* /opt/traffic_ops/app/conf/<environment>/riak.conf needs to be updated to reflect the correct username and password for accessing riak.
+
+Configuring Riak Search
+=======================
+
+In order to more effectively support retrieval of SSL certificates by Traffic Router and Traffic Ops ORT, Traffic Vault uses `Riak search <http://docs.basho.com/riak/kv/latest/using/reference/search/>`_.  Riak Search uses `Apache Solr <http://lucene.apache.org/solr>`_ for indexing and searching of records.  The following explains how to enable, configure, and validate Riak Search.
+
+Riak Configuration
+------------------
+
+On Each Riak Server:
+
+1. If java is not already installed on your Riak server, install Java
+	* To see if Java is already installed: ``java -version``
+	* To install Java: ``yum install -y jdk``
+
+2. enable search in riak.conf
+	* ``vim /etc/riak/riak.conf``
+	* look for search and change ``search = off`` to ``search = on``
+
+3. Restart Riak so search is on
+	* ``service riak restart``
+
+One time configuration:
+
+1. **On one of the Riak servers in the cluster run the following riak-admin commands**
+
+``riak-admin security grant search.admin on schema to admin``
+
+``riak-admin security grant search.admin on index to admin``
+
+``riak-admin security grant search.query on index to admin``
+
+``riak-admin security grant search.query on index sslkeys to admin``
+
+``riak-admin security grant search.query on index to riakuser``
+
+``riak-admin security grant search.query on index sslkeys to riakuser``
+
+``riak-admin security grant riak_core.set_bucket on any to admin``
+
+2. Add the search schema to Riak.  This schema is a simple Apache Solr configuration file which will index all records on cdn, hostname, and deliveryservice.
+	* Get the schema file by either cloning the project and going to `traffic_ops/app/config/misc/riak_search` or from `github <https://github.com/apache/incubator-trafficcontrol/tree/master/traffic_ops/app/conf/misc/riak_search>`_.
+	* Use curl to add the schema to riak: ``curl -kvs -XPUT "https://admin:pass@riakserver:8088/search/schema/sslkeys" -H 'Content-Type:application/xml'  -d @sslkeys.xml``
+
+3. Add search index to Riak
+	* run the following curl command:  ``curl -kvs -XPUT "https://admin:pass@riakserver:8088/search/index/sslkeys" -H 'Content-Type: application/json' -d '{"schema":"sslkeys"}'``
+
+4. Associate the sslkeys index to the ssl bucket in Riak
+	* run the following curl command: ``curl -kvs -XPUT "https://admin:pass@riakserver:8088/buckets/ssl/props" -H'content-type:application/json' -d'{"props":{"search_index":"sslkeys"}}'``
+
+Riak Search (using Apache Solr) will now index all NEW records that are added to the "ssl" bucket.  The cdn, deliveryservice, and hostname fields are indexed and when a search is performed riak will return the indexed fields along with the crt and key values for a ssl record.  In order to add the indexed fields to current records and to get the current records added, a standalone script needs to be run.  The following explains how to run the script.
+
+1. Get script from github either by cloning the project and going to `traffic_ops/app/script` or from `here <https://github.com/apache/incubator-trafficcontrol/blob/master/traffic_ops/app/script/update_riak_for_search.pl>`_
+2. Run the script by performing the following command ``./update_riak_for_search.pl -to_url=https://traffic-ops.kabletown.net -to_un=user -to_pw=password``
+
+Validate the search is working by querying against Riak directly:
+``curl -kvs "https://admin:password@riakserver:8088/search/query/sslkeys?wt=json&q=cdn:mycdn"``
+
+Validation can also be done by querying Traffic Ops:
+``curl -Lvs -H "Cookie: $COOKIE" https://traffic-ops.kabletown.net/api/1.2/cdns/name/mycdn/sslkeys.json``
+
+
+
+

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/9c7fc09d/docs/latest/_sources/admin/traffic_vault.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/admin/traffic_vault.txt b/docs/latest/_sources/admin/traffic_vault.txt
deleted file mode 100644
index d50ef25..0000000
--- a/docs/latest/_sources/admin/traffic_vault.txt
+++ /dev/null
@@ -1,195 +0,0 @@
-..
-..
-.. Licensed 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.
-..
-
-****************************
-Traffic Vault Administration
-****************************
-Installing Traffic Vault
-========================
-In order to successfully store private keys you will need to install Riak.
-The latest version of Riak can be downloaded on the Riak `website <http://docs.basho.com/riak/latest/downloads/>`_.
-The installation instructions for Riak can be found `here <http://docs.basho.com/riak/latest/ops/building/installing/>`__.
-
-Production is currently running version 2.0.5 of Riak, but the latest version should suffice.
-
-
-Configuring Traffic Vault
-=========================
-The following steps were taken to configure Riak in our environments.
-
-Riak configuration file configuration
--------------------------------------
-
-The following steps need to be performed on each Riak server in the cluster:
-
-* Log into riak server as root
-
-* cd to /etc/riak/
-
-* Update the following in riak.conf to reflect your IP:
-	- nodename = riak@a-host.sys.kabletown.net
-	- listener.http.internal = a-host.sys.kabletown.net:8098 (can be 80 - This endpoint will not work with sec enabled)
-	- listener.protobuf.internal = a-host.sys.kabletown.net:8087 (can be different port if you want)
-	- listener.https.internal = a-host.sys.kabletown.net:8088 (can be 443)
-
-* Updated the following conf file to point to your cert files
-	- ssl.certfile = /etc/riak/certs/server.crt
-	- ssl.keyfile = /etc/riak/certs/server.key
-	- ssl.cacertfile = /etc/pki/tls/certs/ca-bundle.crt
-
-* Add a line at the bottom of the config for tlsv1
-	- tls_protocols.tlsv1 = on
-
-* Once the config file has been updated restart riak
-	- ``/etc/init.d/riak restart``
-
-* Validate server is running by going to the following URL:
- 	- https://<serverHostname>:8088/ping
-
-Riak-admin configuration
--------------------------
-
-Riak-admin is a command line utility that needs to be run as root on a server in the riak cluster.
-
-Assumptions:
-	* Riak 2.0.2 or greater is installed
-	* SSL Certificates have been generated (signed or self-signed)
-	* Root access to riak servers
-
-Add admin user and riakuser to riak
-	* Admin user will be a super user
-	* Riakuser will be the application user
-
-Login to one of the riak servers in the cluster as root (any will do)
-
-	1. Enable security
-
-		``riak-admin security enable``
-
-	2. Add groups
-
-		``riak-admin security add-group admins``
-
-		``riak-admin security add-group keysusers``
-	3. Add users
-
-	 .. Note:: username and password should be stored in /opt/traffic_ops/app/conf/<environment>/riak.conf
-	 ..
-
-		``riak-admin security add-user admin password=<AdminPassword> groups=admins``
-
-		``riak-admin security add-user riakuser password=<RiakUserPassword> groups=keysusers``
-
-	4. Grant access for admin and riakuser
-
-		``riak-admin security add-source riakuser 0.0.0.0/0 password``
-
-		``riak-admin security add-source admin 0.0.0.0/0 password``
-
-	5. Grant privs to admins for everything
-
-		``riak-admin security grant riak_kv.list_buckets,riak_kv.list_keys,riak_kv.get,riak_kv.put,riak_kv.delete on any to admins``
-
-	6. Grant privs to keysuser for ssl, dnssec, and url_sig_keys buckets only
-
-		``riak-admin security grant riak_kv.get,riak_kv.put,riak_kv.delete on default ssl to keysusers``
-
-		``riak-admin security grant riak_kv.get,riak_kv.put,riak_kv.delete on default dnssec to keysusers``
-
-		``riak-admin security grant riak_kv.get,riak_kv.put,riak_kv.delete on default url_sig_keys to keysusers``
-
-.. seealso:: For more information on security in Riak, see the `Riak Security documentation <http://docs.basho.com/riak/2.0.4/ops/advanced/security/>`_.
-.. seealso:: For more information on authentication and authorization in Riak, see the `Riak Authentication and Authorization documentation <http://docs.basho.com/riak/2.0.4/ops/running/authz/>`_.
-
-
-Traffic Ops Configuration
--------------------------
-
-There are a couple configurations that are necessary in Traffic Ops.
-
-1. Database Updates
-	* A new profile for Riak needs to be added to the profile table
-	* A new type of Riak needs to be added to the type table
-	* The servers in the Riak cluster need to be added to the server table
-
-	 .. Note:: profile and type data should be pre-loaded by seeds sql script.
-	 ..
-
-2. Configuration updates
-	* /opt/traffic_ops/app/conf/<environment>/riak.conf needs to be updated to reflect the correct username and password for accessing riak.
-
-Configuring Riak Search
-=======================
-
-In order to more effectively support retrieval of SSL certificates by Traffic Router and Traffic Ops ORT, Traffic Vault uses `Riak search <http://docs.basho.com/riak/kv/latest/using/reference/search/>`_.  Riak Search uses `Apache Solr <http://lucene.apache.org/solr>`_ for indexing and searching of records.  The following explains how to enable, configure, and validate Riak Search.
-
-Riak Configuration
-------------------
-
-On Each Riak Server:
-
-1. If java is not already installed on your Riak server, install Java
-	* To see if Java is already installed: ``java -version``
-	* To install Java: ``yum install -y jdk``
-
-2. enable search in riak.conf
-	* ``vim /etc/riak/riak.conf``
-	* look for search and change ``search = off`` to ``search = on``
-
-3. Restart Riak so search is on
-	* ``service riak restart``
-
-One time configuration:
-
-1. **On one of the Riak servers in the cluster run the following riak-admin commands**
-
-``riak-admin security grant search.admin on schema to admin``
-
-``riak-admin security grant search.admin on index to admin``
-
-``riak-admin security grant search.query on index to admin``
-
-``riak-admin security grant search.query on index sslkeys to admin``
-
-``riak-admin security grant search.query on index to riakuser``
-
-``riak-admin security grant search.query on index sslkeys to riakuser``
-
-``riak-admin security grant riak_core.set_bucket on any to admin``
-
-2. Add the search schema to Riak.  This schema is a simple Apache Solr configuration file which will index all records on cdn, hostname, and deliveryservice.
-	* Get the schema file by either cloning the project and going to `traffic_ops/app/config/misc/riak_search` or from `github <https://github.com/apache/incubator-trafficcontrol/tree/master/traffic_ops/app/conf/misc/riak_search>`_.
-	* Use curl to add the schema to riak: ``curl -kvs -XPUT "https://admin:pass@riakserver:8088/search/schema/sslkeys" -H 'Content-Type:application/xml'  -d @sslkeys.xml``
-
-3. Add search index to Riak
-	* run the following curl command:  ``curl -kvs -XPUT "https://admin:pass@riakserver:8088/search/index/sslkeys" -H 'Content-Type: application/json' -d '{"schema":"sslkeys"}'``
-
-4. Associate the sslkeys index to the ssl bucket in Riak
-	* run the following curl command: ``curl -kvs -XPUT "https://admin:pass@riakserver:8088/buckets/ssl/props" -H'content-type:application/json' -d'{"props":{"search_index":"sslkeys"}}'``
-
-Riak Search (using Apache Solr) will now index all NEW records that are added to the "ssl" bucket.  The cdn, deliveryservice, and hostname fields are indexed and when a search is performed riak will return the indexed fields along with the crt and key values for a ssl record.  In order to add the indexed fields to current records and to get the current records added, a standalone script needs to be run.  The following explains how to run the script.
-
-1. Get script from github either by cloning the project and going to `traffic_ops/app/script` or from `here <https://github.com/apache/incubator-trafficcontrol/blob/master/traffic_ops/app/script/update_riak_for_search.pl>`_
-2. Run the script by performing the following command ``./update_riak_for_search.pl -to_url=https://traffic-ops.kabletown.net -to_un=user -to_pw=password``
-
-Validate the search is working by querying against Riak directly:
-``curl -kvs "https://admin:password@riakserver:8088/search/query/sslkeys?wt=json&q=cdn:mycdn"``
-
-Validation can also be done by querying Traffic Ops:
-``curl -Lvs -H "Cookie: $COOKIE" https://traffic-ops.kabletown.net/api/1.2/cdns/name/mycdn/sslkeys.json``
-
-
-
-

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/9c7fc09d/docs/latest/_sources/basics/cache_revalidation.rst.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/basics/cache_revalidation.rst.txt b/docs/latest/_sources/basics/cache_revalidation.rst.txt
new file mode 100644
index 0000000..dc57346
--- /dev/null
+++ b/docs/latest/_sources/basics/cache_revalidation.rst.txt
@@ -0,0 +1,71 @@
+.. 
+.. 
+.. Licensed 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.
+.. 
+
+.. index::
+	Cache Control Header
+	Revalidation
+	HTTP 304
+	
+Cache Control Headers and Revalidation
+======================================
+The `HTTP/1.1 spec <https://www.ietf.org/rfc/rfc2616.txt>`_ allows for origin servers and clients to influence how caches treat their requests and responses. By default, the Traffic Control CDN will honor cache control headers. Most commonly, origin servers will tell the downstream caches how long a response can be cached::
+
+  HTTP/1.1 200 OK
+  Date: Sun, 14 Dec 2014 23:22:44 GMT
+  Server: Apache/2.2.15 (Red Hat)
+  Last-Modified: Sun, 14 Dec 2014 23:18:51 GMT
+  ETag: "1aa008f-2d-50a3559482cc0"
+  Cache-Control: max-age=86400
+  Content-Length: 45
+  Connection: close
+  Content-Type: text/html; charset=UTF-8
+
+  <html><body>This is a fun file</body></html>
+
+In the above response, the origin server tells downstream caching systems that the maximum time to cache this response for is 86400 seconds. The origin can also add a ``Expires:`` header, explicitly telling the cache the time this response is to be expired. When a response is expired it usually doesn't get deleted from the cache, but, when a request comes in that would have hit on this response if it was not expired, the cache *revalidates* the response. In stead of requesting the object again from the origin server, the cache will send a request to the origin indicating what version of the response it has, and asking if it has changed. If it changed, the server will send a ``200 OK`` response, with the new data. If it has not changed, the origin server will send back a ``304 Not Modified`` response indicating the response is still valid, and that the cache can reset the timer on the response expiration. To indicate what version the client (cache) has it will add an ``If-Not-Modifie
 d-Since:`` header, or an ``If-None-Match:`` header.  For example, in the ``If-None-Match:`` case, the origin will send and ``ETag`` header that uniquely identifies the response. The client can use that in an revalidation request like::
+
+	GET /foo/bar/fun.html HTTP/1.1
+	If-None-Match: "1aa008f-2d-50a3559482cc0"
+	Host: www.origin.com
+
+If the content has changed (meaning, the new response would not have had the same ETag) it will respond with ``200 OK``, like::
+
+  HTTP/1.1 200 OK
+  Date: Sun, 18 Dec 2014 3:22:44 GMT
+  Server: Apache/2.2.15 (Red Hat)
+  Last-Modified: Sun, 14 Dec 2014 23:18:51 GMT
+  ETag: "1aa008f-2d-50aa00feadd"
+  Cache-Control: max-age=604800
+  Content-Length: 49
+  Connection: close
+  Content-Type: text/html; charset=UTF-8
+
+  <html><body>This is NOT a fun file</body></html>
+
+
+If the Content did not change (meaning, the response would have had the same ETag) it will respond with ``304 Not Modified``, like::
+
+  304 Not Modified
+  Date: Sun, 18 Dec 2014 3:22:44 GMT
+  Server: Apache/2.2.15 (Red Hat)
+  Last-Modified: Sun, 14 Dec 2014 23:18:51 GMT
+  ETag: "1aa008f-2d-50a3559482cc0"
+  Cache-Control: max-age=604800
+  Content-Length: 45
+  Connection: close
+  Content-Type: text/html; charset=UTF-8
+
+Note that the 304 response only has headers, not the data.
+ 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/9c7fc09d/docs/latest/_sources/basics/cache_revalidation.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/basics/cache_revalidation.txt b/docs/latest/_sources/basics/cache_revalidation.txt
deleted file mode 100644
index dc57346..0000000
--- a/docs/latest/_sources/basics/cache_revalidation.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-.. 
-.. 
-.. Licensed 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.
-.. 
-
-.. index::
-	Cache Control Header
-	Revalidation
-	HTTP 304
-	
-Cache Control Headers and Revalidation
-======================================
-The `HTTP/1.1 spec <https://www.ietf.org/rfc/rfc2616.txt>`_ allows for origin servers and clients to influence how caches treat their requests and responses. By default, the Traffic Control CDN will honor cache control headers. Most commonly, origin servers will tell the downstream caches how long a response can be cached::
-
-  HTTP/1.1 200 OK
-  Date: Sun, 14 Dec 2014 23:22:44 GMT
-  Server: Apache/2.2.15 (Red Hat)
-  Last-Modified: Sun, 14 Dec 2014 23:18:51 GMT
-  ETag: "1aa008f-2d-50a3559482cc0"
-  Cache-Control: max-age=86400
-  Content-Length: 45
-  Connection: close
-  Content-Type: text/html; charset=UTF-8
-
-  <html><body>This is a fun file</body></html>
-
-In the above response, the origin server tells downstream caching systems that the maximum time to cache this response for is 86400 seconds. The origin can also add a ``Expires:`` header, explicitly telling the cache the time this response is to be expired. When a response is expired it usually doesn't get deleted from the cache, but, when a request comes in that would have hit on this response if it was not expired, the cache *revalidates* the response. In stead of requesting the object again from the origin server, the cache will send a request to the origin indicating what version of the response it has, and asking if it has changed. If it changed, the server will send a ``200 OK`` response, with the new data. If it has not changed, the origin server will send back a ``304 Not Modified`` response indicating the response is still valid, and that the cache can reset the timer on the response expiration. To indicate what version the client (cache) has it will add an ``If-Not-Modifie
 d-Since:`` header, or an ``If-None-Match:`` header.  For example, in the ``If-None-Match:`` case, the origin will send and ``ETag`` header that uniquely identifies the response. The client can use that in an revalidation request like::
-
-	GET /foo/bar/fun.html HTTP/1.1
-	If-None-Match: "1aa008f-2d-50a3559482cc0"
-	Host: www.origin.com
-
-If the content has changed (meaning, the new response would not have had the same ETag) it will respond with ``200 OK``, like::
-
-  HTTP/1.1 200 OK
-  Date: Sun, 18 Dec 2014 3:22:44 GMT
-  Server: Apache/2.2.15 (Red Hat)
-  Last-Modified: Sun, 14 Dec 2014 23:18:51 GMT
-  ETag: "1aa008f-2d-50aa00feadd"
-  Cache-Control: max-age=604800
-  Content-Length: 49
-  Connection: close
-  Content-Type: text/html; charset=UTF-8
-
-  <html><body>This is NOT a fun file</body></html>
-
-
-If the Content did not change (meaning, the response would have had the same ETag) it will respond with ``304 Not Modified``, like::
-
-  304 Not Modified
-  Date: Sun, 18 Dec 2014 3:22:44 GMT
-  Server: Apache/2.2.15 (Red Hat)
-  Last-Modified: Sun, 14 Dec 2014 23:18:51 GMT
-  ETag: "1aa008f-2d-50a3559482cc0"
-  Cache-Control: max-age=604800
-  Content-Length: 45
-  Connection: close
-  Content-Type: text/html; charset=UTF-8
-
-Note that the 304 response only has headers, not the data.
- 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/9c7fc09d/docs/latest/_sources/basics/caching_proxies.rst.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/basics/caching_proxies.rst.txt b/docs/latest/_sources/basics/caching_proxies.rst.txt
new file mode 100644
index 0000000..af93730
--- /dev/null
+++ b/docs/latest/_sources/basics/caching_proxies.rst.txt
@@ -0,0 +1,238 @@
+.. 
+.. 
+.. Licensed 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.
+.. 
+
+
+.. |arrow| image:: fwda.png
+
+.. _rl-caching_proxy:
+
+Caching Proxies
+===============
+The main function of a CDN is to proxy requests from clients to origin servers 
+and cache the results. 
+To proxy, in the CDN context, is to obtain content using HTTP from an origin 
+server on behalf of a client. To cache is to store the results so they can be 
+reused when other clients are requesting the same content. There are three 
+types of proxies in use on the Internet today which are described below.
+
+.. index::
+  Reverse Proxy
+
+.. _rl-rev-proxy:
+
+|arrow| Reverse Proxy
+---------------------
+  A reverse proxy acts on behalf of the origin server. The client is mostly unaware it is communicating with a proxy and not the actual origin. 
+  All EDGE caches in a Traffic Control CDN are reverse proxies. 
+  To the end user a Traffic Control based CDN appears as a reverse proxy since 
+  it retrieves content from the origin server, acting on behalf of that origin server. The client requests a URL that has 
+  a hostname which resolves to the reverse proxy's IP address and, in compliance 
+  with the HTTP 1.1 specification, the client sends a ``Host:`` header to the reverse 
+  proxy that matches the hostname in the URL. 
+  The proxy looks up this hostname in a 
+  list of mappings to find the origin hostname; if the hostname of the Host header is not found in the list, 
+  the proxy will send an error (``404 Not Found``) to the client. 
+  If the supplied hostname is found in this list of mappings, the proxy checks the cache, and when the content is not already present, connects to the 
+  origin the requested ``Host:`` maps to and requests the path of the original URL, providing the origin hostname in the ``Host`` header.  The proxy then stores the URL in cache and serves the contents to the client. When there are subsequent requests for 
+  the same URL, a caching proxy serves the content out of cache thereby reducing 
+  latency and network traffic.
+
+.. seealso:: `ATS documentation on reverse proxy <https://docs.trafficserver.apache.org/en/latest/admin/reverse-proxy-http-redirects.en.html#http-reverse-proxy>`_.
+
+To insert a reverse proxy into the previous HTTP 1.1 example, the reverse proxy requires provisioning 
+for ``www.origin.com``. By adding a remap rule to the cache, the reverse proxy then maps requests to 
+this origin. The content owner must inform the clients, by updating the URL, to receive the content 
+from the cache and not from the origin server directly. For this example, the remap rule on the 
+cache is: ``http://www-origin-cache.cdn.com http://www.origin.com``.
+
+..  Note:: In the previous example minimal headers were shown on both the request and response. In the examples that follow, the origin server response is more realistic. 
+
+::
+
+  HTTP/1.1 200 OK
+  Date: Sun, 14 Dec 2014 23:22:44 GMT
+  Server: Apache/2.2.15 (Red Hat)
+  Last-Modified: Sun, 14 Dec 2014 23:18:51 GMT
+  ETag: "1aa008f-2d-50a3559482cc0"
+  Content-Length: 45
+  Connection: close
+  Content-Type: text/html; charset=UTF-8
+
+  <html><body>This is a fun file</body></html>
+
+The client is given the URL ``http://www-origin-cache.cdn.com/foo/bar/fun.html`` (note the different hostname) and when attempting to obtain that URL, the following occurs:
+
+1. The client sends a request to the LDNS server to resolve the name ``www-origin-cache.cdn.com`` to an IPv4 address.
+
+2. Similar to the previous case, the LDNS server resolves the name ``www-origin-cache.cdn.com`` to an IPv4 address, in this example, this address is 55.44.33.22.
+
+3. The client opens a TCP connection from a random port locally, to port 80 (the HTTP default) on 55.44.33.22, and sends the following: ::
+
+    GET /foo/bar/fun.html HTTP/1.1
+    Host: www-origin-cache.cdn.com
+
+4. The reverse proxy looks up ``www-origin-cache.cdn.com`` in its remap rules, and finds the origin is ``www.origin.com``.
+
+5. The proxy checks its cache to see if the response for ``http://www-origin-cache.cdn.com/foo/bar/fun.html`` is already in the cache.
+
+6a. If the response is not in the cache:
+
+  1. The proxy uses DNS to get the IPv4 address for ``www.origin.com``, connect to it on port 80, and sends: ::
+
+   	GET /foo/bar/fun.html HTTP/1.1
+   	Host: www.origin.com
+
+  2. The origin server responds with the headers and content as shown: ::
+
+      HTTP/1.1 200 OK
+      Date: Sun, 14 Dec 2014 23:22:44 GMT
+      Server: Apache/2.2.15 (Red Hat)
+      Last-Modified: Sun, 14 Dec 2014 23:18:51 GMT
+      ETag: "1aa008f-2d-50a3559482cc0"
+      Content-Length: 45
+      Connection: close
+      Content-Type: text/html; charset=UTF-8
+
+      <html><body>This is a fun file</body></html>
+
+  3. The proxy sends the origin response on to the client adding a ``Via:`` header (and maybe others): ::
+
+      HTTP/1.1 200 OK
+      Date: Sun, 14 Dec 2014 23:22:44 GMT
+      Last-Modified: Sun, 14 Dec 2014 23:18:51 GMT
+      ETag: "1aa008f-2d-50a3559482cc0"
+      Content-Length: 45
+      Connection: close
+      Content-Type: text/html; charset=UTF-8
+      Age: 0
+      Via: http/1.1 cache01.cdn.kabletown.net (ApacheTrafficServer/4.2.1 [uScSsSfUpSeN:t cCSi p sS])
+      Server: ATS/4.2.1
+
+    	<html><body>This is a fun file</body></html>
+
+6b. If it *is* in the cache:
+ 
+  The proxy responds to the client with the previously retrieved result: ::
+
+      HTTP/1.1 200 OK
+      Date: Sun, 14 Dec 2014 23:22:44 GMT
+      Last-Modified: Sun, 14 Dec 2014 23:18:51 GMT
+      ETag: "1aa008f-2d-50a3559482cc0"
+      Content-Length: 45
+      Connection: close
+      Content-Type: text/html; charset=UTF-8
+      Age: 39711
+      Via: http/1.1 cache01.cdn.kabletown.net (ApacheTrafficServer/4.2.1 [uScSsSfUpSeN:t cCSi p sS])
+      Server: ATS/4.2.1
+
+      <html><body>This is a fun file</body></html>
+
+
+.. index::
+  Forward Proxy
+
+.. _rl-fwd-proxy:
+
+|arrow| Forward Proxy
+---------------------
+  A forward proxy acts on behalf of the client. The origin server is mostly 
+  unaware of the proxy, the client requests the proxy to retrieve content from a 
+  particular origin server. All MID caches in a Traffic Control based CDN are 
+  forward proxies. In a forward proxy scenario, the client is explicitely configured  to use the
+  the proxy's IP address and port as a forward proxy. The client always connects to the forward 
+  proxy for content. The content provider does not have to change the URL the 
+  client obtains, and is unaware of the proxy in the middle. 
+
+..  seealso:: `ATS documentation on forward proxy <https://docs.trafficserver.apache.org/en/latest/admin/forward-proxy.en.html>`_.
+
+Below is an example of the client retrieving the URL ``http://www.origin.com/foo/bar/fun.html`` through a forward proxy:
+
+1. The client requires configuration to use the proxy, as opposed to the reverse proxy example. Assume the client configuration is through preferences entries or other to use the proxy IP address 99.88.77.66 and proxy port 8080.
+
+2. To retrieve ``http://www.origin.com/foo/bar/fun.html`` URL, the client connects to 99.88.77.66 on port 8080 and sends: 
+ 
+ ::
+
+  GET http://www.origin.com/foo/bar/fun.html HTTP/1.1
+
+
+ ..  Note:: In this case, the client places the entire URL after GET, including protocol and hostname (``http://www.origin.com``),  but in the reverse proxy and direct-to-origin case it  puts only the path portion of the URL (``/foo/bar/fun.html``) after the GET. 
+
+3. The proxy verifies whether the response for ``http://www-origin-cache.cdn.com/foo/bar/fun.html`` is already in the cache.
+
+4a. If it is not in the cache:
+
+  1. The proxy uses DNS to obtain the IPv4 address for ``www.origin.com``, connects to it on port 80, and sends: ::
+
+
+      GET /foo/bar/fun.html HTTP/1.1
+      Host: www.origin.com
+
+
+  2. The origin server responds with the headers and content as shown below: ::
+
+
+      HTTP/1.1 200 OK
+      Date: Sun, 14 Dec 2014 23:22:44 GMT
+      Server: Apache/2.2.15 (Red Hat)
+      Last-Modified: Sun, 14 Dec 2014 23:18:51 GMT
+      ETag: "1aa008f-2d-50a3559482cc0"
+      Content-Length: 45
+      Connection: close
+      Content-Type: text/html; charset=UTF-8
+
+      <html><body>This is a fun file</body></html>
+
+
+  3. The proxy sends this on to the client adding a ``Via:`` header (and maybe others): ::
+
+      HTTP/1.1 200 OK
+      Date: Sun, 14 Dec 2014 23:22:44 GMT
+      Last-Modified: Sun, 14 Dec 2014 23:18:51 GMT
+      ETag: "1aa008f-2d-50a3559482cc0"
+      Content-Length: 45
+      Connection: close
+      Content-Type: text/html; charset=UTF-8
+      Age: 0
+      Via: http/1.1 cache01.cdn.kabletown.net (ApacheTrafficServer/4.2.1 [uScSsSfUpSeN:t cCSi p sS])
+      Server: ATS/4.2.1
+          
+      <html><body>This is a fun file</body></html>
+
+
+4b. If it *is* in the cache:
+ 
+  The proxy responds to the client with the previously retrieved result: ::
+
+    HTTP/1.1 200 OK
+    Date: Sun, 14 Dec 2014 23:22:44 GMT
+    Last-Modified: Sun, 14 Dec 2014 23:18:51 GMT
+    ETag: "1aa008f-2d-50a3559482cc0"
+    Content-Length: 45
+    Connection: close
+    Content-Type: text/html; charset=UTF-8
+    Age: 99711
+    Via: http/1.1 cache01.cdn.kabletown.net (ApacheTrafficServer/4.2.1 [uScSsSfUpSeN:t cCSi p sS])
+    Server: ATS/4.2.1
+          
+    <html><body>This is a fun file</body></html>
+
+.. index::
+  Transparent Proxy
+  
+|arrow| Transparent Proxy 
+-------------------------
+  Neither the origin nor the client are aware of the actions performed by the transparent proxies. A Traffic Control based CDN does not use transparent proxies.   If you are interested you can learn more about transparent proxies on `wikipedia <http://en.wikipedia.org/wiki/Proxy_server#Transparent_proxy>`_.
+

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/9c7fc09d/docs/latest/_sources/basics/caching_proxies.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/basics/caching_proxies.txt b/docs/latest/_sources/basics/caching_proxies.txt
deleted file mode 100644
index af93730..0000000
--- a/docs/latest/_sources/basics/caching_proxies.txt
+++ /dev/null
@@ -1,238 +0,0 @@
-.. 
-.. 
-.. Licensed 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.
-.. 
-
-
-.. |arrow| image:: fwda.png
-
-.. _rl-caching_proxy:
-
-Caching Proxies
-===============
-The main function of a CDN is to proxy requests from clients to origin servers 
-and cache the results. 
-To proxy, in the CDN context, is to obtain content using HTTP from an origin 
-server on behalf of a client. To cache is to store the results so they can be 
-reused when other clients are requesting the same content. There are three 
-types of proxies in use on the Internet today which are described below.
-
-.. index::
-  Reverse Proxy
-
-.. _rl-rev-proxy:
-
-|arrow| Reverse Proxy
----------------------
-  A reverse proxy acts on behalf of the origin server. The client is mostly unaware it is communicating with a proxy and not the actual origin. 
-  All EDGE caches in a Traffic Control CDN are reverse proxies. 
-  To the end user a Traffic Control based CDN appears as a reverse proxy since 
-  it retrieves content from the origin server, acting on behalf of that origin server. The client requests a URL that has 
-  a hostname which resolves to the reverse proxy's IP address and, in compliance 
-  with the HTTP 1.1 specification, the client sends a ``Host:`` header to the reverse 
-  proxy that matches the hostname in the URL. 
-  The proxy looks up this hostname in a 
-  list of mappings to find the origin hostname; if the hostname of the Host header is not found in the list, 
-  the proxy will send an error (``404 Not Found``) to the client. 
-  If the supplied hostname is found in this list of mappings, the proxy checks the cache, and when the content is not already present, connects to the 
-  origin the requested ``Host:`` maps to and requests the path of the original URL, providing the origin hostname in the ``Host`` header.  The proxy then stores the URL in cache and serves the contents to the client. When there are subsequent requests for 
-  the same URL, a caching proxy serves the content out of cache thereby reducing 
-  latency and network traffic.
-
-.. seealso:: `ATS documentation on reverse proxy <https://docs.trafficserver.apache.org/en/latest/admin/reverse-proxy-http-redirects.en.html#http-reverse-proxy>`_.
-
-To insert a reverse proxy into the previous HTTP 1.1 example, the reverse proxy requires provisioning 
-for ``www.origin.com``. By adding a remap rule to the cache, the reverse proxy then maps requests to 
-this origin. The content owner must inform the clients, by updating the URL, to receive the content 
-from the cache and not from the origin server directly. For this example, the remap rule on the 
-cache is: ``http://www-origin-cache.cdn.com http://www.origin.com``.
-
-..  Note:: In the previous example minimal headers were shown on both the request and response. In the examples that follow, the origin server response is more realistic. 
-
-::
-
-  HTTP/1.1 200 OK
-  Date: Sun, 14 Dec 2014 23:22:44 GMT
-  Server: Apache/2.2.15 (Red Hat)
-  Last-Modified: Sun, 14 Dec 2014 23:18:51 GMT
-  ETag: "1aa008f-2d-50a3559482cc0"
-  Content-Length: 45
-  Connection: close
-  Content-Type: text/html; charset=UTF-8
-
-  <html><body>This is a fun file</body></html>
-
-The client is given the URL ``http://www-origin-cache.cdn.com/foo/bar/fun.html`` (note the different hostname) and when attempting to obtain that URL, the following occurs:
-
-1. The client sends a request to the LDNS server to resolve the name ``www-origin-cache.cdn.com`` to an IPv4 address.
-
-2. Similar to the previous case, the LDNS server resolves the name ``www-origin-cache.cdn.com`` to an IPv4 address, in this example, this address is 55.44.33.22.
-
-3. The client opens a TCP connection from a random port locally, to port 80 (the HTTP default) on 55.44.33.22, and sends the following: ::
-
-    GET /foo/bar/fun.html HTTP/1.1
-    Host: www-origin-cache.cdn.com
-
-4. The reverse proxy looks up ``www-origin-cache.cdn.com`` in its remap rules, and finds the origin is ``www.origin.com``.
-
-5. The proxy checks its cache to see if the response for ``http://www-origin-cache.cdn.com/foo/bar/fun.html`` is already in the cache.
-
-6a. If the response is not in the cache:
-
-  1. The proxy uses DNS to get the IPv4 address for ``www.origin.com``, connect to it on port 80, and sends: ::
-
-   	GET /foo/bar/fun.html HTTP/1.1
-   	Host: www.origin.com
-
-  2. The origin server responds with the headers and content as shown: ::
-
-      HTTP/1.1 200 OK
-      Date: Sun, 14 Dec 2014 23:22:44 GMT
-      Server: Apache/2.2.15 (Red Hat)
-      Last-Modified: Sun, 14 Dec 2014 23:18:51 GMT
-      ETag: "1aa008f-2d-50a3559482cc0"
-      Content-Length: 45
-      Connection: close
-      Content-Type: text/html; charset=UTF-8
-
-      <html><body>This is a fun file</body></html>
-
-  3. The proxy sends the origin response on to the client adding a ``Via:`` header (and maybe others): ::
-
-      HTTP/1.1 200 OK
-      Date: Sun, 14 Dec 2014 23:22:44 GMT
-      Last-Modified: Sun, 14 Dec 2014 23:18:51 GMT
-      ETag: "1aa008f-2d-50a3559482cc0"
-      Content-Length: 45
-      Connection: close
-      Content-Type: text/html; charset=UTF-8
-      Age: 0
-      Via: http/1.1 cache01.cdn.kabletown.net (ApacheTrafficServer/4.2.1 [uScSsSfUpSeN:t cCSi p sS])
-      Server: ATS/4.2.1
-
-    	<html><body>This is a fun file</body></html>
-
-6b. If it *is* in the cache:
- 
-  The proxy responds to the client with the previously retrieved result: ::
-
-      HTTP/1.1 200 OK
-      Date: Sun, 14 Dec 2014 23:22:44 GMT
-      Last-Modified: Sun, 14 Dec 2014 23:18:51 GMT
-      ETag: "1aa008f-2d-50a3559482cc0"
-      Content-Length: 45
-      Connection: close
-      Content-Type: text/html; charset=UTF-8
-      Age: 39711
-      Via: http/1.1 cache01.cdn.kabletown.net (ApacheTrafficServer/4.2.1 [uScSsSfUpSeN:t cCSi p sS])
-      Server: ATS/4.2.1
-
-      <html><body>This is a fun file</body></html>
-
-
-.. index::
-  Forward Proxy
-
-.. _rl-fwd-proxy:
-
-|arrow| Forward Proxy
----------------------
-  A forward proxy acts on behalf of the client. The origin server is mostly 
-  unaware of the proxy, the client requests the proxy to retrieve content from a 
-  particular origin server. All MID caches in a Traffic Control based CDN are 
-  forward proxies. In a forward proxy scenario, the client is explicitely configured  to use the
-  the proxy's IP address and port as a forward proxy. The client always connects to the forward 
-  proxy for content. The content provider does not have to change the URL the 
-  client obtains, and is unaware of the proxy in the middle. 
-
-..  seealso:: `ATS documentation on forward proxy <https://docs.trafficserver.apache.org/en/latest/admin/forward-proxy.en.html>`_.
-
-Below is an example of the client retrieving the URL ``http://www.origin.com/foo/bar/fun.html`` through a forward proxy:
-
-1. The client requires configuration to use the proxy, as opposed to the reverse proxy example. Assume the client configuration is through preferences entries or other to use the proxy IP address 99.88.77.66 and proxy port 8080.
-
-2. To retrieve ``http://www.origin.com/foo/bar/fun.html`` URL, the client connects to 99.88.77.66 on port 8080 and sends: 
- 
- ::
-
-  GET http://www.origin.com/foo/bar/fun.html HTTP/1.1
-
-
- ..  Note:: In this case, the client places the entire URL after GET, including protocol and hostname (``http://www.origin.com``),  but in the reverse proxy and direct-to-origin case it  puts only the path portion of the URL (``/foo/bar/fun.html``) after the GET. 
-
-3. The proxy verifies whether the response for ``http://www-origin-cache.cdn.com/foo/bar/fun.html`` is already in the cache.
-
-4a. If it is not in the cache:
-
-  1. The proxy uses DNS to obtain the IPv4 address for ``www.origin.com``, connects to it on port 80, and sends: ::
-
-
-      GET /foo/bar/fun.html HTTP/1.1
-      Host: www.origin.com
-
-
-  2. The origin server responds with the headers and content as shown below: ::
-
-
-      HTTP/1.1 200 OK
-      Date: Sun, 14 Dec 2014 23:22:44 GMT
-      Server: Apache/2.2.15 (Red Hat)
-      Last-Modified: Sun, 14 Dec 2014 23:18:51 GMT
-      ETag: "1aa008f-2d-50a3559482cc0"
-      Content-Length: 45
-      Connection: close
-      Content-Type: text/html; charset=UTF-8
-
-      <html><body>This is a fun file</body></html>
-
-
-  3. The proxy sends this on to the client adding a ``Via:`` header (and maybe others): ::
-
-      HTTP/1.1 200 OK
-      Date: Sun, 14 Dec 2014 23:22:44 GMT
-      Last-Modified: Sun, 14 Dec 2014 23:18:51 GMT
-      ETag: "1aa008f-2d-50a3559482cc0"
-      Content-Length: 45
-      Connection: close
-      Content-Type: text/html; charset=UTF-8
-      Age: 0
-      Via: http/1.1 cache01.cdn.kabletown.net (ApacheTrafficServer/4.2.1 [uScSsSfUpSeN:t cCSi p sS])
-      Server: ATS/4.2.1
-          
-      <html><body>This is a fun file</body></html>
-
-
-4b. If it *is* in the cache:
- 
-  The proxy responds to the client with the previously retrieved result: ::
-
-    HTTP/1.1 200 OK
-    Date: Sun, 14 Dec 2014 23:22:44 GMT
-    Last-Modified: Sun, 14 Dec 2014 23:18:51 GMT
-    ETag: "1aa008f-2d-50a3559482cc0"
-    Content-Length: 45
-    Connection: close
-    Content-Type: text/html; charset=UTF-8
-    Age: 99711
-    Via: http/1.1 cache01.cdn.kabletown.net (ApacheTrafficServer/4.2.1 [uScSsSfUpSeN:t cCSi p sS])
-    Server: ATS/4.2.1
-          
-    <html><body>This is a fun file</body></html>
-
-.. index::
-  Transparent Proxy
-  
-|arrow| Transparent Proxy 
--------------------------
-  Neither the origin nor the client are aware of the actions performed by the transparent proxies. A Traffic Control based CDN does not use transparent proxies.   If you are interested you can learn more about transparent proxies on `wikipedia <http://en.wikipedia.org/wiki/Proxy_server#Transparent_proxy>`_.
-

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/9c7fc09d/docs/latest/_sources/basics/content_delivery_networks.rst.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/basics/content_delivery_networks.rst.txt b/docs/latest/_sources/basics/content_delivery_networks.rst.txt
new file mode 100644
index 0000000..872018e
--- /dev/null
+++ b/docs/latest/_sources/basics/content_delivery_networks.rst.txt
@@ -0,0 +1,40 @@
+.. 
+.. 
+.. Licensed 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.
+.. 
+
+.. index::
+	Log File Analysis
+	CDN
+	Content Delivery Network 
+
+Content Delivery Networks
+=========================
+The vast majority of today's Internet traffic is media files (often video or audio) being sent from a single source (the *Content Provider*) to many thousands or even millions of destinations (the *Content Consumers*).  Content Delivery Networks are the technology that make that one-to-many distribution possible in an economical way. A Content Delivery Network (CDN) is a distributed system of servers for delivering content over HTTP. These servers are deployed in multiple locations with the goal of optimizing the delivery of content to the end users, while minimizing the traffic on the network. A CDN typically consists of the following:
+
+* **Caching Proxies**
+	The proxy (cache or caching proxy) is a server that both proxies the requests and caches the results for reusing.  
+
+* **Content Router**
+    The Content Router ensures that the end user is connected to the optimal cache for the location of the end user and content availability.
+
+* **Health Protocol** 
+    The Health Protocol monitors the usage of the caches and tenants in the CDN.
+
+* **Configuration Management System** 
+    In many cases a CDN encompasses hundreds of servers across a large geographic area. The Configuration Management System allows an operator to manage these servers.
+
+* **Log File Analysis System**
+    Every transaction in the CDN gets logged. The Log File Analysis System aggregates all of the log entries from all of the servers to a central location for analysis and troubleshooting.
+
+

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/9c7fc09d/docs/latest/_sources/basics/content_delivery_networks.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/basics/content_delivery_networks.txt b/docs/latest/_sources/basics/content_delivery_networks.txt
deleted file mode 100644
index 872018e..0000000
--- a/docs/latest/_sources/basics/content_delivery_networks.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-.. 
-.. 
-.. Licensed 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.
-.. 
-
-.. index::
-	Log File Analysis
-	CDN
-	Content Delivery Network 
-
-Content Delivery Networks
-=========================
-The vast majority of today's Internet traffic is media files (often video or audio) being sent from a single source (the *Content Provider*) to many thousands or even millions of destinations (the *Content Consumers*).  Content Delivery Networks are the technology that make that one-to-many distribution possible in an economical way. A Content Delivery Network (CDN) is a distributed system of servers for delivering content over HTTP. These servers are deployed in multiple locations with the goal of optimizing the delivery of content to the end users, while minimizing the traffic on the network. A CDN typically consists of the following:
-
-* **Caching Proxies**
-	The proxy (cache or caching proxy) is a server that both proxies the requests and caches the results for reusing.  
-
-* **Content Router**
-    The Content Router ensures that the end user is connected to the optimal cache for the location of the end user and content availability.
-
-* **Health Protocol** 
-    The Health Protocol monitors the usage of the caches and tenants in the CDN.
-
-* **Configuration Management System** 
-    In many cases a CDN encompasses hundreds of servers across a large geographic area. The Configuration Management System allows an operator to manage these servers.
-
-* **Log File Analysis System**
-    Every transaction in the CDN gets logged. The Log File Analysis System aggregates all of the log entries from all of the servers to a central location for analysis and troubleshooting.
-
-

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/9c7fc09d/docs/latest/_sources/basics/http_11.rst.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/basics/http_11.rst.txt b/docs/latest/_sources/basics/http_11.rst.txt
new file mode 100644
index 0000000..65d6d71
--- /dev/null
+++ b/docs/latest/_sources/basics/http_11.rst.txt
@@ -0,0 +1,48 @@
+.. 
+.. 
+.. Licensed 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.
+.. 
+
+.. index::
+	http/1.1
+	HTTP
+
+HTTP 1.1
+========
+For a comprehensive look at Traffic Control, it is important to understand basic HTTP 1.1 protocol operations and how caches function. The example below illustrates the fulfillment of an HTTP 1.1 request in a situation without CDN or proxy, followed by viewing the changes after inserting different types of (caching) proxies. Several of the examples below are simplified for clarification of the essentials.
+
+For complete details on HTTP 1.1 see `RFC 2616 - Hypertext Transfer Protocol -- HTTP/1.1 <https://www.ietf.org/rfc/rfc2616.txt>`_.
+
+Below are the steps of a client retrieving the URL ``http://www.origin.com/foo/bar/fun.html`` using HTTP/1.1 without proxies:
+
+1. The client sends a request to the Local DNS (LDNS) server to resolve the name ``www.origin.com`` to an IPv4 address.
+
+2. If the LDNS does not have this name (IPv4 mapping cached), it sends DNS requests to the ., .com, and .origin.com authoritative servers until it receives a response with the address for ``www.origin.com``. Per the DNS SPEC, this response has a Time To Live (TTL), which indicates how long this mapping can be cached at the LDNS server. In the example, the IP address found by the LDNS server for www.origin.com is 44.33.22.11.
+
+  .. Note:: While longer DNS TTLs of a day (86400 seconds) or more are quite common in other use cases, in CDN use cases DNS TTLs are often below a minute.
+
+3. The client opens a TCP connection from a random port locally to port 80 (the HTTP default) on 44.33.22.11, and sends this (showing the minimum HTTP 1.1 request, typically there are additional headers): ::
+
+    GET /foo/bar/fun.html HTTP/1.1
+    Host: www.origin.com
+
+4. The server at ``www.origin.com`` looks up the Host: header to match that to a configuration section, usually referred to as a virtual host section. If the Host: header and configuration section match, the search continues for the content of the path ``/foo/bar/fun.html``, in the example, this is a file that contains ``<html><body>This is a fun file</body></html>``, so the server responds with the following: ::
+
+
+      HTTP/1.1 200 OK
+      Content-Type: text/html; charset=UTF-8
+      Content-Length: 45
+
+      <html><body>This is a fun file</body></html>
+
+ At this point, HTTP transaction is complete.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/9c7fc09d/docs/latest/_sources/basics/http_11.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/basics/http_11.txt b/docs/latest/_sources/basics/http_11.txt
deleted file mode 100644
index 65d6d71..0000000
--- a/docs/latest/_sources/basics/http_11.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-.. 
-.. 
-.. Licensed 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.
-.. 
-
-.. index::
-	http/1.1
-	HTTP
-
-HTTP 1.1
-========
-For a comprehensive look at Traffic Control, it is important to understand basic HTTP 1.1 protocol operations and how caches function. The example below illustrates the fulfillment of an HTTP 1.1 request in a situation without CDN or proxy, followed by viewing the changes after inserting different types of (caching) proxies. Several of the examples below are simplified for clarification of the essentials.
-
-For complete details on HTTP 1.1 see `RFC 2616 - Hypertext Transfer Protocol -- HTTP/1.1 <https://www.ietf.org/rfc/rfc2616.txt>`_.
-
-Below are the steps of a client retrieving the URL ``http://www.origin.com/foo/bar/fun.html`` using HTTP/1.1 without proxies:
-
-1. The client sends a request to the Local DNS (LDNS) server to resolve the name ``www.origin.com`` to an IPv4 address.
-
-2. If the LDNS does not have this name (IPv4 mapping cached), it sends DNS requests to the ., .com, and .origin.com authoritative servers until it receives a response with the address for ``www.origin.com``. Per the DNS SPEC, this response has a Time To Live (TTL), which indicates how long this mapping can be cached at the LDNS server. In the example, the IP address found by the LDNS server for www.origin.com is 44.33.22.11.
-
-  .. Note:: While longer DNS TTLs of a day (86400 seconds) or more are quite common in other use cases, in CDN use cases DNS TTLs are often below a minute.
-
-3. The client opens a TCP connection from a random port locally to port 80 (the HTTP default) on 44.33.22.11, and sends this (showing the minimum HTTP 1.1 request, typically there are additional headers): ::
-
-    GET /foo/bar/fun.html HTTP/1.1
-    Host: www.origin.com
-
-4. The server at ``www.origin.com`` looks up the Host: header to match that to a configuration section, usually referred to as a virtual host section. If the Host: header and configuration section match, the search continues for the content of the path ``/foo/bar/fun.html``, in the example, this is a file that contains ``<html><body>This is a fun file</body></html>``, so the server responds with the following: ::
-
-
-      HTTP/1.1 200 OK
-      Content-Type: text/html; charset=UTF-8
-      Content-Length: 45
-
-      <html><body>This is a fun file</body></html>
-
- At this point, HTTP transaction is complete.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/9c7fc09d/docs/latest/_sources/basics/index.rst.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/basics/index.rst.txt b/docs/latest/_sources/basics/index.rst.txt
new file mode 100644
index 0000000..23ee1da
--- /dev/null
+++ b/docs/latest/_sources/basics/index.rst.txt
@@ -0,0 +1,29 @@
+.. 
+.. 
+.. Licensed 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.
+.. 
+
+CDN Basics
+**********
+
+Traffic Control is a CDN control plane, see the topics below to familiarize yourself with the basic concepts of a CDN.
+
+.. toctree::
+  :maxdepth: 2
+
+  content_delivery_networks
+  http_11
+  caching_proxies
+  cache_revalidation
+
+

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/9c7fc09d/docs/latest/_sources/basics/index.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/basics/index.txt b/docs/latest/_sources/basics/index.txt
deleted file mode 100644
index 23ee1da..0000000
--- a/docs/latest/_sources/basics/index.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-.. 
-.. 
-.. Licensed 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.
-.. 
-
-CDN Basics
-**********
-
-Traffic Control is a CDN control plane, see the topics below to familiarize yourself with the basic concepts of a CDN.
-
-.. toctree::
-  :maxdepth: 2
-
-  content_delivery_networks
-  http_11
-  caching_proxies
-  cache_revalidation
-
-

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/9c7fc09d/docs/latest/_sources/development/index.rst.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/development/index.rst.txt b/docs/latest/_sources/development/index.rst.txt
new file mode 100644
index 0000000..851e463
--- /dev/null
+++ b/docs/latest/_sources/development/index.rst.txt
@@ -0,0 +1,29 @@
+.. 
+.. 
+.. Licensed 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.
+.. 
+
+Developer's Guide
+*****************
+Use this guide to start developing applications that consume the Traffic Control APIs, to create extensions to Traffic Ops, or work on Traffic Control itself.
+
+.. toctree::
+  :maxdepth: 2
+
+  traffic_ops
+  traffic_portal
+  traffic_router
+  traffic_monitor
+  traffic_stats
+  traffic_server
+

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/9c7fc09d/docs/latest/_sources/development/index.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/development/index.txt b/docs/latest/_sources/development/index.txt
deleted file mode 100644
index 851e463..0000000
--- a/docs/latest/_sources/development/index.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-.. 
-.. 
-.. Licensed 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.
-.. 
-
-Developer's Guide
-*****************
-Use this guide to start developing applications that consume the Traffic Control APIs, to create extensions to Traffic Ops, or work on Traffic Control itself.
-
-.. toctree::
-  :maxdepth: 2
-
-  traffic_ops
-  traffic_portal
-  traffic_router
-  traffic_monitor
-  traffic_stats
-  traffic_server
-

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/9c7fc09d/docs/latest/_sources/development/traffic_monitor.rst.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/development/traffic_monitor.rst.txt b/docs/latest/_sources/development/traffic_monitor.rst.txt
new file mode 100644
index 0000000..012cbb3
--- /dev/null
+++ b/docs/latest/_sources/development/traffic_monitor.rst.txt
@@ -0,0 +1,112 @@
+.. 
+.. 
+.. Licensed 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.
+.. 
+
+Traffic Monitor
+***************
+Introduction
+============
+Traffic Monitor is a Java Tomcat application that monitors caches, provides health state information to Traffic Router, and collects statistics for use in tools such as Traffic Ops and Traffic Stats.  The health state provided by Traffic Monitor is used by Traffic Router to control which caches are available on the CDN.
+
+Software Requirements
+=====================
+To work on Traffic Monitor you need a \*nix (MacOS and Linux are most commonly used) environment that has the following installed:
+
+* Eclipse >= Kepler SR2 (or another Java IDE)
+* Maven >= 3.3.1
+* JDK >= 6.0
+
+Traffic Monitor Project Tree Overview
+=====================================
+* ``traffic_control/traffic_monitor/`` - base directory for Traffic Monitor
+
+	* ``etc/`` - Miscellaneous simulator utilities
+	* ``src/main`` - Main source directory for the Traffic Monitor
+
+		* ``bin/`` - Configuration tools
+		* ``conf/`` - Configuration files
+		* ``java/`` - Java source code for Traffic Monitor
+		* ``opt/tomcat/conf`` - Contains Tomcat configuration file(s) pulled in during an RPM build
+		* ``resources/`` - Resources pulled in during an RPM build
+		* ``scripts/`` - Scripts used by the RPM build process
+		* ``webapp/`` - Java webapp resources
+
+	* ``src/test`` - Test source directory for Traffic Monitor
+
+		* ``java/`` - JUnit based unit tests for Traffic Monitor
+		* ``resources/conf`` - Configuration files used by unit tests
+		* ``resources/db`` - Files downloaded by unit tests
+		* ``resources/var`` - Files generated by unit tests
+
+Java Formatting Conventions 
+===========================
+None at this time.  The codebase will eventually be formatted per Java standards.
+
+Installing The Developer Environment
+====================================
+To install the Traffic Monitor Developer environment:
+
+1. Clone the traffic_control repository using Git.
+2. Change directories into ``traffic_control/traffic_monitor``.
+3. Edit the following parameters in src/test/resources/conf/traffic_monitor_config.js:
+
++-----------------+------------------------------------------------------------+
+|    Parameter    |                           Value                            |
++=================+============================================================+
+| ``tm.hostname`` | FQDN of the Traffic Ops instance (do not include http://). |
++-----------------+------------------------------------------------------------+
+| ``tm.username`` | Admin username for Traffic Ops                             |
++-----------------+------------------------------------------------------------+
+| ``tm.password`` | Password for admin user                                    |
++-----------------+------------------------------------------------------------+
+| ``cdnName``     | Name of the CDN this Traffic Monitor will monitor          |
++-----------------+------------------------------------------------------------+
+
+4. Import the existing git repo into Eclipse:
+
+	a. File -> Import -> Git -> Projects from Git; Next
+	b. Existing local repository; Next
+	c. Add -> browse to find ``traffic_control``; Add
+	d. Select ``traffic_control``; Next
+	e. Ensure "Import existing projects" is selected, expand ``traffic_control``, select ``traffic_monitor``; Next
+	f. Ensure ``traffic_monitor`` is checked; Finish
+	g. Ensure ``traffic_monitor`` has been opened by Eclipse after importing
+
+5. Run ``mvn clean verify`` from the ``traffic_monitor`` directory
+
+6. Start the embedded Jetty instance from within Eclipse
+
+	a. In the package explorer, expand ``traffic_monitor``
+	b. Expand ``src/test/java``
+	c. Expand the package ``com.comcast.cdn.traffic_control.traffic_monitor``
+	d. Open and run ``Start.java``
+
+		..  Note:: If an error is displayed in the Console, run ``mvn clean verify`` from the ``traffic_monitor`` directory
+
+	e. With a web browser, navigate to http://localhost:8080
+
+Test Cases
+==========
+Unit tests can be executed using Maven by running ``mvn test`` at the root of the ``traffic_monitor`` project.
+
+API
+===
+
+:ref:`reference-tm-api`
+
+.. toctree:: 
+  :hidden:
+  :maxdepth: 1
+
+  traffic_monitor/traffic_monitor_api
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/9c7fc09d/docs/latest/_sources/development/traffic_monitor.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/development/traffic_monitor.txt b/docs/latest/_sources/development/traffic_monitor.txt
deleted file mode 100644
index 6ed025d..0000000
--- a/docs/latest/_sources/development/traffic_monitor.txt
+++ /dev/null
@@ -1,114 +0,0 @@
-.. 
-.. 
-.. Licensed 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.
-.. 
-
-Traffic Monitor
-***************
-Introduction
-============
-Traffic Monitor is a Java Tomcat application that monitors caches, provides health state information to Traffic Router, and collects statistics for use in tools such as Traffic Ops and Traffic Stats.  The health state provided by Traffic Monitor is used by Traffic Router to control which caches are available on the CDN.
-
-Software Requirements
-=====================
-To work on Traffic Monitor you need a \*nix (MacOS and Linux are most commonly used) environment that has the following installed:
-
-* Eclipse >= Kepler SR2 (or another Java IDE)
-* Maven >= 3.3.1
-* JDK >= 6.0
-
-Traffic Monitor Project Tree Overview
-=====================================
-* ``traffic_control/traffic_monitor/`` - base directory for Traffic Monitor
-
-	* ``etc/`` - Miscellaneous simulator utilities
-	* ``src/main`` - Main source directory for the Traffic Monitor
-
-		* ``bin/`` - Configuration tools
-		* ``conf/`` - Configuration files
-		* ``java/`` - Java source code for Traffic Monitor
-		* ``opt/tomcat/conf`` - Contains Tomcat configuration file(s) pulled in during an RPM build
-		* ``resources/`` - Resources pulled in during an RPM build
-		* ``scripts/`` - Scripts used by the RPM build process
-		* ``webapp/`` - Java webapp resources
-
-	* ``src/test`` - Test source directory for Traffic Monitor
-
-		* ``java/`` - JUnit based unit tests for Traffic Monitor
-		* ``resources/conf`` - Configuration files used by unit tests
-		* ``resources/db`` - Files downloaded by unit tests
-		* ``resources/var`` - Files generated by unit tests
-
-Java Formatting Conventions 
-===========================
-None at this time.  The codebase will eventually be formatted per Java standards.
-
-Installing The Developer Environment
-====================================
-To install the Traffic Monitor Developer environment:
-
-1. Clone the traffic_control repository using Git.
-2. Change directories into ``traffic_control/traffic_monitor``.
-3. Edit the following parameters in src/test/resources/conf/traffic_monitor_config.js:
-
-  +-----------------+------------------------------------------------------------+
-  |    Parameter    |                           Value                            |
-  +=================+============================================================+
-  | ``tm.hostname`` | FQDN of the Traffic Ops instance (do not include http://). |
-  +-----------------+------------------------------------------------------------+
-  | ``tm.username`` | Admin username for Traffic Ops                             |
-  +-----------------+------------------------------------------------------------+
-  | ``tm.password`` | Password for admin user                                    |
-  +-----------------+------------------------------------------------------------+
-  | ``cdnName``     | Name of the CDN this Traffic Monitor will monitor          |
-  +-----------------+------------------------------------------------------------+
-
-  Note: any change done later in the configuration file requires a mvn build in order to be applied.
- 
-4. Import the existing git repo into Eclipse:
-
-	a. File -> Import -> Git -> Projects from Git; Next
-	b. Existing local repository; Next
-	c. Add -> browse to find ``traffic_control``; Add
-	d. Select ``traffic_control``; Next
-	e. Ensure "Import existing projects" is selected, expand ``traffic_control``, select ``traffic_monitor``; Next
-	f. Ensure ``traffic_monitor`` is checked; Finish
-	g. Ensure ``traffic_monitor`` has been opened by Eclipse after importing
-
-5. Run ``mvn clean verify`` from the ``traffic_monitor`` directory
-
-6. Start the embedded Jetty instance from within Eclipse
-
-	a. In the package explorer, expand ``traffic_monitor``
-	b. Expand ``src/test/java``
-	c. Expand the package ``com.comcast.cdn.traffic_control.traffic_monitor``
-	d. Open and run ``Start.java``
-
-		..  Note:: If an error is displayed in the Console, run ``mvn clean verify`` from the ``traffic_monitor`` directory
-
-	e. With a web browser, navigate to http://localhost:8080
-
-Test Cases
-==========
-Unit tests can be executed using Maven by running ``mvn test`` at the root of the ``traffic_monitor`` project.
-
-API
-===
-
-:ref:`reference-tm-api`
-
-.. toctree:: 
-  :hidden:
-  :maxdepth: 1
-
-  traffic_monitor/traffic_monitor_api

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/9c7fc09d/docs/latest/_sources/development/traffic_monitor/traffic_monitor_api.rst.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/development/traffic_monitor/traffic_monitor_api.rst.txt b/docs/latest/_sources/development/traffic_monitor/traffic_monitor_api.rst.txt
new file mode 100644
index 0000000..0240fd4
--- /dev/null
+++ b/docs/latest/_sources/development/traffic_monitor/traffic_monitor_api.rst.txt
@@ -0,0 +1,178 @@
+.. 
+.. 
+.. Licensed 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.
+.. 
+
+.. _reference-tm-api:
+
+Traffic Monitor APIs
+====================
+The Traffic Monitor URLs below allow certain query parameters for use in controlling the data returned. The optional query parameters are the *tabbed* in values under each URL, if they exist.
+
+|
+
+**/publish/EventLog**
+
+Log of recent events.
+
+|
+
+**/publish/CacheStats**
+
+Statistics gathered for each cache.
+
+**Query Parameters**
+
++--------------+---------+------------------------------------------------+
+|  Parameter   | Type    |                  Description                   |
++==============+=========+================================================+
+| ``hc``       | int     | The history count, number of items to display. |
++--------------+---------+------------------------------------------------+
+| ``stats``    | string  | A comma separated list of stats to display.    |
++--------------+---------+------------------------------------------------+
+| ``wildcard`` | boolean | Controls whether specified stats should be     |
+|              |         | treated as partial strings.                    |
++--------------+---------+------------------------------------------------+
+
+|
+
+**/publish/CacheStats/:cache**
+
+Statistics gathered for only this cache.
+
+**Query Parameters**
+
++--------------+---------+------------------------------------------------+
+|  Parameter   | Type    |                  Description                   |
++==============+=========+================================================+
+| ``hc``       | int     | The history count, number of items to display. |
++--------------+---------+------------------------------------------------+
+| ``stats``    | string  | A comma separated list of stats to display.    |
++--------------+---------+------------------------------------------------+
+| ``wildcard`` | boolean | Controls whether specified stats should be     |
+|              |         | treated as partial strings.                    |
++--------------+---------+------------------------------------------------+
+
+|
+
+**/publish/DsStats**
+
+Statistics gathered for delivery services.
+
+**Query Parameters**
+
++--------------+---------+------------------------------------------------+
+|  Parameter   | Type    |                  Description                   |
++==============+=========+================================================+
+| ``hc``       | int     | The history count, number of items to display. |
++--------------+---------+------------------------------------------------+
+| ``stats``    | string  | A comma separated list of stats to display.    |
++--------------+---------+------------------------------------------------+
+| ``wildcard`` | boolean | Controls whether specified stats should be     |
+|              |         | treated as partial strings.                    |
++--------------+---------+------------------------------------------------+
+
+|
+
+**/publish/DsStats/:deliveryService**
+
+Statistics gathered for this delivery service only.
+
+**Query Parameters**
+
++--------------+---------+------------------------------------------------+
+|  Parameter   | Type    |                  Description                   |
++==============+=========+================================================+
+| ``hc``       | int     | The history count, number of items to display. |
++--------------+---------+------------------------------------------------+
+| ``stats``    | string  | A comma separated list of stats to display.    |
++--------------+---------+------------------------------------------------+
+| ``wildcard`` | boolean | Controls whether specified stats should be     |
+|              |         | treated as partial strings.                    |
++--------------+---------+------------------------------------------------+
+
+|
+
+**/publish/CrStates**
+
+The current state of this CDN per the health protocol.
+
+|
+
+**raw**
+
+The current state of this CDN per this Traffic Monitor only.
+
+|
+
+**/publish/CrConfig**
+
+The CrConfig served to and consumed by Traffic Router.
+
+|
+
+**/publish/PeerStates**
+
+The health state information from all peer Traffic Monitors.
+
+**Query Parameters**
+
++--------------+---------+------------------------------------------------+
+|  Parameter   | Type    |                  Description                   |
++==============+=========+================================================+
+| ``hc``       | int     | The history count, number of items to display. |
++--------------+---------+------------------------------------------------+
+| ``stats``    | string  | A comma separated list of stats to display.    |
++--------------+---------+------------------------------------------------+
+| ``wildcard`` | boolean | Controls whether specified stats should be     |
+|              |         | treated as partial strings.                    |
++--------------+---------+------------------------------------------------+
+
+|
+
+**/publish/Stats**
+
+The general statistics about Traffic Monitor.
+
+|
+
+**/publish/StatSummary**
+
+The summary of cache statistics.
+
+**Query Parameters**
+
++---------------+---------+-----------------------------------------------------------+
+|   Parameter   |   Type  |                        Description                        |
++===============+=========+===========================================================+
+| ``startTime`` | number  | Window start. The number of milliseconds since the epoch. |
++---------------+---------+-----------------------------------------------------------+
+| ``endTime``   | number  | Window end. The number of milliseconds since the epoch.   |
++---------------+---------+-----------------------------------------------------------+
+| ``hc``        | int     | The history count, number of items to display.            |
++---------------+---------+-----------------------------------------------------------+
+| ``stats``     | string  | A comma separated list of stats to display.               |
++---------------+---------+-----------------------------------------------------------+
+| ``wildcard``  | boolean | Controls whether specified stats should be                |
+|               |         | treated as partial strings.                               |
++---------------+---------+-----------------------------------------------------------+
+| ``cache``     | string  | Summary statistics for just this cache.                   |
++---------------+---------+-----------------------------------------------------------+
+
+|
+
+**/publish/ConfigDoc**
+
+The overview of configuration options.
+
+


Mime
View raw message