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

Jump to bottom

Doc: normalise pre-acronym determiners #31772

Merged
merged 2 commits into from Mar 11, 2022
Merged

Doc: normalise pre-acronym determiners #31772

merged 2 commits into from Mar 11, 2022

Conversation

erlend-aasland
Copy link
Contributor

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

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

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

@erlend-aasland erlend-aasland commented Mar 8, 2022

Triggered by #31753 (comment)

@JelleZijlstra JelleZijlstra self-assigned this Mar 8, 2022
JelleZijlstra
JelleZijlstra approved these changes Mar 9, 2022
View changes
Copy link
Member

@JelleZijlstra JelleZijlstra left a 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
Copy link
Member

@JelleZijlstra JelleZijlstra commented Mar 10, 2022

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

@JelleZijlstra JelleZijlstra merged commit 2d5835a into python:main Mar 11, 2022
12 checks passed
@miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Mar 11, 2022

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
Copy link
Contributor

@miss-islington miss-islington commented Mar 11, 2022

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
Copy link
Contributor

@miss-islington miss-islington commented Mar 11, 2022

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
Copy link
Contributor

@miss-islington miss-islington commented Mar 11, 2022

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
Copy link
Contributor

@miss-islington miss-islington commented Mar 11, 2022

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
Copy link

@bedevere-bot bedevere-bot commented Mar 11, 2022

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

JelleZijlstra added a commit to JelleZijlstra/cpython that referenced this issue Mar 11, 2022
@erlend-aasland @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
Copy link

@bedevere-bot bedevere-bot commented Mar 11, 2022

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

JelleZijlstra added a commit to JelleZijlstra/cpython that referenced this issue Mar 11, 2022
@erlend-aasland @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 issue Mar 12, 2022
@erlend-aasland @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 issue Mar 12, 2022
@erlend-aasland @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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JelleZijlstra JelleZijlstra

@berkerpeksag berkerpeksag

Assignees

@JelleZijlstra JelleZijlstra

Labels
CLA signed skip issue skip news type-documentation
Projects
None yet
Milestone
No milestone
6 participants
@erlend-aasland @JelleZijlstra @miss-islington @bedevere-bot @the-knights-who-say-ni @AlexWaygood