5 files changed, 22 insertions, 7 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index b0c5088ab..7350347c9 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,11 +1,22 @@
+2009-02-25  Brooks Moses  <brooks@codesourcery.com>
+
+	* libc/stdlib/Makefile.am (CHEWOUT_FILES): Add
+	  mbsnrtowcs.def, wcsnrtombs.def.
+	* libc/stdlib/Makefile.in: Regenerate.
+	* libc/stdlib/stdlib.tex (@menu): Use correct section
+	  names for mbsrtowcs, wcsrtombs.
+	* libc/stdlib/wcstod.c: Remove stray character in
+	  documentation.
+
 2009-02-25  Corinna Vinschen  <corinna@vinschen.de>
 
-	* mbtowc_r.c (_mbtowc_r): Remove conversion of 5 and 6 byte UTF-8
+	* libc/stdlib/mbtowc_r.c (_mbtowc_r): Remove conversion of 5 and 6 
+	byte UTF-8
 	sequences since they are invalid in the Unicode standard.
 	Handle surrogate pairs in case of wchar_t == UTF-16.
-	* wctomb_r.c (_wctomb_r): Don't convert invalid Unicode wchar_t
-	values beyond 0x10ffff into UTF-8 chars.  Handle surrogate pairs in
-	case of wchar_t == UTF-16.
+	* libc/stdlib/wctomb_r.c (_wctomb_r): Don't convert invalid Unicode 
+	wchar_t values beyond 0x10ffff into UTF-8 chars.  Handle surrogate 
+	pairs in case of wchar_t == UTF-16.
 
 2009-02-24  Kevin Buettner  <kevinb@redhat.com>
 
diff --git a/newlib/libc/stdlib/Makefile.am b/newlib/libc/stdlib/Makefile.am
index 6a9296e62..74df73a09 100644
--- a/newlib/libc/stdlib/Makefile.am
+++ b/newlib/libc/stdlib/Makefile.am
@@ -229,6 +229,7 @@ CHEWOUT_FILES= \
 	malloc.def	\
 	mallocr.def	\
 	mblen.def	\
+	mbsnrtowcs.def	\
 	mbstowcs.def	\
 	mbtowc.def	\
 	mlock.def	\
@@ -241,6 +242,7 @@ CHEWOUT_FILES= \
 	strtoll.def 	\
 	strtoul.def 	\
 	strtoull.def 	\
+	wcsnrtombs.def	\
 	wcstod.def 	\
 	wcstol.def 	\
 	wcstoll.def 	\
diff --git a/newlib/libc/stdlib/Makefile.in b/newlib/libc/stdlib/Makefile.in
index ab06a0ef3..4734317cf 100644
--- a/newlib/libc/stdlib/Makefile.in
+++ b/newlib/libc/stdlib/Makefile.in
@@ -520,6 +520,7 @@ CHEWOUT_FILES = \
 	malloc.def	\
 	mallocr.def	\
 	mblen.def	\
+	mbsnrtowcs.def	\
 	mbstowcs.def	\
 	mbtowc.def	\
 	mlock.def	\
@@ -532,6 +533,7 @@ CHEWOUT_FILES = \
 	strtoll.def 	\
 	strtoul.def 	\
 	strtoull.def 	\
+	wcsnrtombs.def	\
 	wcstod.def 	\
 	wcstol.def 	\
 	wcstoll.def 	\
diff --git a/newlib/libc/stdlib/stdlib.tex b/newlib/libc/stdlib/stdlib.tex
index 9242246db..b227d13e9 100644
--- a/newlib/libc/stdlib/stdlib.tex
+++ b/newlib/libc/stdlib/stdlib.tex
@@ -29,7 +29,7 @@ The corresponding declarations are in the header file @file{stdlib.h}.
 * malloc::      Allocate and manage memory (malloc, realloc, free)
 * mallinfo::	Get information about allocated memory
 * __malloc_lock::	Lock memory pool for malloc and free
-* mbsnrtowcs::	Convert a character string to a wide-character string
+* mbsrtowcs::	Convert a character string to a wide-character string
 * mbstowcs::	Minimal multibyte string to wide string converter
 * mblen::	Minimal multibyte length
 * mbtowc::      Minimal multibyte to wide character converter
@@ -41,7 +41,7 @@ The corresponding declarations are in the header file @file{stdlib.h}.
 * strtoll::     String to long long
 * strtoul::     String to unsigned long
 * strtoull::    String to unsigned long long
-* wcsnrtombs::	Convert a wide-character string to a character string
+* wcsrtombs::	Convert a wide-character string to a character string
 * wcstod::      Wide string to double or float
 * wcstol::      Wide string to long
 * wcstoll::     Wide string to long long
diff --git a/newlib/libc/stdlib/wcstod.c b/newlib/libc/stdlib/wcstod.c
index 2d62a86af..11fb922b1 100644
--- a/newlib/libc/stdlib/wcstod.c
+++ b/newlib/libc/stdlib/wcstod.c
@@ -71,7 +71,7 @@ DESCRIPTION
 	round-even rule.  However, <<wcstof>> is currently subject to
 	double rounding errors.
 
-	The alternate functions <<_wcstod_r>> and <<_wcstof_r>:> are 
+	The alternate functions <<_wcstod_r>> and <<_wcstof_r>> are 
 	reentrant versions of <<wcstod>> and <<wcstof>>, respectively.
 	The extra argument <[reent]> is a pointer to a reentrancy structure.