Merge "Small fixes to the documentation."