Copy edits

dstansby · dstansby · commit 91067d6dceed · 2020-09-23T18:36:47.000+01:00
diff --git a/doc/devel/conduct/CoC_reporting_manual.rst b/doc/devel/conduct/CoC_reporting_manual.rst
@@ -3,10 +3,10 @@
 .. _CoC_reporting_manual:
 
 Matplotlib Code of Conduct - How to follow up on a report
-----------------------------------------------------
+---------------------------------------------------------
 
-This is the manual followed by Matplotlib's Code of Conduct Committee. It's used
-when we respond to an issue to make sure we're consistent and fair.
+This is the manual followed by Matplotlib's Code of Conduct Committee. It's
+used when we respond to an issue to make sure we're consistent and fair.
 
 Enforcing the Code of Conduct impacts our community today and for the future.
 It's an action that we do not take lightly. When reviewing enforcement
@@ -100,15 +100,16 @@ severe breaches like personal threats, violent, sexist or racist language.
 When a member of the Code of Conduct committee becomes aware of a clear and
 severe breach, they will do the following:
 
-* Immediately disconnect the originator from all Matplotlib communication channels.
+* Immediately disconnect the originator from all Matplotlib communication
+  channels.
 * Reply to the reporter that their report has been received and that the
   originator has been disconnected.
 * In every case, the moderator should make a reasonable effort to contact the
   originator, and tell them specifically how their language or actions
   qualify as a "clear and severe breach".  The moderator should also say
   that, if the originator believes this is unfair or they want to be
-  reconnected to Matplotlib, they have the right to ask for a review, as below, by
-  the Code of Conduct Committee.
+  reconnected to Matplotlib, they have the right to ask for a review, as below,
+  by the Code of Conduct Committee.
   The moderator should copy this explanation to the Code of Conduct Committee.
 * The Code of Conduct Committee will formally review and sign off on all cases
   where this mechanism has been applied to make sure it is not being used to
@@ -149,10 +150,10 @@ justified request. If the Committee finds the need to use off-list
 communications (e.g. phone calls for early/rapid response), it should in all
 cases summarize these back to the list so there's a good record of the process.
 
-The Code of Conduct Committee should aim to have a resolution agreed upon within
-two weeks. In the event that a resolution can't be determined in that time, the
-committee will respond to the reporter(s) with an update and projected timeline
-for resolution.
+The Code of Conduct Committee should aim to have a resolution agreed upon
+within two weeks. In the event that a resolution can't be determined in that
+time, the committee will respond to the reporter(s) with an update and
+projected timeline for resolution.
 
 
 .. _CoC_resolutions:
@@ -169,8 +170,9 @@ Possible responses may include:
 
 * Taking no further action
 
-  - if we determine no violations have occurred.
-  - if the matter has been resolved publicly while the committee was considering responses.
+  - if it is determined no violations have occurred.
+  - if the matter has been resolved publicly while the committee was
+    considering responses.
 
 * Coordinating voluntary mediation: if all involved parties agree, the
   Committee may facilitate a mediation process as detailed above.
@@ -195,22 +197,22 @@ Possible responses may include:
   temporarily refrain from community participation. If the individual chooses
   not to take a temporary break voluntarily, the committee may issue a
   "mandatory cooling off period".
-* A permanent or temporary ban from some or all Matplotlib spaces (mailing lists,
-  gitter.im, etc.). The group will maintain records of all such bans so that
-  they may be reviewed in the future or otherwise maintained.
+* A permanent or temporary ban from some or all Matplotlib spaces (mailing
+  lists, forums, chat rooms, etc.). The group will maintain records of all
+  such bans so that they may be reviewed in the future or otherwise maintained.
 
 Once a resolution is agreed upon, but before it is enacted, the committee will
 contact the original reporter and any other affected parties and explain the
 proposed resolution. The committee will ask if this resolution is acceptable,
 and must note feedback for the record.
 
-Finally, the committee will make a report to the Matplotlib Steering Council (as
-well as the Matplotlib core team in the event of an ongoing resolution, such as a
-ban).
+Finally, the committee will make a report to the Matplotlib Steering Council
+(as well as the Matplotlib core team in the event of an ongoing resolution,
+such as a ban).
 
 The committee will never publicly discuss the issue; all public statements will
