◐ Shell
reader mode source ↗
Skip to content

Doc: normalise pre-acronym determiners#31772

Merged
JelleZijlstra merged 2 commits into
python:mainfrom
erlend-aasland:es-es-cue-el-no-sequel
Mar 11, 2022
Merged

Doc: normalise pre-acronym determiners#31772
JelleZijlstra merged 2 commits into
python:mainfrom
erlend-aasland:es-es-cue-el-no-sequel

Conversation

@erlend-aasland

@erlend-aasland erlend-aasland commented Mar 8, 2022 •
edited
Loading

Copy link
Copy Markdown
Contributor

For consistency, replace seven instances of "a SQL" with "an SQL" in sqlite3 docs/docstrings.

Doc: normalise pre-acronym determiners …
5163caf 
For consistency, replace "a SQL" with "an SQL".
@erlend-aasland

erlend-aasland commented Mar 8, 2022

Copy link
Copy Markdown
Contributor Author

Triggered by #31753 (comment)

@JelleZijlstra JelleZijlstra self-assigned this Mar 8, 2022
@AlexWaygood AlexWaygood added the docs Documentation in the Doc dir label Mar 8, 2022
JelleZijlstra
JelleZijlstra approved these changes Mar 9, 2022
View reviewed changes

@JelleZijlstra JelleZijlstra left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Hide comment

It's good to make this consistent in the sqlite docs. There are two more instances in howto/functional.rst and Lib/socketserver.py, but I think we can leave those alone since they're not directly about SQLite.

@gvanrossum I'm planning to merge this soon

@JelleZijlstra

JelleZijlstra commented Mar 10, 2022

Copy link
Copy Markdown
Member

There's a merge conflict, could you regenerate Argument Clinic?

@JelleZijlstra JelleZijlstra merged commit 2d5835a into python:main Mar 11, 2022
@miss-islington

miss-islington commented Mar 11, 2022

Copy link
Copy Markdown
Contributor

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

@miss-islington

miss-islington commented Mar 11, 2022

Copy link
Copy Markdown
Contributor

Sorry, @erlend-aasland and @JelleZijlstra, I could not cleanly backport this to 3.10 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 2d5835a019a46573d5b1b614c8ef88d6b564d8d4 3.10

@miss-islington

miss-islington commented Mar 11, 2022

Copy link
Copy Markdown
Contributor

Sorry @erlend-aasland and @JelleZijlstra, I had trouble checking out the 3.9 backport branch.
Please backport using cherry_picker on command line.
cherry_picker 2d5835a019a46573d5b1b614c8ef88d6b564d8d4 3.9

@miss-islington

miss-islington commented Mar 11, 2022

Copy link
Copy Markdown
Contributor

Thanks @erlend-aasland for the PR, and @JelleZijlstra for merging it 🌮🎉.. I'm working now to backport this PR to: 3.9.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

@miss-islington

miss-islington commented Mar 11, 2022

Copy link
Copy Markdown
Contributor

Sorry, @erlend-aasland 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 2d5835a019a46573d5b1b614c8ef88d6b564d8d4 3.9

@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label Mar 11, 2022
@bedevere-bot

bedevere-bot commented Mar 11, 2022

Copy link
Copy Markdown

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

JelleZijlstra pushed a commit to JelleZijlstra/cpython that referenced this pull request Mar 11, 2022
@JelleZijlstra
[3.10] sqlite3: normalise pre-acronym determiners (pythonGH-31772) …
78803b3 
For consistency, replace "a SQL" with "an SQL"..
(cherry picked from commit 2d5835a)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
@bedevere-bot

bedevere-bot commented Mar 11, 2022

Copy link
Copy Markdown

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

JelleZijlstra pushed a commit to JelleZijlstra/cpython that referenced this pull request Mar 11, 2022
@JelleZijlstra
[3.9] sqlite3: normalise pre-acronym determiners (pythonGH-31772) …
78672ae 
For consistency, replace "a SQL" with "an SQL"..
(cherry picked from commit 2d5835a)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
JelleZijlstra added a commit that referenced this pull request Mar 12, 2022
@JelleZijlstra
[3.10] sqlite3: normalise pre-acronym determiners (GH-31772) (GH-31806) …
d8ba5c1 
For consistency, replace "a SQL" with "an SQL"..
(cherry picked from commit 2d5835a)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
JelleZijlstra added a commit that referenced this pull request Mar 12, 2022
@JelleZijlstra
[3.9] sqlite3: normalise pre-acronym determiners (GH-31772) (GH-31807) …
49ff5ed 
For consistency, replace "a SQL" with "an SQL"..
(cherry picked from commit 2d5835a)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
hello-adam pushed a commit to hello-adam/cpython that referenced this pull request Jun 2, 2022
@JelleZijlstra @hello-adam
[3.9] sqlite3: normalise pre-acronym determiners (pythonGH-31772) (py… …
05c6111 
…thonGH-31807)

For consistency, replace "a SQL" with "an SQL"..
(cherry picked from commit 2d5835a)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
@erlend-aasland erlend-aasland mentioned this pull request Jul 27, 2022
Closed
5 tasks
@erlend-aasland erlend-aasland deleted the es-es-cue-el-no-sequel branch July 4, 2023 22:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@JelleZijlstra JelleZijlstra JelleZijlstra approved these changes

@berkerpeksag berkerpeksag Awaiting requested review from berkerpeksag

Assignees

@JelleZijlstra JelleZijlstra

Labels

docs Documentation in the Doc dir skip issue skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@erlend-aasland @JelleZijlstra @miss-islington @bedevere-bot @the-knights-who-say-ni @AlexWaygood