Merge of all doc fixes.