couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robertkowal...@apache.org
Subject [05/50] couchdb commit: updated refs/heads/asf-site to d3e3eb8
Date Mon, 11 May 2015 19:06:17 GMT
Remove br elements

git-svn-id: https://svn.apache.org/repos/asf/couchdb/site@1618505 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/c945ed31
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/c945ed31
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/c945ed31

Branch: refs/heads/asf-site
Commit: c945ed3184f2389bf8a85070d5dfd40899bfcee7
Parents: 4a072b0
Author: Noah Slater <nslater@apache.org>
Authored: Sun Aug 17 19:04:12 2014 +0000
Committer: Noah Slater <nslater@apache.org>
Committed: Sun Aug 17 19:04:12 2014 +0000

----------------------------------------------------------------------
 conduct.html | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/c945ed31/conduct.html
----------------------------------------------------------------------
diff --git a/conduct.html b/conduct.html
index 47acf6d..7785ad5 100644
--- a/conduct.html
+++ b/conduct.html
@@ -2,24 +2,19 @@
 
 <body>
 <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>
+<h1>Introduction</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.
 <p>This code of conduct also <u>applies to all spaces</u> managed by the
Apache CouchDB project, including IRC, all public and private mailing lists, the issue tracker,
the wiki, the blogs, Twitter, and any other forum which the community uses for communication.
<em><span style="color: rgb(255,0,0);">TODO: An expanded code of conduct is being
drafted for events that involve physical interaction (conferences), based on the</span>
<a href="https://www.apache.org/foundation/policies/anti-harassment.html">published
ASF anti-harassment policy</a>.</em>
 <p>This code <u>is not exhaustive or complete</u>. It serves to distill
our common understanding of a collaborative, shared environment and goals. We expect it to
be followed in spirit as much as in the letter, so that it can enrich all of us and the technical
communities in which we participate.
 <h1>Specific Guidelines</h1>
 <p>We strive to:
 <ol>
-<li><strong>Be open</strong>. We invite anyone to participate in our community.
As per <a href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=40511017#ProjectBylaws%28WIP%29-3.DecisionMaking">Section
3 of our Project Bylaws</a>, we preferably use public methods of communication for project-related
messages, unless discussing something sensitive. This applies to messages for help or CouchDB-related
support, too; not only is a public support request much more likely to result in an answer
to a question, it also makes sure that any inadvertent mistakes made by people answering will
be more easily detected and corrected.<br>
-<br>
-<li><strong>Be <a href="#ProjectCodeofConductandDiversityStatement(WIP)-Endnotes">empathetic</a>,
welcoming, friendly, and patient</strong>: We work together to resolve conflict, assume
good intentions, and do our best to act in an empathetic fashion. We may all experience some
frustration from time to time, but we do not allow frustration to turn into a personal attack.
A community where people feel uncomfortable or threatened is not a productive one. We should
be respectful when dealing with other community members as well as with people outside our
community.<br>
-<br>
-<li><strong>Be collaborative.</strong> Our work will be used by other people,
and in turn we will depend on the work of others. When we make something for the benefit of
the project, we are willing to explain to others how it works, so that they can build on the
work to make it even better. Any decision we make will affect users and colleagues, and we
take those consequences seriously when making decisions.<br>
-<br>
+<li><p><strong>Be open</strong>. We invite anyone to participate
in our community. As per <a href="https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=40511017#ProjectBylaws%28WIP%29-3.DecisionMaking">Section
3 of our Project Bylaws</a>, we preferably use public methods of communication for project-related
messages, unless discussing something sensitive. This applies to messages for help or CouchDB-related
support, too; not only is a public support request much more likely to result in an answer
to a question, it also makes sure that any inadvertent mistakes made by people answering will
be more easily detected and corrected.
+<li><p><strong>Be <a href="#ProjectCodeofConductandDiversityStatement(WIP)-Endnotes">empathetic</a>,
welcoming, friendly, and patient</strong>: We work together to resolve conflict, assume
good intentions, and do our best to act in an empathetic fashion. We may all experience some
frustration from time to time, but we do not allow frustration to turn into a personal attack.
A community where people feel uncomfortable or threatened is not a productive one. We should
be respectful when dealing with other community members as well as with people outside our
community.
+<li><p><strong>Be collaborative.</strong> Our work will be used by
other people, and in turn we will depend on the work of others. When we make something for
the benefit of the project, we are willing to explain to others how it works, so that they
can build on the work to make it even better. Any decision we make will affect users and colleagues,
and we take those consequences seriously when making decisions.
 <li>
-<p><strong>Be inquisitive</strong>. Nobody knows everything! Asking questions
early avoids many problems later, so questions are encouraged, though they may be directed
to the appropriate forum. Those who are asked should be responsive and helpful, within the
context of our shared goal of improving Apache CouchDB.<br>
-<br>
-<li><strong>Be careful in the words that we choose.</strong> Whether we
are participating as professionals or volunteers, we value professionalism in all interactions,
and take responsibility for our own speech. Be kind to others. Do not insult or put down other
participants. Harassment and other exclusionary behaviour are not acceptable. This includes,
but is not limited to:<br>
-<br>
+<p><p><strong>Be inquisitive</strong>. Nobody knows everything! Asking
questions early avoids many problems later, so questions are encouraged, though they may be
directed to the appropriate forum. Those who are asked should be responsive and helpful, within
the context of our shared goal of improving Apache CouchDB.
+<li><p><strong>Be careful in the words that we choose.</strong> Whether
we are participating as professionals or volunteers, we value professionalism in all interactions,
and take responsibility for our own speech. Be kind to others. Do not insult or put down other
participants. Harassment and other exclusionary behaviour are not acceptable. This includes,
but is not limited to:
 <ul>
 <li>Violent threats or language directed against another person.
 <li>Sexist, racist, or otherwise discriminatory jokes and language.
@@ -30,13 +25,11 @@
 <li>Unwelcome sexual attention.
 <li>Excessive or unnecessary profanity.
 <li>Repeated harassment of others. In general, if someone asks you to stop, then stop.
-<li>Advocating for, or encouraging, any of the above behaviour.</ul><strong><br></strong>
-<li><strong>Be concise</strong>. Keep in mind that what you write once
will be read by hundreds of persons. Writing a short email means people can understand the
conversation as efficiently as possible. Short emails should always strive to be empathetic,
welcoming, friendly and patient. When a long explanation is necessary, consider adding a summary.
+<li>Advocating for, or encouraging, any of the above behaviour.</ul>
+<li><p><strong>Be concise</strong>. Keep in mind that what you write
once will be read by hundreds of persons. Writing a short email means people can understand
the conversation as efficiently as possible. Short emails should always strive to be empathetic,
welcoming, friendly and patient. When a long explanation is necessary, consider adding a summary.
 <p>Try to bring new ideas to a conversation so that each mail adds something unique
to the thread, keeping in mind that the rest of the thread still contains the other messages
with arguments that have already been made.
-<p>Try to stay on topic, especially in discussions that are already fairly large.<br>
-<br>
-<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>
+<p>Try to stay on topic, especially in discussions that are already fairly large.
+<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>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.


Mime
View raw message