docs: Clean up development environment headings.

docs/brief-install-vagrant-dev.md

@@ -1,5 +1,4 @@
-Brief installation instructions for Vagrant development environment
--------------
+# Vagrant environment setup (in brief)
 
 Start by cloning this repository: `git clone https://github.com/zulip/zulip.git`
 

docs/dev-env-first-time-contributors.md

@@ -1,4 +1,4 @@
-## Development environment setup for first-time contributors
+## Vagrant environment setup tutorial
 
 This section guides first-time contributors through installing the Zulip dev
 environment on Windows 10, OS X El Capitan, Ubuntu 14.04, and Ubuntu 16.04.

docs/index.rst

@@ -64,9 +64,9 @@ Contents:
 
    dev-env-first-time-contributors
    brief-install-vagrant-dev
-   install-docker-dev
    install-ubuntu-without-vagrant-dev
    install-generic-unix-dev
+   install-docker-dev
    using-dev-environment
 
 .. _tutorial-docs:

docs/install-generic-unix-dev.md

@@ -1,5 +1,4 @@
-Installing manually on UNIX-based platforms
--------
+# Installing manually on UNIX
 
 * [Debian or Ubuntu systems](#on-debian-or-ubuntu-systems)
 * [Fedora 22 (experimental)](#on-fedora-22-experimental)

docs/install-ubuntu-without-vagrant-dev.md

@@ -1,21 +1,24 @@
-Installing on Ubuntu 14.04 Trusty without Vagrant
-----------------------------------
+# Installing directly on Ubuntu
+
 Start by cloning this repository: `git clone
 https://github.com/zulip/zulip.git`
 
-If you'd like to install a Zulip development environment on a server
-that's already running Ubuntu 14.04 Trusty, you can do that by just
-running:
+If you'd like to install a Zulip development environment on a computer
+that's already running Ubuntu 14.04 Trusty or Ubuntu 16.04 Xenial, you
+can do that by just running:
 
 ```
-sudo apt-get update
-python /srv/zulip/tools/provision.py
-
-cd /srv/zulip
+# From a clone of zulip.git
+./tools/provision.py
 source /srv/zulip-venv/bin/activate
-./tools/run-dev.py
+./tools/run-dev.py  # starts the development server
 ```
 
 Note that there is no supported uninstallation process without Vagrant
 (with Vagrant, you can just do `vagrant destroy` to clean up the
 development environment).
+
+Once you've done the above setup, you can pick up the [documentation
+on using the Zulip development
+environment](dev-env-first-time-contributors.html#step-4-developing),
+ignoring the parts about `vagrant` (since you're not using it).