diff --git a/docs/src/common_links.inc b/docs/src/common_links.inc index 38a889132c..b0263dafb6 100644 --- a/docs/src/common_links.inc +++ b/docs/src/common_links.inc @@ -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 diff --git a/docs/src/conf.py b/docs/src/conf.py index 1058651879..1c7cc7c3f2 100644 --- a/docs/src/conf.py +++ b/docs/src/conf.py @@ -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. diff --git a/docs/src/copyright.rst b/docs/src/copyright.rst index 16ac07acb3..2829374f47 100644 --- a/docs/src/copyright.rst +++ b/docs/src/copyright.rst @@ -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. @@ -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 `_. + + 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 `_. 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: psi@nationalarchives.gsi.gov.uk. diff --git a/docs/src/developers_guide/contributing_getting_involved.rst b/docs/src/developers_guide/contributing_getting_involved.rst index 3524331c25..f7bd4733a3 100644 --- a/docs/src/developers_guide/contributing_getting_involved.rst +++ b/docs/src/developers_guide/contributing_getting_involved.rst @@ -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`_ diff --git a/docs/src/whatsnew/latest.rst b/docs/src/whatsnew/latest.rst index f85c001453..8c7ddfc8a7 100644 --- a/docs/src/whatsnew/latest.rst +++ b/docs/src/whatsnew/latest.rst @@ -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 `. (: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