Update docs from commit 8ee1ddac5448bc08bc08f6b5452969fa920272ef
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/4f212cfc Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/tree/4f212cfc Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/diff/4f212cfc Branch: refs/heads/asf-site Commit: 4f212cfcec3a74ffea307b0a7d6f7e864bcc80b4 Parents: d4f030f Author: jenkins <bui...@apache.org> Authored: Thu Sep 7 21:18:24 2017 +0000 Committer: jenkins <bui...@apache.org> Committed: Thu Sep 7 21:18:24 2017 +0000 ---------------------------------------------------------------------- docs/master/admin/traffic_ops/using.html | 2 +- docs/master/development/traffic_ops_api/v12/hwinfo.html | 6 +++--- docs/master/development/traffic_ops_api/v12/job.html | 6 +++--- docs/master/searchindex.js | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/4f212cfc/docs/master/admin/traffic_ops/using.html ---------------------------------------------------------------------- diff --git a/docs/master/admin/traffic_ops/using.html b/docs/master/admin/traffic_ops/using.html index d752afd..7b48994 100644 --- a/docs/master/admin/traffic_ops/using.html +++ b/docs/master/admin/traffic_ops/using.html @@ -1050,7 +1050,7 @@ for associated servers when assigned to a server profile. Value must be “c <span id="rl-multi-site-origin"></span><h3>Multi Site Origin<a class="headerlink" href="#multi-site-origin" title="Permalink to this headline">¶</a></h3> <div class="admonition note"> <p class="first admonition-title">Note</p> -<p class="last">The configuration of this feature changed significantly between ATS version 5 and >= 6. Some configuration in Traffic Control is different as well. This documentation assumes ATS 6 or higher. See <span class="xref std std-ref">rl-multi-site-origin-qht-ats5</span> for the ATS version 5.x configuration details.</p> +<p class="last">The configuration of this feature changed significantly between ATS version 5 and >= 6. Some configuration in Traffic Control is different as well. This documentation assumes ATS 6 or higher. See <a class="reference internal" href="../quick_howto/multi_site_ats5.html#rl-multi-site-origin-qht-ats5"><span class="std std-ref">Configure Multi Site Origin (5.x)</span></a> for the ATS version 5.x configuration details.</p> </div> <p>Normally, the mid servers are not aware of any redundancy at the origin layer. With Multi Site Origin enabled this changes - Traffic Server (and Traffic Ops) are now made aware of the fact there are multiple origins, and can be configured to do more advanced failover and loadbalancing actions. A prerequisite for MSO to work is that the multiple origin sites serve identical content with identical paths, and both are configured to serve the same origin hostname as is configured in the deliveryservice <cite>Origin Server Base URL</cite> field. See the <a class="reference external" href="https://docs.trafficserver.apache.org/en/latest/admin-guide/files/parent.config.en.html";>Apache Traffic Server docs</a> for more information on that cache’s implementation.</p> <p>With This feature enabled, origin servers (or origin server VIP names for a site) are going to be entered as servers in to the Traiffic Ops UI. Server type is “ORG”.</p> http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/4f212cfc/docs/master/development/traffic_ops_api/v12/hwinfo.html ---------------------------------------------------------------------- diff --git a/docs/master/development/traffic_ops_api/v12/hwinfo.html b/docs/master/development/traffic_ops_api/v12/hwinfo.html index ca2f774..ecf5592 100644 --- a/docs/master/development/traffic_ops_api/v12/hwinfo.html +++ b/docs/master/development/traffic_ops_api/v12/hwinfo.html @@ -40,7 +40,7 @@ <link rel="search" title="Search" href="../../../search.html"/> <link rel="top" title="Traffic Control 2.1-dev documentation" href="../../../index.html"/> <link rel="up" title="Traffic Ops" href="../../traffic_ops.html"/> - <link rel="next" title="ISO" href="iso.html"/> + <link rel="next" title="Jobs" href="job.html"/> <link rel="prev" title="Federation" href="federation.html"/> @@ -187,7 +187,7 @@ <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation"> - <a href="iso.html" class="btn btn-neutral float-right" title="ISO">Next <span class="fa fa-arrow-circle-right"></span></a> + <a href="job.html" class="btn btn-neutral float-right" title="Jobs">Next <span class="fa fa-arrow-circle-right"></span></a> <a href="federation.html" class="btn btn-neutral" title="Federation"><span class="fa fa-arrow-circle-left"></span> Previous</a> @@ -272,7 +272,7 @@ <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation"> - <a href="iso.html" class="btn btn-neutral float-right" title="ISO">Next <span class="fa fa-arrow-circle-right"></span></a> + <a href="job.html" class="btn btn-neutral float-right" title="Jobs">Next <span class="fa fa-arrow-circle-right"></span></a> <a href="federation.html" class="btn btn-neutral" title="Federation"><span class="fa fa-arrow-circle-left"></span> Previous</a> http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/4f212cfc/docs/master/development/traffic_ops_api/v12/job.html ---------------------------------------------------------------------- diff --git a/docs/master/development/traffic_ops_api/v12/job.html b/docs/master/development/traffic_ops_api/v12/job.html index 44f4eba..bc22987 100644 --- a/docs/master/development/traffic_ops_api/v12/job.html +++ b/docs/master/development/traffic_ops_api/v12/job.html @@ -41,7 +41,7 @@ <link rel="top" title="Traffic Control 2.1-dev documentation" href="../../../index.html"/> <link rel="up" title="Traffic Ops" href="../../traffic_ops.html"/> <link rel="next" title="Parameter" href="parameter.html"/> - <link rel="prev" title="ISO" href="iso.html"/> + <link rel="prev" title="Hardware Info" href="hwinfo.html"/> <script src="_static/js/modernizr.min.js"></script> @@ -190,7 +190,7 @@ <a href="parameter.html" class="btn btn-neutral float-right" title="Parameter">Next <span class="fa fa-arrow-circle-right"></span></a> - <a href="iso.html" class="btn btn-neutral" title="ISO"><span class="fa fa-arrow-circle-left"></span> Previous</a> + <a href="hwinfo.html" class="btn btn-neutral" title="Hardware Info"><span class="fa fa-arrow-circle-left"></span> Previous</a> </div> @@ -383,7 +383,7 @@ <a href="parameter.html" class="btn btn-neutral float-right" title="Parameter">Next <span class="fa fa-arrow-circle-right"></span></a> - <a href="iso.html" class="btn btn-neutral" title="ISO"><span class="fa fa-arrow-circle-left"></span> Previous</a> + <a href="hwinfo.html" class="btn btn-neutral" title="Hardware Info"><span class="fa fa-arrow-circle-left"></span> Previous</a> </div>
