You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by ne...@apache.org on 2017/01/14 22:06:03 UTC

[73/75] incubator-trafficcontrol-website git commit: add master docs to latest'

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/52a20853/docs/latest/_sources/development/traffic_ops_api/v12/user.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/user.txt b/docs/latest/_sources/development/traffic_ops_api/v12/user.txt
index e81292a..b141eca 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/user.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/user.txt
@@ -1,5 +1,4 @@
 .. 
-.. Copyright 2015 Comcast Cable Communications Management, LLC
 .. 
 .. Licensed under the Apache License, Version 2.0 (the "License");
 .. you may not use this file except in compliance with the License.
@@ -209,6 +208,237 @@ Users
 
 |
 
+**GET /api/1.2/users/:id/deliveryservices**
+
+  Retrieves all delivery services assigned to the user. See also `Using Traffic Ops - Delivery Service <http://trafficcontrol.apache.org/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
+
+  Authentication Required: Yes
+
+  Role(s) Required: None
+
+  **Request Route Parameters**
+
+  +-----------------+----------+---------------------------------------------------+
+  | Name            | Required | Description                                       |
+  +=================+==========+===================================================+
+  | ``id``          | yes      | User ID.                                          |
+  +-----------------+----------+---------------------------------------------------+
+
+
+  **Response Properties**
+
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  |        Parameter         |  Type  |                                                             Description                                                              |
+  +==========================+========+======================================================================================================================================+
+  | ``active``               |  bool  | true if active, false if inactive.                                                                                                   |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``cacheurl``             | string | Cache URL rule to apply to this delivery service.                                                                                    |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``ccrDnsTtl``            | string | The TTL of the DNS response for A or AAAA queries requesting the IP address of the tr. host.                                         |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``cdnId``                | string | Id of the CDN to which the delivery service belongs to.                                                                              |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``cdnName``              | string | Name of the CDN to which the delivery service belongs to.                                                                            |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``checkPath``            | string | The path portion of the URL to check this deliveryservice for health.                                                                |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``displayName``          | string | The display name of the delivery service.                                                                                            |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``dnsBypassIp``          | string | The IPv4 IP to use for bypass on a DNS deliveryservice  - bypass starts when serving more than the                                   |
+  |                          |        | globalMaxMbps traffic on this deliveryservice.                                                                                       |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``dnsBypassIp6``         | string | The IPv6 IP to use for bypass on a DNS deliveryservice - bypass starts when serving more than the                                    |
+  |                          |        | globalMaxMbps traffic on this deliveryservice.                                                                                       |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``dnsBypassTtl``         | string | The TTL of the DNS bypass response.                                                                                                  |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``dscp``                 | string | The Differentiated Services Code Point (DSCP) with which to mark downstream (EDGE ->  customer) traffic.                             |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``edgeHeaderRewrite``    | string | The EDGE header rewrite actions to perform.                                                                                          |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``geoLimitRedirectUrl``  | string |                                                                                                                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``geoLimit``             | string | - 0: None - no limitations                                                                                                           |
+  |                          |        | - 1: Only route on CZF file hit                                                                                                      |
+  |                          |        | - 2: Only route on CZF hit or when from USA                                                                                          |
+  |                          |        |                                                                                                                                      |
+  |                          |        | Note that this does not prevent access to content or makes content secure; it just prevents                                          |
+  |                          |        | routing to the content by Traffic Router.                                                                                            |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``geoLimitCountries``    | string |                                                                                                                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``geoProvider``          | string |                                                                                                                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``globalMaxMbps``        | string | The maximum global bandwidth allowed on this deliveryservice. If exceeded, the traffic routes to the                                 |
+  |                          |        | dnsByPassIp* for DNS deliveryservices and to the httpBypassFqdn for HTTP deliveryservices.                                           |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``globalMaxTps``         | string | The maximum global transactions per second allowed on this deliveryservice. When this is exceeded                                    |
+  |                          |        | traffic will be sent to the dnsByPassIp* for DNS deliveryservices and to the httpBypassFqdn for                                      |
+  |                          |        | HTTP deliveryservices                                                                                                                |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``httpBypassFqdn``       | string | The HTTP destination to use for bypass on an HTTP deliveryservice - bypass starts when serving more than the                         |
+  |                          |        | globalMaxMbps traffic on this deliveryservice.                                                                                       |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``id``                   | string | The deliveryservice id (database row number).                                                                                        |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``infoUrl``              | string | Use this to add a URL that points to more information about that deliveryservice.                                                    |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``initialDispersion``    | string |                                                                                                                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``ipv6RoutingEnabled``   |  bool  | false: send IPv4 address of Traffic Router to client on HTTP type del.                                                               |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``lastUpdated``          | string |                                                                                                                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``logsEnabled``          |  bool  |                                                                                                                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``longDesc``             | string | Description field 1.                                                                                                                 |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``longDesc1``            | string | Description field 2.                                                                                                                 |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``longDesc2``            | string | Description field 2.                                                                                                                 |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``>>type``               | string | The type of MatchList (one of :ref:to-api-v11-types use_in_table='regex').                                                           |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``>>setNumber``          | string | The set Number of the matchList.                                                                                                     |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``>>pattern``            | string | The regexp for the matchList.                                                                                                        |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``maxDnsAnswers``        | string | The maximum number of IPs to put in a A/AAAA response for a DNS deliveryservice (0 means all                                         |
+  |                          |        | available).                                                                                                                          |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``midHeaderRewrite``     | string | The MID header rewrite actions to perform.                                                                                           |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``missLat``              | string | The latitude to use when the client cannot be found in the CZF or the Geo lookup.                                                    |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``missLong``             | string | The longitude to use when the client cannot be found in the CZF or the Geo lookup.                                                   |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``multiSiteOrigin``      |  bool  | Is the Multi Site Origin feature enabled for this delivery service (0=false, 1=true). See :ref:`rl-multi-site-origin`                |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``multiSiteOriginAlgor`` |  bool  | Is the Multi Site Origin feature enabled for this delivery service (0=false, 1=true). See :ref:`rl-multi-site-origin`                |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``orgServerFqdn``        | string | The origin server base URL (FQDN when used in this instance, includes the                                                            |
+  |                          |        | protocol (http:// or https://) for use in retrieving content from the origin server.                                                 |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``originShield``         | string |                                                                                                                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``profileDescription``   | string | The description of the Traffic Router Profile with which this deliveryservice is associated.                                         |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``profileId``            | string | The id of the Traffic Router Profile with which this deliveryservice is associated.                                                  |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``profileName``          | string | The name of the Traffic Router Profile with which this deliveryservice is associated.                                                |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``protocol``             | string | - 0: serve with http:// at EDGE                                                                                                      |
+  |                          |        | - 1: serve with https:// at EDGE                                                                                                     |
+  |                          |        | - 2: serve with both http:// and https:// at EDGE                                                                                    |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``qstringIgnore``        | string | - 0: no special query string handling; it is for use in the cache-key and pass up to origin.                                         |
+  |                          |        | - 1: ignore query string in cache-key, but pass it up to parent and or origin.                                                       |
+  |                          |        | - 2: drop query string at edge, and do not use it in the cache-key.                                                                  |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``rangeRequestHandling`` | string | How to treat range requests:                                                                                                         |
+  |                          |        |                                                                                                                                      |
+  |                          |        | - 0 Do not cache (ranges requested from files taht are already cached due to a non range request will be a HIT)                      |
+  |                          |        | - 1 Use the `background_fetch <https://docs.trafficserver.apache.org/en/latest/reference/plugins/background_fetch.en.html>`_ plugin. |
+  |                          |        | - 2 Use the cache_range_requests plugin.                                                                                             |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``regexRemap``           | string | Regex Remap rule to apply to this delivery service at the Edge tier.                                                                 |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``regionalGeoBlocking``  |  bool  | Regex Remap rule to apply to this delivery service at the Edge tier.                                                                 |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``remapText``            | string | Additional raw remap line text.                                                                                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``signed``               |  bool  | - false: token based auth (see :ref:token-based-auth) is not enabled for this deliveryservice.                                       |
+  |                          |        | - true: token based auth is enabled for this deliveryservice.                                                                        |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``sslKeyVersion``        | string |                                                                                                                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``trRequestHeaders``     | string |                                                                                                                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``trResponseHeaders``    | string |                                                                                                                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``type``                 | string | The type of this deliveryservice (one of :ref:to-api-v11-types use_in_table='deliveryservice').                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``typeId``               | string | The type of this deliveryservice (one of :ref:to-api-v11-types use_in_table='deliveryservice').                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``xmlId``                | string | Unique string that describes this deliveryservice.                                                                                   |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+
+  **Response Example** ::
+
+    {
+      "response": [
+        {
+            "active": true,
+            "cacheurl": null,
+            "ccrDnsTtl": "3600",
+            "cdnId": "2",
+            "cdnName": "over-the-top",
+            "checkPath": "",
+            "displayName": "My Cool Delivery Service",
+            "dnsBypassCname": "",
+            "dnsBypassIp": "",
+            "dnsBypassIp6": "",
+            "dnsBypassTtl": "30",
+            "dscp": "40",
+            "edgeHeaderRewrite": null,
+            "exampleURLs": [
+                "http://edge.foo-ds.foo.bar.net"
+            ],
+            "geoLimit": "0",
+            "geoLimitCountries": null,
+            "geoLimitRedirectURL": null,
+            "geoProvider": "0",
+            "globalMaxMbps": null,
+            "globalMaxTps": "0",
+            "httpBypassFqdn": "",
+            "id": "442",
+            "infoUrl": "",
+            "initialDispersion": "1",
+            "ipv6RoutingEnabled": true,
+            "lastUpdated": "2016-01-26 08:49:35",
+            "logsEnabled": false,
+            "longDesc": "",
+            "longDesc1": "",
+            "longDesc2": "",
+            "matchList": [
+                {
+                    "pattern": ".*\\.foo-ds\\..*",
+                    "setNumber": "0",
+                    "type": "HOST_REGEXP"
+                }
+            ],
+            "maxDnsAnswers": "0",
+            "midHeaderRewrite": null,
+            "missLat": "41.881944",
+            "missLong": "-87.627778",
+            "multiSiteOrigin": false,
+            "multiSiteOriginAlgorithm": null,
+            "orgServerFqdn": "http://baz.boo.net",
+            "originShield": null,
+            "profileDescription": "Content Router for over-the-top",
+            "profileId": "5",
+            "profileName": "ROUTER_TOP",
+            "protocol": "0",
+            "qstringIgnore": "1",
+            "rangeRequestHandling": "0",
+            "regexRemap": null,
+            "regionalGeoBlocking": false,
+            "remapText": null,
+            "signed": false,
+            "sslKeyVersion": "0",
+            "trRequestHeaders": null,
+            "trResponseHeaders": "Access-Control-Allow-Origin: *",
+            "type": "HTTP",
+            "typeId": "8",
+            "xmlId": "foo-ds"
+        }
+        { .. },
+        { .. }
+      ]
+    }
+
+|
+
 
 **GET /api/1.2/user/current.json**
 

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/52a20853/docs/latest/_sources/development/traffic_portal.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/development/traffic_portal.txt b/docs/latest/_sources/development/traffic_portal.txt
index 691c4b2..8950d12 100644
--- a/docs/latest/_sources/development/traffic_portal.txt
+++ b/docs/latest/_sources/development/traffic_portal.txt
@@ -1,5 +1,4 @@
 ..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
 ..
 .. Licensed under the Apache License, Version 2.0 (the "License");
 .. you may not use this file except in compliance with the License.
