From eadf596e00daf649cffee431938b907d80f8e675 Mon Sep 17 00:00:00 2001 From: Justin W. Flory (he/him) Date: Dec 03 2020 19:19:24 +0000 Subject: Index: Refactor from git mishaps, reorganize some content I reviewed this page today and was surprised to discover that somehow, this file has an older state from when we were solving merge conflicts. Oh no! I tried to mitigate by cleaning up the mistakes and typos. I also reorganized the format in an attempt to de-duplicate some information. Git merge conflicts bite hard sometimes! Signed-off-by: Justin W. Flory (he/him) --- diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc index da5c69b..2e5c6a8 100644 --- a/modules/ROOT/pages/index.adoc +++ b/modules/ROOT/pages/index.adoc @@ -3,52 +3,42 @@ include::ROOT:partial$attributes.adoc[] = Diversity and inclusion in Fedora :toc: -The goal of our team is to encourage diversity and inclusion in the Fedora community.By inclusion, we mean to create a comfortable environment to encourage and empower everyone to be part of the community. -Inclusion is not about just being respectful to each other anymore! -It is to make the community accessible to groups from underpresented, disabled and many other communities. -While the Fedora Project is open to contributions from everyone, our community stands strong on pillars of mutual respect, tolerance and encouragement. -Please checkout our xref:project:ROOT:code-of-conduct.adoc[code of conduct] for more information. +Welcome to the documentation site for the Fedora D&I Team! -To get a sneak peak of the Fedora community, check out https://www.youtube.com/watch?v=O1eHRoEps6I[Flock to Fedora-2019] that happened at Budapest! +The goal of our team is to encourage diversity and inclusion in the Fedora Community. +By inclusion, we mean to create a comfortable environment to encourage and empower everyone to be part of the community. +Inclusion is not about just being respectful to each other; +it is to make the community accessible to groups from under-represented, disabled and many other communities. -image::infographic-2020.png[Infographic with statistics about Fedora Women's Day since 2016. Created by Smera Goel.] - -[[goals]] -== Goals - -The Fedora D&I team strives to enhance diversity and inclusion by focusing on some of the efforts mentioned below: - - -[[join]] -== Join - -If you'd like to help out, please send an introduction to the mailing list and introduce yourself in IRC. -You can also join the conversation on Telegram bridge to IRC https://t.me/fedoradiversity[here.] +While the Fedora Project is open to contributions from everyone, our community stands strong on pillars of mutual respect, tolerance, and encouragement. +Please review the xref:project::code-of-conduct.adoc[Fedora Code of Conduct] for more information. +[NOTE] +==== +Want to know more about the Fedora Community and our work? +Meet the Fedora Community in Maria "tatica" Leandro's https://www.youtube.com/watch?v=O1eHRoEps6I[Flock to Fedora 2019] video from Budapest. -[[meetings]] -== Meetings +A https://fedoraprojectpodcast.simplecast.com/episodes/fedora-diversity-inclusion-team[Fedora Podcast interview] also gives further insight into the purpose, objective and working process of the team. +The podcast has interesting conversation between members of the D&I team and Eduard Lucena (@x3mboy). +==== -The Diversity and Inclusion team generally meets *bi-weekly* in #fedora-diversity at 14:00 UTC on Thursdays. -Calendar information about our upcoming meetings can be found at: https://apps.fedoraproject.org/calendar/meeting/9784/[here]. -Meeting logs are available at https://meetbot.fedoraproject.org/sresults/?group_id=fedora-diversity&type=channel[Meetbot] +image::infographic-2020.png[Infographic with statistics about Fedora Women's Day since 2016. Created by Smera Goel.] -https://fedoraprojectpodcast.simplecast.com/episodes/fedora-diversity-inclusion-team[Fedora Podcast] gives further insight into the purpose, objective and working process of the team. -The podcast has interesting conversation between members of the D&I team and Eduard Lucena (@x3mboy). -[[current-projects]] -== Current Projects +[[what-we-do]] +== What we do -We track our https://pagure.io/fedora-diversity/issues[ongoing work and action items] in Pagure. +We track https://pagure.io/fedora-diversity/issues[on-going work] in Pagure tickets. [[fedora-women]] === Fedora Women -The https://fedoraproject.org/wiki/Women[Fedora Women] team is no longer active or maintained. However, as the aims of Fedora Women and Fedora D&I team align with each other, the D&I team has taken up to organize Fedora Women's Day event, that aims to keep the goal of Fedora Women alive! +The https://fedoraproject.org/wiki/Women[Fedora Women] team is no longer active or maintained. +However, as the aims of Fedora Women and Fedora D&I team align with each other, the D&I team has taken up to organize Fedora Women's Day event, that aims to keep the goal of Fedora Women alive! Fedora Women aims to nurture the involvement of women (cis and trans) and genderqueer people in Fedora and other Free and Open Source Software projects. -In addition, this community aims to bring awareness of contributions by women/non-binary in the Fedora Project. -Regardless of one's gender, Fedora Women welcomes anyone who supports women's involvement in Fedora. +In addition, this community aims to bring awareness of contributions by women/non-binary in the Fedora Project. +Regardless of one's gender, Fedora Women welcomes anyone who supports women's involvement in Fedora. Join Fedora Women community at IRC Freenode on https://webchat.freenode.net/#fedora-women[#fedora-women] channel. Subscribe to the https://lists.fedoraproject.org/admin/lists/women.lists.fedoraproject.org/[Fedora Women mailing list] for latest updates. @@ -57,40 +47,63 @@ Subscribe to the https://lists.fedoraproject.org/admin/lists/women.lists.fedorap === Events Fedora Diversity and Inclusion team organizes and supports a xref:events:index.adoc[variety of events] with an aim of fostering diversity and inclusion in Fedora community. -Our key focuses are to engage, empower, and celebrate the contributions of women, LGBT+, BIPOC, and people with disabilities in open source projects and communities. +Our key focuses are to engage, empower, and celebrate the contributions of women, LGBT+, BIPOC, and people with disabilities in Free and Open Source projects and communities. If you are interested in working with us to organize events in your local community, {MAILINGLIST}[send us an email]. We are always looking for new collaborators. [[demographic-survey]] -== Demographic Survery +=== Demographic Survey -The xref:demographic-survery.adoc[Demographic Survery] was launched to understand demographics of the Fedora Community. - -While the D&I Team is no longer actively working on this survey due to data collection and storage concerns (i.e. G.D.P.R.), it is retained for historical purposes. +In 2015/2016, the D&I Team drafted a xref:survey:index.adoc[demographic survey]. +This was intended to be a tool to better understand the demographics of the Fedora Community. +However, due to data storage concerns and G.D.P.R., the D&I Team did not launch this survey. +It is retained here for historical purposes. The team hopes our research and work may be useful for other Open Source communities and Diversity & Inclusion programmes. -[[get-involved-with-us]] -== Get Involed With Us - -* Are you willing to help us with enhancing diversity and inclusion Fedora community? -* Are you part of a local hackerspace, Linux User Group(LUG) or STEM community? -* Are you involved in open source project beyond Fedora? -If you said YES to one or more points above,then you are at the right place! -Our team always looks forward to working with folks from diverse backgrounds. -We believe everyone can bring value to our goal in one way or the other. +[[find-team]] +== Where to find Fedora D&I Team + +The Fedora D&I team uses the following communication platforms: -If you are interested in working with us, please checkout how to xref:get-involved.adoc[get involved with us] to start your journey with our team! +Mailing list:: {MAILING-LIST}[{MAILING-LIST}] +IRC channel:: link:ircs://chat.freenode.net:6697/#fedora-diversity[#fedora-diversity] on https://freenode.net/[Freenode IRC] +Matrix room:: {MATRIX}[#fedora-diversity:matrix.org] +Telegram group:: {TELEGRAM}[@fedoradiversity] -[[meeting-guide]] -=== Meeting Guide +The {MAILING-LIST}[mailing list] is best for _asynchronous_ communication. +This means it is best for questions or topics that someone may respond to later. +It is better for longer, threaded discussions. -xref:meetings.adoc[Meetings] of the D&I team are held every other Thursday in https://webchat.freenode.net/?channels=#fedora-diversity[#fedora-diversity] channel at 14:00 UTC. -If you are interested in attending or chairing our meetings, checkout our xref:meetings.adoc[meeting guide] for information. +The Fedora D&I IRC channel, Matrix room, and Telegram group are bridged together. +They are best for _synchronous_ communication. +This means it is best for quick feedback, like a conversation. +It is helpful for real-time discussions or getting someone's attention. -[[Policy]] -== Policy +First time using IRC? +Look into https://opensource.com/article/17/5/introducing-riot-IRC[Element] (formerly Riot), a free and open source client that is compatible with various IRC networks. +Element also keeps you connected to IRC even when you are not connected to the Internet. + + +[[meetings]] +== Meetings + +The Diversity and Inclusion team generally meets *every other week* on Thursdays at 14:00 UTC in `#fedora-diversity`. +See the https://apps.fedoraproject.org/calendar/meeting/9784/[Fedocal meeting event] for more info. +Meeting logs are available via https://meetbot.fedoraproject.org/sresults/?group_id=fedora-diversity&type=channel[Meetbot] + +If you are interested in attending or chairing our meetings, see the xref:meetings.adoc[meeting guide] for more information. + + +[[get-involved]] +== Get involved with the D&I Team + +* Are you willing to enhance diversity and inclusion in the Fedora Community? +* Are you part of a local hackerspace, Linux User Group (LUG), or STEM community? +* Are you involved in Open Source projects beyond Fedora? + +If you said YES to one or more points above, you are at the right place! +Our team always looks forward to working with folks from diverse backgrounds. +We believe everyone can bring value to our goal in one way or the other. -We follow lazy approval method! -Checkout xref:decision-process.adoc[policy page] to know more about our decision making process. -s \ No newline at end of file +See how to xref:get-involved.adoc[get involved with us] to start your journey with the Fedora D&I Team.