Bug 1045090 - Fix docs to reflect dependency on ui repo in default configuration; r=mdoglio

docs/installation.rst

@@ -1,10 +1,16 @@
 Installation
 ================
 
-* Clone the `project repo`_ on Github
+* Clone the `treeherder-service repo`_ from Github.
 
 * Install Virtualbox_ and Vagrant_ if not present.
 
+* Either follow the :doc:`ui_integration` steps, or comment out this line in the Vagrantfile:
+
+  .. code-block:: ruby
+     
+     config.vm.synced_folder "../treeherder-ui", "/home/vagrant/treeherder-ui", type: "nfs"
+
 * Open a shell, cd into the root of the project you just cloned and type
 
   .. code-block:: bash
@@ -89,6 +95,6 @@ Installation
 
 
 
-.. _project repo: https://github.com/mozilla/treeherder-service
+.. _treeherder-service repo: https://github.com/mozilla/treeherder-service
 .. _Vagrant: https://www.vagrantup.com
 .. _Virtualbox: https://www.virtualbox.org

docs/ui_integration.rst

@@ -2,16 +2,19 @@ Integrating the ui
 ==================
 
 If you want to develop both the ui and the service side by side it may be convenient to load the ui in the vagrant environment.
-To do so, uncomment this line in the Vagrantfile
 
-  .. code-block:: ruby
+* Make sure the `treeherder-ui repo`_ is cloned in the same parent folder as treeherder-service (and with the directory name 'treeherder-ui').
-     
-     #config.vm.share_folder("treeherder-ui", "/home/vagrant/treeherder-ui", "../treeherder-ui/", :nfs => nfs)
 
-Make sure treeherder-ui is cloned in the same folder as treeherder-service (same parent folder) and reload you vagrant environment with
+* If you previously commented out the treeherder-ui line in the Vagrantfile as part of the :doc:`installation` instructions, undo that now.
+
+* If you have an existing Vagrant environment set up, you will need to reload it using:
 
   .. code-block:: bash
      
      >vagrant reload
 
 You should now be able to access the ui on http://local.treeherder.mozilla.org/ui/
+
+
+
+.. _treeherder-ui repo: https://github.com/mozilla/treeherder-ui