From 52fa1724ced41dc8cd0cdd8617b3f067978d7fb2 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 13 Oct 2013 10:07:31 +0200
Subject: [PATCH] Closes #14486: add versionchanged notices throughout the
 threading docs for PEP8-compliant APIs; the note at the top of the page is
 too hard to notice.

---
 Doc/library/threading.rst | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
index 9e56dc0ed8..68eb32ca6b 100644
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -48,6 +48,9 @@ This module defines the following functions and objects:
    Return the number of :class:`Thread` objects currently alive.  The returned
    count is equal to the length of the list returned by :func:`.enumerate`.
 
+   .. versionchanged:: 2.6
+      Added ``active_count()`` spelling.
+
 
 .. function:: Condition()
    :noindex:
@@ -67,6 +70,9 @@ This module defines the following functions and objects:
    :mod:`threading` module, a dummy thread object with limited functionality is
    returned.
 
+   .. versionchanged:: 2.6
+      Added ``current_thread()`` spelling.
+
 
 .. function:: enumerate()
 
@@ -328,17 +334,19 @@ impossible to detect the termination of alien threads.
       :meth:`join` a thread before it has been started and attempts to do so
       raises the same exception.
 
-   .. method:: getName()
-               setName()
-
-      Old API for :attr:`~Thread.name`.
-
    .. attribute:: name
 
       A string used for identification purposes only. It has no semantics.
       Multiple threads may be given the same name.  The initial name is set by
       the constructor.
 
+      .. versionadded:: 2.6
+
+   .. method:: getName()
+               setName()
+
+      Pre-2.6 API for :attr:`~Thread.name`.
+
    .. attribute:: ident
 
       The 'thread identifier' of this thread or ``None`` if the thread has not
@@ -358,10 +366,8 @@ impossible to detect the termination of alien threads.
       until just after the :meth:`run` method terminates.  The module function
       :func:`.enumerate` returns a list of all alive threads.
 
-   .. method:: isDaemon()
-               setDaemon()
-
-      Old API for :attr:`~Thread.daemon`.
+      .. versionchanged:: 2.6
+         Added ``is_alive()`` spelling.
 
    .. attribute:: daemon
 
@@ -374,6 +380,13 @@ impossible to detect the termination of alien threads.
 
       The entire Python program exits when no alive non-daemon threads are left.
 
+      .. versionadded:: 2.6
+
+   .. method:: isDaemon()
+               setDaemon()
+
+      Pre-2.6 API for :attr:`~Thread.daemon`.
+
 
 .. _lock-objects:
 
@@ -602,6 +615,9 @@ needs to wake up one consumer thread.
       calling thread has not acquired the lock when this method is called, a
       :exc:`RuntimeError` is raised.
 
+      .. versionchanged:: 2.6
+         Added ``notify_all()`` spelling.
+
 
 .. _semaphore-objects:
 
@@ -701,7 +717,7 @@ An event object manages an internal flag that can be set to true with the
       Return true if and only if the internal flag is true.
 
       .. versionchanged:: 2.6
-         The ``is_set()`` syntax is new.
+         Added ``is_set()`` spelling.
 
    .. method:: set()
 
-- 
2.50.1