[1.11.x] Corrected doc'd type of some parameters from string to str.

Backport of d63c00a4283ce85622ec00c6f668630078c75817 from master

docs/ref/contrib/gis/geos.txt

@@ -932,7 +932,7 @@ Geometry Factories
 .. function:: fromstr(string, srid=None)
 
     :param string: string that contains spatial data
-    :type string: string
+    :type string: str
     :param srid: spatial reference identifier
     :type srid: int
     :rtype: a :class:`GEOSGeometry` corresponding to the spatial data in the string

docs/ref/urls.txt

@@ -74,14 +74,14 @@ parameter is useful.
 
     :arg module: URLconf module (or module name)
     :arg namespace: Instance namespace for the URL entries being included
-    :type namespace: string
+    :type namespace: str
     :arg app_name: Application namespace for the URL entries being included
-    :type app_name: string
+    :type app_name: str
     :arg pattern_list: Iterable of :func:`django.conf.urls.url` instances
     :arg app_namespace: Application namespace for the URL entries being included
-    :type app_namespace: string
+    :type app_namespace: str
     :arg instance_namespace: Instance namespace for the URL entries being included
-    :type instance_namespace: string
+    :type instance_namespace: str
 
 See :ref:`including-other-urlconfs` and :ref:`namespaces-and-include`.