Merge from upstream
docbook: New package (Info-like viewer for DocBook documents).
Merge from upstream
docbook.el: Add autoload cookie.
docbook.el: Re-arrange to avoid using a defsubst before defining it.
js2-mode: Use \\' instead of $