Docs: correct options for possible location of rose.conf

[jmarshrossney]

Changed 2 lines in the docs for configuring rose:

/etc/.metomi/rose.conf --> /etc/rose.conf
$ROSE_SITE_CONF_PATH/.metomi/rose.conf --> $ROSE_SITE_CONF_PATH/rose.conf

The docstring is correct.

Cheers!

[oliver-sanders]

Took a look at the code, this all seems correct to me.

Thanks!

[oliver-sanders]

Thanks for sorting this out @jmarshrossney.

For legal reasons, when people make their first contribution to Rose (no matter how big or small), they need to add their name to the CONTRIBUTING.md file before we are allowed to accept their commit. This indicates that you have accepted the contributor licence agreement (CLA).

Could you please add marshrossney to the CONTRIBUTING.md file. Note, this must match the format returned by git shortlog -se.

If you would like to change the appearance of your name, then add an entry to the .mailmap file like so:

diff --git a/.mailmap b/.mailmap
index f1e6d5759..9b4a4794a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -35,3 +35,4 @@ Thomas Coleman       <[email protected]>          Tom Coleman          <
 Tim Pillinger        <[email protected]>     wxtim                <[email protected]>
 Tim Pillinger        <[email protected]>
 Tomasz Trzeciak      <[email protected]>   TomekTrzeciak        <[email protected]>
+First Last           <[email protected]>

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 541e8889e..1f819233e 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)
+ - First Last
 <!-- end-shortlog -->
 
 (All contributors are identifiable with email addresses in the version control

[jmarshrossney]

Fair dos

[jmarshrossney]

Apologies for the github username/email complications! That's my mistake.

[oliver-sanders]

No probs, it's just a hoop we have to jump through.