Merge "Docs: Pre-processing updates for N       Adding Andrew's feedback" into nyc-dev