Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Katie edits #2249

Merged
merged 14 commits into from
Nov 4, 2024
Merged

Katie edits #2249

merged 14 commits into from
Nov 4, 2024

Conversation

ericholscher
Copy link
Member

@ericholscher ericholscher commented Oct 29, 2024

Adds Katie's suggestions to the CFP.


📚 Documentation preview 📚: https://writethedocs-www--2249.org.readthedocs.build/

AnwesaNanda and others added 10 commits September 16, 2024 20:26
* Install docutils for rst2html for vale

* Install docutils for rst2html for vale

* Revert "Install docutils for rst2html for vale"

This reverts commit d5d6c35.
* [australia] - reminder, team and speaker updates

* Pretalx updates

* Update schedule

* Update docs/conf/australia/2024/news/tickets-closing-get-ready.rst

Co-authored-by: Sam <[email protected]>

* Updates from review

---------

Co-authored-by: Sam Wright <[email protected]>
Co-authored-by: Sam <[email protected]>
* Update formatting australia-2024-sessions.yaml

Fixed the list items in the talks and added some extra paragraphs from pretalx.

* Update australia-2024-sessions.yaml

* Fixed error

---------

Co-authored-by: Swapnil Ogale <[email protected]>
@ericholscher
Copy link
Member Author

ericholscher commented Oct 29, 2024

@plaindocs I pulled in some edits katie made to the original CFP text which happened before the recent edits on GH. I was trying to coordinate this a bit better, but at least this shows a diff of the changes that we can go back & forth on.

The rest of the changes are from merging main, which I shouldn't have done, but didn't want to handle the merge conflicts again 🙃

The changes are here: https://github.com/writethedocs/www/pull/2249/files#diff-db1f1a66f611ba243a3ce5b09ca9a71777066ea7caf21caca7bfccb00daa4a07

I generally think most of this is simplification and structure stuff, but feel free to push edits and then we can merge it in.

@ericholscher ericholscher changed the title katie edits Katie edits Oct 29, 2024
Copy link
Contributor

@plaindocs plaindocs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall these are good changes! :-)

docs/conf/portland/2025/cfp.rst Show resolved Hide resolved
docs/conf/portland/2025/cfp.rst Outdated Show resolved Hide resolved
docs/conf/portland/2025/cfp.rst Outdated Show resolved Hide resolved
docs/conf/portland/2025/cfp.rst Outdated Show resolved Hide resolved
docs/conf/portland/2025/cfp.rst Outdated Show resolved Hide resolved
docs/conf/portland/2025/cfp.rst Outdated Show resolved Hide resolved
docs/conf/portland/2025/cfp.rst Outdated Show resolved Hide resolved
docs/conf/portland/2025/cfp.rst Outdated Show resolved Hide resolved
docs/conf/portland/2025/cfp.rst Outdated Show resolved Hide resolved
docs/conf/portland/2025/cfp.rst Outdated Show resolved Hide resolved
Copy link
Member Author

@ericholscher ericholscher left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@plaindocs feel free to edit this the rest of the way that you want. I'm mostly just trying to get the changes in a good diff format.

docs/conf/portland/2025/cfp.rst Outdated Show resolved Hide resolved
docs/conf/portland/2025/cfp.rst Outdated Show resolved Hide resolved
Copy link
Contributor

@plaindocs plaindocs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ericholscher I've pushed up a few commits to address my comments. Feel free to merge this into the other PR.

When do we want to push it out? Moday?

@ericholscher ericholscher merged commit a8a84f1 into pdx-25-full-site Nov 4, 2024
1 check passed
@ericholscher ericholscher deleted the katie-edits branch November 4, 2024 21:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants