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

bpo-47235: Note where a typo is intentional in examples #32348

Merged
merged 1 commit into from
Apr 6, 2022

Conversation

gpshead
Copy link
Member

@gpshead gpshead commented Apr 6, 2022

People keep popping up reporting these as typos in the docs despite
being described as typos in the surrounding text. Hopefully a comment
on the line itself makes it more obvious?

Arguably some of the typo examples are not using the "right" typo as the
"assret" one in particular is now detected by default due to how common
it was in actual code. But I don't want to to typo chasing by changing
these examples to be other not yet auto-detected typos as they still
illustrate the point well enough.

https://bugs.python.org/issue47235

Automerge-Triggered-By: GH:gpshead

People keep popping up reporting these as typos in the docs despite
being described as typos in the surrounding text.  Hopefully a comment
on the line itself makes it more obvious?

Arguably some of the typo examples are not using the "right" typo as the
"assret" one in particular is now detected by default due to how common
it was in actual code.  But I don't want to to typo chasing by changing
these examples to be other not yet auto-detected typos as they still
illustrate the point well enough.
@gpshead gpshead added docs Documentation in the Doc dir skip news needs backport to 3.8 needs backport to 3.9 only security fixes needs backport to 3.10 only security fixes labels Apr 6, 2022
@gpshead gpshead self-assigned this Apr 6, 2022
@gpshead gpshead changed the title bpo-47235: Note where a typo is intentional in code. bpo-47235: Note where a typo is intentional in examples Apr 6, 2022
@gpshead gpshead requested a review from Mariatta April 6, 2022 00:31
@miss-islington
Copy link
Contributor

Sorry, I can't merge this PR. Reason: You're not authorized to push to this branch. Visit https://docs.github.com/articles/about-protected-branches/ for more information..

@hugovk
Copy link
Member

hugovk commented Apr 6, 2022

Sorry, I can't merge this PR. Reason: You're not authorized to push to this branch. Visit https://docs.github.com/articles/about-protected-branches/ for more information..

The branch was temporarily protected whilst the 3.11 alpha was going out, all ready for merge now.

Copy link
Member

@Fidget-Spinner Fidget-Spinner left a comment

Choose a reason for hiding this comment

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

Maybe this might re-trigger the bot.

@JelleZijlstra
Copy link
Member

@gpshead any specific reason you want to backport this to 3.8? Pretty sure it's not a security issue :)

@gpshead gpshead merged commit ac1fb07 into python:main Apr 6, 2022
@miss-islington
Copy link
Contributor

Thanks @gpshead for the PR 🌮🎉.. I'm working now to backport this PR to: 3.9, 3.10.
🐍🍒⛏🤖

@gpshead gpshead deleted the assret-docs branch April 6, 2022 15:07
@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label Apr 6, 2022
@bedevere-bot
Copy link

GH-32367 is a backport of this pull request to the 3.10 branch.

@bedevere-bot
Copy link

GH-32368 is a backport of this pull request to the 3.9 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.9 only security fixes label Apr 6, 2022
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Apr 6, 2022
People keep popping up reporting these as typos in the docs despite
being described as typos in the surrounding text.  Hopefully a comment
on the line itself makes it more obvious?

Arguably some of the typo examples are not using the "right" typo as the
"assret" one in particular is now detected by default due to how common
it was in actual code.  But I don't want to to typo chasing by changing
these examples to be other not yet auto-detected typos as they still
illustrate the point well enough.
(cherry picked from commit ac1fb07)

Co-authored-by: Gregory P. Smith <greg@krypto.org>
@gpshead
Copy link
Member Author

gpshead commented Apr 6, 2022

any specific reason you want to backport this to 3.8? Pretty sure it's not a security issue :)

I tend to backport doc fixes as far back as they'll go if the patch applies cleanly as people to reference and read older versioned docs. not really important for this one. 3.8 removed.

miss-islington added a commit that referenced this pull request Apr 6, 2022
People keep popping up reporting these as typos in the docs despite
being described as typos in the surrounding text.  Hopefully a comment
on the line itself makes it more obvious?

Arguably some of the typo examples are not using the "right" typo as the
"assret" one in particular is now detected by default due to how common
it was in actual code.  But I don't want to to typo chasing by changing
these examples to be other not yet auto-detected typos as they still
illustrate the point well enough.
(cherry picked from commit ac1fb07)

Co-authored-by: Gregory P. Smith <greg@krypto.org>
miss-islington added a commit that referenced this pull request Apr 6, 2022
People keep popping up reporting these as typos in the docs despite
being described as typos in the surrounding text.  Hopefully a comment
on the line itself makes it more obvious?

Arguably some of the typo examples are not using the "right" typo as the
"assret" one in particular is now detected by default due to how common
it was in actual code.  But I don't want to to typo chasing by changing
these examples to be other not yet auto-detected typos as they still
illustrate the point well enough.
(cherry picked from commit ac1fb07)

Co-authored-by: Gregory P. Smith <greg@krypto.org>
@JelleZijlstra
Copy link
Member

Thanks, good to know. I was under the impression that we wanted to strictly limit changes on the security fix branches.

@Mariatta
Copy link
Member

Mariatta commented Apr 6, 2022

Great, thanks @gpshead!

@Mariatta
Copy link
Member

Mariatta commented Apr 6, 2022

Yeah sometimes we do fix documentation to security branches, but I think it depends on the Release Manager :)

hello-adam pushed a commit to hello-adam/cpython that referenced this pull request Jun 2, 2022
People keep popping up reporting these as typos in the docs despite
being described as typos in the surrounding text.  Hopefully a comment
on the line itself makes it more obvious?

Arguably some of the typo examples are not using the "right" typo as the
"assret" one in particular is now detected by default due to how common
it was in actual code.  But I don't want to to typo chasing by changing
these examples to be other not yet auto-detected typos as they still
illustrate the point well enough.
(cherry picked from commit ac1fb07)

Co-authored-by: Gregory P. Smith <greg@krypto.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs Documentation in the Doc dir skip news
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants