Merge branch 'gh-pages' into typo-fixes

Author: valentina-s

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,9 @@
+Please delete the text below before submitting your contribution. 
+
+---
+
+Thanks for contributing! If this contribution is for instructor training, please send an email to [email protected] with a link to this contribution so we can record your progress. You’ve completed your contribution step for instructor checkout just by submitting this contribution.  
+
+Please keep in mind that lesson maintainers are volunteers and it may be some time before they can respond to your contribution. Although not all contributions can be incorporated into the lesson materials, we appreciate your time and effort to improve the curriculum.  If you have any questions about the lesson maintenance process or would like to volunteer your time as a contribution reviewer, please contact Kate Hertweck ([email protected]).  
+
+---

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,9 @@
+Please delete the text below before submitting your contribution. 
+
+---
+
+Thanks for contributing! If this contribution is for instructor training, please send an email to [email protected] with a link to this contribution so we can record your progress. You’ve completed your contribution step for instructor checkout just by submitting this contribution.  
+
+Please keep in mind that lesson maintainers are volunteers and it may be some time before they can respond to your contribution. Although not all contributions can be incorporated into the lesson materials, we appreciate your time and effort to improve the curriculum.  If you have any questions about the lesson maintenance process or would like to volunteer your time as a contribution reviewer, please contact Kate Hertweck ([email protected]).  
+
+---

.mailmap

@@ -1,114 +1,54 @@
-Hakim Achterberg <hachterberg@bigr-hakim>
-James Adams <[email protected]>
-Joshua Adelman <[email protected]>
-James Allen <[email protected]>
-Sung Bae <[email protected]>
-Piotr Banaszkiewicz <[email protected]>
-Pauline Barmby <[email protected]>
-Ewan Barr <[email protected]>
-David Beitey <[email protected]>
-Trevor Bekolay <[email protected]>
-Jared Berghold <[email protected]>
-John Blischak <[email protected]>
-Maxime Boissonneault <[email protected]>
-Azalee Bostroem <[email protected]>
-Andy Boughton <[email protected]> <[email protected]>
-Amy Brown <[email protected]>
-Kyler Brown <[email protected]>
+Abigail Cabunoc Mayes <[email protected]>
 Abigail Cabunoc Mayes <[email protected]> <[email protected]>
-John Chase <[email protected]>
-Jin Choi <[email protected]>
-Richard Clare <[email protected]>
-Sarah Clayton <[email protected]>
-Peter Cock <[email protected]>
-Marianne Corvellec <[email protected]>
-Thomas Coudrat <[email protected]>
-Ryan Dale <[email protected]>
-Matt Davis <[email protected]>
-Andrew Davison <[email protected]>
-Raffaella Demichelis <[email protected]>
-Gabriel A. Devenyi <[email protected]>
-Emily Dolson <[email protected]>
-David Dotson <[email protected]>
-Laurent Duchesne <[email protected]>
-Jonah Duckles <[email protected]>
-Rémi Emonet <[email protected]> <[email protected]>
-K. Arthur Endsley <[email protected]>
-Nicolas Fauchereau <[email protected]>
-Talitha Ford <[email protected]>
-Ivan Gonzalez <[email protected]>
-Jan Gosmann <[email protected]>
-John Gosset <[email protected]>
-Jeremy Gray <[email protected]>
-Bastian Greshake <[email protected]>
-Mary Haley <[email protected]>
-Sam Hames <[email protected]>
-Jessica B. Hamrick <[email protected]>
-Michael Hansen <[email protected]>
-Konrad Hinsen <[email protected]>
-Johan Hjelm <[email protected]>
-Toby Hodges <[email protected]>
-Derek Howard <[email protected]>
-Damien Irving <[email protected]> <[email protected]>
-Mike Jackson <[email protected]>
-Ben Jolly <[email protected]>
-Nick Jones <[email protected]>
-Blake Joyce <[email protected]>
-David Ketcheson <[email protected]>
-W. Trevor King <[email protected]>
-Sigrid Klerke <[email protected]>
-Benjamin Laken <[email protected]>
-Hilmar Lapp <[email protected]>
-Doug Latornell <[email protected]>
-Jean-Christophe Leyder <[email protected]>
-Johnny Lin <[email protected]>
-Andrew Lonsdale <[email protected]>
-Alexandre Manhaes Savio <[email protected]>
-Dan Mazur <[email protected]>
-François Michonneau <[email protected]>
-Bill Mills <[email protected]>
-Zakariyya Mughal <[email protected]>
-Narayanan <[email protected]>
-Lex Nederbragt <[email protected]>
-Ryan Neufeld <[email protected]>
-Aaron O'Leary <[email protected]>
-Adam Obeng <[email protected]>
-Jeramia Ory <[email protected]>
-Natalia Osiecka <[email protected]>
-Jon Pipitone <[email protected]>
-Adrianna Pińska <[email protected]>
-Timothée Poisot <[email protected]>
-Pawel Pomorski <[email protected]>
-Florian Rathgeber <[email protected]>
-Adam Richie-Halford <[email protected]>
-Janet Riley <[email protected]>
+Andy Boughton <[email protected]> <[email protected]>
+Andy Kwong <[email protected]>
+Ardita Shkurti <[email protected]>
 Ariel Rokem <[email protected]>
-Marjorie Roswell <[email protected]>
-Mahdi Sadjadi <[email protected]>
-Elliott Sales de Andrade <[email protected]>
-Sebastian Schmeier <[email protected]>
-Leigh Sheneman <[email protected]>
 Arron Shiffer <[email protected]>
-Ardita Shkurti <[email protected]>
-Raniere Silva <[email protected]> <[email protected]> <[email protected]>
-Nicola Soranzo <[email protected]> <[email protected]>
-Erik Spence <[email protected]>
-Ashwin Srinath <[email protected]>
-Valentina Staneva <[email protected]> <[email protected]>
-Jim Stapleton <[email protected]>
-Brian Stucky <[email protected]>
-Cody Taylor <[email protected]>
 Bartosz Telenczuk <[email protected]>
-Ian Thomas <[email protected]>
-Brian Thorne <[email protected]>
+Brian Stucky <[email protected]>
+Damien Irving <[email protected]> <[email protected]>
+Derek Howard <[email protected]>
+Edwin van der Helm <[email protected]> <[email protected]>
+Evan P. Williamson <[email protected]>
+Ewan Barr <[email protected]>
+François Michonneau <[email protected]>
+François Michonneau <[email protected]> <[email protected]>
 Giovanni Torres <[email protected]>
-Tim Tröndle <[email protected]>
-Olav Vahtras <[email protected]>
-Edwin van der Helm <[email protected]>
-Alistair Walsh <[email protected]>
-Derek Weitzel <[email protected]>
-Daniel Wheeler <[email protected]>
-Ethan White <[email protected]>
-Frank Willmore <[email protected]>
 Greg Wilson <[email protected]> <[email protected]>
-Andrea Zonca <[email protected]>
+Ian Carroll <[email protected]> <[email protected]>
+James Adams <[email protected]>
+James Allen <[email protected]> <[email protected]>
+Jean-Christophe Leyder <[email protected]> <[email protected]>
+Jessica Upani <[email protected]>
+Jim Stapleton <[email protected]>
+Jin Choi <[email protected]>
+John Chase <[email protected]>
+John R. Leeman <[email protected]>
+Kate Hertweck <[email protected]>
+Leigh Sheneman <[email protected]>
+Maxime Boissonneault <[email protected]>
+Mike Jackson <[email protected]> <[email protected]>
+Narayanan Raghupathy <[email protected]>
+Neal Davis <[email protected]> <[email protected]>
+Nicola Soranzo <[email protected]> <[email protected]>
+Pauline Barmby <[email protected]>
+Pawel Pomorski <[email protected]>
+Peter Cock <[email protected]>
+Raffaella Demichelis <[email protected]>
+Raniere Silva <[email protected]> <[email protected]>
+Raniere Silva <[email protected]> <[email protected]>
+Rémi Emonet <[email protected]> <[email protected]>
+Rémi Emonet <[email protected]> <[email protected]>
+Richard Clare <[email protected]>
+Ryan Dale <[email protected]>
+Ryan Neufeld <[email protected]> <[email protected]>
+Sarah Clayton <[email protected]>
+Sigrid Klerke <[email protected]>
+Timothée Poisot <[email protected]> <[email protected]>
+Toby Hodges <[email protected]>
+Trevor Bekolay <[email protected]>
+Valentina Staneva <[email protected]>
+Valentina Staneva <[email protected]>
+Willem Ligtenberg <[email protected]>
+YourName <[email protected]>

AUTHORS

@@ -2,29 +2,37 @@ Hakim Achterberg
 James Adams
 Joshua Adelman
 James Allen
+Jorge Aranda
 Sung Bae
 Piotr Banaszkiewicz
 Pauline Barmby
 Ewan Barr
 David Beitey
 Trevor Bekolay
 Jared Berghold
+Marius Bjørnstad
 John Blischak
 Maxime Boissonneault
+Corinne Bosley
 Azalee Bostroem
 Andy Boughton
+Ry4an Brase
 Amy Brown
 Kyler Brown
 Abigail Cabunoc Mayes
+Ian Carroll
 John Chase
