Issue #20266: Merge with 3.3

2 files changed, 10 insertions, 6 deletions

diff --git a/Doc/faq/windows.rst b/Doc/faq/windows.rst
index 246856e..59f9480 100644
--- a/Doc/faq/windows.rst
+++ b/Doc/faq/windows.rst
@@ -170,18 +170,20 @@ offender.
 How do I make an executable from a Python script?
 -------------------------------------------------
 
-See http://www.py2exe.org/ for a distutils extension that allows you
+See http://cx-freeze.sourceforge.net/ for a distutils extension that allows you
 to create console and GUI executables from Python code.
+`py2exe <http://www.py2exe.org/>`_, the most popular extension for building
+Python 2.x-based executables, does not yet support Python 3 but a version that
+does is in development.
+
 
 Is a ``*.pyd`` file the same as a DLL?
 --------------------------------------
 
-.. XXX update for py3k (PyInit_foo)
-
 Yes, .pyd files are dll's, but there are a few differences.  If you have a DLL
-named ``foo.pyd``, then it must have a function ``initfoo()``.  You can then
+named ``foo.pyd``, then it must have a function ``PyInit_foo()``.  You can then
 write Python "import foo", and Python will search for foo.pyd (as well as
-foo.py, foo.pyc) and if it finds it, will attempt to call ``initfoo()`` to
+foo.py, foo.pyc) and if it finds it, will attempt to call ``PyInit_foo()`` to
 initialize it.  You do not link your .exe with foo.lib, as that would cause
 Windows to require the DLL to be present.
 
diff --git a/Misc/NEWS b/Misc/NEWS
index fc33a13..662b2cd 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -489,7 +489,9 @@ Build
 Documentation
 -------------
 
-- Issue #20255: Update the about and bugs pages.
+- Issue #20266: Updated some parts of the Windows FAQ.
+
+- Issue #20255: Updated the about and bugs pages.
 
 - Issue #20253: Fixed a typo in the ipaddress docs that advertised an
   illegal attribute name.  Found by INADA Naoki.