remove github-flavored-markdown; automatically use marked instead (js…

…doc#385)

Jake/templates/package.json.tmpl

@@ -20,7 +20,6 @@
 		"async": "0.1.22",
 		"catharsis": "0.5.6",
 		"crypto-browserify": "git+https://github.com/dominictarr/crypto-browserify.git#95c5d505",
-		"github-flavored-markdown": "git+https://github.com/hegemonic/github-flavored-markdown.git",
 		"js2xmlparser": "0.1.0",
 		"jshint": "0.9.1",
 		"markdown": "git+https://github.com/jsdoc3/markdown-js.git",

lib/jsdoc/util/markdown.js

@@ -15,14 +15,12 @@ var parsers = {
     /** The "[markdown-js](https://github.com/evilstreak/markdown-js)" (aka "evilstreak") parser. */
     evilstreak: "markdown",
     /**
-     * Deprecated in favor of "marked"
-     * The "[GitHub-flavored Markdown](https://github.com/hegemonic/github-flavored-markdown)"
-     * parser.
+     * The "GitHub-flavored Markdown" parser.
+     * @deprecated Replaced by "marked."
      */
-    gfm: "github-flavored-markdown",
+    gfm: "marked",
     /**
-     * The "[Marked](https://github.com/chjj/marked)"
-     * parser.
+     * The "[Marked](https://github.com/chjj/marked)" parser.
      */
     marked: "marked"
 };
@@ -56,12 +54,6 @@ function getParseFunction(parser, conf) {
     conf = conf || {};
     var parse;
 
-    if (parser === parsers.gfm) {
-        console.log( 'configuration uses the gfm parser, which has been replaced by the marked parser. ' +
-            'Please update the configuration to use "' + parsers.marked + '" parser instead.' );
-        parser = parsers.marked;
-    }
-
     if (parser === parsers.marked) {
         parser = require(parser);
         parser = require(parser);