http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/42d25dc5/docs/latest/development/traffic_router/traffic_router_api.html
----------------------------------------------------------------------
diff --git a/docs/latest/development/traffic_router/traffic_router_api.html 
b/docs/latest/development/traffic_router/traffic_router_api.html
index afafbff..48814ae 100644
--- a/docs/latest/development/traffic_router/traffic_router_api.html
+++ b/docs/latest/development/traffic_router/traffic_router_api.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Traffic Router API &mdash; Traffic Control master documentation 
</title>
+  <title>Traffic Router API &mdash; Traffic Control 2.1-dev documentation 
</title>
   
 
   
@@ -33,7 +33,7 @@
   
 
   
-    <link rel="top" title="Traffic Control master documentation" 
href="../../index.html"/>
+    <link rel="top" title="Traffic Control 2.1-dev documentation" 
href="../../index.html"/>
         <link rel="up" title="Traffic Router" href="../traffic_router.html"/>
         <link rel="next" title="Traffic Monitor" 
href="../traffic_monitor.html"/>
         <link rel="prev" title="Traffic Router" 
href="../traffic_router.html"/> 
@@ -102,12 +102,15 @@
 </ul>
 <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>
-<li class="toctree-l2"><a class="reference internal" 
href="../../admin/traffic_ops_extensions.html">Managing Traffic Ops 
Extensions</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../../admin/traffic_ops/installation.html">Traffic Ops - 
Installing</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../../admin/traffic_ops/default_profiles.html">Traffic Ops - Default 
Profiles</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../../admin/traffic_ops/migration_from_10_to_20.html">Traffic Ops - 
Migrating from 1.x to 2.x</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../../admin/traffic_ops/configuration.html">Traffic Ops - 
Configuring</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../../admin/traffic_ops/using.html">Traffic Ops - Using</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../../admin/traffic_ops/extensions.html">Managing Traffic Ops 
Extensions</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../../admin/traffic_portal.html">Traffic Portal Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../../admin/traffic_monitor.html">Traffic Monitor Administration</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../../admin/traffic_monitor_golang.html">Traffic Monitor 
Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../../admin/traffic_router.html">Traffic Router Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../../admin/traffic_stats.html">Traffic Stats Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../../admin/traffic_server.html">Traffic Server Administration</a></li>
@@ -118,10 +121,12 @@
 </ul>
 <ul class="current">
 <li class="toctree-l1 current"><a class="reference internal" 
href="../index.html">Developer&#8217;s Guide</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" 
href="../building.html">Building Traffic Control</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 current"><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_monitor_golang.html">Traffic Monitor Golang</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../traffic_stats.html">Traffic Stats</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../traffic_server.html">Traffic Server</a></li>
 </ul>
@@ -159,7 +164,7 @@
         <div class="rst-content">
           <div role="navigation" aria-label="breadcrumbs navigation">
   <ul class="wy-breadcrumbs">
-    <li><a href="../../index.html">Traffic Control master</a> &raquo;</li>
+    <li><a href="../../index.html">Traffic Control 2.1-dev</a> &raquo;</li>
       
           <li><a href="../index.html">Developer&#8217;s Guide</a> &raquo;</li>
       
@@ -250,10 +255,11 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../../',
-            VERSION:'master',
+            VERSION:'2.1-dev',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
-            HAS_SOURCE:  true
+            HAS_SOURCE:  true,
+            SOURCELINK_SUFFIX: ''
         };
     </script>
       <script type="text/javascript" src="../../_static/jquery.js"></script>

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/42d25dc5/docs/latest/development/traffic_server.html
----------------------------------------------------------------------
diff --git a/docs/latest/development/traffic_server.html 
b/docs/latest/development/traffic_server.html
index 89dcc7b..cb72a23 100644
--- a/docs/latest/development/traffic_server.html
+++ b/docs/latest/development/traffic_server.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Traffic Server &mdash; Traffic Control master documentation </title>
+  <title>Traffic Server &mdash; Traffic Control 2.1-dev documentation </title>
   
 
   
@@ -33,7 +33,7 @@
   
 
   
-    <link rel="top" title="Traffic Control master documentation" 
href="../index.html"/>
+    <link rel="top" title="Traffic Control 2.1-dev documentation" 
href="../index.html"/>
         <link rel="up" title="Developer’s Guide" href="index.html"/>
         <link rel="next" title="FAQ" href="../faq/index.html"/>
         <link rel="prev" title="Traffic Stats" href="traffic_stats.html"/> 
@@ -102,12 +102,15 @@
 </ul>
 <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>
-<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_extensions.html">Managing Traffic Ops 
Extensions</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/installation.html">Traffic Ops - Installing</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/default_profiles.html">Traffic Ops - Default 
Profiles</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/migration_from_10_to_20.html">Traffic Ops - 
Migrating from 1.x to 2.x</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/configuration.html">Traffic Ops - 
Configuring</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/using.html">Traffic Ops - Using</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/extensions.html">Managing Traffic Ops 
Extensions</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_portal.html">Traffic Portal Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_monitor.html">Traffic Monitor Administration</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_monitor_golang.html">Traffic Monitor 
Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_router.html">Traffic Router Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_stats.html">Traffic Stats Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_server.html">Traffic Server Administration</a></li>
@@ -118,12 +121,14 @@
 </ul>
 <ul class="current">
 <li class="toctree-l1 current"><a class="reference internal" 
