You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2017/04/28 19:11:09 UTC

[8/9] incubator-trafficcontrol-website git commit: updates latest to match master

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/868aab4e/docs/latest/_sources/development/traffic_ops_api/v12/deliveryservice.txt
----------------------------------------------------------------------
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 3618141..8e21e98 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/deliveryservice.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/deliveryservice.txt
@@ -39,6 +39,8 @@ Delivery Service
   +=================+==========+===================================================+
   | ``cdn``         | no       | Filter delivery services by CDN ID.               |
   +-----------------+----------+---------------------------------------------------+
+  | ``profile``     | no       | Filter delivery services by Profile ID.           |
+  +-----------------+----------+---------------------------------------------------+
   | ``type``        | no       | Filter delivery services by Type ID.              |
   +-----------------+----------+---------------------------------------------------+
   | ``logsEnabled`` | no       | Filter by logs enabled (true|false).              |
@@ -126,9 +128,13 @@ Delivery Service
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``midHeaderRewrite``     | string | The MID header rewrite actions to perform.                                                                                           |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``missLat``              | float  | The latitude to use when the client cannot be found in the CZF or the Geo lookup.                                                    |
+  | ``missLat``              | float  | The latitude as decimal degrees to use when the client cannot be found in the CZF or the Geo lookup.                                 |
+  |                          |        |                                                                                                                                      |
+  |                          |        | - e.g. 39.7391500 or null                                                                                                            |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``missLong``             | float  | The longitude to use when the client cannot be found in the CZF or the Geo lookup.                                                   |
+  | ``missLong``             | float  | The longitude as decimal degrees to use when the client cannot be found in the CZF or the Geo lookup.                                |
+  |                          |        |                                                                                                                                      |
+  |                          |        | - e.g. -104.9847000 or null                                                                                                          |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``multiSiteOrigin``      |  bool  | Is the Multi Site Origin feature enabled for this delivery service (0=false, 1=true). See :ref:`rl-multi-site-origin`                |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
@@ -216,8 +222,8 @@ Delivery Service
             "longDesc2": "",
             "maxDnsAnswers": "0",
             "midHeaderRewrite": null,
-            "missLat": "41.881944",
-            "missLong": "-87.627778",
+            "missLat": "39.7391500",
+            "missLong": "-104.9847000",
             "multiSiteOrigin": false,
             "orgServerFqdn": "http://baz.boo.net",
             "originShield": null,
@@ -351,9 +357,13 @@ Delivery Service
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``midHeaderRewrite``     | string | The MID header rewrite actions to perform.                                                                                           |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``missLat``              | float  | The latitude to use when the client cannot be found in the CZF or the Geo lookup.                                                    |
+  | ``missLat``              | float  | The latitude as decimal degrees to use when the client cannot be found in the CZF or the Geo lookup.                                 |
+  |                          |        |                                                                                                                                      |
+  |                          |        | - e.g. 39.7391500 or null                                                                                                            |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
-  | ``missLong``             | float  | The longitude to use when the client cannot be found in the CZF or the Geo lookup.                                                   |
+  | ``missLong``             | float  | The longitude as decimal degrees to use when the client cannot be found in the CZF or the Geo lookup.                                |
+  |                          |        |                                                                                                                                      |
+  |                          |        | - e.g. -104.9847000 or null                                                                                                          |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
   | ``multiSiteOrigin``      |  bool  | Is the Multi Site Origin feature enabled for this delivery service (0=false, 1=true). See :ref:`rl-multi-site-origin`                |
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
@@ -448,8 +458,8 @@ Delivery Service
             ],
             "maxDnsAnswers": "0",
             "midHeaderRewrite": null,
-            "missLat": "41.881944",
-            "missLong": "-87.627778",
+            "missLat": "39.7391500",
+            "missLong": "-104.9847000",
             "multiSiteOrigin": false,
             "orgServerFqdn": "http://baz.boo.net",
             "originShield": null,
@@ -900,6 +910,37 @@ Server
     }
 
 
