diff options
| author | Éric Araujo <merwok@netwok.org> | 2011-08-19 07:36:59 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2011-08-19 07:36:59 (GMT) |
| commit | d1ca4f9dc6f28bcda09576e6148200b82c3cedae (patch) | |
| tree | 4cb9826deb99824080c8575ee71b1f6f051f1356 /Doc | |
| parent | 87552785c3f5e80dea44b170e790d7d29602e758 (diff) | |
| parent | 355d48ad8374d4b0f2ac40ad274104bff861ea5e (diff) | |
| download | cpython-d1ca4f9dc6f28bcda09576e6148200b82c3cedae.zip cpython-d1ca4f9dc6f28bcda09576e6148200b82c3cedae.tar.gz cpython-d1ca4f9dc6f28bcda09576e6148200b82c3cedae.tar.bz2 | |
Merge fixes for #12256 and typos from 3.2
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/distutils/install.rst | 2 | ||||
| -rw-r--r-- | Doc/distutils/setupscript.rst | 2 | ||||
| -rw-r--r-- | Doc/glossary.rst | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/Doc/distutils/install.rst b/Doc/distutils/install.rst index 9d916d3..b20f1fb 100644 --- a/Doc/distutils/install.rst +++ b/Doc/distutils/install.rst @@ -101,7 +101,7 @@ one command from a terminal:: python setup.py install -For Windows, this command should be run from a command prompt windows +For Windows, this command should be run from a command prompt window (:menuselection:`Start --> Accessories`):: setup.py install diff --git a/Doc/distutils/setupscript.rst b/Doc/distutils/setupscript.rst index 606ea0f..8029243 100644 --- a/Doc/distutils/setupscript.rst +++ b/Doc/distutils/setupscript.rst @@ -254,7 +254,7 @@ code: it's probably better to write C code like :: If you need to include header files from some other Python extension, you can take advantage of the fact that header files are installed in a consistent way -by the Distutils :command:`install_header` command. For example, the Numerical +by the Distutils :command:`install_headers` command. For example, the Numerical Python header files are installed (on a standard Unix installation) to :file:`/usr/local/include/python1.5/Numerical`. (The exact location will differ according to your platform and Python installation.) Since the Python include diff --git a/Doc/glossary.rst b/Doc/glossary.rst index 358f40e..c66aac1 100644 --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -30,7 +30,10 @@ Glossary Abstract base classes complement :term:`duck-typing` by providing a way to define interfaces when other techniques like :func:`hasattr` would be clumsy or subtly wrong (for example with - :ref:`magic methods <special-lookup>`). Python comes with many built-in ABCs for + :ref:`magic methods <special-lookup>`). ABCs introduce virtual + subclasses, which are classes that don't inherit from a class but are + still recognized by :func:`isinstance` and :func:`issubclass`; see the + :mod:`abc` module documentation. Python comes with many built-in ABCs for data structures (in the :mod:`collections.abc` module), numbers (in the :mod:`numbers` module), streams (in the :mod:`io` module), import finders and loaders (in the :mod:`importlib.abc` module). You can create your own |