href="index.html">Developer&#8217;s Guide</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" 
href="building.html">Building Traffic Control</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>
 <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_monitor_golang.html">Traffic Monitor Golang</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>
@@ -159,7 +164,7 @@
         <div class="rst-content">
           <div role="navigation" aria-label="breadcrumbs navigation">
   <ul class="wy-breadcrumbs">
-    <li><a href="../index.html">Traffic Control master</a> &raquo;</li>
+    <li><a href="../index.html">Traffic Control 2.1-dev</a> &raquo;</li>
       
           <li><a href="index.html">Developer&#8217;s Guide</a> &raquo;</li>
       
@@ -227,10 +232,11 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../',
-            VERSION:'master',
+            VERSION:'2.1-dev',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
-            HAS_SOURCE:  true
+            HAS_SOURCE:  true,
+            SOURCELINK_SUFFIX: ''
         };
     </script>
       <script type="text/javascript" src="../_static/jquery.js"></script>

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/42d25dc5/docs/latest/development/traffic_stats.html
----------------------------------------------------------------------
diff --git a/docs/latest/development/traffic_stats.html 
b/docs/latest/development/traffic_stats.html
index 48cc8ea..9839e27 100644
--- a/docs/latest/development/traffic_stats.html
+++ b/docs/latest/development/traffic_stats.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Traffic Stats &mdash; Traffic Control master documentation </title>
+  <title>Traffic Stats &mdash; Traffic Control 2.1-dev documentation </title>
   
 
   
@@ -33,10 +33,10 @@
   
 
   
-    <link rel="top" title="Traffic Control master documentation" 
href="../index.html"/>
+    <link rel="top" title="Traffic Control 2.1-dev documentation" 
href="../index.html"/>
         <link rel="up" title="Developer’s Guide" href="index.html"/>
         <link rel="next" title="Traffic Server" href="traffic_server.html"/>
-        <link rel="prev" title="Traffic Monitor APIs" 
href="traffic_monitor/traffic_monitor_api.html"/> 
+        <link rel="prev" title="Traffic Monitor Golang" 
href="traffic_monitor_golang.html"/> 
 
   
   <script src="_static/js/modernizr.min.js"></script>
@@ -102,12 +102,15 @@
 </ul>
 <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>
-<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_extensions.html">Managing Traffic Ops 
Extensions</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/installation.html">Traffic Ops - Installing</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/default_profiles.html">Traffic Ops - Default 
Profiles</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/migration_from_10_to_20.html">Traffic Ops - 
Migrating from 1.x to 2.x</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/configuration.html">Traffic Ops - 
Configuring</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/using.html">Traffic Ops - Using</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/extensions.html">Managing Traffic Ops 
Extensions</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_portal.html">Traffic Portal Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_monitor.html">Traffic Monitor Administration</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_monitor_golang.html">Traffic Monitor 
Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_router.html">Traffic Router Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_stats.html">Traffic Stats Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_server.html">Traffic Server Administration</a></li>
@@ -118,11 +121,13 @@
 </ul>
 <ul class="current">
 <li class="toctree-l1 current"><a class="reference internal" 
href="index.html">Developer&#8217;s Guide</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" 
href="building.html">Building Traffic Control</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>
 <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"><a class="reference internal" 
href="traffic_monitor_golang.html">Traffic Monitor Golang</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>
@@ -159,7 +164,7 @@
         <div class="rst-content">
           <div role="navigation" aria-label="breadcrumbs navigation">
   <ul class="wy-breadcrumbs">
-    <li><a href="../index.html">Traffic Control master</a> &raquo;</li>
+    <li><a href="../index.html">Traffic Control 2.1-dev</a> &raquo;</li>
       
           <li><a href="index.html">Developer&#8217;s Guide</a> &raquo;</li>
       
@@ -178,7 +183,7 @@
                          <a href="traffic_server.html" class="btn btn-neutral 
float-right" title="Traffic Server">Next <span class="fa 
fa-arrow-circle-right"></span></a>
                  
                  
-                         <a href="traffic_monitor/traffic_monitor_api.html" 
class="btn btn-neutral" title="Traffic Monitor APIs"><span class="fa 
fa-arrow-circle-left"></span> Previous</a>
+                         <a href="traffic_monitor_golang.html" class="btn 
btn-neutral" title="Traffic Monitor Golang"><span class="fa 
fa-arrow-circle-left"></span> Previous</a>
                  
                  </div>
                  
@@ -246,7 +251,7 @@
         <a href="traffic_server.html" class="btn btn-neutral float-right" 
title="Traffic Server">Next <span class="fa fa-arrow-circle-right"></span></a>
       
       
-        <a href="traffic_monitor/traffic_monitor_api.html" class="btn 
btn-neutral" title="Traffic Monitor APIs"><span class="fa 
fa-arrow-circle-left"></span> Previous</a>
+        <a href="traffic_monitor_golang.html" class="btn btn-neutral" 
title="Traffic Monitor Golang"><span class="fa fa-arrow-circle-left"></span> 
Previous</a>
       
     </div>
   
@@ -275,10 +280,11 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../',
-            VERSION:'master',
+            VERSION:'2.1-dev',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
-            HAS_SOURCE:  true
+            HAS_SOURCE:  true,
+            SOURCELINK_SUFFIX: ''
         };
     </script>
       <script type="text/javascript" src="../_static/jquery.js"></script>

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/42d25dc5/docs/latest/faq/administration.html
----------------------------------------------------------------------
diff --git a/docs/latest/faq/administration.html 
b/docs/latest/faq/administration.html
index 09ed7b9..7cbe777 100644
--- a/docs/latest/faq/administration.html
+++ b/docs/latest/faq/administration.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Running a Traffic Control CDN &mdash; Traffic Control master 
documentation </title>
+  <title>Running a Traffic Control CDN &mdash; Traffic Control 2.1-dev 
documentation </title>
   
 
   
