Here's how the build looks like: https://imgur.com/a/Xgmo8D1

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

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

• The Events page's entry is available on both nav.adoc files in both modules (ROOT and events)
• The partials are breaking in the events module as we've got the import removed, here's a fix: https://docs.fedoraproject.org/en-US/fedora-docs/asciidoc-fedora/reusable-attributes/#import

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

yayy :grinning: Thank you @jflory7

@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 :

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 :)

@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:

• Don't Be Scared of git rebase (this is the most useful one I think)
• How to Rebase a Pull Request
• The Git Rebase Introduction I Wish I'd Had

Hope this helps! :bouquet:

@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

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

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

https://pagure.io/fork/ramyaparimi/fedora-diversity/blob/33d112cb0f998298193555f162fed47060d266d6/f/modules/events/pages/about-fwd.adoc#_7

Another link to team.adoc page, please remove the link and let's keep the simple text.

@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 :)

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

@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: