From a596793a9a0ab02037e68714a04715070437f016 Mon Sep 17 00:00:00 2001
From: kevgliss <kevgliss@gmail.com>
Date: Tue, 22 Sep 2015 14:18:38 -0700
Subject: [PATCH 1/2] clearing up docs based on feedback

---
 docs/quickstart/index.rst | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/docs/quickstart/index.rst b/docs/quickstart/index.rst
index 95bd438d..ab856150 100644
--- a/docs/quickstart/index.rst
+++ b/docs/quickstart/index.rst
@@ -61,11 +61,18 @@ Installing from Source
 
 If you're installing the Lemur source (e.g. from git), you'll also need to install **npm**.
 
-Once your system is prepared, symlink your source into the virtualenv:
+Once your system is prepared, ensure that your in the virtualenv:
 
 .. code-block:: bash
 
-  $ make develop
+  $ which python
+
+
+And then run:
+
+.. code-block:: bash
+
+  $ python setup.py install
 
 .. Note:: This command will install npm dependencies as well as compile static assets.
 
@@ -154,8 +161,8 @@ Setup a Reverse Proxy
 ---------------------
 
 By default, Lemur runs on port 5000. Even if you change this, under normal conditions you won't be able to bind to
-port 80. To get around this (and to avoid running Lemur as a privileged user, which you shouldn't), we recommend
-you setup a simple web proxy.
+port 80. To get around this (and to avoid running Lemur as a privileged user, which you shouldn't), we need setup a
+simple web proxy. There are many different web servers you can use for this, we like and recommend Nginx.
 
 Proxying with Nginx
 ~~~~~~~~~~~~~~~~~~~

From 1559727f2d364dfe2ee2e3449e0dc51efd5489e9 Mon Sep 17 00:00:00 2001
From: kevgliss <kevgliss@gmail.com>
Date: Tue, 22 Sep 2015 14:49:37 -0700
Subject: [PATCH 2/2] Making make build the static assets

---
 Makefile                  | 2 ++
 docs/quickstart/index.rst | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 03369342..4c2067d2 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,8 @@ develop: update-submodules setup-git
 	pip install -e .
 	pip install "file://`pwd`#egg=lemur[dev]"
 	pip install "file://`pwd`#egg=lemur[tests]"
+	node_modules/.bin/gulp build
+	node_modules/.bin/gulp package
 	@echo ""
 
 dev-docs:
diff --git a/docs/quickstart/index.rst b/docs/quickstart/index.rst
index ab856150..0b4ba4a1 100644
--- a/docs/quickstart/index.rst
+++ b/docs/quickstart/index.rst
@@ -72,7 +72,7 @@ And then run:
 
 .. code-block:: bash
 
-  $ python setup.py install
+  $ make develop
 
 .. Note:: This command will install npm dependencies as well as compile static assets.