trafficcontrol-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbea...@apache.org
Subject [51/51] [partial] incubator-trafficcontrol-website git commit: adds 2.1.x documentation
Date Mon, 22 Jan 2018 15:57:59 GMT
adds 2.1.x documentation


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/commit/24ff8964
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/tree/24ff8964
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/diff/24ff8964

Branch: refs/heads/asf-site
Commit: 24ff896454c28a71f4219f16225c65534c00cef5
Parents: 3c7626c
Author: hbeatty <hbeatty@apache.org>
Authored: Mon Jan 22 10:56:40 2018 -0500
Committer: hbeatty <hbeatty@apache.org>
Committed: Mon Jan 22 10:56:40 2018 -0500

----------------------------------------------------------------------
 .../066CEF4F-C1A3-4A89-8B52-4F72B0531367.png    |   Bin 0 -> 63381 bytes
 docs/2.1.x/_images/12m.png                      |   Bin 0 -> 22728 bytes
 .../19BB6EC1-B6E8-4D22-BFA0-B7D6A9708B42.png    |   Bin 0 -> 62806 bytes
 .../C5C4CD22-949A-48FD-8976-C673083E2177.png    |   Bin 0 -> 55410 bytes
 .../D22DCAA3-18CC-48F4-965B-5312993F9820.png    |   Bin 0 -> 99921 bytes
 .../D28614AA-9758-45ED-9EFD-3A284FC4218E.png    |   Bin 0 -> 45381 bytes
 docs/2.1.x/_images/bad.png                      |   Bin 0 -> 472 bytes
 docs/2.1.x/_images/bad1.png                     |   Bin 0 -> 472 bytes
 docs/2.1.x/_images/cache_groups_1.png           |   Bin 0 -> 80623 bytes
 docs/2.1.x/_images/clock-black.png              |   Bin 0 -> 427 bytes
 docs/2.1.x/_images/dnssec01.png                 |   Bin 0 -> 32216 bytes
 docs/2.1.x/_images/dnssec02.png                 |   Bin 0 -> 61047 bytes
 docs/2.1.x/_images/dnssec03.png                 |   Bin 0 -> 145394 bytes
 docs/2.1.x/_images/dnssec04.png                 |   Bin 0 -> 195587 bytes
 docs/2.1.x/_images/federation01.png             |   Bin 0 -> 96843 bytes
 docs/2.1.x/_images/federation02.png             |   Bin 0 -> 101666 bytes
 docs/2.1.x/_images/federation03.png             |   Bin 0 -> 316490 bytes
 docs/2.1.x/_images/federation04.png             |   Bin 0 -> 269316 bytes
 docs/2.1.x/_images/fwda.png                     |   Bin 0 -> 206 bytes
 docs/2.1.x/_images/fwda1.png                    |   Bin 0 -> 206 bytes
 docs/2.1.x/_images/good.png                     |   Bin 0 -> 617 bytes
 docs/2.1.x/_images/good1.png                    |   Bin 0 -> 617 bytes
 docs/2.1.x/_images/graph.png                    |   Bin 0 -> 892 bytes
 docs/2.1.x/_images/info.png                     |   Bin 0 -> 3594 bytes
 docs/2.1.x/_images/mso-enable.png               |   Bin 0 -> 107805 bytes
 docs/2.1.x/_images/mso-rank.png                 |   Bin 0 -> 140070 bytes
 docs/2.1.x/_images/regionalgeo01.png            |   Bin 0 -> 75096 bytes
 docs/2.1.x/_images/regionalgeo02.png            |   Bin 0 -> 93191 bytes
 docs/2.1.x/_images/regionalgeo03.png            |   Bin 0 -> 42367 bytes
 docs/2.1.x/_images/steering01.png               |   Bin 0 -> 51223 bytes
 docs/2.1.x/_images/steering02.png               |   Bin 0 -> 116876 bytes
 docs/2.1.x/_images/steering03.png               |   Bin 0 -> 210908 bytes
 docs/2.1.x/_images/steering04.png               |   Bin 0 -> 35255 bytes
 .../_images/traffic_control_overview_3.png      |   Bin 0 -> 138671 bytes
 docs/2.1.x/_sources/admin/index.rst.txt         |    50 +
 .../_sources/admin/quick_howto/dnssec.rst.txt   |    72 +
 .../admin/quick_howto/federations.rst.txt       |   135 +
 .../_sources/admin/quick_howto/index.rst.txt    |    29 +
 .../admin/quick_howto/multi_site.rst.txt        |    95 +
 .../admin/quick_howto/multi_site_ats5.rst.txt   |    95 +
 .../admin/quick_howto/regionalgeo.rst.txt       |   109 +
 .../_sources/admin/quick_howto/steering.rst.txt |   111 +
 .../_sources/admin/traffic_monitor.rst.txt      |   177 +
 .../admin/traffic_monitor_golang.rst.txt        |    65 +
 .../admin/traffic_ops/configuration.rst.txt     |   300 +
 .../admin/traffic_ops/default_profiles.rst.txt  |    53 +
 .../admin/traffic_ops/extensions.rst.txt        |    88 +
 .../admin/traffic_ops/installation.rst.txt      |   243 +
 .../traffic_ops/migration_from_10_to_20.rst.txt |    88 +
 .../_sources/admin/traffic_ops/using.rst.txt    |  1106 ++
 .../2.1.x/_sources/admin/traffic_portal.rst.txt |    53 +
 .../2.1.x/_sources/admin/traffic_router.rst.txt |   514 +
 .../2.1.x/_sources/admin/traffic_server.rst.txt |   143 +
 docs/2.1.x/_sources/admin/traffic_stats.rst.txt |   188 +
 docs/2.1.x/_sources/admin/traffic_vault.rst.txt |   195 +
 .../_sources/basics/cache_revalidation.rst.txt  |    71 +
 .../_sources/basics/caching_proxies.rst.txt     |   238 +
 .../basics/content_delivery_networks.rst.txt    |    40 +
 docs/2.1.x/_sources/basics/http_11.rst.txt      |    48 +
 docs/2.1.x/_sources/basics/index.rst.txt        |    29 +
 .../2.1.x/_sources/development/building.rst.txt |    94 +
 docs/2.1.x/_sources/development/index.rst.txt   |    31 +
 .../development/traffic_monitor.rst.txt         |   114 +
 .../traffic_monitor/traffic_monitor_api.rst.txt |   178 +
 .../development/traffic_monitor_golang.rst.txt  |   295 +
 .../_sources/development/traffic_ops.rst.txt    |   643 ++
 .../development/traffic_ops_api/routes.rst.txt  |   118 +
 .../development/traffic_ops_api/v11/asn.rst.txt |    69 +
 .../traffic_ops_api/v11/cachegroup.rst.txt      |   317 +
 .../development/traffic_ops_api/v11/cdn.rst.txt |  1086 ++
 .../traffic_ops_api/v11/changelog.rst.txt       |   154 +
 .../traffic_ops_api/v11/deliveryservice.rst.txt |  1276 +++
 .../traffic_ops_api/v11/hwinfo.rst.txt          |    67 +
 .../traffic_ops_api/v11/parameter.rst.txt       |   136 +
 .../traffic_ops_api/v11/phys_location.rst.txt   |   449 +
 .../traffic_ops_api/v11/profile.rst.txt         |   129 +
 .../traffic_ops_api/v11/region.rst.txt          |   235 +
 .../traffic_ops_api/v11/role.rst.txt            |    58 +
 .../traffic_ops_api/v11/server.rst.txt          |   630 ++
 .../traffic_ops_api/v11/static_dns.rst.txt      |    63 +
 .../traffic_ops_api/v11/status.rst.txt          |   127 +
 .../traffic_ops_api/v11/system.rst.txt          |    79 +
 .../traffic_ops_api/v11/to_extension.rst.txt    |   210 +
 .../traffic_ops_api/v11/type.rst.txt            |   151 +
 .../traffic_ops_api/v11/user.rst.txt            |   778 ++
 .../traffic_ops_api/v12/api_capability.rst.txt  |   320 +
 .../development/traffic_ops_api/v12/asn.rst.txt |   200 +
 .../traffic_ops_api/v12/cache_stats.rst.txt     |   134 +
 .../traffic_ops_api/v12/cachegroup.rst.txt      |   802 ++
 .../v12/cachegroup_parameter.rst.txt            |   177 +
 .../traffic_ops_api/v12/capability.rst.txt      |   271 +
 .../development/traffic_ops_api/v12/cdn.rst.txt |  1407 +++
 .../traffic_ops_api/v12/changelog.rst.txt       |   164 +
 .../traffic_ops_api/v12/configfiles_ats.rst.txt |   200 +
 .../traffic_ops_api/v12/deliveryservice.rst.txt |  3135 +++++
 .../v12/deliveryservice_regex.rst.txt           |   374 +
 .../v12/deliveryservice_stats.rst.txt           |   155 +
 .../traffic_ops_api/v12/division.rst.txt        |   203 +
 .../traffic_ops_api/v12/federation.rst.txt      |   151 +
 .../traffic_ops_api/v12/hwinfo.rst.txt          |    68 +
 .../traffic_ops_api/v12/influxdb.rst.txt        |    65 +
 .../development/traffic_ops_api/v12/job.rst.txt |   136 +
 .../traffic_ops_api/v12/parameter.rst.txt       |   672 ++
 .../traffic_ops_api/v12/phys_location.rst.txt   |   456 +
 .../traffic_ops_api/v12/profile.rst.txt         |   393 +
 .../v12/profile_parameter.rst.txt               |   457 +
 .../traffic_ops_api/v12/region.rst.txt          |   244 +
 .../traffic_ops_api/v12/role.rst.txt            |    59 +
 .../traffic_ops_api/v12/server.rst.txt          |  1471 +++
 .../traffic_ops_api/v12/static_dns.rst.txt      |    66 +
 .../traffic_ops_api/v12/status.rst.txt          |   127 +
 .../traffic_ops_api/v12/steering_target.rst.txt |   315 +
 .../traffic_ops_api/v12/system.rst.txt          |    80 +
 .../traffic_ops_api/v12/tenant.rst.txt          |   255 +
 .../traffic_ops_api/v12/to_extension.rst.txt    |   206 +
 .../traffic_ops_api/v12/topology.rst.txt        |   152 +
 .../traffic_ops_api/v12/type.rst.txt            |   151 +
 .../traffic_ops_api/v12/user.rst.txt            |  1196 ++
 .../_sources/development/traffic_portal.rst.txt |    54 +
 .../_sources/development/traffic_router.rst.txt |   145 +
 .../traffic_router/traffic_router_api.rst.txt   |    48 +
 .../_sources/development/traffic_server.rst.txt |    19 +
 .../_sources/development/traffic_stats.rst.txt  |    58 +
 docs/2.1.x/_sources/faq/administration.rst.txt  |    66 +
 docs/2.1.x/_sources/faq/development.rst.txt     |    21 +
 docs/2.1.x/_sources/faq/general.rst.txt         |    52 +
 docs/2.1.x/_sources/faq/index.rst.txt           |    26 +
 docs/2.1.x/_sources/glossary.rst.txt            |    81 +
 docs/2.1.x/_sources/index.rst.txt               |    80 +
 docs/2.1.x/_sources/overview/index.rst.txt      |    30 +
 .../_sources/overview/introduction.rst.txt      |    49 +
 .../_sources/overview/traffic_monitor.rst.txt   |    66 +
 .../2.1.x/_sources/overview/traffic_ops.rst.txt |    39 +
 .../_sources/overview/traffic_portal.rst.txt    |    43 +
 .../_sources/overview/traffic_router.rst.txt    |   109 +
 .../_sources/overview/traffic_server.rst.txt    |    49 +
 .../_sources/overview/traffic_stats.rst.txt     |    35 +
 .../_sources/overview/traffic_vault.rst.txt     |    36 +
 docs/2.1.x/_static/ajax-loader.gif              |   Bin 0 -> 673 bytes
 docs/2.1.x/_static/basic.css                    |   643 ++
 docs/2.1.x/_static/comment-bright.png           |   Bin 0 -> 756 bytes
 docs/2.1.x/_static/comment-close.png            |   Bin 0 -> 829 bytes
 docs/2.1.x/_static/comment.png                  |   Bin 0 -> 641 bytes
 docs/2.1.x/_static/css/badge_only.css           |     2 +
 docs/2.1.x/_static/css/badge_only.css.map       |     7 +
 docs/2.1.x/_static/css/theme.css                |     5 +
 docs/2.1.x/_static/css/theme.css.map            |     7 +
 docs/2.1.x/_static/doctools.js                  |   311 +
 docs/2.1.x/_static/down-pressed.png             |   Bin 0 -> 222 bytes
 docs/2.1.x/_static/down.png                     |   Bin 0 -> 202 bytes
 docs/2.1.x/_static/favicon.ico                  |   Bin 0 -> 16958 bytes
 docs/2.1.x/_static/file.png                     |   Bin 0 -> 286 bytes
 docs/2.1.x/_static/fonts/FontAwesome.otf        |   Bin 0 -> 62856 bytes
 docs/2.1.x/_static/fonts/Inconsolata-Bold.ttf   |   Bin 0 -> 47064 bytes
 docs/2.1.x/_static/fonts/Inconsolata.ttf        |   Bin 0 -> 63184 bytes
 docs/2.1.x/_static/fonts/Lato-Bold.ttf          |   Bin 0 -> 82368 bytes
 docs/2.1.x/_static/fonts/Lato-Regular.ttf       |   Bin 0 -> 81980 bytes
 docs/2.1.x/_static/fonts/RobotoSlab-Bold.ttf    |   Bin 0 -> 36596 bytes
 docs/2.1.x/_static/fonts/RobotoSlab-Regular.ttf |   Bin 0 -> 36276 bytes
 .../2.1.x/_static/fonts/fontawesome-webfont.eot |   Bin 0 -> 38205 bytes
 .../2.1.x/_static/fonts/fontawesome-webfont.ttf |   Bin 0 -> 80652 bytes
 .../_static/fonts/fontawesome-webfont.woff      |   Bin 0 -> 44432 bytes
 docs/2.1.x/_static/jquery-3.1.0.js              | 10074 +++++++++++++++++
 docs/2.1.x/_static/jquery.js                    |     4 +
 docs/2.1.x/_static/js/modernizr.min.js          |     4 +
 docs/2.1.x/_static/js/theme.js                  |    50 +
 docs/2.1.x/_static/minus.png                    |   Bin 0 -> 90 bytes
 docs/2.1.x/_static/plus.png                     |   Bin 0 -> 90 bytes
 docs/2.1.x/_static/pygments.css                 |    69 +
 docs/2.1.x/_static/searchtools.js               |   761 ++
 docs/2.1.x/_static/tc_logo_c_only.png           |   Bin 0 -> 106800 bytes
 docs/2.1.x/_static/theme_overrides.css          |    69 +
 docs/2.1.x/_static/underscore-1.3.1.js          |   999 ++
 docs/2.1.x/_static/underscore.js                |    31 +
 docs/2.1.x/_static/up-pressed.png               |   Bin 0 -> 214 bytes
 docs/2.1.x/_static/up.png                       |   Bin 0 -> 203 bytes
 docs/2.1.x/_static/websupport.js                |   808 ++
 docs/2.1.x/admin/index.html                     |   455 +
 docs/2.1.x/admin/quick_howto/dnssec.html        |   317 +
 docs/2.1.x/admin/quick_howto/federations.html   |   380 +
 docs/2.1.x/admin/quick_howto/index.html         |   276 +
 docs/2.1.x/admin/quick_howto/multi_site.html    |   347 +
 .../admin/quick_howto/multi_site_ats5.html      |   347 +
 docs/2.1.x/admin/quick_howto/regionalgeo.html   |   344 +
 docs/2.1.x/admin/quick_howto/steering.html      |   352 +
 docs/2.1.x/admin/traffic_monitor.html           |   427 +
 docs/2.1.x/admin/traffic_monitor_golang.html    |   311 +
 docs/2.1.x/admin/traffic_ops/configuration.html |   653 ++
 .../admin/traffic_ops/default_profiles.html     |   291 +
 docs/2.1.x/admin/traffic_ops/extensions.html    |   326 +
 docs/2.1.x/admin/traffic_ops/installation.html  |   502 +
 .../traffic_ops/migration_from_10_to_20.html    |   321 +
 docs/2.1.x/admin/traffic_ops/using.html         |  1729 +++
 docs/2.1.x/admin/traffic_portal.html            |   302 +
 docs/2.1.x/admin/traffic_router.html            |   948 ++
 docs/2.1.x/admin/traffic_server.html            |   405 +
 docs/2.1.x/admin/traffic_stats.html             |   497 +
 docs/2.1.x/admin/traffic_vault.html             |   517 +
 docs/2.1.x/basics/cache_revalidation.html       |   312 +
 docs/2.1.x/basics/caching_proxies.html          |   486 +
 .../2.1.x/basics/content_delivery_networks.html |   293 +
 docs/2.1.x/basics/http_11.html                  |   297 +
 docs/2.1.x/basics/index.html                    |   276 +
 docs/2.1.x/development/building.html            |   331 +
 docs/2.1.x/development/index.html               |   334 +
 docs/2.1.x/development/traffic_monitor.html     |   404 +
 .../traffic_monitor/traffic_monitor_api.html    |   514 +
 .../development/traffic_monitor_golang.html     |   514 +
 docs/2.1.x/development/traffic_ops.html         |   920 ++
 .../development/traffic_ops_api/routes.html     |   438 +
 .../development/traffic_ops_api/v11/asn.html    |   332 +
 .../traffic_ops_api/v11/cachegroup.html         |   709 ++
 .../development/traffic_ops_api/v11/cdn.html    |  2017 ++++
 .../traffic_ops_api/v11/changelog.html          |   465 +
 .../traffic_ops_api/v11/deliveryservice.html    |  2319 ++++
 .../development/traffic_ops_api/v11/hwinfo.html |   330 +
 .../traffic_ops_api/v11/parameter.html          |   431 +
 .../traffic_ops_api/v11/phys_location.html      |   957 ++
 .../traffic_ops_api/v11/profile.html            |   440 +
 .../development/traffic_ops_api/v11/region.html |   618 +
 .../development/traffic_ops_api/v11/role.html   |   320 +
 .../development/traffic_ops_api/v11/server.html |  1216 ++
 .../traffic_ops_api/v11/static_dns.html         |   330 +
 .../development/traffic_ops_api/v11/status.html |   416 +
 .../development/traffic_ops_api/v11/system.html |   348 +
 .../traffic_ops_api/v11/to_extension.html       |   551 +
 .../development/traffic_ops_api/v11/type.html   |   470 +
 .../development/traffic_ops_api/v11/user.html   |  1468 +++
 .../traffic_ops_api/v12/api_capability.html     |   767 ++
 .../development/traffic_ops_api/v12/asn.html    |   555 +
 .../traffic_ops_api/v12/cache_stats.html        |   436 +
 .../traffic_ops_api/v12/cachegroup.html         |  1519 +++
 .../v12/cachegroup_parameter.html               |   486 +
 .../traffic_ops_api/v12/capability.html         |   670 ++
 .../development/traffic_ops_api/v12/cdn.html    |  2534 +++++
 .../traffic_ops_api/v12/changelog.html          |   489 +
 .../traffic_ops_api/v12/configfiles_ats.html    |   419 +
 .../traffic_ops_api/v12/deliveryservice.html    |  5404 +++++++++
 .../v12/deliveryservice_regex.html              |   828 ++
 .../v12/deliveryservice_stats.html              |   463 +
 .../traffic_ops_api/v12/division.html           |   554 +
 .../traffic_ops_api/v12/federation.html         |   440 +
 .../development/traffic_ops_api/v12/hwinfo.html |   333 +
 .../traffic_ops_api/v12/influxdb.html           |   322 +
 .../development/traffic_ops_api/v12/job.html    |   441 +
 .../traffic_ops_api/v12/parameter.html          |  1314 +++
 .../traffic_ops_api/v12/phys_location.html      |   977 ++
 .../traffic_ops_api/v12/profile.html            |   889 ++
 .../traffic_ops_api/v12/profile_parameter.html  |   896 ++
 .../development/traffic_ops_api/v12/region.html |   641 ++
 .../development/traffic_ops_api/v12/role.html   |   323 +
 .../development/traffic_ops_api/v12/server.html |  2636 +++++
 .../traffic_ops_api/v12/static_dns.html         |   333 +
 .../development/traffic_ops_api/v12/status.html |   416 +
 .../traffic_ops_api/v12/steering_target.html    |   743 ++
 .../development/traffic_ops_api/v12/system.html |   351 +
 .../development/traffic_ops_api/v12/tenant.html |   624 +
 .../traffic_ops_api/v12/to_extension.html       |   551 +
 .../traffic_ops_api/v12/topology.html           |   488 +
 .../development/traffic_ops_api/v12/type.html   |   470 +
 .../development/traffic_ops_api/v12/user.html   |  2170 ++++
 docs/2.1.x/development/traffic_portal.html      |   310 +
 docs/2.1.x/development/traffic_router.html      |   472 +
 .../traffic_router/traffic_router_api.html      |   289 +
 docs/2.1.x/development/traffic_server.html      |   266 +
 docs/2.1.x/development/traffic_stats.html       |   314 +
 docs/2.1.x/faq/administration.html              |   343 +
 docs/2.1.x/faq/development.html                 |   270 +
 docs/2.1.x/faq/general.html                     |   307 +
 docs/2.1.x/faq/index.html                       |   284 +
 docs/2.1.x/genindex.html                        |   518 +
 docs/2.1.x/glossary.html                        |   297 +
 docs/2.1.x/index.html                           |   526 +
 docs/2.1.x/objects.inv                          |   Bin 0 -> 4360 bytes
 docs/2.1.x/overview/index.html                  |   292 +
 docs/2.1.x/overview/introduction.html           |   302 +
 docs/2.1.x/overview/traffic_monitor.html        |   299 +
 docs/2.1.x/overview/traffic_ops.html            |   283 +
 docs/2.1.x/overview/traffic_portal.html         |   289 +
 docs/2.1.x/overview/traffic_router.html         |   342 +
 docs/2.1.x/overview/traffic_server.html         |   287 +
 docs/2.1.x/overview/traffic_stats.html          |   276 +
 docs/2.1.x/overview/traffic_vault.html          |   305 +
 docs/2.1.x/search.html                          |   257 +
 docs/2.1.x/searchindex.js                       |     1 +
 285 files changed, 107548 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/066CEF4F-C1A3-4A89-8B52-4F72B0531367.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/066CEF4F-C1A3-4A89-8B52-4F72B0531367.png b/docs/2.1.x/_images/066CEF4F-C1A3-4A89-8B52-4F72B0531367.png
