From 46bbdffb5a7a6088a823a5c90c71375c62f8c401 Mon Sep 17 00:00:00 2001 From: Ramya Parimi Date: Nov 03 2020 20:37:43 +0000 Subject: [PATCH 1/22] restructured landing page --- diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc index 899d69a..dbf4d0e 100644 --- a/modules/ROOT/pages/index.adoc +++ b/modules/ROOT/pages/index.adoc @@ -3,12 +3,11 @@ include::{partialsdir}/attributes.adoc[] = Diversity and inclusion in Fedora :toc: -The Fedora Project welcomes and encourages participation by everyone. -Our community is based on mutual respect, tolerance, and encouragement, and we work to help each other live up to these principles. -Please, refer to our xref:project:ROOT:code-of-conduct.adoc[Code of Conduct] for more information. -The Fedora Diversity and Inclusion team (Fedora D&I team) is committed to fostering diversity and inclusion in the Fedora community. +The main goal of our team is to encourage diversity and inclusion in the Fedora community. +While the Fedora Project is open to contributions from everyone, the 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. -You can watch our recent video showcasing the Fedora community https://www.youtube.com/watch?v=O1eHRoEps6I[here]. + +Get a sneak peak of the Fedora community by checking out https://www.youtube.com/watch?v=O1eHRoEps6I[Flock to Fedora-2019] event at Budapest! image::infographic-2020.png[Infographic with statistics about Fedora Women's Day since 2016. Created by Smera Goel.] @@ -16,63 +15,78 @@ image::infographic-2020.png[Infographic with statistics about Fedora Women's Day [[goals]] == Goals -The goal of this initiative is to help foster diversity and inclusion in the Fedora community. -The Fedora D&I team works towards this goal by focusing on efforts including (but not limited to): +The Fedora D&I team strives to enhance diversity and inclusion by focussing on some of the many efforts mentioned below: -* Creating content and organizing events to spread awareness about diversity within Fedora and outside the Fedora community. -* Supporting community building and engagement activities to foster inclusion. -* Coordinating with Fedora SIGs and subprojects to futher foster diversity and inclusion in the community. -* Supporting programs committed to building diversity and inclusion in Free and Open Source Software communities. +* Organize events to bring awareness about diversity within and outside the Fedora community. +* Cultivate inclusion by supporting community building and engagement activities. +* Enrich diversity and inclusion within Fedora by co-ordinating with other Fedora SIGs and sub-projects. +* Support events and programs that promote diversity and inclusion in Free and Open Source Software communities -https://fedoraprojectpodcast.simplecast.com/episodes/fedora-diversity-inclusion-team[Fedora Podcast] gives further insight into the purpose, objective and working process of the team in a huge community project. +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 conversations between the members of D&I team and Eduard Lucena (@x3mboy). [[current-projects]] == Current Projects -We are tracking our ongoing work and action items https://pagure.io/fedora-diversity/issues[here] in Pagure. +We track our https://pagure.io/fedora-diversity/issues[ongoing work and action items] in Pagure. [[fedora-women]] === Fedora Women -Fedora Women aims to foster involvement of women (cis and trans) and genderqueer people in Fedora and Free and Open Source Software. +As the https://fedoraproject.org/wiki/Women[Fedora Women] community is not active at the moment, the Fedora D&I team has taken up this project to keep it up and running. + +Fedora Women aims to nurture involvement of women (cis and trans) and genderqueer people in Fedora and other Free and Open Source Software projects. +Fedora Women advocates for awareness of contributions of women/non-binary within the Fedora Project. +Fedora Women welcomes anyone, regardless of their gender, who supports involvement of women to use and contribute to 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. [[events]] === Events -Fedora Diversity and Inclusion team organizes and supports a variety of xref:events:index.adoc[events] with the 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. -If you are interested in working with us to organize events in your local community, send us an email. We are always looking for new collaborators. +xref:events:index.adoc[The Events] organized by the Fedora D&I team mainly focus to: + +* Celebrate the contributions of women, LGBT+, BIPOC, and people with disabilities and +* Engage, empower and encourage diverse folks in the open source communities. + +If you are interested in organizing such local event, please send us an email. We are always looking for new collaborators. [[meetings]] == Meetings -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] +xref:meetings.adoc[The meetings] of D&I team happen every other Thurday in https://webchat.freenode.net/?channels=#fedora-diversity[#fedora-diversity] channel at 14:00 UTC. + +Here is the https://apps.fedoraproject.org/calendar/meeting/9784/[calendar] of our meetings. +Find our meetings logs at https://meetbot.fedoraproject.org/sresults/?group_id=fedora-diversity&type=channel[Meetbot]. + [[get-in-touch]] == Get in touch with us + +* Are you willing to help us with enhancing diversity and inclusion Fedora community? +* Are you part of a local hackerspace, LUG or STEM community? +* Are you nvolved in open source project beyond Fedora? + +Did you say YES to one or more of the above? +Then you are at the right place! Our team always looks forward to working with folks from diverse parts of Fedora. We believe everyone can bring in value to our goal. +We have plenty opporunties for contributions available that are flexilbe to everyone. +If you are interesting in contributing to our team: -Are you an individual contributor who wants to help us shape diversity and inclusion in the Fedora community? -Are you a part of a local hackerspace, LUG or STEM community? -Are you involved in open source project beyond Fedora? -Did you say YES to any one of these? -Diversity efforts require that we work with all parts of Fedora. -We feel that everyone can bring in valuable inputs to this conversation. -We have diverse and flexible contribution opportunities available for everyone. +* Please introduce yourself on our {MAILINGLIST}[Diversity & Inclusion mailing list]. -* If you'd like to help out, please introduce yourself on our {MAILINGLIST}[Diversity & Inclusion mailing list]. +* Join our channel on: -* You can join the conversation via IRC #fedora-diversity on Freenode. - We also have a Telegram bridge to IRC https://t.me/fedoradiversity[here]. +** IRC https://webchat.freenode.net/?channels=#fedora-diversity[#fedora-diversity] channel on IRC Freenode (or) +** https://t.me/fedoradiversity[Telegram bridge] to IRC . -* We are especially looking for other open source projects and local communities to share resources and collaborate together. - Please get in touch via the above mentioned ways or open a new ticket https://pagure.io/fedora-diversity/issues[here]. +* We are always looking to collaborate with other open source and local communities to bring in new ideas to foster diverity and inclusion. + +If interested, please get in touch through one of our chat channels or open a https://pagure.io/fedora-diversity/issues[new ticket] on Pagure. -* Feel like you don't have much time to contribute? - Subscribe to our {MAILINGLIST}[Diversity & Inclusion mailing list] to receive updates about our work. +* Not ready to contribute yet? +You can still follow our work by subscribing to our {MAILINGLIST}[Diversity & Inclusion mailing list]. From c9960c7b0ce98a13d4f1b3ccd944f063cdc1f26e Mon Sep 17 00:00:00 2001 From: Ramya Parimi Date: Nov 04 2020 02:20:52 +0000 Subject: [PATCH 2/22] restructured landing page --- diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc index dbf4d0e..5762961 100644 --- a/modules/ROOT/pages/index.adoc +++ b/modules/ROOT/pages/index.adoc @@ -3,15 +3,13 @@ include::{partialsdir}/attributes.adoc[] = Diversity and inclusion in Fedora :toc: -The main goal of our team is to encourage diversity and inclusion in the Fedora community. +The goal of our team is to encourage diversity and inclusion in the Fedora community. While the Fedora Project is open to contributions from everyone, the 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. - -Get a sneak peak of the Fedora community by checking out https://www.youtube.com/watch?v=O1eHRoEps6I[Flock to Fedora-2019] event at Budapest! +To get a sneak peak of the Fedora community, checking out https://www.youtube.com/watch?v=O1eHRoEps6I[Flock to Fedora-2019] event that happened at Budapest! image::infographic-2020.png[Infographic with statistics about Fedora Women's Day since 2016. Created by Smera Goel.] - [[goals]] == Goals @@ -25,7 +23,6 @@ The Fedora D&I team strives to enhance diversity and inclusion by focussing on 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 conversations between the members of D&I team and Eduard Lucena (@x3mboy). - [[current-projects]] == Current Projects @@ -36,14 +33,13 @@ We track our https://pagure.io/fedora-diversity/issues[ongoing work and action i As the https://fedoraproject.org/wiki/Women[Fedora Women] community is not active at the moment, the Fedora D&I team has taken up this project to keep it up and running. -Fedora Women aims to nurture involvement of women (cis and trans) and genderqueer people in Fedora and other Free and Open Source Software projects. -Fedora Women advocates for awareness of contributions of women/non-binary within the Fedora Project. -Fedora Women welcomes anyone, regardless of their gender, who supports involvement of women to use and contribute to Fedora. +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. +This community aims to bring the awareness of contributions by women/non-binary within the Fedora Project. +Regardless of their gender, Fedora Women welcomes anyone who supports the involvement of women 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. - [[events]] === Events @@ -52,41 +48,38 @@ xref:events:index.adoc[The Events] organized by the Fedora D&I team mainly focus * Celebrate the contributions of women, LGBT+, BIPOC, and people with disabilities and * Engage, empower and encourage diverse folks in the open source communities. -If you are interested in organizing such local event, please send us an email. We are always looking for new collaborators. +If you are interested in organizing such local event, please send us an email. We are always looking for new collaborators. +In addition, please checkout the xref:events:fwd-resource-pack[Event Resource Pack] for more information. +[[demographic-survey]] +== Demographic Survery -[[meetings]] -== Meetings +The xref:demographic-survery.adoc[Demographic Survery] was launched to understand demographics of the Fedora Community. -xref:meetings.adoc[The meetings] of D&I team happen every other Thurday in https://webchat.freenode.net/?channels=#fedora-diversity[#fedora-diversity] channel at 14:00 UTC. +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. +The team hopes our research and work may be useful for other Open Source communities and Diversity & Inclusion programmes. -Here is the https://apps.fedoraproject.org/calendar/meeting/9784/[calendar] of our meetings. -Find our meetings logs at https://meetbot.fedoraproject.org/sresults/?group_id=fedora-diversity&type=channel[Meetbot]. - - - -[[get-in-touch]] -== Get in touch with us +[[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, LUG or STEM community? * Are you nvolved in open source project beyond Fedora? -Did you say YES to one or more of the above? -Then you are at the right place! Our team always looks forward to working with folks from diverse parts of Fedora. We believe everyone can bring in value to our goal. -We have plenty opporunties for contributions available that are flexilbe to everyone. -If you are interesting in contributing to our team: +If you said YES to one or more of the above, +then you are at the right place! +Our team is always looking forward to working with folks from diverse backgrounds. +We believe everyone can bring in value to our goal in one way or the other. -* Please introduce yourself on our {MAILINGLIST}[Diversity & Inclusion mailing list]. +If you are interested in working with us, please checkout xref:get-involced.adoc[how to get involved with us] to start your journey with our team! -* Join our channel on: +[[meeting-guide]] +=== Meeting Guide -** IRC https://webchat.freenode.net/?channels=#fedora-diversity[#fedora-diversity] channel on IRC Freenode (or) -** https://t.me/fedoradiversity[Telegram bridge] to IRC . +xref:meetings.adoc[Meetings] of the D&I team happen every other Thurday 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. -* We are always looking to collaborate with other open source and local communities to bring in new ideas to foster diverity and inclusion. - -If interested, please get in touch through one of our chat channels or open a https://pagure.io/fedora-diversity/issues[new ticket] on Pagure. +[[Policy]] +== Policy -* Not ready to contribute yet? -You can still follow our work by subscribing to our {MAILINGLIST}[Diversity & Inclusion mailing list]. +We follow lazy approval method! Checkout xref:decision-process.adoc[policy page] to know more about our decision making process. \ No newline at end of file From 89480cf423e3556078848799a445c34790a594ae Mon Sep 17 00:00:00 2001 From: Ramya Parimi Date: Nov 04 2020 03:17:49 +0000 Subject: [PATCH 3/22] minor grammar edit --- diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc index 5762961..9a300e3 100644 --- a/modules/ROOT/pages/index.adoc +++ b/modules/ROOT/pages/index.adoc @@ -6,7 +6,7 @@ include::{partialsdir}/attributes.adoc[] The goal of our team is to encourage diversity and inclusion in the Fedora community. While the Fedora Project is open to contributions from everyone, the 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. -To get a sneak peak of the Fedora community, checking out https://www.youtube.com/watch?v=O1eHRoEps6I[Flock to Fedora-2019] event that happened at Budapest! +To get a sneak peak of the Fedora community, check out https://www.youtube.com/watch?v=O1eHRoEps6I[Flock to Fedora-2019] event that happened at Budapest! image::infographic-2020.png[Infographic with statistics about Fedora Women's Day since 2016. Created by Smera Goel.] From 43b60dd8466884b26d3ed976eae3512807c2a448 Mon Sep 17 00:00:00 2001 From: Ramya Parimi Date: Nov 05 2020 03:17:21 +0000 Subject: [PATCH 4/22] minor sentence changes --- diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc index 9a300e3..9a7a011 100644 --- a/modules/ROOT/pages/index.adoc +++ b/modules/ROOT/pages/index.adoc @@ -4,9 +4,9 @@ include::{partialsdir}/attributes.adoc[] :toc: The goal of our team is to encourage diversity and inclusion in the Fedora community. -While the Fedora Project is open to contributions from everyone, the 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. +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. -To get a sneak peak of the Fedora community, check out https://www.youtube.com/watch?v=O1eHRoEps6I[Flock to Fedora-2019] event that happened at Budapest! +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! image::infographic-2020.png[Infographic with statistics about Fedora Women's Day since 2016. Created by Smera Goel.] @@ -15,13 +15,13 @@ image::infographic-2020.png[Infographic with statistics about Fedora Women's Day The Fedora D&I team strives to enhance diversity and inclusion by focussing on some of the many efforts mentioned below: -* Organize events to bring awareness about diversity within and outside the Fedora community. -* Cultivate inclusion by supporting community building and engagement activities. +* Organize events to bring awareness about diversity both within and outside the Fedora community. +* Cultivate inclusion by organizing community building and engagement activities. * Enrich diversity and inclusion within Fedora by co-ordinating with other Fedora SIGs and sub-projects. * Support events and programs that promote diversity and inclusion in Free and Open Source Software communities 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 conversations between the members of D&I team and Eduard Lucena (@x3mboy). +The podcast has interesting conversation between members of the D&I team and Eduard Lucena (@x3mboy). [[current-projects]] == Current Projects @@ -31,11 +31,11 @@ We track our https://pagure.io/fedora-diversity/issues[ongoing work and action i [[fedora-women]] === Fedora Women -As the https://fedoraproject.org/wiki/Women[Fedora Women] community is not active at the moment, the Fedora D&I team has taken up this project to keep it up and running. +As the https://fedoraproject.org/wiki/Women[Fedora Women] community is not active at the moment, Fedora D&I team has taken up this project to keep it up and running. 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. -This community aims to bring the awareness of contributions by women/non-binary within the Fedora Project. -Regardless of their gender, Fedora Women welcomes anyone who supports the involvement of women 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 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. @@ -43,12 +43,12 @@ Subscribe to the https://lists.fedoraproject.org/admin/lists/women.lists.fedorap [[events]] === Events -xref:events:index.adoc[The Events] organized by the Fedora D&I team mainly focus to: +xref:events:index.adoc[The Events] organized by the Fedora D&I team focus to: * Celebrate the contributions of women, LGBT+, BIPOC, and people with disabilities and * Engage, empower and encourage diverse folks in the open source communities. -If you are interested in organizing such local event, please send us an email. We are always looking for new collaborators. +If you are interested in organizing such event at your locality, please send us an email. We are always looking for new collaborators. In addition, please checkout the xref:events:fwd-resource-pack[Event Resource Pack] for more information. [[demographic-survey]] @@ -66,17 +66,17 @@ The team hopes our research and work may be useful for other Open Source communi * Are you part of a local hackerspace, LUG or STEM community? * Are you nvolved in open source project beyond Fedora? -If you said YES to one or more of the above, +If you said YES to one or more points above, then you are at the right place! -Our team is always looking forward to working with folks from diverse backgrounds. -We believe everyone can bring in value to our goal in one way or the other. +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. If you are interested in working with us, please checkout xref:get-involced.adoc[how to get involved with us] to start your journey with our team! [[meeting-guide]] === Meeting Guide -xref:meetings.adoc[Meetings] of the D&I team happen every other Thurday in https://webchat.freenode.net/?channels=#fedora-diversity[#fedora-diversity] channel at 14:00 UTC. +xref:meetings.adoc[Meetings] of the D&I team are held every other Thurday 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. [[Policy]] From a2eab2214d517c864383c773624e2eeebdf748e6 Mon Sep 17 00:00:00 2001 From: Ramya Parimi Date: Nov 05 2020 15:33:59 +0000 Subject: [PATCH 5/22] restructured landing page --- diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc index 899d69a..dbf4d0e 100644 --- a/modules/ROOT/pages/index.adoc +++ b/modules/ROOT/pages/index.adoc @@ -3,12 +3,11 @@ include::{partialsdir}/attributes.adoc[] = Diversity and inclusion in Fedora :toc: -The Fedora Project welcomes and encourages participation by everyone. -Our community is based on mutual respect, tolerance, and encouragement, and we work to help each other live up to these principles. -Please, refer to our xref:project:ROOT:code-of-conduct.adoc[Code of Conduct] for more information. -The Fedora Diversity and Inclusion team (Fedora D&I team) is committed to fostering diversity and inclusion in the Fedora community. +The main goal of our team is to encourage diversity and inclusion in the Fedora community. +While the Fedora Project is open to contributions from everyone, the 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. -You can watch our recent video showcasing the Fedora community https://www.youtube.com/watch?v=O1eHRoEps6I[here]. + +Get a sneak peak of the Fedora community by checking out https://www.youtube.com/watch?v=O1eHRoEps6I[Flock to Fedora-2019] event at Budapest! image::infographic-2020.png[Infographic with statistics about Fedora Women's Day since 2016. Created by Smera Goel.] @@ -16,63 +15,78 @@ image::infographic-2020.png[Infographic with statistics about Fedora Women's Day [[goals]] == Goals -The goal of this initiative is to help foster diversity and inclusion in the Fedora community. -The Fedora D&I team works towards this goal by focusing on efforts including (but not limited to): +The Fedora D&I team strives to enhance diversity and inclusion by focussing on some of the many efforts mentioned below: -* Creating content and organizing events to spread awareness about diversity within Fedora and outside the Fedora community. -* Supporting community building and engagement activities to foster inclusion. -* Coordinating with Fedora SIGs and subprojects to futher foster diversity and inclusion in the community. -* Supporting programs committed to building diversity and inclusion in Free and Open Source Software communities. +* Organize events to bring awareness about diversity within and outside the Fedora community. +* Cultivate inclusion by supporting community building and engagement activities. +* Enrich diversity and inclusion within Fedora by co-ordinating with other Fedora SIGs and sub-projects. +* Support events and programs that promote diversity and inclusion in Free and Open Source Software communities -https://fedoraprojectpodcast.simplecast.com/episodes/fedora-diversity-inclusion-team[Fedora Podcast] gives further insight into the purpose, objective and working process of the team in a huge community project. +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 conversations between the members of D&I team and Eduard Lucena (@x3mboy). [[current-projects]] == Current Projects -We are tracking our ongoing work and action items https://pagure.io/fedora-diversity/issues[here] in Pagure. +We track our https://pagure.io/fedora-diversity/issues[ongoing work and action items] in Pagure. [[fedora-women]] === Fedora Women -Fedora Women aims to foster involvement of women (cis and trans) and genderqueer people in Fedora and Free and Open Source Software. +As the https://fedoraproject.org/wiki/Women[Fedora Women] community is not active at the moment, the Fedora D&I team has taken up this project to keep it up and running. + +Fedora Women aims to nurture involvement of women (cis and trans) and genderqueer people in Fedora and other Free and Open Source Software projects. +Fedora Women advocates for awareness of contributions of women/non-binary within the Fedora Project. +Fedora Women welcomes anyone, regardless of their gender, who supports involvement of women to use and contribute to 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. [[events]] === Events -Fedora Diversity and Inclusion team organizes and supports a variety of xref:events:index.adoc[events] with the 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. -If you are interested in working with us to organize events in your local community, send us an email. We are always looking for new collaborators. +xref:events:index.adoc[The Events] organized by the Fedora D&I team mainly focus to: + +* Celebrate the contributions of women, LGBT+, BIPOC, and people with disabilities and +* Engage, empower and encourage diverse folks in the open source communities. + +If you are interested in organizing such local event, please send us an email. We are always looking for new collaborators. [[meetings]] == Meetings -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] +xref:meetings.adoc[The meetings] of D&I team happen every other Thurday in https://webchat.freenode.net/?channels=#fedora-diversity[#fedora-diversity] channel at 14:00 UTC. + +Here is the https://apps.fedoraproject.org/calendar/meeting/9784/[calendar] of our meetings. +Find our meetings logs at https://meetbot.fedoraproject.org/sresults/?group_id=fedora-diversity&type=channel[Meetbot]. + [[get-in-touch]] == Get in touch with us + +* Are you willing to help us with enhancing diversity and inclusion Fedora community? +* Are you part of a local hackerspace, LUG or STEM community? +* Are you nvolved in open source project beyond Fedora? + +Did you say YES to one or more of the above? +Then you are at the right place! Our team always looks forward to working with folks from diverse parts of Fedora. We believe everyone can bring in value to our goal. +We have plenty opporunties for contributions available that are flexilbe to everyone. +If you are interesting in contributing to our team: -Are you an individual contributor who wants to help us shape diversity and inclusion in the Fedora community? -Are you a part of a local hackerspace, LUG or STEM community? -Are you involved in open source project beyond Fedora? -Did you say YES to any one of these? -Diversity efforts require that we work with all parts of Fedora. -We feel that everyone can bring in valuable inputs to this conversation. -We have diverse and flexible contribution opportunities available for everyone. +* Please introduce yourself on our {MAILINGLIST}[Diversity & Inclusion mailing list]. -* If you'd like to help out, please introduce yourself on our {MAILINGLIST}[Diversity & Inclusion mailing list]. +* Join our channel on: -* You can join the conversation via IRC #fedora-diversity on Freenode. - We also have a Telegram bridge to IRC https://t.me/fedoradiversity[here]. +** IRC https://webchat.freenode.net/?channels=#fedora-diversity[#fedora-diversity] channel on IRC Freenode (or) +** https://t.me/fedoradiversity[Telegram bridge] to IRC . -* We are especially looking for other open source projects and local communities to share resources and collaborate together. - Please get in touch via the above mentioned ways or open a new ticket https://pagure.io/fedora-diversity/issues[here]. +* We are always looking to collaborate with other open source and local communities to bring in new ideas to foster diverity and inclusion. + +If interested, please get in touch through one of our chat channels or open a https://pagure.io/fedora-diversity/issues[new ticket] on Pagure. -* Feel like you don't have much time to contribute? - Subscribe to our {MAILINGLIST}[Diversity & Inclusion mailing list] to receive updates about our work. +* Not ready to contribute yet? +You can still follow our work by subscribing to our {MAILINGLIST}[Diversity & Inclusion mailing list]. From 8961580a158fe972c1c4eb85fa20b53f14de9ee2 Mon Sep 17 00:00:00 2001 From: Ramya Parimi Date: Nov 05 2020 15:33:59 +0000 Subject: [PATCH 6/22] restructured landing page --- diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc index dbf4d0e..5762961 100644 --- a/modules/ROOT/pages/index.adoc +++ b/modules/ROOT/pages/index.adoc @@ -3,15 +3,13 @@ include::{partialsdir}/attributes.adoc[] = Diversity and inclusion in Fedora :toc: -The main goal of our team is to encourage diversity and inclusion in the Fedora community. +The goal of our team is to encourage diversity and inclusion in the Fedora community. While the Fedora Project is open to contributions from everyone, the 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. - -Get a sneak peak of the Fedora community by checking out https://www.youtube.com/watch?v=O1eHRoEps6I[Flock to Fedora-2019] event at Budapest! +To get a sneak peak of the Fedora community, checking out https://www.youtube.com/watch?v=O1eHRoEps6I[Flock to Fedora-2019] event that happened at Budapest! image::infographic-2020.png[Infographic with statistics about Fedora Women's Day since 2016. Created by Smera Goel.] - [[goals]] == Goals @@ -25,7 +23,6 @@ The Fedora D&I team strives to enhance diversity and inclusion by focussing on 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 conversations between the members of D&I team and Eduard Lucena (@x3mboy). - [[current-projects]] == Current Projects @@ -36,14 +33,13 @@ We track our https://pagure.io/fedora-diversity/issues[ongoing work and action i As the https://fedoraproject.org/wiki/Women[Fedora Women] community is not active at the moment, the Fedora D&I team has taken up this project to keep it up and running. -Fedora Women aims to nurture involvement of women (cis and trans) and genderqueer people in Fedora and other Free and Open Source Software projects. -Fedora Women advocates for awareness of contributions of women/non-binary within the Fedora Project. -Fedora Women welcomes anyone, regardless of their gender, who supports involvement of women to use and contribute to Fedora. +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. +This community aims to bring the awareness of contributions by women/non-binary within the Fedora Project. +Regardless of their gender, Fedora Women welcomes anyone who supports the involvement of women 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. - [[events]] === Events @@ -52,41 +48,38 @@ xref:events:index.adoc[The Events] organized by the Fedora D&I team mainly focus * Celebrate the contributions of women, LGBT+, BIPOC, and people with disabilities and * Engage, empower and encourage diverse folks in the open source communities. -If you are interested in organizing such local event, please send us an email. We are always looking for new collaborators. +If you are interested in organizing such local event, please send us an email. We are always looking for new collaborators. +In addition, please checkout the xref:events:fwd-resource-pack[Event Resource Pack] for more information. +[[demographic-survey]] +== Demographic Survery -[[meetings]] -== Meetings +The xref:demographic-survery.adoc[Demographic Survery] was launched to understand demographics of the Fedora Community. -xref:meetings.adoc[The meetings] of D&I team happen every other Thurday in https://webchat.freenode.net/?channels=#fedora-diversity[#fedora-diversity] channel at 14:00 UTC. +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. +The team hopes our research and work may be useful for other Open Source communities and Diversity & Inclusion programmes. -Here is the https://apps.fedoraproject.org/calendar/meeting/9784/[calendar] of our meetings. -Find our meetings logs at https://meetbot.fedoraproject.org/sresults/?group_id=fedora-diversity&type=channel[Meetbot]. - - - -[[get-in-touch]] -== Get in touch with us +[[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, LUG or STEM community? * Are you nvolved in open source project beyond Fedora? -Did you say YES to one or more of the above? -Then you are at the right place! Our team always looks forward to working with folks from diverse parts of Fedora. We believe everyone can bring in value to our goal. -We have plenty opporunties for contributions available that are flexilbe to everyone. -If you are interesting in contributing to our team: +If you said YES to one or more of the above, +then you are at the right place! +Our team is always looking forward to working with folks from diverse backgrounds. +We believe everyone can bring in value to our goal in one way or the other. -* Please introduce yourself on our {MAILINGLIST}[Diversity & Inclusion mailing list]. +If you are interested in working with us, please checkout xref:get-involced.adoc[how to get involved with us] to start your journey with our team! -* Join our channel on: +[[meeting-guide]] +=== Meeting Guide -** IRC https://webchat.freenode.net/?channels=#fedora-diversity[#fedora-diversity] channel on IRC Freenode (or) -** https://t.me/fedoradiversity[Telegram bridge] to IRC . +xref:meetings.adoc[Meetings] of the D&I team happen every other Thurday 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. -* We are always looking to collaborate with other open source and local communities to bring in new ideas to foster diverity and inclusion. - -If interested, please get in touch through one of our chat channels or open a https://pagure.io/fedora-diversity/issues[new ticket] on Pagure. +[[Policy]] +== Policy -* Not ready to contribute yet? -You can still follow our work by subscribing to our {MAILINGLIST}[Diversity & Inclusion mailing list]. +We follow lazy approval method! Checkout xref:decision-process.adoc[policy page] to know more about our decision making process. \ No newline at end of file From 877ddeaa8c2ad9ec16f9c0a55bfc918fb54e068d Mon Sep 17 00:00:00 2001 From: Ramya Parimi Date: Nov 05 2020 15:33:59 +0000 Subject: [PATCH 7/22] minor grammar edit --- diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc index 5762961..9a300e3 100644 --- a/modules/ROOT/pages/index.adoc +++ b/modules/ROOT/pages/index.adoc @@ -6,7 +6,7 @@ include::{partialsdir}/attributes.adoc[] The goal of our team is to encourage diversity and inclusion in the Fedora community. While the Fedora Project is open to contributions from everyone, the 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. -To get a sneak peak of the Fedora community, checking out https://www.youtube.com/watch?v=O1eHRoEps6I[Flock to Fedora-2019] event that happened at Budapest! +To get a sneak peak of the Fedora community, check out https://www.youtube.com/watch?v=O1eHRoEps6I[Flock to Fedora-2019] event that happened at Budapest! image::infographic-2020.png[Infographic with statistics about Fedora Women's Day since 2016. Created by Smera Goel.] From 4220c9eeed2b9e1d0f6bc2ef4befbaab92ce10b3 Mon Sep 17 00:00:00 2001 From: Ramya Parimi Date: Nov 05 2020 15:33:59 +0000 Subject: [PATCH 8/22] minor sentence changes --- diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc index 9a300e3..9a7a011 100644 --- a/modules/ROOT/pages/index.adoc +++ b/modules/ROOT/pages/index.adoc @@ -4,9 +4,9 @@ include::{partialsdir}/attributes.adoc[] :toc: The goal of our team is to encourage diversity and inclusion in the Fedora community. -While the Fedora Project is open to contributions from everyone, the 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. +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. -To get a sneak peak of the Fedora community, check out https://www.youtube.com/watch?v=O1eHRoEps6I[Flock to Fedora-2019] event that happened at Budapest! +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! image::infographic-2020.png[Infographic with statistics about Fedora Women's Day since 2016. Created by Smera Goel.] @@ -15,13 +15,13 @@ image::infographic-2020.png[Infographic with statistics about Fedora Women's Day The Fedora D&I team strives to enhance diversity and inclusion by focussing on some of the many efforts mentioned below: -* Organize events to bring awareness about diversity within and outside the Fedora community. -* Cultivate inclusion by supporting community building and engagement activities. +* Organize events to bring awareness about diversity both within and outside the Fedora community. +* Cultivate inclusion by organizing community building and engagement activities. * Enrich diversity and inclusion within Fedora by co-ordinating with other Fedora SIGs and sub-projects. * Support events and programs that promote diversity and inclusion in Free and Open Source Software communities 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 conversations between the members of D&I team and Eduard Lucena (@x3mboy). +The podcast has interesting conversation between members of the D&I team and Eduard Lucena (@x3mboy). [[current-projects]] == Current Projects @@ -31,11 +31,11 @@ We track our https://pagure.io/fedora-diversity/issues[ongoing work and action i [[fedora-women]] === Fedora Women -As the https://fedoraproject.org/wiki/Women[Fedora Women] community is not active at the moment, the Fedora D&I team has taken up this project to keep it up and running. +As the https://fedoraproject.org/wiki/Women[Fedora Women] community is not active at the moment, Fedora D&I team has taken up this project to keep it up and running. 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. -This community aims to bring the awareness of contributions by women/non-binary within the Fedora Project. -Regardless of their gender, Fedora Women welcomes anyone who supports the involvement of women 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 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. @@ -43,12 +43,12 @@ Subscribe to the https://lists.fedoraproject.org/admin/lists/women.lists.fedorap [[events]] === Events -xref:events:index.adoc[The Events] organized by the Fedora D&I team mainly focus to: +xref:events:index.adoc[The Events] organized by the Fedora D&I team focus to: * Celebrate the contributions of women, LGBT+, BIPOC, and people with disabilities and * Engage, empower and encourage diverse folks in the open source communities. -If you are interested in organizing such local event, please send us an email. We are always looking for new collaborators. +If you are interested in organizing such event at your locality, please send us an email. We are always looking for new collaborators. In addition, please checkout the xref:events:fwd-resource-pack[Event Resource Pack] for more information. [[demographic-survey]] @@ -66,17 +66,17 @@ The team hopes our research and work may be useful for other Open Source communi * Are you part of a local hackerspace, LUG or STEM community? * Are you nvolved in open source project beyond Fedora? -If you said YES to one or more of the above, +If you said YES to one or more points above, then you are at the right place! -Our team is always looking forward to working with folks from diverse backgrounds. -We believe everyone can bring in value to our goal in one way or the other. +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. If you are interested in working with us, please checkout xref:get-involced.adoc[how to get involved with us] to start your journey with our team! [[meeting-guide]] === Meeting Guide -xref:meetings.adoc[Meetings] of the D&I team happen every other Thurday in https://webchat.freenode.net/?channels=#fedora-diversity[#fedora-diversity] channel at 14:00 UTC. +xref:meetings.adoc[Meetings] of the D&I team are held every other Thurday 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. [[Policy]] From 022a941792582182895d5b7cfcd3c69bf3823141 Mon Sep 17 00:00:00 2001 From: Ramya Parimi Date: Nov 05 2020 16:25:36 +0000 Subject: [PATCH 9/22] has changes suggested --- diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc index 9a7a011..9efb23d 100644 --- a/modules/ROOT/pages/index.adoc +++ b/modules/ROOT/pages/index.adoc @@ -4,7 +4,8 @@ include::{partialsdir}/attributes.adoc[] :toc: The goal of our team is to encourage diversity and inclusion in the Fedora community. -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. +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. 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! @@ -13,7 +14,7 @@ image::infographic-2020.png[Infographic with statistics about Fedora Women's Day [[goals]] == Goals -The Fedora D&I team strives to enhance diversity and inclusion by focussing on some of the many efforts mentioned below: +The Fedora D&I team strives to enhance diversity and inclusion by focusing on some of the efforts mentioned below: * Organize events to bring awareness about diversity both within and outside the Fedora community. * Cultivate inclusion by organizing community building and engagement activities. @@ -31,7 +32,7 @@ We track our https://pagure.io/fedora-diversity/issues[ongoing work and action i [[fedora-women]] === Fedora Women -As the https://fedoraproject.org/wiki/Women[Fedora Women] community is not active at the moment, Fedora D&I team has taken up this project to keep it up and running. +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. @@ -43,7 +44,7 @@ Subscribe to the https://lists.fedoraproject.org/admin/lists/women.lists.fedorap [[events]] === Events -xref:events:index.adoc[The Events] organized by the Fedora D&I team focus to: +xref:events:index.adoc[Events] organized by the Fedora D&I team focus to: * Celebrate the contributions of women, LGBT+, BIPOC, and people with disabilities and * Engage, empower and encourage diverse folks in the open source communities. @@ -63,23 +64,23 @@ The team hopes our research and work may be useful for other Open Source communi == Get Involed With Us * Are you willing to help us with enhancing diversity and inclusion Fedora community? -* Are you part of a local hackerspace, LUG or STEM community? -* Are you nvolved in open source project beyond Fedora? +* 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! +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. -If you are interested in working with us, please checkout xref:get-involced.adoc[how to get involved with us] to start your journey with our team! +If you are interested in working with us, please checkout xref:get-involved.adoc[how to get involved with us] to start your journey with our team! [[meeting-guide]] === Meeting Guide -xref:meetings.adoc[Meetings] of the D&I team are held every other Thurday in https://webchat.freenode.net/?channels=#fedora-diversity[#fedora-diversity] channel at 14:00 UTC. +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. [[Policy]] == Policy -We follow lazy approval method! Checkout xref:decision-process.adoc[policy page] to know more about our decision making process. \ No newline at end of file +We follow lazy approval method! +Checkout xref:decision-process.adoc[policy page] to know more about our decision making process. \ No newline at end of file From b0928f0cc8fea4155c6c877dd1d29b161ad6d123 Mon Sep 17 00:00:00 2001 From: Ramya Parimi Date: Nov 05 2020 16:48:39 +0000 Subject: [PATCH 10/22] Made changes suggested. Merged upstream changes :D --- diff --git a/antora.yml b/antora.yml index 78e1c18..4b08f76 100644 --- a/antora.yml +++ b/antora.yml @@ -2,16 +2,18 @@ # Tip: If you want to use the local preview scripts that come with this repository, please change this value in the site.yml file as well. (under site/start_page) name: diversity-inclusion -# Title will be visible on the page. +# Title will be visible on the page. title: Diversity and Inclusion # If you don't plan to have multiple versions of the docs (for example, to document multiple versions of some software), you can ignore this field. Otherwise, change "master" to a specific version. version: master -# We encourage you to name the index page as "index.adoc". If you absolutely have to use a different name, please reflect it here. You can ignore this field otherwise. +# We encourage you to name the index page as "index.adoc". If you absolutely have to use a different name, please reflect it here. You can ignore this field otherwise. start_page: ROOT:index # This lists all the menu definitions of your component. nav: - modules/ROOT/nav.adoc +- modules/survey/nav.adoc - modules/events/nav.adoc +- modules/outreachy/nav.adoc diff --git a/modules/ROOT/nav.adoc b/modules/ROOT/nav.adoc index 2614ad6..99a73a8 100644 --- a/modules/ROOT/nav.adoc +++ b/modules/ROOT/nav.adoc @@ -1,4 +1,3 @@ -* xref:demographic-survey.adoc[Demographic survey] * xref:get-involved.adoc[Get involved] * xref:meetings.adoc[D&I Meeting Guide] * Policy diff --git a/modules/ROOT/pages/demographic-survey.adoc b/modules/ROOT/pages/demographic-survey.adoc deleted file mode 100644 index 61b56f4..0000000 --- a/modules/ROOT/pages/demographic-survey.adoc +++ /dev/null @@ -1,257 +0,0 @@ -include::{partialsdir}/attributes.adoc[] - -= Demographic survey research - -This wiki page contains the draft of questions used for a Fedora contributor / demographic survey. -Most of these questions were extensively discussed and revised during the https://fedoraproject.org/wiki/FAD_Diversity_2017[FAD Diversity 2017]. -More details about this can be found in Pagure ticket discussions and in Etherpads. -The questions in this wiki page are not finalized unless otherwise stated. - - -[[objectives]] -== Objectives - -The primary objectives we identified for the demographic survey were… - -1. Gather baseline demographics about the contributor community -* Why is this objective important? -** Better allows us to focus on groups who are underrepresented and try to improve the user experience for new contributors in the community -* Examples of target criteria: -** Numbers for underrepresented groups (race / gender / sexuality / etc.) -** Age of contributors -** Gender -** Race/Cultural background -** Location -** Disability -** Family / kids / Motherhood ? -** Non-English speaking community -2. Determine contributor knowledge about project components that ease contribution -* Join SIG -* Mentoring Programs -* Onboarding programs -* Classrooms? -* Code of conduct / diversity and inclusion team - -[[other-comments-and-thoughts]] -=== Other comments and thoughts - -Other questions, comments, and ideas from our raw notes… - -* @bee2502's musings - some questions -** How were you introduced to Fedora? -1. By another Fedora contributor -2. At a Fedora event (e.g. FAD / workshop / meetup / release party) -3. Conference -4. Hackerspace -5. Red Hat -6. Web / online -** What makes it difficult contributing to Fedora for you? - -We also wanted to identify how the data will be used and clearly communicate how the data will be used (ideally, this outline or information being available for participants in the survey to review). - - -[[relevant-resources]] -== Relevant resources - -* *FLOSS Survey 2013* -** https://floss2013.larjona.net/[Questions and results] -** http://flosshub.org/content/women-freelibreopen-source-software-situation-2010s[Women in Free/Libre/Open Source Software: The Situation in the 2010s] paper with results analysis - note how they don't conclude that they have authoritative statistics on diversity of the FLOSS community, but instead focus on comparative analysis of different groups of respondents - -* *Apache Software Foundation Committer Diversity Survey* -** http://mail-archives.apache.org/mod_mbox/www-announce/201611.mbox/%3Cpony-31e1cbf2b23a01ea035ee3323fe2ab95950c8284-dc1f345f30800e5cbef086a8801c55be77bc49c3%40announce.apache.org%3E[Announcement e-mail] -** https://cwiki.apache.org/confluence/display/COMDEV/ASF+Committer+Diversity+Survey+-+2016[Results] - - -[[survey-questions]] -== Survey questions - -Below are the "ver. 1.0" version of the survey questions. -Our last plan for these was to submit them to Fedora Legal for feedback, which I believe @bex and @marinaz were going to work on. These questions will also be updated in the {FWIKI}/Diversity/Survey[Survey wiki page]. - -[[fedora-and-free-and-open-source-software-usage-and-contributions]] -=== Fedora and free and open source software usage and contributions - -* *How long have you been a Fedora user?* -** I have never used Fedora -** Less than 1 year -** 1 to 3 years -** 3 to 6 years -** 6 to 10 years -** Over 10 years -** Prefer not to say -* *How long have you been a Fedora contributor?* -** I have never contributed to Fedora -** Less than 1 year -** 1 to 3 years -** 3 to 6 years -** 6 to 10 years -** Over 10 years -** Prefer not to say -* *Please select types of contributions that you make to Fedora:* -** Community (community leadership, new contributor outreach and onboarding, diversity and inclusion work, marketing, event organization) -** Technical (packaging, programming, infrastructure, operations, release engineering, testing / QA, language-specific SIGs) -** Other non-technical (design, documentation, localization, translation) -** Prefer not to say -** Other (please specify) -* *Do you contribute to Fedora as a volunteer or as an employee of a company? [select all that apply]* -** Volunteer (student) -** Volunteer (unemployed) -** Volunteer (retired) -** Volunteer (outside regular job) -** Employee (work-related contributions) -** Prefer not to say -** Other (please specify) -* *On average, how many hours a week did you spend on Fedora contributions in the last three months?* -** 0, I have not contributed in the last three months -** Less than 2 -** 2 - 5 -** 6 - 10 -** 11 - 20 -** 21 - 40 -** More than 40 -** Prefer not to say -* *What are the top reasons you contribute to Fedora? Please check a maximum of 4 answers.* -** To participate in a global cooperative project -** To participate in a free and open source software project -** To improve a free and open source software project -** Because I think that software should not be proprietary -** To solve a problem that could not be done by proprietary software -** To get help in realizing a good idea for a software project -** To learn and develop new skills -** To share my knowledge and skills -** To improve my job opportunities -** To get a reputation in the free and open source software scene -** To meet other people in the free and open source software community -** Because I enjoy working with other people in the community -** To get funding to travel internationally -** To earn a living -** Prefer not to say -** Other (please specify) -* *Think of the time you made your first contribution to Fedora that was incorporated. What best describes your experience?* -** My co-worker, who was paid to work on Fedora, helped me prepare the contribution -** A person I already knew socially helped me prepare the contribution -** A person I did not know before helped me prepare the contribution at an in-person event -** A person I did not know before helped me prepare the contribution via electronic communications -** A mentor for a third-party program (e.g. Google Summer of Code, Outreachy, etc.) helped me prepare the contribution via electornic communications -** A mentor identified by the Fedora Project helped me prepare the contribution via electronic communications -** A person whom I identified as a mentor helped me prepare the contribution via electronic communications -** I submitted my contribution electronically for review and it was reviewed by my co-worker, who was paid to work on Fedora -** I submitted my contribution electronically for review and it was reviewed by someone I already knew socially -** I submitted my contribution electronically for review and it was reviewed by someone I didn’t know before -** Prefer not to say -** Other (please specify) -* *Do you routinely use software that is not free and open source on Fedora?* -** Yes, but only web-based applications like Google Docs -** Yes, but only locally installed applications (including hardware drivers) -** Yes, both web-based and locally installed applications -** No -** Prefer not to say -** Other (please specify) - -[[demographics]] -=== Demographics - -* *What is your gender?* -** Male -** Female -** Non-binary -** Prefer not to say -** Other (please specify) -* *Do you identify as lesbian, gay, bisexual, transgender or queer?* -** Yes -** No -** Prefer not to say -* *What is your age range?* -** 17 or younger -** 18 to 24 -** 25 to 34 -** 35 to 44 -** 45 to 54 -** 55 to 64 -** 65 to 74 -** Over 75 -** Prefer not to say -* *Do you have any disability, including, but not limited to any of the ones listed https://www.dol.gov/ofccp/regs/compliance/sec503/Self_ID_Forms/VoluntarySelf-ID_CC-305_ENG_JRF_QA_508c.pdf[here]?* -** Yes -** No -** Prefer not to say -* *Do you have a partner?* -** No, I am a single -** Yes, although we do not live together -** Yes, I live together with my partner -** Yes, I am married -** Yes, I am married, but we do not live together -** Prefer not to say -** Other (please specify) -* *How old is your youngest child?* -** I don’t have children -** Less than 2 years old -** Between 2 years and 5 years old -** Between 6 years and 10 years old -** Between 11 years and 17 years old -** 18 years or older -** Prefer not to say -* *What region of the world do you reside in?* -** Asia and Pacific Countries (APAC) -** Europe and the Middle East (EMEA) -** Latin and South America (LATAM) -** North America (NA) -** Prefer not to say -* *What is your country of residence? [FAS Country List - Divided by Region]* -* *What is the highest level of education you have completed?* -** Less than secondary (High) school -** Secondary (High) school graduate or equivalent -** Vocational / trade program or apprenticeship -** Some college (working towards a first level university degree) -** Some college (not pursuing a degree anymore) -** Associate degree -** Bachelor’s degree -** Master’s degree -** Doctorate (Ph.D.) or other advanced degree (e..g M.D., J.D.) -** Prefer not to say -** Other (please specify) -* *If you are employed, what organization do you work for?* -** I am not employed -** Employed (please specify organization name) -** Employed, but prefer not to specify the organization -** Prefer not to say -* *If you are employed, what do you work on? [select all that apply]* -** I am not employed -** Software development -** System administration -** Testing / QA / QE -** Technical writing -** UX/UI design -** Marketing /communications -** Community and event management -** Prefer not to say -** Other (please specify) - -[[perception-of-experience-with-and-attitudes-towards-diversity-and-inclusion]] -=== Perception of, experience with, and attitudes towards diversity and inclusion - -_Should we use headers / categories for questions, we will want something easier to read for a "production" version of this section._ - -The following questions can be presented as a table, with the same set of answer options. -Questions about diverse perspectives, comfort with contributing ideas, valuing best ideas, and feeling respected were adapted from Red Hat Associate Survey. - -* *Please indicate how you feel about the following statements.* -** Diverse perspectives are valued in the Fedora community. -** I feel comfortable contributing my ideas (in meetings or online forums), even when my views differ from other contributors. -** The people I collaborate with value the best ideas regardless of their source. -** I feel respected when I share my ideas and opinions in the Fedora community. -** Having greater diversity of contributors will positively impact the Fedora Project. -** I’m appreciated for the contributions I make. -* *Information about Fedora processes, policies or guidelines is easy to find.* -** Strongly agree -** Agree -** Slightly agree -** Neither agree nor disagree -** Slightly disagree -** Disagree -** Strongly disagree - -Please do not put any identifying information about yourself or others in either text box. - -* *Is there anything you believe would improve the inclusivity of the Fedora community?* -* *Do you have any feedback on this survey and are there any additional questions you believe it should have asked?* diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc index 9efb23d..59ff671 100644 --- a/modules/ROOT/pages/index.adoc +++ b/modules/ROOT/pages/index.adoc @@ -32,7 +32,7 @@ We track our https://pagure.io/fedora-diversity/issues[ongoing work and action i [[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 goal 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. @@ -55,7 +55,7 @@ In addition, please checkout the xref:events:fwd-resource-pack[Event Resource Pa [[demographic-survey]] == Demographic Survery -The xref:demographic-survery.adoc[Demographic Survery] was launched to understand demographics of the Fedora Community. +The xref:survery:index.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. The team hopes our research and work may be useful for other Open Source communities and Diversity & Inclusion programmes. @@ -83,4 +83,4 @@ If you are interested in attending or chairing our meetings, checkout our xref:m == Policy We follow lazy approval method! -Checkout xref:decision-process.adoc[policy page] to know more about our decision making process. \ No newline at end of file +Checkout xref:decision-process.adoc[policy page] to know more about our decision making process. diff --git a/modules/events/nav.adoc b/modules/events/nav.adoc index bc981a8..d203174 100644 --- a/modules/events/nav.adoc +++ b/modules/events/nav.adoc @@ -1,3 +1,10 @@ * xref:index.adoc[D&I Events] -** xref:about-fwd.adoc[Fedora Women's Day] -*** xref:fwd-resource-pack.adoc[Resource pack] +** xref:flock-social-events.adoc[Flock Social Events] +** Fedora Women's Day +*** xref:fwd/about-fwd.adoc[About] +*** xref:fwd/history.adoc[History] +*** xref:fwd/organize.adoc[How to organize] +*** xref:fwd/participate.adoc[How to participate] +** xref:past-events.adoc[Past Events] +** xref:fwd-resource-pack.adoc[Resource pack] + diff --git a/modules/events/pages/about-fwd.adoc b/modules/events/pages/about-fwd.adoc deleted file mode 100644 index f06d12e..0000000 --- a/modules/events/pages/about-fwd.adoc +++ /dev/null @@ -1,13 +0,0 @@ -include::ROOT:partial$attributes.adoc[] - -= About Fedora Women's Day - -Fedora Women's Day highlights and celebrates the women/non-binary contributers in open source communities like Fedora and beyond. -Fedora Women's Day marks the anniversary of the {FWIKI}/Women[Fedora Women] team and is headed by Fedora's Diversity and Inclusion Team. - -Across September, we encourage more women contributors across Fedora to connect and network with one another. -Fedora Women's Day highlights and celebrates the women of open source communities like Fedora and their contributions to their projects and community. -They are also an opportunity for women to learn about free and open source software and jump-start their journey as a user of FOSS and/or become a contributor. -They also provide a platform for women to connect, learn, and be inspired by other women in open source communities and beyond. - -image:ROOT:fwd/infographic-template.png[Infographic about the Fedora Women's Day event. Created by Smera Goel.] diff --git a/modules/events/pages/flock-social-events.adoc b/modules/events/pages/flock-social-events.adoc new file mode 100644 index 0000000..40d91f7 --- /dev/null +++ b/modules/events/pages/flock-social-events.adoc @@ -0,0 +1,7 @@ +[INFO] +==== +This page is still a placeholder. +It is not yet written! + +If you want to help write it, review the https://pagure.io/fedora-diversity/issues[Fedora D&I Pagure issue tracker] to see where you can get involved. +==== \ No newline at end of file diff --git a/modules/events/pages/fwd-resource-pack.adoc b/modules/events/pages/fwd-resource-pack.adoc index f961c34..34b1974 100644 --- a/modules/events/pages/fwd-resource-pack.adoc +++ b/modules/events/pages/fwd-resource-pack.adoc @@ -8,7 +8,7 @@ In this page you can find a resource pack that helps in organizing a successful * A summary about Fedora D&I team * Overview of different Fedora editions * Fedora and Python - + == How to welcome new contributors to Fedora? Did you come across folks who are interested in contributing to the Fedora project? Then please create link:https://pagure.io/fedora-join/Welcome-to-Fedora/issues[Welcome to Fedora ticket] for the newcomers with Fedora Join SIG. This ticket helps them to easily track their progress in the journey to becoming Fedora contributors. @@ -20,7 +20,7 @@ Need help with creating the welcome ticket? Reach out to Fedora Join SIG at any At your event, start with an introduction to the Fedora Diversity and Inclusion Team. Explain the role of D&I team in the Fedora community and its upcoming goals. -Share our xref:diversity-inclusion::team.adoc[team's introduction page] with anyone who is interested in learing more. +Share our xref:ROOT:index.adoc[team's introduction page] with anyone who is interested in learing more. What is the role of Fedora Diversity and Inclusion Team?:: As the name indicates, the main goal of the D&I team is to foster diversity and inclusion in Fedora community. @@ -32,10 +32,10 @@ Below are some of the many efforts focused by D&I team to achieve its goal: What the D&I team works on?:: The D&I team works on various tasks to support diversity and inclusion in the Fedora Project. -For example, new additions were made to the 2018 https://flocktofedora.org/[Fedora Flock conference] such as including gender-neutral bathrooms, a quiet room, and communication preference stickers. -These additions in turn supported our existing effort to draft https://pagure.io/fedora-diversity/issue/54[event inclusion guidelines] for Fedora event organizers. +For example, new additions were made to the 2018 https://flocktofedora.org/[Fedora Flock conference] such as including gender-neutral bathrooms, a quiet room, and communication preference stickers. +These additions in turn supported our existing effort to draft https://pagure.io/fedora-diversity/issue/54[event inclusion guidelines] for Fedora event organizers. These guidelines when shared within and outside Fedora community provide best practices to organizers holding an event. -In addition, we also hope to launch a https://pagure.io/fedora-diversity/issue/62[demographic survey] of the Fedora community in soon. +In the past, we also worked on a xref:survey:index.adoc[Fedora Project Demographic Survey] to understand who is in the Fedora Community. == Fedora Editions diff --git a/modules/events/pages/fwd/about-fwd.adoc b/modules/events/pages/fwd/about-fwd.adoc new file mode 100644 index 0000000..f06d12e --- /dev/null +++ b/modules/events/pages/fwd/about-fwd.adoc @@ -0,0 +1,13 @@ +include::ROOT:partial$attributes.adoc[] + += About Fedora Women's Day + +Fedora Women's Day highlights and celebrates the women/non-binary contributers in open source communities like Fedora and beyond. +Fedora Women's Day marks the anniversary of the {FWIKI}/Women[Fedora Women] team and is headed by Fedora's Diversity and Inclusion Team. + +Across September, we encourage more women contributors across Fedora to connect and network with one another. +Fedora Women's Day highlights and celebrates the women of open source communities like Fedora and their contributions to their projects and community. +They are also an opportunity for women to learn about free and open source software and jump-start their journey as a user of FOSS and/or become a contributor. +They also provide a platform for women to connect, learn, and be inspired by other women in open source communities and beyond. + +image:ROOT:fwd/infographic-template.png[Infographic about the Fedora Women's Day event. Created by Smera Goel.] diff --git a/modules/events/pages/fwd/history.adoc b/modules/events/pages/fwd/history.adoc new file mode 100644 index 0000000..40d91f7 --- /dev/null +++ b/modules/events/pages/fwd/history.adoc @@ -0,0 +1,7 @@ +[INFO] +==== +This page is still a placeholder. +It is not yet written! + +If you want to help write it, review the https://pagure.io/fedora-diversity/issues[Fedora D&I Pagure issue tracker] to see where you can get involved. +==== \ No newline at end of file diff --git a/modules/events/pages/fwd/organize.adoc b/modules/events/pages/fwd/organize.adoc new file mode 100644 index 0000000..40d91f7 --- /dev/null +++ b/modules/events/pages/fwd/organize.adoc @@ -0,0 +1,7 @@ +[INFO] +==== +This page is still a placeholder. +It is not yet written! + +If you want to help write it, review the https://pagure.io/fedora-diversity/issues[Fedora D&I Pagure issue tracker] to see where you can get involved. +==== \ No newline at end of file diff --git a/modules/events/pages/fwd/participate.adoc b/modules/events/pages/fwd/participate.adoc new file mode 100644 index 0000000..40d91f7 --- /dev/null +++ b/modules/events/pages/fwd/participate.adoc @@ -0,0 +1,7 @@ +[INFO] +==== +This page is still a placeholder. +It is not yet written! + +If you want to help write it, review the https://pagure.io/fedora-diversity/issues[Fedora D&I Pagure issue tracker] to see where you can get involved. +==== \ No newline at end of file diff --git a/modules/events/pages/past-events.adoc b/modules/events/pages/past-events.adoc new file mode 100644 index 0000000..40d91f7 --- /dev/null +++ b/modules/events/pages/past-events.adoc @@ -0,0 +1,7 @@ +[INFO] +==== +This page is still a placeholder. +It is not yet written! + +If you want to help write it, review the https://pagure.io/fedora-diversity/issues[Fedora D&I Pagure issue tracker] to see where you can get involved. +==== \ No newline at end of file diff --git a/modules/outreachy/nav.adoc b/modules/outreachy/nav.adoc new file mode 100644 index 0000000..0066cdc --- /dev/null +++ b/modules/outreachy/nav.adoc @@ -0,0 +1 @@ +* xref:about.adoc[Outreachy] \ No newline at end of file diff --git a/modules/outreachy/pages/about.adoc b/modules/outreachy/pages/about.adoc new file mode 100644 index 0000000..40d91f7 --- /dev/null +++ b/modules/outreachy/pages/about.adoc @@ -0,0 +1,7 @@ +[INFO] +==== +This page is still a placeholder. +It is not yet written! + +If you want to help write it, review the https://pagure.io/fedora-diversity/issues[Fedora D&I Pagure issue tracker] to see where you can get involved. +==== \ No newline at end of file diff --git a/modules/survey/nav.adoc b/modules/survey/nav.adoc new file mode 100644 index 0000000..7f979aa --- /dev/null +++ b/modules/survey/nav.adoc @@ -0,0 +1,4 @@ +* Demographic Survey +** xref:index.adoc[About] +** xref:questions.adoc[Questions] +** xref:resources.adoc[Resources] diff --git a/modules/survey/pages/index.adoc b/modules/survey/pages/index.adoc new file mode 100644 index 0000000..4aeaf89 --- /dev/null +++ b/modules/survey/pages/index.adoc @@ -0,0 +1,74 @@ +include::ROOT:partial$attributes.adoc[] + += About Fedora Project Demographic Survey +Fedora Diversity & Inclusion Team +:toc: + +This section documents the Fedora Project Demographic Survey research. +This was work completed between 2016 to 2018 to launch a demographic survey to understand the Fedora Community. +Because of legal concerns around recent data legislation passed in this time period (https://en.wikipedia.org/wiki/General_Data_Protection_Regulation[G.D.P.R.]), the survey was planned but never published. + +A majority of this work was completed at the https://communityblog.fedoraproject.org/fedora-diversity-fad-2017/[Fedora Diversity FAD] in January 2017. + +[NOTE] +==== +This page represents six to eight months of work from the Fedora Diversity & Inclusion Team in late 2015 and early 2016. +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 here for historical purposes. +The team hopes our research and work may be useful for other Open Source communities and Diversity & Inclusion programmes. +==== + + +[[objectives]] +== Objectives + +The Fedora Project Demographic Survey established these key objectives for launching such a survey: + +[[understand]] +=== 1. Understand baseline demographics about the Fedora Community. + +* *Why this objective was important*: + Enables Fedora Diversity and Inclusion Team to identify different areas of need for contributing to Fedora, and prioritize to act on areas of most-immediate need. +* *Examples of target criteria*: +** Age +** Gender +** Race and cultural background +** Geographic area or region +** Disability +** Parents and families +** Non-English languages + +[[support]] +=== 2. Support underrepresented groups by supplementing on-boarding resources to other Fedora teams. + +* *Why this objective was important*: +** Collaborate and support on-going work in other Fedora Teams by advising mentorship and teaching programs in Fedora Community +** Disseminate best practices through mentorship and community on-boarding +* *Examples of possible partnering teams*: +** xref:fedora-join::index.adoc[Join SIG] +** Mentoring and internship programs + (GSoC and Outreachy) +** xref:fedora-join::classroom/classroom.adoc[Fedora Classrooms] + + +[[misc-comments]] +== Miscellaneous comments + +When the survey was first drafted in late 2016 and early 2017, several comments, ideas, and xref::resources.adoc[resources] influenced the design of the survey and an outreach campaign for it. +Some of the pending and unresolved notes are below for archival purposes. + +[quote,Bee Padalkar (bee2502)] +____ +* How were you introduced to Fedora? +.. By another Fedora contributor +.. At a Fedora event + (e.g. FAD / workshop / meetup / release party) +.. Conference +.. Hackerspace +.. Red Hat +.. Web / online +* What makes contributing to Fedora difficult for you? +____ + +We also wanted to identify how the data will be used. +We aimed to make a communication plan for how the data would be used. +Ideally, information about data use and intentions is available and embedded in the survey. diff --git a/modules/survey/pages/questions.adoc b/modules/survey/pages/questions.adoc new file mode 100644 index 0000000..e8e8099 --- /dev/null +++ b/modules/survey/pages/questions.adoc @@ -0,0 +1,262 @@ +include::ROOT:partial$attributes.adoc[] + += Demographic Survey Questions +Fedora Diversity & Inclusion Team +v1.0.0 +:toc: + +This page includes the officially-approved list of questions for the Fedora Project Demographic Survey. +It contains 23 questions. +See the xref:index.adoc[About] and xref:resources.adoc[Resources & references] pages for additional context behind these questions. + +[NOTE] +==== +This page represents six to eight months of work from the Fedora Diversity & Inclusion Team in late 2015 and early 2016. +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 here for historical purposes. +The team hopes our research and work may be useful for other Open Source communities and Diversity & Inclusion programmes. +==== + + +[[fedora-foss]] +== Fedora and Free and Open Source software usage and contributions + +. *How long have you been a Fedora user?* +** I have never used Fedora +** Less than 1 year +** 1 to 3 years +** 3 to 6 years +** 6 to 10 years +** Over 10 years +** Prefer not to say + +. *How long have you been a Fedora contributor?* +** I have never contributed to Fedora +** Less than 1 year +** 1 to 3 years +** 3 to 6 years +** 6 to 10 years +** Over 10 years +** Prefer not to say + +. *Please select types of contributions that you make to Fedora:* +** Community + (community leadership, new contributor outreach and onboarding, diversity and inclusion work, marketing, event organization) +** Technical + (packaging, programming, infrastructure, operations, release engineering, testing / QA, language-specific SIGs) +** Other non-technical + (design, documentation, localization, translation) +** Prefer not to say +** Other + (please specify) + +. *Do you contribute to Fedora as a volunteer or as an employee of a company?* + [select all that apply] +** Volunteer + (student) +** Volunteer + (unemployed) +** Volunteer + (retired) +** Volunteer + (outside regular job) +** Employee + (work-related contributions) +** Prefer not to say +** Other + (please specify) + +. *On average, how many hours a week did you spend on Fedora contributions in the last three months?* +** 0, I have not contributed in the last three months +** Less than 2 +** 2 - 5 +** 6 - 10 +** 11 - 20 +** 21 - 40 +** More than 40 +** Prefer not to say + +. *What are the top reasons you contribute to Fedora?* + Please check a maximum of 4 answers. +** To participate in a global cooperative project +** To participate in a free and open source software project +** To improve a free and open source software project +** Because I think that software should not be proprietary +** To solve a problem that could not be done by proprietary software +** To get help in realizing a good idea for a software project +** To learn and develop new skills +** To share my knowledge and skills +** To improve my job opportunities +** To get a reputation in the free and open source software scene +** To meet other people in the free and open source software community +** Because I enjoy working with other people in the community +** To get funding to travel internationally +** To earn a living +** Prefer not to say +** Other + (please specify) + +. *Think of the time you made your first contribution to Fedora that was incorporated. What best describes your experience?* +** My co-worker, who was paid to work on Fedora, helped me prepare the contribution +** A person I already knew socially helped me prepare the contribution +** A person I did not know before helped me prepare the contribution at an in-person event +** A person I did not know before helped me prepare the contribution via electronic communications +** A mentor for a third-party program (e.g. Google Summer of Code, Outreachy, etc.) helped me prepare the contribution via electornic communications +** A mentor identified by the Fedora Project helped me prepare the contribution via electronic communications +** A person whom I identified as a mentor helped me prepare the contribution via electronic communications +** I submitted my contribution electronically for review and it was reviewed by my co-worker, who was paid to work on Fedora +** I submitted my contribution electronically for review and it was reviewed by someone I already knew socially +** I submitted my contribution electronically for review and it was reviewed by someone I didn’t know before +** Prefer not to say +** Other + (please specify) + +. *Do you routinely use software that is not free and open source on Fedora?* +** Yes, but only web-based applications like Google Docs +** Yes, but only locally installed applications (including hardware drivers) +** Yes, both web-based and locally installed applications +** No +** Prefer not to say +** Other + (please specify) + + +[[demographics]] +== Demographics + +. *What is your gender?* +** Male +** Female +** Non-binary +** Prefer not to say +** Other + (please specify) + +. *Do you identify as lesbian, gay, bisexual, transgender or queer?* +** Yes +** No +** Prefer not to say + +. *What is your age range?* +** 17 or younger +** 18 to 24 +** 25 to 34 +** 35 to 44 +** 45 to 54 +** 55 to 64 +** 65 to 74 +** Over 75 +** Prefer not to say + +. *Do you have any disability, including, but not limited to any of the ones listed https://www.dol.gov/ofccp/regs/compliance/sec503/Self_ID_Forms/VoluntarySelf-ID_CC-305_ENG_JRF_QA_508c.pdf[here]?* +** Yes +** No +** Prefer not to say + +. *Do you have a partner?* +** No, I am a single +** Yes, although we do not live together +** Yes, I live together with my partner +** Yes, I am married +** Yes, I am married, but we do not live together +** Prefer not to say +** Other + (please specify) + +. *How old is your youngest child?* +** I don’t have children +** Less than 2 years old +** Between 2 years and 5 years old +** Between 6 years and 10 years old +** Between 11 years and 17 years old +** 18 years or older +** Prefer not to say + +. *What region of the world do you reside in?* +** Asia and Pacific Countries + (APAC) +** Europe and the Middle East + (EMEA) +** Latin and South America + (LATAM) +** North America + (NA) +** Prefer not to say + +. *What is your country of residence?* + [FAS Country List - Divided by Region] + +. *What is the highest level of education you have completed?* +** Less than secondary (High) school +** Secondary (High) school graduate or equivalent +** Vocational / trade program or apprenticeship +** Some college + (working towards a first level university degree) +** Some college + (not pursuing a degree anymore) +** Associate degree +** Bachelor’s degree +** Master’s degree +** Doctorate (Ph.D.) or other advanced degree + (e.g. M.D., J.D.) +** Prefer not to say +** Other + (please specify) + +. *If you are employed, what organization do you work for?* +** I am not employed +** Employed + (please specify organization name) +** Employed, but prefer not to specify the organization +** Prefer not to say + +. *If you are employed, what do you work on?* + [select all that apply] +** I am not employed +** Software development +** System administration +** Testing / QA / QE +** Technical writing +** UX/UI design +** Marketing /communications +** Community and event management +** Prefer not to say +** Other + (please specify) + + +[[perception]] +== Perception of, experience with, and attitudes towards diversity and inclusion + +[NOTE] +==== +This section title may need revisions for simplicity. +==== + +The following questions can be presented as a table, with the same set of answer options. +Questions about diverse perspectives, comfort with contributing ideas, valuing best ideas, and feeling respected were adapted from Red Hat Associate Survey. + +. *Please indicate how you feel about the following statements.* +** Diverse perspectives are valued in the Fedora community. +** I feel comfortable contributing my ideas (in meetings or online forums), even when my views differ from other contributors. +** The people I collaborate with value the best ideas regardless of their source. +** I feel respected when I share my ideas and opinions in the Fedora community. +** Having greater diversity of contributors will positively impact the Fedora Project. +** I’m appreciated for the contributions I make. + +. *Information about Fedora processes, policies or guidelines is easy to find.* +** Strongly agree +** Agree +** Slightly agree +** Neither agree nor disagree +** Slightly disagree +** Disagree +** Strongly disagree + +[NOTE] +==== +For the final two questions, do not add personally-identifying information about yourself or others in either text box. +==== + +. *Is there anything you believe would improve the inclusivity of the Fedora community?* + +. *Do you have any feedback on this survey and are there any additional questions you believe it should have asked?* diff --git a/modules/survey/pages/resources.adoc b/modules/survey/pages/resources.adoc new file mode 100644 index 0000000..7254320 --- /dev/null +++ b/modules/survey/pages/resources.adoc @@ -0,0 +1,18 @@ +include::ROOT:partial$attributes.adoc[] + += Resources & references + +Several other existing surveys, Open Source research studies, and other writing influenced the creation, design, and execution of this survey: + +[NOTE] +==== +FLOSS Survey 2013 focuses on a comparative analysis of different groups of respondents instead of asserting authoritative statistics abour diversity in the Open Source community. +==== + +FLOSS Survey 2013:: +* https://floss2013.larjona.net/[Questions and results] +* http://flosshub.org/content/women-freelibreopen-source-software-situation-2010s[Women in Free/Libre/Open Source Software: The Situation in the 2010s] paper with results analysis + +Apache Software Foundation Committer Diversity Survey:: +* http://mail-archives.apache.org/mod_mbox/www-announce/201611.mbox/%3Cpony-31e1cbf2b23a01ea035ee3323fe2ab95950c8284-dc1f345f30800e5cbef086a8801c55be77bc49c3%40announce.apache.org%3E[Announcement e-mail] +* https://cwiki.apache.org/confluence/display/COMDEV/ASF+Committer+Diversity+Survey+-+2016[Results] From 6dbd56df9be62e663c5f00245598263b9113f01a Mon Sep 17 00:00:00 2001 From: Ramya Parimi Date: Nov 05 2020 17:05:05 +0000 Subject: [PATCH 11/22] tried to fix xref links --- diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc index 59ff671..cee2a48 100644 --- a/modules/ROOT/pages/index.adoc +++ b/modules/ROOT/pages/index.adoc @@ -50,7 +50,7 @@ xref:events:index.adoc[Events] organized by the Fedora D&I team focus to: * Engage, empower and encourage diverse folks in the open source communities. If you are interested in organizing such event at your locality, please send us an email. We are always looking for new collaborators. -In addition, please checkout the xref:events:fwd-resource-pack[Event Resource Pack] for more information. +In addition, please checkout the xref:events:fwd-resource-pack.adoc[Event Resource Pack] for more information. [[demographic-survey]] == Demographic Survery @@ -71,7 +71,7 @@ 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. -If you are interested in working with us, please checkout xref:get-involved.adoc[how to get involved with us] to start your journey with our team! +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! [[meeting-guide]] === Meeting Guide From bed387ce3d1cf274a26744fa8e4a8f734b38365f Mon Sep 17 00:00:00 2001 From: Ramya Parimi Date: Nov 08 2020 17:21:43 +0000 Subject: [PATCH 12/22] minor changes to address the feedback --- diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc index cee2a48..f7e9760 100644 --- a/modules/ROOT/pages/index.adoc +++ b/modules/ROOT/pages/index.adoc @@ -3,7 +3,9 @@ include::{partialsdir}/attributes.adoc[] = Diversity and inclusion in Fedora :toc: -The goal of our team is to encourage diversity and inclusion in the Fedora community. +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. @@ -36,7 +38,7 @@ The https://fedoraproject.org/wiki/Women[Fedora Women] team is no longer active 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 involvement in Fedora. +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. From 9c9d499d4c5ea45bf822038a4684e2b2ef12781a Mon Sep 17 00:00:00 2001 From: Ramya Parimi Date: Nov 14 2020 03:28:46 +0000 Subject: [PATCH 13/22] updating communication platforms on D&I team page edited the heading for communications paragraph edited link for IRC web chat added link to channel in Matrix --- diff --git a/antora.yml b/antora.yml index 7af343e..78e1c18 100644 --- a/antora.yml +++ b/antora.yml @@ -14,3 +14,4 @@ start_page: ROOT:index # This lists all the menu definitions of your component. nav: - modules/ROOT/nav.adoc +- modules/events/nav.adoc diff --git a/modules/ROOT/nav.adoc b/modules/ROOT/nav.adoc index b41d53a..2614ad6 100644 --- a/modules/ROOT/nav.adoc +++ b/modules/ROOT/nav.adoc @@ -1,8 +1,4 @@ -* xref:events.adoc[D&I events] * xref:demographic-survey.adoc[Demographic survey] -* Fedora Women's Day (FWD) -** xref:fedora-womens-day/about.adoc[About FWD] -** xref:fedora-womens-day/resource-pack.adoc[Resource pack] * xref:get-involved.adoc[Get involved] * xref:meetings.adoc[D&I Meeting Guide] * Policy diff --git a/modules/ROOT/pages/fedora-womens-day/about.adoc b/modules/ROOT/pages/fedora-womens-day/about.adoc deleted file mode 100644 index f189b0a..0000000 --- a/modules/ROOT/pages/fedora-womens-day/about.adoc +++ /dev/null @@ -1,12 +0,0 @@ -include::{partialsdir}/attributes.adoc[] - -= About Fedora Women's Day - -Fedora Women's Day (FWD) is a day of celebration to raise awareness and gratitude for women contributors across the Fedora Project. -Fedora Women's Day marks the anniversary of the {FWIKI}/Women[Fedora Women] team. -The event is headed by Fedora's xref:team.adoc[Diversity and Inclusion Team]. - -Across September, we encourage more women contributors across Fedora to connect and network with one another. -Fedora Women's Day highlights and celebrates the women of open source communities like Fedora and their contributions to their projects and community. -They are also an opportunity for women to learn about free and open source software and jump-start their journey as a user of FOSS and/or become a contributor. -They also provide a platform for women to connect, learn, and be inspired by other women in open source communities and beyond. diff --git a/modules/ROOT/pages/fedora-womens-day/resource-pack.adoc b/modules/ROOT/pages/fedora-womens-day/resource-pack.adoc deleted file mode 100644 index 7582231..0000000 --- a/modules/ROOT/pages/fedora-womens-day/resource-pack.adoc +++ /dev/null @@ -1,111 +0,0 @@ -include::{partialsdir}/attributes.adoc[] - -= FWD organizer resource pack - -This page is the resource pack provided to xref:fedora-womens-day/about.adoc[Fedora Women's Day] organizers by the xref:diversity-inclusion::team.adoc[Diversity and Inclusion Team]. -These resources summarize information about Fedora. -It also provides suggestions for what organizers should put on their agendas. -Each sub-heading below represents a different piece of the resource pack. - -**Did you find people interested in contributing to Fedora**, Kindly help them create link:https://pagure.io/fedora-join/Welcome-to-Fedora/issues[Welcome to Fedora tickets] for themselves for Fedora Join SIG to keep track of their progress and help them become contributors. -Read about the process link:https://docs.fedoraproject.org/en-US/fedora-join/welcome/welcome/[here]. - -If you need any help with it, Feel free to reach out to Fedora Join SIG for co-ordination at any of Fedora Join SIG's https://docs.fedoraproject.org/en-US/fedora-join/#communication[Communication channels]. - -== About Fedora Diversity and Inclusion Team - -At your event, please introduce the Fedora Diversity and Inclusion Team to your attendees. -The explanation includes what the team does in the Fedora community and some of our upcoming goals. -If anyone wants to learn more, you can share our xref:diversity-inclusion::team.adoc[team introduction page] with them. - -What is the Fedora Diversity and Inclusion Team:: -Fedora Diversity and Inclusion team is committed to fostering diversity and inclusion in Fedora community. -The team works towards this goal by focusing on efforts including (but not limited to): -* Creating content and organizing events to spread awareness about diversity in Fedora within and outside the Fedora community (like Fedora Women's Day!) -* Supporting community building and engagement activities to foster inclusion -* Coordinating with Fedora sub-projects to foster Diversity and Inclusion in the community -* Supporting programs committed to building diversity and inclusion in Free and Open Source Software communities - -What the team is working on:: -The team is working on a different range of tasks to support diversity and inclusion efforts in the Fedora Project. -Recently, at the 2018 https://flocktofedora.org/[Fedora Flock conference], new additions were made to the conference, including gender-neutral bathrooms, a quiet room, and communication preference stickers. -This supported our existing effort to draft https://pagure.io/fedora-diversity/issue/54[event inclusion guidelines] for Fedora event organizers. -The intention is to share it widely with others in the community (and possibly other communities) to follow best practices for event organizers. -Additionally, we hope to launch a https://pagure.io/fedora-diversity/issue/62[demographic survey] of the Fedora community in early 2019. - - -== Fedora Editions - -{FWIKI}/Editions[Fedora Editions] are the flagship configurations of Fedora offered by the Fedora Project. -They are promoted on the https://getfedora.org/[getfedora.org] website. -Each Edition has a different use case and audience, explained below. - -=== Fedora Workstation - -https://getfedora.org/workstation/[Fedora Workstation] is the primary desktop configuration offered by Fedora. -If your audience is looking to use Linux on the desktop or learn how to develop in a Linux environment, Fedora Workstation is a great choice. -It ships the https://www.gnome.org/[GNOME Desktop Environment], includes latest versions of programming languages and libraries, and is easy to make a https://fedoramagazine.org/make-fedora-usb-stick/[bootable USB stick]. - -See recent features to Fedora Workstation {FWIKI}/Fedora_{MAJOROSVER}_talking_points#Fedora_Workstation[here]. - -=== Fedora Server - -https://getfedora.org/server/[Fedora Server] is the primary server configuration offered by Fedora. -If your audience includes system administrators, Fedora Server is a good choice for seasoned system administrators to work with the latest technologies from the open source community. -It is a short-lifecycle, community-supported server environment. -Fedora Server features https://cockpit-project.org/[Cockpit], https://www.freeipa.org/page/About[FreeIPA identity management], and the brand-new https://docs.pagure.org/modularity/[Fedora Server Modular Edition]. - -See recent features to Fedora Server {FWIKI}/Fedora_{MAJOROSVER}_talking_points#Fedora_Server[here]. - -=== Fedora Silverblue - -https://silverblue.fedoraproject.org/[Fedora Silverblue] is a variant of Fedora Workstation. -It looks, feels and behaves like a regular desktop operating system, and the experience is similar to what you find with a standard Fedora Workstation. - -However, unlike other operating systems, Silverblue is immutable. -This means that every installation is identical to every other installation of the same version. -The operating system that is on disk is exactly the same from one machine to the next, and it never changes as it is used. - -=== Fedora CoreOS - -https://getfedora.org/en/coreos/[Fedora CoreOS] is an automatically updating, minimal, monolithic, container-focused operating system, designed for clusters but also operable standalone, optimized for Kubernetes but also great without it. -It aims to combine the best of both CoreOS Container Linux and Fedora Atomic Host, integrating technology like Ignition from Container Linux with rpm-ostree and SELinux hardening from Project Atomic. -Its goal is to provide the best container host to run containerized workloads securely and at scale. - -=== Fedora IoT - -xref:iot:ROOT:index.adoc[Fedora IoT] or Fedora Internet of Things is a Fedora Edition to provide a strong foundation for IoT ecosystems. -Whether you’re working on a project at home, industrial gateways, smart cities or analytics with AI/ML, Fedora IoT can provide a trusted open source platform to build on. -Fedora IoT rolling releases help you keep your ecosystem up-to-date. - -== Fedora Objectives - -[quote, 'From https://docs.fedoraproject.org/en-US/project/objectives/[Fedora Objectives]'] -____ -The primary role of the Fedora Council is to identify the short, medium, and long term goals of the Fedora community and to organize and enable the project to best achieve them. -Each objective has a designated Objective Lead who is responsible for coordinating efforts to reach the Objective’s goals, for evaluating and reporting on progress, and for working regularly with all relevant groups in Fedora to ensure that progress is made. -____ - -These Objectives are listed as follows: - -* xref:minimization:index.adoc[Fedora Minimization] -* {FWIKI}/Objectives/Fedora_IoT[Internet of Things (IoT)] - -== Fedora <3 Python - -https://fedoralovespython.org/[*fedoralovespython.org*]:: -Collection of resources on using Python on Fedora. -https://developer.fedoraproject.org/tech/languages/python/python-installation.html[*Python - Fedora Developer Portal*]:: -Steps and guides on how to install, use, and develop with Python on Fedora (including Django, Flask, https://developer.fedoraproject.org/tech/languages/python/scipy.html[SciPy] and more). -http://fedora.portingdb.xyz/[*Python 3 porting database*]:: -Fedora's Python 3 porting database. -Shows progress towards fully migrating Fedora Python packages to Python 3. -https://labs.fedoraproject.org/python-classroom/[*Python Classroom Lab*]:: -Fedora Lab intended for teachers and instructors teaching students Python. -It includes several Python development tools and libraries not normally installed by default (also is available as GNOME desktop, a Vagrant VM, or a Docker container). -https://whatcanidoforfedora.org/en/#coding#python[*Contributing to Python in Fedora*]:: -Helpful resources to find ways to contribute to Python efforts in Fedora. -https://fedoramagazine.org/tag/python/[*Python articles on Fedora Magazine*]:: -All articles on the Fedora Magazine related to Python in Fedora. -Two great examples are https://fedoramagazine.org/python-3-7-now-available-in-fedora/[_Python 3.7 now available in Fedora_] and https://fedoramagazine.org/install-pipenv-fedora/[_How to install Pipenv on Fedora_]. - diff --git a/modules/ROOT/pages/get-involved.adoc b/modules/ROOT/pages/get-involved.adoc index 6af3091..6453a2b 100644 --- a/modules/ROOT/pages/get-involved.adoc +++ b/modules/ROOT/pages/get-involved.adoc @@ -62,7 +62,7 @@ Consider these questions when introducing yourself: [[join-irc-telegram]] -== Join IRC/Telegram group chat +== Join IRC/Telegram/Matrix group chat The Fedora Diversity and Inclusion Team has a real-time group chat. We use this group chat for quick updates, friendly chatter, and running meetings. @@ -73,7 +73,7 @@ Here are the easiest ways to join: * https://webchat.freenode.net/?channels=#fedora-diversity[IRC Web chat] * https://t.me/fedoradiversity[Telegram] -* https://app.element.io/#/room/#freenode_#fedora-diversity:matrix.org[Matrix] +* https://app.element.io/#/room/#fedora-diversity:matrix.org[Element/Matrix] Don't forget to say hi when you join! diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc index 29f4e57..fced380 100644 --- a/modules/ROOT/pages/index.adoc +++ b/modules/ROOT/pages/index.adoc @@ -39,9 +39,8 @@ Fedora Women aims to foster involvement of women (cis and trans) and genderqueer [[events]] === Events -Fedora Diversity and Inclusion team organizes and supports a variety of events with the aim of fostering diversity and inclusion in Fedora community. +Fedora Diversity and Inclusion team organizes and supports a variety of xref:events:index.adoc[events] with the 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. -Information about some of our events can be found xref:events.adoc[Here]. If you are interested in working with us to organize events in your local community, send us an email. We are always looking for new collaborators. diff --git a/modules/events/nav.adoc b/modules/events/nav.adoc new file mode 100644 index 0000000..bc981a8 --- /dev/null +++ b/modules/events/nav.adoc @@ -0,0 +1,3 @@ +* xref:index.adoc[D&I Events] +** xref:about-fwd.adoc[Fedora Women's Day] +*** xref:fwd-resource-pack.adoc[Resource pack] diff --git a/modules/events/pages/about-fwd.adoc b/modules/events/pages/about-fwd.adoc new file mode 100644 index 0000000..4dc738e --- /dev/null +++ b/modules/events/pages/about-fwd.adoc @@ -0,0 +1,11 @@ +include::ROOT:partial$attributes.adoc[] + += About Fedora Women's Day + +Fedora Women's Day highlights and celebrates the women/non-binary contributers in open source communities like Fedora and beyond. +Fedora Women's Day marks the anniversary of the {FWIKI}/Women[Fedora Women] team and is headed by Fedora's Diversity and Inclusion Team. + +Across September, we encourage more women contributors across Fedora to connect and network with one another. +Fedora Women's Day highlights and celebrates the women of open source communities like Fedora and their contributions to their projects and community. +They are also an opportunity for women to learn about free and open source software and jump-start their journey as a user of FOSS and/or become a contributor. +They also provide a platform for women to connect, learn, and be inspired by other women in open source communities and beyond. diff --git a/modules/events/pages/fwd-resource-pack.adoc b/modules/events/pages/fwd-resource-pack.adoc new file mode 100644 index 0000000..f961c34 --- /dev/null +++ b/modules/events/pages/fwd-resource-pack.adoc @@ -0,0 +1,115 @@ +include::ROOT:partial$attributes.adoc[] + += FWD organizer resource pack + +In this page you can find a resource pack that helps in organizing a successful xref:events:about-fwd.adoc[Fedora Women's Day] event. The points below can be used in the event organizer's agenda: + + * How to welcome contributors to Fedora + * A summary about Fedora D&I team + * Overview of different Fedora editions + * Fedora and Python + +== How to welcome new contributors to Fedora? + +Did you come across folks who are interested in contributing to the Fedora project? Then please create link:https://pagure.io/fedora-join/Welcome-to-Fedora/issues[Welcome to Fedora ticket] for the newcomers with Fedora Join SIG. This ticket helps them to easily track their progress in the journey to becoming Fedora contributors. +Find more information about the welcome ticket process link:https://docs.fedoraproject.org/en-US/fedora-join/welcome/welcome/[here]. + +Need help with creating the welcome ticket? Reach out to Fedora Join SIG at any of their https://docs.fedoraproject.org/en-US/fedora-join/#communication[Communication channels]. + +== About Fedora Diversity and Inclusion Team + +At your event, start with an introduction to the Fedora Diversity and Inclusion Team. +Explain the role of D&I team in the Fedora community and its upcoming goals. +Share our xref:diversity-inclusion::team.adoc[team's introduction page] with anyone who is interested in learing more. + +What is the role of Fedora Diversity and Inclusion Team?:: +As the name indicates, the main goal of the D&I team is to foster diversity and inclusion in Fedora community. +Below are some of the many efforts focused by D&I team to achieve its goal: +* Creating content and organizing events to spread awareness about diversity within and outside Fedora community (like Fedora Women's Day!) +* Supporting community building and engagement activities to promote inclusion +* Coordinate with Fedora sub-projects to enhance Diversity and Inclusion in the community +* Supporting programs committed to building diversity and inclusion in Free and Open Source Software communities + +What the D&I team works on?:: +The D&I team works on various tasks to support diversity and inclusion in the Fedora Project. +For example, new additions were made to the 2018 https://flocktofedora.org/[Fedora Flock conference] such as including gender-neutral bathrooms, a quiet room, and communication preference stickers. +These additions in turn supported our existing effort to draft https://pagure.io/fedora-diversity/issue/54[event inclusion guidelines] for Fedora event organizers. +These guidelines when shared within and outside Fedora community provide best practices to organizers holding an event. +In addition, we also hope to launch a https://pagure.io/fedora-diversity/issue/62[demographic survey] of the Fedora community in soon. + + +== Fedora Editions + +{FWIKI}/Editions[Fedora Editions] are the flagship configurations of Fedora offered by the Fedora Project. +They are promoted on the https://getfedora.org/[getfedora.org] website. +Each Edition has a different use case and audience as explained below. + +=== Fedora Workstation + +https://getfedora.org/workstation/[Fedora Workstation] is a primary desktop configuration offered by Fedora. +Fedora workstation is a great choice for someone looking to use a Linux on their desktop or learn to develop in a Linux environment. +It ships the https://www.gnome.org/[GNOME Desktop Environment], includes latest versions of programming languages and libraries, and is easy to make a https://fedoramagazine.org/make-fedora-usb-stick/[bootable USB stick]. + +See recent features to Fedora Workstation {FWIKI}/Fedora_{MAJOROSVER}_talking_points#Fedora_Workstation[here]. + +=== Fedora Server + +https://getfedora.org/server/[Fedora Server] is a primary server configuration offered by Fedora. +This makes a good choice for seasoned system administrators, allowing them to work with latest technologies from the open source community. +This is a short-lifecycled, community-supported server environment. +Fedora Server features https://cockpit-project.org/[Cockpit], https://www.freeipa.org/page/About[FreeIPA identity management], and the brand-new https://docs.pagure.org/modularity/[Fedora Server Modular Edition]. + +See recent features to Fedora Server {FWIKI}/Fedora_{MAJOROSVER}_talking_points#Fedora_Server[here]. + +=== Fedora Silverblue + +https://silverblue.fedoraproject.org/[Fedora Silverblue] is a variant of Fedora Workstation. +It looks, feels and behaves like a regular desktop operating system giving an experience is similar to a standard Fedora Workstation. + +However, unlike other operating systems, Silverblue is immutable. +This means that every installation is identical to every other installation of the same version. +The operating system that is on disk is exactly the same from one machine to the next, and it never changes as it is used. + +=== Fedora CoreOS + +https://getfedora.org/en/coreos/[Fedora CoreOS] is an automatically updating, minimal, monolithic, container-focused operating system designed for clusters but also operable standalone. This is optimized for Kubernetes but also works great without it. +It aims to combine the best of both CoreOS Container Linux and Fedora Atomic Host, by integrating Ignition technology from Container Linux with rpm-ostree and SELinux hardening from Project Atomic. +The goal of this edition is to provide the best container host to run containerized workloads securely and at scale. + +=== Fedora IoT + +xref:iot:ROOT:index.adoc[Fedora IoT] or Fedora Internet of Things provides a strong foundation for IoT ecosystems. +Whether you’re working on a project at home, industrial gateways, smart cities or analytics with AI/ML, Fedora IoT can provide a trusted open source platform to build on. +Fedora IoT rolling releases help you keep your ecosystem up-to-date. + +== Fedora Objectives + +[quote, 'From https://docs.fedoraproject.org/en-US/project/objectives/[Fedora Objectives]'] +____ +The primary role of the Fedora Council is to identify the short, medium, and long term goals of the Fedora community and to organize and enable the project to best achieve them. +Each objective has a designated Objective Lead who is responsible for coordinating efforts to reach the Objective’s goals, for evaluating and reporting on progress, and for working regularly with all relevant groups in Fedora to ensure that progress is made. +____ + +These Objectives are listed as follows: + +* xref:minimization:index.adoc[Fedora Minimization] +* {FWIKI}/Objectives/Fedora_IoT[Internet of Things (IoT)] + +== Fedora <3 Python + +https://fedoralovespython.org/[*fedoralovespython.org*]:: +Collection of resources on using Python on Fedora. +https://developer.fedoraproject.org/tech/languages/python/python-installation.html[*Python - Fedora Developer Portal*]:: +Steps and guides on how to install, use, and develop with Python on Fedora (including Django, Flask, https://developer.fedoraproject.org/tech/languages/python/scipy.html[SciPy] and more). +http://fedora.portingdb.xyz/[*Python 3 porting database*]:: +Fedora's Python 3 porting database. +Shows progress towards fully migrating Fedora Python packages to Python 3. +https://labs.fedoraproject.org/python-classroom/[*Python Classroom Lab*]:: +Fedora Lab intended for teachers and instructors teaching students Python. +It includes several Python development tools and libraries not normally installed by default (also is available as GNOME desktop, a Vagrant VM, or a Docker container). +https://whatcanidoforfedora.org/en/#coding#python[*Contributing to Python in Fedora*]:: +Helpful resources to find ways to contribute to Python efforts in Fedora. +https://fedoramagazine.org/tag/python/[*Python articles on Fedora Magazine*]:: +All articles on the Fedora Magazine related to Python in Fedora. +Two great examples are https://fedoramagazine.org/python-3-7-now-available-in-fedora/[_Python 3.7 now available in Fedora_] and https://fedoramagazine.org/install-pipenv-fedora/[_How to install Pipenv on Fedora_]. + diff --git a/modules/events/pages/index.adoc b/modules/events/pages/index.adoc new file mode 100644 index 0000000..c3098ac --- /dev/null +++ b/modules/events/pages/index.adoc @@ -0,0 +1,9 @@ +include::ROOT:partial$attributes.adoc[] + += Events + +The Events section of the D&I Docs aims to build a *Fedora Diversity events calendar* and identify *regional events for participation*. +As the D&I team aims to assist minorities and promote a more inclusive environment in the Fedora Community, we target minority-specific events. + +This page is maintained by the Fedora Diversity and Inclusion Team. +For suggesting any modifications, please contact xref:ROOT:get-involved.adoc[Diversity and Inclusion Team] or the xref:council:ROOT:diversity-advisor.adoc[Diversity Adviser]. From ae88b9d95eaa150a308855160f86c4958ef18981 Mon Sep 17 00:00:00 2001 From: Justin W. Flory (he/him) Date: Nov 14 2020 03:28:46 +0000 Subject: [PATCH 14/22] fwd: Add FWD infographic template to docs (closes #121) This commit adds the Fedora Women's Day infographic template created by @smeragoel to the Fedora D&I Team docs repo. Currently, it is only an incomplete template, but now that FWD 2020 has completed, we can fill it out for this year. To help motivate us for this year, I added the PNG version of the template to the "About FWD" page as a placeholder to update once we get a finalized 2020 version. Closes #121. Signed-off-by: Justin W. Flory (he/him) --- diff --git a/modules/ROOT/assets/images/fwd/infographic-template.png b/modules/ROOT/assets/images/fwd/infographic-template.png new file mode 100644 index 0000000..dac30eb Binary files /dev/null and b/modules/ROOT/assets/images/fwd/infographic-template.png differ diff --git a/modules/ROOT/assets/images/fwd/infographic-template.svg b/modules/ROOT/assets/images/fwd/infographic-template.svg new file mode 100644 index 0000000..f59914f --- /dev/null +++ b/modules/ROOT/assets/images/fwd/infographic-template.svg @@ -0,0 +1,3734 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + FWD BADGE + This year,more than X people were awarded the FWD attendee badge. Woohoo! + + + Fedora Women's Day is a global event to celebrate women and non-binary contributors across the Fedora Project.IRC: #fedora-diversity on freenodeTelegram: @fedoradiversity + + + HEADING + Subheading + Body text + + + FEDORA WOMEN'S DAY + + + + EVENT + + This edition of FWD was held on *date* at *location* and was hosted by *name of host*. It was attended by more than X people. *Add more event specific details here* + The best part of FWD are the talks given by the awesome folks who make Fedora better. This edition of FWD had amazing talks given by:• Speaker 1• Speaker 2• Speaker 3• Speaker 4• Speaker 5• Speaker 6 + + This edition of FWD had a host of activities for audience engagement like: + ACTIVITIES + To learn more about the Fedora Project visit: getfedora.org + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 20 + + *Activity 2 Name* + *Add description of activity 2 here* Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas cursus vel dui eget consequat. Integer rhoncus, mauris vel maximus mattis, ex elit faucibus odio, sit amet dapibus metus purus sed turpis. + + + *You can add an image here* + + *Activity 1 Name* + *Add description of activity 1 here* Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas cursus vel dui eget consequat. Integer rhoncus, mauris vel maximus mattis, ex elit faucibus odio, sit amet dapibus metus purus sed turpis. + SPEAKERS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + *You can add an image here* + + + diff --git a/modules/events/pages/about-fwd.adoc b/modules/events/pages/about-fwd.adoc index 4dc738e..f06d12e 100644 --- a/modules/events/pages/about-fwd.adoc +++ b/modules/events/pages/about-fwd.adoc @@ -9,3 +9,5 @@ Across September, we encourage more women contributors across Fedora to connect Fedora Women's Day highlights and celebrates the women of open source communities like Fedora and their contributions to their projects and community. They are also an opportunity for women to learn about free and open source software and jump-start their journey as a user of FOSS and/or become a contributor. They also provide a platform for women to connect, learn, and be inspired by other women in open source communities and beyond. + +image:ROOT:fwd/infographic-template.png[Infographic about the Fedora Women's Day event. Created by Smera Goel.] From d55cea95da3dba0da49db3a866aba8332d0f179c Mon Sep 17 00:00:00 2001 From: Justin W. Flory (he/him) Date: Nov 14 2020 03:28:46 +0000 Subject: [PATCH 15/22] index: Add 2020 infographic from @smeragoel (closes #154) This commit adds the 2020 infographic created by @smeragoel into our docs repository. It also adds it to the home page for the D&I docs. I figure a visual says a lot more than pictures, so I placed it near the top of the document. I also added a table of contents (`:toc:`) to help make the content on the lower part of the page more known and not buried by the infographic. Closes #154. Signed-off-by: Justin W. Flory (he/him) --- diff --git a/modules/ROOT/assets/images/infographic-2020.png b/modules/ROOT/assets/images/infographic-2020.png new file mode 100644 index 0000000..fda2511 Binary files /dev/null and b/modules/ROOT/assets/images/infographic-2020.png differ diff --git a/modules/ROOT/assets/images/infographic-2020.svg b/modules/ROOT/assets/images/infographic-2020.svg new file mode 100644 index 0000000..b4ccc98 --- /dev/null +++ b/modules/ROOT/assets/images/infographic-2020.svg @@ -0,0 +1,28926 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + SPEAK A NON-ENGLISH LANGUAGE + The D&I Team organised an hour-long event for people to speak a non-English language with other native speakers of non-English languages to foster inclusion in the community! + + + Fedora Diversity and Inclusion team is committed to fostering diversity and inclusion in the Fedora community. IRC: #fedora-diversity on freenodeTelegram: @fedoradiversity + + + + + + + + + + + + + + + + + + + + + + + + + + + + DIVERSITY & INCLUSION + + + + To learn more about the Fedora Project visit: getfedora.org + + + + + + + + FEDORA WOMEN'S DAY + Fedora Women's Day (FWD) is a day of celebration to help raise awareness and thanks for the women contributors across the Fedora Project. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + In 2019, 9 different FWDs were organised in four different countries. + You can organise a FWD for your local Fedora community! Resource packs and support from the D&I team are provided to assist. + + One of the goals of the D&I team is to create content to spread awareness about diversity in Fedora. + VIDEO CONTENT + Meet the Fedorans + The Fedora Project community spans all four corners of the world. The D&I team made a video introducing some Fedora community members from across the world! + + What happens in Budapest + During Flock Budapest 2019, the D&I team recorded members from the community and created a short video showing Fedora's diversity. The video was produced in less than 6 hours! + The D&I team organized a work-shop at Flock 2018 to address Unconscious Bias and Imposter Syndrome. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc index fced380..899d69a 100644 --- a/modules/ROOT/pages/index.adoc +++ b/modules/ROOT/pages/index.adoc @@ -1,6 +1,7 @@ include::{partialsdir}/attributes.adoc[] = Diversity and inclusion in Fedora +:toc: The Fedora Project welcomes and encourages participation by everyone. Our community is based on mutual respect, tolerance, and encouragement, and we work to help each other live up to these principles. @@ -9,6 +10,8 @@ The Fedora Diversity and Inclusion team (Fedora D&I team) is committed to foster You can watch our recent video showcasing the Fedora community https://www.youtube.com/watch?v=O1eHRoEps6I[here]. +image::infographic-2020.png[Infographic with statistics about Fedora Women's Day since 2016. Created by Smera Goel.] + [[goals]] == Goals From aa5a1fdf4e1fec2571aea8228903b42a736bd439 Mon Sep 17 00:00:00 2001 From: Ramya Parimi Date: Nov 14 2020 03:28:46 +0000 Subject: [PATCH 16/22] restructured landing page --- diff --git a/antora.yml b/antora.yml index 78e1c18..3af5b83 100644 --- a/antora.yml +++ b/antora.yml @@ -15,3 +15,4 @@ start_page: ROOT:index nav: - modules/ROOT/nav.adoc - modules/events/nav.adoc +- modules/outreachy/nav.adoc diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc index 899d69a..9efb23d 100644 --- a/modules/ROOT/pages/index.adoc +++ b/modules/ROOT/pages/index.adoc @@ -3,76 +3,84 @@ include::{partialsdir}/attributes.adoc[] = Diversity and inclusion in Fedora :toc: -The Fedora Project welcomes and encourages participation by everyone. -Our community is based on mutual respect, tolerance, and encouragement, and we work to help each other live up to these principles. -Please, refer to our xref:project:ROOT:code-of-conduct.adoc[Code of Conduct] for more information. -The Fedora Diversity and Inclusion team (Fedora D&I team) is committed to fostering diversity and inclusion in the Fedora community. +The goal of our team is to encourage diversity and inclusion in the Fedora community. +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. -You can watch our recent video showcasing the Fedora community https://www.youtube.com/watch?v=O1eHRoEps6I[here]. +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! image::infographic-2020.png[Infographic with statistics about Fedora Women's Day since 2016. Created by Smera Goel.] - [[goals]] == Goals -The goal of this initiative is to help foster diversity and inclusion in the Fedora community. -The Fedora D&I team works towards this goal by focusing on efforts including (but not limited to): - -* Creating content and organizing events to spread awareness about diversity within Fedora and outside the Fedora community. -* Supporting community building and engagement activities to foster inclusion. -* Coordinating with Fedora SIGs and subprojects to futher foster diversity and inclusion in the community. -* Supporting programs committed to building diversity and inclusion in Free and Open Source Software communities. +The Fedora D&I team strives to enhance diversity and inclusion by focusing on some of the efforts mentioned below: -https://fedoraprojectpodcast.simplecast.com/episodes/fedora-diversity-inclusion-team[Fedora Podcast] gives further insight into the purpose, objective and working process of the team in a huge community project. -The podcast has interesting conversations between the members of D&I team and Eduard Lucena (@x3mboy). +* Organize events to bring awareness about diversity both within and outside the Fedora community. +* Cultivate inclusion by organizing community building and engagement activities. +* Enrich diversity and inclusion within Fedora by co-ordinating with other Fedora SIGs and sub-projects. +* Support events and programs that promote diversity and inclusion in Free and Open Source Software communities +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 -We are tracking our ongoing work and action items https://pagure.io/fedora-diversity/issues[here] in Pagure. +We track our https://pagure.io/fedora-diversity/issues[ongoing work and action items] in Pagure. [[fedora-women]] === Fedora Women -Fedora Women aims to foster involvement of women (cis and trans) and genderqueer people in Fedora and Free and Open Source Software. +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 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. [[events]] === Events -Fedora Diversity and Inclusion team organizes and supports a variety of xref:events:index.adoc[events] with the 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. -If you are interested in working with us to organize events in your local community, send us an email. We are always looking for new collaborators. +xref:events:index.adoc[Events] organized by the Fedora D&I team focus to: + +* Celebrate the contributions of women, LGBT+, BIPOC, and people with disabilities and +* Engage, empower and encourage diverse folks in the open source communities. + +If you are interested in organizing such event at your locality, please send us an email. We are always looking for new collaborators. +In addition, please checkout the xref:events:fwd-resource-pack[Event Resource Pack] for more information. +[[demographic-survey]] +== Demographic Survery -[[meetings]] -== Meetings +The xref:demographic-survery.adoc[Demographic Survery] was launched to understand demographics of the Fedora Community. -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] +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. +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? -[[get-in-touch]] -== Get in touch with us +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. -Are you an individual contributor who wants to help us shape diversity and inclusion in the Fedora community? -Are you a part of a local hackerspace, LUG or STEM community? -Are you involved in open source project beyond Fedora? -Did you say YES to any one of these? -Diversity efforts require that we work with all parts of Fedora. -We feel that everyone can bring in valuable inputs to this conversation. -We have diverse and flexible contribution opportunities available for everyone. +If you are interested in working with us, please checkout xref:get-involved.adoc[how to get involved with us] to start your journey with our team! -* If you'd like to help out, please introduce yourself on our {MAILINGLIST}[Diversity & Inclusion mailing list]. +[[meeting-guide]] +=== Meeting Guide -* You can join the conversation via IRC #fedora-diversity on Freenode. - We also have a Telegram bridge to IRC https://t.me/fedoradiversity[here]. +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. -* We are especially looking for other open source projects and local communities to share resources and collaborate together. - Please get in touch via the above mentioned ways or open a new ticket https://pagure.io/fedora-diversity/issues[here]. +[[Policy]] +== Policy -* Feel like you don't have much time to contribute? - Subscribe to our {MAILINGLIST}[Diversity & Inclusion mailing list] to receive updates about our work. +We follow lazy approval method! +Checkout xref:decision-process.adoc[policy page] to know more about our decision making process. \ No newline at end of file diff --git a/modules/events/nav.adoc b/modules/events/nav.adoc index bc981a8..d203174 100644 --- a/modules/events/nav.adoc +++ b/modules/events/nav.adoc @@ -1,3 +1,10 @@ * xref:index.adoc[D&I Events] -** xref:about-fwd.adoc[Fedora Women's Day] -*** xref:fwd-resource-pack.adoc[Resource pack] +** xref:flock-social-events.adoc[Flock Social Events] +** Fedora Women's Day +*** xref:fwd/about-fwd.adoc[About] +*** xref:fwd/history.adoc[History] +*** xref:fwd/organize.adoc[How to organize] +*** xref:fwd/participate.adoc[How to participate] +** xref:past-events.adoc[Past Events] +** xref:fwd-resource-pack.adoc[Resource pack] + diff --git a/modules/events/pages/about-fwd.adoc b/modules/events/pages/about-fwd.adoc deleted file mode 100644 index f06d12e..0000000 --- a/modules/events/pages/about-fwd.adoc +++ /dev/null @@ -1,13 +0,0 @@ -include::ROOT:partial$attributes.adoc[] - -= About Fedora Women's Day - -Fedora Women's Day highlights and celebrates the women/non-binary contributers in open source communities like Fedora and beyond. -Fedora Women's Day marks the anniversary of the {FWIKI}/Women[Fedora Women] team and is headed by Fedora's Diversity and Inclusion Team. - -Across September, we encourage more women contributors across Fedora to connect and network with one another. -Fedora Women's Day highlights and celebrates the women of open source communities like Fedora and their contributions to their projects and community. -They are also an opportunity for women to learn about free and open source software and jump-start their journey as a user of FOSS and/or become a contributor. -They also provide a platform for women to connect, learn, and be inspired by other women in open source communities and beyond. - -image:ROOT:fwd/infographic-template.png[Infographic about the Fedora Women's Day event. Created by Smera Goel.] diff --git a/modules/events/pages/flock-social-events.adoc b/modules/events/pages/flock-social-events.adoc new file mode 100644 index 0000000..40d91f7 --- /dev/null +++ b/modules/events/pages/flock-social-events.adoc @@ -0,0 +1,7 @@ +[INFO] +==== +This page is still a placeholder. +It is not yet written! + +If you want to help write it, review the https://pagure.io/fedora-diversity/issues[Fedora D&I Pagure issue tracker] to see where you can get involved. +==== \ No newline at end of file diff --git a/modules/events/pages/fwd-resource-pack.adoc b/modules/events/pages/fwd-resource-pack.adoc index f961c34..8e712fc 100644 --- a/modules/events/pages/fwd-resource-pack.adoc +++ b/modules/events/pages/fwd-resource-pack.adoc @@ -20,7 +20,7 @@ Need help with creating the welcome ticket? Reach out to Fedora Join SIG at any At your event, start with an introduction to the Fedora Diversity and Inclusion Team. Explain the role of D&I team in the Fedora community and its upcoming goals. -Share our xref:diversity-inclusion::team.adoc[team's introduction page] with anyone who is interested in learing more. +Share our xref:ROOT:index.adoc[team's introduction page] with anyone who is interested in learing more. What is the role of Fedora Diversity and Inclusion Team?:: As the name indicates, the main goal of the D&I team is to foster diversity and inclusion in Fedora community. diff --git a/modules/events/pages/fwd/about-fwd.adoc b/modules/events/pages/fwd/about-fwd.adoc new file mode 100644 index 0000000..f06d12e --- /dev/null +++ b/modules/events/pages/fwd/about-fwd.adoc @@ -0,0 +1,13 @@ +include::ROOT:partial$attributes.adoc[] + += About Fedora Women's Day + +Fedora Women's Day highlights and celebrates the women/non-binary contributers in open source communities like Fedora and beyond. +Fedora Women's Day marks the anniversary of the {FWIKI}/Women[Fedora Women] team and is headed by Fedora's Diversity and Inclusion Team. + +Across September, we encourage more women contributors across Fedora to connect and network with one another. +Fedora Women's Day highlights and celebrates the women of open source communities like Fedora and their contributions to their projects and community. +They are also an opportunity for women to learn about free and open source software and jump-start their journey as a user of FOSS and/or become a contributor. +They also provide a platform for women to connect, learn, and be inspired by other women in open source communities and beyond. + +image:ROOT:fwd/infographic-template.png[Infographic about the Fedora Women's Day event. Created by Smera Goel.] diff --git a/modules/events/pages/fwd/history.adoc b/modules/events/pages/fwd/history.adoc new file mode 100644 index 0000000..40d91f7 --- /dev/null +++ b/modules/events/pages/fwd/history.adoc @@ -0,0 +1,7 @@ +[INFO] +==== +This page is still a placeholder. +It is not yet written! + +If you want to help write it, review the https://pagure.io/fedora-diversity/issues[Fedora D&I Pagure issue tracker] to see where you can get involved. +==== \ No newline at end of file diff --git a/modules/events/pages/fwd/organize.adoc b/modules/events/pages/fwd/organize.adoc new file mode 100644 index 0000000..40d91f7 --- /dev/null +++ b/modules/events/pages/fwd/organize.adoc @@ -0,0 +1,7 @@ +[INFO] +==== +This page is still a placeholder. +It is not yet written! + +If you want to help write it, review the https://pagure.io/fedora-diversity/issues[Fedora D&I Pagure issue tracker] to see where you can get involved. +==== \ No newline at end of file diff --git a/modules/events/pages/fwd/participate.adoc b/modules/events/pages/fwd/participate.adoc new file mode 100644 index 0000000..40d91f7 --- /dev/null +++ b/modules/events/pages/fwd/participate.adoc @@ -0,0 +1,7 @@ +[INFO] +==== +This page is still a placeholder. +It is not yet written! + +If you want to help write it, review the https://pagure.io/fedora-diversity/issues[Fedora D&I Pagure issue tracker] to see where you can get involved. +==== \ No newline at end of file diff --git a/modules/events/pages/past-events.adoc b/modules/events/pages/past-events.adoc new file mode 100644 index 0000000..40d91f7 --- /dev/null +++ b/modules/events/pages/past-events.adoc @@ -0,0 +1,7 @@ +[INFO] +==== +This page is still a placeholder. +It is not yet written! + +If you want to help write it, review the https://pagure.io/fedora-diversity/issues[Fedora D&I Pagure issue tracker] to see where you can get involved. +==== \ No newline at end of file diff --git a/modules/outreachy/nav.adoc b/modules/outreachy/nav.adoc new file mode 100644 index 0000000..0066cdc --- /dev/null +++ b/modules/outreachy/nav.adoc @@ -0,0 +1 @@ +* xref:about.adoc[Outreachy] \ No newline at end of file diff --git a/modules/outreachy/pages/about.adoc b/modules/outreachy/pages/about.adoc new file mode 100644 index 0000000..40d91f7 --- /dev/null +++ b/modules/outreachy/pages/about.adoc @@ -0,0 +1,7 @@ +[INFO] +==== +This page is still a placeholder. +It is not yet written! + +If you want to help write it, review the https://pagure.io/fedora-diversity/issues[Fedora D&I Pagure issue tracker] to see where you can get involved. +==== \ No newline at end of file From 2e7638959a437a4975b30d20eb06637af940e9b0 Mon Sep 17 00:00:00 2001 From: Justin W. Flory (he/him) Date: Nov 14 2020 03:28:46 +0000 Subject: [PATCH 17/22] survey: Initial commit of new module (closes #169) This commit makes the following changes: * Creates a new Antora module (`survey`) to better organize the research, work, and questions from the Fedora Project Demographic Survey * Removes "Demographic survey" page from ROOT module, removes from ROOT module `nav.adoc` * Adds `survey` module `nav.adoc` into the main Antora site configuration Closes #169. Signed-off-by: Justin W. Flory (he/him) squash! survey: Initial commit of new module (closes #169) Fix table of contents Signed-off-by: Justin W. Flory (he/him) --- diff --git a/antora.yml b/antora.yml index 3af5b83..4b08f76 100644 --- a/antora.yml +++ b/antora.yml @@ -2,17 +2,18 @@ # Tip: If you want to use the local preview scripts that come with this repository, please change this value in the site.yml file as well. (under site/start_page) name: diversity-inclusion -# Title will be visible on the page. +# Title will be visible on the page. title: Diversity and Inclusion # If you don't plan to have multiple versions of the docs (for example, to document multiple versions of some software), you can ignore this field. Otherwise, change "master" to a specific version. version: master -# We encourage you to name the index page as "index.adoc". If you absolutely have to use a different name, please reflect it here. You can ignore this field otherwise. +# We encourage you to name the index page as "index.adoc". If you absolutely have to use a different name, please reflect it here. You can ignore this field otherwise. start_page: ROOT:index # This lists all the menu definitions of your component. nav: - modules/ROOT/nav.adoc +- modules/survey/nav.adoc - modules/events/nav.adoc - modules/outreachy/nav.adoc diff --git a/modules/ROOT/nav.adoc b/modules/ROOT/nav.adoc index 2614ad6..99a73a8 100644 --- a/modules/ROOT/nav.adoc +++ b/modules/ROOT/nav.adoc @@ -1,4 +1,3 @@ -* xref:demographic-survey.adoc[Demographic survey] * xref:get-involved.adoc[Get involved] * xref:meetings.adoc[D&I Meeting Guide] * Policy diff --git a/modules/ROOT/pages/demographic-survey.adoc b/modules/ROOT/pages/demographic-survey.adoc deleted file mode 100644 index 61b56f4..0000000 --- a/modules/ROOT/pages/demographic-survey.adoc +++ /dev/null @@ -1,257 +0,0 @@ -include::{partialsdir}/attributes.adoc[] - -= Demographic survey research - -This wiki page contains the draft of questions used for a Fedora contributor / demographic survey. -Most of these questions were extensively discussed and revised during the https://fedoraproject.org/wiki/FAD_Diversity_2017[FAD Diversity 2017]. -More details about this can be found in Pagure ticket discussions and in Etherpads. -The questions in this wiki page are not finalized unless otherwise stated. - - -[[objectives]] -== Objectives - -The primary objectives we identified for the demographic survey were… - -1. Gather baseline demographics about the contributor community -* Why is this objective important? -** Better allows us to focus on groups who are underrepresented and try to improve the user experience for new contributors in the community -* Examples of target criteria: -** Numbers for underrepresented groups (race / gender / sexuality / etc.) -** Age of contributors -** Gender -** Race/Cultural background -** Location -** Disability -** Family / kids / Motherhood ? -** Non-English speaking community -2. Determine contributor knowledge about project components that ease contribution -* Join SIG -* Mentoring Programs -* Onboarding programs -* Classrooms? -* Code of conduct / diversity and inclusion team - -[[other-comments-and-thoughts]] -=== Other comments and thoughts - -Other questions, comments, and ideas from our raw notes… - -* @bee2502's musings - some questions -** How were you introduced to Fedora? -1. By another Fedora contributor -2. At a Fedora event (e.g. FAD / workshop / meetup / release party) -3. Conference -4. Hackerspace -5. Red Hat -6. Web / online -** What makes it difficult contributing to Fedora for you? - -We also wanted to identify how the data will be used and clearly communicate how the data will be used (ideally, this outline or information being available for participants in the survey to review). - - -[[relevant-resources]] -== Relevant resources - -* *FLOSS Survey 2013* -** https://floss2013.larjona.net/[Questions and results] -** http://flosshub.org/content/women-freelibreopen-source-software-situation-2010s[Women in Free/Libre/Open Source Software: The Situation in the 2010s] paper with results analysis - note how they don't conclude that they have authoritative statistics on diversity of the FLOSS community, but instead focus on comparative analysis of different groups of respondents - -* *Apache Software Foundation Committer Diversity Survey* -** http://mail-archives.apache.org/mod_mbox/www-announce/201611.mbox/%3Cpony-31e1cbf2b23a01ea035ee3323fe2ab95950c8284-dc1f345f30800e5cbef086a8801c55be77bc49c3%40announce.apache.org%3E[Announcement e-mail] -** https://cwiki.apache.org/confluence/display/COMDEV/ASF+Committer+Diversity+Survey+-+2016[Results] - - -[[survey-questions]] -== Survey questions - -Below are the "ver. 1.0" version of the survey questions. -Our last plan for these was to submit them to Fedora Legal for feedback, which I believe @bex and @marinaz were going to work on. These questions will also be updated in the {FWIKI}/Diversity/Survey[Survey wiki page]. - -[[fedora-and-free-and-open-source-software-usage-and-contributions]] -=== Fedora and free and open source software usage and contributions - -* *How long have you been a Fedora user?* -** I have never used Fedora -** Less than 1 year -** 1 to 3 years -** 3 to 6 years -** 6 to 10 years -** Over 10 years -** Prefer not to say -* *How long have you been a Fedora contributor?* -** I have never contributed to Fedora -** Less than 1 year -** 1 to 3 years -** 3 to 6 years -** 6 to 10 years -** Over 10 years -** Prefer not to say -* *Please select types of contributions that you make to Fedora:* -** Community (community leadership, new contributor outreach and onboarding, diversity and inclusion work, marketing, event organization) -** Technical (packaging, programming, infrastructure, operations, release engineering, testing / QA, language-specific SIGs) -** Other non-technical (design, documentation, localization, translation) -** Prefer not to say -** Other (please specify) -* *Do you contribute to Fedora as a volunteer or as an employee of a company? [select all that apply]* -** Volunteer (student) -** Volunteer (unemployed) -** Volunteer (retired) -** Volunteer (outside regular job) -** Employee (work-related contributions) -** Prefer not to say -** Other (please specify) -* *On average, how many hours a week did you spend on Fedora contributions in the last three months?* -** 0, I have not contributed in the last three months -** Less than 2 -** 2 - 5 -** 6 - 10 -** 11 - 20 -** 21 - 40 -** More than 40 -** Prefer not to say -* *What are the top reasons you contribute to Fedora? Please check a maximum of 4 answers.* -** To participate in a global cooperative project -** To participate in a free and open source software project -** To improve a free and open source software project -** Because I think that software should not be proprietary -** To solve a problem that could not be done by proprietary software -** To get help in realizing a good idea for a software project -** To learn and develop new skills -** To share my knowledge and skills -** To improve my job opportunities -** To get a reputation in the free and open source software scene -** To meet other people in the free and open source software community -** Because I enjoy working with other people in the community -** To get funding to travel internationally -** To earn a living -** Prefer not to say -** Other (please specify) -* *Think of the time you made your first contribution to Fedora that was incorporated. What best describes your experience?* -** My co-worker, who was paid to work on Fedora, helped me prepare the contribution -** A person I already knew socially helped me prepare the contribution -** A person I did not know before helped me prepare the contribution at an in-person event -** A person I did not know before helped me prepare the contribution via electronic communications -** A mentor for a third-party program (e.g. Google Summer of Code, Outreachy, etc.) helped me prepare the contribution via electornic communications -** A mentor identified by the Fedora Project helped me prepare the contribution via electronic communications -** A person whom I identified as a mentor helped me prepare the contribution via electronic communications -** I submitted my contribution electronically for review and it was reviewed by my co-worker, who was paid to work on Fedora -** I submitted my contribution electronically for review and it was reviewed by someone I already knew socially -** I submitted my contribution electronically for review and it was reviewed by someone I didn’t know before -** Prefer not to say -** Other (please specify) -* *Do you routinely use software that is not free and open source on Fedora?* -** Yes, but only web-based applications like Google Docs -** Yes, but only locally installed applications (including hardware drivers) -** Yes, both web-based and locally installed applications -** No -** Prefer not to say -** Other (please specify) - -[[demographics]] -=== Demographics - -* *What is your gender?* -** Male -** Female -** Non-binary -** Prefer not to say -** Other (please specify) -* *Do you identify as lesbian, gay, bisexual, transgender or queer?* -** Yes -** No -** Prefer not to say -* *What is your age range?* -** 17 or younger -** 18 to 24 -** 25 to 34 -** 35 to 44 -** 45 to 54 -** 55 to 64 -** 65 to 74 -** Over 75 -** Prefer not to say -* *Do you have any disability, including, but not limited to any of the ones listed https://www.dol.gov/ofccp/regs/compliance/sec503/Self_ID_Forms/VoluntarySelf-ID_CC-305_ENG_JRF_QA_508c.pdf[here]?* -** Yes -** No -** Prefer not to say -* *Do you have a partner?* -** No, I am a single -** Yes, although we do not live together -** Yes, I live together with my partner -** Yes, I am married -** Yes, I am married, but we do not live together -** Prefer not to say -** Other (please specify) -* *How old is your youngest child?* -** I don’t have children -** Less than 2 years old -** Between 2 years and 5 years old -** Between 6 years and 10 years old -** Between 11 years and 17 years old -** 18 years or older -** Prefer not to say -* *What region of the world do you reside in?* -** Asia and Pacific Countries (APAC) -** Europe and the Middle East (EMEA) -** Latin and South America (LATAM) -** North America (NA) -** Prefer not to say -* *What is your country of residence? [FAS Country List - Divided by Region]* -* *What is the highest level of education you have completed?* -** Less than secondary (High) school -** Secondary (High) school graduate or equivalent -** Vocational / trade program or apprenticeship -** Some college (working towards a first level university degree) -** Some college (not pursuing a degree anymore) -** Associate degree -** Bachelor’s degree -** Master’s degree -** Doctorate (Ph.D.) or other advanced degree (e..g M.D., J.D.) -** Prefer not to say -** Other (please specify) -* *If you are employed, what organization do you work for?* -** I am not employed -** Employed (please specify organization name) -** Employed, but prefer not to specify the organization -** Prefer not to say -* *If you are employed, what do you work on? [select all that apply]* -** I am not employed -** Software development -** System administration -** Testing / QA / QE -** Technical writing -** UX/UI design -** Marketing /communications -** Community and event management -** Prefer not to say -** Other (please specify) - -[[perception-of-experience-with-and-attitudes-towards-diversity-and-inclusion]] -=== Perception of, experience with, and attitudes towards diversity and inclusion - -_Should we use headers / categories for questions, we will want something easier to read for a "production" version of this section._ - -The following questions can be presented as a table, with the same set of answer options. -Questions about diverse perspectives, comfort with contributing ideas, valuing best ideas, and feeling respected were adapted from Red Hat Associate Survey. - -* *Please indicate how you feel about the following statements.* -** Diverse perspectives are valued in the Fedora community. -** I feel comfortable contributing my ideas (in meetings or online forums), even when my views differ from other contributors. -** The people I collaborate with value the best ideas regardless of their source. -** I feel respected when I share my ideas and opinions in the Fedora community. -** Having greater diversity of contributors will positively impact the Fedora Project. -** I’m appreciated for the contributions I make. -* *Information about Fedora processes, policies or guidelines is easy to find.* -** Strongly agree -** Agree -** Slightly agree -** Neither agree nor disagree -** Slightly disagree -** Disagree -** Strongly disagree - -Please do not put any identifying information about yourself or others in either text box. - -* *Is there anything you believe would improve the inclusivity of the Fedora community?* -* *Do you have any feedback on this survey and are there any additional questions you believe it should have asked?* diff --git a/modules/events/pages/fwd-resource-pack.adoc b/modules/events/pages/fwd-resource-pack.adoc index 8e712fc..34b1974 100644 --- a/modules/events/pages/fwd-resource-pack.adoc +++ b/modules/events/pages/fwd-resource-pack.adoc @@ -8,7 +8,7 @@ In this page you can find a resource pack that helps in organizing a successful * A summary about Fedora D&I team * Overview of different Fedora editions * Fedora and Python - + == How to welcome new contributors to Fedora? Did you come across folks who are interested in contributing to the Fedora project? Then please create link:https://pagure.io/fedora-join/Welcome-to-Fedora/issues[Welcome to Fedora ticket] for the newcomers with Fedora Join SIG. This ticket helps them to easily track their progress in the journey to becoming Fedora contributors. @@ -32,10 +32,10 @@ Below are some of the many efforts focused by D&I team to achieve its goal: What the D&I team works on?:: The D&I team works on various tasks to support diversity and inclusion in the Fedora Project. -For example, new additions were made to the 2018 https://flocktofedora.org/[Fedora Flock conference] such as including gender-neutral bathrooms, a quiet room, and communication preference stickers. -These additions in turn supported our existing effort to draft https://pagure.io/fedora-diversity/issue/54[event inclusion guidelines] for Fedora event organizers. +For example, new additions were made to the 2018 https://flocktofedora.org/[Fedora Flock conference] such as including gender-neutral bathrooms, a quiet room, and communication preference stickers. +These additions in turn supported our existing effort to draft https://pagure.io/fedora-diversity/issue/54[event inclusion guidelines] for Fedora event organizers. These guidelines when shared within and outside Fedora community provide best practices to organizers holding an event. -In addition, we also hope to launch a https://pagure.io/fedora-diversity/issue/62[demographic survey] of the Fedora community in soon. +In the past, we also worked on a xref:survey:index.adoc[Fedora Project Demographic Survey] to understand who is in the Fedora Community. == Fedora Editions diff --git a/modules/survey/nav.adoc b/modules/survey/nav.adoc new file mode 100644 index 0000000..7f979aa --- /dev/null +++ b/modules/survey/nav.adoc @@ -0,0 +1,4 @@ +* Demographic Survey +** xref:index.adoc[About] +** xref:questions.adoc[Questions] +** xref:resources.adoc[Resources] diff --git a/modules/survey/pages/index.adoc b/modules/survey/pages/index.adoc new file mode 100644 index 0000000..d2adebb --- /dev/null +++ b/modules/survey/pages/index.adoc @@ -0,0 +1,67 @@ +include::ROOT:partial$attributes.adoc[] + += About Fedora Project Demographic Survey +Fedora Diversity & Inclusion Team +:toc: + +This section documents the Fedora Project Demographic Survey research. +This was work completed between 2016 to 2018 to launch a demographic survey to understand the Fedora Community. +Because of legal concerns around recent data legislation passed in this time period (https://en.wikipedia.org/wiki/General_Data_Protection_Regulation[G.D.P.R.]), the survey was planned but never published. + +A majority of this work was completed at the https://communityblog.fedoraproject.org/fedora-diversity-fad-2017/[Fedora Diversity FAD] in January 2017. + + +[[objectives]] +== Objectives + +The Fedora Project Demographic Survey established these key objectives for launching such a survey: + +[[understand]] +=== 1. Understand baseline demographics about the Fedora Community. + +* *Why this objective was important*: + Enables Fedora Diversity and Inclusion Team to identify different areas of need for contributing to Fedora, and prioritize to act on areas of most-immediate need. +* *Examples of target criteria*: +** Age +** Gender +** Race and cultural background +** Geographic area or region +** Disability +** Parents and families +** Non-English languages + +[[support]] +=== 2. Support underrepresented groups by supplementing on-boarding resources to other Fedora teams. + +* *Why this objective was important*: +** Collaborate and support on-going work in other Fedora Teams by advising mentorship and teaching programs in Fedora Community +** Disseminate best practices through mentorship and community on-boarding +* *Examples of possible partnering teams*: +** xref:fedora-join::index.adoc[Join SIG] +** Mentoring and internship programs + (GSoC and Outreachy) +** xref:fedora-join::classroom/classroom.adoc[Fedora Classrooms] + + +[[misc-comments]] +== Miscellaneous comments + +When the survey was first drafted in late 2016 and early 2017, several comments, ideas, and xref::resources.adoc[resources] influenced the design of the survey and an outreach campaign for it. +Some of the pending and unresolved notes are below for archival purposes. + +[quote,Bee Padalkar (bee2502)] +____ +* How were you introduced to Fedora? +.. By another Fedora contributor +.. At a Fedora event + (e.g. FAD / workshop / meetup / release party) +.. Conference +.. Hackerspace +.. Red Hat +.. Web / online +* What makes contributing to Fedora difficult for you? +____ + +We also wanted to identify how the data will be used. +We aimed to make a communication plan for how the data would be used. +Ideally, information about data use and intentions is available and embedded in the survey. diff --git a/modules/survey/pages/questions.adoc b/modules/survey/pages/questions.adoc new file mode 100644 index 0000000..a6ba47d --- /dev/null +++ b/modules/survey/pages/questions.adoc @@ -0,0 +1,255 @@ +include::ROOT:partial$attributes.adoc[] + += Demographic Survey Questions +Fedora Diversity & Inclusion Team +v1.0.0 +:toc: + +This page includes the officially-approved list of questions for the Fedora Project Demographic Survey. +It contains 23 questions. +See the xref:index.adoc[About] and xref:resources.adoc[Resources & references] pages for additional context behind these questions. + + +[[fedora-foss]] +== Fedora and Free and Open Source software usage and contributions + +. *How long have you been a Fedora user?* +** I have never used Fedora +** Less than 1 year +** 1 to 3 years +** 3 to 6 years +** 6 to 10 years +** Over 10 years +** Prefer not to say + +. *How long have you been a Fedora contributor?* +** I have never contributed to Fedora +** Less than 1 year +** 1 to 3 years +** 3 to 6 years +** 6 to 10 years +** Over 10 years +** Prefer not to say + +. *Please select types of contributions that you make to Fedora:* +** Community + (community leadership, new contributor outreach and onboarding, diversity and inclusion work, marketing, event organization) +** Technical + (packaging, programming, infrastructure, operations, release engineering, testing / QA, language-specific SIGs) +** Other non-technical + (design, documentation, localization, translation) +** Prefer not to say +** Other + (please specify) + +. *Do you contribute to Fedora as a volunteer or as an employee of a company?* + [select all that apply] +** Volunteer + (student) +** Volunteer + (unemployed) +** Volunteer + (retired) +** Volunteer + (outside regular job) +** Employee + (work-related contributions) +** Prefer not to say +** Other + (please specify) + +. *On average, how many hours a week did you spend on Fedora contributions in the last three months?* +** 0, I have not contributed in the last three months +** Less than 2 +** 2 - 5 +** 6 - 10 +** 11 - 20 +** 21 - 40 +** More than 40 +** Prefer not to say + +. *What are the top reasons you contribute to Fedora?* + Please check a maximum of 4 answers. +** To participate in a global cooperative project +** To participate in a free and open source software project +** To improve a free and open source software project +** Because I think that software should not be proprietary +** To solve a problem that could not be done by proprietary software +** To get help in realizing a good idea for a software project +** To learn and develop new skills +** To share my knowledge and skills +** To improve my job opportunities +** To get a reputation in the free and open source software scene +** To meet other people in the free and open source software community +** Because I enjoy working with other people in the community +** To get funding to travel internationally +** To earn a living +** Prefer not to say +** Other + (please specify) + +. *Think of the time you made your first contribution to Fedora that was incorporated. What best describes your experience?* +** My co-worker, who was paid to work on Fedora, helped me prepare the contribution +** A person I already knew socially helped me prepare the contribution +** A person I did not know before helped me prepare the contribution at an in-person event +** A person I did not know before helped me prepare the contribution via electronic communications +** A mentor for a third-party program (e.g. Google Summer of Code, Outreachy, etc.) helped me prepare the contribution via electornic communications +** A mentor identified by the Fedora Project helped me prepare the contribution via electronic communications +** A person whom I identified as a mentor helped me prepare the contribution via electronic communications +** I submitted my contribution electronically for review and it was reviewed by my co-worker, who was paid to work on Fedora +** I submitted my contribution electronically for review and it was reviewed by someone I already knew socially +** I submitted my contribution electronically for review and it was reviewed by someone I didn’t know before +** Prefer not to say +** Other + (please specify) + +. *Do you routinely use software that is not free and open source on Fedora?* +** Yes, but only web-based applications like Google Docs +** Yes, but only locally installed applications (including hardware drivers) +** Yes, both web-based and locally installed applications +** No +** Prefer not to say +** Other + (please specify) + + +[[demographics]] +== Demographics + +. *What is your gender?* +** Male +** Female +** Non-binary +** Prefer not to say +** Other + (please specify) + +. *Do you identify as lesbian, gay, bisexual, transgender or queer?* +** Yes +** No +** Prefer not to say + +. *What is your age range?* +** 17 or younger +** 18 to 24 +** 25 to 34 +** 35 to 44 +** 45 to 54 +** 55 to 64 +** 65 to 74 +** Over 75 +** Prefer not to say + +. *Do you have any disability, including, but not limited to any of the ones listed https://www.dol.gov/ofccp/regs/compliance/sec503/Self_ID_Forms/VoluntarySelf-ID_CC-305_ENG_JRF_QA_508c.pdf[here]?* +** Yes +** No +** Prefer not to say + +. *Do you have a partner?* +** No, I am a single +** Yes, although we do not live together +** Yes, I live together with my partner +** Yes, I am married +** Yes, I am married, but we do not live together +** Prefer not to say +** Other + (please specify) + +. *How old is your youngest child?* +** I don’t have children +** Less than 2 years old +** Between 2 years and 5 years old +** Between 6 years and 10 years old +** Between 11 years and 17 years old +** 18 years or older +** Prefer not to say + +. *What region of the world do you reside in?* +** Asia and Pacific Countries + (APAC) +** Europe and the Middle East + (EMEA) +** Latin and South America + (LATAM) +** North America + (NA) +** Prefer not to say + +. *What is your country of residence?* + [FAS Country List - Divided by Region] + +. *What is the highest level of education you have completed?* +** Less than secondary (High) school +** Secondary (High) school graduate or equivalent +** Vocational / trade program or apprenticeship +** Some college + (working towards a first level university degree) +** Some college + (not pursuing a degree anymore) +** Associate degree +** Bachelor’s degree +** Master’s degree +** Doctorate (Ph.D.) or other advanced degree + (e.g. M.D., J.D.) +** Prefer not to say +** Other + (please specify) + +. *If you are employed, what organization do you work for?* +** I am not employed +** Employed + (please specify organization name) +** Employed, but prefer not to specify the organization +** Prefer not to say + +. *If you are employed, what do you work on?* + [select all that apply] +** I am not employed +** Software development +** System administration +** Testing / QA / QE +** Technical writing +** UX/UI design +** Marketing /communications +** Community and event management +** Prefer not to say +** Other + (please specify) + + +[[perception]] +== Perception of, experience with, and attitudes towards diversity and inclusion + +[NOTE] +==== +This section title may need revisions for simplicity. +==== + +The following questions can be presented as a table, with the same set of answer options. +Questions about diverse perspectives, comfort with contributing ideas, valuing best ideas, and feeling respected were adapted from Red Hat Associate Survey. + +. *Please indicate how you feel about the following statements.* +** Diverse perspectives are valued in the Fedora community. +** I feel comfortable contributing my ideas (in meetings or online forums), even when my views differ from other contributors. +** The people I collaborate with value the best ideas regardless of their source. +** I feel respected when I share my ideas and opinions in the Fedora community. +** Having greater diversity of contributors will positively impact the Fedora Project. +** I’m appreciated for the contributions I make. + +. *Information about Fedora processes, policies or guidelines is easy to find.* +** Strongly agree +** Agree +** Slightly agree +** Neither agree nor disagree +** Slightly disagree +** Disagree +** Strongly disagree + +[NOTE] +==== +For the final two questions, do not add personally-identifying information about yourself or others in either text box. +==== + +. *Is there anything you believe would improve the inclusivity of the Fedora community?* + +. *Do you have any feedback on this survey and are there any additional questions you believe it should have asked?* diff --git a/modules/survey/pages/resources.adoc b/modules/survey/pages/resources.adoc new file mode 100644 index 0000000..7254320 --- /dev/null +++ b/modules/survey/pages/resources.adoc @@ -0,0 +1,18 @@ +include::ROOT:partial$attributes.adoc[] + += Resources & references + +Several other existing surveys, Open Source research studies, and other writing influenced the creation, design, and execution of this survey: + +[NOTE] +==== +FLOSS Survey 2013 focuses on a comparative analysis of different groups of respondents instead of asserting authoritative statistics abour diversity in the Open Source community. +==== + +FLOSS Survey 2013:: +* https://floss2013.larjona.net/[Questions and results] +* http://flosshub.org/content/women-freelibreopen-source-software-situation-2010s[Women in Free/Libre/Open Source Software: The Situation in the 2010s] paper with results analysis + +Apache Software Foundation Committer Diversity Survey:: +* http://mail-archives.apache.org/mod_mbox/www-announce/201611.mbox/%3Cpony-31e1cbf2b23a01ea035ee3323fe2ab95950c8284-dc1f345f30800e5cbef086a8801c55be77bc49c3%40announce.apache.org%3E[Announcement e-mail] +* https://cwiki.apache.org/confluence/display/COMDEV/ASF+Committer+Diversity+Survey+-+2016[Results] From 5f1354b142e3e28fbffe078b3399303475686b9b Mon Sep 17 00:00:00 2001 From: Justin W. Flory (he/him) Date: Nov 14 2020 03:28:46 +0000 Subject: [PATCH 18/22] survey: Add explicit note that survey is not actively being worked on This commit adds a clarification about the current status of the demographic survey, i.e. that it is not being maintained. This came up in the D&I Team meeting because there was confusion over whether this was a campaign/initiative we were still working towards. cc: @riecatnor @ramyaparimi @lilyx Signed-off-by: Justin W. Flory (he/him) --- diff --git a/modules/survey/pages/index.adoc b/modules/survey/pages/index.adoc index d2adebb..4aeaf89 100644 --- a/modules/survey/pages/index.adoc +++ b/modules/survey/pages/index.adoc @@ -10,6 +10,13 @@ Because of legal concerns around recent data legislation passed in this time per A majority of this work was completed at the https://communityblog.fedoraproject.org/fedora-diversity-fad-2017/[Fedora Diversity FAD] in January 2017. +[NOTE] +==== +This page represents six to eight months of work from the Fedora Diversity & Inclusion Team in late 2015 and early 2016. +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 here for historical purposes. +The team hopes our research and work may be useful for other Open Source communities and Diversity & Inclusion programmes. +==== + [[objectives]] == Objectives diff --git a/modules/survey/pages/questions.adoc b/modules/survey/pages/questions.adoc index a6ba47d..e8e8099 100644 --- a/modules/survey/pages/questions.adoc +++ b/modules/survey/pages/questions.adoc @@ -9,6 +9,13 @@ This page includes the officially-approved list of questions for the Fedora Proj It contains 23 questions. See the xref:index.adoc[About] and xref:resources.adoc[Resources & references] pages for additional context behind these questions. +[NOTE] +==== +This page represents six to eight months of work from the Fedora Diversity & Inclusion Team in late 2015 and early 2016. +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 here for historical purposes. +The team hopes our research and work may be useful for other Open Source communities and Diversity & Inclusion programmes. +==== + [[fedora-foss]] == Fedora and Free and Open Source software usage and contributions From 486af9854f9340c28a689c4713dd505ac3c3171e Mon Sep 17 00:00:00 2001 From: Ramya Parimi Date: Nov 14 2020 03:32:31 +0000 Subject: [PATCH 19/22] resolved merge conflicts --- diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc index 9efb23d..b335f62 100644 --- a/modules/ROOT/pages/index.adoc +++ b/modules/ROOT/pages/index.adoc @@ -83,4 +83,4 @@ If you are interested in attending or chairing our meetings, checkout our xref:m == Policy We follow lazy approval method! -Checkout xref:decision-process.adoc[policy page] to know more about our decision making process. \ No newline at end of file +Checkout xref:decision-process.adoc[policy page] to know more about our decision making process. From ebfe734e6bd7c491f454bfacdd756ee4220fa7fa Mon Sep 17 00:00:00 2001 From: Ramya Parimi Date: Nov 14 2020 03:38:23 +0000 Subject: [PATCH 20/22] # This is a combination of 2 commits. # This is the 1st commit message: merge conflict # The commit message #2 will be skipped: # tried to fix xref links --- diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc index b335f62..45af310 100644 --- a/modules/ROOT/pages/index.adoc +++ b/modules/ROOT/pages/index.adoc @@ -4,8 +4,12 @@ include::{partialsdir}/attributes.adoc[] :toc: The goal of our team is to encourage diversity and inclusion in the Fedora community. +<<<<<<< HEAD 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. +======= +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. +>>>>>>> 4220c9e... minor sentence changes 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! @@ -32,7 +36,11 @@ We track our https://pagure.io/fedora-diversity/issues[ongoing work and action i [[fedora-women]] === Fedora Women +<<<<<<< HEAD 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! +======= +As the https://fedoraproject.org/wiki/Women[Fedora Women] community is not active at the moment, Fedora D&I team has taken up this project to keep it up and running. +>>>>>>> 4220c9e... minor sentence changes 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. @@ -44,13 +52,17 @@ Subscribe to the https://lists.fedoraproject.org/admin/lists/women.lists.fedorap [[events]] === Events +<<<<<<< HEAD xref:events:index.adoc[Events] organized by the Fedora D&I team focus to: +======= +xref:events:index.adoc[The Events] organized by the Fedora D&I team focus to: +>>>>>>> 4220c9e... minor sentence changes * Celebrate the contributions of women, LGBT+, BIPOC, and people with disabilities and * Engage, empower and encourage diverse folks in the open source communities. If you are interested in organizing such event at your locality, please send us an email. We are always looking for new collaborators. -In addition, please checkout the xref:events:fwd-resource-pack[Event Resource Pack] for more information. +In addition, please checkout the xref:events:fwd-resource-pack.adoc[Event Resource Pack] for more information. [[demographic-survey]] == Demographic Survery @@ -67,16 +79,25 @@ The team hopes our research and work may be useful for other Open Source communi * Are you part of a local hackerspace, Linux User Group(LUG) or STEM community? * Are you involved in open source project beyond Fedora? +<<<<<<< HEAD If you said YES to one or more points above,then you are at the right place! +======= +If you said YES to one or more points above, +then you are at the right place! +>>>>>>> 4220c9e... minor sentence changes 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. -If you are interested in working with us, please checkout xref:get-involved.adoc[how to get involved with us] to start your journey with our team! +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! [[meeting-guide]] === Meeting Guide +<<<<<<< HEAD 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. +======= +xref:meetings.adoc[Meetings] of the D&I team are held every other Thurday in https://webchat.freenode.net/?channels=#fedora-diversity[#fedora-diversity] channel at 14:00 UTC. +>>>>>>> 4220c9e... minor sentence changes If you are interested in attending or chairing our meetings, checkout our xref:meetings.adoc[meeting guide] for information. [[Policy]] From 17e7bb50efdf718c97dc1e0d85b468879cfb3e7f Mon Sep 17 00:00:00 2001 From: Ramya Parimi Date: Nov 14 2020 03:41:54 +0000 Subject: [PATCH 21/22] merge conflict --- diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc index 45af310..3886c2a 100644 --- a/modules/ROOT/pages/index.adoc +++ b/modules/ROOT/pages/index.adoc @@ -4,12 +4,8 @@ include::{partialsdir}/attributes.adoc[] :toc: The goal of our team is to encourage diversity and inclusion in the Fedora community. -<<<<<<< HEAD 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. -======= -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. ->>>>>>> 4220c9e... minor sentence changes 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! @@ -36,11 +32,7 @@ We track our https://pagure.io/fedora-diversity/issues[ongoing work and action i [[fedora-women]] === Fedora Women -<<<<<<< HEAD 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! -======= -As the https://fedoraproject.org/wiki/Women[Fedora Women] community is not active at the moment, Fedora D&I team has taken up this project to keep it up and running. ->>>>>>> 4220c9e... minor sentence changes 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. @@ -52,17 +44,13 @@ Subscribe to the https://lists.fedoraproject.org/admin/lists/women.lists.fedorap [[events]] === Events -<<<<<<< HEAD xref:events:index.adoc[Events] organized by the Fedora D&I team focus to: -======= -xref:events:index.adoc[The Events] organized by the Fedora D&I team focus to: ->>>>>>> 4220c9e... minor sentence changes * Celebrate the contributions of women, LGBT+, BIPOC, and people with disabilities and * Engage, empower and encourage diverse folks in the open source communities. If you are interested in organizing such event at your locality, please send us an email. We are always looking for new collaborators. -In addition, please checkout the xref:events:fwd-resource-pack.adoc[Event Resource Pack] for more information. +In addition, please checkout the xref:events:fwd-resource-pack[Event Resource Pack] for more information. [[demographic-survey]] == Demographic Survery @@ -79,25 +67,16 @@ The team hopes our research and work may be useful for other Open Source communi * Are you part of a local hackerspace, Linux User Group(LUG) or STEM community? * Are you involved in open source project beyond Fedora? -<<<<<<< HEAD If you said YES to one or more points above,then you are at the right place! -======= -If you said YES to one or more points above, -then you are at the right place! ->>>>>>> 4220c9e... minor sentence changes 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. -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! +If you are interested in working with us, please checkout xref:get-involved.adoc[how to get involved with us] to start your journey with our team! [[meeting-guide]] === Meeting Guide -<<<<<<< HEAD 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. -======= -xref:meetings.adoc[Meetings] of the D&I team are held every other Thurday in https://webchat.freenode.net/?channels=#fedora-diversity[#fedora-diversity] channel at 14:00 UTC. ->>>>>>> 4220c9e... minor sentence changes If you are interested in attending or chairing our meetings, checkout our xref:meetings.adoc[meeting guide] for information. [[Policy]] @@ -105,3 +84,4 @@ If you are interested in attending or chairing our meetings, checkout our xref:m 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 From 6f0c2ab2ef8f3557cbb071c0f55175645e90a795 Mon Sep 17 00:00:00 2001 From: Ramya Parimi Date: Nov 14 2020 03:51:43 +0000 Subject: [PATCH 22/22] resolved merge conflicts --- diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc index 3886c2a..f7e9760 100644 --- a/modules/ROOT/pages/index.adoc +++ b/modules/ROOT/pages/index.adoc @@ -3,7 +3,9 @@ include::{partialsdir}/attributes.adoc[] = Diversity and inclusion in Fedora :toc: -The goal of our team is to encourage diversity and inclusion in the Fedora community. +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. @@ -32,11 +34,11 @@ We track our https://pagure.io/fedora-diversity/issues[ongoing work and action i [[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 goal 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 involvement in Fedora. +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. @@ -50,12 +52,12 @@ xref:events:index.adoc[Events] organized by the Fedora D&I team focus to: * Engage, empower and encourage diverse folks in the open source communities. If you are interested in organizing such event at your locality, please send us an email. We are always looking for new collaborators. -In addition, please checkout the xref:events:fwd-resource-pack[Event Resource Pack] for more information. +In addition, please checkout the xref:events:fwd-resource-pack.adoc[Event Resource Pack] for more information. [[demographic-survey]] == Demographic Survery -The xref:demographic-survery.adoc[Demographic Survery] was launched to understand demographics of the Fedora Community. +The xref:survery:index.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. The team hopes our research and work may be useful for other Open Source communities and Diversity & Inclusion programmes. @@ -71,7 +73,7 @@ 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. -If you are interested in working with us, please checkout xref:get-involved.adoc[how to get involved with us] to start your journey with our team! +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! [[meeting-guide]] === Meeting Guide @@ -84,4 +86,3 @@ If you are interested in attending or chairing our meetings, checkout our xref:m 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