Merge branch '6.2' into 6.3

* 6.2:
  Minor
  move further reading, convert to rst, remove dead links

Author: OskarStark

contributing/diversity/further_reading.rst

@@ -0,0 +1,56 @@
+Further Reading / Viewing
+=========================
+
+This is a non-exhaustive list of further reading on the topic of diversity.
+
+Diversity in Open Source
+------------------------
+
+`Sage Sharp - What makes a good community? <https://sage.thesharps.us/2015/10/06/what-makes-a-good-community>`_
+`Ashe Dryden - The Ethics of Unpaid Labor and the OSS Community <https://www.ashedryden.com/blog/the-ethics-of-unpaid-labor-and-the-oss-community>`_
+`Model View Culture - The Dehumanizing Myth of the Meritocracy <https://modelviewculture.com/pieces/the-dehumanizing-myth-of-the-meritocracy>`_
+`Annalee - How “Good Intent” Undermines Diversity and Inclusion <https://thebias.com/2017/09/26/how-good-intent-undermines-diversity-and-inclusion>`_
+`Karolina Szczur - Building Inclusive Communities <https://speakerdeck.com/fox/building-inclusive-communities>`_
+
+Code of Conduct
+---------------
+
+`Karolina Szczur - When a Code of Conduct becomes harmful <https://medium.com/@fox/when-a-code-of-conduct-becomes-harmful-1d4e737ff7aa>`_
+`Ashe Dryden - Codes of Conduct 101 + FAQ <https://www.ashedryden.com/blog/codes-of-conduct-101-faq>`_
+`Phil Sturgeon - Codes of Conduct: Maybe They're Not So Bad? <https://philsturgeon.uk/2016/09/15/codes-of-conduct-maybe-theyre-not-so-bad>`_
+
+Inclusive language
+------------------
+
+`Jenée Desmond-Harris - Why I’m finally convinced it's time to stop saying "you guys" <https://www.vox.com/2015/6/11/8761227/you-guys-sexism-language>`_
+`inclusive language presentations <https://github.com/hcorona/diversity-inclusion/blob/master/inclusive-language-presentations.md>`_
+
+Other talks and Blog Posts
+--------------------------
+
+`Lena Reinhard – A Talk About Nothing <https://www.youtube.com/watch?v=D3e3V66TH2Y>`_
+`Lena Reinhard - A Talk about Everything <https://www.youtube.com/watch?v=CZx7rYoq1Uw>`_
+`Sage Sharp - SCALE: Improving Diversity with Maslow’s hierarchy <https://sage.thesharps.us/2016/01/24/scale-improving-diversity-with-maslows-hierarchy>`_
+`UCSF - Unconscious Bias <https://diversity.ucsf.edu/resources/unconscious-bias>`_
+`Responding to harassment reports <http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Responding_to_reports>`_
+`Unconscious bias at work <https://rework.withgoogle.com/guides/unbiasing-raise-awareness/steps/watch-unconscious-bias-at-work>`_
+`CIS people declaring their pronouns <https://medium.com/@mrsexsmith/dear-cis-people-who-put-your-pronouns-on-your-hello-my-name-is-nametags-78c047ed7af1>`_
+
+Books
+-----
+
+`Emily Chang - Brotopia <http://www.brotopiabook.com>`_
+
+Websites
+--------
+
+`Better Allies <https://maleallies.com>`_
+`Geek Feminism WIKI <http://geekfeminism.wikia.com/wiki/Geek_Feminism_Wiki>`_
+`Open Source Diversity <https://opensourcediversity.org>`_
+`Open Demographics documentation <https://drnikki.github.io/open-demographics>`_
+`CHAOSS Metrics <https://chaoss.community/metrics/>`_
+`Up for grabs <https://up-for-grabs.net/#/>`_
+`The developmental model of intercultural sensitivity (DMIS) <http://meldye.weebly.com/what-is-dmis.html>`_
+`DiversifyTech <https://www.diversifytech.co>`_
+`so-you-just-learned <https://github.com/sublimemarch/so-you-just-learned/blob/master/README.md>`_
+`The Post-Meritocracy Manifesto <https://postmeritocracy.org>`_

contributing/diversity/index.rst

@@ -5,3 +5,4 @@ Diversity Initiative
     :maxdepth: 2
 
     governance
+    further_reading