Update links from tripleo.org to upstream docs

source/install/index.html.md

@@ -6,15 +6,15 @@ authors: cbrown ocf, dansmith, dneary, edmv, radez, rbowen, rlandy, slagle, snec
 
 # Installing and configuring RDO
 
-[← Docs](/documentation/)
+[← Use](/use/)
 
 For an initial test deployment, follow the [Packstack](/install/packstack) instructions. While using Packstack is sufficient as a proof of concept, there are other ways that you can use to deploy OpenStack with RDO. If you need to deploy a production-ready cloud, possibly with HA, see the [TripleO quickstart](/tripleo).
 
 <div class="splits">
 <div class="split-third with-more">
 ### Installation
 
-*   [TripleO quickstart](/tripleo) &ndash; production deployment, with HA
+*   [TripleO quickstart](https://docs.openstack.org/tripleo-quickstart/latest/) &ndash; production deployment, with HA
 *   [Packstack](/install/packstack) &ndash; proof of concept for single node
 *   [More information on Packstack](/documentation/packstack-cookbook/)
 *   [Manual Installation Tutorial](https://docs.openstack.org/install-guide/) &ndash; OpenStack upstream documentation

source/tripleo/index.html.md

@@ -1,42 +1,19 @@
 ---
-title: TripleO quickstart
-authors: athomas, hewbrocca, jcoufal, jistr, cbrown2, trown
+title: TripleO
 ---
 
-# <a name="qs">TripleO Quickstart</a>
+# <a name="qs">TripleOt</a>
 
-TripleO is an OpenStack Deployment & Management tool. It is developed upstream as the [OpenStack TripleO](http://tripleo.org/) project.
+TripleO is a set of tools for the deployment and management of OpenStack which utilizes the RDO repositories.
 
-There is an [Ansible-based](https://www.ansible.com/) project called [tripleo-quickstart](https://github.com/openstack/tripleo-quickstart) whose main goal is to quickly stand up TripleO environments.
+The name TripleO refers to three related things:
 
-You will need a host machine (referred to as `$VIRTHOST`) with at least 16GB of RAM, preferably 32GB, and you must be able to ssh to the `$VIRTHOST` machine as root without a password from the machine running Ansible. The `$VIRTHOST` machine must be running a recent Red Hat-based Linux distribution (such as CentOS 7 or RHEL 7, but only CentOS 7 is currently tested).
+*   A design pattern, where an underlying OpenStack instance is used to deploy and then to manage another, usually more complex, OpenStack instance.
+*   A set of configuration files and scripts which contain OS image building rules and service configuration rules
+*   The upstream program within the OpenStack project which develops the various scripts and utilities which are combined to deliver the complete software solution.
 
-A quick way to test that your `$VIRTHOST` machine is ready to rock is:
-
-    $ ssh root@$VIRTHOST uname -a
-
-The defaults are meant to *just work*, so it is as easy as downloading and running the `quickstart.sh` script.
-
-    $ curl -O https://raw.githubusercontent.com/openstack/tripleo-quickstart/master/quickstart.sh
-
-The `quickstart.sh` script will install this repo along with Ansible in a virtual environment and run the `quickstart` playbook. The script also has some dependencies that must be installed on the local system before it can run. You can install the necessary dependencies by running:
-
-```
-$ sudo bash quickstart.sh --install-deps
-```
-
-**Note:** The `quickstart` playbook will delete the ``stack`` user on the $VIRTHOST and recreate it:
-
-    $ export VIRTHOST='my_test_machine.example.com'
-    $ curl -O https://raw.githubusercontent.com/openstack/tripleo-quickstart/master/quickstart.sh
-    # To check available options for quickstart.sh, run:-
-    $ bash quickstart.sh --help
-    # To setup master release using tripleo-quickstart, run:-
-    $ bash quickstart.sh -R master --tags all $VIRTHOST
-
-This script will output instructions at the end to access the deployed undercloud. If a release name is not given, newton release name is used. Further documentation about TripleO Quickstart is available from the [TripleO Quickstart Documentation](https://docs.openstack.org/developer/tripleo-quickstart/).
-
-## <a name="reading">Further reading</a>
+The design pattern utilizes a single-purpose deployment OpenStack which deploys and manages a more sophisticated, general-purpose OpenStack instance which is what
+gies TripleO its name. TripleO is short for *OpenStack On OpenStack*.
 
 Upstream TripleO documentation:
 
@@ -48,11 +25,6 @@ TripleO YouTube channel:
 
 * [TripleO YouTube Channel](https://www.youtube.com/channel/UCNGDxZGwUELpgaBoLvABsTA/)
 
-## <a name="presentations">Presentations</a>
-
-tripleo-quickstart demo (March 9, 2016):
-
-*   [tripleo-quickstart tag based breakpoint demo](https://www.youtube.com/watch?v=4O8KvC66eeU)
 
 ## Get in touch
 

source/use/index.html.md

@@ -15,8 +15,8 @@ Since RDO sticks closely to the upstream OpenStack project, the documentation at
 
 ## Getting started
 
-* [TripleO](http://tripleo.org/install/) – Deploy a production cloud
-* [TripleO quickstart](/tripleo) – Develop and Test OpenStack
+* [TripleO](https://docs.openstack.org/tripleo-docs) – Deploy a production cloud
+* [TripleO quickstart](https://docs.openstack.org/tripleo-quickstart/latest/) – Develop and Test OpenStack
 * [Packstack](/install/packstack) – Spin up an all-in-one concept cloud
 
 </div>