add master docs to latest'
diff --git a/docs/latest/_sources/admin/index.txt b/docs/latest/_sources/admin/index.txt
index eaef3a9..e92f5e2 100644
--- a/docs/latest/_sources/admin/index.txt
+++ b/docs/latest/_sources/admin/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.
diff --git a/docs/latest/_sources/admin/quick_howto/dnssec.txt b/docs/latest/_sources/admin/quick_howto/dnssec.txt
index 6e41fe9..d336057 100644
--- a/docs/latest/_sources/admin/quick_howto/dnssec.txt
+++ b/docs/latest/_sources/admin/quick_howto/dnssec.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.
diff --git a/docs/latest/_sources/admin/quick_howto/federations.txt b/docs/latest/_sources/admin/quick_howto/federations.txt
index 5bcb387..a17122c 100644
--- a/docs/latest/_sources/admin/quick_howto/federations.txt
+++ b/docs/latest/_sources/admin/quick_howto/federations.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.
diff --git a/docs/latest/_sources/admin/quick_howto/index.txt b/docs/latest/_sources/admin/quick_howto/index.txt
index 57f5727..96f098f 100644
--- a/docs/latest/_sources/admin/quick_howto/index.txt
+++ b/docs/latest/_sources/admin/quick_howto/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.
diff --git a/docs/latest/_sources/admin/quick_howto/multi_site.txt b/docs/latest/_sources/admin/quick_howto/multi_site.txt
index 0811056..32b5436 100644
--- a/docs/latest/_sources/admin/quick_howto/multi_site.txt
+++ b/docs/latest/_sources/admin/quick_howto/multi_site.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.
diff --git a/docs/latest/_sources/admin/quick_howto/regionalgeo.txt b/docs/latest/_sources/admin/quick_howto/regionalgeo.txt
index 58f8851..a903c8a 100644
--- a/docs/latest/_sources/admin/quick_howto/regionalgeo.txt
+++ b/docs/latest/_sources/admin/quick_howto/regionalgeo.txt
@@ -1,5 +1,4 @@
 ..
-.. Copyright 2015 Cisco Systems, Inc.
 ..
 .. Licensed under the Apache License, Version 2.0 (the "License");
 .. you may not use this file except in compliance with the License.
diff --git a/docs/latest/_sources/admin/quick_howto/steering.txt b/docs/latest/_sources/admin/quick_howto/steering.txt
index 03f6b1d..1060f29 100644
--- a/docs/latest/_sources/admin/quick_howto/steering.txt
+++ b/docs/latest/_sources/admin/quick_howto/steering.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.
diff --git a/docs/latest/_sources/admin/traffic_monitor.txt b/docs/latest/_sources/admin/traffic_monitor.txt
index b7615fb..3a06e78 100644
--- a/docs/latest/_sources/admin/traffic_monitor.txt
+++ b/docs/latest/_sources/admin/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.
@@ -33,7 +32,7 @@
 
 1. Enter the Traffic Monitor server into Traffic Ops
 2. Make sure the FQDN of the Traffic Monitor is resolvable in DNS.
-3. Install Traffic Monitor and perl mods: ``sudo yum -y install traffic_monitor perl-JSON perl-WWW-Curl``
+3. Install Traffic Monitor and Perl mods: ``sudo yum -y install traffic_monitor perl-JSON perl-WWW-Curl``
 4. Take the config from Traffic Ops - run : ``sudo /opt/traffic_monitor/bin/traffic_monitor_config.pl``
  
 	Sample output: ::
diff --git a/docs/latest/_sources/admin/traffic_ops_config.txt b/docs/latest/_sources/admin/traffic_ops_config.txt
index 10acb86..90c0c1c 100644
--- a/docs/latest/_sources/admin/traffic_ops_config.txt
+++ b/docs/latest/_sources/admin/traffic_ops_config.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.
@@ -108,9 +107,9 @@
 +------------------+---------------+------------------------------------------------------+------------------------------------------------------------------------------------------------------------+
 |       Name       |  Config file  |                     Description                      |                                                  Details                                                   |
 +==================+===============+======================================================+============================================================================================================+
-| astats_over_http | package       | The package version for the astats_over_http plugin. | `astats_over_http <http://traffic-control-cdn.net/downloads/index.html>`_                                  |
+| astats_over_http | package       | The package version for the astats_over_http plugin. | `astats_over_http <http://trafficcontrol.apache.org/downloads/index.html>`_                                |
 +------------------+---------------+------------------------------------------------------+------------------------------------------------------------------------------------------------------------+
-| trafficserver    | package       | The package version for the trafficserver plugin.    | `trafficserver <http://traffic-control-cdn.net/downloads/index.html>`_                                     |
+| trafficserver    | package       | The package version for the trafficserver plugin.    | `trafficserver <http://trafficcontrol.apache.org/downloads/index.html>`_                                   |
 +------------------+---------------+------------------------------------------------------+------------------------------------------------------------------------------------------------------------+
 | regex_revalidate | plugin.config | The config to be used for regex_revalidate.          | `regex_revalidate <https://docs.trafficserver.apache.org/en/5.3.x/reference/plugins/regex_remap.en.html>`_ |
 |                  |               | For example: --config regex_revalidate.config        |                                                                                                            |
diff --git a/docs/latest/_sources/admin/traffic_ops_extensions.txt b/docs/latest/_sources/admin/traffic_ops_extensions.txt
index f57277d..4aceebb 100644
--- a/docs/latest/_sources/admin/traffic_ops_extensions.txt
+++ b/docs/latest/_sources/admin/traffic_ops_extensions.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.
diff --git a/docs/latest/_sources/admin/traffic_ops_install.txt b/docs/latest/_sources/admin/traffic_ops_install.txt
index 784b696..ca49461 100644
--- a/docs/latest/_sources/admin/traffic_ops_install.txt
+++ b/docs/latest/_sources/admin/traffic_ops_install.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.
@@ -76,7 +75,7 @@
 
 1. Install Traffic Ops: 
 
-  Download the traffic_ops rpm package from http://traffic-control-cdn.net/downloads/index.html
+  Download the traffic_ops rpm package from http://trafficcontrol.apache.org/downloads/index.html
   
   ``sudo rpm -ivh traffic_ops-1.*.*-****.x86_64.rpm``
 
@@ -98,7 +97,7 @@
       Hit ENTER to continue:
 
 
-  The first thing the post install will do is install additional packages needed from the yum repo.
+  The first thing postinstall will do is install additional packages needed from the yum repo.
 
   Ater that, it will automatically proceed to installing the required Perl packages from CPAN.
 
@@ -378,5 +377,5 @@
 
 1. Enter the following command:``service traffic_ops stop``
 2. Enter the following command:``yum upgrade traffic_ops``
-3. See :ref:`rl-ps` to run the post install.
+3. See :ref:`rl-ps` to run postinstall.
 4. Enter the following command:``service traffic_ops start``
diff --git a/docs/latest/_sources/admin/traffic_ops_using.txt b/docs/latest/_sources/admin/traffic_ops_using.txt
index 4a50742..eb3d0ee 100644
--- a/docs/latest/_sources/admin/traffic_ops_using.txt
+++ b/docs/latest/_sources/admin/traffic_ops_using.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.
@@ -317,7 +316,7 @@
 |                                                  | - CZF only - If the requesting IP is not in the Coverage Zone File, do not serve the request.                                                                                                                       |
 |                                                  | - CZF + US - If the requesting IP is not in the Coverage Zone File or not in the United States, do not serve the request.                                                                                           |
 +--------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| Geo Limit Redirect URL                           | (for HTTP routed delivery services only) This is the URL Traffic Router will redirect to when Geo Limit Failure. See :ref:`geolimit-failure-redirect-feature`                                                       |
+| Geo Limit Redirect URL                           | (for HTTP routed delivery services only) This is the URL Traffic Router will redirect to when Geo Limit Failure. See :ref:`rl-tr-ngb`                                                                               |
 +--------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | Bypass FQDN                                      | (for HTTP routed delivery services only) This is the FQDN Traffic Router will redirect to (with the same path) when the max Bps or Max Tps for this deliveryservice are exceeded.                                   |
 +--------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
@@ -353,7 +352,7 @@
 | Maximum Transactions per Second allowed globally | The maximum transactions per se this delivery service can serve across all EDGE caches before traffic will be diverted to the bypass destination. For a DNS delivery service, the Bypass Ipv4 or Ipv6  will be used |
 |                                                  | (depending on whether this was a A or AAAA request), and for HTTP delivery services the Bypass FQDN will be used.                                                                                                   |
 +--------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| Geo Miss Default Latitude                        | Default Latitude for this delivery service. When client localization fails for bot Coverage Zone and Geo Lookup, this the client will be routed as if it was at this lat.                                           |
+| Geo Miss Default Latitude                        | Default Latitude for this delivery service. When client localization fails for both Coverage Zone and Geo Lookup, this the client will be routed as if it was at this lat.                                          |
 +--------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | Geo Miss Default Longitude                       | Default Longitude for this delivery service. When client localization fails for bot Coverage Zone and Geo Lookup, this the client will be routed as if it was at this long.                                         |
 +--------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
@@ -421,10 +420,10 @@
 +-----------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | HTTP_LIVE_NATNL | HTTP Content routing, same as HTTP_LIVE, but the MID tier is NOT bypassed.                                                                                                                                                                                                                                                   |
 +-----------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| DNS_LIVE_NATNL  | DNS Content routing, ut where for "standard" DNS content routing the objects are stored on disk, for this delivery service type the objects are stored                                                                                                                                                                       |
+| DNS_LIVE_NATNL  | DNS Content routing, but where for "standard" DNS content routing the objects are stored on disk, for this delivery service type the objects are stored                                                                                                                                                                      |
 |                 | on the RAM disks. Use this for linear TV. The MID tier is NOT bypassed for this type.                                                                                                                                                                                                                                        |
 +-----------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| DNS_LIVE        | DNS Content routing, same as DNS_LIVE_NATIONAL, but the MID tier is bypassed.                                                                                                                                                                                                                                                |
+| DNS_LIVE        | DNS Content routing, same as DNS_LIVE_NATNL, but the MID tier is bypassed.                                                                                                                                                                                                                                                   |
 +-----------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | ANY_MAP         | ANY_MAP is not known to Traffic Router. For this deliveryservice, the "Raw remap text" field in the input form will be used as the remap line on the cache.                                                                                                                                                                  |
 +-----------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
@@ -506,7 +505,7 @@
                 0110: use part1 and part 2 of path only
                 01: use everything except the fqdn
 
-        ``P=<parts string (0's and 1's>``
+        ``P=<parts string (0's and 1's)>``
 
 Signature
         The signature over the parts + the query string up to and
@@ -595,11 +594,11 @@
 
 Multi Site Origin
 +++++++++++++++++
-.. Note:: The Multi Site Origin feature is based upon a feature n ATS that has yet to be submitted to Traffic Server upstream, until it is, set this to 0, or use the ATS rpm supplied on the traffic-control-cdn.net website.
+.. Note:: The Multi Site Origin feature is based upon a feature n ATS that has yet to be submitted to Traffic Server upstream, until it is, set this to 0, or use the ATS rpm supplied on the trafficcontrol.apache.org website.
 
 Normally, the mid servers are not aware of any redundancy at the origin layer. With Multi Site Origin enabled this changes - Traffic Server (and Traffic Ops) are now made aware of the fact there are multiple origins, and can be configured to do more advanced failover and loadbalancing actions.
 
-With This feature enabled, origin servers (or origin server VIP names for a site) are going to be entered as servers in to the Traiffic Ops UI. Server type is With This feature enabled, origin servers (or origin server VIP names for a site) are going to be entered as servers in to the Traiffic Ops UI. Server type is ""
+With This feature enabled, origin servers (or origin server VIP names for a site) are going to be entered as servers in to the Traiffic Ops UI. Server type is ""
 
 
 Parameters in the Origin profile that influence this feature:
@@ -1026,7 +1025,7 @@
 
 **Generate Keys**
 
-Generate Keys will generate dnssec keys for the CDN TLD as well as for each Delivery Service in the CDN.  It is important to note that this button will create a new KSK for the TLD and, therefore, a new DS Record.  Any time a new DS Record is created, it will need to be added to the parent zone of the TLD in order for DNSSEC to work properly.  When a user clicks the **Generate Keys** button, they will be presented with a screen with the following fields:
+Generate Keys will generate DNSSEC keys for the CDN TLD as well as for each Delivery Service in the CDN.  It is important to note that this button will create a new KSK for the TLD and, therefore, a new DS Record.  Any time a new DS Record is created, it will need to be added to the parent zone of the TLD in order for DNSSEC to work properly.  When a user clicks the **Generate Keys** button, they will be presented with a screen with the following fields:
 
   - **CDN:** This is not editable and displays the CDN for which keys will be generated
   - **ZSK Expiration (Days):**  Sets how long (in days) the Zone Signing Key will be valid for the CDN and associated Delivery Services. The default is 30 days.
diff --git a/docs/latest/_sources/admin/traffic_portal.txt b/docs/latest/_sources/admin/traffic_portal.txt
index 0c5b5b0..9e761b8 100644
--- a/docs/latest/_sources/admin/traffic_portal.txt
+++ b/docs/latest/_sources/admin/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.
@@ -24,7 +23,7 @@
 
 **Installing Traffic Portal**
 
-	- Download the Traffic Portal RPM from the traffic control `downloads <http://traffic-control-cdn.net/downloads/index.html>`_ page or build from `source <https://github.com/Comcast/traffic_control/tree/master/traffic_portal/build>`_.
+	- Download the Traffic Portal RPM from the traffic control `downloads <https://trafficcontrol.apache.org/downloads/index.html>`_ page or build from `source <https://github.com/apache/incubator-trafficcontrol/traffic_portal/build>`_.
 	- Copy the Traffic Portal RPM to your server
 	- curl --silent --location https://rpm.nodesource.com/setup_6.x | sudo bash -
 	- sudo yum install -y nodejs
diff --git a/docs/latest/_sources/admin/traffic_router.txt b/docs/latest/_sources/admin/traffic_router.txt
index 8f274a7..4fe4759 100644
--- a/docs/latest/_sources/admin/traffic_router.txt
+++ b/docs/latest/_sources/admin/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.
@@ -37,7 +36,7 @@
 1. If no suitable profile exists, create a new profile for Traffic Router.
 
 2. Enter the Traffic Router server into Traffic Ops, assign it to a Traffic Router profile, and ensure that its status is set to ``ONLINE``.
-3. Ensure the FQDN of the Traffic Monitor is resolvable in DNS. This FQDN must be resolvable by the clients expected to use this CDN.
+3. Ensure the FQDN of the Traffic Router is resolvable in DNS. This FQDN must be resolvable by the clients expected to use this CDN.
 4. Install a traffic router: ``sudo yum install traffic_router``.
 5. Edit ``/opt/traffic_router/conf/traffic_monitor.properties`` and specify the correct online Traffic Monitor(s) for your CDN. See :ref:`rl-tr-config-files`
 	# traffic_monitor.properties: url that should normally point to this file
@@ -493,3 +492,21 @@
 
 While it is running it is suggested that you monitor your Traffic Router nodes for memory and CPU utilization.
 
+Tuning Recommendations
+======================
+
+The following is an example of /opt/tomcat/bin/setenv.sh that has been tested on a multi core server running under HTTPS load test requests.
+This is following the general recommendation to use the G1 garbage collector for JVM applications running on multi core machines.
+In addition to using the G1 garbage collector the InitiatingHeapOccupancyPercent was lowered to run garbage collection more frequently which
+improved overall throughput for Traffic Router and reduced 'Stop the World' garbage collection. Note that setting the min and max heap settings
+in setenv.sh will override init scripts in /etc/init.d/tomcat.
+
+  /opt/tomcat/bin/setenv.sh::
+
+
+      #! /bin/sh
+      export CATALINA_OPTS="$CATALINA_OPTS -server"
+      export CATALINA_OPTS="$CATALINA_OPTS -Xms2g -Xmx2g"
+      export CATALINA_OPTS="$CATALINA_OPTS -XX:+UseG1GC"
+      export CATALINA_OPTS="$CATALINA_OPTS -XX:+UnlockExperimentalVMOptions"
+      export CATALINA_OPTS="$CATALINA_OPTS -XX:InitiatingHeapOccupancyPercent=30"
diff --git a/docs/latest/_sources/admin/traffic_server.txt b/docs/latest/_sources/admin/traffic_server.txt
index 393fcc5..1b99ce0 100644
--- a/docs/latest/_sources/admin/traffic_server.txt
+++ b/docs/latest/_sources/admin/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.
diff --git a/docs/latest/_sources/admin/traffic_stats.txt b/docs/latest/_sources/admin/traffic_stats.txt
index e8d9e78..df720ae 100644
--- a/docs/latest/_sources/admin/traffic_stats.txt
+++ b/docs/latest/_sources/admin/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.
@@ -25,7 +24,7 @@
 
 **Installing Traffic Stats:**
 
-	- Download the Traffic Stats RPM from the traffic control `downloads <http://traffic-control-cdn.net/downloads/index.html>`_ page.
+	- Download the Traffic Stats RPM from the traffic control `downloads <https://trafficcontrol.apache.org/downloads/index.html>`_ page.
 	- Copy the Traffic Stats RPM to your server
 	- sudo rpm -ivh <traffic_stats rpm>
 
@@ -38,7 +37,7 @@
 
 **Installing Grafana:**
 
-	Grafana is used to display Traffic Stats/InfluxDB data in Traffic Ops.  Grafana is typically run on the same server as Traffic Stats but this is not a requirement.  Grafana can be installed on any server that can access InfluxDB and can be accessed by Traffic Ops.  Documentation on installing Grafana can be found on the `Grafana website <http://docs.grafana.org/installation/>`_.
+	Grafana is used to display Traffic Stats/InfluxDB data in Traffic Ops.  Grafana is typically run on the same server as Traffic Stats but this is not a requirement.  Grafana can be installed on any server that can access InfluxDB and can be accessed by Traffic Ops.  Documentation on installing Grafana can be found on the `Grafana website <http://docs.grafana.org/installation/>`__.
 
 Configuration
 =========================
@@ -89,7 +88,7 @@
 
 	In order for Traffic Ops users to see Grafana graphs, Grafana will need to allow anonymous access.  Information on how to configure anonymous access can be found on the configuration page of the `Grafana Website  <http://docs.grafana.org/installation/configuration/#authanonymous>`_.
 
-	Traffic Ops uses custom dashboards to display information about individual delivery services or cache groups.  In order for the custom graphs to display correctly, the `traffic_ops_*.js <https://github.com/Comcast/traffic_control/blob/master/traffic_stats/grafana/>`_ files need to be in the ``/usr/share/grafana/public/dashboards/`` directory on the grafana server.  If your Grafana server is the same as your Traffic Stats server the RPM install process will take care of putting the files in place.  If your grafana server is different from your Traffic Stats server, you will need to manually copy the files to the correct directory.
+	Traffic Ops uses custom dashboards to display information about individual delivery services or cache groups.  In order for the custom graphs to display correctly, the `traffic_ops_*.js <https://github.com/apache/incubator-trafficcontrol/blob/master/traffic_stats/grafana/>`_ files need to be in the ``/usr/share/grafana/public/dashboards/`` directory on the grafana server.  If your Grafana server is the same as your Traffic Stats server the RPM install process will take care of putting the files in place.  If your grafana server is different from your Traffic Stats server, you will need to manually copy the files to the correct directory.
 
 	More information on custom scripted graphs can be found in the `scripted dashboards <http://docs.grafana.org/reference/scripting/>`_ section of the Grafana documentation.
 
@@ -148,11 +147,11 @@
 		3. Run it:
 			- ./create_ts_databases -help
 			- optional flags:
-				- influxUrl -  The influxdb url and port
+				- url -  The influxdb url and port
 				- replication -  The number of nodes in the cluster
 				- user - The user to use
 				- password - The password to use
-			- example: ./create_ts_databases -influxUrl=localhost:8086 -replication=3 -user=joe -password=mysecret
+			- example: ./create_ts_databases -url=localhost:8086 -replication=3 -user=joe -password=mysecret
 
 **sync_ts_databases**
 	This script is used to sync one influxdb environment to another.  Only data from continuous queries is synced as it is downsampled data and much smaller in size than syncing raw data.  Possible use cases are syncing from Production to Development or Syncing a new cluster once brought online.
diff --git a/docs/latest/_sources/admin/traffic_vault.txt b/docs/latest/_sources/admin/traffic_vault.txt
index cf37b35..d50ef25 100644
--- a/docs/latest/_sources/admin/traffic_vault.txt
+++ b/docs/latest/_sources/admin/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.
@@ -21,7 +20,7 @@
 ========================
 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/>`_.
+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.
 
@@ -171,7 +170,7 @@
 ``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/Comcast/traffic_control/tree/master/traffic_ops/app/conf/misc/riak_search>`_.
+	* 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
@@ -182,7 +181,7 @@
 
 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/Comcast/traffic_control/blob/master/traffic_ops/app/script/update_riak_for_search.pl>`_
+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:
diff --git a/docs/latest/_sources/basics/cache_revalidation.txt b/docs/latest/_sources/basics/cache_revalidation.txt
index 70f7508..dc57346 100644
--- a/docs/latest/_sources/basics/cache_revalidation.txt
+++ b/docs/latest/_sources/basics/cache_revalidation.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.
diff --git a/docs/latest/_sources/basics/caching_proxies.txt b/docs/latest/_sources/basics/caching_proxies.txt
index 624dbc1..af93730 100644
--- a/docs/latest/_sources/basics/caching_proxies.txt
+++ b/docs/latest/_sources/basics/caching_proxies.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.
diff --git a/docs/latest/_sources/basics/content_delivery_networks.txt b/docs/latest/_sources/basics/content_delivery_networks.txt
index c696e9c..872018e 100644
--- a/docs/latest/_sources/basics/content_delivery_networks.txt
+++ b/docs/latest/_sources/basics/content_delivery_networks.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.
diff --git a/docs/latest/_sources/basics/http_11.txt b/docs/latest/_sources/basics/http_11.txt
index d53e91a..65d6d71 100644
--- a/docs/latest/_sources/basics/http_11.txt
+++ b/docs/latest/_sources/basics/http_11.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.
diff --git a/docs/latest/_sources/basics/index.txt b/docs/latest/_sources/basics/index.txt
index 0dae70f..23ee1da 100644
--- a/docs/latest/_sources/basics/index.txt
+++ b/docs/latest/_sources/basics/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.
diff --git a/docs/latest/_sources/development/index.txt b/docs/latest/_sources/development/index.txt
index 70b05f4..851e463 100644
--- a/docs/latest/_sources/development/index.txt
+++ b/docs/latest/_sources/development/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.
diff --git a/docs/latest/_sources/development/traffic_monitor.txt b/docs/latest/_sources/development/traffic_monitor.txt
index 4a801bb..6ed025d 100644
--- a/docs/latest/_sources/development/traffic_monitor.txt
+++ b/docs/latest/_sources/development/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.
@@ -62,18 +61,20 @@
 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          |
-+-----------------+------------------------------------------------------------+
+  +-----------------+------------------------------------------------------------+
+  |    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
@@ -110,4 +111,4 @@
   :hidden:
   :maxdepth: 1
 
-  traffic_monitor/traffic_monitor_api
\ No newline at end of file
+  traffic_monitor/traffic_monitor_api
diff --git a/docs/latest/_sources/development/traffic_monitor/traffic_monitor_api.txt b/docs/latest/_sources/development/traffic_monitor/traffic_monitor_api.txt
index 5fbc422..0240fd4 100644
--- a/docs/latest/_sources/development/traffic_monitor/traffic_monitor_api.txt
+++ b/docs/latest/_sources/development/traffic_monitor/traffic_monitor_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.
diff --git a/docs/latest/_sources/development/traffic_ops.txt b/docs/latest/_sources/development/traffic_ops.txt
index c2957a5..9e30148 100644
--- a/docs/latest/_sources/development/traffic_ops.txt
+++ b/docs/latest/_sources/development/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.
@@ -36,6 +35,11 @@
 * MySQL 5.1.52
 * `Goose <https://bitbucket.org/liamstask/goose/>`_
 
+Addionally, the installation of the following RPMs (or equivalent) is required:
+
+* All RPMs listed in :ref:`rl-ps`
+* mysql-test
+
 Traffic Ops Project Tree Overview
 =======================================
 
@@ -164,7 +168,7 @@
 ====================================
 To install the Traffic Ops Developer environment:
 
-1. Clone the traffic_control repository from `github.com <https://github.com/Comcast/traffic_control>`_.
+1. Clone the traffic_control repository from `github.com <https://github.com/apache/incubator-trafficcontrol>`_.
 2. Install the local dependencies using Carton (cpanfile).
 
   ::
diff --git a/docs/latest/_sources/development/traffic_ops_api/routes.txt b/docs/latest/_sources/development/traffic_ops_api/routes.txt
index e378903..ec90963 100644
--- a/docs/latest/_sources/development/traffic_ops_api/routes.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/routes.txt
@@ -25,7 +25,6 @@
   </style>
 
 .. 
-.. 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.
diff --git a/docs/latest/_sources/development/traffic_ops_api/v11/asn.txt b/docs/latest/_sources/development/traffic_ops_api/v11/asn.txt
index bd10bb7..b6960d7 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v11/asn.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v11/asn.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.
diff --git a/docs/latest/_sources/development/traffic_ops_api/v11/cachegroup.txt b/docs/latest/_sources/development/traffic_ops_api/v11/cachegroup.txt
index 30a5732..5278645 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v11/cachegroup.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v11/cachegroup.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.
diff --git a/docs/latest/_sources/development/traffic_ops_api/v11/cdn.txt b/docs/latest/_sources/development/traffic_ops_api/v11/cdn.txt
index 1173c84..d2f742e 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v11/cdn.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v11/cdn.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.
diff --git a/docs/latest/_sources/development/traffic_ops_api/v11/changelog.txt b/docs/latest/_sources/development/traffic_ops_api/v11/changelog.txt
index db73928..22b1ff1 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v11/changelog.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v11/changelog.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.
diff --git a/docs/latest/_sources/development/traffic_ops_api/v11/deliveryservice.txt b/docs/latest/_sources/development/traffic_ops_api/v11/deliveryservice.txt
index 73d8ffd..373c7ec 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v11/deliveryservice.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v11/deliveryservice.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.
@@ -27,7 +26,7 @@
 
 **GET /api/1.1/deliveryservices**
 
-  Retrieves all delivery services. See also `Using Traffic Ops - Delivery Service <http://traffic-control-cdn.net/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
+  Retrieves all delivery services. See also `Using Traffic Ops - Delivery Service <http://trafficcontrol.apache.org/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
 
   Authentication Required: Yes
 
@@ -64,8 +63,6 @@
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``edgeHeaderRewrite``    | string | The EDGE header rewrite actions to perform.                                                                                          |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``exampleURLs``          |  array | Entry points into the CDN for this deliveryservice.                                                                                  |
-  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``geoLimitRedirectUrl``  | string |                                                                                                                                      |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``geoLimit``             | string | - 0: None - no limitations                                                                                                           |
@@ -107,8 +104,6 @@
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``longDesc2``            | string | Description field 2.                                                                                                                 |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``matchList``            | array  | Array of matchList hashes.                                                                                                           |
-  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``>>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.                                                                                                     |
@@ -254,7 +249,7 @@
 
 **GET /api/1.1/deliveryservices/:id**
 
-  Retrieves a specific delivery service. See also `Using Traffic Ops - Delivery Service <http://traffic-control-cdn.net/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
+  Retrieves a specific delivery service. See also `Using Traffic Ops - Delivery Service <http://trafficcontrol.apache.org/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
 
   Authentication Required: Yes
 
diff --git a/docs/latest/_sources/development/traffic_ops_api/v11/hwinfo.txt b/docs/latest/_sources/development/traffic_ops_api/v11/hwinfo.txt
index 8c5a9f3..cc45b38 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v11/hwinfo.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v11/hwinfo.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.
diff --git a/docs/latest/_sources/development/traffic_ops_api/v11/parameter.txt b/docs/latest/_sources/development/traffic_ops_api/v11/parameter.txt
index db3a8d1..1b83d01 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v11/parameter.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v11/parameter.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.
diff --git a/docs/latest/_sources/development/traffic_ops_api/v11/phys_location.txt b/docs/latest/_sources/development/traffic_ops_api/v11/phys_location.txt
index 61d6c0b..6ebaff0 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v11/phys_location.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v11/phys_location.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.
diff --git a/docs/latest/_sources/development/traffic_ops_api/v11/profile.txt b/docs/latest/_sources/development/traffic_ops_api/v11/profile.txt
index 97075d8..5c37690 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v11/profile.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v11/profile.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.
diff --git a/docs/latest/_sources/development/traffic_ops_api/v11/region.txt b/docs/latest/_sources/development/traffic_ops_api/v11/region.txt
index 7eda251..d521f33 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v11/region.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v11/region.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.
@@ -173,7 +172,7 @@
 			"divisionName": "mydivision1"
 		}
 	}
-|
+
 
 **POST /api/1.1/divisions/:division_name/regions**
   Create Region
diff --git a/docs/latest/_sources/development/traffic_ops_api/v11/role.txt b/docs/latest/_sources/development/traffic_ops_api/v11/role.txt
index bd02f05..bf3337c 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v11/role.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v11/role.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.
diff --git a/docs/latest/_sources/development/traffic_ops_api/v11/server.txt b/docs/latest/_sources/development/traffic_ops_api/v11/server.txt
index 61184f9..44f1292 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v11/server.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v11/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.
diff --git a/docs/latest/_sources/development/traffic_ops_api/v11/static_dns.txt b/docs/latest/_sources/development/traffic_ops_api/v11/static_dns.txt
index b840b90..c9d3a3d 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v11/static_dns.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v11/static_dns.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.
diff --git a/docs/latest/_sources/development/traffic_ops_api/v11/status.txt b/docs/latest/_sources/development/traffic_ops_api/v11/status.txt
index 853f276..6a8c92a 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v11/status.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v11/status.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.
diff --git a/docs/latest/_sources/development/traffic_ops_api/v11/system.txt b/docs/latest/_sources/development/traffic_ops_api/v11/system.txt
index ba3edbb..c4e53df 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v11/system.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v11/system.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.
diff --git a/docs/latest/_sources/development/traffic_ops_api/v11/to_extension.txt b/docs/latest/_sources/development/traffic_ops_api/v11/to_extension.txt
index 676a457..5ed2654 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v11/to_extension.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v11/to_extension.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.
diff --git a/docs/latest/_sources/development/traffic_ops_api/v11/type.txt b/docs/latest/_sources/development/traffic_ops_api/v11/type.txt
index 2430b97..6c7806b 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v11/type.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v11/type.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.
diff --git a/docs/latest/_sources/development/traffic_ops_api/v11/user.txt b/docs/latest/_sources/development/traffic_ops_api/v11/user.txt
index 5b06ccc..2ef5012 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v11/user.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v11/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.
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/asn.txt b/docs/latest/_sources/development/traffic_ops_api/v12/asn.txt
index fb45a07..b5803cd 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/asn.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/asn.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.
@@ -31,6 +30,14 @@
 
   Role(s) Required: None
 
+  **Request Query Parameters**
+
+  +---------------------+----------+---------------------------------------------+
+  |   Name              | Required |                Description                  |
+  +=====================+==========+=============================================+
+  |   ``cachegroup``    |    no    | Filter ASNs by cache group ID               |
+  +---------------------+----------+---------------------------------------------+
+
   **Response Properties**
 
   +------------------+--------+-------------------------------------------------------------------------+
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/cache_stats.txt b/docs/latest/_sources/development/traffic_ops_api/v12/cache_stats.txt
index d959c2b..dffc9a4 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/cache_stats.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/cache_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.
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/cachegroup.txt b/docs/latest/_sources/development/traffic_ops_api/v12/cachegroup.txt
index 5e6dc06..391c278 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/cachegroup.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/cachegroup.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.
@@ -30,6 +29,14 @@
 
   Role(s) Required: None
 
+  **Request Query Parameters**
+
+  +-----------------+----------+---------------------------------------------------+
+  | Name            | Required | Description                                       |
+  +=================+==========+===================================================+
+  | ``type``        | no       | Filter cache groups by Type ID.                   |
+  +-----------------+----------+---------------------------------------------------+
+
   **Response Properties**
 
   +-----------------------------------+--------+--------------------------------------------------------------------------+
@@ -185,6 +192,47 @@
 
 |
 
+**GET /api/1.2/cachegroups/:id/parameters**
+
+  Authentication Required: Yes
+
+  Role(s) Required: None
+
+  **Response Properties**
+
+  +-----------------------------------+--------+--------------------------------------------------------------------------+
+  | Parameter                         | Type   | Description                                                              |
+  +===================================+========+==========================================================================+
+  | ``id``                            |   int  | Local unique identifier for the parameter                                |
+  +-----------------------------------+--------+--------------------------------------------------------------------------+
+  | ``name``                          | string | Name of the parameter                                                    |
+  +-----------------------------------+--------+--------------------------------------------------------------------------+
+  | ``value``                         | string | Value of the parameter                                                   |
+  +-----------------------------------+--------+--------------------------------------------------------------------------+
+  | ``configFile``                    | string | Config file associated with the parameter                                |
+  +-----------------------------------+--------+--------------------------------------------------------------------------+
+  | ``secure``                        |  bool  | Is the parameter value only visible to admin users                       |
+  +-----------------------------------+--------+--------------------------------------------------------------------------+
+  | ``lastUpdated``                   | string | The Time / Date this entry was last updated                              |
+  +-----------------------------------+--------+--------------------------------------------------------------------------+
+
+  **Response Example** ::
+
+    {
+     "response": [
+        {
+            "id": "1100",
+            "name": "cgw.originUrl",
+            "value": "http://to-short.g.foo.net/data/",
+            "configFile": "foo.config",
+            "secure": false,
+            "lastUpdated": "2015-08-27 15:11:49"
+        },
+        { ... }
+     ]
+    }
+
+|
 
 **GET /api/1.2/cachegroup/:parameter_id/parameter**
 
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/cdn.txt b/docs/latest/_sources/development/traffic_ops_api/v12/cdn.txt
index 9a4daac..d7e3c3c 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/cdn.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/cdn.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.
@@ -1331,5 +1330,3 @@
         }
       ]
     }
-|
-
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/changelog.txt b/docs/latest/_sources/development/traffic_ops_api/v12/changelog.txt
index edb4ff3..5cedbe0 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/changelog.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/changelog.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.
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/deliveryservice.txt b/docs/latest/_sources/development/traffic_ops_api/v12/deliveryservice.txt
index a6a6b66..c1100dd 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/deliveryservice.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/deliveryservice.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.
@@ -25,14 +24,25 @@
 /api/1.2/deliveryservices
 +++++++++++++++++++++++++
 
-**GET /api/1.2/deliveryservices.json**
+**GET /api/1.2/deliveryservices**
 
-  Retrieves all delivery services. See also `Using Traffic Ops - Delivery Service <http://traffic-control-cdn.net/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
+  Retrieves all delivery services. 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 Query Parameters**
+
+  +-----------------+----------+---------------------------------------------------+
+  | Name            | Required | Description                                       |
+  +=================+==========+===================================================+
+  | ``cdn``         | no       | Filter delivery services by CDN ID.               |
+  +-----------------+----------+---------------------------------------------------+
+  | ``type``        | no       | Filter delivery services by Type ID.              |
+  +-----------------+----------+---------------------------------------------------+
+
+
   **Response Properties**
 
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
@@ -64,8 +74,6 @@
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``edgeHeaderRewrite``    | string | The EDGE header rewrite actions to perform.                                                                                          |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``exampleURLs``          |  array | Entry points into the CDN for this deliveryservice.                                                                                  |
-  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``geoLimitRedirectUrl``  | string |                                                                                                                                      |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``geoLimit``             | string | - 0: None - no limitations                                                                                                           |
@@ -107,8 +115,6 @@
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``longDesc2``            | string | Description field 2.                                                                                                                 |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``matchList``            | array  | Array of matchList hashes.                                                                                                           |
-  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``>>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.                                                                                                     |
@@ -254,12 +260,20 @@
 
 **GET /api/1.2/deliveryservices/:id**
 
-  Retrieves a specific delivery service. See also `Using Traffic Ops - Delivery Service <http://traffic-control-cdn.net/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
+  Retrieves a specific delivery service. 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      | Delivery service ID.                              |
+  +-----------------+----------+---------------------------------------------------+
+
   **Response Properties**
 
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
@@ -476,13 +490,169 @@
 
 |
 
+**GET /api/1.2/deliveryservices/:id/servers**
+
+  Retrieves properties of CDN Edge servers assigned to a delivery service.
+
+  Authentication Required: Yes
+
+  Role(s) Required: None
+
+  **Request Route Parameters**
+
+  +-----------------+----------+---------------------------------------------------+
+  | Name            | Required | Description                                       |
+  +=================+==========+===================================================+
+  | ``id``          | yes      | Delivery service ID.                              |
+  +-----------------+----------+---------------------------------------------------+
+
+  **Response Properties**
+
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  |     Parameter      |  Type  |                                                Description                                                 |
+  +====================+========+============================================================================================================+
+  | ``cachegroup``     | string | The cache group name (see :ref:`to-api-v11-cachegroup`).                                                   |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``cachegroupId``   | string | The cache group id.                                                                                        |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``cdnId``          | string | Id of the CDN to which the server belongs to.                                                              |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``cdnName``        | string | Name of the CDN to which the server belongs to.                                                            |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``domainName``     | string | The domain name part of the FQDN of the cache.                                                             |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``guid``           | string | An identifier used to uniquely identify the server.                                                        |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``hostName``       | string | The host name part of the cache.                                                                           |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``httpsPort``      | string | The HTTPS port on which the main application listens (443 in most cases).                                  |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``id``             | string | The server id (database row number).                                                                       |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``iloIpAddress``   | string | The IPv4 address of the lights-out-management port.                                                        |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``iloIpGateway``   | string | The IPv4 gateway address of the lights-out-management port.                                                |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``iloIpNetmask``   | string | The IPv4 netmask of the lights-out-management port.                                                        |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``iloPassword``    | string | The password of the of the lights-out-management user (displays as ****** unless you are an 'admin' user). |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``iloUsername``    | string | The user name for lights-out-management.                                                                   |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``interfaceMtu``   | string | The Maximum Transmission Unit (MTU) to configure for ``interfaceName``.                                    |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``interfaceName``  | string | The network interface name used for serving traffic.                                                       |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``ip6Address``     | string | The IPv6 address/netmask for ``interfaceName``.                                                            |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``ip6Gateway``     | string | The IPv6 gateway for ``interfaceName``.                                                                    |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``ipAddress``      | string | The IPv4 address for ``interfaceName``.                                                                    |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``ipGateway``      | string | The IPv4 gateway for ``interfaceName``.                                                                    |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``ipNetmask``      | string | The IPv4 netmask for ``interfaceName``.                                                                    |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``lastUpdated``    | string | The Time and Date for the last update for this server.                                                     |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``mgmtIpAddress``  | string | The IPv4 address of the management port (optional).                                                        |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``mgmtIpGateway``  | string | The IPv4 gateway of the management port (optional).                                                        |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``mgmtIpNetmask``  | string | The IPv4 netmask of the management port (optional).                                                        |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``offlineReason``  | string | A user-entered reason why the server is in ADMIN_DOWN or OFFLINE status.                                   |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``physLocation``   | string | The physical location name (see :ref:`to-api-v11-phys-loc`).                                               |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``physLocationId`` | string | The physical location id (see :ref:`to-api-v11-phys-loc`).                                                 |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``profile``        | string | The assigned profile name (see :ref:`to-api-v11-profile`).                                                 |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``profileDesc``    | string | The assigned profile description (see :ref:`to-api-v11-profile`).                                          |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``profileId``      | string | The assigned profile Id (see :ref:`to-api-v11-profile`).                                                   |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``rack``           | string | A string indicating rack location.                                                                         |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``routerHostName`` | string | The human readable name of the router.                                                                     |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``routerPortName`` | string | The human readable name of the router port.                                                                |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``status``         | string | The Status string (See :ref:`to-api-v11-status`).                                                          |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``statusId``       | string | The Status id (See :ref:`to-api-v11-status`).                                                              |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``tcpPort``        | string | The default TCP port on which the main application listens (80 for a cache in most cases).                 |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``type``           | string | The name of the type of this server (see :ref:`to-api-v11-type`).                                          |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``typeId``         | string | The id of the type of this server (see :ref:`to-api-v11-type`).                                            |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``updPending``     |  bool  |                                                                                                            |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+
+  **Response Example** ::
+
+   {
+      "response": [
+          {
+              "cachegroup": "us-il-chicago",
+              "cachegroupId": "3",
+              "cdnId": "3",
+              "cdnName": "CDN-1",
+              "domainName": "chi.kabletown.net",
+              "guid": null,
+              "hostName": "atsec-chi-00",
+              "id": "19",
+              "iloIpAddress": "172.16.2.6",
+              "iloIpGateway": "172.16.2.1",
+              "iloIpNetmask": "255.255.255.0",
+              "iloPassword": "********",
+              "iloUsername": "",
+              "interfaceMtu": "9000",
+              "interfaceName": "bond0",
+              "ip6Address": "2033:D0D0:3300::2:2/64",
+              "ip6Gateway": "2033:D0D0:3300::2:1",
+              "ipAddress": "10.10.2.2",
+              "ipGateway": "10.10.2.1",
+              "ipNetmask": "255.255.255.0",
+              "lastUpdated": "2015-03-08 15:57:32",
+              "mgmtIpAddress": "",
+              "mgmtIpGateway": "",
+              "mgmtIpNetmask": "",
+              "offlineReason": "N/A",
+              "physLocation": "plocation-chi-1",
+              "physLocationId": "9",
+              "profile": "EDGE1_CDN1_421_SSL",
+              "profileDesc": "EDGE1_CDN1_421_SSL profile",
+              "profileId": "12",
+              "rack": "RR 119.02",
+              "routerHostName": "rtr-chi.kabletown.net",
+              "routerPortName": "2",
+              "status": "ONLINE",
+              "statusId": "6",
+              "tcpPort": "80",
+              "httpsPort": "443",
+              "type": "EDGE",
+              "typeId": "3",
+              "updPending": false
+          },
+          {
+          ... more server data
+          }
+        ]
+    }
+
+|
+
 
 .. _to-api-v12-ds-health:
 
 Health
 ++++++
 
-**GET /api/1.2/deliveryservices/:id/state.json**
+**GET /api/1.2/deliveryservices/:id/state**
 
   Retrieves the failover state for a delivery service.
 
@@ -531,7 +701,7 @@
 
 |
 
-**GET /api/1.2/deliveryservices/:id/health.json**
+**GET /api/1.2/deliveryservices/:id/health**
 
   Retrieves the health of all locations (cache groups) for a delivery service.
 
@@ -581,7 +751,7 @@
 
 |
 
-**GET /api/1.2/deliveryservices/:id/capacity.json**
+**GET /api/1.2/deliveryservices/:id/capacity**
 
   Retrieves the capacity percentages of a delivery service.
 
@@ -629,7 +799,7 @@
 
 |
 
-**GET /api/1.2/deliveryservices/:id/routing.json**
+**GET /api/1.2/deliveryservices/:id/routing**
 
   Retrieves the routing method percentages of a delivery service.
 
@@ -693,7 +863,7 @@
 Server
 ++++++
 
-**GET /api/1.2/deliveryserviceserver.json**
+**GET /api/1.2/deliveryserviceserver**
 
   Authentication Required: Yes
 
@@ -749,7 +919,7 @@
 SSL Keys
 +++++++++
 
-**GET /api/1.2/deliveryservices/xmlId/:xmlid/sslkeys.json**
+**GET /api/1.2/deliveryservices/xmlId/:xmlid/sslkeys**
 
   Authentication Required: Yes
 
@@ -774,29 +944,34 @@
 
   **Response Properties**
 
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  |    Parameter     |  Type  |                                                               Description                                                               |
-  +==================+========+=========================================================================================================================================+
-  | ``crt``          | string | base64 encoded crt file for delivery service                                                                                            |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``csr``          | string | base64 encoded csr file for delivery service                                                                                            |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``key``          | string | base64 encoded private key file for delivery service                                                                                    |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``businessUnit`` | string | The business unit entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``city``         | string | The city entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response          |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``organization`` | string | The organization entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response  |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``hostname``     | string | The hostname entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response      |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``country``      | string | The country entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response       |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``state``        | string | The state entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response         |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``version``      | string | The version of the certificate record in Riak                                                                                           |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  |    Parameter        |  Type  |                                                               Description                                                               |
+  +=====================+========+=========================================================================================================================================+
+  | ``crt``             | string | base64 encoded crt file for delivery service                                                                                            |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``csr``             | string | base64 encoded csr file for delivery service                                                                                            |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``key``             | string | base64 encoded private key file for delivery service                                                                                    |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``cdn``             | string | The CDN of the delivery service for which the certs were generated.                                                                     |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``deliveryservice`` | string | The XML ID of the delivery service for which the cert was generated.                                                                    |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``businessUnit``    | string | The business unit entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``city``            | string | The city entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response          |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``organization``    | string | The organization entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response  |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``hostname``        | string | The hostname generated by Traffic Ops that is used as the common name when generating the certificate.                                  |
+  |                     |        | This will be a FQDN for DNS delivery services and a wildcard URL for HTTP delivery services.                                            |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``country``         | string | The country entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response       |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``state``           | string | The state entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response         |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``version``         | string | The version of the certificate record in Riak                                                                                           |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
 
   **Response Example** ::
 
@@ -807,6 +982,8 @@
           "key": "key",
           "csr": "csr"
         },
+        "deliveryservice": "my-ds",
+        "cdn": "qa",
         "businessUnit": "CDN_Eng",
         "city": "Denver",
         "organization": "KableTown",
@@ -819,7 +996,7 @@
 
 |
 
-**GET /api/1.2/deliveryservices/hostname/:hostname/sslkeys.json**
+**GET /api/1.2/deliveryservices/hostname/:hostname/sslkeys**
 
   Authentication Required: Yes
 
@@ -844,29 +1021,34 @@
 
   **Response Properties**
 
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  |    Parameter     |  Type  |                                                               Description                                                               |
-  +==================+========+=========================================================================================================================================+
-  | ``crt``          | string | base64 encoded crt file for delivery service                                                                                            |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``csr``          | string | base64 encoded csr file for delivery service                                                                                            |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``key``          | string | base64 encoded private key file for delivery service                                                                                    |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``businessUnit`` | string | The business unit entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``city``         | string | The city entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response          |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``organization`` | string | The organization entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response  |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``hostname``     | string | The hostname entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response      |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``country``      | string | The country entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response       |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``state``        | string | The state entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response         |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``version``      | string | The version of the certificate record in Riak                                                                                           |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  |    Parameter        |  Type  |                                                               Description                                                               |
+  +=====================+========+=========================================================================================================================================+
+  | ``crt``             | string | base64 encoded crt file for delivery service                                                                                            |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``csr``             | string | base64 encoded csr file for delivery service                                                                                            |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``key``             | string | base64 encoded private key file for delivery service                                                                                    |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``cdn``             | string | The CDN of the delivery service for which the certs were generated.                                                                     |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``deliveryservice`` | string | The XML ID of the delivery service for which the cert was generated.                                                                    |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``businessUnit``    | string | The business unit entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``city``            | string | The city entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response          |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``organization``    | string | The organization entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response  |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``hostname``        | string | The hostname generated by Traffic Ops that is used as the common name when generating the certificate.                                  |
+  |                     |        | This will be a FQDN for DNS delivery services and a wildcard URL for HTTP delivery services.                                            |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``country``         | string | The country entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response       |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``state``           | string | The state entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response         |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``version``         | string | The version of the certificate record in Riak                                                                                           |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
 
   **Response Example** ::
 
@@ -877,6 +1059,8 @@
           "key": "key",
           "csr": "csr"
         },
+        "deliveryservice": "my-ds",
+        "cdn": "qa",
         "businessUnit": "CDN_Eng",
         "city": "Denver",
         "organization": "KableTown",
@@ -889,7 +1073,7 @@
 
 |
 
-**GET /api/1.2/deliveryservices/xmlId/:xmlid/sslkeys/delete.json**
+**GET /api/1.2/deliveryservices/xmlId/:xmlid/sslkeys/delete**
 
   Authentication Required: Yes
 
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/deliveryservice_stats.txt b/docs/latest/_sources/development/traffic_ops_api/v12/deliveryservice_stats.txt
index 9d6c21f..8d9dadb 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/deliveryservice_stats.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/deliveryservice_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.
@@ -27,7 +26,7 @@
 
 **GET /api/1.2/deliveryservice_stats.json**
 
-  Retrieves statistics on the delivery services. See also `Using Traffic Ops - Delivery Service <http://traffic-control-cdn.net/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
+  Retrieves statistics on the delivery services. See also `Using Traffic Ops - Delivery Service <http://trafficcontrol.apache.org/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
 
   Authentication Required: Yes
 
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/division.txt b/docs/latest/_sources/development/traffic_ops_api/v12/division.txt
index 2d9403a..e0f1756 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/division.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/division.txt
@@ -1,5 +1,4 @@
 .. 
-.. Copyright 2016 Cisco
 .. 
 .. Licensed under the Apache License, Version 2.0 (the "License");
 .. you may not use this file except in compliance with the License.
@@ -22,7 +21,7 @@
 .. _to-api-v12-division-route:
 
 /api/1.2/divisions
-++++++++++++++++
+++++++++++++++++++
 
 **GET /api/1.2/divisions**
   Get all divisions.
@@ -155,6 +154,7 @@
 			"name": "mydivision1"
 		}
 	}
+  
 |
 
 
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/federation.txt b/docs/latest/_sources/development/traffic_ops_api/v12/federation.txt
index 54038a8..a15922e 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/federation.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/federation.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.
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/hwinfo.txt b/docs/latest/_sources/development/traffic_ops_api/v12/hwinfo.txt
index 24ce897..2da59c5 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/hwinfo.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/hwinfo.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.
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/influxdb.txt b/docs/latest/_sources/development/traffic_ops_api/v12/influxdb.txt
index b2bdbd5..ca82cf5 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/influxdb.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/influxdb.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.
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/parameter.txt b/docs/latest/_sources/development/traffic_ops_api/v12/parameter.txt
index 81c00c3..569cb85 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/parameter.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/parameter.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.
@@ -115,6 +114,52 @@
 
 |
 
+**GET /api/1.2/parameters/:id/profiles**
+
+    Retrieves all profiles assigned to the parameter.
+
+	Authentication Required: Yes
+
+	Role(s) Required: None
+
+	**Request Route Parameters**
+
+	+---------------+----------+----------------------------------------------------+
+	|    Name       | Required |                    Description                     |
+	+===============+==========+====================================================+
+	| ``id``        |   yes    | Parameter ID.                                      |
+	+---------------+----------+----------------------------------------------------+
+
+	**Response Properties**
+
+	+-----------------+--------+----------------------------------------------------+
+	|    Parameter    |  Type  |                    Description                     |
+	+=================+========+====================================================+
+	| ``lastUpdated`` | array  | The Time / Date this server entry was last updated |
+	+-----------------+--------+----------------------------------------------------+
+	| ``name``        | string | The name for the profile                           |
+	+-----------------+--------+----------------------------------------------------+
+	| ``id``          | string | Primary key                                        |
+	+-----------------+--------+----------------------------------------------------+
+	| ``description`` | string | The description for the profile                    |
+	+-----------------+--------+----------------------------------------------------+
+
+  **Response Example** ::
+
+    {
+     "response": [
+        {
+            "lastUpdated": "2012-10-08 19:34:45",
+            "name": "CCR_TOP",
+            "id": "8",
+            "description": "Content Router for top.foobar.net"
+        }
+     ]
+    }
+
+|
+
+
 **GET /api/1.2/profiles/:id/parameters**
 
   Authentication Required: Yes
@@ -294,31 +339,34 @@
   +-----------------+---------+--------------------------------------------------------------------------------------+
 
   
-  **Request Example** ::
+  **Request Example** 
 
-  1. single parameter format exampe:
-    {
-        "name":"param1",
-        "configFile":"configFile1"
-        "value":"value1",
-        "secure":0,
-    }
+  1. single parameter format example: ::
 
-  2. array format example:
-    [
-        {
-            "name":"param1",
-            "configFile":"configFile1"
-            "value":"value1",
-            "secure":0,
-        }, 
-        {
-            "name":"param2",
-            "configFile":"configFile2"
-            "value":"value2",
-            "secure":1,
-        }
-    ]
+      {
+          "name":"param1",
+          "configFile":"configFile1",
+          "value":"value1",
+          "secure":0
+      }
+
+  2. array format example: ::
+
+      [
+          {
+              "name":"param1",
+              "configFile":"configFile1",
+              "value":"value1",
+              "secure":0
+          }, 
+          {
+              "name":"param2",
+              "configFile":"configFile2",
+              "value":"value2",
+              "secure":1
+          }
+      ]
+
 
   **Response Example** ::
 
@@ -392,7 +440,7 @@
 
     {
         "name":"param1",
-        "configFile":"configFile1"
+        "configFile":"configFile1",
         "value":"value1",
         "secure":"0",
     }
@@ -444,8 +492,6 @@
 
   **Response Example** ::
 
-    Response Example:
-
     {
       "alerts":
         [
@@ -453,7 +499,7 @@
             "level": "success",
             "text": "Parameter was successfully deleted."
           }
-        ],
+        ]
     }
 
 |
@@ -497,8 +543,8 @@
 
     {
         "name":"param1",
-        "configFile":"configFile1"
-        "value":"value1",
+        "configFile":"configFile1",
+        "value":"value1"
     }
 
   **Response Example** ::
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/phys_location.txt b/docs/latest/_sources/development/traffic_ops_api/v12/phys_location.txt
index 53c561f..67359e5 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/phys_location.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/phys_location.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.
@@ -30,6 +29,14 @@
 
   Role(s) Required: None
 
+  **Request Query Parameters**
+
+  +--------------+----------+---------------------------------------------+
+  |   Name       | Required |                Description                  |
+  +==============+==========+=============================================+
+  |  ``region``  | no       | Filter by Region ID.                        |
+  +--------------+----------+---------------------------------------------+
+
   **Response Properties**
 
   +----------------------+--------+------------------------------------------------+
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/profile.txt b/docs/latest/_sources/development/traffic_ops_api/v12/profile.txt
index 5892272..bec8f9f 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/profile.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/profile.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.
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/profile_parameter.txt b/docs/latest/_sources/development/traffic_ops_api/v12/profile_parameter.txt
index bc16128..31b5789 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/profile_parameter.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/profile_parameter.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.
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/region.txt b/docs/latest/_sources/development/traffic_ops_api/v12/region.txt
index 8129854..74e6fbf 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/region.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/region.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.
@@ -30,6 +29,14 @@
 
   Role(s) Required: None
 
+  **Request Route Parameters**
+
+  +---------------+----------+---------------------------------------------+
+  |   Name        | Required |                Description                  |
+  +===============+==========+=============================================+
+  |  ``division`` |    no    | Filter regions by Division ID.              |
+  +---------------+----------+---------------------------------------------+
+
   **Response Properties**
 
   +----------------------+--------+------------------------------------------------+
@@ -173,6 +180,7 @@
 			"divisionName": "mydivision1"
 		}
 	}
+  
 |
 
 **POST /api/1.2/divisions/:division_name/regions**
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/role.txt b/docs/latest/_sources/development/traffic_ops_api/v12/role.txt
index 247c0cb..b993c97 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/role.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/role.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.
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/server.txt b/docs/latest/_sources/development/traffic_ops_api/v12/server.txt
index 316f126..2a08586 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/server.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/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.
@@ -43,7 +42,13 @@
   +--------------------+----------+---------------------------------------------+
   | ``type``           | no       | Used to filter servers by type.             |
   +--------------------+----------+---------------------------------------------+
-  | ``profileId``      | no       | Used to filter servers by profile.          |
+  | ``profileId``      | no       | Used to filter servers by profile ID.       |
+  +--------------------+----------+---------------------------------------------+
+  | ``cdn``            | no       | Used to filter servers by CDN ID.           |
+  +--------------------+----------+---------------------------------------------+
+  | ``cachegroup``     | no       | Used to filter servers by cache group ID.   |
+  +--------------------+----------+---------------------------------------------+
+  | ``physLocation``   | no       | Used to filter servers by phys location ID. |
   +--------------------+----------+---------------------------------------------+
 
   **Response Properties**
@@ -340,6 +345,237 @@
 |
 
 
+**GET /api/1.2/servers/:id/deliveryservices**
+
+  Retrieves all delivery services assigned to the server. 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      | Server 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/servers/summary**
 
   Retrieves a count of CDN servers by type.
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/static_dns.txt b/docs/latest/_sources/development/traffic_ops_api/v12/static_dns.txt
index 266dad4..0e44cec 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/static_dns.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/static_dns.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.
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/status.txt b/docs/latest/_sources/development/traffic_ops_api/v12/status.txt
index e374527..a97a313 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/status.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/status.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.
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/system.txt b/docs/latest/_sources/development/traffic_ops_api/v12/system.txt
index e2f5fe7..2740d22 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/system.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/system.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.
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/to_extension.txt b/docs/latest/_sources/development/traffic_ops_api/v12/to_extension.txt
index b4b05f8..44c0246 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/to_extension.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/to_extension.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.
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/topology.txt b/docs/latest/_sources/development/traffic_ops_api/v12/topology.txt
index 6c73832..89444f0 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/topology.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/topology.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.
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/type.txt b/docs/latest/_sources/development/traffic_ops_api/v12/type.txt
index 4238fc7..6d614c5 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/type.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/type.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.
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 @@
 
 |
 
+**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**
 
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
 ============
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 @@
 
 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
+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://). |
-+-------------------------------------+------------------------------------------------------------------------------------------------------------------+
+	  +-------------------------------------+------------------------------------------------------------------------------------------------------------------+
+	  |              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:
+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 @@
 	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 @@
 
 		..  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
 ==========
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.
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.
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.
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.
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 @@
 
 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.
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 @@
 
 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 <mailto:users@trafficcontrol.incubator.apache.org>`_.
 	
 What is Rascal?
 ===============
@@ -50,4 +49,4 @@
 
 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>`_
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.
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
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.
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.
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 @@
 ============
 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. 
 
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.
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.
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.
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.
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.
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.
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.
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 @@
     width: 230px;
     margin-left: -100%;
     font-size: 90%;
-    word-wrap: break-word;
-    overflow-wrap : break-word;
 }
 
 div.sphinxsidebar ul {
@@ -85,6 +83,10 @@
     width: 170px;
 }
 
+div.sphinxsidebar #searchbox input[type="submit"] {
+    width: 30px;
+}
+
 img {
     border: 0;
     max-width: 100%;
@@ -185,13 +187,6 @@
 
 /* -- 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;
 }
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 @@
     this.fixFirefoxAnchorBug();
     this.highlightSearchWords();
     this.initIndexTable();
-    
   },
 
   /**
@@ -253,29 +252,6 @@
     });
     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 @@
 
 $(document).ready(function() {
   Documentation.init();
-});
\ No newline at end of file
+});
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 */
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 @@
     }
 
     // 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 @@
   /**
    * 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 @@
       // 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 @@
 
       // 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 @@
    * 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) {
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 {
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.
  *
  */
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’s Guide &mdash; Traffic Control 1.7 documentation </title>
+  <title>Administrator’s 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
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
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 @@
 <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 @@
 <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 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../../',
-            VERSION:'1.7',
+            VERSION:'master',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
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’s 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
diff --git a/docs/latest/admin/quick_howto/multi_site.html b/docs/latest/admin/quick_howto/multi_site.html
index ffc8ea1..0bd8071 100644
--- a/docs/latest/admin/quick_howto/multi_site.html
+++ b/docs/latest/admin/quick_howto/multi_site.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Configure Multi Site Origin &mdash; Traffic Control 1.7 documentation </title>
+  <title>Configure Multi Site Origin &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 DNSSEC" href="dnssec.html"/>
         <link rel="prev" title="Quick How To Guides" href="index.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>
       
@@ -191,23 +191,23 @@
 <ol class="arabic simple">
 <li>Create &#8220;cachegroups&#8221; for the origin locations, and assign the appropriate parent-child relationship between the mid cg&#8217;s and org cgs (click the image to see full size):</li>
 </ol>
-<a class="reference internal image-reference" href="../../_images/C5C4CD22-949A-48FD-8976-C673083E2177.png"><img alt="../../_images/C5C4CD22-949A-48FD-8976-C673083E2177.png" class="align-center" src="../../_images/C5C4CD22-949A-48FD-8976-C673083E2177.png" style="width: 1472.0px; height: 210.0px;" /></a>
+<a class="reference internal image-reference" href="../../_images/C5C4CD22-949A-48FD-8976-C673083E2177.png"><img alt="../../_images/C5C4CD22-949A-48FD-8976-C673083E2177.png" class="align-center" src="../../_images/C5C4CD22-949A-48FD-8976-C673083E2177.png" /></a>
 <ol class="arabic simple" start="2">
 <li>Create a profile to assign to each of the origins:</li>
 </ol>
-<a class="reference internal image-reference" href="../../_images/19BB6EC1-B6E8-4D22-BFA0-B7D6A9708B42.png"><img alt="../../_images/19BB6EC1-B6E8-4D22-BFA0-B7D6A9708B42.png" class="align-center" src="../../_images/19BB6EC1-B6E8-4D22-BFA0-B7D6A9708B42.png" style="width: 1470.0px; height: 219.0px;" /></a>
+<a class="reference internal image-reference" href="../../_images/19BB6EC1-B6E8-4D22-BFA0-B7D6A9708B42.png"><img alt="../../_images/19BB6EC1-B6E8-4D22-BFA0-B7D6A9708B42.png" class="align-center" src="../../_images/19BB6EC1-B6E8-4D22-BFA0-B7D6A9708B42.png" /></a>
 <ol class="arabic simple" start="3">
 <li>Create server entries for the origination vips:</li>
 </ol>
-<a class="reference internal image-reference" href="../../_images/D28614AA-9758-45ED-9EFD-3A284FC4218E.png"><img alt="../../_images/D28614AA-9758-45ED-9EFD-3A284FC4218E.png" class="align-center" src="../../_images/D28614AA-9758-45ED-9EFD-3A284FC4218E.png" style="width: 1468.0px; height: 166.0px;" /></a>
+<a class="reference internal image-reference" href="../../_images/D28614AA-9758-45ED-9EFD-3A284FC4218E.png"><img alt="../../_images/D28614AA-9758-45ED-9EFD-3A284FC4218E.png" class="align-center" src="../../_images/D28614AA-9758-45ED-9EFD-3A284FC4218E.png" /></a>
 <ol class="arabic simple" start="4">
 <li>Check the multi-site check box in the delivery service screen and make sure that Content Routing Type is set to HTTP_LIVE_NATL:</li>
 </ol>
-<a class="reference internal image-reference" href="../../_images/mso-enable.png"><img alt="../../_images/mso-enable.png" class="align-center" src="../../_images/mso-enable.png" style="width: 1695.0px; height: 1079.0px;" /></a>
+<a class="reference internal image-reference" href="../../_images/mso-enable.png"><img alt="../../_images/mso-enable.png" class="align-center" src="../../_images/mso-enable.png" /></a>
 <ol class="arabic simple" start="5">
 <li>Assign the org servers to the delivery service that will have the multi site feature:</li>
 </ol>
-<a class="reference internal image-reference" href="../../_images/066CEF4F-C1A3-4A89-8B52-4F72B0531367.png"><img alt="../../_images/066CEF4F-C1A3-4A89-8B52-4F72B0531367.png" class="align-center" src="../../_images/066CEF4F-C1A3-4A89-8B52-4F72B0531367.png" style="width: 580.0px; height: 343.0px;" /></a>
+<a class="reference internal image-reference" href="../../_images/066CEF4F-C1A3-4A89-8B52-4F72B0531367.png"><img alt="../../_images/066CEF4F-C1A3-4A89-8B52-4F72B0531367.png" class="align-center" src="../../_images/066CEF4F-C1A3-4A89-8B52-4F72B0531367.png" /></a>
 <div class="admonition note">
 <p class="first admonition-title">Note</p>
 <p class="last">“Origin Server Base URL” uniqueness: In order to enable MID caches to distinguish delivery services by different MSO algorithms while performing parent failover, it requires that “Origin Server Base URL” (OFQDN) for each MSO enabled delivery service is unique unless the exceptions listed afterwards. This means that the OFQDN of a MSO enabled delivery service should be different with the OFQDNs of any other delivery service, regardless of whether they are MSO enabled or not. The exceptions are:
@@ -254,14 +254,14 @@
 <ol class="arabic simple" start="7">
 <li>Optionally, there are two configuration options that can set the order of the origins used if &#8220;Primary/backup&#8221; is selected for &#8220;Multi Site Origin Algorithm&#8221;. By creating location-based cachegroups and assigning the origin servers accordingly and defining these cachegroups as parents for specific mids, location-based primary/secondary selection can be made.   If primary/secondary selection should be the same for all mids, then a new parameter “rank” should be configured for each origin server profile. Origin servers with lower values of rank have higher ranking in the origin server list on MID caches, e.g. OS with rank of &#8220;2&#8221; precedes OS with the rank of &#8220;5&#8221;. For any OS, if rank value is not defined in its profile, its rank value will default to “1”.  In the event that both location based cachegroups are used alongside rank, sorting will be by cachegroup first and rank second.  In this way it is possible to have specific backup servers for use at specific locations.</li>
 </ol>
-<a class="reference internal image-reference" href="../../_images/mso-rank.png"><img alt="../../_images/mso-rank.png" class="align-center" src="../../_images/mso-rank.png" style="width: 585.0px; height: 105.6px;" /></a>
+<a class="reference internal image-reference" href="../../_images/mso-rank.png"><img alt="../../_images/mso-rank.png" class="align-center" src="../../_images/mso-rank.png" /></a>
 <ol class="arabic simple" start="8">
 <li>Assign the parent.config location parameter to the MID profile:</li>
 </ol>
-<a class="reference internal image-reference" href="../../_images/D22DCAA3-18CC-48F4-965B-5312993F9820.png"><img alt="../../_images/D22DCAA3-18CC-48F4-965B-5312993F9820.png" class="align-center" src="../../_images/D22DCAA3-18CC-48F4-965B-5312993F9820.png" style="width: 658.0px; height: 601.0px;" /></a>
+<a class="reference internal image-reference" href="../../_images/D22DCAA3-18CC-48F4-965B-5312993F9820.png"><img alt="../../_images/D22DCAA3-18CC-48F4-965B-5312993F9820.png" class="align-center" src="../../_images/D22DCAA3-18CC-48F4-965B-5312993F9820.png" /></a>
 <ol class="arabic" start="9">
 <li><p class="first">Configure the mid hdr_rewrite on the delivery service, example:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">cond</span> <span class="o">%</span><span class="p">{</span><span class="n">REMAP_PSEUDO_HOOK</span><span class="p">}</span> <span class="n">__RETURN__</span> <span class="nb">set</span><span class="o">-</span><span class="n">config</span> <span class="n">proxy</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">http</span><span class="o">.</span><span class="n">parent_origin</span><span class="o">.</span><span class="n">dead_server_retry_enabled</span> <span class="mi">1</span> <span class="n">__RETURN__</span> <span class="nb">set</span><span class="o">-</span><span class="n">config</span> <span class="n">proxy</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">http</span><span class="o">.</span><span class="n">parent_origin</span><span class="o">.</span><span class="n">simple_retry_enabled</span> <span class="mi">1</span> <span class="n">__RETURN__</span> <span class="nb">set</span><span class="o">-</span><span class="n">config</span> <span class="n">proxy</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">http</span><span class="o">.</span><span class="n">parent_origin</span><span class="o">.</span><span class="n">simple_retry_response_codes</span> <span class="s2">&quot;400,404,412&quot;</span> <span class="n">__RETURN__</span> <span class="nb">set</span><span class="o">-</span><span class="n">config</span> <span class="n">proxy</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">http</span><span class="o">.</span><span class="n">parent_origin</span><span class="o">.</span><span class="n">dead_server_retry_response_codes</span> <span class="s2">&quot;502,503&quot;</span> <span class="n">__RETURN__</span> <span class="nb">set</span><span class="o">-</span><span class="n">config</span> <span class="n">proxy</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">http</span><span class="o">.</span><span class="n">connect_attempts_timeout</span> <span class="mi">2</span> <span class="n">__RETURN__</span> <span class="nb">set</span><span class="o">-</span><span class="n">config</span> <span class="n">proxy</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">http</span><span class="o">.</span><span class="n">connect_attempts_max_retries</span> <span class="mi">2</span> <span class="n">__RETURN__</span> <span class="nb">set</span><span class="o">-</span><span class="n">config</span> <span class="n">proxy</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">http</span><span class="o">.</span><span class="n">connect_attempts_max_retries_dead_server</span> <span class="mi">1</span> <span class="n">__RETURN__</span> <span class="nb">set</span><span class="o">-</span><span class="n">config</span> <span class="n">proxy</span><span class="o">.</span><span class="n">config</span><span class="o">.</span><span class="n">http</span><span class="o">.</span><span class="n">transaction_active_timeout_in</span> <span class="mi">5</span> <span class="p">[</span><span class="n">L</span><span class="p">]</span> <span class="n">__RETURN__</span>
+<div class="highlight-python"><div class="highlight"><pre>cond %{REMAP_PSEUDO_HOOK} __RETURN__ set-config proxy.config.http.parent_origin.dead_server_retry_enabled 1 __RETURN__ set-config proxy.config.http.parent_origin.simple_retry_enabled 1 __RETURN__ set-config proxy.config.http.parent_origin.simple_retry_response_codes &quot;400,404,412&quot; __RETURN__ set-config proxy.config.http.parent_origin.dead_server_retry_response_codes &quot;502,503&quot; __RETURN__ set-config proxy.config.http.connect_attempts_timeout 2 __RETURN__ set-config proxy.config.http.connect_attempts_max_retries 2 __RETURN__ set-config proxy.config.http.connect_attempts_max_retries_dead_server 1 __RETURN__ set-config proxy.config.http.transaction_active_timeout_in 5 [L] __RETURN__
 </pre></div>
 </div>
 </li>
@@ -308,7 +308,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../../',
-            VERSION:'1.7',
+            VERSION:'master',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/latest/admin/quick_howto/regionalgeo.html b/docs/latest/admin/quick_howto/regionalgeo.html
index f753af0..4775038 100644
--- a/docs/latest/admin/quick_howto/regionalgeo.html
+++ b/docs/latest/admin/quick_howto/regionalgeo.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Configure Regional Geo-blocking (RGB) &mdash; Traffic Control 1.7 documentation </title>
+  <title>Configure Regional Geo-blocking (RGB) &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 Delivery Service Steering" href="steering.html"/>
         <link rel="prev" title="Configure Federations" href="federations.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>
       
@@ -196,24 +196,24 @@
 <li>Prepare RGB configuration file</li>
 </ol>
 <p>RGB uses a configuration file in JSON format to define regional geo-blocking rules for delivery services. The file needs to be put on an HTTP server accessible to Traffic Router. An example of the JSON is as follows:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span>
-<span class="s2">&quot;deliveryServices&quot;</span><span class="p">:</span>
-    <span class="p">[</span>
-        <span class="p">{</span>
-            <span class="s2">&quot;deliveryServiceId&quot;</span><span class="p">:</span> <span class="s2">&quot;hls-live&quot;</span><span class="p">,</span>
-            <span class="s2">&quot;urlRegex&quot;</span><span class="p">:</span> <span class="s2">&quot;.*live4</span><span class="se">\\</span><span class="s2">.m3u8&quot;</span><span class="p">,</span>
-            <span class="s2">&quot;geoLocation&quot;</span><span class="p">:</span> <span class="p">{</span><span class="s2">&quot;includePostalCode&quot;</span><span class="p">:[</span><span class="s2">&quot;N0H&quot;</span><span class="p">,</span> <span class="s2">&quot;L9V&quot;</span><span class="p">,</span> <span class="s2">&quot;L9W&quot;</span><span class="p">]},</span>
-            <span class="s2">&quot;redirectUrl&quot;</span><span class="p">:</span> <span class="s2">&quot;http://third-party.com/blacked_out.html&quot;</span>
-        <span class="p">},</span>
-        <span class="p">{</span>
-            <span class="s2">&quot;deliveryServiceId&quot;</span><span class="p">:</span> <span class="s2">&quot;hls-live&quot;</span><span class="p">,</span>
-            <span class="s2">&quot;urlRegex&quot;</span><span class="p">:</span> <span class="s2">&quot;.*live5</span><span class="se">\\</span><span class="s2">.m3u8&quot;</span><span class="p">,</span>
-            <span class="s2">&quot;ipWhiteList&quot;</span><span class="p">:</span> <span class="p">[</span><span class="mf">185.68</span><span class="o">.</span><span class="mf">71.9</span><span class="o">/</span><span class="mi">22</span><span class="s2">&quot;,&quot;</span><span class="mf">142.232</span><span class="o">.</span><span class="mf">0.79</span><span class="o">/</span><span class="mi">24</span><span class="s2">&quot;],</span>
-            <span class="s2">&quot;geoLocation&quot;</span><span class="p">:</span> <span class="p">{</span><span class="s2">&quot;excludePostalCode&quot;</span><span class="p">:[</span><span class="s2">&quot;N0H&quot;</span><span class="p">,</span> <span class="s2">&quot;L9V&quot;</span><span class="p">]},</span>
-            <span class="s2">&quot;redirectUrl&quot;</span><span class="p">:</span> <span class="s2">&quot;/live5_low_bitrate.m3u8&quot;</span>
-        <span class="p">}</span>
-    <span class="p">]</span>
-<span class="p">}</span>
+<div class="highlight-python"><div class="highlight"><pre>{
+&quot;deliveryServices&quot;:
+    [
+        {
+            &quot;deliveryServiceId&quot;: &quot;hls-live&quot;,
+            &quot;urlRegex&quot;: &quot;.*live4\\.m3u8&quot;,
+            &quot;geoLocation&quot;: {&quot;includePostalCode&quot;:[&quot;N0H&quot;, &quot;L9V&quot;, &quot;L9W&quot;]},
+            &quot;redirectUrl&quot;: &quot;http://third-party.com/blacked_out.html&quot;
+        },
+        {
+            &quot;deliveryServiceId&quot;: &quot;hls-live&quot;,
+            &quot;urlRegex&quot;: &quot;.*live5\\.m3u8&quot;,
+            &quot;ipWhiteList&quot;: [185.68.71.9/22&quot;,&quot;142.232.0.79/24&quot;],
+            &quot;geoLocation&quot;: {&quot;excludePostalCode&quot;:[&quot;N0H&quot;, &quot;L9V&quot;]},
+            &quot;redirectUrl&quot;: &quot;/live5_low_bitrate.m3u8&quot;
+        }
+    ]
+}
 </pre></div>
 </div>
 <ul class="simple">
@@ -231,23 +231,23 @@
 <li>&#8220;regional_geoblocking.polling.url&#8221;: the HTTP URL of RGB configuration file. Traffic Router will fetch the file from this URL.</li>
 <li>&#8220;regional_geoblocking.polling.interval&#8221;: the interval that Traffic Router polls the RGB configuration file.</li>
 </ul>
-<a class="reference internal image-reference" href="../../_images/regionalgeo01.png"><img alt="../../_images/regionalgeo01.png" class="align-center" src="../../_images/regionalgeo01.png" style="width: 1234.0px; height: 430.0px;" /></a>
+<a class="reference internal image-reference" href="../../_images/regionalgeo01.png"><img alt="../../_images/regionalgeo01.png" class="align-center" src="../../_images/regionalgeo01.png" /></a>
 <ol class="arabic simple" start="3">
 <li>Enable RGB for a delivery service</li>
 </ol>
-<a class="reference internal image-reference" href="../../_images/regionalgeo02.png"><img alt="../../_images/regionalgeo02.png" class="align-center" src="../../_images/regionalgeo02.png" style="width: 1046.0px; height: 1054.0px;" /></a>
+<a class="reference internal image-reference" href="../../_images/regionalgeo02.png"><img alt="../../_images/regionalgeo02.png" class="align-center" src="../../_images/regionalgeo02.png" /></a>
 <ol class="arabic simple" start="4">
 <li>Make configuration effective</li>
 </ol>
 <p>Go to Tools-&gt;Snapshot CRConfig, perform “Diff CRConfig” and click &#8220;Write CRConfig&#8221;.</p>
-<a class="reference internal image-reference" href="../../_images/regionalgeo03.png"><img alt="../../_images/regionalgeo03.png" class="align-center" src="../../_images/regionalgeo03.png" style="width: 464.8px; height: 128.8px;" /></a>
+<a class="reference internal image-reference" href="../../_images/regionalgeo03.png"><img alt="../../_images/regionalgeo03.png" class="align-center" src="../../_images/regionalgeo03.png" /></a>
 <ol class="arabic simple" start="5">
 <li>Traffic Router access log with RGB</li>
 </ol>
 <p>RGB extends the field of &#8220;rtype&#8221; and adds a new field &#8220;rgb&#8221; in Traffic Router access.log to help to monitor the working of this feature.</p>
 <p>For &#8220;rtype&#8221;, RGALT indicates that a request is redirected to an alternate URL by RGB; RGDENY indicates that a request is denied by RGB because there is no matching rule in JSON for this request.</p>
 <p>For &#8220;rgb&#8221;, when RGB is enabled, it will be non-empty with following format:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span><span class="n">FSA</span><span class="p">}:{</span><span class="n">allowed</span><span class="o">/</span><span class="n">disallowed</span><span class="p">}:{</span><span class="n">include</span><span class="o">/</span><span class="n">exclude</span> <span class="n">postal</span><span class="p">}:{</span><span class="n">fallback</span> <span class="n">config</span><span class="o">/</span><span class="n">current</span> <span class="n">config</span><span class="p">}:{</span><span class="n">allowed</span> <span class="n">by</span> <span class="n">whitelist</span><span class="o">/</span><span class="n">otherwise</span><span class="p">}</span>
+<div class="highlight-python"><div class="highlight"><pre>{FSA}:{allowed/disallowed}:{include/exclude postal}:{fallback config/current config}:{allowed by whitelist/otherwise}
 </pre></div>
 </div>
 <ul class="simple">
@@ -258,11 +258,11 @@
 <li>{allowed by whitelist/otherwise}: If a request is allowed by whitelist, this flag is set to 1; for all other cases, it is 0.</li>
 </ul>
 <p>Example:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="mf">1446442214.685</span> <span class="n">qtype</span><span class="o">=</span><span class="n">HTTP</span> <span class="n">chi</span><span class="o">=</span><span class="mf">129.100</span><span class="o">.</span><span class="mf">254.79</span> <span class="n">url</span><span class="o">=</span><span class="s2">&quot;http://ccr.geo2.cdn.com/live5.m3u8&quot;</span> <span class="n">cqhm</span><span class="o">=</span><span class="n">GET</span> <span class="n">cqhv</span><span class="o">=</span><span class="n">HTTP</span><span class="o">/</span><span class="mf">1.1</span> <span class="n">rtype</span><span class="o">=</span><span class="n">GEO</span> <span class="n">rloc</span><span class="o">=</span><span class="s2">&quot;-&quot;</span> <span class="n">rdtl</span><span class="o">=-</span> <span class="n">rerr</span><span class="o">=</span><span class="s2">&quot;-&quot;</span> <span class="n">rgb</span><span class="o">=</span><span class="s2">&quot;N6G:1:X:0:0&quot;</span> <span class="n">pssc</span><span class="o">=</span><span class="mi">302</span> <span class="n">ttms</span><span class="o">=</span><span class="mi">3</span> <span class="n">rurl</span><span class="o">=</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">cent6</span><span class="o">-</span><span class="mf">44.</span><span class="n">geo2</span><span class="o">.</span><span class="n">cdn</span><span class="o">.</span><span class="n">com</span><span class="o">/</span><span class="n">live5</span><span class="o">.</span><span class="n">m3u8</span> <span class="n">rh</span><span class="o">=</span><span class="s2">&quot;-&quot;</span>
+<div class="highlight-python"><div class="highlight"><pre>1446442214.685 qtype=HTTP chi=129.100.254.79 url=&quot;http://ccr.geo2.cdn.com/live5.m3u8&quot; cqhm=GET cqhv=HTTP/1.1 rtype=GEO rloc=&quot;-&quot; rdtl=- rerr=&quot;-&quot; rgb=&quot;N6G:1:X:0:0&quot; pssc=302 ttms=3 rurl=http://cent6-44.geo2.cdn.com/live5.m3u8 rh=&quot;-&quot;
 
-<span class="mf">1446442219.181</span> <span class="n">qtype</span><span class="o">=</span><span class="n">HTTP</span> <span class="n">chi</span><span class="o">=</span><span class="mf">184.68</span><span class="o">.</span><span class="mf">71.9</span> <span class="n">url</span><span class="o">=</span><span class="s2">&quot;http://ccr.geo2.cdn.com/live5.m3u8&quot;</span> <span class="n">cqhm</span><span class="o">=</span><span class="n">GET</span> <span class="n">cqhv</span><span class="o">=</span><span class="n">HTTP</span><span class="o">/</span><span class="mf">1.1</span> <span class="n">rtype</span><span class="o">=</span><span class="n">RGALT</span> <span class="n">rloc</span><span class="o">=</span><span class="s2">&quot;-&quot;</span> <span class="n">rdtl</span><span class="o">=-</span> <span class="n">rerr</span><span class="o">=</span><span class="s2">&quot;-&quot;</span> <span class="n">rgb</span><span class="o">=</span><span class="s2">&quot;-:0:X:0:0&quot;</span> <span class="n">pssc</span><span class="o">=</span><span class="mi">302</span> <span class="n">ttms</span><span class="o">=</span><span class="mi">3</span> <span class="n">rurl</span><span class="o">=</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">cent6</span><span class="o">-</span><span class="mf">44.</span><span class="n">geo2</span><span class="o">.</span><span class="n">cdn</span><span class="o">.</span><span class="n">com</span><span class="o">/</span><span class="n">low_bitrate</span><span class="o">.</span><span class="n">m3u8</span> <span class="n">rh</span><span class="o">=</span><span class="s2">&quot;-&quot;</span>
+1446442219.181 qtype=HTTP chi=184.68.71.9 url=&quot;http://ccr.geo2.cdn.com/live5.m3u8&quot; cqhm=GET cqhv=HTTP/1.1 rtype=RGALT rloc=&quot;-&quot; rdtl=- rerr=&quot;-&quot; rgb=&quot;-:0:X:0:0&quot; pssc=302 ttms=3 rurl=http://cent6-44.geo2.cdn.com/low_bitrate.m3u8 rh=&quot;-&quot;
 
-<span class="mf">1446445521.677</span> <span class="n">qtype</span><span class="o">=</span><span class="n">HTTP</span> <span class="n">chi</span><span class="o">=</span><span class="mf">24.114</span><span class="o">.</span><span class="mf">29.79</span> <span class="n">url</span><span class="o">=</span><span class="s2">&quot;http://ccr.geo2.cdn.com/live51.m3u8&quot;</span> <span class="n">cqhm</span><span class="o">=</span><span class="n">GET</span> <span class="n">cqhv</span><span class="o">=</span><span class="n">HTTP</span><span class="o">/</span><span class="mf">1.1</span> <span class="n">rtype</span><span class="o">=</span><span class="n">RGDENY</span> <span class="n">rloc</span><span class="o">=</span><span class="s2">&quot;-&quot;</span> <span class="n">rdtl</span><span class="o">=-</span> <span class="n">rerr</span><span class="o">=</span><span class="s2">&quot;-&quot;</span> <span class="n">rgb</span><span class="o">=</span><span class="s2">&quot;L4S:0:-:0:0&quot;</span> <span class="n">pssc</span><span class="o">=</span><span class="mi">520</span> <span class="n">ttms</span><span class="o">=</span><span class="mi">3</span> <span class="n">rurl</span><span class="o">=</span><span class="s2">&quot;-&quot;</span> <span class="n">rh</span><span class="o">=</span><span class="s2">&quot;-&quot;</span>
+1446445521.677 qtype=HTTP chi=24.114.29.79 url=&quot;http://ccr.geo2.cdn.com/live51.m3u8&quot; cqhm=GET cqhv=HTTP/1.1 rtype=RGDENY rloc=&quot;-&quot; rdtl=- rerr=&quot;-&quot; rgb=&quot;L4S:0:-:0:0&quot; pssc=520 ttms=3 rurl=&quot;-&quot; rh=&quot;-&quot;
 </pre></div>
 </div>
 </div>
@@ -305,7 +305,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../../',
-            VERSION:'1.7',
+            VERSION:'master',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/latest/admin/quick_howto/steering.html b/docs/latest/admin/quick_howto/steering.html
index 918c8a3..180a906 100644
--- a/docs/latest/admin/quick_howto/steering.html
+++ b/docs/latest/admin/quick_howto/steering.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Configure Delivery Service Steering &mdash; Traffic Control 1.7 documentation </title>
+  <title>Configure Delivery Service Steering &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="Developer’s Guide" href="../../development/index.html"/>
         <link rel="prev" title="Configure Regional Geo-blocking (RGB)" href="regionalgeo.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>
       
@@ -191,19 +191,19 @@
 <ol class="arabic simple">
 <li>Create two target delivery services in Traffic Ops.  They must both be HTTP delivery services that are part of the same CDN.</li>
 </ol>
-<a class="reference internal image-reference" href="../../_images/steering01.png"><img alt="../../_images/steering01.png" class="align-center" src="../../_images/steering01.png" style="width: 1172.0px; height: 232.0px;" /></a>
+<a class="reference internal image-reference" href="../../_images/steering01.png"><img alt="../../_images/steering01.png" class="align-center" src="../../_images/steering01.png" /></a>
 <ol class="arabic simple" start="2">
 <li>Create a delivery service with type STEERING in Traffic Ops.</li>
 </ol>
-<a class="reference internal image-reference" href="../../_images/steering02.png"><img alt="../../_images/steering02.png" class="align-center" src="../../_images/steering02.png" style="width: 811.0px; height: 617.0px;" /></a>
+<a class="reference internal image-reference" href="../../_images/steering02.png"><img alt="../../_images/steering02.png" class="align-center" src="../../_images/steering02.png" /></a>
 <ol class="arabic simple" start="3">
 <li>Click the &#8216;Manage Steering Assignments&#8217; button on the delivery service screen to assign targets.</li>
 </ol>
-<a class="reference internal image-reference" href="../../_images/steering03.png"><img alt="../../_images/steering03.png" class="align-center" src="../../_images/steering03.png" style="width: 757.0px; height: 598.0px;" /></a>
+<a class="reference internal image-reference" href="../../_images/steering03.png"><img alt="../../_images/steering03.png" class="align-center" src="../../_images/steering03.png" /></a>
 <ol class="arabic simple" start="4">
 <li>Create a user with the role of Steering.</li>
 </ol>
-<a class="reference internal image-reference" href="../../_images/steering04.png"><img alt="../../_images/steering04.png" class="align-center" src="../../_images/steering04.png" style="width: 650.0px; height: 487.0px;" /></a>
+<a class="reference internal image-reference" href="../../_images/steering04.png"><img alt="../../_images/steering04.png" class="align-center" src="../../_images/steering04.png" /></a>
 <ol class="arabic" start="5">
 <li><p class="first">As the steering user, assign weights to target delivery services.  This will require logging in to Traffic Ops first via <code class="docutils literal"><span class="pre">http://to.kabletown.net/api/1.2/user/login</span></code> and storing the mojolicious cookie.</p>
 <blockquote>
@@ -212,15 +212,15 @@
 </div></blockquote>
 </li>
 </ol>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span>
- <span class="s2">&quot;targets&quot;</span><span class="p">:</span> <span class="p">[</span>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+ <span class="s">&quot;targets&quot;</span><span class="p">:</span> <span class="p">[</span>
   <span class="p">{</span>
-    <span class="s2">&quot;weight&quot;</span><span class="p">:</span> <span class="s2">&quot;1000&quot;</span><span class="p">,</span>
-    <span class="s2">&quot;deliveryService&quot;</span><span class="p">:</span> <span class="s2">&quot;target-deliveryservice-1&quot;</span>
+    <span class="s">&quot;weight&quot;</span><span class="p">:</span> <span class="s">&quot;1000&quot;</span><span class="p">,</span>
+    <span class="s">&quot;deliveryService&quot;</span><span class="p">:</span> <span class="s">&quot;target-deliveryservice-1&quot;</span>
   <span class="p">},</span>
   <span class="p">{</span>
-    <span class="s2">&quot;weight&quot;</span><span class="p">:</span> <span class="s2">&quot;9000&quot;</span><span class="p">,</span>
-    <span class="s2">&quot;deliveryService&quot;</span><span class="p">:</span> <span class="s2">&quot;target-deliveryservice-2&quot;</span>
+    <span class="s">&quot;weight&quot;</span><span class="p">:</span> <span class="s">&quot;9000&quot;</span><span class="p">,</span>
+    <span class="s">&quot;deliveryService&quot;</span><span class="p">:</span> <span class="s">&quot;target-deliveryservice-2&quot;</span>
   <span class="p">}</span>
  <span class="p">]</span>
 <span class="p">}</span>
@@ -234,21 +234,21 @@
 </div></blockquote>
 </li>
 </ol>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span>
- <span class="s2">&quot;filters&quot;</span><span class="p">:</span> <span class="p">[</span>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+ <span class="s">&quot;filters&quot;</span><span class="p">:</span> <span class="p">[</span>
   <span class="p">{</span>
-    <span class="s2">&quot;pattern&quot;</span><span class="p">:</span> <span class="s2">&quot;.*</span><span class="se">\\</span><span class="s2">gototarget1</span><span class="se">\\</span><span class="s2">..*&quot;</span><span class="p">,</span>
-    <span class="s2">&quot;deliveryService&quot;</span><span class="p">:</span> <span class="s2">&quot;target-deliveryservice-1&quot;</span>
+    <span class="s">&quot;pattern&quot;</span><span class="p">:</span> <span class="s">&quot;.*</span><span class="se">\\</span><span class="s">gototarget1</span><span class="se">\\</span><span class="s">..*&quot;</span><span class="p">,</span>
+    <span class="s">&quot;deliveryService&quot;</span><span class="p">:</span> <span class="s">&quot;target-deliveryservice-1&quot;</span>
   <span class="p">}</span>
  <span class="p">],</span>
- <span class="s2">&quot;targets&quot;</span><span class="p">:</span> <span class="p">[</span>
+ <span class="s">&quot;targets&quot;</span><span class="p">:</span> <span class="p">[</span>
   <span class="p">{</span>
-    <span class="s2">&quot;weight&quot;</span><span class="p">:</span> <span class="s2">&quot;1000&quot;</span><span class="p">,</span>
-    <span class="s2">&quot;deliveryService&quot;</span><span class="p">:</span> <span class="s2">&quot;target-deliveryservice-1&quot;</span>
+    <span class="s">&quot;weight&quot;</span><span class="p">:</span> <span class="s">&quot;1000&quot;</span><span class="p">,</span>
+    <span class="s">&quot;deliveryService&quot;</span><span class="p">:</span> <span class="s">&quot;target-deliveryservice-1&quot;</span>
   <span class="p">},</span>
   <span class="p">{</span>
-    <span class="s2">&quot;weight&quot;</span><span class="p">:</span> <span class="s2">&quot;9000&quot;</span><span class="p">,</span>
-    <span class="s2">&quot;deliveryService&quot;</span><span class="p">:</span> <span class="s2">&quot;target-deliveryservice-2&quot;</span>
+    <span class="s">&quot;weight&quot;</span><span class="p">:</span> <span class="s">&quot;9000&quot;</span><span class="p">,</span>
+    <span class="s">&quot;deliveryService&quot;</span><span class="p">:</span> <span class="s">&quot;target-deliveryservice-2&quot;</span>
   <span class="p">}</span>
  <span class="p">]</span>
 <span class="p">}</span>
@@ -297,7 +297,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../../',
-            VERSION:'1.7',
+            VERSION:'master',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/latest/admin/traffic_monitor.html b/docs/latest/admin/traffic_monitor.html
index 75e7310..b4816bf 100644
--- a/docs/latest/admin/traffic_monitor.html
+++ b/docs/latest/admin/traffic_monitor.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Traffic Monitor Administration &mdash; Traffic Control 1.7 documentation </title>
+  <title>Traffic Monitor Administration &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’s Guide" href="index.html"/>
         <link rel="next" title="Traffic Router Administration" href="traffic_router.html"/>
         <link rel="prev" title="Traffic Portal Administration" href="traffic_portal.html"/> 
@@ -58,7 +58,7 @@
 
         
           
-          <img src="../_static/tc_logo.png" class="logo" />
+          <img src="../_static/tc_logo_c_only.png" class="logo" />
         
         </a>
 
@@ -107,7 +107,7 @@
 <li class="toctree-l2"><a class="reference internal" href="traffic_ops_using.html">Using Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" href="traffic_ops_extensions.html">Managing Traffic Ops Extensions</a></li>
 <li class="toctree-l2"><a class="reference internal" href="traffic_portal.html">Traffic Portal Administration</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="#">Traffic Monitor Administration</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Traffic Monitor Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="traffic_router.html">Traffic Router Administration</a></li>
 <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>
@@ -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>
       
@@ -205,12 +205,12 @@
 </li>
 <li><p class="first">Make sure the FQDN of the Traffic Monitor is resolvable in DNS.</p>
 </li>
-<li><p class="first">Install Traffic Monitor and perl mods: <code class="docutils literal"><span class="pre">sudo</span> <span class="pre">yum</span> <span class="pre">-y</span> <span class="pre">install</span> <span class="pre">traffic_monitor</span> <span class="pre">perl-JSON</span> <span class="pre">perl-WWW-Curl</span></code></p>
+<li><p class="first">Install Traffic Monitor and Perl mods: <code class="docutils literal"><span class="pre">sudo</span> <span class="pre">yum</span> <span class="pre">-y</span> <span class="pre">install</span> <span class="pre">traffic_monitor</span> <span class="pre">perl-JSON</span> <span class="pre">perl-WWW-Curl</span></code></p>
 </li>
 <li><p class="first">Take the config from Traffic Ops - run : <code class="docutils literal"><span class="pre">sudo</span> <span class="pre">/opt/traffic_monitor/bin/traffic_monitor_config.pl</span></code></p>
 <blockquote>
 <div><p>Sample output:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span>traffic_mon # /opt/traffic_monitor/bin/traffic_monitor_config.pl https://traffic-ops.cdn.kabletown.net admin:password prompt
+<div class="highlight-python"><div class="highlight"><pre>traffic_mon # /opt/traffic_monitor/bin/traffic_monitor_config.pl https://traffic-ops.cdn.kabletown.net admin:password prompt
 DEBUG: traffic_ops selected: https://traffic-ops.cdn.kabletown.net
 DEBUG: traffic_ops login: admin:kl0tevax
 DEBUG: Config write mode: prompt
@@ -293,13 +293,13 @@
 </div></blockquote>
 </li>
 <li><p class="first">Start Tomcat: <code class="docutils literal"><span class="pre">sudo</span> <span class="pre">service</span> <span class="pre">tomcat</span> <span class="pre">start</span></code></p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">Using</span> <span class="n">CATALINA_BASE</span><span class="p">:</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">tomcat</span>
-<span class="n">Using</span> <span class="n">CATALINA_HOME</span><span class="p">:</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">tomcat</span>
-<span class="n">Using</span> <span class="n">CATALINA_TMPDIR</span><span class="p">:</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">tomcat</span><span class="o">/</span><span class="n">temp</span>
-<span class="n">Using</span> <span class="n">JRE_HOME</span><span class="p">:</span> <span class="o">/</span><span class="n">usr</span>
-<span class="n">Using</span> <span class="n">CLASSPATH</span><span class="p">:</span><span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">tomcat</span><span class="o">/</span><span class="nb">bin</span><span class="o">/</span><span class="n">bootstrap</span><span class="o">.</span><span class="n">jar</span>
-<span class="n">Using</span> <span class="n">CATALINA_PID</span><span class="p">:</span><span class="o">/</span><span class="n">var</span><span class="o">/</span><span class="n">run</span><span class="o">/</span><span class="n">tomcat</span><span class="o">/</span><span class="n">tomcat</span><span class="o">.</span><span class="n">pid</span>
-<span class="n">Starting</span> <span class="n">tomcat</span> <span class="p">[</span> <span class="n">OK</span> <span class="p">]</span>
+<div class="highlight-python"><div class="highlight"><pre>Using CATALINA_BASE: /opt/tomcat
+Using CATALINA_HOME: /opt/tomcat
+Using CATALINA_TMPDIR: /opt/tomcat/temp
+Using JRE_HOME: /usr
+Using CLASSPATH:/opt/tomcat/bin/bootstrap.jar
+Using CATALINA_PID:/var/run/tomcat/tomcat.pid
+Starting tomcat [ OK ]
 </pre></div>
 </div>
 </li>
@@ -358,7 +358,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../',
-            VERSION:'1.7',
+            VERSION:'master',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/latest/admin/traffic_ops_config.html b/docs/latest/admin/traffic_ops_config.html
index da47adf..da6bcfe 100644
--- a/docs/latest/admin/traffic_ops_config.html
+++ b/docs/latest/admin/traffic_ops_config.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Configuring Traffic Ops &mdash; Traffic Control 1.7 documentation </title>
+  <title>Configuring Traffic Ops &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’s Guide" href="index.html"/>
         <link rel="next" title="Using Traffic Ops" href="traffic_ops_using.html"/>
         <link rel="prev" title="Installing Traffic Ops" href="traffic_ops_install.html"/> 
@@ -58,7 +58,7 @@
 
         
           
-          <img src="../_static/tc_logo.png" class="logo" />
+          <img src="../_static/tc_logo_c_only.png" class="logo" />
         
         </a>
 
@@ -103,7 +103,7 @@
 <ul class="current">
 <li class="toctree-l1 current"><a class="reference internal" href="index.html">Administrator&#8217;s Guide</a><ul class="current">
 <li class="toctree-l2"><a class="reference internal" href="traffic_ops_install.html">Installing Traffic Ops</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="#">Configuring Traffic Ops</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Configuring Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" href="traffic_ops_using.html">Using Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" href="traffic_ops_extensions.html">Managing Traffic Ops Extensions</a></li>
 <li class="toctree-l2"><a class="reference internal" href="traffic_portal.html">Traffic Portal Administration</a></li>
@@ -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>
       
@@ -315,7 +315,7 @@
 </tr>
 <tr class="row-even"><td>purge_allow_ip</td>
 <td>ip_allow.config</td>
-<td>The IP address range that is allowed to execute the PURGE method on the caches (not related to <a class="reference internal" href="traffic_ops_using.html#rl-purge"><span class="std std-ref">Invalidate Content</span></a>)</td>
+<td>The IP address range that is allowed to execute the PURGE method on the caches (not related to <a class="reference internal" href="traffic_ops_using.html#rl-purge"><em>Invalidate Content</em></a>)</td>
 </tr>
 <tr class="row-odd"><td>health.threshold.loadavg</td>
 <td>rascal.properties</td>
@@ -348,12 +348,12 @@
 <tr class="row-even"><td>astats_over_http</td>
 <td>package</td>
 <td>The package version for the astats_over_http plugin.</td>
-<td><a class="reference external" href="http://traffic-control-cdn.net/downloads/index.html">astats_over_http</a></td>
+<td><a class="reference external" href="http://trafficcontrol.apache.org/downloads/index.html">astats_over_http</a></td>
 </tr>
 <tr class="row-odd"><td>trafficserver</td>
 <td>package</td>
 <td>The package version for the trafficserver plugin.</td>
-<td><a class="reference external" href="http://traffic-control-cdn.net/downloads/index.html">trafficserver</a></td>
+<td><a class="reference external" href="http://trafficcontrol.apache.org/downloads/index.html">trafficserver</a></td>
 </tr>
 <tr class="row-even"><td>regex_revalidate</td>
 <td>plugin.config</td>
@@ -377,7 +377,7 @@
 </div>
 <div class="section" id="configuring-content-purge">
 <h2>Configuring Content Purge<a class="headerlink" href="#configuring-content-purge" title="Permalink to this headline">¶</a></h2>
-<p>Content purge using ATS is not simple; there is no file system to delete files/directories from, and in large caches it can be hard to delete a simple regular expression from the cache. This is why Traffic Control uses the <a class="reference external" href="https://docs.trafficserver.apache.org/en/latest/admin-guide/plugins/regex_revalidate.en.html">Regex Revalidate Plugin</a> to purge content from the system. We don&#8217;t actually remove the content, we have a check that gets run before each request on each cache to see if this request matches a list of regular expressions, and if it does, we force a revalidation to the origin, making the original content inaccessible. The regex_revalidate plugin will monitor it&#8217;s config file, and will pick up changes to it without a <cite>traffic_line -x</cite> signal to ATS. Changes to this file need to be distributed to the highest tier (MID) caches in the CDN before they are distributed to the lower tiers, to prevent filling the lower tiers with the content that should be purged from the higher tiers without hitting the origin. This is why the ort script (see <a class="reference internal" href="traffic_server.html#reference-traffic-ops-ort"><span class="std std-ref">Configuring Traffic Server</span></a>) will by default push out config changes to MID first, confirm that they have all been updated, and then push out the changes to the lower tiers. In large CDNs, this can make the distribution and time to activation of the purge too long, and because of that there is the option to not distribute the <cite>regex_revalidate.config</cite> file using the ort script, but to do this using other means. By default, Traffic Ops will use ort to distribute the <cite>regex_revalidate.config</cite> file.</p>
+<p>Content purge using ATS is not simple; there is no file system to delete files/directories from, and in large caches it can be hard to delete a simple regular expression from the cache. This is why Traffic Control uses the <a class="reference external" href="https://docs.trafficserver.apache.org/en/latest/admin-guide/plugins/regex_revalidate.en.html">Regex Revalidate Plugin</a> to purge content from the system. We don&#8217;t actually remove the content, we have a check that gets run before each request on each cache to see if this request matches a list of regular expressions, and if it does, we force a revalidation to the origin, making the original content inaccessible. The regex_revalidate plugin will monitor it&#8217;s config file, and will pick up changes to it without a <cite>traffic_line -x</cite> signal to ATS. Changes to this file need to be distributed to the highest tier (MID) caches in the CDN before they are distributed to the lower tiers, to prevent filling the lower tiers with the content that should be purged from the higher tiers without hitting the origin. This is why the ort script (see <a class="reference internal" href="traffic_server.html#reference-traffic-ops-ort"><em>Configuring Traffic Server</em></a>) will by default push out config changes to MID first, confirm that they have all been updated, and then push out the changes to the lower tiers. In large CDNs, this can make the distribution and time to activation of the purge too long, and because of that there is the option to not distribute the <cite>regex_revalidate.config</cite> file using the ort script, but to do this using other means. By default, Traffic Ops will use ort to distribute the <cite>regex_revalidate.config</cite> file.</p>
 <p>Content Purge is controlled by the following parameters in the profile of the cache:</p>
 <table border="1" class="docutils">
 <colgroup>
@@ -424,13 +424,13 @@
 <li>Start the kickstart installation.</li>
 </ol>
 <p>Create a ks.src file in the root of the selection location. See the example below:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">mkdir</span> <span class="n">newdir</span>
-<span class="n">cd</span> <span class="n">newdir</span><span class="o">/</span>
-<span class="n">cp</span> <span class="o">-</span><span class="n">r</span> <span class="o">../</span><span class="n">centos65</span><span class="o">/*</span> <span class="o">.</span>
-<span class="n">vim</span> <span class="n">ks</span><span class="o">.</span><span class="n">src</span>
-<span class="n">vim</span> <span class="n">isolinux</span><span class="o">/</span><span class="n">isolinux</span><span class="o">.</span><span class="n">cfg</span>
-<span class="n">cd</span> <span class="n">vim</span> <span class="n">osversions</span><span class="o">.</span><span class="n">cfg</span>
-<span class="n">vim</span> <span class="n">osversions</span><span class="o">.</span><span class="n">cfg</span>
+<div class="highlight-python"><div class="highlight"><pre>mkdir newdir
+cd newdir/
+cp -r ../centos65/* .
+vim ks.src
+vim isolinux/isolinux.cfg
+cd vim osversions.cfg
+vim osversions.cfg
 </pre></div>
 </div>
 <p>This is a standard kickstart formatted file that the generate ISO process uses to create the kickstart (ks.cfg) file for the install. The generate ISO process uses the ks.src, overwriting any information set in the Generate ISO tab in Traffic Ops, creating ks.cfg.</p>
@@ -484,7 +484,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../',
-            VERSION:'1.7',
+            VERSION:'master',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/latest/admin/traffic_ops_extensions.html b/docs/latest/admin/traffic_ops_extensions.html
index c894f91..5de6b08 100644
--- a/docs/latest/admin/traffic_ops_extensions.html
+++ b/docs/latest/admin/traffic_ops_extensions.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Managing Traffic Ops Extensions &mdash; Traffic Control 1.7 documentation </title>
+  <title>Managing Traffic Ops Extensions &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’s Guide" href="index.html"/>
         <link rel="next" title="Traffic Portal Administration" href="traffic_portal.html"/>
         <link rel="prev" title="Using Traffic Ops" href="traffic_ops_using.html"/> 
@@ -58,7 +58,7 @@
 
         
           
-          <img src="../_static/tc_logo.png" class="logo" />
+          <img src="../_static/tc_logo_c_only.png" class="logo" />
         
         </a>
 
@@ -105,7 +105,7 @@
 <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>
-<li class="toctree-l2 current"><a class="current reference internal" href="#">Managing Traffic Ops Extensions</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Managing Traffic Ops Extensions</a></li>
 <li class="toctree-l2"><a class="reference internal" href="traffic_portal.html">Traffic Portal Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="traffic_monitor.html">Traffic Monitor Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="traffic_router.html">Traffic Router Administration</a></li>
@@ -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>
       
@@ -190,7 +190,7 @@
 <p>The extensions must be registered with Traffic Ops in order to display a column on the Server Check page. The list of currently registered extensions can be listed by running <code class="docutils literal"><span class="pre">/opt/traffic_ops/app/bin/extensions</span> <span class="pre">-a</span></code>.</p>
 <p>The below extensions are automatically registered with the Traffic Ops database (<code class="docutils literal"><span class="pre">to_extension</span></code> table) at install time (see <code class="docutils literal"><span class="pre">traffic_ops/app/db/seeds.sql</span></code>). However, cron must still be configured to run these checks periodically.</p>
 <p>The scripts are called as follows:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span>$TO_HOME/bin/checks/To&lt;name&gt;Check.pl  -c &quot;{\&quot;base_url\&quot;: \&quot;,https://\&quot;&lt;traffic_ops_ip&gt;\&quot;, \&quot;check_name\&quot;: \&quot;&lt;check_name&gt;\&quot;}&quot; -l &lt;log level&gt;
+<div class="highlight-python"><div class="highlight"><pre>$TO_HOME/bin/checks/To&lt;name&gt;Check.pl  -c &quot;{\&quot;base_url\&quot;: \&quot;,https://\&quot;&lt;traffic_ops_ip&gt;\&quot;, \&quot;check_name\&quot;: \&quot;&lt;check_name&gt;\&quot;}&quot; -l &lt;log level&gt;
 where:
 
 &lt;name&gt; is the type of check script
@@ -202,48 +202,48 @@
 <div class="section" id="example-cron-file">
 <h2>Example Cron File<a class="headerlink" href="#example-cron-file" title="Permalink to this headline">¶</a></h2>
 <p>Edit with <code class="docutils literal"><span class="pre">crontab</span> <span class="pre">-e</span></code>. You may need to adjust the path to your $TO_HOME to match your system.</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">PERL5LIB</span><span class="o">=/</span><span class="n">opt</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">app</span><span class="o">/</span><span class="n">local</span><span class="o">/</span><span class="n">lib</span><span class="o">/</span><span class="n">perl5</span><span class="p">:</span><span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">app</span><span class="o">/</span><span class="n">lib</span>
+<div class="highlight-python"><div class="highlight"><pre>PERL5LIB=/opt/traffic_ops/app/local/lib/perl5:/opt/traffic_ops/app/lib
 
-<span class="c1"># IPv4 ping examples - The &#39;select: [&quot;hostName&quot;,&quot;domainName&quot;]&#39; works but, if you want to check DNS resolution use FQDN.</span>
-<span class="o">*/</span><span class="mi">15</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="n">root</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">app</span><span class="o">/</span><span class="nb">bin</span><span class="o">/</span><span class="n">checks</span><span class="o">/</span><span class="n">ToPingCheck</span><span class="o">.</span><span class="n">pl</span> <span class="o">-</span><span class="n">c</span> <span class="s2">&quot;{</span><span class="se">\&quot;</span><span class="s2">base_url</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">https://localhost</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">check_name</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">10G</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">select</span><span class="se">\&quot;</span><span class="s2">: [</span><span class="se">\&quot;</span><span class="s2">hostName</span><span class="se">\&quot;</span><span class="s2">,</span><span class="se">\&quot;</span><span class="s2">domainName</span><span class="se">\&quot;</span><span class="s2">]}&quot;</span> <span class="o">&gt;&gt;</span> <span class="o">/</span><span class="n">var</span><span class="o">/</span><span class="n">log</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">extensionCheck</span><span class="o">.</span><span class="n">log</span> <span class="mi">2</span><span class="o">&gt;&amp;</span><span class="mi">1</span>
-<span class="o">*/</span><span class="mi">15</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="n">root</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">app</span><span class="o">/</span><span class="nb">bin</span><span class="o">/</span><span class="n">checks</span><span class="o">/</span><span class="n">ToPingCheck</span><span class="o">.</span><span class="n">pl</span> <span class="o">-</span><span class="n">c</span> <span class="s2">&quot;{</span><span class="se">\&quot;</span><span class="s2">base_url</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">https://localhost</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">check_name</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">10G</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">select</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">ipAddress</span><span class="se">\&quot;</span><span class="s2">}&quot;</span> <span class="o">&gt;&gt;</span> <span class="o">/</span><span class="n">var</span><span class="o">/</span><span class="n">log</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">extensionCheck</span><span class="o">.</span><span class="n">log</span> <span class="mi">2</span><span class="o">&gt;&amp;</span><span class="mi">1</span>
-<span class="o">*/</span><span class="mi">15</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="n">root</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">app</span><span class="o">/</span><span class="nb">bin</span><span class="o">/</span><span class="n">checks</span><span class="o">/</span><span class="n">ToPingCheck</span><span class="o">.</span><span class="n">pl</span> <span class="o">-</span><span class="n">c</span> <span class="s2">&quot;{</span><span class="se">\&quot;</span><span class="s2">base_url</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">https://localhost</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">check_name</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">10G</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">name</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">IPv4 Ping</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">select</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">ipAddress</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">syslog_facility</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">local0</span><span class="se">\&quot;</span><span class="s2">}&quot;</span> <span class="o">&gt;</span> <span class="o">/</span><span class="n">dev</span><span class="o">/</span><span class="n">null</span> <span class="mi">2</span><span class="o">&gt;&amp;</span><span class="mi">1</span>
+# IPv4 ping examples - The &#39;select: [&quot;hostName&quot;,&quot;domainName&quot;]&#39; works but, if you want to check DNS resolution use FQDN.
+*/15 * * * * root /opt/traffic_ops/app/bin/checks/ToPingCheck.pl -c &quot;{\&quot;base_url\&quot;: \&quot;https://localhost\&quot;, \&quot;check_name\&quot;: \&quot;10G\&quot;, \&quot;select\&quot;: [\&quot;hostName\&quot;,\&quot;domainName\&quot;]}&quot; &gt;&gt; /var/log/traffic_ops/extensionCheck.log 2&gt;&amp;1
+*/15 * * * * root /opt/traffic_ops/app/bin/checks/ToPingCheck.pl -c &quot;{\&quot;base_url\&quot;: \&quot;https://localhost\&quot;, \&quot;check_name\&quot;: \&quot;10G\&quot;, \&quot;select\&quot;: \&quot;ipAddress\&quot;}&quot; &gt;&gt; /var/log/traffic_ops/extensionCheck.log 2&gt;&amp;1
+*/15 * * * * root /opt/traffic_ops/app/bin/checks/ToPingCheck.pl -c &quot;{\&quot;base_url\&quot;: \&quot;https://localhost\&quot;, \&quot;check_name\&quot;: \&quot;10G\&quot;, \&quot;name\&quot;: \&quot;IPv4 Ping\&quot;, \&quot;select\&quot;: \&quot;ipAddress\&quot;, \&quot;syslog_facility\&quot;: \&quot;local0\&quot;}&quot; &gt; /dev/null 2&gt;&amp;1
 
-<span class="c1"># IPv6 ping examples</span>
-<span class="o">*/</span><span class="mi">15</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="n">root</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">app</span><span class="o">/</span><span class="nb">bin</span><span class="o">/</span><span class="n">checks</span><span class="o">/</span><span class="n">ToPingCheck</span><span class="o">.</span><span class="n">pl</span> <span class="o">-</span><span class="n">c</span> <span class="s2">&quot;{</span><span class="se">\&quot;</span><span class="s2">base_url</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">https://localhost</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">check_name</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">10G6</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">name</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">IPv6 Ping</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">select</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">ip6Address</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">syslog_facility</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">local0</span><span class="se">\&quot;</span><span class="s2">}&quot;</span> <span class="o">&gt;/</span><span class="n">dev</span><span class="o">/</span><span class="n">null</span> <span class="mi">2</span><span class="o">&gt;&amp;</span><span class="mi">1</span>
-<span class="o">*/</span><span class="mi">15</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="n">root</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">app</span><span class="o">/</span><span class="nb">bin</span><span class="o">/</span><span class="n">checks</span><span class="o">/</span><span class="n">ToPingCheck</span><span class="o">.</span><span class="n">pl</span> <span class="o">-</span><span class="n">c</span> <span class="s2">&quot;{</span><span class="se">\&quot;</span><span class="s2">base_url</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">https://localhost</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">check_name</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">10G6</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">select</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">ip6Address</span><span class="se">\&quot;</span><span class="s2">}&quot;</span> <span class="o">&gt;&gt;</span> <span class="o">/</span><span class="n">var</span><span class="o">/</span><span class="n">log</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">extensionCheck</span><span class="o">.</span><span class="n">log</span> <span class="mi">2</span><span class="o">&gt;&amp;</span><span class="mi">1</span>
+# IPv6 ping examples
+*/15 * * * * root /opt/traffic_ops/app/bin/checks/ToPingCheck.pl -c &quot;{\&quot;base_url\&quot;: \&quot;https://localhost\&quot;, \&quot;check_name\&quot;: \&quot;10G6\&quot;, \&quot;name\&quot;: \&quot;IPv6 Ping\&quot;, \&quot;select\&quot;: \&quot;ip6Address\&quot;, \&quot;syslog_facility\&quot;: \&quot;local0\&quot;}&quot; &gt;/dev/null 2&gt;&amp;1
+*/15 * * * * root /opt/traffic_ops/app/bin/checks/ToPingCheck.pl -c &quot;{\&quot;base_url\&quot;: \&quot;https://localhost\&quot;, \&quot;check_name\&quot;: \&quot;10G6\&quot;, \&quot;select\&quot;: \&quot;ip6Address\&quot;}&quot; &gt;&gt; /var/log/traffic_ops/extensionCheck.log 2&gt;&amp;1
 
-<span class="c1"># iLO ping</span>
-<span class="mi">18</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="n">root</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">app</span><span class="o">/</span><span class="nb">bin</span><span class="o">/</span><span class="n">checks</span><span class="o">/</span><span class="n">ToPingCheck</span><span class="o">.</span><span class="n">pl</span> <span class="o">-</span><span class="n">c</span> <span class="s2">&quot;{</span><span class="se">\&quot;</span><span class="s2">base_url</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">https://localhost</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">check_name</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">ILO</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">select</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">iloIpAddress</span><span class="se">\&quot;</span><span class="s2">}&quot;</span> <span class="o">&gt;&gt;</span> <span class="o">/</span><span class="n">var</span><span class="o">/</span><span class="n">log</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">extensionCheck</span><span class="o">.</span><span class="n">log</span> <span class="mi">2</span><span class="o">&gt;&amp;</span><span class="mi">1</span>
-<span class="mi">18</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="n">root</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">app</span><span class="o">/</span><span class="nb">bin</span><span class="o">/</span><span class="n">checks</span><span class="o">/</span><span class="n">ToPingCheck</span><span class="o">.</span><span class="n">pl</span> <span class="o">-</span><span class="n">c</span> <span class="s2">&quot;{</span><span class="se">\&quot;</span><span class="s2">base_url</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">https://localhost</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">check_name</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">ILO</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">name</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">ILO ping</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">select</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">iloIpAddress</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">syslog_facility</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">local0</span><span class="se">\&quot;</span><span class="s2">}&quot;</span> <span class="o">&gt;/</span><span class="n">dev</span><span class="o">/</span><span class="n">null</span> <span class="mi">2</span><span class="o">&gt;&amp;</span><span class="mi">1</span>
+# iLO ping
+18 * * * * root /opt/traffic_ops/app/bin/checks/ToPingCheck.pl -c &quot;{\&quot;base_url\&quot;: \&quot;https://localhost\&quot;, \&quot;check_name\&quot;: \&quot;ILO\&quot;, \&quot;select\&quot;: \&quot;iloIpAddress\&quot;}&quot; &gt;&gt; /var/log/traffic_ops/extensionCheck.log 2&gt;&amp;1
+18 * * * * root /opt/traffic_ops/app/bin/checks/ToPingCheck.pl -c &quot;{\&quot;base_url\&quot;: \&quot;https://localhost\&quot;, \&quot;check_name\&quot;: \&quot;ILO\&quot;, \&quot;name\&quot;: \&quot;ILO ping\&quot;, \&quot;select\&quot;: \&quot;iloIpAddress\&quot;, \&quot;syslog_facility\&quot;: \&quot;local0\&quot;}&quot; &gt;/dev/null 2&gt;&amp;1
 
-<span class="c1"># MTU ping</span>
-<span class="mi">45</span> <span class="mi">0</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="n">root</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">app</span><span class="o">/</span><span class="nb">bin</span><span class="o">/</span><span class="n">checks</span><span class="o">/</span><span class="n">ToPingCheck</span><span class="o">.</span><span class="n">pl</span> <span class="o">-</span><span class="n">c</span> <span class="s2">&quot;{</span><span class="se">\&quot;</span><span class="s2">base_url</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">https://localhost</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">check_name</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">MTU</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">select</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">ipAddress</span><span class="se">\&quot;</span><span class="s2">}&quot;</span> <span class="o">&gt;&gt;</span> <span class="o">/</span><span class="n">var</span><span class="o">/</span><span class="n">log</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">extensionCheck</span><span class="o">.</span><span class="n">log</span> <span class="mi">2</span><span class="o">&gt;&amp;</span><span class="mi">1</span>
-<span class="mi">45</span> <span class="mi">0</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="n">root</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">app</span><span class="o">/</span><span class="nb">bin</span><span class="o">/</span><span class="n">checks</span><span class="o">/</span><span class="n">ToPingCheck</span><span class="o">.</span><span class="n">pl</span> <span class="o">-</span><span class="n">c</span> <span class="s2">&quot;{</span><span class="se">\&quot;</span><span class="s2">base_url</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">https://localhost</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">check_name</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">MTU</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">select</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">ip6Address</span><span class="se">\&quot;</span><span class="s2">}&quot;</span> <span class="o">&gt;&gt;</span> <span class="o">/</span><span class="n">var</span><span class="o">/</span><span class="n">log</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">extensionCheck</span><span class="o">.</span><span class="n">log</span> <span class="mi">2</span><span class="o">&gt;&amp;</span><span class="mi">1</span>
-<span class="mi">45</span> <span class="mi">0</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="n">root</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">app</span><span class="o">/</span><span class="nb">bin</span><span class="o">/</span><span class="n">checks</span><span class="o">/</span><span class="n">ToPingCheck</span><span class="o">.</span><span class="n">pl</span> <span class="o">-</span><span class="n">c</span> <span class="s2">&quot;{</span><span class="se">\&quot;</span><span class="s2">base_url</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">https://localhost</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">check_name</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">MTU</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">name</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">Max Trans Unit</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">select</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">ipAddress</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">syslog_facility</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">local0</span><span class="se">\&quot;</span><span class="s2">}&quot;</span> <span class="o">&gt;</span> <span class="o">/</span><span class="n">dev</span><span class="o">/</span><span class="n">null</span> <span class="mi">2</span><span class="o">&gt;&amp;</span><span class="mi">1</span>
-<span class="mi">45</span> <span class="mi">0</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="n">root</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">app</span><span class="o">/</span><span class="nb">bin</span><span class="o">/</span><span class="n">checks</span><span class="o">/</span><span class="n">ToPingCheck</span><span class="o">.</span><span class="n">pl</span> <span class="o">-</span><span class="n">c</span> <span class="s2">&quot;{</span><span class="se">\&quot;</span><span class="s2">base_url</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">https://localhost</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">check_name</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">MTU</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">name</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">Max Trans Unit</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">select</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">ip6Address</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">syslog_facility</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">local0</span><span class="se">\&quot;</span><span class="s2">}&quot;</span> <span class="o">&gt;</span> <span class="o">/</span><span class="n">dev</span><span class="o">/</span><span class="n">null</span> <span class="mi">2</span><span class="o">&gt;&amp;</span><span class="mi">1</span>
+# MTU ping
+45 0 * * * root /opt/traffic_ops/app/bin/checks/ToPingCheck.pl -c &quot;{\&quot;base_url\&quot;: \&quot;https://localhost\&quot;, \&quot;check_name\&quot;: \&quot;MTU\&quot;, \&quot;select\&quot;: \&quot;ipAddress\&quot;}&quot; &gt;&gt; /var/log/traffic_ops/extensionCheck.log 2&gt;&amp;1
+45 0 * * * root /opt/traffic_ops/app/bin/checks/ToPingCheck.pl -c &quot;{\&quot;base_url\&quot;: \&quot;https://localhost\&quot;, \&quot;check_name\&quot;: \&quot;MTU\&quot;, \&quot;select\&quot;: \&quot;ip6Address\&quot;}&quot; &gt;&gt; /var/log/traffic_ops/extensionCheck.log 2&gt;&amp;1
+45 0 * * * root /opt/traffic_ops/app/bin/checks/ToPingCheck.pl -c &quot;{\&quot;base_url\&quot;: \&quot;https://localhost\&quot;, \&quot;check_name\&quot;: \&quot;MTU\&quot;, \&quot;name\&quot;: \&quot;Max Trans Unit\&quot;, \&quot;select\&quot;: \&quot;ipAddress\&quot;, \&quot;syslog_facility\&quot;: \&quot;local0\&quot;}&quot; &gt; /dev/null 2&gt;&amp;1
+45 0 * * * root /opt/traffic_ops/app/bin/checks/ToPingCheck.pl -c &quot;{\&quot;base_url\&quot;: \&quot;https://localhost\&quot;, \&quot;check_name\&quot;: \&quot;MTU\&quot;, \&quot;name\&quot;: \&quot;Max Trans Unit\&quot;, \&quot;select\&quot;: \&quot;ip6Address\&quot;, \&quot;syslog_facility\&quot;: \&quot;local0\&quot;}&quot; &gt; /dev/null 2&gt;&amp;1
 
-<span class="c1"># FQDN</span>
-<span class="mi">27</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="n">root</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">app</span><span class="o">/</span><span class="nb">bin</span><span class="o">/</span><span class="n">checks</span><span class="o">/</span><span class="n">ToFQDNCheck</span><span class="o">.</span><span class="n">pl</span> <span class="o">-</span><span class="n">c</span> <span class="s2">&quot;{</span><span class="se">\&quot;</span><span class="s2">base_url</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">https://localhost</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">check_name</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">FQDN</span><span class="se">\&quot;</span><span class="s2">&quot;</span>  <span class="o">&gt;&gt;</span> <span class="o">/</span><span class="n">var</span><span class="o">/</span><span class="n">log</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">extensionCheck</span><span class="o">.</span><span class="n">log</span> <span class="mi">2</span><span class="o">&gt;&amp;</span><span class="mi">1</span>
-<span class="mi">27</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="n">root</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">app</span><span class="o">/</span><span class="nb">bin</span><span class="o">/</span><span class="n">checks</span><span class="o">/</span><span class="n">ToFQDNCheck</span><span class="o">.</span><span class="n">pl</span> <span class="o">-</span><span class="n">c</span> <span class="s2">&quot;{</span><span class="se">\&quot;</span><span class="s2">base_url</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">https://localhost</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">check_name</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">FQDN</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">name</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">DNS Lookup</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">syslog_facility</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">local0</span><span class="se">\&quot;</span><span class="s2">}&quot;</span> <span class="o">&gt;</span> <span class="o">/</span><span class="n">dev</span><span class="o">/</span><span class="n">null</span> <span class="mi">2</span><span class="o">&gt;&amp;</span><span class="mi">1</span>
+# FQDN
+27 * * * * root /opt/traffic_ops/app/bin/checks/ToFQDNCheck.pl -c &quot;{\&quot;base_url\&quot;: \&quot;https://localhost\&quot;, \&quot;check_name\&quot;: \&quot;FQDN\&quot;&quot;  &gt;&gt; /var/log/traffic_ops/extensionCheck.log 2&gt;&amp;1
+27 * * * * root /opt/traffic_ops/app/bin/checks/ToFQDNCheck.pl -c &quot;{\&quot;base_url\&quot;: \&quot;https://localhost\&quot;, \&quot;check_name\&quot;: \&quot;FQDN\&quot;, \&quot;name\&quot;: \&quot;DNS Lookup\&quot;, \&quot;syslog_facility\&quot;: \&quot;local0\&quot;}&quot; &gt; /dev/null 2&gt;&amp;1
 
-<span class="c1"># DSCP</span>
-<span class="mi">36</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="n">root</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">app</span><span class="o">/</span><span class="nb">bin</span><span class="o">/</span><span class="n">checks</span><span class="o">/</span><span class="n">ToDSCPCheck</span><span class="o">.</span><span class="n">pl</span> <span class="o">-</span><span class="n">c</span> <span class="s2">&quot;{</span><span class="se">\&quot;</span><span class="s2">base_url</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">https://localhost</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">check_name</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">DSCP</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">cms_interface</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">eth0</span><span class="se">\&quot;</span><span class="s2">}&quot;</span> <span class="o">&gt;&gt;</span> <span class="o">/</span><span class="n">var</span><span class="o">/</span><span class="n">log</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">extensionCheck</span><span class="o">.</span><span class="n">log</span> <span class="mi">2</span><span class="o">&gt;&amp;</span><span class="mi">1</span>
-<span class="mi">36</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="n">root</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">app</span><span class="o">/</span><span class="nb">bin</span><span class="o">/</span><span class="n">checks</span><span class="o">/</span><span class="n">ToDSCPCheck</span><span class="o">.</span><span class="n">pl</span> <span class="o">-</span><span class="n">c</span> <span class="s2">&quot;{</span><span class="se">\&quot;</span><span class="s2">base_url</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">https://localhost</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">check_name</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">DSCP</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">name</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">Delivery Service</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">cms_interface</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">eth0</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">syslog_facility</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">local0</span><span class="se">\&quot;</span><span class="s2">}&quot;</span> <span class="o">&gt;</span> <span class="o">/</span><span class="n">dev</span><span class="o">/</span><span class="n">null</span> <span class="mi">2</span><span class="o">&gt;&amp;</span><span class="mi">1</span>
+# DSCP
+36 * * * * root /opt/traffic_ops/app/bin/checks/ToDSCPCheck.pl -c &quot;{\&quot;base_url\&quot;: \&quot;https://localhost\&quot;, \&quot;check_name\&quot;: \&quot;DSCP\&quot;, \&quot;cms_interface\&quot;: \&quot;eth0\&quot;}&quot; &gt;&gt; /var/log/traffic_ops/extensionCheck.log 2&gt;&amp;1
+36 * * * * root /opt/traffic_ops/app/bin/checks/ToDSCPCheck.pl -c &quot;{\&quot;base_url\&quot;: \&quot;https://localhost\&quot;, \&quot;check_name\&quot;: \&quot;DSCP\&quot;, \&quot;name\&quot;: \&quot;Delivery Service\&quot;, \&quot;cms_interface\&quot;: \&quot;eth0\&quot;, \&quot;syslog_facility\&quot;: \&quot;local0\&quot;}&quot; &gt; /dev/null 2&gt;&amp;1
 
-<span class="c1"># RTR</span>
-<span class="mi">10</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="n">root</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">app</span><span class="o">/</span><span class="nb">bin</span><span class="o">/</span><span class="n">checks</span><span class="o">/</span><span class="n">ToRTRCheck</span><span class="o">.</span><span class="n">pl</span> <span class="o">-</span><span class="n">c</span> <span class="s2">&quot;{</span><span class="se">\&quot;</span><span class="s2">base_url</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">https://localhost</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">check_name</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">RTR</span><span class="se">\&quot;</span><span class="s2">}&quot;</span>  <span class="o">&gt;&gt;</span> <span class="o">/</span><span class="n">var</span><span class="o">/</span><span class="n">log</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">extensionCheck</span><span class="o">.</span><span class="n">log</span> <span class="mi">2</span><span class="o">&gt;&amp;</span><span class="mi">1</span>
-<span class="mi">10</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="n">root</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">app</span><span class="o">/</span><span class="nb">bin</span><span class="o">/</span><span class="n">checks</span><span class="o">/</span><span class="n">ToRTRCheck</span><span class="o">.</span><span class="n">pl</span> <span class="o">-</span><span class="n">c</span> <span class="s2">&quot;{</span><span class="se">\&quot;</span><span class="s2">base_url</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">https://localhost</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">check_name</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">RTR</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">name</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">Content Router Check</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">syslog_facility</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">local0</span><span class="se">\&quot;</span><span class="s2">}&quot;</span> <span class="o">&gt;</span> <span class="o">/</span><span class="n">dev</span><span class="o">/</span><span class="n">null</span> <span class="mi">2</span><span class="o">&gt;&amp;</span><span class="mi">1</span>
+# RTR
+10 * * * * root /opt/traffic_ops/app/bin/checks/ToRTRCheck.pl -c &quot;{\&quot;base_url\&quot;: \&quot;https://localhost\&quot;, \&quot;check_name\&quot;: \&quot;RTR\&quot;}&quot;  &gt;&gt; /var/log/traffic_ops/extensionCheck.log 2&gt;&amp;1
+10 * * * * root /opt/traffic_ops/app/bin/checks/ToRTRCheck.pl -c &quot;{\&quot;base_url\&quot;: \&quot;https://localhost\&quot;, \&quot;check_name\&quot;: \&quot;RTR\&quot;, \&quot;name\&quot;: \&quot;Content Router Check\&quot;, \&quot;syslog_facility\&quot;: \&quot;local0\&quot;}&quot; &gt; /dev/null 2&gt;&amp;1
 
-<span class="c1"># CHR</span>
-<span class="o">*/</span><span class="mi">15</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="n">root</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">app</span><span class="o">/</span><span class="nb">bin</span><span class="o">/</span><span class="n">checks</span><span class="o">/</span><span class="n">ToCHRCheck</span><span class="o">.</span><span class="n">pl</span> <span class="o">-</span><span class="n">c</span> <span class="s2">&quot;{</span><span class="se">\&quot;</span><span class="s2">base_url</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">https://localhost</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">check_name</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">CHR</span><span class="se">\&quot;</span><span class="s2">}&quot;</span>  <span class="o">&gt;&gt;</span> <span class="o">/</span><span class="n">var</span><span class="o">/</span><span class="n">log</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">extensionCheck</span><span class="o">.</span><span class="n">log</span> <span class="mi">2</span><span class="o">&gt;&amp;</span><span class="mi">1</span>
+# CHR
+*/15 * * * * root /opt/traffic_ops/app/bin/checks/ToCHRCheck.pl -c &quot;{\&quot;base_url\&quot;: \&quot;https://localhost\&quot;, \&quot;check_name\&quot;: \&quot;CHR\&quot;}&quot;  &gt;&gt; /var/log/traffic_ops/extensionCheck.log 2&gt;&amp;1
 
-<span class="c1"># CDU</span>
-<span class="mi">20</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="n">root</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">app</span><span class="o">/</span><span class="nb">bin</span><span class="o">/</span><span class="n">checks</span><span class="o">/</span><span class="n">ToCDUCheck</span><span class="o">.</span><span class="n">pl</span> <span class="o">-</span><span class="n">c</span> <span class="s2">&quot;{</span><span class="se">\&quot;</span><span class="s2">base_url</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">https://localhost</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">check_name</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">CDU</span><span class="se">\&quot;</span><span class="s2">}&quot;</span>  <span class="o">&gt;&gt;</span> <span class="o">/</span><span class="n">var</span><span class="o">/</span><span class="n">log</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">extensionCheck</span><span class="o">.</span><span class="n">log</span> <span class="mi">2</span><span class="o">&gt;&amp;</span><span class="mi">1</span>
+# CDU
+20 * * * * root /opt/traffic_ops/app/bin/checks/ToCDUCheck.pl -c &quot;{\&quot;base_url\&quot;: \&quot;https://localhost\&quot;, \&quot;check_name\&quot;: \&quot;CDU\&quot;}&quot;  &gt;&gt; /var/log/traffic_ops/extensionCheck.log 2&gt;&amp;1
 
-<span class="c1"># ORT</span>
-<span class="mi">40</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="n">ssh_key_edge_user</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">app</span><span class="o">/</span><span class="nb">bin</span><span class="o">/</span><span class="n">checks</span><span class="o">/</span><span class="n">ToORTCheck</span><span class="o">.</span><span class="n">pl</span> <span class="o">-</span><span class="n">c</span> <span class="s2">&quot;{</span><span class="se">\&quot;</span><span class="s2">base_url</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">https://localhost</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">check_name</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">ORT</span><span class="se">\&quot;</span><span class="s2">}&quot;</span>  <span class="o">&gt;&gt;</span> <span class="o">/</span><span class="n">var</span><span class="o">/</span><span class="n">log</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">extensionCheck</span><span class="o">.</span><span class="n">log</span> <span class="mi">2</span><span class="o">&gt;&amp;</span><span class="mi">1</span>
-<span class="mi">40</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="n">ssh_key_edge_user</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">app</span><span class="o">/</span><span class="nb">bin</span><span class="o">/</span><span class="n">checks</span><span class="o">/</span><span class="n">ToORTCheck</span><span class="o">.</span><span class="n">pl</span> <span class="o">-</span><span class="n">c</span> <span class="s2">&quot;{</span><span class="se">\&quot;</span><span class="s2">base_url</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">https://localhost</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">check_name</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">ORT</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">name</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">Operational Readiness Test</span><span class="se">\&quot;</span><span class="s2">, </span><span class="se">\&quot;</span><span class="s2">syslog_facility</span><span class="se">\&quot;</span><span class="s2">: </span><span class="se">\&quot;</span><span class="s2">local0</span><span class="se">\&quot;</span><span class="s2">}&quot;</span> <span class="o">&gt;</span> <span class="o">/</span><span class="n">dev</span><span class="o">/</span><span class="n">null</span> <span class="mi">2</span><span class="o">&gt;&amp;</span><span class="mi">1</span>
+# ORT
+40 * * * * ssh_key_edge_user /opt/traffic_ops/app/bin/checks/ToORTCheck.pl -c &quot;{\&quot;base_url\&quot;: \&quot;https://localhost\&quot;, \&quot;check_name\&quot;: \&quot;ORT\&quot;}&quot;  &gt;&gt; /var/log/traffic_ops/extensionCheck.log 2&gt;&amp;1
+40 * * * * ssh_key_edge_user /opt/traffic_ops/app/bin/checks/ToORTCheck.pl -c &quot;{\&quot;base_url\&quot;: \&quot;https://localhost\&quot;, \&quot;check_name\&quot;: \&quot;ORT\&quot;, \&quot;name\&quot;: \&quot;Operational Readiness Test\&quot;, \&quot;syslog_facility\&quot;: \&quot;local0\&quot;}&quot; &gt; /dev/null 2&gt;&amp;1
 </pre></div>
 </div>
 </div>
@@ -287,7 +287,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../',
-            VERSION:'1.7',
+            VERSION:'master',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/latest/admin/traffic_ops_install.html b/docs/latest/admin/traffic_ops_install.html
index a3ed616..06d112e 100644
--- a/docs/latest/admin/traffic_ops_install.html
+++ b/docs/latest/admin/traffic_ops_install.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Installing Traffic Ops &mdash; Traffic Control 1.7 documentation </title>
+  <title>Installing Traffic Ops &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’s Guide" href="index.html"/>
         <link rel="next" title="Configuring Traffic Ops" href="traffic_ops_config.html"/>
         <link rel="prev" title="Administrator’s Guide" href="index.html"/> 
@@ -58,7 +58,7 @@
 
         
           
-          <img src="../_static/tc_logo.png" class="logo" />
+          <img src="../_static/tc_logo_c_only.png" class="logo" />
         
         </a>
 
@@ -102,7 +102,7 @@
 </ul>
 <ul class="current">
 <li class="toctree-l1 current"><a class="reference internal" href="index.html">Administrator&#8217;s Guide</a><ul class="current">
-<li class="toctree-l2 current"><a class="current reference internal" href="#">Installing Traffic Ops</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">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>
 <li class="toctree-l2"><a class="reference internal" href="traffic_ops_extensions.html">Managing Traffic Ops Extensions</a></li>
@@ -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>
       
@@ -246,7 +246,7 @@
 <li>Install Traffic Ops:</li>
 </ol>
 <blockquote>
-<div><p>Download the traffic_ops rpm package from <a class="reference external" href="http://traffic-control-cdn.net/downloads/index.html">http://traffic-control-cdn.net/downloads/index.html</a></p>
+<div><p>Download the traffic_ops rpm package from <a class="reference external" href="http://trafficcontrol.apache.org/downloads/index.html">http://trafficcontrol.apache.org/downloads/index.html</a></p>
 <p><code class="docutils literal"><span class="pre">sudo</span> <span class="pre">rpm</span> <span class="pre">-ivh</span> <span class="pre">traffic_ops-1.*.*-****.x86_64.rpm</span></code></p>
 </div></blockquote>
 <ol class="arabic simple" start="2">
@@ -254,16 +254,16 @@
 </ol>
 <blockquote>
 <div><p>Example output:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">trafficops</span><span class="o">-</span><span class="n">vm</span> <span class="c1"># /opt/traffic_ops/install/bin/postinstall</span>
+<div class="highlight-python"><div class="highlight"><pre>trafficops-vm # /opt/traffic_ops/install/bin/postinstall
 
-<span class="n">This</span> <span class="n">script</span> <span class="n">will</span> <span class="n">build</span> <span class="ow">and</span> <span class="n">package</span> <span class="n">the</span> <span class="n">required</span> <span class="n">Traffic</span> <span class="n">Ops</span> <span class="n">perl</span> <span class="n">modules</span><span class="o">.</span>
-<span class="n">In</span> <span class="n">order</span> <span class="n">to</span> <span class="n">complete</span> <span class="n">this</span> <span class="n">operation</span><span class="p">,</span> <span class="n">Development</span> <span class="n">tools</span> <span class="n">such</span> <span class="k">as</span> <span class="n">the</span> <span class="n">gcc</span>
-<span class="n">compiler</span> <span class="n">must</span> <span class="n">be</span> <span class="n">installed</span> <span class="n">on</span> <span class="n">this</span> <span class="n">machine</span><span class="o">.</span>
+This script will build and package the required Traffic Ops perl modules.
+In order to complete this operation, Development tools such as the gcc
+compiler must be installed on this machine.
 
-<span class="n">Hit</span> <span class="n">ENTER</span> <span class="n">to</span> <span class="k">continue</span><span class="p">:</span>
+Hit ENTER to continue:
 </pre></div>
 </div>
-<p>The first thing the post install will do is install additional packages needed from the yum repo.</p>
+<p>The first thing postinstall will do is install additional packages needed from the yum repo.</p>
 <p>Ater that, it will automatically proceed to installing the required Perl packages from CPAN.</p>
 <div class="admonition note">
 <p class="first admonition-title">Note</p>
@@ -271,7 +271,7 @@
 </div>
 <p>If there are any prompts in this phase, please just answer with the defaults (some CPAN installs can prompt for install questions).</p>
 <p>When this phase is complete, you will see:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span>...
+<div class="highlight-python"><div class="highlight"><pre>...
 Successfully installed Test-Differences-0.63
 Successfully installed DBIx-Class-Schema-Loader-0.07042
 Successfully installed Time-HiRes-1.9726 (upgraded from 1.9719)
@@ -300,7 +300,7 @@
 <p class="last">CentOS files note.</p>
 </div>
 <p>Example output:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span>Database type [mysql]:
+<div class="highlight-python"><div class="highlight"><pre>Database type [mysql]:
 Database name [traffic_ops_db]:
 Database server hostname IP or FQDN [localhost]:
 Database port number [3306]:
@@ -426,7 +426,7 @@
 <td>The DNS domain that will be delegated to this Traffic Control CDN</td>
 </tr>
 <tr class="row-odd"><td>name of your CentOS 6.5 ISO kickstart tar file</td>
-<td>See <a class="reference internal" href="traffic_ops_config.html#creating-centos-kickstart"><span class="std std-ref">Creating the CentOS Kickstart File</span></a></td>
+<td>See <a class="reference internal" href="traffic_ops_config.html#creating-centos-kickstart"><em>Creating the CentOS Kickstart File</em></a></td>
 </tr>
 <tr class="row-even"><td>Administration username for Traffic Ops</td>
 <td>The Administration (highest privilege) Traffic Ops user to create;
@@ -441,120 +441,120 @@
 <p>The postinstall script will now seed the database with some inital configuration settings for the CDN and the servers in the CDN.</p>
 <p>The next phase is the download of the geo location database and configuration of information needed for SSL certificates.</p>
 <p>Example output:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">Downloading</span> <span class="n">MaxMind</span> <span class="n">data</span><span class="o">.</span>
-<span class="o">--</span><span class="mi">2015</span><span class="o">-</span><span class="mi">04</span><span class="o">-</span><span class="mi">14</span> <span class="mi">02</span><span class="p">:</span><span class="mi">14</span><span class="p">:</span><span class="mi">32</span><span class="o">--</span>  <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">geolite</span><span class="o">.</span><span class="n">maxmind</span><span class="o">.</span><span class="n">com</span><span class="o">/</span><span class="n">download</span><span class="o">/</span><span class="n">geoip</span><span class="o">/</span><span class="n">database</span><span class="o">/</span><span class="n">GeoLite2</span><span class="o">-</span><span class="n">City</span><span class="o">.</span><span class="n">mmdb</span><span class="o">.</span><span class="n">gz</span>
-<span class="n">Resolving</span> <span class="n">geolite</span><span class="o">.</span><span class="n">maxmind</span><span class="o">.</span><span class="n">com</span><span class="o">...</span> <span class="mf">141.101</span><span class="o">.</span><span class="mf">115.190</span><span class="p">,</span> <span class="mf">141.101</span><span class="o">.</span><span class="mf">114.190</span><span class="p">,</span> <span class="mi">2400</span><span class="p">:</span><span class="n">cb00</span><span class="p">:</span><span class="mi">2048</span><span class="p">:</span><span class="mi">1</span><span class="p">::</span><span class="mi">8</span><span class="n">d65</span><span class="p">:</span><span class="mi">73</span><span class="n">be</span><span class="p">,</span> <span class="o">...</span>
-<span class="n">Connecting</span> <span class="n">to</span> <span class="n">geolite</span><span class="o">.</span><span class="n">maxmind</span><span class="o">.</span><span class="n">com</span><span class="o">|</span><span class="mf">141.101</span><span class="o">.</span><span class="mf">115.190</span><span class="o">|</span><span class="p">:</span><span class="mf">80.</span><span class="o">..</span> <span class="n">connected</span><span class="o">.</span>
-<span class="n">HTTP</span> <span class="n">request</span> <span class="n">sent</span><span class="p">,</span> <span class="n">awaiting</span> <span class="n">response</span><span class="o">...</span> <span class="mi">200</span> <span class="n">OK</span>
-<span class="n">Length</span><span class="p">:</span> <span class="mi">17633433</span> <span class="p">(</span><span class="mi">17</span><span class="n">M</span><span class="p">)</span> <span class="p">[</span><span class="n">application</span><span class="o">/</span><span class="n">octet</span><span class="o">-</span><span class="n">stream</span><span class="p">]</span>
-<span class="n">Saving</span> <span class="n">to</span><span class="p">:</span> <span class="s2">&quot;GeoLite2-City.mmdb.gz&quot;</span>
+<div class="highlight-python"><div class="highlight"><pre>Downloading MaxMind data.
+--2015-04-14 02:14:32--  http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz
+Resolving geolite.maxmind.com... 141.101.115.190, 141.101.114.190, 2400:cb00:2048:1::8d65:73be, ...
+Connecting to geolite.maxmind.com|141.101.115.190|:80... connected.
+HTTP request sent, awaiting response... 200 OK
+Length: 17633433 (17M) [application/octet-stream]
+Saving to: &quot;GeoLite2-City.mmdb.gz&quot;
 
-<span class="mi">100</span><span class="o">%</span><span class="p">[</span><span class="o">==================================================================================================================================================================&gt;</span><span class="p">]</span> <span class="mi">17</span><span class="p">,</span><span class="mi">633</span><span class="p">,</span><span class="mi">433</span>  <span class="mf">7.03</span><span class="n">M</span><span class="o">/</span><span class="n">s</span>   <span class="ow">in</span> <span class="mf">2.4</span><span class="n">s</span>
+100%[==================================================================================================================================================================&gt;] 17,633,433  7.03M/s   in 2.4s
 
-<span class="mi">2015</span><span class="o">-</span><span class="mi">04</span><span class="o">-</span><span class="mi">14</span> <span class="mi">02</span><span class="p">:</span><span class="mi">14</span><span class="p">:</span><span class="mi">35</span> <span class="p">(</span><span class="mf">7.03</span> <span class="n">MB</span><span class="o">/</span><span class="n">s</span><span class="p">)</span> <span class="o">-</span> <span class="s2">&quot;GeoLite2-City.mmdb.gz&quot;</span> <span class="n">saved</span> <span class="p">[</span><span class="mi">17633433</span><span class="o">/</span><span class="mi">17633433</span><span class="p">]</span>
+2015-04-14 02:14:35 (7.03 MB/s) - &quot;GeoLite2-City.mmdb.gz&quot; saved [17633433/17633433]
 
-<span class="n">Copying</span> <span class="n">coverage</span> <span class="n">zone</span> <span class="n">file</span> <span class="n">to</span> <span class="n">public</span> <span class="nb">dir</span><span class="o">.</span>
+Copying coverage zone file to public dir.
 
-<span class="n">Installing</span> <span class="n">SSL</span> <span class="n">Certificates</span><span class="o">.</span>
+Installing SSL Certificates.
 
-  <span class="n">We</span><span class="s1">&#39;re now running a script to generate a self signed X509 SSL certificate.</span>
-  <span class="n">When</span> <span class="n">prompted</span> <span class="n">to</span> <span class="n">enter</span> <span class="n">a</span> <span class="k">pass</span> <span class="n">phrase</span><span class="p">,</span> <span class="n">just</span> <span class="n">enter</span> <span class="s1">&#39;pass&#39;</span> <span class="n">each</span> <span class="n">time</span><span class="o">.</span>  <span class="n">The</span>
-  <span class="k">pass</span> <span class="n">phrase</span> <span class="n">will</span> <span class="n">be</span> <span class="n">stripped</span> <span class="kn">from</span> <span class="nn">the</span> <span class="n">private</span> <span class="n">key</span> <span class="n">before</span> <span class="n">installation</span><span class="o">.</span>
+  We&#39;re now running a script to generate a self signed X509 SSL certificate.
+  When prompted to enter a pass phrase, just enter &#39;pass&#39; each time.  The
+  pass phrase will be stripped from the private key before installation.
 
-  <span class="n">When</span> <span class="n">prompted</span> <span class="n">to</span> <span class="n">enter</span> <span class="n">a</span> <span class="s1">&#39;challenge password&#39;</span><span class="p">,</span> <span class="n">just</span> <span class="n">hit</span> <span class="n">the</span> <span class="n">ENTER</span> <span class="n">key</span><span class="o">.</span>
+  When prompted to enter a &#39;challenge password&#39;, just hit the ENTER key.
 
-  <span class="n">The</span> <span class="n">remaining</span> <span class="n">enformation</span> <span class="n">Country</span><span class="p">,</span> <span class="n">State</span><span class="p">,</span> <span class="n">Locality</span><span class="p">,</span> <span class="n">etc</span><span class="o">...</span> <span class="n">are</span> <span class="n">required</span> <span class="n">to</span>
-  <span class="n">generate</span> <span class="n">a</span> <span class="n">properly</span> <span class="n">formatted</span> <span class="n">SSL</span> <span class="n">certificate</span><span class="o">.</span>
+  The remaining enformation Country, State, Locality, etc... are required to
+  generate a properly formatted SSL certificate.
 
-<span class="n">Hit</span> <span class="n">Enter</span> <span class="n">when</span> <span class="n">you</span> <span class="n">are</span> <span class="n">ready</span> <span class="n">to</span> <span class="k">continue</span><span class="p">:</span>
-<span class="n">Postinstall</span> <span class="n">SSL</span> <span class="n">Certificate</span> <span class="n">Creation</span><span class="o">.</span>
+Hit Enter when you are ready to continue:
+Postinstall SSL Certificate Creation.
 
-<span class="n">Generating</span> <span class="n">an</span> <span class="n">RSA</span> <span class="n">Private</span> <span class="n">Server</span> <span class="n">Key</span><span class="o">.</span>
+Generating an RSA Private Server Key.
 
-<span class="n">Generating</span> <span class="n">RSA</span> <span class="n">private</span> <span class="n">key</span><span class="p">,</span> <span class="mi">1024</span> <span class="n">bit</span> <span class="n">long</span> <span class="n">modulus</span>
-<span class="o">..........................++++++</span>
-<span class="o">.....................++++++</span>
-<span class="n">e</span> <span class="ow">is</span> <span class="mi">65537</span> <span class="p">(</span><span class="mh">0x10001</span><span class="p">)</span>
-<span class="n">Enter</span> <span class="k">pass</span> <span class="n">phrase</span> <span class="k">for</span> <span class="n">server</span><span class="o">.</span><span class="n">key</span><span class="p">:</span>
-<span class="n">Verifying</span> <span class="o">-</span> <span class="n">Enter</span> <span class="k">pass</span> <span class="n">phrase</span> <span class="k">for</span> <span class="n">server</span><span class="o">.</span><span class="n">key</span><span class="p">:</span>
+Generating RSA private key, 1024 bit long modulus
+..........................++++++
+.....................++++++
+e is 65537 (0x10001)
+Enter pass phrase for server.key:
+Verifying - Enter pass phrase for server.key:
 
-<span class="n">The</span> <span class="n">server</span> <span class="n">key</span> <span class="n">has</span> <span class="n">been</span> <span class="n">generated</span><span class="o">.</span>
+The server key has been generated.
 
-<span class="n">Creating</span> <span class="n">a</span> <span class="n">Certificate</span> <span class="n">Signing</span> <span class="n">Request</span> <span class="p">(</span><span class="n">CSR</span><span class="p">)</span>
+Creating a Certificate Signing Request (CSR)
 
-<span class="n">Enter</span> <span class="k">pass</span> <span class="n">phrase</span> <span class="k">for</span> <span class="n">server</span><span class="o">.</span><span class="n">key</span><span class="p">:</span>
-<span class="n">You</span> <span class="n">are</span> <span class="n">about</span> <span class="n">to</span> <span class="n">be</span> <span class="n">asked</span> <span class="n">to</span> <span class="n">enter</span> <span class="n">information</span> <span class="n">that</span> <span class="n">will</span> <span class="n">be</span> <span class="n">incorporated</span>
-<span class="n">into</span> <span class="n">your</span> <span class="n">certificate</span> <span class="n">request</span><span class="o">.</span>
-<span class="n">What</span> <span class="n">you</span> <span class="n">are</span> <span class="n">about</span> <span class="n">to</span> <span class="n">enter</span> <span class="ow">is</span> <span class="n">what</span> <span class="ow">is</span> <span class="n">called</span> <span class="n">a</span> <span class="n">Distinguished</span> <span class="n">Name</span> <span class="ow">or</span> <span class="n">a</span> <span class="n">DN</span><span class="o">.</span>
-<span class="n">There</span> <span class="n">are</span> <span class="n">quite</span> <span class="n">a</span> <span class="n">few</span> <span class="n">fields</span> <span class="n">but</span> <span class="n">you</span> <span class="n">can</span> <span class="n">leave</span> <span class="n">some</span> <span class="n">blank</span>
-<span class="n">For</span> <span class="n">some</span> <span class="n">fields</span> <span class="n">there</span> <span class="n">will</span> <span class="n">be</span> <span class="n">a</span> <span class="n">default</span> <span class="n">value</span><span class="p">,</span>
-<span class="n">If</span> <span class="n">you</span> <span class="n">enter</span> <span class="s1">&#39;.&#39;</span><span class="p">,</span> <span class="n">the</span> <span class="n">field</span> <span class="n">will</span> <span class="n">be</span> <span class="n">left</span> <span class="n">blank</span><span class="o">.</span>
-<span class="o">-----</span>
-<span class="n">Country</span> <span class="n">Name</span> <span class="p">(</span><span class="mi">2</span> <span class="n">letter</span> <span class="n">code</span><span class="p">)</span> <span class="p">[</span><span class="n">XX</span><span class="p">]:</span><span class="n">US</span>
-<span class="n">State</span> <span class="ow">or</span> <span class="n">Province</span> <span class="n">Name</span> <span class="p">(</span><span class="n">full</span> <span class="n">name</span><span class="p">)</span> <span class="p">[]:</span><span class="n">CO</span>
-<span class="n">Locality</span> <span class="n">Name</span> <span class="p">(</span><span class="n">eg</span><span class="p">,</span> <span class="n">city</span><span class="p">)</span> <span class="p">[</span><span class="n">Default</span> <span class="n">City</span><span class="p">]:</span><span class="n">Denver</span>
-<span class="n">Organization</span> <span class="n">Name</span> <span class="p">(</span><span class="n">eg</span><span class="p">,</span> <span class="n">company</span><span class="p">)</span> <span class="p">[</span><span class="n">Default</span> <span class="n">Company</span> <span class="n">Ltd</span><span class="p">]:</span>
-<span class="n">Organizational</span> <span class="n">Unit</span> <span class="n">Name</span> <span class="p">(</span><span class="n">eg</span><span class="p">,</span> <span class="n">section</span><span class="p">)</span> <span class="p">[]:</span>
-<span class="n">Common</span> <span class="n">Name</span> <span class="p">(</span><span class="n">eg</span><span class="p">,</span> <span class="n">your</span> <span class="n">name</span> <span class="ow">or</span> <span class="n">your</span> <span class="n">server</span><span class="s1">&#39;s hostname) []:</span>
-<span class="n">Email</span> <span class="n">Address</span> <span class="p">[]:</span>
+Enter pass phrase for server.key:
+You are about to be asked to enter information that will be incorporated
+into your certificate request.
+What you are about to enter is what is called a Distinguished Name or a DN.
+There are quite a few fields but you can leave some blank
+For some fields there will be a default value,
+If you enter &#39;.&#39;, the field will be left blank.
+-----
+Country Name (2 letter code) [XX]:US
+State or Province Name (full name) []:CO
+Locality Name (eg, city) [Default City]:Denver
+Organization Name (eg, company) [Default Company Ltd]:
+Organizational Unit Name (eg, section) []:
+Common Name (eg, your name or your server&#39;s hostname) []:
+Email Address []:
 
-<span class="n">Please</span> <span class="n">enter</span> <span class="n">the</span> <span class="n">following</span> <span class="s1">&#39;extra&#39;</span> <span class="n">attributes</span>
-<span class="n">to</span> <span class="n">be</span> <span class="n">sent</span> <span class="k">with</span> <span class="n">your</span> <span class="n">certificate</span> <span class="n">request</span>
-<span class="n">A</span> <span class="n">challenge</span> <span class="n">password</span> <span class="p">[]:</span><span class="k">pass</span>
-<span class="n">An</span> <span class="n">optional</span> <span class="n">company</span> <span class="n">name</span> <span class="p">[]:</span>
+Please enter the following &#39;extra&#39; attributes
+to be sent with your certificate request
+A challenge password []:pass
+An optional company name []:
 
-<span class="n">The</span> <span class="n">Certificate</span> <span class="n">Signing</span> <span class="n">Request</span> <span class="n">has</span> <span class="n">been</span> <span class="n">generated</span><span class="o">.</span>
-<span class="n">Removing</span> <span class="n">the</span> <span class="k">pass</span> <span class="n">phrase</span> <span class="kn">from</span> <span class="nn">the</span> <span class="n">server</span> <span class="n">key</span><span class="o">.</span>
-<span class="n">Enter</span> <span class="k">pass</span> <span class="n">phrase</span> <span class="k">for</span> <span class="n">server</span><span class="o">.</span><span class="n">key</span><span class="o">.</span><span class="n">orig</span><span class="p">:</span>
-<span class="n">writing</span> <span class="n">RSA</span> <span class="n">key</span>
+The Certificate Signing Request has been generated.
+Removing the pass phrase from the server key.
+Enter pass phrase for server.key.orig:
+writing RSA key
 
-<span class="n">The</span> <span class="k">pass</span> <span class="n">phrase</span> <span class="n">has</span> <span class="n">been</span> <span class="n">removed</span> <span class="kn">from</span> <span class="nn">the</span> <span class="n">server</span> <span class="n">key</span><span class="o">.</span>
+The pass phrase has been removed from the server key.
 
-<span class="n">Generating</span> <span class="n">a</span> <span class="n">Self</span><span class="o">-</span><span class="n">signed</span> <span class="n">certificate</span><span class="o">.</span>
-<span class="n">Signature</span> <span class="n">ok</span>
-<span class="n">subject</span><span class="o">=/</span><span class="n">C</span><span class="o">=</span><span class="n">US</span><span class="o">/</span><span class="n">ST</span><span class="o">=</span><span class="n">CO</span><span class="o">/</span><span class="n">L</span><span class="o">=</span><span class="n">Denver</span><span class="o">/</span><span class="n">O</span><span class="o">=</span><span class="n">Default</span> <span class="n">Company</span> <span class="n">Ltd</span>
-<span class="n">Getting</span> <span class="n">Private</span> <span class="n">key</span>
+Generating a Self-signed certificate.
+Signature ok
+subject=/C=US/ST=CO/L=Denver/O=Default Company Ltd
+Getting Private key
 
-<span class="n">A</span> <span class="n">server</span> <span class="n">key</span> <span class="ow">and</span> <span class="bp">self</span> <span class="n">signed</span> <span class="n">certificate</span> <span class="n">has</span> <span class="n">been</span> <span class="n">generated</span><span class="o">.</span>
+A server key and self signed certificate has been generated.
 
-<span class="n">Installing</span> <span class="n">the</span> <span class="n">server</span> <span class="n">key</span> <span class="ow">and</span> <span class="n">server</span> <span class="n">certificate</span><span class="o">.</span>
+Installing the server key and server certificate.
 
-<span class="n">The</span> <span class="n">private</span> <span class="n">key</span> <span class="n">has</span> <span class="n">been</span> <span class="n">installed</span><span class="o">.</span>
+The private key has been installed.
 
-<span class="n">Installing</span> <span class="n">the</span> <span class="bp">self</span> <span class="n">signed</span> <span class="n">certificate</span><span class="o">.</span>
+Installing the self signed certificate.
 
-<span class="n">Saving</span> <span class="n">the</span> <span class="bp">self</span> <span class="n">signed</span> <span class="n">csr</span><span class="o">.</span>
+Saving the self signed csr.
 
-  <span class="n">The</span> <span class="bp">self</span> <span class="n">signed</span> <span class="n">certificate</span> <span class="n">has</span> <span class="n">now</span> <span class="n">been</span> <span class="n">installed</span><span class="o">.</span>
+  The self signed certificate has now been installed.
 
-  <span class="n">You</span> <span class="n">may</span> <span class="n">obtain</span> <span class="n">a</span> <span class="n">certificate</span> <span class="n">signed</span> <span class="n">by</span> <span class="n">a</span> <span class="n">Certificate</span> <span class="n">Authority</span> <span class="n">using</span> <span class="n">the</span>
-  <span class="n">server</span><span class="o">.</span><span class="n">csr</span> <span class="n">file</span> <span class="n">saved</span> <span class="ow">in</span> <span class="n">the</span> <span class="n">current</span> <span class="n">directory</span><span class="o">.</span>  <span class="n">Once</span> <span class="n">you</span> <span class="n">have</span> <span class="n">obtained</span>
-  <span class="n">a</span> <span class="n">signed</span> <span class="n">certificate</span><span class="p">,</span> <span class="n">copy</span> <span class="n">it</span> <span class="n">to</span> <span class="o">/</span><span class="n">etc</span><span class="o">/</span><span class="n">pki</span><span class="o">/</span><span class="n">tls</span><span class="o">/</span><span class="n">certs</span><span class="o">/</span><span class="n">localhost</span><span class="o">.</span><span class="n">crt</span> <span class="ow">and</span>
-  <span class="n">restart</span> <span class="n">Traffic</span> <span class="n">Ops</span><span class="o">.</span>
+  You may obtain a certificate signed by a Certificate Authority using the
+  server.csr file saved in the current directory.  Once you have obtained
+  a signed certificate, copy it to /etc/pki/tls/certs/localhost.crt and
+  restart Traffic Ops.
 
 
 
-<span class="n">SSL</span> <span class="n">Certificates</span> <span class="n">have</span> <span class="n">been</span> <span class="n">installed</span><span class="o">.</span>
+SSL Certificates have been installed.
 
-<span class="n">Starting</span> <span class="n">Traffic</span> <span class="n">Ops</span><span class="o">.</span>
+Starting Traffic Ops.
 
-<span class="n">Starting</span> <span class="n">Traffic</span> <span class="n">Ops</span>
+Starting Traffic Ops
 
-<span class="n">Subroutine</span> <span class="n">TrafficOps</span><span class="p">::</span><span class="n">has</span> <span class="n">redefined</span> <span class="n">at</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">app</span><span class="o">/</span><span class="n">local</span><span class="o">/</span><span class="n">lib</span><span class="o">/</span><span class="n">perl5</span><span class="o">/</span><span class="n">Mojo</span><span class="o">/</span><span class="n">Base</span><span class="o">.</span><span class="n">pm</span> <span class="n">line</span> <span class="mf">38.</span>
-<span class="n">Subroutine</span> <span class="n">TrafficOps</span><span class="p">::</span><span class="n">has</span> <span class="n">redefined</span> <span class="n">at</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">app</span><span class="o">/</span><span class="n">local</span><span class="o">/</span><span class="n">lib</span><span class="o">/</span><span class="n">perl5</span><span class="o">/</span><span class="n">Mojo</span><span class="o">/</span><span class="n">Base</span><span class="o">.</span><span class="n">pm</span> <span class="n">line</span> <span class="mf">38.</span>
-<span class="n">Loading</span> <span class="n">config</span> <span class="kn">from</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">app</span><span class="o">/</span><span class="n">conf</span><span class="o">/</span><span class="n">cdn</span><span class="o">.</span><span class="n">conf</span>
-<span class="n">Reading</span> <span class="n">log4perl</span> <span class="n">config</span> <span class="kn">from</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">app</span><span class="o">/</span><span class="n">conf</span><span class="o">/</span><span class="n">production</span><span class="o">/</span><span class="n">log4perl</span><span class="o">.</span><span class="n">conf</span>
-<span class="n">Starting</span> <span class="n">hot</span> <span class="n">deployment</span> <span class="k">for</span> <span class="n">Hypnotoad</span> <span class="n">server</span> <span class="mf">32192.</span>
+Subroutine TrafficOps::has redefined at /opt/traffic_ops/app/local/lib/perl5/Mojo/Base.pm line 38.
+Subroutine TrafficOps::has redefined at /opt/traffic_ops/app/local/lib/perl5/Mojo/Base.pm line 38.
+Loading config from /opt/traffic_ops/app/conf/cdn.conf
+Reading log4perl config from /opt/traffic_ops/app/conf/production/log4perl.conf
+Starting hot deployment for Hypnotoad server 32192.
 
-<span class="n">Waiting</span> <span class="k">for</span> <span class="n">Traffic</span> <span class="n">Ops</span> <span class="n">to</span> <span class="n">start</span><span class="o">.</span>
+Waiting for Traffic Ops to start.
 
 
-<span class="n">Shutdown</span> <span class="n">Traffic</span> <span class="n">Ops</span> <span class="p">[</span><span class="n">y</span><span class="o">/</span><span class="n">n</span><span class="p">]</span> <span class="p">[</span><span class="n">n</span><span class="p">]:</span>  <span class="n">n</span>
+Shutdown Traffic Ops [y/n] [n]:  n
 
-<span class="n">To</span> <span class="n">start</span> <span class="n">Traffic</span> <span class="n">Ops</span><span class="p">:</span>  <span class="n">service</span> <span class="n">traffic_ops</span> <span class="n">start</span>
-<span class="n">To</span> <span class="n">stop</span> <span class="n">Traffic</span> <span class="n">Ops</span><span class="p">:</span>   <span class="n">service</span> <span class="n">traffic_ops</span> <span class="n">stop</span>
+To start Traffic Ops:  service traffic_ops start
+To stop Traffic Ops:   service traffic_ops stop
 
-<span class="n">traffic_ops</span> <span class="c1">#</span>
+traffic_ops #
 </pre></div>
 </div>
 </div></blockquote>
@@ -565,7 +565,7 @@
 <ol class="arabic simple">
 <li>Enter the following command:<code class="docutils literal"><span class="pre">service</span> <span class="pre">traffic_ops</span> <span class="pre">stop</span></code></li>
 <li>Enter the following command:<code class="docutils literal"><span class="pre">yum</span> <span class="pre">upgrade</span> <span class="pre">traffic_ops</span></code></li>
-<li>See <a class="reference internal" href="#rl-ps"><span class="std std-ref">Installing Traffic Ops</span></a> to run the post install.</li>
+<li>See <a class="reference internal" href="#rl-ps"><em>Installing Traffic Ops</em></a> to run postinstall.</li>
 <li>Enter the following command:<code class="docutils literal"><span class="pre">service</span> <span class="pre">traffic_ops</span> <span class="pre">start</span></code></li>
 </ol>
 </div>
@@ -610,7 +610,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../',
-            VERSION:'1.7',
+            VERSION:'master',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/latest/admin/traffic_ops_using.html b/docs/latest/admin/traffic_ops_using.html
index 6c1a40e..19b8299 100644
--- a/docs/latest/admin/traffic_ops_using.html
+++ b/docs/latest/admin/traffic_ops_using.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Using Traffic Ops &mdash; Traffic Control 1.7 documentation </title>
+  <title>Using Traffic Ops &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’s Guide" href="index.html"/>
         <link rel="next" title="Managing Traffic Ops Extensions" href="traffic_ops_extensions.html"/>
         <link rel="prev" title="Configuring Traffic Ops" href="traffic_ops_config.html"/> 
@@ -58,7 +58,7 @@
 
         
           
-          <img src="../_static/tc_logo.png" class="logo" />
+          <img src="../_static/tc_logo_c_only.png" class="logo" />
         
         </a>
 
@@ -104,7 +104,7 @@
 <li class="toctree-l1 current"><a class="reference internal" href="index.html">Administrator&#8217;s Guide</a><ul class="current">
 <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 current"><a class="current reference internal" href="#">Using Traffic Ops</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Using Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" href="traffic_ops_extensions.html">Managing Traffic Ops Extensions</a></li>
 <li class="toctree-l2"><a class="reference internal" href="traffic_portal.html">Traffic Portal Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="traffic_monitor.html">Traffic Monitor Administration</a></li>
@@ -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>
       
@@ -208,16 +208,16 @@
 <td>A real time view into the main performance indicators of the CDNs managed by Traffic Control.
 This view is sourced directly by the Traffic Monitor data and is updated every 10 seconds.
 This is the default screen of Traffic Ops.
-See <a class="reference internal" href="#rl-health-table"><span class="std std-ref">The Health Table</span></a> for details.</td>
+See <a class="reference internal" href="#rl-health-table"><em>The Health Table</em></a> for details.</td>
 </tr>
 <tr class="row-odd"><td>Graph View</td>
 <td>A real graphical time view into the main performance indicators of the CDNs managed by Traffic Control.
 This view is sourced by the Traffic Monitor data and is updated every 10 seconds.
 On loading, this screen will show a history of 24 hours of data from Traffic Stats
-See <a class="reference internal" href="#rl-health-graph"><span class="std std-ref">Graph View</span></a> for details.</td>
+See <a class="reference internal" href="#rl-health-graph"><em>Graph View</em></a> for details.</td>
 </tr>
 <tr class="row-even"><td>Server Checks</td>
-<td>A table showing the results of the periodic check extension scripts that are run. See <a class="reference internal" href="#rl-server-checks"><span class="std std-ref">Server Checks</span></a></td>
+<td>A table showing the results of the periodic check extension scripts that are run. See <a class="reference internal" href="#rl-server-checks"><em>Server Checks</em></a></td>
 </tr>
 <tr class="row-odd"><td>Daily Summary</td>
 <td>A graph displaying the daily peaks of bandwidth, overall bytes served per day, and overall bytes served since initial installation
@@ -259,7 +259,7 @@
 </thead>
 <tbody valign="top">
 <tr class="row-even"><td>Upload Server CSV</td>
-<td>Bulk add of servers from a csv file. See <a class="reference internal" href="#rl-bulkserver"><span class="std std-ref">Bulk Upload Server</span></a></td>
+<td>Bulk add of servers from a csv file. See <a class="reference internal" href="#rl-bulkserver"><em>Bulk Upload Server</em></a></td>
 </tr>
 </tbody>
 </table>
@@ -278,7 +278,7 @@
 </thead>
 <tbody valign="top">
 <tr class="row-even"><td>Global Profile</td>
-<td>The table of global parameters. See <a class="reference internal" href="traffic_ops_config.html#rl-param-prof"><span class="std std-ref">Profile Parameters</span></a>. This is where you Create/Read/Update/Delete parameters in the Global profile</td>
+<td>The table of global parameters. See <a class="reference internal" href="traffic_ops_config.html#rl-param-prof"><em>Profile Parameters</em></a>. This is where you Create/Read/Update/Delete parameters in the Global profile</td>
 </tr>
 <tr class="row-odd"><td>All Cache Groups</td>
 <td>The table of all parameters <em>that are assgined to a cachegroup</em> - this may be slow to pull up, as there can be thousands of parameters.</td>
@@ -309,19 +309,19 @@
 </thead>
 <tbody valign="top">
 <tr class="row-even"><td>Generate ISO</td>
-<td>Generate a bootable image for any of the servers in the Servers table (or any server for that matter). See <a class="reference internal" href="#rl-generate-iso"><span class="std std-ref">Generate ISO</span></a></td>
+<td>Generate a bootable image for any of the servers in the Servers table (or any server for that matter). See <a class="reference internal" href="#rl-generate-iso"><em>Generate ISO</em></a></td>
 </tr>
 <tr class="row-odd"><td>Queue Updates</td>
-<td>Send Updates to the caches. See <a class="reference internal" href="#rl-queue-updates"><span class="std std-ref">Queue Updates and Snapshot CRConfig</span></a></td>
+<td>Send Updates to the caches. See <a class="reference internal" href="#rl-queue-updates"><em>Queue Updates and Snapshot CRConfig</em></a></td>
 </tr>
 <tr class="row-even"><td>DB Dump</td>
 <td>Backup the Database to a .sql file.</td>
 </tr>
 <tr class="row-odd"><td>Snapshot CRConfig</td>
-<td>Send updates to the Traffic Monitor / Traffic Router servers.  See <a class="reference internal" href="#rl-queue-updates"><span class="std std-ref">Queue Updates and Snapshot CRConfig</span></a></td>
+<td>Send updates to the Traffic Monitor / Traffic Router servers.  See <a class="reference internal" href="#rl-queue-updates"><em>Queue Updates and Snapshot CRConfig</em></a></td>
 </tr>
 <tr class="row-even"><td>Invalidate Content</td>
-<td>Invalidate or purge content from all caches in the CDN. See <a class="reference internal" href="#rl-purge"><span class="std std-ref">Invalidate Content</span></a></td>
+<td>Invalidate or purge content from all caches in the CDN. See <a class="reference internal" href="#rl-purge"><em>Invalidate Content</em></a></td>
 </tr>
 <tr class="row-odd"><td>Manage DNSSEC keys</td>
 <td>Manage DNSSEC Keys for a chosen CDN.</td>
@@ -349,10 +349,10 @@
 <td>Create/Read/Update/Delete users</td>
 </tr>
 <tr class="row-even"><td>Profiles</td>
-<td>Create/Read/Update/Delete profiles. See <a class="reference internal" href="#rl-working-with-profiles"><span class="std std-ref">Parameters and Profiles</span></a></td>
+<td>Create/Read/Update/Delete profiles. See <a class="reference internal" href="#rl-working-with-profiles"><em>Parameters and Profiles</em></a></td>
 </tr>
 <tr class="row-odd"><td>Networks(ASNs)</td>
-<td>Create/Read/Update/Delete Autonomous System Numbers See <a class="reference internal" href="#rl-asn-czf"><span class="std std-ref">The Coverage Zone File and ASN Table</span></a></td>
+<td>Create/Read/Update/Delete Autonomous System Numbers See <a class="reference internal" href="#rl-asn-czf"><em>The Coverage Zone File and ASN Table</em></a></td>
 </tr>
 <tr class="row-even"><td>Hardware</td>
 <td>Get detailed hardware information (note: this should be moved to a Traffic Ops Extension)</td>
@@ -554,7 +554,7 @@
 <td>A unique string that identifies this delivery service.</td>
 </tr>
 <tr class="row-odd"><td>Content Routing Type</td>
-<td>The type of content routing this delivery service will use. See <a class="reference internal" href="#rl-ds-types"><span class="std std-ref">Delivery Service Types</span></a>.</td>
+<td>The type of content routing this delivery service will use. See <a class="reference internal" href="#rl-ds-types"><em>Delivery Service Types</em></a>.</td>
 </tr>
 <tr class="row-even"><td>Protocol</td>
 <td><p class="first">The protocol to serve this delivery service to the clients with:</p>
@@ -569,7 +569,7 @@
 <td>The DSCP value to mark IP packets to the client with.</td>
 </tr>
 <tr class="row-even"><td>Signed URLs</td>
-<td>Use Signed URLs? See <a class="reference internal" href="#rl-signed-urls"><span class="std std-ref">Token Based Authentication</span></a>.</td>
+<td>Use Signed URLs? See <a class="reference internal" href="#rl-signed-urls"><em>Token Based Authentication</em></a>.</td>
 </tr>
 <tr class="row-odd"><td>Query String Handling</td>
 <td><p class="first">How to treat query strings:</p>
@@ -590,7 +590,7 @@
 </td>
 </tr>
 <tr class="row-odd"><td>Geo Limit Redirect URL</td>
-<td>(for HTTP routed delivery services only) This is the URL Traffic Router will redirect to when Geo Limit Failure. See <span class="xref std std-ref">geolimit-failure-redirect-feature</span></td>
+<td>(for HTTP routed delivery services only) This is the URL Traffic Router will redirect to when Geo Limit Failure. See <a class="reference internal" href="traffic_router.html#rl-tr-ngb"><em>GeoLimit Failure Redirect feature</em></a></td>
 </tr>
 <tr class="row-even"><td>Bypass FQDN</td>
 <td>(for HTTP routed delivery services only) This is the FQDN Traffic Router will redirect to (with the same path) when the max Bps or Max Tps for this deliveryservice are exceeded.</td>
@@ -621,7 +621,7 @@
 <td>The Origin Server&#8217;s base URL. This includes the protocol (http or https). Example: <code class="docutils literal"><span class="pre">http://movies.origin.com</span></code></td>
 </tr>
 <tr class="row-odd"><td>Use Multi Site Origin Feature</td>
-<td>Enable the Multi Site Origin feature for this delivery service. See <a class="reference internal" href="#rl-multi-site-origin"><span class="std std-ref">Multi Site Origin</span></a></td>
+<td>Enable the Multi Site Origin feature for this delivery service. See <a class="reference internal" href="#rl-multi-site-origin"><em>Multi Site Origin</em></a></td>
 </tr>
 <tr class="row-even"><td>Multi Site Origin Algorithm</td>
 <td><ul class="first last simple">
@@ -633,7 +633,7 @@
 </td>
 </tr>
 <tr class="row-odd"><td>CCR profile</td>
-<td>The Traffic Router  profile for this delivery service. See <a class="reference internal" href="#rl-ccr-profile"><span class="std std-ref">CCR Profile or Traffic Router Profile</span></a>.</td>
+<td>The Traffic Router  profile for this delivery service. See <a class="reference internal" href="#rl-ccr-profile"><em>CCR Profile or Traffic Router Profile</em></a>.</td>
 </tr>
 <tr class="row-even"><td>Maximum Bits per Second allowed globally</td>
 <td>The maximum bits per second this delivery service can serve across all EDGE caches before traffic will be diverted to the bypass destination. For a DNS delivery service, the Bypass Ipv4 or Ipv6  will be used
@@ -644,16 +644,16 @@
 (depending on whether this was a A or AAAA request), and for HTTP delivery services the Bypass FQDN will be used.</td>
 </tr>
 <tr class="row-even"><td>Geo Miss Default Latitude</td>
-<td>Default Latitude for this delivery service. When client localization fails for bot Coverage Zone and Geo Lookup, this the client will be routed as if it was at this lat.</td>
+<td>Default Latitude for this delivery service. When client localization fails for both Coverage Zone and Geo Lookup, this the client will be routed as if it was at this lat.</td>
 </tr>
 <tr class="row-odd"><td>Geo Miss Default Longitude</td>
 <td>Default Longitude for this delivery service. When client localization fails for bot Coverage Zone and Geo Lookup, this the client will be routed as if it was at this long.</td>
 </tr>
 <tr class="row-even"><td>Edge Header Rewrite Rules</td>
-<td>Header Rewrite rules to apply for this delivery service at the EDGE tier. See <a class="reference internal" href="#rl-header-rewrite"><span class="std std-ref">Header Rewrite Options and DSCP</span></a>. <a class="footnote-reference" href="#id6" id="id1">[1]</a></td>
+<td>Header Rewrite rules to apply for this delivery service at the EDGE tier. See <a class="reference internal" href="#rl-header-rewrite"><em>Header Rewrite Options and DSCP</em></a>. <a class="footnote-reference" href="#id6" id="id1">[1]</a></td>
 </tr>
 <tr class="row-odd"><td>Mid Header Rewrite Rules</td>
-<td>Header Rewrite rules to apply for this delivery service at the MID tier. See <a class="reference internal" href="#rl-header-rewrite"><span class="std std-ref">Header Rewrite Options and DSCP</span></a>. <a class="footnote-reference" href="#id6" id="id2">[1]</a></td>
+<td>Header Rewrite rules to apply for this delivery service at the MID tier. See <a class="reference internal" href="#rl-header-rewrite"><em>Header Rewrite Options and DSCP</em></a>. <a class="footnote-reference" href="#id6" id="id2">[1]</a></td>
 </tr>
 <tr class="row-even"><td>Regex Remap Expression</td>
 <td>Regex Remap rule to apply to this delivery service at the Edge tier. See <a class="reference external" href="https://docs.trafficserver.apache.org/en/latest/admin-guide/plugins/regex_remap.en.html">ATS documentation on regex_remap</a>. <a class="footnote-reference" href="#id6" id="id3">[1]</a></td>
@@ -689,16 +689,16 @@
 <td>(Read Only) The last time this delivery service was updated.</td>
 </tr>
 <tr class="row-odd"><td>Number of edges assigned</td>
-<td>(Read Only - change by clicking the <strong>Server Assignments</strong> button at the bottom) The number of EDGE caches assigned to this delivery service. See <a class="reference internal" href="#rl-assign-edges"><span class="std std-ref">Server Assignments</span></a>.</td>
+<td>(Read Only - change by clicking the <strong>Server Assignments</strong> button at the bottom) The number of EDGE caches assigned to this delivery service. See <a class="reference internal" href="#rl-assign-edges"><em>Server Assignments</em></a>.</td>
 </tr>
 <tr class="row-even"><td>Number of static DNS entries</td>
-<td>(Read Only - change by clicking the <strong>Static DNS</strong> button at the bottom) The number of static DNS entries for this delivery service. See <a class="reference internal" href="#rl-static-dns"><span class="std std-ref">Static DNS Entries</span></a>.</td>
+<td>(Read Only - change by clicking the <strong>Static DNS</strong> button at the bottom) The number of static DNS entries for this delivery service. See <a class="reference internal" href="#rl-static-dns"><em>Static DNS Entries</em></a>.</td>
 </tr>
 <tr class="row-odd"><td>Example delivery URL</td>
 <td>(Read Only) An example of how the delivery URL may start. This could be multiple rows if multiple HOST_REGEXP entries have been entered.</td>
 </tr>
 <tr class="row-even"><td>Regular expressions for this delivery service</td>
-<td>A subtable of the regular expressions to use when routing traffic for this delivery service. See <a class="reference internal" href="#rl-ds-regexp"><span class="std std-ref">Delivery Service Regexp</span></a>.</td>
+<td>A subtable of the regular expressions to use when routing traffic for this delivery service. See <a class="reference internal" href="#rl-ds-regexp"><em>Delivery Service Regexp</em></a>.</td>
 </tr>
 </tbody>
 </table>
@@ -742,11 +742,11 @@
 <td>HTTP Content routing, same as HTTP_LIVE, but the MID tier is NOT bypassed.</td>
 </tr>
 <tr class="row-odd"><td>DNS_LIVE_NATNL</td>
-<td>DNS Content routing, ut where for &#8220;standard&#8221; DNS content routing the objects are stored on disk, for this delivery service type the objects are stored
+<td>DNS Content routing, but where for &#8220;standard&#8221; DNS content routing the objects are stored on disk, for this delivery service type the objects are stored
 on the RAM disks. Use this for linear TV. The MID tier is NOT bypassed for this type.</td>
 </tr>
 <tr class="row-even"><td>DNS_LIVE</td>
-<td>DNS Content routing, same as DNS_LIVE_NATIONAL, but the MID tier is bypassed.</td>
+<td>DNS Content routing, same as DNS_LIVE_NATNL, but the MID tier is bypassed.</td>
 </tr>
 <tr class="row-odd"><td>ANY_MAP</td>
 <td>ANY_MAP is not known to Traffic Router. For this deliveryservice, the &#8220;Raw remap text&#8221; field in the input form will be used as the remap line on the cache.</td>
@@ -830,7 +830,7 @@
 <div>1: use fqdn and all of URl path
 0110: use part1 and part 2 of path only
 01: use everything except the fqdn</div></blockquote>
-<p class="last"><code class="docutils literal"><span class="pre">P=&lt;parts</span> <span class="pre">string</span> <span class="pre">(0's</span> <span class="pre">and</span> <span class="pre">1's&gt;</span></code></p>
+<p class="last"><code class="docutils literal"><span class="pre">P=&lt;parts</span> <span class="pre">string</span> <span class="pre">(0's</span> <span class="pre">and</span> <span class="pre">1's)&gt;</span></code></p>
 </dd>
 <dt>Signature</dt>
 <dd><p class="first">The signature over the parts + the query string up to and
@@ -1003,10 +1003,10 @@
 <span id="rl-multi-site-origin"></span><h3>Multi Site Origin<a class="headerlink" href="#multi-site-origin" title="Permalink to this headline">¶</a></h3>
 <div class="admonition note">
 <p class="first admonition-title">Note</p>
-<p class="last">The Multi Site Origin feature is based upon a feature n ATS that has yet to be submitted to Traffic Server upstream, until it is, set this to 0, or use the ATS rpm supplied on the traffic-control-cdn.net website.</p>
+<p class="last">The Multi Site Origin feature is based upon a feature n ATS that has yet to be submitted to Traffic Server upstream, until it is, set this to 0, or use the ATS rpm supplied on the trafficcontrol.apache.org website.</p>
 </div>
 <p>Normally, the mid servers are not aware of any redundancy at the origin layer. With Multi Site Origin enabled this changes - Traffic Server (and Traffic Ops) are now made aware of the fact there are multiple origins, and can be configured to do more advanced failover and loadbalancing actions.</p>
-<p>With This feature enabled, origin servers (or origin server VIP names for a site) are going to be entered as servers in to the Traiffic Ops UI. Server type is With This feature enabled, origin servers (or origin server VIP names for a site) are going to be entered as servers in to the Traiffic Ops UI. Server type is &#8220;&#8221;</p>
+<p>With This feature enabled, origin servers (or origin server VIP names for a site) are going to be entered as servers in to the Traiffic Ops UI. Server type is &#8220;&#8221;</p>
 <p>Parameters in the Origin profile that influence this feature:</p>
 <table border="1" class="docutils">
 <colgroup>
@@ -1070,7 +1070,7 @@
 </tr>
 </tbody>
 </table>
-<p>see <a class="reference internal" href="quick_howto/multi_site.html#rl-multi-site-origin-qht"><span class="std std-ref">Configure Multi Site Origin</span></a> for a <em>quick how to</em> on this feature.</p>
+<p>see <a class="reference internal" href="quick_howto/multi_site.html#rl-multi-site-origin-qht"><em>Configure Multi Site Origin</em></a> for a <em>quick how to</em> on this feature.</p>
 </div>
 <div class="section" id="ccr-profile-or-traffic-router-profile">
 <span id="rl-ccr-profile"></span><h3>CCR Profile or Traffic Router Profile<a class="headerlink" href="#ccr-profile-or-traffic-router-profile" title="Permalink to this headline">¶</a></h3>
@@ -1310,30 +1310,30 @@
 <div class="section" id="the-coverage-zone-file-and-asn-table">
 <span id="rl-asn-czf"></span><h3>The Coverage Zone File and ASN Table<a class="headerlink" href="#the-coverage-zone-file-and-asn-table" title="Permalink to this headline">¶</a></h3>
 <p>The Coverage Zone File (CZF) should contain a cachegroup name to network prefix mapping in the form:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span>
-  <span class="s2">&quot;coverageZones&quot;</span><span class="p">:</span> <span class="p">{</span>
-    <span class="s2">&quot;cache-group-01&quot;</span><span class="p">:</span> <span class="p">{</span>
-      <span class="s2">&quot;network6&quot;</span><span class="p">:</span> <span class="p">[</span>
-        <span class="s2">&quot;1234:5678::\/64&quot;</span><span class="p">,</span>
-        <span class="s2">&quot;1234:5679::\/64&quot;</span>
-      <span class="p">],</span>
-      <span class="s2">&quot;network&quot;</span><span class="p">:</span> <span class="p">[</span>
-        <span class="s2">&quot;192.168.8.0\/24&quot;</span><span class="p">,</span>
-        <span class="s2">&quot;192.168.9.0\/24&quot;</span>
-      <span class="p">]</span>
-    <span class="p">}</span>
-    <span class="s2">&quot;cache-group-02&quot;</span><span class="p">:</span> <span class="p">{</span>
-      <span class="s2">&quot;network6&quot;</span><span class="p">:</span> <span class="p">[</span>
-        <span class="s2">&quot;1234:567a::\/64&quot;</span><span class="p">,</span>
-        <span class="s2">&quot;1234:567b::\/64&quot;</span>
-      <span class="p">],</span>
-      <span class="s2">&quot;network&quot;</span><span class="p">:</span> <span class="p">[</span>
-        <span class="s2">&quot;192.168.4.0\/24&quot;</span><span class="p">,</span>
-        <span class="s2">&quot;192.168.5.0\/24&quot;</span>
-      <span class="p">]</span>
-    <span class="p">}</span>
-  <span class="p">}</span>
-<span class="p">}</span>
+<div class="highlight-python"><div class="highlight"><pre>{
+  &quot;coverageZones&quot;: {
+    &quot;cache-group-01&quot;: {
+      &quot;network6&quot;: [
+        &quot;1234:5678::\/64&quot;,
+        &quot;1234:5679::\/64&quot;
+      ],
+      &quot;network&quot;: [
+        &quot;192.168.8.0\/24&quot;,
+        &quot;192.168.9.0\/24&quot;
+      ]
+    }
+    &quot;cache-group-02&quot;: {
+      &quot;network6&quot;: [
+        &quot;1234:567a::\/64&quot;,
+        &quot;1234:567b::\/64&quot;
+      ],
+      &quot;network&quot;: [
+        &quot;192.168.4.0\/24&quot;,
+        &quot;192.168.5.0\/24&quot;
+      ]
+    }
+  }
+}
 </pre></div>
 </div>
 <p>The CZF is an input to the Traffic Control CDN, and as such does not get generated by Traffic Ops, but rather, it gets consumed by Traffic Router. Some popular IP management systems output a very similar file to the CZF but in stead of a cachegroup an ASN will be listed. Traffic Ops has the &#8220;Networks (ASNs)&#8221; view to aid with the conversion of files like that to a Traffic Control CZF file; this table is not used anywhere in Traffic Ops, but can be used to script the conversion using the API.</p>
@@ -1345,7 +1345,7 @@
 <p>Parameters are shared between profiles if the set of <code class="docutils literal"><span class="pre">{</span> <span class="pre">name,</span> <span class="pre">config_file,</span> <span class="pre">value</span> <span class="pre">}</span></code> is the same. To change a value in one profile but not in others, the parameter has to be removed from the profile you want to change it in, and a new parameter entry has to be created (<strong>Add Parameter</strong> button at the bottom of the Parameters view), and assigned to that profile. It is easy to create new profiles from the <strong>Misc &gt; Profiles</strong> view - just use the <strong>Add/Copy Profile</strong> button at the bottom of the profile view to copy an existing profile to a new one. Profiles can be exported from one system and imported to another using the profile view as well. It makes no sense for a parameter to not be assigned to a single profile - in that case it really has no function. To find parameters like that use the <strong>Parameters &gt; Orphaned Parameters</strong> view. It is easy to create orphaned parameters by removing all profiles, or not assigning a profile directly after creating the parameter.</p>
 <div class="admonition seealso">
 <p class="first admonition-title">See also</p>
-<p class="last"><a class="reference internal" href="traffic_ops_config.html#rl-param-prof"><span class="std std-ref">Profile Parameters</span></a> in the <em>Configuring Traffic Ops</em> section.</p>
+<p class="last"><a class="reference internal" href="traffic_ops_config.html#rl-param-prof"><em>Profile Parameters</em></a> in the <em>Configuring Traffic Ops</em> section.</p>
 </div>
 </div>
 <div class="section" id="tools">
@@ -1421,30 +1421,30 @@
 <p>What we currently do is have 2 scripts, one to do hard drive configuration and one to do network configuration. Both are relatively specific to the environment they were created in, and both are <em>probably</em> wrong for other organizations, however they are currently living in the &#8220;misc&#8221; directory as examples of how to do things.</p>
 <p>We trigger those in a %pre section in ks.cfg and they will write config files to /tmp. We will then include those files in the appropriate places using  %pre.</p>
 <p>For example this is a section of our ks.cfg file:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="o">%</span><span class="n">include</span> <span class="o">/</span><span class="n">mnt</span><span class="o">/</span><span class="n">stage2</span><span class="o">/</span><span class="n">ks_scripts</span><span class="o">/</span><span class="n">packages</span><span class="o">.</span><span class="n">txt</span>
+<div class="highlight-python"><div class="highlight"><pre>%include /mnt/stage2/ks_scripts/packages.txt
 
-<span class="o">%</span><span class="n">pre</span>
-  <span class="n">python</span> <span class="o">/</span><span class="n">mnt</span><span class="o">/</span><span class="n">stage2</span><span class="o">/</span><span class="n">ks_scripts</span><span class="o">/</span><span class="n">create_network_line</span><span class="o">.</span><span class="n">py</span>
-  <span class="n">bash</span> <span class="o">/</span><span class="n">mnt</span><span class="o">/</span><span class="n">stage2</span><span class="o">/</span><span class="n">ks_scripts</span><span class="o">/</span><span class="n">drive_config</span><span class="o">.</span><span class="n">sh</span>
-<span class="o">%</span><span class="n">end</span>
+%pre
+  python /mnt/stage2/ks_scripts/create_network_line.py
+  bash /mnt/stage2/ks_scripts/drive_config.sh
+%end
 </pre></div>
 </div>
 <p>These two scripts will then run _before_ anaconda sets up it&#8217;s internal structures, then a bit further up in the ks.cfg file (outside of the %pre %end block) we do an</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="o">%</span><span class="n">include</span> <span class="o">/</span><span class="n">mnt</span><span class="o">/</span><span class="n">stage2</span><span class="o">/</span><span class="n">ks_scripts</span><span class="o">/</span><span class="n">password</span><span class="o">.</span><span class="n">cfg</span>
-<span class="o">...</span>
-<span class="o">%</span><span class="n">include</span> <span class="o">/</span><span class="n">tmp</span><span class="o">/</span><span class="n">network_line</span>
+<div class="highlight-python"><div class="highlight"><pre>%include /mnt/stage2/ks_scripts/password.cfg
+...
+%include /tmp/network_line
 
-<span class="o">%</span><span class="n">include</span> <span class="o">/</span><span class="n">tmp</span><span class="o">/</span><span class="n">drive_config</span>
-<span class="o">...</span>
+%include /tmp/drive_config
+...
 </pre></div>
 </div>
 <p>This snarfs up the contents and inlines them.</p>
 <p>If you only have one kind of hardware on your CDN it is probably best to just put the drive config right in the ks.cfg.</p>
 <p>If you have simple networking needs (we use bonded interfaces in most, but not all locations and we have several types of hardware meaning different ethernet interface names at the OS level etc.) then something like this:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="ch">#!/bin/bash</span>
-<span class="n">source</span> <span class="o">/</span><span class="n">mnt</span><span class="o">/</span><span class="n">stage2</span><span class="o">/</span><span class="n">ks_scripts</span><span class="o">/</span><span class="n">network</span><span class="o">.</span><span class="n">cfg</span>
-<span class="n">echo</span> <span class="s2">&quot;network --bootproto=static --activate --ipv6=$IPV6ADDR --ip=$IPADDR --netmask=$NETMASK --gateway=$GATEWAY --ipv6gateway=$GATEWAY --nameserver=$NAMESERVER --mtu=$MTU --hostname=$HOSTNAME&quot;</span> <span class="o">&gt;&gt;</span> <span class="o">/</span><span class="n">tmp</span><span class="o">/</span><span class="n">network</span><span class="o">.</span><span class="n">cfg</span>
-<span class="c1"># Note that this is an example and may not work at all.</span>
+<div class="highlight-python"><div class="highlight"><pre>#!/bin/bash
+source /mnt/stage2/ks_scripts/network.cfg
+echo &quot;network --bootproto=static --activate --ipv6=$IPV6ADDR --ip=$IPADDR --netmask=$NETMASK --gateway=$GATEWAY --ipv6gateway=$GATEWAY --nameserver=$NAMESERVER --mtu=$MTU --hostname=$HOSTNAME&quot; &gt;&gt; /tmp/network.cfg
+# Note that this is an example and may not work at all.
 </pre></div>
 </div>
 <p>You could also put this in the %pre section. Lots of ways to solve it.</p>
@@ -1486,7 +1486,7 @@
 </div>
 <div class="section" id="snapshot-crconfig">
 <span id="rl-snapshot-crconfig"></span><span id="index-12"></span><h4>Snapshot CRConfig<a class="headerlink" href="#snapshot-crconfig" title="Permalink to this headline">¶</a></h4>
-<p>Every 60 seconds Traffic Monitor will check with Traffic Ops to see if a new CRConfig snapshot exists; Traffic Monitor polls Traffic Ops for a new CRConfig, and Traffic Router polls Traffic Monitor for the same file. This is necessary to ensure that Traffic Monitor sees configuration changes first, which helps to ensure that the health and state of caches and delivery services propagates properly to Traffic Router. See <a class="reference internal" href="#rl-ccr-profile"><span class="std std-ref">CCR Profile or Traffic Router Profile</span></a> for more information on the CRConfig file.</p>
+<p>Every 60 seconds Traffic Monitor will check with Traffic Ops to see if a new CRConfig snapshot exists; Traffic Monitor polls Traffic Ops for a new CRConfig, and Traffic Router polls Traffic Monitor for the same file. This is necessary to ensure that Traffic Monitor sees configuration changes first, which helps to ensure that the health and state of caches and delivery services propagates properly to Traffic Router. See <a class="reference internal" href="#rl-ccr-profile"><em>CCR Profile or Traffic Router Profile</em></a> for more information on the CRConfig file.</p>
 <p>To create a new snapshot, use the <em>Tools &gt; Snapshot CRConfig</em> menu:</p>
 <blockquote>
 <div><ol class="arabic">
@@ -1558,7 +1558,7 @@
 <p><strong>Activate/Deactivate DNSSEC for a CDN</strong></p>
 <p>Fairly straight forward, this button set the <strong>dnssec.enabled</strong> param to either <strong>true</strong> or <strong>false</strong> on the Traffic Router profile for the CDN.  The Activate/Deactivate option is only available if DNSSEC keys exist for CDN.  In order to active DNSSEC for a CDN a user must first generate keys and then click the <strong>Active DNSSEC</strong> button.</p>
 <p><strong>Generate Keys</strong></p>
-<p>Generate Keys will generate dnssec keys for the CDN TLD as well as for each Delivery Service in the CDN.  It is important to note that this button will create a new KSK for the TLD and, therefore, a new DS Record.  Any time a new DS Record is created, it will need to be added to the parent zone of the TLD in order for DNSSEC to work properly.  When a user clicks the <strong>Generate Keys</strong> button, they will be presented with a screen with the following fields:</p>
+<p>Generate Keys will generate DNSSEC keys for the CDN TLD as well as for each Delivery Service in the CDN.  It is important to note that this button will create a new KSK for the TLD and, therefore, a new DS Record.  Any time a new DS Record is created, it will need to be added to the parent zone of the TLD in order for DNSSEC to work properly.  When a user clicks the <strong>Generate Keys</strong> button, they will be presented with a screen with the following fields:</p>
 <blockquote>
 <div><ul class="simple">
 <li><strong>CDN:</strong> This is not editable and displays the CDN for which keys will be generated</li>
@@ -1624,7 +1624,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../',
-            VERSION:'1.7',
+            VERSION:'master',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/latest/admin/traffic_portal.html b/docs/latest/admin/traffic_portal.html
index b33145b..03e22be 100644
--- a/docs/latest/admin/traffic_portal.html
+++ b/docs/latest/admin/traffic_portal.html
@@ -1,266 +1,293 @@
+
+
 <!DOCTYPE html>
-<!--[if IE 8]>
-<html class="no-js lt-ie9" lang="en"> <![endif]-->
-<!--[if gt IE 8]><!-->
-<html class="no-js" lang="en"> <!--<![endif]-->
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Traffic Portal Administration &mdash; Traffic Control 1.7 documentation </title>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  
+  <title>Traffic Portal Administration &mdash; Traffic Control master documentation </title>
+  
+
+  
+  
     <link rel="shortcut icon" href="../_static/favicon.ico"/>
-    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css"/>
-    <link rel="stylesheet" href="../_static/theme_overrides.css" type="text/css"/>
-    <link rel="top" title="Traffic Control 1.7 documentation" href="../index.html"/>
-    <link rel="up" title="Administrator’s Guide" href="index.html"/>
-    <link rel="next" title="Traffic Monitor Administration" href="traffic_monitor.html"/>
-    <link rel="prev" title="Managing Traffic Ops Extensions" href="traffic_ops_extensions.html"/>
-    <script src="_static/js/modernizr.min.js"></script>
+  
+
+  
+
+  
+  
+    
+
+  
+
+  
+  
+    <link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
+  
+
+  
+    <link rel="stylesheet" href="../_static/theme_overrides.css" type="text/css" />
+  
+
+  
+    <link rel="top" title="Traffic Control master documentation" href="../index.html"/>
+        <link rel="up" title="Administrator’s Guide" href="index.html"/>
+        <link rel="next" title="Traffic Monitor Administration" href="traffic_monitor.html"/>
+        <link rel="prev" title="Managing Traffic Ops Extensions" href="traffic_ops_extensions.html"/> 
+
+  
+  <script src="_static/js/modernizr.min.js"></script>
+
 </head>
+
 <body class="wy-body-for-nav" role="document">
-    <div class="wy-grid-for-nav">
-        <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-            <div class="wy-side-nav-search">
-                <a href="/" class="icon icon-home"> Traffic Control
-                    <img src="../_static/tc_logo.png" class="logo"/>
-                </a>
-                <div role="search">
-                    <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
-                        <input type="text" name="q" placeholder="Search docs"/>
-                        <input type="hidden" name="check_keywords" value="yes"/>
-                        <input type="hidden" name="area" value="default"/>
-                    </form>
-                </div>
-            </div>
-            <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-                <ul>
-                    <li class="toctree-l1"><a class="reference internal" href="../basics/index.html">CDN Basics</a>
-                        <ul>
-                            <li class="toctree-l2"><a class="reference internal"
-                                                      href="../basics/content_delivery_networks.html">Content Delivery
-                                Networks</a></li>
-                            <li class="toctree-l2"><a class="reference internal" href="../basics/http_11.html">HTTP 1.1</a>
-                            </li>
-                            <li class="toctree-l2"><a class="reference internal" href="../basics/caching_proxies.html">Caching
-                                Proxies</a></li>
-                            <li class="toctree-l2"><a class="reference internal" href="../basics/cache_revalidation.html">Cache
-                                Control Headers and Revalidation</a></li>
-                        </ul>
-                    </li>
-                </ul>
-                <ul>
-                    <li class="toctree-l1"><a class="reference internal" href="../overview/index.html">Traffic Control
-                        Overview</a>
-                        <ul>
-                            <li class="toctree-l2"><a class="reference internal" href="../overview/introduction.html">Introduction</a>
-                            </li>
-                            <li class="toctree-l2"><a class="reference internal" href="../overview/traffic_ops.html">Traffic
-                                Ops</a></li>
-                            <li class="toctree-l2"><a class="reference internal" href="../overview/traffic_portal.html">Traffic
-                                Portal</a></li>
-                            <li class="toctree-l2"><a class="reference internal" href="../overview/traffic_router.html">Traffic
-                                Router</a></li>
-                            <li class="toctree-l2"><a class="reference internal" href="../overview/traffic_monitor.html">Traffic
-                                Monitor</a></li>
-                            <li class="toctree-l2"><a class="reference internal" href="../overview/traffic_stats.html">Traffic
-                                Stats</a></li>
-                            <li class="toctree-l2"><a class="reference internal" href="../overview/traffic_server.html">Traffic
-                                Server</a></li>
-                            <li class="toctree-l2"><a class="reference internal" href="../overview/traffic_vault.html">Traffic
-                                Vault</a></li>
-                        </ul>
-                    </li>
-                </ul>
-                <ul class="current">
-                    <li class="toctree-l1 current"><a class="reference internal" href="index.html">Administrator&#8217;s
-                        Guide</a>
-                        <ul class="current">
-                            <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>
-                            <li class="toctree-l2"><a class="reference internal" href="traffic_ops_extensions.html">Managing
-                                Traffic Ops Extensions</a></li>
-                            <li class="toctree-l2 current"><a class="current reference internal" href="#">Traffic Portal
-                                Administration</a></li>
-                            <li class="toctree-l2"><a class="reference internal" href="traffic_monitor.html">Traffic Monitor
-                                Administration</a></li>
-                            <li class="toctree-l2"><a class="reference internal" href="traffic_router.html">Traffic Router
-                                Administration</a></li>
-                            <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"><a class="reference internal" href="quick_howto/index.html">Quick How To
-                                Guides</a></li>
-                        </ul>
-                    </li>
-                </ul>
-                <ul>
-                    <li class="toctree-l1"><a class="reference internal" href="../development/index.html">Developer&#8217;s
-                        Guide</a>
-                        <ul>
-                            <li class="toctree-l2"><a class="reference internal" href="../development/traffic_ops.html">Traffic
-                                Ops</a></li>
-                            <li class="toctree-l2"><a class="reference internal" href="../development/traffic_portal.html">Traffic
-                                Portal</a></li>
-                            <li class="toctree-l2"><a class="reference internal" href="../development/traffic_router.html">Traffic
-                                Router</a></li>
-                            <li class="toctree-l2"><a class="reference internal" href="../development/traffic_monitor.html">Traffic
-                                Monitor</a></li>
-                            <li class="toctree-l2"><a class="reference internal" href="../development/traffic_stats.html">Traffic
-                                Stats</a></li>
-                            <li class="toctree-l2"><a class="reference internal" href="../development/traffic_server.html">Traffic
-                                Server</a></li>
-                        </ul>
-                    </li>
-                </ul>
-                <ul>
-                    <li class="toctree-l1"><a class="reference internal" href="../faq/index.html">FAQ</a>
-                        <ul>
-                            <li class="toctree-l2"><a class="reference internal" href="../faq/general.html">General</a></li>
-                            <li class="toctree-l2"><a class="reference internal"
-                                                      href="../faq/development.html">Development</a></li>
-                            <li class="toctree-l2"><a class="reference internal" href="../faq/administration.html">Running a
-                                Traffic Control CDN</a></li>
-                        </ul>
-                    </li>
-                </ul>
-                <ul>
-                    <li class="toctree-l1"><a class="reference internal" href="../glossary.html">Glossary</a></li>
-                </ul>
-            </div>
-        </nav>
-        <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
-            <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-                <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-                <a href="../index.html">Traffic Control</a>
-            </nav>
-            <div class="wy-nav-content">
-                <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">Administrator&#8217;s Guide</a> &raquo;</li>
-                            <li>Traffic Portal Administration</li>
-                            <li class="wy-breadcrumbs-aside">
-                                <a href="../_sources/admin/traffic_portal.txt" rel="nofollow"> View page source</a>
-                            </li>
-                        </ul>
-                        <hr/>
-                    </div>
-                    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-                        <a href="traffic_monitor.html" class="btn btn-neutral float-right"
-                           title="Traffic Monitor Administration">Next <span class="fa fa-arrow-circle-right"></span></a>
-                        <a href="traffic_ops_extensions.html" class="btn btn-neutral"
-                           title="Managing Traffic Ops Extensions"><span class="fa fa-arrow-circle-left"></span>
-                            Previous</a>
-                    </div>
-                    <div role="main" class="document">
-                        <div class="section" id="traffic-portal-administration">
-                            <h1>Traffic Portal Administration<a class="headerlink" href="#traffic-portal-administration"
-                                                                title="Permalink to this headline">¶</a></h1>
-                            <p>The following are requirements to ensure an accurate set up:</p>
-                            <ul class="simple">
-                                <li>CentOS 6.7 or 7</li>
-                                <li>Node.js 6.0.x or above</li>
-                            </ul>
-                            <p><strong>Installing Traffic Portal</strong></p>
-                            <blockquote>
-                                <div>
-                                    <ul class="simple">
-                                        <li>Download the Traffic Portal RPM from the traffic control <a
-                                                class="reference external"
-                                                href="/downloads/index.html">downloads</a>
-                                            page or build from <a class="reference external"
-                                                                  href="https://github.com/apache/incubator-trafficcontrol/tree/master/traffic_portal/build">source</a>.
-                                        </li>
-                                        <li>Copy the Traffic Portal RPM to your server</li>
-                                        <li>curl &#8211;silent &#8211;location <a class="reference external"
-                                                                                  href="https://rpm.nodesource.com/setup_6.x">https://rpm.nodesource.com/setup_6.x</a>
-                                            | sudo bash -
-                                        </li>
-                                        <li>sudo yum install -y nodejs</li>
-                                        <li>sudo yum install -y &lt;traffic_portal rpm&gt;</li>
-                                    </ul>
-                                </div>
-                            </blockquote>
-                            <p><strong>Configuring Traffic Portal</strong></p>
-                            <blockquote>
-                                <div>
-                                    <ul class="simple">
-                                        <li>cd /etc/traffic_portal/conf</li>
-                                        <li>sudo cp config-template.js config.js</li>
-                                        <li>sudo vi config.js (read the inline comments)</li>
-                                        <li>[OPTIONAL] sudo vi /opt/traffic_portal/public/traffic_portal_properties.json (to
-                                            customize traffic portal content)
-                                        </li>
-                                        <li>[OPTIONAL] sudo vi /opt/traffic_portal/public/resources/assets/css/custom.css
-                                            (to customize traffic portal skin)
-                                        </li>
-                                    </ul>
-                                </div>
-                            </blockquote>
-                            <p><strong>Starting Traffic Portal</strong></p>
-                            <blockquote>
-                                <div>
-                                    <ul class="simple">
-                                        <li>sudo service traffic_portal start</li>
-                                    </ul>
-                                </div>
-                            </blockquote>
-                            <p><strong>Stopping Traffic Portal</strong></p>
-                            <blockquote>
-                                <div>
-                                    <ul class="simple">
-                                        <li>sudo service traffic_portal stop</li>
-                                    </ul>
-                                </div>
-                            </blockquote>
-                        </div>
-                    </div>
-                    <footer>
-                        <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
-                            <a href="traffic_monitor.html" class="btn btn-neutral float-right"
-                               title="Traffic Monitor Administration">Next <span
-                                    class="fa fa-arrow-circle-right"></span></a>
-                            <a href="traffic_ops_extensions.html" class="btn btn-neutral"
-                               title="Managing Traffic Ops Extensions"><span class="fa fa-arrow-circle-left"></span>
-                                Previous</a>
-                        </div>
-                        <hr/>
-                        <div role="contentinfo">
-                            <p>
-                            </p>
-                        </div>
-                        Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a
-                            href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a
-                            href="https://readthedocs.org">Read the Docs</a>.
-                    </footer>
-                </div>
-            </div>
-        </section>
+
+  <div class="wy-grid-for-nav">
+
+    
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-nav-search">
+        
+
+        
+          <a href="/" class="icon icon-home"> Traffic Control
+        
+
+        
+          
+          <img src="../_static/tc_logo_c_only.png" class="logo" />
+        
+        </a>
+
+        
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+
+        
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+        
+          
+          
+              <ul>
+<li class="toctree-l1"><a class="reference internal" href="../basics/index.html">CDN Basics</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="../basics/content_delivery_networks.html">Content Delivery Networks</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../basics/http_11.html">HTTP 1.1</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../basics/caching_proxies.html">Caching Proxies</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../basics/cache_revalidation.html">Cache Control Headers and Revalidation</a></li>
+</ul>
+</li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../overview/index.html">Traffic Control Overview</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="../overview/introduction.html">Introduction</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../overview/traffic_ops.html">Traffic Ops</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../overview/traffic_portal.html">Traffic Portal</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../overview/traffic_router.html">Traffic Router</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../overview/traffic_monitor.html">Traffic Monitor</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../overview/traffic_stats.html">Traffic Stats</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../overview/traffic_server.html">Traffic Server</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../overview/traffic_vault.html">Traffic Vault</a></li>
+</ul>
+</li>
+</ul>
+<ul class="current">
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Administrator&#8217;s Guide</a><ul class="current">
+<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>
+<li class="toctree-l2"><a class="reference internal" href="traffic_ops_extensions.html">Managing Traffic Ops Extensions</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Traffic Portal Administration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="traffic_monitor.html">Traffic Monitor Administration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="traffic_router.html">Traffic Router Administration</a></li>
+<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"><a class="reference internal" href="quick_howto/index.html">Quick How To Guides</a></li>
+</ul>
+</li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../development/index.html">Developer&#8217;s Guide</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="../development/traffic_ops.html">Traffic Ops</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../development/traffic_portal.html">Traffic Portal</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../development/traffic_router.html">Traffic Router</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../development/traffic_monitor.html">Traffic Monitor</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../development/traffic_stats.html">Traffic Stats</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../development/traffic_server.html">Traffic Server</a></li>
+</ul>
+</li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../faq/index.html">FAQ</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="../faq/general.html">General</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../faq/development.html">Development</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../faq/administration.html">Running a Traffic Control CDN</a></li>
+</ul>
+</li>
+</ul>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../glossary.html">Glossary</a></li>
+</ul>
+
+          
+        
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+      
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="../index.html">Traffic Control</a>
+      </nav>
+
+
+      
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="../index.html">Traffic Control master</a> &raquo;</li>
+      
+          <li><a href="index.html">Administrator&#8217;s Guide</a> &raquo;</li>
+      
+    <li>Traffic Portal Administration</li>
+      <li class="wy-breadcrumbs-aside">
+        
+          <a href="../_sources/admin/traffic_portal.txt" rel="nofollow"> View page source</a>
+        
+      </li>
+  </ul>
+  <hr/>
+</div>
+ 		  
+    		  <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      		  
+        		  <a href="traffic_monitor.html" class="btn btn-neutral float-right" title="Traffic Monitor Administration">Next <span class="fa fa-arrow-circle-right"></span></a>
+      		  
+      		  
+        		  <a href="traffic_ops_extensions.html" class="btn btn-neutral" title="Managing Traffic Ops Extensions"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      		  
+    		  </div>
+  		  
+          <div role="main" class="document">
+            
+  <div class="section" id="traffic-portal-administration">
+<h1>Traffic Portal Administration<a class="headerlink" href="#traffic-portal-administration" title="Permalink to this headline">¶</a></h1>
+<p>The following are requirements to ensure an accurate set up:</p>
+<ul class="simple">
+<li>CentOS 6.7 or 7</li>
+<li>Node.js 6.0.x or above</li>
+</ul>
+<p><strong>Installing Traffic Portal</strong></p>
+<blockquote>
+<div><ul class="simple">
+<li>Download the Traffic Portal RPM from the traffic control <a class="reference external" href="https://trafficcontrol.apache.org/downloads/index.html">downloads</a> page or build from <a class="reference external" href="https://github.com/apache/incubator-trafficcontrol/traffic_portal/build">source</a>.</li>
+<li>Copy the Traffic Portal RPM to your server</li>
+<li>curl &#8211;silent &#8211;location <a class="reference external" href="https://rpm.nodesource.com/setup_6.x">https://rpm.nodesource.com/setup_6.x</a> | sudo bash -</li>
+<li>sudo yum install -y nodejs</li>
+<li>sudo yum install -y &lt;traffic_portal rpm&gt;</li>
+</ul>
+</div></blockquote>
+<p><strong>Configuring Traffic Portal</strong></p>
+<blockquote>
+<div><ul class="simple">
+<li>cd /etc/traffic_portal/conf</li>
+<li>sudo cp config-template.js config.js</li>
+<li>sudo vi config.js (read the inline comments)</li>
+<li>[OPTIONAL] sudo vi /opt/traffic_portal/public/traffic_portal_properties.json (to customize traffic portal content)</li>
+<li>[OPTIONAL] sudo vi /opt/traffic_portal/public/resources/assets/css/custom.css (to customize traffic portal skin)</li>
+</ul>
+</div></blockquote>
+<p><strong>Starting Traffic Portal</strong></p>
+<blockquote>
+<div><ul class="simple">
+<li>sudo service traffic_portal start</li>
+</ul>
+</div></blockquote>
+<p><strong>Stopping Traffic Portal</strong></p>
+<blockquote>
+<div><ul class="simple">
+<li>sudo service traffic_portal stop</li>
+</ul>
+</div></blockquote>
+</div>
+
+
+          </div>
+          <footer>
+  
+    <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
+      
+        <a href="traffic_monitor.html" class="btn btn-neutral float-right" title="Traffic Monitor Administration">Next <span class="fa fa-arrow-circle-right"></span></a>
+      
+      
+        <a href="traffic_ops_extensions.html" class="btn btn-neutral" title="Managing Traffic Ops Extensions"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+      
     </div>
+  
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>
+    </p>
+  </div>
+  Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+  
+
+
+  
+
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
-            URL_ROOT: '../',
-            VERSION: '1.7',
-            COLLAPSE_INDEX: false,
-            FILE_SUFFIX: '.html',
-            HAS_SOURCE: true
+            URL_ROOT:'../',
+            VERSION:'master',
+            COLLAPSE_INDEX:false,
+            FILE_SUFFIX:'.html',
+            HAS_SOURCE:  true
         };
     </script>
-    <script type="text/javascript" src="../_static/jquery.js"></script>
-    <script type="text/javascript" src="../_static/underscore.js"></script>
-    <script type="text/javascript" src="../_static/doctools.js"></script>
+      <script type="text/javascript" src="../_static/jquery.js"></script>
+      <script type="text/javascript" src="../_static/underscore.js"></script>
+      <script type="text/javascript" src="../_static/doctools.js"></script>
+
+  
+
+  
+  
     <script type="text/javascript" src="../_static/js/theme.js"></script>
-    <script type="text/javascript">
-        jQuery(function () {
-            SphinxRtdTheme.StickyNav.enable();
-        });
-    </script>
+  
+
+  
+  
+  <script type="text/javascript">
+      jQuery(function () {
+          SphinxRtdTheme.StickyNav.enable();
+      });
+  </script>
+   
+
 </body>
 </html>
\ No newline at end of file
diff --git a/docs/latest/admin/traffic_router.html b/docs/latest/admin/traffic_router.html
index dad7e42..779b941 100644
--- a/docs/latest/admin/traffic_router.html
+++ b/docs/latest/admin/traffic_router.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Traffic Router Administration &mdash; Traffic Control 1.7 documentation </title>
+  <title>Traffic Router Administration &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’s Guide" href="index.html"/>
         <link rel="next" title="Traffic Stats Administration" href="traffic_stats.html"/>
         <link rel="prev" title="Traffic Monitor Administration" href="traffic_monitor.html"/> 
@@ -58,7 +58,7 @@
 
         
           
-          <img src="../_static/tc_logo.png" class="logo" />
+          <img src="../_static/tc_logo_c_only.png" class="logo" />
         
         </a>
 
@@ -108,7 +108,7 @@
 <li class="toctree-l2"><a class="reference internal" href="traffic_ops_extensions.html">Managing Traffic Ops Extensions</a></li>
 <li class="toctree-l2"><a class="reference internal" href="traffic_portal.html">Traffic Portal Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="traffic_monitor.html">Traffic Monitor Administration</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="#">Traffic Router Administration</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Traffic Router Administration</a></li>
 <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>
@@ -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>
       
@@ -198,6 +198,7 @@
 <li><a class="reference internal" href="#geolimit-failure-redirect-feature" id="id10">GeoLimit Failure Redirect feature</a></li>
 <li><a class="reference internal" href="#steering-feature" id="id11">Steering feature</a></li>
 <li><a class="reference internal" href="#https-for-http-type-delivery-services" id="id12">HTTPS for Http Type Delivery Services</a></li>
+<li><a class="reference internal" href="#tuning-recommendations" id="id13">Tuning Recommendations</a></li>
 </ul>
 </li>
 </ul>
@@ -222,12 +223,12 @@
 </li>
 <li><p class="first">Enter the Traffic Router server into Traffic Ops, assign it to a Traffic Router profile, and ensure that its status is set to <code class="docutils literal"><span class="pre">ONLINE</span></code>.</p>
 </li>
-<li><p class="first">Ensure the FQDN of the Traffic Monitor is resolvable in DNS. This FQDN must be resolvable by the clients expected to use this CDN.</p>
+<li><p class="first">Ensure the FQDN of the Traffic Router is resolvable in DNS. This FQDN must be resolvable by the clients expected to use this CDN.</p>
 </li>
 <li><p class="first">Install a traffic router: <code class="docutils literal"><span class="pre">sudo</span> <span class="pre">yum</span> <span class="pre">install</span> <span class="pre">traffic_router</span></code>.</p>
 </li>
 <li><dl class="first docutils">
-<dt>Edit <code class="docutils literal"><span class="pre">/opt/traffic_router/conf/traffic_monitor.properties</span></code> and specify the correct online Traffic Monitor(s) for your CDN. See <a class="reference internal" href="#rl-tr-config-files"><span class="std std-ref">Configuration files</span></a></dt>
+<dt>Edit <code class="docutils literal"><span class="pre">/opt/traffic_router/conf/traffic_monitor.properties</span></code> and specify the correct online Traffic Monitor(s) for your CDN. See <a class="reference internal" href="#rl-tr-config-files"><em>Configuration files</em></a></dt>
 <dd><p class="first"># traffic_monitor.properties: url that should normally point to this file
 traffic_monitor.properties=file:/opt/traffic_router/conf/traffic_monitor.properties</p>
 <p class="last"># Frequency for reloading this file
@@ -237,7 +238,7 @@
 </li>
 <li><p class="first">Start Tomcat: <code class="docutils literal"><span class="pre">sudo</span> <span class="pre">service</span> <span class="pre">tomcat</span> <span class="pre">start</span></code>, and test lookups with dig and curl against that server.</p>
 </li>
-<li><p class="first">Snapshot CRConfig; See <a class="reference internal" href="traffic_ops_using.html#rl-snapshot-crconfig"><span class="std std-ref">Snapshot CRConfig</span></a></p>
+<li><p class="first">Snapshot CRConfig; See <a class="reference internal" href="traffic_ops_using.html#rl-snapshot-crconfig"><em>Snapshot CRConfig</em></a></p>
 </li>
 </ol>
 <div class="admonition note">
@@ -258,7 +259,7 @@
 <p class="first admonition-title">Note</p>
 <p class="last">Pre-existing installations having configuration files in <code class="docutils literal"><span class="pre">/opt/traffic_router/conf</span></code> will still be used and honored for Traffic Router 1.5 and onward.</p>
 </div>
-<p>For the most part, the configuration files and parameters that follow are used to get Traffic Router online and communicating with various Traffic Control components. Once Traffic Router is successfully communicating with Traffic Control, configuration is mostly performed in Traffic Ops, and is distributed throughout Traffic Control via the CRConfig snapshot process. See <a class="reference internal" href="traffic_ops_using.html#rl-snapshot-crconfig"><span class="std std-ref">Snapshot CRConfig</span></a> for more information. Please see the parameter documentation for Traffic Router in the Using Traffic Ops guide documented under <a class="reference internal" href="traffic_ops_using.html#rl-ccr-profile"><span class="std std-ref">CCR Profile or Traffic Router Profile</span></a> for parameters that influence the behavior of Traffic Router via the CRConfig.</p>
+<p>For the most part, the configuration files and parameters that follow are used to get Traffic Router online and communicating with various Traffic Control components. Once Traffic Router is successfully communicating with Traffic Control, configuration is mostly performed in Traffic Ops, and is distributed throughout Traffic Control via the CRConfig snapshot process. See <a class="reference internal" href="traffic_ops_using.html#rl-snapshot-crconfig"><em>Snapshot CRConfig</em></a> for more information. Please see the parameter documentation for Traffic Router in the Using Traffic Ops guide documented under <a class="reference internal" href="traffic_ops_using.html#rl-ccr-profile"><em>CCR Profile or Traffic Router Profile</em></a> for parameters that influence the behavior of Traffic Router via the CRConfig.</p>
 <div class="section" id="configuration-files">
 <span id="rl-tr-config-files"></span><h3>Configuration files<a class="headerlink" href="#configuration-files" title="Permalink to this headline">¶</a></h3>
 <table border="1" class="docutils">
@@ -384,7 +385,7 @@
 </div>
 <div class="section" id="operation">
 <h3>Operation<a class="headerlink" href="#operation" title="Permalink to this headline">¶</a></h3>
-<p>Upon startup or a configuration change, Traffic Router obtains keys from the keystore API in Traffic Ops which returns key signing keys (KSK) and zone signing keys (ZSK) for each delivery service that is a subdomain off the CDN&#8217;s top level domain (TLD), in addition to the keys for the CDN TLD itself. Each key has timing information that allows Traffic Router to determine key validity (expiration, inception, and effective dates) in addition to the appropriate TTL to use for the DNSKEY record(s).  All TTLs are configurable parameters; see the <a class="reference internal" href="traffic_ops_using.html#rl-ccr-profile"><span class="std std-ref">CCR Profile or Traffic Router Profile</span></a> documentation for more information.</p>
+<p>Upon startup or a configuration change, Traffic Router obtains keys from the keystore API in Traffic Ops which returns key signing keys (KSK) and zone signing keys (ZSK) for each delivery service that is a subdomain off the CDN&#8217;s top level domain (TLD), in addition to the keys for the CDN TLD itself. Each key has timing information that allows Traffic Router to determine key validity (expiration, inception, and effective dates) in addition to the appropriate TTL to use for the DNSKEY record(s).  All TTLs are configurable parameters; see the <a class="reference internal" href="traffic_ops_using.html#rl-ccr-profile"><em>CCR Profile or Traffic Router Profile</em></a> documentation for more information.</p>
 <p>Once Traffic Router obtains the key data from the API, it converts each public key into the appropriate record types (DNSKEY, DS) to place in zones and uses the private key to sign zones. DNSKEY records are added to each delivery service&#8217;s zone (e.g.: mydeliveryservice.cdn.kabletown.net) for every valid key that exists, in addition to the CDN TLD&#8217;s zone. A DS record is generated from each zone&#8217;s KSK and is placed in the CDN TLD&#8217;s zone (e.g.: cdn.kabletown.net); the DS record for the CDN TLD must be placed in its parent zone, which is not managed by Traffic Control.</p>
 <p>The DNSKEY to DS record relationship allows resolvers to validate signatures across zone delegation points; with Traffic Control, we control all delegation points below the CDN&#8217;s TLD, <strong>however, the DS record for the CDN TLD must be placed in the parent zone (e.g.: kabletown.net), which is not managed by Traffic Control</strong>. As such, the DS record (available in the Traffic Ops DNSSEC administration UI) must be placed in the parent zone prior to enabling DNSSEC, and prior to generating a new CDN KSK. Based on your deployment&#8217;s DNS configuration, this might be a manual process or it might be automated; either way, extreme care and diligence must be taken and knowledge of the management of the upstream zone is imperative for a successful DNSSEC deployment.</p>
 </div>
@@ -409,8 +410,8 @@
 <div class="section" id="sample-message">
 <h3>Sample Message<a class="headerlink" href="#sample-message" title="Permalink to this headline">¶</a></h3>
 <p>Items within brackets below are detailed under the HTTP and DNS sections</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="mf">144140678.000</span> <span class="n">qtype</span><span class="o">=</span><span class="n">DNS</span> <span class="n">chi</span><span class="o">=</span><span class="mf">192.168</span><span class="o">.</span><span class="mf">10.11</span> <span class="n">ttms</span><span class="o">=</span><span class="mi">789</span> <span class="p">[</span><span class="n">Fields</span> <span class="n">Specific</span> <span class="n">to</span> <span class="n">the</span> <span class="n">DNS</span> <span class="n">request</span><span class="p">]</span> <span class="n">rtype</span><span class="o">=</span><span class="n">CZ</span> <span class="n">rloc</span><span class="o">=</span><span class="s2">&quot;40.252611,58.439389&quot;</span> <span class="n">rdtl</span><span class="o">=-</span> <span class="n">rerr</span><span class="o">=</span><span class="s2">&quot;-&quot;</span> <span class="p">[</span><span class="n">Fields</span> <span class="n">Specific</span> <span class="n">to</span> <span class="n">the</span> <span class="n">DNS</span> <span class="n">result</span><span class="p">]</span>
-<span class="mf">144140678.000</span> <span class="n">qtype</span><span class="o">=</span><span class="n">HTTP</span> <span class="n">chi</span><span class="o">=</span><span class="mf">192.168</span><span class="o">.</span><span class="mf">10.11</span> <span class="n">ttms</span><span class="o">=</span><span class="mi">789</span> <span class="p">[</span><span class="n">Fields</span> <span class="n">Specific</span> <span class="n">to</span> <span class="n">the</span> <span class="n">HTTP</span> <span class="n">request</span><span class="p">]</span> <span class="n">rtype</span><span class="o">=</span><span class="n">GEO</span> <span class="n">rloc</span><span class="o">=</span><span class="s2">&quot;40.252611,58.439389&quot;</span> <span class="n">rdtl</span><span class="o">=-</span> <span class="n">rerr</span><span class="o">=</span><span class="s2">&quot;-&quot;</span> <span class="p">[</span><span class="n">Fields</span> <span class="n">Specific</span> <span class="n">to</span> <span class="n">the</span> <span class="n">HTTP</span> <span class="n">result</span><span class="p">]</span>
+<div class="highlight-python"><div class="highlight"><pre>144140678.000 qtype=DNS chi=192.168.10.11 ttms=789 [Fields Specific to the DNS request] rtype=CZ rloc=&quot;40.252611,58.439389&quot; rdtl=- rerr=&quot;-&quot; [Fields Specific to the DNS result]
+144140678.000 qtype=HTTP chi=192.168.10.11 ttms=789 [Fields Specific to the HTTP request] rtype=GEO rloc=&quot;40.252611,58.439389&quot; rdtl=- rerr=&quot;-&quot; [Fields Specific to the HTTP result]
 </pre></div>
 </div>
 <div class="admonition note">
@@ -549,7 +550,7 @@
 <div class="section" id="http-specifics">
 <h3>HTTP Specifics<a class="headerlink" href="#http-specifics" title="Permalink to this headline">¶</a></h3>
 <p>Sample Message</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="mf">1452197640.936</span> <span class="n">qtype</span><span class="o">=</span><span class="n">HTTP</span> <span class="n">chi</span><span class="o">=</span><span class="mf">69.241</span><span class="o">.</span><span class="mf">53.218</span> <span class="n">url</span><span class="o">=</span><span class="s2">&quot;http://ccr.mm-test.jenkins.cdnlab.comcast.net/some/asset.m3u8&quot;</span> <span class="n">cqhm</span><span class="o">=</span><span class="n">GET</span> <span class="n">cqhv</span><span class="o">=</span><span class="n">HTTP</span><span class="o">/</span><span class="mf">1.1</span> <span class="n">rtype</span><span class="o">=</span><span class="n">GEO</span> <span class="n">rloc</span><span class="o">=</span><span class="s2">&quot;40.252611,58.439389&quot;</span> <span class="n">rdtl</span><span class="o">=-</span> <span class="n">rerr</span><span class="o">=</span><span class="s2">&quot;-&quot;</span> <span class="n">pssc</span><span class="o">=</span><span class="mi">302</span> <span class="n">ttms</span><span class="o">=</span><span class="mi">0</span> <span class="n">rurl</span><span class="o">=</span><span class="s2">&quot;http://odol-atsec-sim-114.mm-test.jenkins.cdnlab.comcast.net:8090/some/asset.m3u8&quot;</span> <span class="n">rh</span><span class="o">=</span><span class="s2">&quot;Accept: */*&quot;</span> <span class="n">rh</span><span class="o">=</span><span class="s2">&quot;myheader: asdasdasdasfasg&quot;</span>
+<div class="highlight-python"><div class="highlight"><pre>1452197640.936 qtype=HTTP chi=69.241.53.218 url=&quot;http://ccr.mm-test.jenkins.cdnlab.comcast.net/some/asset.m3u8&quot; cqhm=GET cqhv=HTTP/1.1 rtype=GEO rloc=&quot;40.252611,58.439389&quot; rdtl=- rerr=&quot;-&quot; pssc=302 ttms=0 rurl=&quot;http://odol-atsec-sim-114.mm-test.jenkins.cdnlab.comcast.net:8090/some/asset.m3u8&quot; rh=&quot;Accept: */*&quot; rh=&quot;myheader: asdasdasdasfasg&quot;
 </pre></div>
 </div>
 <p><strong>Request Fields</strong></p>
@@ -609,7 +610,7 @@
 <div class="section" id="dns-specifics">
 <h3>DNS Specifics<a class="headerlink" href="#dns-specifics" title="Permalink to this headline">¶</a></h3>
 <p>Sample Message</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="mf">144140678.000</span> <span class="n">qtype</span><span class="o">=</span><span class="n">DNS</span> <span class="n">chi</span><span class="o">=</span><span class="mf">192.168</span><span class="o">.</span><span class="mf">10.11</span> <span class="n">ttms</span><span class="o">=</span><span class="mi">123</span> <span class="n">xn</span><span class="o">=</span><span class="mi">65535</span> <span class="n">fqdn</span><span class="o">=</span><span class="n">www</span><span class="o">.</span><span class="n">example</span><span class="o">.</span><span class="n">com</span><span class="o">.</span> <span class="nb">type</span><span class="o">=</span><span class="n">A</span> <span class="n">class</span><span class="o">=</span><span class="n">IN</span> <span class="n">ttl</span><span class="o">=</span><span class="mi">12345</span> <span class="n">rcode</span><span class="o">=</span><span class="n">NOERROR</span> <span class="n">rtype</span><span class="o">=</span><span class="n">CZ</span> <span class="n">rloc</span><span class="o">=</span><span class="s2">&quot;40.252611,58.439389&quot;</span> <span class="n">rdtl</span><span class="o">=-</span> <span class="n">rerr</span><span class="o">=</span><span class="s2">&quot;-&quot;</span> <span class="n">ans</span><span class="o">=</span><span class="s2">&quot;192.168.1.2 192.168.3.4 0:0:0:0:0:ffff:c0a8:102 0:0:0:0:0:ffff:c0a8:304&quot;</span>
+<div class="highlight-python"><div class="highlight"><pre>144140678.000 qtype=DNS chi=192.168.10.11 ttms=123 xn=65535 fqdn=www.example.com. type=A class=IN ttl=12345 rcode=NOERROR rtype=CZ rloc=&quot;40.252611,58.439389&quot; rdtl=- rerr=&quot;-&quot; ans=&quot;192.168.1.2 192.168.3.4 0:0:0:0:0:ffff:c0a8:102 0:0:0:0:0:ffff:c0a8:304&quot;
 </pre></div>
 </div>
 <p><strong>Request Fields</strong></p>
@@ -844,6 +845,25 @@
 <p>While it is running it is suggested that you monitor your Traffic Router nodes for memory and CPU utilization.</p>
 </div>
 </div>
+<div class="section" id="tuning-recommendations">
+<h2><a class="toc-backref" href="#contents">Tuning Recommendations</a><a class="headerlink" href="#tuning-recommendations" title="Permalink to this headline">¶</a></h2>
+<p>The following is an example of /opt/tomcat/bin/setenv.sh that has been tested on a multi core server running under HTTPS load test requests.
+This is following the general recommendation to use the G1 garbage collector for JVM applications running on multi core machines.
+In addition to using the G1 garbage collector the InitiatingHeapOccupancyPercent was lowered to run garbage collection more frequently which
+improved overall throughput for Traffic Router and reduced &#8216;Stop the World&#8217; garbage collection. Note that setting the min and max heap settings
+in setenv.sh will override init scripts in /etc/init.d/tomcat.</p>
+<blockquote>
+<div><p>/opt/tomcat/bin/setenv.sh:</p>
+<div class="highlight-python"><div class="highlight"><pre>#! /bin/sh
+export CATALINA_OPTS=&quot;$CATALINA_OPTS -server&quot;
+export CATALINA_OPTS=&quot;$CATALINA_OPTS -Xms2g -Xmx2g&quot;
+export CATALINA_OPTS=&quot;$CATALINA_OPTS -XX:+UseG1GC&quot;
+export CATALINA_OPTS=&quot;$CATALINA_OPTS -XX:+UnlockExperimentalVMOptions&quot;
+export CATALINA_OPTS=&quot;$CATALINA_OPTS -XX:InitiatingHeapOccupancyPercent=30&quot;
+</pre></div>
+</div>
+</div></blockquote>
+</div>
 </div>
 
 
@@ -884,7 +904,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../',
-            VERSION:'1.7',
+            VERSION:'master',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/latest/admin/traffic_server.html b/docs/latest/admin/traffic_server.html
index 490abfe..1248ea4 100644
--- a/docs/latest/admin/traffic_server.html
+++ b/docs/latest/admin/traffic_server.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Traffic Server Administration &mdash; Traffic Control 1.7 documentation </title>
+  <title>Traffic Server Administration &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’s Guide" href="index.html"/>
         <link rel="next" title="Traffic Vault Administration" href="traffic_vault.html"/>
         <link rel="prev" title="Traffic Stats Administration" href="traffic_stats.html"/> 
@@ -58,7 +58,7 @@
 
         
           
-          <img src="../_static/tc_logo.png" class="logo" />
+          <img src="../_static/tc_logo_c_only.png" class="logo" />
         
         </a>
 
@@ -110,7 +110,7 @@
 <li class="toctree-l2"><a class="reference internal" href="traffic_monitor.html">Traffic Monitor Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="traffic_router.html">Traffic Router Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="traffic_stats.html">Traffic Stats Administration</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="#">Traffic Server Administration</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">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"><a class="reference internal" href="quick_howto/index.html">Quick How To Guides</a></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>
       
@@ -202,7 +202,7 @@
 <dl class="docutils">
 <dt><strong>traffic_ops_ort.pl</strong></dt>
 <dd><p class="first">The traffic_ops_ort.pl should be installed on all caches (by puppet or other non Traffic Ops means), usually in /opt/ort. It is used to do initial install of the config files when the cache is being deployed, and to keep the config files up to date when the cache is already in service.  The usage message of the script is shown below:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span>$ sudo ./traffic_ops_ort.pl syncds warn https://to.cdn.kabletown.net
+<div class="highlight-python"><div class="highlight"><pre>$ sudo ./traffic_ops_ort.pl syncds warn https://to.cdn.kabletown.net
 Thu May 26 15:52:11 UTC 2016
 ====-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-====
 Usage: ./traffic_ops_ort.pl &lt;Mode&gt; &lt;Log_Level&gt; &lt;Traffic_Ops_URL&gt; &lt;Traffic_Ops_Login&gt; [optional flags]
@@ -226,11 +226,11 @@
 </pre></div>
 </div>
 <p>For initial configuration or when major changes (like a Profile change) need to be made, run the script in &#8220;badass mode&#8221;. All required rpm packages will be installed, all Traffic Server config files will be fetched and installed, and (if needed) the Traffic Server application will be restarted.  Example run below:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">run</span> <span class="n">here</span>
+<div class="highlight-python"><div class="highlight"><pre>run here
 </pre></div>
 </div>
 <p>For &#8220;every day changes&#8221; such as adding deliveryservices or changing records.config parameters caches should run the script in &#8220;syncds&#8221; mode out of cron. Example crontab entry:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="o">*/</span><span class="mi">15</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">ort</span><span class="o">/</span><span class="n">traffic_ops_ort</span><span class="o">.</span><span class="n">pl</span> <span class="n">syncds</span> <span class="n">warn</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">traffops</span><span class="o">.</span><span class="n">kabletown</span><span class="o">.</span><span class="n">net</span> <span class="n">admin</span><span class="p">:</span><span class="n">password</span> <span class="o">&gt;</span> <span class="o">/</span><span class="n">tmp</span><span class="o">/</span><span class="n">ort</span><span class="o">/</span><span class="n">syncds</span><span class="o">.</span><span class="n">log</span> <span class="mi">2</span><span class="o">&gt;&amp;</span><span class="mi">1</span>
+<div class="highlight-python"><div class="highlight"><pre>*/15 * * * * /opt/ort/traffic_ops_ort.pl syncds warn https://traffops.kabletown.net admin:password &gt; /tmp/ort/syncds.log 2&gt;&amp;1
 </pre></div>
 </div>
 <div class="last admonition note">
@@ -280,7 +280,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../',
-            VERSION:'1.7',
+            VERSION:'master',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/latest/admin/traffic_stats.html b/docs/latest/admin/traffic_stats.html
index a70274a..e6120bf 100644
--- a/docs/latest/admin/traffic_stats.html
+++ b/docs/latest/admin/traffic_stats.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Traffic Stats Administration &mdash; Traffic Control 1.7 documentation </title>
+  <title>Traffic Stats Administration &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’s Guide" href="index.html"/>
         <link rel="next" title="Traffic Server Administration" href="traffic_server.html"/>
         <link rel="prev" title="Traffic Router Administration" href="traffic_router.html"/> 
@@ -58,7 +58,7 @@
 
         
           
-          <img src="../_static/tc_logo.png" class="logo" />
+          <img src="../_static/tc_logo_c_only.png" class="logo" />
         
         </a>
 
@@ -109,7 +109,7 @@
 <li class="toctree-l2"><a class="reference internal" href="traffic_portal.html">Traffic Portal Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="traffic_monitor.html">Traffic Monitor Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="traffic_router.html">Traffic Router Administration</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="#">Traffic Stats Administration</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">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"><a class="reference internal" href="quick_howto/index.html">Quick How To Guides</a></li>
@@ -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>
       
@@ -192,7 +192,7 @@
 <p><strong>Installing Traffic Stats:</strong></p>
 <blockquote>
 <div><ul class="simple">
-<li>Download the Traffic Stats RPM from the traffic control <a class="reference external" href="http://traffic-control-cdn.net/downloads/index.html">downloads</a> page.</li>
+<li>Download the Traffic Stats RPM from the traffic control <a class="reference external" href="https://trafficcontrol.apache.org/downloads/index.html">downloads</a> page.</li>
 <li>Copy the Traffic Stats RPM to your server</li>
 <li>sudo rpm -ivh &lt;traffic_stats rpm&gt;</li>
 </ul>
@@ -267,7 +267,7 @@
 </ul>
 </div></blockquote>
 <p>In order for Traffic Ops users to see Grafana graphs, Grafana will need to allow anonymous access.  Information on how to configure anonymous access can be found on the configuration page of the <a class="reference external" href="http://docs.grafana.org/installation/configuration/#authanonymous">Grafana Website</a>.</p>
-<p>Traffic Ops uses custom dashboards to display information about individual delivery services or cache groups.  In order for the custom graphs to display correctly, the <a class="reference external" href="https://github.com/Comcast/traffic_control/blob/master/traffic_stats/grafana/">traffic_ops_*.js</a> files need to be in the <code class="docutils literal"><span class="pre">/usr/share/grafana/public/dashboards/</span></code> directory on the grafana server.  If your Grafana server is the same as your Traffic Stats server the RPM install process will take care of putting the files in place.  If your grafana server is different from your Traffic Stats server, you will need to manually copy the files to the correct directory.</p>
+<p>Traffic Ops uses custom dashboards to display information about individual delivery services or cache groups.  In order for the custom graphs to display correctly, the <a class="reference external" href="https://github.com/apache/incubator-trafficcontrol/blob/master/traffic_stats/grafana/">traffic_ops_*.js</a> files need to be in the <code class="docutils literal"><span class="pre">/usr/share/grafana/public/dashboards/</span></code> directory on the grafana server.  If your Grafana server is the same as your Traffic Stats server the RPM install process will take care of putting the files in place.  If your grafana server is different from your Traffic Stats server, you will need to manually copy the files to the correct directory.</p>
 <p>More information on custom scripted graphs can be found in the <a class="reference external" href="http://docs.grafana.org/reference/scripting/">scripted dashboards</a> section of the Grafana documentation.</p>
 </div></blockquote>
 <p><strong>Configuring Traffic Ops for Traffic Stats:</strong></p>
@@ -320,8 +320,8 @@
 </table>
 </div></blockquote>
 </div>
-<div class="section" id="id2">
-<h2>InfluxDb Tools<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="id1">
+<h2>InfluxDb Tools<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h2>
 <p>Under the Traffic Stats source directory there is a directory called influxdb_tools.  These tools are meant to be used as one-off scripts to help a user quickly get new databases and continuous queries setup in influxdb.
 They are specific for traffic stats and are not meant to be generic to influxdb.  Below is an brief description of each script along with how to use it.</p>
 <dl class="docutils">
@@ -350,7 +350,7 @@
 <li><dl class="first docutils">
 <dt>optional flags:</dt>
 <dd><ul class="first last simple">
-<li>influxUrl -  The influxdb url and port</li>
+<li>url -  The influxdb url and port</li>
 <li>replication -  The number of nodes in the cluster</li>
 <li>user - The user to use</li>
 <li>password - The password to use</li>
@@ -358,7 +358,7 @@
 </dd>
 </dl>
 </li>
-<li><p class="first">example: ./create_ts_databases -influxUrl=localhost:8086 -replication=3 -user=joe -password=mysecret</p>
+<li><p class="first">example: ./create_ts_databases -url=localhost:8086 -replication=3 -user=joe -password=mysecret</p>
 </li>
 </ul>
 </dd>
@@ -462,7 +462,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../',
-            VERSION:'1.7',
+            VERSION:'master',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/latest/admin/traffic_vault.html b/docs/latest/admin/traffic_vault.html
index c86266b..77048d1 100644
--- a/docs/latest/admin/traffic_vault.html
+++ b/docs/latest/admin/traffic_vault.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Traffic Vault Administration &mdash; Traffic Control 1.7 documentation </title>
+  <title>Traffic Vault Administration &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’s Guide" href="index.html"/>
         <link rel="next" title="Quick How To Guides" href="quick_howto/index.html"/>
         <link rel="prev" title="Traffic Server Administration" href="traffic_server.html"/> 
@@ -58,7 +58,7 @@
 
         
           
-          <img src="../_static/tc_logo.png" class="logo" />
+          <img src="../_static/tc_logo_c_only.png" class="logo" />
         
         </a>
 
@@ -111,7 +111,7 @@
 <li class="toctree-l2"><a class="reference internal" href="traffic_router.html">Traffic Router Administration</a></li>
 <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 current"><a class="current reference internal" href="#">Traffic Vault Administration</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Traffic Vault Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" href="quick_howto/index.html">Quick How To Guides</a></li>
 </ul>
 </li>
@@ -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>
       
@@ -406,7 +406,7 @@
 <li><dl class="first docutils">
 <dt>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.</dt>
 <dd><ul class="first last simple">
-<li>Get the schema file by either cloning the project and going to <cite>traffic_ops/app/config/misc/riak_search</cite> or from <a class="reference external" href="https://github.com/Comcast/traffic_control/tree/master/traffic_ops/app/conf/misc/riak_search">github</a>.</li>
+<li>Get the schema file by either cloning the project and going to <cite>traffic_ops/app/config/misc/riak_search</cite> or from <a class="reference external" href="https://github.com/apache/incubator-trafficcontrol/tree/master/traffic_ops/app/conf/misc/riak_search">github</a>.</li>
 <li>Use curl to add the schema to riak: <code class="docutils literal"><span class="pre">curl</span> <span class="pre">-kvs</span> <span class="pre">-XPUT</span> <span class="pre">&quot;https://admin:pass&#64;riakserver:8088/search/schema/sslkeys&quot;</span> <span class="pre">-H</span> <span class="pre">'Content-Type:application/xml'</span>&nbsp; <span class="pre">-d</span> <span class="pre">&#64;sslkeys.xml</span></code></li>
 </ul>
 </dd>
@@ -431,7 +431,7 @@
 </ol>
 <p>Riak Search (using Apache Solr) will now index all NEW records that are added to the &#8220;ssl&#8221; 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.</p>
 <ol class="arabic simple">
-<li>Get script from github either by cloning the project and going to <cite>traffic_ops/app/script</cite> or from <a class="reference external" href="https://github.com/Comcast/traffic_control/blob/master/traffic_ops/app/script/update_riak_for_search.pl">here</a></li>
+<li>Get script from github either by cloning the project and going to <cite>traffic_ops/app/script</cite> or from <a class="reference external" href="https://github.com/apache/incubator-trafficcontrol/blob/master/traffic_ops/app/script/update_riak_for_search.pl">here</a></li>
 <li>Run the script by performing the following command <code class="docutils literal"><span class="pre">./update_riak_for_search.pl</span> <span class="pre">-to_url=https://traffic-ops.kabletown.net</span> <span class="pre">-to_un=user</span> <span class="pre">-to_pw=password</span></code></li>
 </ol>
 <p>Validate the search is working by querying against Riak directly:
@@ -480,7 +480,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../',
-            VERSION:'1.7',
+            VERSION:'master',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/latest/basics/cache_revalidation.html b/docs/latest/basics/cache_revalidation.html
index 84b7f54..7015042 100644
--- a/docs/latest/basics/cache_revalidation.html
+++ b/docs/latest/basics/cache_revalidation.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Cache Control Headers and Revalidation &mdash; Traffic Control 1.7 documentation </title>
+  <title>Cache Control Headers and Revalidation &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="CDN Basics" href="index.html"/>
         <link rel="next" title="Traffic Control Overview" href="../overview/index.html"/>
         <link rel="prev" title="Caching Proxies" href="caching_proxies.html"/> 
@@ -58,7 +58,7 @@
 
         
           
-          <img src="../_static/tc_logo.png" class="logo" />
+          <img src="../_static/tc_logo_c_only.png" class="logo" />
         
         </a>
 
@@ -83,7 +83,7 @@
 <li class="toctree-l2"><a class="reference internal" href="content_delivery_networks.html">Content Delivery Networks</a></li>
 <li class="toctree-l2"><a class="reference internal" href="http_11.html">HTTP 1.1</a></li>
 <li class="toctree-l2"><a class="reference internal" href="caching_proxies.html">Caching Proxies</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="#">Cache Control Headers and Revalidation</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Cache Control Headers and Revalidation</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">CDN Basics</a> &raquo;</li>
       
@@ -187,49 +187,49 @@
   <div class="section" id="cache-control-headers-and-revalidation">
 <span id="index-0"></span><h1>Cache Control Headers and Revalidation<a class="headerlink" href="#cache-control-headers-and-revalidation" title="Permalink to this headline">¶</a></h1>
 <p>The <a class="reference external" href="https://www.ietf.org/rfc/rfc2616.txt">HTTP/1.1 spec</a> 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:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">HTTP</span><span class="o">/</span><span class="mf">1.1</span> <span class="mi">200</span> <span class="n">OK</span>
-<span class="n">Date</span><span class="p">:</span> <span class="n">Sun</span><span class="p">,</span> <span class="mi">14</span> <span class="n">Dec</span> <span class="mi">2014</span> <span class="mi">23</span><span class="p">:</span><span class="mi">22</span><span class="p">:</span><span class="mi">44</span> <span class="n">GMT</span>
-<span class="n">Server</span><span class="p">:</span> <span class="n">Apache</span><span class="o">/</span><span class="mf">2.2</span><span class="o">.</span><span class="mi">15</span> <span class="p">(</span><span class="n">Red</span> <span class="n">Hat</span><span class="p">)</span>
-<span class="n">Last</span><span class="o">-</span><span class="n">Modified</span><span class="p">:</span> <span class="n">Sun</span><span class="p">,</span> <span class="mi">14</span> <span class="n">Dec</span> <span class="mi">2014</span> <span class="mi">23</span><span class="p">:</span><span class="mi">18</span><span class="p">:</span><span class="mi">51</span> <span class="n">GMT</span>
-<span class="n">ETag</span><span class="p">:</span> <span class="s2">&quot;1aa008f-2d-50a3559482cc0&quot;</span>
-<span class="n">Cache</span><span class="o">-</span><span class="n">Control</span><span class="p">:</span> <span class="nb">max</span><span class="o">-</span><span class="n">age</span><span class="o">=</span><span class="mi">86400</span>
-<span class="n">Content</span><span class="o">-</span><span class="n">Length</span><span class="p">:</span> <span class="mi">45</span>
-<span class="n">Connection</span><span class="p">:</span> <span class="n">close</span>
-<span class="n">Content</span><span class="o">-</span><span class="n">Type</span><span class="p">:</span> <span class="n">text</span><span class="o">/</span><span class="n">html</span><span class="p">;</span> <span class="n">charset</span><span class="o">=</span><span class="n">UTF</span><span class="o">-</span><span class="mi">8</span>
+<div class="highlight-python"><div class="highlight"><pre>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: &quot;1aa008f-2d-50a3559482cc0&quot;
+Cache-Control: max-age=86400
+Content-Length: 45
+Connection: close
+Content-Type: text/html; charset=UTF-8
 
-<span class="o">&lt;</span><span class="n">html</span><span class="o">&gt;&lt;</span><span class="n">body</span><span class="o">&gt;</span><span class="n">This</span> <span class="ow">is</span> <span class="n">a</span> <span class="n">fun</span> <span class="n">file</span><span class="o">&lt;/</span><span class="n">body</span><span class="o">&gt;&lt;/</span><span class="n">html</span><span class="o">&gt;</span>
+&lt;html&gt;&lt;body&gt;This is a fun file&lt;/body&gt;&lt;/html&gt;
 </pre></div>
 </div>
 <p>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 <code class="docutils literal"><span class="pre">Expires:</span></code> header, explicitly telling the cache the time this response is to be expired. When a response is expired it usually doesn&#8217;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 <em>revalidates</em> 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 <code class="docutils literal"><span class="pre">200</span> <span class="pre">OK</span></code> response, with the new data. If it has not changed, the origin server will send back a <code class="docutils literal"><span class="pre">304</span> <span class="pre">Not</span> <span class="pre">Modified</span></code> 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 <code class="docutils literal"><span class="pre">If-Not-Modified-Since:</span></code> header, or an <code class="docutils literal"><span class="pre">If-None-Match:</span></code> header.  For example, in the <code class="docutils literal"><span class="pre">If-None-Match:</span></code> case, the origin will send and <code class="docutils literal"><span class="pre">ETag</span></code> header that uniquely identifies the response. The client can use that in an revalidation request like:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">GET</span> <span class="o">/</span><span class="n">foo</span><span class="o">/</span><span class="n">bar</span><span class="o">/</span><span class="n">fun</span><span class="o">.</span><span class="n">html</span> <span class="n">HTTP</span><span class="o">/</span><span class="mf">1.1</span>
-<span class="n">If</span><span class="o">-</span><span class="kc">None</span><span class="o">-</span><span class="n">Match</span><span class="p">:</span> <span class="s2">&quot;1aa008f-2d-50a3559482cc0&quot;</span>
-<span class="n">Host</span><span class="p">:</span> <span class="n">www</span><span class="o">.</span><span class="n">origin</span><span class="o">.</span><span class="n">com</span>
+<div class="highlight-python"><div class="highlight"><pre>GET /foo/bar/fun.html HTTP/1.1
+If-None-Match: &quot;1aa008f-2d-50a3559482cc0&quot;
+Host: www.origin.com
 </pre></div>
 </div>
 <p>If the content has changed (meaning, the new response would not have had the same ETag) it will respond with <code class="docutils literal"><span class="pre">200</span> <span class="pre">OK</span></code>, like:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">HTTP</span><span class="o">/</span><span class="mf">1.1</span> <span class="mi">200</span> <span class="n">OK</span>
-<span class="n">Date</span><span class="p">:</span> <span class="n">Sun</span><span class="p">,</span> <span class="mi">18</span> <span class="n">Dec</span> <span class="mi">2014</span> <span class="mi">3</span><span class="p">:</span><span class="mi">22</span><span class="p">:</span><span class="mi">44</span> <span class="n">GMT</span>
-<span class="n">Server</span><span class="p">:</span> <span class="n">Apache</span><span class="o">/</span><span class="mf">2.2</span><span class="o">.</span><span class="mi">15</span> <span class="p">(</span><span class="n">Red</span> <span class="n">Hat</span><span class="p">)</span>
-<span class="n">Last</span><span class="o">-</span><span class="n">Modified</span><span class="p">:</span> <span class="n">Sun</span><span class="p">,</span> <span class="mi">14</span> <span class="n">Dec</span> <span class="mi">2014</span> <span class="mi">23</span><span class="p">:</span><span class="mi">18</span><span class="p">:</span><span class="mi">51</span> <span class="n">GMT</span>
-<span class="n">ETag</span><span class="p">:</span> <span class="s2">&quot;1aa008f-2d-50aa00feadd&quot;</span>
-<span class="n">Cache</span><span class="o">-</span><span class="n">Control</span><span class="p">:</span> <span class="nb">max</span><span class="o">-</span><span class="n">age</span><span class="o">=</span><span class="mi">604800</span>
-<span class="n">Content</span><span class="o">-</span><span class="n">Length</span><span class="p">:</span> <span class="mi">49</span>
-<span class="n">Connection</span><span class="p">:</span> <span class="n">close</span>
-<span class="n">Content</span><span class="o">-</span><span class="n">Type</span><span class="p">:</span> <span class="n">text</span><span class="o">/</span><span class="n">html</span><span class="p">;</span> <span class="n">charset</span><span class="o">=</span><span class="n">UTF</span><span class="o">-</span><span class="mi">8</span>
+<div class="highlight-python"><div class="highlight"><pre>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: &quot;1aa008f-2d-50aa00feadd&quot;
+Cache-Control: max-age=604800
+Content-Length: 49
+Connection: close
+Content-Type: text/html; charset=UTF-8
 
-<span class="o">&lt;</span><span class="n">html</span><span class="o">&gt;&lt;</span><span class="n">body</span><span class="o">&gt;</span><span class="n">This</span> <span class="ow">is</span> <span class="n">NOT</span> <span class="n">a</span> <span class="n">fun</span> <span class="n">file</span><span class="o">&lt;/</span><span class="n">body</span><span class="o">&gt;&lt;/</span><span class="n">html</span><span class="o">&gt;</span>
+&lt;html&gt;&lt;body&gt;This is NOT a fun file&lt;/body&gt;&lt;/html&gt;
 </pre></div>
 </div>
 <p>If the Content did not change (meaning, the response would have had the same ETag) it will respond with <code class="docutils literal"><span class="pre">304</span> <span class="pre">Not</span> <span class="pre">Modified</span></code>, like:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="mi">304</span> <span class="n">Not</span> <span class="n">Modified</span>
-<span class="n">Date</span><span class="p">:</span> <span class="n">Sun</span><span class="p">,</span> <span class="mi">18</span> <span class="n">Dec</span> <span class="mi">2014</span> <span class="mi">3</span><span class="p">:</span><span class="mi">22</span><span class="p">:</span><span class="mi">44</span> <span class="n">GMT</span>
-<span class="n">Server</span><span class="p">:</span> <span class="n">Apache</span><span class="o">/</span><span class="mf">2.2</span><span class="o">.</span><span class="mi">15</span> <span class="p">(</span><span class="n">Red</span> <span class="n">Hat</span><span class="p">)</span>
-<span class="n">Last</span><span class="o">-</span><span class="n">Modified</span><span class="p">:</span> <span class="n">Sun</span><span class="p">,</span> <span class="mi">14</span> <span class="n">Dec</span> <span class="mi">2014</span> <span class="mi">23</span><span class="p">:</span><span class="mi">18</span><span class="p">:</span><span class="mi">51</span> <span class="n">GMT</span>
-<span class="n">ETag</span><span class="p">:</span> <span class="s2">&quot;1aa008f-2d-50a3559482cc0&quot;</span>
-<span class="n">Cache</span><span class="o">-</span><span class="n">Control</span><span class="p">:</span> <span class="nb">max</span><span class="o">-</span><span class="n">age</span><span class="o">=</span><span class="mi">604800</span>
-<span class="n">Content</span><span class="o">-</span><span class="n">Length</span><span class="p">:</span> <span class="mi">45</span>
-<span class="n">Connection</span><span class="p">:</span> <span class="n">close</span>
-<span class="n">Content</span><span class="o">-</span><span class="n">Type</span><span class="p">:</span> <span class="n">text</span><span class="o">/</span><span class="n">html</span><span class="p">;</span> <span class="n">charset</span><span class="o">=</span><span class="n">UTF</span><span class="o">-</span><span class="mi">8</span>
+<div class="highlight-python"><div class="highlight"><pre>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: &quot;1aa008f-2d-50a3559482cc0&quot;
+Cache-Control: max-age=604800
+Content-Length: 45
+Connection: close
+Content-Type: text/html; charset=UTF-8
 </pre></div>
 </div>
 <p>Note that the 304 response only has headers, not the data.</p>
@@ -273,7 +273,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../',
-            VERSION:'1.7',
+            VERSION:'master',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/latest/basics/caching_proxies.html b/docs/latest/basics/caching_proxies.html
index f544c4d..2e50bca 100644
--- a/docs/latest/basics/caching_proxies.html
+++ b/docs/latest/basics/caching_proxies.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Caching Proxies &mdash; Traffic Control 1.7 documentation </title>
+  <title>Caching Proxies &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="CDN Basics" href="index.html"/>
         <link rel="next" title="Cache Control Headers and Revalidation" href="cache_revalidation.html"/>
         <link rel="prev" title="HTTP 1.1" href="http_11.html"/> 
@@ -58,7 +58,7 @@
 
         
           
-          <img src="../_static/tc_logo.png" class="logo" />
+          <img src="../_static/tc_logo_c_only.png" class="logo" />
         
         </a>
 
@@ -82,7 +82,7 @@
 <li class="toctree-l1 current"><a class="reference internal" href="index.html">CDN Basics</a><ul class="current">
 <li class="toctree-l2"><a class="reference internal" href="content_delivery_networks.html">Content Delivery Networks</a></li>
 <li class="toctree-l2"><a class="reference internal" href="http_11.html">HTTP 1.1</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="#">Caching Proxies</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Caching Proxies</a></li>
 <li class="toctree-l2"><a class="reference internal" href="cache_revalidation.html">Cache Control Headers and Revalidation</a></li>
 </ul>
 </li>
@@ -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">CDN Basics</a> &raquo;</li>
       
@@ -222,16 +222,16 @@
 <p class="first admonition-title">Note</p>
 <p class="last">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.</p>
 </div>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">HTTP</span><span class="o">/</span><span class="mf">1.1</span> <span class="mi">200</span> <span class="n">OK</span>
-<span class="n">Date</span><span class="p">:</span> <span class="n">Sun</span><span class="p">,</span> <span class="mi">14</span> <span class="n">Dec</span> <span class="mi">2014</span> <span class="mi">23</span><span class="p">:</span><span class="mi">22</span><span class="p">:</span><span class="mi">44</span> <span class="n">GMT</span>
-<span class="n">Server</span><span class="p">:</span> <span class="n">Apache</span><span class="o">/</span><span class="mf">2.2</span><span class="o">.</span><span class="mi">15</span> <span class="p">(</span><span class="n">Red</span> <span class="n">Hat</span><span class="p">)</span>
-<span class="n">Last</span><span class="o">-</span><span class="n">Modified</span><span class="p">:</span> <span class="n">Sun</span><span class="p">,</span> <span class="mi">14</span> <span class="n">Dec</span> <span class="mi">2014</span> <span class="mi">23</span><span class="p">:</span><span class="mi">18</span><span class="p">:</span><span class="mi">51</span> <span class="n">GMT</span>
-<span class="n">ETag</span><span class="p">:</span> <span class="s2">&quot;1aa008f-2d-50a3559482cc0&quot;</span>
-<span class="n">Content</span><span class="o">-</span><span class="n">Length</span><span class="p">:</span> <span class="mi">45</span>
-<span class="n">Connection</span><span class="p">:</span> <span class="n">close</span>
-<span class="n">Content</span><span class="o">-</span><span class="n">Type</span><span class="p">:</span> <span class="n">text</span><span class="o">/</span><span class="n">html</span><span class="p">;</span> <span class="n">charset</span><span class="o">=</span><span class="n">UTF</span><span class="o">-</span><span class="mi">8</span>
+<div class="highlight-python"><div class="highlight"><pre>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: &quot;1aa008f-2d-50a3559482cc0&quot;
+Content-Length: 45
+Connection: close
+Content-Type: text/html; charset=UTF-8
 
-<span class="o">&lt;</span><span class="n">html</span><span class="o">&gt;&lt;</span><span class="n">body</span><span class="o">&gt;</span><span class="n">This</span> <span class="ow">is</span> <span class="n">a</span> <span class="n">fun</span> <span class="n">file</span><span class="o">&lt;/</span><span class="n">body</span><span class="o">&gt;&lt;/</span><span class="n">html</span><span class="o">&gt;</span>
+&lt;html&gt;&lt;body&gt;This is a fun file&lt;/body&gt;&lt;/html&gt;
 </pre></div>
 </div>
 <p>The client is given the URL <code class="docutils literal"><span class="pre">http://www-origin-cache.cdn.com/foo/bar/fun.html</span></code> (note the different hostname) and when attempting to obtain that URL, the following occurs:</p>
@@ -241,8 +241,8 @@
 <li><p class="first">Similar to the previous case, the LDNS server resolves the name <code class="docutils literal"><span class="pre">www-origin-cache.cdn.com</span></code> to an IPv4 address, in this example, this address is 55.44.33.22.</p>
 </li>
 <li><p class="first">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:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">GET</span> <span class="o">/</span><span class="n">foo</span><span class="o">/</span><span class="n">bar</span><span class="o">/</span><span class="n">fun</span><span class="o">.</span><span class="n">html</span> <span class="n">HTTP</span><span class="o">/</span><span class="mf">1.1</span>
-<span class="n">Host</span><span class="p">:</span> <span class="n">www</span><span class="o">-</span><span class="n">origin</span><span class="o">-</span><span class="n">cache</span><span class="o">.</span><span class="n">cdn</span><span class="o">.</span><span class="n">com</span>
+<div class="highlight-python"><div class="highlight"><pre>GET /foo/bar/fun.html HTTP/1.1
+Host: www-origin-cache.cdn.com
 </pre></div>
 </div>
 </li>
@@ -255,38 +255,38 @@
 <blockquote>
 <div><ol class="arabic">
 <li><p class="first">The proxy uses DNS to get the IPv4 address for <code class="docutils literal"><span class="pre">www.origin.com</span></code>, connect to it on port 80, and sends:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">GET</span> <span class="o">/</span><span class="n">foo</span><span class="o">/</span><span class="n">bar</span><span class="o">/</span><span class="n">fun</span><span class="o">.</span><span class="n">html</span> <span class="n">HTTP</span><span class="o">/</span><span class="mf">1.1</span>
-<span class="n">Host</span><span class="p">:</span> <span class="n">www</span><span class="o">.</span><span class="n">origin</span><span class="o">.</span><span class="n">com</span>
+<div class="highlight-python"><div class="highlight"><pre>GET /foo/bar/fun.html HTTP/1.1
+Host: www.origin.com
 </pre></div>
 </div>
 </li>
 <li><p class="first">The origin server responds with the headers and content as shown:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">HTTP</span><span class="o">/</span><span class="mf">1.1</span> <span class="mi">200</span> <span class="n">OK</span>
-<span class="n">Date</span><span class="p">:</span> <span class="n">Sun</span><span class="p">,</span> <span class="mi">14</span> <span class="n">Dec</span> <span class="mi">2014</span> <span class="mi">23</span><span class="p">:</span><span class="mi">22</span><span class="p">:</span><span class="mi">44</span> <span class="n">GMT</span>
-<span class="n">Server</span><span class="p">:</span> <span class="n">Apache</span><span class="o">/</span><span class="mf">2.2</span><span class="o">.</span><span class="mi">15</span> <span class="p">(</span><span class="n">Red</span> <span class="n">Hat</span><span class="p">)</span>
-<span class="n">Last</span><span class="o">-</span><span class="n">Modified</span><span class="p">:</span> <span class="n">Sun</span><span class="p">,</span> <span class="mi">14</span> <span class="n">Dec</span> <span class="mi">2014</span> <span class="mi">23</span><span class="p">:</span><span class="mi">18</span><span class="p">:</span><span class="mi">51</span> <span class="n">GMT</span>
-<span class="n">ETag</span><span class="p">:</span> <span class="s2">&quot;1aa008f-2d-50a3559482cc0&quot;</span>
-<span class="n">Content</span><span class="o">-</span><span class="n">Length</span><span class="p">:</span> <span class="mi">45</span>
-<span class="n">Connection</span><span class="p">:</span> <span class="n">close</span>
-<span class="n">Content</span><span class="o">-</span><span class="n">Type</span><span class="p">:</span> <span class="n">text</span><span class="o">/</span><span class="n">html</span><span class="p">;</span> <span class="n">charset</span><span class="o">=</span><span class="n">UTF</span><span class="o">-</span><span class="mi">8</span>
+<div class="highlight-python"><div class="highlight"><pre>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: &quot;1aa008f-2d-50a3559482cc0&quot;
+Content-Length: 45
+Connection: close
+Content-Type: text/html; charset=UTF-8
 
-<span class="o">&lt;</span><span class="n">html</span><span class="o">&gt;&lt;</span><span class="n">body</span><span class="o">&gt;</span><span class="n">This</span> <span class="ow">is</span> <span class="n">a</span> <span class="n">fun</span> <span class="n">file</span><span class="o">&lt;/</span><span class="n">body</span><span class="o">&gt;&lt;/</span><span class="n">html</span><span class="o">&gt;</span>
+&lt;html&gt;&lt;body&gt;This is a fun file&lt;/body&gt;&lt;/html&gt;
 </pre></div>
 </div>
 </li>
 <li><p class="first">The proxy sends the origin response on to the client adding a <code class="docutils literal"><span class="pre">Via:</span></code> header (and maybe others):</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">HTTP</span><span class="o">/</span><span class="mf">1.1</span> <span class="mi">200</span> <span class="n">OK</span>
-<span class="n">Date</span><span class="p">:</span> <span class="n">Sun</span><span class="p">,</span> <span class="mi">14</span> <span class="n">Dec</span> <span class="mi">2014</span> <span class="mi">23</span><span class="p">:</span><span class="mi">22</span><span class="p">:</span><span class="mi">44</span> <span class="n">GMT</span>
-<span class="n">Last</span><span class="o">-</span><span class="n">Modified</span><span class="p">:</span> <span class="n">Sun</span><span class="p">,</span> <span class="mi">14</span> <span class="n">Dec</span> <span class="mi">2014</span> <span class="mi">23</span><span class="p">:</span><span class="mi">18</span><span class="p">:</span><span class="mi">51</span> <span class="n">GMT</span>
-<span class="n">ETag</span><span class="p">:</span> <span class="s2">&quot;1aa008f-2d-50a3559482cc0&quot;</span>
-<span class="n">Content</span><span class="o">-</span><span class="n">Length</span><span class="p">:</span> <span class="mi">45</span>
-<span class="n">Connection</span><span class="p">:</span> <span class="n">close</span>
-<span class="n">Content</span><span class="o">-</span><span class="n">Type</span><span class="p">:</span> <span class="n">text</span><span class="o">/</span><span class="n">html</span><span class="p">;</span> <span class="n">charset</span><span class="o">=</span><span class="n">UTF</span><span class="o">-</span><span class="mi">8</span>
-<span class="n">Age</span><span class="p">:</span> <span class="mi">0</span>
-<span class="n">Via</span><span class="p">:</span> <span class="n">http</span><span class="o">/</span><span class="mf">1.1</span> <span class="n">cache01</span><span class="o">.</span><span class="n">cdn</span><span class="o">.</span><span class="n">kabletown</span><span class="o">.</span><span class="n">net</span> <span class="p">(</span><span class="n">ApacheTrafficServer</span><span class="o">/</span><span class="mf">4.2</span><span class="o">.</span><span class="mi">1</span> <span class="p">[</span><span class="n">uScSsSfUpSeN</span><span class="p">:</span><span class="n">t</span> <span class="n">cCSi</span> <span class="n">p</span> <span class="n">sS</span><span class="p">])</span>
-<span class="n">Server</span><span class="p">:</span> <span class="n">ATS</span><span class="o">/</span><span class="mf">4.2</span><span class="o">.</span><span class="mi">1</span>
+<div class="highlight-python"><div class="highlight"><pre>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: &quot;1aa008f-2d-50a3559482cc0&quot;
+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
 
-  <span class="o">&lt;</span><span class="n">html</span><span class="o">&gt;&lt;</span><span class="n">body</span><span class="o">&gt;</span><span class="n">This</span> <span class="ow">is</span> <span class="n">a</span> <span class="n">fun</span> <span class="n">file</span><span class="o">&lt;/</span><span class="n">body</span><span class="o">&gt;&lt;/</span><span class="n">html</span><span class="o">&gt;</span>
+  &lt;html&gt;&lt;body&gt;This is a fun file&lt;/body&gt;&lt;/html&gt;
 </pre></div>
 </div>
 </li>
@@ -295,18 +295,18 @@
 <p>6b. If it <em>is</em> in the cache:</p>
 <blockquote>
 <div><p>The proxy responds to the client with the previously retrieved result:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">HTTP</span><span class="o">/</span><span class="mf">1.1</span> <span class="mi">200</span> <span class="n">OK</span>
-<span class="n">Date</span><span class="p">:</span> <span class="n">Sun</span><span class="p">,</span> <span class="mi">14</span> <span class="n">Dec</span> <span class="mi">2014</span> <span class="mi">23</span><span class="p">:</span><span class="mi">22</span><span class="p">:</span><span class="mi">44</span> <span class="n">GMT</span>
-<span class="n">Last</span><span class="o">-</span><span class="n">Modified</span><span class="p">:</span> <span class="n">Sun</span><span class="p">,</span> <span class="mi">14</span> <span class="n">Dec</span> <span class="mi">2014</span> <span class="mi">23</span><span class="p">:</span><span class="mi">18</span><span class="p">:</span><span class="mi">51</span> <span class="n">GMT</span>
-<span class="n">ETag</span><span class="p">:</span> <span class="s2">&quot;1aa008f-2d-50a3559482cc0&quot;</span>
-<span class="n">Content</span><span class="o">-</span><span class="n">Length</span><span class="p">:</span> <span class="mi">45</span>
-<span class="n">Connection</span><span class="p">:</span> <span class="n">close</span>
-<span class="n">Content</span><span class="o">-</span><span class="n">Type</span><span class="p">:</span> <span class="n">text</span><span class="o">/</span><span class="n">html</span><span class="p">;</span> <span class="n">charset</span><span class="o">=</span><span class="n">UTF</span><span class="o">-</span><span class="mi">8</span>
-<span class="n">Age</span><span class="p">:</span> <span class="mi">39711</span>
-<span class="n">Via</span><span class="p">:</span> <span class="n">http</span><span class="o">/</span><span class="mf">1.1</span> <span class="n">cache01</span><span class="o">.</span><span class="n">cdn</span><span class="o">.</span><span class="n">kabletown</span><span class="o">.</span><span class="n">net</span> <span class="p">(</span><span class="n">ApacheTrafficServer</span><span class="o">/</span><span class="mf">4.2</span><span class="o">.</span><span class="mi">1</span> <span class="p">[</span><span class="n">uScSsSfUpSeN</span><span class="p">:</span><span class="n">t</span> <span class="n">cCSi</span> <span class="n">p</span> <span class="n">sS</span><span class="p">])</span>
-<span class="n">Server</span><span class="p">:</span> <span class="n">ATS</span><span class="o">/</span><span class="mf">4.2</span><span class="o">.</span><span class="mi">1</span>
+<div class="highlight-python"><div class="highlight"><pre>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: &quot;1aa008f-2d-50a3559482cc0&quot;
+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
 
-<span class="o">&lt;</span><span class="n">html</span><span class="o">&gt;&lt;</span><span class="n">body</span><span class="o">&gt;</span><span class="n">This</span> <span class="ow">is</span> <span class="n">a</span> <span class="n">fun</span> <span class="n">file</span><span class="o">&lt;/</span><span class="n">body</span><span class="o">&gt;&lt;/</span><span class="n">html</span><span class="o">&gt;</span>
+&lt;html&gt;&lt;body&gt;This is a fun file&lt;/body&gt;&lt;/html&gt;
 </pre></div>
 </div>
 </div></blockquote>
@@ -331,7 +331,7 @@
 <li>To retrieve <code class="docutils literal"><span class="pre">http://www.origin.com/foo/bar/fun.html</span></code> URL, the client connects to 99.88.77.66 on port 8080 and sends:</li>
 </ol>
 <blockquote>
-<div><div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">GET</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">www</span><span class="o">.</span><span class="n">origin</span><span class="o">.</span><span class="n">com</span><span class="o">/</span><span class="n">foo</span><span class="o">/</span><span class="n">bar</span><span class="o">/</span><span class="n">fun</span><span class="o">.</span><span class="n">html</span> <span class="n">HTTP</span><span class="o">/</span><span class="mf">1.1</span>
+<div><div class="highlight-python"><div class="highlight"><pre>GET http://www.origin.com/foo/bar/fun.html HTTP/1.1
 </pre></div>
 </div>
 <div class="admonition note">
@@ -346,38 +346,38 @@
 <blockquote>
 <div><ol class="arabic">
 <li><p class="first">The proxy uses DNS to obtain the IPv4 address for <code class="docutils literal"><span class="pre">www.origin.com</span></code>, connects to it on port 80, and sends:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">GET</span> <span class="o">/</span><span class="n">foo</span><span class="o">/</span><span class="n">bar</span><span class="o">/</span><span class="n">fun</span><span class="o">.</span><span class="n">html</span> <span class="n">HTTP</span><span class="o">/</span><span class="mf">1.1</span>
-<span class="n">Host</span><span class="p">:</span> <span class="n">www</span><span class="o">.</span><span class="n">origin</span><span class="o">.</span><span class="n">com</span>
+<div class="highlight-python"><div class="highlight"><pre>GET /foo/bar/fun.html HTTP/1.1
+Host: www.origin.com
 </pre></div>
 </div>
 </li>
 <li><p class="first">The origin server responds with the headers and content as shown below:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">HTTP</span><span class="o">/</span><span class="mf">1.1</span> <span class="mi">200</span> <span class="n">OK</span>
-<span class="n">Date</span><span class="p">:</span> <span class="n">Sun</span><span class="p">,</span> <span class="mi">14</span> <span class="n">Dec</span> <span class="mi">2014</span> <span class="mi">23</span><span class="p">:</span><span class="mi">22</span><span class="p">:</span><span class="mi">44</span> <span class="n">GMT</span>
-<span class="n">Server</span><span class="p">:</span> <span class="n">Apache</span><span class="o">/</span><span class="mf">2.2</span><span class="o">.</span><span class="mi">15</span> <span class="p">(</span><span class="n">Red</span> <span class="n">Hat</span><span class="p">)</span>
-<span class="n">Last</span><span class="o">-</span><span class="n">Modified</span><span class="p">:</span> <span class="n">Sun</span><span class="p">,</span> <span class="mi">14</span> <span class="n">Dec</span> <span class="mi">2014</span> <span class="mi">23</span><span class="p">:</span><span class="mi">18</span><span class="p">:</span><span class="mi">51</span> <span class="n">GMT</span>
-<span class="n">ETag</span><span class="p">:</span> <span class="s2">&quot;1aa008f-2d-50a3559482cc0&quot;</span>
-<span class="n">Content</span><span class="o">-</span><span class="n">Length</span><span class="p">:</span> <span class="mi">45</span>
-<span class="n">Connection</span><span class="p">:</span> <span class="n">close</span>
-<span class="n">Content</span><span class="o">-</span><span class="n">Type</span><span class="p">:</span> <span class="n">text</span><span class="o">/</span><span class="n">html</span><span class="p">;</span> <span class="n">charset</span><span class="o">=</span><span class="n">UTF</span><span class="o">-</span><span class="mi">8</span>
+<div class="highlight-python"><div class="highlight"><pre>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: &quot;1aa008f-2d-50a3559482cc0&quot;
+Content-Length: 45
+Connection: close
+Content-Type: text/html; charset=UTF-8
 
-<span class="o">&lt;</span><span class="n">html</span><span class="o">&gt;&lt;</span><span class="n">body</span><span class="o">&gt;</span><span class="n">This</span> <span class="ow">is</span> <span class="n">a</span> <span class="n">fun</span> <span class="n">file</span><span class="o">&lt;/</span><span class="n">body</span><span class="o">&gt;&lt;/</span><span class="n">html</span><span class="o">&gt;</span>
+&lt;html&gt;&lt;body&gt;This is a fun file&lt;/body&gt;&lt;/html&gt;
 </pre></div>
 </div>
 </li>
 <li><p class="first">The proxy sends this on to the client adding a <code class="docutils literal"><span class="pre">Via:</span></code> header (and maybe others):</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">HTTP</span><span class="o">/</span><span class="mf">1.1</span> <span class="mi">200</span> <span class="n">OK</span>
-<span class="n">Date</span><span class="p">:</span> <span class="n">Sun</span><span class="p">,</span> <span class="mi">14</span> <span class="n">Dec</span> <span class="mi">2014</span> <span class="mi">23</span><span class="p">:</span><span class="mi">22</span><span class="p">:</span><span class="mi">44</span> <span class="n">GMT</span>
-<span class="n">Last</span><span class="o">-</span><span class="n">Modified</span><span class="p">:</span> <span class="n">Sun</span><span class="p">,</span> <span class="mi">14</span> <span class="n">Dec</span> <span class="mi">2014</span> <span class="mi">23</span><span class="p">:</span><span class="mi">18</span><span class="p">:</span><span class="mi">51</span> <span class="n">GMT</span>
-<span class="n">ETag</span><span class="p">:</span> <span class="s2">&quot;1aa008f-2d-50a3559482cc0&quot;</span>
-<span class="n">Content</span><span class="o">-</span><span class="n">Length</span><span class="p">:</span> <span class="mi">45</span>
-<span class="n">Connection</span><span class="p">:</span> <span class="n">close</span>
-<span class="n">Content</span><span class="o">-</span><span class="n">Type</span><span class="p">:</span> <span class="n">text</span><span class="o">/</span><span class="n">html</span><span class="p">;</span> <span class="n">charset</span><span class="o">=</span><span class="n">UTF</span><span class="o">-</span><span class="mi">8</span>
-<span class="n">Age</span><span class="p">:</span> <span class="mi">0</span>
-<span class="n">Via</span><span class="p">:</span> <span class="n">http</span><span class="o">/</span><span class="mf">1.1</span> <span class="n">cache01</span><span class="o">.</span><span class="n">cdn</span><span class="o">.</span><span class="n">kabletown</span><span class="o">.</span><span class="n">net</span> <span class="p">(</span><span class="n">ApacheTrafficServer</span><span class="o">/</span><span class="mf">4.2</span><span class="o">.</span><span class="mi">1</span> <span class="p">[</span><span class="n">uScSsSfUpSeN</span><span class="p">:</span><span class="n">t</span> <span class="n">cCSi</span> <span class="n">p</span> <span class="n">sS</span><span class="p">])</span>
-<span class="n">Server</span><span class="p">:</span> <span class="n">ATS</span><span class="o">/</span><span class="mf">4.2</span><span class="o">.</span><span class="mi">1</span>
+<div class="highlight-python"><div class="highlight"><pre>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: &quot;1aa008f-2d-50a3559482cc0&quot;
+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
 
-<span class="o">&lt;</span><span class="n">html</span><span class="o">&gt;&lt;</span><span class="n">body</span><span class="o">&gt;</span><span class="n">This</span> <span class="ow">is</span> <span class="n">a</span> <span class="n">fun</span> <span class="n">file</span><span class="o">&lt;/</span><span class="n">body</span><span class="o">&gt;&lt;/</span><span class="n">html</span><span class="o">&gt;</span>
+&lt;html&gt;&lt;body&gt;This is a fun file&lt;/body&gt;&lt;/html&gt;
 </pre></div>
 </div>
 </li>
@@ -386,18 +386,18 @@
 <p>4b. If it <em>is</em> in the cache:</p>
 <blockquote>
 <div><p>The proxy responds to the client with the previously retrieved result:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">HTTP</span><span class="o">/</span><span class="mf">1.1</span> <span class="mi">200</span> <span class="n">OK</span>
-<span class="n">Date</span><span class="p">:</span> <span class="n">Sun</span><span class="p">,</span> <span class="mi">14</span> <span class="n">Dec</span> <span class="mi">2014</span> <span class="mi">23</span><span class="p">:</span><span class="mi">22</span><span class="p">:</span><span class="mi">44</span> <span class="n">GMT</span>
-<span class="n">Last</span><span class="o">-</span><span class="n">Modified</span><span class="p">:</span> <span class="n">Sun</span><span class="p">,</span> <span class="mi">14</span> <span class="n">Dec</span> <span class="mi">2014</span> <span class="mi">23</span><span class="p">:</span><span class="mi">18</span><span class="p">:</span><span class="mi">51</span> <span class="n">GMT</span>
-<span class="n">ETag</span><span class="p">:</span> <span class="s2">&quot;1aa008f-2d-50a3559482cc0&quot;</span>
-<span class="n">Content</span><span class="o">-</span><span class="n">Length</span><span class="p">:</span> <span class="mi">45</span>
-<span class="n">Connection</span><span class="p">:</span> <span class="n">close</span>
-<span class="n">Content</span><span class="o">-</span><span class="n">Type</span><span class="p">:</span> <span class="n">text</span><span class="o">/</span><span class="n">html</span><span class="p">;</span> <span class="n">charset</span><span class="o">=</span><span class="n">UTF</span><span class="o">-</span><span class="mi">8</span>
-<span class="n">Age</span><span class="p">:</span> <span class="mi">99711</span>
-<span class="n">Via</span><span class="p">:</span> <span class="n">http</span><span class="o">/</span><span class="mf">1.1</span> <span class="n">cache01</span><span class="o">.</span><span class="n">cdn</span><span class="o">.</span><span class="n">kabletown</span><span class="o">.</span><span class="n">net</span> <span class="p">(</span><span class="n">ApacheTrafficServer</span><span class="o">/</span><span class="mf">4.2</span><span class="o">.</span><span class="mi">1</span> <span class="p">[</span><span class="n">uScSsSfUpSeN</span><span class="p">:</span><span class="n">t</span> <span class="n">cCSi</span> <span class="n">p</span> <span class="n">sS</span><span class="p">])</span>
-<span class="n">Server</span><span class="p">:</span> <span class="n">ATS</span><span class="o">/</span><span class="mf">4.2</span><span class="o">.</span><span class="mi">1</span>
+<div class="highlight-python"><div class="highlight"><pre>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: &quot;1aa008f-2d-50a3559482cc0&quot;
+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
 
-<span class="o">&lt;</span><span class="n">html</span><span class="o">&gt;&lt;</span><span class="n">body</span><span class="o">&gt;</span><span class="n">This</span> <span class="ow">is</span> <span class="n">a</span> <span class="n">fun</span> <span class="n">file</span><span class="o">&lt;/</span><span class="n">body</span><span class="o">&gt;&lt;/</span><span class="n">html</span><span class="o">&gt;</span>
+&lt;html&gt;&lt;body&gt;This is a fun file&lt;/body&gt;&lt;/html&gt;
 </pre></div>
 </div>
 </div></blockquote>
@@ -447,7 +447,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../',
-            VERSION:'1.7',
+            VERSION:'master',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/latest/basics/content_delivery_networks.html b/docs/latest/basics/content_delivery_networks.html
index 5351d03..85685f8 100644
--- a/docs/latest/basics/content_delivery_networks.html
+++ b/docs/latest/basics/content_delivery_networks.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Content Delivery Networks &mdash; Traffic Control 1.7 documentation </title>
+  <title>Content Delivery Networks &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="CDN Basics" href="index.html"/>
         <link rel="next" title="HTTP 1.1" href="http_11.html"/>
         <link rel="prev" title="CDN Basics" href="index.html"/> 
@@ -58,7 +58,7 @@
 
         
           
-          <img src="../_static/tc_logo.png" class="logo" />
+          <img src="../_static/tc_logo_c_only.png" class="logo" />
         
         </a>
 
@@ -80,7 +80,7 @@
           
               <ul class="current">
 <li class="toctree-l1 current"><a class="reference internal" href="index.html">CDN Basics</a><ul class="current">
-<li class="toctree-l2 current"><a class="current reference internal" href="#">Content Delivery Networks</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Content Delivery Networks</a></li>
 <li class="toctree-l2"><a class="reference internal" href="http_11.html">HTTP 1.1</a></li>
 <li class="toctree-l2"><a class="reference internal" href="caching_proxies.html">Caching Proxies</a></li>
 <li class="toctree-l2"><a class="reference internal" href="cache_revalidation.html">Cache Control Headers and Revalidation</a></li>
@@ -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">CDN Basics</a> &raquo;</li>
       
@@ -259,7 +259,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../',
-            VERSION:'1.7',
+            VERSION:'master',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/latest/basics/http_11.html b/docs/latest/basics/http_11.html
index 3509cae..36b3776 100644
--- a/docs/latest/basics/http_11.html
+++ b/docs/latest/basics/http_11.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>HTTP 1.1 &mdash; Traffic Control 1.7 documentation </title>
+  <title>HTTP 1.1 &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="CDN Basics" href="index.html"/>
         <link rel="next" title="Caching Proxies" href="caching_proxies.html"/>
         <link rel="prev" title="Content Delivery Networks" href="content_delivery_networks.html"/> 
@@ -58,7 +58,7 @@
 
         
           
-          <img src="../_static/tc_logo.png" class="logo" />
+          <img src="../_static/tc_logo_c_only.png" class="logo" />
         
         </a>
 
@@ -81,7 +81,7 @@
               <ul class="current">
 <li class="toctree-l1 current"><a class="reference internal" href="index.html">CDN Basics</a><ul class="current">
 <li class="toctree-l2"><a class="reference internal" href="content_delivery_networks.html">Content Delivery Networks</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="#">HTTP 1.1</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">HTTP 1.1</a></li>
 <li class="toctree-l2"><a class="reference internal" href="caching_proxies.html">Caching Proxies</a></li>
 <li class="toctree-l2"><a class="reference internal" href="cache_revalidation.html">Cache Control Headers and Revalidation</a></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">CDN Basics</a> &raquo;</li>
       
@@ -201,17 +201,17 @@
 </div></blockquote>
 <ol class="arabic" start="3">
 <li><p class="first">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):</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">GET</span> <span class="o">/</span><span class="n">foo</span><span class="o">/</span><span class="n">bar</span><span class="o">/</span><span class="n">fun</span><span class="o">.</span><span class="n">html</span> <span class="n">HTTP</span><span class="o">/</span><span class="mf">1.1</span>
-<span class="n">Host</span><span class="p">:</span> <span class="n">www</span><span class="o">.</span><span class="n">origin</span><span class="o">.</span><span class="n">com</span>
+<div class="highlight-python"><div class="highlight"><pre>GET /foo/bar/fun.html HTTP/1.1
+Host: www.origin.com
 </pre></div>
 </div>
 </li>
 <li><p class="first">The server at <code class="docutils literal"><span class="pre">www.origin.com</span></code> 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 <code class="docutils literal"><span class="pre">/foo/bar/fun.html</span></code>, in the example, this is a file that contains <code class="docutils literal"><span class="pre">&lt;html&gt;&lt;body&gt;This</span> <span class="pre">is</span> <span class="pre">a</span> <span class="pre">fun</span> <span class="pre">file&lt;/body&gt;&lt;/html&gt;</span></code>, so the server responds with the following:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">HTTP</span><span class="o">/</span><span class="mf">1.1</span> <span class="mi">200</span> <span class="n">OK</span>
-<span class="n">Content</span><span class="o">-</span><span class="n">Type</span><span class="p">:</span> <span class="n">text</span><span class="o">/</span><span class="n">html</span><span class="p">;</span> <span class="n">charset</span><span class="o">=</span><span class="n">UTF</span><span class="o">-</span><span class="mi">8</span>
-<span class="n">Content</span><span class="o">-</span><span class="n">Length</span><span class="p">:</span> <span class="mi">45</span>
+<div class="highlight-python"><div class="highlight"><pre>HTTP/1.1 200 OK
+Content-Type: text/html; charset=UTF-8
+Content-Length: 45
 
-<span class="o">&lt;</span><span class="n">html</span><span class="o">&gt;&lt;</span><span class="n">body</span><span class="o">&gt;</span><span class="n">This</span> <span class="ow">is</span> <span class="n">a</span> <span class="n">fun</span> <span class="n">file</span><span class="o">&lt;/</span><span class="n">body</span><span class="o">&gt;&lt;/</span><span class="n">html</span><span class="o">&gt;</span>
+&lt;html&gt;&lt;body&gt;This is a fun file&lt;/body&gt;&lt;/html&gt;
 </pre></div>
 </div>
 </li>
@@ -258,7 +258,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../',
-            VERSION:'1.7',
+            VERSION:'master',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/latest/basics/index.html b/docs/latest/basics/index.html
index d4921fa..d7bb2fc 100644
--- a/docs/latest/basics/index.html
+++ b/docs/latest/basics/index.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>CDN Basics &mdash; Traffic Control 1.7 documentation </title>
+  <title>CDN Basics &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="Content Delivery Networks" href="content_delivery_networks.html"/>
         <link rel="prev" title="Traffic Control" href="../index.html"/> 
 
@@ -57,7 +57,7 @@
 
         
           
-          <img src="../_static/tc_logo.png" class="logo" />
+          <img src="../_static/tc_logo_c_only.png" class="logo" />
         
         </a>
 
@@ -78,7 +78,7 @@
           
           
               <ul class="current">
-<li class="toctree-l1 current"><a class="current reference internal" href="#">CDN Basics</a><ul>
+<li class="toctree-l1 current"><a class="current reference internal" href="">CDN Basics</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="content_delivery_networks.html">Content Delivery Networks</a></li>
 <li class="toctree-l2"><a class="reference internal" href="http_11.html">HTTP 1.1</a></li>
 <li class="toctree-l2"><a class="reference internal" href="caching_proxies.html">Caching Proxies</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>CDN Basics</li>
       <li class="wy-breadcrumbs-aside">
@@ -237,7 +237,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../',
-            VERSION:'1.7',
+            VERSION:'master',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/latest/development/index.html b/docs/latest/development/index.html
index 42ef17a..3de6b99 100644
--- a/docs/latest/development/index.html
+++ b/docs/latest/development/index.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Developer’s Guide &mdash; Traffic Control 1.7 documentation </title>
+  <title>Developer’s 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="Traffic Ops" href="traffic_ops.html"/>
         <link rel="prev" title="Configure Delivery Service Steering" href="../admin/quick_howto/steering.html"/> 
 
@@ -57,7 +57,7 @@
 
         
           
-          <img src="../_static/tc_logo.png" class="logo" />
+          <img src="../_static/tc_logo_c_only.png" class="logo" />
         
         </a>
 
@@ -116,7 +116,7 @@
 </li>
 </ul>
 <ul class="current">
-<li class="toctree-l1 current"><a class="current reference internal" href="#">Developer&#8217;s Guide</a><ul>
+<li class="toctree-l1 current"><a class="current reference internal" href="">Developer&#8217;s Guide</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="traffic_ops.html">Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" href="traffic_portal.html">Traffic Portal</a></li>
 <li class="toctree-l2"><a class="reference internal" href="traffic_router.html">Traffic Router</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>Developer&#8217;s Guide</li>
       <li class="wy-breadcrumbs-aside">
@@ -279,7 +279,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../',
-            VERSION:'1.7',
+            VERSION:'master',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/latest/development/traffic_monitor.html b/docs/latest/development/traffic_monitor.html
index fa3c0f4..e3439a5 100644
--- a/docs/latest/development/traffic_monitor.html
+++ b/docs/latest/development/traffic_monitor.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Traffic Monitor &mdash; Traffic Control 1.7 documentation </title>
+  <title>Traffic Monitor &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="Developer’s Guide" href="index.html"/>
         <link rel="next" title="Traffic Monitor APIs" href="traffic_monitor/traffic_monitor_api.html"/>
         <link rel="prev" title="Traffic Router API" href="traffic_router/traffic_router_api.html"/> 
@@ -58,7 +58,7 @@
 
         
           
-          <img src="../_static/tc_logo.png" class="logo" />
+          <img src="../_static/tc_logo_c_only.png" class="logo" />
         
         </a>
 
@@ -121,7 +121,7 @@
 <li class="toctree-l2"><a class="reference internal" href="traffic_ops.html">Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" href="traffic_portal.html">Traffic Portal</a></li>
 <li class="toctree-l2"><a class="reference internal" href="traffic_router.html">Traffic Router</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="#">Traffic Monitor</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Traffic Monitor</a></li>
 <li class="toctree-l2"><a class="reference internal" href="traffic_stats.html">Traffic Stats</a></li>
 <li class="toctree-l2"><a class="reference internal" href="traffic_server.html">Traffic Server</a></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">Developer&#8217;s Guide</a> &raquo;</li>
       
@@ -247,7 +247,8 @@
 <li>Change directories into <code class="docutils literal"><span class="pre">traffic_control/traffic_monitor</span></code>.</li>
 <li>Edit the following parameters in src/test/resources/conf/traffic_monitor_config.js:</li>
 </ol>
-<table border="1" class="docutils">
+<blockquote>
+<div><table border="1" class="docutils">
 <colgroup>
 <col width="22%" />
 <col width="78%" />
@@ -272,6 +273,8 @@
 </tr>
 </tbody>
 </table>
+<p>Note: any change done later in the configuration file requires a mvn build in order to be applied.</p>
+</div></blockquote>
 <ol class="arabic" start="4">
 <li><p class="first">Import the existing git repo into Eclipse:</p>
 <blockquote>
@@ -318,7 +321,7 @@
 </div>
 <div class="section" id="api">
 <h2>API<a class="headerlink" href="#api" title="Permalink to this headline">¶</a></h2>
-<p><a class="reference internal" href="traffic_monitor/traffic_monitor_api.html#reference-tm-api"><span class="std std-ref">Traffic Monitor APIs</span></a></p>
+<p><a class="reference internal" href="traffic_monitor/traffic_monitor_api.html#reference-tm-api"><em>Traffic Monitor APIs</em></a></p>
 <div class="toctree-wrapper compound">
 </div>
 </div>
@@ -362,7 +365,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../',
-            VERSION:'1.7',
+            VERSION:'master',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/latest/development/traffic_monitor/traffic_monitor_api.html b/docs/latest/development/traffic_monitor/traffic_monitor_api.html
index 2c46f54..ae165ff 100644
--- a/docs/latest/development/traffic_monitor/traffic_monitor_api.html
+++ b/docs/latest/development/traffic_monitor/traffic_monitor_api.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Traffic Monitor APIs &mdash; Traffic Control 1.7 documentation </title>
+  <title>Traffic Monitor APIs &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="Traffic Monitor" href="../traffic_monitor.html"/>
         <link rel="next" title="Traffic Stats" href="../traffic_stats.html"/>
         <link rel="prev" title="Traffic Monitor" href="../traffic_monitor.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">Developer&#8217;s Guide</a> &raquo;</li>
       
@@ -475,7 +475,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../../',
-            VERSION:'1.7',
+            VERSION:'master',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/latest/development/traffic_ops.html b/docs/latest/development/traffic_ops.html
index fb939a1..b99bd75 100644
--- a/docs/latest/development/traffic_ops.html
+++ b/docs/latest/development/traffic_ops.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Traffic Ops &mdash; Traffic Control 1.7 documentation </title>
+  <title>Traffic Ops &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="Developer’s Guide" href="index.html"/>
         <link rel="next" title="API Routes" href="traffic_ops_api/routes.html"/>
         <link rel="prev" title="Developer’s Guide" href="index.html"/> 
@@ -58,7 +58,7 @@
 
         
           
-          <img src="../_static/tc_logo.png" class="logo" />
+          <img src="../_static/tc_logo_c_only.png" class="logo" />
         
         </a>
 
@@ -118,7 +118,7 @@
 </ul>
 <ul class="current">
 <li class="toctree-l1 current"><a class="reference internal" href="index.html">Developer&#8217;s Guide</a><ul class="current">
-<li class="toctree-l2 current"><a class="current reference internal" href="#">Traffic Ops</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" href="traffic_portal.html">Traffic Portal</a></li>
 <li class="toctree-l2"><a class="reference internal" href="traffic_router.html">Traffic Router</a></li>
 <li class="toctree-l2"><a class="reference internal" href="traffic_monitor.html">Traffic Monitor</a></li>
@@ -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">Developer&#8217;s Guide</a> &raquo;</li>
       
@@ -205,6 +205,11 @@
 <li>MySQL 5.1.52</li>
 <li><a class="reference external" href="https://bitbucket.org/liamstask/goose/">Goose</a></li>
 </ul>
+<p>Addionally, the installation of the following RPMs (or equivalent) is required:</p>
+<ul class="simple">
+<li>All RPMs listed in <a class="reference internal" href="../admin/traffic_ops_install.html#rl-ps"><em>Installing Traffic Ops</em></a></li>
+<li>mysql-test</li>
+</ul>
 </div>
 <div class="section" id="traffic-ops-project-tree-overview">
 <h2>Traffic Ops Project Tree Overview<a class="headerlink" href="#traffic-ops-project-tree-overview" title="Permalink to this headline">¶</a></h2>
@@ -264,7 +269,7 @@
 <div class="section" id="perl-formatting-conventions">
 <h2>Perl Formatting Conventions<a class="headerlink" href="#perl-formatting-conventions" title="Permalink to this headline">¶</a></h2>
 <p>Perl tidy is for use in code formatting. See the following config file for formatting conventions.</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span>edit a file called $HOME/.perltidyrc
+<div class="highlight-python"><div class="highlight"><pre>edit a file called $HOME/.perltidyrc
 
 -l=156
 -et=4
@@ -346,11 +351,11 @@
 <h2>Installing The Developer Environment<a class="headerlink" href="#installing-the-developer-environment" title="Permalink to this headline">¶</a></h2>
 <p>To install the Traffic Ops Developer environment:</p>
 <ol class="arabic simple">
-<li>Clone the traffic_control repository from <a class="reference external" href="https://github.com/Comcast/traffic_control">github.com</a>.</li>
+<li>Clone the traffic_control repository from <a class="reference external" href="https://github.com/apache/incubator-trafficcontrol">github.com</a>.</li>
 <li>Install the local dependencies using Carton (cpanfile).</li>
 </ol>
 <blockquote>
-<div><div class="highlight-default"><div class="highlight"><pre><span></span>$ cd traffic_ops/app
+<div><div class="highlight-python"><div class="highlight"><pre>$ cd traffic_ops/app
 $ carton
 </pre></div>
 </div>
@@ -360,7 +365,7 @@
 </ol>
 <blockquote>
 <div><p>Example:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span>master $ mysql
+<div class="highlight-python"><div class="highlight"><pre>master $ mysql
 Welcome to the MySQL monitor.  Commands end with ; or \g.
 Your MySQL connection id is 305
 Server version: 5.6.19 Homebrew
@@ -391,7 +396,7 @@
 <div class="line"><br /></div>
 </div>
 <p>Running the the admin.pl script in setup mode should look like this:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span>master $ db/admin.pl --env=development setup
+<div class="highlight-python"><div class="highlight"><pre>master $ db/admin.pl --env=development setup
 Using database.conf: conf/development/database.conf
 Using database.conf: conf/development/database.conf
 Using database.conf: conf/development/database.conf
@@ -424,9 +429,9 @@
 </li>
 </ol>
 <blockquote>
-<div><div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">[</span><span class="mi">2015</span><span class="o">-</span><span class="mi">02</span><span class="o">-</span><span class="mi">24</span> <span class="mi">10</span><span class="p">:</span><span class="mi">44</span><span class="p">:</span><span class="mi">34</span><span class="p">,</span><span class="mi">991</span><span class="p">]</span> <span class="p">[</span><span class="n">INFO</span><span class="p">]</span> <span class="n">Listening</span> <span class="n">at</span> <span class="s2">&quot;http://*:3000&quot;</span><span class="o">.</span>
+<div><div class="highlight-python"><div class="highlight"><pre>[2015-02-24 10:44:34,991] [INFO] Listening at &quot;http://*:3000&quot;.
 
-<span class="n">Server</span> <span class="n">available</span> <span class="n">at</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="mf">127.0</span><span class="o">.</span><span class="mf">0.1</span><span class="p">:</span><span class="mf">3000.</span>
+Server available at http://127.0.0.1:3000.
 </pre></div>
 </div>
 </div></blockquote>
@@ -486,14 +491,14 @@
 </ol>
 <blockquote>
 <div>These allow you to add statistic sources for the graph views and APIs.</div></blockquote>
-<p>Extensions are managed using the $TO_HOME/bin/extensions command line script. For more information see <a class="reference internal" href="../admin/traffic_ops_extensions.html#admin-to-ext-script"><span class="std std-ref">Managing Traffic Ops Extensions</span></a>.</p>
+<p>Extensions are managed using the $TO_HOME/bin/extensions command line script. For more information see <a class="reference internal" href="../admin/traffic_ops_extensions.html#admin-to-ext-script"><em>Managing Traffic Ops Extensions</em></a>.</p>
 <div class="section" id="check-extensions">
 <h3>Check Extensions<a class="headerlink" href="#check-extensions" title="Permalink to this headline">¶</a></h3>
 <p>In other words, check extensions are scripts that, after registering with Traffic Ops, have a column reserved in the &#8220;Health-&gt;Server Checks&#8221; view and that usually run periodically out of cron.</p>
 <p>It is the responsibility of the check extension script to iterate over the servers it wants to check and post the results.</p>
 <p>An example script might proceed by logging into the Traffic Ops server using the HTTPS base_url provided on the command line. The script is hardcoded with an auth token that is also provisioned in the Traffic Ops User database. This token allows the script to obtain a cookie used in later communications with the Traffic Ops API. The script then obtains a list of all caches to be polled by accessing Traffic Ops&#8217; <code class="docutils literal"><span class="pre">/api/1.1/servers.json</span></code> REST target. This list is walked, running a command to gather the stats from that cache. For some extensions, an HTTP GET request might be made to the ATS astats plugin, while for others the cache might be pinged, or a command run over SSH. The results are then compiled into a numeric or boolean result and the script POSTs tha result back to the Traffic Ops <code class="docutils literal"><span class="pre">/api/1.1/servercheck/</span></code> target.</p>
 <p>A check extension can have a column of <img alt="checkmark" src="../_images/good1.png" />&#8216;s and <img alt="X" src="../_images/bad1.png" />&#8216;s (CHECK_EXTENSION_BOOL) or a column that shows a number (CHECK_EXTENSION_NUM).A simple example of a check extension of type CHECK_EXTENSION_NUM that will show 99.33 for all servers of type EDGE is shown below:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">Script</span> <span class="n">here</span><span class="o">.</span>
+<div class="highlight-python"><div class="highlight"><pre>Script here.
 </pre></div>
 </div>
 <p>Check Extension scripts are located in the $TO_HOME/bin/checks directory.</p>
@@ -508,7 +513,7 @@
 <dt><strong>Maximum Transmission Check - MTU</strong></dt>
 <dd>Checks if the Traffic Ops host (if that is the one running the check) can send and receive 8192 size packets to the <code class="docutils literal"><span class="pre">ip_address</span></code> of the server in the server table.</dd>
 <dt><strong>Operational Readiness Check - ORT</strong></dt>
-<dd>See <a class="reference internal" href="../admin/traffic_server.html#reference-traffic-ops-ort"><span class="std std-ref">Configuring Traffic Server</span></a> for more information on the ort script. The ORT column shows how many changes the traffic_ops_ort.pl script would apply if it was run. The number in this column should be 0.</dd>
+<dd>See <a class="reference internal" href="../admin/traffic_server.html#reference-traffic-ops-ort"><em>Configuring Traffic Server</em></a> for more information on the ort script. The ORT column shows how many changes the traffic_ops_ort.pl script would apply if it was run. The number in this column should be 0.</dd>
 <dt><strong>Ping Check - 10G, ILO, 10G6, FQDN</strong></dt>
 <dd><p class="first">The bin/checks/ToPingCheck.pl is to check basic IP connectivity, and in the default setup it checks IP connectivity to the following:</p>
 <dl class="last docutils">
@@ -541,7 +546,7 @@
 <div class="section" id="extension-directories">
 <h3>Extension Directories<a class="headerlink" href="#extension-directories" title="Permalink to this headline">¶</a></h3>
 <p>PERL5LIB Example Configuration:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="n">export</span> <span class="n">PERL5LIB</span><span class="o">=/</span><span class="n">opt</span><span class="o">/</span><span class="n">traffic_ops_extensions</span><span class="o">/</span><span class="n">private</span><span class="o">/</span><span class="n">lib</span><span class="o">/</span><span class="n">Extensions</span><span class="p">:</span><span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">traffic_ops</span><span class="o">/</span><span class="n">app</span><span class="o">/</span><span class="n">lib</span><span class="o">/</span><span class="n">Extensions</span><span class="o">/</span><span class="n">TrafficStats</span>
+<div class="highlight-python"><div class="highlight"><pre>export PERL5LIB=/opt/traffic_ops_extensions/private/lib/Extensions:/opt/traffic_ops/app/lib/Extensions/TrafficStats
 </pre></div>
 </div>
 </div>
@@ -568,9 +573,9 @@
 <div class="section" id="response-structure">
 <h3>Response Structure<a class="headerlink" href="#response-structure" title="Permalink to this headline">¶</a></h3>
 <p>All successful responses have the following structure:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span>
-  <span class="s2">&quot;response&quot;</span><span class="p">:</span> <span class="o">&lt;</span><span class="n">JSON</span> <span class="nb">object</span> <span class="k">with</span> <span class="n">main</span> <span class="n">response</span><span class="o">&gt;</span><span class="p">,</span>
-<span class="p">}</span>
+<div class="highlight-python"><div class="highlight"><pre>{
+  &quot;response&quot;: &lt;JSON object with main response&gt;,
+}
 </pre></div>
 </div>
 <p>To make the documentation easier to read, only the <code class="docutils literal"><span class="pre">&lt;JSON</span> <span class="pre">object</span> <span class="pre">with</span> <span class="pre">main</span> <span class="pre">response&gt;</span></code> is documented, even though the response and version fields are always present.</p>
@@ -583,7 +588,7 @@
 <li>Pass the mojolicious cookie value, along with any subsequent calls to an authenticated API endpoint.</li>
 </ol>
 <p>Example:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span>[jvd@laika ~]$ curl -H &quot;Accept: application/json&quot; http://localhost:3000/api/1.1/usage/asns.json
+<div class="highlight-python"><div class="highlight"><pre>[jvd@laika ~]$ curl -H &quot;Accept: application/json&quot; http://localhost:3000/api/1.1/usage/asns.json
 {&quot;alerts&quot;:[{&quot;level&quot;:&quot;error&quot;,&quot;text&quot;:&quot;Unauthorized, please log in.&quot;}]}
 [jvd@laika ~]$
 [jvd@laika ~]$ curl -v -H &quot;Accept: application/json&quot; -v -X POST --data &#39;{ &quot;u&quot;:&quot;admin&quot;, &quot;p&quot;:&quot;secret_passwd&quot; }&#39; http://localhost:3000/api/1.1/user/login
@@ -658,7 +663,7 @@
 <dl class="docutils">
 <dt>401 Unauthorized</dt>
 <dd><p class="first">When you don&#8217;t supply the right cookie, this is the response.</p>
-<div class="last highlight-default"><div class="highlight"><pre><span></span>[jvd@laika ~]$ curl -v -H &quot;Accept: application/json&quot; http://localhost:3000/api/1.1/usage/asns.json
+<div class="last highlight-python"><div class="highlight"><pre>[jvd@laika ~]$ curl -v -H &quot;Accept: application/json&quot; http://localhost:3000/api/1.1/usage/asns.json
 * Hostname was NOT found in DNS cache
 *   Trying ::1...
 * connect to ::1 port 3000 failed: Connection refused
@@ -690,7 +695,7 @@
 </dd>
 <dt>404 Not Found</dt>
 <dd><p class="first">When the resource (path) is non existent Traffic Ops returns a 404:</p>
-<div class="last highlight-default"><div class="highlight"><pre><span></span>[jvd@laika ~]$ curl -v -H&#39;Cookie: mojolicious=eyJleHBpcmVzIjoxNDI5NDAyMjAxLCJhdXRoX2RhdGEiOiJhZG1pbiJ9--f990d03b7180b1ece97c3bb5ca69803cd6a79862;&#39; -H &quot;Accept: application/json&quot; http://localhost:3000/api/1.1/asnsjj.json
+<div class="last highlight-python"><div class="highlight"><pre>[jvd@laika ~]$ curl -v -H&#39;Cookie: mojolicious=eyJleHBpcmVzIjoxNDI5NDAyMjAxLCJhdXRoX2RhdGEiOiJhZG1pbiJ9--f990d03b7180b1ece97c3bb5ca69803cd6a79862;&#39; -H &quot;Accept: application/json&quot; http://localhost:3000/api/1.1/asnsjj.json
 * Hostname was NOT found in DNS cache
 *   Trying ::1...
 * connect to ::1 port 3000 failed: Connection refused
@@ -724,7 +729,7 @@
 </dd>
 <dt>500 Internal Server Error</dt>
 <dd><p class="first">When you are asking for a correct path, but the database doesn&#8217;t match, it returns a 500:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span>[jvd@laika ~]$ curl -v -H&#39;Cookie: mojolicious=eyJleHBpcmVzIjoxNDI5NDAyMjAxLCJhdXRoX2RhdGEiOiJhZG1pbiJ9--f990d03b7180b1ece97c3bb5ca69803cd6a79862;&#39; -H &quot;Accept: application/json&quot; http://localhost:3000/api/1.1/servers/hostname/jj/details.json
+<div class="highlight-python"><div class="highlight"><pre>[jvd@laika ~]$ curl -v -H&#39;Cookie: mojolicious=eyJleHBpcmVzIjoxNDI5NDAyMjAxLCJhdXRoX2RhdGEiOiJhZG1pbiJ9--f990d03b7180b1ece97c3bb5ca69803cd6a79862;&#39; -H &quot;Accept: application/json&quot; http://localhost:3000/api/1.1/servers/hostname/jj/details.json
 * Hostname was NOT found in DNS cache
 *   Trying ::1...
 * connect to ::1 port 3000 failed: Connection refused
@@ -865,7 +870,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../',
-            VERSION:'1.7',
+            VERSION:'master',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/latest/development/traffic_ops_api/routes.html b/docs/latest/development/traffic_ops_api/routes.html
index b8d9efd..398561d 100644
--- a/docs/latest/development/traffic_ops_api/routes.html
+++ b/docs/latest/development/traffic_ops_api/routes.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>API Routes &mdash; Traffic Control 1.7 documentation </title>
+  <title>API Routes &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="Traffic Ops" href="../traffic_ops.html"/>
         <link rel="next" title="ASN" href="v11/asn.html"/>
         <link rel="prev" title="Traffic Ops" href="../traffic_ops.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">Developer&#8217;s Guide</a> &raquo;</li>
       
@@ -224,16 +224,16 @@
 </thead>
 <tbody valign="top">
 <tr class="row-even"><td>/asns</td>
-<td><a class="reference internal" href="v11/asn.html#to-api-v11-asns-route"><span class="std std-ref">/api/1.1/asns</span></a></td>
-<td><a class="reference internal" href="v12/asn.html#to-api-v12-asns-route"><span class="std std-ref">/api/1.2/asns</span></a></td>
+<td><a class="reference internal" href="v11/asn.html#to-api-v11-asns-route"><em>/api/1.1/asns</em></a></td>
+<td><a class="reference internal" href="v12/asn.html#to-api-v12-asns-route"><em>/api/1.2/asns</em></a></td>
 </tr>
 <tr class="row-odd"><td>/availableds</td>
-<td><a class="reference internal" href="v11/deliveryservice.html#to-api-v11-ds-route"><span class="std std-ref">/api/1.1/deliveryservices</span></a></td>
-<td><a class="reference internal" href="v12/deliveryservice.html#to-api-v12-ds-route"><span class="std std-ref">/api/1.2/deliveryservices</span></a></td>
+<td><a class="reference internal" href="v11/deliveryservice.html#to-api-v11-ds-route"><em>/api/1.1/deliveryservices</em></a></td>
+<td><a class="reference internal" href="v12/deliveryservice.html#to-api-v12-ds-route"><em>/api/1.2/deliveryservices</em></a></td>
 </tr>
 <tr class="row-even"><td><em>Not Implemented</em></td>
 <td><em>Not Implemented</em></td>
-<td><a class="reference internal" href="v12/cache_stats.html#to-api-v12-cache-stats-route"><span class="std std-ref">/api/1.2/cache_stats</span></a></td>
+<td><a class="reference internal" href="v12/cache_stats.html#to-api-v12-cache-stats-route"><em>/api/1.2/cache_stats</em></a></td>
 </tr>
 <tr class="row-odd"><td>/datacrans</td>
 <td>/api/1.1/crans.json</td>
@@ -244,8 +244,8 @@
 <td>/api/1.2/crans.json</td>
 </tr>
 <tr class="row-odd"><td>/datadeliveryservice</td>
-<td><a class="reference internal" href="v11/deliveryservice.html#to-api-v11-ds-route"><span class="std std-ref">/api/1.1/deliveryservices</span></a></td>
-<td><a class="reference internal" href="v12/deliveryservice.html#to-api-v12-ds-route"><span class="std std-ref">/api/1.2/deliveryservices</span></a></td>
+<td><a class="reference internal" href="v11/deliveryservice.html#to-api-v11-ds-route"><em>/api/1.1/deliveryservices</em></a></td>
+<td><a class="reference internal" href="v12/deliveryservice.html#to-api-v12-ds-route"><em>/api/1.2/deliveryservices</em></a></td>
 </tr>
 <tr class="row-even"><td>/datadeliveryserviceserver</td>
 <td>/api/1.1/deliveryserviceserver.json</td>
@@ -257,11 +257,11 @@
 </tr>
 <tr class="row-even"><td><em>Not Implemented</em></td>
 <td><em>Not Implemented</em></td>
-<td><a class="reference internal" href="v12/deliveryservice_stats.html#to-api-v12-ds-stats-route"><span class="std std-ref">/api/1.2/deliveryservice_stats</span></a></td>
+<td><a class="reference internal" href="v12/deliveryservice_stats.html#to-api-v12-ds-stats-route"><em>/api/1.2/deliveryservice_stats</em></a></td>
 </tr>
 <tr class="row-odd"><td>/datahwinfo</td>
-<td><a class="reference internal" href="v11/hwinfo.html#to-api-v11-hwinfo-route"><span class="std std-ref">/api/1.1/hwinfo</span></a></td>
-<td><a class="reference internal" href="v12/hwinfo.html#to-api-v12-hwinfo-route"><span class="std std-ref">/api/1.2/hwinfo</span></a></td>
+<td><a class="reference internal" href="v11/hwinfo.html#to-api-v11-hwinfo-route"><em>/api/1.1/hwinfo</em></a></td>
+<td><a class="reference internal" href="v12/hwinfo.html#to-api-v12-hwinfo-route"><em>/api/1.2/hwinfo</em></a></td>
 </tr>
 <tr class="row-even"><td>/datalinks</td>
 <td>/api/1.1/deliveryserviceserver.json</td>
@@ -272,86 +272,86 @@
 <td>/api/1.2/deliveryserviceserver.json</td>
 </tr>
 <tr class="row-even"><td>/datalogs</td>
-<td><a class="reference internal" href="v11/changelog.html#to-api-v11-change-logs-route"><span class="std std-ref">/api/1.1/logs</span></a></td>
-<td><a class="reference internal" href="v12/changelog.html#to-api-v12-change-logs-route"><span class="std std-ref">/api/1.2/logs</span></a></td>
+<td><a class="reference internal" href="v11/changelog.html#to-api-v11-change-logs-route"><em>/api/1.1/logs</em></a></td>
+<td><a class="reference internal" href="v12/changelog.html#to-api-v12-change-logs-route"><em>/api/1.2/logs</em></a></td>
 </tr>
 <tr class="row-odd"><td>/datalocation/orderby/id</td>
-<td><a class="reference internal" href="v11/cachegroup.html#to-api-v11-cachegroups-route"><span class="std std-ref">/api/1.1/cachegroups</span></a></td>
-<td><a class="reference internal" href="v12/cachegroup.html#to-api-v12-cachegroups-route"><span class="std std-ref">/api/1.2/cachegroups</span></a></td>
+<td><a class="reference internal" href="v11/cachegroup.html#to-api-v11-cachegroups-route"><em>/api/1.1/cachegroups</em></a></td>
+<td><a class="reference internal" href="v12/cachegroup.html#to-api-v12-cachegroups-route"><em>/api/1.2/cachegroups</em></a></td>
 </tr>
 <tr class="row-even"><td>/datalocationparameters</td>
-<td><a class="reference internal" href="v11/cachegroup.html#to-api-v11-cachegroups-route"><span class="std std-ref">/api/1.1/cachegroups</span></a></td>
-<td><a class="reference internal" href="v12/cachegroup.html#to-api-v12-cachegroups-route"><span class="std std-ref">/api/1.2/cachegroups</span></a></td>
+<td><a class="reference internal" href="v11/cachegroup.html#to-api-v11-cachegroups-route"><em>/api/1.1/cachegroups</em></a></td>
+<td><a class="reference internal" href="v12/cachegroup.html#to-api-v12-cachegroups-route"><em>/api/1.2/cachegroups</em></a></td>
 </tr>
 <tr class="row-odd"><td>/dataparameter</td>
-<td><a class="reference internal" href="v11/parameter.html#to-api-v11-parameters-route"><span class="std std-ref">/api/1.1/parameters</span></a></td>
-<td><a class="reference internal" href="v12/parameter.html#to-api-v12-parameters-route"><span class="std std-ref">/api/1.2/parameters</span></a></td>
+<td><a class="reference internal" href="v11/parameter.html#to-api-v11-parameters-route"><em>/api/1.1/parameters</em></a></td>
+<td><a class="reference internal" href="v12/parameter.html#to-api-v12-parameters-route"><em>/api/1.2/parameters</em></a></td>
 </tr>
 <tr class="row-even"><td>/dataparameter/:parameter</td>
 <td>/api/1.1/parameters/profile/:parameter.json</td>
 <td>/api/1.2/parameters/profile/:parameter.json</td>
 </tr>
 <tr class="row-odd"><td>/dataphys_location</td>
-<td><a class="reference internal" href="v11/phys_location.html#to-api-v11-phys-loc-route"><span class="std std-ref">/api/1.1/phys_locations</span></a></td>
-<td><a class="reference internal" href="v12/phys_location.html#to-api-v12-phys-loc-route"><span class="std std-ref">/api/1.2/phys_locations</span></a></td>
+<td><a class="reference internal" href="v11/phys_location.html#to-api-v11-phys-loc-route"><em>/api/1.1/phys_locations</em></a></td>
+<td><a class="reference internal" href="v12/phys_location.html#to-api-v12-phys-loc-route"><em>/api/1.2/phys_locations</em></a></td>
 </tr>
 <tr class="row-even"><td><p class="first">/dataprofile</p>
 <p class="last">/dataprofile/orderby/name</p>
 </td>
-<td><a class="reference internal" href="v11/profile.html#to-api-v11-profiles-route"><span class="std std-ref">/api/1.1/profiles</span></a></td>
-<td><a class="reference internal" href="v12/profile.html#to-api-v12-profiles-route"><span class="std std-ref">/api/1.2/profiles</span></a></td>
+<td><a class="reference internal" href="v11/profile.html#to-api-v11-profiles-route"><em>/api/1.1/profiles</em></a></td>
+<td><a class="reference internal" href="v12/profile.html#to-api-v12-profiles-route"><em>/api/1.2/profiles</em></a></td>
 </tr>
 <tr class="row-odd"><td>/dataregion</td>
-<td><a class="reference internal" href="v11/region.html#to-api-v11-regions-route"><span class="std std-ref">/api/1.1/regions</span></a></td>
-<td><a class="reference internal" href="v12/region.html#to-api-v12-regions-route"><span class="std std-ref">/api/1.2/regions</span></a></td>
+<td><a class="reference internal" href="v11/region.html#to-api-v11-regions-route"><em>/api/1.1/regions</em></a></td>
+<td><a class="reference internal" href="v12/region.html#to-api-v12-regions-route"><em>/api/1.2/regions</em></a></td>
 </tr>
 <tr class="row-even"><td>/datarole</td>
-<td><a class="reference internal" href="v11/role.html#to-api-v11-roles-route"><span class="std std-ref">/api/1.1/roles</span></a></td>
-<td><a class="reference internal" href="v12/role.html#to-api-v12-roles-route"><span class="std std-ref">/api/1.2/roles</span></a></td>
+<td><a class="reference internal" href="v11/role.html#to-api-v11-roles-route"><em>/api/1.1/roles</em></a></td>
+<td><a class="reference internal" href="v12/role.html#to-api-v12-roles-route"><em>/api/1.2/roles</em></a></td>
 </tr>
 <tr class="row-odd"><td>/datarole/orderby/:field</td>
-<td><a class="reference internal" href="v11/role.html#to-api-v11-roles-route"><span class="std std-ref">/api/1.1/roles</span></a></td>
-<td><a class="reference internal" href="v12/role.html#to-api-v12-roles-route"><span class="std std-ref">/api/1.2/roles</span></a></td>
+<td><a class="reference internal" href="v11/role.html#to-api-v11-roles-route"><em>/api/1.1/roles</em></a></td>
+<td><a class="reference internal" href="v12/role.html#to-api-v12-roles-route"><em>/api/1.2/roles</em></a></td>
 </tr>
 <tr class="row-even"><td>/dataserver</td>
-<td><a class="reference internal" href="v11/server.html#to-api-v11-servers-route"><span class="std std-ref">/api/1.1/servers</span></a></td>
-<td><a class="reference internal" href="v12/server.html#to-api-v12-servers-route"><span class="std std-ref">/api/1.2/servers</span></a></td>
+<td><a class="reference internal" href="v11/server.html#to-api-v11-servers-route"><em>/api/1.1/servers</em></a></td>
+<td><a class="reference internal" href="v12/server.html#to-api-v12-servers-route"><em>/api/1.2/servers</em></a></td>
 </tr>
 <tr class="row-odd"><td>/dataserver/orderby/:field</td>
-<td><a class="reference internal" href="v11/server.html#to-api-v11-servers-route"><span class="std std-ref">/api/1.1/servers</span></a></td>
-<td><a class="reference internal" href="v12/server.html#to-api-v12-servers-route"><span class="std std-ref">/api/1.2/servers</span></a></td>
+<td><a class="reference internal" href="v11/server.html#to-api-v11-servers-route"><em>/api/1.1/servers</em></a></td>
+<td><a class="reference internal" href="v12/server.html#to-api-v12-servers-route"><em>/api/1.2/servers</em></a></td>
 </tr>
 <tr class="row-even"><td>/dataserverdetail/select/:hostname</td>
 <td>/api/1.1/servers/hostname/:hostname/details.json</td>
 <td>/api/1.2/servers/hostname/:hostname/details.json</td>
 </tr>
 <tr class="row-odd"><td>/datastaticdnsentry</td>
-<td><a class="reference internal" href="v11/static_dns.html#to-api-v11-static-dns-route"><span class="std std-ref">/api/1.1/staticdnsentries</span></a></td>
-<td><a class="reference internal" href="v12/static_dns.html#to-api-v12-static-dns-route"><span class="std std-ref">/api/1.2/staticdnsentries</span></a></td>
+<td><a class="reference internal" href="v11/static_dns.html#to-api-v11-static-dns-route"><em>/api/1.1/staticdnsentries</em></a></td>
+<td><a class="reference internal" href="v12/static_dns.html#to-api-v12-static-dns-route"><em>/api/1.2/staticdnsentries</em></a></td>
 </tr>
 <tr class="row-even"><td>/datastatus</td>
-<td><a class="reference internal" href="v11/status.html#to-api-v11-statuses-route"><span class="std std-ref">/api/1.1/statuses</span></a></td>
-<td><a class="reference internal" href="v12/status.html#to-api-v12-statuses-route"><span class="std std-ref">/api/1.2/statuses</span></a></td>
+<td><a class="reference internal" href="v11/status.html#to-api-v11-statuses-route"><em>/api/1.1/statuses</em></a></td>
+<td><a class="reference internal" href="v12/status.html#to-api-v12-statuses-route"><em>/api/1.2/statuses</em></a></td>
 </tr>
 <tr class="row-odd"><td>/datastatus/orderby/name</td>
-<td><a class="reference internal" href="v11/status.html#to-api-v11-statuses-route"><span class="std std-ref">/api/1.1/statuses</span></a></td>
-<td><a class="reference internal" href="v12/status.html#to-api-v12-statuses-route"><span class="std std-ref">/api/1.2/statuses</span></a></td>
+<td><a class="reference internal" href="v11/status.html#to-api-v11-statuses-route"><em>/api/1.1/statuses</em></a></td>
+<td><a class="reference internal" href="v12/status.html#to-api-v12-statuses-route"><em>/api/1.2/statuses</em></a></td>
 </tr>
 <tr class="row-even"><td>/datatype</td>
-<td><a class="reference internal" href="v11/type.html#to-api-v11-types-route"><span class="std std-ref">/api/1.1/types</span></a></td>
-<td><a class="reference internal" href="v12/type.html#to-api-v12-types-route"><span class="std std-ref">/api/1.2/types</span></a></td>
+<td><a class="reference internal" href="v11/type.html#to-api-v11-types-route"><em>/api/1.1/types</em></a></td>
+<td><a class="reference internal" href="v12/type.html#to-api-v12-types-route"><em>/api/1.2/types</em></a></td>
 </tr>
 <tr class="row-odd"><td>/datatype/orderby/:field</td>
-<td><a class="reference internal" href="v11/type.html#to-api-v11-types-route"><span class="std std-ref">/api/1.1/types</span></a></td>
-<td><a class="reference internal" href="v12/type.html#to-api-v12-types-route"><span class="std std-ref">/api/1.2/types</span></a></td>
+<td><a class="reference internal" href="v11/type.html#to-api-v11-types-route"><em>/api/1.1/types</em></a></td>
+<td><a class="reference internal" href="v12/type.html#to-api-v12-types-route"><em>/api/1.2/types</em></a></td>
 </tr>
 <tr class="row-even"><td>/datauser</td>
-<td><a class="reference internal" href="v11/user.html#to-api-v11-users-route"><span class="std std-ref">/api/1.1/users</span></a></td>
-<td><a class="reference internal" href="v12/user.html#to-api-v12-users-route"><span class="std std-ref">/api/1.2/users</span></a></td>
+<td><a class="reference internal" href="v11/user.html#to-api-v11-users-route"><em>/api/1.1/users</em></a></td>
+<td><a class="reference internal" href="v12/user.html#to-api-v12-users-route"><em>/api/1.2/users</em></a></td>
 </tr>
 <tr class="row-odd"><td>/datauser/orderby/:field</td>
-<td><a class="reference internal" href="v11/user.html#to-api-v11-users-route"><span class="std std-ref">/api/1.1/users</span></a></td>
-<td><a class="reference internal" href="v12/user.html#to-api-v12-users-route"><span class="std std-ref">/api/1.2/users</span></a></td>
+<td><a class="reference internal" href="v11/user.html#to-api-v11-users-route"><em>/api/1.1/users</em></a></td>
+<td><a class="reference internal" href="v12/user.html#to-api-v12-users-route"><em>/api/1.2/users</em></a></td>
 </tr>
 </tbody>
 </table>
@@ -395,7 +395,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../../',
-            VERSION:'1.7',
+            VERSION:'master',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/latest/development/traffic_ops_api/v11/asn.html b/docs/latest/development/traffic_ops_api/v11/asn.html
index 9172657..8725a5e 100644
--- a/docs/latest/development/traffic_ops_api/v11/asn.html
+++ b/docs/latest/development/traffic_ops_api/v11/asn.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>ASN &mdash; Traffic Control 1.7 documentation </title>
+  <title>ASN &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="Traffic Ops" href="../../traffic_ops.html"/>
         <link rel="next" title="Cache Group" href="cachegroup.html"/>
         <link rel="prev" title="API Routes" href="../routes.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">Developer&#8217;s Guide</a> &raquo;</li>
       
@@ -231,20 +231,20 @@
 </tbody>
 </table>
 <p><strong>Response Example</strong></p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span>
- <span class="s2">&quot;response&quot;</span><span class="p">:</span> <span class="p">{</span>
-    <span class="s2">&quot;asns&quot;</span><span class="p">:</span> <span class="p">[</span>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+ <span class="s">&quot;response&quot;</span><span class="p">:</span> <span class="p">{</span>
+    <span class="s">&quot;asns&quot;</span><span class="p">:</span> <span class="p">[</span>
        <span class="p">{</span>
-          <span class="s2">&quot;lastUpdated&quot;</span><span class="p">:</span> <span class="s2">&quot;2012-09-17 21:41:22&quot;</span><span class="p">,</span>
-          <span class="s2">&quot;id&quot;</span><span class="p">:</span> <span class="s2">&quot;27&quot;</span><span class="p">,</span>
-          <span class="s2">&quot;asn&quot;</span><span class="p">:</span> <span class="s2">&quot;7015&quot;</span><span class="p">,</span>
-          <span class="s2">&quot;cachegroup&quot;</span><span class="p">:</span> <span class="s2">&quot;us-ma-woburn&quot;</span>
+          <span class="s">&quot;lastUpdated&quot;</span><span class="p">:</span> <span class="s">&quot;2012-09-17 21:41:22&quot;</span><span class="p">,</span>
+          <span class="s">&quot;id&quot;</span><span class="p">:</span> <span class="s">&quot;27&quot;</span><span class="p">,</span>
+          <span class="s">&quot;asn&quot;</span><span class="p">:</span> <span class="s">&quot;7015&quot;</span><span class="p">,</span>
+          <span class="s">&quot;cachegroup&quot;</span><span class="p">:</span> <span class="s">&quot;us-ma-woburn&quot;</span>
        <span class="p">},</span>
        <span class="p">{</span>
-          <span class="s2">&quot;lastUpdated&quot;</span><span class="p">:</span> <span class="s2">&quot;2012-09-17 21:41:22&quot;</span><span class="p">,</span>
-          <span class="s2">&quot;id&quot;</span><span class="p">:</span> <span class="s2">&quot;28&quot;</span><span class="p">,</span>
-          <span class="s2">&quot;asn&quot;</span><span class="p">:</span> <span class="s2">&quot;7016&quot;</span><span class="p">,</span>
-          <span class="s2">&quot;cachegroup&quot;</span><span class="p">:</span> <span class="s2">&quot;us-pa-pittsburgh&quot;</span>
+          <span class="s">&quot;lastUpdated&quot;</span><span class="p">:</span> <span class="s">&quot;2012-09-17 21:41:22&quot;</span><span class="p">,</span>
+          <span class="s">&quot;id&quot;</span><span class="p">:</span> <span class="s">&quot;28&quot;</span><span class="p">,</span>
+          <span class="s">&quot;asn&quot;</span><span class="p">:</span> <span class="s">&quot;7016&quot;</span><span class="p">,</span>
+          <span class="s">&quot;cachegroup&quot;</span><span class="p">:</span> <span class="s">&quot;us-pa-pittsburgh&quot;</span>
        <span class="p">}</span>
     <span class="p">]</span>
  <span class="p">},</span>
@@ -293,7 +293,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../../../',
-            VERSION:'1.7',
+            VERSION:'master',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/latest/development/traffic_ops_api/v11/cachegroup.html b/docs/latest/development/traffic_ops_api/v11/cachegroup.html
index c5655d8..c700674 100644
--- a/docs/latest/development/traffic_ops_api/v11/cachegroup.html
+++ b/docs/latest/development/traffic_ops_api/v11/cachegroup.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Cache Group &mdash; Traffic Control 1.7 documentation </title>
+  <title>Cache Group &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="Traffic Ops" href="../../traffic_ops.html"/>
         <link rel="next" title="CDN" href="cdn.html"/>
         <link rel="prev" title="ASN" href="asn.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">Developer&#8217;s Guide</a> &raquo;</li>
       
@@ -259,35 +259,35 @@
 </tbody>
 </table>
 <p><strong>Response Example</strong></p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span>
- <span class="s2">&quot;response&quot;</span><span class="p">:</span> <span class="p">[</span>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+ <span class="s">&quot;response&quot;</span><span class="p">:</span> <span class="p">[</span>
     <span class="p">{</span>
-       <span class="s2">&quot;id&quot;</span><span class="p">:</span> <span class="s2">&quot;21&quot;</span><span class="p">,</span>
-       <span class="s2">&quot;lastUpdated&quot;</span><span class="p">:</span> <span class="s2">&quot;2012-09-25 20:27:28&quot;</span><span class="p">,</span>
-       <span class="s2">&quot;latitude&quot;</span><span class="p">:</span> <span class="s2">&quot;0&quot;</span><span class="p">,</span>
-       <span class="s2">&quot;longitude&quot;</span><span class="p">:</span> <span class="s2">&quot;0&quot;</span><span class="p">,</span>
-       <span class="s2">&quot;name&quot;</span><span class="p">:</span> <span class="s2">&quot;dc-chicago&quot;</span><span class="p">,</span>
-       <span class="s2">&quot;parentCachegroupId&quot;</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
-       <span class="s2">&quot;parentCachegroupName&quot;</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
-       <span class="s2">&quot;secondaryParentCachegroupId&quot;</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
-       <span class="s2">&quot;secondaryParentCachegroupName&quot;</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
-       <span class="s2">&quot;shortName&quot;</span><span class="p">:</span> <span class="s2">&quot;dcchi&quot;</span><span class="p">,</span>
-       <span class="s2">&quot;typeName&quot;</span><span class="p">:</span> <span class="s2">&quot;MID_LOC&quot;</span><span class="p">,</span>
-       <span class="s2">&quot;typeId&quot;</span><span class="p">:</span> <span class="s2">&quot;4&quot;</span>
+       <span class="s">&quot;id&quot;</span><span class="p">:</span> <span class="s">&quot;21&quot;</span><span class="p">,</span>
+       <span class="s">&quot;lastUpdated&quot;</span><span class="p">:</span> <span class="s">&quot;2012-09-25 20:27:28&quot;</span><span class="p">,</span>
+       <span class="s">&quot;latitude&quot;</span><span class="p">:</span> <span class="s">&quot;0&quot;</span><span class="p">,</span>
+       <span class="s">&quot;longitude&quot;</span><span class="p">:</span> <span class="s">&quot;0&quot;</span><span class="p">,</span>
+       <span class="s">&quot;name&quot;</span><span class="p">:</span> <span class="s">&quot;dc-chicago&quot;</span><span class="p">,</span>
+       <span class="s">&quot;parentCachegroupId&quot;</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
+       <span class="s">&quot;parentCachegroupName&quot;</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
+       <span class="s">&quot;secondaryParentCachegroupId&quot;</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
+       <span class="s">&quot;secondaryParentCachegroupName&quot;</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
+       <span class="s">&quot;shortName&quot;</span><span class="p">:</span> <span class="s">&quot;dcchi&quot;</span><span class="p">,</span>
+       <span class="s">&quot;typeName&quot;</span><span class="p">:</span> <span class="s">&quot;MID_LOC&quot;</span><span class="p">,</span>
+       <span class="s">&quot;typeId&quot;</span><span class="p">:</span> <span class="s">&quot;4&quot;</span>
     <span class="p">},</span>
     <span class="p">{</span>
-       <span class="s2">&quot;id&quot;</span><span class="p">:</span> <span class="s2">&quot;22&quot;</span><span class="p">,</span>
-       <span class="s2">&quot;lastUpdated&quot;</span><span class="p">:</span> <span class="s2">&quot;2012-09-25 20:27:28&quot;</span><span class="p">,</span>
-       <span class="s2">&quot;latitude&quot;</span><span class="p">:</span> <span class="s2">&quot;0&quot;</span><span class="p">,</span>
-       <span class="s2">&quot;longitude&quot;</span><span class="p">:</span> <span class="s2">&quot;0&quot;</span><span class="p">,</span>
-       <span class="s2">&quot;name&quot;</span><span class="p">:</span> <span class="s2">&quot;dc-chicago-1&quot;</span><span class="p">,</span>
-       <span class="s2">&quot;parentCachegroupId&quot;</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
-       <span class="s2">&quot;parentCachegroupName&quot;</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
-       <span class="s2">&quot;secondaryParentCachegroupId&quot;</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
-       <span class="s2">&quot;secondaryParentCachegroupName&quot;</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
-       <span class="s2">&quot;shortName&quot;</span><span class="p">:</span> <span class="s2">&quot;dcchi&quot;</span><span class="p">,</span>
-       <span class="s2">&quot;typeName&quot;</span><span class="p">:</span> <span class="s2">&quot;MID_LOC&quot;</span><span class="p">,</span>
-       <span class="s2">&quot;typeId&quot;</span><span class="p">:</span> <span class="s2">&quot;4&quot;</span>
+       <span class="s">&quot;id&quot;</span><span class="p">:</span> <span class="s">&quot;22&quot;</span><span class="p">,</span>
+       <span class="s">&quot;lastUpdated&quot;</span><span class="p">:</span> <span class="s">&quot;2012-09-25 20:27:28&quot;</span><span class="p">,</span>
+       <span class="s">&quot;latitude&quot;</span><span class="p">:</span> <span class="s">&quot;0&quot;</span><span class="p">,</span>
+       <span class="s">&quot;longitude&quot;</span><span class="p">:</span> <span class="s">&quot;0&quot;</span><span class="p">,</span>
+       <span class="s">&quot;name&quot;</span><span class="p">:</span> <span class="s">&quot;dc-chicago-1&quot;</span><span class="p">,</span>
+       <span class="s">&quot;parentCachegroupId&quot;</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
+       <span class="s">&quot;parentCachegroupName&quot;</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
+       <span class="s">&quot;secondaryParentCachegroupId&quot;</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
+       <span class="s">&quot;secondaryParentCachegroupName&quot;</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
+       <span class="s">&quot;shortName&quot;</span><span class="p">:</span> <span class="s">&quot;dcchi&quot;</span><span class="p">,</span>
+       <span class="s">&quot;typeName&quot;</span><span class="p">:</span> <span class="s">&quot;MID_LOC&quot;</span><span class="p">,</span>
+       <span class="s">&quot;typeId&quot;</span><span class="p">:</span> <span class="s">&quot;4&quot;</span>
     <span class="p">}</span>
  <span class="p">],</span>
 <span class="p">}</span>
@@ -322,16 +322,16 @@
 </tbody>
 </table>
 <p><strong>Response Example</strong></p>
-<div class="highlight-default"><div class="highlight"><pre><span></span> <span class="p">{</span>
-  <span class="s2">&quot;response&quot;</span><span class="p">:</span> <span class="p">[</span>
-     <span class="p">{</span>
-        <span class="s2">&quot;name&quot;</span><span class="p">:</span> <span class="s2">&quot;dc-chicago&quot;</span>
-     <span class="p">},</span>
-     <span class="p">{</span>
-        <span class="s2">&quot;name&quot;</span><span class="p">:</span> <span class="s2">&quot;dc-cmc&quot;</span>
-     <span class="p">}</span>
-  <span class="p">],</span>
-<span class="p">}</span>
+<div class="highlight-python"><div class="highlight"><pre> {
+  &quot;response&quot;: [
+     {
+        &quot;name&quot;: &quot;dc-chicago&quot;
+     },
+     {
+        &quot;name&quot;: &quot;dc-cmc&quot;
+     }
+  ],
+}
 </pre></div>
 </div>
 </div></blockquote>
@@ -407,21 +407,21 @@
 </tbody>
 </table>
 <p><strong>Response Example</strong></p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span>
- <span class="s2">&quot;response&quot;</span><span class="p">:</span> <span class="p">[</span>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+ <span class="s">&quot;response&quot;</span><span class="p">:</span> <span class="p">[</span>
     <span class="p">{</span>
-       <span class="s2">&quot;id&quot;</span><span class="p">:</span> <span class="s2">&quot;21&quot;</span><span class="p">,</span>
-       <span class="s2">&quot;lastUpdated&quot;</span><span class="p">:</span> <span class="s2">&quot;2012-09-25 20:27:28&quot;</span><span class="p">,</span>
-       <span class="s2">&quot;latitude&quot;</span><span class="p">:</span> <span class="s2">&quot;0&quot;</span><span class="p">,</span>
-       <span class="s2">&quot;longitude&quot;</span><span class="p">:</span> <span class="s2">&quot;0&quot;</span><span class="p">,</span>
-       <span class="s2">&quot;name&quot;</span><span class="p">:</span> <span class="s2">&quot;dc-chicago&quot;</span><span class="p">,</span>
-       <span class="s2">&quot;parentCachegroupId&quot;</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
-       <span class="s2">&quot;parentCachegroupName&quot;</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
-       <span class="s2">&quot;secondaryParentCachegroupId&quot;</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
-       <span class="s2">&quot;secondaryParentCachegroupName&quot;</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
-       <span class="s2">&quot;shortName&quot;</span><span class="p">:</span> <span class="s2">&quot;dcchi&quot;</span><span class="p">,</span>
-       <span class="s2">&quot;typeName&quot;</span><span class="p">:</span> <span class="s2">&quot;MID_LOC&quot;</span><span class="p">,</span>
-       <span class="s2">&quot;typeId&quot;</span><span class="p">:</span> <span class="s2">&quot;4&quot;</span>
+       <span class="s">&quot;id&quot;</span><span class="p">:</span> <span class="s">&quot;21&quot;</span><span class="p">,</span>
+       <span class="s">&quot;lastUpdated&quot;</span><span class="p">:</span> <span class="s">&quot;2012-09-25 20:27:28&quot;</span><span class="p">,</span>
+       <span class="s">&quot;latitude&quot;</span><span class="p">:</span> <span class="s">&quot;0&quot;</span><span class="p">,</span>
+       <span class="s">&quot;longitude&quot;</span><span class="p">:</span> <span class="s">&quot;0&quot;</span><span class="p">,</span>
+       <span class="s">&quot;name&quot;</span><span class="p">:</span> <span class="s">&quot;dc-chicago&quot;</span><span class="p">,</span>
+       <span class="s">&quot;parentCachegroupId&quot;</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
+       <span class="s">&quot;parentCachegroupName&quot;</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
+       <span class="s">&quot;secondaryParentCachegroupId&quot;</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
+       <span class="s">&quot;secondaryParentCachegroupName&quot;</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
+       <span class="s">&quot;shortName&quot;</span><span class="p">:</span> <span class="s">&quot;dcchi&quot;</span><span class="p">,</span>
+       <span class="s">&quot;typeName&quot;</span><span class="p">:</span> <span class="s">&quot;MID_LOC&quot;</span><span class="p">,</span>
+       <span class="s">&quot;typeId&quot;</span><span class="p">:</span> <span class="s">&quot;4&quot;</span>
     <span class="p">}</span>
  <span class="p">],</span>
 <span class="p">}</span>
@@ -484,16 +484,16 @@
 </tbody>
 </table>
 <p><strong>Response Example</strong></p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span>
- <span class="s2">&quot;response&quot;</span><span class="p">:</span> <span class="p">{</span>
-    <span class="s2">&quot;cachegroups&quot;</span><span class="p">:</span> <span class="p">[</span>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+ <span class="s">&quot;response&quot;</span><span class="p">:</span> <span class="p">{</span>
+    <span class="s">&quot;cachegroups&quot;</span><span class="p">:</span> <span class="p">[</span>
        <span class="p">{</span>
-          <span class="s2">&quot;name&quot;</span><span class="p">:</span> <span class="s2">&quot;dc-chicago&quot;</span><span class="p">,</span>
-          <span class="s2">&quot;id&quot;</span><span class="p">:</span> <span class="s2">&quot;21&quot;</span>
+          <span class="s">&quot;name&quot;</span><span class="p">:</span> <span class="s">&quot;dc-chicago&quot;</span><span class="p">,</span>
+          <span class="s">&quot;id&quot;</span><span class="p">:</span> <span class="s">&quot;21&quot;</span>
        <span class="p">},</span>
        <span class="p">{</span>
-          <span class="s2">&quot;name&quot;</span><span class="p">:</span> <span class="s2">&quot;dc-cmc&quot;</span><span class="p">,</span>
-          <span class="s2">&quot;id&quot;</span><span class="p">:</span> <span class="s2">&quot;22&quot;</span>
+          <span class="s">&quot;name&quot;</span><span class="p">:</span> <span class="s">&quot;dc-cmc&quot;</span><span class="p">,</span>
+          <span class="s">&quot;id&quot;</span><span class="p">:</span> <span class="s">&quot;22&quot;</span>
        <span class="p">}</span>
     <span class="p">]</span>
  <span class="p">},</span>
@@ -538,23 +538,23 @@
 </tbody>
 </table>
 <p><strong>Response Example</strong></p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span>
- <span class="s2">&quot;response&quot;</span><span class="p">:</span> <span class="p">{</span>
-    <span class="s2">&quot;cachegroupParameters&quot;</span><span class="p">:</span> <span class="p">[</span>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+ <span class="s">&quot;response&quot;</span><span class="p">:</span> <span class="p">{</span>
+    <span class="s">&quot;cachegroupParameters&quot;</span><span class="p">:</span> <span class="p">[</span>
        <span class="p">{</span>
-          <span class="s2">&quot;parameter&quot;</span><span class="p">:</span> <span class="s2">&quot;379&quot;</span><span class="p">,</span>
-          <span class="s2">&quot;last_updated&quot;</span><span class="p">:</span> <span class="s2">&quot;2013-08-05 18:49:37&quot;</span><span class="p">,</span>
-          <span class="s2">&quot;cachegroup&quot;</span><span class="p">:</span> <span class="s2">&quot;us-ca-sanjose&quot;</span>
+          <span class="s">&quot;parameter&quot;</span><span class="p">:</span> <span class="s">&quot;379&quot;</span><span class="p">,</span>
+          <span class="s">&quot;last_updated&quot;</span><span class="p">:</span> <span class="s">&quot;2013-08-05 18:49:37&quot;</span><span class="p">,</span>
+          <span class="s">&quot;cachegroup&quot;</span><span class="p">:</span> <span class="s">&quot;us-ca-sanjose&quot;</span>
        <span class="p">},</span>
        <span class="p">{</span>
-          <span class="s2">&quot;parameter&quot;</span><span class="p">:</span> <span class="s2">&quot;380&quot;</span><span class="p">,</span>
-          <span class="s2">&quot;last_updated&quot;</span><span class="p">:</span> <span class="s2">&quot;2013-08-05 18:49:37&quot;</span><span class="p">,</span>
-          <span class="s2">&quot;cachegroup&quot;</span><span class="p">:</span> <span class="s2">&quot;us-ca-sanjose&quot;</span>
+          <span class="s">&quot;parameter&quot;</span><span class="p">:</span> <span class="s">&quot;380&quot;</span><span class="p">,</span>
+          <span class="s">&quot;last_updated&quot;</span><span class="p">:</span> <span class="s">&quot;2013-08-05 18:49:37&quot;</span><span class="p">,</span>
+          <span class="s">&quot;cachegroup&quot;</span><span class="p">:</span> <span class="s">&quot;us-ca-sanjose&quot;</span>
        <span class="p">},</span>
        <span class="p">{</span>
-          <span class="s2">&quot;parameter&quot;</span><span class="p">:</span> <span class="s2">&quot;379&quot;</span><span class="p">,</span>
-          <span class="s2">&quot;last_updated&quot;</span><span class="p">:</span> <span class="s2">&quot;2013-08-05 18:49:37&quot;</span><span class="p">,</span>
-          <span class="s2">&quot;cachegroup&quot;</span><span class="p">:</span> <span class="s2">&quot;us-ma-woburn&quot;</span>
+          <span class="s">&quot;parameter&quot;</span><span class="p">:</span> <span class="s">&quot;379&quot;</span><span class="p">,</span>
+          <span class="s">&quot;last_updated&quot;</span><span class="p">:</span> <span class="s">&quot;2013-08-05 18:49:37&quot;</span><span class="p">,</span>
+          <span class="s">&quot;cachegroup&quot;</span><span class="p">:</span> <span class="s">&quot;us-ma-woburn&quot;</span>
        <span class="p">}</span>
     <span class="p">]</span>
  <span class="p">},</span>
@@ -614,15 +614,15 @@
 </tbody>
 </table>
 <p><strong>Response Example</strong></p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span>
- <span class="s2">&quot;response&quot;</span><span class="p">:</span> <span class="p">[</span>
+<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
+ <span class="s">&quot;response&quot;</span><span class="p">:</span> <span class="p">[</span>
     <span class="p">{</span>
-       <span class="s2">&quot;name&quot;</span><span class="p">:</span> <span class="s2">&quot;dc-chicago&quot;</span><span class="p">,</span>
-       <span class="s2">&quot;id&quot;</span><span class="p">:</span> <span class="s2">&quot;21&quot;</span>
+       <span class="s">&quot;name&quot;</span><span class="p">:</span> <span class="s">&quot;dc-chicago&quot;</span><span class="p">,</span>
+       <span class="s">&quot;id&quot;</span><span class="p">:</span> <span class="s">&quot;21&quot;</span>
     <span class="p">},</span>
     <span class="p">{</span>
-       <span class="s2">&quot;name&quot;</span><span class="p">:</span> <span class="s2">&quot;dc-cmc&quot;</span><span class="p">,</span>
-       <span class="s2">&quot;id&quot;</span><span class="p">:</span> <span class="s2">&quot;22&quot;</span>
+       <span class="s">&quot;name&quot;</span><span class="p">:</span> <span class="s">&quot;dc-cmc&quot;</span><span class="p">,</span>
+       <span class="s">&quot;id&quot;</span><span class="p">:</span> <span class="s">&quot;22&quot;</span>
     <span class="p">}</span>
  <span class="p">],</span>
 <span class="p">}</span>
@@ -670,7 +670,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../../../',
-            VERSION:'1.7',
+            VERSION:'master',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true
diff --git a/docs/latest/development/traffic_ops_api/v11/cdn.html b/docs/latest/development/traffic_ops_api/v11/cdn.html
index 8b4ec50..adb3716 100644
--- a/docs/latest/development/traffic_ops_api/v11/cdn.html
+++ b/docs/latest/development/traffic_ops_api/v11/cdn.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>CDN &mdash; Traffic Control 1.7 documentation </title>
+  <title>CDN &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="Traffic Ops" href="../../traffic_ops.html"/>
         <link rel="next" title="Change Logs" href="changelog.html"/>
         <link rel="prev" title="Cache Group" href="cachegroup.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">Developer&#8217;s Guide</a> &raquo;</li>
       
@@ -227,22 +227,22 @@
 </tbody>
 </table>
 <p><strong>Response Example</strong></p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span>
- <span class="s2">&quot;response&quot;</span><span class="p">:</span> <span class="p">[</span>
-       <span class="p">{</span>
-          <span class="s2">&quot;id&quot;</span><span class="p">:</span> <span class="s2">&quot;1&quot;</span>
-          <span class="s2">&quot;name&quot;</span><span class="p">:</span> <span class="s2">&quot;over-the-top&quot;</span><span class="p">,</span>
-          <span class="s2">&quot;dnssecEnabled&quot;</span><span class="p">:</span> <span class="n">false</span><span class="p">,</span>
-          <span class="s2">&quot;lastUpdated&quot;</span><span class="p">:</span> <span class="s2">&quot;2014-10-02 08:22:43&quot;</span>
-       <span class="p">},</span>
-       <span class="p">{</span>
-          <span class="s2">&quot;id&quot;</span><span class="p">:</span> <span class="s2">&quot;2&quot;</span>
-          <span class="s2">&quot;name&quot;</span><span class="p">:</span> <span class="s2">&quot;cdn2&quot;</span><span class="p">,</span>
-          <span class="s2">&quot;dnssecEnabled&quot;</span><span class="p">:</span> <span class="n">true</span><span class="p">,</span>
-          <span class="s2">&quot;lastUpdated&quot;</span><span class="p">:</span> <span class="s2">&quot;2014-10-02 08:22:43&quot;</span>
-       <span class="p">}</span>
-    <span class="p">]</span>
-<span class="p">}</span>
+<div class="highlight-python"><div class="highlight"><pre>{
+ &quot;response&quot;: [
+       {
+          &quot;id&quot;: &quot;1&quot;
+          &quot;name&quot;: &quot;over-the-top&quot;,
+          &quot;dnssecEnabled&quot;: false,
+          &quot;lastUpdated&quot;: &quot;2014-10-02 08:22:43&quot;
+       },
+       {
+          &quot;id&quot;: &quot;2&quot;
+          &quot;name&quot;: &quot;cdn2&quot;,
+          &quot;dnssecEnabled&quot;: true,
+          &quot;lastUpdated&quot;: &quot;2014-10-02 08:22:43&quot;
+       }
+    ]
+}
 </pre></div>
 </div>
 </div></blockquote>
@@ -306,16 +306,16 @@
 </tbody>
 </table>
 <p><strong>Response Example</strong></p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span>
- <span class="s2">&quot;response&quot;</span><span class="p">:</span> <span class="p">[</span>
-       <span class="p">{</span>
-          <span class="s2">&quot;id&quot;</span><span class="p">:</span> <span class=&