More doc updates required by #1136, plus a couple of additional minor

tweaks and fixes.
Oof. With the original path, I get the error if I `cd docs` and then `make html`. But with the second one, I get the error if I run `make package` or `make dev`. :( I'll see if I can resolve.