@@ -33,7 +33,7 @@
   
 
   
-    <link rel="top" title="Traffic Control master documentation" 
href="../index.html"/>
+    <link rel="top" title="Traffic Control 2.1-dev documentation" 
href="../index.html"/>
         <link rel="up" title="FAQ" href="index.html"/>
         <link rel="next" title="Glossary" href="../glossary.html"/>
         <link rel="prev" title="Development" href="development.html"/> 
@@ -102,12 +102,15 @@
 </ul>
 <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>
-<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_extensions.html">Managing Traffic Ops 
Extensions</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/installation.html">Traffic Ops - Installing</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/default_profiles.html">Traffic Ops - Default 
Profiles</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/migration_from_10_to_20.html">Traffic Ops - 
Migrating from 1.x to 2.x</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/configuration.html">Traffic Ops - 
Configuring</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/using.html">Traffic Ops - Using</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/extensions.html">Managing Traffic Ops 
Extensions</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_portal.html">Traffic Portal Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_monitor.html">Traffic Monitor Administration</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_monitor_golang.html">Traffic Monitor 
Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_router.html">Traffic Router Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_stats.html">Traffic Stats Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_server.html">Traffic Server Administration</a></li>
@@ -118,10 +121,12 @@
 </ul>
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Developer&#8217;s Guide</a><ul>
+<li class="toctree-l2"><a class="reference internal" 
href="../development/building.html">Building Traffic Control</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_ops.html">Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_portal.html">Traffic Portal</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_router.html">Traffic Router</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_monitor.html">Traffic Monitor</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_monitor_golang.html">Traffic Monitor 
Golang</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_stats.html">Traffic Stats</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_server.html">Traffic Server</a></li>
 </ul>
@@ -131,7 +136,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>
@@ -159,7 +164,7 @@
         <div class="rst-content">
           <div role="navigation" aria-label="breadcrumbs navigation">
   <ul class="wy-breadcrumbs">
-    <li><a href="../index.html">Traffic Control master</a> &raquo;</li>
+    <li><a href="../index.html">Traffic Control 2.1-dev</a> &raquo;</li>
       
           <li><a href="index.html">FAQ</a> &raquo;</li>
       
@@ -317,10 +322,11 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../',
-            VERSION:'master',
+            VERSION:'2.1-dev',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
-            HAS_SOURCE:  true
+            HAS_SOURCE:  true,
+            SOURCELINK_SUFFIX: ''
         };
     </script>
       <script type="text/javascript" src="../_static/jquery.js"></script>

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/42d25dc5/docs/latest/faq/development.html
----------------------------------------------------------------------
diff --git a/docs/latest/faq/development.html b/docs/latest/faq/development.html
index 6ab244a..2d54dc9 100644
--- a/docs/latest/faq/development.html
+++ b/docs/latest/faq/development.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Development &mdash; Traffic Control master documentation </title>
+  <title>Development &mdash; Traffic Control 2.1-dev documentation </title>
   
 
   
@@ -33,7 +33,7 @@
   
 
   
-    <link rel="top" title="Traffic Control master documentation" 
href="../index.html"/>
+    <link rel="top" title="Traffic Control 2.1-dev documentation" 
href="../index.html"/>
         <link rel="up" title="FAQ" href="index.html"/>
         <link rel="next" title="Running a Traffic Control CDN" 
href="administration.html"/>
         <link rel="prev" title="General" href="general.html"/> 
@@ -102,12 +102,15 @@
 </ul>
 <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>
-<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_extensions.html">Managing Traffic Ops 
Extensions</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/installation.html">Traffic Ops - Installing</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/default_profiles.html">Traffic Ops - Default 
Profiles</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/migration_from_10_to_20.html">Traffic Ops - 
Migrating from 1.x to 2.x</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/configuration.html">Traffic Ops - 
Configuring</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/using.html">Traffic Ops - Using</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/extensions.html">Managing Traffic Ops 
Extensions</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_portal.html">Traffic Portal Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_monitor.html">Traffic Monitor Administration</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_monitor_golang.html">Traffic Monitor 
Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_router.html">Traffic Router Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_stats.html">Traffic Stats Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_server.html">Traffic Server Administration</a></li>
@@ -118,10 +121,12 @@
 </ul>
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Developer&#8217;s Guide</a><ul>
+<li class="toctree-l2"><a class="reference internal" 
href="../development/building.html">Building Traffic Control</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_ops.html">Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_portal.html">Traffic Portal</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_router.html">Traffic Router</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_monitor.html">Traffic Monitor</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_monitor_golang.html">Traffic Monitor 
Golang</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_stats.html">Traffic Stats</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_server.html">Traffic Server</a></li>
 </ul>
@@ -130,7 +135,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>
@@ -159,7 +164,7 @@
         <div class="rst-content">
           <div role="navigation" aria-label="breadcrumbs navigation">
   <ul class="wy-breadcrumbs">
-    <li><a href="../index.html">Traffic Control master</a> &raquo;</li>
+    <li><a href="../index.html">Traffic Control 2.1-dev</a> &raquo;</li>
       
           <li><a href="index.html">FAQ</a> &raquo;</li>
       
@@ -231,10 +236,11 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../',
-            VERSION:'master',
+            VERSION:'2.1-dev',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
-            HAS_SOURCE:  true
+            HAS_SOURCE:  true,
+            SOURCELINK_SUFFIX: ''
         };
     </script>
       <script type="text/javascript" src="../_static/jquery.js"></script>

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/42d25dc5/docs/latest/faq/general.html
----------------------------------------------------------------------
diff --git a/docs/latest/faq/general.html b/docs/latest/faq/general.html
index c6fe933..bc0e183 100644
--- a/docs/latest/faq/general.html
+++ b/docs/latest/faq/general.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>General &mdash; Traffic Control master documentation </title>
+  <title>General &mdash; Traffic Control 2.1-dev documentation </title>
   
 
   
@@ -33,7 +33,7 @@
   
 
   
-    <link rel="top" title="Traffic Control master documentation" 
href="../index.html"/>
+    <link rel="top" title="Traffic Control 2.1-dev documentation" 
href="../index.html"/>
         <link rel="up" title="FAQ" href="index.html"/>
         <link rel="next" title="Development" href="development.html"/>
         <link rel="prev" title="FAQ" href="index.html"/> 
@@ -102,12 +102,15 @@
 </ul>
 <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>
-<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_extensions.html">Managing Traffic Ops 
Extensions</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/installation.html">Traffic Ops - Installing</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/default_profiles.html">Traffic Ops - Default 
Profiles</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/migration_from_10_to_20.html">Traffic Ops - 
Migrating from 1.x to 2.x</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/configuration.html">Traffic Ops - 
Configuring</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/using.html">Traffic Ops - Using</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/extensions.html">Managing Traffic Ops 
Extensions</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_portal.html">Traffic Portal Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_monitor.html">Traffic Monitor Administration</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_monitor_golang.html">Traffic Monitor 
Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_router.html">Traffic Router Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_stats.html">Traffic Stats Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_server.html">Traffic Server Administration</a></li>
@@ -118,10 +121,12 @@
 </ul>
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Developer&#8217;s Guide</a><ul>
+<li class="toctree-l2"><a class="reference internal" 
href="../development/building.html">Building Traffic Control</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_ops.html">Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_portal.html">Traffic Portal</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_router.html">Traffic Router</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_monitor.html">Traffic Monitor</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_monitor_golang.html">Traffic Monitor 
Golang</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_stats.html">Traffic Stats</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_server.html">Traffic Server</a></li>
 </ul>
@@ -129,7 +134,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>
@@ -159,7 +164,7 @@
         <div class="rst-content">
           <div role="navigation" aria-label="breadcrumbs navigation">
   <ul class="wy-breadcrumbs">
-    <li><a href="../index.html">Traffic Control master</a> &raquo;</li>
+    <li><a href="../index.html">Traffic Control 2.1-dev</a> &raquo;</li>
       
           <li><a href="index.html">FAQ</a> &raquo;</li>
       
@@ -268,10 +273,11 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../',
-            VERSION:'master',
+            VERSION:'2.1-dev',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
-            HAS_SOURCE:  true
+            HAS_SOURCE:  true,
+            SOURCELINK_SUFFIX: ''
         };
     </script>
       <script type="text/javascript" src="../_static/jquery.js"></script>

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/42d25dc5/docs/latest/faq/index.html
----------------------------------------------------------------------
diff --git a/docs/latest/faq/index.html b/docs/latest/faq/index.html
index 715e687..b075434 100644
--- a/docs/latest/faq/index.html
+++ b/docs/latest/faq/index.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>FAQ &mdash; Traffic Control master documentation </title>
+  <title>FAQ &mdash; Traffic Control 2.1-dev documentation </title>
   
 
   
@@ -33,7 +33,7 @@
   
 
   
-    <link rel="top" title="Traffic Control master documentation" 
href="../index.html"/>
+    <link rel="top" title="Traffic Control 2.1-dev documentation" 
href="../index.html"/>
         <link rel="next" title="General" href="general.html"/>
         <link rel="prev" title="Traffic Server" 
href="../development/traffic_server.html"/> 
 
@@ -101,12 +101,15 @@
 </ul>
 <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>
-<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops_extensions.html">Managing Traffic Ops 
Extensions</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/installation.html">Traffic Ops - Installing</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/default_profiles.html">Traffic Ops - Default 
Profiles</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/migration_from_10_to_20.html">Traffic Ops - 
Migrating from 1.x to 2.x</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/configuration.html">Traffic Ops - 
Configuring</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/using.html">Traffic Ops - Using</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_ops/extensions.html">Managing Traffic Ops 
Extensions</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_portal.html">Traffic Portal Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_monitor.html">Traffic Monitor Administration</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_monitor_golang.html">Traffic Monitor 
Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_router.html">Traffic Router Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_stats.html">Traffic Stats Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../admin/traffic_server.html">Traffic Server Administration</a></li>
@@ -117,17 +120,19 @@
 </ul>
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="../development/index.html">Developer&#8217;s Guide</a><ul>
+<li class="toctree-l2"><a class="reference internal" 
href="../development/building.html">Building Traffic Control</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_ops.html">Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_portal.html">Traffic Portal</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_router.html">Traffic Router</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_monitor.html">Traffic Monitor</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_monitor_golang.html">Traffic Monitor 
Golang</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_stats.html">Traffic Stats</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="../development/traffic_server.html">Traffic Server</a></li>
 </ul>
 </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>
