Point to new reporting form link (owned by [email protected]) (#…

…4298)

* Point to new reporting form link (owned by [email protected])
* Alter text to add links to #reporting section

CODE_OF_CONDUCT.md

@@ -3,15 +3,15 @@ every member in the MDAnalysis community so that everyone can
 experience a welcoming, supportive, and productive environment that is
 free from harassment.
 
-<!-- markdown-toc start - Don't edit this section. Run M-x markdown-toc-generate-toc again -->
 **Table of Contents**
 
 - [MDAnalysis Code of Conduct and Community Guidelines](#mdanalysis-code-of-conduct-and-community-guidelines)
+- [Diversity, Equity, and Inclusion Statement](#diversity-equity-and-inclusion-statement)
 - [Reporting](#reporting)
+   * [Reporting at MDAnalysis Events and Meetups](#reporting-at-mdanalysis-events-and-meetups)
 - [Enforcement](#enforcement)
 - [Acknowledgment](#acknowledgment)
 
-<!-- markdown-toc end -->
 ## MDAnalysis Code of Conduct and Community Guidelines
 
 MDAnalysis is an engaged and respectful community made up of people from all
@@ -36,10 +36,8 @@ a misunderstanding and de-escalate things.
 However, sometimes these informal processes may be inadequate: they fail to
 work, there is urgency or risk to someone, nobody is intervening publicly and
 you don't feel comfortable speaking in public, etc. For these or other reasons,
-structured follow-up may be necessary and here we provide the means for that: we
-welcome reports by
-emailing [*Conduct-email*][conduct-mail] or
-in anonymous by filling out [*this form*][conduct-form].
+structured follow-up may be necessary and here we provide the means for that: [we
+welcome reports](#reporting) by filling out [*this form*][conduct-form].
 
 This code applies equally to founders, developers, mentors and new
 community members, in all spaces managed by MDAnalysis. This
@@ -109,6 +107,12 @@ at our [*user-mailing-list*](mailto:[email protected]).
    and telling someone that you are sorry is act of empathy that doesn’t
    automatically imply an admission of guilt.
 
+## Diversity, Equity, and Inclusion Statement
+
+MDAnalysis strives to ensure a welcoming, inclusive space for all. As a [*NumFOCUS*](https://numfocus.org/) sponsored project, we fully support their [*Diversity & Inclusion in Scientific Computing*](https://numfocus.org/programs/diversity-inclusion) (DISC) mission and abide by their Diversity Statement:
+
+> *"NumFOCUS welcomes and encourages participation in our community by people of all backgrounds and identities. We are committed to promoting and sustaining a culture that values mutual respect, tolerance, and learning, and we work together as a community to help each other live out these values."*
+
 ## Reporting
 
 If someone makes you or any other contributor feel unsafe or unwelcome, please
@@ -129,7 +133,7 @@ guidelines if you would like to contact a third-party outside of the MDAnalysis
 community.
 
 ### Reporting at MDAnalysis Events and Meetups
-If you are attending an MDAnalysis event or meetup and wish to make a report, you may contact the ombudspersons (who will identify themselves at the event) or other event staff/meetup organizers so that they can take any appropriate immediate response. If you would prefer not to do that, please [submit a report][conduct-form] to MDAnalysis. 
+If you are attending an MDAnalysis event or meetup and wish to [make a report](#reporting), you may contact the ombudspersons (who will identify themselves at the event) or other event staff/meetup organizers so that they can take any appropriate immediate response. If you would prefer not to do that, please [submit a report][conduct-form] to MDAnalysis. 
 
 Ombudspeople and event staff/meetup organizers will be happy to help participants contact venue security or local law enforcement, provide escorts, or otherwise assist those experiencing harassment to feel safe for the duration of the event/meetup.
 
@@ -172,8 +176,7 @@ materials under open licensing terms for us to easily reuse.
 All content on this page is licensed under a [*Creative Commons
 Attribution*](http://creativecommons.org/licenses/by/3.0/) license. 
 
-[conduct-mail]: mailto:[email protected]
-[conduct-form]: https://goo.gl/forms/w2IwBKkY3oT0aVEB3
+[conduct-form]: https://forms.gle/r2SMU4XcwM814CpJ9
 
 [NF-conduct]: https://numfocus.org/code-of-conduct