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

Fixing typo's in Gitwash. #5145

Merged
merged 2 commits into from
Feb 3, 2023
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
3 changes: 2 additions & 1 deletion docs/src/common_links.inc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,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
.. _generating sss keys for GitHub: https://docs.github.com/en/github/authenticating-to-github/adding-a-new-ssh-key-to-your-github-account
.. _generating ssh keys for GitHub: https://docs.github.com/en/github/authenticating-to-github/adding-a-new-ssh-key-to-your-github-account
.. _GitHub Actions: https://docs.github.com/en/actions
.. _GitHub Help Documentation: https://docs.github.com/en/github
.. _GitHub Discussions: https://github.com/SciTools/iris/discussions
Expand Down Expand Up @@ -57,6 +57,7 @@
.. _@DPeterK: https://github.com/DPeterK
.. _@ESadek-MO: https://github.com/ESadek-MO
.. _@esc24: https://github.com/esc24
.. _@HGWright: https://github.com/HGWright
.. _@jamesp: https://github.com/jamesp
.. _@jonseddon: https://github.com/jonseddon
.. _@jvegasbsc: https://github.com/jvegasbsc
Expand Down
2 changes: 1 addition & 1 deletion docs/src/developers_guide/gitwash/forking.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Set up and Configure a Github Account
If you don't have a github account, go to the github page, and make one.

You then need to configure your account to allow write access, see
the `generating sss keys for GitHub`_ help on `github help`_.
the `generating ssh keys for GitHub`_ help on `github help`_.


Create Your own Forked Copy of Iris
Expand Down
2 changes: 1 addition & 1 deletion docs/src/developers_guide/gitwash/set_up_fork.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Overview

git clone git@github.com:your-user-name/iris.git
cd iris
git remote add upstream git://github.com/SciTools/iris.git
bjlittle marked this conversation as resolved.
Show resolved Hide resolved
git remote add upstream git@github.com/SciTools/iris.git

In Detail
=========
Expand Down
3 changes: 3 additions & 0 deletions docs/src/whatsnew/latest.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ This document explains the changes made to Iris for this release
================

#. Congratulations to `@ESadek-MO`_ who has become a core developer for Iris! 🎉
#. Welcome and congratulations to `@HGWright`_ for making his first contribution to Iris! 🎉


✨ Features
Expand Down Expand Up @@ -94,6 +95,8 @@ This document explains the changes made to Iris for this release
for the outstanding work of `@ed-hawkins`_ et al for `#ShowYourStripes`_.
(:pull:`5141`)

#. `@HGWright`_ fixed some typo's from Gitwash. (:pull:`5145`)

bjlittle marked this conversation as resolved.
Show resolved Hide resolved
💼 Internal
===========

Expand Down