docs(*): refactor and reorganize

Reorganize the docs to make more sense for users.

Author: carmstrong

README.md

@@ -15,7 +15,7 @@ Trying out Deis? Continue following these instructions for a local cluster setup
 
 # Upgrading Deis
 
-Upgrading from a previous Deis release? See [Upgrading Deis](http://docs.deis.io/en/latest/operations/upgrading-deis/) for additional information.
+Upgrading from a previous Deis release? See [Upgrading Deis](http://docs.deis.io/en/latest/installing_deis/upgrading-deis/) for additional information.
 
 ## Install prerequisites
 On your workstation:
@@ -72,7 +72,7 @@ Use `make run` to start all Deis containers and attach to their log output. This
 $ make run
 ```
 
-Your Vagrant VM is accessible at `local.deisapp.com` (or `local3.deisapp.com`/`local5.deisapp.com`). For clusters on other platforms (EC2, Rackspace, bare metal, etc.), see our guide to [Configuring DNS](http://docs.deis.io/en/latest/operations/configure-dns/).
+Your Vagrant VM is accessible at `local.deisapp.com` (or `local3.deisapp.com`/`local5.deisapp.com`). For clusters on other platforms (EC2, Rackspace, bare metal, etc.), see our guide to [Configuring DNS](http://docs.deis.io/en/latest/installing_deis/configure-dns/).
 
 ## Testing the cluster
 Integration tests and corresponding documentation can be found under the `test/` folder.

client/README.rst

@@ -129,11 +129,11 @@ version of the Deis client for Mac OS X, Windows, or Debian Linux:
 
 To learn more, use ``deis help`` or browse `the documentation`_.
 
-.. _`Install the Client`: http://docs.deis.io/en/latest/developer/install-client/
+.. _`Install the Client`: http://docs.deis.io/en/latest/using_deis/install-client/
 .. _`Python`: http://www.python.org/
-.. _`Register a User`: http://docs.deis.io/en/latest/developer/register-user/
-.. _`Deploy an Application`: http://docs.deis.io/en/latest/developer/deploy-application/
-.. _`Manage an Application`: http://docs.deis.io/en/latest/developer/manage-application/
+.. _`Register a User`: http://docs.deis.io/en/latest/using_deis/register-user/
+.. _`Deploy an Application`: http://docs.deis.io/en/latest/using_deis/deploy-application/
+.. _`Manage an Application`: http://docs.deis.io/en/latest/using_deis/manage-application/
 .. _`the documentation`: http://docs.deis.io/
 
 

contrib/ec2/README.md

@@ -84,7 +84,7 @@ The script will deploy Deis and make sure the services start properly.
 
 ## Configure DNS
 While you can reference the controller and hosted applications with public hostnames provided by EC2, it is recommended for ease-of-use that
-you configure your own DNS records using a domain you own. See [Configuring DNS](http://docs.deis.io/en/latest/operations/configure-dns/) for details.
+you configure your own DNS records using a domain you own. See [Configuring DNS](http://docs.deis.io/en/latest/installing_deis/configure-dns/) for details.
 
 ## Use Deis!
 After that, register with Deis!

contrib/rackspace/README.md

@@ -70,7 +70,7 @@ $ cd ../.. && make run
 The script will deploy Deis and make sure the services start properly.
 
 ### Configure DNS
-You'll need to configure DNS records so you can access applications hosted on Deis. See [Configuring DNS](http://docs.deis.io/en/latest/operations/configure-dns/) for details.
+You'll need to configure DNS records so you can access applications hosted on Deis. See [Configuring DNS](http://docs.deis.io/en/latest/installing_deis/configure-dns/) for details.
 
 ### Use Deis!
 After that, register with Deis!

controller/web/static/css/main.css

@@ -2,37 +2,31 @@
 $('.toctree-l1 > a:contains("Releases")').siblings().remove();
 
 //Check URL
-var path = window.location.href;
-var pathName = path.split('/');
-var num = pathName.length - 3;
+var path = window.location.pathname.split('/');
+var cleanedPath = $.grep(path,function(n){ return(n) });
 
-switch(pathName[num]) {
-  case 'gettingstarted':
-    $('.toctree-l1 > a:contains("Getting Started")').attr('state', 'open');
+// the second to last path segment is the section
+switch(cleanedPath[cleanedPath.length-2]) {
+  case 'understanding_deis':
+    $('.toctree-l1 > a:contains("Understanding Deis")').attr('state', 'open');
     break;
-  case 'installation':
-    $('.toctree-l1 > a:contains("Installation")').attr('state', 'open');
+  case 'installing_deis':
+    $('.toctree-l1 > a:contains("Installing Deis")').attr('state', 'open');
     break;
-  case 'operations':
-    $('.toctree-l1 > a:contains("Operations")').attr('state', 'open');
+  case 'using_deis':
+    $('.toctree-l1 > a:contains("Using Deis")').attr('state', 'open');
     break;
-  case 'developer':
-    $('.toctree-l1 > a:contains("Developer")').attr('state', 'open');
-    break;
-  case 'components':
-    $('.toctree-l1 > a:contains("Components")').attr('state', 'open');
-    break;
-  case 'topologies':
-    $('.toctree-l1 > a:contains("Topologies")').attr('state', 'open');
+  case 'managing_deis':
+    $('.toctree-l1 > a:contains("Managing Deis")').attr('state', 'open');
     break;
   case 'contributing':
     $('.toctree-l1 > a:contains("Contributing")').attr('state', 'open');
     break;
+  case 'reference':
   case 'client':
-    $('.toctree-l1 > a:contains("Client Reference")').attr('state', 'open');
-    break;
   case 'server':
-    $('.toctree-l1 > a:contains("Server Reference")').attr('state', 'open');
+  case 'terms':
+    $('.toctree-l1 > a:contains("Reference Guide")').attr('state', 'open');
     break;
   default:
     $('.toctree-l1 > a:contains("Version")').attr('state', 'close');

controller/web/static/js/checkURL.js

@@ -31,6 +31,9 @@ dirhtml:
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
 
+auto: dirhtml
+	sphinx-autobuild -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
 	@echo "  html       to make standalone HTML files"

docs/Makefile

@@ -8,7 +8,7 @@ Contributing
 :Date: |today|
 
 .. toctree::
-    :maxdepth: 1
+
 
     overview
     localdev

docs/contributing/index.rst

@@ -153,7 +153,7 @@ access using:
 
 
 Your local development environment is running! Follow the
-rest of the :ref:`Developer Guide <developer>` to deploy your first application.
+rest of the `_using_deis` guide to deploy your first application.
 
 Test Your Changes
 -----------------

docs/contributing/localdev.rst

@@ -3,24 +3,13 @@
 
 Welcome
 =======
-Deis is a lightweight, flexible and powerful open source PaaS. Building
-on Docker and CoreOS, Deis provides a familiar, Heroku-inspired workflow
-using efficient containerization, on your cloud or hardware.
-Your PaaS. Your Rules.
+Deis (pronounced DAY-iss) is an open source PaaS that makes it easy to deploy and manage applications
+on your own servers. Deis builds upon Docker and CoreOS to provide a lightweight PaaS with a
+Heroku-inspired workflow.
 
-.. image:: ../controller/web/static/img/deis-graphic.png
-    :alt: Deis cover logo
-
-If you are new to Deis, start with :ref:`Concepts` and basic
-:ref:`Usage` of the command-line client. Follow the
-:ref:`Developer Guide <developer>` to learn how to deploy and scale
-your own application. The :ref:`Operations Guide <operations>` will
-walk you through provisioning and managing Deis itself.
+To get started with Deis, first read :ref:`Understanding Deis <understanding_deis>`.
 
-So how does it work? Read about the overall :ref:`architecture` and
-individual :ref:`components`, or search the API reference for the
-:ref:`Client <client>` and :ref:`Server <server>`.
+The full documentation tree can be seen `here </toctree/>`_.
 
-Interested in contributing to the Deis project? Check out our
-:ref:`Local Development <localdev>` instructions
-and :ref:`Contributor Overview <contributor>`.
+.. image:: ../controller/web/static/img/deis-graphic.png
+    :alt: Deis cover logo