#219 docs: Update team name to Diversity, Equity, & Inclusion Team
Merged 2 years ago by siddharthvipul1. Opened 2 years ago by jflory7.
jflory7/fedora-diversity change/dei  into  main

file modified
+4 -4
@@ -1,12 +1,12 @@ 

- How to contribute to D&I Team documentation

- ===========================================

+ How to contribute to D.E.I. Team documentation

+ ==============================================

  

  <!--

      Style rule: one sentence per line please!

      This makes git diffs easier to read. :)

  -->

  

- 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 @@ 

  

  ## 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:

  

file modified
+6 -7
@@ -1,5 +1,5 @@ 

- Fedora Diversity and Inclusion Team

- ===================================

+ Fedora Diversity, Equity, & Inclusion Team

+ ==========================================

  

  <!--

      Style rule: one sentence per line please!
@@ -7,23 +7,22 @@ 

  -->

  

  [![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) ]

file modified
+1 -1
@@ -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

@@ -2878,7 +2878,7 @@ 

             width="244.22356"

             id="rect916-0" /></flowRegion><flowPara

           id="flowPara5592"

-          style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:14.6667px;line-height:0;font-family:Montserrat;-inkscape-font-specification:'Montserrat Medium';fill:#ffffff;fill-opacity:1">Fedora Diversity and Inclusion team is committed to fostering diversity and inclusion in the Fedora community.</flowPara><flowPara

+          style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:14.6667px;line-height:0;font-family:Montserrat;-inkscape-font-specification:'Montserrat Medium';fill:#ffffff;fill-opacity:1">Fedora Diversity, Equity, & Inclusion team is committed to fostering diversity, equity, and inclusion in the Fedora community.</flowPara><flowPara

           id="flowPara5585"

           style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:14.6667px;line-height:0;font-family:Montserrat;-inkscape-font-specification:'Montserrat Medium';fill:#ffffff;fill-opacity:1"> </flowPara><flowPara

           id="flowPara3260"

file modified
+1 -1
@@ -1,4 +1,4 @@ 

  * xref:get-involved.adoc[Get involved]

- * xref:meetings.adoc[D&I Meeting Guide]

+ * xref:meetings.adoc[D.E.I. Meeting Guide]

  * Policy

  ** xref:policy/decision-process.adoc[Decision-making process]

@@ -3,10 +3,10 @@ 

  = Events

  

  The purpose of this page is to build a *Fedora Diversity events calendar* and to identify *regional participation* for each event.

- Since the agenda of the Diversity and Inclusion team is to assist minorities and promote a more inclusive Fedora community, we are targeting events which are minority-specific.

+ Since the agenda of the Diversity, Equity, & Inclusion team is to assist minorities and promote a more inclusive Fedora community, we are targeting events which are minority-specific.

  

- This page is maintained by the Fedora Diversity and Inclusion Team.

- In case of any modifications required, please contact xref:team.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.

+ In case of any modifications required, please contact xref:team.adoc[Diversity, Equity, & Inclusion Team] or the xref:council:ROOT:diversity-advisor.adoc[Diversity Adviser].

  

  

  [[event-list]]
@@ -42,13 +42,13 @@ 

    We could host a panel where they show us how they have "conquered the IT world".

  5. **Fedora Diversity Day / FAD**

  * We would like to initiate recognizing a Fedora Diversity Day.

-   We would love this to be a yearly FAD or something that we can consider a Diversity and Inclusion team's own event to review numbers, strategies, and so on.

+   We would love this to be a yearly FAD or something that we can consider a Diversity, Equity, & Inclusion team's own event to review numbers, strategies, and so on.

    We are sure that we will work on having a FAD to match our goals and we will be able to have a proper diversity (general) event.

    Link for this is link:{FWIKI}/FAD_Diversity_2017[here].

  6. **Diversity Panel**

  * The next Diversity Panel planning in process.

    More on this is https://pagure.io/fedora-diversity/issue/10[here] in the ticket.

- 7. **Diversity and Inclusion Team presence at Flock 2017**

+ 7. **Diversity, Equity, & Inclusion Team presence at Flock 2017**

  * Fedora Diversity Panel, and…

  * Women in Open Source

  * More information on Flock 2016 panels and talks can be found on these blog posts:

@@ -1,19 +1,19 @@ 

  include::{partialsdir}/attributes.adoc[]

  

- = Get involved with Fedora Diversity and Inclusion Team

+ = Get involved with Fedora Diversity, Equity, & Inclusion Team

  

- Diversity and Inclusion Team always welcomes new contributors. 

+ Diversity, Equity, & Inclusion Team always welcomes new contributors.

  Whether you are a newcomer or an old-timer, whether you can contribute frequently or sporadically, there are ways to get involved. 

- As a Diversity and Inclusion team member, you can:

+ As a Diversity, Equity, & Inclusion team member, you can:

  

- * Work closely with Fedora leadership to build initiatives from the ground-up which shape Diversity and Inclusion in Fedora community.

+ * Work closely with Fedora leadership to build initiatives from the ground-up which shape Diversity, Equity, & Inclusion in Fedora community.

  * Organize global events like Fedora Women's Day to support people from diverse backgrounds in taking their first steps in Fedora community.

  * Cross-collaborate with different teams like Localization to enable Fedora community members from diverse backgrounds to contribute effectively.

  * Organize community-building workshops and activities to foster inclusion in Fedora community.

  * Create outreach content like videos, infographics and blog posts to improve the visibility of underrepresented community members in Fedora community.

- * Research about Diversity and Inclusion initiatives in other open source communities and how they can be applied to Fedora community.

+ * Research about Diversity, Equity, & Inclusion initiatives in other open source communities and how they can be applied to Fedora community.

  

- Interested in helping the Fedora Diversity and Inclusion Team?

+ Interested in helping the Fedora Diversity, Equity, & Inclusion Team?

  This page explains the typical process for getting involved with our team.

  

  
@@ -31,7 +31,7 @@ 

  

  https://lists.fedoraproject.org/admin/lists/diversity.lists.fedoraproject.org[**Subscribe here!**]

  

- The Fedora Diversity and Inclusion Team uses a mailing list.

+ The Fedora Diversity, Equity, & Inclusion Team uses a mailing list.

  The mailing list is used for announcements, summaries of meetings, and a way to share longer-form content with the team.

  It is a good place to keep up with what we are up to!

  To join the mailing list, subscribe on https://lists.fedoraproject.org/admin/lists/diversity.lists.fedoraproject.org[lists.fedoraproject.org].
@@ -56,7 +56,7 @@ 

    Let us know what parts of Fedora you are involved in.

  * Are you an organizer of local events or programs?

    If you run any kind of event in your local community, let us know what you do.

- * What is interesting to you about the Fedora Diversity and Inclusion Team?

+ * What is interesting to you about the Fedora Diversity, Equity, & Inclusion Team?

    Our team is a collection of people with different interests and niches.

    Knowing each others' interests and what we like lets us connect each other to things we want to help out with.

  
@@ -64,7 +64,7 @@ 

  [[join-irc-telegram]]

  == Join IRC/Telegram/Matrix group chat

  

- The Fedora Diversity and Inclusion Team has a real-time group chat.

+ The Fedora Diversity, Equity, & Inclusion Team has a real-time group chat.

  We use this group chat for quick updates, friendly chatter, and running meetings.

  We use both an IRC channel on the https://freenode.net/[Freenode IRC network] and a Telegram chat group.

  Both are bridged to each other, so folks in IRC will see Telegram messages and vice versa.

file modified
+14 -15
@@ -1,9 +1,9 @@ 

  include::ROOT:partial$attributes.adoc[]

  

- = Diversity and inclusion in Fedora

+ = Diversity, equity, and inclusion in Fedora

@jflory7:
Like everywhere else, should we have E and I in equity and inclusion in upper case?

  :toc:

  

- Welcome to the documentation site for the Fedora D&I Team!

+ Welcome to the documentation site for the Fedora Diversity, Equity, & Inclusion Team!

  

  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.
@@ -18,7 +18,7 @@ 

  Meet the Fedora Community in Maria "tatica" Leandro's https://www.youtube.com/watch?v=O1eHRoEps6I[Flock to Fedora 2019] video from Budapest.

  

  A https://fedoraprojectpodcast.simplecast.com/episodes/fedora-diversity-inclusion-team[Fedora Podcast interview] also gives further insight into the purpose, objective and working process of the team.

- The podcast has interesting conversation between members of the D&I team and Eduard Lucena (@x3mboy).

+ The podcast has interesting conversation between members of the D.E.I. team and Eduard Lucena (@x3mboy).

  ====

  

  image::infographic-2020.png[Infographic with statistics about Fedora Women's Day since 2016. Created by Smera Goel.]
@@ -33,19 +33,18 @@ 

  === 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!

+ However, as the aims of Fedora Women and Fedora D.E.I. team align with each other, the D.E.I. team has taken up to organize Fedora Women's Day event, that aims to keep the goal of Fedora Women alive!

  

  Fedora Women aims to nurture the involvement of women (cis and trans) and genderqueer people in Fedora and other Free and Open Source Software projects.

  In addition, this community aims to bring awareness of contributions by women/non-binary in the Fedora Project.

  Regardless of one's gender, Fedora Women welcomes anyone who supports women's involvement in Fedora.

  

- 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 xref:events:index.adoc[variety of events] with an aim of fostering diversity and inclusion in Fedora community.

+ Fedora Diversity, Equity, & Inclusion team organizes and supports a xref:events:index.adoc[variety of events] with an aim of fostering diversity and inclusion in Fedora community.

  Our key focuses are to engage, empower, and celebrate the contributions of women, LGBT+, BIPOC, and people with disabilities in Free and Open Source projects and communities.

  If you are interested in working with us to organize events in your local community, {MAILINGLIST}[send us an email].

  We are always looking for new collaborators.
@@ -53,17 +52,17 @@ 

  [[demographic-survey]]

  === Demographic Survey

  

- In 2015/2016, the D&I Team drafted a xref:survey:index.adoc[demographic survey].

+ In 2015/2016, the D.E.I. Team drafted a xref:survey:index.adoc[demographic survey].

  This was intended to be a tool to better understand the demographics of the Fedora Community.

- However, due to data storage concerns and G.D.P.R., the D&I Team did not launch this survey.

+ However, due to data storage concerns and G.D.P.R., the D.E.I. Team did not launch this survey.

  It is retained here for historical purposes.

- The team hopes our research and work may be useful for other Open Source communities and Diversity & Inclusion programmes.

+ The team hopes our research and work may be useful for other Open Source communities and Diversity, Equity, & Inclusion programmes.

  

  

  [[find-team]]

- == Where to find Fedora D&I Team

+ == Where to find Fedora D.E.I. Team

  

- The Fedora D&I team uses the following communication platforms:

+ The Fedora D.E.I. team uses the following communication platforms:

  

  Mailing list:: {MAILINGLIST}[{MAILINGLIST}]

  IRC channel:: https://web.libera.chat/?channels=#fedora-diversity[#fedora-diversity] on https://libera.chat/[Libera IRC]
@@ -74,7 +73,7 @@ 

  This means it is best for questions or topics that someone may respond to later.

  It is better for longer, threaded discussions.

  

- The Fedora D&I IRC channel, Matrix room, and Telegram group are bridged together.

+ The Fedora D.E.I. IRC channel, Matrix room, and Telegram group are bridged together.

  They are best for _synchronous_ communication.

  This means it is best for quick feedback, like a conversation.

  It is helpful for real-time discussions or getting someone's attention.
@@ -87,7 +86,7 @@ 

  [[meetings]]

  == Meetings

  

- The Diversity and Inclusion team generally meets *every other week* on Thursdays at 14:00 UTC in `#fedora-diversity`.

+ The Diversity, Equity, & Inclusion team generally meets *every other week* on Thursdays at 14:00 UTC in `#fedora-diversity`.

  See the https://apps.fedoraproject.org/calendar/meeting/9784/[Fedocal meeting event] for more info.

  Meeting logs are available via https://meetbot.fedoraproject.org/sresults/?group_id=fedora-diversity&type=channel[Meetbot]

  
@@ -95,7 +94,7 @@ 

  

  

  [[get-involved]]

- == Get involved with the D&I Team

+ == Get involved with the D.E.I. Team

  

  * Are you willing to enhance diversity and inclusion in the Fedora Community?

  * Are you part of a local hackerspace, Linux User Group (LUG), or STEM community?
@@ -105,4 +104,4 @@ 

  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.

  

- See how to xref:get-involved.adoc[get involved with us] to start your journey with the Fedora D&I Team.

+ See how to xref:get-involved.adoc[get involved with us] to start your journey with the Fedora D.E.I. Team.

@@ -1,9 +1,9 @@ 

  include::{partialsdir}/attributes.adoc[]

  

- = D&I meeting guide

+ = D.E.I. meeting guide

  :toc:

  

- This guide contains instructions and recommendations for running Fedora Diversity and Inclusion Team team meetings.

+ This guide contains instructions and recommendations for running Fedora Diversity, Equity, & Inclusion Team team meetings.

  

  

  == How to add a ticket to meeting agenda
@@ -24,7 +24,7 @@ 

  This section includes a sample script of MeetBot meeting bot commnds with `zodbot` on Freenode IRC.

  

  ----

- #startmeeting Fedora Diversity & Inclusion Team (YYYY-MM-DD)

+ #startmeeting Fedora Diversity, Equity, & Inclusion Team (YYYY-MM-DD)

  #meetingname diversity

  #nick di-team

  #chair <active meeting participants>
@@ -41,7 +41,7 @@ 

  

  #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

@@ -2,13 +2,13 @@ 

  

  = 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 @@ 

  

  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.

  

  

file modified
+1 -1
@@ -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]

@@ -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.

+ ====

@@ -5,7 +5,7 @@ 

  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 @@ 

  

  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.

@@ -3,7 +3,7 @@ 

  = 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.

@@ -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.

+ ====

@@ -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.

+ ====

@@ -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.

+ ====

@@ -2,8 +2,8 @@ 

  

  = 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].

@@ -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.

+ ====

@@ -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.

+ ====

file modified
+1 -1
@@ -1,2 +1,2 @@ 

  * Role Handbooks

- ** xref:council-advisor.adoc[Council D&I Advisor]

+ ** xref:council-advisor.adoc[Council D.E.I. Advisor]

@@ -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 @@ 

  [[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 @@ 

    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 @@ 

  [[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 @@ 

  [[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 @@ 

  * 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 @@ 

  

  

  [[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

@@ -1,7 +1,7 @@ 

  include::ROOT:partial$attributes.adoc[]

  

  = About Fedora Project Demographic Survey

- Fedora Diversity & Inclusion Team <diversity@lists.fedoraproject.org>

+ Fedora Diversity, Equity, & Inclusion Team <diversity@lists.fedoraproject.org>

  :toc:

  

  This section documents the Fedora Project Demographic Survey research.
@@ -12,9 +12,9 @@ 

  

  [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 @@ 

  === 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

@@ -1,7 +1,7 @@ 

  include::ROOT:partial$attributes.adoc[]

  

  = Demographic Survey Questions

- Fedora Diversity & Inclusion Team <diversity@lists.fedoraproject.org>

+ Fedora Diversity, Equity, & Inclusion Team <diversity@lists.fedoraproject.org>

  v1.0.0

  :toc:

  
@@ -11,9 +11,9 @@ 

  

  [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.

  ====

  

  

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.

Metadata Update from @jflory7:
- Pull-request tagged with: new change, type - docs, type - internal organization
- Request assigned

2 years ago

rebased onto 1b1a6c6

2 years ago

@jflory7:
Like everywhere else, should we have E and I in equity and inclusion in upper case?

Hi @jflory7,
Thank you so much for this :raised_hands:
Everything is perfect except a small nitpick (left in review)
I can merge it right away after we have that change, what do you think?

Pull-Request has been merged by siddharthvipul1

2 years ago