Fix typo in URL. Build JSDoc and Sphinx docs together

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

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