doc: minor clean up.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
doc: Merge cleanup.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>