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.

Sign up for GitHub

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

chore: fix typos #116345

Merged
merged 1 commit into from
Mar 5, 2024
Merged

chore: fix typos #116345

merged 1 commit into from
Mar 5, 2024

Conversation

cuishuang
Copy link
Contributor

@cuishuang cuishuang commented Mar 5, 2024 •
edited by github-actions bot
Loading

@cuishuang
chore: fix typos
72de8de 
Signed-off-by: cui fliter <imcusg@gmail.com>
@cpython-cla-bot CPython CLA Bot
Copy link

cpython-cla-bot bot commented Mar 5, 2024 •
edited
Loading

All commit authors signed the Contributor License Agreement.
CLA signed

@bedevere-app
Copy link

bedevere-app bot commented Mar 5, 2024

Most changes to Python require a NEWS entry. Add one using the blurb_it web app or the blurb command-line tool.

If this change has little impact on Python users, wait for a maintainer to apply the skip news label instead.

carljm
carljm approved these changes Mar 5, 2024
View reviewed changes
Copy link
Member

@carljm carljm left a comment

Choose a reason for hiding this comment

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

Thanks! These all look like valid typo fixes to me.

The only debatable one is "ancilliary," which I find variously characterized as an "alternative", "archaic", or simply "mis-spelled" form of "ancillary." I think it's clear that "ancillary" is the more standard/common spelling, so we may as well go with it.

@carljm carljm merged commit e7ba6e9 into python:main Mar 5, 2024
47 checks passed
terryjreedy added a commit to terryjreedy/cpython that referenced this pull request Mar 5, 2024
@terryjreedy
chore: fix typos (python#116345)
70b92b7 
Signed-off-by: cui fliter <imcusg@gmail.com>
(cherry picked from commit e7ba6e9)
@bedevere-app
Copy link

bedevere-app bot commented Mar 5, 2024

GH-116370 is a backport of this pull request to the 3.12 branch.

@terryjreedy
Copy link
Member

I wanted the IDLE doc change backported and decided to first see how many backported with cherry-picker (10). The 5 conflicts were easy to fix and all or most of the rest will likely backport to 3.11.

terryjreedy added a commit that referenced this pull request Mar 5, 2024
@terryjreedy
[3.12] chore: fix typos (#116345) (#116370)
84b023d 
Co-authored-by: cui fliter <imcusg@gmail.com>
(cherry picked from commit e7ba6e9)
terryjreedy added a commit to terryjreedy/cpython that referenced this pull request Mar 5, 2024
@terryjreedy
[3.11] chore: fix typos (pythonGH-116345) (python#116370)
fe81aaa 
Co-authored-by: cui fliter <imcusg@gmail.com>
(cherry picked from commit e7ba6e9)
(cherry picked from commit 84b023d)
@bedevere-app
Copy link

bedevere-app bot commented Mar 5, 2024

GH-116375 is a backport of this pull request to the 3.11 branch.

terryjreedy added a commit that referenced this pull request Mar 5, 2024
@terryjreedy
[3.11] chore: fix typos (GH-116345) (#116375)
f4672e2 
Co-authored-by: cui fliter <imcusg@gmail.com>
(cherry picked from commit e7ba6e9)
@python python deleted a comment from bedevere-bot Mar 6, 2024
@python python deleted a comment from bedevere-bot Mar 6, 2024
@terryjreedy
Copy link
Member

Both backports merged. 5 of 10 3.12 backports valid in 3.11. I learned how to quickly remove files with conflicts when I did not want to edit the file, such as here when changed line did not exist in older versions. 'Issue' complete.

I deleted reports of unrelated buildbot failures in test_multiprocessing.

adorilson pushed a commit to adorilson/cpython that referenced this pull request Mar 25, 2024
@cuishuang @adorilson
chore: fix typos (python#116345)
c64e4d2 
Signed-off-by: cui fliter <imcusg@gmail.com>
diegorusso pushed a commit to diegorusso/cpython that referenced this pull request Apr 17, 2024
@cuishuang @diegorusso
chore: fix typos (python#116345)
75b180f 
Signed-off-by: cui fliter <imcusg@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@carljm carljm carljm approved these changes

@encukou encukou Awaiting requested review from encukou encukou is a code owner

@brettcannon brettcannon Awaiting requested review from brettcannon brettcannon is a code owner

@ericsnowcurrently ericsnowcurrently Awaiting requested review from ericsnowcurrently ericsnowcurrently is a code owner

@ncoghlan ncoghlan Awaiting requested review from ncoghlan ncoghlan is a code owner

@warsaw warsaw Awaiting requested review from warsaw warsaw is a code owner

@1st1 1st1 Awaiting requested review from 1st1 1st1 is a code owner

@asvetlov asvetlov Awaiting requested review from asvetlov asvetlov is a code owner

@gvanrossum gvanrossum Awaiting requested review from gvanrossum

@kumaraditya303 kumaraditya303 Awaiting requested review from kumaraditya303 kumaraditya303 is a code owner

@willingc willingc Awaiting requested review from willingc willingc is a code owner

Assignees
No one assigned
Labels
skip issue skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cuishuang @terryjreedy @carljm