Merge 3.3 (#16805)

diff --cc Doc/c-api/arg.rst
Simple merge

diff --cc Doc/c-api/init.rst
Simple merge

diff --cc Doc/faq/library.rst
Simple merge

diff --cc Doc/library/io.rst
Simple merge

diff --cc Doc/library/logging.config.rst
Simple merge

diff --cc Doc/library/os.rst
Simple merge

diff --cc Doc/library/pkgutil.rst
Simple merge

diff --cc Doc/library/socket.rst
Simple merge

diff --cc Doc/library/ssl.rst
Simple merge

diff --cc Doc/library/sys.rst
Simple merge

diff --cc Doc/library/test.rst
Simple merge