Incorporate existing strcasestr doc into new doc structure.

3 files changed, 21 insertions, 35 deletions

diff --git a/ChangeLog b/ChangeLog
index b77689b33d..cb0d3ea3c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-2008-01-18  Bruno Haible  <bruno@clisp.org>
+2008-01-19  Bruno Haible  <bruno@clisp.org>
+
+	* doc/glibc-functions/strcasestr.texi: Include contents of
+	doc/functions/strcasestr.texi, fixing the list of platforms.
+	* doc/functions/strcasestr.texi: Remove file.
+
+2008-01-19  Bruno Haible  <bruno@clisp.org>
 
 	* doc/glibc-functions/memmem.texi: Include contents of
 	doc/functions/memmem.texi.
diff --git a/doc/functions/strcasestr.texi b/doc/functions/strcasestr.texi
deleted file mode 100644
index b5a7d05195..0000000000
--- a/doc/functions/strcasestr.texi
+++ /dev/null
@@ -1,29 +0,0 @@
-@node strcasestr
-@section @code{strcasestr}
-@findex strcasestr
-
-Unspecified by POSIX, but comparable to a mix of @code{strstr} and
-@code{strcasecmp}.
-
-Gnulib module: strcasestr or strcasestr-simple
-
-Portability problems fixed by either Gnulib module @code{strcasestr-simple}
-or @code{strcasestr}:
-@itemize
-@item
-This function is missing on some platforms:
-MacOS X 10.3, FreeBSD 5.2.1, AIX 4.3.2, HP-UX 11, IRIX 6.5, OSF/1 5.1,
-Solaris 10, Cygwin 1.5.x, mingw, Interix 3.5, BeOS.
-@end itemize
-
-Portability problems fixed by Gnulib module @code{strcasestr}:
-@itemize
-@item
-This function has quadratic instead of linear worst-case complexity on some
-platforms:
-glibc 2.6.1, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0, AIX 5.1.
-@end itemize
-
-Portability problems not fixed by Gnulib:
-@itemize
-@end itemize
diff --git a/doc/glibc-functions/strcasestr.texi b/doc/glibc-functions/strcasestr.texi
index 8e49f84735..4df018cd96 100644
--- a/doc/glibc-functions/strcasestr.texi
+++ b/doc/glibc-functions/strcasestr.texi
@@ -2,15 +2,24 @@
 @subsection @code{strcasestr}
 @findex strcasestr
 
-Gnulib module: ---
+Gnulib module: strcasestr or strcasestr-simple
 
-Portability problems fixed by Gnulib:
+Portability problems fixed by either Gnulib module @code{strcasestr-simple}
+or @code{strcasestr}:
 @itemize
+@item
+This function is missing on some platforms:
+AIX 5.1, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 10, Cygwin, mingw, BeOS.
 @end itemize
 
-Portability problems not fixed by Gnulib:
+Portability problems fixed by Gnulib module @code{strcasestr}:
 @itemize
 @item
-This function is missing on some platforms:
-AIX 5.1, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 10, Cygwin, mingw, BeOS.
+This function has quadratic instead of linear worst-case complexity on some
+platforms:
+glibc 2.6.1, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0.
+@end itemize
+
+Portability problems not fixed by Gnulib:
+@itemize
 @end itemize