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

[3.5] Update make_rst.py to match the master version #81193

Merged

Conversation

YuriSizov
Copy link
Contributor

A cherry-pick of #75898. There were two conflicts between 3.x and 3.5:

  • We don't document editor settings in 3.5, so one of the fixes wasn't even needed.
  • 3.x supports [kbd] in the docs, while 3.5 does not so make_rst.py was slightly different between the two versions; I've ported all the changes as is including [kbd] support, because the cost of having it is tiny. Note that this doesn't mean that 3.5 now supports [kbd], for that editor help needs to be updated as well.

Note that after this PR when doing the first class reference sync, godotengine/godot-docs#7146 also needs to be cherry-picked for 3.5.

This does not include master-specific concepts, like
constructors, operators, annotations, and bitfields.

(cherry picked from commit 0f24d6e)
@YuriSizov YuriSizov added this to the 3.5 milestone Aug 31, 2023
@YuriSizov YuriSizov requested a review from a team as a code owner August 31, 2023 12:28
@akien-mga akien-mga merged commit 6cedbcc into godotengine:3.5 Sep 1, 2023
13 checks passed
@akien-mga
Copy link
Member

Thanks!

@YuriSizov YuriSizov deleted the docs-make-rst-enhancements-3.5 branch September 1, 2023 09:28
@YuriSizov
Copy link
Contributor Author

godotengine/godot-docs#7146 has been cherry-picked and class reference changes have been synced godotengine/godot-docs#7967. Should be up on the website in an hour or so.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants