Fix typo in URL. Build JSDoc and Sphinx docs together
This commit is contained in:
parent
b85c5b5b0e
commit
601ee673fa
4
Makefile
4
Makefile
|
@ -230,13 +230,13 @@ check: eslint
|
||||||
## Documentation
|
## Documentation
|
||||||
|
|
||||||
.PHONY: html
|
.PHONY: html
|
||||||
html:
|
html: apidoc
|
||||||
rm -rf $(BUILDDIR)/html
|
rm -rf $(BUILDDIR)/html
|
||||||
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
|
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
|
||||||
make apidoc
|
make apidoc
|
||||||
@echo
|
@echo
|
||||||
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
|
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
|
||||||
|
|
||||||
ePHONY: apidoc
|
PHONY: apidoc
|
||||||
apidoc:
|
apidoc:
|
||||||
$(JSDOC) --readme docs/source/jsdoc_intro.md -c docs/source/conf.json -d docs/html/api src/*.js
|
$(JSDOC) --readme docs/source/jsdoc_intro.md -c docs/source/conf.json -d docs/html/api src/*.js
|
||||||
|
|
|
@ -4,7 +4,7 @@ Welcome to the new Converse API documentation, generated with
|
||||||
[JSDoc](http://usejsdoc.org/).
|
[JSDoc](http://usejsdoc.org/).
|
||||||
|
|
||||||
The old (increasingly out of date and incomplete) API documentation is
|
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
|
## The public and private API
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user