@@ -158,7 +163,7 @@
         <div class="rst-content">
           <div role="navigation" aria-label="breadcrumbs navigation">
   <ul class="wy-breadcrumbs">
-    <li><a href="../index.html">Traffic Control master</a> &raquo;</li>
+    <li><a href="../index.html">Traffic Control 2.1-dev</a> &raquo;</li>
       
     <li>FAQ</li>
       <li class="wy-breadcrumbs-aside">
@@ -245,10 +250,11 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'../',
-            VERSION:'master',
+            VERSION:'2.1-dev',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
-            HAS_SOURCE:  true
+            HAS_SOURCE:  true,
+            SOURCELINK_SUFFIX: ''
         };
     </script>
       <script type="text/javascript" src="../_static/jquery.js"></script>

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/42d25dc5/docs/latest/genindex.html
----------------------------------------------------------------------
diff --git a/docs/latest/genindex.html b/docs/latest/genindex.html
index abfec0a..01d091c 100644
--- a/docs/latest/genindex.html
+++ b/docs/latest/genindex.html
@@ -8,7 +8,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Index &mdash; Traffic Control master documentation </title>
+  <title>Index &mdash; Traffic Control 2.1-dev documentation </title>
   
 
   
@@ -34,7 +34,7 @@
   
 
   
-    <link rel="top" title="Traffic Control master documentation" 
href="index.html"/> 
+    <link rel="top" title="Traffic Control 2.1-dev documentation" 
href="index.html"/> 
 
   
   <script src="_static/js/modernizr.min.js"></script>
@@ -100,12 +100,15 @@
 </ul>
 <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>
-<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops_extensions.html">Managing Traffic Ops 
Extensions</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops/installation.html">Traffic Ops - Installing</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops/default_profiles.html">Traffic Ops - Default 
Profiles</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops/migration_from_10_to_20.html">Traffic Ops - Migrating 
from 1.x to 2.x</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops/configuration.html">Traffic Ops - Configuring</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops/using.html">Traffic Ops - Using</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops/extensions.html">Managing Traffic Ops 
Extensions</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_portal.html">Traffic Portal Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_monitor.html">Traffic Monitor Administration</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_monitor_golang.html">Traffic Monitor Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_router.html">Traffic Router Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_stats.html">Traffic Stats Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_server.html">Traffic Server Administration</a></li>
@@ -116,10 +119,12 @@
 </ul>
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="development/index.html">Developer&#8217;s Guide</a><ul>
+<li class="toctree-l2"><a class="reference internal" 
href="development/building.html">Building Traffic Control</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="development/traffic_ops.html">Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="development/traffic_portal.html">Traffic Portal</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="development/traffic_router.html">Traffic Router</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="development/traffic_monitor.html">Traffic Monitor</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="development/traffic_monitor_golang.html">Traffic Monitor Golang</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="development/traffic_stats.html">Traffic Stats</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="development/traffic_server.html">Traffic Server</a></li>
 </ul>
@@ -157,7 +162,7 @@
         <div class="rst-content">
           <div role="navigation" aria-label="breadcrumbs navigation">
   <ul class="wy-breadcrumbs">
-    <li><a href="index.html">Traffic Control master</a> &raquo;</li>
+    <li><a href="index.html">Traffic Control 2.1-dev</a> &raquo;</li>
       
     <li></li>
       <li class="wy-breadcrumbs-aside">
@@ -203,7 +208,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>
@@ -223,7 +228,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-3">Bulk Upload Server</a>
+  <dt><a href="admin/traffic_ops/using.html#index-3">Bulk Upload Server</a>
   </dt>
 
   </dl></td>
@@ -241,7 +246,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>
 
       
@@ -253,7 +258,7 @@
   </dt>
 
       
-  <dt><a href="admin/traffic_ops_using.html#index-1">Change Log</a>
+  <dt><a href="admin/traffic_ops/using.html#index-1">Change Log</a>
   </dt>
 
   </dl></td>
@@ -271,7 +276,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,13 +294,13 @@
   </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>
   <td style="width: 33%" valign="top"><dl>
       
-  <dt><a href="admin/traffic_ops_using.html#index-4">Delivery Service Type</a>
+  <dt><a href="admin/traffic_ops/using.html#index-4">Delivery Service Type</a>
   </dt>
 
   </dl></td>
@@ -311,7 +316,7 @@
   </dl></td>
   <td style="width: 33%" valign="top"><dl>
       
-  <dt><a href="admin/traffic_ops_using.html#index-2">Edge Health</a>
+  <dt><a href="admin/traffic_ops/using.html#index-2">Edge Health</a>
   </dt>
 
   </dl></td>
@@ -337,7 +342,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>
 
       
@@ -347,7 +352,7 @@
   </dl></td>
   <td style="width: 33%" valign="top"><dl>
       
-  <dt><a href="admin/traffic_ops_config.html#index-0">Global Profile</a>
+  <dt><a href="admin/traffic_ops/configuration.html#index-0">Global Profile</a>
   </dt>
 
   </dl></td>
@@ -357,15 +362,15 @@
 <table style="width: 100%" class="indextable genindextable"><tr>
   <td style="width: 33%" valign="top"><dl>
       
-  <dt><a href="admin/traffic_ops_using.html#index-5">Header Rewrite</a>
+  <dt><a href="admin/traffic_ops/using.html#index-5">Header Rewrite</a>
   </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>
 
       
-  <dt><a href="admin/traffic_ops_using.html#index-2">Health</a>
+  <dt><a href="admin/traffic_ops/using.html#index-2">Health</a>
   </dt>
 
       
@@ -373,13 +378,13 @@
   </dt>
 
       
-  <dt><a href="admin/traffic_ops_using.html#index-0">Health Tab</a>
+  <dt><a href="admin/traffic_ops/using.html#index-0">Health Tab</a>
   </dt>
 
   </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 +406,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 +462,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 +472,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 +482,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 +492,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,21 +516,21 @@
 <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>
 
       
-  <dt><a href="admin/traffic_ops_using.html#index-6">Signed URLs</a>
+  <dt><a href="admin/traffic_ops/using.html#index-6">Signed URLs</a>
   </dt>
 
   </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>
@@ -531,7 +540,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-6">Token Based 
Authentication</a>
+  <dt><a href="admin/traffic_ops/using.html#index-6">Token Based 
Authentication</a>
   </dt>
 
       
@@ -539,12 +548,20 @@
   </dt>
 
       
-  <dt><a href="admin/traffic_ops_install.html#index-0">Traffic Ops - 
Installing</a>
+  <dt><a href="admin/traffic_ops/default_profiles.html#index-0">Traffic Ops - 
Default Profiles</a>
+  </dt>
+
+      
+  <dt><a href="admin/traffic_ops/installation.html#index-0">Traffic Ops - 
Installing</a>
   </dt>
 
   </dl></td>
   <td style="width: 33%" valign="top"><dl>
       
+  <dt><a href="admin/traffic_ops/migration_from_10_to_20.html#index-0">Traffic 
Ops - Migrating from Traffic Ops 1.x to Traffic Ops 2.x</a>
+  </dt>
+
+      
   <dt><a href="overview/traffic_portal.html#index-0">Traffic Portal - 
Overview</a>
   </dt>
 
@@ -589,10 +606,11 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'./',
-            VERSION:'master',
+            VERSION:'2.1-dev',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
-            HAS_SOURCE:  true
+            HAS_SOURCE:  true,
+            SOURCELINK_SUFFIX: ''
         };
     </script>
       <script type="text/javascript" src="_static/jquery.js"></script>

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/42d25dc5/docs/latest/glossary.html
----------------------------------------------------------------------
diff --git a/docs/latest/glossary.html b/docs/latest/glossary.html
index 0997cc9..e3ffd02 100644
--- a/docs/latest/glossary.html
+++ b/docs/latest/glossary.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Glossary &mdash; Traffic Control master documentation </title>
+  <title>Glossary &mdash; Traffic Control 2.1-dev documentation </title>
   
 
   
@@ -33,7 +33,7 @@
   
 
   
-    <link rel="top" title="Traffic Control master documentation" 
href="index.html"/>
+    <link rel="top" title="Traffic Control 2.1-dev documentation" 
href="index.html"/>
         <link rel="prev" title="Running a Traffic Control CDN" 
href="faq/administration.html"/> 
 
   
@@ -100,12 +100,15 @@
 </ul>
 <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>
-<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops_extensions.html">Managing Traffic Ops 
Extensions</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops/installation.html">Traffic Ops - Installing</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops/default_profiles.html">Traffic Ops - Default 
Profiles</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops/migration_from_10_to_20.html">Traffic Ops - Migrating 
from 1.x to 2.x</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops/configuration.html">Traffic Ops - Configuring</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops/using.html">Traffic Ops - Using</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops/extensions.html">Managing Traffic Ops 
Extensions</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_portal.html">Traffic Portal Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_monitor.html">Traffic Monitor Administration</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_monitor_golang.html">Traffic Monitor Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_router.html">Traffic Router Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_stats.html">Traffic Stats Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_server.html">Traffic Server Administration</a></li>
@@ -116,10 +119,12 @@
 </ul>
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="development/index.html">Developer&#8217;s Guide</a><ul>
+<li class="toctree-l2"><a class="reference internal" 
href="development/building.html">Building Traffic Control</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="development/traffic_ops.html">Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="development/traffic_portal.html">Traffic Portal</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="development/traffic_router.html">Traffic Router</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="development/traffic_monitor.html">Traffic Monitor</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="development/traffic_monitor_golang.html">Traffic Monitor Golang</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="development/traffic_stats.html">Traffic Stats</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="development/traffic_server.html">Traffic Server</a></li>
 </ul>
@@ -134,7 +139,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>
 
           
@@ -157,7 +162,7 @@
         <div class="rst-content">
           <div role="navigation" aria-label="breadcrumbs navigation">
   <ul class="wy-breadcrumbs">
-    <li><a href="index.html">Traffic Control master</a> &raquo;</li>
+    <li><a href="index.html">Traffic Control 2.1-dev</a> &raquo;</li>
       
     <li>Glossary</li>
       <li class="wy-breadcrumbs-aside">
@@ -181,44 +186,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>
 
@@ -258,10 +263,11 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'./',
-            VERSION:'master',
+            VERSION:'2.1-dev',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
-            HAS_SOURCE:  true
+            HAS_SOURCE:  true,
+            SOURCELINK_SUFFIX: ''
         };
     </script>
       <script type="text/javascript" src="_static/jquery.js"></script>

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/42d25dc5/docs/latest/index.html
----------------------------------------------------------------------
diff --git a/docs/latest/index.html b/docs/latest/index.html
index 3458196..04e7927 100644
--- a/docs/latest/index.html
+++ b/docs/latest/index.html
@@ -7,7 +7,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
-  <title>Traffic Control &mdash; Traffic Control master documentation </title>
+  <title>Traffic Control &mdash; Traffic Control 2.1-dev documentation </title>
   
 
   
