fixup merge

Author: StanFromIreland

Doc/conf.py

@@ -69,7 +69,7 @@
 
 # General substitutions.
 project = 'Python'
-opyright = "2001 Python Software Foundation"
+copyright = "2001 Python Software Foundation"
 _doc_authors = 'Python documentation authors'
 
 # We look for the Include/patchlevel.h file in the current Python source tree