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

[MRG+1] simple grammatical/formatting changes (minor) #3260

Merged
merged 5 commits into from Jun 2, 2018
Merged

[MRG+1] simple grammatical/formatting changes (minor) #3260

merged 5 commits into from Jun 2, 2018

Conversation

@herinckc
Copy link

@herinckc herinckc commented May 15, 2018

No description provided.

@whalebot-helmsman
Copy link
Contributor

@whalebot-helmsman whalebot-helmsman commented May 17, 2018

@herinckc Problem with unit-tests was fixed in master. Can you merge master to this PR?

Colton Herinckx added 2 commits May 19, 2018
@codecov
Copy link

@codecov codecov bot commented May 19, 2018

Codecov Report

Merging #3260 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #3260   +/-   ##
=======================================
  Coverage   82.12%   82.12%           
=======================================
  Files         228      228           
  Lines        9599     9599           
  Branches     1385     1385           
=======================================
  Hits         7883     7883           
  Misses       1457     1457           
  Partials      259      259
@herinckc
Copy link
Author

@herinckc herinckc commented May 19, 2018

@whalebot-helmsman I believe I've successfully merged this pull request with master. Also removed a previous change that was causing the build to fail. Let me know if I need to change anything

@kmike
Copy link
Member

@kmike kmike commented Jun 1, 2018

Hey @herinckc! We haven't written these texts ourselves; license is BSD 3-clause, and Code of Conduct is from https://www.contributor-covenant.org/version/1/4/code-of-conduct. I'd prefer to keep them as-is; if you think there is an error in text, it is better to fix that in canonical texts. I'm not sure where to report issues with BSD license text (probably it is fixed forever); Code of Conduct spelling issues can be reported and fixed here: https://github.com/ContributorCovenant/contributor_covenant

@cathalgarvey
Copy link
Contributor

@cathalgarvey cathalgarvey commented Jun 1, 2018

I'd agree these are changes to upstream to the source of the policy. However, unless we actively track the policy as it evolves and changes (and, I don't think we do?), I see no harm in merging these changes as-is, too.

@kmike kmike changed the title simple grammatical/formatting changes (minor) [MRG+1] simple grammatical/formatting changes (minor) Jun 1, 2018
@kmike
Copy link
Member

@kmike kmike commented Jun 1, 2018

Ok, fair enough. +1 to merge after squashing then.

@dangra
dangra approved these changes Jun 2, 2018
Copy link
Member

@dangra dangra left a comment

It's hard to accept a change to a widely spread public document like BSD-3 but considering the change is really correct IMO it must be fixed here and upstream.


2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
notice, this list of conditions, and the following disclaimer in the

This comment has been minimized.

@dangra

dangra Jun 2, 2018
Member

I was reluctant to accept this change until I looked for more info and found this 😂 :
image

source: http://themoosebody.tumblr.com/post/10317138331/unlikelywords-why-the-oxford-comma-is

@dangra dangra merged commit 596f396 into scrapy:master Jun 2, 2018
2 checks passed
2 checks passed
codecov/patch Coverage not affected when comparing bac1e2d...6e563b7
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@kmike kmike added this to the v1.6 milestone Jul 4, 2018
@kmike kmike modified the milestones: v1.6, v1.5.1 Jul 11, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants