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/03/31 18:05:02 UTC
[03/22] incubator-trafficcontrol-website git commit: updates latest
(master) docs
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/45597d7d/docs/latest/development/traffic_ops_api/v12/user.html
----------------------------------------------------------------------
diff --git a/docs/latest/development/traffic_ops_api/v12/user.html b/docs/latest/development/traffic_ops_api/v12/user.html
index f33458e..d0cc125 100644
--- a/docs/latest/development/traffic_ops_api/v12/user.html
+++ b/docs/latest/development/traffic_ops_api/v12/user.html
@@ -292,29 +292,29 @@
</tbody>
</table>
<p><strong>Response Example</strong></p>
-<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
- <span class="s">"response"</span><span class="p">:</span> <span class="p">[</span>
+<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span>
+ <span class="s2">"response"</span><span class="p">:</span> <span class="p">[</span>
<span class="p">{</span>
- <span class="s">"addressLine1"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"addressLine2"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"city"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"company"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"country"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"email"</span><span class="p">:</span> <span class="s">"email1@email.com"</span><span class="p">,</span>
- <span class="s">"fullName"</span><span class="p">:</span> <span class="s">"Tom Simpson"</span><span class="p">,</span>
- <span class="s">"gid"</span><span class="p">:</span> <span class="s">"0"</span><span class="p">,</span>
- <span class="s">"id"</span><span class="p">:</span> <span class="s">"53"</span><span class="p">,</span>
- <span class="s">"lastUpdated"</span><span class="p">:</span> <span class="s">"2016-01-26 10:22:07"</span><span class="p">,</span>
- <span class="s">"newUser"</span><span class="p">:</span> <span class="n">true</span><span class="p">,</span>
- <span class="s">"phoneNumber"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"postalCode"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"publicSshKey"</span><span class="p">:</span> <span class="s">"xxx"</span><span class="p">,</span>
- <span class="s">"registrationSent"</span><span class="p">:</span> <span class="n">true</span><span class="p">,</span>
- <span class="s">"role"</span><span class="p">:</span> <span class="s">"6"</span><span class="p">,</span>
- <span class="s">"rolename"</span><span class="p">:</span> <span class="s">"admin"</span><span class="p">,</span>
- <span class="s">"stateOrProvince"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"uid"</span><span class="p">:</span> <span class="s">"0"</span><span class="p">,</span>
- <span class="s">"username"</span><span class="p">:</span> <span class="s">"tsimpson"</span>
+ <span class="s2">"addressLine1"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"addressLine2"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"city"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"company"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"country"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"email"</span><span class="p">:</span> <span class="s2">"email1@email.com"</span><span class="p">,</span>
+ <span class="s2">"fullName"</span><span class="p">:</span> <span class="s2">"Tom Simpson"</span><span class="p">,</span>
+ <span class="s2">"gid"</span><span class="p">:</span> <span class="s2">"0"</span><span class="p">,</span>
+ <span class="s2">"id"</span><span class="p">:</span> <span class="s2">"53"</span><span class="p">,</span>
+ <span class="s2">"lastUpdated"</span><span class="p">:</span> <span class="s2">"2016-01-26 10:22:07"</span><span class="p">,</span>
+ <span class="s2">"newUser"</span><span class="p">:</span> <span class="n">true</span><span class="p">,</span>
+ <span class="s2">"phoneNumber"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"postalCode"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"publicSshKey"</span><span class="p">:</span> <span class="s2">"xxx"</span><span class="p">,</span>
+ <span class="s2">"registrationSent"</span><span class="p">:</span> <span class="n">true</span><span class="p">,</span>
+ <span class="s2">"role"</span><span class="p">:</span> <span class="s2">"6"</span><span class="p">,</span>
+ <span class="s2">"rolename"</span><span class="p">:</span> <span class="s2">"admin"</span><span class="p">,</span>
+ <span class="s2">"stateOrProvince"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"uid"</span><span class="p">:</span> <span class="s2">"0"</span><span class="p">,</span>
+ <span class="s2">"username"</span><span class="p">:</span> <span class="s2">"tsimpson"</span>
<span class="p">},</span>
<span class="p">{</span>
<span class="o">...</span> <span class="n">more</span> <span class="n">users</span>
@@ -449,29 +449,29 @@
</tbody>
</table>
<p><strong>Response Example</strong></p>
-<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
- <span class="s">"response"</span><span class="p">:</span> <span class="p">[</span>
+<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span>
+ <span class="s2">"response"</span><span class="p">:</span> <span class="p">[</span>
<span class="p">{</span>
- <span class="s">"addressLine1"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"addressLine2"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"city"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"company"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"country"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"email"</span><span class="p">:</span> <span class="s">"email1@email.com"</span><span class="p">,</span>
- <span class="s">"fullName"</span><span class="p">:</span> <span class="s">"Tom Simpson"</span><span class="p">,</span>
- <span class="s">"gid"</span><span class="p">:</span> <span class="s">"0"</span><span class="p">,</span>
- <span class="s">"id"</span><span class="p">:</span> <span class="s">"53"</span><span class="p">,</span>
- <span class="s">"lastUpdated"</span><span class="p">:</span> <span class="s">"2016-01-26 10:22:07"</span><span class="p">,</span>
- <span class="s">"newUser"</span><span class="p">:</span> <span class="n">true</span><span class="p">,</span>
- <span class="s">"phoneNumber"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"postalCode"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"publicSshKey"</span><span class="p">:</span> <span class="s">"xxx"</span><span class="p">,</span>
- <span class="s">"registrationSent"</span><span class="p">:</span> <span class="n">true</span><span class="p">,</span>
- <span class="s">"role"</span><span class="p">:</span> <span class="s">"6"</span><span class="p">,</span>
- <span class="s">"rolename"</span><span class="p">:</span> <span class="s">"admin"</span><span class="p">,</span>
- <span class="s">"stateOrProvince"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"uid"</span><span class="p">:</span> <span class="s">"0"</span><span class="p">,</span>
- <span class="s">"username"</span><span class="p">:</span> <span class="s">"tsimpson"</span>
+ <span class="s2">"addressLine1"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"addressLine2"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"city"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"company"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"country"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"email"</span><span class="p">:</span> <span class="s2">"email1@email.com"</span><span class="p">,</span>
+ <span class="s2">"fullName"</span><span class="p">:</span> <span class="s2">"Tom Simpson"</span><span class="p">,</span>
+ <span class="s2">"gid"</span><span class="p">:</span> <span class="s2">"0"</span><span class="p">,</span>
+ <span class="s2">"id"</span><span class="p">:</span> <span class="s2">"53"</span><span class="p">,</span>
+ <span class="s2">"lastUpdated"</span><span class="p">:</span> <span class="s2">"2016-01-26 10:22:07"</span><span class="p">,</span>
+ <span class="s2">"newUser"</span><span class="p">:</span> <span class="n">true</span><span class="p">,</span>
+ <span class="s2">"phoneNumber"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"postalCode"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"publicSshKey"</span><span class="p">:</span> <span class="s2">"xxx"</span><span class="p">,</span>
+ <span class="s2">"registrationSent"</span><span class="p">:</span> <span class="n">true</span><span class="p">,</span>
+ <span class="s2">"role"</span><span class="p">:</span> <span class="s2">"6"</span><span class="p">,</span>
+ <span class="s2">"rolename"</span><span class="p">:</span> <span class="s2">"admin"</span><span class="p">,</span>
+ <span class="s2">"stateOrProvince"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"uid"</span><span class="p">:</span> <span class="s2">"0"</span><span class="p">,</span>
+ <span class="s2">"username"</span><span class="p">:</span> <span class="s2">"tsimpson"</span>
<span class="p">},</span>
<span class="p">{</span>
<span class="o">...</span> <span class="n">more</span> <span class="n">users</span>
@@ -679,11 +679,11 @@ available).</td>
</tr>
<tr class="row-odd"><td><code class="docutils literal"><span class="pre">multiSiteOrigin</span></code></td>
<td>bool</td>
-<td>Is the Multi Site Origin feature enabled for this delivery service (0=false, 1=true). See <a class="reference internal" href="../../../admin/traffic_ops_using.html#rl-multi-site-origin"><em>Multi Site Origin</em></a></td>
+<td>Is the Multi Site Origin feature enabled for this delivery service (0=false, 1=true). See <a class="reference internal" href="../../../admin/traffic_ops_using.html#rl-multi-site-origin"><span class="std std-ref">Multi Site Origin</span></a></td>
</tr>
<tr class="row-even"><td><code class="docutils literal"><span class="pre">multiSiteOriginAlgor</span></code></td>
<td>bool</td>
-<td>Is the Multi Site Origin feature enabled for this delivery service (0=false, 1=true). See <a class="reference internal" href="../../../admin/traffic_ops_using.html#rl-multi-site-origin"><em>Multi Site Origin</em></a></td>
+<td>Is the Multi Site Origin feature enabled for this delivery service (0=false, 1=true). See <a class="reference internal" href="../../../admin/traffic_ops_using.html#rl-multi-site-origin"><span class="std std-ref">Multi Site Origin</span></a></td>
</tr>
<tr class="row-odd"><td><code class="docutils literal"><span class="pre">orgServerFqdn</span></code></td>
<td>string</td>
@@ -781,77 +781,77 @@ protocol (<a class="reference external" href="http://">http://</a> or <a class="
</tbody>
</table>
<p><strong>Response Example</strong></p>
-<div class="highlight-python"><div class="highlight"><pre>{
- "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"
- }
- { .. },
- { .. }
- ]
-}
+<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span>
+ <span class="s2">"response"</span><span class="p">:</span> <span class="p">[</span>
+ <span class="p">{</span>
+ <span class="s2">"active"</span><span class="p">:</span> <span class="n">true</span><span class="p">,</span>
+ <span class="s2">"cacheurl"</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
+ <span class="s2">"ccrDnsTtl"</span><span class="p">:</span> <span class="s2">"3600"</span><span class="p">,</span>
+ <span class="s2">"cdnId"</span><span class="p">:</span> <span class="s2">"2"</span><span class="p">,</span>
+ <span class="s2">"cdnName"</span><span class="p">:</span> <span class="s2">"over-the-top"</span><span class="p">,</span>
+ <span class="s2">"checkPath"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"displayName"</span><span class="p">:</span> <span class="s2">"My Cool Delivery Service"</span><span class="p">,</span>
+ <span class="s2">"dnsBypassCname"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"dnsBypassIp"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"dnsBypassIp6"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"dnsBypassTtl"</span><span class="p">:</span> <span class="s2">"30"</span><span class="p">,</span>
+ <span class="s2">"dscp"</span><span class="p">:</span> <span class="s2">"40"</span><span class="p">,</span>
+ <span class="s2">"edgeHeaderRewrite"</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
+ <span class="s2">"exampleURLs"</span><span class="p">:</span> <span class="p">[</span>
+ <span class="s2">"http://edge.foo-ds.foo.bar.net"</span>
+ <span class="p">],</span>
+ <span class="s2">"geoLimit"</span><span class="p">:</span> <span class="s2">"0"</span><span class="p">,</span>
+ <span class="s2">"geoLimitCountries"</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
+ <span class="s2">"geoLimitRedirectURL"</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
+ <span class="s2">"geoProvider"</span><span class="p">:</span> <span class="s2">"0"</span><span class="p">,</span>
+ <span class="s2">"globalMaxMbps"</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
+ <span class="s2">"globalMaxTps"</span><span class="p">:</span> <span class="s2">"0"</span><span class="p">,</span>
+ <span class="s2">"httpBypassFqdn"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"id"</span><span class="p">:</span> <span class="s2">"442"</span><span class="p">,</span>
+ <span class="s2">"infoUrl"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"initialDispersion"</span><span class="p">:</span> <span class="s2">"1"</span><span class="p">,</span>
+ <span class="s2">"ipv6RoutingEnabled"</span><span class="p">:</span> <span class="n">true</span><span class="p">,</span>
+ <span class="s2">"lastUpdated"</span><span class="p">:</span> <span class="s2">"2016-01-26 08:49:35"</span><span class="p">,</span>
+ <span class="s2">"logsEnabled"</span><span class="p">:</span> <span class="n">false</span><span class="p">,</span>
+ <span class="s2">"longDesc"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"longDesc1"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"longDesc2"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"matchList"</span><span class="p">:</span> <span class="p">[</span>
+ <span class="p">{</span>
+ <span class="s2">"pattern"</span><span class="p">:</span> <span class="s2">".*</span><span class="se">\\</span><span class="s2">.foo-ds</span><span class="se">\\</span><span class="s2">..*"</span><span class="p">,</span>
+ <span class="s2">"setNumber"</span><span class="p">:</span> <span class="s2">"0"</span><span class="p">,</span>
+ <span class="s2">"type"</span><span class="p">:</span> <span class="s2">"HOST_REGEXP"</span>
+ <span class="p">}</span>
+ <span class="p">],</span>
+ <span class="s2">"maxDnsAnswers"</span><span class="p">:</span> <span class="s2">"0"</span><span class="p">,</span>
+ <span class="s2">"midHeaderRewrite"</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
+ <span class="s2">"missLat"</span><span class="p">:</span> <span class="s2">"41.881944"</span><span class="p">,</span>
+ <span class="s2">"missLong"</span><span class="p">:</span> <span class="s2">"-87.627778"</span><span class="p">,</span>
+ <span class="s2">"multiSiteOrigin"</span><span class="p">:</span> <span class="n">false</span><span class="p">,</span>
+ <span class="s2">"multiSiteOriginAlgorithm"</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
+ <span class="s2">"orgServerFqdn"</span><span class="p">:</span> <span class="s2">"http://baz.boo.net"</span><span class="p">,</span>
+ <span class="s2">"originShield"</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
+ <span class="s2">"profileDescription"</span><span class="p">:</span> <span class="s2">"Content Router for over-the-top"</span><span class="p">,</span>
+ <span class="s2">"profileId"</span><span class="p">:</span> <span class="s2">"5"</span><span class="p">,</span>
+ <span class="s2">"profileName"</span><span class="p">:</span> <span class="s2">"ROUTER_TOP"</span><span class="p">,</span>
+ <span class="s2">"protocol"</span><span class="p">:</span> <span class="s2">"0"</span><span class="p">,</span>
+ <span class="s2">"qstringIgnore"</span><span class="p">:</span> <span class="s2">"1"</span><span class="p">,</span>
+ <span class="s2">"rangeRequestHandling"</span><span class="p">:</span> <span class="s2">"0"</span><span class="p">,</span>
+ <span class="s2">"regexRemap"</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
+ <span class="s2">"regionalGeoBlocking"</span><span class="p">:</span> <span class="n">false</span><span class="p">,</span>
+ <span class="s2">"remapText"</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
+ <span class="s2">"signed"</span><span class="p">:</span> <span class="n">false</span><span class="p">,</span>
+ <span class="s2">"sslKeyVersion"</span><span class="p">:</span> <span class="s2">"0"</span><span class="p">,</span>
+ <span class="s2">"trRequestHeaders"</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
+ <span class="s2">"trResponseHeaders"</span><span class="p">:</span> <span class="s2">"Access-Control-Allow-Origin: *"</span><span class="p">,</span>
+ <span class="s2">"type"</span><span class="p">:</span> <span class="s2">"HTTP"</span><span class="p">,</span>
+ <span class="s2">"typeId"</span><span class="p">:</span> <span class="s2">"8"</span><span class="p">,</span>
+ <span class="s2">"xmlId"</span><span class="p">:</span> <span class="s2">"foo-ds"</span>
+ <span class="p">}</span>
+ <span class="p">{</span> <span class="o">..</span> <span class="p">},</span>
+ <span class="p">{</span> <span class="o">..</span> <span class="p">}</span>
+ <span class="p">]</span>
+<span class="p">}</span>
</pre></div>
</div>
</div></blockquote>
@@ -948,25 +948,25 @@ protocol (<a class="reference external" href="http://">http://</a> or <a class="
</tbody>
</table>
<p><strong>Response Example</strong></p>
-<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
- <span class="s">"response"</span><span class="p">:</span> <span class="p">{</span>
- <span class="s">"email"</span><span class="p">:</span> <span class="s">"email@email.com"</span><span class="p">,</span>
- <span class="s">"city"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"id"</span><span class="p">:</span> <span class="s">"50"</span><span class="p">,</span>
- <span class="s">"phoneNumber"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"company"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"country"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"fullName"</span><span class="p">:</span> <span class="s">"Tom Callahan"</span><span class="p">,</span>
- <span class="s">"localUser"</span><span class="p">:</span> <span class="n">true</span><span class="p">,</span>
- <span class="s">"uid"</span><span class="p">:</span> <span class="s">"0"</span><span class="p">,</span>
- <span class="s">"stateOrProvince"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"username"</span><span class="p">:</span> <span class="s">"tommyboy"</span><span class="p">,</span>
- <span class="s">"newUser"</span><span class="p">:</span> <span class="n">false</span><span class="p">,</span>
- <span class="s">"addressLine2"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"role"</span><span class="p">:</span> <span class="s">"6"</span><span class="p">,</span>
- <span class="s">"addressLine1"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"gid"</span><span class="p">:</span> <span class="s">"0"</span><span class="p">,</span>
- <span class="s">"postalCode"</span><span class="p">:</span> <span class="s">""</span>
+<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span>
+ <span class="s2">"response"</span><span class="p">:</span> <span class="p">{</span>
+ <span class="s2">"email"</span><span class="p">:</span> <span class="s2">"email@email.com"</span><span class="p">,</span>
+ <span class="s2">"city"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"id"</span><span class="p">:</span> <span class="s2">"50"</span><span class="p">,</span>
+ <span class="s2">"phoneNumber"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"company"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"country"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"fullName"</span><span class="p">:</span> <span class="s2">"Tom Callahan"</span><span class="p">,</span>
+ <span class="s2">"localUser"</span><span class="p">:</span> <span class="n">true</span><span class="p">,</span>
+ <span class="s2">"uid"</span><span class="p">:</span> <span class="s2">"0"</span><span class="p">,</span>
+ <span class="s2">"stateOrProvince"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"username"</span><span class="p">:</span> <span class="s2">"tommyboy"</span><span class="p">,</span>
+ <span class="s2">"newUser"</span><span class="p">:</span> <span class="n">false</span><span class="p">,</span>
+ <span class="s2">"addressLine2"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"role"</span><span class="p">:</span> <span class="s2">"6"</span><span class="p">,</span>
+ <span class="s2">"addressLine1"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"gid"</span><span class="p">:</span> <span class="s2">"0"</span><span class="p">,</span>
+ <span class="s2">"postalCode"</span><span class="p">:</span> <span class="s2">""</span>
<span class="p">},</span>
<span class="p">}</span>
</pre></div>
@@ -1065,25 +1065,25 @@ protocol (<a class="reference external" href="http://">http://</a> or <a class="
</tbody>
</table>
<p><strong>Request Example</strong></p>
-<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
- <span class="s">"user"</span><span class="p">:</span> <span class="p">{</span>
- <span class="s">"email"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"city"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"id"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"phoneNumber"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"company"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"country"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"fullName"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"localUser"</span><span class="p">:</span> <span class="n">true</span><span class="p">,</span>
- <span class="s">"uid"</span><span class="p">:</span> <span class="s">"0"</span><span class="p">,</span>
- <span class="s">"stateOrProvince"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"username"</span><span class="p">:</span> <span class="s">"tommyboy"</span><span class="p">,</span>
- <span class="s">"newUser"</span><span class="p">:</span> <span class="n">false</span><span class="p">,</span>
- <span class="s">"addressLine2"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"role"</span><span class="p">:</span> <span class="s">"6"</span><span class="p">,</span>
- <span class="s">"addressLine1"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"gid"</span><span class="p">:</span> <span class="s">"0"</span><span class="p">,</span>
- <span class="s">"postalCode"</span><span class="p">:</span> <span class="s">""</span>
+<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span>
+ <span class="s2">"user"</span><span class="p">:</span> <span class="p">{</span>
+ <span class="s2">"email"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"city"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"id"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"phoneNumber"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"company"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"country"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"fullName"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"localUser"</span><span class="p">:</span> <span class="n">true</span><span class="p">,</span>
+ <span class="s2">"uid"</span><span class="p">:</span> <span class="s2">"0"</span><span class="p">,</span>
+ <span class="s2">"stateOrProvince"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"username"</span><span class="p">:</span> <span class="s2">"tommyboy"</span><span class="p">,</span>
+ <span class="s2">"newUser"</span><span class="p">:</span> <span class="n">false</span><span class="p">,</span>
+ <span class="s2">"addressLine2"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"role"</span><span class="p">:</span> <span class="s2">"6"</span><span class="p">,</span>
+ <span class="s2">"addressLine1"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"gid"</span><span class="p">:</span> <span class="s2">"0"</span><span class="p">,</span>
+ <span class="s2">"postalCode"</span><span class="p">:</span> <span class="s2">""</span>
<span class="p">}</span>
<span class="p">}</span>
</pre></div>
@@ -1126,11 +1126,11 @@ protocol (<a class="reference external" href="http://">http://</a> or <a class="
</tbody>
</table>
<p><strong>Response Example</strong></p>
-<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
- <span class="s">"alerts"</span><span class="p">:</span> <span class="p">[</span>
+<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span>
+ <span class="s2">"alerts"</span><span class="p">:</span> <span class="p">[</span>
<span class="p">{</span>
- <span class="s">"level"</span><span class="p">:</span> <span class="s">"success"</span><span class="p">,</span>
- <span class="s">"text"</span><span class="p">:</span> <span class="s">"UserProfile was successfully updated."</span>
+ <span class="s2">"level"</span><span class="p">:</span> <span class="s2">"success"</span><span class="p">,</span>
+ <span class="s2">"text"</span><span class="p">:</span> <span class="s2">"UserProfile was successfully updated."</span>
<span class="p">}</span>
<span class="p">],</span>
<span class="p">}</span>
@@ -1242,23 +1242,23 @@ protocol (<a class="reference external" href="http://">http://</a> or <a class="
</tbody>
</table>
<p><strong>Response Example</strong></p>
-<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
- <span class="s">"response"</span><span class="p">:</span> <span class="p">[</span>
+<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span>
+ <span class="s2">"response"</span><span class="p">:</span> <span class="p">[</span>
<span class="p">{</span>
- <span class="s">"id"</span><span class="p">:</span> <span class="s">"1"</span><span class="p">,</span>
- <span class="s">"keyword"</span><span class="p">:</span> <span class="s">"PURGE"</span><span class="p">,</span>
- <span class="s">"objectName"</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
- <span class="s">"assetUrl"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"assetType"</span><span class="p">:</span> <span class="s">"file"</span><span class="p">,</span>
- <span class="s">"status"</span><span class="p">:</span> <span class="s">"PENDING"</span><span class="p">,</span>
- <span class="s">"dsId"</span><span class="p">:</span> <span class="s">"9999"</span><span class="p">,</span>
- <span class="s">"dsXmlId"</span><span class="p">:</span> <span class="s">"ds-xml-id"</span><span class="p">,</span>
- <span class="s">"username"</span><span class="p">:</span> <span class="s">"peewee"</span><span class="p">,</span>
- <span class="s">"parameters"</span><span class="p">:</span> <span class="s">"TTL:56h"</span><span class="p">,</span>
- <span class="s">"enteredTime"</span><span class="p">:</span> <span class="s">"2015-01-21 18:00:16"</span><span class="p">,</span>
- <span class="s">"objectType"</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
- <span class="s">"agent"</span><span class="p">:</span> <span class="s">""</span><span class="p">,</span>
- <span class="s">"startTime"</span><span class="p">:</span> <span class="s">"2015-01-21 10:45:38"</span>
+ <span class="s2">"id"</span><span class="p">:</span> <span class="s2">"1"</span><span class="p">,</span>
+ <span class="s2">"keyword"</span><span class="p">:</span> <span class="s2">"PURGE"</span><span class="p">,</span>
+ <span class="s2">"objectName"</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
+ <span class="s2">"assetUrl"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"assetType"</span><span class="p">:</span> <span class="s2">"file"</span><span class="p">,</span>
+ <span class="s2">"status"</span><span class="p">:</span> <span class="s2">"PENDING"</span><span class="p">,</span>
+ <span class="s2">"dsId"</span><span class="p">:</span> <span class="s2">"9999"</span><span class="p">,</span>
+ <span class="s2">"dsXmlId"</span><span class="p">:</span> <span class="s2">"ds-xml-id"</span><span class="p">,</span>
+ <span class="s2">"username"</span><span class="p">:</span> <span class="s2">"peewee"</span><span class="p">,</span>
+ <span class="s2">"parameters"</span><span class="p">:</span> <span class="s2">"TTL:56h"</span><span class="p">,</span>
+ <span class="s2">"enteredTime"</span><span class="p">:</span> <span class="s2">"2015-01-21 18:00:16"</span><span class="p">,</span>
+ <span class="s2">"objectType"</span><span class="p">:</span> <span class="n">null</span><span class="p">,</span>
+ <span class="s2">"agent"</span><span class="p">:</span> <span class="s2">""</span><span class="p">,</span>
+ <span class="s2">"startTime"</span><span class="p">:</span> <span class="s2">"2015-01-21 10:45:38"</span>
<span class="p">}</span>
<span class="p">],</span>
<span class="p">}</span>
@@ -1327,11 +1327,11 @@ unnecessary work.</td>
</tbody>
</table>
<p><strong>Request Example</strong></p>
-<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
- <span class="s">"dsId"</span><span class="p">:</span> <span class="s">"9999"</span><span class="p">,</span>
- <span class="s">"regex"</span><span class="p">:</span> <span class="s">"/path/to/content.jpg"</span><span class="p">,</span>
- <span class="s">"startTime"</span><span class="p">:</span> <span class="s">"2015-01-27 11:08:37"</span><span class="p">,</span>
- <span class="s">"ttl"</span><span class="p">:</span> <span class="mi">54</span>
+<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span>
+ <span class="s2">"dsId"</span><span class="p">:</span> <span class="s2">"9999"</span><span class="p">,</span>
+ <span class="s2">"regex"</span><span class="p">:</span> <span class="s2">"/path/to/content.jpg"</span><span class="p">,</span>
+ <span class="s2">"startTime"</span><span class="p">:</span> <span class="s2">"2015-01-27 11:08:37"</span><span class="p">,</span>
+ <span class="s2">"ttl"</span><span class="p">:</span> <span class="mi">54</span>
<span class="p">}</span>
</pre></div>
</div>
@@ -1373,12 +1373,12 @@ unnecessary work.</td>
</tbody>
</table>
<p><strong>Response Example</strong></p>
-<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
- <span class="s">"alerts"</span><span class="p">:</span>
+<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span>
+ <span class="s2">"alerts"</span><span class="p">:</span>
<span class="p">[</span>
<span class="p">{</span>
- <span class="s">"level"</span><span class="p">:</span> <span class="s">"success"</span><span class="p">,</span>
- <span class="s">"text"</span><span class="p">:</span> <span class="s">"Successfully created purge job for: ."</span>
+ <span class="s2">"level"</span><span class="p">:</span> <span class="s2">"success"</span><span class="p">,</span>
+ <span class="s2">"text"</span><span class="p">:</span> <span class="s2">"Successfully created purge job for: ."</span>
<span class="p">}</span>
<span class="p">],</span>
<span class="p">}</span>
@@ -1418,9 +1418,9 @@ unnecessary work.</td>
</tbody>
</table>
<p><strong>Request Example</strong></p>
-<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
- <span class="s">"u"</span><span class="p">:</span> <span class="s">"username"</span><span class="p">,</span>
- <span class="s">"p"</span><span class="p">:</span> <span class="s">"password"</span>
+<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span>
+ <span class="s2">"u"</span><span class="p">:</span> <span class="s2">"username"</span><span class="p">,</span>
+ <span class="s2">"p"</span><span class="p">:</span> <span class="s2">"password"</span>
<span class="p">}</span>
</pre></div>
</div>
@@ -1462,11 +1462,11 @@ unnecessary work.</td>
</tbody>
</table>
<p><strong>Response Example</strong></p>
-<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
- <span class="s">"alerts"</span><span class="p">:</span> <span class="p">[</span>
+<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span>
+ <span class="s2">"alerts"</span><span class="p">:</span> <span class="p">[</span>
<span class="p">{</span>
- <span class="s">"level"</span><span class="p">:</span> <span class="s">"success"</span><span class="p">,</span>
- <span class="s">"text"</span><span class="p">:</span> <span class="s">"Successfully logged in."</span>
+ <span class="s2">"level"</span><span class="p">:</span> <span class="s2">"success"</span><span class="p">,</span>
+ <span class="s2">"text"</span><span class="p">:</span> <span class="s2">"Successfully logged in."</span>
<span class="p">}</span>
<span class="p">],</span>
<span class="p">}</span>
@@ -1525,15 +1525,15 @@ unnecessary work.</td>
</tbody>
</table>
<p><strong>Response Example</strong></p>
-<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
- <span class="s">"response"</span><span class="p">:</span> <span class="p">[</span>
+<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span>
+ <span class="s2">"response"</span><span class="p">:</span> <span class="p">[</span>
<span class="p">{</span>
- <span class="s">"xmlId"</span><span class="p">:</span> <span class="s">"ns-img"</span><span class="p">,</span>
- <span class="s">"id"</span><span class="p">:</span> <span class="s">"90"</span>
+ <span class="s2">"xmlId"</span><span class="p">:</span> <span class="s2">"ns-img"</span><span class="p">,</span>
+ <span class="s2">"id"</span><span class="p">:</span> <span class="s2">"90"</span>
<span class="p">},</span>
<span class="p">{</span>
- <span class="s">"xmlId"</span><span class="p">:</span> <span class="s">"ns-img-secure"</span><span class="p">,</span>
- <span class="s">"id"</span><span class="p">:</span> <span class="s">"280"</span>
+ <span class="s2">"xmlId"</span><span class="p">:</span> <span class="s2">"ns-img-secure"</span><span class="p">,</span>
+ <span class="s2">"id"</span><span class="p">:</span> <span class="s2">"280"</span>
<span class="p">}</span>
<span class="p">],</span>
<span class="p">}</span>
@@ -1569,8 +1569,8 @@ unnecessary work.</td>
</tbody>
</table>
<p><strong>Request Example</strong></p>
-<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
- <span class="s">"t"</span><span class="p">:</span> <span class="s">"token-value"</span>
+<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span>
+ <span class="s2">"t"</span><span class="p">:</span> <span class="s2">"token-value"</span>
<span class="p">}</span>
</pre></div>
</div>
@@ -1612,11 +1612,11 @@ unnecessary work.</td>
</tbody>
</table>
<p><strong>Response Example</strong></p>
-<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
- <span class="s">"alerts"</span><span class="p">:</span> <span class="p">[</span>
+<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span>
+ <span class="s2">"alerts"</span><span class="p">:</span> <span class="p">[</span>
<span class="p">{</span>
- <span class="s">"level"</span><span class="p">:</span> <span class="s">"error"</span><span class="p">,</span>
- <span class="s">"text"</span><span class="p">:</span> <span class="s">"Unauthorized, please log in."</span>
+ <span class="s2">"level"</span><span class="p">:</span> <span class="s2">"error"</span><span class="p">,</span>
+ <span class="s2">"text"</span><span class="p">:</span> <span class="s2">"Unauthorized, please log in."</span>
<span class="p">}</span>
<span class="p">],</span>
<span class="p">}</span>
@@ -1670,11 +1670,11 @@ unnecessary work.</td>
</tbody>
</table>
<p><strong>Response Example</strong></p>
-<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
- <span class="s">"alerts"</span><span class="p">:</span> <span class="p">[</span>
+<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span>
+ <span class="s2">"alerts"</span><span class="p">:</span> <span class="p">[</span>
<span class="p">{</span>
- <span class="s">"level"</span><span class="p">:</span> <span class="s">"success"</span><span class="p">,</span>
- <span class="s">"text"</span><span class="p">:</span> <span class="s">"You are logged out."</span>
+ <span class="s2">"level"</span><span class="p">:</span> <span class="s2">"success"</span><span class="p">,</span>
+ <span class="s2">"text"</span><span class="p">:</span> <span class="s2">"You are logged out."</span>
<span class="p">}</span>
<span class="p">],</span>
<span class="p">}</span>
@@ -1711,8 +1711,8 @@ password reset.</td>
</tbody>
</table>
<p><strong>Request Example</strong></p>
-<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
- <span class="s">"email"</span><span class="p">:</span> <span class="s">"email@email.com"</span>
+<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span>
+ <span class="s2">"email"</span><span class="p">:</span> <span class="s2">"email@email.com"</span>
<span class="p">}</span>
</pre></div>
</div>
@@ -1760,11 +1760,11 @@ password reset.</td>
</tbody>
</table>
<p><strong>Response Example</strong></p>
-<div class="highlight-python"><div class="highlight"><pre><span class="p">{</span>
- <span class="s">"alerts"</span><span class="p">:</span> <span class="p">[</span>
+<div class="highlight-default"><div class="highlight"><pre><span></span><span class="p">{</span>
+ <span class="s2">"alerts"</span><span class="p">:</span> <span class="p">[</span>
<span class="p">{</span>
- <span class="s">"level"</span><span class="p">:</span> <span class="s">"success"</span><span class="p">,</span>
- <span class="s">"text"</span><span class="p">:</span> <span class="s">"Successfully sent password reset to email 'email@email.com'"</span>
+ <span class="s2">"level"</span><span class="p">:</span> <span class="s2">"success"</span><span class="p">,</span>
+ <span class="s2">"text"</span><span class="p">:</span> <span class="s2">"Successfully sent password reset to email 'email@email.com'"</span>
<span class="p">}</span>
<span class="p">],</span>
<span class="p">}</span>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/45597d7d/docs/latest/development/traffic_portal.html
----------------------------------------------------------------------
diff --git a/docs/latest/development/traffic_portal.html b/docs/latest/development/traffic_portal.html
index b4ece16..fb1488e 100644
--- a/docs/latest/development/traffic_portal.html
+++ b/docs/latest/development/traffic_portal.html
@@ -119,7 +119,7 @@
<ul class="current">
<li class="toctree-l1 current"><a class="reference internal" href="index.html">Developer’s Guide</a><ul class="current">
<li class="toctree-l2"><a class="reference internal" href="traffic_ops.html">Traffic Ops</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="">Traffic Portal</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="#">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>
<li class="toctree-l2"><a class="reference internal" href="traffic_stats.html">Traffic Stats</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/45597d7d/docs/latest/development/traffic_router.html
----------------------------------------------------------------------
diff --git a/docs/latest/development/traffic_router.html b/docs/latest/development/traffic_router.html
index 0a059e6..dda8614 100644
--- a/docs/latest/development/traffic_router.html
+++ b/docs/latest/development/traffic_router.html
@@ -120,7 +120,7 @@
<li class="toctree-l1 current"><a class="reference internal" href="index.html">Developer’s Guide</a><ul class="current">
<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 current"><a class="current reference internal" href="">Traffic Router</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="#">Traffic Router</a></li>
<li class="toctree-l2"><a class="reference internal" href="traffic_monitor.html">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>
@@ -389,7 +389,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_router/traffic_router_api.html#reference-tr-api"><em>Traffic Router API</em></a></p>
+<p><a class="reference internal" href="traffic_router/traffic_router_api.html#reference-tr-api"><span class="std std-ref">Traffic Router API</span></a></p>
<div class="toctree-wrapper compound">
</div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/45597d7d/docs/latest/development/traffic_server.html
----------------------------------------------------------------------
diff --git a/docs/latest/development/traffic_server.html b/docs/latest/development/traffic_server.html
index 89dcc7b..bfb15e5 100644
--- a/docs/latest/development/traffic_server.html
+++ b/docs/latest/development/traffic_server.html
@@ -123,7 +123,7 @@
<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>
<li class="toctree-l2"><a class="reference internal" href="traffic_stats.html">Traffic Stats</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="">Traffic Server</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="#">Traffic Server</a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/45597d7d/docs/latest/development/traffic_stats.html
----------------------------------------------------------------------
diff --git a/docs/latest/development/traffic_stats.html b/docs/latest/development/traffic_stats.html
index 48cc8ea..a66b25c 100644
--- a/docs/latest/development/traffic_stats.html
+++ b/docs/latest/development/traffic_stats.html
@@ -122,7 +122,7 @@
<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>
-<li class="toctree-l2 current"><a class="current reference internal" href="">Traffic Stats</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="#">Traffic Stats</a></li>
<li class="toctree-l2"><a class="reference internal" href="traffic_server.html">Traffic Server</a></li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/45597d7d/docs/latest/faq/administration.html
----------------------------------------------------------------------
diff --git a/docs/latest/faq/administration.html b/docs/latest/faq/administration.html
index 09ed7b9..8406baa 100644
--- a/docs/latest/faq/administration.html
+++ b/docs/latest/faq/administration.html
@@ -131,7 +131,7 @@
<li class="toctree-l1 current"><a class="reference internal" href="index.html">FAQ</a><ul class="current">
<li class="toctree-l2"><a class="reference internal" href="general.html">General</a></li>
<li class="toctree-l2"><a class="reference internal" href="development.html">Development</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="">Running a Traffic Control CDN</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="#">Running a Traffic Control CDN</a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/45597d7d/docs/latest/faq/development.html
----------------------------------------------------------------------
diff --git a/docs/latest/faq/development.html b/docs/latest/faq/development.html
index 6ab244a..6261de2 100644
--- a/docs/latest/faq/development.html
+++ b/docs/latest/faq/development.html
@@ -130,7 +130,7 @@
<ul class="current">
<li class="toctree-l1 current"><a class="reference internal" href="index.html">FAQ</a><ul class="current">
<li class="toctree-l2"><a class="reference internal" href="general.html">General</a></li>
-<li class="toctree-l2 current"><a class="current reference internal" href="">Development</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="#">Development</a></li>
<li class="toctree-l2"><a class="reference internal" href="administration.html">Running a Traffic Control CDN</a></li>
</ul>
</li>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/45597d7d/docs/latest/faq/general.html
----------------------------------------------------------------------
diff --git a/docs/latest/faq/general.html b/docs/latest/faq/general.html
index c6fe933..4cc9a4c 100644
--- a/docs/latest/faq/general.html
+++ b/docs/latest/faq/general.html
@@ -129,7 +129,7 @@
</ul>
<ul class="current">
<li class="toctree-l1 current"><a class="reference internal" href="index.html">FAQ</a><ul class="current">
-<li class="toctree-l2 current"><a class="current reference internal" href="">General</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="#">General</a></li>
<li class="toctree-l2"><a class="reference internal" href="development.html">Development</a></li>
<li class="toctree-l2"><a class="reference internal" href="administration.html">Running a Traffic Control CDN</a></li>
</ul>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/45597d7d/docs/latest/faq/index.html
----------------------------------------------------------------------
diff --git a/docs/latest/faq/index.html b/docs/latest/faq/index.html
index 715e687..8e4f544 100644
--- a/docs/latest/faq/index.html
+++ b/docs/latest/faq/index.html
@@ -127,7 +127,7 @@
</li>
</ul>
<ul class="current">
-<li class="toctree-l1 current"><a class="current reference internal" href="">FAQ</a><ul>
+<li class="toctree-l1 current"><a class="current reference internal" href="#">FAQ</a><ul>
<li class="toctree-l2"><a class="reference internal" href="general.html">General</a></li>
<li class="toctree-l2"><a class="reference internal" href="development.html">Development</a></li>
<li class="toctree-l2"><a class="reference internal" href="administration.html">Running a Traffic Control CDN</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/45597d7d/docs/latest/genindex.html
----------------------------------------------------------------------
diff --git a/docs/latest/genindex.html b/docs/latest/genindex.html
index abfec0a..bcaa5bd 100644
--- a/docs/latest/genindex.html
+++ b/docs/latest/genindex.html
@@ -203,7 +203,7 @@
</dl></td>
<td style="width: 33%" valign="top"><dl>
- <dt><a href="glossary.html#term-content-routing"><strong>302 content routing</strong></a>
+ <dt><a href="glossary.html#term-302-content-routing"><strong>302 content routing</strong></a>
</dt>
</dl></td>
@@ -241,7 +241,7 @@
</dt>
- <dt><a href="admin/traffic_ops_using.html#index-11">Cache Updates</a>
+ <dt><a href="admin/traffic_ops_using.html#index-12">Cache Updates</a>
</dt>
@@ -271,7 +271,7 @@
</dt>
- <dt><a href="glossary.html#term-5"><strong>content routing</strong></a>
+ <dt><a href="glossary.html#term-content-routing"><strong>content routing</strong></a>
</dt>
@@ -289,7 +289,7 @@
</dt>
- <dt><a href="admin/traffic_ops_using.html#index-7">Delivery Service regexp</a>
+ <dt><a href="admin/traffic_ops_using.html#index-8">Delivery Service regexp</a>
</dt>
</dl></td>
@@ -337,7 +337,7 @@
<table style="width: 100%" class="indextable genindextable"><tr>
<td style="width: 33%" valign="top"><dl>
- <dt><a href="admin/traffic_ops_using.html#index-10">Generate ISO</a>
+ <dt><a href="admin/traffic_ops_using.html#index-11">Generate ISO</a>
</dt>
@@ -361,7 +361,7 @@
</dt>
- <dt><a href="admin/traffic_ops_using.html#index-7">HEADER_REGEXP</a>
+ <dt><a href="admin/traffic_ops_using.html#index-8">HEADER_REGEXP</a>
</dt>
@@ -379,7 +379,7 @@
</dl></td>
<td style="width: 33%" valign="top"><dl>
- <dt><a href="admin/traffic_ops_using.html#index-7">HOST_REGEXP</a>
+ <dt><a href="admin/traffic_ops_using.html#index-8">HOST_REGEXP</a>
</dt>
@@ -401,13 +401,13 @@
<table style="width: 100%" class="indextable genindextable"><tr>
<td style="width: 33%" valign="top"><dl>
- <dt><a href="admin/traffic_ops_using.html#index-13">Invalidate Content</a>
+ <dt><a href="admin/traffic_ops_using.html#index-14">Invalidate Content</a>
</dt>
</dl></td>
<td style="width: 33%" valign="top"><dl>
- <dt><a href="admin/traffic_ops_using.html#index-10">ISO</a>
+ <dt><a href="admin/traffic_ops_using.html#index-11">ISO</a>
</dt>
</dl></td>
@@ -457,7 +457,7 @@
</dt>
- <dt><a href="admin/traffic_ops_using.html#index-7">PATH_REGEXP</a>
+ <dt><a href="admin/traffic_ops_using.html#index-8">PATH_REGEXP</a>
</dt>
</dl></td>
@@ -467,7 +467,7 @@
</dt>
- <dt><a href="admin/traffic_ops_using.html#index-13">Purge</a>
+ <dt><a href="admin/traffic_ops_using.html#index-14">Purge</a>
</dt>
</dl></td>
@@ -477,7 +477,7 @@
<table style="width: 100%" class="indextable genindextable"><tr>
<td style="width: 33%" valign="top"><dl>
- <dt><a href="admin/traffic_ops_using.html#index-11">Queue Updates</a>
+ <dt><a href="admin/traffic_ops_using.html#index-12">Queue Updates</a>
</dt>
</dl></td>
@@ -487,16 +487,20 @@
<table style="width: 100%" class="indextable genindextable"><tr>
<td style="width: 33%" valign="top"><dl>
- <dt><a href="basics/cache_revalidation.html#index-0">Revalidation</a>
+ <dt><a href="admin/traffic_ops_using.html#index-7">Regex Remap Expression</a>
</dt>
- <dt><a href="basics/caching_proxies.html#index-0">Reverse Proxy</a>
+ <dt><a href="basics/cache_revalidation.html#index-0">Revalidation</a>
</dt>
</dl></td>
<td style="width: 33%" valign="top"><dl>
+ <dt><a href="basics/caching_proxies.html#index-0">Reverse Proxy</a>
+ </dt>
+
+
<dt><a href="glossary.html#term-reverse-proxy"><strong>reverse proxy</strong></a>
</dt>
@@ -507,7 +511,7 @@
<table style="width: 100%" class="indextable genindextable"><tr>
<td style="width: 33%" valign="top"><dl>
- <dt><a href="admin/traffic_ops_using.html#index-9">Server Assignments</a>
+ <dt><a href="admin/traffic_ops_using.html#index-10">Server Assignments</a>
</dt>
@@ -517,11 +521,11 @@
</dl></td>
<td style="width: 33%" valign="top"><dl>
- <dt><a href="admin/traffic_ops_using.html#index-12">Snapshot CRConfig</a>
+ <dt><a href="admin/traffic_ops_using.html#index-13">Snapshot CRConfig</a>
</dt>
- <dt><a href="admin/traffic_ops_using.html#index-8">Static DNS Entries</a>
+ <dt><a href="admin/traffic_ops_using.html#index-9">Static DNS Entries</a>
</dt>
</dl></td>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/45597d7d/docs/latest/glossary.html
----------------------------------------------------------------------
diff --git a/docs/latest/glossary.html b/docs/latest/glossary.html
index 0997cc9..a76d472 100644
--- a/docs/latest/glossary.html
+++ b/docs/latest/glossary.html
@@ -134,7 +134,7 @@
</li>
</ul>
<ul class="current">
-<li class="toctree-l1 current"><a class="current reference internal" href="">Glossary</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="#">Glossary</a></li>
</ul>
@@ -181,44 +181,44 @@
<div class="section" id="glossary">
<span id="id1"></span><h1>Glossary<a class="headerlink" href="#glossary" title="Permalink to this headline">�</a></h1>
<dl class="glossary docutils">
-<dt id="term-content-routing">302 content routing</dt>
-<dd><a class="reference internal" href="overview/traffic_router.html#rl-http-cr"><em> HTTP Content Routing</em></a>.</dd>
+<dt id="term-302-content-routing">302 content routing</dt>
+<dd><a class="reference internal" href="overview/traffic_router.html#rl-http-cr"><span class="std std-ref"> HTTP Content Routing</span></a>.</dd>
<dt id="term-astats-stats-over-http">astats (stats_over_http)</dt>
-<dd>An ATS plugin that allows you to monitor vitals of the ATS server. See <a class="reference internal" href="overview/traffic_monitor.html#rl-astats"><em> Cache Monitoring</em></a>.</dd>
+<dd>An ATS plugin that allows you to monitor vitals of the ATS server. See <a class="reference internal" href="overview/traffic_monitor.html#rl-astats"><span class="std std-ref"> Cache Monitoring</span></a>.</dd>
<dt id="term-cache">cache</dt>
-<dd>A caching proxy server. See <a class="reference internal" href="basics/caching_proxies.html#rl-caching-proxy"><em>Caching Proxies</em></a>.</dd>
+<dd>A caching proxy server. See <a class="reference internal" href="basics/caching_proxies.html#rl-caching-proxy"><span class="std std-ref">Caching Proxies</span></a>.</dd>
<dt id="term-cachegroup">cachegroup</dt>
-<dd>A group of caches that together create a combined larger cache using consistent hashing. See <a class="reference internal" href="overview/traffic_server.html#rl-cachegroup"><em> Cache Group</em></a>.</dd>
+<dd>A group of caches that together create a combined larger cache using consistent hashing. See <a class="reference internal" href="overview/traffic_server.html#rl-cachegroup"><span class="std std-ref"> Cache Group</span></a>.</dd>
<dt id="term-consistent-hashing">consistent hashing</dt>
-<dd>See <a class="reference external" href="http://en.wikipedia.org/wiki/Consistent_hashing">the Wikipedia article</a>; Traffic Control uses consistent hashing when using <a class="reference internal" href="overview/traffic_router.html#rl-http-cr"><em> HTTP Content Routing</em></a> for the edge tier and when selecting parents in the mid tier.</dd>
-<dt id="term-5">content routing</dt>
-<dd>Directing clients (or client systems) to a particular location or device in a location for optimal delivery of content See also <a class="reference internal" href="overview/traffic_router.html#rl-http-cr"><em> HTTP Content Routing</em></a> and <a class="reference internal" href="overview/traffic_router.html#rl-dns-cr"><em> DNS Content Routing</em></a>.</dd>
+<dd>See <a class="reference external" href="http://en.wikipedia.org/wiki/Consistent_hashing">the Wikipedia article</a>; Traffic Control uses consistent hashing when using <a class="reference internal" href="overview/traffic_router.html#rl-http-cr"><span class="std std-ref"> HTTP Content Routing</span></a> for the edge tier and when selecting parents in the mid tier.</dd>
+<dt id="term-content-routing">content routing</dt>
+<dd>Directing clients (or client systems) to a particular location or device in a location for optimal delivery of content See also <a class="reference internal" href="overview/traffic_router.html#rl-http-cr"><span class="std std-ref"> HTTP Content Routing</span></a> and <a class="reference internal" href="overview/traffic_router.html#rl-dns-cr"><span class="std std-ref"> DNS Content Routing</span></a>.</dd>
<dt id="term-coverage-zone-map">coverage zone map</dt>
-<dd>The coverage zone map (czm) or coverage zone file (zcf) is a file that maps network prefixes to cachegroups. See <a class="reference internal" href="overview/traffic_router.html#rl-localization"><em> Localization</em></a>.</dd>
+<dd>The coverage zone map (czm) or coverage zone file (zcf) is a file that maps network prefixes to cachegroups. See <a class="reference internal" href="overview/traffic_router.html#rl-localization"><span class="std std-ref"> Localization</span></a>.</dd>
<dt id="term-delivery-service">delivery service</dt>
-<dd>A grouping of content in the CDN, usually a determined by the URL hostname. See <a class="reference internal" href="overview/traffic_router.html#rl-ds"><em> Delivery Service</em></a>.</dd>
+<dd>A grouping of content in the CDN, usually a determined by the URL hostname. See <a class="reference internal" href="overview/traffic_router.html#rl-ds"><span class="std std-ref"> Delivery Service</span></a>.</dd>
<dt id="term-edge-tier-or-cache">edge (tier or cache)</dt>
-<dd>Closest to the client or end-user. The edge tier is the tier that serves the client, edge caches are caches in the edge tier. In a Traffic Control CDN the basic function of the edge cache is that of a <a class="reference internal" href="basics/caching_proxies.html#rl-rev-proxy"><em> Reverse Proxy</em></a>. See also <a class="reference internal" href="overview/traffic_server.html#rl-cachegroup"><em> Cache Group</em></a>.</dd>
+<dd>Closest to the client or end-user. The edge tier is the tier that serves the client, edge caches are caches in the edge tier. In a Traffic Control CDN the basic function of the edge cache is that of a <a class="reference internal" href="basics/caching_proxies.html#rl-rev-proxy"><span class="std std-ref"> Reverse Proxy</span></a>. See also <a class="reference internal" href="overview/traffic_server.html#rl-cachegroup"><span class="std std-ref"> Cache Group</span></a>.</dd>
<dt id="term-traffic-ops-extension">(traffic ops) extension</dt>
-<dd>Using <em>extensions</em>, Traffic Ops be extended to use proprietary checks or monitoring sources. See <a class="reference internal" href="overview/traffic_ops.html#rl-trops-ext"><em> Traffic Ops Extension</em></a>.</dd>
+<dd>Using <em>extensions</em>, Traffic Ops be extended to use proprietary checks or monitoring sources. See <a class="reference internal" href="overview/traffic_ops.html#rl-trops-ext"><span class="std std-ref"> Traffic Ops Extension</span></a>.</dd>
<dt id="term-forward-proxy">forward proxy</dt>
-<dd>A proxy that works that acts like it is the client to the origin. See <a class="reference internal" href="basics/caching_proxies.html#rl-fwd-proxy"><em> Forward Proxy</em></a>.</dd>
+<dd>A proxy that works that acts like it is the client to the origin. See <a class="reference internal" href="basics/caching_proxies.html#rl-fwd-proxy"><span class="std std-ref"> Forward Proxy</span></a>.</dd>
<dt id="term-geo-localization-or-geo-routing">geo localization or geo routing</dt>
<dd>Localizing clients to the nearest caches using a geo database like the one from Maxmind.</dd>
<dt id="term-health-protocol">health protocol</dt>
-<dd>The protocol to monitor the health of all the caches. See <a class="reference internal" href="overview/traffic_monitor.html#rl-health-proto"><em> Health Protocol</em></a>.</dd>
+<dd>The protocol to monitor the health of all the caches. See <a class="reference internal" href="overview/traffic_monitor.html#rl-health-proto"><span class="std std-ref"> Health Protocol</span></a>.</dd>
<dt id="term-localization">localization</dt>
-<dd>Finding location on the network, or on planet earth. See <a class="reference internal" href="overview/traffic_router.html#rl-localization"><em> Localization</em></a>.</dd>
+<dd>Finding location on the network, or on planet earth. See <a class="reference internal" href="overview/traffic_router.html#rl-localization"><span class="std std-ref"> Localization</span></a>.</dd>
<dt id="term-mid-tier-or-cache">mid (tier or cache)</dt>
-<dd>The tier above the edge tier. The mid tier does not directly serves the end-user and is used as an additional layer between the edge and the origin. In a Traffic Control CDN the basic function of the mid cache is that of a <a class="reference internal" href="basics/caching_proxies.html#rl-fwd-proxy"><em> Forward Proxy</em></a>. See also <a class="reference internal" href="overview/traffic_server.html#rl-cachegroup"><em> Cache Group</em></a>.</dd>
+<dd>The tier above the edge tier. The mid tier does not directly serves the end-user and is used as an additional layer between the edge and the origin. In a Traffic Control CDN the basic function of the mid cache is that of a <a class="reference internal" href="basics/caching_proxies.html#rl-fwd-proxy"><span class="std std-ref"> Forward Proxy</span></a>. See also <a class="reference internal" href="overview/traffic_server.html#rl-cachegroup"><span class="std std-ref"> Cache Group</span></a>.</dd>
<dt id="term-origin">origin</dt>
<dd>The source of content for the CDN. Usually a redundant HTTP/1.1 webserver.</dd>
<dt id="term-parent-cache-or-cachegroup">parent (cache or cachegroup)</dt>
-<dd>The (group of) cache(s) in the higher tier. See <a class="reference internal" href="overview/traffic_server.html#rl-cachegroup"><em> Cache Group</em></a>.</dd>
+<dd>The (group of) cache(s) in the higher tier. See <a class="reference internal" href="overview/traffic_server.html#rl-cachegroup"><span class="std std-ref"> Cache Group</span></a>.</dd>
<dt id="term-profile">profile</dt>
-<dd>A group of settings (parameters) that will be applied to a server. See <a class="reference internal" href="overview/traffic_server.html#rl-profile"><em> Profile</em></a>.</dd>
+<dd>A group of settings (parameters) that will be applied to a server. See <a class="reference internal" href="overview/traffic_server.html#rl-profile"><span class="std std-ref"> Profile</span></a>.</dd>
<dt id="term-reverse-proxy">reverse proxy</dt>
-<dd>A proxy that acts like it is the origin to the client. See <a class="reference internal" href="basics/caching_proxies.html#rl-rev-proxy"><em> Reverse Proxy</em></a>.</dd>
+<dd>A proxy that acts like it is the origin to the client. See <a class="reference internal" href="basics/caching_proxies.html#rl-rev-proxy"><span class="std std-ref"> Reverse Proxy</span></a>.</dd>
</dl>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/45597d7d/docs/latest/index.html
----------------------------------------------------------------------
diff --git a/docs/latest/index.html b/docs/latest/index.html
index 3458196..a093136 100644
--- a/docs/latest/index.html
+++ b/docs/latest/index.html
@@ -306,6 +306,7 @@
</li>
<li class="toctree-l2"><a class="reference internal" href="admin/quick_howto/index.html">Quick How To Guides</a><ul>
<li class="toctree-l3"><a class="reference internal" href="admin/quick_howto/multi_site.html">Configure Multi Site Origin</a></li>
+<li class="toctree-l3"><a class="reference internal" href="admin/quick_howto/multi_site_ats5.html">Configure Multi Site Origin (5.x)</a></li>
<li class="toctree-l3"><a class="reference internal" href="admin/quick_howto/dnssec.html">Configure DNSSEC</a></li>
<li class="toctree-l3"><a class="reference internal" href="admin/quick_howto/federations.html">Configure Federations</a></li>
<li class="toctree-l3"><a class="reference internal" href="admin/quick_howto/regionalgeo.html">Configure Regional Geo-blocking (RGB)</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/45597d7d/docs/latest/objects.inv
----------------------------------------------------------------------
diff --git a/docs/latest/objects.inv b/docs/latest/objects.inv
index e9a9a48..155acd2 100644
Binary files a/docs/latest/objects.inv and b/docs/latest/objects.inv differ
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/45597d7d/docs/latest/overview/index.html
----------------------------------------------------------------------
diff --git a/docs/latest/overview/index.html b/docs/latest/overview/index.html
index cb3ca37..08cb8fc 100644
--- a/docs/latest/overview/index.html
+++ b/docs/latest/overview/index.html
@@ -87,7 +87,7 @@
</li>
</ul>
<ul class="current">
-<li class="toctree-l1 current"><a class="current reference internal" href="">Traffic Control Overview</a><ul>
+<li class="toctree-l1 current"><a class="current reference internal" href="#">Traffic Control Overview</a><ul>
<li class="toctree-l2"><a class="reference internal" href="introduction.html">Introduction</a></li>
<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>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/45597d7d/docs/latest/overview/introduction.html
----------------------------------------------------------------------
diff --git a/docs/latest/overview/introduction.html b/docs/latest/overview/introduction.html
index 43b6695..4ef29c6 100644
--- a/docs/latest/overview/introduction.html
+++ b/docs/latest/overview/introduction.html
@@ -89,7 +89,7 @@
</ul>
<ul class="current">
<li class="toctree-l1 current"><a class="reference internal" href="index.html">Traffic Control Overview</a><ul class="current">
-<li class="toctree-l2 current"><a class="current reference internal" href="">Introduction</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="#">Introduction</a></li>
<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>
@@ -186,10 +186,42 @@
<div class="section" id="introduction">
<h1>Introduction<a class="headerlink" href="#introduction" title="Permalink to this headline">�</a></h1>
-<p>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 <a class="reference external" href="http://trafficserver.apache.org/">Apache Traffic Server</a> (ATS). Although the current release only supports ATS as a cache, this may change with future releases.</p>
+<p>Traffic Control is a caching server control plane application which is used to aggregate caching servers into a Content Delivery Network (CDN). The CDN caching software chosen for Traffic Control is <a class="reference external" href="http://trafficserver.apache.org/">Apache Traffic Server</a> (ATS). Although the current release only supports ATS as a cache, this may change with future releases.</p>
<p>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.</p>
-<p>Traffic Control implements the blue boxes in the architecture diagram below.</p>
+<p>Traffic Control implements the elements illustrated in green in the diagram below.</p>
<img alt="../_images/traffic_control_overview_3.png" class="align-center" src="../_images/traffic_control_overview_3.png" />
+<dl class="docutils">
+<dt><strong>Traffic Ops</strong></dt>
+<dd><ul class="first last simple">
+<li><a class="reference external" href="http://trafficcontrol.apache.org/docs/latest/overview/traffic_ops.html/">Traffic Ops</a> is used to configure caching servers and CDN delivery services. It also contains APIs used to access CDN data.</li>
+</ul>
+</dd>
+<dt><strong>Traffic Router</strong></dt>
+<dd><ul class="first last simple">
+<li><a class="reference external" href="http://trafficcontrol.apache.org/docs/latest/overview/traffic_router.html/">Traffic Router</a> is used to route clients requests to the closest healthy cache by analyzing the health, capacity, and state of the caching servers and relative distance from each cache group to the location of the client.</li>
+</ul>
+</dd>
+<dt><strong>Traffic Monitor</strong></dt>
+<dd><ul class="first last simple">
+<li><a class="reference external" href="http://trafficcontrol.apache.org/docs/latest/overview/traffic_monitor.html/">Traffic Monitor</a> does health polling of the caching servers on a very short interval to keep track of which servers should be kept in rotation.</li>
+</ul>
+</dd>
+<dt><strong>Traffic Stats</strong></dt>
+<dd><ul class="first last simple">
+<li><a class="reference external" href="http://trafficcontrol.apache.org/docs/latest/overview/traffic_stats.html/">Traffic Stats</a> collects real time traffic statistics aggregated from each of the caching servers. This data is used by the Traffic Router to assess the available capacity of each caching server which it uses to balance traffic load and prevent overload.</li>
+</ul>
+</dd>
+<dt><strong>Traffic Portal</strong></dt>
+<dd><ul class="first last simple">
+<li><a class="reference external" href="http://trafficcontrol.apache.org/docs/latest/overview/traffic_portal.html/">Traffic Portal</a> is a web application which leverages the Traffic Ops APIs to present CDN data through a web interface.</li>
+</ul>
+</dd>
+<dt><strong>Traffic Logs</strong></dt>
+<dd><ul class="first last simple">
+<li>Traffic Logs is currently under construction and is intended to aggregate Traffic Server request/response logs as well as other server logs. Logs will be parsed and indexed for search.</li>
+</ul>
+</dd>
+</dl>
<p>In the next sections each of these components will be explained further.</p>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/45597d7d/docs/latest/overview/traffic_monitor.html
----------------------------------------------------------------------
diff --git a/docs/latest/overview/traffic_monitor.html b/docs/latest/overview/traffic_monitor.html
index fb8d611..9c86879 100644
--- a/docs/latest/overview/traffic_monitor.html
+++ b/docs/latest/overview/traffic_monitor.html
@@ -93,7 +93,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>
<li class="toctree-l2"><a class="reference internal" href="traffic_vault.html">Traffic Vault</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/45597d7d/docs/latest/overview/traffic_ops.html
----------------------------------------------------------------------
diff --git a/docs/latest/overview/traffic_ops.html b/docs/latest/overview/traffic_ops.html
index f7c623e..60c2494 100644
--- a/docs/latest/overview/traffic_ops.html
+++ b/docs/latest/overview/traffic_ops.html
@@ -90,7 +90,7 @@
<ul class="current">
<li class="toctree-l1 current"><a class="reference internal" href="index.html">Traffic Control Overview</a><ul class="current">
<li class="toctree-l2"><a class="reference internal" href="introduction.html">Introduction</a></li>
-<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>