diff options
author | Ulrich Drepper <drepper@redhat.com> | 2006-11-10 21:12:47 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2006-11-10 21:12:47 +0000 |
commit | 6decd24cc22116dea9da17c548d0ea0e9b6d5bfc (patch) | |
tree | 4d3462cb2df095944ff830ca20fd2b371b605eb8 /manual/time.texi | |
parent | 4260af60e9361dbb07af8e0e6ce28cdfa6e0bdba (diff) | |
download | glibc-6decd24cc22116dea9da17c548d0ea0e9b6d5bfc.tar.gz glibc-6decd24cc22116dea9da17c548d0ea0e9b6d5bfc.tar.xz glibc-6decd24cc22116dea9da17c548d0ea0e9b6d5bfc.zip |
[BZ #3483]
* elf/ldconfig.c (main): Call setlocale and textdomain. Patch mostly by Benno Schulenberg <bensberg@justemail.net>.
Diffstat (limited to 'manual/time.texi')
-rw-r--r-- | manual/time.texi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/manual/time.texi b/manual/time.texi index 9b87d3eed0..a3e8438bce 100644 --- a/manual/time.texi +++ b/manual/time.texi @@ -193,7 +193,7 @@ total amount of time a process has actively used a CPU since some arbitrary event. On the GNU system, that event is the creation of the process. While arbitrary in general, the event is always the same event for any particular process, so you can always measure how much time on -the CPU a particular computation takes by examinining the process' CPU +the CPU a particular computation takes by examining the process' CPU time before and after the computation. @cindex CPU time @cindex clock ticks @@ -447,7 +447,7 @@ current calendar time is not available, the value @comment time.h @comment SVID, XPG @deftypefun int stime (time_t *@var{newtime}) -@code{stime} sets the system clock, i.e. it tells the system that the +@code{stime} sets the system clock, i.e., it tells the system that the current calendar time is @var{newtime}, where @code{newtime} is interpreted as described in the above definition of @code{time_t}. @@ -1470,7 +1470,7 @@ widely available. @node Low-Level Time String Parsing @subsubsection Interpret string according to given format -he first function is rather low-level. It is nevertheless frequently +The first function is rather low-level. It is nevertheless frequently used in software since it is better known. Its interface and implementation are heavily influenced by the @code{getdate} function, which is defined and implemented in terms of calls to @code{strptime}. @@ -1790,7 +1790,7 @@ process. If the input string contains more characters than required by the format string the return value points right after the last consumed input character. If the whole input string is consumed the return value points to the @code{NULL} byte at the end of the string. If an error -occurs, i.e. @code{strptime} fails to match all of the format string, +occurs, i.e., @code{strptime} fails to match all of the format string, the function returns @code{NULL}. @end deftypefun |