Skip to content

docs: remove unneeded hyphens from compound modifiers #94551

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

Merged
merged 1 commit into from
Jul 5, 2022

Conversation

nedbat
Copy link
Member

@nedbat nedbat commented Jul 4, 2022

This was discussed here: https://discuss.python.org/t/slight-grammar-fix-throughout-adverbs-dont-need-hyphen/17021

(sorry if I haven't provided the correct metadata yet...)

@ambv
Copy link
Contributor

ambv commented Jul 5, 2022

I started reading the PR with my mind made up that I dislike changing this because the hyphen makes things easier to a non-native speaker like myself. However, some time through reviewing the changes I "got it". Indeed, the hyphen is unnecessary for the clear case of adverbs followed by an adjective. So yeah, let's do it.

Since this is sweeping, it should be backported. Let's see how many conflicts we get 🤠

@ambv ambv merged commit 3440d19 into python:main Jul 5, 2022
@miss-islington
Copy link
Contributor

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

@bedevere-bot
Copy link

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

@miss-islington
Copy link
Contributor

Sorry, @nedbat and @ambv, I could not cleanly backport this to 3.10 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 3440d197a55800ecceea3e115e44b4262411359c 3.10

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 5, 2022
@nedbat
Copy link
Member Author

nedbat commented Jul 5, 2022

Since this is a small pervasive change, I'm fine with not back-porting it if it will cause any friction.

ambv pushed a commit to ambv/cpython that referenced this pull request Jul 5, 2022
@ambv
Copy link
Contributor

ambv commented Jul 5, 2022

The thing is, not backporting will cause more friction in the long term as it will cause conflicts for other docs backports. It's better to deal with those now. 3.11 applied cleanly, 3.10 had a few conflicts which I just resolved.

@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label Jul 5, 2022
@bedevere-bot
Copy link

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

@nedbat nedbat deleted the nedbat/adverb-hyphen branch July 5, 2022 09:24
JulienPalard pushed a commit to python/python-docs-fr that referenced this pull request Mar 27, 2023
pareil, fuzzies vérifiées upstream. Des liens passés en HTTPS, des backquotes rajoutées, et des tirets retirés.
Il y a 2-3 PRs qui sont passées upstream et qui provoquent beaucoup de bruit chez nous (des fois pour pas grand chose, particulièrement les tirets).

La PR upstream qui retire des tirets partout, pour exemple : python/cpython#94551

travail accompli avec POEdit Pro+ ✌️

Co-authored-by: Mathieu Dupuy <[email protected]>
Reviewed-on: https://git.afpy.org/AFPy/python-docs-fr/pulls/106
Reviewed-by: jeanas <[email protected]>
Co-authored-by: deronnax <[email protected]>
Co-committed-by: deronnax <[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 issue skip news
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants