Skip to content
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
1 change: 1 addition & 0 deletions docs/src/common_links.inc
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
.. _conda: https://docs.conda.io/en/latest/
.. _contributor: https://github.com/SciTools/scitools.org.uk/blob/master/contributors.json
.. _core developers: https://github.com/SciTools/scitools.org.uk/blob/master/contributors.json
.. _discussions: https://github.com/SciTools/iris/discussions
.. _generating sss keys for GitHub: https://docs.github.com/en/github/authenticating-to-github/adding-a-new-ssh-key-to-your-github-account
.. _GitHub Help Documentation: https://docs.github.com/en/github
.. _Iris GitHub Discussions: https://github.com/SciTools/iris/discussions
Expand Down
1 change: 1 addition & 0 deletions docs/src/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ def _dotv(version):
"http://www.wmo.int/pages/prog/www/DPFS/documents/485_Vol_I_en_colour.pdf",
"https://software.ac.uk/how-cite-software",
"http://www.esrl.noaa.gov/psd/data/gridded/conventions/cdc_netcdf_standard.shtml",
"http://www.nationalarchives.gov.uk/doc/open-government-licence",
]

# list of sources to exclude from the build.
Expand Down
18 changes: 9 additions & 9 deletions docs/src/copyright.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ You should find all source files with the following header:
.. admonition:: Code License

Copyright Iris contributors

This file is part of Iris and is released under the LGPL license.
See COPYING and COPYING.LESSER in the root of the repository for full
licensing details.
Expand All @@ -23,17 +23,17 @@ You should find all source files with the following header:
Iris Documentation and Examples
-------------------------------

All documentation, examples and sample data found on this website and in source repository
All documentation, examples and sample data found on this website and in source repository
are licensed under the UK's Open Government Licence:

.. admonition:: Documentation, example and data license

(C) British Crown Copyright |copyright_years|
You may use and re-use the information featured on this website (not including logos) free of
charge in any format or medium, under the terms of the
`Open Government Licence <http://reference.data.gov.uk/id/open-government-licence>`_.

You may use and re-use the information featured on this website (not including logos) free of
charge in any format or medium, under the terms of the
`Open Government Licence <http://www.nationalarchives.gov.uk/doc/open-government-licence>`_.
We encourage users to establish hypertext links to this website.
Any email enquiries regarding the use and re-use of this information resource should be

Any email enquiries regarding the use and re-use of this information resource should be
sent to: [email protected].
7 changes: 5 additions & 2 deletions docs/src/developers_guide/contributing_getting_involved.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,16 @@ The `Iris GitHub`_ project has been configured to use templates for each of
the above issue types when creating a `new issue`_ to ensure the appropriate
information is provided.

Alternatively, **join the conversation** in `Iris GitHub Discussions`_, when
you would like the opinions of the Iris community.

A `pull request`_ may also be created by anyone who has become a
**contributor** to Iris_. Permissions to merge pull requests to the
``main`` branch are only given to **core developers** of Iris_, this is
to ensure a measure of control.

To get started we suggest reading recent `issues`_ and `pull requests`_
for Iris.
To get started we suggest reading recent `issues`_, `discussions`_ and
`pull requests`_ for Iris.

If you are new to using GitHub we recommend reading the
`GitHub getting started`_
Expand Down
7 changes: 5 additions & 2 deletions docs/src/whatsnew/latest.rst
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,16 @@ This document explains the changes made to Iris for this release
📚 Documentation
================

#. N/A
#. `@trexfeathers`_ included `Iris GitHub Discussions`_ in
:ref:`get involved <development_where_to_start>`. (:pull:`4307`)


💼 Internal
===========

#. N/A
#. `@trexfeathers`_ set the linkcheck to ignore
http://www.nationalarchives.gov.uk/doc/open-government-licence since this
always works locally, but never within CI. (:pull:`4307`)


.. comment
Expand Down