Incorporate existing memmem doc into new doc structure.

diff --git a/ChangeLog b/ChangeLog
index 1cb43d2309d9e7bd205af69ccf2e21ac3d32fa44..b77689b33d9f58b002d9fcf41094553f3ffe31f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-18  Bruno Haible  <bruno@clisp.org>
+
+       * doc/glibc-functions/memmem.texi: Include contents of
+       doc/functions/memmem.texi.
+       * doc/functions/memmem.texi: Remove file.
+
 2008-01-18  Bruno Haible  <bruno@clisp.org>
 
        * doc/glibc-functions/*.texi: New files.

diff --git a/doc/functions/memmem.texi b/doc/functions/memmem.texi
deleted file mode 100644 (file)
index 9fc86f9..0000000
--- a/doc/functions/memmem.texi
+++ /dev/null
@@ -1,36 +0,0 @@
-@node memmem
-@section @code{memmem}
-@findex memmem
-
-Unspecified by POSIX, but comparable to @code{strstr}.
-
-Gnulib module: memmem or memmem-simple
-
-Portability problems fixed by either Gnulib module @code{memmem-simple}
-or @code{memmem}:
-@itemize
-@item
-This function is missing on some platforms:
-MacOS X 10.3, FreeBSD 5.2.1, OpenBSD 4.0, AIX 4.3.2, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw, Interix 3.5, BeOS.
-
-@item
-This function has reversed arguments on some older platforms:
-Linux libc 5.0.9
-@end itemize
-
-Portability problems fixed by Gnulib module @code{memmem}:
-@itemize
-@item
-This function returns incorrect values in some cases, such as when
-given an empty needle:
-glibc <= 2.0, Cygwin 1.5.x.
-
-@item
-This function has quadratic instead of linear worst-case complexity on some
-platforms:
-glibc 2.6.1, FreeBSD 6.2, NetBSD 3.0, AIX 5.1, Cygwin 1.5.x.
-@end itemize
-
-Portability problems not fixed by Gnulib:
-@itemize
-@end itemize

diff --git a/doc/glibc-functions/memmem.texi b/doc/glibc-functions/memmem.texi
index ae3e276e8615465aebb8336fc46c801919565833..a9ec7de27d7ede26d2c7878caef5bdcdbcc58d05 100644 (file)
--- a/doc/glibc-functions/memmem.texi
+++ b/doc/glibc-functions/memmem.texi
@@ -2,15 +2,31 @@
 @subsection @code{memmem}
 @findex memmem
 
-Gnulib module: ---
+Gnulib module: memmem or memmem-simple
 
-Portability problems fixed by Gnulib:
+Portability problems fixed by either Gnulib module @code{memmem-simple}
+or @code{memmem}:
 @itemize
+@item
+This function is missing on some platforms:
+MacOS X 10.3, FreeBSD 5.2.1, OpenBSD 4.0, AIX 4.3.2, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw, Interix 3.5, BeOS.
+@item
+This function has reversed arguments on some older platforms:
+Linux libc 5.0.9
 @end itemize
 
-Portability problems not fixed by Gnulib:
+Portability problems fixed by Gnulib module @code{memmem}:
 @itemize
 @item
-This function is missing on some platforms:
-MacOS X 10.3, FreeBSD 5.2.1, OpenBSD 3.8, AIX 4.3.2, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 10, mingw, Interix 3.5, BeOS.
+This function returns incorrect values in some cases, such as when
+given an empty needle:
+glibc <= 2.0, Cygwin 1.5.x.
+@item
+This function has quadratic instead of linear worst-case complexity on some
+platforms:
+glibc 2.6.1, FreeBSD 6.2, NetBSD 3.0, AIX 5.1, Cygwin 1.5.x.
+@end itemize
+
+Portability problems not fixed by Gnulib:
+@itemize
 @end itemize