From 1b1a6c66b831719aa52abd07544b89ec758408b8 Mon Sep 17 00:00:00 2001 From: Justin W. Flory (he/him) [Fedora Project] Date: Feb 01 2022 21:32:30 +0000 Subject: docs: Update team name to Diversity, Equity, & Inclusion Team This commit updates the Pagure README, Fedora documentation, and other miscellaneous files in the repository to reflect our new team name. We added "Equity" into the team name to better reflect the focus and intended impact of our work. This was discussed in team meetings and Pagure tickets before finalizing. Closes #206. Signed-off-by: Justin W. Flory (he/him) [Fedora Project] --- diff --git a/.pagure/CONTRIBUTING.md b/.pagure/CONTRIBUTING.md index 2b6729d..8bf67ee 100644 --- a/.pagure/CONTRIBUTING.md +++ b/.pagure/CONTRIBUTING.md @@ -1,12 +1,12 @@ -How to contribute to D&I Team documentation -=========================================== +How to contribute to D.E.I. Team documentation +============================================== -Please report issues and submit pull requests for **Content Fixes** to [Fedora D&I documentation](https://docs.fedoraproject.org/en-US/diversity-inclusion/) here. +Please report issues and submit pull requests for **Content Fixes** to [Fedora D.E.I. documentation](https://docs.fedoraproject.org/en-US/diversity-inclusion/) here. General appearance issues and publishing issues should be reported against the [publishing software](https://pagure.io/fedora-docs/docs-fp-o). Never done a pull request (or "PR")? @@ -16,7 +16,7 @@ If you already know git, see the [Pagure documentation for Pull Requests](https: ## How to edit these documents -Content for the D&I documentation is stored [in this repository](https://pagure.io/fedora-diversity/tree/). +Content for the D.E.I. documentation is stored [in this repository](https://pagure.io/fedora-diversity/tree/). Source content is written in [AsciiDoc](http://asciidoc.org/). See these resources for help using AsciiDoc: diff --git a/README.md b/README.md index 91c5ecf..a6a9e98 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -Fedora Diversity and Inclusion Team -=================================== +Fedora Diversity, Equity, & Inclusion Team +========================================== [![License: CC BY-SA 4.0](https://img.shields.io/badge/License-CC%20BY--SA%204.0-lightgrey.svg)](https://creativecommons.org/licenses/by-sa/4.0/ "Fedora Docs content licensed under CC BY-SA 4.0") -[![Join us at #fedora-diversity on freenode.net](https://img.shields.io/badge/chat-on%20freenode-brightgreen.svg)](https://webchat.freenode.net/?channels=fedora-diversity "Join us at #fedora-diversity on freenode.net") -Ticket-based discussion and tasks for Fedora [Diversity & Inclusion Team](https://docs.fedoraproject.org/en-US/diversity-inclusion/) +Ticket-based discussion and tasks for Fedora [Diversity, Equity, & Inclusion Team](https://docs.fedoraproject.org/en-US/diversity-inclusion/) ## What can I do here? -This repository is a task manager / tracker for the Diversity and Inclusion Team to collaborate on the various tasks we're working on. +This repository is a task manager / tracker for the Diversity, Equity, and Inclusion Team to collaborate on the various tasks we are working on. You can see these [here](https://pagure.io/fedora-diversity/issues). -You can also file a ticket for anything related to diversity and inclusion efforts in Fedora or needing the attention of the [Diversity Adviser](https://docs.fedoraproject.org/en-US/council/diversity-advisor/). +You can also file a ticket for anything related to diversity, equity, and inclusion efforts in Fedora or needing the attention of the [D.E.I. Adviser](https://docs.fedoraproject.org/en-US/council/diversity-advisor/). **[Tickets planned for the next meeting are found here!](https://pagure.io/fedora-diversity/issues?status=Open&priority=20)** ## Where to find us -If you're looking for other places to get in contact or participate with the Diversity and Inclusion Team, you can find us in the following places: +If you're looking for other places to get in contact or participate with the Diversity, Equity, and Inclusion Team, you can find us in the following places: * **Mailing list**: [diversity AT lists DOT fedoraproject DOT org](https://lists.fedoraproject.org/admin/lists/diversity.lists.fedoraproject.org) * **IRC channel**: #fedora-diversity on [Libera IRC](https://libera.chat/) [ [webchat](https://web.libera.chat/?channels=#fedora-diversity) ] diff --git a/antora.yml b/antora.yml index ce2fb19..b426651 100644 --- a/antora.yml +++ b/antora.yml @@ -3,7 +3,7 @@ name: diversity-inclusion # Title will be visible on the page. -title: Diversity and Inclusion +title: Diversity, Equity, 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 diff --git a/modules/ROOT/assets/images/infographic-2020.svg b/modules/ROOT/assets/images/infographic-2020.svg index b4ccc98..a741159 100644 --- a/modules/ROOT/assets/images/infographic-2020.svg +++ b/modules/ROOT/assets/images/infographic-2020.svg @@ -2878,7 +2878,7 @@ width="244.22356" id="rect916-0" />Fedora Diversity and Inclusion team is committed to fostering diversity and inclusion in the Fedora community.Fedora Diversity, Equity, & Inclusion team is committed to fostering diversity, equity, and inclusion in the Fedora community. @@ -41,7 +41,7 @@ This section includes a sample script of MeetBot meeting bot commnds with `zodbo #topic Roll call / introductions -If this is your first time at a D&I Team meeting, please say hello! If you have any questions before we get started with the rest of the agenda, now is also a good time to ask. +If this is your first time at a D.E.I. Team meeting, please say hello! If you have any questions before we get started with the rest of the agenda, now is also a good time to ask. #topic Announcements diff --git a/modules/ROOT/pages/policy/decision-process.adoc b/modules/ROOT/pages/policy/decision-process.adoc index 106edf9..75bacb6 100644 --- a/modules/ROOT/pages/policy/decision-process.adoc +++ b/modules/ROOT/pages/policy/decision-process.adoc @@ -2,13 +2,13 @@ include::{partialsdir}/attributes.adoc[] = Decision-making process -This page describes how the Fedora D&I team makes decisions. +This page describes how the Fedora D.E.I. team makes decisions. [[process]] == Process -Members of the https://admin.fedoraproject.org/accounts/group/members/diversity-team/*[Fedora Diversity and Inclusion Team FAS group] are eligible to vote. +Members of the https://admin.fedoraproject.org/accounts/group/members/diversity-team/*[Fedora Diversity, Equity, & Inclusion Team FAS group] are eligible to vote. === Lazy Approval @@ -21,18 +21,18 @@ Any team member can ask for the deadline to be extended or the decision escalate More significant decisions are made through a process of full consensus. In order to pass, these decisions need three positive votes (+3) and no negative votes (-1) within a specific period of time i.e. 14 days. -The votes can be cast by any of the approved members in the FAS group for the Diversity and Inclusion Team. +The votes can be cast by any of the approved members in the FAS group for the Diversity, Equity, & Inclusion Team. A negative vote immediately halts the process and requires discussion. Therefore, in order to remain valid, negative votes must be supported with a specific concern about the proposal, and suggestions for what could be changed in order to make the proposal acceptable. == Choosing a process -*Lazy approval* is followed for tasks with a defined process in D&I Team. +*Lazy approval* is followed for tasks with a defined process in D.E.I. Team. When all prior steps for a task are completed with just the ticket-based approval remaining. For example, translating an article or proposing a Flock session fit in this model. -*Full consensus* is required to approve new processes, make changes to existing team policies, and tickets requiring D&I budget. +*Full consensus* is required to approve new processes, make changes to existing team policies, and tickets requiring D.E.I. budget. For example, proposing new event guidelines for events, changing the decision-making process, and voting on Outreachy budget allocation requires full consensus. diff --git a/modules/events/nav.adoc b/modules/events/nav.adoc index d203174..bd484b8 100644 --- a/modules/events/nav.adoc +++ b/modules/events/nav.adoc @@ -1,4 +1,4 @@ -* xref:index.adoc[D&I Events] +* xref:index.adoc[D.E.I. Events] ** xref:flock-social-events.adoc[Flock Social Events] ** Fedora Women's Day *** xref:fwd/about-fwd.adoc[About] diff --git a/modules/events/pages/flock-social-events.adoc b/modules/events/pages/flock-social-events.adoc index 40d91f7..1d3e36b 100644 --- a/modules/events/pages/flock-social-events.adoc +++ b/modules/events/pages/flock-social-events.adoc @@ -3,5 +3,5 @@ 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 +If you want to help write it, review the https://pagure.io/fedora-diversity/issues[Fedora D.E.I. Pagure issue tracker] to see where you can get involved. +==== diff --git a/modules/events/pages/fwd-resource-pack.adoc b/modules/events/pages/fwd-resource-pack.adoc index b0ffeff..948932a 100644 --- a/modules/events/pages/fwd-resource-pack.adoc +++ b/modules/events/pages/fwd-resource-pack.adoc @@ -5,7 +5,7 @@ include::ROOT:partial$attributes.adoc[] 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 + * A summary about Fedora D.E.I. team * Overview of different Fedora editions * Fedora and Python @@ -16,22 +16,22 @@ Find more information about the welcome ticket process link:https://docs.fedorap 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 +== About Fedora Diversity, Equity, & 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. +At your event, start with an introduction to the Fedora Diversity, Equity, & Inclusion Team. +Explain the role of D.E.I. team in the Fedora community and its upcoming goals. 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. -Below are some of the many efforts focused by D&I team to achieve its goal: +What is the role of Fedora Diversity, Equity, & Inclusion Team?:: +As the name indicates, the main goal of the D.E.I. team is to foster diversity, equity, and inclusion in Fedora community. +Below are some of the many efforts focused by D.E.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 +* Coordinate with Fedora sub-projects to enhance diversity, equity, and inclusion in the community +* Supporting programs committed to building diversity, equity, 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. +What the D.E.I. team works on?:: +The D.E.I. team works on various tasks to support diversity, equity, 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. diff --git a/modules/events/pages/fwd/about-fwd.adoc b/modules/events/pages/fwd/about-fwd.adoc index f06d12e..044c610 100644 --- a/modules/events/pages/fwd/about-fwd.adoc +++ b/modules/events/pages/fwd/about-fwd.adoc @@ -3,7 +3,7 @@ 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. +Fedora Women's Day marks the anniversary of the {FWIKI}/Women[Fedora Women] team and is headed by Fedora's Diversity, Equity, & 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. diff --git a/modules/events/pages/fwd/history.adoc b/modules/events/pages/fwd/history.adoc index 40d91f7..1d3e36b 100644 --- a/modules/events/pages/fwd/history.adoc +++ b/modules/events/pages/fwd/history.adoc @@ -3,5 +3,5 @@ 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 +If you want to help write it, review the https://pagure.io/fedora-diversity/issues[Fedora D.E.I. Pagure issue tracker] to see where you can get involved. +==== diff --git a/modules/events/pages/fwd/organize.adoc b/modules/events/pages/fwd/organize.adoc index 40d91f7..1d3e36b 100644 --- a/modules/events/pages/fwd/organize.adoc +++ b/modules/events/pages/fwd/organize.adoc @@ -3,5 +3,5 @@ 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 +If you want to help write it, review the https://pagure.io/fedora-diversity/issues[Fedora D.E.I. Pagure issue tracker] to see where you can get involved. +==== diff --git a/modules/events/pages/fwd/participate.adoc b/modules/events/pages/fwd/participate.adoc index 40d91f7..1d3e36b 100644 --- a/modules/events/pages/fwd/participate.adoc +++ b/modules/events/pages/fwd/participate.adoc @@ -3,5 +3,5 @@ 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 +If you want to help write it, review the https://pagure.io/fedora-diversity/issues[Fedora D.E.I. Pagure issue tracker] to see where you can get involved. +==== diff --git a/modules/events/pages/index.adoc b/modules/events/pages/index.adoc index c3098ac..82854e6 100644 --- a/modules/events/pages/index.adoc +++ b/modules/events/pages/index.adoc @@ -2,8 +2,8 @@ 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. +The Events section of the D.E.I. Docs aims to build a *Fedora Diversity events calendar* and identify *regional events for participation*. +As the D.E.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]. +This page is maintained by the Fedora Diversity, Equity, & Inclusion Team. +For suggesting any modifications, please contact xref:ROOT:get-involved.adoc[Diversity, Equity, & Inclusion Team] or the xref:council:ROOT:diversity-advisor.adoc[Diversity Adviser]. diff --git a/modules/events/pages/past-events.adoc b/modules/events/pages/past-events.adoc index 40d91f7..1d3e36b 100644 --- a/modules/events/pages/past-events.adoc +++ b/modules/events/pages/past-events.adoc @@ -3,5 +3,5 @@ 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 +If you want to help write it, review the https://pagure.io/fedora-diversity/issues[Fedora D.E.I. Pagure issue tracker] to see where you can get involved. +==== diff --git a/modules/outreachy/pages/about.adoc b/modules/outreachy/pages/about.adoc index 40d91f7..1d3e36b 100644 --- a/modules/outreachy/pages/about.adoc +++ b/modules/outreachy/pages/about.adoc @@ -3,5 +3,5 @@ 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 +If you want to help write it, review the https://pagure.io/fedora-diversity/issues[Fedora D.E.I. Pagure issue tracker] to see where you can get involved. +==== diff --git a/modules/roles/nav.adoc b/modules/roles/nav.adoc index 73f9779..7da9b13 100644 --- a/modules/roles/nav.adoc +++ b/modules/roles/nav.adoc @@ -1,2 +1,2 @@ * Role Handbooks -** xref:council-advisor.adoc[Council D&I Advisor] +** xref:council-advisor.adoc[Council D.E.I. Advisor] diff --git a/modules/roles/pages/council-advisor.adoc b/modules/roles/pages/council-advisor.adoc index 8d50db0..1245e7f 100644 --- a/modules/roles/pages/council-advisor.adoc +++ b/modules/roles/pages/council-advisor.adoc @@ -1,18 +1,18 @@ include::ROOT:partial$attributes.adoc[] :page-aliases: council:ROOT:diversity-advisor.adoc -= Fedora Diversity and Inclusion (D&I) Advisor += Fedora Diversity, Equity, & Inclusion (D.E.I.) Advisor :toc: (xref:council:ROOT:members.adoc[_Return to "Current Members of the Fedora Council"_]) -The *Fedora Diversity and Inclusion (D&I) Advisor* is a liaison between the Fedora Council and the Fedora Community on topics and issues related to diversity and inclusion in Fedora. -The D&I Advisor works with Fedora Council leadership to represent perspectives and voices of the Fedora Community in decision-making and project discussions. -Additionally, they also lead initiatives to assess and promote equality and inclusion in close collaboration with the xref:ROOT:index.adoc[Fedora D&I Team]. +The *Fedora Diversity, Equity, & Inclusion (D.E.I.) Advisor* is a liaison between the Fedora Council and the Fedora Community on topics and issues related to diversity and inclusion in Fedora. +The D.E.I. Advisor works with Fedora Council leadership to represent perspectives and voices of the Fedora Community in decision-making and project discussions. +Additionally, they also lead initiatives to assess and promote equality and inclusion in close collaboration with the xref:ROOT:index.adoc[Fedora D.E.I. Team]. [[current-advisor]] -== Current D&I Advisor +== Current D.E.I. Advisor [.profile-picture] image::https://seccdn.libravatar.org/avatar/c72ce27c1c9008d3a3745ea354de86fa?s=400&d=retro[Vipul Siddharth (he/him)] @@ -25,27 +25,27 @@ More coming soon after the Fedora 34 release cycle winds down and we begin worki [[duration]] == Duration of service -The D&I Representative will serve until they wish to step down, or the Council or the D&I Team wish to replace them. +The D.E.I. Representative will serve until they wish to step down, or the Council or the D.E.I. Team wish to replace them. The recommendation for duration of service is two Fedora release cycles, or *one year*. However, terms may (xref:#history[and have]) run shorter or longer depending on the personal situation of the person filling the Advisor role. -In the event that the representative, Council, or D&I Team wish to make a change in representative, sufficient reason should be given. -A new representative will then be xref:#selection[selected] by the D&I Team. +In the event that the representative, Council, or D.E.I. Team wish to make a change in representative, sufficient reason should be given. +A new representative will then be xref:#selection[selected] by the D.E.I. Team. [[responsibilities]] == Responsibilities -The Fedora D&I Advisor is a liaison between the Fedora Council, the Fedora D&I Team, and the Fedora Community. -The following responsibilities and duties are delegated to the D&I Advisor. +The Fedora D.E.I. Advisor is a liaison between the Fedora Council, the Fedora D.E.I. Team, and the Fedora Community. +The following responsibilities and duties are delegated to the D.E.I. Advisor. [[responsibilities-council]] === To Fedora Council * Participate in two to three Council hackfests a year (xref:#hackfest[_what is a hackfest?_]) -* Participate in two to three Council meetings a month, as representative of the D&I Team -* Identify synergies and collaboration opportunities with Fedora Council responsibilities, Fedora D&I Team objectives, and the Fedora Community +* Participate in two to three Council meetings a month, as representative of the D.E.I. Team +* Identify synergies and collaboration opportunities with Fedora Council responsibilities, Fedora D.E.I. Team objectives, and the Fedora Community [[responsibilities-council-examples]] ==== Examples @@ -62,21 +62,21 @@ The following responsibilities and duties are delegated to the D&I Advisor. While not explicitly a diversity, equity, and inclusion topic, there is an opportunity for the Council Advisor to share constructive feedback to up-and-coming initiatives within the Fedora Community. [[responsibilities-diversity-team]] -=== To Fedora D&I Team +=== To Fedora D.E.I. Team -* Participate in two to three Diversity & Inclusion meetings a month +* Participate in two to three Diversity, Equity, & Inclusion meetings a month * Share periodic updates and insight on Council tasks and priorities back to the team -* Maintain and update team documentation for any key objectives and the D&I Advisor role page -* Maintain Fedora D&I budget documentation in coordination with xref:council::fcaic.adoc[Community Action and Impact Coordinator] +* Maintain and update team documentation for any key objectives and the D.E.I. Advisor role page +* Maintain Fedora D.E.I. budget documentation in coordination with xref:council::fcaic.adoc[Community Action and Impact Coordinator] [[responsibilities-diversity-team-examples]] ==== Examples -* *D&I Team meetings*: +* *D.E.I. Team meetings*: Usually held https://meetbot.fedoraproject.org/sresults/?group_id=diversity&type=team[over text channels], such as IRC, Matrix, and Telegram. Also an opportunity for the Council Advisor to share any announcements or on-going work in the Fedora Council back with the wider team. * *Documentation*: - Help keep pages (like this one!) up-to-date in the D&I Team documentation. + Help keep pages (like this one!) up-to-date in the D.E.I. Team documentation. * *Budget maintenance*: This is done with support xref:council::fcaic.adoc[Community Action and Impact Coordinator]. Logistics of how this is updated varies between Council Advisors. @@ -84,7 +84,7 @@ The following responsibilities and duties are delegated to the D&I Advisor. [[responsibilities-community]] === To Fedora Community -* Monitor and respond (if necessary) to mail sent to Fedora D&I email address alias +* Monitor and respond (if necessary) to mail sent to Fedora D.E.I. email address alias (see email address xref:#contact[below]) * Listen to needs, concerns, and hopes of the Fedora Community for Fedora * Be an intersectional advocate for the diverse Fedora Community to Fedora Leadership @@ -104,26 +104,26 @@ There is always room for new ideas and approaches on how to best serve the needs [[selection]] == Selection -This section explains how the D&I Advisor is nominated and confirmed. -The selection process documented below is initiated when a rotation of Advisors is motioned by the existing representative, the Fedora D&I Team, or the Fedora Council. +This section explains how the D.E.I. Advisor is nominated and confirmed. +The selection process documented below is initiated when a rotation of Advisors is motioned by the existing representative, the Fedora D.E.I. Team, or the Fedora Council. [[selection-nomination]] === Nomination There will be a one-week nomination period for potential representatives. Nominees can be self-nominated or nominated by others with their consent. -A prospective nominee should understand the dynamics of the Fedora D&I Team, a basic understanding of various Fedora sub-projects, and have sufficient time to perform the responsibilities required. -Nominees are required to be members of the Fedora D&I Team. +A prospective nominee should understand the dynamics of the Fedora D.E.I. Team, a basic understanding of various Fedora sub-projects, and have sufficient time to perform the responsibilities required. +Nominees are required to be members of the Fedora D.E.I. Team. -In the event that there are no nominees, the D&I Team will work with the Council to broaden the search message and request more time. -Should no nominees be found after that, the role will rotate among existing D&I Team members until the next representative is identified. +In the event that there are no nominees, the D.E.I. Team will work with the Council to broaden the search message and request more time. +Should no nominees be found after that, the role will rotate among existing D.E.I. Team members until the next representative is identified. [[selection-confirmation]] === Confirmation -After the one-week nomination period expires, the Fedora D&I Team will discuss candidates in a public meeting. +After the one-week nomination period expires, the Fedora D.E.I. Team will discuss candidates in a public meeting. In a meeting discussion, it provides an opportunity for the team to weigh in and share other context. -In the event that more than two nominees are both interested in the Advisor role, the Fedora D&I Team will coordinate with the xref:council::fpgm.adoc[Fedora Program Manager] to run an election. +In the event that more than two nominees are both interested in the Advisor role, the Fedora D.E.I. Team will coordinate with the xref:council::fpgm.adoc[Fedora Program Manager] to run an election. For the Fedora Elections application, use these conditions: @@ -131,16 +131,16 @@ For the Fedora Elections application, use these conditions: * Voting is open to CLA+1 voters (like Council elections) The selected person and the Council will be notified once the selection is confirmed. -The selected person will begin serving as the D&I Advisor to the Council as soon as possible. +The selected person will begin serving as the D.E.I. Advisor to the Council as soon as possible. [[contact]] == Contact -Get in touch with the Fedora D&I Advisor in the following places: +Get in touch with the Fedora D.E.I. Advisor in the following places: * *IRC*: - link:[#fedora-diversity] on https://freenode.net/[freenode IRC] + link:[#fedora-diversity] on https://libera.chat/[Libera.Chat IRC] * *Matrix/Element*: https://app.element.io/#/room/#fedora-diversity:matrix.org[#fedora-diversity:matrix.org] * *Telegram*: @@ -150,12 +150,12 @@ Get in touch with the Fedora D&I Advisor in the following places: [[history]] -== History of Fedora D&I Advisor +== History of Fedora D.E.I. Advisor |=== |Releases | Advisor -|35, … +|35, 36, … |{FWIKI}/User:Siddharthvipul1[Vipul Siddharth] |33, 34 diff --git a/modules/survey/pages/index.adoc b/modules/survey/pages/index.adoc index 4aeaf89..b68f567 100644 --- a/modules/survey/pages/index.adoc +++ b/modules/survey/pages/index.adoc @@ -1,7 +1,7 @@ include::ROOT:partial$attributes.adoc[] = About Fedora Project Demographic Survey -Fedora Diversity & Inclusion Team +Fedora Diversity, Equity, & Inclusion Team :toc: This section documents the Fedora Project Demographic Survey research. @@ -12,9 +12,9 @@ A majority of this work was completed at the https://communityblog.fedoraproject [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. +This page represents six to eight months of work from the Fedora Diversity, Equity, & Inclusion Team in late 2015 and early 2016. +While the D.E.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, Equity, & Inclusion programmes. ==== @@ -27,7 +27,7 @@ The Fedora Project Demographic Survey established these key objectives for launc === 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. + Enables Fedora Diversity, Equity, & 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 diff --git a/modules/survey/pages/questions.adoc b/modules/survey/pages/questions.adoc index e8e8099..a512b44 100644 --- a/modules/survey/pages/questions.adoc +++ b/modules/survey/pages/questions.adoc @@ -1,7 +1,7 @@ include::ROOT:partial$attributes.adoc[] = Demographic Survey Questions -Fedora Diversity & Inclusion Team +Fedora Diversity, Equity, & Inclusion Team v1.0.0 :toc: @@ -11,9 +11,9 @@ See the xref:index.adoc[About] and xref:resources.adoc[Resources & references] p [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. +This page represents six to eight months of work from the Fedora Diversity, Equity, & Inclusion Team in late 2015 and early 2016. +While the D.E.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, Equity, & Inclusion programmes. ====