From c3e5ef9951d73059639eda1a9d2c410826e71b68 Mon Sep 17 00:00:00 2001 From: orionstar25 Date: Sep 06 2020 19:49:58 +0000 Subject: Merge About and Team page --- diff --git a/modules/ROOT/nav.adoc b/modules/ROOT/nav.adoc index 5df6810..c86a4a4 100644 --- a/modules/ROOT/nav.adoc +++ b/modules/ROOT/nav.adoc @@ -1,4 +1,3 @@ -* xref:team.adoc[About Diversity and Inclusion Team] * xref:events.adoc[D&I events] * xref:demographic-survey.adoc[Demographic survey] * Fedora Women's Day (FWD) diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc index 5d7d500..126526a 100644 --- a/modules/ROOT/pages/index.adoc +++ b/modules/ROOT/pages/index.adoc @@ -3,45 +3,29 @@ include::{partialsdir}/attributes.adoc[] = Diversity and inclusion in Fedora The Fedora Project welcomes and encourages participation by everyone. -Our community is based on mutual respect, tolerance, and encouragement, and we are working to help each other live up to these principles. -Please, refer to our xref:project:ROOT:code-of-conduct.adoc[Code of Conduct] if you need more information. -Fedora Diversity and Inclusion team is committed to fostering diversity and inclusion in Fedora community. -You can watch our recent video showcasing the Fedora community https://youtu.be/Ig0gnM9jsm0[here]. +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. +You can watch our recent video showcasing the Fedora community https://www.youtube.com/watch?v=O1eHRoEps6I[here]. [[goals]] == Goals -The goal of this initiative is to help foster diversity and inclusion in Fedora community. -Fedora Diversity and Inclusion team works towards this goal by focusing on efforts including (but not limited to) +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 in Fedora within and outside the Fedora community. +* 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 foster Diversity and Inclusion in the community. +* 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. -[[join]] -== Join - -If you'd like to help out, please send an introduction to the mailing list and introduce yourself in IRC. -You can also join the conversation on Telegram bridge to IRC https://t.me/fedoradiversity[here.] - - -[[meetings]] -== Meetings - -The Diversity and Inclusion team meets *bi-weekly* in #fedora-diversity at 12:30 UTC on Fridays. -The calendar for future meetings is available https://apps.fedoraproject.org/calendar/meeting/6397/[here]. -Meeting logs are available at https://meetbot.fedoraproject.org/sresults/?group_id=fedora-diversity&type=channel[Meetbot] - - [[current-projects]] == Current Projects We are tracking our ongoing work and action items https://pagure.io/fedora-diversity/issues[here] in Pagure. - [[fedora-women]] === Fedora Women @@ -51,13 +35,38 @@ 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 an aim of fostering diversity and inclusion in Fedora community. +The Fedora D&I team organizes and supports a variety of events which help us achieve our goals. xref:events.adoc[Here] is the list of events. -Please send us an email if you are interested in helping us organize events in your local community related to promoting diversity and inclusion in open source communities including Fedora. +Please send us an {MAILINGLIST}[email] if you are interested in helping us organize events in your local community related to promoting diversity and inclusion in open source communities including Fedora. -[[contacts]] -== Community Contacts +[[meetings]] +== Meetings + +The D&I team meets *bi-weekly* via IRC #fedora-diversity on Freenode at 12:30 UTC on Fridays. +The calendar for future meetings is available https://apps.fedoraproject.org/calendar/meeting/6397/[here]. +Meeting logs are available at https://meetbot.fedoraproject.org/sresults/?group_id=fedora-diversity&type=channel[Meetbot]. + +[[get-in-touch]] +== Get in touch with us + +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. -To get in touch with Fedora Diversity and Inclusion team, please send an email to our mailing list or connect with us on IRC or via Telegram. +We feel that everyone can bring in valuable inputs to this conversation. +We have diverse and flexible contribution opportunities available for everyone. + +* If you'd like to help out, please introduce yourself on our {MAILINGLIST}[Diversity & Inclusion mailing list]. + +* You can join the conversation via IRC #fedora-diversity on Freenode. + We also have a Telegram bridge to IRC https://t.me/fedoradiversity[here]. + +* 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]. + +* Feel like you don't have much time to contribute? + Subscribe to our {MAILINGLIST}[Diversity & Inclusion mailing list] to receive updates about our work. + \ No newline at end of file diff --git a/modules/ROOT/pages/team.adoc b/modules/ROOT/pages/team.adoc deleted file mode 100644 index c2f4854..0000000 --- a/modules/ROOT/pages/team.adoc +++ /dev/null @@ -1,54 +0,0 @@ -include::{partialsdir}/attributes.adoc[] - -= About Diversity and Inclusion Team - -Fedora Diversity and Inclusion team is committed to fostering diversity and inclusion in Fedora community. -You can watch our recent video showcasing the Fedora community https://youtu.be/Ig0gnM9jsm0[here]. - - -[[goals]] -== Goals - -The goal of this initiative is to help foster diversity and inclusion in Fedora community. -Fedora Diversity and Inclusion 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. -* Supporting community building and engagement activities to foster inclusion. -* Coordinating with Fedora SIGs and subprojects to foster Diversity and Inclusion in the community. -* Supporting programs committed to building diversity and inclusion in Free and Open Source Software communities. - - -[[current-projects]] -== Current Projects - -We are tracking our ongoing work and action items https://pagure.io/fedora-diversity/issues[here] in Pagure. - - -[[meetings]] -== Meetings - -The Diversity and Inclusion team meets *bi-weekly* in #fedora-diversity at 1300 UTC on Fridays. -The calendar for future meetings is available https://apps.fedoraproject.org/calendar/meeting/6397/[here]. -Meeting logs are available at https://meetbot.fedoraproject.org/sresults/?group_id=fedora-diversity&type=channel[Meetbot] - - -[[get-in-touch]] -== Get in touch with us - -* Want to help us shape diversity and inclusion in Fedora community? - We feel that everyone can bring in valuable inputs to this conversation. - We have diverse and flexible contribution opportunities available for everyone. - You can join the conversation via IRC #fedora-diversity on Freenode. - We also have a Telegram bridge to IRC https://t.me/fedoradiversity[here.]. - Feel free to introduce yourself on our {MAILINGLIST}[Diversity & Inclusion mailing list]. - -* Feel like you don't have much time to contribute? - Subscribe to our {MAILINGLIST}[Diversity & Inclusion mailing list] to receive updates about our work. - -* 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? - -We are especially looking for other open source projects and local communities to share resources and collaborate together. -If you are interested in collaborating with us, please get in touch with us via IRC #fedora-diversity on Freenode or {MAILINGLIST}[Diversity & Inclusion mailing list]. -We also have a Telegram bridge to IRC https://t.me/fedoradiversity[here.].