From 212667bf8ec11561c61c66e8cf78a396823e188c Mon Sep 17 00:00:00 2001 From: Justin W. Flory (he/him) Date: Sep 06 2023 09:51:57 +0000 Subject: Deprecate Pagure and move to GitLab This commit is the final commit made to the Pagure repo for the DEI Team before the repository is set to read-only. The documentation is now migrated to its new home on GitLab. This PR finally unblocks #241 and we can say goodbye to Pagure and appreciate it for all that it provided for us in the last seven years. Signed-off-by: Justin W. Flory (he/him) --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 0b9bcd3..0000000 --- a/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -# Documentation artifacts -# Antora-specific rules for preview documentation -_package/ -_preview/ - -# Miscellaneous artifacts -build -cache -public diff --git a/.pagure/CONTRIBUTING.md b/.pagure/CONTRIBUTING.md deleted file mode 100644 index 8bf67ee..0000000 --- a/.pagure/CONTRIBUTING.md +++ /dev/null @@ -1,56 +0,0 @@ -How to contribute to D.E.I. Team documentation -============================================== - - - -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")? -See the [GitHub Guides](https://guides.github.com/) for getting started with git. -If you already know git, see the [Pagure documentation for Pull Requests](https://docs.pagure.org/pagure/usage/pull_requests.html) on how to submit contributions on pagure.io. - - -## How to edit these documents - -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: - -* [AsciiDoc Syntax - Quick Reference](http://asciidoctor.org/docs/asciidoc-syntax-quick-reference/) -* [AsciiDoc Recommended Practices](https://asciidoctor.org/docs/asciidoc-recommended-practices/) - - - - -## Test with a local preview - -This repo includes scripts to build and preview the contents of this repository. - -**NOTE**: Please note that if you reference pages from other repositories, those links will be broken in the local preview, as it only builds this repository. -If you want to rebuild the whole Fedora Docs site, see the [Fedora Docs build repository](https://pagure.io/fedora-docs/docs-fp-o/) for instructions. - -Both of the below scripts use Docker, so ensure Docker is installed on your system before beginning (see below for Fedora instructions). -See below for further instructions. - -To build and preview the site, run: - -```bash -./build.sh && ./preview.sh -``` - -The preview is hosted at [http://localhost:8080](http://localhost:8080). - -### Installing Docker on Fedora - -See the Fedora Developer Portal on [how to install Docker on Fedora](https://developer.fedoraproject.org/tools/docker/docker-installation.html "How to install Docker on Fedora"). diff --git a/README.md b/README.md index 1f9df14..7b7961a 100644 --- a/README.md +++ b/README.md @@ -1,34 +1,54 @@ -Fedora Diversity, Equity, & Inclusion Team -========================================== +# This repository is deprecated and set to read-only. - +The Fedora DEI Team moved to GitLab in 2023. +This repository was split into two repositories for a [task tracker](https://gitlab.com/fedora/dei/home) and our [documentation](https://gitlab.com/fedora/dei/docs). -[![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") -Ticket-based discussion and tasks for Fedora [Diversity, Equity, & Inclusion Team](https://docs.fedoraproject.org/en-US/diversity-inclusion/) +## FAQ +### I need to open a new ticket with the DEI Team. Where should I open it? -## What can I do here? +Do you have a new request for the Fedora DEI Team? +Visit the new [**team issue tracker**](https://gitlab.com/fedora/dei/home) on GitLab. +A [list of ongoing issues](https://gitlab.com/fedora/dei/home/-/issues) can be found. +Check if your new request relates to an ongoing issue. +If not, open a new issue. -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, 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/). +Using GitLab will improve response time as the DEI Team adapts its task-tracking workflows to GitLab. -**[Tickets planned for the next meeting are found here!](https://pagure.io/fedora-diversity/issues?status=Open&priority=20)** +### I already have a GitLab account but I cannot open a new issue or comment on existing issues. +You need to either link an existing GitLab account to your FAS account or make a new GitLab account via FAS. -## Where to find us +To link an existing GitLab account, **first sign into your GitLab account**. +Then, [**use this special URL**](https://gitlab.com/groups/fedora/-/saml/sso) to link your GitLab and FAS accounts together. +After linking, you will be able to participate fully in Fedora GitLab discussions and issues. -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: +To create a new GitLab account via FAS, use the special URL above and you will be prompted to create a GitLab account. -* **Discourse forum**: [https://discussion.fedoraproject.org/tag/dei](https://discussion.fedoraproject.org/tag/dei) -* **IRC channel**: #fedora-diversity on [Libera IRC](https://libera.chat/) [ [webchat](https://web.libera.chat/?channels=#fedora-diversity) ] -* **Telegram**: [@fedoradiversity](https://t.me/fedoradiversity) +### I already opened an issue here on Pagure. Do I need to take any action? +This repository is now set to read-only. +Closed issues from the past remain here as an historical archive. +Once tooling is available, Pagure issues will eventually be imported into a read-only GitLab repo for easier referencing from a GitLab workflow. -## How to contribute to docs -See [CONTRIBUTING.md](https://pagure.io/fedora-diversity/blob/master/f/.pagure/CONTRIBUTING.md). +## How to contact the DEI Team + +The Fedora DEI Team uses the following communication platforms: + +* _Asynchronous_: + [discussion.fedoraproject.org/tag/dei-team](https://discussion.fedoraproject.org/tag/dei-team) +* _Synchronous_: + [matrix.to/#/#dei:fedoraproject.org](https://matrix.to/#/#dei:fedoraproject.org) + +The Discourse forum is best for _asynchronous_ communication. +This means it is best for questions or topics that someone may respond to later. +It is better for longer, threaded discussions. + +The Matrix room is 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 more quickly. +For convenience, the Matrix room is also bridged to an IRC channel on the LiberaChat network: + +* _LiberaChat IRC web chat_: [#fedora-mindshare](https://web.libera.chat/?channels=#fedora-mindshare) diff --git a/antora.yml b/antora.yml deleted file mode 100644 index b426651..0000000 --- a/antora.yml +++ /dev/null @@ -1,24 +0,0 @@ -# Name will be mostly visible in the URL. Treat it as an indentifier. -# 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: 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 - -# 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 - -# Navbar element. Anything added below appears in the docs.fp.o site navbar. -# -# NOTE: If you want to add to the sidebar, look at the `nav.adoc` file in a -# module first. If you create a new module, add its `nav.adoc` file below. -nav: -- modules/ROOT/nav.adoc -- modules/survey/nav.adoc -- modules/events/nav.adoc -- modules/outreachy/nav.adoc -- modules/roles/nav.adoc -- modules/resources/nav.adoc diff --git a/build.sh b/build.sh deleted file mode 100755 index 2fa8f74..0000000 --- a/build.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh - -image="docker.io/antora/antora" -cmd="site.yml" - -if uname | grep -iwq darwin; then - # Running on macOS. - # Let's assume that the user has the Docker CE installed - # which doesn't require a root password. - echo "" - echo "This build script is using Docker container runtime to run the build in an isolated environment." - echo "" - docker run --rm -it -v "$(pwd):/antora" "${image}" ${cmd} - -elif uname | grep -iq linux; then - # Running on Linux. - # there isn't an antora/aarch64 container, antora can be installed locally - # Check whether podman is available, else faill back to docker - # which requires root. - - if [ -f /usr/local/bin/antora ]; then - /usr/local/bin/antora ${cmd} - elif uname -m | grep -iwq aarch64; then - echo "no antora/aarch64 container try just \`npm install -g @antora/cli @antora/site-generator-default\`" - elif [ -f /usr/bin/podman ]; then - echo "" - echo "This build script is using Podman to run the build in an isolated environment." - echo "" - podman run --rm -it -v "$(pwd):/antora:z" "${image}" ${cmd} - - elif [ -f /usr/bin/docker ]; then - echo "" - echo "This build script is using Docker to run the build in an isolated environment." - echo "" - - if groups | grep -wq "docker"; then - docker run --rm -it -v "$(pwd):/antora:z" "${image}" ${cmd} - else - echo "You might be asked for your password." - echo "You can avoid this by adding your user to the 'docker' group," - echo "but be aware of the security implications." - echo "See https://docs.docker.com/install/linux/linux-postinstall/" - echo "" - sudo docker run --rm -it -v "$(pwd):/antora:z" "${image}" ${cmd} - fi - else - echo "" - echo "Error: Container runtime haven't been found on your system. Fix it by:" - echo "$ sudo dnf install podman" - exit 1 - fi -fi diff --git a/modules/ROOT/assets/images/fwd/infographic-template.png b/modules/ROOT/assets/images/fwd/infographic-template.png deleted file mode 100644 index dac30eb..0000000 Binary files a/modules/ROOT/assets/images/fwd/infographic-template.png and /dev/null differ diff --git a/modules/ROOT/assets/images/fwd/infographic-template.svg b/modules/ROOT/assets/images/fwd/infographic-template.svg deleted file mode 100644 index f59914f..0000000 --- a/modules/ROOT/assets/images/fwd/infographic-template.svg +++ /dev/null @@ -1,3734 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/ROOT/assets/images/infographic-2020.png b/modules/ROOT/assets/images/infographic-2020.png deleted file mode 100644 index fda2511..0000000 Binary files a/modules/ROOT/assets/images/infographic-2020.png and /dev/null differ diff --git a/modules/ROOT/assets/images/infographic-2020.svg b/modules/ROOT/assets/images/infographic-2020.svg deleted file mode 100644 index a741159..0000000 --- a/modules/ROOT/assets/images/infographic-2020.svg +++ /dev/null @@ -1,28926 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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, Equity, & Inclusion team is committed to fostering diversity, equity, 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/assets/images/logo-icon.png b/modules/ROOT/assets/images/logo-icon.png deleted file mode 100644 index 40f430e..0000000 Binary files a/modules/ROOT/assets/images/logo-icon.png and /dev/null differ diff --git a/modules/ROOT/assets/images/logo.png b/modules/ROOT/assets/images/logo.png deleted file mode 100644 index 3cc916b..0000000 Binary files a/modules/ROOT/assets/images/logo.png and /dev/null differ diff --git a/modules/ROOT/assets/images/meetings/pagure-update-ticket-priority.png b/modules/ROOT/assets/images/meetings/pagure-update-ticket-priority.png deleted file mode 100644 index 2120828..0000000 Binary files a/modules/ROOT/assets/images/meetings/pagure-update-ticket-priority.png and /dev/null differ diff --git a/modules/ROOT/nav.adoc b/modules/ROOT/nav.adoc deleted file mode 100644 index 265c297..0000000 --- a/modules/ROOT/nav.adoc +++ /dev/null @@ -1,4 +0,0 @@ -* xref:get-involved.adoc[Get involved] -* xref:meetings.adoc[Team meeting guide] -* Policy -** xref:policy/decision-process.adoc[Decision-making process] diff --git a/modules/ROOT/pages/events.adoc b/modules/ROOT/pages/events.adoc deleted file mode 100644 index 3ba12f0..0000000 --- a/modules/ROOT/pages/events.adoc +++ /dev/null @@ -1,71 +0,0 @@ -include::{partialsdir}/attributes.adoc[] - -= 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, 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, 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]] -== Event list - -1. **FWD (Fedora Week of Diversity)** -* link:Fedora_Women_Day_2016[Fedora Women's Day] was a day to celebrate and thank the women contributors across the Fedora Project. - It was celebrated every year on (or near) July 15, the anniversary of the Fedora Women project in 2006, until it was expanded to the Fedora Week of Diversity. -* The 2016 event was a success and we would love to host it again. - We will pre-plan this in advance, create the resources we need to spread it wider to include more people. - The link for the 2016 page is link:Fedora_Women_Day_2016[here]. -* Areas to improve on for 2017: -** Communication and coordination with regional Ambassadors -** Reaching out to more local communities ahead of time (including existing teams like Open Labs in Albania and other groups in Greece and India) -*** #idea http://wic.rit.edu/[WiC at RIT]? -** Providing resources / slide decks ahead of time for event organizers (common foundation for local events) -** Time zone planning (WhenIsGood poll could be helpful for planning times with regional organizers for video calls with xref:council:ROOT:diversity-advisor.adoc[Diversity Adviser] / other team members -2. **FLISoL** -* https://en.wikipedia.org/wiki/FLISOL[FLISoL], an acronym for Festival Latinoamericano de Instalación de Software Libre (Latin American free software install fest), is the biggest event for spreading Software Libre in Latin America since 2005. - It is performed simultaneously in different countries of Latin America. - In 2012, more than 290 cities from - 20 countries participated on a FLISoL. -* Our Fedora xref:council:ROOT:diversity-advisor.adoc[Diversity Adviser], link:{FWIKI}/User:Jonatoni[Jonatoni], will make some efforts to put a Fedora Diversity talk in as many locations as she can. - This will help target the "Latam-Hispanic" group. - We can align our regional / local events to support this. -3. **LGBT community** -* To raise awareness, we will also hold some activities for the LGBT community. - However, since the worldwide celebration of International Day Against Homophobia, Transphobia, and Biphobia would be on Wednesday, May 17, 2017, we could do it on *Saturday, May 20, 2017*. - A panel like we did for FWD might be fantastic. -4. **Disabilities** -* We will include a day to celebrate those who, despite the adversity, have conquered their disabilities to work with us at Fedora. - The International Day of Persons with Disabilities will be next on *Saturday, December 3, 2017*. - 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, 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, 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: -** https://whatamithinks.wordpress.com/2016/08/15/480/ -** https://blog.justinwflory.com/2016/08/fedora-flock-2016/ - - -[[links]] -== Links - -1. https://en.wikipedia.org/wiki/International_Day_Against_Homophobia,_Transphobia_and_Biphobia -2. https://en.wikipedia.org/wiki/United_Nations%27_International_Day_of_Persons_with_Disabilities - - -[[additional-information]] -== Additional information - -* link:{FWIKI}/How_to_organize_a_Fedora_event[Organization] -- event organization, budget information, and regional responsibility. -* link:Event_reports[Event reports] -- guidelines and suggestions. -* link:Event_Wiki_Template[Event Wiki Template] -- template for Event pages diff --git a/modules/ROOT/pages/get-involved.adoc b/modules/ROOT/pages/get-involved.adoc deleted file mode 100644 index cbd542b..0000000 --- a/modules/ROOT/pages/get-involved.adoc +++ /dev/null @@ -1,126 +0,0 @@ -include::ROOT:partial$attributes.adoc[] - -= Get involved with {team_name} - -The {team_name} 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 {team_name} member, you can: - -* 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 Week of Diversity 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, Equity, & Inclusion initiatives in other open source communities and how they can be applied to Fedora community. - -Interested in helping the {team_name}? -This page explains the typical process for getting involved with our team. - - -[[create-fas-account]] -== Create Fedora Account System (FAS) account - -All contributors to Fedora need to register in the link:https://accounts.fedoraproject.org/[Fedora Account System]. -New contributors are asked to sign the xref:legal::fpca.adoc[Fedora Project Contributor Agreement] (FPCA). -This is not a copyright assignment agreement, but ensures your contributions to Fedora have acceptable licensing terms. -If you need help with this, contact the xref:infra::day_to_day_fedora.adoc[Fedora Infrastructure Team]. - - -[[forum]] -== Discourse forum - -We have a tag on link:{team_asynch_communication}[Fedora Discussion] (the Fedora community forum) where team topics are discussed. - -[[forum-introduction]] -=== Introduce yourself - -If you want to get involved, we want to get to know you! -*Post a self-introduction on the link:{team_asynch_communication}[#dei-team tag on Fedora Discussion]*. -This is a helpful step for other folks on the {team_name} to get to know you. - -Not sure what to say? -Consider these questions when introducing yourself: - -* Are you new to the Fedora community? - If so, what was interesting to you about Fedora? -* Are you involved with other communities? - Tell us about what you do in other communities or projects. -* Do you already contribute to Fedora? - 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 {team_name}? - 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. - - -[[chat]] -== Join Matrix chat room - -The {team_name} has a real-time chat room on Matrix. -We use the chat room for quick updates, friendly chatter, and running meetings. -Use link:{team_synch_communication}[this link] to join from your preferred Matrix client. -Don't forget to say hi when you join! - - -[[attend-meeting]] -== Attend a meeting - -link:{team_meetings}[**Find our next meeting on our calendar!**] - -The {team_name} usually holds a fortnightly meeting over Jitsi Meet to review ongoing work and plan new work. -It is a good opportunity to say hello and meet other team members in real-time while seeing how we work. -See the xref:meetings.adoc[team meeting guide] for how our meetings work, including the xref:meetings.adoc#social-agreement[social agreement] and xref:meetings.adoc#format[meeting format]. - - -[[tickets]] -== Ticket-based task management - -The next step to get involved is to review our ticket tracker and look for a task that is interesting to you. -Our open tickets are in our link:{team_issue_tracker}[GitLab repository]. -New tasks are added as "issues" into GitLab. - -See a ticket that looks interesting? -If someone is not already assigned, leave a comment and ask how you can help. -Another member of the team will get back to you with feedback. -This is an opportunity to get casual mentoring on a task. - -Alternatively, do you think something is missing or could be improved in the Fedora community? -Open a new ticket with your idea or suggestion. -Our best ideas come from a wide range of people with different backgrounds, experiences, and perspectives. -Whether you are new to the Fedora community or are a long-time contributor, you might have the next great idea for the team. -Open a new ticket and we can discuss more about your idea or suggestion. - - -[[sponsorship]] -== Team sponsorship - -When someone is considered a full voting member of the {team_name}, we call this person a *sponsored member*. -After spending time contributing with the {team_name}, you can join the team in a formal capacity as a full voting member. -The process to become sponsored is as follows: - -. Talk to a member(s) of the {team_name} to find a sponsor. - You can see a list of sponsored team members in the https://accounts.fedoraproject.org/group/diversity-team/[`diversity-team` Fedora Account System group]. -. Sponsor will open a "New Team Member" ticket on the {team_name} ticket tracker. -. Ticket will be open for two weeks for others members to vote and/or give commentary about your team membership. -.. If we do not reach consensus in the two-week period, it can be extended for another two weeks. -.. A negative vote halts the process and requires discussion. -. Full consensus is required for you to join the {team_name}. - This means at least three +1 votes and no -1 votes. -. If consensus is met, you will then be added to the Fedora Account System (FAS) group. - -Sponsors will evaluate your membership in a couple of ways: - -* *Ability to work cooperatively with peers*. -** By the interactions potential members have in meetings and in channel. -** By how potential members respond to criticism. -** By how potential members participate on the forum, chat room, and ticket trackers. -* *Community involvement beyond the {team_name}*. -** By the interactions potential members have in the Fedora community. -** Does the potential member engage on the forum, chat room, and ticket trackers? - Do they show a helpful attitude and respect for other ideas of others? -* *Commitment and follow-through*. -** By time already given to the {team_name}. -** By how well potential members stick with the process through tough issues. -** By how potential members engage on difficult topics in a constructive way. -** By regularly showing up in meetings or the chat rooms. diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc deleted file mode 100644 index 1e7ec87..0000000 --- a/modules/ROOT/pages/index.adoc +++ /dev/null @@ -1,101 +0,0 @@ -include::ROOT:partial$attributes.adoc[] - -= {team_name} - -image::logo.png[Team logo for the Fedora DEI Team. A round, blue circle appears with three hands reaching up toward the air. The workmark "Fedora DEI Team" appears next to the circle.] - -{team_summary} - -Inclusion is not about just being respectful to each other; -it is also to make the community accessible to groups from under-represented, disabled and many other communities. -xref:diversity-inclusion:resources:resources.adoc[DEI Resources page] has valuable information for someone looking to learn more on the topic. - -While the Fedora Project is open to contributions from everyone, our community stands strong on pillars of mutual respect, tolerance, and encouragement. -Please review the xref:project::code-of-conduct.adoc[Fedora Code of Conduct] for more information. - -[NOTE] -==== -Want to know more about the Fedora community and our work? -Meet the Fedora community in Maria "tatica" Leandro's https://www.youtube.com/watch?v=O1eHRoEps6I[Flock to Fedora 2019] video from Budapest. -==== - -image::infographic-2020.png[Infographic with statistics about Fedora Women's Day since 2016 (now expanded to Fedora Week of Diversity). Created by Smera Goel.] - - -[[what-we-do]] -== What we do - -We track link:{team_issue_tracker}[ongoing work] through tickets. - -[[fedora-women]] -=== Fedora Women - -The link:{FWIKI}/Women[Fedora Women] team is no longer active. -However, as the aims of Fedora Women and {team_name} align with each other, the {team_name} has taken up to organize the Fedora Week of Diversity event, that aims to keep the goal of Fedora Women alive! - -Fedora Women aims to nurture the involvement of women (cis and trans) and gender-queer 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. - -[[events]] -=== Events - -The {team_name} organizes and supports a xref:events:index.adoc[variety of events] with an aim of fostering diversity, equity, 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, link:{team_asynch_communication}[reach out to our team]. -We are always looking for new collaborators. - -[[demographic-survey]] -=== Demographic Survey - -In 2015/2016, the {team_name} 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 GDPR, the {team_name} did not launch this survey. -It is retained here for historical purposes. -The {team_name} hopes our research and work may be useful for other Open Source communities and Diversity, Equity, & Inclusion programmes. - - -[[find-team]] -== Where to find {team_name} - -The {team_name} uses the following communication platforms: - -Asynchronous:: link:{team_asynch_communication}[{team_asynch_communication}] -Synchronous:: link:{team_synch_communication}[{team_synch_communication}] - -The Discourse forum is best for _asynchronous_ communication. -This means it is best for questions or topics that someone may respond to later. -It is better for longer, threaded discussions. - -The {team_name} Matrix room is 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 more quickly. -For convenience, the Matrix room is also bridged to an IRC channel on the LiberaChat network: - -LiberaChat IRC web chat:: link:https://web.libera.chat/?channels=#fedora-diversity[#fedora-diversity] - - -[[meetings]] -== Meetings - -The {team_name} holds a bi-weekly meeting over a Jitsi call to review on-going work and determine next steps on current work. -The meeting format is intended to be quick updates and long discussion. -It is a good opportunity to say hello and meet other members of the team in real-time while seeing how we work. - -link:{team_meetings}[**Find our next meeting on our calendar!**] - -If you are interested in attending or chairing our meetings, see the xref:meetings.adoc[meeting guide] for more information. - - -[[get-involved]] -== Get involved with the {team_name} - -* Are you willing to improve diversity, equity, and inclusion in the Fedora community? -* Are you part of a local hackerspace, Linux User Group (LUG), or STEM community? -* Are you involved in Open Source projects beyond Fedora? - -If you said YES to one or more points above, you are at the right place! -Our team always looks forward to working with folks from diverse backgrounds. -We believe everyone can bring value to our goal in one way or the other. - -See how to xref:get-involved.adoc[get involved with us] to start your journey with the {team_name}. diff --git a/modules/ROOT/pages/meetings.adoc b/modules/ROOT/pages/meetings.adoc deleted file mode 100644 index b3f64bb..0000000 --- a/modules/ROOT/pages/meetings.adoc +++ /dev/null @@ -1,104 +0,0 @@ -include::ROOT:partial$attributes.adoc[] - -= Team meeting guide - -This guide contains instructions and recommendations for running {team_name} meetings. - - -[[social-agreement]] -== Social agreement - -The social agreement is our social rules and etiquette for how we treat each other during meetings. -This keeps our meetings productive and gives everyone an opportunity to be heard: - -* Focus on listening -* Stay present as much as possible, refrain from email/chat/etc -* Let everyone have a chance to speak, be aware of how much time you are talking -* Be mindful of the meeting schedule and help to move the dialog forward -* Use the raise hand function -* Stay on mute when you are not speaking - - -[[format]] -== Format - -Since 24 October 2020, the {team_name} adopted this format for structuring team meeting agendas: - -. Intros, welcomes, hellos - (5 minutes) -. Team announcements & news - (5-10 minutes) -. Follow-ups from last meeting, if any - (5-10 minutes) -. Ticket discussions - (remaining time) -. Open floor - (final 5-10 minutes) - - -[[add-ticket]] -== How to add a ticket to meeting agenda - -Add tickets to the next meeting agenda by changing a ticket priority to *next meeting*. -First, open a Pagure ticket and look in the metadata sidebar to the right. -Click the edit pencil towards the top and change the priority field. -The ticket will automatically go onto the queue for meeting discussion. - -Generally, ticket assignee is responsibile to add a ticket to the next meeting agenda. -If you are working on a ticket and want feedback in a meeting, please remember to change the ticket priority to put it on the agenda. - -image::meetings/pagure-update-ticket-priority.png[Screenshot of how to update Pagure ticket priority field] - - -[[meetbot-script]] -== MeetBot command script - -This section includes a sample script of MeetBot meeting bot commnds with `zodbot` on Freenode IRC. - ----- -#startmeeting Fedora Diversity, Equity, & Inclusion Team (YYYY-MM-DD) -#meetingname diversity -#nick di-team -#chair - - -#topic Agenda - -#info (1) Roll call / introductions -#info (2) Announcements -#info (3) Action items from last meeting -#info (4) Tickets -#info (5) Open floor - - -#topic Roll call / introductions - -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 - -#info === "" === -#link - - -#topic Action items from last meeting - -#link [ link to last meeting minutes: https://meetbot.fedoraproject.org/sresults/?group_id=diversity&type=team ] -#info How This Works: We review past #action items from the last meeting. For each task, we get a quick update on status and move forward. - -#info === [] "" === -#link - - -#topic Tickets -#link https://pagure.io/fedora-diversity/issues?status=Open&priority=20 - -#topic Ticket #: "" -#link https://pagure.io/fedora-diversity/issue/ -#info [ any updates to share for meeting discussion ] - -#topic Open floor - -#endmeeting ----- diff --git a/modules/ROOT/pages/policy/decision-process.adoc b/modules/ROOT/pages/policy/decision-process.adoc deleted file mode 100644 index 75bacb6..0000000 --- a/modules/ROOT/pages/policy/decision-process.adoc +++ /dev/null @@ -1,42 +0,0 @@ -include::{partialsdir}/attributes.adoc[] - -= Decision-making process - -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, Equity, & Inclusion Team FAS group] are eligible to vote. - -=== Lazy Approval - -This means general consent is assumed unless valid objections are raised within a specific period of time i.e. 5 days along with minimum two positive vote (+1) and no -1's. -Votes can be cast by any approved member of diversity team. -This process is used for decisions with short-term consequences and which can be easily reversed. -Any team member can ask for the deadline to be extended or the decision escalated to require full consensus. - -=== Full Consensus - -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, 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.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.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. - - -[[references]] -== References - -* https://pagure.io/fedora-diversity/issue/98[fedora-diversity#98] diff --git a/modules/ROOT/partials/attributes.adoc b/modules/ROOT/partials/attributes.adoc deleted file mode 100644 index 0f78c4a..0000000 --- a/modules/ROOT/partials/attributes.adoc +++ /dev/null @@ -1,33 +0,0 @@ -// This is a data store of information about the Fedora DEI team. - -// Team name: -:team_name: Fedora Diversity, Equity, & Inclusion (DEI) Team - -// Team summary: -:team_summary: The {team_name} encourages, supports, and enables DEI in the Fedora community. We work with the community to create an environment where everyone feels empowered to be a part of and contribute to the Fedora Project. - -// Team page URL: -:team_url: https://docs.fedoraproject.org/en-US/diversity-inclusion/ - -// Team activity status. -// Choose from: Active, Inactive -:team_status: Active - -// Preferred asynchronous communication channel -:team_asynch_communication: https://discussion.fedoraproject.org/tag/dei-team - -// Preferred synchronous communication channel -:team_synch_communication: https://matrix.to/#/#dei:fedoraproject.org - -// Issue tracker -:team_issue_tracker: https://gitlab.com/fedora/dei/home/ - -// Meetings -:team_meetings: https://apps.fedoraproject.org/calendar/diversity-team/ - -// Imported from our old attributes file. -:COMMBLOG: https://communityblog.fedoraproject.org -:FISCALYEAR: FY20 -:FWIKI: https://fedoraproject.org/wiki -:YEAR: 2023 -:MAJOROSVER: 37 diff --git a/modules/events/nav.adoc b/modules/events/nav.adoc deleted file mode 100644 index 503163d..0000000 --- a/modules/events/nav.adoc +++ /dev/null @@ -1,10 +0,0 @@ -* xref:index.adoc[D.E.I. Events] -** xref:flock-social-events.adoc[Flock Social Events] -** Fedora Week of Diversity -*** 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/flock-social-events.adoc b/modules/events/pages/flock-social-events.adoc deleted file mode 100644 index 1d3e36b..0000000 --- a/modules/events/pages/flock-social-events.adoc +++ /dev/null @@ -1,7 +0,0 @@ -[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.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 deleted file mode 100644 index a9242dc..0000000 --- a/modules/events/pages/fwd-resource-pack.adoc +++ /dev/null @@ -1,120 +0,0 @@ -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 Week of Diversity] event. The points below can be used in the event organizer's agenda: - - * How to welcome contributors to Fedora - * A summary about Fedora D.E.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, Equity, & Inclusion Team - -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, 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 Week of Diversity!) -* Supporting community building and engagement activities to promote inclusion -* 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.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. -In the past, we also worked on a xref:survey:index.adoc[Fedora Project Demographic Survey] to understand who is in the Fedora Community. - -Community Script:: -Hi, my name is \_____, I am from \_____, I am \_____, and I speak \_____. -We are from different countries, We speak different languages, We are of different cultures, But Fedora unites us with Open Source. WE ARE FEDORA! - -== 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]. - -* Check out this overview of notable features in Fedora's recent release link:https://fedoramagazine.org/announcing-fedora-{MAJOROSVER}/[here]. - -* For a comprehensive description of updates and new features, see the official release notes link:https://docs.fedoraproject.org/en-US/fedora/f{MAJOROSVER}/release-notes/[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/fwd/about-fwd.adoc b/modules/events/pages/fwd/about-fwd.adoc deleted file mode 100644 index 661714f..0000000 --- a/modules/events/pages/fwd/about-fwd.adoc +++ /dev/null @@ -1,13 +0,0 @@ -include::ROOT:partial$attributes.adoc[] - -= About Fedora Week of Diversity - -Fedora Week of Diversity highlights and celebrates the women/non-binary contributers in open source communities like Fedora and beyond. -Fedora Week of Diversity 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 diverse contributors across Fedora to connect and network with one another. -Fedora Week of Diversity highlights and celebrates the diverse members of open source communities like Fedora and their contributions to their projects and community. -They are also an opportunity for diverse people 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 diverse people to connect, learn, and be inspired by each other in open source communities and beyond. - -image:ROOT:fwd/infographic-template.png[Infographic about the Fedora Week of Diversity event. Created by Smera Goel.] diff --git a/modules/events/pages/fwd/history.adoc b/modules/events/pages/fwd/history.adoc deleted file mode 100644 index 1d3e36b..0000000 --- a/modules/events/pages/fwd/history.adoc +++ /dev/null @@ -1,7 +0,0 @@ -[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.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 deleted file mode 100644 index 1d3e36b..0000000 --- a/modules/events/pages/fwd/organize.adoc +++ /dev/null @@ -1,7 +0,0 @@ -[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.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 deleted file mode 100644 index 1d3e36b..0000000 --- a/modules/events/pages/fwd/participate.adoc +++ /dev/null @@ -1,7 +0,0 @@ -[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.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 deleted file mode 100644 index 82854e6..0000000 --- a/modules/events/pages/index.adoc +++ /dev/null @@ -1,9 +0,0 @@ -include::ROOT:partial$attributes.adoc[] - -= 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, 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 deleted file mode 100644 index 1d3e36b..0000000 --- a/modules/events/pages/past-events.adoc +++ /dev/null @@ -1,7 +0,0 @@ -[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.E.I. Pagure issue tracker] to see where you can get involved. -==== diff --git a/modules/outreachy/nav.adoc b/modules/outreachy/nav.adoc deleted file mode 100644 index 0066cdc..0000000 --- a/modules/outreachy/nav.adoc +++ /dev/null @@ -1 +0,0 @@ -* xref:about.adoc[Outreachy] \ No newline at end of file diff --git a/modules/outreachy/pages/about.adoc b/modules/outreachy/pages/about.adoc deleted file mode 100644 index 1d3e36b..0000000 --- a/modules/outreachy/pages/about.adoc +++ /dev/null @@ -1,7 +0,0 @@ -[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.E.I. Pagure issue tracker] to see where you can get involved. -==== diff --git a/modules/resources/nav.adoc b/modules/resources/nav.adoc deleted file mode 100644 index cd1aa64..0000000 --- a/modules/resources/nav.adoc +++ /dev/null @@ -1 +0,0 @@ -* xref:resources.adoc[Recommended Resources] diff --git a/modules/resources/pages/resources.adoc b/modules/resources/pages/resources.adoc deleted file mode 100644 index 5c3f540..0000000 --- a/modules/resources/pages/resources.adoc +++ /dev/null @@ -1,74 +0,0 @@ -= DEI Resource page - -IMPORTANT: This resource page is meant to be a guide for folks who are interested in learning more about why we do what we do. This is not meant to be a source of truth in any way but just some resources the team can vouch to be a good learning place. Contribution is welcomed and appreciated! - -== Guides - -**English** - -* https://students.wustl.edu/glossary-bias-terms/[Glossary of Bias Terms] -* https://buffer.com/resources/inclusive-language-tech/[Inclusive Language and Vocabulary for Startups and Tech] - -**French** - -* https://www.un.org/fr/gender-inclusive-language/guidelines.shtml[Orientations pour un langage inclusif en français] -* https://www.noslangues-ourlanguages.gc.ca/fr/blogue-blog/respecter-la-non-binarite-de-genre-fra[Respecter la non-binarité de genre en français] - - -== Short Courses [30-120 minutes] - -* https://trainingportal.linuxfoundation.org/learn/course/inclusive-open-source-community-orientation-lfc102/introduction/course-information[Inclusive Open Source Community Orientation by The Linux Foundation] - -TIP: Take this course to claim the https://badges.fedoraproject.org/badge/inclusive-open-source-community-orientation[Inclusive Open Source Community Orientation badge] - -== Extensive Courses [>4 hours] - -* https://www.coursera.org/learn/diversity-inclusion-workplace[Diversity and inclusion in the workplace] -* https://www.edx.org/course/leading-with-effective-communication-inclusive-lea[Leading With Effective Communication (Inclusive Leadership Training)] - -== Communities -TIP: These communities are outside of Fedora but actively meet and discuss different topics, host events, and more. - -=== LGBTQ+ Focused -* https://outintech.com/[Out in Tech] -* https://lesbianswhotech.org[Lesbians Who Tech] -* https://prideinstem.org/[Pride in STEM] - -=== Women's Focused -* https://www.womenwhocode.com/[Women Who Code] -* https://railsgirls.com/[Rails Girls: Ruby on Rails Focused] -* https://pyladies.com/[PyLadies: Python Focused] - -== Books - -* https://www.goodreads.com/book/show/45358681-hacking-diversity?ac=1&from_search=true&qid=X1rcWShvWw&rank=1[Hacking Diversity] -* https://www.goodreads.com/book/show/30816008-inclusive-design-patterns---coding-accessibility-into-web-design[Inclusive Design Patterns - Coding Accessibility Into Web Design] -* https://www.goodreads.com/book/show/6649312-whistling-vivaldi[Whistling Vivaldi] -* https://www.goodreads.com/book/show/22085568-the-culture-map[The Culture Map] - - -== Tools - -* https://www.racialequitytools.org/[racialequitytools] - -This site is a starting place to learn about the organizational and societal dynamics of racial inclusion and equity. The lens is race, but the lessons are more broadly applicable. Organized for action, it will help you understand how to get started and what a process might be for exploring DEI in your own organization. - - -== Articles - -* https://opensource.com/article/17/9/diversity-and-inclusion-innovation[Diversity and inclusion: Stop talking and do your homework] - - -== Studies - -* https://link.springer.com/article/10.1007/BF01068252#page-1[The semantics of grammatical gender: A cross-cultural study] -* https://www.sciencedaily.com/releases/2006/04/060410162259.htm[Racial Diversity Improves Group Decision Making In Unexpected Ways, According To Tufts University Research] -* https://www.pnas.org/content/111/52/18524.abstract[Ethnic diversity deflates price bubbles] - - -== Existing Resources Pages* - -* https://opensourcediversity.org/[Open Source Diversity] -* https://thesafezoneproject.com/[The Safe Zone Project: Free LGBTQ+ Curriculum, Activities, & Resources!] -* https://www.educause.edu/about/diversity-equity-and-inclusion/resources[Diversity, Equity, and Inclusion Resources] - diff --git a/modules/roles/nav.adoc b/modules/roles/nav.adoc deleted file mode 100644 index 7da9b13..0000000 --- a/modules/roles/nav.adoc +++ /dev/null @@ -1,2 +0,0 @@ -* Role Handbooks -** 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 deleted file mode 100644 index 1245e7f..0000000 --- a/modules/roles/pages/council-advisor.adoc +++ /dev/null @@ -1,182 +0,0 @@ -include::ROOT:partial$attributes.adoc[] -:page-aliases: council:ROOT:diversity-advisor.adoc - -= 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, 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.E.I. Advisor - -[.profile-picture] -image::https://seccdn.libravatar.org/avatar/c72ce27c1c9008d3a3745ea354de86fa?s=400&d=retro[Vipul Siddharth (he/him)] - -https://vipul.dev/about/[Vipul Siddharth] (he/him) works on CI and Infrastructure team in the Community Platform Engineering at Red Hat. -He was a contributor long before that too. -More coming soon after the Fedora 34 release cycle winds down and we begin working on Fedora 35. - - -[[duration]] -== Duration of service - -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.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.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.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 - -* *Hackfests*: - See https://communityblog.fedoraproject.org/tag/council-hackfest-2019/[Matthew Miller's four-part report] about the November 2019 Council hackfest. - https://pagure.io/Fedora-Council/tickets/issue/331[Fedora-Council/tickets#331] also shows an example of the planning for a hackfest. -* *Council meetings*: - Sometimes https://meetbot.fedoraproject.org/sresults/?group_id=council&type=team[in text], sometimes https://www.youtube.com/playlist?list=PL0x39xti0_64uSci6Wqk_E-IMSyq6vEuE[on video]. -* *Synergies and collaborations*: - See https://pagure.io/Fedora-Council/tickets/issue/306[Fedora-Council/tickets#306], which discussed renaming the dist-git default branch from `master` to `main`. - This only represents one small part of the (publicly archived) conversation, but there is more behind-the-scenes work that involves talking to other members of the Fedora Community. - Another example is https://pagure.io/Fedora-Council/tickets/issue/335[Fedora-Council#335], which was a proposal for the link:{FWIKI}/Objectives/CommunityOutreachRevamp[Fedora Community Outreach Revamp]. - 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.E.I. Team - -* 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.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.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.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. - -[[responsibilities-community]] -=== To Fedora Community - -* 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 -* Act as a source of support and/or mediator in concerns or incidents -* Make explicit invitations for Fedora Community events and provide financial support to do so when needed -* Promote inclusion in the Fedora Community - -[[responsibilities-community-examples]] -==== Examples - -There are fewer concrete examples of what meeting responsibilities to the Fedora Community looks like. -This is deeply personal and varies between Council Advisors. -It is also a unique opportunity to take a creative spin to how each Council Advisor approaches the role. -There is always room for new ideas and approaches on how to best serve the needs of the Fedora Community and encourage inclusion across Fedora. - - -[[selection]] -== Selection - -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.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.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.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.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: - -* Nominee must be a member of `fedora-diversity` F.A.S. group -* 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.E.I. Advisor to the Council as soon as possible. - - -[[contact]] -== Contact - -Get in touch with the Fedora D.E.I. Advisor in the following places: - -* *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*: - https://t.me/fedoradiversity[@fedoradiversity] -* *Email*: - diversity `AT` fedoraproject `DOT` org - - -[[history]] -== History of Fedora D.E.I. Advisor - -|=== -|Releases | Advisor - -|35, 36, … -|{FWIKI}/User:Siddharthvipul1[Vipul Siddharth] - -|33, 34 -|{FWIKI}/User:Jflory7[Justin W. Flory] - -|29, 30, 31, 32 -|{FWIKI}/User:Jonatoni[Jona Azizaj] - -|27, 28 -|{FWIKI}/User:Amsharma[Amita Sharma] - -|23, 24, 26, 26 -|{FWIKI}/User:Tatica[Maria "tatica" Leandro] -|=== - - -[[appendix]] -== Appendix - -[[hackfest]] -Hackfest:: -A hackfest is a multi-day "team sprint" where Fedora contributors gather together to work towards one or two clear objectives or goals. -Pre-COVID, teams could propose their own budgets for arranging travel, booking accommodations and a venue, and other support costs for bringing people together. -During COVID, hackfests sometimes take the form of multi-day events spread out over multiple weeks, i.e. one 4-5 hour call a week for diff --git a/modules/survey/nav.adoc b/modules/survey/nav.adoc deleted file mode 100644 index 7f979aa..0000000 --- a/modules/survey/nav.adoc +++ /dev/null @@ -1,4 +0,0 @@ -* 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 deleted file mode 100644 index b68f567..0000000 --- a/modules/survey/pages/index.adoc +++ /dev/null @@ -1,74 +0,0 @@ -include::ROOT:partial$attributes.adoc[] - -= About Fedora Project Demographic Survey -Fedora Diversity, Equity, & 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, 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. -==== - - -[[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, 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 -** 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 deleted file mode 100644 index a512b44..0000000 --- a/modules/survey/pages/questions.adoc +++ /dev/null @@ -1,262 +0,0 @@ -include::ROOT:partial$attributes.adoc[] - -= Demographic Survey Questions -Fedora Diversity, Equity, & 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, 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. -==== - - -[[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 deleted file mode 100644 index 7254320..0000000 --- a/modules/survey/pages/resources.adoc +++ /dev/null @@ -1,18 +0,0 @@ -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] diff --git a/preview.sh b/preview.sh deleted file mode 100755 index 4270107..0000000 --- a/preview.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -if [ "$(uname)" = "Darwin" ]; then - # Running on macOS. - # Let's assume that the user has the Docker CE installed - # which doesn't require a root password. - echo "The preview will be available at http://localhost:8080/" - docker run --rm -v "$(pwd):/antora:ro" -v "$(pwd)/nginx.conf:/etc/nginx/conf.d/default.conf:ro" -p 8080:80 nginx - -elif [ "$(expr substr "$(uname -s)" 1 5)" = "Linux" ]; then - # Running on Linux. - # Fedora Workstation has python3 installed as a default, so using that - echo "" - echo "The preview is available at http://localhost:8080" - echo "" - cd ./public - python3 -m http.server 8080 -fi diff --git a/site.yml b/site.yml deleted file mode 100644 index da5086d..0000000 --- a/site.yml +++ /dev/null @@ -1,20 +0,0 @@ -site: - title: Local Preview - start_page: diversity-inclusion::index -content: - sources: - - url: . - branches: HEAD -ui: - bundle: - url: https://asamalik.fedorapeople.org/ui-bundle.zip - snapshot: true - default_layout: with_menu -output: - clean: true - dir: ./public - destinations: - - provider: archive -runtime: - fetch: true - cache_dir: ./cache