+**DELETE /api/1.2/deliveryservice_server/:dsId/:serverId**
+
+  Removes a server (cache) from a delivery service.
+
+  Authentication Required: Yes
+
+  Role(s) Required: Admin or Oper (if delivery service is not assigned to user)
+
+  **Request Route Parameters**
+
+  +-----------------+----------+---------------------------------------------------+
+  | Name            | Required | Description                                       |
+  +=================+==========+===================================================+
+  | ``dsId``        | yes      | Delivery service ID.                              |
+  +-----------------+----------+---------------------------------------------------+
+  | ``serverId``    | yes      | Server (cache) ID.                                |
+  +-----------------+----------+---------------------------------------------------+
+
+   **Response Example** ::
+
+    {
+           "alerts": [
+                     {
+                             "level": "success",
+                             "text": "Server unlinked from delivery service."
+                     }
+             ],
+    }
+
+|
+
 
 .. _to-api-v12-ds-sslkeys:
 
@@ -1442,9 +1483,13 @@ SSL Keys
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
   | midHeaderRewrite       | no       | The MID header rewrite actions to perform.                                                              |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
-  | missLat                | yes      | The latitude to use when the client cannot be found in the CZF or the Geo lookup.                       |
+  | missLat                | no       | The latitude as decimal degrees to use when the client cannot be found in the CZF or the Geo lookup.    |
+  |                        |          |                                                                                                         |
+  |                        |          | - e.g. 39.7391500 or null                                                                               |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
-  | missLong               | yes      | The longitude to use when the client cannot be found in the CZF or the Geo lookup.                      |
+  | missLong               | no       | The longitude as decimal degrees to use when the client cannot be found in the CZF or the Geo lookup.   |
+  |                        |          |                                                                                                         |
+  |                        |          | - e.g. -104.9847000 or null                                                                             |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
   | multiSiteOrigin        | yes      | 1 if enabled, 0 if disabled.                                                                            |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
@@ -1508,8 +1553,8 @@ SSL Keys
         "ipv6RoutingEnabled": false,
         "logsEnabled": false,
         "multiSiteOrigin": false,
-        "missLat": 45,
-        "missLong": 45,
+        "missLat": 39.7391500,
+        "missLong": -104.9847000,
         "qstringIgnore": 0,
         "rangeRequestHandling": 0,
         "regionalGeoBlocking": false,
@@ -1517,10 +1562,154 @@ SSL Keys
     }
 
 
+  **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``            |  int   | The TTL of the DNS response for A or AAAA queries requesting the IP address of the tr. host.                                         |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``cdnId``                |  int   | 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.                                                                                            |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``dnsBypassCname``       | string |                                                                                                                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``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``         |  int   | The TTL of the DNS bypass response.                                                                                                  |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``dscp``                 |  int   | The Differentiated Services Code Point (DSCP) with which to mark downstream (EDGE ->  customer) traffic.                             |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``edgeHeaderRewrite``    | string | The EDGE header rewrite actions to perform.                                                                                          |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``exampleURLs``          | array  | Entry points into the CDN for this deliveryservice.                                                                                  |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``geoLimitRedirectUrl``  | string |                                                                                                                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``geoLimit``             |  int   | - 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``          |  int   |                                                                                                                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``globalMaxMbps``        |  int   | 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``         |  int   | 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``                   |  int   | The deliveryservice id (database row number).                                                                                        |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``infoUrl``              | string | Use this to add a URL that points to more information about that deliveryservice.                                                    |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``initialDispersion``    |  int   |                                                                                                                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``ipv6RoutingEnabled``   |  bool  | false: send IPv4 address of Traffic Router to client on HTTP type del.                                                               |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``lastUpdated``          | string |                                                                                                                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``logsEnabled``          |  bool  |                                                                                                                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``longDesc``             | string | Description field.                                                                                                                   |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``longDesc1``            | string | Description field 1.                                                                                                                 |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``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.                                                                                                     |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``>>pattern``            | string | The regexp for the matchList.                                                                                                        |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``maxDnsAnswers``        |  int   | 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``              | float  | The latitude as decimal degrees to use when the client cannot be found in the CZF or the Geo lookup.                                 |
+  |                          |        |                                                                                                                                      |
+  |                          |        | - e.g. 39.7391500 or null                                                                                                            |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``missLong``             | float  | The longitude as decimal degrees to use when the client cannot be found in the CZF or the Geo lookup.                                |
+  |                          |        |                                                                                                                                      |
+  |                          |        | - e.g. -104.9847000 or null                                                                                                          |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``multiSiteOrigin``      |  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``            |  int   | 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``             |  int   | - 0: serve with http:// at EDGE                                                                                                      |
+  |                          |        | - 1: serve with https:// at EDGE                                                                                                     |
+  |                          |        | - 2: serve with both http:// and https:// at EDGE                                                                                    |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``qstringIgnore``        |  int   | - 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`` |  int   | 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``        |  int   |                                                                                                                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``trRequestHeaders``     | string |                                                                                                                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``trResponseHeaders``    | string |                                                                                                                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``typeId``               |  int   | 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":
+      "response": [
         {
             "active": true,
             "cacheurl": null,
@@ -1535,6 +1724,9 @@ SSL Keys
             "dnsBypassTtl": "30",
             "dscp": "40",
             "edgeHeaderRewrite": null,
+            "exampleURLs": [
+                "http://edge.foo-ds.foo.bar.net"
+            ],
             "geoLimit": "0",
             "geoLimitCountries": null,
             "geoLimitRedirectURL": null,
@@ -1551,10 +1743,17 @@ SSL Keys
             "longDesc": "",
             "longDesc1": "",
             "longDesc2": "",
+            "matchList": [
+                {
+                    "pattern": ".*\\.foo-ds\\..*",
+                    "setNumber": "0",
+                    "type": "HOST_REGEXP"
+                }
+            ],
             "maxDnsAnswers": "0",
             "midHeaderRewrite": null,
-            "missLat": "41.881944",
-            "missLong": "-87.627778",
+            "missLat": "39.7391500",
+            "missLong": "-104.9847000",
             "multiSiteOrigin": false,
             "orgServerFqdn": "http://baz.boo.net",
             "originShield": null,
@@ -1575,12 +1774,7 @@ SSL Keys
             "typeId": "8",
             "xmlId": "foo-ds"
         }
-        "alerts":[
-            {
-                "level": "success",
-                "text": "Delivery service was created: 312"
-            }
-        ]
+      ]
     }
 
 |
@@ -1676,9 +1870,13 @@ SSL Keys
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
   | midHeaderRewrite       | no       | The MID header rewrite actions to perform.                                                              |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
-  | missLat                | yes      | The latitude to use when the client cannot be found in the CZF or the Geo lookup.                       |
+  | missLat                | no       | The latitude as decimal degrees to use when the client cannot be found in the CZF or the Geo lookup.    |
+  |                        |          |                                                                                                         |
+  |                        |          | - e.g. 39.7391500 or null                                                                               |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
-  | missLong               | yes      | The longitude to use when the client cannot be found in the CZF or the Geo lookup.                      |
+  | missLong               | no       | The longitude as decimal degrees to use when the client cannot be found in the CZF or the Geo lookup.   |
+  |                        |          |                                                                                                         |
+  |                        |          | - e.g. -104.9847000 or null                                                                             |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
   | multiSiteOrigin        | yes      | 1 if enabled, 0 if disabled.                                                                            |
   +------------------------+----------+---------------------------------------------------------------------------------------------------------+
@@ -1742,8 +1940,8 @@ SSL Keys
         "ipv6RoutingEnabled": false,
         "logsEnabled": false,
         "multiSiteOrigin": false,
-        "missLat": 45,
-        "missLong": 45,
+        "missLat": 39.7391500,
+        "missLong": -104.9847000,
         "qstringIgnore": 0,
         "rangeRequestHandling": 0,
         "regionalGeoBlocking": false,
@@ -1751,10 +1949,154 @@ SSL Keys
     }
 
 
+  **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``            |  int   | The TTL of the DNS response for A or AAAA queries requesting the IP address of the tr. host.                                         |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``cdnId``                |  int   | 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.                                                                                            |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``dnsBypassCname``       | string |                                                                                                                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``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``         |  int   | The TTL of the DNS bypass response.                                                                                                  |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``dscp``                 |  int   | The Differentiated Services Code Point (DSCP) with which to mark downstream (EDGE ->  customer) traffic.                             |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``edgeHeaderRewrite``    | string | The EDGE header rewrite actions to perform.                                                                                          |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``exampleURLs``          | array  | Entry points into the CDN for this deliveryservice.                                                                                  |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``geoLimitRedirectUrl``  | string |                                                                                                                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``geoLimit``             |  int   | - 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``          |  int   |                                                                                                                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``globalMaxMbps``        |  int   | 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``         |  int   | 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``                   |  int   | The deliveryservice id (database row number).                                                                                        |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``infoUrl``              | string | Use this to add a URL that points to more information about that deliveryservice.                                                    |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``initialDispersion``    |  int   |                                                                                                                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``ipv6RoutingEnabled``   |  bool  | false: send IPv4 address of Traffic Router to client on HTTP type del.                                                               |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``lastUpdated``          | string |                                                                                                                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``logsEnabled``          |  bool  |                                                                                                                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``longDesc``             | string | Description field.                                                                                                                   |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``longDesc1``            | string | Description field 1.                                                                                                                 |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``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.                                                                                                     |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``>>pattern``            | string | The regexp for the matchList.                                                                                                        |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``maxDnsAnswers``        |  int   | 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``              | float  | The latitude as decimal degrees to use when the client cannot be found in the CZF or the Geo lookup.                                 |
+  |                          |        |                                                                                                                                      |
+  |                          |        | - e.g. 39.7391500 or null                                                                                                            |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``missLong``             | float  | The longitude as decimal degrees to use when the client cannot be found in the CZF or the Geo lookup.                                |
+  |                          |        |                                                                                                                                      |
+  |                          |        | - e.g. -104.9847000 or null                                                                                                          |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``multiSiteOrigin``      |  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``            |  int   | 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``             |  int   | - 0: serve with http:// at EDGE                                                                                                      |
+  |                          |        | - 1: serve with https:// at EDGE                                                                                                     |
+  |                          |        | - 2: serve with both http:// and https:// at EDGE                                                                                    |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``qstringIgnore``        |  int   | - 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`` |  int   | 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``        |  int   |                                                                                                                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``trRequestHeaders``     | string |                                                                                                                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``trResponseHeaders``    | string |                                                                                                                                      |
+  +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+  | ``typeId``               |  int   | 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":
+      "response": [
         {
             "active": true,
             "cacheurl": null,
@@ -1769,6 +2111,9 @@ SSL Keys
             "dnsBypassTtl": "30",
             "dscp": "40",
             "edgeHeaderRewrite": null,
+            "exampleURLs": [
+                "http://edge.foo-ds.foo.bar.net"
+            ],
             "geoLimit": "0",
             "geoLimitCountries": null,
             "geoLimitRedirectURL": null,
@@ -1785,10 +2130,17 @@ SSL Keys
             "longDesc": "",
             "longDesc1": "",
             "longDesc2": "",
+            "matchList": [
+                {
+                    "pattern": ".*\\.foo-ds\\..*",
+                    "setNumber": "0",
+                    "type": "HOST_REGEXP"
+                }
+            ],
             "maxDnsAnswers": "0",
             "midHeaderRewrite": null,
-            "missLat": "41.881944",
-            "missLong": "-87.627778",
+            "missLat": "39.7391500",
+            "missLong": "-104.9847000",
             "multiSiteOrigin": false,
             "orgServerFqdn": "http://baz.boo.net",
             "originShield": null,
@@ -1809,12 +2161,7 @@ SSL Keys
             "typeId": "8",
             "xmlId": "foo-ds"
         }
-        "alerts":[
-            {
-                "level": "success",
-                "text": "Delivery service was updated: 312"
-            }
-        ]
+      ]
     }
 
 |

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/868aab4e/docs/latest/_sources/development/traffic_ops_api/v12/tenant.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/tenant.txt b/docs/latest/_sources/development/traffic_ops_api/v12/tenant.txt
index afdcaa7..f75868e 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/tenant.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/tenant.txt
@@ -42,7 +42,9 @@ Tenants
   +----------------------+--------+-------------------------------------------------+
   |``active``            |  bool  | Active or inactive                              |
   +----------------------+--------+-------------------------------------------------+
-  |``parentId``          |  int   | Parent tenant                                   |
+  |``parentId``          |  int   | Parent tenant ID                                |
+  +----------------------+--------+-------------------------------------------------+
+  |``parentName``        | string | Parent tenant name                              |
   +----------------------+--------+-------------------------------------------------+
 
   **Response Example** ::
@@ -54,12 +56,14 @@ Tenants
            "name": "root",
            "active": true,
            "parentId": null,
+           "parentName": null,
         },
         {
            "id": 2
            "name": "tenant-a",
            "active": true,
            "parentId": 1
+           "parentName": "root"
         }
      ]
     }
@@ -86,7 +90,9 @@ Tenants
   +----------------------+--------+-------------------------------------------------+
   |``active``            |  bool  | Active or inactive                              |
   +----------------------+--------+-------------------------------------------------+
-  |``parentId``          |  int   | Parent tenant                                   |
+  |``parentId``          |  int   | Parent tenant ID                                |
+  +----------------------+--------+-------------------------------------------------+
+  |``parentName``        | string | Parent tenant name                              |
   +----------------------+--------+-------------------------------------------------+
 
   **Response Example** ::
@@ -98,6 +104,7 @@ Tenants
            "name": "tenant-a",
            "active": true,
            "parentId": 1,
+           "parentName": "root"
         }
      ]
     }
@@ -154,7 +161,9 @@ Tenants
   +----------------------+--------+-------------------------------------------------+
   |``active``            |  bool  | Active or inactive                              |
   +----------------------+--------+-------------------------------------------------+
-  |``parentId``          |  int   | Parent tenant                                   |
+  |``parentId``          |  int   | Parent tenant ID                                |
+  +----------------------+--------+-------------------------------------------------+
+  |``parentName``        | string | Parent tenant name                              |
   +----------------------+--------+-------------------------------------------------+
 
   **Response Example** ::
@@ -165,6 +174,7 @@ Tenants
 			"name": "my-tenant",
 			"active": true,
 			"parentId": 1,
+			"parentName": "root",
 			"lastUpdated": "2014-03-18 08:57:39"
 		},
 		"alerts": [
@@ -218,7 +228,9 @@ Tenants
   +----------------------+--------+-------------------------------------------------+
   |``active``            |  bool  | Active or inactive                              |
   +----------------------+--------+-------------------------------------------------+
-  |``parentId``          |  int   | Parent tenant                                   |
+  |``parentId``          |  int   | Parent tenant ID                                |
+  +----------------------+--------+-------------------------------------------------+
+  |``parentName``        | string | Parent tenant name                              |
   +----------------------+--------+-------------------------------------------------+
 
   **Response Example** ::
@@ -229,6 +241,7 @@ Tenants
 			"name": "your-tenant",
 			"active": false,
 			"parentId": 2,
+			"parentName": "my-tenant",
 			"lastUpdated": "2014-03-18 08:57:39"
 		},
 		"alerts": [

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/868aab4e/docs/latest/_sources/development/traffic_ops_api/v12/user.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/user.txt b/docs/latest/_sources/development/traffic_ops_api/v12/user.txt
index b141eca..c84dfc5 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/user.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/user.txt
@@ -72,6 +72,10 @@ Users
   +----------------------+--------+------------------------------------------------+
   |``stateOrProvince``   | string |                                                |
   +----------------------+--------+------------------------------------------------+
+  | ``tenant``           | string | Owning tenant name                             |
+  +----------------------+--------+------------------------------------------------+
+  | ``tenantId``         | int    | Owning tenant ID                               |
+  +----------------------+--------+------------------------------------------------+
   |``uid``               | string |                                                |
   +----------------------+--------+------------------------------------------------+
   |``username``          | string |                                                |
@@ -100,6 +104,8 @@ Users
 			"role": "6",
 			"rolename": "admin",
 			"stateOrProvince": "",
+			"tenant": "root",
+			"tenantId": 1,
 			"uid": "0",
 			"username": "tsimpson"
 		 },
