Skip to content

Commit

Permalink
RTD support link update (#4166)
Browse files Browse the repository at this point in the history
* RTD support link update

* review actions
  • Loading branch information
bjlittle authored Jun 2, 2021
1 parent 64c88c8 commit 7f734a8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
2 changes: 1 addition & 1 deletion docs/src/common_links.inc
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
.. _core developers: https://github.com/SciTools/scitools.org.uk/blob/master/contributors.json
.. _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
.. _Iris: https://github.com/SciTools/iris
.. _Iris GitHub: https://github.com/SciTools/iris
.. _iris mailing list: https://groups.google.com/forum/#!forum/scitools-iris
.. _iris-sample-data: https://github.com/SciTools/iris-sample-data
.. _iris-test-data: https://github.com/SciTools/iris-test-data
.. _issue: https://github.com/SciTools/iris/issues
Expand Down
8 changes: 2 additions & 6 deletions docs/src/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -271,12 +271,8 @@ def _dotv(version):
"https://github.com/SciTools/iris",
),
(
'<i class="fa fa-comments fa-fw"></i> Users Google Group',
"https://groups.google.com/forum/#!forum/scitools-iris",
),
(
'<i class="fa fa-comments fa-fw"></i> Developers Google Group',
"https://groups.google.com/forum/#!forum/scitools-iris-dev",
'<i class="fa fa-comments fa-fw"></i> GitHub Discussions',
"https://github.com/SciTools/iris/discussions",
),
(
'<i class="fa fa-question fa-fw"></i> StackOverflow for "How Do I?"',
Expand Down
2 changes: 1 addition & 1 deletion docs/src/developers_guide/gitwash/development_workflow.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ In what follows we'll refer to the upstream iris ``master`` branch, as
* If you can possibly avoid it, avoid merging trunk or any other branches into
your feature branch while you are working.
* If you do find yourself merging from trunk, consider :ref:`rebase-on-trunk`
* Ask on the `iris mailing list`_ if you get stuck.
* Ask on the `Iris GitHub Discussions`_ if you get stuck.
* Ask for code review!

This way of working helps to keep work well organized, with readable history.
Expand Down

0 comments on commit 7f734a8

Please sign in to comment.