8000 Improve the description of difflib in the documentation by Mandeepahlawat · Pull Request #22253 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

Improve the description of difflib in the documentation #22253

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
Merged
merged 2 commits into from
Sep 15, 2020
Merged

Improve the description of difflib in the documentation #22253

merged 2 commits into from
Sep 15, 2020

Conversation

Mandeepahlawat
Copy link
Contributor
@Mandeepahlawat Mandeepahlawat commented Sep 15, 2020 •
edited by miss-islington
Loading

From "can produce difference information in various formats ..."
to " can produce information about file differences in various formats ..."

Automerge-Triggered-By: @Mariatta

@the-knights-who-say-ni
Copy link

Hello, and thanks for your contribution!

I'm a bot set up to make sure that the project can legally accept this contribution by verifying everyone involved has signed the PSF contributor agreement (CLA).

Recognized GitHub username

We couldn't find a bugs.python.org (b.p.o) account corresponding to the following GitHub usernames:

@Mandeepahlawat

This might be simply due to a missing "GitHub Name" entry in one's b.p.o account settings. This is necessary for legal reasons before we can look at this contribution. Please follow the steps outlined in the CPython devguide to rectify this issue.

You can check yourself to see if the CLA has been received.

Thanks again for the contribution, we look forward to reviewing it!

@bedevere-bot bedevere-bot added docs Documentation in the Doc dir awaiting review labels Sep 15, 2020
Mariatta
Mariatta previously approved these changes Sep 15, 2020
View reviewed changes
Copy link
Member
@Mariatta Mariatta left a comment

Choose a reason for hiding this comment

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

Thanks!

Mariatta
Mariatta reviewed Sep 15, 2020
View reviewed changes
Copy link
Member
@Mariatta Mariatta left a comment

Choose a reason for hiding this comment

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

Hmm reading the entire paragraph again, I think "difference" is correct here.

@Mariatta Mariatta self-requested a review September 15, 2020 03:10
@Mariatta Mariatta dismissed their stale review September 15, 2020 03:11

"difference" is correct. Maybe we need to use the term diff?

@Mariatta Mariatta removed their request for review September 15, 2020 03:11
@Mariatta Mariatta mentioned this pull request Sep 15, 2020
Closed
@Mandeepahlawat
Copy link
Contributor Author

Hmm reading the entire paragraph again, I think "difference" is correct here.

@Mariatta yeah, i just read it again and in this context "difference" would be correct, but i don't think the whole sentence is grammatically correct. Although, "diff" would definitely be better

@vsajip
Copy link
Member
vsajip commented Sep 15, 2020

but i don't think the whole sentence is grammatically correct.

I can't see anything grammatically wrong with that sentence. However, "difference information" could be replaced by "information about differences" to avoid someone revisiting this because it looked wrong at first sight.

Mariatta
Mariatta reviewed Sep 15, 2020
View reviewed changes
@Mandeepahlawat @Mariatta
Updated text to make it more understandable
55a2ddb 
Co-authored-by: Mariatta <Mariatta@users.noreply.github.com>
Mariatta
Mariatta approved these changes Sep 15, 2020
View reviewed changes
Copy link
Member
@Mariatta Mariatta left a comment

Choose a reason for hiding this comment

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

Thanks!

@Mariatta Mariatta changed the title grammatical error fix Improve the description of difflib in the documentation Sep 15, 2020
@Mariatta
Copy link
Member

Have you sign the CLA?

@Mandeepahlawat
Copy link
Contributor Author

Have you sign the CLA?

yeah, I signed it after creating this pull request

@Mariatta Mariatta merged commit 5531269 into python:master Sep 15, 2020
@miss-islington
Copy link
Contributor
8000

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

@miss-islington
Copy link
Contributor

Sorry @Mandeepahlawat and @Mariatta, I had trouble checking out the 3.9 backport branch.
Please backport using cherry_picker on command line.
cherry_picker 5531269f698f789d1247123fd82681f7a455f66e 3.9

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Sep 15, 2020
@Mandeepahlawat @miss-islington
Improve the description of difflib in the documentation (pythonGH-22253)
5647318 
From "can produce difference information in various formats ..."
to " can produce information about file differences in various formats ..."

Automerge-Triggered-By: @Mariatta
(cherry picked from commit 5531269)

Co-authored-by: Mandeep <mandeep052@gmail.com>
@bedevere-bot
Copy link

GH-22260 is a backport of this pull request to the 3.8 branch.

@Mariatta Mariatta added needs backport to 3.9 only security fixes and removed needs backport to 3.9 only security fixes labels Sep 15, 2020
@miss-islington
Copy link
Contributor

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Sep 15, 2020
@Mandeepahlawat @miss-islington
Improve the description of difflib in the documentation (pythonGH-22253)
4a442f1 
From "can produce difference information in various formats ..."
to " can produce information about file differences in various formats ..."

Automerge-Triggered-By: @Mariatta
(cherry picked from commit 5531269)

Co-authored-by: Mandeep <mandeep052@gmail.com>
@bedevere-bot
Copy link

GH-22261 is a backport of this pull request to the 3.9 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.9 only security fixes label Sep 15, 2020
Mariatta pushed a commit that referenced this pull request Sep 15, 2020
@miss-islington @Mandeepahlawat
Improve the description of difflib in the documentation (GH-22253) (#…
0374883 
…22261)

From "can produce difference information in various formats ..."
to " can produce information about file differences in various formats ..."

Automerge-Triggered-By: @Mariatta
(cherry picked from commit 5531269)

Co-authored-by: Mandeep <mandeep052@gmail.com>
Mariatta pushed a commit that referenced this pull request Sep 15, 2020
@miss-islington @Mandeepahlawat
Improve the description of difflib in the documentation (GH-22253) (G…
5fdc142 
…H-22260)

From "can produce difference information in various formats ..."
to " can produce information about file differences in various formats ..."

Automerge-Triggered-By: @Mariatta
(cherry picked from commit 5531269)

Co-authored-by: Mandeep <mandeep052@gmail.com>
xzy3 pushed a commit to xzy3/cpython that referenced this pull request Oct 18, 2020
@Mandeepahlawat
Improve the description of difflib in the documentation (pythonGH-22253)
43c21dc 
From "can produce difference information in various formats ..."
to " can produce information about file differences in various formats ..."

Automerge-Triggered-By: @Mariatta
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

Assignees

@Mariatta Mariatta

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.
6 participants
@Mandeepahlawat @the-knights-who-say-ni @vsajip @Mariatta @miss-islington @bedevere-bot
0