Index: Objects/tupleobject.c
===================================================================
--- Objects/tupleobject.c	(revision 84382)
+++ Objects/tupleobject.c	(working copy)
@@ -745,8 +745,8 @@
 }
 
 PyDoc_STRVAR(index_doc,
-"T.index(value, [start, [stop]]) -> integer -- return first index of value.\n"
-"Raises ValueError if the value is not present."
+"T.index(value, [start, [stop]]) -> integer -- return first index of\n"
+"value.  Raises ValueError if the value is not present."
 );
 PyDoc_STRVAR(count_doc,
 "T.count(value) -> integer -- return number of occurrences of value");
Index: Modules/mathmodule.c
===================================================================
--- Modules/mathmodule.c	(revision 84382)
+++ Modules/mathmodule.c	(working copy)
@@ -868,7 +868,7 @@
       "exp(x)\n\nReturn e raised to the power of x.")
 FUNC1(expm1, m_expm1, 1,
       "expm1(x)\n\nReturn exp(x)-1.\n"
-      "This function avoids the loss of precision involved in the direct "
+      "This function avoids the loss of precision involved in the direct\n"
       "evaluation of exp(x)-1 for small x.")
 FUNC1(fabs, fabs, 0,
       "fabs(x)\n\nReturn the absolute value of the float x.")
@@ -1435,7 +1435,8 @@
 PyDoc_STRVAR(math_trunc_doc,
 "trunc(x:Real) -> Integral\n"
 "\n"
-"Truncates x to the nearest Integral toward 0. Uses the __trunc__ magic method.");
+"Truncates x to the nearest Integral toward 0. Uses the __trunc__\n"
+"magic method.");
 
 static PyObject *
 math_frexp(PyObject *self, PyObject *arg)
@@ -1545,8 +1546,8 @@
 PyDoc_STRVAR(math_modf_doc,
 "modf(x)\n"
 "\n"
-"Return the fractional and integer parts of x.  Both results carry the sign\n"
-"of x and are floats.");
+"Return the fractional and integer parts of x.  Both results carry the\n"
+"sign of x and are floats.");
 
 /* A decent logarithm is easy to compute even for huge longs, but libm can't
    do that by itself -- loghelper can.  func is log or log10, and name is
@@ -1828,7 +1829,8 @@
 
 PyDoc_STRVAR(math_isfinite_doc,
 "isfinite(x) -> bool\n\n\
-Return True if x is neither an infinity nor a NaN, and False otherwise.");
+Return True if x is neither an infinity nor a NaN, and False\n\
+otherwise.");
 
 static PyObject *
 math_isnan(PyObject *self, PyObject *arg)
@@ -1854,7 +1856,8 @@
 
 PyDoc_STRVAR(math_isinf_doc,
 "isinf(x) -> bool\n\n\
-Return True if x is a positive or negative infinity, and False otherwise.");
+Return True if x is a positive or negative infinity, and False\n\
+otherwise.");
 
 static PyMethodDef math_methods[] = {
     {"acos",            math_acos,      METH_O,         math_acos_doc},
Index: Modules/_datetimemodule.c
===================================================================
--- Modules/_datetimemodule.c	(revision 84382)
+++ Modules/_datetimemodule.c	(working copy)
@@ -3151,7 +3151,7 @@
      PyDoc_STR("datetime -> string name of time zone.")},
 
     {"utcoffset",       (PyCFunction)tzinfo_utcoffset,          METH_O,
-     PyDoc_STR("datetime -> timedelta showing offset from UTC, negative "
+     PyDoc_STR("datetime -> timedelta showing offset from UTC, negative\n"
            "values indicating West of UTC")},
 
     {"dst",             (PyCFunction)tzinfo_dst,                METH_O,
@@ -3374,8 +3374,8 @@
 
 static PyMethodDef timezone_methods[] = {
     {"tzname", (PyCFunction)timezone_tzname, METH_O,
-     PyDoc_STR("If name is specified when timezone is created, returns the name."
-               "  Otherwise returns offset as 'UTC(+|-)HH:MM'.")},
+     PyDoc_STR("If name is specified when timezone is created, returns the name.\n"
+               "Otherwise returns offset as 'UTC(+|-)HH:MM'.")},
 
     {"utcoffset", (PyCFunction)timezone_utcoffset, METH_O,
      PyDoc_STR("Return fixed offset.")},
Index: Modules/timemodule.c
===================================================================
--- Modules/timemodule.c	(revision 84382)
+++ Modules/timemodule.c	(working copy)
@@ -297,7 +297,8 @@
                        tm_sec, tm_wday, tm_yday, tm_isdst)\n\
 \n\
 Convert seconds since the Epoch to a time tuple expressing UTC (a.k.a.\n\
-GMT).  When 'seconds' is not passed in, convert the current time instead.");
+GMT).  When 'seconds' is not passed in, convert the current time\n\
+instead.");
 
 static PyObject *
 time_localtime(PyObject *self, PyObject *args)
@@ -568,8 +569,8 @@
 "strftime(format[, tuple]) -> string\n\
 \n\
 Convert a time tuple to a string according to a format specification.\n\
-See the library reference manual for formatting codes. When the time tuple\n\
-is not present, current time as returned by localtime() is used.");
+See the library reference manual for formatting codes. When the time\n\
+tuple is not present, current time as returned by localtime() is used.");
 #endif /* HAVE_STRFTIME */
 
 static PyObject *
