am ef9fd39d: am 769f9b89: am 5b86de94: fix doc bugs

Merge commit 'ef9fd39d73877162ba200ef8b2000216133dab2e'

* commit 'ef9fd39d73877162ba200ef8b2000216133dab2e':
  fix doc bugs