Merge for issue #12484

3 files changed, 1 insertions, 19 deletions

diff --git a/Doc/c-api/import.rst b/Doc/c-api/import.rst
index bf1b495..15a9e25 100644
--- a/Doc/c-api/import.rst
+++ b/Doc/c-api/import.rst
@@ -236,11 +236,6 @@ Importing Modules
    For internal use only.
 
 
-.. c:function:: PyObject* _PyImport_FixupExtension(char *, char *)
-
-   For internal use only.
-
-
 .. c:function:: int PyImport_ImportFrozenModuleObject(PyObject *name)
 
    Load a frozen module named *name*.  Return ``1`` for success, ``0`` if the
diff --git a/Doc/faq/extending.rst b/Doc/faq/extending.rst
index 7bb4dc2..c932d38 100644
--- a/Doc/faq/extending.rst
+++ b/Doc/faq/extending.rst
@@ -247,20 +247,6 @@ For Red Hat, install the python-devel RPM to get the necessary files.
 For Debian, run ``apt-get install python-dev``.
 
 
-What does "SystemError: _PyImport_FixupExtension: module yourmodule not loaded" mean?
--------------------------------------------------------------------------------------
-
-This means that you have created an extension module named "yourmodule", but
-your module init function does not initialize with that name.
-
-Every module init function will have a line similar to::
-
-   module = Py_InitModule("yourmodule", yourmodule_functions);
-
-If the string passed to this function is not the same name as your extension
-module, the :exc:`SystemError` exception will be raised.
-
-
 How do I tell "incomplete input" from "invalid input"?
 ------------------------------------------------------
 
diff --git a/Misc/ACKS b/Misc/ACKS
index 170e1d6..09ad15c 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1313,6 +1313,7 @@ Pete Sevander
 Denis Severson
 Ian Seyer
 Dmitry Shachnev
+Anish Shah
 Daniel Shahaf
 Mark Shannon
 Ha Shao