Merge pull request #184 from tracykteal/admin

qjcg · web-flow · commit 5df2fcabd047 · 2017-04-27T20:50:47.000-04:00
added NEWS and updated admin files
diff --git a/CITATION b/CITATION
@@ -0,0 +1,6 @@
+Please cite as:
+
+John Gosset, April Wright, Mateusz Kuzak (eds): "Data Carpentry Python Ecology lesson."
+Version 2017.04.0, April 2017,
+http://www.datacarpentry.org/python-ecology-lesson/,
+FIXME: Add Zenodo DOI.
diff --git a/CONDUCT.md b/CONDUCT.md
@@ -32,13 +32,13 @@ 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](http://www.datacarpentry.org/code-of-conduct/).
 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](http://www.datacarpentry.org/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](http://www.datacarpentry.org/code-of-conduct/)
+- [Code of Conduct Reporting Guide](http://www.datacarpentry.org/CoC-reporting/)
+
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -38,7 +38,7 @@ work under [these licenses](LICENSE.md).
 
 If it is easier for you to send them to us some other way,
 please mail us at
-[board@datacarpentry.org](mailto:board@datacarpentry.org).
+[admin@datacarpentry.org](mailto:admin@datacarpentry.org).
 Given a choice between you creating content or wrestling with Git,
 we'd rather have you doing the former.
 
@@ -96,5 +96,5 @@ guidelines:
 
 -   *Where can I get help?*
     <br/>
-    Mail us at [board@datacarpentry.org](mailto:board@datacarpentry.org)
+    Mail us at [admin@datacarpentry.org](mailto:admin@datacarpentry.org)
 
diff --git a/NEWS.md b/NEWS.md
@@ -0,0 +1,3 @@
+## Data Carpentry Python Ecology lesson 2017.04.0
+
+Initial release of the Data Carpentry Python Ecology lesson

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+## Data Carpentry Python Ecology lesson 2017.04.0`
	`2`	`+`
	`3`	`+Initial release of the Data Carpentry Python Ecology lesson`