Skip to content

Use 'for example' instead of 'in other words'#8401

Merged
Mariatta merged 1 commit intopython:masterfrom
andresdelfino:fix-ie-in-for
Jul 30, 2018
Merged

Use 'for example' instead of 'in other words'#8401
Mariatta merged 1 commit intopython:masterfrom
andresdelfino:fix-ie-in-for

Conversation

@andresdelfino
Copy link
Copy Markdown
Contributor

@andresdelfino andresdelfino commented Jul 22, 2018 •
edited
Loading

As other mutable sequence types -such as bytearray-, are subject to this as well.

@bedevere-bot bedevere-bot added the docs Documentation in the Doc dir label Jul 22, 2018
BoboTiG
BoboTiG approved these changes Jul 28, 2018
View reviewed changes
Copy link
Copy Markdown
Contributor

@BoboTiG BoboTiG left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Thanks! It looks good to me.

@Mariatta Mariatta merged commit 6921ef7 into python:master Jul 30, 2018
@miss-islington
Copy link
Copy Markdown
Contributor

miss-islington commented Jul 30, 2018

Thanks @andresdelfino for the PR, and @Mariatta for merging it 🌮🎉.. I'm working now to backport this PR to: 2.7, 3.6, 3.7.
🐍🍒⛏🤖

@miss-islington
Copy link
Copy Markdown
Contributor

miss-islington commented Jul 30, 2018

Sorry @andresdelfino and @Mariatta, I had trouble checking out the 3.6 backport branch.
Please backport using cherry_picker on command line.
cherry_picker 6921ef7bef4eab3819b3d0fda5fa3e3b2a8c0613 3.6

@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented Jul 30, 2018

GH-8570 is a backport of this pull request to the 3.7 branch.

@miss-islington
Copy link
Copy Markdown
Contributor

miss-islington commented Jul 30, 2018

Sorry, @andresdelfino and @Mariatta, I could not cleanly backport this to 2.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 6921ef7bef4eab3819b3d0fda5fa3e3b2a8c0613 2.7

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 30, 2018
@andresdelfino @miss-islington
Use 'for example' instead of 'in other words' in compound statement d…
7264453 
…oc (pythonGH-8401)

(cherry picked from commit 6921ef7)

Co-authored-by: Andrés Delfino <adelfino@gmail.com>
@miss-islington
Copy link
Copy Markdown
Contributor

miss-islington commented Jul 30, 2018

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

@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented Jul 30, 2018

GH-8571 is a backport of this pull request to the 3.6 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 30, 2018
@andresdelfino @miss-islington
Use 'for example' instead of 'in other words' in compound statement d…
43073e8 
…oc (pythonGH-8401)

(cherry picked from commit 6921ef7)

Co-authored-by: Andrés Delfino <adelfino@gmail.com>
andresdelfino added a commit to andresdelfino/cpython that referenced this pull request Jul 30, 2018
@andresdelfino
[3.6] Use 'for example' instead of 'in other words' in compound state…
22ce200 
…ment doc (pythonGH-8401)

(cherry picked from commit 6921ef7)

Co-authored-by: Andrés Delfino <adelfino@gmail.com>
@andresdelfino andresdelfino mentioned this pull request Jul 30, 2018
Closed
andresdelfino added a commit to andresdelfino/cpython that referenced this pull request Jul 30, 2018
@andresdelfino
[2.7] Use 'for example' instead of 'in other words' in compound state…
45d46a1 
…ment doc (pythonGH-8401).

(cherry picked from commit 6921ef7)

Co-authored-by: Andrés Delfino <adelfino@gmail.com>
@andresdelfino andresdelfino mentioned this pull request Jul 30, 2018
Merged
@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented Jul 30, 2018

GH-8573 is a backport of this pull request to the 2.7 branch.

@andresdelfino andresdelfino deleted the fix-ie-in-for branch July 30, 2018 18:52
Mariatta pushed a commit to Mariatta/cpython that referenced this pull request Jul 30, 2018
@andresdelfino @Mariatta
[2.7] Use 'for example' instead of 'in other words' in compound state…
db0b15f 
…ment doc (pythonGH-8401).

(cherry picked from commit 6921ef7)

Co-authored-by: Andrés Delfino <adelfino@gmail.com>
@Mariatta Mariatta mentioned this pull request Jul 30, 2018
Closed
@Mariatta Mariatta removed their assignment Jul 30, 2018
@andresdelfino
Copy link
Copy Markdown
Contributor Author

andresdelfino commented Jul 30, 2018

Sorry for the trouble regarding the backports, @Mariatta . It's not clear to me when I should take care of them, and when I should wait for the core devs.

Mariatta pushed a commit that referenced this pull request Jul 30, 2018
@andresdelfino @Mariatta
[2.7] Use 'for example' instead of 'in other words' in compound state…
5e980f0 
…ment doc (GH-8401)

(cherry picked from commit 6921ef7)

Co-authored-by: Andrés Delfino <adelfino@gmail.com>
miss-islington added a commit that referenced this pull request Jul 30, 2018
@miss-islington @andresdelfino
Use 'for example' instead of 'in other words' in compound statement d…
399b47f 
…oc (GH-8401)

(cherry picked from commit 6921ef7)

Co-authored-by: Andrés Delfino <adelfino@gmail.com>
miss-islington added a commit that referenced this pull request Jul 30, 2018
@miss-islington @andresdelfino
Use 'for example' instead of 'in other words' in compound statement d…
a7bd4bb 
…oc (GH-8401)

(cherry picked from commit 6921ef7)

Co-authored-by: Andrés Delfino <adelfino@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Mariatta Mariatta Mariatta approved these changes

+1 more reviewer

@BoboTiG BoboTiG BoboTiG approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

docs Documentation in the Doc dir skip issue skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@andresdelfino @miss-islington @bedevere-bot @BoboTiG @Mariatta @berkerpeksag @the-knights-who-say-ni