DOC Correct a typo in author name, merge conflict resolved#875

star1327p wants to merge 1 commit intonumpy:mainnumpy/numpy.org:mainfrom

star1327p:author-name-typostar1327p/numpy.org:author-name-typoCopy head branch name to clipboard