Author: claudep
Date: 2012-03-19 13:44:51 -0700 (Mon, 19 Mar 2012)
New Revision: 17768

Modified:
   django/trunk/docs/ref/contrib/gis/install.txt
Log:
Fixed #17893 -- Added GeoDjango installation instructions for Ubuntu 11.10. 
Thanks jpaulett for the patch.

Modified: django/trunk/docs/ref/contrib/gis/install.txt
===================================================================
--- django/trunk/docs/ref/contrib/gis/install.txt       2012-03-19 12:52:15 UTC 
(rev 17767)
+++ django/trunk/docs/ref/contrib/gis/install.txt       2012-03-19 20:44:51 UTC 
(rev 17768)
@@ -972,15 +972,27 @@
 Ubuntu
 ^^^^^^
 
+11.10
+~~~~~
+
+In Ubuntu 11.10, PostgreSQL was upgraded to 9.1. The installation commands are:
+
+.. code-block:: bash
+
+    $ sudo apt-get install binutils gdal-bin libproj-dev 
postgresql-9.1-postgis \
+         postgresql-server-dev-9.1 python-psycopg2
+
 .. _ubuntu10:
 
-10.04 and 10.10
-~~~~~~~~~~~~~~~
+10.04 through 11.04
+~~~~~~~~~~~~~~~~~~~
 
-In Ubuntu 10 PostgreSQL was upgraded to 8.4 and GDAL was upgraded to 1.6.
+In Ubuntu 10.04, PostgreSQL was upgraded to 8.4 and GDAL was upgraded to 1.6.
 Ubuntu 10.04 uses PostGIS 1.4, while Ubuntu 10.10 uses PostGIS 1.5 (with
-geography support).  The installation commands are::
+geography support).  The installation commands are:
 
+.. code-block:: bash
+
     $ sudo apt-get install binutils gdal-bin libproj-dev 
postgresql-8.4-postgis \
          postgresql-server-dev-8.4 python-psycopg2
 
@@ -989,8 +1001,10 @@
 8.10
 ~~~~
 
-Use the synaptic package manager to install the following packages::
+Use the synaptic package manager to install the following packages:
 
+.. code-block:: bash
+
     $ sudo apt-get install binutils gdal-bin postgresql-8.3-postgis \
         postgresql-server-dev-8.3 python-psycopg2
 
@@ -1018,8 +1032,10 @@
     geographic admin because the ``null`` datum grid is not available for
     transforming geometries to the spherical mercator projection. A solution
     is to download the datum-shifting files, create the grid file, and
-    install it yourself::
+    install it yourself:
 
+    .. code-block:: bash
+
         $ wget http://download.osgeo.org/proj/proj-datumgrid-1.4.tar.gz
         $ mkdir nad
         $ cd nad
@@ -1059,8 +1075,10 @@
 Binary packages
 ~~~~~~~~~~~~~~~
 The following command will install acceptable binary packages, as well as
-the development tools necessary to build the rest of the requirements::
+the development tools necessary to build the rest of the requirements:
 
+.. code-block:: bash
+
     $ sudo apt-get install binutils bzip2 gcc g++ flex make postgresql-8.1 \
         postgresql-server-dev-8.1 python-ctypes python-psycopg2 
python-setuptools
 
@@ -1090,8 +1108,10 @@
 ^^^^^^^^^^^
 
 This version is comparable to Ubuntu :ref:`ibex`, so the command
-is very similar::
+is very similar:
 
+.. code-block:: bash
+
     $ sudo apt-get install binutils libgdal1-1.5.0 postgresql-8.3 \
         postgresql-8.3-postgis postgresql-server-dev-8.3 \
         python-psycopg2 python-setuptools
@@ -1111,8 +1131,10 @@
 ~~~~~~~~~~~~~~~~~~~~~~~
 
 If the PostgreSQL database cluster was not initiated after installing, then it
-can be created (and started) with the following command::
+can be created (and started) with the following command:
 
+.. code-block:: bash
+
     $ sudo pg_createcluster --start 8.3 main
 
 Afterwards, the ``/etc/init.d/postgresql-8.3`` script should be used to manage
@@ -1121,8 +1143,10 @@
 In addition, the SQL files for PostGIS are placed in a different location on
 Debian 5.0 . Thus when :ref:`spatialdb_template` either:
 
-* Create a symbolic link to these files::
+* Create a symbolic link to these files:
 
+.. code-block:: bash
+
     $ sudo ln -s 
/usr/share/postgresql-8.3-postgis/{lwpostgis,spatial_ref_sys}.sql \
         /usr/share/postgresql/8.3
 

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com.
To unsubscribe from this group, send email to 
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to