@@ -15,7 +14,7 @@
 ..
 
 Traffic Portal
-*************
+**************
 
 Introduction
 ============

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/52a20853/docs/latest/_sources/development/traffic_router.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/development/traffic_router.txt b/docs/latest/_sources/development/traffic_router.txt
index a9baaa3..383613b 100644
--- a/docs/latest/_sources/development/traffic_router.txt
+++ b/docs/latest/_sources/development/traffic_router.txt
@@ -1,5 +1,4 @@
 .. 
-.. Copyright 2015 Comcast Cable Communications Management, LLC
 .. 
 .. Licensed under the Apache License, Version 2.0 (the "License");
 .. you may not use this file except in compliance with the License.
@@ -87,20 +86,22 @@ To install the Traffic Router Developer environment:
 
 1. Clone the traffic_control repository using Git.
 2. Change directories into ``traffic_control/traffic_router``.
-3. Set the environment variable TRAFFIC_MONITOR_HOSTS to be a semicolon delimited list of Traffic Monitors that can be accessed during integration tests
-4. core/src/test/resources no longer exists
-5. core/src/test/conf contains a properties file for accessing Traffic Ops
-6. Default configuration values now reside in core/src/main/webapp/WEB-INF/applicationContext.xml
-7. The above values may be overridden by creating and/or modifying the property files listed in core/src/main/resources/applicationProperties.xml
-8. Pre-existing properties files are still honored by Traffic Router
-
-+-------------------------------------+------------------------------------------------------------------------------------------------------------------+
-|              Parameter              |                                                      Value                                                       |
-+=====================================+==================================================================================================================+
-| ``traffic_monitor.bootstrap.hosts`` | FQDN and port of the Traffic Monitor instance(s), separated by semicolons as necessary (do not include http://). |
-+-------------------------------------+------------------------------------------------------------------------------------------------------------------+
-
-4. Import the existing git repo into Eclipse:
+3. Follow the instructions in "README.DNSSEC" for DNSSEC support.
+4. Set the environment variable TRAFFIC_MONITOR_HOSTS to be a semicolon delimited list of Traffic Monitors that can be accessed during integration tests
+5. Additional configuration is set using the below files: 
+	* core/src/test/resources no longer exists
+	* core/src/test/conf/traffic_ops.properties file holds the credentials for accessing Traffic Ops.
+	* Default configuration values now reside in core/src/main/webapp/WEB-INF/applicationContext.xml
+	* The above values may be overridden by creating and/or modifying the property files listed in core/src/main/resources/applicationProperties.xml
+	* Pre-existing properties files are still honored by Traffic Router. For example traffic_monitor.properties:
+
+	  +-------------------------------------+------------------------------------------------------------------------------------------------------------------+
+	  |              Parameter              |                                                      Value                                                       |
+	  +=====================================+==================================================================================================================+
+	  | ``traffic_monitor.bootstrap.hosts`` | FQDN and port of the Traffic Monitor instance(s), separated by semicolons as necessary (do not include http://). |
+	  +-------------------------------------+------------------------------------------------------------------------------------------------------------------+
+
+6. Import the existing git repo into Eclipse:
 
 	a. File -> Import -> Git -> Projects from Git; Next
 	b. Existing local repository; Next
@@ -110,9 +111,9 @@ To install the Traffic Router Developer environment:
 	f. Ensure ``traffic_router_api``, ``traffic_router_connector``, and ``traffic_router_core`` are checked; Finish (this step can take several minutes to complete)
 	g. Ensure ``traffic_router_api``, ``traffic_router_connector``, and ``traffic_router_core`` have been opened by Eclipse after importing
 
-5. From the terminal, run ``mvn clean verify`` from the ``traffic_router`` directory
+7. From the terminal, run ``mvn clean verify`` from the ``traffic_router`` directory
 
-6. Start the embedded Jetty instance for Core from within Eclipse
+8. Start the embedded Jetty instance for Core from within Eclipse
 
 	a. In the package explorer, expand ``traffic_router_core``
 	b. Expand ``src/test/java``
@@ -121,7 +122,7 @@ To install the Traffic Router Developer environment:
 
 		..  Note:: If an error is displayed in the Console, run ``mvn clean verify`` from the ``traffic_router`` directory
 
-7. Traffic Router Core should now be running; the HTTP routing interface is available on http://localhost:8081, while the DNS server and routing interface is available on localhost:1053 via TCP and UDP.
+9. Traffic Router Core should now be running; the HTTP routing interface is available on http://localhost:8081, while HTTPS is available on http://localhost:8443. The DNS server and routing interface is available on localhost:1053 via TCP and UDP.
 
 Test Cases
 ==========

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/52a20853/docs/latest/_sources/development/traffic_router/traffic_router_api.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/development/traffic_router/traffic_router_api.txt b/docs/latest/_sources/development/traffic_router/traffic_router_api.txt
index 00f3e8a..d742276 100644
--- a/docs/latest/_sources/development/traffic_router/traffic_router_api.txt
+++ b/docs/latest/_sources/development/traffic_router/traffic_router_api.txt
@@ -1,5 +1,4 @@
 ..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
 ..
 .. Licensed under the Apache License, Version 2.0 (the "License");
 .. you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/52a20853/docs/latest/_sources/development/traffic_server.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/development/traffic_server.txt b/docs/latest/_sources/development/traffic_server.txt
index 25014b3..f8a78fb 100644
--- a/docs/latest/_sources/development/traffic_server.txt
+++ b/docs/latest/_sources/development/traffic_server.txt
@@ -1,5 +1,4 @@
 .. 
-.. Copyright 2015 Comcast Cable Communications Management, LLC
 .. 
 .. Licensed under the Apache License, Version 2.0 (the "License");
 .. you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/52a20853/docs/latest/_sources/development/traffic_stats.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/development/traffic_stats.txt b/docs/latest/_sources/development/traffic_stats.txt
index 4c78bec..02317f7 100644
--- a/docs/latest/_sources/development/traffic_stats.txt
+++ b/docs/latest/_sources/development/traffic_stats.txt
@@ -1,5 +1,4 @@
 ..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
 ..
 .. Licensed under the Apache License, Version 2.0 (the "License");
 .. you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/52a20853/docs/latest/_sources/faq/administration.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/faq/administration.txt b/docs/latest/_sources/faq/administration.txt
index a003811..feecff7 100644
--- a/docs/latest/_sources/faq/administration.txt
+++ b/docs/latest/_sources/faq/administration.txt
@@ -1,5 +1,4 @@
 .. 
-.. Copyright 2015 Comcast Cable Communications Management, LLC
 .. 
 .. Licensed under the Apache License, Version 2.0 (the "License");
 .. you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/52a20853/docs/latest/_sources/faq/development.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/faq/development.txt b/docs/latest/_sources/faq/development.txt
index cb62481..8518eeb 100644
--- a/docs/latest/_sources/faq/development.txt
+++ b/docs/latest/_sources/faq/development.txt
@@ -1,5 +1,4 @@
 .. 
-.. Copyright 2015 Comcast Cable Communications Management, LLC
 .. 
 .. Licensed under the Apache License, Version 2.0 (the "License");
 .. you may not use this file except in compliance with the License.
@@ -19,4 +18,4 @@ Development
 
 How can I become involved?
 ==========================
-	See our `CONTRIBUTING <https://github.com/Comcast/traffic_control/blob/master/CONTRIBUTING.md>`_ page.
\ No newline at end of file
+	See our `CONTRIBUTING <https://github.com/apache/incubator-trafficcontrol/blob/master/CONTRIBUTING.md>`_ page.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/52a20853/docs/latest/_sources/faq/general.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/faq/general.txt b/docs/latest/_sources/faq/general.txt
index c2364e2..747aa60 100644
--- a/docs/latest/_sources/faq/general.txt
+++ b/docs/latest/_sources/faq/general.txt
@@ -1,5 +1,4 @@
 .. 
-.. Copyright 2015 Comcast Cable Communications Management, LLC
 .. 
 .. Licensed under the Apache License, Version 2.0 (the "License");
 .. you may not use this file except in compliance with the License.
@@ -34,7 +33,7 @@ Who is using Traffic Control?
 
 How do I get help with Traffic Control?
 =======================================
-	Hop on to our Slack Channel by filling out `this form <https://goo.gl/Suzakj>`_, or send a question to our google forum `here <https://groups.google.com/forum/#!forum/traffic_control>`_.
+	Hop on to our Slack Channel by filling out `this form <https://goo.gl/Suzakj>`_, or send a question to our mailing list `here <ma...@trafficcontrol.incubator.apache.org>`_.
 	
 What is Rascal?
 ===============
@@ -50,4 +49,4 @@ What is Twelve Monkeys?
 
 What license is Traffic Control released under?
 ===============================================
-	See the `LICENSE file <https://github.com/Comcast/traffic_control/blob/master/LICENSE>`_
+	See the `LICENSE file <https://github.com/apache/incubator-trafficcontrol/blob/master/LICENSE>`_

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/52a20853/docs/latest/_sources/faq/index.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/faq/index.txt b/docs/latest/_sources/faq/index.txt
index c72fbe4..82ea912 100644
--- a/docs/latest/_sources/faq/index.txt
+++ b/docs/latest/_sources/faq/index.txt
@@ -1,5 +1,4 @@
 .. 
-.. Copyright 2015 Comcast Cable Communications Management, LLC
 .. 
 .. Licensed under the Apache License, Version 2.0 (the "License");
 .. you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/52a20853/docs/latest/_sources/glossary.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/glossary.txt b/docs/latest/_sources/glossary.txt
index b32bea9..a932579 100644
--- a/docs/latest/_sources/glossary.txt
+++ b/docs/latest/_sources/glossary.txt
@@ -1,3 +1,18 @@
+..
+..
+.. 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.
+..
+
 .. _glossary:
 
 Glossary

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/52a20853/docs/latest/_sources/index.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/index.txt b/docs/latest/_sources/index.txt
index 2c49467..2a12096 100644
--- a/docs/latest/_sources/index.txt
+++ b/docs/latest/_sources/index.txt
@@ -1,5 +1,4 @@
 .. 
-.. Copyright 2015 Comcast Cable Communications Management, LLC
 .. 
 .. Licensed under the Apache License, Version 2.0 (the "License");
 .. you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/52a20853/docs/latest/_sources/overview/index.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/overview/index.txt b/docs/latest/_sources/overview/index.txt
index 095dda0..65dd20e 100644
--- a/docs/latest/_sources/overview/index.txt
+++ b/docs/latest/_sources/overview/index.txt
@@ -1,5 +1,4 @@
 .. 
-.. Copyright 2015 Comcast Cable Communications Management, LLC
 .. 
 .. Licensed under the Apache License, Version 2.0 (the "License");
 .. you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/52a20853/docs/latest/_sources/overview/introduction.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/overview/introduction.txt b/docs/latest/_sources/overview/introduction.txt
index c379578..a983820 100644
--- a/docs/latest/_sources/overview/introduction.txt
+++ b/docs/latest/_sources/overview/introduction.txt
@@ -1,5 +1,4 @@
 .. 
-.. Copyright 2015 Comcast Cable Communications Management, LLC
 .. 
 .. Licensed under the Apache License, Version 2.0 (the "License");
 .. you may not use this file except in compliance with the License.
@@ -18,7 +17,7 @@ Introduction
 ============
 Traffic Control is a control plane for a CDN, which includes all of the components mentioned in the CDN Basics section, except for the Log File Analysis System. The caching software chosen for Traffic Control is `Apache Traffic Server <http://trafficserver.apache.org/>`_ (ATS). Although the current release only supports ATS as a cache, this may change with future releases. 
 
-Traffic Control was first developed at Comcast for internal use and released to Open Source in April of 2015.
+Traffic Control was first developed at Comcast for internal use and released to Open Source in April of 2015. Traffic Control moved into the Apache Incubator in August of 2016.
 
 Traffic Control implements the blue boxes in the architecture diagram below. 
 

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/52a20853/docs/latest/_sources/overview/traffic_monitor.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/overview/traffic_monitor.txt b/docs/latest/_sources/overview/traffic_monitor.txt
index e25fcbc..1a3222f 100644
--- a/docs/latest/_sources/overview/traffic_monitor.txt
+++ b/docs/latest/_sources/overview/traffic_monitor.txt
@@ -1,5 +1,4 @@
 .. 
-.. Copyright 2015 Comcast Cable Communications Management, LLC
 .. 
 .. Licensed under the Apache License, Version 2.0 (the "License");
 .. you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/52a20853/docs/latest/_sources/overview/traffic_ops.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/overview/traffic_ops.txt b/docs/latest/_sources/overview/traffic_ops.txt
index 59720e2..9cc72ee 100644
--- a/docs/latest/_sources/overview/traffic_ops.txt
+++ b/docs/latest/_sources/overview/traffic_ops.txt
@@ -1,5 +1,4 @@
 .. 
-.. Copyright 2015 Comcast Cable Communications Management, LLC
 .. 
 .. Licensed under the Apache License, Version 2.0 (the "License");
 .. you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/52a20853/docs/latest/_sources/overview/traffic_portal.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/overview/traffic_portal.txt b/docs/latest/_sources/overview/traffic_portal.txt
index a52ee84..20325e4 100644
--- a/docs/latest/_sources/overview/traffic_portal.txt
+++ b/docs/latest/_sources/overview/traffic_portal.txt
@@ -1,5 +1,4 @@
 .. 
-.. Copyright 2015 Comcast Cable Communications Management, LLC
 .. 
 .. Licensed under the Apache License, Version 2.0 (the "License");
 .. you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/52a20853/docs/latest/_sources/overview/traffic_router.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/overview/traffic_router.txt b/docs/latest/_sources/overview/traffic_router.txt
index 0f72a50..f9ed1bc 100644
--- a/docs/latest/_sources/overview/traffic_router.txt
+++ b/docs/latest/_sources/overview/traffic_router.txt
@@ -1,5 +1,4 @@
 .. 
-.. Copyright 2015 Comcast Cable Communications Management, LLC
 .. 
 .. Licensed under the Apache License, Version 2.0 (the "License");
 .. you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/52a20853/docs/latest/_sources/overview/traffic_server.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/overview/traffic_server.txt b/docs/latest/_sources/overview/traffic_server.txt
index 8fd0e15..4928e4e 100644
--- a/docs/latest/_sources/overview/traffic_server.txt
+++ b/docs/latest/_sources/overview/traffic_server.txt
@@ -1,5 +1,4 @@
 .. 
-.. Copyright 2015 Comcast Cable Communications Management, LLC
 .. 
 .. Licensed under the Apache License, Version 2.0 (the "License");
 .. you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/52a20853/docs/latest/_sources/overview/traffic_stats.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/overview/traffic_stats.txt b/docs/latest/_sources/overview/traffic_stats.txt
index 874b10d..10981de 100644
--- a/docs/latest/_sources/overview/traffic_stats.txt
+++ b/docs/latest/_sources/overview/traffic_stats.txt
@@ -1,5 +1,4 @@
 ..
-.. Copyright 2015 Comcast Cable Communications Management, LLC
 ..
 .. Licensed under the Apache License, Version 2.0 (the "License");
 .. you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/52a20853/docs/latest/_sources/overview/traffic_vault.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/overview/traffic_vault.txt b/docs/latest/_sources/overview/traffic_vault.txt
index 33efdd3..933b86b 100644
--- a/docs/latest/_sources/overview/traffic_vault.txt
+++ b/docs/latest/_sources/overview/traffic_vault.txt
@@ -1,5 +1,4 @@
 .. 
-.. Copyright 2015 Comcast Cable Communications Management, LLC
 .. 
 .. Licensed under the Apache License, Version 2.0 (the "License");
 .. you may not use this file except in compliance with the License.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/52a20853/docs/latest/_static/basic.css
----------------------------------------------------------------------
diff --git a/docs/latest/_static/basic.css b/docs/latest/_static/basic.css
index 2b513f0..9fa77d8 100644
--- a/docs/latest/_static/basic.css
+++ b/docs/latest/_static/basic.css
@@ -4,7 +4,7 @@
  *
  * Sphinx stylesheet -- basic theme.
  *
- * :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
  *
  */
@@ -52,8 +52,6 @@ div.sphinxsidebar {
     width: 230px;
     margin-left: -100%;
     font-size: 90%;
-    word-wrap: break-word;
-    overflow-wrap : break-word;
 }
 
 div.sphinxsidebar ul {
@@ -85,6 +83,10 @@ div.sphinxsidebar #searchbox input[type="text"] {
     width: 170px;
 }
 
+div.sphinxsidebar #searchbox input[type="submit"] {
+    width: 30px;
+}
+
 img {
     border: 0;
     max-width: 100%;
@@ -185,13 +187,6 @@ div.genindex-jumpbox {
 
 /* -- general body styles --------------------------------------------------- */
 
-div.body p, div.body dd, div.body li, div.body blockquote {
-    -moz-hyphens: auto;
-    -ms-hyphens: auto;
-    -webkit-hyphens: auto;
-    hyphens: auto;
-}
-
 a.headerlink {
     visibility: hidden;
 }

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/52a20853/docs/latest/_static/doctools.js
----------------------------------------------------------------------
diff --git a/docs/latest/_static/doctools.js b/docs/latest/_static/doctools.js
index 8163495..c7bfe76 100644
--- a/docs/latest/_static/doctools.js
+++ b/docs/latest/_static/doctools.js
@@ -4,7 +4,7 @@
  *
  * Sphinx JavaScript utilities for all documentation.
  *
- * :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
  *
  */
@@ -124,7 +124,6 @@ var Documentation = {
     this.fixFirefoxAnchorBug();
     this.highlightSearchWords();
     this.initIndexTable();
-    
   },
 
   /**
@@ -253,29 +252,6 @@ var Documentation = {
     });
     var url = parts.join('/');
     return path.substring(url.lastIndexOf('/') + 1, path.length - 1);
-  },
-
-  initOnKeyListeners: function() {
-    $(document).keyup(function(event) {
-      var activeElementType = document.activeElement.tagName;
-      // don't navigate when in search box or textarea
-      if (activeElementType !== 'TEXTAREA' && activeElementType !== 'INPUT' && activeElementType !== 'SELECT') {
-        switch (event.keyCode) {
-          case 37: // left
-            var prevHref = $('link[rel="prev"]').prop('href');
-            if (prevHref) {
-              window.location.href = prevHref;
-              return false;
-            }
-          case 39: // right
-            var nextHref = $('link[rel="next"]').prop('href');
-            if (nextHref) {
-              window.location.href = nextHref;
-              return false;
-            }
-        }
-      }
-    });
   }
 };
 
@@ -284,4 +260,4 @@ _ = Documentation.gettext;
 
 $(document).ready(function() {
   Documentation.init();
-});
\ No newline at end of file
+});

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/52a20853/docs/latest/_static/pygments.css
----------------------------------------------------------------------
diff --git a/docs/latest/_static/pygments.css b/docs/latest/_static/pygments.css
index 8213e90..57eadc0 100644
--- a/docs/latest/_static/pygments.css
+++ b/docs/latest/_static/pygments.css
@@ -4,10 +4,8 @@
 .highlight .err { border: 1px solid #FF0000 } /* Error */
 .highlight .k { color: #007020; font-weight: bold } /* Keyword */
 .highlight .o { color: #666666 } /* Operator */
-.highlight .ch { color: #408090; font-style: italic } /* Comment.Hashbang */
 .highlight .cm { color: #408090; font-style: italic } /* Comment.Multiline */
 .highlight .cp { color: #007020 } /* Comment.Preproc */
-.highlight .cpf { color: #408090; font-style: italic } /* Comment.PreprocFile */
 .highlight .c1 { color: #408090; font-style: italic } /* Comment.Single */
 .highlight .cs { color: #408090; background-color: #fff0f0 } /* Comment.Special */
 .highlight .gd { color: #A00000 } /* Generic.Deleted */

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/52a20853/docs/latest/_static/searchtools.js
----------------------------------------------------------------------
diff --git a/docs/latest/_static/searchtools.js b/docs/latest/_static/searchtools.js
index 066857c..0e794fd 100644
--- a/docs/latest/_static/searchtools.js
+++ b/docs/latest/_static/searchtools.js
@@ -2,15 +2,14 @@
  * searchtools.js_t
  * ~~~~~~~~~~~~~~~~
  *
- * Sphinx JavaScript utilities for the full-text search.
+ * Sphinx JavaScript utilties for the full-text search.
  *
- * :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
  *
  */
 
 
-/* Non-minified version JS is _stemmer.js if file is provided */ 
 /**
  * Porter Stemmer
  */
@@ -374,7 +373,8 @@ var Search = {
     }
 
     // lookup as search terms in fulltext
-    results = results.concat(this.performTermsSearch(searchterms, excluded, terms, titleterms));
+    results = results.concat(this.performTermsSearch(searchterms, excluded, terms, Scorer.term))
+                     .concat(this.performTermsSearch(searchterms, excluded, titleterms, Scorer.title));
 
     // let the scorer override scores with a custom scoring function
     if (Scorer.score) {
@@ -538,47 +538,23 @@ var Search = {
   /**
    * search for full-text terms in the index
    */
-  performTermsSearch : function(searchterms, excluded, terms, titleterms) {
+  performTermsSearch : function(searchterms, excluded, terms, score) {
     var filenames = this._index.filenames;
     var titles = this._index.titles;
 
-    var i, j, file;
+    var i, j, file, files;
     var fileMap = {};
-    var scoreMap = {};
     var results = [];
 
     // perform the search on the required terms
     for (i = 0; i < searchterms.length; i++) {
       var word = searchterms[i];
-      var files = [];
-      var _o = [
-        {files: terms[word], score: Scorer.term},
-        {files: titleterms[word], score: Scorer.title}
-      ];
-
       // no match but word was a required one
-      if ($u.every(_o, function(o){return o.files === undefined;})) {
+      if ((files = terms[word]) === undefined)
         break;
+      if (files.length === undefined) {
+        files = [files];
       }
-      // found search word in contents
-      $u.each(_o, function(o) {
-        var _files = o.files;
-        if (_files === undefined)
-          return
-
-        if (_files.length === undefined)
-          _files = [_files];
-        files = files.concat(_files);
-
-        // set score for the word in each file to Scorer.term
-        for (j = 0; j < _files.length; j++) {
-          file = _files[j];
-          if (!(file in scoreMap))
-            scoreMap[file] = {}
-          scoreMap[file][word] = o.score;
-        }
-      });
-
       // create the mapping
       for (j = 0; j < files.length; j++) {
         file = files[j];
@@ -600,9 +576,7 @@ var Search = {
       // ensure that none of the excluded terms is in the search result
       for (i = 0; i < excluded.length; i++) {
         if (terms[excluded[i]] == file ||
-            titleterms[excluded[i]] == file ||
-            $u.contains(terms[excluded[i]] || [], file) ||
-            $u.contains(titleterms[excluded[i]] || [], file)) {
+          $u.contains(terms[excluded[i]] || [], file)) {
           valid = false;
           break;
         }
@@ -610,9 +584,6 @@ var Search = {
 
       // if we have still a valid result we can add it to the result list
       if (valid) {
-        // select one (max) score for the file.
-        // for better ranking, we should calculate ranking by using words statistics like basic tf-idf...
-        var score = $u.max($u.map(fileMap[file], function(w){return scoreMap[file][w]}));
         results.push([filenames[file], titles[file], '', null, score]);
       }
     }
@@ -623,7 +594,7 @@ var Search = {
    * helper function to return a node containing the
    * search summary for a given text. keywords is a list
    * of stemmed words, hlwords is the list of normal, unstemmed
-   * words. the first one is used to find the occurrence, the
+   * words. the first one is used to find the occurance, the
    * latter for highlighting it.
    */
   makeSearchSummary : function(text, keywords, hlwords) {

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/52a20853/docs/latest/_static/theme_overrides.css
----------------------------------------------------------------------
diff --git a/docs/latest/_static/theme_overrides.css b/docs/latest/_static/theme_overrides.css
index 00a730f..a00e0b8 100644
--- a/docs/latest/_static/theme_overrides.css
+++ b/docs/latest/_static/theme_overrides.css
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
 /* override table width restrictions */
 .wy-table-responsive table td, .wy-table-responsive table th {
     /* !important prevents the common CSS stylesheets from
@@ -10,8 +29,33 @@
     overflow: visible !important;
 }
 
+.wy-side-nav-search {
+  background-color: #000000;
+}
+
+.adminition-title {
+  background-color: #404040;
+}
+.wy-alert.wy-alert-info, .rst-content .note, .rst-content .wy-alert-info.attention, .rst-content .wy-alert-info.caution, .rst-content 
+.wy-alert-info.danger, .rst-content .wy-alert-info.error, .rst-content .wy-alert-info.hint, .rst-content .wy-alert-info.important, 
+.rst-content .wy-alert-info.tip, .rst-content .wy-alert-info.warning, .rst-content .seealso, .rst-content .wy-alert-info.admonition-todo {
+  background: #edf0f2;
+}
+
+.wy-alert.wy-alert-info .wy-alert-title, .rst-content .note .wy-alert-title, .rst-content .wy-alert-info.attention .wy-alert-title, 
+.rst-content .wy-alert-info.caution .wy-alert-title, .rst-content .wy-alert-info.danger .wy-alert-title, .rst-content .wy-alert-info.error 
+.wy-alert-title, .rst-content .wy-alert-info.hint .wy-alert-title, .rst-content .wy-alert-info.important .wy-alert-title, .rst-content 
+.wy-alert-info.tip .wy-alert-title, .rst-content .wy-alert-info.warning .wy-alert-title, .rst-content .seealso .wy-alert-title, .rst-content 
+.wy-alert-info.admonition-todo .wy-alert-title, .wy-alert.wy-alert-info .rst-content .admonition-title, .rst-content .wy-alert.wy-alert-info 
+.admonition-title, .rst-content .note .admonition-title, .rst-content .wy-alert-info.attention .admonition-title, .rst-content .wy-alert-info.caution 
+.admonition-title, .rst-content .wy-alert-info.danger .admonition-title, .rst-content .wy-alert-info.error .admonition-title, .rst-content 
+.wy-alert-info.hint .admonition-title, .rst-content .wy-alert-info.important .admonition-title, .rst-content .wy-alert-info.tip .admonition-title, 
+.rst-content .wy-alert-info.warning .admonition-title, .rst-content .seealso .admonition-title, .rst-content .wy-alert-info.admonition-todo .admonition-title {
+  background: #404040;
+}
+
 .wy-side-nav-search img {
-	width: 63% !important;
+	width: 33% !important;
 }
 
 .section {

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/52a20853/docs/latest/_static/websupport.js
----------------------------------------------------------------------
diff --git a/docs/latest/_static/websupport.js b/docs/latest/_static/websupport.js
index 98e7f40..28d65db 100644
--- a/docs/latest/_static/websupport.js
+++ b/docs/latest/_static/websupport.js
@@ -2,9 +2,9 @@
  * websupport.js
  * ~~~~~~~~~~~~~
  *
- * sphinx.websupport utilities for all documentation.
+ * sphinx.websupport utilties for all documentation.
  *
- * :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+ * :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
  *
  */

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/52a20853/docs/latest/admin/index.html
----------------------------------------------------------------------
diff --git a/docs/latest/admin/index.html b/docs/latest/admin/index.html
index 511c279..18d4174 100644
--- a/docs/latest/admin/index.html
+++ b/docs/latest/admin/index.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Administrator\u2019s Guide &mdash; Traffic Control 1.7 documentation </title>
+  <title>Administrator\u2019s Guide &mdash; Traffic Control master documentation </title>
   
 
   
@@ -33,7 +33,7 @@
   
 
   
-    <link rel="top" title="Traffic Control 1.7 documentation" href="../index.html"/>
+    <link rel="top" title="Traffic Control master documentation" href="../index.html"/>
         <link rel="next" title="Installing Traffic Ops" href="traffic_ops_install.html"/>
         <link rel="prev" title="Traffic Vault" href="../overview/traffic_vault.html"/> 
 
@@ -57,7 +57,7 @@
 
         
           
-          <img src="../_static/tc_logo.png" class="logo" />
+          <img src="../_static/tc_logo_c_only.png" class="logo" />
         
         </a>
 
@@ -100,7 +100,7 @@
 </li>
 </ul>
 <ul class="current">
-<li class="toctree-l1 current"><a class="current reference internal" href="#">Administrator&#8217;s Guide</a><ul>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Administrator&#8217;s Guide</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="traffic_ops_install.html">Installing Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" href="traffic_ops_config.html">Configuring Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" href="traffic_ops_using.html">Using Traffic Ops</a></li>
@@ -158,7 +158,7 @@
         <div class="rst-content">
           <div role="navigation" aria-label="breadcrumbs navigation">
   <ul class="wy-breadcrumbs">
-    <li><a href="../index.html">Traffic Control 1.7</a> &raquo;</li>
+    <li><a href="../index.html">Traffic Control master</a> &raquo;</li>
       
     <li>Administrator&#8217;s Guide</li>
       <li class="wy-breadcrumbs-aside">
@@ -307,12 +307,13 @@
 <li class="toctree-l3"><a class="reference internal" href="traffic_router.html#suggested-way-of-setting-up-an-https-delivery-service">Suggested Way of Setting up an HTTPS Delivery Service</a></li>
 </ul>
 </li>
+<li class="toctree-l2"><a class="reference internal" href="traffic_router.html#tuning-recommendations">Tuning Recommendations</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="traffic_stats.html">Traffic Stats Administration</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="traffic_stats.html#installation">Installation</a></li>
 <li class="toctree-l2"><a class="reference internal" href="traffic_stats.html#configuration">Configuration</a></li>
-<li class="toctree-l2"><a class="reference internal" href="traffic_stats.html#id2">InfluxDb Tools</a></li>
+<li class="toctree-l2"><a class="reference internal" href="traffic_stats.html#id1">InfluxDb Tools</a></li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="traffic_server.html">Traffic Server Administration</a><ul>
@@ -384,7 +385,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../',
-            VERSION:'1.7',
+            VERSION:'master',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/52a20853/docs/latest/admin/quick_howto/dnssec.html
----------------------------------------------------------------------
diff --git a/docs/latest/admin/quick_howto/dnssec.html b/docs/latest/admin/quick_howto/dnssec.html
index c5c25f2..6efa6be 100644
--- a/docs/latest/admin/quick_howto/dnssec.html
+++ b/docs/latest/admin/quick_howto/dnssec.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Configure DNSSEC &mdash; Traffic Control 1.7 documentation </title>
+  <title>Configure DNSSEC &mdash; Traffic Control master documentation </title>
   
 
   
@@ -33,7 +33,7 @@
   
 
   
-    <link rel="top" title="Traffic Control 1.7 documentation" href="../../index.html"/>
+    <link rel="top" title="Traffic Control master documentation" href="../../index.html"/>
         <link rel="up" title="Quick How To Guides" href="index.html"/>
         <link rel="next" title="Configure Federations" href="federations.html"/>
         <link rel="prev" title="Configure Multi Site Origin" href="multi_site.html"/> 
@@ -58,7 +58,7 @@
 
         
           
-          <img src="../../_static/tc_logo.png" class="logo" />
+          <img src="../../_static/tc_logo_c_only.png" class="logo" />
         
         </a>
 
@@ -159,7 +159,7 @@
         <div class="rst-content">
           <div role="navigation" aria-label="breadcrumbs navigation">
   <ul class="wy-breadcrumbs">
-    <li><a href="../../index.html">Traffic Control 1.7</a> &raquo;</li>
+    <li><a href="../../index.html">Traffic Control master</a> &raquo;</li>
       
           <li><a href="../index.html">Administrator&#8217;s Guide</a> &raquo;</li>
       
@@ -199,7 +199,7 @@
 <ol class="arabic simple">
 <li>Go to Tools-&gt;Manage DNSSEC Keys choose a CDN and click Manage DNSSEC Keys</li>
 </ol>
-<a class="reference internal image-reference" href="../../_images/dnssec01.png"><img alt="../../_images/dnssec01.png" class="align-center" src="../../_images/dnssec01.png" style="width: 1100.0px; height: 280.0px;" /></a>
+<a class="reference internal image-reference" href="../../_images/dnssec01.png"><img alt="../../_images/dnssec01.png" class="align-center" src="../../_images/dnssec01.png" /></a>
 <ol class="arabic" start="2">
 <li><p class="first">Generate keys for a CDN by clicking Generate Keys then entering the following information:</p>
 <blockquote>
@@ -213,20 +213,20 @@
 <p>Depending upon the number of Delivery Services in the CDN, generating DNSSEC keys may take serveral seconds.</p>
 </li>
 </ol>
-<a class="reference internal image-reference" href="../../_images/dnssec02.png"><img alt="../../_images/dnssec02.png" class="align-center" src="../../_images/dnssec02.png" style="width: 747.0px; height: 454.0px;" /></a>
+<a class="reference internal image-reference" href="../../_images/dnssec02.png"><img alt="../../_images/dnssec02.png" class="align-center" src="../../_images/dnssec02.png" /></a>
 <ol class="arabic" start="3">
 <li><p class="first">In order for DNSSEC to work properly, the DS Record information needs to be added to the parent zone of the CDN&#8217;s domain (e.g. If       the CDN&#8217;s domain is &#8216;cdn.kabletown.net&#8217; the parent zone is &#8216;kabletown.net&#8217;).</p>
 <p>If you control your parent zone you can enter this information yourself, otherwise you will need to work with your DNS team to get the DS Record added to the parent zone.</p>
 </li>
 </ol>
-<a class="reference internal image-reference" href="../../_images/dnssec03.png"><img alt="../../_images/dnssec03.png" class="align-center" src="../../_images/dnssec03.png" style="width: 499.1px; height: 190.4px;" /></a>
+<a class="reference internal image-reference" href="../../_images/dnssec03.png"><img alt="../../_images/dnssec03.png" class="align-center" src="../../_images/dnssec03.png" /></a>
 <ol class="arabic" start="4">
 <li><p class="first">Once DS Record information has been added to the parent zone, DNSSEC needs to be activated for the CDN so that Traffic Router will sign responses.</p>
 <p>Click on Tools -&gt; Manage DNSSEC Keys -&gt; Choose your CDN -&gt; On the Manage DNSSEC Keys page click the activate DNSSEC Keys button.</p>
 <p>This will add a &#8216;dnssec.enabled = &#8220;true&#8221;&#8217; entry to CRConfig for the chosen CDN.</p>
 </li>
 </ol>
-<a class="reference internal image-reference" href="../../_images/dnssec04.png"><img alt="../../_images/dnssec04.png" class="align-center" src="../../_images/dnssec04.png" style="width: 554.4px; height: 422.8px;" /></a>
+<a class="reference internal image-reference" href="../../_images/dnssec04.png"><img alt="../../_images/dnssec04.png" class="align-center" src="../../_images/dnssec04.png" /></a>
 <ol class="arabic" start="5">
 <li><p class="first">DNSSEC should now be active on your CDN and Traffic Router should be signing responses.</p>
 <blockquote>
@@ -278,7 +278,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../../',
-            VERSION:'1.7',
+            VERSION:'master',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/52a20853/docs/latest/admin/quick_howto/federations.html
----------------------------------------------------------------------
diff --git a/docs/latest/admin/quick_howto/federations.html b/docs/latest/admin/quick_howto/federations.html
index 2fb7c80..76f6922 100644
--- a/docs/latest/admin/quick_howto/federations.html
+++ b/docs/latest/admin/quick_howto/federations.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Configure Federations &mdash; Traffic Control 1.7 documentation </title>
+  <title>Configure Federations &mdash; Traffic Control master documentation </title>
   
 
   
@@ -33,7 +33,7 @@
   
 
   
-    <link rel="top" title="Traffic Control 1.7 documentation" href="../../index.html"/>
+    <link rel="top" title="Traffic Control master documentation" href="../../index.html"/>
         <link rel="up" title="Quick How To Guides" href="index.html"/>
         <link rel="next" title="Configure Regional Geo-blocking (RGB)" href="regionalgeo.html"/>
         <link rel="prev" title="Configure DNSSEC" href="dnssec.html"/> 
@@ -58,7 +58,7 @@
 
         
           
-          <img src="../../_static/tc_logo.png" class="logo" />
+          <img src="../../_static/tc_logo_c_only.png" class="logo" />
         
         </a>
 
@@ -159,7 +159,7 @@
         <div class="rst-content">
           <div role="navigation" aria-label="breadcrumbs navigation">
   <ul class="wy-breadcrumbs">
-    <li><a href="../../index.html">Traffic Control 1.7</a> &raquo;</li>
+    <li><a href="../../index.html">Traffic Control master</a> &raquo;</li>
       
           <li><a href="../index.html">Administrator&#8217;s Guide</a> &raquo;</li>
       
@@ -200,24 +200,24 @@
 </div></blockquote>
 </li>
 </ol>
-<a class="reference internal image-reference" href="../../_images/federation01.png"><img alt="../../_images/federation01.png" class="align-center" src="../../_images/federation01.png" style="width: 804.0px; height: 690.0px;" /></a>
+<a class="reference internal image-reference" href="../../_images/federation01.png"><img alt="../../_images/federation01.png" class="align-center" src="../../_images/federation01.png" /></a>
 <ol class="arabic simple" start="2">
 <li>As a user with admin priveleges, create a Federation Mapping by going to Delivery Services -&gt; Federations and then clicking &#8216;Add Federation Mapping&#8217;</li>
 <li>Choose the Delivery Service for the federation to be mapped to and assign it to the Federation User; click Add.</li>
 </ol>
-<a class="reference internal image-reference" href="../../_images/federation02.png"><img alt="../../_images/federation02.png" class="align-center" src="../../_images/federation02.png" style="width: 766.0px; height: 494.0px;" /></a>
+<a class="reference internal image-reference" href="../../_images/federation02.png"><img alt="../../_images/federation02.png" class="align-center" src="../../_images/federation02.png" /></a>
 <ol class="arabic" start="4">
 <li><p class="first">After the Federation is added, Traffic Ops will display the Federation.</p>
 <p>Changes can be made at this time or the Federation can be deleted.  Notice that no resolvers have been added to the fedeation yet.  This can only be done by the federation user created in step 1.</p>
 <p>If no further action is necessary, the Close button will close the window and display the list of all Federations.</p>
 </li>
 </ol>
-<a class="reference internal image-reference" href="../../_images/federation03.png"><img alt="../../_images/federation03.png" class="align-center" src="../../_images/federation03.png" style="width: 806.0px; height: 886.0px;" /></a>
+<a class="reference internal image-reference" href="../../_images/federation03.png"><img alt="../../_images/federation03.png" class="align-center" src="../../_images/federation03.png" /></a>
 <p><strong>The Federation user can now add resolvers to the Federation Mapping in Traffic Ops.</strong></p>
 <ol class="arabic" start="5">
 <li><p class="first">The federation user logs to traffic ops and stores the mojolicious cookie.  The mojolicious cookie can be obtained manually using the debug tools on a web browser or via curl.</p>
 <p>Example:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span>$ curl -i -XPOST &quot;http://localhost:3000/api/1.1/user/login&quot; -H &quot;Content-Type: application/json&quot; -d &#39;{ &quot;u&quot;: &quot;federation_user1&quot;, &quot;p&quot;: &quot;password&quot; }&#39;
+<div class="highlight-python"><div class="highlight"><pre>$ curl -i -XPOST &quot;http://localhost:3000/api/1.1/user/login&quot; -H &quot;Content-Type: application/json&quot; -d &#39;{ &quot;u&quot;: &quot;federation_user1&quot;, &quot;p&quot;: &quot;password&quot; }&#39;
 
 HTTP/1.1 200 OK
 Date: Wed, 02 Dec 2015 21:12:06 GMT
@@ -239,7 +239,7 @@ Access-Control-Allow-Origin: http://localhost:8080
 <li><p class="first">The federation user sends a request to Traffic Ops to add IPV4 and/or IPV6 resolvers</p>
 <blockquote>
 <div><p>Example:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span>$ curl -ki -H &quot;Cookie: mojolicious=eyJleHBpcmVzIjoxNDQ5MTA1MTI2LCJhdXRoX2RhdGEiOiJmZWRlcmF0aW9uX3VzZXIxIn0---06b4f870d809d82a91433e92eae8320875c3e8b0;&quot; -XPUT &#39;http://localhost:3000/api/1.2/federations&#39; -d &#39;
+<div class="highlight-python"><div class="highlight"><pre>$ curl -ki -H &quot;Cookie: mojolicious=eyJleHBpcmVzIjoxNDQ5MTA1MTI2LCJhdXRoX2RhdGEiOiJmZWRlcmF0aW9uX3VzZXIxIn0---06b4f870d809d82a91433e92eae8320875c3e8b0;&quot; -XPUT &#39;http://localhost:3000/api/1.2/federations&#39; -d &#39;
         {&quot;federations&quot;: [
                 {   &quot;deliveryService&quot;: &quot;images-c1&quot;,
                         &quot;mappings&quot;:
@@ -271,12 +271,12 @@ Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept
 <li><p class="first">The resolvers added by the federation user will now visible in Traffic Ops.</p>
 </li>
 </ol>
-<a class="reference internal image-reference" href="../../_images/federation04.png"><img alt="../../_images/federation04.png" class="align-center" src="../../_images/federation04.png" style="width: 802.0px; height: 875.0px;" /></a>
+<a class="reference internal image-reference" href="../../_images/federation04.png"><img alt="../../_images/federation04.png" class="align-center" src="../../_images/federation04.png" /></a>
 <ol class="arabic" start="8">
 <li><p class="first">Any requests made from a client that resolves to one of the federation resolvers will now be given a CNAME from Traffic Router.</p>
 <blockquote>
 <div><p>Example:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span>$ dig @tr.kabletown.net edge.images-c1.kabletown.net
+<div class="highlight-python"><div class="highlight"><pre>$ dig @tr.kabletown.net edge.images-c1.kabletown.net
 
 ; &lt;&lt;&gt;&gt; DiG 9.7.3-RedHat-9.7.3-2.el6 &lt;&lt;&gt;&gt; @tr.kabletown.net edge.images-c1.kabletown.net
 ; (1 server found)
@@ -341,7 +341,7 @@ edge.images-c1.kabletown.net.   30 IN CNAME img.mega-cdn.net.
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../../',
-            VERSION:'1.7',
+            VERSION:'master',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/52a20853/docs/latest/admin/quick_howto/index.html
----------------------------------------------------------------------
diff --git a/docs/latest/admin/quick_howto/index.html b/docs/latest/admin/quick_howto/index.html
index 3bcfa76..bc369ed 100644
--- a/docs/latest/admin/quick_howto/index.html
+++ b/docs/latest/admin/quick_howto/index.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Quick How To Guides &mdash; Traffic Control 1.7 documentation </title>
+  <title>Quick How To Guides &mdash; Traffic Control master documentation </title>
   
 
   
@@ -33,7 +33,7 @@
   
 
   
-    <link rel="top" title="Traffic Control 1.7 documentation" href="../../index.html"/>
+    <link rel="top" title="Traffic Control master documentation" href="../../index.html"/>
         <link rel="up" title="Administrator\u2019s Guide" href="../index.html"/>
         <link rel="next" title="Configure Multi Site Origin" href="multi_site.html"/>
         <link rel="prev" title="Traffic Vault Administration" href="../traffic_vault.html"/> 
@@ -58,7 +58,7 @@
 
         
           
-          <img src="../../_static/tc_logo.png" class="logo" />
+          <img src="../../_static/tc_logo_c_only.png" class="logo" />
         
         </a>
 
@@ -112,7 +112,7 @@
 <li class="toctree-l2"><a class="reference internal" href="../traffic_stats.html">Traffic Stats Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../traffic_server.html">Traffic Server Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="../traffic_vault.html">Traffic Vault Administration</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="#">Quick How To Guides</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Quick How To Guides</a></li>
 </ul>
 </li>
 </ul>
@@ -159,7 +159,7 @@
         <div class="rst-content">
           <div role="navigation" aria-label="breadcrumbs navigation">
   <ul class="wy-breadcrumbs">
-    <li><a href="../../index.html">Traffic Control 1.7</a> &raquo;</li>
+    <li><a href="../../index.html">Traffic Control master</a> &raquo;</li>
       
           <li><a href="../index.html">Administrator&#8217;s Guide</a> &raquo;</li>
       
@@ -236,7 +236,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../../',
-            VERSION:'1.7',
+            VERSION:'master',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true