Merge "Documentation: Various corrections"