Skip to content

Commit

Permalink
Synchronized with gh_pages branch
Browse files Browse the repository at this point in the history
  • Loading branch information
CoralineAda committed Dec 2, 2015
1 parent 9013f3c commit 0e927bc
Show file tree
Hide file tree
Showing 11 changed files with 144 additions and 45 deletions.
61 changes: 43 additions & 18 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,49 @@
# Contributor Code of Conduct

As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
As contributors and maintainers of this project, and in the interest of
fostering an open and welcoming community, 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, religion, or nationality.
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, religion, or nationality.

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery
* Personal attacks
* Trolling or insulting/derogatory comments
* Public or private harassment
* Publishing other's private information, such as physical or electronic addresses, without explicit permission
* Other unethical or 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, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.

By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team.

This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting a project maintainer at [INSERT EMAIL ADDRESS]. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. Maintainers are obligated to maintain confidentiality with regard to the reporter of an incident.

This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.3.0, available at [http://contributor-covenant.org/version/1/3/0/](http://contributor-covenant.org/version/1/3/0/)
* The use of sexualized language or imagery
* Personal attacks
* Trolling or insulting/derogatory comments
* Public or private harassment
* Publishing other's private information, such as physical or electronic
addresses, without explicit permission
* Other unethical or 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, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

By adopting this Code of Conduct, project maintainers commit themselves to
fairly and consistently applying these principles to every aspect of managing
this project. Project maintainers who do not follow or enforce the Code of
Conduct may be permanently removed from the project team.

This code of conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community.

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting a project maintainer at [INSERT EMAIL ADDRESS]. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. Maintainers are
obligated to maintain confidentiality with regard to the reporter of an
incident.

This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 1.3.0, available at
[http://contributor-covenant.org/version/1/3/0/][version]

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/3/0/
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,5 +95,4 @@ This code of conduct has been adopted by [thousands of open source projects](htt
* [Volt.rb](https://github.com/voltrb/volt)
* [WAI-request-spec](https://gitlab.com/cpp.cabrera/wai-request-spec)
* [Wisper](https://github.com/krisleech/wisper)
* [xoreos](https://github.com/xoreos/xoreos)
* [Your First PR](https://github.com/yourfirstpr/)
* [xoreos](https://github.com/xoreos/xoreos)
2 changes: 2 additions & 0 deletions adopters/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,12 @@ <h3>A Sample of Projects Adopting the Contributor Covenant</h3>
<li><a href="https://github.com/qa-tools/qa-tools">QA-Tools</a></li>
<li><a href="https://gitlab.com/coraline/snuffle/tree/master">Snuffle</a></li>
<li><a href="https://github.com/snipe/snipe-it">Snipe-IT</a></li>
<li><a href="https://www.tinymce.com/docs/advanced/contributing-to-open-source/">TinyMCE</a></li>
<li><a href="https://github.com/rtorr/vim-cheat-sheet">vim cheat sheet</a></li>
<li><a href="https://github.com/voltrb/volt">Volt.rb</a></li>
<li><a href="https://gitlab.com/cpp.cabrera/wai-request-spec">WAI-request-spec</a></li>
<li><a href="https://github.com/xoreos/xoreos">xoreos</a></li>
<li><a href="https://github.com/yourfirstpr/">Your First PR</a></li>
</ul>
<br class="clear">

Expand Down
61 changes: 52 additions & 9 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<!DOCTYPE html>
<head>
<meta charset="utf-8"/>
<link href="styles/main.css" rel="stylesheet">
<link href='http://fonts.googleapis.com/css?family=Poiret+One' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=Droid+Sans+Mono' rel='stylesheet' type='text/css'></head>
Expand All @@ -12,9 +13,12 @@ <h2>A Code of Conduct for Open Source Projects.</h2>
</div>

<section id="preamble">
<p>Open Source has always been a foundation of the Internet, and with the advent of social open source networks this is more true than ever. But open source projects suffer from a startling lack of diversity of participants, including women, people of color, and other underrepresented populations.</p>
<p>Open Source has always been a foundation of the Internet, and with the advent of social open source networks this is more true than ever. But open source projects suffer from a startling lack of diversity, with dramatically low participation by women, people of color, and other marginalized populations.</p>

<p>Part of this problem lies with the very structure of some projects: the use of insensitive language, thoughtless use of pronouns, assumptions of gender, and even sexualized or culturally insensitive names.</p>

<p>Marginalized people also suffer some of the unintended consequences of dogmatic insistence on meritocratic principles of governance. Studies have show that organizational cultures that value meritocracy <a href="http://asq.sagepub.com/content/55/4/543.short" target="_new">often result in greater inequality</a>. People with "merit" are often <a href="https://modelviewculture.com/pieces/the-dehumanizing-myth-of-the-meritocracy" target="_new">excused for their bad behavior</a> in public spaces based on the value of their technical contributions. Meritocracy also naively assumes a level playing field, in which everyone has access to the same resources, free time, and common life experiences to draw upon. These factors and more make contributing to open source a daunting prospect for many people, especially women and other underrepresented people. (For more critical analysis of meritocracy, refer to <a href="http://geekfeminism.wikia.com/wiki/Meritocracy" target="_new">this entry</a> on the Geek Feminism wiki.)</p>

<p>Part of this problem lies with the projects themselves. Insensitive language, thoughtless use of pronouns, projects with sexualized or culturally inappropriate names, and side effects of the pervasive cult of meritocracy make contributing to open source a daunting prospect for many people.</p>
</section>

<section id="introduction">
Expand All @@ -30,19 +34,57 @@ <h3>Contributor Covenant v1.3.0</h3>
<p>
You can view and download Version 1.3 of the Contributor Covenant here:
</p>
<ul>
<li><a href="version/1/3/0/code_of_conduct.md">Markdown</a></li>
<li><a href="version/1/3/0/">HTML</a></li>
<li><a href="version/1/3/0/code_of_conduct.txt">Plain text</a></li>
</ul>
<table class="indented">
<tr>
<td>Markdown:</td>
<td>
<a href="version/1/3/0/code_of_conduct.md">English</a> |
<a href="version/1/3/0/es/code_of_conduct.md">Español</a> |
<a href="version/1/3/0/fr/code_of_conduct.md">Français</a> |
<a href="version/1/3/0/it/code_of_conduct.md">Italiano</a> |
<a href="version/1/3/0/pl/code_of_conduct.md">Polskie</a> |
<a href="version/1/3/0/pt/code_of_conduct.md">Português</a>
</td>
</tr>
<tr>
<td>HTML:</td>
<td>
<a href="version/1/3/0/">English</a> |
<a href="version/1/3/0/es/">Español</a> |
<a href="version/1/3/0/fr/">Français</a> |
<a href="version/1/3/0/it/">Italiano</a> |
<a href="version/1/3/0/pl/">Polskie</a> |
<a href="version/1/3/0/pt/">Português</a>
</td>
</tr>
<tr>
<td>Plain text:</td>
<td>
<a href="version/1/3/0/code_of_conduct.txt">English</a> |
<a href="version/1/3/0/es/code_of_conduct.txt">Español</a> |
<a href="version/1/3/0/fr/code_of_conduct.txt">Français</a> |
<a href="version/1/3/0/it/code_of_conduct.txt">Italiano</a> |
<a href="version/1/3/0/pl/code_of_conduct.txt">Polskie</a> |
<a href="version/1/3/0/pt/code_of_conduct.txt">Português</a>
</td>
</tr>
</table>
<p>
Note that since the Contributor Covenant uses semantic versioning for revisions, all URLs are permanent.
The Contributor Covenant uses semantic versioning for revisions so all URLs are permanent. Previous versions are available here: <a href="version/1/0/0/">1.0</a>, <a href="version/1/1/0/">1.1</a>, and <a href="version/1/2/0/">1.2</a>
</p>
</section>

<section id="how">
<h3>Using the Contributor Covenant</h3>
<p>We recommend that you add the Markdown or text version of the Contributor Covenant to your source code repository at the root level.</p>

<p>Thanks to <a href="https://github.com/simonv3/covenant-generator" target="_new">Simon Vansintjan</a> there is an automated way to add Contributor Covenant to your project. Assuming that you have node installed, simply run the following two commands from your project folder:</p>

<blockquote><code>
npm install -g covgen<br />
covgen your_email_address
</code></blockquote>

<p>You may want to add language similar to this to introduce your code of conduct:</p>
<blockquote>Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms.</blockquote>
<p>You may also use the permalinks given above to reference from your project home page.</p>
Expand All @@ -52,7 +94,7 @@ <h3>Using the Contributor Covenant</h3>
<section id="who">
<h3>Who Has Adopted the Contributor Covenant?</h3>
<p>
This code of conduct has already been adopted by <a href="https://github.com/search?l=markdown&q=%22contributor+covenant%22&ref=searchresults&type=Code&utf8=✓" target="_new">thousands of open source projects</a>. Here are just a few major projects using the Contributor Covenant. <a href="adopters/" title="Other adopters of the Contributor Covenant">See this page for more</a>.
This code of conduct has already been adopted by <a href="https://github.com/search?l=markdown&q=%22contributor+covenant%22&ref=searchresults&type=Code&utf8=✓" target="_new">nearly 10,000 open source projects</a>. Here are just a few major projects using the Contributor Covenant. <a href="adopters/" title="Other adopters of the Contributor Covenant">See this page for more</a>.
</p>

<ul class="column">
Expand Down Expand Up @@ -84,6 +126,7 @@ <h3>Who Has Adopted the Contributor Covenant?</h3>
<li><a href="https://github.com/rvm/rvm">RVM</a></li>
<li><a href="https://github.com/shoes/shoes4">Shoes</a></li>
<li><a href="https://github.com/spree/spree">Spree</a></li>
<li><a href="https://www.tinymce.com/docs/advanced/contributing-to-open-source/">TinyMCE</a></li>
<li><a href="https://github.com/voltrb/volt">Volt.rb</a></li>
</ul>
<br class="clear">
Expand Down
4 changes: 4 additions & 0 deletions styles/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,8 @@ section#footer {
border-top: 1px solid #000;
font-size: .8em;
text-align: center;
}

.indented {
margin-left: 2em;
}
50 changes: 38 additions & 12 deletions version/1/3/0/code_of_conduct.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,50 @@
# Contributor Code of Conduct

As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
As contributors and maintainers of this project, and in the interest of
fostering an open and welcoming community, 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, religion, or nationality.
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, religion, or nationality.

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery
* Personal attacks
* Trolling or insulting/derogatory comments
* Public or private harassment
* Publishing other's private information, such as physical or electronic addresses, without explicit permission
* The use of sexualized language or imagery
* Personal attacks
* Trolling or insulting/derogatory comments
* Public or private harassment
* Publishing other's private information, such as physical or electronic
addresses, without explicit permission
* Other unethical or 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, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
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, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team.
By adopting this Code of Conduct, project maintainers commit themselves to
fairly and consistently applying these principles to every aspect of managing
this project. Project maintainers who do not follow or enforce the Code of
Conduct may be permanently removed from the project team.

This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
This code of conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community.

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting a project maintainer at [INSERT EMAIL ADDRESS]. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. Maintainers are obligated to maintain confidentiality with regard to the reporter of an incident.
Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting a project maintainer at [INSERT EMAIL ADDRESS]. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. Maintainers are
obligated to maintain confidentiality with regard to the reporter of an
incident.

This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.3.0, available at [http://contributor-covenant.org/version/1/3/0/](http://contributor-covenant.org/version/1/3/0/)

This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 1.3.0, available at
[http://contributor-covenant.org/version/1/3/0/][version]

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/3/0/
2 changes: 1 addition & 1 deletion version/1/3/0/es/code_of_conduct.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ Este código de conducta aplica, tanto a los espacios del proyecto como a espaci

Ejemplos de abuso, acoso u otro comportamiento inaceptable pueden ser reportados al administrador del proyecto en [INSERTE CORREO AQUÍ]. Todas las quejas serán revisadas e investigadas, generando un resultado apropiado a las circunstancias. Los administradores tienen la obligación de mantener la confidencialidad de la persona que reportó el incidente.

Este Código de Conducta es una adaptación del [Contributor Covenant](http://contributor-covenant.org), versión 1.3.0, disponible en [http://contributor-covenant.org/version/1/3/0/](http://contributor-covenant.org/version/1/3/0/)
Este Código de Conducta es una adaptación del [Contributor Covenant](http://contributor-covenant.org), versión 1.3.0, disponible en [http://contributor-covenant.org/version/1/3/0/es/](http://contributor-covenant.org/version/1/3/0/es/)
2 changes: 1 addition & 1 deletion version/1/3/0/es/code_of_conduct.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ Este código de conducta aplica, tanto a los espacios del proyecto como a espaci

Ejemplos de abuso, acoso u otro comportamiento inaceptable pueden ser reportados al administrador del proyecto en [INSERTE CORREO AQUÍ]. Todas las quejas serán revisadas e investigadas, generando un resultado apropiado a las circunstancias. Los administradores tienen la obligación de mantener la confidencialidad de la persona que reportó el incidente.

Este Código de Conducta es una adaptación del "Contributor Covenant", versión 1.3.0, disponible en http://contributor-covenant.org/version/1/3/0/
Este Código de Conducta es una adaptación del "Contributor Covenant", versión 1.3.0, disponible en http://contributor-covenant.org/version/1/3/0/es/
Loading

0 comments on commit 0e927bc

Please sign in to comment.