Merge pull request SciTools#1123 from QuLogic/doc-typos

DOC: Fix some minor issues
shiweihappy · Sep 25, 2018 · 19cfbde · 19cfbde
2 parents 7321e9a + 6da3731
commit 19cfbde
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -345,7 +345,7 @@
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {'python': ('https://docs.python.org/3', None),
                        'matplotlib': ('https://matplotlib.org', None),
-                       'shapely': ('https://toblerity.org/shapely', None), }
+                       'shapely': ('http://toblerity.org/shapely', None), }
 
 
 

diff --git a/docs/source/whats_new.rst b/docs/source/whats_new.rst
@@ -7,11 +7,11 @@ What's New in cartopy 0.17
 Features
 --------
 * The :class:`cartopy.feature.NaturalEarthFeature` class now allows a
-:class:`cartopy.feature.AdaptiveScaler` object to be passed as the `scale`
-argument. This will automatically choose the appropriate feature scale from
-the GeoAxes extent. This can also be used interactively while panning and
-zooming in a figure. :data:`cartopy.feature.NaturalEarthFeature.scale` is
-now read-only. (:pull:`1102`, :pull:`983`)
+  :class:`cartopy.feature.AdaptiveScaler` object to be passed as the `scale`
+  argument. This will automatically choose the appropriate feature scale from
+  the GeoAxes extent. This can also be used interactively while panning and
+  zooming in a figure. :data:`cartopy.feature.NaturalEarthFeature.scale` is
+  now read-only. (:pull:`1102`, :pull:`983`)
 
 --------
 

diff --git a/lib/cartopy/crs.py b/lib/cartopy/crs.py
@@ -969,6 +969,8 @@ def __init__(self, central_longitude=0.0,
         scale_factor: optional
             Scale factor at natural origin. Defaults to unused.
 
+        Notes
+        -----
         Only one of ``latitude_true_scale`` and ``scale_factor`` should
         be included.
         """

diff --git a/lib/cartopy/io/img_tiles.py b/lib/cartopy/io/img_tiles.py
@@ -59,8 +59,8 @@ def __init__(self, desired_tile_form='RGB', style="street",
             'satellite', 'terrain', and 'only_streets'.  Defaults to 'street'.
         url: optional
             URL pointing to a tile source and containing {x}, {y}, and {z}.
-            Such as: ('https://server.arcgisonline.com/ArcGIS/rest/services/'
-            'World_Shaded_Relief/MapServer/tile/{z}/{y}/{x}.jpg')
+            Such as: ``'https://server.arcgisonline.com/ArcGIS/rest/services/\
+World_Shaded_Relief/MapServer/tile/{z}/{y}/{x}.jpg'``
 
         """
         # Only streets are partly transparent tiles that can be overlayed over