am 74e151c5: am 5f1d1002: Merge "docs: fix markup error" into froyo

Merge commit '74e151c54c31cf7324771fcabc06e9fbfe1118ca' into kraken

* commit '74e151c54c31cf7324771fcabc06e9fbfe1118ca':
  docs: fix markup error