to make it more applicaple to real world software develoment by making
it focus on software and dephasizing contributor's personal traits.
The changes also attempt reduce the Code of Conduct's potential for abuse
by people of any agenda who would seek to use it for a power grab.
Signed-off-by: Michael Vlahos
---
Documentation/process/code-of-conduct.rst | 77 +++
1 file changed, 50 insertions(+), 27 deletions(-)
diff --git a/Documentation/process/code-of-conduct.rst
b/Documentation/process/code-of-conduct.rst
index ab7c24b5478c..54a6784cd0d7 100644
--- a/Documentation/process/code-of-conduct.rst
+++ b/Documentation/process/code-of-conduct.rst
@@ -1,4 +1,4 @@
-Contributor Covenant Code of Conduct
+Code of Conduct
Our Pledge
@@ -6,10 +6,25 @@ Our Pledge
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, sex characteristics, gender identity and
-expression, level of experience, education, socio-economic status, nationality,
-personal appearance, race, religion, or sexual identity and orientation.
+our community a harassment-free experience for everyone; a place where all that
+matters is the quality of the code they contribute. Personal details of
+contributors are irrelevant. Contributor's opinions and comments on topics not
+directly related to the project being contributed to are also irrelevant.
+
+While we seek to be welcoming, it is important to recall that some amount of
+conflict is both unavoidable and healthy. Thus to attempt to avoid all conflict
+is both destructive and futile. Instead our goal is to encourage criticism and
+critique of code that is both respectful and civil with the express aim of
+improving the overall quality of the codebase, and also to prevent low quality
+contributions from being accepted into the codebase. Critique and criticism of
+a contributor's overall history of code quality in that contributor's
+contributions to the project must be allowed in a respectful and civil manner.
+
+To prevent abuse of it, we assert that the purpose of the Code of Conduct is to
+facilitate the creation of the best, most robust, software possible; not to
+control the thought or speech of contributors outside the bounds of the
project.
+We respect the rights of contributors to do and say whatever they like when not
+directly representing the project.
Our Standards
=
@@ -21,17 +36,19 @@ include:
* 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
Examples of unacceptable behavior by participants include:
-* The use of sexualized language or imagery and unwelcome sexual attention or
- advances
+* The use of sexual imagery and 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
+* Intentionally mentioning one's own irrelevant personal details and opinions
+* Not respecting the irrelevance of a contributor's personal details
+* Not respecting the irrelevance of a contributor's opinions outside the scope
+ of the project
* Other conduct which could reasonably be considered inappropriate in a
professional setting
@@ -40,35 +57,40 @@ Our Responsibilities
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.
+and are expected to take appropriate, consistent, and fair corrective action in
+response to any instances of unacceptable behavior.
-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.
+Maintainers have the right 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 temporarily ban any contributor for behaviors that
+violate the Code of Conduct.
Scope
=
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
