Merge "Miscellaneous small documentation fixes."