From 83e7bf4f8e4eb7a2327824a5ef55764cf448393c Mon Sep 17 00:00:00 2001
From: "Joseph M. Koning" <koning1@llnl.gov>
Date: Fri, 22 Nov 2019 12:13:57 -0800
Subject: [PATCH] Update the docs with the current spack build instructions.

---
 docs/source/spack.rst | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/docs/source/spack.rst b/docs/source/spack.rst
index 9701c55b8..c85ea959c 100644
--- a/docs/source/spack.rst
+++ b/docs/source/spack.rst
@@ -9,16 +9,6 @@ Merlin will then be installed in this specific version allowing for
 multiple python versions on a single system without the need for a
 virtualenv. The py-merlinwf package builds with python3.6+.
 
-Checkout merlin spack repo
-**************************
-
-
-Get the latest version of merlin.spack from github.
-
-::
-
-  git clone https://github.com/LLNL/merlin.spack.git
-
 
 Checkout spack
 **************
@@ -32,6 +22,16 @@ make sure merlin and spack are in separate directories.
   git clone https://github.com/spack/spack.git
 
 
+The merlin addition to spack is currently in pull requests, you can clone a 
+branch that has all of the PR changes here:
+
+.. code:: bash
+
+  git clone https://github.com/koning/spack.git
+  cd spack
+  git checkout feature/koning/merlinwf
+
+
 Setup spack
 ***********
 
@@ -57,18 +57,12 @@ To see the compilers.
 
     spack compiler list
 
-Add the merlin.spack repo to spack (done once):
-
-.. code:: bash
-
-    spack repo add <path>/<to>/merlin.spack
-
 
 Build merlin
 ************
 
-Build merlin, this will take a *long* time, be prepared to wait.  It is going
-to build python and everything python needs including numpy.
+Build merlin, this will take a *long* time, be prepared to wait.  It will
+build python and all python modules merlin needs including numpy.
 
 .. code:: bash