Merge changes between r23795 and r23927 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@23928 7b3dc134-2b1b-0410-93df-9e9f96275f8d

5 files changed, 7 insertions, 12 deletions

diff --git a/libc/manual/charset.texi b/libc/manual/charset.texi
index e21502e5c..404263930 100644
--- a/libc/manual/charset.texi
+++ b/libc/manual/charset.texi
@@ -786,7 +786,7 @@ mbslen (const char *s)
 This function simply calls @code{mbrlen} for each multibyte character
 in the string and counts the number of function calls.  Please note that
 we here use @code{MB_LEN_MAX} as the size argument in the @code{mbrlen}
-call.  This is acceptable since a) this value is larger then the length of
+call.  This is acceptable since a) this value is larger than the length of
 the longest multibyte character sequence and b) we know that the string
 @var{s} ends with a NUL byte, which cannot be part of any other multibyte
 character sequence but the one representing the NUL wide character.
diff --git a/libc/manual/filesys.texi b/libc/manual/filesys.texi
index 814c210a9..1cac45393 100644
--- a/libc/manual/filesys.texi
+++ b/libc/manual/filesys.texi
@@ -1909,7 +1909,7 @@ replaces the normal implementation.
 @comment Unix98
 @deftypefun int stat64 (const char *@var{filename}, struct stat64 *@var{buf})
 This function is similar to @code{stat} but it is also able to work on
-files larger then @math{2^31} bytes on 32-bit systems.  To be able to do
+files larger than @math{2^31} bytes on 32-bit systems.  To be able to do
 this the result is stored in a variable of type @code{struct stat64} to
 which @var{buf} must point.
 
@@ -1970,7 +1970,7 @@ replaces the normal implementation.
 @comment Unix98
 @deftypefun int lstat64 (const char *@var{filename}, struct stat64 *@var{buf})
 This function is similar to @code{lstat} but it is also able to work on
-files larger then @math{2^31} bytes on 32-bit systems.  To be able to do
+files larger than @math{2^31} bytes on 32-bit systems.  To be able to do
 this the result is stored in a variable of type @code{struct stat64} to
 which @var{buf} must point.
 
@@ -3152,7 +3152,7 @@ interface transparently replaces the old interface.
 @deftypefun {FILE *} tmpfile64 (void)
 This function is similar to @code{tmpfile}, but the stream it returns a
 pointer to was opened using @code{tmpfile64}.  Therefore this stream can
-be used for files larger then @math{2^31} bytes on 32-bit machines.
+be used for files larger than @math{2^31} bytes on 32-bit machines.
 
 Please note that the return type is still @code{FILE *}.  There is no
 special @code{FILE} type for the LFS interface.
diff --git a/libc/manual/install.texi b/libc/manual/install.texi
index 4575d2231..2ac0104ca 100644
--- a/libc/manual/install.texi
+++ b/libc/manual/install.texi
@@ -138,11 +138,6 @@ linker.
 Don't build libraries with profiling information.  You may want to use
 this option if you don't plan to do profiling.
 
-@item --disable-versioning
-Don't compile the shared libraries with symbol version information.
-Doing this will make the resulting library incompatible with old
-binaries, so it's not recommended.
-
 @item --enable-static-nss
 Compile static versions of the NSS (Name Service Switch) libraries.
 This is not recommended because it defeats the purpose of NSS; a program
diff --git a/libc/manual/stdio.texi b/libc/manual/stdio.texi
index 3f9be9bc5..30630caf6 100644
--- a/libc/manual/stdio.texi
+++ b/libc/manual/stdio.texi
@@ -267,7 +267,7 @@ Locks}.
 @deftypefun {FILE *} fopen64 (const char *@var{filename}, const char *@var{opentype})
 This function is similar to @code{fopen} but the stream it returns a
 pointer for is opened using @code{open64}.  Therefore this stream can be
-used even on files larger then @math{2^31} bytes on 32 bit machines.
+used even on files larger than @math{2^31} bytes on 32 bit machines.
 
 Please note that the return type is still @code{FILE *}.  There is no
 special @code{FILE} type for the LFS interface.
diff --git a/libc/manual/string.texi b/libc/manual/string.texi
index 246be8445..2a164a952 100644
--- a/libc/manual/string.texi
+++ b/libc/manual/string.texi
@@ -682,7 +682,7 @@ The behavior of @code{wcpcpy} is undefined if the strings overlap.
 This function is similar to @code{stpcpy} but copies always exactly
 @var{size} characters into @var{to}.
 
-If the length of @var{from} is more then @var{size}, then @code{stpncpy}
+If the length of @var{from} is more than @var{size}, then @code{stpncpy}
 copies just the first @var{size} characters and returns a pointer to the
 character directly following the one which was copied last.  Note that in
 this case there is no null terminator written into @var{to}.
@@ -707,7 +707,7 @@ declared in @file{string.h}.
 This function is similar to @code{wcpcpy} but copies always exactly
 @var{wsize} characters into @var{wto}.
 
-If the length of @var{wfrom} is more then @var{size}, then
+If the length of @var{wfrom} is more than @var{size}, then
 @code{wcpncpy} copies just the first @var{size} wide characters and
 returns a pointer to the wide character directly following the last
 non-null wide character which was copied last.  Note that in this case