summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2008-06-04 11:46:50 +0200
committerPetr Baudis <pasky@ucw.cz>2010-05-12 02:00:47 +0200
commit2da4488386833b4787fc3e364a304bf2201b0aca (patch)
tree043531e9287f04b75cee0c0505acb0ea47ee8822
parenta4b67d9bcd17d19386fada0c26f2dbbf0f192d9f (diff)
downloadglibc-2da4488386833b4787fc3e364a304bf2201b0aca.tar.gz
manual: adjust grammar
* manual/charset.texi: Adjust grammar. (cherry picked from commit 82acaacb9c7689c479c3426743ae66d0ad466a1d)
-rw-r--r--ChangeLog2
-rw-r--r--manual/charset.texi10
2 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index c86bd63a27..6071e5626d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2010-02-22 Jim Meyering <meyering@redhat.com>
+ * manual/charset.texi: Adjust grammar.
+
* manual/errno.texi (Error Messages): Fix doubled-words and typos.
* manual/charset.texi (Selecting the Conversion): Likewise.
* manual/getopt.texi (Getopt Long Options): Likewise.
diff --git a/manual/charset.texi b/manual/charset.texi
index a49798c7c2..808469b8c1 100644
--- a/manual/charset.texi
+++ b/manual/charset.texi
@@ -393,7 +393,7 @@ We already said above that the currently selected locale for the
by the functions we are about to describe. Each locale uses its own
character set (given as an argument to @code{localedef}) and this is the
one assumed as the external multibyte encoding. The wide character
-set always is UCS-4, at least on GNU systems.
+set is always UCS-4, at least on GNU systems.
A characteristic of each multibyte character set is the maximum number
of bytes that can be necessary to represent one character. This
@@ -577,8 +577,8 @@ The @code{btowc} function was introduced in @w{Amendment 1} to @w{ISO C90}
and is declared in @file{wchar.h}.
@end deftypefun
-Despite the limitation that the single byte value always is interpreted
-in the initial state this function is actually useful most of the time.
+Despite the limitation that the single byte value is always interpreted
+in the initial state, this function is actually useful most of the time.
Most characters are either entirely single-byte character sets or they
are extension to ASCII. But then it is possible to write code like this
(not that this specific example is very useful):
@@ -607,10 +607,10 @@ that there is no guarantee that one can perform this kind of arithmetic
on the character of the character set used for @code{wchar_t}
representation. In other situations the bytes are not constant at
compile time and so the compiler cannot do the work. In situations like
-this it is necessary @code{btowc}.
+this, using @code{btowc} is required.
@noindent
-There also is a function for the conversion in the other direction.
+There is also a function for the conversion in the other direction.
@comment wchar.h
@comment ISO