#173 moved FWD dir to new events module
Merged 3 years ago by jflory7. Opened 3 years ago by ramyaparimi.

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

  # This lists all the menu definitions of your component.

  nav:

  - modules/ROOT/nav.adoc

+ - modules/events/nav.adoc

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

- * xref:team.adoc[About Diversity and Inclusion Team]

- * xref:events.adoc[D&I events]

  * xref:demographic-survey.adoc[Demographic survey]

- * Fedora Women's Day (FWD)

- ** xref:fedora-womens-day/about.adoc[About FWD]

- ** xref:fedora-womens-day/resource-pack.adoc[Resource pack]

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

- * xref:meetings.adoc[Meetings]

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

  * Policy

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

@@ -1,12 +0,0 @@

- 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 {FWIKI}/Women[Fedora Women] 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.

- They are also an opportunity for women 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 women to connect, learn, and be inspired by other women in open source communities and beyond.

@@ -62,7 +62,7 @@

  

  

  [[join-irc-telegram]]

- == Join IRC/Telegram group chat

+ == Join IRC/Telegram/Matrix group chat

  

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

  We use this group chat for quick updates, friendly chatter, and running meetings.
@@ -71,10 +71,9 @@

  

  Here are the easiest ways to join:

  

- * IRC

- ** link:ircs://chat.freenode.net:6697/%23fedora-diversity[`chat.freenode.net/#fedora-diversity`]

- ** https://webchat.freenode.net/?channels=#fedora-diversity[Web chat]

+ * https://webchat.freenode.net/?channels=#fedora-diversity[IRC Web chat]

  * https://t.me/fedoradiversity[Telegram]

+ * https://app.element.io/#/room/#fedora-diversity:matrix.org[Element/Matrix]

  

  Don't forget to say hi when you join!

  

file modified
+41 -29
@@ -3,37 +3,26 @@

  = Diversity and inclusion in Fedora

  

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

+ Our community is based on mutual respect, tolerance, and encouragement, and we work to help each other live up to these principles.

+ Please, refer to our xref:project:ROOT:code-of-conduct.adoc[Code of Conduct] for more information.

+ The Fedora Diversity and Inclusion team (Fedora D&I team) is committed to fostering diversity and inclusion in the Fedora community.

+ 

+ You can watch our recent video showcasing the Fedora community https://www.youtube.com/watch?v=O1eHRoEps6I[here].

  

  

  [[goals]]

  == Goals

  

- The goal of this initiative is to help foster diversity and inclusion in Fedora community.

- Fedora Diversity and Inclusion team works towards this goal by focusing on efforts including (but not limited to)

+ The goal of this initiative is to help foster diversity and inclusion in the Fedora community.

+ The Fedora D&I team works towards this goal by focusing on efforts including (but not limited to):

  

- * Creating content and organizing events to spread awareness about diversity in Fedora within and outside the Fedora community.

+ * Creating content and organizing events to spread awareness about diversity within Fedora and outside the Fedora community.

  * Supporting community building and engagement activities to foster inclusion.

- * Coordinating with Fedora SIGs and subprojects to foster Diversity and Inclusion in the community.

+ * Coordinating with Fedora SIGs and subprojects to futher foster diversity and inclusion in the community.

  * Supporting programs committed to building diversity and inclusion in Free and Open Source Software communities.

  

- 

- [[join]]

- == Join

- 

- If you'd like to help out, please send an introduction to the mailing list and introduce yourself in IRC.

- You can also join the conversation on Telegram bridge to IRC https://t.me/fedoradiversity[here.]

- 

- 

- [[meetings]]

- == Meetings

- 

- The Diversity and Inclusion team meets *bi-weekly* in #fedora-diversity at 12:30 UTC on Fridays.

- The calendar for future meetings is available https://apps.fedoraproject.org/calendar/meeting/6397/[here].

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

+ https://fedoraprojectpodcast.simplecast.com/episodes/fedora-diversity-inclusion-team[Fedora Podcast] gives further insight into the purpose, objective and working process of the team in a huge community project.

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

  

  

  [[current-projects]]
@@ -41,7 +30,6 @@

  

  We are tracking our ongoing work and action items https://pagure.io/fedora-diversity/issues[here] in Pagure.

  

- 

  [[fedora-women]]

  === Fedora Women

  
@@ -51,13 +39,37 @@

  [[events]]

  === Events

  

- Fedora Diversity and Inclusion team organizes and supports a variety of events with an aim of fostering diversity and inclusion in Fedora community.

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

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

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

+ If you are interested in working with us to organize events in your local community, send us an email. We are always looking for new collaborators.

  

  

- [[contacts]]

- == Community Contacts

+ [[meetings]]

+ == Meetings

+ 

+ The Diversity and Inclusion team generally meets *bi-weekly* in #fedora-diversity at 14:00 UTC on Thursdays.

+ Calendar information about our upcoming meetings can be found at: https://apps.fedoraproject.org/calendar/meeting/9784/[here].

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

+ 

  

+ [[get-in-touch]]

+ == Get in touch with us

+ 

+ Are you an individual contributor who wants to help us shape diversity and inclusion in the Fedora community?

+ 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?

  Diversity efforts require that we work with all parts of Fedora.

- To get in touch with Fedora Diversity and Inclusion team, please send an email to our mailing list or connect with us on IRC or via Telegram.

+ We feel that everyone can bring in valuable inputs to this conversation.

+ We have diverse and flexible contribution opportunities available for everyone.

+ 

+ * If you'd like to help out, please introduce yourself on our {MAILINGLIST}[Diversity & Inclusion mailing list].

+ 

+ * You can join the conversation via IRC #fedora-diversity on Freenode.

+   We also have a Telegram bridge to IRC https://t.me/fedoradiversity[here].

+ 

+ * We are especially looking for other open source projects and local communities to share resources and collaborate together.

+   Please get in touch via the above mentioned ways or open a new ticket https://pagure.io/fedora-diversity/issues[here].

+ 

+ * Feel like you don't have much time to contribute?

+   Subscribe to our {MAILINGLIST}[Diversity & Inclusion mailing list] to receive updates about our work.

@@ -1,54 +0,0 @@

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

- 

- = About Diversity and Inclusion Team

- 

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

- 

- 

- [[goals]]

- == Goals

- 

- The goal of this initiative is to help foster diversity and inclusion in Fedora community.

- Fedora Diversity and Inclusion team works towards this goal by focusing on efforts including (but not limited to):

- 

- * Creating content and organizing events to spread awareness about diversity in Fedora within and outside the Fedora community.

- * Supporting community building and engagement activities to foster inclusion.

- * Coordinating with Fedora SIGs and subprojects to foster Diversity and Inclusion in the community.

- * Supporting programs committed to building diversity and inclusion in Free and Open Source Software communities.

- 

- 

- [[current-projects]]

- == Current Projects

- 

- We are tracking our ongoing work and action items https://pagure.io/fedora-diversity/issues[here] in Pagure.

- 

- 

- [[meetings]]

- == Meetings

- 

- The Diversity and Inclusion team meets *bi-weekly* in #fedora-diversity at 1300 UTC on Fridays.

- The calendar for future meetings is available https://apps.fedoraproject.org/calendar/meeting/6397/[here].

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

- 

- 

- [[get-in-touch]]

- == Get in touch with us

- 

- * Want to help us shape diversity and inclusion in Fedora community?

-   We feel that everyone can bring in valuable inputs to this conversation.

-   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 {MAILINGLIST}[Diversity & Inclusion mailing list].

- 

- * Feel like you don't have much time to contribute?

-   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 {MAILINGLIST}[Diversity & Inclusion mailing list].

- We also have a Telegram bridge to IRC https://t.me/fedoradiversity[here.].

@@ -0,0 +1,3 @@

+ * xref:index.adoc[D&I Events]

+ ** xref:about-fwd.adoc[Fedora Women's Day]

+ *** xref:fwd-resource-pack.adoc[Resource pack]

@@ -0,0 +1,10 @@

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

+ 

+ = About Fedora Women's Day

+ 

+ Fedora Women's Day highlights and celebrates the women/non-binary contributers in open source communities like Fedora and beyond.

+ Fedora Women's Day marks the anniversary of the {FWIKI}/Women[Fedora Women] team and is headed by Fedora's Diversity and Inclusion Team.

+ 

+ In the month of September, we encourage  women and non binary contributors across Fedora to connect and network with one another.

+ FWD is an opportunity for women/non-binary to learn about free and open source software and jump-start their journey as a user/contributer of the FOSS.

+ In addition, FWD provides a platform for folks from diverse backgrounds to connect, learn, and get inspired by one another. 

\ No newline at end of file

modules/events/pages/fwd-resource-pack.adoc modules/ROOT/pages/fedora-womens-day/resource-pack.adoc
file renamed
+38 -34
@@ -1,58 +1,62 @@

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

+ include::ROOT:partial$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].

- These resources summarize information about Fedora.

- It also provides suggestions for what organizers should put on their agendas.

- Each sub-heading below represents a different piece of the resource pack.

+ In this page you can find a resource pack that helps in organizing a successful xref:events:about-fwd.adoc[Fedora Women's Day] event. The points below can be used in the event organizer's agenda:

  

- **Did you find people interested in contributing to Fedora**, Kindly help them create link:https://pagure.io/fedora-join/Welcome-to-Fedora/issues[Welcome to Fedora tickets] for themselves for Fedora Join SIG to keep track of their progress and help them become contributors.

- Read about the process link:https://docs.fedoraproject.org/en-US/fedora-join/welcome/welcome/[here].

+     * How to welcome contributors to Fedora

+     * A summary about Fedora D&I team

+     * Overview of different Fedora editions

+     * Fedora and Python

+     

+ == How to welcome new contributors to Fedora?

  

- If you need any help with it, Feel free to reach out to Fedora Join SIG for co-ordination at any of Fedora Join SIG's https://docs.fedoraproject.org/en-US/fedora-join/#communication[Communication channels].

+ 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 and Inclusion Team

  

- 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 xref:diversity-inclusion::team.adoc[team introduction page] with them.

+ At your event, start with an introduction to the Fedora Diversity and Inclusion Team.

+ Explain the role of D&I team in the Fedora community and its upcoming goals.

+ Share our xref:diversity-inclusion::team.adoc[team's introduction page] with anyone who is interested in learing more.

  

- What is the Fedora Diversity and Inclusion Team::

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

- The team works towards this goal by focusing on efforts including (but not limited to):

- * Creating content and organizing events to spread awareness about diversity in Fedora within and outside the Fedora community (like Fedora Women's Day!)

- * Supporting community building and engagement activities to foster inclusion

- * Coordinating with Fedora sub-projects to foster Diversity and Inclusion in the community

+ What is the role of Fedora Diversity and Inclusion Team?::

+ As the name indicates, the main goal of the D&I team is to foster diversity and inclusion in Fedora community.

+ Below are some of the many efforts focused by D&I team to achieve its goal:

+ * Creating content and organizing events to spread awareness about diversity within and outside Fedora community (like Fedora Women's Day!)

+ * Supporting community building and engagement activities to promote inclusion

+ * Coordinate with Fedora sub-projects to enhance Diversity and Inclusion in the community

  * Supporting programs committed to building diversity and inclusion in Free and Open Source Software communities

  

- What the team is working on::

- The team is working on a different range of tasks to support diversity and inclusion efforts in the Fedora Project.

- Recently, at the 2018 https://flocktofedora.org/[Fedora Flock conference], new additions were made to the conference, including gender-neutral bathrooms, a quiet room, and communication preference stickers.

- This supported our existing effort to draft https://pagure.io/fedora-diversity/issue/54[event inclusion guidelines] for Fedora event organizers.

- The intention is to share it widely with others in the community (and possibly other communities) to follow best practices for event organizers.

- Additionally, we hope to launch a https://pagure.io/fedora-diversity/issue/62[demographic survey] of the Fedora community in early 2019.

+ What the D&I team works on?::

+ The D&I team works on various tasks to support diversity 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 addition, we also hope to launch a https://pagure.io/fedora-diversity/issue/62[demographic survey] of the Fedora community in soon.

  

  

  == 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, explained below.

+ Each Edition has a different use case and audience as explained below.

  

  === Fedora Workstation

  

- https://getfedora.org/workstation/[Fedora Workstation] is the primary desktop configuration offered by Fedora.

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

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

  

  See recent features to Fedora Workstation {FWIKI}/Fedora_{MAJOROSVER}_talking_points#Fedora_Workstation[here].

  

  === Fedora Server

  

- https://getfedora.org/server/[Fedora Server] is the primary server configuration offered by Fedora.

- If your audience includes system administrators, Fedora Server is a good choice for seasoned system administrators to work with the latest technologies from the open source community.

- It is a short-lifecycle, community-supported server environment.

+ 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].
@@ -60,7 +64,7 @@

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

+ 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.
@@ -68,13 +72,13 @@

  

  === 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. 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 is a Fedora Edition to provide a strong foundation for IoT ecosystems.

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

  

@@ -0,0 +1,10 @@

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

+ 

+ = Events

+  

+ The Events section of D&I team aims to build a **Fedora Diversity events calendar** and indentify **regional events for participation** .

+ 

+ As the D&I team aims to assist minorities and promote a more inclusive environment in the Fedora community, we target minority-specific events. 

+  

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

+ For suggesting any modifications, please contact xref:ROOT:get-involved.adoc[Diversity and Inclusion Team] or the xref:council:ROOT:diversity-advisor.adoc[Diversity Adviser]. 

\ No newline at end of file

  1. Created new module 'events'
  2. Added nav.doc to this module
  3. Moved FWD folder from ROOT to events
  4. Added index.adoc describing about Fedora
  5. Deleted partials on the top as it was giving as error. I referred 'contributing to docs' for this.
  6. Added events/nav.adoc in antora.yml

1 new commit added

  • created a D&I events dropdown.added FWD under it.
3 years ago

Metadata Update from @nasirhm:
- Request assigned

3 years ago

@nasirhm thank you for the images. That is how I intended it to be :smile: but is that how the team wanted? is there something I need to change?

rebased onto ab03da9a41e59956cda559a2a45bbca9944ba526

3 years ago

Metadata Update from @jflory7:
- Pull-request tagged with: type - docs, type - events

3 years ago

+1! This looks right to me. :smile: Just as we discussed in the Mentor Hour.

hey @ramyaparimi thank you for working on it, We're actually having 2 issues that we need to fix:

rebased onto 0a02b32

3 years ago

1 new commit added

  • removed Fedora Women's Day tab from ROOT nav.adoc
3 years ago

+1! This looks right to me. :smile: Just as we discussed in the Mentor Hour.

yayy :grinning: Thank you @jflory7

1 new commit added

  • probably fixed attributes issue
3 years ago

@nasirhm Hey Nasir, seems like the attributes issue is fixed. At least I did not get any error in my preview. Let me know if it looks alright.

Thanks for catching those things, @nasirhm. :smile:

@ramyaparimi It looks like this Pull Request has a merge conflict. It needs to be resolved locally with git. Are you familiar with how to use git to rebase your git branch to the master branch? This can be a little complicated to do, so if you need help, please ping me in the Fedora Docs chat. :)

Minor change. This is a deprecated way of referencing a partials directory. This was deprecated in Antora 2.0. The new syntax for Antora 2.0 is below:

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

More info about reusable attributes / partials is here.

Not sure if you have tried this syntax already or if this worked for you. Have you tried writing the include:: statement like I wrote above?

Here's how the build looks like :

Screenshot_from_2020-10-12_02-42-27.png

The Partials work fine too. Please modify the partials import syntax to the new syntax and after a merge / rebase, we'll be good to merge :)

1 new commit added

  • partials changed to new antora syntax
3 years ago

@jflory7 thank you for checking my commits, I changed the syntax to the new version. It did not throw any error in my preview. Please let me know if it looks alright.
I also went ahead and rebased the branch.... I found that there is only one command to rebase git rebase master branch-name . I hope I did the right one.
@nasirhm Thank you for posting the preview images.

okay realized thats not the right way to rebase :D will get back once I work on it

@ramyaparimi No worries. Rebasing and fixing merge conflicts are probably one of the most famous, tricky things to learn in git.

However, you might find this comment I wrote up in another Fedora Docs Pull Request helpful. I listed the commands I normally use when rebasing.

Here are some blog posts that may be useful references too:

Hope this helps! :bouquet:

1 new commit added

  • updating current with upstream
3 years ago

@jflory7 @nasirhm I think I resolved the merge conflict.. could you please check it?

@jflory7 I have no idea how I missed that previous comment!!! Thank you so very much for sharing such valuable and helpful information..... as always you are an awesome mentor... I wish I saw that comment before I tried to do 'something'... lol

5 new commits added

  • resolved conflicts
  • probably resolved merge conflicts
  • added path to partials
  • created a D&I events dropdown.added FWD under it.
  • moved FWD dir to new events module
3 years ago

@jflory7 now there are duplicates of my commits :cry:

The Events link needs to be removed as it's also present in events module.

Element / Matrix as Matrix is the protocol and Element is the client (one of many)

As we've removed team.adocfrom the ROOT module, I think removing this link xref would be better and let's keep it simple.

@ramyaparimi As we've moved the about-fwd.adoc file to the events module, In fwd-resource-pack.adoc [line 5] it has a link to the about-fwd.adoc you can replace it with :

xref:events:about-fwd.adoc

Thank you @ramyaparimi for working on it, Once we make these minor changes (mentioned above), we'll be good to merge.

1 new commit added

  • made tiny changes
3 years ago

@nasirhm thank you for taking out your time to review my commits.. I went ahead and comitted the changes suggested :smile:

Suggested Change: xref:events:index.adoc

The link currently works fine, the suggested change makes it more intuitive.

@nasirhm thank you for taking out your time to review my commits.. I went ahead and comitted the changes suggested :smile:

Thank you for working on the PR :)

1 new commit added

  • made changes suggest, made content changes for better flow
3 years ago

@nasirhm Please review my changes. I took the liberty to edit some content for better flow and understanding. Probably need fresh eyes to review any grammatical or spelling error! My eyes are tired and not able to catch them anymore :weary:
Also, please ket me know if changing the content caused any deviation from the goal of the page.
Looking forward to reviews and editions. Thank you!

@ramyaparimi LGTM, Thank you for working on it. :)

@jflory7 Are we good to merge ?

xref:council:ROOT:diversity-advisor.adoc[Diversity Adviser] this link isn't working, should I remove this?.

xref:council:ROOT:diversity-advisor.adoc[Diversity Adviser] this link isn't working, should I remove this?.

@ramyaparimi What's happening here is it's referring to the Fedora Council doc's Page: here

As fedora, Builds all it's docs at one place It can create links to other repositories which will work fine when referred internally but will not be working while building a single repository locally.

Here's an example: https://pagure.io/fedora-docs/pages/blob/master/f/engineering/modules/ROOT/pages/index.adoc
Here is refers to all the Engineering Teams docs which will fail if you're building a single repository locally.

1 new commit added

  • reverted a change I made in the events page
3 years ago

@nasirhm thank you clarifying this for me.

Thanks all! I squashed these commits down to a singular commit locally. I am going to merge the Pull Request so this gets a chance to build soon in the Fedora Docs site. Thanks for working on this @ramyaparimi! :tada:

Merging. :ocean:

Pull-Request has been merged by jflory7

3 years ago