Merge "Fix docs markup consistency"