-be made by the chair of the Code of Conduct Committee or the Matplotlib Steering
-Council.
+be made by the chair of the Code of Conduct Committee or the Matplotlib
+Steering Council.
 
 
 Conflicts of Interest
diff --git a/doc/devel/conduct/code_of_conduct.rst b/doc/devel/conduct/code_of_conduct.rst
@@ -8,12 +8,13 @@ Introduction
 This code of conduct applies to all spaces managed by the Matplotlib project,
 including all public and private mailing lists, issue trackers, wikis, blogs,
 Twitter, and any other communication channel used by our community.  The
-Matplotlib project does not organise in-person events, however events related
-to our community should have a code of conduct similar in spirit to this one.
+Matplotlib project does not currently organise in-person events, however events
+related to our community should have a code of conduct similar in spirit to
+this one.
 
 This code of conduct should be honored by everyone who participates in
-the Matplotlib community formally or informally, or claims any affiliation with the
-project, in any project-related activities and especially when representing the
+the Matplotlib community formally or informally, or claims any affiliation with
+the project, in any project-related activities and when representing the
 project, in any role.
 
 This code is not exhaustive nor complete. It serves to distill our common
@@ -59,21 +60,25 @@ We strive 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").
+    - 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, without the sender's consent.
+      or unlogged forums such as IRC channel history, without the sender's
+      consent.
     - Personal insults, especially those using racist or sexist terms.
     - Unwelcome sexual attention.
-    - Excessive profanity. Please avoid swearwords; people differ greatly in their sensitivity to swearing.
-    - Repeated harassment of others. In general, if someone asks you to stop, then stop.
+    - Excessive profanity. Please avoid swearwords; people differ greatly in
+      their sensitivity to swearing.
+    - Repeated harassment of others. In general, if someone asks you to stop,
+      then stop.
     - Advocating for, or encouraging, any of the above behaviour.
 
 
 Diversity Statement
 -------------------
 
-The Matplotlib project welcomes and encourages participation by everyone. We are
-committed to being a community that everyone enjoys being part of. Although
+The Matplotlib project welcomes and encourages participation by everyone. We
+are committed to being a community that everyone enjoys being part of. Although
 we may not always be able to accommodate each individual's preferences, we try
 our best to treat everyone kindly.
 
@@ -109,11 +114,10 @@ report to the Code of Conduct Committee directly, or ask the Committee for
 advice, in confidence.
 
 You can report issues to the Matplotlib Code of Conduct committee, at
-Matplotlib@numfocus.org. Currently, the committee consists of:
+matplotlib@numfocus.org. Currently, the committee consists of:
 
-- Stefan van der Walt
-- Melissa Weber Mendonça
-- Anirudh Subramanian
+- Thomas Caswell
+- Hannah Aizenman
 
 If your report involves any members of the committee, or if they feel they have
 a conflict of interest in handling it, then they will recuse themselves from
@@ -129,22 +133,23 @@ Incident reporting resolution & Code of Conduct enforcement
 *This section summarizes the most important points, more details can be found
 in* :ref:`CoC_reporting_manual`.
 
-We will investigate and respond to all complaints. The Matplotlib Code of Conduct
-Committee and the Matplotlib Steering Committee (if involved) will protect the
-identity of the reporter, and treat the content of complaints as confidential
-(unless the reporter agrees otherwise).
+We will investigate and respond to all complaints. The Matplotlib Code of
+Conduct Committee and the Matplotlib Steering Committee (if involved) will
+protect the identity of the reporter, and treat the content of complaints as
+confidential (unless the reporter agrees otherwise).
 
 In case of severe and obvious breaches, e.g. personal threat or violent, sexist
-or racist language, we will immediately disconnect the originator from Matplotlib
-communication channels; please see the manual for details.
+or racist language, we will immediately disconnect the originator from
+Matplotlib communication channels; please see the manual for details.
 
 In cases not involving clear severe and obvious breaches of this code of
 conduct, the process for acting on any received code of conduct violation
 report will be:
 
 1. acknowledge report is received
 2. reasonable discussion/feedback
-3. mediation (if feedback didn't help, and only if both reporter and reportee agree to this)
+3. mediation (if feedback didn't help, and only if both reporter and reportee
+   agree to this)
 4. enforcement via transparent decision (see :ref:`CoC_resolutions`) by the
    Code of Conduct Committee
 
