Merge branch 'stable'

[gnulib.git] / doc / posix-functions / iconv.texi

diff --git a/doc/posix-functions/iconv.texi b/doc/posix-functions/iconv.texi
index 3f984b5..8f26da2 100644 (file)
--- a/doc/posix-functions/iconv.texi
+++ b/doc/posix-functions/iconv.texi
@@ -22,15 +22,15 @@ Portability problems not fixed by Gnulib:
 @itemize
 @item
 This function is missing on some platforms:
-MacOS X 10.5, FreeBSD 6.0, OpenBSD 3.8, IRIX 5.3, Cygwin, mingw, BeOS,
+Mac OS X 10.5, FreeBSD 6.0, OpenBSD 3.8, Minix 3.1.8, IRIX 5.3, Cygwin, mingw, MSVC 9, BeOS,
 when GNU libiconv is not installed.
 @item
 This function was not correctly implemented in glibc versions before 2.2.
 @item
-When @code{iconv} encounters an input character that is valid but that can
-not be converted to the output character set, glibc's and GNU libiconv's
+When @code{iconv} encounters an input character that is valid but that
+cannot be converted to the output character set, glibc's and GNU libiconv's
 @code{iconv} stop the conversion.  Some other implementations put an
-implementation-defined character into the output buffer.  ---
+implementation-defined character into the output buffer.
 Gnulib provides higher-level facilities @code{striconv} and @code{striconveh}
 (wrappers around @code{iconv}) that deal with conversion errors in a platform
 independent way.