summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorGulliver <gulliver@fargonauten.de>2014-10-09 00:45:00 +0200
committerGulliver <gulliver@fargonauten.de>2014-10-09 00:45:00 +0200
commit7da937e2aea109e42b5ce9d6c9fe2e4e9ec877fc (patch)
tree975a69c0533623790733074a42fb3a9bb7577bd9 /README.md
parent1703abe7a21f5014ce00f04bd95d2aa4e1ba81c0 (diff)
parentc69bfce61eeec398be46eb914f6280fe471b293f (diff)
Merge branch 'master' into cmake-build
* master: (75 commits) Remove duplicate `footer` Correct capitalization of JavaScript Added link to commonmark.org on web page. Added cases from #51 to spec. Added test case from issue #147. Removed uthash license. We no longer use this library. Removed bstrlib license. We no longer use this library. Removed oldtests. Cleaned up entity section of spec. Adjusted tests for new js parser. stmd.js: Fixed entityToChar, adding fromCodePoint polyfill. Reset label_nest_level before parsing reference. Removed spurious 'and', reflowed. Removed spurious 'and', reflowed. Further emph fallback optimizations. Some jshint fixes. Use simpler algorithm. Revert "Use integers instead of strings for tags." Revert "Use numerical constants." Use numerical constants. ...
Diffstat (limited to 'README.md')
-rw-r--r--README.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/README.md b/README.md
index 78fc837..96661ab 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@ CommonMark
==========
CommonMark is a [specification of Markdown syntax][the spec],
-together with BSD3-licensed implementations (`stmd`) in C and javascript.
+together with BSD3-licensed implementations (`stmd`) in C and JavaScript.
The implementations
-------------------
@@ -20,7 +20,7 @@ tarball.)
--ast Print AST instead of HTML
--version Print version
-The javascript implementation is a single javascript file, with
+The JavaScript implementation is a single JavaScript file, with
no dependencies, that can be linked to in an HTML page. A standalone
version (using `node.js`) is also provided (`js/markdown`), and there is
a "dingus" for playing with it interactively. (`make dingus` will start