8000 Grammer polishing for the README by jsoref · Pull Request #734 · toml-lang/toml · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Grammer polishing for the README #734

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

Merged
merged 2 commits into from
May 7, 2020
Merged

Conversation

jsoref
Copy link
Contributor
@jsoref jsoref commented May 5, 2020

No description provided.

@ChristianSi
Copy link
Contributor

"MIME type" is correct, "MIME-type" is not, see Media type.

Otherwise, this looks good to me!

However, there is a tiny amount of overlap with my (still unmerged) clean-up PR #732, so it might make sense to wait until that one is merged and then adjust this one as needed.

@jsoref
Copy link
Contributor Author
jsoref commented May 6, 2020

Sorry, I should know better. I've reported the incorrect suggestion to app.gammarly.com.

I've tried to trigger a notification for the other PR. Hopefully that'll be enough for me to know when to update this. I presume you're OK w/ a rebased commit.

@pradyunsg pradyunsg changed the title Grammar Grammer polishing for the README May 7, 2020
Copy link
Member
@pradyunsg pradyunsg left a comment

Choose a reason for hiding this comment

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

LGTM, other than aforementioned point. :)

@jsoref
Copy link
Contributor Author
jsoref commented May 7, 2020

@pradyunsg: do you folks prefer extra commits or a squash-rebase?

(I'm assuming I'm waiting on the other PR to merge...)

@pradyunsg
Copy link
Member

No preference tbh. Anything works. I'll likely end up squash-merging, so... 🤷‍♂️

@pradyunsg
Copy link
Member

Alrighty! #732 is merged. Now, this PR has merge conflicts. :)

@jsoref
Copy link
Contributor Author
jsoref commented May 7, 2020

@pradyunsg: ok, now you can squash merge :-)

@@ -157,7 +157,7 @@ first = "Tom" last = "Preston-Werner" # INVALID
Keys
----

A key may be either bare, quoted or dotted.
A key may be either bare, quoted, or dotted.
Copy link
Member
@pradyunsg pradyunsg May 7, 2020

Choose a reason for hiding this comment

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

Hmmm... I'm gonna let this slide through. ;)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I checked before making that change, the document appears to favor Oxford commas. I don't usually go off randomly changing between styles. (My goal is to get things merged, not cause style fights.)

@pradyunsg pradyunsg merged commit 36e4975 into toml-lang:master May 7, 2020
@jsoref jsoref deleted the grammar branch May 7, 2020 18:39
@pradyunsg
Copy link
Member

Thanks for the PR @jsoref! ^>^

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.

3 participants
0