Doc rewrite.
Merge branch.