am bde31762: am 93dc642e: docs: fix misc bugs from external tracker

* commit 'bde31762f989acbfde92e8f47ceea780cacc4e7a':