Remove mentions of the Demo directory.

diff --git a/Doc/extending/embedding.rst b/Doc/extending/embedding.rst
index 13a8e25e7c019108836fbc8d26b3f9e276b242fd..e261048169e3e8f4e4eb4c5a6169227517c7266a 100644 (file)
--- a/Doc/extending/embedding.rst
+++ b/Doc/extending/embedding.rst
@@ -35,9 +35,6 @@ stdio file pointer and a file name (for identification in error messages only)
 to :c:func:`PyRun_SimpleFile`.  You can also call the lower-level operations
 described in the previous chapters to construct and use Python objects.
 
-A simple demo of embedding Python can be found in the directory
-:file:`Demo/embed/` of the source distribution.
-
 
 .. seealso::
 

diff --git a/Doc/library/curses.rst b/Doc/library/curses.rst
index f9ba0d624b2333549ba688d3d9d727fbb397f08c..369571a2b15c1088c23bffb8feb8925a2d3ee4fc 100644 (file)
--- a/Doc/library/curses.rst
+++ b/Doc/library/curses.rst
@@ -49,7 +49,7 @@ Linux and the BSD variants of Unix.
       Tutorial material on using curses with Python, by Andrew Kuchling and Eric
       Raymond.
 
-   The :file:`Demo/curses/` directory in the Python source distribution contains
+   The :file:`Tools/demo/` directory in the Python source distribution contains
    some example programs using the curses bindings provided by this module.
 
 

diff --git a/Doc/library/imp.rst b/Doc/library/imp.rst
index 398698f930e79a7ba45942fceee8382b8c986f71..6e9845ed004606c4790bd4a971ef72dc75f9b496 100644 (file)
--- a/Doc/library/imp.rst
+++ b/Doc/library/imp.rst
@@ -308,10 +308,3 @@ in that version, since :func:`find_module` has been extended and
            # Since we may exit via an exception, close fp explicitly.
            if fp:
                fp.close()
-
-.. index:: module: knee
-
-A more complete example that implements hierarchical module names and includes a
-:func:`reload` function can be found in the module :mod:`knee`.  The :mod:`knee`
-module can be found in :file:`Demo/imputil/` in the Python source distribution.
-

diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index cf92ed46981351e2f77b477bdf5a072d1f88265b..ae5635f3c800aa7310cc6e435314e4658a22d3d6 100644 (file)
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -659,9 +659,7 @@ relief
 
 scrollcommand
    This is almost always the :meth:`!set` method of some scrollbar widget, but can
-   be any widget method that takes a single argument.   Refer to the file
-   :file:`Demo/tkinter/matt/canvas-with-scrollbars.py` in the Python source
-   distribution for an example.
+   be any widget method that takes a single argument.
 
 wrap:
    Must be one of: ``"none"``, ``"char"``, or ``"word"``.

diff --git a/Doc/library/tkinter.tix.rst b/Doc/library/tkinter.tix.rst
index 68d8f5a53083e4d5d90aac4b454815726d31f1bf..cc7ffd1e07dc65ec1a36edccf6bae6332002111f 100644 (file)
--- a/Doc/library/tkinter.tix.rst
+++ b/Doc/library/tkinter.tix.rst
@@ -84,11 +84,7 @@ Tix Widgets
 -----------
 
 `Tix <http://tix.sourceforge.net/dist/current/man/html/TixCmd/TixIntro.htm>`_
-introduces over 40 widget classes to the :mod:`tkinter` repertoire.  There is a
-demo of all the :mod:`tkinter.tix` widgets in the :file:`Demo/tix` directory of
-the standard distribution.
-
-.. The Python sample code is still being added to Python, hence commented out
+introduces over 40 widget classes to the :mod:`tkinter` repertoire.
 
 
 Basic Widgets

diff --git a/Doc/library/turtle.rst b/Doc/library/turtle.rst
index c2b9f4172a6bf1f13cf6a7626ec7a24df697168b..4f2fbcc942dd7dac051c252d1a1b8fd8c1ba1eb7 100644 (file)
--- a/Doc/library/turtle.rst
+++ b/Doc/library/turtle.rst
@@ -2268,7 +2268,7 @@ There can be a :file:`turtle.cfg` file in the directory where :mod:`turtle` is
 stored and an additional one in the current working directory.  The latter will
 override the settings of the first one.
 