new file mode 100644
index 0000000..9998e81
Binary files /dev/null and b/docs/2.1.x/_images/066CEF4F-C1A3-4A89-8B52-4F72B0531367.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/12m.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/12m.png b/docs/2.1.x/_images/12m.png
new file mode 100644
index 0000000..36ce934
Binary files /dev/null and b/docs/2.1.x/_images/12m.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/19BB6EC1-B6E8-4D22-BFA0-B7D6A9708B42.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/19BB6EC1-B6E8-4D22-BFA0-B7D6A9708B42.png b/docs/2.1.x/_images/19BB6EC1-B6E8-4D22-BFA0-B7D6A9708B42.png
new file mode 100644
index 0000000..1a6ad24
Binary files /dev/null and b/docs/2.1.x/_images/19BB6EC1-B6E8-4D22-BFA0-B7D6A9708B42.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/C5C4CD22-949A-48FD-8976-C673083E2177.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/C5C4CD22-949A-48FD-8976-C673083E2177.png b/docs/2.1.x/_images/C5C4CD22-949A-48FD-8976-C673083E2177.png
new file mode 100644
index 0000000..96fddab
Binary files /dev/null and b/docs/2.1.x/_images/C5C4CD22-949A-48FD-8976-C673083E2177.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/D22DCAA3-18CC-48F4-965B-5312993F9820.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/D22DCAA3-18CC-48F4-965B-5312993F9820.png b/docs/2.1.x/_images/D22DCAA3-18CC-48F4-965B-5312993F9820.png
new file mode 100644
index 0000000..59d5b8e
Binary files /dev/null and b/docs/2.1.x/_images/D22DCAA3-18CC-48F4-965B-5312993F9820.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/D28614AA-9758-45ED-9EFD-3A284FC4218E.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/D28614AA-9758-45ED-9EFD-3A284FC4218E.png b/docs/2.1.x/_images/D28614AA-9758-45ED-9EFD-3A284FC4218E.png
new file mode 100644
index 0000000..6d05b19
Binary files /dev/null and b/docs/2.1.x/_images/D28614AA-9758-45ED-9EFD-3A284FC4218E.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/bad.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/bad.png b/docs/2.1.x/_images/bad.png
new file mode 100644
index 0000000..485e3da
Binary files /dev/null and b/docs/2.1.x/_images/bad.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/bad1.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/bad1.png b/docs/2.1.x/_images/bad1.png
new file mode 100644
index 0000000..485e3da
Binary files /dev/null and b/docs/2.1.x/_images/bad1.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/cache_groups_1.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/cache_groups_1.png b/docs/2.1.x/_images/cache_groups_1.png
new file mode 100644
index 0000000..d03d320
Binary files /dev/null and b/docs/2.1.x/_images/cache_groups_1.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/clock-black.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/clock-black.png b/docs/2.1.x/_images/clock-black.png
new file mode 100644
index 0000000..4783c01
Binary files /dev/null and b/docs/2.1.x/_images/clock-black.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/dnssec01.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/dnssec01.png b/docs/2.1.x/_images/dnssec01.png
new file mode 100644
index 0000000..044538f
Binary files /dev/null and b/docs/2.1.x/_images/dnssec01.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/dnssec02.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/dnssec02.png b/docs/2.1.x/_images/dnssec02.png
new file mode 100644
index 0000000..82fa75a
Binary files /dev/null and b/docs/2.1.x/_images/dnssec02.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/dnssec03.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/dnssec03.png b/docs/2.1.x/_images/dnssec03.png
new file mode 100644
index 0000000..1fc3cce
Binary files /dev/null and b/docs/2.1.x/_images/dnssec03.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/dnssec04.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/dnssec04.png b/docs/2.1.x/_images/dnssec04.png
new file mode 100644
index 0000000..f9b8d32
Binary files /dev/null and b/docs/2.1.x/_images/dnssec04.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/federation01.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/federation01.png b/docs/2.1.x/_images/federation01.png
new file mode 100644
index 0000000..bbbd924
Binary files /dev/null and b/docs/2.1.x/_images/federation01.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/federation02.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/federation02.png b/docs/2.1.x/_images/federation02.png
new file mode 100644
index 0000000..9db970e
Binary files /dev/null and b/docs/2.1.x/_images/federation02.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/federation03.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/federation03.png b/docs/2.1.x/_images/federation03.png
new file mode 100644
index 0000000..abd52d2
Binary files /dev/null and b/docs/2.1.x/_images/federation03.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/federation04.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/federation04.png b/docs/2.1.x/_images/federation04.png
new file mode 100644
index 0000000..dd5a812
Binary files /dev/null and b/docs/2.1.x/_images/federation04.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/fwda.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/fwda.png b/docs/2.1.x/_images/fwda.png
new file mode 100644
index 0000000..ba63bee
Binary files /dev/null and b/docs/2.1.x/_images/fwda.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/fwda1.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/fwda1.png b/docs/2.1.x/_images/fwda1.png
new file mode 100644
index 0000000..ba63bee
Binary files /dev/null and b/docs/2.1.x/_images/fwda1.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/good.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/good.png b/docs/2.1.x/_images/good.png
new file mode 100644
index 0000000..84d96cd
Binary files /dev/null and b/docs/2.1.x/_images/good.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/good1.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/good1.png b/docs/2.1.x/_images/good1.png
new file mode 100644
index 0000000..84d96cd
Binary files /dev/null and b/docs/2.1.x/_images/good1.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/graph.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/graph.png b/docs/2.1.x/_images/graph.png
new file mode 100644
index 0000000..ea0b4c5
Binary files /dev/null and b/docs/2.1.x/_images/graph.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/info.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/info.png b/docs/2.1.x/_images/info.png
new file mode 100644
index 0000000..5680f06
Binary files /dev/null and b/docs/2.1.x/_images/info.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/mso-enable.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/mso-enable.png b/docs/2.1.x/_images/mso-enable.png
new file mode 100644
index 0000000..9932de1
Binary files /dev/null and b/docs/2.1.x/_images/mso-enable.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/mso-rank.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/mso-rank.png b/docs/2.1.x/_images/mso-rank.png
new file mode 100644
index 0000000..de80ac5
Binary files /dev/null and b/docs/2.1.x/_images/mso-rank.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/regionalgeo01.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/regionalgeo01.png b/docs/2.1.x/_images/regionalgeo01.png
new file mode 100644
index 0000000..0443a17
Binary files /dev/null and b/docs/2.1.x/_images/regionalgeo01.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/regionalgeo02.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/regionalgeo02.png b/docs/2.1.x/_images/regionalgeo02.png
new file mode 100644
index 0000000..5530920
Binary files /dev/null and b/docs/2.1.x/_images/regionalgeo02.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/regionalgeo03.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/regionalgeo03.png b/docs/2.1.x/_images/regionalgeo03.png
new file mode 100644
index 0000000..ce2676b
Binary files /dev/null and b/docs/2.1.x/_images/regionalgeo03.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/steering01.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/steering01.png b/docs/2.1.x/_images/steering01.png
new file mode 100644
index 0000000..1515011
Binary files /dev/null and b/docs/2.1.x/_images/steering01.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/steering02.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/steering02.png b/docs/2.1.x/_images/steering02.png
new file mode 100644
index 0000000..c2fc22c
Binary files /dev/null and b/docs/2.1.x/_images/steering02.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/steering03.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/steering03.png b/docs/2.1.x/_images/steering03.png
new file mode 100644
index 0000000..f4b110d
Binary files /dev/null and b/docs/2.1.x/_images/steering03.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/steering04.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/steering04.png b/docs/2.1.x/_images/steering04.png
new file mode 100644
index 0000000..0ab962b
Binary files /dev/null and b/docs/2.1.x/_images/steering04.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_images/traffic_control_overview_3.png
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_images/traffic_control_overview_3.png b/docs/2.1.x/_images/traffic_control_overview_3.png
new file mode 100644
index 0000000..58f03d7
Binary files /dev/null and b/docs/2.1.x/_images/traffic_control_overview_3.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_sources/admin/index.rst.txt
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_sources/admin/index.rst.txt b/docs/2.1.x/_sources/admin/index.rst.txt
new file mode 100644
index 0000000..18a36ce
--- /dev/null
+++ b/docs/2.1.x/_sources/admin/index.rst.txt
@@ -0,0 +1,50 @@
+.. 
+.. 
+.. Licensed under the Apache License, Version 2.0 (the "License");
+.. you may not use this file except in compliance with the License.
+.. You may obtain a copy of the License at
+.. 
+..     http://www.apache.org/licenses/LICENSE-2.0
+.. 
+.. Unless required by applicable law or agreed to in writing, software
+.. distributed under the License is distributed on an "AS IS" BASIS,
+.. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+.. See the License for the specific language governing permissions and
+.. limitations under the License.
+.. 
+
+Administrator's Guide
+*********************
+
+Traffic Control is distributed in source form for the developer, but also as a binary package. This guide details how to install and configure a Traffic Control CDN using the binary packages, as well as how to perform common operations running a CDN.
+
+When installing a complete CDN from scratch, a sample recommended order is:
+
+#. Traffic Ops
+#. Traffic Vault (Riak)
+#. Traffic Monitor
+#. Apache Traffic Server Mid-Tier Caches
+#. Apache Traffic Server Edge Caches
+#. Traffic Router
+#. Traffic Stats
+#. Traffic Portal
+
+Once everything is installed, you will need to configure the servers to talk to each other. You will also need Origin server(s), which the Mid-Tier Cache(s) get content from. An Origin server is simply an HTTP(S) server which serves the content you wish to cache on the CDN.
+
+.. toctree::
+  :maxdepth: 3
+
+  traffic_ops/installation.rst
+  traffic_ops/default_profiles.rst
+  traffic_ops/migration_from_10_to_20.rst
+  traffic_ops/configuration.rst
+  traffic_ops/using.rst
+  traffic_ops/extensions.rst
+  traffic_portal.rst
+  traffic_monitor.rst
+  traffic_monitor_golang.rst
+  traffic_router.rst
+  traffic_stats.rst
+  traffic_server.rst
+  traffic_vault.rst
+  quick_howto/index.rst

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_sources/admin/quick_howto/dnssec.rst.txt
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_sources/admin/quick_howto/dnssec.rst.txt b/docs/2.1.x/_sources/admin/quick_howto/dnssec.rst.txt
new file mode 100644
index 0000000..d336057
--- /dev/null
+++ b/docs/2.1.x/_sources/admin/quick_howto/dnssec.rst.txt
@@ -0,0 +1,72 @@
+.. 
+.. 
+.. Licensed under the Apache License, Version 2.0 (the "License");
+.. you may not use this file except in compliance with the License.
+.. You may obtain a copy of the License at
+.. 
+..     http://www.apache.org/licenses/LICENSE-2.0
+.. 
+.. Unless required by applicable law or agreed to in writing, software
+.. distributed under the License is distributed on an "AS IS" BASIS,
+.. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+.. See the License for the specific language governing permissions and
+.. limitations under the License.
+.. 
+
+.. _rl-dnssec-qht:
+
+****************
+Configure DNSSEC
+****************
+
+.. Note:: In order for Traffic Ops to successfully store keys in Traffic Vault, at least one Riak Server needs to be configured in Traffic Ops. See the `Traffic Vault admin page <../traffic_vault.html>`_ for more information.
+
+.. Note:: Currently DNSSEC is only supported for DNS delivery services.
+
+1)  Go to Tools->Manage DNSSEC Keys choose a CDN and click Manage DNSSEC Keys
+
+.. image:: dnssec01.png
+	:scale: 100%
+	:align: center
+
+2)	Generate keys for a CDN by clicking Generate Keys then entering the following information: 
+	
+		-  Expiration in days for the Zone Signing Key (ZSK)
+		-  Expiration in days for the Key Signing Key (KSK)
+		-  Effective Date
+
+	Once the required information has been entered click on the 'Generate Keys' button.  
+
+	Depending upon the number of Delivery Services in the CDN, generating DNSSEC keys may take serveral seconds.
+
+.. image:: dnssec02.png
+	:scale: 100%
+	:align: center
+
+3)	In order for DNSSEC to work properly, the DS Record information needs to be added to the parent zone of the CDN's domain (e.g. If 	the CDN's domain is 'cdn.kabletown.net' the parent zone is 'kabletown.net'). 
+
+	If you control your parent zone you can enter this information yourself, otherwise you will need to work with your DNS team to get the DS Record added to the parent zone.
+
+.. image:: dnssec03.png
+	:scale: 70%
+	:align: center
+
+4)	Once DS Record information has been added to the parent zone, DNSSEC needs to be activated for the CDN so that Traffic Router will sign responses.  
+	
+	Click on Tools -> Manage DNSSEC Keys -> Choose your CDN -> On the Manage DNSSEC Keys page click the activate DNSSEC Keys button.  
+
+	This will add a 'dnssec.enabled = "true"' entry to CRConfig for the chosen CDN. 
+
+.. image:: dnssec04.png
+	:scale: 70%
+	:align: center
+
+5) DNSSEC should now be active on your CDN and Traffic Router should be signing responses.  
+	
+	A dig command with +dnssec added should show you the signed responses.  
+
+	``dig edge.cdn.kabletown.net. +dnssec``
+
+6)	When KSK expiration is approaching (default 365 days), it is necessary to manually generate a new KSK for the TLD (Top Level Domain) and add the DS Record to the parent zone.  In order to avoid signing errors, it is suggested that an effective date is chosen which allows time for the DS Record to be added to the parent zone before the new KSK becomes active.  
+
+	A new KSK can be generated by clicking the 'Regenerate KSK' button on the Manage DNSSEC Keys screen (see screenshot above). 

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_sources/admin/quick_howto/federations.rst.txt
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_sources/admin/quick_howto/federations.rst.txt b/docs/2.1.x/_sources/admin/quick_howto/federations.rst.txt
new file mode 100644
index 0000000..a17122c
--- /dev/null
+++ b/docs/2.1.x/_sources/admin/quick_howto/federations.rst.txt
@@ -0,0 +1,135 @@
+.. 
+.. 
+.. Licensed under the Apache License, Version 2.0 (the "License");
+.. you may not use this file except in compliance with the License.
+.. You may obtain a copy of the License at
+.. 
+..     http://www.apache.org/licenses/LICENSE-2.0
+.. 
+.. Unless required by applicable law or agreed to in writing, software
+.. distributed under the License is distributed on an "AS IS" BASIS,
+.. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+.. See the License for the specific language governing permissions and
+.. limitations under the License.
+.. 
+
+.. _rl-federations-qht:
+
+*********************
+Configure Federations
+*********************
+
+1)  Create a user with a federations role (Misc -> Users -> Add User).  This user will have the ability to perform the following actions: 
+		
+		- Edit the federation
+		- Delete the federation
+		- Add IPV4 resolvers
+		- Add IPV6 resolvers
+
+.. image:: federation01.png
+	:scale: 100%
+	:align: center
+
+2) 	As a user with admin priveleges, create a Federation Mapping by going to Delivery Services -> Federations and then clicking 'Add Federation Mapping'
+
+3)	Choose the Delivery Service for the federation to be mapped to and assign it to the Federation User; click Add.
+
+.. image:: federation02.png
+	:scale: 100%
+	:align: center
+
+4) 	After the Federation is added, Traffic Ops will display the Federation.  
+
+	Changes can be made at this time or the Federation can be deleted.  Notice that no resolvers have been added to the fedeation yet.  This can only be done by the federation user created in step 1. 
+
+	If no further action is necessary, the Close button will close the window and display the list of all Federations. 
+
+.. image:: federation03.png
+	:scale: 100%
+	:align: center
+
+	
+**The Federation user can now add resolvers to the Federation Mapping in Traffic Ops.**
+
+5)	The federation user logs to traffic ops and stores the mojolicious cookie.  The mojolicious cookie can be obtained manually using the debug tools on a web browser or via curl.
+
+	Example::
+
+		$ curl -i -XPOST "http://localhost:3000/api/1.1/user/login" -H "Content-Type: application/json" -d '{ "u": "federation_user1", "p": "password" }'
+
+		HTTP/1.1 200 OK
+		Date: Wed, 02 Dec 2015 21:12:06 GMT
+		Content-Length: 65
+		Access-Control-Allow-Credentials: true
+		Content-Type: application/json
+		Access-Control-Allow-Methods: POST,GET,OPTIONS,PUT,DELETE
+		Set-Cookie: mojolicious=eyJleHBpcmVzIjoxNDQ5MTA1MTI2LCJhdXRoX2RhdGEiOiJmZWRlcmF0aW9uX3VzZXIxIn0---06b4f870d809d82a91433e92eae8320875c3e8b0; expires=Thu, 03 Dec 2015 01:12:06 GMT; path=/; HttpOnly
+		Server: Mojolicious (Perl)
+		Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept
+		Cache-Control: no-cache, no-store, max-age=0, must-revalidate
+		Connection: keep-alive
+		Access-Control-Allow-Origin: http://localhost:8080
+
+		{"alerts":[{"level":"success","text":"Successfully logged in."}]}
+
+6) The federation user sends a request to Traffic Ops to add IPV4 and/or IPV6 resolvers
+	
+
+	Example::
+
+		$ curl -ki -H "Cookie: mojolicious=eyJleHBpcmVzIjoxNDQ5MTA1MTI2LCJhdXRoX2RhdGEiOiJmZWRlcmF0aW9uX3VzZXIxIn0---06b4f870d809d82a91433e92eae8320875c3e8b0;" -XPUT 'http://localhost:3000/api/1.2/federations' -d '
+			{"federations": [ 
+				{   "deliveryService": "images-c1", 
+					"mappings": 
+						{ "resolve4": [ "8.8.8.8/32", "8.8.4.4/32" ],
+						  "resolve6": ["2001:4860:4860::8888/128", "2001:4860:4860::8844"]
+						} 
+				} 
+			  ] 
+			}'
+
+		HTTP/1.1 200 OK
+		Set-Cookie: mojolicious=eyJleHBpcmVzIjoxNDQ5MTA1OTQyLCJhdXRoX2RhdGEiOiJmZWRlcmF0aW9uX3VzZXIxIn0---b42be0749415cefd1d14e1a91bb214845b4de556; expires=Thu, 03 Dec 2015 01:25:42 GMT; path=/; HttpOnly
+		Server: Mojolicious (Perl)
+		Date: Wed, 02 Dec 2015 21:25:42 GMT
+		Content-Length: 74
+		Access-Control-Allow-Credentials: true
+		Content-Type: application/json
+		Access-Control-Allow-Methods: POST,GET,OPTIONS,PUT,DELETE
+		Cache-Control: no-cache, no-store, max-age=0, must-revalidate
+		Access-Control-Allow-Origin: http://localhost:8080
+		Connection: keep-alive
+		Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept
+
+		{"response":"federation_user1 successfully created federation resolvers."}
+
+7) The resolvers added by the federation user will now visible in Traffic Ops.
+
+.. image:: federation04.png
+	:scale: 100%
+	:align: center
+
+8) Any requests made from a client that resolves to one of the federation resolvers will now be given a CNAME from Traffic Router.
+
+	Example::
+
+		$ dig @tr.kabletown.net edge.images-c1.kabletown.net
+
+		; <<>> DiG 9.7.3-RedHat-9.7.3-2.el6 <<>> @tr.kabletown.net edge.images-c1.kabletown.net
+		; (1 server found)
+		;; global options: +cmd
+		;; Got answer:
+		;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 45110
+		;; flags: qr rd; QUERY: 1, ANSWER: 1, AUTHORITY: 0, ADDITIONAL: 0
+		;; WARNING: recursion requested but not available
+
+		;; QUESTION SECTION:
+		;edge.images-c1.kabletown.net.	IN A
+
+		;; ANSWER SECTION:
+		edge.images-c1.kabletown.net.	30 IN CNAME img.mega-cdn.net.
+
+		;; Query time: 9 msec
+		;; SERVER: 10.10.10.10#53(10.10.10.10)
+		;; WHEN: Wed Dec  2 22:05:26 2015
+		;; MSG SIZE  rcvd: 84
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_sources/admin/quick_howto/index.rst.txt
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_sources/admin/quick_howto/index.rst.txt b/docs/2.1.x/_sources/admin/quick_howto/index.rst.txt
new file mode 100644
index 0000000..4eab27f
--- /dev/null
+++ b/docs/2.1.x/_sources/admin/quick_howto/index.rst.txt
@@ -0,0 +1,29 @@
+..
+..
+.. Licensed under the Apache License, Version 2.0 (the "License");
+.. you may not use this file except in compliance with the License.
+.. You may obtain a copy of the License at
+..
+..     http://www.apache.org/licenses/LICENSE-2.0
+..
+.. Unless required by applicable law or agreed to in writing, software
+.. distributed under the License is distributed on an "AS IS" BASIS,
+.. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+.. See the License for the specific language governing permissions and
+.. limitations under the License.
+..
+
+Quick How To Guides
+*******************
+
+Traffic Control is a complicated system, and documenting it is not trivial. Sometimes a picture says more than a thousand words, so here are some screen shot based tutorials on how to use some of the more involved features.
+
+.. toctree::
+  :maxdepth: 3
+
+  multi_site.rst
+  multi_site_ats5.rst
+  dnssec.rst
+  federations.rst
+  regionalgeo.rst
+  steering.rst

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_sources/admin/quick_howto/multi_site.rst.txt
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_sources/admin/quick_howto/multi_site.rst.txt b/docs/2.1.x/_sources/admin/quick_howto/multi_site.rst.txt
new file mode 100644
index 0000000..10dfb82
--- /dev/null
+++ b/docs/2.1.x/_sources/admin/quick_howto/multi_site.rst.txt
@@ -0,0 +1,95 @@
+.. 
+.. 
+.. Licensed under the Apache License, Version 2.0 (the "License");
+.. you may not use this file except in compliance with the License.
+.. You may obtain a copy of the License at
+.. 
+..     http://www.apache.org/licenses/LICENSE-2.0
+.. 
+.. Unless required by applicable law or agreed to in writing, software
+.. distributed under the License is distributed on an "AS IS" BASIS,
+.. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+.. See the License for the specific language governing permissions and
+.. limitations under the License.
+.. 
+
+.. _rl-multi-site-origin-qht:
+
+***************************
+Configure Multi Site Origin
+***************************
+
+1) Create "cachegroups" for the origin locations, and assign the appropriate parent-child relationship between the mid cg's and org cgs (click the image to see full size):
+
+.. image:: C5C4CD22-949A-48FD-8976-C673083E2177.png
+	:scale: 100%
+	:align: center
+
+2) Create a profile to assign to each of the origins:
+
+.. image:: 19BB6EC1-B6E8-4D22-BFA0-B7D6A9708B42.png
+	:scale: 100%
+	:align: center
+
+3) Create server entries for the origination vips:
+
+.. image:: D28614AA-9758-45ED-9EFD-3A284FC4218E.png
+	:scale: 100%
+	:align: center
+
+4) Check the multi-site check box in the delivery service screen:
+
+.. image:: mso-enable.png
+	:scale: 100%
+	:align: center
+
+5) Assign the org servers to the delivery service that will have the multi site feature:
+
+.. image:: 066CEF4F-C1A3-4A89-8B52-4F72B0531367.png
+	:scale: 100%
+	:align: center
+
+.. Note:: “Origin Server Base URL” uniqueness: In order to enable MID caches to distinguish delivery services by different MSO algorithms while performing parent failover, it requires that “Origin Server Base URL” (OFQDN) for each MSO enabled delivery service is unique unless the exceptions listed afterwards. This means that the OFQDN of a MSO enabled delivery service should be different with the OFQDNs of any other delivery service, regardless of whether they are MSO enabled or not. The exceptions are: 
+       1) If there are multiple CDNs created on the same Traffic Ops, delivery services across different CDNs may have the same OFQDN configured.
+       2) If several delivery services in the same CDN have the same MSO algorithm configured, they may share the same OFQDN.
+       3) If delivery services are assigned with different MID cache groups respectively, they can share the same OFQDN.
+
+6) Select an option from the "Multi Site Origin Algorithm" drop-down list. Four MSO algorithms are supported:
+
++------------------+--------------------------------------------------------------------------------------------------------------------+
+|     Option       |                                                            Description                                             |
++==================+====================================================================================================================+
+| Consistent hash  | Origin server selection is based on the consistent hash of requested URLs.                                         |
++------------------+--------------------------------------------------------------------------------------------------------------------+
+| Primary/back     | Round robin selection does not occur. The first origin server is selected unless it fails.                         |
+|                  | If the first fails, the second and other following origin servers will be tried by order.                          |
+|                  | Order is defined by 2 factors - if the origin server's cachegroup is configured as the                             |
+|                  | parent cachegroup for the mid, then this server will be used as the primary. The same rules                        |
+|                  | apply for secondary parents, in order.  Within the cachegroups, the rank parameter will sort                       |
+|                  | order further. If no parents are defined at the mid, then only rank is considered.                                 |  
++------------------+--------------------------------------------------------------------------------------------------------------------+
+| Strict           | MID caches serve requests strictly in turn. For example: origin server 1 serves the first request,                 |
+| round-robin      | origin server 2 serves the second request, and so on.                                                              |
++------------------+--------------------------------------------------------------------------------------------------------------------+
+| IP based         | MID cache goes through the origin server list in a round robin-based on the IP address of EDGE cache.              |
+| round-robin      |                                                                                                                    |
++------------------+--------------------------------------------------------------------------------------------------------------------+
+
+7) Optionally, there are two configuration options that can set the order of the origins used if "Primary/backup" is selected for "Multi Site Origin Algorithm". By creating location-based cachegroups and assigning the origin servers accordingly and defining these cachegroups as parents for specific mids, location-based primary/secondary selection can be made.   If primary/secondary selection should be the same for all mids, then a new parameter “rank” should be configured for each origin server profile. Origin servers with lower values of rank have higher ranking in the origin server list on MID caches, e.g. OS with rank of "2" precedes OS with the rank of "5". For any OS, if rank value is not defined in its profile, its rank value will default to “1”.  In the event that both location based cachegroups are used alongside rank, sorting will be by cachegroup first and rank second.  In this way it is possible to have specific backup servers for use at specific locations.
+
+.. image:: mso-rank.png
+	:scale: 60%
+	:align: center
+
+8) Assign the parent.config location parameter to the MID profile:
+
+.. image:: D22DCAA3-18CC-48F4-965B-5312993F9820.png
+	:scale: 100%
+	:align: center
+
+
+9) Configure the mid hdr_rewrite on the delivery service, example: ::
+
+	cond %{REMAP_PSEUDO_HOOK} __RETURN__ set-config proxy.config.http.parent_origin.dead_server_retry_enabled 1 __RETURN__ set-config proxy.config.http.parent_origin.simple_retry_enabled 1 __RETURN__ set-config proxy.config.http.parent_origin.simple_retry_response_codes "400,404,412" __RETURN__ set-config proxy.config.http.parent_origin.dead_server_retry_response_codes "502,503" __RETURN__ set-config proxy.config.http.connect_attempts_timeout 2 __RETURN__ set-config proxy.config.http.connect_attempts_max_retries 2 __RETURN__ set-config proxy.config.http.connect_attempts_max_retries_dead_server 1 __RETURN__ set-config proxy.config.http.transaction_active_timeout_in 5 [L] __RETURN__
+
+10) Turn on parent_proxy_routing in the MID profile.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_sources/admin/quick_howto/multi_site_ats5.rst.txt
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_sources/admin/quick_howto/multi_site_ats5.rst.txt b/docs/2.1.x/_sources/admin/quick_howto/multi_site_ats5.rst.txt
new file mode 100644
index 0000000..570e844
--- /dev/null
+++ b/docs/2.1.x/_sources/admin/quick_howto/multi_site_ats5.rst.txt
@@ -0,0 +1,95 @@
+.. 
+.. 
+.. Licensed under the Apache License, Version 2.0 (the "License");
+.. you may not use this file except in compliance with the License.
+.. You may obtain a copy of the License at
+.. 
+..     http://www.apache.org/licenses/LICENSE-2.0
+.. 
+.. Unless required by applicable law or agreed to in writing, software
+.. distributed under the License is distributed on an "AS IS" BASIS,
+.. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+.. See the License for the specific language governing permissions and
+.. limitations under the License.
+.. 
+
+.. _rl-multi-site-origin-qht-ats5:
+
+*********************************
+Configure Multi Site Origin (5.x)
+*********************************
+
+1) Create "cachegroups" for the origin locations, and assign the appropriate parent-child relationship between the mid cg's and org cgs (click the image to see full size):
+
+.. image:: C5C4CD22-949A-48FD-8976-C673083E2177.png
+	:scale: 100%
+	:align: center
+
+2) Create a profile to assign to each of the origins:
+
+.. image:: 19BB6EC1-B6E8-4D22-BFA0-B7D6A9708B42.png
+	:scale: 100%
+	:align: center
+
+3) Create server entries for the origination vips:
+
+.. image:: D28614AA-9758-45ED-9EFD-3A284FC4218E.png
+	:scale: 100%
+	:align: center
+
+4) Check the multi-site check box in the delivery service screen:
+
+.. image:: mso-enable.png
+	:scale: 100%
+	:align: center
+
+5) Assign the org servers to the delivery service that will have the multi site feature:
+
+.. image:: 066CEF4F-C1A3-4A89-8B52-4F72B0531367.png
+	:scale: 100%
+	:align: center
+
+.. Note:: “Origin Server Base URL” uniqueness: In order to enable MID caches to distinguish delivery services by different MSO algorithms while performing parent failover, it requires that “Origin Server Base URL” (OFQDN) for each MSO enabled delivery service is unique unless the exceptions listed afterwards. This means that the OFQDN of a MSO enabled delivery service should be different with the OFQDNs of any other delivery service, regardless of whether they are MSO enabled or not. The exceptions are: 
+       1) If there are multiple CDNs created on the same Traffic Ops, delivery services across different CDNs may have the same OFQDN configured.
+       2) If several delivery services in the same CDN have the same MSO algorithm configured, they may share the same OFQDN.
+       3) If delivery services are assigned with different MID cache groups respectively, they can share the same OFQDN.
+
+6) Select an option from the "Multi Site Origin Algorithm" drop-down list. Four MSO algorithms are supported:
+
++------------------+--------------------------------------------------------------------------------------------------------------------+
+|     Option       |                                                            Description                                             |
++==================+====================================================================================================================+
+| Consistent hash  | Origin server selection is based on the consistent hash of requested URLs.                                         |
++------------------+--------------------------------------------------------------------------------------------------------------------+
+| Primary/back     | Round robin selection does not occur. The first origin server is selected unless it fails.                         |
+|                  | If the first fails, the second and other following origin servers will be tried by order.                          |
+|                  | Order is defined by 2 factors - if the origin server's cachegroup is configured as the                             |
+|                  | parent cachegroup for the mid, then this server will be used as the primary. The same rules                        |
+|                  | apply for secondary parents, in order.  Within the cachegroups, the rank parameter will sort                       |
+|                  | order further. If no parents are defined at the mid, then only rank is considered.                                 |  
++------------------+--------------------------------------------------------------------------------------------------------------------+
+| Strict           | MID caches serve requests strictly in turn. For example: origin server 1 serves the first request,                 |
+| round-robin      | origin server 2 serves the second request, and so on.                                                              |
++------------------+--------------------------------------------------------------------------------------------------------------------+
+| IP based         | MID cache goes through the origin server list in a round robin-based on the IP address of EDGE cache.              |
+| round-robin      |                                                                                                                    |
++------------------+--------------------------------------------------------------------------------------------------------------------+
+
+7) Optionally, there are two configuration options that can set the order of the origins used if "Primary/backup" is selected for "Multi Site Origin Algorithm". By creating location-based cachegroups and assigning the origin servers accordingly and defining these cachegroups as parents for specific mids, location-based primary/secondary selection can be made.   If primary/secondary selection should be the same for all mids, then a new parameter “rank” should be configured for each origin server profile. Origin servers with lower values of rank have higher ranking in the origin server list on MID caches, e.g. OS with rank of "2" precedes OS with the rank of "5". For any OS, if rank value is not defined in its profile, its rank value will default to “1”.  In the event that both location based cachegroups are used alongside rank, sorting will be by cachegroup first and rank second.  In this way it is possible to have specific backup servers for use at specific locations.
+
+.. image:: mso-rank.png
+	:scale: 60%
+	:align: center
+
+8) Assign the parent.config location parameter to the MID profile:
+
+.. image:: D22DCAA3-18CC-48F4-965B-5312993F9820.png
+	:scale: 100%
+	:align: center
+
+
+9) Configure the mid hdr_rewrite on the delivery service, example: ::
+
+	cond %{REMAP_PSEUDO_HOOK} __RETURN__ set-config proxy.config.http.parent_origin.dead_server_retry_enabled 1 __RETURN__ set-config proxy.config.http.parent_origin.simple_retry_enabled 1 __RETURN__ set-config proxy.config.http.parent_origin.simple_retry_response_codes "400,404,412" __RETURN__ set-config proxy.config.http.parent_origin.dead_server_retry_response_codes "502,503" __RETURN__ set-config proxy.config.http.connect_attempts_timeout 2 __RETURN__ set-config proxy.config.http.connect_attempts_max_retries 2 __RETURN__ set-config proxy.config.http.connect_attempts_max_retries_dead_server 1 __RETURN__ set-config proxy.config.http.transaction_active_timeout_in 5 [L] __RETURN__
+
+10) Turn on parent_proxy_routing in the MID profile.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_sources/admin/quick_howto/regionalgeo.rst.txt
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_sources/admin/quick_howto/regionalgeo.rst.txt b/docs/2.1.x/_sources/admin/quick_howto/regionalgeo.rst.txt
new file mode 100644
index 0000000..a903c8a
--- /dev/null
+++ b/docs/2.1.x/_sources/admin/quick_howto/regionalgeo.rst.txt
@@ -0,0 +1,109 @@
+..
+..
+.. Licensed under the Apache License, Version 2.0 (the "License");
+.. you may not use this file except in compliance with the License.
+.. You may obtain a copy of the License at
+..
+..     http://www.apache.org/licenses/LICENSE-2.0
+..
+.. Unless required by applicable law or agreed to in writing, software
+.. distributed under the License is distributed on an "AS IS" BASIS,
+.. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+.. See the License for the specific language governing permissions and
+.. limitations under the License.
+..
+
+.. _rl-regionalgeo-qht:
+
+**************************************
+Configure Regional Geo-blocking (RGB)
+**************************************
+
+.. Note:: RGB is only supported for HTTP delivery services.
+
+1)	Prepare RGB configuration file
+
+RGB uses a configuration file in JSON format to define regional geo-blocking rules for delivery services. The file needs to be put on an HTTP server accessible to Traffic Router. An example of the JSON is as follows::
+
+    {
+    "deliveryServices":
+        [
+            {
+                "deliveryServiceId": "hls-live",
+                "urlRegex": ".*live4\\.m3u8",
+                "geoLocation": {"includePostalCode":["N0H", "L9V", "L9W"]},
+                "redirectUrl": "http://third-party.com/blacked_out.html"
+            },
+            {
+                "deliveryServiceId": "hls-live",
+                "urlRegex": ".*live5\\.m3u8",
+                "ipWhiteList": [185.68.71.9/22","142.232.0.79/24"],
+                "geoLocation": {"excludePostalCode":["N0H", "L9V"]},
+                "redirectUrl": "/live5_low_bitrate.m3u8"
+            }
+        ]
+    }
+
+* The value of "deliveryServiceId" shall be equal to the “XML ID” field of the intended delivery service defined on Traffic Ops.
+
+* “urlRegex” is to match request URLs. The URLs matching the regex are applicable to the rule.
+
+* “geoLocation” currently supports “includePostalCode” and “excludePostalCode” attribute. When “includePostalCode” attribute is used, only the clients whose FSAs are in the “includePostalCode” list are able to view the content represented by “urlRegex”. When “excludePostalCode” is used, any client whose FSA are not in the “excludePostalCode” list are allowed to view the content. “includePostalCode” and “excludePostalCode” are mutually exclusive in one rule. (FSA: Forward Sortation Area, first three postal characters of Canadian postal codes)
+
+* “redirectUrl” is the URL that will be responded to the blocked clients. Without a domain name in the URL, the URL will still be served in the same delivery service. Thus Traffic Router will redirect the client to a chosen cache server assigned to the delivery service. If the URL includes a domain name, Traffic Router simply redirects the client to the defined URL. In the later case, the redirect URL must not match the “urlRegex” part to avoid HTTP 302 loop on Traffic Router.
+
+* “ipWhiteList” is an optional element. It includes a list of CIDR (Classless Inter-Domain Routing) blocks indicating the IPv4 subnets that are allowed by the rule. If this list exists and the value is not empty, client IP will be matched against the CIDR list, and if there is any match, the request will be allowed and no postal code matching logic is needed. If there is no match in the white list, postal code matching logic will be processed further.
+
+
+2)	Add RGB parameters on Traffic Ops
+
+The two new parameters in following table are required to be added into CRConfig.json:
+
+* "regional_geoblocking.polling.url": the HTTP URL of RGB configuration file. Traffic Router will fetch the file from this URL.
+* "regional_geoblocking.polling.interval": the interval that Traffic Router polls the RGB configuration file.
+
+.. image:: regionalgeo01.png
+	:scale: 100%
+	:align: center
+
+3)	Enable RGB for a delivery service
+
+.. image:: regionalgeo02.png
+	:scale: 100%
+	:align: center
+
+4)	Make configuration effective
+
+Go to Tools->Snapshot CRConfig, perform “Diff CRConfig” and click "Write CRConfig".
+
+.. image:: regionalgeo03.png
+	:scale: 70%
+	:align: center
+
+5)	Traffic Router access log with RGB
+
+RGB extends the field of "rtype" and adds a new field "rgb" in Traffic Router access.log to help to monitor the working of this feature.
+
+For "rtype", RGALT indicates that a request is redirected to an alternate URL by RGB; RGDENY indicates that a request is denied by RGB because there is no matching rule in JSON for this request.
+
+For "rgb", when RGB is enabled, it will be non-empty with following format::
+
+    {FSA}:{allowed/disallowed}:{include/exclude postal}:{fallback config/current config}:{allowed by whitelist/otherwise}
+
+
+* {FSA}: It is the client’s FSA part of its postal code, which is retrieved from geo-location database. If FSA is empty, dash (“-“) is filled in.
+* {allowed/disallowed}: This flag shows if a request is allowed or disallowed by RGB (1 for yes, and 0 for no).
+* {include/exclude postal}: It shows that when a rule in JSON is matched for a request, it is an include or exclude list of postal codes (i.e. FSAs). “I” for include, and “X” for exclude. If no rule matches, dash (“-“) is filled in.
+* {fallback config/current config}: when TR fails to parse an RGB JSON, TR will handle requests with latest valid JSON configuration, but will set {fallback config} flag to 1. If the new JSON is valid, then the flag is set to 0.
+* {allowed by whitelist/otherwise}: If a request is allowed by whitelist, this flag is set to 1; for all other cases, it is 0.
+
+
+Example::
+
+    1446442214.685 qtype=HTTP chi=129.100.254.79 url="http://ccr.geo2.cdn.com/live5.m3u8" cqhm=GET cqhv=HTTP/1.1 rtype=GEO rloc="-" rdtl=- rerr="-" rgb="N6G:1:X:0:0" pssc=302 ttms=3 rurl=http://cent6-44.geo2.cdn.com/live5.m3u8 rh="-"
+
+    1446442219.181 qtype=HTTP chi=184.68.71.9 url="http://ccr.geo2.cdn.com/live5.m3u8" cqhm=GET cqhv=HTTP/1.1 rtype=RGALT rloc="-" rdtl=- rerr="-" rgb="-:0:X:0:0" pssc=302 ttms=3 rurl=http://cent6-44.geo2.cdn.com/low_bitrate.m3u8 rh="-"
+
+    1446445521.677 qtype=HTTP chi=24.114.29.79 url="http://ccr.geo2.cdn.com/live51.m3u8" cqhm=GET cqhv=HTTP/1.1 rtype=RGDENY rloc="-" rdtl=- rerr="-" rgb="L4S:0:-:0:0" pssc=520 ttms=3 rurl="-" rh="-"
+
+

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_sources/admin/quick_howto/steering.rst.txt
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_sources/admin/quick_howto/steering.rst.txt b/docs/2.1.x/_sources/admin/quick_howto/steering.rst.txt
new file mode 100644
index 0000000..be3c319
--- /dev/null
+++ b/docs/2.1.x/_sources/admin/quick_howto/steering.rst.txt
@@ -0,0 +1,111 @@
+..
+..
+.. Licensed under the Apache License, Version 2.0 (the "License");
+.. you may not use this file except in compliance with the License.
+.. You may obtain a copy of the License at
+..
+..     http://www.apache.org/licenses/LICENSE-2.0
+..
+.. Unless required by applicable law or agreed to in writing, software
+.. distributed under the License is distributed on an "AS IS" BASIS,
+.. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+.. See the License for the specific language governing permissions and
+.. limitations under the License.
+..
+
+.. _rl-steering-qht:
+
+***********************************
+Configure Delivery Service Steering
+***********************************
+
+1)  Create two target delivery services in Traffic Ops.  They must both be HTTP delivery services that are part of the same CDN.
+
+.. image:: steering01.png
+	:scale: 100%
+	:align: center
+
+2) Create a delivery service with type STEERING in Traffic Ops.
+
+.. image:: steering02.png
+	:scale: 100%
+	:align: center
+
+3) Click the 'Manage Steering Assignments' button on the delivery service screen to assign targets.
+
+.. image:: steering03.png
+	:scale: 100%
+	:align: center
+
+4) Create a user with the role of Steering.
+
+.. image:: steering04.png
+	:scale: 100%
+	:align: center
+
+5) As the steering user, assign weights or orders to target delivery services.  Assignments must either have a value for weight or order, but not both.  The value of weight must be a positive integer, while the value of order can be any integer.  This will require logging in to Traffic Ops first via ``http://to.kabletown.net/api/1.2/user/login`` and storing the mojolicious cookie.
+
+	Sample cURL: ``curl -H "Cookie: mojolicious=xxxyyy" -XPUT "https://to.kabletown.net/internal/api/1.2/steering/steering-ds" -d @/tmp/steering.json``
+
+	Sample JSON body:
+
+::
+
+   {
+    "targets": [
+     {
+       "weight": "1000",
+       "deliveryService": "target-deliveryservice-1"
+     },
+     {
+       "weight": "9000",
+       "deliveryService": "target-deliveryservice-2"
+     }
+     {
+       "order": -1,
+       "deliveryService": "target-deliveryservice-3"
+     }
+     {
+       "order": 3,
+       "deliveryService": "target-deliveryservice-4"
+     }
+    ]
+   }
+
+6) If desired, the steering user can create filters for the target delivery services.
+
+	Sample cURL: ``curl -H "Cookie: mojolicious=xxxyyy" -XPUT "https://to.kabletown.net/internal/api/1.2/steering/steering-ds" -d @/tmp/steering.json``
+
+	Sample JSON body:
+
+::
+
+   {
+    "filters": [
+     {
+       "pattern": ".*\\gototarget1\\..*",
+       "deliveryService": "target-deliveryservice-1"
+     }
+    ],
+    "targets": [
+     {
+       "weight": "1000",
+       "deliveryService": "target-deliveryservice-1"
+     },
+     {
+       "weight": "9000",
+       "deliveryService": "target-deliveryservice-2"
+     }
+     {
+       "order": -1,
+       "deliveryService": "target-deliveryservice-3"
+     }
+     {
+       "order": 3,
+       "deliveryService": "target-deliveryservice-4"
+     }
+    ]
+   }
+
+7) Any requests to Traffic Router for the steering delivery service should now be routed to target delivery services based on configured weight or order.  Example: ``curl -Lvs http://tr.steering-ds.cdn.kabletown.net/foo``
+

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_sources/admin/traffic_monitor.rst.txt
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_sources/admin/traffic_monitor.rst.txt b/docs/2.1.x/_sources/admin/traffic_monitor.rst.txt
new file mode 100644
index 0000000..1e0c797
--- /dev/null
+++ b/docs/2.1.x/_sources/admin/traffic_monitor.rst.txt
@@ -0,0 +1,177 @@
+.. 
+.. 
+.. Licensed under the Apache License, Version 2.0 (the "License");
+.. you may not use this file except in compliance with the License.
+.. You may obtain a copy of the License at
+.. 
+..     http://www.apache.org/licenses/LICENSE-2.0
+.. 
+.. Unless required by applicable law or agreed to in writing, software
+.. distributed under the License is distributed on an "AS IS" BASIS,
+.. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+.. See the License for the specific language governing permissions and
+.. limitations under the License.
+.. 
+
+******************************
+Traffic Monitor Administration
+******************************
+
+.. _rl-tm-java:
+
+* These instructions are for the Java Traffic Monitor, for the Golang beta, see :ref:`rl-tm-golang`.
+
+Installing Traffic Monitor
+==========================
+The following are requirements to ensure an accurate set up:
+
+* CentOS 6
+* 4 vCPUs
+* 8GB RAM
+* Successful install of Traffic Ops
+* Tomcat
+* Administrative access to the Traffic Ops
+* Physical address of the site
+* perl-JSON
+* perl-WWW-Curl
+
+#. Add the Traffic Monitor server into Traffic Ops using 'Servers' -> 'Add Server'. Set the 'Type' field to 'RASCAL'.
+
+#. Make sure the FQDN of the Traffic Monitor is resolvable in DNS.
+
+#. Get the Traffic Monitor RPM.
+
+   Sample command: ::
+
+      wget http://traffic-control-cdn.net/downloads/1.7.0/RELEASE-1.7.0/traffic_monitor-1.7.0-3908.5b77f60f.el6.x86_64.rpm
+
+#. Install Traffic Monitor and Perl modules: ::
+
+    sudo yum -y install traffic_monitor-*.rpm perl-JSON perl-WWW-Curl
+
+#. Take the config from Traffic Ops: ::
+
+    sudo /opt/traffic_monitor/bin/traffic_monitor_config.pl https://<traffic-ops-URL> <traffic-ops-user>:<traffic-ops-password> prompt
+
+   Sample session: ::
+
+    traffic_mon # /opt/traffic_monitor/bin/traffic_monitor_config.pl https://traffic-ops.cdn.kabletown.net admin:kl0tevax prompt
+    DEBUG: traffic_ops selected: https://traffic-ops.cdn.kabletown.net
+    DEBUG: traffic_ops login: admin:kl0tevax
+    DEBUG: Config write mode: prompt
+    DEBUG: Found profile from traffic_ops: RASCAL_CDN
+    DEBUG: Found CDN name from traffic_ops: kabletown_cdn
+    DEBUG: Found location for rascal-config.txt from traffic_ops: /opt/traffic_monitor/conf
+    WARN: Param not in traffic_ops: allow.config.edit                        description: Allow the running configuration to be edited through the UI                                                              Using default value of: false
+    WARN: Param not in traffic_ops: default.accessControlAllowOrigin         description: The value for the header: Access-Control-Allow-Origin for published jsons... should be narrowed down to TMs              Using default value of: *
+    WARN: Param not in traffic_ops: default.connection.timeout               description: Default connection time for all queries (cache, peers, TM)                                                               Using default value of: 2000
+    WARN: Param not in traffic_ops: hack.forceSystemExit                     description: Call System.exit on shutdown                                                                                             Using default value of: false
+    WARN: Param not in traffic_ops: hack.peerOptimistic                      description: The assumption of a caches availability when unknown by peers                                                            Using default value of: true
+    WARN: Param not in traffic_ops: hack.publishDsStates                     description: If true, the delivery service states will be included in the CrStates.json                                               Using default value of: true
+    WARN: Param not in traffic_ops: health.ds.interval                       description: The polling frequency for calculating the deliveryService states                                                         Using default value of: 1000
+    WARN: Param not in traffic_ops: health.ds.leniency                       description: The amount of time before the deliveryService disregards the last update from a non-responsive cache                     Using default value of: 30000
+    WARN: Param not in traffic_ops: health.event-count                       description: The number of historical events that will be kept                                                                        Using default value of: 200
+    WARN: Param not in traffic_ops: health.polling.interval                  description: The polling frequency for getting the states from caches                                                                 Using default value of: 5000
+    WARN: Param not in traffic_ops: health.startupMinCycles                  description: The number of query cycles that must be completed before this Traffic Monitor will start reporting                       Using default value of: 2
+    WARN: Param not in traffic_ops: health.timepad                           description: A delay between each separate cache query                                                                                Using default value of: 10
+    WARN: Param not in traffic_ops: peers.polling.interval                   description: Polling frequency for getting states from peer monitors                                                                  Using default value of: 5000
+    WARN: Param not in traffic_ops: peers.polling.url                        description: The url for current, unfiltered states from peer monitors                                                                Using default value of: http://${hostname}/publish/CrStates?raw
+    WARN: Param not in traffic_ops: peers.threadPool                         description: The number of threads given to the pool for querying peers                                                               Using default value of: 1
+    WARN: Param not in traffic_ops: tm.auth.url                              description: The url for the authentication form                                                                                      Using default value of: https://${tmHostname}/login
+    WARN: Param not in traffic_ops: tm.crConfig.json.polling.url             description: Url for the cr-config (json)                                                                                             Using default value of: https://${tmHostname}/CRConfig-Snapshots/${cdnName}/CRConfig.json
+    WARN: Param not in traffic_ops: tm.healthParams.polling.url              description: The url for the heath params (json)                                                                                      Using default value of: https://${tmHostname}/health/${cdnName}
+    WARN: Param not in traffic_ops: tm.polling.interval                      description: The polling frequency for getting updates from TM                                                                        Using default value of: 10000
+    DEBUG: allow.config.edit needed in config, but does not exist in config on disk.
+    DEBUG: cdnName value on disk () does not match value needed in config (kabletown_cdn).
+    DEBUG: default.accessControlAllowOrigin needed in config, but does not exist in config on disk.
+    DEBUG: default.connection.timeout needed in config, but does not exist in config on disk.
+    DEBUG: hack.forceSystemExit needed in config, but does not exist in config on disk.
+    DEBUG: hack.peerOptimistic needed in config, but does not exist in config on disk.
+    DEBUG: hack.publishDsStates needed in config, but does not exist in config on disk.
+    DEBUG: health.ds.interval needed in config, but does not exist in config on disk.
+    DEBUG: health.ds.leniency needed in config, but does not exist in config on disk.
+    DEBUG: health.startupMinCycles needed in config, but does not exist in config on disk.
+    DEBUG: health.timepad value on disk (20) does not match value needed in config (10).
+    DEBUG: peers.polling.interval needed in config, but does not exist in config on disk.
+    DEBUG: peers.threadPool needed in config, but does not exist in config on disk.
+    DEBUG: tm.auth.password value on disk () does not match value needed in config (kl0tevax).
+    DEBUG: tm.auth.username value on disk () does not match value needed in config (admin).
+    DEBUG: tm.hostname value on disk () does not match value needed in config (traffic-ops.cdn.kabletown.net).
+    DEBUG: Proposed traffic_monitor_config:
+    {
+       "traffic_monitor_config":{
+          "default.accessControlAllowOrigin":"*",
+          "health.startupMinCycles":"2",
+          "tm.auth.password":"kl0tevax",
+          "tm.auth.url":"https://${tmHostname}/login",
+          "tm.healthParams.polling.url":"https://${tmHostname}/health/${cdnName}",
+          "allow.config.edit":"false",
+          "tm.crConfig.json.polling.url":"https://${tmHostname}/CRConfig-Snapshots/${cdnName}/CRConfig.json",
+          "tm.auth.username":"admin",
+          "peers.polling.url":"http://${hostname}/publish/CrStates?raw",
+          "health.timepad":"10",
+          "hack.publishDsStates":"true",
+          "default.connection.timeout":"2000",
+          "health.ds.interval":"1000",
+          "peers.polling.interval":"5000",
+          "hack.forceSystemExit":"false",
+          "health.ds.leniency":"30000",
+          "cdnName":"kabletown_cdn",
+          "peers.threadPool":"1",
+          "tm.polling.interval":"10000",
+          "health.polling.interval":"5000",
+          "health.event-count":"200",
+          "hack.peerOptimistic":"true",
+          "tm.hostname":"traffic-ops.cdn.kabletown.net"
+       }
+    }
+    ----------------------------------------------
+    ----OK to write this config to disk? (Y/n) [n]y
+    ----------------------------------------------
+    ----------------------------------------------
+    ----OK to write this config to disk? (Y/n) [n]Y
+    ----------------------------------------------
+    DEBUG: Writing /opt/traffic_monitor/conf/traffic_monitor_config.js
+    traffic_mon #
+
+#. Update the 'allow_ip' and 'allow_ip6' parameters in the profiles of all caches defined in traffic ops, both edge and mid,
+   with the address of the traffic monitor being installed, so that the traffic servers will allow this Traffic Monitor
+   to access the astats plugin.
+   For details see :ref:`rl-param-prof` in the *Configuring Traffic Ops* section.
+
+#. Start Tomcat: ``sudo service tomcat start`` ::
+
+    Using CATALINA_BASE: /opt/tomcat
+    Using CATALINA_HOME: /opt/tomcat
+    Using CATALINA_TMPDIR: /opt/tomcat/temp
+    Using JRE_HOME: /usr
+    Using CLASSPATH:/opt/tomcat/bin/bootstrap.jar
+    Using CATALINA_PID:/var/run/tomcat/tomcat.pid
+    Starting tomcat [ OK ]
+
+#. Configure tomcat to start automatically: ``sudo chkconfig tomcat on``
+
+#. Verify Traffic Monitor is running by pointing your browser to port 80 on the Traffic Monitor host:
+
+   * The 'Cache States' tab should display all Mid and Edge caches configured in Traffic Ops.
+   * The 'DeliveryService States' tab should display all delivery services configured in Traffic Ops.
+
+#. In Traffic Ops servers table, click 'Edit' for this server, then click 'Online'.
+
+
+Configuring Traffic Monitor
+===========================
+
+Configuration Overview
+----------------------
+Traffic Monitor is configured using its JSON configuration file, ``/opt/traffic_monitor/conf/traffic_monitor_config.js``.
+This file is created by ``traffic_monitor_config.pl`` script, and among other things, it contains the Traffic Ops URL and the user:password
+specified during the invocation of that script.
+
+When started, Traffic Monitor uses this basic configuration to downloads its configuration from Traffic Ops, and begins polling caches.
+Once a configurable number of polling cycles completes, health protocol state is available via RESTful JSON endpoints.
+
+
+Troubleshooting and log files
+=============================
+Traffic Monitor log files are in ``/opt/traffic_monitor/var/log/``, and tomcat log files are in ``/opt/tomcat/logs/``.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/24ff8964/docs/2.1.x/_sources/admin/traffic_monitor_golang.rst.txt
----------------------------------------------------------------------
diff --git a/docs/2.1.x/_sources/admin/traffic_monitor_golang.rst.txt b/docs/2.1.x/_sources/admin/traffic_monitor_golang.rst.txt
new file mode 100644
index 0000000..d08e010
--- /dev/null
+++ b/docs/2.1.x/_sources/admin/traffic_monitor_golang.rst.txt
@@ -0,0 +1,65 @@
+.. 
+.. 
+.. Licensed under the Apache License, Version 2.0 (the "License");
+.. you may not use this file except in compliance with the License.
+.. You may obtain a copy of the License at
+.. 
+..     http://www.apache.org/licenses/LICENSE-2.0
+.. 
+.. Unless required by applicable law or agreed to in writing, software
+.. distributed under the License is distributed on an "AS IS" BASIS,
+.. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+.. See the License for the specific language governing permissions and
+.. limitations under the License.
+.. 
+
+******************************
+Traffic Monitor Administration
+******************************
+
+.. _rl-tm-golang:
+
+* These instructions are for the beta Golang Traffic Monitor, for the old Java version, see :ref:`rl-tm-java`.
+
+Installing Traffic Monitor
+==========================
+
+The following are requirements to ensure an accurate set up:
+
+* CentOS 6
+* 8 vCPUs
+* 16GB RAM
+* Successful install of Traffic Ops
+* Administrative access to the Traffic Ops
+* Physical address of the site
+
+1. Enter the Traffic Monitor server into Traffic Ops
+2. Make sure the FQDN of the Traffic Monitor is resolvable in DNS.
+3. Install Traffic Monitor: ``sudo yum -y install traffic_monitor``
+4. Configure Traffic Monitor. See :ref:`rl-tm-configure`
+5. Start the service: ``sudo service traffic_monitor start`` ::
+
+    Starting traffic_monitor:
+
+6. Verify Traffic Monitor is running by pointing your browser to port 80 on the Traffic Monitor host.
+
+Configuring Traffic Monitor
+===========================
+
+Configuration Overview
+----------------------
+
+.. _rl-tm-configure:
+
+Traffic Monitor is configured via two JSON configuration files, ``traffic_ops.cfg`` and ``traffic_monitor.cfg``, by default located in the ``conf`` directory in the install location.
+
+The ``traffic_ops.cfg`` config contains Traffic Ops connection information. Specify the URL, username, and password for the instance of Traffic Ops for which this Traffic Monitor is a member.
+
+The ``traffic_monitor.cfg`` config contains log file locations, as well as detailed application configuration variables, such as processing flush times and initial poll intervals.
+
+Once started with the correct configuration, Traffic Monitor downloads its configuration from Traffic Ops and begins polling caches. Once every cache has been polled, health protocol state is available via RESTful JSON endpoints.
+
+
+Troubleshooting and log files
+=============================
+Traffic Monitor log files are in ``/opt/traffic_monitor/var/log/``.


Mime
View raw message