Small doc fixes
Merge pull request #16514 from cachedout/master_doc_fix

Small doc fixes