Author: nslater
Date: Sun Aug 17 19:02:08 2014
New Revision: 1618502
URL: http://svn.apache.org/r1618502
Log:
Replace all entities
Modified:
couchdb/site/conduct.html
Modified: couchdb/site/conduct.html
URL:
http://svn.apache.org/viewvc/couchdb/site/conduct.html?rev=1618502&r1=1618501&r2=1618502&view=diff
==============================================================================
--- couchdb/site/conduct.html (original)
+++ couchdb/site/conduct.html Sun Aug 17 19:02:08 2014
@@ -1,7 +1,6 @@
<title>View Source</title>
<body>
-<p>
<p><em>This Code of Conduct and Diversity Statement has not yet been made
official by the community. This is a work in progress.</em>
<h1>Introduction<em><br></em></h1>
<p>This code of conduct <u>governs how we behave</u> in any forum and whenever
we will be judged by our actions. We expect it to be honoured by everyone who
participates in the Apache CouchDB community <a
href="http://formally%20recognized%20roles%20and%20responsibilities";>formally</a>
or informally, or claims any affiliation with the project.
@@ -39,13 +38,13 @@
<li>
<p><strong>Step down considerately</strong>: Members of every project come and
go. When somebody leaves or disengages from the project they should tell people
they are leaving and take the proper steps to ensure that others can pick up
where they left off. In doing so, they should remain respectful of those who
continue to participate in the project and should not misrepresent the
project's goals or achievements. Likewise, community members should respect any
individual's choice to leave the project.</ol>
<h1>Diversity Statement</h1>
-<p>Apache CouchDB welcomes and encourages participation by everyone. We
are committed to being a community that everyone feels good about joining.
Although we may not be able to satisfy everyone, we will always work to treat
everyone well.
+<p>Apache CouchDB welcomes and encourages participation by everyone. We are
committed to being a community that everyone feels good about joining. Although
we may not be able to satisfy everyone, we will always work to treat everyone
well.
<p>No matter how you identify yourself or how others perceive you: we welcome
you. Though no list can hope to be comprehensive, we explicitly honour
diversity in: age, culture, ethnicity, genotype, gender identity or expression,
language, national origin, neurotype, phenotype, political beliefs, profession,
race, religion, sexual orientation, socioeconomic status, subculture and
technical ability.
<p>Though we welcome people fluent in all languages, Apache CouchDB
development is conducted in English.
<p>Standards for behaviour in the Apache CouchDB community are detailed in the
Code of Conduct above. We expect participants in our community to meet these
standards in all their interactions and to help others to do so as well.
<p>If you want to help encourage a more diverse community, we encourage you to
<em><span style="color: rgb(255,0,0);">TODO: join the diversity mailing list at
<TBD></span></em>
<h1>Reporting Guidelines</h1>
-<p>While this code of conduct should be adhered to by participants, we
recognize that sometimes people may have a bad day, or be unaware of some of
the guidelines in this code of conduct. When that happens, you may reply to
them and point out this code of conduct. Such messages may be in public or in
private, whatever is most appropriate. However, regardless of whether the
message is public or not, it should still adhere to the relevant parts of this
code of conduct; in particular, it should not be abusive or disrespectful.
+<p>While this code of conduct should be adhered to by participants, we
recognize that sometimes people may have a bad day, or be unaware of some of
the guidelines in this code of conduct. When that happens, you may reply to
them and point out this code of conduct. Such messages may be in public or in
private, whatever is most appropriate. However, regardless of whether the
message is public or not, it should still adhere to the relevant parts of this
code of conduct; in particular, it should not be abusive or disrespectful.
<p>If you believe someone is violating this code of conduct, you may reply to
them and point out this code of conduct. Such messages may be in public or in
private, whatever is most appropriate. Assume good faith; it is more likely
that participants are unaware of their bad behaviour than that they
intentionally try to degrade the quality of the discussion. Should there be
difficulties in dealing with the situation, you may report your compliance
issues in confidence to <a
href="mailto:[email protected]";>[email protected]</a>.
<p>If the violation is in documentation or code, for example inappropriate
pronoun usage or word choice within official documentation, we ask that people
report these privately to the project at <a
href="mailto:[email protected]";>[email protected]</a>, and,
if they have sufficient ability within the project, to resolve or remove the
concerning material, being mindful of the perspective of the person originally
reporting the issue.
<h1>Endnotes</h1>
@@ -60,4 +59,3 @@
<li><a
href="https://wiki.mozilla.org/Code_of_Conduct/Draft#Conflicts_of_Interest";>Mozilla
Code of Conduct/Draft</a>
<li><a href="https://www.python.org/community/diversity/";>Python Diversity
Appendix</a>
<li><a href="http://pythonmentors.com/";>Python Mentors Home Page</a></ul>
-<p>
