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

bpo-44740: Lowercase "internet" and "web" where appropriate. #27378

Merged
merged 3 commits into from Jul 26, 2021

Conversation

@felixxm
Copy link
Contributor

@felixxm felixxm commented Jul 26, 2021

@ambv ambv merged commit 11749e2 into python:main Jul 26, 2021
14 checks passed
14 checks passed
@github-actions
Docs
Details
@github-actions
Check for source changes
Details
@github-actions
Check if generated files are up to date
Details
@github-actions
Windows (x86)
Details
@github-actions
Windows (x64)
Details
@github-actions
macOS
Details
@github-actions
Ubuntu
Details
@github-actions
Ubuntu SSL tests with OpenSSL (1.1.1k)
Details
@github-actions
Ubuntu SSL tests with OpenSSL (3.0.0-beta1)
Details
@github-actions
Address sanitizer Address sanitizer
Details
Azure Pipelines PR #20210726.42 succeeded
Details
@travis-ci
Travis CI - Pull Request Build Passed
Details
@bedevere-bot
bedevere/issue-number Issue number 44740 found
Details
@bedevere-bot
bedevere/news News entry found in Misc/NEWS.d
@bedevere-bot
Copy link

@bedevere-bot bedevere-bot commented Jul 26, 2021

@ambv: Please replace # with GH- in the commit message next time. Thanks!

@miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Jul 26, 2021

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

@miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Jul 26, 2021

Sorry @felixxm and @ambv, I had trouble checking out the 3.10 backport branch.
Please backport using cherry_picker on command line.
cherry_picker 11749e2dc20ad6a76e9a39e948853e89b2b4bbed 3.10

@miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Jul 26, 2021

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

@bedevere-bot
Copy link

@bedevere-bot bedevere-bot commented Jul 26, 2021

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

miss-islington added a commit to miss-islington/cpython that referenced this pull request Jul 26, 2021
…H-27378)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
(cherry picked from commit 11749e2)

Co-authored-by: Mariusz Felisiak <felisiak.mariusz@gmail.com>
@miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Jul 26, 2021

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

@miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Jul 26, 2021

Sorry, @felixxm and @ambv, I could not cleanly backport this to 3.9 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 11749e2dc20ad6a76e9a39e948853e89b2b4bbed 3.9

ambv pushed a commit that referenced this pull request Jul 26, 2021
… (GH-27380)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
(cherry picked from commit 11749e2)

Co-authored-by: Mariusz Felisiak <felisiak.mariusz@gmail.com>
@ambv
Copy link
Contributor

@ambv ambv commented Jul 26, 2021

As I expected, docs between main and 3.9 are too divergent to cleanly backport this manually. @felixxm, if you'd like to see your change land in 3.9 docs too, we will need a fresh PR against the 3.9 branch.

@terryjreedy terryjreedy requested a review from JulienPalard Jul 27, 2021
Copy link
Member

@terryjreedy terryjreedy left a comment

Changes are formally correct.

@JulienPalard Change is based on 2016 revised Associated Press Style Book. 'web' versus 'Web' looks correct to me. I am not sure whether any 'Internet' (versus 'internet') uses should remain. Your opinion?

@ambv I subsequently saw that this is merged already. Fine with me since you think so. Is there any situation in which 'Internet' is still proper, is has it been completely genericized?

Doc/howto/ipaddress.rst Show resolved Hide resolved
Doc/library/ftplib.rst Show resolved Hide resolved
Doc/library/http.server.rst Show resolved Hide resolved
@@ -106,7 +106,7 @@ BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1\
\f1\b0 \
1. This LICENSE AGREEMENT is between the Corporation for National Research Initiatives, having an office at 1895 Preston White Drive, Reston, VA 20191 ("CNRI"), and the Individual or Organization ("Licensee") accessing and otherwise using Python 1.6.1 software in source or binary form and its associated documentation.\
\
2. Subject to the terms and conditions of this License Agreement, CNRI hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python 1.6.1 alone or in any derivative version, provided, however, that CNRI's License Agreement and CNRI's notice of copyright, i.e., "Copyright (c) 1995-2001 Corporation for National Research Initiatives; All Rights Reserved" are retained in Python 1.6.1 alone or in any derivative version prepared by Licensee. Alternately, in lieu of CNRI's License Agreement, Licensee may substitute the following text (omitting the quotes): "Python 1.6.1 is made available subject to the terms and conditions in CNRI's License Agreement. This Agreement together with Python 1.6.1 may be located on the Internet using the following unique, persistent identifier (known as a handle): 1895.22/1013. This Agreement may also be obtained from a proxy server on the Internet using the following URL: http://hdl.handle.net/1895.22/1013".\
2. Subject to the terms and conditions of this License Agreement, CNRI hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python 1.6.1 alone or in any derivative version, provided, however, that CNRI's License Agreement and CNRI's notice of copyright, i.e., "Copyright (c) 1995-2001 Corporation for National Research Initiatives; All Rights Reserved" are retained in Python 1.6.1 alone or in any derivative version prepared by Licensee. Alternately, in lieu of CNRI's License Agreement, Licensee may substitute the following text (omitting the quotes): "Python 1.6.1 is made available subject to the terms and conditions in CNRI's License Agreement. This Agreement together with Python 1.6.1 may be located on the internet using the following unique, persistent identifier (known as a handle): 1895.22/1013. This Agreement may also be obtained from a proxy server on the internet using the following URL: http://hdl.handle.net/1895.22/1013".\

