Closes #14511: merge with 3.2

diff --cc Doc/conf.py
index f8278405b5a8e10756e629d238f2b4966214ca0a,555f281b5c574ec5e70ba646ace05418b34f4bb1..6bbe4ce35c9f7222c6bac1c5106fa4d7c5274c61
--- 1/Doc/conf.py
--- 2/Doc/conf.py
+++ b/Doc/conf.py
@@@ -91,7 -91,7 +91,7 @@@ html_additional_pages = 
  }
  
  # Output an OpenSearch description file.
- html_use_opensearch = 'http://docs.python.org/dev/py3k'
 -html_use_opensearch = 'http://docs.python.org/3.2'
++html_use_opensearch = 'http://docs.python.org/3.3'
  
  # Additional static files.
  html_static_path = ['tools/sphinxext/static']