summaryrefslogtreecommitdiff
path: root/libc/manual/errno.texi
diff options
context:
space:
mode:
authorjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2006-11-13 16:43:45 +0000
committerjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2006-11-13 16:43:45 +0000
commitf09284a630c837c56a3bdff26ab9ef624aa41f5d (patch)
treeab5ed171550051d3e3ad184e64b73623802259b9 /libc/manual/errno.texi
parent38966ef44646e74412b5bf809e3d678074162205 (diff)
Merge changes between r615 and r677 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@678 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/manual/errno.texi')
-rw-r--r--libc/manual/errno.texi4
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/manual/errno.texi b/libc/manual/errno.texi
index 4df47008c..7f96130ba 100644
--- a/libc/manual/errno.texi
+++ b/libc/manual/errno.texi
@@ -1434,7 +1434,7 @@ like those given to the @code{printf} family of functions. The
arguments required for the format can follow the @var{format} parameter.
Just like @code{perror}, @code{error} also can report an error code in
textual form. But unlike @code{perror} the error value is explicitly
-passed to the function in the @var{errnum} parameter. This elimintates
+passed to the function in the @var{errnum} parameter. This eliminates
the problem mentioned above that the error reporting function must be
called immediately after the function causing the error since otherwise
@code{errno} might have a different value.
@@ -1479,7 +1479,7 @@ in an input file (like a programming language source code file etc).
If the global variable @code{error_one_per_line} is set to a non-zero
value @code{error_at_line} will avoid printing consecutive messages for
-the same file anem line. Repetition which are not directly following
+the same file and line. Repetition which are not directly following
each other are not caught.
Just like @code{error} this function only returned if @var{status} is