@@ -33,7 +33,7 @@
   
 
   
-    <link rel="top" title="Traffic Control master documentation" href="#"/>
+    <link rel="top" title="Traffic Control 2.1-dev documentation" href="#"/>
         <link rel="next" title="CDN Basics" href="basics/index.html"/> 
 
   
@@ -100,12 +100,15 @@
 </ul>
 <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>
-<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops_extensions.html">Managing Traffic Ops 
Extensions</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops/installation.html">Traffic Ops - Installing</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops/default_profiles.html">Traffic Ops - Default 
Profiles</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops/migration_from_10_to_20.html">Traffic Ops - Migrating 
from 1.x to 2.x</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops/configuration.html">Traffic Ops - Configuring</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops/using.html">Traffic Ops - Using</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops/extensions.html">Managing Traffic Ops 
Extensions</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_portal.html">Traffic Portal Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_monitor.html">Traffic Monitor Administration</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_monitor_golang.html">Traffic Monitor Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_router.html">Traffic Router Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_stats.html">Traffic Stats Administration</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_server.html">Traffic Server Administration</a></li>
@@ -116,10 +119,12 @@
 </ul>
 <ul>
 <li class="toctree-l1"><a class="reference internal" 
href="development/index.html">Developer&#8217;s Guide</a><ul>
+<li class="toctree-l2"><a class="reference internal" 
href="development/building.html">Building Traffic Control</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="development/traffic_ops.html">Traffic Ops</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="development/traffic_portal.html">Traffic Portal</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="development/traffic_router.html">Traffic Router</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="development/traffic_monitor.html">Traffic Monitor</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="development/traffic_monitor_golang.html">Traffic Monitor Golang</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="development/traffic_stats.html">Traffic Stats</a></li>
 <li class="toctree-l2"><a class="reference internal" 
href="development/traffic_server.html">Traffic Server</a></li>
 </ul>
@@ -157,7 +162,7 @@
         <div class="rst-content">
           <div role="navigation" aria-label="breadcrumbs navigation">
   <ul class="wy-breadcrumbs">
-    <li><a href="#">Traffic Control master</a> &raquo;</li>
+    <li><a href="#">Traffic Control 2.1-dev</a> &raquo;</li>
       
     <li>Traffic Control</li>
       <li class="wy-breadcrumbs-aside">
@@ -240,32 +245,44 @@
 <div class="toctree-wrapper compound">
 <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><ul>
-<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops_install.html#system-requirements">System 
Requirements</a></li>
-<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops_install.html#navigating-the-install">Navigating the 
Install</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops/installation.html">Traffic Ops - Installing</a><ul>
+<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops/installation.html#system-requirements">System 
Requirements</a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops/installation.html#navigating-the-install">Navigating 
the Install</a></li>
 </ul>
 </li>
-<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops_config.html">Configuring Traffic Ops</a><ul>
-<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops_config.html#installing-the-ssl-cert">Installing the SSL 
Cert</a></li>
-<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops_config.html#content-delivery-networks">Content Delivery 
Networks</a></li>
-<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops_config.html#profile-parameters">Profile 
Parameters</a></li>
-<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops_config.html#regions-locations-and-cache-groups">Regions,
 Locations and Cache Groups</a></li>
-<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops_config.html#configuring-content-purge">Configuring 
Content Purge</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops/default_profiles.html">Traffic Ops - Default 
Profiles</a><ul>
+<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops/default_profiles.html#minimum-traffic-ops-profiles-needed">Minimum
 Traffic Ops Profiles needed</a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops/default_profiles.html#steps-to-import-a-profile">Steps 
to Import a Profile</a></li>
 </ul>
 </li>
-<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops_using.html">Using Traffic Ops</a><ul>
-<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops_using.html#the-traffic-ops-menu">The Traffic Ops 
Menu</a></li>
-<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops_using.html#health">Health</a></li>
-<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops_using.html#server">Server</a></li>
-<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops_using.html#delivery-service">Delivery Service</a></li>
-<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops_using.html#parameters-and-profiles">Parameters and 
Profiles</a></li>
-<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops_using.html#tools">Tools</a></li>
-<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops_using.html#invalidate-content">Invalidate 
Content</a></li>
-<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops_using.html#manage-dnssec-keys">Manage DNSSEC 
Keys</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops/migration_from_10_to_20.html">Traffic Ops - Migrating 
from 1.x to 2.x</a><ul>
+<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops/migration_from_10_to_20.html#system-requirements">System
 Requirements</a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops/migration_from_10_to_20.html#setup-the-traffic-ops-db-directory">Setup
 the traffic_ops_db directory</a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops/migration_from_10_to_20.html#migration-preparation">Migration
 Preparation</a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops/migration_from_10_to_20.html#navigating-the-database-migration">Navigating
 the Database Migration</a></li>
 </ul>
 </li>
