Documentation fixes.
Another little typo
Merge branch 'configuration' into custom-release