Merge "documentation: minor cosmetics"