-<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops_extensions.html">Managing Traffic Ops Extensions</a><ul>
-<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops_extensions.html#example-cron-file">Example Cron 
File</a></li>
+<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops/configuration.html">Traffic Ops - Configuring</a><ul>
+<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops/configuration.html#installing-the-ssl-cert">Installing 
the SSL Cert</a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops/configuration.html#content-delivery-networks">Content 
Delivery Networks</a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops/configuration.html#profile-parameters">Profile 
Parameters</a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops/configuration.html#regions-locations-and-cache-groups">Regions,
 Locations and Cache Groups</a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops/configuration.html#configuring-content-purge">Configuring
 Content Purge</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops/using.html">Traffic Ops - Using</a><ul>
+<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops/using.html#the-traffic-ops-menu">The Traffic Ops 
Menu</a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops/using.html#health">Health</a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops/using.html#server">Server</a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops/using.html#delivery-service">Delivery Service</a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops/using.html#parameters-and-profiles">Parameters and 
Profiles</a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops/using.html#tools">Tools</a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops/using.html#invalidate-content">Invalidate 
Content</a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops/using.html#manage-dnssec-keys">Manage DNSSEC 
Keys</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_ops/extensions.html">Managing Traffic Ops Extensions</a><ul>
+<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_ops/extensions.html#example-cron-file">Example Cron 
File</a></li>
 </ul>
 </li>
 <li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_portal.html">Traffic Portal Administration</a></li>
@@ -275,6 +292,12 @@
 <li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_monitor.html#troubleshooting-and-log-files">Troubleshooting 
and log files</a></li>
 </ul>
 </li>
+<li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_monitor_golang.html">Traffic Monitor Administration</a><ul>
+<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_monitor_golang.html#installing-traffic-monitor">Installing 
Traffic Monitor</a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_monitor_golang.html#configuring-traffic-monitor">Configuring
 Traffic Monitor</a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_monitor_golang.html#troubleshooting-and-log-files">Troubleshooting
 and log files</a></li>
+</ul>
+</li>
 <li class="toctree-l2"><a class="reference internal" 
href="admin/traffic_router.html">Traffic Router Administration</a><ul>
 <li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_router.html#installing-traffic-router">Installing Traffic 
Router</a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="admin/traffic_router.html#configuring-traffic-router">Configuring Traffic 
Router</a></li>
@@ -306,6 +329,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>
@@ -319,10 +343,15 @@
 </div>
 <div class="section" id="developer-s-guide">
 <h2>Developer&#8217;s Guide<a class="headerlink" href="#developer-s-guide" 
title="Permalink to this headline">¶</a></h2>
-<p>A guide to the various internal and external APIs, and a introduction for 
the Traffic Control developer.</p>
+<p>A guide to the various internal and external APIs, and an introduction for 
the Traffic Control developer.</p>
 <div class="toctree-wrapper compound">
 <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/building.html">Building Traffic Control</a><ul>
+<li class="toctree-l3"><a class="reference internal" 
href="development/building.html#build-using-pkg">Build using pkg</a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="development/building.html#build-using-docker-compose">Build using 
docker-compose</a></li>
+</ul>
+</li>
 <li class="toctree-l2"><a class="reference internal" 
href="development/traffic_ops.html">Traffic Ops</a><ul>
 <li class="toctree-l3"><a class="reference internal" 
href="development/traffic_ops.html#introduction">Introduction</a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="development/traffic_ops.html#software-requirements">Software 
Requirements</a></li>
@@ -364,6 +393,17 @@
 <li class="toctree-l3"><a class="reference internal" 
href="development/traffic_monitor.html#api">API</a></li>
 </ul>
 </li>
+<li class="toctree-l2"><a class="reference internal" 
href="development/traffic_monitor_golang.html">Traffic Monitor Golang</a><ul>
+<li class="toctree-l3"><a class="reference internal" 
href="development/traffic_monitor_golang.html#introduction">Introduction</a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="development/traffic_monitor_golang.html#software-requirements">Software 
Requirements</a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="development/traffic_monitor_golang.html#project-tree-overview">Project 
Tree Overview</a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="development/traffic_monitor_golang.html#architecture">Architecture</a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="development/traffic_monitor_golang.html#formatting-conventions">Formatting
 Conventions</a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="development/traffic_monitor_golang.html#installing-the-developer-environment">Installing
 The Developer Environment</a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="development/traffic_monitor_golang.html#test-cases">Test Cases</a></li>
+<li class="toctree-l3"><a class="reference internal" 
href="development/traffic_monitor_golang.html#api">API</a></li>
+</ul>
+</li>
 <li class="toctree-l2"><a class="reference internal" 
href="development/traffic_stats.html">Traffic Stats</a><ul>
 <li class="toctree-l3"><a class="reference internal" 
href="development/traffic_stats.html#introduction">Introduction</a></li>
 <li class="toctree-l3"><a class="reference internal" 
href="development/traffic_stats.html#software-requirements">Software 
Requirements</a></li>
@@ -452,10 +492,11 @@
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'./',
-            VERSION:'master',
+            VERSION:'2.1-dev',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
-            HAS_SOURCE:  true
+            HAS_SOURCE:  true,
+            SOURCELINK_SUFFIX: ''
         };
     </script>
       <script type="text/javascript" src="_static/jquery.js"></script>

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/42d25dc5/docs/latest/objects.inv
----------------------------------------------------------------------
diff --git a/docs/latest/objects.inv b/docs/latest/objects.inv
index e9a9a48..5369f11 100644
Binary files a/docs/latest/objects.inv and b/docs/latest/objects.inv differ

Reply via email to