Fix typo in URL. Build JSDoc and Sphinx docs together

This commit is contained in:
JC Brand 2018-11-13 12:59:35 +01:00
parent b85c5b5b0e
commit 601ee673fa
2 changed files with 3 additions and 3 deletions

View File

@ -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

View File

@ -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