Adapt/remove mentions of functions gone in 3.x

diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst
index 8b2f04790b28739155ee10493c7c8c52c76ee420..d1a3dafce8678178d28e965a03e611170ee32fda 100644 (file)
--- a/Doc/faq/programming.rst
+++ b/Doc/faq/programming.rst
@@ -473,15 +473,6 @@ calling another function by using ``*`` and ``**``::
        ...
        g(x, *args, **kwargs)
 
-In the unlikely case that you care about Python versions older than 2.0, use
-:func:`apply`::
-
-   def f(x, *args, **kwargs):
-       ...
-       kwargs['width'] = '14.3c'
-       ...
-       apply(g, (x,)+args, kwargs)
-
 
 How do I write a function with output parameters (call by reference)?
 ---------------------------------------------------------------------

diff --git a/Doc/faq/windows.rst b/Doc/faq/windows.rst
index 6b37faf9b5b54959ab1e7947d64b98ec059cf1a8..68a1b5c153c73ff08b64bbe4773c26dcc8d42711 100644 (file)
--- a/Doc/faq/windows.rst
+++ b/Doc/faq/windows.rst
@@ -543,7 +543,7 @@ with multithreading-DLL options (``/MD``).
 
 If you can't change compilers or flags, try using :c:func:`Py_RunSimpleString`.
 A trick to get it to run an arbitrary file is to construct a call to
-:func:`execfile` with the name of your file as argument.
+:func:`exec` and :func:`open` with the name of your file as argument.
 
 Also note that you can not mix-and-match Debug and Release versions.  If you
 wish to use the Debug Multithreaded DLL, then your module *must* have ``_d``

diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index 2003e0bc9a772a3c71c597497a03cc055ecb97bc..7e615816bcc313a9a60f3b5d68f26fc57c4745a6 100644 (file)
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -489,7 +489,7 @@ Glossary
       :func:`builtins.open` and :func:`os.open` are distinguished by their
       namespaces.  Namespaces also aid readability and maintainability by making
       it clear which module implements a function.  For instance, writing
-      :func:`random.seed` or :func:`itertools.izip` makes it clear that those
+      :func:`random.seed` or :func:`itertools.islice` makes it clear that those
       functions are implemented by the :mod:`random` and :mod:`itertools`
       modules, respectively.