2002-08-29 Jeff Johnston <jjohnstn@redhat.com>

        * libc/libc.texinfo: Add node reference to wide-character strings.
        * libc/string/wcstrings.tex: New file.
        * libc/string/strtok_r.c: Remove outdated advertising clause.
        * libc/string/Makefile.am (doc): Add wide-character string
        chapter to documentation.
        * libc/string/Makefile.in: Regenerated.

4 files changed, 93 insertions, 5 deletions

diff --git a/newlib/libc/string/Makefile.am b/newlib/libc/string/Makefile.am
index 9e9bdb481..cc7c9e732 100644
--- a/newlib/libc/string/Makefile.am
+++ b/newlib/libc/string/Makefile.am
@@ -121,5 +121,6 @@ TARGETDOC = ../tmp.texi
 
 doc: $(CHEWOUT_FILES)
 	cat $(srcdir)/strings.tex >> $(TARGETDOC)
+	cat $(srcdir)/wcstrings.tex >> $(TARGETDOC)
 
 CLEANFILES = $(CHEWOUT_FILES) *.ref
diff --git a/newlib/libc/string/Makefile.in b/newlib/libc/string/Makefile.in
index e140de8b6..14f7b74f0 100644
--- a/newlib/libc/string/Makefile.in
+++ b/newlib/libc/string/Makefile.in
@@ -500,6 +500,7 @@ objectlist.awk.in: $(noinst_LTLIBRARIES)
 
 doc: $(CHEWOUT_FILES)
 	cat $(srcdir)/strings.tex >> $(TARGETDOC)
+	cat $(srcdir)/wcstrings.tex >> $(TARGETDOC)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/newlib/libc/string/strtok_r.c b/newlib/libc/string/strtok_r.c
index c4aecc811..02ad80b9b 100644
--- a/newlib/libc/string/strtok_r.c
+++ b/newlib/libc/string/strtok_r.c
@@ -10,11 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/newlib/libc/string/wcstrings.tex b/newlib/libc/string/wcstrings.tex
new file mode 100644
index 000000000..ccd029f49
--- /dev/null
+++ b/newlib/libc/string/wcstrings.tex
@@ -0,0 +1,90 @@
+@node Wchar strings
+@chapter Wide Character Strings (@file{wchar.h})
+
+This chapter describes wide-character string-handling functions and
+managing areas of memory containing wide-characters.  The corresponding 
+declarations are in @file{wchar.h}.
+
+@menu
+* wmemchr::     Find wide-character in memory
+* wmemcmp::     Compare two wide-character memory areas
+* wmemcpy::     Copy wide-character memory regions
+* wmemmove::    Move possibly overlapping wide-character memory
+* wmemset::     Set an area of memory to a specified wide-character
+* wcscat::      Concatenate wide-character strings
+* wcschr::      Search for wide-character in string
+* wcscmp::      Wide-character string compare
+* wcscpy::      Copy wide-character string
+* wcscspn::     Count wide-chars not in string
+* wcslcat::     Concatenate wide-character strings to specified length
+* wcslcpy::     Copy wide-character string to specified length
+* wcslen::      Wide-character string length
+* wcsncat::     Concatenate wide-character strings
+* wcsncmp::     Wide-character string compare
+* wcsncpy::     Counted copy wide-character string
+* wcspbrk::     Find wide-chars in string
+* wcsrchr::     Reverse search for wide-character in string
+* wcsspn::      Find initial match in wide-character string
+* wcsstr::      Find wide-character string segment
+@end menu
+
+@page
+@include string/wmemchr.def
+
+@page
+@include string/wmemcmp.def
+
+@page
+@include string/wmemcpy.def
+
+@page
+@include string/wmemmove.def
+
+@page
+@include string/wmemset.def
+
+@page
+@include string/wcscat.def
+
+@page
+@include string/wcschr.def
+
+@page
+@include string/wcscmp.def
+
+@page
+@include string/wcscpy.def
+
+@page
+@include string/wcscspn.def
+
+@page
+@include string/wcslcat.def
+
+@page
+@include string/wcslcpy.def
+
+@page
+@include string/wcslen.def
+
+@page
+@include string/wcsncat.def
+
+@page
+@include string/wcsncmp.def
+
+@page
+@include string/wcsncpy.def
+
+@page
+@include string/wcspbrk.def
+
+@page
+@include string/wcsrchr.def
+
+@page
+@include string/wcsspn.def
+
+@page
+@include string/wcsstr.def
+