Fix times return value, CLK_TCK description

	[BZ #2636]
	* manual/time.texi (Processor Time): Return type of times is
	elapsed real time since an arbitrary point in the past.
	(CPU Time): Move CLK_TCK from here...
	(Processor Time): ...to here.  Correct description.
	* manual/conf.texi (Constants for Sysconf): Correct description of
	_SC_CLK_TCK.

4 files changed, 25 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 0bd15aac5c..3ffbd0d585 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-04-09  Andreas Jaeger  <aj@suse.de>
+
+	[BZ #2636]
+	* manual/time.texi (Processor Time): Return type of times is
+	elapsed real time since an arbitrary point in the past.
+	(CPU Time): Move CLK_TCK from here...
+	(Processor Time): ...to here.  Correct description.
+	* manual/conf.texi (Constants for Sysconf): Correct description of
+	_SC_CLK_TCK.
+
 2012-04-10  David S. Miller  <davem@davemloft.net>
 
 	[BZ #13967]
diff --git a/NEWS b/NEWS
index fb5fd4ce7a..c1bcf45a14 100644
--- a/NEWS
+++ b/NEWS
@@ -10,9 +10,9 @@ Version 2.16
 * The following bugs are resolved with this release:
 
   174, 350, 369, 411, 706, 2541, 2547, 2548, 2551, 2552, 2553, 2554, 2562,
-  2563, 2565, 2566, 2576, 2678, 3335, 3866, 3868, 3976, 3992, 4026, 4108,
-  4596, 4822, 5077, 5461, 5805, 5993, 6471, 6486, 6578, 6649, 6730, 6770,
-  6884, 6890, 6894, 6895, 6907, 6911, 9739, 9902, 10110, 10135, 10140,
+  2563, 2565, 2566, 2576, 2636, 2678, 3335, 3866, 3868, 3976, 3992, 4026,
+  4108, 4596, 4822, 5077, 5461, 5805, 5993, 6471, 6486, 6578, 6649, 6730,
+  6770, 6884, 6890, 6894, 6895, 6907, 6911, 9739, 9902, 10110, 10135, 10140,
   10153, 10210, 10254, 10346, 10545, 10716, 11174, 11322, 11365, 11451,
   11494, 11521, 12047, 12340, 13058, 13525, 13526, 13527, 13528, 13529,
   13530, 13531, 13532, 13533, 13547, 13551, 13552, 13553, 13555, 13559,
diff --git a/manual/conf.texi b/manual/conf.texi
index 2cd41f6c73..61dc260317 100644
--- a/manual/conf.texi
+++ b/manual/conf.texi
@@ -360,8 +360,8 @@ Inquire about the parameter corresponding to @code{_POSIX_VERSION}.
 @comment unistd.h
 @comment POSIX.1
 @item _SC_CLK_TCK
-Inquire about the parameter corresponding to @code{CLOCKS_PER_SEC};
-@pxref{CPU Time}.
+Inquire about the number of clock ticks per second; @pxref{CPU Time}.
+The corresponding parameter @code{CLK_TCK} is obsolete.
 
 @comment unistd.h
 @comment GNU
diff --git a/manual/time.texi b/manual/time.texi
index a410def3eb..7dff44f42c 100644
--- a/manual/time.texi
+++ b/manual/time.texi
@@ -237,12 +237,6 @@ million independent of the actual resolution.
 @end deftypevr
 
 @comment time.h
-@comment POSIX.1
-@deftypevr Macro int CLK_TCK
-This is an obsolete name for @code{CLOCKS_PER_SEC}.
-@end deftypevr
-
-@comment time.h
 @comment ISO
 @deftp {Data Type} clock_t
 This is the type of the value returned by the @code{clock} function.
@@ -306,15 +300,22 @@ these are the actual amounts of time; not relative to any event.
 @xref{Creating a Process}.
 @end deftp
 
+@comment time.h
+@comment POSIX.1
+@deftypevr Macro int CLK_TCK
+This is an obsolete name for the number of clock ticks per second.  Use
+@code{sysconf (_SC_CLK_TCK)} instead.
+@end deftypevr
+
 @comment sys/times.h
 @comment POSIX.1
 @deftypefun clock_t times (struct tms *@var{buffer})
 The @code{times} function stores the processor time information for
 the calling process in @var{buffer}.
 
-The return value is the calling process' CPU time (the same value you
-get from @code{clock()}.  @code{times} returns @code{(clock_t)(-1)} to
-indicate failure.
+The return value is the number of clock ticks since an arbitrary point
+in the past, e.g. since system start-up.  @code{times} returns
+@code{(clock_t)(-1)} to indicate failure.
 @end deftypefun
 
 @strong{Portability Note:} The @code{clock} function described in