Merge branch '1437-package-update'

ckan · Jan 20, 2014 · 6233740 · 6233740
2 parents 116ec3d + b5b7510
commit 6233740
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/doc/install-from-package.rst b/doc/install-from-package.rst
@@ -92,8 +92,17 @@ CKAN:
 #. Also optionally, you can enable file uploads by following the
    instructions in :doc:`filestore`.
 
+---------------------------
+3. Restart Apache and Nginx
+---------------------------
+
+Restart Apache and Nginx by running this command in a terminal::
+
+    sudo service apache2 restart
+    sudo service nginx restart
+
 ---------------
-3. You're done!
+4. You're done!
 ---------------
 
 Open http://localhost in your web browser. You should see the CKAN front

diff --git a/doc/upgrade-package-to-minor-release.rst b/doc/upgrade-package-to-minor-release.rst
@@ -46,10 +46,10 @@ respectively.
    .. note::
 
      The install process will uninstall any existing CKAN extensions or other
-     libraries located in the ``src`` directory of the CKAN virtualenv. To 
+     libraries located in the ``src`` directory of the CKAN virtualenv. To
      enable them again, the installation process will iterate over all folders in
      the ``src`` directory, reinstall the requirements listed in
-     ``pip-requirements.txt`` and ``requirements.txt`` files and run 
+     ``pip-requirements.txt`` and ``requirements.txt`` files and run
      ``python setup.py develop`` for each. If you are using a custom extension
      which does not use this requirements file name or is located elsewhere,
      you will need to manually reinstall it.
@@ -96,8 +96,9 @@ respectively.
    See :ref:`rebuild search index` for details of the
    ``ckan search-index rebuild`` command.
 
-#. Finally, restart Apache:
+#. Finally, restart Apache and Nginx:
 
    .. parsed-literal::
 
     |restart_apache|
+    sudo service nginx restart
diff --git a/doc/upgrade-package-to-patch-release.rst b/doc/upgrade-package-to-patch-release.rst
@@ -77,11 +77,12 @@ minor release they belong to, so for example CKAN ``2.0``, ``2.0.1``,
       These are due to vdm not longer being installed from source. You can
       ignore them and delete the folder manually if you want.
 
-#. Finally, restart Apache:
+#. Finally, restart Apache and Nginx:
 
    .. parsed-literal::
 
     |restart_apache|
+    sudo service nginx restart
 
 #. You're done!