@@ -169,6 +175,10 @@ Users
   +----------------------+--------+------------------------------------------------+
   |``stateOrProvince``   | string |                                                |
   +----------------------+--------+------------------------------------------------+
+  | ``tenant``           | string | Owning tenant name                             |
+  +----------------------+--------+------------------------------------------------+
+  | ``tenantId``         | int    | Owning tenant ID                               |
+  +----------------------+--------+------------------------------------------------+
   |``uid``               | string |                                                |
   +----------------------+--------+------------------------------------------------+
   |``username``          | string |                                                |
@@ -197,6 +207,8 @@ Users
 			"role": "6",
 			"rolename": "admin",
 			"stateOrProvince": "",
+			"tenant": "root",
+			"tenantId": 1,
 			"uid": "0",
 			"username": "tsimpson"
 		 },
@@ -440,7 +452,7 @@ Users
 |
 
 
-**GET /api/1.2/user/current.json**
+**GET /api/1.2/user/current**
 
   Retrieves the profile for the authenticated user.
 
@@ -448,7 +460,7 @@ Users
 
   Role(s) Required: None
 
-  **Request Properties**
+  **Response Properties**
 
   +----------------------+---------+------------------------------------------------+
   | Parameter            | Type    | Description                                    |
@@ -487,6 +499,10 @@ Users
   +----------------------+---------+------------------------------------------------+
   |``postalCode``        | string  |                                                |
   +----------------------+---------+------------------------------------------------+
+  | ``tenant``           | string  | Owning tenant name                             |
+  +----------------------+---------+------------------------------------------------+
+  | ``tenantId``         | int     | Owning tenant ID                               |
+  +----------------------+---------+------------------------------------------------+
 
   **Response Example** ::
 
@@ -508,13 +524,16 @@ Users
                             "role": "6",
                             "addressLine1": "",
                             "gid": "0",
-                            "postalCode": ""
+                            "postalCode": "",
+                            "tenant": "root",
+                            "tenantId": 1
+
            },
     }
 
 |
   
-**POST /api/1.2/user/current/update**
+**PUT /api/1.2/user/current**
 
   Updates the date for the authenticated user.
 
@@ -561,6 +580,10 @@ Users
   +----------------------+---------+------------------------------------------------+
   |``postalCode``        | string  |                                                |
   +----------------------+---------+------------------------------------------------+
+  | ``tenant``           | string  | Owning tenant name                             |
+  +----------------------+---------+------------------------------------------------+
+  | ``tenantId``         | int     | Owning tenant ID                               |
+  +----------------------+---------+------------------------------------------------+
 
   **Request Example** ::
 
@@ -582,7 +605,10 @@ Users
         "role": "6",
         "addressLine1": "",
         "gid": "0",
-        "postalCode": ""
+        "postalCode": "",
+        "tenant": "root",
+        "tenantId": 1,
+
      }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/868aab4e/docs/latest/_sources/index.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/index.txt b/docs/latest/_sources/index.txt
index 2a12096..50b604b 100644
--- a/docs/latest/_sources/index.txt
+++ b/docs/latest/_sources/index.txt
@@ -23,7 +23,7 @@ Traffic Control is an Open Source implementation of a Content Delivery Network.
 
 The following documentation sections are available:
 
-CDN Basics 
+CDN Basics
 ==========
 A review of the basic functionality of a Content Delivery Network. 
 
@@ -53,7 +53,7 @@ How to deploy and manage a Traffic Control CDN.
 
 Developer's Guide
 ==================
-A guide to the various internal and external APIs, and a introduction for the Traffic Control developer.
+A guide to the various internal and external APIs, and an introduction for the Traffic Control developer.
 
 .. toctree::
    :maxdepth: 3

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/868aab4e/docs/latest/_sources/overview/traffic_monitor.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/overview/traffic_monitor.txt b/docs/latest/_sources/overview/traffic_monitor.txt
index 1a3222f..d97bddd 100644
--- a/docs/latest/_sources/overview/traffic_monitor.txt
+++ b/docs/latest/_sources/overview/traffic_monitor.txt
@@ -22,7 +22,7 @@
 
 Traffic Monitor
 ===============
-Traffic Monitor is a Java/Tomcat application that monitors the caches in a CDN for a variety of metrics. These metrics are for use in determining the overall health of a given cache and the related delivery services. A given CDN can operate a number of Traffic Monitors, from a number of geographically diverse locations, to prevent false positives caused by network problems at a given site.
+Traffic Monitor is an HTTP service that monitors the caches in a CDN for a variety of metrics. These metrics are for use in determining the overall health of a given cache and the related delivery services. A given CDN can operate a number of Traffic Monitors, from a number of geographically diverse locations, to prevent false positives caused by network problems at a given site.
 
 Traffic Monitors operate independently, but use the state of other Traffic Monitors in conjunction with their own state, to provide a consistent view of CDN cache health to upstream applications such as Traffic Router. Health Protocol governs the cache and Delivery Service availability. 
 

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/868aab4e/docs/latest/admin/index.html
----------------------------------------------------------------------
diff --git a/docs/latest/admin/index.html b/docs/latest/admin/index.html
index 98e2001..e99337f 100644
--- a/docs/latest/admin/index.html
+++ b/docs/latest/admin/index.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Administrator\u2019s Guide &mdash; Traffic Control master documentation </title>
+  <title>Administrator\u2019s Guide &mdash; Traffic Control 1.8-dev documentation </title>
   
 
   
@@ -33,7 +33,7 @@
   
 
   
-    <link rel="top" title="Traffic Control master documentation" href="../index.html"/>
+    <link rel="top" title="Traffic Control 1.8-dev 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"/> 
 
@@ -107,6 +107,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"><a class="reference internal" href="traffic_monitor_golang.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>
@@ -121,6 +122,7 @@
 <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_monitor_golang.html">Traffic Monitor Golang</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>
@@ -158,7 +160,7 @@
         <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">Traffic Control 1.8-dev</a> &raquo;</li>
       
     <li>Administrator&#8217;s Guide</li>
       <li class="wy-breadcrumbs-aside">
@@ -188,9 +190,9 @@
 <ol class="arabic simple">
 <li>Traffic Ops</li>
 <li>Traffic Vault (Riak)</li>
+<li>Traffic Monitor</li>
 <li>Apache Traffic Server Mid-Tier Caches</li>
 <li>Apache Traffic Server Edge Caches</li>
-<li>Traffic Monitor</li>
 <li>Traffic Router</li>
 <li>Traffic Stats</li>
 <li>Traffic Portal</li>
@@ -204,6 +206,11 @@
 <li class="toctree-l3"><a class="reference internal" href="traffic_ops_install.html#upgrading-traffic-ops">Upgrading Traffic Ops</a></li>
 </ul>
 </li>
+<li class="toctree-l2"><a class="reference internal" href="traffic_ops_install.html#manually-generating-and-installing-the-ssl-certificate">Manually Generating and Installing the SSL Certificate</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="traffic_ops_install.html#self-signed-certificate-development">Self-signed Certificate (Development)</a></li>
+<li class="toctree-l3"><a class="reference internal" href="traffic_ops_install.html#certificate-from-certificate-authority-production">Certificate from Certificate Authority (Production)</a></li>
+</ul>
+</li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="traffic_ops_config.html">Configuring Traffic Ops</a><ul>
@@ -270,6 +277,15 @@
 <li class="toctree-l2"><a class="reference internal" href="traffic_monitor.html#troubleshooting-and-log-files">Troubleshooting and log files</a></li>
 </ul>
 </li>
+<li class="toctree-l1"><a class="reference internal" href="traffic_monitor_golang.html">Traffic Monitor Administration</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="traffic_monitor_golang.html#installing-traffic-monitor">Installing Traffic Monitor</a></li>
+<li class="toctree-l2"><a class="reference internal" href="traffic_monitor_golang.html#configuring-traffic-monitor">Configuring Traffic Monitor</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="traffic_monitor_golang.html#configuration-overview">Configuration Overview</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="traffic_monitor_golang.html#troubleshooting-and-log-files">Troubleshooting and log files</a></li>
+</ul>
+</li>
 <li class="toctree-l1"><a class="reference internal" href="traffic_router.html">Traffic Router Administration</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="traffic_router.html#installing-traffic-router">Installing Traffic Router</a></li>
 <li class="toctree-l2"><a class="reference internal" href="traffic_router.html#configuring-traffic-router">Configuring Traffic Router</a><ul>
@@ -319,7 +335,10 @@
 </li>
 <li class="toctree-l1"><a class="reference internal" href="traffic_server.html">Traffic Server Administration</a><ul>
 <li class="toctree-l2"><a class="reference internal" href="traffic_server.html#installing-traffic-server">Installing Traffic Server</a></li>
-<li class="toctree-l2"><a class="reference internal" href="traffic_server.html#configuring-traffic-server">Configuring Traffic Server</a></li>
+<li class="toctree-l2"><a class="reference internal" href="traffic_server.html#configuring-traffic-server">Configuring Traffic Server</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="traffic_server.html#installing-the-ort-script">Installing the ORT script</a></li>
+</ul>
+</li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="traffic_vault.html">Traffic Vault Administration</a><ul>
@@ -387,7 +406,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../',
-            VERSION:'master',
+            VERSION:'1.8-dev',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/868aab4e/docs/latest/admin/quick_howto/dnssec.html
----------------------------------------------------------------------
diff --git a/docs/latest/admin/quick_howto/dnssec.html b/docs/latest/admin/quick_howto/dnssec.html
index 69775c1..979522c 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 master documentation </title>
+  <title>Configure DNSSEC &mdash; Traffic Control 1.8-dev documentation </title>
   
 
   
@@ -33,7 +33,7 @@
   
 
   
-    <link rel="top" title="Traffic Control master documentation" href="../../index.html"/>
+    <link rel="top" title="Traffic Control 1.8-dev 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 (5.x)" href="multi_site_ats5.html"/> 
@@ -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 master</a> &raquo;</li>
+    <li><a href="../../index.html">Traffic Control 1.8-dev</a> &raquo;</li>
       
           <li><a href="../index.html">Administrator&#8217;s Guide</a> &raquo;</li>
       
@@ -278,7 +278,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../../',
-            VERSION:'master',
+            VERSION:'1.8-dev',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/868aab4e/docs/latest/admin/quick_howto/federations.html
----------------------------------------------------------------------
diff --git a/docs/latest/admin/quick_howto/federations.html b/docs/latest/admin/quick_howto/federations.html
index a02454a..9c28266 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 master documentation </title>
+  <title>Configure Federations &mdash; Traffic Control 1.8-dev documentation </title>
   
 
   
@@ -33,7 +33,7 @@
   
 
   
-    <link rel="top" title="Traffic Control master documentation" href="../../index.html"/>
+    <link rel="top" title="Traffic Control 1.8-dev 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"/> 
@@ -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 master</a> &raquo;</li>
+    <li><a href="../../index.html">Traffic Control 1.8-dev</a> &raquo;</li>
       
           <li><a href="../index.html">Administrator&#8217;s Guide</a> &raquo;</li>
       
@@ -341,7 +341,7 @@ edge.images-c1.kabletown.net.   30 IN CNAME img.mega-cdn.net.
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../../',
-            VERSION:'master',
+            VERSION:'1.8-dev',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true