-The :file:`Demo/turtle` directory contains a :file:`turtle.cfg` file.  You can
+The :file:`Lib/turtledemo` directory contains a :file:`turtle.cfg` file.  You can
 study it as an example and see its effects when running the demos (preferably
 not from within the demo-viewer).
 
@@ -2400,8 +2400,7 @@ Changes since Python 3.0
   strings and numbers respectively.
 
 - Two example scripts :file:`tdemo_nim.py` and :file:`tdemo_round_dance.py`
-  have been added to the Demo directory (source distribution only). As usual
-  they can be viewed and executed within the demo viewer :file:`turtleDemo.py`.
+  have been added to the :file:`Lib/turtledemo` directory.
 
 
 .. doctest::

diff --git a/Mac/Makefile.in b/Mac/Makefile.in
index 3c974a079e0624abc81d7289101e56ce2c3e7826..c5cd333b52e05fd3d1d6f9884bfb5029c3796568 100644 (file)
--- a/Mac/Makefile.in
+++ b/Mac/Makefile.in
@@ -202,10 +202,6 @@ $(INSTALLED_PYTHONAPP): install_Python
 installextras: $(srcdir)/Extras.ReadMe.txt $(srcdir)/Extras.install.py
        $(INSTALL) -d "$(DESTDIR)$(PYTHONAPPSDIR)/Extras"
        $(INSTALL) $(srcdir)/Extras.ReadMe.txt "$(DESTDIR)$(PYTHONAPPSDIR)/Extras/ReadMe.txt"
-       $(RUNSHARED) $(BUILDPYTHON) $(srcdir)/Extras.install.py $(srcdir)/../Demo \
-               "$(DESTDIR)$(PYTHONAPPSDIR)/Extras/Demo"
-       $(RUNSHARED) $(BUILDPYTHON) $(srcdir)/Extras.install.py $(srcdir)/Demo \
-               "$(DESTDIR)$(PYTHONAPPSDIR)/Extras/Demo.Mac"
 
 
 checkapplepython: $(srcdir)/Tools/fixapplepython23.py

diff --git a/Mac/README b/Mac/README
index a41fbf0904347d990f9f37118b8903969140bcb9..02611270761ef4faa10c31f047ac89caa6f86b0f 100644 (file)
--- a/Mac/README
+++ b/Mac/README
@@ -188,8 +188,8 @@ frameworkinstall is composed of a couple of sub-targets that install the
 framework itself, the Mac subtree, the applications and the unix tools.
 
 There is an extra target frameworkinstallextras that is not part of the
-normal frameworkinstall which installs the Demo and Tools directories
-into "/Applications/MacPython <VERSION>", this is useful for binary
+normal frameworkinstall which installs the Tools directory into
+"/Applications/MacPython <VERSION>", this is useful for binary
 distributions.
 
 What do all these programs do?

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 323f68dba4ee2c2dcac69643f813ce0f94afde28..63ee79b32e5c10bdb186a2e1f5c5dfa5448b0fda 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -154,7 +154,7 @@ CONFIG_ARGS=        @CONFIG_ARGS@
 SRCDIRS=       @SRCDIRS@
 
 # Other subdirectories
-SUBDIRSTOO=    Include Lib Misc Demo
+SUBDIRSTOO=    Include Lib Misc
 
 # Files and directories to be distributed
 CONFIGFILES=   configure configure.in acconfig.h pyconfig.h.in Makefile.pre.in
@@ -1155,7 +1155,7 @@ frameworkinstallunixtools:
 frameworkaltinstallunixtools:
        cd Mac && $(MAKE) altinstallunixtools DESTDIR="$(DESTDIR)"
 
-# This installs the Demos and Tools into the applications directory.
+# This installs the Tools into the applications directory.
 # It is not part of a normal frameworkinstall
 frameworkinstallextras:
        cd Mac && $(MAKE) installextras DESTDIR="$(DESTDIR)"

diff --git a/Misc/NEWS b/Misc/NEWS
index 9477594b26711a3a50f4b44fba109881a7fd28b5..b6b968af60d6d1a7bc3e10c2fa94790892bd277e 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -79,6 +79,13 @@ Build
 - Issue #10679: The "idle", "pydoc" and "2to3" scripts are now installed with
   a version-specific suffix on "make altinstall".
 
+Tools/Demos
+-----------
+
+- Issue #7962: The Demo directory is gone.  Most of the old and unmaintained
+  demos have been removed, others integrated in documentation or a new
+  Tools/demo subdirectory.
+
 
 What's New in Python 3.2 Beta 2?
 ================================