Skip to content

[3.14] gh-141984: Add "exhausted" to glossary, link existing mentions (GH-157225) - #157272

Merged
encukou merged 1 commit into
python:3.14from
StanFromIreland:backport-9bd670c-3.14
Sep 10, 2026
Merged

[3.14] gh-141984: Add "exhausted" to glossary, link existing mentions (GH-157225)#157272
encukou merged 1 commit into
python:3.14from
StanFromIreland:backport-9bd670c-3.14

Conversation

@StanFromIreland

@StanFromIreland StanFromIreland commented Sep 10, 2026 •
edited by bedevere-app Bot
Loading

Copy link
Copy Markdown
Member

@encukou @blaisep @StanFromIreland
[3.14] pythongh-141984: Add "exhausted" to glossary, link existing me…
0d1b271 
…ntions (pythonGH-157225)

(cherry picked from commit 9bd670c)

Co-authored-by: Petr Viktorin <encukou@gmail.com>
Co-authored-by: Blaise Pabon <blaise@gmail.com>
Co-authored-by: Stan Ulbrych <stan@python.org>
@bedevere-app bedevere-app Bot mentioned this pull request Sep 10, 2026
Open
@bedevere-app bedevere-app Bot added docs Documentation in the Doc dir skip news awaiting core review labels Sep 10, 2026
@github-project-automation github-project-automation Bot moved this to Todo in Docs PRs Sep 10, 2026
@bedevere-app bedevere-app Bot mentioned this pull request Sep 10, 2026
Merged
@StanFromIreland

StanFromIreland commented Sep 10, 2026 •
edited
Loading

Copy link
Copy Markdown
Member Author

@encukou, I think you gave up a little too early ;-) The only conflict was in Doc/library/functions.rst, in a hunk that was only present in later branches. (3.13, however, has multiple conflicts so I won't touch it.)

@read-the-docs-community

read-the-docs-community Bot commented Sep 10, 2026

Copy link
Copy Markdown

Documentation build overview

📚 cpython-previews | 🛠️ Build #34492990 | 📁 Comparing 0d1b271 against main (86b55a6)

  🔍 Preview build  

303 files changed · + 1 added · ± 282 modified · - 20 deleted

+ Added

± Modified

- Deleted

@encukou

encukou commented Sep 10, 2026

Copy link
Copy Markdown
Member

I didn't give up here -- Miss Islington would have backported from 3.15 cleanly, as soon as that would have been merged. Next time I'll note that; sorry for making you do the work!

(I did give up on 3.13, yeah.)

@encukou
encukou merged commit 04ed190 into python:3.14 Sep 10, 2026
38 checks passed
@github-project-automation github-project-automation Bot moved this from Todo to Done in Docs PRs Sep 10, 2026
@StanFromIreland
StanFromIreland deleted the backport-9bd670c-3.14 branch September 10, 2026 15:23
@StanFromIreland

StanFromIreland commented Sep 10, 2026

Copy link
Copy Markdown
Member Author

Oh sorry for the noise then, I didn't realise the label was moved!

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

Reviewers

@encukou encukou Awaiting requested review from encukou
@willingc willingc Awaiting requested review from willingc willingc is a code owner
@AA-Turner AA-Turner Awaiting requested review from AA-Turner AA-Turner is a code owner
@rhettinger rhettinger Awaiting requested review from rhettinger rhettinger is a code owner

Assignees

No one assigned

Labels

docs Documentation in the Doc dir skip news

Projects

Docs PRs
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@StanFromIreland @encukou