You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2016/11/01 18:42:21 UTC
[1/4] incubator-trafficcontrol git commit: Removed more references to
old traffic-control-cdn.net website
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master 93bb2b9bc -> e4d369834
Removed more references to old traffic-control-cdn.net website
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/2a5406ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/2a5406ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/2a5406ce
Branch: refs/heads/master
Commit: 2a5406ce772ccc1ae2eb273bd821acd25c6093c2
Parents: 25e8e2b
Author: Eric Friedrich <ef...@cisco.com>
Authored: Mon Oct 31 21:50:57 2016 -0400
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Tue Nov 1 12:41:13 2016 -0600
----------------------------------------------------------------------
README.md | 14 +++++++-------
traffic_ops/goto/README.md | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/2a5406ce/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 3777139..9bd7e2e 100644
--- a/README.md
+++ b/README.md
@@ -2,14 +2,14 @@
Apache Traffic Control (incubating) is an Open Source implementation of a Content Delivery Network.
#### Documentation
-* [Intro](http://traffic-control-cdn.net/docs/latest/index.html)
-* [CDN Basics](http://traffic-control-cdn.net/docs/latest/basics/index.html)
-* [Traffic Control Overview](http://traffic-control-cdn.net/docs/latest/overview/index.html)
-* [Administrator's Guide](http://traffic-control-cdn.net/docs/latest/admin/index.html)
-* [Developer's Guide](http://traffic-control-cdn.net/docs/latest/development/index.html)
+* [Intro](http://trafficcontrol.apache.org/docs/latest/index.html)
+* [CDN Basics](http://trafficcontrol.apache.org/docs/latest/basics/index.html)
+* [Traffic Control Overview](http://trafficcontrol.apache.org/docs/latest/overview/index.html)
+* [Administrator's Guide](http://trafficcontrol.apache.org/docs/latest/admin/index.html)
+* [Developer's Guide](http://trafficcontrol.apache.org/docs/latest/development/index.html)
####Questions, Comments, Bugs and More
-* [Frequently Asked Questions](http://traffic-control-cdn.net/docs/latest/faq/index.html)
+* [Frequently Asked Questions](http://trafficcontrol.apache.org/docs/latest/faq/index.html)
* [Found a bug or file a feature request](https://issues.apache.org/jira/browse/TC/?selectedTab=com.atlassian.jira.jira-projects-plugin:summary-panel)
* [Subscribe to our users list](mailto:users-subscribe@trafficcontrol.incubator.apache.org)
* [Subscribe to our dev list](mailto:dev-subscribe@trafficcontrol.incubator.apache.org)
@@ -55,5 +55,5 @@ Apache Traffic Control (incubating) is an Open Source implementation of a Conten
See https://github.com/Comcast/traffic_control/issues?utf8=%E2%9C%93&q=milestone%3A1.1.3 for the full change list.
* 16-April-2015: **Traffic Control is Open Source!**
- Certainly not perfect, but hopefully good enough to get going for an administrator using the rpms, and for brave developers to start looking in to helping the project move forward. Please see the **[Additional Install Notes for this release](http://traffic-control-cdn.net/docs/latest/faq/administration.html#why-is-my-crconfig-json-rejected)** when installing for the first time.
+ Certainly not perfect, but hopefully good enough to get going for an administrator using the rpms, and for brave developers to start looking in to helping the project move forward. Please see the **[Additional Install Notes for this release](http://trafficcontrol.apache.org/docs/latest/faq/administration.html#why-is-my-crconfig-json-rejected)** when installing for the first time.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/2a5406ce/traffic_ops/goto/README.md
----------------------------------------------------------------------
diff --git a/traffic_ops/goto/README.md b/traffic_ops/goto/README.md
index d8ce7ad..523650c 100644
--- a/traffic_ops/goto/README.md
+++ b/traffic_ops/goto/README.md
@@ -3,7 +3,7 @@
GoTO is a server/some other stuff written in Go that allows for RESTful interaction with SQL databases through an Angular web API.
-This is written for the Comcast [Traffic Ops](http://traffic-control-cdn.net/docs/latest/development/traffic_ops.html) database, but I'm pretty sure it should probably work for all databases.
+This is written for the Comcast [Traffic Ops](http://trafficcontrol.apache.org/docs/latest/development/traffic_ops.html) database, but I'm pretty sure it should probably work for all databases.
## Install
[2/4] incubator-trafficcontrol git commit: Removed references to old
traffic-control-cdn.net website
Posted by mi...@apache.org.
Removed references to old traffic-control-cdn.net website
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/25e8e2b0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/25e8e2b0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/25e8e2b0
Branch: refs/heads/master
Commit: 25e8e2b0487be8f02ea2602437b8c0773423e341
Parents: 26358e6
Author: Eric Friedrich <ef...@cisco.com>
Authored: Mon Oct 31 21:45:02 2016 -0400
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Tue Nov 1 12:41:13 2016 -0600
----------------------------------------------------------------------
docs/source/admin/traffic_ops_config.rst | 4 ++--
docs/source/admin/traffic_ops_install.rst | 2 +-
docs/source/admin/traffic_ops_using.rst | 2 +-
docs/source/development/traffic_ops_api/v11/deliveryservice.rst | 4 ++--
docs/source/development/traffic_ops_api/v12/deliveryservice.rst | 4 ++--
.../development/traffic_ops_api/v12/deliveryservice_stats.rst | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/25e8e2b0/docs/source/admin/traffic_ops_config.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_ops_config.rst b/docs/source/admin/traffic_ops_config.rst
index 5429bfa..0ca57da 100644
--- a/docs/source/admin/traffic_ops_config.rst
+++ b/docs/source/admin/traffic_ops_config.rst
@@ -107,9 +107,9 @@ Below is a list of Traffic Server plugins that need to be configured in the para
+------------------+---------------+------------------------------------------------------+------------------------------------------------------------------------------------------------------------+
| Name | Config file | Description | Details |
+==================+===============+======================================================+============================================================================================================+
-| astats_over_http | package | The package version for the astats_over_http plugin. | `astats_over_http <http://traffic-control-cdn.net/downloads/index.html>`_ |
+| astats_over_http | package | The package version for the astats_over_http plugin. | `astats_over_http <http://trafficcontrol.apache.org/downloads/index.html>`_ |
+------------------+---------------+------------------------------------------------------+------------------------------------------------------------------------------------------------------------+
-| trafficserver | package | The package version for the trafficserver plugin. | `trafficserver <http://traffic-control-cdn.net/downloads/index.html>`_ |
+| trafficserver | package | The package version for the trafficserver plugin. | `trafficserver <http://trafficcontrol.apache.org/downloads/index.html>`_ |
+------------------+---------------+------------------------------------------------------+------------------------------------------------------------------------------------------------------------+
| regex_revalidate | plugin.config | The config to be used for regex_revalidate. | `regex_revalidate <https://docs.trafficserver.apache.org/en/5.3.x/reference/plugins/regex_remap.en.html>`_ |
| | | For example: --config regex_revalidate.config | |
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/25e8e2b0/docs/source/admin/traffic_ops_install.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_ops_install.rst b/docs/source/admin/traffic_ops_install.rst
index 3982453..ca49461 100644
--- a/docs/source/admin/traffic_ops_install.rst
+++ b/docs/source/admin/traffic_ops_install.rst
@@ -75,7 +75,7 @@ To begin the install:
1. Install Traffic Ops:
- Download the traffic_ops rpm package from http://traffic-control-cdn.net/downloads/index.html
+ Download the traffic_ops rpm package from http://trafficcontrol.apache.org/downloads/index.html
``sudo rpm -ivh traffic_ops-1.*.*-****.x86_64.rpm``
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/25e8e2b0/docs/source/admin/traffic_ops_using.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_ops_using.rst b/docs/source/admin/traffic_ops_using.rst
index 6b49651..5b8525d 100644
--- a/docs/source/admin/traffic_ops_using.rst
+++ b/docs/source/admin/traffic_ops_using.rst
@@ -594,7 +594,7 @@ Parameters in the Mid (parent) profile that influence this feature:
Multi Site Origin
+++++++++++++++++
-.. Note:: The Multi Site Origin feature is based upon a feature n ATS that has yet to be submitted to Traffic Server upstream, until it is, set this to 0, or use the ATS rpm supplied on the traffic-control-cdn.net website.
+.. Note:: The Multi Site Origin feature is based upon a feature n ATS that has yet to be submitted to Traffic Server upstream, until it is, set this to 0, or use the ATS rpm supplied on the trafficcontrol.apache.org website.
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.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/25e8e2b0/docs/source/development/traffic_ops_api/v11/deliveryservice.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v11/deliveryservice.rst b/docs/source/development/traffic_ops_api/v11/deliveryservice.rst
index 1f7bb86..373c7ec 100644
--- a/docs/source/development/traffic_ops_api/v11/deliveryservice.rst
+++ b/docs/source/development/traffic_ops_api/v11/deliveryservice.rst
@@ -26,7 +26,7 @@ Delivery Service
**GET /api/1.1/deliveryservices**
- Retrieves all delivery services. See also `Using Traffic Ops - Delivery Service <http://traffic-control-cdn.net/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
+ Retrieves all delivery services. See also `Using Traffic Ops - Delivery Service <http://trafficcontrol.apache.org/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
Authentication Required: Yes
@@ -249,7 +249,7 @@ Delivery Service
**GET /api/1.1/deliveryservices/:id**
- Retrieves a specific delivery service. See also `Using Traffic Ops - Delivery Service <http://traffic-control-cdn.net/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
+ Retrieves a specific delivery service. See also `Using Traffic Ops - Delivery Service <http://trafficcontrol.apache.org/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
Authentication Required: Yes
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/25e8e2b0/docs/source/development/traffic_ops_api/v12/deliveryservice.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/deliveryservice.rst b/docs/source/development/traffic_ops_api/v12/deliveryservice.rst
index 0bb4fc6..379ea37 100644
--- a/docs/source/development/traffic_ops_api/v12/deliveryservice.rst
+++ b/docs/source/development/traffic_ops_api/v12/deliveryservice.rst
@@ -26,7 +26,7 @@ Delivery Service
**GET /api/1.2/deliveryservices**
- Retrieves all delivery services. See also `Using Traffic Ops - Delivery Service <http://traffic-control-cdn.net/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
+ Retrieves all delivery services. See also `Using Traffic Ops - Delivery Service <http://trafficcontrol.apache.org/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
Authentication Required: Yes
@@ -249,7 +249,7 @@ Delivery Service
**GET /api/1.2/deliveryservices/:id**
- Retrieves a specific delivery service. See also `Using Traffic Ops - Delivery Service <http://traffic-control-cdn.net/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
+ Retrieves a specific delivery service. See also `Using Traffic Ops - Delivery Service <http://trafficcontrol.apache.org/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
Authentication Required: Yes
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/25e8e2b0/docs/source/development/traffic_ops_api/v12/deliveryservice_stats.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/deliveryservice_stats.rst b/docs/source/development/traffic_ops_api/v12/deliveryservice_stats.rst
index 995c542..8d9dadb 100644
--- a/docs/source/development/traffic_ops_api/v12/deliveryservice_stats.rst
+++ b/docs/source/development/traffic_ops_api/v12/deliveryservice_stats.rst
@@ -26,7 +26,7 @@ Delivery Service Statistics
**GET /api/1.2/deliveryservice_stats.json**
- Retrieves statistics on the delivery services. See also `Using Traffic Ops - Delivery Service <http://traffic-control-cdn.net/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
+ Retrieves statistics on the delivery services. See also `Using Traffic Ops - Delivery Service <http://trafficcontrol.apache.org/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
Authentication Required: Yes
[4/4] incubator-trafficcontrol git commit: This closes #29
Posted by mi...@apache.org.
This closes #29
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/e4d36983
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/e4d36983
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/e4d36983
Branch: refs/heads/master
Commit: e4d369834920164aeec38a37020d2cf25995600d
Parents: 2a5406c
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Tue Nov 1 12:42:14 2016 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Tue Nov 1 12:42:14 2016 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/4] incubator-trafficcontrol git commit: Clean up references to old
repos and mailing lists
Posted by mi...@apache.org.
Clean up references to old repos and mailing lists
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/26358e62
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/26358e62
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/26358e62
Branch: refs/heads/master
Commit: 26358e622fc98548a4976d24f2cdf5846d88aeb7
Parents: 93bb2b9
Author: Eric Friedrich <ef...@cisco.com>
Authored: Mon Oct 31 21:39:48 2016 -0400
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Tue Nov 1 12:41:13 2016 -0600
----------------------------------------------------------------------
docs/source/admin/traffic_portal.rst | 2 +-
docs/source/admin/traffic_stats.rst | 4 ++--
docs/source/admin/traffic_vault.rst | 4 ++--
docs/source/conf.py | 8 ++++----
docs/source/development/traffic_ops.rst | 2 +-
docs/source/faq/development.rst | 2 +-
docs/source/faq/general.rst | 4 ++--
docs/source/overview/introduction.rst | 2 +-
8 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/26358e62/docs/source/admin/traffic_portal.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_portal.rst b/docs/source/admin/traffic_portal.rst
index 357db44..9e761b8 100644
--- a/docs/source/admin/traffic_portal.rst
+++ b/docs/source/admin/traffic_portal.rst
@@ -23,7 +23,7 @@ The following are requirements to ensure an accurate set up:
**Installing Traffic Portal**
- - Download the Traffic Portal RPM from the traffic control `downloads <http://traffic-control-cdn.net/downloads/index.html>`_ page or build from `source <https://github.com/Comcast/traffic_control/tree/master/traffic_portal/build>`_.
+ - Download the Traffic Portal RPM from the traffic control `downloads <https://trafficcontrol.apache.org/downloads/index.html>`_ page or build from `source <https://github.com/apache/incubator-trafficcontrol/traffic_portal/build>`_.
- Copy the Traffic Portal RPM to your server
- curl --silent --location https://rpm.nodesource.com/setup_6.x | sudo bash -
- sudo yum install -y nodejs
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/26358e62/docs/source/admin/traffic_stats.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_stats.rst b/docs/source/admin/traffic_stats.rst
index 0f58563..ae9d91b 100644
--- a/docs/source/admin/traffic_stats.rst
+++ b/docs/source/admin/traffic_stats.rst
@@ -24,7 +24,7 @@ Installation
**Installing Traffic Stats:**
- - Download the Traffic Stats RPM from the traffic control `downloads <http://traffic-control-cdn.net/downloads/index.html>`_ page.
+ - Download the Traffic Stats RPM from the traffic control `downloads <https://trafficcontrol.apache.org/downloads/index.html>`_ page.
- Copy the Traffic Stats RPM to your server
- sudo rpm -ivh <traffic_stats rpm>
@@ -88,7 +88,7 @@ Configuration
In order for Traffic Ops users to see Grafana graphs, Grafana will need to allow anonymous access. Information on how to configure anonymous access can be found on the configuration page of the `Grafana Website <http://docs.grafana.org/installation/configuration/#authanonymous>`_.
- Traffic Ops uses custom dashboards to display information about individual delivery services or cache groups. In order for the custom graphs to display correctly, the `traffic_ops_*.js <https://github.com/Comcast/traffic_control/blob/master/traffic_stats/grafana/>`_ files need to be in the ``/usr/share/grafana/public/dashboards/`` directory on the grafana server. If your Grafana server is the same as your Traffic Stats server the RPM install process will take care of putting the files in place. If your grafana server is different from your Traffic Stats server, you will need to manually copy the files to the correct directory.
+ Traffic Ops uses custom dashboards to display information about individual delivery services or cache groups. In order for the custom graphs to display correctly, the `traffic_ops_*.js <https://github.com/apache/incubator-trafficcontrol/blob/master/traffic_stats/grafana/>`_ files need to be in the ``/usr/share/grafana/public/dashboards/`` directory on the grafana server. If your Grafana server is the same as your Traffic Stats server the RPM install process will take care of putting the files in place. If your grafana server is different from your Traffic Stats server, you will need to manually copy the files to the correct directory.
More information on custom scripted graphs can be found in the `scripted dashboards <http://docs.grafana.org/reference/scripting/>`_ section of the Grafana documentation.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/26358e62/docs/source/admin/traffic_vault.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_vault.rst b/docs/source/admin/traffic_vault.rst
index 60dddef..35be160 100644
--- a/docs/source/admin/traffic_vault.rst
+++ b/docs/source/admin/traffic_vault.rst
@@ -170,7 +170,7 @@ One time configuration:
``riak-admin security grant riak_core.set_bucket on any to admin``
2. Add the search schema to Riak. This schema is a simple Apache Solr configuration file which will index all records on cdn, hostname, and deliveryservice.
- * Get the schema file by either cloning the project and going to `traffic_ops/app/config/misc/riak_search` or from `github <https://github.com/Comcast/traffic_control/tree/master/traffic_ops/app/conf/misc/riak_search>`_.
+ * Get the schema file by either cloning the project and going to `traffic_ops/app/config/misc/riak_search` or from `github <https://github.com/apache/incubator-trafficcontrol/tree/master/traffic_ops/app/conf/misc/riak_search>`_.
* Use curl to add the schema to riak: ``curl -kvs -XPUT "https://admin:pass@riakserver:8088/search/schema/sslkeys" -H 'Content-Type:application/xml' -d @sslkeys.xml``
3. Add search index to Riak
@@ -181,7 +181,7 @@ One time configuration:
Riak Search (using Apache Solr) will now index all NEW records that are added to the "ssl" bucket. The cdn, deliveryservice, and hostname fields are indexed and when a search is performed riak will return the indexed fields along with the crt and key values for a ssl record. In order to add the indexed fields to current records and to get the current records added, a standalone script needs to be run. The following explains how to run the script.
-1. Get script from github either by cloning the project and going to `traffic_ops/app/script` or from `here <https://github.com/Comcast/traffic_control/blob/master/traffic_ops/app/script/update_riak_for_search.pl>`_
+1. Get script from github either by cloning the project and going to `traffic_ops/app/script` or from `here <https://github.com/apache/incubator-trafficcontrol/blob/master/traffic_ops/app/script/update_riak_for_search.pl>`_
2. Run the script by performing the following command ``./update_riak_for_search.pl -to_url=https://traffic-ops.kabletown.net -to_un=user -to_pw=password``
Validate the search is working by querying against Riak directly:
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/26358e62/docs/source/conf.py
----------------------------------------------------------------------
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 9bb77f8..d98a734 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -202,7 +202,7 @@ latex_elements = {
# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, author, documentclass [howto/manual]).
latex_documents = [
- ('index', 'TrafficControl.tex', u'Traffic Control Documentation', 'Comcast Cable', 'manual'),
+ ('index', 'TrafficControl.tex', u'Traffic Control Documentation', 'Apache Software Foundation', 'manual'),
]
# The name of an image file (relative to this directory) to place at the top of
# the title page.
@@ -243,7 +243,7 @@ man_pages = [
# dir menu entry, description, category)
texinfo_documents = [
('index', 'Traffic Control', u'Traffic Control Documentation',
- u'Comcast Cable', 'Traffic Control', 'One line description of project.',
+ u'Apache Software Foundation', 'Traffic Control', 'One line description of project.',
'Miscellaneous'),
]
@@ -261,8 +261,8 @@ texinfo_documents = [
# Bibliographic Dublin Core info.
epub_title = u'Traffic Control'
-epub_author = u'Comcast Cable'
-epub_publisher = u'Comcast Cable'
+epub_author = u'Apache Software Foundation'
+epub_publisher = u'Apache Software Foundation'
# The language of the text. It defaults to the language option
# or en if the language is not set.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/26358e62/docs/source/development/traffic_ops.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops.rst b/docs/source/development/traffic_ops.rst
index aeebdb1..5ec31e4 100644
--- a/docs/source/development/traffic_ops.rst
+++ b/docs/source/development/traffic_ops.rst
@@ -163,7 +163,7 @@ Installing The Developer Environment
====================================
To install the Traffic Ops Developer environment:
-1. Clone the traffic_control repository from `github.com <https://github.com/Comcast/traffic_control>`_.
+1. Clone the traffic_control repository from `github.com <https://github.com/apache/incubator-trafficcontrol>`_.
2. Install the local dependencies using Carton (cpanfile).
::
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/26358e62/docs/source/faq/development.rst
----------------------------------------------------------------------
diff --git a/docs/source/faq/development.rst b/docs/source/faq/development.rst
index 025acfb..8518eeb 100644
--- a/docs/source/faq/development.rst
+++ b/docs/source/faq/development.rst
@@ -18,4 +18,4 @@ Development
How can I become involved?
==========================
- See our `CONTRIBUTING <https://github.com/Comcast/traffic_control/blob/master/CONTRIBUTING.md>`_ page.
\ No newline at end of file
+ See our `CONTRIBUTING <https://github.com/apache/incubator-trafficcontrol/blob/master/CONTRIBUTING.md>`_ page.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/26358e62/docs/source/faq/general.rst
----------------------------------------------------------------------
diff --git a/docs/source/faq/general.rst b/docs/source/faq/general.rst
index 2b4b1e9..747aa60 100644
--- a/docs/source/faq/general.rst
+++ b/docs/source/faq/general.rst
@@ -33,7 +33,7 @@ Who is using Traffic Control?
How do I get help with Traffic Control?
=======================================
- Hop on to our Slack Channel by filling out `this form <https://goo.gl/Suzakj>`_, or send a question to our google forum `here <https://groups.google.com/forum/#!forum/traffic_control>`_.
+ Hop on to our Slack Channel by filling out `this form <https://goo.gl/Suzakj>`_, or send a question to our mailing list `here <ma...@trafficcontrol.incubator.apache.org>`_.
What is Rascal?
===============
@@ -49,4 +49,4 @@ What is Twelve Monkeys?
What license is Traffic Control released under?
===============================================
- See the `LICENSE file <https://github.com/Comcast/traffic_control/blob/master/LICENSE>`_
+ See the `LICENSE file <https://github.com/apache/incubator-trafficcontrol/blob/master/LICENSE>`_
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/26358e62/docs/source/overview/introduction.rst
----------------------------------------------------------------------
diff --git a/docs/source/overview/introduction.rst b/docs/source/overview/introduction.rst
index a50e38d..a983820 100644
--- a/docs/source/overview/introduction.rst
+++ b/docs/source/overview/introduction.rst
@@ -17,7 +17,7 @@ Introduction
============
Traffic Control is a control plane for a CDN, which includes all of the components mentioned in the CDN Basics section, except for the Log File Analysis System. The caching software chosen for Traffic Control is `Apache Traffic Server <http://trafficserver.apache.org/>`_ (ATS). Although the current release only supports ATS as a cache, this may change with future releases.
-Traffic Control was first developed at Comcast for internal use and released to Open Source in April of 2015.
+Traffic Control was first developed at Comcast for internal use and released to Open Source in April of 2015. Traffic Control moved into the Apache Incubator in August of 2016.
Traffic Control implements the blue boxes in the architecture diagram below.