#162 Ticket #116 Diversity Landing Page Updates
Closed 4 years ago by jflory7. Opened 4 years ago by ashlyna.
Unknown source d&i_doc_updates  into  master

@@ -31,8 +31,8 @@

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

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

  

  
@@ -52,8 +52,9 @@

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

+ We focus on such topics as empowering and celebrating women, LGBT+, BIPOC, and people with disabilities' involvement in open source projects and communities.

+ Information about some of our events can be found xref:events.adoc[Here].

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

Updated meeting information and meeting link.

I also made a couple of edits to the wording on our events to characterize the focus of fedora diversity events a little bit.

Hi @ashlyna, it looks good to me! But there is a merge conflict with some of the latest changes on master branch. Could you please take a look and resolve the merge conflict?

If it is tricky, I can share a few tips for fixing a merge conflict. Let me know!

Metadata Update from @jflory7:
- Pull-request tagged with: improvement, needs changes, type - docs, type - internal organization
- Request assigned

4 years ago

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

4 years ago

Metadata Update from @jflory7:
- Pull-request tagged with: blocked

4 years ago

Keeping this Pull Request open for now. We will look at it during the Docs Mentorship Hour next Thursday for a short overview on git rebase.

Metadata Update from @jflory7:
- Pull-request untagged with: blocked

4 years ago

@ashlyna / @lilyx and I followed up today on this Pull Request, but were unable to debug live because of login issues with Pagure (see fedora-infrastructure#9406). But we were still able to review interactive and normal git rebase and how to do that for this repo:

Screenshot of step-by-step instructions for rebasing PR 162

We worked on a temporary GitHub mirror of this repository. So once we figure out the Pagure login issues, Ashlyn should be able to jump back in and finalize this Pull Request.

@lilyx and I checked in earlier. Since she has a new FAS account, I am going to close out this Pull Request since it won't be updated.

To make the process easier, I pushed up the fixed changes from the old account to a new git branch here on this repo:

https://pagure.io/fedora-diversity/c/a2b131a6e8bedab10108bf92e5af10a8c25e4d08?branch=pr162-rebased

Will follow up with a change again soon!

Pull-Request has been closed by jflory7

4 years ago