diff --git a/.mailmap b/.mailmap index f1e6d5759..d3a807e89 100644 --- a/.mailmap +++ b/.mailmap @@ -35,3 +35,5 @@ Thomas Coleman Tom Coleman < Tim Pillinger wxtim Tim Pillinger <26465611+wxtim@users.noreply.github.com> Tomasz Trzeciak TomekTrzeciak +Joe Marsh Rossney <17361029+jmarshrossney@users.noreply.github.com> +Joe Marsh Rossney <17361029+jmarshrossney@users.noreply.github.com> <17361029+marshrossney@users.noreply.github.com> diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 541e8889e..54f5c05e5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -53,6 +53,7 @@ below: - Ronnie Dutta (Met Office, UK) - Roddy Sharp (Met Office UK) - Mark Dawson (Met Office UK) + - Joe Marsh Rossney (UK Centre for Ecology & Hydrology) (All contributors are identifiable with email addresses in the version control diff --git a/sphinx/installation.rst b/sphinx/installation.rst index c586da76b..6b82cbd2d 100644 --- a/sphinx/installation.rst +++ b/sphinx/installation.rst @@ -76,8 +76,8 @@ Configuring Rose Rose configuration files can be located in the following places: -* ``/etc/.metomi/rose.conf`` -* ``$ROSE_SITE_CONF_PATH/.metomi/rose.conf`` +* ``/etc/rose.conf`` +* ``$ROSE_SITE_CONF_PATH/rose.conf`` * ``$HOME/.metomi/rose.conf`` See :rose:file:`rose.conf` in the API reference for more information.