Merge branch 'master' into episode_04_issues

Author: LisaBock

AUTHORS

@@ -1 +1,52 @@
-FIXME: list authors' names and email addresses.
+name: Andela, Bouwe
+    institute: NLeSC, Netherlands
+    email: [email protected]
+    orcid: https://orcid.org/0000-0001-9005-8940
+
+name: de Mora, Lee
+    institute: PML, UK
+    email: [email protected]
+    orcid: https://orcid.org/0000-0002-5080-3149
+
+name: Drost, Niels
+    institute: NLeSC, Netherlands
+    email: [email protected]
+    orcid: https://orcid.org/0000-0001-9795-7981
+
+name: Mueller, Benjamin
+    institute: LMU, Germany
+    email: [email protected]
+    orcid:
+
+name: Predoi, Valeriu
+    institute: URead, UK
+    email: [email protected]
+    orcid: https://orcid.org/0000-0002-9729-6578
+
+name: Alidoost, Sarah
+    institute: NLeSC, Netherlands
+    orcid: https://orcid.org/0000-0001-8407-6472
+
+name: Bock, Lisa
+    institute: DLR, Germany
+    orcid: https://orcid.org/0000-0001-7058-5938
+
+name: Camphuijsen, Jaro
+    institute: NLeSC, Netherlands
+    orcid: https://orcid.org/0000-0002-8928-7831
+
+name: Hassler, Birgit
+    institute: DLR, Germany
+    orcid: https://orcid.org/0000-0003-2724-709X
+
+name: Kalverla, Peter
+    institute: NLeSC, Netherlands
+    orcid: https://orcid.org/0000-0002-5025-7862
+
+name: Swaminathan, Ranjini
+    institute: University of Reading, UK
+    orcid: https://orcid.org/0000-0001-5853-2673
+
+name: Verhoeven, Stefan
+    institute: NLeSC, Netherlands
+    orcid: https://orcid.org/0000-0002-5821-2060

CITATION

@@ -1 +1,15 @@
-FIXME: describe how to cite this lesson.
+Please cite this tutorial as:
+
+- ESMValTool 2.0 tutorial, ESMValTool developers, version [ADD VERSION],
+  [https://github.com/ESMValGroup/ESMValTool_tutorial](https://github.com/ESMValGroup/ESMValTool_tutorial),
+  [DATE].
+
+and cite ESMValTool as:
+
+- Lauer, A., Eyring, V., Bellprat, O., Bock, L., Gier, B. K., Hunter, A.,
+  Lorenz, R., Pérez-Zanón, N., Righi, M., Schlund, M., Senftleben, D., Weigel,
+  K., and Zechlau, S.: Earth System Model Evaluation Tool (ESMValTool) v2.0 –
+  diagnostics for emergent constraints and future projections from Earth
+  system models in CMIP, Geosci. Model Dev. Discuss.,
+  [https://doi.org/10.5194/gmd-2020-60](https://doi.org/10.5194/gmd-2020-60),
+  in review, 2020.

CODE_OF_CONDUCT.md

@@ -1,11 +1,5 @@
----
-layout: page
-title: "Contributor Code of Conduct"
----
-As contributors and maintainers of this project,
-we pledge to follow the [Carpentry Code of Conduct][coc].
+# Contributor Code of Conduct
 
-Instances of abusive, harassing, or otherwise unacceptable behavior
-may be reported by following our [reporting guidelines][coc-reporting].
-
-{% include links.md %}
+As contributors and maintainers of this tutorial,
+we pledge to follow the ESMValTool
+[Code of Conduct](https://github.com/ESMValGroup/ESMValTool/blob/master/CODE_OF_CONDUCT.md).

CONTRIBUTING.md

@@ -100,10 +100,10 @@ and can be used as:
 mdl your_markdown_filename
 ```
 
-We use [Codacy](https://app.codacy.com/gh/ESMValGroup/tutorial) as an automated
-code analysis services. To run the analyis
-[locally](https://github.com/codacy/codacy-analysis-cli) on Markdown files with
-Docker use
+We use [Codacy](https://app.codacy.com/gh/ESMValGroup/ESMValTool_Tutorial)
+as an automated code analysis services. To run the analyis
+[locally](https://github.com/codacy/codacy-analysis-cli)
+on Markdown files with Docker use
 
 ```bash
 docker run \
@@ -118,9 +118,10 @@ docker run \
 
 ### Previewing your changes locally
 
-If you are making a new episode or contributing to existing ones, please preview
-changes on your machine before submitting a [pull request][PR]. To do so, you
-need to install the software described below:
+If you are making a new episode or contributing to existing ones,
+please preview changes on your machine before submitting a
+[pull request][PR]. To do so, you need to install
+the software described below:
 
 ```bash
 # apt (Ubuntu/Devian)
@@ -158,20 +159,24 @@ This address can be opened in your browser to preview the tutorial website.
 
 ## Other Resources
 
-General discussion of the tutorial happens in `User Engagement Team`.
-You can reach us by [email][email].
+General discussion of the tutorial happens in
+ESMValTool [User Engagement Team][user-engagement].
+You can reach us by email.
+Please see the [contact information][contact-info].
 
 [email]: mailto:TODO_FIX_ME
 [ESMValTool-site]: https://www.esmvaltool.org/
 [ESMValTool-doc]: https://esmvaltool.readthedocs.io/en/latest/
-[tutorial-repo]: https://esmvalgroup.github.io/tutorial/
-[tutorial-site]: https://esmvalgroup.github.io/tutorial
-[tutorial-maintainers]: https://github.com/ESMValGroup/tutorial#maintainers
+[tutorial-repo]: https://esmvalgroup.github.io/ESMValTool_Tutorial/
+[tutorial-site]: https://esmvalgroup.github.io/ESMValTool_Tutorial
+[tutorial-maintainers]: https://github.com/ESMValGroup/ESMValTool_Tutorial#maintainers
 [github]: https://github.com
-[issues]: https://github.com/ESMValGroup/tutorial/issues
-[PR]: https://github.com/ESMValGroup/tutorial/pulls
+[issues]: https://github.com/ESMValGroup/ESMValTool_Tutorial/issues
+[PR]: https://github.com/ESMValGroup/ESMValTool_Tutorial/pulls
 [swc-site]: https://software-carpentry.org/
 [swc-handbook]: https://carpentries.github.io/curriculum-development/
 [swc-lesson-organization]: https://carpentries.github.io/lesson-example/03-organization/index.html
 [swc-lesson-formatting]: https://carpentries.github.io/lesson-example/04-formatting/index.html
 [ea-site]: https://github.com/escience-academy
+[user-engagement]: https://github.com/orgs/ESMValGroup/teams/userengagementteam
+[contact-info]: https://docs.esmvaltool.org/en/latest/community/contact.html