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

Word Choices, Spelling fixes. #16

Closed
wants to merge 1 commit into from
Closed

Word Choices, Spelling fixes. #16

wants to merge 1 commit into from

Conversation

jdc20181
Copy link

@jdc20181 jdc20181 commented Jul 7, 2017

Pre-Moderate, is a better concept to make it understandable that content is not pre moderated or checked. However, it can be removed etc.
changed supercede to supersede -
takedown is not one word, rather two words, I added a hyphen.

Cancelled or Canceled I guess this will turn into a debate, but from my research cancelled, overtook canceled in the 1980's, although many Americans, see Canceled as good enough.

Pre-Moderate, is a better concept to make it understandable that content is not pre moderated or checked. However, it can be removed etc.
changed supercede to supersede - 
takedown is not one word, rather two words, I added a hyphen. 

Cancelled or Canceled  I guess this will turn into a debate, but from my research cancelled, overtook canceled in the 1980's, although many Americans, see Canceled as good enough.
@jdc20181 jdc20181 mentioned this pull request Jul 7, 2017
@jcorbett-tandent
Copy link

IMO, this change should be rejected. I don't find "pre-moderate" to be clearer than "pre-screen," non-hyphenated "takedown" is the accepted spelling in the legal community, and "supercede" and "cancelled" are both valid spellings, notwithstanding whether alternate spellings are more or less popular.

@@ -161,7 +161,7 @@ To the extent such an agreement is not enforceable by applicable law, you grant
Paid accounts may have [private repositories](/articles/making-a-public-repository-private/), which allow the User to control access to Content. GitHub employees [only access private repositories when access is required for security or maintenance](/articles/github-security/#employee-access) or for support reasons, and then only with the consent of the repository owner. Because we respect your privacy in private repositories, you must respect the Terms of Service in everything you post to a private repository. If we have reason to believe the contents of a private repository are in violation of the law or of these Terms, we have the right to remove them.

### E. Copyright Infringement and DMCA Policy
If you believe that content on our website violates your copyright, please contact us in accordance with our [Digital Millennium Copyright Act Policy](/articles/dmca-takedown-policy/). If you are a copyright owner and you believe that content on GitHub violates your rights, please contact us via [our convenient DMCA form](https://github.com/contact/dmca) or by emailing copyright@github.com. There may be legal consequences for sending a false or frivolous takedown notice. Before sending a takedown request, you must consider legal uses such as fair use and licensed uses.
If you believe that content on our website violates your copyright, please contact us in accordance with our [Digital Millennium Copyright Act Policy](/articles/dmca-takedown-policy/). If you are a copyright owner and you believe that content on GitHub violates your rights, please contact us via [our convenient DMCA form](https://github.com/contact/dmca) or by emailing copyright@github.com. There may be legal consequences for sending a false or frivolous takedown notice. Before sending a take-down request, you must consider legal uses such as fair use and licensed uses.
Copy link

@ajhyndman ajhyndman Jul 11, 2017

Choose a reason for hiding this comment

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

There are two usages of the word takedown in this line. If this were to go forward, spelling should probably be consistent.

Copy link

Choose a reason for hiding this comment

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

I agree that usage should be consistent for the word. Inconsistency looks unprofessional and in legal land could throw a user into a state of confusion, making them wonder whether the sleeping difference implies something slightly different. And until they figure it the difference or reconcile the problem, they may be deterred from using GitHub. Would you mind making a PR indoor just this one fix and cite simply that consistency would be less confusing to users? Unless of course I missed something in this thread. Just because they disagreed with other changes does not mean they disagreed with this particular change.

@mhucka
Copy link

mhucka commented Jul 14, 2017

FYI, "takedown" is not hyphenated. See, for example, Merriam-Webster.

Copy link

@KyLeggiero KyLeggiero left a comment

Choose a reason for hiding this comment

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

There's no need to change "cancelled" to "canceled"

@@ -257,7 +257,7 @@ You are responsible for all fees, including taxes, associated with your use of t
It is your responsibility to properly cancel your account with GitHub. You can [cancel your account at any time](/articles/how-do-i-cancel-my-account/) by going into your Settings in the global navigation bar at the top of the screen. The Account screen provides a simple, no questions asked cancellation link. We are not able to cancel accounts in response to an email or phone request.

#### 2. Upon Cancellation
We will retain and use your information as necessary to comply with our legal obligations, resolve disputes, and enforce our agreements, but barring legal requirements, we will delete your full profile and the Content of your repositories within 90 days of cancellation or termination (though some information may remain in encrypted backups). This information can not be recovered once your account is cancelled.
We will retain and use your information as necessary to comply with our legal obligations, resolve disputes, and enforce our agreements, but barring legal requirements, we will delete your full profile and the Content of your repositories within 90 days of cancellation or termination (though some information may remain in encrypted backups). This information can not be recovered once your account is canceled.
Copy link

@KyLeggiero KyLeggiero Jul 16, 2017

Choose a reason for hiding this comment

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

Both spellings are correct in English. Cancelled is the primary spelling, with canceled as an alternative. It's better to use the primary, making this change more gunk than good.

@jdc20181 jdc20181 closed this Jul 16, 2017
@jdc20181
Copy link
Author

jdc20181 commented Jul 16, 2017

@mhucka I was going by https://www.merriam-webster.com/dictionary/take%20down this, and in many cases a hyphen is appropriate.
@benbalter Maybe so, mentioned that in my opening comments.

@ajhyndman didn't even see that.

Closing the PR, too much arguing about what is valid and isn't. Regardless of legal acceptability in the "legal community" this is not the legal community, this is a community of developers.

Next, better word choices make a difference. Regardless of ones' opinion rather a community's.

Closed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants