[cig-commits] r16311 - cs/portal/trunk/doc/admin

[leif at geodynamics.org]

Author: leif
Date: 2010-02-22 15:19:23 -0800 (Mon, 22 Feb 2010)
New Revision: 16311

Modified:
   cs/portal/trunk/doc/admin/deps.rst
   cs/portal/trunk/doc/admin/quick.rst
Log:
These are minor changes I made while Luis was moving the Django app to
the main server (I neglected to mention ImageMagic).


Modified: cs/portal/trunk/doc/admin/deps.rst
===================================================================
--- cs/portal/trunk/doc/admin/deps.rst	2010-02-22 23:17:53 UTC (rev 16310)
+++ cs/portal/trunk/doc/admin/deps.rst	2010-02-22 23:19:23 UTC (rev 16311)
@@ -10,10 +10,11 @@
 
 * Python v2.4 or later (but not Python v3.0)
 * Django v0.96 (v1.0 and later will not work)
-* pysqlite
-    + SQLite
+    + pysqlite
+        - SQLite
 * GMT
     + netCDF
+* `ImageMagic http://www.imagemagick.org/`_
 
 Note that both Python v3.0 and Django v1.0 are dramatically different from prior versions (they are not backwards compatible).  Consequently, the portal does not work with Python v3.0 or Django v1.0.
 

Modified: cs/portal/trunk/doc/admin/quick.rst
===================================================================
--- cs/portal/trunk/doc/admin/quick.rst	2010-02-22 23:17:53 UTC (rev 16310)
+++ cs/portal/trunk/doc/admin/quick.rst	2010-02-22 23:19:23 UTC (rev 16311)
@@ -18,6 +18,7 @@
 * `Python <http://python.org/>`_ v2.5 [#sqlite]_ or later (but not Python v3.0).
 * `Django <http://www.djangoproject.com/>`_ v0.96 (v1.0 and later will not work)
 * `GMT <http://gmt.soest.hawaii.edu/>`_; and the `netCDF <http://www.unidata.ucar.edu/software/netcdf/>`_ package upon which GMT depends (these two are optional for the impatient)
+* `ImageMagic http://www.imagemagick.org/`_
 
 See :ref:`web-app-dependencies` for more information.
 
@@ -99,7 +100,7 @@
     $ export PATH=$HOME/portal/bin:$PATH
     $ export PYTHONPATH=$HOME/lib/python2.6/site-packages
 
-In any event, a handful of environment variables must be set in order to configure Django to run the portal, and to configure the portal app itself.  `The top-level source directory <http://geodynamics.org/svn/cig/cs/portal/trunk/northridge/>`_ contains ``debug-setup.sh``, `a Bash shell script <http://geodynamics.org/svn/cig/cs/portal/trunk/northridge/debug-setup.sh>`_ which sets all of the variables described below.  If you installed GMT and netCDF, first customize ``WEBPORTAL_GMT_ROOT`` and ``WEBPORTAL_NETCDF_ROOT``.  Then simply enter a scratch directory and source the script::
+In any event, a handful of environment variables must be set in order to configure Django to run the portal, and to configure the portal app itself.  `The top-level source directory <http://geodynamics.org/svn/cig/cs/portal/trunk/northridge/>`_ contains ``debug-setup.sh``, `a Bash shell script <http://geodynamics.org/svn/cig/cs/portal/trunk/northridge/debug-setup.sh>`_ which sets all of the required variables.  If you installed GMT and netCDF, first customize ``WEBPORTAL_GMT_ROOT`` and ``WEBPORTAL_NETCDF_ROOT``.  Then simply enter a scratch directory and source the script::
 
         $ mkdir $HOME/scratch
         $ cd $HOME/scratch