diff --git a/CHANGES b/CHANGES index 900773867..c47248178 100644 --- a/CHANGES +++ b/CHANGES @@ -1 +1 @@ -Please see docs/source/whats_new.rst for a changelog. +Please see docs/source/whatsnew/ for a changelog. diff --git a/INSTALL b/INSTALL index 03609e87a..f19033e84 100644 --- a/INSTALL +++ b/INSTALL @@ -12,7 +12,7 @@ Other binaries Additional pre-built binaries can be found at a variety of sources, including: * `Conda `_ -* Christoph Gohlke (https://www.lfd.uci.edu/~gohlke/pythonlibs/) +* Christoph Gohlke (https://github.com/cgohlke/geospatial-wheels/) maintains unofficial Windows binaries of cartopy. * `OSGeo Live `_. diff --git a/docs/source/_static/copyright_license.csv b/docs/source/_static/copyright_license.csv index a84a9a9a4..e819ae767 100644 --- a/docs/source/_static/copyright_license.csv +++ b/docs/source/_static/copyright_license.csv @@ -1,3 +1,3 @@ Data Provider;Cartopy Function;Citation (short);Citation (long);License;Terms of Use Information -OpenStreetMap;:mod:`img_tiles.OSM `;|copy| OpenStreetMap;Map data |copy| OpenStreetMap contributors;`Open Database Licence `_;`Legal FAQ `_ +OpenStreetMap;:mod:`img_tiles.OSM `;|copy| OpenStreetMap;Map data |copy| OpenStreetMap contributors;`Open Database Licence `_;`Legal FAQ `_ Natural Earth raster + vector map data;:class:`NaturalEarthFeature `;Made with Natural Earth.;Made with Natural Earth. Free vector and raster map data @ naturalearthdata.com.;`Public Domain `_;`Terms of Use `_ diff --git a/docs/source/citation.rst b/docs/source/citation.rst index 9aac32f57..ae8875a58 100644 --- a/docs/source/citation.rst +++ b/docs/source/citation.rst @@ -50,10 +50,10 @@ For example:: Cartopy. Met Office. git@github.com:SciTools/cartopy.git. 2015-02-18. 7b2242e. -.. _How to cite and describe software: https://software.ac.uk/so-exactly-what-software-did-you-use +.. _How to cite and describe software: https://www.software.ac.uk/publication/how-cite-and-describe-software -[Jackson] Jackson, M. 2012. `How to cite and describe software`_. Accessed 2013-03-06. +[Jackson] Jackson, M. 2012. `How to cite and describe software`_. Accessed 2024-03-15. .. _referencing_copyright: @@ -87,4 +87,4 @@ The corresponding information for the data providers included in cartopy is list .. |---| unicode:: U+02014 .. em dash :trim: -The `feature_creation example <./examples/feature_creation.html>`_ shows such annotation for Natural Earth data. +The `feature_creation example <./gallery/lines_and_polygons/feature_creation.html>`_ shows such annotation for Natural Earth data. diff --git a/docs/source/matplotlib/feature_interface.rst b/docs/source/matplotlib/feature_interface.rst index 598cb623e..50f58e18a 100644 --- a/docs/source/matplotlib/feature_interface.rst +++ b/docs/source/matplotlib/feature_interface.rst @@ -3,7 +3,7 @@ The cartopy Feature interface ============================= -The :ref:`data copyright, license and attribution ` can be blended on the map using `text annotations (mpl docs) `_ as shown in `feature_creation <../gallery/feature_creation.html>`_. +The :ref:`data copyright, license and attribution ` can be blended on the map using `text annotations (mpl docs) `_ as shown in `feature_creation <../gallery/lines_and_polygons/feature_creation.html>`_. Specific Feature subclasses have been defined for common functionality, such as accessing Natural Earth or GSHHS shapefiles. A list of these can be found in :ref:`the reference documentation `. diff --git a/docs/source/whatsnew/v0.9.rst b/docs/source/whatsnew/v0.9.rst index b4066564c..c070eeea3 100644 --- a/docs/source/whatsnew/v0.9.rst +++ b/docs/source/whatsnew/v0.9.rst @@ -7,7 +7,7 @@ Version 0.9 (September 12, 2013) "Iris & Cartopy" `_ was voted best talk of the conference. * Other talks and tutorials during this release cycle include Phil Elson's `talk at SciPy'13 - (with video) `_, + (with video) `_, `Thomas Lecocq's tutorial at EuroSciPy `_ and a forthcoming `talk at FOSS4G `_. diff --git a/lib/cartopy/io/shapereader.py b/lib/cartopy/io/shapereader.py index a9fe8820b..b74648019 100644 --- a/lib/cartopy/io/shapereader.py +++ b/lib/cartopy/io/shapereader.py @@ -281,8 +281,8 @@ def natural_earth(resolution='110m', category='physical', name='coastline'): To identify valid components for this function, either browse NaturalEarthData.com, or if you know what you are looking for, go to - https://github.com/nvkelso/natural-earth-vector/tree/master/zips to - see the actual files which will be downloaded. + https://github.com/nvkelso/natural-earth-vector/ to see the actual + files which will be downloaded. Note ---- diff --git a/lib/cartopy/mpl/patch.py b/lib/cartopy/mpl/patch.py index c67cab0d8..9c7749d7f 100644 --- a/lib/cartopy/mpl/patch.py +++ b/lib/cartopy/mpl/patch.py @@ -6,7 +6,7 @@ Provide shapely geometry <-> matplotlib path support. See also `Shapely Geometric Objects `_ -and `Matplotlib Path API `_. +and `Matplotlib Path API `_. .. see_also_shapely: https://shapely.readthedocs.io/en/latest/manual.html#geometric-objects