This comment has been minimized.

@terryjreedy

terryjreedy Jul 27, 2021
Member

I cannot see what changed.

This comment has been minimized.

@felixxm

felixxm Jul 27, 2021
Author Contributor

the internet is twice in this line.

This comment has been minimized.

@serhiy-storchaka

serhiy-storchaka Jul 27, 2021
Member

Has this change been conformed with lawyers? This is a legal document and cannot be changed arbitrarily.

@felixxm felixxm deleted the felixxm:bpo-44740 branch Jul 27, 2021
@felixxm
Copy link
Contributor Author

@felixxm felixxm commented Jul 27, 2021

@ambv Thanks

As I expected, docs between main and 3.9 are too divergent to cleanly backport this manually. @felixxm, if you'd like to see your change land in 3.9 docs too, we will need a fresh PR against the 3.9 branch.

I wasn't sure what is the policy of backporting docs changes. It's probably not worth the extra work for documentation translators 🤔

Doc/howto/ipaddress.rst Show resolved Hide resolved
Doc/library/ftplib.rst Show resolved Hide resolved
Doc/whatsnew/2.3.rst Show resolved Hide resolved
@@ -106,7 +106,7 @@ BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1\
\f1\b0 \
1. This LICENSE AGREEMENT is between the Corporation for National Research Initiatives, having an office at 1895 Preston White Drive, Reston, VA 20191 ("CNRI"), and the Individual or Organization ("Licensee") accessing and otherwise using Python 1.6.1 software in source or binary form and its associated documentation.\
\
2. Subject to the terms and conditions of this License Agreement, CNRI hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python 1.6.1 alone or in any derivative version, provided, however, that CNRI's License Agreement and CNRI's notice of copyright, i.e., "Copyright (c) 1995-2001 Corporation for National Research Initiatives; All Rights Reserved" are retained in Python 1.6.1 alone or in any derivative version prepared by Licensee. Alternately, in lieu of CNRI's License Agreement, Licensee may substitute the following text (omitting the quotes): "Python 1.6.1 is made available subject to the terms and conditions in CNRI's License Agreement. This Agreement together with Python 1.6.1 may be located on the Internet using the following unique, persistent identifier (known as a handle): 1895.22/1013. This Agreement may also be obtained from a proxy server on the Internet using the following URL: http://hdl.handle.net/1895.22/1013".\
2. Subject to the terms and conditions of this License Agreement, CNRI hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python 1.6.1 alone or in any derivative version, provided, however, that CNRI's License Agreement and CNRI's notice of copyright, i.e., "Copyright (c) 1995-2001 Corporation for National Research Initiatives; All Rights Reserved" are retained in Python 1.6.1 alone or in any derivative version prepared by Licensee. Alternately, in lieu of CNRI's License Agreement, Licensee may substitute the following text (omitting the quotes): "Python 1.6.1 is made available subject to the terms and conditions in CNRI's License Agreement. This Agreement together with Python 1.6.1 may be located on the internet using the following unique, persistent identifier (known as a handle): 1895.22/1013. This Agreement may also be obtained from a proxy server on the internet using the following URL: http://hdl.handle.net/1895.22/1013".\

This comment has been minimized.

@serhiy-storchaka

serhiy-storchaka Jul 27, 2021
Member

Has this change been conformed with lawyers? This is a legal document and cannot be changed arbitrarily.

Misc/HISTORY Show resolved Hide resolved
@felixxm
Copy link
Contributor Author

@felixxm felixxm commented Jul 27, 2021

@terryjreedy @serhiy-storchaka Thanks for reviews 👍 I prepared PR with requested edits #27385.

@terryjreedy
Copy link
Member

@terryjreedy terryjreedy commented Jul 27, 2021

Some of us routinely try doc change backports. If they do so cleanly, fine. If not, optional -- if someone makes the new PR.

JuniorJPDJ added a commit to JuniorJPDJ/cpython that referenced this pull request Aug 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment