summaryrefslogtreecommitdiffstats
path: root/Doc/using
diff options
context:
space:
mode:
Diffstat (limited to 'Doc/using')
-rw-r--r--Doc/using/cmdline.rst13
-rw-r--r--Doc/using/mac.rst7
-rw-r--r--Doc/using/windows.rst2
3 files changed, 2 insertions, 20 deletions
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 8704b7f..ae661ce 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -130,9 +130,6 @@ source.
added to the start of :data:`sys.path` and the ``__main__.py`` file in
that location is executed as the :mod:`__main__` module.
- .. versionchanged:: 2.5
- Directories and zipfiles containing a ``__main__.py`` file at the top
- level are now considered valid Python scripts.
If no interface option is given, :option:`-i` is implied, ``sys.argv[0]`` is
an empty string (``""``) and the current directory will be added to the
@@ -157,7 +154,7 @@ Generic options
Print the Python version number and exit. Example output could be::
- Python 2.5.1
+ Python 3.0
Miscellaneous options
@@ -174,8 +171,6 @@ Miscellaneous options
If given, Python won't try to write ``.pyc`` or ``.pyo`` files on the
import of source modules. See also :envvar:`PYTHONDONTWRITEBYTECODE`.
- .. versionadded:: 2.6
-
.. cmdoption:: -d
@@ -216,8 +211,6 @@ Miscellaneous options
Don't add user site directory to sys.path
- .. versionadded:: 2.6
-
.. seealso::
:pep:`370` -- Per user site-packages directory
@@ -432,8 +425,6 @@ These environment variables influence Python's behavior.
If this is set, Python won't try to write ``.pyc`` or ``.pyo`` files on the
import of source modules.
- .. versionadded:: 2.6
-
.. envvar:: PYTHONNOUSERSITE
@@ -470,8 +461,6 @@ if Python was configured with the :option:`--with-pydebug` build option.
If set, Python will print threading debug info.
- .. versionchanged:: 2.6
- Previously, this variable was called ``THREADDEBUG``.
.. envvar:: PYTHONDUMPREFS
diff --git a/Doc/using/mac.rst b/Doc/using/mac.rst
index 7811f37..8953e0b 100644
--- a/Doc/using/mac.rst
+++ b/Doc/using/mac.rst
@@ -14,18 +14,13 @@ the IDE and the Package Manager that are worth pointing out.
The Mac-specific modules are documented in :ref:`mac-specific-services`.
-Python on Mac OS 9 or earlier can be quite different from Python on Unix or
-Windows, but is beyond the scope of this manual, as that platform is no longer
-supported, starting with Python 2.4. See http://www.cwi.nl/~jack/macpython for
-installers for the latest 2.3 release for Mac OS 9 and related documentation.
-
.. _getting-osx:
Getting and Installing MacPython
================================
-Mac OS X 10.4 comes with Python 2.3 pre-installed by Apple. However, you are
+Mac OS X 10.5 comes with Python 2.5 pre-installed by Apple. However, you are
encouraged to install the most recent version of Python from the Python website
(http://www.python.org). A "universal binary" build of Python 2.5, which runs
natively on the Mac's new Intel and legacy PPC CPU's, is available there.
diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst
index cd706a7..4064fa1 100644
--- a/Doc/using/windows.rst
+++ b/Doc/using/windows.rst
@@ -24,8 +24,6 @@ With ongoing development of Python, some platforms that used to be supported
earlier are no longer supported (due to the lack of users or developers).
Check :pep:`11` for details on all unsupported platforms.
-* DOS and Windows 3.x are deprecated since Python 2.0 and code specific to these
- systems was removed in Python 2.1.
* Up to 2.5, Python was still compatible with Windows 95, 98 and ME (but already
raised a deprecation warning on installation). For Python 2.6 (and all
following releases), this support was dropped and new releases are just