@@ -590,7 +591,8 @@
 "strptime(string, format) -> struct_time\n\
 \n\
 Parse a string to a time tuple according to a format specification.\n\
-See the library reference manual for formatting codes (same as strftime()).");
+See the library reference manual for formatting codes (same as\n\
+strftime()).");
 
 
 static PyObject *
@@ -616,8 +618,8 @@
 "asctime([tuple]) -> string\n\
 \n\
 Convert a time tuple to a string, e.g. 'Sat Jun 06 16:26:11 1998'.\n\
-When the time tuple is not present, current time as returned by localtime()\n\
-is used.");
+When the time tuple is not present, current time as returned by\n\
+localtime() is used.");
 
 static PyObject *
 time_ctime(PyObject *self, PyObject *args)
@@ -652,8 +654,8 @@
 "ctime(seconds) -> string\n\
 \n\
 Convert a time in seconds since the Epoch to a string in local time.\n\
-This is equivalent to asctime(localtime(seconds)). When the time tuple is\n\
-not present, current time as returned by localtime() is used.");
+This is equivalent to asctime(localtime(seconds)). When the time tuple\n\
+is not present, current time as returned by localtime() is used.");
 
 #ifdef HAVE_MKTIME
 static PyObject *
Index: Modules/cmathmodule.c
===================================================================
--- Modules/cmathmodule.c	(revision 84382)
+++ Modules/cmathmodule.c	(working copy)
@@ -953,8 +953,8 @@
 
 PyDoc_STRVAR(cmath_polar_doc,
 "polar(z) -> r: float, phi: float\n\n\
-Convert a complex from rectangular coordinates to polar coordinates. r is\n\
-the distance from 0 and phi the phase angle.");
+Convert a complex from rectangular coordinates to polar coordinates.\n\
+r is the distance from 0 and phi the phase angle.");
 
 /*
   rect() isn't covered by the C99 standard, but it's not too hard to
@@ -1034,7 +1034,8 @@
 
 PyDoc_STRVAR(cmath_isfinite_doc,
 "isfinite(z) -> bool\n\
-Return True if both the real and imaginary parts of z are finite, else False.");
+Return True if both the real and imaginary parts of z are finite,\n\
+else False.");
 
 static PyObject *
 cmath_isnan(PyObject *self, PyObject *args)