PR#133: Fixed Broken Links - fedora-diversity

		`@@ -2,3 +2,5 @@`
		`:FISCALYEAR: FY20`
		`:FWIKI: https://fedoraproject.org/wiki`
		`:YEAR: 2020`
		`+ :MAILINGLIST: https://lists.fedoraproject.org/archives/list/diversity@lists.fedoraproject.org/`
		`+ :MAJOROSVER: 32`

modules/ROOT/pages/demographic-survey.adoc

file modified

+1 -1

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

modules/ROOT/pages/events.adoc

file modified

+5 -7

		`@@ -6,7 +6,7 @@`
		`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 xref:team.adoc[Diversity and Inclusion Team] or the xref:council:ROOT:diversity-advisor.adoc[Diversity Adviser].`


		`[[event-list]]`
		`@@ -23,13 +23,13 @@`
		`** 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 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 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 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 @@`
		`* 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 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,8 +66,6 @@`
		`[[additional-information]]`
		`== Additional information`

		`- * link: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`
		`- * 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`

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

file modified

+1 -1

		`@@ -4,7 +4,7 @@`

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

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

file modified

+19 -16

		`@@ -12,7 +12,7 @@`

		`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 @@`
		`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_{MAJOROSVER}_talking_points#Fedora_Workstation[here].`
jflory7 commented 3 years ago I love it :smile:

		`=== Fedora Server`

		`@@ -51,23 +51,28 @@`
		`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_{MAJOROSVER}_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.`

		`- === Coming soon: Fedora CoreOS`
		`+ === Fedora CoreOS`

		`- 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.`
		`+ 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.`

		`== Fedora Objectives`

		`@@ -79,10 +84,8 @@`

		`These Objectives are listed as follows:`

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

		`== Fedora <3 Python`

modules/ROOT/pages/index.adoc

file modified

+1 -1

		`@@ -4,7 +4,7 @@`

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

modules/ROOT/pages/team.adoc

file modified

+3 -3

		`@@ -40,15 +40,15 @@`
		`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 {MAILINGLIST}[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 {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 [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 {MAILINGLIST}[Diversity & Inclusion mailing list].`
		`We also have a Telegram bridge to IRC https://t.me/fedoradiversity[here.].`

nasirhm commented 3 years ago

I've fixed Broken link, Updated some pages according to latest fedora stuff i.e : Objectives. Fedora Editions.

Docs that i think needs to written :

Event Organization Ideas & Guidelines for Fedora D&I
Event Report ideas
Event Wiki Template
Fedora D&I Team Members Page.

Thank You, If you think there are things that needs to be updated, Feel free to update it. :D

nasirhm commented 3 years ago

According to this Issue#131 we need to improve the on boarding process too.

jflory7 commented 3 years ago

Hey @nasirhm, I missed this PR! It was buried in notifications.

Thanks for taking initiative on fixing up the links. I have a few comments I will add before this is ready to merge. :) Thanks for working on this.

Metadata Update from @jflory7:
- Request assigned

3 years ago

Metadata Update from @jflory7:
- Pull-request tagged with: bug, needs changes, type - docs

3 years ago

jflory7 commented on line 6 of modules/ROOT/pages/events.adoc 3 years ago

Could you please also fix link:Diversity#Team_Members[Diversity and Inclusion Team member] on this line?

jflory7 commented on line 6 of modules/ROOT/pages/events.adoc 3 years ago

https://docs.fedoraproject.org/en-US/council/diversity-advisor/[Diversity Adviser] should be an xref so it links to the Fedora Council doc page. If the URL schema ever changes, using an xref will make sure the link is always up-to-date. Note that cross-project xref's will not work locally, but they will work when pushed live onto the Fedora Docs site. If you need xref help, come find the Docs team in #fedora-docs :)

jflory7 commented on line 15 of modules/ROOT/pages/events.adoc 3 years ago

This should also be a xref to the Council docs page.

jflory7 commented on line 22 of modules/ROOT/pages/events.adoc 3 years ago

Same xref as above here.

