Correct some errors in Sphinx
Merge branch '2.3'