Merge branch 'docs2'
Adjusts formatting.