am 105e1c5a: am 6a297118: Merge "docs: a couple doc bug fixes" into froyo

Merge commit '105e1c5adc3da14996d659ac403e7254b81bcb76' into kraken

* commit '105e1c5adc3da14996d659ac403e7254b81bcb76':
  docs: a couple doc bug fixes