Commit e4e394bb authored by Raniere Silva's avatar Raniere Silva Committed by GitHub
Browse files

Merge pull request #147 from rgaiacs/update-coc

Updated CONDUCT.md
parents 895499e6 7999654d
Loading
Loading
Loading
Loading
+6 −5
Original line number Diff line number Diff line
@@ -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 %}

_includes/links.md

0 → 100644
+35 −0
Original line number Diff line number Diff line
[cc-by-human]: https://creativecommons.org/licenses/by/4.0/
[cc-by-legal]: https://creativecommons.org/licenses/by/4.0/legalcode
[concept-maps]: http://swcarpentry.github.io/instructor-training/08-memory/
[contact]: mailto:lessons@software-carpentry.org
[contrib-covenant]: http://contributor-covenant.org/
[contributing]: {{ site.github.repository_url }}/blob/gh-pages/CONTRIBUTING.md
[cran-checkpoint]: https://cran.r-project.org/web/packages/checkpoint/index.html
[cran-knitr]: https://cran.r-project.org/web/packages/knitr/index.html
[cran-stringr]: https://cran.r-project.org/web/packages/stringr/index.html
[github-importer]: https://import.github.com/
[importer]: http://import.github.com/new
[jekyll-collection]: https://jekyllrb.com/docs/collections/
[jekyll-install]: https://jekyllrb.com/docs/installation/
[jekyll-windows]: http://jekyll-windows.juthilo.com/
[jekyll]: https://jekyllrb.com/
[jupyter]: https://jupyter.org/
[mit-license]: http://opensource.org/licenses/mit-license.html
[morea]: https://morea-framework.github.io/
[numfocus]: http://numfocus.org/
[osi]: http://opensource.org
[pandoc]: https://pandoc.org/
[paper-now]: https://github.com/PeerJ/paper-now
[python-gapminder]: https://swcarpentry.github.io/python-novice-gapminder/
[pyyaml]: https://pypi.python.org/pypi/PyYAML
[r-markdown]: http://rmarkdown.rstudio.com/
[rstudio]: https://www.rstudio.com/
[ruby-install-guide]: https://www.ruby-lang.org/en/downloads/
[ruby-installer]: http://rubyinstaller.org/
[rubygems]: https://rubygems.org/pages/download/
[styles]: https://github.com/swcarpentry/styles/
[training]: http://swcarpentry.github.io/instructor-training/
[workshop-repo]: {{ site.workshop_repo }}
[yaml]: http://yaml.org/
[coc]: https://software-carpentry.org/conduct/
[coc-reporting]: https://software-carpentry.org/CoC-reporting/
 No newline at end of file