PR#118: Switch relevant links to use macros - fedora-diversity

fedora-diversity

#118 Switch relevant links to use macros

Merged 4 years ago by jflory7. Opened 4 years ago by jflory7.

change/use-macros into master

Switch relevant links to use macros

Justin W. Flory • 4 years ago

495dbf2

modules/ROOT/pages/demographic-survey.adoc

file modified

+3 -1

		`@@ -1,3 +1,5 @@`
		`+ include::{partialsdir}/attributes.adoc[]`
		`+`
		`= Demographic survey research`

		`This wiki page contains the draft of questions used for a Fedora contributor / demographic survey.`
		`@@ -64,7 +66,7 @@`
		`== Survey questions`

		`Below are the "ver. 1.0" version of the survey questions.`
		`- Our last plan for these was to submit them to Fedora Legal for feedback, which I believe @bex and @marinaz were going to work on. These questions will also be updated in the https://fedoraproject.org/wiki/Diversity/Survey[Survey wiki page].`
		`+ Our last plan for these was to submit them to Fedora Legal for feedback, which I believe @bex and @marinaz were going to work on. These questions will also be updated in the {FWIKI}/Diversity/Survey[Survey wiki page].`

		`[[fedora-and-free-and-open-source-software-usage-and-contributions]]`
		`=== Fedora and free and open source software usage and contributions`

modules/ROOT/pages/events.adoc

file modified

		`@@ -1,3 +1,5 @@`
		`+ 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.`

modules/ROOT/pages/fedora-womens-day/about.adoc

file modified

+3 -1

		`@@ -1,7 +1,9 @@`
		`+ include::{partialsdir}/attributes.adoc[]`
		`+`
		`= About Fedora Women's Day`

		`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 https://fedoraproject.org/wiki/Women[Fedora Women] team.`
		`+ 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].`

		`Across September, we encourage more women contributors across Fedora to connect and network with one another.`

modules/ROOT/pages/fedora-womens-day/resource-pack.adoc

file modified

+8 -6

		`@@ -1,3 +1,5 @@`
		`+ include::{partialsdir}/attributes.adoc[]`
		`+`
		`= FWD organizer resource pack`

		`This page is the resource pack provided to xref:fedora-womens-day/about.adoc[Fedora Women's Day] organizers by the xref:diversity-inclusion::team.adoc[Diversity and Inclusion Team].`
		`@@ -30,7 +32,7 @@`

		`== Fedora Editions`

		`- https://fedoraproject.org/wiki/Editions[Fedora Editions] are the flagship configurations of Fedora offered by the Fedora Project.`
		`+ {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, explained below.`

		`@@ -40,7 +42,7 @@`
		`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 https://fedoraproject.org/wiki/Fedora_28_talking_points#Fedora_Workstation[here].`
		`+ See recent features to Fedora Workstation {FWIKI}/Fedora_28_talking_points#Fedora_Workstation[here].`

		`=== Fedora Server`

		`@@ -49,7 +51,7 @@`
		`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 https://fedoraproject.org/wiki/Fedora_28_talking_points#Fedora_Server[here].`
		`+ See recent features to Fedora Server {FWIKI}/Fedora_28_talking_points#Fedora_Server[here].`

		`=== Fedora Atomic`

		`@@ -57,7 +59,7 @@`
		`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.`

		`- See recent features to Fedora Atomic https://fedoraproject.org/wiki/Fedora_28_talking_points#Fedora_Atomic_Host[here].`
		`+ See recent features to Fedora Atomic {FWIKI}/Fedora_28_talking_points#Fedora_Atomic_Host[here].`

		`=== Coming soon: Fedora CoreOS`

		`@@ -77,8 +79,8 @@`

		`These Objectives are listed as follows:`

		`- * https://fedoraproject.org/wiki/Objectives/Continuous_Integration_and_Delivery_of_Fedora_Atomic_Host[Fedora Atomic continuous integration / delivery]`
		`- * https://fedoraproject.org/wiki/Objectives/Fedora_IoT[Internet of Things (IoT)]`
		`+ * {FWIKI}/Objectives/Continuous_Integration_and_Delivery_of_Fedora_Atomic_Host[Fedora Atomic continuous integration / delivery]`
		`+ * {FWIKI}/Objectives/Fedora_IoT[Internet of Things (IoT)]`
		`* https://docs.pagure.org/modularity/[Modularity]`

modules/ROOT/pages/get-involved.adoc

file modified

+4 -2

		`@@ -1,3 +1,5 @@`
		`+ include::{partialsdir}/attributes.adoc[]`
		`+`
		`= Get involved with Fedora Diversity and Inclusion Team`

		`Interested in helping the Fedora Diversity and Inclusion Team?`
		`@@ -8,9 +10,9 @@`
		`== Create Fedora Account System (FAS) account`

		`All contributors to Fedora need to register in the https://admin.fedoraproject.org/accounts/[Fedora Account System].`
		`- New contributors are asked to sign the https://fedoraproject.org/wiki/Legal:Fedora_Project_Contributor_Agreement[Fedora Project Contributor Agreement] (FPCA).`
		`+ New contributors are asked to sign the {FWIKI}/Legal:Fedora_Project_Contributor_Agreement[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 https://fedoraproject.org/wiki/Infrastructure#Communicating[Fedora Infrastructure Team].`
		`+ If you need help with this, contact the {FWIKI}/Infrastructure#Communicating[Fedora Infrastructure Team].`


		`[[mailing-list]]`

modules/ROOT/pages/index.adoc

file modified

+3 -1

		`@@ -1,3 +1,5 @@`
		`+ include::{partialsdir}/attributes.adoc[]`
		`+`
		`= Diversity and inclusion in Fedora`

		`The Fedora Project welcomes and encourages participation by everyone.`
		`@@ -50,7 +52,7 @@`
		`=== Events`

		`Fedora Diversity and Inclusion team organizes and supports a variety of events with an aim of fostering diversity and inclusion in Fedora community.`
		`- https://fedoraproject.org/wiki/Diversity_Events[Here] is the list of events.`
		`+ xref:events.adoc[Here] is the list of events.`
		`Please send us an email if you are interested in helping us organize events in your local community related to promoting diversity and inclusion in open source communities including Fedora.`

modules/ROOT/pages/meetings.adoc

file modified

		`@@ -1,3 +1,5 @@`
		`+ include::{partialsdir}/attributes.adoc[]`
		`+`
		`= D&I meeting guide`
		`:toc:`

modules/ROOT/pages/team.adoc

file modified

		`@@ -1,3 +1,5 @@`
		`+ include::{partialsdir}/attributes.adoc[]`
		`+`
		`= About Diversity and Inclusion Team`

		`Fedora Diversity and Inclusion team is committed to fostering diversity and inclusion in Fedora community.`

jflory7 commented 4 years ago

This commit is a follow-up to PR #117. That PR added a new
_partials/attributes.adoc file with reusable macros. This commit
actually implements the macros across our docs. This updates a lot of
links to use the macros for the Fedora Wiki. I also changed some links
from Fedora Wiki URLs to xref macros, since some page we linked out to
are now hosted in our docs site.