am 32189e26: Merge "misc doc bug fixes" into jb-dev

* commit '32189e260c8dee27d561bf67c0333c9b9927636b':
  misc doc bug fixes