This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new d8bc2a1 Update COC to Apache edition (#890)
d8bc2a1 is described below
commit d8bc2a1f477e4a54b7e414bd27aeff10d7a2c6fa
Author: Gao Hongtao <[email protected]>
AuthorDate: Tue Mar 6 18:51:01 2018 +0800
Update COC to Apache edition (#890)
---
CODE_OF_CONDUCT.md | 90 +++++++++++++++++++++++++++++++++++++-----------------
1 file changed, 62 insertions(+), 28 deletions(-)
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 2549961..220f9b4 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,46 +1,80 @@
-# Contributor Covenant Code of Conduct
+*The following is copied for your convenience from
<https://www.apache.org/foundation/policies/conduct.html>. If there's a
discrepancy between the two, let us know or submit a PR to fix it.*
-## Our Pledge
+# CODE OF CONDUCT
-In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age,
body size, disability, ethnicity, gender identity and expression, level of
experience, nationality, personal appearance, race, religion, or sexual
identity and orientation.
+## INTRODUCTION
+This code of conduct applies to all spaces managed by the Apache Software
Foundation, including IRC, all public and private mailing lists, issue
trackers, wikis, blogs, Twitter, and any other communication channel used by
our communities. A code of conduct which is specific to in-person events (ie.,
conferences) is codified in the published ASF anti-harassment policy.
-## Our Standards
+We expect this code of conduct to be honored by everyone who participates in
the Apache community formally or informally, or claims any affiliation with the
Foundation, in any Foundation-related activities and especially when
representing the ASF, in any role.
-Examples of behavior that contributes to creating a positive environment
include:
+This code is __not exhaustive or complete__. 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.
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+## SPECIFIC GUIDELINES
+We strive to:
-Examples of unacceptable behavior by participants include:
+1. **Be open.** We invite anyone to participate in our community. We
preferably use public methods of communication for project-related messages,
unless discussing something sensitive. This applies to messages for help or
project-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.
-* The use of sexualized language or imagery and unwelcome sexual attention or
advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
professional setting
+2. **Be empathetic, welcoming, friendly, and patient.** 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.
-## Our Responsibilities
+3. **Be collaborative.** 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.
-Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.
+4. **Be inquisitive.** 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 project code.
-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.
+5. **Be careful in the words that we choose.** 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 behavior are not
acceptable. This includes, but is not limited to:
+ * Violent threats or language directed against another person.
+ * Sexist, racist, or otherwise discriminatory jokes and language.
+ * Posting sexually explicit or violent material.
+ * Posting (or threatening to post) other people's personally identifying
information ("doxing").
+ * Sharing private content, such as emails sent privately or non-publicly,
or unlogged forums such as IRC channel history.
+ * Personal insults, especially those using racist or sexist terms.
+ * Unwelcome sexual attention.
+ * Excessive or unnecessary profanity.
+ * Repeated harassment of others. In general, if someone asks you to stop,
then stop.
+ * Advocating for, or encouraging, any of the above behavior.
-## Scope
+6. **Be concise.** 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.
-This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an
appointed representative at an online or offline event. Representation of a
project may be further defined and clarified by project maintainers.
+ 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.
-## Enforcement
+ Try to stay on topic, especially in discussions that are already fairly
large.
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at [email protected]. The project
team will review and investigate all complaints, and will respond in a way that
it deems appropriate to the circumstances. The project team is obligated to
maintain confidentiality with regard to the reporter of an incident. Further
details of specific enforcement policies may be posted separately.
+7. **Step down considerately.** 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.
-Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.
+## DIVERSITY STATEMENT
+Apache 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.
-## Attribution
+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.
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+Though we welcome people fluent in all languages, Apache development is
conducted in English.
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+Standards for behaviour in the Apache 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.
+
+## REPORTING GUIDELINES
+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 shoul [...]
+
+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 either:
+
+* President of the Apache Software Foundation: Sam Ruby (rubys at intertwingly
dot net)
+
+Or one of our volunteers:
+
+* [Mark Thomas](http://home.apache.org/~markt/coc.html)
+* [Joan Touzet](http://home.apache.org/~wohali/)
+* [Sharan Foga](http://home.apache.org/~sharan/coc.html)
+
+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 in question at
<[email protected]>, 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.
+
+## ENDNOTES
+This Code defines **empathy** as "a vicarious participation in the emotions,
ideas, or opinions of others; the ability to imagine oneself in the condition
or predicament of another." **Empathetic** is the adjectival form of empathy.
+
+This statement thanks the following, on which it draws for content and
inspiration:
+
+* [CouchDB Project Code of conduct](http://couchdb.apache.org/conduct.html)
+* [Fedora Project Code of Conduct](http://fedoraproject.org/code-of-conduct)
+* [Speak Up! Code of Conduct](http://speakup.io/coc.html)
+* [Django Code of Conduct](https://www.djangoproject.com/conduct/)
+* [Debian Code of Conduct](http://www.debian.org/vote/2014/vote_002)
+* [Twitter Open Source Code of
Conduct](https://github.com/twitter/code-of-conduct/blob/master/code-of-conduct.md)
+* [Mozilla Code of
Conduct/Draft](https://wiki.mozilla.org/Code_of_Conduct/Draft#Conflicts_of_Interest)
+* [Python Diversity Appendix](https://www.python.org/community/diversity/)
+* [Python Mentors Home Page](http://pythonmentors.com)
--
To stop receiving notification emails like this one, please contact
[email protected].
