Geoffrey Booth 9b77371ea8 Merge commit '72cf485dceb6a88abb3b83493032734409c3591a' into 2 ...

# Conflicts:
#	Cakefile
#	docs/v1/index.html
#	documentation/sections/changelog.md
#	documentation/sections/installation.md
#	documentation/sections/introduction.md
#	lib/coffee-script/nodes.js
#	lib/coffee-script/rewriter.js
#	lib/coffee-script/sourcemap.js
#	lib/coffeescript/browser.js
#	lib/coffeescript/cake.js
#	lib/coffeescript/coffeescript.js
#	lib/coffeescript/command.js
#	lib/coffeescript/grammar.js
#	lib/coffeescript/helpers.js
#	lib/coffeescript/index.js
#	lib/coffeescript/lexer.js
#	lib/coffeescript/optparse.js
#	lib/coffeescript/register.js
#	lib/coffeescript/repl.js
#	lib/coffeescript/scope.js
#	package.json

2017-04-12 20:27:57 -07:00

..

annotated_source.md

Remove hyphen in coffee-script

2017-02-12 17:00:05 -08:00

books.md

Docs improvements: content in Markdown, organization into subtemplates, fixed tests (#4401)

2016-12-15 21:05:44 -08:00

breaking_changes.md

[CS2] 2.0.0-beta1 docs (#4494)

2017-04-09 23:07:58 -07:00

cake.md

Fix broken links in 2 docs (#4480)

2017-04-02 20:09:13 -07:00

changelog.md

Merge commit '72cf485dceb6a88abb3b83493032734409c3591a' into 2

2017-04-12 20:27:57 -07:00

chat.md

Refactor docs resources section; reorganize outline; other minor corrections

2016-12-18 18:13:59 -08:00

classes.md

Update docs for classes, breaking changes (#4438)

2017-02-09 08:50:11 -08:00

coffeescript_2.md

[CS2] 2.0.0-beta1 docs (#4494)

2017-04-09 23:07:58 -07:00

comments.md

Improvements to strings and comments docs; could be back-ported to v1 docs

2016-12-18 15:13:54 -08:00

comparisons.md

Docs improvements: content in Markdown, organization into subtemplates, fixed tests (#4401)

2016-12-15 21:05:44 -08:00

conditionals.md

Docs improvements: content in Markdown, organization into subtemplates, fixed tests (#4401)

2016-12-15 21:05:44 -08:00

contributing.md

Merge discussion of CoffeeScript’s benefits into expanded CoffeeScript 2 section and revised Contributing section

2017-04-02 22:53:18 -07:00

destructuring.md

Docs improvements: content in Markdown, organization into subtemplates, fixed tests (#4401)

2016-12-15 21:05:44 -08:00

embedded.md

Docs improvements: content in Markdown, organization into subtemplates, fixed tests (#4401)

2016-12-15 21:05:44 -08:00

examples.md

Docs improvements: content in Markdown, organization into subtemplates, fixed tests (#4401)

2016-12-15 21:05:44 -08:00

existential_operator.md

Docs improvements: content in Markdown, organization into subtemplates, fixed tests (#4401)

2016-12-15 21:05:44 -08:00

expressions.md

Docs improvements: content in Markdown, organization into subtemplates, fixed tests (#4401)

2016-12-15 21:05:44 -08:00

fat_arrow.md

Modernize various sections as relevant to v2; improve presentation of tables

2016-12-19 22:27:32 -08:00

functions.md

Refactor docs resources section; reorganize outline; other minor corrections

2016-12-18 18:13:59 -08:00

heregexes.md

Docs improvements: content in Markdown, organization into subtemplates, fixed tests (#4401)

2016-12-15 21:05:44 -08:00

installation.md

1.12.5 (#4495)

2017-04-10 09:30:36 -07:00

introduction.md

1.12.5 (#4495)

2017-04-10 09:30:36 -07:00

language.md

Modernize various sections as relevant to v2; improve presentation of tables

2016-12-19 22:27:32 -08:00

lexical_scope.md

Docs improvements: content in Markdown, organization into subtemplates, fixed tests (#4401)

2016-12-15 21:05:44 -08:00

literate.md

Remove out-of-date info and dead link from Literate CoffeeScript section of the docs

2016-12-18 15:21:41 -08:00

loops.md

Docs improvements: content in Markdown, organization into subtemplates, fixed tests (#4401)

2016-12-15 21:05:44 -08:00

modules.md

Docs improvements: content in Markdown, organization into subtemplates, fixed tests (#4401)

2016-12-15 21:05:44 -08:00

objects_and_arrays.md

Docs improvements: content in Markdown, organization into subtemplates, fixed tests (#4401)

2016-12-15 21:05:44 -08:00

operators.md

1.12.5 (#4495)

2017-04-10 09:30:36 -07:00

overview.md

On mobile, the code examples are stacked

2016-12-15 23:19:50 -08:00

prototypal_inheritance.md

Update docs for classes, breaking changes (#4438)

2017-02-09 08:50:11 -08:00

resources.md

Refactor the build tasks to be more foolproof, including the parser unless it’s explicitly excluded

2017-02-13 21:05:12 -08:00

screencasts.md

Docs improvements: content in Markdown, organization into subtemplates, fixed tests (#4401)

2016-12-15 21:05:44 -08:00

scripts.md

Fix broken links in 2 docs (#4480)

2017-04-02 20:09:13 -07:00

slices.md

Docs improvements: content in Markdown, organization into subtemplates, fixed tests (#4401)

2016-12-15 21:05:44 -08:00

source_maps.md

Modernize various sections as relevant to v2; improve presentation of tables

2016-12-19 22:27:32 -08:00

splats.md

Docs improvements: content in Markdown, organization into subtemplates, fixed tests (#4401)

2016-12-15 21:05:44 -08:00

strings.md

Improvements to strings and comments docs; could be back-ported to v1 docs

2016-12-18 15:13:54 -08:00

switch.md

Docs improvements: content in Markdown, organization into subtemplates, fixed tests (#4401)

2016-12-15 21:05:44 -08:00

tagged_template_literals.md

Modernize various sections as relevant to v2; improve presentation of tables

2016-12-19 22:27:32 -08:00

test.md

Refactor docs resources section; reorganize outline; other minor corrections

2016-12-18 18:13:59 -08:00

try.md

Docs improvements: content in Markdown, organization into subtemplates, fixed tests (#4401)

2016-12-15 21:05:44 -08:00

unsupported.md

[CS2] 2.0.0-beta1 docs (#4494)

2017-04-09 23:07:58 -07:00

usage.md

1.12.5 (#4495)

2017-04-10 09:30:36 -07:00