jeena/showdown
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Merge branch 'master' of git://github.com/coreyti/showdown into syntax-extensions

Browse source
This commit is contained in:
Titus 2012-06-20 21:46:59 -06:00
commit 96e13ee912
2 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
README.md
View file

@ -17,7 +17,7 @@ Showdown, at least as it exists on GitHub.
Apologies for any confusion or perceived misinformation. Apologies for any confusion or perceived misinformation.
Cheers, Cheers,<br/>
Corey Corey
@ -38,10 +38,10 @@ Quick Example
------------- -------------
``` js ``` js
var Showdown = require('showdown').Showdown var Showdown = require('showdown');
var converter = new Showdown().converter() var converter = new Showdown.converter();
converter.makeHtml('#hello markdown!') converter.makeHtml('#hello markdown!');
// <h1 id="hellomarkdown">hello, markdown</h1> // <h1 id="hellomarkdown">hello, markdown</h1>
@ -308,21 +308,21 @@ Credits
--------------------------- ---------------------------
* Origins * Origins
* [John Fraser](http://attacklab.net/): * [John Fraser](http://attacklab.net/):<br/>
Author of Showdown Author of Showdown
* [John Gruber](http://daringfireball.net/projects/markdown/): * [John Gruber](http://daringfireball.net/projects/markdown/):<br/>
Author of Markdown Author of Markdown
* Maintenance * Maintenance
* [Corey Innis](http://github.com/coreyti): * [Corey Innis](http://github.com/coreyti):<br/>
GitHub project maintainer GitHub project maintainer
* [Remy Sharp](http://remysharp.com/): * [Remy Sharp](http://remysharp.com/):<br/>
CommonJS-compatibility and more CommonJS-compatibility and more
* [Roger Braun](https://github.com/rogerbraun): * [Roger Braun](https://github.com/rogerbraun):<br/>
Github-style code blocks Github-style code blocks
* [Dominic Tarr](https://github.com/dominictarr): * [Dominic Tarr](https://github.com/dominictarr):<br/>
Documentation Documentation
* [Cat Chen](https://github.com/CatChen): * [Cat Chen](https://github.com/CatChen):<br/>
Export fix Export fix
* [Titus Stone](https://github.com/tstone): * [Titus Stone](https://github.com/tstone):<br/>
Mocha tests + bug fixes Mocha tests + bug fixes

5
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "showdown", "name": "showdown",
"version": "0.1.0", "version": "0.2.0",
"author": "John Fraser", "author": "John Fraser",
"contributors": [ "contributors": [
"John Gruber", "John Gruber",
@ -10,7 +10,8 @@
"Konstantin Käfer", "Konstantin Käfer",
"Roger Braun", "Roger Braun",
"Dominic Tarr", "Dominic Tarr",
"Cat Chen" "Cat Chen",
"Titus Stone"
], ],
"repository": { "repository": {
"type": "git", "type": "git",