Ticket #13267: gis_tutorial_update.diff

docs/ref/contrib/gis/tutorial.txt

@@ -342 +342 @@
 Now, the world borders shapefile may be opened using GeoDjango's 
 :class:`~django.contrib.gis.gdal.DataSource` interface::
 
-    >>> from django.contrib.gis.gdal import *
+    >>> from django.contrib.gis.gdal.datasource import DataSource
     >>> ds = DataSource(world_shp)
     >>> print ds
     / ... /geodjango/world/data/TM_WORLD_BORDERS-0.3.shp (ESRI Shapefile)
@@ -459 +459 @@
         'subregion' : 'SUBREGION',
         'lon' : 'LON',
         'lat' : 'LAT',
-        'mpoly' : 'MULTIPOLYGON',
+        'geom' : 'MULTIPOLYGON',
     }
 
     world_shp = os.path.abspath(os.path.join(os.path.dirname(__file__), 'data/TM_WORLD_BORDERS-0.3.shp'))
@@ -468 +468 @@
         lm = LayerMapping(WorldBorders, world_shp, world_mapping, 
                           transform=False, encoding='iso-8859-1')
 
-        lm.save(strict=True, verbose=verbose)
+        lm.save(strict=True, verbose=True)
 
 A few notes about what's going on: