Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62055-62058,62060-62066,62068-62074,62076-62079,62081-62083,62086-62089,62092-62094,62098,62101,62104,62106-62109,62115-62122,62124-62125,62127-62128,62130,62132,62134-62137,62139-62142,62144,62146-62148,62150-62152,62155-62161 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r62127 | trent.nelson | 2008-04-03 08:39:17 -0700 (Thu, 03 Apr 2008) | 1 line

  Remove the building of Berkeley DB step; _bsddb44.vcproj takes care of this for us now.
........
  r62136 | amaury.forgeotdarc | 2008-04-03 16:07:55 -0700 (Thu, 03 Apr 2008) | 9 lines

  #1733757: the interpreter would hang on shutdown, if the function set by sys.settrace
  calls threading.currentThread.

  The correction somewhat improves the code, but it was close.
  Many thanks to the "with" construct, which turns python code into C calls.

  I wonder if it is not better to sys.settrace(None) just after
  running the __main__ module and before finalization.
........
  r62141 | jeffrey.yasskin | 2008-04-03 21:51:19 -0700 (Thu, 03 Apr 2008) | 5 lines

  Doh! os.read() raises an OSError, not an IOError when it's interrupted.

  And fix some flakiness in test_itimer_prof, which could detect that the timer
  had reached 0 before the signal arrived announcing that fact.
........
  r62142 | fred.drake | 2008-04-03 22:41:30 -0700 (Thu, 03 Apr 2008) | 4 lines

  - Issue #2385: distutils.core.run_script() makes __file__ available, so the
    controlled environment will more closely mirror the typical script
    environment.  This supports setup.py scripts that refer to data files.
........
  r62147 | fred.drake | 2008-04-04 04:31:14 -0700 (Fri, 04 Apr 2008) | 6 lines

  my previous change did what I said it should not: it changed the current
  directory to the directory in which the setup.py script lived (which made
  __file__ wrong)

  fixed, with test that the script is run in the current directory of the caller
........
  r62148 | fred.drake | 2008-04-04 04:38:51 -0700 (Fri, 04 Apr 2008) | 2 lines

  stupid, stupid, stupid!
........
  r62150 | jeffrey.yasskin | 2008-04-04 09:48:19 -0700 (Fri, 04 Apr 2008) | 2 lines

  Oops again. EINTR is in errno, not signal.
........
  r62158 | andrew.kuchling | 2008-04-04 19:42:20 -0700 (Fri, 04 Apr 2008) | 1 line

  Minor edits
........
  r62159 | andrew.kuchling | 2008-04-04 19:47:07 -0700 (Fri, 04 Apr 2008) | 1 line

  Markup fix; explain what interval timers do; typo fix
........
  r62160 | andrew.kuchling | 2008-04-04 20:38:39 -0700 (Fri, 04 Apr 2008) | 1 line

  Various edits
........
  r62161 | neal.norwitz | 2008-04-04 21:26:31 -0700 (Fri, 04 Apr 2008) | 9 lines

  Prevent test_sqlite from hanging on older versions of sqlite.
  The problem is that when trying to do the second insert, sqlite seems to sleep
  for a very long time.  Here is the output from strace:

    read(6, "SQLite format 3\0\4\0\1\1\0@  \0\0\0\1\0\0\0\0"..., 1024) = 1024
    nanosleep({4294, 966296000},  <unfinished ...>

  I don't know which version this was fixed in, but 3.2.1 definitely fails.
........

1 files changed, 10 insertions, 4 deletions

diff --git a/Doc/library/signal.rst b/Doc/library/signal.rst
index 94863e1..7586035 100644
--- a/Doc/library/signal.rst
+++ b/Doc/library/signal.rst
@@ -82,7 +82,7 @@ The variables defined in the :mod:`signal` module are:
 
 .. data:: ITIMER_REAL    
 
-   Decrements interval timer in real time, and delivers SIGALRM upon expiration.
+   Decrements interval timer in real time, and delivers :const:`SIGALRM` upon expiration.
 
 
 .. data:: ITIMER_VIRTUAL 
@@ -143,12 +143,18 @@ The :mod:`signal` module defines the following functions:
 
 .. function:: setitimer(which, seconds[, interval])
 
-   Sets given itimer (one of :const:`signal.ITIMER_REAL`, 
-   :const:`signal.ITIMER_VIRTUAL` or :const:`signal.ITIMER_PROF`) especified
+   Sets given interval timer (one of :const:`signal.ITIMER_REAL`, 
+   :const:`signal.ITIMER_VIRTUAL` or :const:`signal.ITIMER_PROF`) specified
    by *which* to fire after *seconds* (float is accepted, different from 
    :func:`alarm`) and after that every *interval* seconds. The interval
    timer specified by *which* can be cleared by setting seconds to zero.
 
+   When an interval timer fires, a signal is sent to the process.
+   The signal sent is dependent on the timer being used; 
+   :const:`signal.ITIMER_REAL` will deliver :const:`SIGALRM`, 
+   :const:`signal.ITIMER_VIRTUAL` sends :const:`SIGVTALRM`,
+   and :const:`signal.ITIMER_PROF` will deliver :const:`SIGPROF`.
+
    The old values are returned as a tuple: (delay, interval).
 
    Attempting to pass an invalid interval timer will cause a 
@@ -159,7 +165,7 @@ The :mod:`signal` module defines the following functions:
 
 .. function:: getitimer(which)
 
-   Returns current value of a given itimer especified by *which*.
+   Returns current value of a given interval timer specified by *which*.
 
    .. versionadded:: 2.6