+Stephen Childs
 Jin Choi
 Richard Clare
 Sarah Clayton
 Peter Cock
+Michael Connell
 Marianne Corvellec
 Thomas Coudrat
 Ryan Dale
 Matt Davis
+Neal Davis
 Andrew Davison
 Raffaella Demichelis
 Gabriel A. Devenyi
@@ -36,15 +44,19 @@ Rémi Emonet
 K. Arthur Endsley
 Nicolas Fauchereau
 Talitha Ford
+Konrad Förstner
 Ivan Gonzalez
 Jan Gosmann
 John Gosset
 Jeremy Gray
 Bastian Greshake
+Stéphane Guillou
 Mary Haley
 Sam Hames
 Jessica B. Hamrick
+Eilis Hannon
 Michael Hansen
+Kate Hertweck
 Konrad Hinsen
 Johan Hjelm
 Toby Hodges
@@ -57,18 +69,22 @@ Blake Joyce
 David Ketcheson
 W. Trevor King
 Sigrid Klerke
+Lauren Ko
+Andy Kwong
 Benjamin Laken
 Hilmar Lapp
 Doug Latornell
+John R. Leeman 
 Jean-Christophe Leyder
+Willem Ligtenberg
 Johnny Lin
 Andrew Lonsdale
 Alexandre Manhaes Savio
+Ryan May
 Dan Mazur
 François Michonneau
 Bill Mills
 Zakariyya Mughal
-Narayanan
 Lex Nederbragt
 Ryan Neufeld
 Aaron O'Leary
@@ -79,9 +95,12 @@ Jon Pipitone
 Adrianna Pińska
 Timothée Poisot
 Pawel Pomorski
+Narayanan Raghupathy
 Florian Rathgeber
+Meredith Rawls
 Adam Richie-Halford
 Janet Riley
+Thomas Robitaille
 Ariel Rokem
 Marjorie Roswell
 Mahdi Sadjadi
@@ -98,17 +117,23 @@ Valentina Staneva
 Jim Stapleton
 Brian Stucky
 Cody Taylor
+Tracy Teal
 Bartosz Telenczuk
 Ian Thomas
 Brian Thorne
 Giovanni Torres
 Tim Tröndle
+Jessica Upani
 Olav Vahtras
 Edwin van der Helm
 Alistair Walsh
+Nathan Walter
 Derek Weitzel
 Daniel Wheeler
 Ethan White
+Evan P. Williamson
 Frank Willmore
+Aidan Wilson
 Greg Wilson
+Xiao Xiao
 Andrea Zonca

CONDUCT.md

@@ -32,13 +32,14 @@ or other unprofessional conduct.
 
 Project maintainers have the right and responsibility to remove, edit, or reject
 comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct.
+that are not aligned to our [Code of Conduct][coc].
 Project maintainers who do not follow the Code of Conduct may be removed from the project team.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior
-may be reported by opening an issue or contacting one or more of the project maintainers.
+may be reported by following our [reporting guidelines][coc-reporting].
 
-This Code of Conduct is adapted from
-the [Contributor Covenant][contrib-covenant] Version 1.0.0.
 
-[contrib-covenant]: http://contributor-covenant.org/
+- [Software and Data Carpentry Code of Conduct][coc]
+- [Code of Conduct Reporting Guide][coc-reporting]
+
+{% include links.md %}

CONTRIBUTING.md

@@ -140,13 +140,12 @@ You can also [reach us by email][contact].
 [dc-lessons]: http://datacarpentry.org/lessons/
 [dc-site]: http://datacarpentry.org/
 [discuss-list]: http://lists.software-carpentry.org/listinfo/discuss
-[example-site]: https://swcarpentry.github.io/lesson-example/
 [github]: http://github.com
 [github-flow]: https://guides.github.com/introduction/flow/
 [github-join]: https://github.com/join
 [how-contribute]: https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github
-[issues]: https://github.com/swcarpentry/python-novice-inflammation/issues/
-[repo]: https://github.com/swcarpentry/python-novice-inflammation/
+[issues]: https://github.com/swcarpentry/FIXME/issues/
+[repo]: https://github.com/swcarpentry/FIXME/
 [swc-issues]: https://github.com/issues?q=user%3Aswcarpentry
 [swc-lessons]: http://software-carpentry.org/lessons/
 [swc-site]: http://software-carpentry.org/

LICENSE.md

@@ -73,7 +73,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ## Trademark
 
-"Software Carpentry" an "Data Carpentry" and their respective logos
+"Software Carpentry" and "Data Carpentry" and their respective logos
 are registered trademarks of [NumFOCUS][numfocus].
 
 [cc-by-human]: https://creativecommons.org/licenses/by/4.0/