Skip to content

Commit

Permalink
Merge pull request #10 from tracykteal/gh-pages
Browse files Browse the repository at this point in the history
added NEWS and updated admin files
  • Loading branch information
tracykteal authored Apr 28, 2017
2 parents ce75b3c + 5498a2b commit aad08b2
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 12 deletions.
7 changes: 6 additions & 1 deletion CITATION
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
FIXME: describe how to cite this lesson.
Please cite as:

Tracy Teal (eds): "Data Carpentry: Ecology Workshop overview."
Version 2017.04.0, April 2017,
http://www.datacarpentry.org/ecology-workshop/,
FIXME: Add Zenodo DOI.
10 changes: 5 additions & 5 deletions CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/)

12 changes: 6 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ In exchange,
we will address your issues and/or assess your change proposal as promptly as we can,
and help you become a member of our community.
Everyone involved in [Software Carpentry][swc-site] and [Data Carpentry][dc-site]
agrees to abide by our [code of conduct](CONDUCT.md).
agrees to abide by our [code of conduct](http://www.datacarpentry.org/code-of-conduct/).

## How to Contribute

Expand Down Expand Up @@ -46,8 +46,8 @@ and to meet some of our community members.
## Where to Contribute

1. If you wish to change this lesson,
please work in <https://github.com/swcarpentry/FIXME>,
which can be viewed at <https://swcarpentry.github.io/FIXME>.
please work in <https://github.com/datacarpentry/spreadsheet-ecology-lesson>,
which can be viewed at <http://www.datacarpentry.org/spreadsheet-ecology-lesson/>.

2. If you wish to change the example lesson,
please work in <https://github.com/swcarpentry/lesson-example>,
Expand Down Expand Up @@ -135,7 +135,7 @@ happens on the [discussion mailing list][discuss-list],
which everyone is welcome to join.
You can also [reach us by email][contact].

[contact]: mailto:admin@software-carpentry.org
[contact]: mailto:admin@datacarpentry.org
[dc-issues]: https://github.com/issues?q=user%3Adatacarpentry
[dc-lessons]: http://datacarpentry.org/lessons/
[dc-site]: http://datacarpentry.org/
Expand All @@ -144,8 +144,8 @@ You can also [reach us by email][contact].
[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/FIXME/issues/
[repo]: https://github.com/swcarpentry/FIXME/
[issues]: https://github.com/datacarpentry/spreadsheet-ecology-lesson/issues/
[repo]: https://github.com/datacarpentry/spreadsheet-ecology-lesson/
[swc-issues]: https://github.com/issues?q=user%3Aswcarpentry
[swc-lessons]: http://software-carpentry.org/lessons/
[swc-site]: http://software-carpentry.org/
3 changes: 3 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
## Data Carpentry Ecology Workshop overview 2017.04.0

Initial release of the Data Carpentry Ecology Workshop overview

0 comments on commit aad08b2

Please sign in to comment.