Update or avoid glibc version numbers in manual.

4 files changed, 31 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index 5ea30b9d21..366d891a4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2012-02-21  Joseph Myers  <joseph@codesourcery.com>
 
+	* manual/install.texi: Do not mention specific glibc version
+	numbers.
+	* manual/libc.texinfo (VERSION, UPDATED): Update.
+	(@copying): Use @copyright{} and range of years.
+
+2012-02-21  Joseph Myers  <joseph@codesourcery.com>
+
 	[BZ #13695]
 	* csu/Makefile (distribute): Remove initfini.c and defs.awk.
 	[crti.S not in sysdirs] (generated): Do not append.
diff --git a/INSTALL b/INSTALL
index 9f9588da33..3f43f05c80 100644
--- a/INSTALL
+++ b/INSTALL
@@ -20,7 +20,7 @@ Configuring and compiling GNU Libc
 
 GNU libc cannot be compiled in the source directory.  You must build it
 in a separate build directory.  For example, if you have unpacked the
-glibc sources in `/src/gnu/glibc-2.4', create a directory
+glibc sources in `/src/gnu/glibc-VERSION', create a directory
 `/src/gnu/glibc-build' to put the object files in.  This allows
 removing the whole build directory in case an error occurs, which is
 the safest way to get a fresh start and should always be done.
@@ -28,7 +28,7 @@ the safest way to get a fresh start and should always be done.
    From your object directory, run the shell script `configure' located
 at the top level of the source tree.  In the scenario above, you'd type
 
-     $ ../glibc-2.4/configure ARGS...
+     $ ../glibc-VERSION/configure ARGS...
 
    Please note that even though you're building in a separate build
 directory, the compilation needs to modify a few files in the source
@@ -79,7 +79,7 @@ will be used, and CFLAGS sets optimization options for the compiler.
      absolute directory name or can be a directory name relative to the
      main source directory, or relative to the build directory (that
      is, the current working directory).  For example,
-     `--enable-add-ons=nptl,../glibc-libidn-2.4'.
+     `--enable-add-ons=nptl,../glibc-libidn-VERSION'.
 
 `--enable-kernel=VERSION'
      This option is currently only useful on GNU/Linux systems.  The
@@ -235,8 +235,8 @@ paths for installation.  This is useful when setting up a chroot
 environment or preparing a binary distribution.  The directory should be
 specified with an absolute file name.
 
-   Glibc 2.2 includes a daemon called `nscd', which you may or may not
-want to run.  `nscd' caches name service lookups; it can dramatically
+   Glibc includes a daemon called `nscd', which you may or may not want
+to run.  `nscd' caches name service lookups; it can dramatically
 improve performance with NIS+, and may help with DNS as well.
 
    One auxiliary program, `/usr/libexec/pt_chown', is installed setuid
@@ -282,16 +282,15 @@ build the GNU C library:
 
    * GCC 3.4 or newer, GCC 4.1 recommended
 
-     For the 2.4 release or later, GCC 3.4 or higher is required; as of
-     this writing, GCC 4.4 is the compiler we advise to use for current
-     versions.  On certain machines including `powerpc64', compilers
-     prior to GCC 4.0 have bugs that prevent them compiling the C
-     library code in the 2.4 release.  On other machines, GCC 4.1 is
-     required to build the C library with support for the correct `long
-     double' type format; these include `powerpc' (32 bit), `s390' and
-     `s390x'.  For other architectures special compiler-provided
-     headers are needed (like `cpuid.h' on x86) which only come with
-     later compiler versions.
+     GCC 3.4 or higher is required; as of this writing, GCC 4.4 is the
+     compiler we advise to use for current versions.  On certain
+     machines including `powerpc64', compilers prior to GCC 4.0 have
+     bugs that prevent them compiling the C library code.  On other
+     machines, GCC 4.1 is required to build the C library with support
+     for the correct `long double' type format; these include `powerpc'
+     (32 bit), `s390' and `s390x'.  For other architectures special
+     compiler-provided headers are needed (like `cpuid.h' on x86) which
+     only come with later compiler versions.
 
      You can use whatever compiler you like to compile programs that
      use GNU libc, but be aware that both GCC 2.7 and 2.8 have bugs in
diff --git a/manual/install.texi b/manual/install.texi
index 61ff23cc3c..8bfd5f1a17 100644
--- a/manual/install.texi
+++ b/manual/install.texi
@@ -35,7 +35,7 @@ GNU Make, and possibly others.  @xref{Tools for Compilation}, below.
 
 GNU libc cannot be compiled in the source directory.  You must build
 it in a separate build directory.  For example, if you have unpacked
-the glibc sources in @file{/src/gnu/glibc-2.4}, create a directory
+the glibc sources in @file{/src/gnu/glibc-@var{version}}, create a directory
 @file{/src/gnu/glibc-build} to put the object files in.  This allows
 removing the whole build directory in case an error occurs, which is
 the safest way to get a fresh start and should always be done.
@@ -44,7 +44,7 @@ From your object directory, run the shell script @file{configure} located
 at the top level of the source tree.  In the scenario above, you'd type
 
 @smallexample
-$ ../glibc-2.4/configure @var{args@dots{}}
+$ ../glibc-@var{version}/configure @var{args@dots{}}
 @end smallexample
 
 Please note that even though you're building in a separate build
@@ -98,7 +98,7 @@ spaces or commas (if you use spaces, remember to quote them from the
 shell).  Each add-on in @var{list} can be an absolute directory name
 or can be a directory name relative to the main source directory, or
 relative to the build directory (that is, the current working directory).
-For example, @samp{--enable-add-ons=nptl,../glibc-libidn-2.4}.
+For example, @samp{--enable-add-ons=nptl,../glibc-libidn-@var{version}}.
 
 @item --enable-kernel=@var{version}
 This option is currently only useful on GNU/Linux systems.  The
@@ -262,7 +262,7 @@ paths for installation.  This is useful when setting up a chroot
 environment or preparing a binary distribution.  The directory should be
 specified with an absolute file name.
 
-Glibc 2.2 includes a daemon called @code{nscd}, which you
+Glibc includes a daemon called @code{nscd}, which you
 may or may not want to run.  @code{nscd} caches name service lookups; it
 can dramatically improve performance with NIS+, and may help with DNS as
 well.
@@ -315,11 +315,11 @@ bugs or lack features.
 @item
 GCC 3.4 or newer, GCC 4.1 recommended
 
-For the 2.4 release or later, GCC 3.4 or higher is required; as of this
+GCC 3.4 or higher is required; as of this
 writing, GCC 4.4 is the compiler we advise to use for current versions.
 On certain machines including @code{powerpc64}, compilers prior to GCC
-4.0 have bugs that prevent them compiling the C library code in the
-2.4 release.  On other machines, GCC 4.1 is required to build the C
+4.0 have bugs that prevent them compiling the C library code.  On other
+machines, GCC 4.1 is required to build the C
 library with support for the correct @code{long double} type format;
 these include @code{powerpc} (32 bit), @code{s390} and @code{s390x}.  For
 other architectures special compiler-provided headers are needed
diff --git a/manual/libc.texinfo b/manual/libc.texinfo
index dfbfac30e3..0ac764f790 100644
--- a/manual/libc.texinfo
+++ b/manual/libc.texinfo
@@ -19,8 +19,8 @@
 
 @c sold 0.06/1.09, print run out 21may96
 @set EDITION 0.13
-@set VERSION 2.14
-@set UPDATED 2011-07-19
+@set VERSION 2.15.90
+@set UPDATED 2012-02-21
 @set ISBN 1-882114-55-8
 
 @copying
@@ -29,8 +29,7 @@ This file documents the GNU C library.
 This is Edition @value{EDITION}, last updated @value{UPDATED},
 of @cite{The GNU C Library Reference Manual}, for version @value{VERSION}.
 
-Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
-2003, 2007, 2008, 2010, 2011 Free Software Foundation, Inc.
+Copyright @copyright{} 1993--2012 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or