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-46586: Fix more erroneous doc links to builtins #31429

Merged
merged 8 commits into from
May 2, 2022

Conversation

meersuri
Copy link
Contributor

@meersuri meersuri commented Feb 19, 2022

@AlexWaygood
Copy link
Member

Hi, it looks like you need to merge origin/main into your branch here — the enum.property fix is still showing up in this PR, even though that one's already been committed to main 🙂

Doc/library/io.rst Outdated Show resolved Hide resolved
Doc/library/zipfile.rst Outdated Show resolved Hide resolved
Doc/library/io.rst Outdated Show resolved Hide resolved
Doc/library/fileinput.rst Outdated Show resolved Hide resolved
@merwok
Copy link
Member

merwok commented May 2, 2022

Thanks for this PR!
Could we also fix the wrong markup in the documentation of structseq objects? (see #90744 (comment))

@JelleZijlstra
Copy link
Member

@merwok let's keep that for another PR, so we can land this one.

@merwok
Copy link
Member

merwok commented May 2, 2022

I don’t really get why split these fixes into three changes here, two changes there (and the original ticket about enum has already had its scope widered), but 🤷🏽 it’s up to you! Better to merge some fixes than none 🙂

@JelleZijlstra JelleZijlstra merged commit cc6ae4f into python:main May 2, 2022
@miss-islington
Copy link
Contributor

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request May 2, 2022
Co-authored-by: Jelle Zijlstra <[email protected]>
Co-authored-by: Éric <[email protected]>
(cherry picked from commit cc6ae4f)

Co-authored-by: Meer Suri <[email protected]>
@miss-islington
Copy link
Contributor

Sorry, @meersuri and @JelleZijlstra, I could not cleanly backport this to 3.9 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker cc6ae4f4835f9e76a34f24cd1f666c1cc0fecfa3 3.9

@bedevere-bot
Copy link

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

@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label May 2, 2022
JelleZijlstra pushed a commit to JelleZijlstra/cpython that referenced this pull request May 2, 2022
…1429)

Co-authored-by: Jelle Zijlstra <[email protected]>
Co-authored-by: Éric <[email protected]>.
(cherry picked from commit cc6ae4f)

Co-authored-by: Meer Suri <[email protected]>
@bedevere-bot bedevere-bot removed the needs backport to 3.9 only security fixes label May 2, 2022
@bedevere-bot
Copy link

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

miss-islington added a commit that referenced this pull request May 2, 2022
Co-authored-by: Jelle Zijlstra <[email protected]>
Co-authored-by: Éric <[email protected]>
(cherry picked from commit cc6ae4f)

Co-authored-by: Meer Suri <[email protected]>
JelleZijlstra added a commit that referenced this pull request May 3, 2022
…92199)

Co-authored-by: Jelle Zijlstra <[email protected]>
Co-authored-by: Éric <[email protected]>.
(cherry picked from commit cc6ae4f)

Co-authored-by: Meer Suri <[email protected]>
hello-adam pushed a commit to hello-adam/cpython that referenced this pull request Jun 2, 2022
…1429) (python#92199)

Co-authored-by: Jelle Zijlstra <[email protected]>
Co-authored-by: Éric <[email protected]>.
(cherry picked from commit cc6ae4f)

Co-authored-by: Meer Suri <[email protected]>
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