From c898f886a35489a46b5c4c21ea964fd39c72a88c Mon Sep 17 00:00:00 2001 From: nasirhm Date: May 03 2020 18:38:45 +0000 Subject: [PATCH 1/18] Updation: index.adoc - Code of Conduct link fixed --- diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc index 4395c34..6d38dcf 100644 --- a/modules/ROOT/pages/index.adoc +++ b/modules/ROOT/pages/index.adoc @@ -4,7 +4,7 @@ include::{partialsdir}/attributes.adoc[] The Fedora Project welcomes and encourages participation by everyone. Our community is based on mutual respect, tolerance, and encouragement, and we are working to help each other live up to these principles. -Please, refer to our https://getfedora.org/code-of-conduct[Code of Conduct] if you need more information. +Please, refer to our https://docs.fedoraproject.org/en-US/project/code-of-conduct/[Code of Conduct] if you need more information. Fedora Diversity and Inclusion team is committed to fostering diversity and inclusion in Fedora community. You can watch our recent video showcasing the Fedora community https://youtu.be/Ig0gnM9jsm0[here]. From 12ffe768e0d01d8752193ec6736d2620c3387cdf Mon Sep 17 00:00:00 2001 From: nasirhm Date: May 03 2020 18:47:09 +0000 Subject: [PATCH 2/18] Updated: team.adoc - Mailing list link replaced with Hyperkitty --- diff --git a/modules/ROOT/pages/team.adoc b/modules/ROOT/pages/team.adoc index 507c9e0..601be75 100644 --- a/modules/ROOT/pages/team.adoc +++ b/modules/ROOT/pages/team.adoc @@ -40,15 +40,15 @@ Meeting logs are available at https://meetbot.fedoraproject.org/sresults/?group_ We have diverse and flexible contribution opportunities available for everyone. You can join the conversation via IRC #fedora-diversity on Freenode. We also have a Telegram bridge to IRC https://t.me/fedoradiversity[here.]. - Feel free to introduce yourself on our [diversity@lists.fedoraproject.org mailing list]. + Feel free to introduce yourself on our https://lists.fedorahosted.org/archives/list/diversity@lists.fedoraproject.org/[Diversity & Inclusion mailing list]. * Feel like you don't have much time to contribute? - Subscribe to our [diversity@lists.fedoraproject.org mailing list] to receive updates about our work. + Subscribe to our https://lists.fedorahosted.org/archives/list/diversity@lists.fedoraproject.org/[Diversity & Inclusion mailing list] to receive updates about our work. * Are you a part of a local hackerspace, LUG or STEM community? Are you involved in open source project beyond Fedora? Did you say YES to any one of these? We are especially looking for other open source projects and local communities to share resources and collaborate together. -If you are interested in collaborating with us, please get in touch with us via IRC #fedora-diversity on Freenode or [diversity@lists.fedoraproject.org mailing list]. +If you are interested in collaborating with us, please get in touch with us via IRC #fedora-diversity on Freenode or https://lists.fedorahosted.org/archives/list/diversity@lists.fedoraproject.org/[Diversity & Inclusion mailing list]. We also have a Telegram bridge to IRC https://t.me/fedoradiversity[here.]. From 897ec93d61c68d2f6fbfe34d56f4f7cbc44d07de Mon Sep 17 00:00:00 2001 From: nasirhm Date: May 03 2020 19:18:21 +0000 Subject: [PATCH 3/18] Updated: events.adoc - Fixed Broken links & remove the Calendar links --- diff --git a/modules/ROOT/pages/events.adoc b/modules/ROOT/pages/events.adoc index f4b2c2b..bbed38c 100644 --- a/modules/ROOT/pages/events.adoc +++ b/modules/ROOT/pages/events.adoc @@ -6,7 +6,7 @@ The purpose of this page is to build a *Fedora Diversity events calendar* and to 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. This page is maintained by the Fedora Diversity and Inclusion Team. -In case of any modifications required, please contact a link:Diversity#Team_Members[Diversity and Inclusion Team member] or the link:Diversity_Adviser[Diversity Adviser]. +In case of any modifications required, please contact a link:Diversity#Team_Members[Diversity and Inclusion Team member] or the https://docs.fedoraproject.org/en-US/council/diversity-advisor/[Diversity Adviser]. [[event-list]] @@ -23,13 +23,13 @@ In case of any modifications required, please contact a link:Diversity#Team_Memb ** 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 link:Diversity_Adviser[Diversity Adviser] / other team members +** Time zone planning (WhenIsGood poll could be helpful for planning times with regional organizers for video calls with https://docs.fedoraproject.org/en-US/council/diversity-advisor/[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 link:Diversity_Adviser[Diversity Adviser], User:Tatica[tatica], will make some efforts to put a Fedora Diversity talk in as many locations as she can. +* Our Fedora https://docs.fedoraproject.org/en-US/council/diversity-advisor/[Diversity Adviser], https://fedoraproject.org/wiki/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** @@ -44,7 +44,7 @@ In case of any modifications required, please contact a link:Diversity#Team_Memb * 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 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:FAD_Diversity_2017[here]. + Link for this is https://fedoraproject.org/wiki/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. @@ -66,8 +66,6 @@ In case of any modifications required, please contact a link:Diversity#Team_Memb [[additional-information]] == Additional information -* link:How_to_organize_a_Fedora_event[Organization] -- event organization, budget information, and regional responsibility. +* link:[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 -* link:Linux_Events[Linux events] -- a collection of calendars of Linux events. -* https://opensource.com/resources/conferences-and-events-monthly[OpenSource.com events calendar] -- community calendar of Linux events happening across the world to be shared with the open source community From c809697ce0c65bab560cf9dfdd92cf8568a9f669 Mon Sep 17 00:00:00 2001 From: nasirhm Date: May 03 2020 19:20:12 +0000 Subject: [PATCH 4/18] Updated: demographic-survey.adoc - Fixed Broken links --- diff --git a/modules/ROOT/pages/demographic-survey.adoc b/modules/ROOT/pages/demographic-survey.adoc index 2637124..61b56f4 100644 --- a/modules/ROOT/pages/demographic-survey.adoc +++ b/modules/ROOT/pages/demographic-survey.adoc @@ -3,7 +3,7 @@ include::{partialsdir}/attributes.adoc[] = Demographic survey research This wiki page contains the draft of questions used for a Fedora contributor / demographic survey. -Most of these questions were extensively discussed and revised during the link:FAD_Diversity_2017[FAD Diversity 2017]. +Most of these questions were extensively discussed and revised during the https://fedoraproject.org/wiki/FAD_Diversity_2017[FAD Diversity 2017]. More details about this can be found in Pagure ticket discussions and in Etherpads. The questions in this wiki page are not finalized unless otherwise stated. From 57b77b4b1a4a90186326006640b95a8f7814b2ea Mon Sep 17 00:00:00 2001 From: nasirhm Date: May 03 2020 19:20:39 +0000 Subject: [PATCH 5/18] Updated: fedora-womens-day/about.adoc - Fixed Broken links --- diff --git a/modules/ROOT/pages/fedora-womens-day/about.adoc b/modules/ROOT/pages/fedora-womens-day/about.adoc index f1c960a..56e514f 100644 --- a/modules/ROOT/pages/fedora-womens-day/about.adoc +++ b/modules/ROOT/pages/fedora-womens-day/about.adoc @@ -4,7 +4,7 @@ include::{partialsdir}/attributes.adoc[] Fedora Women's Day (FWD) is a day of celebration to raise awareness and gratitude for women contributors across the Fedora Project. Fedora Women's Day marks the anniversary of the {FWIKI}/Women[Fedora Women] team. -The event is headed by Fedora's xref:fedora-womens-day/about.adoc[Diversity and Inclusion Team]. +The event is headed by Fedora's https://docs.fedoraproject.org/en-US/diversity-inclusion/team/[Diversity and Inclusion Team]. Across September, we encourage more women contributors across Fedora to connect and network with one another. Fedora Women's Day highlights and celebrates the women of open source communities like Fedora and their contributions to their projects and community. From b776ba31709de4bbf0e16b02b2d99ee2bcf5515b Mon Sep 17 00:00:00 2001 From: nasirhm Date: May 03 2020 19:53:33 +0000 Subject: [PATCH 6/18] Updated: fedora-womens-day/resource-pack.adoc - Fixed Broken links & Updated it with lateest fedora information --- diff --git a/modules/ROOT/pages/fedora-womens-day/resource-pack.adoc b/modules/ROOT/pages/fedora-womens-day/resource-pack.adoc index 8966d21..6a979fe 100644 --- a/modules/ROOT/pages/fedora-womens-day/resource-pack.adoc +++ b/modules/ROOT/pages/fedora-womens-day/resource-pack.adoc @@ -53,21 +53,19 @@ Fedora Server features https://cockpit-project.org/[Cockpit], https://www.freeip See recent features to Fedora Server {FWIKI}/Fedora_28_talking_points#Fedora_Server[here]. -=== Fedora Atomic +=== Fedora Silverblue -https://getfedora.org/atomic/[Fedora Atomic] is a special configuration of Fedora optimized for containers and container orchestration. -Its goal is to be the best platform for a Linux-Docker-Kubernetes stack. -It makes it easy to keep servers identical with https://lwn.net/Articles/581811/[OSTree], features a https://github.com/projectatomic/atomic[command-line tool] to manage different types of containers, and is optimized for Kubernetes / OpenShift clusters. +https://silverblue.fedoraproject.org/[Fedora Silverblue] is a variant of Fedora Workstation. It looks, feels and behaves like a regular desktop operating system, and the experience is similar to what you find with a standard Fedora Workstation. -See recent features to Fedora Atomic {FWIKI}/Fedora_28_talking_points#Fedora_Atomic_Host[here]. +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 -=== Coming soon: Fedora CoreOS +https://getfedora.org/en/coreos/[Fedora CoreOS] is an automatically updating, minimal, monolithic, container-focused operating system, designed for clusters but also operable standalone, optimized for Kubernetes but also great without it. It aims to combine the best of both CoreOS Container Linux and Fedora Atomic Host, integrating technology like Ignition from Container Linux with rpm-ostree and SELinux hardening from Project Atomic. Its goal is to provide the best container host to run containerized workloads securely and at scale. -Fedora CoreOS will soon premier as a new Fedora Edition. -This is following the news of Red Hat https://www.redhat.com/en/about/press-releases/red-hat-acquire-coreos-expanding-its-kubernetes-and-containers-leadership[acquiring CoreOS]. -This will be of interest to people working with containers, Kubernetes, OpenShift, and other devops tools. -More information will follow soon. +=== Fedora IoT +https://docs.fedoraproject.org/en-US/iot/[Fedora IoT] or Fedora Internet of Things is a Fedora Edition to provide a strong foundation for IoT ecosystems. Whether you’re working on a project at home, industrial gateways, smart cities or analytics with AI/ML, Fedora IoT can provide a trusted open source platform to build on. Fedora IoT rolling releases help you keep your ecosystem up-to-date. == Fedora Objectives @@ -79,10 +77,8 @@ ____ These Objectives are listed as follows: -* {FWIKI}/Objectives/Continuous_Integration_and_Delivery_of_Fedora_Atomic_Host[Fedora Atomic continuous integration / delivery] +* https://docs.fedoraproject.org/en-US/minimization/[Fedora Minimization] * {FWIKI}/Objectives/Fedora_IoT[Internet of Things (IoT)] -* https://docs.pagure.org/modularity/[Modularity] - == Fedora <3 Python From 2a855b648d9705895fabbfa53c568116c8c175c5 Mon Sep 17 00:00:00 2001 From: nasirhm Date: Jun 13 2020 15:52:09 +0000 Subject: [PATCH 7/18] fix links by using xref for diversity-advior --- diff --git a/modules/ROOT/pages/events.adoc b/modules/ROOT/pages/events.adoc index bbed38c..e71a4f9 100644 --- a/modules/ROOT/pages/events.adoc +++ b/modules/ROOT/pages/events.adoc @@ -6,7 +6,7 @@ The purpose of this page is to build a *Fedora Diversity events calendar* and to 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. This page is maintained by the Fedora Diversity and Inclusion Team. -In case of any modifications required, please contact a link:Diversity#Team_Members[Diversity and Inclusion Team member] or the https://docs.fedoraproject.org/en-US/council/diversity-advisor/[Diversity Adviser]. +In case of any modifications required, please contact a link:Diversity#Team_Members[Diversity and Inclusion Team member] or the xref:council:ROOT:diversity-advisor.adoc[Diversity Adviser]. [[event-list]] @@ -23,13 +23,13 @@ In case of any modifications required, please contact a link:Diversity#Team_Memb ** 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 https://docs.fedoraproject.org/en-US/council/diversity-advisor/[Diversity Adviser] / other team members +** 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 https://docs.fedoraproject.org/en-US/council/diversity-advisor/[Diversity Adviser], https://fedoraproject.org/wiki/User:Jonatoni[Jonatoni], will make some efforts to put a Fedora Diversity talk in as many locations as she can. +* Our Fedora xref:council:ROOT:diversity-advisor.adoc[Diversity Adviser], https://fedoraproject.org/wiki/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** @@ -66,6 +66,6 @@ In case of any modifications required, please contact a link:Diversity#Team_Memb [[additional-information]] == Additional information -* link:[Organization] -- event organization, budget information, and regional responsibility. +* https://fedoraproject.org/wiki/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 From 18f8929effc51c702f221d176a857ac6f02b9efd Mon Sep 17 00:00:00 2001 From: nasirhm Date: Jun 13 2020 15:56:10 +0000 Subject: [PATCH 8/18] fix: xref to D&I team --- diff --git a/modules/ROOT/pages/fedora-womens-day/about.adoc b/modules/ROOT/pages/fedora-womens-day/about.adoc index 56e514f..f189b0a 100644 --- a/modules/ROOT/pages/fedora-womens-day/about.adoc +++ b/modules/ROOT/pages/fedora-womens-day/about.adoc @@ -4,7 +4,7 @@ include::{partialsdir}/attributes.adoc[] Fedora Women's Day (FWD) is a day of celebration to raise awareness and gratitude for women contributors across the Fedora Project. Fedora Women's Day marks the anniversary of the {FWIKI}/Women[Fedora Women] team. -The event is headed by Fedora's https://docs.fedoraproject.org/en-US/diversity-inclusion/team/[Diversity and Inclusion Team]. +The event is headed by Fedora's xref:team.adoc[Diversity and Inclusion Team]. Across September, we encourage more women contributors across Fedora to connect and network with one another. Fedora Women's Day highlights and celebrates the women of open source communities like Fedora and their contributions to their projects and community. From dac33728b24b0d1739906abafd4bf3eb479ac342 Mon Sep 17 00:00:00 2001 From: nasirhm Date: Jun 13 2020 16:07:04 +0000 Subject: [PATCH 9/18] used attribution {FWIKI} instead of directly referencing --- diff --git a/modules/ROOT/pages/events.adoc b/modules/ROOT/pages/events.adoc index e71a4f9..53a8080 100644 --- a/modules/ROOT/pages/events.adoc +++ b/modules/ROOT/pages/events.adoc @@ -29,7 +29,7 @@ In case of any modifications required, please contact a link:Diversity#Team_Memb 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], https://fedoraproject.org/wiki/User:Jonatoni[Jonatoni], will make some efforts to put a Fedora Diversity talk in as many locations as she can. +* 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** @@ -44,7 +44,7 @@ In case of any modifications required, please contact a link:Diversity#Team_Memb * 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 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 https://fedoraproject.org/wiki/FAD_Diversity_2017[here]. + 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. @@ -66,6 +66,6 @@ In case of any modifications required, please contact a link:Diversity#Team_Memb [[additional-information]] == Additional information -* https://fedoraproject.org/wiki/How_to_organize_a_Fedora_event[Organization] -- event organization, budget information, and regional responsibility. +* 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 From 54ff6ab37ccbd5482af9177ed19090dfd76a2d55 Mon Sep 17 00:00:00 2001 From: nasirhm Date: Jun 13 2020 16:19:06 +0000 Subject: [PATCH 10/18] fix: cross-site links with xref --- diff --git a/modules/ROOT/pages/fedora-womens-day/resource-pack.adoc b/modules/ROOT/pages/fedora-womens-day/resource-pack.adoc index 6a979fe..3d4b039 100644 --- a/modules/ROOT/pages/fedora-womens-day/resource-pack.adoc +++ b/modules/ROOT/pages/fedora-womens-day/resource-pack.adoc @@ -12,7 +12,7 @@ Each sub-heading below represents a different piece of the resource pack. At your event, please introduce the Fedora Diversity and Inclusion Team to your attendees. The explanation includes what the team does in the Fedora community and some of our upcoming goals. -If anyone wants to learn more, you can share our https://docs.fedoraproject.org/en-US/diversity-inclusion/team/[team introduction page] with them. +If anyone wants to learn more, you can share our xref:diversity-inclusion::team.adoc[team introduction page] with them. What is the Fedora Diversity and Inclusion Team:: Fedora Diversity and Inclusion team is committed to fostering diversity and inclusion in Fedora community. @@ -42,7 +42,7 @@ https://getfedora.org/workstation/[Fedora Workstation] is the primary desktop co If your audience is looking to use Linux on the desktop or learn how to develop in a Linux environment, Fedora Workstation is a great choice. It ships the https://www.gnome.org/[GNOME Desktop Environment], includes latest versions of programming languages and libraries, and is easy to make a https://fedoramagazine.org/make-fedora-usb-stick/[bootable USB stick]. -See recent features to Fedora Workstation {FWIKI}/Fedora_28_talking_points#Fedora_Workstation[here]. +See recent features to Fedora Workstation {FWIKI}/Fedora_32_talking_points#Fedora_Workstation[here]. === Fedora Server @@ -51,21 +51,21 @@ If your audience includes system administrators, Fedora Server is a good choice It is a short-lifecycle, community-supported server environment. Fedora Server features https://cockpit-project.org/[Cockpit], https://www.freeipa.org/page/About[FreeIPA identity management], and the brand-new https://docs.pagure.org/modularity/[Fedora Server Modular Edition]. -See recent features to Fedora Server {FWIKI}/Fedora_28_talking_points#Fedora_Server[here]. +See recent features to Fedora Server {FWIKI}/Fedora_32_talking_points#Fedora_Server[here]. === Fedora Silverblue https://silverblue.fedoraproject.org/[Fedora Silverblue] is a variant of Fedora Workstation. It looks, feels and behaves like a regular desktop operating system, and the experience is similar to what you find with a standard Fedora Workstation. However, unlike other operating systems, Silverblue is immutable. This means that every installation is identical to every other installation of the same version. The operating system that is on disk is exactly the same from one machine to the next, and it never changes as it is used. - + === Fedora CoreOS https://getfedora.org/en/coreos/[Fedora CoreOS] is an automatically updating, minimal, monolithic, container-focused operating system, designed for clusters but also operable standalone, optimized for Kubernetes but also great without it. It aims to combine the best of both CoreOS Container Linux and Fedora Atomic Host, integrating technology like Ignition from Container Linux with rpm-ostree and SELinux hardening from Project Atomic. Its goal is to provide the best container host to run containerized workloads securely and at scale. === Fedora IoT -https://docs.fedoraproject.org/en-US/iot/[Fedora IoT] or Fedora Internet of Things is a Fedora Edition to provide a strong foundation for IoT ecosystems. Whether you’re working on a project at home, industrial gateways, smart cities or analytics with AI/ML, Fedora IoT can provide a trusted open source platform to build on. Fedora IoT rolling releases help you keep your ecosystem up-to-date. +xref:iot:ROOT:index.adoc[Fedora IoT] or Fedora Internet of Things is a Fedora Edition to provide a strong foundation for IoT ecosystems. Whether you’re working on a project at home, industrial gateways, smart cities or analytics with AI/ML, Fedora IoT can provide a trusted open source platform to build on. Fedora IoT rolling releases help you keep your ecosystem up-to-date. == Fedora Objectives @@ -77,7 +77,7 @@ ____ These Objectives are listed as follows: -* https://docs.fedoraproject.org/en-US/minimization/[Fedora Minimization] +* xref:minimization:index.adoc[Fedora Minimization] * {FWIKI}/Objectives/Fedora_IoT[Internet of Things (IoT)] == Fedora <3 Python From 106337f2dd952b019359eaa182909892bcd1dfd4 Mon Sep 17 00:00:00 2001 From: nasirhm Date: Jun 13 2020 16:24:47 +0000 Subject: [PATCH 11/18] add: MAILINGLIST attribute to refer to Diversity Mailing list for re-usability --- diff --git a/modules/ROOT/pages/_partials/attributes.adoc b/modules/ROOT/pages/_partials/attributes.adoc index e093b24..7415d2b 100644 --- a/modules/ROOT/pages/_partials/attributes.adoc +++ b/modules/ROOT/pages/_partials/attributes.adoc @@ -2,3 +2,4 @@ :FISCALYEAR: FY20 :FWIKI: https://fedoraproject.org/wiki :YEAR: 2020 +:MAILINGLIST: https://lists.fedorahosted.org/archives/list/diversity@lists.fedoraproject.org/ From 19a70a43b93208b828d196821bce798eae96cdd8 Mon Sep 17 00:00:00 2001 From: nasirhm Date: Jun 13 2020 16:32:35 +0000 Subject: [PATCH 12/18] using {MAILINGLIST} attribute instead of link --- diff --git a/modules/ROOT/pages/team.adoc b/modules/ROOT/pages/team.adoc index 601be75..c2f4854 100644 --- a/modules/ROOT/pages/team.adoc +++ b/modules/ROOT/pages/team.adoc @@ -40,15 +40,15 @@ Meeting logs are available at https://meetbot.fedoraproject.org/sresults/?group_ We have diverse and flexible contribution opportunities available for everyone. You can join the conversation via IRC #fedora-diversity on Freenode. We also have a Telegram bridge to IRC https://t.me/fedoradiversity[here.]. - Feel free to introduce yourself on our https://lists.fedorahosted.org/archives/list/diversity@lists.fedoraproject.org/[Diversity & Inclusion mailing list]. + Feel free to introduce yourself on our {MAILINGLIST}[Diversity & Inclusion mailing list]. * Feel like you don't have much time to contribute? - Subscribe to our https://lists.fedorahosted.org/archives/list/diversity@lists.fedoraproject.org/[Diversity & Inclusion mailing list] to receive updates about our work. + Subscribe to our {MAILINGLIST}[Diversity & Inclusion mailing list] to receive updates about our work. * Are you a part of a local hackerspace, LUG or STEM community? Are you involved in open source project beyond Fedora? Did you say YES to any one of these? We are especially looking for other open source projects and local communities to share resources and collaborate together. -If you are interested in collaborating with us, please get in touch with us via IRC #fedora-diversity on Freenode or https://lists.fedorahosted.org/archives/list/diversity@lists.fedoraproject.org/[Diversity & Inclusion mailing list]. +If you are interested in collaborating with us, please get in touch with us via IRC #fedora-diversity on Freenode or {MAILINGLIST}[Diversity & Inclusion mailing list]. We also have a Telegram bridge to IRC https://t.me/fedoradiversity[here.]. From 4b0e86d44bd08c1383b1c9121017d76ddfb12230 Mon Sep 17 00:00:00 2001 From: nasirhm Date: Jun 13 2020 16:37:08 +0000 Subject: [PATCH 13/18] fix: used xref for cross site reference to code-of-conduct --- diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc index 6d38dcf..5d7d500 100644 --- a/modules/ROOT/pages/index.adoc +++ b/modules/ROOT/pages/index.adoc @@ -4,7 +4,7 @@ include::{partialsdir}/attributes.adoc[] The Fedora Project welcomes and encourages participation by everyone. Our community is based on mutual respect, tolerance, and encouragement, and we are working to help each other live up to these principles. -Please, refer to our https://docs.fedoraproject.org/en-US/project/code-of-conduct/[Code of Conduct] if you need more information. +Please, refer to our xref:project:ROOT:code-of-conduct.adoc[Code of Conduct] if you need more information. Fedora Diversity and Inclusion team is committed to fostering diversity and inclusion in Fedora community. You can watch our recent video showcasing the Fedora community https://youtu.be/Ig0gnM9jsm0[here]. From eb0f2122adb60fd9fd4c00475d132c94402ccbaa Mon Sep 17 00:00:00 2001 From: nasirhm Date: Jun 13 2020 16:40:14 +0000 Subject: [PATCH 14/18] fix: fixed the link to D&I team --- diff --git a/modules/ROOT/pages/events.adoc b/modules/ROOT/pages/events.adoc index 53a8080..79d0c6b 100644 --- a/modules/ROOT/pages/events.adoc +++ b/modules/ROOT/pages/events.adoc @@ -6,7 +6,7 @@ The purpose of this page is to build a *Fedora Diversity events calendar* and to 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. This page is maintained by the Fedora Diversity and Inclusion Team. -In case of any modifications required, please contact a link:Diversity#Team_Members[Diversity and Inclusion Team member] or the xref:council:ROOT:diversity-advisor.adoc[Diversity Adviser]. +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]. [[event-list]] From f3c64a5305c4b5848f90fee0e6deb3e6c01d2f15 Mon Sep 17 00:00:00 2001 From: nasirhm Date: Jun 13 2020 16:46:01 +0000 Subject: [PATCH 15/18] fix: link to d&i mailinglist --- diff --git a/modules/ROOT/pages/_partials/attributes.adoc b/modules/ROOT/pages/_partials/attributes.adoc index 7415d2b..7f2f834 100644 --- a/modules/ROOT/pages/_partials/attributes.adoc +++ b/modules/ROOT/pages/_partials/attributes.adoc @@ -2,4 +2,4 @@ :FISCALYEAR: FY20 :FWIKI: https://fedoraproject.org/wiki :YEAR: 2020 -:MAILINGLIST: https://lists.fedorahosted.org/archives/list/diversity@lists.fedoraproject.org/ +:MAILINGLIST: https://lists.fedoraproject.org/archives/list/diversity@lists.fedoraproject.org/ From e896ed2bfeaa1337f0fd9bf960eb15825edadb85 Mon Sep 17 00:00:00 2001 From: nasirhm Date: Jun 13 2020 19:44:33 +0000 Subject: [PATCH 16/18] Add: MAJOROSVER attribute to point at current major release version --- diff --git a/modules/ROOT/pages/_partials/attributes.adoc b/modules/ROOT/pages/_partials/attributes.adoc index 7f2f834..f58cd9d 100644 --- a/modules/ROOT/pages/_partials/attributes.adoc +++ b/modules/ROOT/pages/_partials/attributes.adoc @@ -3,3 +3,4 @@ :FWIKI: https://fedoraproject.org/wiki :YEAR: 2020 :MAILINGLIST: https://lists.fedoraproject.org/archives/list/diversity@lists.fedoraproject.org/ +:MAJOROSVER: 32 From f0f58ddc3e55d76a45729d1c73e9402a736c498c Mon Sep 17 00:00:00 2001 From: nasirhm Date: Jun 13 2020 19:48:41 +0000 Subject: [PATCH 17/18] Fix: Addition of MAJOROSVER insures to reuse the latest release version of Fedora --- diff --git a/modules/ROOT/pages/fedora-womens-day/resource-pack.adoc b/modules/ROOT/pages/fedora-womens-day/resource-pack.adoc index 3d4b039..87fb892 100644 --- a/modules/ROOT/pages/fedora-womens-day/resource-pack.adoc +++ b/modules/ROOT/pages/fedora-womens-day/resource-pack.adoc @@ -42,7 +42,7 @@ https://getfedora.org/workstation/[Fedora Workstation] is the primary desktop co If your audience is looking to use Linux on the desktop or learn how to develop in a Linux environment, Fedora Workstation is a great choice. It ships the https://www.gnome.org/[GNOME Desktop Environment], includes latest versions of programming languages and libraries, and is easy to make a https://fedoramagazine.org/make-fedora-usb-stick/[bootable USB stick]. -See recent features to Fedora Workstation {FWIKI}/Fedora_32_talking_points#Fedora_Workstation[here]. +See recent features to Fedora Workstation {FWIKI}/Fedora_{MAJOROSVER}_talking_points#Fedora_Workstation[here]. === Fedora Server @@ -51,7 +51,7 @@ If your audience includes system administrators, Fedora Server is a good choice It is a short-lifecycle, community-supported server environment. Fedora Server features https://cockpit-project.org/[Cockpit], https://www.freeipa.org/page/About[FreeIPA identity management], and the brand-new https://docs.pagure.org/modularity/[Fedora Server Modular Edition]. -See recent features to Fedora Server {FWIKI}/Fedora_32_talking_points#Fedora_Server[here]. +See recent features to Fedora Server {FWIKI}/Fedora_{MAJOROSVER}_talking_points#Fedora_Server[here]. === Fedora Silverblue From 25753ca230a85e300ddaa9b1c89af699d104dfc5 Mon Sep 17 00:00:00 2001 From: nasirhm Date: Jun 13 2020 19:59:58 +0000 Subject: [PATCH 18/18] One sentence on one line for resource-pack --- diff --git a/modules/ROOT/pages/fedora-womens-day/resource-pack.adoc b/modules/ROOT/pages/fedora-womens-day/resource-pack.adoc index 87fb892..af658ea 100644 --- a/modules/ROOT/pages/fedora-womens-day/resource-pack.adoc +++ b/modules/ROOT/pages/fedora-womens-day/resource-pack.adoc @@ -55,17 +55,24 @@ See recent features to Fedora Server {FWIKI}/Fedora_{MAJOROSVER}_talking_points# === Fedora Silverblue -https://silverblue.fedoraproject.org/[Fedora Silverblue] is a variant of Fedora Workstation. It looks, feels and behaves like a regular desktop operating system, and the experience is similar to what you find with a standard Fedora Workstation. +https://silverblue.fedoraproject.org/[Fedora Silverblue] is a variant of Fedora Workstation. +It looks, feels and behaves like a regular desktop operating system, and the experience is similar to what you find with a standard Fedora Workstation. -However, unlike other operating systems, Silverblue is immutable. This means that every installation is identical to every other installation of the same version. The operating system that is on disk is exactly the same from one machine to the next, and it never changes as it is used. +However, unlike other operating systems, Silverblue is immutable. +This means that every installation is identical to every other installation of the same version. +The operating system that is on disk is exactly the same from one machine to the next, and it never changes as it is used. === Fedora CoreOS -https://getfedora.org/en/coreos/[Fedora CoreOS] is an automatically updating, minimal, monolithic, container-focused operating system, designed for clusters but also operable standalone, optimized for Kubernetes but also great without it. It aims to combine the best of both CoreOS Container Linux and Fedora Atomic Host, integrating technology like Ignition from Container Linux with rpm-ostree and SELinux hardening from Project Atomic. Its goal is to provide the best container host to run containerized workloads securely and at scale. +https://getfedora.org/en/coreos/[Fedora CoreOS] is an automatically updating, minimal, monolithic, container-focused operating system, designed for clusters but also operable standalone, optimized for Kubernetes but also great without it. +It aims to combine the best of both CoreOS Container Linux and Fedora Atomic Host, integrating technology like Ignition from Container Linux with rpm-ostree and SELinux hardening from Project Atomic. +Its goal is to provide the best container host to run containerized workloads securely and at scale. === Fedora IoT -xref:iot:ROOT:index.adoc[Fedora IoT] or Fedora Internet of Things is a Fedora Edition to provide a strong foundation for IoT ecosystems. Whether you’re working on a project at home, industrial gateways, smart cities or analytics with AI/ML, Fedora IoT can provide a trusted open source platform to build on. Fedora IoT rolling releases help you keep your ecosystem up-to-date. +xref:iot:ROOT:index.adoc[Fedora IoT] or Fedora Internet of Things is a Fedora Edition to provide a strong foundation for IoT ecosystems. +Whether you’re working on a project at home, industrial gateways, smart cities or analytics with AI/ML, Fedora IoT can provide a trusted open source platform to build on. +Fedora IoT rolling releases help you keep your ecosystem up-to-date. == Fedora Objectives