Merge "docs: fixed '@' signs that were escaped improperly" into nyc-dev