Skip to content

Merge upstream changes #8

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 8 commits into from
Oct 27, 2015
Merged

Merge upstream changes #8

merged 8 commits into from
Oct 27, 2015

Conversation

mclehman
Copy link
Owner

No description provided.

mclehman and others added 8 commits October 25, 2015 15:57
 - Adds missing commas, including in if statement header. Other option is "these are actually if expressions". 

 - Adds code formatting to "if" when referring to the keyword. Some instances do, some don't. Changed for consistency.
 - Fixes use of "e.g." and "i.e." (British English standards, rather than American English, which would use "e.g., __" or "i.e., __")

 - Replaces exposed HTML dfn tag with boldface mirroring introduction of "syntactic sugar" above.
 - "becomes" -> "become"

 - Adds missing colons and commas

 - Removes dubious in "aesthetic value is doubtful dubious". Gotta pick one, and the sentence refers back to doubtful anyway.

 - "Recommanded" -> "Recommended"

 - "loosing" -> "losing"

 - Added needed "of"

 - "correspondent" -> "counterpart". I believe "corresponding function" was meant, this way avoids repeating "function".

 - "looking" -> "look"

 - "consider" -> "feels". Also updates matching clause below to enhance parallelism.

 - "nocive" -> "novice" (best guess)

 - "overuse or under-use them" reworded for clarity
Hugo Herbelin ( @herbelin ) reports that he mistakenly tried 4.02.0 and observed massive Coq compilation times. I'm trying to update the web-facing information to avoid users getting caught like this.
Update the link to the Camlp5 manual
Discourage use of 4.02.0
mclehman added a commit that referenced this pull request Oct 27, 2015
Merge upstream changes
@mclehman mclehman merged commit d57c2ac into mclehman:patch-4 Oct 27, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants