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

Jump to bottom

bpo-34065: Fix wrongly written basicConfig document rst syntax about force #8153

Merged
merged 1 commit into from Jul 7, 2018
Merged

bpo-34065: Fix wrongly written basicConfig document rst syntax about force #8153

merged 1 commit into from Jul 7, 2018

Conversation

corona10
Copy link
Member

@corona10 corona10 commented Jul 7, 2018 •
edited by bedevere-bot

@corona10
Copy link
Member Author

corona10 commented Jul 7, 2018

@Mariatta Can you take a look?

serhiy-storchaka
serhiy-storchaka requested changes Jul 7, 2018
View reviewed changes
Copy link
Member

@serhiy-storchaka serhiy-storchaka left a comment

Choose a reason for hiding this comment

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

Please fix also the markup in versionchanged notes below. And sort notes in the order of the version.

@bedevere-bot
Copy link

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

And if you don't make the requested changes, you will be put in the comfy chair!

@serhiy-storchaka serhiy-storchaka added the docs Documentation in the Doc dir label Jul 7, 2018
@corona10
Copy link
Member Author

corona10 commented Jul 7, 2018

@serhiy-storchaka
Thanks for the comment.

The mark up of The ``force`` argument was added. looks like correct without version sort since
The ``style`` argument was added. is using the same syntax.

Should I update this markup into The *force* argument was added.?

Thanks!

@corona10
Copy link
Member Author

corona10 commented Jul 7, 2018

Okay I will fix them all, I understand what you are saying.

@serhiy-storchaka
Copy link
Member

*name* is usually used for all arguments.

@corona10
Copy link
Member Author

corona10 commented Jul 7, 2018

I have made the requested changes; please review again

@bedevere-bot
Copy link

Thanks for making the requested changes!

@serhiy-storchaka: please review the changes made to this pull request.

@serhiy-storchaka serhiy-storchaka merged commit 2800dcf into python:master Jul 7, 2018
@miss-islington
Copy link
Contributor

Thanks @corona10 for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 3.6, 3.7.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Sorry, @corona10 and @serhiy-storchaka, I could not cleanly backport this to 3.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 2800dcf656229c2ca4c90b4ddbace0717c41bb9e 3.7

@serhiy-storchaka
Copy link
Member

Do you mind to make backports to 3.6 and 3.7 manually @corona10?

@miss-islington
Copy link
Contributor

Sorry, @corona10 and @serhiy-storchaka, I could not cleanly backport this to 3.6 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 2800dcf656229c2ca4c90b4ddbace0717c41bb9e 3.6

@corona10
Copy link
Member Author

corona10 commented Jul 7, 2018

@serhiy-storchaka Sure

corona10 added a commit to corona10/cpython that referenced this pull request Jul 7, 2018
@corona10
[3.6] bpo-34065: Improve the markup of logging.basicConfig() arguments (
dad6e8e 
pythonGH-8153).

(cherry picked from commit 2800dcf)

Co-authored-by: Dong-hee Na <donghee.na92@gmail.com>
@bedevere-bot
Copy link

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

corona10 added a commit to corona10/cpython that referenced this pull request Jul 7, 2018
@corona10
[3.7] bpo-34065: Improve the markup of logging.basicConfig() arguments (
ed523c0 
pythonGH-8153).

(cherry picked from commit 2800dcf)

Co-authored-by: Dong-hee Na <donghee.na92@gmail.com>
@bedevere-bot
Copy link

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

serhiy-storchaka pushed a commit that referenced this pull request Jul 7, 2018
@corona10 @serhiy-storchaka
[3.6] bpo-34065: Improve the markup of logging.basicConfig() arguments (
cad4a27 
GH-8153). (GH-8155)

(cherry picked from commit 2800dcf)

Co-authored-by: Dong-hee Na <donghee.na92@gmail.com>
serhiy-storchaka pushed a commit that referenced this pull request Jul 7, 2018
@corona10 @serhiy-storchaka
[3.7] bpo-34065: Improve the markup of logging.basicConfig() arguments (
75f2eb5 
GH-8153). (GH-8156)

(cherry picked from commit 2800dcf)

Co-authored-by: Dong-hee Na <donghee.na92@gmail.com>
@corona10 corona10 deleted the bpo-34065 branch July 7, 2018 16:43
@serhiy-storchaka serhiy-storchaka removed their assignment Oct 28, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@serhiy-storchaka serhiy-storchaka serhiy-storchaka approved these changes

Assignees
No one assigned
Labels
docs Documentation in the Doc dir
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@corona10 @bedevere-bot @serhiy-storchaka @miss-islington @the-knights-who-say-ni