http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/6b5a5ffa/docs/latest/overview/index.html
----------------------------------------------------------------------
diff --git a/docs/latest/overview/index.html b/docs/latest/overview/index.html
index 6bb7b5e..19d8940 100644
--- a/docs/latest/overview/index.html
+++ b/docs/latest/overview/index.html
@@ -60,7 +60,7 @@
 
         
           
-          <img src="../_static/tc_logo.png" class="logo" />
+          <img src="../_static/tc_logo_c_only.png" class="logo" />
         
         </a>
 
@@ -103,7 +103,7 @@
 </li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../admin/index.html">Administrator’s Guide</a><ul>
+<li class="toctree-l1"><a class="reference internal" 
href="../admin/index.html">Administrator&#8217;s Guide</a><ul>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_install.html">Installing Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_config.html">Configuring Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_using.html">Using Traffic Ops</a></li>
@@ -119,7 +119,7 @@
 </li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Developer’s Guide</a><ul>
+<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Developer&#8217;s Guide</a><ul>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_ops.html">Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_portal.html">Traffic Portal</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_router.html">Traffic Router</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/6b5a5ffa/docs/latest/overview/introduction.html
----------------------------------------------------------------------
diff --git a/docs/latest/overview/introduction.html 
b/docs/latest/overview/introduction.html
index eb36609..c6457f0 100644
--- a/docs/latest/overview/introduction.html
+++ b/docs/latest/overview/introduction.html
@@ -61,7 +61,7 @@
 
         
           
-          <img src="../_static/tc_logo.png" class="logo" />
+          <img src="../_static/tc_logo_c_only.png" class="logo" />
         
         </a>
 
@@ -104,7 +104,7 @@
 </li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../admin/index.html">Administrator’s Guide</a><ul>
+<li class="toctree-l1"><a class="reference internal" 
href="../admin/index.html">Administrator&#8217;s Guide</a><ul>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_install.html">Installing Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_config.html">Configuring Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_using.html">Using Traffic Ops</a></li>
@@ -120,7 +120,7 @@
 </li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Developer’s Guide</a><ul>
+<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Developer&#8217;s Guide</a><ul>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_ops.html">Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_portal.html">Traffic Portal</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_router.html">Traffic Router</a></li>
@@ -189,10 +189,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/6b5a5ffa/docs/latest/overview/traffic_monitor.html
----------------------------------------------------------------------
diff --git a/docs/latest/overview/traffic_monitor.html 
b/docs/latest/overview/traffic_monitor.html
index 4b28c8b..193081b 100644
--- a/docs/latest/overview/traffic_monitor.html
+++ b/docs/latest/overview/traffic_monitor.html
@@ -61,7 +61,7 @@
 
         
           
-          <img src="../_static/tc_logo.png" class="logo" />
+          <img src="../_static/tc_logo_c_only.png" class="logo" />
         
         </a>
 
@@ -104,7 +104,7 @@
 </li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../admin/index.html">Administrator’s Guide</a><ul>
+<li class="toctree-l1"><a class="reference internal" 
href="../admin/index.html">Administrator&#8217;s Guide</a><ul>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_install.html">Installing Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_config.html">Configuring Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_using.html">Using Traffic Ops</a></li>
@@ -120,7 +120,7 @@
 </li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Developer’s Guide</a><ul>
+<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Developer&#8217;s Guide</a><ul>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_ops.html">Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_portal.html">Traffic Portal</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_router.html">Traffic Router</a></li>
@@ -217,10 +217,10 @@
 <span id="rl-health-proto"></span><h2><img alt="arrow" 
src="../_images/fwda1.png" /> Health Protocol<a class="headerlink" 
href="#arrow-health-protocol" title="Permalink to this headline">¶</a></h2>
 <blockquote>
 <div><p>Redundant Traffic Monitor servers operate independently from each 
other but take the state of other Traffic Monitors into account when asked for 
health state information. In the above overview of cache monitoring, the 
behavior of Traffic Monitor pertains only to how an individual instance detects 
and handles failures. The Health Protocol adds another dimension to the health 
state of the CDN by merging the states of all Traffic Monitors into one, and 
then taking the <em>optimistic</em> approach when dealing with a cache or 
Delivery Service that might have been marked as unavailable by this particular 
instance or a peer instance of Traffic Monitor.</p>
-<p>Upon startup or configuration change in Traffic Ops, in addition to caches, 
Traffic Monitor begins polling its peer Traffic Monitors whose state is set to 
<code class="docutils literal"><span class="pre">ONLINE</span></code>. Each 
<code class="docutils literal"><span class="pre">ONLINE</span></code> Traffic 
Monitor polls all of its peers at a configurable interval and saves the 
peer’s state for later use. When polling its peers, Traffic Monitor asks for 
the raw health state from each respective peer, which is strictly that 
instance’s view of the CDN’s health. When any <code class="docutils 
literal"><span class="pre">ONLINE</span></code> Traffic Monitor is asked for 
CDN health by an upstream component, such as Traffic Router, the component gets 
the health protocol influenced version of CDN health (non-raw view).</p>
-<p>In operation of the health protocol, Traffic Monitor takes all health 
states from all peers, including the locally known health state, and serves an 
optimistic outlook to the requesting client. This means that, for example, if 
three of the four Traffic Monitors see a given cache or Delivery Service as 
exceeding its thresholds and unavailable, it is still considered available.  
Only if all Traffic Monitors agree that the given object is unavailable is that 
state propagated to upstream components. This optimistic approach to the Health 
Protocol is counter to the “fail fast” philosophy, but serves well for 
large networks with complicated geography and or routing. The optimistic Health 
Protocol allows network failures or latency to occur without affecting overall 
traffic routing, as Traffic Monitors can and do have a different view of the 
network when deployed in geographically diverse locations. Short polling 
intervals of both the caches and Traffic Monitor peers help to reduce 
 customer impact of outages.</p>
+<p>Upon startup or configuration change in Traffic Ops, in addition to caches, 
Traffic Monitor begins polling its peer Traffic Monitors whose state is set to 
<code class="docutils literal"><span class="pre">ONLINE</span></code>. Each 
<code class="docutils literal"><span class="pre">ONLINE</span></code> Traffic 
Monitor polls all of its peers at a configurable interval and saves the 
peer&#8217;s state for later use. When polling its peers, Traffic Monitor asks 
for the raw health state from each respective peer, which is strictly that 
instance&#8217;s view of the CDN&#8217;s health. When any <code class="docutils 
literal"><span class="pre">ONLINE</span></code> Traffic Monitor is asked for 
CDN health by an upstream component, such as Traffic Router, the component gets 
the health protocol influenced version of CDN health (non-raw view).</p>
+<p>In operation of the health protocol, Traffic Monitor takes all health 
states from all peers, including the locally known health state, and serves an 
optimistic outlook to the requesting client. This means that, for example, if 
three of the four Traffic Monitors see a given cache or Delivery Service as 
exceeding its thresholds and unavailable, it is still considered available.  
Only if all Traffic Monitors agree that the given object is unavailable is that 
state propagated to upstream components. This optimistic approach to the Health 
Protocol is counter to the &#8220;fail fast&#8221; philosophy, but serves well 
for large networks with complicated geography and or routing. The optimistic 
Health Protocol allows network failures or latency to occur without affecting 
overall traffic routing, as Traffic Monitors can and do have a different view 
of the network when deployed in geographically diverse locations. Short polling 
intervals of both the caches and Traffic Monitor peers help to
  reduce customer impact of outages.</p>
 </div></blockquote>
-<p>It is not uncommon for a cache to be marked unavailable by Traffic Monitor 
- in fact, it is business as usual for many CDNs. A hot video asset may cause a 
single cache (say cache-03) to get close to it’s interface capacity, the 
health protocol “kicks in”, and Traffic Monitor marks cache-03 as 
unavailable. New clients want to see the same asset, and now, Traffic Router 
will send these customers to another cache (say cache-01) in the same 
cachegroup. The load is now shared between cache-01 and cache-03. As clients 
finish watching the asset on cache-03, it will drop below the threshold and 
gets marked available again, and new clients will now go back to cache-03 
again.</p>
+<p>It is not uncommon for a cache to be marked unavailable by Traffic Monitor 
- in fact, it is business as usual for many CDNs. A hot video asset may cause a 
single cache (say cache-03) to get close to it&#8217;s interface capacity, the 
health protocol &#8220;kicks in&#8221;, and Traffic Monitor marks cache-03 as 
unavailable. New clients want to see the same asset, and now, Traffic Router 
will send these customers to another cache (say cache-01) in the same 
cachegroup. The load is now shared between cache-01 and cache-03. As clients 
finish watching the asset on cache-03, it will drop below the threshold and 
gets marked available again, and new clients will now go back to cache-03 
again.</p>
 <p>It is less common for a delivery service to be marked unavailable by 
Traffic Monitor, the delivery service thresholds are usually used for overflow 
situations at extreme peaks to protect other delivery services in the CDN from 
getting impacted.</p>
 </div>
 </div>

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/6b5a5ffa/docs/latest/overview/traffic_ops.html
----------------------------------------------------------------------
diff --git a/docs/latest/overview/traffic_ops.html 
b/docs/latest/overview/traffic_ops.html
index ca505e8..8208a58 100644
--- a/docs/latest/overview/traffic_ops.html
+++ b/docs/latest/overview/traffic_ops.html
@@ -61,7 +61,7 @@
 
         
           
-          <img src="../_static/tc_logo.png" class="logo" />
+          <img src="../_static/tc_logo_c_only.png" class="logo" />
         
         </a>
 
@@ -104,7 +104,7 @@
 </li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../admin/index.html">Administrator’s Guide</a><ul>
+<li class="toctree-l1"><a class="reference internal" 
href="../admin/index.html">Administrator&#8217;s Guide</a><ul>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_install.html">Installing Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_config.html">Configuring Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_using.html">Using Traffic Ops</a></li>
@@ -120,7 +120,7 @@
 </li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Developer’s Guide</a><ul>
+<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Developer&#8217;s Guide</a><ul>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_ops.html">Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_portal.html">Traffic Portal</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_router.html">Traffic Router</a></li>
@@ -201,7 +201,7 @@
 <blockquote>
 <div><p>Traffic Ops Extensions are a way to enhance the basic functionality of 
Traffic Ops in a custom manner. There are three types of extensions:</p>
 <ul class="simple">
-<li>Check Extensions - Allows you to add custom checks to the 
“Health-&gt;Server Checks” view.</li>
+<li>Check Extensions - Allows you to add custom checks to the 
&#8220;Health-&gt;Server Checks&#8221; view.</li>
 <li>Configuration Extension - Allows you to add custom configuration file 
generators.</li>
 <li>Data source Extensions - Allows you to add data sources for the graph 
views and usage APIs.</li>
 </ul>

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/6b5a5ffa/docs/latest/overview/traffic_portal.html
----------------------------------------------------------------------
diff --git a/docs/latest/overview/traffic_portal.html 
b/docs/latest/overview/traffic_portal.html
index 177fe3f..de3d8f6 100644
--- a/docs/latest/overview/traffic_portal.html
+++ b/docs/latest/overview/traffic_portal.html
@@ -61,7 +61,7 @@
 
         
           
-          <img src="../_static/tc_logo.png" class="logo" />
+          <img src="../_static/tc_logo_c_only.png" class="logo" />
         
         </a>
 
@@ -104,7 +104,7 @@
 </li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../admin/index.html">Administrator’s Guide</a><ul>
+<li class="toctree-l1"><a class="reference internal" 
href="../admin/index.html">Administrator&#8217;s Guide</a><ul>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_install.html">Installing Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_config.html">Configuring Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_using.html">Using Traffic Ops</a></li>
@@ -120,7 +120,7 @@
 </li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Developer’s Guide</a><ul>
+<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Developer&#8217;s Guide</a><ul>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_ops.html">Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_portal.html">Traffic Portal</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_router.html">Traffic Router</a></li>
@@ -189,7 +189,7 @@
             
   <div class="section" id="traffic-portal">
 <span id="index-0"></span><h1>Traffic Portal<a class="headerlink" 
href="#traffic-portal" title="Permalink to this headline">¶</a></h1>
-<p>Traffic Portal is an <a class="reference external" 
href="https://angularjs.org/";>AngularJS 1.x</a> client served from a <a 
class="reference external" href="https://nodejs.org/en/";>Node.js</a> web server 
designed to consume the Traffic Ops 1.x API. Traffic Portal provides a set of 
functionality restricted to the delivery service(s) of the authenticated user. 
Functionality primarily includes a set of charts / graphs designed to provide 
insight into the performance of a user’s delivery service(s).</p>
+<p>Traffic Portal is an <a class="reference external" 
href="https://angularjs.org/";>AngularJS 1.x</a> client served from a <a 
class="reference external" href="https://nodejs.org/en/";>Node.js</a> web server 
designed to consume the Traffic Ops 1.x API. Traffic Portal provides a set of 
functionality restricted to the delivery service(s) of the authenticated user. 
Functionality primarily includes a set of charts / graphs designed to provide 
insight into the performance of a user&#8217;s delivery service(s).</p>
 <p>Charts / Graphs include:</p>
 <blockquote>
 <div><ul class="simple">

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/6b5a5ffa/docs/latest/overview/traffic_router.html
----------------------------------------------------------------------
diff --git a/docs/latest/overview/traffic_router.html 
b/docs/latest/overview/traffic_router.html
index c5b3999..0c64681 100644
--- a/docs/latest/overview/traffic_router.html
+++ b/docs/latest/overview/traffic_router.html
@@ -61,7 +61,7 @@
 
         
           
-          <img src="../_static/tc_logo.png" class="logo" />
+          <img src="../_static/tc_logo_c_only.png" class="logo" />
         
         </a>
 
@@ -104,7 +104,7 @@
 </li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../admin/index.html">Administrator’s Guide</a><ul>
+<li class="toctree-l1"><a class="reference internal" 
href="../admin/index.html">Administrator&#8217;s Guide</a><ul>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_install.html">Installing Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_config.html">Configuring Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_using.html">Using Traffic Ops</a></li>
@@ -120,7 +120,7 @@
 </li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Developer’s Guide</a><ul>
+<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Developer&#8217;s Guide</a><ul>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_ops.html">Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_portal.html">Traffic Portal</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_router.html">Traffic Router</a></li>
@@ -189,7 +189,7 @@
             
   <span class="target" id="reference-label-tc-tr"></span><div class="section" 
id="traffic-router">
 <span id="index-0"></span><h1>Traffic Router<a class="headerlink" 
href="#traffic-router" title="Permalink to this headline">¶</a></h1>
-<p>Traffic Router’s function is to send clients to the most optimal cache. 
Optimal in this case is based on a number of factors:</p>
+<p>Traffic Router&#8217;s function is to send clients to the most optimal 
cache. Optimal in this case is based on a number of factors:</p>
 <ul class="simple">
 <li>Distance between the cache and the client (not necessarily measured in 
meters, but quite often in layer 3 network hops). Less network distance between 
the client and cache yields better performance, and lower network load. Traffic 
Router helps clients connect to the best performing cache for their location at 
the lowest network cost.</li>
 <li>Availability of caches and health / load on the caches. A common issue in 
Internet and television distribution scenarios is having many clients 
attempting to retrieve the same content at the same time. Traffic Router helps 
clients route around overloaded or down caches.</li>
@@ -220,7 +220,7 @@
 <div class="section" id="arrow-localization">
 <span id="rl-localization"></span><h2><img alt="arrow" 
src="../_images/fwda1.png" /> Localization<a class="headerlink" 
href="#arrow-localization" title="Permalink to this headline">¶</a></h2>
 <blockquote>
-<div>Traffic Router uses a JSON input file called the <em>coverage zone 
map</em> to determine what <em>cachegroup</em> is closest to the client. If the 
client IP address is not in this coverage zone map, it falls back to 
<em>geo</em>, using the maxmind database to find the client’s location, and 
the geo coordinates from Traffic Ops for the cachegroup.</div></blockquote>
+<div>Traffic Router uses a JSON input file called the <em>coverage zone 
map</em> to determine what <em>cachegroup</em> is closest to the client. If the 
client IP address is not in this coverage zone map, it falls back to 
<em>geo</em>, using the maxmind database to find the client&#8217;s location, 
and the geo coordinates from Traffic Ops for the cachegroup.</div></blockquote>
 <div class="line-block">
 <div class="line"><br /></div>
 </div>
@@ -240,13 +240,13 @@
 <div class="section" id="arrow-http-content-routing">
 <span id="rl-http-cr"></span><h2><img alt="arrow" src="../_images/fwda1.png" 
/> HTTP Content Routing<a class="headerlink" href="#arrow-http-content-routing" 
title="Permalink to this headline">¶</a></h2>
 <blockquote>
-<div><p>For an HTTP delivery service the client receives a URL with a hostname 
beginning with <code class="docutils literal"><span 
class="pre">tr.</span></code> (e.g. <a class="reference external" 
href="http://tr.dsname.cdn.com/foo/bar/fun.html";>http://tr.dsname.cdn.com/foo/bar/fun.html</a>),
 the LDNS server resolves this <code class="docutils literal"><span 
class="pre">tr.dsname.cdn.com</span></code> to an IP address, but in this case 
Traffic Router returns its own IP address. The client opens a connection to 
port 80 on the Traffic Router’s IP address, and sends:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span 
class="n">GET</span> <span class="o">/</span><span class="n">foo</span><span 
class="o">/</span><span class="n">bar</span><span class="o">/</span><span 
class="n">fun</span><span class="o">.</span><span class="n">html</span> <span 
class="n">HTTP</span><span class="o">/</span><span class="mf">1.1</span>
+<div><p>For an HTTP delivery service the client receives a URL with a hostname 
beginning with <code class="docutils literal"><span 
class="pre">tr.</span></code> (e.g. <a class="reference external" 
href="http://tr.dsname.cdn.com/foo/bar/fun.html";>http://tr.dsname.cdn.com/foo/bar/fun.html</a>),
 the LDNS server resolves this <code class="docutils literal"><span 
class="pre">tr.dsname.cdn.com</span></code> to an IP address, but in this case 
Traffic Router returns its own IP address. The client opens a connection to 
port 80 on the Traffic Router&#8217;s IP address, and sends:</p>
+<div class="highlight-default"><div class="highlight"><pre><span 
class="n">GET</span> <span class="o">/</span><span class="n">foo</span><span 
class="o">/</span><span class="n">bar</span><span class="o">/</span><span 
class="n">fun</span><span class="o">.</span><span class="n">html</span> <span 
class="n">HTTP</span><span class="o">/</span><span class="mf">1.1</span>
 <span class="n">Host</span><span class="p">:</span> <span 
class="n">tr</span><span class="o">.</span><span class="n">dsname</span><span 
class="o">.</span><span class="n">cdn</span><span class="o">.</span><span 
class="n">com</span>
 </pre></div>
 </div>
 <p>Traffic Router uses an HTTP 302 to redirect the client to the best cache. 
For example:</p>
-<div class="highlight-default"><div class="highlight"><pre><span></span><span 
class="n">HTTP</span><span class="o">/</span><span class="mf">1.1</span> <span 
class="mi">302</span> <span class="n">Moved</span> <span 
class="n">Temporarily</span>
+<div class="highlight-default"><div class="highlight"><pre><span 
class="n">HTTP</span><span class="o">/</span><span class="mf">1.1</span> <span 
class="mi">302</span> <span class="n">Moved</span> <span 
class="n">Temporarily</span>
 <span class="n">Server</span><span class="p">:</span> <span 
class="n">Apache</span><span class="o">-</span><span 
class="n">Coyote</span><span class="o">/</span><span class="mf">1.1</span>
 <span class="n">Location</span><span class="p">:</span> <span 
class="n">http</span><span class="p">:</span><span class="o">//</span><span 
class="n">atsec</span><span class="o">-</span><span class="n">nyc</span><span 
class="o">-</span><span class="mf">02.</span><span class="n">dsname</span><span 
class="o">.</span><span class="n">cdn</span><span class="o">.</span><span 
class="n">com</span><span class="o">/</span><span class="n">foo</span><span 
class="o">/</span><span class="n">bar</span><span class="o">/</span><span 
class="n">fun</span><span class="o">.</span><span class="n">html</span>
 <span class="n">Content</span><span class="o">-</span><span 
class="n">Length</span><span class="p">:</span> <span class="mi">0</span>
@@ -255,11 +255,11 @@
 </div>
 <p>The information Traffic Router can consider when selecting a cache in this 
case is much better:</p>
 <ul class="simple">
-<li>The client’s IP address (the other side of the socket).</li>
+<li>The client&#8217;s IP address (the other side of the socket).</li>
 <li>The URL path the client is requesting, excluding query string.</li>
 <li>All HTTP 1.1 headers.</li>
 </ul>
-<p>The client follows the redirect and performs a DNS request for the IP 
address for <code class="docutils literal"><span 
class="pre">atsec-nyc-02.dsname.cdn.com</span></code>, and normal HTTP steps 
follow, except the sending of the Host: header when connected to the cache is 
<code class="docutils literal"><span class="pre">Host:</span> <span 
class="pre">atsec-nyc-02.dsname.cdn</span></code>, and the configuration of the 
cache includes the remap rule (e.g.“http://atsec-nyc-02.dsname.cdn  <a 
class="reference external" 
href="http://origin.dsname";>http://origin.dsname</a>.com“).</p>
+<p>The client follows the redirect and performs a DNS request for the IP 
address for <code class="docutils literal"><span 
class="pre">atsec-nyc-02.dsname.cdn.com</span></code>, and normal HTTP steps 
follow, except the sending of the Host: header when connected to the cache is 
<code class="docutils literal"><span class="pre">Host:</span> <span 
class="pre">atsec-nyc-02.dsname.cdn</span></code>, and the configuration of the 
cache includes the remap rule (e.g.``http://atsec-nyc-02.dsname.cdn  <a 
class="reference external" 
href="http://origin.dsname";>http://origin.dsname</a>.com``).</p>
 <p>Traffic Router sends all requests for the same path in a delivery service 
to the same cache in a cache group using consistent hashing, in this case all 
caches in a cache group are not carrying the same content, and there is a much 
larger combined cache in the cache group.</p>
 </div></blockquote>
 <p>In many cases DNS content routing is the best possible option, especially 
in cases where the client is receiving small objects from the CDN like images 
and web pages.</p>

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/6b5a5ffa/docs/latest/overview/traffic_server.html
----------------------------------------------------------------------
diff --git a/docs/latest/overview/traffic_server.html 
b/docs/latest/overview/traffic_server.html
index 89e1775..dade331 100644
--- a/docs/latest/overview/traffic_server.html
+++ b/docs/latest/overview/traffic_server.html
@@ -61,7 +61,7 @@
 
         
           
-          <img src="../_static/tc_logo.png" class="logo" />
+          <img src="../_static/tc_logo_c_only.png" class="logo" />
         
         </a>
 
@@ -104,7 +104,7 @@
 </li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../admin/index.html">Administrator’s Guide</a><ul>
+<li class="toctree-l1"><a class="reference internal" 
href="../admin/index.html">Administrator&#8217;s Guide</a><ul>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_install.html">Installing Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_config.html">Configuring Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_using.html">Using Traffic Ops</a></li>
@@ -120,7 +120,7 @@
 </li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Developer’s Guide</a><ul>
+<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Developer&#8217;s Guide</a><ul>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_ops.html">Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_portal.html">Traffic Portal</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_router.html">Traffic Router</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/6b5a5ffa/docs/latest/overview/traffic_stats.html
----------------------------------------------------------------------
diff --git a/docs/latest/overview/traffic_stats.html 
b/docs/latest/overview/traffic_stats.html
index 0b4e610..d9a2487 100644
--- a/docs/latest/overview/traffic_stats.html
+++ b/docs/latest/overview/traffic_stats.html
@@ -61,7 +61,7 @@
 
         
           
-          <img src="../_static/tc_logo.png" class="logo" />
+          <img src="../_static/tc_logo_c_only.png" class="logo" />
         
         </a>
 
@@ -104,7 +104,7 @@
 </li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../admin/index.html">Administrator’s Guide</a><ul>
+<li class="toctree-l1"><a class="reference internal" 
href="../admin/index.html">Administrator&#8217;s Guide</a><ul>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_install.html">Installing Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_config.html">Configuring Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_using.html">Using Traffic Ops</a></li>
@@ -120,7 +120,7 @@
 </li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Developer’s Guide</a><ul>
+<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Developer&#8217;s Guide</a><ul>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_ops.html">Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_portal.html">Traffic Portal</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_router.html">Traffic Router</a></li>
@@ -189,7 +189,7 @@
             
   <span class="target" id="reference-label-tc-ts"></span><div class="section" 
id="traffic-stats">
 <h1>Traffic Stats<a class="headerlink" href="#traffic-stats" title="Permalink 
to this headline">¶</a></h1>
-<p>Traffic Stats is a program written in <a class="reference external" 
href="http://golang.org";>Golang</a> that is used to acquire and store 
statistics about CDNs controlled by Traffic Control.  Traffic Stats mines 
metrics from Traffic Monitor’s JSON APIs and stores the data in <a 
class="reference external" href="http://influxdb.com";>InfluxDb</a>.  Data is 
typically stored in InfluxDb on a short-term basis (30 days or less).  The data 
from InfluxDb is then used to drive graphs created by <a class="reference 
external" href="http://grafana.org";>Grafana</a> - which are linked to from 
Traffic Ops - as well as provide data exposed through the Traffic Ops API.  
Traffic Stats performs two functions:  first it gathers stat data for Edge 
Caches and Delivery Services at a configurable interval (10 second default) 
from the Traffic Monitor API’s and stores the data in InfluxDb; second it 
summarizes all of the stats once a day (around midnight UTC) and creates a 
daily rollup containing the M
 ax Gbps served and the Total Bytes served.</p>
+<p>Traffic Stats is a program written in <a class="reference external" 
href="http://golang.org";>Golang</a> that is used to acquire and store 
statistics about CDNs controlled by Traffic Control.  Traffic Stats mines 
metrics from Traffic Monitor&#8217;s JSON APIs and stores the data in <a 
class="reference external" href="http://influxdb.com";>InfluxDb</a>.  Data is 
typically stored in InfluxDb on a short-term basis (30 days or less).  The data 
from InfluxDb is then used to drive graphs created by <a class="reference 
external" href="http://grafana.org";>Grafana</a> - which are linked to from 
Traffic Ops - as well as provide data exposed through the Traffic Ops API.  
Traffic Stats performs two functions:  first it gathers stat data for Edge 
Caches and Delivery Services at a configurable interval (10 second default) 
from the Traffic Monitor API&#8217;s and stores the data in InfluxDb; second it 
summarizes all of the stats once a day (around midnight UTC) and creates a 
daily rollup containi
 ng the Max Gbps served and the Total Bytes served.</p>
 <p>Stat data is stored in three different databases:</p>
 <blockquote>
 <div><ul class="simple">

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/6b5a5ffa/docs/latest/overview/traffic_vault.html
----------------------------------------------------------------------
diff --git a/docs/latest/overview/traffic_vault.html 
b/docs/latest/overview/traffic_vault.html
index 85cd1a2..7ad36fa 100644
--- a/docs/latest/overview/traffic_vault.html
+++ b/docs/latest/overview/traffic_vault.html
@@ -61,7 +61,7 @@
 
         
           
-          <img src="../_static/tc_logo.png" class="logo" />
+          <img src="../_static/tc_logo_c_only.png" class="logo" />
         
         </a>
 
@@ -104,7 +104,7 @@
 </li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../admin/index.html">Administrator’s Guide</a><ul>
+<li class="toctree-l1"><a class="reference internal" 
href="../admin/index.html">Administrator&#8217;s Guide</a><ul>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_install.html">Installing Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_config.html">Configuring Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_using.html">Using Traffic Ops</a></li>
@@ -120,7 +120,7 @@
 </li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Developer’s Guide</a><ul>
+<li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Developer&#8217;s Guide</a><ul>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_ops.html">Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_portal.html">Traffic Portal</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_router.html">Traffic Router</a></li>
@@ -228,7 +228,7 @@
 </li>
 <li>URL Signing Keys</li>
 </ul>
-<p>As the name suggests, Traffic Vault is meant to be a “vault” of private 
keys that only certain users are allowed to access.  In order to create, add, 
and retrieve keys a user must have admin privileges.  Keys can be created via 
the Traffic Ops UI, but they can only be retrieved via the Traffic Ops API.  
The keystore used by Traffic Vault is <a class="reference external" 
href="http://basho.com/riak/";>Riak</a>.  Traffic ops accesses Riak via https on 
port 8088.  Traffic ops uses Riak’s rest API with username/password 
authentication.  Information on the API can be found <a class="reference 
external" 
href="http://docs.basho.com/riak/latest/dev/references/http/";>here</a>.</p>
+<p>As the name suggests, Traffic Vault is meant to be a &#8220;vault&#8221; of 
private keys that only certain users are allowed to access.  In order to 
create, add, and retrieve keys a user must have admin privileges.  Keys can be 
created via the Traffic Ops UI, but they can only be retrieved via the Traffic 
Ops API.  The keystore used by Traffic Vault is <a class="reference external" 
href="http://basho.com/riak/";>Riak</a>.  Traffic ops accesses Riak via https on 
port 8088.  Traffic ops uses Riak&#8217;s rest API with username/password 
authentication.  Information on the API can be found <a class="reference 
external" 
href="http://docs.basho.com/riak/latest/dev/references/http/";>here</a>.</p>
 </div>
 
 

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/6b5a5ffa/docs/latest/search.html
----------------------------------------------------------------------
diff --git a/docs/latest/search.html b/docs/latest/search.html
index 31527b3..03b3055 100644
--- a/docs/latest/search.html
+++ b/docs/latest/search.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Search &mdash; Traffic Control 1.8-dev documentation </title>
+  <title>Search &mdash; Traffic Control 2.0-dev documentation </title>
   
 
   
@@ -36,7 +36,7 @@
         <link rel="index" title="Index"
               href="genindex.html"/>
         <link rel="search" title="Search" href="#"/>
-    <link rel="top" title="Traffic Control 1.8-dev documentation" 
href="index.html"/> 
+    <link rel="top" title="Traffic Control 2.0-dev documentation" 
href="index.html"/> 
 
   
   <script src="_static/js/modernizr.min.js"></script>
@@ -58,7 +58,7 @@
 
         
           
-          <img src="_static/tc_logo.png" class="logo" />
+          <img src="_static/tc_logo_c_only.png" class="logo" />
         
         </a>
 
@@ -101,7 +101,7 @@
 </li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="admin/index.html">Administrator’s Guide</a><ul>
+<li class="toctree-l1"><a class="reference internal" 
href="admin/index.html">Administrator&#8217;s Guide</a><ul>
 <li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops_install.html">Installing Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops_config.html">Configuring Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops_using.html">Using Traffic Ops</a></li>
@@ -117,7 +117,7 @@
 </li>
 </ul>
 <ul>
-<li class="toctree-l1"><a class="reference internal" 
href="development/index.html">Developer’s Guide</a><ul>
+<li class="toctree-l1"><a class="reference internal" 
href="development/index.html">Developer&#8217;s Guide</a><ul>
 <li class="toctree-l2"><a class="reference internal" 
href="development/traffic_ops.html">Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="development/traffic_portal.html">Traffic Portal</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="development/traffic_router.html">Traffic Router</a></li>
@@ -159,9 +159,9 @@
         <div class="rst-content">
           <div role="navigation" aria-label="breadcrumbs navigation">
   <ul class="wy-breadcrumbs">
-    <li><a href="index.html">Traffic Control 1.8-dev</a> &raquo;</li>
+    <li><a href="index.html">Traffic Control 2.0-dev</a> &raquo;</li>
       
-    <li>Search</li>
+    <li></li>
       <li class="wy-breadcrumbs-aside">
         
       </li>
@@ -213,7 +213,7 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'./',
-            VERSION:'1.8-dev',
+            VERSION:'2.0-dev',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true


Reply via email to