Commit e47f4b15 authored by Raniere Silva's avatar Raniere Silva
Browse files

Merge remote-tracking branch 'swc-styles/gh-pages' into gh-pages

parents 015ca0b0 f55a015a
Loading
Loading
Loading
Loading
+1 −34
Original line number Diff line number Diff line
@@ -3,42 +3,9 @@ layout: page
title: "Contributor Code of Conduct"
---
As contributors and maintainers of this project,
we pledge to respect all people who contribute through reporting issues,
posting feature requests,
updating documentation,
submitting pull requests or patches,
and other activities.

We are committed to making participation in this project a harassment-free experience for everyone,
regardless of level of experience,
gender,
gender identity and expression,
sexual orientation,
disability,
personal appearance,
body size,
race,
ethnicity,
age,
or religion.

Examples of unacceptable behavior by participants include the use of sexual language or imagery,
derogatory comments or personal attacks,
trolling,
public or private harassment,
insults,
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 our [Code of Conduct][coc].
Project maintainers who do not follow the Code of Conduct may be removed from the project team.
we pledge to follow the [Carpentry Code of Conduct][coc].

Instances of abusive, harassing, or otherwise unacceptable behavior
may be reported by following our [reporting guidelines][coc-reporting].


- [Software and Data Carpentry Code of Conduct][coc]
- [Code of Conduct Reporting Guide][coc-reporting]

{% include links.md %}
+6 −2
Original line number Diff line number Diff line
@@ -74,6 +74,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
## Trademark

"Software Carpentry" and "Data Carpentry" and their respective logos
are registered trademarks of [NumFOCUS][numfocus].
are registered trademarks of [Community Initiatives][CI].

{% include links.md %}
[cc-by-human]: https://creativecommons.org/licenses/by/4.0/
[cc-by-legal]: https://creativecommons.org/licenses/by/4.0/legalcode
[mit-license]: http://opensource.org/licenses/mit-license.html
[ci]: http://communityin.org/
[osi]: http://opensource.org
+1 −1
Original line number Diff line number Diff line
@@ -14,6 +14,6 @@
    Library Carpentry introduces you to the fundamentals of computing
    and provides you with a platform for further self-directed learning.
    For more information on what we teach and why, please see our paper
    "<a href="http://doi.org/10.18352/lq.10176">Library Carpentry: software skills training for library professionals</a>".
    "<a href="https://doi.org/10.18352/lq.10176">Library Carpentry: software skills training for library professionals</a>".
  </em>
</p>
+10 −8
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
[ci]: http://communityin.org/
[coc-reporting]: https://docs.carpentries.org/topic_folders/policies/code-of-conduct.html#reporting-guidelines
[coc]: https://docs.carpentries.org/topic_folders/policies/code-of-conduct.html
[concept-maps]: https://carpentries.github.io/instructor-training/05-memory/
[concept-maps]: https://carpentries.github.io/instructor-training/05-memory/
[email]: mailto:lessons@software-carpentry.org
[contrib-covenant]: https://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
[cran-checkpoint]: https://cran.r-project.org/package=checkpoint
[cran-knitr]: https://cran.r-project.org/package=knitr
[cran-stringr]: https://cran.r-project.org/package=stringr
[email]: mailto:lessons@software-carpentry.org
[github-importer]: https://import.github.com/
[importer]: https://github.com/new/import
[jekyll-collection]: https://jekyllrb.com/docs/collections/
@@ -14,6 +18,7 @@
[jekyll-windows]: http://jekyll-windows.juthilo.com/
[jekyll]: https://jekyllrb.com/
[jupyter]: https://jupyter.org/
[lesson-example]: https://swcarpentry.github.io/lesson-example/
[mit-license]: https://opensource.org/licenses/mit-license.html
[morea]: https://morea-framework.github.io/
[numfocus]: https://numfocus.org/
@@ -22,7 +27,7 @@
[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/
[r-markdown]: https://rmarkdown.rstudio.com/
[rstudio]: https://www.rstudio.com/
[ruby-install-guide]: https://www.ruby-lang.org/en/downloads/
[ruby-installer]: https://rubyinstaller.org/
@@ -32,6 +37,3 @@
[training]: https://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/
[lesson-example]: https://swcarpentry.github.io/lesson-example/
+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@
    <meta http-equiv="last-modified" content="{{ site.time }}">
    <meta name="viewport" content="width=device-width, initial-scale=1">
    <!-- meta "search-domain" used for google site search function google_search() -->
    <meta name="search-domain" value="{{ site.github.url }}">
    <meta name="search-domain" value="{{ site.github.html_url }}">
    <link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/bootstrap.css" />
    <link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/bootstrap-theme.css" />
    <link rel="stylesheet" type="text/css" href="{{ page.root }}/assets/css/lesson.css" />
Loading