aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--NEWS6
-rw-r--r--manual/stdio.texi4
3 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ebc8b3274..56f79ce7a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-17 Joseph Myers <joseph@codesourcery.com>
+
+ [BZ #6884]
+ * manual/stdio.texi (fopen): Fix typos in description of
+ ",ccs=STRING".
+
2012-02-17 Aurelien Jarno <aurelien@aurel32.net>
[BZ #4026]
diff --git a/NEWS b/NEWS
index ec0e938d89..a9bc32658f 100644
--- a/NEWS
+++ b/NEWS
@@ -9,9 +9,9 @@ Version 2.16
* The following bugs are resolved with this release:
- 411, 4026 4822, 9902, 10140, 11494, 13525, 13526, 13527, 13528, 13529,
- 13531, 13532, 13533, 13547, 13530, 13551, 13552, 13553, 13555, 13559,
- 13583, 13618
+ 411, 4026, 4822, 6884, 9902, 10140, 11494, 13525, 13526, 13527, 13528,
+ 13529, 13531, 13532, 13533, 13547, 13530, 13551, 13552, 13553, 13555,
+ 13559, 13583, 13618
* ISO C11 support:
diff --git a/manual/stdio.texi b/manual/stdio.texi
index 588c15bf7d..58fcda07d0 100644
--- a/manual/stdio.texi
+++ b/manual/stdio.texi
@@ -215,8 +215,8 @@ difference in POSIX systems (including the GNU system). If both
If the @var{opentype} string contains the sequence
@code{,ccs=@var{STRING}} then @var{STRING} is taken as the name of a
coded character set and @code{fopen} will mark the stream as
-wide-oriented which appropriate conversion functions in place to convert
-from and to the character set @var{STRING} is place. Any other stream
+wide-oriented with appropriate conversion functions in place to convert
+from and to the character set @var{STRING}. Any other stream
is opened initially unoriented and the orientation is decided with the
first file operation. If the first operation is a wide character
operation, the stream is not only marked as wide-oriented, also the