#4808: move old API below new API doc.
diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
index 01e7136..769afd4 100644
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -278,12 +278,6 @@
raises the same exception.
-.. method:: Thread.getName()
- Thread.setName()
-
- Old API for :attr:`~Thread.name`.
-
-
.. attribute:: Thread.name
A string used for identification purposes only. It has no semantics.
@@ -291,6 +285,13 @@
constructor.
+.. method:: Thread.getName()
+ Thread.setName()
+
+ Old getter/setter API for :attr:`~Thread.name`; use it directly as a property
+ instead.
+
+
.. attribute:: Thread.ident
The 'thread identifier' of this thread or ``None`` if the thread has not been
@@ -309,12 +310,6 @@
returns a list of all alive threads.
-.. method:: Thread.isDaemon()
- Thread.setDaemon()
-
- Old API for :attr:`~Thread.daemon`.
-
-
.. attribute:: Thread.daemon
The thread's daemon flag. This must be set before :meth:`start` is called,
@@ -325,6 +320,13 @@
The entire Python program exits when no alive non-daemon threads are left.
+.. method:: Thread.isDaemon()
+ Thread.setDaemon()
+
+ Old getter/setter API for :attr:`~Thread.daemon`; use it directly as a
+ property instead.
+
+
.. _lock-objects:
Lock Objects