From 20a24c23f7833ff2aad1e8bc3aa56ebfa087f9ca Mon Sep 17 00:00:00 2001
From: David Read <david.read@hackneyworkshop.com>
Date: Thu, 15 Feb 2018 12:37:22 +0000
Subject: [PATCH] [#4020] Move the who.ini step to be before the "paster db
 init" step.

---
 .../installing/install-from-source.rst        | 43 +++++++++----------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/doc/maintaining/installing/install-from-source.rst b/doc/maintaining/installing/install-from-source.rst
index e12a974d436..72ae97d1fea 100644
--- a/doc/maintaining/installing/install-from-source.rst
+++ b/doc/maintaining/installing/install-from-source.rst
@@ -106,13 +106,13 @@ b. Install the recommended ``setuptools`` version:
 
 c. Install the CKAN source code into your virtualenv.
    .. important::
-   
+
        For the following commands, make sure you are in your CKAN default directory. E.g.
-    
+
       .. parsed-literal::
-      
+
          cd /usr/lib/ckan/default/
-   
+
    To install the latest stable release of CKAN (CKAN |latest_release_version|),
    run:
 
@@ -129,14 +129,14 @@ c. Install the CKAN source code into your virtualenv.
        pip install -e 'git+\ |git_url|\#egg=ckan'
 
    .. tip::
-      
+
       If you would like to work submit a pull request with your changes, be sure you are working from a cloned repository.
       Use your personal repository URL instead of the CKAN repository. E.g.
-      
+
       .. parsed-literal::
-         
+
          pip install -e 'git=https://github.com/{your-username}/ckan.git#egg=ckan'
-   
+
    .. warning::
 
       The development version may contain bugs and should not be used for
@@ -235,8 +235,19 @@ site_url
 
 .. _postgres-init:
 
+----------------------
+6. Link to ``who.ini``
+----------------------
+
+``who.ini`` (the Repoze.who configuration file) needs to be accessible in the
+same directory as your CKAN config file, so create a symlink to it:
+
+.. parsed-literal::
+
+    ln -s |virtualenv|/src/ckan/who.ini |config_dir|/who.ini
+
 -------------------------
-6. Create database tables
+7. Create database tables
 -------------------------
 
 Now that you have a configuration file that has the correct settings for your
@@ -256,7 +267,7 @@ You should see ``Initialising DB: SUCCESS``.
     See `4. Create a CKAN config file`_.
 
 -----------------------
-7. Set up the DataStore
+8. Set up the DataStore
 -----------------------
 
 .. note ::
@@ -268,17 +279,6 @@ Follow the instructions in :doc:`/maintaining/datastore` to create the required
 databases and users, set the right permissions and set the appropriate values
 in your CKAN config file.
 
-----------------------
-8. Link to ``who.ini``
-----------------------
-
-``who.ini`` (the Repoze.who configuration file) needs to be accessible in the
-same directory as your CKAN config file, so create a symlink to it:
-
-.. parsed-literal::
-
-    ln -s |virtualenv|/src/ckan/who.ini |config_dir|/who.ini
-
 ---------------
 9. You're done!
 ---------------
@@ -380,4 +380,3 @@ This is seen occasionally with Jetty and Ubuntu 14.04. It requires a solr-jetty
     wget https://launchpad.net/~vshn/+archive/ubuntu/solr/+files/solr-jetty-jsp-fix_1.0.2_all.deb
     sudo dpkg -i solr-jetty-jsp-fix_1.0.2_all.deb
     sudo service jetty restart
-