merge from gcc

[deliverable/binutils-gdb.git] / libiberty / strstr.c

diff --git a/libiberty/strstr.c b/libiberty/strstr.c
index e7360341bc02be061948cfba4bd31616b136eea2..ffe1d10fc9ef5f6e241cc7b8be1344943ef88a33 100644 (file)
--- a/libiberty/strstr.c
+++ b/libiberty/strstr.c
@@ -6,8 +6,8 @@
 @deftypefn Supplemental char* strstr (const char *@var{string}, const char *@var{sub})
 
 This function searches for the substring @var{sub} in the string
-@var{string}, not including the terminating NUL characters.  A pointer
-to the first occurance of @var{sub} is returned, or NULL if the
+@var{string}, not including the terminating null characters.  A pointer
+to the first occurrence of @var{sub} is returned, or NULL if the
 substring is absent.  If @var{sub} points to a string with zero
 length, the function returns @var{string}.