diff --git a/docs/Makefile b/docs/Makefile index e64b2e8..461cb65 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -60,7 +60,7 @@ dist: html cp -al build/html . @echo "Build finished. Final docs are in html/" -html: jsapi api autoconfig automagic +html: api autoconfig automagic html_noapi: clean_api autoconfig automagic html html_noapi: @@ -81,9 +81,6 @@ source/config/options/generated: python autogen_config.py @echo "Created docs for config options" -jsapi: - jsdoc -c jsdoc_config.json -d ./build/jsapi_html/ - api: source/api/generated/gen.txt source/api/generated/gen.txt: diff --git a/docs/jsdoc_config.json b/docs/jsdoc_config.json deleted file mode 100644 index dd30a15..0000000 --- a/docs/jsdoc_config.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "markdown": { - "parser": "gfm" - }, - "plugins": [ - "plugins/markdown" , - "jsdoc_plugin.js" - ], - "source": { - "include": [ - "../IPython/html/static/notebook/js/notebook.js" - ] - }, - "tags": { - "allowUnknownTags": true - }, - "templates": { - "cleverLinks": false, - "monospaceLinks": false - } -} diff --git a/docs/jsdoc_plugin.js b/docs/jsdoc_plugin.js deleted file mode 100644 index 3fa3035..0000000 --- a/docs/jsdoc_plugin.js +++ /dev/null @@ -1,12 +0,0 @@ -exports.handlers = { - newDoclet: function(e) { - // e.doclet will refer to the newly created doclet - // you can read and modify properties of that doclet if you wish - if (typeof e.doclet.name === 'string') { - if (e.doclet.name[0] == '_') { - console.log('Private method "' + e.doclet.longname + '" not documented.'); - e.doclet.memberof = ''; - } - } - } -}; \ No newline at end of file diff --git a/docs/make.cmd b/docs/make.cmd index b174f3a..aa10980 100644 --- a/docs/make.cmd +++ b/docs/make.cmd @@ -5,7 +5,6 @@ SETLOCAL SET SPHINXOPTS= SET SPHINXBUILD=sphinx-build -SET JSDOC=jsdoc SET PAPER= SET SRCDIR=source @@ -43,9 +42,6 @@ FOR %%L IN (html pickle htmlhelp latex changes linkcheck) DO ( ) ) -IF "%1" == "jsapi" ( - %JSDOC% -c jsdoc_config.json -d ./build/jsapi_html/ -) IF "%1" == "clean" ( RD /s /q build dist %SRCDIR%\api\generated 2>NUL