Merge in texinfo-3.12.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@18811 138bc75d-0d04-0410-961f-82ee72b054a4

79 files changed, 4634 insertions, 4354 deletions

diff --git a/texinfo/ABOUT-NLS b/texinfo/ABOUT-NLS
index 75f8a27fda1..dacb8b18bed 100644
--- a/texinfo/ABOUT-NLS
+++ b/texinfo/ABOUT-NLS
@@ -1,16 +1,16 @@
-Notes on the GNU Translation Project
-************************************
+Notes on the Free Translation Project
+*************************************
 
-   GNU is going international!  The GNU Translation Project is a way to
-get maintainers, translators, and users all together, so that GNU will
-gradually become able to speak many languages.  A few packages already
-provide translations for their messages.
+   Free software is going international!  The Free Translation Project
+is a way to get maintainers of free software, translators, and users all
+together, so that will gradually become able to speak many languages.
+A few packages already provide translations for their messages.
 
-   If you found this `ABOUT-NLS' file inside a GNU distribution, you
-may assume that the distributed package does use GNU `gettext'
-internally, itself available at your nearest GNU archive site.  But you
-do *not* need to install GNU `gettext' prior to configuring, installing
-or using this package with messages translated.
+   If you found this `ABOUT-NLS' file inside a distribution, you may
+assume that the distributed package does use GNU `gettext' internally,
+itself available at your nearest GNU archive site.  But you do *not*
+need to install GNU `gettext' prior to configuring, installing or using
+this package with messages translated.
 
    Installers will find here some useful hints.  These notes also
 explain how users should proceed for getting the programs to use the
@@ -31,19 +31,23 @@ should configure it using
      ./configure --with-included-gettext
 
 to force usage of internationalizing routines provided within this
-package, despite the existence of internationalizing capabilities in
-the operating system where this package is being installed.  So far, no
-prior implementation provides as many useful features (such as locale
-alias or message inheritance).  It is also not possible to offer this
-additional functionality on top of a `catgets' implementation.  Future
-versions of GNU `gettext' will very likely convey even more
-functionality.  So it might be a good idea to change to GNU `gettext'
-as soon as possible.
+package, despite the existence of internationalizing capabilities in the
+operating system where this package is being installed.  So far, only
+the `gettext' implementation in the GNU C library version 2 provides as
+many features (such as locale alias or message inheritance) as the
+implementation here.  It is also not possible to offer this additional
+functionality on top of a `catgets' implementation.  Future versions of
+GNU `gettext' will very likely convey even more functionality.  So it
+might be a good idea to change to GNU `gettext' as soon as possible.
+
+   So you need not provide this option if you are using GNU libc 2 or
+you have installed a recent copy of the GNU gettext package with the
+included `libintl'.
 
 INSTALL Matters
 ===============
 
-   Some GNU packages are "localizable" when properly installed; the
+   Some packages are "localizable" when properly installed; the
 programs they contain can be made to speak your own native language.
 Most such packages use GNU `gettext'.  Other packages have their own
 ways to internationalization, predating GNU `gettext'.
@@ -113,37 +117,34 @@ shell prompt, merely execute `setenv LANG de' (in `csh'),
 can be done from your `.login' or `.profile' file, once and for all.
 
    An operating system might already offer message localization for
-many of its programs, while other programs (whether GNU or not) have
-been installed locally with the full capabilities of GNU `gettext'.
-Just using `gettext' extended syntax for `LANG' would break proper
-localization of already available operating system programs.  In this
-case, users should set both `LANGUAGE' and `LANG' variables in their
-environment, as programs using GNU `gettext' give preference to
-`LANGUAGE'.  For example, some Swedish users would rather read
-translations in German than English for when Swedish is not available.
-This is easily accomplished by setting `LANGUAGE' to `sv:de' while
-leaving `LANG' to `sv'.
+many of its programs, while other programs have been installed locally
+with the full capabilities of GNU `gettext'.  Just using `gettext'
+extended syntax for `LANG' would break proper localization of already
+available operating system programs.  In this case, users should set
+both `LANGUAGE' and `LANG' variables in their environment, as programs
+using GNU `gettext' give preference to `LANGUAGE'.  For example, some
+Swedish users would rather read translations in German than English for
+when Swedish is not available.  This is easily accomplished by setting
+`LANGUAGE' to `sv:de' while leaving `LANG' to `sv'.
 
 Translating Teams
 =================
 
-   For the GNU Translation Project to be a success, we need interested
+   For the Free Translation Project to be a success, we need interested
 people who like their own language and write it well, and who are also
 able to synergize with other translators speaking the same language.
 Each translation team has its own mailing list, courtesy of Linux
 International.  You may reach your translation team at the address
 `LL@li.org', replacing LL by the two-letter ISO 639 code for your
 language.  Language codes are *not* the same as the country codes given
-in ISO 3166.  The following translation teams exist, as of February
-1997:
+in ISO 3166.  The following translation teams exist, as of August 1997:
 
-     Arabic `ar', Chinese `zh', Czech `cs', Danish `da', Dutch `nl',
-     English `en', Esperanto `eo', Finnish `fi', French `fr', German
-     `de', Greek `el', Hebrew `he', Hungarian `hu', Irish `ga', Italian
-     `it', Indonesian `id', Japanese `ja', Korean `ko', Latin `la',
-     Norwegian `no', Persian `fa', Polish `pl', Portuguese `pt',
-     Russian `ru', Slovenian `sl', Spanish `es', Swedish `sv', Telugu
-     `te', Turkish `tr' and Ukrainian `uk'.
+     Chinese `zh', Czech `cs', Danish `da', Dutch `nl', English `en',
+     Esperanto `eo', Finnish `fi', French `fr', German `de', Hungarian
+     `hu', Irish `ga', Italian `it', Indonesian `id', Japanese `ja',
+     Korean `ko', Latin `la', Norwegian `no', Persian `fa', Polish
+     `pl', Portuguese `pt', Russian `ru', Slovenian `sl', Spanish `es',
+     Swedish `sv', and Turkish `tr'.
 
 For example, you may reach the Chinese translation team by writing to
 `zh@li.org'.
@@ -160,55 +161,53 @@ message to `sv-request@li.org', having this message body:
 *actively* in translations, or at solving translational difficulties,
 rather than merely lurking around.  If your team does not exist yet and
 you want to start one, or if you are unsure about what to do or how to
-get started, please write to `gnu-translation@gnu.ai.mit.edu' to reach
-the GNU coordinator for all translator teams.
+get started, please write to `translation@iro.umontreal.ca' to reach the
+coordinator for all translator teams.
 
    The English team is special.  It works at improving and uniformizing
-the terminology used in GNU.  Proven linguistic skill are praised more
-than programming skill, here.  For the time being, please avoid
-subscribing to the English team unless explicitly invited to do so.
+the terminology in use.  Proven linguistic skill are praised more than
+programming skill, here.
 
 Available Packages
 ==================
 
-   Languages are not equally supported in all GNU packages.  The
-following matrix shows the current state of GNU internationalization,
-as of February 1997.  The matrix shows, in regard of each package, for
-which languages PO files have been submitted to translation
-coordination.
-
-     Ready PO files    cs de en es fi fr ja ko nl no pl pt sl sv
-                     .-------------------------------------------.
-     bash            |    []          []       []                |  3
-     bison           |    []          []       []                |  3
-     clisp           |    [] []       []                         |  3
-     cpio            |    []    []    []       []    []          |  5
-     diffutils       |          []    []             []       [] |  4
-     enscript        |    []       [] []       []          []    |  5
-     fileutils       |    []    []    []       []    [] [] [] [] |  8
-     findutils       |    []    []    []    [] []    []       [] |  7
-     flex            |                []    []                [] |  3
-     gcal            |    []          []       []                |  3
-     gettext         |    []    []    []    [] [] [] [] [] [] [] | 11
-     grep            |          []    []    [] [] [] []    [] [] |  8
-     hello           |    []    []    []    [] [] [] [] [] [] [] | 10
-     id-utils        |    []          []                         |  2
-     indent          |    []                []                   |  2
-     libc            |    []    []    []    [] []    []       [] |  7
-     m4              |    []          [] []    []             [] |  5
-     make            |    []    []    []    [] []    []          |  6
-     music           |                []                         |  1
-     ptx             |    []    []    []       [] [] [] []    [] |  8
-     recode          |    []    []    []       []    [] [] [] [] |  8
-     sh-utils        |    []          []       []       []    [] |  5
-     sharutils       |    []    []    []       []             [] |  5
-     tar             |    []          []    [] [] [] [] [] [] [] |  9
-     texinfo         |                                           |  0
-     textutils       |    []    []    []    [] []    []          |  6
-     wdiff           | [] []    []    []       [] [] []       [] |  8
-                     `-------------------------------------------'
-       14 languages    cs de en es fi fr ja ko nl no pl pt sl sv
-       27 packages      1 22  1 14  1 25  1 10 20  7 14  7  7 15  145
+   Languages are not equally supported in all packages.  The following
+matrix shows the current state of internationalization, as of August
+1997.  The matrix shows, in regard of each package, for which languages
+PO files have been submitted to translation coordination.
+
+     Ready PO files    cs da de en es fi fr it ja ko nl no pl pt sl sv
+                     .-------------------------------------------------.
+     bash            |       []          []          []                |  3
+     bison           |       []          []          []                |  3
+     clisp           |       [] [] []    []                            |  4
+     cpio            |       []    []    []          []    []          |  5
+     diffutils       |       []    []    []                []       [] |  5
+     enscript        |       []    [] [] []          []          []    |  6
+     fileutils       | []    []    []    []       [] []    [] [] [] [] | 10
+     findutils       |       []    []    [] []    [] []    []       [] |  8
+     flex            |             []    []       []                [] |  4
+     gcal            |       []          []          []    []       [] |  5
+     gettext         |       []    []    []       [] [] [] [] [] [] [] | 11
+     grep            |       []    []    []       [] [] [] []    [] [] |  9
+     hello           |       []    []    []       [] [] [] [] [] [] [] | 10
+     id-utils        |       []          []                []          |  3
+     indent          |    [] []                   []       []          |  4
+     libc            |       []    []    []       [] []    []       [] |  7
+     m4              |       []          []    []    []             [] |  5
+     make            |       []    []    []       [] []    []          |  6
+     music           |                   []                []          |  2
+     ptx             |       []    []    []          [] [] [] []    [] |  8
+     recode          |    [] []    []    []          []    [] [] [] [] |  9
+     sh-utils        |       []          []          [] [] [] []    [] |  7
+     sharutils       |       []    []    []          []             [] |  5
+     tar             |       []          [] []    [] [] [] [] [] [] [] | 10
+     texinfo         |                   []                            |  1
+     textutils       | []    []    []    []       [] [] [] []       [] |  9
+     wdiff           | []    []    []    []          [] [] []       [] |  8
+                     `-------------------------------------------------'
+       16 languages    cs da de en es fi fr it ja ko nl no pl pt sl sv
+       27 packages      3  2 24  1 17  1 26  2  1 11 20  9 19  7  7 17  167
 
    Some counters in the preceding matrix are higher than the number of
 visible blocks let us expect.  This is because a few extra PO files are
@@ -219,8 +218,8 @@ dialects.
 which it applies should also have been internationalized and
 distributed as such by its maintainer.  There might be an observable
 lag between the mere existence a PO file and its wide availability in a
-GNU distribution.
+distribution.
 
-   If February 1997 seems to be old, you may fetch a more recent copy
-of this `ABOUT-NLS' file on most GNU archive sites.
+   If August 1997 seems to be old, you may fetch a more recent copy of
+this `ABOUT-NLS' file on most GNU archive sites.
 
diff --git a/texinfo/ChangeLog b/texinfo/ChangeLog
index 453750c49e4..8e3fb78ebe7 100644
--- a/texinfo/ChangeLog
+++ b/texinfo/ChangeLog
@@ -1,47 +1,227 @@
-Mon Feb  2 17:17:17 1998  Jason Molenda  (crash@bugshack.cygnus.com)
+Tue Mar  3 13:29:17 1998  Karl Berry  <karl@cs.umb.edu>
 
-	* info/termdep.h (TIOCGETC): Don't define if we have termios.h.
-        From Robert Lipe.
+	* configure.in: Version 3.12.
 
-Tue Oct  7 11:14:04 1997  Michael Meissner  <meissner@cygnus.com>
+	* po/de.po: New version.
+	
+	* po/POTFILES.in: Do not include doc.c; that gets built at
+	runtime, thus causing texinfo.pot to try to get rebuilt.  Besides,
+	it doesn't have any translatable strings.
+
+Sun Mar  1 10:38:47 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* util/install-info.c: No need for i18n on version message.  From
+ 		ke@suse.de.
+
+Fri Feb 27 16:06:23 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* configure.in: Run texconfig conf instead of confall.
+
+	* doc/Makefile.am (INSTALL_INFO): New variable.
+	(install-info-am): Use install-info from our distribution.
+
+	* info/info.c (info_minor_version): Increment.
+	* (info_patch_level),
+	* info/info.h (info_patch_level): Remove.
+
+	* info/info.c (program_name): Move decl.
+
+	* util/install-info.c (ensure_dirfile_exists): Use commas and \t
+	 instead of an explicit tab, which make dist expands.
+
+	* doc/texinfo.txi: @prep.ai.mit.edu -> @gnu.org.
+
+	* info/info.c: Make help messages consistent with others.
+
+	* util/install-info.c (print_help): Format consistently.
+	
+	(readfile): Support gzipped files via libz.
+	From: Elliot Lee <sopwith@redhat.com>
+	Date: Mon, 1 Sep 1997 23:37:14 -0400 (EDT)
+
+Thu Feb 26 16:13:14 1998  Karl Berry  <karl@cs.umb.edu>
 
-	* info/tilde.c (alloca): Don't redefine alloca as __builtin_alloca
-	if alloca was already defined.
+	* info/echo-area.c: Whoops, _ might not start with parens.
 
-Mon Oct  6 12:46:27 1997  Ian Lance Taylor  <ian@cygnus.com>
+	* configure.in: Check for libz.
+	Do not output emacs/Makefile.
 
-	* util/Makefile.am (bin_PROGRAMS): Remove install-info.
-	(noinst_PROGRAMS, install_inf_SOURCES): Define.
-	(install-exec-local): New target.
-	* util/Makefile.in: Rebuild.
-	* info/Makefile.in: Rebuild with current automake.
+	* Makefile.am (AUTOMAKE_OPTIONS): Set to 1.2f.
 
-Wed Sep  3 12:44:18 1997  Ian Lance Taylor  <ian@cygnus.com>
+	* util/texi2dvi: Always remove temporary directories. (From Akim.)
+	Formatting changes.
 
-	* po/Makefile.in.in: More --enable-maintainer-mode changes.
+Wed Feb 25 15:26:26 1998  Karl Berry  <karl@cs.umb.edu>
 
-Thu Aug 28 23:52:29 1997  Ian Lance Taylor  <ian@cygnus.com>
+	* util/texi2dvi: New options --batch, --clean.
+	From: Akim Demaille <demaille@inf.enst.fr>
+	Date: 15 Aug 1997 18:05:33 +0200
+	* doc/texinfo.txi (Format with texi2dvi): Mention --help.
 
-	* po/Makefile.in.in: Make automatic dependencies only run programs
-	if --enable-maintainer-mode.
+	Applied this:
+1997-08-09  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
 
-Mon Aug 25 16:50:32 1997  Ian Lance Taylor  <ian@cygnus.com>
+	* makeinfo/makeinfo.c (me_executing_string): New variable.
+	(me_execute_string): Use it instead of executing_string.
+	(popfile): Check for me_executing_string as well as
+	executing_string.
+	(get_until_in_line): Likewise.
+	(insert_and_underscore): Do not write any expansion output if
+	executing a string.
+	(cm_node, cm_include, index_add_arg, cm_footnote, execute_macro,
+	cm_macro, cm_unmacro): Likewise.
+	(cm_footnote): Include the footnote marker in the expansion
+	output.
+	(append_to_expansion_output): Do nothing if the input_text wasn't
+	a remembered text.
+	(defun_internal): Make the index entry even if expanding macros.
+	(expansion): Don't reset macro_expansion_output_stream around call
+	to execute_string.
+	(apply): Fix typo.
 
-	* configure.in: Add AM_MAINTAINER_MODE and AM_EXEEXT.
-	* Makefile.in, */Makefile.in: Rebuild with automake --cygnus.
-	* configure: Rebuild with current autoconf.
+Tue Feb 24 17:33:44 1998  Karl Berry  <karl@cs.umb.edu>
+
+	1997-11-10 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
+	* makeinfo/makeinfo.c (get_until_in_line): Don't use xstrdup on
+		the unterminated input_text.
+
+	* makeinfo/makeinfo.c: Don't assume all \'s in macro bodies are
+		arguments.
+	From: Mathias.Herberts@irisa.fr (Mathias Herberts)
+	Date: Tue, 6 Jan 1998 18:54:26 +0100
+
+	* configure.in: Check for sigblock in libc before libbsd.
+	* From: hjl@lucon.org (H.J. Lu)
+	* Date: Fri, 23 Jan 1998 21:50:25 -0800 (PST)
+
+Mon Feb 23 16:26:31 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* info/window.c (character_width): If ISO_Latin_p is set, make
+		printable_limit 255, not 160.  ISO Latin 1 uses
+		essentially all of the 256 characters.
+	Reported by: Marius Groeger <mag@sysgo.de>
+	Date: Wed, 17 Dec 1997 16:05:27 +0100
+
+	* info/info.c: Improve help message.
+
+Sun Feb 22 17:38:32 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* Makefile.am (SUBDIRS): Remove emacs; we'll just distribute the
+		Elisp files with Emacs.
+
+	* doc/Makefile.am (info_TEXINFOS, texinfo): Rename manual to
+		texinfo.txi to avoid DOS filename clash with texinfo.tex.
+
+	* info/tilde.c: Copy slightly updated alloca stuff from makeinfo.
+
+	* util/texindex.c (main): Declare as returning int to placate
+ 		warnings.
+
+	* info/Makefile.am: Uncomment BUILT_SOURCES stuff and add missing _.
+	From: "Joel N. Weber II" <devnull@gnu.org>
+	Date: Fri, 30 Jan 1998 17:21:38 -1000
+
+	* util/texindex.c,
+	* util/install-info.c,
+	* makeinfo/makeinfo.c,
+	* info/info.c: Change help address to @gnu.org.
+
+	1998-01-22 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
+	* makeinfo/makeinfo.c (usage): Fix order of arguments to help
+		format string.
+
+	* makeinfo/makeinfo.c (cm_top): Error message wording.
+
+	* doc/texinfo.texi (Functions in Typed Languages): Remove
+		duplicate description of @deftypemethod.
+	From: KHMarbaise@p69.ks.fido.de (Karl Heinz Marbaise)
+	Date: Wed, 07 Jan 1998 11:11:50 +0100
+
+	* info/session.c (info_get_input_char) [EINTR]: Keep reading if we
+		get EINTR.
+	From: Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
+	Date: 22 Dec 1997 10:32:53 +0100
+
+Sat Feb 21 17:41:26 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (find_and_load): Malloc enough room for the
+		null as well as the newline.
+	From: "John W. Eaton" <jwe@bevo.che.wisc.edu>
+	Date: Tue, 30 Sep 1997 21:12:01 -0500
+
+	* util/texindex.c (--version),
+	* makeinfo/makeinfo.c (cm_today),
+	* makeinfo/makeinfo.c (print_version_info): Version strings etc. do not
+		need translation. 
+	From: Karl Eichwalder <ke@suse.de>
+	Date: 13 Sep 1997 16:20:02 +0200
+
+	* info/echo-area.c: Rewrite pluralization to be translatable.
+	From: Karl Eichwalder <ke@suse.de>
+	Date: 13 Sep 1997 16:20:02 +0200
+
+	* util/texindex.c,
+	* info/info.c,
+	* makeinfo/makeinfo.c,
+	* util/install-info.c: --version: Give year as argument to printf,
+		to reduce the number of translations needed.
+	From: Ulrich Drepper <drepper@ipd.info.uni-karlsruhe.de>
+	Date: 02 Sep 1997 18:01:26 +0200
+
+	* util/texindex.c: Remove the fnctl.h and sys/file.h conditional #includes, they are
+	already in lib/system.h.
+	From: "Philippe De Muyter" <phdm@macqel.be>
+	Date: Thu, 21 Aug 1997 20:16:49 +0200 (MET DST)
+
+	* info/terminal.c (terminal_begin_using_terminal,
+ 	  terminal_end_using_terminal): #ifdef SIGWINCH settings for
+	 	  m68k-motorola-sysv.
+	From: "Philippe De Muyter" <phdm@macqel.be>
+	Date: Thu, 21 Aug 1997 20:16:49 +0200 (MET DST)
+
+	* info/filesys.c (info_suffixes): Add /index as a possibility for
+		subdirectories.
+	From: Matthew Wilcox <willy@odie.barnet.ac.uk>
+	Date: Wed, 6 Aug 1997 15:55:16 +0100 (BST)
+
+	* configure.in: Redirect texconfig input from /dev/null to avoid
+		stoppage.
+	From: Thomas Esser <te@informatik.uni-hannover.de>
+	Date: Mon, 4 Aug 1997 18:15:49 +0200
+
+	* makeinfo/makeinfo.c (find_and_load): Null-terminate the input text.
+	From: Kenneth Stailey <kstailey@disclosure.com>.
+
+	* info/Makefile.am (INCLUDES): Add -I.. -I$(srcdir).
+
+Fri Aug 22 16:24:59 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/texinfo.texi: Adjust ISBN, edition number for print run.
+
+Mon Aug  4 16:12:42 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* info/info.c (main) [INFODIR]: Add this to infopath, if set.
+	* info/Makefile.am (DEFS): New define, include -DINFODIR.
+	From: Larry Schwimmer <rosebud@cyclone.Stanford.EDU>.
+
+	* util/install-info.c (ensure_dirfile_exists): Use tabs instead of
+ 		spaces on the File: dir line.
+ 	Bug from: Dave Love <d.love@dl.ac.uk>.
+
+Sat Aug  2 12:43:57 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (cm_value, cm_email, cm_uref): Have to cast
+ 		from unsigned char * to char * or IRIX cc complains.
+	From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>.
 
-Wed Feb 12 11:15:16 1997  Michael Meissner  <meissner@cygnus.com>
+Fri Aug  1 14:05:10 1997  Karl Berry  <karl@cs.umb.edu>
 
-	* util/texindex.c (main): Make main an int function, not void.
+	* Makefile.am (EXTRA_DIST): Remove README-alpha.
+	From: "ir. Mark M._Kettenis" <kettenis@phys.uva.nl>.
 
-Sat Jun 29 18:56:07 1996  Geoffrey Noer  <noer@cygnus.com>
+1997-07-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>	
 
-	* configure.in: if ac_cv_c_cross is yes, don't run the
-	AC_FUNC_SETVBUF_REVERSED call since it tries to do a run
-	test.  This allows texinfo to build for cygwin32 Canadian
-	crosses/natives
-	* configure: regenerate
+	* configure.in: Use AC_CHECK_HEADERS, not AC_CHECK_HEADER.
 
 Thu Jul 31 11:57:46 1997  Karl Berry  <karl@cs.umb.edu>
 
diff --git a/texinfo/INTRODUCTION b/texinfo/INTRODUCTION
index 1d298ca36a7..1355e6fcf4a 100644
--- a/texinfo/INTRODUCTION
+++ b/texinfo/INTRODUCTION
@@ -1,14 +1,6 @@
 Getting Started with Texinfo
 ============================
 
-25 March 1993
-
-Most of the installation instructions are described in the file `INSTALL'.
-One additional note to make is that if your info files are in a nonstandard
-place (i.e. not in the `info' directory immediately under $prefix) you may
-wish to change the default info path as specified via DEFAULT_INFOPATH in
-info/Makefile.in.
-
 "Texinfo" is a documentation system that uses a single source file to
 produce both on-line information and printed output.  Using Texinfo,
 you can create a printed document with the normal features of a book,
@@ -16,23 +8,23 @@ including chapters, sections, cross references, and indices.  From the
 same Texinfo source file, you can create a menu-driven, on-line Info
 file with nodes, menus, cross references, and indices.
   
-The name of the Texinfo source documentation file is `texinfo.texi'.
+The name of the Texinfo source documentation file is `texinfo.txi'.
 You can produce both on-line information and printed output from this
 source file.  The documentation describes Texinfo in detail, including
 how to write Texinfo files, how to format them for both hard copy and
 Info, and how to install Info files.
 
 To get started, you need to create either a printed manual or an
-on-line Info file from the `texinfo.texi' file.  You do not need to
+on-line Info file from the `texinfo.txi' file.  You do not need to
 create both, although you will probably want both eventually.
 
 To learn how to use Info, read the info documentation.  You can do this in
 one of two ways: using the standalone `info' program, or using Info mode in
 GNU Emacs.
 
-  * If you want to use the `info' program, type
+  * If you want to use the `info' program, run
 
-         $ info -f info-stnd
+         info -f info-stnd
 
   * If you want to use Emacs, start up emacs and type `C-h i' [M-x info].
     Follow the instructions to learn how to use Info.
@@ -40,7 +32,7 @@ GNU Emacs.
 After learning how to use Info, you can read the Texinfo documentation.
 Using the standalone `info', type the following at the shell prompt:
 
-         $ info -f texinfo
+         info -f texinfo
 
 To use read this manual in Emacs, you first need to edit the Info-directory
 menu (the file `dir' in the system info directory) to contain the
@@ -114,6 +106,6 @@ The name of the printing command depends on the system; `lpr -d' is
 common, and is illustrated here.  You may use a different name for the
 printing command.
 
-Please report bugs to bug-texinfo@prep.ai.mit.edu.
+Please report bugs to bug-texinfo@gnu.org.
 
 Happy formatting.
diff --git a/texinfo/Makefile.am b/texinfo/Makefile.am
index 294a7faba74..9449a03bbfd 100644
--- a/texinfo/Makefile.am
+++ b/texinfo/Makefile.am
@@ -1,15 +1,16 @@
 ## Makefile.am for texinfo.
-## $Id: Makefile.am,v 1.3 1998/03/24 18:04:57 law Exp $
+## $Id: Makefile.am,v 1.5 1998/04/10 00:37:57 law Exp $
 ## Process this file with automake to produce Makefile.in in all directories.
 
-## Be sure we're using the right version of Automake.
-AUTOMAKE_OPTIONS = 1.1p
+# Be sure we're using the right version of Automake.
+# 1.2f was the first version that supported .txi as a Texinfo suffix.
+AUTOMAKE_OPTIONS = 1.2f
 
 # Additional files to distribute.
-EXTRA_DIST = INTRODUCTION dir-example README-alpha
+EXTRA_DIST = INTRODUCTION dir-example
 
 # All subdirectories.
 # Do intl/ and lib/ first since the C programs depend on them.
 # Do doc/ last so makeinfo will be built when we get there.
 # Others are alphabetical.
-SUBDIRS = intl lib emacs info makeinfo po util doc
+SUBDIRS = intl lib info makeinfo po util doc
diff --git a/texinfo/Makefile.in b/texinfo/Makefile.in
index 9466dda4ea7..51989e7b42e 100644
--- a/texinfo/Makefile.in
+++ b/texinfo/Makefile.in
@@ -1,8 +1,17 @@
-# Makefile.in generated automatically by automake 1.2 from Makefile.am
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Be sure we're using the right version of Automake.
+# 1.2f was the first version that supported .txi as a Texinfo suffix.
 
 
 SHELL = /bin/sh
@@ -43,27 +52,26 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 DATADIRNAME = @DATADIRNAME@
-EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
+INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -79,24 +87,24 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 l = @l@
 
-AUTOMAKE_OPTIONS = 1.1p
+AUTOMAKE_OPTIONS = 1.2f
 
 # Additional files to distribute.
-EXTRA_DIST = INTRODUCTION dir-example README-alpha
+EXTRA_DIST = INTRODUCTION dir-example
 
 # All subdirectories.
 # Do intl/ and lib/ first since the C programs depend on them.
 # Do doc/ last so makeinfo will be built when we get there.
 # Others are alphabetical.
-SUBDIRS = intl lib emacs info makeinfo po util doc
+SUBDIRS = intl lib info makeinfo po util doc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = 
 DIST_COMMON =  README ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL \
-Makefile.am Makefile.in NEWS THANKS TODO acconfig.h acinclude.m4 \
-aclocal.m4 config.guess config.h.in config.sub configure configure.in \
-install-sh missing mkinstalldirs stamp-h.in texinfo.tex
+Makefile.am Makefile.in NEWS TODO acconfig.h aclocal.m4 config.guess \
+config.h.in config.sub configure configure.in install-sh missing \
+mkinstalldirs stamp-h.in texinfo.tex
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -106,28 +114,29 @@ GZIP = --best
 default: all
 
 .SUFFIXES:
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-$(ACLOCAL_M4): @MAINT@ configure.in  acinclude.m4
+$(ACLOCAL_M4):  configure.in 
 	cd $(srcdir) && $(ACLOCAL)
 
 config.status: $(srcdir)/configure
 	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINT@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
 
-config.h: stamp-h ; @:
+config.h: stamp-h
+	@:
 stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
 	cd $(top_builddir) \
 	  && CONFIG_FILES= CONFIG_HEADERS=config.h \
 	     $(SHELL) ./config.status
 	@echo timestamp > stamp-h
-$(srcdir)/config.h.in: @MAINT@$(srcdir)/stamp-h.in
+$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
 $(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
 	cd $(top_srcdir) && $(AUTOHEADER)
 	@echo timestamp > $(srcdir)/stamp-h.in
@@ -137,7 +146,7 @@ mostlyclean-hdr:
 clean-hdr:
 
 distclean-hdr:
-	rm -f config.h
+	-rm -f config.h
 
 maintainer-clean-hdr:
 
@@ -151,10 +160,10 @@ maintainer-clean-hdr:
 @SET_MAKE@
 
 all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive install-info-recursive \
+installdirs-recursive install-recursive uninstall-recursive  \
 check-recursive installcheck-recursive info-recursive dvi-recursive:
 	@set fnord $(MAKEFLAGS); amf=$$2; \
-	for subdir in $(SUBDIRS); do \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  target=`echo $@ | sed s/-recursive//`; \
 	  echo "Making $$target in $$subdir"; \
 	  (cd $$subdir && $(MAKE) $$target) \
@@ -164,7 +173,9 @@ check-recursive installcheck-recursive info-recursive dvi-recursive:
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
 	@set fnord $(MAKEFLAGS); amf=$$2; \
-	rev=''; for subdir in $(SUBDIRS); do rev="$$rev $$subdir"; done; \
+	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+	  rev="$$subdir $$rev"; \
+	done; \
 	for subdir in $$rev; do \
 	  target=`echo $@ | sed s/-recursive//`; \
 	  echo "Making $$target in $$subdir"; \
@@ -178,24 +189,29 @@ tags-recursive:
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES)
-	here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS)
+ID: $(HEADERS) $(SOURCES) $(LISP)
+	here=`pwd` && cd $(srcdir) \
+	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES)
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
 	tags=; \
 	here=`pwd`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
 	done; \
-	test -z "$(ETAGS_ARGS)config.h.in$(SOURCES)$(HEADERS)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $(SOURCES) $(HEADERS) -o $$here/TAGS)
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 
 clean-tags:
 
 distclean-tags:
-	rm -f TAGS ID
+	-rm -f TAGS ID
 
 maintainer-clean-tags:
 
@@ -206,7 +222,7 @@ top_distdir = $(distdir)
 # it guarantees that the distribution is self-contained by making another
 # tarfile.
 distcheck: dist
-	rm -rf $(distdir)
+	-rm -rf $(distdir)
 	GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz
 	mkdir $(distdir)/=build
 	mkdir $(distdir)/=inst
@@ -219,34 +235,34 @@ distcheck: dist
 	  && $(MAKE) install \
 	  && $(MAKE) installcheck \
 	  && $(MAKE) dist
-	rm -rf $(distdir)
+	-rm -rf $(distdir)
 	@echo "========================"; \
 	echo "$(distdir).tar.gz is ready for distribution"; \
 	echo "========================"
 dist: distdir
 	-chmod -R a+r $(distdir)
 	GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	rm -rf $(distdir)
+	-rm -rf $(distdir)
 dist-all: distdir
 	-chmod -R a+r $(distdir)
 	GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	rm -rf $(distdir)
+	-rm -rf $(distdir)
 distdir: $(DISTFILES)
-	rm -rf $(distdir)
+	-rm -rf $(distdir)
 	mkdir $(distdir)
 	-chmod 777 $(distdir)
 	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  d=$(srcdir); \
 	  test -f $(distdir)/$$file \
 	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
 	  || cp -p $$d/$$file $(distdir)/$$file; \
 	done
-	for subdir in $(SUBDIRS); do		\
-	  test -d $(distdir)/$$subdir		\
-	  || mkdir $(distdir)/$$subdir		\
-	  || exit 1;				\
-	  chmod 777 $(distdir)/$$subdir;	\
-	  (cd $$subdir && $(MAKE) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
+	for subdir in $(SUBDIRS); do \
+	  test -d $(distdir)/$$subdir \
+	  || mkdir $(distdir)/$$subdir \
+	  || exit 1; \
+	  chmod 777 $(distdir)/$$subdir; \
+	  (cd $$subdir && $(MAKE) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
 	    || exit 1; \
 	done
 info: info-recursive
@@ -254,7 +270,6 @@ dvi: dvi-recursive
 check: all-am
 	$(MAKE) check-recursive
 installcheck: installcheck-recursive
-install-info: install-info-recursive
 all-recursive-am: config.h
 	$(MAKE) all-recursive
 
@@ -279,19 +294,19 @@ installdirs: installdirs-recursive
 
 
 mostlyclean-generic:
-	test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-	test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	rm -f Makefile $(DISTCLEANFILES)
-	rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(DISTCLEANFILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-	test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean-am:  mostlyclean-hdr mostlyclean-tags mostlyclean-generic
 
 clean-am:  clean-hdr clean-tags clean-generic mostlyclean-am
@@ -306,12 +321,12 @@ mostlyclean:  mostlyclean-recursive mostlyclean-am
 clean:  clean-recursive clean-am
 
 distclean:  distclean-recursive distclean-am
-	rm -f config.status
+	-rm -f config.status
 
 maintainer-clean:  maintainer-clean-recursive maintainer-clean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
-	rm -f config.status
+	-rm -f config.status
 
 .PHONY: default mostlyclean-hdr distclean-hdr clean-hdr \
 maintainer-clean-hdr install-data-recursive uninstall-data-recursive \
@@ -321,10 +336,10 @@ installcheck-recursive info-recursive dvi-recursive \
 mostlyclean-recursive distclean-recursive clean-recursive \
 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
 distclean-tags clean-tags maintainer-clean-tags distdir info dvi \
-installcheck install-info all-recursive-am all-am install-exec \
-install-data install uninstall all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+installcheck all-recursive-am all-am install-exec install-data install \
+uninstall all installdirs mostlyclean-generic distclean-generic \
+clean-generic maintainer-clean-generic clean mostlyclean distclean \
+maintainer-clean
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/texinfo/NEWS b/texinfo/NEWS
index 968184177ff..a9d80d8f50c 100644
--- a/texinfo/NEWS
+++ b/texinfo/NEWS
@@ -1,5 +1,11 @@
 This file records noteworthy changes.
 
+3.12 (3 March 1998)
+* Elisp files removed, since they are only usefully distributed with Emacs.
+* Restore inclusion of compile-time $(infodir) to INFOPATH.
+* install-info creates a proper dir file.
+* Various portability fixes.
+
 3.11 (31 July 1997)
 * New commands:
   - @uref to make a reference to a url; @url now only indicates such.
diff --git a/texinfo/README b/texinfo/README
index 0312f85e6f6..15f83239d42 100644
--- a/texinfo/README
+++ b/texinfo/README
@@ -1,62 +1,48 @@
 This is the README file for the GNU Texinfo distribution.
+The primary distribution point is ftp://ftp.gnu.org/pub/gnu.
 
-Please email bugs or suggestions to bug-texinfo@prep.ai.mit.edu.
+Please email bugs or suggestions to bug-texinfo@gnu.org.  (If you wish,
+you can join this list by sending a subscribe message to
+bug-texinfo-request@gnu.org.)  Patches are welcome; if possible, please
+make them with diff -c and include ChangeLog entries.
 
-Files within this distribution have their own version and edition
-numbers.  When you refer to a file, please mention its own version, as
-well as the version number of the Texinfo distribution.
+Programs within this distribution have their own version numbers.  When
+you refer to a file, please mention its own version, as well as the
+version number of the Texinfo distribution.
 
-For instructions on compiling and installing info, makeinfo, texi2dvi,
-and texindex, please read the file `INSTALL'.  Also:
-
-    * The Emacs Lisp files are not compiled or installed by default; to
-      install them, use `make install' in the `emacs' subdirectory.  See
-      ./emacs/README for some considerations.
+For generic installation instructions on compiling and installing this
+Automake-based distribution, please read the file `INSTALL'.
+Installation notes specific to Texinfo:
 
     * The Info tree uses a file `dir' as its root node; the `dir-example'
       file in this distribution is included for informative purposes.
-      Use it or not as you like.
+      Use it, modify it, or ignore it just as you like.
 
     * You can create a file texinfo.cnf to be read by TeX when
       processing Texinfo manuals.  For example, it might contain the
       command @afourpaper.  See the `Preparing for TeX' node in
       texinfo.texi for more details.
 
-
-Texinfo is a documentation system that uses a single source file to
-produce both online information and printed output.  This means that
-instead of writing two different documents, one for the online help or
-other online information and the other for a typeset manual or other
-printed work, you need write only one document.  When the work is
-revised, you need revise only one document.  You can read the online
-information, known as an "Info file", with an Info documentation-reading
-program.  By convention, Texinfo source file names end with a `.texi' or
-`.texinfo' extension.  Texinfo is described in the Texinfo manual (the
-file ./doc/texinfo.texi).
-
-You can write and format Texinfo files into Info files within GNU Emacs,
-and read them using the Emacs Info reader.  If you do not have Emacs,
-you can format Texinfo files into Info files using `makeinfo' and read
-them using `info'.  Use TeX, which is not included in this package (see
-`How to Obtain TeX' in the Texinfo manual for information), to typeset
-Texinfo files for printing.
+    * If your info files are not in $prefix/info, you may wish to add a line
+#define DEFAULT_INFOPATH "/mydir1:/mydir2:/etc"
+      to config.h after running configure.
 
 
 This distribution includes (but is not limited to) the following files:
 
     README                      This file.
-    INTRODUCTION                This file tells you how to create
-                                readable files from the Texinfo source
-                                files in this distribution.
+    INTRODUCTION                Brief introduction to the system, and
+                                how to create readable files from the
+                                Texinfo source files in this distribution.
 
 Texinfo source files (in ./doc):
 
-    texinfo.texi                This manual describes Texinfo.  It
+    texinfo.texi                This manual describes the Texinfo language
+                                and many of the associated tools.  It
                                 tells how to use Texinfo to write
                                 documentation, how to use Texinfo mode
-                                in GNU Emacs, how to use TeX,
-                                makeinfo, and the Emacs Lisp Texinfo
-                                formatting commands.
+                                in GNU Emacs, TeX, makeinfo, and the
+                                Emacs Lisp Texinfo formatting commands.
 
     info.texi                   This manual tells you how to use 
                                 Info.  This document comes as part of
@@ -74,7 +60,7 @@ Texinfo source files (in ./doc):
 
 Printing related files:
 
-    texinfo.tex                 This TeX definitions file tells
+    doc/texinfo.tex             This TeX definitions file tells
                                 the TeX program how to typeset a
                                 Texinfo file into a DVI file ready for
                                 printing.
@@ -90,25 +76,6 @@ Printing related files:
                                 source document uses Texinfo @macros.
 
 
-GNU Emacs related files (in ./emacs):
-
-    texinfmt.el                 This Emacs Lisp file provides the
-                                functions that GNU Emacs uses to
-                                format a Texinfo file into an Info
-                                file.
-
-    texinfo.el                  This file provides Texinfo mode
-                                for GNU Emacs.
-
-    texnfo-upd.el               These files provides commands to
-    makeinfo.el                 help you write Texinfo files
-                                using GNU Emacs Texinfo mode.
-
-    info.el                     These are the standard GNU Emacs
-    informat.el                 Info reading and support files,
-                                included here for your convenience.
- 
-
 Source files for standalone C programs (./lib, ./makeinfo, ./info):
 
     makeinfo.c                  This file contains the source for
@@ -143,7 +110,7 @@ Installation files:
                                 to use to make a Makefile.in.
                                
 
-Other files:
+Other files (util):
 
     NEWS                        This contains a summary of new
                                 features since the first edition 
diff --git a/texinfo/TODO b/texinfo/TODO
index 7a7eb858e8c..6df65a872ef 100644
--- a/texinfo/TODO
+++ b/texinfo/TODO
@@ -1,8 +1,8 @@
-If you are interested in working on any of these,
-email bug-texinfo@prep.ai.mit.edu.
+If you are interested in working on any of these, email bug-texinfo@gnu.org.
 
 * Makeinfo:
-  - HTML output.
+  - HTML output is being actively worked on, and with luck will be in
+    the next release.
   - A detexinfo program, like detex or delatex.  This command would
     strip all the texinfo commands out, and would be used as a filter on
     the way to a speller.  An option would be to NOT strip comments out.
@@ -12,8 +12,9 @@ email bug-texinfo@prep.ai.mit.edu.
     enumerate chapters and sections, convert cross-refs and indices to
     chapter/section references.  See:
        ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp/v2/faq201s.zip
+  - Call Ghostscript to get ASCII output for the @image command.
 
-n* TeX:
+* TeX:
   - Use @ as the escape character, and Texinfo syntax generally, in the
     table of contents, aux, and index files.  Eliminate all the crazy
     multiple redefinitions of every Texinfo command in different contexts.
diff --git a/texinfo/config.guess b/texinfo/config.guess
index a33514f2462..30230b3dfe9 100755
--- a/texinfo/config.guess
+++ b/texinfo/config.guess
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -52,11 +52,53 @@ trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     alpha:OSF1:*:*)
+	if test $UNAME_RELEASE = "V4.0"; then
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+	fi
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//'`
+	cat <<EOF >dummy.s
+	.globl main
+	.ent main
+main:
+	.frame \$30,0,\$26,0
+	.prologue 0
+	.long 0x47e03d80 # implver $0
+	lda \$2,259
+	.long 0x47e20c21 # amask $2,$1
+	srl \$1,8,\$2
+	sll \$2,2,\$2
+	sll \$0,3,\$0
+	addl \$1,\$0,\$0
+	addl \$2,\$0,\$0
+	ret \$31,(\$26),1
+	.end main
+EOF
+	${CC-cc} dummy.s -o dummy 2>/dev/null
+	if test "$?" = 0 ; then
+		./dummy
+		case "$?" in
+			7)
+				UNAME_MACHINE="alpha"
+				;;
+			15)
+				UNAME_MACHINE="alphaev5"
+				;;
+			14)
+				UNAME_MACHINE="alphaev56"
+				;;
+			10)
+				UNAME_MACHINE="alphapca56"
+				;;
+			16)
+				UNAME_MACHINE="alphaev6"
+				;;
+		esac
+	fi
+	rm -f dummy.s dummy
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
 	exit 0 ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
@@ -68,11 +110,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
       echo m68k-cbm-netbsd${UNAME_RELEASE}
       exit 0 ;;
     amiga:OpenBSD:*:*)
-      echo m68k-cbm-openbsd${UNAME_RELEASE}
-      exit 0 ;;
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc64:OpenBSD:*:*)
+	echo mips64el-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    arc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    hkmips:OpenBSD:*:*)
+	echo mips-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    pmax:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    sgi:OpenBSD:*:*)
+	echo mips-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    wgrisc:OpenBSD:*:*)
+	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
+    arm32:NetBSD:*:*)
+	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	exit 0 ;;
     SR2?01:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
 	exit 0;;
@@ -111,6 +174,18 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     sun3*:SunOS:*:*)
 	echo m68k-sun-sunos${UNAME_RELEASE}
 	exit 0 ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit 0 ;;
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
 	exit 0 ;;
@@ -118,19 +193,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo m68k-atari-netbsd${UNAME_RELEASE}
 	exit 0 ;;
     atari*:OpenBSD:*:*)
-	echo m68k-atari-openbsd${UNAME_RELEASE}
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     sun3*:NetBSD:*:*)
 	echo m68k-sun-netbsd${UNAME_RELEASE}
 	exit 0 ;;
     sun3*:OpenBSD:*:*)
-	echo m68k-sun-openbsd${UNAME_RELEASE}
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     mac68k:NetBSD:*:*)
 	echo m68k-apple-netbsd${UNAME_RELEASE}
 	exit 0 ;;
     mac68k:OpenBSD:*:*)
-	echo m68k-apple-openbsd${UNAME_RELEASE}
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme68k:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
+    mvme88k:OpenBSD:*:*)
+	echo m88k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
@@ -144,6 +225,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
 	exit 0 ;;
+    2020:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
 	sed 's/^	//' << EOF >dummy.c
 	int main (argc, argv) int argc; char **argv; {
@@ -378,8 +462,8 @@ EOF
     hp3[0-9][05]:NetBSD:*:*)
 	echo m68k-hp-netbsd${UNAME_RELEASE}
 	exit 0 ;;
-    hp3[0-9][05]:OpenBSD:*:*)
-	echo m68k-hp-openbsd${UNAME_RELEASE}
+    hp300:OpenBSD:*:*)
+	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     i?86:BSD/386:*:* | *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -394,7 +478,10 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	exit 0 ;;
     i*:CYGWIN*:*)
-	echo i386-pc-cygwin32
+	echo ${UNAME_MACHINE}-pc-cygwin32
+	exit 0 ;;
+    i*:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
 	exit 0 ;;
     p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin32
@@ -403,33 +490,86 @@ EOF
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
     *:GNU:*:*)
-	echo `echo ${UNAME_MACHINE}|sed -e 's,-.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
     *:Linux:*:*)
+	# uname on the ARM produces all sorts of strangeness, and we need to
+	# filter it out.
+	case "$UNAME_MACHINE" in
+	  arm* | sa110*)	      UNAME_MACHINE="arm" ;;
+	esac
+
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us.
 	ld_help_string=`ld --help 2>&1`
-	if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i.86"; then
-	  echo "${UNAME_MACHINE}-pc-linux-gnu" ; exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86linux"; then
-	  echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86coff"; then
-	  echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68kelf"; then
-	  echo "${UNAME_MACHINE}-unknown-linux-gnu" ; exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68klinux"; then
-	  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0
-	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf32ppc"; then
-	  echo "powerpc-unknown-linux-gnu" ; exit 0
-	elif test "${UNAME_MACHINE}" = "alpha" ; then
-	  echo alpha-unknown-linux-gnu ; exit 0
-	elif test "${UNAME_MACHINE}" = "sparc" ; then
-	  echo sparc-unknown-linux-gnu ; exit 0
+	ld_supported_emulations=`echo $ld_help_string \
+			 | sed -ne '/supported emulations:/!d
+				    s/[ 	][ 	]*/ /g
+				    s/.*supported emulations: *//
+				    s/ .*//
+				    p'`
+        case "$ld_supported_emulations" in
+	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
+	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
+	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+	  armlinux)   echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+	  elf32ppc)   echo "powerpc-unknown-linux-gnu"              ; exit 0 ;;
+	esac
+
+	if test "${UNAME_MACHINE}" = "alpha" ; then
+		sed 's/^	//'  <<EOF >dummy.s
+		.globl main
+		.ent main
+	main:
+		.frame \$30,0,\$26,0
+		.prologue 0
+		.long 0x47e03d80 # implver $0
+		lda \$2,259
+		.long 0x47e20c21 # amask $2,$1
+		srl \$1,8,\$2
+		sll \$2,2,\$2
+		sll \$0,3,\$0
+		addl \$1,\$0,\$0
+		addl \$2,\$0,\$0
+		ret \$31,(\$26),1
+		.end main
+EOF
+		LIBC=""
+		${CC-cc} dummy.s -o dummy 2>/dev/null
+		if test "$?" = 0 ; then
+			./dummy
+			case "$?" in
+			7)
+				UNAME_MACHINE="alpha"
+				;;
+			15)
+				UNAME_MACHINE="alphaev5"
+				;;
+			14)
+				UNAME_MACHINE="alphaev56"
+				;;
+			10)
+				UNAME_MACHINE="alphapca56"
+				;;
+			16)
+				UNAME_MACHINE="alphaev6"
+				;;
+			esac	
+
+			objdump --private-headers dummy | \
+			  grep ld.so.1 > /dev/null
+			if test "$?" = 0 ; then
+				LIBC="libc1"
+			fi
+		fi	
+		rm -f dummy.s dummy
+		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
 	elif test "${UNAME_MACHINE}" = "mips" ; then
 	  cat >dummy.c <<EOF
 main(argc, argv)
-int argc;
-char *argv[];
+     int argc;
+     char *argv[];
 {
 #ifdef __MIPSEB__
   printf ("%s-unknown-linux-gnu\n", argv[1]);
@@ -443,20 +583,41 @@ EOF
 	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
 	  rm -f dummy.c dummy
 	else
-	  # Either a pre-BFD a.out linker (linux-gnuoldld) or one that does not give us
-	  # useful --help.  Gcc wants to distinguish between linux-gnuoldld and linux-gnuaout.
-	  test ! -d /usr/lib/ldscripts/. \
-	    && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
+	  # Either a pre-BFD a.out linker (linux-gnuoldld)
+	  # or one that does not give us useful --help.
+	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
+	  # If ld does not provide *any* "supported emulations:"
+	  # that means it is gnuoldld.
+	  echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
+	  test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
+
+	  case "${UNAME_MACHINE}" in
+	  i?86)
+	    VENDOR=pc;
+	    ;;
+	  *)
+	    VENDOR=unknown;
+	    ;;
+	  esac
 	  # Determine whether the default compiler is a.out or elf
 	  cat >dummy.c <<EOF
+#include <features.h>
 main(argc, argv)
-int argc;
-char *argv[];
+     int argc;
+     char *argv[];
 {
 #ifdef __ELF__
-  printf ("%s-pc-linux-gnu\n", argv[1]);
+# ifdef __GLIBC__
+#  if __GLIBC__ >= 2
+    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
+#  else
+    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+#  endif
+# else
+   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+# endif
 #else
-  printf ("%s-pc-linux-gnuaout\n", argv[1]);
+  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
 #endif
   return 0;
 }
@@ -469,6 +630,14 @@ EOF
     i?86:DYNIX/ptx:4*:*)
 	echo i386-sequent-sysv4
 	exit 0 ;;
+    i?86:UNIX_SV:4.2MP:2.*)
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+        # Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit 0 ;;
     i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
 		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
@@ -490,6 +659,11 @@ EOF
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
 	exit 0 ;;
+    pc:*:*:*)
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i386.
+	echo i386-pc-msdosdjgpp
+        exit 0 ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit 0 ;;
@@ -565,6 +739,9 @@ EOF
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
 	exit 0 ;;
+    news*:NEWS-OS:*:6*)
+	echo mips-sony-newsos6
+	exit 0 ;;
     R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
diff --git a/texinfo/config.h.in b/texinfo/config.h.in
index 94c0061d524..f814b6573c5 100644
--- a/texinfo/config.h.in
+++ b/texinfo/config.h.in
@@ -185,6 +185,9 @@
 /* Define if you have the <malloc.h> header file.  */
 #undef HAVE_MALLOC_H
 
+/* Define if you have the <ncurses/termcap.h> header file.  */
+#undef HAVE_NCURSES_TERMCAP_H
+
 /* Define if you have the <nl_types.h> header file.  */
 #undef HAVE_NL_TYPES_H
 
@@ -203,6 +206,9 @@
 /* Define if you have the <sys/file.h> header file.  */
 #undef HAVE_SYS_FILE_H
 
+/* Define if you have the <sys/param.h> header file.  */
+#undef HAVE_SYS_PARAM_H
+
 /* Define if you have the <sys/ptem.h> header file.  */
 #undef HAVE_SYS_PTEM_H
 
@@ -236,6 +242,9 @@
 /* Define if you have the i library (-li).  */
 #undef HAVE_LIBI
 
+/* Define if you have the z library (-lz).  */
+#undef HAVE_LIBZ
+
 /* For gettext (NLS) */
 #include <libintl.h>
 #define _(String) gettext (String)
diff --git a/texinfo/config.sub b/texinfo/config.sub
index cd342535401..e24b8504126 100755
--- a/texinfo/config.sub
+++ b/texinfo/config.sub
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
+#   Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc.
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
 # can handle that machine.  It does not imply ALL GNU software can.
@@ -149,19 +149,20 @@ esac
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	tahoe | i860 | m68k | m68000 | m88k | ns32k | arm \
-		| arme[lb] | pyramid \
+	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+		| arme[lb] | pyramid | mn10200 | mn10300 \
 		| tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
-		| alpha | we32k | ns16k | clipper | i370 | sh \
-		| powerpc | powerpcle | 1750a | dsp16xx | mips64 | mipsel \
-		| pdp11 | mips64el | mips64orion | mips64orionel \
-		| sparc | sparclet | sparclite | sparc64)
+		| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
+		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
+		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
+		| mipstx39 | mipstx39el \
+		| sparc | sparclet | sparclite | sparc64 | v850)
 		basic_machine=$basic_machine-unknown
 		;;
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
-	i[3456]86)
+	i[34567]86)
 	  basic_machine=$basic_machine-pc
 	  ;;
 	# Object if more than one company name word.
@@ -170,14 +171,18 @@ case $basic_machine in
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-	vax-* | tahoe-* | i[3456]86-* | i860-* | m68k-* | m68000-* | m88k-* \
-	      | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \
-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \
-	      | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
-	      | hppa-* | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
-	      | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
-	      | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \
-	      | mips64el-* | mips64orion-* | mips64orionel-* | f301-*)
+	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
+	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
+	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
+	      | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* \
+	      | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
+	      | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
+	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+	      | sparc64-* | mips64-* | mipsel-* \
+	      | mips64el-* | mips64orion-* | mips64orionel-*  \
+	      | mipstx39-* | mipstx39el-* \
+	      | f301-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -204,9 +209,9 @@ case $basic_machine in
 	amiga | amiga-*)
 		basic_machine=m68k-cbm
 		;;
-	amigados)
+	amigaos | amigados)
 		basic_machine=m68k-cbm
-		os=-amigados
+		os=-amigaos
 		;;
 	amigaunix | amix)
 		basic_machine=m68k-cbm
@@ -345,19 +350,19 @@ case $basic_machine in
 		os=-mvs
 		;;
 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i[3456]86v32)
+	i[34567]86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
 		;;
-	i[3456]86v4*)
+	i[34567]86v4*)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv4
 		;;
-	i[3456]86v)
+	i[34567]86v)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv
 		;;
-	i[3456]86sol2)
+	i[34567]86sol2)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
@@ -391,11 +396,11 @@ case $basic_machine in
 		;;
 	mipsel*-linux*)
 		basic_machine=mipsel-unknown
-		os=-linux
+		os=-linux-gnu
 		;;
 	mips*-linux*)
 		basic_machine=mips-unknown
-		os=-linux
+		os=-linux-gnu
 		;;
 	mips3*-*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
@@ -464,25 +469,23 @@ case $basic_machine in
         pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5)
-		basic_machine=i586-intel
+	pentium | p5 | k5 | nexen)
+		basic_machine=i586-pc
 		;;
-	pentiumpro | p6)
-		basic_machine=i686-intel
+	pentiumpro | p6 | k6 | 6x86)
+		basic_machine=i686-pc
 		;;
-	pentium-* | p5-*)
+	pentiumii | pentium2)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | nexen-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumpro-* | p6-*)
+	pentiumpro-* | p6-* | k6-* | 6x86-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	k5)
-		# We don't have specific support for AMD's K5 yet, so just call it a Pentium
-		basic_machine=i586-amd
-		;;
-	nexen)
-		# We don't have specific support for Nexgen yet, so just call it a Pentium
-		basic_machine=i586-nexgen
+	pentiumii-* | pentium2-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pn)
 		basic_machine=pn-gould
@@ -566,6 +569,12 @@ case $basic_machine in
 		basic_machine=i386-sequent
 		os=-dynix
 		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
@@ -585,7 +594,7 @@ case $basic_machine in
 		basic_machine=vax-dec
 		os=-vms
 		;;
-       vpp*|vx|vx-*)
+	vpp*|vx|vx-*)
                basic_machine=f301-fujitsu
                ;;
 	vxworks960)
@@ -615,7 +624,7 @@ case $basic_machine in
 # Here we handle the default manufacturer of certain CPU types.  It is in
 # some cases the only manufacturer, in others, it is the most popular.
 	mips)
-		if [ x$os = x-linux ]; then
+		if [ x$os = x-linux-gnu ]; then
 			basic_machine=mips-unknown
 		else
 			basic_machine=mips-mips
@@ -680,9 +689,12 @@ case $os in
 	-solaris)
 		os=-solaris2
 		;;
-	-unixware* | svr4*)
+	-svr4*)
 		os=-sysv4
 		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
 	-gnu/linux*)
 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
 		;;
@@ -693,7 +705,8 @@ case $os in
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigados* | -msdos* | -newsos* | -unicos* | -aof* | -aos* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
@@ -701,7 +714,7 @@ case $os in
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -linux-gnu* | -uxpv*)
+	      | -mingw32* | -linux-gnu* | -uxpv*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-linux*)
@@ -827,7 +840,7 @@ case $basic_machine in
 		os=-sysv
 		;;
 	*-cbm)
-		os=-amigados
+		os=-amigaos
 		;;
 	*-dg)
 		os=-dgux
diff --git a/texinfo/configure b/texinfo/configure
index 1a02a2bd977..c873259b44b 100755
--- a/texinfo/configure
+++ b/texinfo/configure
@@ -12,9 +12,6 @@ ac_help=
 ac_default_prefix=/usr/local
 # Any additions from configure.in:
 ac_help="$ac_help
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer"
-ac_help="$ac_help
   --disable-nls           do not use Native Language Support"
 ac_help="$ac_help
   --with-included-gettext use the GNU gettext library included here"
@@ -558,11 +555,12 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 # SunOS /usr/etc/install
 # IRIX /sbin/install
 # AIX /bin/install
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:566: checking for a BSD compatible install" >&5
+echo "configure:564: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -574,12 +572,13 @@ else
     /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
     *)
       # OSF1 and SCO ODT 3.0 have their own names for install.
-      for ac_prog in ginstall installbsd scoinst install; do
+      # Don't use installbsd from OSF since it installs stuff as root
+      # by default.
+      for ac_prog in ginstall scoinst install; do
         if test -f $ac_dir/$ac_prog; then
 	  if test $ac_prog = install &&
             grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
-	    # OSF/1 installbsd also uses dspmsg, but is usable.
 	    :
 	  else
 	    ac_cv_path_install="$ac_dir/$ac_prog -c"
@@ -614,24 +613,8 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 
-
-PACKAGE=texinfo
-
-VERSION=3.11
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-cat >> confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
-
-cat >> confdefs.h <<EOF
-#define VERSION "$VERSION"
-EOF
-
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:635: checking whether build environment is sane" >&5
+echo "configure:618: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -642,10 +625,21 @@ echo timestamp > conftestfile
 # directory).
 if (
    set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "" = "X"; then
+   if test "$*" = "X"; then
       # -L didn't work.
       set X `ls -t $srcdir/configure conftestfile`
    fi
+   if test "$*" != "X $srcdir/configure conftestfile" \
+      && test "$*" != "X conftestfile $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" 1>&2; exit 1; }
+   fi
+
    test "$2" = conftestfile
    )
 then
@@ -676,9 +670,54 @@ test "$program_suffix" != NONE &&
 # sed with no file args requires a program.
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
+echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+echo "configure:675: checking whether ${MAKE-make} sets \${MAKE}" >&5
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftestmake <<\EOF
+all:
+	@echo 'ac_maketemp="${MAKE}"'
+EOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+if test -n "$ac_maketemp"; then
+  eval ac_cv_prog_make_${ac_make}_set=yes
+else
+  eval ac_cv_prog_make_${ac_make}_set=no
+fi
+rm -f conftestmake
+fi
+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  SET_MAKE=
+else
+  echo "$ac_t""no" 1>&6
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+
+PACKAGE=texinfo
+
+VERSION=3.12
+
+if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
+  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
+fi
+cat >> confdefs.h <<EOF
+#define PACKAGE "$PACKAGE"
+EOF
+
+cat >> confdefs.h <<EOF
+#define VERSION "$VERSION"
+EOF
+
+
+
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:682: checking for working aclocal" >&5
+echo "configure:721: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -691,7 +730,7 @@ else
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:695: checking for working autoconf" >&5
+echo "configure:734: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -704,7 +743,7 @@ else
 fi
 
 echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:708: checking for working automake" >&5
+echo "configure:747: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -717,7 +756,7 @@ else
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:721: checking for working autoheader" >&5
+echo "configure:760: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -730,7 +769,7 @@ else
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:734: checking for working makeinfo" >&5
+echo "configure:773: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -742,38 +781,12 @@ else
    echo "$ac_t""missing" 1>&6
 fi
 
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:747: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
 
 
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:777: checking for $ac_word" >&5
+echo "configure:790: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -802,7 +815,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:806: checking for $ac_word" >&5
+echo "configure:819: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -850,7 +863,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:854: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:867: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -860,11 +873,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS
 cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext <<EOF
-#line 864 "configure"
+#line 877 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -884,12 +897,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:888: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:901: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:893: checking whether we are using GNU C" >&5
+echo "configure:906: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -898,7 +911,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:902: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -913,7 +926,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:917: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:930: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -941,7 +954,7 @@ else
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:945: checking how to run the C preprocessor" >&5
+echo "configure:958: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -956,13 +969,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 960 "configure"
+#line 973 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:979: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -973,13 +986,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 977 "configure"
+#line 990 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:983: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:996: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
@@ -1003,13 +1016,13 @@ echo "$ac_t""$CPP" 1>&6
 
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:1007: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:1020: checking whether ${CC-cc} needs -traditional" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
     ac_pattern="Autoconf.*'x'"
   cat > conftest.$ac_ext <<EOF
-#line 1013 "configure"
+#line 1026 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
@@ -1027,7 +1040,7 @@ rm -f conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 1031 "configure"
+#line 1044 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
@@ -1048,70 +1061,11 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6
   fi
 fi
 
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1063: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    # OSF/1 installbsd also uses dspmsg, but is usable.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
+EGCS_PROG_INSTALL
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1115: checking for $ac_word" >&5
+echo "configure:1069: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1143,7 +1097,7 @@ TEXMF='$(datadir)/texmf'
 # Extract the first word of "texconfig", so it can be a program name with args.
 set dummy texconfig; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1147: checking for $ac_word" >&5
+echo "configure:1101: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_TEXCONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1169,11 +1123,11 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-$TEXCONFIG && eval `texconfig confall | grep '^TEXMF='`
+$TEXCONFIG && eval `texconfig conf </dev/null | grep '^TEXMF='`
 
 
 echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:1177: checking for POSIXized ISC" >&5
+echo "configure:1131: checking for POSIXized ISC" >&5
 if test -d /etc/conf/kconfig.d &&
   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
 then
@@ -1195,17 +1149,17 @@ fi
 
 ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6
-echo "configure:1199: checking for minix/config.h" >&5
+echo "configure:1153: checking for minix/config.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1204 "configure"
+#line 1158 "configure"
 #include "confdefs.h"
 #include <minix/config.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1209: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1163: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1243,82 +1197,106 @@ EOF
 fi
 
 
-echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1248: checking whether to enable maintainer-specific portions of Makefiles" >&5
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
-  if test $USE_MAINTAINER_MODE = yes; then
-    MAINT=
-  else
-    MAINT='#M#'
-  fi
-  
+AM_MAINTAINER_MODE
+AM_EXEEXT
 
-echo $ac_n "checking for Cygwin32 environment""... $ac_c" 1>&6
-echo "configure:1266: checking for Cygwin32 environment" >&5
-if eval "test \"`echo '$''{'am_cv_cygwin32'+set}'`\" = set"; then
+echo $ac_n "checking for gzdopen in -lz""... $ac_c" 1>&6
+echo "configure:1205: checking for gzdopen in -lz" >&5
+ac_lib_var=`echo z'_'gzdopen | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 1271 "configure"
+  ac_save_LIBS="$LIBS"
+LIBS="-lz  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 1213 "configure"
 #include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char gzdopen();
 
 int main() {
-int main () { return __CYGWIN32__; }
+gzdopen()
 ; return 0; }
 EOF
-if { (eval echo configure:1278: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
-  am_cv_cygwin32=yes
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  am_cv_cygwin32=no
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
-rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo z | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lz $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-echo "$ac_t""$am_cv_cygwin32" 1>&6
-CYGWIN32=
-test "$am_cv_cygwin32" = yes && CYGWIN32=yes
 
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1296: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'am_cv_exeext'+set}'`\" = set"; then
+# Needed on sysV68 for sigblock, sigsetmask.  But check for it in libc first.
+echo $ac_n "checking for sigblock""... $ac_c" 1>&6
+echo "configure:1254: checking for sigblock" >&5
+if eval "test \"`echo '$''{'ac_cv_func_sigblock'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test "$CYGWIN32" = yes; then
-am_cv_exeext=.exe
-else
-cat > am_c_test.c << 'EOF'
+  cat > conftest.$ac_ext <<EOF
+#line 1259 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char sigblock(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char sigblock();
+
 int main() {
-/* Nothing needed here */
-}
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_sigblock) || defined (__stub___sigblock)
+choke me
+#else
+sigblock();
+#endif
+
+; return 0; }
 EOF
-${CC-cc} -o am_c_test $CFLAGS $CPPFLAGS $LDFLAGS am_c_test.c $LIBS 1>&5
-am_cv_exeext=`echo am_c_test.* | grep -v am_c_test.c | sed -e s/am_c_test//`
-rm -f am_c_test*
+if { (eval echo configure:1282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_func_sigblock=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_sigblock=no"
 fi
-
-test x"${am_cv_exeext}" = x && am_cv_exeext=no
+rm -f conftest*
 fi
-EXEEXT=""
-test x"${am_cv_exeext}" != xno && EXEEXT=${am_cv_exeext}
-echo "$ac_t""${am_cv_exeext}" 1>&6
-
 
-# Needed on sysV68 for sigblock, sigsetmask.
+if eval "test \"`echo '$ac_cv_func_'sigblock`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
 echo $ac_n "checking for sigblock in -lbsd""... $ac_c" 1>&6
-echo "configure:1322: checking for sigblock in -lbsd" >&5
+echo "configure:1300: checking for sigblock in -lbsd" >&5
 ac_lib_var=`echo bsd'_'sigblock | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1326,7 +1304,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lbsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1330 "configure"
+#line 1308 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1337,7 +1315,7 @@ int main() {
 sigblock()
 ; return 0; }
 EOF
-if { (eval echo configure:1341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1352,7 +1330,7 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo bsd | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    ac_tr_lib=HAVE_LIB`echo bsd | sed -e 's/^a-zA-Z0-9_/_/g' \
     -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
   cat >> confdefs.h <<EOF
 #define $ac_tr_lib 1
@@ -1364,13 +1342,15 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
+fi
+
 
 # Some GNU/Linux systems (e.g., SuSE 4.3, 1996) don't have curses, but
 # rather ncurses.  So we check for it.
 TERMLIBS=
 for termlib in ncurses curses termcap terminfo termlib ; do
    echo $ac_n "checking for tputs in -l${termlib}""... $ac_c" 1>&6
-echo "configure:1374: checking for tputs in -l${termlib}" >&5
+echo "configure:1354: checking for tputs in -l${termlib}" >&5
 ac_lib_var=`echo ${termlib}'_'tputs | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1378,7 +1358,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l${termlib}  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1382 "configure"
+#line 1362 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1389,7 +1369,7 @@ int main() {
 tputs()
 ; return 0; }
 EOF
-if { (eval echo configure:1393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1412,13 +1392,55 @@ fi
 done
 
 
+if test "x$termlib" = xncurses; then
+    for ac_hdr in ncurses/termcap.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:1401: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1406 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1411: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+fi
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1417: checking for ANSI C header files" >&5
+echo "configure:1439: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1422 "configure"
+#line 1444 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1426,7 +1448,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1452: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1443,7 +1465,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1447 "configure"
+#line 1469 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1461,7 +1483,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1465 "configure"
+#line 1487 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1482,7 +1504,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1486 "configure"
+#line 1508 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1493,7 +1515,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:1497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1522,17 +1544,17 @@ for ac_hdr in fcntl.h pwd.h string.h strings.h termcap.h termio.h \
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1526: checking for $ac_hdr" >&5
+echo "configure:1548: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1531 "configure"
+#line 1553 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1536: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1559,49 +1581,13 @@ fi
 done
 
 
-if test "x$termlib" = xncurses; then
-  ac_safe=`echo "ncurses/termcap.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for ncurses/termcap.h""... $ac_c" 1>&6
-echo "configure:1566: checking for ncurses/termcap.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1571 "configure"
-#include "confdefs.h"
-#include <ncurses/termcap.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1576: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:1600: checking for off_t" >&5
+echo "configure:1586: checking for off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1605 "configure"
+#line 1591 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1629,12 +1615,12 @@ EOF
 fi
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:1633: checking return type of signal handlers" >&5
+echo "configure:1619: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1638 "configure"
+#line 1624 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -1651,7 +1637,7 @@ int main() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:1655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -1670,12 +1656,12 @@ EOF
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1674: checking for working const" >&5
+echo "configure:1660: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1679 "configure"
+#line 1665 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1724,7 +1710,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:1728: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -1745,12 +1731,12 @@ EOF
 fi
 
 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:1749: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:1735: checking whether struct tm is in sys/time.h or time.h" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1754 "configure"
+#line 1740 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -1758,7 +1744,7 @@ int main() {
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:1762: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1748: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
 else
@@ -1782,19 +1768,19 @@ fi
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:1786: checking for working alloca.h" >&5
+echo "configure:1772: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1791 "configure"
+#line 1777 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:1798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -1815,12 +1801,12 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:1819: checking for alloca" >&5
+echo "configure:1805: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1824 "configure"
+#line 1810 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -1843,7 +1829,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:1847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -1875,12 +1861,12 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:1879: checking whether alloca needs Cray hooks" >&5
+echo "configure:1865: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1884 "configure"
+#line 1870 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -1905,12 +1891,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1909: checking for $ac_func" >&5
+echo "configure:1895: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1914 "configure"
+#line 1900 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1933,7 +1919,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -1960,7 +1946,7 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:1964: checking stack direction for C alloca" >&5
+echo "configure:1950: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1968,7 +1954,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 1972 "configure"
+#line 1958 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -1987,7 +1973,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:1991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -2009,12 +1995,12 @@ EOF
 fi
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:2013: checking for vprintf" >&5
+echo "configure:1999: checking for vprintf" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2018 "configure"
+#line 2004 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
@@ -2037,7 +2023,7 @@ vprintf();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else
@@ -2061,12 +2047,12 @@ fi
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:2065: checking for _doprnt" >&5
+echo "configure:2051: checking for _doprnt" >&5
 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2070 "configure"
+#line 2056 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
@@ -2089,7 +2075,7 @@ _doprnt();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
 else
@@ -2113,9 +2099,8 @@ fi
 
 fi
 
-if test "$ac_cv_c_cross" = no; then
-  echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6
-echo "configure:2119: checking whether setvbuf arguments are reversed" >&5
+echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6
+echo "configure:2104: checking whether setvbuf arguments are reversed" >&5
 if eval "test \"`echo '$''{'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2123,7 +2108,7 @@ else
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 2127 "configure"
+#line 2112 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 /* If setvbuf has the reversed format, exit 0. */
@@ -2137,7 +2122,7 @@ main () {
   exit(0);			/* Non-reversed systems segv here.  */
 }
 EOF
-if { (eval echo configure:2141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_setvbuf_reversed=yes
 else
@@ -2160,17 +2145,16 @@ EOF
 
 fi
 
-fi
 for ac_func in setvbuf getcwd memset bzero strchr strcasecmp \
   sigprocmask sigsetmask
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2169: checking for $ac_func" >&5
+echo "configure:2153: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2174 "configure"
+#line 2158 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2193,7 +2177,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2220,12 +2204,12 @@ done
 for ac_func in memcpy memmove strdup strerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2224: checking for $ac_func" >&5
+echo "configure:2208: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2229 "configure"
+#line 2213 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2248,7 +2232,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2277,21 +2261,21 @@ done
 
 ALL_LINGUAS="de fr"
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:2281: checking for inline" >&5
+echo "configure:2265: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 2288 "configure"
+#line 2272 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:2295: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -2317,12 +2301,12 @@ EOF
 esac
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2321: checking for size_t" >&5
+echo "configure:2305: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2326 "configure"
+#line 2310 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2353,17 +2337,17 @@ for ac_hdr in unistd.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2357: checking for $ac_hdr" >&5
+echo "configure:2341: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2362 "configure"
+#line 2346 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2367: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2351: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2392,12 +2376,12 @@ done
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2396: checking for $ac_func" >&5
+echo "configure:2380: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2401 "configure"
+#line 2385 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2420,7 +2404,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2445,7 +2429,7 @@ fi
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:2449: checking for working mmap" >&5
+echo "configure:2433: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2453,7 +2437,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 2457 "configure"
+#line 2441 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -2593,7 +2577,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:2597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -2615,23 +2599,23 @@ EOF
 
 fi
 
-                           
+                              
    for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h string.h \
-unistd.h values.h
+unistd.h values.h sys/param.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2625: checking for $ac_hdr" >&5
+echo "configure:2609: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2630 "configure"
+#line 2614 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2635: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2619: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2661,12 +2645,12 @@ done
 __argz_count __argz_stringify __argz_next
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2665: checking for $ac_func" >&5
+echo "configure:2649: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2670 "configure"
+#line 2654 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2689,7 +2673,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2718,12 +2702,12 @@ done
      for ac_func in stpcpy
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2722: checking for $ac_func" >&5
+echo "configure:2706: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2727 "configure"
+#line 2711 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2746,7 +2730,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2780,19 +2764,19 @@ EOF
 
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:2784: checking for LC_MESSAGES" >&5
+echo "configure:2768: checking for LC_MESSAGES" >&5
 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2789 "configure"
+#line 2773 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:2796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   am_cv_val_LC_MESSAGES=yes
 else
@@ -2813,7 +2797,7 @@ EOF
     fi
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:2817: checking whether NLS is requested" >&5
+echo "configure:2801: checking whether NLS is requested" >&5
         # Check whether --enable-nls or --disable-nls was given.
 if test "${enable_nls+set}" = set; then
   enableval="$enable_nls"
@@ -2833,7 +2817,7 @@ fi
 EOF
 
       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:2837: checking whether included gettext is requested" >&5
+echo "configure:2821: checking whether included gettext is requested" >&5
       # Check whether --with-included-gettext or --without-included-gettext was given.
 if test "${with_included_gettext+set}" = set; then
   withval="$with_included_gettext"
@@ -2852,17 +2836,17 @@ fi
 
 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:2856: checking for libintl.h" >&5
+echo "configure:2840: checking for libintl.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2861 "configure"
+#line 2845 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2866: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2850: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2879,19 +2863,19 @@ fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
-echo "configure:2883: checking for gettext in libc" >&5
+echo "configure:2867: checking for gettext in libc" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2888 "configure"
+#line 2872 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:2895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   gt_cv_func_gettext_libc=yes
 else
@@ -2907,7 +2891,7 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6
 
 	   if test "$gt_cv_func_gettext_libc" != "yes"; then
 	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
-echo "configure:2911: checking for bindtextdomain in -lintl" >&5
+echo "configure:2895: checking for bindtextdomain in -lintl" >&5
 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2915,7 +2899,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2919 "configure"
+#line 2903 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2926,7 +2910,7 @@ int main() {
 bindtextdomain()
 ; return 0; }
 EOF
-if { (eval echo configure:2930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2942,19 +2926,19 @@ fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
-echo "configure:2946: checking for gettext in libintl" >&5
+echo "configure:2930: checking for gettext in libintl" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2951 "configure"
+#line 2935 "configure"
 #include "confdefs.h"
 
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:2958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   gt_cv_func_gettext_libintl=yes
 else
@@ -2982,7 +2966,7 @@ EOF
 	      # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2986: checking for $ac_word" >&5
+echo "configure:2970: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3016,12 +3000,12 @@ fi
 		for ac_func in dcgettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3020: checking for $ac_func" >&5
+echo "configure:3004: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3025 "configure"
+#line 3009 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3044,7 +3028,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3071,7 +3055,7 @@ done
 		# Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3075: checking for $ac_word" >&5
+echo "configure:3059: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3106,7 +3090,7 @@ fi
 		# Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3110: checking for $ac_word" >&5
+echo "configure:3094: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3138,7 +3122,7 @@ else
 fi
 
 		cat > conftest.$ac_ext <<EOF
-#line 3142 "configure"
+#line 3126 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -3146,7 +3130,7 @@ extern int _nl_msg_cat_cntr;
 			       return _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:3150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   CATOBJEXT=.gmo
 		   DATADIRNAME=share
@@ -3169,7 +3153,7 @@ fi
 
         if test "$CATOBJEXT" = "NONE"; then
 	  echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
-echo "configure:3173: checking whether catgets can be used" >&5
+echo "configure:3157: checking whether catgets can be used" >&5
 	  # Check whether --with-catgets or --without-catgets was given.
 if test "${with_catgets+set}" = set; then
   withval="$with_catgets"
@@ -3182,7 +3166,7 @@ fi
 
 	  if test "$nls_cv_use_catgets" = "yes"; then
 	    	    echo $ac_n "checking for main in -li""... $ac_c" 1>&6
-echo "configure:3186: checking for main in -li" >&5
+echo "configure:3170: checking for main in -li" >&5
 ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3190,14 +3174,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-li  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3194 "configure"
+#line 3178 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:3201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3225,12 +3209,12 @@ else
 fi
 
 	    echo $ac_n "checking for catgets""... $ac_c" 1>&6
-echo "configure:3229: checking for catgets" >&5
+echo "configure:3213: checking for catgets" >&5
 if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3234 "configure"
+#line 3218 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char catgets(); below.  */
@@ -3253,7 +3237,7 @@ catgets();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_catgets=yes"
 else
@@ -3275,7 +3259,7 @@ EOF
 	       # Extract the first word of "gencat", so it can be a program name with args.
 set dummy gencat; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3279: checking for $ac_word" >&5
+echo "configure:3263: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3310,7 +3294,7 @@ fi
 		 # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3314: checking for $ac_word" >&5
+echo "configure:3298: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3346,7 +3330,7 @@ fi
 		   # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3350: checking for $ac_word" >&5
+echo "configure:3334: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3381,7 +3365,7 @@ fi
 		 # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3385: checking for $ac_word" >&5
+echo "configure:3369: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3416,7 +3400,7 @@ fi
 		 CATOBJEXT=.cat
 		 INSTOBJEXT=.cat
 		 DATADIRNAME=lib
-		 INTLDEPS="../intl/libintl.a"
+		 INTLDEPS='$(top_builddir)/intl/libintl.a'
 		 INTLLIBS=$INTLDEPS
 		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
 		 nls_cv_header_intl=intl/libintl.h
@@ -3439,7 +3423,7 @@ fi
         # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3443: checking for $ac_word" >&5
+echo "configure:3427: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3473,7 +3457,7 @@ fi
         # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3477: checking for $ac_word" >&5
+echo "configure:3461: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3508,7 +3492,7 @@ fi
         # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3512: checking for $ac_word" >&5
+echo "configure:3496: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3544,7 +3528,7 @@ fi
         CATOBJEXT=.gmo
         INSTOBJEXT=.mo
         DATADIRNAME=share
-	INTLDEPS="../intl/libintl.a"
+	INTLDEPS='$(top_builddir)/intl/libintl.a'
 	INTLLIBS=$INTLDEPS
 	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
         nls_cv_header_intl=intl/libintl.h
@@ -3598,7 +3582,7 @@ fi
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:3602: checking for catalogs to be installed" >&5
+echo "configure:3586: checking for catalogs to be installed" >&5
        NEW_LINGUAS=
        for lang in ${LINGUAS=$ALL_LINGUAS}; do
          case "$ALL_LINGUAS" in
@@ -3614,21 +3598,29 @@ echo "configure:3602: checking for catalogs to be installed" >&5
      fi
    fi
 
+            if test $ac_cv_header_locale_h = yes; then
+     INCLUDE_LOCALE_H="#include <locale.h>"
+   else
+     INCLUDE_LOCALE_H="\
+/* The system does not provide the header <locale.h>.  Take care yourself.  */"
+   fi
+   
+
             test -d intl || mkdir intl
    if test "$CATOBJEXT" = ".cat"; then
      ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
-echo "configure:3622: checking for linux/version.h" >&5
+echo "configure:3614: checking for linux/version.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3627 "configure"
+#line 3619 "configure"
 #include "confdefs.h"
 #include <linux/version.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3632: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3624: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3667,10 +3659,10 @@ fi
    
 
             MKINSTALLDIRS=
-   if test $ac_aux_dir; then
+   if test -n "$ac_aux_dir"; then
      MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
    fi
-   if test -z $MKINSTALLDIRS; then
+   if test -z "$MKINSTALLDIRS"; then
      MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
    fi
    
@@ -3688,6 +3680,7 @@ fi
    else
      posrcprefix="../"
    fi
+   rm -f po/POTFILES
    sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
 	< $srcdir/po/POTFILES.in > po/POTFILES
   
@@ -3796,7 +3789,6 @@ ac_given_INSTALL="$INSTALL"
 
 trap 'rm -fr `echo "Makefile             \
            doc/Makefile         \
-           emacs/Makefile       \
            info/Makefile        \
            intl/Makefile        \
            lib/Makefile         \
@@ -3847,12 +3839,9 @@ s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@CC@%$CC%g
 s%@CPP@%$CPP%g
-s%@INSTALL@%$INSTALL%g
 s%@RANLIB@%$RANLIB%g
 s%@TEXCONFIG@%$TEXCONFIG%g
 s%@TEXMF@%$TEXMF%g
-s%@MAINT@%$MAINT%g
-s%@EXEEXT@%$EXEEXT%g
 s%@TERMLIBS@%$TERMLIBS%g
 s%@ALLOCA@%$ALLOCA%g
 s%@LIBOBJS@%$LIBOBJS%g
@@ -3872,6 +3861,7 @@ s%@INTLLIBS@%$INTLLIBS%g
 s%@INTLOBJS@%$INTLOBJS%g
 s%@POFILES@%$POFILES%g
 s%@POSUB@%$POSUB%g
+s%@INCLUDE_LOCALE_H@%$INCLUDE_LOCALE_H%g
 s%@GT_NO@%$GT_NO%g
 s%@GT_YES@%$GT_YES%g
 s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g
@@ -3919,7 +3909,6 @@ cat >> $CONFIG_STATUS <<EOF
 
 CONFIG_FILES=\${CONFIG_FILES-"Makefile             \
            doc/Makefile         \
-           emacs/Makefile       \
            info/Makefile        \
            intl/Makefile        \
            lib/Makefile         \
diff --git a/texinfo/configure.in b/texinfo/configure.in
index ca9fcb1bd93..c6740ae3f9a 100644
--- a/texinfo/configure.in
+++ b/texinfo/configure.in
@@ -1,11 +1,11 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in,v 1.5 1998/03/24 18:05:13 law Exp $
+dnl $Id: configure.in,v 1.7 1998/03/26 10:30:41 law Exp $
 dnl
 AC_INIT(makeinfo/makeinfo.c)
 AC_PREREQ(2.12)dnl Minimum Autoconf version required.
 AM_CONFIG_HEADER(config.h)
 
-AM_INIT_AUTOMAKE([texinfo], [3.11])
+AM_INIT_AUTOMAKE([texinfo], [3.12])
 
 dnl Checks for programs.
 AC_PROG_CC
@@ -16,7 +16,7 @@ AC_PROG_RANLIB
 # We do this for the sake of a more helpful warning in doc/Makefile.
 TEXMF='$(datadir)/texmf'
 AC_CHECK_PROG(TEXCONFIG, texconfig, true, false)
-$TEXCONFIG && eval `texconfig confall | grep '^TEXMF='`
+$TEXCONFIG && eval `texconfig conf </dev/null | grep '^TEXMF='`
 AC_SUBST(TEXMF)
 
 AC_ISC_POSIX
@@ -27,8 +27,10 @@ AM_MAINTAINER_MODE
 AM_EXEEXT
 
 dnl Checks for libraries.
-# Needed on sysV68 for sigblock, sigsetmask.
-AC_CHECK_LIB(bsd, sigblock)
+AC_CHECK_LIB(z, gzdopen)
+
+# Needed on sysV68 for sigblock, sigsetmask.  But check for it in libc first.
+AC_CHECK_FUNC(sigblock, , AC_CHECK_LIB(bsd, sigblock))
 
 # Some GNU/Linux systems (e.g., SuSE 4.3, 1996) don't have curses, but
 # rather ncurses.  So we check for it.
@@ -40,16 +42,16 @@ done
 AC_SUBST(TERMLIBS)
 
 dnl Checks for header files.
+dnl Do not use <ncurses/termcap.h> unless we're linking with ncurses.
+if test "x$termlib" = xncurses; then
+  dnl Use AC_CHECK_HEADERS so the HAVE_*_H symbol gets defined.
+  AC_CHECK_HEADERS(ncurses/termcap.h)
+fi
 AC_HEADER_STDC
 AC_CHECK_HEADERS(fcntl.h pwd.h string.h strings.h termcap.h termio.h \
   termios.h unistd.h \
   sys/fcntl.h sys/file.h sys/ptem.h sys/time.h sys/ttold.h sys/wait.h)
 
-dnl Do not use <ncurses/termcap.h> unless we're linking with ncurses.
-if test "x$termlib" = xncurses; then
-  AC_CHECK_HEADER(ncurses/termcap.h)
-fi
-
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_OFF_T
 AC_TYPE_SIGNAL
@@ -59,9 +61,7 @@ AC_STRUCT_TM
 dnl Checks for library functions.
 AC_FUNC_ALLOCA
 AC_FUNC_VPRINTF
-if test "$ac_cv_c_cross" = no; then
-  AC_FUNC_SETVBUF_REVERSED
-fi
+AC_FUNC_SETVBUF_REVERSED
 AC_CHECK_FUNCS(setvbuf getcwd memset bzero strchr strcasecmp \
   sigprocmask sigsetmask)
 dnl strcasecmp, strerror, xmalloc, xrealloc, probably others should be added.
@@ -74,7 +74,6 @@ AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
 
 AC_OUTPUT([Makefile             \
            doc/Makefile         \
-           emacs/Makefile       \
            info/Makefile        \
            intl/Makefile        \
            lib/Makefile         \
diff --git a/texinfo/dir-example b/texinfo/dir-example
index 9dc4fe33cc6..803e0479756 100644
--- a/texinfo/dir-example
+++ b/texinfo/dir-example
@@ -1,32 +1,39 @@
 This is the directory file `dir' a.k.a. `DIR', which contains the
-topmost node of the Info hierarchy.  This file is merely made available
-for your hacking pleasure, not official or standard in any way.
-If it doesn't make sense to you, or you don't like it, ignore it.
+  topmost node of the Info hierarchy.
+This particular dir file is merely made available for your hacking
+  pleasure, not official or standard in any way.  If it doesn't make sense
+  to you, or you don't like it, ignore it.
+If you have dir entries for Texinfo manuals you'd like to be added here,
+  please send them to karl@gnu.org.
 
-$Id: dir-example,v 1.3 1998/03/24 18:05:15 law Exp $
+$Id: dir-example,v 1.1.1.3 1998/03/24 18:19:30 law Exp $
 
-File: dir	Node: Top	This is the top of the INFO tree.
+File: dir,	Node: Top,	This is the top of the INFO tree.
 
-This node gives a menu of the major topics accessible through Info.
+This is the Info main menu (aka directory node).
+A few useful Info commands:
 
   `q' quits;
   `?' lists all Info commands;
   `h' starts the Info tutorial;
   `mTexinfo RET' visits the Texinfo manual, etc.
 
+Not all of the topics shown below may be available on this system.
+
 * Menu:
 
 GNU packages
-* Bash: (bash).			Bourne again shell.
-* Cpio: (cpio).			Cpio archiver.
-* DC: (dc).			Postfix arbitrary expression calculator.
+* Bash: (bash).			Bourne-Again SHell.
+* Cpio: (cpio).			Copy-in-copy-out archiver.
+* DC: (dc).			Postfix desk calculator.
 * Diff: (diff).			Comparing and merging programs.
 * Ed: (ed).			Line editor.
 * Emacs: (emacs).		Extensible self-documenting text editor.
-* File utilities: (fileutils).  GNU file utilities.
+* File utilities: (fileutils).	GNU file utilities.
 * Finding files: (find).	Operating on files matching certain criteria.
 * Font utilities: (fontu).	Programs for font manipulation.
-* Gawk: (gawk.info).            A text scanning and processing language.
+* Gawk: (gawk.info).		A text scanning and processing language.
+* Gcal: (gcal).			GNU calendar program.
 * Gzip: (gzip).			General (de)compression.
 * Identifier DB: (id-utils).	Identifier database utilities.
 * Ispell: (ispell).		Interactive spelling corrector.
@@ -34,13 +41,13 @@ GNU packages
 * Make: (make).			Remake files automatically.
 * Ptx: (ptx).			Permuted index generator.
 * Shar: (sharutils).		Shell archiver, uudecode/uuencode.
-* Shell utilities: (sh-utils).  GNU shell utilities.
+* Shell utilities: (sh-utils).	GNU shell utilities.
 * tar: (tar).			Making tape (or disk) archives.
-* Text utilities: (textutils).  GNU text utilities.
+* Text utilities: (textutils).	GNU text utilities.
 * Time: (time).			Measuring program resource usage.
 * UUCP: (uucp).			Copying between machines, offline.
 * Wdiff: (wdiff).		Word-by-word comparison.
-* Wget: (wget).                 URL download.
+* Wget: (wget).			URL download.
 
 GNU programming tools
 * As: (as).			Assembler.
@@ -61,20 +68,21 @@ GNU programming tools
 * Ld: (ld).			Linker.
 
 Texinfo documentation system
-* Info: (info).                 Documentation browsing system.
-* Texinfo: (texinfo).           The GNU documentation format.
+* Info: (info).			Documentation browsing system.
+* Texinfo: (texinfo).		The GNU documentation format.
 * info program: (info-stnd).	Standalone Info-reading program.
 * install-info: (texinfo)Invoking install-info. Updating info/dir entries.
-* texi2dvi: (texinfo)Format with texi2dvi.      Printing Texinfo documentation.
-* texindex: (texinfo)Format with tex/texindex.  Sorting Texinfo index files.
-* makeinfo: (texinfo)makeinfo preferred.        Translate Texinfo source.
+* texi2dvi: (texinfo)Format with texi2dvi.	Printing Texinfo documentation.
+* texindex: (texinfo)Format with tex/texindex.	Sorting Texinfo index files.
+* makeinfo: (texinfo)makeinfo preferred.	Translate Texinfo source.
 
 GNU Emacs Lisp
 * Elisp: (elisp).		GNU Emacs Lisp reference manual.
 * Intro Elisp: (emacs-lisp-intro). Introduction to Elisp programming.
 
+* AUC TeX: (auctex).		Editing (La)TeX files.
 * Calc: (calc).			Calculator and more.
-* CC-mode: (ccmode).		Editing C, C++, and Objective C.
+* CC mode: (cc-mode).		Editing C, C++, Objective C, and Java.
 * Common Lisp: (cl).		Partial Common Lisp support for Emacs Lisp.
 * Dired-x: (dired-x).		Extra directory editor features.
 * Edebug: (edebug).		Source-level debugger for Emacs Lisp.
@@ -121,9 +129,10 @@ GNU programming documentation
 * Stabs: (stabs).		Symbol table debugging information format.
 * Standards: (standards).	GNU coding standards.
 
-DOS
-* Demacs: (demacs).		GNU Emacs for DOS.
-* GNUish: (gnuish).		GNU utilities for DOS.
+Linux
+* dosemu: (dosemu).		Linux DOS emulator.
+* gpm: (gpm).			Linux general purpose mouse interface.
+* linux-faq: (linux-faq).	The Linux FAQ List
 
 TeX things
 * Afm2tfm: (dvips)Invoking afm2tfm.  Making Type 1 fonts available to TeX.
@@ -137,124 +146,133 @@ TeX things
 * TeXDraw: (texdraw).		Drawing PostScript diagrams within TeX.
 * Web2c: (web2c).		TeX, Metafont, and their companion programs.
 
+DOS 
+* Demacs: (demacs).		GNU Emacs for DOS.
+* GNUish: (gnuish).		GNU utilities for DOS.
+
 Other things
 * Amd: (amdref).		Filesystem automounter.
 * CMUCL: (cmu-user).		CMU Common Lisp.
 * File headers: (filehdr).	Bibliographic information for computer files.
 * GCP: (gcp).			Game club protocol.
+* GIMP: (pdb).			The GIMP procedural database.
 * HTML: (snafu).		Hypertext Markup Language 2.0 specification.
 * Jargon: (jargon).		The jargon file.
+* JED: (jed).			JED editor documentation.
+* octave: (octave).		Octave - A language for numerical computation.
 * Perl: (perl).			Practical extraction and report language.
 * PRCS: (prcs).			Project revision control system.
 * Screen: (screen).		Virtual screen manager.
 * UMB C.S. Dept.: (csinfo).	UMass/Boston Computer Science Dept. info.
 
 Individual utilities
-* aclocal: (automake)Invoking aclocal.          Generating aclocal.m4.
+* aclocal: (automake)Invoking aclocal.		Generating aclocal.m4.
 * aid: (id-utils)aid invocation.		Matching strings.
 * ar: (binutils)ar.				Create/modify/extract archives.
 * at-pr: (gnats)at-pr.				Bug report timely reminders.
-* automake: (automake).		                Making Makefile.in's.
+* automake: (automake).				Making Makefile.in's.
 * autoreconf: (autoconf)Invoking autoreconf.	Remake multiple configure's.
 * autoscan: (autoconf)Invoking autoscan.	Automate initial configure.in.
 * awk: (gawk)Invoking gawk.			Text processing and scanning.
-* basename: (sh-utils)basename invocation.      Strip directory and suffix.
+* basename: (sh-utils)basename invocation.	Strip directory and suffix.
 * bibtex: (web2c)BibTeX invocation.		Maintaining bibliographies.
 * c++filt: (binutils)c++filt.			Demangle C++ symbols.
-* cat: (textutils)cat invocation.               Concatenate and write files.
-* chgrp: (fileutils)chgrp invocation.           Change file groups.
-* chmod: (fileutils)chmod invocation.           Change file permissions.
-* chown: (fileutils)chown invocation.           Change file owners/groups.
-* chroot: (sh-utils)chroot invocation.          Specify the root directory.
-* cksum: (textutils)cksum invocation.           Print POSIX CRC checksum.
+* cat: (textutils)cat invocation.		Concatenate and write files.
+* chgrp: (fileutils)chgrp invocation.		Change file groups.
+* chmod: (fileutils)chmod invocation.		Change file permissions.
+* chown: (fileutils)chown invocation.		Change file owners/groups.
+* chroot: (sh-utils)chroot invocation.		Specify the root directory.
+* cksum: (textutils)cksum invocation.		Print POSIX CRC checksum.
 * cmp: (diff)Invoking cmp.			Character-by-character diff.
-* comm: (textutils)comm invocation.             Compare sorted files by line.
-* cp: (fileutils)cp invocation.                 Copy files.
-* csplit: (textutils)csplit invocation.         Split by context.
-* cut: (textutils)cut invocation.               Print selected parts of lines.
-* date: (sh-utils)date invocation.              Print/set system date and time.
-* dd: (fileutils)dd invocation.                 Copy and convert a file.
-* df: (fileutils)df invocation.                 Report filesystem disk usage.
+* comm: (textutils)comm invocation.		Compare sorted files by line.
+* cp: (fileutils)cp invocation.			Copy files.
+* csplit: (textutils)csplit invocation.		Split by context.
+* cut: (textutils)cut invocation.		Print selected parts of lines.
+* date: (sh-utils)date invocation.		Print/set system date and time.
+* dd: (fileutils)dd invocation.			Copy and convert a file.
+* df: (fileutils)df invocation.			Report filesystem disk usage.
 * diff3: (diff)Invoking diff3.			Three-way diff.
-* dir: (fileutils)dir invocation.               List directories briefly.
-* dircolors: (fileutils)dircolors invocation.   Color setup for ls.
-* dirname: (sh-utils)dirname invocation.        Strip non-directory suffix.
+* dir: (fileutils)dir invocation.		List directories briefly.
+* dircolors: (fileutils)dircolors invocation.	Color setup for ls.
+* dirname: (sh-utils)dirname invocation.	Strip non-directory suffix.
 * dmp: (web2c)Dmp invocation.			Troff->MPX (MetaPost pictures).
-* du: (fileutils)du invocation.                 Report on disk usage.
+* du: (fileutils)du invocation.			Report on disk usage.
 * dvicopy: (web2c)DVIcopy invocation.		Virtual font expansion
 * dvitomp: (web2c)DVItoMP invocation.		DVI to MPX (MetaPost pictures).
 * dvitype: (web2c)DVItype invocation.		DVI to human-readable text.
-* echo: (sh-utils)echo invocation.              Print a line of text.
+* echo: (sh-utils)echo invocation.		Print a line of text.
 * edit-pr: (gnats)Invoking edit-pr.		Changing bugs.
 * eid: (id-utils)eid invocation.		Invoking an editor on matches.
 * emacsclient: (emacs)Emacs Server.		Connecting to a running Emacs.
 * emacsserver: (emacs)Emacs Server.		Connecting to a running Emacs.
-* env: (sh-utils)env invocation.                Modify the environment.
+* env: (sh-utils)env invocation.		Modify the environment.
 * etags: (emacs)Create Tags Table.		Creating a TAGS table.
-* expand: (textutils)expand invocation.         Convert tabs to spaces.
-* expr: (sh-utils)expr invocation.              Evaluate expressions.
-* factor: (sh-utils)factor invocation.          Print prime factors
-* false: (sh-utils)false invocation.            Do nothing, unsuccessfully.
+* expand: (textutils)expand invocation.		Convert tabs to spaces.
+* expr: (sh-utils)expr invocation.		Evaluate expressions.
+* factor: (sh-utils)factor invocation.		Print prime factors
+* false: (sh-utils)false invocation.		Do nothing, unsuccessfully.
 * fid: (id-utils)fid invocation.		Listing a file's identifiers.
 * file-pr: (gnats)file-pr.			Processing incoming traffic.
 * find: (find)Invoking find.			Finding and acting on files.
-* fmt: (textutils)fmt invocation.               Reformat paragraph text.
-* fold: (textutils)fold invocation.             Wrap long input lines.
+* fmt: (textutils)fmt invocation.		Reformat paragraph text.
+* fold: (textutils)fold invocation.		Wrap long input lines.
 * g++: (gcc)Invoking G++.			The GNU C++ compiler.
+* gcal2txt: (gcal)Invoking gcal2txt.		Calendar resource to text file.
 * gettextize: (gettext)gettextize Invocation.	Prepare a package for gettext.
 * gftodvi: (web2c)GFtoDVI invocation.		Generic font proofsheets.
 * gftopk: (web2c)GFtoPK invocation.		Generic to packed fonts.
 * gftype: (web2c)GFtype invocation.		GF to human-readable text.
 * gid: (id-utils)gid invocation.		Listing all matching lines.
-* groups: (sh-utils)groups invocation.          Print group names a user is in.
+* git: (git).					GNU interactive tools.
+* groups: (sh-utils)groups invocation.		Print group names a user is in.
 * gunzip: (gzip)Overview.			Decompression.
-* head: (textutils)head invocation.             Output the first part of files.
-* hostname: (sh-utils)hostname invocation.      Print or set system name.
-* id: (sh-utils)id invocation.                  Print real/effective uid/gid.
+* head: (textutils)head invocation.		Output the first part of files.
+* hostname: (sh-utils)hostname invocation.	Print or set system name.
+* id: (sh-utils)id invocation.			Print real/effective uid/gid.
 * idx: (id-utils)idx invocation.		Testing mkid scanners.
 * ifnames: (autoconf)Invoking ifnames.		List conditionals in source.
 * iid: (id-utils)iid invocation.		Interactive complex queries.
 * inimf: (web2c)inimf invocation.		Initial Metafont.
 * inimp: (web2c)inimp invocation.		Initial MetaPost.
 * initex: (web2c)initex invocation.		Initial TeX.
-* install: (fileutils)install invocation.       Copy and change attributes.
-* join: (textutils)join invocation.             Join lines on a common field.
+* install: (fileutils)install invocation.	Copy and change attributes.
+* join: (textutils)join invocation.		Join lines on a common field.
 * kpsewhich: (kpathsea)Invoking kpsewhich.	TeX file searching.
 * lid: (id-utils)lid invocation.		Matching identifier patterns.
-* ln: (fileutils)ln invocation.                 Make links between files.
+* ln: (fileutils)ln invocation.			Make links between files.
 * locate: (find)Invoking locate.		Finding files in a database.
-* logname: (sh-utils)logname invocation.        Print current login name.
-* ls: (fileutils)ls invocation.                 List directory contents.
+* logname: (sh-utils)logname invocation.	Print current login name.
+* ls: (fileutils)ls invocation.			List directory contents.
 * makempx: (web2c)MakeMPX invocation.		MetaPost label typesetting.
 * maketexmf: (kpathsea)MakeTeX scripts.		MF source generation.
 * maketexpk: (kpathsea)MakeTeX scripts.		PK bitmap generation.
 * maketextex: (kpathsea)MakeTeX scripts.	TeX source generation.
 * maketextfm: (kpathsea)MakeTeX scripts.	TeX font metric generation.
-* md5sum: (textutils)md5sum invocation.         Print or check message-digests.
+* md5sum: (textutils)md5sum invocation.		Print or check message-digests.
 * mf: (web2c)mf invocation.			Creating typeface families.
 * mft: (web2c)MFT invocation.			Prettyprinting Metafont source.
-* mkdir: (fileutils)mkdir invocation.           Create directories.
-* mkfifo: (fileutils)mkfifo invocation.         Create FIFOs: (named pipes).
+* mkdir: (fileutils)mkdir invocation.		Create directories.
+* mkfifo: (fileutils)mkfifo invocation.		Create FIFOs: (named pipes).
 * mkid: (id-utils)mkid invocation.		Creating an ID database.
-* mknod: (fileutils)mknod invocation.           Create special files.
+* mknod: (fileutils)mknod invocation.		Create special files.
 * mp: (web2c)mp invocation.			Creating technical diagrams.
 * mpto: (web2c)MPto invocation.			MetaPost label extraction.
 * msgfmt: (gettext)msgfmt Invocation.		Make MO files out of PO files.
 * msgmerge: (gettext)msgmerge Invocation.	Update two PO files into one.
-* mv: (fileutils)mv invocation.                 Rename files.
+* mv: (fileutils)mv invocation.			Rename files.
 * newer: (web2c)Newer invocation.		Compare modification times.
-* nice: (sh-utils)nice invocation.              Modify scheduling priority.
-* nl: (textutils)nl invocation.                 Number lines and write files.
+* nice: (sh-utils)nice invocation.		Modify scheduling priority.
+* nl: (textutils)nl invocation.			Number lines and write files.
 * nlmconv: (binutils)nlmconv.			Convert object to NetWare LM.
 * nm: (binutils)nm.				List symbols in object files.
-* nohup: (sh-utils)nohup invocation.            Immunize to hangups.
+* nohup: (sh-utils)nohup invocation.		Immunize to hangups.
 * objcopy: (binutils)objcopy.			Copy/translate object files.
 * objdump: (binutils)objdump.			Display info from object files.
-* od: (textutils)od invocation.                 Dump files in octal, etc.
-* paste: (textutils)paste invocation.           Merge lines of files.
+* od: (textutils)od invocation.			Dump files in octal, etc.
+* paste: (textutils)paste invocation.		Merge lines of files.
 * patch: (diff)Invoking patch.			Automatically applying diffs.
 * patgen: (web2c)Patgen invocation.		Creating hyphenation patterns.
-* pathchk: (sh-utils)pathchk invocation.        Check file name portability.
+* pathchk: (sh-utils)pathchk invocation.	Check file name portability.
 * pid: (id-utils)pid invocation.		Looking up filenames.
 * pktogf: (web2c)PKtoGF invocation.		Packed to generic fonts.
 * pktype: (web2c)PKtype invocation.		PK to human-readable text.
@@ -262,60 +280,62 @@ Individual utilities
 * pooltype: (web2c)Pooltype invocation.		Display WEB pool files.
 * pr-addr: (gnats)pr-addr.			Bug report address retrieval.
 * pr-edit: (gnats)pr-edit.			The edit-pr driver.
-* pr: (textutils)pr invocation.                 Paginate or columnate files.
-* printenv: (sh-utils)printenv invocation.      Print environment variables.
-* printf: (sh-utils)printf invocation.          Format and print data.
-* pwd: (sh-utils)pwd invocation.                Print working directory.
+* pr: (textutils)pr invocation.			Paginate or columnate files.
+* printenv: (sh-utils)printenv invocation.	Print environment variables.
+* printf: (sh-utils)printf invocation.		Format and print data.
+* pwd: (sh-utils)pwd invocation.		Print working directory.
 * query-pr: (gnats)Invoking query-pr.		Bug searching/reporting.
 * queue-pr: (gnats)queue-pr.			Handling incoming traffic.
 * ranlib: (binutils)ranlib.			Index archive file contents.
-* rm: (fileutils)rm invocation.                 Remove files.
-* rmdir: (fileutils)rmdir invocation.           Remove empty directories.
+* rm: (fileutils)rm invocation.			Remove files.
+* rmdir: (fileutils)rmdir invocation.		Remove empty directories.
 * sdiff: (diff)Invoking sdiff.			Interactively merge files.
 * send-pr: (gnats)Invoking send-pr.		Submitting bugs.
-* seq: (sh-utils)seq invocation.                Print numeric sequences
+* seq: (sh-utils)seq invocation.		Print numeric sequences
 * shar: (sharutils)shar invocation.		Create shell archive.
 * size: (binutils)size.				List object file section sizes.
-* sleep: (sh-utils)sleep invocation.            Delay for a specified time.
-* sort: (textutils)sort invocation.             Sort text files.
-* split: (textutils)split invocation.           Split into fixed-size pieces.
+* sleep: (sh-utils)sleep invocation.		Delay for a specified time.
+* sort: (textutils)sort invocation.		Sort text files.
+* split: (textutils)split invocation.		Split into fixed-size pieces.
 * strings: (binutils)strings.			List printable strings.
 * strip: (binutils)strip.			Discard symbols.
-* stty: (sh-utils)stty invocation.              Print/change terminal settings.
-* su: (sh-utils)su invocation.                  Modify user and group id.
-* sum: (textutils)sum invocation.               Print traditional checksum.
-* sync: (fileutils)sync invocation.             Synchronize memory and disk.
+* stty: (sh-utils)stty invocation.		Print/change terminal settings.
+* su: (sh-utils)su invocation.			Modify user and group id.
+* sum: (textutils)sum invocation.		Print traditional checksum.
+* sync: (fileutils)sync invocation.		Synchronize memory and disk.
 * tabs: (tput)Invoking tabs.			Tab settings.
-* tac: (textutils)tac invocation.               Reverse files.
-* tail: (textutils)tail invocation.             Output the last part of files.
+* tac: (textutils)tac invocation.		Reverse files.
+* tail: (textutils)tail invocation.		Output the last part of files.
 * tangle: (web2c)Tangle invocation.		WEB to Pascal.
-* tee: (sh-utils)tee invocation.                Redirect to multiple files.
-* test: (sh-utils)test invocation.              File/string tests.
+* tcal: (gcal)Invoking tcal.			Run Gcal with tomorrow's date.
+* tee: (sh-utils)tee invocation.		Redirect to multiple files.
+* test: (sh-utils)test invocation.		File/string tests.
 * tex: (web2c)tex invocation.			Typesetting.
 * tftopl: (web2c)TFtoPL invocation.		TFM -> property list.
-* touch: (fileutils)touch invocation.           Change file timestamps.
+* touch: (fileutils)touch invocation.		Change file timestamps.
 * tput: (tput)Invoking tput.			Termcap in shell scripts.
-* tr: (textutils)tr invocation.                 Translate characters.
-* true: (sh-utils)true invocation.              Do nothing, successfully.
-* tty: (sh-utils)tty invocation.                Print terminal name.
-* uname: (sh-utils)uname invocation.            Print system information.
-* unexpand: (textutils)unexpand invocation.     Convert spaces to tabs.
-* uniq: (textutils)uniq invocation.             Uniqify files.
+* tr: (textutils)tr invocation.			Translate characters.
+* true: (sh-utils)true invocation.		Do nothing, successfully.
+* tty: (sh-utils)tty invocation.		Print terminal name.
+* txt2gcal: (gcal)Invoking txt2gcal.		Calendar text to resource file.
+* uname: (sh-utils)uname invocation.		Print system information.
+* unexpand: (textutils)unexpand invocation.	Convert spaces to tabs.
+* uniq: (textutils)uniq invocation.		Uniqify files.
 * unshar: (sharutils)unshar invocation.		Extract from shell archive.
 * updatedb: (find)Invoking updatedb.		Building the locate database.
-* users: (sh-utils)users invocation.            Print current user names.
-* vdir: (fileutils)vdir invocation.             List directories verbosely.
+* users: (sh-utils)users invocation.		Print current user names.
+* vdir: (fileutils)vdir invocation.		List directories verbosely.
 * vftovp: (web2c)VFtoVP invocation.		Virtual font -> virtual pl.
 * view-pr: (gnats)Invoking view-pr.		Showing bug reports.
 * virmf: (web2c)virmf invocation.		Virgin Metafont.
 * virmp: (web2c)virmp invocation.		Virgin MetaPost.
 * virtex: (web2c)virtex invocation.		Virgin TeX.
 * vptovf: (web2c)VPtoVF invocation.		Virtual pl -> virtual font.
-* wc: (textutils)wc invocation.                 Byte, word, and line counts.
+* wc: (textutils)wc invocation.			Byte, word, and line counts.
 * weave: (web2c)Weave invocation.		WEB to TeX.
-* who: (sh-utils)who invocation.                Print who is logged in.
-* whoami: (sh-utils)whoami invocation.          Print effective user id.
+* who: (sh-utils)who invocation.		Print who is logged in.
+* whoami: (sh-utils)whoami invocation.		Print effective user id.
 * xargs: (find)Invoking xargs.			Operating on many files.
 * xgettext: (gettext)xgettext Invocation.	Extract strings into a PO file.
-* yes: (sh-utils)yes invocation.                Print a string indefinitely.
+* yes: (sh-utils)yes invocation.		Print a string indefinitely.
 * zcat: (gzip)Overview.				Decompression to stdout.
diff --git a/texinfo/doc/Makefile.am b/texinfo/doc/Makefile.am
index 72eb1b79f03..cd9ae182cb9 100644
--- a/texinfo/doc/Makefile.am
+++ b/texinfo/doc/Makefile.am
@@ -1,11 +1,12 @@
 ## Makefile.am for texinfo/emacs.
-## $Id: Makefile.am,v 1.2 1998/03/24 18:05:32 law Exp $
+## $Id: Makefile.am,v 1.1.1.2 1998/03/24 18:20:38 law Exp $
 ## Run automake in .. to produce Makefile.in from this.
 
-info_TEXINFOS = info-stnd.texi info.texi texinfo.texi
+info_TEXINFOS = info-stnd.texi info.texi texinfo.txi
 
-# Use the makeinfo built in our distribution.
+# Use the programs built in our distribution.
 MAKEINFO = ../makeinfo/makeinfo
+INSTALL_INFO = ../util/install-info
 
 # Include our texinfo.tex, not Automake's.
 EXTRA_DIST = macro.texi userdoc.texi epsf.tex texinfo.tex
@@ -26,10 +27,10 @@ dist-info:
 # since we don't distribute them.
 .texi.info:
 	$(MAKEINFO) -I$(srcdir) `echo $< | sed 's,.*/,,'`
-texinfo: $(srcdir)/texinfo.texi
-	$(MAKEINFO) -I$(srcdir) texinfo.texi
+texinfo: $(srcdir)/texinfo.txi
+	$(MAKEINFO) -I$(srcdir) texinfo.txi
 
-# Do not try to install them from $(srcdir).
+# Similarly, Do not try to install the info files from $(srcdir).
 install-info-am: $(INFO_DEPS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(infodir)
@@ -43,14 +44,14 @@ install-info-am: $(INFO_DEPS)
 	  done; \
 	done
 	@$(POST_INSTALL)
-	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
+	@if $(SHELL) -c '$(INSTALL_INFO) --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
 	  for file in $(INFO_DEPS); do \
-	    echo " install-info --info-dir=$(infodir) $(infodir)/$$file";\
-	    install-info --info-dir=$(infodir) $(infodir)/$$file || :;\
+	    echo " $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/$$file";\
+	    $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/$$file || :;\
 	  done; \
 	else : ; fi
 
 
-# Remove them at make distclean.
+# Remove the info files at make distclean.
 distclean-aminfo:
 	rm -f texinfo texinfo-* info*.info*
diff --git a/texinfo/doc/Makefile.in b/texinfo/doc/Makefile.in
index cd882e78732..c021d3e9ab3 100644
--- a/texinfo/doc/Makefile.in
+++ b/texinfo/doc/Makefile.in
@@ -1,8 +1,14 @@
-# Makefile.in generated automatically by automake 1.2 from Makefile.am
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
 
 SHELL = /bin/sh
@@ -43,27 +49,26 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 DATADIRNAME = @DATADIRNAME@
-EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
+INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
-MAINT = @MAINT@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 PACKAGE = @PACKAGE@
@@ -77,10 +82,11 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 l = @l@
 
-info_TEXINFOS = info-stnd.texi info.texi texinfo.texi
+info_TEXINFOS = info-stnd.texi info.texi texinfo.txi
 
-# Use the makeinfo built in our distribution.
+# Use the programs built in our distribution.
 MAKEINFO = ../makeinfo/makeinfo
+INSTALL_INFO = ../util/install-info
 
 # Include our texinfo.tex, not Automake's.
 EXTRA_DIST = macro.texi userdoc.texi epsf.tex texinfo.tex
@@ -90,11 +96,11 @@ TEXMF = @TEXMF@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
-TEXI2DVI = `if test -f $(top_srcdir)/../texinfo/util/texi2dvi; then echo $(top_srcdir)/../texinfo/util/texi2dvi; else echo texi2dvi; fi`
-TEXINFO_TEX = $(top_srcdir)/../texinfo/texinfo.tex
+TEXI2DVI = texi2dvi
+TEXINFO_TEX = $(srcdir)/texinfo.tex
 INFO_DEPS = info-stnd.info info.info texinfo
 DVIS = info-stnd.dvi info.dvi texinfo.dvi
-TEXINFOS = info-stnd.texi info.texi texinfo.texi
+TEXINFOS = info-stnd.texi info.texi texinfo.txi
 DIST_COMMON =  README $(info_TEXINFOS) Makefile.am Makefile.in \
 texinfo.tex
 
@@ -106,9 +112,9 @@ GZIP = --best
 default: all
 
 .SUFFIXES:
-.SUFFIXES: .dvi .info .ps .texi .texinfo
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus doc/Makefile
+.SUFFIXES: .dvi .info .ps .texi .texinfo .txi
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
@@ -123,31 +129,48 @@ info.info: info.texi $(info_TEXINFOS)
 info.dvi: info.texi $(info_TEXINFOS)
 
 
-texinfo: texinfo.texi
-texinfo.dvi: texinfo.texi
+texinfo: texinfo.txi
+texinfo.dvi: texinfo.txi
 
 
 DVIPS = dvips
 
 .texi.dvi:
-	TEXINPUTS=$(top_srcdir)/../texinfo:$$TEXINPUTS \
+	TEXINPUTS=$(srcdir):$$TEXINPUTS \
 	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
 
 .texi:
-	@rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	$(MAKEINFO) -I $(srcdir) $<
+	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+	cd $(srcdir) \
+	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
 
 .texinfo.info:
-	@rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	$(MAKEINFO) -I $(srcdir) $<
+	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+	cd $(srcdir) \
+	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
 
 .texinfo:
-	@rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	$(MAKEINFO) -I $(srcdir) $<
+	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+	cd $(srcdir) \
+	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
 
 .texinfo.dvi:
-	TEXINPUTS=$(top_srcdir)/../texinfo:$$TEXINPUTS \
+	TEXINPUTS=$(srcdir):$$TEXINPUTS \
+	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
+
+.txi.info:
+	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+	cd $(srcdir) \
+	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
+
+.txi.dvi:
+	TEXINPUTS=$(srcdir):$$TEXINPUTS \
 	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
+
+.txi:
+	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+	cd $(srcdir) \
+	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
 .dvi.ps:
 	$(DVIPS) $< -o $@
 
@@ -157,33 +180,39 @@ uninstall-info:
 	  ii=yes; \
 	else ii=; fi; \
 	for file in $(INFO_DEPS); do \
-	  test -z $ii || install-info --info-dir=$(infodir) --remove $$file; \
+	  test -z "$ii" \
+	    || install-info --info-dir=$(infodir) --remove $$file; \
 	done
-	$(NORMAL_UNINSTALL)
+	@$(NORMAL_UNINSTALL)
 	for file in $(INFO_DEPS); do \
 	  (cd $(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \
 	done
 
 mostlyclean-aminfo:
-	rm -f info-stnd.aux info-stnd.cp info-stnd.cps info-stnd.dvi \
-	  info-stnd.fn info-stnd.fns info-stnd.ky info-stnd.log \
-	  info-stnd.pg info-stnd.toc info-stnd.tp info-stnd.tps \
-	  info-stnd.vr info-stnd.vrs info-stnd.op info-stnd.tr \
-	  info-stnd.cv info.aux info.cp info.cps info.dvi info.fn \
-	  info.fns info.ky info.log info.pg info.toc info.tp info.tps \
-	  info.vr info.vrs info.op info.tr info.cv texinfo.aux \
+	-rm -f info-stnd.aux info-stnd.cp info-stnd.cps info-stnd.dvi \
+	  info-stnd.fn info-stnd.fns info-stnd.ky info-stnd.kys \
+	  info-stnd.ps info-stnd.log info-stnd.pg info-stnd.toc \
+	  info-stnd.tp info-stnd.tps info-stnd.vr info-stnd.vrs \
+	  info-stnd.op info-stnd.tr info-stnd.cv info-stnd.cn info.aux \
+	  info.cp info.cps info.dvi info.fn info.fns info.ky info.kys \
+	  info.ps info.log info.pg info.toc info.tp info.tps info.vr \
+	  info.vrs info.op info.tr info.cv info.cn texinfo.aux \
 	  texinfo.cp texinfo.cps texinfo.dvi texinfo.fn texinfo.fns \
-	  texinfo.ky texinfo.log texinfo.pg texinfo.toc texinfo.tp \
-	  texinfo.tps texinfo.vr texinfo.vrs texinfo.op texinfo.tr \
-	  texinfo.cv
+	  texinfo.ky texinfo.kys texinfo.ps texinfo.log texinfo.pg \
+	  texinfo.toc texinfo.tp texinfo.tps texinfo.vr texinfo.vrs \
+	  texinfo.op texinfo.tr texinfo.cv texinfo.cn
 
 clean-aminfo:
 
 distclean-aminfo:
 
 maintainer-clean-aminfo:
-	for i in $(INFO_DEPS); do rm -f `eval echo $$i*`; done
-clean-info: mostlyclean-aminfo
+	for i in $(INFO_DEPS); do \
+	  rm -f $$i; \
+	  if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \
+	    rm -f $$i-[0-9]*; \
+	  fi; \
+	done
 tags: TAGS
 TAGS:
 
@@ -194,7 +223,7 @@ subdir = doc
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  d=$(srcdir); \
 	  test -f $(distdir)/$$file \
 	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
 	  || cp -p $$d/$$file $(distdir)/$$file; \
@@ -205,45 +234,45 @@ dvi: $(DVIS)
 check: all
 	$(MAKE)
 installcheck:
-install-info: install-info-am
 install-exec: 
 	@$(NORMAL_INSTALL)
 
-install-data: install-data-local
+install-data: install-info-am install-data-local
 	@$(NORMAL_INSTALL)
 
 install: install-exec install-data all
 	@:
 
-uninstall: 
+uninstall: uninstall-info
 
-all: Makefile
+all: Makefile $(INFO_DEPS)
 
 install-strip:
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs:
+	$(mkinstalldirs)  $(infodir)
 
 
 mostlyclean-generic:
-	test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-	test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	rm -f Makefile $(DISTCLEANFILES)
-	rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(DISTCLEANFILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-	test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-aminfo mostlyclean-generic
 
 clean:  clean-aminfo clean-generic mostlyclean
 
 distclean:  distclean-aminfo distclean-generic clean
-	rm -f config.status
+	-rm -f config.status
 
 maintainer-clean:  maintainer-clean-aminfo maintainer-clean-generic \
 		distclean
@@ -252,10 +281,9 @@ maintainer-clean:  maintainer-clean-aminfo maintainer-clean-generic \
 
 .PHONY: default install-info-am uninstall-info mostlyclean-aminfo \
 distclean-aminfo clean-aminfo maintainer-clean-aminfo tags distdir info \
-dvi installcheck install-info install-exec install-data install \
-uninstall all installdirs mostlyclean-generic distclean-generic \
-clean-generic maintainer-clean-generic clean mostlyclean distclean \
-maintainer-clean
+dvi installcheck install-exec install-data install uninstall all \
+installdirs mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
 install-data-local:
@@ -271,10 +299,10 @@ dist-info:
 # since we don't distribute them.
 .texi.info:
 	$(MAKEINFO) -I$(srcdir) `echo $< | sed 's,.*/,,'`
-texinfo: $(srcdir)/texinfo.texi
-	$(MAKEINFO) -I$(srcdir) texinfo.texi
+texinfo: $(srcdir)/texinfo.txi
+	$(MAKEINFO) -I$(srcdir) texinfo.txi
 
-# Do not try to install them from $(srcdir).
+# Similarly, Do not try to install the info files from $(srcdir).
 install-info-am: $(INFO_DEPS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(infodir)
@@ -288,14 +316,14 @@ install-info-am: $(INFO_DEPS)
 	  done; \
 	done
 	@$(POST_INSTALL)
-	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
+	@if $(SHELL) -c '$(INSTALL_INFO) --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
 	  for file in $(INFO_DEPS); do \
-	    echo " install-info --info-dir=$(infodir) $(infodir)/$$file";\
-	    install-info --info-dir=$(infodir) $(infodir)/$$file || :;\
+	    echo " $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/$$file";\
+	    $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/$$file || :;\
 	  done; \
 	else : ; fi
 
-# Remove them at make distclean.
+# Remove the info files at make distclean.
 distclean-aminfo:
 	rm -f texinfo texinfo-* info*.info*
 
diff --git a/texinfo/doc/README b/texinfo/doc/README
index e7518e6be77..fe8e65444f8 100644
--- a/texinfo/doc/README
+++ b/texinfo/doc/README
@@ -1,5 +1,6 @@
 This directory contains documentation on the Texinfo system and the TeX
-sources needed to process Texinfo sources.
+sources needed to process Texinfo sources.  (Use texi2dvi to run a
+Texinfo manual through TeX to produce a DVI file.)
 
 The .tex files are not installed automatically because TeX installations
 vary so widely.  Installing them in the wrong place would give a false
diff --git a/texinfo/doc/info-stnd.texi b/texinfo/doc/info-stnd.texi
index 98df1358f98..2e05bf212ec 100644
--- a/texinfo/doc/info-stnd.texi
+++ b/texinfo/doc/info-stnd.texi
@@ -9,7 +9,7 @@
 @synindex fn cp
 @synindex ky cp
 @comment %**end of header
-@comment $Id: info-stnd.texi,v 1.2 1998/03/24 18:05:36 law Exp $
+@comment $Id: info-stnd.texi,v 1.1.1.2 1998/03/24 18:20:36 law Exp $
 
 @dircategory Texinfo documentation system
 @direntry
diff --git a/texinfo/doc/info.texi b/texinfo/doc/info.texi
index 9e63665a136..41e72954811 100644
--- a/texinfo/doc/info.texi
+++ b/texinfo/doc/info.texi
@@ -3,7 +3,7 @@
 @setfilename info.info
 @settitle Info 1.0
 @comment %**end of header 
-@comment $Id: info.texi,v 1.2 1998/03/24 18:05:37 law Exp $
+@comment $Id: info.texi,v 1.1.1.2 1998/03/24 18:20:37 law Exp $
 
 @dircategory Texinfo documentation system
 @direntry
diff --git a/texinfo/doc/texinfo.tex b/texinfo/doc/texinfo.tex
index 124d337be42..25d2634fd8b 100644
--- a/texinfo/doc/texinfo.tex
+++ b/texinfo/doc/texinfo.tex
@@ -1,32 +1,40 @@
-%% TeX macros to handle Texinfo files.
-%% $Id: texinfo.tex,v 1.2 1998/03/24 18:05:39 law Exp $
-
-%  Copyright (C) 1985, 86, 88, 90, 91, 92, 93,
-%                94, 95, 96, 97 Free Software Foundation, Inc.
-
-%This texinfo.tex file is free software; you can redistribute it and/or
-%modify it under the terms of the GNU General Public License as
-%published by the Free Software Foundation; either version 2, or (at
-%your option) any later version.
-
-%This texinfo.tex file is distributed in the hope that it will be
-%useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-%of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-%General Public License for more details.
-
-%You should have received a copy of the GNU General Public License
-%along with this texinfo.tex file; see the file COPYING.  If not, write
-%to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-%Boston, MA 02111-1307, USA.
-
-
-%In other words, you are welcome to use, share and improve this program.
-%You are forbidden to forbid anyone else to use, share and improve
-%what you give them.   Help stamp out software-hoarding!
-
-
-% Send bug reports to bug-texinfo@prep.ai.mit.edu.
-% Please include a *precise* test case in each bug report.
+% texinfo.tex -- TeX macros to handle Texinfo files.
+% $Id: texinfo.tex,v 1.1.1.2 1998/03/24 18:20:39 law Exp $
+%
+% Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98
+% Free Software Foundation, Inc.
+%
+% This texinfo.tex file is free software; you can redistribute it and/or
+% modify it under the terms of the GNU General Public License as
+% published by the Free Software Foundation; either version 2, or (at
+% your option) any later version.
+%
+% This texinfo.tex file is distributed in the hope that it will be
+% useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+% of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+% General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with this texinfo.tex file; see the file COPYING.  If not, write
+% to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+% Boston, MA 02111-1307, USA.
+%
+% In other words, you are welcome to use, share and improve this program.
+% You are forbidden to forbid anyone else to use, share and improve
+% what you give them.   Help stamp out software-hoarding!
+%
+% Please try the latest version of texinfo.tex before submitting bug
+% reports; you can get the latest version from:
+% ftp://ftp.cs.umb.edu/pub/tex/texinfo.tex
+% /home/gd/gnu/doc/texinfo.tex on the GNU machines.
+% 
+% Send bug reports to bug-texinfo@gnu.org.
+% Please include a precise test case in each bug report,
+% including a complete document with which we can reproduce the problem.
+% 
+% Texinfo macros (with @macro) are *not* supported by texinfo.tex.  You
+% have to run makeinfo -E to expand macros first; the texi2dvi script
+% does this.
 
 
 % Make it possible to create a .fmt file just by loading this file:
@@ -36,7 +44,7 @@
 
 % This automatically updates the version number based on RCS.
 \def\deftexinfoversion$#1: #2 ${\def\texinfoversion{#2}}
-\deftexinfoversion$Revision: 1.2 $
+\deftexinfoversion$Revision: 1.1.1.2 $
 \message{Loading texinfo package [Version \texinfoversion]:}
 
 % If in a .fmt file, print the version number
@@ -54,7 +62,8 @@
 \let\ptexdot=\.
 \let\ptexdots=\dots
 \let\ptexend=\end
-\let\ptexequiv = \equiv
+\let\ptexequiv=\equiv
+\let\ptexexclam=\!
 \let\ptexi=\i
 \let\ptexlbrace=\{
 \let\ptexrbrace=\}
@@ -441,14 +450,11 @@
 % @. is an end-of-sentence period.
 \def\.{.\spacefactor=3000 }
 
-% @enddots{} is an end-of-sentence ellipsis.
-\gdef\enddots{$\mathinner{\ldotp\ldotp\ldotp\ldotp}$\spacefactor=3000}
-
 % @! is an end-of-sentence bang.
-\gdef\!{!\spacefactor=3000 }
+\def\!{!\spacefactor=3000 }
 
 % @? is an end-of-sentence query.
-\gdef\?{?\spacefactor=3000 }
+\def\?{?\spacefactor=3000 }
 
 % @w prevents a word break.  Without the \leavevmode, @w at the
 % beginning of a paragraph, when TeX is still in vertical mode, would
@@ -573,9 +579,27 @@ where each line of input produces a line of output.}
 
 \let\br = \par
 
-% @dots{}  output some dots
+% @dots{} output an ellipsis using the current font.
+% We do .5em per period so that it has the same spacing in a typewriter
+% font as three actual period characters.
+%
+\def\dots{\hbox to 1.5em{%
+  \hskip 0pt plus 0.25fil minus 0.25fil
+  .\hss.\hss.%
+  \hskip 0pt plus 0.5fil minus 0.5fil
+}}
+
+% @enddots{} is an end-of-sentence ellipsis.
+% 
+\def\enddots{%
+  \hbox to 2em{%
+    \hskip 0pt plus 0.25fil minus 0.25fil
+    .\hss.\hss.\hss.%
+    \hskip 0pt plus 0.5fil minus 0.5fil
+  }%
+  \spacefactor=3000
+}
 
-\def\dots{$\ldots$}
 
 % @page    forces the start of a new page
 
@@ -1236,7 +1260,7 @@ where each line of input produces a line of output.}
   \let\tensf=\titlesf \let\teni=\titlei \let\tensy=\titlesy
   \let\tenttsl=\titlettsl
   \resetmathfonts \setleading{25pt}}
-\def\titlefont#1{{\titlefonts #1}}
+\def\titlefont#1{{\titlefonts\rm #1}}
 \def\chapfonts{%
   \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl
   \let\tenbf=\chapbf \let\tentt=\chaptt \let\smallcaps=\chapsc
@@ -1263,6 +1287,10 @@ where each line of input produces a line of output.}
 %
 \textfonts
 
+% Define these so they can be easily changed for other fonts.
+\def\angleleft{$\langle$}
+\def\angleright{$\rangle$}
+
 % Count depth in font-changes, for error checks
 \newcount\fontdepth \fontdepth=0
 
@@ -1300,15 +1328,15 @@ where each line of input produces a line of output.}
   \null
 }
 \let\ttfont=\t
-\def\samp #1{`\tclose{#1}'\null}
+\def\samp#1{`\tclose{#1}'\null}
 \setfont\smallrm\rmshape{8}{1000}
 \font\smallsy=cmsy9
 \def\key#1{{\smallrm\textfont2=\smallsy \leavevmode\hbox{%
-  \raise0.4pt\hbox{$\langle$}\kern-.08em\vtop{%
+  \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
     \vbox{\hrule\kern-0.4pt
-     \hbox{\raise0.4pt\hbox{\vphantom{$\langle$}}#1}}%
+     \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
     \kern-0.4pt\hrule}%
-  \kern-.06em\raise0.4pt\hbox{$\rangle$}}}}
+  \kern-.06em\raise0.4pt\hbox{\angleright}}}}
 % The old definition, with no lozenge:
 %\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null}
 \def\ctrl #1{{\tt \rawbackslash \hat}#1}
@@ -1421,7 +1449,7 @@ where each line of input produces a line of output.}
 
 % rms does not like the angle brackets --karl, 17may97.
 % So now @email is just like @uref.
-%\def\email#1{$\langle${\tt #1}$\rangle$}
+%\def\email#1{\angleleft{\tt #1}\angleright}
 \let\email=\uref
 
 % Check if we are currently using a typewriter font.  Since all the
@@ -2043,10 +2071,7 @@ July\or August\or September\or October\or November\or December\fi
 % @multitablelinespace is space to leave between table items, baseline
 %                                                            to baseline.
 %   0pt means it depends on current normal line spacing.
-
-%%%%
-% Dimensions
-
+%
 \newskip\multitableparskip
 \newskip\multitableparindent
 \newdimen\multitablecolspace
@@ -2056,15 +2081,15 @@ July\or August\or September\or October\or November\or December\fi
 \multitablecolspace=12pt
 \multitablelinespace=0pt
 
-%%%%
 % Macros used to set up halign preamble:
+% 
 \let\endsetuptable\relax
 \def\xendsetuptable{\endsetuptable}
 \let\columnfractions\relax
 \def\xcolumnfractions{\columnfractions}
 \newif\ifsetpercent
 
-%% 2/1/96, to allow fractions to be given with more than one digit.
+% 2/1/96, to allow fractions to be given with more than one digit.
 \def\pickupwholefraction#1 {\global\advance\colcount by1 %
 \expandafter\xdef\csname col\the\colcount\endcsname{.#1\hsize}%
 \setuptable}
@@ -2090,80 +2115,84 @@ July\or August\or September\or October\or November\or December\fi
 \ifx\go\pickupwholefraction\else\let\go\setuptable\fi%
 \fi\go}
 
-%%%%
 % multitable syntax
 \def\tab{&\hskip1sp\relax} % 2/2/96
                            % tiny skip here makes sure this column space is
                            % maintained, even if it is never used.
 
-
-%%%%
 % @multitable ... @end multitable definitions:
 
 \def\multitable{\parsearg\dotable}
-
 \def\dotable#1{\bgroup
-\let\item\cr
-\tolerance=9500
-\hbadness=9500
-\setmultitablespacing
-\parskip=\multitableparskip
-\parindent=\multitableparindent
-\overfullrule=0pt
-\global\colcount=0\relax%
-\def\Emultitable{\global\setpercentfalse\global\everycr{}\cr\egroup\egroup}%
- % To parse everything between @multitable and @item :
-\setuptable#1 \endsetuptable
- % Need to reset this to 0 after \setuptable.
-\global\colcount=0\relax%
- %
- % This preamble sets up a generic column definition, which will
- % be used as many times as user calls for columns.
- % \vtop will set a single line and will also let text wrap and
- % continue for many paragraphs if desired.
-\halign\bgroup&\global\advance\colcount by 1\relax%
-\multistrut\vtop{\hsize=\expandafter\csname col\the\colcount\endcsname
- % In order to keep entries from bumping into each other
- % we will add a \leftskip of \multitablecolspace to all columns after
- % the first one.
- %  If a template has been used, we will add \multitablecolspace
- % to the width of each template entry.
- %  If user has set preamble in terms of percent of \hsize
- % we will use that dimension as the width of the column, and
- % the \leftskip will keep entries from bumping into each other.
- % Table will start at left margin and final column will justify at
- % right margin.
-\ifnum\colcount=1
-\else
-  \ifsetpercent
+  \vskip\parskip
+  \let\item\crcr
+  \tolerance=9500
+  \hbadness=9500
+  \setmultitablespacing
+  \parskip=\multitableparskip
+  \parindent=\multitableparindent
+  \overfullrule=0pt
+  \global\colcount=0
+  \def\Emultitable{\global\setpercentfalse\cr\egroup\egroup}%
+  %
+  % To parse everything between @multitable and @item:
+  \setuptable#1 \endsetuptable
+  %
+  % \everycr will reset column counter, \colcount, at the end of
+  % each line. Every column entry will cause \colcount to advance by one.
+  % The table preamble
+  % looks at the current \colcount to find the correct column width.
+  \everycr{\noalign{%
+  %
+  % \filbreak%% keeps underfull box messages off when table breaks over pages.
+  % Maybe so, but it also creates really weird page breaks when the table
+  % breaks over pages. Wouldn't \vfil be better?  Wait until the problem
+  % manifests itself, so it can be fixed for real --karl.
+    \global\colcount=0\relax}}%
+  %
+  % This preamble sets up a generic column definition, which will
+  % be used as many times as user calls for columns.
+  % \vtop will set a single line and will also let text wrap and
+  % continue for many paragraphs if desired.
+  \halign\bgroup&\global\advance\colcount by 1\relax
+    \multistrut\vtop{\hsize=\expandafter\csname col\the\colcount\endcsname
+  %
+  % In order to keep entries from bumping into each other
+  % we will add a \leftskip of \multitablecolspace to all columns after
+  % the first one.
+  % 
+  % If a template has been used, we will add \multitablecolspace
+  % to the width of each template entry.
+  % 
+  % If the user has set preamble in terms of percent of \hsize we will
+  % use that dimension as the width of the column, and the \leftskip
+  % will keep entries from bumping into each other.  Table will start at
+  % left margin and final column will justify at right margin.
+  % 
+  % Make sure we don't inherit \rightskip from the outer environment.
+  \rightskip=0pt
+  \ifnum\colcount=1
+    % The first column will be indented with the surrounding text.
+    \advance\hsize by\leftskip
   \else
-   % If user has <not> set preamble in terms of percent of \hsize
-   % we will advance \hsize by \multitablecolspace
-  \advance\hsize by \multitablecolspace
+    \ifsetpercent \else
+      % If user has not set preamble in terms of percent of \hsize
+      % we will advance \hsize by \multitablecolspace.
+      \advance\hsize by \multitablecolspace
+    \fi
+   % In either case we will make \leftskip=\multitablecolspace:
+  \leftskip=\multitablecolspace
   \fi
- % In either case we will make \leftskip=\multitablecolspace:
-\leftskip=\multitablecolspace
-\fi
- % Ignoring space at the beginning and end avoids an occasional spurious
- % blank line, when TeX decides to break the line at the space before the
- % box from the multistrut, so the strut ends up on a line by itself.
- % For example:
- % @multitable @columnfractions .11 .89
- % @item @code{#}
- % @tab Legal holiday which is valid in major parts of the whole country.
- % Is automatically provided with highlighting sequences respectively marking
- % characters.
- \noindent\ignorespaces##\unskip\multistrut}\cr
- % \everycr will reset column counter, \colcount, at the end of
- % each line. Every column  entry will cause \colcount to advance by one.
- % The table preamble
- % looks at the current \colcount to find the correct column width.
-\global\everycr{\noalign{%
-% \filbreak%% keeps underfull box messages off when table breaks over pages.
-% Maybe so, but it also creates really weird page breaks when the table
-% breaks over pages Wouldn't \vfil be better?  Wait until the problem
-% manifests itself, so it can be fixed for real --karl.
-\global\colcount=0\relax}}
+  % Ignoring space at the beginning and end avoids an occasional spurious
+  % blank line, when TeX decides to break the line at the space before the
+  % box from the multistrut, so the strut ends up on a line by itself.
+  % For example:
+  % @multitable @columnfractions .11 .89
+  % @item @code{#}
+  % @tab Legal holiday which is valid in major parts of the whole country.
+  % Is automatically provided with highlighting sequences respectively marking
+  % characters.
+  \noindent\ignorespaces##\unskip\multistrut}\cr
 }
 
 \def\setmultitablespacing{% test to see if user has set \multitablelinespace.
@@ -2510,6 +2539,11 @@ width0pt\relax} \fi
   \indexbreaks
   %
   % See if the index file exists and is nonempty.
+  % Change catcode of @ here so that if the index file contains
+  % \initial {@}
+  % as its first line, TeX doesn't complain about mismatched braces
+  % (because it thinks @} is a control sequence).
+  \catcode`\@ = 11
   \openin 1 \jobname.#1s
   \ifeof 1
     % \enddoublecolumns gets confused if there is no text in the index,
@@ -2531,7 +2565,6 @@ width0pt\relax} \fi
       % to make right now.
       \def\indexbackslash{\rawbackslashxx}%
       \catcode`\\ = 0
-      \catcode`\@ = 11
       \escapechar = `\\
       \begindoublecolumns
       \input \jobname.#1s
@@ -3427,11 +3460,12 @@ width0pt\relax} \fi
 % the index entries, but we want to suppress hyphenation here.  (We
 % can't do that in the \entry macro, since index entries might consist
 % of hyphenated-identifiers-that-do-not-fit-on-a-line-and-nothing-else.)
-%
-% \turnoffactive is for the sake of @" used for umlauts.
 \def\tocentry#1#2{\begingroup
   \vskip 0pt plus1pt % allow a little stretch for the sake of nice page breaks
-  \entry{\turnoffactive #1}{\turnoffactive #2}%
+  % Do not use \turnoffactive in these arguments.  Since the toc is
+  % typeset in cmr, so characters such as _ would come out wrong; we
+  % have to do the usual translation tricks.
+  \entry{#1}{#2}%
 \endgroup}
 
 % Space between chapter (or whatever) number and the title.
@@ -3497,30 +3531,35 @@ width0pt\relax} \fi
 % But \@ or @@ will get a plain tex @ character.
 
 \def\tex{\begingroup
-\catcode `\\=0 \catcode `\{=1 \catcode `\}=2
-\catcode `\$=3 \catcode `\&=4 \catcode `\#=6
-\catcode `\^=7 \catcode `\_=8 \catcode `\~=13 \let~=\tie
-\catcode `\%=14
-\catcode 43=12 % plus
-\catcode`\"=12
-\catcode`\==12
-\catcode`\|=12
-\catcode`\<=12
-\catcode`\>=12
-\escapechar=`\\
-%
-\let\,=\ptexcomma
-\let\{=\ptexlbrace
-\let\}=\ptexrbrace
-\let\.=\ptexdot
-\let\*=\ptexstar
-\let\dots=\ptexdots
-\def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}%
-\def\enddots{\relax\ifmmode\endldots\else$\mathsurround=0pt \endldots\,$\fi}%
-\def\@{@}%
-\let\bullet=\ptexbullet
-\let\b=\ptexb \let\c=\ptexc \let\i=\ptexi \let\t=\ptext
-%
+  \catcode `\\=0 \catcode `\{=1 \catcode `\}=2
+  \catcode `\$=3 \catcode `\&=4 \catcode `\#=6
+  \catcode `\^=7 \catcode `\_=8 \catcode `\~=13 \let~=\tie
+  \catcode `\%=14
+  \catcode 43=12 % plus
+  \catcode`\"=12
+  \catcode`\==12
+  \catcode`\|=12
+  \catcode`\<=12
+  \catcode`\>=12
+  \escapechar=`\\
+  %
+  \let\b=\ptexb
+  \let\bullet=\ptexbullet
+  \let\c=\ptexc
+  \let\,=\ptexcomma
+  \let\.=\ptexdot
+  \let\dots=\ptexdots
+  \let\equiv=\ptexequiv
+  \let\!=\ptexexclam
+  \let\i=\ptexi
+  \let\{=\ptexlbrace
+  \let\}=\ptexrbrace
+  \let\*=\ptexstar
+  \let\t=\ptext
+  %
+  \def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}%
+  \def\enddots{\relax\ifmmode\endldots\else$\mathsurround=0pt \endldots\,$\fi}%
+  \def\@{@}%
 \let\Etex=\endgroup}
 
 % Define @lisp ... @endlisp.
@@ -4373,7 +4412,7 @@ width0pt\relax} \fi
 \def\refx#1#2{%
   \expandafter\ifx\csname X#1\endcsname\relax
     % If not defined, say something at least.
-    $\langle$un\-de\-fined$\rangle$%
+    \angleleft un\-de\-fined\angleright
     \ifhavexrefs
       \message{\linenumber Undefined cross reference `#1'.}%
     \else
@@ -4390,10 +4429,13 @@ width0pt\relax} \fi
 }
 
 % This is the macro invoked by entries in the aux file.
-\def\xrdef #1#2{{%
-  \catcode`\'=\other
-  \expandafter\gdef\csname X#1\endcsname{#2}%
-}}
+% 
+\def\xrdef#1{\begingroup
+  % Reenable \ as an escape while reading the second argument.
+  \catcode`\\ = 0
+  \afterassignment\endgroup
+  \expandafter\gdef\csname X#1\endcsname
+}
 
 % Read the last existing aux file, if any.  No error if none exists.
 \def\readauxfile{\begingroup
@@ -4617,7 +4659,7 @@ width0pt\relax} \fi
 % Check for and read epsf.tex up front.  If we read it only at @image
 % time, we might be inside a group, and then its definitions would get
 % undone and the next image would fail.
-\openin 1 = xepsf.tex
+\openin 1 = epsf.tex
 \ifeof 1 \else
   \closein 1
   \def\epsfannounce{\toks0 = }% do not bother showing banner
diff --git a/texinfo/info/Makefile.am b/texinfo/info/Makefile.am
index 15db3668cc6..47073ae3343 100644
--- a/texinfo/info/Makefile.am
+++ b/texinfo/info/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile.am for texinfo/info.
-## $Id: Makefile.am,v 1.2 1998/03/24 18:05:58 law Exp $
+## $Id: Makefile.am,v 1.1.1.2 1998/03/24 18:20:06 law Exp $
 ## Run automake in .. to produce Makefile.in from this.
 
 noinst_PROGRAMS = makedoc
@@ -13,7 +13,10 @@ transform = s/ginfo/info/; @program_transform_name@
 localedir = $(datadir)/locale
 
 # -I. for funs.h.
-INCLUDES = -I. -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
+# Automake puts -I.. and -I$(srcdir) into DEFS by default, but
+# we need to override it, so include them ourselves.
+INCLUDES = -I. -I$(top_srcdir)/lib -I../intl -I.. -I$(srcdir)
+DEFS = -DINFODIR=\"$(infodir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@
 LDADD = ../lib/libtxi.a @TERMLIBS@ @INTLLIBS@
 
 makedoc_SOURCES = makedoc.c
@@ -32,13 +35,11 @@ EXTRA_DIST = README
 # files which contain DECLARE_INFO_COMMAND.  `funs.h' is a header file
 # listing the functions found.  `doc.c' is a structure containing pointers
 # to those functions along with completable names and documentation strings.
-# 
-# I do not know how to get this right.
-# BUILT_SOURCES = doc.c funs.h
-#
-#cmd_sources = $(srcdir)/session.c $(srcdir)/echo-area.c $(srcdir)/infodoc.c \
-#  $(srcdir)/m-x.c $(srcdir)/indices.c $(srcdir)/nodemenu.c \
-#  $(srcdir)/footnotes.c $(srcdir)/variables.c
-#
-#$(BUILTSOURCES): makedoc $(cmd_sources)
-#	./makedoc $(cmd_sources)
+BUILT_SOURCES = doc.c funs.h
+
+cmd_sources = $(srcdir)/session.c $(srcdir)/echo-area.c $(srcdir)/infodoc.c \
+  $(srcdir)/m-x.c $(srcdir)/indices.c $(srcdir)/nodemenu.c \
+  $(srcdir)/footnotes.c $(srcdir)/variables.c
+
+$(BUILT_SOURCES): makedoc $(cmd_sources)
+	./makedoc $(cmd_sources)
diff --git a/texinfo/info/Makefile.in b/texinfo/info/Makefile.in
index 24c555e3459..c71d31959ec 100644
--- a/texinfo/info/Makefile.in
+++ b/texinfo/info/Makefile.in
@@ -1,8 +1,14 @@
-# Makefile.in generated automatically by automake 1.2 from Makefile.am
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
 
 SHELL = /bin/sh
@@ -42,27 +48,26 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 DATADIRNAME = @DATADIRNAME@
-EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
+INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -89,7 +94,10 @@ transform = s/ginfo/info/; @program_transform_name@
 localedir = $(datadir)/locale
 
 # -I. for funs.h.
-INCLUDES = -I. -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
+# Automake puts -I.. and -I$(srcdir) into DEFS by default, but
+# we need to override it, so include them ourselves.
+INCLUDES = -I. -I$(top_srcdir)/lib -I../intl -I.. -I$(srcdir)
+DEFS = -DINFODIR=\"$(infodir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@
 LDADD = ../lib/libtxi.a @TERMLIBS@ @INTLLIBS@
 
 makedoc_SOURCES = makedoc.c
@@ -103,15 +111,21 @@ ginfo_SOURCES = dir.c display.c display.h doc.c doc.h dribble.c dribble.h \
   variables.c variables.h window.c window.h
 
 EXTRA_DIST = README
+
+# The files `doc.c' and `funs.h' are created by ./makedoc run over the source
+# files which contain DECLARE_INFO_COMMAND.  `funs.h' is a header file
+# listing the functions found.  `doc.c' is a structure containing pointers
+# to those functions along with completable names and documentation strings.
+BUILT_SOURCES = doc.c funs.h
+
+cmd_sources = $(srcdir)/session.c $(srcdir)/echo-area.c $(srcdir)/infodoc.c \
+  $(srcdir)/m-x.c $(srcdir)/indices.c $(srcdir)/nodemenu.c \
+  $(srcdir)/footnotes.c $(srcdir)/variables.c
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
-bin_PROGRAMS =  ginfo$(EXEEXT)
-noinst_PROGRAMS =  makedoc$(EXEEXT)
 PROGRAMS =  $(bin_PROGRAMS) $(noinst_PROGRAMS)
 
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I..
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
@@ -142,9 +156,9 @@ OBJECTS = $(ginfo_OBJECTS) $(makedoc_OBJECTS)
 default: all
 
 .SUFFIXES:
-.SUFFIXES: .c .o
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus info/Makefile
+.SUFFIXES: .S .c .o .s
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps info/Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
@@ -154,7 +168,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 mostlyclean-binPROGRAMS:
 
 clean-binPROGRAMS:
-	test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 
 distclean-binPROGRAMS:
 
@@ -171,7 +185,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	done
 
 uninstall-binPROGRAMS:
-	$(NORMAL_UNINSTALL)
+	@$(NORMAL_UNINSTALL)
 	list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \
 	done
@@ -179,7 +193,7 @@ uninstall-binPROGRAMS:
 mostlyclean-noinstPROGRAMS:
 
 clean-noinstPROGRAMS:
-	test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
 
 distclean-noinstPROGRAMS:
 
@@ -188,41 +202,52 @@ maintainer-clean-noinstPROGRAMS:
 .c.o:
 	$(COMPILE) -c $<
 
+.s.o:
+	$(COMPILE) -c $<
+
+.S.o:
+	$(COMPILE) -c $<
+
 mostlyclean-compile:
-	rm -f *.o core
+	-rm -f *.o core *.core
 
 clean-compile:
 
 distclean-compile:
-	rm -f *.tab.c
+	-rm -f *.tab.c
 
 maintainer-clean-compile:
 
-ginfo$(EXEEXT): $(ginfo_OBJECTS) $(ginfo_DEPENDENCIES)
-	@rm -f ginfo$(EXEEXT)
+ginfo: $(ginfo_OBJECTS) $(ginfo_DEPENDENCIES)
+	@rm -f ginfo
 	$(LINK) $(ginfo_LDFLAGS) $(ginfo_OBJECTS) $(ginfo_LDADD) $(LIBS)
 
-makedoc$(EXEEXT): $(makedoc_OBJECTS) $(makedoc_DEPENDENCIES)
-	@rm -f makedoc$(EXEEXT)
+makedoc: $(makedoc_OBJECTS) $(makedoc_DEPENDENCIES)
+	@rm -f makedoc
 	$(LINK) $(makedoc_LDFLAGS) $(makedoc_OBJECTS) $(makedoc_LDADD) $(LIBS)
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES)
-	here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS)
+ID: $(HEADERS) $(SOURCES) $(LISP)
+	here=`pwd` && cd $(srcdir) \
+	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $(SOURCES) $(HEADERS) -o $$here/TAGS)
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 
 clean-tags:
 
 distclean-tags:
-	rm -f TAGS ID
+	-rm -f TAGS ID
 
 maintainer-clean-tags:
 
@@ -232,17 +257,112 @@ subdir = info
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  d=$(srcdir); \
 	  test -f $(distdir)/$$file \
 	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
 	  || cp -p $$d/$$file $(distdir)/$$file; \
 	done
+dir.o: dir.c info.h ../lib/system.h ../config.h filesys.h display.h \
+	info-utils.h nodes.h window.h infomap.h search.h terminal.h \
+	session.h dribble.h echo-area.h doc.h footnotes.h gc.h tilde.h
+display.o: display.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h
+doc.o: doc.c doc.h info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h footnotes.h gc.h \
+	funs.h
+dribble.o: dribble.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h
+echo-area.o: echo-area.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h
+filesys.o: filesys.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h tilde.h
+footnotes.o: footnotes.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h
+gc.o: gc.c info.h ../lib/system.h ../config.h filesys.h display.h \
+	info-utils.h nodes.h window.h infomap.h search.h terminal.h \
+	session.h dribble.h echo-area.h doc.h footnotes.h gc.h
+indices.o: indices.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h indices.h
+info-utils.o: info-utils.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h man.h
+info.o: info.c info.h ../lib/system.h ../config.h filesys.h display.h \
+	info-utils.h nodes.h window.h infomap.h search.h terminal.h \
+	session.h dribble.h echo-area.h doc.h footnotes.h gc.h \
+	indices.h ../lib/getopt.h man.h
+infodoc.o: infodoc.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h
+infomap.o: infomap.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h funs.h
+m-x.o: m-x.c info.h ../lib/system.h ../config.h filesys.h display.h \
+	info-utils.h nodes.h window.h infomap.h search.h terminal.h \
+	session.h dribble.h echo-area.h doc.h footnotes.h gc.h
+makedoc.o: makedoc.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h
+man.o: man.c info.h ../lib/system.h ../config.h filesys.h display.h \
+	info-utils.h nodes.h window.h infomap.h search.h terminal.h \
+	session.h dribble.h echo-area.h doc.h footnotes.h gc.h \
+	signals.h tilde.h man.h
+nodemenu.o: nodemenu.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h
+nodes.o: nodes.c info.h ../lib/system.h ../config.h filesys.h display.h \
+	info-utils.h nodes.h window.h infomap.h search.h terminal.h \
+	session.h dribble.h echo-area.h doc.h footnotes.h gc.h man.h
+search.o: search.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h
+session.o: session.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h man.h
+signals.o: signals.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h signals.h
+terminal.o: terminal.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h termdep.h
+tilde.o: tilde.c info.h ../lib/system.h ../config.h filesys.h display.h \
+	info-utils.h nodes.h window.h infomap.h search.h terminal.h \
+	session.h dribble.h echo-area.h doc.h footnotes.h gc.h
+variables.o: variables.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h variables.h
+window.o: window.c info.h ../lib/system.h ../config.h filesys.h \
+	display.h info-utils.h nodes.h window.h infomap.h search.h \
+	terminal.h session.h dribble.h echo-area.h doc.h footnotes.h \
+	gc.h
+
 info:
 dvi:
 check: all
 	$(MAKE)
 installcheck:
-install-info:
 install-exec: install-binPROGRAMS
 	@$(NORMAL_INSTALL)
 
@@ -263,19 +383,19 @@ installdirs:
 
 
 mostlyclean-generic:
-	test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-	test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	rm -f Makefile $(DISTCLEANFILES)
-	rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(DISTCLEANFILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-	test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-binPROGRAMS mostlyclean-noinstPROGRAMS \
 		mostlyclean-compile mostlyclean-tags \
 		mostlyclean-generic
@@ -286,7 +406,7 @@ clean:  clean-binPROGRAMS clean-noinstPROGRAMS clean-compile clean-tags \
 distclean:  distclean-binPROGRAMS distclean-noinstPROGRAMS \
 		distclean-compile distclean-tags distclean-generic \
 		clean
-	rm -f config.status
+	-rm -f config.status
 
 maintainer-clean:  maintainer-clean-binPROGRAMS \
 		maintainer-clean-noinstPROGRAMS \
@@ -302,25 +422,13 @@ clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile tags mostlyclean-tags distclean-tags \
 clean-tags maintainer-clean-tags distdir info dvi installcheck \
-install-info install-exec install-data install uninstall all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
+install-exec install-data install uninstall all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-# The files `doc.c' and `funs.h' are created by ./makedoc run over the source
-# files which contain DECLARE_INFO_COMMAND.  `funs.h' is a header file
-# listing the functions found.  `doc.c' is a structure containing pointers
-# to those functions along with completable names and documentation strings.
-# 
-# I do not know how to get this right.
-# BUILT_SOURCES = doc.c funs.h
-#
-#cmd_sources = $(srcdir)/session.c $(srcdir)/echo-area.c $(srcdir)/infodoc.c \
-#  $(srcdir)/m-x.c $(srcdir)/indices.c $(srcdir)/nodemenu.c \
-#  $(srcdir)/footnotes.c $(srcdir)/variables.c
-#
-#$(BUILTSOURCES): makedoc $(cmd_sources)
-#	./makedoc $(cmd_sources)
+$(BUILT_SOURCES): makedoc $(cmd_sources)
+	./makedoc $(cmd_sources)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/texinfo/info/README b/texinfo/info/README
index 90d3e2cd522..7e1ab327b99 100644
--- a/texinfo/info/README
+++ b/texinfo/info/README
@@ -6,8 +6,7 @@ maintain, and thus decided to write this one.
 
 The rewrite consists of about 12,000 lines of code written in about 12
 days.  I believe this version of Info to be in much better shape than the
-original Info, and the only reason it is in Beta test is because of its
-short life span.
+original Info.
 
 Info 2.0 is substantially different from its original standalone
 predecessor.  It appears almost identical to the GNU Emacs version, but has
@@ -24,8 +23,4 @@ A full listing of the commands available in Info can be gotten by typing
 `?' while within an Info window.  This produces a node in a window which
 can be viewed just like any Info node.
 
-Please send your comments, bug reports, and suggestions to
-
-	bug-texinfo@prep.ai.mit.edu
-
---Brian Fox <bfox@ai.mit.edu>
+--Brian Fox <bfox@gnu.org>
diff --git a/texinfo/info/doc.c b/texinfo/info/doc.c
index 3859b7fd66a..67383960112 100644
--- a/texinfo/info/doc.c
+++ b/texinfo/info/doc.c
@@ -24,106 +24,106 @@
 FUNCTION_DOC function_doc_array[] = {
 
 /* Commands found in "./session.c". */
-   { info_next_line, "next-line", N_("Move down to the next line") },
-   { info_prev_line, "prev-line", N_("Move up to the previous line") },
-   { info_end_of_line, "end-of-line", N_("Move to the end of the line") },
-   { info_beginning_of_line, "beginning-of-line", N_("Move to the start of the line") },
-   { info_forward_char, "forward-char", N_("Move forward a character") },
-   { info_backward_char, "backward-char", N_("Move backward a character") },
-   { info_forward_word, "forward-word", N_("Move forward a word") },
-   { info_backward_word, "backward-word", N_("Move backward a word") },
-   { info_global_next_node, "global-next-node", N_("Move forwards or down through node structure") },
-   { info_global_prev_node, "global-prev-node", N_("Move backwards or up through node structure") },
-   { info_scroll_forward, "scroll-forward", N_("Scroll forward in this window") },
-   { info_scroll_backward, "scroll-backward", N_("Scroll backward in this window") },
-   { info_beginning_of_node, "beginning-of-node", N_("Move to the start of this node") },
-   { info_end_of_node, "end-of-node", N_("Move to the end of this node") },
-   { info_next_window, "next-window", N_("Select the next window") },
-   { info_prev_window, "prev-window", N_("Select the previous window") },
-   { info_split_window, "split-window", N_("Split the current window") },
-   { info_delete_window, "delete-window", N_("Delete the current window") },
-   { info_keep_one_window, "keep-one-window", N_("Delete all other windows") },
-   { info_scroll_other_window, "scroll-other-window", N_("Scroll the other window") },
-   { info_grow_window, "grow-window", N_("Grow (or shrink) this window") },
-   { info_tile_windows, "tile-windows", N_("Divide the available screen space among the visible windows") },
-   { info_toggle_wrap, "toggle-wrap", N_("Toggle the state of line wrapping in the current window") },
-   { info_next_node, "next-node", N_("Select the `Next' node") },
-   { info_prev_node, "prev-node", N_("Select the `Prev' node") },
-   { info_up_node, "up-node", N_("Select the `Up' node") },
-   { info_last_node, "last-node", N_("Select the last node in this file") },
-   { info_first_node, "first-node", N_("Select the first node in this file") },
-   { info_history_node, "history-node", N_("Select the most recently selected node") },
-   { info_last_menu_item, "last-menu-item", N_("Select the last item in this node's menu") },
-   { info_menu_digit, "menu-digit", N_("Select this menu item") },
-   { info_menu_item, "menu-item", N_("Read a menu item and select its node") },
-   { info_xref_item, "xref-item", N_("Read a footnote or cross reference and select its node") },
-   { info_find_menu, "find-menu", N_("Move to the start of this node's menu") },
-   { info_visit_menu, "visit-menu", N_("Visit as many menu items at once as possible") },
-   { info_goto_node, "goto-node", N_("Read a node name and select it") },
-   { info_man, "man", N_("Read a manpage reference and select it") },
-   { info_top_node, "top-node", N_("Select the node `Top' in this file") },
-   { info_dir_node, "dir-node", N_("Select the node `(dir)'") },
-   { info_kill_node, "kill-node", N_("Kill this node") },
-   { info_view_file, "view-file", N_("Read the name of a file and select it") },
-   { info_print_node, "print-node", N_("Pipe the contents of this node through INFO_PRINT_COMMAND") },
-   { info_search, "search", N_("Read a string and search for it") },
-   { isearch_forward, "isearch-forward", N_("Search interactively for a string as you type it") },
-   { isearch_backward, "isearch-backward", N_("Search interactively for a string as you type it") },
-   { info_move_to_prev_xref, "move-to-prev-xref", N_("Move to the previous cross reference") },
-   { info_move_to_next_xref, "move-to-next-xref", N_("Move to the next cross reference") },
-   { info_select_reference_this_line, "select-reference-this-line", N_("Select reference or menu item appearing on this line") },
-   { info_abort_key, "abort-key", N_("Cancel current operation") },
-   { info_move_to_window_line, "move-to-window-line", N_("Move to the cursor to a specific line of the window") },
-   { info_redraw_display, "redraw-display", N_("Redraw the display") },
-   { info_quit, "quit", N_("Quit using Info") },
+   { info_next_line, "next-line", "Move down to the next line" },
+   { info_prev_line, "prev-line", "Move up to the previous line" },
+   { info_end_of_line, "end-of-line", "Move to the end of the line" },
+   { info_beginning_of_line, "beginning-of-line", "Move to the start of the line" },
+   { info_forward_char, "forward-char", "Move forward a character" },
+   { info_backward_char, "backward-char", "Move backward a character" },
+   { info_forward_word, "forward-word", "Move forward a word" },
+   { info_backward_word, "backward-word", "Move backward a word" },
+   { info_global_next_node, "global-next-node", "Move forwards or down through node structure" },
+   { info_global_prev_node, "global-prev-node", "Move backwards or up through node structure" },
+   { info_scroll_forward, "scroll-forward", "Scroll forward in this window" },
+   { info_scroll_backward, "scroll-backward", "Scroll backward in this window" },
+   { info_beginning_of_node, "beginning-of-node", "Move to the start of this node" },
+   { info_end_of_node, "end-of-node", "Move to the end of this node" },
+   { info_next_window, "next-window", "Select the next window" },
+   { info_prev_window, "prev-window", "Select the previous window" },
+   { info_split_window, "split-window", "Split the current window" },
+   { info_delete_window, "delete-window", "Delete the current window" },
+   { info_keep_one_window, "keep-one-window", "Delete all other windows" },
+   { info_scroll_other_window, "scroll-other-window", "Scroll the other window" },
+   { info_grow_window, "grow-window", "Grow (or shrink) this window" },
+   { info_tile_windows, "tile-windows", "Divide the available screen space among the visible windows" },
+   { info_toggle_wrap, "toggle-wrap", "Toggle the state of line wrapping in the current window" },
+   { info_next_node, "next-node", "Select the `Next' node" },
+   { info_prev_node, "prev-node", "Select the `Prev' node" },
+   { info_up_node, "up-node", "Select the `Up' node" },
+   { info_last_node, "last-node", "Select the last node in this file" },
+   { info_first_node, "first-node", "Select the first node in this file" },
+   { info_last_menu_item, "last-menu-item", "Select the last item in this node's menu" },
+   { info_menu_digit, "menu-digit", "Select this menu item" },
+   { info_menu_item, "menu-item", "Read a menu item and select its node" },
+   { info_xref_item, "xref-item", "Read a footnote or cross reference and select its node" },
+   { info_find_menu, "find-menu", "Move to the start of this node's menu" },
+   { info_visit_menu, "visit-menu", "Visit as many menu items at once as possible" },
+   { info_goto_node, "goto-node", "Read a node name and select it" },
+   { info_man, "man", "Read a manpage reference and select it" },
+   { info_top_node, "top-node", "Select the node `Top' in this file" },
+   { info_dir_node, "dir-node", "Select the node `(dir)'" },
+   { info_history_node, "history-node", "Select the most recently selected node" },
+   { info_kill_node, "kill-node", "Kill this node" },
+   { info_view_file, "view-file", "Read the name of a file and select it" },
+   { info_print_node, "print-node", "Pipe the contents of this node through INFO_PRINT_COMMAND" },
+   { info_search, "search", "Read a string and search for it" },
+   { isearch_forward, "isearch-forward", "Search interactively for a string as you type it" },
+   { isearch_backward, "isearch-backward", "Search interactively for a string as you type it" },
+   { info_move_to_prev_xref, "move-to-prev-xref", "Move to the previous cross reference" },
+   { info_move_to_next_xref, "move-to-next-xref", "Move to the next cross reference" },
+   { info_select_reference_this_line, "select-reference-this-line", "Select reference or menu item appearing on this line" },
+   { info_abort_key, "abort-key", "Cancel current operation" },
+   { info_move_to_window_line, "move-to-window-line", "Move to the cursor to a specific line of the window" },
+   { info_redraw_display, "redraw-display", "Redraw the display" },
+   { info_quit, "quit", "Quit using Info" },
    { info_do_lowercase_version, "do-lowercase-version", "" },
-   { info_add_digit_to_numeric_arg, "add-digit-to-numeric-arg", N_("Add this digit to the current numeric argument") },
-   { info_universal_argument, N_("universal-argument"), N_("Start (or multiply by 4) the current numeric argument") },
-   { info_numeric_arg_digit_loop, "numeric-arg-digit-loop", N_("Internally used by \\[universal-argument]") },
+   { info_add_digit_to_numeric_arg, "add-digit-to-numeric-arg", "Add this digit to the current numeric argument" },
+   { info_universal_argument, "universal-argument", "Start (or multiply by 4) the current numeric argument" },
+   { info_numeric_arg_digit_loop, "numeric-arg-digit-loop", "Internally used by \\[universal-argument]" },
 /* Commands found in "./echo-area.c". */
-   { ea_forward, "echo-area-forward", N_("Move forward a character") },
-   { ea_backward, "echo-area-backward", N_("Move backward a character") },
-   { ea_beg_of_line, "echo-area-beg-of-line", N_("Move to the start of this line") },
-   { ea_end_of_line, "echo-area-end-of-line", N_("Move to the end of this line") },
-   { ea_forward_word, "echo-area-forward-word", N_("Move forward a word") },
-   { ea_backward_word, "echo-area-backward-word", N_("Move backward a word") },
-   { ea_delete, "echo-area-delete", N_("Delete the character under the cursor") },
-   { ea_rubout, "echo-area-rubout", N_("Delete the character behind the cursor") },
-   { ea_abort, "echo-area-abort", N_("Cancel or quit operation") },
-   { ea_newline, "echo-area-newline", N_("Accept (or force completion of) this line") },
-   { ea_quoted_insert, "echo-area-quoted-insert", N_("Insert next character verbatim") },
-   { ea_insert, "echo-area-insert", N_("Insert this character") },
-   { ea_tab_insert, "echo-area-tab-insert", N_("Insert a TAB character") },
-   { ea_transpose_chars, "echo-area-transpose-chars", N_("Transpose characters at point") },
-   { ea_yank, "echo-area-yank", N_("Yank back the contents of the last kill") },
-   { ea_yank_pop, "echo-area-yank-pop", N_("Yank back a previous kill") },
-   { ea_kill_line, "echo-area-kill-line", N_("Kill to the end of the line") },
-   { ea_backward_kill_line, "echo-area-backward-kill-line", N_("Kill to the beginning of the line") },
-   { ea_kill_word, "echo-area-kill-word", N_("Kill the word following the cursor") },
-   { ea_backward_kill_word, "echo-area-backward-kill-word", N_("Kill the word preceding the cursor") },
-   { ea_possible_completions, "echo-area-possible-completions", N_("List possible completions") },
-   { ea_complete, "echo-area-complete", N_("Insert completion") },
-   { ea_scroll_completions_window, "echo-area-scroll-completions-window", N_("Scroll the completions window") },
+   { ea_forward, "echo-area-forward", "Move forward a character" },
+   { ea_backward, "echo-area-backward", "Move backward a character" },
+   { ea_beg_of_line, "echo-area-beg-of-line", "Move to the start of this line" },
+   { ea_end_of_line, "echo-area-end-of-line", "Move to the end of this line" },
+   { ea_forward_word, "echo-area-forward-word", "Move forward a word" },
+   { ea_backward_word, "echo-area-backward-word", "Move backward a word" },
+   { ea_delete, "echo-area-delete", "Delete the character under the cursor" },
+   { ea_rubout, "echo-area-rubout", "Delete the character behind the cursor" },
+   { ea_abort, "echo-area-abort", "Cancel or quit operation" },
+   { ea_newline, "echo-area-newline", "Accept (or force completion of) this line" },
+   { ea_quoted_insert, "echo-area-quoted-insert", "Insert next character verbatim" },
+   { ea_insert, "echo-area-insert", "Insert this character" },
+   { ea_tab_insert, "echo-area-tab-insert", "Insert a TAB character" },
+   { ea_transpose_chars, "echo-area-transpose-chars", "Transpose characters at point" },
+   { ea_yank, "echo-area-yank", "Yank back the contents of the last kill" },
+   { ea_yank_pop, "echo-area-yank-pop", "Yank back a previous kill" },
+   { ea_kill_line, "echo-area-kill-line", "Kill to the end of the line" },
+   { ea_backward_kill_line, "echo-area-backward-kill-line", "Kill to the beginning of the line" },
+   { ea_kill_word, "echo-area-kill-word", "Kill the word following the cursor" },
+   { ea_backward_kill_word, "echo-area-backward-kill-word", "Kill the word preceding the cursor" },
+   { ea_possible_completions, "echo-area-possible-completions", "List possible completions" },
+   { ea_complete, "echo-area-complete", "Insert completion" },
+   { ea_scroll_completions_window, "echo-area-scroll-completions-window", "Scroll the completions window" },
 /* Commands found in "./infodoc.c". */
-   { info_get_help_window, "get-help-window", N_("Display help message") },
-   { info_get_info_help_node, "get-info-help-node", N_("Visit Info node `(info)Help'") },
-   { describe_key, "describe-key", N_("Print documentation for KEY") },
-   { info_where_is, "where-is", N_("Show what to type to execute a given command") },
+   { info_get_help_window, "get-help-window", "Display help message" },
+   { info_get_info_help_node, "get-info-help-node", "Visit Info node `(info)Help'" },
+   { describe_key, "describe-key", "Print documentation for KEY" },
+   { info_where_is, "where-is", "Show what to type to execute a given command" },
 /* Commands found in "./m-x.c". */
-   { describe_command, "describe-command", N_("Read the name of an Info command and describe it") },
-   { info_execute_command, "execute-command", N_("Read a command name in the echo area and execute it") },
-   { set_screen_height, "set-screen-height", N_("Set the height of the displayed window") },
+   { describe_command, "describe-command", "Read the name of an Info command and describe it" },
+   { info_execute_command, "execute-command", "Read a command name in the echo area and execute it" },
+   { set_screen_height, "set-screen-height", "Set the height of the displayed window" },
 /* Commands found in "./indices.c". */
-   { info_index_search, "index-search", N_("Look up a string in the index for this file") },
-   { info_next_index_match, "next-index-match", N_("Go to the next matching index item from the last `\\[index-search]' command") },
-   { info_index_apropos, "index-apropos", N_("Grovel all known info file's indices for a string and build a menu") },
+   { info_index_search, "index-search", "Look up a string in the index for this file" },
+   { info_next_index_match, "next-index-match", "Go to the next matching index item from the last `\\[index-search]' command" },
+   { info_index_apropos, "index-apropos", "Grovel all known info file's indices for a string and build a menu" },
 /* Commands found in "./nodemenu.c". */
-   { list_visited_nodes, "list-visited-nodes", N_("Make a window containing a menu of all of the currently visited nodes") },
-   { select_visited_node, "select-visited-node", N_("Select a node which has been previously visited in a visible window") },
+   { list_visited_nodes, "list-visited-nodes", "Make a window containing a menu of all of the currently visited nodes" },
+   { select_visited_node, "select-visited-node", "Select a node which has been previously visited in a visible window" },
 /* Commands found in "./footnotes.c". */
-   { info_show_footnotes, "show-footnotes", N_("Show the footnotes associated with this node in another window") },
+   { info_show_footnotes, "show-footnotes", "Show the footnotes associated with this node in another window" },
 /* Commands found in "./variables.c". */
-   { describe_variable, "describe-variable", N_("Explain the use of a variable") },
-   { set_variable, "set-variable", N_("Set the value of an Info variable") },
+   { describe_variable, "describe-variable", "Explain the use of a variable" },
+   { set_variable, "set-variable", "Set the value of an Info variable" },
    { (VFunction *)NULL, (char *)NULL, (char *)NULL }
 };
diff --git a/texinfo/info/echo-area.c b/texinfo/info/echo-area.c
index 6cc0199689f..2c80d23d77c 100644
--- a/texinfo/info/echo-area.c
+++ b/texinfo/info/echo-area.c
@@ -1,7 +1,7 @@
 /* echo-area.c -- How to read a line in the echo area.
-   $Id: echo-area.c,v 1.2 1998/03/24 18:06:11 law Exp $
+   $Id: echo-area.c,v 1.1.1.2 1998/03/24 18:20:08 law Exp $
 
-   Copyright (C) 1993, 97 Free Software Foundation, Inc.
+   Copyright (C) 1993, 97, 98 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -938,11 +938,9 @@ DECLARE_INFO_COMMAND (ea_possible_completions, _("List possible completions"))
       int limit, count, max_label = 0;
 
       initialize_message_buffer ();
-      printf_to_message_buffer
-        (_("There %s %d "), completions_found_index == 1 ? _("is") : _("are"),
-         completions_found_index);
-      printf_to_message_buffer
-        (_("completion%s:\n"), completions_found_index == 1 ? "" : "s");
+      printf_to_message_buffer (completions_found_index == 1
+                                ? _("One completion:\n")
+                                : _("%d completions:\n"));
 
       /* Find the maximum length of a label. */
       for (i = 0; i < completions_found_index; i++)
diff --git a/texinfo/info/echo-area.h b/texinfo/info/echo-area.h
index 9f948c1037e..8787de92d4a 100644
--- a/texinfo/info/echo-area.h
+++ b/texinfo/info/echo-area.h
@@ -1,5 +1,5 @@
 /* echo-area.h -- Functions used in reading information from the echo area.
-   $Id: echo-area.h,v 1.2 1998/03/24 18:06:12 law Exp $
+   $Id: echo-area.h,v 1.1.1.2 1998/03/24 18:20:09 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
diff --git a/texinfo/info/filesys.c b/texinfo/info/filesys.c
index 6d449743aaa..36287ab1f6a 100644
--- a/texinfo/info/filesys.c
+++ b/texinfo/info/filesys.c
@@ -1,7 +1,7 @@
 /* filesys.c -- File system specific functions for hacking this system.
-   $Id: filesys.c,v 1.2 1998/03/24 18:06:16 law Exp $
+   $Id: filesys.c,v 1.1.1.3 1998/03/24 18:20:10 law Exp $
 
-   Copyright (C) 1993, 97 Free Software Foundation, Inc.
+   Copyright (C) 1993, 97, 98 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -38,6 +38,7 @@ static char *info_suffixes[] = {
   "",
   ".info",
   "-info",
+  "/index",
   (char *)NULL
 };
 
diff --git a/texinfo/info/funs.h b/texinfo/info/funs.h
index 45fcb6ae274..32d80d51c03 100644
--- a/texinfo/info/funs.h
+++ b/texinfo/info/funs.h
@@ -29,7 +29,6 @@ extern void info_prev_node ();
 extern void info_up_node ();
 extern void info_last_node ();
 extern void info_first_node ();
-extern void info_history_node ();
 extern void info_last_menu_item ();
 extern void info_menu_digit ();
 extern void info_menu_item ();
@@ -40,6 +39,7 @@ extern void info_goto_node ();
 extern void info_man ();
 extern void info_top_node ();
 extern void info_dir_node ();
+extern void info_history_node ();
 extern void info_kill_node ();
 extern void info_view_file ();
 extern void info_print_node ();
diff --git a/texinfo/info/info.c b/texinfo/info/info.c
index 6642182c6e1..22b831a20ef 100644
--- a/texinfo/info/info.c
+++ b/texinfo/info/info.c
@@ -1,7 +1,7 @@
 /* info.c -- Display nodes of Info files in multiple windows.
-   $Id: info.c,v 1.2 1998/03/24 18:06:30 law Exp $
+   $Id: info.c,v 1.1.1.3 1998/03/24 18:20:13 law Exp $
 
-   Copyright (C) 1993, 96, 97 Free Software Foundation, Inc.
+   Copyright (C) 1993, 96, 97, 98 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,8 +29,10 @@
 
 /* The version numbers of this version of Info. */
 int info_major_version = 2;
-int info_minor_version = 17;
-int info_patch_level = 0;
+int info_minor_version = 18;
+
+/* basename (argv[0]) */
+static char *program_name = NULL;
 
 /* Non-zero means search all indices for APROPOS_SEARCH_STRING. */
 static int apropos_p = 0;
@@ -100,7 +102,7 @@ static char *short_options = "d:n:f:o:s";
 int info_windows_initialized_p = 0;
 
 /* Some "forward" declarations. */
-static void usage (), info_short_help (), remember_info_program_name ();
+static void info_short_help (), remember_info_program_name ();
 
 
 /* **************************************************************** */
@@ -207,7 +209,8 @@ main (argc, argv)
           break;
 
         default:
-          usage ();
+          fprintf (stderr, _("Try --help for more information."));
+          exit (1);
         }
     }
 
@@ -223,11 +226,13 @@ main (argc, argv)
   /* If the user specified --version, then show the version and exit. */
   if (print_version_p)
     {
-      printf ("info (GNU %s %s) %s\n", PACKAGE, VERSION, version_string ());
-      puts ("Copyright (C) 1997 Free Software Foundation, Inc.\n\
+      printf ("%s (GNU %s %s) %s\n", program_name, PACKAGE, VERSION, 
+              version_string ());
+      printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\
 There is NO warranty.  You may redistribute this software\n\
 under the terms of the GNU General Public License.\n\
-For more information about these matters, see the files named COPYING.");
+For more information about these matters, see the files named COPYING.\n"),
+		  "1998");
       exit (0);
     }
 
@@ -238,7 +243,10 @@ For more information about these matters, see the files named COPYING.");
       exit (0);
     }
   
-  /* If the user hasn't specified a path for Info files, default it.  */
+  /* If the user hasn't specified a path for Info files, default it.
+     Lowest priority is our messy hardwired list in filesys.h.
+     Then comes the user's INFODIR from the Makefile.
+     Highest priority is the environment variable, if set.  */
   if (!infopath)
     {
       char *path_from_env = getenv ("INFOPATH");
@@ -252,10 +260,18 @@ For more information about these matters, see the files named COPYING.");
               path_from_env[len - 1] = 0;
               info_add_path (DEFAULT_INFOPATH, INFOPATH_PREPEND);
             }
+#ifdef INFODIR /* from the Makefile */
+          info_add_path (INFODIR, INFOPATH_PREPEND);
+#endif
           info_add_path (path_from_env, INFOPATH_PREPEND);
         }
       else
-        info_add_path (DEFAULT_INFOPATH, INFOPATH_PREPEND);
+        {
+          info_add_path (DEFAULT_INFOPATH, INFOPATH_PREPEND);
+#ifdef INFODIR /* from the Makefile */
+         info_add_path (INFODIR, INFOPATH_PREPEND);
+#endif
+        }
     }
 
   /* If the user specified a particular filename, add the path of that
@@ -517,19 +533,12 @@ version_string ()
     {
       vstring = (char *)xmalloc (50);
       sprintf (vstring, "%d.%d", info_major_version, info_minor_version);
-      if (info_patch_level)
-        sprintf (vstring + strlen (vstring), "-p%d", info_patch_level);
     }
   return (vstring);
 }
-
-/* **************************************************************** */
-/*                                                                  */
-/*                 Error Handling for Info                          */
-/*                                                                  */
-/* **************************************************************** */
 
-static char *program_name = (char *)NULL;
+
+/* Error handling.  */
 
 static void
 remember_info_program_name (fullpath)
@@ -586,44 +595,33 @@ info_error (format, arg1, arg2)
     }
 }
 
-/* Produce a very brief descripton of the available options and exit with
-   an error. */
-static void
-usage ()
-{
-  fprintf (stderr,"%s\n%s\n%s\n%s\n%s\n",
-_("Usage: info [-d dir-path] [-f info-file] [-o output-file] [-n node-name]..."),
-_("            [--directory dir-path] [--file info-file] [--node node-name]..."),
-_("            [--help] [--output output-file] [--subnodes] [--version]"),
-_("            [--dribble dribble-file] [--restore from-file]"),
-_("            [menu-selection ...]"));
-  exit (1);
-}
-
 /* Produce a scaled down description of the available options to Info. */
 static void
 info_short_help ()
 {
-  puts (_("\
-Here is a quick description of Info's options.  For a more complete\n\
-description of how to use Info, type `info info options'.\n\
+  printf (_("\
+Usage: %s [OPTION]... [INFO-FILE [MENU-ITEM...]]\n\
+\n\
+Read documentation in Info format.\n\
+For more complete documentation on how to use Info, run `info info options'.\n\
 \n\
-   --directory DIR              Add DIR to INFOPATH.\n\
-   --dribble FILENAME           Remember user keystrokes in FILENAME.\n\
-   --file FILENAME              Specify Info file to visit.\n\
-   --node NODENAME              Specify nodes in first visited Info file.\n\
-   --output FILENAME            Output selected nodes to FILENAME.\n\
-   --restore FILENAME           Read initial keystrokes from FILENAME.\n\
-   --subnodes                   Recursively output menu items.\n\
-   --help                       Get this help message.\n\
-   --version                    Display Info's version information.\n\
+Options:\n\
+--directory DIR              add DIR to INFOPATH.\n\
+--dribble FILENAME           remember user keystrokes in FILENAME.\n\
+--file FILENAME              specify Info file to visit.\n\
+--node NODENAME              specify nodes in first visited Info file.\n\
+--output FILENAME            output selected nodes to FILENAME.\n\
+--restore FILENAME           read initial keystrokes from FILENAME.\n\
+--subnodes                   recursively output menu items.\n\
+--help                       display this help and exit.\n\
+--version                    display version information and exit.\n\
 \n\
-Remaining arguments to Info are treated as the names of menu\n\
-items in the initial node visited.  You can easily move to the\n\
-node of your choice by specifying the menu names which describe\n\
-the path to that node.  For example, `info emacs buffers'.\n\
+The first argument, if present, is the name of the Info file to read.\n\
+Any remaining arguments are treated as the names of menu\n\
+items in the initial node visited.  For example, `info emacs buffers'\n\
+moves to the node `buffers' in the info file `emacs'.\n\
 \n\
-Email bug reports to bug-texinfo@prep.ai.mit.edu."));
+Email bug reports to bug-texinfo@gnu.org."), program_name);
 
   exit (0);
 }
diff --git a/texinfo/info/info.h b/texinfo/info/info.h
index a0c78f80f48..22ad7bdf2f4 100644
--- a/texinfo/info/info.h
+++ b/texinfo/info/info.h
@@ -1,10 +1,10 @@
 /* info.h -- Header file which includes all of the other headers.
-   $Id: info.h,v 1.2 1998/03/24 18:06:31 law Exp $
+   $Id: info.h,v 1.1.1.3 1998/03/24 18:20:14 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
 
-   Copyright (C) 1993, 97 Free Software Foundation, Inc.
+   Copyright (C) 1993, 97, 98 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -125,7 +125,7 @@ extern int info_error_rings_bell_p;
 extern void info_error ();
 
 /* The version numbers of Info. */
-extern int info_major_version, info_minor_version, info_patch_level;
+extern int info_major_version, info_minor_version;
 
 /* How to get the version string for this version of Info.  Returns
    something similar to "2.11". */
diff --git a/texinfo/info/session.c b/texinfo/info/session.c
index e99301b8d0d..04a548bfb51 100644
--- a/texinfo/info/session.c
+++ b/texinfo/info/session.c
@@ -1,5 +1,5 @@
 /* session.c -- The user windowing interface to Info.
-   $Id: session.c,v 1.2 1998/03/24 18:06:46 law Exp $
+   $Id: session.c,v 1.1.1.3 1998/03/24 18:20:15 law Exp $
 
    Copyright (C) 1993, 96, 97 Free Software Foundation, Inc.
 
@@ -4206,7 +4206,20 @@ info_get_input_char ()
          out how many characters are currently buffered, we
          should stay with away from stream I/O.
          --Egil Kvaleberg <egilk@sn.no>, January 1997.  */
+#ifdef EINTR
+      /* Keep reading if we got EINTR, so that we don't just exit.
+         --Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>,
+         22 Dec 1997.  */
+      {
+        int n;
+        do
+	  n = read (tty, &c, 1);
+        while (n == -1 && errno == EINTR);
+        rawkey = n == 1 ? c : EOF;
+      }
+#else
       rawkey = (read (tty, &c, 1) == 1) ? c : EOF;
+#endif
 
       keystroke = rawkey;
 
diff --git a/texinfo/info/termdep.h b/texinfo/info/termdep.h
index 09c03e2f913..58e20761029 100644
--- a/texinfo/info/termdep.h
+++ b/texinfo/info/termdep.h
@@ -1,5 +1,5 @@
 /* termdep.h -- System things that terminal.c depends on.
-   $Id: termdep.h,v 1.4 1998/03/24 18:06:50 law Exp $
+   $Id: termdep.h,v 1.5 1998/03/24 19:40:54 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
@@ -33,11 +33,6 @@
 
 #ifdef HAVE_TERMIOS_H
 #  include <termios.h>
- /*
-    POSIX does not mandate that we have these and it may, in fact, be only
-    partially implemented.
-  */
-#  undef TIOCGETC
 #else
 #  if defined (HAVE_TERMIO_H)
 #    include <termio.h>
diff --git a/texinfo/info/terminal.c b/texinfo/info/terminal.c
index 9b90e5de9e1..d77d89e90f6 100644
--- a/texinfo/info/terminal.c
+++ b/texinfo/info/terminal.c
@@ -1,8 +1,8 @@
 /* terminal.c -- How to handle the physical terminal for Info.
-   $Id: terminal.c,v 1.4 1998/03/24 18:06:53 law Exp $
+   $Id: terminal.c,v 1.1.1.3 1998/03/24 18:20:18 law Exp $
 
-   Copyright (C) 1988, 89, 90, 91, 92, 93, 96, 97 Free Software
-   Foundation, Inc.
+   Copyright (C) 1988, 89, 90, 91, 92, 93, 96, 97, 98
+   Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -141,7 +141,10 @@ terminal_begin_using_terminal ()
   if (!term_begin_use || !*term_begin_use)
     return;
 
+#ifdef SIGWINCH
   sigsave = signal (SIGWINCH, SIG_IGN); 
+#endif
+
   send_to_terminal (term_begin_use);
   /* Without this fflush and sleep, running info in a shelltool or
      cmdtool (TERM=sun-cmd) with scrollbars loses -- the scrollbars are
@@ -149,7 +152,10 @@ terminal_begin_using_terminal ()
      From: strube@physik3.gwdg.de (Hans Werner Strube).  */
   fflush (stdout);
   sleep (1);
+
+#ifdef SIGWINCH
   signal (SIGWINCH, sigsave);
+#endif
 }
 
 /* Tell the terminal that we will not be doing any more cursor
@@ -165,11 +171,17 @@ terminal_end_using_terminal ()
   if (!term_end_use || !*term_end_use)
     return;
 
+#ifdef SIGWINCH
   sigsave = signal (SIGWINCH, SIG_IGN);
+#endif
+
   send_to_terminal (term_end_use);
   fflush (stdout);
   sleep (1);
+
+#ifdef SIGWINCH
   signal (SIGWINCH, sigsave);
+#endif
 }
 
 /* **************************************************************** */
diff --git a/texinfo/info/tilde.c b/texinfo/info/tilde.c
index 46c3a5a448c..5013eae1861 100644
--- a/texinfo/info/tilde.c
+++ b/texinfo/info/tilde.c
@@ -1,10 +1,11 @@
 /* tilde.c -- Tilde expansion code (~/foo := $HOME/foo).
-   $Id: tilde.c,v 1.2 1998/03/24 18:06:55 law Exp $
+   $Id: tilde.c,v 1.1.1.3 1998/03/24 18:20:19 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
 
-   Copyright (C) 1988, 89, 90, 91, 92, 93, 96 Free Software Foundation, Inc.
+   Copyright (C) 1988, 89, 90, 91, 92, 93, 96, 98
+   Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,22 +23,26 @@
 
    Written by Brian Fox (bfox@ai.mit.edu). */
 
+/* Indent #pragma so that older Cpp's don't try to parse it. */
+#ifdef _AIX
+ #pragma alloca
+#endif /* _AIX */
+
 /* Include config.h before doing alloca.  */
 #include "info.h"
 
-#ifndef alloca
-#if defined (__GNUC__)
-#  define alloca __builtin_alloca
-#else /* !__GNUC__ */
-#  if defined (_AIX)
- #pragma alloca
-#  else /* !_AIX */
-#    if defined (HAVE_ALLOCA_H)
-#      include <alloca.h>
-#    endif /* HAVE_ALLOCA_H */
-#  endif /* !AIX */
-#endif /* !__GNUC__ */
-#endif /* ! defined alloca */
+#ifdef __GNUC__
+# undef alloca
+# define alloca __builtin_alloca
+#else
+# ifdef HAVE_ALLOCA_H
+#  include <alloca.h>
+# else
+#  ifndef _AIX
+char *alloca ();
+#  endif
+# endif
+#endif
 
 #if defined (TEST) || defined (STATIC_MALLOC)
 static void *xmalloc (), *xrealloc ();
diff --git a/texinfo/info/window.c b/texinfo/info/window.c
index 4357e656b87..6f7b68aa21f 100644
--- a/texinfo/info/window.c
+++ b/texinfo/info/window.c
@@ -1,5 +1,5 @@
 /* window.c -- Windows in Info.
-   $Id: window.c,v 1.2 1998/03/24 18:06:59 law Exp $
+   $Id: window.c,v 1.1.1.3 1998/03/24 18:20:20 law Exp $
 
    This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
@@ -723,7 +723,7 @@ character_width (character, hpos)
   int width = 1;
 
   if (ISO_Latin_p)
-    printable_limit = 160;
+    printable_limit = 255;
 
   if (character > printable_limit)
     width = 3;
diff --git a/texinfo/intl/ChangeLog b/texinfo/intl/ChangeLog
index 718808e087b..ecff6f6b2cd 100644
--- a/texinfo/intl/ChangeLog
+++ b/texinfo/intl/ChangeLog
@@ -1,6 +1,57 @@
-Thu Sep  4 15:01:11 1997  Jeffrey A Law  (law@cygnus.com)
+1997-09-06 02:10  Ulrich Drepper  <drepper@cygnus.com>
 
-	* Makefile.in (install-info): Add dummy target.
+	* intlh.inst.in: Reformat copyright.
+
+1997-08-19 15:22  Ulrich Drepper  <drepper@cygnus.com>
+
+	* dcgettext.c (DCGETTEXT): Remove wrong comment.
+
+1997-08-16 00:13  Ulrich Drepper  <drepper@cygnus.com>
+
+	* Makefile.in (install-data): Don't change directory to install.
+
+1997-08-01 14:30  Ulrich Drepper  <drepper@cygnus.com>
+
+	* cat-compat.c: Fix copyright.
+
+	* localealias.c: Don't define strchr unless !HAVE_STRCHR.
+
+	* loadmsgcat.c: Update copyright.  Fix typos.
+
+	* l10nflist.c: Don't define strchr unless !HAVE_STRCHR.
+	(_nl_make_l10nflist): Handle sponsor and revision correctly.
+
+	* gettext.c: Update copyright.
+	* gettext.h: Likewise.
+	* hash-string.h: Likewise.
+
+	* finddomain.c: Remoave dead code.  Define strchr only if
+	!HAVE_STRCHR.
+
+	* explodename.c: Include <sys/types.h>.
+
+	* explodename.c: Reformat copyright text.
+	(_nl_explode_name): Fix typo.
+
+	* dcgettext.c: Define and use __set_errno.
+	(guess_category_value): Don't use setlocale if HAVE_LC_MESSAGES is
+	not defined.
+
+	* bindtextdom.c: Pretty printing.
+
+1997-05-01 02:25  Ulrich Drepper  <drepper@cygnus.com>
+
+	* dcgettext.c (guess_category_value): Don't depend on
+	HAVE_LC_MESSAGES.  We don't need the macro here.
+	Patch by Bruno Haible <haible@ilog.fr>.
+
+	* cat-compat.c (textdomain): DoN't refer to HAVE_SETLOCALE_NULL
+	macro.  Instead use HAVE_LOCALE_NULL and define it when using
+	glibc, as in dcgettext.c.
+	Patch by Bruno Haible <haible@ilog.fr>.
+
+	* Makefile.in (CPPFLAGS): New variable.  Reported by Franc,ois
+	Pinard.
 
 Mon Mar 10 06:51:17 1997  Ulrich Drepper  <drepper@cygnus.com>
 
diff --git a/texinfo/intl/Makefile.in b/texinfo/intl/Makefile.in
index e617bbc2875..a41fb5796b0 100644
--- a/texinfo/intl/Makefile.in
+++ b/texinfo/intl/Makefile.in
@@ -50,6 +50,7 @@ RANLIB = @RANLIB@
 
 DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \
 -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" @DEFS@
+CPPFLAGS = @CPPFLAGS@
 CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
 
@@ -130,10 +131,9 @@ install-data: all
 	    $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
 	  fi; \
 	  $(INSTALL_DATA) VERSION $(gettextsrcdir)/VERSION; \
-	  cd $(srcdir) && \
 	  dists="$(DISTFILES.common)"; \
 	  for file in $$dists; do \
-	    $(INSTALL_DATA) $$file $(gettextsrcdir)/$$file; \
+	    $(INSTALL_DATA) $(srcdir)/$$file $(gettextsrcdir)/$$file; \
 	  done; \
 	else \
 	  : ; \
@@ -148,7 +148,7 @@ uninstall:
 	  rm -f $(gettextsrcdir)/$$file; \
 	done
 
-info dvi install-info:
+info dvi:
 
 $(OBJECTS): ../config.h libgettext.h
 bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h
diff --git a/texinfo/intl/VERSION b/texinfo/intl/VERSION
index 7d069b886d6..d31950a61d6 100644
--- a/texinfo/intl/VERSION
+++ b/texinfo/intl/VERSION
@@ -1 +1 @@
-GNU gettext library from gettext-0.10.27
+GNU gettext library from gettext-0.10.32
diff --git a/texinfo/intl/bindtextdom.c b/texinfo/intl/bindtextdom.c
index 72583f25783..9fcb8d9f29b 100644
--- a/texinfo/intl/bindtextdom.c
+++ b/texinfo/intl/bindtextdom.c
@@ -1,5 +1,5 @@
-/* bindtextdom.c -- implementation of the bindtextdomain(3) function
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+/* Implementation of the bindtextdomain(3) function
+   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@ void free ();
 #else
 # include <strings.h>
 # ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy ((Src), (Dst), (Num))
+#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
 # endif
 #endif
 
@@ -61,6 +61,7 @@ extern struct binding *_nl_domain_bindings;
    prefix.  So we have to make a difference here.  */
 #ifdef _LIBC
 # define BINDTEXTDOMAIN __bindtextdomain
+# define strdup(str) __strdup (str)
 #else
 # define BINDTEXTDOMAIN bindtextdomain__
 #endif
@@ -98,25 +99,36 @@ BINDTEXTDOMAIN (domainname, dirname)
 
   if (binding != NULL)
     {
-      /* The domain is already bound.  Replace the old binding.  */
-      char *new_dirname;
-
-      if (strcmp (dirname, _nl_default_dirname) == 0)
-	new_dirname = (char *) _nl_default_dirname;
-      else
+      /* The domain is already bound.  If the new value and the old
+	 one are equal we simply do nothing.  Otherwise replace the
+	 old binding.  */
+      if (strcmp (dirname, binding->dirname) != 0)
 	{
-	  size_t len = strlen (dirname) + 1;
-	  new_dirname = (char *) malloc (len);
-	  if (new_dirname == NULL)
-	    return NULL;
+	  char *new_dirname;
+
+	  if (strcmp (dirname, _nl_default_dirname) == 0)
+	    new_dirname = (char *) _nl_default_dirname;
+	  else
+	    {
+#if defined _LIBC || defined HAVE_STRDUP
+	      new_dirname = strdup (dirname);
+	      if (new_dirname == NULL)
+		return NULL;
+#else
+	      size_t len = strlen (dirname) + 1;
+	      new_dirname = (char *) malloc (len);
+	      if (new_dirname == NULL)
+		return NULL;
 
-	  memcpy (new_dirname, dirname, len);
-	}
+	      memcpy (new_dirname, dirname, len);
+#endif
+	    }
 
-      if (strcmp (binding->dirname, _nl_default_dirname) != 0)
-        free (binding->dirname);
+	  if (binding->dirname != _nl_default_dirname)
+	    free (binding->dirname);
 
-      binding->dirname = new_dirname;
+	  binding->dirname = new_dirname;
+	}
     }
   else
     {
@@ -128,21 +140,33 @@ BINDTEXTDOMAIN (domainname, dirname)
       if (new_binding == NULL)
 	return NULL;
 
+#if defined _LIBC || defined HAVE_STRDUP
+      new_binding->domainname = strdup (domainname);
+      if (new_binding->domainname == NULL)
+	return NULL;
+#else
       len = strlen (domainname) + 1;
       new_binding->domainname = (char *) malloc (len);
       if (new_binding->domainname == NULL)
-	  return NULL;
+	return NULL;
       memcpy (new_binding->domainname, domainname, len);
+#endif
 
       if (strcmp (dirname, _nl_default_dirname) == 0)
 	new_binding->dirname = (char *) _nl_default_dirname;
       else
 	{
+#if defined _LIBC || defined HAVE_STRDUP
+	  new_binding->dirname = strdup (dirname);
+	  if (new_binding->dirname == NULL)
+	    return NULL;
+#else
 	  len = strlen (dirname) + 1;
 	  new_binding->dirname = (char *) malloc (len);
 	  if (new_binding->dirname == NULL)
 	    return NULL;
 	  memcpy (new_binding->dirname, dirname, len);
+#endif
 	}
 
       /* Now enqueue it.  */
diff --git a/texinfo/intl/cat-compat.c b/texinfo/intl/cat-compat.c
index 4a9a1d898f4..867d901b8ff 100644
--- a/texinfo/intl/cat-compat.c
+++ b/texinfo/intl/cat-compat.c
@@ -1,20 +1,19 @@
 /* Compatibility code for gettext-using-catgets interface.
-   Copyright (C) 1995 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -40,6 +39,16 @@ char *getenv ();
 
 /* @@ end of prolog @@ */
 
+/* XPG3 defines the result of `setlocale (category, NULL)' as:
+   ``Directs `setlocale()' to query `category' and return the current
+     setting of `local'.''
+   However it does not specify the exact format.  And even worse: POSIX
+   defines this not at all.  So we can use this feature only on selected
+   system (e.g. those using GNU C Library).  */
+#ifdef _LIBC
+# define HAVE_LOCALE_NULL
+#endif
+
 /* The catalog descriptor.  */
 static nl_catd catalog = (nl_catd) -1;
 
@@ -68,7 +77,8 @@ textdomain (domainname)
   size_t new_name_len;
   char *lang;
 
-#if HAVE_SETLOCALE && HAVE_LC_MESSAGES && HAVE_SETLOCALE_NULL
+#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES \
+    && defined HAVE_LOCALE_NULL
   lang = setlocale (LC_MESSAGES, NULL);
 #else
   lang = getenv ("LC_ALL");
diff --git a/texinfo/intl/dcgettext.c b/texinfo/intl/dcgettext.c
index 9ce1b3a9a1a..a316bfd1086 100644
--- a/texinfo/intl/dcgettext.c
+++ b/texinfo/intl/dcgettext.c
@@ -1,19 +1,19 @@
-/* dcgettext.c -- implementation of the dcgettext(3) function
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+/* Implementation of the dcgettext(3) function
+   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -42,6 +42,9 @@ char *alloca ();
 #ifndef errno
 extern int errno;
 #endif
+#ifndef __set_errno
+# define __set_errno(val) errno = (val)
+#endif
 
 #if defined STDC_HEADERS || defined _LIBC
 # include <stdlib.h>
@@ -273,13 +276,13 @@ DCGETTEXT (domainname, msgid, category)
       dirname = (char *) alloca (path_max + dirname_len);
       ADD_BLOCK (block_list, dirname);
 
-      errno = 0;
+      __set_errno (0);
       while ((ret = getcwd (dirname, path_max)) == NULL && errno == ERANGE)
 	{
 	  path_max += PATH_INCR;
 	  dirname = (char *) alloca (path_max + dirname_len);
 	  ADD_BLOCK (block_list, dirname);
-	  errno = 0;
+	  __set_errno (0);
 	}
 
       if (ret == NULL)
@@ -287,14 +290,10 @@ DCGETTEXT (domainname, msgid, category)
 	  /* We cannot get the current working directory.  Don't signal an
 	     error but simply return the default string.  */
 	  FREE_BLOCKS (block_list);
-	  errno = saved_errno;
+	  __set_errno (saved_errno);
 	  return (char *) msgid;
 	}
 
-      /* We don't want libintl.a to depend on any other library.  So
-	 we avoid the non-standard function stpcpy.  In GNU C Library
-	 this function is available, though.  Also allow the symbol
-	 HAVE_STPCPY to be defined.  */
       stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname);
     }
 
@@ -305,10 +304,7 @@ DCGETTEXT (domainname, msgid, category)
   xdomainname = (char *) alloca (strlen (categoryname)
 				 + strlen (domainname) + 5);
   ADD_BLOCK (block_list, xdomainname);
-  /* We don't want libintl.a to depend on any other library.  So we
-     avoid the non-standard function stpcpy.  In GNU C Library this
-     function is available, though.  Also allow the symbol HAVE_STPCPY
-     to be defined.  */
+
   stpcpy (stpcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"),
 		  domainname),
 	  ".mo");
@@ -329,7 +325,7 @@ DCGETTEXT (domainname, msgid, category)
 	{
 	  /* The whole contents of CATEGORYVALUE has been searched but
 	     no valid entry has been found.  We solve this situation
-	     by implicitely appending a "C" entry, i.e. no translation
+	     by implicitly appending a "C" entry, i.e. no translation
 	     will take place.  */
 	  single_locale[0] = 'C';
 	  single_locale[1] = '\0';
@@ -348,7 +344,7 @@ DCGETTEXT (domainname, msgid, category)
 	  || strcmp (single_locale, "POSIX") == 0)
 	{
 	  FREE_BLOCKS (block_list);
-	  errno = saved_errno;
+	  __set_errno (saved_errno);
 	  return (char *) msgid;
 	}
 
@@ -377,7 +373,7 @@ DCGETTEXT (domainname, msgid, category)
 	  if (retval != NULL)
 	    {
 	      FREE_BLOCKS (block_list);
-	      errno = saved_errno;
+	      __set_errno (saved_errno);
 	      return retval;
 	    }
 	}
@@ -538,7 +534,8 @@ category_to_name (category)
 }
 
 /* Guess value of current locale from value of the environment variables.  */
-static const char *guess_category_value (category, categoryname)
+static const char *
+guess_category_value (category, categoryname)
      int category;
      const char *categoryname;
 {
diff --git a/texinfo/intl/explodename.c b/texinfo/intl/explodename.c
index 64b0a036c0c..37c46e9d7b8 100644
--- a/texinfo/intl/explodename.c
+++ b/texinfo/intl/explodename.c
@@ -1,21 +1,19 @@
-/* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
-The GNU C Library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -23,6 +21,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
 
 #include "loadinfo.h"
 
@@ -164,7 +163,7 @@ _nl_explode_name (name, language, modifier, territory, codeset,
 	}
     }
 
-  /* For CEN sytnax values it might be important to have the
+  /* For CEN syntax values it might be important to have the
      separator character in the file name, not for XPG syntax.  */
   if (syntax == xpg)
     {
diff --git a/texinfo/intl/finddomain.c b/texinfo/intl/finddomain.c
index 3b7861e8472..ec85d4de4d1 100644
--- a/texinfo/intl/finddomain.c
+++ b/texinfo/intl/finddomain.c
@@ -1,5 +1,5 @@
-/* finddomain.c -- handle list of needed message catalogs
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+/* Handle list of needed message catalogs
+   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
    This program is free software; you can redistribute it and/or modify
@@ -39,12 +39,14 @@ void free ();
 # include <string.h>
 #else
 # include <strings.h>
+# ifndef memcpy
+#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+# endif
+#endif
+#if !HAVE_STRCHR && !defined _LIBC
 # ifndef strchr
 #  define strchr index
 # endif
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy ((Src), (Dst), (Num))
-# endif
 #endif
 
 #if defined HAVE_UNISTD_H || defined _LIBC
@@ -60,18 +62,6 @@ void free ();
 #endif
 
 /* @@ end of prolog @@ */
-
-#ifdef _LIBC
-/* Rename the non ANSI C functions.  This is required by the standard
-   because some ANSI C functions will require linking with this object
-   file and the name space must not be polluted.  */
-# define stpcpy(dest, src) __stpcpy(dest, src)
-#else
-# ifndef HAVE_STPCPY
-static char *stpcpy PARAMS ((char *dest, const char *src));
-# endif
-#endif
-
 /* List of already loaded domains.  */
 static struct loaded_l10nfile *_nl_loaded_domains;
 
@@ -103,7 +93,7 @@ _nl_find_domain (dirname, locale, domainname)
 
      and six parts for the CEN syntax:
 
-	language[_territory][+audience][+special][,sponsor][_revision]
+	language[_territory][+audience][+special][,[sponsor][_revision]]
 
      Beside the first all of them are allowed to be missing.  If the
      full specified locale is not found, the less specific one are
@@ -168,7 +158,7 @@ _nl_find_domain (dirname, locale, domainname)
 			   &sponsor, &revision);
 
   /* Create all possible locale entries which might be interested in
-     generalzation.  */
+     generalization.  */
   retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
 			       strlen (dirname) + 1, mask, language, territory,
 			       codeset, normalized_codeset, modifier, special,
@@ -197,21 +187,3 @@ _nl_find_domain (dirname, locale, domainname)
 
   return retval;
 }
-
-/* @@ begin of epilog @@ */
-
-/* We don't want libintl.a to depend on any other library.  So we
-   avoid the non-standard function stpcpy.  In GNU C Library this
-   function is available, though.  Also allow the symbol HAVE_STPCPY
-   to be defined.  */
-#if !_LIBC && !HAVE_STPCPY
-static char *
-stpcpy (dest, src)
-     char *dest;
-     const char *src;
-{
-  while ((*dest++ = *src++) != '\0')
-    /* Do nothing. */ ;
-  return dest - 1;
-}
-#endif
diff --git a/texinfo/intl/gettext.c b/texinfo/intl/gettext.c
index 7bed6369b44..1336d21e7c9 100644
--- a/texinfo/intl/gettext.c
+++ b/texinfo/intl/gettext.c
@@ -1,19 +1,19 @@
-/* gettext.c -- implementation of gettext(3) function
-   Copyright (C) 1995 Software Foundation, Inc.
+/* Implementation of gettext(3) function
+   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
diff --git a/texinfo/intl/gettext.h b/texinfo/intl/gettext.h
index 5190f09447f..6b4b9e3316c 100644
--- a/texinfo/intl/gettext.h
+++ b/texinfo/intl/gettext.h
@@ -1,20 +1,20 @@
-/* gettext.h - internal header for GNU gettext internationalization functions
-   Copyright (C) 1995 Software Foundation, Inc.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+/* Internal header for GNU gettext internationalization functions
+   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #ifndef _GETTEXT_H
 #define _GETTEXT_H 1
diff --git a/texinfo/intl/hash-string.h b/texinfo/intl/hash-string.h
index ef1f448d865..e66e8417a97 100644
--- a/texinfo/intl/hash-string.h
+++ b/texinfo/intl/hash-string.h
@@ -1,19 +1,20 @@
-/* hash-string - Implements a string hashing function.
-   Copyright (C) 1995 Free Software Foundation, Inc.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+/* Implements a string hashing function.
+   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #ifdef HAVE_VALUES_H
 # include <values.h>
diff --git a/texinfo/intl/l10nflist.c b/texinfo/intl/l10nflist.c
index 3611b12904f..4e2bc130950 100644
--- a/texinfo/intl/l10nflist.c
+++ b/texinfo/intl/l10nflist.c
@@ -1,5 +1,5 @@
-/* finddomain.c -- handle list of needed message catalogs
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+/* Handle list of needed message catalogs
+   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
    This program is free software; you can redistribute it and/or modify
@@ -20,6 +20,7 @@
 # include <config.h>
 #endif
 
+
 #if defined HAVE_STRING_H || defined _LIBC
 # ifndef _GNU_SOURCE
 #  define _GNU_SOURCE	1
@@ -27,18 +28,21 @@
 # include <string.h>
 #else
 # include <strings.h>
+# ifndef memcpy
+#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+# endif
+#endif
+#if !HAVE_STRCHR && !defined _LIBC
 # ifndef strchr
 #  define strchr index
 # endif
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy ((Src), (Dst), (Num))
-# endif
 #endif
 
 #if defined _LIBC || defined HAVE_ARGZ_H
 # include <argz.h>
 #endif
 #include <ctype.h>
+#include <sys/types.h>
 
 #if defined STDC_HEADERS || defined _LIBC
 # include <stdlib.h>
@@ -198,14 +202,16 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
 				  + ((mask & XPG_NORM_CODESET) != 0
 				     ? strlen (normalized_codeset) + 1 : 0)
 				  + (((mask & XPG_MODIFIER) != 0
-				      || (mask & CEN_AUDIENCE) != 0) ?
-				     strlen (modifier) + 1 : 0)
+				      || (mask & CEN_AUDIENCE) != 0)
+				     ? strlen (modifier) + 1 : 0)
 				  + ((mask & CEN_SPECIAL) != 0
 				     ? strlen (special) + 1 : 0)
-				  + ((mask & CEN_SPONSOR) != 0
-				     ? strlen (sponsor) + 1 : 0)
-				  + ((mask & CEN_REVISION) != 0
-				     ? strlen (revision) + 1 : 0)
+				  + (((mask & CEN_SPONSOR) != 0
+				      || (mask & CEN_REVISION) != 0)
+				     ? (1 + ((mask & CEN_SPONSOR) != 0
+					     ? strlen (sponsor) + 1 : 0)
+					+ ((mask & CEN_REVISION) != 0
+					   ? strlen (revision) + 1 : 0)) : 0)
 				  + 1 + strlen (filename) + 1);
 
   if (abs_filename == NULL)
@@ -248,15 +254,16 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
       *cp++ = '+';
       cp = stpcpy (cp, special);
     }
-  if ((mask & CEN_SPONSOR) != 0)
+  if ((mask & (CEN_SPONSOR | CEN_REVISION)) != 0)
     {
       *cp++ = ',';
-      cp = stpcpy (cp, sponsor);
-    }
-  if ((mask & CEN_REVISION) != 0)
-    {
-      *cp++ = '_';
-      cp = stpcpy (cp, revision);
+      if ((mask & CEN_SPONSOR) != 0)
+	cp = stpcpy (cp, sponsor);
+      if ((mask & CEN_REVISION) != 0)
+	{
+	  *cp++ = '_';
+	  cp = stpcpy (cp, revision);
+	}
     }
 
   *cp++ = '/';
@@ -313,8 +320,8 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
     }
 
   entries = 0;
-  /* If the DIRLIST is a real list the RETVAL entry correcponds not to
-     a real file.  So we have to use the DIRLIST separation machanism
+  /* If the DIRLIST is a real list the RETVAL entry corresponds not to
+     a real file.  So we have to use the DIRLIST separation mechanism
      of the inner loop.  */
   cnt = __argz_count (dirlist, dirlist_len) == 1 ? mask - 1 : mask;
   for (; cnt >= 0; --cnt)
diff --git a/texinfo/intl/libgettext.h b/texinfo/intl/libgettext.h
index c9212aac539..0d4de4d0ee1 100644
--- a/texinfo/intl/libgettext.h
+++ b/texinfo/intl/libgettext.h
@@ -1,19 +1,19 @@
-/* libgettext.h -- Message catalogs for internationalization.
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+/* Message catalogs for internationalization.
+   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* Because on some systems (e.g. Solaris) we sometimes have to include
    the systems libintl.h as well as this file we have more complex
@@ -151,13 +151,13 @@ extern int _nl_msg_cat_cntr;
 	 if (! __translation__ || __catalog_counter__ != _nl_msg_cat_cntr)    \
 	   {								      \
 	     __translation__ =						      \
-	       dcgettext__ ((Domainname), (Msgid), (Category));		      \
+	       dcgettext__ (Domainname, Msgid, Category);		      \
 	     __catalog_counter__ = _nl_msg_cat_cntr;			      \
 	   }								      \
 	 __result = __translation__;					      \
        }								      \
      else								      \
-       __result = dcgettext__ ((Domainname), (Msgid), (Category));	      \
+       __result = dcgettext__ (Domainname, Msgid, Category);		      \
      __result;								      \
     }))
 #  endif
diff --git a/texinfo/intl/loadmsgcat.c b/texinfo/intl/loadmsgcat.c
index 4b98ec80671..73e90a9190f 100644
--- a/texinfo/intl/loadmsgcat.c
+++ b/texinfo/intl/loadmsgcat.c
@@ -1,19 +1,19 @@
-/* loadmsgcat.c -- load needed message catalogs
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+/* Load needed message catalogs
+   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -41,8 +41,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* @@ end of prolog @@ */
 
 #ifdef _LIBC
-/* Rename the non ANSI C functions.  This is required by the standard
-   because some ANSI C functions will require linking with this object
+/* Rename the non ISO C functions.  This is required by the standard
+   because some ISO C functions will require linking with this object
    file and the name space must not be polluted.  */
 # define fstat  __fstat
 # define open   __open
@@ -55,7 +55,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* We need a sign, whether a new catalog was loaded, which can be associated
    with all translations.  This is important if the translations are
    cached by one of GCC's features.  */
-int _nl_msg_cat_cntr;
+int _nl_msg_cat_cntr = 0;
 
 
 /* Load the message catalogs specified by FILENAME.  If it is no valid
diff --git a/texinfo/intl/localealias.c b/texinfo/intl/localealias.c
index a869acf6a6c..00d91941b9b 100644
--- a/texinfo/intl/localealias.c
+++ b/texinfo/intl/localealias.c
@@ -1,5 +1,5 @@
-/* localealias.c -- handle aliases for locale names
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+/* Handle aliases for locale names
+   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
    This program is free software; you can redistribute it and/or modify
@@ -59,12 +59,14 @@ void free ();
 # include <string.h>
 #else
 # include <strings.h>
+# ifndef memcpy
+#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
+# endif
+#endif
+#if !HAVE_STRCHR && !defined _LIBC
 # ifndef strchr
 #  define strchr index
 # endif
-# ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy ((Src), (Dst), (Num))
-# endif
 #endif
 
 #include "gettext.h"
@@ -295,7 +297,7 @@ read_alias_file (fname, fname_len)
 	    }
 	}
 
-      /* Possibily not the whole line fitted into the buffer.  Ignore
+      /* Possibly not the whole line fits into the buffer.  Ignore
 	 the rest of the line.  */
       while (strchr (cp, '\n') == NULL)
 	{
diff --git a/texinfo/intl/textdomain.c b/texinfo/intl/textdomain.c
index 09530b8f75b..55d93406a8a 100644
--- a/texinfo/intl/textdomain.c
+++ b/texinfo/intl/textdomain.c
@@ -1,5 +1,5 @@
-/* textdomain.c -- implementation of the textdomain(3) function
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+/* Implementation of the textdomain(3) function
+   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
    This program is free software; you can redistribute it and/or modify
@@ -29,7 +29,7 @@
 #else
 # include <strings.h>
 # ifndef memcpy
-#  define memcpy(Dst, Src, Num) bcopy ((Src), (Dst), (Num))
+#  define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num)
 # endif
 #endif
 
@@ -54,6 +54,7 @@ extern const char *_nl_current_default_domain;
    prefix.  So we have to make a difference here.  */
 #ifdef _LIBC
 # define TEXTDOMAIN __textdomain
+# define strdup(str) __strdup (str)
 #else
 # define TEXTDOMAIN textdomain__
 #endif
@@ -82,11 +83,15 @@ TEXTDOMAIN (domainname)
       /* If the following malloc fails `_nl_current_default_domain'
 	 will be NULL.  This value will be returned and so signals we
 	 are out of core.  */
+#if defined _LIBC || defined HAVE_STRDUP
+      _nl_current_default_domain = strdup (domainname);
+#else
       size_t len = strlen (domainname) + 1;
       char *cp = (char *) malloc (len);
       if (cp != NULL)
 	memcpy (cp, domainname, len);
       _nl_current_default_domain = cp;
+#endif
     }
 
   if (old != _nl_default_default_domain)
diff --git a/texinfo/lib/Makefile.am b/texinfo/lib/Makefile.am
index c3a8e98af85..b7d7dcf40b8 100644
--- a/texinfo/lib/Makefile.am
+++ b/texinfo/lib/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile.am for texinfo/lib.
-## $Id: Makefile.am,v 1.2 1998/03/24 18:07:26 law Exp $
+## $Id: Makefile.am,v 1.1.1.2 1998/03/24 18:19:49 law Exp $
 ## Run automake in .. to produce Makefile.in from this.
 
 noinst_LIBRARIES = libtxi.a
diff --git a/texinfo/lib/Makefile.in b/texinfo/lib/Makefile.in
index fe16e628500..4612381824e 100644
--- a/texinfo/lib/Makefile.in
+++ b/texinfo/lib/Makefile.in
@@ -1,8 +1,14 @@
-# Makefile.in generated automatically by automake 1.2 from Makefile.am
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
 
 SHELL = /bin/sh
@@ -43,27 +49,26 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 DATADIRNAME = @DATADIRNAME@
-EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
+INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -117,9 +122,9 @@ OBJECTS = $(libtxi_a_OBJECTS)
 default: all
 
 .SUFFIXES:
-.SUFFIXES: .c .o
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus lib/Makefile
+.SUFFIXES: .S .c .o .s
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lib/Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
@@ -129,7 +134,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 mostlyclean-noinstLIBRARIES:
 
 clean-noinstLIBRARIES:
-	test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 
 distclean-noinstLIBRARIES:
 
@@ -138,38 +143,49 @@ maintainer-clean-noinstLIBRARIES:
 .c.o:
 	$(COMPILE) -c $<
 
+.s.o:
+	$(COMPILE) -c $<
+
+.S.o:
+	$(COMPILE) -c $<
+
 mostlyclean-compile:
-	rm -f *.o core
+	-rm -f *.o core *.core
 
 clean-compile:
 
 distclean-compile:
-	rm -f *.tab.c
+	-rm -f *.tab.c
 
 maintainer-clean-compile:
 
 libtxi.a: $(libtxi_a_OBJECTS) $(libtxi_a_DEPENDENCIES)
-	rm -f libtxi.a
+	-rm -f libtxi.a
 	$(AR) cru libtxi.a $(libtxi_a_OBJECTS) $(libtxi_a_LIBADD)
 	$(RANLIB) libtxi.a
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES)
-	here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS)
+ID: $(HEADERS) $(SOURCES) $(LISP)
+	here=`pwd` && cd $(srcdir) \
+	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $(SOURCES) $(HEADERS) -o $$here/TAGS)
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 
 clean-tags:
 
 distclean-tags:
-	rm -f TAGS ID
+	-rm -f TAGS ID
 
 maintainer-clean-tags:
 
@@ -179,17 +195,21 @@ subdir = lib
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  d=$(srcdir); \
 	  test -f $(distdir)/$$file \
 	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
 	  || cp -p $$d/$$file $(distdir)/$$file; \
 	done
+getopt.o: getopt.c ../config.h
+getopt1.o: getopt1.c ../config.h getopt.h
+xmalloc.o: xmalloc.c
+xstrdup.o: xstrdup.c ../config.h
+
 info:
 dvi:
 check: all
 	$(MAKE)
 installcheck:
-install-info:
 install-exec: 
 	@$(NORMAL_INSTALL)
 
@@ -209,19 +229,19 @@ installdirs:
 
 
 mostlyclean-generic:
-	test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-	test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	rm -f Makefile $(DISTCLEANFILES)
-	rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(DISTCLEANFILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-	test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
 		mostlyclean-tags mostlyclean-generic
 
@@ -230,7 +250,7 @@ clean:  clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
 
 distclean:  distclean-noinstLIBRARIES distclean-compile distclean-tags \
 		distclean-generic clean
-	rm -f config.status
+	-rm -f config.status
 
 maintainer-clean:  maintainer-clean-noinstLIBRARIES \
 		maintainer-clean-compile maintainer-clean-tags \
@@ -243,8 +263,8 @@ clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile tags mostlyclean-tags distclean-tags \
 clean-tags maintainer-clean-tags distdir info dvi installcheck \
-install-info install-exec install-data install uninstall all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
+install-exec install-data install uninstall all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
diff --git a/texinfo/lib/README b/texinfo/lib/README
index 04ae4817aa9..6280ef53c9a 100644
--- a/texinfo/lib/README
+++ b/texinfo/lib/README
@@ -1,3 +1,4 @@
-Common routines to the Texinfo package.
+Common routines for the Texinfo package.
+
 Many are common to other GNU packages as well.
-(On the FSF machines, check /gd/gnu/lib for the latest.)
+(On the FSF machines, check /home/gd/gnu/lib for the latest.)
diff --git a/texinfo/lib/getopt.c b/texinfo/lib/getopt.c
index 300f86de3eb..fc87ce67d69 100644
--- a/texinfo/lib/getopt.c
+++ b/texinfo/lib/getopt.c
@@ -6,23 +6,23 @@
    Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97
    	Free Software Foundation, Inc.
 
-NOTE: The canonical source of this file is maintained with the GNU C Library.
-Bugs can be reported to bug-glibc@prep.ai.mit.edu.
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.  */
+   NOTE: The canonical source of this file is maintained with the GNU C Library.
+   Bugs can be reported to bug-glibc@prep.ai.mit.edu.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 /* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
    Ditto for AIX 3.2 and <stdlib.h>.  */
@@ -79,12 +79,6 @@ USA.  */
 #endif
 #endif
 
-#if defined (WIN32) && !defined (__CYGWIN32__)
-/* It's not Unix, really.  See?  Capital letters.  */
-#include <windows.h>
-#define getpid() GetCurrentProcessId()
-#endif
-
 #ifndef _
 /* This is for other GNU distributions with internationalized messages.
    When compiling libc, the _ macro is predefined.  */
@@ -262,8 +256,6 @@ static int nonoption_flags_len;
 static int original_argc;
 static char *const *original_argv;
 
-extern pid_t __libc_pid;
-
 /* Make sure the environment variable bash 2.0 puts in the environment
    is valid for the getopt call we must make sure that the ARGV passed
    to getopt is that one passed to the process.  */
@@ -276,7 +268,9 @@ store_args_and_env (int argc, char *const *argv)
   original_argc = argc;
   original_argv = argv;
 }
+# ifdef text_set_element
 text_set_element (__libc_subinit, store_args_and_env);
+# endif /* text_set_element */
 
 # define SWAP_FLAGS(ch1, ch2) \
   if (nonoption_flags_len > 0)						      \
@@ -329,9 +323,9 @@ exchange (argv)
 	nonoption_flags_len = nonoption_flags_max_len = 0;
       else
 	{
-	  memcpy (new_str, __getopt_nonoption_flags, nonoption_flags_max_len);
-	  memset (&new_str[nonoption_flags_max_len], '\0',
-		  top + 1 - nonoption_flags_max_len);
+	  memset (__mempcpy (new_str, __getopt_nonoption_flags,
+			     nonoption_flags_max_len),
+		  '\0', top + 1 - nonoption_flags_max_len);
 	  nonoption_flags_max_len = top + 1;
 	  __getopt_nonoption_flags = new_str;
 	}
@@ -440,11 +434,8 @@ _getopt_initialize (argc, argv, optstring)
 	      if (__getopt_nonoption_flags == NULL)
 		nonoption_flags_max_len = -1;
 	      else
-		{
-		  memcpy (__getopt_nonoption_flags, orig_str, len);
-		  memset (&__getopt_nonoption_flags[len], '\0',
-			  nonoption_flags_max_len - len);
-		}
+		memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),
+			'\0', nonoption_flags_max_len - len);
 	    }
 	}
       nonoption_flags_len = nonoption_flags_max_len;
diff --git a/texinfo/lib/getopt.h b/texinfo/lib/getopt.h
index 69256fd3864..c4adc30bbba 100644
--- a/texinfo/lib/getopt.h
+++ b/texinfo/lib/getopt.h
@@ -1,23 +1,23 @@
 /* Declarations for getopt.
    Copyright (C) 1989,90,91,92,93,94,96,97 Free Software Foundation, Inc.
 
-NOTE: The canonical source of this file is maintained with the GNU C Library.
-Bugs can be reported to bug-glibc@prep.ai.mit.edu.
+   NOTE: The canonical source of this file is maintained with the GNU C Library.
+   Bugs can be reported to bug-glibc@prep.ai.mit.edu.
 
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifndef _GETOPT_H
 #define _GETOPT_H 1
@@ -130,4 +130,4 @@ extern int _getopt_internal ();
 }
 #endif
 
-#endif /* _GETOPT_H */
+#endif /* getopt.h */
diff --git a/texinfo/lib/getopt1.c b/texinfo/lib/getopt1.c
index 6507ba1b1f6..af8e6819657 100644
--- a/texinfo/lib/getopt1.c
+++ b/texinfo/lib/getopt1.c
@@ -1,23 +1,23 @@
 /* getopt_long and getopt_long_only entry points for GNU getopt.
    Copyright (C) 1987,88,89,90,91,92,93,94,96,97 Free Software Foundation, Inc.
 
-NOTE: The canonical source of this file is maintained with the GNU C Library.
-Bugs can be reported to bug-glibc@prep.ai.mit.edu.
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.  */
+   NOTE: The canonical source of this file is maintained with the GNU C Library.
+   Bugs can be reported to bug-glibc@prep.ai.mit.edu.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 2, or (at your option) any
+   later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+   USA.  */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/texinfo/lib/system.h b/texinfo/lib/system.h
index 1a0a9768485..c0595c48d38 100644
--- a/texinfo/lib/system.h
+++ b/texinfo/lib/system.h
@@ -1,5 +1,5 @@
 /* system.h: System-dependent declarations.  Include this first.
-   $Id: system.h,v 1.2 1998/03/24 18:07:37 law Exp $
+   $Id: system.h,v 1.1.1.2 1998/03/24 18:19:53 law Exp $
 
    Copyright (C) 1997 Free Software Foundation, Inc.
 
diff --git a/texinfo/makeinfo/Makefile.am b/texinfo/makeinfo/Makefile.am
index a715d8bf6d3..536a27849cb 100644
--- a/texinfo/makeinfo/Makefile.am
+++ b/texinfo/makeinfo/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile.am for texinfo/makeinfo.
-## $Id: Makefile.am,v 1.2 1998/03/24 18:07:49 law Exp $
+## $Id: Makefile.am,v 1.3 1998/03/24 19:41:22 law Exp $
 ## Run automake in .. to produce Makefile.in from this.
 
 bin_PROGRAMS = makeinfo
diff --git a/texinfo/makeinfo/Makefile.in b/texinfo/makeinfo/Makefile.in
index 842b26e19d2..d1d76aba3fe 100644
--- a/texinfo/makeinfo/Makefile.in
+++ b/texinfo/makeinfo/Makefile.in
@@ -1,8 +1,14 @@
-# Makefile.in generated automatically by automake 1.2 from Makefile.am
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
 
 SHELL = /bin/sh
@@ -43,27 +49,26 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 DATADIRNAME = @DATADIRNAME@
-EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
+INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -91,7 +96,6 @@ EXTRA_DIST = README
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
-bin_PROGRAMS =  makeinfo$(EXEEXT)
 PROGRAMS =  $(bin_PROGRAMS)
 
 
@@ -119,9 +123,9 @@ OBJECTS = $(makeinfo_OBJECTS)
 default: all
 
 .SUFFIXES:
-.SUFFIXES: .c .o
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus makeinfo/Makefile
+.SUFFIXES: .S .c .o .s
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps makeinfo/Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
@@ -131,7 +135,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 mostlyclean-binPROGRAMS:
 
 clean-binPROGRAMS:
-	test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 
 distclean-binPROGRAMS:
 
@@ -148,7 +152,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	done
 
 uninstall-binPROGRAMS:
-	$(NORMAL_UNINSTALL)
+	@$(NORMAL_UNINSTALL)
 	list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \
 	done
@@ -156,37 +160,48 @@ uninstall-binPROGRAMS:
 .c.o:
 	$(COMPILE) -c $<
 
+.s.o:
+	$(COMPILE) -c $<
+
+.S.o:
+	$(COMPILE) -c $<
+
 mostlyclean-compile:
-	rm -f *.o core
+	-rm -f *.o core *.core
 
 clean-compile:
 
 distclean-compile:
-	rm -f *.tab.c
+	-rm -f *.tab.c
 
 maintainer-clean-compile:
 
-makeinfo$(EXEEXT): $(makeinfo_OBJECTS) $(makeinfo_DEPENDENCIES)
-	@rm -f makeinfo$(EXEEXT)
+makeinfo: $(makeinfo_OBJECTS) $(makeinfo_DEPENDENCIES)
+	@rm -f makeinfo
 	$(LINK) $(makeinfo_LDFLAGS) $(makeinfo_OBJECTS) $(makeinfo_LDADD) $(LIBS)
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES)
-	here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS)
+ID: $(HEADERS) $(SOURCES) $(LISP)
+	here=`pwd` && cd $(srcdir) \
+	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $(SOURCES) $(HEADERS) -o $$here/TAGS)
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 
 clean-tags:
 
 distclean-tags:
-	rm -f TAGS ID
+	-rm -f TAGS ID
 
 maintainer-clean-tags:
 
@@ -196,17 +211,20 @@ subdir = makeinfo
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  d=$(srcdir); \
 	  test -f $(distdir)/$$file \
 	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
 	  || cp -p $$d/$$file $(distdir)/$$file; \
 	done
+makeinfo.o: makeinfo.c ../lib/system.h ../config.h ../lib/getopt.h \
+	makeinfo.h
+multi.o: multi.c ../lib/system.h ../config.h makeinfo.h
+
 info:
 dvi:
 check: all
 	$(MAKE)
 installcheck:
-install-info:
 install-exec: install-binPROGRAMS
 	@$(NORMAL_INSTALL)
 
@@ -227,19 +245,19 @@ installdirs:
 
 
 mostlyclean-generic:
-	test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-	test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	rm -f Makefile $(DISTCLEANFILES)
-	rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(DISTCLEANFILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-	test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-binPROGRAMS mostlyclean-compile \
 		mostlyclean-tags mostlyclean-generic
 
@@ -248,7 +266,7 @@ clean:  clean-binPROGRAMS clean-compile clean-tags clean-generic \
 
 distclean:  distclean-binPROGRAMS distclean-compile distclean-tags \
 		distclean-generic clean
-	rm -f config.status
+	-rm -f config.status
 
 maintainer-clean:  maintainer-clean-binPROGRAMS maintainer-clean-compile \
 		maintainer-clean-tags maintainer-clean-generic \
@@ -261,8 +279,8 @@ clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
 install-binPROGRAMS mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile tags mostlyclean-tags distclean-tags \
 clean-tags maintainer-clean-tags distdir info dvi installcheck \
-install-info install-exec install-data install uninstall all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
+install-exec install-data install uninstall all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
diff --git a/texinfo/makeinfo/README b/texinfo/makeinfo/README
index 8b404caaf6d..2bfe6e1cbeb 100644
--- a/texinfo/makeinfo/README
+++ b/texinfo/makeinfo/README
@@ -1,6 +1,8 @@
-A standalone program to convert Texinfo source into Info files
-readable with standalone info or M-x info in Emacs.
-makeinfo can also output plain ASCII.
+makeinfo is a standalone program to convert Texinfo source into Info
+files readable with standalone info or M-x info in Emacs.
 
-The Emacs function M-x texinfo-format-buffer does the same job, but
-makeinfo is faster and gives better error messages.
+makeinfo can also output plain ASCII.  Work to support HTML and Troff
+output is almost complete.
+
+The Emacs function M-x texinfo-format-buffer does more or less the same
+job, but makeinfo is faster and gives better error messages.
diff --git a/texinfo/makeinfo/makeinfo.c b/texinfo/makeinfo/makeinfo.c
index 25f6c6cdfcb..e92065770ea 100644
--- a/texinfo/makeinfo/makeinfo.c
+++ b/texinfo/makeinfo/makeinfo.c
@@ -1,7 +1,8 @@
 /* Makeinfo -- convert Texinfo source files into Info files.
-   $Id: makeinfo.c,v 1.8 1998/03/24 18:07:53 law Exp $
+   $Id: makeinfo.c,v 1.11 1998/07/06 21:58:00 law Exp $
 
-   Copyright (C) 1987, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.
+   Copyright (C) 1987, 92, 93, 94, 95, 96, 97, 98
+   Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -115,6 +116,9 @@ int must_start_paragraph = 0;
 /* Nonzero means a string is in execution, as opposed to a file. */
 static int executing_string = 0;
 
+/* Nonzero means a macro string is in execution, as opposed to a file. */
+static int me_executing_string = 0;
+
 #if defined (HAVE_MACROS)
 /* If non-NULL, this is an output stream to write the full macro expansion
    of the input text to.  The result is another texinfo file, but
@@ -1082,10 +1086,11 @@ main (argc, argv)
         case 'V':
           /* User requested version info. */
           print_version_info ();
-          puts (_("Copyright (C) 1996 Free Software Foundation, Inc.\n\
+	  printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\
 There is NO warranty.  You may redistribute this software\n\
 under the terms of the GNU General Public License.\n\
-For more information about these matters, see the files named COPYING."));
+For more information about these matters, see the files named COPYING.\n"),
+		  "1998");
           exit (NO_ERROR);
           break;
 
@@ -1143,7 +1148,7 @@ For more information about these matters, see the files named COPYING."));
 void
 print_version_info ()
 {
-  printf (_("makeinfo (GNU %s %s) %d.%d\n"), PACKAGE, VERSION,
+  printf ("makeinfo (GNU %s %s) %d.%d\n", PACKAGE, VERSION,
           major_version, minor_version);
 }
 
@@ -1188,10 +1193,10 @@ Options:\n\
 --verbose              report about what is being done.\n\
 --version              display version information and exit.\n\
 \n\
-Email bug reports to bug-texinfo@prep.ai.mit.edu.\n\
+Email bug reports to bug-texinfo@gnu.org.\n\
 "),
-           progname, paragraph_start_indent,
-           fill_column, max_error_level, reference_warning_limit);
+           progname, max_error_level, fill_column,
+           paragraph_start_indent, reference_warning_limit);
   exit (exit_value);
 }
 
@@ -1248,8 +1253,8 @@ find_and_load (filename)
   if (file < 0)
     goto error_exit;
 
-  /* Load the file. */
-  result = (char *)xmalloc (1 + file_size);
+  /* Load the file, with enough room for a newline and a null. */
+  result = xmalloc (file_size + 2);
 
   /* VMS stat lies about the st_size value.  The actual number of
      readable bytes is always less than this value.  The arcane
@@ -1291,8 +1296,10 @@ find_and_load (filename)
   line_number = 1;
   /* Not strictly necessary.  This magic prevents read_token () from doing
      extra unnecessary work each time it is called (that is a lot of times).
-     The SIZE_OF_INPUT_TEXT is one past the actual end of the text. */
+     SIZE_OF_INPUT_TEXT is one past the actual end of the text. */
   input_text[size_of_input_text] = '\n';
+  /* This, on the other hand, is always necessary.  */
+  input_text[size_of_input_text+1] = 0;
   return (result);
 }
 
@@ -1333,7 +1340,7 @@ popfile ()
   filestack = filestack->next;
 
   /* Make sure that commands with braces have been satisfied. */
-  if (!executing_string)
+  if (!executing_string && !me_executing_string)
     discard_braces ();
 
   /* Get the top of the stack into the globals. */
@@ -1817,7 +1824,7 @@ get_until_in_line (expand, match, string)
      `execution_strings' array.  This happens when processing the
      (synthetic) Overview-Footnotes node in the Texinfo manual.  */
 
-  if (expand && !executing_string)
+  if (expand && !executing_string && !me_executing_string)
     {
       char *xp;
       unsigned xp_len, new_len;
@@ -1833,12 +1840,15 @@ get_until_in_line (expand, match, string)
       xp_len = strlen (xp);
       free (str);
       
-      /* Plunk the expansion into the middle of input_text.  */
-      str = xstrdup (input_text + limit);
-      new_len = input_text_offset + xp_len + strlen (str) + 1;
+      /* Plunk the expansion into the middle of `input_text' --
+         which is terminated by a newline, not a null.  */
+      str = xmalloc (real_bottom - limit + 1);
+      strncpy (str, input_text + limit, real_bottom - limit + 1);
+      new_len = input_text_offset + xp_len + real_bottom - limit + 1;
       input_text = xrealloc (input_text, new_len);
       strcpy (input_text + input_text_offset, xp);
-      strcat (input_text, str);
+      strncpy (input_text + input_text_offset + xp_len, str,
+	       real_bottom - limit + 1);
       free (str);
       free (xp);
       
@@ -3973,7 +3983,7 @@ cm_today (arg)
     {
       time_t timer = time (0);
       struct tm *ts = localtime (&timer);
-      add_word_args (_("%d %s %d"), ts->tm_mday, _(months[ts->tm_mon]),
+      add_word_args ("%d %s %d", ts->tm_mday, _(months[ts->tm_mon]),
                      ts->tm_year + 1900);
     }
 }
@@ -4160,7 +4170,7 @@ insert_and_underscore (with_char)
   no_indent = 1;
 
 #if defined (HAVE_MACROS)
-  if (macro_expansion_output_stream)
+  if (macro_expansion_output_stream && !executing_string)
     append_to_expansion_output (input_text_offset + 1);
 #endif /* HAVE_MACROS */
 
@@ -4168,7 +4178,7 @@ insert_and_underscore (with_char)
 
   starting_pos = output_position + output_paragraph_offset;
 #if defined (HAVE_MACROS)
-  if (macro_expansion_output_stream)
+  if (macro_expansion_output_stream && !executing_string)
     {
       char *temp1 = (char *) xmalloc (2 + strlen (temp));
       sprintf (temp1, "%s\n", temp);
@@ -4312,7 +4322,7 @@ cm_top ()
     {
       TAG_ENTRY *tag = tag_table;
 
-      line_error (_("There already is a node having %ctop as a section"),
+      line_error (_("Node with %ctop as a section already exists"),
                   COMMAND_PREFIX);
 
       while (tag != (TAG_ENTRY *)NULL)
@@ -4730,7 +4740,7 @@ cm_node ()
   current_footnote_number = 1;
 
 #if defined (HAVE_MACROS)
-  if (macro_expansion_output_stream)
+  if (macro_expansion_output_stream && !executing_string)
     append_to_expansion_output (input_text_offset + 1);
 #endif /* HAVE_MACROS */
 
@@ -4743,7 +4753,7 @@ cm_node ()
     printf (_("Formatting node %s...\n"), node);
     
 #if defined (HAVE_MACROS)
-  if (macro_expansion_output_stream)
+  if (macro_expansion_output_stream && !executing_string)
     remember_itext (input_text, input_text_offset);
 #endif /* HAVE_MACROS */
 
@@ -4753,7 +4763,7 @@ cm_node ()
       add_word_args ("\037\nFile: %s,  Node: ", pretty_output_filename);
 
 #if defined (HAVE_MACROS)
-      if (macro_expansion_output_stream)
+      if (macro_expansion_output_stream && !executing_string)
         me_execute_string (node);
       else
 #endif /* HAVE_MACROS */
@@ -4934,7 +4944,7 @@ cm_node ()
 #if defined (HAVE_MACROS)
   /* Insert the correct args if we are expanding macros, and the node's
      pointers weren't defaulted. */
-  if (macro_expansion_output_stream && !defaulting)
+  if (macro_expansion_output_stream && !executing_string && !defaulting)
     {
       char *temp;
       int op_orig = output_paragraph_offset;
@@ -5833,7 +5843,7 @@ cm_uref (arg, start_pos, end_pos)
   if (arg == END)
     {
       char *comma;
-      char *arg = &output_paragraph[start_pos];
+      char *arg = (char *) &output_paragraph[start_pos];
 
       output_paragraph[end_pos] = 0;
       output_column -= end_pos - start_pos;
@@ -5877,7 +5887,7 @@ cm_email (arg, start_pos, end_pos)
   if (arg == END)
     {
       char *comma;
-      char *arg = &output_paragraph[start_pos];
+      char *arg = (char *) &output_paragraph[start_pos];
 
       output_paragraph[end_pos] = 0;
       output_column -= end_pos - start_pos;
@@ -6314,8 +6324,8 @@ cm_value (arg, start_pos, end_pos)
 {
   if (arg == END)
     {
-      char *name, *value;
-      name = &output_paragraph[start_pos];
+      char *name = (char *) &output_paragraph[start_pos];
+      char *value;
       output_paragraph[end_pos] = 0;
       name = xstrdup (name);
       value = set_p (name);
@@ -6623,13 +6633,10 @@ expansion (str, implicit_code)
   /* Inhibit any real output.  */
   int start = output_paragraph_offset;
   int saved_paragraph_is_open = paragraph_is_open;
-  FILE *saved_macro_expansion_output_stream = macro_expansion_output_stream;
 
   inhibit_output_flushing ();
-  macro_expansion_output_stream = NULL;
   paragraph_is_open = 1;
   execute_string (implicit_code ? "@code{%s}" : "%s", str);
-  macro_expansion_output_stream = saved_macro_expansion_output_stream;
   uninhibit_output_flushing ();
 
   /* Copy the expansion from the buffer.  */
@@ -7268,29 +7275,27 @@ defun_internal (type, x_p)
   current_indent -= default_indentation_increment;
   close_single_paragraph ();
 
-  if (!macro_expansion_output_stream)
-    /* Make an entry in the appropriate index unless we are just
-       expanding macros. */
-    switch (base_type)
-      {
-      case deffn:
-      case deftypefn:
-        execute_string ("%cfindex %s\n", COMMAND_PREFIX, defined_name);
-        break;
-      case defvr:
-      case deftypevr:
-      case defcv:
-        execute_string ("%cvindex %s\n", COMMAND_PREFIX, defined_name);
-        break;
-      case defop:
-      case deftypemethod:
-        execute_string ("%cfindex %s on %s\n",
-                        COMMAND_PREFIX, defined_name, type_name);
-        break;
-      case deftp:
-        execute_string ("%ctindex %s\n", COMMAND_PREFIX, defined_name);
-        break;
-      }
+  /* Make an entry in the appropriate index. */
+  switch (base_type)
+    {
+    case deffn:
+    case deftypefn:
+      execute_string ("%cfindex %s\n", COMMAND_PREFIX, defined_name);
+      break;
+    case defvr:
+    case deftypevr:
+    case defcv:
+      execute_string ("%cvindex %s\n", COMMAND_PREFIX, defined_name);
+      break;
+    case defop:
+    case deftypemethod:
+      execute_string ("%cfindex %s on %s\n",
+		      COMMAND_PREFIX, defined_name, type_name);
+      break;
+    case deftp:
+      execute_string ("%ctindex %s\n", COMMAND_PREFIX, defined_name);
+      break;
+    }
 
   /* Deallocate the token list. */
   scan_args = defun_args;
@@ -7562,7 +7567,7 @@ cm_include ()
   char *filename;
 
 #if defined (HAVE_MACROS)
-  if (macro_expansion_output_stream)
+  if (macro_expansion_output_stream && !executing_string)
     me_append_before_this_command ();
 #endif /* HAVE_MACROS */
 
@@ -7570,7 +7575,7 @@ cm_include ()
   get_rest_of_line (&filename);
 
 #if defined (HAVE_MACROS)
-  if (macro_expansion_output_stream)
+  if (macro_expansion_output_stream && !executing_string)
     remember_itext (input_text, input_text_offset);
 #endif /* HAVE_MACROS */
 
@@ -7608,7 +7613,7 @@ cm_include ()
   else
     {
 #if defined (HAVE_MACROS)
-      if (macro_expansion_output_stream)
+      if (macro_expansion_output_stream && !executing_string)
         remember_itext (input_text, input_text_offset);
 #endif /* HAVE_MACROS */
       reader_loop ();
@@ -7936,7 +7941,7 @@ index_add_arg (name)
   which = tem ? tem->write_index : -1;
 
 #if defined (HAVE_MACROS)
-  if (macro_expansion_output_stream)
+  if (macro_expansion_output_stream && !executing_string)
     append_to_expansion_output (input_text_offset + 1);
 #endif /* HAVE_MACROS */
 
@@ -7944,7 +7949,7 @@ index_add_arg (name)
   ignore_blank_line ();
 
 #if defined (HAVE_MACROS)
-  if (macro_expansion_output_stream)
+  if (macro_expansion_output_stream && !executing_string)
     {
       int op_orig;
 
@@ -8436,12 +8441,12 @@ cm_footnote ()
   char *marker;
   char *note;
 
-  if (macro_expansion_output_stream)
-    append_to_expansion_output (input_text_offset + 1); /* include the { */
-
   get_until ("{", &marker);
   canon_white (marker);
 
+  if (macro_expansion_output_stream && !executing_string)
+    append_to_expansion_output (input_text_offset + 1); /* include the { */
+
   /* Read the argument in braces. */
   if (curchar () != '{')
     {
@@ -8483,7 +8488,7 @@ cm_footnote ()
 
   /* Must write the macro-expanded argument to the macro expansion
      output stream.  This is like the case in index_add_arg.  */
-  if (macro_expansion_output_stream)
+  if (macro_expansion_output_stream && !executing_string)
     {
       int op_orig;
 
@@ -8854,10 +8859,10 @@ apply (named, actuals, body)
             }
           else
             { /* not a parameter, restore \'s */
-              char *trailer = body[i] ? "/" : "";
-              len += 1 + strlen (trailer);
-              text = (char *)xmalloc (1 + len);
-              sprintf (text, "\\%s%s", param, trailer);
+              i = body[i] ? (i - 1) : i;
+              len++;
+              text = xmalloc (1 + len);
+              sprintf (text, "\\%s", param);
             }
 
           if ((2 + strlen (param)) < len)
@@ -8888,7 +8893,7 @@ execute_macro (def)
   int num_args;
   char *execution_string = (char *)NULL;
 
-  if (macro_expansion_output_stream && !me_inhibit_expansion)
+  if (macro_expansion_output_stream && !executing_string && !me_inhibit_expansion)
     me_append_before_this_command ();
 
   /* Find out how many arguments this macro definition takes. */
@@ -8911,7 +8916,7 @@ execute_macro (def)
 
   if (def->body)
     {
-      if (macro_expansion_output_stream && !me_inhibit_expansion)
+      if (macro_expansion_output_stream && !executing_string && !me_inhibit_expansion)
         {
           remember_itext (input_text, input_text_offset);
           me_execute_string (execution_string);
@@ -8939,7 +8944,7 @@ cm_macro ()
   body_size = 0;
   body_index = 0;
 
-  if (macro_expansion_output_stream)
+  if (macro_expansion_output_stream && !executing_string)
     me_append_before_this_command ();
 
   skip_whitespace ();
@@ -9136,7 +9141,7 @@ cm_macro ()
 
   add_macro (name, arglist, body, input_filename, defining_line, flags);
 
-  if (macro_expansion_output_stream)
+  if (macro_expansion_output_stream && !executing_string)
     remember_itext (input_text, input_text_offset);
 }
 
@@ -9147,7 +9152,7 @@ cm_unmacro ()
   char *line, *name;
   MACRO_DEF *def;
 
-  if (macro_expansion_output_stream)
+  if (macro_expansion_output_stream && !executing_string)
     me_append_before_this_command ();
 
   get_rest_of_line (&line);
@@ -9181,7 +9186,7 @@ cm_unmacro ()
   free (line);
   free (name);
 
-  if (macro_expansion_output_stream)
+  if (macro_expansion_output_stream && !executing_string)
     remember_itext (input_text, input_text_offset);
 }
 
@@ -9284,10 +9289,10 @@ me_execute_string (execution_string)
 
   remember_itext (execution_string, 0);
 
-  executing_string++;
+  me_executing_string++;
   reader_loop ();
   popfile ();
-  executing_string--;
+  me_executing_string--;
 }
 
 /* Append the text which appears in input_text from the last offset to
@@ -9307,7 +9312,7 @@ append_to_expansion_output (offset)
       }
 
   if (!itext)
-    itext = remember_itext (input_text, 0);
+    return;
 
   if (offset > itext->offset)
     {
diff --git a/texinfo/missing b/texinfo/missing
index a6abd069801..79a3e4ed66b 100755
--- a/texinfo/missing
+++ b/texinfo/missing
@@ -80,7 +80,15 @@ WARNING: \`$1' is missing on your system.  You should only need it if
          you modified \`acconfig.h' or \`configure.in'.  You might want
          to install the \`Autoconf' and \`GNU m4' packages.  Grab them
          from any GNU archive site."
-    touch config.h.in
+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER([^):]*:\([^)]*\)).*/\1/p' configure.in`
+    if test -z "$files"; then
+      files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^):]*\)).*/\1/p' configure.in`
+      test -z "$files" || files="$files.in"
+    else
+      files=`echo "$files" | sed -e 's/:/ /g'`
+    fi
+    test -z "$files" && files="config.h.in"
+    touch $files
     ;;
 
   automake)
diff --git a/texinfo/mkinstalldirs b/texinfo/mkinstalldirs
index 18325938df9..0f5dbd3af71 100755
--- a/texinfo/mkinstalldirs
+++ b/texinfo/mkinstalldirs
@@ -4,7 +4,7 @@
 # Created: 1993-05-16
 # Public domain
 
-# $Id: mkinstalldirs,v 1.3 1998/03/24 18:05:22 law Exp $
+# $Id: mkinstalldirs,v 1.1.1.2 1998/03/24 18:19:28 law Exp $
 
 errstatus=0
 
diff --git a/texinfo/po/ChangeLog b/texinfo/po/ChangeLog
index 55848cb5866..e69de29bb2d 100644
--- a/texinfo/po/ChangeLog
+++ b/texinfo/po/ChangeLog
@@ -1,5 +0,0 @@
-Thu Sep  4 15:01:33 1997  Jeffrey A Law  (law@cygnus.com)
-
-	* Makefile.in.in (install-info): Add dummy target.
-
-
diff --git a/texinfo/po/Makefile.in.in b/texinfo/po/Makefile.in.in
index 69159ea9135..c25fea49b01 100644
--- a/texinfo/po/Makefile.in.in
+++ b/texinfo/po/Makefile.in.in
@@ -1,19 +1,10 @@
 # Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# This file file be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+# Please note that the actual code is *not* freely available.
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
@@ -35,7 +26,7 @@ subdir = po
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
+MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
 
 CC = @CC@
 GENCAT = @GENCAT@
@@ -71,35 +62,19 @@ INSTOBJEXT = @INSTOBJEXT@
 	$(COMPILE) $<
 
 .po.pox:
-	if [ x"@MAINT@" = x ]; then \
-	  $(MAKE) $(PACKAGE).pot; \
-	  $(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox; \
-	else \
-	  touch $@; \
-	fi
+	$(MAKE) $(PACKAGE).pot
+	$(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox
 
 .po.mo:
-	if [ x"@MAINT@" = x ]; then \
-	  $(MSGFMT) -o $@ $<; \
-	else \
-	  touch $@; \
-	fi
+	$(MSGFMT) -o $@ $<
 
 .po.gmo:
-	if [ x"@MAINT@" = x ]; then \
-	  file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
-	    && rm -f $$file && $(GMSGFMT) -o $$file $<; \
-	else \
-	  touch $@; \
-	fi
+	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
+	  && rm -f $$file && $(GMSGFMT) -o $$file $<
 
 .po.cat:
-	if [ x"@MAINT@" = x ]; then \
-	  sed -f ../intl/po2msg.sed < $< > $*.msg \
-	    && rm -f $@ && $(GENCAT) $@ $*.msg; \
-	else \
-	  touch $@; \
-	fi
+	sed -f ../intl/po2msg.sed < $< > $*.msg \
+	  && rm -f $@ && $(GENCAT) $@ $*.msg
 
 
 all: all-@USE_NLS@
@@ -107,20 +82,15 @@ all: all-@USE_NLS@
 all-yes: cat-id-tbl.c $(CATALOGS)
 all-no:
 
-$(PACKAGE).pot: @MAINT@ $(POTFILES)
+$(srcdir)/$(PACKAGE).pot: $(POTFILES)
 	$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
 	  --add-comments --keyword=_ --keyword=N_ \
 	  --files-from=$(srcdir)/POTFILES.in
-	if [ ! -s $(PACKAGE).po ] \
-	  || cmp -s $(PACKAGE).po $(srcdir)/$(PACKAGE).pot; then \
-	  rm -f $(PACKAGE).po; \
-	else \
-	  rm -f $(srcdir)/$(PACKAGE).pot \
-	    && mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot; \
-	fi
+	rm -f $(srcdir)/$(PACKAGE).pot
+	mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot
 
-cat-id-tbl.c: stamp-cat-id
-stamp-cat-id: @MAINT@ $(PACKAGE).pot
+$(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
+$(srcdir)/stamp-cat-id: $(PACKAGE).pot
 	rm -f cat-id-tbl.tmp
 	sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \
 		| sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp
@@ -146,11 +116,12 @@ install-data-yes: all
 	fi
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
 	  case "$$cat" in \
 	    *.gmo) destdir=$(gnulocaledir);; \
 	    *)     destdir=$(localedir);; \
 	  esac; \
-	  lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
+	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
 	  dir=$$destdir/$$lang/LC_MESSAGES; \
 	  if test -r $(MKINSTALLDIRS); then \
 	    $(MKINSTALLDIRS) $$dir; \
@@ -185,8 +156,8 @@ install-data-yes: all
 	  else \
 	    $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
 	  fi; \
-	  cd $(srcdir) && \
-	    $(INSTALL_DATA) Makefile.in.in $(gettextsrcdir)/Makefile.in.in; \
+	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
+			  $(gettextsrcdir)/Makefile.in.in; \
 	else \
 	  : ; \
 	fi
@@ -197,7 +168,8 @@ installcheck:
 uninstall:
 	catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
-	  lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
 	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
 	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
 	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
@@ -209,7 +181,7 @@ check: all
 
 cat-id-tbl.o: ../intl/libgettext.h
 
-dvi info install-info tags TAGS ID:
+dvi info tags TAGS ID:
 
 mostlyclean:
 	rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp
@@ -223,6 +195,7 @@ distclean: clean
 maintainer-clean: distclean
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
+	rm -f $(GMOFILES)
 
 distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
 dist distdir: update-po $(DISTFILES)
@@ -238,7 +211,8 @@ update-po: Makefile
 	cd $(srcdir); \
 	catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
-	  lang=`echo $$cat | sed 's/$(CATOBJEXT)$$//'`; \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
 	  mv $$lang.po $$lang.old.po; \
 	  echo "$$lang:"; \
 	  if $(MSGMERGE) $$lang.old.po $(PACKAGE).pot -o $$lang.po; then \
@@ -256,9 +230,12 @@ POTFILES: POTFILES.in
 	  else \
 	    posrcprefix="../"; \
 	  fi; \
-	  sed -e '/^#/d' -e '/^[ 	]*$$/d' \
-	      -e "s@.*@	$$posrcprefix& \\\\@" \
-	      -e '$$s/\(.*\) \\/\1/' < $(srcdir)/POTFILES.in > POTFILES )
+	  rm -f $@-t $@ \
+	    && (sed -e '/^#/d' -e '/^[ 	]*$$/d' \
+		    -e "s@.*@	$$posrcprefix& \\\\@" < $(srcdir)/$@.in \
+		| sed -e '$$s/\\$$//') > $@-t \
+	    && chmod a-w $@-t \
+	    && mv $@-t $@ )
 
 Makefile: Makefile.in.in ../config.status POTFILES
 	cd .. \
diff --git a/texinfo/po/POTFILES.in b/texinfo/po/POTFILES.in
index 3efaaac8d02..8debb07e931 100644
--- a/texinfo/po/POTFILES.in
+++ b/texinfo/po/POTFILES.in
@@ -1,19 +1,21 @@
 # List of source files containing translatable strings.
 # The last line must not be a comment.
 
-info/doc.c
 info/echo-area.c
 info/footnotes.c
+info/footnotes.h
 info/indices.c
 info/info.c
+info/info.h
 info/infodoc.c
 info/m-x.c
 info/makedoc.c
 info/nodemenu.c
-info/nodes.h
 info/session.c
+info/tilde.c
 info/variables.c
 info/window.c
+lib/getopt.c
 makeinfo/makeinfo.c
 makeinfo/multi.c
 util/install-info.c
diff --git a/texinfo/po/cat-id-tbl.c b/texinfo/po/cat-id-tbl.c
index e0d2ce8083b..f40dc22b199 100644
--- a/texinfo/po/cat-id-tbl.c
+++ b/texinfo/po/cat-id-tbl.c
@@ -498,4 +498,5 @@ Email bug reports to bug-texinfo@prep.ai.mit.edu.", 358},
   {"%s; for file `%s'.\n", 363},
   {"Virtual memory exhausted in %s ()!  Needed %d bytes.", 364},
 };
+
 int _msg_tbl_length = 364;
diff --git a/texinfo/po/de.po b/texinfo/po/de.po
index 444ea5703c7..081cce67a6a 100644
--- a/texinfo/po/de.po
+++ b/texinfo/po/de.po
@@ -1,505 +1,134 @@
-# German messages for the GNU Texinfo package.
-# Copyright (C) 1996 Free Software Foundation, Inc.
-# Karl Eichwalder <ke@ke.central.de>, 1996.
+# German messages for GNU Texinfo
+# Copyright © 1996, 1997, 1998 Free Software Foundation, Inc.
+# Karl Eichwalder <ke@ke.Central.DE>, 1996.
+# Karl Eichwalder <ke@SuSE.DE>, 1997,1998.
+#
+# 1998-02-28 14:29:49 MET
+# Revised for 3.11b
+# I refuse to translate getopt.c strings
+# -ke-
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU Texinfo 3.9bPOT-Creation-Date: 1997-07-11 "
-"11:21-0400PO-Revision-Date: 1996-12-17 21:27 METLast-Translator: Karl "
-"Eichwalder <ke@ke.central.de>Language-Team: German <de@li.org>MIME-Version: "
-"1.0Content-Type: text/plain; charset=ISO-8859-1Content-Transfer-Encoding: "
-"8-bitPOT-Creation-Date: 1997-07-13 17:12-0400POT-Creation-Date: 1997-07-13 "
-"17:12-0400POT-Creation-Date: 1997-07-13 17:12-0400POT-Creation-Date: "
-"1997-07-13 17:12-0400POT-Creation-Date: 1997-07-15 "
-"14:50-0400POT-Creation-Date: 1997-07-15 14:50-0400POT-Creation-Date: "
-"1997-07-15 15:35-0400POT-Creation-Date: 1997-07-15 "
-"15:35-0400POT-Creation-Date: 1997-07-17 17:50-0400POT-Creation-Date: "
-"1997-07-18 10:40-0400POT-Creation-Date: 1997-07-19 "
-"17:19-0400POT-Creation-Date: 1997-07-20 08:19-0400POT-Creation-Date: "
-"1997-07-20 08:19-0400POT-Creation-Date: 1997-07-20 "
-"08:19-0400POT-Creation-Date: 1997-07-25 17:57-0400POT-Creation-Date: "
-"1997-07-25 17:57-0400POT-Creation-Date: 1997-07-29 "
-"18:04-0400POT-Creation-Date: 1997-07-31 17:43-0400POT-Creation-Date: "
-"1997-07-31 17:43-0400\n"
-
-#. Commands found in "./session.c".
-#: info/doc.c:27 info/session.c:629
-#, fuzzy
-msgid "Move down to the next line"
-msgstr "Zum Ende dieser Zeile bewegen"
-
-#. Move WINDOW's point up to the previous line if possible.
-#: info/doc.c:28 info/session.c:644
-#, fuzzy
-msgid "Move up to the previous line"
-msgstr "Zum Ende dieser Zeile bewegen"
-
-#. Move WINDOW's point to the end of the true line.
-#: info/doc.c:29 info/session.c:659
-#, fuzzy
-msgid "Move to the end of the line"
-msgstr "Zum Ende dieser Zeile bewegen"
-
-#. Move WINDOW's point to the beginning of the true line.
-#: info/doc.c:30 info/session.c:679
-#, fuzzy
-msgid "Move to the start of the line"
-msgstr "Zum Anfang dieser Zeile bewegen"
+"Project-Id-Version: texinfo 3.11\n"
+"POT-Creation-Date: 1998-03-03 13:32-0500\n"
+"PO-Revision-Date: 1998-02-28 14:32+01:00\n"
+"Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
+"Language-Team: German <de@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8-bit\n"
 
-#. Commands found in "./echo-area.c".
-#: info/doc.c:31 info/doc.c:84 info/echo-area.c:283 info/session.c:698
+#. ****************************************************************
+#.
+#. Echo Area Movement Commands
+#.
+#. ****************************************************************
+#: info/echo-area.c:283 info/session.c:698
 msgid "Move forward a character"
 msgstr "Ein Zeichen vorwärts bewegen"
 
 #. Move point backward in the node.
-#: info/doc.c:32 info/doc.c:85 info/echo-area.c:295 info/session.c:714
+#: info/echo-area.c:295 info/session.c:714
 msgid "Move backward a character"
 msgstr "Ein Zeichen rückwärts bewegen"
 
+#: info/echo-area.c:307
+msgid "Move to the start of this line"
+msgstr "Zum Anfang dieser Zeile bewegen"
+
+#: info/echo-area.c:312
+msgid "Move to the end of this line"
+msgstr "Zum Ende dieser Zeile bewegen"
+
 #. Move forward a word in the input line.
-#: info/doc.c:33 info/doc.c:88 info/echo-area.c:320 info/session.c:732
+#: info/echo-area.c:320 info/session.c:732
 msgid "Move forward a word"
 msgstr "Ein Wort vorwärts bewegen"
 
-#: info/doc.c:34 info/doc.c:89 info/echo-area.c:360 info/session.c:781
+#: info/echo-area.c:360 info/session.c:781
 msgid "Move backward a word"
 msgstr "Ein Wort rückwärts bewegen"
 
-#: info/doc.c:35 info/session.c:1121
-msgid "Move forwards or down through node structure"
-msgstr ""
-
-#: info/doc.c:36 info/session.c:1137
-msgid "Move backwards or up through node structure"
-msgstr ""
-
-# checkit
-#. Show the next screen of WINDOW's node.
-#: info/doc.c:37 info/session.c:1152
-#, fuzzy
-msgid "Scroll forward in this window"
-msgstr "Vervollständigungs-Fenster »scrollen«"
-
-# checkit
-#. Show the previous screen of WINDOW's node.
-#: info/doc.c:38 info/session.c:1197
-#, fuzzy
-msgid "Scroll backward in this window"
-msgstr "Vervollständigungs-Fenster »scrollen«"
-
-#. Move to the beginning of the node.
-#: info/doc.c:39 info/session.c:1237
-#, fuzzy
-msgid "Move to the start of this node"
-msgstr "Zum Anfang dieser Zeile bewegen"
-
-#. Move to the end of the node.
-#: info/doc.c:40 info/session.c:1244
-#, fuzzy
-msgid "Move to the end of this node"
-msgstr "Zum Ende dieser Zeile bewegen"
-
-# checkit
-#. ****************************************************************
-#.
-#. Commands for Manipulating Windows
-#.
-#. ****************************************************************
-#. Make the next window in the chain be the active window.
-#: info/doc.c:41 info/session.c:1257
-#, fuzzy
-msgid "Select the next window"
-msgstr "Vervollständigungs-Fenster »scrollen«"
-
-# checkit
-#. Make the previous window in the chain be the active window.
-#: info/doc.c:42 info/session.c:1296
-#, fuzzy
-msgid "Select the previous window"
-msgstr "Vervollständigungs-Fenster »scrollen«"
-
-# checkit
-#. Split WINDOW into two windows, both showing the same node.  If we
-#. are automatically tiling windows, re-tile after the split.
-#: info/doc.c:43 info/session.c:1347
-#, fuzzy
-msgid "Split the current window"
-msgstr "Vervollständigungs-Fenster »scrollen«"
-
-# checkit
-#. Delete WINDOW, forgetting the list of last visited nodes.  If we are
-#. automatically displaying footnotes, show or remove the footnotes
-#. window.  If we are automatically tiling windows, re-tile after the
-#. deletion.
-#: info/doc.c:44 info/session.c:1428
-#, fuzzy
-msgid "Delete the current window"
-msgstr "Das Zeichen hinter dem Cursor löschen"
-
-#. Just keep WINDOW, deleting all others.
-#: info/doc.c:45 info/session.c:1469
-msgid "Delete all other windows"
-msgstr ""
-
-# checkit
-#. Scroll the "other" window of WINDOW.
-#: info/doc.c:46 info/session.c:1515
-#, fuzzy
-msgid "Scroll the other window"
-msgstr "Vervollständigungs-Fenster »scrollen«"
-
-#. Change the size of WINDOW by AMOUNT.
-#: info/doc.c:47 info/session.c:1535
-msgid "Grow (or shrink) this window"
-msgstr ""
-
-#: info/doc.c:48 info/session.c:1546
-msgid "Divide the available screen space among the visible windows"
-msgstr ""
-
-#: info/doc.c:49 info/session.c:1553
-msgid "Toggle the state of line wrapping in the current window"
-msgstr ""
-
-#. Make WINDOW display the "Next:" node of the node currently being
-#. displayed.
-#: info/doc.c:50 info/session.c:1714
-msgid "Select the `Next' node"
-msgstr ""
-
-#. Make WINDOW display the "Prev:" node of the node currently being
-#. displayed.
-#: info/doc.c:51 info/session.c:1722
-msgid "Select the `Prev' node"
-msgstr ""
-
-#. Make WINDOW display the "Up:" node of the node currently being
-#. displayed.
-#: info/doc.c:52 info/session.c:1730
-msgid "Select the `Up' node"
-msgstr ""
-
-#. Make WINDOW display the last node of this info file.
-#: info/doc.c:53 info/session.c:1737
-#, fuzzy
-msgid "Select the last node in this file"
-msgstr "Zum Anfang dieser Zeile bewegen"
-
-#. Make WINDOW display the first node of this info file.
-#: info/doc.c:54 info/session.c:1759
-msgid "Select the first node in this file"
-msgstr ""
-
-#: info/doc.c:55 info/session.c:2401
-msgid "Select the most recently selected node"
-msgstr ""
-
-#: info/doc.c:56 info/session.c:1778
-#, fuzzy
-msgid "Select the last item in this node's menu"
-msgstr "Es sind keine %d Punkte in diesem Menu."
-
-#. Use KEY (a digit) to select the Nth menu item in WINDOW->node.
-#: info/doc.c:57 info/session.c:1784
-#, fuzzy
-msgid "Select this menu item"
-msgstr "Ersten Menupunkt auswählen..."
-
-#. Read a line (with completion) which is the name of a menu item,
-#. and select that item.
-#: info/doc.c:58 info/session.c:2042
-#, fuzzy
-msgid "Read a menu item and select its node"
-msgstr "Es gibt keinen Menupunkt »%s« in diesem Node."
-
-#: info/doc.c:59 info/session.c:2050
-msgid "Read a footnote or cross reference and select its node"
-msgstr ""
-
-#. Position the cursor at the start of this node's menu.
-#: info/doc.c:60 info/session.c:2056
-#, fuzzy
-msgid "Move to the start of this node's menu"
-msgstr "Zum Anfang dieser Zeile bewegen"
-
-#: info/doc.c:61 info/session.c:2080
-msgid "Visit as many menu items at once as possible"
-msgstr ""
-
-#. Read a line of input which is a node name, and go to that node.
-#: info/doc.c:62 info/session.c:2108
-#, fuzzy
-msgid "Read a node name and select it"
-msgstr "Lies einen Befehlsnamen in der »Echo-Area« und führe ihn aus"
-
-#: info/doc.c:63 info/session.c:2194
-#, fuzzy
-msgid "Read a manpage reference and select it"
-msgstr "Lies einen Befehlsnamen in der »Echo-Area« und führe ihn aus"
-
-#. Move to the "Top" node in this file.
-#: info/doc.c:64 info/session.c:2228
-#, fuzzy
-msgid "Select the node `Top' in this file"
-msgstr "Zum Ende dieser Zeile bewegen"
-
-#. Move to the node "(dir)Top".
-#: info/doc.c:65 info/session.c:2234
-msgid "Select the node `(dir)'"
-msgstr ""
-
-#. Kill named node.
-#: info/doc.c:66 info/session.c:2407
-msgid "Kill this node"
-msgstr ""
-
-#. Read the name of a file and select the entire file.
-#: info/doc.c:67 info/session.c:2415
-#, fuzzy
-msgid "Read the name of a file and select it"
-msgstr "Lese den Namen eines Info-Befehls und beschreibe ihn"
-
-#: info/doc.c:68 info/session.c:2634
-msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
-msgstr ""
-
-#: info/doc.c:69 info/session.c:2946
-msgid "Read a string and search for it"
-msgstr ""
-
-#: info/doc.c:70 info/doc.c:71 info/session.c:3020 info/session.c:3026
-msgid "Search interactively for a string as you type it"
-msgstr ""
-
-#: info/doc.c:72 info/session.c:3579
-msgid "Move to the previous cross reference"
-msgstr ""
-
-#: info/doc.c:73 info/session.c:3588
-#, fuzzy
-msgid "Move to the next cross reference"
-msgstr "Zum Ende dieser Zeile bewegen"
-
-#: info/doc.c:74 info/session.c:3598
-msgid "Select reference or menu item appearing on this line"
-msgstr ""
-
-# checkit
-#. ****************************************************************
-#.
-#. Miscellaneous Info Commands
-#.
-#. ****************************************************************
-#. What to do when C-g is pressed in a window.
-#: info/doc.c:75 info/session.c:3620
-msgid "Cancel current operation"
-msgstr "Momentane Operation abbrechen"
-
-#: info/doc.c:76 info/session.c:3636
-msgid "Move to the cursor to a specific line of the window"
-msgstr ""
-
-#. Clear the screen and redraw its contents.  Given a numeric argument,
-#. move the line the cursor is on to the COUNT'th line of the window.
-#: info/doc.c:77 info/session.c:3668
-msgid "Redraw the display"
-msgstr ""
-
-#. This command does nothing.  It is the fact that a key is bound to it
-#. that has meaning.  See the code at the top of info_session ().
-#: info/doc.c:78 info/session.c:3705
-msgid "Quit using Info"
-msgstr ""
-
-#: info/doc.c:80 info/session.c:3958
-msgid "Add this digit to the current numeric argument"
-msgstr ""
-
-#: info/doc.c:81
-msgid "universal-argument"
-msgstr ""
-
-#: info/doc.c:81 info/session.c:3967
-msgid "Start (or multiply by 4) the current numeric argument"
-msgstr ""
-
-#: info/doc.c:82 info/session.c:3982
-msgid "Internally used by \\[universal-argument]"
-msgstr ""
-
-#: info/doc.c:86 info/echo-area.c:307
-msgid "Move to the start of this line"
-msgstr "Zum Anfang dieser Zeile bewegen"
-
-#: info/doc.c:87 info/echo-area.c:312
-msgid "Move to the end of this line"
-msgstr "Zum Ende dieser Zeile bewegen"
-
-#: info/doc.c:90 info/echo-area.c:400
+#: info/echo-area.c:400
 msgid "Delete the character under the cursor"
 msgstr "Das Zeichen unter dem Cursor löschen"
 
 # checkit
-#: info/doc.c:91 info/echo-area.c:430
+#: info/echo-area.c:430
 msgid "Delete the character behind the cursor"
 msgstr "Das Zeichen hinter dem Cursor löschen"
 
-#: info/doc.c:92 info/echo-area.c:451
+#: info/echo-area.c:451
 msgid "Cancel or quit operation"
 msgstr "Operation abbrechen oder beenden"
 
-#: info/doc.c:93 info/echo-area.c:466
+#: info/echo-area.c:466
 msgid "Accept (or force completion of) this line"
 msgstr "Akzeptiere diese Zeile (oder erzwinge ihre Vervollständigung)"
 
-#: info/doc.c:94 info/echo-area.c:471
+#: info/echo-area.c:471
 msgid "Insert next character verbatim"
 msgstr "Das nächste Zeichen wörtlich eingeben"
 
-#: info/doc.c:95 info/echo-area.c:479
+#: info/echo-area.c:479
 msgid "Insert this character"
 msgstr "Dieses Zeichen eingeben"
 
 # checkit
-#: info/doc.c:96 info/echo-area.c:497
+#: info/echo-area.c:497
 msgid "Insert a TAB character"
 msgstr "Ein TAB-Zeichen eingeben"
 
 #. Transpose the characters at point.  If point is at the end of the line,
 #. then transpose the characters before point.
-#: info/doc.c:97 info/echo-area.c:504
+#: info/echo-area.c:504
 msgid "Transpose characters at point"
 msgstr "Zeichen am Point umstellen"
 
-#: info/doc.c:98 info/echo-area.c:555
+#: info/echo-area.c:555
 msgid "Yank back the contents of the last kill"
 msgstr "Füge den Inhalt des letzten Killens ein"
 
+# IMO muss "kill" auch im Folgenden wörtlich üs werden -ke-
+#: info/echo-area.c:562
+msgid "Kill ring is empty"
+msgstr "Der Kill-Ring ist leer"
+
 #. If the last command was yank, or yank_pop, and the text just before
 #. point is identical to the current kill item, then delete that text
 #. from the line, rotate the index down, and yank back some other text.
-#: info/doc.c:99 info/echo-area.c:575
+#: info/echo-area.c:575
 msgid "Yank back a previous kill"
 msgstr "Füge ein vorangehendes Killen ein"
 
 #. Delete the text from point to end of line.
-#: info/doc.c:100 info/echo-area.c:608
+#: info/echo-area.c:608
 msgid "Kill to the end of the line"
 msgstr "Bis zum Ende der Zeile killen"
 
-#: info/doc.c:101 info/echo-area.c:621
+#: info/echo-area.c:621
 msgid "Kill to the beginning of the line"
 msgstr "Bis zum Anfang der Zeile killen"
 
 #. Delete from point to the end of the current word.
-#: info/doc.c:102 info/echo-area.c:633
+#: info/echo-area.c:633
 msgid "Kill the word following the cursor"
 msgstr "Das dem Cursor folgende Wort killen"
 
-#: info/doc.c:103 info/echo-area.c:652
+#: info/echo-area.c:652
 msgid "Kill the word preceding the cursor"
 msgstr "Das dem Cursor vorangehende Wort killen"
 
-#: info/doc.c:104 info/echo-area.c:916
-msgid "List possible completions"
-msgstr "Mögliche Vervollständigungen listen"
-
-#: info/doc.c:105 info/echo-area.c:1090
-msgid "Insert completion"
-msgstr "Vervollständigung einfügen"
-
-# checkit
-#. Scroll the "other" window.  If there is a window showing completions, scroll
-#. that one, otherwise scroll the window which was active on entering the read
-#. function.
-#: info/doc.c:106 info/echo-area.c:1321
-msgid "Scroll the completions window"
-msgstr "Vervollständigungs-Fenster »scrollen«"
-
-#. Commands found in "./infodoc.c".
-#: info/doc.c:108 info/infodoc.c:328
-msgid "Display help message"
-msgstr "Diesen Hilfe-Text anzeigen"
-
-#. Show the Info help node.  This means that the "info" file is installed
-#. where it can easily be found on your system.
-#: info/doc.c:109 info/infodoc.c:346
-msgid "Visit Info node `(info)Help'"
-msgstr "Info-Node »(info)Help« besuchen"
-
-#: info/doc.c:110 info/infodoc.c:470
-msgid "Print documentation for KEY"
-msgstr "Dokumentation für KEY ausgeben"
-
-#: info/doc.c:111
-msgid "Show what to type to execute a given command"
-msgstr "Zeige an, was einzugeben ist, um einen gegebenen Befehl auszuführen"
-
-#. Commands found in "./m-x.c".
-#: info/doc.c:113 info/m-x.c:69
-msgid "Read the name of an Info command and describe it"
-msgstr "Lese den Namen eines Info-Befehls und beschreibe ihn"
-
-#: info/doc.c:114 info/m-x.c:96
-msgid "Read a command name in the echo area and execute it"
-msgstr "Lies einen Befehlsnamen in der »Echo-Area« und führe ihn aus"
-
-#: info/doc.c:115 info/m-x.c:150
-msgid "Set the height of the displayed window"
-msgstr "Setze die Höhe des angezeigten Fensters"
-
-#. Commands found in "./indices.c".
-#: info/doc.c:117 info/indices.c:175
-msgid "Look up a string in the index for this file"
-msgstr "Sieh eine Zeichenkette im Index dieser Datei nach"
-
-#: info/doc.c:118 info/indices.c:332
-msgid ""
-"Go to the next matching index item from the last `\\[index-search]' command"
-msgstr ""
-"Geh zum nächsten übereinstimmenden Index-Eintrag vom letzten "
-"»\\[index-search]«-Befehl"
-
-#: info/doc.c:119 info/indices.c:616
-msgid "Grovel all known info file's indices for a string and build a menu"
-msgstr ""
-"Durchsuche durch alle bekannten Info-Datei-Indices nach einer Zeichenkette "
-"und bilde ein Menu"
-
-#. Commands found in "./nodemenu.c".
-#: info/doc.c:121 info/nodemenu.c:217
-msgid "Make a window containing a menu of all of the currently visited nodes"
-msgstr ""
-
-#: info/doc.c:122 info/nodemenu.c:297
-msgid "Select a node which has been previously visited in a visible window"
-msgstr ""
-
-#. Commands found in "./footnotes.c".
-#: info/doc.c:124 info/footnotes.c:232
-msgid "Show the footnotes associated with this node in another window"
-msgstr "Zeige die mit diesem Node verbundenen Fußnoten im anderen Fenster"
-
-#. Commands found in "./variables.c".
-#: info/doc.c:126 info/variables.c:77
-msgid "Explain the use of a variable"
-msgstr ""
-
-#: info/doc.c:127 info/variables.c:102
-#, fuzzy
-msgid "Set the value of an Info variable"
-msgstr "Lese den Namen eines Info-Befehls und beschreibe ihn"
-
-# IMO muss "kill" auch im Folgenden wörtlich üs werden -ke-
-#: info/echo-area.c:562
-msgid "Kill ring is empty"
-msgstr "Der Kill-Ring ist leer"
-
 # checkit
 #: info/echo-area.c:871
 msgid "Not complete"
 msgstr "Nicht vollständig"
 
+#: info/echo-area.c:916
+msgid "List possible completions"
+msgstr "Mögliche Vervollständigungen listen"
+
 #: info/echo-area.c:929
 msgid "No completions"
 msgstr "Keine Vervollständigungen"
@@ -509,31 +138,42 @@ msgid "Sole completion"
 msgstr "Einzige Vervollständigung"
 
 #: info/echo-area.c:942
-#, c-format
-msgid "There %s %d "
-msgstr "Da %s %d "
-
-#: info/echo-area.c:942
-msgid "is"
-msgstr "ist"
+msgid "One completion:\n"
+msgstr "Eine Vervollständigung:\n"
 
-#: info/echo-area.c:942
-msgid "are"
-msgstr "sind"
+#: info/echo-area.c:943
+#, c-format
+msgid "%d completions:\n"
+msgstr "%d Vervollständigungen:\n"
 
-#: info/echo-area.c:945
-#, fuzzy, c-format
-msgid "completion%s:\n"
-msgstr "Keine Vervollständigungen"
+#: info/echo-area.c:1088
+msgid "Insert completion"
+msgstr "Vervollständigung einfügen"
 
-#: info/echo-area.c:1223
+#: info/echo-area.c:1221
 msgid "Building completions..."
 msgstr "Bilde Vervollständigungen..."
 
+# checkit
+#. Scroll the "other" window.  If there is a window showing completions, scroll
+#. that one, otherwise scroll the window which was active on entering the read
+#. function.
+#: info/echo-area.c:1319
+msgid "Scroll the completions window"
+msgstr "Vervollständigungs-Fenster »scrollen«"
+
 #: info/footnotes.c:206
 msgid "Footnotes could not be displayed"
 msgstr "Fußnoten können nicht angezeigt werden"
 
+#: info/footnotes.c:232
+msgid "Show the footnotes associated with this node in another window"
+msgstr "Zeige die mit diesem Node verbundenen Fußnoten im anderen Fenster"
+
+#: info/indices.c:175
+msgid "Look up a string in the index for this file"
+msgstr "Sieh eine Zeichenkette im Index dieser Datei nach"
+
 #: info/indices.c:205
 msgid "Finding index entries..."
 msgstr "Suche Index-Einträge..."
@@ -548,6 +188,13 @@ msgstr "Keine Indices gefunden."
 msgid "Index entry: "
 msgstr "Index-Eintrag: "
 
+#: info/indices.c:332
+msgid ""
+"Go to the next matching index item from the last `\\[index-search]' command"
+msgstr ""
+"Geh zum nächsten übereinstimmenden Index-Eintrag vom letzten "
+"»\\[index-search]«-Befehl"
+
 #: info/indices.c:342
 msgid "No previous index search string."
 msgstr "Keine vorangehende zu suchende Index-Zeichenkette."
@@ -583,6 +230,12 @@ msgstr ""
 msgid "Scanning indices of \"%s\"..."
 msgstr "Index von »%s« wird durchsucht..."
 
+#: info/indices.c:616
+msgid "Grovel all known info file's indices for a string and build a menu"
+msgstr ""
+"Durchsuche durch alle bekannten Info-Datei-Indices nach einer Zeichenkette "
+"und bilde ein Menü"
+
 #: info/indices.c:620
 msgid "Index apropos: "
 msgstr "Index apropos: "
@@ -594,107 +247,103 @@ msgid ""
 "* Menu: Nodes whoses indices contain \"%s\":\n"
 msgstr ""
 "\n"
-"* Menu: Nodes, deren Indices »%s« beinhalten:\n"
+"* Menü: Nodes, deren Indices »%s« beinhalten:\n"
 
-# checkit
-# oder sind "Einträge" gemeint? -ke-
-#: info/info.c:347
-#, fuzzy
+#: info/info.c:212
+msgid "Try --help for more information."
+msgstr "»--help« gibt weitere Informationen."
+
+# Hier de-Standard-Formulierung einsetzen!
+#: info/info.c:231 makeinfo/makeinfo.c:1089 util/install-info.c:530
+#: util/texindex.c:338
+#, c-format
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"There is NO warranty.  You may redistribute this software\n"
+"under the terms of the GNU General Public License.\n"
+"For more information about these matters, see the files named COPYING.\n"
+msgstr ""
+"Copyright © %s Free Software Foundation, Inc.\n"
+"Dies ist freie Software; in den Quellen befindet sich die Lizenz- und\n"
+"Kopierbedingung.  Es gibt KEINERLEI Garantie, nicht einmal für die\n"
+"TAUGLICHKEIT oder die VERWENDBARKEIT ZU EINEM ANGEGEBENEN ZWECK.\n"
+
+#: info/info.c:363
 msgid "no entries found\n"
-msgstr "Keine Indices gefunden."
+msgstr "Keine Einträge gefunden\n"
 
-#: info/info.c:390
+#: info/info.c:406
 msgid "There is no menu in this node."
-msgstr "Es gibt kein Menu in diesem Node."
+msgstr "Es gibt kein Menü in diesem Node."
 
-#: info/info.c:421
+#: info/info.c:437
 #, c-format
 msgid "There is no menu item \"%s\" in this node."
-msgstr "Es gibt keinen Menupunkt »%s« in diesem Node."
+msgstr "Es gibt keinen Menüpunkt »%s« in diesem Node."
 
-#: info/info.c:485
+#: info/info.c:501
 #, c-format
 msgid "Unable to find the node referenced by \"%s\"."
 msgstr "Kann keinen von »%s« referenzierten Node finden."
 
-# Dieser und die folgenden Strings wird nur gebraucht, wenn Fehleingabe vorliegt;
-# muss durch `Try `%s --help' ...' ersetzt werden. -ke-
-#: info/info.c:595
-msgid ""
-"Usage: info [-d dir-path] [-f info-file] [-o output-file] [-n node-name]..."
-msgstr ""
-"Aufruf: info [-d dir-path] [-f info-file] [-o output-file] [-n node-name]..."
-
-#: info/info.c:596
-msgid ""
-"            [--directory dir-path] [--file info-file] [--node node-name]..."
-msgstr ""
-"            [--directory dir-path] [--file info-file] [--node node-name]..."
-
-#: info/info.c:597
-msgid "            [--help] [--output output-file] [--subnodes] [--version]"
-msgstr "            [--help] [--output output-file] [--subnodes] [--version]"
-
-#: info/info.c:598
-msgid "            [--dribble dribble-file] [--restore from-file]"
-msgstr "            [--dribble dribble-file] [--restore from-file]"
-
-#: info/info.c:599
-msgid "            [menu-selection ...]"
-msgstr "            [menu-selection ...]"
-
-#: info/info.c:607
-#, fuzzy
+#: info/info.c:602
+#, c-format
 msgid ""
-"Here is a quick description of Info's options.  For a more complete\n"
-"description of how to use Info, type `info info options'.\n"
+"Usage: %s [OPTION]... [INFO-FILE [MENU-ITEM...]]\n"
+"\n"
+"Read documentation in Info format.\n"
+"For more complete documentation on how to use Info, run `info info "
+"options'.\n"
 "\n"
-"   --directory DIR              Add DIR to INFOPATH.\n"
-"   --dribble FILENAME           Remember user keystrokes in FILENAME.\n"
-"   --file FILENAME              Specify Info file to visit.\n"
-"   --node NODENAME              Specify nodes in first visited Info file.\n"
-"   --output FILENAME            Output selected nodes to FILENAME.\n"
-"   --restore FILENAME           Read initial keystrokes from FILENAME.\n"
-"   --subnodes                   Recursively output menu items.\n"
-"   --help                       Get this help message.\n"
-"   --version                    Display Info's version information.\n"
+"Options:\n"
+"--directory DIR              add DIR to INFOPATH.\n"
+"--dribble FILENAME           remember user keystrokes in FILENAME.\n"
+"--file FILENAME              specify Info file to visit.\n"
+"--node NODENAME              specify nodes in first visited Info file.\n"
+"--output FILENAME            output selected nodes to FILENAME.\n"
+"--restore FILENAME           read initial keystrokes from FILENAME.\n"
+"--subnodes                   recursively output menu items.\n"
+"--help                       display this help and exit.\n"
+"--version                    display version information and exit.\n"
 "\n"
-"Remaining arguments to Info are treated as the names of menu\n"
-"items in the initial node visited.  You can easily move to the\n"
-"node of your choice by specifying the menu names which describe\n"
-"the path to that node.  For example, `info emacs buffers'.\n"
+"The first argument, if present, is the name of the Info file to read.\n"
+"Any remaining arguments are treated as the names of menu\n"
+"items in the initial node visited.  For example, `info emacs buffers'\n"
+"moves to the node `buffers' in the info file `emacs'.\n"
 "\n"
-"Email bug reports to bug-texinfo@prep.ai.mit.edu."
+"Email bug reports to bug-texinfo@gnu.org."
 msgstr ""
-"Für eine ausführlichere Anleitung, wie Info zu benutzen ist, gib\n"
-"»info info options« ein.\n"
+"Syntax: %s [OPTION]... [INFO-DATEI [MENU-EINTRAG...]]\n"
 "\n"
-"  --directory=VERZ    VERZ zu INFOPATH hinzufügen\n"
-"  --dribble=DATEI     Tasteneingaben des Benutzers in DATEI merken\n"
-"  --file=DATEI        zu besuchende Info-DATEI angeben\n"
-"  --node=NODENAME     \"node\" in der ersten zu besuchenden Info-Datei "
+"Um Dokumentation zu lesen, die im Info-Format vorliegt.\n"
+"Für eine ausführlichere Anleitung, wie Info zu benutzen ist, »info info\n"
+"options« eingeben.\n"
+"\n"
+"Optionen:\n"
+"  --directory VERZ    VERZ zu INFOPATH hinzufügen\n"
+"  --dribble DATEI     Tasteneingaben des Benutzers in DATEI merken\n"
+"  --file DATEI        zu besuchende Info-DATEI angeben\n"
+"  --node KNOTEN       Knoten in der ersten zu besuchenden Info-Datei "
 "angeben\n"
-"  --output=DATEI      ausgewählte \"nodes\" einer Datei nach DATEI ausgeben\n"
-"  --restore=DATEI     einleitende Tasteneingaben von DATEI lesen\n"
-"  --subnodes          Menupunkte rekursiv ausgeben\n"
+"  --output DATEI      ausgewählte Knoten nach DATEI ausgeben\n"
+"  --restore DATEI     die beginnenden Tasteneingaben von DATEI lesen\n"
+"  --subnodes          Menüpunkte rekursiv ausgeben\n"
 "  --help              diese Hilfe anzeigen\n"
 "  --version           Programmversion anzeigen\n"
 "\n"
-"Verbleibende Parameter werden als Namen von Menupunkten des zuerst "
+"Verbleibende Parameter werden als Namen von Menüpunkten des zuerst "
 "besuchten\n"
-"\"nodes\" angesehen.  Man kann sich einfach zum gewünschten \"node\" "
-"bewegen,\n"
-"indem man die Namen der Menupunkte angibt, die den Weg dorthin bezeichnen;\n"
+"Knotens angesehen.  Man kann sich einfach zum gewünschten Knoten bewegen,\n"
+"indem man die Namen der Menüpunkte angibt, die den Weg dorthin bezeichnen;\n"
 "z. B. »info emacs buffers«.\n"
 "\n"
-"Fehler (\"bugs\") bitte an <bug-texinfo@prep.ai.mit.edu> melden."
+"Fehler (\"bugs\") bitte an <bug-texinfo@gnu.org> melden.<\n"
+"\n"
+"Für die deutsche Übersetzung ist die Mailingliste <de@li.org> zuständig."
 
 #: info/infodoc.c:50
-#, fuzzy
 msgid "Basic Commands in Info Windows"
-msgstr ""
-"Verfügbare Befehle im Info-Fenster:\n"
-"\n"
+msgstr "Grundbefehle in Info-Fenstern"
 
 #: info/infodoc.c:211
 msgid ""
@@ -707,6 +356,21 @@ msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
 msgstr ""
 "--- »\\[history-node]« oder »\\[kill-node]« benutzen, um zu beenden ---\n"
 
+#. Create or move to the help window.
+#: info/infodoc.c:328
+msgid "Display help message"
+msgstr "Diesen Hilfe-Text anzeigen"
+
+#. Show the Info help node.  This means that the "info" file is installed
+#. where it can easily be found on your system.
+#: info/infodoc.c:346
+msgid "Visit Info node `(info)Help'"
+msgstr "Info-Node »(info)Help« besuchen"
+
+#: info/infodoc.c:470
+msgid "Print documentation for KEY"
+msgstr "Dokumentation für KEY ausgeben"
+
 #: info/infodoc.c:483
 #, c-format
 msgid "Describe key: %s"
@@ -723,9 +387,9 @@ msgid "%s is undefined."
 msgstr "%s ist nicht definiert."
 
 #: info/infodoc.c:535
-#, fuzzy, c-format
+#, c-format
 msgid "%s is defined to %s."
-msgstr "%s ist nicht definiert."
+msgstr "%s ist definiert als %s."
 
 #: info/infodoc.c:731
 msgid "Where is command: "
@@ -751,25 +415,40 @@ msgstr "%s kann via %s aufgerufen werden."
 msgid "There is no function named `%s'"
 msgstr "Es gibt keine Funktion mit Namen »%s«"
 
+#: info/m-x.c:69
+msgid "Read the name of an Info command and describe it"
+msgstr "Lese den Namen eines Info-Befehls und beschreibe ihn"
+
 #: info/m-x.c:73
 msgid "Describe command: "
 msgstr "Beschreibe den Befehl: "
 
+#: info/m-x.c:96
+msgid "Read a command name in the echo area and execute it"
+msgstr "Lies einen Befehlsnamen in der »Echo-Area« und führe ihn aus"
+
 #: info/m-x.c:134
 msgid "Cannot execute an `echo-area' command here."
 msgstr "Kann hier keinen »echo-area«-Befehl ausführen."
 
+#: info/m-x.c:150
+msgid "Set the height of the displayed window"
+msgstr "Setze die Höhe des angezeigten Fensters"
+
 # checkit
 #: info/m-x.c:163
 #, c-format
 msgid "Set screen height to (%d): "
 msgstr "Bildschirm-Höhe auf (%d) setzen: "
 
+# checkit
 #: info/makedoc.c:126
 msgid ""
 "   Source files groveled to make this file include:\n"
 "\n"
 msgstr ""
+"   Quelldatei \"groveled\", damit diese Datei enthält:\n"
+"\n"
 
 #: info/makedoc.c:450
 #, c-format
@@ -784,24 +463,37 @@ msgid ""
 "  ----------                        -----   ----   ---------------"
 msgstr ""
 "\n"
-"* Menu:\n"
-"  (Datei)Node                       Zeilen  Größe  Beinhaltet Datei\n"
-"  -----------                       -----   ----   ----------------"
+"* Menü:\n"
+"  (Datei)Knoten                     Zeilen  Größe  Beinhaltet Datei\n"
+"  -------------                     ------  -----  ----------------"
 
 #: info/nodemenu.c:197
 msgid ""
 "Here is the menu of nodes you have recently visited.\n"
 "Select one from this menu, or use `\\[history-node]' in another window.\n"
 msgstr ""
+"Hier ist das Menü der Knoten, die zuetzt besucht wurden.\n"
+"Einen von diesem Menü auswählen oder »\\[history-node]« im anderen Fenster\n"
+"benutzen.\n"
+
+#: info/nodemenu.c:217
+msgid "Make a window containing a menu of all of the currently visited nodes"
+msgstr ""
+"Veranlassen, dass ein Fenster ein Menü aller aktuell besuchten Knoten enthält"
+
+#: info/nodemenu.c:297
+msgid "Select a node which has been previously visited in a visible window"
+msgstr ""
+"Einen Knoten auswählen, der zuvor in einem sichtbaren Fenster besucht wurde"
 
 #: info/nodemenu.c:309
 msgid "Select visited node: "
-msgstr ""
+msgstr "Besuchten Knoten auswählen: "
 
 #: info/nodemenu.c:329 info/session.c:1996
 #, c-format
 msgid "The reference disappeared! (%s)."
-msgstr ""
+msgstr "Der Verweispunkt ist verschwunden! (%s)."
 
 #: info/session.c:162
 #, c-format
@@ -809,24 +501,49 @@ msgid ""
 "Welcome to Info version %s. \"\\[get-help-window]\" for help, "
 "\"\\[menu-item]\" for menu item."
 msgstr ""
+"Willkommen bei Info Version %s. \"\\[get-help-window]\" um Hilfe zu "
+"bekommen,\n"
+"mit \"\\[menu-item]\" Menüpunkt anzeigen."
+
+#. Move WINDOW's point down to the next line if possible.
+#: info/session.c:629
+msgid "Move down to the next line"
+msgstr "Eine Zeile nach unten bewegen"
+
+#. Move WINDOW's point up to the previous line if possible.
+#: info/session.c:644
+msgid "Move up to the previous line"
+msgstr "Eine Zeile nach oben bewegen"
+
+#. Move WINDOW's point to the end of the true line.
+#: info/session.c:659
+msgid "Move to the end of the line"
+msgstr "Zum Ende dieser Zeile bewegen"
+
+#. Move WINDOW's point to the beginning of the true line.
+#: info/session.c:679
+msgid "Move to the start of the line"
+msgstr "Zum Anfang der Zeile bewegen"
 
 #: info/session.c:855
 msgid " times"
-msgstr ""
+msgstr "mal"
 
 #: info/session.c:857
 #, c-format
 msgid "%d times"
-msgstr ""
+msgstr "%d mal"
 
 #: info/session.c:895
 msgid "No \"Next\" pointer for this node."
-msgstr ""
+msgstr "Kein »Next«-Verweis bei diesem Knoten."
 
 #: info/session.c:898
 msgid "Following \"Next\" node..."
-msgstr ""
+msgstr "»Next«-Knoten folgend..."
 
+# checkit
+# üs? -ke-
 #: info/session.c:899 info/session.c:927 info/session.c:999
 #: info/session.c:1717
 msgid "Next"
@@ -834,13 +551,15 @@ msgstr ""
 
 #: info/session.c:915
 msgid "Selecting first menu item..."
-msgstr "Ersten Menupunkt auswählen..."
+msgstr "Ersten Menüpunkt auswählen..."
 
+# checkit
 #: info/session.c:926
-#, fuzzy
 msgid "Selecting \"Next\" node..."
-msgstr "Ersten Menupunkt auswählen..."
+msgstr "Den Knoten \"Next\" auswählen..."
 
+# checkit
+# üs? -ke-
 #: info/session.c:950 info/session.c:1063 info/session.c:1733
 msgid "Up"
 msgstr ""
@@ -851,94 +570,267 @@ msgstr "Keine \"Nodes\" mehr"
 
 #: info/session.c:1044
 msgid "No \"Prev\" for this node."
-msgstr ""
+msgstr "Kein »Prev« bei diesem Knoten."
 
+# checkit
 #. Move to the previous node.  If this node now contains a menu,
 #. and we have not inhibited movement to it, move to the node
 #. corresponding to the last menu item.
 #: info/session.c:1047 info/session.c:1100
 msgid "Moving \"Prev\" in this window."
-msgstr ""
+msgstr "Nach »Prev« in diesem Fenster bewegen."
 
+# checkit
+# üs? -ke-
 #: info/session.c:1048 info/session.c:1101 info/session.c:1725
 msgid "Prev"
 msgstr ""
 
 #: info/session.c:1059
 msgid "No \"Prev\" or \"Up\" for this node."
-msgstr ""
+msgstr "Kein »Prev« oder »Up« bei diesem Knoten."
 
 #: info/session.c:1062
 msgid "Moving \"Up\" in this window."
-msgstr ""
+msgstr "Nach »Up« in diesem Fenster bewegen."
 
 #: info/session.c:1110
 msgid "Moving to \"Prev\"'s last menu item."
-msgstr ""
+msgstr "Nach dem letzten Menüpunkt von »Prev« bewegen."
+
+#: info/session.c:1121
+msgid "Move forwards or down through node structure"
+msgstr "Vorwärts oder abwärts durch die Knotenstruktur bewegen"
+
+#: info/session.c:1137
+msgid "Move backwards or up through node structure"
+msgstr "Zurück oder aufwärts durch die Knotenstruktur bewegen"
+
+#. Show the next screen of WINDOW's node.
+#: info/session.c:1152
+msgid "Scroll forward in this window"
+msgstr "In diesem Fenster vorwärts »scrollen«"
+
+#. Show the previous screen of WINDOW's node.
+#: info/session.c:1197
+msgid "Scroll backward in this window"
+msgstr "In diesem Fenster rückwärts »scrollen«"
+
+#. Move to the beginning of the node.
+#: info/session.c:1237
+msgid "Move to the start of this node"
+msgstr "Zum Anfang dieses Knotens bewegen"
+
+#. Move to the end of the node.
+#: info/session.c:1244
+msgid "Move to the end of this node"
+msgstr "Zum Ende dieses Knotens bewegen"
+
+#. ****************************************************************
+#.
+#. Commands for Manipulating Windows
+#.
+#. ****************************************************************
+#. Make the next window in the chain be the active window.
+#: info/session.c:1257
+msgid "Select the next window"
+msgstr "Das nächste Fenster auswählen"
+
+#. Make the previous window in the chain be the active window.
+#: info/session.c:1296
+msgid "Select the previous window"
+msgstr "Das vorige Fenster auswählen"
+
+#. Split WINDOW into two windows, both showing the same node.  If we
+#. are automatically tiling windows, re-tile after the split.
+#: info/session.c:1347
+msgid "Split the current window"
+msgstr "Aktuelles Fenster unterteilen"
+
+#. Delete WINDOW, forgetting the list of last visited nodes.  If we are
+#. automatically displaying footnotes, show or remove the footnotes
+#. window.  If we are automatically tiling windows, re-tile after the
+#. deletion.
+#: info/session.c:1428
+msgid "Delete the current window"
+msgstr "Aktuelles Fenster löschen"
 
 #: info/session.c:1436
 msgid "Cannot delete a permanent window"
+msgstr "Ein permanentes Fenster kann nicht gelöscht werden"
+
+#. Just keep WINDOW, deleting all others.
+#: info/session.c:1469
+msgid "Delete all other windows"
+msgstr "Alle anderen Fenster löschen"
+
+#. Scroll the "other" window of WINDOW.
+#: info/session.c:1515
+msgid "Scroll the other window"
+msgstr "Das andere Fenster »scrollen«"
+
+#. Change the size of WINDOW by AMOUNT.
+#: info/session.c:1535
+msgid "Grow (or shrink) this window"
+msgstr "Aktuelles Fenster vergrößern (oder verkleinern)"
+
+#: info/session.c:1546
+msgid "Divide the available screen space among the visible windows"
 msgstr ""
+"Den vorhandenen Bildschirmplatz unter allen sichtbaren Fenstern aufteilen"
+
+#: info/session.c:1553
+msgid "Toggle the state of line wrapping in the current window"
+msgstr "Den Status des Zeilenumbruchs im aktuellen Fenster umschalten"
+
+#. Make WINDOW display the "Next:" node of the node currently being
+#. displayed.
+#: info/session.c:1714
+msgid "Select the `Next' node"
+msgstr "Den »Next«-Knoten auswählen"
+
+#. Make WINDOW display the "Prev:" node of the node currently being
+#. displayed.
+#: info/session.c:1722
+msgid "Select the `Prev' node"
+msgstr "Den »Prev«-Knoten auswählen"
 
+#. Make WINDOW display the "Up:" node of the node currently being
+#. displayed.
+#: info/session.c:1730
+msgid "Select the `Up' node"
+msgstr "Den »Up«-Knoten auswählen"
+
+#. Make WINDOW display the last node of this info file.
+#: info/session.c:1737
+msgid "Select the last node in this file"
+msgstr "Den letzten Knoten dieser Datei auswählen"
+
+# checkit
 #: info/session.c:1750 info/session.c:1768
 msgid "This window has no additional nodes"
-msgstr ""
+msgstr "Dies Fenster hat keine weiteren Knoten"
+
+#. Make WINDOW display the first node of this info file.
+#: info/session.c:1759
+msgid "Select the first node in this file"
+msgstr "Den ersten Knoten dieser Datei auswählen"
+
+#: info/session.c:1778
+msgid "Select the last item in this node's menu"
+msgstr "Den letzten Punkt des Menüs dieses Knotens auswählen"
+
+#. Use KEY (a digit) to select the Nth menu item in WINDOW->node.
+#: info/session.c:1784
+msgid "Select this menu item"
+msgstr "Diesen Menüpunkt auswählen"
 
 #: info/session.c:1813
 #, c-format
 msgid "There aren't %d items in this menu."
-msgstr "Es sind keine %d Punkte in diesem Menu."
+msgstr "Es sind keine %d Punkte in diesem Menü."
 
 #: info/session.c:1944
 #, c-format
 msgid "Menu item (%s): "
-msgstr "Menupunkt (%s): "
+msgstr "Menüpunkt (%s): "
 
 #: info/session.c:1946
 msgid "Menu item: "
-msgstr "Menupunkt: "
+msgstr "Menüpunkt: "
 
 #: info/session.c:1951
 #, c-format
 msgid "Follow xref (%s): "
-msgstr ""
+msgstr "Folge xref (%s): "
 
 #: info/session.c:1953
 msgid "Follow xref: "
-msgstr ""
+msgstr "Folge xref: "
+
+#. Read a line (with completion) which is the name of a menu item,
+#. and select that item.
+#: info/session.c:2042
+msgid "Read a menu item and select its node"
+msgstr "Einen Menüpunkt lesen und seinen Knoten auswählen"
+
+#: info/session.c:2050
+msgid "Read a footnote or cross reference and select its node"
+msgstr "Fußnote oder Querverweis lesen und den Konote auswählen"
+
+#. Position the cursor at the start of this node's menu.
+#: info/session.c:2056
+msgid "Move to the start of this node's menu"
+msgstr "Zum Anfang des Menüs dieses Knotens bewegen"
+
+#: info/session.c:2080
+msgid "Visit as many menu items at once as possible"
+msgstr "So viele Menüpunkte wie möglich auf einmal besuchen"
+
+#. Read a line of input which is a node name, and go to that node.
+#: info/session.c:2108
+msgid "Read a node name and select it"
+msgstr "Den Namen eines Knotens lesen und diesen auswählen"
 
 #: info/session.c:2169 info/session.c:2173
 msgid "Goto Node: "
-msgstr ""
+msgstr "Gehe nach Knoten: "
+
+#: info/session.c:2194
+msgid "Read a manpage reference and select it"
+msgstr "Einen Verweis auf eine Manpage lesen und diese auswählen"
 
 #: info/session.c:2198
 msgid "Get Manpage: "
-msgstr ""
+msgstr "Hole Manpage: "
+
+#. Move to the "Top" node in this file.
+#: info/session.c:2228
+msgid "Select the node `Top' in this file"
+msgstr "Den Knoten »Top« dieser Datei auswählen"
 
 #. Notice that the node "Top" is special, and doesn't have to
 #. be referenced.
-#: info/session.c:2230 makeinfo/makeinfo.c:5135 makeinfo/makeinfo.c:5218
+#: info/session.c:2230 makeinfo/makeinfo.c:5145 makeinfo/makeinfo.c:5228
 msgid "Top"
 msgstr "Top"
 
+#. Move to the node "(dir)Top".
+#: info/session.c:2234
+msgid "Select the node `(dir)'"
+msgstr "Den Knoten »(dir)« auswählen"
+
 #: info/session.c:2254
 #, c-format
 msgid "Kill node (%s): "
-msgstr ""
+msgstr "Kille Knoten (%s): "
 
 #: info/session.c:2307
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot kill node `%s'"
-msgstr "Kann »%s« nicht finden."
+msgstr "Kann Knoten »%s« nicht killen"
 
 #: info/session.c:2317
 msgid "Cannot kill the last node"
-msgstr ""
+msgstr "Der letzte Knoten kann nicht gekillt werden"
+
+#: info/session.c:2401
+msgid "Select the most recently selected node"
+msgstr "Den zuletzt gewählten Knoten auswählen"
+
+#. Kill named node.
+#: info/session.c:2407
+msgid "Kill this node"
+msgstr "Diesen Knoten killen"
+
+#. Read the name of a file and select the entire file.
+#: info/session.c:2415
+msgid "Read the name of a file and select it"
+msgstr "Den Namen einer Datei lesen und diese auswählen"
 
 #: info/session.c:2419
-#, fuzzy
 msgid "Find file: "
-msgstr " Unterdatei: %s"
+msgstr "Datei finden: "
 
 #: info/session.c:2436
 #, c-format
@@ -946,9 +838,9 @@ msgid "Cannot find \"%s\"."
 msgstr "Kann »%s« nicht finden."
 
 #: info/session.c:2483 info/session.c:2608
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create output file \"%s\"."
-msgstr "Datei »%s« ist nicht zu verändern.\n"
+msgstr "Ausgabe-Datei »%s« kann nicht angelegt werden."
 
 #: info/session.c:2496 info/session.c:2625 info/session.c:2671
 msgid "Done."
@@ -957,73 +849,125 @@ msgstr "Fertig."
 #: info/session.c:2553
 #, c-format
 msgid "Writing node \"(%s)%s\"..."
-msgstr ""
+msgstr "Schreibe Knoten (%s)%s"
 
 #: info/session.c:2556
-#, fuzzy, c-format
+#, c-format
 msgid "Writing node \"%s\"..."
-msgstr "Index von »%s« wird durchsucht..."
+msgstr "Knoten »%s« schreiben..."
+
+#: info/session.c:2634
+msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
+msgstr "Den Inhalt dieses Knotens durch INFO_PRINT_COMMAND pipen"
 
 #: info/session.c:2654
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot open pipe to \"%s\"."
-msgstr "Kann »%s« nicht finden."
+msgstr "Kann nicht nach »%s« pipen."
 
 #: info/session.c:2661
-#, fuzzy, c-format
+#, c-format
 msgid "Printing node \"(%s)%s\"..."
-msgstr "Index von »%s« wird durchsucht..."
+msgstr "Drucke Knoten »(%s)%s«..."
 
 #: info/session.c:2664
-#, fuzzy, c-format
+#, c-format
 msgid "Printing node \"%s\"..."
-msgstr "Index von »%s« wird durchsucht..."
+msgstr "Drucke Knoten »%s«..."
 
 #: info/session.c:2896
-#, fuzzy, c-format
+#, c-format
 msgid "Searching subfile \"%s\"..."
-msgstr "Index von »%s« wird durchsucht..."
+msgstr "Unterdatei »%s« wird durchsucht..."
 
+#: info/session.c:2946
+msgid "Read a string and search for it"
+msgstr "Eine Zeichenkette einlesen und danach suchen"
+
+# checkit
 #: info/session.c:2966
 #, c-format
 msgid "%s for string [%s]: "
-msgstr ""
+msgstr "%s nach Zeichenkette [%s]: "
 
 #: info/session.c:2967
 msgid "Search backward"
-msgstr ""
+msgstr "Suche rückwärts"
 
 #: info/session.c:2967
 msgid "Search"
-msgstr ""
+msgstr "Suche"
 
 #: info/session.c:2994
 msgid "Search failed."
-msgstr ""
+msgstr "Suche fehlgeschlagen."
+
+#: info/session.c:3020 info/session.c:3026
+msgid "Search interactively for a string as you type it"
+msgstr "Interaktiv nach einer Zeichenkette während der Eingabe suchen"
 
 #: info/session.c:3120
 msgid "I-search backward: "
-msgstr ""
+msgstr "Interactive Suche rückwarts: "
 
 #: info/session.c:3122
 msgid "I-search: "
-msgstr ""
+msgstr "Interactive Suche"
 
+# checkit
 #: info/session.c:3147
 msgid "Failing "
-msgstr ""
+msgstr "Fehlgeschlagen "
 
 #: info/session.c:3512
-#, fuzzy
 msgid "No cross references in this node."
-msgstr "Es gibt kein Menu in diesem Node."
+msgstr "Keine Querverweise in diesem Knoten."
+
+#: info/session.c:3579
+msgid "Move to the previous cross reference"
+msgstr "Zum vorigen Querverweis bewegen"
+
+#: info/session.c:3588
+msgid "Move to the next cross reference"
+msgstr "Zum nächsten Querverweis bewegen"
+
+#: info/session.c:3598
+msgid "Select reference or menu item appearing on this line"
+msgstr "Verweis oder Menüpunkt auswählen, der auf dieser Zeile erscheint"
+
+# checkit
+#. ****************************************************************
+#.
+#. Miscellaneous Info Commands
+#.
+#. ****************************************************************
+#. What to do when C-g is pressed in a window.
+#: info/session.c:3620
+msgid "Cancel current operation"
+msgstr "Momentane Operation abbrechen"
 
 #: info/session.c:3627
 msgid "Quit"
-msgstr ""
+msgstr "Ende"
+
+#: info/session.c:3636
+msgid "Move to the cursor to a specific line of the window"
+msgstr "Den Cursor nach einer bestimmten Zeile des Fensters bewegen"
+
+#. Clear the screen and redraw its contents.  Given a numeric argument,
+#. move the line the cursor is on to the COUNT'th line of the window.
+#: info/session.c:3668
+msgid "Redraw the display"
+msgstr "Anzeige erneut darstellen"
+
+#. This command does nothing.  It is the fact that a key is bound to it
+#. that has meaning.  See the code at the top of info_session ().
+#: info/session.c:3705
+msgid "Quit using Info"
+msgstr "Info beenden"
 
 #: info/session.c:3728
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown command (%s)."
 msgstr "Unbekannter Befehl (%s)."
 
@@ -1036,67 +980,97 @@ msgstr "\"\" ist ungültig"
 msgid "\"%s\" is invalid"
 msgstr "\"%s\" ist ungültig"
 
+#: info/session.c:3958
+msgid "Add this digit to the current numeric argument"
+msgstr "Diese Zahl dem aktuellen numerischen Argument hinzufügen"
+
+#: info/session.c:3967
+msgid "Start (or multiply by 4) the current numeric argument"
+msgstr "Beginne (oder multipliziere mit 4) das aktuelle nummerische Argument"
+
+#: info/session.c:3982
+msgid "Internally used by \\[universal-argument]"
+msgstr "Intern gebraucht von \\[universal-argument]"
+
+#: info/tilde.c:362
+msgid "readline: Out of virtual memory!\n"
+msgstr "readline: Kein Speicher mehr!\n"
+
 #: info/variables.c:40
 msgid "When \"On\", footnotes appear and disappear automatically"
-msgstr ""
+msgstr "Wenn »On«, dann erscheinen und verschwinden Fußnoten automatisch"
 
 #: info/variables.c:44
 msgid "When \"On\", creating or deleting a window resizes other windows"
 msgstr ""
+"Wenn »On«, dann werden beim Anlegen oder Löschen eines Fensters die anderen "
+"Fenster angepasst"
 
 #: info/variables.c:48
 msgid "When \"On\", flash the screen instead of ringing the bell"
-msgstr ""
+msgstr "Wenn »On«, dann den Bildschirm blinken lassen, kein akustisches Signal"
 
 #: info/variables.c:52
 msgid "When \"On\", errors cause the bell to ring"
-msgstr ""
+msgstr "Wenn »On«, dann lassen Fehler ein akustisches Signal ertönen"
 
+# checkit
 #: info/variables.c:56
 msgid "When \"On\", Info garbage collects files which had to be uncompressed"
 msgstr ""
+"Wenn »On«, Info \"garbage collectet\" Dateien, die ausgepackt werden müssen"
 
 #: info/variables.c:59
 msgid "When \"On\", the portion of the matched search string is highlighted"
 msgstr ""
+"Wenn »On«, die übereinstimmende gefundene Zeichenkette wird gekennzeichnet"
 
 #: info/variables.c:63
 msgid "Controls what happens when scrolling is requested at the end of a node"
 msgstr ""
+"Kontrolliert, was passiert, wenn »scrollen« am Ende eines Knotens veranlasst "
+"wird"
 
 #: info/variables.c:67
 msgid "The number lines to scroll when the cursor moves out of the window"
 msgstr ""
+"Anzahl der Zeilen zu »scrollen«, wenn der Cursor aus dem Fenster bewegt wird"
 
 #: info/variables.c:71
 msgid "When \"On\", Info accepts and displays ISO Latin characters"
-msgstr ""
+msgstr "Wenn »On«, dann akzeptiert Info ISO-Latin-Zeichen und zeigt diese an"
+
+#: info/variables.c:77
+msgid "Explain the use of a variable"
+msgstr "Den Zweck einer Variablen erklären"
 
 #. Get the variable's name.
 #: info/variables.c:83
-#, fuzzy
 msgid "Describe variable: "
-msgstr "Beschreibe Taste: %s"
+msgstr "Beschreibe Variable: "
+
+#: info/variables.c:102
+msgid "Set the value of an Info variable"
+msgstr "Den Wert einer Info-Variablen setzen"
 
 #. Get the variable's name and value.
 #: info/variables.c:108
 msgid "Set variable: "
-msgstr ""
+msgstr "Setze Variable: "
 
-# checkit
 #: info/variables.c:126
-#, fuzzy, c-format
+#, c-format
 msgid "Set %s to value (%d): "
-msgstr "Bildschirm-Höhe auf (%d) setzen: "
+msgstr "Setze %s auf den Wert (%d): "
 
 #: info/variables.c:167
 #, c-format
 msgid "Set %s to value (%s): "
-msgstr ""
+msgstr "Setze %s auf den Wert (%s): "
 
 #: info/window.c:1102
 msgid "--*** Tags out of Date ***"
-msgstr ""
+msgstr "--*** Tags veraltet ***"
 
 #. strlen (location_indicator).
 #. 10 for the decimal representation of the number of lines in this
@@ -1120,77 +1094,116 @@ msgstr "-%s%s-Info: (%s)%s, %d Zeilen --%s--"
 msgid " Subfile: %s"
 msgstr " Unterdatei: %s"
 
-#: makeinfo/makeinfo.c:889
-#, fuzzy, c-format
+#: lib/getopt.c:672
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr ""
+
+#: lib/getopt.c:696
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr ""
+
+#: lib/getopt.c:701
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr ""
+
+#: lib/getopt.c:718 lib/getopt.c:891
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr ""
+
+#. --option
+#: lib/getopt.c:747
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr ""
+
+#. +option or -option
+#: lib/getopt.c:751
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr ""
+
+#. 1003.2 specifies the format of this message.
+#: lib/getopt.c:777
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr ""
+
+#: lib/getopt.c:780
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr ""
+
+#. 1003.2 specifies the format of this message.
+#: lib/getopt.c:810 lib/getopt.c:940
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr ""
+
+#: lib/getopt.c:857
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr ""
+
+#: lib/getopt.c:875
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:893
+#, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: Warnung: "
 
-#: makeinfo/makeinfo.c:912
+#: makeinfo/makeinfo.c:916
 msgid "Too many errors!  Gave up.\n"
 msgstr "Zu viele Fehler!  Abbruch.\n"
 
-#: makeinfo/makeinfo.c:971 makeinfo/makeinfo.c:996 makeinfo/makeinfo.c:1064
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:975 makeinfo/makeinfo.c:1000 makeinfo/makeinfo.c:1068
+#, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
-msgstr "%s: Argument für --error-limit muss numerisch sein, nicht »%s«.\n"
+msgstr "%s: %s Argument muss numerisch sein, nicht »%s«.\n"
 
-#: makeinfo/makeinfo.c:985
-#, fuzzy, c-format
+# checkit
+#: makeinfo/makeinfo.c:989
+#, c-format
 msgid "Couldn't open macro expansion output `%s'"
-msgstr ""
-"Für die Macro-Auflösung kann die Ausgabe nach »%s« nicht geöffnet werden"
+msgstr "Die Macro-Auflösung für »%s« kann nicht geöffnet werden"
 
-#: makeinfo/makeinfo.c:988
+#: makeinfo/makeinfo.c:992
 msgid "Cannot specify more than one macro expansion output"
 msgstr "Mehr als eine Ausgabedatei darf nicht angegeben werden"
 
-#: makeinfo/makeinfo.c:1032
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:1036
+#, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
-"%s: Argument für --paragraph-indent muss numerisch/»none«/»asis«, sein, "
-"nicht »%s«.\n"
+"%s: Arg für --paragraph-indent muss numerisch/»none«/»asis« sein, nicht "
+"»%s«.\n"
 
-#: makeinfo/makeinfo.c:1075
+#: makeinfo/makeinfo.c:1079
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 "%s: Argument für --footnote-style muss »separate« oder »end« sein, nicht "
 "»%s«.\n"
 
-# Hier de-Standard-Formulierung einsetzen!
-#: makeinfo/makeinfo.c:1085 util/install-info.c:522 util/texindex.c:348
-msgid ""
-"Copyright (C) 1996 Free Software Foundation, Inc.\n"
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING."
-msgstr ""
-"Copyright © %s Free Software Foundation, Inc.\n"
-"Dies ist freie Software; in den Quellen befindet sich die Lizenz- und\n"
-"Kopierbedingung.  Es gibt KEINERLEI Garantie, nicht einmal für die\n"
-"TAUGLICHKEIT oder die VERWENDBARKEIT ZU EINEM ANGEGEBENEN ZWECK."
-
-#: makeinfo/makeinfo.c:1105
+#: makeinfo/makeinfo.c:1110
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: Datei-Angabe fehlt.\n"
 
-#: makeinfo/makeinfo.c:1146
-#, fuzzy, c-format
-msgid "makeinfo (GNU %s %s) %d.%d\n"
-msgstr "GNU Makeinfo (Texinfo 3.9) %d.%d\n"
-
-# checkit
-#: makeinfo/makeinfo.c:1158
+#: makeinfo/makeinfo.c:1163
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "»%s --help« gibt weitere Informationen.\n"
 
-# checkit
 # Die "." am Zeilenende habe ich entfernt. -ke-
-#: makeinfo/makeinfo.c:1160
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:1165
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 "\n"
@@ -1223,7 +1236,7 @@ msgid ""
 "--verbose              report about what is being done.\n"
 "--version              display version information and exit.\n"
 "\n"
-"Email bug reports to bug-texinfo@prep.ai.mit.edu.\n"
+"Email bug reports to bug-texinfo@gnu.org.\n"
 msgstr ""
 "Aufruf: %s [OPTION]... TEXINFO-DATEI...\n"
 "\n"
@@ -1231,26 +1244,29 @@ msgstr ""
 "kann.\n"
 "\n"
 "Optionen:\n"
-"-D VAR                 eine Variable definieren, wie mit @set.\n"
+"-D VAR                 eine Variable definieren, wie mit @set\n"
 "-E MACRO-AUSGABEDATEI  nur die Macros auflösen, Texinfo-Quelltext ausgeben\n"
 "-I VERZ                VERZ in die Verzeichnis-Suchliste für @include "
 "aufnehmen\n"
+"-P DIR                 VERZ dem @include Verzeichnis-Suchpfad voranstellen\n"
 "-U VAR                 eine Variable aufheben, wie mit @clear\n"
 "--error-limit ZAHL     nach ZAHL Fehlern beenden (Standard %d)\n"
 "--fill-column ZAHL     Zeilen nach ZAHL Zeichen umbrechen (Standard %d)\n"
 "--footnote-style STYLE Fußnoten gemäß STYLE ausgeben:\n"
-"                       »separate«: Fußnoten in einen eigenen \"node\" "
+"                       »separate«: Fußnoten in einen eigenen Knoten "
 "plazieren;\n"
-"                            »end«: Fußnoten an das Ende des \"nodes\" "
-"setzen, in\n"
+"                            »end«: Fußnoten an das Ende des Knoten setzen, "
+"in\n"
 "                                   dem sie definiert sind (Standard)\n"
+"--force                Ausgabe auch bei Fehlern aufbewahren\n"
 "--help                 diese Hilfe zeigen\n"
 "--no-validate          Überprüfen der \"node\"-Querverweise unterdrücken\n"
 "--no-warn              Warnungen unterdrücken (aber keine Fehler)\n"
 "--no-split             Aufteilen langer Dateien unterdrücken\n"
-"--no-headers           \"node\"-Unterteiler und \"Node\" unterdrücken: Foo "
-"headers\n"
-"--output DATEI, -o DATEI Ausgabe nach DATEI und @setfilename ignorieren\n"
+"--no-headers           Knoten-Unterteiler und \"Node: Foo\" Kopfzeilen\n"
+"                       unterdrücken\n"
+"--output DATEI, -o DATEI\n"
+"                       Ausgabe nach DATEI und @setfilename ignorieren\n"
 "--paragraph-indent ZAHL/»none«/»asis«\n"
 "                       Absätze mit ZAHL Leerräumen einziehen (Standard %d);\n"
 "                       »none«: keine Leerräume\n"
@@ -1259,508 +1275,507 @@ msgstr ""
 "--verbose              ausführlich die Bearbeitungschritte anzeigen\n"
 "--version              Programmversion anzeigen\n"
 "\n"
-"Fehlerberichte (\"bugs\") bitte an <bug-texinfo@prep.ai.mit.edu> schicken.\n"
+"Fehlerberichte (\"bugs\") bitte an <bug-texinfo@gnu.org> schicken.\n"
+"\n"
+"Für die deutsche Übersetzung ist die Mailingliste <de@li.org> zuständig.\n"
 
-#: makeinfo/makeinfo.c:1545
+#: makeinfo/makeinfo.c:1552
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1741
+#: makeinfo/makeinfo.c:1748
 #, c-format
 msgid "Expected `%s'"
-msgstr ""
+msgstr "Erwartet »%s«"
 
-#: makeinfo/makeinfo.c:2072
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:2082
+#, c-format
 msgid "No `%s' found in `%s'"
-msgstr "%s; für Datei »%s«.\n"
+msgstr "Kein »%s« in »%s« gefunden"
 
-#: makeinfo/makeinfo.c:2122
+#: makeinfo/makeinfo.c:2132
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
+"%s: Macro-Auflösung nach der Standard-Ausgabe, da auch die Info-Ausgabe nach "
+"dort geht.\n"
 
-#: makeinfo/makeinfo.c:2141
+#: makeinfo/makeinfo.c:2151
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
-msgstr ""
+msgstr "Erzeuge %s Datei »%s« von »%s«.\n"
 
-#: makeinfo/makeinfo.c:2171
+#: makeinfo/makeinfo.c:2181
 #, c-format
 msgid "This is Info file %s, produced by Makeinfo version %d.%d"
-msgstr ""
+msgstr "Dies ist die Info-Datei %s, hergestellt von Makeinfo Version %d.%d"
 
-#: makeinfo/makeinfo.c:2173
+#: makeinfo/makeinfo.c:2183
 #, c-format
 msgid " from the input file %s.\n"
-msgstr ""
+msgstr " aus der Eingabe-Datei %s.\n"
 
-#: makeinfo/makeinfo.c:2192
+#: makeinfo/makeinfo.c:2202
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
+"%s: Entferne Macro-Ausgabe-Datei »%s« wegen der Fehler; --force benutzen, um "
+"diese beizubehalten.\n"
 
 #. If there were errors, and no --force, remove the output.
-#: makeinfo/makeinfo.c:2224
+#: makeinfo/makeinfo.c:2234
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
+"%s: Entferne Ausgabe-Datei »%s« wegen der Fehler; --force benutzen, um diese "
+"beizubehalten.\n"
 
 #. Special case.  I'm not supposed to see this character by itself.
 #. If I do, it means there is a syntax error in the input text.
 #. Report the error here, but remember this brace on the stack so
 #. you can ignore its partner.
-#: makeinfo/makeinfo.c:2364 makeinfo/makeinfo.c:7624
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:2374 makeinfo/makeinfo.c:7629
+#, c-format
 msgid "Misplaced %c"
-msgstr "Fehlplazierte »}«"
+msgstr "Fehlplazierte %c"
 
-#: makeinfo/makeinfo.c:2451
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:2461
+#, c-format
 msgid "Unknown command `%s'"
-msgstr "Unbekannter Befehl (%s)."
+msgstr "Unbekannter Befehl »%s«"
 
-#: makeinfo/makeinfo.c:2471
+#: makeinfo/makeinfo.c:2481
 msgid "NO_NAME!"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2485
+#: makeinfo/makeinfo.c:2495
 #, c-format
 msgid "%c%s expected `{...}'"
-msgstr ""
+msgstr "%c%s erwartete »{...}«"
 
-#: makeinfo/makeinfo.c:2518
-#, fuzzy
+#: makeinfo/makeinfo.c:2528
 msgid "Unmatched }"
-msgstr "Nicht übereinstimmende »%c%s«"
+msgstr "Nicht übereinstimmende }"
 
-#: makeinfo/makeinfo.c:2566
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:2576
+#, c-format
 msgid "%c%s missing close brace"
-msgstr "%s: Datei-Angabe fehlt.\n"
+msgstr "%c%s fehlende schließende Klammer"
 
-#: makeinfo/makeinfo.c:3362
+# checkit
+# üs? -ke-
+#: makeinfo/makeinfo.c:3372
 msgid "Broken-Type in insertion_type_pname"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3428
+#: makeinfo/makeinfo.c:3438
 msgid "Enumeration stack overflow"
-msgstr ""
+msgstr "Nummerierungsstack-Überlauf"
 
-#: makeinfo/makeinfo.c:3460
+#: makeinfo/makeinfo.c:3470
 #, c-format
 msgid "lettering overflow, restarting at %c"
-msgstr ""
+msgstr "Buchstaben-Zählungs-Überlauf, beginne wieder bei %c"
 
-#: makeinfo/makeinfo.c:3499
-#, fuzzy
+# checkit
+# übersetzen? -ke-
+#: makeinfo/makeinfo.c:3509
 msgid "* Menu:\n"
-msgstr "Menu"
+msgstr "* Menü:\n"
 
-#: makeinfo/makeinfo.c:3583
-#, fuzzy, c-format
+# checkit
+#: makeinfo/makeinfo.c:3593
+#, c-format
 msgid "%s requires an argument: the formatter for %citem"
-msgstr "%s erfordert einen Buchstaben oder eine Zahl"
+msgstr "%s erfordert ein Argument: der Formatierer für %citem"
 
-#: makeinfo/makeinfo.c:3687
+#: makeinfo/makeinfo.c:3697
 #, c-format
 msgid "`%cend' expected `%s', but saw `%s'"
-msgstr ""
+msgstr "»%cend« erwartete »%s«, aber bekam »%s«"
 
-#: makeinfo/makeinfo.c:3800
-#, fuzzy, c-format
+# checkit
+#: makeinfo/makeinfo.c:3810
+#, c-format
 msgid "No matching `%cend %s'"
-msgstr "Nicht übereinstimmende »%c%s«"
+msgstr "Nicht übereinstimmende »%cend %s«"
 
-#: makeinfo/makeinfo.c:3939
+#: makeinfo/makeinfo.c:3949
 #, c-format
 msgid "How did @%s end up in cm_special_char?\n"
-msgstr ""
+msgstr "Zu was führt @%s in cm_special_char?\n"
 
 #. This error message isn't perfect if the argument is multiple
 #. characters, but it doesn't seem worth getting right.
-#: makeinfo/makeinfo.c:3953
+#: makeinfo/makeinfo.c:3963
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
-msgstr ""
+msgstr "%c%s erwartet »i« oder »j« als Argument, nicht »%c«"
 
-#: makeinfo/makeinfo.c:3957
+#: makeinfo/makeinfo.c:3967
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
-msgstr ""
+msgstr "%c%s erwartet einen einzigen Buchstaben »i« oder »j« als Argument"
 
-#: makeinfo/makeinfo.c:3969
+#: makeinfo/makeinfo.c:3979
 msgid "January"
-msgstr ""
+msgstr "Januar"
 
-#: makeinfo/makeinfo.c:3969
+#: makeinfo/makeinfo.c:3979
 msgid "February"
-msgstr ""
+msgstr "Februar"
 
-#: makeinfo/makeinfo.c:3969
+#: makeinfo/makeinfo.c:3979
 msgid "March"
-msgstr ""
+msgstr "März"
 
-#: makeinfo/makeinfo.c:3969
+#: makeinfo/makeinfo.c:3979
 msgid "April"
-msgstr ""
+msgstr "April"
 
-#: makeinfo/makeinfo.c:3969
+#: makeinfo/makeinfo.c:3979
 msgid "May"
-msgstr ""
+msgstr "Mai"
 
-#: makeinfo/makeinfo.c:3970
+#: makeinfo/makeinfo.c:3980
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
-#: makeinfo/makeinfo.c:3970
+#: makeinfo/makeinfo.c:3980
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
-#: makeinfo/makeinfo.c:3970
+#: makeinfo/makeinfo.c:3980
 msgid "August"
-msgstr ""
+msgstr "August"
 
-#: makeinfo/makeinfo.c:3970
+#: makeinfo/makeinfo.c:3980
 msgid "September"
-msgstr ""
+msgstr "September"
 
-#: makeinfo/makeinfo.c:3970
+#: makeinfo/makeinfo.c:3980
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
-#: makeinfo/makeinfo.c:3971
+#: makeinfo/makeinfo.c:3981
 msgid "November"
-msgstr ""
+msgstr "November"
 
-#: makeinfo/makeinfo.c:3971
+#: makeinfo/makeinfo.c:3981
 msgid "December"
-msgstr ""
-
-#: makeinfo/makeinfo.c:3976
-#, c-format
-msgid "%d %s %d"
-msgstr ""
+msgstr "Dezember"
 
-#: makeinfo/makeinfo.c:4029
+#: makeinfo/makeinfo.c:4039
 #, c-format
 msgid "%c%s expects a single character as an argument"
-msgstr ""
+msgstr "%c%s erwartet einen einzigen Buchstaben als Argument"
 
-#: makeinfo/makeinfo.c:4143
+#: makeinfo/makeinfo.c:4153
 #, c-format
 msgid "%c%s is obsolete"
-msgstr ""
+msgstr "%c%s ist obsolet"
 
-#: makeinfo/makeinfo.c:4315
+#: makeinfo/makeinfo.c:4325
 #, c-format
-msgid "There already is a node having %ctop as a section"
-msgstr ""
+msgid "Node with %ctop as a section already exists"
+msgstr "Konoten mit %ctop als Abschnitt existiert bereits"
 
-#: makeinfo/makeinfo.c:4327
+#: makeinfo/makeinfo.c:4337
 #, c-format
 msgid "Here is the %ctop node"
-msgstr ""
+msgstr "Hier ist der Knoten %ctop"
 
-#: makeinfo/makeinfo.c:4346
+#: makeinfo/makeinfo.c:4356
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
-msgstr ""
+msgstr "%ctop vor %cnode gebraucht, als Standard %s genommen"
 
-#: makeinfo/makeinfo.c:4421
+#: makeinfo/makeinfo.c:4431
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
-msgstr ""
+msgstr "%c%s ist obsolet; stattdessen %c%s benutzen"
 
-#: makeinfo/makeinfo.c:4670
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:4680
+#, c-format
 msgid "Node `%s' multiply defined (line %d is first definition at)"
-msgstr "\"Node\" »%s« mehrfach definiert (%d ist erste Definition)"
+msgstr "Knoten »%s« mehrfach definiert (in Zeile %d ist erste Definition)"
 
-#: makeinfo/makeinfo.c:4743
+#: makeinfo/makeinfo.c:4753
 #, c-format
 msgid "Formatting node %s...\n"
-msgstr ""
+msgstr "Formatiere Knoten %s...\n"
 
-#: makeinfo/makeinfo.c:4792
+#: makeinfo/makeinfo.c:4802
 #, c-format
 msgid "Node `%s' requires a sectioning command (e.g. %c%s)"
-msgstr "\"Node\" »s« erfordert eine Unterteilungs-Angabe, z.B. »%c%s«"
+msgstr "Knoten »%s« erfordert eine Abschnitt-Angabe (z.B. %c%s)"
 
-#: makeinfo/makeinfo.c:5075
+#: makeinfo/makeinfo.c:5085
 #, c-format
 msgid "Node `%s''s Next field not pointed back to"
-msgstr "\"Next field\" des \"Nodes\" »%s« verweist nicht zurück nach"
+msgstr "\"Next field\" des Knotens »%s« verweist nicht zurück nach"
 
 # checkit
-#: makeinfo/makeinfo.c:5080
+#: makeinfo/makeinfo.c:5090
 #, c-format
 msgid "This node (`%s') is the one with the bad `Prev'"
-msgstr "Dieser \"node\" (»%s«) hat schlechten(?) \"Prev\"-Eintrag"
+msgstr "Dieser Knoten (»%s«) hat schlechten(?) \"Prev\"-Eintrag"
 
-#: makeinfo/makeinfo.c:5120
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:5130
+#, c-format
 msgid "Node `%s's Prev field not pointed back to"
-msgstr "Das \"Prev field\" des \"nodes\" »%s« verweist nicht zurück nach"
+msgstr "Das \"Prev field\" des Knotens »%s« verweist nicht zurück nach"
 
 # checkit
-#: makeinfo/makeinfo.c:5124
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:5134
+#, c-format
 msgid "This node (`%s') has the bad Next"
-msgstr "Dieser \"node\" (»%s«) hat schlechten(?) \"Next\"-Eintrag"
+msgstr "Dieser Knoten (»%s«) hat schlechten(?) \"Next\"-Eintrag"
 
-#: makeinfo/makeinfo.c:5136
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:5146
+#, c-format
 msgid "Node `%s' missing Up field"
-msgstr "Dem \"node\" »%s« fehlt ein \"Up field\""
+msgstr "Dem Knoten »%s« fehlt ein \"Up field\""
 
-#: makeinfo/makeinfo.c:5176
+#: makeinfo/makeinfo.c:5186
 #, c-format
 msgid "`%s' has an Up field of `%s', but `%s' has no menu item for `%s'"
 msgstr ""
-"»%s« hat ein \"Up field\" von »%s«, aber »%s« hat keinen Menu-Eintrag für "
+"»%s« hat ein \"Up field\" von »%s«, aber »%s« hat keinen Menü-Eintrag für "
 "»%s«"
 
-#: makeinfo/makeinfo.c:5207
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:5217
+#, c-format
 msgid "node `%s' has been referenced %d times"
-msgstr "Auf \"node\" »%s« wird %d mal verwiesen"
+msgstr "auf Knoten »%s« wird %d mal verwiesen"
 
-# checkit
-#: makeinfo/makeinfo.c:5219
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:5229
+#, c-format
 msgid "unreferenced node `%s'"
-msgstr "Auf \"node\" »%s« wird nicht verwiesen"
+msgstr "auf Knoten »%s« wird nicht verwiesen"
 
 # checkit
-#: makeinfo/makeinfo.c:5246
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:5256
+#, c-format
 msgid "%s reference to nonexistent node `%s'"
-msgstr "Auf \"node\" »%s« wird nicht verwiesen"
+msgstr "Verweis %s auf den nicht existierenden Knoten »%s«"
 
-# checkit
-#: makeinfo/makeinfo.c:5658 makeinfo/makeinfo.c:5670
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:5668 makeinfo/makeinfo.c:5680
+#, c-format
 msgid "%cmenu seen before first node"
-msgstr "%cmenu festgestellt, bevor ein \"node\" definiert wurde."
+msgstr "%cmenu festgestellt, bevor der erste Knoten definiert wurde"
 
-# checkit
-#: makeinfo/makeinfo.c:5659 makeinfo/makeinfo.c:5671
-#, fuzzy
+#: makeinfo/makeinfo.c:5669 makeinfo/makeinfo.c:5681
 msgid "creating `Top' node"
-msgstr "»TOP«-\"node\" wird angelegt."
+msgstr "»Top«-Knoten wird angelegt"
 
-#: makeinfo/makeinfo.c:5784
+# checkit
+#: makeinfo/makeinfo.c:5794
 #, c-format
 msgid "`.' or `,' must follow cross reference, not %c"
-msgstr ""
+msgstr "».« or »,« muss einem Querverweis folgen, nicht %c"
 
-#: makeinfo/makeinfo.c:5952
+#: makeinfo/makeinfo.c:5962
 #, c-format
 msgid "@image file `%s' unreadable: %s"
-msgstr ""
+msgstr "@image-Datei »%s« nicht lesbar: %s"
 
-#: makeinfo/makeinfo.c:5956
-#, fuzzy
+#: makeinfo/makeinfo.c:5966
 msgid "@image missing filename argument"
-msgstr "%s: Datei-Angabe fehlt.\n"
+msgstr "@image fehlt als Argument ein Dateiname"
 
-#: makeinfo/makeinfo.c:6057
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:6067
+#, c-format
 msgid "%s requires letter or digit"
 msgstr "%s erfordert einen Buchstaben oder eine Zahl"
 
-#: makeinfo/makeinfo.c:6142
+#: makeinfo/makeinfo.c:6152
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr "Nicht übereinstimmende »%c%s«"
 
-#: makeinfo/makeinfo.c:6149
+#: makeinfo/makeinfo.c:6159
 #, c-format
 msgid "`%c%s' needs something after it"
 msgstr "»%c%s« braucht etwas Nachfolgendes"
 
 # checkit
-#: makeinfo/makeinfo.c:6155
+#: makeinfo/makeinfo.c:6165
 #, c-format
 msgid "Bad argument to `%s', `%s', using `%s'"
 msgstr "Falsches Argument für »%s«, »%s«, wenn »%s« benutzt wird"
 
-#: makeinfo/makeinfo.c:6328
+# checkit
+#: makeinfo/makeinfo.c:6338
 #, c-format
 msgid "{No Value For \"%s\"}"
-msgstr ""
+msgstr "{Kein Wert Für »%s«}"
 
-#: makeinfo/makeinfo.c:6378
+#: makeinfo/makeinfo.c:6388
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s erfordert einen Namen"
 
-#: makeinfo/makeinfo.c:6486
+#: makeinfo/makeinfo.c:6496
 #, c-format
 msgid "Reached eof before matching @end %s"
-msgstr ""
+msgstr "Das Ende der Datei vor dem erforderlichen @end %s erreicht"
 
-#: makeinfo/makeinfo.c:6715
+#: makeinfo/makeinfo.c:6722
 #, c-format
 msgid "The `%c%s' command is meaningless within a `@%s' block"
 msgstr "Der »%c%s«-Befehl ist sinnlos innerhalb eines »@%s«-Blocks"
 
-#: makeinfo/makeinfo.c:6724
+#: makeinfo/makeinfo.c:6731
 #, c-format
 msgid "%citemx is not meaningful inside of a `%s' block"
 msgstr "%citemx ist nicht sinnvoll innerhalb eines »@%s«-Blocks"
 
 # checkit
-#: makeinfo/makeinfo.c:6837
+#: makeinfo/makeinfo.c:6844
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "%c%s außerhalb eines Einfügungsblocks gefunden"
 
 # checkit
-#: makeinfo/makeinfo.c:6928
+#: makeinfo/makeinfo.c:6935
 #, c-format
 msgid "Missing `}' in %cdef arg"
 msgstr "Fehlende »}« in »%cdef«-Argument"
 
-#: makeinfo/makeinfo.c:7137 makeinfo/makeinfo.c:7157
+#: makeinfo/makeinfo.c:7144 makeinfo/makeinfo.c:7164
 msgid "Function"
 msgstr ""
 
-#: makeinfo/makeinfo.c:7141
+#: makeinfo/makeinfo.c:7148
 msgid "Macro"
 msgstr ""
 
-#: makeinfo/makeinfo.c:7145
+#: makeinfo/makeinfo.c:7152
 msgid "Special Form"
 msgstr ""
 
-#: makeinfo/makeinfo.c:7149 makeinfo/makeinfo.c:7161
+#: makeinfo/makeinfo.c:7156 makeinfo/makeinfo.c:7168
 msgid "Variable"
 msgstr ""
 
-#: makeinfo/makeinfo.c:7153
-#, fuzzy
+#: makeinfo/makeinfo.c:7160
 msgid "User Option"
-msgstr "Vervollständigung einfügen"
+msgstr "Benutzer-Option"
 
-#: makeinfo/makeinfo.c:7165
-#, fuzzy
+#: makeinfo/makeinfo.c:7172
 msgid "Instance Variable"
-msgstr "Beschreibe Taste: %s"
+msgstr ""
 
-#: makeinfo/makeinfo.c:7169 makeinfo/makeinfo.c:7173
+#: makeinfo/makeinfo.c:7176 makeinfo/makeinfo.c:7180
 msgid "Method"
 msgstr ""
 
 # checkit
-#: makeinfo/makeinfo.c:7330
+#: makeinfo/makeinfo.c:7335
 #, c-format
 msgid "Must be in a `%s' insertion in order to use `%s'x"
 msgstr "Muss in einer »%s«-Einfügung sein, wenn »%s«x benutzt werden soll"
 
 # checkit
-#: makeinfo/makeinfo.c:7402
+#: makeinfo/makeinfo.c:7407
 #, c-format
 msgid "%csp requires a positive numeric argument"
 msgstr "»%csp« erfordert ein positives numerisches Argument"
 
-#: makeinfo/makeinfo.c:7645
-#, fuzzy
+#: makeinfo/makeinfo.c:7650
 msgid "asis"
-msgstr "ist"
+msgstr "genau"
 
-# checkit
-#: makeinfo/makeinfo.c:7647
-#, fuzzy
+#: makeinfo/makeinfo.c:7652
 msgid "none"
-msgstr "(keine)"
+msgstr "kein"
 
-#: makeinfo/makeinfo.c:7669
+#: makeinfo/makeinfo.c:7674
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "Falsches Argument für »%c%s«"
 
-#: makeinfo/makeinfo.c:7961
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:7966
+#, c-format
 msgid "Unknown index `%s'"
-msgstr "Unbekannter Index-Name »%s«"
+msgstr "Unbekannter Index »%s«"
 
-#: makeinfo/makeinfo.c:8026
+#: makeinfo/makeinfo.c:8031
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "Index »%s« ist schon vorhanden"
 
-#: makeinfo/makeinfo.c:8057
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:8062
+#, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
-msgstr "Unbekannter Index-Name »%s«"
+msgstr "Unbekannter Index »%s« und /oder unbekannter »%s« in @synindex"
 
-#: makeinfo/makeinfo.c:8246
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:8251
+#, c-format
 msgid "Unknown index `%s' in @printindex"
-msgstr "Unbekannter Index-Name »%s«"
+msgstr "Unbekannter Index »%s« in @printindex"
 
-#: makeinfo/makeinfo.c:8261
-#, fuzzy
+# übersetzen? -ke-
+#: makeinfo/makeinfo.c:8266
 msgid ""
 "* Menu:\n"
 "\n"
-msgstr "Menu"
+msgstr ""
+"* Menü:\n"
+"\n"
 
-#: makeinfo/makeinfo.c:8448
+#: makeinfo/makeinfo.c:8453
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
-msgstr ""
+msgstr "»%c%s« braucht das Argument in der Form »{...}«, nicht nur »%s«"
 
-#: makeinfo/makeinfo.c:8463
+#: makeinfo/makeinfo.c:8468
 #, c-format
 msgid "No closing brace for footnote `%s'"
 msgstr "Keine schließende Klammer für Fußnote »%s«"
 
 # checkit
-#: makeinfo/makeinfo.c:8502
+#: makeinfo/makeinfo.c:8507
 msgid "Footnote defined without parent node"
 msgstr "Fußnote definiert ohne einen Eltern-\"node\""
 
-#: makeinfo/makeinfo.c:8534
-#, fuzzy
+#: makeinfo/makeinfo.c:8539
 msgid "-Footnotes"
-msgstr "*Fußnoten*"
+msgstr "-Fußnoten"
 
-#: makeinfo/makeinfo.c:8589
-#, fuzzy
+#: makeinfo/makeinfo.c:8594
 msgid ""
 "---------- Footnotes ----------\n"
 "\n"
 msgstr ""
-"---------------------\n"
+"----------- Fußnoten -----------\n"
 "\n"
 
-#: makeinfo/makeinfo.c:8685
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:8690
+#, c-format
 msgid "macro `%s' previously defined"
 msgstr "Macro »%s« ist bereits definiert"
 
-#: makeinfo/makeinfo.c:8689
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:8694
+#, c-format
 msgid "here is the previous definition of `%s'"
 msgstr "Hier ist die vorangehende Definition von »%s«"
 
-#: makeinfo/makeinfo.c:8903
+#: makeinfo/makeinfo.c:8908
 #, c-format
 msgid "Macro `%s' called with too many args"
 msgstr "Macro »%s« mit zu vielen Argumenten aufgerufen"
 
-#: makeinfo/makeinfo.c:9055
+#: makeinfo/makeinfo.c:9060
 #, c-format
 msgid "%cend macro not found"
 msgstr "»%cend«-Macro nicht gefunden"
 
 # checkit
-#: makeinfo/makeinfo.c:9095
+#: makeinfo/makeinfo.c:9100
 #, c-format
 msgid "%cquote-arg only useful when the macro takes a single argument"
 msgstr ""
@@ -1803,31 +1818,31 @@ msgid "* column #%d: output = %s\n"
 msgstr "* Spalte #%d: Ausgabe = %s\n"
 
 # checkit
-#: util/install-info.c:119 util/install-info.c:132
+#: util/install-info.c:123 util/install-info.c:136
 msgid "virtual memory exhausted"
 msgstr "virtual memory exhausted"
 
-#: util/install-info.c:188
-#, fuzzy, c-format
+#: util/install-info.c:192
+#, c-format
 msgid "%s: warning: "
 msgstr "%s: Warnung: "
 
-#: util/install-info.c:209
+#: util/install-info.c:213
 #, c-format
 msgid " for %s"
 msgstr " für %s"
 
-#: util/install-info.c:278
-#, fuzzy, c-format
+#: util/install-info.c:282
+#, c-format
 msgid "\tTry `%s --help' for a complete list of options.\n"
 msgstr "»%s --help« gibt weitere Informationen.\n"
 
-# checkit
-#: util/install-info.c:286
-#, fuzzy, c-format
+#: util/install-info.c:290
+#, c-format
 msgid ""
-"%s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
-"  Install INFO-FILE in the Info directory file DIR-FILE.\n"
+"Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+"\n"
+"Install INFO-FILE in the Info directory file DIR-FILE.\n"
 "\n"
 "Options:\n"
 "--delete          Delete existing entries in INFO-FILE;\n"
@@ -1855,10 +1870,11 @@ msgid ""
 "                    from information in the Info file itself.\n"
 "--version         Display version information and exit.\n"
 "\n"
-"Email bug reports to bug-texinfo@prep.ai.mit.edu.\n"
+"Email bug reports to bug-texinfo@gnu.org.\n"
 msgstr ""
-"%s [OPTION]... [INFO-DATEI [VERZ-DATEI]]\n"
-"  Installiere die INFO-DATEI in dem Info-Verzeichnis VERZ-DATEI.\n"
+"Syntax: %s [OPTION]... [INFO-DATEI [VERZ-DATEI]]\n"
+"\n"
+"Installiere die INFO-DATEI in dem Info-Verzeichnis VERZ-DATEI.\n"
 "\n"
 "Optionen:\n"
 "--delete          entferne vorhandene Einträge aus INFO-DATEI; keine neuen\n"
@@ -1868,16 +1884,15 @@ msgstr ""
 "                  mit dem VERZ-DATEI-Argument\n"
 "--entry=TEXT      TEXT als einen Info-Verzeichnis-Eintrag einfügen.  TEXT "
 "soll\n"
-"                  die Form einer Zeile eines Info-Menupunkts haben,\n"
-"                  zuzüglich null oder mehrerer Extra-Zeilen, die mit "
+"                  die Form einer Zeile eines Info-Menüpunkts haben,\n"
+"                  zuzüglich Null oder mehrerer Extra-Zeilen, die mit "
 "Leerraum\n"
 "                  (\"whitespace\") beginnen.  Wenn mehr als ein Eintrag "
 "angegeben\n"
-"                  wird, werden alle hinzugefügt.  Wenn gar kein Eintrag "
-"angege-\n"
-"                  ben wird, wird der Eintragstext der Info-Datei selbst "
-"ent-\n"
-"                  nommen.\n"
+"                  wird, werden alle hinzugefügt.  Wenn gar kein Eintrag\n"
+"                  angegeben wird, wird der Eintragstext der Info-Datei "
+"selbst\n"
+"                  entnommen.\n"
 "--help            diese Hilfe zeigen\n"
 "--info-file=DATEI Info-Datei angeben, die im Verzeichnis zu installieren "
 "ist.\n"
@@ -1885,11 +1900,10 @@ msgstr ""
 "--info-dir=VERZ   wie --dir-file=VERZ/dir.\n"
 "--item=TEXT       wie --entry TEXT.  Ein Info-Verzeichnis-Eintrag ist "
 "nämlich\n"
-"                  ein Menupunkt\n"
+"                  ein Menüpunkt\n"
 "--quiet           Warnungen unterdrücken\n"
 "--remove          wie --delete\n"
-"--section=ABSCHNITT stelle die Einträge dieser Datei in den Abschnitt "
-"ABSCHNITT\n"
+"--section=ABSCHN  stelle die Einträge dieser Datei in den Abschnitt ABSCHN\n"
 "                  des Verzeichnisses.  Wenn mehr als ein --section "
 "angegeben\n"
 "                  wird, werden alle Einträge in jedem der Abschnitte\n"
@@ -1898,15 +1912,17 @@ msgstr ""
 "                  der Eintragstext der Info-Datei selbst entnommen.\n"
 "--version         Programmversion anzeigen\n"
 "\n"
-"Fehlerberichte (\"bugs\") bitte an <bug-texinfo@prep.ai.mit.edu> schicken.\n"
+"Fehlerberichte (\"bugs\") bitte an <bug-texinfo@gnu.org> schicken.\n"
+"\n"
+"Für die deutsche Übersetzung ist die Mailingliste <de@li.org> zuständig.\n"
 
-#: util/install-info.c:334
+#: util/install-info.c:341
 msgid ""
 "This is the file .../info/dir, which contains the\n"
 "topmost node of the Info hierarchy, called (dir)Top.\n"
 "The first time you invoke Info you start off looking at this node.\n"
 "\n"
-"File: dir       Node: Top       This is the top of the INFO tree\n"
+"File: dir,\tNode: Top,\tThis is the top of the INFO tree\n"
 "\n"
 "  This (the Directory node) gives a menu of major topics.\n"
 "  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
@@ -1918,50 +1934,57 @@ msgid ""
 "\n"
 "* Menu:\n"
 msgstr ""
+"Dies ist die Datei .../info/dir, die den obersten Knoten der\n"
+"Info-Hierarchie enthält, genannt (dir)Top.\n"
+"Beim ersten Aufruf von Info geht es bei diesem Knoten los.\n"
+"\n"
+"Date: dir     Knoten: Top       Dies ist »top« des INFO-Baums\n"
+"\n"
+"  Dieser Verzeichnis-Knoten zeigt ein Menü aller Hauptpunkte an.\n"
+"  Beenden mit \"q\", \"?\" listet alle Info-Befehle auf, \"d\" kehrt nach "
+"hierher\n"
+"  zurück, \"h\" gibt eine Einsteiger-Hilfe,\n"
+"  \"mEmacs<Return>\" besucht das Emacs-Manual, etc.\n"
+"\n"
+"  Im Emacs kann man mit mouse-button-2 auf einen Menüpunkt oder einen\n"
+"  Querverweis klicken, um einen solchen auswählen.\n"
+"\n"
+"* Menü:\n"
 
-#: util/install-info.c:357
+#: util/install-info.c:364
 #, c-format
 msgid "%s: could not read (%s) and could not create (%s)\n"
-msgstr ""
+msgstr "%s: kann nicht gelesen (%s) und kann nicht angelegt werden (%s)\n"
 
-#: util/install-info.c:456 util/install-info.c:466
+#: util/install-info.c:464 util/install-info.c:474
 #, c-format
 msgid "%s: Specify the Info directory only once.\n"
 msgstr "%s: Info-Verzeichnis nur einmal angeben.\n"
 
-#: util/install-info.c:494
+#: util/install-info.c:502
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr "%s: Info-Datei nur einmal angeben.\n"
 
-#: util/install-info.c:521
-#, c-format
-msgid "install-info (GNU %s) %s\n"
-msgstr ""
-
 # checkit
-#: util/install-info.c:541
+#: util/install-info.c:550
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr "Kommandozeilen-Argument »%s« wird übergangen"
 
-# checkit
-#: util/install-info.c:545
-#, fuzzy
+#: util/install-info.c:554
 msgid "No input file specified; try --help for more information."
-msgstr "»%s --help« gibt weitere Informationen.\n"
+msgstr "Keine Eingabe-Datei angegeben; »--help« gibt weitere Informationen."
 
-# checkit
-#: util/install-info.c:547
-#, fuzzy
+#: util/install-info.c:556
 msgid "No dir file specified; try --help for more information."
-msgstr "»%s --help« gibt weitere Informationen.\n"
+msgstr "Keine dir-Datei angegeben; »--help« gibt weitere Informationen."
 
-#: util/install-info.c:599 util/install-info.c:622
+#: util/install-info.c:608 util/install-info.c:631
 msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
 msgstr "START-INFO-DIR-ENTRY ohne END-INFO-DIR-ENTRY"
 
-#: util/install-info.c:618
+#: util/install-info.c:627
 msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
 msgstr "END-INFO-DIR-ENTRY ohne START-INFO-DIR-ENTRY"
 
@@ -1970,56 +1993,56 @@ msgstr "END-INFO-DIR-ENTRY ohne START-INFO-DIR-ENTRY"
 #. installer should have to correct (it's a problem for the
 #. maintainer), and there's no need to cause subsequent parts of
 #. `make install' to fail.
-#: util/install-info.c:632
-#, fuzzy, c-format
+#: util/install-info.c:641
+#, c-format
 msgid "no info dir entry in `%s'"
 msgstr "Kein Info-Verzeichnis-Eintrag in »%s«"
 
-#: util/install-info.c:843
+#: util/install-info.c:852
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
-msgstr "Menupunkt »%s« bereits vorhanden, für Datei »%s«"
+msgstr "Menüpunkt »%s« bereits vorhanden, für Datei »%s«"
 
-#: util/install-info.c:866
+#: util/install-info.c:875
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr "keine Einträge für »%s« gefunden; nichts entfernt"
 
-#: util/texindex.c:263
+#: util/texindex.c:253
 msgid "keep temporary files around after processing"
 msgstr "temporäre Dateien bis nach der Verarbeitung aufheben"
 
-#: util/texindex.c:265
+#: util/texindex.c:255
 msgid "do not keep temporary files around after processing (default)"
 msgstr "keine temporäre Dateien bis nach der Verarbeitung aufheben (Standard)"
 
-#: util/texindex.c:267
+#: util/texindex.c:257
 msgid "send output to FILE"
 msgstr "Ausgabe nach DATEI schicken"
 
-#: util/texindex.c:269
+#: util/texindex.c:259
 msgid "display version information and exit"
 msgstr "Programmversion anzeigen"
 
-#: util/texindex.c:271
+#: util/texindex.c:261
 msgid "display this help and exit"
 msgstr "diese Hilfe anzeigen"
 
-#: util/texindex.c:282
+#: util/texindex.c:272
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Aufruf: %s [OPTION]... DATEI...\n"
 
-#: util/texindex.c:283
+#: util/texindex.c:273
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr "Erzeuge einen sortierten Index für jede TeX-Ausgabedatei.\n"
 
 #. Avoid trigraph nonsense.
-#: util/texindex.c:285
+#: util/texindex.c:275
 msgid "Usually FILE... is `foo.??' for a document `foo.texi'.\n"
 msgstr "DATEI... ist normalerweise »foo.??« für ein Dokument »foo.texi«.\n"
 
-#: util/texindex.c:286
+#: util/texindex.c:276
 msgid ""
 "\n"
 "Options:\n"
@@ -2027,207 +2050,40 @@ msgstr ""
 "\n"
 "Optionen:\n"
 
-#: util/texindex.c:300
+#: util/texindex.c:290
 msgid ""
 "\n"
-"Email bug reports to bug-texinfo@prep.ai.mit.edu."
+"Email bug reports to bug-texinfo@gnu.org."
 msgstr ""
 "\n"
-"Fehler (\"bugs\") bitte an <bug-texinfo@prep.ai.mit.edu> melden."
-
-#: util/texindex.c:347
-#, fuzzy, c-format
-msgid "texindex (GNU %s %s) 2.1\n"
-msgstr "GNU Makeinfo (Texinfo 3.9) %d.%d\n"
+"Fehler (\"bugs\") bitte an <bug-texinfo@gnu.org> melden.\n"
+"\n"
+"Für die deutsche Übersetzung ist die Mailingliste <de@li.org> zuständig."
 
-#: util/texindex.c:926 util/texindex.c:960 util/texindex.c:1036
-#: util/texindex.c:1064
+#: util/texindex.c:917 util/texindex.c:951 util/texindex.c:1027
+#: util/texindex.c:1055
 #, c-format
 msgid "%s: not a texinfo index file"
 msgstr "%s: keine Texinfo-Indexdatei"
 
-#: util/texindex.c:1021
+#: util/texindex.c:1012
 #, c-format
 msgid "failure reopening %s"
 msgstr "Fehler beim Wiederöffnen von »%s«"
 
 # checkit
-#: util/texindex.c:1334
+#: util/texindex.c:1325
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "Eintrag »%s« folgt einem Eintrag mit einem Zweitnamen"
 
-#: util/texindex.c:1672
-#, fuzzy, c-format
+#: util/texindex.c:1663
+#, c-format
 msgid "%s; for file `%s'.\n"
 msgstr "%s; für Datei »%s«.\n"
 
 # checkit
-#: util/texindex.c:1733
+#: util/texindex.c:1724
 #, c-format
 msgid "Virtual memory exhausted in %s ()!  Needed %d bytes."
 msgstr "Virtual memory exhausted in %s ()!  Needed %d bytes."
-
-#~ msgid "%s: --fill-column arg must be numeric, not `%s'.\n"
-#~ msgstr "%s: Argument für --fill-column muss numerisch sein, nicht »%s«.\n"
-
-#~ msgid "%s: --reference-limit arg must be numeric, not `%s'.\n"
-#~ msgstr ""
-#~ "%s: Argument für --reference-limit muss numerisch sein, nicht »%s«.\n"
-
-#~ msgid "Misplaced `}'"
-#~ msgstr "Fehlplazierte »}«"
-
-#~ msgid "No input file specified"
-#~ msgstr "Keine Eingabedatei angegeben"
-
-#~ msgid "No dir file specified"
-#~ msgstr "Keine »dir«-Datei angegeben"
-
-#, fuzzy
-#~ msgid "No earlier nodes in this window."
-#~ msgstr "Es gibt kein Menu in diesem Node."
-
-#~ msgid "Cross-reference must be terminated with a period or a comma"
-#~ msgstr "Querverweis muss mit einem Punkt oder Komma beendet werden."
-
-#~ msgid "stdin"
-#~ msgstr "Standard-Eingabe"
-
-#~ msgid "noname.texi"
-#~ msgstr "noname.texi"
-
-#~ msgid "No node name specified for `%c%s' command"
-#~ msgstr "Keinen \"node\"-Namen für »%c%s«-Befehl angegeben"
-
-#~ msgid ""
-#~ "Validation error.  `%s' field points to node `%s', which doesn't exist"
-#~ msgstr ""
-#~ "Fehler beim Überprüfen.  Feld »%s« verweist auf \"node\" »%s«, den es nicht "
-#~ "gibt."
-
-# checkit
-#~ msgid "Unknown file system error"
-#~ msgstr "Unbekannt file system Fehler"
-
-#~ msgid "Unknown index reference `%s'"
-#~ msgstr "Unbekannter Index-Verweis »%s«"
-
-#~ msgid "Unknown index reference"
-#~ msgstr "Unbekannter Index-Verweis"
-
-#~ msgid "`%c%s' expected more than just `%s'.  It needs something in `{...}'"
-#~ msgstr "»%c%s« erwartet mehr als nur »%s«.  Es verlangt etwas in »{...}«"
-
-#~ msgid "%s: can not open: %s\n"
-#~ msgstr "%s: kann nicht geöffnet werden: %s\n"
-
-#~ msgid "%s: %s: %d: mismatched braces\n"
-#~ msgstr "%s: %s: %d: nicht übereinstimmende Klammern\n"
-
-#~ msgid "unknown error %d"
-#~ msgstr "unbekannter Fehler %d"
-
-#~ msgid "Unknown error"
-#~ msgstr "Unbekannter Fehler"
-
-#~ msgid "--version"
-#~ msgstr "--version"
-
-#~ msgid "--keep"
-#~ msgstr "--keep"
-
-#~ msgid "-k"
-#~ msgstr "-k"
-
-#~ msgid "--help"
-#~ msgstr "--help"
-
-#~ msgid "-h"
-#~ msgstr "-h"
-
-#~ msgid "--output"
-#~ msgstr "--output"
-
-#~ msgid "-o"
-#~ msgstr "-o"
-
-#~ msgid "Index"
-#~ msgstr "Index"
-
-#~ msgid "GNU Info (Texinfo 3.9) %s\n"
-#~ msgstr "GNU Info (Texinfo 3.9) %s\n"
-
-#~ msgid "The current search path is:\n"
-#~ msgstr "Der aktuelle Suchpfad ist:\n"
-
-#~ msgid ""
-#~ "Commands available in the echo area:\n"
-#~ "\n"
-#~ msgstr "Verfügbare Befehle im Echo-Bereich:\n"
-
-# darf derzeit nicht übersetzt werden! -ke-
-#~ msgid "Help"
-#~ msgstr "Help"
-
-# darf derzeit nicht übersetzt werden! -ke-
-#~ msgid "Help-Small-Screen"
-#~ msgstr "Help-Small-Screen"
-
-#~ msgid "Info"
-#~ msgstr "Info"
-
-#~ msgid "ESC "
-#~ msgstr "ESC "
-
-#~ msgid "%s (%s): %s."
-#~ msgstr "%s (%s): %s."
-
-#~ msgid "ESC %s"
-#~ msgstr "ESC %s"
-
-#~ msgid "LFD"
-#~ msgstr "LFD"
-
-#~ msgid "TAB"
-#~ msgstr "TAB"
-
-#~ msgid "RET"
-#~ msgstr "RET"
-
-#~ msgid "ESC"
-#~ msgstr "ESC"
-
-#~ msgid "SPC"
-#~ msgstr "SPC"
-
-#~ msgid "DEL"
-#~ msgstr "DEL"
-
-# nicht üs -ke-
-#~ msgid "echo-area-"
-#~ msgstr "echo-area-"
-
-#~ msgid "/* %s -- Generated declarations for Info commands. */\n"
-#~ msgstr "/* %s -- Erzeugte Deklarationen für Info-Befehle. */\n"
-
-# checkit
-#~ msgid "done"
-#~ msgstr "fertig"
-
-# checkit
-#~ msgid "%s: Out of virtual memory!\n"
-#~ msgstr "%s: Hauptspeicher erschöpft!\n"
-
-#~ msgid "Multitables cannot be nested"
-#~ msgstr "\"Multitables\" können nicht verschachtelt sein"
-
-#~ msgid "--no-keep"
-#~ msgstr "--no-keep"
-
-#~ msgid "*Apropos*"
-#~ msgstr "*Apropos*"
-
-# checkit
-#~ msgid "******************************"
-#~ msgstr "******************************"
diff --git a/texinfo/po/fr.gmo b/texinfo/po/fr.gmo
index 1b6caa1658f..bc0f11cb69b 100644
--- a/texinfo/po/fr.gmo
+++ b/texinfo/po/fr.gmo
diff --git a/texinfo/po/fr.po b/texinfo/po/fr.po
index adb60a772f2..a1a2abc7a22 100644
--- a/texinfo/po/fr.po
+++ b/texinfo/po/fr.po
@@ -1,479 +1,124 @@
-# Version française du progiciel Texinfo-3.9
-# Copyright (C) 1996 Free Software Foundation, Inc.
-# Laurent Bourbeau <bourbeau@progiciels-bpi.ca>, 1996.
+# Version française du progiciel Texinfo-3.11.
+# Copyright © 1996, 1997 Free Software Foundation, Inc.
+# Laurent Bourbeau <bourbeau@progiciels-bpi.ca>, 1997.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: texinfo 3.9POT-Creation-Date: 1997-07-13 "
-"17:12-0400PO-Revision-Date: 1997-03-11 00:47 ESTLast-Translator: Laurent "
-"Bourbeau <bourbeau@progiciels-bpi.ca>Language-Team: French "
-"<fr@li.org>MIME-Version: 1.0Content-Type: text/plain; "
-"charset=ISO-8859-1Content-Transfer-Encoding: 8-bitPOT-Creation-Date: "
-"1997-07-13 17:12-0400POT-Creation-Date: 1997-07-13 "
-"17:12-0400POT-Creation-Date: 1997-07-13 17:12-0400POT-Creation-Date: "
-"1997-07-15 14:50-0400POT-Creation-Date: 1997-07-15 "
-"14:50-0400POT-Creation-Date: 1997-07-15 15:35-0400POT-Creation-Date: "
-"1997-07-15 15:35-0400POT-Creation-Date: 1997-07-17 "
-"17:50-0400POT-Creation-Date: 1997-07-18 10:40-0400POT-Creation-Date: "
-"1997-07-19 17:19-0400POT-Creation-Date: 1997-07-20 "
-"08:19-0400POT-Creation-Date: 1997-07-20 08:19-0400POT-Creation-Date: "
-"1997-07-20 08:19-0400POT-Creation-Date: 1997-07-25 "
-"17:57-0400POT-Creation-Date: 1997-07-25 17:57-0400 POT-Creation-Date: "
-"1997-07-29 18:04-0400POT-Creation-Date: 1997-07-31 "
-"17:43-0400gPOT-Creation-Date: 1997-07-31 17:43-0400\n"
-"m"
-
-#. Commands found in "./session.c".
-#: info/doc.c:27 info/session.c:629
-msgid "Move down to the next line"
-msgstr "Descendre à la ligne suivante"
-
-#. Move WINDOW's point up to the previous line if possible.
-#: info/doc.c:28 info/session.c:644
-msgid "Move up to the previous line"
-msgstr "Monter à la ligne précédente"
+"Project-Id-Version: texinfo 3.11\n"
+"POT-Creation-Date: 1998-03-03 13:32-0500\n"
+"PO-Revision-Date: 1997-09-16 12:28-04:00\n"
+"Last-Translator: Laurent Bourbeau <bourbeau@progiciels-bpi.ca>\n"
+"Language-Team: French <fr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=8859-1\n"
+"Content-Transfer-Encoding: 8-bit\n"
 
-#. Move WINDOW's point to the end of the true line.
-#: info/doc.c:29 info/session.c:659
-msgid "Move to the end of the line"
-msgstr "Aller à la fin de la ligne"
-
-#. Move WINDOW's point to the beginning of the true line.
-#: info/doc.c:30 info/session.c:679
-msgid "Move to the start of the line"
-msgstr "Aller au début de la ligne"
-
-#. Commands found in "./echo-area.c".
-#: info/doc.c:31 info/doc.c:84 info/echo-area.c:283 info/session.c:698
+#. ****************************************************************
+#.
+#. Echo Area Movement Commands
+#.
+#. ****************************************************************
+#: info/echo-area.c:283 info/session.c:698
 msgid "Move forward a character"
 msgstr "Avancer d'un caractère"
 
 #. Move point backward in the node.
-#: info/doc.c:32 info/doc.c:85 info/echo-area.c:295 info/session.c:714
+#: info/echo-area.c:295 info/session.c:714
 msgid "Move backward a character"
 msgstr "Reculer d'un caractère"
 
+#: info/echo-area.c:307
+msgid "Move to the start of this line"
+msgstr "Se déplacer au début de cette ligne"
+
+#: info/echo-area.c:312
+msgid "Move to the end of this line"
+msgstr "Se déplacer à la fin de cette ligne"
+
 #. Move forward a word in the input line.
-#: info/doc.c:33 info/doc.c:88 info/echo-area.c:320 info/session.c:732
+#: info/echo-area.c:320 info/session.c:732
 msgid "Move forward a word"
 msgstr "Avancer d'un mot"
 
-#: info/doc.c:34 info/doc.c:89 info/echo-area.c:360 info/session.c:781
+#: info/echo-area.c:360 info/session.c:781
 msgid "Move backward a word"
 msgstr "Reculer d'un mot"
 
-#: info/doc.c:35 info/session.c:1121
-msgid "Move forwards or down through node structure"
-msgstr "Avancer ou descendre à travers la structure de noeuds"
-
-#: info/doc.c:36 info/session.c:1137
-#, fuzzy
-msgid "Move backwards or up through node structure"
-msgstr "Avancer ou descendre à travers la structure de noeuds"
-
-#. Show the next screen of WINDOW's node.
-#: info/doc.c:37 info/session.c:1152
-msgid "Scroll forward in this window"
-msgstr "Défiler vers l'avant dans cette fenêtre"
-
-#. Show the previous screen of WINDOW's node.
-#: info/doc.c:38 info/session.c:1197
-msgid "Scroll backward in this window"
-msgstr "Défiler vers l'arrière dans cette fenêtre"
-
-#. Move to the beginning of the node.
-#: info/doc.c:39 info/session.c:1237
-msgid "Move to the start of this node"
-msgstr "Aller au noeud de départ de ce noeud"
-
-#. Move to the end of the node.
-#: info/doc.c:40 info/session.c:1244
-msgid "Move to the end of this node"
-msgstr "Aller au noeud terminal de ce noeud"
-
-#. ****************************************************************
-#.
-#. Commands for Manipulating Windows
-#.
-#. ****************************************************************
-#. Make the next window in the chain be the active window.
-#: info/doc.c:41 info/session.c:1257
-msgid "Select the next window"
-msgstr "Sélectionner la fenêtre suivante"
-
-#. Make the previous window in the chain be the active window.
-#: info/doc.c:42 info/session.c:1296
-msgid "Select the previous window"
-msgstr "Sélectionner la fenêtre précédente"
-
-#. Split WINDOW into two windows, both showing the same node.  If we
-#. are automatically tiling windows, re-tile after the split.
-#: info/doc.c:43 info/session.c:1347
-msgid "Split the current window"
-msgstr "Diviser en deux la fenêtre courante"
-
-#. Delete WINDOW, forgetting the list of last visited nodes.  If we are
-#. automatically displaying footnotes, show or remove the footnotes
-#. window.  If we are automatically tiling windows, re-tile after the
-#. deletion.
-#: info/doc.c:44 info/session.c:1428
-msgid "Delete the current window"
-msgstr "Éliminer la fenêtre courante"
-
-#. Just keep WINDOW, deleting all others.
-#: info/doc.c:45 info/session.c:1469
-msgid "Delete all other windows"
-msgstr "Éliminer toutes les autres fenêtres"
-
-#. Scroll the "other" window of WINDOW.
-#: info/doc.c:46 info/session.c:1515
-msgid "Scroll the other window"
-msgstr "Défiler l'autre fenêtre"
-
-#. Change the size of WINDOW by AMOUNT.
-#: info/doc.c:47 info/session.c:1535
-msgid "Grow (or shrink) this window"
-msgstr "Agrandir (ou réduire) cette fenêtre"
-
-#: info/doc.c:48 info/session.c:1546
-msgid "Divide the available screen space among the visible windows"
-msgstr "Répartir l'espace écran disponible parmi les fenêtres visibles"
-
-#: info/doc.c:49 info/session.c:1553
-msgid "Toggle the state of line wrapping in the current window"
-msgstr "Basculer l'état du remplissage de ligne dans la fenêtre courante"
-
-#. Make WINDOW display the "Next:" node of the node currently being
-#. displayed.
-#: info/doc.c:50 info/session.c:1714
-#, fuzzy
-msgid "Select the `Next' node"
-msgstr "Sélectionner la fenêtre suivante"
-
-#. Make WINDOW display the "Prev:" node of the node currently being
-#. displayed.
-#: info/doc.c:51 info/session.c:1722
-#, fuzzy
-msgid "Select the `Prev' node"
-msgstr "Sélection des autres noeuds:"
-
-#. Make WINDOW display the "Up:" node of the node currently being
-#. displayed.
-#: info/doc.c:52 info/session.c:1730
-#, fuzzy
-msgid "Select the `Up' node"
-msgstr "Sélection des autres noeuds:"
-
-#. Make WINDOW display the last node of this info file.
-#: info/doc.c:53 info/session.c:1737
-#, fuzzy
-msgid "Select the last node in this file"
-msgstr "Sélectionner le premier noeud dans ce fichier"
-
-#. Make WINDOW display the first node of this info file.
-#: info/doc.c:54 info/session.c:1759
-msgid "Select the first node in this file"
-msgstr "Sélectionner le premier noeud dans ce fichier"
-
-#: info/doc.c:55 info/session.c:2401
-msgid "Select the most recently selected node"
-msgstr "Choisir le noeud qui a été le plus récemment sélectionné"
-
-#: info/doc.c:56 info/session.c:1778
-msgid "Select the last item in this node's menu"
-msgstr "Sélectionner le dernier item dans ce menu de noeuds"
-
-#. Use KEY (a digit) to select the Nth menu item in WINDOW->node.
-#: info/doc.c:57 info/session.c:1784
-msgid "Select this menu item"
-msgstr "Sélectionner cet item menu"
-
-#. Read a line (with completion) which is the name of a menu item,
-#. and select that item.
-#: info/doc.c:58 info/session.c:2042
-msgid "Read a menu item and select its node"
-msgstr "Lire un item menu et sélectionner son noeud"
-
-#: info/doc.c:59 info/session.c:2050
-msgid "Read a footnote or cross reference and select its node"
-msgstr ""
-"Lire une note en bas de page ou une référence croisée et\n"
-"sélectionner son noeud."
-
-#. Position the cursor at the start of this node's menu.
-#: info/doc.c:60 info/session.c:2056
-msgid "Move to the start of this node's menu"
-msgstr "Aller au point de départ de ce menu de noeud."
-
-#: info/doc.c:61 info/session.c:2080
-msgid "Visit as many menu items at once as possible"
-msgstr "Visiter d'un seul coup autant d'items menu que possible"
-
-#. Read a line of input which is a node name, and go to that node.
-#: info/doc.c:62 info/session.c:2108
-msgid "Read a node name and select it"
-msgstr "Lire un nom de noeud et sélectionner ce noeud"
-
-#: info/doc.c:63 info/session.c:2194
-msgid "Read a manpage reference and select it"
-msgstr "Lire une référence de page-manuel et la sélectionner"
-
-#. Move to the "Top" node in this file.
-#: info/doc.c:64 info/session.c:2228
-msgid "Select the node `Top' in this file"
-msgstr "Sélectionner le noeud «Top» dans ce fichier"
-
-#. Move to the node "(dir)Top".
-#: info/doc.c:65 info/session.c:2234
-msgid "Select the node `(dir)'"
-msgstr "Sélectionner le noeud «(dir)»"
-
-#. Kill named node.
-#: info/doc.c:66 info/session.c:2407
-msgid "Kill this node"
-msgstr "Effacer ce noeud"
-
-#. Read the name of a file and select the entire file.
-#: info/doc.c:67 info/session.c:2415
-msgid "Read the name of a file and select it"
-msgstr "Lire le nom d'un fichier et le sélectionner"
-
-#: info/doc.c:68 info/session.c:2634
-msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
-msgstr "Acheminer les contenus de ce noeud à travers INFO_PRINT_COMMAND"
-
-#: info/doc.c:69 info/session.c:2946
-msgid "Read a string and search for it"
-msgstr "Lire une chaîne et en faire la fouille"
-
-#: info/doc.c:70 info/doc.c:71 info/session.c:3020 info/session.c:3026
-msgid "Search interactively for a string as you type it"
-msgstr "Fouiller interactivement pour une chaîne telle que vous la tapez"
-
-#: info/doc.c:72 info/session.c:3579
-msgid "Move to the previous cross reference"
-msgstr "Aller à la référence croisée précédente"
-
-#: info/doc.c:73 info/session.c:3588
-msgid "Move to the next cross reference"
-msgstr "Aller à la prochaine référence croisée"
-
-#: info/doc.c:74 info/session.c:3598
-msgid "Select reference or menu item appearing on this line"
-msgstr "Sélectionner la référence ou l'item menu apparaissant sur cette ligne"
-
-#. ****************************************************************
-#.
-#. Miscellaneous Info Commands
-#.
-#. ****************************************************************
-#. What to do when C-g is pressed in a window.
-#: info/doc.c:75 info/session.c:3620
-msgid "Cancel current operation"
-msgstr "Annuler l'opération courante"
-
-#: info/doc.c:76 info/session.c:3636
-msgid "Move to the cursor to a specific line of the window"
-msgstr "Déplacer le curseur sur une ligne spécifique de la fenêtre."
-
-#. Clear the screen and redraw its contents.  Given a numeric argument,
-#. move the line the cursor is on to the COUNT'th line of the window.
-#: info/doc.c:77 info/session.c:3668
-msgid "Redraw the display"
-msgstr "Redessiner l'affichage écran."
-
-#. This command does nothing.  It is the fact that a key is bound to it
-#. that has meaning.  See the code at the top of info_session ().
-#: info/doc.c:78 info/session.c:3705
-msgid "Quit using Info"
-msgstr "Quitter en utilisant Info"
-
-#: info/doc.c:80 info/session.c:3958
-msgid "Add this digit to the current numeric argument"
-msgstr "Ajouter ce chiffre à l'argument numérique courant"
-
-#: info/doc.c:81
-#, fuzzy
-msgid "universal-argument"
-msgstr "Utilisé internement par \\[universal-argument]"
-
-#: info/doc.c:81 info/session.c:3967
-msgid "Start (or multiply by 4) the current numeric argument"
-msgstr "Enclencher (ou multipler par 4) l'argument numérique courant"
-
-#: info/doc.c:82 info/session.c:3982
-msgid "Internally used by \\[universal-argument]"
-msgstr "Utilisé internement par \\[universal-argument]"
-
-#: info/doc.c:86 info/echo-area.c:307
-msgid "Move to the start of this line"
-msgstr "Se déplacer au début de cette ligne"
-
-#: info/doc.c:87 info/echo-area.c:312
-msgid "Move to the end of this line"
-msgstr "Se déplacer à la fin de cette ligne"
-
-#: info/doc.c:90 info/echo-area.c:400
+#: info/echo-area.c:400
 msgid "Delete the character under the cursor"
 msgstr "Éliminer le caractère sous le curseur"
 
-#: info/doc.c:91 info/echo-area.c:430
+#: info/echo-area.c:430
 msgid "Delete the character behind the cursor"
 msgstr "Éliminer le caractère précédent le curseur"
 
-#: info/doc.c:92 info/echo-area.c:451
+#: info/echo-area.c:451
 msgid "Cancel or quit operation"
 msgstr "Annuler ou opération de quitter"
 
-#: info/doc.c:93 info/echo-area.c:466
+#: info/echo-area.c:466
 msgid "Accept (or force completion of) this line"
 msgstr "Accepter cette ligne (ou en forcer la complétion)"
 
-#: info/doc.c:94 info/echo-area.c:471
+#: info/echo-area.c:471
 msgid "Insert next character verbatim"
 msgstr "Insérer le prochain caractère textuellement"
 
-#: info/doc.c:95 info/echo-area.c:479
+#: info/echo-area.c:479
 msgid "Insert this character"
 msgstr "Insérer ce caractère"
 
-#: info/doc.c:96 info/echo-area.c:497
+#: info/echo-area.c:497
 msgid "Insert a TAB character"
 msgstr "Insérer un caractère de tabulation"
 
 #. Transpose the characters at point.  If point is at the end of the line,
 #. then transpose the characters before point.
-#: info/doc.c:97 info/echo-area.c:504
+#: info/echo-area.c:504
 msgid "Transpose characters at point"
 msgstr "Transposer les caractères en position du point courant"
 
-#: info/doc.c:98 info/echo-area.c:555
+#: info/echo-area.c:555
 msgid "Yank back the contents of the last kill"
 msgstr "Recoller le contenu du dernier effacement"
 
+#: info/echo-area.c:562
+msgid "Kill ring is empty"
+msgstr "L'anneau des effacements temporaires est vide"
+
 #. If the last command was yank, or yank_pop, and the text just before
 #. point is identical to the current kill item, then delete that text
 #. from the line, rotate the index down, and yank back some other text.
-#: info/doc.c:99 info/echo-area.c:575
+#: info/echo-area.c:575
 msgid "Yank back a previous kill"
 msgstr "Recoller un effacement antérieur"
 
 #. Delete the text from point to end of line.
-#: info/doc.c:100 info/echo-area.c:608
+#: info/echo-area.c:608
 msgid "Kill to the end of the line"
 msgstr "Effacer du point courant jusqu'à la fin de la ligne"
 
-#: info/doc.c:101 info/echo-area.c:621
+#: info/echo-area.c:621
 msgid "Kill to the beginning of the line"
 msgstr "Effacer du point courant jusqu'au début de la ligne"
 
 #. Delete from point to the end of the current word.
-#: info/doc.c:102 info/echo-area.c:633
+#: info/echo-area.c:633
 msgid "Kill the word following the cursor"
 msgstr "Effacer le mot suivant le curseur"
 
-#: info/doc.c:103 info/echo-area.c:652
+#: info/echo-area.c:652
 msgid "Kill the word preceding the cursor"
 msgstr "Effacer le mot précédent le curseur"
 
-#: info/doc.c:104 info/echo-area.c:916
-msgid "List possible completions"
-msgstr "Énumérer les complétions possibles"
-
-#: info/doc.c:105 info/echo-area.c:1090
-msgid "Insert completion"
-msgstr "Insérer la complétion"
-
-#. Scroll the "other" window.  If there is a window showing completions, scroll
-#. that one, otherwise scroll the window which was active on entering the read
-#. function.
-#: info/doc.c:106 info/echo-area.c:1321
-msgid "Scroll the completions window"
-msgstr "Dérouler la fenêtre des complétions"
-
-#. Commands found in "./infodoc.c".
-#: info/doc.c:108 info/infodoc.c:328
-msgid "Display help message"
-msgstr "Afficher le message d'aide"
-
-#. Show the Info help node.  This means that the "info" file is installed
-#. where it can easily be found on your system.
-#: info/doc.c:109 info/infodoc.c:346
-msgid "Visit Info node `(info)Help'"
-msgstr "Visiter le noeud Info «(info)Aide»"
-
-#: info/doc.c:110 info/infodoc.c:470
-msgid "Print documentation for KEY"
-msgstr "Imprimer la documentation pour KEY."
-
-#: info/doc.c:111
-msgid "Show what to type to execute a given command"
-msgstr "Montrer quoi écrire afin d'exécuter une commande donnée."
-
-#. Commands found in "./m-x.c".
-#: info/doc.c:113 info/m-x.c:69
-msgid "Read the name of an Info command and describe it"
-msgstr "Lire le nom d'une commande Info et la décrire"
-
-#: info/doc.c:114 info/m-x.c:96
-msgid "Read a command name in the echo area and execute it"
-msgstr "Lire le nom d'une commande dans la zone écho et l'exécuter"
-
-#: info/doc.c:115 info/m-x.c:150
-msgid "Set the height of the displayed window"
-msgstr "Ajuster la hauteur de la fenêtre affichée"
-
-#. Commands found in "./indices.c".
-#: info/doc.c:117 info/indices.c:175
-msgid "Look up a string in the index for this file"
-msgstr "Rechercher une chaîne dans l'index pour ce fichier"
-
-#: info/doc.c:118 info/indices.c:332
-msgid ""
-"Go to the next matching index item from the last `\\[index-search]' command"
-msgstr ""
-"Aller au prochain item d'appariement d'index à partir de la dernière\n"
-"commande `\\[index-search]'"
-
-#: info/doc.c:119 info/indices.c:616
-msgid "Grovel all known info file's indices for a string and build a menu"
-msgstr ""
-"Aplatir tous les indices de fichier info connus pour une chaîne\n"
-"et construire un menu"
-
-#. Commands found in "./nodemenu.c".
-#: info/doc.c:121 info/nodemenu.c:217
-msgid "Make a window containing a menu of all of the currently visited nodes"
-msgstr "Faire une fenêtre contenant un menu de tout noeud actuellement visité."
-
-#: info/doc.c:122 info/nodemenu.c:297
-msgid "Select a node which has been previously visited in a visible window"
-msgstr "Sélectionner un noeud qui a déjà été visité dans une fenêtre visible."
-
-#. Commands found in "./footnotes.c".
-#: info/doc.c:124 info/footnotes.c:232
-msgid "Show the footnotes associated with this node in another window"
-msgstr ""
-"Montrer les notes en bas de page associées à ce noeud dans\n"
-"une autre fenêtre"
-
-#. Commands found in "./variables.c".
-#: info/doc.c:126 info/variables.c:77
-msgid "Explain the use of a variable"
-msgstr "Expliquer l'usage d'une variable"
-
-#: info/doc.c:127 info/variables.c:102
-msgid "Set the value of an Info variable"
-msgstr "Fixer la valeur d'une variable Info"
-
-#: info/echo-area.c:562
-msgid "Kill ring is empty"
-msgstr "L'anneau des effacements temporaires est vide"
-
 #: info/echo-area.c:871
 msgid "Not complete"
 msgstr "Non complet"
 
+#: info/echo-area.c:916
+msgid "List possible completions"
+msgstr "Énumérer les complétions possibles"
+
 #: info/echo-area.c:929
 msgid "No completions"
 msgstr "Aucune complétion"
@@ -483,31 +128,43 @@ msgid "Sole completion"
 msgstr "Une seule complétion"
 
 #: info/echo-area.c:942
-#, c-format
-msgid "There %s %d "
-msgstr "Comme complétion(s) %s %d "
-
-#: info/echo-area.c:942
-msgid "is"
-msgstr "il y a"
-
-#: info/echo-area.c:942
-msgid "are"
-msgstr "il y a"
+#, fuzzy
+msgid "One completion:\n"
+msgstr "la complétion %s:\n"
 
-#: info/echo-area.c:945
+#: info/echo-area.c:943
 #, fuzzy, c-format
-msgid "completion%s:\n"
-msgstr "Aucune complétion"
+msgid "%d completions:\n"
+msgstr "la complétion %s:\n"
+
+#: info/echo-area.c:1088
+msgid "Insert completion"
+msgstr "Insérer la complétion"
 
-#: info/echo-area.c:1223
+#: info/echo-area.c:1221
 msgid "Building completions..."
 msgstr "Construction des complétions..."
 
+#. Scroll the "other" window.  If there is a window showing completions, scroll
+#. that one, otherwise scroll the window which was active on entering the read
+#. function.
+#: info/echo-area.c:1319
+msgid "Scroll the completions window"
+msgstr "Dérouler la fenêtre des complétions"
+
 #: info/footnotes.c:206
 msgid "Footnotes could not be displayed"
 msgstr "Les notes en bas de page ne peuvent pas être affichées"
 
+#: info/footnotes.c:232
+msgid "Show the footnotes associated with this node in another window"
+msgstr ""
+"Montrer les notes en bas de page associées à ce noeud dans une autre fenêtre"
+
+#: info/indices.c:175
+msgid "Look up a string in the index for this file"
+msgstr "Rechercher une chaîne dans l'index pour ce fichier"
+
 #: info/indices.c:205
 msgid "Finding index entries..."
 msgstr "Recherche des entrées d'index..."
@@ -520,6 +177,12 @@ msgstr "Aucun indice retrouvé."
 msgid "Index entry: "
 msgstr "Entrée d'index: "
 
+#: info/indices.c:332
+msgid ""
+"Go to the next matching index item from the last `\\[index-search]' command"
+msgstr ""
+"Passer à la référence suivante de la dernière commande «\\[index-search]»"
+
 #: info/indices.c:342
 msgid "No previous index search string."
 msgstr "Aucune autre chaîne de fouille d'index."
@@ -544,15 +207,19 @@ msgstr "NE PEUT PAS VOIR CECI"
 #: info/indices.c:429
 #, c-format
 msgid "Found \"%s\" in %s. (`\\[next-index-match]' tries to find next.)"
-msgstr ""
-"Trouver «%s» dans %s.  (`\\[next-index-match]' tente de trouver\n"
-"le prochain.)"
+msgstr "Trouver «%s» dans %s.  («\\[next-index-match]» cherchera le prochain.)"
 
 #: info/indices.c:533
 #, c-format
 msgid "Scanning indices of \"%s\"..."
 msgstr "Fouille des indices de «%s»..."
 
+#: info/indices.c:616
+msgid "Grovel all known info file's indices for a string and build a menu"
+msgstr ""
+"Aplatir tous les indices de fichier info connus pour une chaîne et "
+"construire un menu"
+
 #: info/indices.c:620
 msgid "Index apropos: "
 msgstr "Index à-propos: "
@@ -566,76 +233,70 @@ msgstr ""
 "\n"
 "* Menu: Noeuds dont les indices contiennent «%s»:\n"
 
-#: info/info.c:347
+#: info/info.c:212
 #, fuzzy
+msgid "Try --help for more information."
+msgstr "Pour en savoir davantage, faites: «%s --help».\n"
+
+#: info/info.c:231 makeinfo/makeinfo.c:1089 util/install-info.c:530
+#: util/texindex.c:338
+#, fuzzy, c-format
+msgid ""
+"Copyright (C) %s Free Software Foundation, Inc.\n"
+"There is NO warranty.  You may redistribute this software\n"
+"under the terms of the GNU General Public License.\n"
+"For more information about these matters, see the files named COPYING.\n"
+msgstr ""
+"Copyright © 1996 Free Software Foundation, Inc.\n"
+"AUCUNE garantie n'est donnée; tant pour des raisons COMMERCIALES que\n"
+"pour RÉPONDRE À UN BESOIN PARTICULIER.  Vous pouvez redistribuer des copies\n"
+"de ce logiciel selon les termes de la licence GNU General Public License.\n"
+"Pour plus d'informations, consultez le fichier COPYING."
+
+#: info/info.c:363
 msgid "no entries found\n"
-msgstr "Aucun indice retrouvé."
+msgstr "aucune entrée retrouvée\n"
 
-#: info/info.c:390
+#: info/info.c:406
 msgid "There is no menu in this node."
 msgstr "Il n'y a pas de menu dans ce noeud."
 
-#: info/info.c:421
+#: info/info.c:437
 #, c-format
 msgid "There is no menu item \"%s\" in this node."
 msgstr "Il n'y a pas d'item menu «%s» dans ce noeud."
 
-#: info/info.c:485
+#: info/info.c:501
 #, c-format
 msgid "Unable to find the node referenced by \"%s\"."
 msgstr "Incappable de trouver le noeud référencé par «%s»."
 
-# Est-ce vraiment un message à traduire?  NON.
-#: info/info.c:595
-msgid ""
-"Usage: info [-d dir-path] [-f info-file] [-o output-file] [-n node-name]..."
-msgstr ""
-"Usage: info [-d dir-path] [-f info-file] [-o output-file] [-n node-name]..."
-
-# Est-ce vraiment un message à traduire?  NON.
-#: info/info.c:596
-msgid ""
-"            [--directory dir-path] [--file info-file] [--node node-name]..."
-msgstr ""
-"            [--directory dir-path] [--file info-file] [--node node-name]..."
-
-# Est-ce vraiment un message à traduire?  NON.
-#: info/info.c:597
-msgid "            [--help] [--output output-file] [--subnodes] [--version]"
-msgstr "            [--help] [--output output-file] [--subnodes] [--version]"
-
-# Est-ce vraiment un message à traduire?  NON.
-#: info/info.c:598
-msgid "            [--dribble dribble-file] [--restore from-file]"
-msgstr "            [--dribble dribble-file] [--restore from-file]"
-
-# Est-ce vraiment un message à traduire?  NON.
-#: info/info.c:599
-msgid "            [menu-selection ...]"
-msgstr "            [menu-selection ...]"
-
-#: info/info.c:607
-#, fuzzy
+#: info/info.c:602
+#, fuzzy, c-format
 msgid ""
-"Here is a quick description of Info's options.  For a more complete\n"
-"description of how to use Info, type `info info options'.\n"
+"Usage: %s [OPTION]... [INFO-FILE [MENU-ITEM...]]\n"
+"\n"
+"Read documentation in Info format.\n"
+"For more complete documentation on how to use Info, run `info info "
+"options'.\n"
 "\n"
-"   --directory DIR              Add DIR to INFOPATH.\n"
-"   --dribble FILENAME           Remember user keystrokes in FILENAME.\n"
-"   --file FILENAME              Specify Info file to visit.\n"
-"   --node NODENAME              Specify nodes in first visited Info file.\n"
-"   --output FILENAME            Output selected nodes to FILENAME.\n"
-"   --restore FILENAME           Read initial keystrokes from FILENAME.\n"
-"   --subnodes                   Recursively output menu items.\n"
-"   --help                       Get this help message.\n"
-"   --version                    Display Info's version information.\n"
+"Options:\n"
+"--directory DIR              add DIR to INFOPATH.\n"
+"--dribble FILENAME           remember user keystrokes in FILENAME.\n"
+"--file FILENAME              specify Info file to visit.\n"
+"--node NODENAME              specify nodes in first visited Info file.\n"
+"--output FILENAME            output selected nodes to FILENAME.\n"
+"--restore FILENAME           read initial keystrokes from FILENAME.\n"
+"--subnodes                   recursively output menu items.\n"
+"--help                       display this help and exit.\n"
+"--version                    display version information and exit.\n"
 "\n"
-"Remaining arguments to Info are treated as the names of menu\n"
-"items in the initial node visited.  You can easily move to the\n"
-"node of your choice by specifying the menu names which describe\n"
-"the path to that node.  For example, `info emacs buffers'.\n"
+"The first argument, if present, is the name of the Info file to read.\n"
+"Any remaining arguments are treated as the names of menu\n"
+"items in the initial node visited.  For example, `info emacs buffers'\n"
+"moves to the node `buffers' in the info file `emacs'.\n"
 "\n"
-"Email bug reports to bug-texinfo@prep.ai.mit.edu."
+"Email bug reports to bug-texinfo@gnu.org."
 msgstr ""
 "Voici une brève description des options en mode Info.\n"
 "Pour une description plus détaillée sur le comment utiliser le mode Info,\n"
@@ -648,7 +309,7 @@ msgstr ""
 "   --output FICHIER     Sortir les noeuds sélectionnés dans FICHIER.\n"
 "   --restore FICHIER    Lire les touches initiales à partir de FICHIER.\n"
 "   --subnodes           Sortir récursivement les items menu.\n"
-"   --help               Afficher l'aide-mémoire.\n"
+"   --help               Afficher cet aide-mémoire.\n"
 "   --version            Afficher le nom et la version du logiciel.\n"
 "\n"
 "Les arguments résiduels à Info sont traités comme étant les noms des items\n"
@@ -672,7 +333,22 @@ msgstr ""
 
 #: info/infodoc.c:228
 msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
-msgstr "--- Utiliser `\\[history-node]' ou `\\[kill-node]' pour sortir ---\n"
+msgstr "--- Utiliser «\\[history-node]» ou «\\[kill-node]» pour sortir ---\n"
+
+#. Create or move to the help window.
+#: info/infodoc.c:328
+msgid "Display help message"
+msgstr "Afficher le message d'aide"
+
+#. Show the Info help node.  This means that the "info" file is installed
+#. where it can easily be found on your system.
+#: info/infodoc.c:346
+msgid "Visit Info node `(info)Help'"
+msgstr "Visiter le noeud Info «(info)Aide»"
+
+#: info/infodoc.c:470
+msgid "Print documentation for KEY"
+msgstr "Imprimer la documentation relative à KEY"
 
 #: info/infodoc.c:483
 #, c-format
@@ -701,7 +377,7 @@ msgstr "Où se trouve la commande: "
 #: info/infodoc.c:753
 #, c-format
 msgid "`%s' is not on any keys"
-msgstr "`%s' ne se trouve pas sur n'importe quelle clé"
+msgstr "«%s» ne se trouve pas sur une quelconque clé"
 
 #: info/infodoc.c:759
 #, c-format
@@ -716,16 +392,28 @@ msgstr "%s peut être invoqué via %s."
 #: info/infodoc.c:766
 #, c-format
 msgid "There is no function named `%s'"
-msgstr "Il n'y a pas de fonction nommée `%s'"
+msgstr "Il n'y a pas de fonction nommée «%s»"
+
+#: info/m-x.c:69
+msgid "Read the name of an Info command and describe it"
+msgstr "Lire le nom d'une commande Info et la décrire"
 
 #: info/m-x.c:73
 msgid "Describe command: "
 msgstr "Décrire la commande: "
 
+#: info/m-x.c:96
+msgid "Read a command name in the echo area and execute it"
+msgstr "Lire le nom d'une commande dans la zone écho et l'exécuter"
+
 #: info/m-x.c:134
 msgid "Cannot execute an `echo-area' command here."
 msgstr "Ne peut pas exécuter une commande «echo-area» en cet endroit."
 
+#: info/m-x.c:150
+msgid "Set the height of the displayed window"
+msgstr "Ajuster la hauteur de la fenêtre affichée"
+
 #: info/m-x.c:163
 #, c-format
 msgid "Set screen height to (%d): "
@@ -762,8 +450,17 @@ msgid ""
 "Select one from this menu, or use `\\[history-node]' in another window.\n"
 msgstr ""
 "Voici le menu de noeuds que vous avez visité récemment.\n"
-"Sélectionner un noeud de ce menu, ou utiliser `\\[history-node]' dans\n"
-"une autre fenêtre.\n"
+"Sélectionner un noeud de ce menu, ou utiliser «\\[history-node]» dans une\n"
+"autre fenêtre.\n"
+
+#: info/nodemenu.c:217
+msgid "Make a window containing a menu of all of the currently visited nodes"
+msgstr ""
+"Faire une fenêtre contenant un menu de tous les noeuds actuellement visités"
+
+#: info/nodemenu.c:297
+msgid "Select a node which has been previously visited in a visible window"
+msgstr "Sélectionner un noeud qui a déjà été visité dans une fenêtre visible"
 
 #: info/nodemenu.c:309
 msgid "Select visited node: "
@@ -781,8 +478,28 @@ msgid ""
 "\"\\[menu-item]\" for menu item."
 msgstr ""
 "Bienvenue au mode Info version %s.\n"
-"  \"\\[get-help-window]\" pour obtenir de l'aide,\n"
-"  \"\\[menu-item]\" pour obtenir l'item menu."
+"  «\\[get-help-window]» pour obtenir de l'aide,\n"
+"  «\\[menu-item]» pour obtenir l'item menu."
+
+#. Move WINDOW's point down to the next line if possible.
+#: info/session.c:629
+msgid "Move down to the next line"
+msgstr "Descendre à la ligne suivante"
+
+#. Move WINDOW's point up to the previous line if possible.
+#: info/session.c:644
+msgid "Move up to the previous line"
+msgstr "Monter à la ligne précédente"
+
+#. Move WINDOW's point to the end of the true line.
+#: info/session.c:659
+msgid "Move to the end of the line"
+msgstr "Aller à la fin de la ligne"
+
+#. Move WINDOW's point to the beginning of the true line.
+#: info/session.c:679
+msgid "Move to the start of the line"
+msgstr "Aller au début de la ligne"
 
 #: info/session.c:855
 msgid " times"
@@ -804,7 +521,7 @@ msgstr "En suivant le noeud «Next»..."
 #: info/session.c:899 info/session.c:927 info/session.c:999
 #: info/session.c:1717
 msgid "Next"
-msgstr "Noeud Next"
+msgstr "Noeud «Next»"
 
 #: info/session.c:915
 msgid "Selecting first menu item..."
@@ -851,14 +568,131 @@ msgstr "Aller au noeud «Up» dans cette fenêtre."
 msgid "Moving to \"Prev\"'s last menu item."
 msgstr "Aller au dernier item menu du noeud «Prev»."
 
+#: info/session.c:1121
+msgid "Move forwards or down through node structure"
+msgstr "Avancer ou descendre à travers la structure de noeuds"
+
+#: info/session.c:1137
+msgid "Move backwards or up through node structure"
+msgstr "Reculer ou monter à travers la structure de noeuds"
+
+#. Show the next screen of WINDOW's node.
+#: info/session.c:1152
+msgid "Scroll forward in this window"
+msgstr "Défiler vers l'avant dans cette fenêtre"
+
+#. Show the previous screen of WINDOW's node.
+#: info/session.c:1197
+msgid "Scroll backward in this window"
+msgstr "Défiler vers l'arrière dans cette fenêtre"
+
+#. Move to the beginning of the node.
+#: info/session.c:1237
+msgid "Move to the start of this node"
+msgstr "Aller au point de départ de ce noeud"
+
+#. Move to the end of the node.
+#: info/session.c:1244
+msgid "Move to the end of this node"
+msgstr "Aller au point terminal de ce noeud"
+
+#. ****************************************************************
+#.
+#. Commands for Manipulating Windows
+#.
+#. ****************************************************************
+#. Make the next window in the chain be the active window.
+#: info/session.c:1257
+msgid "Select the next window"
+msgstr "Sélectionner la fenêtre suivante"
+
+#. Make the previous window in the chain be the active window.
+#: info/session.c:1296
+msgid "Select the previous window"
+msgstr "Sélectionner la fenêtre précédente"
+
+#. Split WINDOW into two windows, both showing the same node.  If we
+#. are automatically tiling windows, re-tile after the split.
+#: info/session.c:1347
+msgid "Split the current window"
+msgstr "Diviser en deux la fenêtre courante"
+
+#. Delete WINDOW, forgetting the list of last visited nodes.  If we are
+#. automatically displaying footnotes, show or remove the footnotes
+#. window.  If we are automatically tiling windows, re-tile after the
+#. deletion.
+#: info/session.c:1428
+msgid "Delete the current window"
+msgstr "Éliminer la fenêtre courante"
+
 #: info/session.c:1436
 msgid "Cannot delete a permanent window"
 msgstr "Ne peut pas éliminer une fenêtre permanente"
 
+#. Just keep WINDOW, deleting all others.
+#: info/session.c:1469
+msgid "Delete all other windows"
+msgstr "Éliminer toutes les autres fenêtres"
+
+#. Scroll the "other" window of WINDOW.
+#: info/session.c:1515
+msgid "Scroll the other window"
+msgstr "Défiler l'autre fenêtre"
+
+#. Change the size of WINDOW by AMOUNT.
+#: info/session.c:1535
+msgid "Grow (or shrink) this window"
+msgstr "Agrandir (ou réduire) cette fenêtre"
+
+#: info/session.c:1546
+msgid "Divide the available screen space among the visible windows"
+msgstr "Répartir l'espace écran disponible parmi les fenêtres visibles"
+
+#: info/session.c:1553
+msgid "Toggle the state of line wrapping in the current window"
+msgstr "Basculer l'état du remplissage de ligne dans la fenêtre courante"
+
+#. Make WINDOW display the "Next:" node of the node currently being
+#. displayed.
+#: info/session.c:1714
+msgid "Select the `Next' node"
+msgstr "Sélectionner le noeud «Next»"
+
+#. Make WINDOW display the "Prev:" node of the node currently being
+#. displayed.
+#: info/session.c:1722
+msgid "Select the `Prev' node"
+msgstr "Sélectionner le noeud «Prev»"
+
+#. Make WINDOW display the "Up:" node of the node currently being
+#. displayed.
+#: info/session.c:1730
+msgid "Select the `Up' node"
+msgstr "Sélectionner le noeud «Up»"
+
+#. Make WINDOW display the last node of this info file.
+#: info/session.c:1737
+msgid "Select the last node in this file"
+msgstr "Sélectionner le dernier noeud dans ce fichier"
+
 #: info/session.c:1750 info/session.c:1768
 msgid "This window has no additional nodes"
 msgstr "Cette fenêtre a aucun noeud additionnel"
 
+#. Make WINDOW display the first node of this info file.
+#: info/session.c:1759
+msgid "Select the first node in this file"
+msgstr "Sélectionner le premier noeud dans ce fichier"
+
+#: info/session.c:1778
+msgid "Select the last item in this node's menu"
+msgstr "Sélectionner le dernier item dans ce menu de noeuds"
+
+#. Use KEY (a digit) to select the Nth menu item in WINDOW->node.
+#: info/session.c:1784
+msgid "Select this menu item"
+msgstr "Sélectionner cet item menu"
+
 #: info/session.c:1813
 #, c-format
 msgid "There aren't %d items in this menu."
@@ -882,34 +716,88 @@ msgstr "Suivre xref (%s): "
 msgid "Follow xref: "
 msgstr "Suivre xref: "
 
+#. Read a line (with completion) which is the name of a menu item,
+#. and select that item.
+#: info/session.c:2042
+msgid "Read a menu item and select its node"
+msgstr "Lire un item menu et sélectionner son noeud"
+
+#: info/session.c:2050
+msgid "Read a footnote or cross reference and select its node"
+msgstr ""
+"Lire une note en bas de page ou une référence croisée et sélectionner son "
+"noeud"
+
+#. Position the cursor at the start of this node's menu.
+#: info/session.c:2056
+msgid "Move to the start of this node's menu"
+msgstr "Aller au point de départ de ce menu de noeud"
+
+#: info/session.c:2080
+msgid "Visit as many menu items at once as possible"
+msgstr "Visiter d'un seul coup autant d'items menu que possible"
+
+#. Read a line of input which is a node name, and go to that node.
+#: info/session.c:2108
+msgid "Read a node name and select it"
+msgstr "Lire un nom de noeud et sélectionner ce noeud"
+
 #: info/session.c:2169 info/session.c:2173
 msgid "Goto Node: "
 msgstr "Aller au Noeud: "
 
+#: info/session.c:2194
+msgid "Read a manpage reference and select it"
+msgstr "Lire une référence de page-manuel et la sélectionner"
+
 #: info/session.c:2198
 msgid "Get Manpage: "
 msgstr "Obtenir la Page-manuel: "
 
+#. Move to the "Top" node in this file.
+#: info/session.c:2228
+msgid "Select the node `Top' in this file"
+msgstr "Sélectionner le noeud «Top» dans ce fichier"
+
 #. Notice that the node "Top" is special, and doesn't have to
 #. be referenced.
-#: info/session.c:2230 makeinfo/makeinfo.c:5135 makeinfo/makeinfo.c:5218
+#: info/session.c:2230 makeinfo/makeinfo.c:5145 makeinfo/makeinfo.c:5228
 msgid "Top"
 msgstr "Noeud «Top»"
 
+#. Move to the node "(dir)Top".
+#: info/session.c:2234
+msgid "Select the node `(dir)'"
+msgstr "Sélectionner le noeud «(dir)»"
+
 #: info/session.c:2254
-#, fuzzy, c-format
+#, c-format
 msgid "Kill node (%s): "
-msgstr "Suivre xref (%s): "
+msgstr "Effacer le noeud (%s): "
 
 #: info/session.c:2307
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot kill node `%s'"
-msgstr "Ne peut pas effacer le dernier noeud"
+msgstr "Ne peut pas effacer le noeud «%s»"
 
 #: info/session.c:2317
 msgid "Cannot kill the last node"
 msgstr "Ne peut pas effacer le dernier noeud"
 
+#: info/session.c:2401
+msgid "Select the most recently selected node"
+msgstr "Choisir le noeud qui a été le plus récemment sélectionné"
+
+#. Kill named node.
+#: info/session.c:2407
+msgid "Kill this node"
+msgstr "Effacer ce noeud"
+
+#. Read the name of a file and select the entire file.
+#: info/session.c:2415
+msgid "Read the name of a file and select it"
+msgstr "Lire le nom d'un fichier et le sélectionner"
+
 #: info/session.c:2419
 msgid "Find file: "
 msgstr "Trouver le fichier: "
@@ -917,7 +805,7 @@ msgstr "Trouver le fichier: "
 #: info/session.c:2436
 #, c-format
 msgid "Cannot find \"%s\"."
-msgstr "Ne peut pas trouver le fichier «%s»."
+msgstr "Ne peut pas trouver «%s»."
 
 #: info/session.c:2483 info/session.c:2608
 #, c-format
@@ -938,6 +826,10 @@ msgstr "Écriture du noeud «(%s)%s»..."
 msgid "Writing node \"%s\"..."
 msgstr "Écriture du noeud «%s»..."
 
+#: info/session.c:2634
+msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
+msgstr "Acheminer les contenus de ce noeud à travers INFO_PRINT_COMMAND"
+
 #: info/session.c:2654
 #, c-format
 msgid "Cannot open pipe to \"%s\"."
@@ -958,6 +850,10 @@ msgstr "Impression du noeud «%s»..."
 msgid "Searching subfile \"%s\"..."
 msgstr "Fouille du sous-fichier «%s»..."
 
+#: info/session.c:2946
+msgid "Read a string and search for it"
+msgstr "Lire une chaîne et en faire la fouille"
+
 #: info/session.c:2966
 #, c-format
 msgid "%s for string [%s]: "
@@ -975,6 +871,10 @@ msgstr "Fouiller"
 msgid "Search failed."
 msgstr "Fouille infructueuse."
 
+#: info/session.c:3020 info/session.c:3026
+msgid "Search interactively for a string as you type it"
+msgstr "Fouiller interactivement pour une chaîne telle que vous la tapez"
+
 #: info/session.c:3120
 msgid "I-search backward: "
 msgstr "Fouille I-search vers l'arrière: "
@@ -991,10 +891,48 @@ msgstr "Échec "
 msgid "No cross references in this node."
 msgstr "Aucune référence croisée dans ce noeud."
 
+#: info/session.c:3579
+msgid "Move to the previous cross reference"
+msgstr "Aller à la référence croisée précédente"
+
+#: info/session.c:3588
+msgid "Move to the next cross reference"
+msgstr "Aller à la prochaine référence croisée"
+
+#: info/session.c:3598
+msgid "Select reference or menu item appearing on this line"
+msgstr "Sélectionner la référence ou l'item menu apparaissant sur cette ligne"
+
+#. ****************************************************************
+#.
+#. Miscellaneous Info Commands
+#.
+#. ****************************************************************
+#. What to do when C-g is pressed in a window.
+#: info/session.c:3620
+msgid "Cancel current operation"
+msgstr "Annuler l'opération courante"
+
 #: info/session.c:3627
 msgid "Quit"
 msgstr "Quitter"
 
+#: info/session.c:3636
+msgid "Move to the cursor to a specific line of the window"
+msgstr "Déplacer le curseur sur une ligne spécifique de la fenêtre"
+
+#. Clear the screen and redraw its contents.  Given a numeric argument,
+#. move the line the cursor is on to the COUNT'th line of the window.
+#: info/session.c:3668
+msgid "Redraw the display"
+msgstr "Redessiner l'affichage écran"
+
+#. This command does nothing.  It is the fact that a key is bound to it
+#. that has meaning.  See the code at the top of info_session ().
+#: info/session.c:3705
+msgid "Quit using Info"
+msgstr "Quitter en utilisant Info"
+
 #: info/session.c:3728
 #, c-format
 msgid "Unknown command (%s)."
@@ -1010,6 +948,22 @@ msgstr "\"\" est invalide"
 msgid "\"%s\" is invalid"
 msgstr "«%s» est invalide"
 
+#: info/session.c:3958
+msgid "Add this digit to the current numeric argument"
+msgstr "Ajouter ce chiffre à l'argument numérique courant"
+
+#: info/session.c:3967
+msgid "Start (or multiply by 4) the current numeric argument"
+msgstr "Enclencher (ou multipler par 4) l'argument numérique courant"
+
+#: info/session.c:3982
+msgid "Internally used by \\[universal-argument]"
+msgstr "Utilisé internement par \\[universal-argument]"
+
+#: info/tilde.c:362
+msgid "readline: Out of virtual memory!\n"
+msgstr ""
+
 #: info/variables.c:40
 msgid "When \"On\", footnotes appear and disappear automatically"
 msgstr ""
@@ -1049,8 +1003,7 @@ msgstr ""
 #: info/variables.c:63
 msgid "Controls what happens when scrolling is requested at the end of a node"
 msgstr ""
-"Contrôler ce qui arrive lorsqu'un défilement d'écran est requis à la fin\n"
-"d'un noeud"
+"Contrôler ce qui arrive lorsqu'un défilement est requis à la fin d'un noeud"
 
 #: info/variables.c:67
 msgid "The number lines to scroll when the cursor moves out of the window"
@@ -1059,14 +1012,22 @@ msgstr "Le nombre de lignes à défiler quand le curseur va hors de la fenêtre"
 #: info/variables.c:71
 msgid "When \"On\", Info accepts and displays ISO Latin characters"
 msgstr ""
-"Lorsque «On» est en fonction, Info accepte et affiche les caractères\n"
-"ISO Latin"
+"Lorsque «On» est en fonction, Info accepte et affiche les caractères ISO "
+"Latin"
+
+#: info/variables.c:77
+msgid "Explain the use of a variable"
+msgstr "Expliquer l'usage d'une variable"
 
 #. Get the variable's name.
 #: info/variables.c:83
 msgid "Describe variable: "
 msgstr "Décrire la variable: "
 
+#: info/variables.c:102
+msgid "Set the value of an Info variable"
+msgstr "Fixer la valeur d'une variable Info"
+
 #. Get the variable's name and value.
 #: info/variables.c:108
 msgid "Set variable: "
@@ -1109,74 +1070,114 @@ msgstr "-%s%s-Info: (%s)%s, %d lignes --%s--"
 msgid " Subfile: %s"
 msgstr " Sous-fichier: %s"
 
-#: makeinfo/makeinfo.c:889
+#: lib/getopt.c:672
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr ""
+
+#: lib/getopt.c:696
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr ""
+
+#: lib/getopt.c:701
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr ""
+
+#: lib/getopt.c:718 lib/getopt.c:891
 #, fuzzy, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%c%s nécessite un nom"
+
+#. --option
+#: lib/getopt.c:747
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr ""
+
+#. +option or -option
+#: lib/getopt.c:751
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr ""
+
+#. 1003.2 specifies the format of this message.
+#: lib/getopt.c:777
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr ""
+
+#: lib/getopt.c:780
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr ""
+
+#. 1003.2 specifies the format of this message.
+#: lib/getopt.c:810 lib/getopt.c:940
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s exige un argument: le formateur pour %citem"
+
+#: lib/getopt.c:857
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr ""
+
+#: lib/getopt.c:875
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:893
+#, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: AVERTISSEMENT: "
 
-#: makeinfo/makeinfo.c:912
+#: makeinfo/makeinfo.c:916
 msgid "Too many errors!  Gave up.\n"
 msgstr "Beaucoup trop d'erreurs!  Abandon.\n"
 
-#: makeinfo/makeinfo.c:971 makeinfo/makeinfo.c:996 makeinfo/makeinfo.c:1064
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:975 makeinfo/makeinfo.c:1000 makeinfo/makeinfo.c:1068
+#, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
-msgstr ""
-"Le paramètre %s de l'option --error-limit doit être numérique,\n"
-"et non pas `%s'.\n"
+msgstr "%s: l'argument %s doit être numérique, non pas «%s».\n"
 
-#: makeinfo/makeinfo.c:985
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:989
+#, c-format
 msgid "Couldn't open macro expansion output `%s'"
-msgstr "Ne peut ouvrir la sortie d'expansion de macro «%s»\""
+msgstr "Ne peut ouvrir la sortie d'expansion de macro «%s»"
 
-#: makeinfo/makeinfo.c:988
+#: makeinfo/makeinfo.c:992
 msgid "Cannot specify more than one macro expansion output"
 msgstr "Ne peut spécifier plus d'une sortie d'expansion de macro"
 
-#: makeinfo/makeinfo.c:1032
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:1036
+#, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
-"Le paramètre %s de l'option --paragraph-indent doit être numérique\n"
-"ou nul ou «asis», et non pas `%s'.\n"
+"%s: l'argument de l'option --paragraph-indent doit être numérique, «none» "
+"ou\n"
+"«asis», non pas «%s».\n"
 
-#: makeinfo/makeinfo.c:1075
+#: makeinfo/makeinfo.c:1079
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
-"Le paramètre %s de l'option --footnote-style doit être «separate»\n"
-"ou «end», et non pas `%s'.\n"
-
-#: makeinfo/makeinfo.c:1085 util/install-info.c:522 util/texindex.c:348
-msgid ""
-"Copyright (C) 1996 Free Software Foundation, Inc.\n"
-"There is NO warranty.  You may redistribute this software\n"
-"under the terms of the GNU General Public License.\n"
-"For more information about these matters, see the files named COPYING."
-msgstr ""
-"Copyright (C) 1996 Free Software Foundation, Inc.\n"
-"AUCUNE garantie n'est donnée; tant pour des raisons COMMERCIALES que\n"
-"pour RÉPONDRE À UN BESOIN PARTICULIER.  Vous pouvez redistribuer des copies\n"
-"de ce logiciel selon les termes de la licence GNU General Public License.\n"
-"Pour plus d'informations, consultez le fichier COPYING."
+"%s: l'argument de l'option --footnote-style doit être «separate» ou\n"
+"«end», non pas «%s».\n"
 
-#: makeinfo/makeinfo.c:1105
+#: makeinfo/makeinfo.c:1110
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: absence d'un argument fichier.\n"
 
-#: makeinfo/makeinfo.c:1146
-#, c-format
-msgid "makeinfo (GNU %s %s) %d.%d\n"
-msgstr ""
-
-#: makeinfo/makeinfo.c:1158
+#: makeinfo/makeinfo.c:1163
 #, c-format
 msgid "Try `%s --help' for more information.\n"
-msgstr "Pour en savoir davantage, faites: `%s --help'.\n"
+msgstr "Pour en savoir davantage, faites: «%s --help».\n"
 
-#: makeinfo/makeinfo.c:1160
+#: makeinfo/makeinfo.c:1165
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... TEXINFO-FILE...\n"
@@ -1210,9 +1211,9 @@ msgid ""
 "--verbose              report about what is being done.\n"
 "--version              display version information and exit.\n"
 "\n"
-"Email bug reports to bug-texinfo@prep.ai.mit.edu.\n"
+"Email bug reports to bug-texinfo@gnu.org.\n"
 msgstr ""
-"Usage: %s [OPTION]... TEXINFO-FILE...\n"
+"Usage: %s [OPTION]... FICHIER-TEXINFO...\n"
 "\n"
 "Traduire une documentation source en format Texinfo vers un format "
 "approprié\n"
@@ -1222,8 +1223,10 @@ msgstr ""
 "-D VAR                 Définir une variable, comme avec @set.\n"
 "-E MACRO-OFILE         Exécuter les macros seulement, sortir un source "
 "texinfo.\n"
-"-I DIR                 Ajouter DIR dans la fouille de répertoires pour "
-"@include.\n"
+"-I DIR                 Ajouter à la fin DIR dans la fouille de répertoires\n"
+"                         pour @include.\n"
+"-P DIR                 Ajouter au début DIR dans la fouille de répertoires\n"
+"                         pour @include.\n"
 "-U VAR                 Rendre indéfinie une variable, comme avec @clear.\n"
 "--error-limit NUM      Quitter après NUM erreurs (par défaut %d).\n"
 "--fill-column NUM      Tronquer les lignes à NUM caractères (par défaut "
@@ -1234,6 +1237,7 @@ msgstr ""
 "noeud,\n"
 "                        «end» pour les placer à la fin du noeud dans lequel\n"
 "                        elles ont été définies (valeur par défaut).\n"
+"--force                Conserver la sortie même s'il y a des erreurs.\n"
 "--help                 Afficher l'aide-mémoire.\n"
 "--no-validate          Supprimer la validation de la table de référence\n"
 "                       des noeuds.\n"
@@ -1243,8 +1247,11 @@ msgstr ""
 "headers.\n"
 "--output FICHIER, -o FICHIER   Écrire dans le FICHIER, et ignorer tous\n"
 "                               les @setfilename.\n"
-"--paragraph-indent NUM Indenter les paragraphes de NUM espaces (%d par "
+"--paragraph-indent VAL Indenter les paragraphes de VAL espaces (%d par "
 "défaut).\n"
+"                        Si VAL est «none», ne pas indenter; si VAL est "
+"«asis»,\n"
+"                        conserver toute valeur d'indentation existante.\n"
 "--reference-limit NUM  Avertir après plus de NUM références (%d par "
 "défaut).\n"
 "--verbose              Utiliser le mode bavard et indiquer ce qui a été "
@@ -1253,498 +1260,484 @@ msgstr ""
 "\n"
 "Rapporter toute anomalie à bug-texinfo@prep.ai.mit.edu.\n"
 
-#: makeinfo/makeinfo.c:1545
+#: makeinfo/makeinfo.c:1552
 #, c-format
 msgid "%s: getwd: %s, %s\n"
-msgstr ""
+msgstr "%s: getwd: %s, %s\n"
 
-#: makeinfo/makeinfo.c:1741
+#: makeinfo/makeinfo.c:1748
 #, c-format
 msgid "Expected `%s'"
-msgstr ""
+msgstr "«%s» attendue"
 
-#: makeinfo/makeinfo.c:2072
+#: makeinfo/makeinfo.c:2082
 #, c-format
 msgid "No `%s' found in `%s'"
-msgstr ""
+msgstr "Aucun «%s» trouvé dans «%s»"
 
-#: makeinfo/makeinfo.c:2122
+#: makeinfo/makeinfo.c:2132
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
+"%s: Sauter l'expansion de macro qui irait sur stdout comme la sortie Info.\n"
 
-#: makeinfo/makeinfo.c:2141
+#: makeinfo/makeinfo.c:2151
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
-msgstr ""
+msgstr "Fabrication du fichier %s «%s» à partir de «%s».\n"
 
-#: makeinfo/makeinfo.c:2171
+#: makeinfo/makeinfo.c:2181
 #, c-format
 msgid "This is Info file %s, produced by Makeinfo version %d.%d"
-msgstr ""
+msgstr "Ceci est le fichier Info %s, produit par Makeinfo version %d.%d"
 
-#: makeinfo/makeinfo.c:2173
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:2183
+#, c-format
 msgid " from the input file %s.\n"
-msgstr "Ne peut pas créer le fichier de sortie «%s»."
+msgstr "à partir du fichier d'entrée «%s».\n"
 
-#: makeinfo/makeinfo.c:2192
+#: makeinfo/makeinfo.c:2202
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
+"%s: Enlèvement du fichier de sortie de macro «%s» à cause d'erreurs;\n"
+"utiliser l'option --force pour préserver.\n"
 
 #. If there were errors, and no --force, remove the output.
-#: makeinfo/makeinfo.c:2224
+#: makeinfo/makeinfo.c:2234
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
+"%s: Enlèvement du fichier de sortie «%s» à cause d'erreurs;\n"
+"utiliser l'option --force pour préserver.\n"
 
 #. Special case.  I'm not supposed to see this character by itself.
 #. If I do, it means there is a syntax error in the input text.
 #. Report the error here, but remember this brace on the stack so
 #. you can ignore its partner.
-#: makeinfo/makeinfo.c:2364 makeinfo/makeinfo.c:7624
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:2374 makeinfo/makeinfo.c:7629
+#, c-format
 msgid "Misplaced %c"
-msgstr "Accolade «}» égarée ou mal placée"
+msgstr "%c égarée ou mal placée"
 
-#: makeinfo/makeinfo.c:2451
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:2461
+#, c-format
 msgid "Unknown command `%s'"
-msgstr "Commande inconnue (%s)."
+msgstr "Commande inconnue «%s»."
 
-#: makeinfo/makeinfo.c:2471
+#: makeinfo/makeinfo.c:2481
 msgid "NO_NAME!"
-msgstr ""
+msgstr "NOM_INCONNU!"
 
-#: makeinfo/makeinfo.c:2485
+#: makeinfo/makeinfo.c:2495
 #, c-format
 msgid "%c%s expected `{...}'"
-msgstr ""
+msgstr "%c%s exigeant des accolades «{...}»"
 
-#: makeinfo/makeinfo.c:2518
-#, fuzzy
+#: makeinfo/makeinfo.c:2528
 msgid "Unmatched }"
-msgstr "`%c%s' non apparié"
+msgstr "Accolade «}» non appariée"
 
-#: makeinfo/makeinfo.c:2566
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:2576
+#, c-format
 msgid "%c%s missing close brace"
-msgstr "%s: absence d'un argument fichier.\n"
+msgstr "%c%s sans accolade fermante"
 
-#: makeinfo/makeinfo.c:3362
+#: makeinfo/makeinfo.c:3372
 msgid "Broken-Type in insertion_type_pname"
-msgstr ""
+msgstr "Type impossible dans la fonction insertion_type_pname"
 
-#: makeinfo/makeinfo.c:3428
+#: makeinfo/makeinfo.c:3438
 msgid "Enumeration stack overflow"
-msgstr ""
+msgstr "Débordement de la pile d'énumérations"
 
-#: makeinfo/makeinfo.c:3460
+#: makeinfo/makeinfo.c:3470
 #, c-format
 msgid "lettering overflow, restarting at %c"
-msgstr ""
+msgstr "débordement du lettrage, reprise à partir de %c"
 
-#: makeinfo/makeinfo.c:3499
-#, fuzzy
+#: makeinfo/makeinfo.c:3509
 msgid "* Menu:\n"
-msgstr "Menu"
+msgstr "* Menu:\n"
 
-#: makeinfo/makeinfo.c:3583
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:3593
+#, c-format
 msgid "%s requires an argument: the formatter for %citem"
-msgstr "%s nécessite une lettre ou un chiffre"
+msgstr "%s exige un argument: le formateur pour %citem"
 
-#: makeinfo/makeinfo.c:3687
+#: makeinfo/makeinfo.c:3697
 #, c-format
 msgid "`%cend' expected `%s', but saw `%s'"
-msgstr ""
+msgstr "«%cend» attendait «%s», mais a vu «%s»"
 
-#: makeinfo/makeinfo.c:3800
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:3810
+#, c-format
 msgid "No matching `%cend %s'"
-msgstr "`%c%s' non apparié"
+msgstr "«%cend %s» non apparié"
 
-#: makeinfo/makeinfo.c:3939
+#: makeinfo/makeinfo.c:3949
 #, c-format
 msgid "How did @%s end up in cm_special_char?\n"
-msgstr ""
+msgstr "Comment le caractère @%s a-t-il pu aboutir dans cm_special_char?\n"
 
 #. This error message isn't perfect if the argument is multiple
 #. characters, but it doesn't seem worth getting right.
-#: makeinfo/makeinfo.c:3953
+#: makeinfo/makeinfo.c:3963
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
-msgstr ""
+msgstr "%c%s s'attend à argument «i» ou «j», non pas «%c»"
 
-#: makeinfo/makeinfo.c:3957
+#: makeinfo/makeinfo.c:3967
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
-msgstr ""
+msgstr "%c%s attend un argument d'un seul caractère «i» ou «j»"
 
-#: makeinfo/makeinfo.c:3969
+#: makeinfo/makeinfo.c:3979
 msgid "January"
-msgstr ""
+msgstr "janvier"
 
-#: makeinfo/makeinfo.c:3969
+#: makeinfo/makeinfo.c:3979
 msgid "February"
-msgstr ""
+msgstr "février"
 
-#: makeinfo/makeinfo.c:3969
-#, fuzzy
+#: makeinfo/makeinfo.c:3979
 msgid "March"
-msgstr "Fouiller"
+msgstr "mars"
 
-#: makeinfo/makeinfo.c:3969
+#: makeinfo/makeinfo.c:3979
 msgid "April"
-msgstr ""
+msgstr "avril"
 
-#: makeinfo/makeinfo.c:3969
+#: makeinfo/makeinfo.c:3979
 msgid "May"
-msgstr ""
+msgstr "mai"
 
-#: makeinfo/makeinfo.c:3970
+#: makeinfo/makeinfo.c:3980
 msgid "June"
-msgstr ""
+msgstr "juin"
 
-#: makeinfo/makeinfo.c:3970
+#: makeinfo/makeinfo.c:3980
 msgid "July"
-msgstr ""
+msgstr "juillet"
 
-#: makeinfo/makeinfo.c:3970
+#: makeinfo/makeinfo.c:3980
 msgid "August"
-msgstr ""
+msgstr "août"
 
-#: makeinfo/makeinfo.c:3970
+#: makeinfo/makeinfo.c:3980
 msgid "September"
-msgstr ""
+msgstr "septembre"
 
-#: makeinfo/makeinfo.c:3970
+#: makeinfo/makeinfo.c:3980
 msgid "October"
-msgstr ""
+msgstr "octobre"
 
-#: makeinfo/makeinfo.c:3971
+#: makeinfo/makeinfo.c:3981
 msgid "November"
-msgstr ""
+msgstr "novembre"
 
-#: makeinfo/makeinfo.c:3971
+#: makeinfo/makeinfo.c:3981
 msgid "December"
-msgstr ""
+msgstr "décembre"
 
-#: makeinfo/makeinfo.c:3976
-#, c-format
-msgid "%d %s %d"
-msgstr ""
-
-#: makeinfo/makeinfo.c:4029
+#: makeinfo/makeinfo.c:4039
 #, c-format
 msgid "%c%s expects a single character as an argument"
-msgstr ""
+msgstr "%c%s s'attend à un seul caractère comme argument"
 
-#: makeinfo/makeinfo.c:4143
+#: makeinfo/makeinfo.c:4153
 #, c-format
 msgid "%c%s is obsolete"
-msgstr ""
+msgstr "%c%s est périmé"
 
-#: makeinfo/makeinfo.c:4315
+#: makeinfo/makeinfo.c:4325
 #, c-format
-msgid "There already is a node having %ctop as a section"
+msgid "Node with %ctop as a section already exists"
 msgstr ""
 
-#: makeinfo/makeinfo.c:4327
+#: makeinfo/makeinfo.c:4337
 #, c-format
 msgid "Here is the %ctop node"
-msgstr ""
+msgstr "Le noeud %ctop se trouve ici"
 
-#: makeinfo/makeinfo.c:4346
+#: makeinfo/makeinfo.c:4356
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
-msgstr ""
+msgstr "noeud %ctop utilisé avant %cnode, %s implicitement"
 
-#: makeinfo/makeinfo.c:4421
+#: makeinfo/makeinfo.c:4431
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
-msgstr ""
+msgstr "%c%s est périmé; utiliser %c%s à la place"
 
-#: makeinfo/makeinfo.c:4670
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:4680
+#, c-format
 msgid "Node `%s' multiply defined (line %d is first definition at)"
-msgstr ""
-"Le noeud `%s' a de multiples définitions (%d est la première\n"
-"définition)"
+msgstr "Noeud «%s» ayant plusieurs définitions (ligne %d étant la première)"
 
-#: makeinfo/makeinfo.c:4743
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:4753
+#, c-format
 msgid "Formatting node %s...\n"
-msgstr "Écriture du noeud «%s»..."
+msgstr "Écriture du noeud «%s»...\n"
 
-#: makeinfo/makeinfo.c:4792
+#: makeinfo/makeinfo.c:4802
 #, c-format
 msgid "Node `%s' requires a sectioning command (e.g. %c%s)"
-msgstr "Le noeud `%s' nécessite une commande de subdivision (e.g. %c%s)"
+msgstr "Le noeud «%s» exige une commande de subdivision (e.g. %c%s)"
 
-#: makeinfo/makeinfo.c:5075
+#: makeinfo/makeinfo.c:5085
 #, c-format
 msgid "Node `%s''s Next field not pointed back to"
-msgstr "Le champ Next du noeud `%s' n'a pas de pointeur de retour en amont"
+msgstr "Le champ Next du noeud «%s» n'a pas de pointeur de retour en amont"
 
-#: makeinfo/makeinfo.c:5080
+#: makeinfo/makeinfo.c:5090
 #, c-format
 msgid "This node (`%s') is the one with the bad `Prev'"
-msgstr "Ce noeud (`%s') est celui dont le champ «Prev» est erroné"
+msgstr "Ce noeud («%s») est celui dont le champ «Prev» est erroné"
 
-#: makeinfo/makeinfo.c:5120
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:5130
+#, c-format
 msgid "Node `%s's Prev field not pointed back to"
-msgstr "Le champ Prev du noeud `%s' n'a pas de pointeur de retour en amont"
+msgstr "Le champ Prev du noeud «%s» n'a pas de pointeur de retour en amont"
 
-#: makeinfo/makeinfo.c:5124
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:5134
+#, c-format
 msgid "This node (`%s') has the bad Next"
-msgstr "Ce noeud (`%s') est celui dont le champ «Next» est erroné"
+msgstr "Ce noeud («%s») est celui dont le champ «Next» est erroné"
 
-#: makeinfo/makeinfo.c:5136
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:5146
+#, c-format
 msgid "Node `%s' missing Up field"
-msgstr "Le noeud `%s' a un champ «Up» manquant"
+msgstr "Le noeud «%s» a un champ «Up» manquant"
 
-#: makeinfo/makeinfo.c:5176
+#: makeinfo/makeinfo.c:5186
 #, c-format
 msgid "`%s' has an Up field of `%s', but `%s' has no menu item for `%s'"
 msgstr ""
-"Le noeud `%s' a un champ Up de `%s', mais `%s' n'a aucun item menu\n"
-"pour `%s'"
+"Le noeud «%s» a un champ Up de «%s», mais «%s» n'a aucun item menu pour «%s»"
 
-#: makeinfo/makeinfo.c:5207
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:5217
+#, c-format
 msgid "node `%s' has been referenced %d times"
-msgstr "Le noeud `%s' a été référencé %d fois"
+msgstr "Le noeud «%s» a été référencé %d fois"
 
-#: makeinfo/makeinfo.c:5219
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:5229
+#, c-format
 msgid "unreferenced node `%s'"
-msgstr "Noeud `%s' non référencé"
+msgstr "noeud «%s» non référencé"
 
-#: makeinfo/makeinfo.c:5246
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:5256
+#, c-format
 msgid "%s reference to nonexistent node `%s'"
-msgstr "Noeud `%s' non référencé"
+msgstr "%s réfère au noeud «%s» non existant"
 
-#: makeinfo/makeinfo.c:5658 makeinfo/makeinfo.c:5670
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:5668 makeinfo/makeinfo.c:5680
+#, c-format
 msgid "%cmenu seen before first node"
-msgstr "%cmenu apparu avant qu'un noeud n'ait été défini"
+msgstr "%cmenu avant même le premier noeud"
 
-#: makeinfo/makeinfo.c:5659 makeinfo/makeinfo.c:5671
-#, fuzzy
+#: makeinfo/makeinfo.c:5669 makeinfo/makeinfo.c:5681
 msgid "creating `Top' node"
-msgstr "Création du noeud «TOP»."
+msgstr "création du noeud «TOP»"
 
-#: makeinfo/makeinfo.c:5784
+#: makeinfo/makeinfo.c:5794
 #, c-format
 msgid "`.' or `,' must follow cross reference, not %c"
-msgstr ""
+msgstr "«.» ou «,» doit suivre une référence croisée, non pas %c"
 
-#: makeinfo/makeinfo.c:5952
+#: makeinfo/makeinfo.c:5962
 #, c-format
 msgid "@image file `%s' unreadable: %s"
-msgstr ""
+msgstr "fichier «%s» dans la commande @image est illisible: %s"
 
-#: makeinfo/makeinfo.c:5956
-#, fuzzy
+#: makeinfo/makeinfo.c:5966
 msgid "@image missing filename argument"
-msgstr "%s: absence d'un argument fichier.\n"
+msgstr "absence d'un argument fichier dans la commande @image"
 
-#: makeinfo/makeinfo.c:6057
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:6067
+#, c-format
 msgid "%s requires letter or digit"
-msgstr "%s nécessite une lettre ou un chiffre"
+msgstr "%s exige une lettre ou un chiffre"
 
-#: makeinfo/makeinfo.c:6142
+#: makeinfo/makeinfo.c:6152
 #, c-format
 msgid "Unmatched `%c%s'"
-msgstr "`%c%s' non apparié"
+msgstr "«%c%s» non apparié"
 
-#: makeinfo/makeinfo.c:6149
+#: makeinfo/makeinfo.c:6159
 #, c-format
 msgid "`%c%s' needs something after it"
-msgstr "`%c%s' a besoin de quelque chose après lui"
+msgstr "«%c%s» a besoin de quelque chose après lui"
 
-#: makeinfo/makeinfo.c:6155
+#: makeinfo/makeinfo.c:6165
 #, c-format
 msgid "Bad argument to `%s', `%s', using `%s'"
-msgstr "Mauvais argument à `%s', `%s', utilisant `%s'"
+msgstr "Mauvais argument à «%s», «%s», utilisant «%s»"
 
-#: makeinfo/makeinfo.c:6328
+#: makeinfo/makeinfo.c:6338
 #, c-format
 msgid "{No Value For \"%s\"}"
-msgstr ""
+msgstr "{Aucune Valeur Pour «%s»}"
 
-#: makeinfo/makeinfo.c:6378
+#: makeinfo/makeinfo.c:6388
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s nécessite un nom"
 
-#: makeinfo/makeinfo.c:6486
+#: makeinfo/makeinfo.c:6496
 #, c-format
 msgid "Reached eof before matching @end %s"
-msgstr ""
+msgstr "Fin de fichier rencontré avant l'appariement de @end %s"
 
-#: makeinfo/makeinfo.c:6715
+#: makeinfo/makeinfo.c:6722
 #, c-format
 msgid "The `%c%s' command is meaningless within a `@%s' block"
-msgstr "La commande `%c%s' est inactive dans un bloc `@%s'"
+msgstr "La commande «%c%s» est inactive dans un bloc «@%s»"
 
-#: makeinfo/makeinfo.c:6724
+#: makeinfo/makeinfo.c:6731
 #, c-format
 msgid "%citemx is not meaningful inside of a `%s' block"
-msgstr "%citemx est inactif à l'intérieur d'un bloc `%s'"
+msgstr "%citemx est inactif à l'intérieur d'un bloc «%s»"
 
-#: makeinfo/makeinfo.c:6837
+#: makeinfo/makeinfo.c:6844
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "%c%s est trouvé à l'extérieur d'un bloc d'insertion"
 
-#: makeinfo/makeinfo.c:6928
+#: makeinfo/makeinfo.c:6935
 #, c-format
 msgid "Missing `}' in %cdef arg"
 msgstr "Accolade «}» manquante dans le paramètre %cdef"
 
-#: makeinfo/makeinfo.c:7137 makeinfo/makeinfo.c:7157
+#: makeinfo/makeinfo.c:7144 makeinfo/makeinfo.c:7164
 msgid "Function"
-msgstr ""
+msgstr "Fonction"
 
-#: makeinfo/makeinfo.c:7141
+#: makeinfo/makeinfo.c:7148
 msgid "Macro"
-msgstr ""
+msgstr "Macro"
 
-#: makeinfo/makeinfo.c:7145
+#: makeinfo/makeinfo.c:7152
 msgid "Special Form"
-msgstr ""
+msgstr "Forme Spéciale"
 
-#: makeinfo/makeinfo.c:7149 makeinfo/makeinfo.c:7161
-#, fuzzy
+#: makeinfo/makeinfo.c:7156 makeinfo/makeinfo.c:7168
 msgid "Variable"
-msgstr "Fixer la variable: "
+msgstr "Variable"
 
-#: makeinfo/makeinfo.c:7153
-#, fuzzy
+#: makeinfo/makeinfo.c:7160
 msgid "User Option"
-msgstr "Insérer la complétion"
+msgstr "Option de l'Usager"
 
-#: makeinfo/makeinfo.c:7165
-#, fuzzy
+#: makeinfo/makeinfo.c:7172
 msgid "Instance Variable"
-msgstr "Décrire la variable: "
+msgstr "Variable d'Instance"
 
-#: makeinfo/makeinfo.c:7169 makeinfo/makeinfo.c:7173
+#: makeinfo/makeinfo.c:7176 makeinfo/makeinfo.c:7180
 msgid "Method"
-msgstr ""
+msgstr "Méthode"
 
-#: makeinfo/makeinfo.c:7330
+#: makeinfo/makeinfo.c:7335
 #, c-format
 msgid "Must be in a `%s' insertion in order to use `%s'x"
-msgstr "Doit être dans une insertion `%s' afin d'utiliser `%s'x."
+msgstr "Doit être dans une insertion «%s» afin d'utiliser «%s»x."
 
-#: makeinfo/makeinfo.c:7402
+#: makeinfo/makeinfo.c:7407
 #, c-format
 msgid "%csp requires a positive numeric argument"
-msgstr "%csp nécessite un argument numérique positif"
+msgstr "%csp exige un argument numérique positif"
 
-#: makeinfo/makeinfo.c:7645
-#, fuzzy
+#: makeinfo/makeinfo.c:7650
 msgid "asis"
-msgstr "il y a"
+msgstr "«asis»"
 
-#: makeinfo/makeinfo.c:7647
-#, fuzzy
+#: makeinfo/makeinfo.c:7652
 msgid "none"
-msgstr "(vide)"
+msgstr "«none»"
 
-#: makeinfo/makeinfo.c:7669
+#: makeinfo/makeinfo.c:7674
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "Mauvais argument à %c%s"
 
-#: makeinfo/makeinfo.c:7961
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:7966
+#, c-format
 msgid "Unknown index `%s'"
-msgstr "Nom d'index inconnu `%s'"
+msgstr "Nom d'index inconnu «%s»"
 
-#: makeinfo/makeinfo.c:8026
+#: makeinfo/makeinfo.c:8031
 #, c-format
 msgid "Index `%s' already exists"
-msgstr "L'index `%s' existe toujours"
+msgstr "L'index «%s» existe toujours"
 
-#: makeinfo/makeinfo.c:8057
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:8062
+#, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
-msgstr "Nom d'index inconnu `%s'"
+msgstr "Nom d'index «%s» inconnu et/ou «%s» dans @synindex"
 
-#: makeinfo/makeinfo.c:8246
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:8251
+#, c-format
 msgid "Unknown index `%s' in @printindex"
-msgstr "Nom d'index inconnu `%s'"
+msgstr "Nom d'index «%s» inconnu dans @printindex"
 
-#: makeinfo/makeinfo.c:8261
-#, fuzzy
+#: makeinfo/makeinfo.c:8266
 msgid ""
 "* Menu:\n"
 "\n"
-msgstr "Menu"
+msgstr ""
+"* Menu:\n"
+"\n"
 
-#: makeinfo/makeinfo.c:8448
+#: makeinfo/makeinfo.c:8453
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
-msgstr ""
+msgstr "«%c%s» nécessite un argument «{...}», non pas «%s» seulement"
 
-#: makeinfo/makeinfo.c:8463
+#: makeinfo/makeinfo.c:8468
 #, c-format
 msgid "No closing brace for footnote `%s'"
-msgstr "Aucune accolade fermante «}» pour la note en bas de page `%s'"
+msgstr "Accolade fermante «}» manquante pour la note en bas de page «%s»"
 
-#: makeinfo/makeinfo.c:8502
+#: makeinfo/makeinfo.c:8507
 msgid "Footnote defined without parent node"
 msgstr "La note en bas de page est définie sans noeud parent"
 
 # Est-ce vraiement un message à traduire?
-#: makeinfo/makeinfo.c:8534
-#, fuzzy
+#: makeinfo/makeinfo.c:8539
 msgid "-Footnotes"
-msgstr "*Notes en bas de page*"
+msgstr "-Footnotes"
 
 # Est-ce vraiment un message à traduire?  NON.
-#: makeinfo/makeinfo.c:8589
-#, fuzzy
+#: makeinfo/makeinfo.c:8594
 msgid ""
 "---------- Footnotes ----------\n"
 "\n"
 msgstr ""
-"---------------------\n"
+"--------- Notes en bas de page ---------\n"
 "\n"
 
-#: makeinfo/makeinfo.c:8685
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:8690
+#, c-format
 msgid "macro `%s' previously defined"
-msgstr "La macro `%s' a déjà été définie précédemment"
+msgstr "macro «%s» déjà définie précédemment"
 
-#: makeinfo/makeinfo.c:8689
-#, fuzzy, c-format
+#: makeinfo/makeinfo.c:8694
+#, c-format
 msgid "here is the previous definition of `%s'"
-msgstr "Ici se trouve la définition précédente de `%s'"
+msgstr "ici se trouve la définition précédente de «%s»"
 
-#: makeinfo/makeinfo.c:8903
+#: makeinfo/makeinfo.c:8908
 #, c-format
 msgid "Macro `%s' called with too many args"
-msgstr "La macro `%s' est appelée avec trop d'arguments"
+msgstr "Macro «%s» appelée avec trop d'arguments"
 
-#: makeinfo/makeinfo.c:9055
+#: makeinfo/makeinfo.c:9060
 #, c-format
 msgid "%cend macro not found"
-msgstr "Macro %cend non trouvée"
+msgstr "macro %cend non trouvée"
 
-#: makeinfo/makeinfo.c:9095
+#: makeinfo/makeinfo.c:9100
 #, c-format
 msgid "%cquote-arg only useful when the macro takes a single argument"
 msgstr "%cquote-arg utile seulement lorsque la macro prend un seul argument"
@@ -1752,7 +1745,7 @@ msgstr "%cquote-arg utile seulement lorsque la macro prend un seul argument"
 #: makeinfo/multi.c:206
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
-msgstr "abandon du texte orphelin `%s' après la commande @multitable"
+msgstr "abandon du texte orphelin «%s» après la commande @multitable"
 
 #: makeinfo/multi.c:277
 #, c-format
@@ -1771,7 +1764,7 @@ msgstr "Ne peut pas sélectionner la colonne #%d dans une multitable."
 
 #: makeinfo/multi.c:404
 msgid "ignoring @tab outside of multitable"
-msgstr "ignorer une commande @tab qui est à l'extérieur d'une multitable"
+msgstr "inhibition d'une commande @tab à l'extérieur d'une multitable"
 
 #: makeinfo/multi.c:428
 msgid "** Multicolumn output from last row:\n"
@@ -1782,30 +1775,31 @@ msgstr "** Sortie en multicolonnes à partir de la dernière rangée:\n"
 msgid "* column #%d: output = %s\n"
 msgstr "* colonne #%d: sortie = %s\n"
 
-#: util/install-info.c:119 util/install-info.c:132
+#: util/install-info.c:123 util/install-info.c:136
 msgid "virtual memory exhausted"
 msgstr "mémoire virtuelle épuisée"
 
-#: util/install-info.c:188
-#, fuzzy, c-format
+#: util/install-info.c:192
+#, c-format
 msgid "%s: warning: "
 msgstr "%s: AVERTISSEMENT: "
 
-#: util/install-info.c:209
+#: util/install-info.c:213
 #, c-format
 msgid " for %s"
 msgstr " pour %s"
 
-#: util/install-info.c:278
-#, fuzzy, c-format
+#: util/install-info.c:282
+#, c-format
 msgid "\tTry `%s --help' for a complete list of options.\n"
-msgstr "Pour avoir la liste complète des options, faites: `%s --help'.\n"
+msgstr "Pour avoir la liste complète des options, faites «%s --help».\n"
 
-#: util/install-info.c:286
-#, c-format
+#: util/install-info.c:290
+#, fuzzy, c-format
 msgid ""
-"%s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
-"  Install INFO-FILE in the Info directory file DIR-FILE.\n"
+"Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+"\n"
+"Install INFO-FILE in the Info directory file DIR-FILE.\n"
 "\n"
 "Options:\n"
 "--delete          Delete existing entries in INFO-FILE;\n"
@@ -1833,7 +1827,7 @@ msgid ""
 "                    from information in the Info file itself.\n"
 "--version         Display version information and exit.\n"
 "\n"
-"Email bug reports to bug-texinfo@prep.ai.mit.edu.\n"
+"Email bug reports to bug-texinfo@gnu.org.\n"
 msgstr ""
 "%s [OPTION]... [INFO-FICHIER [DIR-FICHIER]]\n"
 "  Installer INFO-FICHIER dans le répertoire DIR-FICHIER de fichiers Info.\n"
@@ -1860,25 +1854,23 @@ msgstr ""
 "--quiet           Supprimer les avertissements.\n"
 "--remove          Identique à l'option --delete.\n"
 "--section=SEC     Mettre cette entrée de fichier dans la section SEC du\n"
-"                    répertoire.  Si plus d'une section est spécifiée, "
-"toutes\n"
-"                    les entrées sont ajoutées dans chacune des sections.  "
-"Si\n"
-"                    aucune section n'est spécifiée, elles seront "
-"déterminées\n"
-"                    à partir de l'information dans le fichier Info "
-"lui-même.\n"
+"                    répertoire.  Si plus d'une section est spécifiée,\n"
+"                    toutes les entrées sont ajoutées dans chacune des\n"
+"                    sections.  Si aucune section n'est spécifiée, elles\n"
+"                    seront déterminées à partir de l'information dans\n"
+"                    le fichier Info lui-même.\n"
 "--version         Afficher le nom et la version du logiciel.\n"
 "\n"
 "Rapporter toute anomalie à bug-texinfo@prep.ai.mit.edu.\n"
 
-#: util/install-info.c:334
+#: util/install-info.c:341
+#, fuzzy
 msgid ""
 "This is the file .../info/dir, which contains the\n"
 "topmost node of the Info hierarchy, called (dir)Top.\n"
 "The first time you invoke Info you start off looking at this node.\n"
 "\n"
-"File: dir       Node: Top       This is the top of the INFO tree\n"
+"File: dir,\tNode: Top,\tThis is the top of the INFO tree\n"
 "\n"
 "  This (the Directory node) gives a menu of major topics.\n"
 "  Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n"
@@ -1890,47 +1882,59 @@ msgid ""
 "\n"
 "* Menu:\n"
 msgstr ""
+"Ceci est le fichier .../info/dir, lequel contient le noeud \n"
+"le plus haut dans la hiérarchie Info, noeud appelé (dir)Top.\n"
+"La première fois que Info est invoqué, vous démarrez la recherche \n"
+"à partir de ce noeud.\n"
+"\n"
+"Fichier: dir     Noeud: Top       Ceci est le haut de l'arborescence INFO\n"
+"\n"
+"  Ceci (le noeud Répertoire) fournit un menu des sujets majeurs.\n"
+"  Taper «q» pour quitter, «?» pour lister toutes les commandes Info,\n"
+"  «d» pour revenir à cet endroit,\n"
+"  «h» fournit un guide d'initiation pour les nouveaux venus,\n"
+"  «mEmacs<Return>» démarre une consultation du manuel Emacs, etc.\n"
+"\n"
+"  En Emacs, vous pouvez cliquer le bouton 2 de la souris sur un item menu "
+"ou\n"
+"  sur une référence croisée pour le sélectionner.\n"
+"\n"
+"* Menu:\n"
 
-#: util/install-info.c:357
+#: util/install-info.c:364
 #, c-format
 msgid "%s: could not read (%s) and could not create (%s)\n"
-msgstr ""
+msgstr "%s: ne peut pas lire (%s) et ne peut pas créer (%s)\n"
 
-#: util/install-info.c:456 util/install-info.c:466
+#: util/install-info.c:464 util/install-info.c:474
 #, c-format
 msgid "%s: Specify the Info directory only once.\n"
 msgstr "%s: Spécifier le répertoire Info une seule fois seulement.\n"
 
-#: util/install-info.c:494
+#: util/install-info.c:502
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr "%s: Spécifier le fichier Info une seule fois seulement.\n"
 
-#: util/install-info.c:521
-#, c-format
-msgid "install-info (GNU %s) %s\n"
-msgstr ""
-
-#: util/install-info.c:541
+#: util/install-info.c:550
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr "excédent d'argument de ligne de commande `%s'"
 
-#: util/install-info.c:545
-#, fuzzy
+#: util/install-info.c:554
 msgid "No input file specified; try --help for more information."
-msgstr "Pour en savoir davantage, faites: `%s --help'.\n"
+msgstr ""
+"Aucun fichier d'entrée spécifié; essayer --help pour plus d'informations."
 
-#: util/install-info.c:547
-#, fuzzy
+#: util/install-info.c:556
 msgid "No dir file specified; try --help for more information."
-msgstr "Pour en savoir davantage, faites: `%s --help'.\n"
+msgstr "Aucun fichier dir spécifié; essayer --help pour plus d'informations."
 
-#: util/install-info.c:599 util/install-info.c:622
+#: util/install-info.c:608 util/install-info.c:631
 msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
 msgstr "START-INFO-DIR-ENTRY non apparié avec END-INFO-DIR-ENTRY"
 
-#: util/install-info.c:618
+#: util/install-info.c:627
 msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
 msgstr "END-INFO-DIR-ENTRY non apparié avec START-INFO-DIR-ENTRY"
 
@@ -1939,56 +1943,56 @@ msgstr "END-INFO-DIR-ENTRY non apparié avec START-INFO-DIR-ENTRY"
 #. installer should have to correct (it's a problem for the
 #. maintainer), and there's no need to cause subsequent parts of
 #. `make install' to fail.
-#: util/install-info.c:632
+#: util/install-info.c:641
 #, c-format
 msgid "no info dir entry in `%s'"
-msgstr "aucune entrée répertoire info dans `%s'"
+msgstr "aucune entrée répertoire Info dans «%s»"
 
-#: util/install-info.c:843
+#: util/install-info.c:852
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
-msgstr "item menu `%s' déjà existant, pour le fichier `%s'"
+msgstr "item menu «%s» déjà existant, pour le fichier «%s»"
 
-#: util/install-info.c:866
+#: util/install-info.c:875
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
-msgstr "aucune entrée trouvée pour `%s'; rien n'a été éliminé"
+msgstr "aucune entrée trouvée pour «%s»; rien n'a été éliminé"
 
-#: util/texindex.c:263
+#: util/texindex.c:253
 msgid "keep temporary files around after processing"
 msgstr "conserver les fichiers temporaires après le traitement"
 
-#: util/texindex.c:265
+#: util/texindex.c:255
 msgid "do not keep temporary files around after processing (default)"
 msgstr "ne pas conserver les fichiers temporaires après le traitement (défaut)"
 
-#: util/texindex.c:267
+#: util/texindex.c:257
 msgid "send output to FILE"
 msgstr "envoyer la sortie dans FICHIER"
 
-#: util/texindex.c:269
+#: util/texindex.c:259
 msgid "display version information and exit"
-msgstr "afficher la version en usage"
+msgstr "afficher la version en usage et quitter"
 
-#: util/texindex.c:271
+#: util/texindex.c:261
 msgid "display this help and exit"
-msgstr "afficher l'aide-mémoire"
+msgstr "afficher cet aide-mémoire et quitter"
 
-#: util/texindex.c:282
+#: util/texindex.c:272
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Usage: %s [OPTION]... FICHIER...\n"
 
-#: util/texindex.c:283
+#: util/texindex.c:273
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr "Générer un index trié pour chaque FICHIER de sortie TeX.\n"
 
 #. Avoid trigraph nonsense.
-#: util/texindex.c:285
+#: util/texindex.c:275
 msgid "Usually FILE... is `foo.??' for a document `foo.texi'.\n"
 msgstr "Habituellement FICHIER... est «foo.??» pour un document «foo.texi».\n"
 
-#: util/texindex.c:286
+#: util/texindex.c:276
 msgid ""
 "\n"
 "Options:\n"
@@ -1996,450 +2000,92 @@ msgstr ""
 "\n"
 "Options:\n"
 
-#: util/texindex.c:300
+#: util/texindex.c:290
+#, fuzzy
 msgid ""
 "\n"
-"Email bug reports to bug-texinfo@prep.ai.mit.edu."
+"Email bug reports to bug-texinfo@gnu.org."
 msgstr ""
 "\n"
 "Rapporter toute anomalie à bug-texinfo@prep.ai.mit.edu."
 
-#: util/texindex.c:347
-#, c-format
-msgid "texindex (GNU %s %s) 2.1\n"
-msgstr ""
-
-#: util/texindex.c:926 util/texindex.c:960 util/texindex.c:1036
-#: util/texindex.c:1064
+#: util/texindex.c:917 util/texindex.c:951 util/texindex.c:1027
+#: util/texindex.c:1055
 #, c-format
 msgid "%s: not a texinfo index file"
-msgstr "%s: pas un fichier index en format texinfo"
+msgstr "%s: pas un fichier index en format Texinfo"
 
-#: util/texindex.c:1021
+#: util/texindex.c:1012
 #, c-format
 msgid "failure reopening %s"
 msgstr "échec lors de la réouverture de %s"
 
-#: util/texindex.c:1334
+#: util/texindex.c:1325
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "l'entrée %s suit une entrée ayant un nom secondaire"
 
-#: util/texindex.c:1672
+#: util/texindex.c:1663
 #, c-format
 msgid "%s; for file `%s'.\n"
-msgstr "%s; pour le fichier `%s'.\n"
+msgstr "%s; pour le fichier «%s».\n"
 
-#: util/texindex.c:1733
+#: util/texindex.c:1724
 #, c-format
 msgid "Virtual memory exhausted in %s ()!  Needed %d bytes."
 msgstr "Mémoire virtuelle épuisée dans %s ()!  Besoin de %d octets."
 
-#~ msgid "%s: --fill-column arg must be numeric, not `%s'.\n"
-#~ msgstr ""
-#~ "Le paramètre %s de l'option --fill-column doit être numérique,\n"
-#~ "et non pas `%s'.\n"
-
-#~ msgid "%s: --reference-limit arg must be numeric, not `%s'.\n"
-#~ msgstr ""
-#~ "Le paramètre %s de l'option --reference-limit doit être numérique,\n"
-#~ "et non pas `%s'.\n"
-
-#~ msgid "Misplaced `}'"
-#~ msgstr "Accolade «}» égarée ou mal placée"
-
-#~ msgid "No input file specified"
-#~ msgstr "Aucun fichier d'entrée spécifié"
-
-#~ msgid "No dir file specified"
-#~ msgstr "Aucun fichier répertoire spécifié"
+#~ msgid "install-info (GNU %s) %s\n"
+#~ msgstr "install-info (GNU %s) %s\n"
 
-#~ msgid "stdin"
-#~ msgstr "entrée standard «stdin»"
+#~ msgid "universal-argument"
+#~ msgstr "universal-argument"
 
-#~ msgid "GNU Makeinfo (Texinfo 3.9) %d.%d\n"
-#~ msgstr "GNU Makeinfo (Texinfo 3.9) %d.%d\n"
+#~ msgid "Show what to type to execute a given command"
+#~ msgstr "Montrer quoi écrire afin d'exécuter une commande donnée"
 
-# Est-ce vraiment un message à traduire?
-#~ msgid "noname.texi"
-#~ msgstr "noname.texi"
-
-#~ msgid "No node name specified for `%c%s' command"
-#~ msgstr "Aucun nom de noeud spécifié pour la commande `%c%s'"
-
-#~ msgid ""
-#~ "Validation error.  `%s' field points to node `%s', which doesn't exist"
-#~ msgstr ""
-#~ "Erreur de validation.\n"
-#~ "Le champ `%s' pointe sur le noeud `%s', qui n'existe pas"
-
-#~ msgid "Cross-reference must be terminated with a period or a comma"
-#~ msgstr "La référence croisée doit se terminer par un point ou une virgule"
-
-#~ msgid "Unknown file system error"
-#~ msgstr "Erreur de système de fichiers inconnue"
-
-#~ msgid "Unknown index reference `%s'"
-#~ msgstr "Référence d'index `%s' inconnue"
-
-#~ msgid "Unknown index reference"
-#~ msgstr "Référence d'index inconnue"
-
-#~ msgid "`%c%s' expected more than just `%s'.  It needs something in `{...}'"
-#~ msgstr ""
-#~ "`%c%s' s'attend à plus que `%s'.  Besoin de quelque chose dans «{...}»."
-
-#~ msgid "Multitables cannot be nested"
-#~ msgstr "Les multitables ne peuvent pas être imbriquées"
-
-#~ msgid "%s: can not open: %s\n"
-#~ msgstr "%s: ne peut pas ouvrir: %s\n"
-
-#~ msgid "%s: %s: %d: mismatched braces\n"
-#~ msgstr "%s: %s: %d: accolades non balancées\n"
+#~ msgid "There %s %d "
+#~ msgstr "Comme complétion(s) %s %d "
 
-#~ msgid "unknown error %d"
-#~ msgstr "erreur inconnue %d"
+#~ msgid "is"
+#~ msgstr "il y a"
 
-#~ msgid "Unknown error"
-#~ msgstr "Erreur inconnue"
-
-# Est-ce vraiment un message à traduire?  NON.
-#~ msgid "--keep"
-#~ msgstr "--keep"
-
-# Est-ce vraiment un message à traduire?  NON.
-#~ msgid "-k"
-#~ msgstr "-k"
-
-# Est-ce vraiment un message à traduire?  NON.
-#~ msgid "--no-keep"
-#~ msgstr "--no-keep"
-
-# Est-ce vraiment un message à traduire?  NON.
-#~ msgid "--output"
-#~ msgstr "--output"
-
-# Est-ce vraiment un message à traduire?  NON.
-#~ msgid "-o"
-#~ msgstr "-o"
-
-# Est-ce vraiment un message à traduire?  NON.
-#~ msgid "--version"
-#~ msgstr "--version"
-
-# Est-ce vraiment un message à traduire?  NON.
-#~ msgid "--help"
-#~ msgstr "--help"
+#~ msgid "are"
+#~ msgstr "il y a"
 
 # Est-ce vraiment un message à traduire?  NON.
-#~ msgid "-h"
-#~ msgstr "-h"
-
-#~ msgid "Index"
-#~ msgstr "Index"
-
-# Est-ce vraiment un message à traduire?
-#~ msgid "*Apropos*"
-#~ msgstr "*À-propos*"
-
-#~ msgid "GNU Info (Texinfo 3.9) %s\n"
-#~ msgstr "GNU Info (Texinfo 3.9) %s\n"
-
-# Est-ce vraiment un commentaire de message à traduire?
-#~ msgid "*Info Help*"
-#~ msgstr "*Info Aide*"
-
-# Est-ce vraiment un message à traduire?  NON.
-#~ msgid "******************************"
-#~ msgstr "******************************"
-
-#~ msgid "  h   Invoke the Info tutorial."
-#~ msgstr "  h   Invoquer le guide de travaux pratiques Info."
-
-# Est-ce vraiment un message à traduire?  NON.
-#~ msgid "----------------------"
-#~ msgstr "----------------------"
-
-#~ msgid "  n   Move to the \"next\" node of this node."
-#~ msgstr "  n   Avancer au noeud «next» de ce noeud."
-
-#~ msgid "  p   Move to the \"previous\" node of this node."
-#~ msgstr "  p   Reculer au noeud «previous» de ce noeud."
-
-#~ msgid "  u   Move \"up\" from this node."
-#~ msgstr "  u   Monter au noeud «up» à partir de ce noeud."
-
-#~ msgid "  m   Pick menu item specified by name."
-#~ msgstr "  m   Choisir l'item «menu» spécifié par le nom."
-
-#~ msgid "      Picking a menu item causes another node to be selected."
-#~ msgstr ""
-#~ "      Choisir un item menu implique qu'un autre noeud est sélectionné."
-
-#~ msgid "  f   Follow a cross reference.  Reads name of reference."
-#~ msgstr ""
-#~ "  f   Suivre une référence croisée («f»ollow).  Lire le nom de la référence."
-
-#~ msgid "  l   Move to the last node seen in this window."
-#~ msgstr "  l   Aller au dernier noeud affiché dans cette fenêtre («l»ast)."
-
-#~ msgid "  d   Move to the `directory' node.  Equivalent to `g(DIR)'."
-#~ msgstr ""
-#~ "  d   Aller au noeud répertoire («d»irectory).  Équivalent à «g(RÉP)»."
-
-#~ msgid "Moving within a node:"
-#~ msgstr "Déplacements dans l'arborescence d'un noeud:"
-
-# Est-ce vraiment un message à traduire?  NON.
-#~ msgid "---------------------"
-#~ msgstr "---------------------"
-
-#~ msgid "  SPC Scroll forward a page."
-#~ msgstr "  SPC Défiler une page en avançant."
-
-#~ msgid "  DEL Scroll backward a page."
-#~ msgstr "  DEL Défiler une page en reculant."
-
-#~ msgid "  b   Go to the beginning of this node."
-#~ msgstr "  b   Aller au tout début de ce noeud («b»eginning)."
-
-#~ msgid "  e   Go to the end of this node."
-#~ msgstr "  e   Aller à la toute fin de ce noeud («e»nd)."
-
-#~ msgid "\"Advanced\" commands:"
-#~ msgstr "Commandes «avancées»:"
-
-# Est-ce vraiment un message à traduire?
-#~ msgid "--------------------"
-#~ msgstr "--------------------"
-
-#~ msgid "  q   Quit Info."
-#~ msgstr "  q   Quitter le mode Info."
-
-#~ msgid "  1   Pick first item in node's menu."
-#~ msgstr "  1   Choisir le premier item dans le menu de noeuds."
-
-#~ msgid "  2-9 Pick second ... ninth item in node's menu."
-#~ msgstr "  2-9 Choisir le 2ième ... 9ième item dans le menu de noeuds."
-
-#~ msgid "  0   Pick last item in node's menu."
-#~ msgstr "  0   Choisir le dernier item dans le menu de noeuds."
-
-#~ msgid "  g   Move to node specified by name."
-#~ msgstr "  g   Aller au noeud spécifié par le nom."
-
-#~ msgid "      You may include a filename as well, as in (FILENAME)NODENAME."
-#~ msgstr ""
-#~ "      Vous pouvez inclure aussi un nom de fichier, comme dans (FICHIER)NOEUD."
-
-#~ msgid "  s   Search through this Info file for a specified string,"
-#~ msgstr "  s   Fouiller à travers ce fichier Info pour une chaîne spécifiée,"
-
-#~ msgid "      and select the node in which the next occurrence is found."
-#~ msgstr ""
-#~ "      et sélectionner le noeud dans lequel la prochaine occurrence est "
-#~ "trouvée."
-
-#~ msgid "The current search path is:\n"
-#~ msgstr "Le chemin répertoire de fouille courant est:\n"
-
-#~ msgid ""
-#~ "Commands available in Info windows:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Commandes disponibles en Info windows:\n"
-#~ "\n"
-
 #~ msgid ""
-#~ "Commands available in the echo area:\n"
-#~ "\n"
+#~ "Usage: info [-d dir-path] [-f info-file] [-o output-file] [-n node-name]..."
 #~ msgstr ""
-#~ "Commandes disponibles dans la zone écho:\n"
-#~ "\n"
-
-#~ msgid "Help"
-#~ msgstr "Aide"
-
-#~ msgid "Help-Small-Screen"
-#~ msgstr "Petit-Écran-Aide"
-
-#~ msgid "Info"
-#~ msgstr "Info"
+#~ "Usage: info [-d dir-path] [-f info-file] [-o output-file] [-n node-name]..."
 
 # Est-ce vraiment un message à traduire?  NON.
-#~ msgid "ESC "
-#~ msgstr "ESC "
-
-#~ msgid "%s (%s): %s."
-#~ msgstr "%s (%s): %s."
-
-# Est-ce vraiment un message à traduire?
-#~ msgid "ESC %s"
-#~ msgstr "ESC %s"
-
-# Est-ce vraiment un message à traduire?
-#~ msgid "LFD"
-#~ msgstr "LFD"
-
-# Est-ce vraiment un message à traduire?
-#~ msgid "TAB"
-#~ msgstr "TAB"
-
-# Est-ce vraiment un message à traduire?
-#~ msgid "RET"
-#~ msgstr "RET"
-
-# Est-ce vraiment un message à traduire?
-#~ msgid "ESC"
-#~ msgstr "ESC"
-
-# Est-ce vraiment un message à traduire?
-#~ msgid "SPC"
-#~ msgstr "SPC"
-
-# Est-ce vraiment un message à traduire?
-#~ msgid "DEL"
-#~ msgstr "DEL"
-
-# Est-ce vraiment un message à traduire?
-#~ msgid "echo-area-"
-#~ msgstr "echo-area-"
-
-#~ msgid ""
-#~ "/* doc.c -- Generated structure containing function names and doc strings."
-#~ msgstr ""
-#~ "/* doc.c -- Structure générée contenant les noms de fonction et les chaînes "
-#~ "doc."
-
-#~ msgid ""
-#~ "   This file was automatically made from various source files with the"
-#~ msgstr ""
-#~ "   Ce fichier a été produit automatiquement à partir de fichiers sources\n"
-#~ "   variés avec la"
-
-#~ msgid "   command \"%s\".  DO NOT EDIT THIS FILE, only \"%s.c\"."
-#~ msgstr "   commande «%s».  NE PAS ÉDITER CE FICHIER, seulement «%s.c»."
-
-#~ msgid "   An entry in the array FUNCTION_DOC_ARRAY is made for each command"
-#~ msgstr ""
-#~ "   Une entrée dans le vecteur FUNCTION_DOC_ARRAY est faite pour chaque "
-#~ "commande"
-
-#~ msgid ""
-#~ "   found in the above files; each entry consists of a function pointer,"
-#~ msgstr ""
-#~ "   trouvée dans les fichiers ci-haut; chaque entrée consiste en un pointeur "
-#~ "de fonction,"
-
-#~ msgid "   a string which is the user-visible name of the function,"
-#~ msgstr ""
-#~ "   une chaîne laquelle est le nom visible-à-l'usager de la fonction,"
-
-#~ msgid "   and a string which documents its purpose. */"
-#~ msgstr "   et une chaîne laquelle fournit une documentation de ses buts. */"
-
-#~ msgid "/* %s -- Generated declarations for Info commands. */\n"
-#~ msgstr "/* %s -- Déclarations générées pour les commandes Info. */\n"
-
-#~ msgid "/* Commands found in \"%s\". */\n"
-#~ msgstr "/* Commandes trouvées dans «%s». */\n"
-
 #~ msgid ""
-#~ "\n"
-#~ "/* Functions declared in \"%s\". */\n"
+#~ "            [--directory dir-path] [--file info-file] [--node node-name]..."
 #~ msgstr ""
-#~ "\n"
-#~ "/* Fonctions déclarées dans «%s». */\n"
+#~ "            [--directory dir-path] [--file info-file] [--node node-name]..."
 
-# Est-ce vraiment un message à traduire?
-#~ msgid "*Node Menu*"
-#~ msgstr "*Noeud Menu*"
-
-#~ msgid "not at all"
-#~ msgstr "sans aucune"
-
-#~ msgid "once"
-#~ msgstr "une seule"
-
-#~ msgid "twice"
-#~ msgstr "deux"
-
-#~ msgid "three"
-#~ msgstr "trois"
-
-#~ msgid "four"
-#~ msgstr "quatre"
-
-#~ msgid "five"
-#~ msgstr "cinq"
-
-#~ msgid "six"
-#~ msgstr "six"
-
-#~ msgid "Continuous"
-#~ msgstr "Continu"
-
-#~ msgid "Next Only"
-#~ msgstr "«Next» Seulement"
-
-#~ msgid "Page Only"
-#~ msgstr "Page Seulement"
-
-#~ msgid "Moving \"Up\" %s, then \"Next\"."
-#~ msgstr "Monter vers «Up» %s, puis aller à «Next»."
-
-#~ msgid "Requested window is not present!"
-#~ msgstr "La fenêtre demandée n'est pas présente!"
-
-#~ msgid "Now wrapped around to beginning of history."
+# Est-ce vraiment un message à traduire?  NON.
+#~ msgid "            [--help] [--output output-file] [--subnodes] [--version]"
 #~ msgstr ""
-#~ "Maintenant enroulé autour jusqu'au début de l'histoire des parcours."
-
-#~ msgid "No earlier nodes in this window."
-#~ msgstr "Aucun noeud antérieur dans cette fenêtre."
-
-# Est-ce vraiment un message à traduire?
-#~ msgid "(dir)Top"
-#~ msgstr "(dir)Top"
-
-# Est-ce vraiment un message à traduire?
-#~ msgid "~expand: "
-#~ msgstr "~expand: "
-
-#~ msgid "done"
-#~ msgstr "terminé"
+#~ "            [--help] [--output output-file] [--subnodes] [--version]"
 
-#~ msgid "quit"
-#~ msgstr "quitter"
-
-#~ msgid "exit"
-#~ msgstr "sortir"
-
-#~ msgid "readline: Out of virtual memory!\n"
-#~ msgstr "lire-ligne: Mémoire virtuelle insuffisante!\n"
-
-# Est-ce vraiment un commentaire de message à traduire?
-#~ msgid "Off"
-#~ msgstr "«Off» hors fonction"
-
-#~ msgid "On"
-#~ msgstr "«On» en fonction"
-
-#~ msgid "All"
-#~ msgstr "Toute"
+# Est-ce vraiment un message à traduire?  NON.
+#~ msgid "            [--dribble dribble-file] [--restore from-file]"
+#~ msgstr "            [--dribble dribble-file] [--restore from-file]"
 
-#~ msgid "Bot"
-#~ msgstr "Bas"
+# Est-ce vraiment un message à traduire?  NON.
+#~ msgid "            [menu-selection ...]"
+#~ msgstr "            [menu-selection ...]"
 
-#~ msgid "*no file*"
-#~ msgstr "*aucun fichier*"
+#~ msgid "makeinfo (GNU %s %s) %d.%d\n"
+#~ msgstr "makeinfo (GNU %s %s) %d.%d\n"
 
-#~ msgid "*no node*"
-#~ msgstr "*aucun noeud*"
+#~ msgid "%d %s %d"
+#~ msgstr "%d %s %d"
 
-#~ msgid "Subfile: "
-#~ msgstr "Sous-fichier: "
+#~ msgid "There already is a node having %ctop as a section"
+#~ msgstr "Il y a déjà un noeud ayant %ctop en tant que section"
 
-#~ msgid "%s: Out of virtual memory!\n"
-#~ msgstr "%s: Mémoire virtuelle insuffisante!\n"
+#~ msgid "texindex (GNU %s %s) 2.1\n"
+#~ msgstr "texindex (GNU %s %s) 2.1\n"
diff --git a/texinfo/testsuite/configure b/texinfo/testsuite/configure
index 5337df459f3..48290d071e2 100755
--- a/texinfo/testsuite/configure
+++ b/texinfo/testsuite/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.10 
+# Generated automatically using autoconf version 2.12.1 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -49,6 +49,9 @@ mandir='${prefix}/man'
 # Initialize some other variables.
 subdirs=
 MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+# Maximum number of lines to put in a shell here document.
+ac_max_here_lines=12
 
 ac_prev=
 for ac_option
@@ -330,7 +333,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.10"
+    echo "configure generated by autoconf version 2.12.1"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -432,11 +435,14 @@ do
 done
 
 # NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+# Only set these to C if already set.  These must not be set unconditionally
+# because not all systems understand e.g. LANG=C (notably SCO).
+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
+# Non-C LC_CTYPE values break the ctype check.
 if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -rf conftest* confdefs.h
@@ -498,6 +504,7 @@ ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
 
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
@@ -530,11 +537,25 @@ cat > confcache <<\EOF
 # --recheck option to rerun configure.
 #
 EOF
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
 (set) 2>&1 |
-  sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \
-  >> confcache
+  case `(ac_space=' '; set) 2>&1 | grep ac_space` in
+  *ac_space=\ *)
+    # `set' does not quote correctly, so add quotes (double-quote substitution
+    # turns \\\\ into \\, and sed turns \\ into \).
+    sed -n \
+      -e "s/'/'\\\\''/g" \
+      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
+    ;;
+  *)
+    # `set' quotes correctly as required by POSIX, so do not add quotes.
+    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
+    ;;
+  esac >> confcache
 if cmp -s $cache_file confcache; then
   :
 else
@@ -601,7 +622,7 @@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.10"
+    echo "$CONFIG_STATUS generated by autoconf version 2.12.1"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -620,6 +641,7 @@ sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
  s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
 $ac_vpsub
 $extrasub
+s%@SHELL@%$SHELL%g
 s%@CFLAGS@%$CFLAGS%g
 s%@CPPFLAGS@%$CPPFLAGS%g
 s%@CXXFLAGS@%$CXXFLAGS%g
@@ -644,20 +666,56 @@ s%@mandir@%$mandir%g
 
 CEOF
 EOF
+
+cat >> $CONFIG_STATUS <<\EOF
+
+# Split the substitutions into bite-sized pieces for seds with
+# small command number limits, like on Digital OSF/1 and HP-UX.
+ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ac_file=1 # Number of current file.
+ac_beg=1 # First line for current file.
+ac_end=$ac_max_sed_cmds # Line after last line for current file.
+ac_more_lines=:
+ac_sed_cmds=""
+while $ac_more_lines; do
+  if test $ac_beg -gt 1; then
+    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
+  else
+    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
+  fi
+  if test ! -s conftest.s$ac_file; then
+    ac_more_lines=false
+    rm -f conftest.s$ac_file
+  else
+    if test -z "$ac_sed_cmds"; then
+      ac_sed_cmds="sed -f conftest.s$ac_file"
+    else
+      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
+    fi
+    ac_file=`expr $ac_file + 1`
+    ac_beg=$ac_end
+    ac_end=`expr $ac_end + $ac_max_sed_cmds`
+  fi
+done
+if test -z "$ac_sed_cmds"; then
+  ac_sed_cmds=cat
+fi
+EOF
+
 cat >> $CONFIG_STATUS <<EOF
 
 CONFIG_FILES=\${CONFIG_FILES-"Makefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile]", defaulting infile="outfile.in".
+  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
   case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'`
+  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
        ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
   *) ac_file_in="${ac_file}.in" ;;
   esac
 
-  # Adjust relative srcdir, etc. for subdirectories.
+  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
 
   # Remove last slash and all that follows it.  Not all systems have dirname.
   ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
@@ -681,6 +739,7 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
     top_srcdir="$ac_dots$ac_given_srcdir" ;;
   esac
 
+
   echo creating "$ac_file"
   rm -f "$ac_file"
   configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
@@ -689,15 +748,21 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
 # $configure_input" ;;
   *) ac_comsub= ;;
   esac
+
+  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
   sed -e "$ac_comsub
 s%@configure_input@%$configure_input%g
 s%@srcdir@%$srcdir%g
 s%@top_srcdir@%$top_srcdir%g
-" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file
+" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
 fi; done
-rm -f conftest.subs
+rm -f conftest.s*
 
+EOF
+cat >> $CONFIG_STATUS <<EOF
 
+EOF
+cat >> $CONFIG_STATUS <<\EOF
 
 exit 0
 EOF
diff --git a/texinfo/util/Makefile.am b/texinfo/util/Makefile.am
index 6690cc14920..de4d0db99f9 100644
--- a/texinfo/util/Makefile.am
+++ b/texinfo/util/Makefile.am
@@ -1,23 +1,13 @@
 ## Makefile.am for texinfo/util.
-## $Id: Makefile.am,v 1.2 1998/03/24 18:08:38 law Exp $
+## $Id: Makefile.am,v 1.3 1998/03/24 19:41:36 law Exp $
 ## Run automake in .. to produce Makefile.in from this.
 
-bin_PROGRAMS = texindex
+bin_PROGRAMS = install-info texindex
 bin_SCRIPTS = texi2dvi
 
-## CYGNUS LOCAL: Build install-inf locally, and install it as
-## install-info, to avoid confusing with the install-info target
-## generated by automake --cygnus.
-noinst_PROGRAMS = install-inf
-install_inf_SOURCES = install-info.c
-
 localedir = $(datadir)/locale
 INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
 LDADD = ../lib/libtxi.a @INTLLIBS@
 
 EXTRA_DIST = README deref.c fixfonts gen-dir-node tex3patch texi2dvi \
              update-info 
-
-install-exec-local: $(noinst_PROGRAMS)
-	$(mkinstalldirs) $(bindir)
-	$(INSTALL_PROGRAM) install-inf$(EXEEXT) $(bindir)/`echo install-info$(EXEEXT)|sed '$(transform)'`; \
diff --git a/texinfo/util/Makefile.in b/texinfo/util/Makefile.in
index a848e610f59..7b04741a6c6 100644
--- a/texinfo/util/Makefile.in
+++ b/texinfo/util/Makefile.in
@@ -1,8 +1,15 @@
-# Makefile.in generated automatically by automake 1.2 from Makefile.am
+# Makefile.in generated automatically by automake 1.2f from Makefile.am
 
-# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
 
 SHELL = /bin/sh
 
@@ -42,27 +49,26 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
-NORMAL_INSTALL = true
-PRE_INSTALL = true
-POST_INSTALL = true
-NORMAL_UNINSTALL = true
-PRE_UNINSTALL = true
-POST_UNINSTALL = true
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 DATADIRNAME = @DATADIRNAME@
-EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GT_NO = @GT_NO@
 GT_YES = @GT_YES@
+INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTOBJEXT = @INSTOBJEXT@
 INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
@@ -78,12 +84,9 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 l = @l@
 
-bin_PROGRAMS = texindex
+bin_PROGRAMS = install-info texindex
 bin_SCRIPTS = texi2dvi
 
-noinst_PROGRAMS = install-inf
-install_inf_SOURCES = install-info.c
-
 localedir = $(datadir)/locale
 INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
 LDADD = ../lib/libtxi.a @INTLLIBS@
@@ -93,24 +96,23 @@ EXTRA_DIST = README deref.c fixfonts gen-dir-node tex3patch texi2dvi \
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
-bin_PROGRAMS =  texindex$(EXEEXT)
-noinst_PROGRAMS =  install-inf$(EXEEXT)
-PROGRAMS =  $(bin_PROGRAMS) $(noinst_PROGRAMS)
+PROGRAMS =  $(bin_PROGRAMS)
 
 
 DEFS = @DEFS@ -I. -I$(srcdir) -I..
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
+install_info_SOURCES = install-info.c
+install_info_OBJECTS =  install-info.o
+install_info_LDADD = $(LDADD)
+install_info_DEPENDENCIES =  ../lib/libtxi.a
+install_info_LDFLAGS = 
 texindex_SOURCES = texindex.c
 texindex_OBJECTS =  texindex.o
 texindex_LDADD = $(LDADD)
 texindex_DEPENDENCIES =  ../lib/libtxi.a
 texindex_LDFLAGS = 
-install_inf_OBJECTS =  install-info.o
-install_inf_LDADD = $(LDADD)
-install_inf_DEPENDENCIES =  ../lib/libtxi.a
-install_inf_LDFLAGS = 
 SCRIPTS =  $(bin_SCRIPTS)
 
 CFLAGS = @CFLAGS@
@@ -123,15 +125,15 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
 GZIP = --best
-SOURCES = texindex.c $(install_inf_SOURCES)
-OBJECTS = texindex.o $(install_inf_OBJECTS)
+SOURCES = install-info.c texindex.c
+OBJECTS = install-info.o texindex.o
 
 default: all
 
 .SUFFIXES:
-.SUFFIXES: .c .o
-$(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus util/Makefile
+.SUFFIXES: .S .c .o .s
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps util/Makefile
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
@@ -141,7 +143,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 mostlyclean-binPROGRAMS:
 
 clean-binPROGRAMS:
-	test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 
 distclean-binPROGRAMS:
 
@@ -158,77 +160,79 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	done
 
 uninstall-binPROGRAMS:
-	$(NORMAL_UNINSTALL)
+	@$(NORMAL_UNINSTALL)
 	list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \
 	done
 
-mostlyclean-noinstPROGRAMS:
-
-clean-noinstPROGRAMS:
-	test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
-
-distclean-noinstPROGRAMS:
+.c.o:
+	$(COMPILE) -c $<
 
-maintainer-clean-noinstPROGRAMS:
+.s.o:
+	$(COMPILE) -c $<
 
-.c.o:
+.S.o:
 	$(COMPILE) -c $<
 
 mostlyclean-compile:
-	rm -f *.o core
+	-rm -f *.o core *.core
 
 clean-compile:
 
 distclean-compile:
-	rm -f *.tab.c
+	-rm -f *.tab.c
 
 maintainer-clean-compile:
 
-texindex$(EXEEXT): $(texindex_OBJECTS) $(texindex_DEPENDENCIES)
-	@rm -f texindex$(EXEEXT)
-	$(LINK) $(texindex_LDFLAGS) $(texindex_OBJECTS) $(texindex_LDADD) $(LIBS)
+install-info: $(install_info_OBJECTS) $(install_info_DEPENDENCIES)
+	@rm -f install-info
+	$(LINK) $(install_info_LDFLAGS) $(install_info_OBJECTS) $(install_info_LDADD) $(LIBS)
 
-install-inf$(EXEEXT): $(install_inf_OBJECTS) $(install_inf_DEPENDENCIES)
-	@rm -f install-inf$(EXEEXT)
-	$(LINK) $(install_inf_LDFLAGS) $(install_inf_OBJECTS) $(install_inf_LDADD) $(LIBS)
+texindex: $(texindex_OBJECTS) $(texindex_DEPENDENCIES)
+	@rm -f texindex
+	$(LINK) $(texindex_LDFLAGS) $(texindex_OBJECTS) $(texindex_LDADD) $(LIBS)
 
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(bindir)
 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo " $(INSTALL_SCRIPT) $$p $(bindir)/`echo $$p|sed '$(transform)'`$(EXEEXT)"; \
-	    $(INSTALL_SCRIPT) $$p $(bindir)/`echo $$p|sed '$(transform)'`$(EXEEXT); \
+	    echo " $(INSTALL_SCRIPT) $$p $(bindir)/`echo $$p|sed '$(transform)'`"; \
+	    $(INSTALL_SCRIPT) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
 	  else if test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(bindir)/`echo $$p|sed '$(transform)'`$(EXEEXT)"; \
-	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(bindir)/`echo $$p|sed '$(transform)'`$(EXEEXT); \
+	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(bindir)/`echo $$p|sed '$(transform)'`"; \
+	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(bindir)/`echo $$p|sed '$(transform)'`; \
 	  else :; fi; fi; \
 	done
 
 uninstall-binSCRIPTS:
-	$(NORMAL_UNINSTALL)
+	@$(NORMAL_UNINSTALL)
 	list='$(bin_SCRIPTS)'; for p in $$list; do \
 	  rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \
 	done
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES)
-	here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS)
+ID: $(HEADERS) $(SOURCES) $(LISP)
+	here=`pwd` && cd $(srcdir) \
+	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	test -z "$(ETAGS_ARGS)$(SOURCES)$(HEADERS)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $(SOURCES) $(HEADERS) -o $$here/TAGS)
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 
 mostlyclean-tags:
 
 clean-tags:
 
 distclean-tags:
-	rm -f TAGS ID
+	-rm -f TAGS ID
 
 maintainer-clean-tags:
 
@@ -238,18 +242,21 @@ subdir = util
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  d=$(srcdir); \
 	  test -f $(distdir)/$$file \
 	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
 	  || cp -p $$d/$$file $(distdir)/$$file; \
 	done
+install-info.o: install-info.c ../lib/system.h ../config.h \
+	../lib/getopt.h
+texindex.o: texindex.c ../lib/system.h ../config.h ../lib/getopt.h
+
 info:
 dvi:
 check: all
 	$(MAKE)
 installcheck:
-install-info:
-install-exec: install-binPROGRAMS install-binSCRIPTS install-exec-local
+install-exec: install-binPROGRAMS install-binSCRIPTS
 	@$(NORMAL_INSTALL)
 
 install-data: 
@@ -269,55 +276,46 @@ installdirs:
 
 
 mostlyclean-generic:
-	test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-	test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	rm -f Makefile $(DISTCLEANFILES)
-	rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-rm -f Makefile $(DISTCLEANFILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-	test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean:  mostlyclean-binPROGRAMS mostlyclean-noinstPROGRAMS \
-		mostlyclean-compile mostlyclean-tags \
-		mostlyclean-generic
-
-clean:  clean-binPROGRAMS clean-noinstPROGRAMS clean-compile clean-tags \
-		clean-generic mostlyclean
-
-distclean:  distclean-binPROGRAMS distclean-noinstPROGRAMS \
-		distclean-compile distclean-tags distclean-generic \
-		clean
-	rm -f config.status
-
-maintainer-clean:  maintainer-clean-binPROGRAMS \
-		maintainer-clean-noinstPROGRAMS \
-		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+mostlyclean:  mostlyclean-binPROGRAMS mostlyclean-compile \
+		mostlyclean-tags mostlyclean-generic
+
+clean:  clean-binPROGRAMS clean-compile clean-tags clean-generic \
+		mostlyclean
+
+distclean:  distclean-binPROGRAMS distclean-compile distclean-tags \
+		distclean-generic clean
+	-rm -f config.status
+
+maintainer-clean:  maintainer-clean-binPROGRAMS maintainer-clean-compile \
+		maintainer-clean-tags maintainer-clean-generic \
+		distclean
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
 .PHONY: default mostlyclean-binPROGRAMS distclean-binPROGRAMS \
 clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
-install-binPROGRAMS mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \
-clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \
-mostlyclean-compile distclean-compile clean-compile \
+install-binPROGRAMS mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile uninstall-binSCRIPTS install-binSCRIPTS tags \
 mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
-distdir info dvi installcheck install-info install-exec install-data \
-install uninstall all installdirs mostlyclean-generic distclean-generic \
+distdir info dvi installcheck install-exec install-data install \
+uninstall all installdirs mostlyclean-generic distclean-generic \
 clean-generic maintainer-clean-generic clean mostlyclean distclean \
 maintainer-clean
 
 
-install-exec-local: $(noinst_PROGRAMS)
-	$(mkinstalldirs) $(bindir)
-	$(INSTALL_PROGRAM) install-inf$(EXEEXT) $(bindir)/`echo install-info$(EXEEXT)|sed '$(transform)'`; \
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/texinfo/util/README b/texinfo/util/README
index b1ce44ca9af..5385522543b 100644
--- a/texinfo/util/README
+++ b/texinfo/util/README
@@ -1,3 +1,4 @@
 Assorted Texinfo-related programs and scripts.
+
 texindex, texi2dvi, and install-info get installed.
-The other programs are for your amusement.
+The other items here are for your amusement and/or hacking pleasure.
diff --git a/texinfo/util/install-info.c b/texinfo/util/install-info.c
index 6007a3cbd31..91b599d57f0 100644
--- a/texinfo/util/install-info.c
+++ b/texinfo/util/install-info.c
@@ -1,7 +1,7 @@
 /* install-info -- create Info directory entry(ies) for an Info file.
-   $Id: install-info.c,v 1.5 1998/03/24 18:08:44 law Exp $
+   $Id: install-info.c,v 1.1.1.3 1998/03/24 18:20:30 law Exp $
 
-   Copyright (C) 1996, 97 Free Software Foundation, Inc.
+   Copyright (C) 1996, 97, 98 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,6 +20,10 @@
 #include "system.h"
 #include <getopt.h>
 
+#ifdef HAVE_LIBZ
+#include <zlib.h>
+#endif
+
 /* Name this program was invoked with.  */
 char *progname;
 
@@ -283,8 +287,9 @@ suggest_asking_for_help ()
 void
 print_help ()
 {
-  printf (_("%s [OPTION]... [INFO-FILE [DIR-FILE]]\n\
-  Install INFO-FILE in the Info directory file DIR-FILE.\n\
+  printf (_("Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n\
+\n\
+Install INFO-FILE in the Info directory file DIR-FILE.\n\
 \n\
 Options:\n\
 --delete          Delete existing entries in INFO-FILE;\n\
@@ -312,12 +317,14 @@ Options:\n\
                     from information in the Info file itself.\n\
 --version         Display version information and exit.\n\
 \n\
-Email bug reports to bug-texinfo@prep.ai.mit.edu.\n\
+Email bug reports to bug-texinfo@gnu.org.\n\
 "), progname);
 }
+
 
 /* If DIRFILE does not exist, create a minimal one (or abort).  If it
    already exists, do nothing.  */
+
 void
 ensure_dirfile_exists (dirfile)
      char *dirfile;
@@ -335,7 +342,7 @@ ensure_dirfile_exists (dirfile)
 topmost node of the Info hierarchy, called (dir)Top.\n\
 The first time you invoke Info you start off looking at this node.\n\
 \n\
-File: dir       Node: Top       This is the top of the INFO tree\n\
+File: dir,\tNode: Top,\tThis is the top of the INFO tree\n\
 \n\
   This (the Directory node) gives a menu of major topics.\n\
   Typing \"q\" exits, \"?\" lists all Info commands, \"d\" returns here,\n\
@@ -368,19 +375,20 @@ File: dir       Node: Top       This is the top of the INFO tree\n\
 
 struct option longopts[] =
 {
-  { "delete",                   no_argument, NULL, 'r' },
-  { "dir-file",                 required_argument, NULL, 'd' },
-  { "entry",                    required_argument, NULL, 'e' },
-  { "help",                     no_argument, NULL, 'h' },
-  { "info-dir",                 required_argument, NULL, 'D' },
-  { "info-file",                required_argument, NULL, 'i' },
-  { "item",                     required_argument, NULL, 'e' },
-  { "quiet",                    no_argument, NULL, 'q' },
-  { "remove",                   no_argument, NULL, 'r' },
-  { "section",                  required_argument, NULL, 's' },
-  { "version",                  no_argument, NULL, 'V' },
+  { "delete",    no_argument, NULL, 'r' },
+  { "dir-file",  required_argument, NULL, 'd' },
+  { "entry",     required_argument, NULL, 'e' },
+  { "help",      no_argument, NULL, 'h' },
+  { "info-dir",  required_argument, NULL, 'D' },
+  { "info-file", required_argument, NULL, 'i' },
+  { "item",      required_argument, NULL, 'e' },
+  { "quiet",     no_argument, NULL, 'q' },
+  { "remove",    no_argument, NULL, 'r' },
+  { "section",   required_argument, NULL, 's' },
+  { "version",   no_argument, NULL, 'V' },
   { 0 }
 };
+
 
 int
 main (argc, argv)
@@ -518,11 +526,12 @@ main (argc, argv)
           break;
 
         case 'V':
-          printf (_("install-info (GNU %s) %s\n"), PACKAGE, VERSION);
-puts (_("Copyright (C) 1996 Free Software Foundation, Inc.\n\
+          printf ("install-info (GNU %s) %s\n", PACKAGE, VERSION);
+	  printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\
 There is NO warranty.  You may redistribute this software\n\
 under the terms of the GNU General Public License.\n\
-For more information about these matters, see the files named COPYING."));
+For more information about these matters, see the files named COPYING.\n"),
+		  "1998");
           exit (0);
 
         default:
@@ -955,18 +964,49 @@ readfile (filename, sizep)
      char *filename;
      int *sizep;
 {
+  int desc;
   int data_size = 1024;
   char *data = (char *) xmalloc (data_size);
   int filled = 0;
   int nread = 0;
+#ifdef HAVE_LIBZ
+  int isGZ = 0;
+  gzFile zdesc;
+#endif
 
-  int desc = open (filename, O_RDONLY);
+  desc = open (filename, O_RDONLY);
   if (desc < 0)
     pfatal_with_name (filename);
 
+#ifdef HAVE_LIBZ
+  /* The file should always be two bytes long.  */
+  if (read (desc, data, 2) != 2)
+    pfatal_with_name (filename);
+
+  /* Undo that read.  */
+  lseek (desc, 0, SEEK_SET);
+
+  /* If we see gzip magic, use gzdopen. */
+  if (data[0] == '\x1f' && data[1] == '\x8b')
+    {
+      isGZ = 1;
+      zdesc = gzdopen (desc, "r");
+      if (zdesc == NULL) {
+        close (desc);
+        pfatal_with_name (filename);
+      }
+    }
+#endif /* HAVE_LIBZ */
+
   while (1)
     {
-      nread = read (desc, data + filled, data_size - filled);
+#ifdef HAVE_LIBZ
+      if (isGZ)
+	nread = gzread (zdesc, data + filled, data_size - filled);
+      else
+#endif
+        nread = read (desc, data + filled, data_size - filled);
+
       if (nread < 0)
         pfatal_with_name (filename);
       if (nread == 0)
@@ -981,6 +1021,14 @@ readfile (filename, sizep)
     }
 
   *sizep = filled;
+
+#ifdef HAVE_LIBZ
+  if (isGZ)
+    gzclose (zdesc);
+  else
+#endif
+    close(desc);
+
   return data;
 }
 
diff --git a/texinfo/util/texi2dvi b/texinfo/util/texi2dvi
index 8363f5ebbfd..5fe8dee8409 100755
--- a/texinfo/util/texi2dvi
+++ b/texinfo/util/texi2dvi
@@ -1,10 +1,9 @@
 #! /bin/sh
 # texi2dvi --- smartly produce DVI files from texinfo sources
-
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-
-# $Id: texi2dvi,v 1.2 1998/03/24 18:08:49 law Exp $
-
+# $Id: texi2dvi,v 1.1.1.3 1998/03/24 18:20:32 law Exp $
+#
+# Copyright (C) 1992, 93, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2, or (at your option)
@@ -19,35 +18,34 @@
 # along with this program; if not, you can either send email to this
 # program's maintainer or write to: The Free Software Foundation,
 # Inc.; 59 Temple Place, Suite 330; Boston, MA 02111-1307, USA.
-
+#
 # Commentary:
-
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-
-# Please send bug reports, etc. to bug-texinfo@prep.ai.mit.edu
+#
+# Author: Noah Friedman <friedman@gnu.org>
+#
+# Please send bug reports, etc. to bug-texinfo@gnu.org.
 # If possible, please send a copy of the output of the script called with
 # the `--debug' option when making a bug report.
-
+#
 # In the interest of general portability, some common bourne shell
 # constructs were avoided because they weren't guaranteed to be available
 # in some earlier implementations.  I've tried to make this program as
 # portable as possible.  Welcome to unix, where the lowest common
 # denominator is rapidly diminishing.
 #
-# Among the more interesting lossages I noticed with some bourne shells
-# are:
+# Among the more interesting lossages I noticed among Bourne shells:
 #     * No shell functions.
 #     * No `unset' builtin.
 #     * `shift' cannot take a numeric argument, and signals an error if
 #       there are no arguments to shift.
-
+#
 # Code:
 
 # Name by which this script was invoked.
 progname=`echo "$0" | sed -e 's/[^\/]*\///g'`
 
 # This string is expanded by rcs automatically when this file is checked out.
-rcs_revision='$Revision: 1.2 $'
+rcs_revision='$Revision: 1.1.1.3 $'
 version=`set - $rcs_revision; echo $2`
 
 # To prevent hairy quoting and escaping later.
@@ -58,6 +56,8 @@ usage="Usage: $0 [OPTION]... FILE...
 Run a Texinfo document through TeX.
 
 Options:
+-b, --batch          No interaction (\nonstopmode in TeX).
+-c, --clean          Remove all auxiliary files.
 -D, --debug          Turn on shell debugging ($bq${bq}set -x$eq$eq).
 -t, --texinfo CMD    Insert CMD after @setfilename before running TeX.
 --verbose            Report on what is done.
@@ -67,14 +67,15 @@ Options:
 The values of the TEX, TEXINDEX, and MAKEINFO environment variables are
 used to run those commands, if they are set.
 
-Email bug reports to bug-texinfo@prep.ai.mit.edu.
-"
+Email bug reports to bug-texinfo@gnu.org."
 
 # Initialize variables.
 # Don't use `unset' since old bourne shells don't have this command.
 # Instead, assign them an empty value.
 # Some of these, like TEX and TEXINDEX, may be inherited from the environment.
 backup_extension=.bak # these files get deleted if all goes well.
+batch=
+clean=
 debug=
 orig_pwd="`pwd`"
 textra=
@@ -92,16 +93,19 @@ export TEXINPUTS
 # It's a good idea to document the full long option name in each case.
 # Long options which take arguments will need a `*' appended to the
 # canonical name to match the value appended after the `=' character.
-while : ; do
-  case $# in 0) break ;; esac
+while :; do
+  test $# -eq 0 && break
+  
   case "$1" in
+    -b | --batch | --b* ) batch=t; shift ;;
+    -c | --clean | --c* ) clean=t; shift ;;
     -D | --debug | --d* ) debug=t; shift ;;
     -h | --help | --h* )   echo "$usage"; exit 0 ;;
     # OK, we should do real option parsing here, but be lazy for now.
     -t | --texinfo | --t*) shift; textra="$textra $1"; shift ;; 
     -v | --vers* )
-      echo "$progname (Texinfo 3.9) $version"
-      echo "Copyright (C) 1996 Free Software Foundation, Inc.
+      echo "$progname (GNU Texinfo 3.12) $version"
+      echo "Copyright (C) 1998 Free Software Foundation, Inc.
 There is NO warranty.  You may redistribute this software
 under the terms of the GNU General Public License.
 For more information about these matters, see the files named COPYING."
@@ -109,8 +113,7 @@ For more information about these matters, see the files named COPYING."
     --verb* )            verbose=echo; shift ;;
     -- )     # Stop option processing
       shift
-      break
-     ;;
+      break ;;
     -* )
       case "$1" in
         --*=* ) arg=`echo "$1" | sed -e 's/=.*//'` ;;
@@ -119,11 +122,8 @@ For more information about these matters, see the files named COPYING."
       exec 1>&2
       echo "$progname: Unknown or ambiguous option $bq$arg$eq."
       echo "$progname: Try $bq--help$eq for more information."
-      exit 1
-     ;;
-    * )
-      break
-     ;;
+      exit 1 ;;
+    * ) break ;;
    esac
 done
 
@@ -139,14 +139,14 @@ fi
 test "$debug" = t && set -x
 
 # Texify files
-for command_line_filename in ${1+"$@"} ; do
+for command_line_filename in ${1+"$@"}; do
   $verbose "Processing $command_line_filename ..."
 
   # See if file exists.  If it doesn't we're in trouble since, even
   # though the user may be able to reenter a valid filename at the tex
   # prompt (assuming they're attending the terminal), this script won't
   # be able to find the right index files and so forth.
-  if test ! -r "${command_line_filename}" ; then
+  if test ! -r "${command_line_filename}"; then
     echo "$0: Could not read ${command_line_filename}." >&2
     continue
   fi
@@ -161,17 +161,22 @@ for command_line_filename in ${1+"$@"} ; do
   # basename as the manual.  Use extension .texi for the temp file so
   # that TeX will ignore it.  Thus, we must use a subdirectory.
   #
-  # Output the macro-expanded file to here.
-  tmp_dir=${TMPDIR-/tmp}/$$
+  # Output the macro-expanded file to here.  The vastly abbreviated
+  # temporary directory name is so we don't have collisions on 8.3 or
+  # 14-character filesystems.
+  tmp_dir=${TMPDIR-/tmp}/txi2d.$$
   filename_tmp=$tmp_dir/$filename_noext.texi
   # Output the file with the user's extra commands to here.
-  filename_tmp2=$tmp_dir.2/$filename_noext.texi
-  mkdir $tmp_dir $tmp_dir.2
+  tmp_dir2=${tmp_dir}.2
+  filename_tmp2=$tmp_dir2/$filename_noext.texi
+  mkdir $tmp_dir $tmp_dir2
+  # Always remove the temporary directories.
+  trap "rm -rf $tmp_dir $tmp_dir2" 1 2 15
 
   # If directory and file are the same, then it's probably because there's
   # no pathname component.  Set dirname to `.', the current directory.
-  if test "z${directory}" = "z${command_line_filename}" ; then
-     directory=.
+  if test "z${directory}" = "z${command_line_filename}"; then
+    directory=.
   fi
 
   # Source file might @include additional texinfo sources.  Put `.' and
@@ -195,10 +200,10 @@ for command_line_filename in ${1+"$@"} ; do
   # let's be safe.)
   if test $? -ne 0 || cmp -s $filename_tmp $command_line_filename; then
     $verbose "Reverting to $command_line_filename ..."
-    filename_input=$command_line_filename
-  else
-    filename_input=$filename_tmp
+    cp -p $command_line_filename $filename_tmp
   fi
+  filename_input=$filename_tmp
+  dirname_input=$tmp_dir
 
   # Used most commonly for @finalout, @smallbook, etc.
   if test -n "$textra"; then
@@ -206,6 +211,14 @@ for command_line_filename in ${1+"$@"} ; do
     sed '/^@setfilename/a\
 '"$textra" $filename_input >$filename_tmp2
    filename_input=$filename_tmp2
+   dirname_input=$tmp_dir2
+  fi
+
+  # If clean mode was specified, then move to the temporary directory.
+  if test "$clean" = t; then
+    $verbose "cd $dirname_input"
+    cd $dirname_input || exit 1
+    filename_input=`basename $filename_input`
   fi
 
   while true; do # will break out of loop below
@@ -218,17 +231,17 @@ for command_line_filename in ${1+"$@"} ; do
     # is actually the cross-references file, but we need to keep track of
     # that too.
     possible_index_files="`eval echo ${filename_noext}.?? ${filename_noext}.aux`"
-    for this_file in ${possible_index_files} ; do
-       # If file is empty, forget it.
-       test -s "${this_file}" || continue
-
-       # Examine first character of file.  If it's not suitable to be an
-       # index or xref file, don't process it.
-       first_character="`sed -n '1s/^\(.\).*$/\1/p;q' ${this_file}`"
-       if test "x${first_character}" = "x\\" \
-          || test "x${first_character}" = "x'"; then
-         definite_index_files="${definite_index_files} ${this_file}"
-       fi
+    for this_file in ${possible_index_files}; do
+      # If file is empty, forget it.
+      test -s "${this_file}" || continue
+
+      # Examine first character of file.  If it's not suitable to be an
+      # index or xref file, don't process it.
+      first_character="`sed -n '1s/^\(.\).*$/\1/p;q' ${this_file}`"
+      if test "x${first_character}" = "x\\" \
+         || test "x${first_character}" = "x'"; then
+        definite_index_files="${definite_index_files} ${this_file}"
+      fi
     done
     orig_index_files="${definite_index_files}"
     orig_index_files_sans_aux="`echo ${definite_index_files} \
@@ -238,7 +251,7 @@ for command_line_filename in ${1+"$@"} ; do
     # Now save copies of original index files so we have some means of
     # comparison later.
     $verbose "Backing up current index files: $orig_index_files ..."  
-    for index_file_to_save in ${orig_index_files} ; do
+    for index_file_to_save in ${orig_index_files}; do
       cp "${index_file_to_save}" "${index_file_to_save}${backup_extension}"
     done
 
@@ -246,21 +259,27 @@ for command_line_filename in ${1+"$@"} ; do
     # after running TeX a first time the index files don't change, then
     # there's no reason to run TeX again.  But we won't know that if the
     # index files are out of date or nonexistent.
-    if test -n "${orig_index_files_sans_aux}" ; then
-       $verbose "Running $texindex $orig_index_files_sans_aux ..."
-       ${texindex} ${orig_index_files_sans_aux}
+    if test -n "${orig_index_files_sans_aux}"; then
+      $verbose "Running $texindex $orig_index_files_sans_aux ..."
+      ${texindex} ${orig_index_files_sans_aux}
     fi
 
     # Finally, run TeX.
+    if test "$batch" = t; then
+      tex_mode='\nonstopmode'
+    else
+      tex_mode=
+    fi
     $verbose "Running $tex $filename_input ..."
-    ${tex} "$filename_input"
+    cmd="$tex $tex_mode \\input $filename_input"
+    $cmd
 
     # Check if index files changed.
     # 
     definite_index_files=
     # Get list of new index files.
     possible_index_files="`eval echo ${filename_noext}.?? ${filename_noext}.aux`"
-    for this_file in ${possible_index_files} ; do
+    for this_file in ${possible_index_files}; do
        # If file is empty, forget it.
        test -s "${this_file}" || continue
 
@@ -283,17 +302,17 @@ for command_line_filename in ${1+"$@"} ; do
     # file or another has definitely changed.
     $verbose "Original index files =$orig_index_files"
     $verbose "New index files =$new_index_files"
-    if test "z${orig_index_files}" != "z${new_index_files}" ; then
+    if test "z${orig_index_files}" != "z${new_index_files}"; then
       index_files_changed_p=t
     else
       # File list is the same.  We must compare each file until we find a
       # difference.
       index_files_changed_p=
-      for this_file in ${new_index_files} ; do
+      for this_file in ${new_index_files}; do
         $verbose "Comparing index file $this_file ..."
         # cmp -s will return nonzero exit status if files differ.
         cmp -s "${this_file}" "${this_file}${backup_extension}"
-        if test $? -ne 0 ; then
+        if test $? -ne 0; then
           # We only need to keep comparing until we find *one* that
           # differs, because we'll have to run texindex & tex no
           # matter what.
@@ -308,22 +327,34 @@ for command_line_filename in ${1+"$@"} ; do
 
     # If index files have changed since TeX has been run, or if the aux
     # file wasn't present originally, run texindex and TeX again.
-    if test "${index_files_changed_p}" ; then :; else
+    if test "${index_files_changed_p}"; then :; else
       # Nothing changed.  We're done with TeX.
       break
     fi
   done
 
+  # If we were in clean mode, compilation was in a tmp directory.
+  # Copy the DVI file into the directory where the compilation
+  # has been done.  (The temp dir is about to get removed anyway.)
+  # We also return to the original directory so that
+  # - the next file is processed in correct conditions
+  # - the temporary file can be removed
+  if test -n "$clean"; then
+    $verbose "Copying DVI file from `pwd` to $orig_pwd"
+    cp -p $filename_noext.dvi $orig_pwd
+    cd $orig_pwd || exit 1
+  fi
+
   # Generate list of files to delete, then call rm once with the entire
   # list.  This is significantly faster than multiple executions of rm.
   file_list=
-  for file in ${orig_index_files} ; do
+  for file in ${orig_index_files}; do
     file_list="${file_list} ${file}${backup_extension}"
   done
-  if test -n "${file_list}" ; then
-    $verbose "Removing $file_list $tmp_dir $tmp_dir.2 ..."
+  if test -n "${file_list}"; then
+    $verbose "Removing $file_list $tmp_dir $tmp_dir2 ..."
     rm -f ${file_list}
-    rm -rf $tmp_dir $tmp_dir.2
+    rm -rf $tmp_dir $tmp_dir2
   fi
 done
 
diff --git a/texinfo/util/texindex.c b/texinfo/util/texindex.c
index d0655fb1228..347cccbd612 100644
--- a/texinfo/util/texindex.c
+++ b/texinfo/util/texindex.c
@@ -1,7 +1,7 @@
 /* Prepare TeX index dribble output into an actual index.
-   $Id: texindex.c,v 1.2 1998/03/24 18:08:47 law Exp $
+   $Id: texindex.c,v 1.1.1.3 1998/03/24 18:20:31 law Exp $
 
-   Copyright (C) 1987, 91, 92, 96, 97 Free Software Foundation, Inc.
+   Copyright (C) 1987, 91, 92, 96, 97, 98 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -43,18 +43,6 @@ char *mktemp ();
 #  define TI_FATAL_ERROR ((1 << 28) | 4)
 #  define unlink delete
 #else /* !VMS */
-#  if defined (HAVE_SYS_FCNTL_H)
-#    include <sys/types.h>
-#    include <sys/fcntl.h>
-#  endif /* HAVE_SYS_FCNTL_H */
-
-#  if defined (_AIX) || !defined (_POSIX_VERSION)
-#    include <sys/file.h>
-#  else /* !AIX && _POSIX_VERSION */
-#    if !defined (HAVE_SYS_FCNTL_H)
-#      include <fcntl.h>
-#    endif /* !HAVE_FCNTL_H */
-#  endif /* !_AIX && _POSIX_VERSION */
 #  define TI_NO_ERROR 0
 #  define TI_FATAL_ERROR 1
 #endif /* !VMS */
@@ -246,6 +234,8 @@ main (argc, argv)
 
   flush_tempfiles (tempcount);
   exit (TI_NO_ERROR);
+  
+  return 0; /* Avoid bogus warnings.  */
 }
 
 typedef struct
@@ -297,7 +287,7 @@ usage (result_value)
 
       fprintf (f, "\t%s\n", _(texindex_options[i].doc_string));
     }
-  puts (_("\nEmail bug reports to bug-texinfo@prep.ai.mit.edu."));
+  puts (_("\nEmail bug reports to bug-texinfo@gnu.org."));
 
   exit (result_value);
 }
@@ -344,11 +334,12 @@ decode_command (argc, argv)
         {
           if (strcmp (arg, "--version") == 0)
             {
-              printf (_("texindex (GNU %s %s) 2.1\n"), PACKAGE, VERSION);
-puts (_("Copyright (C) 1996 Free Software Foundation, Inc.\n\
+              printf ("texindex (GNU %s) %s\n", PACKAGE, VERSION);
+	  printf (_("Copyright (C) %s Free Software Foundation, Inc.\n\
 There is NO warranty.  You may redistribute this software\n\
 under the terms of the GNU General Public License.\n\
-For more information about these matters, see the files named COPYING."));
+For more information about these matters, see the files named COPYING.\n"),
+		  "1998");
               exit (0);
             }
           else if ((strcmp (arg, "--keep") == 0) ||
diff --git a/texinfo/util/update-info b/texinfo/util/update-info
index d946bceb511..0d31fde4d27 100755
--- a/texinfo/util/update-info
+++ b/texinfo/util/update-info
@@ -213,7 +213,7 @@ Options:
 Backup of the info node has a '.old' suffix added.  This is a shell script.
 Files: update-info.f -- contains functions (optional).
 Environment Variables: COLUMNS, EDITOR, LINES, TMPDIR
-Email bug reports to bug-texinfo@prep.ai.mit.edu.
+Email bug reports to bug-texinfo@gnu.org.
 HelpEndOfFile
 		exit;;