From 601ee673fa978fd5dfd80bdd0f91d7ce8464b6cf Mon Sep 17 00:00:00 2001 From: JC Brand Date: Tue, 13 Nov 2018 12:59:35 +0100 Subject: [PATCH] Fix typo in URL. Build JSDoc and Sphinx docs together --- Makefile | 4 ++-- docs/source/jsdoc_intro.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 368709c4c..7178d331f 100644 --- a/Makefile +++ b/Makefile @@ -230,13 +230,13 @@ check: eslint ## Documentation .PHONY: html -html: +html: apidoc rm -rf $(BUILDDIR)/html $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html make apidoc @echo @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." -ePHONY: apidoc +PHONY: apidoc apidoc: $(JSDOC) --readme docs/source/jsdoc_intro.md -c docs/source/conf.json -d docs/html/api src/*.js diff --git a/docs/source/jsdoc_intro.md b/docs/source/jsdoc_intro.md index eb663dd69..f55a4d433 100644 --- a/docs/source/jsdoc_intro.md +++ b/docs/source/jsdoc_intro.md @@ -4,7 +4,7 @@ Welcome to the new Converse API documentation, generated with [JSDoc](http://usejsdoc.org/). The old (increasingly out of date and incomplete) API documentation is -currently still [available here](/docs/htmls/developer_api.html). +currently still [available here](/docs/html/developer_api.html). ## The public and private API