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

felixxm · 2021-07-26T20:36:06Z

https://bugs.python.org/issue44740

bedevere-bot · 2021-07-26T22:11:58Z

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

miss-islington · 2021-07-26T22:12:08Z

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

miss-islington · 2021-07-26T22:12:10Z

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 · 2021-07-26T22:12:34Z

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

bedevere-bot · 2021-07-26T22:12:42Z

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

…H-27378) Co-authored-by: Łukasz Langa <[email protected]> (cherry picked from commit 11749e2) Co-authored-by: Mariusz Felisiak <[email protected]>

miss-islington · 2021-07-26T22:35:02Z

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

miss-islington · 2021-07-26T22:35:05Z

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

… (GH-27380) Co-authored-by: Łukasz Langa <[email protected]> (cherry picked from commit 11749e2) Co-authored-by: Mariusz Felisiak <[email protected]>

ambv · 2021-07-26T22:36:10Z

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

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

Doc/library/ftplib.rst

Doc/library/http.server.rst

terryjreedy · 2021-07-27T02:50:04Z

Mac/BuildScript/resources/License.rtf

@@ -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".\


I cannot see what changed.

the internet is twice in this line.

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

felixxm · 2021-07-27T04:18:37Z

@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

Doc/library/ftplib.rst

Doc/whatsnew/2.3.rst

serhiy-storchaka · 2021-07-27T05:35:30Z

Mac/BuildScript/resources/License.rtf

@@ -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".\


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

Misc/HISTORY

felixxm · 2021-07-27T05:54:57Z

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

terryjreedy · 2021-07-27T07:50:15Z

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

felixxm added 2 commits July 26, 2021 22:34

bpo-44740: Lowercase "internet" where appropriate.

c575e7c

bpo-44740: Lowercase "web" where appropriate.

ef3045f

felixxm requested review from 1st1, asvetlov, berkerpeksag, ethanfurman, terryjreedy, tiran, vsajip and a team as code owners July 26, 2021 20:36

bedevere-bot added the awaiting review label Jul 26, 2021

the-knights-who-say-ni added the CLA signed label Jul 26, 2021

Add Blurb

6053b1b

ambv merged commit 11749e2 into python:main Jul 26, 2021

bedevere-bot removed the awaiting review label Jul 26, 2021

ambv added the needs backport to 3.10 only security fixes label Jul 26, 2021

miss-islington assigned ambv Jul 26, 2021

ambv added needs backport to 3.10 only security fixes and removed needs backport to 3.10 only security fixes labels Jul 26, 2021

bedevere-bot removed the needs backport to 3.10 only security fixes label Jul 26, 2021

ambv added the needs backport to 3.9 only security fixes label Jul 26, 2021

ambv removed the needs backport to 3.9 only security fixes label Jul 26, 2021

terryjreedy requested a review from JulienPalard July 27, 2021 02:52

terryjreedy reviewed Jul 27, 2021

View reviewed changes

felixxm deleted the bpo-44740 branch July 27, 2021 04:08

serhiy-storchaka reviewed Jul 27, 2021

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

felixxm commented Jul 26, 2021 •

edited by bedevere-bot

Loading

bedevere-bot commented Jul 26, 2021

miss-islington commented Jul 26, 2021

miss-islington commented Jul 26, 2021

miss-islington commented Jul 26, 2021

bedevere-bot commented Jul 26, 2021

miss-islington commented Jul 26, 2021

miss-islington commented Jul 26, 2021

ambv commented Jul 26, 2021

terryjreedy left a comment •

edited

Loading

terryjreedy Jul 27, 2021

felixxm Jul 27, 2021

serhiy-storchaka Jul 27, 2021

felixxm commented Jul 27, 2021

serhiy-storchaka Jul 27, 2021

felixxm commented Jul 27, 2021

terryjreedy commented Jul 27, 2021

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

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

Conversation

felixxm commented Jul 26, 2021 • edited by bedevere-bot Loading

bedevere-bot commented Jul 26, 2021

miss-islington commented Jul 26, 2021

miss-islington commented Jul 26, 2021

miss-islington commented Jul 26, 2021

bedevere-bot commented Jul 26, 2021

miss-islington commented Jul 26, 2021

miss-islington commented Jul 26, 2021

ambv commented Jul 26, 2021

terryjreedy left a comment • edited Loading

Choose a reason for hiding this comment

terryjreedy Jul 27, 2021

Choose a reason for hiding this comment

felixxm Jul 27, 2021

Choose a reason for hiding this comment

serhiy-storchaka Jul 27, 2021

Choose a reason for hiding this comment

felixxm commented Jul 27, 2021

serhiy-storchaka Jul 27, 2021

Choose a reason for hiding this comment

felixxm commented Jul 27, 2021

terryjreedy commented Jul 27, 2021

felixxm commented Jul 26, 2021 •

edited by bedevere-bot

Loading

terryjreedy left a comment •

edited

Loading