Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DOC: Update several links #2353

Merged
merged 2 commits into from
Mar 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGES
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Please see docs/source/whats_new.rst for a changelog.
Please see docs/source/whatsnew/ for a changelog.
2 changes: 1 addition & 1 deletion INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Other binaries
Additional pre-built binaries can be found at a variety of sources, including:

* `Conda <https://conda.io/miniconda.html>`_
* 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 <https://live.osgeo.org>`_.

Expand Down
2 changes: 1 addition & 1 deletion docs/source/_static/copyright_license.csv
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Data Provider;Cartopy Function;Citation (short);Citation (long);License;Terms of Use Information
OpenStreetMap;:mod:`img_tiles.OSM <cartopy.io.img_tiles>`;|copy| OpenStreetMap;Map data |copy| OpenStreetMap contributors;`Open Database Licence <www.opendatacommons.org/licenses/odbl>`_;`Legal FAQ <https://wiki.openstreetmap.org/wiki/Legal_FAQ#3a._I_would_like_to_use_OpenStreetMap_maps._How_should_I_credit_you.3F>`_
OpenStreetMap;:mod:`img_tiles.OSM <cartopy.io.img_tiles>`;|copy| OpenStreetMap;Map data |copy| OpenStreetMap contributors;`Open Database Licence <https://www.opendatacommons.org/licenses/odbl>`_;`Legal FAQ <https://wiki.openstreetmap.org/wiki/Legal_FAQ#3a._I_would_like_to_use_OpenStreetMap_maps._How_should_I_credit_you.3F>`_
Natural Earth raster + vector map data;:class:`NaturalEarthFeature <cartopy.feature.NaturalEarthFeature>`;Made with Natural Earth.;Made with Natural Earth. Free vector and raster map data @ naturalearthdata.com.;`Public Domain <https://creativecommons.org/publicdomain/>`_;`Terms of Use <https://www.naturalearthdata.com/about/terms-of-use/>`_
6 changes: 3 additions & 3 deletions docs/source/citation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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.
2 changes: 1 addition & 1 deletion docs/source/matplotlib/feature_interface.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
The cartopy Feature interface
=============================

The :ref:`data copyright, license and attribution <referencing_copyright>` can be blended on the map using `text annotations (mpl docs) <https://matplotlib.org/users/annotations_intro.html>`_ as shown in `feature_creation <../gallery/feature_creation.html>`_.
The :ref:`data copyright, license and attribution <referencing_copyright>` can be blended on the map using `text annotations (mpl docs) <https://matplotlib.org/stable/users/explain/text/annotations.html>`_ 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 <api.feature>`.
Expand Down
2 changes: 1 addition & 1 deletion docs/source/whatsnew/v0.9.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Version 0.9 (September 12, 2013)
"Iris & Cartopy" <https://www.euroscipy.org/2013/schedule/presentation/35/>`_
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) <https://conference.scipy.org/scipy2013/presentation_detail.php?id=132>`_,
(with video) <https://pyvideo.org/scipy-2013/iris-cartopy-python-packages-for-atmospheric-a.html>`_,
`Thomas Lecocq's tutorial at EuroSciPy
<https://www.euroscipy.org/2013/schedule/presentation/27/>`_
and a forthcoming `talk at FOSS4G <http://2013.foss4g.org/conf/programme/presentations/29/>`_.
Expand Down
4 changes: 2 additions & 2 deletions lib/cartopy/io/shapereader.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
----
Expand Down
2 changes: 1 addition & 1 deletion lib/cartopy/mpl/patch.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Provide shapely geometry <-> matplotlib path support.

See also `Shapely Geometric Objects <see_also_shapely>`_
and `Matplotlib Path API <https://matplotlib.org/api/path_api.html>`_.
and `Matplotlib Path API <https://matplotlib.org/stable/api/path_api.html>`_.

.. see_also_shapely:
https://shapely.readthedocs.io/en/latest/manual.html#geometric-objects
Expand Down