[bug#31480] [PATCH 1/2] documentation: Add Code of Conduct section.

[bug#31480] [PATCH 1/2] documentation: Add Code of Conduct section.

[Tonton]

 * doc/contributing.texi: Add Code of Conduct section.
---
 doc/contributing.texi | 110 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 109 insertions(+), 1 deletion(-)

diff --git a/doc/contributing.texi b/doc/contributing.texi
index 2792fe2b2..8ea9c85e0 100644
--- a/doc/contributing.texi
+++ b/doc/contributing.texi
@@ -13,13 +13,15 @@ We want to provide a warm, friendly, and harassment-free environment, so
 that anyone can contribute to the best of their abilities.  To this end
 our project uses a ``Contributor Covenant'', which was adapted from
 @url{http://contributor-covenant.org/}.  You can find a local version in
-the @file{CODE-OF-CONDUCT} file in the source tree.
+the @file{CODE-OF-CONDUCT} file in the source tree or in the following
+(@pxref{Code of Conduct}).
 
 Contributors are not required to use their legal name in patches and
 on-line communication; they can use any name or pseudonym of their
 choice.
 
 @menu
+* Code of Conduct::             Our pledge to foster a friendly environment.
 * Building from Git::           The latest and greatest.
 * Running Guix Before It Is Installed::  Hacker tricks.
 * The Perfect Setup::           The right tools.
@@ -27,6 +29,112 @@ choice.
 * Submitting Patches::          Share your work.
 @end menu
 
+@node Code of Conduct
+@section Code of Conduct
+@anchor{#Code-of-Conduct}
+
+@quotation Note
+Here, "project" refers to GNU Guix, and "project maintainer(s)"
+refers to maintainer(s) of GNU Guix.
+@end quotation
+
+@subsection Our Pledge
+@anchor{#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, gender identity and
+expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+@subsection Our Standards
+@anchor{#Our-Standards}
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+@itemize
+@item
+Using welcoming and inclusive language
+@item
+Being respectful of differing viewpoints and experiences
+@item
+Gracefully accepting constructive criticism
+@item
+Focusing on what is best for the community
+@item
+Showing empathy towards other community members
+@end itemize
+
+Examples of unacceptable behavior by participants include:
+
+@itemize
+@item
+The use of sexualized language or imagery and unwelcome sexual attention
+or advances
+@item
+Trolling, insulting/derogatory comments, and personal or political
+attacks
+@item
+Public or private harassment
+@item
+Publishing others' private information, such as a physical or electronic
+address, without explicit permission
+@item
+Other conduct which could reasonably be considered inappropriate in a
+professional setting
+@end itemize
+
+@subsection Our Responsibilities
+@anchor{#Our-Responsibilities}
+
+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.
+
+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.
+
+@subsection Scope
+@anchor{#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 online or
+offline event. Representation of a project may be further defined and
+clarified by project maintainers.
+
+@subsection Enforcement
+@anchor{#Enforcement}
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may
+be reported by contacting the project team at
+@email{guix-maintainers@@gnu.org}.  All complaints will be reviewed and
+investigated and will result in a response that is deemed necessary and
+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.
+
+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.
+
+@subsection Attribution
+@anchor{#Attribution}
+This Code of Conduct is adapted from the
+@uref{https://www.contributor-covenant.org,Contributor Covenant},
+version 1.4, available at
+@uref{https://www.contributor-covenant.org/version/1/4/code-of-conduct.html}
+
+
 @node Building from Git
 @section Building from Git
 
-- 
2.17.0

[bug#31481] [PATCH 2/2] documentation: Update CODE-OF-CONDUCT.

[Tonton]

 * CODE-OF-CONDUCT: Update to version 1.4.
---
 CODE-OF-CONDUCT | 114 ++++++++++++++++++++++++++++++------------------
 1 file changed, 71 insertions(+), 43 deletions(-)

diff --git a/CODE-OF-CONDUCT b/CODE-OF-CONDUCT
index 0458fd787..ceab378a7 100644
--- a/CODE-OF-CONDUCT
+++ b/CODE-OF-CONDUCT
@@ -1,51 +1,79 @@
-Contributor Code of Conduct
+Code of Conduct
 
-  Note: In the sequel, "project" refers to GNU Guix, and "project
+  Note: Here, "project" refers to GNU Guix, and "project
   maintainer(s)" refers to maintainer(s) of GNU Guix.
 
-As contributors and maintainers of this project, and in the interest of
-fostering an open and welcoming community, we pledge to respect all
-people who contribute through reporting issues, posting feature
-requests, updating documentation, submitting pull requests or patches,
-and other activities.
+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, gender identity and expression, level of experience,
+education, socio-economic status, nationality, personal appearance, race,
+religion, or sexual identity and orientation.
+
+Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+
+* 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
 
-We are committed to making participation in this project a
-harassment-free experience for everyone, regardless of level of
-experience, gender, gender identity and expression, sexual orientation,
-disability, personal appearance, body size, race, ethnicity, age,
-religion, or nationality.
 
 Examples of unacceptable behavior by participants include:
 
-* The use of sexualized language or imagery
-* Personal attacks
-* Trolling or insulting/derogatory comments
+
+* 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 other's private information, such as physical or electronic
-addresses, without explicit permission
-* Other unethical or unprofessional conduct
-
-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.
-
-By adopting this Code of Conduct, project maintainers commit themselves
-to fairly and consistently applying these principles to every aspect of
-managing this project. Project maintainers who do not follow or enforce
-the Code of Conduct may be permanently removed from the project team.
-
-This Code of Conduct applies both within project spaces and in public
-spaces when an individual is representing the project or its community.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may
-be reported by contacting a project maintainer at guix-maintainers@gnu.org.
-All complaints will be reviewed and investigated and will
-result in a response that is deemed necessary and appropriate to the
-circumstances. Maintainers are obligated to maintain confidentiality
-with regard to the reporter of an incident.
-
-This Code of Conduct is adapted from the Contributor Covenant
-(http://contributor-covenant.org), version 1.3.0, available at
-http://contributor-covenant.org/version/1/3/0/
+* 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
+
+
+Our Responsibilities
+
+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.
+
+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.
+
+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 online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at <guix-maintainers@gnu.org>. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and 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.
+
+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.
+
+Attribution
+
+This Code of Conduct is adapted from the Contributor Covenant, version 1.4,
+available at <https://www.contributor-covenant.org/version/1/4/code-of-conduct.html>
+
-- 
2.17.0

[bug#31480] Related bugs

[Tonton]

[-- Attachment #1: Type: text/plain, Size: 521 bytes --]

I fudged sending a list of patches once more.

The bugs 31480 and 31481 are the same list of patches for updating and
improving the code of conduct in the guix source tree and manual.

Bug 31482 is related, but deals with the website.

-- 
I use gpg to sign my emails. All the symbols you may see at the bottom
of this mail is my cryptographic signature. It can be ignored, or used
to check that it really is me sending this email. Learn more by asking
me or see: https://u.fsf.org/zb or https://ssd.eff.org/

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

bug#31481: [PATCH 2/2] documentation: Update CODE-OF-CONDUCT.

[Ludovic Courtès]

Hello,

Tonton <tonton@riseup.net> skribis:

>  * CODE-OF-CONDUCT: Update to version 1.4.

I finally did that in commit a076f19908d06b6df49f1c25c40de8838213cd71.

Thank you for initiating this change!

Ludo’.

bug#31480: documentation: Add code of conduct section

[Gábor Boskovits]

[-- Attachment #1: Type: text/plain, Size: 25 bytes --]

Already fixed as #31481.

[-- Attachment #2: Type: text/html, Size: 46 bytes --]