Index: Doc/library/threading.rst =================================================================== --- Doc/library/threading.rst (revision 68877) +++ Doc/library/threading.rst (working copy) @@ -210,7 +210,7 @@ A thread can be flagged as a "daemon thread". The significance of this flag is that the entire Python program exits when only daemon threads are left. The initial value is inherited from the creating thread. The flag can be set -through the :attr:`daemon` attribute. +through the :attr:`daemon` property. There is a "main thread" object; this corresponds to the initial thread of control in the Python program. It is not a daemon thread. @@ -332,11 +332,12 @@ .. attribute:: Thread.daemon - The thread's daemon flag. This must be set before :meth:`start` is called, - otherwise :exc:`RuntimeError` is raised. + A boolean value indicating whether this thread is a daemon thread (True) or + not (False). This must be set before :meth:`start` is called, otherwise + :exc:`RuntimeError` is raised. Its initial value is inherited from the + creating thread; the main thread is not a daemon thread and therefore all + threads created in the main thread default to False. - The initial value is inherited from the creating thread. - The entire Python program exits when no alive non-daemon threads are left.