Author: nslater
Date: Sun Aug 17 19:01:19 2014
New Revision: 1618500
URL: http://svn.apache.org/r1618500
Log:
Remove spans
Modified:
couchdb/site/conduct.html
Modified: couchdb/site/conduct.html
URL:
http://svn.apache.org/viewvc/couchdb/site/conduct.html?rev=1618500&r1=1618499&r2=1618500&view=diff
==============================================================================
--- couchdb/site/conduct.html (original)
+++ couchdb/site/conduct.html Sun Aug 17 19:01:19 2014
@@ -17,7 +17,7 @@
<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 inquisitive</strong>. <span>Nobody knows
everything! </span><span>Asking questions early avoids many problems
later, so questions are encouraged, though they may be directed to the
appropriate forum.</span> <span>Those who are asked should be responsive
and helpful,</span> within the context of our shared goal of improving Apache
CouchDB.<br>
+<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>
@@ -30,14 +30,14 @@
<li>Personal insults, especially those using racist or sexist terms.
<li>Unwelcome sexual attention.
<li>Excessive or unnecessary profanity.
-<li><span>Repeated harassment of others. In general, if someone asks you to
stop, then stop.</span>
+<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.
<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><span>: 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.</span> 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><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.