jflory7 commented on line 40 of modules/ROOT/pages/events.adoc 3 years ago

Today I learned this is a wiki page: https://fedoraproject.org/wiki/How_to_organize_a_Fedora_event

I'm not sure how useful this link is right now… we can leave it in for now but maybe we want to remove/replace it. Please link it to the wiki page for now, thanks!

jflory7 commented on line 6 of modules/ROOT/pages/fedora-womens-day/about.adoc 3 years ago

Oops, the xref path is wrong. It should be:

xref:team.adoc[Diversity and Inclusion Team]

This one should work locally since it is a page in the same docs site.

jflory7 commented on line 27 of modules/ROOT/pages/fedora-womens-day/resource-pack.adoc 3 years ago

Another cross-site xref here too :)

jflory7 commented on line 6 of modules/ROOT/pages/index.adoc 3 years ago

Another cross-site xref here too :)

jflory7 commented on line 36 of modules/ROOT/pages/fedora-womens-day/resource-pack.adoc 3 years ago

Another cross-site xref here too :)

jflory7 commented on line 18 of modules/ROOT/pages/team.adoc 3 years ago

Hmm… our mailing list is a good idea to make a link in our attributes.adoc file, so we can define it once and re-use the same link across the site. Like we do with {FWIKI}:

https://pagure.io/fedora-diversity/blob/0cf16140547626be653428323ade8e456877a127/f/modules/ROOT/pages/_partials/attributes.adoc

This is a little more advanced and out of scope of the PR though. If you have extra time and want to do this, that is awesome! But if not, it's okay too. We can get it in another PR.

jflory7 commented 3 years ago

One more general comment: please place each sentence on its own line. This is an AsciiDoc convention, but it also makes git diffs waaay easier to read. :) This is the usual standard we follow in other Fedora Docs sites, so best to be consistent here too:

https://asciidoctor.org/docs/asciidoc-recommended-practices/#one-sentence-per-line

9 new commits added

fix: link to d&i mailinglist
fix: fixed the link to D&I team
fix: used xref for cross site reference to code-of-conduct
using {MAILINGLIST} attribute instead of link
add: MAILINGLIST attribute to refer to Diversity Mailing list for re-usability
fix: cross-site links with xref
used attribution {FWIKI} instead of directly referencing
fix: xref to D&I team
fix links by using xref for diversity-advior

3 years ago

nasirhm commented 3 years ago

One more general comment: please place each sentence on its own line. This is an AsciiDoc convention, but it also makes git diffs waaay easier to read. :) This is the usual standard we follow in other Fedora Docs sites, so best to be consistent here too:
https://asciidoctor.org/docs/asciidoc-recommended-practices/#one-sentence-per-line

Would try my best to use it as much as i can.

I've added the Mailing list attribute as {MAILINGLIST} that points towards the mailing list's archive.

nasirhm commented 3 years ago

Made the xrefs, best reference i found was engineering team docs for cross-site xrefs.

Thanks for reviewing. Do let me know if there's anything you would like to see updated. :)

jflory7 commented on line 24 of modules/ROOT/pages/fedora-womens-day/resource-pack.adoc 3 years ago

Just an idea… we could probably make a {MAJOROSVER} like the quick-docs project does:

https://pagure.io/fedora-docs/quick-docs/blob/master/f/modules/ROOT/pages/_partials/attributes.adoc

We can open that in a new PR. But it would make this easier to maintain and always point to the Marketing Team's latest work.

Metadata Update from @jflory7:
- Pull-request untagged with: needs changes

3 years ago

3 new commits added

One sentence on one line for resource-pack
Fix: Addition of MAJOROSVER insures to reuse the latest release version of Fedora
Add: MAJOROSVER attribute to point at current major release version

3 years ago

nasirhm commented 3 years ago

@jflory7 Here ^ are the Changes i made:

Addition of {MAJOROSVER} to make it easier to maintain and always point to the marketing team's latest work and used it where i mentioned the release version manually i.e: 32
Fixed one sentence per line, I've gone through the docs and feel that it's been fixed.