import texinfo 4.8 into the tree.

(okay theo, kettenis)

279 files changed, 67575 insertions, 27987 deletions

diff --git a/gnu/usr.bin/texinfo/ABOUT-NLS b/gnu/usr.bin/texinfo/ABOUT-NLS
index 022965c6ac5..2f50c6693ef 100644
--- a/gnu/usr.bin/texinfo/ABOUT-NLS
+++ b/gnu/usr.bin/texinfo/ABOUT-NLS
@@ -1,8 +1,8 @@
 Notes on the Free Translation Project
 *************************************
 
-   Free software is going international!  The Free Translation Project
-is a way to get maintainers of free software, translators, and users all
+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.
 
@@ -25,7 +25,7 @@ related to internationalization, you should tell about the version of
 Quick configuration advice
 ==========================
 
-   If you want to exploit the full power of internationalization, you
+If you want to exploit the full power of internationalization, you
 should configure it using
 
      ./configure --with-included-gettext
@@ -48,10 +48,10 @@ included `libintl'.
 INSTALL Matters
 ===============
 
-   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'.
+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'.
 
    By default, this package will be installed to allow translation of
 messages.  It will automatically detect whether the system already
@@ -98,7 +98,7 @@ codes, stating which languages are allowed.
 Using This Package
 ==================
 
-   As a user, if your language has been installed for this package, you
+As a user, if your language has been installed for this package, you
 only have to set the `LANG' environment variable to the appropriate
 `LL_CC' combination.  Here `LL' is an ISO 639 two-letter language code,
 and `CC' is an ISO 3166 two-letter country code.  For example, let's
@@ -131,6 +131,13 @@ system libraries.  For example, some Swedish users who would rather
 read translations in German than English for when Swedish is not
 available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
 
+   Special advice for Norwegian users: The language code for Norwegian
+bokma*l changed from `no' to `nb' recently (in 2003).  During the
+transition period, while some message catalogs for this language are
+installed under `nb' and some older ones under `no', it's recommended
+for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and
+older translations are used.
+
    In the `LANGUAGE' environment variable, but not in the `LANG'
 environment variable, `LL_CC' combinations can be abbreviated as `LL'
 to denote the language's main dialect.  For example, `de' is equivalent
@@ -140,7 +147,7 @@ to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
 Translating Teams
 =================
 
-   For the Free 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.  The up-to-date list of
@@ -170,194 +177,559 @@ programming skill, here.
 Available Packages
 ==================
 
-   Languages are not equally supported in all packages.  The following
-matrix shows the current state of internationalization, as of March
-2002.  The matrix shows, in regard of each package, for which languages
+Languages are not equally supported in all packages.  The following
+matrix shows the current state of internationalization, as of January
+2004.  The matrix shows, in regard of each package, for which languages
 PO files have been submitted to translation coordination, with a
 translation percentage of at least 50%.
 
-     Ready PO files    bg ca cs da de el en eo es et fi fr
-                     +-------------------------------------+
-     a2ps            |          [] []             []    [] |
-     bash            |             []       [] []       [] |
-     bfd             |                         []       [] |
-     binutils        |                         []       [] |
-     bison           |             []             []    [] |
-     clisp           |             []    []    []       [] |
-     cpio            |          [] []          []       [] |
-     diffutils       |       [] [] []       [] []       [] |
-     enscript        |             []                   [] |
-     error           |                         []       [] |
-     fetchmail       |       () [] []          []       () |
-     fileutils       |          [] []          [] []    [] |
-     findutils       |          [] []          [] []    [] |
-     flex            |    []    []             []       [] |
-     gas             |                         []       [] |
-     gawk            |                         []       [] |
-     gcal            |    []                            [] |
-     gcc             |                         []       [] |
-     gettext         |    []    [] []          []       [] |
-     gnupg           |             [] []    [] [] []    [] |
-     gprof           |                         []       [] |
-     grep            | [] []       []          [] []    [] |
-     hello           |          [] [] []    [] [] [] [] [] |
-     id-utils        |          [] []                   [] |
-     indent          |    []       []       []    []    [] |
-     jpilot          |       () [] []                   [] |
-     jwhois          |                         []       [] |
-     kbd             |                         []       [] |
-     ld              |                         []       [] |
-     libc            |    [] [] [] [] []       []       [] |
-     lilypond        |          []                      [] |
-     lynx            |       [] [] []             []       |
-     m4              |       [] [] [] []                [] |
-     make            |          [] []          []       [] |
-     mysecretdiary   |             []                   [] |
-     nano            |    [] () [] []          []       [] |
-     nano_1_0        |    [] () [] []          []       [] |
-     opcodes         |          []             []       [] |
-     parted          |    []    [] []                   [] |
-     ptx             |          [] []          [] []    [] |
-     python          |                                     |
-     recode          |          [] [] []    [] []       [] |
-     sed             |       [] [] [] []    [] [] []    [] |
-     sh-utils        |    [] [] [] [] []       [] []    [] |
-     sharutils       |       [] [] [] []       []       [] |
-     sketch          |             ()          []       () |
-     soundtracker    |             []          []       [] |
-     sp              |                                     |
-     tar             |       [] [] []          [] []    [] |
-     texinfo         |       [] [] []       []          [] |
-     textutils       |    []    [] []          []       [] |
-     util-linux      |       [] []             []       [] |
-     vorbis-tools    |                                     |
-     wdiff           |          [] []          [] []    [] |
-     wget            |    [] [] [] [] []       [] []    [] |
-                     +-------------------------------------+
-                       bg ca cs da de el en eo es et fi fr
-                        1 12 11 31 36  9  1  8 39 15  1 50
+     Ready PO files       af am ar az be bg bs ca cs da de el en en_GB eo es
+                        +----------------------------------------------------+
+     a2ps               |             []             [] [] []                |
+     aegis              |                               ()                   |
+     ant-phone          |                               ()                   |
+     anubis             |                                                    |
+     ap-utils           |                                                    |
+     aspell             |             []                                     |
+     bash               |                      []       []             [] [] |
+     batchelor          |                                                    |
+     bfd                |                            []                   [] |
+     binutils           |                            []                   [] |
+     bison              |                            [] []                [] |
+     bluez-pin          | []                      []                   []    |
+     clisp              |                                                    |
+     clisp              |                               []    []          [] |
+     console-tools      |                         []    []                   |
+     coreutils          |                      []    [] []                [] |
+     cpio               |                            [] []                [] |
+     darkstat           |                []          ()                   [] |
+     diffutils          |                      [] [] [] [] []          [] [] |
+     e2fsprogs          |                         []    []                [] |
+     enscript           |                      []    [] []        []         |
+     error              |                      []    [] []        []      [] |
+     fetchmail          |                      [] () [] [] []             [] |
+     fileutils          |                            [] []                [] |
+     findutils          |             []       []    [] [] []          [] [] |
+     flex               |                      []    [] []                [] |
+     fslint             |                                                    |
+     gas                |                                                 [] |
+     gawk               |                      []    [] []                [] |
+     gbiff              |                               []                   |
+     gcal               |                      []                            |
+     gcc                |                            []                   [] |
+     gettext            |             []       []    [] []                [] |
+     gettext-examples   | []                   []       []                [] |
+     gettext-runtime    |             []       []    [] []                [] |
+     gettext-tools      |                      []       []                [] |
+     gimp-print         |                         [] [] []        []      [] |
+     gliv               |                                                    |
+     glunarclock        |                            [] []                   |
+     gnubiff            |                               []                   |
+     gnucash            |                         []    ()        []      [] |
+     gnucash-glossary   |                            [] ()                [] |
+     gnupg              |                      [] ()    [] []          [] [] |
+     gpe-aerial         |                         []                         |
+     gpe-beam           |                         []    []                   |
+     gpe-calendar       |                         []    []                   |
+     gpe-clock          |                         []    []                   |
+     gpe-conf           |                         []    []                   |
+     gpe-contacts       |                         []    []                   |
+     gpe-edit           |                         []                         |
+     gpe-go             |                         []                         |
+     gpe-login          |                         []    []                   |
+     gpe-ownerinfo      |                         []    []                   |
+     gpe-sketchbook     |                         []    []                   |
+     gpe-su             |                         []    []                   |
+     gpe-taskmanager    |                         []    []                   |
+     gpe-timesheet      |                         []                         |
+     gpe-today          |                         []    []                   |
+     gpe-todo           |                         []    []                   |
+     gphoto2            |                         [] [] []                [] |
+     gprof              |                            [] []                [] |
+     gpsdrive           |                               ()    ()          () |
+     gramadoir          |                               []                   |
+     grep               |             [] []    []       [] []             [] |
+     gretl              |                                                 [] |
+     gtick              | []                            ()                   |
+     hello              |                      []    [] [] []          [] [] |
+     id-utils           |                            [] []                   |
+     indent             |                      []       []             [] [] |
+     iso_3166           |          []    [] [] [] [] [] [] []          [] [] |
+     iso_3166_1         |                      [] [] [] [] []             [] |
+     iso_3166_2         |                                                    |
+     iso_3166_3         |                               []                   |
+     iso_4217           |                      []    [] []                [] |
+     iso_639            |                                                    |
+     jpilot             |                         [] []                   [] |
+     jtag               |                                                    |
+     jwhois             |                                                 [] |
+     kbd                |                         [] [] [] []             [] |
+     latrine            |                               ()                   |
+     ld                 |                            []                   [] |
+     libc               |                      [] [] [] [] []             [] |
+     libgpewidget       |                         []    []                   |
+     libiconv           |                      []    [] []             [] [] |
+     lifelines          |                            [] ()                   |
+     lilypond           |                               []                   |
+     lingoteach         |                                                    |
+     lingoteach_lessons |                               ()                () |
+     lynx               |                      [] [] [] []                   |
+     m4                 |                         [] [] [] []                |
+     mailutils          |                      []                         [] |
+     make               |                            [] []                [] |
+     man-db             |                      [] () [] []                () |
+     minicom            |                         []    []                [] |
+     mysecretdiary      |                            [] []                [] |
+     nano               |                      [] () [] []                [] |
+     nano_1_0           |                      [] () [] []                [] |
+     opcodes            |                                                 [] |
+     parted             |                      [] [] [] []                [] |
+     ptx                |                      []    [] []             [] [] |
+     python             |                                                    |
+     radius             |                                                 [] |
+     recode             |             []       []    [] [] []          [] [] |
+     rpm                |                         [] []                      |
+     screem             |                                                    |
+     scrollkeeper       |             []       [] [] [] []                [] |
+     sed                | []                   []    [] []             [] [] |
+     sh-utils           |                            [] []                [] |
+     shared-mime-info   |                                                    |
+     sharutils          |                      [] [] [] [] []             [] |
+     silky              |                               ()                   |
+     skencil            |                            [] ()                [] |
+     sketch             |                            [] ()                [] |
+     soundtracker       |                            [] []                [] |
+     sp                 |                               []                   |
+     tar                |                         [] [] []                [] |
+     texinfo            |                            [] []             []    |
+     textutils          |                      []    [] []                [] |
+     tin                |                               ()        ()         |
+     tp-robot           |                                                    |
+     tuxpaint           |                      [] [] [] [] []     []      [] |
+     unicode-han-tra... |                                                    |
+     unicode-transla... |                                                    |
+     util-linux         |                      [] [] [] []                [] |
+     vorbis-tools       |             []          [] []                   [] |
+     wastesedge         |                               ()                   |
+     wdiff              |                      []    [] []                [] |
+     wget               |                []    []    [] [] []             [] |
+     xchat              |                      []       [] []             [] |
+     xfree86_xkb_xml    |                         [] []                      |
+     xpad               |                                                 [] |
+                        +----------------------------------------------------+
+                          af am ar az be bg bs ca cs da de el en en_GB eo es
+                           4  0  0  1  9  4  1 40 41 60 78 17  1   5   13 68
+     
+                          et eu fa fi fr ga gl he hr hu id is it ja ko lg
+                        +-------------------------------------------------+
+     a2ps               | []       [] []                      ()    ()    |
+     aegis              |                                                 |
+     ant-phone          |             []                                  |
+     anubis             |             []                                  |
+     ap-utils           |             []                                  |
+     aspell             |             [] []                               |
+     bash               |             []             []                   |
+     batchelor          |             [] []                               |
+     bfd                |             []                                  |
+     binutils           |             []                         []       |
+     bison              | []          []                []    []          |
+     bluez-pin          |          [] [] []          [] []                |
+     clisp              |                                                 |
+     clisp              |             []                                  |
+     console-tools      |                                                 |
+     coreutils          | []       [] [] []                   [] []       |
+     cpio               |             []    []       []             []    |
+     darkstat           |             () []          [] []                |
+     diffutils          |          [] []    [] []    [] []       []       |
+     e2fsprogs          |                                                 |
+     enscript           |             []          []                      |
+     error              |          [] [] []          []                   |
+     fetchmail          |                                        []       |
+     fileutils          | []          [] []          []       [] []       |
+     findutils          | []       [] [] [] []    [] [] []    [] [] []    |
+     flex               |             [] []                         []    |
+     fslint             |             []                                  |
+     gas                |             []                                  |
+     gawk               |             []       []                []       |
+     gbiff              |             []                                  |
+     gcal               |             []                                  |
+     gcc                |             []                                  |
+     gettext            |             []                         [] []    |
+     gettext-examples   |             []                         []       |
+     gettext-runtime    |          [] []                []       [] []    |
+     gettext-tools      |             []                         [] []    |
+     gimp-print         |             []                         []       |
+     gliv               |             ()                                  |
+     glunarclock        |          []    [] []       []                   |
+     gnubiff            |             []                                  |
+     gnucash            |             ()                      []          |
+     gnucash-glossary   |                                     []          |
+     gnupg              | []       [] []    []          []    [] []       |
+     gpe-aerial         |             []                                  |
+     gpe-beam           |             []                                  |
+     gpe-calendar       |             []             [] []                |
+     gpe-clock          |             []                                  |
+     gpe-conf           |             []                                  |
+     gpe-contacts       |             []             []                   |
+     gpe-edit           |             []                []                |
+     gpe-go             |             []                                  |
+     gpe-login          |             []             []                   |
+     gpe-ownerinfo      |             []             [] []                |
+     gpe-sketchbook     |             []                                  |
+     gpe-su             |             []                                  |
+     gpe-taskmanager    |             []                                  |
+     gpe-timesheet      |             [] []             []                |
+     gpe-today          |             [] []                               |
+     gpe-todo           |             []                []                |
+     gphoto2            |             []             []          []       |
+     gprof              |             []                []                |
+     gpsdrive           |             ()                      () ()       |
+     gramadoir          |             [] []                               |
+     grep               | []       [] [] [] [] [] [] [] []    [] []       |
+     gretl              |             []                      []          |
+     gtick              |          [] [] []                               |
+     hello              | []    [] [] [] [] [] [] [] [] []    [] [] []    |
+     id-utils           |             []             [] []    []          |
+     indent             | []       [] [] [] []       [] []    [] []       |
+     iso_3166           |    []       [] []       [] [] []    []          |
+     iso_3166_1         |    []       [] []          [] []                |
+     iso_3166_2         |                                                 |
+     iso_3166_3         |                                                 |
+     iso_4217           | []          []    []       []       [] []       |
+     iso_639            |                                                 |
+     jpilot             |             []                         ()       |
+     jtag               |             []                                  |
+     jwhois             |             []             [] []    []          |
+     kbd                |             []                                  |
+     latrine            |             []                                  |
+     ld                 |             []                                  |
+     libc               |          [] []    []       []          [] []    |
+     libgpewidget       |             [] []          [] []                |
+     libiconv           | []       [] [] [] []    [] [] []    []          |
+     lifelines          |             ()                                  |
+     lilypond           |             []                                  |
+     lingoteach         |             []                []                |
+     lingoteach_lessons |                                                 |
+     lynx               | []                         []       [] []       |
+     m4                 |             []    []          []       []       |
+     mailutils          |                                                 |
+     make               |             []    [] [] []             [] []    |
+     man-db             |                                     () ()       |
+     minicom            |          [] []             []          []       |
+     mysecretdiary      |             []                []                |
+     nano               |             []    []          []    []          |
+     nano_1_0           |             []    []          []    []          |
+     opcodes            |             []                                  |
+     parted             |             []    []                   []       |
+     ptx                | []       [] [] [] []       [] []                |
+     python             |                                                 |
+     radius             |             []                                  |
+     recode             |             []    [] []    [] []    []          |
+     rpm                |             []                            []    |
+     screem             |                                                 |
+     scrollkeeper       |                            []                   |
+     sed                | []       [] [] [] []       [] []    [] []       |
+     sh-utils           | []       [] [] []          []       [] []       |
+     shared-mime-info   |          [] []             []                   |
+     sharutils          | []          []    []       []          []       |
+     silky              |          () []             ()       ()          |
+     skencil            |             []                                  |
+     sketch             |             []                                  |
+     soundtracker       |             []                      []          |
+     sp                 |             []                         ()       |
+     tar                | []       [] []    []    [] [] []    [] []       |
+     texinfo            |             []       [] []             []       |
+     textutils          |             [] [] []       []          [] []    |
+     tin                | []          ()                                  |
+     tp-robot           |             []                                  |
+     tuxpaint           |          [] []       []    [] [] [] [] [] []    |
+     unicode-han-tra... |                                                 |
+     unicode-transla... |             [] []                               |
+     util-linux         | []       [] []             []       () []       |
+     vorbis-tools       |             []                                  |
+     wastesedge         |             ()                                  |
+     wdiff              | []          [] [] []       [] []                |
+     wget               | []       [] []    []    [] []          []       |
+     xchat              | []       [] []                                  |
+     xfree86_xkb_xml    |             []             []                   |
+     xpad               |             [] []                               |
+                        +-------------------------------------------------+
+                          et eu fa fi fr ga gl he hr hu id is it ja ko lg
+                          22  2  1 26 106 28 24  8 10 41 33  1 26 33 12  0
      
-                       gl he hr hu id it ja ko lv nb nl nn
-                     +-------------------------------------+
-     a2ps            |                ()    ()       []    |
-     bash            |                                     |
-     bfd             |                   []                |
-     binutils        |                   []                |
-     bison           |                   []          []    |
-     clisp           |                               []    |
-     cpio            | []                   []       []    |
-     diffutils       | [] []             []                |
-     enscript        |                               []    |
-     error           |          []                         |
-     fetchmail       |                                     |
-     fileutils       |          []    [] []                |
-     findutils       | []          [] [] [] []       []    |
-     flex            |                      []             |
-     gas             |                                     |
-     gawk            |    []                               |
-     gcal            |                                     |
-     gcc             |                                     |
-     gettext         |                      []             |
-     gnupg           | []             [] []                |
-     gprof           |                                     |
-     grep            |                []                   |
-     hello           | [] []    []    [] [] [] [] [] [] [] |
-     id-utils        |                               []    |
-     indent          | []                []          []    |
-     jpilot          |                   ()          ()    |
-     jwhois          |                                     |
-     kbd             |                                     |
-     ld              |                                     |
-     libc            | []                [] []    []       |
-     lilypond        |                   []          []    |
-     lynx            |                   []          []    |
-     m4              | []          []    []          []    |
-     make            | []                [] []       []    |
-     mysecretdiary   |                                     |
-     nano            | []          [] [] ()       [] () [] |
-     nano_1_0        | []          [] [] ()       [] () [] |
-     opcodes         |                               []    |
-     parted          | []                []             [] |
-     ptx             | []          []             [] []    |
-     python          |                                     |
-     recode          | [] []          []                   |
-     sed             | [] []       [] [] [] []       []    |
-     sh-utils        | []             [] []       [] []    |
-     sharutils       | []                []          []    |
-     sketch          |                ()                   |
-     soundtracker    | []                                  |
-     sp              |                                     |
-     tar             |                [] []       []       |
-     texinfo         |    []             []                |
-     textutils       |                      []    []       |
-     util-linux      |                () []                |
-     vorbis-tools    |                                     |
-     wdiff           |                                     |
-     wget            | [] []    []       []          []    |
-                     +-------------------------------------+
-                       gl he hr hu id it ja ko lv nb nl nn
-                       19  7  0  4  6 11 22  9  1  8 19  4
+                          lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru
+                        +-----------------------------------------------------+
+     a2ps               |             []       []    ()     ()     []   [] [] |
+     aegis              |                      ()                       () () |
+     ant-phone          |                      []                       []    |
+     anubis             |             []    [] []           []          [] [] |
+     ap-utils           |                      []           ()          []    |
+     aspell             |                      []                             |
+     bash               |                                          []   [] [] |
+     batchelor          |                                               []    |
+     bfd                |                                               []    |
+     binutils           |                                                  [] |
+     bison              |             []       []                  []   [] [] |
+     bluez-pin          |                      []           []          []    |
+     clisp              |                                                     |
+     clisp              |                      []                             |
+     console-tools      |                                                  [] |
+     coreutils          |                                   []             [] |
+     cpio               |                      []           []     []   [] [] |
+     darkstat           |             []       []                  []   []    |
+     diffutils          |             []       []           []     []   [] [] |
+     e2fsprogs          |                                   []                |
+     enscript           |                      []                  []   [] [] |
+     error              |                      []                  []   []    |
+     fetchmail          |                      []           []     ()      [] |
+     fileutils          |                                   []          [] [] |
+     findutils          |                      []           []     []   [] [] |
+     flex               |                                   []     []   [] [] |
+     fslint             |                      []                       []    |
+     gas                |                                                     |
+     gawk               |                                   []     []   []    |
+     gbiff              |                      []                       []    |
+     gcal               |                                                     |
+     gcc                |                                                     |
+     gettext            |                                   []          [] [] |
+     gettext-examples   |                      []           []          []    |
+     gettext-runtime    |                      []           []          [] [] |
+     gettext-tools      |                                   []          []    |
+     gimp-print         |                      []                             |
+     gliv               |                      []                  []   []    |
+     glunarclock        |             []       []                       [] [] |
+     gnubiff            |                      []                             |
+     gnucash            |                      []              []  ()      [] |
+     gnucash-glossary   |                      []              []             |
+     gnupg              |                                               []    |
+     gpe-aerial         |                      []              []       [] [] |
+     gpe-beam           |                      []              []       [] [] |
+     gpe-calendar       |                      []              []       [] [] |
+     gpe-clock          |                      []              []       [] [] |
+     gpe-conf           |                      []              []       [] [] |
+     gpe-contacts       |                      []              []       [] [] |
+     gpe-edit           |                      []              []       [] [] |
+     gpe-go             |                      []                       [] [] |
+     gpe-login          |                      []              []       [] [] |
+     gpe-ownerinfo      |                      []              []       [] [] |
+     gpe-sketchbook     |                      []              []       [] [] |
+     gpe-su             |                      []              []       [] [] |
+     gpe-taskmanager    |                      []              []       [] [] |
+     gpe-timesheet      |                      []              []       [] [] |
+     gpe-today          |                      []              []       [] [] |
+     gpe-todo           |                      []              []       [] [] |
+     gphoto2            |                                               []    |
+     gprof              |                                          []   []    |
+     gpsdrive           |                      ()    ()                 []    |
+     gramadoir          |                      ()                       []    |
+     grep               |                                   [] []  []   [] [] |
+     gretl              |                                                     |
+     gtick              |                      []                       [] [] |
+     hello              |    []       []    [] [] [] []     []     []   [] [] |
+     id-utils           |                      []                  []   [] [] |
+     indent             |                      []                  []   [] [] |
+     iso_3166           |          []                [] []                    |
+     iso_3166_1         |                      []    []                       |
+     iso_3166_2         |                                                     |
+     iso_3166_3         |                      []                             |
+     iso_4217           |          []          [] [] []     [] []  []      [] |
+     iso_639            |          []                                         |
+     jpilot             |                      ()    ()                       |
+     jtag               |                                                     |
+     jwhois             |                      []           []     []   [] () |
+     kbd                |                      []           []          []    |
+     latrine            |                                               []    |
+     ld                 |                                                     |
+     libc               |                   []       []     []     []         |
+     libgpewidget       |                      []              []       []    |
+     libiconv           |                      []           []     []   [] [] |
+     lifelines          |                                                     |
+     lilypond           |                                                     |
+     lingoteach         |                                                     |
+     lingoteach_lessons |                                                     |
+     lynx               |                      []                  []      [] |
+     m4                 |                      []           []     []   [] [] |
+     mailutils          |                                   []          [] [] |
+     make               |                      []           []     []      [] |
+     man-db             |                                               []    |
+     minicom            |                                   []     []   [] [] |
+     mysecretdiary      |                      []                  []   []    |
+     nano               |             []       []           []          [] [] |
+     nano_1_0           |             []    []    []        []          [] [] |
+     opcodes            |                      []                       []    |
+     parted             |                         []        [] []  []         |
+     ptx                |                   [] []    []     [] []  []   [] [] |
+     python             |                                                     |
+     radius             |                                   []             [] |
+     recode             |                                   []     []   [] [] |
+     rpm                |                                   [] []          [] |
+     screem             |                                                     |
+     scrollkeeper       |                   [] []           []          [] [] |
+     sed                |                                   []     []   []    |
+     sh-utils           |                   []                             [] |
+     shared-mime-info   |                      [] []                          |
+     sharutils          |                      []                          [] |
+     silky              |                                                  () |
+     skencil            |                                      []  []         |
+     sketch             |                                      []  []         |
+     soundtracker       |                                                     |
+     sp                 |                                                     |
+     tar                |             []    []       []     []     []   []    |
+     texinfo            |                   []              []          [] [] |
+     textutils          |                   []                             [] |
+     tin                |                                                     |
+     tp-robot           |                      []                             |
+     tuxpaint           | []          []       [] []        [] []  []   []    |
+     unicode-han-tra... |                                                     |
+     unicode-transla... |                                                     |
+     util-linux         |                      []                  []      [] |
+     vorbis-tools       |                      []                       [] [] |
+     wastesedge         |                                                     |
+     wdiff              |             []                    []     []   [] [] |
+     wget               |                                   []          [] [] |
+     xchat              |    []                []                          [] |
+     xfree86_xkb_xml    |                      []                          [] |
+     xpad               |                      []                       []    |
+                        +-----------------------------------------------------+
+                          lt lv mk mn ms mt nb nl nn no nso pl pt pt_BR ro ru
+                           1  2  0  3 12  0 10 69  6  7  1  40 26  36   76 63
      
-                       no pl pt pt_BR ru sk sl sv tr uk zh_TW
-                     +----------------------------------------+
-     a2ps            | () () ()       []    [] [] ()          |  8
-     bash            |                                        |  4
-     bfd             |                         [] []          |  5
-     binutils        |                            []          |  4
-     bison           |                []       [] []          |  8
-     clisp           |                                        |  5
-     cpio            |    []     []   []       []             | 11
-     diffutils       |    []          []       [] []     []   | 14
-     enscript        |           []   []       []             |  6
-     error           |                   []       []     []   |  6
-     fetchmail       |    ()     ()               []          |  4
-     fileutils       |                []    [] [] []          | 12
-     findutils       |    []     []   [] [] [] [] []          | 18
-     flex            |                []       [] []          |  8
-     gas             |                            []          |  3
-     gawk            |                         [] []          |  5
-     gcal            |                         [] []          |  4
-     gcc             |                            []          |  3
-     gettext         |                   [] [] [] []          | 10
-     gnupg           |    []                   [] []          | 12
-     gprof           |                         [] []          |  4
-     grep            |                []    []    []          | 10
-     hello           | [] []          [] []    [] [] []       | 25
-     id-utils        |                []       []             |  6
-     indent          |                [] []    [] []          | 12
-     jpilot          | ()                      ()             |  3
-     jwhois          |                ()       () []          |  3
-     kbd             |                         [] []          |  4
-     ld              |                         [] []          |  4
-     libc            | [] []     []      []    [] []          | 17
-     lilypond        |                         []             |  5
-     lynx            |           []   []       []             |  9
-     m4              |    []          []       []             | 12
-     make            |    []     []   []          []          | 12
-     mysecretdiary   |                         [] []          |  4
-     nano            | () []          []       []    []       | 14
-     nano_1_0        | ()             []       []    []       | 13
-     opcodes         |                         [] []          |  6
-     parted          |       []  []            []             | 10
-     ptx             | [] [] []       []       [] []          | 15
-     python          |                                        |  0
-     recode          |    []          []    [] []             | 13
-     sed             |           []   [] [] [] [] []          | 21
-     sh-utils        | [] []     []   [] [] [] [] []     []   | 22
-     sharutils       |                []       []        []   | 12
-     sketch          |           []   ()                      |  3
-     soundtracker    |                         []             |  5
-     sp              |                                        |  0
-     tar             | [] []     []      [] [] [] []          | 16
-     texinfo         |                []       []        []   | 10
-     textutils       |                      [] [] []     []   | 11
-     util-linux      |           []            [] []          |  8
-     vorbis-tools    |                         []             |  1
-     wdiff           |                [] []    [] []          |  9
-     wget            |                [] [] [] [] [] []  []   | 20
-                     +----------------------------------------+
-       35 teams        no pl pt pt_BR ru sk sl sv tr uk zh_TW
-       55 domains       5 13  2  12   25 11 11 41 34  4   7    489
+                          sk sl sr sv ta th tr uk ven vi wa xh zh_CN zh_TW zu
+                        +-----------------------------------------------------+
+     a2ps               |    []    []       [] []                             | 16
+     aegis              |                                                     |  0
+     ant-phone          |                                                     |  3
+     anubis             |                   [] []                             |  9
+     ap-utils           |                      ()                             |  3
+     aspell             |                                                     |  4
+     bash               |                                                     |  9
+     batchelor          |                                                     |  3
+     bfd                |          []       []                                |  6
+     binutils           |          []       []                  []            |  8
+     bison              |          []       []                                | 14
+     bluez-pin          | []       []                    []                   | 14
+     clisp              |                                                     |  0
+     clisp              |                                                     |  5
+     console-tools      |                                                     |  3
+     coreutils          |    []    []       []                        []      | 16
+     cpio               |          []                           []            | 14
+     darkstat           | []    [] []                           ()    ()      | 12
+     diffutils          |          []       []                        []      | 23
+     e2fsprogs          |          []       []                                |  6
+     enscript           |          []       []                                | 12
+     error              | []                []                        []      | 15
+     fetchmail          | []                []                                | 11
+     fileutils          |    []    []       []                  []    []      | 17
+     findutils          | [] [] [] []       []                  []            | 29
+     flex               |          []       []                                | 13
+     fslint             |                                                     |  3
+     gas                |                   []                                |  3
+     gawk               |          []       []                                | 12
+     gbiff              |                                                     |  4
+     gcal               |          []       []                                |  4
+     gcc                |                   []                                |  4
+     gettext            | [] []    []       []                        []      | 16
+     gettext-examples   | []    [] []       []                  []            | 14
+     gettext-runtime    | [] [] [] []       [] []               []    []      | 22
+     gettext-tools      | [] [] [] []       []                  []            | 14
+     gimp-print         | []       []                                         | 10
+     gliv               |                                                     |  3
+     glunarclock        |       [] []                    []                   | 13
+     gnubiff            |                                                     |  3
+     gnucash            | []                                          []      |  9
+     gnucash-glossary   | []       []                                 []      |  8
+     gnupg              | []       []       []                        []      | 17
+     gpe-aerial         |          []                                         |  7
+     gpe-beam           |          []                                         |  8
+     gpe-calendar       | []       []                    []           []      | 13
+     gpe-clock          | []    [] []                                         | 10
+     gpe-conf           | []       []                                         |  9
+     gpe-contacts       | []       []                                 []      | 11
+     gpe-edit           | []    [] []                    []           []      | 12
+     gpe-go             |                                                     |  5
+     gpe-login          | []    [] []                    []           []      | 13
+     gpe-ownerinfo      | []    [] []                                 []      | 13
+     gpe-sketchbook     | []       []                                         |  9
+     gpe-su             | []    [] []                                         | 10
+     gpe-taskmanager    | []    [] []                                         | 10
+     gpe-timesheet      | []    [] []                                 []      | 12
+     gpe-today          | []    [] []                    []           []      | 13
+     gpe-todo           | []       []                    []           []      | 12
+     gphoto2            | []       []                           []            | 11
+     gprof              |          []       []                                |  9
+     gpsdrive           | []       []                                         |  3
+     gramadoir          | []                                                  |  5
+     grep               |    [] []          [] []                             | 26
+     gretl              |                                                     |  3
+     gtick              |                                                     |  7
+     hello              | []    [] []       [] []                             | 34
+     id-utils           |          []       []                                | 12
+     indent             | []    [] []       []                                | 21
+     iso_3166           | [] [] [] []       []    []     []                   | 27
+     iso_3166_1         | [] []             []                                | 16
+     iso_3166_2         |                                                     |  0
+     iso_3166_3         |                                                     |  2
+     iso_4217           | [] []    []       [] []               []            | 24
+     iso_639            |                                                     |  1
+     jpilot             |          []       []        []        []    []      |  9
+     jtag               | []                                                  |  2
+     jwhois             |          ()       []                        []      | 11
+     kbd                |          []       []                                | 11
+     latrine            |                                                     |  2
+     ld                 |          []       []                                |  5
+     libc               | []       []       []                  []            | 20
+     libgpewidget       | []    [] []                    []                   | 13
+     libiconv           | [] [] [] []       [] []        []     []            | 27
+     lifelines          |          []                                         |  2
+     lilypond           |          []                                         |  3
+     lingoteach         |                                                     |  2
+     lingoteach_lessons |                                       ()            |  0
+     lynx               |          []       [] []                             | 14
+     m4                 |          []                           []            | 15
+     mailutils          |                                                     |  5
+     make               |          []       []                  []            | 16
+     man-db             |          []                                         |  5
+     minicom            |                                                     | 11
+     mysecretdiary      |          []       []                                | 10
+     nano               |       [] []       [] []                             | 17
+     nano_1_0           |          []       [] []                             | 17
+     opcodes            |          []       []                                |  6
+     parted             |          []       []                  []            | 15
+     ptx                |          []       []                                | 22
+     python             |                                                     |  0
+     radius             |                                                     |  4
+     recode             |    []    []       []                                | 20
+     rpm                |          []       []                                |  9
+     screem             |          []                           []            |  2
+     scrollkeeper       | []    [] []                                         | 15
+     sed                | [] [] [] []       [] []                             | 24
+     sh-utils           |    []             []                                | 14
+     shared-mime-info   |       [] []                                         |  7
+     sharutils          |       [] []       []                        []      | 17
+     silky              | ()                                                  |  3
+     skencil            |          []                                         |  6
+     sketch             |          []                                         |  6
+     soundtracker       | []       []                                         |  7
+     sp                 |                   []                                |  3
+     tar                | [] []    []       []                  []            | 24
+     texinfo            |          []       []                  []            | 14
+     textutils          |    []    []       []                        []      | 16
+     tin                |                                                     |  1
+     tp-robot           |                                                     |  2
+     tuxpaint           | []       []       []           []     []            | 29
+     unicode-han-tra... |                                                     |  0
+     unicode-transla... |                                                     |  2
+     util-linux         |          []       []                                | 15
+     vorbis-tools       |                                                     |  8
+     wastesedge         |                                                     |  0
+     wdiff              | []       []       []                                | 18
+     wget               | [] [] [] []       [] []               []    []      | 24
+     xchat              | [] [] [] []                           []            | 15
+     xfree86_xkb_xml    | []    []          [] []               []            | 11
+     xpad               |                                                     |  5
+                        +-----------------------------------------------------+
+       63 teams           sk sl sr sv ta th tr uk ven vi wa xh zh_CN zh_TW zu
+      131 domains         47 19 28 83  0  0 59 13  1   1 11  0  22    22    0  1373
 
    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
@@ -370,7 +742,7 @@ 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
 distribution.
 
-   If March 2002 seems to be old, you may fetch a more recent copy of
+   If January 2004 seems to be old, you may fetch a more recent copy of
 this `ABOUT-NLS' file on most GNU archive sites.  The most up-to-date
 matrix with full percentage details can be found at
 `http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
@@ -378,7 +750,7 @@ matrix with full percentage details can be found at
 Using `gettext' in new packages
 ===============================
 
-   If you are writing a freely available program and want to
+If you are writing a freely available program and want to
 internationalize it you are welcome to use GNU `gettext' in your
 package.  Of course you have to respect the GNU Library General Public
 License which covers the use of the GNU `gettext' library.  This means
@@ -387,7 +759,7 @@ library, whereas only free software can use `libintl' as a static
 library or use modified versions of `libintl'.
 
    Once the sources are changed appropriately and the setup can handle
-to use of `gettext' the only thing missing are the translations.  The
+the use of `gettext' the only thing missing are the translations.  The
 Free Translation Project is also available for packages which are not
 developed inside the GNU project.  Therefore the information given above
 applies also for every other Free Software Project.  Contact
diff --git a/gnu/usr.bin/texinfo/AUTHORS b/gnu/usr.bin/texinfo/AUTHORS
index ead862aba0c..ccc36bade41 100644
--- a/gnu/usr.bin/texinfo/AUTHORS
+++ b/gnu/usr.bin/texinfo/AUTHORS
@@ -1,3 +1,31 @@
-Richard Stallman, Brian Fox, Bob Chassell, Noah Friedman, Paul Rubin,
-Karl Berry, Eli Zaretskii, and many others.
+$Id: AUTHORS,v 1.1.1.3 2006/07/17 16:03:13 espie Exp $
+Texinfo authors.
 
+  Copyright (C) 2003 Free Software Foundation, Inc.
+  
+  Copying and distribution of this file, with or without modification,
+  are permitted in any medium without royalty provided the copyright
+  notice and this notice are preserved.
+
+Akim Demaille		texi2dvi.
+Alper Ersoy		makeinfo: enhancements in all files, especially
+                          html-, xml-, and docbook-related.
+Andreas Schwab		texinfo.tex, configure.ac, most makeinfo files.
+Bob Chassell		texinfo.tex, original texinfo.txi.
+Brian Fox		all makeinfo/* and info/* files, info-stnd.texi.
+Dave Love		original makeinfo/html.[ch].
+Eli Zaretskii		all files.
+Karl Berry		all files.
+Karl Heinz Marbaise	original makeinfo language support, most files.
+Noah Friedman		original texi2dvi.
+Paul Rubin		original makeinfo/multi.c.
+Philippe Martin		original makeinfo xml/docbook output.
+Richard Stallman	original texinfo.tex, install-info.c,
+			texindex.c, texinfo.txi.
+Zack Weinberg		texinfo.tex: @macro implementation.
+
+See http://www.iro.umontreal.ca/contrib/po/HTML/team-LL.html for the
+translation teams for a given language LL.
+
+Many files included in the Texinfo distribution are copied from other
+locations, no author information is given for those.  See util/srclist*.
diff --git a/gnu/usr.bin/texinfo/ChangeLog b/gnu/usr.bin/texinfo/ChangeLog
index 75bd4894b35..7c53a091188 100644
--- a/gnu/usr.bin/texinfo/ChangeLog
+++ b/gnu/usr.bin/texinfo/ChangeLog
@@ -1,10810 +1,5003 @@
-2002-04-01    <karl@gnu.org>
+2004-12-31  Karl Berry  <karl@gnu.org>
 
-	* configure.ac: version 4.2.
-	* util/texi2dvi: 4.2
+	* Version 4.8.
 
-	* makeinfo/toc.c: doc fix.
-	* util/install-info-html:
-	* makeinfo/texinfo.xsl: Fixes From: Ville Skyttä
-		<ville.skytta@iki.fi>.
+2004-12-21  Karl Berry  <karl@gnu.org>
 
-	* makeinfo/insertion.c (begin_insertion): (copying case) omit
-		cm_insert_copying if no_headers.
-	Bug report from Stephen Gildea.
+	* pretest version 4.7.94.
 
-2002-03-28    <karl@gnu.org>
+	* makeinfo/xref.c: doc fix.
 
-	* configure.ac: pretest 4.1d.
+2004-12-20  Karl Berry  <karl@gnu.org>
 
-	* doc/texinfo.txi:
-	* makeinfo/cmds.c: ignore headings commands.  From Stephen Gildea.
+	* makeinfo/html.c (cm_node) <html>: need old-style names in the normal
+	(not no_headers) html case, too, of course.
+	(add_html_names): canon_white the new name, too.
 
-	* doc/texinfo.txi: @ifplaintext
+2004-12-19  Karl Berry  <karl@gnu.org>
 
-2002-03-26    <karl@gnu.org>
+	* pretest version 4.7.93.
 
-	* doc/texinfo.tex (\ifplaintext,\ifnotplaintext): new output
-		format conditional.
+	* automake 1.9.4.
 
-	* makeinfo/cmds.c (cm_settitle):
-	* makeinfo/node.c (cm_node): need to pass output filename arg to
-		* xml_begin_document.
+	* makeinfo/xml.c (try_docbook_image): new fn.
+	(xml_insert_docbook_image): call it, trying additional formats
+	pdf, svg, etc.
+	* makeinfo/makeinfo.c (cm_image): check for gif too.
+	http://www.gnu.org/philosophy/gif.html says:
+	"we can and will include support for displaying GIF files in GNU
+	 software."  Leaving it undocumented, though.
+	Based on patch from Jens Elkner, 18 Dec 2004 01:56:28 +0100.
 
-	* makeinfo/cmds.c (cm_sp): need close_single_paragraph instead of
-	close_paragraph to avoid an extra blank line.  Bug report from Stephen Gildea.
+2004-12-19  Torsten Bronger  <bronger@physik.rwth-aachen.de>
 
-	* doc/texinfo.tex (\doignore): can't do c kludge for
-		documentdescription.  Bug report from Stephen Gildea.
+	* util/texinfo.dtd: define most entities, add <neos>.
 
-	* doc/texinfo.txi: missing t in documentdescription example, from
-	Stephen Gildea.
+2004-12-17  Juan M. Guerrero  <st001906@hrz1.hrz.tu-darmstadt.de>
 
-2002-03-24    <karl@gnu.org>
+	* djgpp/config.bat: remove files like coXXXXXX.tmp created
+	in the top_srcdir by the gl_FUNC_MKSTEMP test.
 
-	* doc/texinfo.txi: invar sec
+2004-12-15  Karl Berry  <karl@gnu.org>
 
-2002-03-23    <karl@gnu.org>
+	* pretest version 4.7.92.
 
-	* configure.ac: pretest 4.1c.
+	* util/texinfo.dtd: merge with makeinfo/texinfo.dtd.
+	* makeinfo/texinfo.dtd, makeinfo/texinfo.xsl: remove.
 
-2002-03-23  Eli Zaretskii  <eliz@is.elta.co.il>
+2004-12-15  Stepan Kasal  <kasal@ucw.cz>
 
-	* info/search.c (skip_non_whitespace): Don't go beyond the
-	terminating null character.
+	* Makefile.am (EXTRA_DIST): Removed po/Makevars.template, sorry.
 
-	* info/filesys.c (filesys_read_info_file) 
-	(filesys_read_compressed): Null-terminate the contents of the file
-	we've read, so it could be used as a C string.
+2004-12-15  Juan M. Guerrero  <st001906@hrz1.hrz.tu-darmstadt.de>
 
-2002-03-23  Eli Zaretskii  <eliz@is.elta.co.il>
+	* djgpp/config.sed: adjust for new autoconf.
+	* makeinfo/node.c (enumerate_filename): make dos_file_names const
+	instead of static, since it may involve a fn call to pathconf.
 
-	* makeinfo/makeinfo.c (insert_toplevel_subdirectory): Fix
-	computation of output_filename's length, to avoid overrunning
-	malloc'ed buffer.  If mkdir returns with EEXIST, assume we can use
-	an existing directory only if the existing file is indeed a
-	directory.  On MS-DOS, allow for EACCES in addition to EEXIST.
-	<max_name_len>: Remove this variable.
+2004-12-15  Karl Berry  <karl@gnu.org>
 
-	* makeinfo/makeinfo.c (expansion): Protect execute_string from too
-	long strings.
-	(EXECUTE_STRING_MAX): New macro.
-	(execute_string): Use EXECUTE_STRING_MAX, not 4000.
+	* Makefile.am (EXTRA_DIST): include ChangeLog.46, README.dev,
+	and po/Makevars.template.  From Stepan.
 
-2002-03-23    <karl@gnu.org>
+2004-12-14  Karl Berry  <karl@gnu.org>
 
-	* doc/texinfo.txi:
-	* makeinfo/insertion.h:
-	* makeinfo/texinfo.dtd:
-	* makeinfo/xml.h:
-	* makeinfo/xml.c:
-	* makeinfo/makeinfo.h:
-	* makeinfo/insertion.c:
-	* makeinfo/html.c:
-	* makeinfo/cmds.c:
-	* doc/info-stnd.texi: @permissions -> @copying.
-	* doc/texinfo.tex: permissions -> copying.
-
-2002-03-22    <karl@gnu.org>
-
-	* configure.ac: pretest 4.1b.
-
-	* info/Makefile.am (BUILT_SOURCES): conditionalize on
-		TEXINFO_MAINT, to appease distcheck.
-
-	* From: Matthew Woodcraft <mattheww@chiark.greenend.org.uk>:
-	* makeinfo/makeinfo.h (next_menu_item_number): New global.
-	* makeinfo/insertion.c (begin_insertion): Initialise it.
-	* makeinfo/makeinfo.c (handle_menu_entry): Emit accesskey attribute
-	in html output, according to next_menu_item_number.
-	* makeinfo/node.c (cm_node): Emit accesskey attributes in html output.
-
-	* doc/texinfo.txi: GNU texts.
-
-	* doc/info-stnd.texi: @syncodeindex, not @synindex.
-
-2002-03-21    <karl@gnu.org>
-
-	* doc/texinfo.txi: @permissions.
-
-2002-03-20    <karl@gnu.org>
-
-	* doc/texinfo.txi: document --no-headers a bit better.
-	* makeinfo/makeinfo.c: better description of --no-headers,
-		suggested by Stephen Gildea.
-
-	* makeinfo/makeinfo.c (insert_toplevel_subdirectory): use
-		command-line specified output name unchanged.
-
-	* makeinfo/makeinfo.c (full_expansion): new routine, separated
-	from expansion, that does not tamper with the formatting parameters.
-	* makeinfo/insertion.c: copying -> permissions.
-	(cm_insert_permissions): insert rather than add.
-	* makeinfo/texinfo.dtd:
-	* makeinfo/xml.h:
-	* makeinfo/xml.c:
-	* makeinfo/cmds.c: copying -> permissions.
-	* makeinfo/makeinfo.h: copying -> permissions.
-	(full_expansion): declare.
-
-	* doc/texinfo.txi: @copying -> @permissions, @include fdl.texi.
-	* doc/info-stnd.texi: @copying -> @permissions, always include the FDL.
-
-	* makeinfo/html.c (html_output_head): copying -> permissions, use
-	insert_string.
-	* makeinfo/insertion.h: copying -> permissions.
-	* doc/texinfo.tex: \copying -> \permissions.
-
-	* doc/Makefile.am (EXTRA_DIST): include fdl.texi.
-
-2002-03-19    <karl@gnu.org>
-
-	* makeinfo/insertion.c (cm_insert_copying): use insert_string in
-		the xml case, sigh.
-
-	* doc/info-stnd.texi: copying
-
-	* dir-example: info standalone.
-
-	* makeinfo/html.c: copyright_text -> copying_text.
-	* makeinfo/texinfo.dtd:
-	* makeinfo/insertion.c:
-	* makeinfo/insertion.h:
-	* makeinfo/makeinfo.h:
-	* makeinfo/xml.c:
-	* makeinfo/xml.h:
-	* makeinfo/cmds.c: copyrighttext -> copying.
-	* doc/info-stnd.texi: copyrighttext -> copying.
-	* doc/texinfo.tex (\copying, \insertcopying): rename from
-		copyrighttext per rms.
-
-	* makeinfo/index.c (index_add_arg): don't emit warning for index
-	entries containing : after all.
-
-	* info/infokey.c: remove non-ansi trailing commas from last items
-	of enums.  From: Albert Chin-A-Young <china@thewrittenword.com>.
-
-2002-03-18    <karl@gnu.org>
-
-	* doc/info-stnd.texi: @include after @setfilename.
-	* doc/texinfo.txi: @insertcopyrighttext, @settitle GNU ...
-
-	* doc/texinfo.txi: mention @setfilename and source filename
-		exceptions at the top.
-
-	* makeinfo/defun.c (scan_group_in_string): handle escaped @{ and @}.
-	Bug report from Werner Lemberg.
-
-	* doc/info-stnd.texi: add version number to title a la Texinfo.
-	* doc/info-stnd.texi: file -> manual.
-	* doc/info-stnd.texi: use @copyrighttext.
-
-	* makeinfo/insertion.c (begin_insertion, end_insertion):
-			copyrighttext case.
-	* makeinfo/makeinfo.h (copyright_text): declare/define.
-	* makeinfo/html.c (html_output_head): output copyrighttext.
-	* makeinfo/texinfo.dtd: Add copyrighttext.
-	* makeinfo/xml.h (xml_element): add COPYRIGHTTEXT.
-	* makeinfo/xml.c (texinfoml_element_list, docbook_element_list):
-			copyrighttext case.
-
-2002-03-17    <karl@gnu.org>
-
-	* makeinfo/insertion.h (insertion_type): include copyrighttext.
-	* makeinfo/cmds.c (command_table): new command copyrighttext.
-
-	* doc/texinfo.tex (\copyrighttext, \insertcopyrighttext): new
-	 Texinfo commands to handle the copyright and permission text cleanly.
-	(\dblarrowbox,\longdblarrowbox,\pushcharbox,\equivbox,\bullbox):
-		remove these definitions that have not been used for ages.
-
-	* configure.ac: call AC_CANONICAL_BUILD before the termcap
-	checking.  Bug report from Eli.
-
-2002-03-16  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/node.c (cm_anchor): When recording the anchor position,
-	account for output_paragraph_offset, since the current paragraph
-	might not be closed yet (happens inside a menu, for example).
-
-	* djgpp/config.sed: Tweak to adapt to the new Automake/Autoconf.
-
-	* djgpp/README: Update.
-
-2002-03-15    <karl@gnu.org>
-
-	* dir-example: GNU organization.
-
-2002-03-14    <karl@gnu.org>
-
-	* makeinfo/cmds.c (cm_titlepage): do not declare nonexistent
-	function.
-
-2002-03-14    <karl@gnu.org>
-
-	* doc/texinfo.txi: don't say specifically html 3.2, since <html
-			lang=...> is not 3.2.
-	Bug reprt from: Matthew Woodcraft <mattheww@chiark.greenend.org.uk>.
-
-2002-03-13    <karl@gnu.org>
-
-	* doc/texinfo.tex (\writetocentry): set \pdfmakepagedesttrue here.
-	(\Etitlepage): instead of here.  In case the document has no
-		@titlepage.  Bug report from Stephen Gildea.
-
-	* util/texi2dvi: be verbose after the definition of cmd, not
-	before.  From Andreas Schwab.
-
-2002-03-12    <karl@gnu.org>
-
-	* pretest 4.1a.
-	* doc/info-stnd.texi: update to FDL.
-
-2002-03-11    <karl@gnu.org>
-
-	* util/texi2dvi:
-	* util/texindex.c:
-	* util/install-info.c:
-	* makeinfo/makeinfo.c:
-	* info/infokey.c:
-	* info/info.c: home page and help message.
-
-	* doc/texinfo.txi (math): document @\ (aka \\) for literal \.
-	regularize index entries.
-	* makeinfo/cmds.c (command_table): \\ -> insert_self.
-
-	* doc/texinfo.tex (\mathbackslash): new definition.
-	(\math): handle \\ too.
-	(\codeunder): handle @code{\} in mmode.
-
-	* makeinfo/html.c: make home page be gnu's.
-
-	* doc/texinfo.txi (Conventions): rewrite description of quotes so
-	as to work in all formats; there was no output for HTML.
-	Report from: David Merrill <david@lupercalia.net>.
-
-2002-03-10    <karl@gnu.org>
-
-	* doc/texinfo.txi (Texinfo Copying Conditions): mention this
-	manual's license specifically.
-
-2002-03-09  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* info/indices.c (add_index_to_index_nodenames): Fix an off-by-one
-	error when computing the number of the last index entry.
-
-2002-03-08    <karl@gnu.org>
-
-	* doc/texinfo.tex: Rewrite unnumbered toc handling to keep track
-	of their sequence, so they can be handled correctly in
-	the PDF toc (= bookmarks).
-	From: Werner LEMBERG <wl@gnu.org>.
-
-	* configure.ac: AC_MSG_WARN if can't find a term library.  From:
-	Marc.Herbert@ens-lyon.fr.
-
-	* info/info.c: alphabetize.
-	* info/info.c: include short option names.
-
-2002-03-08  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* info/display.c (display_update_one_window): Dynamically reallocate
-	printed_line[] as needed.  When under -R, ignore ANSI escapes for
-	the purposes of line wrap display.  Clear the line to EOL if it
-	used escape sequences.  Reallocate entry->text if the new
-	printed_line is longer than screenwidth.
-
-	* info/window.c (string_width): Don't count ANSI escape sequences
-	in string width, when under -R..
-	(calculate_line_starts): Don't count ANSI escape sequences in line
-	width, when under -R.
-	(window_get_cursor_column, window_chars_to_goal): When under -R,
-	ANSI escapes don't affect the horizontal position.
-
-	* info/info-utils.c (printed_representation): If -R is in effect,
-	treat ESC as a normal character.
-
-2002-03-08    <karl@gnu.org>
-
-	* util/Makefile.am:
-	* info/Makefile.am:
-	* makeinfo/Makefile.am:
-	* lib/Makefile.am: doc fix.
-
-	* doc/Makefile.am (install-tex): prefix the install directories
-	with $(DESTDIR), because that is what automake does for all
-	generated install rules.  The file pdfcolor.tex should be
-	installed as such (and not as epsf.tex).
-	From: Peter Breitenlohner <peb@mppmu.mpg.de>.
-
-	* configure.ac (AC_INIT): now pass [GNU Texinfo].
-	(AM_INIT_AUTOMAKE): now no args, for automake 1.6.
-
-2002-03-05    <karl@gnu.org>
-
-	* doc/texinfo.txi: history
-
-2002-03-04    <karl@gnu.org>
-
-	* configure.ac: version 4.1.
-	* util/texi2dvi: version.
-
-	* doc/texinfo.txi: @settitle is used in html output (from Eli),
-		various underfull hbox fixes.
-
-2002-03-02    <karl@gnu.org>
-
-	* configure.ac: pretest 4.0k
-
-	* info/info.c: declare add_file_to_directory to avoid warning.
-
-	* doc/info-stnd.texi: info standalone so as not to collide with
-		`standards' in dir.
-
-2002-03-01  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/insertion.c (end_insertion): Insert the /td and /tr
-	directives in lower case.  From Per Bothner <per@bothner.com>.
-
-	* makeinfo/macro.c (cm_alias): Ignore whitespace around the alias
-	name, like the manual promises.
-
-	* doc/texinfo.txi (Invoking Macros, Macro Details): Document that
-	commas in macro arguments don't work in TeX.  Advise texi2dvi -e
-	when macros don't work with TeX.
-
-	* doc/texinfo.txi (Node Line Requirements): Add restrictions about
-	parens and some punctuation characters in node names.
-	(Def Cmd Template): Document that macros are not expanded.
-
-	The following two changes allow to say "info foo" if there's an
-	Info file `foo' somewhere along INFOPATH.
-
-	* info/info.c (add_file_directory_to_path): New function, code
-	moved from `main'.
-	(main): Use add_file_directory_to_path.  
-
-	* info/session.c (info_follow_menus): If the first menu entry
-	couldn't be found as an item in DIR's menu, try it as a file name.
-
-	2001-06-19  Mark Montague  <markmont@umich.edu>
-
-	* info/filesys.c: Fix for sparc64 (offsets should be "long"s).
-
-	* info/session.c: Fix typos in function calls.
-
-	2001-08-23  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/footnote.c (cm_footnote): Don't allow footnotes inside
-	footnotes.
-	(output_pending_notes): Increment already_outputting_pending_notes
-	in the HTML case as well, to protect execute_string from
-	recursively entering output_pending_notes.
-
-2002-03-01    <karl@gnu.org>
-
-	* doc/texinfo.tex: fix mismatched $'s for sake of emacs font-lock.
-	From: Stephen Gildea <gildea@stop.mail-abuse.org>.
-
-2002-02-27    <karl@gnu.org>
-
-	* configure.ac: pretest 4.0j.
-
-	* info/infodoc.c: 1scroll-forward typo.
-
-2002-02-26    <karl@gnu.org>
-
-	* lib/system.h [! ENABLE_NLS]: let's not go const.
-
-2002-02-26  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* djgpp/config.sed: Add tweaking of file names in "install-info"
-	and "uninstall-info" targets.
-
-	* doc/inf-stnd.texi (Custom Key Bindings, Invoking infokey):
-          Add footnotes about DOS file names.
-
-	* info/infokey.c (main) [__MSDOS__]: If HOME is not defined,
-	default to the current directory.
-
-2002-02-26    <karl@gnu.org>
-
-	* lib/system.h (LC_MESSAGES) [! LC_MESSAGES]: need this after all.
-
-2002-02-25    <karl@gnu.org>
-
-	* doc/info-stnd.texi: contents at top, avoid overfull hbox.
-	* lib/Makefile.am (libtxi_a_sources): include gettext.h.
-
-	* lib/system.h (LC_MESSAGES): don't need conditional, Bruno says
-		that locale.h or libintl.h does so.
-
-	* configure.ac: pretest 4.0i.
-
-	* dir-example: infokey.
-	* doc/info-stnd.texi: invoking infokey.
-	* info/infokey.c (short_help): reorganize slightly.
-
-	* lib/system.h: use "gettext.h" instead of <libintl.h> per gettext
-	0.11 recommendation.
-
-2002-02-25  gettextize  <bug-gnu-gettext@gnu.org>
-
-	* Makefile.am (SUBDIRS): Add intl.
-	* configure.ac (AC_CONFIG_FILES): Add intl/Makefile.
-
-2002-02-25    <karl@gnu.org>
-
-	* util/Makefile.am (LDADD):
-	* makeinfo/Makefile.am (LDADD):
-	* info/Makefile.am (LDADD): @LIBINTL@ per gettextize.
-
-	* configure.ac: gettextize changes.
-	* Makefile.am: gettextize changes.
-
-2002-02-25  gettextize  <bug-gnu-gettext@gnu.org>
-
-	* Makefile.am (SUBDIRS): Add m4.
-	(SUBDIRS): Remove intl.
-	(ACLOCAL_AMFLAGS): New variable.
-	(EXTRA_DIST): Add config.rpath.
-	* configure.ac (AC_CONFIG_FILES): Add m4/Makefile.
-	(AC_CONFIG_FILES): Remove intl/Makefile.
-
-2002-02-23    <karl@gnu.org>
-
-	* pretest 4.0h.
-
-	* 2002-02-23  Eli Zaretskii  <eliz@is.elta.co.il>
-	* doc/info-stnd.texi (Invoking Info): Add a reference to the
-	description of index-apropos and index-search.  Document the
-	--raw-escapes option.
-	(Searching Commands): Describe index-search and index-apropos.
-
-	* info/man.c (clean_manpage): If raw_escapes_p is not set, remove
-	ANSI escape sequences from the man page.
-
-	* info/info.h: Declare raw_escapes_p.
-
-	* info/info.c: <raw_escapes_p>: New variable.
-	New option --raw-escapes or -R.
-	(main): Handle it.
-	(info_short_help): Document it.
-	(main): Honor --output together with --usage, by dumping the node
-	we found to the named file.
-
-	2002-02-23  Eli Zaretskii  <eliz@is.elta.co.il>
-	* makeinfo/html.c (nodename_to_filename): Call
-	nodename_to_filename_1 with the last argument 1, not 0.
-
-	* makeinfo/toc.c (shortcontents_update_html) 
-	(contents_update_html): Don't omit the entry for the Top node.
-
-	* 2002-01-30  Eli Zaretskii  <eliz@is.elta.co.il>
-	* makeinfo/node.c (cm_node): Don't condition splitting on
-	top_node_seen being non-zero.  If current_node is NULL, use the
-	current output file name to get at the file name for the previous
-	node.  Don't compute a new file name for a node if we didn't close
-	the current file.
-
-	2002-02-01  Eli Zaretskii  <eliz@is.elta.co.il>
-	* makeinfo/node.c (cm_node): Call html_output_head whenever we
-	create a new split-HTML file.
-
-	* makeinfo/html.c (html_output_head): Make html_title static.
-	Compute it only once, and don't free it.  Output the <h1> title
-	header only once per run.
-
-	2002-02-02  Eli Zaretskii  <eliz@is.elta.co.il>
-	* makeinfo/toc.c (contents_update_html): Fix the condition for
-	omitting duplicate TOC entries.  Fix comparison with the TOC entry
-	for "Top".
-
-2002-02-14    <karl@gnu.org>
-
-	* doc/Makefile.am (DISTCLEANFILES): use this variable instead of
-	the distclean-aminfo target, which apparently is no longer used.
-
-	* pretest 4.0g.
-
-	* doc/texinfo.tex (\appendixentry): new macro for typesetting
-	appendix toc entries.
-	(\appendixzzz, \summarycontents, \pdfoutlines): use it, instead of
-	usurping \chapentry.  This allows the bookmarks in the pdf output
-	to come out right.  Report from: Kurt Hornik
-	<Kurt.Hornik@ci.tuwien.ac.at>.
-
-2002-02-13    <karl@gnu.org>
-
-	* configure.ac: ALL_LINGUAS is deprecated as of gettext 0.11.
-	* doc/texinfo.tex (\image): remove spurious \loggingall.
-
-	* doc/texinfo.txi: @math now implies @tex.
-	* doc/texinfo.tex (\math): imply @tex.
-
-2002-02-11    <karl@gnu.org>
-
-	* makeinfo/insertion.c (handle_verbatim_environment): save and
-	restore filling_enabled and inhibit_paragraph_indentation.  Bug
-	report from: Alexandre Duret-Lutz <duret_g@lrde.epita.fr>.
-
-	* makeinfo/makeinfo.c (reader_loop): don't worry about bare braces
-	inside @math.
-
-2002-02-08    <karl@gnu.org>
-
-	* info/infodoc.c: keep underlines with the text they refer to, for
-		translation purposes.
-	Pointed out by Christian Rose <menthos@menthos.com>, 20 nov 2001.
-
-	* doc/info.texi: recommend setting INFOPATH.
-
-	* doc/Makefile.am (install-tex): need $(srcdir) for install.
-	From: istry <istry@mail.ru>.
-
-	* doc/texinfo.tex: replace $$$ delimiter with $.$, for sake of
-	font-lock in Emacs 21.1.  Suggestion from: Stephen Gildea
-	<gildea@stop.mail-abuse.org>.
-
-	2002-01-26  Eli Zaretskii  <eliz@is.elta.co.il>
-	* info/infomap.c (default_emacs_like_info_keys) 
-	(default_emacs_like_ea_keys, default_vi_like_info_keys) 
-	(default_vi_like_ea_keys): Fix default keybindings to be
-	consistent with non-INFOKEY branch.  Add bindings for Home, End,
-	and Delete keys.
-
-	2002-01-23  Eli Zaretskii  <eliz@is.elta.co.il>
-	* makeinfo/toc.h <TOC_ENTRY_ELT>: New member html_file.
-
-	* makeinfo/toc.c (toc_add_entry): Compute and set the html_file
-	member.
-	(shortcontents_update_html): Produce the toc_* links correctly,
-	without duplicating the link text.  Fix comparison with "Top".
-	Handle the case when there's @shortcontents, but no @contents.
-	(contents_update_html): Fix the way toc_* anchors are produced
-	from toc_entry_alist[i]->name: take only the node name from the
-	string in toc_entry_alist[i]->name.  Fix comparison with "Top".
-
-	* makeinfo/sectioning.c (sectioning_html): Take the toc_anchor
-	substring before closing the anchor with </a>.  Fix the closing
-	</hN> tag--add 2 to level, not 1.  Use sizeof instead of a magic
-	value of 9.
-
-	* makeinfo/cmds.c: Make @summarycontents call cm_shortcontents, as
-	promised by the docs.
-
-	2002-01-19  Eli Zaretskii  <eliz@is.elta.co.il>
-	* djgpp/config.sed: Fix a problem with AC_CONFIG_LINKS that
-	prevented building from a directory on another drive.
-
-	* djgpp/config.bat: Fix problems with long --srcdir diectory names.
-
-	* djgpp/README: Update.
-
-2002-01-31    <karl@gnu.org>
-
-	* doc/texinfo.txi: mention dvips
-
-2002-01-28    <karl@gnu.org>
-
-	* configure.ac (ALL_LINGUAS): add hr.
-
-2002-01-22    <karl@gnu.org>
-
-	* makeinfo/defun.c (defun.c): only warn about ( immediately
-        following a defun name, since the groff manual needs other
-        characters there where whitespace is incorrect.
-	Reported by Werner Lemberg <wl@gnu.org>.
-
-	* doc/info-stnd.texi: alphabetize variable list.
-
-	* doc/texinfo.txi: no :'s in index entries, index @page/@group
-	some more.
-
-	* makeinfo/index.c (index_add_arg): warn if index entry contains a
-	colon.  From: Kenneth Lorber <keni@his.com>.
-
-2002-01-21    <karl@gnu.org>
-
-	* makeinfo/insertion.c: </pre not /<pre, reported by Mike
-	Benefield <mike@duckbrain.com>.
-
-2002-01-18    <karl@gnu.org>
-
-	* configure.ac: pretest 4.0f.
-
-	* util/texindex.c:
-	* util/install-info.c:
-	* makeinfo/makeinfo.c:
-	* info/info.c: it's 2002.
-
-	* info/session.c: pass right args to info_scroll_half_screen_up.
-	From Eli.
-
-2002-01-18  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/multi.c (multitable_item): Always return a value.
-
-	* util/install-info.c (xmalloc, xrealloc, pfatal_with_name)
-	(open_possibly_compressed_file, parse_input): Call `fatal' with 3
-	arguments, to avoid compiler warnings.
-	(main): Call `fatal', `error', and `warning' with the right number
-	of arguments.
-
-	* makeinfo/makeinfo.c (main): Remove extraneous first arg of
-	usage().
-
-	* info/window.c (build_message_node): Supply a 4th argument to
-	build_message_buffer.
-
-
-2002-01-18  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/sectioning.c (sectioning_html): End the anchor properly
-	with a </a>.
-
-	* info/session.c (info_menu_or_ref_item): If we didn't find a
-	cross-reference on this line, try the one before.
-
-	* info/infomap.c (fetch_user_maps): Provide two different
-	translations for ``file too small'' and ``file too big'' error.
-
-	* info/info.c (info_short_help): Print the --speech-friendly
-	option together with the other options, not at the end of the help
-	screen.
-
-2002-01-18  Andreas Schwab  <schwab@suse.de>
-
-	* makeinfo/html.c (escape_string): When string is empty don't read
-	past end of it.
-
-2002-01-17    <karl@gnu.org>
-
-	* doc/info-stnd.texi: overfull box in table.
-
-2002-01-16    <karl@gnu.org>
-
-	* configure.ac: pretest 4.0e.
-
-	* doc/info.texi: update from emacs.
-
-2002-01-03  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/makeinfo.c (file_line_error): New function.
-
-	* makeinfo/insertion.c (discard_insertions): Call file_line_error
-	instead of changing global variables.
-
-	* makeinfo/sectioning.c (cm_top): Ditto.
-
-	* makeinfo/node.c (validate_file): Ditto.
-
-	* makeinfo/makeinfo.c (discard_braces, handle_variable_internal):
-	Ditto.
-
-	* makeinfo/macro.c (define_macro): Ditto.
-
-	2001-12-31  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/node.h (TAG_ENTRY): New struct member html_fname.
-
-	* makeinfo/node.c (find_node_by_fname): New function.
-	(remember_node): Accept an additional argument FNAME, the node's
-	file name, and record it in the list of nodes; callers changed.
-	(cm_node): Call find_node_by_fname to see if this node's file name
-	clashes with another node or anchor.  If it clashes with another
-	node, append the new node to the same file instead of erasing the
-	other node.  If it clashes with an anchor, print an error message
-	and overwrite the anchor's file.
-	(cm_anchor): If this anchor's file name clashes with another
-	anchor or node, print an error message and ignore the anchor.
-
-	* makeinfo/files.c (normalize_filename): New function.
-
-	* makeinfo/files.h <normalize_filename>: Add declaration.
-
-	* makeinfo/html.c (nodename_to_filename_1): Call
-	normalize_filename before returning the file name to the caller.
-	Disable the code which adds #Nodified-filename to the file name we
-	produce.
-
-	* makeinfo/makeinfo.c (add_char): Don't replace whitespace with
-	&nbsp; if we are producing an HTML directive.
-	(add_html_elt): New function.
-	(cm_xref, cm_inforef, cm_uref, cm_email, cm_image): Use
-	add_html_elt instead of add_word, where appropriate.
-
-	* makeinfo/html.c (add_link): Ditto.
-
-	* makeinfo/footnote.c (cm_footnote): Ditto. 
-
-	* makeinfo/defun.c (defun_internal): Ditto.
-
-	2001-12-27  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/node.c (cm_node): Don't omit links to (DIR) from the
-	navigation bar, add_anchor_name will DTRT now.
-
-	* makeinfo/makeinfo.c (cm_xref): Produce a split-HTML file name
-	from arg1, the node name, not from arg3 or arg2, which are the
-	reference name.  Use arg2 or arg3 for the text to be displayed as
-	a link between ">" and "</a>".  Use add_anchor_name instead of
-	add_nodename_to_filename.
-	(cm_inforef): Use add_anchor_name instead of
-	add_nodename_to_filename.  Handle the case of a missing second
-	argument in @inforef.
-
-	* makeinfo/html.c (add_anchor_name): Always add # and the anchor
-	name, even if we are splitting.  If the node is "(dir)", treat it
-	as if it were "dir".
-	(nodename_to_filename_1): Don't append #Top for the Top node.
-	(add_link): Don't punt if nodename is "(dir)".  Output "</a>"
-	after the link.
-
-	2001-12-25  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/makeinfo.c (cm_xref, cm_inforef): Output the target
-	file name via add_nodename_to_filename.
-
-	2001-12-20  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/html.c (nodename_to_filename_1): Make references to Top
-	to refer to index.html#Top.
-	(add_nodename_to_filename): Accept additional argument HREF;
-	callers changed.
-
-	* makeinfo/toc.c (rewrite_top): If the filename to rewrite is
-	stdout or the null device, do nothing.
-
-	* makeinfo/makeinfo.c (insert_toplevel_subdirectory): Use
-	FILENAME_CMP instead of strcmp.  Search for a period forward, not
-	backward.  Make index_name[] a static const array, and its len
-	computed at compile time.
-	(convert_from_loaded_file): If output_filename is the null device,
-	turn off HTML splitting.
-	(cm_xref): Use add_anchor_name, rather than add_escaped_anchor_name,
-	in the 5-argument case in HTML mode.
-	(cm_inforef): Fix external references in HTML mode.
-
-	* makeinfo/node.c (cm_node): Use FILENAME_CMP instead of strcmp.
-	Don't open a new file if the new node's name is empty.  Take the
-	directory part of split-HTML files from current_output_filename,
-	not from toplevel_output_filename (the latter doesn't include the
-	manual's subdirectory part).
-
-	* makeinfo/html.c (nodename_to_filename_1): Use FILENAME_CMPN
-	instead of strncmp.  Support *.inf files in references.
-
-2001-12-11  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* djgpp/config.bat, djgpp/config.sed, djgpp/config.site: Update
-	for Texinfo 4.0d.
-
-	* makeinfo/makeinfo.c (insert_toplevel_subdirectory): Use IS_SLASH
-	instead of literal `/'.
-	(convert_from_loaded_file): Flush the output stream before
-	creating the TOC.
+	* doc/texinfo.txi (inforef): try to explain possible uses more
+	thoroughly.
+	From: Luc Teirlinck, 13 Dec 2004 21:45:58 -0600.
 
+	* doc/texinfo.txi (pxref): more explanation.
+	* doc/info-stnd.texi (Basic Windows): put pxref in parens.
+	help-texinfo mail from adl, 13 Dec 2004 17:07:50 +0100.
 
-2002-01-14    <karl@gnu.org>
+2004-12-13  Andreas Schwab  <schwab@suse.de>
 
-	* info/info.c: translate --speech-friendly (from Eli).
-	* makeinfo/index.c: formatting.
+	* info/echo-area.c (DECLARE_INFO_COMMAND): Add intermediate cast
+	to avoid warning.
+	* info/infokey.c (compile): Likewise.
+	* info/session.c (forward_move_node_structure): Likewise.
+	(DECLARE_INFO_COMMAND): Likewise.
 
-	2001-12-24  Eli Zaretskii  <eliz@is.elta.co.il>
-	* info/infomap.c (initialize_info_keymaps): Bind the user-defined
-	keys on top of the default ones, not the other way around.
+	* makeinfo/makeinfo.c (init_paragraph): Don't use free_and_clear
+	to avoid strict aliasing issue.
 
-2002-01-11    <karl@gnu.org>
+	* makeinfo/cmds.c (cm_center): Avoid strict aliasing issue.
 
-	* info/info.c: can't do #ifdef inside of printf any more.
-	From: Tyler <tyler@zerodivide.cx>
+2004-12-13  Karl Berry  <karl@gnu.org>
 
-	* configure.ac (ALL_LINGUAS): add he, from Eli.
+	* doc/texinfo.txi (HTML Cross-reference Command Expansion): add
+	@euro{} -> U+20AC.  texinfo-pretest mail from Patrice,
+	12 Dec 2004 23:49:50 +0100.
 
-2002-01-09  Eli Zaretskii <eliz@is.elta.co.il>
+2004-12-12  Karl Berry  <karl@gnu.org>
 
-	* info/window.c (calculate_line_starts): Cast node->contents[i] to
- 	unsigned char.
+	* doc/texinfo.txi (makeinfo options): don't be so suggestive about
+	skipping xref validation.
+	emacs-devel mail from: Luc Teirlinck, 12 Dec 2004 13:02:11 -0600.
 
-2002-01-04    <karl@gnu.org>
+2004-12-08  Karl Berry  <karl@gnu.org>
 
-	* doc/texinfo.tex (\footnotezzz): \noindent=\relax.
+	* pretest version 4.7.91.
 
-2002-01-03    <karl@gnu.org>
+	* info/echo-area.c, info/infokey.c, info/session.c: omit useless
+	casts to intptr_t, since we're just casting to (void *) next.
+	intptr_t is not defined with gcc 3.04 on Tru64 Unix V5.1
+	(This whole vararg stuff needs to be redone correctly.)
+	Report from: Svend Tollak Munkejord (via te)
+        8 Dec 2004 17:15:17 +0100.	
 
-	* doc/texinfo.tex (\imagexxx): handle pdf and dvi cases the same.
-        (\dopdfimage): need \immediate to avoid seg fault when including the
-	same image twice.
-	Bug reports from Alexandre Duret-Lutz <duret_g@lrde.epita.fr>.
+	* doc/texinfo.txi (ref): rewrite last two redundant paragraphs.
 
-2001-12-31    <karl@gnu.org>
+2004-12-07  Karl Berry  <karl@gnu.org>
 
-	* makeinfo/makeinfo.c (cm_image): check *ext_arg as well as
-		ext_arg when computing length of fullname.
+	* doc/texinfo.txi (Macro Details): document @c kludge in macro
+	definitions to work around some newline problems.  (From Werner.)
 
-	* makeinfo/defun.c: docbook changes.
-	* makeinfo/docbook.c (docbook_punctuation): remove deprecated
-		default: at end of statement.
+2004-12-05  Karl Berry  <karl@gnu.org>
 
-	* makeinfo/docbook.c: initial.
-	* makeinfo/docbook.h: initial.
-	* makeinfo/Makefile.am (makeinfo_SOURCES): add docbook.[ch].
-	* makeinfo/makeinfo.c (add_char): use &nbsp; in docbook case.
-
-	* doc/texinfo.tex (\footnotezzz): use \everypar={\hang} instead of
-	just \hang in case a footnote extends for multiple paragraphs.
-
-2001-12-18    <karl@gnu.org>
-
-	* info/Makefile.am (BUILT_SOURCES): include $(EXEEXT) on makedoc
-	dependency since automake doesn't do it.
-
-	2001-12-11  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* djgpp/config.bat, djgpp/config.sed, djgpp/config.site: Update
-	for Texinfo 4.0d.
-
-	* info/infomap.c (fetch_user_maps): Initialize `filename' to NULL
-	and don't try to call `open' if `filename' is NULL.
-	[__MSDOS__]: Try the current directory if neither $INFOKEY nor
-	$HOME are defined.
-
-	* makeinfo/makeinfo.c (insert_toplevel_subdirectory): Use IS_SLASH
-	instead of literal `/'.
-	(convert_from_loaded_file): Flush the output stream before
-	creating the TOC.
-
-	2001-12-10  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* info/infokey.c (main): Use FOPEN_WBIN instead of "w".
-
-	* info/infokey.h (INFOKEY_SRCFILE, INFOKEY_FILE) [__MSDOS__]:
-	Special definitions for MS-DOS.
-
-	2001-12-09  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* lib/system.h: Condition inclusion of libintl.h on ENABLE_NLS.
-	(gettext, bindtextdomain, textdomain) [!ENABLE_NLS]: Provide
-	trivial definitions for when NLS is not used.
-	(LC_MESSAGES) [!ENABLE_NLS]: Define if undefined by locale.h.
-
-2001-12-18  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* info/infomap.c (decode_keys): Change the return type to int;
-	callers changed.  Return zero if some of the special keys in SRC
-	are not defined by the terminal; return non-zero otherwise.
-	(section_to_keymaps): If decode_keys returns zero, don't bind the
-	key sequence.
-
-2001-12-18  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/xml.c (xml_insert_element_with_attribute) 
-	(xml_insert_element): Rename the argument `element' to `elt'.
-
-	* info/infokey.c (compile): Use \033 instead of (non-standard) \e.
-
-2001-12-17    <karl@gnu.org>
-
-	2001-12-16  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* info/pcterm.c (pc_initialize_terminal) [INFOKEY]: Store term_kh,
-	term_ke, term_ki, and term_kx sequences.
-	(DJGPP_keytab): Map Home, End, and Insert to escape sequences, not
-	to C-a, C-e, etc.
-
-	* info/infomap.c (default_emacs_like_info_keys) 
-	(default_emacs_like_ea_keys, default_vi_like_info_keys) 
-	(default_vi_like_ea_keys): Add the leading suppress-default flag,
-	to be consistent with the table which comes from a file.
-
-	* info/session.c (info_do_lowercase_version): Add a doc string.
-
-	* info/infodoc.c (describe_key) [INFOKEY]: If keystroke is bound
-	to do-lowercase-version, but its lower-case variant is undefined,
-	say that keystroke is also undefined.
-
-
-2001-12-12    <karl@gnu.org>
-
-	* makeinfo/files.c (find_and_load): remove conditionals on
-		 VMS|O_BINARY, always just read as many bytes as we can.
-
-        2001-12-11  Eli Zaretskii  <eliz@is.elta.co.il>
-        * new files for djgpp/.
-
-        2001-09-09  Eli Zaretskii  <eliz@is.elta.co.il>
-	* info/echo-area.c (build_completions): Look for a candidate
-	completion which matches user's request including the letter-case,
-	use that as the value of LCD_completion.
-
-        2001-12-06  Eli Zaretskii  <eliz@is.elta.co.il>
-	* info/echo-area.c (build_completions): When looking for the best
-	completion candidate, only compare as much characters as the user
-	typed.
-
-
-2001-12-04    <karl@gnu.org>
-
-	* doc/texinfo.tex (\pdfmkpgn): remove trailing @ in link names
-		again.  Also from Kurt.
-
-	* doc/texinfo.tex (\image): need five commas to ignore additional
-	optional args to @image.  From Kurt.Hornik@ci.tuwien.ac.at.
-
-	* doc/texinfo.tex (\afourlatex): reset \globaldefs=0 explicitly.
-	From Trond Endrestøl <trond@ramstind.gtf.ol.no>.
-
-2001-12-01    <karl@gnu.org>
-
-	* makeinfo/files.c (find_and_load): remove O_BINARY from open
-	call, this messes up under Windows.  From eli.
-
-2001-11-20    <karl@gnu.org>
-
-	* makeinfo/makeinfo.c (cm_image): reword error messages.
-
-2001-11-19    <karl@gnu.org>
-
-	* Pretest 4.0d.
-	* doc/texinfo.txi: index ragged right/left.
-
-	* info/window.c (build_message_buffer): handle %1$s as used in
-	ja.po.  From Fumitoshi UKAI <ukai@debian.or.jp>.
-
-	* configure.ac (ALL_LINGUAS): add sv.
-
-2001-11-16    <karl@gnu.org>
-
-	* Makefile.am (EXTRA_DIST): add COPYING.DOC.
-
-        1999-10-30  Andrew Bettison  <andrewb@zip.com.au>
-
-	All these changes are to implement user-configurable key mapping
-	using the new 'infokey' program.  For the time being, the new
-	code is conditional on [INFOKEY] and the old code is still there
-	in case we want to revert.
-
-	* info/session.c (incremental_search): test for printable chars
-	_before_ isearch command keys -- makes a difference if the
-	isearch commands are bound to printable chars.
-
-	* info/doc.h,
-	* info/infodoc.c,
-	* info/infomap.c,
-	* info/m-x.c,
-	* info/session.c: New typedef InfoCommand, plus a bunch of
-	supporting macros, to abstract a "command" away from being a
-	function pointer.
-
-	* info/doc.h (pretty_keyseq),
-	* info/infodoc.c (pretty_keyseq),
-	* info/session.c (pretty_keyseq): Moved definition from
-	session.c into infodoc.c, and rewrote to recognise special
-	terminal sequences (PgUp, PgDn, etc.).
-
-	* info/infodoc.c (create_internal_info_help_node,
-	replace_in_documentation, info_where_is),
-	* info/m-x.c (info_execute_command): Cleaned up references to
-	hardwired keystrokes.
-
-	* info/infodoc.c (replace_in_documentation):
-	Extended the \\[foo] syntax to recognise \\%-X.Y[foo], which
-	causes the replacement text to be inserted using sprintf("%-X.Ys").
-
-	* info/session.c (_scroll_forward, _scroll_backward,
-	scroll_forward_page_only, scroll_backward_page_only,
-	scroll_forward_page_only_set_window,
-	scroll_backward_page_only_set_window): New functions, eliminating
-	need for SPC and DEL hack.
-
-	* info/session.c (scroll_forward, scroll_backward,
-	scroll_forward_set_window, scroll_backward_set_window): Call
-	_scroll_forward and _scroll_backward to do all the work.
-
-	* info/infomap.c (initialize_info_keymaps)[!INFOKEY]: set 'v'
-	and Control('v') key bindings to info_scroll_backward_page_only
-	and info_scroll_forward_page_only respectively.
-
-	* info/Makefile.am (bin_PROGRAMS): Added new executable `infokey'.
-	(infokey_SOURCES): Defined.
-	(EXTRA_DIST): Added `sample_infokey'.
-	(BUILT_SOURCES): Added `key.c'.
-
-	* info/infokey.h,
-	* info/infokey.c: Created, for new program `infokey' which
-	creates a $HOME/.info file by compiling a text source file with
-	syntax very similar to that used by `lesskey' in less 3.4.0.
-
-	* info/makedoc.c: Generate new file `key.c' defining an array to
-	map command names to codes.
-
-	* info/key.h: Created, to define contents of new `key.c' now
-	created by makedoc.
-
-	* info/info.h (INFOKEY): Define, to enable all following changes.
-	(set_variable_to_value)[INFOKEY]: Declare new function.
-
-	* info/makedoc.c [INFOKEY]: Write '#define A_' numeric command
-	code definitions into `funs.h' to support new key binding system.
-
-	* info/session.c (info_dispatch_on_key, info_numeric_arg_digit_loop)
-	[INFOKEY],
-	* info/infomap.c [INFOKEY],
-	* info/infodoc.c (function_documentation, function_name,
-	describe_key, pretty_keyname, pretty_keyseq_internal,
-	where_is_internal)[INFOKEY],
-	* info/terminal.h (term_kh, term_ke, term_kx, term_ki)[INFOKEY],
-	* info/terminal.c (term_kh, term_ke, term_kx, term_ki,
-	terminal_initialize_terminal)[INFOKEY],
-	* info/variables.c (set_variable_to_value)[INFOKEY],
-	* info/sample_infokey: Added infokey functionality, copied more
-	or less wholesale from 'lesskey' in GNU Less 3.4.0.  Added a new
-	typedef struct FUNCTION_KEYSEQ, and a new element `keys' to
-	typedef struct FUNCTION_DOC, to give the user some control over
-	the keystrokes that appear in the documentation node generated
-	by get-help-window, and to improve efficiency a little.
-
-	* info/infodoc.c (info_internal_help_text,
-	create_internal_info_help_node)[INFOKEY]: Rewrote all code that
-	assumes fixed keystrokes, replacing %10s sequences with \\%10[foo]
-	sequences instead.
-
-	* doc/info-stnd.texi: Documented above changes.
-
-2001-09-19    <karl@gnu.org>
-
-	* makeinfo/cmds.c: </ not /<, duh :).  From janneke.
-
-2001-09-12    <karl@gnu.org>
-
-	* configure.ac (AC_SYS_POSIX_TERMIOS, AC_HEADER_TIOCGWINSZ): use
-	 these new autoconf macros instead of the old automake ones.
-
-	* info/terminal.c: remove unconditional include of sys/ioctl.h.
-	* info/termdep.h: <sys/ioctl.h> [GWINSZ_IN_SYS_IOCTL]: include outside of HAVE_TERMIOS_H,
-	per autoconf manual.
-
-	* doc/Makefile.am (install-info-am): remove override of automake's
-	 target, instead enable looking in . for info files within automake.
-
-	* doc/info-stnd.texi: include separate version-stnd.texi
-	* configure.ac: autoconf 2.52, and rename to configure.ac.
-
-2001-09-11    <karl@gnu.org>
-
-	* doc/texinfo.txi: recommend against using - and _ in @set names,
-		* and rearrange that section.
-
-	* info/infodoc.c (replace_in_documentation): free fun_name to fix
-		memory leak.
-	From: "Art Haas" <ahaas@neosoft.com>, Sat, 4 Aug 2001 08:34:31 -0500.
-
-	* makeinfo/lang.c: encoding support for info output from kama.
-	* makeinfo/lang.h: encoding support for info output from kama.
-
-	* makeinfo/html.c: include document encoding code unless
-	no_encoding.
-	* makeinfo/insertion.c (cm_direntry): don't call begin_insertion
-	if ignoring.
-	(cm_documentdescription): moved here, and likewise.
-	(begin_insertion): don't need output format conditionals here.
-
-	* makeinfo/cmds.c (cm_documentdescription): move to insertion.c.
-	* makeinfo/makeinfo.h (enable_encoding): new global.
-	* makeinfo/makeinfo.c: new option --enable-encoding, rearrange help.
-
-	Sun Oct 31 18:44:24 UTC 1999 Karl Heinz Marbaise <kama@hippo.fido.de>
-
-	    - lang.{c,h}:
-	      o added translation map between HTML markups and 8-Bit
-		(ISO-8859-1 codes; supplemental is Unicode for the future).
-	      o added cm_search_iso_map:
-		search for characters based on HTML markup names for
-		translation 8-Bit code.
-	      o recognizing of @documentencoding improved.
-		now we can recognize things like ISO-8859-{1...15}
-
-	    - makeinfo.{c,h}:
-	      o added two command line switches.
-		+ info-encoding to activate the encoding for info output
-		  which is correctly shown by info. Default is NOT to
-		  encode the output to be compatible with earlier versions.
-		+ no-encoding to suppress encoding e.g. while producing
-		  ASCII output (--no-headers) results in that you get
-		  "A for &Auml; as before.
-	      o help output changed to document the switches.
-
-	    - html.c:
-	      charset encoding in html based on @documentencoding.
-
-
-2001-07-31    <karl@gnu.org>
-
-	* doc/texinfo.txi: mention pdfcolor.tex.
-	* doc/texinfo.tex: doc.
-	* doc/Makefile.am (install-tex): install pdfcolor.tex too.
-	* doc/pdfcolor.tex: new file, since Kurt.Hornik@ci.tuwien.ac.at
-		reports that not all pdftex installations include it.
-
-2001-07-25    <karl@gnu.org>
-
-	* doc/texinfo.tex (\Etitlepage): need \HEADINGSon before the
-	\...aftertitlepage checks to get page numbers. Report from
-	3diff@gnu.org.
-
-2001-07-06    <karl@gnu.org>
-
-	* doc/texinfo.txi: mention http://docbook2X.sourceforge.net/.
-
-2001-06-29    <karl@gnu.org>
-
-	* makeinfo/makeinfo.c: make output to stdout imply --no-split for
-		HTML, too.
-
-	* makeinfo/html.c (html_output_head): use documentdescription if set.
-	* makeinfo/insertion.h (insertion_type): new case documentdescription.
-	* makeinfo/insertion.c (begin_insertion, end_insertion,
-	insertion_type_names): new case for documentdescription.
-	* makeinfo/cmds.c (cm_documentdescription): new fn.
-	* makeinfo/makeinfo.h (document_description): new global.
-	* doc/texinfo.txi: @documentdescription.
-	@documentdescription implementation from patches by Will Estes.
-
-2001-06-26    <karl@gnu.org>
-
-	* doc/texinfo.txi: documentdescription
-	* doc/texinfo.tex: Ignore @documentdescription ... @end
-	documentdescription.
-
-	* doc/texinfo.txi: document sequential punctuation in @footnote is
-	normal, suggested by rms.
-
-2001-06-21    <karl@gnu.org>
-
-	* doc/texinfo.tex (\textfonts): call \setleading here, so that we can
-	switch font sizes back and forth inside @tex with \globaldefs=1
-	and not lose the leading.
-
-	* doc/texinfo.txi: allow @smallbook to run without overfull or
-		underfull boxes.
-
-2001-06-19    <karl@gnu.org>
-
-	* doc/texinfo.tex (\imagexxx): ignore new optional args to @image.
-
-	* makeinfo/html.c (html_output_head): include <h1>title</h1> at
-	beginning of document.
-	* makeinfo/sectioning.c (cm_top): don't include explicit links in
-	HTML output, the regular code for @node will do it.
-	(sectioning_html): use <h2> for chapter instead of <h1>, etc.
-	* makeinfo/node.c (cm_node): do not include code to output the
-	HTML <head>, we do that elsewhere now.
+	* makeinfo/html.c (add_escaped_anchor_name): prefix g_t if the
+	nodename begins with a nonletter.  Ugh.
+	* doc/texinfo.txi (HTML Xref Node Name Expansion): document this.
+	http://ff0.org/pipermail/texinfo-pretest/2004-December/000210.html
 	
-	1999-11-26 W. L. Estes <will@fumblers.org>
-	* makeinfo/insertion.c (begin_insertion): add an explicit <br>
-	before beginning a <pre> block. for flushleft and flushright, use
-	<div> tag with an align attribute set.
-	* makeinfo/insertion.c (end_insertion): for flushleft and
-	flushright, end the </div> block.
+	* doc/texinfo.txi (HTML Xref 8-bit Character Expansion): define
+	behavior for Unicode code points above 0xfff.
 
-	* makeinfo/makeinfo.c (cm_image): new variable, alt_arg now allows
-	user-supplied alt attribute value and
-	ext_arg allows user-supplied extension for image files.
+	* makeinfo/makeinfo.c (reader_loop): <wbr> didn't make it into
+	HTML 4, remove it.  Sigh.
+	texinfo-pretest mail from wl, 05 Dec 2004 23:39:05 +0100.
 
-	* makeinfo/toc.c (contents_update_html): add anchors at chapter
-	level entries
-	(shortcontents_update_html): hrefs in shortcontents point to the
-	above anchors in the detailed contents
+2004-12-02  Karl Berry  <karl@gnu.org>
 
-	* doc/texinfo.txi: document changes to @image and the new behavior
-	of shortcontents entries
+	* configure.ac (install-warnings): simplify default case.  From te.
 
-2001-06-14    <karl@gnu.org>
+2004-12-01  Karl Berry  <karl@gnu.org>
 
-	* makeinfo/node.c: no need for size_t.
+	* pretest version 4.7.90.
 
-2001-06-13    <karl@gnu.org>
+	* util/texi2dvi (recode): new option, off by default.
+	Unconditionally calling recode seems problematic, when there
+	hasn't been a release for years and its Texinfo support is less than
+	perfect.
 
-	* texinfo.tex (\pdfmkdest): \normalturnoffactive, so refs and 
-	defs match.
-	(\xrefX): pdf link defs no longer use @, so link refs shouldn't use @
-	either. (All xrefs in pdf were failing.)
-	(\mkpgn): remove redundant second definition.
+2004-11-30  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (\smallerfonts): new font size.
-	(\smallexample, et al.): use it, in all cases, not just @smallbook.
+	* doc/texinfo.txi (Quotations and Examples): @quotation does not
+	reduce interparagraph spacing.
 	
-	1999-11-30 Andreas Schwab <schwab@suse.de>
-	* doc/texinfo.tex (\xrefX): Turn off active characters when writing
-	out the link name for pdf.
-
-2001-06-13    <karl@gnu.org>
-
-	* doc/texinfo.txi: document that @smallexample is smaller in all
-		page formats now.
-
-2001-06-11    <karl@gnu.org>
-
-	* 4.0c.
-	* util/Makefile.am: Don't need automake patch any more, with
-		automake 1.4p4.
-
-	* configure.in (AC_FUNC_SETVBUF_REVERSED): only needed on
-	pre-sysvr3 systems that nobody has anymore?  Or so Russ Allbery
-	informs me ...
-
-2001-06-08    <karl@gnu.org>
-
-	* makeinfo/Makefile.am (EXTRA_DIST): include texinfo.{dtd,xsl}.
-
-	* util/Makefile.am: automake-1.4p3 now.
-
-2001-06-07    <karl@gnu.org>
-
-	* util/texi2dvi: comment out conditional text, from Werner LEMBERG
-	       <wl@gnu.org>.
-
-       2001-06-02  Eli Zaretskii  <eliz@is.elta.co.il>
-	* info/echo-area.c (info_read_completing_internal): If there are
-	no completions, say that instead of "Not complete".
-
-	* configure.in (ALL_LINGUAS): add da
-
-	* makeinfo/Makefile.am (pkgdata_DATA): include texinfo.xsl.
-
-	* configure.in: update for autoconf 2.50.
-
-2001-06-04    <karl@gnu.org>
-
-	* util/Makefile.am (EXTRA_DIST): automake-14p2.patch now.
-	* util/automake-14p2.patch: rename from 14p1.
-
-2001-05-22    <karl@gnu.org>
-
-	* changes from feloy for lowercase xml names, etc.
-
-2001-05-21    <karl@gnu.org>
-
-	* util/Makefile.am (EXTRA_DIST): add automake-14p1.patch.
-	* makeinfo/Makefile.am (pkgdata_DATA): define to install
-	        texinfo.dtd.
-
-        2001-05-17  Eli Zaretskii  <eliz@is.elta.co.il>
-	* makeinfo/makeinfo.c (cm_xref, cm_inforef): Don't allow empty
-	first arguments in cross references.
-
-	* makeinfo/makeinfo.c: redo --help, basic patch from ke@suse.de.
-
-2001-05-03    <karl@gnu.org>
-
-	* doc/info.texi: move help-cross to be subnode of cross-refs,
-	instead dangling out in space.
-	* doc/info.texi: update from eli
-
-2001-05-02    <karl@gnu.org>
-
-	* makeinfo/xml.c (xml_push_current_element): need to select the
-		`name' member.
-
-2001-05-01    <karl@gnu.org>
-
-	* configure.in: 4.0b
-
-	* doc/info.texi (Help-Cross): subsection of Cross-refs.
-
-	* lib/system.h (va_alist, etc.): moved from makeinfo.c.
-	* makeinfo/makeinfo.c (va_alist, etc.): move to system.h
-
-	* makeinfo/xml.[ch]: new files from Philippe Martin <feloy@free.fr>.
-	* pretty much all files also modified for XML/DocBook output.
-	* doc/texinfo.txi: minimally mention --xml and --docbook.
-	* makeinfo/xml.c: convert to K&R until we can do ansi2knr.
-
-	* util/texindex.c,
-	* util/install-info.c,
-	* info/info.c: it's 2001.
-
-2001-04-15    <karl@gnu.org>
-
-	* doc/info.texi: major update from eli.
-
-2001-04-13    <karl@gnu.org>
-
-        1999-10-16  Eli Zaretskii  <eliz@is.elta.co.il>
-	* makeinfo/node.c (cm_node): Don't generate cross-references to
-	"(DIR)".
-	* makeinfo/html.c (add_link): Likewise.
-
-        1999-10-16  Eli Zaretskii  <eliz@is.elta.co.il>
-	* makeinfo/makeinfo.c (insert): Don't call html_output_head here.
-	(add_char): Call html_output_head here...
-	* makeinfo/cmds.c (cm_sp): ...and here...
-	* makeinfo/toc.c (cm_contents, cm_shortcontents): ...and here...
-	* makeinfo/node.c (cm_anchor): ...and here.
-	
-	* makeinfo/html.c (html_output_head): `free' html_title if
-	expanded.  Make <head> and <body> stand out.
-
-2001-04-12    <karl@gnu.org>
-
-	1999-12-26  Eli Zaretskii  <eliz@is.elta.co.il>
-	* makeinfo/defun.c (defun_internal): Use execute_string instead
-	add_word_args to expand defined_name, type_name and category (in
-	HTML mode).
-
-2001-03-29    <karl@gnu.org>
-
-	* Makefile.am: simple license.
-
-2001-02-27    <karl@gnu.org>
-
-	1999-12-17  Yoshiki Hayashi  <t90553@mail.ecc.u-tokyo.ac.jp>
-		* info/terminal.h, info/terminal.c (term_kh, term_ke, term_kD):
-		New variables to hold Home, End, Delete key sequences.
-		* info/infomap.c (initialize_emacs_like_keymaps,
-		initialize_vi_like_keymaps): Set them.
-
-	* makeinfo/makeinfo.h,
-	* makeinfo/makeinfo.c: --split-size option from Yoshiki:
-	1999-12-09  Yoshiki Hayashi  <t90553@mail.ecc.u-tokyo.ac.jp>
-		* makeinfo/makeinfo.h (split_size): New option.
-		* makeinfo/makeinfo.c (long_options): Add split_size.
-		(usage): Ditto.	Suggested by Richard Y. Kim.
-
-	* util/texi2dvi: -o support from Akim.
-
-2001-02-02    <karl@gnu.org>
-
-	* dir-example: don't need zsh twice.
-
-	From: Nishio Futoshi <fut_nis@d3.dion.ne.jp>, 02 Apr 2000.
-	* doc/texinfo.txi: capitalization fixes.
-	* doc/info.texi: up pointer fixes.
-	* doc/texinfo.txi: installing an info file.
-
-	* makeinfo/makeinfo.c: --output is for split html, not non-split.
-	From: Karl Eichwalder <keichwa@gmx.net>
-
-2001-01-12    <karl@gnu.org>
-
-	1999-10-15  Eli Zaretskii  <eliz@is.elta.co.il>
-		* makeinfo/cmds.c (cm_sc): Don't print the warning about
-		all-uppercase argument in menus under --no-headers.
-
-	* makeinfo/files.c: pass O_BINARY flag to open, suggested by bfox.
-
-2001-01-11    <karl@gnu.org>
-
-	* info/terminal.c [HAVE_TERMIOS_H && TCOON]: tcflow TCOOFF/TCCON
-	to resume output if user presses CTRL-S at the beginning of
-	things.
-	[HAVE_TERMIO_H && TCXONC]: ditto.
-	From Kevin Ryde <user42@zip.com.au>, 16jun2000;
-	cf. emacs/src/sysdep.c.
-
-2001-01-08    <karl@gnu.org>
-
-	* makeinfo/cmds.c: afivepaper, afourwide, afourlatex.
-	* doc/texinfo.txi: afivepaper
-
-2001-01-05    <karl@gnu.org>
-
-	* doc/info.texi: typo from: Martin Buchholz <martin@xemacs.org>.
-	* doc/info.texi: typo fixes from meyering.
-
-2001-01-02    <karl@gnu.org>
-
-	* makeinfo/makeinfo.c (remember_brace_1): don't assume command is
-	 non-null, an (erroneous) input line like \hbox to7in{ passes in a
-	 null.
-
-	* makeinfo/toc.c: fix from jan
-	* makeinfo/html.c: fix from jan for top-level references.
-
-2000-12-22    <karl@gnu.org>
-
-	* makeinfo/makeinfo.c: --help changes.
-	* doc/texinfo.txi: -o means the directory name for HTML output.
-
-2000-12-21    <karl@gnu.org>
-
-	* doc/texinfo.txi: switch to fdl
-
-	* makeinfo/html.c: doc fix.
-	* makeinfo/insertion.c: no space after _ I guess.
-	* makeinfo/cmds.c: no space after _ I guess.
-
-	* makeinfo/html.c (nodename_to_filename_1): fix up external
-	* top-node references.
-
-2000-12-20    <karl@gnu.org>
-
-* HTML table patch from Jan:
-    2000-12-19  Jan Nieuwenhuizen  <janneke@gnu.org>
-
-	    * makeinfo/multi.c (multitable_item),
-	    (cm_tab): close html table columns.  Also, align cell contents to
-	    top, which is probably the most sensible thing to do for text.
-
-
-2000-12-19    <karl@gnu.org>
-
-	* makeinfo/makeinfo.c (insert_toplevel_subdirectory): try
-		name.html if just name doesn't work.
-
-	* doc/texinfo.txi: document html output in .html directory
-		sometimes.
-
-	* util/Makefile.am (EXTRA_DIST): add install-info-html.
-
-	* util/texindex.c: 2000
-	* util/install-info.c: 2000
-	* info/info.c: 2000
-	* configure.in: 4.0a
-
-	* lib/system.h: include limits.h
-
-	* Applied HTML splitting changes from Jan:
-    2000-11-10  Jan Nieuwenhuizen  <janneke@gnu.org>
-
-	    * makeinfo: removed code for numbered split HTML output, removed
-	    SPLIT_JCN conditional.
-
-    2000-11-09  Jan Nieuwenhuizen  <janneke@gnu.org>
-
-	    * makeinfo/html.c: prepared nodifying filename functions for
-	    linking not non-spit HTML documents, by adding ``#anchor'' to
-	    external refernces.
-
-	    * doc/texinfo.txi (Installing HTML info): updated doco for --html
-	    option, added node Installing HTML info.
-
-	    * util/install-info-html.in: new script.  The bare minimum
-	    required for generating HTML index.  
-
-	    * lib/system.h:	compilation fix.
-
-    2000-11-08  Jan Nieuwenhuizen  <janneke@gnu.org>
-
-	    * makeinfo/makeinfo.c (convert_from_loaded_file): [SPLIT_JCN]:
-	    overloaded already way too hairy function with logic to put split
-	    html output into subdirectory with basename of toplevel output
-	    file.
-
-	    * makeinfo/html.c (fix_filename): new function.
-
-    2000-11-07  Jan Nieuwenhuizen  <janneke@gnu.org>
-
-	    * toc.c (toc_add_entry): 
-	    (contents_update_html): 
-	    (shortcontents_update_html): [SPLIT_JCN]: use hrefs for nodename based
-	    html files.
-
-	    * node.c (cm_node): [SPLIT_JCN]: create html filename based on
-	    nodename (instead of a numbered node<num>.html filename).
-
-	    * makeinfo/makeinfo.c (main): [SPLIT_JCN]: enable splitting of
-	    html output.
-
-	    * makeinfo/html.c
-	    (add_url_name,add_nodename_to_filename,nodename_to_filename): new
-	    functions.
-
-2000-12-15    <karl@gnu.org>
-
-	* configure.in (AC_CHECK_HEADERS): add limits.h explicitly.
-
-2000-11-10    <karl@gnu.org>
-
-	* dir-example: update
-	* info/nodes.c: doc fixes, etc.
-
-	* incorporated verbatim patch from janneke:
-    2000-04-14    <janneke@gnu.org>
-
-	    * applied texinfo-3.12s.jcn4 patch
-
-    1999-09-02    <janneke@gnu.org>
-
-	    * makeinfo/cmds.c,
-	    * makeinfo/insertion.c: @verbatiminclude file
-	    * doc/texinfo.tex: @verbatiminclude file
-	    * doc/texinfo.txi: @vebatiminclude file doco
-	    * NEWS: added @verbatiminclude to Language section
-
-    1999-09-01    <janneke@gnu.org>
-
-	    * makeinfo/makeinfo.c: bf: @exdent (urg6.texi) -- Rolled into 4.0
-	    * NEWS: added verb* to Language section
-	    * doc/texinfo.txi: @verb, @verbatim doco
-	    * doc/texinfo.tex: tricky tex-fix for @verb{<char>..<char>}
-	    * doc/texinfo.tex: real tab expansion for @verbatim mode
-	    * doc/texinfo.tex: proper start of environment, no indentation
-
-    1999-08-31    <janneke@gnu.org>
-
-	    * makeinfo/cmds.c: 
-	    * makeinfo/insertion.{c,h},
-	    * makeinfo/makeinfo.{c,h}: redo of @verbatim, @verb{<char>..<char>}
-	    * doc/texinfo.tex: fixed @verb{<char>..<char>}
-
-    1999-08-30  Jan Nieuwenhuizen <janneke@gnu.org>
-
-	    * makeinfo/cmds.c,
-	    * makeinfo/insertion.{c,h},
-	    * makeinfo/makeinfo.{c,h}: added @verbatim (and preliminary @verb)
-	    support
-	    * doc/texinfo.tex: added @verbatim (and preliminary @verb) support
-
-    1999-08-24  Jan Nieuwenhuizen <janneke@gnu.org>
-
-	    * bf: empty node: makeinfo/node.c:cm_node () -- Rolled into 4.0
-
-
-2000-10-18    <karl@gnu.org>
-
-	* doc/info.texi: eli update
-
-2000-09-22    <karl@gnu.org>
-
-	* makeinfo/defun.c: warn if non-whitespace follows @defun'd name
-	  (suggestion from Akim).
-
-  Installed some patches:
-  
-  2000-08-04  Paul Eggert  <eggert@twinsun.com>
-	  * makeinfo/multi.c (find_template_width):
-	  Don't access before start of *PARAMS.
-
-  2000-08-21  Eli Zaretskii  <eliz@is.elta.co.il>
-	  * info/filesys.c (info_file_in_path): Reject FILENAME if it is
-	  empty, or ".", or "..".
-
-  2000-08-23  Eli Zaretskii  <eliz@is.elta.co.il>
-	  * info/session.c (info_menu_or_ref_item): If the user have chosen
-	  menu item or xref that's identical to defentry's label, use
-	  defentry instead of looking for its label.  Otherwise, select the
-	  entry whose position is the closest to the window's point, in
-	  case there's more than a single entry with that label.
-
-2000-09-12    <karl@gnu.org>
-
-	* doc/texinfo.txi: it's 2000 now.
-	* doc/texinfo.txi: document the only real (and rare) reason for not using implicit pointer
-	creation.
-
-2000-09-06    <karl@gnu.org>
-
-	* configure.in: test all termcap variables for existence.  From
-	andy@rz.uni-karlsruhe.de.
-
-	* configure.in (ALL_LINGUAS): include ja.
-	* lib/system.h [HAVE_IO_H]: make #include <io.h> conditional for
-	BeOS.  Reported by Dan Moore, dan@moore.cx.
-	* configure.in (AC_CHECK_HEADERS): add io.h.
-
-2000-06-05    <karl@gnu.org>
-
-	* doc/texinfo.txi: forgot to escape {}.
-
-2000-05-30    <karl@gnu.org>
-
-	* info/filesys.c (is_dir_name): check all info suffixes as well as
-	the compression suffixes.  Fixes segmentation fault on a dir.info
-	file ending after the * Menu.
-
-2000-05-28    <karl@gnu.org>
-
-	* doc/texinfo.txi: Forgot {arg} in @rmacro example.  From Olaf B.
-
-2000-05-27    <karl@gnu.org>
-
-	* doc/txi-cs.tex: update from: Stepan Kasal <kasal@suse.cz>.
-
-	* doc/Makefile.am (install-data-local): reformat warning per
-	François to hopefully make it more noticeable.
-
-	2000-02-08  Eli Zaretskii  <eliz@is.elta.co.il>
-		* info/session.c (incremental_search): Don't retain RET when
-		exiting isearch.  Suggested by Hrvoje Niksic <hniksic@iskon.hr>.
-
-2000-05-22    <karl@gnu.org>
-
-	* doc/texinfo.txi: pageparams -> pagesizes
-
-2000-05-18    <karl@gnu.org>
-
-	* makeinfo/lang.c (cm_accent_tilde): need N in list.
-	From: kama@hippo.fido.de (Karl Heinz Marbaise)
-
-	* makeinfo/files.c (find_and_load): read only the number of bytes
-	available in the buffer.  Also, remove one-byte-at-a-time reading
-	in the WIN32 case.
-	From: "J. David Bryan" <dbryan@bcpl.net>
-
-	* info/man.c: use eli's patch after all, we re-increment j at the
-	top of the loop.
-
-2000-05-16    <karl@gnu.org>
-
-	* info/man.c (clean_manpage): don't write before the beginning of
-	newpage.
-	(based on patch from Eli).
-
-2000-02-03    <karl@gnu.org>
-
-	* doc/texinfo.txi: remove spurious space. from kaja.
-
-1999-10-12  Karl Berry  <karl@gnu.org>
-
-	* doc/Makefile.am (install-tex): install all txi-?? files.
-
-1999-10-01  W. L. Estes  <will@fumblers.org>
-
-	* makeinfo/cmds.c: dont treat @center as separate paragraph,
-	use div element to output center
-
-1999-09-29  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* djgpp/README: Say `dir-example', not DIR.
-
-	* lib/system.h (DEFAULT_INFOPATH) [__DJGPP__]: Define.
-
-1999-09-28  Karl Berry  <karl@gnu.org>
-
-	* configure.in,
-	util/texi2dvi: version 4.0.
-	* doc/texinfo.txi: New isbn.
-
-1999-09-24  Karl Berry  <karl@gnu.org>
+	* makeinfo/node.c (cm_node) <html>: do not bother calling
+	add_html_nodes in the split case, the filename is wrong.
+
+2004-11-29  Karl Berry  <karl@gnu.org>
+
+	Support for writing <a name="..."> using the old-style node name
+		to HTML name conversion, to keep the gcc folks happy.
+	* makeinfo/node.c (add_html_names): new routine, factoring out
+	common code (plus new code) from cm_node.
+	(cm_node) <html>: call it.
+	* makeinfo/makeinfo.h (OLD_HTML_SAFE, OLD_URL_SAFE_CHAR):
+	(re)define these.
+	* makeinfo/html.c (add_escaped_anchor_name): take new argument to
+	optionally output the old-style conversion.
+	(add_anchor_name): change call.
+	* index.c: change calls.
+	* makeinfo/html.h (add_escaped_anchor_name): change decl.
 
-	* doc/texinfo.txi: Fixes from Oleg.
+2004-11-26  Karl Berry  <karl@gnu.org>
 
-1999-09-20  Karl Berry  <karl@gnu.org>
+	* makeinfo/makeinfo.c (reader_loop): allow <wbr> after &mdash;
 
-	* makeinfo/node.c: Don't write region at an anchor.
-	From: Thomas Esken <esken@nmlab.informatik.fh-dortmund.de>
+2004-11-25  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (Fonts): document new command @sansserif.
+	* doc/texinfo.tex (\sansserif): new command.
+	* makeinfo/cmds.h (cm_sansserif): new cmd.
+	* makeinfo/cmds.c (cm_sansserif): new cmd.
+	(command_table): add it.
+	* makeinfo/texinfo.dtd (Inline.fonts): add it; also slanted.
+	* makeinfo/xml.h (SANSSERIF, SLANTED): define these new elements.
+	* makeinfo/xml.c (texinfoml_element_list): add them.
+	From: Frank Küster, 21 Oct 2004 23:27:33 +0200, Debian bug#277754.
 
-	* info/terminal.c: Only set dumb terminal if tgetent returns < 0,
-		not 0.
-	For HP-UP 11.
-	From jeff.hull@state.co.us.
+	* doc/texinfo.txi (Quotations and Examples, end titlepage): state
+	that there must be only one space between the @end and its
+	argument.  Report from: christoph.sobotka, 26 Oct 2004 22:04:03 +0200.
 
-	* makeinfo/footnote.c: Don't translate the `Footnotes' string
-		according to LANG, it should be according to
-		@documentlanguage, which isn't implemented yet.
-	From: Jan Nieuwenhuizen <janneke@gnu.org>
+2004-11-22  Karl Berry  <karl@gnu.org>
 
-	* doc/texinfo.txi: @end direntry from kama.
+	* doc/texinfo.txi (euro): new node, documenting new command,
+		@euro{}, for the Euro currency symbol.
+	* doc/texinfo.tex (\euro): new command, along with \eurofont to
+	support it.  The following extra font support is also related to
+	supporting @euro{}:
+	(\bfstylename): define this.
+	(\textnominalsize .. \ssecnominalsize): new macros.
+	(\textfonts .. \ssecfonts): define \curfontsize.
+	* makeinfo/cmds.c (command_table): add euro.
+	* makeinfo/lang.c (cm_special_char): handle euro.
+	(iso8859_15_map): new global.	
 
-1999-09-19  Karl Berry  <karl@gnu.org>
+2004-11-18  Stepan Kasal  <kasal@ucw.cz>
 
-	* doc/texinfo.txi: \ninett is now \smalltt.
+	* doc/texinfo.tex (\ptexnewwrite): Save \newwrite.
+	(\newwrite): Call it.
 
-	* doc/texinfo.txi: arnold changes
+2004-11-17  Karl Berry  <karl@gnu.org>
 
-	1999-09-03  Akim Demaille  <akim@epita.fr>
-	* texi2dvi (getopt): batch has to be assigned `eval', not `echo'.
-	(bibtex): Launch BibTeX also when the LOG file complains that
- 	there are no BBL file.
+	* configure.ac (install-warnings): new --enable option, requested
+		by te.
 
-	* doc/texinfo.txi: Document that @anchor ignores spaces.
+2004-11-11  Karl Berry  <karl@gnu.org>
 
-	* makeinfo/cmds.c (cm_shyph): remove, &shy; is not supported in
-		browsers. 
-	From: Thomas Esken <esken@nmlab.informatik.fh-dortmund.de>
+	* texinfo.dtd (metainformation): add documentdescription.
+	(documentdescription): define.
+	* xml.h (DOCUMENTDESCRIPTION): new value for xml_element.
+	* xml.c (texinfoml_element_list): define documentdescription.
+	(docbook_element_list): likewise, but don't know how to handle it.
+	* cmds.c (cm_documentdescription): insert opening xml tag.
+	* insertion.c (end_insertion): insert closing xml tag.
 
-	* makeinfo/makeinfo.c: Don't crash if current_indent = 0.
-	From: Jan Nieuwenhuizen <janneke@gnu.org>
+	* makeinfo/makeinfo.c (insert_string): declare const char * arg.
+        * makeinfo/makeinfo.h: likewise.
+	Report from: Vincent Lefevre, 20 Oct 2004 15:40:39 +0200,
+	noting a spurious </para> after </dircategory>.
 
-	* makeinfo/makeinfo.c: Avoid blank lines between @menu entries.
-	* configure.in: 3.12t
+2004-11-08  Karl Berry  <karl@gnu.org>
 
-	1999-08-31  Eli Zaretskii  <eliz@is.elta.co.il>
-	* info/info.c (info_short_help): Document --apropos.
+	* doc/texinfo.tex (\pdfmakeoutlines): in the first run through the
+	toc, define \thischapnum...\thissubsecnum as 0, rather than \empty.
+	This is so \expnumber doesn't end up trying to expand
+	\csname sec\empty\endcsname, i.e., \sec, which is the secant function.
+	Report from: Oliver Beck, help-texinfo, 8 Nov 2004 08:05:55 +0100.
 
-1999-09-18  Karl Berry  <karl@gnu.org>
+2004-11-07  Karl Berry  <karl@gnu.org>
 
-	* makeinfo/html.c (html_output_head): use text for <title>, not
-		html markup.  From François.
-	* makeinfo/makeinfo.c (text_expansion): new routine.
-	* makeinfo/cmds.c (cm_settitle): don't expand the title here,
-		we'll do it later.
+	* makeinfo/makeinfo.c (main) [LC_MESSAGES]: #ifdef the setlocale
+	using LC_MESSAGES.  From te, 6 Nov 2004 23:36:10 +0100.
 
-	* makeinfo/makeinfo.h (text_expansion): declare.
+2004-11-06  Karl Berry  <karl@gnu.org>
 
-	* info/indices.c,
-	* info/infodoc.c,
-	* info/session.c,
-	* info/footnotes.c: translate errors.
-	* info/info.h: Use `' instead of "" in errors.
+	* lib/Makefile.am (libtxi_a_SOURCES): add strdup.h.
+	Report from: Thomas Esser <te@dbs.uni-hannover.de>,
+	6 Nov 2004 18:11:51 +0100.
 
-1999-09-06  Karl Berry  <karl@gnu.org>
+2004-11-01  Karl Berry  <karl@gnu.org>
 
-	+1999-08-24  Jan Nieuwenhuizen <janneke@gnu.org>
-	* makeinfo/node.c:cm_node: don't compare current_node when null.
+	* makeinfo/xref.c (cm_xref): don't include the external file name
+	in the HTML output, since it's pretty traditional not to
+	distinguish internal and external links in HTML, and it disturbs
+	the flow of reading.
+	From: Han-Wen Nienhuys <hanwen@xs4all.nl>, 31 Oct 2004 00:13:36 +0200.
+	(For lilypond.)
 
-	1999-08-23  W. L. Estes  <will@fumblers.org>
-	*  makeinfo/node.c (cm_node): write <a name=> tags even
-           ifusing --no-headers
+2004-10-31  Karl Berry  <karl@gnu.org>
 
-	* configure.in: ospeedlib -> trylib
-	From: Andreas Schwab <schwab@suse.de>
+	* doc/texinfo.tex (\setmultitablespacing): just let \multistrut be
+	the same as \strut.  Its previous computation was wrong.
+	See bug-texinfo report from Werner Lemberg, 31 Oct 2004 12:52:20 +0100.
 
-	* makeinfo/makeinfo.c (read_command): add explicit 0 to return if
-	enclosure command.  From: Andreas Jaeger <aj@arthur.rhein-neckar.de>.
+2004-10-22  Stepan Kasal  <kasal@ucw.cz>
 
-1999-08-19  Karl Berry  <karl@gnu.org>
+	* info/Makefile.am (generated_sources): Add dependencies defining
+	  a total order on the files, to prevent race conditions with
+	  parallel make.
+	  Move the code about generated sources to the end of the file.
 
-	* configure.in: add missing quotes, logic in new termcap library
-	check.
+2004-10-20  Stepan Kasal  <kasal@ucw.cz>
 
-1999-08-17  Karl Berry  <karl@gnu.org>
+	* info/Makefile.am (doc.c, key.c, funs.h): Don't distribute them.
+	  of these three files.
+	(ginfo_SOURCES, nodist_ginfo_SOURCES): Move files.
+	(infokey_SOURCES, nodist_infokey_SOURCES): Likewise.
+	(DISTCLEANFILES): Include generated_sources.
 
-	* makeinfo/multi.c,
-	* makeinfo/sectioning.c,
-	* makeinfo/node.c,
-	* makeinfo/macro.c: omit unused vars
-	* info/session.c (info_goto_invocation_node): omit unused decl.
+2004-10-20  Stepan Kasal  <kasal@ucw.cz>
 
-	* configure.in: Check for extra termlib variable necessary on
-		HP-UX 9.
-	From: Olaf Bachmann <obachman@mathematik.uni-kl.de>
+	BUILT_SOURCES is a special variable for a hack to supplement
+	  the automatic dependency tracking; we need it for funs.h only.
+	  See the explanation in the automake manual.
 
-  1999-08-16  Andreas Schwab  <schwab@suse.de>
-	  * info/terminal.c (terminal_initialize_terminal): Try tcgetattr
-	  and cfgetospeed in preference to TIOCGETP.
-	  (original_tchars, original_ltchars): Define them only if needed.
+	* info/Makefile.am (BUILT_SOURCES): All occurences replaced by ...
+	(generated_sources): ... this new variable.
+	(BUILT_SOURCES): set to ``funs.h''.
 
-1999-08-16  Karl Berry  <karl@gnu.org>
+2004-10-20  Stepan Kasal  <kasal@ucw.cz>
 
-	* info/infodoc.c (create_internal_info_help_node): rename arg.
-	(info_find_or_create_help_window): avoid deref of null eligible.
+	* info/Makefile.am (ginfo_SOURCES): replace $(BUILT_SOURCES)
+	  with ``doc.c funs.h''; this reflects the true situation.
+	(infokey_SOURCES): Add funs.h.
 
-	* info/terminal.c (TIOCGETP, TIOCGETC, TIOCGLTC) [alpha && linux]:
-	#undef.  Useless stubs are present.
+2004-10-20  Stepan Kasal  <kasal@ucw.cz>
 
-1999-08-15  Karl Berry  <karl@gnu.org>
+	* info/Makefile.am (EXTRA_DIST): No need to mention the generated
+	  sources here, they are in ginfo_SOURCES or infokey_SOURCES.
 
-	* info/nodes.c: Remove reference to nonexistent RFC for Info
-	files.
+2004-10-19  Stepan Kasal  <kasal@ucw.cz>
 
-1999-08-11  Eli Zaretskii  <eliz@is.elta.co.il>
+	* configure.ac: When cross compiling, we have to remove
+	  ./config.status, not "$native_tools"/config.status.
+	  Replace ``echo'' with AC_MSG_NOTICE.  Quote the variable
+	  values passed to ``env.''
 
-	* info/nodes.c (info_find_file_internal): If the file's contents
-	were gc'ed since last time it was loaded, reload the file.
+2004-10-17  Karl Berry  <karl@gnu.org>
 
-Wed Aug 11 06:42:47 1999  Karl Berry  <karl@gnu.org>
+	* makeinfo/node.c (cm_node): don't output <br> after the
+		navigation line, it's apparently just extra space.
 
-	* doc/Makefile.am (EXTRA_DIST): add txi-pt.tex from Lalo.
+	* configure.ac: Clean environment for native configure.
+	From: Mark Fortescue <mark@mtfhpc.demon.co.uk>,
+	17 Oct 2004 19:09:53 +0100.
 
-Mon Aug  9 16:28:18 1999  Karl Berry  <karl@gnu.org>
+2004-10-11  Stepan Kasal  <kasal@ucw.cz>
 
-	* util/texi2dvi: Support preloaded texinfo.tex, from Stephen.
+	* configure.ac: Add a short explanation about cross compile.
 
-	* makeinfo/makeinfo.c (add_char): restore ugly check for first
- 		character being <.
+2004-10-08  Karl Berry  <karl@gnu.org>
 
-	* makeinfo/cmds.c (cm_kbd): Increment in_fixed_width_font for
- 		html.
+	* info/Makefile.am (generated_sources): remove.  Found by Stepan.
 
-	* doc/texinfo.txi: effect not affect
+2004-10-08  Stepan Kasal  <kasal@ucw.cz>
 
-	* makeinfo/makeinfo.c: Rearrange help.
+	Support cross compiling.  Based on research by Mark Fortescue.
+	Maciej W. Rozycki pointed out this issue previously.
 
-	* makeinfo/toc.c: Cast %* arguments to (int) to placate gcc
- 		-Wformat.
+	* configure.ac: If cross compiling, run second configure script
+	  in a subdirectory ${native_tools}.  New automake conditional
+	  TOOLS_ONLY is set inside that subdirectory.
+	* Makefile.am (SUBDIRS): Add $(native_tools); restrict the
+	  SUBDIRS to minimum, if we are inside the $(native_toos) dir.
+	(distclean-local): Remove directory $(native_tools).
+	* doc/Makefile.am: If necessary, use makeinfo and install-info
+	  from $(native_tools).
+	* info/Makefile.am: Similarily with the ``makedoc'' program.
 
-Fri Aug  6 13:03:14 1999  Karl Berry  <karl@gnu.org>
+2004-10-07  Stepan Kasal  <kasal@ucw.cz>
 
-	* util/install-info.c: Hardwire the File: dir, Node: top part of
-		the skeleton dir file.
-	Report from: Stanislav Brabec <utx@k332.feld.cvut.cz>
+	@table command doesn't work inside environment @display.
+	There is no point in trying to fix it: just give up with a cry.
 
-	* info/Makefile.am (BUILT_SOURCES): rm -f $(BUILT_SOURCES), a
- 		kludge.
+	* doc/texinfo.tex (\table, \ftable, \vtable): Instead of calling
+	  \tablex directly, call ...
+	(\tablecheck): ... this new macro which checks for active newline;
+	  if it's found, it reports an error and uses \doignore to recover.
+	* doc/texinfo.txi (display): mention this.
 
-    1999-07-28  Karl Eichwalder  <ke@gnu.franken.de>
+2004-10-06  Karl Berry  <karl@gnu.org>
 
-	    * makeinfo/makeinfo.c: Fix help string (-o).
+	* doc/*.texi: more consistent use of dashes.
+	From Stepan and Benno Schulenberg <benno@nietvergeten.nl>.
+ 
+2004-10-04  Karl Berry  <karl@gnu.org>
 
-    1999-07-30  Eli Zaretskii  <eliz@is.elta.co.il>
+	* makeinfo/makeinfo.c (cm_value): increment and restore
+		input_text_offset before execute_string on the value,
+		so cm_xref doesn't complain about missing punctuation.
+	From: Sergey Poznyakoff <gray@Mirddin.farlep.net>,
+	04 Oct 2004 15:04:33 +0300.
 
-	    * makeinfo/makeinfo.c (cm_uref, cm_email): Don't collapse -- and
-	    `` in the URL part of the reference.
+2004-10-01  Karl Berry  <karl@gnu.org>
 
-    1999-08-03  Eli Zaretskii  <eliz@is.elta.co.il>
+	* lib/Makefile.am (libtxi_a_SOURCES): add getopt_.h.
 
-	    * util/install-info.c (main): For entries given on command line,
-	    set entry_sections and entry_sections_tail members to NULL, and
-	    set text_len member to the entry length.  After processing the
-	    Info file, update the entry_sections pointers of all entries that
-	    came from the command line.
+	* configure.ac: bump version to 4.7.90, although we're not really
+		pretesting yet.  (I need a distribution to check an
+		automake issue.)
 
-	* util/texindex.c (sort_offline, sort_in_core): use off_t rather
-		than long.
-	Found on FreedBSD 2.2.8 by "Trond Endrestol" <endrestol@hotmail.com>.
+2004-09-14  Karl Berry  <karl@gnu.org>
 
-Mon Jul 19 17:16:46 1999  Karl Berry  <karl@gnu.org>
+	* util/srclist.txt (getopt.h): renamed to getopt_.h.
+	* lib/getopt_.h: new file.
+	* lib/getopt.h: just include getopt.h.
 
-	* configure.in: 3.12n
+2004-09-09  Karl Berry  <karl@gnu.org>
 
-	* makeinfo/makeinfo.c (add_char): Don't insert <p> if we're in
- 		@html.
+	* doc/texinfo.txi (Image Syntax): mention @noindent, @center.
 
-	* makeinfo/html.c (add_escaped_anchor_name),
-	* makeinfo/toc.c (toc_add_entry): use URL_SAFE_CHAR.
-	* makeinfo/makeinfo.h (HTML_SAFE, URL_SAFE_CHAR): new macros.
+2004-09-06  Stepan Kasal  <kasal@ucw.cz>
 
-Sun Jul 18 14:47:40 1999  Karl Berry  <karl@gnu.org>
+	* doc/texinfo.tex (\Efloat): Take care to run \scantokens on
+	  \thisshortcaption before writing the lof line to auxfile.
+	  Otherwise, when a newline appears in the argument to
+	  @shortcaption, a literal ^^M is written to the aux file.
+	  Report from Patrice, 1 Aug 2004 15:54:44 +0200.
 
-	* dir-example: Add bzip2.
+2004-09-01  Karl Berry  <karl@gnu.org>
 
-	* configure.in: 3.12m.
+	* util/gendocs.sh: show commands, allow / in description.
 
-	* doc/texinfo.txi (@afourlatex,@afourwide): add to command list.
+2004-08-30  Karl Berry  <karl@gnu.org>
 
-1999-07-17  Eli Zaretskii  <eliz@is.elta.co.il>
+	* makeinfo/makeinfo.c (maybe_escaped_expansion): new routine, like
+		expansion but does HTML escapes.
+	* makeinfo/makeinfo.h (maybe_escaped_expansion): declare.
+	* makeinfo/index.c (cm_printindex): call it.
+	This is @cindex Kahrs, J@"urgen does not get
+	gawk.texi:23425: Unknown command `&quot;urgen'.
+	(in gawk 3.1.4).
+	Report from: Stepan Kasal <kasal@ucw.cz>, 24 Aug 2004 12:36:34 +0200.
 
-	* makeinfo/makeinfo.c (cm_xref): Don't collapse `` and -- while
-	expanding node names.  Generate a terminating period for
-	@pxref, when it has more than a single argument.
+2004-08-29  Karl Berry  <karl@gnu.org>
 
-	* makeinfo/index.c (cm_printindex): Don't collapse `` and -- while
-	expanding node names.
+	* makeinfo/node.c (split_file): do not search for output file
+		along the path when calling find_and_load (can cause seg
+		fault when cross-compiling).
+	From: Martin Husemann <martin@duskware.de>, 29 Aug 2004 08:40:33 +0200.
+	http://www.netbsd.org/cgi-bin/query-pr-single.pl?number=26791
 
-Sat Jul 17 16:33:45 1999  Karl Berry  <karl@gnu.org>
+2004-08-27  Karl Berry  <karl@gnu.org>
 
-	* 3.12l.
+	* doc/texinfo.txi (Macro details): more warnings about macro usage.
+	Report from: Stepan Kasal <kasal@ucw.cz>, 24 Aug 2004 09:29:35 +0200.
 
-	* doc/texinfo.txi: @alias, @definfoenclose, etc.
+	* doc/texinfo.tex (\Efloat): \vskip\parskip after printing the
+	caption; previous \printedsomething code to do this had become
+	obsolete.  Reported by Stepan.
 
-	* util/texindex.c (indexify): error message instead of abort(2)
- 		when no page number.
+	* doc/texinfo.txi (caption shortcaption): show an example for
+        @shortcaption, and remark that weird commands like @c and @verb
+	are not allowed.  Suggested by Stepan.
 
-Fri Jul 16 18:00:26 1999  Karl Berry  <karl@gnu.org>
+2004-08-27  Stepan Kasal  <kasal@ucw.cz>
 
-	* doc/texinfo.txi: Overfull boxes, help2man, etc.
+	* doc/texinfo.tex (\initial): when breaking the column before the
+	  initial, allow for some space at the bottom of the column, so
+	  the baselineskip is preserved (more or less).
+	  Don't give negative penalty, it encouradges creating of underfull
+	  columns with stretched baselineskip.
+	  At the end, the \nobreak should be before \vskip, not after it.
 
-	* util/Makefile.am (EXTRA_DIST): texi-outline.gawk is really
-	outline.gawk, add fixref.gawk and prepinfo.awk and
-		texi-docstring-magic.el.
+2004-08-26  Stepan Kasal  <kasal@ucw.cz>
 
-Thu Jul 15 18:57:54 1999  Karl Berry  <karl@gnu.org>
+	* util/texi2dvi: fix the sed script searching for @documentencoding;
+	  Double-quote some instances of "$filename_???"
 
-	* doc/texinfo.txi: .fmt, etc.
-	* doc/texinfo.txi: More macro docs, etc.
+2004-08-26  Akim Demaille  <akim@epita.fr>
 
-Wed Jul 14 19:58:47 1999  Karl Berry  <karl@gnu.org>
+	Let DVI and PDF files honor the document encoding in TeX.
 
-	* doc/texinfo.txi: Give good quote.
+	* util/texi2dvi ($language): Be sure to set its value.
+	(get_xref_files): Turn this external shell script into a function.
+	(filename_rcd, $tmpdir_rcd): New.
+	If the file is in Texinfo, and has @documentencoding, and recode
+	is available, then run it.
 
-	* util/Makefile.am (EXTRA_DIST): add texi-outline.gawk.
+2004-08-25   Akim Demaille  <akim@epita.fr>
 
-	From: kama@hippo.fido.de (Karl Heinz Marbaise)
-	* makeinfo/toc.c (contents_update_html): go back to start level.
-	* doc/texinfo.txi: deftypeop
+	* util/Makefile.am (texinfo.cat): Fix for srcdir != builddir.
 
-	From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>
-	* makeinfo/toc.c (toc_add_entry): don't assume sprintf return type
- 		is int.
-	* makeinfo/sectioning.c (insert_and_underscore): declare more
- 		unsigned char *.
-	* makeinfo/macro.h (itext_info, itext_size): remove declarations,
-		they're defined static.
-	* makeinfo/makeinfo.c: Split up help string even more.
+2004-08-25  Karl Berry  <karl@gnu.org>
 
-Tue Jul 13 17:16:18 1999  Karl Berry  <karl@gnu.org>
+	* util/texi2dvi: @ is also ok for the first character of xref_files.
 
-	* doc/texinfo.txi: Document @rmacro.
-	* makeinfo/macro.c (cm_rmacro): new command to do @allow-recursion
- 		by default.
- 	(define_macro): split off from cm_macro.
+2004-08-20  Karl Berry  <karl@gnu.org>
 
-	* makeinfo/macro.h (cm_rmacro): declare.
-	* makeinfo/macro.h (delete_macro): do not need to export.
-	* makeinfo/cmds.c (rmacro): new command.
+	* doc/texinfo.tex (\tablez): accidentally removed assignments
+		enabling @item and @itemx within @table.
 
-	* makeinfo/html.c,
-	* makeinfo/toc.c,
-	* makeinfo/lang.c,
-	* makeinfo/makeinfo.c: Use strchr instead of member.
+2004-08-19  Karl Berry  <karl@gnu.org>
 
-Mon Jul 12 08:01:19 1999  Karl Berry  <karl@gnu.org>
+	* doc/texinfo.tex (\multitable): \def\item to \crcr, instead of
+		\let, to avoid errors with a nested @itemize inside
+		@multitable.
+	Report from: Pierre-Luc Veilleux <plv@centretiv.com>,
+	18 Aug 2004 13:26:00 -0400.
 
-	* doc/texinfo.txi: document this.
-	* makeinfo/macro.c (apply): warn if \ in macro body is not
-		followed by a parameter name or \, instead of silently
-		accepting it, for compatibility with TeX. 
+2004-08-19  Stepan Kasal  <kasal@ucw.cz>
 
-	* makeinfo/macro.c: Doc fix.
+	* doc/texinfo.tex (\scanmacro): Make backslash active, not other,
+	  as this is the default when processing texinfo files. 
+	  Otherwise, a \ inside @copying will eventually print as ``.
 
-Sun Jul 11 12:49:50 1999  Karl Berry  <karl@gnu.org>
+2004-08-18  Stepan Kasal  <kasal@ucw.cz>
 
-	* makeinfo/macro.c (cm_macro): do @quote-arg implicitly if single
- 		argument to macro.
-	* doc/texinfo.txi: Document this.
+	* doc/texinfo.tex (\scantxt): " is another active char to be
+	  sanitized.
 
-	* doc/texinfo.txi (Smallcaps): Document makeinfo warning if arg is
- 		all uppercase.
-	* makeinfo/cmds.c (cm_sc): warn if arg is all upper (suggested by
- 		Jim Meyering).
+2004-08-18  Karl Berry  <karl@gnu.org>
 
-	* makeinfo/cmds.c (cm_var): warn if argument contains any of ,[]()
-		which are unlikely to be allowable in real variable names.
-		Suggested by rms.
+	* doc/texinfo.txi (exampleindent): document that the default is
+		different in TeX.
+	From: Simon Josefsson <jas@extundo.com>, 18 Aug 2004 13:44:32 +0200.
 
-	* makeinfo/makeinfo.h (member): remove weird masking macro.
+2004-08-14  Karl Berry  <karl@gnu.org>
 
-	* doc/texinfo.txi: Probably ok to indent @example.
+	* doc/texinfo.tex (\cslet): equivalent-or-better, and shorter,
+	version from dak, 12 Aug 2004 19:17:27 +0200.
 
-	* configure.in: 3.12k.
+	* doc/texinfo.txi (makeinfo options): use --no-number-sections
+		with non-hierarchical manuals.
 
-	* makeinfo/html.c (add_escaped_anchor_name): Cast to unsigned char
-		for 8-bit chars. From Yoshiki.
+2004-08-13  Karl Berry  <karl@gnu.org>
 
-	* makeinfo/makeinfo.c: complain -> warn for sake of <80 chars.
+	* util/texi2dvi: check for -file-line-error, since -style is no
+		longer part of the name.
 
-1999-07-09  Eli Zaretskii  <eliz@is.elta.co.il>
+2004-08-07  Karl Berry  <karl@gnu.org>
 
-	* makeinfo/multi.c (multitable_item): Quote the value of align=
-	property.
-
-	* makeinfo/defun.c (defun_internal): Ditto.
-
-	* makeinfo/cmds.c (cm_center): Ditto.
-
-	* makeinfo/toc.c (toc_add_entry): New argument ANCHOR; all callers
-	changed.  In HTML mode, expand NODE_NAME, or use ANCHOR, if
-	non-NULL, and save it together with the TOC name in the name
-	member of the TOC entry.
-	(toc_add_entry, toc_find_section_of_node): Add a warning in a
-	comment that the NODE argument must be unexpanded.
-	(contents_update_html): Terminate the TOC entry with </a>.
-
-	* makeinfo/sectioning.c (sectioning_html): If the sectioning
-	command is outside any node, generate explicit anchor and pass it
-	to toc_add_entry.
-
-	* makeinfo/node.c (expand_node_name): Now external instead of
-	static.
-	(cm_node): Output expanded node name in the navigation bar.
-
-	* makeinfo/node.h: Declare expand_node_name.
-
-	* makeinfo/index.c (cm_printindex): Produce valid HTML links, even
-	if index->node is NULL or empty.  Fix format of index under
-	--no-headers.
-
-Fri Jul  9 18:09:28 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi: Pair @end html properly.  From Olaf B.
-
-	* doc/Makefile.am (EXTRA_DIST): add txi-nl.tex from Marcel van der Boom
-	<marcel@virtualprojects.org>.
-
-	* doc/txi-en.tex: Doc fix.
-
-Wed Jul  7 16:07:44 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/Makefile.am: Doc fix.
-
-	* configure.in (txi_CHECK_DECLS): call this new macro (in
- 		acinclude.m4).
- 	* acinclude.m4: new file.
-
-Tue Jul  6 19:12:37 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/insertion.h,
-	* makeinfo/insertion.c,
-	* makeinfo/cmds.c,
-	* makeinfo/defun.c: new command @deftypeop.
-	Suggestion from: booth@us.ibm.com.
-
-1999-07-05  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/makeinfo.c (cm_value): Don't convert quotes and dashes
-	in the argument of @value, since @set doesn't.
-
-Mon Jul  5 16:43:23 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/insertion.c (get_item_function): return "@ " rather
- 		than "@".	(command_needs_braces): new fn.
-	(cm_item): handle @itemize markers that don't take braces.
-	Bug reported by Stephen, prototype fix from Yoshiki.
-
-	* doc/texinfo.txi (Contents): @contents ignored at beginning when
- 		outputting to stdout.
-	Installed this.
->1999-05-02  Eli Zaretskii  <eliz@is.elta.co.il>
->	* makeinfo/toc.c (cm_contents, cm_shortcontents): If writing to
->	stdout, output the contents and short contents immediately, and
->	assign NULL to contents_filename and shortcontents_filename, so
->	that toc_update won't try to rewrite stdout.
-
-
-	* makeinfo/sectioning.c (sectioning_html): declare starting_pos
-		and ending_pos as unsigned char * since they're based on
-		output_paragraph.
-
-	* makeinfo/insertion.c: Cast output_paragraph to char * for sake
-		of strncmp prototype (on IRIX 4).
-	From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>
-
-
-	* info/man.c (get_manpage_contents): restore previous (default)
- 		SIGCHLD handler so the pclose when gunzipping info files
- 		doesn't fail with `No child processes' (because
- 		reap_children reaped it).
- 	From: Josip Rodin <jrodin@public.srce.hr>
- 	njs@uclink4.berkeley.edu, 38063-forwarded@bugs.debian.org
-
-Fri Jul  2 14:26:22 1999  Karl Berry  <karl@gnu.org>
-
-	From gildea:
-	* info/terminal.c (TIOCGETC) [M_XENIX && TIOCGETC]: #undef.
-	* info/session.c (strncasecmp) [M_XENIX]: declare.  
-
-Thu Jul  1 19:25:12 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/makeinfo.c (cm_value): erroneous capitalization in
- 		error message.
-
-	* makeinfo/insertion.c (end_insertion): @end html should turn html
- 		escaping back on. From esr.
-
-	* makeinfo/makeinfo.c (cm_pxref): No period needed to terminate
- 		cross-reference.
-
-Sun Jun 13 16:12:41 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi: Remove some more node links.
-
-Sat May  1 16:01:36 1999  Karl Berry  <karl@gnu.org>
-
-	* info/info.c: Single space for option indent to match others.
-
-	* makeinfo/makeinfo.c,
-	* util/texindex.c,
-	* util/install-info.c: Must indent option list for help2man.
-
-	* info/infodoc.c [HELP_NODE_GETS_REGENERATED]: set to true.
-	(info_internal_help_text): put moving cmds first so they know how to go
-	forward in the help window.
-	(create_internal_info_help_node): can't always quit help with C-x 0.
-	(info_find_or_create_help_window): pass !one_window_p.
-
-1999-04-29  Yoshiki Hayashi  <g740685@komaba.ecc.u-tokyo.ac.jp>
-
-	* makeinfo/makeinfo.c (cm_xref): Don't collapse --- to -- etc., 
-	in references.
-
-Mon Apr 26 16:41:55 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/node.c (validate): arrange to translate the reference type.
-	Report from Sergio.
-
-	* makeinfo/makeinfo.c (validate): should not be declared here.
-
-	* makeinfo/index.c (cm_printindex): <ul compact> is not
- 		translatable.  From Yoshiki.
-
-	* doc/Makefile.am (EXTRA_DIST): include new txi-es.tex from Adrian
- 		Perez Jorge <alu1415@csi.ull.es>.  And new txi-en.tex.
-
-Sun Apr 25 16:08:27 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/cmds.c (cm_settitle): don't output html head here.
-
-	* makeinfo/makeinfo.c: Move html routines to html.c.
-	* makeinfo/Makefile.am (makeinfo_SOURCES): add html.[ch].
-	* makeinfo/html.[ch]: new files.
-
-	* makeinfo/makeinfo.c: Restore -- in --output line.  From Sergio.
-
-1999-04-23  Yoshiki Hayashi <g740685@komaba.ecc.u-tokyo.ac.jp>
-
-	* makeinfo/cmds.c (cm_center): Recover the previous state when 
-	called with --html.
-
-1999-04-24  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/cmds.c (cm_bye): Flush the output, in case some command
-	produced it immediately before @bye.
-
-	* makeinfo/toc.h (TOC_ENTRY_ELT): New member: containing_node.
-
-	* makeinfo/toc.c (lots_of_stars): New variable.
-	(toc_add_entry): Add a new parameter node_name; all callers
-	changed.  Record the name of the node containing the section.
-	(toc_find_section_of_node): New function.
-	(toc_free): Free the new containing_node member.
-	(contents_update_info, shortcontents_update_info): Underline the
-	title with stars.  Output two empty lines after the TOC.
-	(contents_update): Fix off-by-one error in writing the rest of the
-	file after updating the TOC.
-
-	* makeinfo/index.c (cm_printindex): Save and restore line_number
-	and input_filename.  Don't output the "* Menu" header when
-	--no-headers is in effect.  Make the fake node name for index
-	entries that are outside any node be more explanatory, and emit an
-	error for such index entries.  Under --no-headers, output a
-	reference to the section name, as returned by a call to
-	toc_find_section_of_node, instead of a node name.
-
-1999-04-24  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/index.c (struct index_elt): Add a new member
-	entry_text.
-	(free_index, make_index_entries_unique): Free the entry_text
-	member.
-	(index_add_arg): Don't HTML-escape the index entry here.
-	(index_add_arg): Initialize the entry member to NULL.  Put the
-	entry text into the entry_text member.
-	(sort_index): Expand the index entries as if in non-HTML mode.
-	Put the expansion into the entry member of struct index_elt.
-	(cm_printindex): Allocate the line[] array in Info mode only.
-	In HTML mode, escape and expand the original index entry text,
-	don't use the results of expansion inside sort_index.
-
-	* makeinfo/cmds.c (cm_r): Undo the effect of @code while printing
-	one of the "code"-style indices in HTML mode.
-
-1999-04-23  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* info/infomap.c (initialize_vi_like_keymaps): Bind DEL in echo
-	area to ea_rubout, except for __MSDOS__.
-
-	* doc/info-stnd.texi (Node Commands): Document that `I' only
-	produces its effect for programs documented in the current Info
-	file.  Tell them to invoke `I' from DIR if it doesn't work from
-	current place.
-
-Thu Apr 22 09:59:02 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/makeinfo.c,
-	* info/info.c: Rewrite help string a little more.
-
-	* doc/info-stnd.texi: Change chapter name to match node name,
-		* other changes.
-
-	* makeinfo/cmds.c (cm_bye): call discard_braces.
-
-	* makeinfo/cmds.c (cm_settitle): output more meta and link tags.
-
-	* configure.in (ALL_LINGUAS): add eo.
-
-	* util/install-info.c [STRIP_DOT_EXE]: #if not #ifdef
-
-Wed Apr 21 19:40:51 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/makeinfo.c: Doc fix.
-
-	* makeinfo/sectioning.c (insert_and_underscore): do not output
- 		html anchor here.
-	* makeinfo/node.c (cm_node): do anchor at node name not sectioning
- 		title.
-
-	* makeinfo/node.c: Newlines on node lines.
-
-Tue Apr 20 13:02:46 1999  Karl Berry  <karl@gnu.org>
-
-	* info/man.c (get_manpage_contents): freopen stdin and stderr to
-        /dev/null rather than closing them. http://bugs.debian.org/14787
-
-Mon Apr 19 14:12:09 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi: Document possibility of `titlepage' stuff for
-		plain text output using @ifinfo.
-	Report from: Kurt Hornik <Kurt.Hornik@ci.tuwien.ac.at>.
-
-	* makeinfo/cmds.c: Screw that.
-	* doc/texinfo.txi: Fix up frontmatter a bit.
-
-	* dir-example: Spaces not tabs.
-	* dir-example (R FAQ): add.
-
-	* makeinfo/makeinfo.c: Lowercase makeinfo in first line.
-
-	* doc/info.texi (The node reached...): is a @subsection not a
- 		@subsub.
-
-	* doc/texinfo.txi: Document option rename.
-	* makeinfo/makeinfo.c: Rename option to commands-in-node-names.
-
-	* makeinfo/index.h (index_compare_fn): declare.
-	* makeinfo/index.c (index_element_compare): call through new
- 		variable index_compare_fn, and set it to strcoll if
-	 	@documentlanguage was used and LANG != en.
-	 	#include lang.h.
-
-Sat Apr 17 14:46:47 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/insertion.c (current_item_function, cm_item): rewrite
- 		to skip all conditionals.
- 	(cm_item): use current_item_function rather than current_insertion_type
-	to check what to use for @item, so @ifset etc. can be used around
-		@items.
-	Report from: "W. L. Estes" <wlestes@br20920.uncg.edu>.
-
-	* makeinfo/makeinfo.c (current_insertion_type): no need to
- 		declare.
-
-	* makeinfo/makeinfo.c: Add examples to help message.
-
-	* util/texindex.c (usage): Rearrange --help, avoid extra newline.
-
-	* info/info.c: Sort --help in the usual place.
-
-	* makeinfo/makeinfo.c: Reindent help message, rename
-	       --expensive-validation to --commands-in-nodes.
-
-Fri Apr 16 17:53:48 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/cmds.c (cm_ignore_arg): new routine.
-	(cm_ignore_line_no_op): remove, can use cm_ignore_line.
-
-Tue Apr 13 16:45:39 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/info-stnd.texi: Frontmatter changes.
-
-	* doc/info.texi: Remove advanced remark in first node.
-
-	* doc/texinfo.txi: Texinfo.tex does macros now. From Eli.
-
-	* doc/texinfo.txi: Document @w{ } to produce an unbreakable space.
-
-	* util/texi2dvi: Update from Akim, avoid Solaris ucb echo weirdness.
-
-	* info/infodoc.c: Parenthesize function calls, don't depend on
- 		gettext being there.  Report from: Doug Semler
- 		<doug@seaspace.com>.
-
-1999-04-12  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* info/infomap.c (initialize_vi_like_keymaps): Initialize the echo
-	are keymap *before* it is filled up with keys.
-
-1999-04-10  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/macro.c (execute_macro): Reset the line number to where
-	the macro argumenst begin, before executing its expansion.
-
-	* makeinfo/makeinfo.c (cm_xref): Expand the name of arguments
-	before writing them in HTML mode.
-	(handle_menu_entry): Expand the name of the gleaned node before
-	writing it in HTML mode.
-
-	* makeinfo/sectioning.c (sectioning_html): Expand the name of the
-	current node when producing the <a name=... anchor.
-
-	* makeinfo/node.c (cm_node): Expand the name of node and its links
-	before outputting them in HTML mode.
-
-	* makeinfo/index.c (cm_printindex): Expand node names to which the
-	index points.
-
-	* makeinfo/footnote.c (cm_footnote): Call execute_string instead
-	of add_word_args, since current_node needs to be expanded.  Expand
-	the name of the Footnotes node before calling
-	remember_node_reference.
-
-	* makeinfo/tests/node-expand.txi: New test, for testing how node
-	names are expanded in @node, @menu, cross-references, and
-	indices.
-
-	* makeinfo/makeinfo.c (add_char): If we output <p>, adjust the
-	affected brace positions by 3, so cm_xxx functions get what they
-	expect in START and END.
-	(insert_html_tag): Likewise.
-
-	* makeinfo/cmds.c (cm_sc): Remove the kludge that looks for the
-	beginning of <small>, it is no longer needed.
-
-	* makeinfo/macro.c (cm_definfoenclose): Don't stop at the first
-	blank after the second comma: the blank may belong to the second
-	delimiter.
-
-	* makeinfo/tests/htmlpara.txi: New test, for the commands affected
-	by the <p> output at paragraph beginning.
-
-	* makeinfo/makeinfo.h (expensive_validation): New option.
-
-	* makeinfo/makeinfo.c (long_options): Add expensive_validation.
-	(usage): Likewise.
-
-	* makeinfo/node.c (find_node): If NAME isn't found verbatim, try
-	expanding it and every node name in tag table, before comparing
-	them, but only if expensive_validation is non-zero.
-	(find_node_reference): Likewise.
-	(cm_node): Don't expand node name and its links here.
-	(validate_file): If direct comparisons fail, try expanding the
-	comparees before giving up, unless expensive_validation is zero.
-	Switch the order of NODE and UP in error message about a lacking
-	menu item.
-
-1999-04-07  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/index.c (cm_printindex): Don't output "Menu" header.
-
-	* makeinfo/node.c (get_node_token): Collapse whitespace in node
-	names.
-	(glean_node_from_menu, expand_node_name): Likewise.
-
-	* info/infomap.c (initialize_vi_like_keymaps): Bind all the 256
-	keys to ea_insert, like the Emacs-like case does.
-
-	* doc/info-stnd.texi (Invoking Info): Document support for files
-	compessed with bzip2, and the --vi-keys option.
-	(Many places): Document key bindings under --vi-keys.
-
-1999-04-06  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* info/session.c (info_last_node, info_first_node): With a numeric
-	argument, go to ARGth node counting from the beginning.  Skip
-	anchor tags when looking for the target node--the last tag can be
-	an anchor, for example.
-	(last_search_direction, last_search_case_sensitive): New
-	variables.
-	(last_search_for_string): Remove variable.
-	(info_search_internal): Always move point by one notch before
-	beginning the search, to avoid complications in repeated search
-	commands.  When looking for the next node tag, skip any anchor
-	tags.
-	(info_search_1): Accept a 5th argument ASK_FOR_STRING, and only
-	prompt for search string if it's non-zero.  All callers changed.
-	Look for the COUNTth occurence of the string.
-	(info_search, info_search_backward, info_search_case_sensitively):
-	Set last_search_direction and last_search_case_sensitive.
-	(info_search_next, info_search_previous): New commands, repeat
-	last search in the same or reverse direction without prompting the
-	user for the string.
-
-	* info/infomap.c (initialize_emacs_like_keymaps): Bind `C-x n' to
-	info_search_next and `C-x N' to info_search_previous.
-	(initialize_vi_like_keymaps): Bind `n' to info_search_next and `N'
-	to info_search_previous.
-
-1999-04-04  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/makeinfo.c (get_rest_of_line): Don't expand non-macros,
-	so that macro-expanded output will still have them.
-
-1999-04-03  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/node.c (cm_node): Expand the node name and its links
-	completely before using them, so that they could use e.g. @value{}
-	etc.
-
-	* makeinfo/makeinfo.c (replace_with_expansion): Don't
-	remember_itext if we are executing_string.
-
-	* makeinfo/sectioning.c (sectioning_html): Remove #ifdef
-	HAVE_MACROS.  Don't call me_execute_string if already
-	executing_string.
-
-	* makeinfo/toc.c (toc_add_entry): Expand macros in TOCNAME right
-	here, since the macro can be later redefined.
-	(contents_update_html, contents_update_info,
-	shortcontents_update_html, shortcontents_update_info): Use stdio
-	functions for output instead of add_word etc.
-	(rewrite_top, contents_update, shortcontents_update, toc_update):
-	New functions, replace the TOC placebo with the actual TOC.
-	(cm_contents): Output a placebo instead of writing the TOC.
-	(cm_shortcontents): Output a placebo instead of writing the short
-	TOC.
-
-	* makeinfo/makeinfo.c (convert_from_loaded_file): Call toc_update
-	if appropriate.
-
-	* makeinfo/sectioning.c (cm_top): Don't output the HTML header
-	here, since the Top node might be preceeded by other commands,
-	like @contents.
-
-	* makeinfo/cmds.c (cm_settitle): Output the HTML header here.
-
-	* makeinfo/node.c (set_current_output_filename): New function,
-	saves the name of the actual file we are now writing, including in
-	the case of split-HTML output.
-	(cm_node): Call it to record the name of output file.
-
-	* makeinfo/footnote.c (free_pending_notes): Re-initialize
-	current_footnote_number to 1.
-
-	* makeinfo/index.c (index_add_arg): Remove redundant xstrdup.
-	(cm_printindex): Don't free index->entry: it is freed in
-	free_index, if, e.g., there's more than one file to convert.
-
-	* makeinfo/makeinfo.c (init_internals): Call toc_free.
-
-Mon Apr  5 16:53:33 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/Makefile.am: Texmf_{texinfo,dvips}: dirs not files.  From
- 		Kurt Hornik.
-
-Wed Mar 31 13:50:09 1999  Karl Berry  <karl@gnu.org>
-
-	* Pretest 3.12h.
-
-	* makeinfo/node.c (last_node_p): new fn.
-	(split_file): call it, instead of assuming no more entries means
-		no more nodes.  (Loses with anchors.)
-	Report from: "Oleg S. Tihonov" <ost@benetnash.ffke-campus.mipt.ru>.
-
-	* makeinfo/index.c (sort_index): whether an entry is @code or not
-		depends on the element, not the index, because of synindex.
-
-	* doc/Makefile.am (install-tex): Must use $(TEXMF), do
-		$(mkinstalldirs) on tex dirs.
-	From: Nathan Sidwell <nathan@acm.org>.
-
-	* doc/texinfo.txi: Document need for blank line before @image if
- 		you want space.
-
-	* Install changes from Eli:
-
-	1999-03-09  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* info/infodoc.c (info_internal_help_text): Remove hard-wired key
-	names, use %-10s instead.
-	(info_help_keys_text): New variable, holds two variants of keys
-	that invoke basic commands, indexed by vi_keys_p.
-	(create_internal_info_help_node): Use info_help_keys_text[].
-
-	* info/window.c (build_message_buffer): Support more general
-	format strings, like %-10.15s, %+4d etc.
-
-	* info/infomap.c (initialize_vi_like_keymaps): Bind ESC-h, ESC-t,
-	C-x LFD and C-x RET.
-
-	1999-03-08  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* util/install-info.c (output_dirfile): Sort the entries and
-	output them in alphabetic order.  Output each entry only in those
-	sections where it belongs.
-	(parse_input): New function, code moved from main.  Process
-	sections and entries in a single loop, and record with each entry
-	the list of sections where that entry belongs.  Record each entry
-	separately, not all of them together as a single block.
-	(parse_dir_file): New function, code moved from main.
-	(main): Move code to parse_input and parse_dir_file.  Put the new
-	entries only into sections where they belong.
-	(compare_entries_text): New function, called when sorting new
-	entries.
-
-	* info/infomap.c (initialize_vi_like_keymaps): New function.  Bind
-	keys a-la Less, including new functions from session.c below.
-	(initialize_emacs_like_keymaps): New function, with the guts of
-	initialize_info_keymaps.
-
-	* info/session.c (info_scroll_forward, info_scroll_backward): If
-	default_window_size is non-negative, use it as the default number
-	of lines to scroll.
-	(info_scroll_forward_set_window, info_scroll_backward_set_window,
-	info_down_line, info_up_line, info_scroll_half_screen_down,
-	info_scroll_half_screen_up, info_search_backward): New functions,
-	for Less-like look and feel.
-
-Tue Mar 30 16:44:53 UTC 1999 Karl Heinz Marbaise <kama@hippo.fido.de>
-
-        * doc/txi-de.tex:
-            - added additional putwordin
-        * doc/texinfo.txi:
-            - changed defivar into deftypeivar
-        * makeinfo/sectioning.c:
-            - changed output of anchors based on problems with ie.
-        * makeinfo/defun.c:
-            - output in HTML mode changed to be on previous state.
-        * makeinfo/insertion.c:
-            - fixed up HTML output for deftypeivar.
-
-1999-03-30  Akim Demaille  <demaille@inf.enst.fr>
-
-        * texi2dvi ($tmpdir): Avoid security holes.
-
-Fri Mar 26 17:06:55 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/cmds.c (cm_exdent): rewrite to preserve blank lines.
-	Bug from: "Oleg S. Tihonov" <ost@benetnash.ffke-campus.mipt.ru>.
-
-	* makeinfo/cmds.c (cm_exdent): arg is in `roman'.
-
-Thu Mar 25 16:21:27 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/insertion.c,
-	* makeinfo/defun.c,
-	* makeinfo/insertion.h (insertion_type): add deftypeivar.
-	* makeinfo/defun.h (cm_defun): declare here.
-	* makeinfo/cmds.c (defun.h): include.
-	* doc/texinfo.txi (deftypeivar[x]): new commands.
-	* makeinfo/cmds.c (deftypeivar[x]): new commands.
-
-	* makeinfo/cmds.c (cm_exdent): save, set and restore
- 		in_fixed_width_font.
-
-	* doc/texinfo.txi (uref): rewrite.
-
-	* info/info.c (info_short_help): more spaces for new help2man.
-
-	* makeinfo/node.c (cm_node): output node name in html, change
- 		navbar punctuation.
-
-	* doc/texinfo.5: Fix URL.
-
-	* Finally installed this:
-	1998-05-01  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-	* makeinfo/makeinfo.c (convert_from_loaded_file): When the file
-	contains no @setfilename then always look for \input (not
-	\include) in the first line and skip that.  Don't skip the first
-	line if no \input was found.
-
-1999-03-24  Akim Demaille  <demaille@inf.enst.fr>
-
-	* configure.in (AC_HEADER_STAT): Added.
-	* util/texindex.c (main): Check infiles are not directories.
-
-1999-03-24  Akim Demaille  <demaille@inf.enst.fr>
-
-	* texi2dvi (index_files): Don't use `!' to run sed -e "s!foo$!!"
-        since the shell will interpret `$!'.
-
-Tue Mar 23 16:41:08 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi (uref): rewrite to make HTML output read more
- 		nicely.  From Tim S.
-
-	* info/info.c (info_short_help): include examples.
-
-	* makeinfo/makeinfo.c (close_paragraph_with_lines): move earlier
- 		so can be static.
-
-	* makeinfo/sectioning.c,
-	* makeinfo/node.c,
-	* makeinfo/makeinfo.h,
-	* makeinfo/makeinfo.c,
-	* makeinfo/macro.c,
-	* makeinfo/insertion.c,
-	* makeinfo/cmds.c,
-	* makeinfo/files.c,
-	* makeinfo/footnote.c (size_of_input_text): rename to
- 		input_text_length.
-
-	* makeinfo/makeinfo.c (cm_xref): make wrong-char-following a warning.
- 	(replace_with_expansion): remove bogus conditional that was duplicated
-	unconditionally.
-	From: Hans-Bernhard Broeker <broeker@physik.rwth-aachen.de>
-
-Mon Mar 22 14:39:59 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/Makefile.am (install-tex): parenthesize.
-
-	* Makefile.am (dist-hook): remove, it uses hard links so we chmod
- 		all our sources.
-
-	* makeinfo/toc.c,
-	* makeinfo/defun.c,
-	* makeinfo/sectioning.c: Use _, not N_.
-
-	* info/Makefile.am (ginfo_SOURCES): include $(BUILT_SOURCES)
- 		explicitly.
-
-	* makeinfo/lang.c,
-	* makeinfo/lang.h: ISO-639 updates.
-
-	* makeinfo/cmds.c: exampleindent changes.
-
-	* info/info.c (info_short_help): reformat somewhat, and don't say
-		info info options any more.
-
-	* doc/info-stnd.texi (Invoking): make description format somewhat
- 		more standard.
-
-	* info/infomap.c (Initialize_info_keymaps): do ea_insert bindings
-		first so subsequent bindings (e.g., for ESC) override.
-
-Sun Mar 21 17:31:00 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/multi.c (output_multitable_row): remove unnecessary
-	trailing whitespace from output, output blank row for blank @item.
-
-	* doc/texinfo.txi: Remove extra @item in language multitable.
-
-Sat Mar 20 12:30:25 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi: Update language table from ISO 639:
-	http://www.iro.umontreal.ca/contrib/po/iso-639.  From kama.
-
-	* doc/texinfo.txi (exampleindent): document.
-
-	* doc/texinfo.txi (Creating an Info File): use this for the node name.
-
-	* doc/info.texi: Make Texinfo references consistent, etc.
-
-1999-03-18  Yoshiki Hayashi  <g740685@komaba.ecc.u-tokyo.ac.jp>
-
-	* makeinfo/makeinfo.c (set_default_indentation_increment): new
-	routine.
-	* makeinfo/insertion.c (cm_exampleindent): new routine.
-	Call set_default_indentation_increment.
-
-Mon Mar 15 17:06:15 1999  Karl Berry  <karl@gnu.org>
-
-	* info/Makefile.am (ginfo_SOURCES): Remove doc.c and funs.h in
-		hopes they then won't be distributed.  Report from Andreas.
-
-	* makeinfo/cmds.c (cm_sp): close paragraph and disable filling to
-		produce blank lines in info. 
-	Report from: Michael Vanier <mvanier@bbb.caltech.edu>.
-
-	* doc/texinfo.txi: Attempt to get Edition info on one line.
-
-	* makeinfo/makeinfo.h (cr_or_whitespace): use whitespace and check
- 		for \r.	(skip_whitespace_and_newlines, command_char): use it.
- 	Report from bonzini@gnu.org.
-
-	* makeinfo/cmds.c (cm_center): save and restore filling_enabled,
- 		so @center can be used inside an @example.  Bug from kama.
-
-1999-03-13  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/footnote.c (cm_footnote): In separate footnote style,
-	generate a reference to "foo-Footnote-NN" for each footnote.
-	(output_pending_notes): In separate footnote style, generate an
-	anchor "foo-Footnote-NN" for each footnote, so that the link in
-	the parent node would lead directly to the footnote.
-
-	* info/footnotes.c (make_footnotes_node): Recognize the new
-	"foo-Footnote-NN" style of footnote references.
-
-1999-03-09  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
-
-	* configure.in (AC_OUTPUT): Remove command to create po/Makefile,
-	already done by AM_GNU_GETTEXT.
-
-Tue Mar  9 17:48:46 1999  Karl Berry  <karl@gnu.org>
-
-	* Makefile.am (dist-hook): make distribution directory writable.
-
-	* Installed these changes:
-
-  1999-03-04  Akim Demaille  <demaille@inf.enst.fr>
-
-	    * texi2dvi (bibtex): Allow several runs of bibtex, this can be
-	    used if bibentries reference other bibentries.  Moreover, looking
-	    for `Citation' in the LOG should be enough to avoid uneless runs.
-
-  Sun Mar  7 15:15:00 1999 UTC Karl Heinz Marbaise <kama@hippo.fido.de>
-
-      * makeinfo/sectioning.{c,h}:
-	      - using defines instead of literals.
-	      - cleaned up some stylistic matters like Karl Berry
-		suggested. Handling of things like:
-		@unnumbered ..
-		@section ...
-		now it works correct.
-
-      * makeinfo/toc.{c,h}
-	      - addTocEntry, freeToc changed into toc_add_entry
-		toc_free. stylistics changed.
-
-      * makeinfo/iso2cht.pl,iso-639: script, table from the web.
-	      - perl script converting the iso-639 table from the web
-		into the appropiate files (isoenum.h, isotab.c and
-		iso.texi) which can be inserted directly into
-		lang.c, lang.h and texinfo.txi.
-
-Tue Mar  9 17:47:59 1999  Karl Berry  <karl@gnu.org>
-
-	* configure.in: Bump to 3.12g.
-
-Sun Mar  7 07:01:19 1999  Karl Berry  <karl@gnu.org>
-
-	* info/infomap.c: Don't do isprint, just bind everything.
-
-Fri Mar  5 14:31:42 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi,
-	* makeinfo/makeinfo.c: Document that --no-headers writes to stdout
- 		by default.
-
-	* doc/texinfo.txi: @setchapternewpage doesn't change
-	\bindingoffset, just headers. Recommend not including it in the
-		manual source at all.
-
-	* makeinfo/node.c (write_tag_table_internal): set
- 		in_fixed_width_font while constructing this so --- doesn't
- 		collapse to --, etc.  Bug report from Sergio.
-
-	* dir-example: Add a2ps stuff.
-
-	* info/session.c: Allow any character in search string.
-
-	* info/infodoc.c (describe_key): don't assume non-latin1
- 		characters are undefined.
-
-	* info/infomap.c (initialize_info_keymaps): make all characters
-		insertable by default in echo area.  From Eli.
-
-	* Installed these changes:
-
-  Wed Feb 23 22:00:00 1999  Karl Heinz Marbaise <kama@hippo.fido.de>
-
-      * makeinfo/sectioning.{c,h}:
-	      - added to hold complete handling of sectioning
-		a little step towards modularization ;-)
-
-      * makeinfo/cmds.c:
-	      - sectioning_alist moved to sectioning.c and
-		added information about enumerated chapter,
-		section ..., appendix or not. Everything
-		which has any relationship with sectioning
-		moved to sectioning.{c,h} I hope I have found
-		all.
-
-      * makeinfo/toc.{c,h}:
-	      - added for complete handling of "table of contents"
-		"short contents". Better ASCII only support
-		(--no-headers) so no Text "Menu" is printed.
-		May be we can do more.
-
-      * makeinfo/makeinfo.{c,h}:
-	      - added new command line switch --number to enumerate
-		chapter, sections etc.
-
-      * doc/texinfo.txi:
-	      - --number option documented.
-
-  1999-02-28  Yoshiki Hayashi  <g740685@komaba.ecc.u-tokyo.ac.jp>
-
-	  * makeinfo/insertion.c (in_paragraph): New variable.
-	  (cm_item): Add </p> only if <p> is open.
-	  * makeinfo/makeinfo.c (handle_menu_entry): Ditto.
-
-	  * makeinfo/insertion.c (begin_insertion),
-	  * makeinfo/makeinfo.c (handle_menu_entry): If commentary 
-	  precedes first menu item, put them outside of <ul>. 
-	  Put <p> and </p> correctly.
-
-  1999-02-27  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	  * info/info.c (info_short_help): Document --show-options and
-	  --usage.
-
-  1999-02-26  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	  * info/makedoc.c (main) [STRIP_DOT_EXE]: Strip the .exe suffix, so
-	  that doc.c says "./makedoc.c", not "./makedoc.exe.c".
-
-	  * info/info.c (goto_invocation_p): New variable.
-	  (long_options): New options --show-options and its alias --usage.
-	  (main): Don't update the display until we find the first node to
-	  be displayed, to avoid flushing incorrect display.  If user wants
-	  to see the command-line options node right away, display whatever
-	  info_intuit_options_node finds.
-
-	  * info/session.c (info_intuit_options_node): New function, uses
-	  heuristics to find the node which describes program's invocation.
-	  (info_goto_invocation_node): New command, asks for a program's
-	  name and displays the invocation node of that program.
-	  (entry_in_menu): New function, fuzzily looks for a menu entry in a
-	  node's menu.
-	  (program_name_from_file_name): New function, suggests a program
-	  name given a name of its Info file.
-	  (info_search_in_node): Accept an additional argument: a flag to
-	  search case-sensitively; all callers changed.  If case-sensitive
-	  search is required, don't turn on the case-fold flag in the search
-	  binding.
-	  (info_search_internal): Accept an additional argument: a flag to
-	  search case-sensitively; all callers changed.  Share the last
-	  search string between normal and case-sensitive search commands.
-	  (info_search_1): New function, with the guts that previously
-	  belonged to info_search.  If the search is case-sensitive,
-	  mentions that in the prompt for the search string.  If the search
-	  string includes upper-case characters, searches case-sensitively.
-	  (info_search): Calls info_search_1 with zero case-sensitivity
-	  flag.
-	  (info_search_case_sensitively): New command, calls info_search_1
-	  with non-zero case-sensitivity flag.
-	  (incremental_search): If the search
-	  string includes upper-case characters, searches case-sensitively.
-
-	  * info/search.c (search_backward): Fix bug in case-sensitive
-	  search.
-
-	  * info/infomap.c (initialize_info_keymaps): `-' in info window map
-	  produces negative arguments.  `S' invokes case-sensitive search.
-	  `O' and `I' invoke goto-invocation.
-
-	  * doc/info-stnd.texi (Invoking Info): Document --show-options.
-	  (Node Commands): Document `O', goto-invocation.
-	  (Searching Commands): Document `S' and the case-sensitive search
-	  when the search string includes upper-case letters.  Document `/'
-	  as a synonym for `s'.
-	  (Miscellaneous Commands): Document `M--' and `-'.
-
-  1999-02-25  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	  * info/info.c (main): Under --index-search, search indices *after*
-	  following menus, so that we don't look for an index in DIR.
-
-
-Wed Mar  3 17:20:07 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/cmds.c: Do not output <small> in info mode.
-	From: Eli Zaretskii <eliz@is.elta.co.il>.
-
-	* makeinfo/insertion.c (enum_html): Remove unused var temp.
-	From: Yoshiki Hayashi <g740685@komaba.ecc.u-tokyo.ac.jp>
-
-	* info/infodoc.c: Avoid translation of blank lines.
-
-	* info/tilde.c,
-	* info/man.c,
-	* makeinfo/index.c (index_add_arg): avoid use of alloca.
-
-	* info/echo-area.c: Don't pause for an additional 75 microseconds.
-	Noted by Eli.
+	* info/echo-area.c (inform_in_echo_area): avoid buffer overrun.
+	Report from: Roman Werpachowski <rwerp@gazeta.pl>,
+	7 Aug 2004 01:18:32 +0200.
 	
-	* configure.in: Bump to 3.12f.
-
-	* doc/texinfo.txi: findex enddots.  From Eli.
-
-1999-03-01  Yoshiki Hayashi  <g740685@komaba.ecc.u-tokyo.ac.jp>
-
-	* makeinfo/makeinfo.c (insert_html_tag): Add <p> when 
-	paragraph is not opened.
-	(sectioning_html): Call close_paragraph so that paragraph
-	will be started.
-
-1999-02-26  Akim Demaille  <demaille@inf.enst.fr>
-
-        * texi2dvi (get_xref_files): Take $filename_noext as $1.
-        (get_xref_files): Look for $1.idx only, not *.idx.
-        (get_xref_files): Look for $1.cb files (\usepackage{changebar}).
-        * texi2dvi: Look for rerun requests in LOG files in addition to
-        xref files comparison.
-        (bibtex): Remove useless `./' (already added in
-        command_line_filename).
-        (filename_dir): Smarter sed expression that handles file names
-        with no directory part.
-        (txiversion): Removed useless () (`` already guarantee a subshell).
-
-1999-02-25  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
-
-	* makeinfo/multi.c (find_template_width): Fix operator precedence.
-
-Tue Feb 23 10:35:53 1999  Karl Berry  <karl@gnu.org>
-
-	* dir-example: ccmode not cc-mode.  From hds.
-
-Mon Feb 22 07:34:00 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/lang.c,
-	* doc/texinfo.txi: Fix kazakhkh typo.
-
-1999-02-21  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* djgpp/config.sed: Add pcterm.c to terminal.o dependencies.
-
-1999-02-21  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
-
-	* makeinfo/lang.c (cm_accent_generic): Emit the accent character
-	only once, after the argument.
-
-Sun Feb 21 16:36:14 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/makeinfo.c (handle_menu_entry): new routine.
-	(reader_loop): call it, allowing for comments in menus.
-
-	* makeinfo/node.c: Rearrange functions to make static, etc.
-
-	* doc/Makefile.am (EXTRA_DIST, install-tex): Add txi-cs and txi-no.
-
-1999-02-20  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* util/install-info.c (open_possibly_compressed_file): Output
-	explicit message about empty input files.
-	(insert_entry_here): Insert multiple entries in alphabetical order.
-
-Fri Feb 19 09:13:28 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/insertion.c (enum_html): new routine.
-	(begin_insertion): call it.
-	Based on code from: Yoshiki Hayashi <g740685@komaba.ecc.u-tokyo.ac.jp>.
+	* info/echo-area.h (inform_in_echo_area): declare arg as const,
+	while we're at it.
 
-	* lib/xexit.c (EXIT_FAILURE) [!defined EXIT_SUCCESS && VMS]: weird
-		long value.
-	From: Lars Hecking <lhecking@nmrc.ucc.ie>
+2004-08-02  Karl Berry  <karl@gnu.org>
 
-Thu Feb 18 16:42:10 1999  Karl Berry  <karl@gnu.org>
+	* makeinfo/cmds.c (cm_acronym_or_abbr): use strchr, not index.
+	Report from: Prof Brian Ripley <ripley@stats.ox.ac.uk>, 
+	2 Aug 2004 12:47:36 +0100 (BST)
 
-	* makeinfo/node.h (remember_node_reference): decl.
-	* makeinfo/makeinfo.c (find_unused_reference): dump unused decl.
-
-1999-02-18  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/cmds.c (cm_dots, cm_enddots): Don't produce &#133; for
-	HTML, as too many browsers don't support it; use "..." in a
-	smaller font.
-	(cm_top): Output the lang= attribute inside <html>.
-
-	* makeinfo/node.c (cm_node): Output the lang= attribute inside
-	<html>.
-
-	* makeinfo/footnote.c (output_pending_notes): Generate <ol>
-	instead of <dl compact>.  Make the text of each footnote start a
-	new paragraph.
-
-1999-02-17  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/insertion.c (cm_item): Remove <dd> when immediately
-	followed by a <dt>.  Add a <br> before every <dt>, except if we
-	are converting @itemx, or in the first item after <dl>.
-	(begin_insertion): Use <dl> for tables, to make it look closer to
-	the Info output.  Don't output a newline after a <pre>.
-
-1999-02-17  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/makeinfo.c (handle_variable): Don't backup input
-	pointer if we hit the end of text (usually, inside
-	execute_string).
-	* makeinfo/insertion.c (get_item_function): Likewise.
-
-Wed Feb 17 15:09:06 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi: Better indexing of space entries.
-
-	* makeinfo/multi.c (find_template_width): new routine to really
- 		parse @multitable {...} templates.
- 	(setup_multitable_parameters): call it.
-	Bug report from: Sergio Pokrovskij <pok@nbsp.nsk.su>.
-
-	* lib/system.h (substring): declare.
-
-	* lib/Makefile.am (libtxi_a_SOURCES): add substring.c.
-
-	* makeinfo/defun.c: Move substring to lib.
-
-	* util/texindex.c (tempcopy): no longer used.
-      	(maketempname): make static.
-
-	* Installed these changes:
-
-1999-02-13  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/cmds.c (cm_acronym): New function, makes @acronym
-	produce a smaller font size in HTML mode.
-	(cm_sc): Produce smaller font size in HTML mode.
-
-	* makeinfo/footnote.c (cm_footnote): In HTML output, make the
-	footnote number be a superscript; remove [] around the link.
-
-	* makeinfo/cmds.c (cm_var_sc): Separated into two functions:
-	cm_var and cm_sc, since @var and @sc have different effects in
-	HTML output.
-
-	* makeinfo/makeinfo.c (cm_xref, cm_inforef): Don't put "[]" around
-	HTML links.
-
-	* info/pcterm.c (DJGPP_keytab): Add translation for Alt-PgUp and
-	Alt-PgDn, to support the new M-prior key.
-
-Wed Feb 17 11:50:46 1999  Karl Berry  <karl@gnu.org>
-
-	* doc/texinfo.txi: Don't mention texi2roff so prominently.
-
-	* makeinfo/makeinfo.c: Pass enclose_expand to remember_brace
- 		rather than enclose_command.  From Eli.
-
-	* makeinfo/macro.c (cm_alias, cm_definfoenclose): Expand macros in
-		first call to get_until_in_line.  From Eli.
-
-	* info/makedoc.c,
-	* info/session.c,
-	* info/man.c,
-	* info/tilde.c,
-	* info/info.c,
-	* makeinfo/files.c,
-	* makeinfo/multi.c,
-	* makeinfo/node.c,
-	* makeinfo/makeinfo.c: Use xexit.
-	* makeinfo/makeinfo.h (NO_ERROR, FATAL, SYNTAX): remove.
-
-	* info/terminal.c: Avoid sleep unless on sun-cmd terminal.
-
-	* lib/xexit.c (EXIT_FAILURE) [!EXIT_FAILURE]: #define to 1 to fix
-		Sony NEWS-OS 4.0C lossage.  From Akim.
-
-	* info/infodoc.c: Translate where is doc string, underline lines
- 		in help.  
-	From: Trond Endrestol <trond@agamemnon.gtf.ol.no>
-
-	* makeinfo/cmds.c (cm_dots, cm_enddots): go back to ... and ....,
-		&#133; apparently doesn't work widely enough.
-
-Tue Feb 16 07:37:54 1999  Karl Berry  <karl@gnu.org>
-
-	* configure.in (ALL_LINGUAS): add de_AT.
-
-	* util/texi2dvi: Redirect cd output to /dev/null when determining
- 		txiversion.
-
-Mon Feb 15 13:43:37 1999  Karl Berry  <karl@gnu.org>
-
-	* util/install-info.c,
-	* util/texindex.c: Call xexit instead of exit.
-
-	* lib/system.h (xexit): Declare.
-
-	* lib/Makefile.am (libtxi_a_SOURCES): Add xexit.c.
-
-	* doc/texinfo.txi: Document that @documentencoding is used in the
- 		HTML output.
-
-	* makeinfo/cmds.c (cm_top): use document_encoding if set.
-	(command_table): call cm_documentencoding instead of no-op.
-	* makeinfo/lang.c (document_encoding, cm_documentencoding): define.
-	* makeinfo/lang.h (document_encoding, cm_documentencoding): declare.
-
-	* makeinfo/insertion.c: Restore </p> before <li>.
-
-	* util/texi2dvi: If texinfo.tex version is too low for macros, use
- 		makeinfo.
-
-	* makeinfo/cmds.c (cm_center): save and restore value of
-	       indented_fill, otherwise @center within an @enumerate (say)
-	       also closes the indentation.
-	Bug from: Sergio Pokrovskij <pok@nbsp.nsk.su>.
-
-Sun Feb 14 15:25:02 1999  Karl Berry  <karl@gnu.org>
-
-	* makeinfo/makeinfo.c: Doc fix.
-
-	* doc/texinfo.txi: Be enthusiastic if people want to implement
-		more output formats, but use makeinfo to do the job.
-
-	* makeinfo/index.c (index_element_compare): Use strcoll if it's
- 		available.
-	* configure.in: Call AC_FUNC_STRCOLL.
-	* makeinfo/makeinfo.c (main): Use LC_CTYPE and LC_COLLATE
- 		categories.  Suggestion from Oleg.
-
-	* lib/system.h (setlocale) [!HAVE_SETLOCALE]: #define away.
-	Suggestion from Akim.
-
-	* doc/texinfo.txi: Document @paragraphindent working in TeX now.
+2004-07-31  Karl Berry  <karl@gnu.org>
 
 	* doc/texinfo.txi,
-	* makeinfo/lang.c,
-	* makeinfo/lang.h (language_code_type): abbrev changes from Oleg.
-
-	* makeinfo/cmds.c,
-	* makeinfo/node.c: Only translate `Next:', `Previous:', and `Up:',
- 		not the whole href.  From Eli.
-
-	* doc/texinfo.txi: Document that only unsplit html output is
- 		supported in this release.
-
-Sat Feb 13 17:55:30 1999  Karl Berry  <karl@gnu.org>
-
-	* configure.in: Check for termlib before termcap for sake of
- 		Solaris (judging from less-332 configure.in) and maybe
- 		HP-UX 11.
-
-	* doc/texinfo.txi (Footnote commands): incoherency reported by Aharon.
-	Language vs country fixes from Oleg.
-
-1999-02-13  Karl Eichwalder  <ke@gnu.franken.de>
-
-	* makeinfo/node.c (cm_node): Tag navigation links as translatable.
-	* makeinfo/cmds.c (cm_top): Ditto.
-
-Wed Feb 10 22:00:00 1999  Karl Heinz Marbaise <kama@hippo.fido.de>
-
-    * makeinfo/defun.h:
-            - new because we need get_base_type-function
-              accessible in insertion.c
-
-    * makeinfo/defun.c:
-            - complete HTML handling of the @def... things.
-
-    * makeinfo/Makefile.am:
-            - defun.h added as part of makeinfo.
+	* doc/texinfo.tex,
+	* makeinfo/cmds.c, cmds.h, xml.c, xml.h,
+	* util/texinfo.dtd: new command @abbr, suggested by Paul Eggert,
+	who also sent the original documentation.
 
-    * makeinfo/makeinfo.c:
-            - define looking_at moved into header-file, because
-              we need it in defun.c
+2004-07-30  Karl Berry  <karl@gnu.org>
 
-    * makeinfo/insertion.c:
-            - some minor changes made to support the @def...
-              things in HTML.
-    
-    * makeinfo/lang.c: (cm_accent_generic)
-            - bug fixed. Using umlaut (accent ...)
-              would produce &A only if an umlaut follows
-              an empty line.
-            - bug fixed. Because things like &tilde; &grave;
-              and &circ; do not exist as standalone characters
-              in HTML.
-            - cm_special_char now produce correct HTML for
-              @O{} and @o{}.
-            - warning using _("Text") instead "Text" (gettext).
+	* info/infomap.c (initialize_vi_like_keymaps): bind j to
+	info_next_line and k to info_prev_line.  From Eli.
 
-    * makeinfo/cmds.c:
-            - @url fixed. Display the given Text.
+2004-07-30  Maciej W. Rozycki  <macro@linux-mips.org>
 
-    * doc/texinfo.txi:
-            - corrected the references for @uref, because
-              they were given as "url" instead of "uref".
-              @uref has three arguments, so show them in
-              command list.
+	* info/filesys.c (extract_colon_unit): Clean up handling of the 
+	end of string.
 
-Wed Feb 10 17:27:58 1999  Karl Berry  <karl@gnu.org>
+2004-07-27  Karl Berry  <karl@gnu.org>
 
-	* doc/texinfo.txi: Rewrite for overfull box.
+	* doc/texinfo.txi (verb): explicitly warn that @verb cannot be
+	used in xref contexts.
 
-Tue Feb  9 19:03:16 1999  Karl Berry  <karl@gnu.org>
+2004-07-27  Stepan Kasal  <kasal@ucw.cz>
 
-	* doc/texinfo.txi: Document more HTML output stuff.  Based on esr
- 		changes.
-	* makeinfo/macro.c,
-	* makeinfo/macro.h,
-	* makeinfo/makeinfo.c: Do alias and definfoenclose expansion.
-  		From esr.
+	* doc/texinfo.tex (\float): The parameters for @float are
+	  separated by commas; allow a space after each of the commas.
 
-Mon Feb  8 14:41:07 1999  Karl Berry  <karl@gnu.org>
+	The TeX code for @caption, @shortcaption and @copying now uses
+	a similar mechanism to macro definitions.  In detail:
 
-	* makeinfo/cmds.c: New commands @alias and @definfoenclose.
-	From: "Eric S. Raymond" <esr@snark.thyrsus.com>.
+	* doc/texinfo.tex (\macrobodyctxt, \macroargctxt): Generalize, ...
+	  (\scanctxt, \scanargctxt): ... and introduce new variants.
+	  (\scanexp): New macro--expand the parameter and call \scantokens.
+	  (\copying, \docopying, \insertcopying): Use \scanargctxt and
+	  \scanexp--this simplifies things a lot.
+	  (\caption, \shortcaption): Redefine, using \scanargctxt via ...
+	  (\docaption, \defcaption): ... these new macros.
+	  (\appendtomacro): Simplify code, using \expandafter.
 
-	* doc/texinfo.txi: Document @documentlanguage and
- 		@documentencoding.
+2004-07-26  Karl Berry  <karl@gnu.org>
 
-	* makeinfo/cmds.c: Move accent support to lang.c.
+        Avoid using the path for output files, since this led to problems
+        when incompatible files created by previous versions were found.
+	* makeinfo/files.c (find_and_load): introduce second parameter
+		use_path, set to 0 from the call in handle_delayed_writes,
+		1 in all cases.
+        * makeinfo/files.h: change decl.
+        * makeinfo/cmds.c, makeinfo.c, node.c: change calls.
+	From: Thomas Klausner <wiz@danbala.ifoer.tuwien.ac.at>,
+	14 Jul 2004 00:31:54 +0200.
 
-	* makeinfo/makeinfo.c (add_char): add &nbsp; rather than an 8-bit
- 		char for html.
+2004-07-25  Werner Lemberg  <wl@gnu.org>
 
-	* makeinfo/Makefile.am (makeinfo_SOURCES): add lang.[ch].
+	Rename @s to @slanted.
 
-	* doc/texinfo.txi: Be even more emphatic that @url is not
-		typically what you want.
-	* doc/texinfo.txi: Document that macro calls must use empty
- 		braces.
+	* doc/texinfo.tex (\s): Replace with...
+	(\slanted): This.
+	* doc/texinfo.txi: Updated.
 
-	* info/session.c: Do not translate node pointers.  From Karl E.
+	* makeinfo/cmds.c (command_table): Add @slanted, not @s.
+	(cm_s): Replace with...
+	(cm_slanted): This.
+	* makeinfo/cmds.h: Add cm_slanted, not cm_s..
 
-	* makeinfo/cmds.c (cm_dfn): Use <dfn>.  Suggestion from Eli.
+	* NEWS: Updated.
 
-Sun Feb  7 07:00:08 1999  Karl Berry  <karl@gnu.org>
+2004-07-24  Karl Berry  <karl@gnu.org>
 
-	* makeinfo/makeinfo.c: Make --html imply --no-split.
+	* info/echo-area.c (ea_possible_completions),
+	* info/session.c (forward_move_node_structure),
+	* info/infokey.c (compile): cast to intptr_t to avoid cast to
+		pointer from integer of different size.
+	From Havard Eidnes <he@netbsd.org>, 14 Jul 2004 20:38:59 +0200.
 
-	* makeinfo/cmds.c (cm_top): don't core dump if the top node has no
- 		next.
+2004-07-19  Alper Ersoy  <dirt@gtk.org>
 
-	* makeinfo/makeinfo.c (replace_with_expansion): compare length
-		after expansion with length of full input text before
-		expansion, not just the length of the expanded text.
-                Bug (contents2) reported by kama.
+	* makeinfo/makeinfo.c (main): with XML, instead of directly calling
+	handle_variable_internal for -D and -U command line flags, hold the
+	variable declarations until output document is started.
+	(convert_from_loaded_file): handle variables provided with -D and -U
+	flags here, just before entering the reader_loop.
+	(Otherwise, -D/-U with --xml cause a segfault.)
 
-	* info/infodoc.c (create_internal_info_help_node): gettext calls
-		to help msg strings. From Ulrich.
+2004-07-15  Werner Lemberg  <wl@gnu.org>
 
-Fri Feb  5 17:35:13 1999  Karl Berry  <karl@gnu.org>
+	* doc/texinfo.tex (\s): New command to typeset text with a slanted
+		font.
+	* doc/texinfo.txi: Document @s.
 
-	* util/texi2dvi: set makeinfo= for latex case.
+	* makeinfo/cmds.c (command_table): Add @s.
+	(cm_s): New function.  Currently the same as cm_i -- it probably
+		has to be adapted to Docbook and XML.
+	* makeinfo/cmds.h: Add prototype for cm_s.
 
-	* doc/texinfo.txi (@deftp summary): ref Data Types node that
-		actually describes it.  From kama.
+	* NEWS: Document new command @s.
 
-Thu Feb  4 07:39:10 1999  Karl Berry  <karl@gnu.org>
+2004-07-15  Werner Lemberg  <wl@gnu.org>
 
-	* makeinfo/makeinfo.c: Take it back.  Emacs info needs that text
- 		before the CTRL-_.
-	* makeinfo/makeinfo.c: Don't bother to output the header (This is
- 		-, produced ...) to stdout.
+	* doc/texinfo.tex (\TeX): Adjust \spacefactor to make it act like a
+		lowercase letter, not like a period.
 
-	* doc/texinfo.txi (Other Info Directories): Mention that dir files
- 		must be named dir.
+2004-07-12  Karl Berry  <karl@gnu.org>
 
-	* makeinfo/makeinfo.c (cm_uref): implement optional third
- 		argument.
-	* doc/texinfo.txi (uref): document it.
-	Suggestion from: Charles Karney <karney@pppl.gov>
+	* texinfo/texinfo.txi (Useful Highlighting): Include
+		cross-references to each of the commands.  Suggestion from
+		Wolfgang Pausch, 12 Jul 2004 08:26:28 +0200.
 
-	* doc/Makefile.am (info_TEXINFOS): put texinfo.txi first so
-		UPDATED reflects its modtime, rather than info-stnd's.
+	* texinfo/texinfo.txi (Invoking makeinfo),
+	* makeinfo/makeinfo.c: mention that --if-noFORMAT also processes
+	@ifnotFORMAT blocks.
+	Suggestion from Stepan.
 
-	* makeinfo/files.c (full_pathname) [!WIN32]: #endif in wrong place.
-	From: Yoshiki Hayashi <g740685@komaba.ecc.u-tokyo.ac.jp>
+2004-07-11  Karl Berry  <karl@gnu.org>
 
-	* makeinfo/cmds.c (cm_url): Remove URL: from output.  It's ugly.
+	* makeinfo/makeinfo.c (discard_until): leave input_text_offset at
+		the end of input_text if not found, not at one past the
+		end of input_text.  (Had erroneously put that in the block
+		only if an error was given.)  The result was a null byte
+		after macro expansions.  Report from Werner,
+		10 Jul 2004 15:36:40 +0200.		
 
-Wed Feb  3 16:05:03 1999  Karl Berry  <karl@gnu.org>
+	* makeinfo/node.c (split_file): fwrite Local Variables trailer so
+		it actually gets into the output of the top-level info
+		file; don't just insert_string.  
+	Report from: Werner LEMBERG, 11 Jul 2004 08:58:13 +0200.
 
-	* info/infodoc.c: Doc fix, zero not oh.
+2004-07-10  Karl Berry  <karl@gnu.org>
 
-	* makeinfo/makeinfo.c (add_char): don't ignore if
-		only_macro_expansion, even in no_headers case.
-		Otherwise menu items don't get remembered and defaulting
-		doesn't work.  Macros suck!
+        * util/texi2pdf: new script.
+        * util/Makefile.am: install it.
+        * doc/texinfo.txi: document it.
 
-	* util/texi2dvi (common): include orig_pwd.
-	(language): reguess for each file if not explicitly set.
+2004-07-05  Karl Berry  <karl@gnu.org>
 
-Tue Feb  2 16:22:32 1999  Karl Berry  <karl@gnu.org>
+	* makeinfo/xref.c (cm_email, cm_uref, et al.): 
+	* makeinfo/xml.c (xml_insert_indexentry, xml_insert_indexterm):
+	* makeinfo/sectioning.c (sectioning_underscore):
+	* makeinfo/makeinfo.c (cm_listoffloats): use %s, don't pass string to
+		execute_string.  Report from Christian Schenk.
 
-	* configure.in: Bump to 3.12d now.
+2004-07-02  Karl Berry  <karl@gnu.org>
 
-Mon Feb  1 14:46:45 1999  Karl Berry  <karl@gnu.org>
+	* makeinfo/makinfo.c (execute_string): don't worry about
+		mismatched multiline commands if executing_macro.
 
-	* makeinfo/insertion.c (cm_item): For itemize and enumerate, do
-		</p> before the <li> for html. Bug from Eli.
+2004-06-27  Karl Berry  <karl@gnu.org>
 
-	* makeinfo/index.c: Installed change in index.c:
-	Mon Dec 28 12:50:14 1998  Matthew Fredette  <fredette@mit.edu>
-		* makeinfo.c (index_add_arg): Use xstrdup on input_filename
-		when saving it in the new index entry.
+	* doc/texinfo.tex: Various doc fixes.
+	(\dosubindsanitize): propagate the same penalty
+	>10000, don't just use \nobreak.
+	(\sectionheading): insert a final penalty of
+	10001, not 10000.  This causes \aboveenvbreak to
+	insert \parskip glue, cancelling the
+	\vskip-\parskip done here.  Otherwise, when (e.g.)
+	@section is followed immediately by @example, the
+	example can be shrunk up above the section title.
 
-	* util/texi2dvi: cd / before cd $orig_pwd in case of DOS drive
- 		change.
+2004-06-14  Karl Berry  <karl@gnu.org>
 
-Sun Jan 31 16:39:01 1999  Karl Berry  <karl@gnu.org>
+	* doc/texinfo.tex (\commondummies, \indexnofonts): dummy-up @comma.
+	Report from Arnold.
 
-	* util/texi2dvi: Used sed to expand only the @{if,}tex parts of
-	the source since makeinfo's conditional options aren't ready yet
-		(from Akim).
-	Also use ${1+"$@"} for Digital Unix "$@" expansion bug (from Noah).
+2004-06-06  Karl Berry  <karl@gnu.org>
 
-	* util/install-info.c: Doc fix from Eli.
+	* makeinfo/index.c (index_add_arg): ensure all elements are always
+	initialized, including output_file, section, and section_name.
+	(cm_printindex): don't pass index->output_file to
+	add_html_block_elt_args if it is null.  Also do
+	not pass spurious extra index_name argument.
 
-	* doc/texinfo.txi: Oops, said we looked for .png twice.
+	* makeinfo/makeinfo.c (add_char): don't call html_output_head if
+	only_macro_expansion (e.g., a macro call in the
+	Top menu).  From: Yuri D'Elia <wavexx@yuv.info>,
+	05 Jun 2004 21:11:00 +0200.
 
-Sat Jan 30 17:18:14 1999  Karl Berry  <karl@gnu.org>
+2004-06-03  Karl Berry  <karl@gnu.org>
 
-	* info/session.c (forward_move_node_structure): remove tangled
-	code to merely print words instead of numbers; too hard to translate.
+	* info/session.c (info_menu_digit): use menu, rather than entry, to
+	avoid seg fault on "0" (the last item),
+	since menu has already been checked.
+	From: Malcolm Rowe <malcolm-gnu@farside.org.uk>,
+	02 Jun 2004 21:32:37 +0100.
 
-	* info/session.c: Missing _'s for more i18n.  From Trond.
+2004-05-17  Karl Berry  <karl@gnu.org>
 
-	* doc/Makefile.am (EXTRA_DIST): Include txi-no.tex from Trond.
+	* util/gendocs.sh, gendocs_template: use package.format.tar.gz
+		consistently.  Before, -, _, and . were all used.
 
-Sun Jan 24 09:28:12 1999  Karl Berry  <karl@gnu.org>
+2004-05-16  Karl Berry  <karl@gnu.org>
 
-	* Makefile.am (EXTRA_DIST): Use djgpp by itself instead of listing
-		each file separately (new feature in automake 1.4).
+	* lib/Makefile.am (libtxi_a_SOURCES): include strcase.h.
+	From: "Gerrit P. Haase" <gp@familiehaase.de>,
+	15 May 2004 21:50:52 +0200.
 
-	* makeinfo/insertion.c (begin_insertion): for quotation, always
-		increment current_indent even if html output, why not.
-		(Otherwise must not decrement current_indent in end_insertion.)
+	* util/gendocs.sh: force HTML output name, otherwise Emacs fails
+        with its "@setfilename ../...".
 
-	* doc/texinfo.txi: More overfull box fixes.
+2004-05-04  Karl Berry  <karl@gnu.org>
 
-	* makeinfo/insertion.c: Add some assertions and the beginnings of
- 		handling @tex.
+	* util/texi2dvi (TEX): don't use the value when it ends in
+	"latex"; TEX is also used by mpost.  Report from
+	Yvon.Henel@wanadoo.fr.
 
-	* doc/texinfo.txi: Fix overfull boxes, but tables of contents at
- 		the front.
+2004-04-29  Karl Berry  <karl@gnu.org>
 
-	* util/texi2dvi: Can't pass --no-ifinfo --iftex to makeinfo yet,
- 		it's not ready.
+	* doc.texinfo.txi (Invoking makeinfo): mention --plaintext.
+	From Akim.
 
-Sat Jan 23 10:22:16 1999  Karl Berry  <karl@gnu.org>
+	* doc/texinfo.tex (\emptyusermacros): can use \asis.
+	(\identity): remove.
 
-	* util/texi2dvi: Pass --no-ifinfo --iftex to makeinfo.
+2004-04-29  Stepan Kasal  <kasal@ucw.cz>
 
-Fri Jan 22 19:09:49 1999  Karl Berry  <karl@gnu.org>
+	* doc/texinfo.tex (\commondummiesnofonts, \indexnofonts):  In order
+	  to correctly transform words like `Dvo\v{r}\'{a}k' to `Dvorak'
+	  for index sorting, one has to define all accent control sequences
+	  as @asis.  (Current code would produce `Dvor{a}k'.)
 
-	* doc/texinfo.txi: Include version.texi before @settitle so
- 		@value{VERSION} gets expanded in the html title.  From kama.
+2004-04-29  Jan Nieuwenhuizen  <janneke@gnu.org>
 
-	* These patches from Tim Singletary <talon@clark.net>.
-	* makeinfo/makeinfo.c: Simplify and improve html menus.
-	* makeinfo/insertion.c (begin_insertion): simplify html menu case
- 		and set had_menu_commentary.
-	* makeinfo/insertion.h (had_menu_commentary): declare new global.
-	* makeinfo/node.h (glean_node_from_menu): declare.
-	* makeinfo/node.c (glean_node_from_menu): new arg to specify what
- 		type of reference to remember as.
+	* makeinfo/makeinfo.c (remember_error): Try cm_bye not more than
+	twice.  Fixes `Too many errors!  Gave up.' looping.
 
-	Date: Sun, 29 Nov 1998 09:21:01 -0500 (EST)
-	From: Tim Singletary <tsingle@talon.clark.net>
-	To: texinfo-pretest@tug.org
-	Subject: explanation of previous patches
+2004-04-26  Karl Berry  <karl@gnu.org>
 
-	> These diffs introduce some non-trivial changes into very
-	> sensitive parts of makeinfo, and it is hard to judge them without
-	> knowing what exactly do they solve.
+	* lib/system.h (STRCASEEQ, STRNCASEEQ): new #defines for
+		convenience.
+	* makeinfo/cmds.c (cm_strong): actually change the output to avoid a
+	spurious xref.  Suggestion from Jan Nieuwenhuizen
+	<janneke@gnu.org>, 26 Apr 2004 00:04:04 +0200, emacs-devel.
 
-	At a high level, these patches fix (or at least significantly improve)
-	the html conversion of menus.  Specifically, they fix bugs in the
-	conversion of menu commentary and detailmenu entries.
+	* automake 1.8.4.
 
-	The menu commentary fixes require some justification:  The unpatched
-	makeinfo attempts, with many bugs, to place menu commentary outside
-	the <menu> by adding </ul> and <ul> tags.  While I understand the
-	motivation for this, that there might be browsers that don't support
-	<p> within <menu>, I'm not aware of any such browser and don't see any
-	compelling reason to continue the </ul> kludge.
+2004-04-24  Karl Berry  <karl@gnu.org>
 
-	Certainly
-			<menu>
-			<li>First paragraph.
-			 <p>Second paragraph.
-			<li>Second item.
-			</menu>
-	is valid html!
+	* doc/texinfo.tex (\emptyusermacros, \identity): new macros.
+	(\indexdummiesnofonts): call it.
+	This is to semi-support macro calls in the arg to @deffn.
+	Report from: Akim Demaille <akim@epita.fr>, 20 Apr 2004 17:48:28 +0200.
 
-	Anyway, here's what my patches do:
+2004-04-21  Karl Berry  <karl@gnu.org>
 
-	1) Deleted the `<h4>Menu</h4>' at the beginning of each menu.  Using
-	   `<h4>' is wrong since menus don't usually come after an `h3'
-	   header.  `<b>' looks the same on most browsers, but my opinion is
-	   that there's no need for any header at all!
+	* configure.ac (gl_FUNC_MKSTEMP): rename from UTILS_FUNC_MKSTEMP,
+	per new gnulib code.
 
-	2) Deleted the `<li>' kludge at the begining of each menu.  It's no
-	   longer needed since I'm deleting the </ul> kludge.
+2004-04-20  Karl Berry  <karl@gnu.org>
 
-	3) Replace `in_menu_para', declared static in makeinfo.c:add_char()
-	   with `had_menu_commentary', declared globally.  Modified
-	   insertion.c:begin_insertion() to initialize had_menu_commentary to
-	   1 when beginning a menu.  Now there's enough state information for
-	   menu commentary to be processed within <menu> ... </menu>; the
-	   commentary can be seperated from the rest of the menu by bracketing
-	   it between <p>'s.
+	* makeinfo/tests/copying: force POSIX language setting.
 
-	   Note that the first patch had a bug initializing
-	   had_menu_commentary; the second patch fixes this bug.
+2004-04-19  Karl Berry  <karl@gnu.org>
 
-	4) Changed the semantics of the argument to
-	   node.c:glean_node_from_menu().  Previously, glean_node_from_menu()
-	   only called remember_node_reference() when the argument was
-	   non-zero.  But add_char() didn't call `glean_node_from_menu(1)'
-	   when processing detailmenu entries.  In other words, detailmenu
-	   entries didn't get registered as references, which lead to the html
-	   conversion of detailmenu entries not producing proper hrefs!
+	* makeinfo/cmds.c (cm_code): use <samp> for commands other than
+	@code, so we get typewriter output; and add `...'
+	for @samp.
+	Report from: John Blevin <blevin@lucent.com>, 
+	16 Apr 2004 11:40:01 -0400.
 
-	   The new semantics are that glean_node_from_menu always calls
-	   remember_node_reference(), but calls it with `menu_reference' when
-	   the first arg to glean_node_from_menu() is 1 and with
-	   `followed_reference' otherwise.  Now, detailmenu entries get
-	   registered as `followed_reference' (normal menu entries still get
-	   registered as `menu_reference') and the html conversion produces
-	   proper hrefs.
+	* makeinfo/html.c (html_output_head) [CSS_FONT_ROMAN,
+	CSS_FONT_SMALL_CAPS]: prettify.
 
-	5) The above changes made it possible to streamline the section of
-	   add_char() that deals with html menu text.
+2004-04-18  Karl Berry  <karl@gnu.org>
 
-	6) In an otherwise unrelated change, rewrote a section of
-	   glean_node_from_menu to no longer use `goto save_node;'.
+	* doc/texinfo.tex (\Orb): define if undefined.
+	Report from Laurent Siebenmann.
 
+	* util/dir-example: diff updates.
 
-Thu Jan 21 12:55:42 1999  Karl Berry  <karl@gnu.org>
+2004-04-13  Karl Berry  <karl@gnu.org>
 
-	* doc/info-stnd.texi: OK, let's try restoring the @include
- 		version.texi with the new automake.
+	* doc/texinfo.tex: remove trailing blanks.  suggestion from Jim.
 
-	* makeinfo/cmds.c: Improve HTML @pounds, @bullet, etc.
+2004-04-12  Paul Eggert  <eggert@twinsun.com>
 
-	* doc/Makefile.am (install-tex): new target.
-	(EXTRA_DIST): Include txi-??.tex.
-	txi-de.tex: new file from kama.
+	* doc/Makefile.am (info.1, infokey.1, install-info.1,
+	makeinfo.1, texi2dvi.1, texindex.1): Don't use $< in ordinary
+	rules; it's not portable.
+	* util/Makefile.am (texinfo.cat): Likewise.
 
-	* Makefile.am (AUTOMAKE_OPTIONS): Bump to 1.4.
-	(install-tex): new target.
+2004-04-12  Karl Berry  <karl@gnu.org>
 
-	* util/texi2dvi: Restore "$@" for explicitness in main loop.
+	* bootstrap: update from berlios.
 
-	* doc/Makefile.am (*.1) [TEXINFO_MAINT]: Conditionalize.
+2004-04-11  Karl Berry  <karl@gnu.org>
 
-	* configure.in (AC_PREREQ): Bump to 2.13.
-	(TEXINFO_MAINT): Define this AM_CONDITIONAL.
+	* Version 4.7.
 
-	* doc/texinfo.txi: Document that the HTML output name is derived
- 		from @setfilename.
+2004-04-09  Karl Berry  <karl@gnu.org>
 
-	* makeinfo/makeinfo.c (convert_from_loaded_file): Use @setfilename
-		for basename of html output.
+	* makeinfo/makeinfo.c (execute_string): do not free the temporary copy
+	of input_filename until we're definitely done with
+	it.  It is used in line_error, etc.
 
-	* doc/texinfo.txi (url): Use example.org for the example.
+	* INSTALL: mention texinfo.tex install step.
 
-	* makeinfo/cmds.c (cm_url): @url should not produce a link, sorry
- 		to say.
+	* util/Makefile.am (texinfo.cat): new name instead of just
+		`catalog'.  rename files.
+	* util/Makefile.am (EXTRA_DIST): texinfo-cat.in now, not
+		catalog.in.
 
-Wed Jan 20 16:31:55 1999  Karl Berry  <karl@gnu.org>
+2004-04-09  Alper Ersoy  <dirt@gtk.org>
 
-	* util/texindex.c,
-	* util/install-info.c,
-	* makeinfo/makeinfo.c,
-	* info/info.c: It's 1999.
+	* makeinfo/insertion.c (begin_insertion): after @copying, do not
+	discard until a newline if we are looking at one.
+	(end_insertion): decrement input line number after @end copying.
 
-	* doc/info.texi (Advanced info commands): Fix typos from Gildea.
+2004-04-08  Karl Berry  <karl@gnu.org>
 
-	* makeinfo/makeinfo.c (end_of_sentence_p): don't check negative
-		array offset.
-	From: Enrico Scholz <enrico.scholz@wirtschaft.tu-chemnitz.de>
+	* util/Makefile.am: doc fix, as automake.diff is no longer needed.
 
-Sun Jan 17 16:42:16 1999  Karl Berry  <karl@gnu.org>
+2004-04-07  Karl Berry  <karl@gnu.org>
 
-	* util/texi2dvi: Restore --batch, handle changing escape character
-		more cleanly.  From Akim (as always).
-
-Thu Jan 14 16:47:41 1999  Karl Berry  <karl@gnu.org>
-
-	* configure.in (ALL_LINGUAS): Add no.
-	From: Trond Endrestol <trond@agamemnon.gtf.ol.no>
-
-	* util/texi2dvi: Doc fix from Akim and do not always exit 1 from trap.
-	And it's 1999.
-
-	* doc/texinfo.txi (image): Document imagename.pdf.
-
-	* Apply this change from Eli:
-
-  1998-11-20  Eli Zaretskii  <eliz@is.elta.co.il>
+	* pretest version 4.6.95.
+	
+	* doc/texinfo.tex (\dodonode): new macro to remove trailing comma.
+	(\donode): call it, after removing space-comma.
+	
+	* doc/texinfo.txi (indicateurl): new name for url.
+	(uref): url is now a synonym for uref.
+	* doc/texinfo.tex (\url, \indicateurl): implement.
+	* makeinfo/cmds.c (cm_indicate_url): rename from cm_url.
+	(command_table): make "url" a synonym for "uref".
+	* makeinfo/cmds.h (cm_indicate_url): declare it.
 
-	  * makeinfo/makeinfo.h (meta_char_pos): New variable.
-	  * makeinfo/makeinfo.c (init_paragraph): Initialize it.
-	  (add_char): Use META to create a non-breakable space character.
-	  (add_meta_char): New function.
-	  (end_of_sentence_p): Don't handle characters at meta_char_pos as
-	  normal sentence enders.
-	  (flush_output): Only unMETA the non-breaking space character.
-	  Reset meta_char_pos to zero.
-	  (do_flush_right_indentation): Call adjust_braces_following.
-	  (indent): Likewise.
-	  (cm_value): Save and restore the value of meta_char_pos.
-	  (expansion): Likewise.
-	  * makeinfo/macro.c (me_execute_string_keep_state): Save and
-	  restore the value of meta_char_pos.
-	  * makeinfo/node.c (cm_node): Save and restore the value of
-	  meta_char_pos.
-	  * makeinfo/cmds.c (cm_accent): Make the dot we add due to
-	  @dotaccent be a meta-character.
-	  (cm_code, cm_dfn): Call add_meta_char to insert the closing
-	  quote.
-	  (cm_cite): Call add_char instead of add_word.
+2004-04-06  Karl Berry  <karl@gnu.org>
 
-Thu Jan  7 18:04:26 1999  Karl Berry  <karl@gnu.org>
+	* makeinfo/sectioning.c (insert_and_underscore): use `...' quote
+	instead of "..." in error message.
+	* info/*.c: likewise.
 
-	* util/texi2dvi: Handle pdf files more cleanly.  From Akim.
+2004-04-07  Alper Ersoy  <dirt@gtk.org>
 
-Wed Jan  6 17:49:11 1999  Karl Berry  <karl@gnu.org>
+	* makeinfo/cmds.c (cm_colon): check if the character we are erasing
+	from the output belongs to an XML tag.
 
-	* makeinfo/makeinfo.c (cm_image): Check for .png also.
+2004-04-07  Alper Ersoy  <dirt@gtk.org>
 
-Sun Dec 20 07:54:47 1998  Karl Berry  <karl@gnu.org>
+	* makeinfo/insertion.c (cm_author): use author element in XML output
+	for attribution.
 
-	* util/texi2dvi: Add --pdf.
+2004-04-06  Alper Ersoy  <dirt@gtk.org>
 
-	* util/texi2dvi: New option -@ to use @input and @nonstopmode, in
-		case texinfo is preloaded.
-	From: Khimenko Victor <khim@sch57.msk.ru>
-	Date: Sun, 20 Dec 1998 02:04:12 +0300 (EET)
+	* makeinfo/makeinfo.c (convert_from_loaded_file): do not call
+	write_tag_table if the output filename is "-".
 
-Sat Dec 19 17:37:37 1998  Karl Berry  <karl@gnu.org>
+2004-04-06  Alper Ersoy  <dirt@gtk.org>
 
-	* doc/texinfo.txi (Multitable Column Widths): leading zero ok for
- 		@columnfractions.
+	* makeinfo/insertion.c (end_insertion): <pre> blocks implicitly ends
+	the previous paragraph, so avoid </p> after the end tag.
 
-	* util/texi2dvi: New version from Akim, plus --quiet is like
- 		--batch, etc.
+	* makeinfo/footnote.c (output_pending_notes): made Footnotes anchor
+	non translatable, and changed it to "texinfo-footnotes-in-document" to
+	lessen the chance of getting in the way of another Footnotes anchor.
 
-Fri Dec 18 17:22:44 1998  Karl Berry  <karl@gnu.org>
+2004-04-04  Jim Meyering  <jim@meyering.net>
 
-	* doc/texinfo.txi: Document that the Texinfo source can't be
-	arbitrarily ordered (for print) even if all pointers are supplied.
+	* info/nodes.c (info_load_file_internal): Don't free lowered_name
+	until *after* using fullpath, since they may be one and the same.
 
-	* makeinfo/insertion.c (end_insertion): In itemize case,
-		close_insertion_paragraph so @end itemize cause a line break.
-        Report from: Sergei Pokrovsky <pok@nbsp.nsk.su>
-        Date: Sun, 22 Nov 1998 19:45:21 +0700 (GMT)
+2004-04-03  Karl Berry  <karl@gnu.org>
 
-Tue Dec 15 16:21:51 1998  Karl Berry  <karl@gnu.org>
+	* doc/texinfo.txi (Image Syntax): had missing @'s in cookies.
 
-	* doc/texinfo.txi: More fixes from Oleg.
+	* makeinfo/cmds.c (cm_w): insert a comment at the end of @w, so that
+	@w{$}Log$ doesn't end up as <dollar>Log<dollar>.
+	Report from rms.
+	* doc/texinfo.txi (GNU Sample Texts, w): mention this.
 
-	* configure.in: Bump version to 3.12c for next pretest.
+2004-04-02  Karl Berry  <karl@gnu.org>
 
-	* util/install-info.c (open_possibly_compressed_file)
-		[STRIP_DOT_EXE]: logic for compression_program assignment
-		was reversed.
-	From: wlestes@wlestes.uncg.edu
+	* configure.ac: pretest version 4.6.94.
 
-Sat Dec 12 18:02:48 1998  Karl Berry  <karl@gnu.org>
+	* doc/texinfo.txi (Node Line Requirements): discuss whitespace.
 
-	* Merged these changes from Andreas:
+	* doc/texinfo.tex (\node, \donode): remove trailing
+	spaces (before the first comma) in the @node line.
 
-1998-12-06  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+2004-03-29  Karl Berry  <karl@gnu.org>
 
-	* makeinfo/node.c (cm_node): When searching for @menu don't
-	require a space after it.
+	* util/install-info.c (menu_line_lessp, menu_line_equal): move to
+		before all uses.
 
-1998-12-06  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+2004-03-27  Karl Berry  <karl@gnu.org>
 
-	* makeinfo/cmds.c (cm_top): free top_name only after done using it.
+	* info/signals.c (initialize_info_signal_handler) [SA_NOCLDSTOP]:
+	use instead of HAVE_SIGACTION, since Solaris 2.7+
+	with Sun CC don't have sa_handler, sa_flags, sa_mask.
 
-Sat Dec 12 15:40:13 1998  Karl Berry  <karl@gnu.org>
+	* info/session.c (search_string_index): remove unused variable.
+	* info/terminal.c (term_mo): remove unused variable.
+	* info/display.c (display_clear_display): remove unused variable
+		display_line.
+	* util/install-info.c (infilelen_sans_info): remove unused
+		variable.
 
-	* doc/texinfo.txi: Various typos and fixes from Oleg.
+	* doc/texinfo.txi: mistakenly had * name: node: in menu items instead
+	of * name: node.
 
-	* doc/texinfo.txi: Move @node's outside of @ifinfo for the sake of
- 		HTML processing.
+	* util/install-info.c (menu_item_equal): must declare ret at beginning
+	of function.  From Werner.
 
-	* doc/texinfo.txi (titlepage): @pxref was not in parens.  From Oleg.
+2004-03-27  Jim Meyering  <jim@meyering.net>
 
-Sun Dec  6 16:49:09 1998  Karl Berry  <karl@gnu.org>
+	* info/info-utils.c (info_parse_node): Don't read beyond end
+	of buffer when looking for ``(line ...)'' in a menu item.
 
-	* dir-example: Amd is now am-utils.
+2004-03-27  Andreas Schwab  <schwab@suse.de>
 
-	* doc/Makefile.am: Reinstate help2man invocations for development.
+	* util/install-info.c (menu_item_equal): Don't scan past
+	term_char.
 
-	* doc/texinfo.txi: Document @set...contentsaftertitlepage (from kama).
-	Fix incorrect sense for @image and Hungariam typo (from Oleg).
+2004-03-26  Karl Berry  <karl@gnu.org>
 
-	* lib/system.h: #include libintl.h here instead of acconfig.h, so
-		the system include files have a chance to #define NULL
-		before it does.
-	* acconfig.h: Remove libintl.h and #defines from here.
-	From: "Philippe De Muyter" <phdm@macqel.be>
-	Date: Fri, 4 Dec 1998 00:56:25 +0100 (CET)
+	* pretest version 4.6.93.
 
-	* info/signals.c: Start #ifdef's in column one for cc on sysv68
-		(m68k-motorola-sysv).
-	From: "Philippe De Muyter" <phdm@macqel.be>
-	Date: Fri, 4 Dec 1998 00:56:25 +0100 (CET)
+	* util/install-info.c (menu_item_equal): compare basenames,
+	so lilypond/ subdir will match.  Bug report from Werner,
+	21 Mar 2004 08:31:10 +0100.
 
-	* info/filesys.c (is_dir_name): use strcpy instead of automatic
-		array initialization.
-	From: "Philippe De Muyter" <phdm@macqel.be>
-	Date: Fri, 4 Dec 1998 00:56:25 +0100 (CET)
+	* configure.ac (AC_CHECK_DECLS): skip strncasecmp again.
+	* lib/system.h (strcase.h): change conditional to
+	!HAVE_STRNCASECMP || !HAVE_STRCASECMP.  Extra
+	!HAVE_DECL seems superfluous.
 
-	* configure.in (ALL_LINGUAS): add ru.
+	* lib/system.h: include <unistd.h> last, following Autoconf's
+		ac_includes_default.
 
-Fri Dec  4 08:12:11 1998  Karl Berry  <karl@gnu.org>
+2004-03-25  Karl Berry  <karl@gnu.org>
 
-	* info/infodoc.c: Gettextize the help buffer string.
+	All these changes are because strncasecmp is only declared in
+	<strings.h> on IBM AIX 4.2.  (Report from Nelson Beebe.)
+	
+	* configure.ac (AC_CHECK_DECLS): add memchr; no need to check for
+	  	     strcasecmp.(gl_STRCASE): call this ... 
+	(AC_REPLACE_FUNCS): ... replacing checks for
+	strcasecmp and strncasecmp here.
+	* lib/system.h (memchr) [!HAVE_DECL_MEMCHR]: add conditional
+	     declaration.
+	(strcase.h) [!HAVE_DECL_STRNCASE]: add conditional include.
+	(strings.h) [HAVE_STRINGS_H]: include if
+	available, even if <string.h> is also available.
+	* info/session.c (strncasecmp) [M_XENIX]: remove this conditional
+	declaration, since we haven't been testing for M_XENIX in many
+	years.
+	* m4/Makefile.am (EXTRA_DIST): add strcase.m4.
+	* util/srclist.txt (lib/strcase.h, m4/strcase.m4): add, updating
+		from gnulib.
 
-Sun Nov 29 17:12:35 1998  Karl Berry  <karl@gnu.org>
+2004-03-24  Karl Berry  <karl@gnu.org>
 
-	* doc/texinfo.txi: Use @ifnottex rather than @ifinfo for @top.
-	(makeinfo top): document this.
+	* makeinfo/index.c:
+	* makeinfo/float.c: avoid use of snprintf, which is not available on
+	all platforms.  Bug report by Nelson and Vin Shelton (22mar03).
 
-	* doc/info-stnd.texi,
-	* doc/info.texi: Use @ifnottex rather than @ifinfo for @top.
+	* automake 1.8.3.
 
-	* makeinfo/insertion.c (cm_menu): Implicitly insert @top command
-        so we can construct the node tree as usual when we see @menu
- 	before @node.  Probably this is when the input uses
- 	@ifinfo instead of @ifnottex, as virtually all existing
- 	manuals do.
+2004-03-23  Karl Berry  <karl@gnu.org>
 
-	* makeinfo/insertion.c (discard_insertions): Let any conditional
-	cross node boundary.  (So the @top node can be wrapped
-	in @ifnottex, for example.)
+	* doc/info-stnd.texi (Searching Commands): typo from jesper.
 
-	* Installed these:
+2004-03-21  Karl Berry  <karl@gnu.org>
 
-1998-11-21  Eli Zaretskii  <eliz@is.elta.co.il>
+	* doc/texinfo.tex (\indexnofonts): \definedummyletter needs to
+	define the control letters to be empty, without
+	taking any argument; most control letters, such as
+	@:, don't take arguments, and it won't hurt to
+	just always ignore them for index sorting.
+	Report from Arnold.
 
-	* makeinfo/makeinfo.c (expansion): Save and restore
-	last_inserted_character and last_char_was_newline.
+	* info/doc.h (InfoFunction): cast NULL to VFunction *, to
+	prevent pgcc from complaining.  From Nelson.
 
-	* makeinfo/cmds.c (cm_dircategory): Kill any indentation before
-	INFO-DIR-SECTION.  install-info relies on this.
+2004-03-20  Karl Berry  <karl@gnu.org>
 
-1998-11-20  Eli Zaretskii  <eliz@is.elta.co.il>
+	* doc/texinfo.txi (Structuring Command Types): be even more explicit
+	about @unnumbered vs. @heading.
 
-	* makeinfo/multi.c (struct env): Add meta_char_pos member.
-	(select_output_environment): Save and restore meta_char_pos.
-	(out_char): Output characters by switching environment to #0 and
-	calling insert.  Call flush_output when a newline is output.
-	(output_multitable_row): Update the current environment's
-	output_paragraph_offset as well, after removing trailing
-	whitespace.  Fix typo in loop index.
-	(do_multitable): Call close_single_paragraph.
-	(end_multitable): Call close_insertion_paragraph.  Don't output
-	an extra newline.
+	* makeinfo/html.c (insert_html_tag_with_attributes): use the same
+	parameter names (start_or_end and tag) in both stdc and !stdc
+	cases.  Report from Nelson.
 
-1998-11-20  Eli Zaretskii  <eliz@is.elta.co.il>
+	* info/m-x.c (info_execute_command): don't dereference
+	InfoFunction(command) as a function call if it's NULL.  Report
+	from Nelson, pgcc-5.1-3 complains.
 
-	* makeinfo/makeinfo.h (meta_char_pos): New variable.
-	* makeinfo/makeinfo.c (init_paragraph): Initialize it.
-	(add_char): Use META to create a non-breakable space character.
-	(add_meta_char): New function.
-	(end_of_sentence_p): Don't handle characters at meta_char_pos as
-	normal sentence enders.
-	(flush_output): Only unMETA the non-breaking space character.
-	Reset meta_char_pos to zero.
-	(do_flush_right_indentation): Call adjust_braces_following.
-	(indent): Likewise.
-	(cm_value): Save and restore the value of meta_char_pos.
-	(expansion): Likewise.
-	* makeinfo/macro.c (me_execute_string_keep_state): Save and
-	restore the value of meta_char_pos.
-	* makeinfo/node.c (cm_node): Save and restore the value of
-	meta_char_pos.
-	* makeinfo/cmds.c (cm_accent): Make the dot we add due to
-	@dotaccent be a meta-character.
-	(cm_code, cm_dfn): Call add_meta_char to insert the closing
-	quote.
-	(cm_cite): Call add_char instead of add_word.
+2004-03-19  Karl Berry  <karl@gnu.org>
 
-Sun Nov 29 16:30:06 1998  Karl Berry  <karl@gnu.org>
+	* info/signals.h [!SA_NOCLDSTOP]: borrow test from coreutils'
+	sort.c, to avoid using sigset_t when it's not
+	defined (apparently).
 
-	* info/info.h,
-	* info/footnotes.h (FOOTNOTE_LABEL),
-	* info/indices.c (APROPOS_NONE): Use N_ rather than _.
+	* makeinfo/html.c (escape_string): escape ", too, for @image's
+	alttext among others.
+	* makeinfo/html.h: doc fix.
+	* doc/texinfo.txi (Image Syntax): making empty alt text, do
+		escaping.
 
-	* info/infodoc.c (create_internal_info_help_node,
-	function_documentation): Do not translate the empty string.
-	Date: Fri, 25 Sep 1998 15:09:42 +0400
-	From: "Oleg S. Tihonov" <tihonov@ffke-campus.mipt.ru>
+	* util/dir-example: reorder.
 
-	* doc/info-stnd.texi: Mention PRIOR as another alias for
- 		PREVIOUS/PageUp.
+	* doc/texinfo.txi (title subtitle author): using them outside
+	@titlepage is an error, they're not actually "ignored".
+	* makeinfo/insertion.c (cm_author): one mdash suffices.
 
-	* doc/texinfo.txi: @emph produces _emph_ not *emph*.  Spurious
-		junk before makeinfo bison example.
-	From: tihonov@ffke-campus.mipt.ru.
+2004-03-19  Jim Meyering  <jim@meyering.net>
 
-1998-11-16  Eli Zaretskii  <eliz@is.elta.co.il>
+	* makeinfo/makeinfo.c (add_char): Use memmove, rather than strncpy,
+	since source and destination strings overlap.
 
-	* makeinfo/defun.c (defun_internal): Don't expand the arguments to
-	@defun and its ilk.
+	* makeinfo/float.c (add_new_float): Avoid buffer overrun when
+	appending `.' to a chapter number.
 
-	* makeinfo/makeinfo.c (expansion): Copy the name of the currently-
-	executing command and restore it after expansion.
+2004-03-18  Karl Berry  <karl@gnu.org>
 
-Sun Nov 15 17:40:51 1998  Karl Berry  <karl@gnu.org>
+	* pretest version 4.6.92.
 
-	* makeinfo/makeinfo.c: Rearrange usage, allow -v for verbose, only
-		output `Making' line when verbose.
-	* makeinfo/makeinfo.h (process_html, process_info, process_tex):
- 		declare.
-	* makeinfo/cmds.c: Use conditional commands.
-	* makeinfo/insertion.c (find_type_from_name): Handle rawhtml and
- 		rawtex.
-	(conditional commands): Allow individual switching on and off.
+2004-03-18  Andreas Schwab  <schwab@suse.de>
 
-	* makeinfo/insertion.h: Declare conditionals.
+	* lib/xmalloc.c: Include "system.h" instead of declaring malloc
+	and realloc ourselves.
+	(xmalloc): Change type of size parameter to size_t.
+	(xrealloc): Likewise.
 
-1998-11-14  Eli Zaretskii  <eliz@is.elta.co.il>
+	* lib/system.h (xmalloc, xrealloc): Change type of size parameter
+	to size_t.
 
-	* makeinfo/insertion.c (begin_insertion, end_insertion): Use <pre>
-	to convert @display and @smalldisplay into HTML.
+2004-03-18  Karl Berry  <karl@gnu.org>
 
-	* makeinfo/cmds.c (cm_asterisk): Don't insert an extra newline in
-	HTML mode, since input includes a newline right after the @*.
-	(cm_sp): Output "<br><p>\n" as many times as the argument says.
-	(cm_url): Don't include "<a href=" in the anchor text in HTML
-	output.
+	* makeinfo/xref.c (cm_xref): ignore any directory part or extension
+	in html case, warn if nothing left.
+	* doc/texinfo.txi (HTML Xref Link Basics): ignore directory part in
+	@xref cmd.
 
-	* makeinfo/makeinfo.c (cm_pxref): Don't add a period after @pxref
-	if in HTML mode.
-	(get_rest_of_line): Accept an additional argument EXPAND, and
-	expand the rest of line if it's non-zero.  All callers changed.
-	(close_paragraph): When in HTML mode, honor the formatting of the
-	source paragraphs by generating "<p>" for every closed paragraph;
-	follow it by as many "<p>"'s as paragraph_spacing specifies.
+	* lib/getopt.h (__GNUC_PREREQ) [! __GNUC_PREREQ]: change
+	conditional to the actual symbol, instead of just
+	__GNUC, else --disable-nls compilation fails under
+	SunOS 5.8 with gcc 3.2.3 (at least).
+	Report from Vin Shelton, 15 Mar 2004 08:51:14 -0500.
 
-Sat Nov 14 17:38:27 1998  Karl Berry  <karl@gnu.org>
+	* util/texindex.c: add some const declarations.
+	* util/install-info.c: add some const declarations.
+	(by no means all)
 
-	* makeinfo/insertion.c: Use <ul compact> instead of deprecated <menu>.
-	Omit extra <li> after the menu beginning.
+	* doc/texinfo.txi (HTML Xref *): new nodes.
 
-	* makeinfo/index.c: Use <ul compact> instead of deprecated <menu>.
+2004-03-15  Karl Berry  <karl@gnu.org>
 
-Thu Nov 12 16:33:09 1998  Karl Berry  <karl@gnu.org>
+	* makeinfo/xref.c (cm_xref): need ../ in reference to foreign html
+	manual, if splitting.
 
-	* Makefile.am (EXTRA_DIST): add djgpp/config.sed.
+2004-03-14  Jim Meyering  <jim@meyering.net>
 
-	* info/terminal.c: #include <sys/ioctl.h> to define TIOCGWINSZ
- 		under LynxOS.  From: Marius Groeger <mag@sysgo.de>.
+	* makeinfo/index.c (insert_index_output_line_no): Ensure that `i'
+	is larger than zero before (not after) using `i-1' as an array index.
 
-1998-11-06  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+	* makeinfo/cmds.c (cm_acronym): Don't write description[-1]
+	when description is the empty string.
 
-	* makeinfo/insertion.c (begin_insertion): Correctly handle
-	ifnottex and ifnothtml.
-	(end_insertion): Likewise.
+	* makeinfo/makeinfo.c (insert): Avoid buffer under-run when
+	output_paragraph_offset is zero.
+	(canon_white): Rewrite not to use strcpy (was used with
+	overlapping source and destination)
 
-Sun Nov  8 17:30:23 1998  Karl Berry  <karl@gnu.org>
+2004-03-14  Andreas Schwab  <schwab@suse.de>
 
-	* makeinfo/index.c,
-	* makeinfo/insertion.c: Menu is special to Info.
-	* makeinfo/node.c: Top is a special name, don't translate it.
-	* info/session.c (info_top_node): Top is a special name, don't
-		translate it.
-	From: "Oleg S. Tihonov" <tihonov@ffke-campus.mipt.ru>.
+	* info/session.c: Fix buffer overflows.
 
-Fri Nov  6 17:18:43 1998  Karl Berry  <karl@gnu.org>
+2004-03-14  Alper Ersoy  <dirt@gtk.org>
 
-	* configure.in: Version 3.12b.
+	* makeinfo/xref.c (cm_xref): print the fifth arg (or fourth if it's
+	not available), in parens for the visible text of the HTML link.
 
-	* util/texi2dvi: Fixes from Eli and Christoph Martin.
+2004-03-14  Alper Ersoy  <dirt@gtk.org>
 
-	Mon Oct  5 13:58:53 1998  Dave Glowacki  <dglo@ssec.wisc.edu>
-	* util/install-info.c: Fix off-by-one error in findlines()
+	* makeinfo/tests/node-expand.txi:
+	* makeinfo/tests/node-whitespace.txi: added titles to @top.
 
-	* util/texindex.c (usage): avoid trigraph until Ulrich fixes
- 		po2tbl.sed.in.  From Paul Eggert.
+2004-03-14  Alper Ersoy  <dirt@gtk.org>
 
-1998-11-03  Eli Zaretskii  <eliz@is.elta.co.il>
+	* makeinfo/sectioning.c (sectioning_underscore): check if title is
+	pointing to NULL before calling strlen (happens when there is no
+	@settitle before @top.)
 
-	* makeinfo/makeinfo.c (cm_xref): Don't bypass the test that an
-	xref ends with a period or a comma if the reference has a single
-	argument.
+2004-03-14  Alper Ersoy  <dirt@gtk.org>
 
-1998-10-31  Eli Zaretskii  <eliz@is.elta.co.il>
+	* makeinfo/sectioning.c (sectioning_underscore): warn if both @top and
+	@settitle are empty.
+	(sectioning_html, insert_and_underscore): use @settitle argument if
+	@top is empty.
+	(insert_and_underscore): removed with_char argument from function
+	declaration.
 
-	* makeinfo/insertion.c (end_insertion): Don't decrement
-	in_fixed_width_font when leaving a menu, the previous value is
-	restored by pop_insertion.
+	* makeinfo/sectioning.h: insert_and_underscore proto update.
 
-	* makeinfo/makeinfo.c (add_char): Don't increment output_column
-	twice when a newline is inserted into the output.
+2004-03-13  Karl Berry  <karl@gnu.org>
 
-	* doc/texinfo.txi (emph & strong): Document the use of underscores
-	for @emph in the Info output.
+	* pretest version 4.6.91.
 
-1998-10-30  Eli Zaretskii  <eliz@is.elta.co.il>
+	* info/*.[ch]: copyright dates, and final ugly casts.
 
-	* djgpp/config.bat: Make sure intl/po2tblsed.in exists before we
-	begin the configure boogie.
-	* djgpp/config.sed: Sed script, to be run by config.bat.
+	* doc/texinfo.txi (Generating HTML): make its own chapter, since we
+	have lots to say about xrefs now.
 
-	* doc/info-stnd.texi (Node Commands): Document the new G command.
+	* doc/texinfo.txi (Refilling Paragraphs): @ignore this, just
+	describe @refill better in the summary.
+	(Obtaining TeX): make a section of Hardcopy,
+	instead of its own appendix.
+	(Command Syntax): subnode of @@-Command List.
+	This reduction in the number of appendices will hopefully make the
+		manual less overwhelming.
 
-	* info/session.c (info_follow_menus): Step over a possible leading
-	space in a menu entry in menus[].
-	(split_list_of_nodenames): Renamed from split_words.  Split the
-	string on commas, not on spaces, since a menu entry can have
-	embedded whitespace.  Get past the null byte after inserting it.
-	(info_menu_sequence): Don't crash if there's no DIR node; try
-	using Top of the current Info file, and if that doesn't work
-	either, throw an error.
+2004-03-13  Alper Ersoy  <dirt@gtk.org>
 
-	* util/texi2dvi: Use $path_sep in TEXINPUTS.  Don't include any
-	dots in $tmpdir, 8+3 filesystems won't like that.
+	* info/dir.c:
+	* info/display.c:
+	* info/display.h:
+	* info/doc.h:
+	* info/dribble.c:
+	* info/dribble.h:
+	* info/echo-area.c:
+	* info/echo-area.h:
+	* info/filesys.c:
+	* info/filesys.h:
+	* info/footnotes.c:
+	* info/footnotes.h:
+	* info/gc.c:
+	* info/gc.h:
+	* info/indices.c:
+	* info/indices.h:
+	* info/info-utils.c:
+	* info/info-utils.h:
+	* info/info.c:
+	* info/info.h:
+	* info/infodoc.c:
+	* info/infokey.c:
+	* info/infomap.c:
+	* info/infomap.h:
+	* info/m-x.c:
+	* info/makedoc.c:
+	* info/man.c:
+	* info/man.h:
+	* info/nodemenu.c:
+	* info/nodes.c:
+	* info/nodes.h:
+	* info/search.c:
+	* info/search.h:
+	* info/session.c:
+	* info/session.h:
+	* info/signals.c:
+	* info/terminal.c:
+	* info/terminal.h:
+	* info/tilde.c:
+	* info/tilde.h:
+	* info/variables.c:
+	* info/variables.h:
+	* info/window.c:
+	* info/window.h:
+	* lib/system.h: protoized.
 
-	* makeinfo/makeinfo.c (reader_loop): Expand any macros in a menu
-	entry when creating a <menu> item for HTML.  Fix an off-by-one
-	error in counting input lines.
+2004-03-12  Karl Berry  <karl@gnu.org>
 
-	* makeinfo/files.c (expand_filename): Don't treat .foo/bar as
-	absolute file name.
+	* makeinfo/sectioning.c (sectioning_underscore): don't segfault when
+	generating xml if @top arg was empty.  Report from Pat.
 
-	* makeinfo/makeinfo.c (add_char): Use strncpy instead of memcpy,
-	since the buffers overlap.  If the line being refilled includes
-	nothing but the indentation and the word being added, do NOT add
-	an extra newline.
+2004-03-11  Karl Berry  <karl@gnu.org>
 
-	* util/install-info.c (strip_info_suffix, menu_item_equal,
-	open_possibly_compressed_file) [__MSDOS__]: Allow .inz and .igz as
-	suffuxes for compressed files.
-	(open_possibly_compressed_file): Return an indication whether we
-	opened a file or a pipe.  Use FOPEN_RBIN from system.h.
-	[STRIP_DOT_EXE]: Use gzip.exe with an explicit .exe extension.
-	[O_BINARY]: If the file is not compressed, switch its stream to
-	text mode.
-	(readfile): Close the file or the pipe.
-	(output_dirfile): Call pclose to actually run the compressor.
+	* doc/texinfo.tex (\pdfoutput): check also for \relax and 0, not
+	just \undefined, in case pdftex is being run in dvi mode.
+	Reported by Thomas Esser.
 
-Thu Nov  5 08:33:06 1998  Karl Berry  <karl@gnu.org>
+	* lib/Makefile.am (libtxi_a_SOURCES): add getopt_int.h.
 
-	* doc/texinfo.txi: effect -> affect
-	From: Eric Hanchrow <offby1@blarg.net>
+2004-03-11  Alper Ersoy  <dirt@gtk.org>
 
-Tue Nov  3 14:26:59 1998  Karl Berry  <karl@gnu.org>
+	* makeinfo/html.c (add_escaped_anchor_name): removed unnecessary
+	ampersand check.
+	(fix_filename): removed size calculation and memory reallocation for
+	filename as it is already PATH_MAX bytes.  Added a check so we don't
+	cross PATH_MAX boundary while expanding not-isalnum to hex values.
 
-	* makeinfo/makeinfo.c (cm_image): Allocate enough space for the
- 		zero byte.
+	* makeinfo/toc.c (toc_add_entry): generate links following html cross
+	refs proposal from Patrice Dumas.
 
-	* doc/texinfo.txi: Document epsf.tex standard location.
+2004-03-11  Alper Ersoy  <dirt@gtk.org>
 
-Tue Oct 27 10:45:47 1998  Karl Berry  <karl@gnu.org>
+	* makeinfo/makeinfo.h: changed URL_SAFE_CHAR to isalnum.
 
-	* Makefile.am (TEXINFO_TEX): add definition.
+	* makeinfo/html.c (add_escaped_anchor_name, add_anchor_name)
+	(fix_filename): generate links following html cross refs proposal
+	from Patrice Dumas.
 
-	* doc/info-stnd.texi: Avoid unnecessary overfull boxes from
- 		examples.
+	* makeinfo/xref.c (cm_xref): tweaked references to external manuals,
+	to better follow html cross refs proposal.
 
-	* doc/Makefile.am (install-data-local): missing ".
+2004-03-08  Karl Berry  <karl@gnu.org>
 
-	* doc/Makefile.am: Don't try to run help2man in distribution.
+	* pretest version 4.6.90.
 
-Mon Oct 26 13:43:53 1998  Karl Berry  <karl@gnu.org>
+	* makeinfo/Makefile.am (makeinfo_SOURCES): include multi.h.
+	* makeinfo/cmds.c (cm_verb): avoid spurious warning.
 
-	* configure.in (TEXMF): lose this whole block.  It is too painful
-		to maintain with the different tex installations out there.
+2004-03-06  Alper Ersoy  <dirt@gtk.org>
 
-	* util/Makefile.am (EXTRA_DIST): update-info renamed to
- 		fix-info-dir.
+	* makeinfo/lang.c (cm_special_char): call add_encoded_char for Info
+	output too.
 
-	* makeinfo/footnote.h: Doc fix.
+2004-03-01  Alper Ersoy  <dirt@gtk.org>
 
-	* makeinfo/multi.c: #include "insertion.h"
-	* makeinfo/cmds.c: #include "node.h"
-	* makeinfo/makeinfo.h,
-	* makeinfo/makeinfo.c: Move globals, functions for insertions and
- 		nodes.
-	* makeinfo/defun.c: #include "insertion.h"
-	* makeinfo/Makefile.am: Add insertion.[ch], node.[ch].
-	* node.[ch], insertion.[ch]: New files.
+	* makeinfo/cmds.c (cm_minus): use minus entity for HTML too.
 
-	* makeinfo/makeinfo.c,
-	* makeinfo/makeinfo.h: Move globals for cmds.h.
-	* makeinfo/index.h: Include cmds.h.
-	* makeinfo/Makefile.am (makeinfo_SOURCES): Add cmds.h, cmds.c.
-	* cmds.c, cmds.h: New files.
+2004-03-01  Alper Ersoy  <dirt@gtk.org>
 
-Sat Oct 24 17:28:14 1998  Karl Berry  <karl@gnu.org>
+	* makeinfo/makeinfo.c (reader_loop): disable multiple dashes and
+	quotes entity substitution for HTML and XML, if escape_html is not
+	true.
 
-	* makeinfo/makeinfo.c,
-	* makeinfo/makeinfo.h: Globals for files.c.
-	* makeinfo/Makefile.am (makeinfo_SOURCES): add files.[ch].
+2004-03-01  Alper Ersoy  <dirt@gtk.org>
 
-Tue Oct 20 17:03:10 1998  Karl Berry  <karl@gnu.org>
+	* util/texinfo.dtd: added math element and updated footnote.
 
-	* makeinfo/Makefile.am (makeinfo_SOURCES): add macro.c and
- 		macro.h.
-	* makeinfo/makeinfo.c: Move macro code to macro.h and macro.c.
-	* makeinfo/makeinfo.h: Move macro stuff to macro.h, expose global
-		last_char_was_newline for macro.c.
-	* makeinfo/index.c,
-	* makeinfo/footnote.c: #include macro.h.
+2004-03-01  Alper Ersoy  <dirt@gtk.org>
 
-Wed Oct  7 16:24:07 1998  Karl Berry  <karl@gnu.org>
+	* makeinfo/xml.c (xml_insert_footnote): start <para> if not already
+	started.
 
-	* doc/info-stnd.texi: For now don't include version.texi due to
- 		automake error.
+2004-03-01  Alper Ersoy  <dirt@gtk.org>
 
-	* makeinfo/index.h: #include makeinfo.h for sake of COMMAND type.
-	* makeinfo/index.c: No need to include makeinfo.h, index.h does
- 		now.
+	* makeinfo/index.c (index_add_arg): make entry node name 'Footnotes'
+	if the output format is non-split HTML, and we are handling footnotes.
 
-	* makeinfo/makeinfo.c: Move footnote code to footnote.c.
-	* makeinfo/makeinfo.h: Globals for footnote.c.
-	* makeinfo/Makefile.am (makeinfo_SOURCES): add footnote.[ch].
+	* makeinfo/footnote.c (output_pending_notes): added anchor at the
+	start of footnotes block for the non-split HTML output, so @printindex
+	can refer to that point as the nodename.
 
-	* makeinfo/makeinfo.c: Move defun code to defun.c, necessary
- 		global to makeinfo.h.
-	* makeinfo/makeinfo.h (default_indentation_increment): move here
- 		for defun.c.
-	* makeinfo/Makefile.am (makeinfo_SOURCES): add defun.c.
+2004-03-01  Alper Ersoy  <dirt@gtk.org>
 
-	* Makefile.am: Doc fix.
+	* makeinfo/defun.c (defun_internal): use var element for HTML, instead
+	of i.
 
-	* configure.in (AC_OUTPUT): generate makeinfo/tests/Makefile.
+2004-03-01  Alper Ersoy  <dirt@gtk.org>
 
-	* makeinfo/makeinfo.c,
-	* makeinfo/makeinfo.h,
-	* makeinfo/Makefile.am (makeinfo_SOURCES): add index.[ch].
+	* makeinfo/makeinfo.c (cm_image): reset filling_enable to its previous
+	state after getting the cookie done.
 
-Fri Oct  2 17:42:26 1998  Karl Berry  <karl@gnu.org>
+2004-03-01  Alper Ersoy  <dirt@gtk.org>
 
-	* lib/system.h (STREQ): new macro.
+	* makeinfo/makeinfo.c (cm_image): insert magic cookie only if there's
+	a bitmap file (if all we have is a text file, skip the cookie.)
 
-Thu Oct  1 09:26:57 1998  Karl Berry  <karl@gnu.org>
+2004-02-29  Alper Ersoy  <dirt@gtk.org>
 
-	* doc/texinfo.txi: Delete spare copy since out of date,
-	add makeinfo html to menu,
-	detailmenu doesn't take braces in summary.
+	* makeinfo/node.c (cm_node): moved node order handling to ...
+	(remember_node): here.
 
-Wed Sep 30 14:38:21 1998  Karl Berry  <karl@gnu.org>
+2004-02-29  Alper Ersoy  <dirt@gtk.org>
 
-	* makeinfo/makeinfo.c: Remove != NULL comparisons,
-	xmalloc/xrealloc casts, assignments in if statements.
+	* makeinfo/multi.c (draw_horizontal_separator): insert a space before
+	the newline so it looks different than @subsection's.
 
-Wed Sep 30 14:16:01 1998  Karl Berry  <karl@cs.umb.edu>
+2004-02-29  Alper Ersoy  <dirt@gtk.org>
 
-	* makeinfo/makeinfo.c: Remove NULL casts and parentheses in return
- 		statements.
+	* makeinfo/makeinfo.c (insert): do not strip trailing whitespace in
+	multitables.
 
-	* makeinfo/makeinfo.c (add_link): Don't add a link if the node is null.
- 	(reader_loop): don't glean_node_from_menu if detailmenu, even if html.
-	Various formatting changes.
+2004-02-29  Alper Ersoy  <dirt@gtk.org>
 
-	* doc/help2man: Always exit successfully.
+	* makeinfo/makeinfo.c (execute_string): removed XML tag balance
+	checks.
 
-	* makeinfo/Makefile.am (SUBDIRS): add.
-	(makeinfo_SOURCES): no more html.h.
-
-Fri Sep 11 18:47:15 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c: Fiddle with html output.
-
-1998-09-07  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/makeinfo.c (maybe_update_execution_strings): Only
-	reallocate TEXT if the existing storage is too small, otherwise
-	leave TEXT alone.
-	(replace_with_expansion): Call maybe_update_execution_strings to
-	reallocate input_text if we are executing_string, since storage
-	for execution_string is assumed to be large enough to hold every
-	possible string.
-	(me_execute_string): xstrdup the argument, so callees could freely
-	relocate it as needed.
-
-1998-09-06  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/makeinfo.c (replace_with_expansion): Don't remember
-	macro-expansion pointers if we are executing_string.
-
-1998-09-05  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* info/filesys.c (info_suffixes): Put the empty suffix last in the
-	list, so that `foo.info' is found before `foo', if both exist.
+2004-02-28  Alper Ersoy  <dirt@gtk.org>
 
-1998-09-05  Eli Zaretskii  <eliz@is.elta.co.il>
+	* makeinfo/insertion.c (begin_insertion, end_insertion): for rawxml,
+	rawhtml and rawdocbook blocks, change the state of escaping depending
+	on raw_output_block in order to avoid problems when these blocks are
+	used within a @rmacro.
 
-	* makeinfo/makeinfo.c (maybe_update_execution_strings): New
-	function, updates an entry in execution_strings[] array after
-	input_text is relocated by replace_with_expansion.
-	(replace_with_expansion): Call it.
+2004-02-28  Alper Ersoy  <dirt@gtk.org>
 
-1998-09-04  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/makeinfo.c (expand_macro): If a macro is called with
-	too many arguments, return NULL and print the line number where
-	the call begins.
-	(execute_macro): If expand_macro returns NULL, return
-	immediately.
+	* makeinfo/insertion.c (end_insertion): for quotation use
+	default_indentation_increment.
 
-Sun Sep  6 19:11:28 1998  Karl Berry  <karl@cs.umb.edu>
+2004-02-28  Alper Ersoy  <dirt@gtk.org>
 
-	* makeinfo/makeinfo.c,
-	* makeinfo/makeinfo.h,
-	* makeinfo/multi.c: Html output.  Specifically, these changes:
+	* makeinfo/makeinfo.c (info_trailer): call current_document_encoding
+	here too.
 
-    Fri Jul  4 22:58:29 1997  Dave Love  <d.love@dl.ac.uk>
+2004-02-28  Alper Ersoy  <dirt@gtk.org>
 
-	     * doc/makeinfo.texi: Document HTML output.
+	* makeinfo/lang.h: new variable unknown_encoding.
 
-	     * makeinfo/makeinfo.c: Wrap strings in _() in bits changed for
-	     HTML.
-	     (cm_image): Generate <img> for HTML.
+	* makeinfo/lang.c (cm_documentencoding): save and use the encoding
+	argument even if it's unknown.
 
-    Sun Jun 22 22:50:07 1997  Dave Love  <d.love@dl.ac.uk>
+	* makeingo/html.c (html_output_head): call current_document_encoding
+	instead of checking document_encoding_code. 
 
-	    * makeinfo/makeinfo.c (NAMED_NODE_ANCHORS): New define.
-	    (title, outstanding_node, node_number, node_node_references,
-	     escape_html, ifinfo_as_html): New variables.
-	    (tentry.number, node_ref.number, fn.number): New fields.
-	    (CommandTable): Various additions and alterations for HTML.
-	    (long_options): Add html and no-info-as-html.
-	    (main): Extra code for HTML.
-	    (usage): Add HTML stuff.
-	    (expand_filename): Deal with .html.
-	    (escape_string): New procedure.
-	    (convert_from_loaded_file): Extra code for HTML.
-	    (init_internals): Call free_node_references, initialize
-	    node_number.
-	    (reader_loop): Process menu items for HTML hyperlinks.  Escape
-	    HTML special characters.
-	    (add_char): Code for line breaks and paragraph insertions in
-	    HTML.
-	    (flush_output): Don't UNMETA for HTML.
-	    (indent): Do nothing for HTML.
-	    (current_item_function): Case for ifhtml.
-	    (begin_insertion): Deal with HTML in various cases.
-	    (insert_html_tag): new procedure.
-	    (cm_asterisk, cm_copyright, cm_accent, cm_code, cm_kbd,
-	    cm_angle_brackets, cm_var, cm_defn, cm_var, cm_emph, cm_string,
-	    cm_cite, cm_top, cm_xref, cm_inforef, cm_uref, cm_direntry,
-	    cm_ifinfo, cm_item, process_defun_args, defun_internal, cm_sp,
-	    cm_dircategory, cm_center, cm_result, cm_expansion, cm_error,
-	    cm_exdent, index_add_arg, make_index_entries_unique,
-	    cm_printindex, cm_footnote, output_pending_notes,
-	    me_execute_string): Code for HTML.
-	    (cm_shyph): New procedure.
-	    (cm_special_char): Add start, end args.  Code for HTML.
-	    (cm_email, cm_url, cm_i, cm_b, cm_r): New procedures.
-	    (sectioning_html): New procedure.
-	    (sectioning_underscore): Use it.
-	    (add_link): New procedure.
-	    (remember_node): Add number field and update node_number.  Note
-	    next, etc. nodes for HTML.
-	    (add_escaped_anchor_name, add_anchor_name): New procedures.
-	    (cm_node): New code for HTML.  Move some other code to more
-	    useful place.
-	    (remember_node_reference): Add number field and update
-	    node_number.
-	    (remember_node_node_reference, free_node_node_references,
-	    number_of_node): New procedures.
-	    (cm_ifhtml, cm_html): New procedures.
-	    (expansion): Take care of HTML escaping.
-	    (cm_settitle): New procedure.
-	    (remember_note): Set number field.
+2004-02-28  Alper Ersoy  <dirt@gtk.org>
 
-	    Declare various procedures in advance.
+	* makeinfo/float.c (cm_listoffloats): simplified entry generation.
 
-	* doc/texinfo.txi: Makeinfo --html documentation from Dave Love.
-	Typo fixes from: Paul DuBois <dubois@primate.wisc.edu>.
+2004-02-28  Alper Ersoy  <dirt@gtk.org>
 
-Thu Sep  3 11:11:01 1998  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/files.h: new members node_order and index_order in
+	DELAYED_WRITE struct.
 
-	* makeinfo/Makefile.am (makeinfo_SOURCES): add html.[ch].
+	* makeinfo/files.c (register_delayed_write): save current node and
+	index order.
+	(handle_delayed_writes): update tag_table positions and index line
+	numbers by comparing orders, not line numbers they are defined.
 
-1998-08-28  Eli Zaretskii  <eliz@is.elta.co.il>
+	* makeinfo/index.c: made index_counter not static and ...
+	* makeinfo/index.h: extern.
 
-	* makeinfo/makeinfo.c (cm_uref, cm_email): Use get_xref_token to
-	gather arguments.
-	(get_xref_token): Keep track of input line number when expanding
-	xref arguments.
+	* makeinfo/node.h: new member order in TAG_ENTRY struct.
 
-Tue Aug 25 14:36:44 1998  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/node.c (cm_node): keep the order of the node entry.
 
-	* util/texi2dvi: Exit the script if TeX exits with bad status.
+2004-02-27  Karl Berry  <karl@gnu.org>
 
-1998-08-16 Eli Zaretskii <eliz@is.elta.co.il>
+	* util/gendocs.sh: generate ASCII in static file, not stdout, so
+	toc/index can get written.
 
-	* info/indices.c (info_index_apropos): In the *Apropos*
-	menu, print the label first, then the Info file name and
-	the node name.  Make the Info file name part of the menu
-	entry, so that all entries are distinct.
-	(apropos_in_all_indices): Scan each Info file only once, thus
-	avoiding multiple identical entries in the *Apropos* menu.
-	Free xstrdup'ed buffer, to avoid leaking memory.
+	* util/gendocs_template: XHTML version from
+	http://www.gnu.org/boilerplate.html, via John Darrington
+	<john@cellform.com.au>, 9 Jan 2004 07:24:27 +0800.
 
-Thu Aug 13 12:54:58 1998  Karl Berry  <karl@cs.umb.edu>
+2004-02-27  Jan Nieuwenhuizen  <janneke@gnu.org>
 
-	* configure.in: Set version to 3.12a.
+	* doc/texinfo.txi (Image Syntax): Update.
 
-	* Makefile.am (AUTOMAKE_OPTIONS): bump required version to 1.3,
- 		add readme-alpha option.
+	* makeinfo/makeinfo.c (cm_image): Only insert a period between the
+	image's NAME and EXTENSION as a second guess, to retain backward
+	compatibility.
 
-	* util/texindex.c (program_name),
-	* util/install-info.c (progname),
-	* info/info.c (program_name),
-	* makeinfo/makeinfo.c (progname): hardwire per coding standards.
-	* doc/help2man: Remove ginfo special case.
+2004-02-27  Alper Ersoy  <dirt@gtk.org>
 
-Tue Aug 11 17:41:15 1998  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/xml.c (xml_insert_element_with_attribute): if we are
+	closing either TABLEITEM, ITEM or DEFINITIONITEM during string
+	execution, update relevant state.
 
-	* util/gen-dir-node: New version from drk@sgi.com.
+2004-02-27  Alper Ersoy  <dirt@gtk.org>
 
-Mon Aug 10 13:55:37 1998  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/makeinfo.c (execute_string): moved state updates below
+	insertion and element stack checks, so any code executed in those
+	checks will be aware of executing_string.
 
-	* dir-example: Add entries from Linux.
+2004-02-27  Alper Ersoy  <dirt@gtk.org>
 
-	* info/info-utils.c (get_window_of_node): New fn.
-	* info/info-utils.h (get_window_of_node): New fn.
-	* (strchr,...) [!HAVE_STRCHR]: remove these #defines.
-	* info/infodoc.c (info_find_or_create_help_window): Call
-		get_window_of_node instead of get_internal_info_window.
-	This is so pressing ? repeatedly will always get to the same Help
-		window instead of popping up new ones.
-	From: "Brian J. Fox" <bfox@prospero.datawave.net>
+	* makeinfo/xml.c (xml_insert_docbook_image): for Docbook, if paragraph
+	is open, use inlinemediaobject instead of mediaobject in an
+	informalfigure.
+	(xml_insert_element_with_attribute): indent after informalfigure.
 
-	* info/signals.c: Ignore SIGWINCH if we're in the midst of it.
-	We might get a whole lot of them.  Noticed on Afterstep.
-	From: "Brian J. Fox" <bfox@prospero.datawave.net>
+2004-02-27  Alper Ersoy  <dirt@gtk.org>
 
-1998-07-25  Bruno Haible  <bruno@linuix.math.u-bordeaux.fr>
+	* makeinfo/xml.c:
+	* makeinfo/xml.h: new element INLINEIMAGE.
 
-        * install-info.c (findlines): Allocate room for one more line,
-        to avoid crash if dir file has exactly 512 lines.
+	* makeinfo/makeinfo.c (cm_image): for XML, use INLINEIMAGE or IMAGE
+	depending on paragraph state.
 
-Tue Aug  4 07:14:35 1998  Karl Berry  <karl@cs.umb.edu>
+2004-02-27  Alper Ersoy  <dirt@gtk.org>
 
-	* info/info.c: Improve help message.
+	* makeinfo/makeinfo.c (cm_image): for Info, enclose text image in
+	brackets if @image is used inline (ie. paragraph is open).
 
-	* dir-example: Add mtools.
+2004-02-27  Alper Ersoy  <dirt@gtk.org>
 
-Fri Jul 31 13:29:52 1998  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/cmds.c (cm_noindent_cmd, cm_indent): start paragraph for
+	Info too.
 
-	* doc/help2man: Various hacks for texinfo.
+2004-02-27  Alper Ersoy  <dirt@gtk.org>
 
-	* doc/texinfo.txi: Make dir entries more consistent.
+	* makeinfo/makeinfo.c (cm_image): for HTML, if paragraph is not open,
+	enclose image in a <div> block.
 
-	* doc/Makefile.am: Generate man pages with help2man.
+2004-02-27  Alper Ersoy  <dirt@gtk.org>
 
-	* util/texi2dvi,
-	* util/install-info.c,
-	* makeinfo/makeinfo.c,
-	* util/texindex.c: Improve help message.
+	* makeinfo/cmds.c (cm_noindent_cmd, cm_indent): insert <p> for HTML.
 
-	* doc/info.5: Initial.
-	* doc/texinfo.5: Section 5.
+2004-02-26  Alper Ersoy  <dirt@gtk.org>
 
-Thu Jul 30 17:31:42 1998  Karl Berry  <karl@cs.umb.edu>
+	* util/texinfo.dtd: moved verbatim to &block;.
 
-	* doc/info-stnd.texi,
-	* doc/texinfo.txi: Use Automake-standard VERSION and UPDATED.
+2004-02-25  Stepan Kasal  <kasal@ucw.cz>
 
-Wed Jul 29 17:34:41 1998  Karl Berry  <karl@cs.umb.edu>
+	A first step towards general cleanup of sectioning macros:
+	* doc/texinfo.tex (\genhead): A generalized version of ...
+	  (\numhead, \apphead, unnmhead): ... these, which uses ...
+	  (\chapheadtype, \unmlevel, \maxseclevel): ... these "variables".
 
-	* doc/texinfo.txi: Describe macro limitations a bit more.
+2004-02-25  Karl Berry  <karl@gnu.org>
 
-	* dir-example: Correct makeinfo link.
+	* makeinfo/index.c (cm_printindex): insert cookie in Info output
+	for benefit of Info readers.
 
-Tue Jul 28 16:44:06 1998  Karl Berry  <karl@cs.umb.edu>
+2004-02-26  Alper Ersoy  <dirt@gtk.org>
 
-	* makeinfo/makeinfo.c (remember_brace_1): xstrdup command, since
- 		we free it later.
+	* makeinfo/insertion.c (end_insertion): removed obsolete Docbook
+	indentation work-around.
 
-Mon Jul 27 16:27:30 1998  Karl Berry  <karl@cs.umb.edu>
+2004-02-25  Alper Ersoy  <dirt@gtk.org>
 
-	* info/session.c (node_printed_rep): New fn.
-	Change calls.
+	* makeinfo/insertion.c (cm_author): new function.
+	(cm_titlepage_cmds): removed @author parts.
 
-	* info/session.c (info_set_node_of_window): Simplify by taking new
-		argument to say whether to call
-		set_remembered_pagetop_and_point.  Change calls.
-	* info/indices.c: Change call.
+	* makeinfo/cmds.c: made @author call cm_author.
 
-	* info/info.c: Rewrite initial menu-sequence following stuff as a
-		function in session.c, and call it.
+2004-02-24  Karl Berry  <karl@gnu.org>
 
-	* info/infomap.c: Define `G' as info_menu_sequence.
-	* info/session.h (info_menu_sequence, info_follow_menus): declare
- 		new fns.
-	* info/session.c (info_follow_menus, split_words,
-		* info_menu_sequence): New functions for new command.
+	* doc/texinfo.txi: avoid duplicate index entries within the same
+	node (from Alper): syncodeindex, lines 9627 and 9633 TEXINPUTS,
+	lines 14157 and 14202 texinfo-format-buffer 15131 and 15159
+	texinfo-format-region 15130 and 15149
 
-Thu Jul 23 16:44:42 1998  Karl Berry  <karl@cs.umb.edu>
+2004-02-24  Alper Ersoy  <dirt@gtk.org>
 
-	* info/session.c (info_scroll_other_window_backward): new command.
-	* info/infomap.c (initialize_info_keymaps): bind M-DEL and M-prior to
-	scroll-other-window-backward.
-	Report from: Vladimir Alexiev <vladimir@cs.ualberta.ca>
-	Date: 	Tue, 2 Dec 1997 14:54:30 -0700
+	* makeinfo/makeinfo.h: new variable example_indentation_increment.
 
-	* info/info-utils.c (printed_representation): If ISO_Latin_p, show
-		characters as-is.  Don't assume iscntrl(x) returns false
-		for meta characters.
-        Report from: Francois Pinard <pinard@iro.umontreal.ca>
-	Date: 15 Jan 1998 17:48:51 -0500
+	* makeinfo/cmds.c (set_default_indentation_increment): renamed to
+	set_example_indentation_increment.
+	(cm_exampleindent): call set_example_indentation_increment.
 
-	* info/pcterm.c (pc_initialize_terminal): now no need to set it
- 		here.
-	* info/info-utils.c (ISO_Latin_p): set to 1 by default.
+	* makeinfo/insertion.c (begin_insertion, end_insertion): @example,
+	@display and the like now rely on example_indentation_increment.
 
-	* doc/info-stnd.texi: Document SPC, add goto-node anchor.
+2004-02-24  Alper Ersoy  <dirt@gtk.org>
 
-Wed Jul 22 18:58:38 1998  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/insertion.c (begin_insertion, end_insertion): @float should
+	not play with indentation.
 
-	* info/window.c (message_buffer_to_node),
-	* info/session.c (kill_node),
-	* info/nodes.c (info_get_node_of_file_buffer,
- 		info_node_of_file_buffer_tags),
-	* info/man.c (manpage_node_of_file_buffer),
-	* info/footnotes.c (make_footnotes_node): set display_pos member
- 		in new node.
+2004-02-24  Alper Ersoy  <dirt@gtk.org>
 
-Tue Jul 21 14:04:52 1998  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/float.c (cm_listoffloats): check if we are crossing the
+	caption boundaries looking for a space to break at.
 
-        (all of this is to make SPC/DEL not move outside the current
-	        document, i.e., not up through dir)
-	* info/info-utils.h (info_label_was_found): Move from here.
-	* (info_prev_label_of_node): Don't use it any more.
-	* info/session.c (INFO_LABEL_WAS_FOUND): Move to here, add test
- 		for filename not dir.
- 	(forward_move_node_structure): Change calls, notice if no more nodes.
-	(backward_move_node_structure): Check for moving outside current
-	document to dir.
-	* info/filesys.c (compression_suffixes): Add bz2 for bunzip2.
-	(is_dir_name): New fn.
-	* info/filesys.h: Declare it.
-	* info/nodes.c (info_get_node, info_find_file_internal): Use it.
+2004-02-24  Karl Berry  <karl@gnu.org>
 
-	* makeinfo/makeinfo.c: Set in_fixed_width_font to avoid munging
- 		node names.
+	* makeinfo/makeinfo.c: TEXINFO_OUTPUT -> TEXINFO_OUTPUT_FORMAT,
+	after discussion with tar maintainer.
 
-Sat Jul 18 17:14:10 1998  Karl Berry  <karl@cs.umb.edu>
+2004-02-20  Stepan Kasal  <kasal@ucw.cz>
 
-	* info/man.c (reap_children): Call wait (NULL), since we don't
-		actually use the return status for anything.  NEXTSTEP 3.3
-		doesn't like an int * even though that is the POSIX
-		specification.
-	Date: Fri, 22 Aug 1997 13:55:42 +0200
-	From: "Felix H. Gatzemeier" <fxg@imib.rwth-aachen.de>
-	Via: Thomas Esser <te@informatik.uni-hannover.de>
+	* doc/texinfo.tex (\infochapter, \infosection, etc.): these stubs
+		of sectioning commands nuked.
 
-	* info/session.c (kill_node): Restore point when we go back.
+2004-02-24  Stepan Kasal  <kasal@ucw.cz>
 
-Thu Jul 16 18:54:04 1998  Karl Berry  <karl@cs.umb.edu>
+	* doc/texinfo.tex (\centerchap): Fixed to work again,
+	  don't open group.
+	  (\centerparameters): New macro.
+	  (\centerchfplain): Nuked.
 
-	* makeinfo/makeinfo.c (BRACE_ELEMENT): Add `command' to the save
- 		stack.
- 	(MAYBE_BRACE_ARGS): New possibility, somewhat like TeX's
-	  next-token-as-argument.
-	(command_table): Use cm_accent and MAYBE_BRACE_ARGS for all accents.
-	(read_command): Implement MAYBE_BRACE_ARGS.
-	(init_brace_stack): save current command.
-	(pop_and_call_brace): restore current command.
-	(cm_accent): move almost all accent characters to after the argument.
-	Suggested by Fran,cois.
+	The following continues with prosecution of @setchapterstyle{open}:
+	* doc/texinfo.tex (\chfplain): renamed to \chapmacro.
+	  (\CHAPFplain): Nuked.
+	  (\setchapterstyle): Moved next to its deprecated friends.
 
-	* info/info.c (version_string): Remove defn.
-	Change call for --version option.
-	* info/session.c (display_startup_message_and_start): Just use
- 		VERSION.
-	* info/info.h (version_string): Remove decl.
+2004-02-24  Karl Berry  <karl@gnu.org>
 
-Tue Jul 14 16:46:58 1998  Karl Berry  <karl@cs.umb.edu>
+	* doc/texinfo.tex (\dofloat): start a paragraph.
 
-	* makeinfo/makeinfo.h: Doc fix.
+2004-02-24  Alper Ersoy  <dirt@gtk.org>
 
-	* makeinfo/makeinfo.c (validate_file): Don't complain about
- 		unreferenced anchors.
+	* makeinfo/insertion.c (cm_caption): check if the innermost
+	environment is @float.
 
-	* doc/texinfo.txi: Document @anchor.
+2004-02-24  Alper Ersoy  <dirt@gtk.org>
 
-Sun Jul 12 14:14:50 1998  Karl Berry  <karl@cs.umb.edu>
+	* info/session.c (info_menu_digit): if the menu entry has a line
+	number, go to that line.
 
-	* makeinfo/makeinfo.c (remember_node): Only set `current_node' if
- 		this is not an anchor.
+2004-02-24  Alper Ersoy  <dirt@gtk.org>
 
-	* info/nodes.c (get_tags_of_indirect_tags_table): Don't set
-	nodelen to -1 when fixing up the subfile entries, it might be 0
-	from an anchor.
+	* info/info.c (main): make sure dir file is not listed for option
+	--where.
 
-	* info/nodes.c (find_node_of_anchor): Offset display_pos for
-	anchor tags by the amount that node references are off by (- 1).
+2004-02-24  Alper Ersoy  <dirt@gtk.org>
 
-Sat Jul 11 17:37:18 1998  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/xml.c (xml_insert_element_with_attribute, xml_add_char)
+	(xml_begin_table, xml_end_table, xml_begin_table_item)
+	(xml_continue_table_item): separated ITEM and TABLEITEM states to
+	handle @table environments better.
 
-	* makeinfo/makeinfo.c (cm_anchor): Add output_column for anchors
- 		embedded in a line.
+2004-02-24  Alper Ersoy  <dirt@gtk.org>
 
-Fri Jul 10 16:28:21 1998  Karl Berry  <karl@cs.umb.edu>
+	* util/texinfo.dtd: added float and friends, updated tableitem and
+	Inline.reference.
 
-	* info/session.c (info_menu_or_ref_item): Don't search for the
-		xref text if it's an anchor.
-	* info/nodes.h (N_FromAnchor): New NODE flag.
-	* info/nodes.c (find_node_of_anchor): New fn.
-	(info_node_of_file_buffer_tags): Handle anchor case.
+2004-02-23  Karl Berry  <karl@gnu.org>
 
-Wed Jul  8 17:48:59 1998  Karl Berry  <karl@cs.umb.edu>
+	* doc/texinfo.txi (Structuring Command Types): slightly more info
+	about headings.  Fix other references, too.
 
-	* info/window.c (window_set_node_of_window): Set window->point to
-		node->display_pos.
-	Remove unneeded casts.
+	* Makefile.am (EXTRA_DIST): explicitly list every file in djgpp,
+	so that the CVS directory is not included in the dist.tar.gz.
 
-Tue Jul  7 08:06:14 1998  Karl Berry  <karl@cs.umb.edu>
+2004-02-23  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* makeinfo/makeinfo.c (add_word_args) [!VA_SPRINTF]: Use buffer,
-		not the undeclared temp_string.
-	From:     Tobias Naehring <naehring@eeetw3.et.tu-dresden.de>
-	To:       egcs-bugs@cygnus.com
-	Date:     Mon, 6 Jul 98 13:51:55 +0200
+	* makeinfo/cmds.c (cm_code): For @samp, using single quotes instead of
+	double quotes, to match TeX output more closely.
 
-Mon Jul  6 17:43:25 1998  Karl Berry  <karl@cs.umb.edu>
+2004-02-23  Alper Ersoy  <dirt@gtk.org>
 
-	* info/nodes.h (NODE): Add display_pos member.
-
-Sun Jul  5 08:17:43 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* info/nodes.h (INFO_REF_LABEL): Define.
-
-	* util/texi2dvi: Rationalize use of `index' vs. more general
- 		`xref'.
-
-Thu Jul  2 18:53:43 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c: Don't translate -Footnotes, it's a magic
- 		cookie.  From Eli.
-
-Wed Jul  1 08:42:41 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.txi (url): Missing word `command'.
-
-Tue Jun 30 10:35:48 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* info/info.c: Missing \n in try --help msg.
-
-	* makeinfo/makeinfo.c (cm_anchor): New fn for new cmd.
-	(TAG_FLAG_ANCHOR): New flag for tag entries.
-	(write_tag_table_internal): Handle anchor case.
-	(TAG_FLAG_{{PREV,NEXT,UP}_ERROR,NO_WARN,IS_TOP}): Add TAG_FLAG_ prefix
-	for clarity, change uses.
-
-	* doc/texinfo.txi: Remove warning about footnotes with @item, that
- 		works now.
-
-Mon Jun 29 10:17:50 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* configure.in (AM_CONFIG_HEADER): Use second argument to be 8.3
-		compliant.
-	* config.h.in: Rename to config.in.
-
-	* info/Makefile.am (EXTRA_DIST),
-	* info/terminal.c [__MSDOS__]: Change #include to pcterm.c and
-		rename file.
-
-Sun Jun 28 14:29:27 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* info/Makefile.am (EXTRA_DIST): Add pc_term.c.
-
-	* makeinfo/makeinfo.c (HAVE_MACROS): Remove this conditional, we
- 		always want macros now.
-
-	* info/indices.c: Copyright.
-
-1998-06-26  Eli Zaretskii  <eliz@is.elta.co.il>
-
-	* makeinfo/makeinfo.c: (only_macro_expansion): New variable,
-	suppresses all expansions except macros.
-	(replace_with_expansion): New function, replaces a portion of
-	input text with its expansion.  Avoids moving the text around if
-	we are positive it will expand into itself.  If the length of the
-	expanded text is the same as the length of the original text, just
-	replaces the original text without moving the rest.  Resyncs the
-	remembered text pointers with the realloc'ed input_text, when it
-	is realloc'ed.
-	(reader_loop): When only_macro_expansion is non-zero, only handle
-	macros, but leave the rest of input intact.
-	(read_command): Now returns an int, zero means no known command or
-	macro is found after the prefix character; all callers changed.
-	Support operation under non-zero only_macro_expansion.
-	(cm_node): Expand only the macros in the @node line.  Allocate and
-	generate the macro-expanded @node line in one swell whoop.
-	(glean_node_from_menu): Expand macros in menu entries.
-	(get_xref_token): A new argument EXPAND, when non-zero, means
-	expand macros in the entire brace-delimited argument before
-	looking for the next comma; all callers changed.
-	(expansion): Save and restore additional state variables important
-	for output generation machinery.  Disable indentation and filling
-	during the recursive expansion, so that the output buffer offset
-	is not invalidated by filling.
-	(me_execute_string_keep_state): New function, calls
-	me_execute_string, but saves and restores state variables
-	important for output generation, so that -E doesn't change the
-	generated Info output.
-	(index_add_arg, cm_footnote): Call me_execute_string_keep_state.
-	(expand_macro): New function, returns the macro expansion as a
-	malloc'ed string.
-	(execute_macro): Call expand_macro.
-	(me_execute_string): Avoid memory leak by freeing input_filename.
-	(get_until_in_braces, replace_with_expansion, add_char,
-	cm_footnote, cm_macro, cm_unmacro, get_brace_args,
-	extract_colon_unit): Use the faster memcpy/memmove instead of
-	strncpy.
-
-Sat Jun 27 14:18:54 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/info.texi: Use @subsubsection instead of
-		@unnumberedsubsubsection, since it's in a numbered chapter.
-
-	* Started installation of following DOS patches from Eli.
->1998-05-16  Eli Zaretskii  <eliz@is.elta.co.il>
->
->	* info/session.c (info_goto_node): Don't show the nodes of the
->	current Info file twice in *Completions*.
->	* info/echo-area.c (ea_possible_completions): Actually pass the
->	number of completions to printf_to_message_buffer.
->
->	* info/man.c (manpage_node_of_file_buffer): xstrdup the nodename
->	member of manpage nodes, since the tags are freed and recomputed
->	when a new man page is added to *manpages* file_buffer.
->	(get_manpage_node): Recompute info_windows[]->nodes[] for all
->	windows showing the man pages after nodes[]->contents are
->	invalidated by reallocation of file_buffer->contents.
->
->1998-05-15  Eli Zaretskii  <eliz@is.elta.co.il>
->
->	* lib/system.h (DEFAULT_INFO_PRINT_COMMAND) [__MSDOS__]: Define to
->	">PRN".
->	* info/session.c (print_node): Support ">printer" in
->	INFO_PRINT_COMMAND, to mean write to the named file/device insead
->	of piping to it as a program.
->	(kill_node): Compare window in addition to the nodename, when
->	looking for the node to kill.
->
->1998-05-09  Eli Zaretskii  <eliz@is.elta.co.il>
->
->	* lib/system.h (SET_SCREEN_SIZE_HELPER) [__MSDOS__]: Define a new
->	macro.
->	* info/m-x.c (set_screen_height): Use SET_SCREEN_SIZE_HELPER, if
->	defined.  If the screen size did'n change, redisplay the previous
->	screen contents.
->
->	* info/infomap.c (initialize_info_keymaps) [__MSDOS__]: Bind DEL
->	to ea_delete in the echo-area keymap.
->	* info/session.c (incremental_search): If the key is
->	isearch_terminate_search_key, but buffered input is pending, don't
->	gobble the ESC key.
->
->	* info/info.c (main): Switch the order thet terminal_prep_terminal
->	and terminal_clear_screen are called, to make it consistent with
->	what initialize_info_session does when called with non-zero second
->	argument.  Call terminal_unprep_terminal last, after moving the
->	cursor to the bottom of the screen.  If user_filename is of the
->	form "d:foo", add "d:." to the INFOPATH, not "d:".
->
->	* info/signals.c (initialize_info_signal_handler): Save old
->	SIGUSR1 handler.
->	(info_signal_handler): Handle SIGUSR1.
->
->	* info/indices.c (info_apropos): Print the results to stdout.
->
->1998-05-02  Eli Zaretskii  <eliz@is.elta.co.il>
->
->	* makeinfo/makeinfo.c (ALSO_NULL_DEVICE): New macro, for alternate
->	null device name.
->
->	* info/man.c (get_manpage_contents): Redirect stderr of the man
->	page formatter to the null device.
->	(executable_file_in_path): Use IS_SLASH.
->
->	* info/session.c (info_gather_typeahead) [__DJGPP__]: Call
->	pc_term_chars_avail to get the number of pending characters.
->
->	* info/filesys.c (convert_eols): New function, converts DOS-style
->	EOLs to a single Newline.
->	(filesys_read_info_file, filesys_read_compressed): Call it.
->	(filesys_read_compressed) [STRIP_DOT_EXE]: Use explicit .exe
->	suffix.
->	(filesys_read_compressed): Check return status of `pclose'.
->
->1998-05-01  Eli Zaretskii  <eliz@is.elta.co.il>
->
->	* info/filesys.c (filesys_read_info_file): Add additional
->	parameter: is_compressed.  All callers changed.
->
->	* makeinfo/makeinfo.c (convert_from_loaded_file): Compare file
->	names with FILENAME_CMP.  Use NULL_DEVICE.
->	(cm_node): Compare file names with FILENAME_CMP.
->	* info/tilde.c (tilde_find_suffix, tilde_expand_word): Use
->	IS_SLASH.
->
->	* info/pc_term.c: New file, handles the PC terminal on MS-DOS and
->	MS-Windows.
->	* info/terminal.c [__MSDOS__]: Include pc_term.c.
->	* info/Makefile.in (ginfo_SOURCES): Add pc_term.c
->	Add pc_term.c to dependencies of terminal.o.
->
->	* info/session.c (info_get_input_char): Reassign tty after EOF
->	from a non-stdin input stream.
->
->1998-04-30  Eli Zaretskii  <eliz@is.elta.co.il>
->
->	* info/session.c (info_set_input_from_file): Use binary input.
->	(info_gc_file_buffers): Compare file names with FILENAME_CMP.
->	* info/search.c (skip_whitespace_and_newlines): Use
->	whitespace_or_newline macro instead of reinventing the wheel.
->	* info/nodes.c (info_find_file_internal): Use IS_ABSOLUTE and
->	FILENAME_CMP.
->	(info_load_file_internal): Call filename_non_directory to find out
->	where the basename begins.
->	(get_tags_of_indirect_tags_table): Call filename_non_directory.
->	containing_dir of "d:foo" is "d:.", not "d:".
->	(forget_info_file): Compare file names with FILENAME_CMP.
->	* info/nodemenu.c (get_visited_nodes): Use FILENAME_CMP to find
->	duplicate lines.
->
->	* lib/system.h (PIPE_USE_FORK): New macro.
->	* info/man.c (get_manpage_contents): Use it to determine whether
->	to call pipe/fork/exec or popen/pclose to run the man page
->	formatter.
->	(executable_file_in_path): Search for the file with several known
->	extensions such as .exe, where appropriate.
->
->	* lib/system.h (NULL_DEVICE): A new macro.
->	* info/makedoc.c (main): Use it.
->	(maybe_dump_tags): Switch output strem to binary mode when
->	appropriate.
->	(process_one_file): Update file_size after reading the file.
->
->	* info/infodoc.c: Add TAB, RET, and `i' to the list of important
->	commands in info_internal_help_text.
->
->	* info/info.c (main): Support the --speech-friendly option.  Use
->	PATH_SEP to separate directories.
->	(info_short_help) [__MSDOS__]: Mention the --speech-friendly
->	option.
->
->	* info/info-utils.c (filename_non_directory): Use HAVE_DRIVE and
->	IS_SLASH.
->	* info/indices.c (do_info_index_search, index_entry_exists): Use
->	FILENAME_CMP to compare file names.
->	* info/filesys.c: Add ".inf" to the list of known extensions.
->	Look for .z before .Z, for the sake of case-insensitive
->	filesystems.  Add DOS-specific extensions to work around 8+3
->	namespace restrictions.
->	(info_absolute_file): New function.
->	(info_find_fullpath): Call it for candidates which are absolute
->	file names.  Use IS_SLASH and IS_ABSOLUTE.
->	(info_file_in_path): Use IS_SLASH.
->	(extract_colon_unit, info_add_path): Use PATH_SEP instead of ":".
->	(lookup_info_filename): Compare file names with FILENAME_CMP.
->	(filesys_read_info_file): Read Info files in binary mode.
->	(filesys_decompressor_for_file): Read Info files in binary mode.
->	Compare file names with FILENAME_CMP.  On MS-DOS, allow files
->	whose names end with a `z' be decompressed with gunzip.
->	* info/dribble.c (open_dribble_file): Open dribble file in
->	FOPEN_WBIN mode.
->	* info/dir.c (maybe_build_dir_node): Use IS_SLASH.
->	* util/texindex.c (maketempname): Put the numeric suffix after the
->	dot, to salvage 3 more characters on 8+3 filesystems.
->
->1998-04-29  Eli Zaretskii  <eliz@is.elta.co.il>
->
->	* util/texindex.c (main): Use IS_SLASH to find the basename of
->	argv[0].  Lose the .exe suffix, if any.
->	(decode_command): Look at $TEMP and $TMP in addition to $TMPDIR.
->	Use DEFAULT_TMPDIR.
->	* util/texi2dvi: Use either `:' or `;' as directory separator in
->	TEXINPUTS, computed at run time.  Save previous versions of index
->	files in a separate backup directory.
->	* util/install-info.c (main): Support backslashes in file names by
->	using IS_SLASH.  Avoid recomputing length of infile_basename
->	unnecessarily.  Use FILENAME_CMP for comparing file names
->	case-insensitively, where appropriate.  Allow foo.inf as well as
->	foo.info to be an Info file name.
->	* lib/system.h (PATH_SEP, STRIP_DOT_EXE, FILENAME_CMPN,
->	DEFAULT_TMPDIR): New macros.
->
->1998-04-25  Eli Zaretskii  <eliz@is.elta.co.il>
->
->	* lib/system.h (O_BINARY, SET_BINARY, FOPEN_RBIN, FOPEN_WBIN,
->	IS_SLASH, HAVE_DRIVE, IS_ABSOLUTE, FILENAME_CMP, PATH_SEP,
->	HAVE_LONG_FILENAMES): New macros.
->	* makeinfo/makeinfo.c (find_and_load): Use O_BINARY to decide when
->	read returning a value different from what st_size says is not an
->	error.  Realloc the buffer after we've read the file.
->	(skip_directory_part): New function, skips leading directory in a
->	way that works on DOSISH systems.
->	(filename_non_directory, pathname_part): Call it.
->	(filename_part): Call filename_non_directory.
->	(expand_filename, full_pathname): Use IS_ABSOLUTE and IS_SLASH.
->	(convert_from_file): Check .txi extension first.
->	(split_file): Support splitting output files on 8+3 filesystems.
->	(main, extract_colon_unit): Use PATH_SEP instead of ':'.
->	(get_file_info_in_path): Use IS_ABSOLUTE and IS_SLASH.
-
-
-	* doc/texinfo.txi: Changes from Eli for MS-DOS stuff.
-	* doc/info-stnd.texi: Fixes from Eli: he documented all the
- 		missing keys and command-line options, corrected
- 		inaccuracies (probably left-overs from previous versions),
- 		and added some clarifications where I thought the manual
- 		was not clear enough.
-	* Makefile.am (EXTRA_DIST): Add djgpp files.
-
-	* makeinfo/makeinfo.c: New no-op commands @setcontentsaftertitlepage
-	and @setshortcontentsaftertitlepage.
-	* doc/texinfo.txi: Document the new @set{,short}contentsaftertitlepage
-	commands and the possibility of putting @contents and
-        @shortcontents after @end titlepage.
-
-	* util/texi2dvi: Check that the toc file has not changed (as well
- 		as .aux and .??).
-
-Thu Jun 25 16:58:46 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.txi: Document new commands @env, @command, @option.
-
-	* makeinfo/makeinfo.c (option, command, env): New markup commands, same
- 		as @code in info.
-
-Wed Jun 24 15:39:38 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c: New no-op command @acronym.
+	* makeinfo/index.h: new output_file and entry_number members in
+	index_elt struct.
 
-	* doc/texinfo.txi: Document new command @acronym.
+	* makeinfo/index.c (index_add_arg, cm_printindex): rewrote hyperlink
+	generation for HTML to avoid duplicate anchors, and to work with
+	splitting enabled.
 
-	* util/install-info.c (strip_info_suffix, menu_item_equal): New fns.
- 	(main): Call them instead of doing the filename test inline; all the
-	.info variations are too confusing to write out twice.
+2004-02-20  Alper Ersoy  <dirt@gtk.org>
 
-Tue Jun 23 18:01:40 1998  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/float.c (cm_listoffloats): create HTML hyperlinks with
+	add_word instead of using @ref to avoid problems with commas in
+	captions.
 
-	* doc/texinfo.txi: Fix some overfull boxes.
+2004-02-20  Alper Ersoy  <dirt@gtk.org>
 
-Mon Jun 22 19:22:17 1998  Karl Berry  <karl@north>
+	* makeinfo/node.c (cm_node): remove whitespace before the node
+	separator sequence.
 
-	* configure.in: Remove AC_LINK_FILES call, that was an old gettext
- 		thing, no longer necessary, and causes problems with Autoconf.
+2004-02-20  Alper Ersoy  <dirt@gtk.org>
 
-Sun Jun 14 07:00:15 1998  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/sectioning.c (handle_enum_increment): do not increment
+	counters for ENUM_SECT_NO heading commands (ie. @unnumbered,
+	@majorheading, etc.)
 
-	* util/texi2dvi: Indent options so help2man will work.  From Akim.
+2004-02-20  Alper Ersoy  <dirt@gtk.org>
 
-Sat Jun 13 10:45:25 1998  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/multi.c (multitable_item): unset hsep if item command is
+	not @headitem.
 
-	* configure.in (ALL_LINGUAS): Add nl.
+2004-02-19  Karl Berry  <karl@gnu.org>
 
-	* util/texi2dvi: Avoid tabs.
+	* doc/texinfo.tex: More hyphenation exceptions.
+	(\author, \quotation): implement @author inside
+	@quotation, for attribution purposes.
 
-Wed Jun 10 17:38:21 1998  Karl Berry  <karl@cs.umb.edu>
+2004-02-19  Alper Ersoy  <dirt@gtk.org>
 
-	* makeinfo/makeinfo.c (gen_defindex): Use xmalloc instead of alloca.
-	This was our only use of alloca, so also remove all the #if junk
-	at the beginning to define it.
+	* makeinfo/cmds.c (cm_exampleindent): fixed paragraph handling after
+	@exampleindent lines.
 
-	* makeinfo/makeinfo.c: Fix grammar in multiply-defined-node error
-		message.
+2004-02-19  Alper Ersoy  <dirt@gtk.org>
 
-Tue Jun  9 17:53:54 1998  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/index.c (index_add_arg): create an anchor where @index is
+	used in HTML documents.
+	(cm_printindex): make index text an hyperlink to the created anchor.
 
-	* doc/texinfo.txi: Document new commands @smallformat,
- 		@smalldisplay.
+2004-02-19  Alper Ersoy  <dirt@gtk.org>
 
-	* makeinfo/makeinfo.c: New commands @smalldisplay and @smallformat.
-	Suggestion from: Eli Zaretskii <eliz@is.elta.co.il>.
+	* makeinfo/insertion.c (begin_insertion): skip empty lines following
+	@table, @ftable, @vtable and @itemize lines.
 
-	* makeinfo/makeinfo.h (insertion_type, insertion_type_names):
-	Declare smalldisplay and smallformat.
+2004-02-18  Karl Berry  <karl@gnu.org>
 
-Mon Jun  8 07:57:52 1998  Karl Berry  <karl@cs.umb.edu>
+	* lib/substring.c,
+	* lib/xexit.c,
+	* lib/xmalloc.c,
+	* lib/system.h: ANSI-fy.  (Other lib files come from gnulib.)
 
-	* doc/texinfo.txi: Document possibility of combining @titlefont
- 		and @title.  From Eli.
+	* doc/texinfo.txi (Definition Commands): describe the argument/@var
+	situation more accurately.
 
-	* util/texi2dvi: Set verbose to : instead of false by default.
+	* doc/texinfo.txi (Definition Commands): explicitly document the
+	implicit index entry creation in all cases.
 
-	* util/texi2dvi: Missing \\ for sed with -t text.  From Akim.
+	* doc/texinfo.txi (Printing Indices & Menus, Indices, Predefined
+	Indices): remove redundancies, make different
+	purposes clear, etc.
 
-Sun Jun  7 13:02:13 1998  Karl Berry  <karl@cs.umb.edu>
+2004-02-18  Alper Ersoy  <dirt@gtk.org>
 
-	* doc/texinfo.txi: Document @pagesizes and texidvi -t.
+	* makeinfo/xml.h:
+	* makeinfo/xml.c (xml_get_assoc_for_id, xml_associate_title_with_id):
+	removed these functions.
+	
+	* makeinfo/xref.c (cm_xref): do not call xml_get_assoc_for_id.
 
-	* makeinfo/makeinfo.c: Define no-op @pagesizes and @afourpaper.
-	(major_version, minor_version): Remove these globals, just use the
-	Texinfo package version.
-	(print_version_info): Ditto.
+	* makeinfo/sectioning.c (sectioning_underscore): added xreflabel
+	attribute to @unnumbered for Docbook.
 
-Fri Jun  5 17:54:16 1998  Karl Berry  <karl@cs.umb.edu>
+2004-02-18  Alper Ersoy  <dirt@gtk.org>
 
-	* doc/texinfo.txi: Change texi2dvi documentation a bit.
+	* makeinfo/xref.c (cm_xref): for Docbook, use lowercase ``see'' when
+	printing index.
 
-	* util/texi2dvi: Handle --option=argument style of specifying
- 		arguments.
+2004-02-18  Alper Ersoy  <dirt@gtk.org>
 
-Sat May 30 14:01:37 1998  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/xml.c (xml_insert_indexentry): removed ``see'' from index
+	entries as cm_xref takes care of it.
 
-	* doc/texinfo.txi: More.
+2004-02-17  Karl Berry  <karl@gnu.org>
 
-	* util/install-info.c (open_possibly_compressed_file): Finish
- 		implementation.
+	* doc/info.texi (Help-Int): mention the new line number feature.
+	* doc/texinfo.txi (Indices): plural correction.
+	* doc/info-stnd.texi (Invoking Info): matche typo.
+	(Searching Commands): grammar.
+	* info/session.c (info_menu_or_ref_item): need to subtract 1 from
+	the actual line number to get to the right place,
+	don't really know why.
 
-	* doc/texinfo.txi: Document install-info compression support.
+	* makeinfo/makeinfo.c, info/info.c, util/texindex.c,
+	utils/install-info.c, util/texi2dvi: update copyright year to
+	2004, and do not mark copyright line for translation, since
+	international law says to always use the English word "copyright".
 
-Fri May 29 08:01:43 1998  Karl Berry  <karl@cs.umb.edu>
+2004-02-17  Alper Ersoy  <dirt@gtk.org>
 
-	* util/install-info.c (open_possibly_compressed_file): Initial
- 		implementation.
+	* makeinfo/insertion.c (end_insertion): use add_html_block_elt instead
+	of add_word for </pre> ending @example and the like.
+	* makeinfo/float.c (cm_listoffloats): use add_html_block_elt for <li>.
 
-	* util/install-info.c (output_dirfile): Attempt to write dir.gz if
- 		that's what we read.
- 	(readfile): Pass back the actual opened filename, too.
+2004-02-17  Alper Ersoy  <dirt@gtk.org>
 
-	* info/indices.c: Check in Eli's patch.
+	* makeinfo/insertion.c (begin_insertion): do not expand @copying for
+	HTML and Info too.
+	(cm_insert_copying): expand copying_text for all formats here.
 
-Thu May 28 17:09:45 1998  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/html.c (html_output_head): use text_expansion for copying
+	text.
 
-	* util/install-info.c (readfile): Set up to handle compressed
-	input (and output) files. Change callers.
-	Rearrange function order to avoid forward declarations.
+2004-02-17  Karl Berry  <karl@gnu.org>
 
-	* configure.in: Remove check for libz, we'll fork gzip instead.
+	* doc/texinfo.txi (float): mention @multitable and @image
+	as typical contents.  From Arnold.
 
-Tue May 26 18:01:13 1998  Karl Berry  <karl@cs.umb.edu>
+2004-02-17  Alper Ersoy  <dirt@gtk.org>
 
-	* util/install-info.c (print_help): Missing \n\ in help string.
+	* makeinfo/xml.c (xml_insert_element_with_attribute): removed check
+	to see if current element contains para before calling xml_start_para,
+	as that check is performed in xml_start_para too.
 
-	* makeinfo/makeinfo.c (POST_SENTENCE): Rename from post_sentence.
-  	Change calls.
-	(flush_output): Strip 8th bit if post_sentence char as well as space.
-	(cm_code, etc.): Change add_char calls for post_sentence chars to set
-	8th bit.
+2004-02-17  Alper Ersoy  <dirt@gtk.org>
 
-1998-05-23  Eli Zaretskii  <eliz@is.elta.co.il>
+	* makeinfo/insertion.c (end_insertion): indent float caption.
 
-	* info/indices.c (info_next_index_match): Call
-	info_set_node_of_window to display the node, so that footnotes are
-	displayed as well.
+2004-02-17  Alper Ersoy  <dirt@gtk.org>
 
-Thu May 21 11:05:50 1998  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/insertion.c (begin_insertion): for XML and Docbook, do not
+	expand @copying text.  Instead of calling @anchor, use <float
+	name="floatlabel"> for XML.
+	(cm_copying): removed ugly copying_text manipulation for Docbook.
+	Warn if there is no @copying before @insertcopying.
 
-	* util/install-info.c (output_dirfile): New function, extracted
- 		from the end of main.
+	* makeinfo/xml.c: made floats contain para.
+	(xml_start_para): check if current element can contain para.
+	(xml_add_char): removed @copying checks.
 
-	* makeinfo/makeinfo.c (begin_insertion): Ignore @group in all the
-	example-like environments, not just @example.  Otherwise the first
-	line in the environment is not indented correctly. Reported by rms.
+2004-02-17  Alper Ersoy  <dirt@gtk.org>
 
-Wed May 20 17:44:38 1998  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/insertion.c (end_insertion): if the output format is XML,
+	do not call close_insertion_paragraph after @end menu.
 
-	* util/install-info.c: Doc fixes.
+2004-02-17  Alper Ersoy  <dirt@gtk.org>
 
-	* util/install-info.c: Handle XEmacs-style dir entries:
-	* FILENAME::PROGRAM  DESCRIPTION.
-	Date: Wed, 13 May 1998 13:58:28 +0900
-	From: KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
+	* makeinfo/xml.c (xml_insert_element_with_attribute): indentation
+	fixes for @multitable.
 
-	Also, do not set something_deleted on continuation lines; they are only
-	deleted if the entry was deleted.
+2004-02-17  Alper Ersoy  <dirt@gtk.org>
 
-Tue May 19 17:22:50 1998  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/multi.c (do_multitable): remove trailing newline when the
+	output format is Docbook or XML, as output_paragraph becomes unusable
+	later for xml_indent during select_output_environment.
 
-	* util/install-info.c: Do not read the dir file if we are only
-	deleting -- it might not exist, and we don't actually need it.
-	From: David Kaelbling <drk@sgi.com>
-	Date: Tue, 12 May 1998 11:05:26 -0400
+2004-02-16  Alper Ersoy  <dirt@gtk.org>
 
-	* util/gen-dir-node:
-	From: David Kaelbling <drk@sgi.com>
-	Date: Tue, 12 May 1998 16:05:16 -0400 -
-	- The "dir" moobler header is slightly different from the default
-		dir file.
-	- If all files in ${infofiles} appear in the skeleton the last one
- 		is processed twice.
- 	- INFO-DIR-SECTION data is ignored.
-  	- Don't generate entries for directories.
+	* makeinfo/cmds.c (cm_bye): do not call flush_output as text appended
+	by convert_from_loaded_file may need to play with output_paragraph.
 
-Sat May 16 17:16:56 1998  Karl Berry  <karl@cs.umb.edu>
+2004-02-16  Alper Ersoy  <dirt@gtk.org>
 
-	* makeinfo/makeinfo.c (cm_novalidate): New fn for new command
- 		@novalidate, like --no-validate.
+	* makeinfo/xml.c (xml_end_document): insert newline after </texinfo>
+	only if indentation is disabled (otherwise xml_indent takes care of
+	the newline.)
+	(xml_insert_indexentry): disable warnings when executing implicit
+	@xref commands  for Docbook, otherwise makeinfo will warn about
+	missing punctuation.
 
-Thu May 14 18:02:31 1998  Karl Berry  <karl@cs.umb.edu>
+2004-02-16  Alper Ersoy  <dirt@gtk.org>
 
-	* doc/texinfo.txi: Document the @novalidate command.
+	* makeinfo/insertion.c (begin_insertion): eat one newline after
+	@xml/@docbook blocks for proper indentation.
 
-Wed May 13 17:47:20 1998  Karl Berry  <karl@cs.umb.edu>
+2004-02-16  Alper Ersoy  <dirt@gtk.org>
 
-	* doc/texinfo.txi: Document limitation on @set/@value names in
- 		index commands.
+	* makeinfo/cmds.c (cm_center): fixed line wrapping after the @center
+	command.
 
-Fri May  1 14:12:15 1998  Karl Berry  <karl@cs.umb.edu>
+2004-02-15  Alper Ersoy  <dirt@gtk.org>
 
-	* doc/texinfo.txi (Command List): @deftypevar out of order.
+	* makeinfo/xml.c (xml_begin_document): disabled warnings around the
+	implicit register_delayed_write("@documentencoding") call.
 
-	* configure.in (ALL_LINGUAS): Add cs.
+2004-02-15  Alper Ersoy  <dirt@gtk.org>
 
-Tue Apr 28 09:33:41 1998  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/insertion.c (begin_insertion, end_insertion): when handling
+	@xml, @html and @docbook blocks, do not touch para elements, and keep
+	whitespace as-is.
 
-	* makeinfo/makeinfo.c (strcasecmp): This is in lib now.
+2004-02-15  Alper Ersoy  <dirt@gtk.org>
 
-1998-04-26 Richard Stallman <rms@psilocin.gnu.org>
+	* makeinfo/xml.h: made xml_keep_space extern.
 
-	* util/install-info.c (print_help): Doc clarifications.
+2004-02-15  Alper Ersoy  <dirt@gtk.org>
 
-Sun Apr 19 15:55:10 1998  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/cmds.c (cm_noindent_cmd, cm_indent): implicitly start
+	para element for Docbook and XML.
 
-	* lib/system.h (strcasecmp, strncasecmp) [!HAVE_STR[N]CASECMP]:
- 		Declare these.
+2004-02-15  Karl Berry  <karl@gnu.org>
 
-	* info/search.h (str[n]casecmp): Remove decl from here.
+	* doc/texinfo.tex (\hyphenation): add more hyphenation exceptions,
+	gleaned from the log in TUGboat.
+	* doc/info-stnd.texi: document new option --where.
+	* info/info.c (main): in print_where_p case, ensure we don't try
+	to print NULL.
 
-	* configure.in (AC_REPLACE_FUNCS): Check for strcasecmp and
- 	strncasecmp here.
-	(AC_CHECK_FUNCS): Instead of just strcasecmp here.
+2004-02-14  Karl Berry  <karl@gnu.org>
 
-	* configure.in (texconfig): Use TEXMFMAIN in preference to TEXMF
- 		for post-0.4 teTeX.
+	* doc/texinfo.tex (\addtokens): had two identical definitions,
+	remove one.
+	(\maketoks): no space token after |ENDTOKS|,
+	although I guess it hasn't mattered.
+	(\entry): make clear what is the argument to
+	\pdfgettoks and what is output.
+	(\appendtomacro): use our own token registers,
+	for safety.
+	(\listoffloatsdoentry): fully expand the page
+	number, and don't expand the lof text.
 
-Wed Apr 15 17:20:31 1998  Karl Berry  <karl@cs.umb.edu>
+2004-02-14  Alper Ersoy  <dirt@gtk.org>
 
-	* doc/texinfo.txi (Reporting Bugs): New section.
-	Suggestion from: Andrew Shapira <shapiraa@cs.rpi.edu>
-	Date: Mon, 4 Aug 1997 19:06:06 -0400 (EDT)
+	* makeinfo/cmds.c (cm_strong):
+	* makeinfo/xml.c (xml_begin_index): cast output_paragraph to char, to
+	avoid warnings with -pedantic.
 
-	* info/infomap.c: Define / to be info_search.
-	Suggestion from: Egil Kvaleberg <egil@kvaleberg.no>
-	Date: Fri, 1 Aug 1997 08:16:45 +0200 (MET DST)
+2004-02-13  Alper Ersoy  <dirt@gtk.org>
 
-	* doc/texinfo.txi (uref): Document reason for not using <URL: format.
-	Also use ftp.gnu.org instead of ftp.gnu.ai.mit.edu throughout.
+	* makeinfo/cmds.c:
+	* makeinfo/cmds.h:
+	* makeinfo/defun.c:
+	* makeinfo/defun.h:
+	* makeinfo/files.c:
+	* makeinfo/files.h:
+	* makeinfo/float.c:
+	* makeinfo/float.h:
+	* makeinfo/footnote.c:
+	* makeinfo/footnote.h:
+	* makeinfo/html.c:
+	* makeinfo/html.h:
+	* makeinfo/index.c:
+	* makeinfo/index.h:
+	* makeinfo/insertion.c:
+	* makeinfo/insertion.h:
+	* makeinfo/lang.c:
+	* makeinfo/lang.h:
+	* makeinfo/macro.c:
+	* makeinfo/macro.h:
+	* makeinfo/makeinfo.c:
+	* makeinfo/makeinfo.h:
+	* makeinfo/multi.c:
+	* makeinfo/node.c:
+	* makeinfo/node.h:
+	* makeinfo/sectioning.c:
+	* makeinfo/sectioning.h:
+	* makeinfo/toc.c:
+	* makeinfo/toc.h:
+	* makeinfo/xml.c:
+	* makeinfo/xml.h:
+	* makeinfo/xref.c:
+	* makeinfo/xref.h: protoized functions.
 
-Tue Apr 14 10:43:39 1998  Karl Berry  <karl@cs.umb.edu>
+2004-02-13  Alper Ersoy  <dirt@gtk.org>
 
-	1998-04-05 Karl Eichwalder <ke@suse.de>
-	* makeinfo/makeinfo.c (begin_insertion): No need to
- 	gettext; it's a keyword.  From carl-friedriech.spilcke-liss@ensae.fr.
- 	(cm_printindex): ditto.
+	* makeinfo/multi.h: new file.
 
-	* util/texi2dvi: Always remove the $tmp_dir's.
-	From: Dean Gaudet <dgaudet@arctic.org>
-	Date: Tue, 14 Apr 1998 00:55:36 -0700 (PDT)
+2004-02-13  Karl Berry  <karl@gnu.org>
 
-Mon Apr 13 18:02:57 1998  Karl Berry  <karl@cs.umb.edu>
+	* doc/texinfo.tex (\caption): make \long.
+	* doc/texinfo.txi (Nodes): mention that changing node names is bad.
+	(caption shortcaption, listoffloats): write these, finishing the
+	first cut at @float documentation.
 
-	* configure.in: Include
-	AM_SYS_POSIX_TERMIOS
-	AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL
-	to avoid window resizing being ignored under glibc2 systems,
-	e.g., Red Hat Linux 5.0.  Actually any system where the ioctls are not
-	defined in <termios.h>.
-	See also http://www-gnats.gnu.org:8080/cgi-bin/wwwgnats.pl/full/206.
-	* acconfig.h (GWINSZ_IN_SYS_IOCTL): New #undef for autoheader.
-	* info/termdep.h [GWINSZ_IN_SYSIOCTL]: #include <sys/ioctl> if
- 		this is defined.
-	From: Mark Jefferys <mjeffery@cse.ogi.edu>
-	Date: Thu, 9 Apr 1998 12:38:27 -0700 (PDT)
+2004-02-12  Alper Ersoy  <dirt@gtk.org>
 
-Fri Apr  3 01:18:22 1998  Philippe De Muyter  <phdm@macqel.be>
+	* makeinfo/cmds.c (cm_verb): end @verb only if delimiter is followed
+	by a closing brace.
 
-	* info/info.c (main): Use 0, not NULL, as ? : alternative.
+2004-02-12  Alper Ersoy  <dirt@gtk.org>
 
-Tue Mar  3 13:29:17 1998  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/lang.c (cm_accent_generic): warn if accented character is
+	whitespace.
 
-	* configure.in: Version 3.12.
+2004-02-12  Alper Ersoy  <dirt@gtk.org>
 
-	* po/de.po: New version.
+	* makeinfo/insertionc. (end_insertion): decrement current_indent
+	only if the output format is Info.
 
-	* 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.
+2004-02-12  Alper Ersoy  <dirt@gtk.org>
 
-Sun Mar  1 10:38:47 1998  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/insertion.c (end_insertion): adjusted caption styles for
+	label and type conditions.
+	(begin_insertion, end_insertion): indent first paragraphs inside
+	@float, even if first paragraph in a chapter.  Increment/decrement
+	current_indent.
 
-	* util/install-info.c: No need for i18n on version message.  From
- 		ke@suse.de.
+2004-02-12  Alper Ersoy  <dirt@gtk.org>
 
-Fri Feb 27 16:06:23 1998  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/tests/defxcond: look for `--' instead of `-'.
 
-	* configure.in: Run texconfig conf instead of confall.
+2004-02-12  Karl Berry  <karl@gnu.org>
 
-	* doc/Makefile.am (INSTALL_INFO): New variable.
-	(install-info-am): Use install-info from our distribution.
+	* makeinfo/float.c (cm_listoffloats): change warning wording.
 
-	* info/info.c (info_minor_version): Increment.
-	* (info_patch_level),
-	* info/info.h (info_patch_level): Remove.
+2004-02-11  Karl Berry  <karl@gnu.org>
 
-	* info/info.c (program_name): Move decl.
+	* doc/texinfo.tex (\dofloat): initialize caption macros here, not
+		globally.
+	(\Efloat): rewrite for more consistent caption
+	line, matching documentation.
+	(\appendtomacro): new macro.
+	(\currentparindent): this \newdimen was not used; removed.
+	* doc/texinfo.txi (float): continue documenting.
 
-	* util/install-info.c (ensure_dirfile_exists): Use commas and \t
-	 instead of an explicit tab, which make dist expands.
+	* makeinfo/files.c (register_delayed_write): change wording of msgs.
 
-	* doc/texinfo.txi: @prep.ai.mit.edu -> @gnu.org.
+2004-02-10  Karl Berry  <karl@gnu.org>
 
-	* info/info.c: Make help messages consistent with others.
+	* makeinfo/defun.c: --- (which gets reduced to --)
+	instead of -- (which gets reduced to -).
+	Report from Akim Demaille <akim@epita.fr>, 09 Feb 2004 18:06:29 +0100.
 
-	* util/install-info.c (print_help): Format consistently.
+2004-02-09  Karl Berry  <karl@gnu.org>
 
-	(readfile): Support gzipped files via libz.
-	From: Elliot Lee <sopwith@redhat.com>
-	Date: Mon, 1 Sep 1997 23:37:14 -0400 (EDT)
+	* doc/texinfo.tex (\pickupwholefraction): allow the fraction to be
+	an integer without a decimal point, like `1'.  Report from: Dumas
+	Patrice <dumas@centre-cired.fr>, 9 Feb 2004 16:46:30 +0100.
+	* makeinfo/multi.c (setup_multitable_parameters): compute width
+	and pass it, for clarity.
 
-Thu Feb 26 16:13:14 1998  Karl Berry  <karl@cs.umb.edu>
+2004-02-07  Alper Ersoy  <dirt@gtk.org>
 
-	* info/echo-area.c: Whoops, _ might not start with parens.
+	* makeinfo/insertion.c (cm_insert_copying): insert double newlines
+	instead of one in non XML outputs.
 
-	* configure.in: Check for libz.
-	Do not output emacs/Makefile.
+2004-02-07  Alper Ersoy  <dirt@gtk.org>
 
-	* Makefile.am (AUTOMAKE_OPTIONS): Set to 1.2f.
+	* makeinfo/cmds.c (cm_code): do not decrement in_fixed_width_font as
+	it gets decremented elsewhere.
 
-	* util/texi2dvi: Always remove temporary directories. (From Akim.)
-	Formatting changes.
+2004-02-07  Alper Ersoy  <dirt@gtk.org>
 
-Wed Feb 25 15:26:26 1998  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/makeinfo.c (next_nonwhitespace_character): also check
+	global input_text since filestack does not contain it.
 
-	* 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.
+2004-02-07  Alper Ersoy  <dirt@gtk.org>
 
-	Applied this:
-1997-08-09  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+	* makeinfo/makeinfo.c (next_nonwhitespace_character): go through the
+	whole filestack looking for the next character.
 
-	* 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.
+2004-02-06  Karl Berry  <karl@gnu.org>
 
-Tue Feb 24 17:33:44 1998  Karl Berry  <karl@cs.umb.edu>
+	* doc/texinfo.tex (\indexnofonts): define \bullet .. \result, so
+	they can be used in @?index commands.
+	Report from: Akim Demaille <akim@epita.fr>, 06 Feb 2004 13:34:15 +0100.
 
-	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.
+2004-02-05  Karl Berry  <karl@gnu.org>
 
-	* 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
+	* makeinfo/xref.c (add_xref_punctuation): if we insert anything,
+	make it a period.
+	(cm_xref): include command name in error message.
+	* doc/texinfo.txi (ref): mention generating a period, if needed.
+	Too many complaints when we made a warning for @ref not followed
+	by period or comma.
 
-	* 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)
+2004-02-05  Alper Ersoy  <dirt@gtk.org>
 
-Mon Feb 23 16:26:31 1998  Karl Berry  <karl@cs.umb.edu>
+	* info/info-utils.c (info_parse_node): look for ``(line '' instead of
+	skipping any non-digit characters. 
 
-	* 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
+2004-02-05  Alper Ersoy  <dirt@gtk.org>
 
-	* info/info.c: Improve help message.
+	* makeinfo/index.c (insert_index_output_line_no): made ``(line NNN)'' not
+	translatable for Info output.
 
-Sun Feb 22 17:38:32 1998  Karl Berry  <karl@cs.umb.edu>
+2004-02-03  Alper Ersoy  <dirt@gtk.org>
 
-	* Makefile.am (SUBDIRS): Remove emacs; we'll just distribute the
-		Elisp files with Emacs.
+	* makeinfo/makeinfo.c (flush_output): increment node_line_number too.
 
-	* doc/Makefile.am (info_TEXINFOS, texinfo): Rename manual to
-		texinfo.txi to avoid DOS filename clash with texinfo.tex.
+	* makeinfo/makeinfo.h: new variable node_line_number to hold the last
+	output line number the current node.
 
-	* info/tilde.c: Copy slightly updated alloca stuff from makeinfo.
+	* makeinfo/nodes.c (cm_node): reset node_line_number just before the
+	node start cookie.
 
-	* util/texindex.c (main): Declare as returning int to placate
- 		warnings.
+	* makeinfo/files.h: new node member in DELAYED_WRITE struct.
+	* makeinfo/files.c (register_delayed_write): save current node name if
+	there's one.
+	(handle_delayed_writes): adjust line numbers in indices only if the
+	output is plaintext, or the index entry appears in the changed node.
 
-	* 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
+	* makeinfo/index.c (index_add_arg, cm_printindex): use
+	node_line_number instead of output_line_number if the output is an
+	Info file.
 
-	* util/texindex.c,
-	* util/install-info.c,
-	* makeinfo/makeinfo.c,
-	* info/info.c: Change help address to @gnu.org.
+2004-02-03  Alper Ersoy  <dirt@gtk.org>
 
-	1998-01-22 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
-	* makeinfo/makeinfo.c (usage): Fix order of arguments to help
-		format string.
+	* info/info-utils.h: new line_number member in REFERENCE struct.
 
-	* makeinfo/makeinfo.c (cm_top): Error message wording.
+	* info/info-utils.c (info_parse_node): parse (line ...) strings
+	from menu items.
+	(info_references_internal): save parsed line number in the entry.
 
-	* 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_menu_of_ref_item): if selected entry has a line
+	number associated with it, jump to that line after updating window.
 
-	* 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
+2004-02-02  Alper Ersoy  <dirt@gtk.org>
 
-Sat Feb 21 17:41:26 1998  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/xml.c (add_xref_punctuation): new function that inserts
+	necessary punctuation after @ref and @pxref commands.
+	(cm_xref): call add_xref_punctuation when multiple parameters are
+	given, make use of next_nonwhitespace_character function in the END
+	case.
+	(cm_ref): do not call cm_xref in the END case.
 
-	* 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
+2004-02-02  Alper Ersoy  <dirt@gtk.org>
 
-	* 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
+	* makeinfo/makeinfo.c (next_nonwhitespace_character): new function.
 
-	* info/echo-area.c: Rewrite pluralization to be translatable.
-	From: Karl Eichwalder <ke@suse.de>
-	Date: 13 Sep 1997 16:20:02 +0200
+2004-02-02  Alper Ersoy  <dirt@gtk.org>
 
-	* 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
+	* makeinfo/cmds.c (cm_code): call xml_start_para instead of tweaking
+	in_fixed_width_font, and use entities rather than quotes.
 
-	* 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)
+2004-02-02  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* 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)
+	* makeinfo/cmds.c (cm_TeX, cm_LaTeX): Add docbook support.
+	(cm_code): Add opening and closing single quotes for @samp in the
+	Docbook output.
+	* makeinfo/xml.c (xml_begin_document): Add `tex' and `latex' entities.
+	* makeinfo/xref.c (cm_xref): Add `See' and `see' strings for docbook
+	and xml.
 
-	* 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)
+2004-01-31  Alper Ersoy  <dirt@gtk.org>
 
-	* 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 (main): fixed ``--option: makeinfo'' messages.
 
-	* makeinfo/makeinfo.c (find_and_load): Null-terminate the input text.
-	From: Kenneth Stailey <kstailey@disclosure.com>.
+2004-01-31  Alper Ersoy  <dirt@gtk.org>
 
-	* info/Makefile.am (INCLUDES): Add -I.. -I$(srcdir).
+	* makeinfo/cmds.c (cm_TeX, cm_LaTeX): really ignore the arguments as
+	the warning suggests.
 
-Fri Aug 22 16:24:59 1997  Karl Berry  <karl@cs.umb.edu>
+2004-01-31  Alper Ersoy  <dirt@gtk.org>
 
-	* doc/texinfo.texi: Adjust ISBN, edition number for print run.
+	* makeinfo/cmds.c (cm_TeX, cm_LaTeX): warn if there are any arguments.
 
-Mon Aug  4 16:12:42 1997  Karl Berry  <karl@cs.umb.edu>
+2004-01-31  Alper Ersoy  <dirt@gtk.org>
 
-	* 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>.
+	* makeinfo/files.c (pop_path_from_include_path): do not mock with
+	include_files_path address directly, as it confuses realloc.
 
-	* 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>.
+2004-01-31  Alper Ersoy  <dirt@gtk.org>
 
-Sat Aug  2 12:43:57 1997  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/makeinfo.c (main, usage): new --output-indent option.
 
-	* 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>.
+2004-01-31  Alper Ersoy  <dirt@gtk.org>
 
-Fri Aug  1 14:05:10 1997  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/xml.c (xml_add_char): break long lines in paragraphs
+	when the output format is Docbook.
 
-	* Makefile.am (EXTRA_DIST): Remove README-alpha.
-	From: "ir. Mark M._Kettenis" <kettenis@phys.uva.nl>.
+2004-01-31  Alper Ersoy  <dirt@gtk.org>
 
-1997-07-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
+	* makeinfo/files.c (prepend_to_include_path, append_to_include_path)
+	(pop_path_from_include_path): new functions to manipulate
+	include_files_path.
 
-	* configure.in: Use AC_CHECK_HEADERS, not AC_CHECK_HEADER.
+	* makeinfo/makeinfo.c (convert_from_file): prepend the loaded file's
+	path to include_files_path in order to make relative include files to
+	be found, then remove afterwards.
+	(main): make use of new functions for -I and -P options. 
 
-Thu Jul 31 11:57:46 1997  Karl Berry  <karl@cs.umb.edu>
+2004-01-30  Alper Ersoy  <dirt@gtk.org>
 
-	*  Version 3.11.
+	* util/texinfo.dtd: added exdent element.
 
-	* info/man.c (reap_children): Declare status as int, not unsigned,
-		since that's what POSIX says the arg to wait should be.
+2004-01-29  Alper Ersoy  <dirt@gtk.org>
 
-	* makeinfo/makeinfo.c (cm_uref, cm_email): Rewrite to do macro
- 		expansion in the arguments.
+	* makeinfo/makeinfo.c (convert_from_loaded_file): call
+	xml_begin_document after opening the output stream for writing.
 
-	* makeinfo/makeinfo.c (main): setlocale LC_MESSAGES and LC_TIME,
-		instead of LC_ALL.
-	From: Akim Demaille <demaille@inf.enst.fr>.
+	* makeinfo/files.c (register_delayed_write): use delayed_command
+	instead of command in messages as it may differ from the actual
+	command name.  Check the usability of current_output_filename.
 
-	* makeinfo/makeinfo.c (cm_today): Let the %d %s %d be translated,
-		so other languages can change the order of day/month/year.
-	From: Akim Demaille <demaille@inf.enst.fr>.
+2004-01-28  Karl Berry  <karl@gnu.org>
 
-	* info/infomap.c: Doc fix.
+	* doc/texinfo.txi (HTML Splitting): describe when two nodes are
+		written to one output file.
 
-	* lib/system.h [!O_RDONLY]: Prefer <fcntl.h> to <sys/fcntl.h>.
+	* doc/texinfo.tex (\TeX): \edef using original \TeX definition.
 
-	* configure.in (AC_CHECK_HEADERS): Check for fcntl.h.
+2004-01-28  Alper Ersoy  <dirt@gtk.org>
 
-	* doc/Makefile.am (install-data-local): Suggest tex/generic/dvips
-		for epsf.tex.
-	From: Tim Mooney <mooney@dogbert.cc.ndsu.NoDak.edu>.
+	* makeinfo/defun.c (process_defun_args, defun_internal):
+	* makeinfo/insertion.c (begin_insertion, end_insertion): execute XML
+	only blocks for Docbook also.
 
-	* configure.in (TEXMF): Move check to block with other program
- 		checks.
+	* makeinfo/xml.c: added Docbook elements for definition commands.
+	(xml_begin_def_term): for Docbook, generate an Info-like @defun line.
+	(xml_insert_element_with_attribute): do not indent DEFINITION and
+	DEFINITIONTERM when the output is Docbook.
 
-Wed Jul 30 11:20:37 1997  Karl Berry  <karl@cs.umb.edu>
+2004-01-25  Alper Ersoy  <dirt@gtk.org>
 
-	* makeinfo/makeinfo.c (defun_internal): Allow extra text after
-		most @def... commands, for tzname[2] in libc.texinfo.
+	* makeinfo/xml.c: changed majorheading and the like with bridgehead
+	for Docbook.
 
-	* info/info.c: Include indices.h.
-	* configure.in (AC_CHECK_HEADERS): Test for sys/wait.h, info/man.c
- 		uses it.
-	From: Erick Branderhorst <Erick.Branderhorst@asml.nl>.
+	* makeinfo/sectioning.c (sectioning_underscore): do not start sections
+	with @majorheading and the like, only insert title.
 
-Tue Jul 29 15:55:19 1997  Karl Berry  <karl@cs.umb.edu>
+2004-01-25  Alper Ersoy  <dirt@gtk.org>
 
-	* configure.in: Version 3.9j.
+	* makeinfo/xml.c:
+	* makeinfo/xml.h: new element EXDENT.
 
-	* info/terminal.c (output_character_function): Return int (the
- 		arg), not void.
+	* makeinfo/cmds.c (cm_comment): save the paragraph state.
+	(cm_exdent): use EXDENT element for XML, LINEANNOTATION for Docbook.
 
-	* info/infomap.c: Don't define term_kP as 'v', since that's undefined.
-	From: Tom Hageman <tom@basil.icce.rug.nl>.
+	* makeinfo/html.c (html_output_head):
+	* makeinfo/xml.c (xml_begin_document): erase output_paragraph.
 
-	* makeinfo/makeinfo.c: Parameterize some messages to avoid
- 		duplicate translations.
+	* makeinfo/insertion.c (begin_insertion): canonize whitespace around
+	copying text.
+	(cm_insert_copying): comment fixes.  Do not append newline if the
+	output is Docbook.
 
-	* info/terminal.c: Only try to declare ospeed, PC, tputs, etc. if
-		we don't have <ncurses.h/termcap.h> or <termcap.h>.
+	* makeinfo/makeinfo.c (close_paragraph): return if Docbook too.
 
-	* makeinfo/makeinfo.c (cm_email): New function, like cm_uref.
+	* makeinfo/sectioning.c (sectioning_underscore): removed newline from
+	the end of titles.
 
-Sun Jul 27 17:09:20 1997  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/lang.c (cm_documentencoding): insert encoding attribute 
+	into XML and Docbook prologs when handling delayed writes.
 
-	* configure.in: Only check for <ncurses/termcap.h> if we're using
-		-lncurses.
-	From: Bo Johansson <bo.johansson@mbox2.swipnet.se>.
+	* makeinfo/xml.c (xml_begin_document): register a delayed write for
+	@documentencoding when writing the prolog.
+	(xml_end_para): removed docbook checks.
+	(xml_insert_element_with_attribute): skip indentation if
+	xml_keep_space is true, indent after table element.  When the output
+	is Docbook, do not insert xml:space attribute, and do not remove from
+	the end of group element and keep_space blocks.
+	(xml_add_char): join lines in a paragraph for Docbook too.
 
-	* info/dir.c (new_dir_file_p): Avoid automatic struct
-		initialization, SunOS 4 etc. cc can't handle it.
-	From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>.
+2004-01-24  Alper Ersoy  <dirt@gtk.org>
 
-Sat Jul 26 15:08:13 1997  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/multi.c (out_char): simple use add_char for XML and Docbook
+	outputs too.
 
-	* Version 3.9i.
+	* makeinfo/makeinfo.c (close_paragraph): just return when the output
+	format is XML.
 
-	* configure.in: Check for termcap.h and ncurses/termcap.h.
-	From: bo.johansson@mbox2.swipnet.se.
+	* makeinfo/makeinfo.h: new variable xml_indendation_increment.
 
-Fri Jul 25 14:09:05 1997  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/cmds.c (cm_comment): insert a newline before the comment,
+	if there is not already one.
+	(cm_noindent_cmd): skip whitespace after the command.
 
-	* doc/texinfo.texi: Document new second optional arg to email.
+	* makeinfo/xml.c:
+	* makeinfo/xml.h: new element DETAILMENU.
 
-	* info/infodoc.c: Document CTRL-x 0 as the way to get out of help.
+	* makeinfo/xml.c: menuentry and menucomment should not contain para.
+	(xml_indent, xml_indent_end_para): use xml_indentation_increment
+	value, and indent only if it is a positive number.
+	(xml_start_para): apply indentation for XML output too.
+	(xml_end_para): add newline if xml_indentation_increment is positive.
+	(xml_insert_element_with_attribute): major indentation fixes.
+	(xml_start_menu_entry): skip whitespace at the start of menu comments.
+	(xml_add_char): fixed paragraph detection in menus, and added a check
+	to detect multiple whitespaces after newline in menu comments.  Do not
+	return when inside multitable to avoid concatenation of two lines
+	without a space char in between.
 
-	* info/dir.c (maybe_build_dir_node): Really check for the same dir
-		file twice, not just by name.
-	(new_dir_file_p): New function.
+	* makeinfo/insertion.c (cm_insert_copying, cm_lisp, cm_smalllisp)
+	(cm_format, cm_smallformat, cm_display, cm_smalldisplay, cm_example)
+	(cm_smallexample): do not insert newline when the output is XML.
+	(end_insertion): ditto for the above mentioned block commands and
+	@group.  Do not increment in_fixed_font for XML output.
+	(begin_insertion, end_insertion): enclose @detailmenu in a detailmenu
+	element.
 
-	* util/install-info.c: Tell them about --help in doc strings.
+	* util/texinfo.dtd: added detailmenu, and fixed menucomment and
+	tableitem definitions.
 
-Thu Jul 24 14:25:44 1997  Karl Berry  <karl@cs.umb.edu>
+2004-01-23  Alper Ersoy  <dirt@gtk.org>
 
-	* util/texindex.c (memory_error): Move to avoid incorrect implicit
- 		decl.
+	* util/Makefile.am: substituted catalog in EXTRA_DIST with catalog.in,
+	and added catalog to CLEANFILES.
 
-	* makeinfo/makeinfo.c,
-	* makeinfo/multi.c,
-	* util/install-info.c,
-	* util/texindex.c,
-	* info/tilde.c,
-	* info/man.c,
-	* info/gc.c,
-	* info/session.c (info_replace_key_to_typeahead): Remove unused
-         function,
-	* info/nodemenu.c,
-	* info/man.c,
-	* info/m-x.c,
-	* info/footnotes.c
-	* info/info.c
-	* info/indices.c,
-	* info/filesys.c: Parenthesize to avoid -Wall warnings
-	remove unused variables,
-	make return types explicit,
-	printf type corrections.
+2004-01-23  Alper Ersoy  <dirt@gtk.org>
 
-	* lib/system.h: <ctype.h>: Include this.
-	* util/texindex.c,
-	* makeinfo/makeinfo.c,
-	* info/echo-area.c,
-	* info/display.c: ctype.h: Included in system.h now.
+	* makeinfo/files.h: new input_filename member in delayed_write struct.
 
-	* info/echo-area.c: Parenthesize to avoid -Wall warnings.
-        (ctype.h): #include for isprint.
-	(echo_area_stack_depth): Remove unused function.
-	* info/display.c: Parenthesize to avoid -Wall warnings.
-        (ctype.h): #include for isprint.
-	* info/dir.c: Parenthesize to avoid -Wall warnings.
-	(build_dir_node_internal): Remove declaration of nonexistent function.
-	From: Erick Branderhorst <Erick.Branderhorst@asml.nl>.
+	* makeinfo/files.c (register_delayed_write): added input_filename to
+	saved variables, and adjusted line_number saving.
+	(handle_delayed_writes): set input_filename and line_number for
+	correct warning and error messages.
 
-	* configure.in (TEXMF): Call texconfig to discover the default value,
-	for the sake of the warning in doc/Makefile.
-	From: Tim Mooney <mooney@dogbert.cc.ndsu.NoDak.edu>.
+2004-01-23  Alper Ersoy  <dirt@gtk.org>
 
-	* doc/Makefile.am (TEXMF): New variable.
-        (install-data-local): Use it in warning.
-	From: Tim Mooney <mooney@dogbert.cc.ndsu.NoDak.edu>.
+	* makeinfo/float.c (cm_listoffloats):
+	* makeinfo/index.c (cm_printindex): decrement line_number only if
+	not handling delayed writes.
 
-	* info/session.c (initialize_info_session): Only call
-	terminal_prep_terminal if clear_screen is true.  Otherwise, failed
-        --index-searches prep the terminal but do not unprep it.
-	From: William Edward Webber <wew@yallara.cs.rmit.EDU.AU>.
+	* makeinfo/float.c (float_type_exists): check if float has a label.
 
-	* info/nodemenu.c: Doc fix.
+2004-01-23  Alper Ersoy  <dirt@gtk.org>
 
-Mon Jul 21 17:11:09 1997  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/makeinfo.c (main): updated copyright year in --version text.
 
-	* doc/texinfo.texi: Comment out @smallbook and @set smallbook so
- 		people at other sites can print it the way they want.
-	From: Thomas Walter <walter@pctc.chemie.uni-erlangen.de>
+2004-01-23  Alper Ersoy  <dirt@gtk.org>
 
-Sun Jul 20 07:52:25 1997  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/tests/Makefile.am: commented top2.texi to fix distcheck.
 
-	* configure.in: 3.9h.
+2004-01-23  Alper Ersoy  <dirt@gtk.org>
 
-	* doc/Makefile.am (install-info-am, distclean-aminfo): New targets
-		to avoid assuming info files are in srcdir.
+	* makeinfo/xml.c (xml_begin_document): use PUBLIC id for TexinfoML
+	instead of SYSTEM.
 
-	* lib/system.h (xstrdup): Returns char *, not void *.
+2004-01-23  Alper Ersoy  <dirt@gtk.org>
 
-	* doc/Makefile.am (.texi.info),
-	* doc/Makefile.am (texinfo): Don't run in $(srcdir).
+	* makeinfo/Makefile.am: removed texinfo.dtd and texinfo.xsl and ...
 
-	* util/install-info.c (main): Remove unnecessary decl of strrchr.
+	* util/Makefile.am: added here.
 
-	* info/tilde.c: Include info.h (for config.h) before alloca stuff.
+2004-01-23  Alper Ersoy  <dirt@gtk.org>
 
-	* makeinfo/makeinfo.c (validate_file): Rename `valid' to `valid_p'
-		to avoid conflict with SunOS 4 header files.
-	From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>.
+	* utils/catalog.in: catalog file for texinfo.dtd.
 
-	* info/session.c (initialize_info_session): Call
-          terminal_prep_terminal here (before calling terminal_clear_screen).
-	(info_session): Instead of here.
-	From: William Edward Webber <wew@yallara.cs.rmit.EDU.AU>.
+2004-01-23  Alper Ersoy  <dirt@gtk.org>
 
-	* Makefile.am (EXTRA_DIST): Add README-alpha.
+	* makeinfo/texinfo.dtd:
+	* makeinfo/texinfo.xsl: moved to ...
 
-Sat Jul 19 13:50:27 1997  Karl Berry  <karl@cs.umb.edu>
+	* utils/texinfo.dtd:
+	* utils/texinfo.xsl: here.
 
-	* info/terminal.c: Use `keypad transmit' sequence if it's defined:
-	(term_keypad_on, term_keypad_off): New statics.
-	(terminal_begin_using_terminal): If term_keypad_on, send it.
-	(terminal_end_using_terminal): If term_keypad_off, send it.
-	(terminal_initialize_terminal): Look up ks and ke termcap strings.
-	From: William Edward Webber <wew@yallara.cs.rmit.EDU.AU>.
+2004-01-23  Alper Ersoy  <dirt@gtk.org>
 
-	* info/infomap.c (initialize_info_keymaps): Initialize hardwired
- 		cases for arrow keys a la readline.  Found by John Eaton,
- 		jwe@bevo.che.wisc.edu.
+	* makeinfo/texinfo.dtd: added ordm and ordf entities and dmn element.
+	updated indexterm location in tables.
 
-	* makeinfo/makeinfo.c (output_pending_notes): Remove footnote
-        macro expansion code I #if 0'd out some time ago.  And doc fixes.
+2004-01-22  Karl Berry  <karl@gnu.org>
 
-	* Applied this patch:
+	* doc/texinfo.tex (\dofloat): handle empty float type and empty
+	float label separately, matching makeinfo behavior.
+	* doc/texinfo.txi (Floats): new section, not yet fully written.
+	(Special Displays): new chapter to hold it.
+	(Footnotes, Images): move these sections to the new chapter.
+	(@@-Command Summary): list new commands.
+	* NEWS: mention new commands here too.
 
-Sat Jul 19 16:29:01 1997  Karl Eichwalder  <ke@suse.de>
+2004-01-21  Alper Ersoy  <dirt@gtk.org>
 
-	* info/info.c (main): setlocale, bindtextdomain, and textdomain.
+	* makeinfo/xml.c (xml_begin_index): move data to a temporary location
+	for delayed use and insert back when handling delayed writes.
 
-Fri Jul 18 10:02:18 1997  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/index.c (cm_printindex): call xml_begin_index when not
+	handling delayed writes too.
 
-	* doc/Makefile.am (install-data-local),
-	* emacs/Makefile.am (install-data-local): Give subdir in warning.
+2004-01-19  Karl Berry  <karl@gnu.org>
 
-	* configure.in: Version 3.9f.
+	* doc/texinfo.tex: doc fix.
 
-	* doc/texinfo.texi: Correct \^ to @^.
-	From Andreas S.
+2004-01-18  Karl Berry  <karl@gnu.org>
 
-	* Merged these changes:
+	* doc/texinfo.tex (\commondummies): dummify @tie and remaining
+	@<char> commands.
+	(\tocindent): reduce to 15pt to match \defaultparindent.
+	(\setref): use XR as control sequence prefix
+	instead of just X; seems nicer.  Change calls.
+	
+	Finish implementing @listoffloats:
+	(\xrdef): keep lists of each float type.
+	(\dofloat): save the floattype in the aux file.
+	(\Efloat): write the lof text to the aux file.
+	(\iffloat, \doiffloat, \listoffloats,
+	\listoffloatsdo, \listoffloatsentry): new macros.
+	* bootstrap: autoheader should come after aclocal, I think.
 
-1997-07-17  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+2004-01-17  Karl Berry  <karl@gnu.org>
 
-	* info/display.c (display_cursor_at_point): Flush ouput.
+	* doc/texinfo.tex (\doitemize): rename from \itemizey.
+	(\itemizeitem): do not set \parskip=0 if the last
+	thing was a \nobreak (e.g., from \sectionheading).
+	Report from: Jesper Harder <harder@ifa.au.dk>, 
+	17 Jan 2004 22:03:51 +0100.
 
-1997-07-17  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+	* doc/texinfo.txi (email): no angle brackets in TeX output.
+	Report from: Jesper Harder <harder@ifa.au.dk>,
+	17 Jan 2004 21:03:21 +0100.
 
-	* info/session.c (remember_window_and_node): Don't crash when the
-	current window has no current node.
+2004-01-17  Alper Ersoy  <dirt@gtk.org>
 
-1997-07-17  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+	* makeinfo/float.c (cm_listoffloats): Prefixed captions with
+	float_type.  For HTML, used an <ul> block.  
 
-	* util/texindex.c (usage): Translate the doc strings.
-	* makeinfo/makeinfo.c (cm_today): Translate the month names.
-	* info/variables.c (describe_variable): Translate the doc strings.
-	* info/nodes.h: Don't translate the strings defining the info format.
+2004-01-17  Alper Ersoy  <dirt@gtk.org>
 
-1997-07-17  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+	* info/info.c (main, info_short_help): new option -w, --where,
+	--location that prints the physical location of Info file.
 
-	* makeinfo/makeinfo.c (get_item_function): Remove superfluous call
-	to canon_white after get_rest_of_line.
-	(cm_end): Likewise.
-	(handle_variable): Likewise.
-	(cm_item): Likewise.
-	(cm_unmacro): Likewise.
+2004-01-17  Alper Ersoy  <dirt@gtk.org>
 
-1997-07-17  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+	* makeinfo/defun.c (defun_internal):
+	* makeinfo/insertion.c (end_insertion): enclose paragraphs in @def
+	blocks in a blockquote element for indentation in the HTML output.
 
-	* info/nodemenu.c (list_visited_nodes): Don't clear the internal
-	flag, this and other functions depend on it.  Don't insist on
-	displaying the menu below the current window.
+2004-01-17  Alper Ersoy  <dirt@gtk.org>
 
-1997-07-17  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+	* makeinfo/html.c (insert_html_tag_with_attribute): new function.
+	(insert_html_tag): only call insert_html_tag_with_attribute with
+	NULL attribute string and return.
+	(push_tag, pop_tag): keep the element attributes in stack too.
+	(html_output_head): fixed span.roman in the default CSS.
 
-	* makeinfo/makeinfo.c (cm_uref): Fix memory leaks.
-	(cm_inforef): Likewise.  Handle empty cross reference name.
+	* makeinfo/html.h: new attribs member in hstack struct.
 
-1997-07-17  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+	* makeinfo/cmds.c (cm_dmn, cm_code, cm_sc, cm_r): use
+	insert_html_tag_with_attribute for setting element class.
 
-	* info/echo-area.c (ea_possible_completions): Check that the
-	current window can actually be split.
+2004-01-15  Karl Berry  <karl@gnu.org>
 
-Thu Jul 17 17:19:34 1997  Karl Berry  <karl@cs.umb.edu>
+	* texinfo.tex (\readauxfile): \ must have catcode other to
+	handle \ in node/section names.
 
+2004-01-16  Alper Ersoy  <dirt@gtk.org>
 
-	* emacs/Makefile.am (*clean-lisp): Define, as Automake didn't.
-	From: Kenneth Stailey <kstailey@disclosure.com>.
+	* makeinfo/toc.c (cm_contents): fixed Docbook element stack underflow.
 
-	* doc/Makefile.am: Do not distribute info.1.
-	* makeinfo/macros: Do not distribute this directory, it's merged
-		into the main documentation.
-	* doc/makeinfo.texi: Don't distribute this either, it's in the
-		main manual.
+	* makeinfo/xml.c (xml_insert_indexterm): set xml_dont_touch_items_defs
+	for only XML output.
 
-	* util/install-info.c: Use \n\ for multiline string constant.
-  		From: Tim Mooney <mooney@dogbert.cc.ndsu.NoDak.edu>.
+2004-01-14  Simon Josefsson <jas@extundo.com>
 
-Wed Jul 16 15:29:50 1997  Karl Berry  <karl@cs.umb.edu>
+	* util/gendocs.sh: new option --html.
 
-	* doc/texinfo.texi: @set must be after @setfilename, I guess.
-	Noted by Erick Branderhorst.
+2004-01-14  Alper Ersoy  <dirt@gtk.org>
 
-	* Applied this change:
+	* makeinfo/html.c (rollback_empty_tag): rewrote to also identify empty
+	elements with attributes.
+	(insert_html_tag): increment and decrement in_html_elt.
 
-Tue Nov 12 22:20:22 1996  John Eaton  <jwe@bevo.che.wisc.edu>
+	* makeinfo/index.c (index_add_arg): do not call flush_output for xml
+	and html outputs as they do not need an accurate output line number
+	tracking, and flush_output makes rollback_empty tag useless.
 
-	* makeinfo.c (INDEX_ALIST): Use two indices, read_index and
-	write_index, instead of just one.
-	(find_index_offset): If a match is found, return index to the
-	current INDEX_ALIST struct, not the index pointing to the list of
-	index entries.
-	(translate_index): Return read_index from the matching
-	INDEX_ALIST.
-	(undefindex): Delete the list of index elements pointed to by
-	read_index from the INDEX_ALIST that matches name.
-	(defindex): Initialize read_index and write_index.
-	(index_add_arg): Add entries to the list pointed to by write_index
-	from the INDEX_ALIST matching name.
-	(index_append): Delete unused function.
-	(cm_synindex): Don't merge indcies, just make the write_index for
-	redirectee the same as the write_index for redirector.
+2004-01-13  Alper Ersoy  <dirt@gtk.org>
 
-Tue Jul 15 09:32:04 1997  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/cmds.c (cm_code): increment and decrement in_html_elt when
+	inserting the class attribute to avoid space char being replaced with
+	entities.
+	(cm_r, cm_dmn): use insert_string instead of add_word for the class
+	attribute.
 
-	* doc/texinfo.texi: Bump edition number for 2.24.
+2004-01-13  Alper Ersoy  <dirt@gtk.org>
 
-	* util/Makefile.am (localedir): Define.
+	* makeinfo/cmds.c (cm_r): changed add_word_args with insert_html_tag,
+	and changed inline style with a class attribute.
 
-	* info/window.h: Rename __window__ to window_struct.
+	* makeinfo/html.c (insert_html_tag): when the current element is the
+	same with the last in the stack, do not return if it's span.
+	(html_output_head): new CSS class roman (for @r.)
 
-	* info/window.h,
-	* info/variables.h,
-	* info/search.h,
-	* info/man.h,
-	* info/info-utils.h,
-	* info/gc.h,
-	* info/footnotes.h,
-	* info/filesys.h,
-	* info/echo-area.h,
-	* info/display.h: Avoid leading _ in #define for #include protection.
+2004-01-13  Alper Ersoy  <dirt@gtk.org>
 
-	* makeinfo/makeinfo.c: Version 1.68.
-	* info/info.c: Version 2.17.
+	* makeinfo/node.c (cm_node): reset output_position when closing the
+	current HTML output file.
 
-	* Most all files: Untabify.
+	* makeinfo/files.c (handle_delayed_writes): fixed position updating of
+	the next writes.
 
-	* doc/Makefile.am (texinfo): Add explicit target.
+2004-01-13  Karl Berry  <karl@gnu.org>
 
-	* emacs/Makefile.am (noinst_LISP): Remove the obsolete
-		detexinfo.el (makeinfo --no-headers is better) and
-	        texnfo-tex.el (now handled by TeX modes in general).
+	* makeinfo/files.c (register_delayed_write): reword warning, and
+	only warn if writing to stdout, not /dev/null.
 
-Mon Jul 14 15:21:03 1997  Karl Berry  <karl@cs.umb.edu>
+2004-01-13  Alper Ersoy  <dirt@gtk.org>
 
-	* util/texi2dvi: Update RCS file from 3.9 distribution.
+	* makeinfo/node.c (glean_node_from_menu): removed unnecessary
+	line_number incrementation.
 
-	* util/Makefile.am (EXTRA_DIST): Add update-info, from
- 		rhawes@dmapub.dma.org
+2004-01-13  Alper Ersoy  <dirt@gtk.org>
 
-Sun Jul 13 17:05:03 1997  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/float.c (cm_listoffloats): 
+	* makeinfo/index.c (cm_printindex): decrement line_number just after
+	get_rest_of_line to make messages refer to the correct line,
+	re-increment it just before returning.
 
-	* info/signals.c: Use RETSIGTYPE instead of hardwiring void.
-	From: "Jeffery L. JT Vogt" <lfm@atw.earthreach.com>.
+2004-01-13  Alper Ersoy  <dirt@gtk.org>
 
-	* info/session.c (info_history_node): Rewrite as
-  	      info_kill_node (current_node).
-        (kill_node, read_nodename_to_kill): New functions from info_kill_node.
-	(info_kill_node): Now this just calls them.
+	* makeinfo/node.c (cm_node): fixed prev, next, up nodes defaulting
+	code to not make use of @menus after @bye.
 
-Fri Jul 11 11:56:58 1997  Karl Berry  <karl@cs.umb.edu>
+2004-01-13  Alper Ersoy  <dirt@gtk.org>
 
-	* doc/texinfo.texi: Fix `Conditionals' xref.
+	* makeinfo/index.c (cm_printindex): handle @printindex immediately
+	if the output format is Docbook, rather than waiting for delayed
+	writes.
 
-Thu Jul 10 17:58:12 1997  Karl Berry  <karl@cs.umb.edu>
+2004-01-13  Alper Ersoy  <dirt@gtk.org>
 
-	* doc/info.texi: Don't say SPC clears ? screen.
+	* makeinfo/float.c (cm_listoffloats): insert xml elements also for
+	docbook.
 
-Sun Jul  6 16:26:41 1997  Karl Berry  <karl@cs.umb.edu>
+2004-01-13  Alper Ersoy  <dirt@gtk.org>
 
-	* doc/info-stnd.texi: Document --index-search.
+	* makeinfo/float.c (float_type_exists): new function that checks if a
+	specific type of @float is previously used.
+	(cm_listoffloats): warn if requested float_type is unknown.
 
-	* info/tilde.c,
-	* info/session.c: Remove redundant getenv decl.
+2004-01-12  Alper Ersoy  <dirt@gtk.org>
 
-	* Installed following change:
-Tue Nov 12 14:44:00 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
+	* makeinfo/files.c (register_delayed_write): warn if delayed write is
+	requested when the output file is not seekable.
 
-	* info/info.c (main): Handle new option, --index-search STRING.
-	(index_search_p, index_search_string): New static variables, used
-	to handle --index-search option.
+2004-01-10  Karl Berry  <karl@gnu.org>
 
-	* info/session.c (initialize_info_session): New arg,
-	clear_screen.  Change all callers.
+	* doc/texinfo.txi (Using Include Files): mention the possibility
+	of no nodes in an include file.  From Bob.
 
-	* info/indices.h (do_info_index_search, index_intry_exists):
-	Provide declarations here.
+2004-01-10  Simon Josefsson  <jas@extundo.com>
 
-	* info/indices.c (do_info_index_search): New function, extracted
-	from info_index_search.
-	(info_index_search): Simply call do_info_index_search() with
-	search_string set to NULL.
-	(index_entry_exists): New function.
+	* makeinfo/node.c (cm_node): Only print ",\n" at correct places.
 
-Sat Jul  5 17:17:14 1997  Karl Berry  <karl@cs.umb.edu>
+2004-01-10  Alper Ersoy  <dirt@gtk.org>
 
-	* doc/texinfo.texi: Document @kbdinputstyle.
+	* makeinfo/html.c (html_output_head): use insert_string instead of
+	add_word for css inclusion to avoid reformatting.
 
-	* makeinfo/makeinfo.c (kbdinputstyle): New command.
-	(cm_no_op_line_arg): New function.
+2004-01-09  Alper Ersoy  <dirt@gtk.org>
 
-	* info/termdep.h (HAVE_TERMIOS_H) [NeXT]: #undef.
-	From: Gregor Hoffleit <flight@mathi.uni-heidelberg.de> et al.
+	* makeinfo/xml.c:
+	* makeinfo/xml.h: new variable xml_dont_touch_items_defs.
 
-Fri Jul  4 14:18:08 1997  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/cmds.c (cm_comment, cm_sp):
+	* makeinfo/xml.c (xml_insert_indexterm): set and unset
+	xml_dont_touch_items_defs.
 
-	* info/Makefile.am (EXTRA_DIST),
-	* util/Makefile.am (EXTRA_DIST),
-	* makeinfo/Makefile.am (EXTRA_DIST),
-	* lib/Makefile.am (EXTRA_DIST): Include README.
+	* makeinfo/xml.c (xml_insert_element_with_attribute)
+	(xml_add_char): do not do anything about @deffnx and @itemx commands
+	if xml_dont_touch_items_defs is non-zero.
 
-	* doc/texinfo.texi (makeinfo options): Document --paragraph-indent
- 		values more completely.
-	* makeinfo/makeinfo.c (set_paragraph_indent): Allow translated
- 		asis or none, improve doc.
- 	From ke.
+2004-01-09  Alper Ersoy  <dirt@gtk.org>
 
-	* doc/Makefile.am (dist-info): New empty target so that we do not
- 		distribute info files.
- 	From Erick Branderhorst.
+	* info/Makefile.am: define INFODIR2 that points to $datadir/info.
 
-	* doc/texinfo.texi (Invoking install-info): Document that the dir
-		file is created now if need be.
-	* Makefile.am (EXTRA_DIST): No longer need dir.
-	* util/install-info.c (ensure_dirfile_exists): New routine.
-	(main): Call it before trying to open dirfile for reading.
+	* info/info.c (main): prepend INFODIR2 to infopath, if defined and if
+	not the same with INFODIR.
 
-	* doc/texinfo.texi: Document install-info --delete a little better.
-	* util/install-info.c: Set something_deleted when we delete a
- 		normal line.
-	Bug from: Denis Kosygin <dkosygin@math.Princeton.EDU>.
+2004-01-08  Alper Ersoy  <dirt@gtk.org>
 
-	* util/install-info.c: If no info dir entry, give warning and exit 0.
+	* makeinfo/index.c (cm_printindex): adapted to delayed writing,
+	decreased the space between the columns of plaintext output.
 
-Wed Jul  2 06:35:17 1997  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/float.c (cm_listoffloats): disabled menu header checks,
+	synced column_width with @printindex.
 
-	* configure.in (ALL_LINGUAS): Add fr.
+2004-01-08  Alper Ersoy  <dirt@gtk.org>
 
-	* makeinfo/makeinfo.h (insertion_type, insertion_type_names): Add
-		ifnot... entries. Alphabetize.
+	* makeinfo/index.c: moved INDEX_ELT and INDEX_ALIST typedefs to ...
 
-Tue Jul  1 17:21:54 1997  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/index.h: here
 
-	* makeinfo/makeinfo.c (sort_index): Set defining_line and
-		input_filename so errors in index entries are reported at
-		the correct location.  From rms.
+	* makeinfo/files.h:
+	* makeinfo/files.c (register_delayed_write): save line number in input
+	document that the calling command is in.
+	(handle_delayed_writes): adjust byte offsets in tag table and output
+	line numbers in all of the indices, 
 
-	* makeinfo/makeinfo.c (cm_ifnothtml, etc.): Routines for new
- 		commands.
+	* makeinfo/makeinfo.c (convert_from_loaded_file): when finished, write
+	the tag table after handling delayed writes.
 
-Sun Jun 29 09:44:01 1997  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/node.c (write_tag_table): accept a filename argument, and
+	open the file in append mode.
 
-	* doc/texinfo.texi: Document new @ifnot... commands, etc.
-	* doc/texinfo.texi: Document @image, etc.
+2004-01-08  Alper Ersoy  <dirt@gtk.org>
 
-Thu Jun 26 17:57:37 1997  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/float.c (add_new_float):
+	* makeinfo/float.h: save the line number @float command used.
 
-	* makeinfo/makeinfo.c (cm_image): New routine for new command @image.
-	(cm_end): Move to better place, doesn't need its own page.
-	Doc fixes.
+2004-01-08  Alper Ersoy  <dirt@gtk.org>
 
-Mon Jun 23 16:54:03 1997  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/toc.c (cm_contents): moved the call to html_output_head
+	to ...
 
-	* Makefile.am (SUBDIRS): Do intl first.
+	* makeinfo/files.c (register_delayed_write): here.
 
-	* doc/Makefile.am (EXTRA_DIST): Include epsf.tex.
-	(install-data-local): Suggest possible installation directory.
-	* epsf.tex: New file.
+2004-01-08  Alper Ersoy  <dirt@gtk.org>
 
-Wed Jun 18 17:51:52 1997  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/float.c (cm_listoffloats): adapted for delayed writing,
+	and slightly fixed formatting with no_headers.
 
-	* doc/texinfo.texi: Document texinfo.cnf.
+2004-01-08  Alper Ersoy  <dirt@gtk.org>
 
-Sun Jun 15 14:37:58 1997  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/cmds.c: use cm_contents for @shortcontents
+	and @summarycontents too.
 
-	* doc/texinfo.texi (Command List): Various commands missing or
-		erroneous.
-	From: Karl_Heinz_Marbaise@p69.ks.fido.de.
+	* makeinfo/files.c (register_delayed_write)
+	(handle_delayed_writes): new functions.
 
-	* makeinfo/makeinfo.c: Oops, failed to break out of loop.
+	* makeinfo/files.h: new delayed_write struct and
+	handling_delayed_writes variable.
 
-	* util/texindex.c: Use <getopt.h> not "getopt.h".
+	* makeinfo/makeinfo.c (insert): use whitespace macro instead of
+	testing characters manually.
+	(convert_from_loaded_file): call handle_delayed_writes when finished.
+	
+	* makeinfo/toc.c (contents_update_html, contents_update_info)
+	(shortcontents_update_html, shortcontents_update_info): changed file
+	read/writes with insert and insert_string.
+	(rewrite_top, contents_update, shortcontents_update)
+	(toc_update, cm_shortcontents): removed functions.
+	(cm_contents): for HTML and Info, only call register_delayed_write if
+	handling_delayed_writes is not true.  Call contents_update_html and
+	other variants according to output format and command name.
 
-	* All source files: Merge gettext changes from Karl E.;
-	his ChangeLog entries below.
+	* makeinfo/toc.h: removed obsolete variables and functions.
 
-Sat Jun 14 17:04:28 1997  Karl Berry  <karl@cs.umb.edu>
+2004-01-08  Alper Ersoy  <dirt@gtk.org>
 
-	* Makefile.am,
-	* makeinfo/Makefile.am: Doc fix.
-	* util/Makefile.am (EXTRA_DIST): Add texi2dvi.  From Karl E.
+	* makeinfo/index.c (index_add_arg): keep line number of the index
+	entry where it appears in the output.
+	(insert_index_output_line_no): new function.
+	(cm_printindex): call insert_index_output_line_no for info and
+	plaintext outputs.
 
-Fri Jun 13 17:39:34 1997  Karl Berry  <karl@cs.umb.edu>
+2004-01-08  Alper Ersoy  <dirt@gtk.org>
 
-	* makeinfo/makeinfo.c [WIN32]: Handle read bogosity and c:\
-		absolute paths.
-	From: Eric Hanchrow <erich@MICROSOFT.com>.
+	* makeinfo/makeinfo.h: new variable output_line_number.
 
-	* configure.in (AC_CHECK_HEADERS): Check for pwd.h.
-	* info/tilde.c (pwd.h): Move #include to system.h.
+	* makeinfo/makeinfo.c (flush_output): keep number of lines in the
+	flushed data, in output_line_number variable.
 
-	* makeinfo/makeinfo.c (main): New option -P to prepend to search path.
-	From: Kenneth Stailey <kstailey@cvs.openbsd.org>.
+2004-01-07  Alper Ersoy  <dirt@gtk.org>
 
-	* doc/texinfo.texi (Invoking makeinfo),
-	* doc/makeinfo.texi: Mention -P.
+	* makeinfo/float.c (cm_listoffloats): when there is no caption, do not
+	insert space between the float number and the colon.
 
-Thu Jun 12 16:25:40 1997  Karl Berry  <karl@cs.umb.edu>
+2004-01-07  Alper Ersoy  <dirt@gtk.org>
 
-	* info/signals.h (SIGCHLD): #define as SIGCLD if undefined, for sysV68.
-	From: "Philippe De Muyter" <phdm%labauto1@ulb.ac.be>.
+	* makeinfo/float.c (cm_listoffloats): use shorttitle only if it's
+	defined.
 
-	* util/install-info.c (O_RDONLY): Remove this stuff, it's in system.h.
- 	(main): Handle existing entry in dir file having .info extension.
-	From: "Bradley C. Kuszmaul" <bradley@GRANITE.SYSTEMSX.CS.YALE.EDU>.
+2004-01-07  Alper Ersoy  <dirt@gtk.org>
 
-	* makeinfo/makeinfo.c (get_char_len): Don't count 8-bit characters
-		as two chars in the output.
-	From: Sung-Hyun Nam <namsh@amuna.rms.lgic.co.kr>.
+	* makeinfo/cmds.c: new command @shortcaption.
 
-Wed Jun 11 16:36:51 1997  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/xml.c:
+	* makeinfo/xml.h: new element SHORTCAPTION.
 
-	* doc/texinfo.texi (Other Info Directories): Document new trailing
- 		: in INFOPATH feature.
+	* makeinfo/insertion.c (cm_caption): insert CAPTION or SHORTCAPTION
+	according to command.
+	(begin_insertion): read @shortcaption too.  Fixed XML floatpos
+	contents.
 
-	* info/info.c (main): Have trailing : in INFOPATH expand to the
- 		default path.
+	* makeinfo/float.h: added shorttitle and position to the float_elt
+	struct.
 
-Fri Jun  6 13:22:02 1997  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/float.c (add_new_float): accept a shorttitle argument.
+	(current_float_shorttitle, current_float_position): new functions.
+	(cm_listoffloats): if title is too long to fit into a line, try
+	shorttitle.
 
-	* doc/texinfo.texi (uref): New node for new command.
+2004-01-07  Alper Ersoy  <dirt@gtk.org>
 
-Thu Jun  5 18:13:48 1997  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/float.h: new variable node_has_listoffloats.
 
-	* makeinfo/makeinfo.c (cm_uref): New function to accept optional
-		second argument.  Call it in command table.
+	* makeinfo/float.c (cm_listoffloats): insert menu header string only
+	if node_has_listoffloats is not true.
 
-Sat Jun 14 10:54:16 1997  Karl Eichwalder  <ke@suse.de>
+	* makeinfo/node.c (cm_node): reset node_has_listoffloats.
 
-	* mkinstalldirs: Update from automake-1.1p.
+2004-01-06  Alper Ersoy  <dirt@gtk.org>
 
-	* configure.in: Touch po/ChangeLog (gettext needs it).
+	* makeinfo/insertion.c (begin_insertion): fixed a thinko in @float
+	arguments parsing code, regarding string termination; changed manual
+	input text skipping with skip_whitespace_and_newlines for proper
+	line_number handling; and changed magic number 10 with sizeof for
+	improved readability.
 
-Thu Jun 12 08:37:52 1997  Karl Eichwalder  <ke@ke.Central.DE>
+	* makeinfo/float.c (cm_listoffloats): end paragraph before the menu
+	header.  Use add_html_block_elt to insert <div> element.
 
-	* util/texindex.c: Include system.h, remove config.h.
+2004-01-06  Alper Ersoy  <dirt@gtk.org>
 
-	* po/POTFILES.in: Fill it.
+	* makeinfo/crossrefs.c:
+	* makeinfo/crossrefs.h: moved to ...
 
-	* makeinfo/multi.c: Include system.h.
+	* makeinfo/xref.c:
+	* makeinfo/xref.h: new files.
 
-	* info/Makefile.am:
 	* makeinfo/Makefile.am:
-	* util/Makefile.am:
- 	(localedir): Set.
-	(INCLUDES): Add intl/ and LOCALEDIR.
-	(LDADD): Add @INTLLIBS@.
-
-	* makeinfo/makeinfo.c (main):
-	* util/texindex.c (main):
-	* util/install-info.c (main):
- 	setlocale, bindtextdomain, and textdomain.
-
-	* lib/system.h: Include locale.h and libintl.h.
-
-	* acconfig.h: Include libintl.h.
-	(_, N_): Define.
-	Add ENABLE_NLS, HAVE_CATGETS, HAVE_GETTEXT, HAVE_LC_MESSAGES,
-	HAVE_STPCPY for libintl.
-	Add @TOP@ and @BOTTOM@.
-
-	* configure.in (AM_GNU_GETTEXT): Add.
-	(AC_OUTPUT): Process Makefiles in intl/ and po/.
-	(ALL_LINGUAS): Available languages.
-
-	* Makefile.am (AUTOMAKE_OPTIONS): Now use 1.1p.
-
-Wed Jun 11 17:05:37 1997  Karl Eichwalder  <ke@ke.Central.DE>
-
-	* Makefile.am (SUBDIRS): Add intl/ and po/ for NLS.
-
-	* run `gettextize -c' to get the i18n skeleton.
-
-Wed Jun  4 17:51:08 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (uref): New command, another alias for @code
- 		for now.
-
-Wed Jun  4 02:02:33 1997  Miles Bader  <miles@gnu.ai.mit.edu>
-
-        * doc/texinfo.texi (email): { and } need @ escapes.
-
-Sun Jun  1 16:34:12 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.texi (itemx): @itemx should always follow @item.
-
-	* makeinfo/makeinfo.c (cm_item): Insert blank line if two
-		consecutive @item's.
-	From: Karl Eichwalder <ke@ke.central.de>.
-	Also various doc fixes.
-
-Tue May 27 17:20:44 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.texi (various): Document @deftypemethod.
-	(email): @ should have been @@ in the example.
-	From: Mate Wierdl <mw@wierdlmpc.msci.memphis.edu>
-
-Mon May 26 16:56:26 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/multi.c (setup_multitable_parameters): Avoid use of %n
-		for sake of m68k-hp-bsd.
-	From: Derek L Davies <ddavies@world.std.com>.
-
-	* info/terminal.c (terminal_begin_using_terminal,
-        terminal_end_using_terminal): Call fflush and sleep to handle
-	cmdtool/shelltool with scrollbars.  Also ignore
- 	SIGWINCH so we do not prematurely exit.  Move call.
-	(terminal_prep_terminal): Disable LNEXT (CTRL-V).
-	From: strube@physik3.gwdg.de (Hans Werner Strube).
-
-	* configure.in (AC_TYPE_SIGNAL): Check this.
-
-Sun May 25 16:49:58 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (discard_insertions): Take arg saying
- 		whether ifinfo/ifset/etc. are ok.
-        (convert_from_loaded_file): At `finished', call discard_insertions.
-	(handle_variable_internal): Complain if we reach eof before the
-		@end for a false condition.
-	From: HERBERT@boevm4.vnet.ibm.com.
-
-	* info/Makefile.am (ginfo_SOURCES): Add doc.h.
-	* lib/Makefile.am (libtxi_a_SOURCES): Add system.h.
-
-Sat May 24 18:08:27 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c: Check that we have macro_expansion_filename
- 		before using strcmp.
-
-Thu May 22 17:59:46 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/makeinfo.texi: Minimally document --force.
-
-	* makeinfo/makeinfo.c (--force): New option.
-	(-E): Allow stdout via `-'.
-	(convert_from_loaded_file): Unlink output files if errors and !force.
-
-Tue May 20 17:48:42 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c: Change all strdup calls to xstrdup.
-	(xmalloc, xrealloc, memory_error): Remove these functions, they're
-		in lib.
-	(set_paragraph_indent, cm_paragraph_indent): Move to misc page.
-	(cm_footnote): Expand macros in the arg for the macro expansion output.
-
-Fri May 16 17:26:59 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (cm_macro): Allocate an empty body if the
- 		macro was empty.
- 	(cm_unmacro): Allocate one more byte for the null.
-	From: Robert Hoehne <robert.hoehne@Mathematik.TU-Chemnitz.DE>.
-
-Sun May 11 17:51:21 1997  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* makeinfo/makeinfo.c (cm_printindex): Fix calculation of the
-	length of an index line.
-
-Sun May 11 14:47:42 1997  Tom Tromey  <tromey@cygnus.com>
-
-	* makeinfo/makeinfo.c (main): Don't unconditionally run usage when
-	-e specified.
-
-Sun May 11 17:47:42 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (init_indices): Free the source for an @synindex.
-	(undefindex): Do not go further if the target was already freed.
-	(free_index): Do not free the node names, as init_tags already did.
-	(cm_synindex, index_add_arg): Improve error message.
-	(program_index, function_index, etc.): Remove these unused #defines.
-
-Tue May  6 17:53:37 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (init_internals): Do not free current_node,
-        it already is, at least when multiple input files are specified.
-	From: Karl Eichwalder <ke@ke.central.de>.
-
-Mon May  5 16:14:39 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.texi: Mention both alignment and non-alignment of
- 		continuation description lines in menus (Arnold).
-
-Sun Apr 27 16:12:44 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (apply): Handle body being `\string'.
-	Also, avoid dereferencing a null pointer when a macro has no named
-	parameters.
-	From: Eli Zaretskii <eliz@is.elta.co.il>.
-
-	* makeinfo/makeinfo.c: Wording changes/fixes in warnings.
-
-	* info/session.c (info_get_input_char): Do not mix stdio with raw I/O.
-	From: Egil Kvaleberg <egilk@sn.no>.
-
-	From Tom Hageman <tom@basil.icce.rug.nl>.  These changes make
-        arrow keys work:
-	* info/infomap.c: Add arrow key bindings.
-        (keymap_bind_keyseq): New support function.
-	(initialize_info_keymaps): Use it.
-	(term_ku,term_kd,term_kl,term_kr): Remove explicit declarations;
-	use #include "terminal.h" instead.
-	* info/session.c (initialize_info_session): Unbuffer stdin.
-	(info_get_another_input_char): Fix bug in `ready' logic.
-	* info/terminal.h,
-	* info/terminal.c (term_kP, term_kN): New variables to hold
- 		PageUp, PageDown key sequences.
-	  (terminal_initialize_terminal): Set them.
-
-	* util/texindex.c (main),
-	* util/install-info.c (main),
-	* makeinfo/makeinfo.c (print_version_info),
-	* info/info.c (main): Use PACKAGE and VERSION from Automake for
- 		printing version number.
-
-Sat Apr 26 19:19:46 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (get_until_in_line): Do not expand if
-		executing_string.
-	Also, free temporary strings.
-	Also, untabify entire file.
-
-	* doc/texinfo.texi: Many corrections from Arnold.
-
-Thu Apr 24 16:31:09 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/multi.c (draw_horizontal_separator): Account for indent
- 		here also.  From Ulrich.
-
-Wed Apr 23 15:15:34 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (cm_today): Use time_t instead of long;
- 		everyone else does.
- 	(LOCALTIME_CAST): Remove kludge, we'll always use time_t now.
-
-	* info/Makefile.am (ginfo_SOURCES): Remove general.h, that got
- 		merged into system.h.
-
-Mon Apr 21 17:13:25 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/multi.c (output_multitable_row): Account for
- 	column_indent, both the global one and for each column.
-	(setup_multitable_parameters): Account for column_indent in the table
-	width in the columnfrac case, but don't bother with the template
- 		case for now.
-
-Sun Apr 20 16:32:00 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (output_stream): Remove redundant
-        definition; it's in makeinfo.h,
-	and a vaxstation-ultrix4.3 fails to link because of the two defns.
-	From: Anders Olofsson <anders@kid025.ericsson.se>.
-
-	* makeinfo/makeinfo.c (expansion): Inhibit appending to the macro
- 		expansion stream.
- 	(get_until_in_line): Possibly expand the text.
-	Change caller in get_node_token to do the expansion,
-	all other calls to remain the same.
-
-	* makeinfo/makeinfo.c (cm_node): No need to call strlen to check
- 		for the empty string.
-
-	* doc/texinfo.texi: Restore missing @c for initial comment.
-
-Fri Apr 18 17:41:36 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.texi: Mention that .info is unnecessary in the info
-		file name argument of an xref.
-
-	* doc/texinfo.texi: Mention texi2dvi -t instead of embedding
- 		@smallbook or @afourpaper in the document source.
-
-Sun Apr 13 15:19:08 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* lib/system.h (_GNU_SOURCE): #define.
-
-Mon Apr  7 16:30:11 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/info.texi,
-	* doc/info-stnd.texi,
-	* doc/texinfo.texi: Do not make (dir) the previous ptr from the top node,
-	and tell people not to do that in the manual.
-	From: rmedina@kanojo.ivic.ve (Rodrigo Medina),
-	confirmed by rms.
-
-Fri Apr  4 16:30:33 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c: Move error page to top to avoid
-	prototypes, and do add prototypes for add_word_args and execute_string,
-	so we can use <stdarg.h>.
-
-	* info/makedoc.c,
-	* info/nodemenu.c: Use %ld instead of %d for file offsets.
-	* makeinfo/makeinfo.c (delete_macro): Decrement macro_list_len.
-	(get_macro_args): Decrement line number if see \n.
-	* utils/texindex.c (indexify): Use fputs instead of fprintf
-	for constant string.
-	From: Eli Zaretskii <eliz@is.elta.co.il>.
-
-Thu Apr  3 17:40:52 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* configure.in (AC_CHECK_HEADERS): No need to check for vararg.h
-	here, AC_FUNC_VPRINTF does it.
-	(AC_CHECK_FUNCS): Likewise for vsprintf and vfprintf.
-	* makeinfo/makeinfo.c (add_word_args, execute_string): Rewrite
-	like the error functions.
-
-Wed Apr  2 17:46:28 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* configure.in: Add AC_FUNC_VPRINTF.
-	* makeinfo/makeinfo.c (error, line_error, warning): Rewrite a la
-        error.c from the *utils to use <stdarg.h> if available.
-
-Tue Apr  1 11:48:40 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* doc/texinfo.texi: Tabs are a bad idea.
-
-	* doc/userdoc.texi,
-	* doc/info.texi: Untabify.
-
-Sun Mar 30 17:36:47 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (end_of_sentence_p): New function.
-	(add_char): Call it, instead of simply sentence_ender.
-	(post_sentence): New macro.
-	Also, remove some #include's now in system.h.
-	* lib/system.h [VMS]: #include <perror.h>, from makeinfo.
-
-Thu Mar 27 17:41:03 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* info/search.c (skip_node_characters): Do not arbitrarily
-	strip trailing period from end of node name; this is valid.
-
-Mon Mar 24 16:44:42 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* configure.in (AC_OUTPUT): Don't need to create stamp-h here,
-	tromey says AM_CONFIG_HEADER will do it.
-
-	* info/Makefile.am, util/Makefile.am, makeinfo/Makefile.am (INCLUDES):
-        Don't need -I.. (for config.h) or -I$(srcdir), says tromey.
-        Automake includes those already.
-
-Fri Mar 14 15:05:17 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* info/Makefile.am: Build as ginfo, install as info,
-	to avoid conflict with the standard info target.
-
-	* lib/system.h: New file.
-	* makeinfo/makeinfo.c (strerror): Remove declaration,
-	include system.h, remove other redundant #if stuff.
-	* info/general.h: Include system.h instead of doing common stuff.
-	* util/install-info.c (my_strerror): Remove this, use strerror,
-	include system.h.
-
-	* info/terminal.c (terminal_prep_terminal): Only use OCRNL and
-		ONLCR if they are defined.  Reported by many people.
-
-	* Installed:
-
-	Sun Dec  1 19:23:54 1996  Karl Eichwalder  <ke@ke.Central.DE>
-
-		* configure.in (TERMLIBS): Add ncurses.
-
-Thu Mar 13 13:59:45 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* lib/Makefile.am (libtxi_a_SOURCES): Add xstrdup.c.
-	* info/*.c: Use xstrdup instead of strdup everywhere.
-
-	* info/tilde.c: Do not include clib.h, move stdlib.h include to
-	* info/general.h: here.
-
-	* configure.in (AC_CONFIG_HEADER): Use this,
-	to avoid hugely long compile line with all the -D's.
-	* info/general.h: Include <config.h>.
-
-	* emacs/Makefile.am (install, install-data): Do @echo
-	to tell the user to compile/install the elisp manually.
-
-	* configure.in (AC_REPLACE_FUNCS): Move strerror check to here.
-	(AC_CHECK_FUNCS): From here.
-
-	* lib/strerror.c: New file, from enscript (et al.) distribution.
-
-Tue Mar 11 16:36:25 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* info/Makefile.am (info_SOURCES): Add doc.c, dribble.c, infodoc.c.
-	(LDADD): Add @TERMLIBS@.
-
-	* info/info.h: HANDLE_MAN_PAGES, NAMED_FUNCTIONS: Define these.
-
-	* info/filesys.h: Spurious ! when DEFAULT_INFOPATH is not defined.
-
-	* configure.in (AC_OUTPUT): Do lib first and doc last.
-
-	* info/echo-area.c,
-	* info/echo-area.h,
-	* info/info.h: Rename echo_area to echo-area.
-
-Mon Mar 10 17:59:05 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* */Makefile.am: Write Makefile.am files for Automake.
-	* doc: New subdirectory, move all manuals and texinfo.tex there.
-	* AUTHORS, THANKS, config.guess, config.sub, mkinstalldirs: New files,
-	required by Automake.
-	* lib/xmalloc.c: Move from info/.
-
-Fri Oct  4 07:49:49 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* Version 3.9.
-
-	* Makefile.in (install): Say to install texinfo.tex manually.
-
-	* util/texi2dvi,
-	* util/texindex.c,
-	* makeinfo/makeinfo.c,
-	* info/info.c: Include only the current year in the copyright message.
-
-	* util/texi2dvi: Exit successfully.
-	From: Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>.
-
-Thu Oct  3 12:58:32 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* Rename install.sh to the preferred install-sh.
-
-	* Makefile.in (VERSION),
-	* util/texi2dvi,
-	* util/texindex.c,
-	* util/install-info.c,
-	* makeinfo/makeinfo.c (minor_version, print_version_info),
-     	* info/info.c: Update version number.
-
-	* util/texi2dvi: Only show diff if verbose.
-
-	* util/install-info.c (main): Check for a missing dir file as well
- 	as a missing info files.
-	(main): At start of a node, completely initialize the newly-malloced
-	node structure.
-
-	* texinfo.texi: Fix incorrect uses of @key,
-	insert missing newline in Installing Dir Entries' @menu item,
-	document install-info invocation.
-
-	* Makefile.in (DISTFILES): Do not put .gdbinit's in distribution.
-	(dist): Use || instead of && (and invert sense) so make doesn't think
-	the command failed.
-	(dist): Exclude more junk.
-
-	* makeinfo/makeinfo.c (cm_xref): Back out patch from Tom T., since
-        we generate a good-enough error message that is suppressible
-        without it.
-
-	* util/gen-dir-node: The recommended name for the top-level info
- 	file is dir, not dir.info.
-
-	* util/install-info.c (main): At `Mark the end of the Top node',
-        make sure the node name is non-NULL before comparing it. From
-        lvirden@cas.org.
-
-	* configure.in (AC_REPLACE_FUNCS): Use this for memcpy, memmove,
-	and strdup.
-        (AC_CHECK_FUNCS): Instead of this.
-	Because both bcopy and memmove are missing on the 3b2, as reported by
-	Gaylen Miller <gaylen@proaxis.com>, hence we must provide our own.
-	* libtxi/Makefile.in (LIBOBJS): New variable.
-	(OBJS): Include it.
-	* libtxi/memcpy.c, libtxi/memmove.c, libtxi/strdup.c: New files,
-	taken from fileutils 3.13.
-	* makeinfo/makeinfo.c,
-	* info/clib.c (strdup): Move to libtxi.
-
-Wed Oct  2 18:23:30 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* info/info-utils.h (memcpy) [!HAVE_MEMCPY],
-	* info/termdep.h (memcpy) [!HAVE_MEMCPY],
-	* makeinfo/makeinfo.c (memmove) [!HAVE_MEMMOVE]: Remove this
-        #ifdef, as we now include it in libtxi if missing.
-
-Tue Oct  1 17:41:52 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/Makefile.in (install),
-	* info/Makefile.in (install),
-	* Makefile.in (install): Use new option name --info-dir instead of
- 	--infodir.
-
-	* makeinfo/multi.c (out_char): New fn.  Replace all calls to
-	putc/fprintf with calls to this.
-
-	* util/install-info.c: Rename --infodir to info-dir.
-
-Mon Sep 30 10:07:21 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* Version 3.8.
-
-	* texinfo.tex: Untabify.
-
-	* texinfo.tex (\ptexl, \ptexL): Do not save, we have our own
-	commands now.
-	(\onepageout): Reformat for readability, and call \indexdummies
-	to avoid expansion of Texinfo commands (e.g., accents) in \write's.
-	(\,, \dotaccent, \ringaccent, \tieaccent, \ubaraccent, udotaccent,
-	\questiondown, \exclamdown, \dotless): New macros.
-	(\l): Let plain TeX definition remain, instead of switching
-	to ``lisp'' font.
-	(\multitable): Ensure space between the columns,
-	insert struts to make interline spacing constant,
-	use real strut instead of a box containing `Xy'.
-	(\indexdummies): Do not define \rm, \char, but
-	do define \@, \{, \}, \dotless, and \,.  And \t should generate
-	\t, not \r.
-	(\indexnofonts): Define \, and \dotless as \indexdummyfont,
-	and let \@ be @.
-	(\doind): Reformat for readability, and use temp control sequence
-	names that actually make sense.
-	(\doublecolumnout, \pagesofar, \enddoublecolumns): Restore
-	Knuth's original code to avoid spurious overfull vbox messages.
-	(No boxes are actually overfull).
-	(\shortcontents): Do not allow hyphenations.
-	(\dochapentry, \tocentry): Make glue above and below flexible, to allow
-	better page breaks.
-	(\tex): Reset \, to its plain TeX meaning,
-	and do not reset \l.
-
-	* COPYING: Update for new FSF address (from gcc dist).
-
-	* libtxi/Makefile.in: Various simplifications.
-
-Sun Sep 29 12:58:44 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* util/texi2dvi: Use $progname instead of $0 for --version.
-
-	* util/install-info.c (xmalloc, xrealloc): Declare malloc and
-	realloc as returning void *,
-	to avoid ptr/int problems on Digital Unix.
-
-	* info/tilde.c (tilde_expand_word): Declare getenv as returning char *,
-	to avoid warning on Digital Unix.
-
-	* makeinfo/multi.c (multitable_active): Declare extern here to
- 	avoid ld warning on rs6000.
-
-	* util/texindex.c (usage): Avoid ??' trigraph.
-
-	* util/install-info.c: Include <sys/fcntl.h> or <fnctl.h>,
-	according to HAVE_SYS_FCNTL_H,
-	and only include <sys/file.h> if HAVE_SYS_FILE_H.
-	(readlines): Oops, had NULL's and 0's reversed for ptr/int members.
-
-	* info/terminal.c (terminal_goto_xy): Remove spurious extra ;.
-
-	* util/install-info.c: Untabify.	(input_sections): Initialize.
-	(find_lines): Initialize the terminating element of the array.
-	(print_help): Document --infodir.
-	(main): Compare the basename of infile sans .info to the dir entry,
-	not infile itself.
-	* util/Makefile.in (clean): Remove the install-info binary.
-
-	* info/Makefile.in (distclean): Remove *.info* files.
-
-	* Makefile.in (install),
-	* info/Makefile.in (install),
-	* makeinfo/Makefile.in (install): Use --infodir instead of --info-file.
-
-	* info/info.c,
-	* makeinfo/makeinfo.c: Avoid newlines in string constants for the
- 		sake of SunOS cc.
-
-	* makeinfo/multi.c: Do not assume ANSI C.
-
-	* info/info.texi: Oops, need @end vtable for a @vtable.
-
-Sat Sep 28 16:31:28 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* Makefile.in (texinfo): Do not depend on sub-all, as then
-        makeinfo is always run.  Instead, depend on texinfo.texi.
-
-	* makeinfo/Makefile.in (info, dvi): New targets.
-	makeinfo.info, makeinfo.dvi: Do not depend on macro.texi for now.
-
-	* info/Makefile.in (install): Must call install-info twice.
-
-	* info/info-stnd.texi,
-	* info/info.texi,
-	* makeinfo/makeinfo.texi: Include direntry.
-
-	* emacs/Makefile.in: Use && after cd, etc.
-
-	* texinfo.texi: Kludges so makeinfo -E will not create spurious
-        differences.  Add new direntries.
-
-	* util/install-info.c,
-	* util/texindex.c,
-	* makeinfo/makeinfo.c,
-	* info/info.c: Standardize --version output.
-
-	* makeinfo/makeinfo.c (defun_internal): Don't insert index command
- 	if expanding macros.
-	(cm_footnotestyle): Don't change the footnote style if it was set
-	on the command line.
-
-	* util/texi2dvi: Recompute original index files each time through loop.
-	Make indentation uniform.
-	Use same basename for the temp input files.
-	Standardize --version output.
-
-	* info/Makefile.in (install),
-	* makeinfo/Makefile.in (install): Insert $(POST_INSTALL).
-
-Fri Sep 27 13:27:30 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.texi (Format with texi2dvi): Rewrite now that the script
- 	runs in a loop.
-
-	* info/Makefile.in (MAKEINFO): Simplify to ../makeinfo/makeinfo.
-
-Fri Sep 27 00:26:03 1996  Miles Bader  <miles@gnu.ai.mit.edu>
-
-	* info/terminal.c [HAVE_TERMIOS_H] (terminal_prep_terminal,
-	terminal_unprep_terminal): Add code for termios.
-	[HAVE_TERMIOS_H] (original_termios, ttybuff): New variables.
-	* info/termdep.h: [HAVE_TERMIOS_H]: Add include of <termios.h>.
-	* configure.in: Add check for <termios.h>.
-
-Thu Sep 26 10:46:34 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* emacs/texnfo-upd.el,
-	* emacs/texinfo.el,
-	* emacs/texinfmt.el: Update from bob for new Texinfo commands, etc.
-
-	* emacs/info.el, emacs/informat.el, emacs/makeinfo.el,
-	emacs/texnfo-tex.el: Update from Emacs 19.34 dist.
-
-	* emacs/elisp-comp: Use TMPDIR if set.
-
-	* util/Makefile.in (libdir): Remove.
-
-	* makeinfo/Makefile.in (install),
-	* Makefile.in (install),
-	* info/Makefile.in (install): Run install-info.
-	(libdir): Remove.
-
-	* texinfo.texi: Various fixes as I make this go through TeX.
-
-	* util/install-info.c: Quote newlines in help message.
-
-	* util/texi2dvi (texi2dvi): Run TeX until the aux/index files
-        stabilize, instead of just twice.  From: David Shaw
-        <daves@gsms01.alcatel.com.au>.
-
-Tue Sep 24 14:43:03 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* dir: Blank dir file for installation on new systems.
-
-Mon Sep 23 12:18:43 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (args_from_string): Do not back up at a };
- 		that leads to an infinite loop.
-
-Sat Sep 21 17:48:04 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (cm_xref): Do not seg fault if outside of
- 	any node.  From: Tom Tromey <tromey@creche.cygnus.com>.
-	(cm_ctrl): Make obsolete.
-
-Tue Sep 17 13:30:08 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\inforef): Move to more appropriate place.
-	(\pounds): Remove spurious extra $.
-	(\email): Typeset argument in angle brackets.
-	(\macro): Use \doignore for robustness, instead of just letting TeX
-	parse the argument.
-	(\unmacro): Define.
-
-Sat Sep 14 16:17:35 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.texi: Document multitables, new ISBN number.
-
-Wed Sep 11 18:01:24 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/multi.c (struct env): Remove unused output_position
-        field; this needs to be global.
-        (setup_multitable_parameters): Implement template-defined multitables.
-	(output_multitable_row): Remove trailing whitespace.
-
-	* makeinfo/makeinfo.c (_READ_BUFFER_GROWTH, struct _defines):
-	Remove leading underscore for POSIX/ANSI pedants.
-	(init_conversion): Initialize output_position here.
-	(init_paragraph): Instead of here, where it loses with the
-	multitable calls, eventually resulting in negative counts to the
-	write call when the output file is split.
-
-	* texinfo.texi: First cut at macro documentation.
-	Change accent doc to use tables.
-	Remove whitespace experiments, they are now the default.
-
-Mon Sep  9 14:16:24 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c: Use putc instead of fprintf where possible.
-        (cm_accent): Put _ from @ubaraccent after argument.
-
-	* util/texindex.c (strerror) [!strerror]: Conditionalize
- 		declaration.
-
-Sat Sep  7 14:13:24 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (commandTable): Obsolete @setchapterstyle.
-
-Thu Sep  5 15:45:11 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (convert_from_loaded_file): Oops, fix
- 		wording of initial output comment.
-
-	* makeinfo/makeinfo.c (cm_angle_brackets): Rename from cm_key.
-        (commandTable): @email should produce angle brackets.
-	@key: Change name.
-
-Tue Sep  3 14:52:17 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\hsize): Decrease.
-        (\hoffset): Increase.
-	(\setleading): Decrease dramatically.
-	This change affects 8.5x11 format only.
-
-	* texinfo.texi: Document accent commands.
-
-Mon Sep  2 11:10:49 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (commandTable): Deprecate @ichapter and
-	@titlespec.
-	Move all the deprecated @i<section> commands to the end of the list.
-
-	* texinfo.texi: Document @pounds{} and @centerchap{}.
-
-	* texinfo.tex (\centerchfplain): Rewrite to use \chfplain, and to
- 	actually center.
-	(\unnchfplain): Just call \chfplain.
-	(\chfplain): Rewrite to be generally callable.
-	(\centerparametersmaybe): Hook, a no-op except with @centerchap.
-
-Sun Sep  1 15:01:49 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.texi: Document @<whitespace>, rearrange spacing section.
-
-	* makeinfo.c (commandTable): Make @. @? @! insert themselves,
- 	not be sentence-non-enders.  They are sentence *enders*.  Also,
- 	make @\t and @\n insert a normal space character, not themselves.
-  	Also, define @hyphenation.
-	(insert_space): New function.
-	(cm_ignore_sentence_ender): Remove this.
-	(flush_output): Check only for META-SPC, not META-<sentence-ender>.
-
-Fri Aug 30 18:55:30 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.texi: Document @- and @hyphenation{}.
-	Miscellanous fixes.
-
-	* makeinfo/makeinfo.c (commandTable): Define @- as cm_no_op, since
- 	makeinfo doesn't do hyphenation.
-
-Thu Aug 29 13:05:38 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\key): Do not uppercase the argument; key names
-	can be mixed case, e.g., `Control'.
-
-	* makeinfo/makeinfo.c: @infotop, @infounnumbered,
-	@infounnumberedsec, @infounnumberedsubsec,
-	@infounnumberedsubsubsec, @infoappendix, @infoappendixsec,
-	@infoappendixsubsec, @infoappendixsubsubsec, @infochapter,
-	@infosection, @infosubsection, @infosubsubsection:
-	  Remove these long-since obsolete commands.
-	@iappendix, @iappendixsection, @iappendixsec, @iappendixsubsec,
-	@iappendixsubsubsec, @ichapter, @isection, @isubsection,
-	@isubsubsection, @iunnumbered, @iunnumberedsec, @iunnumberedsubsec,
-	@iunnumberedsubsubsec:
- 	  Deprecate these.
-	@infoinclude:
-	  Obsolete this.
-	@,: Have to take an argument, since have to do @,{c} not c@,; can't
-	feasibly implement the latter in TeX.
-
-	* makeinfo/makeinfo.c: Rename @d to @udotaccent, since this is
- 		relatively infrequently used.
-
-Tue Aug 27 14:58:56 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* info/info.c (print_short_help),
-	* util/install-info.c (print_help),
-	* util/texi2dvi,
-	* makeinfo/makeinfo.c (usage) Include bug reporting address.
-
-Mon Aug 26 15:27:17 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (commandTable): Remove @input, @medbreak,
- 		@smallbreak, @overfullrule, @br.
-
-Sun Aug 25 17:25:48 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (commandTable): Unify commands that perform
-        the same operation, such as cm_file, cm_samp, cm_email,
-        etc., which all do cm_code.
-
-	* texinfo.texi: Document @ifhtml ... @end ifhtml.  Change
-	`PlainTeX' to `plain TeX'.
-
-Fri Aug 23 16:03:16 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\pounds): New Texinfo command @pounds{}.
-	(\parskip): New smaller value.
-	(\chapheadingskip, \secheadingskip, \subsecheadingskip): New smaller
-	values, both for 8.5x11 and @smallbook formats. From Bob.
-
-	* makeinfo/makeinfo.c (cm_special_char): @pounds{} prints a #.
-	(commandTable): Add new command @pounds.
-
-Tue Aug 20 13:47:20 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (CommandTable): Restore "!", accidentally
-        removed previously.
-
-	* texinfo.tex (\key): Typeset a lozenge around the argument (from
-	gildea@intouchsys.com).
-	* makeinfo/makeinfo.c (cm_key): Surround arg with <...> to match
-        new lozenge style in TeX.
-
-Wed Aug 14 16:59:23 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.texi: Propagate change from rms.
-
-Tue Aug 13 11:33:27 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.texi: Propagate change from rms.
-
-	* texinfo.texi: Document other @headings options.
-
-Sun Aug 11 13:19:42 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (cm_accent, cm_special_char, cm_dotless):
-	New functions.
-	(CommandTable): Add new commands for all of plain.tex's
-	accents and non-English characters.
-
-Fri Aug  9 14:12:07 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* makeinfo/makeinfo.c (convert_from_loaded_file): Say we're making
- 	``text'' file if no_headers.  Also, use `input_filename' instead
- 	of just `name' for clarity.
-	(suffixes): Check for no suffix last, i.e., prefer `foo.texi' as an
-	input file to `foo'.  (The latter is probably a binary.)
+	* makeinfo/cmds.c:
+	* makeinfo/footnote.c:
+	* makeinfo/html.c:
+	* makeinfo/makeinfo.c:
+	* makeinfo/node.c:
+	* makeinfo/node.h:
+	* makeinfo/sectioning.c:
+	* makeinfo/toc.c: adjusted for new names.
 
-Mon Aug  5 13:52:39 1996  Karl Berry  <karl@cs.umb.edu>
+2004-01-06  Alper Ersoy  <dirt@gtk.org>
 
-	* texinfo.tex (\heading, \subheading, \subsubheading): Can no
- 	longer call the nonexistent \*secheadingi series. Instead, call
- 	\plain*secheading.
-	(\plainsubsecheading, \plainsubsubsecheading): New macros, by analogy
-	with \plainsecheading.
-	(\unnumberedsubseczzz, \unnumberedsubsubseczzz): Call them.
+	* makeinfo/makeinfo.c:
+	* makeinfo/makeinfo.h: moved cross referencing commands to ...
 
-Sun Aug  4 16:46:10 1996  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/crossrefs.c:
+	* makeinfo/crossrefs.h: new files.
 
-	* makeinfo/makeinfo.c (flush_output): Mask out eighth bit, that we
- 	turned on in non-sentence enders.
+	* makeinfo/cmds.c:
+	* makeinfo/footnote.c:
+	* makeinfo/html.c:
+	* makeinfo/makeinfo.c:
+	* makeinfo/node.c:
+	* makeinfo/sectioning.c:
+	* makeinfo/toc.c: added crossrefs.h to includes.
 
-Sat Aug  3 14:03:10 1996  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/Makefile.am: added new files crossrefs.c and crossrefs.h
 
-	* texinfo.tex (\HEADINGSdouble, \HEADINGSsingle,
- 	HEADINGSdoubleafter, \HEADINGSsingleafter, \CHAPPAGoff,
- 	\CHAPPAGon, \CHAPPAGodd): Set \contentsalignmacro, analogous to
- 	\pagealignmacro.
-	(\startcontents): Call \contentsalignmacro instead of \pagealignmacro.
+2004-01-06  Alper Ersoy  <dirt@gtk.org>
 
-Mon Jul 29 14:44:33 1996  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/node.c (cm_node): removed ``Node: <nodename>'' from the
+	node headers.
 
-	* texinfo.tex (\indexfonts): Make leading be 12pt. Otherwise, it's
- 	too crammed.
-	(\smalllispx): Remove \setleading{10pt}. That was too small.
-	(\doprintindex): Do not call \tex ... \Etex.  Index files are Texinfo
-	source, not TeX source, except for using \ instead of @ as the
- 	escape character (for now).
+2004-01-06  Alper Ersoy  <dirt@gtk.org>
 
-Sun Jul 28 13:37:05 1996  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/insertion.c (begin_insertion): keep line_number the same
+	before and after get_until, so messages issued inside full_expansion
+	have correct line numbers.
 
-	* texinfo.tex (paragraphindent): Move to more reasonable place in
-        the source file.
-        (chapfonts, secfonts, subsecfonts, indexfonts): Call \setleading.
-	(\chfplain, \secheading, \plainsecheading, \subsecheading,
-	 \subsubheading): Rewrite to properly \hangindent the title.
-     	(\sectionheading): New generic macro to print section titles.
+2004-01-06  Alper Ersoy  <dirt@gtk.org>
 
-	* texinfo.texi: Update the `Obtaining TeX' node.
+	* makeinfo/makeinfo.c (handle_menu_entry):
+	* makeinfo/node.c (glean_node_from_menu): adjust line_number.
 
-Fri Jul 26 14:11:48 1996  Karl Berry  <karl@cs.umb.edu>
+2004-01-05  Karl Berry  <karl@gnu.org>
 
-	* util/texi2dvi: Do macro expansion with makeinfo before running TeX.
-	Various expansion safety measures added for test; avoid use of -o.
+	* doc/texinfo.tex (\rawbackslashxx): rename to \backslashcurfont,
+	to keep reducing the number of `xx's here.
 
-	* makeinfo/makeinfo.c (usage): More usage message tweaks.
+	* doc/texinfo.tex (\setref): call \atdummies, not \indexnofonts; we
+	need to keep the user's commands.
+	(\dofloat): call \indexnofonts and \turnoffactive
+	to support commands and special characters in the
+	float type name.
 
-Fri Jul 26 11:55:37 1996  Karl Berry  <karl@laurie>
+	* doc/texinfo.txi (firstparindent): shorten name so it doesn't
+	break in the toc.
 
-	* util/texi2dvi: Format usage message to conform to the other *utils.
+2004-01-05  Alper Ersoy  <dirt@gtk.org>
 
-Thu Jul 25 17:05:47 1996  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/html.c (html_output_head): new CSS entry span.sc for
+	small-caps font variant.
 
-	* emacs/Makefile.in: Do not compile the Elisp by default.  We
-	don't install it, so it confuses people to compile it.
+	* makeinfo/cmds.c (cm_sc): use span with class attribute sc, instead
+	of small.
 
-Sun Jul 21 07:20:09 1996  Karl Berry  <karl@cs.umb.edu>
+2004-01-04  Stepan Kasal  <kasal@ucw.cz>
 
-	* util/Makefile.in (install-info): Dependency should be
- 	  install-info.o, not install-info. Also, update copyright years.
+	* doc/texinfo.tex (\commondummies, \indexnofonts): Merge the
+	  common part of these two to ...
+	  (\commondummiesnofonts): ... a new macro.
+	  (\indexdummylatex, \indexdummytex, \indexdummydots): Nuke,
+	  the time saved is not worth the hassle.
 
-	* makeinfo/makeinfo.c (cm_printindex): Don't call execute_string
-        to print index entries, we've already done the expansion now.
+2004-01-04  Stepan Kasal  <kasal@ucw.cz>
 
-	* makeinfo/makeinfo.h: Add copyright.  Finish merge of rms changes.
-	* makeinfo/makeinfo.c: Finish merge, add my expansion changes again.
-	* makeinfo/multi.c: Add copyright message.
+	* doc/texinfo.tex (\makedispenv): Determine the size of the fonts
+	  according to the value of SETdispenvsize, using ...
+	  (\setnormaldispenv, \setsmalldispenv, \SETdispenvsize, \smallword):
+	  (\nosmallword): ... these new macros.
+	  (\flushleft): No longer defined via \makedispenv.
 
-Fri Jul 19 10:35:22 1996  Karl Berry  <karl@cs.umb.edu>
+2004-01-03  Karl Berry  <karl@gnu.org>
 
-	* info/info.c: Update copyright date.
+	* doc/texinfo.tex (\TeX): new macro, copying plain but make a
+	period following end a sentence.  Idea from LaTeX.
 
-	* info/info.texi,
-	* util/install-info.c,
-	* emacs/Makefile.in,
-	* emacs/texnfo-tex.el,
-	* emacs/Makefile.in: Change FSF address.
+2004-01-02  Alper Ersoy  <dirt@gtk.org>
 
-	* Merged changes from bfox -- below, plus multitable changes, plus
-	lots more.
+	* makeinfo/node.c (clean_old_split_files): new function.
+	(split_file): moved filename generation code to a ...
+	(enumerate_filename): new function.
 
-	    Sun Apr 14 08:49:50 1996  Brian J. Fox  <bfox@nirvana.samsara.com>
+	* makeinfo/makeinfo.c (convert_from_loaded_file): call
+	clean_old_split_files before calling split_file.
 
-		    * makeinfo/makeinfo.c (remember_node_reference): Numerous commands
-		    call remember_node_reference.  If a node has not yet been defined,
-		    use the empty string as the current node for those cases.
+2004-01-02  Alper Ersoy  <dirt@gtk.org>
 
-	    Mon Feb 12 17:35:38 1996  Brian J. Fox  <bfox@nirvana.samsara.com>
+	* makeinfo/makeinfo.c (create_html_directory): new function.
+	(insert_toplevel_subdirectory): moved common if blocks to
+	create_html_directory.  Adjusted checks to reuse existing
+	directories, and remove existing <output>.html files, when
+	falling back to suffices.
 
-		    * makeinfo/makeinfo.c (push_node_filename): Clean up calls to
-		    xmalloc and xrealloc.  Only have to call xrealloc.
+2004-01-02  Alper Ersoy  <dirt@gtk.org>
 
-	    Fri Jan 26 08:00:38 1996  Brian J. Fox  <bfox@nirvana.samsara.com>
+	* makeinfo/cmds.c (cm_code): for HTML, use span for @command, @env,
+	@file, @option and @samp, and insert command name as class attribute.
 
-		    * info/session.c (info_input_buffer_space_available): Fix typo
-		    which forced the limitation of the sizeof (int) instead of sizeof
-		    (buffer).
+2003-12-31  Alper Ersoy  <dirt@gtk.org>
 
-		    * Makefile.in (PACKVER): now at 3.8.  Add TERMIOS support to
-		    Info.  Minor bugs fixed in Makeinfo.
+	* makeinfo/makeinfo.c (add_char, handle_menu_entry): end <ul> block
+	before inserting <p>, and restart afterwards.
 
-Sat Jul 13 11:58:57 1996  Karl Berry  <karl@cs.umb.edu>
+2003-12-31  Alper Ersoy  <dirt@gtk.org>
 
-	* texinfo.texi (ftable vtable): Mention example.
+	* makeinfo/makeinfo.c (handle_menu_entry): for HTML, append colon only
+	if there is a description following the menu item.
 
-Sun Jun 30 14:59:51 1996  Karl Berry  <karl@goldman.gnu.ai.mit.edu>
+2003-12-31  Alper Ersoy  <dirt@gtk.org>
 
-        * makeinfo/makeinfo.c (cm_email): New function for new @email command.
-	* texinfo.texi (email): New node documenting it.
+	* makeinfo/makeinfo.c (usage): removed short forms of output options.
 
-Wed Apr 17 18:07:34 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+2003-12-30  Alper Ersoy  <dirt@gtk.org>
 
-	* makeinfo/makeinfo.c (cm_kbd): Do nothing if in @example or @code.
-	(struct brace_element): New field in_fixed_with_font.
-	(remember_brace_1): Save in_fixed_with_font.
-	(pop_and_call_brace): Restore in_fixed_with_font.
-	(cm_code): Don't decrement in_fixed_with_font at end of construct.
-	(struct istack_elt): New field in_fixed_with_font.
-	(push_insertion, pop_insertion): Save and restore in_fixed_with_font.
-	(end_insertion): Don't decrement in_fixed_with_font here.
-	(not_fixed_width): New function.
-	(cm_sc, cm_var, cm_italic, cm_roman, cm_titlefont):
-	Use not_fixed_width.
+	* cmds.c (cm_comment): do not output comments before HTML header is
+	written.
 
-Sat Apr 13 23:22:05 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+2003-12-30  Alper Ersoy  <dirt@gtk.org>
 
-	* util/install-info.c (main): Fatal error if no input file spec'd.
-	Look for START-INFO-DIR-ENTRY, not BEGIN-INFO-DIR-ENTRY.
+	* makeinfo/makeinfo.c (main): new option --plaintext.
+	(usage): added short forms of --html, --xml, --docbook and --plaintext
+	to the help text.
 
-Thu Apr 11 18:21:50 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+2003-12-30  Alper Ersoy  <dirt@gtk.org>
 
-	* makeinfo/makeinfo.c (cm_enddots): New function.
-	(self_delimiting): Accept -, ^ and ".
-	(CommandTable): Add commands -, ^, ", enddots, centerchap.
+	* makeinfo/multi.c (multitable_item): removed thead and tbody from
+	HTML tables.  Added hsep after @headitem for Info.
+	(multitable_item, multitable_tab): for HTML, use th instead of td for
+	@headitem rows.
 
-Sun Mar 24 12:18:32 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+	* makeinfo/xml.c (xml_begin_multitable): moved Docbook TGROUP code to
+	a ...
+	(xml_begin_multitable_group): new function.
+	(xml_end_multitable_row): restart TGROUP on @headitem.
+	(xml_end_multitable): warn if @headitem is the last item in
+	multitable, and output format is Docbook.  Joined common code between
+	XML and Docbook.
 
-	* makeinfo/makeinfo.c (enum insertion_type): Add `direntry'.
-	(insertion_type_names): Add "direntry".
-	(cm_dircategory): New function.
-	(cm_direntry): New function.
-	(CommandTable): Add "dircategory" and "direntry".
-	(insert_string): New function.
-	(end_insertion): Handle direntry.
-	(begin_insertion): Handle direntry.
+2003-12-30  Arnold D. Robbins  <arnold@skeeve.com>
 
-Sun Mar 24 11:10:05 1996  Karl Berry  <karl@spiff.gnu.ai.mit.edu>
+	* makeinfo/cmds.c (cm_strong): Use <emphasis role="bold"> for docbook.
 
-        * makeinfo/makeinfo.c (cm_url): New function for new @url command.
+2003-12-30  Alper Ersoy  <dirt@gtk.org>
 
-Fri Feb 23 21:14:40 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+	* makeinfo/float.c (cm_listoffloats): substituted fixed numbers with
+	the sizeof operator where possible, and commented code where not, to
+	improve code readability.
 
-	* info/Makefile.in (install, uninstall): Use manprefix.
+2003-12-30  Alper Ersoy  <dirt@gtk.org>
 
-Fri Feb 23 19:50:18 1996  Richard Stallman  <rms@whiz-bang.gnu.ai.mit.edu>
+	* makeinfo/makeinfo.c (cm_image): do not escape backslash and double
+	quote characters in plaintext output.
 
-	* util/Makefile.in (install-info, install-info.o): New targets.
-	(all): Depend on install-info.
-	(install, uninstall): Operate on install-info.
+2003-12-30  Alper Ersoy  <dirt@gtk.org>
 
-	* install-info.c: New file.
+	* makeinfo/makeinfo.c (cm_image): do not write magic cookie when
+	output format is plaintext.
 
-Wed Jan  3 10:01:45 1996  Brian J. Fox  <bfox@nirvana.datawave.net>
+2003-12-30  Alper Ersoy  <dirt@gtk.org>
 
-        * makeinfo/makeinfo.c (make_index_entries_unique): Be a little bit
-	stricter about what makes two index entries identical.
+	* makeinfo/makeinfo.c (add_char): added forgotten html check to
+	in_html_block_level_elt if block.
 
-Fri Dec 29 13:00:24 1995  Brian J. Fox  <bfox@wizard.datawave.net>
+2003-12-30  Alper Ersoy  <dirt@gtk.org>
 
-	* makeinfo/makeinfo.c (Whole File): Add @detailmenu for allowing
-	detailed menu listings to appear while still defaulting nodes.
+	* makeinfo/xml.c:
+	* makeinfo/xml.h: added new element alttext (IMAGEALTTEXT),
+	as a child of image.
 
-Wed Dec 27 13:54:30 1995  Brian Fox  <bfox@albert.gnu.ai.mit.edu>
+	* makeinfo/makeinfo.c (cm_image): moved alttext attribute to the new
+	alttext child in XML output, to keep markup intact.  Moved filename
+	CDATA to name attribute.
 
-	* makeinfo/makeinfo.c (cm_code): Always notice that we are in
-	fixed_width_font, even if other formatting changes are not to take
-	place.
+	* makeinfo/texinfo.dtd: updated image element.
 
-Sat Dec 23 11:48:43 1995  Brian J. Fox  <bfox@wizard.datawave.net>
+2003-12-30  Alper Ersoy  <dirt@gtk.org>
 
-	* info/man.c: (clean_manpage) Remove ^L's from page.
+	* makeinfo/makeinfo.c (cm_image): use HTML entities in alt attribute.
 
-	* makeinfo/makeinfo.c (get_brace_args): Change some memcpy's to
-	memmoves.
+2003-12-28  Alper Ersoy  <dirt@gtk.org>
 
-	* info/info.c (main): Prefer caseless matches over partial
-	matches.
+	* makeinfo/insertion.c (cm_item): do not call close_single_paragraph
+	and use rollback_empty_tag for empty <dd> removal.
 
-	* Makefile.in (All Subdir Targets): Change suggested by Debian
-	people which allows errors in recursive makes to kill the
-	top-level make.
+2003-12-28  Alper Ersoy  <dirt@gtk.org>
 
-	* makeinfo/Makefile.in (makeinfo.dvi): New target.
+	* makeinfo/html.c (rollback_empty_tag): new function.
+	(insert_html_tag): try rollback_empty_tag before closing both
+	tag and old_tag.
 
-	* info/info.c (main): Print version of containing texinfo package.
+2003-12-28  Alper Ersoy  <dirt@gtk.org>
 
-	* makeinfo/makeinfo.c (flush_output): Don't strip high-bit from
-	sentence_enders.
-	Print the version number of the containing texinfo package.
+	* makeinfo/cmds.c (cm_sp): for HTML use <pre>.
 
-	* info/man.c (locate_manpage_xref): Count the 0th entry.
+	* makeinfo/defun.c (defun_internal): do not close paragraph when
+	outputting HTML to avoid empty <p> elements.
+	(process_defun_args): joined duplicate if/else blocks.
 
-	* makeinfo/makeinfo.c (cm_menu): If a menu is seen before a node
-	has been defined, warn, and create the node `Top'.
+	* makeinfo/html.c (insert_html_tag): removed redundant paragraph
+	starting code.
 
-Wed Jun 21 03:19:39 1995  Brian Fox  <bfox@albert.gnu.ai.mit.edu>
+	* makeinfo/insertion.c (begin_insertion): keep state of the first <dt>
+	child of a <dl> in the new html_deflist_has_term variable for ...
+	(cm_item): cleaner <br> insertion checks.  Fixed non-functional empty
+	<dd> rollback code.
 
-	* makeinfo/makeinfo.c (cm_infoinclude): Clean up after printing
-	error if the file couldn't be included.
-	(discard_braces): Print errors only for those unmatched open
-	braces that belong to a texinfo command.
+	* makeinfo/makeinfo.c (add_html_block_elt, add_html_block_elt_args):
+	new functions for inserting block level elements that must not be
+	preceded by a <p> element.
+	(add_char): insert <p> only if in_html_block_level_elt is not true.
 
-	* */Makefile.in: Use @CFLAGS@ and @LDFLAGS@.
+	* makeinfo/cmds.c (cm_comment, cm_center):
+	* makeinfo/footnote.c (output_pending_notes):
+	* makeinfo/html.c (html_output_head):
+	* makeinfo/index.c (cm_printindex):
+	* makeinfo/insertion.c (enum_html, begin_insertion, end_insertion)
+	(handle_verbatim_environment, cm_item):
+	* makeinfo/makeinfo.c (handle_menu_entry):
+	* makeinfo/multi.c (do_multitable):
+	* makeinfo/node.c (cm_node):
+	* makeinfo/sectioning.c (sectioning_html): use add_html_block_elt and
+	add_html_block_elt_args instead of add_word and add_word_args
+	respectively, when inserting <ul>, <div>, <h?> and the like.
 
-	* makeinfo/makeinfo.c: End `node_search_string' and friends with a
-	terminating null character.
+2003-12-25  Karl Berry  <karl@gnu.org>
 
-Wed Jun 21 01:23:49 1995  Jim Meyering (meyering@comco.com)
+	* doc/texinfo.txi (Def Cmd Continuation Lines): new node.
+	* NEWS: mention this new feature.
 
-	* makeinfo/makeinfo.c: Close comment after #endif.
+2003-12-25  Alper Ersoy  <dirt@gtk.org>
 
-Tue Jun 20 04:58:26 1995  Brian Fox  <bfox@albert.gnu.ai.mit.edu>
+	* makeinfo/insertion.c (end_insertion): inhibit paragraph indentation
+	for more cases after example, display and the like environments.
 
-	* emacs/Makefile.in (install): Fix typo: "fle" -> "file".
+	* makeinfo/xml.c (xml_start_para, xml_end_para): made <para> and
+	</para> indentation more newline-aware.
 
-	* Makefile.in (VERSION): Bump to 3.6
+2003-12-25  Alper Ersoy  <dirt@gtk.org>
 
-	* info/clib.c: Include general.h for `info_toupper' and friends.
+	* makeinfo/insertion.c (end_insertion, cm_example, cm_smallexample)
+	(cm_lisp, cm_smalllisp, cm_format, cm_smallformat, cm_display)
+	(cm_smalldisplay): unified whitespaces inside these elements
+	in XML and Docbook output (always one newline at the beginning
+	and one at the end).
 
-	* info/clib.h: strncmp and strncascmp return an int.  What kind of
-	drugs was I on?
+2003-12-25  Alper Ersoy  <dirt@gtk.org>
 
-Mon Jun 19 23:34:47 1995  Brian Fox  <bfox@albert.gnu.ai.mit.edu>
+	* makeinfo/lang.c (cm_accent_generic_no_headers): do not issue
+	warnings when substituting non-ASCII accents with punctuation.
 
-	* makeinfo/makeinfo.c (make_index_entries_unique): Copy the last
-	index entry.
+2003-12-24  Karl Berry  <karl@gnu.org>
 
-Mon Jun 19 21:55:49 1995  Noah Friedman  <friedman@prep.ai.mit.edu>
+	* makeinfo/makeinfo.c (cm_xref): rparen is not allowed after all,
+	confirmed by experimentation (thanks to Luc).
+	* doc/texinfo.txi (ref): remove it from doc.
 
-        * util/texi2dvi (--version): New option.
-        Cosmetic changes.
+2003-12-23  Alper Ersoy  <dirt@gtk.org>
 
-Mon Jun 19 16:06:40 1995  Brian Fox  <bfox@albert.gnu.ai.mit.edu>
+	* makeinfo/makeinfo.c (convert_from_loaded_file): when finished, do
+	not indent body and html closing tags, and do not use comment tags if
+	there is no trailing information.
 
-	* makeinfo/makeinfo.c (cm_macro): Fix typo.  `x != y' is not the
-	same as `x |= y'.
+2003-12-23  Alper Ersoy  <dirt@gtk.org>
 
-	* info/Makefile.in (exec_prefix): Use @exec_prefix@ not $(prefix).
-	* makeinfo/Makefile.in (exec_prefix): Use @exec_prefix@ not $(prefix).
-	* util/Makefile.in (exec_prefix): Use @exec_prefix@ not $(prefix).
-	* libtxi/Makefile.in (exec_prefix): Use @exec_prefix@ not $(prefix).
+	* makeinfo/cmds.c (cm_acronym):
+	* makeinfo/cmds.h: save second arguments of acronym in acronyms_stack
+	and reuse them as title attributes of acronym element of HTML output,
+	when there is only one argument given.
 
-	* emacs/Makefile.in (uninstall): New target.
-	(install): Use the definition of $(lispdir), don't dynamically
-	find it.  Use INSTALL_DATA not cp.
-	(exec_prefix): use @exec_prefix@ not $(prefix).
+2003-12-23  Alper Ersoy  <dirt@gtk.org>
 
-	* makeinfo/makeinfo.c (apply): If there isn't an actual argument
-	for a named argument, default it to "".
+	* makeinfo/makeinfo.c (cm_image): use text_expansion for alt
+	attribute of images.
 
-	* Makefile.in (VERSION): Now at 3.5.
-	(texinfo): Make ./makeinfo/makeinfo depend on sub-all for parallel
-	makes.
+2003-12-23  Alper Ersoy  <dirt@gtk.org>
 
-	* emacs/Makefile.in (ELISP_OBJS): Explictly declare .el and .elc
-	in the SUFFIXES list.
+	* makeinfo/sectioning.c (sectioning_html): do not insert "%s "
+	unconditionally for title enumerations, which causes unnecessary
+	blanks for @unnumbered and @top.
 
-	* makeinfo/makeinfo.c (cm_today): Special case for losing alpha.
-	* (minor_version): Increase to 63.
+2003-12-23  Arnold D. Robbins  <arnold@skeeve.com>
 
-	* info/info.c (version_string): Now at 2.14.
-	* info/tilde.c: Declare getenv to return (char *).
-	* info/window.c (build_message_buffer): Jump through hoops to keep
-	DEC Alpha's happy.
+	* float.h (FLOAT_ELT): New member: `title_used'. Avoids reuse of
+	title inside nested floats.
+	(current_float_used_title, current_float_set_title_used): declared.
 
-	* info/xmalloc.c: Declare malloc and realloc as (void *) returning
+	* float.c (add_new_float): Init `new->title_used' to zero.
+	(current_float_used_title, current_float_set_title_used): new
 	functions.
 
-Sun Jun 18 12:47:21 1995  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* emacs/detexinfo.el (detexinfo-line-cmds-without-arg):
-	Handle ifhtml.
-
-Fri Jun 16 13:48:14 1995  Brian Fox  <bfox@albert.gnu.ai.mit.edu>
-
-	* util/texindex.c: Update TEXINDEX_VERSION_STRING for texinfo 3.4
-
-	* (All *.c *.h *.in): Change FSF old address to new.
-	* texinfo.texi (Obtaining TeX): Change FSF old address to new
-	address.  Change Old phone numbers to new phone numbers.
-
-	* Makefile.in (VERSION): Change to 3.4.
-
-Thu Jun 15 22:49:07 1995  Robert J. Chassell  <bob@hill.gnu.ai.mit.edu>
-
-        * texinfo.texi, emacs/=development/cover.texi: update
-          Texinfo distribution package version number
-
-Thu Jun 15 09:23:02 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* info/info.c: (minor_version): Set to 13.
-
-	* info/clib.c,h: New files gather together replacement functions
-	for those POSIX-style C library functions that are not present on
-	the target system.
-
-	* info/Makefile.in (SRCS): Add clib.c and clib.h.  makedoc now
-	needs clib.o to build on systems missing various string.h stuff.
-
-	* info/variables.c (whole file): Call strdup, not savestring.
-	* info/tilde.c (whole file): Call strdup, not savestring.
-	* info/search.c (whole file): Call strdup, not savestring.
-	* info/nodes.c (whole file): Call strdup, not savestring.
-	* info/nodemenu.c (whole file): Call strdup, not savestring.
-	* info/man.c (whole file): Call strdup, not savestring.
-	* info/makedoc.c (whole file): Call strdup, not savestring.
-	* info/m-x.c (whole file): Call strdup, not savestring.
-	* info/info.c (whole file): Call strdup, not savestring.
-	* info/indices.c (whole file): Call strdup, not savestring.
-	* info/echo_area.c (whole file): Call strdup, not savestring.
-	* info/session.c (whole file): Call strdup, not savestring.
-	* info/filesys.c (whole file): Call strdup, not savestring.
-
-	* makeinfo/makeinfo.c (minor_version): Change to 1.62.
-	* makeinfo/makeinfo.c (get_execution_string): Initialize `i' to 0
-	in case there are no execution_strings.
-
-Wed Jun 14 17:48:06 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* texinfo.texi: include "texinfo.tex", not "texinfo".
-	* info/session.c (forget_window_and_nodes): Place a sequence point
-	in between "info_windows[i] = info_windows[++i];" as per various
-	compiler experts.
-
-	* makeinfo/makeinfo.c (strdup): Create this function if the system
-	doesn't have it.
-	(discard_insertions): Use the insertion's filename, not the
-	current input file.
-	(push_insertion): Remember the current input file with each
-	insertion.
-	(pop_insertion): Free storage used by remembered input file.
-
-	* makeinfo/makeinfo.c (whole file): Use `strdup' instead of
-	`savestring'.
-	* configure.in: Check for `strdup'.
-
-Wed Jun 14 15:58:51 1995  Brian Fox  <bfox@albert.gnu.ai.mit.edu>
-
-        * libtxi/Makefile.in (prefix): Use @prefix@, not /usr/local/
-
-Wed Jun 14 10:50:57 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* Makefile.in (DISTFILES): Don't include *.elc files in the list
-	  of files to distribute.
-	  (installdirs): Include `emacs' in the list of sub-dirs with
-	  Makefile.in's.
-
-	* emacs/elisp-comp: Shell script which batch compiles the *.el files.
-	* emacs/Makefile.in: New file contains targets to build the elc files.
-	* configure.in: Add `emacs/Makefile' to the list of created makefiles.
-	* makeinfo/makeinfo.c (whole file): Give every function a return
-	  type.  All cm_xxx functions are now void.  Add declarations for
-	  functions to top of file.
-
-Mon Jun 12 12:00:57 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* info/man.c (reference_section_starters): Add versions of "SEE
-	ALSO" and "RELATED INFORMATION" with tabs instead of spaces as
-	well.
-
-	* util/texindex.c: Back out changes for OFF_T.  Explicity coerce
-	the result of lseek to a long, and use longs everywhere.
-
-	* texinfo.texi: Change "@end shorttitlepage" to "@end titlepage".
-	* makeinfo/makeinfo.c: Make @shorttitlepage ignore the rest of the
-	line.
-
-	* util/texindex.c (strrchr): Create if not present.
-	Test for HAVE_STRCHR and HAVE_STRING_H.
-	(main): Make PROGRAM_NAME be just the last path componenet of argv[0].
-	(decode_command): Rewrite.
-	(usage): Rewrite.  Now texindex handles --version.
-
-	* makeinfo/makeinfo.c (make_index_entries_unique): Rewrite from
-	scratch.
-
-	* Don't distribute created info files with texinfo.  After all,
-	the user will have the tools necessary to create them, yes?
-
-	* Makefile.in (distclean): Remove *.log
-
-	* info/man.c (read_from_fd): Change timeout value for select to 15
-	seconds.  Some systems (e.g., albert.ai.mit.edu) actually need
-	more than 10 seconds to format a man page.
-
-	* info/tilde.c: Fix typo in declaration for
-	`tilde_expansion_failure_hook'.
-
-Wed Jun  7 13:36:53 1995  Brian Fox  <bfox@albert.gnu.ai.mit.edu>
-
-	* info/tilde.h: Change type of tilde_expansion_failure_hook to
-	a pointer to a function returning a (char *).
-	* info/tilde.c: Change type of tilde_expansion_failure_hook to a
-	pointer to function returning a (char *).
-
-	* makeinfo/makeinfo.c (get_execution_string): Don't use `i' in the
-	latter assignment, use `execution_strings_index' instead.
-
-	* info/man.c (read_from_fd): Change logic to avoid using FIONREAD.
-
-	* info/xmalloc.c (xrealloc): Use (void *), not (caddr_t *).
-	* info/xmalloc.c (xmalloc): Use (void *), not (caddr_t *).
-
-	* Makefile.in (DISTFILES): Don't find RCS no "=" directories.
-
-	* util/Makefile.in (prefix): Use @prefix@ as the value.
-	* info/Makefile.in (prefix): Use @prefix@ as the value.
-	* makeinfo/Makefile.in (prefix): Use @prefix@ as the value.
-
-Wed Jun  7 12:29:28 1995  Robert J. Chassell  <bob@hill.gnu.ai.mit.edu>
-
-        * texinfo.texi: Correct minor typos.
-
-        * emacs/texinfmt.el:  Don't require @shorttitlepage to be inside
-          of @iftex ... @end iftex
-
-Mon May  8 18:33:52 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* info/nodes.c: #include "man.h" if HANDLE_MAN_PAGES.
-	(info_get_node_of_file_buffer): If the file buffer is one
-	associated with manpages, call the manpage node finding
-	function instead.
-	(info_find_file_internal): If the file buffer is one associated
-	with manpages, avoid doing any file I/O.
-	(info_reload_file_buffer_contents): Ditto.
-	(info_find_file_internal): Call create_manpage_file_buffer instead
-	of info_load_file_internal.
-
-	* info/info.c: #include "man.h" if HANDLE_MAN_PAGES.
-	(main): If the initial node cannot be found, perhaps find it as a
-	manpage.
-	* info/info-utils.c: #include "man.h" if HANDLE_MAN_PAGES.
-	(info_xrefs_of_node): If handling man pages, and this is a manpage
-	node, use xrefs_of_manpage.
-
-	* info/session.c (info_set_input_from_file): Only fclose (stream)
-	if it is non-null and not stdin.
-	#include "man.h" if HANDLE_MAN_PAGES.
-	(info_menu_or_ref_item): If handling man pages, and this is a
-	manpage node, get the xrefs from manpage_xrefs_in_binding.
-	(info_man): Compile in for M-x man if handling man pages.
-	(info_move_to_xref): If handling man pages, and the current node
-	is a manpage node, use locate_manpage_xref to get xrefs.
-
-Thu May  4 08:55:23 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* info/info.c (main): If the output device is not a terminal, and
-	no output filename has been specified, make user_output_filename
-	be "-", so that the info is written to stdout, and turn on the
-	dumping of subnodes.
-
-Thu Apr 13 18:05:06 1995  Daniel Hagerty  <hag@churchy.gnu.ai.mit.edu>
-
-	* texinfo.texi: Fixed @end titlepage/@end shorttitlepage
-
-Sat Apr  8 12:51:49 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
-
-	* makeinfo/makeinfo.c [! HAVE_STRERROR] (strerror): New function,
- 	snarfed from ../info/filesys.c.
-	(cm_infoinclude): Use strerror instead of sys_errlist.
-
-Tue Apr  4 18:44:00 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* util/texindex.c (sort_offline): Change TOTAL to be an off_t.
-	* util/texindex.c (sort_in_core): Change TOTAL to be an off_t.
-	* util/texindex.c (MAX_IN_CORE_SORT): Cast to off_t.
-
-Sun Apr  2 16:20:13 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* info/Makefile.in: Define DEFAULT_INFOPATH in case we are
-	compiling in the current directory.
-	* info/Makefile.in (info.o): Add filesys.h because of DEFAULT_INFOPATH.
-	* info/(search.c,h, nodes.c info-utils.c) Use strcasecmp and
-	strncasecmp instead of stricmp and strnicmp.  Define strcasecmp
-	and strncasecmp in search.c if !HAVE_STRCASECMP.
-	* info/search.c: If HAVE_STRING_H include it.
-	* info/nodes.c: If HAVE_STRING_H include it.
-	* info/info-utils.c: If HAVE_STRING_H include it.
-	* info/info.h: If HAVE_STRING_H include it.
-	* configure.in (AC_HAVE_FUNCS): Check for strcasecmp.
-	* makeinfo/makeinfo.c (strcasecmp): Define if !HAVE_STRCASECMP.
-	* makeinfo/makeinfo.c (entire file): Use `strcasecmp' instead of
-	`stricmp'.
-	* makeinfo/makeinfo.c (cm_ifeq): New command takes three args.
-	Compares first two, executes remainder if the first two are
-	string-wise eq.
-	* makeinfo/makeinfo.c (ifhtml): Add to command list.  Shouldn't be
-	used, but it is by people who don't want to hack macros.
-
-Sat Apr  1 09:20:14 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* makeinfo/makeinfo.c (begin_insertion): Fix reversed arguments to
-	line_error.
-
-	* info/info-stnd.texi: Use "end" footnote style instead of "separate".
-
-	* info/Makefile.in: Change "rm -f" to $(RM).
-
-	* info/general.h: Define zero_mem in terms of memset if we have
-	it, else in terms of bzero if we have that, else as inline code.
-
-	* info/NEWS: Updated to reflect changes in 2.11.
-
-Fri Mar 31 22:38:31 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* Makefile (DISTFILES): Don't include *.a, *orig, nor *.e
-	files.
-	(DISTFILES):
-
-Sat Mar  4 12:16:29 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* Makefile.in: Use @prefix@ instead of hardwired `/usr/local'.
-	  Clean up makefile rules which make in subdirs.
-	  (ALL_SUBDIRS): Add makeinfo/macros to list of subdirectories.
-
-	* configure.in (AC_CHECK_FUNCS): Add `bcopy' to list of things to
-	check for.
-
-Fri Mar  3 13:54:10 1995  Robert J. Chassell  <bob@hill.gnu.ai.mit.edu>
-
-        * texinfo.texi: Minor changes for incremental new edition 2.20.
-
-Fri Mar  3 19:01:36 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* filesys.c (filesys_read_info_file): Local variable ST_SIZE is a
-	long which has the value of finfo->st_size casted to it.
-	* nodes.c (whole file): Similar changes.
-
-	These changes and the following for makedoc.c were required for
-	proper operation on HPm68k NetBSD.
-
-Mon Feb 27 15:16:27 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* makedoc.c (process_one_file): Local variable FILE_SIZE is a long
-	which has the value of finfo.st_size casted to it.
-
-
-Fri Mar  3 18:58:38 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* makeinfo.c (find_and_load): Cast fileinfo.st_size to a long for
-	internal use.  This makes things work on NetBSD.
-
-
-Fri Mar  3 13:54:10 1995  Robert J. Chassell  <bob@hill.gnu.ai.mit.edu>
-
-        * texinfo.texi: Minor changes for incremental new edition 2.20.
-
-Fri Mar  3 09:41:39 1995  Brian J. Fox  <bfox@wizard.datawave.net>
-
-	* configure.in (TERMLIBS): Use AC_CHECK_LIB instead of
-	AC_HAVE_LIBRARY.
-
-Mon Jan  9 16:55:31 1995  Brian Fox  <bfox@churchy.gnu.ai.mit.edu>
-
-	* Makefile.in (DISTFILES): Add the directory EMACS-BACKUPS to the
-	list of things to avoid distributing.
-
-Tue Nov 29 17:48:37 1994  David J. MacKenzie  <djm@duality.gnu.ai.mit.edu>
-
-	* configure.in: Check for off_t.
-	* util/texindex.c (main): Use it.
-
-Fri Nov 11 14:46:28 1994  David J. MacKenzie  <djm@duality.gnu.ai.mit.edu>
-
-	* configure.in: Update for Autoconf v2.
-
-Thu Oct 13 02:17:38 1994  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* emacs/detexinfo.el (detexinfo): Handle @!, @?, @^, @".
-
-Mon Aug  1 03:26:13 1994  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texindex.c: Move the memset define down past string.h include.
-
-Tue Jun 28 14:21:43 1994  David J. MacKenzie  (djm@churchy.gnu.ai.mit.edu)
-
-	* makeinfo/makeinfo.c: Add --help option.
-	(usage): Take args for stream and error code.
-	Change callers.
-	(print_version_info): Write to stdout, not stderr.
-
-Wed May 18 18:55:24 1994  Brian J. Fox  (bfox@ai.mit.edu)
-
-	* info/session.c (forget_window_and_nodes): Negate test for
-	internal_info_node_p.  We only want to free the text if it is
-	not an internal node.
-
-Thu Mar 10 03:07:18 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
-
-	* texindex.c (memset): Fix invalid parm name (was 0).
-
-Thu Feb 10 12:56:52 1994  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * makeinfo/makeinfo.c (current_item_function): Don't loop if elt
-        is NULL.
-
-Wed Feb  9 12:21:09 1994  Brian J. Fox  (bfox@ai.mit.edu)
-
-	* makeinfo/makeinfo.c (minor_version): Release now at 1.60.
-
-	* makeinfo/makeinfo.c (expand_filename): Additional fixes.  Now
-	when called with NULL filename, makes an output filename from the
-	input filename.
-	(convert_from_loaded_file): If REQUIRE_SETFILENAME is #defined (no
-	longer the default case) then error if no @setfilename was found
-	in the file.  If REQUIRE_SETFILENAME is not #defined, the input
-	file starts either at the first line, or at the second line if the
-	first line contains the text "\input", and the output filename is
-	the input file name without directory and with ".info" replacing
-	any extension found.
-	(convert_from_loaded_file): Fixed bug in search for first
-	occurence of "@setfilename".
-
-Tue Feb  8 14:16:58 1994  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * configure.in: Check for sys/file.h.
-        info/dir.c, info/filesys.c, info/makedoc.c, info/nodes.c,
-        info/session.c, info/termdep.h, makeinfo/makeinfo.c
-        [HAVE_SYS_FILE_H]: Include <sys/file.h>.
-
-        * makeinfo/makeinfo.c (convert_from_loaded_file): Print
-        real_output_filename instead of output_filename, so user knows
-        exactly where output file is going.
-
-        Fri Jun 11 14:34:30 1993  Ian Lance Taylor  (ian@cygnus.com)
-       	* configure.in: Check for sigprocmask and sigsetmask.
-	* info/signals.h (HAVE_SIGSETMASK): Don't define.
-	(HAVE_SIGPROCMASK): Use instead of _POSIX_VERSION.
-	(BLOCK_SIGNAL, UNBLOCK_SIGNAL): If neither HAVE_SIGPROCMASK nor
-	HAVE_SIGSETMASK is defined, define these to do nothing.
-	* info/signals.c (sigprocmask): Don't compile if HAVE_SIGSETMASK
-	is not defined.
-
-	* info/terminal.c (terminal_prep_terminal): Don't clobber VINTR
-	and VQUIT in conditionals.
-
-Mon Feb  7 18:10:22 1994  Brian J. Fox  (bfox@ai.mit.edu)
-
-	* makeinfo/makeinfo.c (full_pathname): Correct to really return
-	the full pathname of the input argument.  Now makeinfo
-	/foo/bar.texi, where /foo/bar.texi contains "@setfilename
-	bar.info", correctly leaves the output file in "./bar.info".
-	Note that "@setfilename ../bar.info" still works; this is already
-	an absolute pathname.
-
-Sat Feb  5 13:04:05 1994  Brian J. Fox  (bfox@ai.mit.edu)
-
-	* makeinfo/makeinfo.c: Version 1.59 released.
-
-	* makeinfo/makeinfo.c (whole file):  Large number of changes allow
-	the "-E filename" option to be used to write a macro expanded
-	output file.  On a file which contains no @include's and no
-	@macro's, the output file is identical to the input file.
-
-	* makeinfo/makeinfo.c (declarations): Remove cm_tex ().  It is
-	never used since it is implemented with `command_name_condition'.
-
-	* makeinfo/makeinfo.c (add_char): Shift braces following the
-	current break point if we have deleted any characters.
-	(adjust_braces_following): New function adjusts all of the markers
-	in the brace stack which follow HERE by AMOUNT.  This fixes a bug
-	where (for example) @var{} immediately following a line break
-	which is the end of a sentence modified the output incorrectly.
-
-Wed Feb  2 14:14:03 1994  Brian J. Fox  (bfox@ai.mit.edu)
-
-	* makeinfo: Version 1.58.
-
-	* makeinfo/makeinfo.c (cm_node): Add extra hair to allow
-	backtracking through execution strings.  Add extra hair to allow
-	the first node seen after a @top node is seen to adjust the
-	sectioning level of the @top node and associated menus.
-	Fix a few typos.
-	Add facility for macros to invoke the original definition.  This
-	works by not allowing a single macro to recurse.  Mutual recursion
-	is also disallowed with this plan.
-
-	* makeinfo/macros: New directory contains shippable macros.
-	* makeinfo/macros/simpledoc.texi: Macros which simplify the most
-	common uses of TeXinfo.  See the example file.
-	Macros are now a reasonable way to get people started using
-	TeXinfo.
-
-Mon Jan 31 12:54:36 1994  Brian J. Fox  (bfox@ai.mit.edu)
-
-	* makeinfo/makeinfo.c (minor_version): Increase to 57.
-
-	* makeinfo/makeinfo.c (cm_node): Call execute_string on the node,
-	next, prev, and up pointers.
-	(reader_loop): Change logic for `@bye'.  No longer required at the
-	ends of executed strings.
-	(execute_string): Do not append `@bye' to the string to execute.
-
-	* makeinfo/makeinfo.c (whole file): Use COMMAND_PREFIX instead of
-	hardcoding `@' character in strings and searches.
-
-	* makeinfo/makeinfo.c (read_command): If HAVE_MACROS is defined,
-	then recognize and execute macros here.
-	(CommandTable): Add "macro" and "unmacro" to table if HAVE_MACROS
-	is defined.
-
-	* makeinfo/makeinfo.c (cm_macro, cm_unmacro, execute_macro)
-	  makeinfo/makeinfo.c (get_macro_args, find_macro, add_macro)
-	  makeinfo/makeinfo.c (delete_macro, array_len, apply):
-	  New functions implement macro facility if HAVE_MACROS is
-	  defined.
-
-	* makeinfo/macro.texi (new file): Examples of using the new macro
-	facility.
-
-Mon Jan 31 10:24:52 1994  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * makeinfo/makeinfo.c (executing_string): Restore global
-        declaration.
-
-Mon Jan 24 23:48:26 1994  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * texinfo.texi: Various typo fixes from Bob Chassell
-        <bob@gnu.ai.mit.edu>.
-
-Thu Jan  6 13:34:21 1994  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * texinfo.texi: Turned on smallbook format and @set smallbook.
-
-Wed Dec 15 20:08:43 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * info/filesys.h (DEFAULT_INFOPATH): Added /usr/local/info,
-        /opt/gnu/info, /usr/share/info, and /usr/local/share/info.
-
-Tue Dec 14 19:10:20 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * libtxi/Makefile.in (ALLOCA): Define from configure.
-
-Fri Dec 10 04:33:12 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * util/texi2dvi: Put under RCS control.
-
-Sun Dec 26 11:55:46 1993  Brian J. Fox  (bfox@ai.mit.edu)
-
-	* info/session.c (info_numeric_digit_arg_loop): Fix doc string.
-
-	* info/infodoc.c (create_internal_info_help_node): Print out list
-	of functions which have to keystroke equivalent if we support
-	NAMED_FUNCTIONS.
-
-	* info/filesys.c (compress_suffixes): Add ".gz" for "gunzip" to
-	alist.
-
-	* info/footnotes.c (make_footnotes_node): If refs[i] doesn't have
-	a nodename, then it couldn't be a reference to a footnote.
-
-	* info/nodemenu.c (get_visited_nodes): Handle the case where
-	filter_func has left no possible buffers to select.
-
-Sat Dec 25 10:35:56 1993  Brian J. Fox  (bfox@ai.mit.edu)
-
-	* info/infodoc.c (create_internal_info_help_node): Conditionalize
-	generation of the help node based on the #define
-	HELP_NODE_GETS_REGENERATED.  When this is not set (the default)
-	the help node is generated exactly once, and is not gc'able.
-	Otherwise, a new node is always created for the help window, and
-	the old node gets garbage collected by the gc system.
-	(info_find_or_create_help_window): Conditionalize window node
-	selected based on the #define HELP_NODE_GETS_REGENERATED.
-
-	* info/dir.c (add_menu_to_file_buffer): Place exactly one blank
-	line between directory entries.
-
-	* info/info.c (version_string): Update minor version to "11".
-
-	* info/info.h: Update comment to "2.11".
-
-	* info/dir.c (maybe_build_dir_node): Only add the contents of a
-	new file if it is not identical to the file of the DIR buffer.
-
-	* info/nodes.c (info_get_node): Call `maybe_build_dir_node' on
-	"dir" as well as "localdir" to mimic emacs-19.22 "dir" merging
-	behaviour.
-
-Fri Dec  3 13:41:44 1993  Brian J. Fox  (bfox@ai.mit.edu)
-
-	* info/info-utils.c (canonicalize_whitespace): Suppress whitespace
-	found at the start of STRING.
-
-Sat Nov 20 14:00:50 1993  Brian J. Fox  (bfox@hippie)
-
-	* info/indices.c (DECLARE_INFO_COMMAND): Fix typo in assignment to
-	`old_offset' (= instead of ==).
-
-Tue Nov  2 12:22:40 1993  Brian J. Fox  (bfox@ai.mit.edu)
-
-	* makeinfo/makeinfo.c (make_index_entries_unique): New function
-	makes a sorted array have all unique entries by appending numbers
-	to the ends of strings.
-	(sort_index): Call `make_index_entries_unique'.
-
-Mon Sep 20 12:04:05 1993  Brian J. Fox  (bfox@ai.mit.edu)
-
-	* makeinfo/makeinfo.c (get_execution_string): New Function returns
-	a pointer to an  EXECUTION_STRING structure.
-	(execute_string): No longer uses a static string; call
-	`get_execution_string' instead in order to get a free buffer for
-	consing.
-
-Sun May 23 07:00:20 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * Texinfo 3.1 released.
-
-Sat May 22 18:21:27 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * info/info.c (info_patch_level): Increment constant to 1.
-
-        * info/Makefile.in (DEFAULT_INFOPATH): Default definition deleted.
-        Makefile.in: Put it here instead.
-        * Makefile.in (MDEFINES): Add DEFAULT_INFOPATH.
-
-        * configure.in: check for vfprintf and vsprintf.
-
-        * makeinfo/makeinfo.c: Version 1.55.
-
-        * makeinfo/makeinfo.c (add_word_args, execute_string) [HAVE_VARARGS_H]:
-        Don't use this definition unless HAVE_VSPRINTF is also defined.
-        (error, line_error, warning) [HAVE_VARARGS_H]: Don't use this
-        definition unless HAVE_VFPRINTF is also defined.
-        Remove indentation of all cpp directives, except for #pragma.
-
-Fri May 21 14:34:24 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * texinfo.texi: Rename to texi.texi.
-        Change @setfilenname and START-INFO-DIR-ENTRY to `texi.info'.
-
-        * Makefile.in (MDEFINES): Pass LDFLAGS to sub-makes.
-        (realclean): Delete `configure'.
-        Changed all references to texinfo.info to texi.info
-
-        * configure.in: Add AC_PROG_RANLIB, and AC_CONST.
-        Check for `rindex' function.
-        Check for varargs.h.
-        Clean up symbol names for header files so a single AC_HAVE_HEADERS
-        can be used.
-        (AC_INIT): Use texi.texi instead of makeinfo/makeinfo.c
-
-        * info/info-utils.h: Copy definitions of bcopy, index, and rindex
-        (with appropriate #ifdef wrappers) from termdep.h.  These are
-        included by a mutually exclusive set of files.
-
-        * info/termdep.h [HAVE_SYS_PTEM]: Use HAVE_SYS_PTEM_H instead.
-
-        * info/terminal.c, info/termdep.h [HAVE_TERMIO]: Use HAVE_TERMIO_H
-        instead.
-
-        * info/makedoc.c, info/filesys.c [!O_RDONLY]: Include fcntl.h or
-        sys/fnctl.h, depending on whether HAVE_SYS_FCNTL_H is set.
-
-        * info/termdep.h: Remove all indentation in #-exprs.
-        Remove old assumptions about bcopy, index, and rindex.
-        [HAVE_BCOPY]: Define bcopy.
-        [HAVE_RINDEX]: Define index and rindex.
-
-        * info/nodes.c (info_get_node): Don't call stricmp if nodename is
-        NULL. Remove indentation in #-exprs.
-
-        * info/echo_area.c (echo_area_stack_depth): Declare static.
-
-        * info/Makefile.in (DEFAULT_INFOPATH): Make separate Makefile
-        variable so it can be overridden more easily by the user.  Add `.'
-        to beginning of path.
-        (clean): Delete core.* (386bsd core files).
-        (MAKEDOC): Variable removed.  Refer to `makedoc' explicitly.
-        (funs.h): Add `:' commands after if, to avoid spurious nonzero
-        exit statuses.
-
-        * info/userdoc.texi: Improved comments explaining its purpose.
-
-        * makeinfo/makeinfo.c [HAVE_VARARGS_H]: Include varargs.h.
-        (error, line_error, warning, add_word_args,
-          execute_string)[HAVE_VARARGS_H]: New versions that
-        use varargs.  From bfox.
-
-        * makeinfo/Makefile.in (clean): Delete core.* (386bsd core files).
-
-        * util/Makefile.in (clean): Remove core.* (386bsd core files).
-
-        * libtxi/Makefile.in: Remove all references to $(common).
-        (RANLIB): New variable, set from autoconf.
-        (libtxi.a): Use $(RANLIB) instead of `ranlib' in target rules.
-        (clean): Delete core.* (386bsd core files).
-
-Tue May 18 12:08:24 1993  Robert J. Chassell (bob at grackle.stockbridge.ma.us)
-
-        * emacs/texinfmt.el (texinfo-format-refill): Do not fill a section
-        title line with the asterisks, hyphens, etc. that underline
-        it in any circumstance.
-
-Sun May 16 13:53:43 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * util/mkinstalldirs: handle relative pathnames.
-
-Fri May 14 20:18:49 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * util/mkinstalldirs: initialize IFS if unset.
-
-Tue May 11 06:33:14 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * makeinfo/makeinfo.c (cm_item): don't dereference item_func if NULL.
-
-Mon May 10 14:50:31 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * Texinfo 3.0 released.
-
-        * Makefile.in (ALLOCA): Provide for substitution.
-
-Mon May 10 10:12:53 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * emacs/texinfmt.el (texinfmt-version): Updated year.
-
-Fri Apr 16 04:48:03 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * makeinfo/makeinfo.c: Version 1.54 from bfox.
-
-        * util/fixfonts: Replace instances of `[..]' with `test'.
-        Use more portable `test' arguments: `z$foo = z' instead of `! $foo'.
-        Robustify quoting in eval assignments.
-        (textfmdir, texpkdir, texgfdir): Don't override definition from
-        environment, if any.
-        Trap EXIT, SIGHUP, SIGINT, SIGQUIT, SIGTERM to delete temp files
-        instead of trying to remove them explicitly before calling exit.
-        When changing cwd, do so in subshell, in case various tex*dir
-        variables are relative.
-        Don't use `head', `dirname', or `basename'.  These don't behave
-        consistently and/or don't even exist on some systems.  They can
-        all be emulated with `sed' anyway.
-        (tempfile2_line1): New variable.  Use it instead of running
-        process to extract first line out of tempfile2 multiple times.
-        Eliminate some gratuitous uses of $tempfile2, such as in for loops.
-
-Fri Mar 26 23:25:13 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * texinfo.texi: @setfilename texinfo.info.
-
-        * makeinfo/makeinfo.c (reader_loop, end_insertion): Fix typos in
-        comments.
-        (handle_variable_internal): Handle the case that there further
-        menu text after a false ifset/ifclear.
-
-        * util/texi2dvi: Version 0.4
-        Replace all instances of `[ ... ]' with `test'.
-        Updated bug-reporting address.
-
-Thu Mar 25 12:31:30 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * info/Makefile.in (install): Install info.1 man page.
-        (uninstall): Remove installed info.1 man page.
-
-        * info/infoman.texi: Standalone manual renamed to info-stnd.texi.
-        Makefile.in: Targets updated appropriately.
-
-        * info/Makefile.in (LDEFS): New variable.  Use it for info-local
-        macros, since DEFS will be inherited from parent make and any
-        local definitions will get clobbered.
-
-        * info/RELEASE: Renamed to info/NEWS.
-
-        * README: New file.
-
-        * Makefile.in (topclean): New target.
-
-        * Getting-started: Renamed to INTRODUCTION.  Former name is too
-          long (over 14 chars).
-
-        * New-features: Renamed to NEWS.
-
-        * Makefile.in (MDEFINES): Set it.
-
-        * Makefile.in (dist): Use --gzip option to tar to make sure
-          resulting file is compressed with gzip.  Change tar file
-          extension from `.Z' to `.z'.
-
-        * Makefile.in (DISTFILES): Filter out any file or directory names
-          starting with `='.
-
-        * fixfonts: Moved to util/fixfonts.
-
-        * RELEASE: Deleted.
-
-        * makeinfo/Makefile.in (VPATH): Use $(srcdir), not @srcdir@.
-        (common): Use ../libtxi, not ../common.
-        (makeinfo.in): Run makeinfo with --no-split.
-
-        * makeinfo/makeinfo.texi: Changes from bob.
-
-        * util/Makefile.in (VPATH): Use $(srcdir), not @srcdir@.
-        (common): Use ../libtxi, not ../common.
-
-        * util/fixfonts: Moved from top-level directory.
-
-Wed Mar 24 10:21:31 1993  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfmt.el (texinfo-format-region): Do not require
-        `@setfilename' line; delete `\input texinfo' line if part of
-        region.
-
-        * emacs/texinfmt.el (texinfo-raise-lower-sections): Raise or lower the
-        hierarchical level of chapters, sections, etc. according to
-        `@raisesections' and `@lowersections' commands.
-
-Thu Mar 18 16:02:27 1993  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfo.el (texinfo-show-structure): Indent *Occur* buffer
-        according to the structure of the file.
-
-Sat Mar  6 05:16:44 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * util/texi2dvi: use ${1+"$@"}, not just "$@".
-
-Tue Feb  2 08:38:06 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * info/Makefile.in: Replace all "--nosplit" arguments to makeinfo
-        with "--no-split"
-
-Sun Jan 31 18:16:58 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * util/texi2dvi: Don't put .dvi and related auxillary files in same
-        directory as source files.  Put them in current directory instead.
-        (TEXINPUTS_orig): New variable.
-        (file_texi): Variable removed.
-        (filename_texi): New variable.
-        (command_line_filename): Use this wherever references to file_texi
-        occured except in setting filename_noext.
-        (TEXINPUTS): Current directory and source directory where input
-        file resides prepended to standard path before invoking TeX.
-
-Wed Jan 27 16:24:37 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * util/Makefile.in: overhauled.
-
-Tue Jan 26 21:04:23 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * Makefile.in, info/Makefile.in, makeinfo/Makefile.in: Overhauled.
-
-        * configure.in: Renamed from texinfo.in.
-          Incorporated makeinfo/makeinfo.in, info/info.in, and
-          util/util.in.  Create all child Makefiles.
-
-        * makeinfo/makeinfo.in, info/info.in: Deleted (incorporated into
-        top configure.in).
-
-        * util/util.in: Deleted (incorporated into ../configure.in).
-
-Mon Jan 25 10:59:49 1993  Brian Fox  (bfox@cubit)
-
-        * info/info.c: New version 2.9; new variable INFO_PATCH_LEVEL
-        appears in the version string if it is non-zero.  New function
-        version_string () produces the current version string, as in 2.8-p1.
-
-        * info/dir.c: New file implements Gillespies `localdir' hacks.
-
-        * info/nodes.c (info_get_node): Now calls maybe_build_dir_node ()
-        if the file name to look for is "dir".
-
-        * info/nodes.h: New flag N_CannotGC unconditionally prevents garbage
-        collection of a file buffer's contents.  Used when "dir" is made
-        from at least one "localdir".
-
-Fri Jan 22 11:36:42 1993  Brian Fox  (bfox@cubit)
-
-        * info/footnotes.c: Do not declare auto_footnotes_p as "extern" in
-        this file.
-
-Thu Jan 21 08:57:08 1993  Brian Fox  (bfox@cubit)
-
-        * info/info.c: New version 2.8.
-
-        * info/userdoc.texi, info/infoman.texi, info/info.texi: Fully
-        document Info; create both online and printed manual versions.
-        "userdoc.texi" contains exactly the documentation for GNU Info 2.x.
-        "infoman.texi" is a wrapper for that file; it is meant to produce
-        printed documentation. "info.texi" has the user documentation as a
-        complete chapter within itself, but continues to contain the Info
-        tutorial.
-
-        * info/makedoc.c: Convert "ea_" into "echo_area_" when creating the
-        command name.
-
-Fri Jan 15 16:50:35 1993  Brian Fox  (bfox@cubit)
-
-        * info/search.c (skip_node_characters): New argument NEWLINES_OKAY if
-        non-zero says that newlines should be skipped over during parsing.
-
-        * info/info-utils.c (info_parse_node): New argument NEWLINES_OKAY if
-        non-zero says that newlines should be skipped while parsing out
-        the nodename specification.
-
-Wed Jan 13 14:42:33 1993  Brian Fox  (bfox@cubit)
-
-        * info/makedoc.c: Remove "info_" from the front of the command name
-        before installing it.
-
-        * info/session.c (info_menu_or_ref_item): A label of "Menu" is okay if
-        the builder is not info_menu_of_node ();
-
-        * info/m-x.c: New function replace_in_documentation () replaces \\[foo]
-        with the keystrokes you type to get that command.  Now used in
-        indices.c, info.c, infodoc.c.
-
-Mon Jan 11 10:27:41 1993  Brian Fox  (bfox@cubit)
-
-        * info/variables.c, h: New files contain describe-variable and stuff
-        moved out of m-x.c.
-
-        * info/m-x.c: Move VARIABLE_ALIST and variable functions into
-        variables.c.  Add documentation string to variable definition.
-
-        * info/echo_area.c (push_echo_area): Zero the contents of
-        echo_area_completion_items after pushing the vars.
-
-Sat Jan  9 11:59:47 1993  Brian Fox  (bfox@cubit)
-
-        * info/Makefile.in: Add footnotes.c,h,o to the appropriate Makefile
-        variables.
-
-        * info/window.c (window_tile_windows): New function divides the
-        available space among the visible windows.
-
-        * info/session.c (info_tile_windows): New function calls
-        window_tile_windows.
-
-        * info/footnotes.c, footnotes.h: New file implements functions for
-        aiding automatic footnote display when entering a node which has
-        footnotes.
-
-        * info/m-x.c: New user-variable "automatic-footnotes".
-
-        * info/window.c (window_physical_lines) New function counts the
-        carriage returns found in NODE.
-
-Wed Jan  6 11:24:19 1993  Brian Fox  (bfox@cubit)
-
-        * info/general.h: #include <unistd.h> if we have it.
-
-Tue Jan  5 11:12:33 1993  Brian Fox  (bfox@cubit)
-
-        * info/info-utils.c (info_concatenate_references): If either arg is
-        NULL, return the other arg.
-
-        * info/indices.c (info_indices_of_file_buffer): Simplified and
-        corrected loop through tags/nodes of file buffer looking for
-        indices.
-
-        * info/search.c (skip_node_characters): Rewrite "if" statement for
-        clarification and conciseness.
-
-Fri Jan  1 03:18:26 1993  Brian Fox  (bfox@cubit)
-
-        * info/info.in: Check for setvbuf (), and check to see whether the args
-        are reversed.
-
-        * info/dribble.c (open_dribble_file) Check HAVE_SETVBUF and
-        SETVBUF_REVERSED when setting the buffering on info_dribble_file.
-
-Thu Dec 31 20:14:13 1992  Brian Fox  (bfox@cubit)
-
-        * info/session.c (info_select_reference) If the node couldn't be found,
-        look for the label as a filename (i.e., "(LABEL)Top").
-
-Wed Dec 30 01:57:50 1992  Brian Fox  (bfox@cubit)
-
-        * New Version 2.7 Beta.
-
-        * info/echo_area.c: Numerous functions now do something with the
-        numeric argument.  Kill ring implemented, as well as yank and
-        yank_pop.  Also transpose-chars.
-
-        * info/window.c (window_make_modeline): Check node->flags for
-        N_IsCompressed and display "zz" in the modeline if the node comes
-        from a file which is compressed on disk.
-
-Mon Dec 28 17:33:12 1992  Brian Fox  (bfox@cubit)
-
-        * info/filesys.c, info/nodes.c: New member of FILE_BUFFER "FILESIZE"
-        contains the size of file_buffer->contents.  finfo.st_size is no
-        longer relied upon to read the contents of files, since the new
-        function (filesys_read_info_file) can read compressed files.
-
-        * info/filesys.c (info_find_fullpath) If a file starts with a slash (or
-        tilde expansion causes it to start with a slash) still call
-        info_find_file_in_path () on it so that we can find files with
-        compression suffixes.
-
-        * info/m-x.c: New variable "gc-compressed-files".
-
-Tue Dec 22 03:45:28 1992  Brian Fox  (bfox@cubit)
-
-        * info/info.c: Version 2.6 Beta.
-
-        * info/indices.c (info_index_next): Improve the final search for the
-        matched index entry.
-
-        * info/session.c (move_to_screen_line): New function implements `M-r'.
-        Given a numeric argument, move point to the start of that line in
-        the current window; without an arg, move to the center line.
-        * infomap.c: Put move_to_screen_line () on `M-r'.
-
-        * info/nodes.c (adjust_nodestart): Don't set N_UpdateTags unless the
-        node came from a tags table.
-
-        * info/nodes.c (info_find_file_internal): If the filename being looked
-        for doesn't start with a `/', then additionally compare the
-        filename against the fullpath of the file buffer sans the
-        directory name.  This can happen when selecting nodemenu items.
-
-Mon Dec 21 10:07:18 1992  Brian Fox  (bfox@cubit)
-
-        * info/session.c, info/display.c: Remove all references to
-        active_window_ch, active_window_cv, cursor_h, and cursor_v.  The
-        single function display_cursor_at_point () is used for all cursor
-        movement, and to place the terminal's cursor at the right location
-        on the screen.
-
-Sat Dec 19 12:01:33 1992  Brian Fox  (bfox@cubit)
-
-        * info/nodemenu.c: New file implements a few functions for manipulating
-        previously visited nodes.  `list-visited-nodes' produces a menu of
-        the nodes that could be reached by info_history_node () in some
-        window.  `select-visited-node' is similar to `list-visited-node'
-        followed by `info-menu-item', but doesn't display a window with
-        the visited nodes menu.
-
-        * info/session.c (info_numeric_arg_digit_loop): If redisplay had been
-        interrupted, then redisplay all of the windows while waiting for
-        input.
-
-        * info/display.c (display_was_interrupted_p): New variable keeps track
-        of interrupted display.  Used in
-        info/session.c:info_numeric_arg_digit_loop ().
-
-        * info/session.c (info_global_next, info_global_prev): Use the numeric
-        argument passed to determine how many nodes to move.
-
-        * info/session.c (info_scroll_forward, info_scroll_backward): If the
-        invoking key is not SPC or DEL only do Page Only scrolling.
-
-Thu Dec 17 01:34:22 1992  Brian Fox  (bfox@cubit)
-
-        * info/display.c (display_update_one_window): Allow W_NoWrap to affect
-        window display.
-
-        * info/window.c (calculate_line_starts): Now takes a WINDOW * as an
-        argument, and simply does the calculation, placing the results
-        into window->line_starts and window->line_count.  It also handles
-        W_NoWrap in window->flags.
-
-Mon Dec 14 02:18:55 1992  Brian Fox  (bfox@cubit)
-
-        * info/session.c (info_backward_scroll): Don't try to get previous node
-        if the top of the node isn't currently being displayed.
-
-        * info/window.c (window_adjust_pagetop) Use new variable
-        "window_scroll_step" to attempt to control the amount which the
-        window scrolls.
-
-        * info/m-x.c (info_variables) Add "scroll-step" to the list.
-
-Thu Dec 10 08:52:10 1992  Brian Fox  (bfox@cubit)
-
-        * info/m-x.c: New variable entry show-index-matches.  When set to
-        non-zero the matched portion of the search string is indicated
-        with ` and '.  Perhaps I should use `|' inst|ea|d?
-
-        * info/echo_area.c (ea_possible_completions): Always build completions
-        before checking to see how many there were.
-
-        * info/info-utils.c: (info_concatenate_references): New utility
-        function concatenates references.
-
-        * info/Makefile.in: Add indices.c and indices.h to SRCS and HDRS.
-          Add indices.c to CMDFILES.
-
-        * info/indices.c, info/indices.h: New file implements `i' and `,'
-        commands of info, and provides index searching capabilities.
-
-        * info/echo_area.c (info_read_completing_in_echo_area):  Split off into
-        separate callable function info_read_completing_internal ().
-
-        * info/echo_area.c (info_read_maybe_completing): New function calls
-        info_read_completing_internal () with non-forcing argument.
-
-        * info/session.c: Rename down_next_upnext_or_error () and
-        prev_up_or_error () to forward_move_node_structure (), and
-        backward_move_node_structure ().  Implement new commands
-        info_global_next () and info_global_prev ().
-
-        * info/infomap.c (initialize_info_keymaps): Bind `[' and `]' to
-        backward_, forward_move_node_structure () respectively.
-
-        * info/session.c (info_menu_digit): Called with "0" as arg, select the
-        last menu item.
-
-        * info/infomap.c (initialize_info_keymaps): "0" calls
-        info_menu_digit ().
-
-        * info/session.c (info_move_to_xref): Take dir into account when there
-        are xrefs and menu items in the node and we are wrapping
-        backwards.
-
-Tue Dec  8 09:57:58 1992  Brian Fox  (bfox@cubit)
-
-        * info/info.c: Version 2.5 Beta.
-
-        * info/terminal.c (terminal_insert_lines, terminal_delete_lines) Do not
-        expect tgoto to return a new string; it returns the address of a
-        static buffer.
-
-        * info/infodoc.c (info_find_or_create_help_window) Correct check for
-        prior existing help node.
-
-        * info/m-x.c (set_variable): Allow variables to have a list of choices.
-        Add new variable scroll-behaviour.
-
-        * info/session.c (down_next_upnext_or_error, prev_up_or_error) New
-        functions implement user-controlled behaviour when attempting to
-        scroll past the bottom or top of a node.  New variable
-        info_scroll_behaviour is user visible as "scroll-behaviour".
-
-        * info/session.c (info_scroll_forward, info_scroll_backward) Call new
-        functions for user-controlled scroll behaviour.
-
-        * info/terminal.c (terminal_initialize_terminal) Set PC from BC not
-        from BUFFER.
-
-Mon Dec  7 11:26:12 1992  Brian Fox  (bfox@cubit)
-
-        * util/texindex.c: Change EXIT_SUCCESS and EXIT_FATAL to TI_NO_ERROR
-        and TI_FATAL_ERROR respectively.  This avoids namespace conflicts
-        on NeXT 2.0.
-
-Sat Dec  5 00:07:59 1992  Brian Fox  (bfox@cubit)
-
-        * info/info.c: New option "--subnodes" says to recursively dump the
-        menus of the nodes that you wish to dump.  Menu items which point
-        to external nodes are not dumped, and no node is dumped twice.
-
-Thu Dec  3 16:11:02 1992  Brian Fox  (bfox@cubit)
-
-        * info/session.c (info_error) Don't ring the bell if
-        info_error_rings_bell_p is zero.  (info_abort_key) Ring the bell
-        if printing "Quit" in the echo area wouldn't do it.
-
-        * info/m-x.c (set_variable) New functions allows setting of
-        variables in the echo area.  Currently, only visilble-bell and
-        errors-ring-bell are implemented.
-
-Wed Dec  2 13:11:37 1992  Brian Fox  (bfox@cubit)
-
-        * info/nodes.c, info/makedoc.c: If O_RDONLY is not defined by
-        sys/file.h, include sys/fcntl.h.
-
-        * info/filesys.c (info_file_in_path): Expand leading tildes found
-        within directory names.
-
-        * info/terminal.c (terminal_initialize_terminal) Set ospeed to 13 if
-        not settable any other way.  It is an index into an array of
-        output speeds.
-
-        * info/display.c (free_display) Do not free a NULL display.
-
-        * info/display.c (string_width): New functions returns the width of
-        STRING when printed at HPOS.
-
-Sun Nov 29 01:24:42 1992  Brian Fox  (bfox@cubit)
-
-        * info/info.c: New version 2.4 beta.
-
-        * info/general.h: #define info_toupper and info_tolower which check
-        their arguments before performing any conversion.
-
-        * info/search.c, info/echo_area.c: Use info_toupper.
-
-Sat Nov 28 14:23:24 1992  Brian Fox  (bfox@cubit)
-
-        * info/session.c (info_scroll_forward, info_scroll_backward) If at
-        last/first page of the node, and the last command was
-        forward/backward, do info_next/prev/_node.
-
-        * info/session.c: New function info_select_reference_this_line gets
-        menu or cross reference immediately.
-
-        * info/infomap.c (initialize_info_keymaps): Add info_keymap[LFD] to
-        invoke info_select_reference_this_line ().
-
-        * info/session.c (info_last_reference) Rename to
-        info_history_reference.  Wrote info_last_reference, and
-        info_first_reference which go to the last or first node of an info
-        file.
-
-Fri Nov 27 00:59:02 1992  Brian Fox  (bfox@cubit)
-
-        * info/info.c: New version 2.3.  Completed implementing contents of
-        TODO file.
-
-        * info/session.c (info_redraw_display): Fix C-l with numeric arg.
-
-Thu Nov 26 20:14:18 1992  Brian Fox  (bfox@cubit)
-
-        * info/m-x.c: New file implements reading named commands in the echo
-        area, along with a new function "info-set-screen-height".
-        Compilation of this file and some code in others controlled by the
-        Makefile variable NAMED_COMMANDS (set to -DNAMED_COMMANDS).
-
-        * info/window.c (window_new_screen_size) Rewrite from scratch, allowing
-        clean growth and shrinkage of the screen.  New variable
-        window_deletion_notifier is a pointer to a function to call when
-        the screen changes size, and some windows have to get deleted.
-        The function is called with the window to be deleted as an
-        argument, and it should clean up dangling references to that
-        window.
-
-        * info/session.c (initialize_info_session): Set
-        window_deletion_function to forget_window_and_nodes.
-
-        * info/display.c (display_update_one_window): If the first row of the
-        window to display wouldn't appear in the_screen, don't try to
-        display it.  This happens when the screen has been made
-        unreasonably small, and we attempt to display the echo area.
-
-Tue Nov 24 00:47:20 1992  Brian Fox  (bfox@cubit)
-
-        * Release Info 2.2.
-
-        * info/session.c: New functions implement reading typeahead and
-        implement C-g flushing typed ahead characters.
-        (info_search_internal): allows C-g to exit multi-file searches.
-
-Mon Nov 23 01:53:35 1992  Brian Fox  (bfox@cubit)
-
-        * info/nodes.c: Remove calls to sscanf (), replacing them with calls to
-        atol (), since that is much faster.
-        (get_nodes_of_tags_table) Only check for "(Indirect)" if we
-        haven't parsed any nodes out of the tags table.  Increase the
-        amount that file_buffer->nodes grows to 100 from 50.  These two
-        together sufficiently speed up the parsing process.
-
-        * info/nodes.c: info_get_node_of_file_buffer_tags (),
-        info_get_node_of_file_buffer_nodes (): Search the appropriate list
-        and return a node.  This was simply a cut and paste edit to
-        functionalize the code.
-
-        * info/TODO: Remove suggestion for partial tag parsing, since tag
-        parsing is much faster now.
-
-Sat Nov 21 02:48:23 1992  Brian Fox  (bfox@cubit)
-
-        * info/makedoc.c: New File replaces makedoc.sh shell script.
-
-        * info/infomap.c: Install info_isearch (on C-s) and
-        info_reverse_isearch (on C-r) for Info windows.
-
-        * info/session.c (incremental_search, info_isearch,
-        info_reverse_isearch) New functions implement incremental
-        searching.
-
-Fri Nov 20 00:01:35 1992  Brian Fox  (bfox@cubit)
-
-        * info/terminal.c (terminal_initialize_terminal): Declare and set up
-        `ospeed'.  Turn off C-s and C-q processing.
-
-        * info/session.c (info_show_point) When this function is called, the
-        desired result is to show the point immediately.  So now it calls
-        set_window_pagetop () if the new pagetop is not the same as the
-        old one.  This means that info_prev_line (), info_next_line (),
-        info_forward_word (), and info_backward_word () can all scroll the
-        window if they have to.
-
-Thu Nov 19 12:27:07 1992  Brian Fox  (bfox@cubit)
-
-        * info/session.c (set_window_pagetop): Add scrolling to make this
-        faster.
-
-        * info/echo_area.c (push/pop_echo_area): Remember the list of items to
-        complete over.
-
-        * info/session.c (info_forward_char): Don't let point get equal to
-        nodelen, only to nodelen - 1.
-
-        * info/display.c: New function display_scroll_display () scrolls the
-        rmembered display as well as the text on the actual display.
-
-        * info/terminal.c: New functions terminal_scroll_terminal (),
-        terminal_scroll_down (), and terminal_scroll_up ().  All
-        implemented using "al" and "dl" termcap capabilities. (i.e.,
-        insert and delete line).
-
-Wed Nov 18 15:05:14 1992  Brian Fox  (bfox@cubit)
-
-        * info/termdep.h: Only define HAVE_FCNTL_H if !aix and !ultrix.
-
-Tue Nov 17 20:35:08 1992  Brian Fox  (bfox@cubit)
-
-        * First Beta Release of Info 2.0.
-
-Sun Nov  1 02:21:05 1992  Noah Friedman  (friedman@prep.ai.mit.edu)
+	* xml.c (xml_begin_docbook_float): Make use of new functions to
+	avoid omitting title, tag, id if have already done so inside
+	nested float.
 
-        * util/texi2dvi (--force): Option removed.  Always run tex at least
-        once, don't bother checking if .dvi file is newer than source.
+2003-12-22  Karl Berry  <karl@gnu.org>
 
-Fri Oct 30 02:16:28 1992  Noah Friedman  (friedman@prep.ai.mit.edu)
+	* makeinfo/makeinfo.c (cm_xref): warn if character after @ref does
+		not produce a valid Info ref.
+	(cm_ref): call cm_xref in both START and END cases.
+	* doc/texinfo.txi (ref): make the second example being a "wrong"
+	        one explicit (report from Luc), and mention the warning.
 
-        * util/texi2dvi (-D): debugging option renamed from '-d'.
-        Made check to enable debugging more terse.
-        When checking if index files have changed, use
-        variable $this_file instead of $file in for loop.
-        (file_texi): wherever the variable $file was used to reference
-        the texinfo file, substituted $file_texi.
+2003-12-21  Karl Berry  <karl@gnu.org>
 
-Sat Oct 17 07:30:34 1992  Brian J. Fox  (bfox@helios)
+	* doc/texinfo.tex (\comma): new command.
+	* makeinfo/cmds.c (cm_comma): new fn.
+	(command_table): use it for @comma.
+	* doc/texinfo.txi (Atsign Braces Comma): Rename node.
+	(Inserting a Comma): new node.
+	(@@-Command Summary): include it here.
 
-        * util/texindex.c: Remove references to USG replacing them with a
-        define declaring the actual feature required or missing.
+2003-12-20  gettextize  <bug-gnu-gettext@gnu.org>
 
-Thu Oct 15 16:17:47 1992  Robert J. Chassell  (bob@nutrimat.gnu.ai.mit.edu)
+	* configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.13.1.
 
-        * emacs/texinfmt.el (texinfo-format-setfilename): Remove date from
-        Info file header so regression testing is easier.
+2003-12-19  Karl Berry  <karl@gnu.org>
 
-Tue Sep 15 16:28:35 1992  Robert J. Chassell  (bob at grackle)
+	* doc/texinfo.tex (\ordf, \ordm): use \lllsize instead of \lsize.
+	Advice from Steve Peter.
 
-        * emacs/texinfmt.el (texinfmt-version): New variable.
-        (texinfo-format-setfilename): Include date and
-        version in Info file header.
-        Better documentation for @definfoenclose
-        Handle whitespace after @end iftex, etc.
+	* doc/texinfo.txi (Printing Indices & Menus): typo, @@index ->
+		@@vindex.  From Luc.
 
-Thu Sep  3 09:25:37 1992  Robert J. Chassell  (bob at grackle)
+2003-12-19  Alper Ersoy  <dirt@gtk.org>
 
-        * emacs/texnfo-upd.el: Fix typo re `texinfo-sequential-node-update.'
+	* makeinfo/cmds.c (cm_acronym): read and make use of second argument
+	like texinfo.tex does.
 
-Tue Aug 18 08:56:24 1992  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfmt.el (texinfo-value): Revise syntax.
-
-        * emacs/texnfo-upd.el (texinfo-start-menu-description):
-        New function to insert title as description in a menu.
-        (texinfo-make-menu-list): Remove automatic title insertion.
-
-        * emacs/texinfo.el (texinfo-mode-map): Add keybinding for
-        texinfo-start-menu-description.
-
-Wed Jul 29 11:58:53 1992  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfmt.el (texinfo-set): Revise to set a string to the flag.
-        (texinfo-value): @value{flag}: New command which inserts the
-        string to which the flag is set.
-
-Tue Jul  7 15:10:52 1992  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texnfo-upd.el (texinfo-master-menu): Error message if file
-        contains too few nodes for a master menu.
-        (texinfo-insert-master-menu-list): Only attempt to insert detailed
-        master menu if there is one.
-
-Wed Jun 10 15:26:18 1992  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfmt.el (texinfo-append-refill): Refill properly when lines
-        begin with within-paragraph @-commands.
-
-Tue Jun  9 12:28:11 1992  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfmt.el: Add `texinfo-deffn-formatting-property' and
-        `texinfo-defun-indexing-property' to @deffn commands.
-
-Mon Jun  8 11:52:01 1992  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texnfo-upd.el: Replace `(mark-whole-buffer)' with
-        `(push-mark (point-max) t) (goto-char (point-min))'
-        to avoid `Mark set' messages.
-
-Fri Jun  5 15:15:16 1992  Robert J. Chassell  (bob@kropotkin.gnu.ai.mit.edu)
-
-        * emacs/texnfo-upd.el (texinfo-check-for-node-name): Offer section
-        title as prompt.
-        (texinfo-copy-next-section-title): Copy title correctly.
-
-Thu May 28 20:34:17 1992  Robert J. Chassell  (bob@hill.gnu.ai.mit.edu)
-
-        * emacs/texinfmt.el: @vtable defined, parallel to @ftable, for
-        variables.
-        (texinfo-append-refill): set case-fold-search nil so @TeX is not
-        confused with @tex.
-
-Thu Mar 26 21:36:41 1992  Robert J. Chassell  (bob@kropotkin.gnu.ai.mit.edu)
-
-        * emacs/makeinfo.el: Rename temp buffer from `*Makeinfo*' back to
-        `*compilation*' so `next-error' works; unfortunately,
-        `*compilation*' is written into the code as the name
-        `next-error' needs.
-        Rename `makeinfo-recenter-makeinfo-buffer' back to
-        `makeinfo-recenter-makeinfo-buffer'
-
-Thu May 14 21:14:25 1992  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * util/fixfonts: Enclosed most variable references with "" to prevent
-        potential globbing and other weirdness.  Eliminated uses of
-        ${var-value}, which unfortunately isn't portable.
-
-        * util/texi2dvi: rewritten from scratch.
-
-Sat Apr 18 23:46:25 1992  Charles Hannum  (mycroft@hal.gnu.ai.mit.edu)
-
-        * util/fixfonts: Re-evaluate prefix and libdir if inherited (to resolve
-        variable references from make).
-        (texlibdir): Don't add '/tex', since it's already there.
-
-Fri Apr 10 14:51:23 1992  Noah Friedman  (friedman@prep.ai.mit.edu)
-
-        * util/fixfonts: set prefix and libdir only if they are not already
-        defined (i.e. not inherited from the environment).
-        Changed default path for libdir to be consistent with Makefile.
-
-Tue Mar  3 13:17:42 1992  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texnfo-upd.el (texinfo-insert-master-menu-list): Insert a
-        master menu only after `Top' node and before next node.
-        (texinfo-copy-menu): Error message if menu empty.
-
-Mon Feb 24 15:47:49 1992  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfmt.el (texinfo-format-region): Make sure region ends in a
-        newline.
-        (texinfo-itemize-item): Recognize all non-whitespace on same line
-        as @item command.
-
-Sat Feb 22 02:15:00 1992  Brian Fox  (bfox at gnuwest.fsf.org)
-
-        * util/texindex.c: New version 1.45 has cleanups, should compile under
-        VMS quietly.
-
-Wed Feb 12 10:50:51 1992  Robert J. Chassell  (bob at grackle)
-
-        * emacs/makeinfo.el: Rename temp buffer as *Makeinfo*.
-        Rename `makeinfo-recenter-compilation-buffer'.
-        (makeinfo-buffer): Offer to save buffer if it is modified.
-        (makeinfo-compile): Do not offer to save other buffers.
-        (makeinfo-compilation-sentinel): Switch to Info file.
-
-Tue Feb  4 13:07:39 1992  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfmt.el (texinfo-print-index): Format so that node names in
-        the index are lined up.
-
-Mon Feb  3 09:08:14 1992  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfmt.el (texinfo-itemize-item): Format entry when text
-        is on the same line as @item command.  Also, handle @-commands.
-        (texinfo-format-region, texinfo-format-buffer-1): Set fill column
-        to local value of Texinfo buffer.
-
-        * emacs/texnfo-upd.el (texinfo-pointer-name):  Find only those
-        section commands that are accompanied by `@node' lines.
-
-Tue Jan 14 16:10:16 1992  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texnfo-upd.el: Ensure that no commands depend on the value of
-        case-fold-search.
-
-Fri Jan 10 15:13:55 1992  Robert J. Chassell  (bob at kropotkin)
-
-        * emacs/texinfmt.el (texinfo-append-refill): Replace use of
-        unsupported function `looking-at-backward' with
-        `re-search-backward'.
-
-Mon Dec 23 23:46:42 1991  David J. MacKenzie  (djm at wookumz.gnu.ai.mit.edu)
-
-        * util/texindex.c: Change POSIX ifdefs to HAVE_UNISTD_H and
-        _POSIX_VERSION.
-
-Mon Dec 16 15:01:36 1991  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfmt.el (texinfo-append-refill): New function appends
-        @refill to all appropriate paragraphs so you no longer need to
-        append @refill command yourself.
-        (texinfo-format-region, texinfo-format-buffer-1,
-        texinfo-format-include): Call `texinfo-append-refill'.
-
-Fri Dec  6 01:25:09 1991  David J. MacKenzie  (djm at wookumz.gnu.ai.mit.edu)
-
-        * util/texindex.c: Conditionalize on _AIX (which is predefined) instead
-        of AIX, just like makeinfo does.
-
-Tue Nov 26 10:21:04 1991  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texnfo-upd.el (texinfo-section-types-regexp): `@subtitle' no
-        longer treated as subsection.
-
-Sat Nov 16 08:27:42 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
-
-        * util/fixfonts: New file, from Karl Berry.
-
-Tue Nov 12 16:13:24 1991  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfmt.el: Create @end smalllisp.
-
-Mon Nov 11 16:50:13 1991  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfo.el (texinfo-environment-regexp): Add all other block
-        enclosing Texinfo commands.
-
-Thu Nov  7 10:23:51 1991  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfo.el (texinfo-insert-@end): Attempt to insert correct end
-        command statement, eg, @end table.  Fails with nested lists.
-         (texinfo-insert-*): Accept prefix arg to surround following N
-         words with braces for command.
-
-Thu Oct 31 21:31:41 1991  Robert J. Chassell  (bob at kropotki)
-
-        * emacs/texinfmt.el (texinfo-clear): Clear flag even if flag not
-        previously set.
-
-Wed Oct 23 11:15:58 1991  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfo.el (texinfo-mode): page-delimiter now finds top node as
-        well as chapters.
-
-Tue Oct 22 11:46:12 1991  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfmt.el (texinfo-do-flushright): Test whether a line is too
-        long for the flush right command (line length must be less than
-        the value of fill column).
-
-        * emacs/texnfo-tex.el (texinfo-tex-buffer): Prompt for original file
-        even if point moved to *texinfo-tex-shell*.
-        texinfo-tex-original-file: variable to hold file name.
-
-Wed Oct 16 08:32:05 1991  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfmt.el (texinfo-format-center): Expand string before
-        centering so @-commands not included.
-
-Thu Oct 10 22:01:47 1991  Robert J. Chassell  (bob at kropotki)
-
-        * emacs/texnfo-tex.el (texinfo-show-tex-print-queue): Do not kill a
-        running process; do start a process none exists.
-
-Thu Sep 26 21:58:47 1991  Robert J. Chassell  (bob at kropotki)
-
-        * util/texi2dvi: Misc. bugs fixed.
-
-        * emacs/texinfo.el: Remove extraneous references to TeX.
-
-Thu Sep 19 20:45:29 1991  Robert J. Chassell  (bob at kropotki)
-
-        * emacs/texinfmt.el: add @cartouche as a noop (makes box with rounded
-        corners in TeX)
-
-Tue Sep 10 20:44:57 1991  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texnfo-upd.el (texinfo-make-one-menu): Copy node-name correctly
-        for message.
-
-Thu Aug 29 17:54:07 1991  Robert J. Chassell  (bob at kropotki)
-
-        * emacs/texnfo-tex.el (texinfo-quit-tex-job): Do not set mark.
-
-Wed Aug 21 10:36:21 1991  Robert J. Chassell  (bob at grackle)
-
-         * emacs/texnfo-upd.el: (texinfo-copy-menu-title): Copy title as it
-         should rather than node line.
-
-Mon Aug  5 15:27:12 1991  Robert J. Chassell  (bob at grackle)
-
-         * emacs/texinfmt.el (texinfo-format-convert): Changed regexp that
-         looks for three hyphens in a row to find those between word
-         constituent characters, as now, for Oxford Univ. style dashes and
-         also between spaces, for Cambridge Univ. Press style dashes.
-
-        * emacs/texnfo-tex.el (texinfo-tex-start-shell): Runs "/bin/sh" so
-        `explicit-shell-file-name' is not set globally.
-
-        * emacs/texnfo-upd.el: Rewrite messages.
-        (texinfo-find-higher-level-node): Stop search at limit.
-        (texinfo-copy-menu-title): Rewrite to handle outer include files.
-        (texinfo-multi-file-update): Update all nodes properly;
-        rewrite doc string and interactive.
-
-Sat Aug  3 10:46:13 1991  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texnfo-upd.el (texinfo-all-menus-update): Fixed typo that
-        caused the function to create a master menu when it shouldn't.
-
-        * emacs/texinfo.el (texinfo-mode): Make `indent-tabs-mode' a local
-        variable and set to nil to prevent TABs troubles with TeX.
-
-Wed Jul 31 11:07:08 1991  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texnfo-tex.el (texinfo-quit-tex-job): New function: quit
-        currently running TeX job, by sending an `x' to it.
-        (texinfo-tex-shell-sentinel): New function to
-        restart texinfo-tex-shell after it is killed.
-        (texinfo-kill-tex-job): Rewrite to use kill-process rather than
-        quit-process; uses `texinfo-tex-shell-sentinel' to restart
-        texinfo-tex-shell after it is killed.
-        (texinfo-tex-region, texinfo-tex-buffer): Replace
-        texinfo-kill-tex-job with quit-process.
-
-        * emacs/texinfo.el (texinfo-define-common-keys): Add keybinding for
-        texinfo-quit-tex-job
-
-Wed Jul 10 15:15:03 1991  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfmt.el: New commands @set, @clear, @ifset...@end
-        ifset, and @ifclear...@end ifclear.
-        Definition functions rewritten to make them easier to
-        maintain.
-
-Wed Jul  3 19:37:04 1991  Robert J. Chassell  (bob at kropotki)
-
-        * emacs/texinfmt.el (texinfo-format-deftypefn-index): Remove reference
-        to data-type to make consistent with texinfo.tex and makeinfo.
-        texinfo.el: Fix page-delimiter and texinfo-chapter-level-regexp
-        variables.
-
-Thu Jun 27 18:35:36 1991  Robert J. Chassell  (bob at nutrimat)
-
-        * emacs/texinfmt.el: Add @dmn as `texinfo-format-noop'.
-        texinfo2.texi: Document @dmn.
-        texinfmt.el (texinfo{,-end}-{eleterate,ecapitate} renamed
-        {alphaenumerate, capsenumerate}.
-
-Fri Jun 14 12:46:32 1991  Robert J. Chassell  (bob at churchy.gnu.ai.mit.edu)
-
-        * emacs/texinfmt.el (texinfo-format-defun-1): @defivar prints name
-        correctly.
-
-Thu Jun  6 21:38:33 1991  Robert J. Chassell  (bob at churchy.gnu.ai.mit.edu)
-
-        * emacs/texinfo.el (texinfo-mode): Set page delimiter to
-        'texinfo-chapter-level-regexp' so that page commands work by
-        chapter or equivalent.
-
-        * emacs/texinfmt.el (texinfo-format-defun-1): @defop prints name
-        correctly.
-        (batch-texinfo-format): replace unsupported
-        'buffer-disable-undo' with 'buffer-flush-undo'
-
-Fri Apr  5 15:17:17 1991  Robert J. Chassell  (bob at wookumz.gnu.ai.mit.edu)
-
-        * emacs/makeinfo.el (makeinfo-compilation-sentinel): Check for
-        existance of makeinfo-temp-file to avoid harmless error message.
-        texinfo2.texi: Minor typos fixed.
-
-Thu Mar 28 19:13:24 1991  Robert J. Chassell  (bob at pogo.gnu.ai.mit.edu)
-
-        * util/texi2dvi: Revised.
-
-Mon Mar 11 12:35:51 1991  Robert J. Chassell  (bob at grackle)
-
-        * emacs/texinfmt.el: (@footnotestyle): New command to set
-        footnotestyle.
-        (@paragraphindent): New command to set indentation.
-        (texinfo-format-refill): Add indentation feature so as to
-        indent paragraph or leave indentation asis before refilling
-        according to value set by @paragraphindent command.
-        (texinfo-format-region): Insert header, if any, into Info buffer.
-        (texinfo-format-separate-node, texinfo-format-end-node): Run
-        texinfo-format-scan on footnote text only once.
-        (texinfo-format-scan): Shorten `---' to `--'.
-
-        * emacs/texinfo.el: Define key for `texinfo-master-menu'; define
-        start and end of header expressions.
-
-        * emacs/texnfo-upd.el (texinfo-all-menus-update): Update
-        pre-existing master menu, if there is one.
-
-Fri May 11 14:36:07 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-        * util/texindex.c: Rename `lines' to `nlines'.
-        (bzero): Pass arg to lib$movc5 through non-register var.
-        (perror_with_file, pfatal_with_file): Move extern decls and includes
-        to top of file.
-        [VMS]: If not using VMS C, define away `noshare' keyword.
-        Include perror.h.
-
-Mon Jul 11 18:02:29 1988  Chris Hanson  (cph at kleph)
-
-        * util/texindex.c (indexify): when comparing to initial strings to
-        decide whether to change the header, must use `strncmp' to avoid
-        comparing entire strings of which initials are a substring.
-
-Sun Jun 26 18:46:16 1988  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
-
-        * util/texindex.c (sort_in_core, sort_offline, parsefile):
-        Give up on input file if any line doesn't start with backslash.
-
-/* changelog for texinfo.tex before 19jun01.  */
-
-2001-05-24    <karl@gnu.org>
-
-	* texinfo.tex (\smallbreak, \medbreak, \bigbreak): add check for
-	\ifnum\lastpenalty to plain tex definitions, so that we won't
-	insert space right after a section title.
-	(\aboveenvbreak): similar check of \lastpenalty.
-
-2001-05-21    <karl@gnu.org>
-
-	* texinfo.tex (\pdfurl): \let\value=\expandablevalue, so at least
-	some cases can be properly handled.
-
-2001-03-28    <karl@gnu.org>
-
-	* texinfo.tex: Copyright.
-
-	* texinfo.tex (\pdfmkdest): remove trailing @ in target names;
-	suggestion from: Reiner Schlotte <R.Schlotte@science-computing.de>.
-	(\imagexxx): call \normalturnoffactive so _ (among others) will be
-	allowed in filenames; report from arnold@skeeve.com.
-
-2001-02-02    <karl@gnu.org>
-
-	* texinfo.tex (\secondary): handle pdf case.
-	(\dosubind): secondary index entry not written as separate arg for
-		texindex.
-	From: Trevin Beattie <trevin@eyring.com>
-	Date: Tue, 21 Mar 2000 13:04:06 -0700
-
-2001-01-12    <karl@gnu.org>
+	* makeinfo/xml.c:
+	* makeinfo/xml.h:
+	* makeinfo/texinfo.dtd: new elements acronymword and acronymdesc.
 
-	* texinfo.tex (\dopdfimage): different syntax for filename
-	inclusion (foo vs {foo}).  From: <Kurt.Hornik@ci.tuwien.ac.at>,
-	22dec99.
+2003-12-19  Alper Ersoy  <dirt@gtk.org>
 
-2001-01-08    <karl@gnu.org>
+	* makeinfo/insertion.c (begin_insertion): insert float element for
+	docbook too.
 
-	* texinfo.tex (\afivepaper): new command from Jose Romildo
-	Malaquias <romildo@urano.iceb.ufop.br>.
+2003-12-18  Karl Berry  <karl@gnu.org>
 
-2000-12-12    <karl@gnu.org>
+	* doc/texinfo.txi, doc/info-stnd.texi: fix incorrect cross-manual
+	xrefs.  From: Juri Linkov <juri@jurta.org>, 18 Dec 2003 05:01:07 +0200.
 
-	* texinfo.tex: oops, had outside page reversed.
+2003-12-18  Alper Ersoy  <dirt@gtk.org>
 
-2000-12-11    <karl@gnu.org>
+	* makeinfo/makeinfo.c (insert): rollback unnecessary whitespace before
+	newline characters.
 
-	* texinfo.tex (\inmargin): allow lefttext and righttext as args.
+2003-12-17  Karl Berry  <karl@gnu.org>
 
-2000-11-10    <karl@gnu.org>
+	* doc/texinfo.tex (\ordf, \ordm): new macros.
+	(\commondummies): include them.
+	(\indexnofonts): here too.
+	* makeinfo/makeinfo.c (command_table): add them.
+	* makeinfo/lang.c (cm_special_char): first cut at handling them.
+	* doc/texinfo.txi (Inserting Accents): document them.
 
-	* texinfo.tex: implementation of new commands @verbatim, @verb,
-	and @verbatiminclude from janneke@gnu.org.
+2003-12-16  Alper Ersoy  <dirt@gtk.org>
 
-2000-11-09    <karl@gnu.org>
+	* makeinfo/defun.c (process_defun_args): use execute_string instead
+	of add_word so accent commands are honored.
 
-	* texinfo.tex (\inmargin): rewrite to allow for placing the
-	material either in the right or left margin.
+2003-12-16  Alper Ersoy  <dirt@gtk.org>
 
-2000-10-27    <karl@gnu.org>
+	* makeinfo/xml.c (xml_begin_document): output xml process instruction
+	also in the Docbook prolog.
 
-	* texinfo.tex (\dosynindex): new macro subroutine, do not
-	\closeout twice the index being redirected.
-	(\synindex, \syncodeindex): call it.
+2003-12-16  Karl Berry  <karl@gnu.org>
 
-2000-10-18    <karl@gnu.org>
+	* doc/texinfo.txi (dots): document enddots spacing.
 
-	* texinfo.tex (\inmargin): rewrite to allow argument to be vmode
-	material, such as a box from an image.
+2003-12-16  Stepan Kasal  <kasal@ucw.cz>
 
-2000-09-06    <karl@gnu.org>
+	* doc/texinfo.tex (\dots): Use \hfil instead of \hss and only
+	  the stretch factor in explicit skips; I don't suppose the dots
+	  will overlap.
+	  (\enddots): Merged with \dots.
 
-	* texinfo.tex (\doublecolumnout): must subtract \ht\partialpage
-	here, not in \begindoublecolumns.  Otherwise the \partialpage on
-	the first page of double columns affects every subsequent page,
-	e.g., if @setchapternewpage off.  Reported by Aharon Robbins
-	<arnold@skeeve.com> for standards.texi.
+2003-12-16  Karl Berry  <karl@gnu.org>
 
-2000-05-28    <karl@gnu.org>
+	* makeinfo/makeinfo.c (cm_image): quote the src= arg in the Info
+	case, since apparently that's what Jan implemented.  Report from:
+	Torsten Bronger <bronger@physik.rwth-aachen.de>, 16 Dec 2003
+	12:55:30 +0100.
 
-	* texinfo.tex (\linkcolor): replace Cyan with Blue.
-	(\output): do \pdfmkdest at top.
-	(\pdfmakeoutlines): set \_ to \normalunderscore.
-	From: Trevin Beattie <trevin@eyring.com>.
+	* util/dir-example: wdiff tools.
 
-2000-05-27    <karl@gnu.org>
+2003-12-15  Stepan Kasal  <kasal@ucw.cz>
 
-	* texinfo.tex (\today): only define if undefined.
-	From: Stepan Kasal <kasal@suse.cz>.
+	* doc/texinfo.tex (\dofloat): Move \startsavinginserts before
+	  the begin of the vtop; it's still local---within the group
+	  open by \float.
+	  (\dofloat, \Efloat): Fix indentation.
 
-2000-05-16    <karl@gnu.org>
+2003-12-15  Stepan Kasal  <kasal@ucw.cz>
 
-	* texinfo.tex (\deftypeivarheader): need defheaderxcond.  From:
-	Marcel van der Boom <marcel@hsdev.com>.
+	* doc/texinfo.tex (\innerdef, \innernewcount): Nuked.
+	  (\getfloatno): New macro, to establish the right float count.
 
-1999-10-01  Karl Berry  <karl@gnu.org>
+2003-12-15  Stepan Kasal  <kasal@ucw.cz>
 
-	* texinfo.tex (\afourwide): had hsize and vsize reversed.
-	From: Pascal Obry <pascal_obry@csi.com>
+	* doc/texinfo.tex (\innernewbox): Nuked, the call expanded.
 
-1999-09-25  Karl Berry  <karl@gnu.org>
+2003-12-14  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (\alias): fix from Andreas.
+	* makeinfo/tests/*: unset TEXINFO_OUTPUT where necessary.
 
-1999-09-19  Karl Berry  <karl@gnu.org>
+2003-12-13  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (\key): rename the \smallrm and \smallsy here.
+	* doc/texinfo.txi (Smallcaps, acronym): Compare and contrast these
+		a bit more fully.
+	* doc/texinfo.tex (\setfontstyle): just \def the string; since we
+		are \edef'd, we can't make ourselves a control sequence.
+	(\selectfonts): new macro.
+	(\doacronym): print acronym in smaller size, and \unsepspaces for
+		if we're called inside @display.
+	(\registeredsymbol): we can use \lllsize here too.
 
-	* texinfo.tex (\indexfonts): rename to \smallfonts, along with
-		\indrm, etc.
-	Define all the fonts, too.
-	(\footnotezzz): use \smallfonts.
+	* configure.ac: gettext 0.13 (many generated files updated).
 
-	* texinfo.tex (\needx): get better leading; do nothing if @need
-	       value is less than one linespace.  From Arnold.
-	(\douref, \xrefX, \doemail [pdf]): make spaces normal again, so our
-	\ignorespaces commands are effective even in an @display.
+	* Makefile.am (AUTOMAKE_OPTIONS): 1.8.
 
-	* texinfo.tex (\finishtitlepage): remove FINISH TITLE debugging
-		message.
+	* makeinfo/makeinfo.c: give warning if TEXINFO_OUTPUT value is
+		unrecognized.
+	* doc/texinfo.txi (makeinfo options): document TEXINFO_OUTPUT.
 
-	* texinfo.tex (\anchor): rewrite to always \ignorespaces.
-	Bug from esken.
+	* doc/texinfo.txi (tex): document @LaTeX.
 	
-	* texinfo.tex (\indexnofonts): dummy up \acronym.
-	From: Thomas Esken <esken@nmlab.informatik.fh-dortmund.de>
-
-1999-09-06  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\texinfoversion): update.
-
-	* texinfo.tex: Avoid multiparagraph cells losing linespace between
-	paragraphs.  From: Andreas Schwab <schwab@suse.de>.
-	Bug from: Lalo Martins <lalo@webcom.com>.
-
-1999-08-19  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\shortchaplabel): move computation of width of
-	"Appendix" inside, in case it's been changed by a language.
-
-Mon Aug  9 16:31:55 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex: pdf updates from Han.
-
-Fri Aug  6 13:48:22 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\charcode): remove unused counter. 
-	From: Akira KAKUTO <kakuto@fsci.fuk.kindai.ac.jp>.
-
-Thu Jul 22 19:08:19 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex: Update from Han.
-
-Tue Jul 20 17:13:16 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex: More pdf improvements from Han.
-
-Mon Jul 19 16:33:31 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex: Better pdf support from: Han The Thanh
- 		<thanh@informatics.muni.cz>.
-
-Sun Jul 18 14:21:03 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex: pdfimage takes braces.
-
-Tue Jul  6 19:40:14 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\deftypeop): New command.
-
-Mon Jul  5 17:17:33 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\contents): call \pdfmakeoutlines here instead of
- 	inline (!).
-	(\pdfmakeoutlines): call \indexnofonts instead of making a separate
-	attempt at it.
-
-Tue May 25 06:16:06 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (time-stamp-format): use %02H.
-
-	* texinfo.tex: Had PDF and DVI transposed.
-
-Sun Apr 25 15:30:00 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\appendixletter): restore \the, necessary for .toc.
-
-Thu Apr 22 19:22:12 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\emergencystretch): Increase to .15\hsize.
-
-Tue Apr 20 05:11:04 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\defunargs): use \tensl\hyphenchar\font to work
-		better with Gildea's PostScript version.
-
-	* texinfo.tex (\tab): Change back to just &.
-	From: Nathan Sidwell <nathan@acm.org>.
-
-	* texinfo.tex: No \fi.
-
-Mon Apr 19 17:38:54 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\pdflink) [!\ifpdf]: define to ignore arg.
-
-	* texinfo.tex: Add pdf support.  Merge from: Kurt Hornik
- 		<Kurt.Hornik@ci.tuwien.ac.at>.
-
-Wed Mar 31 13:24:16 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\defopheader): missing word space before `on'.
-  		Report from: Chris Hanson <cph@martigny.ai.mit.edu>.
-
-Fri Mar 26 17:00:41 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\imagexxx): Equalize space above and below if in
- 		vmode.  From rms.
-
-Thu Mar 25 20:00:00 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\deftypeivar): new command.
-
-Tue Mar 23 17:53:37 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (&): be sure active & is defined for @deftypefn
-		operator&.
-	Report from: Nathan Sidwell <nathan@acm.org>.
-
-Sat Mar 20 12:31:53 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\exampleindent): new command.  From Yoshiki.
-
-	* texinfo.tex: Changes from Andreas to use \sl\$ inside italics
-		and to avoid extra spaces around @anchor.
-
-	* texinfo.tex (\image, \imagexx): move pdf test to imagexxx for
- 		correct filename parsing.
-
-Mon Mar 15 16:51:20 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\imagexxx): reset catcode ^^M in case we're inside
- 		in an example.  Report from kama.
-
-	* texinfo.tex (\putwordin): new macro for word `in'.
-	(\xrefX): use it.
-	Report from: "Alexey A. Nikiforov" <A.A.Nikiforov@inp.nsk.su>
-
-Sun Feb 21 16:47:28 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex: Expand tabs.
-
-Sun Feb 14 16:02:29 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\paragraphindent): implement.
-	Suggestion from: Paul DuBois <dubois@primate.wisc.edu>.
-
-Tue Feb  9 07:25:07 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\alias): use def rather than \let.
-	Change timestamp format to include hours.
-
-	* texinfo.tex: New commands @alias and @definfoenclose.
-	From: "Eric S. Raymond" <esr@snark.thyrsus.com>.
-
-Mon Feb  8 14:46:56 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\scanmacro): Use \endinput to avoid spurious space,
- 		and various other space fixes.  From: Andreas Schwab
- 		<schwab@ls5.informatik.uni-dortmund.de>.
-
-Thu Feb  4 15:24:40 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\uref): implement optional third arg.
-
-	* texinfo.tex (\dosubind): Include index entry in third arg to
-		\entry instead of writing as bogus fourth arg.
-	Report from: kama@hippo.fido.de (Karl Heinz Marbaise).
-
-	* texinfo.tex (\setemergencystretch): Increase somewhat.
-
-	* texinfo.tex (\putwordof): rename from \putwordOf.
-	* texinfo.tex (defivarhead, \defcvarheader): Use \putwordof.
-
-Tue Feb  2 16:57:00 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\documentlanguage, \documentencoding): new
-	commands.  \documentlanguage based on an implementation by kama.
-
-Sat Jan 30 17:23:45 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\putwordMMai): Should be MMay.  From Trond.
-
-Fri Jan 29 17:52:16 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex: Fix @macro expansion inside @section.  Patch from
- 	Andreas:
-
-	From: Andreas Schwab <schwab@ls5.informatik.uni-dortmund.de>
-
-	The general idea is to construct a list a all defined macros in
- 		the form \do\macro1\do\macro2..., then temporarily define
- 		\do to something appropriate and execute the list to do
- 		whatever is needed.  Here is a patch, and i have also
- 		fixed a few other bugs that i found while browsing through
- 		the @macro implementation.  Additionally i have added a
- 		check to prevent the user from doing silly things like
- 		@macro shipout.
-
-Sun Jan 24 09:59:42 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\obstexwarn): Don't use *** in message, it
- 		interferes with make output parsing.
-
-Thu Jan 21 15:45:20 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex: Internationalization improvements from kama.
-
-Wed Jan 20 17:12:52 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\contents, \shortcontents): Run \contentspagealignmacro.
- 	From: Trond Endrestol <trond@agamemnon.gtf.ol.no>
-
-Thu Jan 14 16:53:43 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\begindoublecolumns): Ship out \partialpage
-	immediately if it is nonvoid, instead of saving it.  This avoids a
-	bug where the index could end up printing one line per page (see
-	the indexspread.tex test).
-	From: Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
-
-	* texinfo.tex (\image): If running pdftex, do \pdfimage{imagefile.pdf}.
- 	From: Samuel Tardieu <sam@inf.enst.fr>
-
- 	Also, update copyright year.
-
-Tue Jan  5 17:50:45 1999  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\enddoublecolumns): Move \pagegoal reset to after
- 		the \endgroup so we get the restored single-column \vsize
- 		as intended.
-
-Sun Dec 20 17:57:22 1998  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\indexdummies): Set \{ and \} to \mylbrace and
-	\mybrace to avoid braces in the index file, which
-	texindex can't handle.
-
-Sat Dec 19 18:13:16 1998  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\pickupwholefraction): Ignore whole-number part.
-	(\setuptable): Always pass whole-number part and decimal point.  This
-	allows leading zeroes.
-	Suggestion from: Ben Bullock <ben@hayamasa.demon.co.uk>.
-	Date: Fri, 21 Aug 1998 14:06:50 +0100 (BST)
-
-Tue Dec 15 16:38:07 1998  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\indexdummies): set \{ and \} to \lbracecmd and
-        \rbracecmd to avoid lossage if @tex is active during \shipout.
-	Report from: "Peter Kabal" <Kabal@ece.mcgill.ca>.
-
-Sun Dec  6 17:11:17 1998  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex: Doc fix.
-
-1998-11-11  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
-
-	* doc/texinfo.tex (\onepageout): Put the cropmarks in vboxes of
-	zero height so that they don't contribute space themselves.
-	Compensate for \topandbottommargin.
-	(\internalpagesizes): Advance \outervsize by 2\topandbottommargin,
-	not only 0.6in.
-
-Fri Nov  6 17:27:57 1998  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex: Use standard time-stamp.el package instead of
- 		update-date.el.
-
-Sat Oct 31 19:23:02 1998  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\indexnofonts,\indexdummies): add \url and \uref to
- 		list.
-
-Fri Oct 30 08:16:23 1998  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (\expandablevalue): Delete spurious `v' character.
-
-Tue Oct 27 11:18:40 1998  Karl Berry  <karl@gnu.org>
-
-	* texinfo.tex (@env, @command, @option): Must disable for index
- 		and xref commands.  Also, \input plain if necessary before
- 		using {} in the version number.
-
-Wed Sep 30 11:40:36 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex: Use date as version number instead of RCS, and
- 		update-date to update it.
-
-Thu Sep 17 13:22:44 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex: Fix @macro expansion of @code with _ in the
- 		argument.
- 	From: Zack Weinberg <zack@rabi.columbia.edu>.
-
-Fri Aug 28 10:30:29 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\itemzzz): take \itemmargin into account when
- 		unhboxing.  Reported by Bob.
-
-Fri Aug 14 16:56:58 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex: Change @defun environments so that right margin is
- 		not changed, and instead the defun type label is outdented
- 		into the margin.
+	* doc/texinfo.tex (\loggingall): reduce \errorcontextlines for
+	sake of infinite loops.
+	(\setfontstyle): \def better than \edef?
+	(\commondummies): LaTeX is a new dummy.
+	(\indexdummies): likewise.
+	(\indexdummylatex): sorted the obvious way.
 
-Thu Aug 13 13:31:41 1998  Karl Berry  <karl@cs.umb.edu>
+	* doc/texinfo.tex (\LaTeX): New macro for new command.
+	(\setfontstyle): new macro to remember current font style.
+	(\rm,\it,\sl,\bf,\tt,\sf,\ttsl): call it; all but
+	the last two are new too.
+	(\ssecsc): use correct magnification, we do for everything else.
+	(\reducedrm..\reducedsy): new fonts.
+	(\reducedfonts): new macro.
+	(\textfonts..\smallerfonts): set \lsize and \lllsize macros.
 
-	* texinfo.tex (\smartslanted): define this separately from
- 	\smartitalic.
-	(\emph, \i): use \smartitalic for true italics.
+2003-12-13  Alper Ersoy  <dirt@gtk.org>
 
-Mon Aug 10 11:51:13 1998  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/makeinfo.c (main): changed TEXINFO_XML_OUTPUT to
+	TEXINFO_OUTPUT.  It now specifies the default output format.
 
-	* texinfo.tex (\value): handle active _ or - in argument (happens
- 		if called from @code).
- 	Report from: Dave Love <d.love@dl.ac.uk>.
+2003-12-13  Alper Ersoy  <dirt@gtk.org>
 
-Sun Jul 19 09:49:23 1998  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/defun.c (defun_internal): implemented basic line
+	continuation.
 
-	* texinfo.tex (\dosubind): Don't do \vskip to preserve \lastskip
- 		unless we are in vertical mode.  Otherwise we might end a
- 		paragraph prematurely, and \folio won't get expanded by
- 		\output.
- 	Report from: "Richard E. Stone" <res@rstone.mn.org>
+2003-12-13  Karl Berry  <karl@gnu.org>
 
-Thu Jul 16 15:33:37 1998  Karl Berry  <karl@cs.umb.edu>
+	* CVSROOT/loginfo: put filename/version number in mail subject.
 
-	* texinfo.tex: Keep track of how negative the page numbers have
- 	gotten:
-	(\lastnegativepageno): New \count register.
-	(\startcontents): Use it.
-	(\contents, \summarycontents): set it.
+	* util/srclist.txt (help2man): remove, we require cvs-builders to
+		have this installed now (or accept `missing's replacement),
+		along with the rest of the dev tools.
 
-Mon Jul 13 16:58:11 1998  Karl Berry  <karl@cs.umb.edu>
+2003-12-13  Alper Ersoy  <dirt@gtk.org>
 
-	* texinfo.tex (\imagexxx): Add some space around the image if it's
- 		by itself.
+	* makeinfo/defun.c (defun_internal):
+	* makeinfo/insertion.c (end_insertion): do not use tables for HTML
+	@deffns.
 
-1998-07-09  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+2003-12-13  Alper Ersoy  <dirt@gtk.org>
 
-	* texinfo.tex (chapterzzz): Put a space before the chapter number
-	in the message.
-	(appendixzzz): Use \putwordAppendix in the message.
+	* makeinfo/insertion.c (begin_insertion): strip whitespace from @float
+	arguments.
 
-Thu Jul  9 08:39:53 1998  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/sectioning.c: last_section_title and last_section_number
+	now default to empty strings.
 
-	* texinfo.tex (\macro): Globalize assignments since it's done
-		inside a group.  From Zack.
+2003-12-13  Alper Ersoy  <dirt@gtk.org>
 
-Mon Jul  6 17:21:25 1998  Karl Berry  <karl@cs.umb.edu>
+	* makeinfo/cmds.c (cm_LaTeX): new function for @LaTeX{}.
 
-	* texinfo.tex (\comment): Speed up.
-	(\loggingall): Turn on eTeX's extended tracing.
-	More macro fixes.
-	Date: Sat, 04 Jul 1998 14:51:49 -0400
-	From: Zack Weinberg <zack@rabi.phys.columbia.edu>
+	* makeinfo/texinfo.dtd: new latex entity.
 
-Thu Jul  2 10:20:32 1998  Karl Berry  <karl@cs.umb.edu>
+2003-12-13  Alper Ersoy  <dirt@gtk.org>
 
-	* texinfo.tex (\contents, \summarycontents, \startcontents): Use
- 		roman numerals for toc, arabic outside, even when toc is
- 		at the beginning.
-
-Mon Jun 29 10:05:28 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\anchor): New command @anchor.
-	(\xrefX): Avoid double space when xref to an @anchor or an @unnumbered.
-
-	* texinfo.tex (\itemzzz): Use kerns and \unhbox when item text
-		fits in the space, so footnotes can work.
-
-	* texinfo.tex (\setref): Take additional argument for the -snt
- 	xref.  Call \indexdummies.
-	(\donoderef, \appendixnoderef, \unnumbnoderef): Change \setref calls.
-
-Sat Jun 27 19:16:34 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\contents, \summarycontents): Must not be \outer.
-
-Fri Jun 26 16:15:14 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\writetocentry): New macro.
-	(\chapternofonts): No longer needed.
-	(\chapter, ..., \unnumberedsubsubsec): Change all the sectioning
-		commands to call \writetocentry instead of doing it inline.
-	Also, do not call \chapternofonts, we avoid expansion with
-		\the\toks instead.
-	(\opencontents): No longer needed, instead \writetocentry opens
-		the file when necessary.
-	(\setfilename): Don't call \opencontents.
-	(\ifsetcontentsaftertitlepage, \ifsetshortcontentsaftertitlepage):
-		New conditionals.
-	(\Etitlepage): Call \contents and/or \shortcontents if
-		conditionals are set.
-
-	Global: use \nobreak instead of \penalty 10000 for epsilon efficiency.
-
-Thu Jun 25 08:29:32 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\option,\env,\command): New markup commands.
-	Suggested by arnold@gnu.org.
-
-	* texinfo.tex (\afourpaper): More reasonable margins.
-	From: Wilhelm Mueller <muewi@hb.senbvs43.uni-bremen.de>
-	Date: Thu, 25 Jun 1998 10:48:13 +0200 (MET DST)
-
-Wed Jun 24 17:46:43 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\acronym): New Texinfo command.
-
-Tue Jun 23 17:36:39 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\dots, \enddots): Missing \leavevmode.
-	Report from: Thomas Esken <esken@nmlab.informatik.fh-dortmund.de>
-	Date: Tue, 23 Jun 1998 14:22:27 +0200 (MET DST)
-
-Mon Jun 22 16:00:53 1998  Karl Berry  <karl@north>
-
-	* texinfo.tex: Rewrite of index stuff to do better column breaking
-	and balancing.
-	The old code failed miserably when the index was just the wrong size,
-	e.g., the Autoconf manual with @afourpaper.
-	Bug report from: Wilhelm Mueller <muewi@hb.senbvs43.uni-bremen.de>
-	Date: Fri, 12 Jun 1998 16:34:49 +0200 (MET DST)
-	(\initial): Add more glue around the initial, and make it a
-		multiple of \baselineskip.
-	(\entry): Add glue before each entry so the columns can always be the
-	 same height.
-	(\doublecolumnout): Available space no longer needs to handle
-	 \partialpage specially.
-	(\pagesofar): Take \ht\partialpage into account with \vsize.
-	(\enddoublecolumns): Reset \output to avoid calling
-		\balancecolumns twice
-	(\balancecolumns): Format for readability.
-	(\initialskipamount): No longer needed, remove.
-
-	(\hbadness): Increase a bit, boxes that are a little underfull look ok.
-
-Sun Jun 21 16:48:38 1998  Karl Berry  <karl@north>
-
-	* texinfo.tex (\ninettsl): cmsltt10 is not standard, so use
-		cmsltt10 scaled 900.
- 	Date: Mon, 15 Jun 1998 12:35:41 +0200 (MET DST)
- 	From: Werner Struckmann <struck@ips.cs.tu-bs.de>.
-
-Thu Jun 18 08:32:15 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex: @macro fixes from Zack Weinberg
-  	     <zack@rabi.phys.columbia.edu>.
- 	- @ifblah did not work inside @macro
-        - spaces in parameter lists in macro definitions caused errors
-        - leading spaces in parameter lists in macro invocations were
-	  preserved inappropriately.
-
-Wed Jun 10 16:50:53 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\smallformatx, \smalldisplayx): New macros.
-	(\smallbook): Arrange to use them.
-	(\display, \flushleft, etc.): Rewrite to avoid duplication.
-
-Sun Jun  7 18:13:45 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\pagesizes): Rename to \internalpagesizes.
-	(\custompaper): Rename to \pagesizes.
-
-Sat Jun  6 13:16:32 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex: Rewrite paper size definitions, add @custompaper.
-
-	* texinfo.tex: Fix for macros in arguments to other commands.
-  		From Zack.
-
-Thu Jun  4 11:21:07 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex: Better @macro implementation.
-	From: Zack Weinberg <zack@rabi.phys.columbia.edu>.
-
-Tue May 26 17:43:21 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\imagexxx): Center image if it is not part of a
- 		paragraph.
-
-Tue May 19 17:17:12 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex: \linkstrue by default.
-	Also, first implementation of @macro; can only handle some cases,
- 		but that is better than nothing.
-	From: Zack Weinberg <zack@rabi.phys.columbia.edu>
-
-Thu May 14 17:32:47 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex: New command @novalidate along the lines of makeinfo
-		--no-validate.
-	Date: Sun, 26 Oct 1997 18:54:47 -0500
-	From: Zack Weinberg <zack@rabi.phys.columbia.edu>
-
-Tue May 12 16:19:35 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\valuexxx): Split up into expandable and
- 		non-expandable parts.
-	(\expandablevalue): New macro.
-	(\indexdummies): \let\value = \expandable value.
-
-	* texinfo.tex: Doc fixes.
-
-	* texinfo.tex (\doind): Just call \dosubind with empty third arg.
-	(\dosubind): Replace with \doind definition and suitable code to handle
-	possible third arg.  And propagate glue past the whatsit from the
- 	\write so index entries don't cause extra space between
- 	@defuns (for example).
-
-Wed May  6 12:51:27 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\deftypemethparsebody): Handle the extra arg in
- 	@deftypemethodx, too.
-	(\deftypefunx): Error definition was misspelled as \deftypeunx.
-
-Fri May  1 17:31:58 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo/texinfo.tex (\putwordon, \putwordMethodon): New macros.
-  	Use in \def... commands.
-	(\indexdummies): make `\ ' be just ` ' for sorting.
-	(\deftypemethparsebody): New macro.
-	(\defmethod): Call it.
-	Various doc fixes.
-	Repored by: KHMarbaise@p69.ks.fido.de (Karl Heinz Marbaise)
-	Date: Wed, 07 Jan 1998 10:19:42 +0100
-
-Fri Apr 10 16:54:48 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex: @cartouche: Align right side correctly.
-	From: dale.smith@bellhow.com (Dale Smith)
-	Date: Fri, 06 Mar 1998 14:47:02 GMT
-
-Sun Apr  5 17:19:03 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\dosetq): Use \normalturnoffactive instead of just
- 	\turnoffactive, so \'s in node names are handled properly.
-	(\tie): Move definition to more rational position in the file.
-	(\@, \{, etc.): Use decimal numbers in all cases, to avoid use of '.
-	Paranoia only.
-	(\+): Turn off once and for all at the beginning, and define as
-	\tabalign in @tex.
-
-Tue Mar 31 19:33:31 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\synindex, \syncodeindex): \closeout the redirected
-		index.
-	From: Jakob Stoklund Olesen <stoklund@mi.aau.dk>
-
-	* texinfo.tex (\doignore): Ignore everything after `c', so @end
- 	ifinfo and the like can be commented out.
-	(\macrocsname): New macro.
-	Reported by: "James A. Lupo" <lupoja@feynman.ml.wpafb.af.mil>
-
-Wed Feb 25 15:48:51 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\doprintindex): Change catcode of @ before \read,
-		in case of \initial{@} being the line that is read.
-	Reported by: Drew Csillag <drew_csillag@geocities.com>
-
-	* texinfo.tex (\dotable): Add \leftskip to \hsize in the first column.
-	Don't inherit \rightskip from surrounding environment.
-	Set \item to \crcr to avoid empty first row.
-        Prepend \parskip glue before table.
-        Set \everycr locally outside of alignment, don't reset it
-	        explicitly in \Emultitable.
-	All from Andreas Schwab, to avoid overfull hboxes.
-
-	Also, work on leading commentary in file a bit.
-
-Tue Feb 24 17:48:29 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex: \!: Save and restore this for @tex.
-	From: Jean-Pierre Moreau <jpmoreau@ciframedical.com>
-	Date: Fri, 22 Aug 1997 16:47:36 -0400
-
-	* texinfo.tex (\angleleft, \angleright): New macros.
-	(\refx, \email, \key): Use them.
-	From: Stephen Gildea <gildea@intouchsys.com>
-	Date: Fri, 26 Dec 1997 11:43:32 EST
-
-Mon Feb 23 17:34:23 1998  Karl Berry  <karl@cs.umb.edu>
-
-	1997-08-28 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
-	* doc/texinfo.tex (xrdef): Read the second argument with \
- 	as an escape character.
-
-1998-01-22  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* texinfo.tex (\tocentry): Don't \turnoffactive before typesetting
-		the arguments, it causes special characters to be printed
-		incorrectly.
-
-Mon Jan 19 10:58:25 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texi2html: Correct version number, home page reference.
-
-Sat Jan 17 15:12:03 1998  Karl Berry  <karl@cs.umb.edu>
-
-	* texi2html: Version 1.54.  Handle @image better, etc.
-	* From: Bob Friesenhahn <bfriesen@simple.dallas.tx.us>.
-
-Wed Dec 24 13:59:07 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\dots, \enddots): Use current font instead of
- 		always using math italic.  From Stephen Gildea.
-
-Tue Dec 23 11:33:07 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex: Spurious xepsf.tex should be epsf.tex.
-
-Mon Oct 13 15:49:28 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\titlefont): Explicitly set \rm.
-
-Sat Jul 26 15:12:37 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\email): Let to \uref instead of \code, as a second
- 		optional argument makes sense for this, too.
-
-Mon Jul 14 13:43:43 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\indexdummies): Add \value.
-
-Thu Jul 10 13:34:30 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\authorrm): Must use \def instead of \let, as
- 		\secrm is not yet defined.
-
-1997-07-09  Richard Stallman  <rms@psilocin.gnu.ai.mit.edu>
-
-	* texinfo.tex (\titlefont): Define again, using \titlefonts.
-
-Wed Jul  9 16:45:30 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\startcontents): Leave ^ catcode as other.
-
-Sat Jul  5 17:16:40 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\titlefonts): New macro to set title font styles,
- 	so italic etc. work in @title.
-	(\titlefont): No longer needed.
-	(\titlepage): Call \titlefonts instead of \titlefont.
-	(\chapsf, \ssecsy, \ssecttsl): Correct magstep values.
-	From: Stephen Gildea <gildea@intouchsys.com>.
-
-	* texinfo.tex (\onepageout): Back up to 2\baselineskip per Stephen.
-	(\kbdinputstyle): New command.
-
-1997-04-03  00:07:28 1997  Richard Stallman  <rms@gnu.ai.mit.edu>
-
-	* texinfo.tex (\kbdfont, \kbdexamplefont): New macros, parms that
-	tell @@kbd what to do.
-	(\setkbdinputdistinct, \setkbdinputexample): New commands set them.
-	(\kbd): Use those parms.
-
-Thu Jul  3 16:52:39 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\onepageout): Leave only one line space above the
- 	footline, to be more like plain.  Suggested by Stephen Gildea.
-	(\evenfootline): Left one too many line spaces here, so reduce by two.
-
-	(\ifnottex): Another ignore command.
-	(\ifnothtml,\ifnotinfo): New commands.
-	(\doignore): Ignore brace characters, so mismatched braces in ignored
-	text do not cause complaints.
-
-Fri Jun 27 15:09:16 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\image): New definition for new @image command.
-
-Wed Jun 18 15:58:20 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\oddfootingxxx),
-	(\onepageout): Leave space for the footline if present.
-	(\everyfootingxxx, \everyheadingxxx): Call \oddfootingxxx and
-	\evenfootingxxx instead of repeating their code.  From: Stephen
- 	Gildea <gildea@intouchsys.com>.
-
-	(\setfilename): Read texinfo.cnf if present.
-
-	(\indexdummies, \indexnofonts): No-op additional commands @result @equiv
-	@expansion @print @error @point.  From: Dave Bodenstab
- 		<imdave@ais.net> (for texi2www doc).
-
-Fri Jun  6 10:31:34 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\setmultitablespacing): Restore bad typing mistake
- 		from yesterday.
-
-Thu Jun  5 18:04:26 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\uref): Write real definition, taking one mandatory
-		argument and one optional one.
-
-Wed Jun  4 17:16:09 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\mainmagstep): Define this as a \count variable
- 	instead of with \let, to make changing to \magstep1 more transparent.
- 	From: HERBERT@boevm4.vnet.ibm.com.
-	(\uref): New command a la \url.
-
-Sat May 24 18:06:41 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\deftypemethod, \deftypemethodheader): New macros
-		to implement new commands @deftypemethod and @deftypemethodx.
-	Suggestion from: KHMarbaise@p69.ks.fido.de (Karl Heinz Marbaise).
-
-Wed May 21 17:17:52 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\opnr, \clnr): Increment/decrement \parencount, for
-   	  @defun lines with nested parens.  From Bill Schelter
- 	  <wfs@fireant.ma.utexas.edu>.
-	(\itemizeitem): Correct \errmessage.
-
-Mon May 19 17:34:40 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\codeunder): Use \_ and \ifusingtt to avoid
- 	dotaccent from _ in roman fonts, e.g., @deftypefn.
-	(\tex): Remove spurious spaces at the end of subdefinitions.
-	From: "John W. Eaton" <jwe@bevo.che.wisc.edu>.
-	(\url, \email): \let to \code; no quotes or angle brackets.
-
-Mon May  5 17:06:35 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\onepageout): \ifcropmarks, center the page body.
-  	Lost this when merged \croppageout with \onepageout.  Found by
- 	Arnold.
-
-	(\doprintindex): Do not bother to go into double column mode unless
-	there actually is a non-empty index.
-
-	(\begindoublecolumns): Include any existing \partialpage in the new one,
-	lest we lose a whole page of output.  Found by M J Morley
- 	<mjm@scs.leeds.ac.uk>.
-
-	(\chapternofonts): Remove spurious spaces, both in the definitions that
-	get output to the aux file(s) and in this macro.
-
-	Fix comments and rationalize whitespace in various other places.
-
-Sun Apr 27 15:41:16 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\chapter, etc.): Avoid expansion of section title
-        when writing the toc.
-
-Thu Apr 24 16:35:46 1997  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\onepageout): Integrate cropmarks case here,
-	instead of having a completely different routine.
-	(\croppageout): Remove this.
-
-Sun Jun  9 14:26:42 1996  Karl Berry  <karl@cs.umb.edu>
-
-	* texinfo.tex (\ignoremorecommands): Ignore \defcodeindex, and do
-        not ignore \message.
-
-Thu Apr 11 12:59:42 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\macro): New macro.
-	(\enddots, \endldots): New macros.
-	(\centerchap, \centerchapyyy): New macros.
-	(\centerchfplain, \centerchfopen): New macros.
-	(\CHAPFplain, \CHAPFopen): Set \centerchapmacro.
-
-Wed Mar 13 11:42:17 1996  Karl Berry  <karl@cs.umb.edu>
-
-        * texinfo.tex (\url): New macro, like \samp for now.
-
-Sun Mar 10 13:05:08 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex: Changes in @multitable code.
-	Change meaning of @multitablelinespace.
-
-Tue Mar  5 18:56:08 1996  Dave Love  <d.love@dl.ac.uk>
-
-	* texinfo.tex (\set): Set catcode of space explicitly (inside a
- 	group) to avoid losing inside @example, say.
-
-Sun Mar  3 17:01:27 1996  Karl Berry  <karl@cs.umb.edu>
-
-        * texinfo.tex (\itemxpar): Protect the \vskip here with \nobreak,
-        to avoid a possible page break at an @itemx.
-
-Sun Feb 25 14:53:15 1996  Karl Berry  <karl@cs.umb.edu>
-
-        * texinfo.tex (\obstexwarn): Use \global to avoid ever getting the
-        warning twice.
-
-        * texinfo.tex (\include): Allow underscores and other such
-        characters we made active in the file name argument.
-
-Tue Feb  6 15:06:27 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\afourlatex): Delete the old duplicate definition
-	of \afourlatex.
-
-Sun Feb  4 15:20:16 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\tab): New definition.
-	(\setuptable): Fix previous change.
-	(\multitablecolspace): Renamed from \multitablecolmargin.
-	(\multitablelinespace): Renamed from \multitablelineskip.
-
-Fri Feb  2 02:20:16 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\multitableparskip): Renamed from \intableparskip.
-	Allocate with \newskip.
-	(\multitableparindent): Renamed from \intableparindent.  Use \newskip.
-	(\multitablelineskip): Renamed from \spacebetweenlines.  Use \newskip.
-	(\multitablecolmargin): Renamed from \spacebetweencols.
-	(\columnfractions): Renamed from \percentofhsize.
-	(xcolumnfractions): Renamed from \xpercentofhsize.
-
-	* texinfo.tex (\setuptable): Handle >1 digits after @percentofsize.
-	(\pickupwholepercent): New macro.
-
-Sun Jan 28 21:14:46 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\key, \kbdfoo): Use \ttsl unconditionally.
-	(\setkeyfont): Definition deleted.
-
-Tue Jan 23 14:57:23 1996  Karl Berry  <karl@cs.umb.edu>
-
-        * texinfo.tex: @kbd within @example selects slanted tty font:
-	(\ttsl, \ttslshape): Define this new font shape.
-        (\kbdfoo): Set the font to \ttsl if already using \tt.
-        (\setkeyfont, \ifmonospace): New macros.
-
-Wed Jan 17 23:57:48 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\changepagesizes): Additional arg for topskip.
-	(\afourlatex): Total rewrite.
-	(\afourwide): Pass new arg to \changepagesizes.
-
-Wed Jan  3 17:15:00 1996  Stephen Gildea  <gildea@x.org>
-
-        * texinfo.tex (\slbshape, \itbshape): Use bold slant and and
-	bold italic in titles to match the bold roman.  Do not use
-        bold sf or bold tt, which would be too heavy.
-
-        * texinfo.tex (\setfont): Pass font name in more pieces.
-        (\*shape): New macros defining symbolic names for all font
-	shapes so can use other font families with different naming
-	conventions.
-
-Wed Jan  3 15:52:18 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\ignoremorecommands): Turn off @everyheading and
-	friends, @headings, @setchapternewpage, @setchapterstyle.
-
-Sat Dec 30 17:20:48 1995  Karl Berry  <karl@cs.umb.edu>
-
-        * texinfo.tex (\inmargin): Don't allow a break before the vertical
-        kern.  Do allow a whole paragraph of marginal text, not just one line.
-	Use \inmarginspacing.
-
-Thu Dec 28 23:22:08 1995  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\inmargin): New command @inmargin.
-	(\dircategory): Ignore @dircategory.
-
-Tue Dec 12 17:25:36 1995  Karl Berry  <karl@cs.umb.edu>
-
-        * texinfo.tex (\lvvmode): Remove this; use \leavevmode as usual,
-        so spaces/underscores at beginnings of lines inside @example work.
-        Bogus index entries should be (and now are, I think) handled in
-        other ways.
-
-Mon Nov 13 16:07:09 1995  Karl Berry  <karl@cs.umb.edu>
-
-        * texinfo.tex (\xrefX): Test for xref-automatic-section-title
-        being @set correctly, and remove spurious redefinition of
-        \printednodename in that case.
-
-Mon Oct 16 15:16:34 1995  Karl Berry  <karl@cs.umb.edu>
-
-        * texinfo.tex (\unsepspaces): New macro to make active space
-        expand into a normal space char in index entries.
-	(\indexdummies): Use \unsepspaces.
-
-Thu Oct 12 14:56:52 1995  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\tie): Use \lvvmode, not \leavevmode.
-	Don't use \@M directly either.
-
-Sun Aug 27 21:17:09 1995  Paul Eggert  <eggert@twinsun.com>
-
-	* texinfo.tex (\appendixsection): Fix misspelled defn.
-
-Mon Jul 31 23:57:57 1995  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\ttfont): Don't call \nohyphenation.
-
-Sun Jul 30 18:30:47 1995  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\tocentry): Use \turnoffactive.
-
-Sun Feb  5 05:34:13 1995  Richard Stallman  <rms@pogo.gnu.ai.mit.edu>
-
-	* texinfo.tex (\boldbraxnoamp): New function.
-	(\deftypefunargs): Use that, not \boldbrax.
-
-Tue Jan 31 12:15:28 1995  Karl Berry  <karl@cs.umb.edu>
-
-        * texinfo.tex (\set): Use \gdef, not \xdef.
-
-Sat Jan 21 16:39:36 1995  Richard Stallman  <rms@pogo.gnu.ai.mit.edu>
-
-	* texinfo.tex: Initially make _ and + \active,
-	then later make them \other.
-	(\otherifyactive): New command.
-
-Thu Jan 19 21:59:22 1995  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\afourwide): New command.
-
-Mon Jan 16 09:29:38 1995  Stephen Gildea  <gildea@x.org>
-
-	* texinfo.tex: Initially make + and _ "other" characters.
-	(\fixbackslash, \everyjob): Make + and _ active characters.
-
-Tue Jan 10 19:16:09 1995  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex: At beginning, \input plain if necessary.
-	(\deftypefunargs): Use \boldbrax, not \functionparens.
-
-Sun Dec 18 16:40:11 1994  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\indsc): Use csc10 (at 9pt), not indrm.
-
-Mon Oct 31 00:51:20 1994  Richard Stallman  <rms@pogo.gnu.ai.mit.edu>
-
-	* texinfo.tex (\changepapersizes): Fix definition syntax.
-	(\fontprefix): Define only if not yet defined.
-
-	* texinfo.tex (\margin): Define a new insert.
-	(\SETmarginindex): Initialize to \relax.
-	(\doindex): Optionally put the entry in the margin.
-	(\pagecontents): Print the index entries put in the margin.
-
-Sat Oct 29 19:50:10 1994  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\auxhat): New macro.
-	(\dosetq): Use \auxhat.
-	(reading the aux file): Give ^ catcode 7.
-
-Wed Oct 26 03:28:04 1994  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\setfont): New macro.  Use it for specifying
-	most of the fonts that are normally cm fonts.
-	(\fontprefix): New macro, normally `cm'.
-
-Mon Oct 24 01:27:09 1994  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\startcontents): Set catcode of ^.
-
-Thu Oct 13 02:19:43 1994  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\ifhtml, \html, \enddots, \?, \!): New commands.
-
-Fri Sep 16 16:30:52 1994  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
-
-	* texinfo.tex (\defheaderxcond): New macro.
-	(\deftypefnheaderx): Use defheaderxcond when calling defname.
-	(\deftypefunheaderx, \deftypevarheader, \deftypevrheader): Likewise.
-
-Fri Aug 26 03:08:08 1994  Amy Hendickson  <amyh@ai.mit.edu>
-
-	* texinfo.tex (\multitable): New command.
-
-Mon Aug  1 14:28:57 1994  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+	* makeinfo/xml.h:
+	* makeinfo/xml.c: new element DIMENSION.
 
-	* texinfo.tex (\changepagesizes, \afourlatex): New macros.
+	* makeinfo/cmds.c (cm_dmn): new function for @dmn.
 
-Tue Jul 12 11:45:58 1994  Karl Berry  (karl@cs.umb.edu)
+2003-12-13  Alper Ersoy  <dirt@gtk.org>
 
-        * texinfo.tex (\quotation): Set \parskip to zero to avoid extra
-        space below the environment.
-	(\quotation): Clean up comments and indentation.
+	* makeinfo/makeinfo.c (main): if TEXINFO_XML_OUTPUT envvar is set,
+	default to XML output.
 
-Wed Jul 13 05:36:40 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+2003-12-13  Alper Ersoy  <dirt@gtk.org>
 
-	* texinfo.tex (\xrefX): Put back, and correct, the test of
-	SETxref-automatic-section-title.
+	* makeinfo/makeinfo.c (main): enabling one output format effectively
+	disables others.
 
-Thu Jul  7 15:57:52 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+2003-12-13  Alper Ersoy  <dirt@gtk.org>
 
-	* Set catcodes of chars 128-255 to \other.
+	* makeinfo/lang.h:
+	* makeinfo/lang.c (current_document_encoding): new function.
 
-Mon Jul  4 15:32:41 1994  Karl Berry  (karl@cs.umb.edu)
+	* makeinfo/xml.c (xml_begin_document): specify encoding in the XML
+	prolog if different from no_encoding.
 
-        * texinfo.tex (\tie): Set \catcode of @ to 11 before using \@M.
+2003-12-13  Alper Ersoy  <dirt@gtk.org>
 
-        * texinfo.tex (\xrefX): Undo \turnoffactive while printing the node
-        name, so _ in node names doesn't come out as the dot accent.
+	* makeinfo/xml.c:
+	* makeinfo/texinfo.dtd: moved documentlanguage out of para.
 
-Sat Jul  2 14:49:26 1994  Karl Berry  (karl@cs.umb.edu)
+2003-12-13  Alper Ersoy  <dirt@gtk.org>
 
-        * texinfo.tex (\tie): Ensure we're in horizontal mode before the
-        \penalty.
+	* makeinfo/float.c (add_new_float): now expects position argument too.
 
-Tue May 10 01:21:28 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+	* makeinfo/insertion.c (begin_insertion): read arguments from @float
+	line, do not look for @anchor.
+	(end_insertion): changed info caption style.
+	(cm_caption): use is_in_insertion_of_type instead of
+	current_insertion_type.
 
-	* texinfo.tex (\donoderef, \unnumbnoderef, \appendixnoderef):
-	Set \lastnode globally.
+	* makeinfo/xml.h:
+	* makeinfo/xml.c: new element floatpos.
+	(xml_begin_enumerate): check actual supplied value, not first digit.
+	Also special case for GPL's silly `@enumerate 0'.  From Aharon Robbins
+	<arnold@skeeve.com> Tue, 9 Dec 2003 12:38:04 +0200.
 
-Sun Apr 17 15:35:43 1994  Karl Berry  (karl@ra.cs.umb.edu)
+2003-12-12  Karl Berry  <karl@gnu.org>
 
-        * texinfo.tex (\~): Define to be a tie.
-        (\ptextilde): New defn to save the plain's tilde accent.
-        (\tex): Restore plain tilde.
+	* doc/texinfo.tex (ifnotdocbook,ifnotxml): define these @-commands.
+	Report from Arnold.
 
-Sun Mar 27 23:35:17 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+	* doc/texinfo.tex (\setfilename): make the \openout\auxfile be
+	\immediate, again.
 
-	* texinfo.tex (\smallbook): Set \defbodyindent and \deftypemargin.
+2003-12-09  Stepan Kasal  <kasal@ucw.cz>
 
-Sun Mar 20 19:47:59 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+	* doc/texinfo.tex (\envparseargdef): New macro, a combination
+	  of \envdef and \parseargdef.
+	  (\enumerate, \float): Use it.
 
-	* texinfo.tex (\xrefX): Define and use \correctnodename.
-	(@turnoffactive): Move after @ becomes available
-	and turn off backslash as well as other chars.  Use @realbackslash.
-	(@normalturnoffactive): Like @turnoffactive but use @normalbackslash.
+2003-12-09  Stepan Kasal  <kasal@ucw.cz>
 
-Sat Mar 19 12:26:25 1994  Karl Berry  (karl@cs.umb.edu)
+	* doc/texinfo.tex (\float, \Efloat, \caption, \shortcaption):
+	(\listoffloats): Adapt to the new environment definition framework.
 
-        * texinfo.tex (\singlespaceskip): Increase to 12.5pt.
-        (\singlespace): Call \setleading instead of just assigning to
-        \baselineskip, so the strut box will be reset.
-        (\smalllispx): Likewise.
+2003-12-09  Stepan Kasal  <kasal@ucw.cz>
 
-Sun Mar 13 20:32:28 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+	* doc/texinfo.tex (\setref, \xrefX): Make the ``\indexnofonts''
+	  setups in these two consistent.
 
-	* texinfo.tex (\dots): Change back to \ldots.
+2003-12-09  Stepan Kasal  <kasal@ucw.cz>
 
-Sat Mar 12 22:34:10 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+	* doc/texinfo.tex (\innernewbox): New macro, non-outer \newbox.
+	  (\newsaveinsX): Use it.
 
-	* texinfo.tex (\indexnofonts): Add %'s to suppress newlines after \def.
+2003-12-09  Stepan Kasal  <kasal@ucw.cz>
 
-Sat Feb 26 15:51:37 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+	* doc/texinfo.tex: after test for epsf.tex, \closein 1, even if the
+	  file wasn't there.
+	  (\summarycontents, \tryauxfile): Similarily, \closein 1 even if eof.
+	  (\startcontents, \contents, \summarycontents): fix indentation.
 
-	* texinfo.tex (\deftexinfoversion): New macro.
-	(\texinfoversion): Define using \deftexinfoversion.
+2003-12-09  Stepan Kasal  <kasal@ucw.cz>
 
-Wed Jan 26 12:40:52 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+	* doc/texinfo.tex (\pdfmakeoutlines): Fix a typo, need
+		\def\thisubsecnum not \let.
 
-	* texinfo.tex (\putwordSee, \putwordInfo, \putwordfile)
-	(\putwordChapter, \putwordAppendix, \putwordSection)
-	(\putwordsection, \putwordpage)
-	(\putwordTableofContents, \putwordShortContents): New macros.
-	Used in various places instead of fixed words.
+2003-12-08  Stepan Kasal  <kasal@ucw.cz>
 
-Mon Jan 24 22:51:36 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+	* doc/texinfo.tex (\makedefun): Add `\def\deffnheader' or the like
+	  at the end; all calls of this macro changed.
 
-	* texinfo.tex (\ignoremorecommands): Turn off @item and @message.
+2003-12-08  Stepan Kasal  <kasal@ucw.cz>
 
-Thu Jan 20 17:01:53 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+	* doc/texinfo.tex (\normaldefunargs): Renamed to ...
+	(\defunargs): ... this; all callers changed.
+	(\ampdefunargs): Nuked, the only call expanded.
 
-	* texinfo.tex (\indexnofonts): Treat accents as dummies.
-	Turn modified European letters into one or more ordinary letters.
+2003-12-08  Stepan Kasal  <kasal@ucw.cz>
 
-Tue Jan 18 14:54:32 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+	* doc/texinfo.tex (\setfilename): Simplify the code for conditional
+	\input of texinfo.cnf.
+	(\contents): Call \pdfmakeoutlines only if .toc exists.
+	(\pdfmakeoutlines): Thus .toc must exist, no need to check again.
+	(\documentlanguage): Simplify, fix indentation.
 
-	* texinfo.tex (\indexdummies): Handle tex accents and European letters.
+2003-12-08  Stepan Kasal  <kasal@ucw.cz>
 
-Wed Nov 24 16:11:51 1993  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+	* doc/texinfo.tex (\center): Separate the horizontal and vetical...
+	(\centerH, \centerV): ... versions; account for \leftskip in \centerV.
 
-	* texinfo.tex (\dots): Use $\,$ for spacing.
+2003-12-08  Stepan Kasal  <kasal@ucw.cz>
 
-Sun Nov 21 22:16:21 1993  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+	* doc/texinfo.tex (\group, \Egroup): Don't call \offinterlineskip;
+	to fix the line spacing after the group, propagate \prevdepth.
+	(Else, @exdent inside @group gets the wrong spacing.)
 
-	* texinfo.tex (\dots): Avoid using \ldots; use periods and kern.
-	(\indexdotfill): Use italic periods.
+2003-12-08  Stepan Kasal  <kasal@ucw.cz>
 
-Fri Nov 19 20:50:31 1993  Roland H. Pesch  (pesch@apple-gunkies.gnu.ai.mit.edu)
+	* doc/texinfo.tex (\acronym): Check for second parameter, ...
+	(\doacronym): using this new function; remove smallcaps.
 
-        * texinfo.tex (\deftypefunargs): use \tclose rather than \code to
-        avoid side effects on active chars
+2003-12-08  Stepan Kasal  <kasal@ucw.cz>
 
-Tue Sep 28 16:01:58 1993  Roland H. Pesch  (pesch@apple-gunkies.gnu.ai.mit.edu)
+	* doc/texinfo.tex (\pdfmakeoutlines): Make the counting macros
+	  robust, so that they won't break on incorrectly nested sections.
+	  (For instance, in the bzip2 manual.)
 
-	* texinfo.tex (\obeyedspace defn): remove blank after \sepspaces
-	(left destructive penalty in vertical list)
+2003-12-08  Stepan Kasal  <kasal@ucw.cz>
 
-Mon Aug 30 14:17:27 1993  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
+	* doc/texinfo.tex (\author): If appears inside a @quotation
+	environment, interpret it as an affiliation; otherwise it has to
+	appear directly inside @titlepage.
 
-	* texinfo.tex (\setref, \unnumbsetref, \appendixsetref): Uncomment
-	\dosetq for title.
-	(\Ytitle): Define as \thissection instead of \thischapter.
-	(\xrefX): If there is no printed-title arg given, and @ifset
-	xref-automatic-section-title, try to use the real section title.
+2003-12-08  Stepan Kasal  <kasal@ucw.cz>
 
-Tue Jul 27 12:47:24 1993  Charles Hannym  (mycroft@trinity.gnu.ai.mit.edu)
+	* doc/texinfo.tex (\argremovec, \argcheckspaces): Add support for
+	continued lines to \parsearg, while ...
+	(\domakedefun, \printdefunline): ... removing it from @defun's ...
+	(\parsedefunline): ... and thus nuking this.
+	(\startdefunx): Replaced by ...
+	(\dodefunx): ... this; it reuses the code of the respective @defun.
 
-	* texinfo.tex (\ifitemxneedsnegativevskip): New \if; set immediately
-	following a short \item.
-	(\itemxpar): \par and then if \ifitemxneedsnegativevskip is set, do
-	a \vskip-\parskip.
-	(\internalBitemx, \internalBxitemx, \internalBkitemx): Use \itemxpar
-	rather than \par.
-	(\itemzzz): Set \ifitemxneedsnegativevskip as appropriate.
+2003-12-08  Stepan Kasal  <kasal@ucw.cz>
 
-Thu Jul 22 16:08:33 1993  Charles Hannum  (mycroft@trinity.gnu.ai.mit.edu)
+	* doc/texinfo.tex (\defparsearg): Rename to ...
+	(\parseargdef): ... this; all uses changed.
 
-	* texinfo.tex (\titlezzz, \finishtitlepage): Explicitly make hrules
-	have a width of \hsize so they aren't too long in smallbook format.
+2003-12-08  Stepan Kasal  <kasal@ucw.cz>
 
-Tue Jun 29 15:56:19 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
+	New framework for environments in texinfo.tex.  It's used like this:
+		\envdef\foo{...}
+		\def\Efoo{...}
+	It's the responsibility of \envdef to insert \begingroup before the
+	actual body; @end closes the group after calling \Efoo.
+	\envdef also defines \thisenv, so the current environment is known;
+	@end checks whether the environment name matches.
+	The \checkenv macro can be used also elsewhere to check whether the
+	current environment is the one expected.
 
-	* texinfo.tex (\deftypefnheaderx): call \normalparens to permit
-	normal typesetting of strings (e.g. for C++ docn) containing `&'
+	Non-false conditionals (@iftex, @ifset) don't fit into this, so they
+	are not treated as enviroments; they don't open a group.
+	(The implementation of @end takes care not to call \endgroup in this
+	special case.)
 
-Fri Jun 25 14:08:44 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
+	* doc/texinfo.tex: All environment definitions, true conditionals and
+	@ifset, @ifclear, changed.
 
-	* texinfo.tex (\nestedignore): turn off \ind... fonts too
-	(primarily for use within @smallexample)
+	Another issue:
+	@set and @value allowed - and _ in variable names, but @clear, @ifset
+	and @ifclear were not ready to accept such variables.
 
-Wed Jun 23 11:58:48 1993  Jim Kingdon  (kingdon@wombat.gnu.ai.mit.edu)
+	* doc/texinfo.tex (@set, @clear, @ifset, @ifclear): Call
+	\makevalueexpandable.
 
-	* longopts.table: Update GDB options.
+2003-12-08  Stepan Kasal  <kasal@ucw.cz>
 
-Sun Jun 20 22:00:11 1993  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
+	* doc/texinfo.tex (\multitable): Move \everytab={} and the check
+	for saved inserts to \everycr; thus \item is \crcr again.
+	(\Emultitable): Call \setpercentfalse only after the last \crcr.
 
-	* lgpl.texinfo: Use @smallexample instead of @example.  Reformat
-	example disclaimer to avoid overfull \hbox.
+2003-12-08  Stepan Kasal  <kasal@ucw.cz>
 
-Mon Jun 14 04:09:47 1993  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+	* doc/texinfo.tex (\readauxfile): Read it, unconditinally;
+	don't open the aux file for writing.
+	(\tryauxfile): A new wrapper around \readauxfile, which checks
+	whether the file exists.
+	(\setfilename): Call \tryauxfile, then open the aux file for writing.
 
-	* texinfo.tex (\entry): Don't make a line of dots
-	if there are no page numbers.
+2003-12-08  Stepan Kasal  <kasal@ucw.cz>
 
-Fri Jun 11 16:35:23 1993  Karl Berry  (karl@cs.umb.edu)
+	* doc/texinfo.tex (\readauxfile): Don't hide serious problems by
+	setting the catcode of backslash to other.
 
-	* texinfo.tex (\defparsebodycommon): New macro from \defvrparsebody.
-	(\deftpparsebody): Call it; can't use \defvrparsebody.
-	(\deftpheaderline, \removeemptybraces): New macros.
+2003-12-08  Stepan Kasal  <kasal@ucw.cz>
 
-Sat May  8 10:49:25 1993  Karl Berry  (karl@cs.umb.edu)
+	* doc/texinfo.tex (\setref): Call \indexnofonts to get nicer names
+	of reference identifiers expanded in \edef.
 
-	* texinfo.tex (\itemzzz): Only change \parskip temporarily, and
-	unskip by it later if the item text is on its own line.
+2003-12-08  Stepan Kasal  <kasal@ucw.cz>
 
-	* texinfo.tex (\tablez): Do \afterenvbreak before the \endgroup,
-	so the \parskip value is the table's, not the surrounding text's.
-	(\vtable, \ftable, \itemizey): Likewise.
-	Note: for most environments, \nonfillfinish deals with this.
+	* doc/texinfo.tex (\scanmacro): Add \spaceisspace, in case we are
+	  in an environment with active spaces; without this, \eatspaces
+	  didn't work.
 
-	* texinfo.tex (\smalllisp): New definition for non-small case, a
-	la @smallexample.
+2003-12-08  Stepan Kasal  <kasal@ucw.cz>
 
-	* texinfo.tex: Delete \message{} at beginning; it does nothing.
+	* doc/texinfo.tex (\scanmacro): Define only one version, using ...
+	  (\scantokens): ... which is a primitive of e-TeX; under ordinary
+	  TeX, define a replacement.
 
-	(These changes are all trying to make space above and below
-	environments more equal.)
-	* texinfo.tex (\singlespace): Don't insert a kern.
-	(\group): Do \offinterlineskip, and reset \par to insert a blank
-	line's worth of space.
-	(\lisppar): Delete meaningless call to \obeyspaces before making
-	the definition.
-	(\Elisp [the outer one]): Rename to \nonfillfinish, and end the
-	paragraph before the group.
-	(\lisp): Set \Elisp (the inner one) to \nonfillfinish
-	(\example, \smallexample, \display, \format, \flushleft,
-	\flushright, \quotation): Use \nonfillfinish.
-	(\lineskipfactor, \strut{height,depth}percent): Set to more exact
-	values.
-	(\setleading): Set \normallineskip and call \normalbaselines, for
-	cleanliness.
+2003-12-08  Stepan Kasal  <kasal@ucw.cz>
 
-Thu May  6 16:00:59 1993  Jeffrey Osier  (jeffrey@deneb.cygnus.com)
+	* doc/texinfo.tex (\spaceisspace): A macro which resets space's
+	catcode to its normal value; use where appropriate.
 
-	* texinfo.tex (\ignoremorecommands): Turn off \set and \clear.
+2003-12-08  Karl Berry  <karl@gnu.org>
 
-Tue Apr 20 17:02:34 1993  Roland H. Pesch  (pesch@apple-gunkies.gnu.ai.mit.edu)
+	* util/texi2dvi: use etex/pdfetex if available.
+	(findprog): new helper fn.
+	* NEWS (texi2dvi): mention this.
+	* doc/texinfo.txi (Format with texi2dvi): use @TeX{} instead of
+	@code{tex}, since we don't literally run `tex' any more.
 
-	* texinfo.tex (\codex): Delete space.
+	* info/session.c (info_select_reference_this_line): don't crash if
+	we have no window->line_starts, as it is after
+	set-screen-height to less than 5.
+	Report from: Christian Biere <christianbiere@gmx.de>,
+	8 Dec 2003 19:12:08 +0100.
 
-Thu Apr 15 14:59:04 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
+	* doc/texinfo.tex (\comma): new command.
 
-	* texinfo.tex (\ignoremorecommands): Turn off @raisesections, @up,
-	@lowersections, @down within false conditionals.
+	* bootstrap: make need for --enable-maintainer-mode more explicit.
 
-Sun Apr 18 04:33:13 1993  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+	* doc/texinfo.tex (\xrefX): otherify everything before getting the
+	-title \csname, so that _'s (et al.) are allowed.
 
-	* texinfo.tex (\code): Define - and _ to permit line-breaking
-	despite the fact that hyphenation is disabled.
-	(\codex, \codedash, \codeunder): New macros.
+2003-12-07  Karl Berry  <karl@gnu.org>
 
-Tue Mar 16 18:19:16 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
+	* doc/texinfo.tex (\xrefX): handle float case.
+	(\parsefloat): take additional optional arg for xref label.
+	(\dofloat): call \setref to define the float in
+	the aux file.
+	(\Yfloat): new macro for \setref.
+	(\floatmagic): new macro for \xrefX and \dofloat
+	to communicate.
 
-	* texinfo.tex (\ignoremorecommands): Turn off @printindex within
-	false conditionals.
+2003-12-03  Karl Berry  <karl@gnu.org>
 
-Sun Mar 14 10:47:36 1993  Karl Berry  (karl@cs.umb.edu)
+	* doc/texinfo.txi (Not Ending a Sentence): mention special
+	entities output for @: in Docbook and XML.
 
-	* texinfo.tex (\footnote): Don't bother to take the footnote text
-	as an argument, and hence don't define as \long.
-        (\footnotezzz): Do \footstrut after we start the paragraph.
-        (Also reformat these macros to make them easier to read.)
+2003-12-02  Alper Ersoy  <dirt@gtk.org>
 
-Fri Feb 26 13:02:44 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
+	* makeinfo/cmds.c (cm_punct): new function to handle @., @! and @?
+	commands.
+	(cm_comment): crunch multiple dashes to a single dash for XML
+	validity.
 
-	* texinfo.tex (@include): Use \thisfile rather than #1 as \input arg.
+	* makeinfo/texinfo.dtd: new entities: period, eosperiod, quest,
+	eosquest, excl, eosexcl.
 
-	* texinfo.tex (\readauxfile): Call \warnedobstrue to turn off warning
-		      re TeX 3.0 on second and subsequent runs.
+2003-12-02  Alper Ersoy  <dirt@gtk.org>
 
-Thu Feb 25 18:03:38 1993  Karl Berry  (karl@cs.umb.edu)
+	* makeinfo/insertion.c (begin_insertion): look for a newline before
+	@anchor and @caption commands in floatenv.
 
-	* texinfo.tex (\realeverypar): Delete, as it was unused.
+2003-12-2 Arnold Robbins  <arnold@skeeve.com>
 
-	* texinfo.tex (\group): Do a \strut in \everypar.
+	* makeinfo/insertion.c (end_insertion): Change tests for docbook
+	and insertion to check current insertion type instead of if deep
+	inside a float insertion.
+	(cm_example, cm_smallexample, cm_lisp, cm_smalllisp, cm_cartouche)
+	(cm_caption): Same.
 
-Mon Feb 22 17:10:06 1993  Karl Berry  (karl@claude.cs.umb.edu)
+	* xml.h (FLOATCARTOUCHE): New constant.
+	* xml.c (texinfoxml_element_list, docbook_element_list): Add "sidebar"
+	for FLOATCARTOUCHE.  For docbook, map @display, @smalldisplay to
+	"literallayout".
+	(replacement_elements): Add entry for CARTOUCHE -> FLOATCARTOUCHE.
+	(xml_begin_docbook_float): Special case for CARTOUCHE, sidebars don't
+	have labels.
 
-	* texinfo.tex (\obeyedspace): Define to be whatever \sepspaces
-	does (and move the definition to after \sepspaces).
+2003-12-01  Karl Berry  <karl@gnu.org>
 
-Wed Feb 17 01:55:20 1993  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+	* doc/texinfo.tex (\float, \listoffloats): new macros for new
+		@-commands -- skeletal implementation only now.
 
-	* texinfo.tex (\nonfillstart): Do \singlespaces and \let\par
-	before \obeylines.
+	From: Aharon Robbins <arnold@skeeve.com>, 1 Dec 2003 17:43:12 +0200:
+	* makeinfo/float.h (current_float_type): declare.
+	* makeinfo/cmds.c (cm_colon): new fn.
+	(command_table): use it for @:.
 
-Fri Feb 12 12:32:56 1993  Roland H. Pesch  (pesch at el_bosque.cygnus.com)
+2003-11-29  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (\obstexwarn): issue message re bug in TeX 3.0.
-          (\nullfont): commented-out redefinition, to enable w/TeX 3.0.
-          (\nestedignore): call \obstexwarn for manuals that may trip bug
+	* doc/texinfo.tex (@turnoffactive): include @unsepspaces, so
+	spaces in anchor names don't expand in the .aux file.  From
+	Stepan.
 
-	* texinfo.tex (\nestedignore): avoid @tex contents with \doignore
+2003-11-28  Karl Berry  <karl@gnu.org>
 
-Thu Feb 11 15:41:06 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
+	* doc/texinfo.txi (Abstract Objects): class names are no longer
+	printed in rm by default.
+	* doc/texinfo.tex (\cite): redefine to always use \sl, never \ttsl.
+	* doc/texinfo.tex (\ttslanted): new macro.
+	(\normaldefunargs): use it for @var; go back to
+	\sl by default.
 
-	* texinfo.tex (\indexdummies): enable @dfn and @emph in index entries
+	* doc/texinfo.txi: document @deftypecv.
 
-Thu Feb 11 13:32:32 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
+2003-11-28  Alper Ersoy  <dirt@gtk.org>
 
-	* texinfo.tex (\ignoremorecommands): ignore @include within
-          failing conditionals
+	* makeinfo/cmds.c (cm_comment): do not perform expansion.
 
-Sat Feb  6 19:44:28 1993  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+2003-11-28  Alper Ersoy  <dirt@gtk.org>
 
-	* texinfo.tex (\nestedignore): Set \globaldefs--make all defs local.
+	* makeinfo/cmds.c (cm_r): also set font-weight to normal in HTML.
 
-Tue Feb  2 15:57:37 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
+2003-11-28  Alper Ersoy  <dirt@gtk.org>
 
-	* texinfo.tex (@raisesections, @lowersections): new commands.
-	* (@up, down): original BFox synonyms for above.
-        * (\numhead, \apphead, \unnmhead): internal macros to map headings
-	to appropriate level
-	* (@nwnode): new synonym for @node, used in newest
-	makeinfo
+	* makeinfo/cmds.c (cm_comment): new function to output comments in
+	HTML, XML and Docbook outputs.
 
-Tue Jan 26 17:05:02 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
+2003-11-28  Alper Ersoy  <dirt@gtk.org>
 
-	* texinfo.tex (\include): avoid group around file contents
+	* makeinfo/index.c: new section and section_name properties in
+	index_elt struct.
 
-Tue Jan 19 18:58:56 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
+	* makeinfo/index.c (index_add_arg): save current section number and
+	title for plain text output.
+	(cm_printindex): simplified printing with no_headers output.
 
-	* texinfo.tex (\ignoremorecommands, used in \nestedignore): also
-	ignore cross-ref commands and \settitle
-        (\setyyy, used in @set): make definitions global
-        (\clearxxx, used in @clear): clear definitions globally
+2003-11-28  Alper Ersoy  <dirt@gtk.org>
 
-Thu Jan 14 17:43:32 1993  Michael I Bushnell  (mib@geech.gnu.ai.mit.edu)
+	* makeinfo/float.h: new section and section_name properties in
+	float_elt struct.
 
-	* texinfo.tex: Added \shorttitlepage.
+	* makeinfo/float.c (add_new_float): save current section number and
+	title for plain text output.
+	(cm_listoffloats): list floats with no_headers too, following
+	printindex @example.
 
-Sat Jan  2 15:01:45 1993  Karl Berry  (karl@cs.umb.edu)
+2003-11-28  Alper Ersoy  <dirt@gtk.org>
 
-	* texinfo.tex (\tclose): Use \spaceskip instead of modifying
-	\fontdimen's to normalize the interword space.
+	* makeinfo/sectioning.h:
+	* makeinfo/sectioning.c (current_sectioning_number)
+	(current_sectioning_title): new functions.
 
-	* texinfo.tex (\t, \key, \tclose): Use \hyphenchar instead of
-	\exhyphenpenalty, to turn off hyphenation for real.
-        (\{no,restore}hyphenation): New macros.
+	* makeinfo/sectioning.c (get_sectioning_number): moved space char at
+	the end of numbers to ...
+	(insert_and_underscore, sectioning_html): here.
+	(get_sectioning_number, insert_and_underscore): keep track of the last
+	number/title to be used by @float, @cindex like commands that need to
+	know in which section they are used.
 
-Sat Jan  2 15:01:45 1993  Karl Berry  (karl@cs.umb.edu)
+2003-11-27  Alper Ersoy  <dirt@gtk.org>
 
-	* texinfo.tex (\t, \key, \tclose): Use \hyphenchar instead of
-	\exhyphenpenalty, to turn off hyphenation for real.
-        (\{no,restore}hyphenation): New macros.
+	* makeinfo/cmds.c (cm_math): new function that encloses @math
+	statements in a math element in XML.
 
-Tue Jan  5 19:15:46 1993  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+	* makeinfo/xml.c:
+	* makeinfo/xml.h: new element math.
 
-	* texinfo.tex (\deftpparsebody): Make synonymous with \defvrparsebody.
+2003-11-27  Alper Ersoy  <dirt@gtk.org>
 
-Sun Dec 27 09:40:08 1992  Karl Berry  (karl@cs.umb.edu)
+	* makeinfo/float.c (cm_listoffloats): made the layout in Info output
+	the same with indices.
 
-	* texinfo.tex (\inforef, \inforefzzz): Use the \ignorespaces
-	primitive instead of \losespace.
-        (\losespace): Delete.
+2003-11-25  Alper Ersoy  <dirt@gtk.org>
 
-	* texinfo.tex (\menu, \direntry): Handle like \ifinfo.
+	* makeinfo/float.c (cm_listoffloats): generate a menu for Info, with
+	automatically shortened captions.
 
-	* texinfo.tex (\unmatchedenderror, \defineunmatchedend): New macros.
-        (\endxxx): Call it, instead of just doing it inline.
-        (\conditionalsucceed, \nece): More new macros.
-        (\iftex): Call \conditionalsucceed.
-        (\Eiftex): Define to give an error at the outer level.
+2003-11-25  Alper Ersoy  <dirt@gtk.org>
 
-	* texinfo.tex (\ignoremorecommands, \nestedignore): New macros.
-        (\ifset, \ifclear): Expand a macro on success as well as failure;
-        also switch to using expansion instead of assignments to act after
-        the conditional.
-        (\if{set,clear}succeed): Call \conditionalsucceed.
-        (\if{set,clear}fail): Call \nestedignore instead of \doignore.
+	* makeinfo/cmds.c (cm_acronym): use acronym element for HTML.
+	Report from: Torsten Bronger <bronger@physik.rwth-aachen.de>
+	Tue, 25 Nov 2003 10:30:52 +0100.
 
-	* texinfo.tex (\clear): Don't insert a spurious space.
+2003-11-25  Alper Ersoy  <dirt@gtk.org>
 
-	* texinfo.tex (\value): Put comment next to definition.
+	* makeinfo/sectioning.c (cm_appendix): reset numbers only when
+	changing enum_marker.
 
-	* texinfo.tex (\setyyy): Call \setzzz, and define the variable as
-	simply the parameter, no \unskip.
-        (\setzzz): New macro; do not globally define the variable.
+2003-11-25  Alper Ersoy  <dirt@gtk.org>
 
-Thu Dec  3 17:24:05 1992  Roland H. Pesch  (pesch@fowanton.cygnus.com)
+	* makeinfo/index.c (cm_printindex): made Appendix matching locale
+	aware.
 
-	* texinfo.tex (croppageout): use same escape-char switching as
-	default output routine.  Permits using _ in TOC entries.
+2003-11-24  Alper Ersoy  <dirt@gtk.org>
 
-Fri Nov 13 17:35:38 1992  Charles Hannum  (mycroft@gnu.ai.mit.edu)
+	* makeinfo/index.c (cm_printindex): also catch Appendix and A.1 kind
+	of numbers with --no-headers Info output.
 
-	* texinfo.tex (indexing): Rewrote double-column mode to fix a
-	rare breakage.
+2003-11-24  Alper Ersoy  <dirt@gtk.org>
 
-Sun Oct 25 07:13:31 1992  Karl Berry  (karl@cs.umb.edu)
+	* makeinfo/insertion.c (cm_example):
+	* makeinfo/xml.c (xml_insert_docbook_image, xml_begin_multitable):
+	moved common floatenv handling to ...
+	(xml_begin_docbook_float): here.
 
-	* texinfo.tex (\obeyedspace): No need to define with \gdef, we're
-	at the outer level.
+	* makeinfo/insertion.c (end_insertion, cm_smallexample, cm_lisp)
+	(cm_smalllisp): insert FLOATEXAMPLE for Docbook if inside @float.
 
-Fri Oct 16 18:04:40 1992  Roland McGrath  (roland@geech.gnu.ai.mit.edu)
+2003-11-24  Alper Ersoy  <dirt@gtk.org>
 
-	* lgpl.texinfo: Change "This program" to "This library" in example
-	copying notice.
+	* makeinfo/insertion.c (is_in_insertion_of_type): don't return the
+	level, as it is not useful.
+	(begin_insertion): instead of is_in_insertion_of_type, use
+	float_active.
 
-Sat Oct 10 09:43:45 1992  Karl Berry  (karl@cs.umb.edu)
+	* makeinfo/insertion.c (cm_example):
+	* makeinfo/xml.c (xml_insert_docbook_image, xml_begin_multitable):
+	insert empty label for @floats with no @anchor.
 
-	* texinfo.tex (\bullet, \minus): Use \implicitmath instead of $.
+2003-11-24  Karl Berry  <karl@gnu.org>
 
-Fri Oct  2 08:35:51 1992  Karl Berry  (karl@cs.umb.edu)
+	* doc/Makefile.am (EXTRA_DIST): remove no-longer-defined
+	noinst_SCRIPTS.
 
-	* texinfo.tex (\Egroup): Don't do the \strut and \nointerlineskip.
+2003-11-24  Akim Demaille  <akim@epita.fr>
 
-Sat Sep 26 09:08:59 1992  Karl Berry  (karl@cs.umb.edu)
+	* configure.ac (HELP2MAN): Look for it.
+	* doc/help2man: Remove.
+	* doc/Makefile.am (HELP2MAN, noinst_SCRIPT): Remove.
+	(common_mandeps): Don't depend on HELP2MAN which can be a complex
+	command such as "missing --run help2man.
 
-        * texinfo.tex (\doignore, \enddoignore): New macros.
-        (\ifinfo): Call \doignore.
-        (\ifxinfoxxx): Deleted.
-	(\ignore, \ifsetfail, \ifclearfail): use \doignore.
+2003-11-24  Karl Berry  <karl@gnu.org>
 
-        * texinfo.tex (\unnumbered): Expand the arg only once for the \message.
+	* doc/texinfo.tex: doc/\global fixes.
 
-        * texinfo.tex (\deftpparsebody, \parsetpheaderline): New macros.
-        (\deftp): Call \deftpparsebody.
+2003-11-24  Alper Ersoy  <dirt@gtk.org>
 
-Thu Sep 24 10:12:45 1992  Karl Berry  (karl@cs.umb.edu)
+	* makeinfo/cmds.c: new command @listoffloats.
 
-        * texinfo.tex (\entry): Do \par first; add comments.
-        (\short{chap,unnumbered}entry,\do{chap,sec,subsec,subsubsec}entry):
-          Call \tocentry, instead of using \vbox.
-        (\tocentry): New macro.
+	* makeinfo/float.c (count_floats_of_type_in_chapter): only count
+	floats with @anchors.
+	(cm_listoffloats): new function.
 
-Sat Sep 19 14:36:11 1992  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+	* makeinfo/insertion.c (end_insertion): do not prepend float type and
+	number if no @anchors.
 
-	* texinfo.tex (\`, \'): Definitions deleted.
+2003-11-24  Alper Ersoy  <dirt@gtk.org>
 
-Fri Sep 18 14:33:09 1992  Roland H. Pesch  (pesch@cygnus.com)
+	* makeinfo/xml.c:
+	* makeinfo/xml.h: new element listoffloats.
 
-	* texinfo.tex (\ifset, \ifclear): Standardize catcode of space as
-	for \ignore.
+2003-11-24  Alper Ersoy  <dirt@gtk.org>
 
-Fri Sep 11 15:25:01 1992  Karl Berry  (karl@hayley)
+	* makeinfo/makeinfo.h: number sections by default.
 
-        * texinfo.tex (\finalout): Move out of final section of file,
-          which claims not to define new control words.
+2003-11-24  Alper Ersoy  <dirt@gtk.org>
 
-        * texinfo.tex (\setleading): New macro.
-        (outer level, @smallbook, @afourpaper): Call it, instead of
-        setting \baselineskip directly.
+	* makeinfo/makeinfo.c (cm_xref): if a reference is being made to a
+	float with only one parameter, use the float number in HTML, and
+	prepend it to the link in Info outputs.
 
-        * texinfo.tex (\|): New definition for changebars.
+2003-11-24  Alper Ersoy  <dirt@gtk.org>
 
-Tue Sep  1 17:32:48 1992  Karl Berry  (karl@hayley)
+	* makeinfo/float.h:
+	* makeinfo/float.c (get_float_ref): new function to retrieve a float's
+	number by its id.
 
-        * texinfo.tex (\begindoublecolumns): Exactly double \vsize.
+2003-11-24  Alper Ersoy  <dirt@gtk.org>
 
-Sat Aug 29 10:12:16 1992  Karl Berry  (karl@hayley)
+	* makeinfo/insertion.c (end_insertion): indent the first paragraph
+	after @float.
 
-        * texinfo.tex (\group): Define \Egroup to use struts instead of
-          letting TeX do its own interline spacing.
+2003-11-24  Alper Ersoy  <dirt@gtk.org>
 
-        * texinfo.tex (\{remove,ignore}activespaces): New macros.
-        (\end): Call \removeactivespaces; give the correct error messages;
-          don't try to expand a nonexistent \E... macro.
+	* makeinfo/cmds.c: new commands @float and @caption.
 
-        * texinfo.tex (\EMsimple): End the help message with a period.
+	* makeinfo/insertion.h: new environment floatenv.
 
-        * texinfo.tex (\gobble): New macro.
-        (\lisp): Call it (instead of defining it every time).
-        (\example, \smallexample): Define \E... within the macro.
+	* makeinfo/insertion.c (cm_float, cm_caption): new functions.
+	(begin_insertion, end_insertion): handle floatenv.
 
-Tue Aug 25 11:56:26 1992  Roland H. Pesch  (pesch@fowanton.cygnus.com)
+	* makeinfo/xml.c:
+	* makeinfo/xml.h: new elements float, floattype, caption, floattable,
+	floatfigure, floatexample.
 
-	* texinfo.tex (\readauxfile): Make + normal while reading aux file.
+	* makeinfo/insertion.c (cm_example):
+	* makeinfo/xml.c (xml_insert_docbook_image, xml_begin_multitable):
+	insert label and id attributes, title element for docbook if used
+	inside @float.
 
-Thu Aug 20 21:32:34 1992  Karl Berry  (karl@hayley)
+	* makeinfo/xml.c: replacements for multitable and informalfigure.
+	(xml_insert_element_with_attribute): special-cased float element for
+	docbook to make it appear in element stack and thus enable element
+	replacements inside floatenv.
 
-        * texinfo.tex (\doublecolumnhsize): Compute value in
-          \begindoublecolumns.
-        (\afourpaper, \smallbook, <outer level>): Remove these (virtually
-          identical) computations.
+2003-11-24  Alper Ersoy  <dirt@gtk.org>
 
-        * texinfo.tex (\doublecolumnvsize): Deleted.
-        (\afourpaper, \smallbook): Don't compute it.
-        (\begindoublecolumns): Just double \vsize here (thus decreasing
-          the value considerably from the old value of 19.1in, which was far
-          too large.)
+	* makeinfo/float.c:
+	* makeinfo/float.h: new files for float environment functions.
 
-Fri Aug 14 10:16:42 1992  Karl Berry  (karl@hayley)
+	* makeinfo/Makefile.am: added new files to makeinfo_SOURCES.
 
-        * texinfo.tex (\parseargx): Use \expandafter instead of
-        \aftergroup to continue the processing.
-        (\parsearglinex): Renamed to \parseargline, since the former
-        \parseargline is no longer needed.
+2003-11-24  Alper Ersoy  <dirt@gtk.org>
 
-	* texinfo.tex (\parseargline) Remove a trailing @c or @comment.
-        (\argremovec, \argremovecomment): New macros.
+	* makeinfo/makeinfo.c (cm_xref): xstrdup the result from
+	xml_get_assoc_for_id, as it gets freed later.
 
-Thu Aug  6 11:28:55 1992  Roland H. Pesch  (pesch@fowanton.cygnus.com)
+	* makeinfo/xml.c (xml_get_assoc_for_id, xml_associate_title_with_id):
+	reimplemented unnumbered_labels handling.
+	(xml_insert_docbook_image): Docbook expects format attribute values to
+	be uppercase.
 
-	* texinfo.tex: extended @set to define expandable vars;
-	  @value expands same.  Auxiliary macros \setxxx, \setyyy
-	  used for @set.
+2003-11-23  Karl Berry  <karl@gnu.org>
 
-Sun Aug  2 14:34:48 1992  Karl Berry  (karl@hayley)
+	* doc/texinfo.tex: doc fix for multitable.
+	* util/gendocs.sh: docbook support, from Simon Josefsson.
 
-        * texinfo.tex (\entry): do line-breaking on the index entry.
+	* doc/texinfo.tex (\defttsl): new font.
+	(\df): set ttsl too.
+	(\deffngeneral,\deftypefngeneral,\deftypecvgeneral,
+	 \deftypheader): call \ampdefunargs or \normaldefunargs.
+	(\normaldefunargs): new macro, typesetting defun
+	 args in ttsl (instead of sl).
+	(\ampdefunargs): treat & specially and then call \normaldefunargs.
+	(\defname): typeset defun name in tt (instead of bf).
 
-Wed Jul  1 17:05:26 1992  Karl Berry  (karl@claude.cs.umb.edu)
+	* doc/texinfo.tex: uniformly comment out eol with {% at macro
+	starts.
 
-        * texinfo.tex (\lparen, \rparen): new definitions.
-        ((,[,],)): new global definitions for these four active
-          characters, so parens and brackets can be used in @deffn names.
+2003-11-23  Alper Ersoy  <dirt@gtk.org>
 
-Sat Jun 27 11:32:58 1992  Karl Berry  (karl@hayley)
+	* makeinfo/insertion.c (is_in_insertion_of_type): return the level
+	where the insertion is found.
 
-        * texinfo.tex (\shortchaplabel): new macro to align chapter and
-          appendix labels.
-        (\shortchapentry): call it.
-        (\shortappendixwidth): new dimen register.
+	* makeinfo/makeinfo.c (search_forward_until_pos): new function that
+	sets search_forward boundary.
+	(text_expansion): also reset docbook.
 
-Wed Jun 24 09:45:34 1992  Karl Berry  (karl@hayley)
+	* makeinfo/sectioning.h:
+	* makeinfo/sectioning.c (current_chapter_number): new function that
+	returns top level chapter numbers.
+	(handle_enum_increment): always do the incrementation. but return
+	strings conditionally.
 
-        * texinfo.tex (\afterenvbreak): make the same as \aboveenvbreak,
-          so space below environments doesn't get lost.
-        (\aboveenvskipamount): rename to \envskipamount, since it's used
-          both above and below.
+	* makeinfo/xml.c: changed screen element's contained_in_para to 0 for
+	Docbook. @lisp/@smalllisp create programlisting.
+	(xml_insert_quotation): reimplemented quotation_stack handling.
 
-Wed Jun 24 09:45:34 1992  Karl Berry  (karl@hayley)
+2003-11-22  Karl Berry  <karl@gnu.org>
 
-        * texinfo.tex (\group): do @comment at the end, to avoid excessive
-          white space when called inside @group.
+	* doc/texinfo.tex (\tocentry): same as \entry, no second 1pt of
+	stretch.  And a couple doc fixes.
 
-Wed Jun 24 16:36:04 1992  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+	* doc/texinfo.txi (Conventions): finally, get rid of @vskip
+	-@baselineskip kludge, we handle index entries after @item's now.
 
-	* texinfo.tex (\startcontents): End page before setting pageno.
+2003-11-22  Stepan Kasal  <kasal@ucw.cz>
 
-Thu May 28 20:27:25 1992  Robert J. Chassell  (bob@hill.gnu.ai.mit.edu)
+	* doc/texinfo.txi: use new @quotation feature.
 
-        * texinfo.tex (\vtable): Like @ftable, but for variables.
+	* texinfo.tex (\putwordDeftypevar, \putwordDeftypefun): Remove.
+	* txi-cs.tex, txi-de.tex, txi-en.tex, txi-es.tex, txi-fr.tex,
+	  txi-it.tex. txi-nl.tex, txi-no.tex, txi-pl.tex, txi-pt.tex,
+	  txi-tr.tex: The same. 
+	[texinfo-20031120-deftype-del.patch]
 
-Fri May 22 07:04:32 1992  Karl Berry  (karl@hayley)
+	* doc/texinfo.tex (\verbatim,\Everbatim): remove one extra level
+	of grouping; move two lines of code ...
+	(\setupverbatim): ... here.
+	(\doverbatiminclude): just call the new \setupverbatim.
+	(\setupverbatiminclude): remove.
+	[texinfo-20031121-verbatim2.patch]
+	
+	* doc/texinfo.tex (\math): no need for \mathcode, and we actually
+		can use $ not \implicitmath.
+	[texinfo-20031121-math.patch]
+
+	* doc/texinfo.tex (\zeroskipmacro): new macro, so we can
+	check for true zero skip.
+	(\dosubindsanitize): use it.
+	[texinfo-20031120-zeroskip.patch]
+	
+	* doc/texinfo.tex (\doignore): scan in verbatim mode.  Without this,
+	if the last line of ignored text ended with ``@'', the ``@end ifxxx''
+	tag was missed.
+	(\dodoignore): use \_STOP_ instead of \ST@P.
+	[texinfo-20031120-ignore-at.patch]
+	
+	* doc/texinfo.tex (\defparsearg): new macro, to simplify places
+	where the user macro just calls \parsearg.  Use it in many places.
+	[texinfo-20031121-defparsearg.patch]
+	
+	* doc/texinfo.tex (\begin): remove, this is undocumented
+	and unused.
+	[texinfo-20031121-begin.patch]
+	
+	* doc/texinfo.tex (\title,\subtitle,\author,...): move to outer
+	level (was inside \titlepage), it's more readable than nested
+	definitions.
+	[texinfo-20031116-titlepage1.patch]
+	
+	* doc/texinfo.tex (\evenheadingxxx,\oddfootingyyy): might as well
+		use \ and avoid changing catcode of @.
+	[texinfo-20031116-catofat.patch]
+	
+	* doc/texinfo.tex (\set): use new macros: \parseargusing and
+	\makecsname.
+	[texinfo-20031116-set.patch]
+	
+	* doc/texinfo.tex (\cartouche): avoid \par if we are already in
+	vertical mode, in case it has an effect, eg. in an @example;
+	avoid extra space from the @cartouche line itself.
+	(\Ecartouche): force vertical mode, so that the \kern has the desired
+	effect.
+	[texinfo-20031120-cart.patch]
+	
+	* doc/texinfo.tex (\ptexfootnote,\ptexinsert): save orig definitions.
+	(\startsavinginserts): new macro (with relatives), call from
+		\cartouche, \group, \table.
+	[texinfo-20031118-saveins.patch]
+	
+	* doc/texinfo.tex (\table, \ftable, \vtable, \tablex, \tabley,
+	\tablez): Cleaned up indentation, etc.
+	(\kitem, \kitemx, \xitem, \xtemx, \description): Removed; they
+	  didn't look as if they would work in their present state, anyway.
+	[texinfo-20031114-table.patch]
+
+	* doc/texinfo.tex (\filenamecatcodes): new macro.
+	(\include,\verbatiminclude): use it, with new \parseargusing.
+	(\pushthisfilestack,etc.): implement our own stack of filenames
+	instead of reading the @include argument in a group.
+	[texinfo-20031109-include.patch]
+	
+	* doc/texinfo.tex (\indexbreaks): remove, and remove call.
+	(\entry): read arguments on the fly, to avoid fixing catcodes.
+	[texinfo-20031121-indexbreaks.patch]
+	
+	* doc/texinfo.tex (\makevalueexpandable): new macro.
+	Change occurrences of \let\value=\expandablevalue to use it,
+	to reduce code duplication.
+	[texinfo-20031121-value.patch]
+
+	* doc/texinfo.tex (\parsedefunlineX,\defunchkspace,defunchktab,
+	\defunloop,\defunchkfinish,\replaceeols): New macros.
+	(\parsedefunline): start them off.  This is to support continuations
+	lines for @defun headers.
+	[texinfo-20031108-defun-cont.patch]
+	
+	* doc/texinfo.tex (\defun and all related commands):
+	rewrite to use \parsearg and uniform command generation.
+	(\makecsname): New macro, to be used within \edef's only.
+	[texinfo-20031120-defun.patch]
+	
+	* doc/texinfo.tex (=, \equalChar): remove active definition of =
+	and hacks that printed = in \tt sometimes.  We want to print
+	everything in \tt anyway, ultimately.
+	[texinfo-20031120-defun-pres3.patch]
+	
+	* doc/texinfo.tex (\defopheader,\defcvarheader,defivarheader):
+	use \code for the class name.
+	[texinfo-defun-pres2.patch]
+	
+	* doc/texinfo.tex (\parsearg): Reset the catcode of space before
+		we scan the argument; so we don't have to worry about
+		obeyed spaces before and after the argument.
+	(\parseargx, \parseargy): Nuke, it was wrong anyway--\obeyedspace,
+	which is a macro, was compared with \temp which could have been let
+	to an obeyed space, but it couldn't be a macro.
+	(\removeactivespaces,\removeactivespacesX,\removeactivespacesY): Nuke.
+	(\argremovespace): If the argument scanned by \parsearg ends with
+	a space, remove it.
+	[texinfo-20031108-parsearg-space.patch]
 
-        * texinfo.tex (\w): do \leavevmode before the \hbox.
+	* doc/texinfo.tex: use \other, for clarity and efficiency;
+		use `\^^M instead of raw number 13.
+	[texinfo-20031108-other.patch]
 
-Sat May 16 11:16:27 1992  Karl Berry  (karl@hayley)
+	* doc/texinfo.tex (\doverbatim): \xdef and \gobble, to avoid
+		the active space between `\end' and `verbatim'.
+	[texinfo-20031120-verbatim.patch]
 
-        * texinfo.tex (\smallbook): decrease \topskip somewhat.
+	* doc/texinfo.tex (\quotationlabel): new macro to print label,
+		with a \bf space.
+	(\quotation): change call so \parsearg is at the end.
+	[texinfo-20031118-quot.patch]
 
-        * texinfo.tex (\group): use \vtop instead of \vbox.
+2003-11-21  Alper Ersoy  <dirt@gtk.org>
 
-        * texinfo.tex (\newlinechar): define for use in help strings.
-        (\groupinvalidhelp): define this for use with \errhelp.
-        (\group): set \errhelp to above.
+	* makeinfo/makeinfo.c (cm_xref): removed the warning about
+	@xrefs to @unnumbered sections, as there are many situations where
+	there is no way to fix them.
 
-Thu Apr 30 16:19:17 1992  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+	* makeinfo/insertion.c: removed lingering titlepage_cmd_present
+	declaration.
 
-	* texinfo.tex (\need): Rewritten by karl.
+2003-11-21  Alper Ersoy  <dirt@gtk.org>
 
-Sat Apr 18 16:24:00 1992  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+	* makeinfo/cmds.c (cm_titlepage, cm_titlepage_cmds): moved to ...
+	* makeinfo/insertion.c: here.
 
-	* texinfo.tex (\exdentamount): New var, set by environments.
-	(\exdent, \exdentyyy): Define suitably for filled environments.
-	Always exdent by innermost indentation step.
-	(\nofillexdent, \nofillexdentyyy): Alternates for nofill envs.
-	(\lisp, \smalllispx, \display): Set \exdent to \nofillexdent.
+	* makeinfo/cmds.h (titlepage_cmd_present): moved to ...
+	* makeinfo/makeinfo.h: here.
 
-Thu Apr  2 15:04:15 1992  Robert J. Chassell  (bob@kropotkin.gnu.ai.mit.edu)
+	* makeinfo/insertion.c (is_in_insertion_of_type): new function to
+	query insertion_stack to see if we are inside a given insertion type.
 
-        * texinfo.tex (\Esmalllisp): Smaller baseline skip for smallexamples.
+	* makeinfo/makeinfo.h:
+	* makeinfo/insertion.c (begin_insertion, end_insertion):
+	* makeinfo/xml.c (xml_add_char):
+	* makeinfo/xml.h: removed xml_in_copying and inside_titlepage_cmd
+	global variables in favor of the new query function.
 
-Sun Mar 29 20:44:49 1992  Brendan Kehoe  (brendan@cs.widener.edu)
+2003-11-21  Alper Ersoy  <dirt@gtk.org>
 
-	* texinfo.tex (\startcontents): Always close contentsfile and
-	adjust the page.
+	* makeinfo/makeinfo.c (discard_until, execute_string): reworded
+	multiline related error messages.
+	(discard_until): rollback input_text_offset only if not dealing with a
+	multiline error, otherwise the same block gets in the way repeatedly.
 
-Fri Mar 27 17:41:52 1992  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+2003-11-21  Alper Ersoy  <dirt@gtk.org>
 
-	* texinfo.tex (\chapternofonts): Deal with \result, \equiv, etc.
+	* makeinfo/xml.h:
+	* makeinfo/xml.c (xml_get_assoc_for_id, xml_associate_title_with_id):
+	new functions.
+	(xml_insert_indexentry): call execute_string(xref) instead of creating
+	references directly.
 
-Sat Mar 21 08:22:29 1992  Karl Berry  (karl at hayley)
+	* makeinfo/makeinfo.c (cm_xref): check to see if xref is being made to
+	an @unnumbered, and only one argument is given.  issue a warning, use
+	@unnumbered's title as the third argument.
 
-        * texinfo.tex (\entry): format entries better if the page number
-          and entry text don't fit on one line.
+	* makeinfo/sectioning.c (sectioning_underscore): keep track of
+	unnumbered sections, and their node names.
 
-        * texinfo.tex (\loggingall, \gloggingall): new macros to help with
-          debugging.
+2003-11-21  Alper Ersoy  <dirt@gtk.org>
 
-Fri Mar 20 15:35:42 1992  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+	* makeinfo/sectioning.c (sectioning_underscore): for Docbook, always
+	provide label attribute for chapter and unnumbered.
+	(handle_enum_increment): simplified enumeration constraints, and
+	changed to follow TeX way.  Moved marker handling to ...
+	(cm_chapter, cm_unnumbered, cm_appendix): here.
+	(cm_appendix): restart numbering.
 
-	* texinfo.tex (\result, \expansion, \print, \equiv):
-	Don't copy prefabricated boxes; must adapt to current font.
-	(\dblarrowbox, \longdblarrowbox, \pushcharbox, \equivbox): Deleted.
-	(\bullbox): Deleted.
+2003-11-21  Alper Ersoy  <dirt@gtk.org>
 
-Thu Mar 19 22:17:14 1992  Robert J. Chassell  (bob@kropotkin.gnu.ai.mit.edu)
+	* makeinfo/insertion.h:
+	* makeinfo/insertion.c: new rawdocbook and rawxml insertion types to
+	provide better block names in error messages (instead of "rawhtml" for
+	everything.)
+	(current_item_function, insertion_type_pname, find_type_from_name)
+	(begin_insertion, end_insertion, discard_insertions, cm_docbook)
+	(cm_xml, cm_item): honor new types.
 
-	* texinfo.tex (\widowpenalty, \clubpenalty): Set them to 10000, since
-          8000 did not work.
+2003-11-21  Alper Ersoy  <dirt@gtk.org>
 
-Fri Mar  6 13:26:36 1992  Robert J. Chassell  (bob@kropotkin.gnu.ai.mit.edu)
+	* makeinfo/makeinfo.c (cm_image): issue only a warning instead of an
+	error when .txt file is unreadable, to better comply with the manual.
 
-	* texinfo.tex (\widowpenalty, \clubpenalty): Set them to 8000, since
-          2000 did not work (but \widowpenalty at 20000 did work).
+2003-11-21  Alper Ersoy  <dirt@gtk.org>
 
-Thu Feb 27 12:27:14 1992  Karl Berry  (karl@wombat.gnu.ai.mit.edu)
+	* makeinfo/sectioning.c (sectioning_underscore): insert label="" only
+	when the output format is Docbook.
 
-        * texinfo.tex (\widowpenalty): set to 2000, not 20000.
+2003-11-21  Alper Ersoy  <dirt@gtk.org>
 
-Sat Feb  8 14:34:45 1992  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+	* makeinfo/insertion.c (cm_end): get rest of the line before returning
+	in case of error, so the parameter to @end does not get leaked into
+	the output document.
 
-	* texinfo.tex (\widowpenalty, \clubpenalty): Set them to 2000.
-	(\itemizeitem): Use penalty 1200.
-	(\itemzzz): Add \nobreak near beginning.
+	* makeinfo/makeinfo.c (discard_until): when the expected string is not
+	found, check to see if we are looking for @end, and if so issue a more
+	descriptive error message.
+	(execute_string): keep track of insertion stack to catch multiline
+	commands where they are not allowed.
+	Report from: Dumas Patrice <dumas@centre-cired.fr>, Wed, 18 Jun 2003
+	09:41:56 +0200.
 
-	* texinfo.tex (\quotation): Increase right margin, instead of
-	left margin twice.
+2003-11-21  Alper Ersoy  <dirt@gtk.org>
 
-Wed Feb  5 12:08:30 1992  Karl Berry  (karl at hayley)
+	* makeinfo/multi.c (multitable_item): start <tbody> immediately if
+	this a regular @item, and first in the table
 
-        * texinfo.tex (\alphaenumerate, \capsenumerate): redefine as a call
-          to \enumerate.
-        (\{lower,upper}caseenumerate): Rename from \{alpha,caps}enumerate.
+2003-11-19  Alper Ersoy  <dirt@gtk.org>
 
-Sun Feb  2 21:07:19 1992  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+	* makeinfo/footnote.c (output_pending_notes): always output footnotes
+	with in_fixed_width_font = 0, so entity substitutions can take place.
 
-	* texinfo.tex (\itemzzz): Compensate in line-by-itself case for
-	a table that is indented.
+2003-11-19  Alper Ersoy  <dirt@gtk.org>
 
-Mon Jan 13 21:04:07 1992  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+	* makeinfo/footnote.c (cm_footnote, output_pending_notes): provide
+	back link from footnote marker.
 
-	* texinfo.tex: Use 26 instead of control-z as character constant.
+2003-11-19  Alper Ersoy  <dirt@gtk.org>
 
-Sat Jan 11 02:20:58 1992  Roland McGrath  (roland@albert.gnu.ai.mit.edu)
+	* makeinfo/insertion.c (cm_insert_copying): remove blockquote from
+	copying_text when inside bookinfo and the output format is Docbook.
 
-	* gpl.texinfo: Unfilled Yoyodyne example.
+2003-11-19  Alper Ersoy  <dirt@gtk.org>
 
-Sat Dec  7 16:16:54 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+	* makeinfo/makeinfo.c (cm_value): return immediately instead of
+	just suppressing bogus warnings.
 
-	* texinfo.tex (\cartouche): Set \nonarrowing.
-	(\lisp, \smalllisp, \quotation, \display): If set, don't narrow.
+2003-11-19  Alper Ersoy  <dirt@gtk.org>
 
-Mon Dec  2 08:15:08 1991  Karl Berry  (karl at hayley)
+	* makeinfo/makeinfo.c (cm_value): do not issue bogus warnings about
+	undefined values when @value is used inside a @menu environment, and
+	the output format is Docbook.
 
-        * texinfo.tex (\itemzzz): don't start a paragraph if the item text
-          is on a line by itself; don't allow a page break after that
-          line; always do \par before typesetting anything.
+2003-11-19  Alper Ersoy  <dirt@gtk.org>
 
-Tue Nov 26 15:13:13 1991  Roland McGrath  (roland@albert.gnu.ai.mit.edu)
+	* makeinfo/sectioning.c (sectioning_underscore): use @settitle value
+	if @top parameter is empty.
 
-	* lgpl.texinfo: @ifset lgpl-appendix, use @appendix instead of
-	@unnumbered.
+2003-11-19  Alper Ersoy  <dirt@gtk.org>
 
-Sun Nov 10 12:00:06 1991  Karl Berry  (karl at hayley)
+	* makeinfo/xml.c (xml_begin_index): make sure we are removing the
+	label attribute and not something else.
 
-        * texinfo.tex (\doprintindex): only \read if the file existed;
-          \closein the test stream in all cases.
-        (\initial, \entry): do not \outer, so that \read does not get an
-          error if the index exists.
+2003-11-19  Alper Ersoy  <dirt@gtk.org>
 
-Fri Nov  8 18:13:28 1991  Michael Bushnell  (roland@churchy.gnu.ai.mit.edu)
+	* makeinfo/sectioning.c (get_sectioning_number): do not append space
+	with Docbook.
+	(sectioning_underscore): insert label attribute to make
+	distinction between chapter and unnumbered in Docbook.
+	(handle_enum_increment): also increment for Docbook.
 
-	* texinfo.tex (\itemizey): missing %'s in macro defn.
-	  Also, add \begingroup; accidentally deleted by Karl Berry.
+	* makeinfo/xml.c (xml_begin_index): remove label attribute from index
+	element.
 
-Thu Nov  7 11:41:25 1991  Karl Berry  (karl at hayley)
+2003-11-18  Karl Berry  <karl@gnu.org>
 
-        * texinfo.tex (\doprintindex): \read from the index file to make
-          \ifeof true when the file exists but is empty.
+	* cmds.c (command_table): new commands @deftypecv, @deftypecvx.
+	* defun.c, insertion.[ch], xml.c: implement them.
 
-Tue Nov  5 08:29:13 1991  Robert J. Chassell  (bob at grackle)
+2003-11-18  Alper Ersoy  <dirt@gtk.org>
 
-        * texinfo.tex (@thischaptername): Provide default value for when
-          @chapter not defined.
+	* makeinfo/makeinfo.c (execute_string): better para handling in case
+	of nested executions.
 
-Sat Nov  2 17:59:02 1991  Karl Berry  (karl at hayley)
+2003-11-18  Karl Berry  <karl@gnu.org>
 
-        * texinfo.tex (\itemizezzz): do \begingroup here, since \itemizey
-          can't any longer.
+	* doc/texinfo.txi (Multi-column Tables): include cmd name in
+	section name.
+	(Multitable Rows): use @headitem in example.
 
-Tue Oct 29 12:17:41 1991  Robert J. Chassell  (bob at grackle)
+2003-11-17  Alper Ersoy  <dirt@gtk.org>
 
-        * texinfo.tex: @paragraphindent defined as a no op.
+	* makeinfo/xml.c (xml_begin_document): upgraded docbook DTD to Docbook
+	XML 4.2.
 
-Fri Oct 25 15:19:47 1991  Karl Berry  (karl at hayley)
+	* makeinfo/makeinfo.c (cm_xref):
+	* makeinfo/xml.c (xml_insert_docbook_image, xml_insert_indexentry)
+	(xml_begin_multitable): close previously open-tag-only elements.
 
-        * texinfo.tex (\enumeratey): allow any lowercase letter, uppercase
-          letter, or number as argument; initialize \itemno and begin the
-          environment's group here.
-          (\itemizey): don't initialize \itemno here.
-          (\numericenumerate, \startenumeration): new macro.
+2003-11-17  Karl Berry  <karl@gnu.org>
 
-Wed Oct 23 16:26:30 1991  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+	* bootstrap: honor environment variables.
 
-	* texinfo.tex (\ifclear, \ifset): Remove \outer.
+2003-11-17  Alper Ersoy  <dirt@gtk.org>
 
-	* texinfo.tex (\afourpaper): Set various parameters.
+	* makeinfo/makeinfo.c (execute_string): end paragraphs if
+	executing @copying text with xml.
 
-Tue Oct 22 18:42:31 1991  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+	* makeinfo/xml.c: disallow nested quotations, legalnotice in abstract,
+	and samp in var with Docbook.
 
-	* texinfo.tex (\alphaenumerate, \capsenumerate):
-	Let @end enumerate end these.
-	(\Ealphaenumerate, \Ecapsenumerate): Aliases for \Eenumerate.
+2003-11-17  Alper Ersoy  <dirt@gtk.org>
 
-Sun Oct 20 18:23:18 1991  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+	* makeinfo/insertion.c (begin_insertion): keep @copying state.
+	use legalnotice instead of abstract for @copying.
+	(cm_insert_copying): removed redundant work arounds.
 
-	* texinfo.tex (\mainmagstep): New parameter macro.
-	(Defining fonts): Use that parameter to scale them.
-	If \bigger is defined, use 12 point fonts.
+	* makeinfo/makeinfo.c (execute_string): try to keep tags balanced with
+	Docbook and xml.
 
-Tue Sep 24 00:30:07 1991  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
+	* makeinfo/xml.c
+	(xml_current_stack_index, xml_end_current_element): new functions.
+	(xml_add_char): enclose @copying text in a quotation element with
+	Docbook.
 
-	* texi2dvi: Iterate over the right variable to look for new idx files.
+2003-11-17  Alper Ersoy  <dirt@gtk.org>
 
-	* texi2dvi: GPL 2.
+	* makeinfo/cmds.c (cm_settitle): do not automatically start bookinfo
+	element after settitle.
 
-	* texi2dvi: Fix 2nd invocation of texindex to pass right args.
+2003-11-17  Alper Ersoy  <dirt@gtk.org>
 
-Wed Sep 11 20:52:42 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+	* makeinfo/xml.c (xml_synindex): new function to keep track of index
+	redirections.
+	(xml_insert_indexterm): added a check to see if any index
+	redirections are made.
 
-	* texinfo.tex (\cartouche): New macro.
+	* makeinfo/index.c (cm_synindex): let xml_synindex() handle xml part.
 
-Fri Aug 23 16:13:46 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+2003-11-17  Alper Ersoy  <dirt@gtk.org>
 
-	* texinfo.tex (\section, \subsection, \subsubsection):
-	Initially define for numbered chapters.
+	* makeinfo/makeinfo.c (cm_uref):
+	* makeinfo/xml.c: use ulink for @uref with Docbook.
 
-Fri Aug  2 01:46:09 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+2003-11-16  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (\footnote): Use \unskip instead of \removelastskip.
+	* util/install-info.c: protoize.
+	* util/texindex.c: protoize.
+	* util/dir-example (protoize,unprotoize): add.
 
-Mon Jul 29 14:06:54 1991  Roland H. Pesch  (pesch at cygint.cygnus.com)
+	* doc/texinfo.tex (\everytab): new \toks.
+	(\headitem): use it to typeset in bold.
+	(\item): reset it.
 
-	* texinfo.tex (\majorheadingzzz, \chapheadingzzz, \chfplain,
-	\unnchfplain, \unnchfopen, \secheadingi, \subsecheadingi,
-	\subsubsecheadingi): allow line breaks in headings.
-	(\shortchapentry, \shortunnumberedentry, \dochapentry, \dosecentry,
-	\dosubsecentry, \dosubsubsecentry): allow line breaks in table of
-	contents entries.
+2003-11-15  Karl Berry  <karl@gnu.org>
 
-Thu Jul 18 19:01:53 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+	* doc/texinfo.txi (quotation): document it.
+	* doc/texinfo.tex (\quotation): accept optional argument.
+	(\doquotation): new macro to test for and typeset it.
 
-	* texinfo.tex (\secfonts, \indexfonts): Fix typos.
+	* doc/texinfo.txi (Multitable Rows): document @headitem.
 
-Sun Jul  7 16:36:28 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+	* doc/texinfo.tex (\headitem): error by default, redefine inside
+	@multitable (= \dotable).  New command suggested by Arnold.
 
-	* texinfo.tex (\afourpaper): New command.
+2003-11-15  Akim Demaille  <akim@epita.fr>
 
-	* texinfo.tex (\numberedsec): Renamed from \section.
-	(\numberedsubsec): Renamed from \subsection.
-	(\numberedsubsubsec): Renamed from \subsubsection.
-	(\chapter, \appendix, \unnumbered): Define \section, \subsection,
-	and \subsubsection here according to type of chapter.
+	* util/texi2dvi (fatal): New function. Use it.
+	(txiversion): Be robust to broken texinfo.tex.
 
-Thu Jul  4 14:19:32 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+	* doc/texinfo.txi (example): mention use of @r for annotations.
 
-	* texinfo.tex (\defvarparsebody, \defvrparsebody, \defopvarparsebody):
-	New functions.
-	(\defvar, \defvr, \defopt, \defcv, \defivar): Use them.
-	(\deftypevar, \deftypevr): Likewise.
+2003-11-15  Alper Ersoy  <dirt@gtk.org>
 
-Mon Jul  1 13:49:25 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+	* makeinfo/cmds.c: new command @headitem.
 
-	* texinfo.tex (\group): Report error if used outside @example, etc.
+	* makeinfo/insertion.c (cm_headitem): new function.
 
-	* texinfo.tex (\defname): Reduce \leftskip
-	to cancel temporarily the increase made in \defparsebody.
+	* makeinfo/insertion.h: new variables to keep head item state.
 
-	* texinfo.tex (\enumerate): Allow optional arg to specify type
-	of counting.
+	* makeinfo/multi.c (multitable_item, end_multitable):
+	* makeinfo/xml.c (xml_end_multitable_row, xml_end_multitable):
+	insert thead element if @headitem is used.
+	
+	* makeinfo/xml.h: new element THEAD.
 
-	* texinfo.tex (\set, \clear): New commands.
+	* makeinfo/texinfo.dtd: updated multitable structure.
 
-Mon Jun 24 12:22:44 1991  Roland McGrath  (roland@albert.gnu.ai.mit.edu)
+	* NEWS: announced @headitem.
 
-	* texinfo.tex (\eleterate): Renamed to \alphaenumerate.  Sigh.
-	(\ecapitate): Likewise \capsenumerate.
+2003-11-14  Alper Ersoy  <dirt@gtk.org>
 
-Thu Jun  6 20:02:48 1991  Roland McGrath  (roland@geech.gnu.ai.mit.edu)
+	* makeinfo/makeinfo.c (cm_xref): make use of third and fifth arguments
+	of @xref with Docbook.
 
-	* lgpl.texinfo: Created from /fsf/rms/gnuorg/lgpl.text.
+	* makeinfo/xml.c: use Docbook citetitle for @cite.
 
-	* gpl.texinfo: Created from /fsf/rms/gnuorg/gpl.text (GPL v2).
+2003-11-13  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (\eleterate, \ecapitate): New commands, like @itemize,
-	but with [a..z] or [A..Z] instead of [1..n].
+	* doc/texinfo.tex: doc fixes.
 
-Tue May 21 15:46:32 1991  Karl Berry  (karl at hayley)
+	* configure.ac, NEWS: autoconf 2.59.
 
-        * texinfo.tex (\dmn): new command to typeset a dimension.
+2003-11-13  Akim Demaille  <akim@epita.fr>
 
-Tue May 21 20:58:22 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+	* configure.ac: Use AC_CHECK_DECLS, not txi_CHECK_DECLS.
+	Also use # instead of dnl for comments.
+	* acinclude.m4: Remove.
 
-	* texinfo.tex (\doind, \dosubind): Make new group around \indexdummies
-	and most of body, excluding the \penalty commands.
+2003-11-14  Alper Ersoy  <dirt@gtk.org>
 
-Mon May 20 21:16:32 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+	* makeinfo/cmds.c (cm_noindent): output continued paragraphs with
+	docbook and xml only when @noindent command is used.
+	(cm_noindent_cmd): new function.  Patch from Arnold Robbins
+	<arnold@skeeve.com>, 13 Nov 2003 15:43:02 +0200.
 
-	* texinfo.tex (\tex): Typo in redefining \@.
+2003-11-11  Alper Ersoy  <dirt@gtk.org>
 
-	* texinfo.tex (\_): Use \lvvmode, not \leavevmode.
-	(\lvvmode): New macro.
+	* makeinfo/cmds.c (cm_i, cm_b, cm_r): do not use lineannotation if we
+	are printing indices.
 
-	* texinfo.tex (\authorrm, \titlerm): Move to after section fonts.
+	* makeinfo/insertion.c (cm_insert_copying): removed unnecessary xml
+	fix.
 
-Tue May 14 21:13:29 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+	* makeinfo/texinfo.dtd: added OElig and oelig entities.
 
-	* texinfo.tex (\defunargs): Set \hyphenchar in \tensl, not \sl.
+2003-11-11  Alper Ersoy  <dirt@gtk.org>
 
-Thu May  9 17:07:08 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+	* makeinfo/cmds.c (cm_sp): disabled parameter expansion.
 
-	* texinfo.tex (\ignore): Standardize catcode of space.
+2003-11-10  Alper Ersoy  <dirt@gtk.org>
 
-Wed May  8 13:49:45 1991  Karl Berry  (karl at hayley)
+	* makeinfo/cmds.c:
+	* makeinfo/insertion.c (cm_html): do not process @xml blocks.
+	(cm_xml): new function to process @xml.
 
-        * texinfo.tex (\sffam, \sf): New macros; support sans serif
-	type style in math.
-        (top level): Set up \textfonts early on, so we can create boxes w/ it.
-        (\tenrm...\tensf): Define these to be \textrm...\textsf instead.
-        (\df, \textfonts, \chapfonts, \secfonts, \subsecfonts):
-        (\indexfonts): Redefine \tenrm (etc.) instead of just \rm, so that
-	the math family assignment doesn't get lost; call \resetmathfonts.
-        (\resetmathfonts): New macro; redefines \textfont of each math family.
-        (\indsc, \indi, \indsy \chapsc, \chapi, \chapsy, \secsc, \seci):
-        (\secsy, \ssecsc, \sseci, \ssecsy): New font definitions.
+	* makeinfo/xml.c (xml_start_para, xml_end_para): skip para handling in
+	footnote.
+	(xml_insert_footnote): keep state in xml_in_footnote variable.
 
-Mon May  6 21:30:19 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+	* makeinfo/texinfo.dtd: updated settitle definition.
 
-	* texinfo.tex (\indexdummies): Write \_ when an _ is seen.
+2003-11-10  Karl Berry  <karl@gnu.org>
 
-Mon Apr 29 01:41:44 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+	* doc/texinfo.txi (Output Formats): rewrite to fix underfull
+	boxes.
 
-	* texinfo.tex (\defname): Use \dimen2, \dimen3 for outer margins.
-	Use outer margins for influencing \rightline.
-	(\tclose, \key, \t): Turn off line breaks at hyphens.
+2003-11-10  Alper Ersoy  <dirt@gtk.org>
 
-Fri Apr 12 03:12:14 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+	* doc/texinfo.tex (\commondummies): added registeredsymbol.
 
-	* texinfo.tex (\authorrm): Move definition to top level; copy \secrm.
+2003-11-09  Alper Ersoy  <dirt@gtk.org>
 
-Tue Apr  2 22:48:39 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+	* makeinfo/makeinfo.c (main): fixed a segfault with --html
+	--no-header.
 
-	* texinfo.tex (\defname): Adjust size of \rlap box, not \dimen0
-	or \dimen1, for current width.
+2003-11-09  Alper Ersoy  <dirt@gtk.org>
 
-	* texinfo.tex (\Yappendixletterandtype): End with {}.
+	* makeinfo/html.c (html_output_head): output node name in title first.
 
-Sat Mar 30 16:13:25 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+2003-11-09  Alper Ersoy  <dirt@gtk.org>
 
-	* texinfo.tex (\xrefX): Really use \cite.
-	(\inforefzzz): Use \samp for node name.
+	* makeinfo/xml.c:
+	* makeinfo/xml.h: new Docbook elements for quotation: tip, note,
+	important, warning, caution.
 
-	* texinfo.tex (\defname): Use current width for \dimen0, \dimen1.
+	* makeinfo/xml.c: better font tags for Docbook.
+	(xml_insert_quotation): new function that is aware of specialized
+	Docbook elements for quotation.
+	(xml_insert_entity): use add_char() instead of insert() for correct
+	paragraph handling.
 
-	* texinfo.tex (\doprintindex): Put lots of whitespace before index.
+	* makeinfo/insertion.c (begin_insertion, end_insertion): use
+	xml_insert_quotation() for quotations.
+	(cm_quotation): removed quotation element insertion.
+	(cm_insert_copying): also work around xml tags.
 
-Fri Mar 29 17:00:58 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+	* makeinfo/cmds.c (cm_b): really use bold with Docbook.
 
-	* texinfo.tex (\xrdef): Take out last change.
+	* NEWS: @quotation changes.
 
-	* texinfo.tex (\needx): Turn off \baselineskip.  Use kern, and no glue.
+2003-11-08  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (\shortcontrm): Renamed from \truesecrm.
-	(\shortcontbf, \shortcontsl): New fonts for short contents lines.
-	(\summarycontents): Use them.
+	* doc/texinfo.txi (registeredsymbol): new node.
 
-	* texinfo.tex (\defname): Don't set \leftskip to 0; just decrease by
-	one indent level.
-	(\defparsebody, \def*parsebody): Increment both margins by one level.
+	* doc/Makefile.am (HELP2MAN): invoke explicitly from $(srcdir), in
+	case . is not in PATH.
 
-Tue Mar 26 22:41:38 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+	* configure.ac (AC_CONFIG_HEADERS): apparent AM_CONFIG_HEADERS is
+	obsolete now, and we get to use AC_CONFIG_HEADERS again.
 
-	* texinfo.tex (\xrdef): Change catcode before reading args.
+	* doc/texinfo.txi (Fonts): mention <lineannotation> feature in
+	Docbook feature.
 
-Wed Mar 20 14:21:57 1991  Roland McGrath  (roland at geech.gnu.ai.mit.edu)
+	* doc/texinfo.txi (itemx): warn not to use blank lines between
+	@itemx's.
 
-	* texi2dvi: Use p modifier in sed -n command, so it works.
-	Duplicate code to find the index files, instead of being smart in
-	one place and dumb in another.
+2003-11-08  Alper Ersoy  <dirt@gtk.org>
 
-Thu Mar  7 17:08:32 1991  Richard Stallman  (rms at mole.ai.mit.edu)
+	* makeinfo/cmds.c (cm_i, cm_b, cm_r): for Docbook, use <lineannotation>
+	in @example-like environments.
+	(cm_r): For HTML use <span> to make sure we always get roman text.
 
-	* texinfo.tex (\defaultparindent): New variable.
-	(\footnotezzz): Reset \parindent to default.
-	(\xrefX): Use \cite for printed manual and node names.
+	* makeinfo/xml.c:
+	* makeinfo/xml.h: new docbook element <lineannotation>.  Added also to
+	replace_elements to avoid nesting.
 
-Tue Mar  5 13:39:34 1991  Richard Stallman  (rms at mole.ai.mit.edu)
+2003-11-08  Alper Ersoy  <dirt@gtk.org>
 
-	* texinfo.tex (\emergencystretch feature): Use \thisisundefined.
+	* doc/texinfo.txi (Custom Headings): removed a newline that broke
+	Docbook output.
 
-Mon Mar  4 00:35:57 1991  Richard Stallman  (rms at mole.ai.mit.edu)
+	* NEWS:
+	* makeinfo/cmds.c: new command @registeredsymbol
 
-	* texinfo.tex (\ftablex): Define \Eftable; undefine \Etable.
+	* makeinfo/cmds.c (cm_registeredsymbol): new function.
+	(cm_code): fixed in_fixed_width_font adjustment for XML and Docbook
+	outputs.
+	(cm_noindent, cm_indent): set xml_no_indent as well.
 
-	* texinfo.tex (\footnote): Discard preceding whitespace.
+	* makeinfo/makeinfo.c (reader_loop): use entities for double quotes
+	and dashes in HTML, XML and Docbook outputs.
 
-	* texinfo.tex: Use the \emergencystretch feature if available.
+	* makeinfo/multi.c (setup_multitable_parameters): convert
+	@columnfractions to integer percentages (original code from Arnold
+	Robbins <arnold@skeeve.com>.)
+	(multitable_item, cm_tab): add width attribute to <td> element if
+	@columnfractions is used.
 
-Fri Feb 22 03:50:58 1991  Richard Stallman  (rms at mole.ai.mit.edu)
+	* makeinfo/texinfo.dtd: added an optional role attribute to para
+	element (used for @noindent.)  New attributes ldquo, rdquo, ndash,
+	mdash, registered.
 
-	* texinfo.tex (\tex): Make + not active.
+	* makeinfo/xml.c: replaced repeated command element with more
+	appropriate Docbook elements in docbook_element_list.
+	(xml_start_para, xml_end_para): new functions to centralize paragraph
+	handling.
 
-Fri Feb 15 10:05:24 1991  Roland McGrath  (mcgrath at cygint.cygnus.com)
+	* makeinfo/xml.h: new variable xml_no_indent.
 
-	* texi2dvi: Use $TEXINFO in place of $TEX (falling back to $TEX
-	if $TEXINFO is undefined).
+2003-11-07  Karl Berry  <karl@gnu.org>
 
-	* texi2dvi: Renamed from texinfo.  Bob (I believe) did this at some
-	point at and didn't make a ChangeLog entry.  I'd shoot him myself if
-	he weren't the person who signs my paychecks.
+	* bootstrap: run the various auto* tools we need instead of
+		autoreconf, which copies in older versions of files.
 
-Sun Feb 10 22:51:52 1991  Richard Stallman  (rms at mole.ai.mit.edu)
+	* doc/Makefile.am (texinfo): remove the special rule, it seems to
+		be fixed.
 
-	* texinfo.tex (\doprintindex): If index is empty, print a dummy.
-	(\need): Use vskips and penalties; don't use \pagetotal.
+	* Makefile.am (AUTOMAKE_OPTIONS): bump to 1.7.8.
+	* doc/version.texi, doc/version-stnd.texi: cvs add these again,
+	because with AM_MAINTAINER_MODE they are not created
+	(unless --enable-maintainer-mode is given).
 
-Fri Feb  8 17:36:53 1991  Richard Stallman  (rms at mole.ai.mit.edu)
+	* doc/Makefile.am (*.1) [MAINTAINER_MODE]: use this conditional
+	instead of TEXINFO_MAINT, now that we have it.
+	* configure.ac (TEXINFO_MAINT): no longer needed, since we call
+	AM_MAINTAINER_MODE.
 
-	* texinfo.tex (\ignoresections):
-	Turn off \contents, \smallbook and \titlepage.
+2003-11-06  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (\Etitlepage): Do a page break before ending the group.
+	* bootstrap: ok, restore --force since it doesn't help Alper
+	anyway.
 
-	* texinfo.tex (\setref, \unnumbsetref, \appendixsetref):
-	Comment out recording the chapter title.
+	* AUTHORS: Silly syntax.
+	* bootstrap: no --force, everything is considered obsolete then
+	(thanks Alper).
 
-Thu Jan 24 23:28:41 1991  Richard Stallman  (rms at mole.ai.mit.edu)
+2003-11-06  Alper Ersoy  <dirt@gtk.org>
 
-	* texinfo.tex (\top): Synonym for \unnumbered.
-	(\infotop): Synonym for \infounnumbered.
-	(\ignoresections): Handle \top.
+	* makeinfo/html.c (html_output_head): add <link> elements pointing to
+	top, up, next, prev nodes when splitting output, and to top when not
+	splitting.  Also provide a link to Texinfo homepage.
+	(add_link): use nodename as title attribute.
 
-Thu Jan 24 12:41:33 1991  Richard Stallman  (rms at mole.ai.mit.edu)
+2003-11-05  Alper Ersoy  <dirt@gtk.org>
 
-	* texinfo.tex: Delete spurious character at beginning.
+	* makeinfo/html.c (html_output_head): append node name to title if
+	splitting.  Escape special chars in title.
 
-Thu Jan 17 16:34:25 1991  Roland McGrath  (roland at cygint.cygnus.com)
+	* makeinfo/node.c (cm_node): removed <link> elements from HTML node
+	navigation <div> as they are only allowed in <head>.
 
-	* texinfo: Check the exit status of tex and texindex.  Don't procede
-	after a failing run.
+2003-11-05  Alper Ersoy  <dirt@gtk.org>
 
-Thu Jan 10 15:16:47 1991  Richard Stallman  (rms at mole.ai.mit.edu)
+	* doc/texinfo.txi (Installing Dir Entries): fixed @uref for Free
+	Software Directory.
+	(Command List): Escaped @/.
 
-	* texinfo.tex (\xrefX): Get rid of blank line.
+	* info/display.c (handle_tag, handle_tag_start, handle_tag_end): new
+	functions.
+	(display_update_one_window): ignore the text between magic
+	tags/cookies.
 
-Wed Jan  9 18:06:20 1991  Richard Stallman  (rms at mole.ai.mit.edu)
+	* makeinfo/cmds.c (cm_dots, cm_enddots): use insert_string() for HTML
+	to avoid escaping.
+	(cm_bullet): use entity name (bull) instead of number (149).
 
-	* texinfo.tex (\entry, \secondary): Use \indexdotfill.
-	(\indexdotfill): New macro.
+	* makeinfo/index.c (cm_printindex): escape expanded_index.
 
-Tue Jan  8 17:44:01 1991  Richard Stallman  (rms at mole.ai.mit.edu)
+	* makeinfo/lang.c (cm_accent_generic_html): handle @dotless{i}
+	correctly.
+	(cm_special_char): use entity names for @OE (OElig) and @oe (oelig)
+	instead of numbers.
 
-	* texinfo.tex (\donoderef): Define a ...-title cross-reference.
-	(Ytitle): Subroutine for that.
-	(xrefX): Use the real title by default (but this is commented out).
+	* makeinfo/node.c (cm_node): escape node names in HTML output.
 
-Tue Jan  1 23:18:21 1991  Richard Stallman  (rms at mole.ai.mit.edu)
+	* makeinfo/xml.c (xml_id): check to see if the character is allowed.
+	
+	* makeinfo/tests/accent-text.txi: new @dotless{j} lines.
 
-	* texinfo.tex (\indexnofonts): Delete troublemaking blank line.
+	* makeinfo/tests/accent: look for &acute;j instead of &acute;i.
 
-Sat Dec 22 00:47:21 1990  Richard Stallman  (rms at mole.ai.mit.edu)
+	* TODO: removed item about @dotless in HTML output.
 
-	* texinfo.tex (\xrefX): Prevent extra space.
+2003-11-04  Karl Berry  <karl@gnu.org>
 
-Fri Dec 21 21:14:50 1990  Richard Stallman  (rms at mole.ai.mit.edu)
+	* util/Makefile.am (EXTRA_DIST): spurious space after trailing
+	backslash.
 
-	* texinfo.tex (\comment, \commentxxx): Ignore @ in comment.
+	* configure.ac (AC_PREREQ): 2.58.
 
-Thu Dec 13 22:38:31 1990  Chris Hanson  (cph at kleph)
+2003-11-03  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (\defivarheader): Capitalize "Variable".
+	* util/Makefile.am (EXTRA_DIST): add gdoc.
 
-Sun Dec  2 01:46:04 1990  Richard Stallman  (rms at mole.ai.mit.edu)
+2003-11-02  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (\indexdummies, \indexnofonts): Handle \t like \r.
+	* util/gendocs.sh: doc fix.
 
-	* texinfo.tex (heading fonts): New fonts based on cm...12.
+	* doc/texinfo.txi (Using Texinfo): merge most details into ...
+	(Output Formats): ... this section.
 
-Tue Nov 27 16:59:35 1990  Richard Stallman  (rms at mole.ai.mit.edu)
+	* util/dir-example (VM): add.
 
-	* texinfo.tex (\indexnofonts): Also supersede \TeX and \dots.
+2003-11-01  Alper Ersoy  <dirt@gtk.org>
 
-Sun Nov 18 16:18:14 1990  Richard Stallman  (rms at mole.ai.mit.edu)
+	* doc/texinfo.txi (Conditional Commands): Docbook text should
+		really use @ifdocbook.
 
-	* texinfo.tex (\*): End with \ignorespaces.
+	* info/info.c (raw_escapes_p): 1 by default.
+	(long_options): new option no-raw-escapes.
+	* doc/info-stnd.texi (Invoking Info): document it.
 
-Fri Nov  2 17:41:48 1990  Richard Stallman  (rms at mole.ai.mit.edu)
+2003-10-31  Alper Ersoy  <dirt@gtk.org>
 
-	* texinfo.tex (\*): Output empty hbox to avoid losing whitespace.
-	(\deftypevarheader, \deftypevrheader): End the paragraph
-	with suitable penalties.
-	(\deftypevrheader): Do print the data type.
+	* makeinfo/xml.c:
+	* makeinfo/xml.h:
+	* makeinfo/insertion.c (handle_verbatim_environment): use
+	<![[CDATA...]]> for @verbatim in docbook output too.
 
-Thu Nov  1 12:04:52 1990  Richard Stallman  (rms at mole.ai.mit.edu)
+2003-10-31  Karl Berry  <karl@gnu.org>
+
+	* TODO: image scaling in html needed.
+	* makeinfo/cmds.c (cm_strong): only give the warning if we're
+	actually producing Info output.
+
+	* makeinfo/cmds.c (cm_strong): reword message and check for only
+	*Note:, not *Note:*.  From: Kevin Ryde <user42@zip.com.au>, 31 Oct
+	2003 06:19:05 +1000.
+
+2003-10-29  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (\defmethodheader): Print `method', not `operation'.
+	* doc/texinfo.txi (Def Cmd Template): shorten.
+	* makeinfo/makeinfo.c: help message.
+	* doc/texinfo.tex: version update.
+	* makeinfo/texinfo.dtd: update copyright.
+
+2003-10-28  Alper Ersoy  <dirt@gtk.org>
+
+	* makeinfo/cmds.c: output correct elements for @command,
+	@env, @file, @option and @samp commands, and also handle
+	@titlepage in xml output.  New commands: @docbook,
+	@ifdocbook and @ifnotdocbook for conditional docbook output.
+
+	* makeinfo/defun.c (args_from_string): allow comma to be
+	recognized as a separate token to help XML side of things.
+	(process_defun_args): let xml.c handle xml output.
+
+	* makeinfo/insertion.c: handle @verbatim properly when
+	outputting xml.  This means: surround data with a <verbatim>
+	block, use <![[CDATA ... ]]> and disable escaping.
+	Recognize @titlepage, @docbook, @ifdocbook and
+	@ifnotdocbook.
+	(cm_insert_copying): do not trust the consistency of
+	copying_text, because full_expansion doesn't let open
+	docbook elements to be closed.
+	(cm_item): generate correct index entries in xml output.
+
+	* makeinfo/insertion.h: new insertion types: ifdocbook,
+	ifnotdocbook, titlepage.
+
+	* makeinfo/lang.c: notify language changes with
+	@documentlanguage in xml output, using <documentlanguage
+	xml:lang=".." /> elements.
+
+	* makeinfo/makeinfo.c: trailing encoding settings in html
+	output are commented.  Do not append any encoding settings
+	to xml and docbook outputs.  Set process_docbook variable
+	for @docbook, etc. and updated --help about it.
+	(set):
+	(clear): Output @set and @clear in xml so it's possible to
+	pass variables to further processors.
+
+	* makeinfo/makeinfo.h: process_docbook and
+	inside_titlepage_cmd (to check validity of @author, @title,
+	@subtitle, etc.)
+
+	* makeinfo/sectioning.c: heading-only commands (@chaphading,
+	etc.) do not start/end sections in xml output.  They are now
+	equivalents of the title element.
+
+	* makeinfo/toc.c: @contents and @shortcontents now appear in
+	the output.
+
+	* makeinfo/xml.c: changed element_list typedefs to also note
+	whether an element is filled.  Prefilled elements get
+	xml:space="preserve" attribute.  Added xml prolog.  Root element
+	in xml output gets the document language like it does in
+	docbook, but with xml:lang.  Removed indentation for xml
+	output.  Also lines in paragraphs are joined.
+	(xml_process_defun_args):
+	(xml_begin_definition):
+	(xml_end_definition):
+	(xml_begin_def_term):
+	(xml_end_def_term): functions to handle @def environments.
+
+	* makeinfo/xml.h: new elements in xml_element enum:
+	TITLEPAGE, AUTHOR, BOOKTITLE, BOOKSUBTITLE, COMMAND_TAG,
+	ENV, FILE_TAG, OPTION, SAMP, CONTENTS, SHORTCONTENTS,
+	DOCUMENTLANGUAGE, VERBATIM, SETVALUE, CLEARVALUE, DEF*.
+	(Suffices of COMMAND_TAG and FILE_TAG are to avoid variable
+	name clashes.)
+
+	* makeinfo/texinfo.dtd: updated to reflect changes.
+
+	* doc/texinfo.tex: skip @docbook and @ifdocbook.
+
+2003-10-28  Karl Berry  <karl@gnu.org>
+
+	* util/gendocs.sh: new -o option to specify output directory.
+
+2003-10-27  Karl Berry  <karl@gnu.org>
+
+	* lib/system.h (LC_MESSAGES): no longer needed according to
+	Bruno, libintl.h defines it.
+	Message of 16 Jul 2003 18:17:23 +0200.
+
+2003-10-27  Stepan Kasal  <kasal@ucw.cz>
+
+	* doc/texinfo.tex (\defname): be sure to declare the space
+	  we get from \rightskip in the first line.
+	  (\parsebodycommon): Be careful not to issue \medbreak after
+	  \penalty 2000.
+	  (\defxbodycommon): The penalty changed from 2000 to 3000;
+	  it should be higher that the one in \parsebodycommon.
+	  -- added "@c vim:sw=2:" near the end, for my comfort.
+
+2003-10-27  Stepan Kasal  <kasal@ucw.cz>
+
+	More cleanup of active chars in @defxx arguments:
+
+	* doc/texinfo.tex (\opnr, \clnr): Reimplemented, ...
+	  (\oprm, \clrm, \opnested, \ampnr): ... nuking these, and using ...
+	  (\parenfont, \infirstlevel, \bfafterword): ... 3 new macros, ...
+	  (\ifampseen): ... and a new \if.
+	  (\brackcount): New count, to count also square braces, ...
+	  (\lbrb, \rbrb): ... here.
+	  (\checkparencounts): Macros to check whether both counts get back
+	  to 0; ...
+	  (\badparencount, \badbrackcount): ... if not, issue an error
+	  message and reset the respective count.
+	  (\deftypefnheaderx): Don't call \normalparens, it has no effect.
+	  (\defvarargs): Call \boldbrax instead of \normalparens.
+	  (\normalparens): Nuked.
+
+2003-10-26  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* info/session.c (info_menu_or_ref_item): If point is before all
+	the cross-references, use the first one as the default, instead of
+	setting which to -1 and crashing.  (Patch originally sent 2000-10-09.)
+	Debian bug 74278, reported from: Josip Rodin <joy@cibalia.gkvk.hr>,
+	7 Oct 2000 19:44:24 +0200.
+
+2003-10-26  Karl Berry  <karl@gnu.org>
+
+	* configure.ac (AM_MAINTAINER_MODE): enable, to avoid lossage
+	when Texinfo sources are imported into other
+	repositories (NetBSD, TeX Live).
+	Most recently suggested by Thomas Klausner
+	<wiz@danbala.ifoer.tuwien.ac.at>, 9 Sep 2003 14:57:09 +0200.
+
+	* makeinfo/node.c (validate_file): ensure tem1 && tem2 before
+	running STREQ.  Report from: Akim Demaille <akim@epita.fr>,
+	13 Oct 2003 10:43:10 +0200.
+
+	* doc/Makefile.am (infokey.1): new target.
+	(man_MANS): include infokey.1.
+	Noticed this in Debian diff.
+	
+	* util/texi2dvi: check for tex up front; inspired by Debian diff.
+
+	* TODO: makeinfo -E should do simple macro expansion, not
+	validity checking (even syntax, for @tex processing).
+
+	From: Stepan Kasal <kasal@ucw.cz>, 24 Oct 2003 19:10:02 +0200.
+	Start at making makeinfo -E behave more like a macro preprocessor,
+		avoiding consistency checks.
+	* makeinfo/insertion.c (cm_menu,cm_detailmenu): avoid checks if
+	macro_expansion_output_stream.
+	* makeinfo/makeinfo.c (main): set validating=0 if
+	macro_expansion_output_stream.
+
+	* util/texi2dvi (comment_iftex_sed): don't think we need to
+	comment out @ifhtml sections here, makeinfo will not expand them
+	by default.
+
+2003-10-25  Karl Berry  <karl@gnu.org>
+
+	* info/info.c: --raw-escapes affects Info files, not just man
+	pages.
+
+	* doc/texinfo.tex: novalis doesn't like my clarification, so make
+	it a special exception instead.
+
+2003-10-24  Stepan Kasal  <kasal@ucw.cz>
+
+	* doc/texinfo.tex (\defname): Cleanup of this macro.
+	  (\boldbraxnoamp): Nuked, it's equivalent to \boldbrax;
+	  the caller changed.
+	  Other minor cleanups around active paretheses.
+	  (\defunargs): After reporting the "Unbalanced paretheses" error,
+	  reset the count.
 
-Fri Oct 26 17:11:08 1990  Richard Stallman  (rms at mole.ai.mit.edu)
+2003-10-24  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (makeinfo advantages): mention that plain text
+	--no-headers does --enable-encoding.
 
-	* texinfo.tex (\indexdummies): Temporarily redefine \_.
-	(\ptexdots): Copy of plain tex \dots.
-	(\tex): Temporarily reinstall that.
+2003-10-23  Karl Berry  <karl@gnu.org>
 
-Fri Oct 19 16:57:48 1990  Richard Stallman  (rms at mole.ai.mit.edu)
+	* makeinfo/macro.c (define_macro): write the macro definition
+	itself to the output stream, to give texinfo.tex a chance at it.
+	Report from: Akim Demaille <akim@epita.fr>, 22 Oct 2003 17:15:34
+	+0200.
+
+	* doc/texinfo.tex (\readauxfile): make the \openout\auxfile be
+	\immediate, to avoid spurious terminal output from the
+	\immediate's in \setref.
 
-	* texinfo.tex (\subsubsecheadingi, \subsecheadingi): New subroutines.
+2003-10-23  Stepan Kasal  <kasal@ucw.cz>
 
-Mon Oct  8 13:34:19 1990  Richard Stallman  (rms at mole.ai.mit.edu)
+	Rewrite \parsearg:
+	* doc/texinfo.tex (\parsearg, \parseargusing): \parseargusing is
+	  a new macro which works just like good old \parsearg but takes
+	  one more parameter which contains code to be performed within
+	  a group just before we slurp the rest of the line---typically,
+	  some catcode chages go here.
+	  (\parseargx): Insert an \empty token before the arg to be read,
+	  to prevent loosing of braces.  (Thus @end{foo} no longer works.)
+	  (\parseargline, \argremovecomment, \argremovec): Change the way
+	  comments are stripped; do not use \toks0.
+	  (\removeactivespaces): is now called directly from \parsearg (via
+	  \parseargusing and \argremovec), and stripps only the trainling
+	  active spaces, doesn't perform expansion.
+	  (\finishparsearg): New macro, finishes \parsearg by nuking the
+	  added \empty token.
+	  (\end, \endxxx): Don't call \removeactivespaces, don't use \toks0;
+	  because of efficiency, move the error handling to ...
+	  (\badenderror): ... a new macro.
+	  (\doverbatim): ``\end{verbatim}'' changed to ``\end verbatim.''
 
-	* texinfo.tex (active _): Use \normalunderscore.
+	Cleanup of various details with active spaces.
+	  (\parseargx): Do the \futurelet and move the rest ...
+	  (\parseargy): ... to a new macro;
+	  (\parseargusing): caller changed;
+	  (\parseargdiscardspace): the other caller nuked.
+	  (\obeyedspace, \sepspaces, \unsepspaces): Move near to \parsearg.
+	  (\obeyedspace): Is now a macro containing the active space.
+	  (\unsepspaces): No longer makes spaces active.
+	  (\ignoreactivespaces): Nuked, it's only appearance in ...
+	  (\aliasxxx): ... replaced by direct code.
 
-Tue Sep 25 22:32:55 1990  Richard Stallman  (rms at mole.ai.mit.edu)
+2003-10-23  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (\deftypefn, \deftypevar, \deftypevr): New macros.
-	Their subroutines also new.
+	* doc/texinfo.tex: comments at top.
 
-Tue Sep 25 16:42:52 1990  Roland McGrath  (roland at geech.ai.mit.edu)
+	* AUTHORS: add kama.  (kama's address is now khmarbaise@gmx.de.)
 
-	* texinfo: Recognize `.tex' as a suffix.
+2003-10-21  Karl Berry  <karl@gnu.org>
 
-Tue Sep 25 01:46:54 1990  Richard Stallman  (rms at mole.ai.mit.edu)
+	* util/gendocs.sh: revision of mohit's original.
+	* util/Makefile.am (EXTRA_DIST): add gendocs.sh and
+		gendocs_template.
 
-	* texinfo.tex (\deftypefun): New macro.
-	(\deftypefunheader, \deftypefunheaderx, \deftypefunargs): Also new.
+2003-10-20  Karl Berry  <karl@gnu.org>
 
-Fri Sep 14 00:38:28 1990  Roland McGrath  (roland at churchy.ai.mit.edu)
+	* makeinfo/cmds.c (handle_include): only close_paragraph if
+	!insertion_stack, else we get extra blank lines when
+	used inside @example.
+	* makeinfo/insertion.c (handle_verbatim_include): likewise, plus
+		move the indentation around.
+	Report from: Brian Gough <bjg@network-theory.co.uk>,
+	20 Oct 2003 14:36:49 +0100.
 
-	* texinfo: Weed out files that have two-letter extensions but don't
-	start with a backslash, and therefore aren't index files.
+	* makeinfo/makeinfo.c (close_paragraph): formatting changes to
+		minimize lines.
 
-	* texinfo: Handle index files that have any two-letter extension,
-	rather than using a static list of extensions.
+	* makeinfo/insertion.c (end_insertion): for html output in the
+	example/etc. case, kill_self_indent to get rid of
+	leading whitespace.
+	Report from: Brian Gough <bjg@network-theory.co.uk>,
+	20 Oct 2003 14:36:49 +0100.
 
-	* texinfo: Handle .texi extension as well as .texinfo.
+2003-10-16  Karl Berry  <karl@gnu.org>
 
-	* texinfo: New file, a sh script to do .texinfo -> .dvi.
+	* doc/texinfo.tex (\shortcontbf): cmb10 scaled \magstep1, not cmb12,
+	since cmb12 is not a standard font.
+	Report from: Staszek Wawrykiewicz <staw@gust.org.pl>,
+	16 Oct 2003 06:44:40 +0200.
 
-Mon Sep 10 13:14:39 1990  Richard Stallman  (rms at mole.ai.mit.edu)
+2003-10-14  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (\math): New macro.
+	* lib/xstrdup.c: put old version back, we're not ready for gnulib
+	xmalloc yet.
 
-Tue Sep  4 07:43:33 1990  Karl Berry  (karl at hayley)
+	* makeinfo/insertion.c: undo xml_no_para change, it causes more
+	problems than it solves, according to Alper (Ersoy, <dirt@gtk.org>).
 
-        * texinfo.tex (\chfplain): Do not print a period after the chapter
-        number, for consistency with sections et al.
+2003-10-12  Karl Berry  <karl@gnu.org>
 
-        * texinfo.tex (\refX): hyphenate `undefined' so that the ligature
-        is not lost.
+	* makeinfo/insertion.c (begin_insertion,end_insertion): in rawhtml
+	case (also used for rawxml), increment and decrement xml_no_para.
 
-        * texinfo.tex (_): use \_ unless we're in tt.
-        (\ifusingtt): new macro for such conditionalization.
+	* makeinfo/lang.c (cm_documentencoding): force the normal (info)
+	expansion when reading the arg, even when parsing xml/html/docbook.
+	Report from: Kevin Ryde <user42@zip.com.au>,
+	13 Oct 2003 10:02:23 +1000.
 
-        * texinfo.tex (\xrefX): don't use \unhbox to print the node names,
-        since that loses on hyphens.
-	Use \ignorespaces rather than \losespace.
+2003-10-09  Karl Berry  <karl@gnu.org>
 
-Thu Aug  2 07:03:26 1990  Karl Berry  (karl at hayley)
+	* doc/texinfo.tex (\chapterzzz,...,\unnumberedsubsubseczzz): make
+	section number settings \global.  Otherwise, when chapters are
+	@included, they are ineffective and every chapter is numbered 1.
+	For instance, the Emacs and Elisp manuals.  Thanks to Stepan for
+	analysis.
 
-        * texinfo.tex (\linenumber): new macro.
-        (\refx): give the line number in the message.
+	* doc/texinfo.tex: add arch-tag for miles.
 
-Tue Jul 31 09:13:32 1990  Karl Berry  (karl at hayley)
+2003-10-08  Stepan Kasal  <kasal@ucw.cz>
 
-        * texinfo.tex (\refx): improve warning messages, remove
-        unnecessary groups, and improve logic.
+	* doc/texinfo.tex (\onepageout): At the beginning of \shipout, call
+	    \pdfdest directly, not via \pdfmkdest.
+	  (\pdfmkdest): Call also \atdummies before \pdfdest.
+	  (\donoderef): Remove the unsuccessful attempt to expand \lastnode
+	    before passing it to \setref (it only expanded `{' twice);
+	    things would screw up if \lastnode was expanded too much.
+	  (\setref): Rewritten, don't call \atdummies, don't expand
+	    \thissection.
+	  (\dosetq, \internalsetq, \Ypagenumber, \Ytitle): Nuked.
+	  (\chfplain): Remove referrence to \Ytitle from a comment.
 
-Thu Jul 26 20:53:38 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+2003-10-08  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (\subheading, \subsubheading): Missing macros defined.
+	* doc/texinfo.tex: spurious space and comment (from Stepan).
 
-Thu Jul 19 22:48:26 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+	* NEWS: automake 1.7.8.
+	* util/dir-example: include netpbm.
 
-	* texinfo.tex (\titlepage): Don't print rule for \page unless already
-	printed a rule.
-	(\abstract): Deleted.
-	(\direntry): New command, much like \ignore.
+2003-10-07  Karl Berry  <karl@gnu.org>
 
-Sun Jul 15 16:28:42 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+	* doc/texinfo.tex (\defbf, shortcontbf): use \bfshape instead of
+	\bxshape, so we use cmb consistently instead of cmbx.
 
-	* texinfo.tex (\abstract): New construct; trivial in tex.
+	* doc/texinfo.txi: more index entries for em/en dashes, fix
+		capitalizations of cindex entries.
 
-Sun Jun 17 01:03:16 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+2003-10-07  Stepan Kasal  <kasal@ucw.cz>
 
-	* texinfo.tex (\defcv): Protect space before `of'.
-	(\defspec): Capitalize `Form'.
+	* doc/texinfo.tex (\defname): Don't use \ifempty.
+	  (\ifempty): Nuke.
 
-Sat Jun 16 19:36:56 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+2003-10-06  Stepan Kasal  <kasal@ucw.cz>
 
-	* texinfo.tex (\kbd, \kbdfoo): Use \par to term. arg to \kbdfoo.
+	* doc/texinfo.tex (\dosubind, \doind): Cleanup, move code ...
+	  (\dosubindwrite, \dosubindsanitize): ... to new macros,
+	  (\emptymacro): and nuke this one.
 
-Fri Jun 15 10:47:12 1990  Robert J. Chassell  (bob at pogo.ai.mit.edu)
+	* doc/texinfo.tex (\Ypagenumber): Add `\noexpand,' so that ...
+	  (\dosetq): ... doesn't have to redefine \folio.  Move \iflinks ...
+	  (\setref): ... here.
 
-	* texinfo.tex (\defcv): Use \defcvarheader instead of (undefined)
-	\defcvheader.
+2003-10-06  Karl Berry  <karl@gnu.org>
 
-Fri May 25 18:04:31 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+	* doc/texinfo.tex (\setdeffont): remove; this used DEF instead of
+	def, and thus had no effect for some years, so
+	clearly no one has been using it.  Noticed by Stepan.
 
-	* texinfo.tex (\xrefX): Use \turnoffactive.
+2003-10-04  Karl Berry  <karl@gnu.org>
 
-Mon May 21 21:17:34 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+	* doc/texinfo.txi: document hyphen -> dash suppression in literal
+	contexts, and verbatim commands not working inside other commands.
+	Report from: Luc Teirlinck <teirllm@dms.auburn.edu>, 2 Oct 2003
+	22:45:14 -0500,
 
-	* texinfo.tex (\turnoffactive): New command.
-	(\normaldoublequote, ...): New commands.
-	(\dosetq): Use \turnoffactive.
+	* doc/texinfo.tex (\commondummies,\indexnofonts): no-op @verb; I
+	doubt this is sufficient to make @verb work in index entries etc.,
+	but it's a start.  Analysis from: Andreas Schwab <schwab@suse.de>,
+	02 Oct 2003 18:54:40 +0200.
 
-Sat May 19 12:31:17 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+2003-09-28  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (\indit): Use slanted font, not italic.
-	(\smalllispx): Do \indexfonts.
+	* TODO: add item for conversion of non-texinfo manuals.
 
-Fri May	 4 17:35:04 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+2003-09-26  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (\footnote, \footnotezzz): Make it \long.
+	* CVSROOT/loginfo: back to log_accum.
 
-Wed May	 2 01:19:55 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+	* doc/texinfo.tex (\parsebodycommon): increase \penalty between
+	headers to 2000 from 0.
+	(\defxbodycommon): check for 10002, not 1000.  We don't want to
+	allow a page break after a section heading.  Hmm, but it seems
+	this should never be called next after a section heading?
 
-	* texinfo.tex (\titlerm): Go back to cmbx10 scaled \magstep5.
-	(\hsize): Don't set it, use the default.
+2003-09-25  Karl Berry  <karl@gnu.org>
 
-Fri Mar 23 21:07:02 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+	* makeinfo/cmds.c (cm_strong): warn if argument is exactly
+	"Note:", since that conflicts with Info usage.  Suggestion from
+	rms.
 
-	* texinfo.tex (\footnote): Read arg in braces, not as a line.
+2003-09-24  Karl Berry  <karl@gnu.org>
 
-Mon Mar 19 19:30:08 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+	* doc/texinfo.tex (\dosubind): must propagate penalty after all,
+	because we insert a non-discardable item (the whatsit), which
+	makes following glue a breakpoint.  Now I understand (maybe).
+	(\sectionheading): must end with \nobreak after
+	all, purely to make \lastpenalty 10000 so future code can check
+	that and avoid breaks.
+	(\parsebodycommon): such as this code; don't do a
+	\medbreak if lastpenalty >=10000.
 
-	* texinfo.tex (\unnumbsubsubsecentry): Typo in name being defined.
+	* doc/texinfo.tex (\tocindent): decrease to 2pc.
+	(\{app,unn}sub{sub,}secentry): redefine so that they
+	indent properly.
 
-Tue Mar 13 18:49:27 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+2003-09-23  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (\defvarargs): Add penalty at end.
+	* doc/texinfo.tex (\dosubind): remove my misbegotten idea of
+	propagating the penalty; all that did was increase the chance of a
+	valid breakpoint.  Bug report from: Werner LEMBERG <wl@gnu.org>,
+	23 Sep 2003 15:47:31 +0200.
+	(\numhead,\apphead,\unnmhead): avoid spurious
+	blank spaces, for cleanliness.
 
-	* texinfo.tex (\synindex, \syncodeindex): Copy one index file name
-	into the other.
+	* CVSROOT/loginfo: syncmail instead of external log_accum.
+	* doc/texinfo.tex (\sectionheading): remove extraneous \nobreak,
+	found by Stepan (of course).
 
-Tue Mar	 6 16:58:54 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+2003-09-22  Stepan Kasal  <kasal@ucw.cz>
 
-	* texinfo.tex (\deftt): Make this a distinct font.
+	* doc/texinfo.tex (\sectionheading): the space below a section
+	  heading should have fixed size; \nobreak after a \vskip is
+	  redundant.
 
-	* texinfo.tex (\initial): Define \tt like \tentt.
+2003-09-21  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (\ifinfo): End with \losespace.
-	(\ignore, \ifsetfailxxx, \ifclearfailxxx): Likewise.
+	* doc/texinfo.tex (\sectionheading): make space below be half of
+	space above, and don't add \parskip to space above.  Suggestion
+	from Han-Wen Nienhuys <hanwen@cs.uu.nl>, implementation ideas from
+	Stepan Kasal <kasal@math.cas.cz>, 16 Sep 2003 11:30:43 +0200.
 
-Sun Mar	 4 19:55:57 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+2003-09-21  Stepan Kasal  <kasal@ucw.cz>
 
-	* texinfo.tex (\lbrb, \rbrb): Use \bf.
+	* doc/texinfo.tex (\dosuppressfirstparagraphindent): change the
+	  redefinition of \indent and \noindent and factor out common
+	  parts of all redefinitions to ...
+	  (\restorefirstparagraphindent): ... a new macro.
 
-Sat Mar	 3 17:53:22 1990  Richard Stallman  (rms at geech)
+2003-09-20  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (\onepageout): Set \escapechar here.
+	* makeinfo/macro.c (cm_alias): do not expand when calling
+	get_until_in_line, since xml/docbook expansion is empty.
+	Report from: Richard Kreuter <kreuter@anduril.rutgers.edu>,
+	17 Sep 2003 17:59:58 -0400.
 
-	* texinfo.tex (\rawbackslash): Define using \chardef.
+	* info/signals.c: Clear the screen when exiting from a SIGQUIT.
+	From: Wojciech Polak <polak@gnu.org>, 19 Sep 2003 10:27:28 +0200.
 
-	* texinfo.tex (\@): Use ttfont.
+2003-09-16  Stepan Kasal  <kasal@ucw.cz>
 
-Thu Mar	 1 16:37:46 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+	* doc/texinfo.tex (\sectionheading): there is no need to insert
+	  \nobreak before a kern which is not followed by
+	  a glue.  Such a kern is not a permissible breakpoint.
 
-	* texinfo.tex (Ysectionnumberandtype, Yappendixletterandtype):
-	Capitalize "chapter", "appendix" and "section".
+2003-09-16  Simon Law <sfllaw@uwaterloo.ca>
 
-Mon Feb 19 20:26:22 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+	* doc/texinfo.tex (\dosuppressfirstparagraph): Gobble \noindent
+	if it occurs in the first paragraph.
+	(\ptexnoindent): for saving/restoring \noindent in @tex.
+	(\footnote): Neutralise the effect of @noindent within a footnote.
 
-	* texinfo.tex (\xkey): Attempt to eliminate spurious space from
-	output.	 Look at y-or-n-p.
+2003-09-16  Karl Berry  <karl@gnu.org>
 
-Mon Feb 12 16:34:00 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+	* doc/texinfo.tex: Changes to make pdf references go to the correct
+	place on the page.  This is most easily testable
+	at high magnifications (I used 400% and 800%).
+	(\output): put \the\pageno pdfdest at very
+	beginning of \shipout.(\dopdfoutline): new macro.
+	(\pdfmakeoutlines): recompute all section numbers.
+	(\unnumberedno): \newcount.
+	(\chapterzzz,\appendixzzz,\unnumberedzzz,
+	 ..., \unnumberedsubsubseczzz): abstract common
+	elements, keep track of numbering for everything.
+	(\doheading,\dosubheading,\dosubsubheading): call
+	\sectionheading directly instead of \plain*secheading.
+	(\chfplain, \sectionheading): take additional section type
+	argument; call \writetocentry and \donoderef.  
+	(\unnchfopen): mention this is deprecated.
+	(\writetocentry): handle "omit" case, and
+	\global\pdfmakepagedesttrue.
+	(\startcontents, \summarycontents): sectioning
+	commands take an extra arg.
+	(\dosub*secentry): take extra arg with section
+	number; change callers.
+	(\pdfcatalog): move this call to the opening PDF
+	commands, for clarity.
+	(\unnumbnoderef): no longer needed, collapsed into
+	\donoderef.(\Yomitfromtoc): new xref constant.
+	(\Ynumbered,\Yappendix): renamed from
+	\Ysectionnumberedandtype and
+	\Yappendixletterandtype, for clarity.
 
-	* texinfo.tex (\errorbox): Get \dimen0 from \tentt.
+	* doc/texinfo.txi (cartouche): omit invalid @group.
 
-Sun Feb 11 15:11:57 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+	* makeinfo/node.c (cm_node): restore accesskey= on the <link>s.
+	From hanwen.
 
-	* texinfo.tex (\defunargs): Use ragged right for args.
-	Add large penalty at end.
+2003-09-15  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex: Make active definition for = using \tt, but disable.
-	(\defparsebody): Make = active.
-	(\defunheader, etc.): Make inactive again.
+	* util/dir-example: add guile-tut.
 
-	* texinfo.tex (\errorbox): Try to equalize outside space to both sides.
+	* info/session.c (info_follow_menus): take the first best_guess
+	rather than the last.
+	From: Rob Browning <rlb@defaultvalue.org>,
+	15 Sep 2003 01:26:17 -0500.
 
-Fri Feb	 2 14:47:21 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+2003-09-13  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (\appendix): Don't use \the before \appendixletter.
+	* automake 1.7.7.
 
-Sat Dec 16 14:02:56 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+	* makeinfo/insertion.c (begin_insertion): start cartouche html output
+	with <p>.  @cartouche can't be used meaningfully
+	within a paragraph.
+	Report from: Simon Josefsson <jas@extundo.com>,
+	11 Sep 2003 19:25:20 +0200.
 
-	* texinfo.tex (\chapter, \appendix): Make defn of \thischapter
-	refer to \thischaptername, and store actual name there.
-	(\chapternofonts): Turn off more macros.
-	(\indexdummies): Likewise.
+2003-09-12  Karl Berry  <karl@gnu.org>
 
-Sun Nov 19 15:29:47 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+	* makeinfo/tests/html-manuals: include -I../../doc for case when
+	version-stnd.texi is in build tree.
+	From: ezra peisach <epeisach@med-xtal.bu.edu>, 
+	12 Sep 2003 13:53:32 -0400.
 
-	* texinfo.tex (\titlerm): There were two definitions of this command.
-	Put them together and commented out one of them.
-	(\subtitlerm): Was same as \tenrm, so just copy that.
-	(\ninett): Always define this.
-	(\indtt): Copy from \ninett.
+2003-09-11  Karl Berry  <karl@gnu.org>
 
-Sat Nov 18 22:57:37 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+	* doc/texinfo.txi (Cartouche): document that @cartouche needs to
+		be outside the @example for HTML output to work.  This
+		is painful to fix in the current makeinfo.
+	Report from: Simon Josefsson <jas@extundo.com>,
+	11 Sep 2003 15:21:44 +0200.
 
-	* texinfo.tex (\ssecrm, etc.): Scale by 1315, rather than to 13pt.
+2003-09-10  Karl Berry  <karl@gnu.org>
 
-Wed Nov	 8 18:38:33 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+	* makeinfo/sectioning.c (section_alist): add entry for centerchap,
+	so at least makeinfo does not bomb out.  (No centering is actually
+	done.)  From: Denys Duchier <duchier@ps.uni-sb.de>, 10 Sep 2003
+	21:35:24 +0200.
 
-	* texinfo.tex (\titlepage): Turn on iffinishedtitlepage so
-	bottom rule is not printed.
-	(\titlezzz): Turn it off, so bottom rule is printed.
+	* lib/system.h: __CYGWIN__ in comments, too.
 
-Mon Nov	 6 09:23:29 1989  Karl Berry  (karl at hayley)
+2003-09-09  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (\chapterzzz, \appendixzzz): include `Chapter
-	\the\chapno' and `Appendix \appendixletter' in \thischapter; use
-	\xdef instead of \gdef to define \thischapter, to avoid timing
-	problems with \chapno or \appendixletter.
-	(\startcontents): don't bother putting `Table of Contents' or
-	`Short Contents' in the headline.
+	* bootstrap: --include=m4.  From Werner.
 
-Fri Oct 20 09:11:35 1989  Karl Berry  (karl at hayley)
+2003-09-08  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (\titlepage): remove obsolete code for subtitles.
-	(\titlezzz): end with \relax, to avoid misinterpretation of a
-	following `plus' or `minus'
-	(\page (inside \titlepage)): call \finishtitlepage.
-	(\Etitlepage): call \finishtitlepage, if it hasn't been.
-	(\finishtitlepage): new macro to print a rule and leave some space
-	at the bottom of the title page.
-	(\iffinishedtitlepage): new; says whether \finishtitlepage has been
-	called.
+	* lib/system.h: make that __CYGWIN__, not __unix__.  From Eli.
+	* lib/system.h (DEFAULT_TMPDIR,PATH_SEP) [O_BINARY && !__unix__]:
+	new case for cygwin, from: Thomas Klausner
+	<wiz@danbala.ifoer.tuwien.ac.at>, 8 Sep 2003 13:43:29 +0200
+	(for cross-building netbsd).
 
-Mon Nov	 6 21:35:34 1989  Robert J. Chassell  (bob at rice-chex)
+2003-09-04  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex: Replaced `GNU CC' in the copyleft of this file with
-	  the phrase `this texinfo.tex file'.
+	* texinfo.txi (Conventions): say more about quotations and dashes,
+	based on a report to help-texinfo from
+	David.Billinghurst@riotinto.com, 18 Jul 2003 16:07:00 +1000.
+
+	* NEWS: mention @tex/@iftex are executed in a group.
 
-Fri Oct 27 10:36:32 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+2003-09-03  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (Macro Details): mention some makeinfo
+	limitations too, from recent bug reports by Patrice Dumas
+	<dumas@centre-cired.fr> and (16 Jul 2003 17:21:56 +0200) Jesper
+	Harder <harder@ifa.au.dk>.
+	* makeinfo/macro.c (define_macro): "end rmacro" is 10 chars long.
 
-	* texinfo.tex (\setfilename): Do nothing except 1st time used.
-	(\titlepage): Brace misplaced in \titlezzz.
-	(\indexdummies, \indexnofonts): Handle @w.
+2003-08-29 Reiner Steib <Reiner.Steib@gmx.de>
+	
+	* makeinfo/lang.c (encoding_table): Downcase coding system
+	names, since Emacs does not recognize the uppercase names.
 
-	(\readauxfile): Set \ifhavexrefs true.
-	(\refX): Warn for every use of an undefined xref,
-	but if no xref values are known, warn just once that none are known.
+	* makeinfo/lang.h: doc fixes.
 
-Tue Sep 19 04:12:51 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+2003-08-28  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (\xrefX): Go back to `section N [Foo], page M'.
-	(\exp): Delete it.
+	* bootstrap: new file (cvs only).
+	* README.dev: mention it.
+	Report from hanwen@cs.uu.nl, sample script from
+	Akim Demaille <akim@epita.fr>.
+	* aclocal.m4: remove from cvs repository.
 
-Mon Sep 18 15:29:30 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+2003-08-26  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (\chapentryfonts): Try using \rm for chap title.
+	* makeinfo/node.c (cm_node): add <LINK> tags. This will produce a
+	navigation bar in Mozilla 1.4 (and perhaps earlier).  Original
+	code from Han-Wen Nienhuys <hanwen@cs.uu.nl>.
 
-Tue Sep 12 03:41:10 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+2003-08-23  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (\titlepage): Missing closeparen after \title.
-	Delete excess paren after \page.
+	* util/texi2dvi: Run tex --help in $tmpdir, to avoid leaving
+	texput.log for old TeX versions.  Report from Patrick Welche
+	<prlw1@newn.cam.ac.uk>, patch from Akim.
 
-	* texinfo.tex (\samp): Use \tclose.
+2003-08-20  Karl Berry  <karl@gnu.org>
 
-Mon Sep 11 23:28:04 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+	* makeinfo/defun.c (cm_defun): skip @ifset/@ifclear insertions
+	when looking for the @defun going with this @defunx.  Report from:
+	Akim Demaille <akim@epita.fr>, 14 Aug 2003 12:10:37 +0200.
 
-	* texinfo.tex (\tclose): Make `@ ' a full-width space.
+	* makeinfo/insertion.c (cm_end): rewrite error message for
+	clarity.
 
-Sat Sep	 9 20:11:29 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+2003-08-13  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (\balancecolumns): Handle properly the case where
-	the index ends before one page is output, so \partialpage is nonempty.
-	In this case we may need to output two pages if the data
-	would just barely fit if not for \partialpage.
+	* info/indices.c (info_index_apropos): correct typo, whoses ->
+	whose.  From: Jesper Harder <harder@ifa.au.dk>, 13 Aug 2003
+	14:49:26 +0200.
 
-Wed Aug 30 22:45:31 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+2003-08-11  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (\refx): New 2nd operand, output if xref is non-null.
-	(\xrefX): Use that to output the comma after the section number.
-	(\appendixnoderef, \appendixsetref, \Yappendixletterandtype):
-	Define xrefs for appendices that say "Appendix N".
-	Used in \appendix, \appendixsec, etc.
+	* doc/texinfo.tex: excise spurious spaces, etc.
 
-	* texinfo.tex (\smartitalic): The actual italic correction was omitted.
+2003-08-09  Karl Berry  <karl@gnu.org>
 
-Mon Aug 28 00:21:33 1989  Richard Stallman  (rms at apple-gunkies.ai.mit.edu)
+	* doc/texinfo.txi: don't use @ifinfo/@heading construct to replace
+	@section any more, the XML output is wrong.
 
-	* texinfo.tex (\ref): New kind of cross-reference.
-	(\xrefX): Put single quotes around section name.
-	(\refx): Allow hyphenation in `undefined'.
+	* doc/texinfo.tex (\pdfmakeoutlines): doc fixes, and use \def once
+	instead of \let twice.
 
-	* texinfo.tex (+): Make it active.
-	(Altmode): Delete active defn.
+	* doc/texinfo.txi: rewrite @ifinfo text sections to take better
+	 account of HTML.  Suggestion from: Dumas Patrice
+	<dumas@centre-cired.fr>, 8 Aug 2003 17:19:22 +0200.
 
-	* texinfo.tex (\defunargs): Prevent hyphenation at `-' in args.
-	Move the penalty at the end so that it works.
-	(\defvarargs): Move the penalty at the end so that it works.
+2003-08-07  Derek Price  <derek@ximbiot.com>
 
-	* texinfo.tex (\defparsebody): Do increase right margin.
+	* makeinfo/insertion.c (cm_direntry): Skip @direntry in --no-headers
+	mode.
 
-	* texinfo.tex (\defbodyindent): Now .4 inch.
+2003-08-05  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (\point, \result, \expansion, \print, \equiv, \error):
-	New macros for Lisp manual.
+	* doc/texinfo.txi (Beginning a File, title, titlefont): more
+	clarifications.  Suggestions from Patrice.
 
-	* texinfo.tex (\tex): Set = to code 12.
+	* doc/texinfo.txi (emph & strong): inconsistent source & example.
+	From Jesper Harder.
 
-	* texinfo.tex (\entry): Hairier way to output dots.
+2003-08-04  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (\kbd): If arg consists of one \key command, be a no op.
+	* doc/texinfo.txi (titlefont): discuss html output a bit.
+	Suggestion from Patrice.
 
-	* texinfo.tex (\sc): Delete spurious \.
+2003-07-31  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (\smartitalic): New macro, does italic correction at end.
-	(\i, \var, \dfn, \emph, \cite): Use that.
+	* doc/texinfo.tex (\doignorecount): no need to initialize.
+	(\doignoreyyy): doc fix.
+	From Stepan.
 
-	* texinfo.tex (\node): Do \ENVcheck.
+2003-07-29  Stepan Kasal  <kasal@ucw.cz>
 
-	* texinfo.tex (\initial): Infinite penalty at end.
+	* doc/texinfo.tex (\doignorecount): No need to initialize the
+	  count while reading texinfo.tex.
+	  (\doignoreyyy): Tiny comment change.
 
-	* texinfo.tex (\chapternofonts): New macro, sets \code, etc. to
-	output selves into file.  Also undef \frenchspacing and \rawbackslash.
-	(\xhapterzzz, etc.): Call that.	 Make a group to undo it.
-	(\indexdummies): Do like \chapternofonts.
+2003-07-28  Karl Berry  <karl@gnu.org>
 
-Sun Aug 27 16:05:23 1989  Richard Stallman  (rms at apple-gunkies.ai.mit.edu)
+	* makeinfo/html.c (process_css_file): @c (for @charset) should
+	also put us into import_state.
 
-	* texinfo.tex (\frenchspacing): Our own definition, using
-	decimal numbers for all character codes.  The standard one fails.
+	* doc/texinfo.txi (Conditional Nesting): new section; also change
+	other conditional sections slightly.
 
-	* texinfo.tex (\indexnofonts): Handle \file, \tt, and many more.
+	* doc/texinfo.tex (\doignoretext, \doignoretextyyy): Only look for
+	conditionals at the beginning of a line, to avoid problems with a
+	commented conditional.  Fix from: Stepan Kasal
+	<kasal@math.cas.cz>, 28 Jul 2003 02:50:41 +0200.
 
-Fri Aug 25 22:05:24 1989  Richard Stallman  (rms at apple-gunkies.ai.mit.edu)
+2003-07-27  Stepan Kasal  <kasal@ucw.cz>
 
-	* texinfo.tex (\chapter, etc.): Undefine \tclose around \edef\temp.
+	* doc/texinfo.tex (\doignore): Rewritten to handle nesting.
+	  (\ignoremorecommands, \obstexwarn, \ifwarnedobs): No longer needed.
+	  (\nestedignore): No longer needed.
+	  (\readauxfile): Remove reference to \warnedobstrue.
 
-Mon Aug 21 15:42:47 1989  Richard Stallman  (rms at apple-gunkies.ai.mit.edu)
+2003-07-27  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (\tclose): Like \t but make space same width
-	as in surrounding text.
-	(\code, \kbd): Use \tclose.
+	* util/dir-example: lowercase automake.
 
-Tue Jul	 4 20:53:52 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+2003-07-26  Karl Berry  <karl@gnu.org>
 
-	* texinfo.tex (titlepage): Don't set \everypar; start just one group.
-	See comments in the code.
+	* makeinfo/html.c (process_css_file): in null_state, only consider
+	@i to be the start of an @import, since @media can get misparsed.
+	Report from: Dumas Patrice <dumas@centre-cired.fr>, 22 Jul 2003
+	12:13:29 +0200.
 
-	* texinfo.tex (defop,defcv): Use defopparsebody.
-	* texinfo.tex (defopparsebody): Like defmethparsebody but defines
-	def...x for more arguments.
+2003-07-25    <karl@gnu.org>
 
-Sat Jun 17 13:49:13 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+	* doc/texinfo.txi (Raise/lower sections): mention difficulties with
+	node pointer creation and top nodes.
+	Report from: Dumas Patrice <dumas@centre-cired.fr>,
+	22 Jul 2003 13:08:24 +0200.
 
-	* texinfo.tex (\titlepage): Rename @subtext, etc., to @subtitle, etc.
+2003-07-24    <karl@gnu.org>
 
-	* texinfo.tex (\titlepage): Don't print the title automatically.
-	Define @title to print it, and the rule underneath it.
-	This should make @titlepage upward compatible with the old one.
+	* makeinfo/sectioning.c (what_section): take additional SECNAME
+		argument; change callers.
+	* makeinfo/sectioning.h (what_section): remove redundant decl.
+	* makeinfo/node.c (cm_node): change what_section call here, too.
+	Report from: Dumas Patrice <dumas@centre-cired.fr>,
+	22 Jul 2003 13:09:19 +0200.
 
-	* texinfo.tex (\titlepage): Revert local definition of @page
-	to previous.  Don't print a rule.
+	* doc/texinfo.tex (\doheading,\dosubheading,\dosubsubheading):
+	rationalize names.
+	(\heading,\subheading,\subsubheading): change
+	calls.  (yesterday's patch called the undefined
+	\subsecheadingyyy, etc.)
 
-Mon Jun 12 20:49:17 1989  Karl Berry.  (karl at mote)
+2003-07-23  Stepan Kasal  <kasal@ucw.cz>
 
-	* texinfo.tex (\titlepage): allow intensional definition of the
-	items on the title page.  New control sequences (allowed only
-	within the titlepage environment:)
-	 (@subtext): may take either a paragraph (e.g., a brief
-	 description of the program) or just a line (e.g., the date).
-	 May appear more than once.
-	 (@author): must come after all the @subtext's.	 Can appear more
-	 than once, also.
-	 Also, use the title defined by @settitle.
-	 (\subtextfont, \authorfont): switch to using the appropriate
-	 fonts with appropriate leading.
-	 (\titlepagetopglue, \titlepagebottomglue): define space that
-	 never stretches or shrinks.
-	 (\realeverypar): formatting for the @subtext's.
+	* doc/texinfo.tex (\heading, \subheading, \subsubheading): Call
+	  \suppressfirstparagraphindent after setting the heading.
+	  (\headingyyy, \subheadingyyy, \subsubheadingyyy): New macros.
+	  (\chapheadingzzz): Call \suppressfirstparagraphindent at the end
+	  and move \chapbreak ...
+	  (\chapheading): ... here.
+	  (\majorheading): Do a modified \chapbreak, then call \chapheadingzzz.
+	  (\majorheadingzzz): Deleted.
 
-Sun Jun	 4 15:04:59 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+2003-07-16    <karl@gnu.org>
 
-	* texinfo.tex (\shortchapentry, \shortunnumberedentry):
-	Use dots, right justify page numbers.  Don't use italics.
+	* doc/texinfo.txi (makeinfo Pointer Creation): must pxref Menus,
+	since Menu Location is not a valid xref point for
+	TeX, because of the special @heading stuff.
 
-Fri Jun	 2 14:40:28 1989  Karl Berry.  (karl at mote)
+	* makeinfo/insertion.c (begin_insertion): lack of */ caused
+	display: and smalldisplay: cases to be ignored.
 
-	* texinfo.tex (\entry, \secondary): use plain TeX \dotfill for
-	better leaders than the homegrown one.
-	(\Dotsbox): Deleted.
-	(\dotfill): Deleted; use Plain TeX definition.
+	* lib/system.h (LC_MESSAGES) [!defined (HAVE_LC_MESSAGES) &&
+	!defined (LC_MESSAGES)]: change conditional.  Report from
+	Christian Krackowizer <ckrackowiz@std.schuler-ag.com>, 16 Jul 2003
+	14:40:30 +0200.
 
-Wed May 31 17:19:30 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+2003-07-14    <karl@gnu.org>
 
-	* texinfo.tex (ignore): Undefine the chapter/section macros
-	while reading the args, since they are \outer.
-	(ifinfo): Likewise
-	(ifsetxxx, ifclearxxx): Call another macro to parse the
-	conditionalized text, and do to that macro as with \ignore.
+	* util/install-info.c (ensure_dirfile_exists): replace literal ^_ with
+	\x1f.  Report from Trond Endrestøl
+	<trond@ramstind.gtf.ol.no>, 14 Jul 2003 13:31:29 +0200.
 
-Tue May 30 15:04:37 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+	* makeinfo/sectioning.c (sectioning_html): forgot to change closing </hN>
+	to match opening <hN> (that is, maximum h3).
+	Report from: Jesper Harder <harder@ifa.au.dk>,
+	14 Jul 2003 15:04:04 +0200.
 
-	* texinfo.tex (unnumbered): Change back from \long to \outer.
+2003-07-03    <karl@gnu.org>
 
-	* texinfo.tex: Changes by Karl Berry for toc format.
-	Rewrite the table of contents for appearance's sake.  Add a
-	synonym for \summarycontents, \shortcontents, since that is the
-	traditional name.  Two subroutines are now shared by \contents and
-	\summarycontents: \prepareforcontents, to reset the page number
-	and such; and \startcontents, which begins the \unnumbered and
-	resets catcodes before \input \jobname.toc.  Some other macros --
-	\labelspace, \dopageno, \shortpageno -- are shared by the printing
-	macros.
+	* doc/info.texi: copy from Emacs (with revisions by Luc).
 
-	* texinfo.tex (\truesecrm): New font, section-size roman, used in the
-	new toc. (cmr12)
+2003-07-02   Akim Demaille  <akim@epita.fr>
 
-Sun May 28 07:25:42 1989  Karl Berry.  (karl at mote)
+	* util/texi2dvi: Add thumbpdf support.
+	Use FD 6 instead of /dev/null so that when --debugging, the output
+	from auxiliary tools can be observed.
 
-	* texinfo.tex (\eatinput): Do not print the `\input texinfo' if a
-	.fmt file is being used; ignore it, instead.  This is the initial
-	definition for `\' now.
-	(\fixbackslash): on the other hand, subsequent backslashes should
-	be printed, and if the file does not have an `\input texinfo', the
-	first one should be printed.  This new macro makes the definition
-	for `\' be \normalbackslash, if it is \eatinput.
-	(\setfilename): use \fixbackslash.
+2003-07-02    <karl@gnu.org>
 
-Wed May 24 15:34:59 1989  Joseph Arceneaux  (jla at apple-gunkies.ai.mit.edu)
+	* doc/texinfo.txi (kbd): document actual makeinfo behavior.
 
-	* texinfo.tex: Changed def of unnumbered from \outer to \long.
+2003-07-01    <karl@gnu.org>
 
-Tue May 23 12:27:59 1989  Karl Berry.  (karl at mote)
+	* doc/texinfo.txi (Menus): require that menus come at the end of the
+	node, since Info readers can't determine the end
+	of a menu.
+	Report from: Luc Teirlinck <teirllm@dms.auburn.edu>,
+	29 Jun 2003 21:33:19 -0500.
 
-	* texinfo.tex: Allow one to make a texinfo.fmt file (with the
-	invocation:
-	   initex \&plain texinfo
-	and then saying
-	   @dump
-	after texinfo.tex has been read.
-	Changes:
-	(\setfilename): Instead of being a no-op, read the xref info, and
-	open the contents and index files.  These actions were done as
-	texinfo.tex was read before.
-	(\opencontents, \openindices): new macros to open those files.
-	(\readauxfile): and one to read the aux file.
+	* makeinfo/insertion.c (begin_insertion): do not increment
+	in_fixed_width_font for @display or @format; this
+	incorrectly caused quotes to be omitted in @kbd
+	output in those environments.
+	Report from: Luc Teirlinck <teirllm@dms.auburn.edu>,
+	26 Jun 2003 21:59:48 -0500.
 
-Sat Apr 29 22:28:02 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+2003-06-24    <karl@gnu.org>
 
-	* texinfo.tex: `@headings on' no longer does a page break.
+	* doc/texinfo.txi (tex): misplaced period.
+	From: Jesper Harder <harder@ifa.au.dk>.
+	(GNU Sample Texts): don't end the $Id index entries with a :.
+	Report from: Luc Teirlinck <teirllm@dms.auburn.edu>.
+	
+2003-06-20    <karl@gnu.org>
 
-Sun Apr	 2 11:22:29 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+	* makeinfo/defun.c (process_defun_args): only insert the HTML
+	start/end tags if we're actually generating html.
+	Report from: Shawn Betts <sabetts@sfu.ca>, 12 Jun 2003
+	16:48:50 -0700.
 
-	* texinfo.tex: Defined `@headings single' and `@headings double'.
-	`@headings on' picks one of them: `@setchapternewpage odd'
-	says `@headings	on' means double; otherwise it means single.
+	* TODO: support translated manuals, from polak@gnu.org.
 
-Mon Jan 30 22:00:35 1989  Robert J. Chassell  (bob at rice-krispies.ai.mit.edu)
+	* doc/texinfo.txi: Edit Options node no longer exists in the Emacs
+		manual.  From: Luc Teirlinck <teirllm@dms.auburn.edu>.
 
-	* texinfo.tex: Changed the size of the subsection fonts so they
-	are scaled at13pt rather than at magstep 2. This makes them
-	smaller than the section fonts, which are scaled at magstep 2.
-	In addition, changed the ssecrm font from cmbx to cmb.
+2003-06-18    <karl@gnu.org>
 
-Fri Jan	 6 15:00:44 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+	* config.{guess,sub}, install-sh, lib/xalloc.h: update from gnulib.
 
-	* texinfo.tex: Changed @lisp, @smalllisp, @display not to change
-	the right margin.
+2003-06-10    <karl@gnu.org>
 
-Mon Dec	 5 22:01:49 1988  Robert J. Chassell  (bob at rice-krispies.ai.mit.edu)
+	* version 4.6.
 
-	* texinfo.tex: Tested the use of `cmbx10' vrs `cmb10' font and
-	stayed with cmb10 font since cmb10 looks better when the bold face
-	is part of a sentence although the cmbx10 font looks better on its own.
 
-Mon Aug 15 14:33:51 1988  Robert J. Chassell  (bob at spiff)
+Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 
-	* texinfo.tex:	Changed the (undocumented) @today command from a
-	Month Day, Year format to a Day Month Year format.  Left old
-	version commented out.
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.
 
 
 Local Variables:
diff --git a/gnu/usr.bin/texinfo/ChangeLog.46 b/gnu/usr.bin/texinfo/ChangeLog.46
new file mode 100644
index 00000000000..c495abfedad
--- /dev/null
+++ b/gnu/usr.bin/texinfo/ChangeLog.46
@@ -0,0 +1,12516 @@
+2003-06-10    <karl@gnu.org>
+
+	* version 4.6.
+
+2003-06-04    <karl@gnu.org>
+
+	* config.sub: update from gnulib.
+
+2003-06-03    <karl@gnu.org>
+
+	* mkinstalldirs: update from gnulib.
+
+2003-06-02 Akim Demaille <akim@epita.fr>
+
+	* util/texi2dvi (tex_envvars): New.
+	Use it to forward -I directories to BIBINPUTS and BSTINPUTS, in
+	addition of INDEXSTYLE and TEXINPUTS.
+
+2003-06-02    <karl@gnu.org>
+
+	* makeinfo/html.c (html_output_head): don't output the <link>, to
+		avoid having mozilla put up a document navigation bar when
+		we don't have anything else to support it yet.  Report from:
+		Per Bothner.
+	* makeinfo/makeinfo.c: no need to declare add_link or
+		add_escaped_anchor_name, since they are not used.
+
+	* doc/texinfo.txi (Contents): recommend @contents at the beginning
+		more strongly.  Suggestions from Kevin Ryde.
+
+2003-06-01    <karl@gnu.org>
+
+	* makeinfo/macro.c (apply): make \\ expand to \ even if the macro
+	has no arguments.  Report from: Jesper Harder <harder@ifa.au.dk>,
+	31 May 2003 02:56:20 +0200.
+
+2003-05-31    <karl@gnu.org>
+
+	* util/dir-example (C++ libraries): new category, suggested by Bruno.
+
+2003-05-29    <karl@gnu.org>
+
+	* configure.ac: pretest version 4.5.93.
+
+2003-05-29  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.12.1.
+
+2003-05-26    <karl@gnu.org>
+
+	* util/texi2dvi: spurious \ in tex_args assignment.
+
+	* doc/texinfo.txi (Contents): trim excess words.
+
+2003-05-25    <karl@gnu.org>
+
+	* util/texi2dvi: extra quotes for the tex_args assignment in
+	--batch mode.
+
+2003-05-19    <karl@gnu.org>
+
+	* lib/xexit.c: translate fflush error messages, add newlines
+	(report from Jim Meyering).
+	* util/{texindex.c,install-info.c},
+	* makeinfo/makeinfo.c,
+	* info/info.c: use xexit again, with redundant return to avoid
+	warnings.
+
+2003-05-18    <karl@gnu.org>
+
+	* lib/xexit.c (xexit): fputs not fprintf, so we get newline;
+	translate the messages, too.  Report from Jim Meyering.
+
+	* util/dir-example: move gcc/automake entries.
+
+	* pretest version 4.5.92.
+
+	* update to automake 1.7.5.
+
+	* makeinfo/html.c (append_char): forgot to increment length, duh.
+	Report from: "Torsten Bronger" <bronger@physik.rwth-aachen.de>,
+	18 May 2003 14:36:23 +0200.
+
+2003-05-17    <karl@gnu.org>
+
+	* makeinfo/makeinfo.c (defining_copying): new fn.
+	(add_char): call it, when testing if we should
+	call html_output_head.
+	Report from: Torsten Bronger <bronger@physik.rwth-aachen.de>,
+	17 May 2003 22:10:42 +0200.
+
+	* configure.ac: pretest version 4.5.91.
+
+2003-05-16    <karl@gnu.org>
+
+	* makeinfo/index.c (sort_index): don't deref NULL.  Report from Jan.
+
+2003-05-13    <karl@gnu.org>
+
+	* makeinfo/html.c (append_char): appease sgi compiler.
+	* makeinfo/html.c (insert_html_tag): remove spurious arg to pop_tag,
+	From: ezra peisach <epeisach@med-xtal.bu.edu>, 13
+	May 2003 12:13:40 -0400.
+
+	Fix a few GCC warnings, reported by Jim Meyering:
+
+	* info/nodes.c: parenthesize assignment used as truth value.
+	* info/nodemenu.c (format_node_info): strcpy instead of sprintf,
+		since there's no format.
+	* makeinfo/makeinfo.c (isolate_nodename): remove spurious decl.
+	* makeinfo/xml.c (xml_insert_indexterm): declare as void.
+	* info/key.c: initialize with 0,0 at end.
+	* info/infokey.c (main): return instead of xexit, and remove
+	unused variable.
+	* makeinfo/html.c (init_buffer): forgot to return buf.
+	* info/info.c (remember_info_program_name): remove spurious
+	declaration.
+
+	* makeinfo/sectioning.c,
+	* info/infomap.c: remove unused variables.
+
+	* makeinfo/makeinfo.c (insert_toplevel_subdirectory),
+	* info/man.c,
+	* info/infodoc.c (info_find_or_create_help_window): parenthesize
+	&& within ||.
+	* info/display.c (display_update_one_window): initialize rep to
+	NULL, parenthesize && within ||.
+
+	* util/install-info.c,
+	* info/info.c (main),
+	* info/makedoc.c (main): return instead of xexit.
+
+2003-05-13  Akim Demaille  <akim@epita.fr>
+
+	* util/texi2dvi (get_xref_files): Pass --file-line-error-style
+	to TeX when supported.
+
+2003-05-12    <karl@gnu.org>
+
+	* configure.ac: pretest version 4.5.90.
+
+	* Makefile.am (EXTRA_DIST): add onceonly.m4.
+
+	* makeinfo/tests/accentenc: must discard stderr since we expect
+	two errors in this case.
+
+	* makeinfo/makeinfo.c (main): new option --css-include.
+	(usage): add to --help message.
+	* makeinfo/makeinfo.h (css_include): new global.
+	* makeinfo/html.c (append_char, process_css_file): new fns
+	implementing it.
+	(html_output_head): call it.
+	* doc/texinfo.txi (HTML CSS): new node describing it.
+	Also split up the Generating HTML node into subnodes.
+
+	* config.{guess,sub}: update from gnulib.
+
+2003-05-10    <karl@gnu.org>
+
+	* makeinfo/index.c (sort_index): allocate the sorted index in new
+	memory, and set the original index to that, to avoid problems with
+	@printindex being called twice on the same index.
+	(cm_printindex): do not free the returned index.
+	Report from: Dumas Patrice <dumas@centre-cired.fr>, 9 May 2003
+	15:12:21 +0200.
+
+2003-05-09    <karl@gnu.org>
+
+	* makeinfo/defun.c (cm_defun): issue error message without extra
+	x's.  Report from: Dumas Patrice <dumas@centre-cired.fr>, 9 May
+	2003 17:24:25 +0200.
+
+2003-05-07  Akim Demaille  <akim@epita.fr>
+
+	* util/texi2dvi (textra_cmd): New.
+        (textra): Escape escapes from sed's evaluation.
+	Use them to support additional TeX/LaTeX commands.
+	Support --command as a synonym for --texinfo.
+
+2003-05-06    <karl@gnu.org>
+
+	* util/dir-example: finish getting rid of GNU packages.
+
+2003-05-04    <karl@gnu.org>
+
+	* doc/texinfo.tex (\itemizey): if no arg to @itemize, default to
+	@bullet.  Fix from: Stepan Kasal <kasal@math.cas.cz> 2 May 2003
+	09:32:11 +0200, report from: Jesper Harder <harder@ifa.au.dk>.
+
+2003-04-30    <karl@gnu.org>
+
+	* makeinfo/.gdbinit: no colon on local variables.
+
+	* doc/texinfo.txi (documentencoding): Document new Info output feature.
+	makeinfo/lang.h (encoding_type): rename `ecname' member to `encname'.
+	makeinfo/html.c, lang.c: change usage.
+	makeinfo/lang.c (cm_documentencoding): fix typo in warning.
+	makeinfo/makeinfo.h (SPLIT_SIZE_THRESHOLD): remove.
+	(info_trailer): declare.
+	makeinfo/makeinfo.c (info_trailer): new fn to generate Local
+		Variables: section if --enable-encoding and
+		@documentencoding are given.
+	(convert_from_loaded_file): call it.
+	* makeinfo/node.c (split_file): write trailer into each split
+		file.  Also, simply split files if file size is less than
+		--split-size, removing SPLIT_SIZE_THRESHOLD.
+
+	* doc/texinfo.tex: remove trailing whitespace.
+
+2003-04-29    <karl@gnu.org>
+
+	* makeinfo/node.c (cm_anchor): normalize_node_name so that an
+	anchor named "TOP" or "top" or whatever is not allowed.  Report
+	from: Dumas Patrice <dumas@centre-cired.fr>, 29 Apr 2003 18:56:51
+	+0200.
+
+2003-04-28    <karl@gnu.org>
+
+	* makeinfo/makeinfo.c: whitespace cleanup.
+
+	* doc/texinfo.tex (\doprintindex): don't \kern-\parindent, it makes
+	the first index entry stick out to the left.
+	Report from: Jesper Harder <harder@ifa.au.dk>,
+	28 Apr 2003 03:10:36 +0200.
+
+	From Akim Demaille  <akim@epita.fr>:
+	* makeinfo/makeinfo.c (cm_value): Warn for undefined flags.
+
+2003-04-27    <karl@gnu.org>
+
+	* doc/texinfo.tex (\footnote, \smartitalicx): use \ptexslash
+	for italic correction instead of \/, since we've redefined \/ now.
+	Report from: Jesper Harder <harder@ifa.au.dk>, 27 Apr 2003
+	23:30:29 +0200.
+
+	* util/dir-example (mailutils): more from Wojciech Polak.
+	(autoconf): align/edit/sort entries.
+
+2003-04-26    <karl@gnu.org>
+
+	* doc/texinfo.txi (Image Syntax): second and following @image args
+	 optional. Report from: Max Techter <mtechter@gmx.de>, 26 Apr 2003
+	15:50:02 +0200.
+
+	* util/dir-example (anubis): request from Wojciech Polak.
+
+2003-04-25    <karl@gnu.org>
+
+	* makeinfo/defun.c (defun_internal): whitespace needed in docbook
+	output for deftype*.  From: José Fonseca
+	<j_r_fonseca@yahoo.co.uk>, 25 Apr 2003 13:07:13 +0100.
+
+2003-04-21    <karl@gnu.org>
+
+	* doc/texinfo.tex (\dofirstparagraphindent): forgot to rename the
+	        \...word's.
+	(\suppressfirstparagraphindent): forgot to rename
+	to \dosuppress...  Reported by Simon.
+
+2003-04-20    <karl@gnu.org>
+
+	* Installed changes from Simon for suppressing indentation on the
+	first paragraph after section headings, and for new @indent command:
+
+	2003-04-12  Simon Law  <sfllaw@engmail.uwaterloo.ca>
+        * doc/texinfo.tex (\firstparagraphindent): implement suppression
+        of the indentation of the first paragraph.
+        (\dofirstparagraphindent): for parsing arguments.
+        (\suppressfirstparagraphindent): suppress, or don't suppress.
+        (\dosuppressfirstparagraphindent): the actual gobbling of indentation.
+        (\footnote): Compensate for the hanging-indent side-effect.
+        (\numhead, \apphead, \unnmhead): call \dosuppress...
+        * makeinfo/cmds.c (command_table): add "firstparagraphindent"
+        (as cm_firstparagraphindent)
+        (set_firstparagraphindent, cm_firstparagraphindent): implement
+        @firstparagraphindent parsing of options.
+        * makeinfo/makeinfo.h: declare "do_first_par_indent".
+        * makeinfo/sectioning.c (sectioning_underscore): suppress
+        indentation if requested.
+        * doc/texinfo.txi: document it.
+
+        * doc/texinfo.tex (\indent): override \indent primitive to
+        clear \everypar.
+        (\ptexindent): for saving/restoring \indent in @tex.
+        (\footnote): Neutralise the effect of @indent
+        within a footnote.
+        * makeinfo/cmds.c (command_table): add "indent" (as cm_indent).
+        (cm_indent): un-inhibit_paragraph_indentation.
+        * doc/texinfo.txi: document it.
+
+        * doc/texinfo.txi (Conventions): remove spurious extra vertical space
+        from bulleted itemize which starts with a quote.
+
+        * makeinfo/cmds.c (command_table): fix @novalidate definition.
+
+
+	* Installed changes from Jan for @image support in Info format:
+
+	2003-04-14  Jan Nieuwenhuizen  <janneke@gnu.org>
+	* info/display.c (display_update_one_window): Skip new style
+	image tag/cookie.
+
+	2003-04-09  Jan Nieuwenhuizen  <janneke@gnu.org>
+	* makeinfo/makeinfo.c (cm_image): Write ^@^H[image ...^@^H] tag.
+
+
+	* makeinfo/html.c (html_output_head): use <style> to get the
+	regular roman font instead of typewriter for @format and @display;
+	likewise to reduce the font size for @small*.  Suggestion from:
+	"Torsten Bronger" <bronger@physik.rwth-aachen.de>, 20 Apr 2003
+	11:03:59 +0200.
+
+2003-04-18    <karl@gnu.org>
+
+	* configure.ac (ncurses/termcap.h): move test to after termlib's
+	definition, of course.  Reported by Norton Allen
+	<allen@huarp.harvard.edu>, 18 Apr 2003 13:31:35 -0400.
+
+	* configure.ac: remove comma from comment in AC_TRY_LINK program,
+	to avoid spurious misinterpretation as an argument delimiter.
+
+2003-04-08    <karl@gnu.org>
+
+	* makeinfo/makeinfo.c (usage): avoid double blank line.
+
+2003-04-05    <karl@gnu.org>
+
+	* Makefile.am (all of them): use $(VAR) instead of @VAR@, since
+	automake now emits definitions for all substituted variables.
+
+	* makeinfo/makeinfo.h (DEFAULT_SPLIT_SIZE): increase to 300,000.
+	(SPLIT_SIZE_THRESHOLD): increase to 500,000.
+	Implicit suggestion via Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>.
+
+2003-04-04    <karl@gnu.org>
+
+	* util/texi2dvi (replace_empty): new variable to do the empty path
+	element detection; don't hardwire path separator as :.
+
+2003-04-02    <karl@gnu.org>
+
+	* doc/txi-pl.tex: new file, from polak@gnu.org.
+	* doc/Makefile.am (TXI_XLATE): add it.
+
+2003-04-01    <karl@gnu.org>
+
+	* makeinfo/makeinfo.c (main): correct wording of html/no-headers/split
+	error message, and don't complain if output is to stdout.
+
+	* makeinfo/insertion.c (end_insertion): for @end menu html output,
+	don't output </ul> if no_headers.  Report from: Jesper
+	Harder <harder@ifa.au.dk>, 01 Apr 2003 00:00:37 +0200.
+
+	* info/infomap.c (fetch_user_maps): don't complain if .info
+		doesn't exist.
+
+2003-03-31    <karl@gnu.org>
+
+	* makeinfo/lang.c (iso8859_2_map): new encoding map.
+	(encoding_table): enable it.
+
+	* info/pcterm.c (pc_up_line): use MAX instead of max (no longer
+	defined).  Reported by Richard Dawes.
+
+	* doc/texinfo.txi (documentencoding): mention that all processors
+	recognize the command.
+
+2003-03-30    <karl@gnu.org>
+
+	* makeinfo/lang.c (cm_special_character): incorrectly added html
+	sequences for @oe and @OE even in info output.
+
+2003-03-25    <karl@gnu.org>
+
+	* util/srclist.txt (COPYING): get from gnulib/doc, not gnulib.
+
+2003-03-24    <karl@gnu.org>
+
+	* TODO: need to write real definition of Info format.
+
+	* makeinfo/node.c (cm_node): use &nbsp; instead of ` ', to avoid
+	line breaks.
+
+2003-03-22    <karl@gnu.org>
+
+	* makeinfo/node.c (cm_node): output a space after the Node: and
+	similar headers, since Bob wants one.
+
+	* info/pcterm.c (MIN,MAX): moved to system.h.
+	* info/session.c (MIN): moved to system.h.
+	* makeinfo/sectioning.c (MIN): move to system.h.
+	* lib/system.h (MIN,MAX): define here.
+
+	* makeinfo/sectioning.c (sectioning_html): don't go smaller than <h3>.
+	Reported by Bob.
+	(MIN): new macro.
+
+	* info/session.c (MIN) [MIN]: #undef first if already #define'd.
+
+	* doc/texinfo.tex (\nodexxx): use a control sequence instead of
+	brackets to parse the parts of @node.  Otherwise node names with
+	brackets cause spurious output.  Reported by Bob.
+	(\xrefprintnodename): separate this out from
+	\xrefX, for easier redefining by Bob.
+
+2003-03-18    <karl@gnu.org>
+
+	* makeinfo/insertion.c (cm_item): ensure we don't go off the end
+	of the string when using strncmp.  From: Peter N Lewis
+	<peter@stairways.com.au>, 13 Mar 2003 16:08:27 +0800.
+
+	* doc/texinfo.txi (Raw Formatter Commands): mention using \gdef
+	within @tex, not \def.
+
+2003-03-12    <karl@gnu.org>
+
+	* doc/texinfo.txi (Preparing for TeX): mention extra colons.
+
+2003-03-07    <karl@gnu.org>
+
+	* doc/texinfo.tex (\/): new command to allow a line break.
+	(\ptexslash): for saving/restoring primitive \/ in @tex.
+	* makeinfo/cmds.c (command_table): add "/" (as cm_no_op).
+	* makeinfo/makeinfo.c (self_delimiting): add /.
+	* doc/texinfo.txi (Line Breaks, Command Summary): document it.
+	Suggestion from wl.
+
+	* doc/texinfo.tex (\hyphenation): time-stamp.
+
+2003-03-06    <karl@gnu.org>
+
+	* info/session.c (nearest_xref): new fn.
+	(info_menu_or_ref_item): call it when we are
+	searching for xrefs, instead of just looking on
+	the current line.
+	* info/info-utils.c (info_copy_reference): new fn.
+	* info/info-utils.h (info_copy_reference): declare.
+	Bug report from: rich@phekda.freeserve.co.uk,
+	04 Mar 2003 17:51:47 +0000.
+
+	* */.gdbinit: set env MALLOC_CHECK_.
+
+	2003-03-06  Ralph Schleicher  <rs@nunatak.allgaeu.org>
+	* makeinfo/files.h (get_file_info_in_path): Declare function.
+	* makeinfo/files.c (get_file_info_in_path): Remove static keyword.
+	* makeinfo/makeinfo.c (cm_image): Lookup image file name in the
+	search path for include files.
+
+2003-03-05    <karl@gnu.org>
+
+	* makeinfo/makeinfo.c (insert_toplevel_subdirectory): always make
+	subdirectory for html. Before, if the current directory happened
+	to be named `foo' and the @setfilename was foo.info, we would
+	write the split html files into the current directory.  Reported
+	by rich@phekda.freeserve.co.uk, 01 Mar 2003 12:03:13 +0000.
+
+	* makeinfo/files.c (filename_part): simplify assignment.
+
+2003-02-24    <karl@gnu.org>
+
+	* makeinfo/insertion.c (get_item_function): check for @item in
+	argument to @itemize.  Report from: Dumas Patrice
+	<dumas@centre-cired.fr>, 24 Feb 2003 13:13:52 +0100.
+
+	* makeinfo/makeinfo.c (remember_brace): say `braces' instead of
+	`{...}', since often we don't actually expect text inside the
+	braces.
+
+2003-02-21    <karl@gnu.org>
+
+	* aclocal.m4: automake 1.7.3.
+
+2003-02-19    <karl@gnu.org>
+
+	* doc/info-stnd.texi: omit all node pointers.
+
+2003-02-18    <karl@gnu.org>
+
+	* util/texindex.c (maketempname): use already-set `tempdir' instead
+	of half-redoing the logic.
+	(concat): only need two args, not three; change callers.
+	(perror_with_name): really call perror, putting
+	the name first a la gcc.
+	(pfatal_with_name): call perror_with_name.
+
+	* util/texi2dvi (get_xref_files): a file whose first line is
+	\input texinfo is not an index file.  Report from: Anton Ertl
+	<anton@a0.complang.tuwien.ac.at>, 18 Feb 2003 14:41:47 +0100.
+
+2003-02-16    <karl@gnu.org>
+
+	* makeinfo/index.c (init_indices): don't try to free indexes that
+	undefindex already freed.  Report from: Arkadiusz
+	Miskiewicz <misiek@pld.ORG.PL>,
+	15 Feb 2003 13:22:49 +0100.
+
+	* configure.ac (curses): forgot to quote arg to AC_TRY_LINK.
+	From vojta and te, 16 Feb 2003 01:37:09 +0100.
+
+2003-02-13    <karl@gnu.org>
+
+	* makeinfo/insertion.c (begin_insertion): for html cartouche
+	output, add class="cartouche".  Suggestion from Stephen.
+
+2003-02-11    <karl@gnu.org>
+
+	* Installed patch:
+	2003-02-10    Peter Breitenlohner <peb@mppmu.mpg.de>
+	* info/indices.c, info/info.c, info/info.h, info/nodemenu.c,
+	info/session.c, info/window.c, makeinfo/defun.c, makeinfo/html.c,
+	makeinfo/index.c, makeinfo/insertion.c, makeinfo/makeinfo.c,
+	makeinfo/makeinfo.h, makeinfo/node.c: declare all constant
+	strings as such in order to avoid lots of gcc warnings (for
+	--disable-nls and maybe without that as well).
+
+	* doc/texinfo.tex (\registeredsymbol): new command for Arnold.
+
+	* util/dir-example: dc to basics.
+
+	* doc/texinfo.txi (Defining Macros): document new requirements on
+	macro names.  Report from: Alper Ersoy
+	<dirt@gtk.org>, 11 Feb 2003 05:11:35 +0200.
+
+2003-02-07    <karl@gnu.org>
+
+	* makeinfo/insertion.c (begin_insertion): output a table with a border
+	for @cartouche.
+	(end_insertion): end the table.
+	From: Joshua N Pritikin <vishnu@pobox.com>,
+	7 Feb 2003 21:59:49 +0530.
+
+2003-02-05    <karl@gnu.org>
+
+	* info/info.c (short_options): add h.
+	(main): treat -h same as --help.
+        From: rwhron@earthlink.net, 31 Aug 2002 19:56:57 -0400.
+
+	* info/session.c (show_isearch_prompt): compute length of
+	translated "Failing ", don't assume 20 is enough.
+	(It's 21 bytes in UTF-8 Russian.)
+	Report from: varg@thsun1.jinr.ru,
+	25 Jul 2002 15:26:42 +0400.
+
+	* info/display.c (display_update_one_window): don't derefence null
+	`entry' (if the screen is very small).
+	From: Danny Yoo <dyoo@hkn.eecs.berkeley.edu>,
+	8 Jul 2002 15:21:14 -0700.
+
+	* doc/.cvsignore: ignore *.info and texput.log.
+
+2003-02-04    <karl@gnu.org>
+
+	* Version 4.5 (that info bug was a killer).
+
+	* configure.ac (AC_CHECK_HEADERS): test for sys/stream.h.
+	(sys/ptem.h): write separate test since it needs
+	sys/stream.h on Solaris.  From: Lars Hecking
+	<lhecking@nmrc.ucc.ie>, 4 Feb 2003 19:47:54 +0000.
+
+	* doc/texinfo.txi: comment about using @example instead of
+	@verbatim due to automake doesn't apply any more.
+
+2003-02-03    <karl@gnu.org>
+
+	* doc/texinfo.tex (\verbatiminclude): use \other instead of 12.
+
+2003-02-02    <karl@gnu.org>
+
+	* doc/texinfo.tex (\cartouche): explicit \par, as @cartouche does
+	not work inside a paragraph.
+	Bug report from: Stephen Gildea <gildea@intouchsys.com>,
+	15 Oct 1999 09:25:31 EDT.
+
+2003-02-01    <karl@gnu.org>
+
+	* util/fix-info-dir, util/gen-dir-node, util/install-info-html,
+	util/tex3patch, util/txitextest: test && test instead of test -a, etc.
+	From: Paul Eggert <eggert@twinsun.com>,
+	31 Jan 2003 22:59:35 -0800.
+
+2003-01-31    <karl@gnu.org>
+
+	* doc/texinfo.tex (\groupbox): \newbox.
+	(\vfilllimit): new \def.
+	(\group): insert an explicit \page if the group is
+	big, and doesn't fit on the current page.
+	Otherwise, the previous page gets stretched unreasonably.
+	From: Werner LEMBERG <wl@gnu.org>,
+	31 Jan 2003 19:19:33 +0100.
+
+	* doc/texinfo.tex (\defargscommonending): insert \penalty10002.
+	(\parsebodycommon): check for \penalty10002 to
+	allow a breakpoint between @def's, not 10000.
+
+	* doc/texinfo.tex (\defargscommonending): new macro.
+	(\defunargs, etc.): call it, instead of repeating code.
+	(No functional change.)
+
+	* info/filesys.c (extract_colon_unit): return last colon unit
+	before claiming we're done.  Report from: Alexandre Duret-Lutz
+	<duret_g@lrde.epita.fr>, 31 Jan 2003 18:18:22 +0100.
+
+	* Version 4.4.
+
+2003-01-30    <karl@gnu.org>
+
+	* doc/texinfo.tex (\dosubind): need full expansion of the index
+		sort string.
+
+	* doc/texinfo.tex (\startcontents,\contents,\shortcontents):
+	assignments to \pageno must be \global; otherwise
+	if it's run inside a group, as in
+	@ifnothtml
+	@contents
+	@end ifnothtml
+	the rest of the pages in the document get roman numerals.
+	Reported by rlp.
+
+	* doc/texinfo.tex (\dosubind): need space between entry and
+	subentry in printed output.  Bug report from: Robin Lee Powell
+	<rlpowell@digitalkingdom.org>, 30 Jan 2003 15:13:48 -0800.
+	(\defophead, \defcvarhead, \defivarheader): show
+	method name in \code.
+
+	* doc/texinfo.tex (\dosubind): need to \vskip-\skip0, not
+	-\lastskip, since \lastskip gets cleared by the \nobreak.  Bug
+	report from: Werner LEMBERG <wl@gnu.org>, 29 Jan 2003 09:18:16
+	+0100.
+
+2003-01-29    <karl@gnu.org>
+
+	* info/signals.c (initialize_info_signal_handler): initialize the
+	sigaction struct here, not statically, since we can't rely on the
+	ordering of the elements; it's different on IRIX and FreeBSD, at
+	least.  Patch from: ezra peisach <epeisach@med-xtal.bu.edu>, 28
+	Jan 2003 13:09:18 -0500 (EST).
+
+2003-01-28    <karl@gnu.org>
+
+	* util/dir-example: bring emacs section up to date.
+
+2003-01-27    <karl@gnu.org>
+
+	* configure.ac: pretest version 4.3d.
+
+        More changes to use @ fully in the .aux file, otherwise something
+	as simple as:
+          @node foo
+          @section @code{foo}
+        was broken.
+	* doc/texinfo.tex (\setref): call \atdummies.
+	(\atdummies): new macro, based on \indexdummies.
+	(\commondummies): separate out common redefinitions.
+	(\lbraceatcmd,\rbraceatcmd): @{ and @}, as strings.
+
+	* configure.ac (AC_CHECK_FUNCS): add sigaction.
+	* info/signals.c (set_termsig) [HAVE_SIGACTION]: second arg to
+	sigaction is a pointer, not a struct.
+
+	From: AIDA Shinra <aida-s@jcom.home.ne.jp>, 25 Jan 2003 18:53:19 +0900:
+	* info/signals.c (mask_termsig,set_termsig,restore_termsig): new fns.
+	(initialize_info_signal_handler): use sigaction if we have it.
+	(info_signal_proc): reread window size in case it has changed
+	while we were suspended.
+
+	Mon Jan 27 08:09:07 CET 2003 Stepan Kasal <kasal@math.cas.cz>
+	* doc/texinfo.tex (\acuteaccent): the workaround is no longer needed.
+	(\xrefX): \normalturnoffactive changed to \turnoffactive, since
+	we \otherbackslash right afterwards anyway.
+
+2003-01-24    <karl@gnu.org>
+
+	* doc/texinfo.tex: These changes allow ' in node and anchor names:
+	(\internalsetq): use @ instead of ' as the escape
+	character for .aux files.
+	(\xrdef): don't need to play games with \ now.
+	(\readauxfile): don't set catcode' to 0, and do
+	set catcode@ to 0.
+
+	These changes allow \ in node and anchor names
+	(this worked once, but we broke it somewhere along the line):
+	(\setref, \xrefX, \dosetq, \refx): call \otherbackslash.
+	(\otherbackslash): new macro to make an active
+	backslash expand to a literal `\' character with
+	catcode other.
+
+
+	* configure.ac: pretest version 4.3c.
+
+	* doc/texinfo.tex (\smallenvironments): remove, and change callers.
+        (\small...x): rename to just \small...
+	(\smallexamplefonts): set to \smallfonts, not
+	\smallerfonts, at least until people complain again.
+
+	The effect of these changes is to make the
+	@small... commands print in a smaller font (9pt)
+	for all formats, not just @smallbook and @afivepaper.
+
+
+	* info/filesys.c (extract_colon_unit): rewrite so that an empty
+	unit does not stop us from processing the rest.  Report from:
+	Werner LEMBERG <wl@gnu.org>, 24 Jan 2003 07:01:09 +0100.
+
+
+	Date: Mon, 02 Dec 2002 01:06:37 +0900
+	From: AIDA Shinra <aida-s@jcom.home.ne.jp>
+
+	* "info infokey" says key bindings in .info take precedence over
+	the default mapping, but this is not true. Only bindings to
+	undefined keys take effects.
+	* Binding to "invalid" action results crash.
+	* No code to disable prefix keys. Some users might want to bind
+	escape or C-x to a non-prefix key, but this does not allowed.
+	... It always allows '^h' in incremental
+	search. Some terminals map 'backspace' to '^h' by default.
+
+        These are the changes:
+	* info/session.c (incremental_search): check for Control('h') as
+	well as DEL.
+	* info/infomap.c (find_function_keyseq, add_function_keyseq,
+	remove_function_keyseq): new fns.
+	(keymap_copy_keymap, keymap_discard_keymap): take
+	rootmap arg.
+
+Wed Jan 22 14:25:39 CET 2003  Stepan Kasal  <kasal@math.cas.cz>
+
+	* doc/texinfo.tex (\footnotezzz): the very beginning was moved
+	  to \startfootins;
+	  (\startfootins): new macro;
+	  (\multitable, \dotable): redefine \startfootins to get footnotes
+	  saved, use \crcrwithfootnotes;
+	  (\crcrwithfootnotes): check for postponed footnotes each time a row
+	  of a multitable is finished;
+	  (\tab): no longer defined globally, just \let to & inside
+	  @multitable.
+
+2003-01-22    <karl@gnu.org>
+
+	* doc/texinfo.tex: doc fix.
+	* doc/texinfo.tex (\dofootnote): rename from \footnotezzz.
+
+        Wed Jan 22 14:23:51 CET 2003  Stepan Kasal  <kasal@math.cas.cz>
+	* doc/texinfo.tex (\cartouche, \footnotezzz): removed \long, it
+	  has no effect for macros without a parameter;
+        (\fo@t, \f@@t, \f@t, \@foot): removed, local \def has no effect.
+
+2003-01-21    <karl@gnu.org>
+
+	* doc/texinfo.txi (Output Formats): new section.
+
+2003-01-19    <karl@gnu.org>
+
+	* configure.ac: pretest version 4.3b.
+
+	* makeinfo/tests/include-value: need -I $srcdir.
+
+	* util/texindex.c:
+	* util/install-info.c:
+	* info/infokey.c:
+	* info/info.c:
+	* makeinfo/makeinfo.c:
+	* util/texi2dvi: 2003.
+
+2003-01-18    <karl@gnu.org>
+
+	* makeinfo/node.c: add `(perhaps incorrect sectioning?)' to some of
+	the error messages. Unfortunately we can't easily
+	determine when the error stems from actual
+	mistyped node pointers, and when from incorrect
+	menus causing the implicit pointer creation to fail.
+
+2003-01-17    <karl@gnu.org>
+
+	Thu Jan 16 10:28:32 CET 2003  Stepan Kasal  <kasal@math.cas.cz>
+	* doc/texinfo.tex (\refx): Set locally \indexdummies before expanding
+	  the \csname, in case there are macros; foreign accents, for example.
+	Bug report from Dumas Patrice <dumas@centre-cired.fr>.
+
+	* makeinfo/makeinfo.c (COMMAND_CHAR): new macro, and exclude ^ and
+	_ from command names.
+	(read_token): call it.
+
+	* makeinfo/makeinfo.h (command_char): move to makeinfo.c, since
+	it's only used in one place.
+
+2003-01-16    <karl@gnu.org>
+
+	* TODO: @else
+
+2003-01-12    <karl@gnu.org>
+
+	* doc/texinfo.tex (\dounmacro): simplify method for removing from
+	macro list.  From Stepan.  (Also rename from \unmacroxxx.)
+	(\unmacrodo): new macro, called with new method.
+
+	* doc/texinfo.tex (\dotChar, questChar, exclamChar, colonChar,
+	semiChar, commaChar, underChar): names for catcode chars, defined using
+	\chardef.  From Stepan.
+
+	* doc/texinfo.tex (\conditionalsucceed): back to the easy
+	definition, since @set is global now.  From Stepan.
+
+	* doc/texinfo.tex (\doifclear,\doifset): use \let\next instead of
+	\expandafter, so that we'll succeed on no
+	conditional text.  From Stepan.
+	Also rename from \ifclearxxx and \ifsetxxx.
+
+	* doc/texinfo.tex (\expandablevalue): give a \message if the
+	variable is not set.  Based on patch from Stepan.
+
+	* doc/texinfo.tex (\setuptable): insert an actual \space after
+	\unskip.  From Stepan.
+
+	* doc/texinfo.tex (\kbdinputstyle): give error if unknown argument,
+	and call the macro to set the default.  From Stepan.
+
+	* doc/texinfo.tex: typo from Stepan.
+
+	* doc/texinfo.tex (\docenter): rename from \centerzzz and do \hfil
+	instead of using plain's \centerline and \hss.  Also force line
+	breaks before and after in horizontal mode.
+	Based on patch from Stepan, 11 Apr 2000 19:44:31 +0200.
+
+	* doc/texinfo.tex: use \other and \active consistently.
+	From: Stepan Kasal <kasal@suse.cz>, 11 Apr 2000 19:44:31 +0200.
+
+	* makeinfo/cmds.c (handle_include): call text_expansion on the
+	filename, so @value constructs are expanded.
+
+	* doc/texinfo.txi (verbatiminclude, Using Include Files): mention
+	@value expansion.
+	Also, update samples to be copyright 2003.
+
+	* doc/texinfo.tex (\doverbatiminclude, \verbatimzzz): expand
+			@value(but nothing else).
+	Bug from: Alper Ersoy <aersoy@tfz.net>,
+	6 Jan 2003 13:14:28 +0200.
+
+2003-01-11    <karl@gnu.org>
+
+	* doc/texinfo.tex (\definedummyword): new macro.
+	(\indexdummies): call it, instead of defining each
+	command separately; many trailing spaces had been omitted.
+	Alternate implementation of a patch from: Stepan
+	Kasal <kasal@math.cas.cz>, 10 Jan 2003 22:42:05 +0100.
+
+	* doc/texinfo.tex (\acuteaccent): new defn.
+	(\indexdummies): use it instead of \' in the aux file.
+	Variation of a patch from: Stepan Kasal <kasal@math.cas.cz>,
+	10 Jan 2003 21:28:40 +0100.
+
+	* doc/texinfo.tex: doc fix.
+
+2003-01-10    <karl@gnu.org>
+
+	* doc/texinfo.tex (\indexnofonts, \indexdummies): handle more
+		accent commands.
+	(\indexdummyfont): not needed, use \asis instead.
+
+	* doc/texinfo.tex (\indexdummies,\indexnofonts): indent, no other
+		changes.
+
+	* doc/texinfo.tex (\chapter .. \subsubsection): indent the
+	definitions; no other change.
+
+	* doc/texinfo.txi (Macro details): no multiple-line args is
+		another limitation.
+
+	Fri Jan 10 07:12:23 CET 2003 Stepan Kasal <kasal@math.cas.cz>
+        * texinfo.tex (\writetocentry): The
+          common work on building the line for \write\tocfile was
+          moved into the macro itself and thus all callers has been changed.
+
+2003-01-09    <karl@gnu.org>
+
+	* info/session.c (incremental_search): don't interpret the
+	`function' element as an InfoCommand when it's really a Keymap.
+	This caused arrow keys to be inserted literally under Solaris, but
+	not GNU/Linux.  Bug report from: Jeremy Lin
+	<jjlin@OCF.Berkeley.EDU>, 5 Jan 2003 01:59:29 -0800.
+
+	* info/infomap.c: add comment about strange pointer cast.
+
+2003-01-08    <karl@gnu.org>
+
+	* doc/texinfo.tex (\ignoremorecommands): define \Edef... and
+	\def...x for all @def... commands, and use \empty
+	instead of \relax.  Bug report from Paul Eggert
+	<eggert@twinsun.com>, 7 Jan 2003 22:29:07 -0800.
+
+2003-01-06    <karl@gnu.org>
+
+	* doc/texinfo.txi (table): mention @option as a useful indicating
+	command, and need for blank lines before and
+	after.  Suggestion from: Kevin Ryde
+	<user42@zip.com.au>, 03 Jan 2003 10:02:55 +1000.
+
+2003-01-05    <karl@gnu.org>
+
+	* util/texi2dvi: make egrep a variable (EGREP).  Suggestion from:
+	Kurt Hornik <hornik@ci.tuwien.ac.at>.
+	Also, replace fgrep with grep.
+
+	* doc/Makefile.am (TXI_XLATE): include txi-tr.tex from Alper Ersoy
+	<dirt@gtk.org>.
+
+2003-01-02    <karl@gnu.org>
+
+	* makeinfo/insertion.c (end_insertion): in table case, call
+	close_insertion_paragraph.  Bug report from: Kevin
+	Ryde <user42@zip.com.au>, 03 Jan 2003 08:09:54 +1000.
+
+	* doc/texinfo.tex: remove spurious CTRL-G.
+
+	* util/srclist.txt: more m4 files from gnulib now.
+
+2003-01-01    <karl@gnu.org>
+
+	* doc/texinfo.tex (\_): more space afterwards, so __ comes out
+	better.  Noticed in the gcc manual.
+
+2002-12-31    <karl@gnu.org>
+
+	* makeinfo/makeinfo.c (usage): omit all the help message when something
+	goes wrong in argument parsing, as intended.
+
+2002-12-26    <karl@gnu.org>
+
+	* doc/texinfo.tex (\insertcopying): ignore @c, @comment, and
+	@ignore...@end ignore as best we can.  Report from
+	"Joseph S. Myers" <jsm28@cam.ac.uk>, 24 Dec 2002
+	18:08:10 +0000 (GMT), for the gcc manual, which
+	uses these constructs for automatic man page generation.
+
+2002-12-23    <karl@gnu.org>
+
+	* doc/texinfo.txi (example): note that Texinfo commands are
+		expanded, plus other changes.  Suggestion from Nelson Beebe.
+
+2002-12-20    <karl@gnu.org>
+
+	* config.guess: update from prep.
+
+2002-12-17    <karl@gnu.org>
+
+	* makeinfo/texinfo.dtd (indexterm): index not INDEX.
+	(node): only any block, not just para|menu.
+	* makeinfo/xml.c (texinfoml_element_list): format and like can
+		contain para.
+	From: Alper Ersoy <aersoy@tfz.net>.
+
+2002-12-14    <karl@gnu.org>
+
+	* doc/texinfo.txi (makeinfo in Emacs): does not prompt for
+	filename.
+	From: Kevin Ryde <user42@zip.com.au>.
+
+2002-12-13    <karl@gnu.org>
+
+	* doc/texinfo.txi: short sample needs @top (from jas), gnu sample
+	can use @verbatim (automake fix).
+
+2002-12-11    <karl@gnu.org>
+
+	* doc/texinfo.txi: typos.
+
+2002-12-07    <karl@gnu.org>
+
+	* makeinfo/xml.c: use lowercase, allow more chars in id's.  From:
+	Jaime Davila <jdavila@engr.uconn.edu>, 6 Dec 2002 11:00:25 -0500.
+
+2002-12-05    <karl@gnu.org>
+
+	* util/dir-example: alphabetize make.
+
+	* NEWS: change texinfo.tex url.
+
+	* doc/texinfo.tex (\obstexwarn): fix url's to TeX.README and
+	texinfo.tex.
+
+2002-12-02    <karl@gnu.org>
+
+	* doc/texinfo.txi (Line Breaks): fixes.
+
+2002-12-01    <karl@gnu.org>
+
+	* configure.ac: pretest version 4.3a.
+
+2002-11-30    <karl@gnu.org>
+
+	* doc/Makefile.am (texinfo): restore rule since this won't quite
+	be fixed until automake 1.7.2 or later.
+
+2002-11-29 19:19  feloy
+
+	* makeinfo/xml.c: Fix the <para>&lt; bug in XML, reported by K.
+	Ryde
+
+2002-11-29    <karl@gnu.org>
+
+	* lib/strdup.c: gnulib update.
+
+2002-11-29  Alexandre Duret-Lutz  <adl@gnu.org>
+
+	* doc/Makefile.am (.texi.info, texinfo): Remove.  Automake 1.7+
+	no longer output info files in the source tree.
+
+2002-11-26    <karl@gnu.org>
+
+	* makeinfo/insertion.c (cm_insertion_copying): flush_output, so that
+	output_position gets updated, which in turn makes
+	the tag table positions reflect the copying text.
+	Report from: "W. L. Estes" <wlestes@uncg.edu>, 15
+	Nov 2002 15:57:04 -0500.
+
+	* makeinfo/index.c (init_indices): undefindex after we know
+	name_index_alist[i] is not null.
+	From: "Ronald F. Guilmette" <rfg@monkeys.com>, 26 Nov 2002
+	01:08:04 -0800.
+
+	* doc/Makefile.am (texinfo): depend on version
+	files.  Report from: Kevin Ryde
+	<user42@zip.com.au>, 27 Nov 2002 07:52:57 +1000.
+
+2002-11-25    <karl@gnu.org>
+
+	* makeinfo/cmds.c (cm_verb): use <tt> not <pre>, as this is an
+	inline construct.  Also, decrement
+	in_fixed_width_font, else the next paragraph does
+	not get a <p>.
+	Report from: Torsten Bronger <bronger@physik.rwth-aachen.de>
+	26 Nov 2002 00:37:35 +0100.
+
+	* doc/texinfo.tex (\dospecials): must include all other characters
+	that we set active, namely <>|_", or they got
+	mysteriously lost as the first character on a
+	verbatim line.
+	Report from: Torsten Bronger <bronger@physik.rwth-aachen.de>
+	25 Nov 2002 18:26:12 +0100.
+
+	(\doverbatim): ignore everything up to the first
+	^^M, to avoid an extra blank line in the output.
+
+	* lib/getopt*, strdup.c, tempname.c: update from gnulib (bruno
+	changes + gpl).
+
+2002-11-24    <karl@gnu.org>
+
+	* doc/texinfo.txi (Multiple Spaces): xref tie rather w for
+	unbreakable spaces.
+
+2002-11-22    <karl@gnu.org>
+
+	* doc/texinfo.txi: editorial changes from Max's editor.
+
+2002-11-21    <karl@gnu.org>
+
+	* doc/texinfo.txi (Conventions): add item for blank lines as
+	paragraph separator.  Report from: Maxim Masiutin
+	<max@ritlabs.com>, 21 Nov 2002 00:03:07 +0200.
+
+2002-11-19    <karl@gnu.org>
+
+	* util/install-info.c (ensure_dirfile_exists): don't translate the `*
+	Menu' keyword.  Report from: Ingo Krabbe
+	<i.krabbe@dokom.net>, 19 Nov 2002 09:24:45 +0100.
+
+2002-11-18    <karl@gnu.org>
+
+	* po/.cvsignore: exclude *.gmo instead of listing each individually.
+	From: Frédéric L. W. Meunier <0@pervalidus.net>,
+	15 Nov 2002 20:16:09 -0200 (BRST).
+
+	* configure.ac (--enable-multiplatform): new option for teTeX and
+	TeX Live.  From te.
+
+2002-11-14    <karl@gnu.org>
+
+	* configure.ac, util/texi2dvi, NEWS: release version 4.3.
+
+	* util/texi2dvi, mkinstalldirs: use `for var<newline>do"' instead
+	 of  `for var; do', for Solaris.
+
+	* doc/texinfo.txi (math): emphasize that makeinfo does not interpret
+	the arg.
+
+	* config.{guess,sub}: update from prep.
+
+2002-11-13    <karl@gnu.org>
+
+	* configure.ac: pretest version 4.2f.
+
+	* makeinfo/xml.c (INDEX_SEP): define as a string that will never
+	appear, so that we don't try to break index terms
+	at commas.  Idea from: Stepan Kasal
+	<kasal@math.cas.cz>, problem reported by José
+	Fonseca <j_r_fonseca@yahoo.co.uk>.
+
+2002-11-12    <karl@gnu.org>
+
+	* makeinfo/makeinfo.c: make sure command is non-null, for sake of bogus
+	input (\def\x{}).  Report from
+	Neil.Turton@broadcom.com, debian bug#168689.
+
+	* makeinfo/Makefile.am (makeinfo_SOURCES): remove docbook.[ch],
+	per feloy the docbook stuff is in xml.[ch] now.
+
+2002-11-12 19:48  feloy
+
+	* makeinfo/: lang.c, makeinfo.c: (docbook) Entities for accented
+	characters are written correctly
+
+2002-11-12 19:34  feloy
+
+	* makeinfo/xml.c: (docbook) Do not expand @set contents
+
+2002-11-11 18:14  feloy
+
+	* makeinfo/xml.c: Better <bookinfo> support
+
+2002-11-11 13:37  feloy
+
+	* makeinfo/: cmds.c, insertion.c, xml.c, xml.h: Better use of
+	<bookinfo> and <abstract> with docbook output
+
+2002-11-11 01:57  feloy
+
+	* makeinfo/: defun.c, xml.c, xml.h: Removed all references to
+	docbook.[ch] which was the old sources for docbook output, replaced
+	by xml.[ch]
+
+2002-11-10 23:31  feloy
+
+	* makeinfo/: insertion.c, xml.c, xml.h: Some bugfixes in docbook
+	output
+
+2002-11-09 18:47  feloy
+
+	* makeinfo/insertion.c: In Docbook, Copying paragraph is not
+	inserted at @copying/@end copying point.
+
+2002-11-08 21:01  feloy
+
+	* makeinfo/xml.c: take care of indexterm at beginning of table
+
+2002-11-08 20:52  feloy
+
+	* makeinfo/xml.c: Text before first @item in @table is inserted as
+	the <title> of <variablelist>
+
+2002-11-08 20:24  feloy
+
+	* makeinfo/xml.c: subsubheading is simplesect and not sect3
+
+2002-11-08 19:13  feloy
+
+	* makeinfo/: makeinfo.c, xml.c, xml.h: makeinfo/xml.c (xml_id):
+	Added more forbidden characters makeinfo/{xml.c,xml.h,makeinfo.c}:
+	Defined xml_in_xref_token variable
+
+2002-11-07    <karl@gnu.org>
+
+	* makeinfo/sectioning.c: doc.
+	* makeinfo/sectioning.c: revert last change, it breaks gcc.
+
+	* makeinfo/xml.c (xml-add_char): don't insert BOOKINFO and ABSTRACT
+	if executing_string.  From Jos? Fonseca.
+
+	* configure.ac: pretest version 4.2e.
+
+	From: José Fonseca <j_r_fonseca@yahoo.co.uk>,
+              7 Nov 2002 00:31:28 +0000.
+	* makeinfo/index.c (cm_printindex): in docbook case, pass the
+	unexpanded index term.
+	* makeinfo/xml.c (xml_insert_indexterm): execute_string instead of
+		insert_string.
+	(Otherwise, <>& are not escaped in the docbook index output.)
+
+	* util/dir-example: sed.
+
+	* makeinfo/lang.c: copyright.
+	* makeinfo/lang.h: copyright.
+
+2002-11-07  Stephen Gildea
+
+	* makeinfo/sectioning.c (sectioning_html): have A tag enclose
+          section name rather than preceding it.
+
+	* makeinfo/toc.c (contents_update_html): put name attribute into
+          existing A tag rather than making a separate tag for it.
+
+2002-11-07  Stephen Gildea
+
+	* makeinfo/lang.c: support @documentencoding US-ASCII:
+	Put NULL at end of map tables so they can be of varying lengths.
+	(us_ascii_map): new iso_map_type table.
+	(encoding_table): add US_ASCII.
+	(cm_search_iso_map): don't assume all maps are the same length.
+	(cm_documentencoding): don't assume ISO_8859_1 is first table entry.
+	* makeinfo/lang.h (encoding_code_type): add US_ASCII.
+
+2002-11-05    <karl@gnu.org>
+
+	* doc/info-stnd.texi: untabify.
+	* doc/info-stnd.texi: document that.
+	* info/footnotes.c (auto_footnotes_p): turn off by default.
+
+	* info/infodoc.c (info_internal_help_text): had
+	scroll-{forward,backward} twice instead of {next,prev}-line.
+	* info/infodoc.c: untabify.
+
+	* util/texi2dvi: untabify.
+	* doc/texinfo.tex: untabify.
+	* util/texindex.c: untabify.
+	* util/install-info.c: untabify.
+	* makeinfo/makeinfo.c: indentation fix.
+	* makeinfo/cmds.c: doc fix.
+
+2002-11-04    <karl@gnu.org>
+
+	* configure.ac: pretest version 4.2d.
+	* doc/fdl.texi: better line break to avoid overfull hbox.
+
+2002-11-04  Stephen Gildea
+
+        * makeinfo/{footnote.c,cmds.c,html.c,index.c,insertion.c,
+        makeinfo.c,node.c,toc.c,sectioning.c}: add a class attribute
+        to tags generated in special circumstances that wouldn't be
+        obvious to a user agent.
+
+        Quote all attribute values (for XHTML).
+
+2002-11-04    <karl@gnu.org>
+
+	* doc/texinfo.txi (File End): grammar.
+
+        These changes from gildea:
+	* makeinfo/cmds.c (cm_titlepage): new fn, and use it for @titlepage.
+
+	* makeinfo/cmds.h (titlepage_cmd_present): new global.
+	* makeinfo/html.c (html_output_head): check titlepage_cmd_present
+	before outputting the <h1>.
+
+	* makeinfo/html.c (html_output_head): put a class on the <h1> from
+	settitle.
+
+	* makeinfo/cmds.c (cm_titlefont): put the class directly on the h1
+	rather than a separate <span> element.
+
+2002-10-31    <karl@gnu.org>
+
+	* doc/texinfo.tex (\mathactive): new fn.
+	(\math): call it, to change definitions of active characters.
+	(\ptex{gtr,hat,less,plus}): save original characters.
+	Report from wl.
+
+	* doc/texinfo.tex (\itemzzz): \penalty10001 instead of 10000
+        before the putative \parskip.
+        (\aboveenvbreak): insert \parskip if penalty!=10000,
+        rather than <10000. Otherwise, @item some long item label /
+        @example has too little spacing.
+	Report from: Werner LEMBERG <wl@gnu.org>,
+	26 Apr 2002 08:37:41 +0200 (CEST).
+
+	* makeinfo/makeinfo.c (executing_macro): new static.
+	(read_command): set it, if we execute a macro.
+	(add_char): if it is set, call html_output_head.
+	This is so if a macro expansion is first in the document body, the
+	html head gets written before the macro body.
+	Report from: Stephen Gildea <gildea@stop.mail-abuse.org>,
+	10 Jul 2002 13:35:13 -0400.
+
+	* makeinfo/html.c (html_title_written),
+	* makeinfo/html.h (html_title_written): make available.
+	* makeinfo/cmds.c (cm_titlefont): set html_title_written for html
+		output.
+
+	* util/texindex.c: texindex.c (need_initials, first_initial): New
+	globals.
+	(main): Clear them for each index.
+	(parsefile): Set need_initials when there is more than one
+	initial in this index.
+	(indexify): Do not emit \initial commands unless need_initials
+	is set.  Use toupper.
+
+	From: Zack Weinberg <zack@codesourcery.com>
+	Date: Tue, 26 Mar 2002 17:20:06 -0800
+
+	* lib/system.h: doc fix from gildea.
+
+2002-10-30    <karl@gnu.org>
+
+        (Following reported by Bob Wilson.)
+
+	* doc/texinfo.tex (\sectionheading): add either
+	\normalbaselineskip or \parskip after the heading, whichever is
+	larger, instead of hardwiring 10pt.
+
+	* doc/texinfo.tex (\defxbodycommon): new defn, including a
+	potential breakpoint if we have multiple consecutive @def...x commands.
+	(\def*parsebody): use it.
+
+	* doc/texinfo.tex (\singlespace): remove, since we fixed the
+        regular line spacing a long time ago to not be double-spaced.
+        In @smallbook mode, it ironically caused excessive line spacing.
+	(\nonfillstart, \quotation): don't call it.
+
+	* doc/texinfo.tex (\smartslanted, \smartitalic): use \ttsl if in
+	typewriter.
+	From: Bob Wilson <bwilson@tensilica.com>.
+
+	* doc/texinfo.tex (\defmethparsebody): pass \empty to \smallsplit
+	to keep a brace-delimited argument to @deffn from having the braces
+	stripped.
+	(Report from: Han-Wen Nienhuys <hanwen@cs.uu.nl>.)
+
+2002-10-28    <karl@gnu.org>
+
+	* doc/texinfo.tex (\loggingall): rewrite to minimize log file
+	output (ideas from Frank Mittelbach's trace.sty) and explicitly
+	show the etex changes.
+
+	* configure.ac: pretest version 4.2c.
+
+	* NEWS: mention Werner's fixes.
+
+2002-10-27  Werner Lemberg  <wl@gnu.org>
+
+	* makeinfo/html.c (insert_html_tag): Fix handling of nested,
+	identical tags.
+
+2002-10-27    <karl@gnu.org>
+
+	* configure.ac (AM_INIT_AUTOMAKE): add dist-bzip2 option.
+
+2002-10-26    <karl@gnu.org>
+
+	* 2002-10-24  Werner Lemberg  <wl@gnu.org>
+	Fix html font tags, i.e., make the output similar to
+	texinfo.tex.  The main idea is to avoid nested font tags.
+
+	* makeinfo/html.c (push_tag, pop_tag): New functions.
+	(insert_html_tag): Use them.
+	Don't emit more than a single font attribute.
+
+	* makeinfo/html.h (HSTACK): New structure.
+
+	* makeinfo/defun.c: Include cmds.h and html.h.
+	(process_defun_args): Don't apply <i>...</i> to parentheses
+	and brackets.
+	(defun_internal): Use insert_html_tag for emitting font tags.
+
+	* makeinfo/cmds.c (cm_url): Use insert_html_tag for emitting
+	font tag.
+	(cm_r): Simplify.
+
+2002-10-25  Alexandre Duret-Lutz  <adl@gnu.org>
+
+	* util/texi2dvi: Preserve empty components when expansing
+	TEXINPUTS and INDEXSTYLE.
+
+2002-10-24    <karl@gnu.org>
+
+	* doc/info-stnd.texi: missing period.
+
+	* m4/{check-decl.m4,mkstemp.m4,prereq.m4}: new files from gnulib.
+	* lib/mkstemp.c, lib/tempname.c: likewise.
+	* aclocal.m4, configure.ac: support for mkstemp instead of mktemp.
+	* util/texindex.c: use mkstemp instead of mktemp.
+
+        2002-10-24  Alexandre Duret-Lutz  <adl@gnu.org>
+	* util/texi2dvi: Turn relative entries $TEXINPUTS and $INDEXSTYLE
+	into absolute paths.  (Allows --clean to work with relative dirs
+	in TEXINPUTS, etc.)
+
+	* doc/texinfo.tex: update \texinfoversion timestamp.
+
+2002-10-22    <karl@gnu.org>
+
+	2002-10-16  Werner Lemberg  <wl@gnu.org>
+
+	* texinfo.tex (\appendixbox): New macro to compute a
+	fixed-width box for the appendix entry in the TOC.
+	(\appendixzzz, \appendixentry): Use it.
+
+	(\shortconttt): New font.
+	(\summarycontents): Use it to set the font size of the \tt
+	font properly.
+
+	(\authortt): New macro.
+	(\authorfont): Use it to provide a proper font size for
+	@email used within @author.
+
+2002-10-21    <karl@gnu.org>
+
+	* automake 1.7.1.
+
+2002-10-18    <karl@gnu.org>
+
+	* doc/texinfo.tex (\defname): get rid of the unused
+	 \deftypemargin; typeset the function type word flush right, in
+	 brackets.  Partially suggested by bob.
+
+2002-10-16    <karl@gnu.org>
+
+	* makeinfo/html.c: Just > after all on <meta> and <link> to
+	appease HTML 4.01 (and break XHTML).  From Janis.
+
+2002-10-15    <karl@gnu.org>
+
+	* configure.ac: pretest version 4.2b.
+
+	* makeinfo/cmds.c (cm_dots, cm_enddots): don't use small if
+	in_fixed_width_fonts; this violates the html specs, which don't
+	want you to change fonts within <pre>. (Argh.)
+	Report from: Janis Johnson <janis187@us.ibm.com>,
+	14 Oct 2002 15:59:16 -0700.
+
+2002-10-14  Alexandre Duret-Lutz  <adl@gnu.org>
+	* util/texi2dvi (common, txincludes): Fix definitions so that
+	an empty $txincludes doesn't result in a empty path element
+	in TEXINPUTS.
+
+2002-10-14    <karl@gnu.org>
+
+	* info/infokey.c: copyright 2002 not 02.
+	* makeinfo/lang.c: copyright 2001 not 01.
+
+	* makeinfo/insertion.c (begin_insertion): for enumerate, set
+	in_paragraph=0 as we do for itemize.
+	Otherwise a </p> gets inserted at the next @item, which is wrong.
+
+	Report from: Janis Johnson <janis187@us.ibm.com>, 14 Oct 2002
+	12:35:30 -0700.
+
+2002-10-13    <karl@gnu.org>
+
+	* util/install-info.c (longopts): make --infodir a synonym for
+	--info-dir, for some compatibility with the Debian install-info.
+	Reported by Bob Chassell, Yves Codet <ycodet@club-internet.fr>,
+	and many others.
+
+	* doc/texinfo.txi (makeinfo advantages): document various options
+	that have crept in to the source.  (Werner Lemberg noted that
+	--iftex and companions were missing.)
+
+2002-10-10    <karl@gnu.org>
+
+	* makeinfo/cmds.c (cm_tie): new fn for new cmd @tie{}.
+	* doc/texinfo.txi: document it.
+
+2002-10-09    <karl@gnu.org>
+
+	* doc/texinfo.txi: recommend free software directory categories
+	(suggestion from rms),
+        more info about @noindent (fut_nis@d3.dion.ne.jp and ryk@dspwiz.com),
+        version specification (spectorhome@rcn.com).
+
+	* makeinfo/{cmds,footnote,html,insertion,makeinfo,multi,node}.c:
+	use <br /> instead of plain <br>, for the sake of XHTML.  Likewise
+        with <hr /> and <meta />, and quote all <meta> values.
+        Suggestion (and assurance of compatibility) from
+        Janis Johnson <janis187@us.ibm.com>
+        and Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>
+        (the gcc web page maintainers).
+
+	* util/infosrch: new contrib script.
+	* util/Makefile.am (EXTRA_DIST): add infosrch.
+
+2002-10-04    <karl@gnu.org>
+
+	* configure.ac: pretest version 4.2a.
+
+	* TODO: more info on dir categories.
+
+2002-10-02    <karl@gnu.org>
+
+	* doc/.cvsignore: ignore tex output files.
+
+	* util/dir-example: remove unused categories, etc.
+
+2002-10-01    <karl@gnu.org>
+
+	* doc/texinfo.tex (\xml,\ifxml): more \doignore's.
+	(\copying,\insertcopying): new implementation to save the uninterpreted
+	tokens instead of typesetting a box, so that the page size, fonts,
+	etc., don't have to be defined before @copying is run.
+
+	These changes from Werner Lemberg <wl@gnu.org>:
+	(\internalpagesizes): take two new arguments for the physical paper
+	height and width.
+	(\smallbook,\afourpaper,\afivepaper,\letterpaper,\afourwide,
+ 	 \pagesizes): pass them.
+
+2002-09-30    <karl@gnu.org>
+
+	* util/texi2dvi: doc fixes.
+
+	* README: mention autoreconf.
+
+2002-09-29    <karl@gnu.org>
+
+	* doc/texinfo.tex (\pdfmakeoutlines): call \turnoffactive to handle all special characters
+	except \{}.
+	(\normalturnoffactive): call \turnoffactive instead of repeating all the
+	redefinitions.
+
+	* doc/texinfo.tex (\afourpaper, \afourlatex, \afourwide): new
+		formatting values.
+	From: Eric.Belpaire@equant.com, 30 Aug 2002 19:03:30 +0200.
+
+	* aclocal.m4: $Id now omitted.
+
+	* doc/texinfo.txi: document @xml and @ifxml.
+
+	* makeinfo/makeinfo.c (usage): mention the new options.
+	* info/Makefile.am (BUILT_SOURCES): define this unconditionally,
+		no more TEXINFO_MAINT.  We handle it in the top-level
+		Makefile.am by defining distcleancheck_listfiles.
+
+	* acinclude.m4: can't have $Id, then it gets propagated to
+		aclocal.m4.
+
+    From: Philippe Martin <feloy@free.fr>, 11 Aug 2002 20:17:44 +0200.
+	* makeinfo/cmds.c: new commands @ifnotxml, @ifxml, @xml.
+	* insertion.c: likewise.
+	(cm_ifxml, cm_ifnotxml): new functions.
+	* insertion.h: likewise.
+	* makeinfo.c: new options --ifxml, --no-ifxml.
+	(cm_image): better xml output.
+        * makeinfo.h (process_xml): new global.
+        * xml.c: call xml_close_sections.
+
+2002-09-28    <karl@gnu.org>
+
+	* makeinfo/insertion.c (begin_insertion): only do <pre>, not
+	<br><pre>; suggestion from Werner.
+
+	* info/infodoc.c: document the bug regarding where_is_rep_index,
+	but don't fix it since it's in the [!INFOKEY] code.
+
+   2002-05-18  Eli Zaretskii  <eliz@is.elta.co.il>
+	These changes make @example be indented in HTML output, and make
+	@exdent work inside an @example in HTML.
+
+	* makeinfo/insertion.c (begin_insertion) <example>: Insert spaces
+	after <pre> to produce indentation of the first line in HTML mode.
+
+	* makeinfo/makeinfo.c (indent): Do indent even in HTML mode.
+
+    These patches from: Thierry Vignaud <tvignaud@mandrakesoft.com>,
+	24 Apr 2002 20:52:37 +0200.
+
+	* makeinfo/insertion.c: doc fix.
+
+	* info/infomap.c: had h and l functions reversed in vi mode.
+
+	* util/install-info.c: bzip2 support.
+
+	* util/texi2dvi: don't allow whitespace as one of the ?'s around
+	the o in foo.?o?, that could lead to misparsing.
+
+2002-09-27    <karl@gnu.org>
+
+	* doc/Makefile.am (*.1): call the binary, not the source file.
+
+	* util/texindex.c (sort_in_core): int not off_t.
+	(main): cast argument to sort_in_core to int.
+	(sort_offline): nfiles parameter is not actually passed (or used);
+	need to pass &tempfiles[i] to sort_in_core.
+	From: Christopher League <league@contrapunctus.net>,
+	26 Apr 2002 22:45:45 -0400.
+
+	* doc/texinfo.tex (\unnumb...entry): make analogous to \...entry
+	(except when actually outputting the text, of course), so pdf
+	bookmarks can go to the right level.
+	From: Christopher League <league@contrapunctus.net>,
+	25 Apr 2002 15:29:24 -0400.
+
+	* install-sh: update from gnulib.
+
+	* makeinfo/insertion.c (handle_verbatim_environment): need to
+	quote & and <.
+	From: Philippe Martin <feloy@free.fr>, 18 Aug 2002 15:39:10 +0200.
+
+        2002-06-04  Eli Zaretskii  <eliz@is.elta.co.il>
+	* makeinfo/cmds.c (cm_exdent): Call start_paragraph to restore
+	previous indentation of text.  (exponent.tex test.)
+
+        2002-05-11  Eli Zaretskii  <eliz@is.elta.co.il>
+	* makeinfo/node.c (remember_node): If the argument FNAME is NULL,
+	as it happens for "Top", use the basename of current_output_filename.
+
+2002-09-26    <karl@gnu.org>
+
+	* lib/system.h [MIKTEX]: include gnu-miktex.h, define S_ISDIR.
+	[! MIKTEX]: declare substring.
+	From: Stephen Gildea <gildea@stop.mail-abuse.org>,
+	08 May 2002 18:12:58 -0400.
+
+	* doc/texinfo.tex: spurious \let when setting \mainmagstep.
+	From: Stephen Gildea <gildea@stop.mail-abuse.org>,
+	08 May 2002 08:38:39 -0400.
+
+	* doc/texinfo.txi: copyright symbol: use @code{@copyright@{@}},
+	with the braces in the @code.
+	From: Paul Eggert <eggert@twinsun.com>, 1 Apr 2002 11:37:52 -0800.
+
+	* info/infodoc.c (replace_in_documentation): always allocate at
+	least one byte for replen, otherwise things crash when MALLOC_CHECK_=2.
+	From: "Andreas Herrmann" <AHERRMAN@de.ibm.com>.
+
+	* lib/Makefile.am (libtxi_a_SOURCES): include xalloc.h.
+
+	* doc/Makefile.am (EXTRA_DIST): skip macro.texi and userdoc.texi now.
+	(common_mandeps): new var.
+	(*.1): use that, and depend on the source files with the version strings
+	instead of the binaries.  Suggestion from Alexandre.
+
+	* util/Makefile.am (bin_PROGRAMS, ginstall_info_SOURCES,
+	transform): build as ginstall-info, to avoid clashing with the
+	install-info target inserted by Automake.  (Suggestion from Akim.)
+
+	* Makefile.am (distcleancheck_listfiles): new definition so
+	distcheck doesn't complain about our generated files in info/,
+	which are conditionalized on TEXINFO_MAINT.
+
+	* lib/gettext.h: update from gettext 0.11.5.
+
+2002-09-24    <karl@gnu.org>
+
+	* util/srclist.txt: m4 files from aclocal rather than gnulib.
+
+        * Makefile.am, util/Makefile.am, dir-example: move dir-example to util.
+
+2002-09-23    <karl@gnu.org>
+
+	* INSTALL.generic: update from autoconf 2.54.
+
+2002-09-20  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.11.5.
+
+2002-09-12    <karl@gnu.org>
+
+	* util/srclist.txt: INSTALL to INSTALL.generic.
+
+2002-08-04    <karl@gnu.org>
+
+	* doc/texinfo.5:
+	* lib/system.h:
+	* doc/texinfo.tex:
+	* doc/info-fr.texi:
+	* configure.ac: non-copyright notice.
+	* doc/info-fr.texi:
+	* doc/info-stnd.texi:
+	* doc/texinfo.txi: copyright years should be written out in full.
+
+2002-07-23    <karl@gnu.org>
+
+	* doc/texinfo.txi: verbatim license sample per rms and chassell.
+
+2002-07-19    <karl@gnu.org>
+
+	* doc/texinfo.txi:
+
+2002-06-05    <karl@gnu.org>
+
+	* doc/Makefile.am (TXI_XLATE): txi-it.tex from Paolo Bonzini
+		<bonzini@gnu.org>.
+
+2002-06-04    <karl@gnu.org>
+
+	* doc/texinfo.tex (\defparsebodycommon): do \penalty0 if the last
+	item was a \nobreak, since that means we have two function headers
+	in a row.  Report from: Brian Gough <bjg@network-theory.co.uk>.
+
+	(\defparsebody,...): use \defparsebodycommon instead of repeating code.
+
+2002-05-09    <karl@gnu.org>
+
+	* doc/texinfo.5: lowercase NAME to `texinfo' for Solaris man.
+	From gildea.
+
+2002-04-29    <karl@gnu.org>
+
+	* doc/texinfo.txi: mention it.
+	* util/texi2dvi: allow -E as well as -e.
+
+2002-04-10    <karl@gnu.org>
+
+	* doc/texinfo.txi:
+
+2002-04-01    <karl@gnu.org>
+
+	* configure.ac: version 4.2.
+	* util/texi2dvi: 4.2
+
+	* makeinfo/toc.c: doc fix.
+	* util/install-info-html:
+	* makeinfo/texinfo.xsl: Fixes From: Ville Skyttä
+		<ville.skytta@iki.fi>.
+
+	* makeinfo/insertion.c (begin_insertion): (copying case) omit
+		cm_insert_copying if no_headers.
+	Bug report from Stephen Gildea.
+
+2002-03-28    <karl@gnu.org>
+
+	* configure.ac: pretest 4.1d.
+
+	* doc/texinfo.txi:
+	* makeinfo/cmds.c: ignore headings commands.  From Stephen Gildea.
+
+	* doc/texinfo.txi: @ifplaintext
+
+2002-03-26    <karl@gnu.org>
+
+	* doc/texinfo.tex (\ifplaintext,\ifnotplaintext): new output
+		format conditional.
+
+	* makeinfo/cmds.c (cm_settitle):
+	* makeinfo/node.c (cm_node): need to pass output filename arg to
+		* xml_begin_document.
+
+	* makeinfo/cmds.c (cm_sp): need close_single_paragraph instead of
+	close_paragraph to avoid an extra blank line.  Bug report from Stephen Gildea.
+
+	* doc/texinfo.tex (\doignore): can't do c kludge for
+		documentdescription.  Bug report from Stephen Gildea.
+
+	* doc/texinfo.txi: missing t in documentdescription example, from
+	Stephen Gildea.
+
+2002-03-24    <karl@gnu.org>
+
+	* doc/texinfo.txi: invar sec
+
+2002-03-23    <karl@gnu.org>
+
+	* configure.ac: pretest 4.1c.
+
+2002-03-23  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* info/search.c (skip_non_whitespace): Don't go beyond the
+	terminating null character.
+
+	* info/filesys.c (filesys_read_info_file)
+	(filesys_read_compressed): Null-terminate the contents of the file
+	we've read, so it could be used as a C string.
+
+2002-03-23  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/makeinfo.c (insert_toplevel_subdirectory): Fix
+	computation of output_filename's length, to avoid overrunning
+	malloc'ed buffer.  If mkdir returns with EEXIST, assume we can use
+	an existing directory only if the existing file is indeed a
+	directory.  On MS-DOS, allow for EACCES in addition to EEXIST.
+	<max_name_len>: Remove this variable.
+
+	* makeinfo/makeinfo.c (expansion): Protect execute_string from too
+	long strings.
+	(EXECUTE_STRING_MAX): New macro.
+	(execute_string): Use EXECUTE_STRING_MAX, not 4000.
+
+2002-03-23    <karl@gnu.org>
+
+	* doc/texinfo.txi:
+	* makeinfo/insertion.h:
+	* makeinfo/texinfo.dtd:
+	* makeinfo/xml.h:
+	* makeinfo/xml.c:
+	* makeinfo/makeinfo.h:
+	* makeinfo/insertion.c:
+	* makeinfo/html.c:
+	* makeinfo/cmds.c:
+	* doc/info-stnd.texi: @permissions -> @copying.
+	* doc/texinfo.tex: permissions -> copying.
+
+2002-03-22    <karl@gnu.org>
+
+	* configure.ac: pretest 4.1b.
+
+	* info/Makefile.am (BUILT_SOURCES): conditionalize on
+		TEXINFO_MAINT, to appease distcheck.
+
+	* From: Matthew Woodcraft <mattheww@chiark.greenend.org.uk>:
+	* makeinfo/makeinfo.h (next_menu_item_number): New global.
+	* makeinfo/insertion.c (begin_insertion): Initialise it.
+	* makeinfo/makeinfo.c (handle_menu_entry): Emit accesskey attribute
+	in html output, according to next_menu_item_number.
+	* makeinfo/node.c (cm_node): Emit accesskey attributes in html output.
+
+	* doc/texinfo.txi: GNU texts.
+
+	* doc/info-stnd.texi: @syncodeindex, not @synindex.
+
+2002-03-21    <karl@gnu.org>
+
+	* doc/texinfo.txi: @permissions.
+
+2002-03-20    <karl@gnu.org>
+
+	* doc/texinfo.txi: document --no-headers a bit better.
+	* makeinfo/makeinfo.c: better description of --no-headers,
+		suggested by Stephen Gildea.
+
+	* makeinfo/makeinfo.c (insert_toplevel_subdirectory): use
+		command-line specified output name unchanged.
+
+	* makeinfo/makeinfo.c (full_expansion): new routine, separated
+	from expansion, that does not tamper with the formatting parameters.
+	* makeinfo/insertion.c: copying -> permissions.
+	(cm_insert_permissions): insert rather than add.
+	* makeinfo/texinfo.dtd:
+	* makeinfo/xml.h:
+	* makeinfo/xml.c:
+	* makeinfo/cmds.c: copying -> permissions.
+	* makeinfo/makeinfo.h: copying -> permissions.
+	(full_expansion): declare.
+
+	* doc/texinfo.txi: @copying -> @permissions, @include fdl.texi.
+	* doc/info-stnd.texi: @copying -> @permissions, always include the FDL.
+
+	* makeinfo/html.c (html_output_head): copying -> permissions, use
+	insert_string.
+	* makeinfo/insertion.h: copying -> permissions.
+	* doc/texinfo.tex: \copying -> \permissions.
+
+	* doc/Makefile.am (EXTRA_DIST): include fdl.texi.
+
+2002-03-19    <karl@gnu.org>
+
+	* makeinfo/insertion.c (cm_insert_copying): use insert_string in
+		the xml case, sigh.
+
+	* doc/info-stnd.texi: copying
+
+	* dir-example: info standalone.
+
+	* makeinfo/html.c: copyright_text -> copying_text.
+	* makeinfo/texinfo.dtd:
+	* makeinfo/insertion.c:
+	* makeinfo/insertion.h:
+	* makeinfo/makeinfo.h:
+	* makeinfo/xml.c:
+	* makeinfo/xml.h:
+	* makeinfo/cmds.c: copyrighttext -> copying.
+	* doc/info-stnd.texi: copyrighttext -> copying.
+	* doc/texinfo.tex (\copying, \insertcopying): rename from
+		copyrighttext per rms.
+
+	* makeinfo/index.c (index_add_arg): don't emit warning for index
+	entries containing : after all.
+
+	* info/infokey.c: remove non-ansi trailing commas from last items
+	of enums.  From: Albert Chin-A-Young <china@thewrittenword.com>.
+
+2002-03-18    <karl@gnu.org>
+
+	* doc/info-stnd.texi: @include after @setfilename.
+	* doc/texinfo.txi: @insertcopyrighttext, @settitle GNU ...
+
+	* doc/texinfo.txi: mention @setfilename and source filename
+		exceptions at the top.
+
+	* makeinfo/defun.c (scan_group_in_string): handle escaped @{ and @}.
+	Bug report from Werner Lemberg.
+
+	* doc/info-stnd.texi: add version number to title a la Texinfo.
+	* doc/info-stnd.texi: file -> manual.
+	* doc/info-stnd.texi: use @copyrighttext.
+
+	* makeinfo/insertion.c (begin_insertion, end_insertion):
+			copyrighttext case.
+	* makeinfo/makeinfo.h (copyright_text): declare/define.
+	* makeinfo/html.c (html_output_head): output copyrighttext.
+	* makeinfo/texinfo.dtd: Add copyrighttext.
+	* makeinfo/xml.h (xml_element): add COPYRIGHTTEXT.
+	* makeinfo/xml.c (texinfoml_element_list, docbook_element_list):
+			copyrighttext case.
+
+2002-03-17    <karl@gnu.org>
+
+	* makeinfo/insertion.h (insertion_type): include copyrighttext.
+	* makeinfo/cmds.c (command_table): new command copyrighttext.
+
+	* doc/texinfo.tex (\copyrighttext, \insertcopyrighttext): new
+	 Texinfo commands to handle the copyright and permission text cleanly.
+	(\dblarrowbox,\longdblarrowbox,\pushcharbox,\equivbox,\bullbox):
+		remove these definitions that have not been used for ages.
+
+	* configure.ac: call AC_CANONICAL_BUILD before the termcap
+	checking.  Bug report from Eli.
+
+2002-03-16  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/node.c (cm_anchor): When recording the anchor position,
+	account for output_paragraph_offset, since the current paragraph
+	might not be closed yet (happens inside a menu, for example).
+
+	* djgpp/config.sed: Tweak to adapt to the new Automake/Autoconf.
+
+	* djgpp/README: Update.
+
+2002-03-15    <karl@gnu.org>
+
+	* dir-example: GNU organization.
+
+2002-03-14    <karl@gnu.org>
+
+	* makeinfo/cmds.c (cm_titlepage): do not declare nonexistent
+	function.
+
+2002-03-14    <karl@gnu.org>
+
+	* doc/texinfo.txi: don't say specifically html 3.2, since <html
+			lang=...> is not 3.2.
+	Bug reprt from: Matthew Woodcraft <mattheww@chiark.greenend.org.uk>.
+
+2002-03-13    <karl@gnu.org>
+
+	* doc/texinfo.tex (\writetocentry): set \pdfmakepagedesttrue here.
+	(\Etitlepage): instead of here.  In case the document has no
+		@titlepage.  Bug report from Stephen Gildea.
+
+	* util/texi2dvi: be verbose after the definition of cmd, not
+	before.  From Andreas Schwab.
+
+2002-03-12    <karl@gnu.org>
+
+	* pretest 4.1a.
+	* doc/info-stnd.texi: update to FDL.
+
+2002-03-11    <karl@gnu.org>
+
+	* util/texi2dvi:
+	* util/texindex.c:
+	* util/install-info.c:
+	* makeinfo/makeinfo.c:
+	* info/infokey.c:
+	* info/info.c: home page and help message.
+
+	* doc/texinfo.txi (math): document @\ (aka \\) for literal \.
+	regularize index entries.
+	* makeinfo/cmds.c (command_table): \\ -> insert_self.
+
+	* doc/texinfo.tex (\mathbackslash): new definition.
+	(\math): handle \\ too.
+	(\codeunder): handle @code{\} in mmode.
+
+	* makeinfo/html.c: make home page be gnu's.
+
+	* doc/texinfo.txi (Conventions): rewrite description of quotes so
+	as to work in all formats; there was no output for HTML.
+	Report from: David Merrill <david@lupercalia.net>.
+
+2002-03-10    <karl@gnu.org>
+
+	* doc/texinfo.txi (Texinfo Copying Conditions): mention this
+	manual's license specifically.
+
+2002-03-09  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* info/indices.c (add_index_to_index_nodenames): Fix an off-by-one
+	error when computing the number of the last index entry.
+
+2002-03-08    <karl@gnu.org>
+
+	* doc/texinfo.tex: Rewrite unnumbered toc handling to keep track
+	of their sequence, so they can be handled correctly in
+	the PDF toc (= bookmarks).
+	From: Werner LEMBERG <wl@gnu.org>.
+
+	* configure.ac: AC_MSG_WARN if can't find a term library.  From:
+	Marc.Herbert@ens-lyon.fr.
+
+	* info/info.c: alphabetize.
+	* info/info.c: include short option names.
+
+2002-03-08  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* info/display.c (display_update_one_window): Dynamically reallocate
+	printed_line[] as needed.  When under -R, ignore ANSI escapes for
+	the purposes of line wrap display.  Clear the line to EOL if it
+	used escape sequences.  Reallocate entry->text if the new
+	printed_line is longer than screenwidth.
+
+	* info/window.c (string_width): Don't count ANSI escape sequences
+	in string width, when under -R..
+	(calculate_line_starts): Don't count ANSI escape sequences in line
+	width, when under -R.
+	(window_get_cursor_column, window_chars_to_goal): When under -R,
+	ANSI escapes don't affect the horizontal position.
+
+	* info/info-utils.c (printed_representation): If -R is in effect,
+	treat ESC as a normal character.
+
+2002-03-08    <karl@gnu.org>
+
+	* util/Makefile.am:
+	* info/Makefile.am:
+	* makeinfo/Makefile.am:
+	* lib/Makefile.am: doc fix.
+
+	* doc/Makefile.am (install-tex): prefix the install directories
+	with $(DESTDIR), because that is what automake does for all
+	generated install rules.  The file pdfcolor.tex should be
+	installed as such (and not as epsf.tex).
+	From: Peter Breitenlohner <peb@mppmu.mpg.de>.
+
+	* configure.ac (AC_INIT): now pass [GNU Texinfo].
+	(AM_INIT_AUTOMAKE): now no args, for automake 1.6.
+
+2002-03-05    <karl@gnu.org>
+
+	* doc/texinfo.txi: history
+
+2002-03-04    <karl@gnu.org>
+
+	* configure.ac: version 4.1.
+	* util/texi2dvi: version.
+
+	* doc/texinfo.txi: @settitle is used in html output (from Eli),
+		various underfull hbox fixes.
+
+2002-03-02    <karl@gnu.org>
+
+	* configure.ac: pretest 4.0k
+
+	* info/info.c: declare add_file_to_directory to avoid warning.
+
+	* doc/info-stnd.texi: info standalone so as not to collide with
+		`standards' in dir.
+
+2002-03-01  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/insertion.c (end_insertion): Insert the /td and /tr
+	directives in lower case.  From Per Bothner <per@bothner.com>.
+
+	* makeinfo/macro.c (cm_alias): Ignore whitespace around the alias
+	name, like the manual promises.
+
+	* doc/texinfo.txi (Invoking Macros, Macro Details): Document that
+	commas in macro arguments don't work in TeX.  Advise texi2dvi -e
+	when macros don't work with TeX.
+
+	* doc/texinfo.txi (Node Line Requirements): Add restrictions about
+	parens and some punctuation characters in node names.
+	(Def Cmd Template): Document that macros are not expanded.
+
+	The following two changes allow to say "info foo" if there's an
+	Info file `foo' somewhere along INFOPATH.
+
+	* info/info.c (add_file_directory_to_path): New function, code
+	moved from `main'.
+	(main): Use add_file_directory_to_path.
+
+	* info/session.c (info_follow_menus): If the first menu entry
+	couldn't be found as an item in DIR's menu, try it as a file name.
+
+	2001-06-19  Mark Montague  <markmont@umich.edu>
+
+	* info/filesys.c: Fix for sparc64 (offsets should be "long"s).
+
+	* info/session.c: Fix typos in function calls.
+
+	2001-08-23  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/footnote.c (cm_footnote): Don't allow footnotes inside
+	footnotes.
+	(output_pending_notes): Increment already_outputting_pending_notes
+	in the HTML case as well, to protect execute_string from
+	recursively entering output_pending_notes.
+
+2002-03-01    <karl@gnu.org>
+
+	* doc/texinfo.tex: fix mismatched $'s for sake of emacs font-lock.
+	From: Stephen Gildea <gildea@stop.mail-abuse.org>.
+
+2002-02-27    <karl@gnu.org>
+
+	* configure.ac: pretest 4.0j.
+
+	* info/infodoc.c: 1scroll-forward typo.
+
+2002-02-26    <karl@gnu.org>
+
+	* lib/system.h [! ENABLE_NLS]: let's not go const.
+
+2002-02-26  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* djgpp/config.sed: Add tweaking of file names in "install-info"
+	and "uninstall-info" targets.
+
+	* doc/inf-stnd.texi (Custom Key Bindings, Invoking infokey):
+          Add footnotes about DOS file names.
+
+	* info/infokey.c (main) [__MSDOS__]: If HOME is not defined,
+	default to the current directory.
+
+2002-02-26    <karl@gnu.org>
+
+	* lib/system.h (LC_MESSAGES) [! LC_MESSAGES]: need this after all.
+
+2002-02-25    <karl@gnu.org>
+
+	* doc/info-stnd.texi: contents at top, avoid overfull hbox.
+	* lib/Makefile.am (libtxi_a_sources): include gettext.h.
+
+	* lib/system.h (LC_MESSAGES): don't need conditional, Bruno says
+		that locale.h or libintl.h does so.
+
+	* configure.ac: pretest 4.0i.
+
+	* dir-example: infokey.
+	* doc/info-stnd.texi: invoking infokey.
+	* info/infokey.c (short_help): reorganize slightly.
+
+	* lib/system.h: use "gettext.h" instead of <libintl.h> per gettext
+	0.11 recommendation.
+
+2002-02-25  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* Makefile.am (SUBDIRS): Add intl.
+	* configure.ac (AC_CONFIG_FILES): Add intl/Makefile.
+
+2002-02-25    <karl@gnu.org>
+
+	* util/Makefile.am (LDADD):
+	* makeinfo/Makefile.am (LDADD):
+	* info/Makefile.am (LDADD): @LIBINTL@ per gettextize.
+
+	* configure.ac: gettextize changes.
+	* Makefile.am: gettextize changes.
+
+2002-02-25  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* Makefile.am (SUBDIRS): Add m4.
+	(SUBDIRS): Remove intl.
+	(ACLOCAL_AMFLAGS): New variable.
+	(EXTRA_DIST): Add config.rpath.
+	* configure.ac (AC_CONFIG_FILES): Add m4/Makefile.
+	(AC_CONFIG_FILES): Remove intl/Makefile.
+
+2002-02-23    <karl@gnu.org>
+
+	* pretest 4.0h.
+
+	* 2002-02-23  Eli Zaretskii  <eliz@is.elta.co.il>
+	* doc/info-stnd.texi (Invoking Info): Add a reference to the
+	description of index-apropos and index-search.  Document the
+	--raw-escapes option.
+	(Searching Commands): Describe index-search and index-apropos.
+
+	* info/man.c (clean_manpage): If raw_escapes_p is not set, remove
+	ANSI escape sequences from the man page.
+
+	* info/info.h: Declare raw_escapes_p.
+
+	* info/info.c: <raw_escapes_p>: New variable.
+	New option --raw-escapes or -R.
+	(main): Handle it.
+	(info_short_help): Document it.
+	(main): Honor --output together with --usage, by dumping the node
+	we found to the named file.
+
+	2002-02-23  Eli Zaretskii  <eliz@is.elta.co.il>
+	* makeinfo/html.c (nodename_to_filename): Call
+	nodename_to_filename_1 with the last argument 1, not 0.
+
+	* makeinfo/toc.c (shortcontents_update_html)
+	(contents_update_html): Don't omit the entry for the Top node.
+
+	* 2002-01-30  Eli Zaretskii  <eliz@is.elta.co.il>
+	* makeinfo/node.c (cm_node): Don't condition splitting on
+	top_node_seen being non-zero.  If current_node is NULL, use the
+	current output file name to get at the file name for the previous
+	node.  Don't compute a new file name for a node if we didn't close
+	the current file.
+
+	2002-02-01  Eli Zaretskii  <eliz@is.elta.co.il>
+	* makeinfo/node.c (cm_node): Call html_output_head whenever we
+	create a new split-HTML file.
+
+	* makeinfo/html.c (html_output_head): Make html_title static.
+	Compute it only once, and don't free it.  Output the <h1> title
+	header only once per run.
+
+	2002-02-02  Eli Zaretskii  <eliz@is.elta.co.il>
+	* makeinfo/toc.c (contents_update_html): Fix the condition for
+	omitting duplicate TOC entries.  Fix comparison with the TOC entry
+	for "Top".
+
+2002-02-14    <karl@gnu.org>
+
+	* doc/Makefile.am (DISTCLEANFILES): use this variable instead of
+	the distclean-aminfo target, which apparently is no longer used.
+
+	* pretest 4.0g.
+
+	* doc/texinfo.tex (\appendixentry): new macro for typesetting
+	appendix toc entries.
+	(\appendixzzz, \summarycontents, \pdfoutlines): use it, instead of
+	usurping \chapentry.  This allows the bookmarks in the pdf output
+	to come out right.  Report from: Kurt Hornik
+	<Kurt.Hornik@ci.tuwien.ac.at>.
+
+2002-02-13    <karl@gnu.org>
+
+	* configure.ac: ALL_LINGUAS is deprecated as of gettext 0.11.
+	* doc/texinfo.tex (\image): remove spurious \loggingall.
+
+	* doc/texinfo.txi: @math now implies @tex.
+	* doc/texinfo.tex (\math): imply @tex.
+
+2002-02-11    <karl@gnu.org>
+
+	* makeinfo/insertion.c (handle_verbatim_environment): save and
+	restore filling_enabled and inhibit_paragraph_indentation.  Bug
+	report from: Alexandre Duret-Lutz <duret_g@lrde.epita.fr>.
+
+	* makeinfo/makeinfo.c (reader_loop): don't worry about bare braces
+	inside @math.
+
+2002-02-08    <karl@gnu.org>
+
+	* info/infodoc.c: keep underlines with the text they refer to, for
+		translation purposes.
+	Pointed out by Christian Rose <menthos@menthos.com>, 20 nov 2001.
+
+	* doc/info.texi: recommend setting INFOPATH.
+
+	* doc/Makefile.am (install-tex): need $(srcdir) for install.
+	From: istry <istry@mail.ru>.
+
+	* doc/texinfo.tex: replace $$$ delimiter with $.$, for sake of
+	font-lock in Emacs 21.1.  Suggestion from: Stephen Gildea
+	<gildea@stop.mail-abuse.org>.
+
+	2002-01-26  Eli Zaretskii  <eliz@is.elta.co.il>
+	* info/infomap.c (default_emacs_like_info_keys)
+	(default_emacs_like_ea_keys, default_vi_like_info_keys)
+	(default_vi_like_ea_keys): Fix default keybindings to be
+	consistent with non-INFOKEY branch.  Add bindings for Home, End,
+	and Delete keys.
+
+	2002-01-23  Eli Zaretskii  <eliz@is.elta.co.il>
+	* makeinfo/toc.h <TOC_ENTRY_ELT>: New member html_file.
+
+	* makeinfo/toc.c (toc_add_entry): Compute and set the html_file
+	member.
+	(shortcontents_update_html): Produce the toc_* links correctly,
+	without duplicating the link text.  Fix comparison with "Top".
+	Handle the case when there's @shortcontents, but no @contents.
+	(contents_update_html): Fix the way toc_* anchors are produced
+	from toc_entry_alist[i]->name: take only the node name from the
+	string in toc_entry_alist[i]->name.  Fix comparison with "Top".
+
+	* makeinfo/sectioning.c (sectioning_html): Take the toc_anchor
+	substring before closing the anchor with </a>.  Fix the closing
+	</hN> tag--add 2 to level, not 1.  Use sizeof instead of a magic
+	value of 9.
+
+	* makeinfo/cmds.c: Make @summarycontents call cm_shortcontents, as
+	promised by the docs.
+
+	2002-01-19  Eli Zaretskii  <eliz@is.elta.co.il>
+	* djgpp/config.sed: Fix a problem with AC_CONFIG_LINKS that
+	prevented building from a directory on another drive.
+
+	* djgpp/config.bat: Fix problems with long --srcdir diectory names.
+
+	* djgpp/README: Update.
+
+2002-01-31    <karl@gnu.org>
+
+	* doc/texinfo.txi: mention dvips
+
+2002-01-28    <karl@gnu.org>
+
+	* configure.ac (ALL_LINGUAS): add hr.
+
+2002-01-22    <karl@gnu.org>
+
+	* makeinfo/defun.c (defun.c): only warn about ( immediately
+        following a defun name, since the groff manual needs other
+        characters there where whitespace is incorrect.
+	Reported by Werner Lemberg <wl@gnu.org>.
+
+	* doc/info-stnd.texi: alphabetize variable list.
+
+	* doc/texinfo.txi: no :'s in index entries, index @page/@group
+	some more.
+
+	* makeinfo/index.c (index_add_arg): warn if index entry contains a
+	colon.  From: Kenneth Lorber <keni@his.com>.
+
+2002-01-21    <karl@gnu.org>
+
+	* makeinfo/insertion.c: </pre not /<pre, reported by Mike
+	Benefield <mike@duckbrain.com>.
+
+2002-01-18    <karl@gnu.org>
+
+	* configure.ac: pretest 4.0f.
+
+	* util/texindex.c:
+	* util/install-info.c:
+	* makeinfo/makeinfo.c:
+	* info/info.c: it's 2002.
+
+	* info/session.c: pass right args to info_scroll_half_screen_up.
+	From Eli.
+
+2002-01-18  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/multi.c (multitable_item): Always return a value.
+
+	* util/install-info.c (xmalloc, xrealloc, pfatal_with_name)
+	(open_possibly_compressed_file, parse_input): Call `fatal' with 3
+	arguments, to avoid compiler warnings.
+	(main): Call `fatal', `error', and `warning' with the right number
+	of arguments.
+
+	* makeinfo/makeinfo.c (main): Remove extraneous first arg of
+	usage().
+
+	* info/window.c (build_message_node): Supply a 4th argument to
+	build_message_buffer.
+
+
+2002-01-18  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/sectioning.c (sectioning_html): End the anchor properly
+	with a </a>.
+
+	* info/session.c (info_menu_or_ref_item): If we didn't find a
+	cross-reference on this line, try the one before.
+
+	* info/infomap.c (fetch_user_maps): Provide two different
+	translations for ``file too small'' and ``file too big'' error.
+
+	* info/info.c (info_short_help): Print the --speech-friendly
+	option together with the other options, not at the end of the help
+	screen.
+
+2002-01-18  Andreas Schwab  <schwab@suse.de>
+
+	* makeinfo/html.c (escape_string): When string is empty don't read
+	past end of it.
+
+2002-01-17    <karl@gnu.org>
+
+	* doc/info-stnd.texi: overfull box in table.
+
+2002-01-16    <karl@gnu.org>
+
+	* configure.ac: pretest 4.0e.
+
+	* doc/info.texi: update from emacs.
+
+2002-01-03  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/makeinfo.c (file_line_error): New function.
+
+	* makeinfo/insertion.c (discard_insertions): Call file_line_error
+	instead of changing global variables.
+
+	* makeinfo/sectioning.c (cm_top): Ditto.
+
+	* makeinfo/node.c (validate_file): Ditto.
+
+	* makeinfo/makeinfo.c (discard_braces, handle_variable_internal):
+	Ditto.
+
+	* makeinfo/macro.c (define_macro): Ditto.
+
+	2001-12-31  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/node.h (TAG_ENTRY): New struct member html_fname.
+
+	* makeinfo/node.c (find_node_by_fname): New function.
+	(remember_node): Accept an additional argument FNAME, the node's
+	file name, and record it in the list of nodes; callers changed.
+	(cm_node): Call find_node_by_fname to see if this node's file name
+	clashes with another node or anchor.  If it clashes with another
+	node, append the new node to the same file instead of erasing the
+	other node.  If it clashes with an anchor, print an error message
+	and overwrite the anchor's file.
+	(cm_anchor): If this anchor's file name clashes with another
+	anchor or node, print an error message and ignore the anchor.
+
+	* makeinfo/files.c (normalize_filename): New function.
+
+	* makeinfo/files.h <normalize_filename>: Add declaration.
+
+	* makeinfo/html.c (nodename_to_filename_1): Call
+	normalize_filename before returning the file name to the caller.
+	Disable the code which adds #Nodified-filename to the file name we
+	produce.
+
+	* makeinfo/makeinfo.c (add_char): Don't replace whitespace with
+	&nbsp; if we are producing an HTML directive.
+	(add_html_elt): New function.
+	(cm_xref, cm_inforef, cm_uref, cm_email, cm_image): Use
+	add_html_elt instead of add_word, where appropriate.
+
+	* makeinfo/html.c (add_link): Ditto.
+
+	* makeinfo/footnote.c (cm_footnote): Ditto.
+
+	* makeinfo/defun.c (defun_internal): Ditto.
+
+	2001-12-27  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/node.c (cm_node): Don't omit links to (DIR) from the
+	navigation bar, add_anchor_name will DTRT now.
+
+	* makeinfo/makeinfo.c (cm_xref): Produce a split-HTML file name
+	from arg1, the node name, not from arg3 or arg2, which are the
+	reference name.  Use arg2 or arg3 for the text to be displayed as
+	a link between ">" and "</a>".  Use add_anchor_name instead of
+	add_nodename_to_filename.
+	(cm_inforef): Use add_anchor_name instead of
+	add_nodename_to_filename.  Handle the case of a missing second
+	argument in @inforef.
+
+	* makeinfo/html.c (add_anchor_name): Always add # and the anchor
+	name, even if we are splitting.  If the node is "(dir)", treat it
+	as if it were "dir".
+	(nodename_to_filename_1): Don't append #Top for the Top node.
+	(add_link): Don't punt if nodename is "(dir)".  Output "</a>"
+	after the link.
+
+	2001-12-25  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/makeinfo.c (cm_xref, cm_inforef): Output the target
+	file name via add_nodename_to_filename.
+
+	2001-12-20  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/html.c (nodename_to_filename_1): Make references to Top
+	to refer to index.html#Top.
+	(add_nodename_to_filename): Accept additional argument HREF;
+	callers changed.
+
+	* makeinfo/toc.c (rewrite_top): If the filename to rewrite is
+	stdout or the null device, do nothing.
+
+	* makeinfo/makeinfo.c (insert_toplevel_subdirectory): Use
+	FILENAME_CMP instead of strcmp.  Search for a period forward, not
+	backward.  Make index_name[] a static const array, and its len
+	computed at compile time.
+	(convert_from_loaded_file): If output_filename is the null device,
+	turn off HTML splitting.
+	(cm_xref): Use add_anchor_name, rather than add_escaped_anchor_name,
+	in the 5-argument case in HTML mode.
+	(cm_inforef): Fix external references in HTML mode.
+
+	* makeinfo/node.c (cm_node): Use FILENAME_CMP instead of strcmp.
+	Don't open a new file if the new node's name is empty.  Take the
+	directory part of split-HTML files from current_output_filename,
+	not from toplevel_output_filename (the latter doesn't include the
+	manual's subdirectory part).
+
+	* makeinfo/html.c (nodename_to_filename_1): Use FILENAME_CMPN
+	instead of strncmp.  Support *.inf files in references.
+
+2001-12-11  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* djgpp/config.bat, djgpp/config.sed, djgpp/config.site: Update
+	for Texinfo 4.0d.
+
+	* makeinfo/makeinfo.c (insert_toplevel_subdirectory): Use IS_SLASH
+	instead of literal `/'.
+	(convert_from_loaded_file): Flush the output stream before
+	creating the TOC.
+
+
+2002-01-14    <karl@gnu.org>
+
+	* info/info.c: translate --speech-friendly (from Eli).
+	* makeinfo/index.c: formatting.
+
+	2001-12-24  Eli Zaretskii  <eliz@is.elta.co.il>
+	* info/infomap.c (initialize_info_keymaps): Bind the user-defined
+	keys on top of the default ones, not the other way around.
+
+2002-01-11    <karl@gnu.org>
+
+	* info/info.c: can't do #ifdef inside of printf any more.
+	From: Tyler <tyler@zerodivide.cx>
+
+	* configure.ac (ALL_LINGUAS): add he, from Eli.
+
+2002-01-09  Eli Zaretskii <eliz@is.elta.co.il>
+
+	* info/window.c (calculate_line_starts): Cast node->contents[i] to
+ 	unsigned char.
+
+2002-01-04    <karl@gnu.org>
+
+	* doc/texinfo.tex (\footnotezzz): \noindent=\relax.
+
+2002-01-03    <karl@gnu.org>
+
+	* doc/texinfo.tex (\imagexxx): handle pdf and dvi cases the same.
+        (\dopdfimage): need \immediate to avoid seg fault when including the
+	same image twice.
+	Bug reports from Alexandre Duret-Lutz <duret_g@lrde.epita.fr>.
+
+2001-12-31    <karl@gnu.org>
+
+	* makeinfo/makeinfo.c (cm_image): check *ext_arg as well as
+		ext_arg when computing length of fullname.
+
+	* makeinfo/defun.c: docbook changes.
+	* makeinfo/docbook.c (docbook_punctuation): remove deprecated
+		default: at end of statement.
+
+	* makeinfo/docbook.c: initial.
+	* makeinfo/docbook.h: initial.
+	* makeinfo/Makefile.am (makeinfo_SOURCES): add docbook.[ch].
+	* makeinfo/makeinfo.c (add_char): use &nbsp; in docbook case.
+
+	* doc/texinfo.tex (\footnotezzz): use \everypar={\hang} instead of
+	just \hang in case a footnote extends for multiple paragraphs.
+
+2001-12-18    <karl@gnu.org>
+
+	* info/Makefile.am (BUILT_SOURCES): include $(EXEEXT) on makedoc
+	dependency since automake doesn't do it.
+
+	2001-12-11  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* djgpp/config.bat, djgpp/config.sed, djgpp/config.site: Update
+	for Texinfo 4.0d.
+
+	* info/infomap.c (fetch_user_maps): Initialize `filename' to NULL
+	and don't try to call `open' if `filename' is NULL.
+	[__MSDOS__]: Try the current directory if neither $INFOKEY nor
+	$HOME are defined.
+
+	* makeinfo/makeinfo.c (insert_toplevel_subdirectory): Use IS_SLASH
+	instead of literal `/'.
+	(convert_from_loaded_file): Flush the output stream before
+	creating the TOC.
+
+	2001-12-10  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* info/infokey.c (main): Use FOPEN_WBIN instead of "w".
+
+	* info/infokey.h (INFOKEY_SRCFILE, INFOKEY_FILE) [__MSDOS__]:
+	Special definitions for MS-DOS.
+
+	2001-12-09  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* lib/system.h: Condition inclusion of libintl.h on ENABLE_NLS.
+	(gettext, bindtextdomain, textdomain) [!ENABLE_NLS]: Provide
+	trivial definitions for when NLS is not used.
+	(LC_MESSAGES) [!ENABLE_NLS]: Define if undefined by locale.h.
+
+2001-12-18  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* info/infomap.c (decode_keys): Change the return type to int;
+	callers changed.  Return zero if some of the special keys in SRC
+	are not defined by the terminal; return non-zero otherwise.
+	(section_to_keymaps): If decode_keys returns zero, don't bind the
+	key sequence.
+
+2001-12-18  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/xml.c (xml_insert_element_with_attribute)
+	(xml_insert_element): Rename the argument `element' to `elt'.
+
+	* info/infokey.c (compile): Use \033 instead of (non-standard) \e.
+
+2001-12-17    <karl@gnu.org>
+
+	2001-12-16  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* info/pcterm.c (pc_initialize_terminal) [INFOKEY]: Store term_kh,
+	term_ke, term_ki, and term_kx sequences.
+	(DJGPP_keytab): Map Home, End, and Insert to escape sequences, not
+	to C-a, C-e, etc.
+
+	* info/infomap.c (default_emacs_like_info_keys)
+	(default_emacs_like_ea_keys, default_vi_like_info_keys)
+	(default_vi_like_ea_keys): Add the leading suppress-default flag,
+	to be consistent with the table which comes from a file.
+
+	* info/session.c (info_do_lowercase_version): Add a doc string.
+
+	* info/infodoc.c (describe_key) [INFOKEY]: If keystroke is bound
+	to do-lowercase-version, but its lower-case variant is undefined,
+	say that keystroke is also undefined.
+
+
+2001-12-12    <karl@gnu.org>
+
+	* makeinfo/files.c (find_and_load): remove conditionals on
+		 VMS|O_BINARY, always just read as many bytes as we can.
+
+        2001-12-11  Eli Zaretskii  <eliz@is.elta.co.il>
+        * new files for djgpp/.
+
+        2001-09-09  Eli Zaretskii  <eliz@is.elta.co.il>
+	* info/echo-area.c (build_completions): Look for a candidate
+	completion which matches user's request including the letter-case,
+	use that as the value of LCD_completion.
+
+        2001-12-06  Eli Zaretskii  <eliz@is.elta.co.il>
+	* info/echo-area.c (build_completions): When looking for the best
+	completion candidate, only compare as much characters as the user
+	typed.
+
+
+2001-12-04    <karl@gnu.org>
+
+	* doc/texinfo.tex (\pdfmkpgn): remove trailing @ in link names
+		again.  Also from Kurt.
+
+	* doc/texinfo.tex (\image): need five commas to ignore additional
+	optional args to @image.  From Kurt.Hornik@ci.tuwien.ac.at.
+
+	* doc/texinfo.tex (\afourlatex): reset \globaldefs=0 explicitly.
+	From Trond Endrestøl <trond@ramstind.gtf.ol.no>.
+
+2001-12-01    <karl@gnu.org>
+
+	* makeinfo/files.c (find_and_load): remove O_BINARY from open
+	call, this messes up under Windows.  From eli.
+
+2001-11-20    <karl@gnu.org>
+
+	* makeinfo/makeinfo.c (cm_image): reword error messages.
+
+2001-11-19    <karl@gnu.org>
+
+	* Pretest 4.0d.
+	* doc/texinfo.txi: index ragged right/left.
+
+	* info/window.c (build_message_buffer): handle %1$s as used in
+	ja.po.  From Fumitoshi UKAI <ukai@debian.or.jp>.
+
+	* configure.ac (ALL_LINGUAS): add sv.
+
+2001-11-16    <karl@gnu.org>
+
+	* Makefile.am (EXTRA_DIST): add COPYING.DOC.
+
+        1999-10-30  Andrew Bettison  <andrewb@zip.com.au>
+
+	All these changes are to implement user-configurable key mapping
+	using the new 'infokey' program.  For the time being, the new
+	code is conditional on [INFOKEY] and the old code is still there
+	in case we want to revert.
+
+	* info/session.c (incremental_search): test for printable chars
+	_before_ isearch command keys -- makes a difference if the
+	isearch commands are bound to printable chars.
+
+	* info/doc.h,
+	* info/infodoc.c,
+	* info/infomap.c,
+	* info/m-x.c,
+	* info/session.c: New typedef InfoCommand, plus a bunch of
+	supporting macros, to abstract a "command" away from being a
+	function pointer.
+
+	* info/doc.h (pretty_keyseq),
+	* info/infodoc.c (pretty_keyseq),
+	* info/session.c (pretty_keyseq): Moved definition from
+	session.c into infodoc.c, and rewrote to recognise special
+	terminal sequences (PgUp, PgDn, etc.).
+
+	* info/infodoc.c (create_internal_info_help_node,
+	replace_in_documentation, info_where_is),
+	* info/m-x.c (info_execute_command): Cleaned up references to
+	hardwired keystrokes.
+
+	* info/infodoc.c (replace_in_documentation):
+	Extended the \\[foo] syntax to recognise \\%-X.Y[foo], which
+	causes the replacement text to be inserted using sprintf("%-X.Ys").
+
+	* info/session.c (_scroll_forward, _scroll_backward,
+	scroll_forward_page_only, scroll_backward_page_only,
+	scroll_forward_page_only_set_window,
+	scroll_backward_page_only_set_window): New functions, eliminating
+	need for SPC and DEL hack.
+
+	* info/session.c (scroll_forward, scroll_backward,
+	scroll_forward_set_window, scroll_backward_set_window): Call
+	_scroll_forward and _scroll_backward to do all the work.
+
+	* info/infomap.c (initialize_info_keymaps)[!INFOKEY]: set 'v'
+	and Control('v') key bindings to info_scroll_backward_page_only
+	and info_scroll_forward_page_only respectively.
+
+	* info/Makefile.am (bin_PROGRAMS): Added new executable `infokey'.
+	(infokey_SOURCES): Defined.
+	(EXTRA_DIST): Added `sample_infokey'.
+	(BUILT_SOURCES): Added `key.c'.
+
+	* info/infokey.h,
+	* info/infokey.c: Created, for new program `infokey' which
+	creates a $HOME/.info file by compiling a text source file with
+	syntax very similar to that used by `lesskey' in less 3.4.0.
+
+	* info/makedoc.c: Generate new file `key.c' defining an array to
+	map command names to codes.
+
+	* info/key.h: Created, to define contents of new `key.c' now
+	created by makedoc.
+
+	* info/info.h (INFOKEY): Define, to enable all following changes.
+	(set_variable_to_value)[INFOKEY]: Declare new function.
+
+	* info/makedoc.c [INFOKEY]: Write '#define A_' numeric command
+	code definitions into `funs.h' to support new key binding system.
+
+	* info/session.c (info_dispatch_on_key, info_numeric_arg_digit_loop)
+	[INFOKEY],
+	* info/infomap.c [INFOKEY],
+	* info/infodoc.c (function_documentation, function_name,
+	describe_key, pretty_keyname, pretty_keyseq_internal,
+	where_is_internal)[INFOKEY],
+	* info/terminal.h (term_kh, term_ke, term_kx, term_ki)[INFOKEY],
+	* info/terminal.c (term_kh, term_ke, term_kx, term_ki,
+	terminal_initialize_terminal)[INFOKEY],
+	* info/variables.c (set_variable_to_value)[INFOKEY],
+	* info/sample_infokey: Added infokey functionality, copied more
+	or less wholesale from 'lesskey' in GNU Less 3.4.0.  Added a new
+	typedef struct FUNCTION_KEYSEQ, and a new element `keys' to
+	typedef struct FUNCTION_DOC, to give the user some control over
+	the keystrokes that appear in the documentation node generated
+	by get-help-window, and to improve efficiency a little.
+
+	* info/infodoc.c (info_internal_help_text,
+	create_internal_info_help_node)[INFOKEY]: Rewrote all code that
+	assumes fixed keystrokes, replacing %10s sequences with \\%10[foo]
+	sequences instead.
+
+	* doc/info-stnd.texi: Documented above changes.
+
+2001-09-19    <karl@gnu.org>
+
+	* makeinfo/cmds.c: </ not /<, duh :).  From janneke.
+
+2001-09-12    <karl@gnu.org>
+
+	* configure.ac (AC_SYS_POSIX_TERMIOS, AC_HEADER_TIOCGWINSZ): use
+	 these new autoconf macros instead of the old automake ones.
+
+	* info/terminal.c: remove unconditional include of sys/ioctl.h.
+	* info/termdep.h: <sys/ioctl.h> [GWINSZ_IN_SYS_IOCTL]: include outside of HAVE_TERMIOS_H,
+	per autoconf manual.
+
+	* doc/Makefile.am (install-info-am): remove override of automake's
+	 target, instead enable looking in . for info files within automake.
+
+	* doc/info-stnd.texi: include separate version-stnd.texi
+	* configure.ac: autoconf 2.52, and rename to configure.ac.
+
+2001-09-11    <karl@gnu.org>
+
+	* doc/texinfo.txi: recommend against using - and _ in @set names,
+		* and rearrange that section.
+
+	* info/infodoc.c (replace_in_documentation): free fun_name to fix
+		memory leak.
+	From: "Art Haas" <ahaas@neosoft.com>, Sat, 4 Aug 2001 08:34:31 -0500.
+
+	* makeinfo/lang.c: encoding support for info output from kama.
+	* makeinfo/lang.h: encoding support for info output from kama.
+
+	* makeinfo/html.c: include document encoding code unless
+	no_encoding.
+	* makeinfo/insertion.c (cm_direntry): don't call begin_insertion
+	if ignoring.
+	(cm_documentdescription): moved here, and likewise.
+	(begin_insertion): don't need output format conditionals here.
+
+	* makeinfo/cmds.c (cm_documentdescription): move to insertion.c.
+	* makeinfo/makeinfo.h (enable_encoding): new global.
+	* makeinfo/makeinfo.c: new option --enable-encoding, rearrange help.
+
+	Sun Oct 31 18:44:24 UTC 1999 Karl Heinz Marbaise <kama@hippo.fido.de>
+
+	    - lang.{c,h}:
+	      o added translation map between HTML markups and 8-Bit
+		(ISO-8859-1 codes; supplemental is Unicode for the future).
+	      o added cm_search_iso_map:
+		search for characters based on HTML markup names for
+		translation 8-Bit code.
+	      o recognizing of @documentencoding improved.
+		now we can recognize things like ISO-8859-{1...15}
+
+	    - makeinfo.{c,h}:
+	      o added two command line switches.
+		+ info-encoding to activate the encoding for info output
+		  which is correctly shown by info. Default is NOT to
+		  encode the output to be compatible with earlier versions.
+		+ no-encoding to suppress encoding e.g. while producing
+		  ASCII output (--no-headers) results in that you get
+		  "A for &Auml; as before.
+	      o help output changed to document the switches.
+
+	    - html.c:
+	      charset encoding in html based on @documentencoding.
+
+
+2001-07-31    <karl@gnu.org>
+
+	* doc/texinfo.txi: mention pdfcolor.tex.
+	* doc/texinfo.tex: doc.
+	* doc/Makefile.am (install-tex): install pdfcolor.tex too.
+	* doc/pdfcolor.tex: new file, since Kurt.Hornik@ci.tuwien.ac.at
+		reports that not all pdftex installations include it.
+
+2001-07-25    <karl@gnu.org>
+
+	* doc/texinfo.tex (\Etitlepage): need \HEADINGSon before the
+	\...aftertitlepage checks to get page numbers. Report from
+	3diff@gnu.org.
+
+2001-07-06    <karl@gnu.org>
+
+	* doc/texinfo.txi: mention http://docbook2X.sourceforge.net/.
+
+2001-06-29    <karl@gnu.org>
+
+	* makeinfo/makeinfo.c: make output to stdout imply --no-split for
+		HTML, too.
+
+	* makeinfo/html.c (html_output_head): use documentdescription if set.
+	* makeinfo/insertion.h (insertion_type): new case documentdescription.
+	* makeinfo/insertion.c (begin_insertion, end_insertion,
+	insertion_type_names): new case for documentdescription.
+	* makeinfo/cmds.c (cm_documentdescription): new fn.
+	* makeinfo/makeinfo.h (document_description): new global.
+	* doc/texinfo.txi: @documentdescription.
+	@documentdescription implementation from patches by Will Estes.
+
+2001-06-26    <karl@gnu.org>
+
+	* doc/texinfo.txi: documentdescription
+	* doc/texinfo.tex: Ignore @documentdescription ... @end
+	documentdescription.
+
+	* doc/texinfo.txi: document sequential punctuation in @footnote is
+	normal, suggested by rms.
+
+2001-06-21    <karl@gnu.org>
+
+	* doc/texinfo.tex (\textfonts): call \setleading here, so that we can
+	switch font sizes back and forth inside @tex with \globaldefs=1
+	and not lose the leading.
+
+	* doc/texinfo.txi: allow @smallbook to run without overfull or
+		underfull boxes.
+
+2001-06-19    <karl@gnu.org>
+
+	* doc/texinfo.tex (\imagexxx): ignore new optional args to @image.
+
+	* makeinfo/html.c (html_output_head): include <h1>title</h1> at
+	beginning of document.
+	* makeinfo/sectioning.c (cm_top): don't include explicit links in
+	HTML output, the regular code for @node will do it.
+	(sectioning_html): use <h2> for chapter instead of <h1>, etc.
+	* makeinfo/node.c (cm_node): do not include code to output the
+	HTML <head>, we do that elsewhere now.
+
+	1999-11-26 W. L. Estes <will@fumblers.org>
+	* makeinfo/insertion.c (begin_insertion): add an explicit <br>
+	before beginning a <pre> block. for flushleft and flushright, use
+	<div> tag with an align attribute set.
+	* makeinfo/insertion.c (end_insertion): for flushleft and
+	flushright, end the </div> block.
+
+	* makeinfo/makeinfo.c (cm_image): new variable, alt_arg now allows
+	user-supplied alt attribute value and
+	ext_arg allows user-supplied extension for image files.
+
+	* makeinfo/toc.c (contents_update_html): add anchors at chapter
+	level entries
+	(shortcontents_update_html): hrefs in shortcontents point to the
+	above anchors in the detailed contents
+
+	* doc/texinfo.txi: document changes to @image and the new behavior
+	of shortcontents entries
+
+2001-06-14    <karl@gnu.org>
+
+	* makeinfo/node.c: no need for size_t.
+
+2001-06-13    <karl@gnu.org>
+
+	* texinfo.tex (\pdfmkdest): \normalturnoffactive, so refs and
+	defs match.
+	(\xrefX): pdf link defs no longer use @, so link refs shouldn't use @
+	either. (All xrefs in pdf were failing.)
+	(\mkpgn): remove redundant second definition.
+
+	* texinfo.tex (\smallerfonts): new font size.
+	(\smallexample, et al.): use it, in all cases, not just @smallbook.
+
+	1999-11-30 Andreas Schwab <schwab@suse.de>
+	* doc/texinfo.tex (\xrefX): Turn off active characters when writing
+	out the link name for pdf.
+
+2001-06-13    <karl@gnu.org>
+
+	* doc/texinfo.txi: document that @smallexample is smaller in all
+		page formats now.
+
+2001-06-11    <karl@gnu.org>
+
+	* 4.0c.
+	* util/Makefile.am: Don't need automake patch any more, with
+		automake 1.4p4.
+
+	* configure.in (AC_FUNC_SETVBUF_REVERSED): only needed on
+	pre-sysvr3 systems that nobody has anymore?  Or so Russ Allbery
+	informs me ...
+
+2001-06-08    <karl@gnu.org>
+
+	* makeinfo/Makefile.am (EXTRA_DIST): include texinfo.{dtd,xsl}.
+
+	* util/Makefile.am: automake-1.4p3 now.
+
+2001-06-07    <karl@gnu.org>
+
+	* util/texi2dvi: comment out conditional text, from Werner LEMBERG
+	       <wl@gnu.org>.
+
+       2001-06-02  Eli Zaretskii  <eliz@is.elta.co.il>
+	* info/echo-area.c (info_read_completing_internal): If there are
+	no completions, say that instead of "Not complete".
+
+	* configure.in (ALL_LINGUAS): add da
+
+	* makeinfo/Makefile.am (pkgdata_DATA): include texinfo.xsl.
+
+	* configure.in: update for autoconf 2.50.
+
+2001-06-04    <karl@gnu.org>
+
+	* util/Makefile.am (EXTRA_DIST): automake-14p2.patch now.
+	* util/automake-14p2.patch: rename from 14p1.
+
+2001-05-22    <karl@gnu.org>
+
+	* changes from feloy for lowercase xml names, etc.
+
+2001-05-21    <karl@gnu.org>
+
+	* util/Makefile.am (EXTRA_DIST): add automake-14p1.patch.
+	* makeinfo/Makefile.am (pkgdata_DATA): define to install
+	        texinfo.dtd.
+
+        2001-05-17  Eli Zaretskii  <eliz@is.elta.co.il>
+	* makeinfo/makeinfo.c (cm_xref, cm_inforef): Don't allow empty
+	first arguments in cross references.
+
+	* makeinfo/makeinfo.c: redo --help, basic patch from ke@suse.de.
+
+2001-05-03    <karl@gnu.org>
+
+	* doc/info.texi: move help-cross to be subnode of cross-refs,
+	instead dangling out in space.
+	* doc/info.texi: update from eli
+
+2001-05-02    <karl@gnu.org>
+
+	* makeinfo/xml.c (xml_push_current_element): need to select the
+		`name' member.
+
+2001-05-01    <karl@gnu.org>
+
+	* configure.in: 4.0b
+
+	* doc/info.texi (Help-Cross): subsection of Cross-refs.
+
+	* lib/system.h (va_alist, etc.): moved from makeinfo.c.
+	* makeinfo/makeinfo.c (va_alist, etc.): move to system.h
+
+	* makeinfo/xml.[ch]: new files from Philippe Martin <feloy@free.fr>.
+	* pretty much all files also modified for XML/DocBook output.
+	* doc/texinfo.txi: minimally mention --xml and --docbook.
+	* makeinfo/xml.c: convert to K&R until we can do ansi2knr.
+
+	* util/texindex.c,
+	* util/install-info.c,
+	* info/info.c: it's 2001.
+
+2001-04-15    <karl@gnu.org>
+
+	* doc/info.texi: major update from eli.
+
+2001-04-13    <karl@gnu.org>
+
+        1999-10-16  Eli Zaretskii  <eliz@is.elta.co.il>
+	* makeinfo/node.c (cm_node): Don't generate cross-references to
+	"(DIR)".
+	* makeinfo/html.c (add_link): Likewise.
+
+        1999-10-16  Eli Zaretskii  <eliz@is.elta.co.il>
+	* makeinfo/makeinfo.c (insert): Don't call html_output_head here.
+	(add_char): Call html_output_head here...
+	* makeinfo/cmds.c (cm_sp): ...and here...
+	* makeinfo/toc.c (cm_contents, cm_shortcontents): ...and here...
+	* makeinfo/node.c (cm_anchor): ...and here.
+
+	* makeinfo/html.c (html_output_head): `free' html_title if
+	expanded.  Make <head> and <body> stand out.
+
+2001-04-12    <karl@gnu.org>
+
+	1999-12-26  Eli Zaretskii  <eliz@is.elta.co.il>
+	* makeinfo/defun.c (defun_internal): Use execute_string instead
+	add_word_args to expand defined_name, type_name and category (in
+	HTML mode).
+
+2001-03-29    <karl@gnu.org>
+
+	* Makefile.am: simple license.
+
+2001-02-27    <karl@gnu.org>
+
+	1999-12-17  Yoshiki Hayashi  <t90553@mail.ecc.u-tokyo.ac.jp>
+		* info/terminal.h, info/terminal.c (term_kh, term_ke, term_kD):
+		New variables to hold Home, End, Delete key sequences.
+		* info/infomap.c (initialize_emacs_like_keymaps,
+		initialize_vi_like_keymaps): Set them.
+
+	* makeinfo/makeinfo.h,
+	* makeinfo/makeinfo.c: --split-size option from Yoshiki:
+	1999-12-09  Yoshiki Hayashi  <t90553@mail.ecc.u-tokyo.ac.jp>
+		* makeinfo/makeinfo.h (split_size): New option.
+		* makeinfo/makeinfo.c (long_options): Add split_size.
+		(usage): Ditto.	Suggested by Richard Y. Kim.
+
+	* util/texi2dvi: -o support from Akim.
+
+2001-02-02    <karl@gnu.org>
+
+	* dir-example: don't need zsh twice.
+
+	From: Nishio Futoshi <fut_nis@d3.dion.ne.jp>, 02 Apr 2000.
+	* doc/texinfo.txi: capitalization fixes.
+	* doc/info.texi: up pointer fixes.
+	* doc/texinfo.txi: installing an info file.
+
+	* makeinfo/makeinfo.c: --output is for split html, not non-split.
+	From: Karl Eichwalder <keichwa@gmx.net>
+
+2001-01-12    <karl@gnu.org>
+
+	1999-10-15  Eli Zaretskii  <eliz@is.elta.co.il>
+		* makeinfo/cmds.c (cm_sc): Don't print the warning about
+		all-uppercase argument in menus under --no-headers.
+
+	* makeinfo/files.c: pass O_BINARY flag to open, suggested by bfox.
+
+2001-01-11    <karl@gnu.org>
+
+	* info/terminal.c [HAVE_TERMIOS_H && TCOON]: tcflow TCOOFF/TCCON
+	to resume output if user presses CTRL-S at the beginning of
+	things.
+	[HAVE_TERMIO_H && TCXONC]: ditto.
+	From Kevin Ryde <user42@zip.com.au>, 16jun2000;
+	cf. emacs/src/sysdep.c.
+
+2001-01-08    <karl@gnu.org>
+
+	* makeinfo/cmds.c: afivepaper, afourwide, afourlatex.
+	* doc/texinfo.txi: afivepaper
+
+2001-01-05    <karl@gnu.org>
+
+	* doc/info.texi: typo from: Martin Buchholz <martin@xemacs.org>.
+	* doc/info.texi: typo fixes from meyering.
+
+2001-01-02    <karl@gnu.org>
+
+	* makeinfo/makeinfo.c (remember_brace_1): don't assume command is
+	 non-null, an (erroneous) input line like \hbox to7in{ passes in a
+	 null.
+
+	* makeinfo/toc.c: fix from jan
+	* makeinfo/html.c: fix from jan for top-level references.
+
+2000-12-22    <karl@gnu.org>
+
+	* makeinfo/makeinfo.c: --help changes.
+	* doc/texinfo.txi: -o means the directory name for HTML output.
+
+2000-12-21    <karl@gnu.org>
+
+	* doc/texinfo.txi: switch to fdl
+
+	* makeinfo/html.c: doc fix.
+	* makeinfo/insertion.c: no space after _ I guess.
+	* makeinfo/cmds.c: no space after _ I guess.
+
+	* makeinfo/html.c (nodename_to_filename_1): fix up external
+	* top-node references.
+
+2000-12-20    <karl@gnu.org>
+
+* HTML table patch from Jan:
+    2000-12-19  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	    * makeinfo/multi.c (multitable_item),
+	    (cm_tab): close html table columns.  Also, align cell contents to
+	    top, which is probably the most sensible thing to do for text.
+
+
+2000-12-19    <karl@gnu.org>
+
+	* makeinfo/makeinfo.c (insert_toplevel_subdirectory): try
+		name.html if just name doesn't work.
+
+	* doc/texinfo.txi: document html output in .html directory
+		sometimes.
+
+	* util/Makefile.am (EXTRA_DIST): add install-info-html.
+
+	* util/texindex.c: 2000
+	* util/install-info.c: 2000
+	* info/info.c: 2000
+	* configure.in: 4.0a
+
+	* lib/system.h: include limits.h
+
+	* Applied HTML splitting changes from Jan:
+    2000-11-10  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	    * makeinfo: removed code for numbered split HTML output, removed
+	    SPLIT_JCN conditional.
+
+    2000-11-09  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	    * makeinfo/html.c: prepared nodifying filename functions for
+	    linking not non-spit HTML documents, by adding ``#anchor'' to
+	    external refernces.
+
+	    * doc/texinfo.txi (Installing HTML info): updated doco for --html
+	    option, added node Installing HTML info.
+
+	    * util/install-info-html.in: new script.  The bare minimum
+	    required for generating HTML index.
+
+	    * lib/system.h:	compilation fix.
+
+    2000-11-08  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	    * makeinfo/makeinfo.c (convert_from_loaded_file): [SPLIT_JCN]:
+	    overloaded already way too hairy function with logic to put split
+	    html output into subdirectory with basename of toplevel output
+	    file.
+
+	    * makeinfo/html.c (fix_filename): new function.
+
+    2000-11-07  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	    * toc.c (toc_add_entry):
+	    (contents_update_html):
+	    (shortcontents_update_html): [SPLIT_JCN]: use hrefs for nodename based
+	    html files.
+
+	    * node.c (cm_node): [SPLIT_JCN]: create html filename based on
+	    nodename (instead of a numbered node<num>.html filename).
+
+	    * makeinfo/makeinfo.c (main): [SPLIT_JCN]: enable splitting of
+	    html output.
+
+	    * makeinfo/html.c
+	    (add_url_name,add_nodename_to_filename,nodename_to_filename): new
+	    functions.
+
+2000-12-15    <karl@gnu.org>
+
+	* configure.in (AC_CHECK_HEADERS): add limits.h explicitly.
+
+2000-11-10    <karl@gnu.org>
+
+	* dir-example: update
+	* info/nodes.c: doc fixes, etc.
+
+	* incorporated verbatim patch from janneke:
+    2000-04-14    <janneke@gnu.org>
+
+	    * applied texinfo-3.12s.jcn4 patch
+
+    1999-09-02    <janneke@gnu.org>
+
+	    * makeinfo/cmds.c,
+	    * makeinfo/insertion.c: @verbatiminclude file
+	    * doc/texinfo.tex: @verbatiminclude file
+	    * doc/texinfo.txi: @vebatiminclude file doco
+	    * NEWS: added @verbatiminclude to Language section
+
+    1999-09-01    <janneke@gnu.org>
+
+	    * makeinfo/makeinfo.c: bf: @exdent (urg6.texi) -- Rolled into 4.0
+	    * NEWS: added verb* to Language section
+	    * doc/texinfo.txi: @verb, @verbatim doco
+	    * doc/texinfo.tex: tricky tex-fix for @verb{<char>..<char>}
+	    * doc/texinfo.tex: real tab expansion for @verbatim mode
+	    * doc/texinfo.tex: proper start of environment, no indentation
+
+    1999-08-31    <janneke@gnu.org>
+
+	    * makeinfo/cmds.c:
+	    * makeinfo/insertion.{c,h},
+	    * makeinfo/makeinfo.{c,h}: redo of @verbatim, @verb{<char>..<char>}
+	    * doc/texinfo.tex: fixed @verb{<char>..<char>}
+
+    1999-08-30  Jan Nieuwenhuizen <janneke@gnu.org>
+
+	    * makeinfo/cmds.c,
+	    * makeinfo/insertion.{c,h},
+	    * makeinfo/makeinfo.{c,h}: added @verbatim (and preliminary @verb)
+	    support
+	    * doc/texinfo.tex: added @verbatim (and preliminary @verb) support
+
+    1999-08-24  Jan Nieuwenhuizen <janneke@gnu.org>
+
+	    * bf: empty node: makeinfo/node.c:cm_node () -- Rolled into 4.0
+
+
+2000-10-18    <karl@gnu.org>
+
+	* doc/info.texi: eli update
+
+2000-09-22    <karl@gnu.org>
+
+	* makeinfo/defun.c: warn if non-whitespace follows @defun'd name
+	  (suggestion from Akim).
+
+  Installed some patches:
+
+  2000-08-04  Paul Eggert  <eggert@twinsun.com>
+	  * makeinfo/multi.c (find_template_width):
+	  Don't access before start of *PARAMS.
+
+  2000-08-21  Eli Zaretskii  <eliz@is.elta.co.il>
+	  * info/filesys.c (info_file_in_path): Reject FILENAME if it is
+	  empty, or ".", or "..".
+
+  2000-08-23  Eli Zaretskii  <eliz@is.elta.co.il>
+	  * info/session.c (info_menu_or_ref_item): If the user have chosen
+	  menu item or xref that's identical to defentry's label, use
+	  defentry instead of looking for its label.  Otherwise, select the
+	  entry whose position is the closest to the window's point, in
+	  case there's more than a single entry with that label.
+
+2000-09-12    <karl@gnu.org>
+
+	* doc/texinfo.txi: it's 2000 now.
+	* doc/texinfo.txi: document the only real (and rare) reason for not using implicit pointer
+	creation.
+
+2000-09-06    <karl@gnu.org>
+
+	* configure.in: test all termcap variables for existence.  From
+	andy@rz.uni-karlsruhe.de.
+
+	* configure.in (ALL_LINGUAS): include ja.
+	* lib/system.h [HAVE_IO_H]: make #include <io.h> conditional for
+	BeOS.  Reported by Dan Moore, dan@moore.cx.
+	* configure.in (AC_CHECK_HEADERS): add io.h.
+
+2000-06-05    <karl@gnu.org>
+
+	* doc/texinfo.txi: forgot to escape {}.
+
+2000-05-30    <karl@gnu.org>
+
+	* info/filesys.c (is_dir_name): check all info suffixes as well as
+	the compression suffixes.  Fixes segmentation fault on a dir.info
+	file ending after the * Menu.
+
+2000-05-28    <karl@gnu.org>
+
+	* doc/texinfo.txi: Forgot {arg} in @rmacro example.  From Olaf B.
+
+2000-05-27    <karl@gnu.org>
+
+	* doc/txi-cs.tex: update from: Stepan Kasal <kasal@suse.cz>.
+
+	* doc/Makefile.am (install-data-local): reformat warning per
+	François to hopefully make it more noticeable.
+
+	2000-02-08  Eli Zaretskii  <eliz@is.elta.co.il>
+		* info/session.c (incremental_search): Don't retain RET when
+		exiting isearch.  Suggested by Hrvoje Niksic <hniksic@iskon.hr>.
+
+2000-05-22    <karl@gnu.org>
+
+	* doc/texinfo.txi: pageparams -> pagesizes
+
+2000-05-18    <karl@gnu.org>
+
+	* makeinfo/lang.c (cm_accent_tilde): need N in list.
+	From: kama@hippo.fido.de (Karl Heinz Marbaise)
+
+	* makeinfo/files.c (find_and_load): read only the number of bytes
+	available in the buffer.  Also, remove one-byte-at-a-time reading
+	in the WIN32 case.
+	From: "J. David Bryan" <dbryan@bcpl.net>
+
+	* info/man.c: use eli's patch after all, we re-increment j at the
+	top of the loop.
+
+2000-05-16    <karl@gnu.org>
+
+	* info/man.c (clean_manpage): don't write before the beginning of
+	newpage.
+	(based on patch from Eli).
+
+2000-02-03    <karl@gnu.org>
+
+	* doc/texinfo.txi: remove spurious space. from kaja.
+
+1999-10-12  Karl Berry  <karl@gnu.org>
+
+	* doc/Makefile.am (install-tex): install all txi-?? files.
+
+1999-10-01  W. L. Estes  <will@fumblers.org>
+
+	* makeinfo/cmds.c: dont treat @center as separate paragraph,
+	use div element to output center
+
+1999-09-29  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* djgpp/README: Say `dir-example', not DIR.
+
+	* lib/system.h (DEFAULT_INFOPATH) [__DJGPP__]: Define.
+
+1999-09-28  Karl Berry  <karl@gnu.org>
+
+	* configure.in,
+	util/texi2dvi: version 4.0.
+	* doc/texinfo.txi: New isbn.
+
+1999-09-24  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi: Fixes from Oleg.
+
+1999-09-20  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/node.c: Don't write region at an anchor.
+	From: Thomas Esken <esken@nmlab.informatik.fh-dortmund.de>
+
+	* info/terminal.c: Only set dumb terminal if tgetent returns < 0,
+		not 0.
+	For HP-UP 11.
+	From jeff.hull@state.co.us.
+
+	* makeinfo/footnote.c: Don't translate the `Footnotes' string
+		according to LANG, it should be according to
+		@documentlanguage, which isn't implemented yet.
+	From: Jan Nieuwenhuizen <janneke@gnu.org>
+
+	* doc/texinfo.txi: @end direntry from kama.
+
+1999-09-19  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi: \ninett is now \smalltt.
+
+	* doc/texinfo.txi: arnold changes
+
+	1999-09-03  Akim Demaille  <akim@epita.fr>
+	* texi2dvi (getopt): batch has to be assigned `eval', not `echo'.
+	(bibtex): Launch BibTeX also when the LOG file complains that
+ 	there are no BBL file.
+
+	* doc/texinfo.txi: Document that @anchor ignores spaces.
+
+	* makeinfo/cmds.c (cm_shyph): remove, &shy; is not supported in
+		browsers.
+	From: Thomas Esken <esken@nmlab.informatik.fh-dortmund.de>
+
+	* makeinfo/makeinfo.c: Don't crash if current_indent = 0.
+	From: Jan Nieuwenhuizen <janneke@gnu.org>
+
+	* makeinfo/makeinfo.c: Avoid blank lines between @menu entries.
+	* configure.in: 3.12t
+
+	1999-08-31  Eli Zaretskii  <eliz@is.elta.co.il>
+	* info/info.c (info_short_help): Document --apropos.
+
+1999-09-18  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/html.c (html_output_head): use text for <title>, not
+		html markup.  From François.
+	* makeinfo/makeinfo.c (text_expansion): new routine.
+	* makeinfo/cmds.c (cm_settitle): don't expand the title here,
+		we'll do it later.
+
+	* makeinfo/makeinfo.h (text_expansion): declare.
+
+	* info/indices.c,
+	* info/infodoc.c,
+	* info/session.c,
+	* info/footnotes.c: translate errors.
+	* info/info.h: Use `' instead of "" in errors.
+
+1999-09-06  Karl Berry  <karl@gnu.org>
+
+	+1999-08-24  Jan Nieuwenhuizen <janneke@gnu.org>
+	* makeinfo/node.c:cm_node: don't compare current_node when null.
+
+	1999-08-23  W. L. Estes  <will@fumblers.org>
+	*  makeinfo/node.c (cm_node): write <a name=> tags even
+           ifusing --no-headers
+
+	* configure.in: ospeedlib -> trylib
+	From: Andreas Schwab <schwab@suse.de>
+
+	* makeinfo/makeinfo.c (read_command): add explicit 0 to return if
+	enclosure command.  From: Andreas Jaeger <aj@arthur.rhein-neckar.de>.
+
+1999-08-19  Karl Berry  <karl@gnu.org>
+
+	* configure.in: add missing quotes, logic in new termcap library
+	check.
+
+1999-08-17  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/multi.c,
+	* makeinfo/sectioning.c,
+	* makeinfo/node.c,
+	* makeinfo/macro.c: omit unused vars
+	* info/session.c (info_goto_invocation_node): omit unused decl.
+
+	* configure.in: Check for extra termlib variable necessary on
+		HP-UX 9.
+	From: Olaf Bachmann <obachman@mathematik.uni-kl.de>
+
+  1999-08-16  Andreas Schwab  <schwab@suse.de>
+	  * info/terminal.c (terminal_initialize_terminal): Try tcgetattr
+	  and cfgetospeed in preference to TIOCGETP.
+	  (original_tchars, original_ltchars): Define them only if needed.
+
+1999-08-16  Karl Berry  <karl@gnu.org>
+
+	* info/infodoc.c (create_internal_info_help_node): rename arg.
+	(info_find_or_create_help_window): avoid deref of null eligible.
+
+	* info/terminal.c (TIOCGETP, TIOCGETC, TIOCGLTC) [alpha && linux]:
+	#undef.  Useless stubs are present.
+
+1999-08-15  Karl Berry  <karl@gnu.org>
+
+	* info/nodes.c: Remove reference to nonexistent RFC for Info
+	files.
+
+1999-08-11  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* info/nodes.c (info_find_file_internal): If the file's contents
+	were gc'ed since last time it was loaded, reload the file.
+
+Wed Aug 11 06:42:47 1999  Karl Berry  <karl@gnu.org>
+
+	* doc/Makefile.am (EXTRA_DIST): add txi-pt.tex from Lalo.
+
+Mon Aug  9 16:28:18 1999  Karl Berry  <karl@gnu.org>
+
+	* util/texi2dvi: Support preloaded texinfo.tex, from Stephen.
+
+	* makeinfo/makeinfo.c (add_char): restore ugly check for first
+ 		character being <.
+
+	* makeinfo/cmds.c (cm_kbd): Increment in_fixed_width_font for
+ 		html.
+
+	* doc/texinfo.txi: effect not affect
+
+	* makeinfo/makeinfo.c: Rearrange help.
+
+	* makeinfo/toc.c: Cast %* arguments to (int) to placate gcc
+ 		-Wformat.
+
+Fri Aug  6 13:03:14 1999  Karl Berry  <karl@gnu.org>
+
+	* util/install-info.c: Hardwire the File: dir, Node: top part of
+		the skeleton dir file.
+	Report from: Stanislav Brabec <utx@k332.feld.cvut.cz>
+
+	* info/Makefile.am (BUILT_SOURCES): rm -f $(BUILT_SOURCES), a
+ 		kludge.
+
+    1999-07-28  Karl Eichwalder  <ke@gnu.franken.de>
+
+	    * makeinfo/makeinfo.c: Fix help string (-o).
+
+    1999-07-30  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	    * makeinfo/makeinfo.c (cm_uref, cm_email): Don't collapse -- and
+	    `` in the URL part of the reference.
+
+    1999-08-03  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	    * util/install-info.c (main): For entries given on command line,
+	    set entry_sections and entry_sections_tail members to NULL, and
+	    set text_len member to the entry length.  After processing the
+	    Info file, update the entry_sections pointers of all entries that
+	    came from the command line.
+
+	* util/texindex.c (sort_offline, sort_in_core): use off_t rather
+		than long.
+	Found on FreedBSD 2.2.8 by "Trond Endrestol" <endrestol@hotmail.com>.
+
+Mon Jul 19 17:16:46 1999  Karl Berry  <karl@gnu.org>
+
+	* configure.in: 3.12n
+
+	* makeinfo/makeinfo.c (add_char): Don't insert <p> if we're in
+ 		@html.
+
+	* makeinfo/html.c (add_escaped_anchor_name),
+	* makeinfo/toc.c (toc_add_entry): use URL_SAFE_CHAR.
+	* makeinfo/makeinfo.h (HTML_SAFE, URL_SAFE_CHAR): new macros.
+
+Sun Jul 18 14:47:40 1999  Karl Berry  <karl@gnu.org>
+
+	* dir-example: Add bzip2.
+
+	* configure.in: 3.12m.
+
+	* doc/texinfo.txi (@afourlatex,@afourwide): add to command list.
+
+1999-07-17  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/makeinfo.c (cm_xref): Don't collapse `` and -- while
+	expanding node names.  Generate a terminating period for
+	@pxref, when it has more than a single argument.
+
+	* makeinfo/index.c (cm_printindex): Don't collapse `` and -- while
+	expanding node names.
+
+Sat Jul 17 16:33:45 1999  Karl Berry  <karl@gnu.org>
+
+	* 3.12l.
+
+	* doc/texinfo.txi: @alias, @definfoenclose, etc.
+
+	* util/texindex.c (indexify): error message instead of abort(2)
+ 		when no page number.
+
+Fri Jul 16 18:00:26 1999  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi: Overfull boxes, help2man, etc.
+
+	* util/Makefile.am (EXTRA_DIST): texi-outline.gawk is really
+	outline.gawk, add fixref.gawk and prepinfo.awk and
+		texi-docstring-magic.el.
+
+Thu Jul 15 18:57:54 1999  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi: .fmt, etc.
+	* doc/texinfo.txi: More macro docs, etc.
+
+Wed Jul 14 19:58:47 1999  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi: Give good quote.
+
+	* util/Makefile.am (EXTRA_DIST): add texi-outline.gawk.
+
+	From: kama@hippo.fido.de (Karl Heinz Marbaise)
+	* makeinfo/toc.c (contents_update_html): go back to start level.
+	* doc/texinfo.txi: deftypeop
+
+	From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>
+	* makeinfo/toc.c (toc_add_entry): don't assume sprintf return type
+ 		is int.
+	* makeinfo/sectioning.c (insert_and_underscore): declare more
+ 		unsigned char *.
+	* makeinfo/macro.h (itext_info, itext_size): remove declarations,
+		they're defined static.
+	* makeinfo/makeinfo.c: Split up help string even more.
+
+Tue Jul 13 17:16:18 1999  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi: Document @rmacro.
+	* makeinfo/macro.c (cm_rmacro): new command to do @allow-recursion
+ 		by default.
+ 	(define_macro): split off from cm_macro.
+
+	* makeinfo/macro.h (cm_rmacro): declare.
+	* makeinfo/macro.h (delete_macro): do not need to export.
+	* makeinfo/cmds.c (rmacro): new command.
+
+	* makeinfo/html.c,
+	* makeinfo/toc.c,
+	* makeinfo/lang.c,
+	* makeinfo/makeinfo.c: Use strchr instead of member.
+
+Mon Jul 12 08:01:19 1999  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi: document this.
+	* makeinfo/macro.c (apply): warn if \ in macro body is not
+		followed by a parameter name or \, instead of silently
+		accepting it, for compatibility with TeX.
+
+	* makeinfo/macro.c: Doc fix.
+
+Sun Jul 11 12:49:50 1999  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/macro.c (cm_macro): do @quote-arg implicitly if single
+ 		argument to macro.
+	* doc/texinfo.txi: Document this.
+
+	* doc/texinfo.txi (Smallcaps): Document makeinfo warning if arg is
+ 		all uppercase.
+	* makeinfo/cmds.c (cm_sc): warn if arg is all upper (suggested by
+ 		Jim Meyering).
+
+	* makeinfo/cmds.c (cm_var): warn if argument contains any of ,[]()
+		which are unlikely to be allowable in real variable names.
+		Suggested by rms.
+
+	* makeinfo/makeinfo.h (member): remove weird masking macro.
+
+	* doc/texinfo.txi: Probably ok to indent @example.
+
+	* configure.in: 3.12k.
+
+	* makeinfo/html.c (add_escaped_anchor_name): Cast to unsigned char
+		for 8-bit chars. From Yoshiki.
+
+	* makeinfo/makeinfo.c: complain -> warn for sake of <80 chars.
+
+1999-07-09  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/multi.c (multitable_item): Quote the value of align=
+	property.
+
+	* makeinfo/defun.c (defun_internal): Ditto.
+
+	* makeinfo/cmds.c (cm_center): Ditto.
+
+	* makeinfo/toc.c (toc_add_entry): New argument ANCHOR; all callers
+	changed.  In HTML mode, expand NODE_NAME, or use ANCHOR, if
+	non-NULL, and save it together with the TOC name in the name
+	member of the TOC entry.
+	(toc_add_entry, toc_find_section_of_node): Add a warning in a
+	comment that the NODE argument must be unexpanded.
+	(contents_update_html): Terminate the TOC entry with </a>.
+
+	* makeinfo/sectioning.c (sectioning_html): If the sectioning
+	command is outside any node, generate explicit anchor and pass it
+	to toc_add_entry.
+
+	* makeinfo/node.c (expand_node_name): Now external instead of
+	static.
+	(cm_node): Output expanded node name in the navigation bar.
+
+	* makeinfo/node.h: Declare expand_node_name.
+
+	* makeinfo/index.c (cm_printindex): Produce valid HTML links, even
+	if index->node is NULL or empty.  Fix format of index under
+	--no-headers.
+
+Fri Jul  9 18:09:28 1999  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi: Pair @end html properly.  From Olaf B.
+
+	* doc/Makefile.am (EXTRA_DIST): add txi-nl.tex from Marcel van der Boom
+	<marcel@virtualprojects.org>.
+
+	* doc/txi-en.tex: Doc fix.
+
+Wed Jul  7 16:07:44 1999  Karl Berry  <karl@gnu.org>
+
+	* doc/Makefile.am: Doc fix.
+
+	* configure.in (txi_CHECK_DECLS): call this new macro (in
+ 		acinclude.m4).
+ 	* acinclude.m4: new file.
+
+Tue Jul  6 19:12:37 1999  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/insertion.h,
+	* makeinfo/insertion.c,
+	* makeinfo/cmds.c,
+	* makeinfo/defun.c: new command @deftypeop.
+	Suggestion from: booth@us.ibm.com.
+
+1999-07-05  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/makeinfo.c (cm_value): Don't convert quotes and dashes
+	in the argument of @value, since @set doesn't.
+
+Mon Jul  5 16:43:23 1999  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/insertion.c (get_item_function): return "@ " rather
+ 		than "@".	(command_needs_braces): new fn.
+	(cm_item): handle @itemize markers that don't take braces.
+	Bug reported by Stephen, prototype fix from Yoshiki.
+
+	* doc/texinfo.txi (Contents): @contents ignored at beginning when
+ 		outputting to stdout.
+	Installed this.
+>1999-05-02  Eli Zaretskii  <eliz@is.elta.co.il>
+>	* makeinfo/toc.c (cm_contents, cm_shortcontents): If writing to
+>	stdout, output the contents and short contents immediately, and
+>	assign NULL to contents_filename and shortcontents_filename, so
+>	that toc_update won't try to rewrite stdout.
+
+
+	* makeinfo/sectioning.c (sectioning_html): declare starting_pos
+		and ending_pos as unsigned char * since they're based on
+		output_paragraph.
+
+	* makeinfo/insertion.c: Cast output_paragraph to char * for sake
+		of strncmp prototype (on IRIX 4).
+	From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>
+
+
+	* info/man.c (get_manpage_contents): restore previous (default)
+ 		SIGCHLD handler so the pclose when gunzipping info files
+ 		doesn't fail with `No child processes' (because
+ 		reap_children reaped it).
+ 	From: Josip Rodin <jrodin@public.srce.hr>
+ 	njs@uclink4.berkeley.edu, 38063-forwarded@bugs.debian.org
+
+Fri Jul  2 14:26:22 1999  Karl Berry  <karl@gnu.org>
+
+	From gildea:
+	* info/terminal.c (TIOCGETC) [M_XENIX && TIOCGETC]: #undef.
+	* info/session.c (strncasecmp) [M_XENIX]: declare.
+
+Thu Jul  1 19:25:12 1999  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/makeinfo.c (cm_value): erroneous capitalization in
+ 		error message.
+
+	* makeinfo/insertion.c (end_insertion): @end html should turn html
+ 		escaping back on. From esr.
+
+	* makeinfo/makeinfo.c (cm_pxref): No period needed to terminate
+ 		cross-reference.
+
+Sun Jun 13 16:12:41 1999  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi: Remove some more node links.
+
+Sat May  1 16:01:36 1999  Karl Berry  <karl@gnu.org>
+
+	* info/info.c: Single space for option indent to match others.
+
+	* makeinfo/makeinfo.c,
+	* util/texindex.c,
+	* util/install-info.c: Must indent option list for help2man.
+
+	* info/infodoc.c [HELP_NODE_GETS_REGENERATED]: set to true.
+	(info_internal_help_text): put moving cmds first so they know how to go
+	forward in the help window.
+	(create_internal_info_help_node): can't always quit help with C-x 0.
+	(info_find_or_create_help_window): pass !one_window_p.
+
+1999-04-29  Yoshiki Hayashi  <g740685@komaba.ecc.u-tokyo.ac.jp>
+
+	* makeinfo/makeinfo.c (cm_xref): Don't collapse --- to -- etc.,
+	in references.
+
+Mon Apr 26 16:41:55 1999  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/node.c (validate): arrange to translate the reference type.
+	Report from Sergio.
+
+	* makeinfo/makeinfo.c (validate): should not be declared here.
+
+	* makeinfo/index.c (cm_printindex): <ul compact> is not
+ 		translatable.  From Yoshiki.
+
+	* doc/Makefile.am (EXTRA_DIST): include new txi-es.tex from Adrian
+ 		Perez Jorge <alu1415@csi.ull.es>.  And new txi-en.tex.
+
+Sun Apr 25 16:08:27 1999  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/cmds.c (cm_settitle): don't output html head here.
+
+	* makeinfo/makeinfo.c: Move html routines to html.c.
+	* makeinfo/Makefile.am (makeinfo_SOURCES): add html.[ch].
+	* makeinfo/html.[ch]: new files.
+
+	* makeinfo/makeinfo.c: Restore -- in --output line.  From Sergio.
+
+1999-04-23  Yoshiki Hayashi <g740685@komaba.ecc.u-tokyo.ac.jp>
+
+	* makeinfo/cmds.c (cm_center): Recover the previous state when
+	called with --html.
+
+1999-04-24  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/cmds.c (cm_bye): Flush the output, in case some command
+	produced it immediately before @bye.
+
+	* makeinfo/toc.h (TOC_ENTRY_ELT): New member: containing_node.
+
+	* makeinfo/toc.c (lots_of_stars): New variable.
+	(toc_add_entry): Add a new parameter node_name; all callers
+	changed.  Record the name of the node containing the section.
+	(toc_find_section_of_node): New function.
+	(toc_free): Free the new containing_node member.
+	(contents_update_info, shortcontents_update_info): Underline the
+	title with stars.  Output two empty lines after the TOC.
+	(contents_update): Fix off-by-one error in writing the rest of the
+	file after updating the TOC.
+
+	* makeinfo/index.c (cm_printindex): Save and restore line_number
+	and input_filename.  Don't output the "* Menu" header when
+	--no-headers is in effect.  Make the fake node name for index
+	entries that are outside any node be more explanatory, and emit an
+	error for such index entries.  Under --no-headers, output a
+	reference to the section name, as returned by a call to
+	toc_find_section_of_node, instead of a node name.
+
+1999-04-24  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/index.c (struct index_elt): Add a new member
+	entry_text.
+	(free_index, make_index_entries_unique): Free the entry_text
+	member.
+	(index_add_arg): Don't HTML-escape the index entry here.
+	(index_add_arg): Initialize the entry member to NULL.  Put the
+	entry text into the entry_text member.
+	(sort_index): Expand the index entries as if in non-HTML mode.
+	Put the expansion into the entry member of struct index_elt.
+	(cm_printindex): Allocate the line[] array in Info mode only.
+	In HTML mode, escape and expand the original index entry text,
+	don't use the results of expansion inside sort_index.
+
+	* makeinfo/cmds.c (cm_r): Undo the effect of @code while printing
+	one of the "code"-style indices in HTML mode.
+
+1999-04-23  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* info/infomap.c (initialize_vi_like_keymaps): Bind DEL in echo
+	area to ea_rubout, except for __MSDOS__.
+
+	* doc/info-stnd.texi (Node Commands): Document that `I' only
+	produces its effect for programs documented in the current Info
+	file.  Tell them to invoke `I' from DIR if it doesn't work from
+	current place.
+
+Thu Apr 22 09:59:02 1999  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/makeinfo.c,
+	* info/info.c: Rewrite help string a little more.
+
+	* doc/info-stnd.texi: Change chapter name to match node name,
+		* other changes.
+
+	* makeinfo/cmds.c (cm_bye): call discard_braces.
+
+	* makeinfo/cmds.c (cm_settitle): output more meta and link tags.
+
+	* configure.in (ALL_LINGUAS): add eo.
+
+	* util/install-info.c [STRIP_DOT_EXE]: #if not #ifdef
+
+Wed Apr 21 19:40:51 1999  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/makeinfo.c: Doc fix.
+
+	* makeinfo/sectioning.c (insert_and_underscore): do not output
+ 		html anchor here.
+	* makeinfo/node.c (cm_node): do anchor at node name not sectioning
+ 		title.
+
+	* makeinfo/node.c: Newlines on node lines.
+
+Tue Apr 20 13:02:46 1999  Karl Berry  <karl@gnu.org>
+
+	* info/man.c (get_manpage_contents): freopen stdin and stderr to
+        /dev/null rather than closing them. http://bugs.debian.org/14787
+
+Mon Apr 19 14:12:09 1999  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi: Document possibility of `titlepage' stuff for
+		plain text output using @ifinfo.
+	Report from: Kurt Hornik <Kurt.Hornik@ci.tuwien.ac.at>.
+
+	* makeinfo/cmds.c: Screw that.
+	* doc/texinfo.txi: Fix up frontmatter a bit.
+
+	* dir-example: Spaces not tabs.
+	* dir-example (R FAQ): add.
+
+	* makeinfo/makeinfo.c: Lowercase makeinfo in first line.
+
+	* doc/info.texi (The node reached...): is a @subsection not a
+ 		@subsub.
+
+	* doc/texinfo.txi: Document option rename.
+	* makeinfo/makeinfo.c: Rename option to commands-in-node-names.
+
+	* makeinfo/index.h (index_compare_fn): declare.
+	* makeinfo/index.c (index_element_compare): call through new
+ 		variable index_compare_fn, and set it to strcoll if
+	 	@documentlanguage was used and LANG != en.
+	 	#include lang.h.
+
+Sat Apr 17 14:46:47 1999  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/insertion.c (current_item_function, cm_item): rewrite
+ 		to skip all conditionals.
+ 	(cm_item): use current_item_function rather than current_insertion_type
+	to check what to use for @item, so @ifset etc. can be used around
+		@items.
+	Report from: "W. L. Estes" <wlestes@br20920.uncg.edu>.
+
+	* makeinfo/makeinfo.c (current_insertion_type): no need to
+ 		declare.
+
+	* makeinfo/makeinfo.c: Add examples to help message.
+
+	* util/texindex.c (usage): Rearrange --help, avoid extra newline.
+
+	* info/info.c: Sort --help in the usual place.
+
+	* makeinfo/makeinfo.c: Reindent help message, rename
+	       --expensive-validation to --commands-in-nodes.
+
+Fri Apr 16 17:53:48 1999  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/cmds.c (cm_ignore_arg): new routine.
+	(cm_ignore_line_no_op): remove, can use cm_ignore_line.
+
+Tue Apr 13 16:45:39 1999  Karl Berry  <karl@gnu.org>
+
+	* doc/info-stnd.texi: Frontmatter changes.
+
+	* doc/info.texi: Remove advanced remark in first node.
+
+	* doc/texinfo.txi: Texinfo.tex does macros now. From Eli.
+
+	* doc/texinfo.txi: Document @w{ } to produce an unbreakable space.
+
+	* util/texi2dvi: Update from Akim, avoid Solaris ucb echo weirdness.
+
+	* info/infodoc.c: Parenthesize function calls, don't depend on
+ 		gettext being there.  Report from: Doug Semler
+ 		<doug@seaspace.com>.
+
+1999-04-12  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* info/infomap.c (initialize_vi_like_keymaps): Initialize the echo
+	are keymap *before* it is filled up with keys.
+
+1999-04-10  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/macro.c (execute_macro): Reset the line number to where
+	the macro argumenst begin, before executing its expansion.
+
+	* makeinfo/makeinfo.c (cm_xref): Expand the name of arguments
+	before writing them in HTML mode.
+	(handle_menu_entry): Expand the name of the gleaned node before
+	writing it in HTML mode.
+
+	* makeinfo/sectioning.c (sectioning_html): Expand the name of the
+	current node when producing the <a name=... anchor.
+
+	* makeinfo/node.c (cm_node): Expand the name of node and its links
+	before outputting them in HTML mode.
+
+	* makeinfo/index.c (cm_printindex): Expand node names to which the
+	index points.
+
+	* makeinfo/footnote.c (cm_footnote): Call execute_string instead
+	of add_word_args, since current_node needs to be expanded.  Expand
+	the name of the Footnotes node before calling
+	remember_node_reference.
+
+	* makeinfo/tests/node-expand.txi: New test, for testing how node
+	names are expanded in @node, @menu, cross-references, and
+	indices.
+
+	* makeinfo/makeinfo.c (add_char): If we output <p>, adjust the
+	affected brace positions by 3, so cm_xxx functions get what they
+	expect in START and END.
+	(insert_html_tag): Likewise.
+
+	* makeinfo/cmds.c (cm_sc): Remove the kludge that looks for the
+	beginning of <small>, it is no longer needed.
+
+	* makeinfo/macro.c (cm_definfoenclose): Don't stop at the first
+	blank after the second comma: the blank may belong to the second
+	delimiter.
+
+	* makeinfo/tests/htmlpara.txi: New test, for the commands affected
+	by the <p> output at paragraph beginning.
+
+	* makeinfo/makeinfo.h (expensive_validation): New option.
+
+	* makeinfo/makeinfo.c (long_options): Add expensive_validation.
+	(usage): Likewise.
+
+	* makeinfo/node.c (find_node): If NAME isn't found verbatim, try
+	expanding it and every node name in tag table, before comparing
+	them, but only if expensive_validation is non-zero.
+	(find_node_reference): Likewise.
+	(cm_node): Don't expand node name and its links here.
+	(validate_file): If direct comparisons fail, try expanding the
+	comparees before giving up, unless expensive_validation is zero.
+	Switch the order of NODE and UP in error message about a lacking
+	menu item.
+
+1999-04-07  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/index.c (cm_printindex): Don't output "Menu" header.
+
+	* makeinfo/node.c (get_node_token): Collapse whitespace in node
+	names.
+	(glean_node_from_menu, expand_node_name): Likewise.
+
+	* info/infomap.c (initialize_vi_like_keymaps): Bind all the 256
+	keys to ea_insert, like the Emacs-like case does.
+
+	* doc/info-stnd.texi (Invoking Info): Document support for files
+	compessed with bzip2, and the --vi-keys option.
+	(Many places): Document key bindings under --vi-keys.
+
+1999-04-06  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* info/session.c (info_last_node, info_first_node): With a numeric
+	argument, go to ARGth node counting from the beginning.  Skip
+	anchor tags when looking for the target node--the last tag can be
+	an anchor, for example.
+	(last_search_direction, last_search_case_sensitive): New
+	variables.
+	(last_search_for_string): Remove variable.
+	(info_search_internal): Always move point by one notch before
+	beginning the search, to avoid complications in repeated search
+	commands.  When looking for the next node tag, skip any anchor
+	tags.
+	(info_search_1): Accept a 5th argument ASK_FOR_STRING, and only
+	prompt for search string if it's non-zero.  All callers changed.
+	Look for the COUNTth occurence of the string.
+	(info_search, info_search_backward, info_search_case_sensitively):
+	Set last_search_direction and last_search_case_sensitive.
+	(info_search_next, info_search_previous): New commands, repeat
+	last search in the same or reverse direction without prompting the
+	user for the string.
+
+	* info/infomap.c (initialize_emacs_like_keymaps): Bind `C-x n' to
+	info_search_next and `C-x N' to info_search_previous.
+	(initialize_vi_like_keymaps): Bind `n' to info_search_next and `N'
+	to info_search_previous.
+
+1999-04-04  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/makeinfo.c (get_rest_of_line): Don't expand non-macros,
+	so that macro-expanded output will still have them.
+
+1999-04-03  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/node.c (cm_node): Expand the node name and its links
+	completely before using them, so that they could use e.g. @value{}
+	etc.
+
+	* makeinfo/makeinfo.c (replace_with_expansion): Don't
+	remember_itext if we are executing_string.
+
+	* makeinfo/sectioning.c (sectioning_html): Remove #ifdef
+	HAVE_MACROS.  Don't call me_execute_string if already
+	executing_string.
+
+	* makeinfo/toc.c (toc_add_entry): Expand macros in TOCNAME right
+	here, since the macro can be later redefined.
+	(contents_update_html, contents_update_info,
+	shortcontents_update_html, shortcontents_update_info): Use stdio
+	functions for output instead of add_word etc.
+	(rewrite_top, contents_update, shortcontents_update, toc_update):
+	New functions, replace the TOC placebo with the actual TOC.
+	(cm_contents): Output a placebo instead of writing the TOC.
+	(cm_shortcontents): Output a placebo instead of writing the short
+	TOC.
+
+	* makeinfo/makeinfo.c (convert_from_loaded_file): Call toc_update
+	if appropriate.
+
+	* makeinfo/sectioning.c (cm_top): Don't output the HTML header
+	here, since the Top node might be preceeded by other commands,
+	like @contents.
+
+	* makeinfo/cmds.c (cm_settitle): Output the HTML header here.
+
+	* makeinfo/node.c (set_current_output_filename): New function,
+	saves the name of the actual file we are now writing, including in
+	the case of split-HTML output.
+	(cm_node): Call it to record the name of output file.
+
+	* makeinfo/footnote.c (free_pending_notes): Re-initialize
+	current_footnote_number to 1.
+
+	* makeinfo/index.c (index_add_arg): Remove redundant xstrdup.
+	(cm_printindex): Don't free index->entry: it is freed in
+	free_index, if, e.g., there's more than one file to convert.
+
+	* makeinfo/makeinfo.c (init_internals): Call toc_free.
+
+Mon Apr  5 16:53:33 1999  Karl Berry  <karl@gnu.org>
+
+	* doc/Makefile.am: Texmf_{texinfo,dvips}: dirs not files.  From
+ 		Kurt Hornik.
+
+Wed Mar 31 13:50:09 1999  Karl Berry  <karl@gnu.org>
+
+	* Pretest 3.12h.
+
+	* makeinfo/node.c (last_node_p): new fn.
+	(split_file): call it, instead of assuming no more entries means
+		no more nodes.  (Loses with anchors.)
+	Report from: "Oleg S. Tihonov" <ost@benetnash.ffke-campus.mipt.ru>.
+
+	* makeinfo/index.c (sort_index): whether an entry is @code or not
+		depends on the element, not the index, because of synindex.
+
+	* doc/Makefile.am (install-tex): Must use $(TEXMF), do
+		$(mkinstalldirs) on tex dirs.
+	From: Nathan Sidwell <nathan@acm.org>.
+
+	* doc/texinfo.txi: Document need for blank line before @image if
+ 		you want space.
+
+	* Install changes from Eli:
+
+	1999-03-09  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* info/infodoc.c (info_internal_help_text): Remove hard-wired key
+	names, use %-10s instead.
+	(info_help_keys_text): New variable, holds two variants of keys
+	that invoke basic commands, indexed by vi_keys_p.
+	(create_internal_info_help_node): Use info_help_keys_text[].
+
+	* info/window.c (build_message_buffer): Support more general
+	format strings, like %-10.15s, %+4d etc.
+
+	* info/infomap.c (initialize_vi_like_keymaps): Bind ESC-h, ESC-t,
+	C-x LFD and C-x RET.
+
+	1999-03-08  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* util/install-info.c (output_dirfile): Sort the entries and
+	output them in alphabetic order.  Output each entry only in those
+	sections where it belongs.
+	(parse_input): New function, code moved from main.  Process
+	sections and entries in a single loop, and record with each entry
+	the list of sections where that entry belongs.  Record each entry
+	separately, not all of them together as a single block.
+	(parse_dir_file): New function, code moved from main.
+	(main): Move code to parse_input and parse_dir_file.  Put the new
+	entries only into sections where they belong.
+	(compare_entries_text): New function, called when sorting new
+	entries.
+
+	* info/infomap.c (initialize_vi_like_keymaps): New function.  Bind
+	keys a-la Less, including new functions from session.c below.
+	(initialize_emacs_like_keymaps): New function, with the guts of
+	initialize_info_keymaps.
+
+	* info/session.c (info_scroll_forward, info_scroll_backward): If
+	default_window_size is non-negative, use it as the default number
+	of lines to scroll.
+	(info_scroll_forward_set_window, info_scroll_backward_set_window,
+	info_down_line, info_up_line, info_scroll_half_screen_down,
+	info_scroll_half_screen_up, info_search_backward): New functions,
+	for Less-like look and feel.
+
+Tue Mar 30 16:44:53 UTC 1999 Karl Heinz Marbaise <kama@hippo.fido.de>
+
+        * doc/txi-de.tex:
+            - added additional putwordin
+        * doc/texinfo.txi:
+            - changed defivar into deftypeivar
+        * makeinfo/sectioning.c:
+            - changed output of anchors based on problems with ie.
+        * makeinfo/defun.c:
+            - output in HTML mode changed to be on previous state.
+        * makeinfo/insertion.c:
+            - fixed up HTML output for deftypeivar.
+
+1999-03-30  Akim Demaille  <demaille@inf.enst.fr>
+
+        * texi2dvi ($tmpdir): Avoid security holes.
+
+Fri Mar 26 17:06:55 1999  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/cmds.c (cm_exdent): rewrite to preserve blank lines.
+	Bug from: "Oleg S. Tihonov" <ost@benetnash.ffke-campus.mipt.ru>.
+
+	* makeinfo/cmds.c (cm_exdent): arg is in `roman'.
+
+Thu Mar 25 16:21:27 1999  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/insertion.c,
+	* makeinfo/defun.c,
+	* makeinfo/insertion.h (insertion_type): add deftypeivar.
+	* makeinfo/defun.h (cm_defun): declare here.
+	* makeinfo/cmds.c (defun.h): include.
+	* doc/texinfo.txi (deftypeivar[x]): new commands.
+	* makeinfo/cmds.c (deftypeivar[x]): new commands.
+
+	* makeinfo/cmds.c (cm_exdent): save, set and restore
+ 		in_fixed_width_font.
+
+	* doc/texinfo.txi (uref): rewrite.
+
+	* info/info.c (info_short_help): more spaces for new help2man.
+
+	* makeinfo/node.c (cm_node): output node name in html, change
+ 		navbar punctuation.
+
+	* doc/texinfo.5: Fix URL.
+
+	* Finally installed this:
+	1998-05-01  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+	* makeinfo/makeinfo.c (convert_from_loaded_file): When the file
+	contains no @setfilename then always look for \input (not
+	\include) in the first line and skip that.  Don't skip the first
+	line if no \input was found.
+
+1999-03-24  Akim Demaille  <demaille@inf.enst.fr>
+
+	* configure.in (AC_HEADER_STAT): Added.
+	* util/texindex.c (main): Check infiles are not directories.
+
+1999-03-24  Akim Demaille  <demaille@inf.enst.fr>
+
+	* texi2dvi (index_files): Don't use `!' to run sed -e "s!foo$!!"
+        since the shell will interpret `$!'.
+
+Tue Mar 23 16:41:08 1999  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (uref): rewrite to make HTML output read more
+ 		nicely.  From Tim S.
+
+	* info/info.c (info_short_help): include examples.
+
+	* makeinfo/makeinfo.c (close_paragraph_with_lines): move earlier
+ 		so can be static.
+
+	* makeinfo/sectioning.c,
+	* makeinfo/node.c,
+	* makeinfo/makeinfo.h,
+	* makeinfo/makeinfo.c,
+	* makeinfo/macro.c,
+	* makeinfo/insertion.c,
+	* makeinfo/cmds.c,
+	* makeinfo/files.c,
+	* makeinfo/footnote.c (size_of_input_text): rename to
+ 		input_text_length.
+
+	* makeinfo/makeinfo.c (cm_xref): make wrong-char-following a warning.
+ 	(replace_with_expansion): remove bogus conditional that was duplicated
+	unconditionally.
+	From: Hans-Bernhard Broeker <broeker@physik.rwth-aachen.de>
+
+Mon Mar 22 14:39:59 1999  Karl Berry  <karl@gnu.org>
+
+	* doc/Makefile.am (install-tex): parenthesize.
+
+	* Makefile.am (dist-hook): remove, it uses hard links so we chmod
+ 		all our sources.
+
+	* makeinfo/toc.c,
+	* makeinfo/defun.c,
+	* makeinfo/sectioning.c: Use _, not N_.
+
+	* info/Makefile.am (ginfo_SOURCES): include $(BUILT_SOURCES)
+ 		explicitly.
+
+	* makeinfo/lang.c,
+	* makeinfo/lang.h: ISO-639 updates.
+
+	* makeinfo/cmds.c: exampleindent changes.
+
+	* info/info.c (info_short_help): reformat somewhat, and don't say
+		info info options any more.
+
+	* doc/info-stnd.texi (Invoking): make description format somewhat
+ 		more standard.
+
+	* info/infomap.c (Initialize_info_keymaps): do ea_insert bindings
+		first so subsequent bindings (e.g., for ESC) override.
+
+Sun Mar 21 17:31:00 1999  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/multi.c (output_multitable_row): remove unnecessary
+	trailing whitespace from output, output blank row for blank @item.
+
+	* doc/texinfo.txi: Remove extra @item in language multitable.
+
+Sat Mar 20 12:30:25 1999  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi: Update language table from ISO 639:
+	http://www.iro.umontreal.ca/contrib/po/iso-639.  From kama.
+
+	* doc/texinfo.txi (exampleindent): document.
+
+	* doc/texinfo.txi (Creating an Info File): use this for the node name.
+
+	* doc/info.texi: Make Texinfo references consistent, etc.
+
+1999-03-18  Yoshiki Hayashi  <g740685@komaba.ecc.u-tokyo.ac.jp>
+
+	* makeinfo/makeinfo.c (set_default_indentation_increment): new
+	routine.
+	* makeinfo/insertion.c (cm_exampleindent): new routine.
+	Call set_default_indentation_increment.
+
+Mon Mar 15 17:06:15 1999  Karl Berry  <karl@gnu.org>
+
+	* info/Makefile.am (ginfo_SOURCES): Remove doc.c and funs.h in
+		hopes they then won't be distributed.  Report from Andreas.
+
+	* makeinfo/cmds.c (cm_sp): close paragraph and disable filling to
+		produce blank lines in info.
+	Report from: Michael Vanier <mvanier@bbb.caltech.edu>.
+
+	* doc/texinfo.txi: Attempt to get Edition info on one line.
+
+	* makeinfo/makeinfo.h (cr_or_whitespace): use whitespace and check
+ 		for \r.	(skip_whitespace_and_newlines, command_char): use it.
+ 	Report from bonzini@gnu.org.
+
+	* makeinfo/cmds.c (cm_center): save and restore filling_enabled,
+ 		so @center can be used inside an @example.  Bug from kama.
+
+1999-03-13  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/footnote.c (cm_footnote): In separate footnote style,
+	generate a reference to "foo-Footnote-NN" for each footnote.
+	(output_pending_notes): In separate footnote style, generate an
+	anchor "foo-Footnote-NN" for each footnote, so that the link in
+	the parent node would lead directly to the footnote.
+
+	* info/footnotes.c (make_footnotes_node): Recognize the new
+	"foo-Footnote-NN" style of footnote references.
+
+1999-03-09  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* configure.in (AC_OUTPUT): Remove command to create po/Makefile,
+	already done by AM_GNU_GETTEXT.
+
+Tue Mar  9 17:48:46 1999  Karl Berry  <karl@gnu.org>
+
+	* Makefile.am (dist-hook): make distribution directory writable.
+
+	* Installed these changes:
+
+  1999-03-04  Akim Demaille  <demaille@inf.enst.fr>
+
+	    * texi2dvi (bibtex): Allow several runs of bibtex, this can be
+	    used if bibentries reference other bibentries.  Moreover, looking
+	    for `Citation' in the LOG should be enough to avoid uneless runs.
+
+  Sun Mar  7 15:15:00 1999 UTC Karl Heinz Marbaise <kama@hippo.fido.de>
+
+      * makeinfo/sectioning.{c,h}:
+	      - using defines instead of literals.
+	      - cleaned up some stylistic matters like Karl Berry
+		suggested. Handling of things like:
+		@unnumbered ..
+		@section ...
+		now it works correct.
+
+      * makeinfo/toc.{c,h}
+	      - addTocEntry, freeToc changed into toc_add_entry
+		toc_free. stylistics changed.
+
+      * makeinfo/iso2cht.pl,iso-639: script, table from the web.
+	      - perl script converting the iso-639 table from the web
+		into the appropiate files (isoenum.h, isotab.c and
+		iso.texi) which can be inserted directly into
+		lang.c, lang.h and texinfo.txi.
+
+Tue Mar  9 17:47:59 1999  Karl Berry  <karl@gnu.org>
+
+	* configure.in: Bump to 3.12g.
+
+Sun Mar  7 07:01:19 1999  Karl Berry  <karl@gnu.org>
+
+	* info/infomap.c: Don't do isprint, just bind everything.
+
+Fri Mar  5 14:31:42 1999  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi,
+	* makeinfo/makeinfo.c: Document that --no-headers writes to stdout
+ 		by default.
+
+	* doc/texinfo.txi: @setchapternewpage doesn't change
+	\bindingoffset, just headers. Recommend not including it in the
+		manual source at all.
+
+	* makeinfo/node.c (write_tag_table_internal): set
+ 		in_fixed_width_font while constructing this so --- doesn't
+ 		collapse to --, etc.  Bug report from Sergio.
+
+	* dir-example: Add a2ps stuff.
+
+	* info/session.c: Allow any character in search string.
+
+	* info/infodoc.c (describe_key): don't assume non-latin1
+ 		characters are undefined.
+
+	* info/infomap.c (initialize_info_keymaps): make all characters
+		insertable by default in echo area.  From Eli.
+
+	* Installed these changes:
+
+  Wed Feb 23 22:00:00 1999  Karl Heinz Marbaise <kama@hippo.fido.de>
+
+      * makeinfo/sectioning.{c,h}:
+	      - added to hold complete handling of sectioning
+		a little step towards modularization ;-)
+
+      * makeinfo/cmds.c:
+	      - sectioning_alist moved to sectioning.c and
+		added information about enumerated chapter,
+		section ..., appendix or not. Everything
+		which has any relationship with sectioning
+		moved to sectioning.{c,h} I hope I have found
+		all.
+
+      * makeinfo/toc.{c,h}:
+	      - added for complete handling of "table of contents"
+		"short contents". Better ASCII only support
+		(--no-headers) so no Text "Menu" is printed.
+		May be we can do more.
+
+      * makeinfo/makeinfo.{c,h}:
+	      - added new command line switch --number to enumerate
+		chapter, sections etc.
+
+      * doc/texinfo.txi:
+	      - --number option documented.
+
+  1999-02-28  Yoshiki Hayashi  <g740685@komaba.ecc.u-tokyo.ac.jp>
+
+	  * makeinfo/insertion.c (in_paragraph): New variable.
+	  (cm_item): Add </p> only if <p> is open.
+	  * makeinfo/makeinfo.c (handle_menu_entry): Ditto.
+
+	  * makeinfo/insertion.c (begin_insertion),
+	  * makeinfo/makeinfo.c (handle_menu_entry): If commentary
+	  precedes first menu item, put them outside of <ul>.
+	  Put <p> and </p> correctly.
+
+  1999-02-27  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	  * info/info.c (info_short_help): Document --show-options and
+	  --usage.
+
+  1999-02-26  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	  * info/makedoc.c (main) [STRIP_DOT_EXE]: Strip the .exe suffix, so
+	  that doc.c says "./makedoc.c", not "./makedoc.exe.c".
+
+	  * info/info.c (goto_invocation_p): New variable.
+	  (long_options): New options --show-options and its alias --usage.
+	  (main): Don't update the display until we find the first node to
+	  be displayed, to avoid flushing incorrect display.  If user wants
+	  to see the command-line options node right away, display whatever
+	  info_intuit_options_node finds.
+
+	  * info/session.c (info_intuit_options_node): New function, uses
+	  heuristics to find the node which describes program's invocation.
+	  (info_goto_invocation_node): New command, asks for a program's
+	  name and displays the invocation node of that program.
+	  (entry_in_menu): New function, fuzzily looks for a menu entry in a
+	  node's menu.
+	  (program_name_from_file_name): New function, suggests a program
+	  name given a name of its Info file.
+	  (info_search_in_node): Accept an additional argument: a flag to
+	  search case-sensitively; all callers changed.  If case-sensitive
+	  search is required, don't turn on the case-fold flag in the search
+	  binding.
+	  (info_search_internal): Accept an additional argument: a flag to
+	  search case-sensitively; all callers changed.  Share the last
+	  search string between normal and case-sensitive search commands.
+	  (info_search_1): New function, with the guts that previously
+	  belonged to info_search.  If the search is case-sensitive,
+	  mentions that in the prompt for the search string.  If the search
+	  string includes upper-case characters, searches case-sensitively.
+	  (info_search): Calls info_search_1 with zero case-sensitivity
+	  flag.
+	  (info_search_case_sensitively): New command, calls info_search_1
+	  with non-zero case-sensitivity flag.
+	  (incremental_search): If the search
+	  string includes upper-case characters, searches case-sensitively.
+
+	  * info/search.c (search_backward): Fix bug in case-sensitive
+	  search.
+
+	  * info/infomap.c (initialize_info_keymaps): `-' in info window map
+	  produces negative arguments.  `S' invokes case-sensitive search.
+	  `O' and `I' invoke goto-invocation.
+
+	  * doc/info-stnd.texi (Invoking Info): Document --show-options.
+	  (Node Commands): Document `O', goto-invocation.
+	  (Searching Commands): Document `S' and the case-sensitive search
+	  when the search string includes upper-case letters.  Document `/'
+	  as a synonym for `s'.
+	  (Miscellaneous Commands): Document `M--' and `-'.
+
+  1999-02-25  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	  * info/info.c (main): Under --index-search, search indices *after*
+	  following menus, so that we don't look for an index in DIR.
+
+
+Wed Mar  3 17:20:07 1999  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/cmds.c: Do not output <small> in info mode.
+	From: Eli Zaretskii <eliz@is.elta.co.il>.
+
+	* makeinfo/insertion.c (enum_html): Remove unused var temp.
+	From: Yoshiki Hayashi <g740685@komaba.ecc.u-tokyo.ac.jp>
+
+	* info/infodoc.c: Avoid translation of blank lines.
+
+	* info/tilde.c,
+	* info/man.c,
+	* makeinfo/index.c (index_add_arg): avoid use of alloca.
+
+	* info/echo-area.c: Don't pause for an additional 75 microseconds.
+	Noted by Eli.
+
+	* configure.in: Bump to 3.12f.
+
+	* doc/texinfo.txi: findex enddots.  From Eli.
+
+1999-03-01  Yoshiki Hayashi  <g740685@komaba.ecc.u-tokyo.ac.jp>
+
+	* makeinfo/makeinfo.c (insert_html_tag): Add <p> when
+	paragraph is not opened.
+	(sectioning_html): Call close_paragraph so that paragraph
+	will be started.
+
+1999-02-26  Akim Demaille  <demaille@inf.enst.fr>
+
+        * texi2dvi (get_xref_files): Take $filename_noext as $1.
+        (get_xref_files): Look for $1.idx only, not *.idx.
+        (get_xref_files): Look for $1.cb files (\usepackage{changebar}).
+        * texi2dvi: Look for rerun requests in LOG files in addition to
+        xref files comparison.
+        (bibtex): Remove useless `./' (already added in
+        command_line_filename).
+        (filename_dir): Smarter sed expression that handles file names
+        with no directory part.
+        (txiversion): Removed useless () (`` already guarantee a subshell).
+
+1999-02-25  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* makeinfo/multi.c (find_template_width): Fix operator precedence.
+
+Tue Feb 23 10:35:53 1999  Karl Berry  <karl@gnu.org>
+
+	* dir-example: ccmode not cc-mode.  From hds.
+
+Mon Feb 22 07:34:00 1999  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/lang.c,
+	* doc/texinfo.txi: Fix kazakhkh typo.
+
+1999-02-21  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* djgpp/config.sed: Add pcterm.c to terminal.o dependencies.
+
+1999-02-21  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* makeinfo/lang.c (cm_accent_generic): Emit the accent character
+	only once, after the argument.
+
+Sun Feb 21 16:36:14 1999  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/makeinfo.c (handle_menu_entry): new routine.
+	(reader_loop): call it, allowing for comments in menus.
+
+	* makeinfo/node.c: Rearrange functions to make static, etc.
+
+	* doc/Makefile.am (EXTRA_DIST, install-tex): Add txi-cs and txi-no.
+
+1999-02-20  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* util/install-info.c (open_possibly_compressed_file): Output
+	explicit message about empty input files.
+	(insert_entry_here): Insert multiple entries in alphabetical order.
+
+Fri Feb 19 09:13:28 1999  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/insertion.c (enum_html): new routine.
+	(begin_insertion): call it.
+	Based on code from: Yoshiki Hayashi <g740685@komaba.ecc.u-tokyo.ac.jp>.
+
+	* lib/xexit.c (EXIT_FAILURE) [!defined EXIT_SUCCESS && VMS]: weird
+		long value.
+	From: Lars Hecking <lhecking@nmrc.ucc.ie>
+
+Thu Feb 18 16:42:10 1999  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/node.h (remember_node_reference): decl.
+	* makeinfo/makeinfo.c (find_unused_reference): dump unused decl.
+
+1999-02-18  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/cmds.c (cm_dots, cm_enddots): Don't produce &#133; for
+	HTML, as too many browsers don't support it; use "..." in a
+	smaller font (with <small>).
+	(cm_top): Output the lang= attribute inside <html>.
+
+	* makeinfo/node.c (cm_node): Output the lang= attribute inside
+	<html>.
+
+	* makeinfo/footnote.c (output_pending_notes): Generate <ol>
+	instead of <dl compact>.  Make the text of each footnote start a
+	new paragraph.
+
+1999-02-17  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/insertion.c (cm_item): Remove <dd> when immediately
+	followed by a <dt>.  Add a <br> before every <dt>, except if we
+	are converting @itemx, or in the first item after <dl>.
+	(begin_insertion): Use <dl> for tables, to make it look closer to
+	the Info output.  Don't output a newline after a <pre>.
+
+1999-02-17  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/makeinfo.c (handle_variable): Don't backup input
+	pointer if we hit the end of text (usually, inside
+	execute_string).
+	* makeinfo/insertion.c (get_item_function): Likewise.
+
+Wed Feb 17 15:09:06 1999  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi: Better indexing of space entries.
+
+	* makeinfo/multi.c (find_template_width): new routine to really
+ 		parse @multitable {...} templates.
+ 	(setup_multitable_parameters): call it.
+	Bug report from: Sergio Pokrovskij <pok@nbsp.nsk.su>.
+
+	* lib/system.h (substring): declare.
+
+	* lib/Makefile.am (libtxi_a_SOURCES): add substring.c.
+
+	* makeinfo/defun.c: Move substring to lib.
+
+	* util/texindex.c (tempcopy): no longer used.
+      	(maketempname): make static.
+
+	* Installed these changes:
+
+1999-02-13  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/cmds.c (cm_acronym): New function, makes @acronym
+	produce a smaller font size in HTML mode.
+	(cm_sc): Produce smaller font size in HTML mode.
+
+	* makeinfo/footnote.c (cm_footnote): In HTML output, make the
+	footnote number be a superscript; remove [] around the link.
+
+	* makeinfo/cmds.c (cm_var_sc): Separated into two functions:
+	cm_var and cm_sc, since @var and @sc have different effects in
+	HTML output.
+
+	* makeinfo/makeinfo.c (cm_xref, cm_inforef): Don't put "[]" around
+	HTML links.
+
+	* info/pcterm.c (DJGPP_keytab): Add translation for Alt-PgUp and
+	Alt-PgDn, to support the new M-prior key.
+
+Wed Feb 17 11:50:46 1999  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi: Don't mention texi2roff so prominently.
+
+	* makeinfo/makeinfo.c: Pass enclose_expand to remember_brace
+ 		rather than enclose_command.  From Eli.
+
+	* makeinfo/macro.c (cm_alias, cm_definfoenclose): Expand macros in
+		first call to get_until_in_line.  From Eli.
+
+	* info/makedoc.c,
+	* info/session.c,
+	* info/man.c,
+	* info/tilde.c,
+	* info/info.c,
+	* makeinfo/files.c,
+	* makeinfo/multi.c,
+	* makeinfo/node.c,
+	* makeinfo/makeinfo.c: Use xexit.
+	* makeinfo/makeinfo.h (NO_ERROR, FATAL, SYNTAX): remove.
+
+	* info/terminal.c: Avoid sleep unless on sun-cmd terminal.
+
+	* lib/xexit.c (EXIT_FAILURE) [!EXIT_FAILURE]: #define to 1 to fix
+		Sony NEWS-OS 4.0C lossage.  From Akim.
+
+	* info/infodoc.c: Translate where is doc string, underline lines
+ 		in help.
+	From: Trond Endrestol <trond@agamemnon.gtf.ol.no>
+
+	* makeinfo/cmds.c (cm_dots, cm_enddots): go back to ... and ....,
+		&#133; apparently doesn't work widely enough.
+
+Tue Feb 16 07:37:54 1999  Karl Berry  <karl@gnu.org>
+
+	* configure.in (ALL_LINGUAS): add de_AT.
+
+	* util/texi2dvi: Redirect cd output to /dev/null when determining
+ 		txiversion.
+
+Mon Feb 15 13:43:37 1999  Karl Berry  <karl@gnu.org>
+
+	* util/install-info.c,
+	* util/texindex.c: Call xexit instead of exit.
+
+	* lib/system.h (xexit): Declare.
+
+	* lib/Makefile.am (libtxi_a_SOURCES): Add xexit.c.
+
+	* doc/texinfo.txi: Document that @documentencoding is used in the
+ 		HTML output.
+
+	* makeinfo/cmds.c (cm_top): use document_encoding if set.
+	(command_table): call cm_documentencoding instead of no-op.
+	* makeinfo/lang.c (document_encoding, cm_documentencoding): define.
+	* makeinfo/lang.h (document_encoding, cm_documentencoding): declare.
+
+	* makeinfo/insertion.c: Restore </p> before <li>.
+
+	* util/texi2dvi: If texinfo.tex version is too low for macros, use
+ 		makeinfo.
+
+	* makeinfo/cmds.c (cm_center): save and restore value of
+	       indented_fill, otherwise @center within an @enumerate (say)
+	       also closes the indentation.
+	Bug from: Sergio Pokrovskij <pok@nbsp.nsk.su>.
+
+Sun Feb 14 15:25:02 1999  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/makeinfo.c: Doc fix.
+
+	* doc/texinfo.txi: Be enthusiastic if people want to implement
+		more output formats, but use makeinfo to do the job.
+
+	* makeinfo/index.c (index_element_compare): Use strcoll if it's
+ 		available.
+	* configure.in: Call AC_FUNC_STRCOLL.
+	* makeinfo/makeinfo.c (main): Use LC_CTYPE and LC_COLLATE
+ 		categories.  Suggestion from Oleg.
+
+	* lib/system.h (setlocale) [!HAVE_SETLOCALE]: #define away.
+	Suggestion from Akim.
+
+	* doc/texinfo.txi: Document @paragraphindent working in TeX now.
+
+	* doc/texinfo.txi,
+	* makeinfo/lang.c,
+	* makeinfo/lang.h (language_code_type): abbrev changes from Oleg.
+
+	* makeinfo/cmds.c,
+	* makeinfo/node.c: Only translate `Next:', `Previous:', and `Up:',
+ 		not the whole href.  From Eli.
+
+	* doc/texinfo.txi: Document that only unsplit html output is
+ 		supported in this release.
+
+Sat Feb 13 17:55:30 1999  Karl Berry  <karl@gnu.org>
+
+	* configure.in: Check for termlib before termcap for sake of
+ 		Solaris (judging from less-332 configure.in) and maybe
+ 		HP-UX 11.
+
+	* doc/texinfo.txi (Footnote commands): incoherency reported by Aharon.
+	Language vs country fixes from Oleg.
+
+1999-02-13  Karl Eichwalder  <ke@gnu.franken.de>
+
+	* makeinfo/node.c (cm_node): Tag navigation links as translatable.
+	* makeinfo/cmds.c (cm_top): Ditto.
+
+Wed Feb 10 22:00:00 1999  Karl Heinz Marbaise <kama@hippo.fido.de>
+
+    * makeinfo/defun.h:
+            - new because we need get_base_type-function
+              accessible in insertion.c
+
+    * makeinfo/defun.c:
+            - complete HTML handling of the @def... things.
+
+    * makeinfo/Makefile.am:
+            - defun.h added as part of makeinfo.
+
+    * makeinfo/makeinfo.c:
+            - define looking_at moved into header-file, because
+              we need it in defun.c
+
+    * makeinfo/insertion.c:
+            - some minor changes made to support the @def...
+              things in HTML.
+
+    * makeinfo/lang.c: (cm_accent_generic)
+            - bug fixed. Using umlaut (accent ...)
+              would produce &A only if an umlaut follows
+              an empty line.
+            - bug fixed. Because things like &tilde; &grave;
+              and &circ; do not exist as standalone characters
+              in HTML.
+            - cm_special_char now produce correct HTML for
+              @O{} and @o{}.
+            - warning using _("Text") instead "Text" (gettext).
+
+    * makeinfo/cmds.c:
+            - @url fixed. Display the given Text.
+
+    * doc/texinfo.txi:
+            - corrected the references for @uref, because
+              they were given as "url" instead of "uref".
+              @uref has three arguments, so show them in
+              command list.
+
+Wed Feb 10 17:27:58 1999  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi: Rewrite for overfull box.
+
+Tue Feb  9 19:03:16 1999  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi: Document more HTML output stuff.  Based on esr
+ 		changes.
+	* makeinfo/macro.c,
+	* makeinfo/macro.h,
+	* makeinfo/makeinfo.c: Do alias and definfoenclose expansion.
+  		From esr.
+
+Mon Feb  8 14:41:07 1999  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/cmds.c: New commands @alias and @definfoenclose.
+	From: "Eric S. Raymond" <esr@snark.thyrsus.com>.
+
+	* doc/texinfo.txi: Document @documentlanguage and
+ 		@documentencoding.
+
+	* makeinfo/cmds.c: Move accent support to lang.c.
+
+	* makeinfo/makeinfo.c (add_char): add &nbsp; rather than an 8-bit
+ 		char for html.
+
+	* makeinfo/Makefile.am (makeinfo_SOURCES): add lang.[ch].
+
+	* doc/texinfo.txi: Be even more emphatic that @url is not
+		typically what you want.
+	* doc/texinfo.txi: Document that macro calls must use empty
+ 		braces.
+
+	* info/session.c: Do not translate node pointers.  From Karl E.
+
+	* makeinfo/cmds.c (cm_dfn): Use <dfn>.  Suggestion from Eli.
+
+Sun Feb  7 07:00:08 1999  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/makeinfo.c: Make --html imply --no-split.
+
+	* makeinfo/cmds.c (cm_top): don't core dump if the top node has no
+ 		next.
+
+	* makeinfo/makeinfo.c (replace_with_expansion): compare length
+		after expansion with length of full input text before
+		expansion, not just the length of the expanded text.
+                Bug (contents2) reported by kama.
+
+	* info/infodoc.c (create_internal_info_help_node): gettext calls
+		to help msg strings. From Ulrich.
+
+Fri Feb  5 17:35:13 1999  Karl Berry  <karl@gnu.org>
+
+	* util/texi2dvi: set makeinfo= for latex case.
+
+	* doc/texinfo.txi (@deftp summary): ref Data Types node that
+		actually describes it.  From kama.
+
+Thu Feb  4 07:39:10 1999  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/makeinfo.c: Take it back.  Emacs info needs that text
+ 		before the CTRL-_.
+	* makeinfo/makeinfo.c: Don't bother to output the header (This is
+ 		-, produced ...) to stdout.
+
+	* doc/texinfo.txi (Other Info Directories): Mention that dir files
+ 		must be named dir.
+
+	* makeinfo/makeinfo.c (cm_uref): implement optional third
+ 		argument.
+	* doc/texinfo.txi (uref): document it.
+	Suggestion from: Charles Karney <karney@pppl.gov>
+
+	* doc/Makefile.am (info_TEXINFOS): put texinfo.txi first so
+		UPDATED reflects its modtime, rather than info-stnd's.
+
+	* makeinfo/files.c (full_pathname) [!WIN32]: #endif in wrong place.
+	From: Yoshiki Hayashi <g740685@komaba.ecc.u-tokyo.ac.jp>
+
+	* makeinfo/cmds.c (cm_url): Remove URL: from output.  It's ugly.
+
+Wed Feb  3 16:05:03 1999  Karl Berry  <karl@gnu.org>
+
+	* info/infodoc.c: Doc fix, zero not oh.
+
+	* makeinfo/makeinfo.c (add_char): don't ignore if
+		only_macro_expansion, even in no_headers case.
+		Otherwise menu items don't get remembered and defaulting
+		doesn't work.  Macros suck!
+
+	* util/texi2dvi (common): include orig_pwd.
+	(language): reguess for each file if not explicitly set.
+
+Tue Feb  2 16:22:32 1999  Karl Berry  <karl@gnu.org>
+
+	* configure.in: Bump to 3.12d now.
+
+Mon Feb  1 14:46:45 1999  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/insertion.c (cm_item): For itemize and enumerate, do
+		</p> before the <li> for html. Bug from Eli.
+
+	* makeinfo/index.c: Installed change in index.c:
+	Mon Dec 28 12:50:14 1998  Matthew Fredette  <fredette@mit.edu>
+		* makeinfo.c (index_add_arg): Use xstrdup on input_filename
+		when saving it in the new index entry.
+
+	* util/texi2dvi: cd / before cd $orig_pwd in case of DOS drive
+ 		change.
+
+Sun Jan 31 16:39:01 1999  Karl Berry  <karl@gnu.org>
+
+	* util/texi2dvi: Used sed to expand only the @{if,}tex parts of
+	the source since makeinfo's conditional options aren't ready yet
+		(from Akim).
+	Also use ${1+"$@"} for Digital Unix "$@" expansion bug (from Noah).
+
+	* util/install-info.c: Doc fix from Eli.
+
+	* doc/texinfo.txi: Oops, said we looked for .png twice.
+
+Sat Jan 30 17:18:14 1999  Karl Berry  <karl@gnu.org>
+
+	* info/session.c (forward_move_node_structure): remove tangled
+	code to merely print words instead of numbers; too hard to translate.
+
+	* info/session.c: Missing _'s for more i18n.  From Trond.
+
+	* doc/Makefile.am (EXTRA_DIST): Include txi-no.tex from Trond.
+
+Sun Jan 24 09:28:12 1999  Karl Berry  <karl@gnu.org>
+
+	* Makefile.am (EXTRA_DIST): Use djgpp by itself instead of listing
+		each file separately (new feature in automake 1.4).
+
+	* makeinfo/insertion.c (begin_insertion): for quotation, always
+		increment current_indent even if html output, why not.
+		(Otherwise must not decrement current_indent in end_insertion.)
+
+	* doc/texinfo.txi: More overfull box fixes.
+
+	* makeinfo/insertion.c: Add some assertions and the beginnings of
+ 		handling @tex.
+
+	* doc/texinfo.txi: Fix overfull boxes, but tables of contents at
+ 		the front.
+
+	* util/texi2dvi: Can't pass --no-ifinfo --iftex to makeinfo yet,
+ 		it's not ready.
+
+Sat Jan 23 10:22:16 1999  Karl Berry  <karl@gnu.org>
+
+	* util/texi2dvi: Pass --no-ifinfo --iftex to makeinfo.
+
+Fri Jan 22 19:09:49 1999  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi: Include version.texi before @settitle so
+ 		@value{VERSION} gets expanded in the html title.  From kama.
+
+	* These patches from Tim Singletary <talon@clark.net>.
+	* makeinfo/makeinfo.c: Simplify and improve html menus.
+	* makeinfo/insertion.c (begin_insertion): simplify html menu case
+ 		and set had_menu_commentary.
+	* makeinfo/insertion.h (had_menu_commentary): declare new global.
+	* makeinfo/node.h (glean_node_from_menu): declare.
+	* makeinfo/node.c (glean_node_from_menu): new arg to specify what
+ 		type of reference to remember as.
+
+	Date: Sun, 29 Nov 1998 09:21:01 -0500 (EST)
+	From: Tim Singletary <tsingle@talon.clark.net>
+	To: texinfo-pretest@tug.org
+	Subject: explanation of previous patches
+
+	> These diffs introduce some non-trivial changes into very
+	> sensitive parts of makeinfo, and it is hard to judge them without
+	> knowing what exactly do they solve.
+
+	At a high level, these patches fix (or at least significantly improve)
+	the html conversion of menus.  Specifically, they fix bugs in the
+	conversion of menu commentary and detailmenu entries.
+
+	The menu commentary fixes require some justification:  The unpatched
+	makeinfo attempts, with many bugs, to place menu commentary outside
+	the <menu> by adding </ul> and <ul> tags.  While I understand the
+	motivation for this, that there might be browsers that don't support
+	<p> within <menu>, I'm not aware of any such browser and don't see any
+	compelling reason to continue the </ul> kludge.
+
+	Certainly
+			<menu>
+			<li>First paragraph.
+			 <p>Second paragraph.
+			<li>Second item.
+			</menu>
+	is valid html!
+
+	Anyway, here's what my patches do:
+
+	1) Deleted the `<h4>Menu</h4>' at the beginning of each menu.  Using
+	   `<h4>' is wrong since menus don't usually come after an `h3'
+	   header.  `<b>' looks the same on most browsers, but my opinion is
+	   that there's no need for any header at all!
+
+	2) Deleted the `<li>' kludge at the begining of each menu.  It's no
+	   longer needed since I'm deleting the </ul> kludge.
+
+	3) Replace `in_menu_para', declared static in makeinfo.c:add_char()
+	   with `had_menu_commentary', declared globally.  Modified
+	   insertion.c:begin_insertion() to initialize had_menu_commentary to
+	   1 when beginning a menu.  Now there's enough state information for
+	   menu commentary to be processed within <menu> ... </menu>; the
+	   commentary can be seperated from the rest of the menu by bracketing
+	   it between <p>'s.
+
+	   Note that the first patch had a bug initializing
+	   had_menu_commentary; the second patch fixes this bug.
+
+	4) Changed the semantics of the argument to
+	   node.c:glean_node_from_menu().  Previously, glean_node_from_menu()
+	   only called remember_node_reference() when the argument was
+	   non-zero.  But add_char() didn't call `glean_node_from_menu(1)'
+	   when processing detailmenu entries.  In other words, detailmenu
+	   entries didn't get registered as references, which lead to the html
+	   conversion of detailmenu entries not producing proper hrefs!
+
+	   The new semantics are that glean_node_from_menu always calls
+	   remember_node_reference(), but calls it with `menu_reference' when
+	   the first arg to glean_node_from_menu() is 1 and with
+	   `followed_reference' otherwise.  Now, detailmenu entries get
+	   registered as `followed_reference' (normal menu entries still get
+	   registered as `menu_reference') and the html conversion produces
+	   proper hrefs.
+
+	5) The above changes made it possible to streamline the section of
+	   add_char() that deals with html menu text.
+
+	6) In an otherwise unrelated change, rewrote a section of
+	   glean_node_from_menu to no longer use `goto save_node;'.
+
+
+Thu Jan 21 12:55:42 1999  Karl Berry  <karl@gnu.org>
+
+	* doc/info-stnd.texi: OK, let's try restoring the @include
+ 		version.texi with the new automake.
+
+	* makeinfo/cmds.c: Improve HTML @pounds, @bullet, etc.
+
+	* doc/Makefile.am (install-tex): new target.
+	(EXTRA_DIST): Include txi-??.tex.
+	txi-de.tex: new file from kama.
+
+	* Makefile.am (AUTOMAKE_OPTIONS): Bump to 1.4.
+	(install-tex): new target.
+
+	* util/texi2dvi: Restore "$@" for explicitness in main loop.
+
+	* doc/Makefile.am (*.1) [TEXINFO_MAINT]: Conditionalize.
+
+	* configure.in (AC_PREREQ): Bump to 2.13.
+	(TEXINFO_MAINT): Define this AM_CONDITIONAL.
+
+	* doc/texinfo.txi: Document that the HTML output name is derived
+ 		from @setfilename.
+
+	* makeinfo/makeinfo.c (convert_from_loaded_file): Use @setfilename
+		for basename of html output.
+
+	* doc/texinfo.txi (url): Use example.org for the example.
+
+	* makeinfo/cmds.c (cm_url): @url should not produce a link, sorry
+ 		to say.
+
+Wed Jan 20 16:31:55 1999  Karl Berry  <karl@gnu.org>
+
+	* util/texindex.c,
+	* util/install-info.c,
+	* makeinfo/makeinfo.c,
+	* info/info.c: It's 1999.
+
+	* doc/info.texi (Advanced info commands): Fix typos from Gildea.
+
+	* makeinfo/makeinfo.c (end_of_sentence_p): don't check negative
+		array offset.
+	From: Enrico Scholz <enrico.scholz@wirtschaft.tu-chemnitz.de>
+
+Sun Jan 17 16:42:16 1999  Karl Berry  <karl@gnu.org>
+
+	* util/texi2dvi: Restore --batch, handle changing escape character
+		more cleanly.  From Akim (as always).
+
+Thu Jan 14 16:47:41 1999  Karl Berry  <karl@gnu.org>
+
+	* configure.in (ALL_LINGUAS): Add no.
+	From: Trond Endrestol <trond@agamemnon.gtf.ol.no>
+
+	* util/texi2dvi: Doc fix from Akim and do not always exit 1 from trap.
+	And it's 1999.
+
+	* doc/texinfo.txi (image): Document imagename.pdf.
+
+	* Apply this change from Eli:
+
+  1998-11-20  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	  * makeinfo/makeinfo.h (meta_char_pos): New variable.
+	  * makeinfo/makeinfo.c (init_paragraph): Initialize it.
+	  (add_char): Use META to create a non-breakable space character.
+	  (add_meta_char): New function.
+	  (end_of_sentence_p): Don't handle characters at meta_char_pos as
+	  normal sentence enders.
+	  (flush_output): Only unMETA the non-breaking space character.
+	  Reset meta_char_pos to zero.
+	  (do_flush_right_indentation): Call adjust_braces_following.
+	  (indent): Likewise.
+	  (cm_value): Save and restore the value of meta_char_pos.
+	  (expansion): Likewise.
+	  * makeinfo/macro.c (me_execute_string_keep_state): Save and
+	  restore the value of meta_char_pos.
+	  * makeinfo/node.c (cm_node): Save and restore the value of
+	  meta_char_pos.
+	  * makeinfo/cmds.c (cm_accent): Make the dot we add due to
+	  @dotaccent be a meta-character.
+	  (cm_code, cm_dfn): Call add_meta_char to insert the closing
+	  quote.
+	  (cm_cite): Call add_char instead of add_word.
+
+Thu Jan  7 18:04:26 1999  Karl Berry  <karl@gnu.org>
+
+	* util/texi2dvi: Handle pdf files more cleanly.  From Akim.
+
+Wed Jan  6 17:49:11 1999  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/makeinfo.c (cm_image): Check for .png also.
+
+Sun Dec 20 07:54:47 1998  Karl Berry  <karl@gnu.org>
+
+	* util/texi2dvi: Add --pdf.
+
+	* util/texi2dvi: New option -@ to use @input and @nonstopmode, in
+		case texinfo is preloaded.
+	From: Khimenko Victor <khim@sch57.msk.ru>
+	Date: Sun, 20 Dec 1998 02:04:12 +0300 (EET)
+
+Sat Dec 19 17:37:37 1998  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi (Multitable Column Widths): leading zero ok for
+ 		@columnfractions.
+
+	* util/texi2dvi: New version from Akim, plus --quiet is like
+ 		--batch, etc.
+
+Fri Dec 18 17:22:44 1998  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi: Document that the Texinfo source can't be
+	arbitrarily ordered (for print) even if all pointers are supplied.
+
+	* makeinfo/insertion.c (end_insertion): In itemize case,
+		close_insertion_paragraph so @end itemize cause a line break.
+        Report from: Sergei Pokrovsky <pok@nbsp.nsk.su>
+        Date: Sun, 22 Nov 1998 19:45:21 +0700 (GMT)
+
+Tue Dec 15 16:21:51 1998  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi: More fixes from Oleg.
+
+	* configure.in: Bump version to 3.12c for next pretest.
+
+	* util/install-info.c (open_possibly_compressed_file)
+		[STRIP_DOT_EXE]: logic for compression_program assignment
+		was reversed.
+	From: wlestes@wlestes.uncg.edu
+
+Sat Dec 12 18:02:48 1998  Karl Berry  <karl@gnu.org>
+
+	* Merged these changes from Andreas:
+
+1998-12-06  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* makeinfo/node.c (cm_node): When searching for @menu don't
+	require a space after it.
+
+1998-12-06  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* makeinfo/cmds.c (cm_top): free top_name only after done using it.
+
+Sat Dec 12 15:40:13 1998  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi: Various typos and fixes from Oleg.
+
+	* doc/texinfo.txi: Move @node's outside of @ifinfo for the sake of
+ 		HTML processing.
+
+	* doc/texinfo.txi (titlepage): @pxref was not in parens.  From Oleg.
+
+Sun Dec  6 16:49:09 1998  Karl Berry  <karl@gnu.org>
+
+	* dir-example: Amd is now am-utils.
+
+	* doc/Makefile.am: Reinstate help2man invocations for development.
+
+	* doc/texinfo.txi: Document @set...contentsaftertitlepage (from kama).
+	Fix incorrect sense for @image and Hungariam typo (from Oleg).
+
+	* lib/system.h: #include libintl.h here instead of acconfig.h, so
+		the system include files have a chance to #define NULL
+		before it does.
+	* acconfig.h: Remove libintl.h and #defines from here.
+	From: "Philippe De Muyter" <phdm@macqel.be>
+	Date: Fri, 4 Dec 1998 00:56:25 +0100 (CET)
+
+	* info/signals.c: Start #ifdef's in column one for cc on sysv68
+		(m68k-motorola-sysv).
+	From: "Philippe De Muyter" <phdm@macqel.be>
+	Date: Fri, 4 Dec 1998 00:56:25 +0100 (CET)
+
+	* info/filesys.c (is_dir_name): use strcpy instead of automatic
+		array initialization.
+	From: "Philippe De Muyter" <phdm@macqel.be>
+	Date: Fri, 4 Dec 1998 00:56:25 +0100 (CET)
+
+	* configure.in (ALL_LINGUAS): add ru.
+
+Fri Dec  4 08:12:11 1998  Karl Berry  <karl@gnu.org>
+
+	* info/infodoc.c: Gettextize the help buffer string.
+
+Sun Nov 29 17:12:35 1998  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi: Use @ifnottex rather than @ifinfo for @top.
+	(makeinfo top): document this.
+
+	* doc/info-stnd.texi,
+	* doc/info.texi: Use @ifnottex rather than @ifinfo for @top.
+
+	* makeinfo/insertion.c (cm_menu): Implicitly insert @top command
+        so we can construct the node tree as usual when we see @menu
+ 	before @node.  Probably this is when the input uses
+ 	@ifinfo instead of @ifnottex, as virtually all existing
+ 	manuals do.
+
+	* makeinfo/insertion.c (discard_insertions): Let any conditional
+	cross node boundary.  (So the @top node can be wrapped
+	in @ifnottex, for example.)
+
+	* Installed these:
+
+1998-11-21  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/makeinfo.c (expansion): Save and restore
+	last_inserted_character and last_char_was_newline.
+
+	* makeinfo/cmds.c (cm_dircategory): Kill any indentation before
+	INFO-DIR-SECTION.  install-info relies on this.
+
+1998-11-20  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/multi.c (struct env): Add meta_char_pos member.
+	(select_output_environment): Save and restore meta_char_pos.
+	(out_char): Output characters by switching environment to #0 and
+	calling insert.  Call flush_output when a newline is output.
+	(output_multitable_row): Update the current environment's
+	output_paragraph_offset as well, after removing trailing
+	whitespace.  Fix typo in loop index.
+	(do_multitable): Call close_single_paragraph.
+	(end_multitable): Call close_insertion_paragraph.  Don't output
+	an extra newline.
+
+1998-11-20  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/makeinfo.h (meta_char_pos): New variable.
+	* makeinfo/makeinfo.c (init_paragraph): Initialize it.
+	(add_char): Use META to create a non-breakable space character.
+	(add_meta_char): New function.
+	(end_of_sentence_p): Don't handle characters at meta_char_pos as
+	normal sentence enders.
+	(flush_output): Only unMETA the non-breaking space character.
+	Reset meta_char_pos to zero.
+	(do_flush_right_indentation): Call adjust_braces_following.
+	(indent): Likewise.
+	(cm_value): Save and restore the value of meta_char_pos.
+	(expansion): Likewise.
+	* makeinfo/macro.c (me_execute_string_keep_state): Save and
+	restore the value of meta_char_pos.
+	* makeinfo/node.c (cm_node): Save and restore the value of
+	meta_char_pos.
+	* makeinfo/cmds.c (cm_accent): Make the dot we add due to
+	@dotaccent be a meta-character.
+	(cm_code, cm_dfn): Call add_meta_char to insert the closing
+	quote.
+	(cm_cite): Call add_char instead of add_word.
+
+Sun Nov 29 16:30:06 1998  Karl Berry  <karl@gnu.org>
+
+	* info/info.h,
+	* info/footnotes.h (FOOTNOTE_LABEL),
+	* info/indices.c (APROPOS_NONE): Use N_ rather than _.
+
+	* info/infodoc.c (create_internal_info_help_node,
+	function_documentation): Do not translate the empty string.
+	Date: Fri, 25 Sep 1998 15:09:42 +0400
+	From: "Oleg S. Tihonov" <tihonov@ffke-campus.mipt.ru>
+
+	* doc/info-stnd.texi: Mention PRIOR as another alias for
+ 		PREVIOUS/PageUp.
+
+	* doc/texinfo.txi: @emph produces _emph_ not *emph*.  Spurious
+		junk before makeinfo bison example.
+	From: tihonov@ffke-campus.mipt.ru.
+
+1998-11-16  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/defun.c (defun_internal): Don't expand the arguments to
+	@defun and its ilk.
+
+	* makeinfo/makeinfo.c (expansion): Copy the name of the currently-
+	executing command and restore it after expansion.
+
+Sun Nov 15 17:40:51 1998  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/makeinfo.c: Rearrange usage, allow -v for verbose, only
+		output `Making' line when verbose.
+	* makeinfo/makeinfo.h (process_html, process_info, process_tex):
+ 		declare.
+	* makeinfo/cmds.c: Use conditional commands.
+	* makeinfo/insertion.c (find_type_from_name): Handle rawhtml and
+ 		rawtex.
+	(conditional commands): Allow individual switching on and off.
+
+	* makeinfo/insertion.h: Declare conditionals.
+
+1998-11-14  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/insertion.c (begin_insertion, end_insertion): Use <pre>
+	to convert @display and @smalldisplay into HTML.
+
+	* makeinfo/cmds.c (cm_asterisk): Don't insert an extra newline in
+	HTML mode, since input includes a newline right after the @*.
+	(cm_sp): Output "<br><p>\n" as many times as the argument says.
+	(cm_url): Don't include "<a href=" in the anchor text in HTML
+	output.
+
+	* makeinfo/makeinfo.c (cm_pxref): Don't add a period after @pxref
+	if in HTML mode.
+	(get_rest_of_line): Accept an additional argument EXPAND, and
+	expand the rest of line if it's non-zero.  All callers changed.
+	(close_paragraph): When in HTML mode, honor the formatting of the
+	source paragraphs by generating "<p>" for every closed paragraph;
+	follow it by as many "<p>"'s as paragraph_spacing specifies.
+
+Sat Nov 14 17:38:27 1998  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/insertion.c: Use <ul compact> instead of deprecated <menu>.
+	Omit extra <li> after the menu beginning.
+
+	* makeinfo/index.c: Use <ul compact> instead of deprecated <menu>.
+
+Thu Nov 12 16:33:09 1998  Karl Berry  <karl@gnu.org>
+
+	* Makefile.am (EXTRA_DIST): add djgpp/config.sed.
+
+	* info/terminal.c: #include <sys/ioctl.h> to define TIOCGWINSZ
+ 		under LynxOS.  From: Marius Groeger <mag@sysgo.de>.
+
+1998-11-06  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* makeinfo/insertion.c (begin_insertion): Correctly handle
+	ifnottex and ifnothtml.
+	(end_insertion): Likewise.
+
+Sun Nov  8 17:30:23 1998  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/index.c,
+	* makeinfo/insertion.c: Menu is special to Info.
+	* makeinfo/node.c: Top is a special name, don't translate it.
+	* info/session.c (info_top_node): Top is a special name, don't
+		translate it.
+	From: "Oleg S. Tihonov" <tihonov@ffke-campus.mipt.ru>.
+
+Fri Nov  6 17:18:43 1998  Karl Berry  <karl@gnu.org>
+
+	* configure.in: Version 3.12b.
+
+	* util/texi2dvi: Fixes from Eli and Christoph Martin.
+
+	Mon Oct  5 13:58:53 1998  Dave Glowacki  <dglo@ssec.wisc.edu>
+	* util/install-info.c: Fix off-by-one error in findlines()
+
+	* util/texindex.c (usage): avoid trigraph until Ulrich fixes
+ 		po2tbl.sed.in.  From Paul Eggert.
+
+1998-11-03  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/makeinfo.c (cm_xref): Don't bypass the test that an
+	xref ends with a period or a comma if the reference has a single
+	argument.
+
+1998-10-31  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/insertion.c (end_insertion): Don't decrement
+	in_fixed_width_font when leaving a menu, the previous value is
+	restored by pop_insertion.
+
+	* makeinfo/makeinfo.c (add_char): Don't increment output_column
+	twice when a newline is inserted into the output.
+
+	* doc/texinfo.txi (emph & strong): Document the use of underscores
+	for @emph in the Info output.
+
+1998-10-30  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* djgpp/config.bat: Make sure intl/po2tblsed.in exists before we
+	begin the configure boogie.
+	* djgpp/config.sed: Sed script, to be run by config.bat.
+
+	* doc/info-stnd.texi (Node Commands): Document the new G command.
+
+	* info/session.c (info_follow_menus): Step over a possible leading
+	space in a menu entry in menus[].
+	(split_list_of_nodenames): Renamed from split_words.  Split the
+	string on commas, not on spaces, since a menu entry can have
+	embedded whitespace.  Get past the null byte after inserting it.
+	(info_menu_sequence): Don't crash if there's no DIR node; try
+	using Top of the current Info file, and if that doesn't work
+	either, throw an error.
+
+	* util/texi2dvi: Use $path_sep in TEXINPUTS.  Don't include any
+	dots in $tmpdir, 8+3 filesystems won't like that.
+
+	* makeinfo/makeinfo.c (reader_loop): Expand any macros in a menu
+	entry when creating a <menu> item for HTML.  Fix an off-by-one
+	error in counting input lines.
+
+	* makeinfo/files.c (expand_filename): Don't treat .foo/bar as
+	absolute file name.
+
+	* makeinfo/makeinfo.c (add_char): Use strncpy instead of memcpy,
+	since the buffers overlap.  If the line being refilled includes
+	nothing but the indentation and the word being added, do NOT add
+	an extra newline.
+
+	* util/install-info.c (strip_info_suffix, menu_item_equal,
+	open_possibly_compressed_file) [__MSDOS__]: Allow .inz and .igz as
+	suffuxes for compressed files.
+	(open_possibly_compressed_file): Return an indication whether we
+	opened a file or a pipe.  Use FOPEN_RBIN from system.h.
+	[STRIP_DOT_EXE]: Use gzip.exe with an explicit .exe extension.
+	[O_BINARY]: If the file is not compressed, switch its stream to
+	text mode.
+	(readfile): Close the file or the pipe.
+	(output_dirfile): Call pclose to actually run the compressor.
+
+Thu Nov  5 08:33:06 1998  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi: effect -> affect
+	From: Eric Hanchrow <offby1@blarg.net>
+
+Tue Nov  3 14:26:59 1998  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/makeinfo.c (cm_image): Allocate enough space for the
+ 		zero byte.
+
+	* doc/texinfo.txi: Document epsf.tex standard location.
+
+Tue Oct 27 10:45:47 1998  Karl Berry  <karl@gnu.org>
+
+	* Makefile.am (TEXINFO_TEX): add definition.
+
+	* doc/info-stnd.texi: Avoid unnecessary overfull boxes from
+ 		examples.
+
+	* doc/Makefile.am (install-data-local): missing ".
+
+	* doc/Makefile.am: Don't try to run help2man in distribution.
+
+Mon Oct 26 13:43:53 1998  Karl Berry  <karl@gnu.org>
+
+	* configure.in (TEXMF): lose this whole block.  It is too painful
+		to maintain with the different tex installations out there.
+
+	* util/Makefile.am (EXTRA_DIST): update-info renamed to
+ 		fix-info-dir.
+
+	* makeinfo/footnote.h: Doc fix.
+
+	* makeinfo/multi.c: #include "insertion.h"
+	* makeinfo/cmds.c: #include "node.h"
+	* makeinfo/makeinfo.h,
+	* makeinfo/makeinfo.c: Move globals, functions for insertions and
+ 		nodes.
+	* makeinfo/defun.c: #include "insertion.h"
+	* makeinfo/Makefile.am: Add insertion.[ch], node.[ch].
+	* node.[ch], insertion.[ch]: New files.
+
+	* makeinfo/makeinfo.c,
+	* makeinfo/makeinfo.h: Move globals for cmds.h.
+	* makeinfo/index.h: Include cmds.h.
+	* makeinfo/Makefile.am (makeinfo_SOURCES): Add cmds.h, cmds.c.
+	* cmds.c, cmds.h: New files.
+
+Sat Oct 24 17:28:14 1998  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/makeinfo.c,
+	* makeinfo/makeinfo.h: Globals for files.c.
+	* makeinfo/Makefile.am (makeinfo_SOURCES): add files.[ch].
+
+Tue Oct 20 17:03:10 1998  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/Makefile.am (makeinfo_SOURCES): add macro.c and
+ 		macro.h.
+	* makeinfo/makeinfo.c: Move macro code to macro.h and macro.c.
+	* makeinfo/makeinfo.h: Move macro stuff to macro.h, expose global
+		last_char_was_newline for macro.c.
+	* makeinfo/index.c,
+	* makeinfo/footnote.c: #include macro.h.
+
+Wed Oct  7 16:24:07 1998  Karl Berry  <karl@gnu.org>
+
+	* doc/info-stnd.texi: For now don't include version.texi due to
+ 		automake error.
+
+	* makeinfo/index.h: #include makeinfo.h for sake of COMMAND type.
+	* makeinfo/index.c: No need to include makeinfo.h, index.h does
+ 		now.
+
+	* makeinfo/makeinfo.c: Move footnote code to footnote.c.
+	* makeinfo/makeinfo.h: Globals for footnote.c.
+	* makeinfo/Makefile.am (makeinfo_SOURCES): add footnote.[ch].
+
+	* makeinfo/makeinfo.c: Move defun code to defun.c, necessary
+ 		global to makeinfo.h.
+	* makeinfo/makeinfo.h (default_indentation_increment): move here
+ 		for defun.c.
+	* makeinfo/Makefile.am (makeinfo_SOURCES): add defun.c.
+
+	* Makefile.am: Doc fix.
+
+	* configure.in (AC_OUTPUT): generate makeinfo/tests/Makefile.
+
+	* makeinfo/makeinfo.c,
+	* makeinfo/makeinfo.h,
+	* makeinfo/Makefile.am (makeinfo_SOURCES): add index.[ch].
+
+Fri Oct  2 17:42:26 1998  Karl Berry  <karl@gnu.org>
+
+	* lib/system.h (STREQ): new macro.
+
+Thu Oct  1 09:26:57 1998  Karl Berry  <karl@gnu.org>
+
+	* doc/texinfo.txi: Delete spare copy since out of date,
+	add makeinfo html to menu,
+	detailmenu doesn't take braces in summary.
+
+Wed Sep 30 14:38:21 1998  Karl Berry  <karl@gnu.org>
+
+	* makeinfo/makeinfo.c: Remove != NULL comparisons,
+	xmalloc/xrealloc casts, assignments in if statements.
+
+Wed Sep 30 14:16:01 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c: Remove NULL casts and parentheses in return
+ 		statements.
+
+	* makeinfo/makeinfo.c (add_link): Don't add a link if the node is null.
+ 	(reader_loop): don't glean_node_from_menu if detailmenu, even if html.
+	Various formatting changes.
+
+	* doc/help2man: Always exit successfully.
+
+	* makeinfo/Makefile.am (SUBDIRS): add.
+	(makeinfo_SOURCES): no more html.h.
+
+Fri Sep 11 18:47:15 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c: Fiddle with html output.
+
+1998-09-07  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/makeinfo.c (maybe_update_execution_strings): Only
+	reallocate TEXT if the existing storage is too small, otherwise
+	leave TEXT alone.
+	(replace_with_expansion): Call maybe_update_execution_strings to
+	reallocate input_text if we are executing_string, since storage
+	for execution_string is assumed to be large enough to hold every
+	possible string.
+	(me_execute_string): xstrdup the argument, so callees could freely
+	relocate it as needed.
+
+1998-09-06  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/makeinfo.c (replace_with_expansion): Don't remember
+	macro-expansion pointers if we are executing_string.
+
+1998-09-05  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* info/filesys.c (info_suffixes): Put the empty suffix last in the
+	list, so that `foo.info' is found before `foo', if both exist.
+
+1998-09-05  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/makeinfo.c (maybe_update_execution_strings): New
+	function, updates an entry in execution_strings[] array after
+	input_text is relocated by replace_with_expansion.
+	(replace_with_expansion): Call it.
+
+1998-09-04  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/makeinfo.c (expand_macro): If a macro is called with
+	too many arguments, return NULL and print the line number where
+	the call begins.
+	(execute_macro): If expand_macro returns NULL, return
+	immediately.
+
+Sun Sep  6 19:11:28 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c,
+	* makeinfo/makeinfo.h,
+	* makeinfo/multi.c: Html output.  Specifically, these changes:
+
+    Fri Jul  4 22:58:29 1997  Dave Love  <d.love@dl.ac.uk>
+
+	     * doc/makeinfo.texi: Document HTML output.
+
+	     * makeinfo/makeinfo.c: Wrap strings in _() in bits changed for
+	     HTML.
+	     (cm_image): Generate <img> for HTML.
+
+    Sun Jun 22 22:50:07 1997  Dave Love  <d.love@dl.ac.uk>
+
+	    * makeinfo/makeinfo.c (NAMED_NODE_ANCHORS): New define.
+	    (title, outstanding_node, node_number, node_node_references,
+	     escape_html, ifinfo_as_html): New variables.
+	    (tentry.number, node_ref.number, fn.number): New fields.
+	    (CommandTable): Various additions and alterations for HTML.
+	    (long_options): Add html and no-info-as-html.
+	    (main): Extra code for HTML.
+	    (usage): Add HTML stuff.
+	    (expand_filename): Deal with .html.
+	    (escape_string): New procedure.
+	    (convert_from_loaded_file): Extra code for HTML.
+	    (init_internals): Call free_node_references, initialize
+	    node_number.
+	    (reader_loop): Process menu items for HTML hyperlinks.  Escape
+	    HTML special characters.
+	    (add_char): Code for line breaks and paragraph insertions in
+	    HTML.
+	    (flush_output): Don't UNMETA for HTML.
+	    (indent): Do nothing for HTML.
+	    (current_item_function): Case for ifhtml.
+	    (begin_insertion): Deal with HTML in various cases.
+	    (insert_html_tag): new procedure.
+	    (cm_asterisk, cm_copyright, cm_accent, cm_code, cm_kbd,
+	    cm_angle_brackets, cm_var, cm_defn, cm_var, cm_emph, cm_string,
+	    cm_cite, cm_top, cm_xref, cm_inforef, cm_uref, cm_direntry,
+	    cm_ifinfo, cm_item, process_defun_args, defun_internal, cm_sp,
+	    cm_dircategory, cm_center, cm_result, cm_expansion, cm_error,
+	    cm_exdent, index_add_arg, make_index_entries_unique,
+	    cm_printindex, cm_footnote, output_pending_notes,
+	    me_execute_string): Code for HTML.
+	    (cm_shyph): New procedure.
+	    (cm_special_char): Add start, end args.  Code for HTML.
+	    (cm_email, cm_url, cm_i, cm_b, cm_r): New procedures.
+	    (sectioning_html): New procedure.
+	    (sectioning_underscore): Use it.
+	    (add_link): New procedure.
+	    (remember_node): Add number field and update node_number.  Note
+	    next, etc. nodes for HTML.
+	    (add_escaped_anchor_name, add_anchor_name): New procedures.
+	    (cm_node): New code for HTML.  Move some other code to more
+	    useful place.
+	    (remember_node_reference): Add number field and update
+	    node_number.
+	    (remember_node_node_reference, free_node_node_references,
+	    number_of_node): New procedures.
+	    (cm_ifhtml, cm_html): New procedures.
+	    (expansion): Take care of HTML escaping.
+	    (cm_settitle): New procedure.
+	    (remember_note): Set number field.
+
+	    Declare various procedures in advance.
+
+	* doc/texinfo.txi: Makeinfo --html documentation from Dave Love.
+	Typo fixes from: Paul DuBois <dubois@primate.wisc.edu>.
+
+Thu Sep  3 11:11:01 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/Makefile.am (makeinfo_SOURCES): add html.[ch].
+
+1998-08-28  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/makeinfo.c (cm_uref, cm_email): Use get_xref_token to
+	gather arguments.
+	(get_xref_token): Keep track of input line number when expanding
+	xref arguments.
+
+Tue Aug 25 14:36:44 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* util/texi2dvi: Exit the script if TeX exits with bad status.
+
+1998-08-16 Eli Zaretskii <eliz@is.elta.co.il>
+
+	* info/indices.c (info_index_apropos): In the *Apropos*
+	menu, print the label first, then the Info file name and
+	the node name.  Make the Info file name part of the menu
+	entry, so that all entries are distinct.
+	(apropos_in_all_indices): Scan each Info file only once, thus
+	avoiding multiple identical entries in the *Apropos* menu.
+	Free xstrdup'ed buffer, to avoid leaking memory.
+
+Thu Aug 13 12:54:58 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* configure.in: Set version to 3.12a.
+
+	* Makefile.am (AUTOMAKE_OPTIONS): bump required version to 1.3,
+ 		add readme-alpha option.
+
+	* util/texindex.c (program_name),
+	* util/install-info.c (progname),
+	* info/info.c (program_name),
+	* makeinfo/makeinfo.c (progname): hardwire per coding standards.
+	* doc/help2man: Remove ginfo special case.
+
+Tue Aug 11 17:41:15 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* util/gen-dir-node: New version from drk@sgi.com.
+
+Mon Aug 10 13:55:37 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* dir-example: Add entries from Linux.
+
+	* info/info-utils.c (get_window_of_node): New fn.
+	* info/info-utils.h (get_window_of_node): New fn.
+	* (strchr,...) [!HAVE_STRCHR]: remove these #defines.
+	* info/infodoc.c (info_find_or_create_help_window): Call
+		get_window_of_node instead of get_internal_info_window.
+	This is so pressing ? repeatedly will always get to the same Help
+		window instead of popping up new ones.
+	From: "Brian J. Fox" <bfox@prospero.datawave.net>
+
+	* info/signals.c: Ignore SIGWINCH if we're in the midst of it.
+	We might get a whole lot of them.  Noticed on Afterstep.
+	From: "Brian J. Fox" <bfox@prospero.datawave.net>
+
+1998-07-25  Bruno Haible  <bruno@linuix.math.u-bordeaux.fr>
+
+        * install-info.c (findlines): Allocate room for one more line,
+        to avoid crash if dir file has exactly 512 lines.
+
+Tue Aug  4 07:14:35 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* info/info.c: Improve help message.
+
+	* dir-example: Add mtools.
+
+Fri Jul 31 13:29:52 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/help2man: Various hacks for texinfo.
+
+	* doc/texinfo.txi: Make dir entries more consistent.
+
+	* doc/Makefile.am: Generate man pages with help2man.
+
+	* util/texi2dvi,
+	* util/install-info.c,
+	* makeinfo/makeinfo.c,
+	* util/texindex.c: Improve help message.
+
+	* doc/info.5: Initial.
+	* doc/texinfo.5: Section 5.
+
+Thu Jul 30 17:31:42 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/info-stnd.texi,
+	* doc/texinfo.txi: Use Automake-standard VERSION and UPDATED.
+
+Wed Jul 29 17:34:41 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/texinfo.txi: Describe macro limitations a bit more.
+
+	* dir-example: Correct makeinfo link.
+
+Tue Jul 28 16:44:06 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (remember_brace_1): xstrdup command, since
+ 		we free it later.
+
+Mon Jul 27 16:27:30 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* info/session.c (node_printed_rep): New fn.
+	Change calls.
+
+	* info/session.c (info_set_node_of_window): Simplify by taking new
+		argument to say whether to call
+		set_remembered_pagetop_and_point.  Change calls.
+	* info/indices.c: Change call.
+
+	* info/info.c: Rewrite initial menu-sequence following stuff as a
+		function in session.c, and call it.
+
+	* info/infomap.c: Define `G' as info_menu_sequence.
+	* info/session.h (info_menu_sequence, info_follow_menus): declare
+ 		new fns.
+	* info/session.c (info_follow_menus, split_words,
+		* info_menu_sequence): New functions for new command.
+
+Thu Jul 23 16:44:42 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* info/session.c (info_scroll_other_window_backward): new command.
+	* info/infomap.c (initialize_info_keymaps): bind M-DEL and M-prior to
+	scroll-other-window-backward.
+	Report from: Vladimir Alexiev <vladimir@cs.ualberta.ca>
+	Date: 	Tue, 2 Dec 1997 14:54:30 -0700
+
+	* info/info-utils.c (printed_representation): If ISO_Latin_p, show
+		characters as-is.  Don't assume iscntrl(x) returns false
+		for meta characters.
+        Report from: Francois Pinard <pinard@iro.umontreal.ca>
+	Date: 15 Jan 1998 17:48:51 -0500
+
+	* info/pcterm.c (pc_initialize_terminal): now no need to set it
+ 		here.
+	* info/info-utils.c (ISO_Latin_p): set to 1 by default.
+
+	* doc/info-stnd.texi: Document SPC, add goto-node anchor.
+
+Wed Jul 22 18:58:38 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* info/window.c (message_buffer_to_node),
+	* info/session.c (kill_node),
+	* info/nodes.c (info_get_node_of_file_buffer,
+ 		info_node_of_file_buffer_tags),
+	* info/man.c (manpage_node_of_file_buffer),
+	* info/footnotes.c (make_footnotes_node): set display_pos member
+ 		in new node.
+
+Tue Jul 21 14:04:52 1998  Karl Berry  <karl@cs.umb.edu>
+
+        (all of this is to make SPC/DEL not move outside the current
+	        document, i.e., not up through dir)
+	* info/info-utils.h (info_label_was_found): Move from here.
+	* (info_prev_label_of_node): Don't use it any more.
+	* info/session.c (INFO_LABEL_WAS_FOUND): Move to here, add test
+ 		for filename not dir.
+ 	(forward_move_node_structure): Change calls, notice if no more nodes.
+	(backward_move_node_structure): Check for moving outside current
+	document to dir.
+	* info/filesys.c (compression_suffixes): Add bz2 for bunzip2.
+	(is_dir_name): New fn.
+	* info/filesys.h: Declare it.
+	* info/nodes.c (info_get_node, info_find_file_internal): Use it.
+
+	* makeinfo/makeinfo.c: Set in_fixed_width_font to avoid munging
+ 		node names.
+
+Sat Jul 18 17:14:10 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* info/man.c (reap_children): Call wait (NULL), since we don't
+		actually use the return status for anything.  NEXTSTEP 3.3
+		doesn't like an int * even though that is the POSIX
+		specification.
+	Date: Fri, 22 Aug 1997 13:55:42 +0200
+	From: "Felix H. Gatzemeier" <fxg@imib.rwth-aachen.de>
+	Via: Thomas Esser <te@informatik.uni-hannover.de>
+
+	* info/session.c (kill_node): Restore point when we go back.
+
+Thu Jul 16 18:54:04 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (BRACE_ELEMENT): Add `command' to the save
+ 		stack.
+ 	(MAYBE_BRACE_ARGS): New possibility, somewhat like TeX's
+	  next-token-as-argument.
+	(command_table): Use cm_accent and MAYBE_BRACE_ARGS for all accents.
+	(read_command): Implement MAYBE_BRACE_ARGS.
+	(init_brace_stack): save current command.
+	(pop_and_call_brace): restore current command.
+	(cm_accent): move almost all accent characters to after the argument.
+	Suggested by Fran,cois.
+
+	* info/info.c (version_string): Remove defn.
+	Change call for --version option.
+	* info/session.c (display_startup_message_and_start): Just use
+ 		VERSION.
+	* info/info.h (version_string): Remove decl.
+
+Tue Jul 14 16:46:58 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.h: Doc fix.
+
+	* makeinfo/makeinfo.c (validate_file): Don't complain about
+ 		unreferenced anchors.
+
+	* doc/texinfo.txi: Document @anchor.
+
+Sun Jul 12 14:14:50 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (remember_node): Only set `current_node' if
+ 		this is not an anchor.
+
+	* info/nodes.c (get_tags_of_indirect_tags_table): Don't set
+	nodelen to -1 when fixing up the subfile entries, it might be 0
+	from an anchor.
+
+	* info/nodes.c (find_node_of_anchor): Offset display_pos for
+	anchor tags by the amount that node references are off by (- 1).
+
+Sat Jul 11 17:37:18 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (cm_anchor): Add output_column for anchors
+ 		embedded in a line.
+
+Fri Jul 10 16:28:21 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* info/session.c (info_menu_or_ref_item): Don't search for the
+		xref text if it's an anchor.
+	* info/nodes.h (N_FromAnchor): New NODE flag.
+	* info/nodes.c (find_node_of_anchor): New fn.
+	(info_node_of_file_buffer_tags): Handle anchor case.
+
+Wed Jul  8 17:48:59 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* info/window.c (window_set_node_of_window): Set window->point to
+		node->display_pos.
+	Remove unneeded casts.
+
+Tue Jul  7 08:06:14 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (add_word_args) [!VA_SPRINTF]: Use buffer,
+		not the undeclared temp_string.
+	From:     Tobias Naehring <naehring@eeetw3.et.tu-dresden.de>
+	To:       egcs-bugs@cygnus.com
+	Date:     Mon, 6 Jul 98 13:51:55 +0200
+
+Mon Jul  6 17:43:25 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* info/nodes.h (NODE): Add display_pos member.
+
+Sun Jul  5 08:17:43 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* info/nodes.h (INFO_REF_LABEL): Define.
+
+	* util/texi2dvi: Rationalize use of `index' vs. more general
+ 		`xref'.
+
+Thu Jul  2 18:53:43 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c: Don't translate -Footnotes, it's a magic
+ 		cookie.  From Eli.
+
+Wed Jul  1 08:42:41 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/texinfo.txi (url): Missing word `command'.
+
+Tue Jun 30 10:35:48 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* info/info.c: Missing \n in try --help msg.
+
+	* makeinfo/makeinfo.c (cm_anchor): New fn for new cmd.
+	(TAG_FLAG_ANCHOR): New flag for tag entries.
+	(write_tag_table_internal): Handle anchor case.
+	(TAG_FLAG_{{PREV,NEXT,UP}_ERROR,NO_WARN,IS_TOP}): Add TAG_FLAG_ prefix
+	for clarity, change uses.
+
+	* doc/texinfo.txi: Remove warning about footnotes with @item, that
+ 		works now.
+
+Mon Jun 29 10:17:50 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* configure.in (AM_CONFIG_HEADER): Use second argument to be 8.3
+		compliant.
+	* config.h.in: Rename to config.in.
+
+	* info/Makefile.am (EXTRA_DIST),
+	* info/terminal.c [__MSDOS__]: Change #include to pcterm.c and
+		rename file.
+
+Sun Jun 28 14:29:27 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* info/Makefile.am (EXTRA_DIST): Add pc_term.c.
+
+	* makeinfo/makeinfo.c (HAVE_MACROS): Remove this conditional, we
+ 		always want macros now.
+
+	* info/indices.c: Copyright.
+
+1998-06-26  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* makeinfo/makeinfo.c: (only_macro_expansion): New variable,
+	suppresses all expansions except macros.
+	(replace_with_expansion): New function, replaces a portion of
+	input text with its expansion.  Avoids moving the text around if
+	we are positive it will expand into itself.  If the length of the
+	expanded text is the same as the length of the original text, just
+	replaces the original text without moving the rest.  Resyncs the
+	remembered text pointers with the realloc'ed input_text, when it
+	is realloc'ed.
+	(reader_loop): When only_macro_expansion is non-zero, only handle
+	macros, but leave the rest of input intact.
+	(read_command): Now returns an int, zero means no known command or
+	macro is found after the prefix character; all callers changed.
+	Support operation under non-zero only_macro_expansion.
+	(cm_node): Expand only the macros in the @node line.  Allocate and
+	generate the macro-expanded @node line in one swell whoop.
+	(glean_node_from_menu): Expand macros in menu entries.
+	(get_xref_token): A new argument EXPAND, when non-zero, means
+	expand macros in the entire brace-delimited argument before
+	looking for the next comma; all callers changed.
+	(expansion): Save and restore additional state variables important
+	for output generation machinery.  Disable indentation and filling
+	during the recursive expansion, so that the output buffer offset
+	is not invalidated by filling.
+	(me_execute_string_keep_state): New function, calls
+	me_execute_string, but saves and restores state variables
+	important for output generation, so that -E doesn't change the
+	generated Info output.
+	(index_add_arg, cm_footnote): Call me_execute_string_keep_state.
+	(expand_macro): New function, returns the macro expansion as a
+	malloc'ed string.
+	(execute_macro): Call expand_macro.
+	(me_execute_string): Avoid memory leak by freeing input_filename.
+	(get_until_in_braces, replace_with_expansion, add_char,
+	cm_footnote, cm_macro, cm_unmacro, get_brace_args,
+	extract_colon_unit): Use the faster memcpy/memmove instead of
+	strncpy.
+
+Sat Jun 27 14:18:54 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/info.texi: Use @subsubsection instead of
+		@unnumberedsubsubsection, since it's in a numbered chapter.
+
+	* Started installation of following DOS patches from Eli.
+>1998-05-16  Eli Zaretskii  <eliz@is.elta.co.il>
+>
+>	* info/session.c (info_goto_node): Don't show the nodes of the
+>	current Info file twice in *Completions*.
+>	* info/echo-area.c (ea_possible_completions): Actually pass the
+>	number of completions to printf_to_message_buffer.
+>
+>	* info/man.c (manpage_node_of_file_buffer): xstrdup the nodename
+>	member of manpage nodes, since the tags are freed and recomputed
+>	when a new man page is added to *manpages* file_buffer.
+>	(get_manpage_node): Recompute info_windows[]->nodes[] for all
+>	windows showing the man pages after nodes[]->contents are
+>	invalidated by reallocation of file_buffer->contents.
+>
+>1998-05-15  Eli Zaretskii  <eliz@is.elta.co.il>
+>
+>	* lib/system.h (DEFAULT_INFO_PRINT_COMMAND) [__MSDOS__]: Define to
+>	">PRN".
+>	* info/session.c (print_node): Support ">printer" in
+>	INFO_PRINT_COMMAND, to mean write to the named file/device insead
+>	of piping to it as a program.
+>	(kill_node): Compare window in addition to the nodename, when
+>	looking for the node to kill.
+>
+>1998-05-09  Eli Zaretskii  <eliz@is.elta.co.il>
+>
+>	* lib/system.h (SET_SCREEN_SIZE_HELPER) [__MSDOS__]: Define a new
+>	macro.
+>	* info/m-x.c (set_screen_height): Use SET_SCREEN_SIZE_HELPER, if
+>	defined.  If the screen size did'n change, redisplay the previous
+>	screen contents.
+>
+>	* info/infomap.c (initialize_info_keymaps) [__MSDOS__]: Bind DEL
+>	to ea_delete in the echo-area keymap.
+>	* info/session.c (incremental_search): If the key is
+>	isearch_terminate_search_key, but buffered input is pending, don't
+>	gobble the ESC key.
+>
+>	* info/info.c (main): Switch the order thet terminal_prep_terminal
+>	and terminal_clear_screen are called, to make it consistent with
+>	what initialize_info_session does when called with non-zero second
+>	argument.  Call terminal_unprep_terminal last, after moving the
+>	cursor to the bottom of the screen.  If user_filename is of the
+>	form "d:foo", add "d:." to the INFOPATH, not "d:".
+>
+>	* info/signals.c (initialize_info_signal_handler): Save old
+>	SIGUSR1 handler.
+>	(info_signal_handler): Handle SIGUSR1.
+>
+>	* info/indices.c (info_apropos): Print the results to stdout.
+>
+>1998-05-02  Eli Zaretskii  <eliz@is.elta.co.il>
+>
+>	* makeinfo/makeinfo.c (ALSO_NULL_DEVICE): New macro, for alternate
+>	null device name.
+>
+>	* info/man.c (get_manpage_contents): Redirect stderr of the man
+>	page formatter to the null device.
+>	(executable_file_in_path): Use IS_SLASH.
+>
+>	* info/session.c (info_gather_typeahead) [__DJGPP__]: Call
+>	pc_term_chars_avail to get the number of pending characters.
+>
+>	* info/filesys.c (convert_eols): New function, converts DOS-style
+>	EOLs to a single Newline.
+>	(filesys_read_info_file, filesys_read_compressed): Call it.
+>	(filesys_read_compressed) [STRIP_DOT_EXE]: Use explicit .exe
+>	suffix.
+>	(filesys_read_compressed): Check return status of `pclose'.
+>
+>1998-05-01  Eli Zaretskii  <eliz@is.elta.co.il>
+>
+>	* info/filesys.c (filesys_read_info_file): Add additional
+>	parameter: is_compressed.  All callers changed.
+>
+>	* makeinfo/makeinfo.c (convert_from_loaded_file): Compare file
+>	names with FILENAME_CMP.  Use NULL_DEVICE.
+>	(cm_node): Compare file names with FILENAME_CMP.
+>	* info/tilde.c (tilde_find_suffix, tilde_expand_word): Use
+>	IS_SLASH.
+>
+>	* info/pc_term.c: New file, handles the PC terminal on MS-DOS and
+>	MS-Windows.
+>	* info/terminal.c [__MSDOS__]: Include pc_term.c.
+>	* info/Makefile.in (ginfo_SOURCES): Add pc_term.c
+>	Add pc_term.c to dependencies of terminal.o.
+>
+>	* info/session.c (info_get_input_char): Reassign tty after EOF
+>	from a non-stdin input stream.
+>
+>1998-04-30  Eli Zaretskii  <eliz@is.elta.co.il>
+>
+>	* info/session.c (info_set_input_from_file): Use binary input.
+>	(info_gc_file_buffers): Compare file names with FILENAME_CMP.
+>	* info/search.c (skip_whitespace_and_newlines): Use
+>	whitespace_or_newline macro instead of reinventing the wheel.
+>	* info/nodes.c (info_find_file_internal): Use IS_ABSOLUTE and
+>	FILENAME_CMP.
+>	(info_load_file_internal): Call filename_non_directory to find out
+>	where the basename begins.
+>	(get_tags_of_indirect_tags_table): Call filename_non_directory.
+>	containing_dir of "d:foo" is "d:.", not "d:".
+>	(forget_info_file): Compare file names with FILENAME_CMP.
+>	* info/nodemenu.c (get_visited_nodes): Use FILENAME_CMP to find
+>	duplicate lines.
+>
+>	* lib/system.h (PIPE_USE_FORK): New macro.
+>	* info/man.c (get_manpage_contents): Use it to determine whether
+>	to call pipe/fork/exec or popen/pclose to run the man page
+>	formatter.
+>	(executable_file_in_path): Search for the file with several known
+>	extensions such as .exe, where appropriate.
+>
+>	* lib/system.h (NULL_DEVICE): A new macro.
+>	* info/makedoc.c (main): Use it.
+>	(maybe_dump_tags): Switch output strem to binary mode when
+>	appropriate.
+>	(process_one_file): Update file_size after reading the file.
+>
+>	* info/infodoc.c: Add TAB, RET, and `i' to the list of important
+>	commands in info_internal_help_text.
+>
+>	* info/info.c (main): Support the --speech-friendly option.  Use
+>	PATH_SEP to separate directories.
+>	(info_short_help) [__MSDOS__]: Mention the --speech-friendly
+>	option.
+>
+>	* info/info-utils.c (filename_non_directory): Use HAVE_DRIVE and
+>	IS_SLASH.
+>	* info/indices.c (do_info_index_search, index_entry_exists): Use
+>	FILENAME_CMP to compare file names.
+>	* info/filesys.c: Add ".inf" to the list of known extensions.
+>	Look for .z before .Z, for the sake of case-insensitive
+>	filesystems.  Add DOS-specific extensions to work around 8+3
+>	namespace restrictions.
+>	(info_absolute_file): New function.
+>	(info_find_fullpath): Call it for candidates which are absolute
+>	file names.  Use IS_SLASH and IS_ABSOLUTE.
+>	(info_file_in_path): Use IS_SLASH.
+>	(extract_colon_unit, info_add_path): Use PATH_SEP instead of ":".
+>	(lookup_info_filename): Compare file names with FILENAME_CMP.
+>	(filesys_read_info_file): Read Info files in binary mode.
+>	(filesys_decompressor_for_file): Read Info files in binary mode.
+>	Compare file names with FILENAME_CMP.  On MS-DOS, allow files
+>	whose names end with a `z' be decompressed with gunzip.
+>	* info/dribble.c (open_dribble_file): Open dribble file in
+>	FOPEN_WBIN mode.
+>	* info/dir.c (maybe_build_dir_node): Use IS_SLASH.
+>	* util/texindex.c (maketempname): Put the numeric suffix after the
+>	dot, to salvage 3 more characters on 8+3 filesystems.
+>
+>1998-04-29  Eli Zaretskii  <eliz@is.elta.co.il>
+>
+>	* util/texindex.c (main): Use IS_SLASH to find the basename of
+>	argv[0].  Lose the .exe suffix, if any.
+>	(decode_command): Look at $TEMP and $TMP in addition to $TMPDIR.
+>	Use DEFAULT_TMPDIR.
+>	* util/texi2dvi: Use either `:' or `;' as directory separator in
+>	TEXINPUTS, computed at run time.  Save previous versions of index
+>	files in a separate backup directory.
+>	* util/install-info.c (main): Support backslashes in file names by
+>	using IS_SLASH.  Avoid recomputing length of infile_basename
+>	unnecessarily.  Use FILENAME_CMP for comparing file names
+>	case-insensitively, where appropriate.  Allow foo.inf as well as
+>	foo.info to be an Info file name.
+>	* lib/system.h (PATH_SEP, STRIP_DOT_EXE, FILENAME_CMPN,
+>	DEFAULT_TMPDIR): New macros.
+>
+>1998-04-25  Eli Zaretskii  <eliz@is.elta.co.il>
+>
+>	* lib/system.h (O_BINARY, SET_BINARY, FOPEN_RBIN, FOPEN_WBIN,
+>	IS_SLASH, HAVE_DRIVE, IS_ABSOLUTE, FILENAME_CMP, PATH_SEP,
+>	HAVE_LONG_FILENAMES): New macros.
+>	* makeinfo/makeinfo.c (find_and_load): Use O_BINARY to decide when
+>	read returning a value different from what st_size says is not an
+>	error.  Realloc the buffer after we've read the file.
+>	(skip_directory_part): New function, skips leading directory in a
+>	way that works on DOSISH systems.
+>	(filename_non_directory, pathname_part): Call it.
+>	(filename_part): Call filename_non_directory.
+>	(expand_filename, full_pathname): Use IS_ABSOLUTE and IS_SLASH.
+>	(convert_from_file): Check .txi extension first.
+>	(split_file): Support splitting output files on 8+3 filesystems.
+>	(main, extract_colon_unit): Use PATH_SEP instead of ':'.
+>	(get_file_info_in_path): Use IS_ABSOLUTE and IS_SLASH.
+
+
+	* doc/texinfo.txi: Changes from Eli for MS-DOS stuff.
+	* doc/info-stnd.texi: Fixes from Eli: he documented all the
+ 		missing keys and command-line options, corrected
+ 		inaccuracies (probably left-overs from previous versions),
+ 		and added some clarifications where I thought the manual
+ 		was not clear enough.
+	* Makefile.am (EXTRA_DIST): Add djgpp files.
+
+	* makeinfo/makeinfo.c: New no-op commands @setcontentsaftertitlepage
+	and @setshortcontentsaftertitlepage.
+	* doc/texinfo.txi: Document the new @set{,short}contentsaftertitlepage
+	commands and the possibility of putting @contents and
+        @shortcontents after @end titlepage.
+
+	* util/texi2dvi: Check that the toc file has not changed (as well
+ 		as .aux and .??).
+
+Thu Jun 25 16:58:46 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/texinfo.txi: Document new commands @env, @command, @option.
+
+	* makeinfo/makeinfo.c (option, command, env): New markup commands, same
+ 		as @code in info.
+
+Wed Jun 24 15:39:38 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c: New no-op command @acronym.
+
+	* doc/texinfo.txi: Document new command @acronym.
+
+	* util/install-info.c (strip_info_suffix, menu_item_equal): New fns.
+ 	(main): Call them instead of doing the filename test inline; all the
+	.info variations are too confusing to write out twice.
+
+Tue Jun 23 18:01:40 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/texinfo.txi: Fix some overfull boxes.
+
+Mon Jun 22 19:22:17 1998  Karl Berry  <karl@north>
+
+	* configure.in: Remove AC_LINK_FILES call, that was an old gettext
+ 		thing, no longer necessary, and causes problems with Autoconf.
+
+Sun Jun 14 07:00:15 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* util/texi2dvi: Indent options so help2man will work.  From Akim.
+
+Sat Jun 13 10:45:25 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* configure.in (ALL_LINGUAS): Add nl.
+
+	* util/texi2dvi: Avoid tabs.
+
+Wed Jun 10 17:38:21 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (gen_defindex): Use xmalloc instead of alloca.
+	This was our only use of alloca, so also remove all the #if junk
+	at the beginning to define it.
+
+	* makeinfo/makeinfo.c: Fix grammar in multiply-defined-node error
+		message.
+
+Tue Jun  9 17:53:54 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/texinfo.txi: Document new commands @smallformat,
+ 		@smalldisplay.
+
+	* makeinfo/makeinfo.c: New commands @smalldisplay and @smallformat.
+	Suggestion from: Eli Zaretskii <eliz@is.elta.co.il>.
+
+	* makeinfo/makeinfo.h (insertion_type, insertion_type_names):
+	Declare smalldisplay and smallformat.
+
+Mon Jun  8 07:57:52 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/texinfo.txi: Document possibility of combining @titlefont
+ 		and @title.  From Eli.
+
+	* util/texi2dvi: Set verbose to : instead of false by default.
+
+	* util/texi2dvi: Missing \\ for sed with -t text.  From Akim.
+
+Sun Jun  7 13:02:13 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/texinfo.txi: Document @pagesizes and texidvi -t.
+
+	* makeinfo/makeinfo.c: Define no-op @pagesizes and @afourpaper.
+	(major_version, minor_version): Remove these globals, just use the
+	Texinfo package version.
+	(print_version_info): Ditto.
+
+Fri Jun  5 17:54:16 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/texinfo.txi: Change texi2dvi documentation a bit.
+
+	* util/texi2dvi: Handle --option=argument style of specifying
+ 		arguments.
+
+Sat May 30 14:01:37 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/texinfo.txi: More.
+
+	* util/install-info.c (open_possibly_compressed_file): Finish
+ 		implementation.
+
+	* doc/texinfo.txi: Document install-info compression support.
+
+Fri May 29 08:01:43 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* util/install-info.c (open_possibly_compressed_file): Initial
+ 		implementation.
+
+	* util/install-info.c (output_dirfile): Attempt to write dir.gz if
+ 		that's what we read.
+ 	(readfile): Pass back the actual opened filename, too.
+
+	* info/indices.c: Check in Eli's patch.
+
+Thu May 28 17:09:45 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* util/install-info.c (readfile): Set up to handle compressed
+	input (and output) files. Change callers.
+	Rearrange function order to avoid forward declarations.
+
+	* configure.in: Remove check for libz, we'll fork gzip instead.
+
+Tue May 26 18:01:13 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* util/install-info.c (print_help): Missing \n\ in help string.
+
+	* makeinfo/makeinfo.c (POST_SENTENCE): Rename from post_sentence.
+  	Change calls.
+	(flush_output): Strip 8th bit if post_sentence char as well as space.
+	(cm_code, etc.): Change add_char calls for post_sentence chars to set
+	8th bit.
+
+1998-05-23  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* info/indices.c (info_next_index_match): Call
+	info_set_node_of_window to display the node, so that footnotes are
+	displayed as well.
+
+Thu May 21 11:05:50 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* util/install-info.c (output_dirfile): New function, extracted
+ 		from the end of main.
+
+	* makeinfo/makeinfo.c (begin_insertion): Ignore @group in all the
+	example-like environments, not just @example.  Otherwise the first
+	line in the environment is not indented correctly. Reported by rms.
+
+Wed May 20 17:44:38 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* util/install-info.c: Doc fixes.
+
+	* util/install-info.c: Handle XEmacs-style dir entries:
+	* FILENAME::PROGRAM  DESCRIPTION.
+	Date: Wed, 13 May 1998 13:58:28 +0900
+	From: KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
+
+	Also, do not set something_deleted on continuation lines; they are only
+	deleted if the entry was deleted.
+
+Tue May 19 17:22:50 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* util/install-info.c: Do not read the dir file if we are only
+	deleting -- it might not exist, and we don't actually need it.
+	From: David Kaelbling <drk@sgi.com>
+	Date: Tue, 12 May 1998 11:05:26 -0400
+
+	* util/gen-dir-node:
+	From: David Kaelbling <drk@sgi.com>
+	Date: Tue, 12 May 1998 16:05:16 -0400 -
+	- The "dir" moobler header is slightly different from the default
+		dir file.
+	- If all files in ${infofiles} appear in the skeleton the last one
+ 		is processed twice.
+ 	- INFO-DIR-SECTION data is ignored.
+  	- Don't generate entries for directories.
+
+Sat May 16 17:16:56 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (cm_novalidate): New fn for new command
+ 		@novalidate, like --no-validate.
+
+Thu May 14 18:02:31 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/texinfo.txi: Document the @novalidate command.
+
+Wed May 13 17:47:20 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/texinfo.txi: Document limitation on @set/@value names in
+ 		index commands.
+
+Fri May  1 14:12:15 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/texinfo.txi (Command List): @deftypevar out of order.
+
+	* configure.in (ALL_LINGUAS): Add cs.
+
+Tue Apr 28 09:33:41 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (strcasecmp): This is in lib now.
+
+1998-04-26 Richard Stallman <rms@psilocin.gnu.org>
+
+	* util/install-info.c (print_help): Doc clarifications.
+
+Sun Apr 19 15:55:10 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* lib/system.h (strcasecmp, strncasecmp) [!HAVE_STR[N]CASECMP]:
+ 		Declare these.
+
+	* info/search.h (str[n]casecmp): Remove decl from here.
+
+	* configure.in (AC_REPLACE_FUNCS): Check for strcasecmp and
+ 	strncasecmp here.
+	(AC_CHECK_FUNCS): Instead of just strcasecmp here.
+
+	* configure.in (texconfig): Use TEXMFMAIN in preference to TEXMF
+ 		for post-0.4 teTeX.
+
+Wed Apr 15 17:20:31 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/texinfo.txi (Reporting Bugs): New section.
+	Suggestion from: Andrew Shapira <shapiraa@cs.rpi.edu>
+	Date: Mon, 4 Aug 1997 19:06:06 -0400 (EDT)
+
+	* info/infomap.c: Define / to be info_search.
+	Suggestion from: Egil Kvaleberg <egil@kvaleberg.no>
+	Date: Fri, 1 Aug 1997 08:16:45 +0200 (MET DST)
+
+	* doc/texinfo.txi (uref): Document reason for not using <URL: format.
+	Also use ftp.gnu.org instead of ftp.gnu.ai.mit.edu throughout.
+
+Tue Apr 14 10:43:39 1998  Karl Berry  <karl@cs.umb.edu>
+
+	1998-04-05 Karl Eichwalder <ke@suse.de>
+	* makeinfo/makeinfo.c (begin_insertion): No need to
+ 	gettext; it's a keyword.  From carl-friedriech.spilcke-liss@ensae.fr.
+ 	(cm_printindex): ditto.
+
+	* util/texi2dvi: Always remove the $tmp_dir's.
+	From: Dean Gaudet <dgaudet@arctic.org>
+	Date: Tue, 14 Apr 1998 00:55:36 -0700 (PDT)
+
+Mon Apr 13 18:02:57 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* configure.in: Include
+	AM_SYS_POSIX_TERMIOS
+	AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL
+	to avoid window resizing being ignored under glibc2 systems,
+	e.g., Red Hat Linux 5.0.  Actually any system where the ioctls are not
+	defined in <termios.h>.
+	See also http://www-gnats.gnu.org:8080/cgi-bin/wwwgnats.pl/full/206.
+	* acconfig.h (GWINSZ_IN_SYS_IOCTL): New #undef for autoheader.
+	* info/termdep.h [GWINSZ_IN_SYSIOCTL]: #include <sys/ioctl> if
+ 		this is defined.
+	From: Mark Jefferys <mjeffery@cse.ogi.edu>
+	Date: Thu, 9 Apr 1998 12:38:27 -0700 (PDT)
+
+Fri Apr  3 01:18:22 1998  Philippe De Muyter  <phdm@macqel.be>
+
+	* info/info.c (main): Use 0, not NULL, as ? : alternative.
+
+Tue Mar  3 13:29:17 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* configure.in: Version 3.12.
+
+	* 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/echo-area.c: Whoops, _ might not start with parens.
+
+	* configure.in: Check for libz.
+	Do not output emacs/Makefile.
+
+	* Makefile.am (AUTOMAKE_OPTIONS): Set to 1.2f.
+
+	* util/texi2dvi: Always remove temporary directories. (From Akim.)
+	Formatting changes.
+
+Wed Feb 25 15:26:26 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* 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.
+
+	Applied this:
+1997-08-09  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* 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.
+
+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>.
+
+Fri Aug  1 14:05:10 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* Makefile.am (EXTRA_DIST): Remove README-alpha.
+	From: "ir. Mark M._Kettenis" <kettenis@phys.uva.nl>.
+
+1997-07-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
+
+	* configure.in: Use AC_CHECK_HEADERS, not AC_CHECK_HEADER.
+
+Thu Jul 31 11:57:46 1997  Karl Berry  <karl@cs.umb.edu>
+
+	*  Version 3.11.
+
+	* info/man.c (reap_children): Declare status as int, not unsigned,
+		since that's what POSIX says the arg to wait should be.
+
+	* makeinfo/makeinfo.c (cm_uref, cm_email): Rewrite to do macro
+ 		expansion in the arguments.
+
+	* makeinfo/makeinfo.c (main): setlocale LC_MESSAGES and LC_TIME,
+		instead of LC_ALL.
+	From: Akim Demaille <demaille@inf.enst.fr>.
+
+	* makeinfo/makeinfo.c (cm_today): Let the %d %s %d be translated,
+		so other languages can change the order of day/month/year.
+	From: Akim Demaille <demaille@inf.enst.fr>.
+
+	* info/infomap.c: Doc fix.
+
+	* lib/system.h [!O_RDONLY]: Prefer <fcntl.h> to <sys/fcntl.h>.
+
+	* configure.in (AC_CHECK_HEADERS): Check for fcntl.h.
+
+	* doc/Makefile.am (install-data-local): Suggest tex/generic/dvips
+		for epsf.tex.
+	From: Tim Mooney <mooney@dogbert.cc.ndsu.NoDak.edu>.
+
+	* configure.in (TEXMF): Move check to block with other program
+ 		checks.
+
+Wed Jul 30 11:20:37 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (defun_internal): Allow extra text after
+		most @def... commands, for tzname[2] in libc.texinfo.
+
+	* info/info.c: Include indices.h.
+	* configure.in (AC_CHECK_HEADERS): Test for sys/wait.h, info/man.c
+ 		uses it.
+	From: Erick Branderhorst <Erick.Branderhorst@asml.nl>.
+
+Tue Jul 29 15:55:19 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* configure.in: Version 3.9j.
+
+	* info/terminal.c (output_character_function): Return int (the
+ 		arg), not void.
+
+	* info/infomap.c: Don't define term_kP as 'v', since that's undefined.
+	From: Tom Hageman <tom@basil.icce.rug.nl>.
+
+	* makeinfo/makeinfo.c: Parameterize some messages to avoid
+ 		duplicate translations.
+
+	* info/terminal.c: Only try to declare ospeed, PC, tputs, etc. if
+		we don't have <ncurses.h/termcap.h> or <termcap.h>.
+
+	* makeinfo/makeinfo.c (cm_email): New function, like cm_uref.
+
+Sun Jul 27 17:09:20 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* configure.in: Only check for <ncurses/termcap.h> if we're using
+		-lncurses.
+	From: Bo Johansson <bo.johansson@mbox2.swipnet.se>.
+
+	* info/dir.c (new_dir_file_p): Avoid automatic struct
+		initialization, SunOS 4 etc. cc can't handle it.
+	From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>.
+
+Sat Jul 26 15:08:13 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* Version 3.9i.
+
+	* configure.in: Check for termcap.h and ncurses/termcap.h.
+	From: bo.johansson@mbox2.swipnet.se.
+
+Fri Jul 25 14:09:05 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/texinfo.texi: Document new second optional arg to email.
+
+	* info/infodoc.c: Document CTRL-x 0 as the way to get out of help.
+
+	* info/dir.c (maybe_build_dir_node): Really check for the same dir
+		file twice, not just by name.
+	(new_dir_file_p): New function.
+
+	* util/install-info.c: Tell them about --help in doc strings.
+
+Thu Jul 24 14:25:44 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* util/texindex.c (memory_error): Move to avoid incorrect implicit
+ 		decl.
+
+	* makeinfo/makeinfo.c,
+	* makeinfo/multi.c,
+	* util/install-info.c,
+	* util/texindex.c,
+	* info/tilde.c,
+	* info/man.c,
+	* info/gc.c,
+	* info/session.c (info_replace_key_to_typeahead): Remove unused
+         function,
+	* info/nodemenu.c,
+	* info/man.c,
+	* info/m-x.c,
+	* info/footnotes.c
+	* info/info.c
+	* info/indices.c,
+	* info/filesys.c: Parenthesize to avoid -Wall warnings
+	remove unused variables,
+	make return types explicit,
+	printf type corrections.
+
+	* lib/system.h: <ctype.h>: Include this.
+	* util/texindex.c,
+	* makeinfo/makeinfo.c,
+	* info/echo-area.c,
+	* info/display.c: ctype.h: Included in system.h now.
+
+	* info/echo-area.c: Parenthesize to avoid -Wall warnings.
+        (ctype.h): #include for isprint.
+	(echo_area_stack_depth): Remove unused function.
+	* info/display.c: Parenthesize to avoid -Wall warnings.
+        (ctype.h): #include for isprint.
+	* info/dir.c: Parenthesize to avoid -Wall warnings.
+	(build_dir_node_internal): Remove declaration of nonexistent function.
+	From: Erick Branderhorst <Erick.Branderhorst@asml.nl>.
+
+	* configure.in (TEXMF): Call texconfig to discover the default value,
+	for the sake of the warning in doc/Makefile.
+	From: Tim Mooney <mooney@dogbert.cc.ndsu.NoDak.edu>.
+
+	* doc/Makefile.am (TEXMF): New variable.
+        (install-data-local): Use it in warning.
+	From: Tim Mooney <mooney@dogbert.cc.ndsu.NoDak.edu>.
+
+	* info/session.c (initialize_info_session): Only call
+	terminal_prep_terminal if clear_screen is true.  Otherwise, failed
+        --index-searches prep the terminal but do not unprep it.
+	From: William Edward Webber <wew@yallara.cs.rmit.EDU.AU>.
+
+	* info/nodemenu.c: Doc fix.
+
+Mon Jul 21 17:11:09 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/texinfo.texi: Comment out @smallbook and @set smallbook so
+ 		people at other sites can print it the way they want.
+	From: Thomas Walter <walter@pctc.chemie.uni-erlangen.de>
+
+Sun Jul 20 07:52:25 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* configure.in: 3.9h.
+
+	* doc/Makefile.am (install-info-am, distclean-aminfo): New targets
+		to avoid assuming info files are in srcdir.
+
+	* lib/system.h (xstrdup): Returns char *, not void *.
+
+	* doc/Makefile.am (.texi.info),
+	* doc/Makefile.am (texinfo): Don't run in $(srcdir).
+
+	* util/install-info.c (main): Remove unnecessary decl of strrchr.
+
+	* info/tilde.c: Include info.h (for config.h) before alloca stuff.
+
+	* makeinfo/makeinfo.c (validate_file): Rename `valid' to `valid_p'
+		to avoid conflict with SunOS 4 header files.
+	From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>.
+
+	* info/session.c (initialize_info_session): Call
+          terminal_prep_terminal here (before calling terminal_clear_screen).
+	(info_session): Instead of here.
+	From: William Edward Webber <wew@yallara.cs.rmit.EDU.AU>.
+
+	* Makefile.am (EXTRA_DIST): Add README-alpha.
+
+Sat Jul 19 13:50:27 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* info/terminal.c: Use `keypad transmit' sequence if it's defined:
+	(term_keypad_on, term_keypad_off): New statics.
+	(terminal_begin_using_terminal): If term_keypad_on, send it.
+	(terminal_end_using_terminal): If term_keypad_off, send it.
+	(terminal_initialize_terminal): Look up ks and ke termcap strings.
+	From: William Edward Webber <wew@yallara.cs.rmit.EDU.AU>.
+
+	* info/infomap.c (initialize_info_keymaps): Initialize hardwired
+ 		cases for arrow keys a la readline.  Found by John Eaton,
+ 		jwe@bevo.che.wisc.edu.
+
+	* makeinfo/makeinfo.c (output_pending_notes): Remove footnote
+        macro expansion code I #if 0'd out some time ago.  And doc fixes.
+
+	* Applied this patch:
+
+Sat Jul 19 16:29:01 1997  Karl Eichwalder  <ke@suse.de>
+
+	* info/info.c (main): setlocale, bindtextdomain, and textdomain.
+
+Fri Jul 18 10:02:18 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/Makefile.am (install-data-local),
+	* emacs/Makefile.am (install-data-local): Give subdir in warning.
+
+	* configure.in: Version 3.9f.
+
+	* doc/texinfo.texi: Correct \^ to @^.
+	From Andreas S.
+
+	* Merged these changes:
+
+1997-07-17  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* info/display.c (display_cursor_at_point): Flush ouput.
+
+1997-07-17  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* info/session.c (remember_window_and_node): Don't crash when the
+	current window has no current node.
+
+1997-07-17  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* util/texindex.c (usage): Translate the doc strings.
+	* makeinfo/makeinfo.c (cm_today): Translate the month names.
+	* info/variables.c (describe_variable): Translate the doc strings.
+	* info/nodes.h: Don't translate the strings defining the info format.
+
+1997-07-17  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* makeinfo/makeinfo.c (get_item_function): Remove superfluous call
+	to canon_white after get_rest_of_line.
+	(cm_end): Likewise.
+	(handle_variable): Likewise.
+	(cm_item): Likewise.
+	(cm_unmacro): Likewise.
+
+1997-07-17  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* info/nodemenu.c (list_visited_nodes): Don't clear the internal
+	flag, this and other functions depend on it.  Don't insist on
+	displaying the menu below the current window.
+
+1997-07-17  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* makeinfo/makeinfo.c (cm_uref): Fix memory leaks.
+	(cm_inforef): Likewise.  Handle empty cross reference name.
+
+1997-07-17  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* info/echo-area.c (ea_possible_completions): Check that the
+	current window can actually be split.
+
+Thu Jul 17 17:19:34 1997  Karl Berry  <karl@cs.umb.edu>
+
+
+	* emacs/Makefile.am (*clean-lisp): Define, as Automake didn't.
+	From: Kenneth Stailey <kstailey@disclosure.com>.
+
+	* doc/Makefile.am: Do not distribute info.1.
+	* makeinfo/macros: Do not distribute this directory, it's merged
+		into the main documentation.
+	* doc/makeinfo.texi: Don't distribute this either, it's in the
+		main manual.
+
+	* util/install-info.c: Use \n\ for multiline string constant.
+  		From: Tim Mooney <mooney@dogbert.cc.ndsu.NoDak.edu>.
+
+Wed Jul 16 15:29:50 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/texinfo.texi: @set must be after @setfilename, I guess.
+	Noted by Erick Branderhorst.
+
+	* Applied this change:
+
+Tue Nov 12 22:20:22 1996  John Eaton  <jwe@bevo.che.wisc.edu>
+
+	* makeinfo.c (INDEX_ALIST): Use two indices, read_index and
+	write_index, instead of just one.
+	(find_index_offset): If a match is found, return index to the
+	current INDEX_ALIST struct, not the index pointing to the list of
+	index entries.
+	(translate_index): Return read_index from the matching
+	INDEX_ALIST.
+	(undefindex): Delete the list of index elements pointed to by
+	read_index from the INDEX_ALIST that matches name.
+	(defindex): Initialize read_index and write_index.
+	(index_add_arg): Add entries to the list pointed to by write_index
+	from the INDEX_ALIST matching name.
+	(index_append): Delete unused function.
+	(cm_synindex): Don't merge indcies, just make the write_index for
+	redirectee the same as the write_index for redirector.
+
+Tue Jul 15 09:32:04 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/texinfo.texi: Bump edition number for 2.24.
+
+	* util/Makefile.am (localedir): Define.
+
+	* info/window.h: Rename __window__ to window_struct.
+
+	* info/window.h,
+	* info/variables.h,
+	* info/search.h,
+	* info/man.h,
+	* info/info-utils.h,
+	* info/gc.h,
+	* info/footnotes.h,
+	* info/filesys.h,
+	* info/echo-area.h,
+	* info/display.h: Avoid leading _ in #define for #include protection.
+
+	* makeinfo/makeinfo.c: Version 1.68.
+	* info/info.c: Version 2.17.
+
+	* Most all files: Untabify.
+
+	* doc/Makefile.am (texinfo): Add explicit target.
+
+	* emacs/Makefile.am (noinst_LISP): Remove the obsolete
+		detexinfo.el (makeinfo --no-headers is better) and
+	        texnfo-tex.el (now handled by TeX modes in general).
+
+Mon Jul 14 15:21:03 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* util/texi2dvi: Update RCS file from 3.9 distribution.
+
+	* util/Makefile.am (EXTRA_DIST): Add update-info, from
+ 		rhawes@dmapub.dma.org
+
+Sun Jul 13 17:05:03 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* info/signals.c: Use RETSIGTYPE instead of hardwiring void.
+	From: "Jeffery L. JT Vogt" <lfm@atw.earthreach.com>.
+
+	* info/session.c (info_history_node): Rewrite as
+  	      info_kill_node (current_node).
+        (kill_node, read_nodename_to_kill): New functions from info_kill_node.
+	(info_kill_node): Now this just calls them.
+
+Fri Jul 11 11:56:58 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/texinfo.texi: Fix `Conditionals' xref.
+
+Thu Jul 10 17:58:12 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/info.texi: Don't say SPC clears ? screen.
+
+Sun Jul  6 16:26:41 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/info-stnd.texi: Document --index-search.
+
+	* info/tilde.c,
+	* info/session.c: Remove redundant getenv decl.
+
+	* Installed following change:
+Tue Nov 12 14:44:00 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* info/info.c (main): Handle new option, --index-search STRING.
+	(index_search_p, index_search_string): New static variables, used
+	to handle --index-search option.
+
+	* info/session.c (initialize_info_session): New arg,
+	clear_screen.  Change all callers.
+
+	* info/indices.h (do_info_index_search, index_intry_exists):
+	Provide declarations here.
+
+	* info/indices.c (do_info_index_search): New function, extracted
+	from info_index_search.
+	(info_index_search): Simply call do_info_index_search() with
+	search_string set to NULL.
+	(index_entry_exists): New function.
+
+Sat Jul  5 17:17:14 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/texinfo.texi: Document @kbdinputstyle.
+
+	* makeinfo/makeinfo.c (kbdinputstyle): New command.
+	(cm_no_op_line_arg): New function.
+
+	* info/termdep.h (HAVE_TERMIOS_H) [NeXT]: #undef.
+	From: Gregor Hoffleit <flight@mathi.uni-heidelberg.de> et al.
+
+Fri Jul  4 14:18:08 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* info/Makefile.am (EXTRA_DIST),
+	* util/Makefile.am (EXTRA_DIST),
+	* makeinfo/Makefile.am (EXTRA_DIST),
+	* lib/Makefile.am (EXTRA_DIST): Include README.
+
+	* doc/texinfo.texi (makeinfo options): Document --paragraph-indent
+ 		values more completely.
+	* makeinfo/makeinfo.c (set_paragraph_indent): Allow translated
+ 		asis or none, improve doc.
+ 	From ke.
+
+	* doc/Makefile.am (dist-info): New empty target so that we do not
+ 		distribute info files.
+ 	From Erick Branderhorst.
+
+	* doc/texinfo.texi (Invoking install-info): Document that the dir
+		file is created now if need be.
+	* Makefile.am (EXTRA_DIST): No longer need dir.
+	* util/install-info.c (ensure_dirfile_exists): New routine.
+	(main): Call it before trying to open dirfile for reading.
+
+	* doc/texinfo.texi: Document install-info --delete a little better.
+	* util/install-info.c: Set something_deleted when we delete a
+ 		normal line.
+	Bug from: Denis Kosygin <dkosygin@math.Princeton.EDU>.
+
+	* util/install-info.c: If no info dir entry, give warning and exit 0.
+
+Wed Jul  2 06:35:17 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* configure.in (ALL_LINGUAS): Add fr.
+
+	* makeinfo/makeinfo.h (insertion_type, insertion_type_names): Add
+		ifnot... entries. Alphabetize.
+
+Tue Jul  1 17:21:54 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (sort_index): Set defining_line and
+		input_filename so errors in index entries are reported at
+		the correct location.  From rms.
+
+	* makeinfo/makeinfo.c (cm_ifnothtml, etc.): Routines for new
+ 		commands.
+
+Sun Jun 29 09:44:01 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/texinfo.texi: Document new @ifnot... commands, etc.
+	* doc/texinfo.texi: Document @image, etc.
+
+Thu Jun 26 17:57:37 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (cm_image): New routine for new command @image.
+	(cm_end): Move to better place, doesn't need its own page.
+	Doc fixes.
+
+Mon Jun 23 16:54:03 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* Makefile.am (SUBDIRS): Do intl first.
+
+	* doc/Makefile.am (EXTRA_DIST): Include epsf.tex.
+	(install-data-local): Suggest possible installation directory.
+	* epsf.tex: New file.
+
+Wed Jun 18 17:51:52 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/texinfo.texi: Document texinfo.cnf.
+
+Sun Jun 15 14:37:58 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/texinfo.texi (Command List): Various commands missing or
+		erroneous.
+	From: Karl_Heinz_Marbaise@p69.ks.fido.de.
+
+	* makeinfo/makeinfo.c: Oops, failed to break out of loop.
+
+	* util/texindex.c: Use <getopt.h> not "getopt.h".
+
+	* All source files: Merge gettext changes from Karl E.;
+	his ChangeLog entries below.
+
+Sat Jun 14 17:04:28 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* Makefile.am,
+	* makeinfo/Makefile.am: Doc fix.
+	* util/Makefile.am (EXTRA_DIST): Add texi2dvi.  From Karl E.
+
+Fri Jun 13 17:39:34 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c [WIN32]: Handle read bogosity and c:\
+		absolute paths.
+	From: Eric Hanchrow <erich@MICROSOFT.com>.
+
+	* configure.in (AC_CHECK_HEADERS): Check for pwd.h.
+	* info/tilde.c (pwd.h): Move #include to system.h.
+
+	* makeinfo/makeinfo.c (main): New option -P to prepend to search path.
+	From: Kenneth Stailey <kstailey@cvs.openbsd.org>.
+
+	* doc/texinfo.texi (Invoking makeinfo),
+	* doc/makeinfo.texi: Mention -P.
+
+Thu Jun 12 16:25:40 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* info/signals.h (SIGCHLD): #define as SIGCLD if undefined, for sysV68.
+	From: "Philippe De Muyter" <phdm%labauto1@ulb.ac.be>.
+
+	* util/install-info.c (O_RDONLY): Remove this stuff, it's in system.h.
+ 	(main): Handle existing entry in dir file having .info extension.
+	From: "Bradley C. Kuszmaul" <bradley@GRANITE.SYSTEMSX.CS.YALE.EDU>.
+
+	* makeinfo/makeinfo.c (get_char_len): Don't count 8-bit characters
+		as two chars in the output.
+	From: Sung-Hyun Nam <namsh@amuna.rms.lgic.co.kr>.
+
+Wed Jun 11 16:36:51 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/texinfo.texi (Other Info Directories): Document new trailing
+ 		: in INFOPATH feature.
+
+	* info/info.c (main): Have trailing : in INFOPATH expand to the
+ 		default path.
+
+Fri Jun  6 13:22:02 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/texinfo.texi (uref): New node for new command.
+
+Thu Jun  5 18:13:48 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (cm_uref): New function to accept optional
+		second argument.  Call it in command table.
+
+Sat Jun 14 10:54:16 1997  Karl Eichwalder  <ke@suse.de>
+
+	* mkinstalldirs: Update from automake-1.1p.
+
+	* configure.in: Touch po/ChangeLog (gettext needs it).
+
+Thu Jun 12 08:37:52 1997  Karl Eichwalder  <ke@ke.Central.DE>
+
+	* util/texindex.c: Include system.h, remove config.h.
+
+	* po/POTFILES.in: Fill it.
+
+	* makeinfo/multi.c: Include system.h.
+
+	* info/Makefile.am:
+	* makeinfo/Makefile.am:
+	* util/Makefile.am:
+ 	(localedir): Set.
+	(INCLUDES): Add intl/ and LOCALEDIR.
+	(LDADD): Add @INTLLIBS@.
+
+	* makeinfo/makeinfo.c (main):
+	* util/texindex.c (main):
+	* util/install-info.c (main):
+ 	setlocale, bindtextdomain, and textdomain.
+
+	* lib/system.h: Include locale.h and libintl.h.
+
+	* acconfig.h: Include libintl.h.
+	(_, N_): Define.
+	Add ENABLE_NLS, HAVE_CATGETS, HAVE_GETTEXT, HAVE_LC_MESSAGES,
+	HAVE_STPCPY for libintl.
+	Add @TOP@ and @BOTTOM@.
+
+	* configure.in (AM_GNU_GETTEXT): Add.
+	(AC_OUTPUT): Process Makefiles in intl/ and po/.
+	(ALL_LINGUAS): Available languages.
+
+	* Makefile.am (AUTOMAKE_OPTIONS): Now use 1.1p.
+
+Wed Jun 11 17:05:37 1997  Karl Eichwalder  <ke@ke.Central.DE>
+
+	* Makefile.am (SUBDIRS): Add intl/ and po/ for NLS.
+
+	* run `gettextize -c' to get the i18n skeleton.
+
+Wed Jun  4 17:51:08 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (uref): New command, another alias for @code
+ 		for now.
+
+Wed Jun  4 02:02:33 1997  Miles Bader  <miles@gnu.ai.mit.edu>
+
+        * doc/texinfo.texi (email): { and } need @ escapes.
+
+Sun Jun  1 16:34:12 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/texinfo.texi (itemx): @itemx should always follow @item.
+
+	* makeinfo/makeinfo.c (cm_item): Insert blank line if two
+		consecutive @item's.
+	From: Karl Eichwalder <ke@ke.central.de>.
+	Also various doc fixes.
+
+Tue May 27 17:20:44 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/texinfo.texi (various): Document @deftypemethod.
+	(email): @ should have been @@ in the example.
+	From: Mate Wierdl <mw@wierdlmpc.msci.memphis.edu>
+
+Mon May 26 16:56:26 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/multi.c (setup_multitable_parameters): Avoid use of %n
+		for sake of m68k-hp-bsd.
+	From: Derek L Davies <ddavies@world.std.com>.
+
+	* info/terminal.c (terminal_begin_using_terminal,
+        terminal_end_using_terminal): Call fflush and sleep to handle
+	cmdtool/shelltool with scrollbars.  Also ignore
+ 	SIGWINCH so we do not prematurely exit.  Move call.
+	(terminal_prep_terminal): Disable LNEXT (CTRL-V).
+	From: strube@physik3.gwdg.de (Hans Werner Strube).
+
+	* configure.in (AC_TYPE_SIGNAL): Check this.
+
+Sun May 25 16:49:58 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (discard_insertions): Take arg saying
+ 		whether ifinfo/ifset/etc. are ok.
+        (convert_from_loaded_file): At `finished', call discard_insertions.
+	(handle_variable_internal): Complain if we reach eof before the
+		@end for a false condition.
+	From: HERBERT@boevm4.vnet.ibm.com.
+
+	* info/Makefile.am (ginfo_SOURCES): Add doc.h.
+	* lib/Makefile.am (libtxi_a_SOURCES): Add system.h.
+
+Sat May 24 18:08:27 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c: Check that we have macro_expansion_filename
+ 		before using strcmp.
+
+Thu May 22 17:59:46 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/makeinfo.texi: Minimally document --force.
+
+	* makeinfo/makeinfo.c (--force): New option.
+	(-E): Allow stdout via `-'.
+	(convert_from_loaded_file): Unlink output files if errors and !force.
+
+Tue May 20 17:48:42 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c: Change all strdup calls to xstrdup.
+	(xmalloc, xrealloc, memory_error): Remove these functions, they're
+		in lib.
+	(set_paragraph_indent, cm_paragraph_indent): Move to misc page.
+	(cm_footnote): Expand macros in the arg for the macro expansion output.
+
+Fri May 16 17:26:59 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (cm_macro): Allocate an empty body if the
+ 		macro was empty.
+ 	(cm_unmacro): Allocate one more byte for the null.
+	From: Robert Hoehne <robert.hoehne@Mathematik.TU-Chemnitz.DE>.
+
+Sun May 11 17:51:21 1997  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* makeinfo/makeinfo.c (cm_printindex): Fix calculation of the
+	length of an index line.
+
+Sun May 11 14:47:42 1997  Tom Tromey  <tromey@cygnus.com>
+
+	* makeinfo/makeinfo.c (main): Don't unconditionally run usage when
+	-e specified.
+
+Sun May 11 17:47:42 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (init_indices): Free the source for an @synindex.
+	(undefindex): Do not go further if the target was already freed.
+	(free_index): Do not free the node names, as init_tags already did.
+	(cm_synindex, index_add_arg): Improve error message.
+	(program_index, function_index, etc.): Remove these unused #defines.
+
+Tue May  6 17:53:37 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (init_internals): Do not free current_node,
+        it already is, at least when multiple input files are specified.
+	From: Karl Eichwalder <ke@ke.central.de>.
+
+Mon May  5 16:14:39 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/texinfo.texi: Mention both alignment and non-alignment of
+ 		continuation description lines in menus (Arnold).
+
+Sun Apr 27 16:12:44 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (apply): Handle body being `\string'.
+	Also, avoid dereferencing a null pointer when a macro has no named
+	parameters.
+	From: Eli Zaretskii <eliz@is.elta.co.il>.
+
+	* makeinfo/makeinfo.c: Wording changes/fixes in warnings.
+
+	* info/session.c (info_get_input_char): Do not mix stdio with raw I/O.
+	From: Egil Kvaleberg <egilk@sn.no>.
+
+	From Tom Hageman <tom@basil.icce.rug.nl>.  These changes make
+        arrow keys work:
+	* info/infomap.c: Add arrow key bindings.
+        (keymap_bind_keyseq): New support function.
+	(initialize_info_keymaps): Use it.
+	(term_ku,term_kd,term_kl,term_kr): Remove explicit declarations;
+	use #include "terminal.h" instead.
+	* info/session.c (initialize_info_session): Unbuffer stdin.
+	(info_get_another_input_char): Fix bug in `ready' logic.
+	* info/terminal.h,
+	* info/terminal.c (term_kP, term_kN): New variables to hold
+ 		PageUp, PageDown key sequences.
+	  (terminal_initialize_terminal): Set them.
+
+	* util/texindex.c (main),
+	* util/install-info.c (main),
+	* makeinfo/makeinfo.c (print_version_info),
+	* info/info.c (main): Use PACKAGE and VERSION from Automake for
+ 		printing version number.
+
+Sat Apr 26 19:19:46 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (get_until_in_line): Do not expand if
+		executing_string.
+	Also, free temporary strings.
+	Also, untabify entire file.
+
+	* doc/texinfo.texi: Many corrections from Arnold.
+
+Thu Apr 24 16:31:09 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/multi.c (draw_horizontal_separator): Account for indent
+ 		here also.  From Ulrich.
+
+Wed Apr 23 15:15:34 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (cm_today): Use time_t instead of long;
+ 		everyone else does.
+ 	(LOCALTIME_CAST): Remove kludge, we'll always use time_t now.
+
+	* info/Makefile.am (ginfo_SOURCES): Remove general.h, that got
+ 		merged into system.h.
+
+Mon Apr 21 17:13:25 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/multi.c (output_multitable_row): Account for
+ 	column_indent, both the global one and for each column.
+	(setup_multitable_parameters): Account for column_indent in the table
+	width in the columnfrac case, but don't bother with the template
+ 		case for now.
+
+Sun Apr 20 16:32:00 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (output_stream): Remove redundant
+        definition; it's in makeinfo.h,
+	and a vaxstation-ultrix4.3 fails to link because of the two defns.
+	From: Anders Olofsson <anders@kid025.ericsson.se>.
+
+	* makeinfo/makeinfo.c (expansion): Inhibit appending to the macro
+ 		expansion stream.
+ 	(get_until_in_line): Possibly expand the text.
+	Change caller in get_node_token to do the expansion,
+	all other calls to remain the same.
+
+	* makeinfo/makeinfo.c (cm_node): No need to call strlen to check
+ 		for the empty string.
+
+	* doc/texinfo.texi: Restore missing @c for initial comment.
+
+Fri Apr 18 17:41:36 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/texinfo.texi: Mention that .info is unnecessary in the info
+		file name argument of an xref.
+
+	* doc/texinfo.texi: Mention texi2dvi -t instead of embedding
+ 		@smallbook or @afourpaper in the document source.
+
+Sun Apr 13 15:19:08 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* lib/system.h (_GNU_SOURCE): #define.
+
+Mon Apr  7 16:30:11 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/info.texi,
+	* doc/info-stnd.texi,
+	* doc/texinfo.texi: Do not make (dir) the previous ptr from the top node,
+	and tell people not to do that in the manual.
+	From: rmedina@kanojo.ivic.ve (Rodrigo Medina),
+	confirmed by rms.
+
+Fri Apr  4 16:30:33 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c: Move error page to top to avoid
+	prototypes, and do add prototypes for add_word_args and execute_string,
+	so we can use <stdarg.h>.
+
+	* info/makedoc.c,
+	* info/nodemenu.c: Use %ld instead of %d for file offsets.
+	* makeinfo/makeinfo.c (delete_macro): Decrement macro_list_len.
+	(get_macro_args): Decrement line number if see \n.
+	* utils/texindex.c (indexify): Use fputs instead of fprintf
+	for constant string.
+	From: Eli Zaretskii <eliz@is.elta.co.il>.
+
+Thu Apr  3 17:40:52 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* configure.in (AC_CHECK_HEADERS): No need to check for vararg.h
+	here, AC_FUNC_VPRINTF does it.
+	(AC_CHECK_FUNCS): Likewise for vsprintf and vfprintf.
+	* makeinfo/makeinfo.c (add_word_args, execute_string): Rewrite
+	like the error functions.
+
+Wed Apr  2 17:46:28 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* configure.in: Add AC_FUNC_VPRINTF.
+	* makeinfo/makeinfo.c (error, line_error, warning): Rewrite a la
+        error.c from the *utils to use <stdarg.h> if available.
+
+Tue Apr  1 11:48:40 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* doc/texinfo.texi: Tabs are a bad idea.
+
+	* doc/userdoc.texi,
+	* doc/info.texi: Untabify.
+
+Sun Mar 30 17:36:47 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (end_of_sentence_p): New function.
+	(add_char): Call it, instead of simply sentence_ender.
+	(post_sentence): New macro.
+	Also, remove some #include's now in system.h.
+	* lib/system.h [VMS]: #include <perror.h>, from makeinfo.
+
+Thu Mar 27 17:41:03 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* info/search.c (skip_node_characters): Do not arbitrarily
+	strip trailing period from end of node name; this is valid.
+
+Mon Mar 24 16:44:42 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* configure.in (AC_OUTPUT): Don't need to create stamp-h here,
+	tromey says AM_CONFIG_HEADER will do it.
+
+	* info/Makefile.am, util/Makefile.am, makeinfo/Makefile.am (INCLUDES):
+        Don't need -I.. (for config.h) or -I$(srcdir), says tromey.
+        Automake includes those already.
+
+Fri Mar 14 15:05:17 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* info/Makefile.am: Build as ginfo, install as info,
+	to avoid conflict with the standard info target.
+
+	* lib/system.h: New file.
+	* makeinfo/makeinfo.c (strerror): Remove declaration,
+	include system.h, remove other redundant #if stuff.
+	* info/general.h: Include system.h instead of doing common stuff.
+	* util/install-info.c (my_strerror): Remove this, use strerror,
+	include system.h.
+
+	* info/terminal.c (terminal_prep_terminal): Only use OCRNL and
+		ONLCR if they are defined.  Reported by many people.
+
+	* Installed:
+
+	Sun Dec  1 19:23:54 1996  Karl Eichwalder  <ke@ke.Central.DE>
+
+		* configure.in (TERMLIBS): Add ncurses.
+
+Thu Mar 13 13:59:45 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* lib/Makefile.am (libtxi_a_SOURCES): Add xstrdup.c.
+	* info/*.c: Use xstrdup instead of strdup everywhere.
+
+	* info/tilde.c: Do not include clib.h, move stdlib.h include to
+	* info/general.h: here.
+
+	* configure.in (AC_CONFIG_HEADER): Use this,
+	to avoid hugely long compile line with all the -D's.
+	* info/general.h: Include <config.h>.
+
+	* emacs/Makefile.am (install, install-data): Do @echo
+	to tell the user to compile/install the elisp manually.
+
+	* configure.in (AC_REPLACE_FUNCS): Move strerror check to here.
+	(AC_CHECK_FUNCS): From here.
+
+	* lib/strerror.c: New file, from enscript (et al.) distribution.
+
+Tue Mar 11 16:36:25 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* info/Makefile.am (info_SOURCES): Add doc.c, dribble.c, infodoc.c.
+	(LDADD): Add @TERMLIBS@.
+
+	* info/info.h: HANDLE_MAN_PAGES, NAMED_FUNCTIONS: Define these.
+
+	* info/filesys.h: Spurious ! when DEFAULT_INFOPATH is not defined.
+
+	* configure.in (AC_OUTPUT): Do lib first and doc last.
+
+	* info/echo-area.c,
+	* info/echo-area.h,
+	* info/info.h: Rename echo_area to echo-area.
+
+Mon Mar 10 17:59:05 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* */Makefile.am: Write Makefile.am files for Automake.
+	* doc: New subdirectory, move all manuals and texinfo.tex there.
+	* AUTHORS, THANKS, config.guess, config.sub, mkinstalldirs: New files,
+	required by Automake.
+	* lib/xmalloc.c: Move from info/.
+
+Fri Oct  4 07:49:49 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* Version 3.9.
+
+	* Makefile.in (install): Say to install texinfo.tex manually.
+
+	* util/texi2dvi,
+	* util/texindex.c,
+	* makeinfo/makeinfo.c,
+	* info/info.c: Include only the current year in the copyright message.
+
+	* util/texi2dvi: Exit successfully.
+	From: Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>.
+
+Thu Oct  3 12:58:32 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* Rename install.sh to the preferred install-sh.
+
+	* Makefile.in (VERSION),
+	* util/texi2dvi,
+	* util/texindex.c,
+	* util/install-info.c,
+	* makeinfo/makeinfo.c (minor_version, print_version_info),
+     	* info/info.c: Update version number.
+
+	* util/texi2dvi: Only show diff if verbose.
+
+	* util/install-info.c (main): Check for a missing dir file as well
+ 	as a missing info files.
+	(main): At start of a node, completely initialize the newly-malloced
+	node structure.
+
+	* texinfo.texi: Fix incorrect uses of @key,
+	insert missing newline in Installing Dir Entries' @menu item,
+	document install-info invocation.
+
+	* Makefile.in (DISTFILES): Do not put .gdbinit's in distribution.
+	(dist): Use || instead of && (and invert sense) so make doesn't think
+	the command failed.
+	(dist): Exclude more junk.
+
+	* makeinfo/makeinfo.c (cm_xref): Back out patch from Tom T., since
+        we generate a good-enough error message that is suppressible
+        without it.
+
+	* util/gen-dir-node: The recommended name for the top-level info
+ 	file is dir, not dir.info.
+
+	* util/install-info.c (main): At `Mark the end of the Top node',
+        make sure the node name is non-NULL before comparing it. From
+        lvirden@cas.org.
+
+	* configure.in (AC_REPLACE_FUNCS): Use this for memcpy, memmove,
+	and strdup.
+        (AC_CHECK_FUNCS): Instead of this.
+	Because both bcopy and memmove are missing on the 3b2, as reported by
+	Gaylen Miller <gaylen@proaxis.com>, hence we must provide our own.
+	* libtxi/Makefile.in (LIBOBJS): New variable.
+	(OBJS): Include it.
+	* libtxi/memcpy.c, libtxi/memmove.c, libtxi/strdup.c: New files,
+	taken from fileutils 3.13.
+	* makeinfo/makeinfo.c,
+	* info/clib.c (strdup): Move to libtxi.
+
+Wed Oct  2 18:23:30 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* info/info-utils.h (memcpy) [!HAVE_MEMCPY],
+	* info/termdep.h (memcpy) [!HAVE_MEMCPY],
+	* makeinfo/makeinfo.c (memmove) [!HAVE_MEMMOVE]: Remove this
+        #ifdef, as we now include it in libtxi if missing.
+
+Tue Oct  1 17:41:52 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/Makefile.in (install),
+	* info/Makefile.in (install),
+	* Makefile.in (install): Use new option name --info-dir instead of
+ 	--infodir.
+
+	* makeinfo/multi.c (out_char): New fn.  Replace all calls to
+	putc/fprintf with calls to this.
+
+	* util/install-info.c: Rename --infodir to info-dir.
+
+Mon Sep 30 10:07:21 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* Version 3.8.
+
+	* texinfo.tex: Untabify.
+
+	* texinfo.tex (\ptexl, \ptexL): Do not save, we have our own
+	commands now.
+	(\onepageout): Reformat for readability, and call \indexdummies
+	to avoid expansion of Texinfo commands (e.g., accents) in \write's.
+	(\,, \dotaccent, \ringaccent, \tieaccent, \ubaraccent, udotaccent,
+	\questiondown, \exclamdown, \dotless): New macros.
+	(\l): Let plain TeX definition remain, instead of switching
+	to ``lisp'' font.
+	(\multitable): Ensure space between the columns,
+	insert struts to make interline spacing constant,
+	use real strut instead of a box containing `Xy'.
+	(\indexdummies): Do not define \rm, \char, but
+	do define \@, \{, \}, \dotless, and \,.  And \t should generate
+	\t, not \r.
+	(\indexnofonts): Define \, and \dotless as \indexdummyfont,
+	and let \@ be @.
+	(\doind): Reformat for readability, and use temp control sequence
+	names that actually make sense.
+	(\doublecolumnout, \pagesofar, \enddoublecolumns): Restore
+	Knuth's original code to avoid spurious overfull vbox messages.
+	(No boxes are actually overfull).
+	(\shortcontents): Do not allow hyphenations.
+	(\dochapentry, \tocentry): Make glue above and below flexible, to allow
+	better page breaks.
+	(\tex): Reset \, to its plain TeX meaning,
+	and do not reset \l.
+
+	* COPYING: Update for new FSF address (from gcc dist).
+
+	* libtxi/Makefile.in: Various simplifications.
+
+Sun Sep 29 12:58:44 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* util/texi2dvi: Use $progname instead of $0 for --version.
+
+	* util/install-info.c (xmalloc, xrealloc): Declare malloc and
+	realloc as returning void *,
+	to avoid ptr/int problems on Digital Unix.
+
+	* info/tilde.c (tilde_expand_word): Declare getenv as returning char *,
+	to avoid warning on Digital Unix.
+
+	* makeinfo/multi.c (multitable_active): Declare extern here to
+ 	avoid ld warning on rs6000.
+
+	* util/texindex.c (usage): Avoid ??' trigraph.
+
+	* util/install-info.c: Include <sys/fcntl.h> or <fnctl.h>,
+	according to HAVE_SYS_FCNTL_H,
+	and only include <sys/file.h> if HAVE_SYS_FILE_H.
+	(readlines): Oops, had NULL's and 0's reversed for ptr/int members.
+
+	* info/terminal.c (terminal_goto_xy): Remove spurious extra ;.
+
+	* util/install-info.c: Untabify.	(input_sections): Initialize.
+	(find_lines): Initialize the terminating element of the array.
+	(print_help): Document --infodir.
+	(main): Compare the basename of infile sans .info to the dir entry,
+	not infile itself.
+	* util/Makefile.in (clean): Remove the install-info binary.
+
+	* info/Makefile.in (distclean): Remove *.info* files.
+
+	* Makefile.in (install),
+	* info/Makefile.in (install),
+	* makeinfo/Makefile.in (install): Use --infodir instead of --info-file.
+
+	* info/info.c,
+	* makeinfo/makeinfo.c: Avoid newlines in string constants for the
+ 		sake of SunOS cc.
+
+	* makeinfo/multi.c: Do not assume ANSI C.
+
+	* info/info.texi: Oops, need @end vtable for a @vtable.
+
+Sat Sep 28 16:31:28 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* Makefile.in (texinfo): Do not depend on sub-all, as then
+        makeinfo is always run.  Instead, depend on texinfo.texi.
+
+	* makeinfo/Makefile.in (info, dvi): New targets.
+	makeinfo.info, makeinfo.dvi: Do not depend on macro.texi for now.
+
+	* info/Makefile.in (install): Must call install-info twice.
+
+	* info/info-stnd.texi,
+	* info/info.texi,
+	* makeinfo/makeinfo.texi: Include direntry.
+
+	* emacs/Makefile.in: Use && after cd, etc.
+
+	* texinfo.texi: Kludges so makeinfo -E will not create spurious
+        differences.  Add new direntries.
+
+	* util/install-info.c,
+	* util/texindex.c,
+	* makeinfo/makeinfo.c,
+	* info/info.c: Standardize --version output.
+
+	* makeinfo/makeinfo.c (defun_internal): Don't insert index command
+ 	if expanding macros.
+	(cm_footnotestyle): Don't change the footnote style if it was set
+	on the command line.
+
+	* util/texi2dvi: Recompute original index files each time through loop.
+	Make indentation uniform.
+	Use same basename for the temp input files.
+	Standardize --version output.
+
+	* info/Makefile.in (install),
+	* makeinfo/Makefile.in (install): Insert $(POST_INSTALL).
+
+Fri Sep 27 13:27:30 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.texi (Format with texi2dvi): Rewrite now that the script
+ 	runs in a loop.
+
+	* info/Makefile.in (MAKEINFO): Simplify to ../makeinfo/makeinfo.
+
+Fri Sep 27 00:26:03 1996  Miles Bader  <miles@gnu.ai.mit.edu>
+
+	* info/terminal.c [HAVE_TERMIOS_H] (terminal_prep_terminal,
+	terminal_unprep_terminal): Add code for termios.
+	[HAVE_TERMIOS_H] (original_termios, ttybuff): New variables.
+	* info/termdep.h: [HAVE_TERMIOS_H]: Add include of <termios.h>.
+	* configure.in: Add check for <termios.h>.
+
+Thu Sep 26 10:46:34 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* emacs/texnfo-upd.el,
+	* emacs/texinfo.el,
+	* emacs/texinfmt.el: Update from bob for new Texinfo commands, etc.
+
+	* emacs/info.el, emacs/informat.el, emacs/makeinfo.el,
+	emacs/texnfo-tex.el: Update from Emacs 19.34 dist.
+
+	* emacs/elisp-comp: Use TMPDIR if set.
+
+	* util/Makefile.in (libdir): Remove.
+
+	* makeinfo/Makefile.in (install),
+	* Makefile.in (install),
+	* info/Makefile.in (install): Run install-info.
+	(libdir): Remove.
+
+	* texinfo.texi: Various fixes as I make this go through TeX.
+
+	* util/install-info.c: Quote newlines in help message.
+
+	* util/texi2dvi (texi2dvi): Run TeX until the aux/index files
+        stabilize, instead of just twice.  From: David Shaw
+        <daves@gsms01.alcatel.com.au>.
+
+Tue Sep 24 14:43:03 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* dir: Blank dir file for installation on new systems.
+
+Mon Sep 23 12:18:43 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (args_from_string): Do not back up at a };
+ 		that leads to an infinite loop.
+
+Sat Sep 21 17:48:04 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (cm_xref): Do not seg fault if outside of
+ 	any node.  From: Tom Tromey <tromey@creche.cygnus.com>.
+	(cm_ctrl): Make obsolete.
+
+Tue Sep 17 13:30:08 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\inforef): Move to more appropriate place.
+	(\pounds): Remove spurious extra $.
+	(\email): Typeset argument in angle brackets.
+	(\macro): Use \doignore for robustness, instead of just letting TeX
+	parse the argument.
+	(\unmacro): Define.
+
+Sat Sep 14 16:17:35 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.texi: Document multitables, new ISBN number.
+
+Wed Sep 11 18:01:24 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/multi.c (struct env): Remove unused output_position
+        field; this needs to be global.
+        (setup_multitable_parameters): Implement template-defined multitables.
+	(output_multitable_row): Remove trailing whitespace.
+
+	* makeinfo/makeinfo.c (_READ_BUFFER_GROWTH, struct _defines):
+	Remove leading underscore for POSIX/ANSI pedants.
+	(init_conversion): Initialize output_position here.
+	(init_paragraph): Instead of here, where it loses with the
+	multitable calls, eventually resulting in negative counts to the
+	write call when the output file is split.
+
+	* texinfo.texi: First cut at macro documentation.
+	Change accent doc to use tables.
+	Remove whitespace experiments, they are now the default.
+
+Mon Sep  9 14:16:24 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c: Use putc instead of fprintf where possible.
+        (cm_accent): Put _ from @ubaraccent after argument.
+
+	* util/texindex.c (strerror) [!strerror]: Conditionalize
+ 		declaration.
+
+Sat Sep  7 14:13:24 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (commandTable): Obsolete @setchapterstyle.
+
+Thu Sep  5 15:45:11 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (convert_from_loaded_file): Oops, fix
+ 		wording of initial output comment.
+
+	* makeinfo/makeinfo.c (cm_angle_brackets): Rename from cm_key.
+        (commandTable): @email should produce angle brackets.
+	@key: Change name.
+
+Tue Sep  3 14:52:17 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\hsize): Decrease.
+        (\hoffset): Increase.
+	(\setleading): Decrease dramatically.
+	This change affects 8.5x11 format only.
+
+	* texinfo.texi: Document accent commands.
+
+Mon Sep  2 11:10:49 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (commandTable): Deprecate @ichapter and
+	@titlespec.
+	Move all the deprecated @i<section> commands to the end of the list.
+
+	* texinfo.texi: Document @pounds{} and @centerchap{}.
+
+	* texinfo.tex (\centerchfplain): Rewrite to use \chfplain, and to
+ 	actually center.
+	(\unnchfplain): Just call \chfplain.
+	(\chfplain): Rewrite to be generally callable.
+	(\centerparametersmaybe): Hook, a no-op except with @centerchap.
+
+Sun Sep  1 15:01:49 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.texi: Document @<whitespace>, rearrange spacing section.
+
+	* makeinfo.c (commandTable): Make @. @? @! insert themselves,
+ 	not be sentence-non-enders.  They are sentence *enders*.  Also,
+ 	make @\t and @\n insert a normal space character, not themselves.
+  	Also, define @hyphenation.
+	(insert_space): New function.
+	(cm_ignore_sentence_ender): Remove this.
+	(flush_output): Check only for META-SPC, not META-<sentence-ender>.
+
+Fri Aug 30 18:55:30 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.texi: Document @- and @hyphenation{}.
+	Miscellanous fixes.
+
+	* makeinfo/makeinfo.c (commandTable): Define @- as cm_no_op, since
+ 	makeinfo doesn't do hyphenation.
+
+Thu Aug 29 13:05:38 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\key): Do not uppercase the argument; key names
+	can be mixed case, e.g., `Control'.
+
+	* makeinfo/makeinfo.c: @infotop, @infounnumbered,
+	@infounnumberedsec, @infounnumberedsubsec,
+	@infounnumberedsubsubsec, @infoappendix, @infoappendixsec,
+	@infoappendixsubsec, @infoappendixsubsubsec, @infochapter,
+	@infosection, @infosubsection, @infosubsubsection:
+	  Remove these long-since obsolete commands.
+	@iappendix, @iappendixsection, @iappendixsec, @iappendixsubsec,
+	@iappendixsubsubsec, @ichapter, @isection, @isubsection,
+	@isubsubsection, @iunnumbered, @iunnumberedsec, @iunnumberedsubsec,
+	@iunnumberedsubsubsec:
+ 	  Deprecate these.
+	@infoinclude:
+	  Obsolete this.
+	@,: Have to take an argument, since have to do @,{c} not c@,; can't
+	feasibly implement the latter in TeX.
+
+	* makeinfo/makeinfo.c: Rename @d to @udotaccent, since this is
+ 		relatively infrequently used.
+
+Tue Aug 27 14:58:56 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* info/info.c (print_short_help),
+	* util/install-info.c (print_help),
+	* util/texi2dvi,
+	* makeinfo/makeinfo.c (usage) Include bug reporting address.
+
+Mon Aug 26 15:27:17 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (commandTable): Remove @input, @medbreak,
+ 		@smallbreak, @overfullrule, @br.
+
+Sun Aug 25 17:25:48 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (commandTable): Unify commands that perform
+        the same operation, such as cm_file, cm_samp, cm_email,
+        etc., which all do cm_code.
+
+	* texinfo.texi: Document @ifhtml ... @end ifhtml.  Change
+	`PlainTeX' to `plain TeX'.
+
+Fri Aug 23 16:03:16 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\pounds): New Texinfo command @pounds{}.
+	(\parskip): New smaller value.
+	(\chapheadingskip, \secheadingskip, \subsecheadingskip): New smaller
+	values, both for 8.5x11 and @smallbook formats. From Bob.
+
+	* makeinfo/makeinfo.c (cm_special_char): @pounds{} prints a #.
+	(commandTable): Add new command @pounds.
+
+Tue Aug 20 13:47:20 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (CommandTable): Restore "!", accidentally
+        removed previously.
+
+	* texinfo.tex (\key): Typeset a lozenge around the argument (from
+	gildea@intouchsys.com).
+	* makeinfo/makeinfo.c (cm_key): Surround arg with <...> to match
+        new lozenge style in TeX.
+
+Wed Aug 14 16:59:23 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.texi: Propagate change from rms.
+
+Tue Aug 13 11:33:27 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.texi: Propagate change from rms.
+
+	* texinfo.texi: Document other @headings options.
+
+Sun Aug 11 13:19:42 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (cm_accent, cm_special_char, cm_dotless):
+	New functions.
+	(CommandTable): Add new commands for all of plain.tex's
+	accents and non-English characters.
+
+Fri Aug  9 14:12:07 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (convert_from_loaded_file): Say we're making
+ 	``text'' file if no_headers.  Also, use `input_filename' instead
+ 	of just `name' for clarity.
+	(suffixes): Check for no suffix last, i.e., prefer `foo.texi' as an
+	input file to `foo'.  (The latter is probably a binary.)
+
+Mon Aug  5 13:52:39 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\heading, \subheading, \subsubheading): Can no
+ 	longer call the nonexistent \*secheadingi series. Instead, call
+ 	\plain*secheading.
+	(\plainsubsecheading, \plainsubsubsecheading): New macros, by analogy
+	with \plainsecheading.
+	(\unnumberedsubseczzz, \unnumberedsubsubseczzz): Call them.
+
+Sun Aug  4 16:46:10 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* makeinfo/makeinfo.c (flush_output): Mask out eighth bit, that we
+ 	turned on in non-sentence enders.
+
+Sat Aug  3 14:03:10 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\HEADINGSdouble, \HEADINGSsingle,
+ 	HEADINGSdoubleafter, \HEADINGSsingleafter, \CHAPPAGoff,
+ 	\CHAPPAGon, \CHAPPAGodd): Set \contentsalignmacro, analogous to
+ 	\pagealignmacro.
+	(\startcontents): Call \contentsalignmacro instead of \pagealignmacro.
+
+Mon Jul 29 14:44:33 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\indexfonts): Make leading be 12pt. Otherwise, it's
+ 	too crammed.
+	(\smalllispx): Remove \setleading{10pt}. That was too small.
+	(\doprintindex): Do not call \tex ... \Etex.  Index files are Texinfo
+	source, not TeX source, except for using \ instead of @ as the
+ 	escape character (for now).
+
+Sun Jul 28 13:37:05 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (paragraphindent): Move to more reasonable place in
+        the source file.
+        (chapfonts, secfonts, subsecfonts, indexfonts): Call \setleading.
+	(\chfplain, \secheading, \plainsecheading, \subsecheading,
+	 \subsubheading): Rewrite to properly \hangindent the title.
+     	(\sectionheading): New generic macro to print section titles.
+
+	* texinfo.texi: Update the `Obtaining TeX' node.
+
+Fri Jul 26 14:11:48 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* util/texi2dvi: Do macro expansion with makeinfo before running TeX.
+	Various expansion safety measures added for test; avoid use of -o.
+
+	* makeinfo/makeinfo.c (usage): More usage message tweaks.
+
+Fri Jul 26 11:55:37 1996  Karl Berry  <karl@laurie>
+
+	* util/texi2dvi: Format usage message to conform to the other *utils.
+
+Thu Jul 25 17:05:47 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* emacs/Makefile.in: Do not compile the Elisp by default.  We
+	don't install it, so it confuses people to compile it.
+
+Sun Jul 21 07:20:09 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* util/Makefile.in (install-info): Dependency should be
+ 	  install-info.o, not install-info. Also, update copyright years.
+
+	* makeinfo/makeinfo.c (cm_printindex): Don't call execute_string
+        to print index entries, we've already done the expansion now.
+
+	* makeinfo/makeinfo.h: Add copyright.  Finish merge of rms changes.
+	* makeinfo/makeinfo.c: Finish merge, add my expansion changes again.
+	* makeinfo/multi.c: Add copyright message.
+
+Fri Jul 19 10:35:22 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* info/info.c: Update copyright date.
+
+	* info/info.texi,
+	* util/install-info.c,
+	* emacs/Makefile.in,
+	* emacs/texnfo-tex.el,
+	* emacs/Makefile.in: Change FSF address.
+
+	* Merged changes from bfox -- below, plus multitable changes, plus
+	lots more.
+
+	    Sun Apr 14 08:49:50 1996  Brian J. Fox  <bfox@nirvana.samsara.com>
+
+		    * makeinfo/makeinfo.c (remember_node_reference): Numerous commands
+		    call remember_node_reference.  If a node has not yet been defined,
+		    use the empty string as the current node for those cases.
+
+	    Mon Feb 12 17:35:38 1996  Brian J. Fox  <bfox@nirvana.samsara.com>
+
+		    * makeinfo/makeinfo.c (push_node_filename): Clean up calls to
+		    xmalloc and xrealloc.  Only have to call xrealloc.
+
+	    Fri Jan 26 08:00:38 1996  Brian J. Fox  <bfox@nirvana.samsara.com>
+
+		    * info/session.c (info_input_buffer_space_available): Fix typo
+		    which forced the limitation of the sizeof (int) instead of sizeof
+		    (buffer).
+
+		    * Makefile.in (PACKVER): now at 3.8.  Add TERMIOS support to
+		    Info.  Minor bugs fixed in Makeinfo.
+
+Sat Jul 13 11:58:57 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.texi (ftable vtable): Mention example.
+
+Sun Jun 30 14:59:51 1996  Karl Berry  <karl@goldman.gnu.ai.mit.edu>
+
+        * makeinfo/makeinfo.c (cm_email): New function for new @email command.
+	* texinfo.texi (email): New node documenting it.
+
+Wed Apr 17 18:07:34 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+
+	* makeinfo/makeinfo.c (cm_kbd): Do nothing if in @example or @code.
+	(struct brace_element): New field in_fixed_with_font.
+	(remember_brace_1): Save in_fixed_with_font.
+	(pop_and_call_brace): Restore in_fixed_with_font.
+	(cm_code): Don't decrement in_fixed_with_font at end of construct.
+	(struct istack_elt): New field in_fixed_with_font.
+	(push_insertion, pop_insertion): Save and restore in_fixed_with_font.
+	(end_insertion): Don't decrement in_fixed_with_font here.
+	(not_fixed_width): New function.
+	(cm_sc, cm_var, cm_italic, cm_roman, cm_titlefont):
+	Use not_fixed_width.
+
+Sat Apr 13 23:22:05 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+
+	* util/install-info.c (main): Fatal error if no input file spec'd.
+	Look for START-INFO-DIR-ENTRY, not BEGIN-INFO-DIR-ENTRY.
+
+Thu Apr 11 18:21:50 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+
+	* makeinfo/makeinfo.c (cm_enddots): New function.
+	(self_delimiting): Accept -, ^ and ".
+	(CommandTable): Add commands -, ^, ", enddots, centerchap.
+
+Sun Mar 24 12:18:32 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+
+	* makeinfo/makeinfo.c (enum insertion_type): Add `direntry'.
+	(insertion_type_names): Add "direntry".
+	(cm_dircategory): New function.
+	(cm_direntry): New function.
+	(CommandTable): Add "dircategory" and "direntry".
+	(insert_string): New function.
+	(end_insertion): Handle direntry.
+	(begin_insertion): Handle direntry.
+
+Sun Mar 24 11:10:05 1996  Karl Berry  <karl@spiff.gnu.ai.mit.edu>
+
+        * makeinfo/makeinfo.c (cm_url): New function for new @url command.
+
+Fri Feb 23 21:14:40 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+
+	* info/Makefile.in (install, uninstall): Use manprefix.
+
+Fri Feb 23 19:50:18 1996  Richard Stallman  <rms@whiz-bang.gnu.ai.mit.edu>
+
+	* util/Makefile.in (install-info, install-info.o): New targets.
+	(all): Depend on install-info.
+	(install, uninstall): Operate on install-info.
+
+	* install-info.c: New file.
+
+Wed Jan  3 10:01:45 1996  Brian J. Fox  <bfox@nirvana.datawave.net>
+
+        * makeinfo/makeinfo.c (make_index_entries_unique): Be a little bit
+	stricter about what makes two index entries identical.
+
+Fri Dec 29 13:00:24 1995  Brian J. Fox  <bfox@wizard.datawave.net>
+
+	* makeinfo/makeinfo.c (Whole File): Add @detailmenu for allowing
+	detailed menu listings to appear while still defaulting nodes.
+
+Wed Dec 27 13:54:30 1995  Brian Fox  <bfox@albert.gnu.ai.mit.edu>
+
+	* makeinfo/makeinfo.c (cm_code): Always notice that we are in
+	fixed_width_font, even if other formatting changes are not to take
+	place.
+
+Sat Dec 23 11:48:43 1995  Brian J. Fox  <bfox@wizard.datawave.net>
+
+	* info/man.c: (clean_manpage) Remove ^L's from page.
+
+	* makeinfo/makeinfo.c (get_brace_args): Change some memcpy's to
+	memmoves.
+
+	* info/info.c (main): Prefer caseless matches over partial
+	matches.
+
+	* Makefile.in (All Subdir Targets): Change suggested by Debian
+	people which allows errors in recursive makes to kill the
+	top-level make.
+
+	* makeinfo/Makefile.in (makeinfo.dvi): New target.
+
+	* info/info.c (main): Print version of containing texinfo package.
+
+	* makeinfo/makeinfo.c (flush_output): Don't strip high-bit from
+	sentence_enders.
+	Print the version number of the containing texinfo package.
+
+	* info/man.c (locate_manpage_xref): Count the 0th entry.
+
+	* makeinfo/makeinfo.c (cm_menu): If a menu is seen before a node
+	has been defined, warn, and create the node `Top'.
+
+Wed Jun 21 03:19:39 1995  Brian Fox  <bfox@albert.gnu.ai.mit.edu>
+
+	* makeinfo/makeinfo.c (cm_infoinclude): Clean up after printing
+	error if the file couldn't be included.
+	(discard_braces): Print errors only for those unmatched open
+	braces that belong to a texinfo command.
+
+	* */Makefile.in: Use @CFLAGS@ and @LDFLAGS@.
+
+	* makeinfo/makeinfo.c: End `node_search_string' and friends with a
+	terminating null character.
+
+Wed Jun 21 01:23:49 1995  Jim Meyering (meyering@comco.com)
+
+	* makeinfo/makeinfo.c: Close comment after #endif.
+
+Tue Jun 20 04:58:26 1995  Brian Fox  <bfox@albert.gnu.ai.mit.edu>
+
+	* emacs/Makefile.in (install): Fix typo: "fle" -> "file".
+
+	* Makefile.in (VERSION): Bump to 3.6
+
+	* info/clib.c: Include general.h for `info_toupper' and friends.
+
+	* info/clib.h: strncmp and strncascmp return an int.  What kind of
+	drugs was I on?
+
+Mon Jun 19 23:34:47 1995  Brian Fox  <bfox@albert.gnu.ai.mit.edu>
+
+	* makeinfo/makeinfo.c (make_index_entries_unique): Copy the last
+	index entry.
+
+Mon Jun 19 21:55:49 1995  Noah Friedman  <friedman@prep.ai.mit.edu>
+
+        * util/texi2dvi (--version): New option.
+        Cosmetic changes.
+
+Mon Jun 19 16:06:40 1995  Brian Fox  <bfox@albert.gnu.ai.mit.edu>
+
+	* makeinfo/makeinfo.c (cm_macro): Fix typo.  `x != y' is not the
+	same as `x |= y'.
+
+	* info/Makefile.in (exec_prefix): Use @exec_prefix@ not $(prefix).
+	* makeinfo/Makefile.in (exec_prefix): Use @exec_prefix@ not $(prefix).
+	* util/Makefile.in (exec_prefix): Use @exec_prefix@ not $(prefix).
+	* libtxi/Makefile.in (exec_prefix): Use @exec_prefix@ not $(prefix).
+
+	* emacs/Makefile.in (uninstall): New target.
+	(install): Use the definition of $(lispdir), don't dynamically
+	find it.  Use INSTALL_DATA not cp.
+	(exec_prefix): use @exec_prefix@ not $(prefix).
+
+	* makeinfo/makeinfo.c (apply): If there isn't an actual argument
+	for a named argument, default it to "".
+
+	* Makefile.in (VERSION): Now at 3.5.
+	(texinfo): Make ./makeinfo/makeinfo depend on sub-all for parallel
+	makes.
+
+	* emacs/Makefile.in (ELISP_OBJS): Explictly declare .el and .elc
+	in the SUFFIXES list.
+
+	* makeinfo/makeinfo.c (cm_today): Special case for losing alpha.
+	* (minor_version): Increase to 63.
+
+	* info/info.c (version_string): Now at 2.14.
+	* info/tilde.c: Declare getenv to return (char *).
+	* info/window.c (build_message_buffer): Jump through hoops to keep
+	DEC Alpha's happy.
+
+	* info/xmalloc.c: Declare malloc and realloc as (void *) returning
+	functions.
+
+Sun Jun 18 12:47:21 1995  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+
+	* emacs/detexinfo.el (detexinfo-line-cmds-without-arg):
+	Handle ifhtml.
+
+Fri Jun 16 13:48:14 1995  Brian Fox  <bfox@albert.gnu.ai.mit.edu>
+
+	* util/texindex.c: Update TEXINDEX_VERSION_STRING for texinfo 3.4
+
+	* (All *.c *.h *.in): Change FSF old address to new.
+	* texinfo.texi (Obtaining TeX): Change FSF old address to new
+	address.  Change Old phone numbers to new phone numbers.
+
+	* Makefile.in (VERSION): Change to 3.4.
+
+Thu Jun 15 22:49:07 1995  Robert J. Chassell  <bob@hill.gnu.ai.mit.edu>
+
+        * texinfo.texi, emacs/=development/cover.texi: update
+          Texinfo distribution package version number
+
+Thu Jun 15 09:23:02 1995  Brian J. Fox  <bfox@wizard.datawave.net>
+
+	* info/info.c: (minor_version): Set to 13.
+
+	* info/clib.c,h: New files gather together replacement functions
+	for those POSIX-style C library functions that are not present on
+	the target system.
+
+	* info/Makefile.in (SRCS): Add clib.c and clib.h.  makedoc now
+	needs clib.o to build on systems missing various string.h stuff.
+
+	* info/variables.c (whole file): Call strdup, not savestring.
+	* info/tilde.c (whole file): Call strdup, not savestring.
+	* info/search.c (whole file): Call strdup, not savestring.
+	* info/nodes.c (whole file): Call strdup, not savestring.
+	* info/nodemenu.c (whole file): Call strdup, not savestring.
+	* info/man.c (whole file): Call strdup, not savestring.
+	* info/makedoc.c (whole file): Call strdup, not savestring.
+	* info/m-x.c (whole file): Call strdup, not savestring.
+	* info/info.c (whole file): Call strdup, not savestring.
+	* info/indices.c (whole file): Call strdup, not savestring.
+	* info/echo_area.c (whole file): Call strdup, not savestring.
+	* info/session.c (whole file): Call strdup, not savestring.
+	* info/filesys.c (whole file): Call strdup, not savestring.
+
+	* makeinfo/makeinfo.c (minor_version): Change to 1.62.
+	* makeinfo/makeinfo.c (get_execution_string): Initialize `i' to 0
+	in case there are no execution_strings.
+
+Wed Jun 14 17:48:06 1995  Brian J. Fox  <bfox@wizard.datawave.net>
+
+	* texinfo.texi: include "texinfo.tex", not "texinfo".
+	* info/session.c (forget_window_and_nodes): Place a sequence point
+	in between "info_windows[i] = info_windows[++i];" as per various
+	compiler experts.
+
+	* makeinfo/makeinfo.c (strdup): Create this function if the system
+	doesn't have it.
+	(discard_insertions): Use the insertion's filename, not the
+	current input file.
+	(push_insertion): Remember the current input file with each
+	insertion.
+	(pop_insertion): Free storage used by remembered input file.
+
+	* makeinfo/makeinfo.c (whole file): Use `strdup' instead of
+	`savestring'.
+	* configure.in: Check for `strdup'.
+
+Wed Jun 14 15:58:51 1995  Brian Fox  <bfox@albert.gnu.ai.mit.edu>
+
+        * libtxi/Makefile.in (prefix): Use @prefix@, not /usr/local/
+
+Wed Jun 14 10:50:57 1995  Brian J. Fox  <bfox@wizard.datawave.net>
+
+	* Makefile.in (DISTFILES): Don't include *.elc files in the list
+	  of files to distribute.
+	  (installdirs): Include `emacs' in the list of sub-dirs with
+	  Makefile.in's.
+
+	* emacs/elisp-comp: Shell script which batch compiles the *.el files.
+	* emacs/Makefile.in: New file contains targets to build the elc files.
+	* configure.in: Add `emacs/Makefile' to the list of created makefiles.
+	* makeinfo/makeinfo.c (whole file): Give every function a return
+	  type.  All cm_xxx functions are now void.  Add declarations for
+	  functions to top of file.
+
+Mon Jun 12 12:00:57 1995  Brian J. Fox  <bfox@wizard.datawave.net>
+
+	* info/man.c (reference_section_starters): Add versions of "SEE
+	ALSO" and "RELATED INFORMATION" with tabs instead of spaces as
+	well.
+
+	* util/texindex.c: Back out changes for OFF_T.  Explicity coerce
+	the result of lseek to a long, and use longs everywhere.
+
+	* texinfo.texi: Change "@end shorttitlepage" to "@end titlepage".
+	* makeinfo/makeinfo.c: Make @shorttitlepage ignore the rest of the
+	line.
+
+	* util/texindex.c (strrchr): Create if not present.
+	Test for HAVE_STRCHR and HAVE_STRING_H.
+	(main): Make PROGRAM_NAME be just the last path componenet of argv[0].
+	(decode_command): Rewrite.
+	(usage): Rewrite.  Now texindex handles --version.
+
+	* makeinfo/makeinfo.c (make_index_entries_unique): Rewrite from
+	scratch.
+
+	* Don't distribute created info files with texinfo.  After all,
+	the user will have the tools necessary to create them, yes?
+
+	* Makefile.in (distclean): Remove *.log
+
+	* info/man.c (read_from_fd): Change timeout value for select to 15
+	seconds.  Some systems (e.g., albert.ai.mit.edu) actually need
+	more than 10 seconds to format a man page.
+
+	* info/tilde.c: Fix typo in declaration for
+	`tilde_expansion_failure_hook'.
+
+Wed Jun  7 13:36:53 1995  Brian Fox  <bfox@albert.gnu.ai.mit.edu>
+
+	* info/tilde.h: Change type of tilde_expansion_failure_hook to
+	a pointer to a function returning a (char *).
+	* info/tilde.c: Change type of tilde_expansion_failure_hook to a
+	pointer to function returning a (char *).
+
+	* makeinfo/makeinfo.c (get_execution_string): Don't use `i' in the
+	latter assignment, use `execution_strings_index' instead.
+
+	* info/man.c (read_from_fd): Change logic to avoid using FIONREAD.
+
+	* info/xmalloc.c (xrealloc): Use (void *), not (caddr_t *).
+	* info/xmalloc.c (xmalloc): Use (void *), not (caddr_t *).
+
+	* Makefile.in (DISTFILES): Don't find RCS no "=" directories.
+
+	* util/Makefile.in (prefix): Use @prefix@ as the value.
+	* info/Makefile.in (prefix): Use @prefix@ as the value.
+	* makeinfo/Makefile.in (prefix): Use @prefix@ as the value.
+
+Wed Jun  7 12:29:28 1995  Robert J. Chassell  <bob@hill.gnu.ai.mit.edu>
+
+        * texinfo.texi: Correct minor typos.
+
+        * emacs/texinfmt.el:  Don't require @shorttitlepage to be inside
+          of @iftex ... @end iftex
+
+Mon May  8 18:33:52 1995  Brian J. Fox  <bfox@wizard.datawave.net>
+
+	* info/nodes.c: #include "man.h" if HANDLE_MAN_PAGES.
+	(info_get_node_of_file_buffer): If the file buffer is one
+	associated with manpages, call the manpage node finding
+	function instead.
+	(info_find_file_internal): If the file buffer is one associated
+	with manpages, avoid doing any file I/O.
+	(info_reload_file_buffer_contents): Ditto.
+	(info_find_file_internal): Call create_manpage_file_buffer instead
+	of info_load_file_internal.
+
+	* info/info.c: #include "man.h" if HANDLE_MAN_PAGES.
+	(main): If the initial node cannot be found, perhaps find it as a
+	manpage.
+	* info/info-utils.c: #include "man.h" if HANDLE_MAN_PAGES.
+	(info_xrefs_of_node): If handling man pages, and this is a manpage
+	node, use xrefs_of_manpage.
+
+	* info/session.c (info_set_input_from_file): Only fclose (stream)
+	if it is non-null and not stdin.
+	#include "man.h" if HANDLE_MAN_PAGES.
+	(info_menu_or_ref_item): If handling man pages, and this is a
+	manpage node, get the xrefs from manpage_xrefs_in_binding.
+	(info_man): Compile in for M-x man if handling man pages.
+	(info_move_to_xref): If handling man pages, and the current node
+	is a manpage node, use locate_manpage_xref to get xrefs.
+
+Thu May  4 08:55:23 1995  Brian J. Fox  <bfox@wizard.datawave.net>
+
+	* info/info.c (main): If the output device is not a terminal, and
+	no output filename has been specified, make user_output_filename
+	be "-", so that the info is written to stdout, and turn on the
+	dumping of subnodes.
+
+Thu Apr 13 18:05:06 1995  Daniel Hagerty  <hag@churchy.gnu.ai.mit.edu>
+
+	* texinfo.texi: Fixed @end titlepage/@end shorttitlepage
+
+Sat Apr  8 12:51:49 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+	* makeinfo/makeinfo.c [! HAVE_STRERROR] (strerror): New function,
+ 	snarfed from ../info/filesys.c.
+	(cm_infoinclude): Use strerror instead of sys_errlist.
+
+Tue Apr  4 18:44:00 1995  Brian J. Fox  <bfox@wizard.datawave.net>
+
+	* util/texindex.c (sort_offline): Change TOTAL to be an off_t.
+	* util/texindex.c (sort_in_core): Change TOTAL to be an off_t.
+	* util/texindex.c (MAX_IN_CORE_SORT): Cast to off_t.
+
+Sun Apr  2 16:20:13 1995  Brian J. Fox  <bfox@wizard.datawave.net>
+
+	* info/Makefile.in: Define DEFAULT_INFOPATH in case we are
+	compiling in the current directory.
+	* info/Makefile.in (info.o): Add filesys.h because of DEFAULT_INFOPATH.
+	* info/(search.c,h, nodes.c info-utils.c) Use strcasecmp and
+	strncasecmp instead of stricmp and strnicmp.  Define strcasecmp
+	and strncasecmp in search.c if !HAVE_STRCASECMP.
+	* info/search.c: If HAVE_STRING_H include it.
+	* info/nodes.c: If HAVE_STRING_H include it.
+	* info/info-utils.c: If HAVE_STRING_H include it.
+	* info/info.h: If HAVE_STRING_H include it.
+	* configure.in (AC_HAVE_FUNCS): Check for strcasecmp.
+	* makeinfo/makeinfo.c (strcasecmp): Define if !HAVE_STRCASECMP.
+	* makeinfo/makeinfo.c (entire file): Use `strcasecmp' instead of
+	`stricmp'.
+	* makeinfo/makeinfo.c (cm_ifeq): New command takes three args.
+	Compares first two, executes remainder if the first two are
+	string-wise eq.
+	* makeinfo/makeinfo.c (ifhtml): Add to command list.  Shouldn't be
+	used, but it is by people who don't want to hack macros.
+
+Sat Apr  1 09:20:14 1995  Brian J. Fox  <bfox@wizard.datawave.net>
+
+	* makeinfo/makeinfo.c (begin_insertion): Fix reversed arguments to
+	line_error.
+
+	* info/info-stnd.texi: Use "end" footnote style instead of "separate".
+
+	* info/Makefile.in: Change "rm -f" to $(RM).
+
+	* info/general.h: Define zero_mem in terms of memset if we have
+	it, else in terms of bzero if we have that, else as inline code.
+
+	* info/NEWS: Updated to reflect changes in 2.11.
+
+Fri Mar 31 22:38:31 1995  Brian J. Fox  <bfox@wizard.datawave.net>
+
+	* Makefile (DISTFILES): Don't include *.a, *orig, nor *.e
+	files.
+	(DISTFILES):
+
+Sat Mar  4 12:16:29 1995  Brian J. Fox  <bfox@wizard.datawave.net>
+
+	* Makefile.in: Use @prefix@ instead of hardwired `/usr/local'.
+	  Clean up makefile rules which make in subdirs.
+	  (ALL_SUBDIRS): Add makeinfo/macros to list of subdirectories.
+
+	* configure.in (AC_CHECK_FUNCS): Add `bcopy' to list of things to
+	check for.
+
+Fri Mar  3 13:54:10 1995  Robert J. Chassell  <bob@hill.gnu.ai.mit.edu>
+
+        * texinfo.texi: Minor changes for incremental new edition 2.20.
+
+Fri Mar  3 19:01:36 1995  Brian J. Fox  <bfox@wizard.datawave.net>
+
+	* filesys.c (filesys_read_info_file): Local variable ST_SIZE is a
+	long which has the value of finfo->st_size casted to it.
+	* nodes.c (whole file): Similar changes.
+
+	These changes and the following for makedoc.c were required for
+	proper operation on HPm68k NetBSD.
+
+Mon Feb 27 15:16:27 1995  Brian J. Fox  <bfox@wizard.datawave.net>
+
+	* makedoc.c (process_one_file): Local variable FILE_SIZE is a long
+	which has the value of finfo.st_size casted to it.
+
+
+Fri Mar  3 18:58:38 1995  Brian J. Fox  <bfox@wizard.datawave.net>
+
+	* makeinfo.c (find_and_load): Cast fileinfo.st_size to a long for
+	internal use.  This makes things work on NetBSD.
+
+
+Fri Mar  3 13:54:10 1995  Robert J. Chassell  <bob@hill.gnu.ai.mit.edu>
+
+        * texinfo.texi: Minor changes for incremental new edition 2.20.
+
+Fri Mar  3 09:41:39 1995  Brian J. Fox  <bfox@wizard.datawave.net>
+
+	* configure.in (TERMLIBS): Use AC_CHECK_LIB instead of
+	AC_HAVE_LIBRARY.
+
+Mon Jan  9 16:55:31 1995  Brian Fox  <bfox@churchy.gnu.ai.mit.edu>
+
+	* Makefile.in (DISTFILES): Add the directory EMACS-BACKUPS to the
+	list of things to avoid distributing.
+
+Tue Nov 29 17:48:37 1994  David J. MacKenzie  <djm@duality.gnu.ai.mit.edu>
+
+	* configure.in: Check for off_t.
+	* util/texindex.c (main): Use it.
+
+Fri Nov 11 14:46:28 1994  David J. MacKenzie  <djm@duality.gnu.ai.mit.edu>
+
+	* configure.in: Update for Autoconf v2.
+
+Thu Oct 13 02:17:38 1994  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+
+	* emacs/detexinfo.el (detexinfo): Handle @!, @?, @^, @".
+
+Mon Aug  1 03:26:13 1994  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+
+	* texindex.c: Move the memset define down past string.h include.
+
+Tue Jun 28 14:21:43 1994  David J. MacKenzie  (djm@churchy.gnu.ai.mit.edu)
+
+	* makeinfo/makeinfo.c: Add --help option.
+	(usage): Take args for stream and error code.
+	Change callers.
+	(print_version_info): Write to stdout, not stderr.
+
+Wed May 18 18:55:24 1994  Brian J. Fox  (bfox@ai.mit.edu)
+
+	* info/session.c (forget_window_and_nodes): Negate test for
+	internal_info_node_p.  We only want to free the text if it is
+	not an internal node.
+
+Thu Mar 10 03:07:18 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* texindex.c (memset): Fix invalid parm name (was 0).
+
+Thu Feb 10 12:56:52 1994  Noah Friedman  (friedman@prep.ai.mit.edu)
+
+        * makeinfo/makeinfo.c (current_item_function): Don't loop if elt
+        is NULL.
+
+Wed Feb  9 12:21:09 1994  Brian J. Fox  (bfox@ai.mit.edu)
+
+	* makeinfo/makeinfo.c (minor_version): Release now at 1.60.
+
+	* makeinfo/makeinfo.c (expand_filename): Additional fixes.  Now
+	when called with NULL filename, makes an output filename from the
+	input filename.
+	(convert_from_loaded_file): If REQUIRE_SETFILENAME is #defined (no
+	longer the default case) then error if no @setfilename was found
+	in the file.  If REQUIRE_SETFILENAME is not #defined, the input
+	file starts either at the first line, or at the second line if the
+	first line contains the text "\input", and the output filename is
+	the input file name without directory and with ".info" replacing
+	any extension found.
+	(convert_from_loaded_file): Fixed bug in search for first
+	occurence of "@setfilename".
+
+Tue Feb  8 14:16:58 1994  Noah Friedman  (friedman@prep.ai.mit.edu)
+
+        * configure.in: Check for sys/file.h.
+        info/dir.c, info/filesys.c, info/makedoc.c, info/nodes.c,
+        info/session.c, info/termdep.h, makeinfo/makeinfo.c
+        [HAVE_SYS_FILE_H]: Include <sys/file.h>.
+
+        * makeinfo/makeinfo.c (convert_from_loaded_file): Print
+        real_output_filename instead of output_filename, so user knows
+        exactly where output file is going.
+
+        Fri Jun 11 14:34:30 1993  Ian Lance Taylor  (ian@cygnus.com)
+       	* configure.in: Check for sigprocmask and sigsetmask.
+	* info/signals.h (HAVE_SIGSETMASK): Don't define.
+	(HAVE_SIGPROCMASK): Use instead of _POSIX_VERSION.
+	(BLOCK_SIGNAL, UNBLOCK_SIGNAL): If neither HAVE_SIGPROCMASK nor
+	HAVE_SIGSETMASK is defined, define these to do nothing.
+	* info/signals.c (sigprocmask): Don't compile if HAVE_SIGSETMASK
+	is not defined.
+
+	* info/terminal.c (terminal_prep_terminal): Don't clobber VINTR
+	and VQUIT in conditionals.
+
+Mon Feb  7 18:10:22 1994  Brian J. Fox  (bfox@ai.mit.edu)
+
+	* makeinfo/makeinfo.c (full_pathname): Correct to really return
+	the full pathname of the input argument.  Now makeinfo
+	/foo/bar.texi, where /foo/bar.texi contains "@setfilename
+	bar.info", correctly leaves the output file in "./bar.info".
+	Note that "@setfilename ../bar.info" still works; this is already
+	an absolute pathname.
+
+Sat Feb  5 13:04:05 1994  Brian J. Fox  (bfox@ai.mit.edu)
+
+	* makeinfo/makeinfo.c: Version 1.59 released.
+
+	* makeinfo/makeinfo.c (whole file):  Large number of changes allow
+	the "-E filename" option to be used to write a macro expanded
+	output file.  On a file which contains no @include's and no
+	@macro's, the output file is identical to the input file.
+
+	* makeinfo/makeinfo.c (declarations): Remove cm_tex ().  It is
+	never used since it is implemented with `command_name_condition'.
+
+	* makeinfo/makeinfo.c (add_char): Shift braces following the
+	current break point if we have deleted any characters.
+	(adjust_braces_following): New function adjusts all of the markers
+	in the brace stack which follow HERE by AMOUNT.  This fixes a bug
+	where (for example) @var{} immediately following a line break
+	which is the end of a sentence modified the output incorrectly.
+
+Wed Feb  2 14:14:03 1994  Brian J. Fox  (bfox@ai.mit.edu)
+
+	* makeinfo: Version 1.58.
+
+	* makeinfo/makeinfo.c (cm_node): Add extra hair to allow
+	backtracking through execution strings.  Add extra hair to allow
+	the first node seen after a @top node is seen to adjust the
+	sectioning level of the @top node and associated menus.
+	Fix a few typos.
+	Add facility for macros to invoke the original definition.  This
+	works by not allowing a single macro to recurse.  Mutual recursion
+	is also disallowed with this plan.
+
+	* makeinfo/macros: New directory contains shippable macros.
+	* makeinfo/macros/simpledoc.texi: Macros which simplify the most
+	common uses of TeXinfo.  See the example file.
+	Macros are now a reasonable way to get people started using
+	TeXinfo.
+
+Mon Jan 31 12:54:36 1994  Brian J. Fox  (bfox@ai.mit.edu)
+
+	* makeinfo/makeinfo.c (minor_version): Increase to 57.
+
+	* makeinfo/makeinfo.c (cm_node): Call execute_string on the node,
+	next, prev, and up pointers.
+	(reader_loop): Change logic for `@bye'.  No longer required at the
+	ends of executed strings.
+	(execute_string): Do not append `@bye' to the string to execute.
+
+	* makeinfo/makeinfo.c (whole file): Use COMMAND_PREFIX instead of
+	hardcoding `@' character in strings and searches.
+
+	* makeinfo/makeinfo.c (read_command): If HAVE_MACROS is defined,
+	then recognize and execute macros here.
+	(CommandTable): Add "macro" and "unmacro" to table if HAVE_MACROS
+	is defined.
+
+	* makeinfo/makeinfo.c (cm_macro, cm_unmacro, execute_macro)
+	  makeinfo/makeinfo.c (get_macro_args, find_macro, add_macro)
+	  makeinfo/makeinfo.c (delete_macro, array_len, apply):
+	  New functions implement macro facility if HAVE_MACROS is
+	  defined.
+
+	* makeinfo/macro.texi (new file): Examples of using the new macro
+	facility.
+
+Mon Jan 31 10:24:52 1994  Noah Friedman  (friedman@prep.ai.mit.edu)
+
+        * makeinfo/makeinfo.c (executing_string): Restore global
+        declaration.
+
+Mon Jan 24 23:48:26 1994  Noah Friedman  (friedman@prep.ai.mit.edu)
+
+        * texinfo.texi: Various typo fixes from Bob Chassell
+        <bob@gnu.ai.mit.edu>.
+
+Thu Jan  6 13:34:21 1994  Noah Friedman  (friedman@prep.ai.mit.edu)
+
+        * texinfo.texi: Turned on smallbook format and @set smallbook.
+
+Wed Dec 15 20:08:43 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
+
+        * info/filesys.h (DEFAULT_INFOPATH): Added /usr/local/info,
+        /opt/gnu/info, /usr/share/info, and /usr/local/share/info.
+
+Tue Dec 14 19:10:20 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
+
+        * libtxi/Makefile.in (ALLOCA): Define from configure.
+
+Fri Dec 10 04:33:12 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
+
+        * util/texi2dvi: Put under RCS control.
+
+Sun Dec 26 11:55:46 1993  Brian J. Fox  (bfox@ai.mit.edu)
+
+	* info/session.c (info_numeric_digit_arg_loop): Fix doc string.
+
+	* info/infodoc.c (create_internal_info_help_node): Print out list
+	of functions which have to keystroke equivalent if we support
+	NAMED_FUNCTIONS.
+
+	* info/filesys.c (compress_suffixes): Add ".gz" for "gunzip" to
+	alist.
+
+	* info/footnotes.c (make_footnotes_node): If refs[i] doesn't have
+	a nodename, then it couldn't be a reference to a footnote.
+
+	* info/nodemenu.c (get_visited_nodes): Handle the case where
+	filter_func has left no possible buffers to select.
+
+Sat Dec 25 10:35:56 1993  Brian J. Fox  (bfox@ai.mit.edu)
+
+	* info/infodoc.c (create_internal_info_help_node): Conditionalize
+	generation of the help node based on the #define
+	HELP_NODE_GETS_REGENERATED.  When this is not set (the default)
+	the help node is generated exactly once, and is not gc'able.
+	Otherwise, a new node is always created for the help window, and
+	the old node gets garbage collected by the gc system.
+	(info_find_or_create_help_window): Conditionalize window node
+	selected based on the #define HELP_NODE_GETS_REGENERATED.
+
+	* info/dir.c (add_menu_to_file_buffer): Place exactly one blank
+	line between directory entries.
+
+	* info/info.c (version_string): Update minor version to "11".
+
+	* info/info.h: Update comment to "2.11".
+
+	* info/dir.c (maybe_build_dir_node): Only add the contents of a
+	new file if it is not identical to the file of the DIR buffer.
+
+	* info/nodes.c (info_get_node): Call `maybe_build_dir_node' on
+	"dir" as well as "localdir" to mimic emacs-19.22 "dir" merging
+	behaviour.
+
+Fri Dec  3 13:41:44 1993  Brian J. Fox  (bfox@ai.mit.edu)
+
+	* info/info-utils.c (canonicalize_whitespace): Suppress whitespace
+	found at the start of STRING.
+
+Sat Nov 20 14:00:50 1993  Brian J. Fox  (bfox@hippie)
+
+	* info/indices.c (DECLARE_INFO_COMMAND): Fix typo in assignment to
+	`old_offset' (= instead of ==).
+
+Tue Nov  2 12:22:40 1993  Brian J. Fox  (bfox@ai.mit.edu)
+
+	* makeinfo/makeinfo.c (make_index_entries_unique): New function
+	makes a sorted array have all unique entries by appending numbers
+	to the ends of strings.
+	(sort_index): Call `make_index_entries_unique'.
+
+Mon Sep 20 12:04:05 1993  Brian J. Fox  (bfox@ai.mit.edu)
+
+	* makeinfo/makeinfo.c (get_execution_string): New Function returns
+	a pointer to an  EXECUTION_STRING structure.
+	(execute_string): No longer uses a static string; call
+	`get_execution_string' instead in order to get a free buffer for
+	consing.
+
+Sun May 23 07:00:20 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
+
+        * Texinfo 3.1 released.
+
+Sat May 22 18:21:27 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
+
+        * info/info.c (info_patch_level): Increment constant to 1.
+
+        * info/Makefile.in (DEFAULT_INFOPATH): Default definition deleted.
+        Makefile.in: Put it here instead.
+        * Makefile.in (MDEFINES): Add DEFAULT_INFOPATH.
+
+        * configure.in: check for vfprintf and vsprintf.
+
+        * makeinfo/makeinfo.c: Version 1.55.
+
+        * makeinfo/makeinfo.c (add_word_args, execute_string) [HAVE_VARARGS_H]:
+        Don't use this definition unless HAVE_VSPRINTF is also defined.
+        (error, line_error, warning) [HAVE_VARARGS_H]: Don't use this
+        definition unless HAVE_VFPRINTF is also defined.
+        Remove indentation of all cpp directives, except for #pragma.
+
+Fri May 21 14:34:24 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
+
+        * texinfo.texi: Rename to texi.texi.
+        Change @setfilenname and START-INFO-DIR-ENTRY to `texi.info'.
+
+        * Makefile.in (MDEFINES): Pass LDFLAGS to sub-makes.
+        (realclean): Delete `configure'.
+        Changed all references to texinfo.info to texi.info
+
+        * configure.in: Add AC_PROG_RANLIB, and AC_CONST.
+        Check for `rindex' function.
+        Check for varargs.h.
+        Clean up symbol names for header files so a single AC_HAVE_HEADERS
+        can be used.
+        (AC_INIT): Use texi.texi instead of makeinfo/makeinfo.c
+
+        * info/info-utils.h: Copy definitions of bcopy, index, and rindex
+        (with appropriate #ifdef wrappers) from termdep.h.  These are
+        included by a mutually exclusive set of files.
+
+        * info/termdep.h [HAVE_SYS_PTEM]: Use HAVE_SYS_PTEM_H instead.
+
+        * info/terminal.c, info/termdep.h [HAVE_TERMIO]: Use HAVE_TERMIO_H
+        instead.
+
+        * info/makedoc.c, info/filesys.c [!O_RDONLY]: Include fcntl.h or
+        sys/fnctl.h, depending on whether HAVE_SYS_FCNTL_H is set.
+
+        * info/termdep.h: Remove all indentation in #-exprs.
+        Remove old assumptions about bcopy, index, and rindex.
+        [HAVE_BCOPY]: Define bcopy.
+        [HAVE_RINDEX]: Define index and rindex.
+
+        * info/nodes.c (info_get_node): Don't call stricmp if nodename is
+        NULL. Remove indentation in #-exprs.
+
+        * info/echo_area.c (echo_area_stack_depth): Declare static.
+
+        * info/Makefile.in (DEFAULT_INFOPATH): Make separate Makefile
+        variable so it can be overridden more easily by the user.  Add `.'
+        to beginning of path.
+        (clean): Delete core.* (386bsd core files).
+        (MAKEDOC): Variable removed.  Refer to `makedoc' explicitly.
+        (funs.h): Add `:' commands after if, to avoid spurious nonzero
+        exit statuses.
+
+        * info/userdoc.texi: Improved comments explaining its purpose.
+
+        * makeinfo/makeinfo.c [HAVE_VARARGS_H]: Include varargs.h.
+        (error, line_error, warning, add_word_args,
+          execute_string)[HAVE_VARARGS_H]: New versions that
+        use varargs.  From bfox.
+
+        * makeinfo/Makefile.in (clean): Delete core.* (386bsd core files).
+
+        * util/Makefile.in (clean): Remove core.* (386bsd core files).
+
+        * libtxi/Makefile.in: Remove all references to $(common).
+        (RANLIB): New variable, set from autoconf.
+        (libtxi.a): Use $(RANLIB) instead of `ranlib' in target rules.
+        (clean): Delete core.* (386bsd core files).
+
+Tue May 18 12:08:24 1993  Robert J. Chassell (bob at grackle.stockbridge.ma.us)
+
+        * emacs/texinfmt.el (texinfo-format-refill): Do not fill a section
+        title line with the asterisks, hyphens, etc. that underline
+        it in any circumstance.
+
+Sun May 16 13:53:43 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
+
+        * util/mkinstalldirs: handle relative pathnames.
+
+Fri May 14 20:18:49 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
+
+        * util/mkinstalldirs: initialize IFS if unset.
+
+Tue May 11 06:33:14 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
+
+        * makeinfo/makeinfo.c (cm_item): don't dereference item_func if NULL.
+
+Mon May 10 14:50:31 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
+
+        * Texinfo 3.0 released.
+
+        * Makefile.in (ALLOCA): Provide for substitution.
+
+Mon May 10 10:12:53 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
+
+        * emacs/texinfmt.el (texinfmt-version): Updated year.
+
+Fri Apr 16 04:48:03 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
+
+        * makeinfo/makeinfo.c: Version 1.54 from bfox.
+
+        * util/fixfonts: Replace instances of `[..]' with `test'.
+        Use more portable `test' arguments: `z$foo = z' instead of `! $foo'.
+        Robustify quoting in eval assignments.
+        (textfmdir, texpkdir, texgfdir): Don't override definition from
+        environment, if any.
+        Trap EXIT, SIGHUP, SIGINT, SIGQUIT, SIGTERM to delete temp files
+        instead of trying to remove them explicitly before calling exit.
+        When changing cwd, do so in subshell, in case various tex*dir
+        variables are relative.
+        Don't use `head', `dirname', or `basename'.  These don't behave
+        consistently and/or don't even exist on some systems.  They can
+        all be emulated with `sed' anyway.
+        (tempfile2_line1): New variable.  Use it instead of running
+        process to extract first line out of tempfile2 multiple times.
+        Eliminate some gratuitous uses of $tempfile2, such as in for loops.
+
+Fri Mar 26 23:25:13 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
+
+        * texinfo.texi: @setfilename texinfo.info.
+
+        * makeinfo/makeinfo.c (reader_loop, end_insertion): Fix typos in
+        comments.
+        (handle_variable_internal): Handle the case that there further
+        menu text after a false ifset/ifclear.
+
+        * util/texi2dvi: Version 0.4
+        Replace all instances of `[ ... ]' with `test'.
+        Updated bug-reporting address.
+
+Thu Mar 25 12:31:30 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
+
+        * info/Makefile.in (install): Install info.1 man page.
+        (uninstall): Remove installed info.1 man page.
+
+        * info/infoman.texi: Standalone manual renamed to info-stnd.texi.
+        Makefile.in: Targets updated appropriately.
+
+        * info/Makefile.in (LDEFS): New variable.  Use it for info-local
+        macros, since DEFS will be inherited from parent make and any
+        local definitions will get clobbered.
+
+        * info/RELEASE: Renamed to info/NEWS.
+
+        * README: New file.
+
+        * Makefile.in (topclean): New target.
+
+        * Getting-started: Renamed to INTRODUCTION.  Former name is too
+          long (over 14 chars).
+
+        * New-features: Renamed to NEWS.
+
+        * Makefile.in (MDEFINES): Set it.
+
+        * Makefile.in (dist): Use --gzip option to tar to make sure
+          resulting file is compressed with gzip.  Change tar file
+          extension from `.Z' to `.z'.
+
+        * Makefile.in (DISTFILES): Filter out any file or directory names
+          starting with `='.
+
+        * fixfonts: Moved to util/fixfonts.
+
+        * RELEASE: Deleted.
+
+        * makeinfo/Makefile.in (VPATH): Use $(srcdir), not @srcdir@.
+        (common): Use ../libtxi, not ../common.
+        (makeinfo.in): Run makeinfo with --no-split.
+
+        * makeinfo/makeinfo.texi: Changes from bob.
+
+        * util/Makefile.in (VPATH): Use $(srcdir), not @srcdir@.
+        (common): Use ../libtxi, not ../common.
+
+        * util/fixfonts: Moved from top-level directory.
+
+Wed Mar 24 10:21:31 1993  Robert J. Chassell  (bob at grackle)
+
+        * emacs/texinfmt.el (texinfo-format-region): Do not require
+        `@setfilename' line; delete `\input texinfo' line if part of
+        region.
+
+        * emacs/texinfmt.el (texinfo-raise-lower-sections): Raise or lower the
+        hierarchical level of chapters, sections, etc. according to
+        `@raisesections' and `@lowersections' commands.
+
+Thu Mar 18 16:02:27 1993  Robert J. Chassell  (bob at grackle)
+
+        * emacs/texinfo.el (texinfo-show-structure): Indent *Occur* buffer
+        according to the structure of the file.
+
+Sat Mar  6 05:16:44 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
+
+        * util/texi2dvi: use ${1+"$@"}, not just "$@".
+
+Tue Feb  2 08:38:06 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
+
+        * info/Makefile.in: Replace all "--nosplit" arguments to makeinfo
+        with "--no-split"
+
+Sun Jan 31 18:16:58 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
+
+        * util/texi2dvi: Don't put .dvi and related auxillary files in same
+        directory as source files.  Put them in current directory instead.
+        (TEXINPUTS_orig): New variable.
+        (file_texi): Variable removed.
+        (filename_texi): New variable.
+        (command_line_filename): Use this wherever references to file_texi
+        occured except in setting filename_noext.
+        (TEXINPUTS): Current directory and source directory where input
+        file resides prepended to standard path before invoking TeX.
+
+Wed Jan 27 16:24:37 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
+
+        * util/Makefile.in: overhauled.
+
+Tue Jan 26 21:04:23 1993  Noah Friedman  (friedman@prep.ai.mit.edu)
+
+        * Makefile.in, info/Makefile.in, makeinfo/Makefile.in: Overhauled.
+
+        * configure.in: Renamed from texinfo.in.
+          Incorporated makeinfo/makeinfo.in, info/info.in, and
+          util/util.in.  Create all child Makefiles.
+
+        * makeinfo/makeinfo.in, info/info.in: Deleted (incorporated into
+        top configure.in).
+
+        * util/util.in: Deleted (incorporated into ../configure.in).
+
+Mon Jan 25 10:59:49 1993  Brian Fox  (bfox@cubit)
+
+        * info/info.c: New version 2.9; new variable INFO_PATCH_LEVEL
+        appears in the version string if it is non-zero.  New function
+        version_string () produces the current version string, as in 2.8-p1.
+
+        * info/dir.c: New file implements Gillespies `localdir' hacks.
+
+        * info/nodes.c (info_get_node): Now calls maybe_build_dir_node ()
+        if the file name to look for is "dir".
+
+        * info/nodes.h: New flag N_CannotGC unconditionally prevents garbage
+        collection of a file buffer's contents.  Used when "dir" is made
+        from at least one "localdir".
+
+Fri Jan 22 11:36:42 1993  Brian Fox  (bfox@cubit)
+
+        * info/footnotes.c: Do not declare auto_footnotes_p as "extern" in
+        this file.
+
+Thu Jan 21 08:57:08 1993  Brian Fox  (bfox@cubit)
+
+        * info/info.c: New version 2.8.
+
+        * info/userdoc.texi, info/infoman.texi, info/info.texi: Fully
+        document Info; create both online and printed manual versions.
+        "userdoc.texi" contains exactly the documentation for GNU Info 2.x.
+        "infoman.texi" is a wrapper for that file; it is meant to produce
+        printed documentation. "info.texi" has the user documentation as a
+        complete chapter within itself, but continues to contain the Info
+        tutorial.
+
+        * info/makedoc.c: Convert "ea_" into "echo_area_" when creating the
+        command name.
+
+Fri Jan 15 16:50:35 1993  Brian Fox  (bfox@cubit)
+
+        * info/search.c (skip_node_characters): New argument NEWLINES_OKAY if
+        non-zero says that newlines should be skipped over during parsing.
+
+        * info/info-utils.c (info_parse_node): New argument NEWLINES_OKAY if
+        non-zero says that newlines should be skipped while parsing out
+        the nodename specification.
+
+Wed Jan 13 14:42:33 1993  Brian Fox  (bfox@cubit)
+
+        * info/makedoc.c: Remove "info_" from the front of the command name
+        before installing it.
+
+        * info/session.c (info_menu_or_ref_item): A label of "Menu" is okay if
+        the builder is not info_menu_of_node ();
+
+        * info/m-x.c: New function replace_in_documentation () replaces \\[foo]
+        with the keystrokes you type to get that command.  Now used in
+        indices.c, info.c, infodoc.c.
+
+Mon Jan 11 10:27:41 1993  Brian Fox  (bfox@cubit)
+
+        * info/variables.c, h: New files contain describe-variable and stuff
+        moved out of m-x.c.
+
+        * info/m-x.c: Move VARIABLE_ALIST and variable functions into
+        variables.c.  Add documentation string to variable definition.
+
+        * info/echo_area.c (push_echo_area): Zero the contents of
+        echo_area_completion_items after pushing the vars.
+
+Sat Jan  9 11:59:47 1993  Brian Fox  (bfox@cubit)
+
+        * info/Makefile.in: Add footnotes.c,h,o to the appropriate Makefile
+        variables.
+
+        * info/window.c (window_tile_windows): New function divides the
+        available space among the visible windows.
+
+        * info/session.c (info_tile_windows): New function calls
+        window_tile_windows.
+
+        * info/footnotes.c, footnotes.h: New file implements functions for
+        aiding automatic footnote display when entering a node which has
+        footnotes.
+
+        * info/m-x.c: New user-variable "automatic-footnotes".
+
+        * info/window.c (window_physical_lines) New function counts the
+        carriage returns found in NODE.
+
+Wed Jan  6 11:24:19 1993  Brian Fox  (bfox@cubit)
+
+        * info/general.h: #include <unistd.h> if we have it.
+
+Tue Jan  5 11:12:33 1993  Brian Fox  (bfox@cubit)
+
+        * info/info-utils.c (info_concatenate_references): If either arg is
+        NULL, return the other arg.
+
+        * info/indices.c (info_indices_of_file_buffer): Simplified and
+        corrected loop through tags/nodes of file buffer looking for
+        indices.
+
+        * info/search.c (skip_node_characters): Rewrite "if" statement for
+        clarification and conciseness.
+
+Fri Jan  1 03:18:26 1993  Brian Fox  (bfox@cubit)
+
+        * info/info.in: Check for setvbuf (), and check to see whether the args
+        are reversed.
+
+        * info/dribble.c (open_dribble_file) Check HAVE_SETVBUF and
+        SETVBUF_REVERSED when setting the buffering on info_dribble_file.
+
+Thu Dec 31 20:14:13 1992  Brian Fox  (bfox@cubit)
+
+        * info/session.c (info_select_reference) If the node couldn't be found,
+        look for the label as a filename (i.e., "(LABEL)Top").
+
+Wed Dec 30 01:57:50 1992  Brian Fox  (bfox@cubit)
+
+        * New Version 2.7 Beta.
+
+        * info/echo_area.c: Numerous functions now do something with the
+        numeric argument.  Kill ring implemented, as well as yank and
+        yank_pop.  Also transpose-chars.
+
+        * info/window.c (window_make_modeline): Check node->flags for
+        N_IsCompressed and display "zz" in the modeline if the node comes
+        from a file which is compressed on disk.
+
+Mon Dec 28 17:33:12 1992  Brian Fox  (bfox@cubit)
+
+        * info/filesys.c, info/nodes.c: New member of FILE_BUFFER "FILESIZE"
+        contains the size of file_buffer->contents.  finfo.st_size is no
+        longer relied upon to read the contents of files, since the new
+        function (filesys_read_info_file) can read compressed files.
+
+        * info/filesys.c (info_find_fullpath) If a file starts with a slash (or
+        tilde expansion causes it to start with a slash) still call
+        info_find_file_in_path () on it so that we can find files with
+        compression suffixes.
+
+        * info/m-x.c: New variable "gc-compressed-files".
+
+Tue Dec 22 03:45:28 1992  Brian Fox  (bfox@cubit)
+
+        * info/info.c: Version 2.6 Beta.
+
+        * info/indices.c (info_index_next): Improve the final search for the
+        matched index entry.
+
+        * info/session.c (move_to_screen_line): New function implements `M-r'.
+        Given a numeric argument, move point to the start of that line in
+        the current window; without an arg, move to the center line.
+        * infomap.c: Put move_to_screen_line () on `M-r'.
+
+        * info/nodes.c (adjust_nodestart): Don't set N_UpdateTags unless the
+        node came from a tags table.
+
+        * info/nodes.c (info_find_file_internal): If the filename being looked
+        for doesn't start with a `/', then additionally compare the
+        filename against the fullpath of the file buffer sans the
+        directory name.  This can happen when selecting nodemenu items.
+
+Mon Dec 21 10:07:18 1992  Brian Fox  (bfox@cubit)
+
+        * info/session.c, info/display.c: Remove all references to
+        active_window_ch, active_window_cv, cursor_h, and cursor_v.  The
+        single function display_cursor_at_point () is used for all cursor
+        movement, and to place the terminal's cursor at the right location
+        on the screen.
+
+Sat Dec 19 12:01:33 1992  Brian Fox  (bfox@cubit)
+
+        * info/nodemenu.c: New file implements a few functions for manipulating
+        previously visited nodes.  `list-visited-nodes' produces a menu of
+        the nodes that could be reached by info_history_node () in some
+        window.  `select-visited-node' is similar to `list-visited-node'
+        followed by `info-menu-item', but doesn't display a window with
+        the visited nodes menu.
+
+        * info/session.c (info_numeric_arg_digit_loop): If redisplay had been
+        interrupted, then redisplay all of the windows while waiting for
+        input.
+
+        * info/display.c (display_was_interrupted_p): New variable keeps track
+        of interrupted display.  Used in
+        info/session.c:info_numeric_arg_digit_loop ().
+
+        * info/session.c (info_global_next, info_global_prev): Use the numeric
+        argument passed to determine how many nodes to move.
+
+        * info/session.c (info_scroll_forward, info_scroll_backward): If the
+        invoking key is not SPC or DEL only do Page Only scrolling.
+
+Thu Dec 17 01:34:22 1992  Brian Fox  (bfox@cubit)
+
+        * info/display.c (display_update_one_window): Allow W_NoWrap to affect
+        window display.
+
+        * info/window.c (calculate_line_starts): Now takes a WINDOW * as an
+        argument, and simply does the calculation, placing the results
+        into window->line_starts and window->line_count.  It also handles
+        W_NoWrap in window->flags.
+
+Mon Dec 14 02:18:55 1992  Brian Fox  (bfox@cubit)
+
+        * info/session.c (info_backward_scroll): Don't try to get previous node
+        if the top of the node isn't currently being displayed.
+
+        * info/window.c (window_adjust_pagetop) Use new variable
+        "window_scroll_step" to attempt to control the amount which the
+        window scrolls.
+
+        * info/m-x.c (info_variables) Add "scroll-step" to the list.
+
+Thu Dec 10 08:52:10 1992  Brian Fox  (bfox@cubit)
+
+        * info/m-x.c: New variable entry show-index-matches.  When set to
+        non-zero the matched portion of the search string is indicated
+        with ` and '.  Perhaps I should use `|' inst|ea|d?
+
+        * info/echo_area.c (ea_possible_completions): Always build completions
+        before checking to see how many there were.
+
+        * info/info-utils.c: (info_concatenate_references): New utility
+        function concatenates references.
+
+        * info/Makefile.in: Add indices.c and indices.h to SRCS and HDRS.
+          Add indices.c to CMDFILES.
+
+        * info/indices.c, info/indices.h: New file implements `i' and `,'
+        commands of info, and provides index searching capabilities.
+
+        * info/echo_area.c (info_read_completing_in_echo_area):  Split off into
+        separate callable function info_read_completing_internal ().
+
+        * info/echo_area.c (info_read_maybe_completing): New function calls
+        info_read_completing_internal () with non-forcing argument.
+
+        * info/session.c: Rename down_next_upnext_or_error () and
+        prev_up_or_error () to forward_move_node_structure (), and
+        backward_move_node_structure ().  Implement new commands
+        info_global_next () and info_global_prev ().
+
+        * info/infomap.c (initialize_info_keymaps): Bind `[' and `]' to
+        backward_, forward_move_node_structure () respectively.
+
+        * info/session.c (info_menu_digit): Called with "0" as arg, select the
+        last menu item.
+
+        * info/infomap.c (initialize_info_keymaps): "0" calls
+        info_menu_digit ().
+
+        * info/session.c (info_move_to_xref): Take dir into account when there
+        are xrefs and menu items in the node and we are wrapping
+        backwards.
+
+Tue Dec  8 09:57:58 1992  Brian Fox  (bfox@cubit)
+
+        * info/info.c: Version 2.5 Beta.
+
+        * info/terminal.c (terminal_insert_lines, terminal_delete_lines) Do not
+        expect tgoto to return a new string; it returns the address of a
+        static buffer.
+
+        * info/infodoc.c (info_find_or_create_help_window) Correct check for
+        prior existing help node.
+
+        * info/m-x.c (set_variable): Allow variables to have a list of choices.
+        Add new variable scroll-behaviour.
+
+        * info/session.c (down_next_upnext_or_error, prev_up_or_error) New
+        functions implement user-controlled behaviour when attempting to
+        scroll past the bottom or top of a node.  New variable
+        info_scroll_behaviour is user visible as "scroll-behaviour".
+
+        * info/session.c (info_scroll_forward, info_scroll_backward) Call new
+        functions for user-controlled scroll behaviour.
+
+        * info/terminal.c (terminal_initialize_terminal) Set PC from BC not
+        from BUFFER.
+
+Mon Dec  7 11:26:12 1992  Brian Fox  (bfox@cubit)
+
+        * util/texindex.c: Change EXIT_SUCCESS and EXIT_FATAL to TI_NO_ERROR
+        and TI_FATAL_ERROR respectively.  This avoids namespace conflicts
+        on NeXT 2.0.
+
+Sat Dec  5 00:07:59 1992  Brian Fox  (bfox@cubit)
+
+        * info/info.c: New option "--subnodes" says to recursively dump the
+        menus of the nodes that you wish to dump.  Menu items which point
+        to external nodes are not dumped, and no node is dumped twice.
+
+Thu Dec  3 16:11:02 1992  Brian Fox  (bfox@cubit)
+
+        * info/session.c (info_error) Don't ring the bell if
+        info_error_rings_bell_p is zero.  (info_abort_key) Ring the bell
+        if printing "Quit" in the echo area wouldn't do it.
+
+        * info/m-x.c (set_variable) New functions allows setting of
+        variables in the echo area.  Currently, only visilble-bell and
+        errors-ring-bell are implemented.
+
+Wed Dec  2 13:11:37 1992  Brian Fox  (bfox@cubit)
+
+        * info/nodes.c, info/makedoc.c: If O_RDONLY is not defined by
+        sys/file.h, include sys/fcntl.h.
+
+        * info/filesys.c (info_file_in_path): Expand leading tildes found
+        within directory names.
+
+        * info/terminal.c (terminal_initialize_terminal) Set ospeed to 13 if
+        not settable any other way.  It is an index into an array of
+        output speeds.
+
+        * info/display.c (free_display) Do not free a NULL display.
+
+        * info/display.c (string_width): New functions returns the width of
+        STRING when printed at HPOS.
+
+Sun Nov 29 01:24:42 1992  Brian Fox  (bfox@cubit)
+
+        * info/info.c: New version 2.4 beta.
+
+        * info/general.h: #define info_toupper and info_tolower which check
+        their arguments before performing any conversion.
+
+        * info/search.c, info/echo_area.c: Use info_toupper.
+
+Sat Nov 28 14:23:24 1992  Brian Fox  (bfox@cubit)
+
+        * info/session.c (info_scroll_forward, info_scroll_backward) If at
+        last/first page of the node, and the last command was
+        forward/backward, do info_next/prev/_node.
+
+        * info/session.c: New function info_select_reference_this_line gets
+        menu or cross reference immediately.
+
+        * info/infomap.c (initialize_info_keymaps): Add info_keymap[LFD] to
+        invoke info_select_reference_this_line ().
+
+        * info/session.c (info_last_reference) Rename to
+        info_history_reference.  Wrote info_last_reference, and
+        info_first_reference which go to the last or first node of an info
+        file.
+
+Fri Nov 27 00:59:02 1992  Brian Fox  (bfox@cubit)
+
+        * info/info.c: New version 2.3.  Completed implementing contents of
+        TODO file.
+
+        * info/session.c (info_redraw_display): Fix C-l with numeric arg.
+
+Thu Nov 26 20:14:18 1992  Brian Fox  (bfox@cubit)
+
+        * info/m-x.c: New file implements reading named commands in the echo
+        area, along with a new function "info-set-screen-height".
+        Compilation of this file and some code in others controlled by the
+        Makefile variable NAMED_COMMANDS (set to -DNAMED_COMMANDS).
+
+        * info/window.c (window_new_screen_size) Rewrite from scratch, allowing
+        clean growth and shrinkage of the screen.  New variable
+        window_deletion_notifier is a pointer to a function to call when
+        the screen changes size, and some windows have to get deleted.
+        The function is called with the window to be deleted as an
+        argument, and it should clean up dangling references to that
+        window.
+
+        * info/session.c (initialize_info_session): Set
+        window_deletion_function to forget_window_and_nodes.
+
+        * info/display.c (display_update_one_window): If the first row of the
+        window to display wouldn't appear in the_screen, don't try to
+        display it.  This happens when the screen has been made
+        unreasonably small, and we attempt to display the echo area.
+
+Tue Nov 24 00:47:20 1992  Brian Fox  (bfox@cubit)
+
+        * Release Info 2.2.
+
+        * info/session.c: New functions implement reading typeahead and
+        implement C-g flushing typed ahead characters.
+        (info_search_internal): allows C-g to exit multi-file searches.
+
+Mon Nov 23 01:53:35 1992  Brian Fox  (bfox@cubit)
+
+        * info/nodes.c: Remove calls to sscanf (), replacing them with calls to
+        atol (), since that is much faster.
+        (get_nodes_of_tags_table) Only check for "(Indirect)" if we
+        haven't parsed any nodes out of the tags table.  Increase the
+        amount that file_buffer->nodes grows to 100 from 50.  These two
+        together sufficiently speed up the parsing process.
+
+        * info/nodes.c: info_get_node_of_file_buffer_tags (),
+        info_get_node_of_file_buffer_nodes (): Search the appropriate list
+        and return a node.  This was simply a cut and paste edit to
+        functionalize the code.
+
+        * info/TODO: Remove suggestion for partial tag parsing, since tag
+        parsing is much faster now.
+
+Sat Nov 21 02:48:23 1992  Brian Fox  (bfox@cubit)
+
+        * info/makedoc.c: New File replaces makedoc.sh shell script.
+
+        * info/infomap.c: Install info_isearch (on C-s) and
+        info_reverse_isearch (on C-r) for Info windows.
+
+        * info/session.c (incremental_search, info_isearch,
+        info_reverse_isearch) New functions implement incremental
+        searching.
+
+Fri Nov 20 00:01:35 1992  Brian Fox  (bfox@cubit)
+
+        * info/terminal.c (terminal_initialize_terminal): Declare and set up
+        `ospeed'.  Turn off C-s and C-q processing.
+
+        * info/session.c (info_show_point) When this function is called, the
+        desired result is to show the point immediately.  So now it calls
+        set_window_pagetop () if the new pagetop is not the same as the
+        old one.  This means that info_prev_line (), info_next_line (),
+        info_forward_word (), and info_backward_word () can all scroll the
+        window if they have to.
+
+Thu Nov 19 12:27:07 1992  Brian Fox  (bfox@cubit)
+
+        * info/session.c (set_window_pagetop): Add scrolling to make this
+        faster.
+
+        * info/echo_area.c (push/pop_echo_area): Remember the list of items to
+        complete over.
+
+        * info/session.c (info_forward_char): Don't let point get equal to
+        nodelen, only to nodelen - 1.
+
+        * info/display.c: New function display_scroll_display () scrolls the
+        rmembered display as well as the text on the actual display.
+
+        * info/terminal.c: New functions terminal_scroll_terminal (),
+        terminal_scroll_down (), and terminal_scroll_up ().  All
+        implemented using "al" and "dl" termcap capabilities. (i.e.,
+        insert and delete line).
+
+Wed Nov 18 15:05:14 1992  Brian Fox  (bfox@cubit)
+
+        * info/termdep.h: Only define HAVE_FCNTL_H if !aix and !ultrix.
+
+Tue Nov 17 20:35:08 1992  Brian Fox  (bfox@cubit)
+
+        * First Beta Release of Info 2.0.
+
+Sun Nov  1 02:21:05 1992  Noah Friedman  (friedman@prep.ai.mit.edu)
+
+        * util/texi2dvi (--force): Option removed.  Always run tex at least
+        once, don't bother checking if .dvi file is newer than source.
+
+Fri Oct 30 02:16:28 1992  Noah Friedman  (friedman@prep.ai.mit.edu)
+
+        * util/texi2dvi (-D): debugging option renamed from '-d'.
+        Made check to enable debugging more terse.
+        When checking if index files have changed, use
+        variable $this_file instead of $file in for loop.
+        (file_texi): wherever the variable $file was used to reference
+        the texinfo file, substituted $file_texi.
+
+Sat Oct 17 07:30:34 1992  Brian J. Fox  (bfox@helios)
+
+        * util/texindex.c: Remove references to USG replacing them with a
+        define declaring the actual feature required or missing.
+
+Thu Oct 15 16:17:47 1992  Robert J. Chassell  (bob@nutrimat.gnu.ai.mit.edu)
+
+        * emacs/texinfmt.el (texinfo-format-setfilename): Remove date from
+        Info file header so regression testing is easier.
+
+Tue Sep 15 16:28:35 1992  Robert J. Chassell  (bob at grackle)
+
+        * emacs/texinfmt.el (texinfmt-version): New variable.
+        (texinfo-format-setfilename): Include date and
+        version in Info file header.
+        Better documentation for @definfoenclose
+        Handle whitespace after @end iftex, etc.
+
+Thu Sep  3 09:25:37 1992  Robert J. Chassell  (bob at grackle)
+
+        * emacs/texnfo-upd.el: Fix typo re `texinfo-sequential-node-update.'
+
+Tue Aug 18 08:56:24 1992  Robert J. Chassell  (bob at grackle)
+
+        * emacs/texinfmt.el (texinfo-value): Revise syntax.
+
+        * emacs/texnfo-upd.el (texinfo-start-menu-description):
+        New function to insert title as description in a menu.
+        (texinfo-make-menu-list): Remove automatic title insertion.
+
+        * emacs/texinfo.el (texinfo-mode-map): Add keybinding for
+        texinfo-start-menu-description.
+
+Wed Jul 29 11:58:53 1992  Robert J. Chassell  (bob at grackle)
+
+        * emacs/texinfmt.el (texinfo-set): Revise to set a string to the flag.
+        (texinfo-value): @value{flag}: New command which inserts the
+        string to which the flag is set.
+
+Tue Jul  7 15:10:52 1992  Robert J. Chassell  (bob at grackle)
+
+        * emacs/texnfo-upd.el (texinfo-master-menu): Error message if file
+        contains too few nodes for a master menu.
+        (texinfo-insert-master-menu-list): Only attempt to insert detailed
+        master menu if there is one.
+
+Wed Jun 10 15:26:18 1992  Robert J. Chassell  (bob at grackle)
+
+        * emacs/texinfmt.el (texinfo-append-refill): Refill properly when lines
+        begin with within-paragraph @-commands.
+
+Tue Jun  9 12:28:11 1992  Robert J. Chassell  (bob at grackle)
+
+        * emacs/texinfmt.el: Add `texinfo-deffn-formatting-property' and
+        `texinfo-defun-indexing-property' to @deffn commands.
+
+Mon Jun  8 11:52:01 1992  Robert J. Chassell  (bob at grackle)
+
+        * emacs/texnfo-upd.el: Replace `(mark-whole-buffer)' with
+        `(push-mark (point-max) t) (goto-char (point-min))'
+        to avoid `Mark set' messages.
+
+Fri Jun  5 15:15:16 1992  Robert J. Chassell  (bob@kropotkin.gnu.ai.mit.edu)
+
+        * emacs/texnfo-upd.el (texinfo-check-for-node-name): Offer section
+        title as prompt.
+        (texinfo-copy-next-section-title): Copy title correctly.
+
+Thu May 28 20:34:17 1992  Robert J. Chassell  (bob@hill.gnu.ai.mit.edu)
+
+        * emacs/texinfmt.el: @vtable defined, parallel to @ftable, for
+        variables.
+        (texinfo-append-refill): set case-fold-search nil so @TeX is not
+        confused with @tex.
+
+Thu Mar 26 21:36:41 1992  Robert J. Chassell  (bob@kropotkin.gnu.ai.mit.edu)
+
+        * emacs/makeinfo.el: Rename temp buffer from `*Makeinfo*' back to
+        `*compilation*' so `next-error' works; unfortunately,
+        `*compilation*' is written into the code as the name
+        `next-error' needs.
+        Rename `makeinfo-recenter-makeinfo-buffer' back to
+        `makeinfo-recenter-makeinfo-buffer'
+
+Thu May 14 21:14:25 1992  Noah Friedman  (friedman@prep.ai.mit.edu)
+
+        * util/fixfonts: Enclosed most variable references with "" to prevent
+        potential globbing and other weirdness.  Eliminated uses of
+        ${var-value}, which unfortunately isn't portable.
+
+        * util/texi2dvi: rewritten from scratch.
+
+Sat Apr 18 23:46:25 1992  Charles Hannum  (mycroft@hal.gnu.ai.mit.edu)
+
+        * util/fixfonts: Re-evaluate prefix and libdir if inherited (to resolve
+        variable references from make).
+        (texlibdir): Don't add '/tex', since it's already there.
+
+Fri Apr 10 14:51:23 1992  Noah Friedman  (friedman@prep.ai.mit.edu)
+
+        * util/fixfonts: set prefix and libdir only if they are not already
+        defined (i.e. not inherited from the environment).
+        Changed default path for libdir to be consistent with Makefile.
+
+Tue Mar  3 13:17:42 1992  Robert J. Chassell  (bob at grackle)
+
+        * emacs/texnfo-upd.el (texinfo-insert-master-menu-list): Insert a
+        master menu only after `Top' node and before next node.
+        (texinfo-copy-menu): Error message if menu empty.
+
+Mon Feb 24 15:47:49 1992  Robert J. Chassell  (bob at grackle)
+
+        * emacs/texinfmt.el (texinfo-format-region): Make sure region ends in a
+        newline.
+        (texinfo-itemize-item): Recognize all non-whitespace on same line
+        as @item command.
+
+Sat Feb 22 02:15:00 1992  Brian Fox  (bfox at gnuwest.fsf.org)
+
+        * util/texindex.c: New version 1.45 has cleanups, should compile under
+        VMS quietly.
+
+Wed Feb 12 10:50:51 1992  Robert J. Chassell  (bob at grackle)
+
+        * emacs/makeinfo.el: Rename temp buffer as *Makeinfo*.
+        Rename `makeinfo-recenter-compilation-buffer'.
+        (makeinfo-buffer): Offer to save buffer if it is modified.
+        (makeinfo-compile): Do not offer to save other buffers.
+        (makeinfo-compilation-sentinel): Switch to Info file.
+
+Tue Feb  4 13:07:39 1992  Robert J. Chassell  (bob at grackle)
+
+        * emacs/texinfmt.el (texinfo-print-index): Format so that node names in
+        the index are lined up.
+
+Mon Feb  3 09:08:14 1992  Robert J. Chassell  (bob at grackle)
+
+        * emacs/texinfmt.el (texinfo-itemize-item): Format entry when text
+        is on the same line as @item command.  Also, handle @-commands.
+        (texinfo-format-region, texinfo-format-buffer-1): Set fill column
+        to local value of Texinfo buffer.
+
+        * emacs/texnfo-upd.el (texinfo-pointer-name):  Find only those
+        section commands that are accompanied by `@node' lines.
+
+Tue Jan 14 16:10:16 1992  Robert J. Chassell  (bob at grackle)
+
+        * emacs/texnfo-upd.el: Ensure that no commands depend on the value of
+        case-fold-search.
+
+Fri Jan 10 15:13:55 1992  Robert J. Chassell  (bob at kropotkin)
+
+        * emacs/texinfmt.el (texinfo-append-refill): Replace use of
+        unsupported function `looking-at-backward' with
+        `re-search-backward'.
+
+Mon Dec 23 23:46:42 1991  David J. MacKenzie  (djm at wookumz.gnu.ai.mit.edu)
+
+        * util/texindex.c: Change POSIX ifdefs to HAVE_UNISTD_H and
+        _POSIX_VERSION.
+
+Mon Dec 16 15:01:36 1991  Robert J. Chassell  (bob at grackle)
+
+        * emacs/texinfmt.el (texinfo-append-refill): New function appends
+        @refill to all appropriate paragraphs so you no longer need to
+        append @refill command yourself.
+        (texinfo-format-region, texinfo-format-buffer-1,
+        texinfo-format-include): Call `texinfo-append-refill'.
+
+Fri Dec  6 01:25:09 1991  David J. MacKenzie  (djm at wookumz.gnu.ai.mit.edu)
+
+        * util/texindex.c: Conditionalize on _AIX (which is predefined) instead
+        of AIX, just like makeinfo does.
+
+Tue Nov 26 10:21:04 1991  Robert J. Chassell  (bob at grackle)
+
+        * emacs/texnfo-upd.el (texinfo-section-types-regexp): `@subtitle' no
+        longer treated as subsection.
+
+Sat Nov 16 08:27:42 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+
+        * util/fixfonts: New file, from Karl Berry.
+
+Tue Nov 12 16:13:24 1991  Robert J. Chassell  (bob at grackle)
+
+        * emacs/texinfmt.el: Create @end smalllisp.
+
+Mon Nov 11 16:50:13 1991  Robert J. Chassell  (bob at grackle)
+
+        * emacs/texinfo.el (texinfo-environment-regexp): Add all other block
+        enclosing Texinfo commands.
+
+Thu Nov  7 10:23:51 1991  Robert J. Chassell  (bob at grackle)
+
+        * emacs/texinfo.el (texinfo-insert-@end): Attempt to insert correct end
+        command statement, eg, @end table.  Fails with nested lists.
+         (texinfo-insert-*): Accept prefix arg to surround following N
+         words with braces for command.
+
+Thu Oct 31 21:31:41 1991  Robert J. Chassell  (bob at kropotki)
+
+        * emacs/texinfmt.el (texinfo-clear): Clear flag even if flag not
+        previously set.
+
+Wed Oct 23 11:15:58 1991  Robert J. Chassell  (bob at grackle)
+
+        * emacs/texinfo.el (texinfo-mode): page-delimiter now finds top node as
+        well as chapters.
+
+Tue Oct 22 11:46:12 1991  Robert J. Chassell  (bob at grackle)
+
+        * emacs/texinfmt.el (texinfo-do-flushright): Test whether a line is too
+        long for the flush right command (line length must be less than
+        the value of fill column).
+
+        * emacs/texnfo-tex.el (texinfo-tex-buffer): Prompt for original file
+        even if point moved to *texinfo-tex-shell*.
+        texinfo-tex-original-file: variable to hold file name.
+
+Wed Oct 16 08:32:05 1991  Robert J. Chassell  (bob at grackle)
+
+        * emacs/texinfmt.el (texinfo-format-center): Expand string before
+        centering so @-commands not included.
+
+Thu Oct 10 22:01:47 1991  Robert J. Chassell  (bob at kropotki)
+
+        * emacs/texnfo-tex.el (texinfo-show-tex-print-queue): Do not kill a
+        running process; do start a process none exists.
+
+Thu Sep 26 21:58:47 1991  Robert J. Chassell  (bob at kropotki)
+
+        * util/texi2dvi: Misc. bugs fixed.
+
+        * emacs/texinfo.el: Remove extraneous references to TeX.
+
+Thu Sep 19 20:45:29 1991  Robert J. Chassell  (bob at kropotki)
+
+        * emacs/texinfmt.el: add @cartouche as a noop (makes box with rounded
+        corners in TeX)
+
+Tue Sep 10 20:44:57 1991  Robert J. Chassell  (bob at grackle)
+
+        * emacs/texnfo-upd.el (texinfo-make-one-menu): Copy node-name correctly
+        for message.
+
+Thu Aug 29 17:54:07 1991  Robert J. Chassell  (bob at kropotki)
+
+        * emacs/texnfo-tex.el (texinfo-quit-tex-job): Do not set mark.
+
+Wed Aug 21 10:36:21 1991  Robert J. Chassell  (bob at grackle)
+
+         * emacs/texnfo-upd.el: (texinfo-copy-menu-title): Copy title as it
+         should rather than node line.
+
+Mon Aug  5 15:27:12 1991  Robert J. Chassell  (bob at grackle)
+
+         * emacs/texinfmt.el (texinfo-format-convert): Changed regexp that
+         looks for three hyphens in a row to find those between word
+         constituent characters, as now, for Oxford Univ. style dashes and
+         also between spaces, for Cambridge Univ. Press style dashes.
+
+        * emacs/texnfo-tex.el (texinfo-tex-start-shell): Runs "/bin/sh" so
+        `explicit-shell-file-name' is not set globally.
+
+        * emacs/texnfo-upd.el: Rewrite messages.
+        (texinfo-find-higher-level-node): Stop search at limit.
+        (texinfo-copy-menu-title): Rewrite to handle outer include files.
+        (texinfo-multi-file-update): Update all nodes properly;
+        rewrite doc string and interactive.
+
+Sat Aug  3 10:46:13 1991  Robert J. Chassell  (bob at grackle)
+
+        * emacs/texnfo-upd.el (texinfo-all-menus-update): Fixed typo that
+        caused the function to create a master menu when it shouldn't.
+
+        * emacs/texinfo.el (texinfo-mode): Make `indent-tabs-mode' a local
+        variable and set to nil to prevent TABs troubles with TeX.
+
+Wed Jul 31 11:07:08 1991  Robert J. Chassell  (bob at grackle)
+
+        * emacs/texnfo-tex.el (texinfo-quit-tex-job): New function: quit
+        currently running TeX job, by sending an `x' to it.
+        (texinfo-tex-shell-sentinel): New function to
+        restart texinfo-tex-shell after it is killed.
+        (texinfo-kill-tex-job): Rewrite to use kill-process rather than
+        quit-process; uses `texinfo-tex-shell-sentinel' to restart
+        texinfo-tex-shell after it is killed.
+        (texinfo-tex-region, texinfo-tex-buffer): Replace
+        texinfo-kill-tex-job with quit-process.
+
+        * emacs/texinfo.el (texinfo-define-common-keys): Add keybinding for
+        texinfo-quit-tex-job
+
+Wed Jul 10 15:15:03 1991  Robert J. Chassell  (bob at grackle)
+
+        * emacs/texinfmt.el: New commands @set, @clear, @ifset...@end
+        ifset, and @ifclear...@end ifclear.
+        Definition functions rewritten to make them easier to
+        maintain.
+
+Wed Jul  3 19:37:04 1991  Robert J. Chassell  (bob at kropotki)
+
+        * emacs/texinfmt.el (texinfo-format-deftypefn-index): Remove reference
+        to data-type to make consistent with texinfo.tex and makeinfo.
+        texinfo.el: Fix page-delimiter and texinfo-chapter-level-regexp
+        variables.
+
+Thu Jun 27 18:35:36 1991  Robert J. Chassell  (bob at nutrimat)
+
+        * emacs/texinfmt.el: Add @dmn as `texinfo-format-noop'.
+        texinfo2.texi: Document @dmn.
+        texinfmt.el (texinfo{,-end}-{eleterate,ecapitate} renamed
+        {alphaenumerate, capsenumerate}.
+
+Fri Jun 14 12:46:32 1991  Robert J. Chassell  (bob at churchy.gnu.ai.mit.edu)
+
+        * emacs/texinfmt.el (texinfo-format-defun-1): @defivar prints name
+        correctly.
+
+Thu Jun  6 21:38:33 1991  Robert J. Chassell  (bob at churchy.gnu.ai.mit.edu)
+
+        * emacs/texinfo.el (texinfo-mode): Set page delimiter to
+        'texinfo-chapter-level-regexp' so that page commands work by
+        chapter or equivalent.
+
+        * emacs/texinfmt.el (texinfo-format-defun-1): @defop prints name
+        correctly.
+        (batch-texinfo-format): replace unsupported
+        'buffer-disable-undo' with 'buffer-flush-undo'
+
+Fri Apr  5 15:17:17 1991  Robert J. Chassell  (bob at wookumz.gnu.ai.mit.edu)
+
+        * emacs/makeinfo.el (makeinfo-compilation-sentinel): Check for
+        existance of makeinfo-temp-file to avoid harmless error message.
+        texinfo2.texi: Minor typos fixed.
+
+Thu Mar 28 19:13:24 1991  Robert J. Chassell  (bob at pogo.gnu.ai.mit.edu)
+
+        * util/texi2dvi: Revised.
+
+Mon Mar 11 12:35:51 1991  Robert J. Chassell  (bob at grackle)
+
+        * emacs/texinfmt.el: (@footnotestyle): New command to set
+        footnotestyle.
+        (@paragraphindent): New command to set indentation.
+        (texinfo-format-refill): Add indentation feature so as to
+        indent paragraph or leave indentation asis before refilling
+        according to value set by @paragraphindent command.
+        (texinfo-format-region): Insert header, if any, into Info buffer.
+        (texinfo-format-separate-node, texinfo-format-end-node): Run
+        texinfo-format-scan on footnote text only once.
+        (texinfo-format-scan): Shorten `---' to `--'.
+
+        * emacs/texinfo.el: Define key for `texinfo-master-menu'; define
+        start and end of header expressions.
+
+        * emacs/texnfo-upd.el (texinfo-all-menus-update): Update
+        pre-existing master menu, if there is one.
+
+Fri May 11 14:36:07 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+        * util/texindex.c: Rename `lines' to `nlines'.
+        (bzero): Pass arg to lib$movc5 through non-register var.
+        (perror_with_file, pfatal_with_file): Move extern decls and includes
+        to top of file.
+        [VMS]: If not using VMS C, define away `noshare' keyword.
+        Include perror.h.
+
+Mon Jul 11 18:02:29 1988  Chris Hanson  (cph at kleph)
+
+        * util/texindex.c (indexify): when comparing to initial strings to
+        decide whether to change the header, must use `strncmp' to avoid
+        comparing entire strings of which initials are a substring.
+
+Sun Jun 26 18:46:16 1988  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+        * util/texindex.c (sort_in_core, sort_offline, parsefile):
+        Give up on input file if any line doesn't start with backslash.
+
+/* changelog for texinfo.tex before 19jun01.  */
+
+2001-05-24    <karl@gnu.org>
+
+	* texinfo.tex (\smallbreak, \medbreak, \bigbreak): add check for
+	\ifnum\lastpenalty to plain tex definitions, so that we won't
+	insert space right after a section title.
+	(\aboveenvbreak): similar check of \lastpenalty.
+
+2001-05-21    <karl@gnu.org>
+
+	* texinfo.tex (\pdfurl): \let\value=\expandablevalue, so at least
+	some cases can be properly handled.
+
+2001-03-28    <karl@gnu.org>
+
+	* texinfo.tex: Copyright.
+
+	* texinfo.tex (\pdfmkdest): remove trailing @ in target names;
+	suggestion from: Reiner Schlotte <R.Schlotte@science-computing.de>.
+	(\imagexxx): call \normalturnoffactive so _ (among others) will be
+	allowed in filenames; report from arnold@skeeve.com.
+
+2001-02-02    <karl@gnu.org>
+
+	* texinfo.tex (\secondary): handle pdf case.
+	(\dosubind): secondary index entry not written as separate arg for
+		texindex.
+	From: Trevin Beattie <trevin@eyring.com>
+	Date: Tue, 21 Mar 2000 13:04:06 -0700
+
+2001-01-12    <karl@gnu.org>
+
+	* texinfo.tex (\dopdfimage): different syntax for filename
+	inclusion (foo vs {foo}).  From: <Kurt.Hornik@ci.tuwien.ac.at>,
+	22dec99.
+
+2001-01-08    <karl@gnu.org>
+
+	* texinfo.tex (\afivepaper): new command from Jose Romildo
+	Malaquias <romildo@urano.iceb.ufop.br>.
+
+2000-12-12    <karl@gnu.org>
+
+	* texinfo.tex: oops, had outside page reversed.
+
+2000-12-11    <karl@gnu.org>
+
+	* texinfo.tex (\inmargin): allow lefttext and righttext as args.
+
+2000-11-10    <karl@gnu.org>
+
+	* texinfo.tex: implementation of new commands @verbatim, @verb,
+	and @verbatiminclude from janneke@gnu.org.
+
+2000-11-09    <karl@gnu.org>
+
+	* texinfo.tex (\inmargin): rewrite to allow for placing the
+	material either in the right or left margin.
+
+2000-10-27    <karl@gnu.org>
+
+	* texinfo.tex (\dosynindex): new macro subroutine, do not
+	\closeout twice the index being redirected.
+	(\synindex, \syncodeindex): call it.
+
+2000-10-18    <karl@gnu.org>
+
+	* texinfo.tex (\inmargin): rewrite to allow argument to be vmode
+	material, such as a box from an image.
+
+2000-09-06    <karl@gnu.org>
+
+	* texinfo.tex (\doublecolumnout): must subtract \ht\partialpage
+	here, not in \begindoublecolumns.  Otherwise the \partialpage on
+	the first page of double columns affects every subsequent page,
+	e.g., if @setchapternewpage off.  Reported by Aharon Robbins
+	<arnold@skeeve.com> for standards.texi.
+
+2000-05-28    <karl@gnu.org>
+
+	* texinfo.tex (\linkcolor): replace Cyan with Blue.
+	(\output): do \pdfmkdest at top.
+	(\pdfmakeoutlines): set \_ to \normalunderscore.
+	From: Trevin Beattie <trevin@eyring.com>.
+
+2000-05-27    <karl@gnu.org>
+
+	* texinfo.tex (\today): only define if undefined.
+	From: Stepan Kasal <kasal@suse.cz>.
+
+2000-05-16    <karl@gnu.org>
+
+	* texinfo.tex (\deftypeivarheader): need defheaderxcond.  From:
+	Marcel van der Boom <marcel@hsdev.com>.
+
+1999-10-01  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\afourwide): had hsize and vsize reversed.
+	From: Pascal Obry <pascal_obry@csi.com>
+
+1999-09-25  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\alias): fix from Andreas.
+
+1999-09-19  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\key): rename the \smallrm and \smallsy here.
+
+	* texinfo.tex (\indexfonts): rename to \smallfonts, along with
+		\indrm, etc.
+	Define all the fonts, too.
+	(\footnotezzz): use \smallfonts.
+
+	* texinfo.tex (\needx): get better leading; do nothing if @need
+	       value is less than one linespace.  From Arnold.
+	(\douref, \xrefX, \doemail [pdf]): make spaces normal again, so our
+	\ignorespaces commands are effective even in an @display.
+
+	* texinfo.tex (\finishtitlepage): remove FINISH TITLE debugging
+		message.
+
+	* texinfo.tex (\anchor): rewrite to always \ignorespaces.
+	Bug from esken.
+
+	* texinfo.tex (\indexnofonts): dummy up \acronym.
+	From: Thomas Esken <esken@nmlab.informatik.fh-dortmund.de>
+
+1999-09-06  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\texinfoversion): update.
+
+	* texinfo.tex: Avoid multiparagraph cells losing linespace between
+	paragraphs.  From: Andreas Schwab <schwab@suse.de>.
+	Bug from: Lalo Martins <lalo@webcom.com>.
+
+1999-08-19  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\shortchaplabel): move computation of width of
+	"Appendix" inside, in case it's been changed by a language.
+
+Mon Aug  9 16:31:55 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex: pdf updates from Han.
+
+Fri Aug  6 13:48:22 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\charcode): remove unused counter.
+	From: Akira KAKUTO <kakuto@fsci.fuk.kindai.ac.jp>.
+
+Thu Jul 22 19:08:19 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex: Update from Han.
+
+Tue Jul 20 17:13:16 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex: More pdf improvements from Han.
+
+Mon Jul 19 16:33:31 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex: Better pdf support from: Han The Thanh
+ 		<thanh@informatics.muni.cz>.
+
+Sun Jul 18 14:21:03 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex: pdfimage takes braces.
+
+Tue Jul  6 19:40:14 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\deftypeop): New command.
+
+Mon Jul  5 17:17:33 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\contents): call \pdfmakeoutlines here instead of
+ 	inline (!).
+	(\pdfmakeoutlines): call \indexnofonts instead of making a separate
+	attempt at it.
+
+Tue May 25 06:16:06 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (time-stamp-format): use %02H.
+
+	* texinfo.tex: Had PDF and DVI transposed.
+
+Sun Apr 25 15:30:00 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\appendixletter): restore \the, necessary for .toc.
+
+Thu Apr 22 19:22:12 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\emergencystretch): Increase to .15\hsize.
+
+Tue Apr 20 05:11:04 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\defunargs): use \tensl\hyphenchar\font to work
+		better with Gildea's PostScript version.
+
+	* texinfo.tex (\tab): Change back to just &.
+	From: Nathan Sidwell <nathan@acm.org>.
+
+	* texinfo.tex: No \fi.
+
+Mon Apr 19 17:38:54 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\pdflink) [!\ifpdf]: define to ignore arg.
+
+	* texinfo.tex: Add pdf support.  Merge from: Kurt Hornik
+ 		<Kurt.Hornik@ci.tuwien.ac.at>.
+
+Wed Mar 31 13:24:16 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\defopheader): missing word space before `on'.
+  		Report from: Chris Hanson <cph@martigny.ai.mit.edu>.
+
+Fri Mar 26 17:00:41 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\imagexxx): Equalize space above and below if in
+ 		vmode.  From rms.
+
+Thu Mar 25 20:00:00 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\deftypeivar): new command.
+
+Tue Mar 23 17:53:37 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (&): be sure active & is defined for @deftypefn
+		operator&.
+	Report from: Nathan Sidwell <nathan@acm.org>.
+
+Sat Mar 20 12:31:53 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\exampleindent): new command.  From Yoshiki.
+
+	* texinfo.tex: Changes from Andreas to use \sl\$ inside italics
+		and to avoid extra spaces around @anchor.
+
+	* texinfo.tex (\image, \imagexx): move pdf test to imagexxx for
+ 		correct filename parsing.
+
+Mon Mar 15 16:51:20 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\imagexxx): reset catcode ^^M in case we're inside
+ 		in an example.  Report from kama.
+
+	* texinfo.tex (\putwordin): new macro for word `in'.
+	(\xrefX): use it.
+	Report from: "Alexey A. Nikiforov" <A.A.Nikiforov@inp.nsk.su>
+
+Sun Feb 21 16:47:28 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex: Expand tabs.
+
+Sun Feb 14 16:02:29 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\paragraphindent): implement.
+	Suggestion from: Paul DuBois <dubois@primate.wisc.edu>.
+
+Tue Feb  9 07:25:07 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\alias): use def rather than \let.
+	Change timestamp format to include hours.
+
+	* texinfo.tex: New commands @alias and @definfoenclose.
+	From: "Eric S. Raymond" <esr@snark.thyrsus.com>.
+
+Mon Feb  8 14:46:56 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\scanmacro): Use \endinput to avoid spurious space,
+ 		and various other space fixes.  From: Andreas Schwab
+ 		<schwab@ls5.informatik.uni-dortmund.de>.
+
+Thu Feb  4 15:24:40 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\uref): implement optional third arg.
+
+	* texinfo.tex (\dosubind): Include index entry in third arg to
+		\entry instead of writing as bogus fourth arg.
+	Report from: kama@hippo.fido.de (Karl Heinz Marbaise).
+
+	* texinfo.tex (\setemergencystretch): Increase somewhat.
+
+	* texinfo.tex (\putwordof): rename from \putwordOf.
+	* texinfo.tex (defivarhead, \defcvarheader): Use \putwordof.
+
+Tue Feb  2 16:57:00 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\documentlanguage, \documentencoding): new
+	commands.  \documentlanguage based on an implementation by kama.
+
+Sat Jan 30 17:23:45 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\putwordMMai): Should be MMay.  From Trond.
+
+Fri Jan 29 17:52:16 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex: Fix @macro expansion inside @section.  Patch from
+ 	Andreas:
+
+	From: Andreas Schwab <schwab@ls5.informatik.uni-dortmund.de>
+
+	The general idea is to construct a list a all defined macros in
+ 		the form \do\macro1\do\macro2..., then temporarily define
+ 		\do to something appropriate and execute the list to do
+ 		whatever is needed.  Here is a patch, and i have also
+ 		fixed a few other bugs that i found while browsing through
+ 		the @macro implementation.  Additionally i have added a
+ 		check to prevent the user from doing silly things like
+ 		@macro shipout.
+
+Sun Jan 24 09:59:42 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\obstexwarn): Don't use *** in message, it
+ 		interferes with make output parsing.
+
+Thu Jan 21 15:45:20 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex: Internationalization improvements from kama.
+
+Wed Jan 20 17:12:52 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\contents, \shortcontents): Run \contentspagealignmacro.
+ 	From: Trond Endrestol <trond@agamemnon.gtf.ol.no>
+
+Thu Jan 14 16:53:43 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\begindoublecolumns): Ship out \partialpage
+	immediately if it is nonvoid, instead of saving it.  This avoids a
+	bug where the index could end up printing one line per page (see
+	the indexspread.tex test).
+	From: Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
+
+	* texinfo.tex (\image): If running pdftex, do \pdfimage{imagefile.pdf}.
+ 	From: Samuel Tardieu <sam@inf.enst.fr>
+
+ 	Also, update copyright year.
+
+Tue Jan  5 17:50:45 1999  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\enddoublecolumns): Move \pagegoal reset to after
+ 		the \endgroup so we get the restored single-column \vsize
+ 		as intended.
+
+Sun Dec 20 17:57:22 1998  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\indexdummies): Set \{ and \} to \mylbrace and
+	\mybrace to avoid braces in the index file, which
+	texindex can't handle.
+
+Sat Dec 19 18:13:16 1998  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\pickupwholefraction): Ignore whole-number part.
+	(\setuptable): Always pass whole-number part and decimal point.  This
+	allows leading zeroes.
+	Suggestion from: Ben Bullock <ben@hayamasa.demon.co.uk>.
+	Date: Fri, 21 Aug 1998 14:06:50 +0100 (BST)
+
+Tue Dec 15 16:38:07 1998  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\indexdummies): set \{ and \} to \lbracecmd and
+        \rbracecmd to avoid lossage if @tex is active during \shipout.
+	Report from: "Peter Kabal" <Kabal@ece.mcgill.ca>.
+
+Sun Dec  6 17:11:17 1998  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex: Doc fix.
+
+1998-11-11  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* doc/texinfo.tex (\onepageout): Put the cropmarks in vboxes of
+	zero height so that they don't contribute space themselves.
+	Compensate for \topandbottommargin.
+	(\internalpagesizes): Advance \outervsize by 2\topandbottommargin,
+	not only 0.6in.
+
+Fri Nov  6 17:27:57 1998  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex: Use standard time-stamp.el package instead of
+ 		update-date.el.
+
+Sat Oct 31 19:23:02 1998  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\indexnofonts,\indexdummies): add \url and \uref to
+ 		list.
+
+Fri Oct 30 08:16:23 1998  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (\expandablevalue): Delete spurious `v' character.
+
+Tue Oct 27 11:18:40 1998  Karl Berry  <karl@gnu.org>
+
+	* texinfo.tex (@env, @command, @option): Must disable for index
+ 		and xref commands.  Also, \input plain if necessary before
+ 		using {} in the version number.
+
+Wed Sep 30 11:40:36 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex: Use date as version number instead of RCS, and
+ 		update-date to update it.
+
+Thu Sep 17 13:22:44 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex: Fix @macro expansion of @code with _ in the
+ 		argument.
+ 	From: Zack Weinberg <zack@rabi.columbia.edu>.
+
+Fri Aug 28 10:30:29 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\itemzzz): take \itemmargin into account when
+ 		unhboxing.  Reported by Bob.
+
+Fri Aug 14 16:56:58 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex: Change @defun environments so that right margin is
+ 		not changed, and instead the defun type label is outdented
+ 		into the margin.
+
+Thu Aug 13 13:31:41 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\smartslanted): define this separately from
+ 	\smartitalic.
+	(\emph, \i): use \smartitalic for true italics.
+
+Mon Aug 10 11:51:13 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\value): handle active _ or - in argument (happens
+ 		if called from @code).
+ 	Report from: Dave Love <d.love@dl.ac.uk>.
+
+Sun Jul 19 09:49:23 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\dosubind): Don't do \vskip to preserve \lastskip
+ 		unless we are in vertical mode.  Otherwise we might end a
+ 		paragraph prematurely, and \folio won't get expanded by
+ 		\output.
+ 	Report from: "Richard E. Stone" <res@rstone.mn.org>
+
+Thu Jul 16 15:33:37 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex: Keep track of how negative the page numbers have
+ 	gotten:
+	(\lastnegativepageno): New \count register.
+	(\startcontents): Use it.
+	(\contents, \summarycontents): set it.
+
+Mon Jul 13 16:58:11 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\imagexxx): Add some space around the image if it's
+ 		by itself.
+
+1998-07-09  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* texinfo.tex (chapterzzz): Put a space before the chapter number
+	in the message.
+	(appendixzzz): Use \putwordAppendix in the message.
+
+Thu Jul  9 08:39:53 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\macro): Globalize assignments since it's done
+		inside a group.  From Zack.
+
+Mon Jul  6 17:21:25 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\comment): Speed up.
+	(\loggingall): Turn on eTeX's extended tracing.
+	More macro fixes.
+	Date: Sat, 04 Jul 1998 14:51:49 -0400
+	From: Zack Weinberg <zack@rabi.phys.columbia.edu>
+
+Thu Jul  2 10:20:32 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\contents, \summarycontents, \startcontents): Use
+ 		roman numerals for toc, arabic outside, even when toc is
+ 		at the beginning.
+
+Mon Jun 29 10:05:28 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\anchor): New command @anchor.
+	(\xrefX): Avoid double space when xref to an @anchor or an @unnumbered.
+
+	* texinfo.tex (\itemzzz): Use kerns and \unhbox when item text
+		fits in the space, so footnotes can work.
+
+	* texinfo.tex (\setref): Take additional argument for the -snt
+ 	xref.  Call \indexdummies.
+	(\donoderef, \appendixnoderef, \unnumbnoderef): Change \setref calls.
+
+Sat Jun 27 19:16:34 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\contents, \summarycontents): Must not be \outer.
+
+Fri Jun 26 16:15:14 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\writetocentry): New macro.
+	(\chapternofonts): No longer needed.
+	(\chapter, ..., \unnumberedsubsubsec): Change all the sectioning
+		commands to call \writetocentry instead of doing it inline.
+	Also, do not call \chapternofonts, we avoid expansion with
+		\the\toks instead.
+	(\opencontents): No longer needed, instead \writetocentry opens
+		the file when necessary.
+	(\setfilename): Don't call \opencontents.
+	(\ifsetcontentsaftertitlepage, \ifsetshortcontentsaftertitlepage):
+		New conditionals.
+	(\Etitlepage): Call \contents and/or \shortcontents if
+		conditionals are set.
+
+	Global: use \nobreak instead of \penalty 10000 for epsilon efficiency.
+
+Thu Jun 25 08:29:32 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\option,\env,\command): New markup commands.
+	Suggested by arnold@gnu.org.
+
+	* texinfo.tex (\afourpaper): More reasonable margins.
+	From: Wilhelm Mueller <muewi@hb.senbvs43.uni-bremen.de>
+	Date: Thu, 25 Jun 1998 10:48:13 +0200 (MET DST)
+
+Wed Jun 24 17:46:43 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\acronym): New Texinfo command.
+
+Tue Jun 23 17:36:39 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\dots, \enddots): Missing \leavevmode.
+	Report from: Thomas Esken <esken@nmlab.informatik.fh-dortmund.de>
+	Date: Tue, 23 Jun 1998 14:22:27 +0200 (MET DST)
+
+Mon Jun 22 16:00:53 1998  Karl Berry  <karl@north>
+
+	* texinfo.tex: Rewrite of index stuff to do better column breaking
+	and balancing.
+	The old code failed miserably when the index was just the wrong size,
+	e.g., the Autoconf manual with @afourpaper.
+	Bug report from: Wilhelm Mueller <muewi@hb.senbvs43.uni-bremen.de>
+	Date: Fri, 12 Jun 1998 16:34:49 +0200 (MET DST)
+	(\initial): Add more glue around the initial, and make it a
+		multiple of \baselineskip.
+	(\entry): Add glue before each entry so the columns can always be the
+	 same height.
+	(\doublecolumnout): Available space no longer needs to handle
+	 \partialpage specially.
+	(\pagesofar): Take \ht\partialpage into account with \vsize.
+	(\enddoublecolumns): Reset \output to avoid calling
+		\balancecolumns twice
+	(\balancecolumns): Format for readability.
+	(\initialskipamount): No longer needed, remove.
+
+	(\hbadness): Increase a bit, boxes that are a little underfull look ok.
+
+Sun Jun 21 16:48:38 1998  Karl Berry  <karl@north>
+
+	* texinfo.tex (\ninettsl): cmsltt10 is not standard, so use
+		cmsltt10 scaled 900.
+ 	Date: Mon, 15 Jun 1998 12:35:41 +0200 (MET DST)
+ 	From: Werner Struckmann <struck@ips.cs.tu-bs.de>.
+
+Thu Jun 18 08:32:15 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex: @macro fixes from Zack Weinberg
+  	     <zack@rabi.phys.columbia.edu>.
+ 	- @ifblah did not work inside @macro
+        - spaces in parameter lists in macro definitions caused errors
+        - leading spaces in parameter lists in macro invocations were
+	  preserved inappropriately.
+
+Wed Jun 10 16:50:53 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\smallformatx, \smalldisplayx): New macros.
+	(\smallbook): Arrange to use them.
+	(\display, \flushleft, etc.): Rewrite to avoid duplication.
+
+Sun Jun  7 18:13:45 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\pagesizes): Rename to \internalpagesizes.
+	(\custompaper): Rename to \pagesizes.
+
+Sat Jun  6 13:16:32 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex: Rewrite paper size definitions, add @custompaper.
+
+	* texinfo.tex: Fix for macros in arguments to other commands.
+  		From Zack.
+
+Thu Jun  4 11:21:07 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex: Better @macro implementation.
+	From: Zack Weinberg <zack@rabi.phys.columbia.edu>.
+
+Tue May 26 17:43:21 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\imagexxx): Center image if it is not part of a
+ 		paragraph.
+
+Tue May 19 17:17:12 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex: \linkstrue by default.
+	Also, first implementation of @macro; can only handle some cases,
+ 		but that is better than nothing.
+	From: Zack Weinberg <zack@rabi.phys.columbia.edu>
+
+Thu May 14 17:32:47 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex: New command @novalidate along the lines of makeinfo
+		--no-validate.
+	Date: Sun, 26 Oct 1997 18:54:47 -0500
+	From: Zack Weinberg <zack@rabi.phys.columbia.edu>
+
+Tue May 12 16:19:35 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\valuexxx): Split up into expandable and
+ 		non-expandable parts.
+	(\expandablevalue): New macro.
+	(\indexdummies): \let\value = \expandable value.
+
+	* texinfo.tex: Doc fixes.
+
+	* texinfo.tex (\doind): Just call \dosubind with empty third arg.
+	(\dosubind): Replace with \doind definition and suitable code to handle
+	possible third arg.  And propagate glue past the whatsit from the
+ 	\write so index entries don't cause extra space between
+ 	@defuns (for example).
+
+Wed May  6 12:51:27 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\deftypemethparsebody): Handle the extra arg in
+ 	@deftypemethodx, too.
+	(\deftypefunx): Error definition was misspelled as \deftypeunx.
+
+Fri May  1 17:31:58 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo/texinfo.tex (\putwordon, \putwordMethodon): New macros.
+  	Use in \def... commands.
+	(\indexdummies): make `\ ' be just ` ' for sorting.
+	(\deftypemethparsebody): New macro.
+	(\defmethod): Call it.
+	Various doc fixes.
+	Repored by: KHMarbaise@p69.ks.fido.de (Karl Heinz Marbaise)
+	Date: Wed, 07 Jan 1998 10:19:42 +0100
+
+Fri Apr 10 16:54:48 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex: @cartouche: Align right side correctly.
+	From: dale.smith@bellhow.com (Dale Smith)
+	Date: Fri, 06 Mar 1998 14:47:02 GMT
+
+Sun Apr  5 17:19:03 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\dosetq): Use \normalturnoffactive instead of just
+ 	\turnoffactive, so \'s in node names are handled properly.
+	(\tie): Move definition to more rational position in the file.
+	(\@, \{, etc.): Use decimal numbers in all cases, to avoid use of '.
+	Paranoia only.
+	(\+): Turn off once and for all at the beginning, and define as
+	\tabalign in @tex.
+
+Tue Mar 31 19:33:31 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\synindex, \syncodeindex): \closeout the redirected
+		index.
+	From: Jakob Stoklund Olesen <stoklund@mi.aau.dk>
+
+	* texinfo.tex (\doignore): Ignore everything after `c', so @end
+ 	ifinfo and the like can be commented out.
+	(\macrocsname): New macro.
+	Reported by: "James A. Lupo" <lupoja@feynman.ml.wpafb.af.mil>
+
+Wed Feb 25 15:48:51 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\doprintindex): Change catcode of @ before \read,
+		in case of \initial{@} being the line that is read.
+	Reported by: Drew Csillag <drew_csillag@geocities.com>
+
+	* texinfo.tex (\dotable): Add \leftskip to \hsize in the first column.
+	Don't inherit \rightskip from surrounding environment.
+	Set \item to \crcr to avoid empty first row.
+        Prepend \parskip glue before table.
+        Set \everycr locally outside of alignment, don't reset it
+	        explicitly in \Emultitable.
+	All from Andreas Schwab, to avoid overfull hboxes.
+
+	Also, work on leading commentary in file a bit.
+
+Tue Feb 24 17:48:29 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex: \!: Save and restore this for @tex.
+	From: Jean-Pierre Moreau <jpmoreau@ciframedical.com>
+	Date: Fri, 22 Aug 1997 16:47:36 -0400
+
+	* texinfo.tex (\angleleft, \angleright): New macros.
+	(\refx, \email, \key): Use them.
+	From: Stephen Gildea <gildea@intouchsys.com>
+	Date: Fri, 26 Dec 1997 11:43:32 EST
+
+Mon Feb 23 17:34:23 1998  Karl Berry  <karl@cs.umb.edu>
+
+	1997-08-28 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
+	* doc/texinfo.tex (xrdef): Read the second argument with \
+ 	as an escape character.
+
+1998-01-22  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* texinfo.tex (\tocentry): Don't \turnoffactive before typesetting
+		the arguments, it causes special characters to be printed
+		incorrectly.
+
+Mon Jan 19 10:58:25 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texi2html: Correct version number, home page reference.
+
+Sat Jan 17 15:12:03 1998  Karl Berry  <karl@cs.umb.edu>
+
+	* texi2html: Version 1.54.  Handle @image better, etc.
+	* From: Bob Friesenhahn <bfriesen@simple.dallas.tx.us>.
+
+Wed Dec 24 13:59:07 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\dots, \enddots): Use current font instead of
+ 		always using math italic.  From Stephen Gildea.
+
+Tue Dec 23 11:33:07 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex: Spurious xepsf.tex should be epsf.tex.
+
+Mon Oct 13 15:49:28 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\titlefont): Explicitly set \rm.
+
+Sat Jul 26 15:12:37 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\email): Let to \uref instead of \code, as a second
+ 		optional argument makes sense for this, too.
+
+Mon Jul 14 13:43:43 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\indexdummies): Add \value.
+
+Thu Jul 10 13:34:30 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\authorrm): Must use \def instead of \let, as
+ 		\secrm is not yet defined.
+
+1997-07-09  Richard Stallman  <rms@psilocin.gnu.ai.mit.edu>
+
+	* texinfo.tex (\titlefont): Define again, using \titlefonts.
+
+Wed Jul  9 16:45:30 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\startcontents): Leave ^ catcode as other.
+
+Sat Jul  5 17:16:40 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\titlefonts): New macro to set title font styles,
+ 	so italic etc. work in @title.
+	(\titlefont): No longer needed.
+	(\titlepage): Call \titlefonts instead of \titlefont.
+	(\chapsf, \ssecsy, \ssecttsl): Correct magstep values.
+	From: Stephen Gildea <gildea@intouchsys.com>.
+
+	* texinfo.tex (\onepageout): Back up to 2\baselineskip per Stephen.
+	(\kbdinputstyle): New command.
+
+1997-04-03  00:07:28 1997  Richard Stallman  <rms@gnu.ai.mit.edu>
+
+	* texinfo.tex (\kbdfont, \kbdexamplefont): New macros, parms that
+	tell @@kbd what to do.
+	(\setkbdinputdistinct, \setkbdinputexample): New commands set them.
+	(\kbd): Use those parms.
+
+Thu Jul  3 16:52:39 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\onepageout): Leave only one line space above the
+ 	footline, to be more like plain.  Suggested by Stephen Gildea.
+	(\evenfootline): Left one too many line spaces here, so reduce by two.
+
+	(\ifnottex): Another ignore command.
+	(\ifnothtml,\ifnotinfo): New commands.
+	(\doignore): Ignore brace characters, so mismatched braces in ignored
+	text do not cause complaints.
+
+Fri Jun 27 15:09:16 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\image): New definition for new @image command.
+
+Wed Jun 18 15:58:20 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\oddfootingxxx),
+	(\onepageout): Leave space for the footline if present.
+	(\everyfootingxxx, \everyheadingxxx): Call \oddfootingxxx and
+	\evenfootingxxx instead of repeating their code.  From: Stephen
+ 	Gildea <gildea@intouchsys.com>.
+
+	(\setfilename): Read texinfo.cnf if present.
+
+	(\indexdummies, \indexnofonts): No-op additional commands @result @equiv
+	@expansion @print @error @point.  From: Dave Bodenstab
+ 		<imdave@ais.net> (for texi2www doc).
+
+Fri Jun  6 10:31:34 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\setmultitablespacing): Restore bad typing mistake
+ 		from yesterday.
+
+Thu Jun  5 18:04:26 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\uref): Write real definition, taking one mandatory
+		argument and one optional one.
+
+Wed Jun  4 17:16:09 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\mainmagstep): Define this as a \count variable
+ 	instead of with \let, to make changing to \magstep1 more transparent.
+ 	From: HERBERT@boevm4.vnet.ibm.com.
+	(\uref): New command a la \url.
+
+Sat May 24 18:06:41 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\deftypemethod, \deftypemethodheader): New macros
+		to implement new commands @deftypemethod and @deftypemethodx.
+	Suggestion from: KHMarbaise@p69.ks.fido.de (Karl Heinz Marbaise).
+
+Wed May 21 17:17:52 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\opnr, \clnr): Increment/decrement \parencount, for
+   	  @defun lines with nested parens.  From Bill Schelter
+ 	  <wfs@fireant.ma.utexas.edu>.
+	(\itemizeitem): Correct \errmessage.
+
+Mon May 19 17:34:40 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\codeunder): Use \_ and \ifusingtt to avoid
+ 	dotaccent from _ in roman fonts, e.g., @deftypefn.
+	(\tex): Remove spurious spaces at the end of subdefinitions.
+	From: "John W. Eaton" <jwe@bevo.che.wisc.edu>.
+	(\url, \email): \let to \code; no quotes or angle brackets.
+
+Mon May  5 17:06:35 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\onepageout): \ifcropmarks, center the page body.
+  	Lost this when merged \croppageout with \onepageout.  Found by
+ 	Arnold.
+
+	(\doprintindex): Do not bother to go into double column mode unless
+	there actually is a non-empty index.
+
+	(\begindoublecolumns): Include any existing \partialpage in the new one,
+	lest we lose a whole page of output.  Found by M J Morley
+ 	<mjm@scs.leeds.ac.uk>.
+
+	(\chapternofonts): Remove spurious spaces, both in the definitions that
+	get output to the aux file(s) and in this macro.
+
+	Fix comments and rationalize whitespace in various other places.
+
+Sun Apr 27 15:41:16 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\chapter, etc.): Avoid expansion of section title
+        when writing the toc.
+
+Thu Apr 24 16:35:46 1997  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\onepageout): Integrate cropmarks case here,
+	instead of having a completely different routine.
+	(\croppageout): Remove this.
+
+Sun Jun  9 14:26:42 1996  Karl Berry  <karl@cs.umb.edu>
+
+	* texinfo.tex (\ignoremorecommands): Ignore \defcodeindex, and do
+        not ignore \message.
+
+Thu Apr 11 12:59:42 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+
+	* texinfo.tex (\macro): New macro.
+	(\enddots, \endldots): New macros.
+	(\centerchap, \centerchapyyy): New macros.
+	(\centerchfplain, \centerchfopen): New macros.
+	(\CHAPFplain, \CHAPFopen): Set \centerchapmacro.
+
+Wed Mar 13 11:42:17 1996  Karl Berry  <karl@cs.umb.edu>
+
+        * texinfo.tex (\url): New macro, like \samp for now.
+
+Sun Mar 10 13:05:08 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+
+	* texinfo.tex: Changes in @multitable code.
+	Change meaning of @multitablelinespace.
+
+Tue Mar  5 18:56:08 1996  Dave Love  <d.love@dl.ac.uk>
+
+	* texinfo.tex (\set): Set catcode of space explicitly (inside a
+ 	group) to avoid losing inside @example, say.
+
+Sun Mar  3 17:01:27 1996  Karl Berry  <karl@cs.umb.edu>
+
+        * texinfo.tex (\itemxpar): Protect the \vskip here with \nobreak,
+        to avoid a possible page break at an @itemx.
+
+Sun Feb 25 14:53:15 1996  Karl Berry  <karl@cs.umb.edu>
+
+        * texinfo.tex (\obstexwarn): Use \global to avoid ever getting the
+        warning twice.
+
+        * texinfo.tex (\include): Allow underscores and other such
+        characters we made active in the file name argument.
+
+Tue Feb  6 15:06:27 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+
+	* texinfo.tex (\afourlatex): Delete the old duplicate definition
+	of \afourlatex.
+
+Sun Feb  4 15:20:16 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+
+	* texinfo.tex (\tab): New definition.
+	(\setuptable): Fix previous change.
+	(\multitablecolspace): Renamed from \multitablecolmargin.
+	(\multitablelinespace): Renamed from \multitablelineskip.
+
+Fri Feb  2 02:20:16 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+
+	* texinfo.tex (\multitableparskip): Renamed from \intableparskip.
+	Allocate with \newskip.
+	(\multitableparindent): Renamed from \intableparindent.  Use \newskip.
+	(\multitablelineskip): Renamed from \spacebetweenlines.  Use \newskip.
+	(\multitablecolmargin): Renamed from \spacebetweencols.
+	(\columnfractions): Renamed from \percentofhsize.
+	(xcolumnfractions): Renamed from \xpercentofhsize.
+
+	* texinfo.tex (\setuptable): Handle >1 digits after @percentofsize.
+	(\pickupwholepercent): New macro.
+
+Sun Jan 28 21:14:46 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+
+	* texinfo.tex (\key, \kbdfoo): Use \ttsl unconditionally.
+	(\setkeyfont): Definition deleted.
+
+Tue Jan 23 14:57:23 1996  Karl Berry  <karl@cs.umb.edu>
+
+        * texinfo.tex: @kbd within @example selects slanted tty font:
+	(\ttsl, \ttslshape): Define this new font shape.
+        (\kbdfoo): Set the font to \ttsl if already using \tt.
+        (\setkeyfont, \ifmonospace): New macros.
+
+Wed Jan 17 23:57:48 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+
+	* texinfo.tex (\changepagesizes): Additional arg for topskip.
+	(\afourlatex): Total rewrite.
+	(\afourwide): Pass new arg to \changepagesizes.
+
+Wed Jan  3 17:15:00 1996  Stephen Gildea  <gildea@x.org>
+
+        * texinfo.tex (\slbshape, \itbshape): Use bold slant and and
+	bold italic in titles to match the bold roman.  Do not use
+        bold sf or bold tt, which would be too heavy.
+
+        * texinfo.tex (\setfont): Pass font name in more pieces.
+        (\*shape): New macros defining symbolic names for all font
+	shapes so can use other font families with different naming
+	conventions.
+
+Wed Jan  3 15:52:18 1996  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+
+	* texinfo.tex (\ignoremorecommands): Turn off @everyheading and
+	friends, @headings, @setchapternewpage, @setchapterstyle.
+
+Sat Dec 30 17:20:48 1995  Karl Berry  <karl@cs.umb.edu>
+
+        * texinfo.tex (\inmargin): Don't allow a break before the vertical
+        kern.  Do allow a whole paragraph of marginal text, not just one line.
+	Use \inmarginspacing.
+
+Thu Dec 28 23:22:08 1995  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+
+	* texinfo.tex (\inmargin): New command @inmargin.
+	(\dircategory): Ignore @dircategory.
+
+Tue Dec 12 17:25:36 1995  Karl Berry  <karl@cs.umb.edu>
+
+        * texinfo.tex (\lvvmode): Remove this; use \leavevmode as usual,
+        so spaces/underscores at beginnings of lines inside @example work.
+        Bogus index entries should be (and now are, I think) handled in
+        other ways.
+
+Mon Nov 13 16:07:09 1995  Karl Berry  <karl@cs.umb.edu>
+
+        * texinfo.tex (\xrefX): Test for xref-automatic-section-title
+        being @set correctly, and remove spurious redefinition of
+        \printednodename in that case.
+
+Mon Oct 16 15:16:34 1995  Karl Berry  <karl@cs.umb.edu>
+
+        * texinfo.tex (\unsepspaces): New macro to make active space
+        expand into a normal space char in index entries.
+	(\indexdummies): Use \unsepspaces.
+
+Thu Oct 12 14:56:52 1995  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+
+	* texinfo.tex (\tie): Use \lvvmode, not \leavevmode.
+	Don't use \@M directly either.
+
+Sun Aug 27 21:17:09 1995  Paul Eggert  <eggert@twinsun.com>
+
+	* texinfo.tex (\appendixsection): Fix misspelled defn.
+
+Mon Jul 31 23:57:57 1995  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+
+	* texinfo.tex (\ttfont): Don't call \nohyphenation.
+
+Sun Jul 30 18:30:47 1995  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+
+	* texinfo.tex (\tocentry): Use \turnoffactive.
+
+Sun Feb  5 05:34:13 1995  Richard Stallman  <rms@pogo.gnu.ai.mit.edu>
+
+	* texinfo.tex (\boldbraxnoamp): New function.
+	(\deftypefunargs): Use that, not \boldbrax.
+
+Tue Jan 31 12:15:28 1995  Karl Berry  <karl@cs.umb.edu>
+
+        * texinfo.tex (\set): Use \gdef, not \xdef.
+
+Sat Jan 21 16:39:36 1995  Richard Stallman  <rms@pogo.gnu.ai.mit.edu>
+
+	* texinfo.tex: Initially make _ and + \active,
+	then later make them \other.
+	(\otherifyactive): New command.
+
+Thu Jan 19 21:59:22 1995  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+
+	* texinfo.tex (\afourwide): New command.
+
+Mon Jan 16 09:29:38 1995  Stephen Gildea  <gildea@x.org>
+
+	* texinfo.tex: Initially make + and _ "other" characters.
+	(\fixbackslash, \everyjob): Make + and _ active characters.
+
+Tue Jan 10 19:16:09 1995  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+
+	* texinfo.tex: At beginning, \input plain if necessary.
+	(\deftypefunargs): Use \boldbrax, not \functionparens.
+
+Sun Dec 18 16:40:11 1994  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+
+	* texinfo.tex (\indsc): Use csc10 (at 9pt), not indrm.
+
+Mon Oct 31 00:51:20 1994  Richard Stallman  <rms@pogo.gnu.ai.mit.edu>
+
+	* texinfo.tex (\changepapersizes): Fix definition syntax.
+	(\fontprefix): Define only if not yet defined.
+
+	* texinfo.tex (\margin): Define a new insert.
+	(\SETmarginindex): Initialize to \relax.
+	(\doindex): Optionally put the entry in the margin.
+	(\pagecontents): Print the index entries put in the margin.
+
+Sat Oct 29 19:50:10 1994  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+
+	* texinfo.tex (\auxhat): New macro.
+	(\dosetq): Use \auxhat.
+	(reading the aux file): Give ^ catcode 7.
+
+Wed Oct 26 03:28:04 1994  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+
+	* texinfo.tex (\setfont): New macro.  Use it for specifying
+	most of the fonts that are normally cm fonts.
+	(\fontprefix): New macro, normally `cm'.
+
+Mon Oct 24 01:27:09 1994  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+
+	* texinfo.tex (\startcontents): Set catcode of ^.
+
+Thu Oct 13 02:19:43 1994  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+
+	* texinfo.tex (\ifhtml, \html, \enddots, \?, \!): New commands.
+
+Fri Sep 16 16:30:52 1994  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+
+	* texinfo.tex (\defheaderxcond): New macro.
+	(\deftypefnheaderx): Use defheaderxcond when calling defname.
+	(\deftypefunheaderx, \deftypevarheader, \deftypevrheader): Likewise.
+
+Fri Aug 26 03:08:08 1994  Amy Hendickson  <amyh@ai.mit.edu>
+
+	* texinfo.tex (\multitable): New command.
+
+Mon Aug  1 14:28:57 1994  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
+
+	* texinfo.tex (\changepagesizes, \afourlatex): New macros.
+
+Tue Jul 12 11:45:58 1994  Karl Berry  (karl@cs.umb.edu)
+
+        * texinfo.tex (\quotation): Set \parskip to zero to avoid extra
+        space below the environment.
+	(\quotation): Clean up comments and indentation.
+
+Wed Jul 13 05:36:40 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\xrefX): Put back, and correct, the test of
+	SETxref-automatic-section-title.
+
+Thu Jul  7 15:57:52 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* Set catcodes of chars 128-255 to \other.
+
+Mon Jul  4 15:32:41 1994  Karl Berry  (karl@cs.umb.edu)
+
+        * texinfo.tex (\tie): Set \catcode of @ to 11 before using \@M.
+
+        * texinfo.tex (\xrefX): Undo \turnoffactive while printing the node
+        name, so _ in node names doesn't come out as the dot accent.
+
+Sat Jul  2 14:49:26 1994  Karl Berry  (karl@cs.umb.edu)
+
+        * texinfo.tex (\tie): Ensure we're in horizontal mode before the
+        \penalty.
+
+Tue May 10 01:21:28 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\donoderef, \unnumbnoderef, \appendixnoderef):
+	Set \lastnode globally.
+
+Sun Apr 17 15:35:43 1994  Karl Berry  (karl@ra.cs.umb.edu)
+
+        * texinfo.tex (\~): Define to be a tie.
+        (\ptextilde): New defn to save the plain's tilde accent.
+        (\tex): Restore plain tilde.
+
+Sun Mar 27 23:35:17 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\smallbook): Set \defbodyindent and \deftypemargin.
+
+Sun Mar 20 19:47:59 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\xrefX): Define and use \correctnodename.
+	(@turnoffactive): Move after @ becomes available
+	and turn off backslash as well as other chars.  Use @realbackslash.
+	(@normalturnoffactive): Like @turnoffactive but use @normalbackslash.
+
+Sat Mar 19 12:26:25 1994  Karl Berry  (karl@cs.umb.edu)
+
+        * texinfo.tex (\singlespaceskip): Increase to 12.5pt.
+        (\singlespace): Call \setleading instead of just assigning to
+        \baselineskip, so the strut box will be reset.
+        (\smalllispx): Likewise.
+
+Sun Mar 13 20:32:28 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\dots): Change back to \ldots.
+
+Sat Mar 12 22:34:10 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\indexnofonts): Add %'s to suppress newlines after \def.
+
+Sat Feb 26 15:51:37 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\deftexinfoversion): New macro.
+	(\texinfoversion): Define using \deftexinfoversion.
+
+Wed Jan 26 12:40:52 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\putwordSee, \putwordInfo, \putwordfile)
+	(\putwordChapter, \putwordAppendix, \putwordSection)
+	(\putwordsection, \putwordpage)
+	(\putwordTableofContents, \putwordShortContents): New macros.
+	Used in various places instead of fixed words.
+
+Mon Jan 24 22:51:36 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\ignoremorecommands): Turn off @item and @message.
+
+Thu Jan 20 17:01:53 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\indexnofonts): Treat accents as dummies.
+	Turn modified European letters into one or more ordinary letters.
+
+Tue Jan 18 14:54:32 1994  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\indexdummies): Handle tex accents and European letters.
+
+Wed Nov 24 16:11:51 1993  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\dots): Use $\,$ for spacing.
+
+Sun Nov 21 22:16:21 1993  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\dots): Avoid using \ldots; use periods and kern.
+	(\indexdotfill): Use italic periods.
+
+Fri Nov 19 20:50:31 1993  Roland H. Pesch  (pesch@apple-gunkies.gnu.ai.mit.edu)
+
+        * texinfo.tex (\deftypefunargs): use \tclose rather than \code to
+        avoid side effects on active chars
+
+Tue Sep 28 16:01:58 1993  Roland H. Pesch  (pesch@apple-gunkies.gnu.ai.mit.edu)
+
+	* texinfo.tex (\obeyedspace defn): remove blank after \sepspaces
+	(left destructive penalty in vertical list)
+
+Mon Aug 30 14:17:27 1993  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
+
+	* texinfo.tex (\setref, \unnumbsetref, \appendixsetref): Uncomment
+	\dosetq for title.
+	(\Ytitle): Define as \thissection instead of \thischapter.
+	(\xrefX): If there is no printed-title arg given, and @ifset
+	xref-automatic-section-title, try to use the real section title.
+
+Tue Jul 27 12:47:24 1993  Charles Hannym  (mycroft@trinity.gnu.ai.mit.edu)
+
+	* texinfo.tex (\ifitemxneedsnegativevskip): New \if; set immediately
+	following a short \item.
+	(\itemxpar): \par and then if \ifitemxneedsnegativevskip is set, do
+	a \vskip-\parskip.
+	(\internalBitemx, \internalBxitemx, \internalBkitemx): Use \itemxpar
+	rather than \par.
+	(\itemzzz): Set \ifitemxneedsnegativevskip as appropriate.
+
+Thu Jul 22 16:08:33 1993  Charles Hannum  (mycroft@trinity.gnu.ai.mit.edu)
+
+	* texinfo.tex (\titlezzz, \finishtitlepage): Explicitly make hrules
+	have a width of \hsize so they aren't too long in smallbook format.
+
+Tue Jun 29 15:56:19 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
+
+	* texinfo.tex (\deftypefnheaderx): call \normalparens to permit
+	normal typesetting of strings (e.g. for C++ docn) containing `&'
+
+Fri Jun 25 14:08:44 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
+
+	* texinfo.tex (\nestedignore): turn off \ind... fonts too
+	(primarily for use within @smallexample)
+
+Wed Jun 23 11:58:48 1993  Jim Kingdon  (kingdon@wombat.gnu.ai.mit.edu)
+
+	* longopts.table: Update GDB options.
+
+Sun Jun 20 22:00:11 1993  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
+
+	* lgpl.texinfo: Use @smallexample instead of @example.  Reformat
+	example disclaimer to avoid overfull \hbox.
+
+Mon Jun 14 04:09:47 1993  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\entry): Don't make a line of dots
+	if there are no page numbers.
+
+Fri Jun 11 16:35:23 1993  Karl Berry  (karl@cs.umb.edu)
+
+	* texinfo.tex (\defparsebodycommon): New macro from \defvrparsebody.
+	(\deftpparsebody): Call it; can't use \defvrparsebody.
+	(\deftpheaderline, \removeemptybraces): New macros.
+
+Sat May  8 10:49:25 1993  Karl Berry  (karl@cs.umb.edu)
+
+	* texinfo.tex (\itemzzz): Only change \parskip temporarily, and
+	unskip by it later if the item text is on its own line.
+
+	* texinfo.tex (\tablez): Do \afterenvbreak before the \endgroup,
+	so the \parskip value is the table's, not the surrounding text's.
+	(\vtable, \ftable, \itemizey): Likewise.
+	Note: for most environments, \nonfillfinish deals with this.
+
+	* texinfo.tex (\smalllisp): New definition for non-small case, a
+	la @smallexample.
+
+	* texinfo.tex: Delete \message{} at beginning; it does nothing.
+
+	(These changes are all trying to make space above and below
+	environments more equal.)
+	* texinfo.tex (\singlespace): Don't insert a kern.
+	(\group): Do \offinterlineskip, and reset \par to insert a blank
+	line's worth of space.
+	(\lisppar): Delete meaningless call to \obeyspaces before making
+	the definition.
+	(\Elisp [the outer one]): Rename to \nonfillfinish, and end the
+	paragraph before the group.
+	(\lisp): Set \Elisp (the inner one) to \nonfillfinish
+	(\example, \smallexample, \display, \format, \flushleft,
+	\flushright, \quotation): Use \nonfillfinish.
+	(\lineskipfactor, \strut{height,depth}percent): Set to more exact
+	values.
+	(\setleading): Set \normallineskip and call \normalbaselines, for
+	cleanliness.
+
+Thu May  6 16:00:59 1993  Jeffrey Osier  (jeffrey@deneb.cygnus.com)
+
+	* texinfo.tex (\ignoremorecommands): Turn off \set and \clear.
+
+Tue Apr 20 17:02:34 1993  Roland H. Pesch  (pesch@apple-gunkies.gnu.ai.mit.edu)
+
+	* texinfo.tex (\codex): Delete space.
+
+Thu Apr 15 14:59:04 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
+
+	* texinfo.tex (\ignoremorecommands): Turn off @raisesections, @up,
+	@lowersections, @down within false conditionals.
+
+Sun Apr 18 04:33:13 1993  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\code): Define - and _ to permit line-breaking
+	despite the fact that hyphenation is disabled.
+	(\codex, \codedash, \codeunder): New macros.
+
+Tue Mar 16 18:19:16 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
+
+	* texinfo.tex (\ignoremorecommands): Turn off @printindex within
+	false conditionals.
+
+Sun Mar 14 10:47:36 1993  Karl Berry  (karl@cs.umb.edu)
+
+	* texinfo.tex (\footnote): Don't bother to take the footnote text
+	as an argument, and hence don't define as \long.
+        (\footnotezzz): Do \footstrut after we start the paragraph.
+        (Also reformat these macros to make them easier to read.)
+
+Fri Feb 26 13:02:44 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
+
+	* texinfo.tex (@include): Use \thisfile rather than #1 as \input arg.
+
+	* texinfo.tex (\readauxfile): Call \warnedobstrue to turn off warning
+		      re TeX 3.0 on second and subsequent runs.
+
+Thu Feb 25 18:03:38 1993  Karl Berry  (karl@cs.umb.edu)
+
+	* texinfo.tex (\realeverypar): Delete, as it was unused.
+
+	* texinfo.tex (\group): Do a \strut in \everypar.
+
+Mon Feb 22 17:10:06 1993  Karl Berry  (karl@claude.cs.umb.edu)
+
+	* texinfo.tex (\obeyedspace): Define to be whatever \sepspaces
+	does (and move the definition to after \sepspaces).
+
+Wed Feb 17 01:55:20 1993  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\nonfillstart): Do \singlespaces and \let\par
+	before \obeylines.
+
+Fri Feb 12 12:32:56 1993  Roland H. Pesch  (pesch at el_bosque.cygnus.com)
+
+	* texinfo.tex (\obstexwarn): issue message re bug in TeX 3.0.
+          (\nullfont): commented-out redefinition, to enable w/TeX 3.0.
+          (\nestedignore): call \obstexwarn for manuals that may trip bug
+
+	* texinfo.tex (\nestedignore): avoid @tex contents with \doignore
+
+Thu Feb 11 15:41:06 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
+
+	* texinfo.tex (\indexdummies): enable @dfn and @emph in index entries
+
+Thu Feb 11 13:32:32 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
+
+	* texinfo.tex (\ignoremorecommands): ignore @include within
+          failing conditionals
+
+Sat Feb  6 19:44:28 1993  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\nestedignore): Set \globaldefs--make all defs local.
+
+Tue Feb  2 15:57:37 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
+
+	* texinfo.tex (@raisesections, @lowersections): new commands.
+	* (@up, down): original BFox synonyms for above.
+        * (\numhead, \apphead, \unnmhead): internal macros to map headings
+	to appropriate level
+	* (@nwnode): new synonym for @node, used in newest
+	makeinfo
+
+Tue Jan 26 17:05:02 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
+
+	* texinfo.tex (\include): avoid group around file contents
+
+Tue Jan 19 18:58:56 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
+
+	* texinfo.tex (\ignoremorecommands, used in \nestedignore): also
+	ignore cross-ref commands and \settitle
+        (\setyyy, used in @set): make definitions global
+        (\clearxxx, used in @clear): clear definitions globally
+
+Thu Jan 14 17:43:32 1993  Michael I Bushnell  (mib@geech.gnu.ai.mit.edu)
+
+	* texinfo.tex: Added \shorttitlepage.
+
+Sat Jan  2 15:01:45 1993  Karl Berry  (karl@cs.umb.edu)
+
+	* texinfo.tex (\tclose): Use \spaceskip instead of modifying
+	\fontdimen's to normalize the interword space.
+
+	* texinfo.tex (\t, \key, \tclose): Use \hyphenchar instead of
+	\exhyphenpenalty, to turn off hyphenation for real.
+        (\{no,restore}hyphenation): New macros.
+
+Sat Jan  2 15:01:45 1993  Karl Berry  (karl@cs.umb.edu)
+
+	* texinfo.tex (\t, \key, \tclose): Use \hyphenchar instead of
+	\exhyphenpenalty, to turn off hyphenation for real.
+        (\{no,restore}hyphenation): New macros.
+
+Tue Jan  5 19:15:46 1993  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\deftpparsebody): Make synonymous with \defvrparsebody.
+
+Sun Dec 27 09:40:08 1992  Karl Berry  (karl@cs.umb.edu)
+
+	* texinfo.tex (\inforef, \inforefzzz): Use the \ignorespaces
+	primitive instead of \losespace.
+        (\losespace): Delete.
+
+	* texinfo.tex (\menu, \direntry): Handle like \ifinfo.
+
+	* texinfo.tex (\unmatchedenderror, \defineunmatchedend): New macros.
+        (\endxxx): Call it, instead of just doing it inline.
+        (\conditionalsucceed, \nece): More new macros.
+        (\iftex): Call \conditionalsucceed.
+        (\Eiftex): Define to give an error at the outer level.
+
+	* texinfo.tex (\ignoremorecommands, \nestedignore): New macros.
+        (\ifset, \ifclear): Expand a macro on success as well as failure;
+        also switch to using expansion instead of assignments to act after
+        the conditional.
+        (\if{set,clear}succeed): Call \conditionalsucceed.
+        (\if{set,clear}fail): Call \nestedignore instead of \doignore.
+
+	* texinfo.tex (\clear): Don't insert a spurious space.
+
+	* texinfo.tex (\value): Put comment next to definition.
+
+	* texinfo.tex (\setyyy): Call \setzzz, and define the variable as
+	simply the parameter, no \unskip.
+        (\setzzz): New macro; do not globally define the variable.
+
+Thu Dec  3 17:24:05 1992  Roland H. Pesch  (pesch@fowanton.cygnus.com)
+
+	* texinfo.tex (croppageout): use same escape-char switching as
+	default output routine.  Permits using _ in TOC entries.
+
+Fri Nov 13 17:35:38 1992  Charles Hannum  (mycroft@gnu.ai.mit.edu)
+
+	* texinfo.tex (indexing): Rewrote double-column mode to fix a
+	rare breakage.
+
+Sun Oct 25 07:13:31 1992  Karl Berry  (karl@cs.umb.edu)
+
+	* texinfo.tex (\obeyedspace): No need to define with \gdef, we're
+	at the outer level.
+
+Fri Oct 16 18:04:40 1992  Roland McGrath  (roland@geech.gnu.ai.mit.edu)
+
+	* lgpl.texinfo: Change "This program" to "This library" in example
+	copying notice.
+
+Sat Oct 10 09:43:45 1992  Karl Berry  (karl@cs.umb.edu)
+
+	* texinfo.tex (\bullet, \minus): Use \implicitmath instead of $.
+
+Fri Oct  2 08:35:51 1992  Karl Berry  (karl@cs.umb.edu)
+
+	* texinfo.tex (\Egroup): Don't do the \strut and \nointerlineskip.
+
+Sat Sep 26 09:08:59 1992  Karl Berry  (karl@cs.umb.edu)
+
+        * texinfo.tex (\doignore, \enddoignore): New macros.
+        (\ifinfo): Call \doignore.
+        (\ifxinfoxxx): Deleted.
+	(\ignore, \ifsetfail, \ifclearfail): use \doignore.
+
+        * texinfo.tex (\unnumbered): Expand the arg only once for the \message.
+
+        * texinfo.tex (\deftpparsebody, \parsetpheaderline): New macros.
+        (\deftp): Call \deftpparsebody.
+
+Thu Sep 24 10:12:45 1992  Karl Berry  (karl@cs.umb.edu)
+
+        * texinfo.tex (\entry): Do \par first; add comments.
+        (\short{chap,unnumbered}entry,\do{chap,sec,subsec,subsubsec}entry):
+          Call \tocentry, instead of using \vbox.
+        (\tocentry): New macro.
+
+Sat Sep 19 14:36:11 1992  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\`, \'): Definitions deleted.
+
+Fri Sep 18 14:33:09 1992  Roland H. Pesch  (pesch@cygnus.com)
+
+	* texinfo.tex (\ifset, \ifclear): Standardize catcode of space as
+	for \ignore.
+
+Fri Sep 11 15:25:01 1992  Karl Berry  (karl@hayley)
+
+        * texinfo.tex (\finalout): Move out of final section of file,
+          which claims not to define new control words.
+
+        * texinfo.tex (\setleading): New macro.
+        (outer level, @smallbook, @afourpaper): Call it, instead of
+        setting \baselineskip directly.
+
+        * texinfo.tex (\|): New definition for changebars.
+
+Tue Sep  1 17:32:48 1992  Karl Berry  (karl@hayley)
+
+        * texinfo.tex (\begindoublecolumns): Exactly double \vsize.
+
+Sat Aug 29 10:12:16 1992  Karl Berry  (karl@hayley)
+
+        * texinfo.tex (\group): Define \Egroup to use struts instead of
+          letting TeX do its own interline spacing.
+
+        * texinfo.tex (\{remove,ignore}activespaces): New macros.
+        (\end): Call \removeactivespaces; give the correct error messages;
+          don't try to expand a nonexistent \E... macro.
+
+        * texinfo.tex (\EMsimple): End the help message with a period.
+
+        * texinfo.tex (\gobble): New macro.
+        (\lisp): Call it (instead of defining it every time).
+        (\example, \smallexample): Define \E... within the macro.
+
+Tue Aug 25 11:56:26 1992  Roland H. Pesch  (pesch@fowanton.cygnus.com)
+
+	* texinfo.tex (\readauxfile): Make + normal while reading aux file.
+
+Thu Aug 20 21:32:34 1992  Karl Berry  (karl@hayley)
+
+        * texinfo.tex (\doublecolumnhsize): Compute value in
+          \begindoublecolumns.
+        (\afourpaper, \smallbook, <outer level>): Remove these (virtually
+          identical) computations.
+
+        * texinfo.tex (\doublecolumnvsize): Deleted.
+        (\afourpaper, \smallbook): Don't compute it.
+        (\begindoublecolumns): Just double \vsize here (thus decreasing
+          the value considerably from the old value of 19.1in, which was far
+          too large.)
+
+Fri Aug 14 10:16:42 1992  Karl Berry  (karl@hayley)
+
+        * texinfo.tex (\parseargx): Use \expandafter instead of
+        \aftergroup to continue the processing.
+        (\parsearglinex): Renamed to \parseargline, since the former
+        \parseargline is no longer needed.
+
+	* texinfo.tex (\parseargline) Remove a trailing @c or @comment.
+        (\argremovec, \argremovecomment): New macros.
+
+Thu Aug  6 11:28:55 1992  Roland H. Pesch  (pesch@fowanton.cygnus.com)
+
+	* texinfo.tex: extended @set to define expandable vars;
+	  @value expands same.  Auxiliary macros \setxxx, \setyyy
+	  used for @set.
+
+Sun Aug  2 14:34:48 1992  Karl Berry  (karl@hayley)
+
+        * texinfo.tex (\entry): do line-breaking on the index entry.
+
+Wed Jul  1 17:05:26 1992  Karl Berry  (karl@claude.cs.umb.edu)
+
+        * texinfo.tex (\lparen, \rparen): new definitions.
+        ((,[,],)): new global definitions for these four active
+          characters, so parens and brackets can be used in @deffn names.
+
+Sat Jun 27 11:32:58 1992  Karl Berry  (karl@hayley)
+
+        * texinfo.tex (\shortchaplabel): new macro to align chapter and
+          appendix labels.
+        (\shortchapentry): call it.
+        (\shortappendixwidth): new dimen register.
+
+Wed Jun 24 09:45:34 1992  Karl Berry  (karl@hayley)
+
+        * texinfo.tex (\afterenvbreak): make the same as \aboveenvbreak,
+          so space below environments doesn't get lost.
+        (\aboveenvskipamount): rename to \envskipamount, since it's used
+          both above and below.
+
+Wed Jun 24 09:45:34 1992  Karl Berry  (karl@hayley)
+
+        * texinfo.tex (\group): do @comment at the end, to avoid excessive
+          white space when called inside @group.
+
+Wed Jun 24 16:36:04 1992  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\startcontents): End page before setting pageno.
+
+Thu May 28 20:27:25 1992  Robert J. Chassell  (bob@hill.gnu.ai.mit.edu)
+
+        * texinfo.tex (\vtable): Like @ftable, but for variables.
+
+Fri May 22 07:04:32 1992  Karl Berry  (karl@hayley)
+
+        * texinfo.tex (\w): do \leavevmode before the \hbox.
+
+Sat May 16 11:16:27 1992  Karl Berry  (karl@hayley)
+
+        * texinfo.tex (\smallbook): decrease \topskip somewhat.
+
+        * texinfo.tex (\group): use \vtop instead of \vbox.
+
+        * texinfo.tex (\newlinechar): define for use in help strings.
+        (\groupinvalidhelp): define this for use with \errhelp.
+        (\group): set \errhelp to above.
+
+Thu Apr 30 16:19:17 1992  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\need): Rewritten by karl.
+
+Sat Apr 18 16:24:00 1992  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\exdentamount): New var, set by environments.
+	(\exdent, \exdentyyy): Define suitably for filled environments.
+	Always exdent by innermost indentation step.
+	(\nofillexdent, \nofillexdentyyy): Alternates for nofill envs.
+	(\lisp, \smalllispx, \display): Set \exdent to \nofillexdent.
+
+Thu Apr  2 15:04:15 1992  Robert J. Chassell  (bob@kropotkin.gnu.ai.mit.edu)
+
+        * texinfo.tex (\Esmalllisp): Smaller baseline skip for smallexamples.
+
+Sun Mar 29 20:44:49 1992  Brendan Kehoe  (brendan@cs.widener.edu)
+
+	* texinfo.tex (\startcontents): Always close contentsfile and
+	adjust the page.
+
+Fri Mar 27 17:41:52 1992  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\chapternofonts): Deal with \result, \equiv, etc.
+
+Sat Mar 21 08:22:29 1992  Karl Berry  (karl at hayley)
+
+        * texinfo.tex (\entry): format entries better if the page number
+          and entry text don't fit on one line.
+
+        * texinfo.tex (\loggingall, \gloggingall): new macros to help with
+          debugging.
+
+Fri Mar 20 15:35:42 1992  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\result, \expansion, \print, \equiv):
+	Don't copy prefabricated boxes; must adapt to current font.
+	(\dblarrowbox, \longdblarrowbox, \pushcharbox, \equivbox): Deleted.
+	(\bullbox): Deleted.
+
+Thu Mar 19 22:17:14 1992  Robert J. Chassell  (bob@kropotkin.gnu.ai.mit.edu)
+
+	* texinfo.tex (\widowpenalty, \clubpenalty): Set them to 10000, since
+          8000 did not work.
+
+Fri Mar  6 13:26:36 1992  Robert J. Chassell  (bob@kropotkin.gnu.ai.mit.edu)
+
+	* texinfo.tex (\widowpenalty, \clubpenalty): Set them to 8000, since
+          2000 did not work (but \widowpenalty at 20000 did work).
+
+Thu Feb 27 12:27:14 1992  Karl Berry  (karl@wombat.gnu.ai.mit.edu)
+
+        * texinfo.tex (\widowpenalty): set to 2000, not 20000.
+
+Sat Feb  8 14:34:45 1992  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\widowpenalty, \clubpenalty): Set them to 2000.
+	(\itemizeitem): Use penalty 1200.
+	(\itemzzz): Add \nobreak near beginning.
+
+	* texinfo.tex (\quotation): Increase right margin, instead of
+	left margin twice.
+
+Wed Feb  5 12:08:30 1992  Karl Berry  (karl at hayley)
+
+        * texinfo.tex (\alphaenumerate, \capsenumerate): redefine as a call
+          to \enumerate.
+        (\{lower,upper}caseenumerate): Rename from \{alpha,caps}enumerate.
+
+Sun Feb  2 21:07:19 1992  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\itemzzz): Compensate in line-by-itself case for
+	a table that is indented.
+
+Mon Jan 13 21:04:07 1992  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+
+	* texinfo.tex: Use 26 instead of control-z as character constant.
+
+Sat Jan 11 02:20:58 1992  Roland McGrath  (roland@albert.gnu.ai.mit.edu)
+
+	* gpl.texinfo: Unfilled Yoyodyne example.
+
+Sat Dec  7 16:16:54 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\cartouche): Set \nonarrowing.
+	(\lisp, \smalllisp, \quotation, \display): If set, don't narrow.
+
+Mon Dec  2 08:15:08 1991  Karl Berry  (karl at hayley)
+
+        * texinfo.tex (\itemzzz): don't start a paragraph if the item text
+          is on a line by itself; don't allow a page break after that
+          line; always do \par before typesetting anything.
+
+Tue Nov 26 15:13:13 1991  Roland McGrath  (roland@albert.gnu.ai.mit.edu)
+
+	* lgpl.texinfo: @ifset lgpl-appendix, use @appendix instead of
+	@unnumbered.
+
+Sun Nov 10 12:00:06 1991  Karl Berry  (karl at hayley)
+
+        * texinfo.tex (\doprintindex): only \read if the file existed;
+          \closein the test stream in all cases.
+        (\initial, \entry): do not \outer, so that \read does not get an
+          error if the index exists.
+
+Fri Nov  8 18:13:28 1991  Michael Bushnell  (roland@churchy.gnu.ai.mit.edu)
+
+	* texinfo.tex (\itemizey): missing %'s in macro defn.
+	  Also, add \begingroup; accidentally deleted by Karl Berry.
+
+Thu Nov  7 11:41:25 1991  Karl Berry  (karl at hayley)
+
+        * texinfo.tex (\doprintindex): \read from the index file to make
+          \ifeof true when the file exists but is empty.
+
+Tue Nov  5 08:29:13 1991  Robert J. Chassell  (bob at grackle)
+
+        * texinfo.tex (@thischaptername): Provide default value for when
+          @chapter not defined.
+
+Sat Nov  2 17:59:02 1991  Karl Berry  (karl at hayley)
+
+        * texinfo.tex (\itemizezzz): do \begingroup here, since \itemizey
+          can't any longer.
+
+Tue Oct 29 12:17:41 1991  Robert J. Chassell  (bob at grackle)
+
+        * texinfo.tex: @paragraphindent defined as a no op.
+
+Fri Oct 25 15:19:47 1991  Karl Berry  (karl at hayley)
+
+        * texinfo.tex (\enumeratey): allow any lowercase letter, uppercase
+          letter, or number as argument; initialize \itemno and begin the
+          environment's group here.
+          (\itemizey): don't initialize \itemno here.
+          (\numericenumerate, \startenumeration): new macro.
+
+Wed Oct 23 16:26:30 1991  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\ifclear, \ifset): Remove \outer.
+
+	* texinfo.tex (\afourpaper): Set various parameters.
+
+Tue Oct 22 18:42:31 1991  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\alphaenumerate, \capsenumerate):
+	Let @end enumerate end these.
+	(\Ealphaenumerate, \Ecapsenumerate): Aliases for \Eenumerate.
+
+Sun Oct 20 18:23:18 1991  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\mainmagstep): New parameter macro.
+	(Defining fonts): Use that parameter to scale them.
+	If \bigger is defined, use 12 point fonts.
+
+Tue Sep 24 00:30:07 1991  Roland McGrath  (roland@churchy.gnu.ai.mit.edu)
+
+	* texi2dvi: Iterate over the right variable to look for new idx files.
+
+	* texi2dvi: GPL 2.
+
+	* texi2dvi: Fix 2nd invocation of texindex to pass right args.
+
+Wed Sep 11 20:52:42 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\cartouche): New macro.
+
+Fri Aug 23 16:13:46 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\section, \subsection, \subsubsection):
+	Initially define for numbered chapters.
+
+Fri Aug  2 01:46:09 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\footnote): Use \unskip instead of \removelastskip.
+
+Mon Jul 29 14:06:54 1991  Roland H. Pesch  (pesch at cygint.cygnus.com)
+
+	* texinfo.tex (\majorheadingzzz, \chapheadingzzz, \chfplain,
+	\unnchfplain, \unnchfopen, \secheadingi, \subsecheadingi,
+	\subsubsecheadingi): allow line breaks in headings.
+	(\shortchapentry, \shortunnumberedentry, \dochapentry, \dosecentry,
+	\dosubsecentry, \dosubsubsecentry): allow line breaks in table of
+	contents entries.
+
+Thu Jul 18 19:01:53 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\secfonts, \indexfonts): Fix typos.
+
+Sun Jul  7 16:36:28 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\afourpaper): New command.
+
+	* texinfo.tex (\numberedsec): Renamed from \section.
+	(\numberedsubsec): Renamed from \subsection.
+	(\numberedsubsubsec): Renamed from \subsubsection.
+	(\chapter, \appendix, \unnumbered): Define \section, \subsection,
+	and \subsubsection here according to type of chapter.
+
+Thu Jul  4 14:19:32 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\defvarparsebody, \defvrparsebody, \defopvarparsebody):
+	New functions.
+	(\defvar, \defvr, \defopt, \defcv, \defivar): Use them.
+	(\deftypevar, \deftypevr): Likewise.
+
+Mon Jul  1 13:49:25 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\group): Report error if used outside @example, etc.
+
+	* texinfo.tex (\defname): Reduce \leftskip
+	to cancel temporarily the increase made in \defparsebody.
+
+	* texinfo.tex (\enumerate): Allow optional arg to specify type
+	of counting.
+
+	* texinfo.tex (\set, \clear): New commands.
+
+Mon Jun 24 12:22:44 1991  Roland McGrath  (roland@albert.gnu.ai.mit.edu)
+
+	* texinfo.tex (\eleterate): Renamed to \alphaenumerate.  Sigh.
+	(\ecapitate): Likewise \capsenumerate.
+
+Thu Jun  6 20:02:48 1991  Roland McGrath  (roland@geech.gnu.ai.mit.edu)
+
+	* lgpl.texinfo: Created from /fsf/rms/gnuorg/lgpl.text.
+
+	* gpl.texinfo: Created from /fsf/rms/gnuorg/gpl.text (GPL v2).
+
+	* texinfo.tex (\eleterate, \ecapitate): New commands, like @itemize,
+	but with [a..z] or [A..Z] instead of [1..n].
+
+Tue May 21 15:46:32 1991  Karl Berry  (karl at hayley)
+
+        * texinfo.tex (\dmn): new command to typeset a dimension.
+
+Tue May 21 20:58:22 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\doind, \dosubind): Make new group around \indexdummies
+	and most of body, excluding the \penalty commands.
+
+Mon May 20 21:16:32 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\tex): Typo in redefining \@.
+
+	* texinfo.tex (\_): Use \lvvmode, not \leavevmode.
+	(\lvvmode): New macro.
+
+	* texinfo.tex (\authorrm, \titlerm): Move to after section fonts.
+
+Tue May 14 21:13:29 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\defunargs): Set \hyphenchar in \tensl, not \sl.
+
+Thu May  9 17:07:08 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\ignore): Standardize catcode of space.
+
+Wed May  8 13:49:45 1991  Karl Berry  (karl at hayley)
+
+        * texinfo.tex (\sffam, \sf): New macros; support sans serif
+	type style in math.
+        (top level): Set up \textfonts early on, so we can create boxes w/ it.
+        (\tenrm...\tensf): Define these to be \textrm...\textsf instead.
+        (\df, \textfonts, \chapfonts, \secfonts, \subsecfonts):
+        (\indexfonts): Redefine \tenrm (etc.) instead of just \rm, so that
+	the math family assignment doesn't get lost; call \resetmathfonts.
+        (\resetmathfonts): New macro; redefines \textfont of each math family.
+        (\indsc, \indi, \indsy \chapsc, \chapi, \chapsy, \secsc, \seci):
+        (\secsy, \ssecsc, \sseci, \ssecsy): New font definitions.
+
+Mon May  6 21:30:19 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\indexdummies): Write \_ when an _ is seen.
+
+Mon Apr 29 01:41:44 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\defname): Use \dimen2, \dimen3 for outer margins.
+	Use outer margins for influencing \rightline.
+	(\tclose, \key, \t): Turn off line breaks at hyphens.
+
+Fri Apr 12 03:12:14 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\authorrm): Move definition to top level; copy \secrm.
+
+Tue Apr  2 22:48:39 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\defname): Adjust size of \rlap box, not \dimen0
+	or \dimen1, for current width.
+
+	* texinfo.tex (\Yappendixletterandtype): End with {}.
+
+Sat Mar 30 16:13:25 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\xrefX): Really use \cite.
+	(\inforefzzz): Use \samp for node name.
+
+	* texinfo.tex (\defname): Use current width for \dimen0, \dimen1.
+
+	* texinfo.tex (\doprintindex): Put lots of whitespace before index.
+
+Fri Mar 29 17:00:58 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\xrdef): Take out last change.
+
+	* texinfo.tex (\needx): Turn off \baselineskip.  Use kern, and no glue.
+
+	* texinfo.tex (\shortcontrm): Renamed from \truesecrm.
+	(\shortcontbf, \shortcontsl): New fonts for short contents lines.
+	(\summarycontents): Use them.
+
+	* texinfo.tex (\defname): Don't set \leftskip to 0; just decrease by
+	one indent level.
+	(\defparsebody, \def*parsebody): Increment both margins by one level.
+
+Tue Mar 26 22:41:38 1991  Richard Stallman  (rms at mole.gnu.ai.mit.edu)
+
+	* texinfo.tex (\xrdef): Change catcode before reading args.
+
+Wed Mar 20 14:21:57 1991  Roland McGrath  (roland at geech.gnu.ai.mit.edu)
+
+	* texi2dvi: Use p modifier in sed -n command, so it works.
+	Duplicate code to find the index files, instead of being smart in
+	one place and dumb in another.
+
+Thu Mar  7 17:08:32 1991  Richard Stallman  (rms at mole.ai.mit.edu)
+
+	* texinfo.tex (\defaultparindent): New variable.
+	(\footnotezzz): Reset \parindent to default.
+	(\xrefX): Use \cite for printed manual and node names.
+
+Tue Mar  5 13:39:34 1991  Richard Stallman  (rms at mole.ai.mit.edu)
+
+	* texinfo.tex (\emergencystretch feature): Use \thisisundefined.
+
+Mon Mar  4 00:35:57 1991  Richard Stallman  (rms at mole.ai.mit.edu)
+
+	* texinfo.tex (\ftablex): Define \Eftable; undefine \Etable.
+
+	* texinfo.tex (\footnote): Discard preceding whitespace.
+
+	* texinfo.tex: Use the \emergencystretch feature if available.
+
+Fri Feb 22 03:50:58 1991  Richard Stallman  (rms at mole.ai.mit.edu)
+
+	* texinfo.tex (\tex): Make + not active.
+
+Fri Feb 15 10:05:24 1991  Roland McGrath  (mcgrath at cygint.cygnus.com)
+
+	* texi2dvi: Use $TEXINFO in place of $TEX (falling back to $TEX
+	if $TEXINFO is undefined).
+
+	* texi2dvi: Renamed from texinfo.  Bob (I believe) did this at some
+	point at and didn't make a ChangeLog entry.  I'd shoot him myself if
+	he weren't the person who signs my paychecks.
+
+Sun Feb 10 22:51:52 1991  Richard Stallman  (rms at mole.ai.mit.edu)
+
+	* texinfo.tex (\doprintindex): If index is empty, print a dummy.
+	(\need): Use vskips and penalties; don't use \pagetotal.
+
+Fri Feb  8 17:36:53 1991  Richard Stallman  (rms at mole.ai.mit.edu)
+
+	* texinfo.tex (\ignoresections):
+	Turn off \contents, \smallbook and \titlepage.
+
+	* texinfo.tex (\Etitlepage): Do a page break before ending the group.
+
+	* texinfo.tex (\setref, \unnumbsetref, \appendixsetref):
+	Comment out recording the chapter title.
+
+Thu Jan 24 23:28:41 1991  Richard Stallman  (rms at mole.ai.mit.edu)
+
+	* texinfo.tex (\top): Synonym for \unnumbered.
+	(\infotop): Synonym for \infounnumbered.
+	(\ignoresections): Handle \top.
+
+Thu Jan 24 12:41:33 1991  Richard Stallman  (rms at mole.ai.mit.edu)
+
+	* texinfo.tex: Delete spurious character at beginning.
+
+Thu Jan 17 16:34:25 1991  Roland McGrath  (roland at cygint.cygnus.com)
+
+	* texinfo: Check the exit status of tex and texindex.  Don't procede
+	after a failing run.
+
+Thu Jan 10 15:16:47 1991  Richard Stallman  (rms at mole.ai.mit.edu)
+
+	* texinfo.tex (\xrefX): Get rid of blank line.
+
+Wed Jan  9 18:06:20 1991  Richard Stallman  (rms at mole.ai.mit.edu)
+
+	* texinfo.tex (\entry, \secondary): Use \indexdotfill.
+	(\indexdotfill): New macro.
+
+Tue Jan  8 17:44:01 1991  Richard Stallman  (rms at mole.ai.mit.edu)
+
+	* texinfo.tex (\donoderef): Define a ...-title cross-reference.
+	(Ytitle): Subroutine for that.
+	(xrefX): Use the real title by default (but this is commented out).
+
+Tue Jan  1 23:18:21 1991  Richard Stallman  (rms at mole.ai.mit.edu)
+
+	* texinfo.tex (\indexnofonts): Delete troublemaking blank line.
+
+Sat Dec 22 00:47:21 1990  Richard Stallman  (rms at mole.ai.mit.edu)
+
+	* texinfo.tex (\xrefX): Prevent extra space.
+
+Fri Dec 21 21:14:50 1990  Richard Stallman  (rms at mole.ai.mit.edu)
+
+	* texinfo.tex (\comment, \commentxxx): Ignore @ in comment.
+
+Thu Dec 13 22:38:31 1990  Chris Hanson  (cph at kleph)
+
+	* texinfo.tex (\defivarheader): Capitalize "Variable".
+
+Sun Dec  2 01:46:04 1990  Richard Stallman  (rms at mole.ai.mit.edu)
+
+	* texinfo.tex (\indexdummies, \indexnofonts): Handle \t like \r.
+
+	* texinfo.tex (heading fonts): New fonts based on cm...12.
+
+Tue Nov 27 16:59:35 1990  Richard Stallman  (rms at mole.ai.mit.edu)
+
+	* texinfo.tex (\indexnofonts): Also supersede \TeX and \dots.
+
+Sun Nov 18 16:18:14 1990  Richard Stallman  (rms at mole.ai.mit.edu)
+
+	* texinfo.tex (\*): End with \ignorespaces.
+
+Fri Nov  2 17:41:48 1990  Richard Stallman  (rms at mole.ai.mit.edu)
+
+	* texinfo.tex (\*): Output empty hbox to avoid losing whitespace.
+	(\deftypevarheader, \deftypevrheader): End the paragraph
+	with suitable penalties.
+	(\deftypevrheader): Do print the data type.
+
+Thu Nov  1 12:04:52 1990  Richard Stallman  (rms at mole.ai.mit.edu)
+
+	* texinfo.tex (\defmethodheader): Print `method', not `operation'.
+
+Fri Oct 26 17:11:08 1990  Richard Stallman  (rms at mole.ai.mit.edu)
+
+	* texinfo.tex (\indexdummies): Temporarily redefine \_.
+	(\ptexdots): Copy of plain tex \dots.
+	(\tex): Temporarily reinstall that.
+
+Fri Oct 19 16:57:48 1990  Richard Stallman  (rms at mole.ai.mit.edu)
+
+	* texinfo.tex (\subsubsecheadingi, \subsecheadingi): New subroutines.
+
+Mon Oct  8 13:34:19 1990  Richard Stallman  (rms at mole.ai.mit.edu)
+
+	* texinfo.tex (active _): Use \normalunderscore.
+
+Tue Sep 25 22:32:55 1990  Richard Stallman  (rms at mole.ai.mit.edu)
+
+	* texinfo.tex (\deftypefn, \deftypevar, \deftypevr): New macros.
+	Their subroutines also new.
+
+Tue Sep 25 16:42:52 1990  Roland McGrath  (roland at geech.ai.mit.edu)
+
+	* texinfo: Recognize `.tex' as a suffix.
+
+Tue Sep 25 01:46:54 1990  Richard Stallman  (rms at mole.ai.mit.edu)
+
+	* texinfo.tex (\deftypefun): New macro.
+	(\deftypefunheader, \deftypefunheaderx, \deftypefunargs): Also new.
+
+Fri Sep 14 00:38:28 1990  Roland McGrath  (roland at churchy.ai.mit.edu)
+
+	* texinfo: Weed out files that have two-letter extensions but don't
+	start with a backslash, and therefore aren't index files.
+
+	* texinfo: Handle index files that have any two-letter extension,
+	rather than using a static list of extensions.
+
+	* texinfo: Handle .texi extension as well as .texinfo.
+
+	* texinfo: New file, a sh script to do .texinfo -> .dvi.
+
+Mon Sep 10 13:14:39 1990  Richard Stallman  (rms at mole.ai.mit.edu)
+
+	* texinfo.tex (\math): New macro.
+
+Tue Sep  4 07:43:33 1990  Karl Berry  (karl at hayley)
+
+        * texinfo.tex (\chfplain): Do not print a period after the chapter
+        number, for consistency with sections et al.
+
+        * texinfo.tex (\refX): hyphenate `undefined' so that the ligature
+        is not lost.
+
+        * texinfo.tex (_): use \_ unless we're in tt.
+        (\ifusingtt): new macro for such conditionalization.
+
+        * texinfo.tex (\xrefX): don't use \unhbox to print the node names,
+        since that loses on hyphens.
+	Use \ignorespaces rather than \losespace.
+
+Thu Aug  2 07:03:26 1990  Karl Berry  (karl at hayley)
+
+        * texinfo.tex (\linenumber): new macro.
+        (\refx): give the line number in the message.
+
+Tue Jul 31 09:13:32 1990  Karl Berry  (karl at hayley)
+
+        * texinfo.tex (\refx): improve warning messages, remove
+        unnecessary groups, and improve logic.
+
+Thu Jul 26 20:53:38 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\subheading, \subsubheading): Missing macros defined.
+
+Thu Jul 19 22:48:26 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\titlepage): Don't print rule for \page unless already
+	printed a rule.
+	(\abstract): Deleted.
+	(\direntry): New command, much like \ignore.
+
+Sun Jul 15 16:28:42 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\abstract): New construct; trivial in tex.
+
+Sun Jun 17 01:03:16 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\defcv): Protect space before `of'.
+	(\defspec): Capitalize `Form'.
+
+Sat Jun 16 19:36:56 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\kbd, \kbdfoo): Use \par to term. arg to \kbdfoo.
+
+Fri Jun 15 10:47:12 1990  Robert J. Chassell  (bob at pogo.ai.mit.edu)
+
+	* texinfo.tex (\defcv): Use \defcvarheader instead of (undefined)
+	\defcvheader.
+
+Fri May 25 18:04:31 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\xrefX): Use \turnoffactive.
+
+Mon May 21 21:17:34 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\turnoffactive): New command.
+	(\normaldoublequote, ...): New commands.
+	(\dosetq): Use \turnoffactive.
+
+Sat May 19 12:31:17 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\indit): Use slanted font, not italic.
+	(\smalllispx): Do \indexfonts.
+
+Fri May	 4 17:35:04 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\footnote, \footnotezzz): Make it \long.
+
+Wed May	 2 01:19:55 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\titlerm): Go back to cmbx10 scaled \magstep5.
+	(\hsize): Don't set it, use the default.
+
+Fri Mar 23 21:07:02 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\footnote): Read arg in braces, not as a line.
+
+Mon Mar 19 19:30:08 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\unnumbsubsubsecentry): Typo in name being defined.
+
+Tue Mar 13 18:49:27 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\defvarargs): Add penalty at end.
+
+	* texinfo.tex (\synindex, \syncodeindex): Copy one index file name
+	into the other.
+
+Tue Mar	 6 16:58:54 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\deftt): Make this a distinct font.
+
+	* texinfo.tex (\initial): Define \tt like \tentt.
+
+	* texinfo.tex (\ifinfo): End with \losespace.
+	(\ignore, \ifsetfailxxx, \ifclearfailxxx): Likewise.
+
+Sun Mar	 4 19:55:57 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\lbrb, \rbrb): Use \bf.
+
+Sat Mar	 3 17:53:22 1990  Richard Stallman  (rms at geech)
+
+	* texinfo.tex (\onepageout): Set \escapechar here.
+
+	* texinfo.tex (\rawbackslash): Define using \chardef.
+
+	* texinfo.tex (\@): Use ttfont.
+
+Thu Mar	 1 16:37:46 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (Ysectionnumberandtype, Yappendixletterandtype):
+	Capitalize "chapter", "appendix" and "section".
+
+Mon Feb 19 20:26:22 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\xkey): Attempt to eliminate spurious space from
+	output.	 Look at y-or-n-p.
+
+Mon Feb 12 16:34:00 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\errorbox): Get \dimen0 from \tentt.
+
+Sun Feb 11 15:11:57 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\defunargs): Use ragged right for args.
+	Add large penalty at end.
+
+	* texinfo.tex: Make active definition for = using \tt, but disable.
+	(\defparsebody): Make = active.
+	(\defunheader, etc.): Make inactive again.
+
+	* texinfo.tex (\errorbox): Try to equalize outside space to both sides.
+
+Fri Feb	 2 14:47:21 1990  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\appendix): Don't use \the before \appendixletter.
+
+Sat Dec 16 14:02:56 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\chapter, \appendix): Make defn of \thischapter
+	refer to \thischaptername, and store actual name there.
+	(\chapternofonts): Turn off more macros.
+	(\indexdummies): Likewise.
+
+Sun Nov 19 15:29:47 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\titlerm): There were two definitions of this command.
+	Put them together and commented out one of them.
+	(\subtitlerm): Was same as \tenrm, so just copy that.
+	(\ninett): Always define this.
+	(\indtt): Copy from \ninett.
+
+Sat Nov 18 22:57:37 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\ssecrm, etc.): Scale by 1315, rather than to 13pt.
+
+Wed Nov	 8 18:38:33 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\titlepage): Turn on iffinishedtitlepage so
+	bottom rule is not printed.
+	(\titlezzz): Turn it off, so bottom rule is printed.
+
+Mon Nov	 6 09:23:29 1989  Karl Berry  (karl at hayley)
+
+	* texinfo.tex (\chapterzzz, \appendixzzz): include `Chapter
+	\the\chapno' and `Appendix \appendixletter' in \thischapter; use
+	\xdef instead of \gdef to define \thischapter, to avoid timing
+	problems with \chapno or \appendixletter.
+	(\startcontents): don't bother putting `Table of Contents' or
+	`Short Contents' in the headline.
+
+Fri Oct 20 09:11:35 1989  Karl Berry  (karl at hayley)
+
+	* texinfo.tex (\titlepage): remove obsolete code for subtitles.
+	(\titlezzz): end with \relax, to avoid misinterpretation of a
+	following `plus' or `minus'
+	(\page (inside \titlepage)): call \finishtitlepage.
+	(\Etitlepage): call \finishtitlepage, if it hasn't been.
+	(\finishtitlepage): new macro to print a rule and leave some space
+	at the bottom of the title page.
+	(\iffinishedtitlepage): new; says whether \finishtitlepage has been
+	called.
+
+Mon Nov	 6 21:35:34 1989  Robert J. Chassell  (bob at rice-chex)
+
+	* texinfo.tex: Replaced `GNU CC' in the copyleft of this file with
+	  the phrase `this texinfo.tex file'.
+
+Fri Oct 27 10:36:32 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\setfilename): Do nothing except 1st time used.
+	(\titlepage): Brace misplaced in \titlezzz.
+	(\indexdummies, \indexnofonts): Handle @w.
+
+	(\readauxfile): Set \ifhavexrefs true.
+	(\refX): Warn for every use of an undefined xref,
+	but if no xref values are known, warn just once that none are known.
+
+Tue Sep 19 04:12:51 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\xrefX): Go back to `section N [Foo], page M'.
+	(\exp): Delete it.
+
+Mon Sep 18 15:29:30 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\chapentryfonts): Try using \rm for chap title.
+
+Tue Sep 12 03:41:10 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\titlepage): Missing closeparen after \title.
+	Delete excess paren after \page.
+
+	* texinfo.tex (\samp): Use \tclose.
+
+Mon Sep 11 23:28:04 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\tclose): Make `@ ' a full-width space.
+
+Sat Sep	 9 20:11:29 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\balancecolumns): Handle properly the case where
+	the index ends before one page is output, so \partialpage is nonempty.
+	In this case we may need to output two pages if the data
+	would just barely fit if not for \partialpage.
+
+Wed Aug 30 22:45:31 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\refx): New 2nd operand, output if xref is non-null.
+	(\xrefX): Use that to output the comma after the section number.
+	(\appendixnoderef, \appendixsetref, \Yappendixletterandtype):
+	Define xrefs for appendices that say "Appendix N".
+	Used in \appendix, \appendixsec, etc.
+
+	* texinfo.tex (\smartitalic): The actual italic correction was omitted.
+
+Mon Aug 28 00:21:33 1989  Richard Stallman  (rms at apple-gunkies.ai.mit.edu)
+
+	* texinfo.tex (\ref): New kind of cross-reference.
+	(\xrefX): Put single quotes around section name.
+	(\refx): Allow hyphenation in `undefined'.
+
+	* texinfo.tex (+): Make it active.
+	(Altmode): Delete active defn.
+
+	* texinfo.tex (\defunargs): Prevent hyphenation at `-' in args.
+	Move the penalty at the end so that it works.
+	(\defvarargs): Move the penalty at the end so that it works.
+
+	* texinfo.tex (\defparsebody): Do increase right margin.
+
+	* texinfo.tex (\defbodyindent): Now .4 inch.
+
+	* texinfo.tex (\point, \result, \expansion, \print, \equiv, \error):
+	New macros for Lisp manual.
+
+	* texinfo.tex (\tex): Set = to code 12.
+
+	* texinfo.tex (\entry): Hairier way to output dots.
+
+	* texinfo.tex (\kbd): If arg consists of one \key command, be a no op.
+
+	* texinfo.tex (\sc): Delete spurious \.
+
+	* texinfo.tex (\smartitalic): New macro, does italic correction at end.
+	(\i, \var, \dfn, \emph, \cite): Use that.
+
+	* texinfo.tex (\node): Do \ENVcheck.
+
+	* texinfo.tex (\initial): Infinite penalty at end.
+
+	* texinfo.tex (\chapternofonts): New macro, sets \code, etc. to
+	output selves into file.  Also undef \frenchspacing and \rawbackslash.
+	(\xhapterzzz, etc.): Call that.	 Make a group to undo it.
+	(\indexdummies): Do like \chapternofonts.
+
+Sun Aug 27 16:05:23 1989  Richard Stallman  (rms at apple-gunkies.ai.mit.edu)
+
+	* texinfo.tex (\frenchspacing): Our own definition, using
+	decimal numbers for all character codes.  The standard one fails.
+
+	* texinfo.tex (\indexnofonts): Handle \file, \tt, and many more.
+
+Fri Aug 25 22:05:24 1989  Richard Stallman  (rms at apple-gunkies.ai.mit.edu)
+
+	* texinfo.tex (\chapter, etc.): Undefine \tclose around \edef\temp.
+
+Mon Aug 21 15:42:47 1989  Richard Stallman  (rms at apple-gunkies.ai.mit.edu)
+
+	* texinfo.tex (\tclose): Like \t but make space same width
+	as in surrounding text.
+	(\code, \kbd): Use \tclose.
+
+Tue Jul	 4 20:53:52 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (titlepage): Don't set \everypar; start just one group.
+	See comments in the code.
+
+	* texinfo.tex (defop,defcv): Use defopparsebody.
+	* texinfo.tex (defopparsebody): Like defmethparsebody but defines
+	def...x for more arguments.
+
+Sat Jun 17 13:49:13 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\titlepage): Rename @subtext, etc., to @subtitle, etc.
+
+	* texinfo.tex (\titlepage): Don't print the title automatically.
+	Define @title to print it, and the rule underneath it.
+	This should make @titlepage upward compatible with the old one.
+
+	* texinfo.tex (\titlepage): Revert local definition of @page
+	to previous.  Don't print a rule.
+
+Mon Jun 12 20:49:17 1989  Karl Berry.  (karl at mote)
+
+	* texinfo.tex (\titlepage): allow intensional definition of the
+	items on the title page.  New control sequences (allowed only
+	within the titlepage environment:)
+	 (@subtext): may take either a paragraph (e.g., a brief
+	 description of the program) or just a line (e.g., the date).
+	 May appear more than once.
+	 (@author): must come after all the @subtext's.	 Can appear more
+	 than once, also.
+	 Also, use the title defined by @settitle.
+	 (\subtextfont, \authorfont): switch to using the appropriate
+	 fonts with appropriate leading.
+	 (\titlepagetopglue, \titlepagebottomglue): define space that
+	 never stretches or shrinks.
+	 (\realeverypar): formatting for the @subtext's.
+
+Sun Jun	 4 15:04:59 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (\shortchapentry, \shortunnumberedentry):
+	Use dots, right justify page numbers.  Don't use italics.
+
+Fri Jun	 2 14:40:28 1989  Karl Berry.  (karl at mote)
+
+	* texinfo.tex (\entry, \secondary): use plain TeX \dotfill for
+	better leaders than the homegrown one.
+	(\Dotsbox): Deleted.
+	(\dotfill): Deleted; use Plain TeX definition.
+
+Wed May 31 17:19:30 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (ignore): Undefine the chapter/section macros
+	while reading the args, since they are \outer.
+	(ifinfo): Likewise
+	(ifsetxxx, ifclearxxx): Call another macro to parse the
+	conditionalized text, and do to that macro as with \ignore.
+
+Tue May 30 15:04:37 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex (unnumbered): Change back from \long to \outer.
+
+	* texinfo.tex: Changes by Karl Berry for toc format.
+	Rewrite the table of contents for appearance's sake.  Add a
+	synonym for \summarycontents, \shortcontents, since that is the
+	traditional name.  Two subroutines are now shared by \contents and
+	\summarycontents: \prepareforcontents, to reset the page number
+	and such; and \startcontents, which begins the \unnumbered and
+	resets catcodes before \input \jobname.toc.  Some other macros --
+	\labelspace, \dopageno, \shortpageno -- are shared by the printing
+	macros.
+
+	* texinfo.tex (\truesecrm): New font, section-size roman, used in the
+	new toc. (cmr12)
+
+Sun May 28 07:25:42 1989  Karl Berry.  (karl at mote)
+
+	* texinfo.tex (\eatinput): Do not print the `\input texinfo' if a
+	.fmt file is being used; ignore it, instead.  This is the initial
+	definition for `\' now.
+	(\fixbackslash): on the other hand, subsequent backslashes should
+	be printed, and if the file does not have an `\input texinfo', the
+	first one should be printed.  This new macro makes the definition
+	for `\' be \normalbackslash, if it is \eatinput.
+	(\setfilename): use \fixbackslash.
+
+Wed May 24 15:34:59 1989  Joseph Arceneaux  (jla at apple-gunkies.ai.mit.edu)
+
+	* texinfo.tex: Changed def of unnumbered from \outer to \long.
+
+Tue May 23 12:27:59 1989  Karl Berry.  (karl at mote)
+
+	* texinfo.tex: Allow one to make a texinfo.fmt file (with the
+	invocation:
+	   initex \&plain texinfo
+	and then saying
+	   @dump
+	after texinfo.tex has been read.
+	Changes:
+	(\setfilename): Instead of being a no-op, read the xref info, and
+	open the contents and index files.  These actions were done as
+	texinfo.tex was read before.
+	(\opencontents, \openindices): new macros to open those files.
+	(\readauxfile): and one to read the aux file.
+
+Sat Apr 29 22:28:02 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex: `@headings on' no longer does a page break.
+
+Sun Apr	 2 11:22:29 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex: Defined `@headings single' and `@headings double'.
+	`@headings on' picks one of them: `@setchapternewpage odd'
+	says `@headings	on' means double; otherwise it means single.
+
+Mon Jan 30 22:00:35 1989  Robert J. Chassell  (bob at rice-krispies.ai.mit.edu)
+
+	* texinfo.tex: Changed the size of the subsection fonts so they
+	are scaled at13pt rather than at magstep 2. This makes them
+	smaller than the section fonts, which are scaled at magstep 2.
+	In addition, changed the ssecrm font from cmbx to cmb.
+
+Fri Jan	 6 15:00:44 1989  Richard Stallman  (rms at sugar-bombs.ai.mit.edu)
+
+	* texinfo.tex: Changed @lisp, @smalllisp, @display not to change
+	the right margin.
+
+Mon Dec	 5 22:01:49 1988  Robert J. Chassell  (bob at rice-krispies.ai.mit.edu)
+
+	* texinfo.tex: Tested the use of `cmbx10' vrs `cmb10' font and
+	stayed with cmb10 font since cmb10 looks better when the bold face
+	is part of a sentence although the cmbx10 font looks better on its own.
+
+Mon Aug 15 14:33:51 1988  Robert J. Chassell  (bob at spiff)
+
+	* texinfo.tex:	Changed the (undocumented) @today command from a
+	Month Day, Year format to a Day Month Year format.  Left old
+	version commented out.
+
+
+Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996,
+1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.
+
+
+Local Variables:
+mode: indented-text
+left-margin: 8
+fill-column: 76
+version-control: never
+End:
diff --git a/gnu/usr.bin/texinfo/INSTALL b/gnu/usr.bin/texinfo/INSTALL
index 50dbe439d09..9f6163692a4 100644
--- a/gnu/usr.bin/texinfo/INSTALL
+++ b/gnu/usr.bin/texinfo/INSTALL
@@ -1,183 +1,45 @@
-Basic Installation
-==================
-
-   These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
-
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `configure'
-initial values for variables by setting them in the environment.  Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-
-Or on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory.  After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
-
-Installation Names
-==================
-
-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
-     CPU-COMPANY-SYSTEM
-
-See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
-
-   If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Operation Controls
-==================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--cache-file=FILE'
-     Use and save the results of the tests in FILE instead of
-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-     debugging `configure'.
-
-`--help'
-     Print a summary of the options to `configure', and exit.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`configure' also accepts some other, not widely useful, options.
-
+$Id: INSTALL,v 1.1.1.4 2006/07/17 16:03:14 espie Exp $
+
+     Copying and distribution of this file, with or without modification,
+     are permitted in any medium without royalty provided the copyright
+     notice and this notice are preserved.
+
+For generic installation instructions on compiling and installing this
+Automake-based distribution, please read the file `INSTALL.generic'.
+
+Installation notes specific to Texinfo:
+
+* texinfo.tex and the other *.tex files are not installed by `make
+  install'.  This is because there is no reliable way to know where to
+  install them.  Instead, you have to run an additional make command
+  after the normal make install:
+    make TEXMF=/your/texmf install-tex
+  texinfo.tex is installed in ${TEXMF}/tex/texinfo/texinfo.tex, etc.
+
+* On the other hand, if you're maintaining a TeX distribution, you don't
+  want your users to see the installation warnings, because you already
+  have the files installed.  (And you're keeping them up to date, right?)
+  In this case, run configure --disable-install-warnings, or set
+  enable_install_warnings=no in the environment.
+
+* On MacOSX, if configure fails with the error:
+	ac_cv_build='config.sub: invalid option -apple-darwin7.2.0
+this is probably because your uname -p is returning "unknown".  Use
+/usr/bin/uname instead.
+
+* For instructions on compiling this distribution with DJGPP tools
+  for MS-DOS and MS-Windows, see the file djgpp/README.
+
+* The Info tree uses a file `dir' as its root node; the `dir-example'
+  file in this distribution is included as a possible starting point.
+  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, you might like to use
+  @afourpaper by default.  See the `Preparing for TeX' node in
+  texinfo.txi for more details.  You don't have to create the file if
+  you have nothing to put in it.
+
+* If your info files are not in $prefix/info, you may wish to add a line
+#define DEFAULT_INFOPATH "/mydir1:/mydir2:..."
+  to config.h after running configure.
diff --git a/gnu/usr.bin/texinfo/INSTALL.generic b/gnu/usr.bin/texinfo/INSTALL.generic
new file mode 100644
index 00000000000..095b1eb4063
--- /dev/null
+++ b/gnu/usr.bin/texinfo/INSTALL.generic
@@ -0,0 +1,231 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+These are generic installation instructions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.  If you're
+     using `csh' on an old version of System V, you might need to type
+     `sh ./configure' instead to prevent `csh' from trying to execute
+     `configure' itself.
+
+     Running `configure' takes awhile.  While running, it prints some
+     messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about.  Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory.  After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc.  You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PREFIX'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+give `configure' the option `--exec-prefix=PREFIX', the package will
+use PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files will still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the `--target=TYPE' option to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+will cause the specified gcc to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+     Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+
diff --git a/gnu/usr.bin/texinfo/INTRODUCTION b/gnu/usr.bin/texinfo/INTRODUCTION
index b87e415bd3d..9d85eff3161 100644
--- a/gnu/usr.bin/texinfo/INTRODUCTION
+++ b/gnu/usr.bin/texinfo/INTRODUCTION
@@ -1,10 +1,13 @@
-Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000, 01
-Free Software Foundation, Inc.
+$Id: INTRODUCTION,v 1.1.1.5 2006/07/17 16:03:18 espie Exp $
+Getting started with Texinfo.
+
+  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+  Free Software Foundation, Inc.
+
+  Copying and distribution of this file, with or without modification,
+  are permitted in any medium without royalty provided the copyright
+  notice and this notice are preserved.
 
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts.  
 
 
 Getting Started with Texinfo
diff --git a/gnu/usr.bin/texinfo/NEWS b/gnu/usr.bin/texinfo/NEWS
index 76d5a742486..c83570e3d48 100644
--- a/gnu/usr.bin/texinfo/NEWS
+++ b/gnu/usr.bin/texinfo/NEWS
@@ -1,12 +1,13 @@
-Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000, 01, 02
-Free Software Foundation, Inc.
+$Id: NEWS,v 1.1.1.7 2006/07/17 16:03:14 espie Exp $
+This file records noteworthy changes, very tersely.
+See the manual for detailed information.
 
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts.  
+  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+  2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
-This file records noteworthy changes.
+  Copying and distribution of this file, with or without modification,
+  are permitted in any medium without royalty provided the copyright
+  notice and this notice are preserved.
 
 
 *** IMPORTANT NEWS FOR ALL AUTHORS OF TEXINFO MANUALS ***
@@ -18,8 +19,213 @@ because the historical method of doing copyright permissions using
 @ifinfo failed to output copyright information in the HTML (or XML)
 formats.  The manual has detailed explanations and examples.  For
 convenience, here's a url to one of the relevant sections:
-  http://texinfo.org/manual/Document-Permissions.html
+  http://www.gnu.org/software/texinfo/manual/texinfo/html_node/Document-Permissions.html
 
+-------------------------------------------------------------------------------
+
+4.8 (31 December 2004)
+* Language:
+  . new command @euro for the Euro currency symbol, and
+    @documentencoding has some support for ISO-8859-15.
+  . new command @abbr for general abbreviations.
+  . new command @slanted to typeset text in a slanted font,
+    and @sansserif to typeset in a sans serif font.
+* makeinfo:
+  . An empty first argument to cross-reference commands, such as @xref,
+    causes an error.  This change was made in 4.1, but not mentioned in NEWS.
+  . HTML output:
+    - <a name="..."> constructs are added for the old-style
+      conversion of node names to HTML names, so that external references
+      to them can continue to work.
+    - "g_t" prefixed to targets for node names beginning with a
+      nonletter, for XHTML compatibility.
+  . Docbook output: recognize more image formats.
+* texi2dvi:
+  . new option --recode, to call recode for input character translation.
+* Distribution:
+  . new convenience script texi2pdf, equivalent to texi2dvi --pdf (from tetex).
+  . some cross-compiling support in configure && make.
+  . new configure option --disable-install-warnings, for TeX.
+    distributions which do have the files installed.
+  . automake 1.9.4.
+
+
+4.7 (9 April 2004)
+* Language:
+  . new commands @float, @caption, @shortcaption, @listoffloats for
+    initial implementation of floating material (figures, tables, etc).
+    Ironically, they do not yet actually float anywhere.
+  . new commands @docbook, @ifdocbook, @ifnotdocbook for conditional Docbook.
+  . new commands @ordf{} and @ordm{} for Spanish feminine/masculine ordinals.
+  . new commands @deftypecv[x] for class variables in typed OO languages.
+  . new command @registeredsymbol for the r-in-a-circle symbol.
+  . new command @headitem to make a heading row in @multitable.
+  . new command @LaTeX{} for the LaTeX logo.
+  . new command @comma{} to avoid comma-parsing problems.
+  . @url is now a synonym for @uref; new command @indicateurl has the
+    old meaning of just displaying a url as text.
+  . @quotation now accepts an optional argument for labelling the text
+      as a `Note', `Tip', etc.
+  . @defun (et al.) heading lines can now be continued with a lone @.
+  . @acronym accepts an optional argument for the meaning of the acronym.
+* makeinfo:
+  . New environment variable TEXINFO_OUTPUT_FORMAT determines the output
+    format at runtime, if no options are specified.
+  . New option --plaintext, equivalent to --no-headers with Info output.
+  . All outputs:
+    - sections are numbered by default.
+  . Info output:
+    - punctuation is inserted after @pxref and @ref, if needed to make
+      cross-references valid.
+    - line numbers included in index menus, so Info readers can go to
+      the exact line of an entry, not just a node.  Also in plaintext output.
+    - ^@^H[index^@^H] cookie included in index menus, so Info readers
+      can handle the ] etc. commands better.
+  . HTML output:
+    - new algorithm for cross-references to other manuals, for maximum
+      portability and stability.
+    - include node name in <title> with split output.
+    - @multicolumn fractions become percentages.
+    - entities used for bullets, quotes, dashes, and others.
+    - index entries are links to the exact locations.
+    - <h4> and <h5> used for @sub and @subsubsections again.
+    - accented dotless i supported.
+  . XML output: many new tags and structure to preserve more source features.
+  . Docbook output:
+    - upgraded DTD to Docbook XML 4.2, no longer using Docbook SGML.
+    - improved translation in general, for instance:
+    - line annotations and marked quotations.
+* texi2dvi:
+  . if available, use etex (pdfetex if --pdf) by default.
+  . if the input file includes thumbpdf.sty (for LaTeX), then run thumbpdf.
+  . more output if --debug.
+* texinfo.tex:
+  . @defun names are now printed in typewriter (instead of bold), and
+    within the arguments, @var text is printed in slanted typewriter.
+  . @tex code is executed inside a TeX group, so that any changes must
+    be prefixed with \global (or the equivalent) to be effective.  (This
+    change was actually made years ago, but never made it into the NEWS.)
+* info:
+  . new option --where (aka --location, -w) to report where an Info file
+    would be found, instead of reading it.
+  . by default, output ANSI terminal escape sequences as-is; new option
+    --no-raw-escapes overrides this.
+  . use the newly-generated index line numbers.
+* Distribution:
+  . new script gendocs.sh (not installed), for use by GNU maintainers in
+    getting their manuals on the GNU web site.  Documented in
+    maintain.texi (http://www.gnu.org/prep/maintain/).
+  . Most code uses ANSI C prototypes, to some extent.
+  . New translation: nb.
+  . automake 1.8.3, autoconf 2.59, gettext 0.14.1.
+
+
+4.6 (10 June 2003)
+* Language:
+  . new command @/ specifies an allowable breakpoint within a line.
+  . new command @dofirstparagraphindent to control whether the first
+    paragraph following a section heading is indented.  Default is to
+    omit this indentation, unlike the output up to now.
+  . new command @indent for explicitly indenting a paragraph.
+  . makeinfo writes a new construct for @image in Info output, so that
+    graphical Info browsers (such as Emacs Info under X) can display an
+    actual image.  (Standalone Info ignores this, since it runs in a tty.)
+* makeinfo:
+  . Common:
+    - search for image files in the include file search path.
+    - warns if @value is used on an undefined variable.
+  . Info output:
+    - default --split-size now 300,000 bytes, up from 50,000.
+    - with --enable-encoding and a given @documentencoding,
+      output a Local Variables section specifying that encoding, for use
+      with Emacs.
+  . HTML output:
+    - uses <h3> at the smallest.
+    - a few css <style> definitions are included to better
+      implement @format, @display, @small..., etc.
+    - new option --css-include=FILE includes FILE in the <style>.
+    - @cartouche now outputs a <table> with a border.
+* texinfo.tex:
+  . new Polish translation txi-pl.tex.
+* texi2dvi:
+  . --command=CMD replaces --texinfo=CMD; it inserts CMD at the first
+    line of LaTeX files now, or after the @setfilename for Texinfo files.
+* info:
+  . RET now goes to the nearest xref (rather like Emacs Info),
+    instead of the next xref starting on the current line.
+* Distribution:
+  . new Romanian (ro) translation.
+  . variables now declared const where appropriate.
+  . gettext 0.12.1, automake 1.7.5.
+
+
+4.5 (4 February 2003)
+* info:
+  . a bug in 4.4 prevented compressed info files from being found.
+* Distribution:
+  . detect sys/ptem.h on Solaris.
+
+
+4.4 (31 January 2003)
+* Language:
+  . The ' (ASCII apostrophe/right quote) character is finally allowed in
+    node and anchor names.  Thus, after installing this texinfo.tex,
+    existing .aux files will cause errors!  Remove them and rerun TeX to
+    generate good ones.
+  . @value constructs are now expanded in the filename arguments to
+    @include and @verbatiminclude.
+* makeinfo:
+  . @macro names may no longer include ^ or _, for the sake of math mode.
+  . bug fix: @copying text is now reflected in tag table positions;
+    before, nodes may not have been found with a long-enough @copying.
+  . bug fix: html @verb arg is quoted properly, and does not imply
+    a paragraph break.
+* texinfo.tex:
+  . @smallexample and the like now output in a smaller font (9pt) in all
+    paper formats, not just @smallbook and @afourpaper.
+  . new translation txi-tr.tex.
+  . bug fix: <>| and other characters do not disappear when they are
+    first on a line in @verbatim.
+* install-info:
+  . bug fix: don't translate the `* Menu' info keyword.
+* info:
+  . CTRL-H is treated like DEL in incremental search.
+  . arrow keys once again work in isearch contexts under Solaris.
+* infokey:
+  . use .info key bindings before defaults.
+  . allow prefix keys to be disabled.
+* Distribution:
+  . update to GNU FDL 1.2 (http://www.gnu.org/licenses/fdl.html).
+  . getopt and other common library files updated from gnulib
+    (http://savannah.gnu.org/projects/gnulib/).
+  . autoconf 2.57, automake 1.7.2.
+
+
+4.3 (14 November 2002)
+* Language:
+  . new command @tie{} to do a real tie (unbreakable interword space).
+* makeinfo:
+  . html output for @defun and friends now has font changes.
+  . html output has some class attributes.
+  . xml and docbook output improved in many details.
+* texinfo.tex:
+  . new Italian translations, txi-it.tex.
+  . pdf bookmarks for unnumbered sections work.
+  . type name for @defun and friends no longer extends into margin.
+* info:
+  . automatic-footnotes now off by default, for emacs compatibility.
+  . crash when MALLOC_CHECK_=2 fixed.
+* install-info:
+  . new option --infodir synonym for --info-dir, for compatibility with
+    the Debian install-info.
+  . support for bzip2-compressed files.
+* texindex:
+  . omit initial if the entire index is under one character.
+* Distribution:
+ . development sources now available under CVS, see
+   http://savannah.gnu.org/projects/texinfo/
+ . Turkish message translation.
+ . gettext 0.11.5, autoconf 2.54, automake 1.7.1.
 
 
 4.2 (1 April 2002)
@@ -43,7 +249,6 @@ convenience, here's a url to one of the relevant sections:
     at make time, to appease Automake's make distcheck.
   . gettext 0.11.1, autoconf 2.53, automake 1.6 (with install-info kludge).
 
-
 
 4.1 (4 March 2002)
 * Language:
@@ -55,11 +260,13 @@ convenience, here's a url to one of the relevant sections:
   . supports xml and docbook output.
   . supports HTML splitting by node, which is now the default.
   . new option --split-size to control maximum size of split info files.
+  . new option --enable-encoding to enable
 * info:
   . user-specified key bindings supported.
   . ANSI escape sequences (as produced by groff) removed from man output
     by default; use --raw-escapes to let them through if your terminal
     supports them.
+  . RET terminates incremental search normally.
 * texinfo.tex:
   . @math implies @tex, so all the usual plain TeX math is supported.
   . smaller fonts for @smallexample, in all page sizes.
@@ -100,7 +307,8 @@ convenience, here's a url to one of the relevant sections:
     (rather than in addition to) the url for info and dvi output.
   . @footnote works in an @item for a @table.
 * texinfo.tex:
-  . latest version always at ftp://ftp.gnu.org/gnu/texinfo.tex (and mirrors).
+  . latest version always at ftp://ftp.gnu.org/gnu/texinfo/texinfo.tex
+    (and mirrors).
   . implements @macro.
   . implements @paragraphindent (except asis).
   . @emph and @i use true italic type (cmti) instead of slanted (cmsl).
diff --git a/gnu/usr.bin/texinfo/README b/gnu/usr.bin/texinfo/README
index 84854944a9d..55cc52998c0 100644
--- a/gnu/usr.bin/texinfo/README
+++ b/gnu/usr.bin/texinfo/README
@@ -1,33 +1,40 @@
-Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000, 01, 02
-Free Software Foundation, Inc.
+$Id: README,v 1.1.1.7 2006/07/17 16:03:10 espie Exp $
+This is the README file for the GNU Texinfo distribution.  Texinfo is
+the preferred documentation format for GNU software.
 
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts.  
+  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+  2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
+  Copying and distribution of this file, with or without modification,
+  are permitted in any medium without royalty provided the copyright
+  notice and this notice are preserved.
 
-This is the README file for the GNU Texinfo distribution.
-The primary distribution point is ftp://ftp.gnu.org/gnu/texinfo/
-and the primary home page is http://www.gnu.org/software/texinfo/,
-secondary home page at http://texinfo.org/.
+See ./INSTALL* for installation instructions.
 
-Mailing lists:
+Primary distribution point: ftp://ftp.gnu.org/gnu/texinfo/
+  (list of mirrors at: http://www.gnu.org/prep/ftp.html)
+
+Home page: http://www.gnu.org/software/texinfo/
+  (list of mirrors at: http://www.gnu.org/server/list-mirrors.html)
+  This page includes links to other Texinfo-related programs.
+
+Mailing lists and archives:
 - bug-texinfo@gnu.org for bug reports or enhancement suggestions,
-  archived at ftp://ftp-mailing-list-archives.gnu.org/bug-texinfo/.
-- help-texinfo@gnu.org for authoring questions and general discussion.
-  archived at ftp://ftp-mailing-list-archives.gnu.org/help-texinfo/.
+  archive: http://mail.gnu.org/pipermail/bug-texinfo
+- help-texinfo@gnu.org for authoring questions and general discussion, 
+  archive: http://mail.gnu.org/pipermail/help-texinfo
 - texinfo-pretest@texinfo.org for pretests of new releases,
-  archived at ftp://ftp.texinfo.org/texinfo/texinfo-pretest-archive/.
-There are as yet no corresponding newsgroups.
+  archive: http://texinfo.org/ftp/texinfo-pretest-archive
+There are no corresponding newsgroups.
 
-For bug reports, please include enough information for the maintainers
-to reproduce the problem.  Generally speaking, that means:
+Bug reports:
+ please include enough information for the maintainers to reproduce the
+ problem.  Generally speaking, that means:
 - the contents of any input files necessary to reproduce the bug (crucial!).
 - a description of the problem and any samples of the erroneous output.
 - the version number of Texinfo and the program(s) involved (use --version).
 - hardware, operating system, and compiler versions (uname -a).
-- any unusual options you gave to configure (see config.status).
+- unusual options you gave to configure, if any (see config.status).
 - anything else that you think would be helpful.
 
 Patches are most welcome; if possible, please make them with diff -c and
@@ -35,55 +42,26 @@ include ChangeLog entries.
 
 When sending email, please do not encode or split the messages in any
 way if at all possible; it's easier to deal with one large message than
-many small ones.  GNU shar is a convenient way of packaging multiple
-and/or binary files for email.
-
-
-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 as a possible starting point.
-  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, you might like to use
-  @afourpaper by default.  See the `Preparing for TeX' node in
-  texinfo.txi for more details.  You don't have to create the file if
-  you have nothing to put in it.
-
-* If your info files are not in $prefix/info, you may wish to add a line
-#define DEFAULT_INFOPATH "/mydir1:/mydir2:..."
-  to config.h after running configure.
-
-* For instructions on compiling this distribution with DJGPP tools
-  for MS-DOS and MS-Windows, see the file djgpp/README.
-
-
-If you would like to contribute to the GNU project by implementing
-additional documentation output formats for Texinfo, that would be
-great.  But please do not write a separate translator texi2foo for your
-favorite format foo!  That is the hard way to do the job, and makes
-extra work in subsequent maintenance, since the Texinfo language is
-continually being enhanced and updated.  Instead, the best approach is
-modify Makeinfo to generate the new format, as it does now for Info,
-HTML, XML, and DocBook.
-
-If you want to convert from DocBook to Texinfo, please see 
-http://docbook2X.sourceforge.net/.
+many small ones.  GNU shar (http://www.gnu.org/software/sharutils/) is a
+convenient way of packaging multiple and/or binary files for email.
 
+See README.dev for information on the Texinfo development environment --
+any interested parties are welcome.  If you're a programmer and wish to
+contribute, this should get you started.  And if you're not a
+programmer, you can still make significant contributions by writing test
+cases, checking the documentation against the implementation, etc.
 
 This distribution includes the following files, among others:
     README                      This file.
+    README.dev                  Texinfo developer information.
 
+    INSTALL                     Texinfo-specific installation notes.
     NEWS                        Summary of new features by release.
-
     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 documentation files (in ./doc):
     texinfo.txi                 Describes the Texinfo language and many
                                 of the associated tools.  It tells how
                                 to use Texinfo to write documentation,
@@ -92,7 +70,7 @@ Texinfo source files (in ./doc):
                                 Texinfo formatting commands.
 
     info.texi                   This manual tells you how to use 
-                                Info.  This document comes as part of
+                                Info.  This document also comes as part of
                                 GNU Emacs.  If you do not have Emacs,
                                 you can format this Texinfo source
                                 file with makeinfo or TeX and then
@@ -120,42 +98,15 @@ Printing related files:
                                 producing an indexed DVI file using
                                 TeX and texindex. 
 
-
-Source files for standalone C programs (./lib, ./makeinfo, ./info):
-
-    makeinfo/makeinfo.c         This file contains the source for
-                                the `makeinfo' program that you can
-                                use to create an Info file from a
-                                Texinfo file.
-
-    info/info.c                 This file contains the source for
-                                the `info' program that you can use to
-                                view Info files on an ASCII terminal.
+Source files for standalone C programs: 
+  ./lib
+  ./makeinfo
+  ./info
 
 Installation files:
-    configure                   This file creates creates a Makefile 
-                                which in turn creates an `info' or
-                                `makeinfo' executable, or a C sources
-                                distribution.
-
-    configure.in                This is a template for creating 
-                                `configure' using Autoconf.
-
-    Makefile.in                 This is a template for `configure' 
-                                to use to make a Makefile.  Created by
-                                Automake.
-                               
-    Makefile.am                 This is a template for Automake
-                                to use to make a Makefile.in.
-                               
-
-Other files:
-    fixfonts                    This is a shell script to install the 
-                                `lcircle10' TeX fonts as an alias for
-                                the `circle10' fonts.  In some older
-                                TeX distributions the names are
-                                different.
-
-    tex3patch                   This handles a bug for version
-                                3.0 of TeX that does not occur in
-                                more recent versions.
+    Makefile.am                 What Automake uses to make a Makefile.in.
+    Makefile.in                 What `configure' uses to make a Makefile,
+                                created by Automake.
+    configure.ac		What Autoconf uses to create `configure'.
+    configure                   Configuration script for local conditions,
+                                created by Autoconf.
diff --git a/gnu/usr.bin/texinfo/README.dev b/gnu/usr.bin/texinfo/README.dev
new file mode 100644
index 00000000000..bf36eb2d903
--- /dev/null
+++ b/gnu/usr.bin/texinfo/README.dev
@@ -0,0 +1,44 @@
+$Id: README.dev,v 1.1.1.1 2006/07/17 16:03:18 espie Exp $
+README.dev - Texinfo developer information.
+
+  Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+
+  Copying and distribution of this file, with or without modification,
+  are permitted in any medium without royalty provided the copyright
+  notice and this notice are preserved.
+
+The development sources for Texinfo is available through anonymous cvs
+at Savannah, see
+  http://savannah.gnu.org/cvs/?group=texinfo
+
+This distribution uses whatever versions of automake, autoconf, and
+gettext are listed in NEWS; usually the latest ones released.  If you
+are getting the Texinfo sources from cvs, or change the Texinfo
+configure.ac, you'll need to have these tools installed to (re)build.
+You'll also need help2man.  (All of these are available from
+ftp://ftp.gnu.org/gnu.)
+
+Here's the order in which to run the tools for a fresh build:
+
+  autoheader    # creates config.in, not necessarily needed every time
+  aclocal -I m4 # for a new version of automake
+  automake
+  autoconf
+  configure CFLAGS=-g --enable-maintainer-mode
+  make
+
+(with arguments to taste, of course.)  Or you can run
+
+  ./bootstrap
+
+instead of the various auto* tools.
+
+
+One final note: If you would like to contribute to the GNU project by
+implementing additional documentation output formats for Texinfo, that
+would be great.  But please do not write a separate translator texi2foo
+for your favorite format foo!  That is the hard way to do the job, and
+makes extra work in subsequent maintenance, since the Texinfo language
+is continually being enhanced and updated.  Instead, the best approach
+is modify Makeinfo to generate the new format, as it does now for Info,
+HTML, XML, and DocBook.
diff --git a/gnu/usr.bin/texinfo/TODO b/gnu/usr.bin/texinfo/TODO
index 295a11cf790..55734b09db7 100644
--- a/gnu/usr.bin/texinfo/TODO
+++ b/gnu/usr.bin/texinfo/TODO
@@ -1,76 +1,119 @@
-Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000, 01, 02
-Free Software Foundation.
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.1 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts.  
-
-
+$Id: TODO,v 1.1.1.7 2006/07/17 16:03:14 espie Exp $
+This is the todo list for GNU Texinfo.
 If you are interested in working on any of these, email bug-texinfo@gnu.org.
 
-* Makeinfo:
-  - Try directory of main source file.
-  - Support @`{@dotless{i}} et al. in HTML.
-  - 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.
-    makeinfo --no-headers comes close.
-  - If node name contains an @ command, complain explicitly.
-  - Call Ghostscript to get ASCII/jpg output for the @image command.
-  - Better HTML output: allow settable background color, table colors
-    and spacing, <head> meta tags, back link from footnote marker, etc.
-  - Rewrite completely to simplify generation of different formats.
+  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2003, 
+  2001, 2002, 2003, 2004 Free Software Foundation.
 
-* 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.
-  - Handle @hsep and @vsep in @multitables.
-  - Introduce new command to change \bindingoffset.
-  - Reasonable way to change fonts from the default (some work has been
-    done), to allow for PostScript fonts, for example.
-  - How about using latex2html to produce HTML?
-  - Support 8-bit input characters, perhaps via the ec fonts.
-  - Repeat table headings if a @multitable is multiple pages long.
-  - Table of contents gets misaligned if there are 10 or more [sub]sections.
+  Copying and distribution of this file, with or without modification,
+  are permitted in any medium without royalty provided the copyright
+  notice and this notice are preserved.
 
 * General:
-  - Rationalize and improve the dir categories in existing manuals.
-  - @xindexterm [def] primary [,secondary [,tertiary]]  or some such?
+  - @euro{}.
+  - Support installation of manuals in different languages, along these lines:
+    . support a LINGUAS file or variable saying which subdirs LL in the
+      source to descend into (under doc/).
+    . within each subdir LL, install the info files into $infodir/LL,
+      and run install-info on $infodir/LL/dir.
+    . info (both emacs and standalone) should read $infodir/$LANG/dir
+      as the first dir file, and likewise read info files first from
+      $infodir/$LANG, before falling back to $infodir.
+    . consider ways to avoid installing images in both places.
+      In fact, images probably need to be installed in a subdir
+      $infodir/MANUAL/ in the first place, to avoid conflicts of having
+      the same image name in different manuals.
+    For a test case, see texinfo cvs, with its one translated manual
+    (info-fr.texi).
+    From Wojciech Polak.
+  - Monitor and improve the dir categories in existing manuals,
+    following the Free Software Directory categories.  Much mail to
+    developers has already been sent, what's needed now is to check new
+    releases and make sure they are using the right categories.
+    See the util/dir-example in the Texinfo distribution for our current
+    recommended categories.
+    For background, see the thread (which discusses a lot of other
+    issues too) at
+    http://mail.gnu.org/pipermail/emacs-devel/2002-10/msg00011.html,
+    especially 
+      http://mail.gnu.org/archive/html/emacs-devel/2002-10/msg00090.html
+      http://mail.gnu.org/archive/html/emacs-devel/2002-10/msg00137.html
+  - Get Info declared as a MIME Content-Type.
+  - Likewise the `info:' URI scheme; a library consortium has proposed a
+    completely different purpose for the URI scheme, but I don't know
+    how to send comments, despite it being a "request for comments".  Sigh.
+    There is mail about this in the bug-texinfo archives:
+      http://mail.gnu.org/archive/html/bug-texinfo/2003-09/msg00086.html
   - Support compressed image files.
-  - Handle reference card creation, perhaps by only paying attention to
+  - Support reference card creation, perhaps by only paying attention to
     sectioning and @def... commands.
   - Allow @end (and other?) commands to be indented in the source.
-  - Get Info declared as a MIME Content-Type.
+  - Test for memory leaks, e.g., with valgrind:
+    http://developer.kde.org/~sewardj/
+  - Extend and improve the tests.
 
 * Language:
-  - @figure:
-@figure [xref-label]
-@figureinclude <filename>, [<height>], [<width>]
-@figurehsize <dimen>
-@figurevsize <dimen>
-@caption ... @end caption
-<arbitrary Texinfo commands>
-@end figure
+  - @else for the @if... conditionals.
+  - @xindexterm [def] primary [,secondary [,tertiary]]  or some such?
+  - Allow subitems and `see' and `see also' in indices.
   - multicolumn * width to take up `the rest'.
   - another table command to take N succeeding items and split them
     into M columns (see eplain).
   - support bibliographies with BibTeX (see web2c/doc for kludge prototype).
   - @flushboth to combine @flushleft and @flushright, for RFC's.
   - @part sectioning command.
-  - Allow subitems and `see' and `see also' in indices.
   - @exercise/@answer command for, e.g., gawk.
   - Allow @hsep/@vsep at @item, instead of just in template.
   - Support automatic line numbering of examples.
   - Better macro syntax.
+  - Better def... command syntax.
   - Allow : in node names for info files, for names like
     `class::method'.  Likewise index entries.  A quoting mechanism such
     as surrounding node names with SPACE BACKSPACE is probably the best
     solution, although this is an incompatible change to Info format, sigh.
-  - Change bars.  This is difficult or impossible in TeX,
-    unfortunately.  To do it right requires device driver support.
-    wdiff or ediff may be all we can do.
+  - Glossary/general definition support (dumas msg 28 Nov 2003 17:09:57 +0100).
+  - Add support for other Latin 9 (and Latin 2 and Latin 1) characters.
+
+* Makeinfo:
+  - Translation of "Appendix" etc. should depend on @doclang not $LANG.
+  - Try directory of main source file.
+  - Make makeinfo -E just do macro expansion, avoiding all error checks.
+    That way, texi2dvi could run makeinfo --iftex -E.
+  - 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.
+    makeinfo --no-headers comes close.
+  - If node name contains an @ command, complain explicitly.
+  - Use @documentlanguage instead of LANG for many translations.
+  - HTML: split output by chapter to improve context, per Akim.
+    Generate dummy files for all nodes for the sake of cross-references.
+  - HTML: support thumbnails.
+  - HTML: make images of math, maybe.
+  - HTML: allow settable background color, table colors and spacing,
+    <head> meta tags, etc.  A la http://texi2html.cvshome.org.  In fact:
+  - HTML: have a library of different CSS styles.
+    http://mail.gnu.org/archive/html/bug-texinfo/2004-01/msg00025.html
+  - XML: cannot be loaded directly in a browser; why not?
+  - Docbook: &euro; and other entities do not work; does anything work?
+  - Rewrite completely to simplify generation of different formats.
+
+* TeX:
+  - Use @ as the escape character, and Texinfo syntax generally, in the
+    table of contents and index files.  Eliminate all the crazy
+    multiple redefinitions of every Texinfo command in different contexts.
+  - Support input in any encoding and language, via ec or Latin Modern fonts.
+  - Reasonable way to change fonts from the default (some work has been
+    done), to allow for PostScript fonts, for example.
+  - @multitable: handle @hsep and @vsep.
+  - @multitable: repeat table headings if multiple pages long.
+  - @multitable: support a heading line concept (<thead> in HTML).
+  - Introduce new command to change \bindingoffset.
+  - How about using latex2html to produce HTML?
+  - Table of contents gets misaligned if there are 10 or more [sub]sections.
+  - Use url.sty (or something) to allow linebreak of url's.
+  - Include hyperlink \special's in the DVI output for xdvi, etc.
+  - PDF: make each letter of the index (A, B, ...) a section in the TOC.
+    From Carsten Dominik <dominik@astro.uva.nl>.
 
 * Doc:
   - Include a complete functional summary, as in a reference card, in
@@ -88,24 +131,37 @@ If you are interested in working on any of these, email bug-texinfo@gnu.org.
   - Search all nodes of dir file at startup, then can have
     INFO-DIR-SEPARATE-GROUPS and other such.
   - Better dir file merging.
+  - Global dir file (as in /etc/conf/dir) and texinfo config file
+    specifying which info directories to search.  From Dale Mellor.
+    http://mail.gnu.org/mailman/private/gnu-prog-discuss/2003q4/000439.html
   - Steal interface ideas from Lynx: number links, use color, etc.
     Perhaps code from the pinfo viewer can be reused:
     http://zeus.polsl.gliwice.pl/~pborys/.
   - More sample .infokey files, so people can choose without writing their own.
   - q within help should quit help like C-x 0.
-  - Incorporate an X-based viewer, perhaps tkinfo
+  - Incorporate an X-based viewer, perhaps saxinfo or tkinfo
       http://www.math.ucsb.edu/~boldt/tkinfo/
-    or saxinfo.
-
-* PDF:
-  - make each letter of the index (A, B, ...) a section in the TOC.
-    From Carsten Dominik <dominik@astro.uva.nl>.
+  - Make "info foo bar" search for bar in foo's index(es) if no menu match.
+  - Handle M-n, C-u m, and C-u g like Emacs Info (opening new windows).
+  - Write technical definition of Info format.
 
-  
 * install-info:
-  - be able to copy the info file to compile-time $(infodir), to
+  - be able to copy the info file to compile-time $infodir, to
     simplify by-hand installation.
+  - also support installing HTML files, etc., along with subsidiary
+    @image (or other) files.  In subdirs.  Or something.
+  - support info dir entries for other than the current info file name;
+    see comments in menu_item_equal.
+  - merge features with Debian install-info, so we can have one program.
+
+* texindex:
+  - read source file (specified by new option) for @documentlanguage
+    and/or @documentencoding, and change the sorting appropriately.
+  From: Wojciech Polak, 26 Apr 2003 11:30:59 +0200.
 
+* Distribution:
+  - generate txi-??.tex from .po's to make translators' jobs easier.
+    From Akim and Karl E.
 
 Ideas that will not be implemented:
 - Process Texinfo files directly instead of converting to Info:
@@ -115,5 +171,11 @@ Ideas that will not be implemented:
   [This has the disadvantage of needing to be updated when the
   Texinfo language changes, so don't.]
 
-- Split HTML output by chapter.
-  [Then cross-references in HTML cannot be generated consistently.]
+- Call Ghostscript to get ASCII/jpg output for the @image command.
+  [makeinfo should not try to be make, or assume it knows how the user
+   wants to generate images.  Too many different methods are possible.]
+
+- Change bars.  This is difficult or impossible in TeX,
+  unfortunately.  To do it right requires device driver support.
+  wdiff or ediff may be all we can do.  Merely specifying what should be
+  changed is not obvious.
diff --git a/gnu/usr.bin/texinfo/aclocal.m4 b/gnu/usr.bin/texinfo/aclocal.m4
index 39a76cdd998..aae5484d262 100644
--- a/gnu/usr.bin/texinfo/aclocal.m4
+++ b/gnu/usr.bin/texinfo/aclocal.m4
@@ -1,6 +1,6 @@
-# aclocal.m4 generated automatically by aclocal 1.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.4 -*- Autoconf -*-
 
-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 # Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -11,276 +11,9 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# $Id: aclocal.m4,v 1.1.1.4 2002/06/10 13:20:08 espie Exp $
-# Source file used by aclocal in generating aclocal.m4.
-
-#serial 3
-
-AC_DEFUN(jm_CHECK_DECLARATION,
-[
-  AC_REQUIRE([AC_HEADER_STDC])dnl
-  test -z "$ac_cv_header_memory_h" && AC_CHECK_HEADERS(memory.h)
-  test -z "$ac_cv_header_string_h" && AC_CHECK_HEADERS(string.h)
-  test -z "$ac_cv_header_strings_h" && AC_CHECK_HEADERS(strings.h)
-  test -z "$ac_cv_header_stdlib_h" && AC_CHECK_HEADERS(stdlib.h)
-  test -z "$ac_cv_header_unistd_h" && AC_CHECK_HEADERS(unistd.h)
-  AC_MSG_CHECKING([whether $1 is declared])
-  AC_CACHE_VAL(jm_cv_func_decl_$1,
-    [AC_TRY_COMPILE($2,
-      [
-#ifndef $1
-char *(*pfn) = (char *(*)) $1
-#endif
-      ],
-      eval "jm_cv_func_decl_$1=yes",
-      eval "jm_cv_func_decl_$1=no")])
-
-  if eval "test \"`echo '$jm_cv_func_decl_'$1`\" = yes"; then
-    AC_MSG_RESULT(yes)
-    ifelse([$3], , :, [$3])
-  else
-    AC_MSG_RESULT(no)
-    ifelse([$4], , , [$4
-])dnl
-  fi
-])dnl
-
-dnl jm_CHECK_DECLARATIONS(INCLUDES, FUNCTION... [, ACTION-IF-DECLARED
-dnl                       [, ACTION-IF-NOT-DECLARED]])
-AC_DEFUN(jm_CHECK_DECLARATIONS,
-[
-  for jm_func in $2
-  do
-    jm_CHECK_DECLARATION($jm_func, $1,
-    [
-      jm_tr_func=HAVE_DECL_`echo $jm_func | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`
-      AC_DEFINE_UNQUOTED($jm_tr_func) $3], $4)dnl
-  done
-])
-
-#serial 1
-# this is check-decl.m4 in sh-utils 1.16k/m4/check-decl.m4
-# with a different function list.
-
-dnl This is just a wrapper function to encapsulate this kludge.
-dnl Putting it in a separate file like this helps share it between
-dnl different packages.
-AC_DEFUN(txi_CHECK_DECLS,
-[
-  headers='
-#include <stdio.h>
-#ifdef HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#else
-# ifdef HAVE_STRINGS_H
-#  include <strings.h>
-# endif
-#endif
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-'
-
-  if test x = y; then
-    dnl This code is deliberately never run via ./configure.
-    dnl FIXME: this is a gross hack to make autoheader put entries
-    dnl for each of these symbols in the config.h.in.
-    dnl Otherwise, I'd have to update acconfig.h every time I change
-    dnl this list of functions.
-    AC_DEFINE(HAVE_DECL_STRERROR, 1, [Define if this function is declared.])
-    AC_DEFINE(HAVE_DECL_STRCASECMP, 1, [Define if this function is declared.])
-    AC_DEFINE(HAVE_DECL_STRNCASECMP, 1, [Define if this function is declared.])
-    AC_DEFINE(HAVE_DECL_STRCOLL, 1, [Define if this function is declared.])
-  fi
-
-  jm_CHECK_DECLARATIONS($headers, strerror strcasecmp strncasecmp strcoll)
-])
-
-# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
-
-# Copyright 1996, 1997, 2000, 2001 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.
-
-AC_PREREQ([2.52])
-
-# serial 6
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  We must strip everything past the first ":",
-# and everything past the last "/".
-
-# _AM_DIRNAME(PATH)
-# -----------------
-# Like AS_DIRNAME, only do it during macro expansion
-AC_DEFUN([_AM_DIRNAME],
-       [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
-	      m4_if(regexp([$1], [^//\([^/]\|$\)]), -1,
-		    m4_if(regexp([$1], [^/.*]), -1,
-			  [.],
-			  patsubst([$1], [^\(/\).*], [\1])),
-		    patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
-	      patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
-])# _AM_DIRNAME
-
-
-# The stamp files are numbered to have different names.
-# We could number them on a directory basis, but that's additional
-# complications, let's have a unique counter.
-m4_define([_AM_STAMP_Count], [0])
-
-
-# _AM_STAMP(HEADER)
-# -----------------
-# The name of the stamp file for HEADER.
-AC_DEFUN([_AM_STAMP],
-[m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl
-AS_ESCAPE(_AM_DIRNAME(patsubst([$1],
-                               [:.*])))/stamp-h[]_AM_STAMP_Count])
-
-
-# _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS)
-# ------------------------------------------------------------
-# We used to try to get a real timestamp in stamp-h.  But the fear is that
-# that will cause unnecessary cvs conflicts.
-AC_DEFUN([_AM_CONFIG_HEADER],
-[# Add the stamp file to the list of files AC keeps track of,
-# along with our hook.
-AC_CONFIG_HEADERS([$1],
-                  [# update the timestamp
-echo 'timestamp for $1' >"_AM_STAMP([$1])"
-$2],
-                  [$3])
-])# _AM_CONFIG_HEADER
-
-
-# AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS)
-# --------------------------------------------------------------
-AC_DEFUN([AM_CONFIG_HEADER],
-[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])])
-])# AM_CONFIG_HEADER
-
-# Do all the work for Automake.                            -*- Autoconf -*-
-
-# This macro actually does too much some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# 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.
-
-# serial 8
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-AC_PREREQ([2.52])
-
-# Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
-# the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
- AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
- AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, "aclocal-${am__api_version}")
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, "automake-${am__api_version}")
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_MISSING_PROG(AMTAR, tar)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_][CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_][CC],
-                          defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_][CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_][CXX],
-                          defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-])
-])
-
-# Copyright 2002  Free Software Foundation, Inc.
+#                                                        -*- Autoconf -*-
+# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
+# Generated from amversion.in; do not edit by hand.
 
 # 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
@@ -300,172 +33,18 @@ AC_PROVIDE_IFELSE([AC_PROG_][CXX],
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"])
+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.6])])
-
-# Helper functions for option handling.                    -*- Autoconf -*-
-
-# Copyright 2001, 2002  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.
-
-# serial 2
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-# Copyright 1996, 1997, 2000, 2001 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.
-
-# serial 3
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $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".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-#  -*- Autoconf -*-
-
-
-# Copyright 1997, 1999, 2000, 2001 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.
-
-# serial 3
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
+	 [AM_AUTOMAKE_VERSION([1.9.4])])
 
 # AM_AUX_DIR_EXPAND
 
-# Copyright 2001 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003 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
@@ -520,19 +99,16 @@ fi
 # absolute PATH.  The drawback is that using absolute paths prevent a
 # configured tree to be moved without reconfiguration.
 
-# Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])
-
-AC_DEFUN([AM_AUX_DIR_EXPAND], [
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
 # expand $ac_aux_dir to an absolute path
 am_aux_dir=`cd $ac_aux_dir && pwd`
 ])
 
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
+# AM_CONDITIONAL                                              -*- Autoconf -*-
 
-# Copyright 2001 Free Software Foundation, Inc.
+# Copyright (C) 1997, 2000, 2001, 2003, 2004 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
@@ -549,53 +125,34 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-# AM_PROG_INSTALL_STRIP
-
-# Copyright 2001 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.
+# serial 6
 
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])
+AC_SUBST([$1_FALSE])
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
 
-# serial 4						-*- Autoconf -*-
+# serial 7						-*- Autoconf -*-
 
-# Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
+# 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
@@ -639,7 +196,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl
 
 ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
        [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc']
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
                    [depcc="$$1"   am_compiler_list=])
 
@@ -656,18 +213,34 @@ AC_CACHE_CHECK([dependency style of $depcc],
   # using a relative directory.
   cp "$am_depcomp" conftest.dir
   cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
 
   am_cv_$1_dependencies_compiler_type=none
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
   fi
   for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
     # We need to recreate these files for each test, as the compiler may
     # overwrite some of them when testing with obscure command lines.
     # This happens at least with the AIX C compiler.
-    echo '#include "conftest.h"' > conftest.c
-    echo 'int i;' > conftest.h
-    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+      # Solaris 8's {/usr,}/bin/sh.
+      touch sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
     case $depmode in
     nosideeffect)
@@ -685,13 +258,25 @@ AC_CACHE_CHECK([dependency style of $depcc],
     # mode.  It turns out that the SunPro C++ compiler does not properly
     # handle `-M -o', and we need to detect this.
     if depmode=$depmode \
-       source=conftest.c object=conftest.o \
-       depfile=conftest.Po tmpdepfile=conftest.TPo \
-       $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
-       grep conftest.h conftest.Po > /dev/null 2>&1 &&
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      am_cv_$1_dependencies_compiler_type=$depmode
-      break
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_$1_dependencies_compiler_type=$depmode
+        break
+      fi
     fi
   done
 
@@ -702,6 +287,9 @@ else
 fi
 ])
 AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
 ])
 
 
@@ -710,16 +298,8 @@ AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
 # Choose a directory name for dependency files.
 # This macro is AC_REQUIREd in _AM_DEPENDENCIES
 AC_DEFUN([AM_SET_DEPDIR],
-[rm -f .deps 2>/dev/null
-mkdir .deps 2>/dev/null
-if test -d .deps; then
-  DEPDIR=.deps
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  DEPDIR=_deps
-fi
-rmdir .deps 2>/dev/null
-AC_SUBST([DEPDIR])
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
 ])
 
 
@@ -727,8 +307,8 @@ AC_SUBST([DEPDIR])
 # ------------
 AC_DEFUN([AM_DEP_TRACK],
 [AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking Speeds up one-time builds
-  --enable-dependency-tracking  Do not reject slow dependency extractors])
+[  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors])
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
@@ -739,7 +319,8 @@ AC_SUBST([AMDEPBACKSLASH])
 
 # Generate code to set up dependency tracking.   -*- Autoconf -*-
 
-# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
+#   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
@@ -764,32 +345,32 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 [for mf in $CONFIG_FILES; do
   # Strip MF so we end up with the name of the file.
   mf=`echo "$mf" | sed -e 's/:.*$//'`
-  if (sed 1q $mf | fgrep 'generated by automake') > /dev/null 2>&1; then
+  # Check whether this is an Automake generated Makefile or not.
+  # We used to match only the files named `Makefile.in', but
+  # some people rename them; so instead we look at the file content.
+  # Grep'ing the first line is not enough: some people post-process
+  # each Makefile.in and add a new line on top of each file to say so.
+  # So let's grep whole file.
+  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue
   fi
-  grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
-  # Extract the definition of DEP_FILES from the Makefile without
-  # running `make'.
-  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
+  # Extract the definition of DEPDIR, am__include, and am__quote
+  # from the Makefile without running `make'.
+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
   test -z "$DEPDIR" && continue
+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
+  test -z "am__include" && continue
+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
   # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n -e '/^U = / s///p' < "$mf"`
-  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-  # We invoke sed twice because it is the simplest approach to
-  # changing $(DEPDIR) to its actual value in the expansion.
-  for file in `sed -n -e '
-    /^DEP_FILES = .*\\\\$/ {
-      s/^DEP_FILES = //
-      :loop
-	s/\\\\$//
-	p
-	n
-	/\\\\$/ b loop
-      p
-    }
-    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+  U=`sed -n 's/^U = //p' < "$mf"`
+  # Find all dependency output files, they are included files with
+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
+  # simplest approach to changing $(DEPDIR) to its actual value in the
+  # expansion.
+  for file in `sed -n "
+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
     # Make sure the directory exists.
     test -f "$dirpart/$file" && continue
@@ -815,7 +396,233 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])
 
-# Copyright 2001 Free Software Foundation, Inc.             -*- Autoconf -*-
+# Do all the work for Automake.                            -*- Autoconf -*-
+
+# This macro actually does too much some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+# 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.
+
+# serial 11
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition.  After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_PREREQ([2.58])dnl
+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+# test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
+   test -f $srcdir/config.status; then
+  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+  if (cygpath --version) >/dev/null 2>/dev/null; then
+    CYGPATH_W='cygpath -w'
+  else
+    CYGPATH_W=echo
+  fi
+fi
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_PROG_INSTALL_SH
+AM_PROG_INSTALL_STRIP
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+	      		     [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+                  [_AM_DEPENDENCIES(CC)],
+                  [define([AC_PROG_CC],
+                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+                  [_AM_DEPENDENCIES(CXX)],
+                  [define([AC_PROG_CXX],
+                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+])
+])
+
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $1 | $1:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+
+# Copyright (C) 2001, 2003 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.
+
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
+AC_SUBST(install_sh)])
+
+#                                                          -*- Autoconf -*-
+# Copyright (C) 2003  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.
+
+# serial 1
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot.  For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=.
+else
+  am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
+# Add --enable-maintainer-mode option to configure.
+# From Jim Meyering
+
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004
+# 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.
+
+# serial 3
+
+AC_DEFUN([AM_MAINTAINER_MODE],
+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+  dnl maintainer-mode is disabled by default
+  AC_ARG_ENABLE(maintainer-mode,
+[  --enable-maintainer-mode  enable make rules and dependencies not useful
+			  (and sometimes confusing) to the casual installer],
+      USE_MAINTAINER_MODE=$enableval,
+      USE_MAINTAINER_MODE=no)
+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+  MAINT=$MAINTAINER_MODE_TRUE
+  AC_SUBST(MAINT)dnl
+]
+)
+
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
+# Check to see how 'make' treats includes.	-*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003 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
@@ -840,8 +647,9 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 AC_DEFUN([AM_MAKE_INCLUDE],
 [am_make=${MAKE-make}
 cat > confinc << 'END'
-doit:
+am__doit:
 	@echo done
+.PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
 AC_MSG_CHECKING([for style of include used by $am_make])
@@ -855,7 +663,7 @@ echo "include confinc" > confmf
 # In particular we don't look at `^make:' because GNU make might
 # be invoked under some other name (usually "gmake"), in which
 # case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
    am__include=include
    am__quote=
    _am_result=GNU
@@ -869,15 +677,16 @@ if test "$am__include" = "#"; then
       _am_result=BSD
    fi
 fi
-AC_SUBST(am__include)
-AC_SUBST(am__quote)
-AC_MSG_RESULT($_am_result)
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
 rm -f confinc confmf
 ])
 
-# AM_CONDITIONAL                                              -*- Autoconf -*-
+#  -*- Autoconf -*-
+
 
-# Copyright 1997, 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1999, 2000, 2001, 2003 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
@@ -894,1611 +703,388 @@ rm -f confinc confmf
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-# serial 5
+# serial 3
 
-AC_PREREQ(2.52)
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
 
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-        [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
 else
-  $1_TRUE='#'
-  $1_FALSE=
+  am_missing_run=
+  AC_MSG_WARN([`missing' script is too old or missing])
 fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([conditional \"$1\" was never defined.
-Usually this means the macro was only invoked conditionally.])
-fi])])
+])
 
-# isc-posix.m4 serial 1 (gettext-0.10.40)
-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-# This test replaces the one in autoconf.
-# Currently this macro should have the same name as the autoconf macro
-# because gettext's gettext.m4 (distributed in the automake package)
-# still uses it.  Otherwise, the use in gettext.m4 makes autoheader
-# give these diagnostics:
-#   configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
-#   configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
-
-undefine([AC_ISC_POSIX])
-
-AC_DEFUN([AC_ISC_POSIX],
-  [
-    dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
-    AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
-  ]
-)
+# AM_PROG_MKDIR_P
+# ---------------
+# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
 
-# gettext.m4 serial 13 (gettext-0.11.1)
-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2002.
-
-dnl Macro to add for using GNU gettext.
-
-dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
-dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
-dnl    default (if it is not specified or empty) is 'no-libtool'.
-dnl    INTLSYMBOL should be 'external' for packages with no intl directory,
-dnl    and 'no-libtool' or 'use-libtool' for packages with an intl directory.
-dnl    If INTLSYMBOL is 'use-libtool', then a libtool library
-dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
-dnl    depending on --{enable,disable}-{shared,static} and on the presence of
-dnl    AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
-dnl    $(top_builddir)/intl/libintl.a will be created.
-dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
-dnl    implementations (in libc or libintl) without the ngettext() function
-dnl    will be ignored.
-dnl INTLDIR is used to find the intl libraries.  If empty,
-dnl    the value `$(top_builddir)/intl/' is used.
-dnl
-dnl The result of the configuration is one of three cases:
-dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
-dnl    and used.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 2) GNU gettext has been found in the system's C library.
-dnl    Catalog format: GNU --> install in $(datadir)
-dnl    Catalog extension: .mo after installation, .gmo in source tree
-dnl 3) No internationalization, always use English msgid.
-dnl    Catalog format: none
-dnl    Catalog extension: none
-dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
-dnl The use of .gmo is historical (it was needed to avoid overwriting the
-dnl GNU format catalogs when building on a platform with an X/Open gettext),
-dnl but we keep it in order not to force irrelevant filename changes on the
-dnl maintainers.
-dnl
-AC_DEFUN([AM_GNU_GETTEXT],
-[
-  dnl Argument checking.
-  ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
-    [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
-])])])])])
-  ifelse([$2], [], , [ifelse([$2], [need-ngettext], ,
-    [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
-])])])
-  define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
-  define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
-
-  AC_REQUIRE([AM_PO_SUBDIRS])dnl
-  ifelse(gt_included_intl, yes, [
-    AC_REQUIRE([AM_INTL_SUBDIR])dnl
-  ])
-
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-
-  AC_MSG_CHECKING([whether NLS is requested])
-  dnl Default is enabled NLS
-  AC_ARG_ENABLE(nls,
-    [  --disable-nls           do not use Native Language Support],
-    USE_NLS=$enableval, USE_NLS=yes)
-  AC_MSG_RESULT($USE_NLS)
-  AC_SUBST(USE_NLS)
-
-  ifelse(gt_included_intl, yes, [
-    BUILD_INCLUDED_LIBINTL=no
-    USE_INCLUDED_LIBINTL=no
-  ])
-  LIBINTL=
-  LTLIBINTL=
-  POSUB=
-
-  dnl If we use NLS figure out what method
-  if test "$USE_NLS" = "yes"; then
-    gt_use_preinstalled_gnugettext=no
-    ifelse(gt_included_intl, yes, [
-      AC_MSG_CHECKING([whether included gettext is requested])
-      AC_ARG_WITH(included-gettext,
-        [  --with-included-gettext use the GNU gettext library included here],
-        nls_cv_force_use_gnu_gettext=$withval,
-        nls_cv_force_use_gnu_gettext=no)
-      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
-
-      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-    ])
-        dnl User does not insist on using GNU NLS library.  Figure out what
-        dnl to use.  If GNU gettext is available we use this.  Else we have
-        dnl to fall back to GNU NLS library.
-
-        dnl Add a version number to the cache macros.
-        define([gt_api_version], ifelse([$2], [need-ngettext], 2, 1))
-        define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
-        define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
-
-        AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
-         [AC_TRY_LINK([#include <libintl.h>
-extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;],
-            [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
-            gt_cv_func_gnugettext_libc=yes,
-            gt_cv_func_gnugettext_libc=no)])
-
-        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
-          dnl Sometimes libintl requires libiconv, so first search for libiconv.
-          ifelse(gt_included_intl, yes, , [
-            AM_ICONV_LINK
-          ])
-          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
-          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
-          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
-          dnl even if libiconv doesn't exist.
-          AC_LIB_LINKFLAGS_BODY([intl])
-          AC_CACHE_CHECK([for GNU gettext in libintl],
-            gt_cv_func_gnugettext_libintl,
-           [gt_save_CPPFLAGS="$CPPFLAGS"
-            CPPFLAGS="$CPPFLAGS $INCINTL"
-            gt_save_LIBS="$LIBS"
-            LIBS="$LIBS $LIBINTL"
-            dnl Now see whether libintl exists and does not depend on libiconv.
-            AC_TRY_LINK([#include <libintl.h>
-extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias ();],
-              [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)],
-              gt_cv_func_gnugettext_libintl=yes,
-              gt_cv_func_gnugettext_libintl=no)
-            dnl Now see whether libintl exists and depends on libiconv.
-            if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
-              LIBS="$LIBS $LIBICONV"
-              AC_TRY_LINK([#include <libintl.h>
-extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias ();],
-                [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)],
-               [LIBINTL="$LIBINTL $LIBICONV"
-                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                gt_cv_func_gnugettext_libintl=yes
-               ])
-            fi
-            CPPFLAGS="$gt_save_CPPFLAGS"
-            LIBS="$gt_save_LIBS"])
-        fi
-
-        dnl If an already present or preinstalled GNU gettext() is found,
-        dnl use it.  But if this macro is used in GNU gettext, and GNU
-        dnl gettext is already preinstalled in libintl, we update this
-        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
-        if test "$gt_cv_func_gnugettext_libc" = "yes" \
-           || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
-                && test "$PACKAGE" != gettext; }; then
-          gt_use_preinstalled_gnugettext=yes
-        else
-          dnl Reset the values set by searching for libintl.
-          LIBINTL=
-          LTLIBINTL=
-          INCINTL=
-        fi
-
-    ifelse(gt_included_intl, yes, [
-        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
-          dnl GNU gettext is not found in the C library.
-          dnl Fall back on included GNU gettext library.
-          nls_cv_use_gnu_gettext=yes
-        fi
-      fi
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 
-      if test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions used to generate GNU NLS library.
-        INTLOBJS="\$(GETTOBJS)"
-        BUILD_INCLUDED_LIBINTL=yes
-        USE_INCLUDED_LIBINTL=yes
-        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
-        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
-        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
-      fi
+# 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.
 
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions to use GNU gettext tools.
-        CATOBJEXT=.gmo
-      fi
-    ])
-
-    if test "$gt_use_preinstalled_gnugettext" = "yes" \
-       || test "$nls_cv_use_gnu_gettext" = "yes"; then
-      AC_DEFINE(ENABLE_NLS, 1,
-        [Define to 1 if translation of program messages to the user's native language
-   is requested.])
-    else
-      USE_NLS=no
-    fi
+# 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.
+
+# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
+# created by `make install' are always world readable, even if the
+# installer happens to have an overly restrictive umask (e.g. 077).
+# This was a mistake.  There are at least two reasons why we must not
+# use `-m 0755':
+#   - it causes special bits like SGID to be ignored,
+#   - it may be too restrictive (some setups expect 775 directories).
+#
+# Do not use -m 0755 and let people choose whatever they expect by
+# setting umask.
+#
+# We cannot accept any implementation of `mkdir' that recognizes `-p'.
+# Some implementations (such as Solaris 8's) are not thread-safe: if a
+# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
+# concurrently, both version can detect that a/ is missing, but only
+# one can create it and the other will error out.  Consequently we
+# restrict ourselves to GNU make (using the --version option ensures
+# this.)
+AC_DEFUN([AM_PROG_MKDIR_P],
+[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+  # We used to keeping the `.' as first argument, in order to
+  # allow $(mkdir_p) to be used without argument.  As in
+  #   $(mkdir_p) $(somedir)
+  # where $(somedir) is conditionally defined.  However this is wrong
+  # for two reasons:
+  #  1. if the package is installed by a user who cannot write `.'
+  #     make install will fail,
+  #  2. the above comment should most certainly read
+  #     $(mkdir_p) $(DESTDIR)$(somedir)
+  #     so it does not work when $(somedir) is undefined and
+  #     $(DESTDIR) is not.
+  #  To support the latter case, we have to write
+  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+  #  so the `.' trick is pointless.
+  mkdir_p='mkdir -p --'
+else
+  # On NextStep and OpenStep, the `mkdir' command does not
+  # recognize any option.  It will interpret all options as
+  # directories to create, and then abort because `.' already
+  # exists.
+  for d in ./-p ./--version;
+  do
+    test -d $d && rmdir $d
+  done
+  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+  if test -f "$ac_aux_dir/mkinstalldirs"; then
+    mkdir_p='$(mkinstalldirs)'
+  else
+    mkdir_p='$(install_sh) -d'
   fi
+fi
+AC_SUBST([mkdir_p])])
 
-  if test "$USE_NLS" = "yes"; then
+# Helper functions for option handling.                    -*- Autoconf -*-
 
-    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
-        AC_MSG_CHECKING([how to link with libintl])
-        AC_MSG_RESULT([$LIBINTL])
-        AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
-      fi
+# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
 
-      dnl For backward compatibility. Some packages may be using this.
-      AC_DEFINE(HAVE_GETTEXT, 1,
-       [Define if the GNU gettext() function is already present or preinstalled.])
-      AC_DEFINE(HAVE_DCGETTEXT, 1,
-       [Define if the GNU dcgettext() function is already present or preinstalled.])
-    fi
+# 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.
 
-    dnl We need to process the po/ directory.
-    POSUB=po
-  fi
+# 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.
 
-  ifelse(gt_included_intl, yes, [
-    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
-    dnl to 'yes' because some of the testsuite requires it.
-    if test "$PACKAGE" = gettext; then
-      BUILD_INCLUDED_LIBINTL=yes
-    fi
+# 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.
 
-    dnl Make all variables we use known to autoconf.
-    AC_SUBST(BUILD_INCLUDED_LIBINTL)
-    AC_SUBST(USE_INCLUDED_LIBINTL)
-    AC_SUBST(CATOBJEXT)
-    AC_SUBST(INTLOBJS)
-
-    dnl For backward compatibility. Some configure.ins may be using this.
-    nls_cv_header_intl=
-    nls_cv_header_libgt=
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    DATADIRNAME=share
-    AC_SUBST(DATADIRNAME)
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    INSTOBJEXT=.mo
-    AC_SUBST(INSTOBJEXT)
-
-    dnl For backward compatibility. Some Makefiles may be using this.
-    GENCAT=gencat
-    AC_SUBST(GENCAT)
-
-    dnl Enable libtool support if the surrounding package wishes it.
-    INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
-    AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
-  ])
-
-  dnl For backward compatibility. Some Makefiles may be using this.
-  INTLLIBS="$LIBINTL"
-  AC_SUBST(INTLLIBS)
-
-  dnl Make all documented variables known to autoconf.
-  AC_SUBST(LIBINTL)
-  AC_SUBST(LTLIBINTL)
-  AC_SUBST(POSUB)
-])
+# serial 2
 
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
-dnl Checks for all prerequisites of the po subdirectory,
-dnl except for USE_NLS.
-AC_DEFUN([AM_PO_SUBDIRS],
-[
-  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-  AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
-
-  dnl Perform the following tests also if --disable-nls has been given,
-  dnl because they are needed for "make dist" to work.
-
-  dnl Search for GNU msgfmt in the PATH.
-  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
-  dnl The second test excludes FreeBSD msgfmt.
-  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-    [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
-     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-
-  dnl Search for GNU xgettext 0.11 or newer in the PATH.
-  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
-  dnl The second test excludes FreeBSD xgettext.
-  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-    [$ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
-     (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  dnl Remove leftover from FreeBSD xgettext call.
-  rm -f messages.po
-
-  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
-  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
-    [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
-
-  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
-  dnl Test whether we really found GNU msgfmt.
-  if test "$GMSGFMT" != ":"; then
-    dnl If it is no GNU msgfmt we define it as : so that the
-    dnl Makefiles still can work.
-    if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
-       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-      AC_MSG_RESULT(
-        [found $GMSGFMT program is not GNU msgfmt; ignore it])
-      GMSGFMT=":"
-    fi
-  fi
+# _AM_SET_OPTION(NAME)
+# ------------------------------
+# Set option NAME.  Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
 
-  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
-  dnl Test whether we really found GNU xgettext.
-  if test "$XGETTEXT" != ":"; then
-    dnl If it is no GNU xgettext we define it as : so that the
-    dnl Makefiles still can work.
-    if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
-       (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      AC_MSG_RESULT(
-        [found xgettext program is not GNU xgettext; ignore it])
-      XGETTEXT=":"
-    fi
-    dnl Remove leftover from FreeBSD xgettext call.
-    rm -f messages.po
-  fi
+# _AM_SET_OPTIONS(OPTIONS)
+# ----------------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
 
-  AC_OUTPUT_COMMANDS([
-    for ac_file in $CONFIG_FILES; do
-      # Support "outfile[:infile[:infile...]]"
-      case "$ac_file" in
-        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-      esac
-      # PO directories have a Makefile.in generated from Makefile.in.in.
-      case "$ac_file" in */Makefile.in)
-        # Adjust a relative srcdir.
-        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-        # In autoconf-2.13 it is called $ac_given_srcdir.
-        # In autoconf-2.50 it is called $srcdir.
-        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-        case "$ac_given_srcdir" in
-          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-          /*) top_srcdir="$ac_given_srcdir" ;;
-          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-        esac
-        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-          rm -f "$ac_dir/POTFILES"
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
-          # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
-          # on $ac_dir but don't depend on user-specified configuration
-          # parameters.
-          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-            # The LINGUAS file contains the set of available languages.
-            if test -n "$ALL_LINGUAS"; then
-              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-            fi
-            ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake.
-            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-          fi
-          case "$ac_given_srcdir" in
-            .) srcdirpre= ;;
-            *) srcdirpre='$(srcdir)/' ;;
-          esac
-          POFILES=
-          GMOFILES=
-          UPDATEPOFILES=
-          DUMMYPOFILES=
-          for lang in $ALL_LINGUAS; do
-            POFILES="$POFILES $srcdirpre$lang.po"
-            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-          done
-          # CATALOGS depends on both $ac_dir and the user's LINGUAS
-          # environment variable.
-          INST_LINGUAS=
-          if test -n "$ALL_LINGUAS"; then
-            for presentlang in $ALL_LINGUAS; do
-              useit=no
-              if test "%UNSET%" != "$LINGUAS"; then
-                desiredlanguages="$LINGUAS"
-              else
-                desiredlanguages="$ALL_LINGUAS"
-              fi
-              for desiredlang in $desiredlanguages; do
-                # Use the presentlang catalog if desiredlang is
-                #   a. equal to presentlang, or
-                #   b. a variant of presentlang (because in this case,
-                #      presentlang can be used as a fallback for messages
-                #      which are not translated in the desiredlang catalog).
-                case "$desiredlang" in
-                  "$presentlang"*) useit=yes;;
-                esac
-              done
-              if test $useit = yes; then
-                INST_LINGUAS="$INST_LINGUAS $presentlang"
-              fi
-            done
-          fi
-          CATALOGS=
-          if test -n "$INST_LINGUAS"; then
-            for lang in $INST_LINGUAS; do
-              CATALOGS="$CATALOGS $lang.gmo"
-            done
-          fi
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-            if test -f "$f"; then
-              case "$f" in
-                *.orig | *.bak | *~) ;;
-                *) cat "$f" >> "$ac_dir/Makefile" ;;
-              esac
-            fi
-          done
-        fi
-        ;;
-      esac
-    done],
-   [# Capture the value of obsolete $ALL_LINGUAS because we need it to compute
-    # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
-    # from automake.
-    eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
-    # Capture the value of LINGUAS because we need it to compute CATALOGS.
-    LINGUAS="${LINGUAS-%UNSET%}"
-   ])
-])
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
+#
+# Check to make sure that the build environment is sane.
+#
 
-dnl Checks for all prerequisites of the intl subdirectory,
-dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
-dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
-AC_DEFUN([AM_INTL_SUBDIR],
-[
-  AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
-  AC_REQUIRE([AC_PROG_CC])dnl
-  AC_REQUIRE([AC_CANONICAL_HOST])dnl
-  AC_REQUIRE([AC_PROG_RANLIB])dnl
-  AC_REQUIRE([AC_ISC_POSIX])dnl
-  AC_REQUIRE([AC_HEADER_STDC])dnl
-  AC_REQUIRE([AC_C_CONST])dnl
-  AC_REQUIRE([AC_C_INLINE])dnl
-  AC_REQUIRE([AC_TYPE_OFF_T])dnl
-  AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-  AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-  AC_REQUIRE([AC_FUNC_MMAP])dnl
-  AC_REQUIRE([jm_GLIBC21])dnl
-
-  AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
-stdlib.h string.h unistd.h sys/param.h])
-  AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \
-geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
-strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
-
-  AM_ICONV
-  AM_LANGINFO_CODESET
-  AM_LC_MESSAGES
-
-  dnl intl/plural.c is generated from intl/plural.y. It requires bison,
-  dnl because plural.y uses bison specific features. It requires at least
-  dnl bison-1.26 because earlier versions generate a plural.c that doesn't
-  dnl compile.
-  dnl bison is only needed for the maintainer (who touches plural.y). But in
-  dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
-  dnl the rule in general Makefile. Now, some people carelessly touch the
-  dnl files or have a broken "make" program, hence the plural.c rule will
-  dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
-  dnl present or too old.
-  AC_CHECK_PROGS([INTLBISON], [bison])
-  if test -z "$INTLBISON"; then
-    ac_verc_fail=yes
-  else
-    dnl Found it, now check the version.
-    AC_MSG_CHECKING([version of bison])
-changequote(<<,>>)dnl
-    ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-    case $ac_prog_version in
-      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-      1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
-changequote([,])dnl
-         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-    esac
-    AC_MSG_RESULT([$ac_prog_version])
-  fi
-  if test $ac_verc_fail = yes; then
-    INTLBISON=:
-  fi
-])
+# Copyright (C) 1996, 1997, 2000, 2001, 2003 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.
 
-AC_DEFUN([AM_MKINSTALLDIRS],
-[
-  dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-  dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
-  dnl Try to locate is.
-  MKINSTALLDIRS=
-  if test -n "$ac_aux_dir"; then
-    MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-  fi
-  if test -z "$MKINSTALLDIRS"; then
-    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-  fi
-  AC_SUBST(MKINSTALLDIRS)
-])
+# 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.
 
-# lib-prefix.m4 serial 1 (gettext-0.11)
-dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
-dnl to access previously installed libraries. The basic assumption is that
-dnl a user will want packages to use other packages he previously installed
-dnl with the same --prefix option.
-dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
-dnl libraries, but is otherwise very convenient.
-AC_DEFUN([AC_LIB_PREFIX],
-[
-  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  dnl By default, look in $includedir and $libdir.
-  use_additional=yes
-  AC_LIB_WITH_FINAL_PREFIX([
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-  ])
-  AC_ARG_WITH([lib-prefix],
-[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
-  --without-lib-prefix    don't search for libraries in includedir and libdir],
-[
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-        AC_LIB_WITH_FINAL_PREFIX([
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-        ])
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
-      fi
-    fi
-])
-  if test $use_additional = yes; then
-    dnl Potentially add $additional_includedir to $CPPFLAGS.
-    dnl But don't add it
-    dnl   1. if it's the standard /usr/include,
-    dnl   2. if it's already present in $CPPFLAGS,
-    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
-    dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_includedir" != "X/usr/include"; then
-      haveit=
-      for x in $CPPFLAGS; do
-        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-        if test "X$x" = "X-I$additional_includedir"; then
-          haveit=yes
-          break
-        fi
-      done
-      if test -z "$haveit"; then
-        if test "X$additional_includedir" = "X/usr/local/include"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux*) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_includedir"; then
-            dnl Really add $additional_includedir to $CPPFLAGS.
-            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
-          fi
-        fi
-      fi
-    fi
-    dnl Potentially add $additional_libdir to $LDFLAGS.
-    dnl But don't add it
-    dnl   1. if it's the standard /usr/lib,
-    dnl   2. if it's already present in $LDFLAGS,
-    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
-    dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_libdir" != "X/usr/lib"; then
-      haveit=
-      for x in $LDFLAGS; do
-        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-        if test "X$x" = "X-L$additional_libdir"; then
-          haveit=yes
-          break
-        fi
-      done
-      if test -z "$haveit"; then
-        if test "X$additional_libdir" = "X/usr/local/lib"; then
-          if test -n "$GCC"; then
-            case $host_os in
-              linux*) haveit=yes;;
-            esac
-          fi
-        fi
-        if test -z "$haveit"; then
-          if test -d "$additional_libdir"; then
-            dnl Really add $additional_libdir to $LDFLAGS.
-            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
-          fi
-        fi
-      fi
-    fi
-  fi
-])
+# 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.
 
-dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
-dnl acl_final_exec_prefix, containing the values to which $prefix and
-dnl $exec_prefix will expand at the end of the configure script.
-AC_DEFUN([AC_LIB_PREPARE_PREFIX],
-[
-  dnl Unfortunately, prefix and exec_prefix get only finally determined
-  dnl at the end of configure.
-  if test "X$prefix" = "XNONE"; then
-    acl_final_prefix="$ac_default_prefix"
-  else
-    acl_final_prefix="$prefix"
-  fi
-  if test "X$exec_prefix" = "XNONE"; then
-    acl_final_exec_prefix='${prefix}'
-  else
-    acl_final_exec_prefix="$exec_prefix"
-  fi
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-  prefix="$acl_save_prefix"
-])
+# serial 3
 
-dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
-dnl variables prefix and exec_prefix bound to the values they will have
-dnl at the end of the configure script.
-AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
-[
-  acl_save_prefix="$prefix"
-  prefix="$acl_final_prefix"
-  acl_save_exec_prefix="$exec_prefix"
-  exec_prefix="$acl_final_exec_prefix"
-  $1
-  exec_prefix="$acl_save_exec_prefix"
-  prefix="$acl_save_prefix"
-])
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments.  Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+   if test "$[*]" = "X"; then
+      # -L didn't work.
+      set X `ls -t $srcdir/configure conftest.file`
+   fi
+   rm -f conftest.file
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
 
-# lib-link.m4 serial 1 (gettext-0.11)
-dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
-dnl augments the CPPFLAGS variable.
-AC_DEFUN([AC_LIB_LINKFLAGS],
-[
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-  define([Name],[translit([$1],[./-], [___])])
-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
-    AC_LIB_LINKFLAGS_BODY([$1], [$2])
-    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
-    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
-    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
-  ])
-  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
-  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
-  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-  AC_SUBST([LIB]NAME)
-  AC_SUBST([LTLIB]NAME)
-  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
-  dnl results of this search when this library appears as a dependency.
-  HAVE_LIB[]NAME=yes
-  undefine([Name])
-  undefine([NAME])
-])
+      # 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".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
 
-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
-dnl searches for libname and the libraries corresponding to explicit and
-dnl implicit dependencies, together with the specified include files and
-dnl the ability to compile and link the specified testcode. If found, it
-dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
-dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
-dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
-dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
-AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
-[
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-  define([Name],[translit([$1],[./-], [___])])
-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-
-  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
-  dnl accordingly.
-  AC_LIB_LINKFLAGS_BODY([$1], [$2])
-
-  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
-  dnl because if the user has installed lib[]Name and not disabled its use
-  dnl via --without-lib[]Name-prefix, he wants to use it.
-  ac_save_CPPFLAGS="$CPPFLAGS"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-
-  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
-    ac_save_LIBS="$LIBS"
-    LIBS="$LIBS $LIB[]NAME"
-    AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
-    LIBS="$ac_save_LIBS"
-  ])
-  if test "$ac_cv_lib[]Name" = yes; then
-    HAVE_LIB[]NAME=yes
-    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
-    AC_MSG_CHECKING([how to link with lib[]$1])
-    AC_MSG_RESULT([$LIB[]NAME])
-  else
-    HAVE_LIB[]NAME=no
-    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
-    dnl $INC[]NAME either.
-    CPPFLAGS="$ac_save_CPPFLAGS"
-    LIB[]NAME=
-    LTLIB[]NAME=
-  fi
-  AC_SUBST([HAVE_LIB]NAME)
-  AC_SUBST([LIB]NAME)
-  AC_SUBST([LTLIB]NAME)
-  undefine([Name])
-  undefine([NAME])
-])
+   test "$[2]" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT(yes)])
 
-dnl Determine the platform dependent parameters needed to use rpath:
-dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
-dnl hardcode_direct, hardcode_minus_L,
-dnl sys_lib_search_path_spec, sys_lib_dlsearch_path_spec.
-AC_DEFUN([AC_LIB_RPATH],
-[
-  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
-  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
-  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
-  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
-  AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
-    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
-    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
-    . ./conftest.sh
-    rm -f ./conftest.sh
-    acl_cv_rpath=done
-  ])
-  wl="$acl_cv_wl"
-  libext="$acl_cv_libext"
-  shlibext="$acl_cv_shlibext"
-  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
-  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
-  hardcode_direct="$acl_cv_hardcode_direct"
-  hardcode_minus_L="$acl_cv_hardcode_minus_L"
-  sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
-  sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
-])
+# AM_PROG_INSTALL_STRIP
 
-dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
-AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
-[
-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
-  dnl By default, look in $includedir and $libdir.
-  use_additional=yes
-  AC_LIB_WITH_FINAL_PREFIX([
-    eval additional_includedir=\"$includedir\"
-    eval additional_libdir=\"$libdir\"
-  ])
-  AC_ARG_WITH([lib$1-prefix],
-[  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
-  --without-lib$1-prefix     don't search for lib$1 in includedir and libdir],
-[
-    if test "X$withval" = "Xno"; then
-      use_additional=no
-    else
-      if test "X$withval" = "X"; then
-        AC_LIB_WITH_FINAL_PREFIX([
-          eval additional_includedir=\"$includedir\"
-          eval additional_libdir=\"$libdir\"
-        ])
-      else
-        additional_includedir="$withval/include"
-        additional_libdir="$withval/lib"
-      fi
-    fi
-])
-  dnl Search the library and its dependencies in $additional_libdir and
-  dnl $LDFLAGS. Using breadth-first-seach.
-  LIB[]NAME=
-  LTLIB[]NAME=
-  INC[]NAME=
-  rpathdirs=
-  ltrpathdirs=
-  names_already_handled=
-  names_next_round='$1 $2'
-  while test -n "$names_next_round"; do
-    names_this_round="$names_next_round"
-    names_next_round=
-    for name in $names_this_round; do
-      already_handled=
-      for n in $names_already_handled; do
-        if test "$n" = "$name"; then
-          already_handled=yes
-          break
-        fi
-      done
-      if test -z "$already_handled"; then
-        names_already_handled="$names_already_handled $name"
-        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
-        dnl or AC_LIB_HAVE_LINKFLAGS call.
-        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
-        eval value=\"\$HAVE_LIB$uppername\"
-        if test -n "$value"; then
-          if test "$value" = yes; then
-            eval value=\"\$LIB$uppername\"
-            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
-            eval value=\"\$LTLIB$uppername\"
-            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
-          else
-            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
-            dnl that this library doesn't exist. So just drop it.
-            :
-          fi
-        else
-          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
-          dnl and the already constructed $LIBNAME/$LTLIBNAME.
-          found_dir=
-          found_la=
-          found_so=
-          found_a=
-          if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
-              found_dir="$additional_libdir"
-              found_so="$additional_libdir/lib$name.$shlibext"
-              if test -f "$additional_libdir/lib$name.la"; then
-                found_la="$additional_libdir/lib$name.la"
-              fi
-            else
-              if test -f "$additional_libdir/lib$name.$libext"; then
-                found_dir="$additional_libdir"
-                found_a="$additional_libdir/lib$name.$libext"
-                if test -f "$additional_libdir/lib$name.la"; then
-                  found_la="$additional_libdir/lib$name.la"
-                fi
-              fi
-            fi
-          fi
-          if test "X$found_dir" = "X"; then
-            for x in $LDFLAGS $LTLIB[]NAME; do
-              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-              case "$x" in
-                -L*)
-                  dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
-                    found_dir="$dir"
-                    found_so="$dir/lib$name.$shlibext"
-                    if test -f "$dir/lib$name.la"; then
-                      found_la="$dir/lib$name.la"
-                    fi
-                  else
-                    if test -f "$dir/lib$name.$libext"; then
-                      found_dir="$dir"
-                      found_a="$dir/lib$name.$libext"
-                      if test -f "$dir/lib$name.la"; then
-                        found_la="$dir/lib$name.la"
-                      fi
-                    fi
-                  fi
-                  ;;
-              esac
-              if test "X$found_dir" != "X"; then
-                break
-              fi
-            done
-          fi
-          if test "X$found_dir" != "X"; then
-            dnl Found the library.
-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
-            if test "X$found_so" != "X"; then
-              dnl Linking with a shared library. We attempt to hardcode its
-              dnl directory into the executable's runpath, unless it's the
-              dnl standard /usr/lib.
-              if test "X$found_dir" = "X/usr/lib"; then
-                dnl No hardcoding is needed.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-              else
-                dnl Use an explicit option to hardcode DIR into the resulting
-                dnl binary.
-                dnl Potentially add DIR to ltrpathdirs.
-                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
-                haveit=
-                for x in $ltrpathdirs; do
-                  if test "X$x" = "X$found_dir"; then
-                    haveit=yes
-                    break
-                  fi
-                done
-                if test -z "$haveit"; then
-                  ltrpathdirs="$ltrpathdirs $found_dir"
-                fi
-                dnl The hardcoding into $LIBNAME is system dependent.
-                if test "$hardcode_direct" = yes; then
-                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
-                  dnl resulting binary.
-                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                else
-                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
-                    dnl Use an explicit option to hardcode DIR into the resulting
-                    dnl binary.
-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                    dnl Potentially add DIR to rpathdirs.
-                    dnl The rpathdirs will be appended to $LIBNAME at the end.
-                    haveit=
-                    for x in $rpathdirs; do
-                      if test "X$x" = "X$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      rpathdirs="$rpathdirs $found_dir"
-                    fi
-                  else
-                    dnl Rely on "-L$found_dir".
-                    dnl But don't add it if it's already contained in the LDFLAGS
-                    dnl or the already constructed $LIBNAME
-                    haveit=
-                    for x in $LDFLAGS $LIB[]NAME; do
-                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                      if test "X$x" = "X-L$found_dir"; then
-                        haveit=yes
-                        break
-                      fi
-                    done
-                    if test -z "$haveit"; then
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
-                    fi
-                    if test "$hardcode_minus_L" != no; then
-                      dnl FIXME: Not sure whether we should use
-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-                      dnl here.
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
-                    else
-                      dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
-                      dnl here, because this doesn't fit in flags passed to the
-                      dnl compiler. So give up. No hardcoding. This affects only
-                      dnl very old systems.
-                      dnl FIXME: Not sure whether we should use
-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
-                      dnl here.
-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-                    fi
-                  fi
-                fi
-              fi
-            else
-              if test "X$found_a" != "X"; then
-                dnl Linking with a static library.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
-              else
-                dnl We shouldn't come here, but anyway it's good to have a
-                dnl fallback.
-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
-              fi
-            fi
-            dnl Assume the include files are nearby.
-            additional_includedir=
-            case "$found_dir" in
-              */lib | */lib/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
-                additional_includedir="$basedir/include"
-                ;;
-            esac
-            if test "X$additional_includedir" != "X"; then
-              dnl Potentially add $additional_includedir to $INCNAME.
-              dnl But don't add it
-              dnl   1. if it's the standard /usr/include,
-              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
-              dnl   3. if it's already present in $CPPFLAGS or the already
-              dnl      constructed $INCNAME,
-              dnl   4. if it doesn't exist as a directory.
-              if test "X$additional_includedir" != "X/usr/include"; then
-                haveit=
-                if test "X$additional_includedir" = "X/usr/local/include"; then
-                  if test -n "$GCC"; then
-                    case $host_os in
-                      linux*) haveit=yes;;
-                    esac
-                  fi
-                fi
-                if test -z "$haveit"; then
-                  for x in $CPPFLAGS $INC[]NAME; do
-                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                    if test "X$x" = "X-I$additional_includedir"; then
-                      haveit=yes
-                      break
-                    fi
-                  done
-                  if test -z "$haveit"; then
-                    if test -d "$additional_includedir"; then
-                      dnl Really add $additional_includedir to $INCNAME.
-                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
-                    fi
-                  fi
-                fi
-              fi
-            fi
-            dnl Look for dependencies.
-            if test -n "$found_la"; then
-              dnl Read the .la file. It defines the variables
-              dnl dlname, library_names, old_library, dependency_libs, current,
-              dnl age, revision, installed, dlopen, dlpreopen, libdir.
-              save_libdir="$libdir"
-              case "$found_la" in
-                */* | *\\*) . "$found_la" ;;
-                *) . "./$found_la" ;;
-              esac
-              libdir="$save_libdir"
-              dnl We use only dependency_libs.
-              for dep in $dependency_libs; do
-                case "$dep" in
-                  -L*)
-                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
-                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
-                    dnl But don't add it
-                    dnl   1. if it's the standard /usr/lib,
-                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
-                    dnl   3. if it's already present in $LDFLAGS or the already
-                    dnl      constructed $LIBNAME,
-                    dnl   4. if it doesn't exist as a directory.
-                    if test "X$additional_libdir" != "X/usr/lib"; then
-                      haveit=
-                      if test "X$additional_libdir" = "X/usr/local/lib"; then
-                        if test -n "$GCC"; then
-                          case $host_os in
-                            linux*) haveit=yes;;
-                          esac
-                        fi
-                      fi
-                      if test -z "$haveit"; then
-                        haveit=
-                        for x in $LDFLAGS $LIB[]NAME; do
-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                            dnl Really add $additional_libdir to $LIBNAME.
-                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
-                          fi
-                        fi
-                        haveit=
-                        for x in $LDFLAGS $LTLIB[]NAME; do
-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-                          if test "X$x" = "X-L$additional_libdir"; then
-                            haveit=yes
-                            break
-                          fi
-                        done
-                        if test -z "$haveit"; then
-                          if test -d "$additional_libdir"; then
-                            dnl Really add $additional_libdir to $LTLIBNAME.
-                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
-                          fi
-                        fi
-                      fi
-                    fi
-                    ;;
-                  -l*)
-                    dnl Handle this in the next round.
-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
-                    ;;
-                  *.la)
-                    dnl Handle this in the next round. Throw away the .la's
-                    dnl directory; it is already contained in a preceding -L
-                    dnl option.
-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
-                    ;;
-                  *)
-                    dnl Most likely an immediate library name.
-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
-                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
-                    ;;
-                esac
-              done
-            fi
-          else
-            dnl Didn't find the library; assume it is in the system directories
-            dnl known to the linker and runtime loader. (All the system
-            dnl directories known to the linker should also be known to the
-            dnl runtime loader, otherwise the system is severely misconfigured.)
-            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
-          fi
-        fi
-      fi
-    done
-  done
-  if test "X$rpathdirs" != "X"; then
-    if test -n "$hardcode_libdir_separator"; then
-      dnl Weird platform: only the last -rpath option counts, the user must
-      dnl pass all path elements in one option. We can arrange that for a
-      dnl single library, but not when more than one $LIBNAMEs are used.
-      alldirs=
-      for found_dir in $rpathdirs; do
-        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
-      done
-      dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
-      acl_save_libdir="$libdir"
-      libdir="$alldirs"
-      eval flag=\"$hardcode_libdir_flag_spec\"
-      libdir="$acl_save_libdir"
-      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-    else
-      dnl The -rpath options are cumulative.
-      for found_dir in $rpathdirs; do
-        acl_save_libdir="$libdir"
-        libdir="$found_dir"
-        eval flag=\"$hardcode_libdir_flag_spec\"
-        libdir="$acl_save_libdir"
-        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
-      done
-    fi
-  fi
-  if test "X$ltrpathdirs" != "X"; then
-    dnl When using libtool, the option that works for both libraries and
-    dnl executables is -R. The -R options are cumulative.
-    for found_dir in $ltrpathdirs; do
-      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
-    done
-  fi
-])
+# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
 
-dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
-dnl unless already present in VAR.
-dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
-dnl contains two or three consecutive elements that belong together.
-AC_DEFUN([AC_LIB_APPENDTOVAR],
-[
-  for element in [$2]; do
-    haveit=
-    for x in $[$1]; do
-      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-      if test "X$x" = "X$element"; then
-        haveit=yes
-        break
-      fi
-    done
-    if test -z "$haveit"; then
-      [$1]="${[$1]}${[$1]:+ }$element"
-    fi
-  done
-])
+# 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.
 
-# lib-ld.m4 serial 1 (gettext-0.11)
-dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl Subroutines of libtool.m4,
-dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
-dnl with libtool.m4.
-
-dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
-AC_DEFUN([AC_LIB_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  acl_cv_prog_gnu_ld=yes
-else
-  acl_cv_prog_gnu_ld=no
-fi])
-with_gnu_ld=$acl_cv_prog_gnu_ld
-])
+# 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.
 
-dnl From libtool-1.4. Sets the variable LD.
-AC_DEFUN([AC_LIB_PROG_LD],
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      [re_direlt='/[^/][^/]*/\.\./']
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(acl_cv_path_LD,
-[if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      acl_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  acl_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$acl_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
+# 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.
+
+# One issue with vendor `install' (even GNU) is that you can't
+# specify the program used to strip binaries.  This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in `make install-strip', and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
 fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_LIB_PROG_LD_GNU
-])
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# iconv.m4 serial AM3 (gettext-0.11)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([AM_ICONV_LINK],
-[
-  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-  dnl those with the standalone portable GNU libiconv installed).
-
-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  AC_REQUIRE([AC_LIB_RPATH])
-
-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
-  dnl accordingly.
-  AC_LIB_LINKFLAGS_BODY([iconv])
-
-  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
-  dnl because if the user has installed libiconv and not disabled its use
-  dnl via --without-libiconv-prefix, he wants to use it. The first
-  dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
-  am_save_CPPFLAGS="$CPPFLAGS"
-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
-
-  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
-    am_cv_func_iconv="no, consider installing GNU libiconv"
-    am_cv_lib_iconv=no
-    AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-      [iconv_t cd = iconv_open("","");
-       iconv(cd,NULL,NULL,NULL,NULL);
-       iconv_close(cd);],
-      am_cv_func_iconv=yes)
-    if test "$am_cv_func_iconv" != yes; then
-      am_save_LIBS="$LIBS"
-      LIBS="$LIBS $LIBICONV"
-      AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-        [iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);],
-        am_cv_lib_iconv=yes
-        am_cv_func_iconv=yes)
-      LIBS="$am_save_LIBS"
-    fi
-  ])
-  if test "$am_cv_func_iconv" = yes; then
-    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
-  fi
-  if test "$am_cv_lib_iconv" = yes; then
-    AC_MSG_CHECKING([how to link with libiconv])
-    AC_MSG_RESULT([$LIBICONV])
-  else
-    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
-    dnl either.
-    CPPFLAGS="$am_save_CPPFLAGS"
-    LIBICONV=
-    LTLIBICONV=
-  fi
-  AC_SUBST(LIBICONV)
-  AC_SUBST(LTLIBICONV)
-])
+# Check how to create a tarball.                            -*- Autoconf -*-
 
-AC_DEFUN([AM_ICONV],
-[
-  AC_REQUIRE([AM_ICONV_LINK])
-  if test "$am_cv_func_iconv" = yes; then
-    AC_MSG_CHECKING([for iconv declaration])
-    AC_CACHE_VAL(am_cv_proto_iconv, [
-      AC_TRY_COMPILE([
-#include <stdlib.h>
-#include <iconv.h>
-extern
-#ifdef __cplusplus
-"C"
-#endif
-#if defined(__STDC__) || defined(__cplusplus)
-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
-#else
-size_t iconv();
-#endif
-], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
-      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
-    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    AC_MSG_RESULT([$]{ac_t:-
-         }[$]am_cv_proto_iconv)
-    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
-      [Define as const if the declaration of iconv() needs const.])
-  fi
-])
+# Copyright (C) 2004  Free Software Foundation, Inc.
 
-# progtest.m4 serial 2 (gettext-0.10.40)
-dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-# Search path for a program which passes the given test.
-
-dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN([AM_PATH_PROG_WITH_TEST],
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
-  /*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if [$3]; then
-	ac_cv_path_$1="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-  ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
-  AC_MSG_RESULT([$]$1)
-else
-  AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
+# 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.
 
-# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-# Test for the GNU C Library, version 2.1 or newer.
-# From Bruno Haible.
-
-AC_DEFUN([jm_GLIBC21],
-  [
-    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
-      ac_cv_gnu_library_2_1,
-      [AC_EGREP_CPP([Lucky GNU user],
-	[
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
-  Lucky GNU user
- #endif
-#endif
-	],
-	ac_cv_gnu_library_2_1=yes,
-	ac_cv_gnu_library_2_1=no)
-      ]
-    )
-    AC_SUBST(GLIBC21)
-    GLIBC21="$ac_cv_gnu_library_2_1"
-  ]
-)
+# 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.
 
-# codeset.m4 serial AM1 (gettext-0.10.40)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([AM_LANGINFO_CODESET],
-[
-  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
-    [AC_TRY_LINK([#include <langinfo.h>],
-      [char* cs = nl_langinfo(CODESET);],
-      am_cv_langinfo_codeset=yes,
-      am_cv_langinfo_codeset=no)
-    ])
-  if test $am_cv_langinfo_codeset = yes; then
-    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
-      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
-  fi
-])
+# 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.
 
-# lcmessage.m4 serial 2 (gettext-0.10.40)
-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995.
-
-# Check whether LC_MESSAGES is available in <locale.h>.
-
-AC_DEFUN([AM_LC_MESSAGES],
-  [if test $ac_cv_header_locale_h = yes; then
-    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-    if test $am_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES, 1,
-        [Define if your <locale.h> file defines LC_MESSAGES.])
-    fi
-  fi])
+# serial 1
+
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of `v7', `ustar', or `pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+#     tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+#     $(am__untar) < result.tar
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+m4_if([$1], [v7],
+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [m4_case([$1], [ustar],, [pax],,
+              [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+  case $_am_tool in
+  gnutar)
+    for _am_tar in tar gnutar gtar;
+    do
+      AM_RUN_LOG([$_am_tar --version]) && break
+    done
+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+    am__untar="$_am_tar -xf -"
+    ;;
+  plaintar)
+    # Must skip GNU tar: if it does not support --format= it doesn't create
+    # ustar tarball either.
+    (tar --version) >/dev/null 2>&1 && continue
+    am__tar='tar chf - "$$tardir"'
+    am__tar_='tar chf - "$tardir"'
+    am__untar='tar xf -'
+    ;;
+  pax)
+    am__tar='pax -L -x $1 -w "$$tardir"'
+    am__tar_='pax -L -x $1 -w "$tardir"'
+    am__untar='pax -r'
+    ;;
+  cpio)
+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+    am__untar='cpio -i -H $1 -d'
+    ;;
+  none)
+    am__tar=false
+    am__tar_=false
+    am__untar=false
+    ;;
+  esac
 
+  # If the value was cached, stop now.  We just wanted to have am__tar
+  # and am__untar set.
+  test -n "${am_cv_prog_tar_$1}" && break
+
+  # tar/untar a dummy directory, and stop if the command works
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  echo GrepMe > conftest.dir/file
+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+  rm -rf conftest.dir
+  if test -s conftest.tar; then
+    AM_RUN_LOG([$am__untar <conftest.tar])
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+  fi
+done
+rm -rf conftest.dir
+
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
+m4_include([m4/codeset.m4])
+m4_include([m4/gettext.m4])
+m4_include([m4/glibc21.m4])
+m4_include([m4/iconv.m4])
+m4_include([m4/intdiv0.m4])
+m4_include([m4/intmax.m4])
+m4_include([m4/inttypes-pri.m4])
+m4_include([m4/inttypes.m4])
+m4_include([m4/inttypes_h.m4])
+m4_include([m4/lcmessage.m4])
+m4_include([m4/lib-ld.m4])
+m4_include([m4/lib-link.m4])
+m4_include([m4/lib-prefix.m4])
+m4_include([m4/longdouble.m4])
+m4_include([m4/longlong.m4])
+m4_include([m4/mkstemp.m4])
+m4_include([m4/nls.m4])
+m4_include([m4/onceonly_2_57.m4])
+m4_include([m4/po.m4])
+m4_include([m4/printf-posix.m4])
+m4_include([m4/progtest.m4])
+m4_include([m4/signed.m4])
+m4_include([m4/size_max.m4])
+m4_include([m4/stdint_h.m4])
+m4_include([m4/strcase.m4])
+m4_include([m4/uintmax_t.m4])
+m4_include([m4/ulonglong.m4])
+m4_include([m4/wchar_t.m4])
+m4_include([m4/wint_t.m4])
+m4_include([m4/xsize.m4])
diff --git a/gnu/usr.bin/texinfo/config.in b/gnu/usr.bin/texinfo/config.in
index 549a66929b5..cc9fc88828c 100644
--- a/gnu/usr.bin/texinfo/config.in
+++ b/gnu/usr.bin/texinfo/config.in
@@ -25,6 +25,9 @@
 /* Define to 1 if you have the <argz.h> header file. */
 #undef HAVE_ARGZ_H
 
+/* Define to 1 if you have the `asprintf' function. */
+#undef HAVE_ASPRINTF
+
 /* Define to 1 if you have the `bzero' function. */
 #undef HAVE_BZERO
 
@@ -32,17 +35,41 @@
    */
 #undef HAVE_DCGETTEXT
 
-/* Define if this function is declared. */
-#undef HAVE_DECL_STRCASECMP
+/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
+   don't. */
+#undef HAVE_DECL_FEOF_UNLOCKED
+
+/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if
+   you don't. */
+#undef HAVE_DECL_FGETS_UNLOCKED
+
+/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
+   don't. */
+#undef HAVE_DECL_GETC_UNLOCKED
+
+/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't.
+   */
+#undef HAVE_DECL_GETENV
 
-/* Define if this function is declared. */
+/* Define to 1 if you have the declaration of `memchr', and to 0 if you don't.
+   */
+#undef HAVE_DECL_MEMCHR
+
+/* Define to 1 if you have the declaration of `strcoll', and to 0 if you
+   don't. */
 #undef HAVE_DECL_STRCOLL
 
-/* Define if this function is declared. */
+/* Define to 1 if you have the declaration of `strerror', and to 0 if you
+   don't. */
 #undef HAVE_DECL_STRERROR
 
-/* Define if this function is declared. */
-#undef HAVE_DECL_STRNCASECMP
+/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you
+   don't. */
+#undef HAVE_DECL__SNPRINTF
+
+/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you
+   don't. */
+#undef HAVE_DECL__SNWPRINTF
 
 /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
 #undef HAVE_DOPRNT
@@ -50,18 +77,12 @@
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
-/* Define to 1 if you have the `feof_unlocked' function. */
-#undef HAVE_FEOF_UNLOCKED
-
-/* Define to 1 if you have the `fgets_unlocked' function. */
-#undef HAVE_FGETS_UNLOCKED
+/* Define to 1 if you have the `fwprintf' function. */
+#undef HAVE_FWPRINTF
 
 /* Define to 1 if you have the `getcwd' function. */
 #undef HAVE_GETCWD
 
-/* Define to 1 if you have the `getc_unlocked' function. */
-#undef HAVE_GETC_UNLOCKED
-
 /* Define to 1 if you have the `getegid' function. */
 #undef HAVE_GETEGID
 
@@ -77,15 +98,25 @@
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT
 
+/* Define to 1 if you have the `gettimeofday' function. */
+#undef HAVE_GETTIMEOFDAY
+
 /* Define to 1 if you have the `getuid' function. */
 #undef HAVE_GETUID
 
 /* Define if you have the iconv() function. */
 #undef HAVE_ICONV
 
-/* Define to 1 if you have the <inttypes.h> header file. */
+/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
+#undef HAVE_INTMAX_T
+
+/* Define if <inttypes.h> exists and doesn't clash with <sys/types.h>. */
 #undef HAVE_INTTYPES_H
 
+/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
+   declares uintmax_t. */
+#undef HAVE_INTTYPES_H_WITH_UINTMAX
+
 /* Define to 1 if you have the <io.h> header file. */
 #undef HAVE_IO_H
 
@@ -104,6 +135,12 @@
 /* Define to 1 if you have the <locale.h> header file. */
 #undef HAVE_LOCALE_H
 
+/* Define if you have the 'long double' type. */
+#undef HAVE_LONG_DOUBLE
+
+/* Define if you have the 'long long' type. */
+#undef HAVE_LONG_LONG
+
 /* Define to 1 if you have the <malloc.h> header file. */
 #undef HAVE_MALLOC_H
 
@@ -122,6 +159,9 @@
 /* Define to 1 if you have the `memset' function. */
 #undef HAVE_MEMSET
 
+/* Define to 1 if you have the `mkstemp' function. */
+#undef HAVE_MKSTEMP
+
 /* Define to 1 if you have a working `mmap' system call. */
 #undef HAVE_MMAP
 
@@ -134,6 +174,9 @@
 /* Define to 1 if you have the <nl_types.h> header file. */
 #undef HAVE_NL_TYPES_H
 
+/* Define if your printf() function supports format strings with positions. */
+#undef HAVE_POSIX_PRINTF
+
 /* Define to 1 if you have the `putenv' function. */
 #undef HAVE_PUTENV
 
@@ -149,18 +192,28 @@
 /* Define to 1 if you have the `setvbuf' function. */
 #undef HAVE_SETVBUF
 
+/* Define to 1 if you have the `sigaction' function. */
+#undef HAVE_SIGACTION
+
 /* Define to 1 if you have the `sigprocmask' function. */
 #undef HAVE_SIGPROCMASK
 
 /* Define to 1 if you have the `sigsetmask' function. */
 #undef HAVE_SIGSETMASK
 
+/* Define to 1 if you have the `snprintf' function. */
+#undef HAVE_SNPRINTF
+
 /* Define to 1 if you have the <stddef.h> header file. */
 #undef HAVE_STDDEF_H
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
+/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
+   uintmax_t. */
+#undef HAVE_STDINT_H_WITH_UINTMAX
+
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
@@ -210,6 +263,9 @@
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
+/* Define to 1 if you have the <sys/stream.h> header file. */
+#undef HAVE_SYS_STREAM_H
+
 /* Define to 1 if you have the <sys/time.h> header file. */
 #undef HAVE_SYS_TIME_H
 
@@ -234,12 +290,27 @@
 /* Define to 1 if you have the `tsearch' function. */
 #undef HAVE_TSEARCH
 
+/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
+#undef HAVE_UINTMAX_T
+
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Define if you have the 'unsigned long long' type. */
+#undef HAVE_UNSIGNED_LONG_LONG
+
 /* Define to 1 if you have the `vprintf' function. */
 #undef HAVE_VPRINTF
 
+/* Define if you have the 'wchar_t' type. */
+#undef HAVE_WCHAR_T
+
+/* Define to 1 if you have the `wcslen' function. */
+#undef HAVE_WCSLEN
+
+/* Define if you have the 'wint_t' type. */
+#undef HAVE_WINT_T
+
 /* Define to 1 if you have the `__argz_count' function. */
 #undef HAVE___ARGZ_COUNT
 
@@ -249,9 +320,18 @@
 /* Define to 1 if you have the `__argz_stringify' function. */
 #undef HAVE___ARGZ_STRINGIFY
 
+/* Define to 1 if you have the `__fsetlocking' function. */
+#undef HAVE___FSETLOCKING
+
+/* Define to 1 if you have the `__secure_getenv' function. */
+#undef HAVE___SECURE_GETENV
+
 /* Define as const if the declaration of iconv() needs const. */
 #undef ICONV_CONST
 
+/* Define if integer division by zero raises signal SIGFPE. */
+#undef INTDIV0_RAISES_SIGFPE
+
 /* Name of package */
 #undef PACKAGE
 
@@ -270,15 +350,22 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
+/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
+#undef PRI_MACROS_BROKEN
+
 /* Define as the return type of signal handlers (`int' or `void'). */
 #undef RETSIGTYPE
 
+/* Define as the maximum value of type 'size_t', if the system doesn't define
+   it. */
+#undef SIZE_MAX
+
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
    automatically deduced at run-time.
-        STACK_DIRECTION > 0 => grows toward higher addresses
-        STACK_DIRECTION < 0 => grows toward lower addresses
-        STACK_DIRECTION = 0 => direction of growth unknown */
+	STACK_DIRECTION > 0 => grows toward higher addresses
+	STACK_DIRECTION < 0 => grows toward lower addresses
+	STACK_DIRECTION = 0 => direction of growth unknown */
 #undef STACK_DIRECTION
 
 /* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
@@ -306,12 +393,28 @@
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
-   if it is not supported. */
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
 #undef inline
+#endif
+
+/* Define to rpl_mkstemp if the replacement function should be used. */
+#undef mkstemp
 
 /* Define to `long' if <sys/types.h> does not define. */
 #undef off_t
 
+/* Define as the type of the result of subtracting two pointers, if the system
+   doesn't define it. */
+#undef ptrdiff_t
+
+/* Define to empty if the C compiler doesn't support this keyword. */
+#undef signed
+
 /* Define to `unsigned' if <sys/types.h> does not define. */
 #undef size_t
+
+/* Define to unsigned long or unsigned long long if <stdint.h> and
+   <inttypes.h> don't define. */
+#undef uintmax_t
diff --git a/gnu/usr.bin/texinfo/config.rpath b/gnu/usr.bin/texinfo/config.rpath
index 5ead7586a7c..4db13e50f66 100644
--- a/gnu/usr.bin/texinfo/config.rpath
+++ b/gnu/usr.bin/texinfo/config.rpath
@@ -2,7 +2,7 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2002 Free Software Foundation, Inc.
+#   Copyright 1996-2003 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
@@ -34,43 +34,57 @@
 #
 # The set of defined variables is at the end of this script.
 
+# Known limitations:
+# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
+#   than 256 bytes, otherwise the compiler driver will dump core. The only
+#   known workaround is to choose shorter directory names for the build
+#   directory and/or the installation directory.
+
 # All known linkers require a `.a' archive for static linking (except M$VC,
 # which needs '.lib').
 libext=a
-shlibext=
+shrext=.so
 
 host="$1"
 host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
+# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
+
 wl=
 if test "$GCC" = yes; then
   wl='-Wl,'
 else
   case "$host_os" in
-    aix3* | aix4* | aix5*)
+    aix*)
       wl='-Wl,'
       ;;
+    mingw* | pw32* | os2*)
+      ;;
     hpux9* | hpux10* | hpux11*)
       wl='-Wl,'
       ;;
-    irix5* | irix6*)
+    irix5* | irix6* | nonstopux*)
       wl='-Wl,'
       ;;
+    newsos6)
+      ;;
     linux*)
-      echo '__INTEL_COMPILER' > conftest.$ac_ext
-      if $CC -E conftest.$ac_ext >/dev/null | grep __INTEL_COMPILER >/dev/null
-      then
-        :
-      else
-        # Intel icc
-        wl='-Qoption,ld,'
-      fi
+      case $CC in
+        icc|ecc)
+          wl='-Wl,'
+          ;;
+        ccc)
+          wl='-Wl,'
+          ;;
+      esac
       ;;
     osf3* | osf4* | osf5*)
       wl='-Wl,'
       ;;
+    sco3.2v5*)
+      ;;
     solaris*)
       wl='-Wl,'
       ;;
@@ -78,15 +92,17 @@ else
       wl='-Qoption ld '
       ;;
     sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-      if test "x$host_vendor" = xsni; then
-        wl='-LD'
-      else
-        wl='-Wl,'
-      fi
+      wl='-Wl,'
+      ;;
+    sysv4*MP*)
+      ;;
+    uts4*)
       ;;
   esac
 fi
 
+# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
+
 hardcode_libdir_flag_spec=
 hardcode_libdir_separator=
 hardcode_direct=no
@@ -110,8 +126,10 @@ ld_shlibs=yes
 if test "$with_gnu_ld" = yes; then
   case "$host_os" in
     aix3* | aix4* | aix5*)
-      # On AIX, the GNU linker is very broken
-      ld_shlibs=no
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+        ld_shlibs=no
+      fi
       ;;
     amigaos*)
       hardcode_libdir_flag_spec='-L$libdir'
@@ -125,7 +143,7 @@ if test "$with_gnu_ld" = yes; then
       ld_shlibs=no
       ;;
     beos*)
-      if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
         :
       else
         ld_shlibs=no
@@ -135,11 +153,18 @@ if test "$with_gnu_ld" = yes; then
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       hardcode_libdir_flag_spec='-L$libdir'
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    netbsd*)
       ;;
     solaris* | sysv5*)
-      if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
         ld_shlibs=no
-      elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
         :
       else
         ld_shlibs=no
@@ -149,7 +174,7 @@ if test "$with_gnu_ld" = yes; then
       hardcode_direct=yes
       ;;
     *)
-      if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
         :
       else
         ld_shlibs=no
@@ -157,6 +182,8 @@ if test "$with_gnu_ld" = yes; then
       ;;
   esac
   if test "$ld_shlibs" = yes; then
+    # Unlike libtool, we use -rpath here, not --rpath, since the documented
+    # option of GNU ld is called -rpath, not --rpath.
     hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
   fi
 else
@@ -209,13 +236,27 @@ else
           fi
         esac
       fi
+      # Begin _LT_AC_SYS_LIBPATH_AIX.
+      echo 'int main () { return 0; }' > conftest.c
+      ${CC} ${LDFLAGS} conftest.c -o conftest
+      aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      if test -z "$aix_libpath"; then
+        aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      fi
+      if test -z "$aix_libpath"; then
+        aix_libpath="/usr/lib:/lib"
+      fi
+      rm -f conftest.c conftest
+      # End _LT_AC_SYS_LIBPATH_AIX.
       if test "$aix_use_runtimelinking" = yes; then
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
       else
         if test "$host_cpu" = ia64; then
           hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
         else
-          hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
+          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
         fi
       fi
       ;;
@@ -225,6 +266,8 @@ else
       # see comment about different semantics on the GNU ld section
       ld_shlibs=no
       ;;
+    bsdi4*)
+      ;;
     cygwin* | mingw* | pw32*)
       # When not using gcc, we currently assume that we are using
       # Microsoft Visual C++.
@@ -234,7 +277,12 @@ else
       libext=lib
       ;;
     darwin* | rhapsody*)
-      hardcode_direct=yes
+      if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+        hardcode_direct=no
+      fi
+      ;;
+    dgux*)
+      hardcode_libdir_flag_spec='-L$libdir'
       ;;
     freebsd1*)
       ld_shlibs=no
@@ -251,14 +299,41 @@ else
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
       ;;
-    hpux9* | hpux10* | hpux11*)
+    hpux9*)
       hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
       hardcode_libdir_separator=:
       hardcode_direct=yes
-      hardcode_minus_L=yes # Not in the search PATH, but as the default
-                           # location of the library.
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
       ;;
-    irix5* | irix6*)
+    hpux10* | hpux11*)
+      if test "$with_gnu_ld" = no; then
+        case "$host_cpu" in
+          hppa*64*)
+            hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+            hardcode_libdir_separator=:
+            hardcode_direct=no
+            ;;
+          ia64*)
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_direct=no
+            # hardcode_minus_L: Not really in the search PATH,
+            # but as the default location of the library.
+            hardcode_minus_L=yes
+            ;;
+          *)
+            hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+            hardcode_libdir_separator=:
+            hardcode_direct=yes
+            # hardcode_minus_L: Not really in the search PATH,
+            # but as the default location of the library.
+            hardcode_minus_L=yes
+            ;;
+        esac
+      fi
+      ;;
+    irix5* | irix6* | nonstopux*)
       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
       hardcode_libdir_separator=:
       ;;
@@ -314,23 +389,20 @@ else
       hardcode_minus_L=yes
       ;;
     sysv4)
-      if test "x$host_vendor" = xsno; then
-        hardcode_direct=yes # is this really true???
-      else
-        hardcode_direct=no # Motorola manual says yes, but my tests say they lie
-      fi
+      case $host_vendor in
+        sni)
+          hardcode_direct=yes # is this really true???
+          ;;
+        siemens)
+          hardcode_direct=no
+          ;;
+        motorola)
+          hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+          ;;
+      esac
       ;;
     sysv4.3*)
       ;;
-    sysv5*)
-      hardcode_libdir_flag_spec=
-      ;;
-    uts4*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      ;;
-    dgux*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      ;;
     sysv4*MP*)
       if test -d /usr/nec; then
         ld_shlibs=yes
@@ -340,7 +412,13 @@ else
       hardcode_direct=yes
       hardcode_minus_L=no
       ;;
-    sysv5uw7* | unixware7*)
+    sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
+      ;;
+    sysv5*)
+      hardcode_libdir_flag_spec=
+      ;;
+    uts4*)
+      hardcode_libdir_flag_spec='-L$libdir'
       ;;
     *)
       ld_shlibs=no
@@ -349,134 +427,97 @@ else
 fi
 
 # Check dynamic linker characteristics
+# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
 libname_spec='lib$name'
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 case "$host_os" in
   aix3*)
-    shlibext=so
     ;;
   aix4* | aix5*)
-    shlibext=so
     ;;
   amigaos*)
-    shlibext=ixlibrary
     ;;
   beos*)
-    shlibext=so
     ;;
   bsdi4*)
-    shlibext=so
-    sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-    sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
     ;;
   cygwin* | mingw* | pw32*)
-    case $GCC,$host_os in
-      yes,cygwin*)
-        shlibext=dll.a
-        ;;
-      yes,mingw*)
-        shlibext=dll
-        sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
-        ;;
-      yes,pw32*)
-        shlibext=dll
-        ;;
-      *)
-        shlibext=dll
-        ;;
-    esac
+    shrext=.dll
     ;;
   darwin* | rhapsody*)
-    shlibext=dylib
+    shrext=.dylib
+    ;;
+  dgux*)
     ;;
   freebsd1*)
     ;;
   freebsd*)
-    shlibext=so
     ;;
   gnu*)
-    shlibext=so
     ;;
   hpux9* | hpux10* | hpux11*)
-    shlibext=sl
+    case "$host_cpu" in
+      ia64*)
+        shrext=.so
+        ;;
+      hppa*64*)
+        shrext=.sl
+        ;;
+      *)
+        shrext=.sl
+        ;;
+    esac
     ;;
-  irix5* | irix6*)
-    shlibext=so
+  irix5* | irix6* | nonstopux*)
     case "$host_os" in
-      irix5*)
+      irix5* | nonstopux*)
         libsuff= shlibsuff=
         ;;
       *)
         case $LD in
-          *-32|*"-32 ") libsuff= shlibsuff= ;;
-          *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 ;;
-          *-64|*"-64 ") libsuff=64 shlibsuff=64 ;;
+          *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
+          *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
+          *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
           *) libsuff= shlibsuff= ;;
         esac
         ;;
     esac
-    sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-    sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
     ;;
-  linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
+  linux*oldld* | linux*aout* | linux*coff*)
     ;;
-  linux-gnu*)
-    shlibext=so
+  linux*)
     ;;
   netbsd*)
-    shlibext=so
     ;;
   newsos6)
-    shlibext=so
+    ;;
+  nto-qnx)
     ;;
   openbsd*)
-    shlibext=so
     ;;
   os2*)
     libname_spec='$name'
-    shlibext=dll
+    shrext=.dll
     ;;
   osf3* | osf4* | osf5*)
-    shlibext=so
-    sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
     ;;
   sco3.2v5*)
-    shlibext=so
     ;;
   solaris*)
-    shlibext=so
     ;;
   sunos4*)
-    shlibext=so
     ;;
   sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-    shlibext=so
-    case "$host_vendor" in
-      motorola)
-        sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-        ;;
-    esac
-    ;;
-  uts4*)
-    shlibext=so
-    ;;
-  dgux*)
-    shlibext=so
     ;;
   sysv4*MP*)
-    if test -d /usr/nec; then
-      shlibext=so
-    fi
+    ;;
+  uts4*)
     ;;
 esac
 
 sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
 escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
+shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
 escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-escaped_sys_lib_search_path_spec=`echo "X$sys_lib_search_path_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-escaped_sys_lib_dlsearch_path_spec=`echo "X$sys_lib_dlsearch_path_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
 
 sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
 
@@ -504,10 +545,4 @@ hardcode_direct="$hardcode_direct"
 # resulting binary.
 hardcode_minus_L="$hardcode_minus_L"
 
-# Compile-time system search path for libraries
-sys_lib_search_path_spec="$escaped_sys_lib_search_path_spec"
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="$escaped_sys_lib_dlsearch_path_spec"
-
 EOF
diff --git a/gnu/usr.bin/texinfo/configure.ac b/gnu/usr.bin/texinfo/configure.ac
index 6debb26e106..83f049125b7 100644
--- a/gnu/usr.bin/texinfo/configure.ac
+++ b/gnu/usr.bin/texinfo/configure.ac
@@ -1,20 +1,33 @@
-dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.ac,v 1.1.1.1 2002/06/10 13:20:14 espie Exp $
-dnl
-AC_PREREQ(2.52)dnl Minimum Autoconf version required.
-dnl
-AC_INIT([GNU Texinfo], [4.2])
+# Process this file with autoconf to produce a configure script.
+# $Id: configure.ac,v 1.1.1.2 2006/07/17 16:03:10 espie Exp $
+#
+# This file is free software; as a special exception the author 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.
+#
+AC_PREREQ(2.59)# Minimum Autoconf version required.
+#
+AC_INIT([GNU Texinfo], [4.8])
+AC_CONFIG_HEADERS(config.h:config.in)# Keep filename to 8.3 for MS-DOS.
 AC_CONFIG_SRCDIR([makeinfo/makeinfo.c])
-AM_CONFIG_HEADER(config.h:config.in)dnl Keep filename to 8.3 for MS-DOS.
-AM_INIT_AUTOMAKE
-dnl
-AM_CONDITIONAL(TEXINFO_MAINT, test -n "$TEXINFO_MAINT")
+AM_INIT_AUTOMAKE([dist-bzip2])
 
-dnl Checks for programs.
+# When the Texinfo source is imported into other repositories
+# (NetBSD and TeX Live), timestamps are generally not preserved.  This
+# causes lots of annoyance, so --enable-maintainer-mode.  Sorry.
+AM_MAINTAINER_MODE
+
+# Checks for programs.
 AC_PROG_CC
 AC_PROG_GCC_TRADITIONAL
 AC_PROG_INSTALL
+AC_PROG_MAKE_SET
 AC_PROG_RANLIB
+AM_MISSING_PROG(HELP2MAN, help2man)
 
 AC_ISC_POSIX
 AC_MINIX
@@ -22,44 +35,86 @@ AC_MINIX
 # Needed on sysV68 for sigblock, sigsetmask.  But check for it in libc first.
 AC_CHECK_FUNC(sigblock, , AC_CHECK_LIB(bsd, sigblock))
 
-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
+# Checks for header files.
 AC_HEADER_STAT
 AC_HEADER_STDC
 AC_CHECK_HEADERS(fcntl.h io.h limits.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)
+  sys/fcntl.h sys/file.h sys/stream.h sys/time.h sys/ttold.h sys/wait.h)
+
+# sys/ptem.h requires sys/stream.h for mblk_t on Solaris.
+AC_CHECK_HEADERS([sys/ptem.h],,,
+[#if HAVE_SYS_STREAM_H
+#include <sys/stream.h>
+#endif
+])
+
 AC_SYS_POSIX_TERMIOS
 AC_HEADER_TIOCGWINSZ
 
-dnl Checks for typedefs, structures, and compiler characteristics.
+# Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_OFF_T
 AC_TYPE_SIGNAL
 AC_C_CONST
 AC_STRUCT_TM
 
-dnl Checks for function declarations.
-txi_CHECK_DECLS
+# Checks for function declarations.
+AC_CHECK_DECLS([memchr, strcoll, strerror])
 
-dnl Checks for library functions.
+# Checks for library functions.
 AC_FUNC_ALLOCA
 AC_FUNC_STRCOLL
 AC_FUNC_VPRINTF
-dnl in theory only pre-sysvr3 systems needed this and it's not likely
-dnl that anyone compiling new texinfo still has such a thing? we'll see.
-dnl AC_FUNC_SETVBUF_REVERSED
-AC_CHECK_FUNCS(setvbuf getcwd memset bzero strchr sigprocmask sigsetmask)
-dnl strerror, xmalloc, xrealloc, probably others should be added.
-AC_REPLACE_FUNCS(memcpy memmove strdup strcasecmp strerror strncasecmp)
-
-dnl We want to recognize djgpp to avoid the useless warning about no
-dnl term library.
+# in theory only pre-sysvr3 systems needed this and it's not likely
+# that anyone compiling new texinfo still has such a thing? we'll see.
+# AC_FUNC_SETVBUF_REVERSED
+AC_CHECK_FUNCS(bzero getcwd memset setvbuf sigaction sigprocmask \
+               sigsetmask strchr)
+AC_REPLACE_FUNCS(memcpy memmove strdup strerror)
+
+# strcasecmp and strncasecmp, gnulib-style.
+gl_STRCASE
+
+# We want to recognize djgpp to avoid the useless warning about no
+# term library.
 AC_CANONICAL_BUILD
 
+# We need to run some of our own binaries, most notably makedoc, but as
+# long as we have this process, we also use our own makeinfo and
+# install-info.
+# 
+# This means that if we are cross compiling, we have to configure the
+# package twice: once with the native compiler (this is done in a
+# subdirectory $native_tools), and once with the cross compiler.
+# The former is invoked automatically here, with --host=$build.
+# $native_tools is also added to SUBDIRS in the main Makefile.am,
+# so that make compiles the native tools first.
+#
+if test "$cross_compiling" = no; then
+  native_tools=
+else
+  native_tools=tools
+  test -d "$native_tools" || mkdir "$native_tools"
+  confdir=`(cd "$srcdir";pwd)`
+  # Make sure the secondary configure won't fail with
+  # "error: source directory already configured".
+  rm -f config.status
+  AC_MSG_NOTICE([[Doing configure of native tools (${build}).]])
+  cd "$native_tools" || exit 1
+  # Run secondary configure in alternate environment or
+  # it gets the wrong CC etc.  env -i gives this build host configure
+  # a clean environment.
+  env -i CC="${BUILD_CC}" AR="${BUILD_AR}" RANLIB="${BUILD_RANLIB}" \
+      PATH="${PATH}" \
+      tools_only=1 \
+    ${confdir}/configure --build=${build} --host=${build} \
+                         --disable-rpath --disable-nls
+  cd .. || exit 1
+  AC_MSG_NOTICE([[Continuing with main configure (${host}).]])
+fi
+AC_SUBST(native_tools)
+AM_CONDITIONAL(TOOLS_ONLY, [[test "x$tools_only" = x1]])
+
 # Some GNU/Linux systems (e.g., SuSE 4.3, 1996) don't have curses, but
 # rather ncurses.  So we check for it.
 TERMLIBS=
@@ -75,19 +130,19 @@ if test -z "$TERMLIBS" && echo "$build" | grep -v djgpp >/dev/null; then
   AC_MSG_WARN([probably need a terminal library, one of: ${TERMLIB_VARIANTS}])
 fi
 
-dnl Checks for variables.
+# Checks for variables.
 # HP-UX 9 (at least) needs -lncurses which defines termcap variables PC etc.
 AC_MSG_CHECKING(for library with termcap variables)
 AC_CACHE_VAL(ac_cv_var_ospeed,
-oldLIBS=$LIBS 
+oldLIBS=$LIBS
 for trylib in $termlib ${TERMLIB_VARIANTS}; do
    if test "x$trylib" != "x$termlib"; then
      LIBS="$oldLIBS -l$termlib -l$trylib"
    else
      LIBS="$oldLIBS -l$termlib"
    fi
-   AC_TRY_LINK(, 
-#ifdef HAVE_NCURSES_TERMCAP_H
+   AC_TRY_LINK(,
+[#ifdef HAVE_NCURSES_TERMCAP_H
 #include <ncurses/termcap.h>
 #else
 #ifdef HAVE_TERMCAP_H
@@ -96,17 +151,17 @@ for trylib in $termlib ${TERMLIB_VARIANTS}; do
 #undef PC
 char *BC;
 char **UP;
-char PC;      
-short ospeed; 
+char PC;
+short ospeed;
 #endif
 #endif
 /* Make sure all variables actually exist.  AIX 4.3 has ospeed but no BC.
-   --Andreas Ley <andy@rz.uni-karlsruhe.de>, 24 Aug 2000.  */
+   --Andreas Ley <andy@rz.uni-karlsruhe.de> 24 Aug 2000.  */
 BC++;
-UP++
+UP++;
 PC++;
 return ospeed != 0;
-, ac_cv_var_ospeed=$trylib; break)
+], ac_cv_var_ospeed=$trylib; break)
 done
 LIBS=$oldLIBS
 )
@@ -115,20 +170,55 @@ if test -n "$ac_cv_var_ospeed" \
    && test "x$termlib" != "x$ac_cv_var_ospeed"; then
   TERMLIBS="${TERMLIBS} -l${ac_cv_var_ospeed}"
 fi
-AC_SUBST(TERMLIBS)dnl
+AC_SUBST(TERMLIBS)#
+
+# Do not use <ncurses/termcap.h> unless we're linking with ncurses.
+# Must come after the termlib tests.
+if test "x$termlib" = xncurses; then
+  # Use AC_CHECK_HEADERS so the HAVE_*_H symbol gets defined.
+  AC_CHECK_HEADERS(ncurses/termcap.h)
+fi
+
+# gnulib.
+gl_FUNC_MKSTEMP
+
+# For teTeX and TeX Live.
+AC_CANONICAL_HOST
+AC_ARG_ENABLE(multiplatform,
+  [  --enable-multiplatform      put executables in bin/PLATFORM])
+# if enable_multiplatform is set in the environment, use that.
+test "x$enable_multiplatform" = xyes \
+&& test "x$bindir" = 'x${exec_prefix}/bin' \
+&& bindir="$bindir/$host"
+
+# Taken from the example in
+# http://www.gnu.org/software/automake/manual/html_node/Conditionals.html.
+AC_ARG_ENABLE(install-warnings,
+  [  --disable-install-warnings  omit make install warnings about TeX files],
+  [case "${enableval}" in
+     yes) install_warnings=true ;;
+      no) install_warnings=false ;;
+       *) AC_MSG_ERROR(bad value ${enableval} for --enable-install-warnings) ;;
+   esac],
+   [install_warnings=true])
+AM_CONDITIONAL(INSTALL_WARNINGS,
+   test x"$install_warnings" = xtrue || test x"$install_warnings" = xyes)
 
-dnl i18n support.
+# i18n support.  To update to a new version of gettext, run:
+# gettextize -f -c --intl
+AM_GNU_GETTEXT_VERSION(0.14.1)
 AM_GNU_GETTEXT()
 
-AC_CONFIG_FILES([Makefile          \
-           doc/Makefile            \
-           info/Makefile           \
-           intl/Makefile	   \
-           lib/Makefile            \
-           m4/Makefile		   \
-           makeinfo/Makefile       \
-           makeinfo/tests/Makefile \
-           po/Makefile.in	   \
-           util/Makefile           \
-           ])
+AC_CONFIG_FILES([
+  Makefile
+  doc/Makefile
+  info/Makefile
+  intl/Makefile
+  lib/Makefile
+  m4/Makefile
+  makeinfo/Makefile
+  makeinfo/tests/Makefile
+  po/Makefile.in
+  util/Makefile
+])
 AC_OUTPUT
diff --git a/gnu/usr.bin/texinfo/depcomp b/gnu/usr.bin/texinfo/depcomp
index 65899658ee7..11e2d3bfe1c 100644
--- a/gnu/usr.bin/texinfo/depcomp
+++ b/gnu/usr.bin/texinfo/depcomp
@@ -1,7 +1,9 @@
 #! /bin/sh
-
 # depcomp - compile a program generating dependencies as side-effects
-# Copyright 1999, 2000 Free Software Foundation, Inc.
+
+scriptversion=2004-05-31.23
+
+# Copyright (C) 1999, 2000, 2003, 2004 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
@@ -25,13 +27,45 @@
 
 # Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
 
+case $1 in
+  '')
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by `PROGRAMS ARGS'.
+  object      Object file output by `PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputing dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit 0
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit 0
+    ;;
+esac
+
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
 fi
-# `libtool' can also be set to `yes' or `no'.
 
-depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
 tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
 
 rm -f "$tmpdepfile"
@@ -163,19 +197,25 @@ sgi)
 
 aix)
   # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  This file always lives in the current directory.
-  # Also, the AIX compiler puts `$object:' at the start of each line;
-  # $object doesn't have directory information.
-  stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
   tmpdepfile="$stripped.u"
-  outname="$stripped.o"
   if test "$libtool" = yes; then
     "$@" -Wc,-M
   else
     "$@" -M
   fi
-
   stat=$?
+
+  if test -f "$tmpdepfile"; then :
+  else
+    stripped=`echo "$stripped" | sed 's,^.*/,,'`
+    tmpdepfile="$stripped.u"
+  fi
+
   if test $stat -eq 0; then :
   else
     rm -f "$tmpdepfile"
@@ -183,6 +223,7 @@ aix)
   fi
 
   if test -f "$tmpdepfile"; then
+    outname="$stripped.o"
     # Each line is of the form `foo.o: dependent.h'.
     # Do two passes, one to just change these to
     # `$object: dependent.h' and one to simply `dependent.h:'.
@@ -197,37 +238,89 @@ aix)
   rm -f "$tmpdepfile"
   ;;
 
+icc)
+  # Intel's C compiler understands `-MD -MF file'.  However on
+  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # ICC 7.0 will fill foo.d with something like
+  #    foo.o: sub/foo.c
+  #    foo.o: sub/foo.h
+  # which is wrong.  We want:
+  #    sub/foo.o: sub/foo.c
+  #    sub/foo.o: sub/foo.h
+  #    sub/foo.c:
+  #    sub/foo.h:
+  # ICC 7.1 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using \ :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+    sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
 tru64)
-   # The Tru64 AIX compiler uses -MD to generate dependencies as a side
+   # The Tru64 compiler uses -MD to generate dependencies as a side
    # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put 
+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
    # dependencies in `foo.d' instead, so we check for that too.
    # Subdirectories are respected.
+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+   test "x$dir" = "x$object" && dir=
+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
 
-   tmpdepfile1="$object.d"
-   tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` 
    if test "$libtool" = yes; then
+      # Dependencies are output in .lo.d with libtool 1.4.
+      # With libtool 1.5 they are output both in $dir.libs/$base.o.d
+      # and in $dir.libs/$base.o.d and $dir$base.o.d.  We process the
+      # latter, because the former will be cleaned when $dir.libs is
+      # erased.
+      tmpdepfile1="$dir.libs/$base.lo.d"
+      tmpdepfile2="$dir$base.o.d"
+      tmpdepfile3="$dir.libs/$base.d"
       "$@" -Wc,-MD
    else
+      tmpdepfile1="$dir$base.o.d"
+      tmpdepfile2="$dir$base.d"
+      tmpdepfile3="$dir$base.d"
       "$@" -MD
    fi
 
    stat=$?
    if test $stat -eq 0; then :
    else
-      rm -f "$tmpdepfile1" "$tmpdepfile2"
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
       exit $stat
    fi
 
    if test -f "$tmpdepfile1"; then
       tmpdepfile="$tmpdepfile1"
-   else
+   elif test -f "$tmpdepfile2"; then
       tmpdepfile="$tmpdepfile2"
+   else
+      tmpdepfile="$tmpdepfile3"
    fi
    if test -f "$tmpdepfile"; then
       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a space and a tab in the [].
-      sed -e 's,^.*\.[a-z]*:[ 	]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+      # That's a tab and a space in the [].
+      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
    else
       echo "#dummy" > "$depfile"
    fi
@@ -240,34 +333,42 @@ tru64)
 
 dashmstdout)
   # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  test -z "$dashmflag" && dashmflag=-M
-  ( IFS=" "
-    case " $* " in
-    *" --mode=compile "*) # this is libtool, let us make it quiet
-      for arg
-      do # cycle over the arguments
-        case "$arg" in
-	"--mode=compile")
-	  # insert --quiet before "--mode=compile"
-	  set fnord "$@" --quiet
-	  shift # fnord
-	  ;;
-	esac
-	set fnord "$@" "$arg"
-	shift # fnord
-	shift # "$arg"
-      done
+  # always write the preprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
       ;;
     esac
-    "$@" $dashmflag | sed 's:^[^:]*\:[ 	]*:'"$object"'\: :' > "$tmpdepfile"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  # Require at least two characters before searching for `:'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  "$@" $dashmflag |
+    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
   tr ' ' '
@@ -285,36 +386,40 @@ dashXmstdout)
   ;;
 
 makedepend)
-  # X makedepend
-  (
-    shift
-    cleared=no
-    for arg in "$@"; do
-      case $cleared in no)
-        set ""; shift
-	cleared=yes
-      esac
-      case "$arg" in
-        -D*|-I*)
-	  set fnord "$@" "$arg"; shift;;
-	-*)
-	  ;;
-	*)
-	  set fnord "$@" "$arg"; shift;;
-      esac
+  "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
     done
-    obj_suffix="`echo $object | sed 's/^.*\././'`"
-    touch "$tmpdepfile"
-    ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
+    shift
+  fi
+  # X makedepend
+  shift
+  cleared=no
+  for arg in "$@"; do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -*|$object)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix="`echo $object | sed 's/^.*\././'`"
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
-  tail +3 "$tmpdepfile" | tr ' ' '
+  sed '1,2d' "$tmpdepfile" | tr ' ' '
 ' | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
@@ -324,35 +429,39 @@ makedepend)
 
 cpp)
   # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  ( IFS=" "
-    case " $* " in
-    *" --mode=compile "*)
-      for arg
-      do # cycle over the arguments
-        case $arg in
-	"--mode=compile")
-	  # insert --quiet before "--mode=compile"
-	  set fnord "$@" --quiet
-	  shift # fnord
-	  ;;
-	esac
-	set fnord "$@" "$arg"
-	shift # fnord
-	shift # "$arg"
-      done
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
       ;;
     esac
-    "$@" -E |
+  done
+
+  "$@" -E |
     sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
     sed '$ s: \\$::' > "$tmpdepfile"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
   cat < "$tmpdepfile" >> "$depfile"
@@ -362,34 +471,27 @@ cpp)
 
 msvisualcpp)
   # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o,
+  # always write the preprocessed file to stdout, regardless of -o,
   # because we must use -o when running libtool.
-  ( IFS=" "
-    case " $* " in
-    *" --mode=compile "*)
-      for arg
-      do # cycle over the arguments
-        case $arg in
-	"--mode=compile")
-	  # insert --quiet before "--mode=compile"
-	  set fnord "$@" --quiet
-	  shift # fnord
-	  ;;
-	esac
+  "$@" || exit $?
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+	set fnord "$@"
+	shift
+	shift
+	;;
+    *)
 	set fnord "$@" "$arg"
-	shift # fnord
-	shift # "$arg"
-      done
-      ;;
+	shift
+	shift
+	;;
     esac
-    "$@" -E |
-    sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
+  done
+  "$@" -E |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
   . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
@@ -409,3 +511,12 @@ none)
 esac
 
 exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/gnu/usr.bin/texinfo/djgpp/config.bat b/gnu/usr.bin/texinfo/djgpp/config.bat
index c9ca7d55287..3b000ee6dc2 100644
--- a/gnu/usr.bin/texinfo/djgpp/config.bat
+++ b/gnu/usr.bin/texinfo/djgpp/config.bat
@@ -206,6 +206,9 @@ echo Running the ./configure script...
 sh ./configure @arguments

 if errorlevel 1 goto cfg_error

 rm arguments

+

+Rem Remove files created by the gl_FUNC_MKSTEMP test.

+rm co*.tmp

 echo Done.

 goto End

 

diff --git a/gnu/usr.bin/texinfo/djgpp/config.sed b/gnu/usr.bin/texinfo/djgpp/config.sed
index abc6b6f0d3c..c4193df0fbd 100644
--- a/gnu/usr.bin/texinfo/djgpp/config.sed
+++ b/gnu/usr.bin/texinfo/djgpp/config.sed
@@ -22,7 +22,7 @@
   }
 
 # Makefile.in.in is renamed to Makefile.in-in.
-/^ac_config_files=/,/_ACEOF/ {
+/ac_config_files=/,/_ACEOF/ {
   s|po/Makefile\.in|&:po/Makefile.in-in|
 }
 /CONFIG_FILES=/ s|po/Makefile\.in|&:po/Makefile.in-in|2
@@ -51,10 +51,10 @@ s,\.deps,_deps,g
 # the package has not been configured for.
 /MISSING=/,/^$/ {
   /^fi$/ a\
-am_missing_run=`echo "$am_missing_run" | sed 's%/dev.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%'`
+am_missing_run=`echo "$am_missing_run" | sed 's%/dev.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%;s%.:.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%'`
 }
 /^install_sh=/a\
-install_sh=`echo "$install_sh" | sed 's%/dev.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%'`
+install_sh=`echo "$install_sh" | sed 's%/dev.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%;s%.:.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%'`
 
 # The following makes sure we are not going to remove a directory
 # which is the cwd on its drive (DOS doesn't allow to remove such
diff --git a/gnu/usr.bin/texinfo/doc/README b/gnu/usr.bin/texinfo/doc/README
index dc734a6e104..6ff98d637af 100644
--- a/gnu/usr.bin/texinfo/doc/README
+++ b/gnu/usr.bin/texinfo/doc/README
@@ -1,3 +1,12 @@
+$Id: README,v 1.1.1.5 2006/07/17 16:03:51 espie Exp $
+texinfo/doc/README
+
+  Copyright (C) 2002 Free Software Foundation, Inc.
+
+  Copying and distribution of this file, with or without modification,
+  are permitted in any medium without royalty provided the copyright
+  notice and this notice are preserved.
+
 This directory contains documentation on the Texinfo system and the TeX
 sources needed to process Texinfo sources.  We recommend using the
 texi2dvi included in this distribution to run a Texinfo manual through
@@ -23,7 +32,7 @@ ones, you very likely have to update your ls-R file; do this with the
 mktexlsr command.  In older versions, this was named MakeTeXls-R.
 
 You can get the latest texinfo.tex from
-ftp://ftp.gnu.org/gnu/texinfo.tex (and all GNU mirrors)
+ftp://ftp.gnu.org/gnu/texinfo/texinfo.tex (and all GNU mirrors)
 ftp://tug.org/tex/texinfo.tex (and all CTAN mirrors)
 or on the FSF machines in /home/gd/gnu/doc/texinfo.tex.
 If you have problems with the version in this distribution, please check
diff --git a/gnu/usr.bin/texinfo/doc/fdl.texi b/gnu/usr.bin/texinfo/doc/fdl.texi
index 361f90f7bb5..11737cc89bd 100644
--- a/gnu/usr.bin/texinfo/doc/fdl.texi
+++ b/gnu/usr.bin/texinfo/doc/fdl.texi
@@ -3,10 +3,10 @@
 @appendixsec GNU Free Documentation License
 
 @cindex FDL, GNU Free Documentation License
-@center Version 1.1, March 2000
+@center Version 1.2, November 2002
 
 @display
-Copyright @copyright{} 2000 Free Software Foundation, Inc.
+Copyright @copyright{} 2000,2001,2002 Free Software Foundation, Inc.
 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
 
 Everyone is permitted to copy and distribute verbatim copies
@@ -18,12 +18,12 @@ of this license document, but changing it is not allowed.
 PREAMBLE
 
 The purpose of this License is to make a manual, textbook, or other
-written document @dfn{free} in the sense of freedom: to assure everyone
-the effective freedom to copy and redistribute it, with or without
-modifying it, either commercially or noncommercially.  Secondarily,
-this License preserves for the author and publisher a way to get
-credit for their work, while not being considered responsible for
-modifications made by others.
+functional and useful document @dfn{free} in the sense of freedom: to
+assure everyone the effective freedom to copy and redistribute it,
+with or without modifying it, either commercially or noncommercially.
+Secondarily, this License preserves for the author and publisher a way
+to get credit for their work, while not being considered responsible
+for modifications made by others.
 
 This License is a kind of ``copyleft'', which means that derivative
 works of the document must themselves be free in the same sense.  It
@@ -41,57 +41,69 @@ principally for works whose purpose is instruction or reference.
 @item
 APPLICABILITY AND DEFINITIONS
 
-This License applies to any manual or other work that contains a
-notice placed by the copyright holder saying it can be distributed
-under the terms of this License.  The ``Document'', below, refers to any
-such manual or work.  Any member of the public is a licensee, and is
-addressed as ``you''.
+This License applies to any manual or other work, in any medium, that
+contains a notice placed by the copyright holder saying it can be
+distributed under the terms of this License.  Such a notice grants a
+world-wide, royalty-free license, unlimited in duration, to use that
+work under the conditions stated herein.  The ``Document'', below,
+refers to any such manual or work.  Any member of the public is a
+licensee, and is addressed as ``you''.  You accept the license if you
+copy, modify or distribute the work in a way requiring permission
+under copyright law.
 
 A ``Modified Version'' of the Document means any work containing the
 Document or a portion of it, either copied verbatim, or with
 modifications and/or translated into another language.
 
-A ``Secondary Section'' is a named appendix or a front-matter section of
-the Document that deals exclusively with the relationship of the
-publishers or authors of the Document to the Document's overall subject
-(or to related matters) and contains nothing that could fall directly
-within that overall subject.  (For example, if the Document is in part a
-textbook of mathematics, a Secondary Section may not explain any
-mathematics.)  The relationship could be a matter of historical
+A ``Secondary Section'' is a named appendix or a front-matter section
+of the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall
+subject (or to related matters) and contains nothing that could fall
+directly within that overall subject.  (Thus, if the Document is in
+part a textbook of mathematics, a Secondary Section may not explain
+any mathematics.)  The relationship could be a matter of historical
 connection with the subject or with related matters, or of legal,
 commercial, philosophical, ethical or political position regarding
 them.
 
 The ``Invariant Sections'' are certain Secondary Sections whose titles
 are designated, as being those of Invariant Sections, in the notice
-that says that the Document is released under this License.
+that says that the Document is released under this License.  If a
+section does not fit the above definition of Secondary then it is not
+allowed to be designated as Invariant.  The Document may contain zero
+Invariant Sections.  If the Document does not identify any Invariant
+Sections then there are none.
 
 The ``Cover Texts'' are certain short passages of text that are listed,
 as Front-Cover Texts or Back-Cover Texts, in the notice that says that
-the Document is released under this License.
+the Document is released under this License.  A Front-Cover Text may
+be at most 5 words, and a Back-Cover Text may be at most 25 words.
 
 A ``Transparent'' copy of the Document means a machine-readable copy,
 represented in a format whose specification is available to the
-general public, whose contents can be viewed and edited directly and
+general public, that is suitable for revising the document
 straightforwardly with generic text editors or (for images composed of
 pixels) generic paint programs or (for drawings) some widely available
 drawing editor, and that is suitable for input to text formatters or
 for automatic translation to a variety of formats suitable for input
 to text formatters.  A copy made in an otherwise Transparent file
-format whose markup has been designed to thwart or discourage
-subsequent modification by readers is not Transparent.  A copy that is
-not ``Transparent'' is called ``Opaque''.
+format whose markup, or absence of markup, has been arranged to thwart
+or discourage subsequent modification by readers is not Transparent.
+An image format is not Transparent if used for any substantial amount
+of text.  A copy that is not ``Transparent'' is called ``Opaque''.
 
 Examples of suitable formats for Transparent copies include plain
-@sc{ascii} without markup, Texinfo input format, La@TeX{} input format,
-@acronym{SGML} or @acronym{XML} using a publicly available
-@acronym{DTD}, and standard-conforming simple @acronym{HTML} designed
-for human modification.  Opaque formats include PostScript,
-@acronym{PDF}, proprietary formats that can be read and edited only by
-proprietary word processors, @acronym{SGML} or @acronym{XML} for which
-the @acronym{DTD} and/or processing tools are not generally available,
-and the machine-generated @acronym{HTML} produced by some word
-processors for output purposes only.
+@sc{ascii} without markup, Texinfo input format, La@TeX{} input
+format, @acronym{SGML} or @acronym{XML} using a publicly available
+@acronym{DTD}, and standard-conforming simple @acronym{HTML},
+PostScript or @acronym{PDF} designed for human modification.  Examples
+of transparent image formats include @acronym{PNG}, @acronym{XCF} and
+@acronym{JPG}.  Opaque formats include proprietary formats that can be
+read and edited only by proprietary word processors, @acronym{SGML} or
+@acronym{XML} for which the @acronym{DTD} and/or processing tools are
+not generally available, and the machine-generated @acronym{HTML},
+PostScript or @acronym{PDF} produced by some word processors for
+output purposes only.
 
 The ``Title Page'' means, for a printed book, the title page itself,
 plus such following pages as are needed to hold, legibly, the material
@@ -100,6 +112,21 @@ formats which do not have any title page as such, ``Title Page'' means
 the text near the most prominent appearance of the work's title,
 preceding the beginning of the body of the text.
 
+A section ``Entitled XYZ'' means a named subunit of the Document whose
+title either is precisely XYZ or contains XYZ in parentheses following
+text that translates XYZ in another language.  (Here XYZ stands for a
+specific section name mentioned below, such as ``Acknowledgements'',
+``Dedications'', ``Endorsements'', or ``History''.)  To ``Preserve the Title''
+of such a section when you modify the Document means that it remains a
+section ``Entitled XYZ'' according to this definition.
+
+The Document may include Warranty Disclaimers next to the notice which
+states that this License applies to the Document.  These Warranty
+Disclaimers are considered to be included by reference in this
+License, but only as regards disclaiming warranties: any other
+implication that these Warranty Disclaimers may have is void and has
+no effect on the meaning of this License.
+
 @item
 VERBATIM COPYING
 
@@ -119,9 +146,10 @@ you may publicly display copies.
 @item
 COPYING IN QUANTITY
 
-If you publish printed copies of the Document numbering more than 100,
-and the Document's license notice requires Cover Texts, you must enclose
-the copies in covers that carry, clearly and legibly, all these Cover
+If you publish printed copies (or copies in media that commonly have
+printed covers) of the Document, numbering more than 100, and the
+Document's license notice requires Cover Texts, you must enclose the
+copies in covers that carry, clearly and legibly, all these Cover
 Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
 the back cover.  Both covers must also clearly and legibly identify
 you as the publisher of these copies.  The front cover must present
@@ -139,16 +167,15 @@ pages.
 If you publish or distribute Opaque copies of the Document numbering
 more than 100, you must either include a machine-readable Transparent
 copy along with each Opaque copy, or state in or with each Opaque copy
-a publicly-accessible computer-network location containing a complete
-Transparent copy of the Document, free of added material, which the
-general network-using public has access to download anonymously at no
-charge using public-standard network protocols.  If you use the latter
-option, you must take reasonably prudent steps, when you begin
-distribution of Opaque copies in quantity, to ensure that this
-Transparent copy will remain thus accessible at the stated location
-until at least one year after the last time you distribute an Opaque
-copy (directly or through your agents or retailers) of that edition to
-the public.
+a computer-network location from which the general network-using
+public has access to download using public-standard network protocols
+a complete Transparent copy of the Document, free of added material.
+If you use the latter option, you must take reasonably prudent steps,
+when you begin distribution of Opaque copies in quantity, to ensure
+that this Transparent copy will remain thus accessible at the stated
+location until at least one year after the last time you distribute an
+Opaque copy (directly or through your agents or retailers) of that
+edition to the public.
 
 It is requested, but not required, that you contact the authors of the
 Document well before redistributing any large number of copies, to give
@@ -176,7 +203,8 @@ if the original publisher of that version gives permission.
 List on the Title Page, as authors, one or more persons or entities
 responsible for authorship of the modifications in the Modified
 Version, together with at least five of the principal authors of the
-Document (all of its principal authors, if it has less than five).
+Document (all of its principal authors, if it has fewer than five),
+unless they release you from this requirement.
 
 @item
 State on the Title page the name of the publisher of the
@@ -202,10 +230,10 @@ and required Cover Texts given in the Document's license notice.
 Include an unaltered copy of this License.
 
 @item
-Preserve the section entitled ``History'', and its title, and add to
-it an item stating at least the title, year, new authors, and
+Preserve the section Entitled ``History'', Preserve its Title, and add
+to it an item stating at least the title, year, new authors, and
 publisher of the Modified Version as given on the Title Page.  If
-there is no section entitled ``History'' in the Document, create one
+there is no section Entitled ``History'' in the Document, create one
 stating the title, year, authors, and publisher of the Document as
 given on its Title Page, then add an item describing the Modified
 Version as stated in the previous sentence.
@@ -220,10 +248,10 @@ least four years before the Document itself, or if the original
 publisher of the version it refers to gives permission.
 
 @item
-In any section entitled ``Acknowledgments'' or ``Dedications'',
-preserve the section's title, and preserve in the section all the
-substance and tone of each of the contributor acknowledgments
-and/or dedications given therein.
+For any section Entitled ``Acknowledgements'' or ``Dedications'', Preserve
+the Title of the section, and preserve in the section all the
+substance and tone of each of the contributor acknowledgements and/or
+dedications given therein.
 
 @item
 Preserve all the Invariant Sections of the Document,
@@ -231,12 +259,15 @@ unaltered in their text and in their titles.  Section numbers
 or the equivalent are not considered part of the section titles.
 
 @item
-Delete any section entitled ``Endorsements''.  Such a section
+Delete any section Entitled ``Endorsements''.  Such a section
 may not be included in the Modified Version.
 
 @item
-Do not retitle any existing section as ``Endorsements''
-or to conflict in title with any Invariant Section.
+Do not retitle any existing section to be Entitled ``Endorsements'' or
+to conflict in title with any Invariant Section.
+
+@item
+Preserve any Warranty Disclaimers.
 @end enumerate
 
 If the Modified Version includes new front-matter sections or
@@ -246,7 +277,7 @@ of these sections as invariant.  To do this, add their titles to the
 list of Invariant Sections in the Modified Version's license notice.
 These titles must be distinct from any other section titles.
 
-You may add a section entitled ``Endorsements'', provided it contains
+You may add a section Entitled ``Endorsements'', provided it contains
 nothing but endorsements of your Modified Version by various
 parties---for example, statements of peer review or that the text has
 been approved by an organization as the authoritative definition of a
@@ -274,7 +305,7 @@ License, under the terms defined in section 4 above for modified
 versions, provided that you include in the combination all of the
 Invariant Sections of all of the original documents, unmodified, and
 list them all as Invariant Sections of your combined work in its
-license notice.
+license notice, and that you preserve all their Warranty Disclaimers.
 
 The combined work need only contain one copy of this License, and
 multiple identical Invariant Sections may be replaced with a single
@@ -285,11 +316,11 @@ author or publisher of that section if known, or else a unique number.
 Make the same adjustment to the section titles in the list of
 Invariant Sections in the license notice of the combined work.
 
-In the combination, you must combine any sections entitled ``History''
-in the various original documents, forming one section entitled
-``History''; likewise combine any sections entitled ``Acknowledgments'',
-and any sections entitled ``Dedications''.  You must delete all sections
-entitled ``Endorsements.''
+In the combination, you must combine any sections Entitled ``History''
+in the various original documents, forming one section Entitled
+``History''; likewise combine any sections Entitled ``Acknowledgements'',
+and any sections Entitled ``Dedications''.  You must delete all
+sections Entitled ``Endorsements.''
 
 @item
 COLLECTIONS OF DOCUMENTS
@@ -310,18 +341,20 @@ AGGREGATION WITH INDEPENDENT WORKS
 
 A compilation of the Document or its derivatives with other separate
 and independent documents or works, in or on a volume of a storage or
-distribution medium, does not as a whole count as a Modified Version
-of the Document, provided no compilation copyright is claimed for the
-compilation.  Such a compilation is called an ``aggregate'', and this
-License does not apply to the other self-contained works thus compiled
-with the Document, on account of their being thus compiled, if they
-are not themselves derivative works of the Document.
+distribution medium, is called an ``aggregate'' if the copyright
+resulting from the compilation is not used to limit the legal rights
+of the compilation's users beyond what the individual works permit.
+When the Document is included in an aggregate, this License does not
+apply to the other works in the aggregate which are not themselves
+derivative works of the Document.
 
 If the Cover Text requirement of section 3 is applicable to these
-copies of the Document, then if the Document is less than one quarter
-of the entire aggregate, the Document's Cover Texts may be placed on
-covers that surround only the Document within the aggregate.
-Otherwise they must appear on covers around the whole aggregate.
+copies of the Document, then if the Document is less than one half of
+the entire aggregate, the Document's Cover Texts may be placed on
+covers that bracket the Document within the aggregate, or the
+electronic equivalent of covers if the Document is in electronic form.
+Otherwise they must appear on printed covers that bracket the whole
+aggregate.
 
 @item
 TRANSLATION
@@ -332,10 +365,17 @@ Replacing Invariant Sections with translations requires special
 permission from their copyright holders, but you may include
 translations of some or all Invariant Sections in addition to the
 original versions of these Invariant Sections.  You may include a
-translation of this License provided that you also include the
-original English version of this License.  In case of a disagreement
-between the translation and the original English version of this
-License, the original English version will prevail.
+translation of this License, and all the license notices in the
+Document, and any Warranty Disclaimers, provided that you also include
+the original English version of this License and the original versions
+of those notices and disclaimers.  In case of a disagreement between
+the translation and the original version of this License or a notice
+or disclaimer, the original version will prevail.
+
+If a section in the Document is Entitled ``Acknowledgements'',
+``Dedications'', or ``History'', the requirement (section 4) to Preserve
+its Title (section 1) will typically require changing the actual
+title.
 
 @item
 TERMINATION
@@ -378,19 +418,28 @@ license notices just after the title page:
 @group
   Copyright (C)  @var{year}  @var{your name}.
   Permission is granted to copy, distribute and/or modify this document
-  under the terms of the GNU Free Documentation License, Version 1.1
+  under the terms of the GNU Free Documentation License, Version 1.2
   or any later version published by the Free Software Foundation;
-  with the Invariant Sections being @var{list their titles}, with the
-  Front-Cover Texts being @var{list}, and with the Back-Cover Texts being @var{list}.
-  A copy of the license is included in the section entitled ``GNU
+  with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
+  Texts.  A copy of the license is included in the section entitled ``GNU
   Free Documentation License''.
 @end group
 @end smallexample
 
-If you have no Invariant Sections, write ``with no Invariant Sections''
-instead of saying which ones are invariant.  If you have no
-Front-Cover Texts, write ``no Front-Cover Texts'' instead of
-``Front-Cover Texts being @var{list}''; likewise for Back-Cover Texts.
+If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
+replace the ``with...Texts.'' line with this:
+
+@smallexample
+@group
+    with the Invariant Sections being @var{list their titles}, with
+    the Front-Cover Texts being @var{list}, and with the Back-Cover Texts
+    being @var{list}.
+@end group
+@end smallexample
+
+If you have Invariant Sections without Cover Texts, or some other
+combination of the three, merge those two alternatives to suit the
+situation.
 
 If your document contains nontrivial examples of program code, we
 recommend releasing these examples in parallel under your choice of
diff --git a/gnu/usr.bin/texinfo/doc/info.1 b/gnu/usr.bin/texinfo/doc/info.1
index 4f7808ae7c5..39ca1d32ac3 100644
--- a/gnu/usr.bin/texinfo/doc/info.1
+++ b/gnu/usr.bin/texinfo/doc/info.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH INFO "1" "April 2002" "GNU texinfo 4.2" FSF
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.34.
+.TH INFO "1" "December 2004" "info 4.8" "User Commands"
 .SH NAME
 info \- read Info documents
 .SH SYNOPSIS
@@ -34,24 +34,30 @@ specify nodes in first visited Info file.
 output selected nodes to FILENAME.
 .TP
 \fB\-R\fR, \fB\-\-raw\-escapes\fR
-don't remove ANSI escapes from man pages.
+output "raw" ANSI escapes (default).
+.TP
+\fB\-\-no\-raw\-escapes\fR
+output escapes as literal text.
 .TP
 \fB\-\-restore\fR=\fIFILENAME\fR
 read initial keystrokes from FILENAME.
 .TP
 \fB\-O\fR, \fB\-\-show\-options\fR, \fB\-\-usage\fR
-go to command-line options node.
+go to command\-line options node.
 .TP
 \fB\-\-subnodes\fR
 recursively output menu items.
 .TP
+\fB\-w\fR, \fB\-\-where\fR, \fB\-\-location\fR
+print physical location of Info file.
+.TP
 \fB\-\-vi\-keys\fR
-use vi-like and less-like key bindings.
+use vi\-like and less\-like key bindings.
 .TP
 \fB\-\-version\fR
 display version information and exit.
 .PP
-The first non-option argument, if present, is the menu entry to start from;
+The first non\-option argument, if present, is the menu entry to start from;
 it is searched for in all `dir' files along INFOPATH.
 If it is not present, info merges all `dir' files and shows the result.
 Any remaining arguments are treated as the names of menu
@@ -59,10 +65,10 @@ items relative to the initial node visited.
 .SH EXAMPLES
 .TP
 info
-show top-level dir menu
+show top\-level dir menu
 .TP
 info emacs
-start at emacs node from top-level dir
+start at emacs node from top\-level dir
 .TP
 info emacs buffers
 start at buffers node within emacs manual
@@ -73,11 +79,11 @@ start at node with emacs' command line options
 info \fB\-f\fR ./foo.info
 show file ./foo.info, not searching dir
 .SH "REPORTING BUGS"
-Email bug reports to bug-texinfo@gnu.org,
-general questions and discussion to help-texinfo@gnu.org.
+Email bug reports to bug\-texinfo@gnu.org,
+general questions and discussion to help\-texinfo@gnu.org.
 Texinfo home page: http://www.gnu.org/software/texinfo/
 .SH COPYRIGHT
-Copyright \(co 2002 Free Software Foundation, Inc.
+Copyright \(co 2004 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.
diff --git a/gnu/usr.bin/texinfo/doc/info.5 b/gnu/usr.bin/texinfo/doc/info.5
index 0e7eb1dc9cc..8380c536611 100644
--- a/gnu/usr.bin/texinfo/doc/info.5
+++ b/gnu/usr.bin/texinfo/doc/info.5
@@ -1,5 +1,5 @@
 .\" info(5)
-.\" $Id: info.5,v 1.1.1.1 2000/02/09 01:27:23 espie Exp $
+.\" $Id: info.5,v 1.1.1.2 2006/07/17 16:03:58 espie Exp $
 .\"
 .\" Copyright (C) 1998 Free Software Foundation, Inc.
 .\"
diff --git a/gnu/usr.bin/texinfo/doc/install-info.1 b/gnu/usr.bin/texinfo/doc/install-info.1
index a6fb8bf7f14..004d5d0f97d 100644
--- a/gnu/usr.bin/texinfo/doc/install-info.1
+++ b/gnu/usr.bin/texinfo/doc/install-info.1
@@ -1,22 +1,22 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH INSTALL-INFO "1" "April 2002" "GNU texinfo 4.2" FSF
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.34.
+.TH INSTALL-INFO "1" "December 2004" "install-info 4.8" "User Commands"
 .SH NAME
 install-info \- update info/dir entries
 .SH SYNOPSIS
 .B install-info
 [\fIOPTION\fR]... [\fIINFO-FILE \fR[\fIDIR-FILE\fR]]
 .SH DESCRIPTION
-Install or delete dir entries from INFO-FILE in the Info directory file
-DIR-FILE.
+Install or delete dir entries from INFO\-FILE in the Info directory file
+DIR\-FILE.
 .SH OPTIONS
 .TP
 \fB\-\-delete\fR
-delete existing entries for INFO-FILE from DIR-FILE;
+delete existing entries for INFO\-FILE from DIR\-FILE;
 don't insert any new entries.
 .TP
 \fB\-\-dir\-file\fR=\fINAME\fR
 specify file name of Info directory file.
-This is equivalent to using the DIR-FILE argument.
+This is equivalent to using the DIR\-FILE argument.
 .TP
 \fB\-\-entry\fR=\fITEXT\fR
 insert TEXT as an Info directory entry.
@@ -31,7 +31,7 @@ display this help and exit.
 .TP
 \fB\-\-info\-file\fR=\fIFILE\fR
 specify Info file to install in the directory.
-This is equivalent to using the INFO-FILE argument.
+This is equivalent to using the INFO\-FILE argument.
 .TP
 \fB\-\-info\-dir\fR=\fIDIR\fR
 same as \fB\-\-dir\-file\fR=\fIDIR\fR/dir.
@@ -56,11 +56,11 @@ from information in the Info file itself.
 \fB\-\-version\fR
 display version information and exit.
 .SH "REPORTING BUGS"
-Email bug reports to bug-texinfo@gnu.org,
-general questions and discussion to help-texinfo@gnu.org.
+Email bug reports to bug\-texinfo@gnu.org,
+general questions and discussion to help\-texinfo@gnu.org.
 Texinfo home page: http://www.gnu.org/software/texinfo/
 .SH COPYRIGHT
-Copyright \(co 2002 Free Software Foundation, Inc.
+Copyright \(co 2004 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.
diff --git a/gnu/usr.bin/texinfo/doc/makeinfo.1 b/gnu/usr.bin/texinfo/doc/makeinfo.1
index 3500b6817c7..7b46491e0a6 100644
--- a/gnu/usr.bin/texinfo/doc/makeinfo.1
+++ b/gnu/usr.bin/texinfo/doc/makeinfo.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH MAKEINFO "1" "April 2002" "GNU texinfo 4.2" FSF
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.34.
+.TH MAKEINFO "1" "December 2004" "makeinfo 4.8" "User Commands"
 .SH NAME
 makeinfo \- translate Texinfo documents
 .SH SYNOPSIS
@@ -20,7 +20,7 @@ preserve output even if errors.
 display this help and exit.
 .TP
 \fB\-\-no\-validate\fR
-suppress node cross-reference validation.
+suppress node cross\-reference validation.
 .TP
 \fB\-\-no\-warn\fR
 suppress warnings (but not errors).
@@ -36,17 +36,20 @@ display version information and exit.
 .SS "Output format selection (default is to produce Info):"
 .TP
 \fB\-\-docbook\fR
-output DocBook rather than Info.
+output Docbook XML rather than Info.
 .TP
 \fB\-\-html\fR
 output HTML rather than Info.
 .TP
 \fB\-\-xml\fR
-output XML (TexinfoML) rather than Info.
+output Texinfo XML rather than Info.
+.TP
+\fB\-\-plaintext\fR
+output plain text rather than Info.
 .SS "General output options:"
 .TP
 \fB\-E\fR, \fB\-\-macro\-expand\fR FILE
-output macro-expanded source to FILE.
+output macro\-expanded source to FILE.
 ignoring any @setfilename.
 .TP
 \fB\-\-no\-headers\fR
@@ -86,7 +89,17 @@ If VAL is `none', do not indent; if VAL is
 `asis', preserve existing indentation.
 .TP
 \fB\-\-split\-size\fR=\fINUM\fR
-split Info files at size NUM (default 50000).
+split Info files at size NUM (default 300000).
+.SS "Options for HTML:"
+.TP
+\fB\-\-css\-include\fR=\fIFILE\fR
+include FILE in HTML <style> output;
+read stdin if FILE is \-.
+.SS "Options for XML and Docbook:"
+.TP
+\fB\-\-output\-indent\fR=\fIVAL\fR
+indent XML elements by VAL spaces (default 2).
+If VAL is 0, ignorable whitespace is dropped.
 .SS "Input file options:"
 .TP
 \fB\-\-commands\-in\-node\-names\fR
@@ -105,6 +118,10 @@ prepend DIR to the @include search path.
 undefine the variable VAR, as with @clear.
 .SS "Conditional processing in input:"
 .TP
+\fB\-\-ifdocbook\fR
+process @ifdocbook and @docbook even if
+not generating Docbook.
+.TP
 \fB\-\-ifhtml\fR
 process @ifhtml and @html even if not generating HTML.
 .TP
@@ -117,6 +134,12 @@ process @ifplaintext even if not generating plain text.
 \fB\-\-iftex\fR
 process @iftex and @tex; implies \fB\-\-no\-split\fR.
 .TP
+\fB\-\-ifxml\fR
+process @ifxml and @xml.
+.TP
+\fB\-\-no\-ifdocbook\fR
+do not process @ifdocbook and @docbook text.
+.TP
 \fB\-\-no\-ifhtml\fR
 do not process @ifhtml and @html text.
 .TP
@@ -128,11 +151,17 @@ do not process @ifplaintext text.
 .TP
 \fB\-\-no\-iftex\fR
 do not process @iftex and @tex text.
+.TP
+\fB\-\-no\-ifxml\fR
+do not process @ifxml and @xml text.
+.IP
+Also, for the \fB\-\-no\-ifFORMAT\fR options, do process @ifnotFORMAT text.
 .IP
 The defaults for the @if... conditionals depend on the output format:
 if generating HTML, \fB\-\-ifhtml\fR is on and the others are off;
 if generating Info, \fB\-\-ifinfo\fR is on and the others are off;
 if generating plain text, \fB\-\-ifplaintext\fR is on and the others are off;
+if generating XML, \fB\-\-ifxml\fR is on and the others are off.
 .SH EXAMPLES
 .TP
 makeinfo foo.texi
@@ -142,7 +171,7 @@ makeinfo \fB\-\-html\fR foo.texi
 write HTML to @setfilename
 .TP
 makeinfo \fB\-\-xml\fR foo.texi
-write XML to @setfilename
+write Texinfo XML to @setfilename
 .TP
 makeinfo \fB\-\-docbook\fR foo.texi
 write DocBook XML to @setfilename
@@ -154,11 +183,11 @@ makeinfo \fB\-\-html\fR \fB\-\-no\-headers\fR foo.texi write html without node l
 makeinfo \fB\-\-number\-sections\fR foo.texi   write Info with numbered sections
 makeinfo \fB\-\-no\-split\fR foo.texi          write one Info file however big
 .SH "REPORTING BUGS"
-Email bug reports to bug-texinfo@gnu.org,
-general questions and discussion to help-texinfo@gnu.org.
+Email bug reports to bug\-texinfo@gnu.org,
+general questions and discussion to help\-texinfo@gnu.org.
 Texinfo home page: http://www.gnu.org/software/texinfo/
 .SH COPYRIGHT
-Copyright \(co 2002 Free Software Foundation, Inc.
+Copyright \(co 2004 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.
diff --git a/gnu/usr.bin/texinfo/doc/mdate-sh b/gnu/usr.bin/texinfo/doc/mdate-sh
index c079aed3e22..881782eb55e 100644
--- a/gnu/usr.bin/texinfo/doc/mdate-sh
+++ b/gnu/usr.bin/texinfo/doc/mdate-sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 # Get modification time of a file or directory and pretty-print it.
-# Copyright 1995, 1996, 1997 Free Software Foundation, Inc.
+
+scriptversion=2004-12-08.12
+
+# Copyright (C) 1995, 1996, 1997, 2003, 2004 Free Software Foundation, Inc.
 # written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995
 #
 # This program is free software; you can redistribute it and/or modify
@@ -22,6 +25,31 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+case $1 in
+  '')
+     echo "$0: No file.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: mdate-sh [--help] [--version] FILE
+
+Pretty-print the modification time of FILE.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit 0
+    ;;
+  -v | --v*)
+    echo "mdate-sh $scriptversion"
+    exit 0
+    ;;
+esac
+
 # Prevent date giving response in another language.
 LANG=C
 export LANG
@@ -30,24 +58,38 @@ export LC_ALL
 LC_TIME=C
 export LC_TIME
 
-# Get the extended ls output of the file or directory.
-# On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below.
+save_arg1="$1"
+
+# Find out how to get the extended ls output of a file or directory.
 if ls -L /dev/null 1>/dev/null 2>&1; then
-  set - x`ls -L -l -d $1`
+  ls_command='ls -L -l -d'
 else
-  set - x`ls -l -d $1`
+  ls_command='ls -l -d'
 fi
-# The month is at least the fourth argument
-# (3 shifts here, the next inside the loop).
-shift
-shift
-shift
 
-# Find the month.  Next argument is day, followed by the year or time.
+# A `ls -l' line looks as follows on OS/2.
+#  drwxrwx---        0 Aug 11  2001 foo
+# This differs from Unix, which adds ownership information.
+#  drwxrwx---   2 root  root      4096 Aug 11  2001 foo
+#
+# To find the date, we split the line on spaces and iterate on words
+# until we find a month.  This cannot work with files whose owner is a
+# user named `Jan', or `Feb', etc.  However, it's unlikely that `/'
+# will be owned by a user whose name is a month.  So we first look at
+# the extended ls output of the root directory to decide how many
+# words should be skipped to get the date.
+
+# On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below.
+set x`ls -l -d /`
+
+# Find which argument is the month.
 month=
+command=
 until test $month
 do
   shift
+  # Add another shift to the command.
+  command="$command shift;"
   case $1 in
     Jan) month=January; nummonth=1;;
     Feb) month=February; nummonth=2;;
@@ -64,6 +106,28 @@ do
   esac
 done
 
+# Get the extended ls output of the file or directory.
+set x`eval "$ls_command \"\$save_arg1\""`
+
+# Remove all preceding arguments
+eval $command
+
+# Get the month.  Next argument is day, followed by the year or time.
+case $1 in
+  Jan) month=January; nummonth=1;;
+  Feb) month=February; nummonth=2;;
+  Mar) month=March; nummonth=3;;
+  Apr) month=April; nummonth=4;;
+  May) month=May; nummonth=5;;
+  Jun) month=June; nummonth=6;;
+  Jul) month=July; nummonth=7;;
+  Aug) month=August; nummonth=8;;
+  Sep) month=September; nummonth=9;;
+  Oct) month=October; nummonth=10;;
+  Nov) month=November; nummonth=11;;
+  Dec) month=December; nummonth=12;;
+esac
+
 day=$2
 
 # Here we have to deal with the problem that the ls output gives either
@@ -95,3 +159,12 @@ esac
 
 # The result.
 echo $day $month $year
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/gnu/usr.bin/texinfo/doc/stamp-1 b/gnu/usr.bin/texinfo/doc/stamp-1
index cbc67f41b53..32973a788b2 100644
--- a/gnu/usr.bin/texinfo/doc/stamp-1
+++ b/gnu/usr.bin/texinfo/doc/stamp-1
@@ -1,4 +1,4 @@
-@set UPDATED 23 March 2002
-@set UPDATED-MONTH March 2002
-@set EDITION 4.2
-@set VERSION 4.2
+@set UPDATED 14 December 2004
+@set UPDATED-MONTH December 2004
+@set EDITION 4.8
+@set VERSION 4.8
diff --git a/gnu/usr.bin/texinfo/doc/stamp-vti b/gnu/usr.bin/texinfo/doc/stamp-vti
index c21b39a2cb5..ae55f879d47 100644
--- a/gnu/usr.bin/texinfo/doc/stamp-vti
+++ b/gnu/usr.bin/texinfo/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 28 March 2002
-@set UPDATED-MONTH March 2002
-@set EDITION 4.2
-@set VERSION 4.2
+@set UPDATED 29 December 2004
+@set UPDATED-MONTH December 2004
+@set EDITION 4.8
+@set VERSION 4.8
diff --git a/gnu/usr.bin/texinfo/doc/texi2dvi.1 b/gnu/usr.bin/texinfo/doc/texi2dvi.1
index f815bb5c061..fe06b4ae188 100644
--- a/gnu/usr.bin/texinfo/doc/texi2dvi.1
+++ b/gnu/usr.bin/texinfo/doc/texi2dvi.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH TEXI2DVI "1" "April 2002" "GNU Texinfo 4.2 0.51" FSF
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.34.
+.TH TEXI2DVI "1" "December 2004" "texi2dvi 1.34" "User Commands"
 .SH NAME
 texi2dvi \- print Texinfo documents
 .SH SYNOPSIS
@@ -7,7 +7,7 @@ texi2dvi \- print Texinfo documents
 [\fIOPTION\fR]... \fIFILE\fR...
 .SH DESCRIPTION
 Run each Texinfo or LaTeX FILE through TeX in turn until all
-cross-references are resolved, building all indices.  The directory
+cross\-references are resolved, building all indices.  The directory
 containing each FILE is searched for included files.  The suffix of FILE
 is used to determine its language (LaTeX or Texinfo).
 .PP
@@ -44,10 +44,10 @@ display version information and exit successfully
 report on what is done
 .SS "TeX tuning:"
 .TP
--@
+\-@
 use @input instead of \einput; for preloaded Texinfo
 .TP
-\fB\-e\fR, \fB\-\-expand\fR
+\fB\-e\fR, \fB\-E\fR, \fB\-\-expand\fR
 force macro expansion using makeinfo
 .TP
 \fB\-I\fR DIR
@@ -59,19 +59,25 @@ specify the LANG of FILE (LaTeX or Texinfo)
 \fB\-p\fR, \fB\-\-pdf\fR
 use pdftex or pdflatex for processing
 .TP
-\fB\-t\fR, \fB\-\-texinfo\fR=\fICMD\fR
-insert CMD after @setfilename in copy of input file
+\fB\-r\fR, \fB\-\-recode\fR
+call recode before TeX to translate input characters
+.TP
+\fB\-t\fR, \fB\-\-command\fR=\fICMD\fR
+insert CMD in copy of input file
+.TP
+or \fB\-\-texinfo\fR=\fICMD\fR
 multiple values accumulate
 .PP
 The values of the BIBTEX, LATEX (or PDFLATEX), MAKEINDEX, MAKEINFO,
-TEX (or PDFTEX), and TEXINDEX environment variables are used to run
-those commands, if they are set.
+TEX (or PDFTEX), TEXINDEX, and THUMBPDF environment variables are used
+to run those commands, if they are set.  Any CMD strings are added
+after @setfilename for Texinfo input, in the first line for LaTeX input.
 .SH "REPORTING BUGS"
-Email bug reports to <bug-texinfo@gnu.org>,
-general questions and discussion to <help-texinfo@gnu.org>.
+Email bug reports to <bug\-texinfo@gnu.org>,
+general questions and discussion to <help\-texinfo@gnu.org>.
 Texinfo home page: http://www.gnu.org/software/texinfo/
 .SH COPYRIGHT
-Copyright \(co 2002 Free Software Foundation, Inc.
+Copyright \(co 2004 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.
diff --git a/gnu/usr.bin/texinfo/doc/texindex.1 b/gnu/usr.bin/texinfo/doc/texindex.1
index 854fed8c30e..732e12b8874 100644
--- a/gnu/usr.bin/texinfo/doc/texindex.1
+++ b/gnu/usr.bin/texinfo/doc/texindex.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH TEXINDEX "1" "April 2002" "GNU texinfo 4.2" FSF
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.34.
+.TH TEXINDEX "1" "December 2004" "texindex 4.8" "User Commands"
 .SH NAME
 texindex \- sort Texinfo index files
 .SH SYNOPSIS
@@ -25,11 +25,11 @@ send output to FILE
 \fB\-\-version\fR
 display version information and exit
 .SH "REPORTING BUGS"
-Email bug reports to bug-texinfo@gnu.org,
-general questions and discussion to help-texinfo@gnu.org.
+Email bug reports to bug\-texinfo@gnu.org,
+general questions and discussion to help\-texinfo@gnu.org.
 Texinfo home page: http://www.gnu.org/software/texinfo/
 .SH COPYRIGHT
-Copyright \(co 2002 Free Software Foundation, Inc.
+Copyright \(co 2004 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.
diff --git a/gnu/usr.bin/texinfo/doc/texinfo.5 b/gnu/usr.bin/texinfo/doc/texinfo.5
index 68504e38035..83387c5705b 100644
--- a/gnu/usr.bin/texinfo/doc/texinfo.5
+++ b/gnu/usr.bin/texinfo/doc/texinfo.5
@@ -1,7 +1,7 @@
 .\" texinfo(5)
-.\" $Id: texinfo.5,v 1.1.1.1 2000/02/09 01:27:23 espie Exp $
+.\" $Id: texinfo.5,v 1.1.1.2 2006/07/17 16:03:58 espie Exp $
 .\"
-.\" Copyright (C) 1998, 99 Free Software Foundation, Inc.
+.\" Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
 .\"
 .\" Permission is granted to make and distribute verbatim copies of this
 .\" manual provided the copyright notice and this permission notice are
@@ -19,7 +19,7 @@
 .\"
 .TH TEXINFO 5 "GNU Texinfo" "FSF"
 .SH NAME
-Texinfo \- software documentation system
+texinfo \- software documentation system
 .SH DESCRIPTION
 Texinfo is a documentation system that uses a single source file to
 produce both online information and printed output.  It is primarily
diff --git a/gnu/usr.bin/texinfo/doc/txi-cs.tex b/gnu/usr.bin/texinfo/doc/txi-cs.tex
index 9fa05b4afa1..5c9395cfd5d 100644
--- a/gnu/usr.bin/texinfo/doc/txi-cs.tex
+++ b/gnu/usr.bin/texinfo/doc/txi-cs.tex
@@ -1,11 +1,11 @@
-% $Id: txi-cs.tex,v 1.1.1.2 2002/06/10 13:21:49 espie Exp $
+% $Id: txi-cs.tex,v 1.1.1.3 2006/07/17 16:03:58 espie Exp $
 % Czech translation for texinfo.tex.
 %
 % Copyright (C) 1999, 2000 Free Software Foundation.
 % 
 % Authors:
 % Vladimir Michl <Vladimir.Michl@mujweb.cz>
-% Stepan Kasal <kasal@suse.cz>
+% Stepan Kasal <kasal@ucw.cz>
 %
 % 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
@@ -58,9 +58,7 @@
 \gdef\putwordDefspec{Speciální forma}
 \gdef\putwordDefvar{Promìnná}
 \gdef\putwordDefopt{Volby}
-\global\let\putwordDeftypevar\putwordDefvar
 \gdef\putwordDeffunc{Funkce}
-\global\let\putwordDeftypefun\putwordDeffunc
 %
 % Redefine \today to produce Czech
 % preferred dates such as 28. januar 1999.
diff --git a/gnu/usr.bin/texinfo/doc/txi-de.tex b/gnu/usr.bin/texinfo/doc/txi-de.tex
index 4d5b1c63b5f..2b17a24c8f8 100644
--- a/gnu/usr.bin/texinfo/doc/txi-de.tex
+++ b/gnu/usr.bin/texinfo/doc/txi-de.tex
@@ -1,5 +1,5 @@
 % txi-de.tex -- adaptation to German for texinfo.tex.
-% $Id: txi-de.tex,v 1.1.1.1 2000/02/09 01:27:22 espie Exp $
+% $Id: txi-de.tex,v 1.1.1.2 2006/07/17 16:03:58 espie Exp $
 %
 % Copyright (C) 1999 Free Software Foundation, Inc.
 %
@@ -75,9 +75,5 @@
 \gdef\putwordDefvar{Variable}
 %% \defopt
 \gdef\putwordDefopt{Benutzer Option}
-%% \deftypevar
-\gdef\putwordDeftypevar{Variable}
 %% \deffun
 \gdef\putwordDeffunc{Funktion}
-%% \deftypefun
-\gdef\putwordDeftypefun{Funktion}
diff --git a/gnu/usr.bin/texinfo/doc/txi-en.tex b/gnu/usr.bin/texinfo/doc/txi-en.tex
index f972a745317..d788eb9633e 100644
--- a/gnu/usr.bin/texinfo/doc/txi-en.tex
+++ b/gnu/usr.bin/texinfo/doc/txi-en.tex
@@ -1,7 +1,7 @@
 % English non-translation for texinfo.tex.  This is read when a source
 % document says @documentlanguage en (which might happen after another
 % @documentlanguage).  The actual values are the same as defaults.
-% $Id: txi-en.tex,v 1.1.1.1 2000/02/09 01:27:22 espie Exp $
+% $Id: txi-en.tex,v 1.1.1.2 2006/07/17 16:03:58 espie Exp $
 %
 % Copyright (C) 1999 Free Software Foundation.
 %
@@ -56,9 +56,7 @@
 \gdef\putwordDefspec{Special Form}
 \gdef\putwordDefvar{Variable}
 \gdef\putwordDefopt{User Option}
-\gdef\putwordDeftypevar{Variable}
 \gdef\putwordDeffunc{Function}
-\gdef\putwordDeftypefun{Function}
 
 % Produces Day Month Year style of output.
 \def\today{%
diff --git a/gnu/usr.bin/texinfo/doc/txi-es.tex b/gnu/usr.bin/texinfo/doc/txi-es.tex
index 496bd2586ea..334e2d1e109 100644
--- a/gnu/usr.bin/texinfo/doc/txi-es.tex
+++ b/gnu/usr.bin/texinfo/doc/txi-es.tex
@@ -53,8 +53,6 @@
 \gdef\putwordDefivar{Variable de Instancia}
 \gdef\putwordDefvar{Variable}
 \gdef\putwordDefopt{Opci\'on de Usuario}
-\gdef\putwordDeftypevar{Variable}
 \gdef\putwordDeffunc{Funci\'on}
-\gdef\putwordDeftypefun{Funci\'on}
 
 \endinput
diff --git a/gnu/usr.bin/texinfo/doc/txi-fr.tex b/gnu/usr.bin/texinfo/doc/txi-fr.tex
index 2210ac9ce51..da62e1ab9e4 100644
--- a/gnu/usr.bin/texinfo/doc/txi-fr.tex
+++ b/gnu/usr.bin/texinfo/doc/txi-fr.tex
@@ -1,5 +1,5 @@
 % txi-fr.tex -- TeX macros to handle French language for texinfo.tex documents.
-% $Id: txi-fr.tex,v 1.1.1.1 2002/06/10 13:21:49 espie Exp $
+% $Id: txi-fr.tex,v 1.1.1.2 2006/07/17 16:03:58 espie Exp $
 %
 % Copyright (C) 1999 Free Software Foundation.
 %
@@ -59,9 +59,7 @@
 \gdef\putwordDefspec{Forme Sp\'eciale}
 \gdef\putwordDefvar{Variable}
 \gdef\putwordDefopt{Option de l'usager}
-\gdef\putwordDeftypevar{Variable}
 \gdef\putwordDeffunc{Fonction}
-\gdef\putwordDeftypefun{Fonction}
 
 % Produces Day Month Year style of output.
 % French datation - for instance: 10 janvier 2000.
diff --git a/gnu/usr.bin/texinfo/doc/txi-it.tex b/gnu/usr.bin/texinfo/doc/txi-it.tex
new file mode 100644
index 00000000000..19fb396647e
--- /dev/null
+++ b/gnu/usr.bin/texinfo/doc/txi-it.tex
@@ -0,0 +1,69 @@
+% English non-translation for texinfo.tex.  This is read when a source
+% document says @documentlanguage en (which might happen after another
+% @documentlanguage).  The actual values are the same as defaults.
+% $Id: txi-it.tex,v 1.1.1.1 2006/07/17 16:03:58 espie Exp $
+%
+% Copyright (C) 1999 Free Software Foundation.
+%
+% 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 of the License, 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.
+
+\gdef\putwordAppendix{Appendice}
+\gdef\putwordChapter{Capitolo}
+\gdef\putwordfile{file}
+\gdef\putwordin{in}
+\gdef\putwordIndexIsEmpty{(L'indice \'e vuoto)}
+\gdef\putwordIndexNonexistent{(L'indice non esiste)}
+\gdef\putwordInfo{Info}
+\gdef\putwordInstanceVariableof{Variabile di istanza di}
+\gdef\putwordMethodon{Metodo di}
+\gdef\putwordNoTitle{Nessun titolo}
+\gdef\putwordof{di}
+\gdef\putwordon{su}
+\gdef\putwordpage{pagina}
+\gdef\putwordsection{sezione}
+\gdef\putwordSection{Sezione}
+\gdef\putwordsee{vedi}
+\gdef\putwordSee{Vedi}
+\gdef\putwordShortTOC{Sommario abbreviato}
+\gdef\putwordTOC{Sommario}
+%
+\gdef\putwordMJan{Gennaio}
+\gdef\putwordMFeb{Febbraio}
+\gdef\putwordMMar{Marzo}
+\gdef\putwordMApr{Aprile}
+\gdef\putwordMMay{Maggio}
+\gdef\putwordMJun{Giugno}
+\gdef\putwordMJul{Luglio}
+\gdef\putwordMAug{Agosto}
+\gdef\putwordMSep{Settembre}
+\gdef\putwordMOct{Ottobre}
+\gdef\putwordMNov{Novembre}
+\gdef\putwordMDec{Dicembre}
+%
+\gdef\putwordDefmac{Macro}
+\gdef\putwordDefspec{Forma speciale}
+\gdef\putwordDefvar{Variabile}
+\gdef\putwordDefopt{Opzione}
+\gdef\putwordDeffunc{Funzione}
+
+% Produces Day Month Year style of output.
+\def\today{%
+  \number\day\space
+  \ifcase\month
+  \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr
+  \or\putwordMMay\or\putwordMJun\or\putwordMJul\or\putwordMAug
+  \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec
+  \fi
+  \space\number\year}
diff --git a/gnu/usr.bin/texinfo/doc/txi-nl.tex b/gnu/usr.bin/texinfo/doc/txi-nl.tex
index 65b9d05ff73..075d47d2c6f 100644
--- a/gnu/usr.bin/texinfo/doc/txi-nl.tex
+++ b/gnu/usr.bin/texinfo/doc/txi-nl.tex
@@ -1,5 +1,5 @@
 % Dutch translation for texinfo.tex.  
-% $Id: txi-nl.tex,v 1.1.1.1 2000/02/09 01:27:22 espie Exp $
+% $Id: txi-nl.tex,v 1.1.1.2 2006/07/17 16:03:58 espie Exp $
 %
 % Copyright (C) 1999 Free Software Foundation.
 %
@@ -55,9 +55,7 @@
 \gdef\putwordDefspec{Speciale Vorm}
 \gdef\putwordDefvar{Variabele}
 \gdef\putwordDefopt{Gebruikers optie}
-\gdef\putwordDeftypevar{Variabele}
 \gdef\putwordDeffunc{Functie}
-\gdef\putwordDeftypefun{Functie}
 
 % Produces Day Month Year style of output.
 \def\today{%
diff --git a/gnu/usr.bin/texinfo/doc/txi-no.tex b/gnu/usr.bin/texinfo/doc/txi-no.tex
index aa538d6b551..a4e589382ed 100644
--- a/gnu/usr.bin/texinfo/doc/txi-no.tex
+++ b/gnu/usr.bin/texinfo/doc/txi-no.tex
@@ -54,9 +54,7 @@
 \gdef\putwordDefivar{Forekomstvariabel}
 \gdef\putwordDefvar{Variabel}
 \gdef\putwordDefopt{Brukervalg}
-\gdef\putwordDeftypevar{Variabel}
 \gdef\putwordDeffunc{Funksjon}
-\gdef\putwordDeftypefun{Funksjon}
 %
 % Redefine \today to produce Norwegian
 % preferred dates such as 28. januar 1999.
diff --git a/gnu/usr.bin/texinfo/doc/txi-pl.tex b/gnu/usr.bin/texinfo/doc/txi-pl.tex
new file mode 100644
index 00000000000..2df91d0e795
--- /dev/null
+++ b/gnu/usr.bin/texinfo/doc/txi-pl.tex
@@ -0,0 +1,73 @@
+% txi-pl.tex -- adaptation to Polish for texinfo.tex.
+% $Id: txi-pl.tex,v 1.1.1.1 2006/07/17 16:03:58 espie Exp $
+%
+% Copyright (C) 2003 Free Software Foundation.
+%
+% 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 of the License, 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.
+%
+% Written by Wojciech Polak <polak@gnu.org> on 29-03-2003.
+% Modified by Staszek Wawrykiewicz <staw@gust.org.pl> on 01-04-2003.
+%
+\prefixing
+\gdef\putwordAppendix{Suplement}
+\gdef\putwordChapter{Rozdzia/l}
+\gdef\putwordfile{plik}
+\gdef\putwordin{w}
+\gdef\putwordIndexIsEmpty{(Skorowidz jest pusty)}
+\gdef\putwordIndexNonexistent{(Brak skorowidza)}
+\gdef\putwordInfo{Info}
+\gdef\putwordInstanceVariableof{Przyk/ladowa zmienna}
+\gdef\putwordMethodon{Metoda}
+\gdef\putwordNoTitle{Brak tytu/lu}
+\gdef\putwordof{z}
+\gdef\putwordon{na}
+\gdef\putwordpage{strona}
+\gdef\putwordsection{cz/e/s/c}
+\gdef\putwordSection{Cz/e/s/c}
+\gdef\putwordsee{zobacz}
+\gdef\putwordSee{Zobacz}
+\gdef\putwordShortTOC{Kr/otka zawarto/s/c}
+\gdef\putwordTOC{Spis tre/sci}
+%
+\gdef\putwordMJan{stycznia}
+\gdef\putwordMFeb{lutego}
+\gdef\putwordMMar{marca}
+\gdef\putwordMApr{kwietnia}
+\gdef\putwordMMay{maja}
+\gdef\putwordMJun{czerwca}
+\gdef\putwordMJul{lipca}
+\gdef\putwordMAug{sierpnia}
+\gdef\putwordMSep{wrze/snia}
+\gdef\putwordMOct{pa/xdziernika}
+\gdef\putwordMNov{listopada}
+\gdef\putwordMDec{grudnia}
+%
+\gdef\putwordDefmac{Makro}
+\gdef\putwordDefspec{Specjalna forma}
+\gdef\putwordDefvar{Zmienna}
+\gdef\putwordDefopt{Opcja u/zytkownika}
+\gdef\putwordDeffunc{Funkcja}
+\nonprefixing
+%
+% Produces Day Month Year style of output.
+%
+\def\today{%
+  \number\day\space
+  \ifcase\month
+  \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr
+  \or\putwordMMay\or\putwordMJun\or\putwordMJul\or\putwordMAug
+  \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec
+  \fi
+  \space\number\year}
diff --git a/gnu/usr.bin/texinfo/doc/txi-pt.tex b/gnu/usr.bin/texinfo/doc/txi-pt.tex
index 4f4530b3df5..c65bc5e1d5a 100644
--- a/gnu/usr.bin/texinfo/doc/txi-pt.tex
+++ b/gnu/usr.bin/texinfo/doc/txi-pt.tex
@@ -65,9 +65,5 @@
 \gdef\putwordDefvar{Vari\'avel}
 %% \defopt
 \gdef\putwordDefopt{Op\,c\~ao de Usu\'ario}
-%% \deftypevar
-\gdef\putwordDeftypevar{Vari\'avel}
 %% \deffun
 \gdef\putwordDeffunc{Fun\,c\~ao}
-%% \deftypefun
-\gdef\putwordDeftypefun{Fun\,c\~ao}
diff --git a/gnu/usr.bin/texinfo/doc/txi-tr.tex b/gnu/usr.bin/texinfo/doc/txi-tr.tex
new file mode 100644
index 00000000000..e106cd098b5
--- /dev/null
+++ b/gnu/usr.bin/texinfo/doc/txi-tr.tex
@@ -0,0 +1,82 @@
+% txi-en.tex -- adaptation to Turkish for texinfo.tex.
+% $Id: txi-tr.tex,v 1.1.1.1 2006/07/17 16:03:58 espie Exp $
+%
+% Copyright (C) 2003 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.
+%
+% Written by Alper Ersoy, 5 January 2003, <aersoy@tfz.net>
+%
+%%
+%% Turkish translations of the used words.
+%%
+%%
+\gdef\putwordAppendix{Ek}
+\gdef\putwordChapter{Kesim}
+\gdef\putwordfile{dosya}
+\gdef\putwordInfo{Bilgi}
+\gdef\putwordpage{Sayfa}
+\gdef\putwordsection{b\"ol\"um}
+\gdef\putwordSection{B\"ol\"um}
+\gdef\putwordsee{bkz.}
+\gdef\putwordSee{Bkz.}
+\gdef\putwordShortTOC{\dotaccent{I}\,cindekiler (K\dotless{i}saca)}
+\gdef\putwordTOC{\dotaccent{I}\,cindekiler}
+%%
+%% This one really sucks :\
+\gdef\putwordMethodon{S\dotless{i}n\dotless{i}f:}
+%%
+%% I could not translate these ones, need examples :\
+%% If anybody out there is using these in turkish, please
+%% don't hesitate to send me patches ;)
+\gdef\putwordin{in}
+\gdef\putwordon{on}
+\gdef\putwordof{of}
+%%
+%%
+\gdef\putwordNoTitle{Ba\,sl\dotless{i}s\dotless{i}z}
+\gdef\putwordIndexNonexistent{(Dizin bulunmamakta)}
+\gdef\putwordIndexIsEmpty{(Dizin bo\,s)}
+%%
+%% Months
+\gdef\putwordMJan{Ocak}
+\gdef\putwordMFeb{\,Subat}
+\gdef\putwordMMar{Mart}
+\gdef\putwordMApr{Nisan}
+\gdef\putwordMMai{May\dotless{i}s}
+\gdef\putwordMJun{Haziran}
+\gdef\putwordMJul{Temmuz}
+\gdef\putwordMAug{A\u{g}ustos}
+\gdef\putwordMSep{Eyl\"ul}
+\gdef\putwordMOct{Ekim}
+\gdef\putwordMNov{Kas\dotless{i}m}
+\gdef\putwordMDec{Aral\dotless{i}k}
+%%
+%% Definitions
+\gdef\putwordDefmac{Makro}
+\gdef\putwordDefspec{\"Ozel Yap\dotless{i}}
+\gdef\putwordDefopt{Se\,cenek}
+\gdef\putwordDefvar{De\u{g}i\,sken}
+\gdef\putwordDeffunc{Fonksiyon}
+%%
+% Produces Day Month Year style of output.
+\def\today{%
+  \number\day\space
+  \ifcase\month
+  \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr
+  \or\putwordMMay\or\putwordMJun\or\putwordMJul\or\putwordMAug
+  \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec
+  \fi
+  \space\number\year}
diff --git a/gnu/usr.bin/texinfo/doc/version-stnd.texi b/gnu/usr.bin/texinfo/doc/version-stnd.texi
index cbc67f41b53..32973a788b2 100644
--- a/gnu/usr.bin/texinfo/doc/version-stnd.texi
+++ b/gnu/usr.bin/texinfo/doc/version-stnd.texi
@@ -1,4 +1,4 @@
-@set UPDATED 23 March 2002
-@set UPDATED-MONTH March 2002
-@set EDITION 4.2
-@set VERSION 4.2
+@set UPDATED 14 December 2004
+@set UPDATED-MONTH December 2004
+@set EDITION 4.8
+@set VERSION 4.8
diff --git a/gnu/usr.bin/texinfo/doc/version.texi b/gnu/usr.bin/texinfo/doc/version.texi
index c21b39a2cb5..ae55f879d47 100644
--- a/gnu/usr.bin/texinfo/doc/version.texi
+++ b/gnu/usr.bin/texinfo/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 28 March 2002
-@set UPDATED-MONTH March 2002
-@set EDITION 4.2
-@set VERSION 4.2
+@set UPDATED 29 December 2004
+@set UPDATED-MONTH December 2004
+@set EDITION 4.8
+@set VERSION 4.8
diff --git a/gnu/usr.bin/texinfo/info/README b/gnu/usr.bin/texinfo/info/README
index 5cc0791c06b..9e9c18d8a85 100644
--- a/gnu/usr.bin/texinfo/info/README
+++ b/gnu/usr.bin/texinfo/info/README
@@ -1,3 +1,12 @@
+$Id: README,v 1.1.1.5 2006/07/17 16:03:41 espie Exp $
+texinfo/info/README
+
+  Copyright (C) 2002 Free Software Foundation, Inc.
+
+  Copying and distribution of this file, with or without modification,
+  are permitted in any medium without royalty provided the copyright
+  notice and this notice are preserved.
+
 Info 2.0 is a complete rewrite of the original standalone Info I wrote in
 1987, the first program I wrote for rms.  That program was something like
 my second Unix program ever, and my die-hard machine language coding habits
diff --git a/gnu/usr.bin/texinfo/info/doc.h b/gnu/usr.bin/texinfo/info/doc.h
index 280551f360d..7323c9b46b3 100644
--- a/gnu/usr.bin/texinfo/info/doc.h
+++ b/gnu/usr.bin/texinfo/info/doc.h
@@ -1,7 +1,7 @@
 /* doc.h -- Structures associating function pointers with documentation.
-   $Id: doc.h,v 1.1.1.3 2002/06/10 13:21:02 espie Exp $
+   $Id: doc.h,v 1.1.1.4 2006/07/17 16:03:42 espie Exp $
 
-   Copyright (C) 1993, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001, 2004 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
@@ -66,15 +66,6 @@ typedef struct
 
 extern FUNCTION_DOC function_doc_array[];
 
-extern char *function_documentation ();
-extern char *key_documentation ();
-extern char *pretty_keyname ();
-extern char *pretty_keyseq ();
-extern char *where_is ();
-extern char *replace_in_documentation ();
-extern void info_document_key ();
-extern void dump_map_to_message_buffer ();
-
 /* Under the old key-binding system, an info command is specified by
    the pointer to its function.  Under the new INFOKEY binding system, 
    it is specified by a pointer to the command's FUNCTION_DOC structure,
@@ -82,7 +73,9 @@ extern void dump_map_to_message_buffer ();
    easily divined using the InfoFunction() extractor.  */
 #if defined(INFOKEY)
 typedef FUNCTION_DOC InfoCommand;
-#define InfoFunction(ic) ((ic) ? (ic)->func : NULL)
+/* The cast to VFunction * prevents pgcc from complaining about
+   dereferencing a void *.  */
+#define InfoFunction(ic) ((ic) ? (ic)->func : (VFunction *) NULL)
 #define InfoCmd(fn) (&function_doc_array[A_##fn])
 #define DocInfoCmd(fd) ((fd) && (fd)->func ? (fd) : NULL)
 #else /* !INFOKEY */
@@ -92,8 +85,19 @@ typedef VFunction InfoCommand;
 #define DocInfoCmd(fd) ((fd)->func)
 #endif /* !INFOKEY */
 
+#include "infomap.h" /* for Keymap.  */
+
 #if defined (NAMED_FUNCTIONS)
-extern char *function_name ();
-extern InfoCommand *named_function ();
+extern char *function_name (InfoCommand *cmd);
+extern InfoCommand *named_function (char *name);
 #endif /* NAMED_FUNCTIONS */
+
+extern char *function_documentation (InfoCommand *cmd);
+extern char *key_documentation (char key, Keymap map);
+extern char *pretty_keyname (unsigned char key);
+extern char *pretty_keyseq (char *keyseq);
+extern char *where_is (Keymap map, InfoCommand *cmd);
+extern char *replace_in_documentation (char *string, int help_is_only_window_p);
+extern void dump_map_to_message_buffer (char *prefix, Keymap map);
+
 #endif /* !DOC_H */
diff --git a/gnu/usr.bin/texinfo/info/dribble.c b/gnu/usr.bin/texinfo/info/dribble.c
index c4b5b9fd3f6..1461c41f105 100644
--- a/gnu/usr.bin/texinfo/info/dribble.c
+++ b/gnu/usr.bin/texinfo/info/dribble.c
@@ -1,6 +1,7 @@
 /* dribble.c -- dribble files for Info.
+   $Id: dribble.c,v 1.1.1.4 2006/07/17 16:03:42 espie Exp $
 
-   Copyright (C) 1993, 98 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1998, 2004 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
@@ -28,8 +29,7 @@ FILE *info_dribble_file = (FILE *)NULL;
 /* Open a dribble file named NAME, perhaps closing an already open one.
    This sets the global variable INFO_DRIBBLE_FILE to the open stream. */
 void
-open_dribble_file (name)
-     char *name;
+open_dribble_file (char *name)
 {
   /* Perhaps close existing dribble file. */
   close_dribble_file ();
@@ -49,7 +49,7 @@ open_dribble_file (name)
 
 /* If there is a dribble file already open, close it. */
 void
-close_dribble_file ()
+close_dribble_file (void)
 {
   if (info_dribble_file)
     {
@@ -61,8 +61,7 @@ close_dribble_file ()
 
 /* Write some output to our existing dribble file. */
 void
-dribble (byte)
-     unsigned char byte;
+dribble (unsigned char byte)
 {
   if (info_dribble_file)
     fwrite (&byte, sizeof (unsigned char), 1, info_dribble_file);
diff --git a/gnu/usr.bin/texinfo/info/dribble.h b/gnu/usr.bin/texinfo/info/dribble.h
index 5647b40529e..f30f2040d8e 100644
--- a/gnu/usr.bin/texinfo/info/dribble.h
+++ b/gnu/usr.bin/texinfo/info/dribble.h
@@ -3,7 +3,7 @@
 /* This file is part of GNU Info, a program for reading online documentation
    stored in Info format.
 
-   Copyright (C) 1993 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2004 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
@@ -30,12 +30,12 @@ extern FILE *info_dribble_file;
 
 /* Open a dribble file named NAME, perhaps closing an already open one.
    This sets the global variable INFO_DRIBBLE_FILE to the open stream. */
-extern void open_dribble_file ();
+extern void open_dribble_file (char *name);
 
 /* If there is a dribble file already open, close it. */
-extern void close_dribble_file ();
+extern void close_dribble_file (void);
 
 /* Write some output to our existing dribble file. */
-extern void dribble ();
+extern void dribble (unsigned char byte);
 
 #endif /* !_DRIBBLE_H_ */
diff --git a/gnu/usr.bin/texinfo/info/gc.c b/gnu/usr.bin/texinfo/info/gc.c
index 1c868ba3284..9c78d4f3f1d 100644
--- a/gnu/usr.bin/texinfo/info/gc.c
+++ b/gnu/usr.bin/texinfo/info/gc.c
@@ -1,9 +1,7 @@
-/* gc.c -- Functions to remember and garbage collect unused node contents. */
+/* gc.c -- Functions to remember and garbage collect unused node contents.
+   $Id: gc.c,v 1.1.1.3 2006/07/17 16:03:42 espie Exp $
 
-/* This file is part of GNU Info, a program for reading online documentation
-   stored in Info format.
-
-   Copyright (C) 1993 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2004 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,8 +32,7 @@ static int gcable_pointers_slots = 0;
    is not actually garbage collected until no info window contains a node
    whose contents member is equal to the pointer. */
 void
-add_gcable_pointer (pointer)
-     char *pointer;
+add_gcable_pointer (char *pointer)
 {
   gc_pointers ();
   add_pointer_to_array (pointer, gcable_pointers_index, gcable_pointers,
@@ -45,7 +42,7 @@ add_gcable_pointer (pointer)
 /* Grovel the list of info windows and gc-able pointers finding those
    node->contents which are collectible, and free them. */
 void
-gc_pointers ()
+gc_pointers (void)
 {
   register int i, j, k;
   INFO_WINDOW *iw;
diff --git a/gnu/usr.bin/texinfo/info/info-utils.c b/gnu/usr.bin/texinfo/info/info-utils.c
index 50010cf84f6..3a08c28ab9b 100644
--- a/gnu/usr.bin/texinfo/info/info-utils.c
+++ b/gnu/usr.bin/texinfo/info/info-utils.c
@@ -1,7 +1,7 @@
 /* info-utils.c -- miscellanous.
-   $Id: info-utils.c,v 1.1.1.4 2002/06/10 13:21:04 espie Exp $
+   $Id: info-utils.c,v 1.1.1.5 2006/07/17 16:03:43 espie Exp $
 
-   Copyright (C) 1993, 98 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1998, 2003, 2004 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
@@ -17,7 +17,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Written by Brian Fox (bfox@ai.mit.edu). */
+   Originally written by Brian Fox (bfox@ai.mit.edu). */
 
 #include "info.h"
 #include "info-utils.h"
@@ -37,12 +37,19 @@ char *info_parsed_filename = (char *)NULL;
    calling info_parse_xxx (). */
 char *info_parsed_nodename = (char *)NULL;
 
+/* Variable which holds the most recent line number parsed as a result of
+   calling info_parse_xxx (). */
+int info_parsed_line_number = 0;
+
 /* Functions to remember a filename or nodename for later return. */
-static void save_filename (), saven_filename ();
-static void save_nodename (), saven_nodename ();
+static void save_filename (char *filename);
+static void saven_filename (char *filename, int len);
+static void save_nodename (char *nodename);
+static void saven_nodename (char *nodename, int len);
 
 /* How to get a reference (either menu or cross). */
-static REFERENCE **info_references_internal ();
+static REFERENCE **info_references_internal (char *label,
+    SEARCH_BINDING *binding);
 
 /* Parse the filename and nodename out of STRING.  If STRING doesn't
    contain a filename (i.e., it is NOT (FILENAME)NODENAME) then set
@@ -50,9 +57,7 @@ static REFERENCE **info_references_internal ();
    non-zero, it says to allow the nodename specification to cross a
    newline boundary (i.e., only `,', `.', or `TAB' can end the spec). */
 void
-info_parse_node (string, newlines_okay)
-     char *string;
-     int newlines_okay;
+info_parse_node (char *string, int newlines_okay)
 {
   register int i = 0;
 
@@ -96,6 +101,37 @@ info_parse_node (string, newlines_okay)
       free (info_parsed_nodename);
       info_parsed_nodename = (char *)NULL;
     }
+
+  /* Parse ``(line ...)'' part of menus, if any.  */
+  {
+    char *rest = string + i;
+
+    /* Advance only if it's not already at end of string.  */
+    if (*rest)
+      rest++;
+
+    /* Skip any whitespace first, and then a newline in case the item
+       was so long to contain the ``(line ...)'' string in the same
+       physical line.  */
+    while (whitespace(*rest))
+      rest++;
+    if (*rest == '\n')
+      {
+        rest++;
+        while (whitespace(*rest))
+          rest++;
+      }
+
+    /* Are we looking at an opening parenthesis?  That can only mean
+       we have a winner. :)  */
+    if (strncmp (rest, "(line ", strlen ("(line ")) == 0)
+      {
+        rest += strlen ("(line ");
+        info_parsed_line_number = strtol (rest, NULL, 0);
+      }
+    else
+      info_parsed_line_number = 0;
+  }
 }
 
 /* Return the node addressed by LABEL in NODE (usually one of "Prev:",
@@ -103,9 +139,7 @@ info_parse_node (string, newlines_okay)
    the global INFO_PARSED_NODENAME and INFO_PARSED_FILENAME contain
    the information. */
 void
-info_parse_label (label, node)
-     char *label;
-     NODE *node;
+info_parse_label (char *label, NODE *node)
 {
   register int i;
   char *nodeline;
@@ -135,30 +169,29 @@ info_parse_label (label, node)
 /* Return a NULL terminated array of REFERENCE * which represents the menu
    found in NODE.  If there is no menu in NODE, just return a NULL pointer. */
 REFERENCE **
-info_menu_of_node (node)
-     NODE *node;
+info_menu_of_node (NODE *node)
 {
   long position;
-  SEARCH_BINDING search;
+  SEARCH_BINDING tmp_search;
   REFERENCE **menu = (REFERENCE **)NULL;
 
-  search.buffer = node->contents;
-  search.start = 0;
-  search.end = node->nodelen;
-  search.flags = S_FoldCase;
+  tmp_search.buffer = node->contents;
+  tmp_search.start = 0;
+  tmp_search.end = node->nodelen;
+  tmp_search.flags = S_FoldCase;
 
   /* Find the start of the menu. */
-  position = search_forward (INFO_MENU_LABEL, &search);
+  position = search_forward (INFO_MENU_LABEL, &tmp_search);
 
   if (position == -1)
     return ((REFERENCE **) NULL);
 
   /* We have the start of the menu now.  Glean menu items from the rest
      of the node. */
-  search.start = position + strlen (INFO_MENU_LABEL);
-  search.start += skip_line (search.buffer + search.start);
-  search.start--;
-  menu = info_menu_items (&search);
+  tmp_search.start = position + strlen (INFO_MENU_LABEL);
+  tmp_search.start += skip_line (tmp_search.buffer + tmp_search.start);
+  tmp_search.start--;
+  menu = info_menu_items (&tmp_search);
   return (menu);
 }
 
@@ -166,30 +199,28 @@ info_menu_of_node (node)
    refrences found in NODE.  If there are no cross references in NODE, just
    return a NULL pointer. */
 REFERENCE **
-info_xrefs_of_node (node)
-     NODE *node;
+info_xrefs_of_node (NODE *node)
 {
-  SEARCH_BINDING search;
+  SEARCH_BINDING tmp_search;
 
 #if defined (HANDLE_MAN_PAGES)
   if (node->flags & N_IsManPage)
     return (xrefs_of_manpage (node));
 #endif
 
-  search.buffer = node->contents;
-  search.start = 0;
-  search.end = node->nodelen;
-  search.flags = S_FoldCase;
+  tmp_search.buffer = node->contents;
+  tmp_search.start = 0;
+  tmp_search.end = node->nodelen;
+  tmp_search.flags = S_FoldCase;
 
-  return (info_xrefs (&search));
+  return (info_xrefs (&tmp_search));
 }
 
 /* Glean menu entries from BINDING->buffer + BINDING->start until we
    have looked at the entire contents of BINDING.  Return an array
    of REFERENCE * that represents each menu item in this range. */
 REFERENCE **
-info_menu_items (binding)
-     SEARCH_BINDING *binding;
+info_menu_items (SEARCH_BINDING *binding)
 {
   return (info_references_internal (INFO_MENU_ENTRY_LABEL, binding));
 }
@@ -198,8 +229,7 @@ info_menu_items (binding)
    BINDING->end.  Return an array of REFERENCE * that represents each
    cross reference in this range. */
 REFERENCE **
-info_xrefs (binding)
-     SEARCH_BINDING *binding;
+info_xrefs (SEARCH_BINDING *binding)
 {
   return (info_references_internal (INFO_XREF_LABEL, binding));
 }
@@ -207,33 +237,31 @@ info_xrefs (binding)
 /* Glean cross references or menu items from BINDING.  Return an array
    of REFERENCE * that represents the items found. */
 static REFERENCE **
-info_references_internal (label, binding)
-     char *label;
-     SEARCH_BINDING *binding;
+info_references_internal (char *label, SEARCH_BINDING *binding)
 {
-  SEARCH_BINDING search;
+  SEARCH_BINDING tmp_search;
   REFERENCE **refs = (REFERENCE **)NULL;
   int refs_index = 0, refs_slots = 0;
   int searching_for_menu_items = 0;
   long position;
 
-  search.buffer = binding->buffer;
-  search.start = binding->start;
-  search.end = binding->end;
-  search.flags = S_FoldCase | S_SkipDest;
+  tmp_search.buffer = binding->buffer;
+  tmp_search.start = binding->start;
+  tmp_search.end = binding->end;
+  tmp_search.flags = S_FoldCase | S_SkipDest;
 
   searching_for_menu_items = (strcasecmp (label, INFO_MENU_ENTRY_LABEL) == 0);
 
-  while ((position = search_forward (label, &search)) != -1)
+  while ((position = search_forward (label, &tmp_search)) != -1)
     {
       int offset, start;
       char *refdef;
       REFERENCE *entry;
 
-      search.start = position;
-      search.start += skip_whitespace (search.buffer + search.start);
-      start = search.start - binding->start;
-      refdef = search.buffer + search.start;
+      tmp_search.start = position;
+      tmp_search.start += skip_whitespace (tmp_search.buffer + tmp_search.start);
+      start = tmp_search.start - binding->start;
+      refdef = tmp_search.buffer + tmp_search.start;
       offset = string_in_line (":", refdef);
 
       /* When searching for menu items, if no colon, there is no
@@ -290,6 +318,8 @@ info_references_internal (label, binding)
 
           if (info_parsed_nodename)
             entry->nodename = xstrdup (info_parsed_nodename);
+
+          entry->line_number = info_parsed_line_number;
         }
 
       add_pointer_to_array
@@ -301,9 +331,7 @@ info_references_internal (label, binding)
 /* Get the entry associated with LABEL in REFERENCES.  Return a pointer
    to the ENTRY if found, or NULL. */
 REFERENCE *
-info_get_labeled_reference (label, references)
-     char *label;
-     REFERENCE **references;
+info_get_labeled_reference (char *label, REFERENCE **references)
 {
   register int i;
   REFERENCE *entry;
@@ -320,8 +348,7 @@ info_get_labeled_reference (label, references)
    REFERENCE ** which is the concatenation of REF1 and REF2.  The REF1
    and REF2 arrays are freed, but their contents are not. */
 REFERENCE **
-info_concatenate_references (ref1, ref2)
-     REFERENCE **ref1, **ref2;
+info_concatenate_references (REFERENCE **ref1, REFERENCE **ref2)
 {
   register int i, j;
   REFERENCE **result;
@@ -355,10 +382,29 @@ info_concatenate_references (ref1, ref2)
   return (result);
 }
 
+
+
+/* Copy a reference structure.  Since we tend to free everything at
+   every opportunity, we don't share any points, but copy everything into
+   new memory.  */
+REFERENCE *
+info_copy_reference (REFERENCE *src)
+{
+  REFERENCE *dest = xmalloc (sizeof (REFERENCE));
+  dest->label = src->label ? xstrdup (src->label) : NULL;
+  dest->filename = src->filename ? xstrdup (src->filename) : NULL;
+  dest->nodename = src->nodename ? xstrdup (src->nodename) : NULL;
+  dest->start = src->start;
+  dest->end = src->end;
+  
+  return dest;
+}
+
+
+
 /* Free the data associated with REFERENCES. */
 void
-info_free_references (references)
-     REFERENCE **references;
+info_free_references (REFERENCE **references)
 {
   register int i;
   REFERENCE *entry;
@@ -382,11 +428,10 @@ info_free_references (references)
    all such sequences with just a single space.  Remove whitespace from
    start and end of string. */
 void
-canonicalize_whitespace (string)
-     char *string;
+canonicalize_whitespace (char *string)
 {
   register int i, j;
-  int len, whitespace_found, whitespace_loc;
+  int len, whitespace_found, whitespace_loc = 0;
   char *temp;
 
   if (!string)
@@ -437,9 +482,7 @@ static char the_rep[10];
 /* Return a pointer to a string which is the printed representation
    of CHARACTER if it were printed at HPOS. */
 char *
-printed_representation (character, hpos)
-     unsigned char character;
-     int hpos;
+printed_representation (unsigned char character, int hpos)
 {
   register int i = 0;
   int printable_limit = ISO_Latin_p ? 255 : 127;
@@ -503,22 +546,21 @@ static int parsed_filename_size = 0;
 /* Amount of space allocated to INFO_PARSED_NODENAME via xmalloc (). */
 static int parsed_nodename_size = 0;
 
-static void save_string (), saven_string ();
+static void save_string (char *string, char **string_p, int *string_size_p);
+static void saven_string (char *string, int len, char **string_p,
+    int *string_size_p);
 
 /* Remember FILENAME in PARSED_FILENAME.  An empty FILENAME is translated
    to a NULL pointer in PARSED_FILENAME. */
 static void
-save_filename (filename)
-     char *filename;
+save_filename (char *filename)
 {
   save_string (filename, &info_parsed_filename, &parsed_filename_size);
 }
 
 /* Just like save_filename (), but you pass the length of the string. */
 static void
-saven_filename (filename, len)
-     char *filename;
-     int len;
+saven_filename (char *filename, int len)
 {
   saven_string (filename, len,
                 &info_parsed_filename, &parsed_filename_size);
@@ -527,17 +569,14 @@ saven_filename (filename, len)
 /* Remember NODENAME in PARSED_NODENAME.  An empty NODENAME is translated
    to a NULL pointer in PARSED_NODENAME. */
 static void
-save_nodename (nodename)
-     char *nodename;
+save_nodename (char *nodename)
 {
   save_string (nodename, &info_parsed_nodename, &parsed_nodename_size);
 }
 
 /* Just like save_nodename (), but you pass the length of the string. */
 static void
-saven_nodename (nodename, len)
-     char *nodename;
-     int len;
+saven_nodename (char *nodename, int len)
 {
   saven_string (nodename, len,
                 &info_parsed_nodename, &parsed_nodename_size);
@@ -547,10 +586,7 @@ saven_nodename (nodename, len)
    bytes allocated to it.  An empty STRING is translated to a NULL pointer
    in STRING_P. */
 static void
-save_string (string, string_p, string_size_p)
-     char *string;
-     char **string_p;
-     int *string_size_p;
+save_string (char *string, char **string_p, int *string_size_p)
 {
   if (!string || !*string)
     {
@@ -562,7 +598,7 @@ save_string (string, string_p, string_size_p)
     }
   else
     {
-      if (strlen (string) >= *string_size_p)
+      if (strlen (string) >= (unsigned int) *string_size_p)
         *string_p = (char *)xrealloc
           (*string_p, (*string_size_p = 1 + strlen (string)));
 
@@ -572,11 +608,7 @@ save_string (string, string_p, string_size_p)
 
 /* Just like save_string (), but you also pass the length of STRING. */
 static void
-saven_string (string, len, string_p, string_size_p)
-     char *string;
-     int len;
-     char **string_p;
-     int *string_size_p;
+saven_string (char *string, int len, char **string_p, int *string_size_p)
 {
   if (!string)
     {
@@ -598,8 +630,7 @@ saven_string (string, len, string_p, string_size_p)
 
 /* Return a pointer to the part of PATHNAME that simply defines the file. */
 char *
-filename_non_directory (pathname)
-     char *pathname;
+filename_non_directory (char *pathname)
 {
   register char *filename = pathname + strlen (pathname);
 
@@ -614,8 +645,7 @@ filename_non_directory (pathname)
 
 /* Return non-zero if NODE is one especially created by Info. */
 int
-internal_info_node_p (node)
-     NODE *node;
+internal_info_node_p (NODE *node)
 {
 #if defined (NEVER)
   if (node &&
@@ -631,9 +661,7 @@ internal_info_node_p (node)
 
 /* Make NODE appear to be one especially created by Info. */
 void
-name_internal_node (node, name)
-     NODE *node;
-     char *name;
+name_internal_node (NODE *node, char *name)
 {
   if (!node)
     return;
@@ -647,8 +675,7 @@ name_internal_node (node, name)
 /* Return the window displaying NAME, the name of an internally created
    Info window. */
 WINDOW *
-get_internal_info_window (name)
-     char *name;
+get_internal_info_window (char *name)
 {
   WINDOW *win;
 
@@ -662,8 +689,7 @@ get_internal_info_window (name)
 
 /* Return a window displaying the node NODE. */
 WINDOW *
-get_window_of_node (node)
-     NODE *node;
+get_window_of_node (NODE *node)
 {
   WINDOW *win = (WINDOW *)NULL;
 
diff --git a/gnu/usr.bin/texinfo/info/infokey.c b/gnu/usr.bin/texinfo/info/infokey.c
index 43e656050a5..bfb3323b4ba 100644
--- a/gnu/usr.bin/texinfo/info/infokey.c
+++ b/gnu/usr.bin/texinfo/info/infokey.c
@@ -1,7 +1,7 @@
 /* infokey.c -- compile ~/.infokey to ~/.info.
-   $Id: infokey.c,v 1.1.1.1 2002/06/10 13:21:13 espie Exp $
+   $Id: infokey.c,v 1.1.1.2 2006/07/17 16:03:45 espie Exp $
 
-   Copyright (C) 1999, 2001, 02 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003, 2004 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
@@ -69,9 +69,16 @@ struct sect
   };
 
 /* Some "forward" declarations. */
-static char *mkpath ();
-static int compile (), write_infokey_file ();
-static void syntax_error (), error_message (), suggest_help (), short_help ();
+static char *mkpath (const char *dir, const char *file);
+static int compile (FILE *fp, const char *filename, struct sect *sections);
+static int write_infokey_file (FILE *fp, struct sect *sections);
+static void syntax_error (const char *filename,
+    unsigned int linenum, const char *fmt,
+    const void *a1, const void *a2, const void *a3, const void *a4);
+static void error_message (int error_code, const char *fmt,
+    const void *a1, const void *a2, const void *a3, const void *a4);
+static void suggest_help (void);
+static void short_help (void);
 
 
 /* **************************************************************** */
@@ -81,21 +88,20 @@ static void syntax_error (), error_message (), suggest_help (), short_help ();
 /* **************************************************************** */
 
 int
-main (argc, argv)
-     int argc;
-     char **argv;
+main (int argc, char **argv)
 {
   int getopt_long_index;	/* Index returned by getopt_long (). */
-  NODE *initial_node;		/* First node loaded by Info. */
 
 #ifdef HAVE_SETLOCALE
   /* Set locale via LC_ALL.  */
   setlocale (LC_ALL, "");
 #endif
 
+#ifdef ENABLE_NLS
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
   while (1)
     {
@@ -140,7 +146,7 @@ main (argc, argv)
 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"),
-	      "1999");
+	      "2003");
       xexit (0);
     }
 
@@ -161,7 +167,8 @@ For more information about these matters, see the files named COPYING.\n"),
     }
   else if (optind != argc)
     {
-      error_message (0, _("incorrect number of arguments"));
+      error_message (0, _("incorrect number of arguments"),
+          NULL, NULL, NULL, NULL);
       suggest_help ();
       xexit (1);
     }
@@ -191,7 +198,8 @@ For more information about these matters, see the files named COPYING.\n"),
     inf = fopen (input_filename, "r");
     if (!inf)
       {
-	error_message (errno, _("cannot open input file `%s'"), input_filename);
+	error_message (errno, _("cannot open input file `%s'"),
+            input_filename, NULL, NULL, NULL);
 	xexit (1);
       }
 
@@ -204,7 +212,8 @@ For more information about these matters, see the files named COPYING.\n"),
 	outf = fopen (output_filename, FOPEN_WBIN);
 	if (!outf)
 	  {
-	    error_message (errno, _("cannot create output file `%s'"), output_filename);
+	    error_message (errno, _("cannot create output file `%s'"),
+                output_filename, NULL, NULL, NULL);
 	    xexit (1);
 	  }
 
@@ -214,12 +223,14 @@ For more information about these matters, see the files named COPYING.\n"),
 	write_error = 0;
 	if (!write_infokey_file (outf, sections))
 	  {
-	    error_message (errno, _("error writing to `%s'"), output_filename);
+	    error_message (errno, _("error writing to `%s'"),
+                output_filename, NULL, NULL, NULL);
 	    write_error = 1;
 	  }
 	if (fclose (outf) == EOF)
 	  {
-	    error_message (errno, _("error closing output file `%s'"), output_filename);
+	    error_message (errno, _("error closing output file `%s'"),
+                output_filename, NULL, NULL, NULL);
 	    write_error = 1;
 	  }
 	if (write_error)
@@ -233,13 +244,11 @@ For more information about these matters, see the files named COPYING.\n"),
     fclose (inf);
   }
 
-  xexit (0);
+  return 0;
 }
 
 static char *
-mkpath (dir, file)
-     const char *dir;
-     const char *file;
+mkpath (const char *dir, const char *file)
 {
   char *p;
 
@@ -289,18 +298,18 @@ mkpath (dir, file)
 		#info
 		#echo-area
 		#var
-	
+
 	The sections may occur in any order.  Each section may be
 	omitted completely.  If the 'info' section is the first in the
 	file, its '#info' line may be omitted.
-	
+
 	The 'info' and 'echo-area' sections
 	-----------------------------------
 	Each line in the 'info' or 'echo-area' sections has the
 	following syntax:
 
 		key-sequence SPACE action-name [ SPACE [ # comment ] ] \n
-	
+
 	Where SPACE is one or more white space characters excluding
 	newline, "action-name" is the name of a GNU Info command,
 	"comment" is any sequence of characters excluding newline, and
@@ -319,7 +328,7 @@ mkpath (dir, file)
 		\r indicates a single CR;
 		\t indicates a single TAB;
 		\b indicates a single BACKSPACE;
-	
+
 	   4.	\ku indicates the Up Arrow key;
 	   	\kd indicates the Down Arrow key;
 	   	\kl indicates the Left Arrow key;
@@ -345,17 +354,17 @@ mkpath (dir, file)
 	If the following line:
 
 		#stop
-	
+
 	occurs anywhere in an 'info' or 'echo-area' section, that
 	indicates to GNU Info to suppress all of its default key
 	bindings in that context.
-	
+
 	The 'var' section
 	-----------------
 	Each line in the 'var' section has the following syntax:
 
 		variable-name = value \n
-	
+
 	Where "variable-name" is the name of a GNU Info variable and
 	"value" is the value that GNU Info will assign to that variable
 	when commencing execution.  There must be no white space in the
@@ -366,21 +375,19 @@ mkpath (dir, file)
 	following the '=' is not ignored.
  */
 
-static int add_to_section (), lookup_action ();
+static int add_to_section (struct sect *s, const char *str, unsigned int len);
+static int lookup_action (const char *actname);
 
 /* Compile the input file into its various sections.  Return true if no
    error was encountered.
  */
 static int
-compile (fp, filename, sections)
-     FILE *fp;
-     const char *filename;
-     struct sect sections[];
+compile (FILE *fp, const char *filename, struct sect *sections)
 {
   int error = 0;
   char rescan = 0;
   unsigned int lnum = 0;
-  int c;
+  int c = 0;
 
   /* This parser is a true state machine, with no sneaky fetching
      of input characters inside the main loop.  In other words, all
@@ -412,9 +419,9 @@ compile (fp, filename, sections)
       octal,
       special_key
     }
-  seqstate;			/* used if state == get_keyseq */
+  seqstate;		/* used if state == get_keyseq */
   char meta = 0;
-  char ocnt;			/* used if state == get_keyseq && seqstate == octal */
+  char ocnt = 0;	/* used if state == get_keyseq && seqstate == octal */
 
   /* Data is accumulated in the following variables.  The code
      avoids overflowing these strings, and throws an error
@@ -422,17 +429,17 @@ compile (fp, filename, sections)
      lengths are arbitrary (and should be large enough) and their
      lengths are not hard-coded anywhere else, so increasing them
      here will not break anything.  */
-  char oval;
+  char oval = 0;
   char comment[10];
-  unsigned int clen;
+  unsigned int clen = 0;
   char seq[20];
-  unsigned int slen;
+  unsigned int slen = 0;
   char act[80];
-  unsigned int alen;
+  unsigned int alen = 0;
   char varn[80];
-  unsigned int varlen;
+  unsigned int varlen = 0;
   char val[80];
-  unsigned int vallen;
+  unsigned int vallen = 0;
 
 #define	To_seq(c) \
 		  do { \
@@ -440,7 +447,8 @@ compile (fp, filename, sections)
 		      seq[slen++] = meta ? Meta(c) : (c); \
 		    else \
 		      { \
-			syntax_error(filename, lnum, _("key sequence too long")); \
+			syntax_error(filename, lnum, _("key sequence too long"), \
+                            NULL, NULL, NULL, NULL); \
 			error = 1; \
 		      } \
 		    meta = 0; \
@@ -518,7 +526,8 @@ compile (fp, filename, sections)
 		  rescan = 1;
 		  if (slen == 0)
 		    {
-		      syntax_error (filename, lnum, _("missing key sequence"));
+		      syntax_error (filename, lnum, _("missing key sequence"),
+                          NULL, NULL, NULL, NULL);
 		      error = 1;
 		    }
 		}
@@ -567,7 +576,7 @@ compile (fp, filename, sections)
 		  seqstate = special_key;
 		  break;
 		default:
-		  /* Backslash followed by any other char 
+		  /* Backslash followed by any other char
 		     just means that char.  */
 		  To_seq (c);
 		  seqstate = normal;
@@ -597,7 +606,9 @@ compile (fp, filename, sections)
 		    To_seq (oval);
 		  else
 		    {
-		      syntax_error (filename, lnum, _("NUL character (\\000) not permitted"));
+		      syntax_error (filename, lnum,
+                          _("NUL character (\\000) not permitted"),
+                          NULL, NULL, NULL, NULL);
 		      error = 1;
 		    }
 		}
@@ -626,7 +637,9 @@ compile (fp, filename, sections)
 		To_seq (CONTROL (c));
 	      else
 		{
-		  syntax_error (filename, lnum, _("NUL character (^%c) not permitted"), c);
+		  syntax_error (filename, lnum,
+                      (char *) _("NUL character (^%c) not permitted"),
+                      (void *) (long) c, NULL, NULL, NULL);
 		  error = 1;
 		}
 	      seqstate = normal;
@@ -649,7 +662,8 @@ compile (fp, filename, sections)
 	      rescan = 1;
 	      if (alen == 0)
 		{
-		  syntax_error (filename, lnum, _("missing action name"), c);
+		  syntax_error (filename, lnum, (char *) _("missing action name"),
+				(void *) (long) c, NULL, NULL, NULL);
 		  error = 1;
 		}
 	      else
@@ -664,13 +678,15 @@ compile (fp, filename, sections)
 			    && add_to_section (&sections[section], "", 1)
 			    && add_to_section (&sections[section], &av, 1)))
 			{
-			  syntax_error (filename, lnum, _("section too long"));
+			  syntax_error (filename, lnum, _("section too long"),
+                              NULL, NULL, NULL, NULL);
 			  error = 1;
 			}
 		    }
 		  else
 		    {
-		      syntax_error (filename, lnum, _("unknown action `%s'"), act);
+		      syntax_error (filename, lnum, _("unknown action `%s'"),
+                          act, NULL, NULL, NULL);
 		      error = 1;
 		    }
 		}
@@ -679,11 +695,12 @@ compile (fp, filename, sections)
 	    act[alen++] = c;
 	  else
 	    {
-	      syntax_error (filename, lnum, _("action name too long"));
+	      syntax_error (filename, lnum, _("action name too long"),
+                  NULL, NULL, NULL, NULL);
 	      error = 1;
 	    }
 	  break;
-	
+
 	case got_action:
 	  if (c == '#')
 	    state = in_trailing_comment;
@@ -691,7 +708,9 @@ compile (fp, filename, sections)
 	    state = start_of_line;
 	  else if (!isspace (c))
 	    {
-	      syntax_error (filename, lnum, _("extra characters following action `%s'"), act);
+	      syntax_error (filename, lnum,
+                  _("extra characters following action `%s'"),
+                  act, NULL, NULL, NULL);
 	      error = 1;
 	    }
 	  break;
@@ -701,7 +720,8 @@ compile (fp, filename, sections)
 	    {
 	      if (varlen == 0)
 		{
-		  syntax_error (filename, lnum, _("missing variable name"));
+		  syntax_error (filename, lnum, _("missing variable name"),
+                      NULL, NULL, NULL, NULL);
 		  error = 1;
 		}
 	      state = get_value;
@@ -709,18 +729,21 @@ compile (fp, filename, sections)
 	    }
 	  else if (c == '\n' || isspace (c))
 	    {
-	      syntax_error (filename, lnum, _("missing `=' immediately after variable name"));
+	      syntax_error (filename, lnum,
+                  _("missing `=' immediately after variable name"),
+                  NULL, NULL, NULL, NULL);
 	      error = 1;
 	    }
 	  else if (varlen < sizeof varn)
 	    varn[varlen++] = c;
 	  else
 	    {
-	      syntax_error (filename, lnum, _("variable name too long"));
+	      syntax_error (filename, lnum, _("variable name too long"),
+                  NULL, NULL, NULL, NULL);
 	      error = 1;
 	    }
 	  break;
-	
+
 	case get_value:
 	  if (c == '\n')
 	    {
@@ -730,7 +753,8 @@ compile (fp, filename, sections)
 		    && add_to_section (&sections[section], val, vallen)
 		    && add_to_section (&sections[section], "", 1)))
 		{
-		  syntax_error (filename, lnum, _("section too long"));
+		  syntax_error (filename, lnum, _("section too long"),
+                      NULL, NULL, NULL, NULL);
 		  error = 1;
 		}
 	    }
@@ -738,10 +762,16 @@ compile (fp, filename, sections)
 	    val[vallen++] = c;
 	  else
 	    {
-	      syntax_error (filename, lnum, _("value too long"));
+	      syntax_error (filename, lnum, _("value too long"),
+                  NULL, NULL, NULL, NULL);
 	      error = 1;
 	    }
 	  break;
+
+        case get_equals:
+        case got_equals:
+        case got_varname:
+          break;
 	}
     }
 
@@ -754,14 +784,11 @@ compile (fp, filename, sections)
    characters fit, or false if the section's size limit was exceeded.
  */
 static int
-add_to_section (s, str, len)
-     struct sect *s;
-     const char *str;
-     unsigned int len;
+add_to_section (struct sect *s, const char *str, unsigned int len)
 {
   if (s->cur + len > sizeof s->data)
     return 0;
-  strncpy (s->data + s->cur, str, len);
+  strncpy ((char *) s->data + s->cur, str, len);
   s->cur += len;
   return 1;
 }
@@ -770,8 +797,7 @@ add_to_section (s, str, len)
    auto-generated array in key.c.
  */
 static int
-lookup_action (actname)
-     const char *actname;
+lookup_action (const char *actname)
 {
   int i;
 
@@ -788,9 +814,7 @@ lookup_action (actname)
    in radix INFOKEY_RADIX.
  */
 static int
-putint (i, fp)
-     int i;
-     FILE *fp;
+putint (int i, FILE *fp)
 {
   return fputc (i % INFOKEY_RADIX, fp) != EOF
     && fputc ((i / INFOKEY_RADIX) % INFOKEY_RADIX, fp) != EOF;
@@ -800,10 +824,7 @@ putint (i, fp)
    empty, simply omit it.
  */
 static int
-putsect (s, code, fp)
-     struct sect *s;
-     int code;
-     FILE *fp;
+putsect (struct sect *s, int code, FILE *fp)
 {
   if (s->cur == 0)
     return 1;
@@ -815,9 +836,7 @@ putsect (s, code, fp)
 /* Write an entire infokey file, given an array containing its sections.
  */
 static int
-write_infokey_file (fp, sections)
-     FILE *fp;
-     struct sect sections[];
+write_infokey_file (FILE *fp, struct sect *sections)
 {
   /* Get rid of sections with no effect. */
   if (sections[info].cur == 1 && sections[info].data[0] == 0)
@@ -849,10 +868,8 @@ write_infokey_file (fp, sections)
 	progname: "filename", line N: message
  */
 static void
-error_message (error_code, fmt, a1, a2, a3, a4)
-     int error_code;
-     const char *fmt;
-     const void *a1, *a2, *a3, *a4;
+error_message (int error_code, const char *fmt,
+    const void *a1, const void *a2, const void *a3, const void *a4)
 {
   fprintf (stderr, "%s: ", program_name);
   fprintf (stderr, fmt, a1, a2, a3, a4);
@@ -865,11 +882,9 @@ error_message (error_code, fmt, a1, a2, a3, a4)
 	progname: message
  */
 static void
-syntax_error (filename, linenum, fmt, a1, a2, a3, a4)
-     const char *filename;
-     unsigned int linenum;
-     const char *fmt;
-     const void *a1, *a2, *a3, *a4;
+syntax_error (const char *filename,
+    unsigned int linenum, const char *fmt,
+    const void *a1, const void *a2, const void *a3, const void *a4)
 {
   fprintf (stderr, "%s: ", program_name);
   fprintf (stderr, _("\"%s\", line %u: "), filename, linenum);
@@ -879,14 +894,14 @@ syntax_error (filename, linenum, fmt, a1, a2, a3, a4)
 
 /* Produce a gentle rtfm. */
 static void
-suggest_help ()
+suggest_help (void)
 {
   fprintf (stderr, _("Try --help for more information.\n"));
 }
 
 /* Produce a scaled down description of the available options to Info. */
 static void
-short_help ()
+short_help (void)
 {
   printf (_("\
 Usage: %s [OPTION]... [INPUT-FILE]\n\
diff --git a/gnu/usr.bin/texinfo/info/infokey.h b/gnu/usr.bin/texinfo/info/infokey.h
index da9759851cd..bc5dd141933 100644
--- a/gnu/usr.bin/texinfo/info/infokey.h
+++ b/gnu/usr.bin/texinfo/info/infokey.h
@@ -1,5 +1,5 @@
 /* infokey.h -- Custom keystroke definition support.
-   $Id: infokey.h,v 1.1.1.1 2002/06/10 13:21:13 espie Exp $
+   $Id: infokey.h,v 1.1.1.2 2006/07/17 16:03:45 espie Exp $
 
    Copyright (C) 1999, 2002 Free Software Foundation, Inc.
 
diff --git a/gnu/usr.bin/texinfo/info/infomap.h b/gnu/usr.bin/texinfo/info/infomap.h
index 524e8f61f7d..e3aa3e7130a 100644
--- a/gnu/usr.bin/texinfo/info/infomap.h
+++ b/gnu/usr.bin/texinfo/info/infomap.h
@@ -1,7 +1,7 @@
 /* infomap.h -- description of a keymap in Info and related functions.
-   $Id: infomap.h,v 1.1.1.3 2002/06/10 13:21:06 espie Exp $
+   $Id: infomap.h,v 1.1.1.4 2006/07/17 16:03:43 espie Exp $
 
-   Copyright (C) 1993, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001, 2004 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
@@ -67,15 +67,16 @@ extern Keymap echo_area_keymap;
 
 /* Return a new keymap which has all the uppercase letters mapped to run
    the function info_do_lowercase_version (). */
-extern Keymap keymap_make_keymap ();
+extern Keymap keymap_make_keymap (void);
 
 /* Return a new keymap which is a copy of MAP. */
-extern Keymap keymap_copy_keymap ();
+extern Keymap keymap_copy_keymap (Keymap map, Keymap rootmap,
+    Keymap newroot);
 
 /* Free MAP and it's descendents. */
-extern void keymap_discard_keymap ();
+extern void keymap_discard_keymap (Keymap map, Keymap rootmap);
 
 /* Initialize the info keymaps. */
-extern void initialize_info_keymaps ();
+extern void initialize_info_keymaps (void);
 
 #endif /* not INFOMAP_H */
diff --git a/gnu/usr.bin/texinfo/info/nodes.c b/gnu/usr.bin/texinfo/info/nodes.c
index 97bd2a30c48..423777e3a42 100644
--- a/gnu/usr.bin/texinfo/info/nodes.c
+++ b/gnu/usr.bin/texinfo/info/nodes.c
@@ -1,7 +1,8 @@
 /* nodes.c -- how to get an Info file and node.
-   $Id: nodes.c,v 1.1.1.4 2002/06/10 13:21:07 espie Exp $
+   $Id: nodes.c,v 1.1.1.5 2006/07/17 16:03:43 espie Exp $
 
-   Copyright (C) 1993, 98, 99, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1998, 1999, 2000, 2002, 2003, 2004 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
@@ -17,7 +18,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Written by Brian Fox (bfox@ai.mit.edu). */
+   Originally written by Brian Fox (bfox@ai.mit.edu). */
 
 #include "info.h"
 
@@ -30,16 +31,23 @@
 #  include "man.h"
 #endif /* HANDLE_MAN_PAGES */
 
-static void forget_info_file (), remember_info_file ();
-static void free_file_buffer_tags (), free_info_tag ();
-static void get_nodes_of_tags_table (), get_nodes_of_info_file ();
-static void get_tags_of_indirect_tags_table ();
-static void info_reload_file_buffer_contents ();
-static char *adjust_nodestart ();
-static FILE_BUFFER *info_load_file_internal (), *info_find_file_internal ();
-static NODE *info_node_of_file_buffer_tags ();
-
-static long get_node_length ();
+static void forget_info_file (char *filename);
+static void remember_info_file (FILE_BUFFER *file_buffer);
+static void free_file_buffer_tags (FILE_BUFFER *file_buffer);
+static void free_info_tag (TAG *tag);
+static void get_nodes_of_tags_table (FILE_BUFFER *file_buffer,
+    SEARCH_BINDING *buffer_binding);
+static void get_nodes_of_info_file (FILE_BUFFER *file_buffer);
+static void get_tags_of_indirect_tags_table (FILE_BUFFER *file_buffer,
+    SEARCH_BINDING *indirect_binding, SEARCH_BINDING *tags_binding);
+static void info_reload_file_buffer_contents (FILE_BUFFER *fb);
+static char *adjust_nodestart (NODE *node, int min, int max);
+static FILE_BUFFER *info_load_file_internal (char *filename, int get_tags);
+static FILE_BUFFER *info_find_file_internal (char *filename, int get_tags);
+static NODE *info_node_of_file_buffer_tags (FILE_BUFFER *file_buffer,
+    char *nodename);
+
+static long get_node_length (SEARCH_BINDING *binding);
 
 /* Magic number that RMS used to decide how much a tags table pointer could
    be off by.  I feel that it should be much smaller, like 4.  */
@@ -64,15 +72,14 @@ int info_loaded_files_slots = 0;
 /* Public functions for node manipulation.  */
 
 /* Used to build `dir' menu from `localdir' files found in INFOPATH. */
-extern void maybe_build_dir_node ();
+extern void maybe_build_dir_node (char *dirname);
 
 /* Return a pointer to a NODE structure for the Info node (FILENAME)NODENAME.
    If FILENAME is NULL, `dir' is used.
    IF NODENAME is NULL, `Top' is used.
    If the node cannot be found, return NULL. */
 NODE *
-info_get_node (filename, nodename)
-     char *filename, *nodename;
+info_get_node (char *filename, char *nodename)
 {
   NODE *node;
   FILE_BUFFER *file_buffer = NULL;
@@ -127,9 +134,7 @@ info_get_node (filename, nodename)
    nodename of "Top" is used.  If the node cannot be found, return a
    NULL pointer. */
 NODE *
-info_get_node_of_file_buffer (nodename, file_buffer)
-     char *nodename;
-     FILE_BUFFER *file_buffer;
+info_get_node_of_file_buffer (char *nodename, FILE_BUFFER *file_buffer)
 {
   NODE *node = NULL;
 
@@ -187,8 +192,7 @@ info_get_node_of_file_buffer (nodename, file_buffer)
    and add it to the list of loaded files.  If the file cannot be found,
    return a NULL FILE_BUFFER *. */
 FILE_BUFFER *
-info_find_file (filename)
-     char *filename;
+info_find_file (char *filename)
 {
   return info_find_file_internal (filename, INFO_GET_TAGS);
 }
@@ -196,8 +200,7 @@ info_find_file (filename)
 /* Load the info file FILENAME, remembering information about it in a
    file buffer. */
 FILE_BUFFER *
-info_load_file (filename)
-     char *filename;
+info_load_file (char *filename)
 {
   return info_load_file_internal (filename, INFO_GET_TAGS);
 }
@@ -211,9 +214,7 @@ info_load_file (filename)
    function is called by info_get_node () when we already have a valid
    tags table describing the nodes, it is unnecessary. */
 static FILE_BUFFER *
-info_find_file_internal (filename, get_tags)
-     char *filename;
-     int get_tags;
+info_find_file_internal (char *filename, int get_tags)
 {
   int i;
   FILE_BUFFER *file_buffer;
@@ -305,9 +306,7 @@ info_find_file_internal (filename, get_tags)
    default behaviour when info_load_file () is called, but it is not
    necessary when loading a subfile for which we already have tags. */
 static FILE_BUFFER *
-info_load_file_internal (filename, get_tags)
-     char *filename;
-     int get_tags;
+info_load_file_internal (char *filename, int get_tags)
 {
   char *fullpath, *contents;
   long filesize;
@@ -331,23 +330,23 @@ info_load_file_internal (filename, get_tags)
   if (retcode < 0)
     {
       char *lowered_name;
-      char *basename;
+      char *tmp_basename;
 
       lowered_name = xstrdup (filename);
-      basename = filename_non_directory (lowered_name);
+      tmp_basename = filename_non_directory (lowered_name);
 
-      while (*basename)
+      while (*tmp_basename)
         {
-          if (isupper (*basename))
-            *basename = tolower (*basename);
+          if (isupper (*tmp_basename))
+            *tmp_basename = tolower (*tmp_basename);
 
-          basename++;
+          tmp_basename++;
         }
 
       fullpath = info_find_fullpath (lowered_name);
-      free (lowered_name);
 
       retcode = stat (fullpath, &finfo);
+      free (lowered_name);
     }
 
   /* If the file wasn't found, give up, returning a NULL pointer. */
@@ -384,8 +383,7 @@ info_load_file_internal (filename, get_tags)
 /* Grovel FILE_BUFFER->contents finding tags and nodes, and filling in the
    various slots.  This can also be used to rebuild a tag or node table. */
 void
-build_tags_and_nodes (file_buffer)
-     FILE_BUFFER *file_buffer;
+build_tags_and_nodes (FILE_BUFFER *file_buffer)
 {
   SEARCH_BINDING binding;
   long position;
@@ -495,8 +493,7 @@ build_tags_and_nodes (file_buffer)
    FILE_BUFFER->tags, and the number of allocated slots in
    FILE_BUFFER->tags_slots. */
 static void
-get_nodes_of_info_file (file_buffer)
-     FILE_BUFFER *file_buffer;
+get_nodes_of_info_file (FILE_BUFFER *file_buffer)
 {
   long nodestart;
   int tags_index = 0;
@@ -572,8 +569,7 @@ get_nodes_of_info_file (file_buffer)
 
 /* Return the length of the node which starts at BINDING. */
 static long
-get_node_length (binding)
-     SEARCH_BINDING *binding;
+get_node_length (SEARCH_BINDING *binding)
 {
   int i;
   char *body;
@@ -590,33 +586,33 @@ get_node_length (binding)
 /* Build and save the array of nodes in FILE_BUFFER by searching through the
    contents of BUFFER_BINDING for a tags table, and groveling the contents. */
 static void
-get_nodes_of_tags_table (file_buffer, buffer_binding)
-     FILE_BUFFER *file_buffer;
-     SEARCH_BINDING *buffer_binding;
+get_nodes_of_tags_table (FILE_BUFFER *file_buffer,
+    SEARCH_BINDING *buffer_binding)
 {
   int name_offset;
-  SEARCH_BINDING *search;
+  SEARCH_BINDING *tmp_search;
   long position;
   int tags_index = 0;
 
-  search = copy_binding (buffer_binding);
+  tmp_search = copy_binding (buffer_binding);
 
   /* Find the start of the tags table. */
-  position = find_tags_table (search);
+  position = find_tags_table (tmp_search);
 
   /* If none, we're all done. */
   if (position == -1)
     return;
 
   /* Move to one character before the start of the actual table. */
-  search->start = position;
-  search->start += skip_node_separator (search->buffer + search->start);
-  search->start += strlen (TAGS_TABLE_BEG_LABEL);
-  search->start--;
+  tmp_search->start = position;
+  tmp_search->start += skip_node_separator
+    (tmp_search->buffer + tmp_search->start);
+  tmp_search->start += strlen (TAGS_TABLE_BEG_LABEL);
+  tmp_search->start--;
 
   /* The tag table consists of lines containing node names and positions.
      Do each line until we find one that doesn't contain a node name. */
-  while ((position = search_forward ("\n", search)) != -1)
+  while ((position = search_forward ("\n", tmp_search)) != -1)
     {
       TAG *entry;
       char *nodedef;
@@ -624,22 +620,22 @@ get_nodes_of_tags_table (file_buffer, buffer_binding)
       int anchor = 0;
 
       /* Prepare to skip this line. */
-      search->start = position;
-      search->start++;
+      tmp_search->start = position;
+      tmp_search->start++;
 
       /* Skip past informative "(Indirect)" tags table line. */
-      if (!tags_index && looking_at (TAGS_TABLE_IS_INDIRECT_LABEL, search))
+      if (!tags_index && looking_at (TAGS_TABLE_IS_INDIRECT_LABEL, tmp_search))
         continue;
 
       /* Find the label preceding the node name. */
       name_offset =
-        string_in_line (INFO_NODE_LABEL, search->buffer + search->start);
+        string_in_line (INFO_NODE_LABEL, tmp_search->buffer + tmp_search->start);
 
       /* If no node label, maybe it's an anchor.  */
       if (name_offset == -1)
         {
           name_offset = string_in_line (INFO_REF_LABEL,
-                                        search->buffer + search->start);
+              tmp_search->buffer + tmp_search->start);
           if (name_offset != -1)
             anchor = 1;
         }
@@ -652,8 +648,8 @@ get_nodes_of_tags_table (file_buffer, buffer_binding)
       entry = xmalloc (sizeof (TAG));
 
       /* Find the beginning of the node definition. */
-      search->start += name_offset;
-      nodedef = search->buffer + search->start;
+      tmp_search->start += name_offset;
+      nodedef = tmp_search->buffer + tmp_search->start;
       nodedef += skip_whitespace (nodedef);
 
       /* Move past the node's name in this tag to the TAGSEP character. */
@@ -681,7 +677,7 @@ get_nodes_of_tags_table (file_buffer, buffer_binding)
       add_pointer_to_array (entry, tags_index, file_buffer->tags,
                             file_buffer->tags_slots, 100, TAG *);
     }
-  free (search);
+  free (tmp_search);
 }
 
 /* A structure used only in `get_tags_of_indirect_tags_table' to hold onto
@@ -695,9 +691,8 @@ typedef struct {
    subfiles of every node which appears in TAGS_BINDING.  The 2nd argument is
    a binding surrounding the indirect files list. */
 static void
-get_tags_of_indirect_tags_table (file_buffer, indirect_binding, tags_binding)
-     FILE_BUFFER *file_buffer;
-     SEARCH_BINDING *indirect_binding, *tags_binding;
+get_tags_of_indirect_tags_table (FILE_BUFFER *file_buffer,
+    SEARCH_BINDING *indirect_binding, SEARCH_BINDING *tags_binding)
 {
   int i;
   SUBFILE **subfiles = NULL;
@@ -862,26 +857,24 @@ get_tags_of_indirect_tags_table (file_buffer, indirect_binding, tags_binding)
 /* Return the node that contains TAG in FILE_BUFFER, else
    (pathologically) NULL.  Called from info_node_of_file_buffer_tags.  */
 static NODE *
-find_node_of_anchor (file_buffer, tag)
-     FILE_BUFFER *file_buffer;
-     TAG *tag;
+find_node_of_anchor (FILE_BUFFER *file_buffer, TAG *tag)
 {
   int anchor_pos, node_pos;
   TAG *node_tag;
   NODE *node;
-  
+
   /* Look through the tag list for the anchor.  */
   for (anchor_pos = 0; file_buffer->tags[anchor_pos]; anchor_pos++)
     {
       TAG *t = file_buffer->tags[anchor_pos];
       if (t->nodestart == tag->nodestart)
-        break;        
+        break;
     }
-  
+
   /* Should not happen, because we should always find the anchor.  */
   if (!file_buffer->tags[anchor_pos])
     return NULL;
-  
+
   /* We've found the anchor.  Look backwards in the tag table for the
      preceding node (we're assuming the tags are given in order),
      skipping over any preceding anchors.  */
@@ -889,20 +882,20 @@ find_node_of_anchor (file_buffer, tag)
        node_pos >= 0 && file_buffer->tags[node_pos]->nodelen == 0;
        node_pos--)
     ;
-  
+
   /* An info file with an anchor before any nodes is pathological, but
      it's possible, so don't crash.  */
   if (node_pos < 0)
     return NULL;
-  
+
   /* We have the tag for the node that contained the anchor tag.  */
-  node_tag = file_buffer->tags[node_pos]; 
+  node_tag = file_buffer->tags[node_pos];
 
   /* Look up the node name in the tag table to get the actual node.
      This is a recursive call, but it can't recurse again, because we
      call it with a real node.  */
   node = info_node_of_file_buffer_tags (file_buffer, node_tag->nodename);
-  
+
   /* Start displaying the node at the anchor position.  */
   if (node)
     { /* The nodestart for real nodes is three characters before the `F'
@@ -919,13 +912,13 @@ find_node_of_anchor (file_buffer, tag)
       /* Otherwise an anchor at the end of a node ends up displaying at
          the end of the last line of the node (way over on the right of
          the screen), which looks wrong.  */
-      if (node->display_pos >= node->nodelen)
+      if (node->display_pos >= (unsigned long) node->nodelen)
         node->display_pos = node->nodelen - 1;
-      
+
       /* Don't search in the node for the xref text, it's not there.  */
       node->flags |= N_FromAnchor;
     }
-  
+
   return node;
 }
 
@@ -933,9 +926,7 @@ find_node_of_anchor (file_buffer, tag)
 /* Return the node from FILE_BUFFER which matches NODENAME by searching
    the tags table in FILE_BUFFER, or NULL.  */
 static NODE *
-info_node_of_file_buffer_tags (file_buffer, nodename)
-     FILE_BUFFER *file_buffer;
-     char *nodename;
+info_node_of_file_buffer_tags (FILE_BUFFER *file_buffer, char *nodename)
 {
   TAG *tag;
   int i;
@@ -944,8 +935,8 @@ info_node_of_file_buffer_tags (file_buffer, nodename)
   if (!file_buffer->tags) {
     return NULL;
   }
-  
-  for (i = 0; (tag = file_buffer->tags[i]); i++)    
+
+  for (i = 0; (tag = file_buffer->tags[i]); i++)
     if (strcmp (nodename, tag->nodename) == 0)
       {
         FILE_BUFFER *subfile = info_find_file_internal (tag->filename,
@@ -1036,7 +1027,7 @@ info_node_of_file_buffer_tags (file_buffer, nodename)
               free (node);
               node = find_node_of_anchor (file_buffer, tag);
             }
-            
+
           else
             {
               /* Since we know the length of this node, we have already
@@ -1059,7 +1050,7 @@ info_node_of_file_buffer_tags (file_buffer, nodename)
 
 /* Create a new, empty file buffer. */
 FILE_BUFFER *
-make_file_buffer ()
+make_file_buffer (void)
 {
   FILE_BUFFER *file_buffer = xmalloc (sizeof (FILE_BUFFER));
 
@@ -1075,8 +1066,7 @@ make_file_buffer ()
 
 /* Add FILE_BUFFER to our list of already loaded info files. */
 static void
-remember_info_file (file_buffer)
-     FILE_BUFFER *file_buffer;
+remember_info_file (FILE_BUFFER *file_buffer)
 {
   int i;
 
@@ -1089,8 +1079,7 @@ remember_info_file (file_buffer)
 
 /* Forget the contents, tags table, nodes list, and names of FILENAME. */
 static void
-forget_info_file (filename)
-     char *filename;
+forget_info_file (char *filename)
 {
   int i;
   FILE_BUFFER *file_buffer;
@@ -1098,7 +1087,7 @@ forget_info_file (filename)
   if (!info_loaded_files)
     return;
 
-  for (i = 0; file_buffer = info_loaded_files[i]; i++)
+  for (i = 0; (file_buffer = info_loaded_files[i]); i++)
     if (FILENAME_CMP (filename, file_buffer->filename) == 0
         || FILENAME_CMP (filename, file_buffer->fullpath) == 0)
       {
@@ -1107,7 +1096,7 @@ forget_info_file (filename)
 
         if (file_buffer->contents)
           free (file_buffer->contents);
-        
+
         /* free_file_buffer_tags () also kills the subfiles list, since
            the subfiles list is only of use in conjunction with tags. */
         free_file_buffer_tags (file_buffer);
@@ -1126,8 +1115,7 @@ forget_info_file (filename)
 
 /* Free the tags (if any) associated with FILE_BUFFER. */
 static void
-free_file_buffer_tags (file_buffer)
-     FILE_BUFFER *file_buffer;
+free_file_buffer_tags (FILE_BUFFER *file_buffer)
 {
   int i;
 
@@ -1155,8 +1143,7 @@ free_file_buffer_tags (file_buffer)
 
 /* Free the data associated with TAG, as well as TAG itself. */
 static void
-free_info_tag (tag)
-     TAG *tag;
+free_info_tag (TAG *tag)
 {
   free (tag->nodename);
 
@@ -1173,8 +1160,7 @@ free_info_tag (tag)
    the file was already loaded at least once successfully, so the tags and/or
    nodes members are still correctly filled. */
 static void
-info_reload_file_buffer_contents (fb)
-     FILE_BUFFER *fb;
+info_reload_file_buffer_contents (FILE_BUFFER *fb)
 {
   int is_compressed;
 
@@ -1204,9 +1190,7 @@ info_reload_file_buffer_contents (fb)
    position directly on the separator that precedes this node.  If the node
    could not be found, return a NULL pointer. */
 static char *
-adjust_nodestart (node, min, max)
-     NODE *node;
-     int min, max;
+adjust_nodestart (NODE *node, int min, int max)
 {
   long position;
   SEARCH_BINDING node_body;
@@ -1247,7 +1231,7 @@ adjust_nodestart (node, min, max)
               nodedef += offset;
               nodedef += skip_whitespace (nodedef);
               offset = skip_node_characters (nodedef, DONT_SKIP_NEWLINES);
-              if ((offset == strlen (node->nodename)) &&
+              if (((unsigned int) offset == strlen (node->nodename)) &&
                   (strncmp (node->nodename, nodedef, offset) == 0))
                 {
                   node->contents = nodestart;
diff --git a/gnu/usr.bin/texinfo/info/pcterm.c b/gnu/usr.bin/texinfo/info/pcterm.c
index 7e5b0626ab0..d0d75106334 100644
--- a/gnu/usr.bin/texinfo/info/pcterm.c
+++ b/gnu/usr.bin/texinfo/info/pcterm.c
@@ -1,7 +1,7 @@
-/* pc_term.c -- How to handle the PC terminal for Info under MS-DOS/MS-Windows.
-   $Id: pcterm.c,v 1.1.1.2 2002/06/10 13:21:14 espie Exp $
+/* pcterm.c -- How to handle the PC terminal for Info under MS-DOS/MS-Windows.
+   $Id: pcterm.c,v 1.1.1.3 2006/07/17 16:03:45 espie Exp $
 
-   Copyright (C) 1998, 99 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2003, 2004 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
@@ -37,15 +37,6 @@
 
 extern int speech_friendly;	/* defined in info.c */
 
-#ifdef max
-# undef max
-#endif
-#ifdef min
-# undef min
-#endif
-#define max(x,y) ((x)>(y) ? (x) : (y))
-#define min(x,y) ((x)<(y) ? (x) : (y))
-
 /* **************************************************************** */
 /*                                                                  */
 /*                PC Terminal Output Functions                      */
@@ -77,7 +68,7 @@ pc_up_line (void)
 {
   int x, y;
   ScreenGetCursor (&y, &x);
-  ScreenSetCursor (max (y-1, 0), x);
+  ScreenSetCursor (MAX (y-1, 0), x);
 }
 
 /* Move the cursor down one line. */
@@ -86,7 +77,7 @@ pc_down_line (void)
 {
   int x, y;
   ScreenGetCursor (&y, &x);
-  ScreenSetCursor (min (screenheight-1, y+1), x);
+  ScreenSetCursor (MIN (screenheight-1, y+1), x);
 }
 
 /* Clear the entire terminal screen. */
@@ -671,7 +662,7 @@ int
 kill (pid_t pid, int sig)
 {
   static char interrupted_msg[] = "Interrupted\r\n";
-  static char stopped_msg[] = "Stopped.  Type \"exit RET\" to return.\r\n";
+  static char stopped_msg[] = "Stopped.  Type `exit RET' to return.\r\n";
   char cwd[PATH_MAX + 1];
 
   if (pid == getpid ()
diff --git a/gnu/usr.bin/texinfo/info/search.c b/gnu/usr.bin/texinfo/info/search.c
index 442bf683f29..c7fc3dc8d0b 100644
--- a/gnu/usr.bin/texinfo/info/search.c
+++ b/gnu/usr.bin/texinfo/info/search.c
@@ -1,7 +1,7 @@
 /* search.c -- searching large bodies of text.
-   $Id: search.c,v 1.1.1.4 2002/06/10 13:21:08 espie Exp $
+   $Id: search.c,v 1.1.1.5 2006/07/17 16:03:43 espie Exp $
 
-   Copyright (C) 1993, 97, 98 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1997, 1998, 2002, 2004 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
@@ -36,9 +36,7 @@
 
 /* A function which makes a binding with buffer and bounds. */
 SEARCH_BINDING *
-make_binding (buffer, start, end)
-     char *buffer;
-     long start, end;
+make_binding (char *buffer, long int start, long int end)
 {
   SEARCH_BINDING *binding;
 
@@ -53,8 +51,7 @@ make_binding (buffer, start, end)
 
 /* Make a copy of BINDING without duplicating the data. */
 SEARCH_BINDING *
-copy_binding (binding)
-     SEARCH_BINDING *binding;
+copy_binding (SEARCH_BINDING *binding)
 {
   SEARCH_BINDING *copy;
 
@@ -73,9 +70,7 @@ copy_binding (binding)
 /* Search forwards or backwards for the text delimited by BINDING.
    The search is forwards if BINDING->start is greater than BINDING->end. */
 long
-search (string, binding)
-     char *string;
-     SEARCH_BINDING *binding;
+search (char *string, SEARCH_BINDING *binding)
 {
   long result;
 
@@ -90,9 +85,7 @@ search (string, binding)
 
 /* Search forwards for STRING through the text delimited in BINDING. */
 long
-search_forward (string, binding)
-     char *string;
-     SEARCH_BINDING *binding;
+search_forward (char *string, SEARCH_BINDING *binding)
 {
   register int c, i, len;
   register char *buff, *end;
@@ -151,9 +144,7 @@ search_forward (string, binding)
 
 /* Search for STRING backwards through the text delimited in BINDING. */
 long
-search_backward (input_string, binding)
-     char *input_string;
-     SEARCH_BINDING *binding;
+search_backward (char *input_string, SEARCH_BINDING *binding)
 {
   register int c, i, len;
   register char *buff, *end;
@@ -225,8 +216,7 @@ search_backward (input_string, binding)
    Return an offset of -1 if STRING does not appear in LINE.  The search
    is bound by the end of the line (i.e., either NEWLINE or 0). */
 int
-string_in_line (string, line)
-     char *string, *line;
+string_in_line (char *string, char *line)
 {
   register int end;
   SEARCH_BINDING binding;
@@ -245,9 +235,7 @@ string_in_line (string, line)
 
 /* Return non-zero if STRING is the first text to appear at BINDING. */
 int
-looking_at (string, binding)
-     char *string;
-     SEARCH_BINDING *binding;
+looking_at (char *string, SEARCH_BINDING *binding)
 {
   long search_end;
 
@@ -273,8 +261,7 @@ looking_at (string, binding)
 
 /* Return the index of the first non-whitespace character in STRING. */
 int
-skip_whitespace (string)
-     char *string;
+skip_whitespace (char *string)
 {
   register int i;
 
@@ -285,8 +272,7 @@ skip_whitespace (string)
 /* Return the index of the first non-whitespace or newline character in
    STRING. */
 int
-skip_whitespace_and_newlines (string)
-     char *string;
+skip_whitespace_and_newlines (char *string)
 {
   register int i;
 
@@ -296,8 +282,7 @@ skip_whitespace_and_newlines (string)
 
 /* Return the index of the first whitespace character in STRING. */
 int
-skip_non_whitespace (string)
-     char *string;
+skip_non_whitespace (char *string)
 {
   register int i;
 
@@ -313,9 +298,7 @@ skip_non_whitespace (string)
    the period.  If second argument NEWLINES_OKAY is non-zero, newlines should
    be skipped while parsing out the nodename specification. */
 int
-skip_node_characters (string, newlines_okay)
-     char *string;
-     int newlines_okay;
+skip_node_characters (char *string, int newlines_okay)
 {
   register int c, i = 0;
   int paren_seen = 0;
@@ -381,8 +364,7 @@ skip_node_characters (string, newlines_okay)
    BINDING-buffer.  The search starts at BINDING->start.  Return -1 if no node
    separator was found. */
 long
-find_node_separator (binding)
-     SEARCH_BINDING *binding;
+find_node_separator (SEARCH_BINDING *binding)
 {
   register long i;
   char *body;
@@ -407,8 +389,7 @@ find_node_separator (binding)
 /* Return the length of the node separator characters that BODY is
    currently pointing at. */
 int
-skip_node_separator (body)
-     char *body;
+skip_node_separator (char *body)
 {
   register int i;
 
@@ -432,8 +413,7 @@ skip_node_separator (body)
 /* Return the number of characters from STRING to the start of
    the next line. */
 int
-skip_line (string)
-     char *string;
+skip_line (char *string)
 {
   register int i;
 
@@ -448,23 +428,23 @@ skip_line (string)
 /* Return the absolute position of the beginning of a tags table in this
    binding starting the search at binding->start. */
 long
-find_tags_table (binding)
-     SEARCH_BINDING *binding;
+find_tags_table (SEARCH_BINDING *binding)
 {
-  SEARCH_BINDING search;
+  SEARCH_BINDING tmp_search;
   long position;
 
-  search.buffer = binding->buffer;
-  search.start = binding->start;
-  search.end = binding->end;
-  search.flags = S_FoldCase;
+  tmp_search.buffer = binding->buffer;
+  tmp_search.start = binding->start;
+  tmp_search.end = binding->end;
+  tmp_search.flags = S_FoldCase;
 
-  while ((position = find_node_separator (&search)) != -1 )
+  while ((position = find_node_separator (&tmp_search)) != -1 )
     {
-      search.start = position;
-      search.start += skip_node_separator (search.buffer + search.start);
+      tmp_search.start = position;
+      tmp_search.start += skip_node_separator (tmp_search.buffer
+          + tmp_search.start);
 
-      if (looking_at (TAGS_TABLE_BEG_LABEL, &search))
+      if (looking_at (TAGS_TABLE_BEG_LABEL, &tmp_search))
         return (position);
     }
   return (-1);
@@ -476,41 +456,41 @@ find_tags_table (binding)
    really point to the right node.  It returns the absolute position of
    the separator preceding the node. */
 long
-find_node_in_binding (nodename, binding)
-     char *nodename;
-     SEARCH_BINDING *binding;
+find_node_in_binding (char *nodename, SEARCH_BINDING *binding)
 {
   long position;
   int offset, namelen;
-  SEARCH_BINDING search;
+  SEARCH_BINDING tmp_search;
 
   namelen = strlen (nodename);
 
-  search.buffer = binding->buffer;
-  search.start = binding->start;
-  search.end = binding->end;
-  search.flags = 0;
+  tmp_search.buffer = binding->buffer;
+  tmp_search.start = binding->start;
+  tmp_search.end = binding->end;
+  tmp_search.flags = 0;
 
-  while ((position = find_node_separator (&search)) != -1)
+  while ((position = find_node_separator (&tmp_search)) != -1)
     {
-      search.start = position;
-      search.start += skip_node_separator (search.buffer + search.start);
+      tmp_search.start = position;
+      tmp_search.start += skip_node_separator
+        (tmp_search.buffer + tmp_search.start);
 
-      offset = string_in_line (INFO_NODE_LABEL, search.buffer + search.start);
+      offset = string_in_line
+        (INFO_NODE_LABEL, tmp_search.buffer + tmp_search.start);
 
       if (offset == -1)
         continue;
 
-      search.start += offset;
-      search.start += skip_whitespace (search.buffer + search.start);
+      tmp_search.start += offset;
+      tmp_search.start += skip_whitespace (tmp_search.buffer + tmp_search.start);
       offset = skip_node_characters
-        (search.buffer + search.start, DONT_SKIP_NEWLINES);
+        (tmp_search.buffer + tmp_search.start, DONT_SKIP_NEWLINES);
 
       /* Notice that this is an exact match.  You cannot grovel through
          the buffer with this function looking for random nodes. */
        if ((offset == namelen) &&
-           (search.buffer[search.start] == nodename[0]) &&
-           (strncmp (search.buffer + search.start, nodename, offset) == 0))
+           (tmp_search.buffer[tmp_search.start] == nodename[0]) &&
+           (strncmp (tmp_search.buffer + tmp_search.start, nodename, offset) == 0))
          return (position);
     }
   return (-1);
diff --git a/gnu/usr.bin/texinfo/info/session.h b/gnu/usr.bin/texinfo/info/session.h
index 7309e94a978..ae3e0e5f3f0 100644
--- a/gnu/usr.bin/texinfo/info/session.h
+++ b/gnu/usr.bin/texinfo/info/session.h
@@ -1,7 +1,8 @@
 /* session.h -- Functions found in session.c.
-   $Id: session.h,v 1.1.1.4 2002/06/10 13:21:10 espie Exp $
+   $Id: session.h,v 1.1.1.5 2006/07/17 16:03:44 espie Exp $
 
-   Copyright (C) 1993, 98, 99, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1998, 1999, 2001, 2002, 2004 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
@@ -32,7 +33,7 @@
    utility program `makedoc', which is also responsible for making
    the documentation/function-pointer maps. */
 #define DECLARE_INFO_COMMAND(name, doc) \
-void name (window, count, key) WINDOW *window; int count; unsigned char key;
+void name (WINDOW *window, int count, unsigned char key)
 
 /* Variables found in session.h. */
 extern VFunction *info_last_executed_command;
@@ -60,27 +61,38 @@ extern char *info_scroll_choices[];
 #define IS_PageOnly   2 /* Simply give up at the bottom of a node. */
 
 /* Utility functions found in session.c */
-extern void info_dispatch_on_key ();
-extern unsigned char info_get_input_char (), info_get_another_input_char ();
-extern unsigned char info_input_pending_p ();
-extern void remember_window_and_node (), set_remembered_pagetop_and_point ();
-extern void set_window_pagetop (), info_set_node_of_window ();
-extern void initialize_keyseq (), add_char_to_keyseq ();
-extern void info_gather_typeahead ();
-extern FILE_BUFFER *file_buffer_of_window ();
-extern long info_search_in_node (), info_target_search_node ();
-extern void info_select_reference ();
-extern int info_any_buffered_input_p ();
-extern void print_node ();
-extern void dump_node_to_file (), dump_nodes_to_file ();
-extern char *program_name_from_file_name ();
+extern void info_dispatch_on_key (unsigned char key, Keymap map);
+extern unsigned char info_get_input_char (void);
+extern unsigned char info_get_another_input_char (void);
+extern unsigned char info_input_pending_p (void);
+extern void remember_window_and_node (WINDOW *window, NODE *node);
+extern void set_remembered_pagetop_and_point (WINDOW *window);
+extern void set_window_pagetop (WINDOW *window, int desired_top);
+extern void info_set_node_of_window (int remember, WINDOW *window,
+    NODE *node);
+extern void initialize_keyseq (void);
+extern void add_char_to_keyseq (char character);
+extern void info_gather_typeahead (void);
+extern FILE_BUFFER *file_buffer_of_window (WINDOW *window);
+extern long info_search_in_node (char *string, NODE *node,
+    long int start, WINDOW *window, int dir, int case_sensitive);
+extern long info_target_search_node (NODE *node, char *string,
+    long int start);
+extern void info_select_reference (WINDOW *window, REFERENCE *entry);
+extern int info_any_buffered_input_p (void);
+extern void print_node (NODE *node);
+extern void dump_node_to_file (NODE *node, char *filename,
+    int dump_subnodes);
+extern void dump_nodes_to_file (char *filename, char **nodenames,
+    char *output_filename, int dump_subnodes);
+extern char *program_name_from_file_name (char *file_name);
 
 /* Do the physical deletion of WINDOW, and forget this window and
    associated nodes. */
-extern void info_delete_window_internal ();
+extern void info_delete_window_internal (WINDOW *window);
 
 /* Tell Info that input is coming from the file FILENAME. */
-extern void info_set_input_from_file ();
+extern void info_set_input_from_file (char *filename);
 
 #define return_if_control_g(val) \
   do { \
@@ -92,59 +104,134 @@ extern void info_set_input_from_file ();
 /* The names of the functions that run an info session. */
 
 /* Starting an info session. */
-extern void begin_multiple_window_info_session (), begin_info_session ();
-extern void begin_info_session_with_error (), info_session ();
-extern void info_read_and_dispatch ();
+extern void begin_multiple_window_info_session (char *filename,
+    char **nodenames);
+extern void begin_info_session (NODE *initial_node);
+extern void begin_info_session_with_error (NODE *initial_node,
+    char *format, void *arg1, void *arg2);
+extern void info_session (void);
+extern void initialize_info_session (NODE *node, int clear_screen);
+extern void info_read_and_dispatch (void);
+extern void info_intuit_options_node (WINDOW *window,
+    NODE *initial_node, char *program);
 
 /* Moving the point within a node. */
-extern void info_next_line (), info_prev_line ();
-extern void info_end_of_line (), info_beginning_of_line ();
-extern void info_forward_char (), info_backward_char ();
-extern void info_forward_word (), info_backward_word ();
-extern void info_beginning_of_node (), info_end_of_node ();
-extern void info_move_to_prev_xref (), info_move_to_next_xref ();
+extern void info_next_line (WINDOW *window, int count, unsigned char key);
+extern void info_prev_line (WINDOW *window, int count, unsigned char key);
+extern void info_end_of_line (WINDOW *window, int count, unsigned char key);
+extern void info_beginning_of_line (WINDOW *window, int count, unsigned char key);
+extern void info_forward_char (WINDOW *window, int count, unsigned char key);
+extern void info_backward_char (WINDOW *window, int count, unsigned char key);
+extern void info_forward_word (WINDOW *window, int count, unsigned char key);
+extern void info_backward_word (WINDOW *window, int count, unsigned char key);
+extern void info_beginning_of_node (WINDOW *window, int count, unsigned char key);
+extern void info_end_of_node (WINDOW *window, int count, unsigned char key);
+extern void info_move_to_prev_xref (WINDOW *window, int count, unsigned char key);
+extern void info_move_to_next_xref (WINDOW *window, int count, unsigned char key);
 
 /* Scrolling text within a window. */
-extern void info_scroll_forward (), info_scroll_backward ();
-extern void info_redraw_display (), info_toggle_wrap ();
-extern void info_move_to_window_line ();
-extern void info_up_line (), info_down_line ();
-extern void info_scroll_half_screen_down (), info_scroll_half_screen_up ();
+extern void info_scroll_forward (WINDOW *window, int count, unsigned char key);
+extern void info_scroll_backward (WINDOW *window, int count, unsigned char key);
+extern void info_redraw_display (WINDOW *window, int count, unsigned char key);
+extern void info_toggle_wrap (WINDOW *window, int count, unsigned char key);
+extern void info_move_to_window_line (WINDOW *window, int count,
+    unsigned char key);
+extern void info_up_line (WINDOW *window, int count, unsigned char key);
+extern void info_down_line (WINDOW *window, int count, unsigned char key);
+extern void info_scroll_half_screen_down (WINDOW *window, int count,
+    unsigned char key);
+extern void info_scroll_half_screen_up (WINDOW *window, int count,
+    unsigned char key);
+extern void info_scroll_forward_set_window (WINDOW *window, int count,
+    unsigned char key);
+extern void info_scroll_forward_page_only (WINDOW *window, int count,
+    unsigned char key);
+extern void info_scroll_forward_page_only_set_window (WINDOW *window, int count,
+    unsigned char key);
+extern void info_scroll_backward_set_window (WINDOW *window, int count,
+    unsigned char key);
+extern void info_scroll_backward_page_only (WINDOW *window, int count,
+    unsigned char key);
+extern void info_scroll_backward_page_only_set_window (WINDOW *window, int count,
+    unsigned char key);
+extern void info_scroll_other_window_backward (WINDOW *window, int count,
+    unsigned char key);
 
 /* Manipulating multiple windows. */
-extern void info_split_window (), info_delete_window ();
-extern void info_keep_one_window (), info_grow_window ();
-extern void info_scroll_other_window (), info_tile_windows ();
-extern void info_next_window (), info_prev_window ();
+extern void info_split_window (WINDOW *window, int count, unsigned char key);
+extern void info_delete_window (WINDOW *window, int count, unsigned char key);
+extern void info_keep_one_window (WINDOW *window, int count, unsigned char key);
+extern void info_grow_window (WINDOW *window, int count, unsigned char key);
+extern void info_scroll_other_window (WINDOW *window, int count,
+    unsigned char key);
+extern void info_tile_windows (WINDOW *window, int count, unsigned char key);
+extern void info_next_window (WINDOW *window, int count, unsigned char key);
+extern void info_prev_window (WINDOW *window, int count, unsigned char key);
 
 /* Selecting nodes. */
-extern void info_next_node (), info_prev_node (), info_up_node ();
-extern void info_last_node (), info_first_node (), info_history_node ();
-extern void info_goto_node (), info_top_node (), info_dir_node ();
-extern void info_global_next_node (), info_global_prev_node ();
-extern void info_kill_node (), info_view_file ();
-extern void info_menu_sequence ();
-extern NODE *info_follow_menus (/* initial_node, menus, errstr, errarg */);
+extern void info_next_node (WINDOW *window, int count, unsigned char key);
+extern void info_prev_node (WINDOW *window, int count, unsigned char key);
+extern void info_up_node (WINDOW *window, int count, unsigned char key);
+extern void info_last_node (WINDOW *window, int count, unsigned char key);
+extern void info_first_node (WINDOW *window, int count, unsigned char key);
+extern void info_history_node (WINDOW *window, int count, unsigned char key);
+extern void info_goto_node (WINDOW *window, int count, unsigned char key);
+extern void info_goto_invocation_node (WINDOW *window, int count,
+    unsigned char key);
+extern void info_top_node (WINDOW *window, int count, unsigned char key);
+extern void info_dir_node (WINDOW *window, int count, unsigned char key);
+extern void info_global_next_node (WINDOW *window, int count, unsigned char key);
+extern void info_global_prev_node (WINDOW *window, int count, unsigned char key);
+extern void info_kill_node (WINDOW *window, int count, unsigned char key);
+extern void info_view_file (WINDOW *window, int count, unsigned char key);
+extern void info_menu_sequence (WINDOW *window, int count, unsigned char key);
+extern NODE *info_follow_menus (NODE *initial_node, char **menus,
+    const char **errstr, char **errarg1, char **errarg2);
+extern void info_man (WINDOW *window, int count, unsigned char key);
+extern void list_visited_nodes (WINDOW *window, int count, unsigned char key);
+extern void select_visited_node (WINDOW *window, int count, unsigned char key);
 
 /* Selecting cross references. */
-extern void info_menu_digit (), info_menu_item (), info_xref_item ();
-extern void info_find_menu (), info_select_reference_this_line ();
+extern void info_menu_digit (WINDOW *window, int count, unsigned char key);
+extern void info_menu_item (WINDOW *window, int count, unsigned char key);
+extern void info_xref_item (WINDOW *window, int count, unsigned char key);
+extern void info_find_menu (WINDOW *window, int count, unsigned char key);
+extern void info_select_reference_this_line (WINDOW *window, int count,
+    unsigned char key);
+extern void info_last_menu_item (WINDOW *window, int count, unsigned char key);
+extern void info_visit_menu (WINDOW *window, int count, unsigned char key);
 
 /* Hacking numeric arguments. */
 extern int info_explicit_arg, info_numeric_arg, info_numeric_arg_sign;
 
-extern void info_add_digit_to_numeric_arg (), info_universal_argument ();
-extern void info_initialize_numeric_arg (), info_numeric_arg_digit_loop ();
+extern void info_add_digit_to_numeric_arg (WINDOW *window, int count,
+    unsigned char key);
+extern void info_universal_argument (WINDOW *window, int count,
+    unsigned char key);
+extern void info_initialize_numeric_arg (void);
+extern void info_numeric_arg_digit_loop (WINDOW *window, int count,
+    unsigned char key);
 
 /* Searching commands. */
-extern void info_search (), isearch_forward (), isearch_backward ();
-extern void info_search_case_sensitively (), info_search_backward ();
-extern void info_search_next (), info_search_previous ();
+extern void info_search (WINDOW *window, int count, unsigned char key);
+extern void isearch_forward (WINDOW *window, int count, unsigned char key);
+extern void isearch_backward (WINDOW *window, int count, unsigned char key);
+extern void info_search_case_sensitively (WINDOW *window, int count,
+    unsigned char key);
+extern void info_search_backward (WINDOW *window, int count, unsigned char key);
+extern void info_search_next (WINDOW *window, int count, unsigned char key);
+extern void info_search_previous (WINDOW *window, int count, unsigned char key);
 
 /* Dumping and printing nodes. */
-extern void info_print_node ();
+extern void info_print_node (WINDOW *window, int count, unsigned char key);
+
+/* Footnotes.  */
+extern void info_show_footnotes (WINDOW *window, int count, unsigned char key);
 
 /* Miscellaneous commands. */
-extern void info_abort_key (), info_quit (), info_do_lowercase_version ();
+extern void info_abort_key (WINDOW *window, int count, unsigned char key);
+extern void info_quit (WINDOW *window, int count, unsigned char key);
+extern void info_do_lowercase_version (WINDOW *window, int count,
+    unsigned char key);
 
 #endif /* not SESSION_H */
diff --git a/gnu/usr.bin/texinfo/info/signals.c b/gnu/usr.bin/texinfo/info/signals.c
index 0fd9fc0c63a..779d325bb13 100644
--- a/gnu/usr.bin/texinfo/info/signals.c
+++ b/gnu/usr.bin/texinfo/info/signals.c
@@ -1,7 +1,8 @@
-/* signals.c -- install and maintain Info signal handlers.
-   $Id: signals.c,v 1.1.1.3 2000/02/09 01:25:00 espie Exp $
+/* signals.c -- install and maintain signal handlers.
+   $Id: signals.c,v 1.1.1.4 2006/07/17 16:03:44 espie Exp $
 
-   Copyright (C) 1993, 94, 95, 98 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995, 1998, 2002, 2003, 2004 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
@@ -17,25 +18,23 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Written by Brian Fox (bfox@ai.mit.edu). */
+   Originally written by Brian Fox (bfox@ai.mit.edu). */
 
 #include "info.h"
 #include "signals.h"
 
+void initialize_info_signal_handler (void);
+
 /* **************************************************************** */
 /*                                                                  */
 /*              Pretending That We Have POSIX Signals               */
 /*                                                                  */
 /* **************************************************************** */
 
-/* Non-zero when our signal handler has been called to handle SIGWINCH. */
-static int in_sigwinch = 0;
-
 #if !defined (HAVE_SIGPROCMASK) && defined (HAVE_SIGSETMASK)
 /* Perform OPERATION on NEWSET, perhaps leaving information in OLDSET. */
 static void
-sigprocmask (operation, newset, oldset)
-     int operation, *newset, *oldset;
+sigprocmask (int operation, int *newset, int *oldset)
 {
   switch (operation)
     {
@@ -63,37 +62,98 @@ sigprocmask (operation, newset, oldset)
 /*                                                                  */
 /* **************************************************************** */
 
-typedef RETSIGTYPE signal_handler ();
+#if defined (HAVE_SIGACTION) || defined (HAVE_SIGPROCMASK) ||\
+  defined (HAVE_SIGSETMASK)
+static void
+mask_termsig (sigset_t *set)
+{
+# if defined (SIGTSTP)
+  sigaddset (set, SIGTSTP);
+  sigaddset (set, SIGTTOU);
+  sigaddset (set, SIGTTIN);
+# endif
+# if defined (SIGWINCH)
+  sigaddset (set, SIGWINCH);
+# endif
+#if defined (SIGQUIT)
+  sigaddset (set, SIGQUIT);
+#endif
+#if defined (SIGINT)
+  sigaddset (set, SIGINT);
+#endif
+# if defined (SIGUSR1)
+  sigaddset (set, SIGUSR1);
+# endif
+}
+#endif /* HAVE_SIGACTION || HAVE_SIGPROCMASK || HAVE_SIGSETMASK */
+
+static RETSIGTYPE info_signal_proc (int sig);
+#if defined (HAVE_SIGACTION)
+typedef struct sigaction signal_info;
+signal_info info_signal_handler;
+
+static void
+set_termsig (int sig, signal_info *old)
+{
+  sigaction (sig, &info_signal_handler, old);
+}
+
+static void
+restore_termsig (int sig, const signal_info *saved)
+{
+  sigaction (sig, saved, NULL);
+}
+#else /* !HAVE_SIGACTION */
+typedef RETSIGTYPE (*signal_info) ();
+#define set_termsig(sig, old) (void)(*(old) = signal (sig, info_signal_proc))
+#define restore_termsig(sig, saved) (void)signal (sig, *(saved))
+#define info_signal_handler info_signal_proc
+static int term_conf_busy = 0;
+#endif /* !HAVE_SIGACTION */
 
-static RETSIGTYPE info_signal_handler ();
-static signal_handler *old_TSTP, *old_TTOU, *old_TTIN;
-static signal_handler *old_WINCH, *old_INT, *old_USR1;
+static signal_info old_TSTP, old_TTOU, old_TTIN;
+static signal_info old_WINCH, old_INT, old_USR1;
+static signal_info old_QUIT;
 
 void
-initialize_info_signal_handler ()
+initialize_info_signal_handler (void)
 {
+#ifdef SA_NOCLDSTOP
+  /* (Based on info from Paul Eggert found in coreutils.)  Don't use
+     HAVE_SIGACTION to decide whether to use the sa_handler, sa_flags,
+     sa_mask members, as some systems (Solaris 7+) don't define them.  Use
+     SA_NOCLDSTOP instead; it's been part of POSIX.1 since day 1 (in 1988).  */
+  info_signal_handler.sa_handler = info_signal_proc;
+  info_signal_handler.sa_flags = 0;
+  mask_termsig (&info_signal_handler.sa_mask);
+#endif /* SA_NOCLDSTOP */
+
 #if defined (SIGTSTP)
-  old_TSTP = (signal_handler *) signal (SIGTSTP, info_signal_handler);
-  old_TTOU = (signal_handler *) signal (SIGTTOU, info_signal_handler);
-  old_TTIN = (signal_handler *) signal (SIGTTIN, info_signal_handler);
+  set_termsig (SIGTSTP, &old_TSTP);
+  set_termsig (SIGTTOU, &old_TTOU);
+  set_termsig (SIGTTIN, &old_TTIN);
 #endif /* SIGTSTP */
 
 #if defined (SIGWINCH)
-  old_WINCH = (signal_handler *) signal (SIGWINCH, info_signal_handler);
+  set_termsig (SIGWINCH, &old_WINCH);
+#endif
+
+#if defined (SIGQUIT)
+  set_termsig (SIGQUIT, &old_QUIT);
 #endif
 
 #if defined (SIGINT)
-  old_INT = (signal_handler *) signal (SIGINT, info_signal_handler);
+  set_termsig (SIGINT, &old_INT);
 #endif
 
 #if defined (SIGUSR1)
   /* Used by DJGPP to simulate SIGTSTP on Ctrl-Z.  */
-  old_USR1 = (signal_handler *) signal (SIGUSR1, info_signal_handler);
+  set_termsig (SIGUSR1, &old_USR1);
 #endif
 }
 
 static void
-redisplay_after_signal ()
+redisplay_after_signal (void)
 {
   terminal_clear_screen ();
   display_clear_display (the_display);
@@ -104,7 +164,7 @@ redisplay_after_signal ()
 }
 
 static void
-reset_info_window_sizes ()
+reset_info_window_sizes (void)
 {
   terminal_goto_xy (0, 0);
   fflush (stdout);
@@ -112,16 +172,29 @@ reset_info_window_sizes ()
   terminal_get_screen_size ();
   terminal_prep_terminal ();
   display_initialize_display (screenwidth, screenheight);
-  window_new_screen_size (screenwidth, screenheight, NULL);
+  window_new_screen_size (screenwidth, screenheight);
   redisplay_after_signal ();
 }
 
 static RETSIGTYPE
-info_signal_handler (sig)
-     int sig;
+info_signal_proc (int sig)
 {
-  signal_handler **old_signal_handler;
+  signal_info *old_signal_handler = NULL;
 
+#if !defined (HAVE_SIGACTION)
+  /* best effort: first increment this counter and later block signals */
+  if (term_conf_busy)
+    return;
+  term_conf_busy++;
+#if defined (HAVE_SIGPROCMASK) || defined (HAVE_SIGSETMASK)
+    {
+      sigset_t nvar, ovar;
+      sigemptyset (&nvar);
+      mask_termsig (&nvar);
+      sigprocmask (SIG_BLOCK, &nvar, &ovar);
+    }
+#endif /* HAVE_SIGPROCMASK || HAVE_SIGSETMASK */
+#endif /* !HAVE_SIGACTION */
   switch (sig)
     {
 #if defined (SIGTSTP)
@@ -129,6 +202,9 @@ info_signal_handler (sig)
     case SIGTTOU:
     case SIGTTIN:
 #endif
+#if defined (SIGQUIT)
+    case SIGQUIT:
+#endif
 #if defined (SIGINT)
     case SIGINT:
 #endif
@@ -141,8 +217,14 @@ info_signal_handler (sig)
         if (sig == SIGTTIN)
           old_signal_handler = &old_TTIN;
 #endif /* SIGTSTP */
+#if defined (SIGQUIT)
+        if (sig == SIGQUIT)
+          old_signal_handler = &old_QUIT;
+#endif /* SIGQUIT */
+#if defined (SIGINT)
         if (sig == SIGINT)
           old_signal_handler = &old_INT;
+#endif /* SIGINT */
 
         /* For stop signals, restore the terminal IO, leave the cursor
            at the bottom of the window, and stop us. */
@@ -150,17 +232,17 @@ info_signal_handler (sig)
         terminal_clear_to_eol ();
         fflush (stdout);
         terminal_unprep_terminal ();
-        signal (sig, *old_signal_handler);
-        UNBLOCK_SIGNAL (sig);
-        kill (getpid (), sig);
+	restore_termsig (sig, old_signal_handler);
+	UNBLOCK_SIGNAL (sig);
+	kill (getpid (), sig);
 
         /* The program is returning now.  Restore our signal handler,
            turn on terminal handling, redraw the screen, and place the
            cursor where it belongs. */
         terminal_prep_terminal ();
-        *old_signal_handler = (signal_handler *) signal (sig, info_signal_handler);
-        redisplay_after_signal ();
-        fflush (stdout);
+	set_termsig (sig, old_signal_handler);
+	/* window size might be changed while sleeping */
+	reset_info_window_sizes ();
       }
       break;
 
@@ -172,35 +254,42 @@ info_signal_handler (sig)
     case SIGUSR1:
 #endif
       {
-        if (!in_sigwinch) {
-          in_sigwinch++;
-          
-          /* Turn off terminal IO, tell our parent that the window has changed,
-             then reinitialize the terminal and rebuild our windows. */
+	/* Turn off terminal IO, tell our parent that the window has changed,
+	   then reinitialize the terminal and rebuild our windows. */
 #ifdef SIGWINCH
-          if (sig == SIGWINCH)
-            old_signal_handler = &old_WINCH;
+	if (sig == SIGWINCH)
+	  old_signal_handler = &old_WINCH;
 #endif
 #ifdef SIGUSR1
-          if (sig == SIGUSR1)
-            old_signal_handler = &old_USR1;
+	if (sig == SIGUSR1)
+	  old_signal_handler = &old_USR1;
 #endif
-          terminal_goto_xy (0, 0);
-          fflush (stdout);
-          terminal_unprep_terminal ();
-          signal (sig, *old_signal_handler);
-          UNBLOCK_SIGNAL (sig);
-          kill (getpid (), sig);
-
-          /* After our old signal handler returns... */
-          *old_signal_handler
-            = (signal_handler *) signal (sig, info_signal_handler);
-          terminal_prep_terminal ();
-          reset_info_window_sizes ();
-          in_sigwinch--;
-        }
+	terminal_goto_xy (0, 0);
+	fflush (stdout);
+	terminal_unprep_terminal (); /* needless? */
+	restore_termsig (sig, old_signal_handler);
+	UNBLOCK_SIGNAL (sig);
+	kill (getpid (), sig);
+
+	/* After our old signal handler returns... */
+	set_termsig (sig, old_signal_handler); /* needless? */
+	terminal_prep_terminal ();
+	reset_info_window_sizes ();
       }
       break;
 #endif /* SIGWINCH || SIGUSR1 */
     }
+#if !defined (HAVE_SIGACTION)
+  /* at this time it is safer to perform unblock after decrement */
+  term_conf_busy--;
+#if defined (HAVE_SIGPROCMASK) || defined (HAVE_SIGSETMASK)
+    {
+      sigset_t nvar, ovar;
+      sigemptyset (&nvar);
+      mask_termsig (&nvar);
+      sigprocmask (SIG_UNBLOCK, &nvar, &ovar);
+    }
+#endif /* HAVE_SIGPROCMASK || HAVE_SIGSETMASK */
+#endif /* !HAVE_SIGACTION */
 }
+/* vim: set sw=2 cino={1s>2sn-s^-se-s: */
diff --git a/gnu/usr.bin/texinfo/info/terminal.h b/gnu/usr.bin/texinfo/info/terminal.h
index e2fa2969c14..92a3e1e7cb2 100644
--- a/gnu/usr.bin/texinfo/info/terminal.h
+++ b/gnu/usr.bin/texinfo/info/terminal.h
@@ -1,7 +1,8 @@
 /* terminal.h -- The external interface to terminal I/O.
-   $Id: terminal.h,v 1.1.1.4 2002/06/10 13:21:11 espie Exp $
+   $Id: terminal.h,v 1.1.1.5 2006/07/17 16:03:44 espie Exp $
 
-   Copyright (C) 1993, 96, 97, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1996, 1997, 2001, 2002, 2004 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
@@ -52,68 +53,71 @@ extern int terminal_can_scroll;
    The variables SCREENHEIGHT and SCREENWIDTH are set to the dimensions that
    this terminal actually has.  The variable TERMINAL_HAS_META_P becomes non-
    zero if this terminal supports a Meta key. */
-extern void terminal_initialize_terminal ();
+extern void terminal_initialize_terminal (char *terminal_name);
 extern VFunction *terminal_initialize_terminal_hook;
 
 /* Return the current screen width and height in the variables
    SCREENWIDTH and SCREENHEIGHT. */
-extern void terminal_get_screen_size ();
+extern void terminal_get_screen_size (void);
 extern VFunction *terminal_get_screen_size_hook;
 
 /* Save and restore tty settings. */
-extern void terminal_prep_terminal (), terminal_unprep_terminal ();
-extern VFunction *terminal_prep_terminal_hook, *terminal_unprep_terminal_hook;
+extern void terminal_prep_terminal (void);
+extern void terminal_unprep_terminal (void);
+
+extern VFunction *terminal_prep_terminal_hook;
+extern VFunction *terminal_unprep_terminal_hook;
 
 /* Re-initialize the terminal to TERMINAL_NAME. */
-extern void terminal_new_terminal ();
+extern void terminal_new_terminal (char *terminal_name);
 extern VFunction *terminal_new_terminal_hook;
 
 /* Move the cursor to the terminal location of X and Y. */
-extern void terminal_goto_xy ();
+extern void terminal_goto_xy (int x, int y);
 extern VFunction *terminal_goto_xy_hook;
 
 /* Print STRING to the terminal at the current position. */
-extern void terminal_put_text ();
+extern void terminal_put_text (char *string);
 extern VFunction *terminal_put_text_hook;
 
 /* Print NCHARS from STRING to the terminal at the current position. */
-extern void terminal_write_chars ();
+extern void terminal_write_chars (char *string, int nchars);
 extern VFunction *terminal_write_chars_hook;
 
 /* Clear from the current position of the cursor to the end of the line. */
-extern void terminal_clear_to_eol ();
+extern void terminal_clear_to_eol (void);
 extern VFunction *terminal_clear_to_eol_hook;
 
 /* Clear the entire terminal screen. */
-extern void terminal_clear_screen ();
+extern void terminal_clear_screen (void);
 extern VFunction *terminal_clear_screen_hook;
 
 /* Move the cursor up one line. */
-extern void terminal_up_line ();
+extern void terminal_up_line (void);
 extern VFunction *terminal_up_line_hook;
 
 /* Move the cursor down one line. */
-extern void terminal_down_line ();
+extern void terminal_down_line (void);
 extern VFunction *terminal_down_line_hook;
 
 /* Turn on reverse video if possible. */
-extern void terminal_begin_inverse ();
+extern void terminal_begin_inverse (void);
 extern VFunction *terminal_begin_inverse_hook;
 
 /* Turn off reverse video if possible. */
-extern void terminal_end_inverse ();
+extern void terminal_end_inverse (void);
 extern VFunction *terminal_end_inverse_hook;
 
 /* Scroll an area of the terminal, starting with the region from START
    to END, AMOUNT lines.  If AMOUNT is negative, the lines are scrolled
    towards the top of the screen, else they are scrolled towards the
    bottom of the screen. */
-extern void terminal_scroll_terminal ();
+extern void terminal_scroll_terminal (int start, int end, int amount);
 extern VFunction *terminal_scroll_terminal_hook;
 
 /* Ring the terminal bell.  The bell is run visibly if it both has one and
    terminal_use_visible_bell_p is non-zero. */
-extern void terminal_ring_bell ();
+extern void terminal_ring_bell (void);
 extern VFunction *terminal_ring_bell_hook;
 
 /* The key sequences output by special keys, if this terminal has any. */
diff --git a/gnu/usr.bin/texinfo/info/tilde.h b/gnu/usr.bin/texinfo/info/tilde.h
index 83f534b2bac..870b1c2b718 100644
--- a/gnu/usr.bin/texinfo/info/tilde.h
+++ b/gnu/usr.bin/texinfo/info/tilde.h
@@ -1,12 +1,10 @@
-/* tilde.h: Externally available variables and function in libtilde.a. */
-
-/* This file is part of GNU Info, a program for reading online documentation
-   stored in Info format.
+/* tilde.h: Externally available variables and function in libtilde.a.
+   $Id: tilde.h,v 1.1.1.3 2006/07/17 16:03:45 espie Exp $
 
    This file has appeared in prior works by the Free Software Foundation;
    thus it carries copyright dates from 1988 through 1993.
 
-   Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993 Free Software
+   Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 2004 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -47,10 +45,10 @@ extern char **tilde_additional_prefixes;
 extern char **tilde_additional_suffixes;
 
 /* Return a new string which is the result of tilde expanding STRING. */
-extern char *tilde_expand ();
+extern char *tilde_expand (char *string);
 
 /* Do the work of tilde expansion on FILENAME.  FILENAME starts with a
    tilde.  If there is no expansion, call tilde_expansion_failure_hook. */
-extern char *tilde_expand_word ();
+extern char *tilde_expand_word (char *filename);
 
 #endif /* not TILDE_H */
diff --git a/gnu/usr.bin/texinfo/install-sh b/gnu/usr.bin/texinfo/install-sh
index b41a2459161..6ebe46de6cf 100644
--- a/gnu/usr.bin/texinfo/install-sh
+++ b/gnu/usr.bin/texinfo/install-sh
@@ -1,19 +1,38 @@
 #!/bin/sh
-#
 # install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
+
+scriptversion=2004-12-17.09
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# Copyright 1991 by the Massachusetts Institute of Technology
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
 # `make' implicit rules from creating a file called install from it
@@ -23,13 +42,11 @@
 # from scratch.  It can only install one file at a time, a restriction
 # shared with many OS's install programs.
 
-
 # set DOITPROG to echo to test this script
 
 # Don't use :- since 4.3BSD and earlier shells don't like it.
 doit="${DOITPROG-}"
 
-
 # put in absolute paths if you don't have them in your path; or use env. vars.
 
 mvprog="${MVPROG-mv}"
@@ -41,211 +58,266 @@ stripprog="${STRIPPROG-strip}"
 rmprog="${RMPROG-rm}"
 mkdirprog="${MKDIRPROG-mkdir}"
 
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
 chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
+chowncmd=
+chgrpcmd=
+stripcmd=
 rmcmd="$rmprog -f"
 mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	true
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-		chmodcmd=""
-	else
-		instcmd=$mkdirprog
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		true
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		true
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		true
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='
-	'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
+src=
+dst=
+dir_arg=
+dstarg=
+no_target_directory=
+
+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+-c         (ignored)
+-d         create directories instead of installing files.
+-g GROUP   $chgrpprog installed files to GROUP.
+-m MODE    $chmodprog installed files to MODE.
+-o USER    $chownprog installed files to USER.
+-s         $stripprog installed files.
+-t DIRECTORY  install into DIRECTORY.
+-T         report an error if DSTFILE is a directory.
+--help     display this help and exit.
+--version  display version info and exit.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+"
+
+while test -n "$1"; do
+  case $1 in
+    -c) shift
+        continue;;
+
+    -d) dir_arg=true
+        shift
+        continue;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+        shift
+        shift
+        continue;;
+
+    --help) echo "$usage"; exit 0;;
+
+    -m) chmodcmd="$chmodprog $2"
+        shift
+        shift
+        continue;;
+
+    -o) chowncmd="$chownprog $2"
+        shift
+        shift
+        continue;;
+
+    -s) stripcmd=$stripprog
+        shift
+        continue;;
+
+    -t) dstarg=$2
 	shift
+	shift
+	continue;;
 
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		true
-	fi
-
-	pathcomp="${pathcomp}/"
+    -T) no_target_directory=true
+	shift
+	continue;;
+
+    --version) echo "$0 $scriptversion"; exit 0;;
+
+    *)  # When -d is used, all remaining arguments are directories to create.
+	# When -t is used, the destination is already specified.
+	test -n "$dir_arg$dstarg" && break
+        # Otherwise, the last argument is the destination.  Remove it from $@.
+	for arg
+	do
+          if test -n "$dstarg"; then
+	    # $@ is not empty: it contains at least $arg.
+	    set fnord "$@" "$dstarg"
+	    shift # fnord
+	  fi
+	  shift # arg
+	  dstarg=$arg
+	done
+	break;;
+  esac
 done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		true
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
 
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
+if test -z "$1"; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call `install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
 
-fi &&
+for src
+do
+  # Protect names starting with `-'.
+  case $src in
+    -*) src=./$src ;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    src=
+
+    if test -d "$dst"; then
+      mkdircmd=:
+      chmodcmd=
+    else
+      mkdircmd=$mkdirprog
+    fi
+  else
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dstarg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+
+    dst=$dstarg
+    # Protect names starting with `-'.
+    case $dst in
+      -*) dst=./$dst ;;
+    esac
 
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dstarg: Is a directory" >&2
+	exit 1
+      fi
+      dst=$dst/`basename "$src"`
+    fi
+  fi
+
+  # This sed command emulates the dirname command.
+  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+
+  # Make sure that the destination directory exists.
+
+  # Skip lots of stat calls in the usual case.
+  if test ! -d "$dstdir"; then
+    defaultIFS='
+	 '
+    IFS="${IFS-$defaultIFS}"
+
+    oIFS=$IFS
+    # Some sh's can't handle IFS=/ for some reason.
+    IFS='%'
+    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    shift
+    IFS=$oIFS
+
+    pathcomp=
+
+    while test $# -ne 0 ; do
+      pathcomp=$pathcomp$1
+      shift
+      if test ! -d "$pathcomp"; then
+        $mkdirprog "$pathcomp"
+	# mkdir can fail with a `File exist' error in case several
+	# install-sh are creating the directory concurrently.  This
+	# is OK.
+	test -d "$pathcomp" || exit
+      fi
+      pathcomp=$pathcomp/
+    done
+  fi
+
+  if test -n "$dir_arg"; then
+    $doit $mkdircmd "$dst" \
+      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
+
+  else
+    dstfile=`basename "$dst"`
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+    trap '(exit $?); exit' 1 2 13 15
+
+    # Copy the file name to the temp name.
+    $doit $cpprog "$src" "$dsttmp" &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+
+    # Now rename the file to the real destination.
+    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+      || {
+	   # The rename failed, perhaps because mv can't rename something else
+	   # to itself, or perhaps because mv is so ancient that it does not
+	   # support -f.
+
+	   # Now remove or move aside any old file at destination location.
+	   # We try this two ways since rm can't unlink itself on some
+	   # systems and the destination file might be busy for other
+	   # reasons.  In this case, the final cleanup might fail but the new
+	   # file should still install successfully.
+	   {
+	     if test -f "$dstdir/$dstfile"; then
+	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+	       || {
+		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+		 (exit 1); exit 1
+	       }
+	     else
+	       :
+	     fi
+	   } &&
+
+	   # Now rename the file to the real destination.
+	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+	 }
+    }
+  fi || { (exit 1); exit 1; }
+done
 
-exit 0
+# The final little trick to "correctly" pass the exit status to the exit trap.
+{
+  (exit 0); exit 0
+}
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/gnu/usr.bin/texinfo/intl/ChangeLog b/gnu/usr.bin/texinfo/intl/ChangeLog
index 478d83460ba..751291929dc 100644
--- a/gnu/usr.bin/texinfo/intl/ChangeLog
+++ b/gnu/usr.bin/texinfo/intl/ChangeLog
@@ -1,4 +1,4 @@
-2002-03-12  GNU  <bug-gnu-gettext@gnu.org>
+2004-01-29  GNU  <bug-gnu-gettext@gnu.org>
 
-	* Version 0.11.1 released.
+	* Version 0.14.1 released.
 
diff --git a/gnu/usr.bin/texinfo/intl/Makefile.in b/gnu/usr.bin/texinfo/intl/Makefile.in
index c2cb20f1138..05f15329e12 100644
--- a/gnu/usr.bin/texinfo/intl/Makefile.in
+++ b/gnu/usr.bin/texinfo/intl/Makefile.in
@@ -1,5 +1,5 @@
-# Makefile for directory with message catalog handling in GNU NLS Utilities.
-# Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.
+# Makefile for directory with message catalog handling library of GNU gettext
+# Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Library General Public License as published
@@ -24,7 +24,7 @@ SHELL = /bin/sh
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = ..
-VPATH = @srcdir@
+VPATH = $(srcdir)
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -40,7 +40,7 @@ subdir = intl
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
+mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
 
 l = @INTL_LIBTOOL_SUFFIX_PREFIX@
 
@@ -52,58 +52,91 @@ YACC = @INTLBISON@ -y -d
 YFLAGS = --name-prefix=__gettext
 
 DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \
--DLIBDIR=\"$(libdir)\" -DIN_LIBINTL @DEFS@
+-DLIBDIR=\"$(libdir)\" -DIN_LIBINTL \
+-DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \
+-Dset_relocation_prefix=libintl_set_relocation_prefix \
+-Drelocate=libintl_relocate \
+-DDEPENDS_ON_LIBICONV=1 @DEFS@
 CPPFLAGS = @CPPFLAGS@
 CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
 
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
 
-HEADERS = $(COMHDRS) libgnuintl.h loadinfo.h
-COMHDRS = gmo.h gettextP.h hash-string.h plural-exp.h eval-plural.h os2compat.h
-SOURCES = $(COMSRCS) intl-compat.c
-COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \
-finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \
-explodename.c dcigettext.c dcngettext.c dngettext.c ngettext.c plural.y \
-plural-exp.c localcharset.c localename.c osdep.c os2compat.c
-OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \
-finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \
-explodename.$lo dcigettext.$lo dcngettext.$lo dngettext.$lo ngettext.$lo \
-plural.$lo plural-exp.$lo localcharset.$lo localename.$lo osdep.$lo
-GETTOBJS = intl-compat.$lo
+HEADERS = \
+  gmo.h \
+  gettextP.h \
+  hash-string.h \
+  loadinfo.h \
+  plural-exp.h \
+  eval-plural.h \
+  localcharset.h \
+  relocatable.h \
+  xsize.h \
+  printf-args.h printf-args.c \
+  printf-parse.h wprintf-parse.h printf-parse.c \
+  vasnprintf.h vasnwprintf.h vasnprintf.c \
+  os2compat.h \
+  libgnuintl.h.in
+SOURCES = \
+  bindtextdom.c \
+  dcgettext.c \
+  dgettext.c \
+  gettext.c \
+  finddomain.c \
+  loadmsgcat.c \
+  localealias.c \
+  textdomain.c \
+  l10nflist.c \
+  explodename.c \
+  dcigettext.c \
+  dcngettext.c \
+  dngettext.c \
+  ngettext.c \
+  plural.y \
+  plural-exp.c \
+  localcharset.c \
+  relocatable.c \
+  localename.c \
+  log.c \
+  printf.c \
+  osdep.c \
+  os2compat.c \
+  intl-compat.c
+OBJECTS = \
+  bindtextdom.$lo \
+  dcgettext.$lo \
+  dgettext.$lo \
+  gettext.$lo \
+  finddomain.$lo \
+  loadmsgcat.$lo \
+  localealias.$lo \
+  textdomain.$lo \
+  l10nflist.$lo \
+  explodename.$lo \
+  dcigettext.$lo \
+  dcngettext.$lo \
+  dngettext.$lo \
+  ngettext.$lo \
+  plural.$lo \
+  plural-exp.$lo \
+  localcharset.$lo \
+  relocatable.$lo \
+  localename.$lo \
+  log.$lo \
+  printf.$lo \
+  osdep.$lo \
+  intl-compat.$lo
 DISTFILES.common = Makefile.in \
 config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
 DISTFILES.generated = plural.c
 DISTFILES.normal = VERSION
-DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc
+DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc \
+libgnuintl.h_vms Makefile.vms \
+libgnuintl.h.msvc-static libgnuintl.h.msvc-shared README.woe32 Makefile.msvc
 DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \
-COPYING.LIB-2 gettext.h libgettext.h plural-eval.c
-
-# Libtool's library version information for libintl.
-# Before making a gettext release, the gettext maintainer must change this
-# according to the libtool documentation, section "Library interface versions".
-# Maintainers of other packages that include the intl directory must *not*
-# change these values.
-LTV_CURRENT=2
-LTV_REVISION=0
-LTV_AGE=0
-
-.SUFFIXES:
-.SUFFIXES: .c .y .o .lo .sin .sed
-.c.o:
-	$(COMPILE) $<
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) $<
-
-.y.c:
-	$(YACC) $(YFLAGS) --output $@ $<
-	rm -f $*.h
-
-.sin.sed:
-	sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $< > t-$@
-	mv t-$@ $@
-
-INCLUDES = -I.. -I. -I$(top_srcdir)/intl
+COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h
 
 all: all-@USE_INCLUDED_LIBINTL@
 all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed
@@ -119,23 +152,102 @@ libintl.a libgnuintl.a: $(OBJECTS)
 libintl.la libgnuintl.la: $(OBJECTS)
 	$(LIBTOOL) --mode=link \
 	  $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \
-	  $(OBJECTS) @LTLIBICONV@ -lc \
+	  $(OBJECTS) @LTLIBICONV@ $(LIBS) -lc \
 	  -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
 	  -rpath $(libdir) \
 	  -no-undefined
 
+# Libtool's library version information for libintl.
+# Before making a gettext release, the gettext maintainer must change this
+# according to the libtool documentation, section "Library interface versions".
+# Maintainers of other packages that include the intl directory must *not*
+# change these values.
+LTV_CURRENT=7
+LTV_REVISION=0
+LTV_AGE=4
+
+.SUFFIXES:
+.SUFFIXES: .c .y .o .lo .sin .sed
+
+.c.o:
+	$(COMPILE) $<
+
+.y.c:
+	$(YACC) $(YFLAGS) --output $@ $<
+	rm -f $*.h
+
+bindtextdom.lo: $(srcdir)/bindtextdom.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/bindtextdom.c
+dcgettext.lo: $(srcdir)/dcgettext.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcgettext.c
+dgettext.lo: $(srcdir)/dgettext.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dgettext.c
+gettext.lo: $(srcdir)/gettext.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/gettext.c
+finddomain.lo: $(srcdir)/finddomain.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/finddomain.c
+loadmsgcat.lo: $(srcdir)/loadmsgcat.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/loadmsgcat.c
+localealias.lo: $(srcdir)/localealias.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localealias.c
+textdomain.lo: $(srcdir)/textdomain.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/textdomain.c
+l10nflist.lo: $(srcdir)/l10nflist.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/l10nflist.c
+explodename.lo: $(srcdir)/explodename.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/explodename.c
+dcigettext.lo: $(srcdir)/dcigettext.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcigettext.c
+dcngettext.lo: $(srcdir)/dcngettext.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dcngettext.c
+dngettext.lo: $(srcdir)/dngettext.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/dngettext.c
+ngettext.lo: $(srcdir)/ngettext.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/ngettext.c
+plural.lo: $(srcdir)/plural.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural.c
+plural-exp.lo: $(srcdir)/plural-exp.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/plural-exp.c
+localcharset.lo: $(srcdir)/localcharset.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localcharset.c
+relocatable.lo: $(srcdir)/relocatable.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/relocatable.c
+localename.lo: $(srcdir)/localename.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/localename.c
+log.lo: $(srcdir)/log.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/log.c
+printf.lo: $(srcdir)/printf.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/printf.c
+osdep.lo: $(srcdir)/osdep.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/osdep.c
+intl-compat.lo: $(srcdir)/intl-compat.c
+	$(LIBTOOL) --mode=compile $(COMPILE) $(srcdir)/intl-compat.c
+
+ref-add.sed: $(srcdir)/ref-add.sin
+	sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-add.sin > t-ref-add.sed
+	mv t-ref-add.sed ref-add.sed
+ref-del.sed: $(srcdir)/ref-del.sin
+	sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $(srcdir)/ref-del.sin > t-ref-del.sed
+	mv t-ref-del.sed ref-del.sed
+
+INCLUDES = -I. -I$(srcdir) -I..
+
+libgnuintl.h: $(srcdir)/libgnuintl.h.in
+	sed -e 's,@''HAVE_POSIX_PRINTF''@,@HAVE_POSIX_PRINTF@,g' \
+	    -e 's,@''HAVE_ASPRINTF''@,@HAVE_ASPRINTF@,g' \
+	    -e 's,@''HAVE_SNPRINTF''@,@HAVE_SNPRINTF@,g' \
+	    -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
+	  < $(srcdir)/libgnuintl.h.in > libgnuintl.h
+
 libintl.h: libgnuintl.h
-	cp $(srcdir)/libgnuintl.h libintl.h
+	cp libgnuintl.h libintl.h
 
-charset.alias: config.charset
+charset.alias: $(srcdir)/config.charset
 	$(SHELL) $(srcdir)/config.charset '@host@' > t-$@
 	mv t-$@ $@
 
 check: all
 
-# This installation goal is only used in GNU gettext.  Packages which
-# only use the library should use install instead.
-
 # We must not install the libintl.h/libintl.a files if we are on a
 # system which has the GNU gettext() function in its C library or in a
 # separate library.
@@ -143,12 +255,30 @@ check: all
 # package, you have to use `configure --with-included-gettext'.
 install: install-exec install-data
 install-exec: all
-	if test "$(PACKAGE)" = "gettext" \
-	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
+	if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
+	   && test '@USE_INCLUDED_LIBINTL@' = yes; then \
 	  $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
 	  $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \
 	  $(LIBTOOL) --mode=install \
 	    $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \
+	  if test "@RELOCATABLE@" = yes; then \
+	    dependencies=`sed -n -e 's,^dependency_libs=\(.*\),\1,p' < $(DESTDIR)$(libdir)/libintl.la | sed -e "s,^',," -e "s,'\$$,,"`; \
+	    if test -n "$$dependencies"; then \
+	      rm -f $(DESTDIR)$(libdir)/libintl.la; \
+	    fi; \
+	  fi; \
+	else \
+	  : ; \
+	fi
+	if test "$(PACKAGE)" = "gettext-tools" \
+	   && test '@USE_INCLUDED_LIBINTL@' = no; then \
+	  $(mkinstalldirs) $(DESTDIR)$(libdir); \
+	  $(LIBTOOL) --mode=install \
+	    $(INSTALL_DATA) libgnuintl.$la $(DESTDIR)$(libdir)/libgnuintl.$la; \
+	  rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
+	  $(INSTALL_DATA) $(DESTDIR)$(libdir)/libgnuintl.so $(DESTDIR)$(libdir)/preloadable_libintl.so; \
+	  $(LIBTOOL) --mode=uninstall \
+	    rm -f $(DESTDIR)$(libdir)/libgnuintl.$la; \
 	else \
 	  : ; \
 	fi
@@ -182,7 +312,7 @@ install-exec: all
 	  : ; \
 	fi
 install-data: all
-	if test "$(PACKAGE)" = "gettext"; then \
+	if test "$(PACKAGE)" = "gettext-tools"; then \
 	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
 	  $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
 	  $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
@@ -209,19 +339,25 @@ install-data: all
 install-strip: install
 
 installdirs:
-	if test "$(PACKAGE)" = "gettext" \
-	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
+	if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
+	   && test '@USE_INCLUDED_LIBINTL@' = yes; then \
 	  $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
 	else \
 	  : ; \
 	fi
+	if test "$(PACKAGE)" = "gettext-tools" \
+	   && test '@USE_INCLUDED_LIBINTL@' = no; then \
+	  $(mkinstalldirs) $(DESTDIR)$(libdir); \
+	else \
+	  : ; \
+	fi
 	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
 	  test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \
 	  $(mkinstalldirs) $(DESTDIR)$(localedir); \
 	else \
 	  : ; \
 	fi
-	if test "$(PACKAGE)" = "gettext"; then \
+	if test "$(PACKAGE)" = "gettext-tools"; then \
 	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
 	else \
 	  : ; \
@@ -231,14 +367,20 @@ installdirs:
 installcheck:
 
 uninstall:
-	if test "$(PACKAGE)" = "gettext" \
-	   && test '@INTLOBJS@' = '$(GETTOBJS)'; then \
+	if { test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; } \
+	   && test '@USE_INCLUDED_LIBINTL@' = yes; then \
 	  rm -f $(DESTDIR)$(includedir)/libintl.h; \
 	  $(LIBTOOL) --mode=uninstall \
 	    rm -f $(DESTDIR)$(libdir)/libintl.$la; \
 	else \
 	  : ; \
 	fi
+	if test "$(PACKAGE)" = "gettext-tools" \
+	   && test '@USE_INCLUDED_LIBINTL@' = no; then \
+	  rm -f $(DESTDIR)$(libdir)/preloadable_libintl.so; \
+	else \
+	  : ; \
+	fi
 	if test '@USE_INCLUDED_LIBINTL@' = yes; then \
 	  if test -f $(DESTDIR)$(libdir)/charset.alias; then \
 	    temp=$(DESTDIR)$(libdir)/t-charset.alias; \
@@ -265,7 +407,7 @@ uninstall:
 	else \
 	  : ; \
 	fi
-	if test "$(PACKAGE)" = "gettext"; then \
+	if test "$(PACKAGE)" = "gettext-tools"; then \
 	  for file in VERSION ChangeLog COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \
 	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
 	  done; \
@@ -273,20 +415,28 @@ uninstall:
 	  : ; \
 	fi
 
-info dvi:
+info dvi ps pdf html:
 
 $(OBJECTS): ../config.h libgnuintl.h
-bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngettext.$lo finddomain.$lo gettext.$lo intl-compat.$lo loadmsgcat.$lo localealias.$lo ngettext.$lo textdomain.$lo: gettextP.h gmo.h loadinfo.h
-dcigettext.$lo: hash-string.h
-explodename.$lo l10nflist.$lo: loadinfo.h
-dcigettext.$lo loadmsgcat.$lo plural.$lo plural-exp.$lo: plural-exp.h
-dcigettext.$lo: eval-plural.h
+bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngettext.$lo finddomain.$lo gettext.$lo intl-compat.$lo loadmsgcat.$lo localealias.$lo ngettext.$lo textdomain.$lo: $(srcdir)/gettextP.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h
+dcigettext.$lo loadmsgcat.$lo: $(srcdir)/hash-string.h
+explodename.$lo l10nflist.$lo: $(srcdir)/loadinfo.h
+dcigettext.$lo loadmsgcat.$lo plural.$lo plural-exp.$lo: $(srcdir)/plural-exp.h
+dcigettext.$lo: $(srcdir)/eval-plural.h
+localcharset.$lo: $(srcdir)/localcharset.h
+localealias.$lo localcharset.$lo relocatable.$lo: $(srcdir)/relocatable.h
+printf.$lo: $(srcdir)/printf-args.h $(srcdir)/printf-args.c $(srcdir)/printf-parse.h $(srcdir)/wprintf-parse.h $(srcdir)/xsize.h $(srcdir)/printf-parse.c $(srcdir)/vasnprintf.h $(srcdir)/vasnwprintf.h $(srcdir)/vasnprintf.c
 
 tags: TAGS
 
 TAGS: $(HEADERS) $(SOURCES)
 	here=`pwd`; cd $(srcdir) && etags -o $$here/TAGS $(HEADERS) $(SOURCES)
 
+ctags: CTAGS
+
+CTAGS: $(HEADERS) $(SOURCES)
+	here=`pwd`; cd $(srcdir) && ctags -o $$here/CTAGS $(HEADERS) $(SOURCES)
+
 id: ID
 
 ID: $(HEADERS) $(SOURCES)
@@ -294,15 +444,15 @@ ID: $(HEADERS) $(SOURCES)
 
 
 mostlyclean:
-	rm -f *.a *.la *.o *.lo core core.*
-	rm -f libintl.h charset.alias ref-add.sed ref-del.sed
+	rm -f *.a *.la *.o *.obj *.lo core core.*
+	rm -f libgnuintl.h libintl.h charset.alias ref-add.sed ref-del.sed
 	rm -f -r .libs _libs
 
 clean: mostlyclean
 
 distclean: clean
 	rm -f Makefile ID TAGS
-	if test "$(PACKAGE)" = gettext; then \
+	if test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; then \
 	  rm -f ChangeLog.inst $(DISTFILES.normal); \
 	else \
 	  : ; \
@@ -317,20 +467,26 @@ maintainer-clean: distclean
 # other files which should not be distributed in other packages.
 distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
 dist distdir: Makefile
-	if test "$(PACKAGE)" = gettext; then \
-	  additional="$(DISTFILES.gettext)"; \
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  : ; \
 	else \
-	  additional="$(DISTFILES.normal)"; \
-	fi; \
-	$(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \
-	for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
-	  if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
-	  cp -p $$dir/$$file $(distdir); \
-	done
-
-Makefile: Makefile.in ../config.status
-	cd .. \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+	  if test "$(PACKAGE)" = "gettext-runtime"; then \
+	    additional="$(DISTFILES.gettext)"; \
+	  else \
+	    additional="$(DISTFILES.normal)"; \
+	  fi; \
+	  $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \
+	  for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
+	    if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+	    cp -p $$dir/$$file $(distdir); \
+	  done; \
+	fi
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status
+# This would be more efficient, but doesn't work any more with autoconf-2.57,
+# when AC_CONFIG_FILES([intl/Makefile:somedir/Makefile.in]) is used.
+#	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 # Tell versions [3.59,3.63) of GNU make not to export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/gnu/usr.bin/texinfo/intl/VERSION b/gnu/usr.bin/texinfo/intl/VERSION
index abe3915e693..b4b846ca765 100644
--- a/gnu/usr.bin/texinfo/intl/VERSION
+++ b/gnu/usr.bin/texinfo/intl/VERSION
@@ -1 +1 @@
-GNU gettext library from gettext-0.11.1
+GNU gettext library from gettext-0.14.1
diff --git a/gnu/usr.bin/texinfo/intl/bindtextdom.c b/gnu/usr.bin/texinfo/intl/bindtextdom.c
index 07e073d6425..dcdc40085da 100644
--- a/gnu/usr.bin/texinfo/intl/bindtextdom.c
+++ b/gnu/usr.bin/texinfo/intl/bindtextdom.c
@@ -1,5 +1,5 @@
 /* Implementation of the bindtextdomain(3) function
-   Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -45,8 +45,8 @@
    names than the internal variables in GNU libc, otherwise programs
    using libintl.a cannot be linked statically.  */
 #if !defined _LIBC
-# define _nl_default_dirname _nl_default_dirname__
-# define _nl_domain_bindings _nl_domain_bindings__
+# define _nl_default_dirname libintl_nl_default_dirname
+# define _nl_domain_bindings libintl_nl_domain_bindings
 #endif
 
 /* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>.  */
@@ -58,12 +58,17 @@
 
 /* Contains the default location of the message catalogs.  */
 extern const char _nl_default_dirname[];
+#ifdef _LIBC
+extern const char _nl_default_dirname_internal[] attribute_hidden;
+#else
+# define INTUSE(name) name
+#endif
 
 /* List with bindings of specific domains.  */
 extern struct binding *_nl_domain_bindings;
 
 /* Lock variable to protect the global data in the gettext implementation.  */
-__libc_rwlock_define (extern, _nl_state_lock)
+__libc_rwlock_define (extern, _nl_state_lock attribute_hidden)
 
 
 /* Names for the libintl functions are a problem.  They must not clash
@@ -77,15 +82,10 @@ __libc_rwlock_define (extern, _nl_state_lock)
 #  define strdup(str) __strdup (str)
 # endif
 #else
-# define BINDTEXTDOMAIN bindtextdomain__
-# define BIND_TEXTDOMAIN_CODESET bind_textdomain_codeset__
+# define BINDTEXTDOMAIN libintl_bindtextdomain
+# define BIND_TEXTDOMAIN_CODESET libintl_bind_textdomain_codeset
 #endif
 
-/* Prototypes for local functions.  */
-static void set_binding_values PARAMS ((const char *domainname,
-					const char **dirnamep,
-					const char **codesetp));
-
 /* Specifies the directory name *DIRNAMEP and the output codeset *CODESETP
    to be used for the DOMAINNAME message catalog.
    If *DIRNAMEP or *CODESETP is NULL, the corresponding attribute is not
@@ -93,10 +93,8 @@ static void set_binding_values PARAMS ((const char *domainname,
    If DIRNAMEP or CODESETP is NULL, the corresponding attribute is neither
    modified nor returned.  */
 static void
-set_binding_values (domainname, dirnamep, codesetp)
-     const char *domainname;
-     const char **dirnamep;
-     const char **codesetp;
+set_binding_values (const char *domainname,
+		    const char **dirnamep, const char **codesetp)
 {
   struct binding *binding;
   int modified;
@@ -146,8 +144,8 @@ set_binding_values (domainname, dirnamep, codesetp)
 	      char *result = binding->dirname;
 	      if (strcmp (dirname, result) != 0)
 		{
-		  if (strcmp (dirname, _nl_default_dirname) == 0)
-		    result = (char *) _nl_default_dirname;
+		  if (strcmp (dirname, INTUSE(_nl_default_dirname)) == 0)
+		    result = (char *) INTUSE(_nl_default_dirname);
 		  else
 		    {
 #if defined _LIBC || defined HAVE_STRDUP
@@ -162,7 +160,7 @@ set_binding_values (domainname, dirnamep, codesetp)
 
 		  if (__builtin_expect (result != NULL, 1))
 		    {
-		      if (binding->dirname != _nl_default_dirname)
+		      if (binding->dirname != INTUSE(_nl_default_dirname))
 			free (binding->dirname);
 
 		      binding->dirname = result;
@@ -216,7 +214,7 @@ set_binding_values (domainname, dirnamep, codesetp)
     {
       /* Simply return the default values.  */
       if (dirnamep)
-	*dirnamep = _nl_default_dirname;
+	*dirnamep = INTUSE(_nl_default_dirname);
       if (codesetp)
 	*codesetp = NULL;
     }
@@ -238,11 +236,11 @@ set_binding_values (domainname, dirnamep, codesetp)
 
 	  if (dirname == NULL)
 	    /* The default value.  */
-	    dirname = _nl_default_dirname;
+	    dirname = INTUSE(_nl_default_dirname);
 	  else
 	    {
-	      if (strcmp (dirname, _nl_default_dirname) == 0)
-		dirname = _nl_default_dirname;
+	      if (strcmp (dirname, INTUSE(_nl_default_dirname)) == 0)
+		dirname = INTUSE(_nl_default_dirname);
 	      else
 		{
 		  char *result;
@@ -265,7 +263,7 @@ set_binding_values (domainname, dirnamep, codesetp)
 	}
       else
 	/* The default value.  */
-	new_binding->dirname = (char *) _nl_default_dirname;
+	new_binding->dirname = (char *) INTUSE(_nl_default_dirname);
 
       new_binding->codeset_cntr = 0;
 
@@ -321,7 +319,7 @@ set_binding_values (domainname, dirnamep, codesetp)
       if (0)
 	{
 	failed_codeset:
-	  if (new_binding->dirname != _nl_default_dirname)
+	  if (new_binding->dirname != INTUSE(_nl_default_dirname))
 	    free (new_binding->dirname);
 	failed_dirname:
 	  free (new_binding);
@@ -343,9 +341,7 @@ set_binding_values (domainname, dirnamep, codesetp)
 /* Specify that the DOMAINNAME message catalog will be found
    in DIRNAME rather than in the system locale data base.  */
 char *
-BINDTEXTDOMAIN (domainname, dirname)
-     const char *domainname;
-     const char *dirname;
+BINDTEXTDOMAIN (const char *domainname, const char *dirname)
 {
   set_binding_values (domainname, &dirname, NULL);
   return (char *) dirname;
@@ -354,9 +350,7 @@ BINDTEXTDOMAIN (domainname, dirname)
 /* Specify the character encoding in which the messages from the
    DOMAINNAME message catalog will be returned.  */
 char *
-BIND_TEXTDOMAIN_CODESET (domainname, codeset)
-     const char *domainname;
-     const char *codeset;
+BIND_TEXTDOMAIN_CODESET (const char *domainname, const char *codeset)
 {
   set_binding_values (domainname, NULL, &codeset);
   return (char *) codeset;
diff --git a/gnu/usr.bin/texinfo/intl/config.charset b/gnu/usr.bin/texinfo/intl/config.charset
index 0a1a68db135..43d45fb75ff 100644
--- a/gnu/usr.bin/texinfo/intl/config.charset
+++ b/gnu/usr.bin/texinfo/intl/config.charset
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Output a system dependent table of character encoding aliases.
 #
-#   Copyright (C) 2000-2002 Free Software Foundation, Inc.
+#   Copyright (C) 2000-2004 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or modify it
 #   under the terms of the GNU Library General Public License as published
@@ -30,72 +30,77 @@
 # MIME charset name is preferred.
 # The current list of GNU canonical charset names is as follows.
 #
-#       name                         used by which systems         a MIME name?
-#   ASCII, ANSI_X3.4-1968     glibc solaris freebsd
-#   ISO-8859-1                glibc aix hpux irix osf solaris freebsd   yes
-#   ISO-8859-2                glibc aix hpux irix osf solaris freebsd   yes
-#   ISO-8859-3                glibc                                     yes
-#   ISO-8859-4                osf solaris freebsd                       yes
-#   ISO-8859-5                glibc aix hpux irix osf solaris freebsd   yes
-#   ISO-8859-6                glibc aix hpux solaris                    yes
-#   ISO-8859-7                glibc aix hpux irix osf solaris           yes
-#   ISO-8859-8                glibc aix hpux osf solaris                yes
-#   ISO-8859-9                glibc aix hpux irix osf solaris           yes
-#   ISO-8859-13               glibc
-#   ISO-8859-15               glibc aix osf solaris freebsd
-#   KOI8-R                    glibc solaris freebsd                     yes
-#   KOI8-U                    glibc freebsd                             yes
-#   CP437                     dos
-#   CP775                     dos
-#   CP850                     aix osf dos
-#   CP852                     dos
-#   CP855                     dos
-#   CP856                     aix
-#   CP857                     dos
-#   CP861                     dos
-#   CP862                     dos
-#   CP864                     dos
-#   CP865                     dos
-#   CP866                     freebsd dos
-#   CP869                     dos
-#   CP874                     win32 dos
-#   CP922                     aix
-#   CP932                     aix win32 dos
-#   CP943                     aix
-#   CP949                     osf win32 dos
-#   CP950                     win32 dos
-#   CP1046                    aix
-#   CP1124                    aix
-#   CP1129                    aix
-#   CP1250                    win32
-#   CP1251                    glibc win32
-#   CP1252                    aix win32
-#   CP1253                    win32
-#   CP1254                    win32
-#   CP1255                    win32
-#   CP1256                    win32
-#   CP1257                    win32
-#   GB2312                    glibc aix hpux irix solaris freebsd       yes
-#   EUC-JP                    glibc aix hpux irix osf solaris freebsd   yes
-#   EUC-KR                    glibc aix hpux irix osf solaris freebsd   yes
-#   EUC-TW                    glibc aix hpux irix osf solaris
-#   BIG5                      glibc aix hpux osf solaris freebsd        yes
-#   BIG5-HKSCS                glibc
-#   GBK                       aix osf win32 dos
-#   GB18030                   glibc
-#   SHIFT_JIS                 hpux osf solaris freebsd                  yes
-#   JOHAB                     glibc win32
-#   TIS-620                   glibc aix hpux osf solaris
-#   VISCII                    glibc                                     yes
-#   HP-ROMAN8                 hpux
-#   HP-ARABIC8                hpux
-#   HP-GREEK8                 hpux
-#   HP-HEBREW8                hpux
-#   HP-TURKISH8               hpux
-#   HP-KANA8                  hpux
-#   DEC-KANJI                 osf
-#   DEC-HANYU                 osf
-#   UTF-8                     glibc aix hpux osf solaris                yes
+#       name              MIME?             used by which systems
+#   ASCII, ANSI_X3.4-1968       glibc solaris freebsd darwin
+#   ISO-8859-1              Y   glibc aix hpux irix osf solaris freebsd darwin
+#   ISO-8859-2              Y   glibc aix hpux irix osf solaris freebsd darwin
+#   ISO-8859-3              Y   glibc solaris
+#   ISO-8859-4              Y   osf solaris freebsd darwin
+#   ISO-8859-5              Y   glibc aix hpux irix osf solaris freebsd darwin
+#   ISO-8859-6              Y   glibc aix hpux solaris
+#   ISO-8859-7              Y   glibc aix hpux irix osf solaris
+#   ISO-8859-8              Y   glibc aix hpux osf solaris
+#   ISO-8859-9              Y   glibc aix hpux irix osf solaris
+#   ISO-8859-13                 glibc
+#   ISO-8859-14                 glibc
+#   ISO-8859-15                 glibc aix osf solaris freebsd
+#   KOI8-R                  Y   glibc solaris freebsd darwin
+#   KOI8-U                  Y   glibc freebsd darwin
+#   KOI8-T                      glibc
+#   CP437                       dos
+#   CP775                       dos
+#   CP850                       aix osf dos
+#   CP852                       dos
+#   CP855                       dos
+#   CP856                       aix
+#   CP857                       dos
+#   CP861                       dos
+#   CP862                       dos
+#   CP864                       dos
+#   CP865                       dos
+#   CP866                       freebsd darwin dos
+#   CP869                       dos
+#   CP874                       woe32 dos
+#   CP922                       aix
+#   CP932                       aix woe32 dos
+#   CP943                       aix
+#   CP949                       osf woe32 dos
+#   CP950                       woe32 dos
+#   CP1046                      aix
+#   CP1124                      aix
+#   CP1125                      dos
+#   CP1129                      aix
+#   CP1250                      woe32
+#   CP1251                      glibc solaris darwin woe32
+#   CP1252                      aix woe32
+#   CP1253                      woe32
+#   CP1254                      woe32
+#   CP1255                      glibc woe32
+#   CP1256                      woe32
+#   CP1257                      woe32
+#   GB2312                  Y   glibc aix hpux irix solaris freebsd darwin
+#   EUC-JP                  Y   glibc aix hpux irix osf solaris freebsd darwin
+#   EUC-KR                  Y   glibc aix hpux irix osf solaris freebsd darwin
+#   EUC-TW                      glibc aix hpux irix osf solaris
+#   BIG5                    Y   glibc aix hpux osf solaris freebsd darwin
+#   BIG5-HKSCS                  glibc solaris
+#   GBK                         glibc aix osf solaris woe32 dos
+#   GB18030                     glibc solaris
+#   SHIFT_JIS               Y   hpux osf solaris freebsd darwin
+#   JOHAB                       glibc solaris woe32
+#   TIS-620                     glibc aix hpux osf solaris
+#   VISCII                  Y   glibc
+#   TCVN5712-1                  glibc
+#   GEORGIAN-PS                 glibc
+#   HP-ROMAN8                   hpux
+#   HP-ARABIC8                  hpux
+#   HP-GREEK8                   hpux
+#   HP-HEBREW8                  hpux
+#   HP-TURKISH8                 hpux
+#   HP-KANA8                    hpux
+#   DEC-KANJI                   osf
+#   DEC-HANYU                   osf
+#   UTF-8                   Y   glibc aix hpux osf solaris
 #
 # Note: Names which are not marked as being a MIME name should not be used in
 # Internet protocols for information interchange (mail, news, etc.).
@@ -116,6 +121,105 @@ echo "# It was automatically generated from config.charset."
 # List of references, updated during installation:
 echo "# Packages using this file: "
 case "$os" in
+    linux-gnulibc1*)
+	# Linux libc5 doesn't have nl_langinfo(CODESET); therefore
+	# localcharset.c falls back to using the full locale name
+	# from the environment variables.
+	echo "C ASCII"
+	echo "POSIX ASCII"
+	for l in af af_ZA ca ca_ES da da_DK de de_AT de_BE de_CH de_DE de_LU \
+	         en en_AU en_BW en_CA en_DK en_GB en_IE en_NZ en_US en_ZA \
+	         en_ZW es es_AR es_BO es_CL es_CO es_DO es_EC es_ES es_GT \
+	         es_HN es_MX es_PA es_PE es_PY es_SV es_US es_UY es_VE et \
+	         et_EE eu eu_ES fi fi_FI fo fo_FO fr fr_BE fr_CA fr_CH fr_FR \
+	         fr_LU ga ga_IE gl gl_ES id id_ID in in_ID is is_IS it it_CH \
+	         it_IT kl kl_GL nl nl_BE nl_NL no no_NO pt pt_BR pt_PT sv \
+	         sv_FI sv_SE; do
+	  echo "$l ISO-8859-1"
+	  echo "$l.iso-8859-1 ISO-8859-1"
+	  echo "$l.iso-8859-15 ISO-8859-15"
+	  echo "$l.iso-8859-15@euro ISO-8859-15"
+	  echo "$l@euro ISO-8859-15"
+	  echo "$l.cp-437 CP437"
+	  echo "$l.cp-850 CP850"
+	  echo "$l.cp-1252 CP1252"
+	  echo "$l.cp-1252@euro CP1252"
+	  #echo "$l.atari-st ATARI-ST" # not a commonly used encoding
+	  echo "$l.utf-8 UTF-8"
+	  echo "$l.utf-8@euro UTF-8"
+	done
+	for l in cs cs_CZ hr hr_HR hu hu_HU pl pl_PL ro ro_RO sk sk_SK sl \
+	         sl_SI sr sr_CS sr_YU; do
+	  echo "$l ISO-8859-2"
+	  echo "$l.iso-8859-2 ISO-8859-2"
+	  echo "$l.cp-852 CP852"
+	  echo "$l.cp-1250 CP1250"
+	  echo "$l.utf-8 UTF-8"
+	done
+	for l in mk mk_MK ru ru_RU; do
+	  echo "$l ISO-8859-5"
+	  echo "$l.iso-8859-5 ISO-8859-5"
+	  echo "$l.koi8-r KOI8-R"
+	  echo "$l.cp-866 CP866"
+	  echo "$l.cp-1251 CP1251"
+	  echo "$l.utf-8 UTF-8"
+	done
+	for l in ar ar_SA; do
+	  echo "$l ISO-8859-6"
+	  echo "$l.iso-8859-6 ISO-8859-6"
+	  echo "$l.cp-864 CP864"
+	  #echo "$l.cp-868 CP868" # not a commonly used encoding
+	  echo "$l.cp-1256 CP1256"
+	  echo "$l.utf-8 UTF-8"
+	done
+	for l in el el_GR gr gr_GR; do
+	  echo "$l ISO-8859-7"
+	  echo "$l.iso-8859-7 ISO-8859-7"
+	  echo "$l.cp-869 CP869"
+	  echo "$l.cp-1253 CP1253"
+	  echo "$l.cp-1253@euro CP1253"
+	  echo "$l.utf-8 UTF-8"
+	  echo "$l.utf-8@euro UTF-8"
+	done
+	for l in he he_IL iw iw_IL; do
+	  echo "$l ISO-8859-8"
+	  echo "$l.iso-8859-8 ISO-8859-8"
+	  echo "$l.cp-862 CP862"
+	  echo "$l.cp-1255 CP1255"
+	  echo "$l.utf-8 UTF-8"
+	done
+	for l in tr tr_TR; do
+	  echo "$l ISO-8859-9"
+	  echo "$l.iso-8859-9 ISO-8859-9"
+	  echo "$l.cp-857 CP857"
+	  echo "$l.cp-1254 CP1254"
+	  echo "$l.utf-8 UTF-8"
+	done
+	for l in lt lt_LT lv lv_LV; do
+	  #echo "$l BALTIC" # not a commonly used encoding, wrong encoding name
+	  echo "$l ISO-8859-13"
+	done
+	for l in ru_UA uk uk_UA; do
+	  echo "$l KOI8-U"
+	done
+	for l in zh zh_CN; do
+	  #echo "$l GB_2312-80" # not a commonly used encoding, wrong encoding name
+	  echo "$l GB2312"
+	done
+	for l in ja ja_JP ja_JP.EUC; do
+	  echo "$l EUC-JP"
+	done
+	for l in ko ko_KR; do
+	  echo "$l EUC-KR"
+	done
+	for l in th th_TH; do
+	  echo "$l TIS-620"
+	done
+	for l in fa fa_IR; do
+	  #echo "$l ISIRI-3342" # a broken encoding
+	  echo "$l.utf-8 UTF-8"
+	done
+	;;
     linux* | *-gnu*)
 	# With glibc-2.1 or newer, we don't need any canonicalization,
 	# because glibc has iconv and both glibc and libiconv support all
@@ -217,6 +321,7 @@ case "$os" in
 	echo "646 ASCII"
 	echo "ISO8859-1 ISO-8859-1"
 	echo "ISO8859-2 ISO-8859-2"
+	echo "ISO8859-3 ISO-8859-3"
 	echo "ISO8859-4 ISO-8859-4"
 	echo "ISO8859-5 ISO-8859-5"
 	echo "ISO8859-6 ISO-8859-6"
@@ -225,10 +330,15 @@ case "$os" in
 	echo "ISO8859-9 ISO-8859-9"
 	echo "ISO8859-15 ISO-8859-15"
 	echo "koi8-r KOI8-R"
+	echo "ansi-1251 CP1251"
 	echo "BIG5 BIG5"
+	echo "Big5-HKSCS BIG5-HKSCS"
 	echo "gb2312 GB2312"
+	echo "GBK GBK"
+	echo "GB18030 GB18030"
 	echo "cns11643 EUC-TW"
 	echo "5601 EUC-KR"
+	echo "ko_KR.johap92 JOHAB"
 	echo "eucJP EUC-JP"
 	echo "PCK SHIFT_JIS"
 	echo "TIS620.2533 TIS-620"
@@ -286,6 +396,47 @@ case "$os" in
 	echo "BIG5 BIG5"
 	echo "SJIS SHIFT_JIS"
 	;;
+    darwin*)
+	# Darwin 6.8 doesn't have nl_langinfo(CODESET); therefore
+	# localcharset.c falls back to using the full locale name
+	# from the environment variables.
+	echo "C ASCII"
+	for l in en_AU en_CA en_GB en_US la_LN; do
+	  echo "$l.US-ASCII ASCII"
+	done
+	for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
+	         fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT nl_BE \
+	         nl_NL no_NO pt_PT sv_SE; do
+	  echo "$l ISO-8859-1"
+	  echo "$l.ISO8859-1 ISO-8859-1"
+	  echo "$l.ISO8859-15 ISO-8859-15"
+	done
+	for l in la_LN; do
+	  echo "$l.ISO8859-1 ISO-8859-1"
+	  echo "$l.ISO8859-15 ISO-8859-15"
+	done
+	for l in cs_CZ hr_HR hu_HU la_LN pl_PL sl_SI; do
+	  echo "$l.ISO8859-2 ISO-8859-2"
+	done
+	for l in la_LN lt_LT; do
+	  echo "$l.ISO8859-4 ISO-8859-4"
+	done
+	for l in ru_RU; do
+	  echo "$l.KOI8-R KOI8-R"
+	  echo "$l.ISO8859-5 ISO-8859-5"
+	  echo "$l.CP866 CP866"
+	done
+	for l in bg_BG; do
+	  echo "$l.CP1251 CP1251"
+	done
+	echo "uk_UA.KOI8-U KOI8-U"
+	echo "zh_TW.BIG5 BIG5"
+	echo "zh_TW.Big5 BIG5"
+	echo "zh_CN.EUC GB2312"
+	echo "ja_JP.EUC EUC-JP"
+	echo "ja_JP.SJIS SHIFT_JIS"
+	echo "ko_KR.EUC EUC-KR"
+	;;
     beos*)
 	# BeOS has a single locale, and it has UTF-8 encoding.
 	echo "* UTF-8"
@@ -300,7 +451,7 @@ case "$os" in
 	echo "# country is not the one your DOS machine actually uses, just"
 	echo "# correct it in this file, and send a mail to"
 	echo "# Juan Manuel Guerrero <st001906@hrz1.hrz.tu-darmstadt.de>"
-	echo "# and Bruno Haible <haible@clisp.cons.org>."
+	echo "# and Bruno Haible <bruno@clisp.org>."
 	echo "#"
 	echo "C ASCII"
 	# ISO-8859-1 languages
@@ -399,6 +550,7 @@ case "$os" in
 	echo "sq CP852"
 	echo "sq_AL CP852"
 	echo "sr CP852"    # CP852 or CP866 or CP855 ??
+	echo "sr_CS CP852" # CP852 or CP866 or CP855 ??
 	echo "sr_YU CP852" # CP852 or CP866 or CP855 ??
 	# ISO-8859-3 languages
 	echo "mt CP850"
@@ -412,6 +564,8 @@ case "$os" in
 	echo "mk_MK CP866" # not CP855 ??
 	echo "ru CP866"
 	echo "ru_RU CP866"
+	echo "uk CP1125"
+	echo "uk_UA CP1125"
 	# ISO-8859-6 languages
 	echo "ar CP864"
 	echo "ar_AE CP864"
diff --git a/gnu/usr.bin/texinfo/intl/dcgettext.c b/gnu/usr.bin/texinfo/intl/dcgettext.c
index b7c96523dd8..850acdee97b 100644
--- a/gnu/usr.bin/texinfo/intl/dcgettext.c
+++ b/gnu/usr.bin/texinfo/intl/dcgettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the dcgettext(3) function.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -37,22 +37,20 @@
 # define DCGETTEXT __dcgettext
 # define DCIGETTEXT __dcigettext
 #else
-# define DCGETTEXT dcgettext__
-# define DCIGETTEXT dcigettext__
+# define DCGETTEXT libintl_dcgettext
+# define DCIGETTEXT libintl_dcigettext
 #endif
 
 /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
    locale.  */
 char *
-DCGETTEXT (domainname, msgid, category)
-     const char *domainname;
-     const char *msgid;
-     int category;
+DCGETTEXT (const char *domainname, const char *msgid, int category)
 {
   return DCIGETTEXT (domainname, msgid, NULL, 0, 0, category);
 }
 
 #ifdef _LIBC
 /* Alias for function name in GNU C Library.  */
+INTDEF(__dcgettext)
 weak_alias (__dcgettext, dcgettext);
 #endif
diff --git a/gnu/usr.bin/texinfo/intl/dcigettext.c b/gnu/usr.bin/texinfo/intl/dcigettext.c
index 2e724e19e74..35238e2cbdb 100644
--- a/gnu/usr.bin/texinfo/intl/dcigettext.c
+++ b/gnu/usr.bin/texinfo/intl/dcigettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the internal dcigettext function.
-   Copyright (C) 1995-1999, 2000-2002 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -33,14 +33,19 @@
 # define alloca __builtin_alloca
 # define HAVE_ALLOCA 1
 #else
-# if defined HAVE_ALLOCA_H || defined _LIBC
-#  include <alloca.h>
+# ifdef _MSC_VER
+#  include <malloc.h>
+#  define alloca _alloca
 # else
-#  ifdef _AIX
- #pragma alloca
+#  if defined HAVE_ALLOCA_H || defined _LIBC
+#   include <alloca.h>
 #  else
-#   ifndef alloca
+#   ifdef _AIX
+ #pragma alloca
+#   else
+#    ifndef alloca
 char *alloca ();
+#    endif
 #   endif
 #  endif
 # endif
@@ -64,6 +69,20 @@ extern int errno;
 
 #include <locale.h>
 
+#ifdef _LIBC
+  /* Guess whether integer division by zero raises signal SIGFPE.
+     Set to 1 only if you know for sure.  In case of doubt, set to 0.  */
+# if defined __alpha__ || defined __arm__ || defined __i386__ \
+     || defined __m68k__ || defined __s390__
+#  define INTDIV0_RAISES_SIGFPE 1
+# else
+#  define INTDIV0_RAISES_SIGFPE 0
+# endif
+#endif
+#if !INTDIV0_RAISES_SIGFPE
+# include <signal.h>
+#endif
+
 #if defined HAVE_SYS_PARAM_H || defined _LIBC
 # include <sys/param.h>
 #endif
@@ -102,10 +121,10 @@ extern int errno;
    names than the internal variables in GNU libc, otherwise programs
    using libintl.a cannot be linked statically.  */
 #if !defined _LIBC
-# define _nl_default_default_domain _nl_default_default_domain__
-# define _nl_current_default_domain _nl_current_default_domain__
-# define _nl_default_dirname _nl_default_dirname__
-# define _nl_domain_bindings _nl_domain_bindings__
+# define _nl_default_default_domain libintl_nl_default_default_domain
+# define _nl_current_default_domain libintl_nl_current_default_domain
+# define _nl_default_dirname libintl_nl_default_dirname
+# define _nl_domain_bindings libintl_nl_domain_bindings
 #endif
 
 /* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>.  */
@@ -129,13 +148,17 @@ extern int errno;
 char *getwd ();
 #  define getcwd(buf, max) getwd (buf)
 # else
+#  if VMS
+#   define getcwd(buf, max) (getcwd) (buf, max, 0)
+#  else
 char *getcwd ();
+#  endif
 # endif
 # ifndef HAVE_STPCPY
-static char *stpcpy PARAMS ((char *dest, const char *src));
+static char *stpcpy (char *dest, const char *src);
 # endif
 # ifndef HAVE_MEMPCPY
-static void *mempcpy PARAMS ((void *dest, const void *src, size_t n));
+static void *mempcpy (void *dest, const void *src, size_t n);
 # endif
 #endif
 
@@ -229,11 +252,8 @@ static void *root;
 # endif
 
 /* Function to compare two entries in the table of known translations.  */
-static int transcmp PARAMS ((const void *p1, const void *p2));
 static int
-transcmp (p1, p2)
-     const void *p1;
-     const void *p2;
+transcmp (const void *p1, const void *p2)
 {
   const struct known_translation_t *s1;
   const struct known_translation_t *s2;
@@ -257,18 +277,27 @@ transcmp (p1, p2)
 }
 #endif
 
+#ifndef INTVARDEF
+# define INTVARDEF(name)
+#endif
+#ifndef INTUSE
+# define INTUSE(name) name
+#endif
+
 /* Name of the default domain used for gettext(3) prior any call to
    textdomain(3).  The default value for this is "messages".  */
-const char _nl_default_default_domain[] = "messages";
+const char _nl_default_default_domain[] attribute_hidden = "messages";
 
 /* Value used as the default domain for gettext(3).  */
-const char *_nl_current_default_domain = _nl_default_default_domain;
+const char *_nl_current_default_domain attribute_hidden
+     = _nl_default_default_domain;
 
 /* Contains the default location of the message catalogs.  */
 #if defined __EMX__
 extern const char _nl_default_dirname[];
 #else
 const char _nl_default_dirname[] = LOCALEDIR;
+INTVARDEF (_nl_default_dirname)
 #endif
 
 /* List with bindings of specific domains created by bindtextdomain()
@@ -276,21 +305,26 @@ const char _nl_default_dirname[] = LOCALEDIR;
 struct binding *_nl_domain_bindings;
 
 /* Prototypes for local functions.  */
-static char *plural_lookup PARAMS ((struct loaded_l10nfile *domain,
-				    unsigned long int n,
-				    const char *translation,
-				    size_t translation_len))
+static char *plural_lookup (struct loaded_l10nfile *domain,
+			    unsigned long int n,
+			    const char *translation, size_t translation_len)
      internal_function;
-static const char *category_to_name PARAMS ((int category)) internal_function;
-static const char *guess_category_value PARAMS ((int category,
-						 const char *categoryname))
+static const char *guess_category_value (int category,
+					 const char *categoryname)
      internal_function;
+#ifdef _LIBC
+# include "../locale/localeinfo.h"
+# define category_to_name(category)	_nl_category_names[category]
+#else
+static const char *category_to_name (int category) internal_function;
+#endif
 
 
 /* For those loosing systems which don't have `alloca' we have to add
    some additional code emulating it.  */
 #ifdef HAVE_ALLOCA
 /* Nothing has to be done.  */
+# define freea(p) /* nothing */
 # define ADD_BLOCK(list, address) /* nothing */
 # define FREE_BLOCKS(list) /* nothing */
 #else
@@ -315,11 +349,13 @@ struct block_list
     while (list != NULL) {						      \
       struct block_list *old = list;					      \
       list = list->next;						      \
+      free (old->address);						      \
       free (old);							      \
     }									      \
   } while (0)
 # undef alloca
 # define alloca(size) (malloc (size))
+# define freea(p) free (p)
 #endif	/* have alloca */
 
 
@@ -343,12 +379,12 @@ typedef unsigned char transmem_block_t;
 #ifdef _LIBC
 # define DCIGETTEXT __dcigettext
 #else
-# define DCIGETTEXT dcigettext__
+# define DCIGETTEXT libintl_dcigettext
 #endif
 
 /* Lock variable to protect the global data in the gettext implementation.  */
 #ifdef _LIBC
-__libc_rwlock_define_initialized (, _nl_state_lock)
+__libc_rwlock_define_initialized (, _nl_state_lock attribute_hidden)
 #endif
 
 /* Checking whether the binaries runs SUID must be done and glibc provides
@@ -388,13 +424,8 @@ static int enable_secure;
    CATEGORY locale and, if PLURAL is nonzero, search over string
    depending on the plural form determined by N.  */
 char *
-DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
-     const char *domainname;
-     const char *msgid1;
-     const char *msgid2;
-     int plural;
-     unsigned long int n;
-     int category;
+DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
+	    int plural, unsigned long int n, int category)
 {
 #ifndef HAVE_ALLOCA
   struct block_list *block_list = NULL;
@@ -419,6 +450,15 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
   if (msgid1 == NULL)
     return NULL;
 
+#ifdef _LIBC
+  if (category < 0 || category >= __LC_LAST || category == LC_ALL)
+    /* Bogus.  */
+    return (plural == 0
+	    ? (char *) msgid1
+	    /* Use the Germanic plural rule.  */
+	    : n == 1 ? (char *) msgid1 : (char *) msgid2);
+#endif
+
   __libc_rwlock_rdlock (_nl_state_lock);
 
   /* If DOMAINNAME is NULL, we are interested in the default domain.  If
@@ -445,6 +485,7 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
   search->category = category;
 
   foundp = (struct known_translation_t **) tfind (search, &root, transcmp);
+  freea (search);
   if (foundp != NULL && (*foundp)->counter == _nl_msg_cat_cntr)
     {
       /* Now deal with plural.  */
@@ -481,7 +522,7 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
     }
 
   if (binding == NULL)
-    dirname = (char *) _nl_default_dirname;
+    dirname = (char *) INTUSE(_nl_default_dirname);
   else if (IS_ABSOLUTE_PATH (binding->dirname))
     dirname = binding->dirname;
   else
@@ -509,17 +550,9 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
 	}
 
       if (ret == NULL)
-	{
-	  /* We cannot get the current working directory.  Don't signal an
-	     error but simply return the default string.  */
-	  FREE_BLOCKS (block_list);
-	  __libc_rwlock_unlock (_nl_state_lock);
-	  __set_errno (saved_errno);
-	  return (plural == 0
-		  ? (char *) msgid1
-		  /* Use the Germanic plural rule.  */
-		  : n == 1 ? (char *) msgid1 : (char *) msgid2);
-	}
+	/* We cannot get the current working directory.  Don't signal an
+	   error but simply return the default string.  */
+	goto return_untranslated;
 
       stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname);
     }
@@ -576,16 +609,7 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
 	 domain.  Return the MSGID.  */
       if (strcmp (single_locale, "C") == 0
 	  || strcmp (single_locale, "POSIX") == 0)
-	{
-	  FREE_BLOCKS (block_list);
-	  __libc_rwlock_unlock (_nl_state_lock);
-	  __set_errno (saved_errno);
-	  return (plural == 0
-		  ? (char *) msgid1
-		  /* Use the Germanic plural rule.  */
-		  : n == 1 ? (char *) msgid1 : (char *) msgid2);
-	}
-
+	break;
 
       /* Find structure describing the message catalog matching the
 	 DOMAINNAME and CATEGORY.  */
@@ -617,7 +641,6 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
 	      /* Found the translation of MSGID1 in domain DOMAIN:
 		 starting at RETVAL, RETLEN bytes.  */
 	      FREE_BLOCKS (block_list);
-	      __set_errno (saved_errno);
 #if defined HAVE_TSEARCH || defined _LIBC
 	      if (foundp == NULL)
 		{
@@ -656,6 +679,8 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
 		  (*foundp)->translation_length = retlen;
 		}
 #endif
+	      __set_errno (saved_errno);
+
 	      /* Now deal with plural.  */
 	      if (plural)
 		retval = plural_lookup (domain, n, retval, retlen);
@@ -665,19 +690,40 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
 	    }
 	}
     }
-  /* NOTREACHED */
+
+ return_untranslated:
+  /* Return the untranslated MSGID.  */
+  FREE_BLOCKS (block_list);
+  __libc_rwlock_unlock (_nl_state_lock);
+#ifndef _LIBC
+  if (!ENABLE_SECURE)
+    {
+      extern void _nl_log_untranslated (const char *logfilename,
+					const char *domainname,
+					const char *msgid1, const char *msgid2,
+					int plural);
+      const char *logfilename = getenv ("GETTEXT_LOG_UNTRANSLATED");
+
+      if (logfilename != NULL && logfilename[0] != '\0')
+	_nl_log_untranslated (logfilename, domainname, msgid1, msgid2, plural);
+    }
+#endif
+  __set_errno (saved_errno);
+  return (plural == 0
+	  ? (char *) msgid1
+	  /* Use the Germanic plural rule.  */
+	  : n == 1 ? (char *) msgid1 : (char *) msgid2);
 }
 
 
 char *
 internal_function
-_nl_find_msg (domain_file, domainbinding, msgid, lengthp)
-     struct loaded_l10nfile *domain_file;
-     struct binding *domainbinding;
-     const char *msgid;
-     size_t *lengthp;
+_nl_find_msg (struct loaded_l10nfile *domain_file,
+	      struct binding *domainbinding, const char *msgid,
+	      size_t *lengthp)
 {
   struct loaded_domain *domain;
+  nls_uint32 nstrings;
   size_t act;
   char *result;
   size_t resultlen;
@@ -690,8 +736,10 @@ _nl_find_msg (domain_file, domainbinding, msgid, lengthp)
 
   domain = (struct loaded_domain *) domain_file->data;
 
+  nstrings = domain->nstrings;
+
   /* Locate the MSGID and its translation.  */
-  if (domain->hash_size > 2 && domain->hash_tab != NULL)
+  if (domain->hash_tab != NULL)
     {
       /* Use the hashing table.  */
       nls_uint32 len = strlen (msgid);
@@ -701,22 +749,30 @@ _nl_find_msg (domain_file, domainbinding, msgid, lengthp)
 
       while (1)
 	{
-	  nls_uint32 nstr = W (domain->must_swap, domain->hash_tab[idx]);
+	  nls_uint32 nstr =
+	    W (domain->must_swap_hash_tab, domain->hash_tab[idx]);
 
 	  if (nstr == 0)
 	    /* Hash table entry is empty.  */
 	    return NULL;
 
-	  /* Compare msgid with the original string at index nstr-1.
+	  nstr--;
+
+	  /* Compare msgid with the original string at index nstr.
 	     We compare the lengths with >=, not ==, because plural entries
 	     are represented by strings with an embedded NUL.  */
-	  if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) >= len
-	      && (strcmp (msgid,
-			  domain->data + W (domain->must_swap,
-					    domain->orig_tab[nstr - 1].offset))
-		  == 0))
+	  if (nstr < nstrings
+	      ? W (domain->must_swap, domain->orig_tab[nstr].length) >= len
+		&& (strcmp (msgid,
+			    domain->data + W (domain->must_swap,
+					      domain->orig_tab[nstr].offset))
+		    == 0)
+	      : domain->orig_sysdep_tab[nstr - nstrings].length > len
+		&& (strcmp (msgid,
+			    domain->orig_sysdep_tab[nstr - nstrings].pointer)
+		    == 0))
 	    {
-	      act = nstr - 1;
+	      act = nstr;
 	      goto found;
 	    }
 
@@ -734,7 +790,7 @@ _nl_find_msg (domain_file, domainbinding, msgid, lengthp)
       size_t top, bottom;
 
       bottom = 0;
-      top = domain->nstrings;
+      top = nstrings;
       while (bottom < top)
 	{
 	  int cmp_val;
@@ -757,9 +813,17 @@ _nl_find_msg (domain_file, domainbinding, msgid, lengthp)
  found:
   /* The translation was found at index ACT.  If we have to convert the
      string to use a different character set, this is the time.  */
-  result = ((char *) domain->data
-	    + W (domain->must_swap, domain->trans_tab[act].offset));
-  resultlen = W (domain->must_swap, domain->trans_tab[act].length) + 1;
+  if (act < nstrings)
+    {
+      result = (char *)
+	(domain->data + W (domain->must_swap, domain->trans_tab[act].offset));
+      resultlen = W (domain->must_swap, domain->trans_tab[act].length) + 1;
+    }
+  else
+    {
+      result = (char *) domain->trans_sysdep_tab[act - nstrings].pointer;
+      resultlen = domain->trans_sysdep_tab[act - nstrings].length;
+    }
 
 #if defined _LIBC || HAVE_ICONV
   if (domain->codeset_cntr
@@ -792,8 +856,9 @@ _nl_find_msg (domain_file, domainbinding, msgid, lengthp)
 	 NULs.  */
 
       if (domain->conv_tab == NULL
-	  && ((domain->conv_tab = (char **) calloc (domain->nstrings,
-						    sizeof (char *)))
+	  && ((domain->conv_tab =
+		 (char **) calloc (nstrings + domain->n_sysdep_strings,
+				   sizeof (char *)))
 	      == NULL))
 	/* Mark that we didn't succeed allocating a table.  */
 	domain->conv_tab = (char **) -1;
@@ -962,11 +1027,8 @@ _nl_find_msg (domain_file, domainbinding, msgid, lengthp)
 /* Look up a plural variant.  */
 static char *
 internal_function
-plural_lookup (domain, n, translation, translation_len)
-     struct loaded_l10nfile *domain;
-     unsigned long int n;
-     const char *translation;
-     size_t translation_len;
+plural_lookup (struct loaded_l10nfile *domain, unsigned long int n,
+	       const char *translation, size_t translation_len)
 {
   struct loaded_domain *domaindata = (struct loaded_domain *) domain->data;
   unsigned long int index;
@@ -999,12 +1061,11 @@ plural_lookup (domain, n, translation, translation_len)
   return (char *) p;
 }
 
-
+#ifndef _LIBC
 /* Return string representation of locale CATEGORY.  */
 static const char *
 internal_function
-category_to_name (category)
-     int category;
+category_to_name (int category)
 {
   const char *retval;
 
@@ -1059,13 +1120,12 @@ category_to_name (category)
 
   return retval;
 }
+#endif
 
 /* Guess value of current locale from value of the environment variables.  */
 static const char *
 internal_function
-guess_category_value (category, categoryname)
-     int category;
-     const char *categoryname;
+guess_category_value (int category, const char *categoryname)
 {
   const char *language;
   const char *retval;
@@ -1081,7 +1141,7 @@ guess_category_value (category, categoryname)
      `LC_xxx', and `LANG'.  On some systems this can be done by the
      `setlocale' function itself.  */
 #ifdef _LIBC
-  retval = setlocale (category, NULL);
+  retval = __current_locale_name (category);
 #else
   retval = _nl_locale_name (category, categoryname);
 #endif
@@ -1106,9 +1166,7 @@ guess_category_value (category, categoryname)
    to be defined.  */
 #if !_LIBC && !HAVE_STPCPY
 static char *
-stpcpy (dest, src)
-     char *dest;
-     const char *src;
+stpcpy (char *dest, const char *src)
 {
   while ((*dest++ = *src++) != '\0')
     /* Do nothing. */ ;
@@ -1118,10 +1176,7 @@ stpcpy (dest, src)
 
 #if !_LIBC && !HAVE_MEMPCPY
 static void *
-mempcpy (dest, src, n)
-     void *dest;
-     const void *src;
-     size_t n;
+mempcpy (void *dest, const void *src, size_t n)
 {
   return (void *) ((char *) memcpy (dest, src, n) + n);
 }
@@ -1131,8 +1186,7 @@ mempcpy (dest, src, n)
 #ifdef _LIBC
 /* If we want to free all resources we have to do some work at
    program's end.  */
-static void __attribute__ ((unused))
-free_mem (void)
+libc_freeres_fn (free_mem)
 {
   void *old;
 
@@ -1140,7 +1194,7 @@ free_mem (void)
     {
       struct binding *oldp = _nl_domain_bindings;
       _nl_domain_bindings = _nl_domain_bindings->next;
-      if (oldp->dirname != _nl_default_dirname)
+      if (oldp->dirname != INTUSE(_nl_default_dirname))
 	/* Yes, this is a pointer comparison.  */
 	free (oldp->dirname);
       free (oldp->codeset);
@@ -1162,6 +1216,4 @@ free_mem (void)
       free (old);
     }
 }
-
-text_set_element (__libc_subfreeres, free_mem);
 #endif
diff --git a/gnu/usr.bin/texinfo/intl/dcngettext.c b/gnu/usr.bin/texinfo/intl/dcngettext.c
index c16af21269c..48a3e09e091 100644
--- a/gnu/usr.bin/texinfo/intl/dcngettext.c
+++ b/gnu/usr.bin/texinfo/intl/dcngettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the dcngettext(3) function.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -37,19 +37,16 @@
 # define DCNGETTEXT __dcngettext
 # define DCIGETTEXT __dcigettext
 #else
-# define DCNGETTEXT dcngettext__
-# define DCIGETTEXT dcigettext__
+# define DCNGETTEXT libintl_dcngettext
+# define DCIGETTEXT libintl_dcigettext
 #endif
 
 /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
    locale.  */
 char *
-DCNGETTEXT (domainname, msgid1, msgid2, n, category)
-     const char *domainname;
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
-     int category;
+DCNGETTEXT (const char *domainname,
+	    const char *msgid1, const char *msgid2, unsigned long int n,
+	    int category)
 {
   return DCIGETTEXT (domainname, msgid1, msgid2, 1, n, category);
 }
diff --git a/gnu/usr.bin/texinfo/intl/dgettext.c b/gnu/usr.bin/texinfo/intl/dgettext.c
index 3651207a0f6..b64b0f5d39d 100644
--- a/gnu/usr.bin/texinfo/intl/dgettext.c
+++ b/gnu/usr.bin/texinfo/intl/dgettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the dgettext(3) function.
-   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -20,9 +20,10 @@
 # include <config.h>
 #endif
 
+#include "gettextP.h"
+
 #include <locale.h>
 
-#include "gettextP.h"
 #ifdef _LIBC
 # include <libintl.h>
 #else
@@ -37,18 +38,16 @@
    prefix.  So we have to make a difference here.  */
 #ifdef _LIBC
 # define DGETTEXT __dgettext
-# define DCGETTEXT __dcgettext
+# define DCGETTEXT INTUSE(__dcgettext)
 #else
-# define DGETTEXT dgettext__
-# define DCGETTEXT dcgettext__
+# define DGETTEXT libintl_dgettext
+# define DCGETTEXT libintl_dcgettext
 #endif
 
 /* Look up MSGID in the DOMAINNAME message catalog of the current
    LC_MESSAGES locale.  */
 char *
-DGETTEXT (domainname, msgid)
-     const char *domainname;
-     const char *msgid;
+DGETTEXT (const char *domainname, const char *msgid)
 {
   return DCGETTEXT (domainname, msgid, LC_MESSAGES);
 }
diff --git a/gnu/usr.bin/texinfo/intl/dngettext.c b/gnu/usr.bin/texinfo/intl/dngettext.c
index f214e95b471..7815637f045 100644
--- a/gnu/usr.bin/texinfo/intl/dngettext.c
+++ b/gnu/usr.bin/texinfo/intl/dngettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the dngettext(3) function.
-   Copyright (C) 1995-1997, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -20,9 +20,10 @@
 # include <config.h>
 #endif
 
+#include "gettextP.h"
+
 #include <locale.h>
 
-#include "gettextP.h"
 #ifdef _LIBC
 # include <libintl.h>
 #else
@@ -39,18 +40,15 @@
 # define DNGETTEXT __dngettext
 # define DCNGETTEXT __dcngettext
 #else
-# define DNGETTEXT dngettext__
-# define DCNGETTEXT dcngettext__
+# define DNGETTEXT libintl_dngettext
+# define DCNGETTEXT libintl_dcngettext
 #endif
 
 /* Look up MSGID in the DOMAINNAME message catalog of the current
    LC_MESSAGES locale and skip message according to the plural form.  */
 char *
-DNGETTEXT (domainname, msgid1, msgid2, n)
-     const char *domainname;
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
+DNGETTEXT (const char *domainname,
+	   const char *msgid1, const char *msgid2, unsigned long int n)
 {
   return DCNGETTEXT (domainname, msgid1, msgid2, n, LC_MESSAGES);
 }
diff --git a/gnu/usr.bin/texinfo/intl/eval-plural.h b/gnu/usr.bin/texinfo/intl/eval-plural.h
index 44f493425e9..01bd5af5fc4 100644
--- a/gnu/usr.bin/texinfo/intl/eval-plural.h
+++ b/gnu/usr.bin/texinfo/intl/eval-plural.h
@@ -1,5 +1,5 @@
 /* Plural expression evaluation.
-   Copyright (C) 2000-2002 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -21,16 +21,10 @@
 #endif
 
 /* Evaluate the plural expression and return an index value.  */
-STATIC unsigned long int plural_eval PARAMS ((struct expression *pexp,
-					      unsigned long int n))
-     internal_function;
-
 STATIC
 unsigned long int
 internal_function
-plural_eval (pexp, n)
-     struct expression *pexp;
-     unsigned long int n;
+plural_eval (struct expression *pexp, unsigned long int n)
 {
   switch (pexp->nargs)
     {
@@ -68,8 +62,16 @@ plural_eval (pexp, n)
 	      case mult:
 		return leftarg * rightarg;
 	      case divide:
+#if !INTDIV0_RAISES_SIGFPE
+		if (rightarg == 0)
+		  raise (SIGFPE);
+#endif
 		return leftarg / rightarg;
 	      case module:
+#if !INTDIV0_RAISES_SIGFPE
+		if (rightarg == 0)
+		  raise (SIGFPE);
+#endif
 		return leftarg % rightarg;
 	      case plus:
 		return leftarg + rightarg;
diff --git a/gnu/usr.bin/texinfo/intl/explodename.c b/gnu/usr.bin/texinfo/intl/explodename.c
index 2985064c924..52c25e7276a 100644
--- a/gnu/usr.bin/texinfo/intl/explodename.c
+++ b/gnu/usr.bin/texinfo/intl/explodename.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1998, 2000-2001, 2003 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
    This program is free software; you can redistribute it and/or modify it
@@ -38,8 +38,7 @@
 /* @@ end of prolog @@ */
 
 char *
-_nl_find_language (name)
-     const char *name;
+_nl_find_language (const char *name)
 {
   while (name[0] != '\0' && name[0] != '_' && name[0] != '@'
 	 && name[0] != '+' && name[0] != ',')
@@ -50,17 +49,11 @@ _nl_find_language (name)
 
 
 int
-_nl_explode_name (name, language, modifier, territory, codeset,
-		  normalized_codeset, special, sponsor, revision)
-     char *name;
-     const char **language;
-     const char **modifier;
-     const char **territory;
-     const char **codeset;
-     const char **normalized_codeset;
-     const char **special;
-     const char **sponsor;
-     const char **revision;
+_nl_explode_name (char *name,
+		  const char **language, const char **modifier,
+		  const char **territory, const char **codeset,
+		  const char **normalized_codeset, const char **special,
+		  const char **sponsor, const char **revision)
 {
   enum { undecided, xpg, cen } syntax;
   char *cp;
diff --git a/gnu/usr.bin/texinfo/intl/finddomain.c b/gnu/usr.bin/texinfo/intl/finddomain.c
index 2f103d55636..4992a8c9e33 100644
--- a/gnu/usr.bin/texinfo/intl/finddomain.c
+++ b/gnu/usr.bin/texinfo/intl/finddomain.c
@@ -1,5 +1,5 @@
 /* Handle list of needed message catalogs
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000-2001, 2003 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.org>, 1995.
 
    This program is free software; you can redistribute it and/or modify it
@@ -47,11 +47,8 @@ static struct loaded_l10nfile *_nl_loaded_domains;
    established bindings.  */
 struct loaded_l10nfile *
 internal_function
-_nl_find_domain (dirname, locale, domainname, domainbinding)
-     const char *dirname;
-     char *locale;
-     const char *domainname;
-     struct binding *domainbinding;
+_nl_find_domain (const char *dirname, char *locale,
+		 const char *domainname, struct binding *domainbinding)
 {
   struct loaded_l10nfile *retval;
   const char *language;
@@ -178,8 +175,7 @@ _nl_find_domain (dirname, locale, domainname, domainbinding)
 
 
 #ifdef _LIBC
-static void __attribute__ ((unused))
-free_mem (void)
+libc_freeres_fn (free_mem)
 {
   struct loaded_l10nfile *runp = _nl_loaded_domains;
 
@@ -193,6 +189,4 @@ free_mem (void)
       free (here);
     }
 }
-
-text_set_element (__libc_subfreeres, free_mem);
 #endif
diff --git a/gnu/usr.bin/texinfo/intl/gettext.c b/gnu/usr.bin/texinfo/intl/gettext.c
index 22a6c24536e..92c42faa7c5 100644
--- a/gnu/usr.bin/texinfo/intl/gettext.c
+++ b/gnu/usr.bin/texinfo/intl/gettext.c
@@ -1,5 +1,5 @@
 /* Implementation of gettext(3) function.
-   Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997, 2000-2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -42,18 +42,17 @@
    prefix.  So we have to make a difference here.  */
 #ifdef _LIBC
 # define GETTEXT __gettext
-# define DCGETTEXT __dcgettext
+# define DCGETTEXT INTUSE(__dcgettext)
 #else
-# define GETTEXT gettext__
-# define DCGETTEXT dcgettext__
+# define GETTEXT libintl_gettext
+# define DCGETTEXT libintl_dcgettext
 #endif
 
 /* Look up MSGID in the current default message catalog for the current
    LC_MESSAGES locale.  If not found, returns MSGID itself (the default
    text).  */
 char *
-GETTEXT (msgid)
-     const char *msgid;
+GETTEXT (const char *msgid)
 {
   return DCGETTEXT (NULL, msgid, LC_MESSAGES);
 }
diff --git a/gnu/usr.bin/texinfo/intl/gettextP.h b/gnu/usr.bin/texinfo/intl/gettextP.h
index a642fdb6dea..4d66c3de314 100644
--- a/gnu/usr.bin/texinfo/intl/gettextP.h
+++ b/gnu/usr.bin/texinfo/intl/gettextP.h
@@ -1,5 +1,5 @@
 /* Header describing internals of libintl library.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
 
    This program is free software; you can redistribute it and/or modify it
@@ -36,18 +36,14 @@
 
 /* @@ end of prolog @@ */
 
-#ifndef PARAMS
-# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif
-#endif
-
 #ifndef internal_function
 # define internal_function
 #endif
 
+#ifndef attribute_hidden
+# define attribute_hidden
+#endif
+
 /* Tell the compiler when a conditional or integer expression is
    almost always true or almost always false.  */
 #ifndef HAVE_BUILTIN_EXPECT
@@ -72,18 +68,50 @@ SWAP (i)
 #endif
 
 
+/* In-memory representation of system dependent string.  */
+struct sysdep_string_desc
+{
+  /* Length of addressed string, including the trailing NUL.  */
+  size_t length;
+  /* Pointer to addressed string.  */
+  const char *pointer;
+};
+
 /* The representation of an opened message catalog.  */
 struct loaded_domain
 {
+  /* Pointer to memory containing the .mo file.  */
   const char *data;
+  /* 1 if the memory is mmap()ed, 0 if the memory is malloc()ed.  */
   int use_mmap;
+  /* Size of mmap()ed memory.  */
   size_t mmap_size;
+  /* 1 if the .mo file uses a different endianness than this machine.  */
   int must_swap;
+  /* Pointer to additional malloc()ed memory.  */
+  void *malloced;
+
+  /* Number of static strings pairs.  */
   nls_uint32 nstrings;
-  struct string_desc *orig_tab;
-  struct string_desc *trans_tab;
+  /* Pointer to descriptors of original strings in the file.  */
+  const struct string_desc *orig_tab;
+  /* Pointer to descriptors of translated strings in the file.  */
+  const struct string_desc *trans_tab;
+
+  /* Number of system dependent strings pairs.  */
+  nls_uint32 n_sysdep_strings;
+  /* Pointer to descriptors of original sysdep strings.  */
+  const struct sysdep_string_desc *orig_sysdep_tab;
+  /* Pointer to descriptors of translated sysdep strings.  */
+  const struct sysdep_string_desc *trans_sysdep_tab;
+
+  /* Size of hash table.  */
   nls_uint32 hash_size;
-  nls_uint32 *hash_tab;
+  /* Pointer to hash table.  */
+  const nls_uint32 *hash_tab;
+  /* 1 if the hash table uses a different endianness than this machine.  */
+  int must_swap_hash_tab;
+
   int codeset_cntr;
 #ifdef _LIBC
   __gconv_t conv;
@@ -123,77 +151,63 @@ struct binding
 extern int _nl_msg_cat_cntr;
 
 #ifndef _LIBC
-const char *_nl_locale_name PARAMS ((int category, const char *categoryname));
+const char *_nl_locale_name (int category, const char *categoryname);
 #endif
 
-struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname,
-						 char *__locale,
-						 const char *__domainname,
-					      struct binding *__domainbinding))
+struct loaded_l10nfile *_nl_find_domain (const char *__dirname, char *__locale,
+					 const char *__domainname,
+					 struct binding *__domainbinding)
      internal_function;
-void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain,
-			      struct binding *__domainbinding))
+void _nl_load_domain (struct loaded_l10nfile *__domain,
+		      struct binding *__domainbinding)
      internal_function;
-void _nl_unload_domain PARAMS ((struct loaded_domain *__domain))
+void _nl_unload_domain (struct loaded_domain *__domain)
      internal_function;
-const char *_nl_init_domain_conv PARAMS ((struct loaded_l10nfile *__domain_file,
-					  struct loaded_domain *__domain,
-					  struct binding *__domainbinding))
+const char *_nl_init_domain_conv (struct loaded_l10nfile *__domain_file,
+				  struct loaded_domain *__domain,
+				  struct binding *__domainbinding)
      internal_function;
-void _nl_free_domain_conv PARAMS ((struct loaded_domain *__domain))
+void _nl_free_domain_conv (struct loaded_domain *__domain)
      internal_function;
 
-char *_nl_find_msg PARAMS ((struct loaded_l10nfile *domain_file,
-			    struct binding *domainbinding,
-			    const char *msgid, size_t *lengthp))
+char *_nl_find_msg (struct loaded_l10nfile *domain_file,
+		    struct binding *domainbinding, const char *msgid,
+		    size_t *lengthp)
      internal_function;
 
 #ifdef _LIBC
-extern char *__gettext PARAMS ((const char *__msgid));
-extern char *__dgettext PARAMS ((const char *__domainname,
-				 const char *__msgid));
-extern char *__dcgettext PARAMS ((const char *__domainname,
-				  const char *__msgid, int __category));
-extern char *__ngettext PARAMS ((const char *__msgid1, const char *__msgid2,
-				 unsigned long int __n));
-extern char *__dngettext PARAMS ((const char *__domainname,
-				  const char *__msgid1, const char *__msgid2,
-				  unsigned long int n));
-extern char *__dcngettext PARAMS ((const char *__domainname,
-				   const char *__msgid1, const char *__msgid2,
-				   unsigned long int __n, int __category));
-extern char *__dcigettext PARAMS ((const char *__domainname,
-				   const char *__msgid1, const char *__msgid2,
-				   int __plural, unsigned long int __n,
-				   int __category));
-extern char *__textdomain PARAMS ((const char *__domainname));
-extern char *__bindtextdomain PARAMS ((const char *__domainname,
-				       const char *__dirname));
-extern char *__bind_textdomain_codeset PARAMS ((const char *__domainname,
-						const char *__codeset));
+extern char *__gettext (const char *__msgid);
+extern char *__dgettext (const char *__domainname, const char *__msgid);
+extern char *__dcgettext (const char *__domainname, const char *__msgid,
+			  int __category);
+extern char *__ngettext (const char *__msgid1, const char *__msgid2,
+			 unsigned long int __n);
+extern char *__dngettext (const char *__domainname,
+			  const char *__msgid1, const char *__msgid2,
+			  unsigned long int n);
+extern char *__dcngettext (const char *__domainname,
+			   const char *__msgid1, const char *__msgid2,
+			   unsigned long int __n, int __category);
+extern char *__dcigettext (const char *__domainname,
+			   const char *__msgid1, const char *__msgid2,
+			   int __plural, unsigned long int __n,
+			   int __category);
+extern char *__textdomain (const char *__domainname);
+extern char *__bindtextdomain (const char *__domainname,
+			       const char *__dirname);
+extern char *__bind_textdomain_codeset (const char *__domainname,
+					const char *__codeset);
 #else
-extern char *gettext__ PARAMS ((const char *__msgid));
-extern char *dgettext__ PARAMS ((const char *__domainname,
-				 const char *__msgid));
-extern char *dcgettext__ PARAMS ((const char *__domainname,
-				  const char *__msgid, int __category));
-extern char *ngettext__ PARAMS ((const char *__msgid1, const char *__msgid2,
-				 unsigned long int __n));
-extern char *dngettext__ PARAMS ((const char *__domainname,
-				  const char *__msgid1, const char *__msgid2,
-				  unsigned long int __n));
-extern char *dcngettext__ PARAMS ((const char *__domainname,
-				   const char *__msgid1, const char *__msgid2,
-				   unsigned long int __n, int __category));
-extern char *dcigettext__ PARAMS ((const char *__domainname,
-				   const char *__msgid1, const char *__msgid2,
-				   int __plural, unsigned long int __n,
-				   int __category));
-extern char *textdomain__ PARAMS ((const char *__domainname));
-extern char *bindtextdomain__ PARAMS ((const char *__domainname,
-				       const char *__dirname));
-extern char *bind_textdomain_codeset__ PARAMS ((const char *__domainname,
-						const char *__codeset));
+/* Declare the exported libintl_* functions, in a way that allows us to
+   call them under their real name.  */
+# undef _INTL_REDIRECT_INLINE
+# undef _INTL_REDIRECT_MACROS
+# define _INTL_REDIRECT_MACROS
+# include "libgnuintl.h"
+extern char *libintl_dcigettext (const char *__domainname,
+				 const char *__msgid1, const char *__msgid2,
+				 int __plural, unsigned long int __n,
+				 int __category);
 #endif
 
 /* @@ begin of epilog @@ */
diff --git a/gnu/usr.bin/texinfo/intl/gmo.h b/gnu/usr.bin/texinfo/intl/gmo.h
index f05ae470c72..e7c9cc14b5d 100644
--- a/gnu/usr.bin/texinfo/intl/gmo.h
+++ b/gnu/usr.bin/texinfo/intl/gmo.h
@@ -1,5 +1,5 @@
 /* Description of GNU message catalog format: general file layout.
-   Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997, 2000-2002, 2004 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -29,6 +29,7 @@
 
 /* Revision number of the currently used .mo (binary) file format.  */
 #define MO_REVISION_NUMBER 0
+#define MO_REVISION_NUMBER_WITH_SYSDEP_I 1
 
 /* The following contortions are an attempt to use the C preprocessor
    to determine an unsigned integral type that is 32 bits wide.  An
@@ -75,26 +76,74 @@ struct mo_file_header
   nls_uint32 magic;
   /* The revision number of the file format.  */
   nls_uint32 revision;
+
+  /* The following are only used in .mo files with major revision 0 or 1.  */
+
   /* The number of strings pairs.  */
   nls_uint32 nstrings;
   /* Offset of table with start offsets of original strings.  */
   nls_uint32 orig_tab_offset;
-  /* Offset of table with start offsets of translation strings.  */
+  /* Offset of table with start offsets of translated strings.  */
   nls_uint32 trans_tab_offset;
-  /* Size of hashing table.  */
+  /* Size of hash table.  */
   nls_uint32 hash_tab_size;
-  /* Offset of first hashing entry.  */
+  /* Offset of first hash table entry.  */
   nls_uint32 hash_tab_offset;
+
+  /* The following are only used in .mo files with minor revision >= 1.  */
+
+  /* The number of system dependent segments.  */
+  nls_uint32 n_sysdep_segments;
+  /* Offset of table describing system dependent segments.  */
+  nls_uint32 sysdep_segments_offset;
+  /* The number of system dependent strings pairs.  */
+  nls_uint32 n_sysdep_strings;
+  /* Offset of table with start offsets of original sysdep strings.  */
+  nls_uint32 orig_sysdep_tab_offset;
+  /* Offset of table with start offsets of translated sysdep strings.  */
+  nls_uint32 trans_sysdep_tab_offset;
 };
 
+/* Descriptor for static string contained in the binary .mo file.  */
 struct string_desc
 {
-  /* Length of addressed string.  */
+  /* Length of addressed string, not including the trailing NUL.  */
   nls_uint32 length;
   /* Offset of string in file.  */
   nls_uint32 offset;
 };
 
+/* The following are only used in .mo files with minor revision >= 1.  */
+
+/* Descriptor for system dependent string segment.  */
+struct sysdep_segment
+{
+  /* Length of addressed string, including the trailing NUL.  */
+  nls_uint32 length;
+  /* Offset of string in file.  */
+  nls_uint32 offset;
+};
+
+/* Descriptor for system dependent string.  */
+struct sysdep_string
+{
+  /* Offset of static string segments in file.  */
+  nls_uint32 offset;
+  /* Alternating sequence of static and system dependent segments.
+     The last segment is a static segment, including the trailing NUL.  */
+  struct segment_pair
+  {
+    /* Size of static segment.  */
+    nls_uint32 segsize;
+    /* Reference to system dependent string segment, or ~0 at the end.  */
+    nls_uint32 sysdepref;
+  } segments[1];
+};
+
+/* Marker for the end of the segments[] array.  This has the value 0xFFFFFFFF,
+   regardless whether 'int' is 16 bit, 32 bit, or 64 bit.  */
+#define SEGMENTS_END ((nls_uint32) ~0)
+
 /* @@ begin of epilog @@ */
 
 #endif	/* gettext.h  */
diff --git a/gnu/usr.bin/texinfo/intl/hash-string.h b/gnu/usr.bin/texinfo/intl/hash-string.h
index b267a87788f..093e3b1c103 100644
--- a/gnu/usr.bin/texinfo/intl/hash-string.h
+++ b/gnu/usr.bin/texinfo/intl/hash-string.h
@@ -1,5 +1,5 @@
 /* Description of GNU message catalog format: string hashing function.
-   Copyright (C) 1995, 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997-1998, 2000-2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -18,14 +18,6 @@
 
 /* @@ end of prolog @@ */
 
-#ifndef PARAMS
-# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
-
 /* We assume to have `unsigned long int' value with at least 32 bits.  */
 #define HASHWORDBITS 32
 
@@ -33,11 +25,8 @@
 /* Defines the so called `hashpjw' function by P.J. Weinberger
    [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
    1986, 1987 Bell Telephone Laboratories, Inc.]  */
-static unsigned long int hash_string PARAMS ((const char *__str_param));
-
 static inline unsigned long int
-hash_string (str_param)
-     const char *str_param;
+hash_string (const char *str_param)
 {
   unsigned long int hval, g;
   const char *str = str_param;
@@ -47,7 +36,7 @@ hash_string (str_param)
   while (*str != '\0')
     {
       hval <<= 4;
-      hval += (unsigned long int) *str++;
+      hval += (unsigned char) *str++;
       g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4));
       if (g != 0)
 	{
diff --git a/gnu/usr.bin/texinfo/intl/intl-compat.c b/gnu/usr.bin/texinfo/intl/intl-compat.c
index 0a06ce947bd..96f9d955d11 100644
--- a/gnu/usr.bin/texinfo/intl/intl-compat.c
+++ b/gnu/usr.bin/texinfo/intl/intl-compat.c
@@ -1,6 +1,6 @@
 /* intl-compat.c - Stub functions to call gettext functions from GNU gettext
    Library.
-   Copyright (C) 1995, 2000, 2001 Software Foundation, Inc.
+   Copyright (C) 1995, 2000-2003 Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -21,52 +21,18 @@
 # include <config.h>
 #endif
 
-#include "libgnuintl.h"
 #include "gettextP.h"
 
 /* @@ end of prolog @@ */
 
-/* This file redirects the gettext functions (without prefix or suffix) to
-   those defined in the included GNU gettext library (with "__" suffix).
-   It is compiled into libintl when the included GNU gettext library is
-   configured --with-included-gettext.
-
-   This redirection works also in the case that the system C library or
-   the system libintl library contain gettext/textdomain/... functions.
-   If it didn't, we would need to add preprocessor level redirections to
-   libgnuintl.h of the following form:
-
-#    define gettext gettext__
-#    define dgettext dgettext__
-#    define dcgettext dcgettext__
-#    define ngettext ngettext__
-#    define dngettext dngettext__
-#    define dcngettext dcngettext__
-#    define textdomain textdomain__
-#    define bindtextdomain bindtextdomain__
-#    define bind_textdomain_codeset bind_textdomain_codeset__
-
-   How does this redirection work? There are two cases.
-   A. When libintl.a is linked into an executable, it works because
-      functions defined in the executable always override functions in
-      the shared libraries.
-   B. When libintl.so is used, it works because
-      1. those systems defining gettext/textdomain/... in the C library
-         (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer) are
-         ELF systems and define these symbols as weak, thus explicitly
-         letting other shared libraries override it.
-      2. those systems defining gettext/textdomain/... in a standalone
-         libintl.so library (namely, Solaris 2.3 and newer) have this
-         shared library in /usr/lib, and the linker will search /usr/lib
-         *after* the directory where the GNU gettext library is installed.
-
-   A third case, namely when libintl.a is linked into a shared library
-   whose name is not libintl.so, is not supported. In this case, on
-   Solaris, when -lintl precedes the linker option for the shared library
-   containing GNU gettext, the system's gettext would indeed override
-   the GNU gettext. Anyone doing this kind of stuff must be clever enough
-   to 1. compile libintl.a with -fPIC, 2. remove -lintl from his linker
-   command line.  */
+/* This file redirects the gettext functions (without prefix) to those
+   defined in the included GNU libintl library (with "libintl_" prefix).
+   It is compiled into libintl in order to make the AM_GNU_GETTEXT test
+   of gettext <= 0.11.2 work with the libintl library >= 0.11.3 which
+   has the redirections primarily in the <libintl.h> include file.
+   It is also compiled into libgnuintl so that libgnuintl.so can be used
+   as LD_PRELOADable library on glibc systems, to provide the extra
+   features that the functions in the libc don't have (namely, logging).  */
 
 
 #undef gettext
@@ -80,87 +46,86 @@
 #undef bind_textdomain_codeset
 
 
+/* When building a DLL, we must export some functions.  Note that because
+   the functions are only defined for binary backward compatibility, we
+   don't need to use __declspec(dllimport) in any case.  */
+#if defined _MSC_VER && BUILDING_DLL
+# define DLL_EXPORTED __declspec(dllexport)
+#else
+# define DLL_EXPORTED
+#endif
+
+
+DLL_EXPORTED
 char *
-gettext (msgid)
-     const char *msgid;
+gettext (const char *msgid)
 {
-  return gettext__ (msgid);
+  return libintl_gettext (msgid);
 }
 
 
+DLL_EXPORTED
 char *
-dgettext (domainname, msgid)
-     const char *domainname;
-     const char *msgid;
+dgettext (const char *domainname, const char *msgid)
 {
-  return dgettext__ (domainname, msgid);
+  return libintl_dgettext (domainname, msgid);
 }
 
 
+DLL_EXPORTED
 char *
-dcgettext (domainname, msgid, category)
-     const char *domainname;
-     const char *msgid;
-     int category;
+dcgettext (const char *domainname, const char *msgid, int category)
 {
-  return dcgettext__ (domainname, msgid, category);
+  return libintl_dcgettext (domainname, msgid, category);
 }
 
 
+DLL_EXPORTED
 char *
-ngettext (msgid1, msgid2, n)
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
+ngettext (const char *msgid1, const char *msgid2, unsigned long int n)
 {
-  return ngettext__ (msgid1, msgid2, n);
+  return libintl_ngettext (msgid1, msgid2, n);
 }
 
 
+DLL_EXPORTED
 char *
-dngettext (domainname, msgid1, msgid2, n)
-     const char *domainname;
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
+dngettext (const char *domainname,
+	   const char *msgid1, const char *msgid2, unsigned long int n)
 {
-  return dngettext__ (domainname, msgid1, msgid2, n);
+  return libintl_dngettext (domainname, msgid1, msgid2, n);
 }
 
 
+DLL_EXPORTED
 char *
-dcngettext (domainname, msgid1, msgid2, n, category)
-     const char *domainname;
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
-     int category;
+dcngettext (const char *domainname,
+	    const char *msgid1, const char *msgid2, unsigned long int n,
+	    int category)
 {
-  return dcngettext__ (domainname, msgid1, msgid2, n, category);
+  return libintl_dcngettext (domainname, msgid1, msgid2, n, category);
 }
 
 
+DLL_EXPORTED
 char *
-textdomain (domainname)
-     const char *domainname;
+textdomain (const char *domainname)
 {
-  return textdomain__ (domainname);
+  return libintl_textdomain (domainname);
 }
 
 
+DLL_EXPORTED
 char *
-bindtextdomain (domainname, dirname)
-     const char *domainname;
-     const char *dirname;
+bindtextdomain (const char *domainname, const char *dirname)
 {
-  return bindtextdomain__ (domainname, dirname);
+  return libintl_bindtextdomain (domainname, dirname);
 }
 
 
+DLL_EXPORTED
 char *
-bind_textdomain_codeset (domainname, codeset)
-     const char *domainname;
-     const char *codeset;
+bind_textdomain_codeset (const char *domainname, const char *codeset)
 {
-  return bind_textdomain_codeset__ (domainname, codeset);
+  return libintl_bind_textdomain_codeset (domainname, codeset);
 }
diff --git a/gnu/usr.bin/texinfo/intl/l10nflist.c b/gnu/usr.bin/texinfo/intl/l10nflist.c
index 5f042325ccd..eb995aafad2 100644
--- a/gnu/usr.bin/texinfo/intl/l10nflist.c
+++ b/gnu/usr.bin/texinfo/intl/l10nflist.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
    This program is free software; you can redistribute it and/or modify it
@@ -58,20 +58,34 @@
 # endif
 #else
 # ifndef HAVE_STPCPY
-static char *stpcpy PARAMS ((char *dest, const char *src));
+static char *stpcpy (char *dest, const char *src);
 # endif
 #endif
 
+/* Pathname support.
+   ISSLASH(C)           tests whether C is a directory separator character.
+   IS_ABSOLUTE_PATH(P)  tests whether P is an absolute path.  If it is not,
+                        it may be concatenated to a directory pathname.
+ */
+#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
+  /* Win32, OS/2, DOS */
+# define ISSLASH(C) ((C) == '/' || (C) == '\\')
+# define HAS_DEVICE(P) \
+    ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
+     && (P)[1] == ':')
+# define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P))
+#else
+  /* Unix */
+# define ISSLASH(C) ((C) == '/')
+# define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0])
+#endif
+
 /* Define function which are usually not available.  */
 
 #if !defined _LIBC && !defined HAVE___ARGZ_COUNT
 /* Returns the number of strings in ARGZ.  */
-static size_t argz_count__ PARAMS ((const char *argz, size_t len));
-
 static size_t
-argz_count__ (argz, len)
-     const char *argz;
-     size_t len;
+argz_count__ (const char *argz, size_t len)
 {
   size_t count = 0;
   while (len > 0)
@@ -85,18 +99,17 @@ argz_count__ (argz, len)
 }
 # undef __argz_count
 # define __argz_count(argz, len) argz_count__ (argz, len)
+#else
+# ifdef _LIBC
+#  define __argz_count(argz, len) INTUSE(__argz_count) (argz, len)
+# endif
 #endif	/* !_LIBC && !HAVE___ARGZ_COUNT */
 
 #if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY
 /* Make '\0' separated arg vector ARGZ printable by converting all the '\0's
    except the last into the character SEP.  */
-static void argz_stringify__ PARAMS ((char *argz, size_t len, int sep));
-
 static void
-argz_stringify__ (argz, len, sep)
-     char *argz;
-     size_t len;
-     int sep;
+argz_stringify__ (char *argz, size_t len, int sep)
 {
   while (len > 0)
     {
@@ -109,17 +122,16 @@ argz_stringify__ (argz, len, sep)
 }
 # undef __argz_stringify
 # define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep)
+#else
+# ifdef _LIBC
+#  define __argz_stringify(argz, len, sep) \
+  INTUSE(__argz_stringify) (argz, len, sep)
+# endif
 #endif	/* !_LIBC && !HAVE___ARGZ_STRINGIFY */
 
 #if !defined _LIBC && !defined HAVE___ARGZ_NEXT
-static char *argz_next__ PARAMS ((char *argz, size_t argz_len,
-				  const char *entry));
-
 static char *
-argz_next__ (argz, argz_len, entry)
-     char *argz;
-     size_t argz_len;
-     const char *entry;
+argz_next__ (char *argz, size_t argz_len, const char *entry)
 {
   if (entry)
     {
@@ -140,11 +152,8 @@ argz_next__ (argz, argz_len, entry)
 
 
 /* Return number of bits set in X.  */
-static int pop PARAMS ((int x));
-
 static inline int
-pop (x)
-     int x;
+pop (int x)
 {
   /* We assume that no more than 16 bits are used.  */
   x = ((x & ~0x5555) >> 1) + (x & 0x5555);
@@ -157,31 +166,27 @@ pop (x)
 
 
 struct loaded_l10nfile *
-_nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
-		    territory, codeset, normalized_codeset, modifier, special,
-		    sponsor, revision, filename, do_allocate)
-     struct loaded_l10nfile **l10nfile_list;
-     const char *dirlist;
-     size_t dirlist_len;
-     int mask;
-     const char *language;
-     const char *territory;
-     const char *codeset;
-     const char *normalized_codeset;
-     const char *modifier;
-     const char *special;
-     const char *sponsor;
-     const char *revision;
-     const char *filename;
-     int do_allocate;
+_nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list,
+		    const char *dirlist, size_t dirlist_len,
+		    int mask, const char *language, const char *territory,
+		    const char *codeset, const char *normalized_codeset,
+		    const char *modifier, const char *special,
+		    const char *sponsor, const char *revision,
+		    const char *filename, int do_allocate)
 {
   char *abs_filename;
-  struct loaded_l10nfile *last = NULL;
+  struct loaded_l10nfile **lastp;
   struct loaded_l10nfile *retval;
   char *cp;
+  size_t dirlist_count;
   size_t entries;
   int cnt;
 
+  /* If LANGUAGE contains an absolute directory specification, we ignore
+     DIRLIST.  */
+  if (IS_ABSOLUTE_PATH (language))
+    dirlist_len = 0;
+
   /* Allocate room for the full file name.  */
   abs_filename = (char *) malloc (dirlist_len
 				  + strlen (language)
@@ -199,7 +204,7 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
 				  + (((mask & CEN_SPONSOR) != 0
 				      || (mask & CEN_REVISION) != 0)
 				     ? (1 + ((mask & CEN_SPONSOR) != 0
-					     ? strlen (sponsor) + 1 : 0)
+					     ? strlen (sponsor) : 0)
 					+ ((mask & CEN_REVISION) != 0
 					   ? strlen (revision) + 1 : 0)) : 0)
 				  + 1 + strlen (filename) + 1);
@@ -207,14 +212,16 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
   if (abs_filename == NULL)
     return NULL;
 
-  retval = NULL;
-  last = NULL;
-
   /* Construct file name.  */
-  memcpy (abs_filename, dirlist, dirlist_len);
-  __argz_stringify (abs_filename, dirlist_len, PATH_SEPARATOR);
-  cp = abs_filename + (dirlist_len - 1);
-  *cp++ = '/';
+  cp = abs_filename;
+  if (dirlist_len > 0)
+    {
+      memcpy (cp, dirlist, dirlist_len);
+      __argz_stringify (cp, dirlist_len, PATH_SEPARATOR);
+      cp += dirlist_len;
+      cp[-1] = '/';
+    }
+
   cp = stpcpy (cp, language);
 
   if ((mask & TERRITORY) != 0)
@@ -261,7 +268,7 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
 
   /* Look in list of already loaded domains whether it is already
      available.  */
-  last = NULL;
+  lastp = l10nfile_list;
   for (retval = *l10nfile_list; retval != NULL; retval = retval->next)
     if (retval->filename != NULL)
       {
@@ -276,7 +283,7 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
 	    break;
 	  }
 
-	last = retval;
+	lastp = &retval->next;
       }
 
   if (retval != NULL || do_allocate == 0)
@@ -285,48 +292,66 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
       return retval;
     }
 
-  retval = (struct loaded_l10nfile *)
-    malloc (sizeof (*retval) + (__argz_count (dirlist, dirlist_len)
-				* (1 << pop (mask))
-				* sizeof (struct loaded_l10nfile *)));
+  dirlist_count = (dirlist_len > 0 ? __argz_count (dirlist, dirlist_len) : 1);
+
+  /* Allocate a new loaded_l10nfile.  */
+  retval =
+    (struct loaded_l10nfile *)
+    malloc (sizeof (*retval)
+	    + (((dirlist_count << pop (mask)) + (dirlist_count > 1 ? 1 : 0))
+	       * sizeof (struct loaded_l10nfile *)));
   if (retval == NULL)
     return NULL;
 
   retval->filename = abs_filename;
-  retval->decided = (__argz_count (dirlist, dirlist_len) != 1
+
+  /* We set retval->data to NULL here; it is filled in later.
+     Setting retval->decided to 1 here means that retval does not
+     correspond to a real file (dirlist_count > 1) or is not worth
+     looking up (if an unnormalized codeset was specified).  */
+  retval->decided = (dirlist_count > 1
 		     || ((mask & XPG_CODESET) != 0
 			 && (mask & XPG_NORM_CODESET) != 0));
   retval->data = NULL;
 
-  if (last == NULL)
-    {
-      retval->next = *l10nfile_list;
-      *l10nfile_list = retval;
-    }
-  else
-    {
-      retval->next = last->next;
-      last->next = retval;
-    }
+  retval->next = *lastp;
+  *lastp = retval;
 
   entries = 0;
-  /* 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)
+  /* Recurse to fill the inheritance list of RETVAL.
+     If the DIRLIST is a real list (i.e. DIRLIST_COUNT > 1), the RETVAL
+     entry does not correspond to a real file; retval->filename contains
+     colons.  In this case we loop across all elements of DIRLIST and
+     across all bit patterns dominated by MASK.
+     If the DIRLIST is a single directory or entirely redundant (i.e.
+     DIRLIST_COUNT == 1), we loop across all bit patterns dominated by
+     MASK, excluding MASK itself.
+     In either case, we loop down from MASK to 0.  This has the effect
+     that the extra bits in the locale name are dropped in this order:
+     first the modifier, then the territory, then the codeset, then the
+     normalized_codeset.  */
+  for (cnt = dirlist_count > 1 ? mask : mask - 1; cnt >= 0; --cnt)
     if ((cnt & ~mask) == 0
 	&& ((cnt & CEN_SPECIFIC) == 0 || (cnt & XPG_SPECIFIC) == 0)
 	&& ((cnt & XPG_CODESET) == 0 || (cnt & XPG_NORM_CODESET) == 0))
       {
-	/* Iterate over all elements of the DIRLIST.  */
-	char *dir = NULL;
-
-	while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir))
-	       != NULL)
+	if (dirlist_count > 1)
+	  {
+	    /* Iterate over all elements of the DIRLIST.  */
+	    char *dir = NULL;
+
+	    while ((dir = __argz_next ((char *) dirlist, dirlist_len, dir))
+		   != NULL)
+	      retval->successor[entries++]
+		= _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1,
+				      cnt, language, territory, codeset,
+				      normalized_codeset, modifier, special,
+				      sponsor, revision, filename, 1);
+	  }
+	else
 	  retval->successor[entries++]
-	    = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1, cnt,
-				  language, territory, codeset,
+	    = _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len,
+				  cnt, language, territory, codeset,
 				  normalized_codeset, modifier, special,
 				  sponsor, revision, filename, 1);
       }
@@ -340,9 +365,7 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
    names.  The return value is dynamically allocated and has to be
    freed by the caller.  */
 const char *
-_nl_normalize_codeset (codeset, name_len)
-     const char *codeset;
-     size_t name_len;
+_nl_normalize_codeset (const char *codeset, size_t name_len)
 {
   int len = 0;
   int only_digit = 1;
@@ -389,9 +412,7 @@ _nl_normalize_codeset (codeset, name_len)
    to be defined.  */
 #if !_LIBC && !HAVE_STPCPY
 static char *
-stpcpy (dest, src)
-     char *dest;
-     const char *src;
+stpcpy (char *dest, const char *src)
 {
   while ((*dest++ = *src++) != '\0')
     /* Do nothing. */ ;
diff --git a/gnu/usr.bin/texinfo/intl/libgnuintl.h.in b/gnu/usr.bin/texinfo/intl/libgnuintl.h.in
new file mode 100644
index 00000000000..3be7eb990cb
--- /dev/null
+++ b/gnu/usr.bin/texinfo/intl/libgnuintl.h.in
@@ -0,0 +1,383 @@
+/* Message catalogs for internationalization.
+   Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
+
+   This program 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, 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library 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 _LIBINTL_H
+#define _LIBINTL_H	1
+
+#include <locale.h>
+
+/* The LC_MESSAGES locale category is the category used by the functions
+   gettext() and dgettext().  It is specified in POSIX, but not in ANSI C.
+   On systems that don't define it, use an arbitrary value instead.
+   On Solaris, <locale.h> defines __LOCALE_H (or _LOCALE_H in Solaris 2.5)
+   then includes <libintl.h> (i.e. this file!) and then only defines
+   LC_MESSAGES.  To avoid a redefinition warning, don't define LC_MESSAGES
+   in this case.  */
+#if !defined LC_MESSAGES && !(defined __LOCALE_H || (defined _LOCALE_H && defined __sun))
+# define LC_MESSAGES 1729
+#endif
+
+/* We define an additional symbol to signal that we use the GNU
+   implementation of gettext.  */
+#define __USE_GNU_GETTEXT 1
+
+/* Provide information about the supported file formats.  Returns the
+   maximum minor revision number supported for a given major revision.  */
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \
+  ((major) == 0 ? 1 : -1)
+
+/* Resolve a platform specific conflict on DJGPP.  GNU gettext takes
+   precedence over _conio_gettext.  */
+#ifdef __DJGPP__
+# undef gettext
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* We redirect the functions to those prefixed with "libintl_".  This is
+   necessary, because some systems define gettext/textdomain/... in the C
+   library (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer).
+   If we used the unprefixed names, there would be cases where the
+   definition in the C library would override the one in the libintl.so
+   shared library.  Recall that on ELF systems, the symbols are looked
+   up in the following order:
+     1. in the executable,
+     2. in the shared libraries specified on the link command line, in order,
+     3. in the dependencies of the shared libraries specified on the link
+        command line,
+     4. in the dlopen()ed shared libraries, in the order in which they were
+        dlopen()ed.
+   The definition in the C library would override the one in libintl.so if
+   either
+     * -lc is given on the link command line and -lintl isn't, or
+     * -lc is given on the link command line before -lintl, or
+     * libintl.so is a dependency of a dlopen()ed shared library but not
+       linked to the executable at link time.
+   Since Solaris gettext() behaves differently than GNU gettext(), this
+   would be unacceptable.
+
+   The redirection happens by default through macros in C, so that &gettext
+   is independent of the compilation unit, but through inline functions in
+   C++, in order not to interfere with the name mangling of class fields or
+   class methods called 'gettext'.  */
+
+/* The user can define _INTL_REDIRECT_INLINE or _INTL_REDIRECT_MACROS.
+   If he doesn't, we choose the method.  A third possible method is
+   _INTL_REDIRECT_ASM, supported only by GCC.  */
+#if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS)
+# if __GNUC__ >= 2 && !defined __APPLE_CC__ && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
+#  define _INTL_REDIRECT_ASM
+# else
+#  ifdef __cplusplus
+#   define _INTL_REDIRECT_INLINE
+#  else
+#   define _INTL_REDIRECT_MACROS
+#  endif
+# endif
+#endif
+/* Auxiliary macros.  */
+#ifdef _INTL_REDIRECT_ASM
+# define _INTL_ASM(cname) __asm__ (_INTL_ASMNAME (__USER_LABEL_PREFIX__, #cname))
+# define _INTL_ASMNAME(prefix,cnamestring) _INTL_STRINGIFY (prefix) cnamestring
+# define _INTL_STRINGIFY(prefix) #prefix
+#else
+# define _INTL_ASM(cname)
+#endif
+
+/* Look up MSGID in the current default message catalog for the current
+   LC_MESSAGES locale.  If not found, returns MSGID itself (the default
+   text).  */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_gettext (const char *__msgid);
+static inline char *gettext (const char *__msgid)
+{
+  return libintl_gettext (__msgid);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define gettext libintl_gettext
+#endif
+extern char *gettext (const char *__msgid)
+       _INTL_ASM (libintl_gettext);
+#endif
+
+/* Look up MSGID in the DOMAINNAME message catalog for the current
+   LC_MESSAGES locale.  */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_dgettext (const char *__domainname, const char *__msgid);
+static inline char *dgettext (const char *__domainname, const char *__msgid)
+{
+  return libintl_dgettext (__domainname, __msgid);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define dgettext libintl_dgettext
+#endif
+extern char *dgettext (const char *__domainname, const char *__msgid)
+       _INTL_ASM (libintl_dgettext);
+#endif
+
+/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
+   locale.  */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_dcgettext (const char *__domainname, const char *__msgid,
+				int __category);
+static inline char *dcgettext (const char *__domainname, const char *__msgid,
+			       int __category)
+{
+  return libintl_dcgettext (__domainname, __msgid, __category);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define dcgettext libintl_dcgettext
+#endif
+extern char *dcgettext (const char *__domainname, const char *__msgid,
+			int __category)
+       _INTL_ASM (libintl_dcgettext);
+#endif
+
+
+/* Similar to `gettext' but select the plural form corresponding to the
+   number N.  */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_ngettext (const char *__msgid1, const char *__msgid2,
+			       unsigned long int __n);
+static inline char *ngettext (const char *__msgid1, const char *__msgid2,
+			      unsigned long int __n)
+{
+  return libintl_ngettext (__msgid1, __msgid2, __n);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define ngettext libintl_ngettext
+#endif
+extern char *ngettext (const char *__msgid1, const char *__msgid2,
+		       unsigned long int __n)
+       _INTL_ASM (libintl_ngettext);
+#endif
+
+/* Similar to `dgettext' but select the plural form corresponding to the
+   number N.  */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_dngettext (const char *__domainname, const char *__msgid1,
+				const char *__msgid2, unsigned long int __n);
+static inline char *dngettext (const char *__domainname, const char *__msgid1,
+			       const char *__msgid2, unsigned long int __n)
+{
+  return libintl_dngettext (__domainname, __msgid1, __msgid2, __n);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define dngettext libintl_dngettext
+#endif
+extern char *dngettext (const char *__domainname,
+			const char *__msgid1, const char *__msgid2,
+			unsigned long int __n)
+       _INTL_ASM (libintl_dngettext);
+#endif
+
+/* Similar to `dcgettext' but select the plural form corresponding to the
+   number N.  */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_dcngettext (const char *__domainname,
+				 const char *__msgid1, const char *__msgid2,
+				 unsigned long int __n, int __category);
+static inline char *dcngettext (const char *__domainname,
+				const char *__msgid1, const char *__msgid2,
+				unsigned long int __n, int __category)
+{
+  return libintl_dcngettext (__domainname, __msgid1, __msgid2, __n, __category);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define dcngettext libintl_dcngettext
+#endif
+extern char *dcngettext (const char *__domainname,
+			 const char *__msgid1, const char *__msgid2,
+			 unsigned long int __n, int __category)
+       _INTL_ASM (libintl_dcngettext);
+#endif
+
+
+/* Set the current default message catalog to DOMAINNAME.
+   If DOMAINNAME is null, return the current default.
+   If DOMAINNAME is "", reset to the default of "messages".  */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_textdomain (const char *__domainname);
+static inline char *textdomain (const char *__domainname)
+{
+  return libintl_textdomain (__domainname);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define textdomain libintl_textdomain
+#endif
+extern char *textdomain (const char *__domainname)
+       _INTL_ASM (libintl_textdomain);
+#endif
+
+/* Specify that the DOMAINNAME message catalog will be found
+   in DIRNAME rather than in the system locale data base.  */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_bindtextdomain (const char *__domainname,
+				     const char *__dirname);
+static inline char *bindtextdomain (const char *__domainname,
+				    const char *__dirname)
+{
+  return libintl_bindtextdomain (__domainname, __dirname);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define bindtextdomain libintl_bindtextdomain
+#endif
+extern char *bindtextdomain (const char *__domainname, const char *__dirname)
+       _INTL_ASM (libintl_bindtextdomain);
+#endif
+
+/* Specify the character encoding in which the messages from the
+   DOMAINNAME message catalog will be returned.  */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_bind_textdomain_codeset (const char *__domainname,
+					      const char *__codeset);
+static inline char *bind_textdomain_codeset (const char *__domainname,
+					     const char *__codeset)
+{
+  return libintl_bind_textdomain_codeset (__domainname, __codeset);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define bind_textdomain_codeset libintl_bind_textdomain_codeset
+#endif
+extern char *bind_textdomain_codeset (const char *__domainname,
+				      const char *__codeset)
+       _INTL_ASM (libintl_bind_textdomain_codeset);
+#endif
+
+
+/* Support for format strings with positions in *printf(), following the
+   POSIX/XSI specification.
+   Note: These replacements for the *printf() functions are visible only
+   in source files that #include <libintl.h> or #include "gettext.h".
+   Packages that use *printf() in source files that don't refer to _()
+   or gettext() but for which the format string could be the return value
+   of _() or gettext() need to add this #include.  Oh well.  */
+
+#if !@HAVE_POSIX_PRINTF@
+
+#include <stdio.h>
+#include <stddef.h>
+
+/* Get va_list.  */
+#if __STDC__ || defined __cplusplus || defined _MSC_VER
+# include <stdarg.h>
+#else
+# include <varargs.h>
+#endif
+
+#undef fprintf
+#define fprintf libintl_fprintf
+extern int fprintf (FILE *, const char *, ...);
+#undef vfprintf
+#define vfprintf libintl_vfprintf
+extern int vfprintf (FILE *, const char *, va_list);
+
+#undef printf
+#define printf libintl_printf
+extern int printf (const char *, ...);
+#undef vprintf
+#define vprintf libintl_vprintf
+extern int vprintf (const char *, va_list);
+
+#undef sprintf
+#define sprintf libintl_sprintf
+extern int sprintf (char *, const char *, ...);
+#undef vsprintf
+#define vsprintf libintl_vsprintf
+extern int vsprintf (char *, const char *, va_list);
+
+#if @HAVE_SNPRINTF@
+
+#undef snprintf
+#define snprintf libintl_snprintf
+extern int snprintf (char *, size_t, const char *, ...);
+#undef vsnprintf
+#define vsnprintf libintl_vsnprintf
+extern int vsnprintf (char *, size_t, const char *, va_list);
+
+#endif
+
+#if @HAVE_ASPRINTF@
+
+#undef asprintf
+#define asprintf libintl_asprintf
+extern int asprintf (char **, const char *, ...);
+#undef vasprintf
+#define vasprintf libintl_vasprintf
+extern int vasprintf (char **, const char *, va_list);
+
+#endif
+
+#if @HAVE_WPRINTF@
+
+#undef fwprintf
+#define fwprintf libintl_fwprintf
+extern int fwprintf (FILE *, const wchar_t *, ...);
+#undef vfwprintf
+#define vfwprintf libintl_vfwprintf
+extern int vfwprintf (FILE *, const wchar_t *, va_list);
+
+#undef wprintf
+#define wprintf libintl_wprintf
+extern int wprintf (const wchar_t *, ...);
+#undef vwprintf
+#define vwprintf libintl_vwprintf
+extern int vwprintf (const wchar_t *, va_list);
+
+#undef swprintf
+#define swprintf libintl_swprintf
+extern int swprintf (wchar_t *, size_t, const wchar_t *, ...);
+#undef vswprintf
+#define vswprintf libintl_vswprintf
+extern int vswprintf (wchar_t *, size_t, const wchar_t *, va_list);
+
+#endif
+
+#endif
+
+
+/* Support for relocatable packages.  */
+
+/* Sets the original and the current installation prefix of the package.
+   Relocation simply replaces a pathname starting with the original prefix
+   by the corresponding pathname with the current prefix instead.  Both
+   prefixes should be directory names without trailing slash (i.e. use ""
+   instead of "/").  */
+#define libintl_set_relocation_prefix libintl_set_relocation_prefix
+extern void
+       libintl_set_relocation_prefix (const char *orig_prefix,
+				      const char *curr_prefix);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* libintl.h */
diff --git a/gnu/usr.bin/texinfo/intl/loadinfo.h b/gnu/usr.bin/texinfo/intl/loadinfo.h
index d180962f525..65e5ebd1f80 100644
--- a/gnu/usr.bin/texinfo/intl/loadinfo.h
+++ b/gnu/usr.bin/texinfo/intl/loadinfo.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-1999, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1996-1999, 2000-2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -32,14 +32,6 @@
    in gettextP.h.
  */
 
-#ifndef PARAMS
-# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif
-#endif
-
 #ifndef internal_function
 # define internal_function
 #endif
@@ -89,33 +81,65 @@ struct loaded_l10nfile
    names.  Normalization allows the user to use any of the common
    names.  The return value is dynamically allocated and has to be
    freed by the caller.  */
-extern const char *_nl_normalize_codeset PARAMS ((const char *codeset,
-						  size_t name_len));
-
+extern const char *_nl_normalize_codeset (const char *codeset,
+					  size_t name_len);
+
+/* Lookup a locale dependent file.
+   *L10NFILE_LIST denotes a pool of lookup results of locale dependent
+   files of the same kind, sorted in decreasing order of ->filename.
+   DIRLIST and DIRLIST_LEN are an argz list of directories in which to
+   look, containing at least one directory (i.e. DIRLIST_LEN > 0).
+   MASK, LANGUAGE, TERRITORY, CODESET, NORMALIZED_CODESET, MODIFIER,
+   SPECIAL, SPONSOR, REVISION are the pieces of the locale name, as
+   produced by _nl_explode_name().  FILENAME is the filename suffix.
+   The return value is the lookup result, either found in *L10NFILE_LIST,
+   or - if DO_ALLOCATE is nonzero - freshly allocated, or possibly NULL.
+   If the return value is non-NULL, it is added to *L10NFILE_LIST, and
+   its ->next field denotes the chaining inside *L10NFILE_LIST, and
+   furthermore its ->successor[] field contains a list of other lookup
+   results from which this lookup result inherits.  */
 extern struct loaded_l10nfile *
-_nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list,
-			    const char *dirlist, size_t dirlist_len, int mask,
-			    const char *language, const char *territory,
-			    const char *codeset,
-			    const char *normalized_codeset,
-			    const char *modifier, const char *special,
-			    const char *sponsor, const char *revision,
-			    const char *filename, int do_allocate));
-
-
-extern const char *_nl_expand_alias PARAMS ((const char *name));
-
-/* normalized_codeset is dynamically allocated and has to be freed by
-   the caller.  */
-extern int _nl_explode_name PARAMS ((char *name, const char **language,
-				     const char **modifier,
-				     const char **territory,
-				     const char **codeset,
-				     const char **normalized_codeset,
-				     const char **special,
-				     const char **sponsor,
-				     const char **revision));
-
-extern char *_nl_find_language PARAMS ((const char *name));
+_nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list,
+		    const char *dirlist, size_t dirlist_len, int mask,
+		    const char *language, const char *territory,
+		    const char *codeset, const char *normalized_codeset,
+		    const char *modifier, const char *special,
+		    const char *sponsor, const char *revision,
+		    const char *filename, int do_allocate);
+
+/* Lookup the real locale name for a locale alias NAME, or NULL if
+   NAME is not a locale alias (but possibly a real locale name).
+   The return value is statically allocated and must not be freed.  */
+extern const char *_nl_expand_alias (const char *name);
+
+/* Split a locale name NAME into its pieces: language, modifier,
+   territory, codeset, special, sponsor, revision.
+   NAME gets destructively modified: NUL bytes are inserted here and
+   there.  *LANGUAGE gets assigned NAME.  Each of *MODIFIER, *TERRITORY,
+   *CODESET, *SPECIAL, *SPONSOR, *REVISION gets assigned either a
+   pointer into the old NAME string, or NULL.  *NORMALIZED_CODESET
+   gets assigned the expanded *CODESET, if it is different from *CODESET;
+   this one is dynamically allocated and has to be freed by the caller.
+   The return value is a bitmask, where each bit corresponds to one
+   filled-in value:
+     XPG_MODIFIER, CEN_AUDIENCE  for *MODIFIER,
+     TERRITORY                   for *TERRITORY,
+     XPG_CODESET                 for *CODESET,
+     XPG_NORM_CODESET            for *NORMALIZED_CODESET,
+     CEN_SPECIAL                 for *SPECIAL,
+     CEN_SPONSOR                 for *SPONSOR,
+     CEN_REVISION                for *REVISION.
+ */
+extern int _nl_explode_name (char *name, const char **language,
+			     const char **modifier, const char **territory,
+			     const char **codeset,
+			     const char **normalized_codeset,
+			     const char **special, const char **sponsor,
+			     const char **revision);
+
+/* Split a locale name NAME into a leading language part and all the
+   rest.  Return a pointer to the first character after the language,
+   i.e. to the first byte of the rest.  */
+extern char *_nl_find_language (const char *name);
 
 #endif	/* loadinfo.h */
diff --git a/gnu/usr.bin/texinfo/intl/loadmsgcat.c b/gnu/usr.bin/texinfo/intl/loadmsgcat.c
index 76130ed2784..99c51b4c5c2 100644
--- a/gnu/usr.bin/texinfo/intl/loadmsgcat.c
+++ b/gnu/usr.bin/texinfo/intl/loadmsgcat.c
@@ -1,5 +1,5 @@
 /* Load needed message catalogs.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000-2004 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -34,17 +34,23 @@
 #include <sys/stat.h>
 
 #ifdef __GNUC__
+# undef  alloca
 # define alloca __builtin_alloca
 # define HAVE_ALLOCA 1
 #else
-# if defined HAVE_ALLOCA_H || defined _LIBC
-#  include <alloca.h>
+# ifdef _MSC_VER
+#  include <malloc.h>
+#  define alloca _alloca
 # else
-#  ifdef _AIX
- #pragma alloca
+#  if defined HAVE_ALLOCA_H || defined _LIBC
+#   include <alloca.h>
 #  else
-#   ifndef alloca
+#   ifdef _AIX
+ #pragma alloca
+#   else
+#    ifndef alloca
 char *alloca ();
+#    endif
 #   endif
 #  endif
 # endif
@@ -71,14 +77,380 @@ char *alloca ();
 # undef HAVE_MMAP
 #endif
 
+#if defined HAVE_STDINT_H_WITH_UINTMAX || defined _LIBC
+# include <stdint.h>
+#endif
+#if defined HAVE_INTTYPES_H || defined _LIBC
+# include <inttypes.h>
+#endif
+
 #include "gmo.h"
 #include "gettextP.h"
+#include "hash-string.h"
 #include "plural-exp.h"
 
 #ifdef _LIBC
 # include "../locale/localeinfo.h"
 #endif
 
+/* Provide fallback values for macros that ought to be defined in <inttypes.h>.
+   Note that our fallback values need not be literal strings, because we don't
+   use them with preprocessor string concatenation.  */
+#if !defined PRId8 || PRI_MACROS_BROKEN
+# undef PRId8
+# define PRId8 "d"
+#endif
+#if !defined PRIi8 || PRI_MACROS_BROKEN
+# undef PRIi8
+# define PRIi8 "i"
+#endif
+#if !defined PRIo8 || PRI_MACROS_BROKEN
+# undef PRIo8
+# define PRIo8 "o"
+#endif
+#if !defined PRIu8 || PRI_MACROS_BROKEN
+# undef PRIu8
+# define PRIu8 "u"
+#endif
+#if !defined PRIx8 || PRI_MACROS_BROKEN
+# undef PRIx8
+# define PRIx8 "x"
+#endif
+#if !defined PRIX8 || PRI_MACROS_BROKEN
+# undef PRIX8
+# define PRIX8 "X"
+#endif
+#if !defined PRId16 || PRI_MACROS_BROKEN
+# undef PRId16
+# define PRId16 "d"
+#endif
+#if !defined PRIi16 || PRI_MACROS_BROKEN
+# undef PRIi16
+# define PRIi16 "i"
+#endif
+#if !defined PRIo16 || PRI_MACROS_BROKEN
+# undef PRIo16
+# define PRIo16 "o"
+#endif
+#if !defined PRIu16 || PRI_MACROS_BROKEN
+# undef PRIu16
+# define PRIu16 "u"
+#endif
+#if !defined PRIx16 || PRI_MACROS_BROKEN
+# undef PRIx16
+# define PRIx16 "x"
+#endif
+#if !defined PRIX16 || PRI_MACROS_BROKEN
+# undef PRIX16
+# define PRIX16 "X"
+#endif
+#if !defined PRId32 || PRI_MACROS_BROKEN
+# undef PRId32
+# define PRId32 "d"
+#endif
+#if !defined PRIi32 || PRI_MACROS_BROKEN
+# undef PRIi32
+# define PRIi32 "i"
+#endif
+#if !defined PRIo32 || PRI_MACROS_BROKEN
+# undef PRIo32
+# define PRIo32 "o"
+#endif
+#if !defined PRIu32 || PRI_MACROS_BROKEN
+# undef PRIu32
+# define PRIu32 "u"
+#endif
+#if !defined PRIx32 || PRI_MACROS_BROKEN
+# undef PRIx32
+# define PRIx32 "x"
+#endif
+#if !defined PRIX32 || PRI_MACROS_BROKEN
+# undef PRIX32
+# define PRIX32 "X"
+#endif
+#if !defined PRId64 || PRI_MACROS_BROKEN
+# undef PRId64
+# define PRId64 (sizeof (long) == 8 ? "ld" : "lld")
+#endif
+#if !defined PRIi64 || PRI_MACROS_BROKEN
+# undef PRIi64
+# define PRIi64 (sizeof (long) == 8 ? "li" : "lli")
+#endif
+#if !defined PRIo64 || PRI_MACROS_BROKEN
+# undef PRIo64
+# define PRIo64 (sizeof (long) == 8 ? "lo" : "llo")
+#endif
+#if !defined PRIu64 || PRI_MACROS_BROKEN
+# undef PRIu64
+# define PRIu64 (sizeof (long) == 8 ? "lu" : "llu")
+#endif
+#if !defined PRIx64 || PRI_MACROS_BROKEN
+# undef PRIx64
+# define PRIx64 (sizeof (long) == 8 ? "lx" : "llx")
+#endif
+#if !defined PRIX64 || PRI_MACROS_BROKEN
+# undef PRIX64
+# define PRIX64 (sizeof (long) == 8 ? "lX" : "llX")
+#endif
+#if !defined PRIdLEAST8 || PRI_MACROS_BROKEN
+# undef PRIdLEAST8
+# define PRIdLEAST8 "d"
+#endif
+#if !defined PRIiLEAST8 || PRI_MACROS_BROKEN
+# undef PRIiLEAST8
+# define PRIiLEAST8 "i"
+#endif
+#if !defined PRIoLEAST8 || PRI_MACROS_BROKEN
+# undef PRIoLEAST8
+# define PRIoLEAST8 "o"
+#endif
+#if !defined PRIuLEAST8 || PRI_MACROS_BROKEN
+# undef PRIuLEAST8
+# define PRIuLEAST8 "u"
+#endif
+#if !defined PRIxLEAST8 || PRI_MACROS_BROKEN
+# undef PRIxLEAST8
+# define PRIxLEAST8 "x"
+#endif
+#if !defined PRIXLEAST8 || PRI_MACROS_BROKEN
+# undef PRIXLEAST8
+# define PRIXLEAST8 "X"
+#endif
+#if !defined PRIdLEAST16 || PRI_MACROS_BROKEN
+# undef PRIdLEAST16
+# define PRIdLEAST16 "d"
+#endif
+#if !defined PRIiLEAST16 || PRI_MACROS_BROKEN
+# undef PRIiLEAST16
+# define PRIiLEAST16 "i"
+#endif
+#if !defined PRIoLEAST16 || PRI_MACROS_BROKEN
+# undef PRIoLEAST16
+# define PRIoLEAST16 "o"
+#endif
+#if !defined PRIuLEAST16 || PRI_MACROS_BROKEN
+# undef PRIuLEAST16
+# define PRIuLEAST16 "u"
+#endif
+#if !defined PRIxLEAST16 || PRI_MACROS_BROKEN
+# undef PRIxLEAST16
+# define PRIxLEAST16 "x"
+#endif
+#if !defined PRIXLEAST16 || PRI_MACROS_BROKEN
+# undef PRIXLEAST16
+# define PRIXLEAST16 "X"
+#endif
+#if !defined PRIdLEAST32 || PRI_MACROS_BROKEN
+# undef PRIdLEAST32
+# define PRIdLEAST32 "d"
+#endif
+#if !defined PRIiLEAST32 || PRI_MACROS_BROKEN
+# undef PRIiLEAST32
+# define PRIiLEAST32 "i"
+#endif
+#if !defined PRIoLEAST32 || PRI_MACROS_BROKEN
+# undef PRIoLEAST32
+# define PRIoLEAST32 "o"
+#endif
+#if !defined PRIuLEAST32 || PRI_MACROS_BROKEN
+# undef PRIuLEAST32
+# define PRIuLEAST32 "u"
+#endif
+#if !defined PRIxLEAST32 || PRI_MACROS_BROKEN
+# undef PRIxLEAST32
+# define PRIxLEAST32 "x"
+#endif
+#if !defined PRIXLEAST32 || PRI_MACROS_BROKEN
+# undef PRIXLEAST32
+# define PRIXLEAST32 "X"
+#endif
+#if !defined PRIdLEAST64 || PRI_MACROS_BROKEN
+# undef PRIdLEAST64
+# define PRIdLEAST64 PRId64
+#endif
+#if !defined PRIiLEAST64 || PRI_MACROS_BROKEN
+# undef PRIiLEAST64
+# define PRIiLEAST64 PRIi64
+#endif
+#if !defined PRIoLEAST64 || PRI_MACROS_BROKEN
+# undef PRIoLEAST64
+# define PRIoLEAST64 PRIo64
+#endif
+#if !defined PRIuLEAST64 || PRI_MACROS_BROKEN
+# undef PRIuLEAST64
+# define PRIuLEAST64 PRIu64
+#endif
+#if !defined PRIxLEAST64 || PRI_MACROS_BROKEN
+# undef PRIxLEAST64
+# define PRIxLEAST64 PRIx64
+#endif
+#if !defined PRIXLEAST64 || PRI_MACROS_BROKEN
+# undef PRIXLEAST64
+# define PRIXLEAST64 PRIX64
+#endif
+#if !defined PRIdFAST8 || PRI_MACROS_BROKEN
+# undef PRIdFAST8
+# define PRIdFAST8 "d"
+#endif
+#if !defined PRIiFAST8 || PRI_MACROS_BROKEN
+# undef PRIiFAST8
+# define PRIiFAST8 "i"
+#endif
+#if !defined PRIoFAST8 || PRI_MACROS_BROKEN
+# undef PRIoFAST8
+# define PRIoFAST8 "o"
+#endif
+#if !defined PRIuFAST8 || PRI_MACROS_BROKEN
+# undef PRIuFAST8
+# define PRIuFAST8 "u"
+#endif
+#if !defined PRIxFAST8 || PRI_MACROS_BROKEN
+# undef PRIxFAST8
+# define PRIxFAST8 "x"
+#endif
+#if !defined PRIXFAST8 || PRI_MACROS_BROKEN
+# undef PRIXFAST8
+# define PRIXFAST8 "X"
+#endif
+#if !defined PRIdFAST16 || PRI_MACROS_BROKEN
+# undef PRIdFAST16
+# define PRIdFAST16 "d"
+#endif
+#if !defined PRIiFAST16 || PRI_MACROS_BROKEN
+# undef PRIiFAST16
+# define PRIiFAST16 "i"
+#endif
+#if !defined PRIoFAST16 || PRI_MACROS_BROKEN
+# undef PRIoFAST16
+# define PRIoFAST16 "o"
+#endif
+#if !defined PRIuFAST16 || PRI_MACROS_BROKEN
+# undef PRIuFAST16
+# define PRIuFAST16 "u"
+#endif
+#if !defined PRIxFAST16 || PRI_MACROS_BROKEN
+# undef PRIxFAST16
+# define PRIxFAST16 "x"
+#endif
+#if !defined PRIXFAST16 || PRI_MACROS_BROKEN
+# undef PRIXFAST16
+# define PRIXFAST16 "X"
+#endif
+#if !defined PRIdFAST32 || PRI_MACROS_BROKEN
+# undef PRIdFAST32
+# define PRIdFAST32 "d"
+#endif
+#if !defined PRIiFAST32 || PRI_MACROS_BROKEN
+# undef PRIiFAST32
+# define PRIiFAST32 "i"
+#endif
+#if !defined PRIoFAST32 || PRI_MACROS_BROKEN
+# undef PRIoFAST32
+# define PRIoFAST32 "o"
+#endif
+#if !defined PRIuFAST32 || PRI_MACROS_BROKEN
+# undef PRIuFAST32
+# define PRIuFAST32 "u"
+#endif
+#if !defined PRIxFAST32 || PRI_MACROS_BROKEN
+# undef PRIxFAST32
+# define PRIxFAST32 "x"
+#endif
+#if !defined PRIXFAST32 || PRI_MACROS_BROKEN
+# undef PRIXFAST32
+# define PRIXFAST32 "X"
+#endif
+#if !defined PRIdFAST64 || PRI_MACROS_BROKEN
+# undef PRIdFAST64
+# define PRIdFAST64 PRId64
+#endif
+#if !defined PRIiFAST64 || PRI_MACROS_BROKEN
+# undef PRIiFAST64
+# define PRIiFAST64 PRIi64
+#endif
+#if !defined PRIoFAST64 || PRI_MACROS_BROKEN
+# undef PRIoFAST64
+# define PRIoFAST64 PRIo64
+#endif
+#if !defined PRIuFAST64 || PRI_MACROS_BROKEN
+# undef PRIuFAST64
+# define PRIuFAST64 PRIu64
+#endif
+#if !defined PRIxFAST64 || PRI_MACROS_BROKEN
+# undef PRIxFAST64
+# define PRIxFAST64 PRIx64
+#endif
+#if !defined PRIXFAST64 || PRI_MACROS_BROKEN
+# undef PRIXFAST64
+# define PRIXFAST64 PRIX64
+#endif
+#if !defined PRIdMAX || PRI_MACROS_BROKEN
+# undef PRIdMAX
+# define PRIdMAX (sizeof (uintmax_t) == sizeof (long) ? "ld" : "lld")
+#endif
+#if !defined PRIiMAX || PRI_MACROS_BROKEN
+# undef PRIiMAX
+# define PRIiMAX (sizeof (uintmax_t) == sizeof (long) ? "li" : "lli")
+#endif
+#if !defined PRIoMAX || PRI_MACROS_BROKEN
+# undef PRIoMAX
+# define PRIoMAX (sizeof (uintmax_t) == sizeof (long) ? "lo" : "llo")
+#endif
+#if !defined PRIuMAX || PRI_MACROS_BROKEN
+# undef PRIuMAX
+# define PRIuMAX (sizeof (uintmax_t) == sizeof (long) ? "lu" : "llu")
+#endif
+#if !defined PRIxMAX || PRI_MACROS_BROKEN
+# undef PRIxMAX
+# define PRIxMAX (sizeof (uintmax_t) == sizeof (long) ? "lx" : "llx")
+#endif
+#if !defined PRIXMAX || PRI_MACROS_BROKEN
+# undef PRIXMAX
+# define PRIXMAX (sizeof (uintmax_t) == sizeof (long) ? "lX" : "llX")
+#endif
+#if !defined PRIdPTR || PRI_MACROS_BROKEN
+# undef PRIdPTR
+# define PRIdPTR \
+  (sizeof (void *) == sizeof (long) ? "ld" : \
+   sizeof (void *) == sizeof (int) ? "d" : \
+   "lld")
+#endif
+#if !defined PRIiPTR || PRI_MACROS_BROKEN
+# undef PRIiPTR
+# define PRIiPTR \
+  (sizeof (void *) == sizeof (long) ? "li" : \
+   sizeof (void *) == sizeof (int) ? "i" : \
+   "lli")
+#endif
+#if !defined PRIoPTR || PRI_MACROS_BROKEN
+# undef PRIoPTR
+# define PRIoPTR \
+  (sizeof (void *) == sizeof (long) ? "lo" : \
+   sizeof (void *) == sizeof (int) ? "o" : \
+   "llo")
+#endif
+#if !defined PRIuPTR || PRI_MACROS_BROKEN
+# undef PRIuPTR
+# define PRIuPTR \
+  (sizeof (void *) == sizeof (long) ? "lu" : \
+   sizeof (void *) == sizeof (int) ? "u" : \
+   "llu")
+#endif
+#if !defined PRIxPTR || PRI_MACROS_BROKEN
+# undef PRIxPTR
+# define PRIxPTR \
+  (sizeof (void *) == sizeof (long) ? "lx" : \
+   sizeof (void *) == sizeof (int) ? "x" : \
+   "llx")
+#endif
+#if !defined PRIXPTR || PRI_MACROS_BROKEN
+# undef PRIXPTR
+# define PRIXPTR \
+  (sizeof (void *) == sizeof (long) ? "lX" : \
+   sizeof (void *) == sizeof (int) ? "X" : \
+   "llX")
+#endif
+
 /* @@ end of prolog @@ */
 
 #ifdef _LIBC
@@ -118,20 +490,287 @@ char *alloca ();
 # define O_BINARY 0
 #endif
 
+
 /* 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;
 
 
+/* Expand a system dependent string segment.  Return NULL if unsupported.  */
+static const char *
+get_sysdep_segment_value (const char *name)
+{
+  /* Test for an ISO C 99 section 7.8.1 format string directive.
+     Syntax:
+     P R I { d | i | o | u | x | X }
+     { { | LEAST | FAST } { 8 | 16 | 32 | 64 } | MAX | PTR }  */
+  /* We don't use a table of 14 times 6 'const char *' strings here, because
+     data relocations cost startup time.  */
+  if (name[0] == 'P' && name[1] == 'R' && name[2] == 'I')
+    {
+      if (name[3] == 'd' || name[3] == 'i' || name[3] == 'o' || name[3] == 'u'
+	  || name[3] == 'x' || name[3] == 'X')
+	{
+	  if (name[4] == '8' && name[5] == '\0')
+	    {
+	      if (name[3] == 'd')
+		return PRId8;
+	      if (name[3] == 'i')
+		return PRIi8;
+	      if (name[3] == 'o')
+		return PRIo8;
+	      if (name[3] == 'u')
+		return PRIu8;
+	      if (name[3] == 'x')
+		return PRIx8;
+	      if (name[3] == 'X')
+		return PRIX8;
+	      abort ();
+	    }
+	  if (name[4] == '1' && name[5] == '6' && name[6] == '\0')
+	    {
+	      if (name[3] == 'd')
+		return PRId16;
+	      if (name[3] == 'i')
+		return PRIi16;
+	      if (name[3] == 'o')
+		return PRIo16;
+	      if (name[3] == 'u')
+		return PRIu16;
+	      if (name[3] == 'x')
+		return PRIx16;
+	      if (name[3] == 'X')
+		return PRIX16;
+	      abort ();
+	    }
+	  if (name[4] == '3' && name[5] == '2' && name[6] == '\0')
+	    {
+	      if (name[3] == 'd')
+		return PRId32;
+	      if (name[3] == 'i')
+		return PRIi32;
+	      if (name[3] == 'o')
+		return PRIo32;
+	      if (name[3] == 'u')
+		return PRIu32;
+	      if (name[3] == 'x')
+		return PRIx32;
+	      if (name[3] == 'X')
+		return PRIX32;
+	      abort ();
+	    }
+	  if (name[4] == '6' && name[5] == '4' && name[6] == '\0')
+	    {
+	      if (name[3] == 'd')
+		return PRId64;
+	      if (name[3] == 'i')
+		return PRIi64;
+	      if (name[3] == 'o')
+		return PRIo64;
+	      if (name[3] == 'u')
+		return PRIu64;
+	      if (name[3] == 'x')
+		return PRIx64;
+	      if (name[3] == 'X')
+		return PRIX64;
+	      abort ();
+	    }
+	  if (name[4] == 'L' && name[5] == 'E' && name[6] == 'A'
+	      && name[7] == 'S' && name[8] == 'T')
+	    {
+	      if (name[9] == '8' && name[10] == '\0')
+		{
+		  if (name[3] == 'd')
+		    return PRIdLEAST8;
+		  if (name[3] == 'i')
+		    return PRIiLEAST8;
+		  if (name[3] == 'o')
+		    return PRIoLEAST8;
+		  if (name[3] == 'u')
+		    return PRIuLEAST8;
+		  if (name[3] == 'x')
+		    return PRIxLEAST8;
+		  if (name[3] == 'X')
+		    return PRIXLEAST8;
+		  abort ();
+		}
+	      if (name[9] == '1' && name[10] == '6' && name[11] == '\0')
+		{
+		  if (name[3] == 'd')
+		    return PRIdLEAST16;
+		  if (name[3] == 'i')
+		    return PRIiLEAST16;
+		  if (name[3] == 'o')
+		    return PRIoLEAST16;
+		  if (name[3] == 'u')
+		    return PRIuLEAST16;
+		  if (name[3] == 'x')
+		    return PRIxLEAST16;
+		  if (name[3] == 'X')
+		    return PRIXLEAST16;
+		  abort ();
+		}
+	      if (name[9] == '3' && name[10] == '2' && name[11] == '\0')
+		{
+		  if (name[3] == 'd')
+		    return PRIdLEAST32;
+		  if (name[3] == 'i')
+		    return PRIiLEAST32;
+		  if (name[3] == 'o')
+		    return PRIoLEAST32;
+		  if (name[3] == 'u')
+		    return PRIuLEAST32;
+		  if (name[3] == 'x')
+		    return PRIxLEAST32;
+		  if (name[3] == 'X')
+		    return PRIXLEAST32;
+		  abort ();
+		}
+	      if (name[9] == '6' && name[10] == '4' && name[11] == '\0')
+		{
+		  if (name[3] == 'd')
+		    return PRIdLEAST64;
+		  if (name[3] == 'i')
+		    return PRIiLEAST64;
+		  if (name[3] == 'o')
+		    return PRIoLEAST64;
+		  if (name[3] == 'u')
+		    return PRIuLEAST64;
+		  if (name[3] == 'x')
+		    return PRIxLEAST64;
+		  if (name[3] == 'X')
+		    return PRIXLEAST64;
+		  abort ();
+		}
+	    }
+	  if (name[4] == 'F' && name[5] == 'A' && name[6] == 'S'
+	      && name[7] == 'T')
+	    {
+	      if (name[8] == '8' && name[9] == '\0')
+		{
+		  if (name[3] == 'd')
+		    return PRIdFAST8;
+		  if (name[3] == 'i')
+		    return PRIiFAST8;
+		  if (name[3] == 'o')
+		    return PRIoFAST8;
+		  if (name[3] == 'u')
+		    return PRIuFAST8;
+		  if (name[3] == 'x')
+		    return PRIxFAST8;
+		  if (name[3] == 'X')
+		    return PRIXFAST8;
+		  abort ();
+		}
+	      if (name[8] == '1' && name[9] == '6' && name[10] == '\0')
+		{
+		  if (name[3] == 'd')
+		    return PRIdFAST16;
+		  if (name[3] == 'i')
+		    return PRIiFAST16;
+		  if (name[3] == 'o')
+		    return PRIoFAST16;
+		  if (name[3] == 'u')
+		    return PRIuFAST16;
+		  if (name[3] == 'x')
+		    return PRIxFAST16;
+		  if (name[3] == 'X')
+		    return PRIXFAST16;
+		  abort ();
+		}
+	      if (name[8] == '3' && name[9] == '2' && name[10] == '\0')
+		{
+		  if (name[3] == 'd')
+		    return PRIdFAST32;
+		  if (name[3] == 'i')
+		    return PRIiFAST32;
+		  if (name[3] == 'o')
+		    return PRIoFAST32;
+		  if (name[3] == 'u')
+		    return PRIuFAST32;
+		  if (name[3] == 'x')
+		    return PRIxFAST32;
+		  if (name[3] == 'X')
+		    return PRIXFAST32;
+		  abort ();
+		}
+	      if (name[8] == '6' && name[9] == '4' && name[10] == '\0')
+		{
+		  if (name[3] == 'd')
+		    return PRIdFAST64;
+		  if (name[3] == 'i')
+		    return PRIiFAST64;
+		  if (name[3] == 'o')
+		    return PRIoFAST64;
+		  if (name[3] == 'u')
+		    return PRIuFAST64;
+		  if (name[3] == 'x')
+		    return PRIxFAST64;
+		  if (name[3] == 'X')
+		    return PRIXFAST64;
+		  abort ();
+		}
+	    }
+	  if (name[4] == 'M' && name[5] == 'A' && name[6] == 'X'
+	      && name[7] == '\0')
+	    {
+	      if (name[3] == 'd')
+		return PRIdMAX;
+	      if (name[3] == 'i')
+		return PRIiMAX;
+	      if (name[3] == 'o')
+		return PRIoMAX;
+	      if (name[3] == 'u')
+		return PRIuMAX;
+	      if (name[3] == 'x')
+		return PRIxMAX;
+	      if (name[3] == 'X')
+		return PRIXMAX;
+	      abort ();
+	    }
+	  if (name[4] == 'P' && name[5] == 'T' && name[6] == 'R'
+	      && name[7] == '\0')
+	    {
+	      if (name[3] == 'd')
+		return PRIdPTR;
+	      if (name[3] == 'i')
+		return PRIiPTR;
+	      if (name[3] == 'o')
+		return PRIoPTR;
+	      if (name[3] == 'u')
+		return PRIuPTR;
+	      if (name[3] == 'x')
+		return PRIxPTR;
+	      if (name[3] == 'X')
+		return PRIXPTR;
+	      abort ();
+	    }
+	}
+    }
+  /* Test for a glibc specific printf() format directive flag.  */
+  if (name[0] == 'I' && name[1] == '\0')
+    {
+#if defined _LIBC || __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)
+      /* The 'I' flag, in numeric format directives, replaces ASCII digits
+	 with the 'outdigits' defined in the LC_CTYPE locale facet.  This is
+	 used for Farsi (Persian) and maybe Arabic.  */
+      return "I";
+#else
+      return "";
+#endif
+    }
+  /* Other system dependent strings are not valid.  */
+  return NULL;
+}
+
 /* Initialize the codeset dependent parts of an opened message catalog.
    Return the header entry.  */
 const char *
 internal_function
-_nl_init_domain_conv (domain_file, domain, domainbinding)
-     struct loaded_l10nfile *domain_file;
-     struct loaded_domain *domain;
-     struct binding *domainbinding;
+_nl_init_domain_conv (struct loaded_l10nfile *domain_file,
+		      struct loaded_domain *domain,
+		      struct binding *domainbinding)
 {
   /* Find out about the character set the file is encoded with.
      This can be found (in textual form) in the entry "".  If this
@@ -192,10 +831,10 @@ _nl_init_domain_conv (domain_file, domain, domainbinding)
 	      if (outcharset == NULL || outcharset[0] == '\0')
 		{
 # ifdef _LIBC
-		  outcharset = (*_nl_current[LC_CTYPE])->values[_NL_ITEM_INDEX (CODESET)].string;
+		  outcharset = _NL_CURRENT (LC_CTYPE, CODESET);
 # else
 #  if HAVE_ICONV
-		  extern const char *locale_charset PARAMS ((void));
+		  extern const char *locale_charset (void);
 		  outcharset = locale_charset ();
 #  endif
 # endif
@@ -216,19 +855,23 @@ _nl_init_domain_conv (domain_file, domain, domainbinding)
 	     we want to use transliteration.  */
 #   if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \
        || _LIBICONV_VERSION >= 0x0105
-	  len = strlen (outcharset);
-	  {
-	    char *tmp = (char *) alloca (len + 10 + 1);
-	    memcpy (tmp, outcharset, len);
-	    memcpy (tmp + len, "//TRANSLIT", 10 + 1);
-	    outcharset = tmp;
-	  }
-#   endif
-	  domain->conv = iconv_open (outcharset, charset);
-#   if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \
-       || _LIBICONV_VERSION >= 0x0105
-	  freea (outcharset);
+	  if (strchr (outcharset, '/') == NULL)
+	    {
+	      char *tmp;
+
+	      len = strlen (outcharset);
+	      tmp = (char *) alloca (len + 10 + 1);
+	      memcpy (tmp, outcharset, len);
+	      memcpy (tmp + len, "//TRANSLIT", 10 + 1);
+	      outcharset = tmp;
+
+	      domain->conv = iconv_open (outcharset, charset);
+
+	      freea (outcharset);
+	    }
+	  else
 #   endif
+	    domain->conv = iconv_open (outcharset, charset);
 #  endif
 # endif
 
@@ -243,8 +886,7 @@ _nl_init_domain_conv (domain_file, domain, domainbinding)
 /* Frees the codeset dependent parts of an opened message catalog.  */
 void
 internal_function
-_nl_free_domain_conv (domain)
-     struct loaded_domain *domain;
+_nl_free_domain_conv (struct loaded_domain *domain)
 {
   if (domain->conv_tab != NULL && domain->conv_tab != (char **) -1)
     free (domain->conv_tab);
@@ -264,9 +906,8 @@ _nl_free_domain_conv (domain)
    message catalog do nothing.  */
 void
 internal_function
-_nl_load_domain (domain_file, domainbinding)
-     struct loaded_l10nfile *domain_file;
-     struct binding *domainbinding;
+_nl_load_domain (struct loaded_l10nfile *domain_file,
+		 struct binding *domainbinding)
 {
   int fd;
   size_t size;
@@ -278,6 +919,7 @@ _nl_load_domain (domain_file, domainbinding)
   struct mo_file_header *data = (struct mo_file_header *) -1;
   int use_mmap = 0;
   struct loaded_domain *domain;
+  int revision;
   const char *nullentry;
 
   domain_file->decided = 1;
@@ -385,22 +1027,353 @@ _nl_load_domain (domain_file, domainbinding)
   domain->use_mmap = use_mmap;
   domain->mmap_size = size;
   domain->must_swap = data->magic != _MAGIC;
+  domain->malloced = NULL;
 
   /* Fill in the information about the available tables.  */
-  switch (W (domain->must_swap, data->revision))
+  revision = W (domain->must_swap, data->revision);
+  /* We support only the major revisions 0 and 1.  */
+  switch (revision >> 16)
     {
     case 0:
+    case 1:
       domain->nstrings = W (domain->must_swap, data->nstrings);
-      domain->orig_tab = (struct string_desc *)
+      domain->orig_tab = (const struct string_desc *)
 	((char *) data + W (domain->must_swap, data->orig_tab_offset));
-      domain->trans_tab = (struct string_desc *)
+      domain->trans_tab = (const struct string_desc *)
 	((char *) data + W (domain->must_swap, data->trans_tab_offset));
       domain->hash_size = W (domain->must_swap, data->hash_tab_size);
-      domain->hash_tab = (nls_uint32 *)
-	((char *) data + W (domain->must_swap, data->hash_tab_offset));
+      domain->hash_tab =
+	(domain->hash_size > 2
+	 ? (const nls_uint32 *)
+	   ((char *) data + W (domain->must_swap, data->hash_tab_offset))
+	 : NULL);
+      domain->must_swap_hash_tab = domain->must_swap;
+
+      /* Now dispatch on the minor revision.  */
+      switch (revision & 0xffff)
+	{
+	case 0:
+	  domain->n_sysdep_strings = 0;
+	  domain->orig_sysdep_tab = NULL;
+	  domain->trans_sysdep_tab = NULL;
+	  break;
+	case 1:
+	default:
+	  {
+	    nls_uint32 n_sysdep_strings;
+
+	    if (domain->hash_tab == NULL)
+	      /* This is invalid.  These minor revisions need a hash table.  */
+	      goto invalid;
+
+	    n_sysdep_strings =
+	      W (domain->must_swap, data->n_sysdep_strings);
+	    if (n_sysdep_strings > 0)
+	      {
+		nls_uint32 n_sysdep_segments;
+		const struct sysdep_segment *sysdep_segments;
+		const char **sysdep_segment_values;
+		const nls_uint32 *orig_sysdep_tab;
+		const nls_uint32 *trans_sysdep_tab;
+		nls_uint32 n_inmem_sysdep_strings;
+		size_t memneed;
+		char *mem;
+		struct sysdep_string_desc *inmem_orig_sysdep_tab;
+		struct sysdep_string_desc *inmem_trans_sysdep_tab;
+		nls_uint32 *inmem_hash_tab;
+		unsigned int i, j;
+
+		/* Get the values of the system dependent segments.  */
+		n_sysdep_segments =
+		  W (domain->must_swap, data->n_sysdep_segments);
+		sysdep_segments = (const struct sysdep_segment *)
+		  ((char *) data
+		   + W (domain->must_swap, data->sysdep_segments_offset));
+		sysdep_segment_values =
+		  alloca (n_sysdep_segments * sizeof (const char *));
+		for (i = 0; i < n_sysdep_segments; i++)
+		  {
+		    const char *name =
+		      (char *) data
+		      + W (domain->must_swap, sysdep_segments[i].offset);
+		    nls_uint32 namelen =
+		      W (domain->must_swap, sysdep_segments[i].length);
+
+		    if (!(namelen > 0 && name[namelen - 1] == '\0'))
+		      {
+			freea (sysdep_segment_values);
+			goto invalid;
+		      }
+
+		    sysdep_segment_values[i] = get_sysdep_segment_value (name);
+		  }
+
+		orig_sysdep_tab = (const nls_uint32 *)
+		  ((char *) data
+		   + W (domain->must_swap, data->orig_sysdep_tab_offset));
+		trans_sysdep_tab = (const nls_uint32 *)
+		  ((char *) data
+		   + W (domain->must_swap, data->trans_sysdep_tab_offset));
+
+		/* Compute the amount of additional memory needed for the
+		   system dependent strings and the augmented hash table.
+		   At the same time, also drop string pairs which refer to
+		   an undefined system dependent segment.  */
+		n_inmem_sysdep_strings = 0;
+		memneed = domain->hash_size * sizeof (nls_uint32);
+		for (i = 0; i < n_sysdep_strings; i++)
+		  {
+		    int valid = 1;
+		    size_t needs[2];
+
+		    for (j = 0; j < 2; j++)
+		      {
+			const struct sysdep_string *sysdep_string =
+			  (const struct sysdep_string *)
+			  ((char *) data
+			   + W (domain->must_swap,
+				j == 0
+				? orig_sysdep_tab[i]
+				: trans_sysdep_tab[i]));
+			size_t need = 0;
+			const struct segment_pair *p = sysdep_string->segments;
+
+			if (W (domain->must_swap, p->sysdepref) != SEGMENTS_END)
+			  for (p = sysdep_string->segments;; p++)
+			    {
+			      nls_uint32 sysdepref;
+
+			      need += W (domain->must_swap, p->segsize);
+
+			      sysdepref = W (domain->must_swap, p->sysdepref);
+			      if (sysdepref == SEGMENTS_END)
+				break;
+
+			      if (sysdepref >= n_sysdep_segments)
+				{
+				  /* Invalid.  */
+				  freea (sysdep_segment_values);
+				  goto invalid;
+				}
+
+			      if (sysdep_segment_values[sysdepref] == NULL)
+				{
+				  /* This particular string pair is invalid.  */
+				  valid = 0;
+				  break;
+				}
+
+			      need += strlen (sysdep_segment_values[sysdepref]);
+			    }
+
+			needs[j] = need;
+			if (!valid)
+			  break;
+		      }
+
+		    if (valid)
+		      {
+			n_inmem_sysdep_strings++;
+			memneed += needs[0] + needs[1];
+		      }
+		  }
+		memneed += 2 * n_inmem_sysdep_strings
+			   * sizeof (struct sysdep_string_desc);
+
+		if (n_inmem_sysdep_strings > 0)
+		  {
+		    unsigned int k;
+
+		    /* Allocate additional memory.  */
+		    mem = (char *) malloc (memneed);
+		    if (mem == NULL)
+		      goto invalid;
+
+		    domain->malloced = mem;
+		    inmem_orig_sysdep_tab = (struct sysdep_string_desc *) mem;
+		    mem += n_inmem_sysdep_strings
+			   * sizeof (struct sysdep_string_desc);
+		    inmem_trans_sysdep_tab = (struct sysdep_string_desc *) mem;
+		    mem += n_inmem_sysdep_strings
+			   * sizeof (struct sysdep_string_desc);
+		    inmem_hash_tab = (nls_uint32 *) mem;
+		    mem += domain->hash_size * sizeof (nls_uint32);
+
+		    /* Compute the system dependent strings.  */
+		    k = 0;
+		    for (i = 0; i < n_sysdep_strings; i++)
+		      {
+			int valid = 1;
+
+			for (j = 0; j < 2; j++)
+			  {
+			    const struct sysdep_string *sysdep_string =
+			      (const struct sysdep_string *)
+			      ((char *) data
+			       + W (domain->must_swap,
+				    j == 0
+				    ? orig_sysdep_tab[i]
+				    : trans_sysdep_tab[i]));
+			    const struct segment_pair *p =
+			      sysdep_string->segments;
+
+			    if (W (domain->must_swap, p->sysdepref)
+				!= SEGMENTS_END)
+			      for (p = sysdep_string->segments;; p++)
+				{
+				  nls_uint32 sysdepref;
+
+				  sysdepref =
+				    W (domain->must_swap, p->sysdepref);
+				  if (sysdepref == SEGMENTS_END)
+				    break;
+
+				  if (sysdep_segment_values[sysdepref] == NULL)
+				    {
+				      /* This particular string pair is
+					 invalid.  */
+				      valid = 0;
+				      break;
+				    }
+				}
+
+			    if (!valid)
+			      break;
+			  }
+
+			if (valid)
+			  {
+			    for (j = 0; j < 2; j++)
+			      {
+				const struct sysdep_string *sysdep_string =
+				  (const struct sysdep_string *)
+				  ((char *) data
+				   + W (domain->must_swap,
+					j == 0
+					? orig_sysdep_tab[i]
+					: trans_sysdep_tab[i]));
+				const char *static_segments =
+				  (char *) data
+				  + W (domain->must_swap, sysdep_string->offset);
+				const struct segment_pair *p =
+				  sysdep_string->segments;
+
+				/* Concatenate the segments, and fill
+				   inmem_orig_sysdep_tab[k] (for j == 0) and
+				   inmem_trans_sysdep_tab[k] (for j == 1).  */
+
+				struct sysdep_string_desc *inmem_tab_entry =
+				  (j == 0
+				   ? inmem_orig_sysdep_tab
+				   : inmem_trans_sysdep_tab)
+				  + k;
+
+				if (W (domain->must_swap, p->sysdepref)
+				    == SEGMENTS_END)
+				  {
+				    /* Only one static segment.  */
+				    inmem_tab_entry->length =
+				      W (domain->must_swap, p->segsize);
+				    inmem_tab_entry->pointer = static_segments;
+				  }
+				else
+				  {
+				    inmem_tab_entry->pointer = mem;
+
+				    for (p = sysdep_string->segments;; p++)
+				      {
+					nls_uint32 segsize =
+					  W (domain->must_swap, p->segsize);
+					nls_uint32 sysdepref =
+					  W (domain->must_swap, p->sysdepref);
+					size_t n;
+
+					if (segsize > 0)
+					  {
+					    memcpy (mem, static_segments, segsize);
+					    mem += segsize;
+					    static_segments += segsize;
+					  }
+
+					if (sysdepref == SEGMENTS_END)
+					  break;
+
+					n = strlen (sysdep_segment_values[sysdepref]);
+					memcpy (mem, sysdep_segment_values[sysdepref], n);
+					mem += n;
+				      }
+
+				    inmem_tab_entry->length =
+				      mem - inmem_tab_entry->pointer;
+				  }
+			      }
+
+			    k++;
+			  }
+		      }
+		    if (k != n_inmem_sysdep_strings)
+		      abort ();
+
+		    /* Compute the augmented hash table.  */
+		    for (i = 0; i < domain->hash_size; i++)
+		      inmem_hash_tab[i] =
+			W (domain->must_swap_hash_tab, domain->hash_tab[i]);
+		    for (i = 0; i < n_inmem_sysdep_strings; i++)
+		      {
+			const char *msgid = inmem_orig_sysdep_tab[i].pointer;
+			nls_uint32 hash_val = hash_string (msgid);
+			nls_uint32 idx = hash_val % domain->hash_size;
+			nls_uint32 incr =
+			  1 + (hash_val % (domain->hash_size - 2));
+
+			for (;;)
+			  {
+			    if (inmem_hash_tab[idx] == 0)
+			      {
+				/* Hash table entry is empty.  Use it.  */
+				inmem_hash_tab[idx] = 1 + domain->nstrings + i;
+				break;
+			      }
+
+			    if (idx >= domain->hash_size - incr)
+			      idx -= domain->hash_size - incr;
+			    else
+			      idx += incr;
+			  }
+		      }
+
+		    domain->n_sysdep_strings = n_inmem_sysdep_strings;
+		    domain->orig_sysdep_tab = inmem_orig_sysdep_tab;
+		    domain->trans_sysdep_tab = inmem_trans_sysdep_tab;
+
+		    domain->hash_tab = inmem_hash_tab;
+		    domain->must_swap_hash_tab = 0;
+		  }
+		else
+		  {
+		    domain->n_sysdep_strings = 0;
+		    domain->orig_sysdep_tab = NULL;
+		    domain->trans_sysdep_tab = NULL;
+		  }
+
+		freea (sysdep_segment_values);
+	      }
+	    else
+	      {
+		domain->n_sysdep_strings = 0;
+		domain->orig_sysdep_tab = NULL;
+		domain->trans_sysdep_tab = NULL;
+	      }
+	  }
+	  break;
+	}
       break;
     default:
       /* This is an invalid revision.  */
+    invalid:
+      /* This is an invalid .mo file.  */
+      if (domain->malloced)
+	free (domain->malloced);
 #ifdef HAVE_MMAP
       if (use_mmap)
 	munmap ((caddr_t) data, size);
@@ -425,14 +1398,16 @@ _nl_load_domain (domain_file, domainbinding)
 #ifdef _LIBC
 void
 internal_function
-_nl_unload_domain (domain)
-     struct loaded_domain *domain;
+_nl_unload_domain (struct loaded_domain *domain)
 {
   if (domain->plural != &__gettext_germanic_plural)
     __gettext_free_exp (domain->plural);
 
   _nl_free_domain_conv (domain);
 
+  if (domain->malloced)
+    free (domain->malloced);
+
 # ifdef _POSIX_MAPPED_FILES
   if (domain->use_mmap)
     munmap ((caddr_t) domain->data, domain->mmap_size);
diff --git a/gnu/usr.bin/texinfo/intl/localcharset.c b/gnu/usr.bin/texinfo/intl/localcharset.c
index bc5587bf601..4865f1037a0 100644
--- a/gnu/usr.bin/texinfo/intl/localcharset.c
+++ b/gnu/usr.bin/texinfo/intl/localcharset.c
@@ -1,6 +1,6 @@
 /* Determine a canonical name for the current locale's character encoding.
 
-   Copyright (C) 2000-2002 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -17,12 +17,15 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
    USA.  */
 
-/* Written by Bruno Haible <haible@clisp.cons.org>.  */
+/* Written by Bruno Haible <bruno@clisp.org>.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
+/* Specification.  */
+#include "localcharset.h"
+
 #if HAVE_STDDEF_H
 # include <stddef.h>
 #endif
@@ -64,6 +67,12 @@
 # include <os2.h>
 #endif
 
+#if ENABLE_RELOCATABLE
+# include "relocatable.h"
+#else
+# define relocate(pathname) (pathname)
+#endif
+
 #if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
   /* Win32, OS/2, DOS */
 # define ISSLASH(C) ((C) == '/' || (C) == '\\')
@@ -77,7 +86,7 @@
 # define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
 #endif
 
-#ifdef HAVE_GETC_UNLOCKED
+#if HAVE_DECL_GETC_UNLOCKED
 # undef getc
 # define getc getc_unlocked
 #endif
@@ -105,9 +114,9 @@ get_charset_aliases ()
   cp = charset_aliases;
   if (cp == NULL)
     {
-#if !defined WIN32
+#if !(defined VMS || defined WIN32)
       FILE *fp;
-      const char *dir = LIBDIR;
+      const char *dir = relocate (LIBDIR);
       const char *base = "charset.alias";
       char *file_name;
 
@@ -195,13 +204,51 @@ get_charset_aliases ()
 
 #else
 
+# if defined VMS
+      /* To avoid the troubles of an extra file charset.alias_vms in the
+	 sources of many GNU packages, simply inline the aliases here.  */
+      /* The list of encodings is taken from the OpenVMS 7.3-1 documentation
+	 "Compaq C Run-Time Library Reference Manual for OpenVMS systems"
+	 section 10.7 "Handling Different Character Sets".  */
+      cp = "ISO8859-1" "\0" "ISO-8859-1" "\0"
+	   "ISO8859-2" "\0" "ISO-8859-2" "\0"
+	   "ISO8859-5" "\0" "ISO-8859-5" "\0"
+	   "ISO8859-7" "\0" "ISO-8859-7" "\0"
+	   "ISO8859-8" "\0" "ISO-8859-8" "\0"
+	   "ISO8859-9" "\0" "ISO-8859-9" "\0"
+	   /* Japanese */
+	   "eucJP" "\0" "EUC-JP" "\0"
+	   "SJIS" "\0" "SHIFT_JIS" "\0"
+	   "DECKANJI" "\0" "DEC-KANJI" "\0"
+	   "SDECKANJI" "\0" "EUC-JP" "\0"
+	   /* Chinese */
+	   "eucTW" "\0" "EUC-TW" "\0"
+	   "DECHANYU" "\0" "DEC-HANYU" "\0"
+	   "DECHANZI" "\0" "GB2312" "\0"
+	   /* Korean */
+	   "DECKOREAN" "\0" "EUC-KR" "\0";
+# endif
+
+# if defined WIN32
       /* To avoid the troubles of installing a separate file in the same
 	 directory as the DLL and of retrieving the DLL's directory at
 	 runtime, simply inline the aliases here.  */
 
-# if defined WIN32
       cp = "CP936" "\0" "GBK" "\0"
-	   "CP1361" "\0" "JOHAB" "\0";
+	   "CP1361" "\0" "JOHAB" "\0"
+	   "CP20127" "\0" "ASCII" "\0"
+	   "CP20866" "\0" "KOI8-R" "\0"
+	   "CP21866" "\0" "KOI8-RU" "\0"
+	   "CP28591" "\0" "ISO-8859-1" "\0"
+	   "CP28592" "\0" "ISO-8859-2" "\0"
+	   "CP28593" "\0" "ISO-8859-3" "\0"
+	   "CP28594" "\0" "ISO-8859-4" "\0"
+	   "CP28595" "\0" "ISO-8859-5" "\0"
+	   "CP28596" "\0" "ISO-8859-6" "\0"
+	   "CP28597" "\0" "ISO-8859-7" "\0"
+	   "CP28598" "\0" "ISO-8859-8" "\0"
+	   "CP28599" "\0" "ISO-8859-9" "\0"
+	   "CP28605" "\0" "ISO-8859-15" "\0";
 # endif
 #endif
 
@@ -267,7 +314,7 @@ locale_charset ()
 
   static char buf[2 + 10 + 1];
 
-  /* Win32 has a function returning the locale's codepage as a number.  */
+  /* Woe32 has a function returning the locale's codepage as a number.  */
   sprintf (buf, "CP%u", GetACP ());
   codeset = buf;
 
@@ -341,5 +388,11 @@ locale_charset ()
 	break;
       }
 
+  /* Don't return an empty string.  GNU libc and GNU libiconv interpret
+     the empty string as denoting "the locale's character encoding",
+     thus GNU libiconv would call this function a second time.  */
+  if (codeset[0] == '\0')
+    codeset = "ASCII";
+
   return codeset;
 }
diff --git a/gnu/usr.bin/texinfo/intl/localcharset.h b/gnu/usr.bin/texinfo/intl/localcharset.h
new file mode 100644
index 00000000000..3b137e73c55
--- /dev/null
+++ b/gnu/usr.bin/texinfo/intl/localcharset.h
@@ -0,0 +1,42 @@
+/* Determine a canonical name for the current locale's character encoding.
+   Copyright (C) 2000-2003 Free Software Foundation, Inc.
+   This file is part of the GNU CHARSET Library.
+
+   This program 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, 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library 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 _LOCALCHARSET_H
+#define _LOCALCHARSET_H
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Determine the current locale's character encoding, and canonicalize it
+   into one of the canonical names listed in config.charset.
+   The result must not be freed; it is statically allocated.
+   If the canonical name cannot be determined, the result is a non-canonical
+   name.  */
+extern const char * locale_charset (void);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* _LOCALCHARSET_H */
diff --git a/gnu/usr.bin/texinfo/intl/locale.alias b/gnu/usr.bin/texinfo/intl/locale.alias
index bd7b9b31eb3..bd6bb2562f6 100644
--- a/gnu/usr.bin/texinfo/intl/locale.alias
+++ b/gnu/usr.bin/texinfo/intl/locale.alias
@@ -1,5 +1,5 @@
 # Locale name alias data base.
-# Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
+# Copyright (C) 1996-2001,2003 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Library General Public License as published
@@ -29,8 +29,8 @@
 
 # Packages using this file: 
 
-bokmal		no_NO.ISO-8859-1
-bokmål		no_NO.ISO-8859-1
+bokmal		nb_NO.ISO-8859-1
+bokmål		nb_NO.ISO-8859-1
 catalan		ca_ES.ISO-8859-1
 croatian	hr_HR.ISO-8859-2
 czech		cs_CZ.ISO-8859-2
@@ -61,9 +61,9 @@ korean		ko_KR.eucKR
 korean.euc 	ko_KR.eucKR
 ko_KR		ko_KR.eucKR
 lithuanian      lt_LT.ISO-8859-13
-nb_NO		no_NO.ISO-8859-1
-nb_NO.ISO-8859-1 no_NO.ISO-8859-1
-norwegian       no_NO.ISO-8859-1
+no_NO		nb_NO.ISO-8859-1
+no_NO.ISO-8859-1 nb_NO.ISO-8859-1
+norwegian       nb_NO.ISO-8859-1
 nynorsk		nn_NO.ISO-8859-1
 polish          pl_PL.ISO-8859-2
 portuguese      pt_PT.ISO-8859-1
diff --git a/gnu/usr.bin/texinfo/intl/localealias.c b/gnu/usr.bin/texinfo/intl/localealias.c
index 456e41e37d7..2eaf8813ed3 100644
--- a/gnu/usr.bin/texinfo/intl/localealias.c
+++ b/gnu/usr.bin/texinfo/intl/localealias.c
@@ -1,5 +1,5 @@
 /* Handle aliases for locale names.
-   Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000-2001, 2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -35,17 +35,23 @@
 #include <sys/types.h>
 
 #ifdef __GNUC__
+# undef alloca
 # define alloca __builtin_alloca
 # define HAVE_ALLOCA 1
 #else
-# if defined HAVE_ALLOCA_H || defined _LIBC
-#  include <alloca.h>
+# ifdef _MSC_VER
+#  include <malloc.h>
+#  define alloca _alloca
 # else
-#  ifdef _AIX
- #pragma alloca
+#  if defined HAVE_ALLOCA_H || defined _LIBC
+#   include <alloca.h>
 #  else
-#   ifndef alloca
+#   ifdef _AIX
+ #pragma alloca
+#   else
+#    ifndef alloca
 char *alloca ();
+#    endif
 #   endif
 #  endif
 # endif
@@ -56,6 +62,12 @@ char *alloca ();
 
 #include "gettextP.h"
 
+#if ENABLE_RELOCATABLE
+# include "relocatable.h"
+#else
+# define relocate(pathname) (pathname)
+#endif
+
 /* @@ end of prolog @@ */
 
 #ifdef _LIBC
@@ -98,11 +110,11 @@ __libc_lock_define_initialized (static, lock);
 # define freea(p) free (p)
 #endif
 
-#if defined _LIBC_REENTRANT || defined HAVE_FGETS_UNLOCKED
+#if defined _LIBC_REENTRANT || HAVE_DECL_FGETS_UNLOCKED
 # undef fgets
 # define fgets(buf, len, s) fgets_unlocked (buf, len, s)
 #endif
-#if defined _LIBC_REENTRANT || defined HAVE_FEOF_UNLOCKED
+#if defined _LIBC_REENTRANT || HAVE_DECL_FEOF_UNLOCKED
 # undef feof
 # define feof(s) feof_unlocked (s)
 #endif
@@ -115,25 +127,28 @@ struct alias_map
 };
 
 
-static char *string_space;
+#ifndef _LIBC
+# define libc_freeres_ptr(decl) decl
+#endif
+
+libc_freeres_ptr (static char *string_space);
 static size_t string_space_act;
 static size_t string_space_max;
-static struct alias_map *map;
+libc_freeres_ptr (static struct alias_map *map);
 static size_t nmap;
 static size_t maxmap;
 
 
 /* Prototypes for local functions.  */
-static size_t read_alias_file PARAMS ((const char *fname, int fname_len))
+static size_t read_alias_file (const char *fname, int fname_len)
      internal_function;
-static int extend_alias_table PARAMS ((void));
-static int alias_compare PARAMS ((const struct alias_map *map1,
-				  const struct alias_map *map2));
+static int extend_alias_table (void);
+static int alias_compare (const struct alias_map *map1,
+			  const struct alias_map *map2);
 
 
 const char *
-_nl_expand_alias (name)
-    const char *name;
+_nl_expand_alias (const char *name)
 {
   static const char *locale_alias_path;
   struct alias_map *retval;
@@ -156,8 +171,8 @@ _nl_expand_alias (name)
       if (nmap > 0)
 	retval = (struct alias_map *) bsearch (&item, map, nmap,
 					       sizeof (struct alias_map),
-					       (int (*) PARAMS ((const void *,
-								 const void *))
+					       (int (*) (const void *,
+							 const void *)
 						) alias_compare);
       else
 	retval = NULL;
@@ -199,9 +214,7 @@ _nl_expand_alias (name)
 
 static size_t
 internal_function
-read_alias_file (fname, fname_len)
-     const char *fname;
-     int fname_len;
+read_alias_file (const char *fname, int fname_len)
 {
   FILE *fp;
   char *full_fname;
@@ -217,7 +230,7 @@ read_alias_file (fname, fname_len)
   memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile);
 #endif
 
-  fp = fopen (full_fname, "r");
+  fp = fopen (relocate (full_fname), "r");
   freea (full_fname);
   if (fp == NULL)
     return 0;
@@ -234,8 +247,10 @@ read_alias_file (fname, fname_len)
 	 a) we are only interested in the first two fields
 	 b) these fields must be usable as file names and so must not
 	    be that long
-       */
-      char buf[BUFSIZ];
+	 We avoid a multi-kilobyte buffer here since this would use up
+	 stack space which we might not have if the program ran out of
+	 memory.  */
+      char buf[400];
       char *alias;
       char *value;
       char *cp;
@@ -244,19 +259,6 @@ read_alias_file (fname, fname_len)
 	/* EOF reached.  */
 	break;
 
-      /* Possibly not the whole line fits into the buffer.  Ignore
-	 the rest of the line.  */
-      if (strchr (buf, '\n') == NULL)
-	{
-	  char altbuf[BUFSIZ];
-	  do
-	    if (FGETS (altbuf, sizeof altbuf, fp) == NULL)
-	      /* Make sure the inner loop will be left.  The outer loop
-		 will exit at the `feof' test.  */
-	      break;
-	  while (strchr (altbuf, '\n') == NULL);
-	}
-
       cp = buf;
       /* Ignore leading white space.  */
       while (isspace ((unsigned char) cp[0]))
@@ -340,6 +342,14 @@ read_alias_file (fname, fname_len)
 	      ++added;
 	    }
 	}
+
+      /* Possibly not the whole line fits into the buffer.  Ignore
+	 the rest of the line.  */
+      while (strchr (buf, '\n') == NULL)
+	if (FGETS (buf, sizeof buf, fp) == NULL)
+	  /* Make sure the inner loop will be left.  The outer loop
+	     will exit at the `feof' test.  */
+	  break;
     }
 
   /* Should we test for ferror()?  I think we have to silently ignore
@@ -348,7 +358,7 @@ read_alias_file (fname, fname_len)
 
   if (added > 0)
     qsort (map, nmap, sizeof (struct alias_map),
-	   (int (*) PARAMS ((const void *, const void *))) alias_compare);
+	   (int (*) (const void *, const void *)) alias_compare);
 
   return added;
 }
@@ -373,23 +383,8 @@ extend_alias_table ()
 }
 
 
-#ifdef _LIBC
-static void __attribute__ ((unused))
-free_mem (void)
-{
-  if (string_space != NULL)
-    free (string_space);
-  if (map != NULL)
-    free (map);
-}
-text_set_element (__libc_subfreeres, free_mem);
-#endif
-
-
 static int
-alias_compare (map1, map2)
-     const struct alias_map *map1;
-     const struct alias_map *map2;
+alias_compare (const struct alias_map *map1, const struct alias_map *map2)
 {
 #if defined _LIBC || defined HAVE_STRCASECMP
   return strcasecmp (map1->alias, map2->alias);
diff --git a/gnu/usr.bin/texinfo/intl/localename.c b/gnu/usr.bin/texinfo/intl/localename.c
index a7241981418..5662e54ffe2 100644
--- a/gnu/usr.bin/texinfo/intl/localename.c
+++ b/gnu/usr.bin/texinfo/intl/localename.c
@@ -1,5 +1,5 @@
 /* Determine the current selected locale.
-   Copyright (C) 1995-1999, 2000-2002 Free Software Foundation, Inc.
+   Copyright (C) 1995-1999, 2000-2004 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -34,6 +34,124 @@
 #ifdef WIN32
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
+/* List of language codes, sorted by value:
+   0x01 LANG_ARABIC
+   0x02 LANG_BULGARIAN
+   0x03 LANG_CATALAN
+   0x04 LANG_CHINESE
+   0x05 LANG_CZECH
+   0x06 LANG_DANISH
+   0x07 LANG_GERMAN
+   0x08 LANG_GREEK
+   0x09 LANG_ENGLISH
+   0x0a LANG_SPANISH
+   0x0b LANG_FINNISH
+   0x0c LANG_FRENCH
+   0x0d LANG_HEBREW
+   0x0e LANG_HUNGARIAN
+   0x0f LANG_ICELANDIC
+   0x10 LANG_ITALIAN
+   0x11 LANG_JAPANESE
+   0x12 LANG_KOREAN
+   0x13 LANG_DUTCH
+   0x14 LANG_NORWEGIAN
+   0x15 LANG_POLISH
+   0x16 LANG_PORTUGUESE
+   0x17 LANG_RHAETO_ROMANCE
+   0x18 LANG_ROMANIAN
+   0x19 LANG_RUSSIAN
+   0x1a LANG_CROATIAN == LANG_SERBIAN
+   0x1b LANG_SLOVAK
+   0x1c LANG_ALBANIAN
+   0x1d LANG_SWEDISH
+   0x1e LANG_THAI
+   0x1f LANG_TURKISH
+   0x20 LANG_URDU
+   0x21 LANG_INDONESIAN
+   0x22 LANG_UKRAINIAN
+   0x23 LANG_BELARUSIAN
+   0x24 LANG_SLOVENIAN
+   0x25 LANG_ESTONIAN
+   0x26 LANG_LATVIAN
+   0x27 LANG_LITHUANIAN
+   0x28 LANG_TAJIK
+   0x29 LANG_FARSI
+   0x2a LANG_VIETNAMESE
+   0x2b LANG_ARMENIAN
+   0x2c LANG_AZERI
+   0x2d LANG_BASQUE
+   0x2e LANG_SORBIAN
+   0x2f LANG_MACEDONIAN
+   0x30 LANG_SUTU
+   0x31 LANG_TSONGA
+   0x32 LANG_TSWANA
+   0x33 LANG_VENDA
+   0x34 LANG_XHOSA
+   0x35 LANG_ZULU
+   0x36 LANG_AFRIKAANS
+   0x37 LANG_GEORGIAN
+   0x38 LANG_FAEROESE
+   0x39 LANG_HINDI
+   0x3a LANG_MALTESE
+   0x3b LANG_SAAMI
+   0x3c LANG_GAELIC
+   0x3d LANG_YIDDISH
+   0x3e LANG_MALAY
+   0x3f LANG_KAZAK
+   0x40 LANG_KYRGYZ
+   0x41 LANG_SWAHILI
+   0x42 LANG_TURKMEN
+   0x43 LANG_UZBEK
+   0x44 LANG_TATAR
+   0x45 LANG_BENGALI
+   0x46 LANG_PUNJABI
+   0x47 LANG_GUJARATI
+   0x48 LANG_ORIYA
+   0x49 LANG_TAMIL
+   0x4a LANG_TELUGU
+   0x4b LANG_KANNADA
+   0x4c LANG_MALAYALAM
+   0x4d LANG_ASSAMESE
+   0x4e LANG_MARATHI
+   0x4f LANG_SANSKRIT
+   0x50 LANG_MONGOLIAN
+   0x51 LANG_TIBETAN
+   0x52 LANG_WELSH
+   0x53 LANG_CAMBODIAN
+   0x54 LANG_LAO
+   0x55 LANG_BURMESE
+   0x56 LANG_GALICIAN
+   0x57 LANG_KONKANI
+   0x58 LANG_MANIPURI
+   0x59 LANG_SINDHI
+   0x5a LANG_SYRIAC
+   0x5b LANG_SINHALESE
+   0x5c LANG_CHEROKEE
+   0x5d LANG_INUKTITUT
+   0x5e LANG_AMHARIC
+   0x5f LANG_TAMAZIGHT
+   0x60 LANG_KASHMIRI
+   0x61 LANG_NEPALI
+   0x62 LANG_FRISIAN
+   0x63 LANG_PASHTO
+   0x64 LANG_TAGALOG
+   0x65 LANG_DIVEHI
+   0x66 LANG_EDO
+   0x67 LANG_FULFULDE
+   0x68 LANG_HAUSA
+   0x69 LANG_IBIBIO
+   0x6a LANG_YORUBA
+   0x70 LANG_IGBO
+   0x71 LANG_KANURI
+   0x72 LANG_OROMO
+   0x73 LANG_TIGRINYA
+   0x74 LANG_GUARANI
+   0x75 LANG_HAWAIIAN
+   0x76 LANG_LATIN
+   0x77 LANG_SOMALI
+   0x78 LANG_YI
+   0x79 LANG_PAPIAMENTU
+*/
 /* Mingw headers don't have latest language and sublanguage codes.  */
 # ifndef LANG_AFRIKAANS
 # define LANG_AFRIKAANS 0x36
@@ -41,6 +159,9 @@
 # ifndef LANG_ALBANIAN
 # define LANG_ALBANIAN 0x1c
 # endif
+# ifndef LANG_AMHARIC
+# define LANG_AMHARIC 0x5e
+# endif
 # ifndef LANG_ARABIC
 # define LANG_ARABIC 0x01
 # endif
@@ -62,9 +183,24 @@
 # ifndef LANG_BENGALI
 # define LANG_BENGALI 0x45
 # endif
+# ifndef LANG_BURMESE
+# define LANG_BURMESE 0x55
+# endif
+# ifndef LANG_CAMBODIAN
+# define LANG_CAMBODIAN 0x53
+# endif
 # ifndef LANG_CATALAN
 # define LANG_CATALAN 0x03
 # endif
+# ifndef LANG_CHEROKEE
+# define LANG_CHEROKEE 0x5c
+# endif
+# ifndef LANG_DIVEHI
+# define LANG_DIVEHI 0x65
+# endif
+# ifndef LANG_EDO
+# define LANG_EDO 0x66
+# endif
 # ifndef LANG_ESTONIAN
 # define LANG_ESTONIAN 0x25
 # endif
@@ -74,24 +210,57 @@
 # ifndef LANG_FARSI
 # define LANG_FARSI 0x29
 # endif
+# ifndef LANG_FRISIAN
+# define LANG_FRISIAN 0x62
+# endif
+# ifndef LANG_FULFULDE
+# define LANG_FULFULDE 0x67
+# endif
+# ifndef LANG_GAELIC
+# define LANG_GAELIC 0x3c
+# endif
+# ifndef LANG_GALICIAN
+# define LANG_GALICIAN 0x56
+# endif
 # ifndef LANG_GEORGIAN
 # define LANG_GEORGIAN 0x37
 # endif
+# ifndef LANG_GUARANI
+# define LANG_GUARANI 0x74
+# endif
 # ifndef LANG_GUJARATI
 # define LANG_GUJARATI 0x47
 # endif
+# ifndef LANG_HAUSA
+# define LANG_HAUSA 0x68
+# endif
+# ifndef LANG_HAWAIIAN
+# define LANG_HAWAIIAN 0x75
+# endif
 # ifndef LANG_HEBREW
 # define LANG_HEBREW 0x0d
 # endif
 # ifndef LANG_HINDI
 # define LANG_HINDI 0x39
 # endif
+# ifndef LANG_IBIBIO
+# define LANG_IBIBIO 0x69
+# endif
+# ifndef LANG_IGBO
+# define LANG_IGBO 0x70
+# endif
 # ifndef LANG_INDONESIAN
 # define LANG_INDONESIAN 0x21
 # endif
+# ifndef LANG_INUKTITUT
+# define LANG_INUKTITUT 0x5d
+# endif
 # ifndef LANG_KANNADA
 # define LANG_KANNADA 0x4b
 # endif
+# ifndef LANG_KANURI
+# define LANG_KANURI 0x71
+# endif
 # ifndef LANG_KASHMIRI
 # define LANG_KASHMIRI 0x60
 # endif
@@ -101,6 +270,15 @@
 # ifndef LANG_KONKANI
 # define LANG_KONKANI 0x57
 # endif
+# ifndef LANG_KYRGYZ
+# define LANG_KYRGYZ 0x40
+# endif
+# ifndef LANG_LAO
+# define LANG_LAO 0x54
+# endif
+# ifndef LANG_LATIN
+# define LANG_LATIN 0x76
+# endif
 # ifndef LANG_LATVIAN
 # define LANG_LATVIAN 0x26
 # endif
@@ -116,21 +294,42 @@
 # ifndef LANG_MALAYALAM
 # define LANG_MALAYALAM 0x4c
 # endif
+# ifndef LANG_MALTESE
+# define LANG_MALTESE 0x3a
+# endif
 # ifndef LANG_MANIPURI
 # define LANG_MANIPURI 0x58
 # endif
 # ifndef LANG_MARATHI
 # define LANG_MARATHI 0x4e
 # endif
+# ifndef LANG_MONGOLIAN
+# define LANG_MONGOLIAN 0x50
+# endif
 # ifndef LANG_NEPALI
 # define LANG_NEPALI 0x61
 # endif
 # ifndef LANG_ORIYA
 # define LANG_ORIYA 0x48
 # endif
+# ifndef LANG_OROMO
+# define LANG_OROMO 0x72
+# endif
+# ifndef LANG_PAPIAMENTU
+# define LANG_PAPIAMENTU 0x79
+# endif
+# ifndef LANG_PASHTO
+# define LANG_PASHTO 0x63
+# endif
 # ifndef LANG_PUNJABI
 # define LANG_PUNJABI 0x46
 # endif
+# ifndef LANG_RHAETO_ROMANCE
+# define LANG_RHAETO_ROMANCE 0x17
+# endif
+# ifndef LANG_SAAMI
+# define LANG_SAAMI 0x3b
+# endif
 # ifndef LANG_SANSKRIT
 # define LANG_SANSKRIT 0x4f
 # endif
@@ -140,12 +339,36 @@
 # ifndef LANG_SINDHI
 # define LANG_SINDHI 0x59
 # endif
+# ifndef LANG_SINHALESE
+# define LANG_SINHALESE 0x5b
+# endif
 # ifndef LANG_SLOVAK
 # define LANG_SLOVAK 0x1b
 # endif
+# ifndef LANG_SOMALI
+# define LANG_SOMALI 0x77
+# endif
+# ifndef LANG_SORBIAN
+# define LANG_SORBIAN 0x2e
+# endif
+# ifndef LANG_SUTU
+# define LANG_SUTU 0x30
+# endif
 # ifndef LANG_SWAHILI
 # define LANG_SWAHILI 0x41
 # endif
+# ifndef LANG_SYRIAC
+# define LANG_SYRIAC 0x5a
+# endif
+# ifndef LANG_TAGALOG
+# define LANG_TAGALOG 0x64
+# endif
+# ifndef LANG_TAJIK
+# define LANG_TAJIK 0x28
+# endif
+# ifndef LANG_TAMAZIGHT
+# define LANG_TAMAZIGHT 0x5f
+# endif
 # ifndef LANG_TAMIL
 # define LANG_TAMIL 0x49
 # endif
@@ -158,6 +381,21 @@
 # ifndef LANG_THAI
 # define LANG_THAI 0x1e
 # endif
+# ifndef LANG_TIBETAN
+# define LANG_TIBETAN 0x51
+# endif
+# ifndef LANG_TIGRINYA
+# define LANG_TIGRINYA 0x73
+# endif
+# ifndef LANG_TSONGA
+# define LANG_TSONGA 0x31
+# endif
+# ifndef LANG_TSWANA
+# define LANG_TSWANA 0x32
+# endif
+# ifndef LANG_TURKMEN
+# define LANG_TURKMEN 0x42
+# endif
 # ifndef LANG_UKRAINIAN
 # define LANG_UKRAINIAN 0x22
 # endif
@@ -167,9 +405,30 @@
 # ifndef LANG_UZBEK
 # define LANG_UZBEK 0x43
 # endif
+# ifndef LANG_VENDA
+# define LANG_VENDA 0x33
+# endif
 # ifndef LANG_VIETNAMESE
 # define LANG_VIETNAMESE 0x2a
 # endif
+# ifndef LANG_WELSH
+# define LANG_WELSH 0x52
+# endif
+# ifndef LANG_XHOSA
+# define LANG_XHOSA 0x34
+# endif
+# ifndef LANG_YI
+# define LANG_YI 0x78
+# endif
+# ifndef LANG_YIDDISH
+# define LANG_YIDDISH 0x3d
+# endif
+# ifndef LANG_YORUBA
+# define LANG_YORUBA 0x6a
+# endif
+# ifndef LANG_ZULU
+# define LANG_ZULU 0x35
+# endif
 # ifndef SUBLANG_ARABIC_SAUDI_ARABIA
 # define SUBLANG_ARABIC_SAUDI_ARABIA 0x01
 # endif
@@ -224,6 +483,12 @@
 # ifndef SUBLANG_AZERI_CYRILLIC
 # define SUBLANG_AZERI_CYRILLIC 0x02
 # endif
+# ifndef SUBLANG_BENGALI_INDIA
+# define SUBLANG_BENGALI_INDIA 0x00
+# endif
+# ifndef SUBLANG_BENGALI_BANGLADESH
+# define SUBLANG_BENGALI_BANGLADESH 0x01
+# endif
 # ifndef SUBLANG_CHINESE_MACAU
 # define SUBLANG_CHINESE_MACAU 0x05
 # endif
@@ -248,12 +513,54 @@
 # ifndef SUBLANG_ENGLISH_PHILIPPINES
 # define SUBLANG_ENGLISH_PHILIPPINES 0x0d
 # endif
+# ifndef SUBLANG_ENGLISH_INDONESIA
+# define SUBLANG_ENGLISH_INDONESIA 0x0e
+# endif
+# ifndef SUBLANG_ENGLISH_HONGKONG
+# define SUBLANG_ENGLISH_HONGKONG 0x0f
+# endif
+# ifndef SUBLANG_ENGLISH_INDIA
+# define SUBLANG_ENGLISH_INDIA 0x10
+# endif
+# ifndef SUBLANG_ENGLISH_MALAYSIA
+# define SUBLANG_ENGLISH_MALAYSIA 0x11
+# endif
+# ifndef SUBLANG_ENGLISH_SINGAPORE
+# define SUBLANG_ENGLISH_SINGAPORE 0x12
+# endif
 # ifndef SUBLANG_FRENCH_LUXEMBOURG
 # define SUBLANG_FRENCH_LUXEMBOURG 0x05
 # endif
 # ifndef SUBLANG_FRENCH_MONACO
 # define SUBLANG_FRENCH_MONACO 0x06
 # endif
+# ifndef SUBLANG_FRENCH_WESTINDIES
+# define SUBLANG_FRENCH_WESTINDIES 0x07
+# endif
+# ifndef SUBLANG_FRENCH_REUNION
+# define SUBLANG_FRENCH_REUNION 0x08
+# endif
+# ifndef SUBLANG_FRENCH_CONGO
+# define SUBLANG_FRENCH_CONGO 0x09
+# endif
+# ifndef SUBLANG_FRENCH_SENEGAL
+# define SUBLANG_FRENCH_SENEGAL 0x0a
+# endif
+# ifndef SUBLANG_FRENCH_CAMEROON
+# define SUBLANG_FRENCH_CAMEROON 0x0b
+# endif
+# ifndef SUBLANG_FRENCH_COTEDIVOIRE
+# define SUBLANG_FRENCH_COTEDIVOIRE 0x0c
+# endif
+# ifndef SUBLANG_FRENCH_MALI
+# define SUBLANG_FRENCH_MALI 0x0d
+# endif
+# ifndef SUBLANG_FRENCH_MOROCCO
+# define SUBLANG_FRENCH_MOROCCO 0x0e
+# endif
+# ifndef SUBLANG_FRENCH_HAITI
+# define SUBLANG_FRENCH_HAITI 0x0f
+# endif
 # ifndef SUBLANG_GERMAN_LUXEMBOURG
 # define SUBLANG_GERMAN_LUXEMBOURG 0x04
 # endif
@@ -272,12 +579,30 @@
 # ifndef SUBLANG_NEPALI_INDIA
 # define SUBLANG_NEPALI_INDIA 0x02
 # endif
+# ifndef SUBLANG_PUNJABI_INDIA
+# define SUBLANG_PUNJABI_INDIA 0x00
+# endif
+# ifndef SUBLANG_PUNJABI_PAKISTAN
+# define SUBLANG_PUNJABI_PAKISTAN 0x01
+# endif
+# ifndef SUBLANG_ROMANIAN_ROMANIA
+# define SUBLANG_ROMANIAN_ROMANIA 0x00
+# endif
+# ifndef SUBLANG_ROMANIAN_MOLDOVA
+# define SUBLANG_ROMANIAN_MOLDOVA 0x01
+# endif
 # ifndef SUBLANG_SERBIAN_LATIN
 # define SUBLANG_SERBIAN_LATIN 0x02
 # endif
 # ifndef SUBLANG_SERBIAN_CYRILLIC
 # define SUBLANG_SERBIAN_CYRILLIC 0x03
 # endif
+# ifndef SUBLANG_SINDHI_INDIA
+# define SUBLANG_SINDHI_INDIA 0x00
+# endif
+# ifndef SUBLANG_SINDHI_PAKISTAN
+# define SUBLANG_SINDHI_PAKISTAN 0x01
+# endif
 # ifndef SUBLANG_SPANISH_GUATEMALA
 # define SUBLANG_SPANISH_GUATEMALA 0x04
 # endif
@@ -332,6 +657,18 @@
 # ifndef SUBLANG_SWEDISH_FINLAND
 # define SUBLANG_SWEDISH_FINLAND 0x02
 # endif
+# ifndef SUBLANG_TAMAZIGHT_ARABIC
+# define SUBLANG_TAMAZIGHT_ARABIC 0x01
+# endif
+# ifndef SUBLANG_TAMAZIGHT_LATIN
+# define SUBLANG_TAMAZIGHT_LATIN 0x02
+# endif
+# ifndef SUBLANG_TIGRINYA_ETHIOPIA
+# define SUBLANG_TIGRINYA_ETHIOPIA 0x00
+# endif
+# ifndef SUBLANG_TIGRINYA_ERITREA
+# define SUBLANG_TIGRINYA_ERITREA 0x01
+# endif
 # ifndef SUBLANG_URDU_PAKISTAN
 # define SUBLANG_URDU_PAKISTAN 0x01
 # endif
@@ -363,9 +700,7 @@
    The result must not be freed; it is statically allocated.  */
 
 const char *
-_nl_locale_name (category, categoryname)
-     int category;
-     const char *categoryname;
+_nl_locale_name (int category, const char *categoryname)
 {
   const char *retval;
 
@@ -428,10 +763,15 @@ _nl_locale_name (category, categoryname)
   /* Split into language and territory part.  */
   primary = PRIMARYLANGID (langid);
   sub = SUBLANGID (langid);
+
+  /* Dispatch on language.
+     See also http://www.unicode.org/unicode/onlinedat/languages.html .
+     For details about languages, see http://www.ethnologue.com/ .  */
   switch (primary)
     {
     case LANG_AFRIKAANS: return "af_ZA";
     case LANG_ALBANIAN: return "sq_AL";
+    case LANG_AMHARIC: return "am_ET";
     case LANG_ARABIC:
       switch (sub)
 	{
@@ -466,9 +806,18 @@ _nl_locale_name (category, categoryname)
     case LANG_BASQUE:
       return "eu"; /* Ambiguous: could be "eu_ES" or "eu_FR".  */
     case LANG_BELARUSIAN: return "be_BY";
-    case LANG_BENGALI: return "bn_IN";
+    case LANG_BENGALI:
+      switch (sub)
+	{
+	case SUBLANG_BENGALI_INDIA: return "bn_IN";
+	case SUBLANG_BENGALI_BANGLADESH: return "bn_BD";
+	}
+      return "bn";
     case LANG_BULGARIAN: return "bg_BG";
+    case LANG_BURMESE: return "my_MM";
+    case LANG_CAMBODIAN: return "km_KH";
     case LANG_CATALAN: return "ca_ES";
+    case LANG_CHEROKEE: return "chr_US";
     case LANG_CHINESE:
       switch (sub)
 	{
@@ -489,20 +838,22 @@ _nl_locale_name (category, categoryname)
 				 */
       switch (sub)
 	{
-	/* FIXME: How to distinguish Croatian and Latin Serbian locales?  */
-	case SUBLANG_SERBIAN_LATIN: return "sr_YU";
-	case SUBLANG_SERBIAN_CYRILLIC: return "sr_YU@cyrillic";
-	default: return "hr_HR";
+	case SUBLANG_DEFAULT: return "hr_HR";
+	case SUBLANG_SERBIAN_LATIN: return "sr_CS";
+	case SUBLANG_SERBIAN_CYRILLIC: return "sr_CS@cyrillic";
 	}
+      return "hr";
     case LANG_CZECH: return "cs_CZ";
     case LANG_DANISH: return "da_DK";
+    case LANG_DIVEHI: return "dv_MV";
     case LANG_DUTCH:
       switch (sub)
 	{
 	case SUBLANG_DUTCH: return "nl_NL";
-	case SUBLANG_DUTCH_BELGIAN: return "nl_BE";
+	case SUBLANG_DUTCH_BELGIAN: /* FLEMISH, VLAAMS */ return "nl_BE";
 	}
       return "nl";
+    case LANG_EDO: return "bin_NG";
     case LANG_ENGLISH:
       switch (sub)
 	{
@@ -523,6 +874,11 @@ _nl_locale_name (category, categoryname)
 	case SUBLANG_ENGLISH_TRINIDAD: return "en_TT";
 	case SUBLANG_ENGLISH_ZIMBABWE: return "en_ZW";
 	case SUBLANG_ENGLISH_PHILIPPINES: return "en_PH";
+	case SUBLANG_ENGLISH_INDONESIA: return "en_ID";
+	case SUBLANG_ENGLISH_HONGKONG: return "en_HK";
+	case SUBLANG_ENGLISH_INDIA: return "en_IN";
+	case SUBLANG_ENGLISH_MALAYSIA: return "en_MY";
+	case SUBLANG_ENGLISH_SINGAPORE: return "en_SG";
 	}
       return "en";
     case LANG_ESTONIAN: return "et_EE";
@@ -533,13 +889,34 @@ _nl_locale_name (category, categoryname)
       switch (sub)
 	{
 	case SUBLANG_FRENCH: return "fr_FR";
-	case SUBLANG_FRENCH_BELGIAN: return "fr_BE";
+	case SUBLANG_FRENCH_BELGIAN: /* WALLOON */ return "fr_BE";
 	case SUBLANG_FRENCH_CANADIAN: return "fr_CA";
 	case SUBLANG_FRENCH_SWISS: return "fr_CH";
 	case SUBLANG_FRENCH_LUXEMBOURG: return "fr_LU";
 	case SUBLANG_FRENCH_MONACO: return "fr_MC";
+	case SUBLANG_FRENCH_WESTINDIES: return "fr"; /* Caribbean? */
+	case SUBLANG_FRENCH_REUNION: return "fr_RE";
+	case SUBLANG_FRENCH_CONGO: return "fr_CG";
+	case SUBLANG_FRENCH_SENEGAL: return "fr_SN";
+	case SUBLANG_FRENCH_CAMEROON: return "fr_CM";
+	case SUBLANG_FRENCH_COTEDIVOIRE: return "fr_CI";
+	case SUBLANG_FRENCH_MALI: return "fr_ML";
+	case SUBLANG_FRENCH_MOROCCO: return "fr_MA";
+	case SUBLANG_FRENCH_HAITI: return "fr_HT";
 	}
       return "fr";
+    case LANG_FRISIAN: return "fy_NL";
+    case LANG_FULFULDE:
+      /* Spoken in Nigeria, Guinea, Senegal, Mali, Niger, Cameroon, Benin. */
+      return "ff_NG";
+    case LANG_GAELIC:
+      switch (sub)
+	{
+	case 0x01: /* SCOTTISH */ return "gd_GB";
+	case 0x02: /* IRISH */ return "ga_IE";
+	}
+      return "C";
+    case LANG_GALICIAN: return "gl_ES";
     case LANG_GEORGIAN: return "ka_GE";
     case LANG_GERMAN:
       switch (sub)
@@ -552,12 +929,21 @@ _nl_locale_name (category, categoryname)
 	}
       return "de";
     case LANG_GREEK: return "el_GR";
+    case LANG_GUARANI: return "gn_PY";
     case LANG_GUJARATI: return "gu_IN";
+    case LANG_HAUSA: return "ha_NG";
+    case LANG_HAWAIIAN:
+      /* FIXME: Do they mean Hawaiian ("haw_US", 1000 speakers)
+	 or Hawaii Creole English ("cpe_US", 600000 speakers)?  */
+      return "cpe_US";
     case LANG_HEBREW: return "he_IL";
     case LANG_HINDI: return "hi_IN";
     case LANG_HUNGARIAN: return "hu_HU";
+    case LANG_IBIBIO: return "nic_NG";
     case LANG_ICELANDIC: return "is_IS";
+    case LANG_IGBO: return "ig_NG";
     case LANG_INDONESIAN: return "id_ID";
+    case LANG_INUKTITUT: return "iu_CA";
     case LANG_ITALIAN:
       switch (sub)
 	{
@@ -567,6 +953,7 @@ _nl_locale_name (category, categoryname)
       return "it";
     case LANG_JAPANESE: return "ja_JP";
     case LANG_KANNADA: return "kn_IN";
+    case LANG_KANURI: return "kr_NG";
     case LANG_KASHMIRI:
       switch (sub)
 	{
@@ -579,6 +966,9 @@ _nl_locale_name (category, categoryname)
       /* FIXME: Adjust this when such locales appear on Unix.  */
       return "kok_IN";
     case LANG_KOREAN: return "ko_KR";
+    case LANG_KYRGYZ: return "ky_KG";
+    case LANG_LAO: return "lo_LA";
+    case LANG_LATIN: return "la_VA";
     case LANG_LATVIAN: return "lv_LV";
     case LANG_LITHUANIAN: return "lt_LT";
     case LANG_MACEDONIAN: return "mk_MK";
@@ -590,10 +980,13 @@ _nl_locale_name (category, categoryname)
 	}
       return "ms";
     case LANG_MALAYALAM: return "ml_IN";
+    case LANG_MALTESE: return "mt_MT";
     case LANG_MANIPURI:
       /* FIXME: Adjust this when such locales appear on Unix.  */
       return "mni_IN";
     case LANG_MARATHI: return "mr_IN";
+    case LANG_MONGOLIAN:
+      return "mn"; /* Ambiguous: could be "mn_CN" or "mn_MN".  */
     case LANG_NEPALI:
       switch (sub)
 	{
@@ -609,6 +1002,10 @@ _nl_locale_name (category, categoryname)
 	}
       return "no";
     case LANG_ORIYA: return "or_IN";
+    case LANG_OROMO: return "om_ET";
+    case LANG_PAPIAMENTU: return "pap_AN";
+    case LANG_PASHTO:
+      return "ps"; /* Ambiguous: could be "ps_PK" or "ps_AF".  */
     case LANG_POLISH: return "pl_PL";
     case LANG_PORTUGUESE:
       switch (sub)
@@ -619,14 +1016,36 @@ _nl_locale_name (category, categoryname)
 	case SUBLANG_PORTUGUESE_BRAZILIAN: return "pt_BR";
 	}
       return "pt";
-    case LANG_PUNJABI: return "pa_IN";
-    case LANG_ROMANIAN: return "ro_RO";
+    case LANG_PUNJABI:
+      switch (sub)
+	{
+	case SUBLANG_PUNJABI_INDIA: return "pa_IN"; /* Gurmukhi script */
+	case SUBLANG_PUNJABI_PAKISTAN: return "pa_PK"; /* Arabic script */
+	}
+      return "pa";
+    case LANG_RHAETO_ROMANCE: return "rm_CH";
+    case LANG_ROMANIAN:
+      switch (sub)
+	{
+	case SUBLANG_ROMANIAN_ROMANIA: return "ro_RO";
+	case SUBLANG_ROMANIAN_MOLDOVA: return "ro_MD";
+	}
+      return "ro";
     case LANG_RUSSIAN:
-      return "ru"; /* Ambiguous: could be "ru_RU" or "ru_UA".  */
+      return "ru"; /* Ambiguous: could be "ru_RU" or "ru_UA" or "ru_MD".  */
+    case LANG_SAAMI: /* actually Northern Sami */ return "se_NO";
     case LANG_SANSKRIT: return "sa_IN";
-    case LANG_SINDHI: return "sd";
+    case LANG_SINDHI:
+      switch (sub)
+	{
+	case SUBLANG_SINDHI_INDIA: return "sd_IN";
+	case SUBLANG_SINDHI_PAKISTAN: return "sd_PK";
+	}
+      return "sd";
+    case LANG_SINHALESE: return "si_LK";
     case LANG_SLOVAK: return "sk_SK";
     case LANG_SLOVENIAN: return "sl_SI";
+    case LANG_SOMALI: return "so_SO";
     case LANG_SORBIAN:
       /* FIXME: Adjust this when such locales appear on Unix.  */
       return "wen_DE";
@@ -656,7 +1075,8 @@ _nl_locale_name (category, categoryname)
 	case SUBLANG_SPANISH_PUERTO_RICO: return "es_PR";
 	}
       return "es";
-    case LANG_SWAHILI: return "sw";
+    case LANG_SUTU: return "bnt_TZ"; /* or "st_LS" or "nso_ZA"? */
+    case LANG_SWAHILI: return "sw_KE";
     case LANG_SWEDISH:
       switch (sub)
 	{
@@ -664,12 +1084,34 @@ _nl_locale_name (category, categoryname)
 	case SUBLANG_SWEDISH_FINLAND: return "sv_FI";
 	}
       return "sv";
+    case LANG_SYRIAC: return "syr_TR"; /* An extinct language.  */
+    case LANG_TAGALOG: return "tl_PH";
+    case LANG_TAJIK: return "tg_TJ";
+    case LANG_TAMAZIGHT:
+      switch (sub)
+	{
+	/* FIXME: Adjust this when Tamazight locales appear on Unix.  */
+	case SUBLANG_TAMAZIGHT_ARABIC: return "ber_MA@arabic";
+	case SUBLANG_TAMAZIGHT_LATIN: return "ber_MA@latin";
+	}
+      return "ber_MA";
     case LANG_TAMIL:
       return "ta"; /* Ambiguous: could be "ta_IN" or "ta_LK" or "ta_SG".  */
-    case LANG_TATAR: return "tt";
+    case LANG_TATAR: return "tt_RU";
     case LANG_TELUGU: return "te_IN";
     case LANG_THAI: return "th_TH";
+    case LANG_TIBETAN: return "bo_CN";
+    case LANG_TIGRINYA:
+      switch (sub)
+	{
+	case SUBLANG_TIGRINYA_ETHIOPIA: return "ti_ET";
+	case SUBLANG_TIGRINYA_ERITREA: return "ti_ER";
+	}
+      return "ti";
+    case LANG_TSONGA: return "ts_ZA";
+    case LANG_TSWANA: return "tn_BW";
     case LANG_TURKISH: return "tr_TR";
+    case LANG_TURKMEN: return "tk_TM";
     case LANG_UKRAINIAN: return "uk_UA";
     case LANG_URDU:
       switch (sub)
@@ -681,12 +1123,18 @@ _nl_locale_name (category, categoryname)
     case LANG_UZBEK:
       switch (sub)
 	{
-	/* FIXME: Adjust this when Uzbek locales appear on Unix.  */
-	case SUBLANG_UZBEK_LATIN: return "uz_UZ@latin";
+	case SUBLANG_UZBEK_LATIN: return "uz_UZ";
 	case SUBLANG_UZBEK_CYRILLIC: return "uz_UZ@cyrillic";
 	}
       return "uz";
+    case LANG_VENDA: return "ve_ZA";
     case LANG_VIETNAMESE: return "vi_VN";
+    case LANG_WELSH: return "cy_GB";
+    case LANG_XHOSA: return "xh_ZA";
+    case LANG_YI: return "sit_CN";
+    case LANG_YIDDISH: return "yi_IL";
+    case LANG_YORUBA: return "yo_NG";
+    case LANG_ZULU: return "zu_ZA";
     default: return "C";
     }
 
diff --git a/gnu/usr.bin/texinfo/intl/log.c b/gnu/usr.bin/texinfo/intl/log.c
new file mode 100644
index 00000000000..cb6076e80f7
--- /dev/null
+++ b/gnu/usr.bin/texinfo/intl/log.c
@@ -0,0 +1,98 @@
+/* Log file output.
+   Copyright (C) 2003 Free Software Foundation, Inc.
+
+   This program 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, 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library 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.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* Print an ASCII string with quotes and escape sequences where needed.  */
+static void
+print_escaped (FILE *stream, const char *str)
+{
+  putc ('"', stream);
+  for (; *str != '\0'; str++)
+    if (*str == '\n')
+      {
+	fputs ("\\n\"", stream);
+	if (str[1] == '\0')
+	  return;
+	fputs ("\n\"", stream);
+      }
+    else
+      {
+	if (*str == '"' || *str == '\\')
+	  putc ('\\', stream);
+	putc (*str, stream);
+      }
+  putc ('"', stream);
+}
+
+/* Add to the log file an entry denoting a failed translation.  */
+void
+_nl_log_untranslated (const char *logfilename, const char *domainname,
+		      const char *msgid1, const char *msgid2, int plural)
+{
+  static char *last_logfilename = NULL;
+  static FILE *last_logfile = NULL;
+  FILE *logfile;
+
+  /* Can we reuse the last opened logfile?  */
+  if (last_logfilename == NULL || strcmp (logfilename, last_logfilename) != 0)
+    {
+      /* Close the last used logfile.  */
+      if (last_logfilename != NULL)
+	{
+	  if (last_logfile != NULL)
+	    {
+	      fclose (last_logfile);
+	      last_logfile = NULL;
+	    }
+	  free (last_logfilename);
+	  last_logfilename = NULL;
+	}
+      /* Open the logfile.  */
+      last_logfilename = (char *) malloc (strlen (logfilename) + 1);
+      if (last_logfilename == NULL)
+	return;
+      strcpy (last_logfilename, logfilename);
+      last_logfile = fopen (logfilename, "a");
+      if (last_logfile == NULL)
+	return;
+    }
+  logfile = last_logfile;
+
+  fprintf (logfile, "domain ");
+  print_escaped (logfile, domainname);
+  fprintf (logfile, "\nmsgid ");
+  print_escaped (logfile, msgid1);
+  if (plural)
+    {
+      fprintf (logfile, "\nmsgid_plural ");
+      print_escaped (logfile, msgid2);
+      fprintf (logfile, "\nmsgstr[0] \"\"\n");
+    }
+  else
+    fprintf (logfile, "\nmsgstr \"\"\n");
+  putc ('\n', logfile);
+}
diff --git a/gnu/usr.bin/texinfo/intl/ngettext.c b/gnu/usr.bin/texinfo/intl/ngettext.c
index fb3ec5a91ea..e73e00c48b2 100644
--- a/gnu/usr.bin/texinfo/intl/ngettext.c
+++ b/gnu/usr.bin/texinfo/intl/ngettext.c
@@ -1,5 +1,5 @@
 /* Implementation of ngettext(3) function.
-   Copyright (C) 1995, 1997, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997, 2000-2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -46,18 +46,15 @@
 # define NGETTEXT __ngettext
 # define DCNGETTEXT __dcngettext
 #else
-# define NGETTEXT ngettext__
-# define DCNGETTEXT dcngettext__
+# define NGETTEXT libintl_ngettext
+# define DCNGETTEXT libintl_dcngettext
 #endif
 
 /* Look up MSGID in the current default message catalog for the current
    LC_MESSAGES locale.  If not found, returns MSGID itself (the default
    text).  */
 char *
-NGETTEXT (msgid1, msgid2, n)
-     const char *msgid1;
-     const char *msgid2;
-     unsigned long int n;
+NGETTEXT (const char *msgid1, const char *msgid2, unsigned long int n)
 {
   return DCNGETTEXT (NULL, msgid1, msgid2, n, LC_MESSAGES);
 }
diff --git a/gnu/usr.bin/texinfo/intl/os2compat.c b/gnu/usr.bin/texinfo/intl/os2compat.c
index 681e98aea7d..c8dc33e7cf4 100644
--- a/gnu/usr.bin/texinfo/intl/os2compat.c
+++ b/gnu/usr.bin/texinfo/intl/os2compat.c
@@ -23,6 +23,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <sys/param.h>
 
 /* A version of getenv() that works from DLLs */
 extern unsigned long DosScanEnv (const unsigned char *pszName, unsigned char **ppszValue);
@@ -38,64 +39,60 @@ _nl_getenv (const char *name)
 }
 
 /* A fixed size buffer.  */
-#define LOCALEDIR_MAX 260
-char _nl_default_dirname__[LOCALEDIR_MAX+1];
+char libintl_nl_default_dirname[MAXPATHLEN+1];
 
-char *_os2_libdir = NULL;
-char *_os2_localealiaspath = NULL;
-char *_os2_localedir = NULL;
+char *_nlos2_libdir = NULL;
+char *_nlos2_localealiaspath = NULL;
+char *_nlos2_localedir = NULL;
 
 static __attribute__((constructor)) void
-os2_initialize ()
+nlos2_initialize ()
 {
   char *root = getenv ("UNIXROOT");
   char *gnulocaledir = getenv ("GNULOCALEDIR");
 
-  _os2_libdir = gnulocaledir;
-  if (!_os2_libdir)
+  _nlos2_libdir = gnulocaledir;
+  if (!_nlos2_libdir)
     {
       if (root)
         {
           size_t sl = strlen (root);
-          _os2_libdir = (char *) malloc (sl + strlen (LIBDIR) + 1);
-          memcpy (_os2_libdir, root, sl);
-          memcpy (_os2_libdir + sl, LIBDIR, strlen (LIBDIR) + 1);
+          _nlos2_libdir = (char *) malloc (sl + strlen (LIBDIR) + 1);
+          memcpy (_nlos2_libdir, root, sl);
+          memcpy (_nlos2_libdir + sl, LIBDIR, strlen (LIBDIR) + 1);
         }
       else
-        _os2_libdir = LIBDIR;
+        _nlos2_libdir = LIBDIR;
     }
 
-  _os2_localealiaspath = gnulocaledir;
-  if (!_os2_localealiaspath)
+  _nlos2_localealiaspath = gnulocaledir;
+  if (!_nlos2_localealiaspath)
     {
       if (root)
         {
           size_t sl = strlen (root);
-          _os2_localealiaspath = (char *) malloc (sl + strlen (LOCALE_ALIAS_PATH) + 1);
-          memcpy (_os2_localealiaspath, root, sl);
-          memcpy (_os2_localealiaspath + sl, LOCALE_ALIAS_PATH, strlen (LOCALE_ALIAS_PATH) + 1);
+          _nlos2_localealiaspath = (char *) malloc (sl + strlen (LOCALE_ALIAS_PATH) + 1);
+          memcpy (_nlos2_localealiaspath, root, sl);
+          memcpy (_nlos2_localealiaspath + sl, LOCALE_ALIAS_PATH, strlen (LOCALE_ALIAS_PATH) + 1);
         }
      else
-        _os2_localealiaspath = LOCALE_ALIAS_PATH;
+        _nlos2_localealiaspath = LOCALE_ALIAS_PATH;
     }
 
-  _os2_localedir = gnulocaledir;
-  if (!_os2_localedir)
+  _nlos2_localedir = gnulocaledir;
+  if (!_nlos2_localedir)
     {
       if (root)
         {
           size_t sl = strlen (root);
-          _os2_localedir = (char *) malloc (sl + strlen (LOCALEDIR) + 1);
-          memcpy (_os2_localedir, root, sl);
-          memcpy (_os2_localedir + sl, LOCALEDIR, strlen (LOCALEDIR) + 1);
+          _nlos2_localedir = (char *) malloc (sl + strlen (LOCALEDIR) + 1);
+          memcpy (_nlos2_localedir, root, sl);
+          memcpy (_nlos2_localedir + sl, LOCALEDIR, strlen (LOCALEDIR) + 1);
         }
       else
-        _os2_localedir = LOCALEDIR;
+        _nlos2_localedir = LOCALEDIR;
     }
 
-  {
-    extern const char _nl_default_dirname__[];
-    if (strlen (_os2_localedir) <= LOCALEDIR_MAX)
-      strcpy (_nl_default_dirname__, _os2_localedir);
-  }
+  if (strlen (_nlos2_localedir) <= MAXPATHLEN)
+    strcpy (libintl_nl_default_dirname, _nlos2_localedir);
 }
diff --git a/gnu/usr.bin/texinfo/intl/os2compat.h b/gnu/usr.bin/texinfo/intl/os2compat.h
index 3605e7a3661..4f74e8c0375 100644
--- a/gnu/usr.bin/texinfo/intl/os2compat.h
+++ b/gnu/usr.bin/texinfo/intl/os2compat.h
@@ -21,16 +21,16 @@
 #ifndef OS2_AWARE
 
 #undef LIBDIR
-#define LIBDIR			_os2_libdir
-extern char *_os2_libdir;
+#define LIBDIR			_nlos2_libdir
+extern char *_nlos2_libdir;
 
 #undef LOCALEDIR
-#define LOCALEDIR		_os2_localedir
-extern char *_os2_localedir;
+#define LOCALEDIR		_nlos2_localedir
+extern char *_nlos2_localedir;
 
 #undef LOCALE_ALIAS_PATH
-#define LOCALE_ALIAS_PATH	_os2_localealiaspath
-extern char *_os2_localealiaspath;
+#define LOCALE_ALIAS_PATH	_nlos2_localealiaspath
+extern char *_nlos2_localealiaspath;
 
 #endif
 
diff --git a/gnu/usr.bin/texinfo/intl/plural-exp.c b/gnu/usr.bin/texinfo/intl/plural-exp.c
index c937c011ac5..8c04e642659 100644
--- a/gnu/usr.bin/texinfo/intl/plural-exp.c
+++ b/gnu/usr.bin/texinfo/intl/plural-exp.c
@@ -1,5 +1,5 @@
 /* Expression parsing for plural form selection.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
 
    This program is free software; you can redistribute it and/or modify it
@@ -96,10 +96,8 @@ init_germanic_plural ()
 
 void
 internal_function
-EXTRACT_PLURAL_EXPRESSION (nullentry, pluralp, npluralsp)
-     const char *nullentry;
-     struct expression **pluralp;
-     unsigned long int *npluralsp;
+EXTRACT_PLURAL_EXPRESSION (const char *nullentry, struct expression **pluralp,
+			   unsigned long int *npluralsp)
 {
   if (nullentry != NULL)
     {
diff --git a/gnu/usr.bin/texinfo/intl/plural-exp.h b/gnu/usr.bin/texinfo/intl/plural-exp.h
index 6a4bba01931..49e2c5bfc66 100644
--- a/gnu/usr.bin/texinfo/intl/plural-exp.h
+++ b/gnu/usr.bin/texinfo/intl/plural-exp.h
@@ -1,5 +1,5 @@
 /* Expression parsing and evaluation for plural form selection.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
 
    This program is free software; you can redistribute it and/or modify it
@@ -20,18 +20,14 @@
 #ifndef _PLURAL_EXP_H
 #define _PLURAL_EXP_H
 
-#ifndef PARAMS
-# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES
-#  define PARAMS(args) args
-# else
-#  define PARAMS(args) ()
-# endif
-#endif
-
 #ifndef internal_function
 # define internal_function
 #endif
 
+#ifndef attribute_hidden
+# define attribute_hidden
+#endif
+
 
 /* This is the representation of the expressions to determine the
    plural form.  */
@@ -94,10 +90,10 @@ struct parse_args
 # define GERMANIC_PLURAL __gettext_germanic_plural
 # define EXTRACT_PLURAL_EXPRESSION __gettext_extract_plural
 #elif defined (IN_LIBINTL)
-# define FREE_EXPRESSION gettext_free_exp__
-# define PLURAL_PARSE gettextparse__
-# define GERMANIC_PLURAL gettext_germanic_plural__
-# define EXTRACT_PLURAL_EXPRESSION gettext_extract_plural__
+# define FREE_EXPRESSION libintl_gettext_free_exp
+# define PLURAL_PARSE libintl_gettextparse
+# define GERMANIC_PLURAL libintl_gettext_germanic_plural
+# define EXTRACT_PLURAL_EXPRESSION libintl_gettext_extract_plural
 #else
 # define FREE_EXPRESSION free_plural_expression
 # define PLURAL_PARSE parse_plural_expression
@@ -105,18 +101,18 @@ struct parse_args
 # define EXTRACT_PLURAL_EXPRESSION extract_plural_expression
 #endif
 
-extern void FREE_EXPRESSION PARAMS ((struct expression *exp))
+extern void FREE_EXPRESSION (struct expression *exp)
      internal_function;
-extern int PLURAL_PARSE PARAMS ((void *arg));
-extern struct expression GERMANIC_PLURAL;
-extern void EXTRACT_PLURAL_EXPRESSION PARAMS ((const char *nullentry,
-					       struct expression **pluralp,
-					       unsigned long int *npluralsp))
+extern int PLURAL_PARSE (void *arg);
+extern struct expression GERMANIC_PLURAL attribute_hidden;
+extern void EXTRACT_PLURAL_EXPRESSION (const char *nullentry,
+				       struct expression **pluralp,
+				       unsigned long int *npluralsp)
      internal_function;
 
 #if !defined (_LIBC) && !defined (IN_LIBINTL)
-extern unsigned long int plural_eval PARAMS ((struct expression *pexp,
-					      unsigned long int n));
+extern unsigned long int plural_eval (struct expression *pexp,
+				      unsigned long int n);
 #endif
 
 #endif /* _PLURAL_EXP_H */
diff --git a/gnu/usr.bin/texinfo/intl/plural.c b/gnu/usr.bin/texinfo/intl/plural.c
index c9ff63fbdb8..72494f9eb92 100644
--- a/gnu/usr.bin/texinfo/intl/plural.c
+++ b/gnu/usr.bin/texinfo/intl/plural.c
@@ -1,6 +1,5 @@
-
-/*  A Bison parser, made from plural.y
-    by GNU Bison version 1.28  */
+/* A Bison parser, made from plural.y
+   by GNU bison 1.35.  */
 
 #define YYBISON 1  /* Identify Bison output.  */
 
@@ -11,16 +10,16 @@
 #define yychar __gettextchar
 #define yydebug __gettextdebug
 #define yynerrs __gettextnerrs
-#define	EQUOP2	257
-#define	CMPOP2	258
-#define	ADDOP2	259
-#define	MULOP2	260
-#define	NUMBER	261
+# define	EQUOP2	257
+# define	CMPOP2	258
+# define	ADDOP2	259
+# define	MULOP2	260
+# define	NUMBER	261
 
 #line 1 "plural.y"
 
 /* Expression parsing for plural form selection.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
 
    This program is free software; you can redistribute it and/or modify it
@@ -64,36 +63,25 @@
 #define YYPARSE_PARAM	arg
 
 #line 49 "plural.y"
+#ifndef YYSTYPE
 typedef union {
   unsigned long int num;
   enum operator op;
   struct expression *exp;
-} YYSTYPE;
+} yystype;
+# define YYSTYPE yystype
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
 #line 55 "plural.y"
 
 /* Prototypes for local functions.  */
-static struct expression *new_exp PARAMS ((int nargs, enum operator op,
-					   struct expression * const *args));
-static inline struct expression *new_exp_0 PARAMS ((enum operator op));
-static inline struct expression *new_exp_1 PARAMS ((enum operator op,
-						   struct expression *right));
-static struct expression *new_exp_2 PARAMS ((enum operator op,
-					     struct expression *left,
-					     struct expression *right));
-static inline struct expression *new_exp_3 PARAMS ((enum operator op,
-						   struct expression *bexp,
-						   struct expression *tbranch,
-						   struct expression *fbranch));
-static int yylex PARAMS ((YYSTYPE *lval, const char **pexp));
-static void yyerror PARAMS ((const char *str));
+static int yylex (YYSTYPE *lval, const char **pexp);
+static void yyerror (const char *str);
 
 /* Allocation of expressions.  */
 
 static struct expression *
-new_exp (nargs, op, args)
-     int nargs;
-     enum operator op;
-     struct expression * const *args;
+new_exp (int nargs, enum operator op, struct expression * const *args)
 {
   int i;
   struct expression *newp;
@@ -122,16 +110,13 @@ new_exp (nargs, op, args)
 }
 
 static inline struct expression *
-new_exp_0 (op)
-     enum operator op;
+new_exp_0 (enum operator op)
 {
   return new_exp (0, op, NULL);
 }
 
 static inline struct expression *
-new_exp_1 (op, right)
-     enum operator op;
-     struct expression *right;
+new_exp_1 (enum operator op, struct expression *right)
 {
   struct expression *args[1];
 
@@ -140,10 +125,7 @@ new_exp_1 (op, right)
 }
 
 static struct expression *
-new_exp_2 (op, left, right)
-     enum operator op;
-     struct expression *left;
-     struct expression *right;
+new_exp_2 (enum operator op, struct expression *left, struct expression *right)
 {
   struct expression *args[2];
 
@@ -153,11 +135,8 @@ new_exp_2 (op, left, right)
 }
 
 static inline struct expression *
-new_exp_3 (op, bexp, tbranch, fbranch)
-     enum operator op;
-     struct expression *bexp;
-     struct expression *tbranch;
-     struct expression *fbranch;
+new_exp_3 (enum operator op, struct expression *bexp,
+	   struct expression *tbranch, struct expression *fbranch)
 {
   struct expression *args[3];
 
@@ -167,12 +146,8 @@ new_exp_3 (op, bexp, tbranch, fbranch)
   return new_exp (3, op, args);
 }
 
-#include <stdio.h>
-
-#ifndef __cplusplus
-#ifndef __STDC__
-#define const
-#endif
+#ifndef YYDEBUG
+# define YYDEBUG 0
 #endif
 
 
@@ -181,129 +156,152 @@ new_exp_3 (op, bexp, tbranch, fbranch)
 #define	YYFLAG		-32768
 #define	YYNTBASE	16
 
+/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */
 #define YYTRANSLATE(x) ((unsigned)(x) <= 261 ? yytranslate[x] : 18)
 
-static const char yytranslate[] = {     0,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,    10,     2,     2,     2,     2,     5,     2,    14,
-    15,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,    12,     2,     2,
-     2,     2,     3,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,    13,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     4,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     1,     6,     7,     8,     9,
-    11
+/* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */
+static const char yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,    10,     2,     2,     2,     2,     5,     2,
+      14,    15,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,    12,     2,
+       2,     2,     2,     3,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+      13,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     4,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     6,     7,     8,
+       9,    11
 };
 
-#if YYDEBUG != 0
-static const short yyprhs[] = {     0,
-     0,     2,     8,    12,    16,    20,    24,    28,    32,    35,
-    37,    39
+#if YYDEBUG
+static const short yyprhs[] =
+{
+       0,     0,     2,     8,    12,    16,    20,    24,    28,    32,
+      35,    37,    39
 };
-
-static const short yyrhs[] = {    17,
-     0,    17,     3,    17,    12,    17,     0,    17,     4,    17,
-     0,    17,     5,    17,     0,    17,     6,    17,     0,    17,
-     7,    17,     0,    17,     8,    17,     0,    17,     9,    17,
-     0,    10,    17,     0,    13,     0,    11,     0,    14,    17,
-    15,     0
+static const short yyrhs[] =
+{
+      17,     0,    17,     3,    17,    12,    17,     0,    17,     4,
+      17,     0,    17,     5,    17,     0,    17,     6,    17,     0,
+      17,     7,    17,     0,    17,     8,    17,     0,    17,     9,
+      17,     0,    10,    17,     0,    13,     0,    11,     0,    14,
+      17,    15,     0
 };
 
 #endif
 
-#if YYDEBUG != 0
-static const short yyrline[] = { 0,
-   174,   182,   186,   190,   194,   198,   202,   206,   210,   214,
-   218,   223
+#if YYDEBUG
+/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
+static const short yyrline[] =
+{
+       0,   150,   158,   162,   166,   170,   174,   178,   182,   186,
+     190,   194,   199
 };
 #endif
 
 
-#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
+#if (YYDEBUG) || defined YYERROR_VERBOSE
 
-static const char * const yytname[] = {   "$","error","$undefined.","'?'","'|'",
-"'&'","EQUOP2","CMPOP2","ADDOP2","MULOP2","'!'","NUMBER","':'","'n'","'('","')'",
-"start","exp", NULL
+/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */
+static const char *const yytname[] =
+{
+  "$", "error", "$undefined.", "'?'", "'|'", "'&'", "EQUOP2", "CMPOP2", 
+  "ADDOP2", "MULOP2", "'!'", "NUMBER", "':'", "'n'", "'('", "')'", 
+  "start", "exp", 0
 };
 #endif
 
-static const short yyr1[] = {     0,
-    16,    17,    17,    17,    17,    17,    17,    17,    17,    17,
-    17,    17
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
+static const short yyr1[] =
+{
+       0,    16,    17,    17,    17,    17,    17,    17,    17,    17,
+      17,    17,    17
 };
 
-static const short yyr2[] = {     0,
-     1,     5,     3,     3,     3,     3,     3,     3,     2,     1,
-     1,     3
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
+static const short yyr2[] =
+{
+       0,     1,     5,     3,     3,     3,     3,     3,     3,     2,
+       1,     1,     3
 };
 
-static const short yydefact[] = {     0,
-     0,    11,    10,     0,     1,     9,     0,     0,     0,     0,
-     0,     0,     0,     0,    12,     0,     3,     4,     5,     6,
-     7,     8,     0,     2,     0,     0,     0
+/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
+   doesn't specify something else to do.  Zero means the default is an
+   error. */
+static const short yydefact[] =
+{
+       0,     0,    11,    10,     0,     1,     9,     0,     0,     0,
+       0,     0,     0,     0,     0,    12,     0,     3,     4,     5,
+       6,     7,     8,     0,     2,     0,     0,     0
 };
 
-static const short yydefgoto[] = {    25,
-     5
+static const short yydefgoto[] =
+{
+      25,     5
 };
 
-static const short yypact[] = {    -9,
-    -9,-32768,-32768,    -9,    34,-32768,    11,    -9,    -9,    -9,
-    -9,    -9,    -9,    -9,-32768,    24,    39,    43,    16,    26,
-    -3,-32768,    -9,    34,    21,    53,-32768
+static const short yypact[] =
+{
+      -9,    -9,-32768,-32768,    -9,    34,-32768,    11,    -9,    -9,
+      -9,    -9,    -9,    -9,    -9,-32768,    24,    39,    43,    16,
+      26,    -3,-32768,    -9,    34,    21,    53,-32768
 };
 
-static const short yypgoto[] = {-32768,
-    -1
+static const short yypgoto[] =
+{
+  -32768,    -1
 };
 
 
 #define	YYLAST		53
 
 
-static const short yytable[] = {     6,
-     1,     2,     7,     3,     4,    14,    16,    17,    18,    19,
-    20,    21,    22,     8,     9,    10,    11,    12,    13,    14,
-    26,    24,    12,    13,    14,    15,     8,     9,    10,    11,
-    12,    13,    14,    13,    14,    23,     8,     9,    10,    11,
-    12,    13,    14,    10,    11,    12,    13,    14,    11,    12,
-    13,    14,    27
+static const short yytable[] =
+{
+       6,     1,     2,     7,     3,     4,    14,    16,    17,    18,
+      19,    20,    21,    22,     8,     9,    10,    11,    12,    13,
+      14,    26,    24,    12,    13,    14,    15,     8,     9,    10,
+      11,    12,    13,    14,    13,    14,    23,     8,     9,    10,
+      11,    12,    13,    14,    10,    11,    12,    13,    14,    11,
+      12,    13,    14,    27
 };
 
-static const short yycheck[] = {     1,
-    10,    11,     4,    13,    14,     9,     8,     9,    10,    11,
-    12,    13,    14,     3,     4,     5,     6,     7,     8,     9,
-     0,    23,     7,     8,     9,    15,     3,     4,     5,     6,
-     7,     8,     9,     8,     9,    12,     3,     4,     5,     6,
-     7,     8,     9,     5,     6,     7,     8,     9,     6,     7,
-     8,     9,     0
+static const short yycheck[] =
+{
+       1,    10,    11,     4,    13,    14,     9,     8,     9,    10,
+      11,    12,    13,    14,     3,     4,     5,     6,     7,     8,
+       9,     0,    23,     7,     8,     9,    15,     3,     4,     5,
+       6,     7,     8,     9,     8,     9,    12,     3,     4,     5,
+       6,     7,     8,     9,     5,     6,     7,     8,     9,     6,
+       7,     8,     9,     0
 };
 #define YYPURE 1
 
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/local/share/bison.simple"
-/* This file comes from bison-1.28.  */
+#line 3 "/usr/local/share/bison/bison.simple"
 
 /* Skeleton output parser for bison,
-   Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 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
@@ -325,62 +323,131 @@ static const short yycheck[] = {     1,
    This special exception was added by the Free Software Foundation
    in version 1.24 of Bison.  */
 
-/* This is the parser code that is written into each bison parser
-  when the %semantic_parser declaration is not specified in the grammar.
-  It was written by Richard Stallman by simplifying the hairy parser
-  used when %semantic_parser is specified.  */
+/* This is the parser code that is written into each bison parser when
+   the %semantic_parser declaration is not specified in the grammar.
+   It was written by Richard Stallman by simplifying the hairy parser
+   used when %semantic_parser is specified.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+#if ! defined (yyoverflow) || defined (YYERROR_VERBOSE)
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# if YYSTACK_USE_ALLOCA
+#  define YYSTACK_ALLOC alloca
+# else
+#  ifndef YYSTACK_USE_ALLOCA
+#   if defined (alloca) || defined (_ALLOCA_H)
+#    define YYSTACK_ALLOC alloca
+#   else
+#    ifdef __GNUC__
+#     define YYSTACK_ALLOC __builtin_alloca
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's `empty if-body' warning. */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+# else
+#  if defined (__STDC__) || defined (__cplusplus)
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   define YYSIZE_T size_t
+#  endif
+#  define YYSTACK_ALLOC malloc
+#  define YYSTACK_FREE free
+# endif
+#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */
+
+
+#if (! defined (yyoverflow) \
+     && (! defined (__cplusplus) \
+	 || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  short yyss;
+  YYSTYPE yyvs;
+# if YYLSP_NEEDED
+  YYLTYPE yyls;
+# endif
+};
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# if YYLSP_NEEDED
+#  define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE))	\
+      + 2 * YYSTACK_GAP_MAX)
+# else
+#  define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
+      + YYSTACK_GAP_MAX)
+# endif
+
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  register YYSIZE_T yyi;		\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (0)
+#  endif
+# endif
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack)					\
+    do									\
+      {									\
+	YYSIZE_T yynewbytes;						\
+	YYCOPY (&yyptr->Stack, Stack, yysize);				\
+	Stack = &yyptr->Stack;						\
+	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX;	\
+	yyptr += yynewbytes / sizeof (*yyptr);				\
+      }									\
+    while (0)
 
-#ifndef YYSTACK_USE_ALLOCA
-#ifdef alloca
-#define YYSTACK_USE_ALLOCA
-#else /* alloca not defined */
-#ifdef __GNUC__
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#else /* not GNU C.  */
-#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
-#define YYSTACK_USE_ALLOCA
-#include <alloca.h>
-#else /* not sparc */
-/* We think this test detects Watcom and Microsoft C.  */
-/* This used to test MSDOS, but that is a bad idea
-   since that symbol is in the user namespace.  */
-#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
-#if 0 /* No need for malloc.h, which pollutes the namespace;
-	 instead, just don't use alloca.  */
-#include <malloc.h>
 #endif
-#else /* not MSDOS, or __TURBOC__ */
-#if defined(_AIX)
-/* I don't know what this was needed for, but it pollutes the namespace.
-   So I turned it off.   rms, 2 May 1997.  */
-/* #include <malloc.h>  */
- #pragma alloca
-#define YYSTACK_USE_ALLOCA
-#else /* not MSDOS, or __TURBOC__, or _AIX */
-#if 0
-#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
-		 and on HPUX 10.  Eventually we can turn this on.  */
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#endif /* __hpux */
+
+
+#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
+# define YYSIZE_T __SIZE_TYPE__
 #endif
-#endif /* not _AIX */
-#endif /* not MSDOS, or __TURBOC__ */
-#endif /* not sparc */
-#endif /* not GNU C */
-#endif /* alloca not defined */
-#endif /* YYSTACK_USE_ALLOCA not defined */
-
-#ifdef YYSTACK_USE_ALLOCA
-#define YYSTACK_ALLOC alloca
-#else
-#define YYSTACK_ALLOC malloc
+#if ! defined (YYSIZE_T) && defined (size_t)
+# define YYSIZE_T size_t
+#endif
+#if ! defined (YYSIZE_T)
+# if defined (__STDC__) || defined (__cplusplus)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# endif
+#endif
+#if ! defined (YYSIZE_T)
+# define YYSIZE_T unsigned int
 #endif
-
-/* Note: there must be only one dollar sign in this file.
-   It is replaced by the list of actions, each action
-   as one case of the switch.  */
 
 #define yyerrok		(yyerrstatus = 0)
 #define yyclearin	(yychar = YYEMPTY)
@@ -389,131 +456,161 @@ static const short yycheck[] = {     1,
 #define YYACCEPT	goto yyacceptlab
 #define YYABORT 	goto yyabortlab
 #define YYERROR		goto yyerrlab1
-/* Like YYERROR except do call yyerror.
-   This remains here temporarily to ease the
-   transition to the new meaning of YYERROR, for GCC.
+/* Like YYERROR except do call yyerror.  This remains here temporarily
+   to ease the transition to the new meaning of YYERROR, for GCC.
    Once GCC version 2 has supplanted version 1, this can go.  */
 #define YYFAIL		goto yyerrlab
 #define YYRECOVERING()  (!!yyerrstatus)
-#define YYBACKUP(token, value) \
+#define YYBACKUP(Token, Value)					\
 do								\
   if (yychar == YYEMPTY && yylen == 1)				\
-    { yychar = (token), yylval = (value);			\
+    {								\
+      yychar = (Token);						\
+      yylval = (Value);						\
       yychar1 = YYTRANSLATE (yychar);				\
       YYPOPSTACK;						\
       goto yybackup;						\
     }								\
   else								\
-    { yyerror ("syntax error: cannot back up"); YYERROR; }	\
+    { 								\
+      yyerror ("syntax error: cannot back up");			\
+      YYERROR;							\
+    }								\
 while (0)
 
 #define YYTERROR	1
 #define YYERRCODE	256
 
-#ifndef YYPURE
-#define YYLEX		yylex()
-#endif
-
-#ifdef YYPURE
-#ifdef YYLSP_NEEDED
-#ifdef YYLEX_PARAM
-#define YYLEX		yylex(&yylval, &yylloc, YYLEX_PARAM)
-#else
-#define YYLEX		yylex(&yylval, &yylloc)
-#endif
-#else /* not YYLSP_NEEDED */
-#ifdef YYLEX_PARAM
-#define YYLEX		yylex(&yylval, YYLEX_PARAM)
-#else
-#define YYLEX		yylex(&yylval)
-#endif
-#endif /* not YYLSP_NEEDED */
-#endif
-
-/* If nonreentrant, generate the variables here */
-
-#ifndef YYPURE
 
-int	yychar;			/*  the lookahead symbol		*/
-YYSTYPE	yylval;			/*  the semantic value of the		*/
-				/*  lookahead symbol			*/
+/* YYLLOC_DEFAULT -- Compute the default location (before the actions
+   are run).
 
-#ifdef YYLSP_NEEDED
-YYLTYPE yylloc;			/*  location data for the lookahead	*/
-				/*  symbol				*/
-#endif
-
-int yynerrs;			/*  number of parse errors so far       */
-#endif  /* not YYPURE */
+   When YYLLOC_DEFAULT is run, CURRENT is set the location of the
+   first token.  By default, to implement support for ranges, extend
+   its range to the last symbol.  */
 
-#if YYDEBUG != 0
-int yydebug;			/*  nonzero means print parse trace	*/
-/* Since this is uninitialized, it does not stop multiple parsers
-   from coexisting.  */
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N)       	\
+   Current.last_line   = Rhs[N].last_line;	\
+   Current.last_column = Rhs[N].last_column;
 #endif
 
-/*  YYINITDEPTH indicates the initial size of the parser's stacks	*/
 
+/* YYLEX -- calling `yylex' with the right arguments.  */
+
+#if YYPURE
+# if YYLSP_NEEDED
+#  ifdef YYLEX_PARAM
+#   define YYLEX		yylex (&yylval, &yylloc, YYLEX_PARAM)
+#  else
+#   define YYLEX		yylex (&yylval, &yylloc)
+#  endif
+# else /* !YYLSP_NEEDED */
+#  ifdef YYLEX_PARAM
+#   define YYLEX		yylex (&yylval, YYLEX_PARAM)
+#  else
+#   define YYLEX		yylex (&yylval)
+#  endif
+# endif /* !YYLSP_NEEDED */
+#else /* !YYPURE */
+# define YYLEX			yylex ()
+#endif /* !YYPURE */
+
+
+/* Enable debugging if requested.  */
+#if YYDEBUG
+
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)			\
+do {						\
+  if (yydebug)					\
+    YYFPRINTF Args;				\
+} while (0)
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+#endif /* !YYDEBUG */
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
 #ifndef	YYINITDEPTH
-#define YYINITDEPTH 200
+# define YYINITDEPTH 200
 #endif
 
-/*  YYMAXDEPTH is the maximum size the stacks can grow to
-    (effective only if the built-in stack extension method is used).  */
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
+
+   Do not make this value too large; the results are undefined if
+   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
 
 #if YYMAXDEPTH == 0
-#undef YYMAXDEPTH
+# undef YYMAXDEPTH
 #endif
 
 #ifndef YYMAXDEPTH
-#define YYMAXDEPTH 10000
+# define YYMAXDEPTH 10000
 #endif
 
-/* Define __yy_memcpy.  Note that the size argument
-   should be passed with type unsigned int, because that is what the non-GCC
-   definitions require.  With GCC, __builtin_memcpy takes an arg
-   of type size_t, but it can handle unsigned int.  */
-
-#if __GNUC__ > 1		/* GNU C and GNU C++ define this.  */
-#define __yy_memcpy(TO,FROM,COUNT)	__builtin_memcpy(TO,FROM,COUNT)
-#else				/* not GNU C or C++ */
-#ifndef __cplusplus
-
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
-static void
-__yy_memcpy (to, from, count)
-     char *to;
-     char *from;
-     unsigned int count;
-{
-  register char *f = from;
-  register char *t = to;
-  register int i = count;
+#ifdef YYERROR_VERBOSE
 
-  while (i-- > 0)
-    *t++ = *f++;
-}
+# ifndef yystrlen
+#  if defined (__GLIBC__) && defined (_STRING_H)
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+static YYSIZE_T
+#   if defined (__STDC__) || defined (__cplusplus)
+yystrlen (const char *yystr)
+#   else
+yystrlen (yystr)
+     const char *yystr;
+#   endif
+{
+  register const char *yys = yystr;
 
-#else /* __cplusplus */
+  while (*yys++ != '\0')
+    continue;
 
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
-static void
-__yy_memcpy (char *to, char *from, unsigned int count)
+  return yys - yystr - 1;
+}
+#  endif
+# endif
+
+# ifndef yystpcpy
+#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+static char *
+#   if defined (__STDC__) || defined (__cplusplus)
+yystpcpy (char *yydest, const char *yysrc)
+#   else
+yystpcpy (yydest, yysrc)
+     char *yydest;
+     const char *yysrc;
+#   endif
 {
-  register char *t = to;
-  register char *f = from;
-  register int i = count;
+  register char *yyd = yydest;
+  register const char *yys = yysrc;
 
-  while (i-- > 0)
-    *t++ = *f++;
-}
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
 
-#endif
+  return yyd - 1;
+}
+#  endif
+# endif
 #endif
 
-#line 217 "/usr/local/share/bison.simple"
+#line 315 "/usr/local/share/bison/bison.simple"
+
 
 /* The user can define YYPARSE_PARAM as the name of an argument to be passed
    into yyparse.  The argument should have type void *.
@@ -522,76 +619,121 @@ __yy_memcpy (char *to, char *from, unsigned int count)
    to the proper pointer type.  */
 
 #ifdef YYPARSE_PARAM
-#ifdef __cplusplus
-#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL
-#else /* not __cplusplus */
-#define YYPARSE_PARAM_ARG YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
-#endif /* not __cplusplus */
-#else /* not YYPARSE_PARAM */
-#define YYPARSE_PARAM_ARG
-#define YYPARSE_PARAM_DECL
-#endif /* not YYPARSE_PARAM */
+# if defined (__STDC__) || defined (__cplusplus)
+#  define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
+#  define YYPARSE_PARAM_DECL
+# else
+#  define YYPARSE_PARAM_ARG YYPARSE_PARAM
+#  define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
+# endif
+#else /* !YYPARSE_PARAM */
+# define YYPARSE_PARAM_ARG
+# define YYPARSE_PARAM_DECL
+#endif /* !YYPARSE_PARAM */
 
 /* Prevent warning if -Wstrict-prototypes.  */
 #ifdef __GNUC__
-#ifdef YYPARSE_PARAM
+# ifdef YYPARSE_PARAM
 int yyparse (void *);
-#else
+# else
 int yyparse (void);
+# endif
 #endif
+
+/* YY_DECL_VARIABLES -- depending whether we use a pure parser,
+   variables are global, or local to YYPARSE.  */
+
+#define YY_DECL_NON_LSP_VARIABLES			\
+/* The lookahead symbol.  */				\
+int yychar;						\
+							\
+/* The semantic value of the lookahead symbol. */	\
+YYSTYPE yylval;						\
+							\
+/* Number of parse errors so far.  */			\
+int yynerrs;
+
+#if YYLSP_NEEDED
+# define YY_DECL_VARIABLES			\
+YY_DECL_NON_LSP_VARIABLES			\
+						\
+/* Location data for the lookahead symbol.  */	\
+YYLTYPE yylloc;
+#else
+# define YY_DECL_VARIABLES			\
+YY_DECL_NON_LSP_VARIABLES
 #endif
 
+
+/* If nonreentrant, generate the variables here. */
+
+#if !YYPURE
+YY_DECL_VARIABLES
+#endif  /* !YYPURE */
+
 int
-yyparse(YYPARSE_PARAM_ARG)
+yyparse (YYPARSE_PARAM_ARG)
      YYPARSE_PARAM_DECL
 {
+  /* If reentrant, generate the variables here. */
+#if YYPURE
+  YY_DECL_VARIABLES
+#endif  /* !YYPURE */
+
   register int yystate;
   register int yyn;
+  int yyresult;
+  /* Number of tokens to shift before error messages enabled.  */
+  int yyerrstatus;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yychar1 = 0;
+
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
+     `yyls': related to locations.
+
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
+
+  /* The state stack. */
+  short	yyssa[YYINITDEPTH];
+  short *yyss = yyssa;
   register short *yyssp;
-  register YYSTYPE *yyvsp;
-  int yyerrstatus;	/*  number of tokens to shift before error messages enabled */
-  int yychar1 = 0;		/*  lookahead token as an internal (translated) token number */
-
-  short	yyssa[YYINITDEPTH];	/*  the state stack			*/
-  YYSTYPE yyvsa[YYINITDEPTH];	/*  the semantic value stack		*/
 
-  short *yyss = yyssa;		/*  refer to the stacks thru separate pointers */
-  YYSTYPE *yyvs = yyvsa;	/*  to allow yyoverflow to reallocate them elsewhere */
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  register YYSTYPE *yyvsp;
 
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylsa[YYINITDEPTH];	/*  the location stack			*/
+#if YYLSP_NEEDED
+  /* The location stack.  */
+  YYLTYPE yylsa[YYINITDEPTH];
   YYLTYPE *yyls = yylsa;
   YYLTYPE *yylsp;
+#endif
 
-#define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
+#if YYLSP_NEEDED
+# define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
 #else
-#define YYPOPSTACK   (yyvsp--, yyssp--)
+# define YYPOPSTACK   (yyvsp--, yyssp--)
 #endif
 
-  int yystacksize = YYINITDEPTH;
-  int yyfree_stacks = 0;
+  YYSIZE_T yystacksize = YYINITDEPTH;
 
-#ifdef YYPURE
-  int yychar;
-  YYSTYPE yylval;
-  int yynerrs;
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylloc;
-#endif
-#endif
 
-  YYSTYPE yyval;		/*  the variable used to return		*/
-				/*  semantic values from the action	*/
-				/*  routines				*/
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+#if YYLSP_NEEDED
+  YYLTYPE yyloc;
+#endif
 
+  /* When reducing, the number of symbols on the RHS of the reduced
+     rule. */
   int yylen;
 
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Starting parse\n");
-#endif
+  YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
@@ -603,110 +745,110 @@ yyparse(YYPARSE_PARAM_ARG)
      so that they stay on the same level as the state stack.
      The wasted elements are never initialized.  */
 
-  yyssp = yyss - 1;
+  yyssp = yyss;
   yyvsp = yyvs;
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
   yylsp = yyls;
 #endif
+  goto yysetstate;
 
-/* Push a new state, which is found in  yystate  .  */
-/* In all cases, when you get here, the value and location stacks
-   have just been pushed. so pushing a state here evens the stacks.  */
-yynewstate:
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed. so pushing a state here evens the stacks.
+     */
+  yyssp++;
 
-  *++yyssp = yystate;
+ yysetstate:
+  *yyssp = yystate;
 
   if (yyssp >= yyss + yystacksize - 1)
     {
-      /* Give user a chance to reallocate the stack */
-      /* Use copies of these so that the &'s don't force the real ones into memory. */
-      YYSTYPE *yyvs1 = yyvs;
-      short *yyss1 = yyss;
-#ifdef YYLSP_NEEDED
-      YYLTYPE *yyls1 = yyls;
-#endif
-
       /* Get the current used size of the three stacks, in elements.  */
-      int size = yyssp - yyss + 1;
+      YYSIZE_T yysize = yyssp - yyss + 1;
 
 #ifdef yyoverflow
-      /* Each stack pointer address is followed by the size of
-	 the data in use in that stack, in bytes.  */
-#ifdef YYLSP_NEEDED
-      /* This used to be a conditional around just the two extra args,
-	 but that might be undefined if yyoverflow is a macro.  */
-      yyoverflow("parser stack overflow",
-		 &yyss1, size * sizeof (*yyssp),
-		 &yyvs1, size * sizeof (*yyvsp),
-		 &yyls1, size * sizeof (*yylsp),
-		 &yystacksize);
-#else
-      yyoverflow("parser stack overflow",
-		 &yyss1, size * sizeof (*yyssp),
-		 &yyvs1, size * sizeof (*yyvsp),
-		 &yystacksize);
-#endif
-
-      yyss = yyss1; yyvs = yyvs1;
-#ifdef YYLSP_NEEDED
-      yyls = yyls1;
-#endif
+      {
+	/* Give user a chance to reallocate the stack. Use copies of
+	   these so that the &'s don't force the real ones into
+	   memory.  */
+	YYSTYPE *yyvs1 = yyvs;
+	short *yyss1 = yyss;
+
+	/* Each stack pointer address is followed by the size of the
+	   data in use in that stack, in bytes.  */
+# if YYLSP_NEEDED
+	YYLTYPE *yyls1 = yyls;
+	/* This used to be a conditional around just the two extra args,
+	   but that might be undefined if yyoverflow is a macro.  */
+	yyoverflow ("parser stack overflow",
+		    &yyss1, yysize * sizeof (*yyssp),
+		    &yyvs1, yysize * sizeof (*yyvsp),
+		    &yyls1, yysize * sizeof (*yylsp),
+		    &yystacksize);
+	yyls = yyls1;
+# else
+	yyoverflow ("parser stack overflow",
+		    &yyss1, yysize * sizeof (*yyssp),
+		    &yyvs1, yysize * sizeof (*yyvsp),
+		    &yystacksize);
+# endif
+	yyss = yyss1;
+	yyvs = yyvs1;
+      }
 #else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyoverflowlab;
+# else
       /* Extend the stack our own way.  */
       if (yystacksize >= YYMAXDEPTH)
-	{
-	  yyerror("parser stack overflow");
-	  if (yyfree_stacks)
-	    {
-	      free (yyss);
-	      free (yyvs);
-#ifdef YYLSP_NEEDED
-	      free (yyls);
-#endif
-	    }
-	  return 2;
-	}
+	goto yyoverflowlab;
       yystacksize *= 2;
       if (yystacksize > YYMAXDEPTH)
 	yystacksize = YYMAXDEPTH;
-#ifndef YYSTACK_USE_ALLOCA
-      yyfree_stacks = 1;
-#endif
-      yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
-      __yy_memcpy ((char *)yyss, (char *)yyss1,
-		   size * (unsigned int) sizeof (*yyssp));
-      yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
-      __yy_memcpy ((char *)yyvs, (char *)yyvs1,
-		   size * (unsigned int) sizeof (*yyvsp));
-#ifdef YYLSP_NEEDED
-      yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
-      __yy_memcpy ((char *)yyls, (char *)yyls1,
-		   size * (unsigned int) sizeof (*yylsp));
-#endif
+
+      {
+	short *yyss1 = yyss;
+	union yyalloc *yyptr =
+	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+	if (! yyptr)
+	  goto yyoverflowlab;
+	YYSTACK_RELOCATE (yyss);
+	YYSTACK_RELOCATE (yyvs);
+# if YYLSP_NEEDED
+	YYSTACK_RELOCATE (yyls);
+# endif
+# undef YYSTACK_RELOCATE
+	if (yyss1 != yyssa)
+	  YYSTACK_FREE (yyss1);
+      }
+# endif
 #endif /* no yyoverflow */
 
-      yyssp = yyss + size - 1;
-      yyvsp = yyvs + size - 1;
-#ifdef YYLSP_NEEDED
-      yylsp = yyls + size - 1;
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
+#if YYLSP_NEEDED
+      yylsp = yyls + yysize - 1;
 #endif
 
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Stack size increased to %d\n", yystacksize);
-#endif
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+		  (unsigned long int) yystacksize));
 
       if (yyssp >= yyss + yystacksize - 1)
 	YYABORT;
     }
 
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Entering state %d\n", yystate);
-#endif
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
   goto yybackup;
- yybackup:
+
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
 
 /* Do appropriate processing given the current state.  */
 /* Read a lookahead token if we need one and don't already have one.  */
@@ -725,10 +867,7 @@ yynewstate:
 
   if (yychar == YYEMPTY)
     {
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Reading a token: ");
-#endif
+      YYDPRINTF ((stderr, "Reading a token: "));
       yychar = YYLEX;
     }
 
@@ -739,25 +878,25 @@ yynewstate:
       yychar1 = 0;
       yychar = YYEOF;		/* Don't call YYLEX any more */
 
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Now at end of input.\n");
-#endif
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
     }
   else
     {
-      yychar1 = YYTRANSLATE(yychar);
+      yychar1 = YYTRANSLATE (yychar);
 
-#if YYDEBUG != 0
+#if YYDEBUG
+     /* We have to keep this `#if YYDEBUG', since we use variables
+	which are defined only if `YYDEBUG' is set.  */
       if (yydebug)
 	{
-	  fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
-	  /* Give the individual parser a way to print the precise meaning
-	     of a token, for further debugging info.  */
-#ifdef YYPRINT
+	  YYFPRINTF (stderr, "Next token is %d (%s",
+		     yychar, yytname[yychar1]);
+	  /* Give the individual parser a way to print the precise
+	     meaning of a token, for further debugging info.  */
+# ifdef YYPRINT
 	  YYPRINT (stderr, yychar, yylval);
-#endif
-	  fprintf (stderr, ")\n");
+# endif
+	  YYFPRINTF (stderr, ")\n");
 	}
 #endif
     }
@@ -789,177 +928,185 @@ yynewstate:
     YYACCEPT;
 
   /* Shift the lookahead token.  */
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
-#endif
+  YYDPRINTF ((stderr, "Shifting token %d (%s), ",
+	      yychar, yytname[yychar1]));
 
   /* Discard the token being shifted unless it is eof.  */
   if (yychar != YYEOF)
     yychar = YYEMPTY;
 
   *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
   *++yylsp = yylloc;
 #endif
 
-  /* count tokens shifted since error; after three, turn off error status.  */
-  if (yyerrstatus) yyerrstatus--;
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
 
   yystate = yyn;
   goto yynewstate;
 
-/* Do the default action for the current state.  */
-yydefault:
 
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
   yyn = yydefact[yystate];
   if (yyn == 0)
     goto yyerrlab;
+  goto yyreduce;
+
 
-/* Do a reduction.  yyn is the number of a rule to reduce with.  */
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
 yyreduce:
+  /* yyn is the number of a rule to reduce with.  */
   yylen = yyr2[yyn];
-  if (yylen > 0)
-    yyval = yyvsp[1-yylen]; /* implement default value of the action */
 
-#if YYDEBUG != 0
+  /* If YYLEN is nonzero, implement the default value of the action:
+     `$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to the semantic value of
+     the lookahead token.  This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+
+#if YYLSP_NEEDED
+  /* Similarly for the default location.  Let the user run additional
+     commands if for instance locations are ranges.  */
+  yyloc = yylsp[1-yylen];
+  YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
+#endif
+
+#if YYDEBUG
+  /* We have to keep this `#if YYDEBUG', since we use variables which
+     are defined only if `YYDEBUG' is set.  */
   if (yydebug)
     {
-      int i;
+      int yyi;
 
-      fprintf (stderr, "Reducing via rule %d (line %d), ",
-	       yyn, yyrline[yyn]);
+      YYFPRINTF (stderr, "Reducing via rule %d (line %d), ",
+		 yyn, yyrline[yyn]);
 
       /* Print the symbols being reduced, and their result.  */
-      for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
-	fprintf (stderr, "%s ", yytname[yyrhs[i]]);
-      fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
+      for (yyi = yyprhs[yyn]; yyrhs[yyi] > 0; yyi++)
+	YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
+      YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]);
     }
 #endif
 
-
   switch (yyn) {
 
 case 1:
-#line 175 "plural.y"
+#line 151 "plural.y"
 {
 	    if (yyvsp[0].exp == NULL)
 	      YYABORT;
 	    ((struct parse_args *) arg)->res = yyvsp[0].exp;
-	  ;
-    break;}
+	  }
+    break;
 case 2:
-#line 183 "plural.y"
+#line 159 "plural.y"
 {
 	    yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp);
-	  ;
-    break;}
+	  }
+    break;
 case 3:
-#line 187 "plural.y"
+#line 163 "plural.y"
 {
 	    yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp);
-	  ;
-    break;}
+	  }
+    break;
 case 4:
-#line 191 "plural.y"
+#line 167 "plural.y"
 {
 	    yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp);
-	  ;
-    break;}
+	  }
+    break;
 case 5:
-#line 195 "plural.y"
+#line 171 "plural.y"
 {
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
-	  ;
-    break;}
+	  }
+    break;
 case 6:
-#line 199 "plural.y"
+#line 175 "plural.y"
 {
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
-	  ;
-    break;}
+	  }
+    break;
 case 7:
-#line 203 "plural.y"
+#line 179 "plural.y"
 {
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
-	  ;
-    break;}
+	  }
+    break;
 case 8:
-#line 207 "plural.y"
+#line 183 "plural.y"
 {
 	    yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
-	  ;
-    break;}
+	  }
+    break;
 case 9:
-#line 211 "plural.y"
+#line 187 "plural.y"
 {
 	    yyval.exp = new_exp_1 (lnot, yyvsp[0].exp);
-	  ;
-    break;}
+	  }
+    break;
 case 10:
-#line 215 "plural.y"
+#line 191 "plural.y"
 {
 	    yyval.exp = new_exp_0 (var);
-	  ;
-    break;}
+	  }
+    break;
 case 11:
-#line 219 "plural.y"
+#line 195 "plural.y"
 {
 	    if ((yyval.exp = new_exp_0 (num)) != NULL)
 	      yyval.exp->val.num = yyvsp[0].num;
-	  ;
-    break;}
+	  }
+    break;
 case 12:
-#line 224 "plural.y"
+#line 200 "plural.y"
 {
 	    yyval.exp = yyvsp[-1].exp;
-	  ;
-    break;}
+	  }
+    break;
 }
-   /* the action file gets copied in in place of this dollarsign */
-#line 543 "/usr/local/share/bison.simple"
+
+#line 705 "/usr/local/share/bison/bison.simple"
+
 
   yyvsp -= yylen;
   yyssp -= yylen;
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
   yylsp -= yylen;
 #endif
 
-#if YYDEBUG != 0
+#if YYDEBUG
   if (yydebug)
     {
-      short *ssp1 = yyss - 1;
-      fprintf (stderr, "state stack now");
-      while (ssp1 != yyssp)
-	fprintf (stderr, " %d", *++ssp1);
-      fprintf (stderr, "\n");
+      short *yyssp1 = yyss - 1;
+      YYFPRINTF (stderr, "state stack now");
+      while (yyssp1 != yyssp)
+	YYFPRINTF (stderr, " %d", *++yyssp1);
+      YYFPRINTF (stderr, "\n");
     }
 #endif
 
   *++yyvsp = yyval;
-
-#ifdef YYLSP_NEEDED
-  yylsp++;
-  if (yylen == 0)
-    {
-      yylsp->first_line = yylloc.first_line;
-      yylsp->first_column = yylloc.first_column;
-      yylsp->last_line = (yylsp-1)->last_line;
-      yylsp->last_column = (yylsp-1)->last_column;
-      yylsp->text = 0;
-    }
-  else
-    {
-      yylsp->last_line = (yylsp+yylen-1)->last_line;
-      yylsp->last_column = (yylsp+yylen-1)->last_column;
-    }
+#if YYLSP_NEEDED
+  *++yylsp = yyloc;
 #endif
 
-  /* Now "shift" the result of the reduction.
-     Determine what state that goes to,
-     based on the state we popped back to
-     and the rule number reduced by.  */
+  /* Now `shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
 
   yyn = yyr1[yyn];
 
@@ -971,10 +1118,13 @@ case 12:
 
   goto yynewstate;
 
-yyerrlab:   /* here on detecting error */
 
-  if (! yyerrstatus)
-    /* If not already recovering from an error, report this error.  */
+/*------------------------------------.
+| yyerrlab -- here on detecting error |
+`------------------------------------*/
+yyerrlab:
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
     {
       ++yynerrs;
 
@@ -983,102 +1133,121 @@ yyerrlab:   /* here on detecting error */
 
       if (yyn > YYFLAG && yyn < YYLAST)
 	{
-	  int size = 0;
-	  char *msg;
-	  int x, count;
-
-	  count = 0;
-	  /* Start X at -yyn if nec to avoid negative indexes in yycheck.  */
-	  for (x = (yyn < 0 ? -yyn : 0);
-	       x < (sizeof(yytname) / sizeof(char *)); x++)
-	    if (yycheck[x + yyn] == x)
-	      size += strlen(yytname[x]) + 15, count++;
-	  msg = (char *) malloc(size + 15);
-	  if (msg != 0)
+	  YYSIZE_T yysize = 0;
+	  char *yymsg;
+	  int yyx, yycount;
+
+	  yycount = 0;
+	  /* Start YYX at -YYN if negative to avoid negative indexes in
+	     YYCHECK.  */
+	  for (yyx = yyn < 0 ? -yyn : 0;
+	       yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
+	    if (yycheck[yyx + yyn] == yyx)
+	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
+	  yysize += yystrlen ("parse error, unexpected ") + 1;
+	  yysize += yystrlen (yytname[YYTRANSLATE (yychar)]);
+	  yymsg = (char *) YYSTACK_ALLOC (yysize);
+	  if (yymsg != 0)
 	    {
-	      strcpy(msg, "parse error");
+	      char *yyp = yystpcpy (yymsg, "parse error, unexpected ");
+	      yyp = yystpcpy (yyp, yytname[YYTRANSLATE (yychar)]);
 
-	      if (count < 5)
+	      if (yycount < 5)
 		{
-		  count = 0;
-		  for (x = (yyn < 0 ? -yyn : 0);
-		       x < (sizeof(yytname) / sizeof(char *)); x++)
-		    if (yycheck[x + yyn] == x)
+		  yycount = 0;
+		  for (yyx = yyn < 0 ? -yyn : 0;
+		       yyx < (int) (sizeof (yytname) / sizeof (char *));
+		       yyx++)
+		    if (yycheck[yyx + yyn] == yyx)
 		      {
-			strcat(msg, count == 0 ? ", expecting `" : " or `");
-			strcat(msg, yytname[x]);
-			strcat(msg, "'");
-			count++;
+			const char *yyq = ! yycount ? ", expecting " : " or ";
+			yyp = yystpcpy (yyp, yyq);
+			yyp = yystpcpy (yyp, yytname[yyx]);
+			yycount++;
 		      }
 		}
-	      yyerror(msg);
-	      free(msg);
+	      yyerror (yymsg);
+	      YYSTACK_FREE (yymsg);
 	    }
 	  else
-	    yyerror ("parse error; also virtual memory exceeded");
+	    yyerror ("parse error; also virtual memory exhausted");
 	}
       else
-#endif /* YYERROR_VERBOSE */
-	yyerror("parse error");
+#endif /* defined (YYERROR_VERBOSE) */
+	yyerror ("parse error");
     }
-
   goto yyerrlab1;
-yyerrlab1:   /* here on error raised explicitly by an action */
 
+
+/*--------------------------------------------------.
+| yyerrlab1 -- error raised explicitly by an action |
+`--------------------------------------------------*/
+yyerrlab1:
   if (yyerrstatus == 3)
     {
-      /* if just tried and failed to reuse lookahead token after an error, discard it.  */
+      /* If just tried and failed to reuse lookahead token after an
+	 error, discard it.  */
 
       /* return failure if at end of input */
       if (yychar == YYEOF)
 	YYABORT;
-
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
-#endif
-
+      YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
+		  yychar, yytname[yychar1]));
       yychar = YYEMPTY;
     }
 
-  /* Else will try to reuse lookahead token
-     after shifting the error token.  */
+  /* Else will try to reuse lookahead token after shifting the error
+     token.  */
 
   yyerrstatus = 3;		/* Each real token shifted decrements this */
 
   goto yyerrhandle;
 
-yyerrdefault:  /* current state does not do anything special for the error token. */
 
+/*-------------------------------------------------------------------.
+| yyerrdefault -- current state does not do anything special for the |
+| error token.                                                       |
+`-------------------------------------------------------------------*/
+yyerrdefault:
 #if 0
   /* This is wrong; only states that explicitly want error tokens
      should shift them.  */
-  yyn = yydefact[yystate];  /* If its default is to accept any token, ok.  Otherwise pop it.*/
-  if (yyn) goto yydefault;
+
+  /* If its default is to accept any token, ok.  Otherwise pop it.  */
+  yyn = yydefact[yystate];
+  if (yyn)
+    goto yydefault;
 #endif
 
-yyerrpop:   /* pop the current state because it cannot handle the error token */
 
-  if (yyssp == yyss) YYABORT;
+/*---------------------------------------------------------------.
+| yyerrpop -- pop the current state because it cannot handle the |
+| error token                                                    |
+`---------------------------------------------------------------*/
+yyerrpop:
+  if (yyssp == yyss)
+    YYABORT;
   yyvsp--;
   yystate = *--yyssp;
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
   yylsp--;
 #endif
 
-#if YYDEBUG != 0
+#if YYDEBUG
   if (yydebug)
     {
-      short *ssp1 = yyss - 1;
-      fprintf (stderr, "Error: state stack now");
-      while (ssp1 != yyssp)
-	fprintf (stderr, " %d", *++ssp1);
-      fprintf (stderr, "\n");
+      short *yyssp1 = yyss - 1;
+      YYFPRINTF (stderr, "Error: state stack now");
+      while (yyssp1 != yyssp)
+	YYFPRINTF (stderr, " %d", *++yyssp1);
+      YYFPRINTF (stderr, "\n");
     }
 #endif
 
+/*--------------.
+| yyerrhandle.  |
+`--------------*/
 yyerrhandle:
-
   yyn = yypact[yystate];
   if (yyn == YYFLAG)
     goto yyerrdefault;
@@ -1101,50 +1270,52 @@ yyerrhandle:
   if (yyn == YYFINAL)
     YYACCEPT;
 
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting error token, ");
-#endif
+  YYDPRINTF ((stderr, "Shifting error token, "));
 
   *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
   *++yylsp = yylloc;
 #endif
 
   yystate = yyn;
   goto yynewstate;
 
- yyacceptlab:
-  /* YYACCEPT comes here.  */
-  if (yyfree_stacks)
-    {
-      free (yyss);
-      free (yyvs);
-#ifdef YYLSP_NEEDED
-      free (yyls);
-#endif
-    }
-  return 0;
 
- yyabortlab:
-  /* YYABORT comes here.  */
-  if (yyfree_stacks)
-    {
-      free (yyss);
-      free (yyvs);
-#ifdef YYLSP_NEEDED
-      free (yyls);
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+/*---------------------------------------------.
+| yyoverflowab -- parser overflow comes here.  |
+`---------------------------------------------*/
+yyoverflowlab:
+  yyerror ("parser stack overflow");
+  yyresult = 2;
+  /* Fall through.  */
+
+yyreturn:
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
 #endif
-    }
-  return 1;
+  return yyresult;
 }
-#line 229 "plural.y"
+#line 205 "plural.y"
 
 
 void
 internal_function
-FREE_EXPRESSION (exp)
-     struct expression *exp;
+FREE_EXPRESSION (struct expression *exp)
 {
   if (exp == NULL)
     return;
@@ -1170,9 +1341,7 @@ FREE_EXPRESSION (exp)
 
 
 static int
-yylex (lval, pexp)
-     YYSTYPE *lval;
-     const char **pexp;
+yylex (YYSTYPE *lval, const char **pexp)
 {
   const char *exp = *pexp;
   int result;
@@ -1315,8 +1484,7 @@ yylex (lval, pexp)
 
 
 static void
-yyerror (str)
-     const char *str;
+yyerror (const char *str)
 {
   /* Do nothing.  We don't print error messages here.  */
 }
diff --git a/gnu/usr.bin/texinfo/intl/plural.y b/gnu/usr.bin/texinfo/intl/plural.y
index 616b7c11a21..4d33bd7c716 100644
--- a/gnu/usr.bin/texinfo/intl/plural.y
+++ b/gnu/usr.bin/texinfo/intl/plural.y
@@ -1,6 +1,6 @@
 %{
 /* Expression parsing for plural form selection.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
 
    This program is free software; you can redistribute it and/or modify it
@@ -54,28 +54,13 @@
 
 %{
 /* Prototypes for local functions.  */
-static struct expression *new_exp PARAMS ((int nargs, enum operator op,
-					   struct expression * const *args));
-static inline struct expression *new_exp_0 PARAMS ((enum operator op));
-static inline struct expression *new_exp_1 PARAMS ((enum operator op,
-						   struct expression *right));
-static struct expression *new_exp_2 PARAMS ((enum operator op,
-					     struct expression *left,
-					     struct expression *right));
-static inline struct expression *new_exp_3 PARAMS ((enum operator op,
-						   struct expression *bexp,
-						   struct expression *tbranch,
-						   struct expression *fbranch));
-static int yylex PARAMS ((YYSTYPE *lval, const char **pexp));
-static void yyerror PARAMS ((const char *str));
+static int yylex (YYSTYPE *lval, const char **pexp);
+static void yyerror (const char *str);
 
 /* Allocation of expressions.  */
 
 static struct expression *
-new_exp (nargs, op, args)
-     int nargs;
-     enum operator op;
-     struct expression * const *args;
+new_exp (int nargs, enum operator op, struct expression * const *args)
 {
   int i;
   struct expression *newp;
@@ -104,16 +89,13 @@ new_exp (nargs, op, args)
 }
 
 static inline struct expression *
-new_exp_0 (op)
-     enum operator op;
+new_exp_0 (enum operator op)
 {
   return new_exp (0, op, NULL);
 }
 
 static inline struct expression *
-new_exp_1 (op, right)
-     enum operator op;
-     struct expression *right;
+new_exp_1 (enum operator op, struct expression *right)
 {
   struct expression *args[1];
 
@@ -122,10 +104,7 @@ new_exp_1 (op, right)
 }
 
 static struct expression *
-new_exp_2 (op, left, right)
-     enum operator op;
-     struct expression *left;
-     struct expression *right;
+new_exp_2 (enum operator op, struct expression *left, struct expression *right)
 {
   struct expression *args[2];
 
@@ -135,11 +114,8 @@ new_exp_2 (op, left, right)
 }
 
 static inline struct expression *
-new_exp_3 (op, bexp, tbranch, fbranch)
-     enum operator op;
-     struct expression *bexp;
-     struct expression *tbranch;
-     struct expression *fbranch;
+new_exp_3 (enum operator op, struct expression *bexp,
+	   struct expression *tbranch, struct expression *fbranch)
 {
   struct expression *args[3];
 
@@ -230,8 +206,7 @@ exp:	  exp '?' exp ':' exp
 
 void
 internal_function
-FREE_EXPRESSION (exp)
-     struct expression *exp;
+FREE_EXPRESSION (struct expression *exp)
 {
   if (exp == NULL)
     return;
@@ -257,9 +232,7 @@ FREE_EXPRESSION (exp)
 
 
 static int
-yylex (lval, pexp)
-     YYSTYPE *lval;
-     const char **pexp;
+yylex (YYSTYPE *lval, const char **pexp)
 {
   const char *exp = *pexp;
   int result;
@@ -402,8 +375,7 @@ yylex (lval, pexp)
 
 
 static void
-yyerror (str)
-     const char *str;
+yyerror (const char *str)
 {
   /* Do nothing.  We don't print error messages here.  */
 }
diff --git a/gnu/usr.bin/texinfo/intl/printf-args.c b/gnu/usr.bin/texinfo/intl/printf-args.c
new file mode 100644
index 00000000000..f6f3219e79e
--- /dev/null
+++ b/gnu/usr.bin/texinfo/intl/printf-args.c
@@ -0,0 +1,119 @@
+/* Decomposed printf argument list.
+   Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
+
+   This program 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, 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library 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>
+#endif
+
+/* Specification.  */
+#include "printf-args.h"
+
+#ifdef STATIC
+STATIC
+#endif
+int
+printf_fetchargs (va_list args, arguments *a)
+{
+  size_t i;
+  argument *ap;
+
+  for (i = 0, ap = &a->arg[0]; i < a->count; i++, ap++)
+    switch (ap->type)
+      {
+      case TYPE_SCHAR:
+	ap->a.a_schar = va_arg (args, /*signed char*/ int);
+	break;
+      case TYPE_UCHAR:
+	ap->a.a_uchar = va_arg (args, /*unsigned char*/ int);
+	break;
+      case TYPE_SHORT:
+	ap->a.a_short = va_arg (args, /*short*/ int);
+	break;
+      case TYPE_USHORT:
+	ap->a.a_ushort = va_arg (args, /*unsigned short*/ int);
+	break;
+      case TYPE_INT:
+	ap->a.a_int = va_arg (args, int);
+	break;
+      case TYPE_UINT:
+	ap->a.a_uint = va_arg (args, unsigned int);
+	break;
+      case TYPE_LONGINT:
+	ap->a.a_longint = va_arg (args, long int);
+	break;
+      case TYPE_ULONGINT:
+	ap->a.a_ulongint = va_arg (args, unsigned long int);
+	break;
+#ifdef HAVE_LONG_LONG
+      case TYPE_LONGLONGINT:
+	ap->a.a_longlongint = va_arg (args, long long int);
+	break;
+      case TYPE_ULONGLONGINT:
+	ap->a.a_ulonglongint = va_arg (args, unsigned long long int);
+	break;
+#endif
+      case TYPE_DOUBLE:
+	ap->a.a_double = va_arg (args, double);
+	break;
+#ifdef HAVE_LONG_DOUBLE
+      case TYPE_LONGDOUBLE:
+	ap->a.a_longdouble = va_arg (args, long double);
+	break;
+#endif
+      case TYPE_CHAR:
+	ap->a.a_char = va_arg (args, int);
+	break;
+#ifdef HAVE_WINT_T
+      case TYPE_WIDE_CHAR:
+	ap->a.a_wide_char = va_arg (args, wint_t);
+	break;
+#endif
+      case TYPE_STRING:
+	ap->a.a_string = va_arg (args, const char *);
+	break;
+#ifdef HAVE_WCHAR_T
+      case TYPE_WIDE_STRING:
+	ap->a.a_wide_string = va_arg (args, const wchar_t *);
+	break;
+#endif
+      case TYPE_POINTER:
+	ap->a.a_pointer = va_arg (args, void *);
+	break;
+      case TYPE_COUNT_SCHAR_POINTER:
+	ap->a.a_count_schar_pointer = va_arg (args, signed char *);
+	break;
+      case TYPE_COUNT_SHORT_POINTER:
+	ap->a.a_count_short_pointer = va_arg (args, short *);
+	break;
+      case TYPE_COUNT_INT_POINTER:
+	ap->a.a_count_int_pointer = va_arg (args, int *);
+	break;
+      case TYPE_COUNT_LONGINT_POINTER:
+	ap->a.a_count_longint_pointer = va_arg (args, long int *);
+	break;
+#ifdef HAVE_LONG_LONG
+      case TYPE_COUNT_LONGLONGINT_POINTER:
+	ap->a.a_count_longlongint_pointer = va_arg (args, long long int *);
+	break;
+#endif
+      default:
+	/* Unknown type.  */
+	return -1;
+      }
+  return 0;
+}
diff --git a/gnu/usr.bin/texinfo/intl/printf-args.h b/gnu/usr.bin/texinfo/intl/printf-args.h
new file mode 100644
index 00000000000..f11e64c0459
--- /dev/null
+++ b/gnu/usr.bin/texinfo/intl/printf-args.h
@@ -0,0 +1,137 @@
+/* Decomposed printf argument list.
+   Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
+
+   This program 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, 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library 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 _PRINTF_ARGS_H
+#define _PRINTF_ARGS_H
+
+/* Get size_t.  */
+#include <stddef.h>
+
+/* Get wchar_t.  */
+#ifdef HAVE_WCHAR_T
+# include <stddef.h>
+#endif
+
+/* Get wint_t.  */
+#ifdef HAVE_WINT_T
+# include <wchar.h>
+#endif
+
+/* Get va_list.  */
+#include <stdarg.h>
+
+
+/* Argument types */
+typedef enum
+{
+  TYPE_NONE,
+  TYPE_SCHAR,
+  TYPE_UCHAR,
+  TYPE_SHORT,
+  TYPE_USHORT,
+  TYPE_INT,
+  TYPE_UINT,
+  TYPE_LONGINT,
+  TYPE_ULONGINT,
+#ifdef HAVE_LONG_LONG
+  TYPE_LONGLONGINT,
+  TYPE_ULONGLONGINT,
+#endif
+  TYPE_DOUBLE,
+#ifdef HAVE_LONG_DOUBLE
+  TYPE_LONGDOUBLE,
+#endif
+  TYPE_CHAR,
+#ifdef HAVE_WINT_T
+  TYPE_WIDE_CHAR,
+#endif
+  TYPE_STRING,
+#ifdef HAVE_WCHAR_T
+  TYPE_WIDE_STRING,
+#endif
+  TYPE_POINTER,
+  TYPE_COUNT_SCHAR_POINTER,
+  TYPE_COUNT_SHORT_POINTER,
+  TYPE_COUNT_INT_POINTER,
+  TYPE_COUNT_LONGINT_POINTER
+#ifdef HAVE_LONG_LONG
+, TYPE_COUNT_LONGLONGINT_POINTER
+#endif
+} arg_type;
+
+/* Polymorphic argument */
+typedef struct
+{
+  arg_type type;
+  union
+  {
+    signed char			a_schar;
+    unsigned char		a_uchar;
+    short			a_short;
+    unsigned short		a_ushort;
+    int				a_int;
+    unsigned int		a_uint;
+    long int			a_longint;
+    unsigned long int		a_ulongint;
+#ifdef HAVE_LONG_LONG
+    long long int		a_longlongint;
+    unsigned long long int	a_ulonglongint;
+#endif
+    float			a_float;
+    double			a_double;
+#ifdef HAVE_LONG_DOUBLE
+    long double			a_longdouble;
+#endif
+    int				a_char;
+#ifdef HAVE_WINT_T
+    wint_t			a_wide_char;
+#endif
+    const char*			a_string;
+#ifdef HAVE_WCHAR_T
+    const wchar_t*		a_wide_string;
+#endif
+    void*			a_pointer;
+    signed char *		a_count_schar_pointer;
+    short *			a_count_short_pointer;
+    int *			a_count_int_pointer;
+    long int *			a_count_longint_pointer;
+#ifdef HAVE_LONG_LONG
+    long long int *		a_count_longlongint_pointer;
+#endif
+  }
+  a;
+}
+argument;
+
+typedef struct
+{
+  size_t count;
+  argument *arg;
+}
+arguments;
+
+
+/* Fetch the arguments, putting them into a. */
+#ifdef STATIC
+STATIC
+#else
+extern
+#endif
+int printf_fetchargs (va_list args, arguments *a);
+
+#endif /* _PRINTF_ARGS_H */
diff --git a/gnu/usr.bin/texinfo/intl/printf-parse.c b/gnu/usr.bin/texinfo/intl/printf-parse.c
new file mode 100644
index 00000000000..d19f903d72c
--- /dev/null
+++ b/gnu/usr.bin/texinfo/intl/printf-parse.c
@@ -0,0 +1,537 @@
+/* Formatted output to strings.
+   Copyright (C) 1999-2000, 2002-2003 Free Software Foundation, Inc.
+
+   This program 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, 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library 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>
+#endif
+
+/* Specification.  */
+#if WIDE_CHAR_VERSION
+# include "wprintf-parse.h"
+#else
+# include "printf-parse.h"
+#endif
+
+/* Get size_t, NULL.  */
+#include <stddef.h>
+
+/* Get intmax_t.  */
+#if HAVE_STDINT_H_WITH_UINTMAX
+# include <stdint.h>
+#endif
+#if HAVE_INTTYPES_H_WITH_UINTMAX
+# include <inttypes.h>
+#endif
+
+/* malloc(), realloc(), free().  */
+#include <stdlib.h>
+
+/* Checked size_t computations.  */
+#include "xsize.h"
+
+#if WIDE_CHAR_VERSION
+# define PRINTF_PARSE wprintf_parse
+# define CHAR_T wchar_t
+# define DIRECTIVE wchar_t_directive
+# define DIRECTIVES wchar_t_directives
+#else
+# define PRINTF_PARSE printf_parse
+# define CHAR_T char
+# define DIRECTIVE char_directive
+# define DIRECTIVES char_directives
+#endif
+
+#ifdef STATIC
+STATIC
+#endif
+int
+PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
+{
+  const CHAR_T *cp = format;		/* pointer into format */
+  size_t arg_posn = 0;		/* number of regular arguments consumed */
+  size_t d_allocated;			/* allocated elements of d->dir */
+  size_t a_allocated;			/* allocated elements of a->arg */
+  size_t max_width_length = 0;
+  size_t max_precision_length = 0;
+
+  d->count = 0;
+  d_allocated = 1;
+  d->dir = malloc (d_allocated * sizeof (DIRECTIVE));
+  if (d->dir == NULL)
+    /* Out of memory.  */
+    return -1;
+
+  a->count = 0;
+  a_allocated = 0;
+  a->arg = NULL;
+
+#define REGISTER_ARG(_index_,_type_) \
+  {									\
+    size_t n = (_index_);						\
+    if (n >= a_allocated)						\
+      {									\
+	size_t memory_size;						\
+	argument *memory;						\
+									\
+	a_allocated = xtimes (a_allocated, 2);				\
+	if (a_allocated <= n)						\
+	  a_allocated = xsum (n, 1);					\
+	memory_size = xtimes (a_allocated, sizeof (argument));		\
+	if (size_overflow_p (memory_size))				\
+	  /* Overflow, would lead to out of memory.  */			\
+	  goto error;							\
+	memory = (a->arg						\
+		  ? realloc (a->arg, memory_size)			\
+		  : malloc (memory_size));				\
+	if (memory == NULL)						\
+	  /* Out of memory.  */						\
+	  goto error;							\
+	a->arg = memory;						\
+      }									\
+    while (a->count <= n)						\
+      a->arg[a->count++].type = TYPE_NONE;				\
+    if (a->arg[n].type == TYPE_NONE)					\
+      a->arg[n].type = (_type_);					\
+    else if (a->arg[n].type != (_type_))				\
+      /* Ambiguous type for positional argument.  */			\
+      goto error;							\
+  }
+
+  while (*cp != '\0')
+    {
+      CHAR_T c = *cp++;
+      if (c == '%')
+	{
+	  size_t arg_index = ARG_NONE;
+	  DIRECTIVE *dp = &d->dir[d->count];/* pointer to next directive */
+
+	  /* Initialize the next directive.  */
+	  dp->dir_start = cp - 1;
+	  dp->flags = 0;
+	  dp->width_start = NULL;
+	  dp->width_end = NULL;
+	  dp->width_arg_index = ARG_NONE;
+	  dp->precision_start = NULL;
+	  dp->precision_end = NULL;
+	  dp->precision_arg_index = ARG_NONE;
+	  dp->arg_index = ARG_NONE;
+
+	  /* Test for positional argument.  */
+	  if (*cp >= '0' && *cp <= '9')
+	    {
+	      const CHAR_T *np;
+
+	      for (np = cp; *np >= '0' && *np <= '9'; np++)
+		;
+	      if (*np == '$')
+		{
+		  size_t n = 0;
+
+		  for (np = cp; *np >= '0' && *np <= '9'; np++)
+		    n = xsum (xtimes (n, 10), *np - '0');
+		  if (n == 0)
+		    /* Positional argument 0.  */
+		    goto error;
+		  if (size_overflow_p (n))
+		    /* n too large, would lead to out of memory later.  */
+		    goto error;
+		  arg_index = n - 1;
+		  cp = np + 1;
+		}
+	    }
+
+	  /* Read the flags.  */
+	  for (;;)
+	    {
+	      if (*cp == '\'')
+		{
+		  dp->flags |= FLAG_GROUP;
+		  cp++;
+		}
+	      else if (*cp == '-')
+		{
+		  dp->flags |= FLAG_LEFT;
+		  cp++;
+		}
+	      else if (*cp == '+')
+		{
+		  dp->flags |= FLAG_SHOWSIGN;
+		  cp++;
+		}
+	      else if (*cp == ' ')
+		{
+		  dp->flags |= FLAG_SPACE;
+		  cp++;
+		}
+	      else if (*cp == '#')
+		{
+		  dp->flags |= FLAG_ALT;
+		  cp++;
+		}
+	      else if (*cp == '0')
+		{
+		  dp->flags |= FLAG_ZERO;
+		  cp++;
+		}
+	      else
+		break;
+	    }
+
+	  /* Parse the field width.  */
+	  if (*cp == '*')
+	    {
+	      dp->width_start = cp;
+	      cp++;
+	      dp->width_end = cp;
+	      if (max_width_length < 1)
+		max_width_length = 1;
+
+	      /* Test for positional argument.  */
+	      if (*cp >= '0' && *cp <= '9')
+		{
+		  const CHAR_T *np;
+
+		  for (np = cp; *np >= '0' && *np <= '9'; np++)
+		    ;
+		  if (*np == '$')
+		    {
+		      size_t n = 0;
+
+		      for (np = cp; *np >= '0' && *np <= '9'; np++)
+			n = xsum (xtimes (n, 10), *np - '0');
+		      if (n == 0)
+			/* Positional argument 0.  */
+			goto error;
+		      if (size_overflow_p (n))
+			/* n too large, would lead to out of memory later.  */
+			goto error;
+		      dp->width_arg_index = n - 1;
+		      cp = np + 1;
+		    }
+		}
+	      if (dp->width_arg_index == ARG_NONE)
+		{
+		  dp->width_arg_index = arg_posn++;
+		  if (dp->width_arg_index == ARG_NONE)
+		    /* arg_posn wrapped around.  */
+		    goto error;
+		}
+	      REGISTER_ARG (dp->width_arg_index, TYPE_INT);
+	    }
+	  else if (*cp >= '0' && *cp <= '9')
+	    {
+	      size_t width_length;
+
+	      dp->width_start = cp;
+	      for (; *cp >= '0' && *cp <= '9'; cp++)
+		;
+	      dp->width_end = cp;
+	      width_length = dp->width_end - dp->width_start;
+	      if (max_width_length < width_length)
+		max_width_length = width_length;
+	    }
+
+	  /* Parse the precision.  */
+	  if (*cp == '.')
+	    {
+	      cp++;
+	      if (*cp == '*')
+		{
+		  dp->precision_start = cp - 1;
+		  cp++;
+		  dp->precision_end = cp;
+		  if (max_precision_length < 2)
+		    max_precision_length = 2;
+
+		  /* Test for positional argument.  */
+		  if (*cp >= '0' && *cp <= '9')
+		    {
+		      const CHAR_T *np;
+
+		      for (np = cp; *np >= '0' && *np <= '9'; np++)
+			;
+		      if (*np == '$')
+			{
+			  size_t n = 0;
+
+			  for (np = cp; *np >= '0' && *np <= '9'; np++)
+			    n = xsum (xtimes (n, 10), *np - '0');
+			  if (n == 0)
+			    /* Positional argument 0.  */
+			    goto error;
+			  if (size_overflow_p (n))
+			    /* n too large, would lead to out of memory
+			       later.  */
+			    goto error;
+			  dp->precision_arg_index = n - 1;
+			  cp = np + 1;
+			}
+		    }
+		  if (dp->precision_arg_index == ARG_NONE)
+		    {
+		      dp->precision_arg_index = arg_posn++;
+		      if (dp->precision_arg_index == ARG_NONE)
+			/* arg_posn wrapped around.  */
+			goto error;
+		    }
+		  REGISTER_ARG (dp->precision_arg_index, TYPE_INT);
+		}
+	      else
+		{
+		  size_t precision_length;
+
+		  dp->precision_start = cp - 1;
+		  for (; *cp >= '0' && *cp <= '9'; cp++)
+		    ;
+		  dp->precision_end = cp;
+		  precision_length = dp->precision_end - dp->precision_start;
+		  if (max_precision_length < precision_length)
+		    max_precision_length = precision_length;
+		}
+	    }
+
+	  {
+	    arg_type type;
+
+	    /* Parse argument type/size specifiers.  */
+	    {
+	      int flags = 0;
+
+	      for (;;)
+		{
+		  if (*cp == 'h')
+		    {
+		      flags |= (1 << (flags & 1));
+		      cp++;
+		    }
+		  else if (*cp == 'L')
+		    {
+		      flags |= 4;
+		      cp++;
+		    }
+		  else if (*cp == 'l')
+		    {
+		      flags += 8;
+		      cp++;
+		    }
+#ifdef HAVE_INTMAX_T
+		  else if (*cp == 'j')
+		    {
+		      if (sizeof (intmax_t) > sizeof (long))
+			{
+			  /* intmax_t = long long */
+			  flags += 16;
+			}
+		      else if (sizeof (intmax_t) > sizeof (int))
+			{
+			  /* intmax_t = long */
+			  flags += 8;
+			}
+		      cp++;
+		    }
+#endif
+		  else if (*cp == 'z' || *cp == 'Z')
+		    {
+		      /* 'z' is standardized in ISO C 99, but glibc uses 'Z'
+			 because the warning facility in gcc-2.95.2 understands
+			 only 'Z' (see gcc-2.95.2/gcc/c-common.c:1784).  */
+		      if (sizeof (size_t) > sizeof (long))
+			{
+			  /* size_t = long long */
+			  flags += 16;
+			}
+		      else if (sizeof (size_t) > sizeof (int))
+			{
+			  /* size_t = long */
+			  flags += 8;
+			}
+		      cp++;
+		    }
+		  else if (*cp == 't')
+		    {
+		      if (sizeof (ptrdiff_t) > sizeof (long))
+			{
+			  /* ptrdiff_t = long long */
+			  flags += 16;
+			}
+		      else if (sizeof (ptrdiff_t) > sizeof (int))
+			{
+			  /* ptrdiff_t = long */
+			  flags += 8;
+			}
+		      cp++;
+		    }
+		  else
+		    break;
+		}
+
+	      /* Read the conversion character.  */
+	      c = *cp++;
+	      switch (c)
+		{
+		case 'd': case 'i':
+#ifdef HAVE_LONG_LONG
+		  if (flags >= 16 || (flags & 4))
+		    type = TYPE_LONGLONGINT;
+		  else
+#endif
+		  if (flags >= 8)
+		    type = TYPE_LONGINT;
+		  else if (flags & 2)
+		    type = TYPE_SCHAR;
+		  else if (flags & 1)
+		    type = TYPE_SHORT;
+		  else
+		    type = TYPE_INT;
+		  break;
+		case 'o': case 'u': case 'x': case 'X':
+#ifdef HAVE_LONG_LONG
+		  if (flags >= 16 || (flags & 4))
+		    type = TYPE_ULONGLONGINT;
+		  else
+#endif
+		  if (flags >= 8)
+		    type = TYPE_ULONGINT;
+		  else if (flags & 2)
+		    type = TYPE_UCHAR;
+		  else if (flags & 1)
+		    type = TYPE_USHORT;
+		  else
+		    type = TYPE_UINT;
+		  break;
+		case 'f': case 'F': case 'e': case 'E': case 'g': case 'G':
+		case 'a': case 'A':
+#ifdef HAVE_LONG_DOUBLE
+		  if (flags >= 16 || (flags & 4))
+		    type = TYPE_LONGDOUBLE;
+		  else
+#endif
+		  type = TYPE_DOUBLE;
+		  break;
+		case 'c':
+		  if (flags >= 8)
+#ifdef HAVE_WINT_T
+		    type = TYPE_WIDE_CHAR;
+#else
+		    goto error;
+#endif
+		  else
+		    type = TYPE_CHAR;
+		  break;
+#ifdef HAVE_WINT_T
+		case 'C':
+		  type = TYPE_WIDE_CHAR;
+		  c = 'c';
+		  break;
+#endif
+		case 's':
+		  if (flags >= 8)
+#ifdef HAVE_WCHAR_T
+		    type = TYPE_WIDE_STRING;
+#else
+		    goto error;
+#endif
+		  else
+		    type = TYPE_STRING;
+		  break;
+#ifdef HAVE_WCHAR_T
+		case 'S':
+		  type = TYPE_WIDE_STRING;
+		  c = 's';
+		  break;
+#endif
+		case 'p':
+		  type = TYPE_POINTER;
+		  break;
+		case 'n':
+#ifdef HAVE_LONG_LONG
+		  if (flags >= 16 || (flags & 4))
+		    type = TYPE_COUNT_LONGLONGINT_POINTER;
+		  else
+#endif
+		  if (flags >= 8)
+		    type = TYPE_COUNT_LONGINT_POINTER;
+		  else if (flags & 2)
+		    type = TYPE_COUNT_SCHAR_POINTER;
+		  else if (flags & 1)
+		    type = TYPE_COUNT_SHORT_POINTER;
+		  else
+		    type = TYPE_COUNT_INT_POINTER;
+		  break;
+		case '%':
+		  type = TYPE_NONE;
+		  break;
+		default:
+		  /* Unknown conversion character.  */
+		  goto error;
+		}
+	    }
+
+	    if (type != TYPE_NONE)
+	      {
+		dp->arg_index = arg_index;
+		if (dp->arg_index == ARG_NONE)
+		  {
+		    dp->arg_index = arg_posn++;
+		    if (dp->arg_index == ARG_NONE)
+		      /* arg_posn wrapped around.  */
+		      goto error;
+		  }
+		REGISTER_ARG (dp->arg_index, type);
+	      }
+	    dp->conversion = c;
+	    dp->dir_end = cp;
+	  }
+
+	  d->count++;
+	  if (d->count >= d_allocated)
+	    {
+	      size_t memory_size;
+	      DIRECTIVE *memory;
+
+	      d_allocated = xtimes (d_allocated, 2);
+	      memory_size = xtimes (d_allocated, sizeof (DIRECTIVE));
+	      if (size_overflow_p (memory_size))
+		/* Overflow, would lead to out of memory.  */
+		goto error;
+	      memory = realloc (d->dir, memory_size);
+	      if (memory == NULL)
+		/* Out of memory.  */
+		goto error;
+	      d->dir = memory;
+	    }
+	}
+    }
+  d->dir[d->count].dir_start = cp;
+
+  d->max_width_length = max_width_length;
+  d->max_precision_length = max_precision_length;
+  return 0;
+
+error:
+  if (a->arg)
+    free (a->arg);
+  if (d->dir)
+    free (d->dir);
+  return -1;
+}
+
+#undef DIRECTIVES
+#undef DIRECTIVE
+#undef CHAR_T
+#undef PRINTF_PARSE
diff --git a/gnu/usr.bin/texinfo/intl/printf-parse.h b/gnu/usr.bin/texinfo/intl/printf-parse.h
new file mode 100644
index 00000000000..8aec50e2a3f
--- /dev/null
+++ b/gnu/usr.bin/texinfo/intl/printf-parse.h
@@ -0,0 +1,75 @@
+/* Parse printf format string.
+   Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
+
+   This program 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, 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library 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 _PRINTF_PARSE_H
+#define _PRINTF_PARSE_H
+
+#include "printf-args.h"
+
+
+/* Flags */
+#define FLAG_GROUP	 1	/* ' flag */
+#define FLAG_LEFT	 2	/* - flag */
+#define FLAG_SHOWSIGN	 4	/* + flag */
+#define FLAG_SPACE	 8	/* space flag */
+#define FLAG_ALT	16	/* # flag */
+#define FLAG_ZERO	32
+
+/* arg_index value indicating that no argument is consumed.  */
+#define ARG_NONE	(~(size_t)0)
+
+/* A parsed directive.  */
+typedef struct
+{
+  const char* dir_start;
+  const char* dir_end;
+  int flags;
+  const char* width_start;
+  const char* width_end;
+  size_t width_arg_index;
+  const char* precision_start;
+  const char* precision_end;
+  size_t precision_arg_index;
+  char conversion; /* d i o u x X f e E g G c s p n U % but not C S */
+  size_t arg_index;
+}
+char_directive;
+
+/* A parsed format string.  */
+typedef struct
+{
+  size_t count;
+  char_directive *dir;
+  size_t max_width_length;
+  size_t max_precision_length;
+}
+char_directives;
+
+
+/* Parses the format string.  Fills in the number N of directives, and fills
+   in directives[0], ..., directives[N-1], and sets directives[N].dir_start
+   to the end of the format string.  Also fills in the arg_type fields of the
+   arguments and the needed count of arguments.  */
+#ifdef STATIC
+STATIC
+#else
+extern
+#endif
+int printf_parse (const char *format, char_directives *d, arguments *a);
+
+#endif /* _PRINTF_PARSE_H */
diff --git a/gnu/usr.bin/texinfo/intl/printf.c b/gnu/usr.bin/texinfo/intl/printf.c
new file mode 100644
index 00000000000..878646c2de5
--- /dev/null
+++ b/gnu/usr.bin/texinfo/intl/printf.c
@@ -0,0 +1,371 @@
+/* Formatted output to strings, using POSIX/XSI format strings with positions.
+   Copyright (C) 2003 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2003.
+
+   This program 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, 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library 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>
+#endif
+
+#ifdef __GNUC__
+# define alloca __builtin_alloca
+# define HAVE_ALLOCA 1
+#else
+# ifdef _MSC_VER
+#  include <malloc.h>
+#  define alloca _alloca
+# else
+#  if defined HAVE_ALLOCA_H || defined _LIBC
+#   include <alloca.h>
+#  else
+#   ifdef _AIX
+ #pragma alloca
+#   else
+#    ifndef alloca
+char *alloca ();
+#    endif
+#   endif
+#  endif
+# endif
+#endif
+
+#include <stdio.h>
+
+#if !HAVE_POSIX_PRINTF
+
+#include <stdlib.h>
+#include <string.h>
+
+/* When building a DLL, we must export some functions.  Note that because
+   the functions are only defined for binary backward compatibility, we
+   don't need to use __declspec(dllimport) in any case.  */
+#if defined _MSC_VER && BUILDING_DLL
+# define DLL_EXPORTED __declspec(dllexport)
+#else
+# define DLL_EXPORTED
+#endif
+
+#define STATIC static
+
+/* Define auxiliary functions declared in "printf-args.h".  */
+#include "printf-args.c"
+
+/* Define auxiliary functions declared in "printf-parse.h".  */
+#include "printf-parse.c"
+
+/* Define functions declared in "vasnprintf.h".  */
+#define vasnprintf libintl_vasnprintf
+#include "vasnprintf.c"
+#if 0 /* not needed */
+#define asnprintf libintl_asnprintf
+#include "asnprintf.c"
+#endif
+
+DLL_EXPORTED
+int
+libintl_vfprintf (FILE *stream, const char *format, va_list args)
+{
+  if (strchr (format, '$') == NULL)
+    return vfprintf (stream, format, args);
+  else
+    {
+      size_t length;
+      char *result = libintl_vasnprintf (NULL, &length, format, args);
+      int retval = -1;
+      if (result != NULL)
+	{
+	  if (fwrite (result, 1, length, stream) == length)
+	    retval = length;
+	  free (result);
+	}
+      return retval;
+    }
+}
+
+DLL_EXPORTED
+int
+libintl_fprintf (FILE *stream, const char *format, ...)
+{
+  va_list args;
+  int retval;
+
+  va_start (args, format);
+  retval = libintl_vfprintf (stream, format, args);
+  va_end (args);
+  return retval;
+}
+
+DLL_EXPORTED
+int
+libintl_vprintf (const char *format, va_list args)
+{
+  return libintl_vfprintf (stdout, format, args);
+}
+
+DLL_EXPORTED
+int
+libintl_printf (const char *format, ...)
+{
+  va_list args;
+  int retval;
+
+  va_start (args, format);
+  retval = libintl_vprintf (format, args);
+  va_end (args);
+  return retval;
+}
+
+DLL_EXPORTED
+int
+libintl_vsprintf (char *resultbuf, const char *format, va_list args)
+{
+  if (strchr (format, '$') == NULL)
+    return vsprintf (resultbuf, format, args);
+  else
+    {
+      size_t length = (size_t) ~0 / (4 * sizeof (char));
+      char *result = libintl_vasnprintf (resultbuf, &length, format, args);
+      if (result != resultbuf)
+	{
+	  free (result);
+	  return -1;
+	}
+      else
+	return length;
+    }
+}
+
+DLL_EXPORTED
+int
+libintl_sprintf (char *resultbuf, const char *format, ...)
+{
+  va_list args;
+  int retval;
+
+  va_start (args, format);
+  retval = libintl_vsprintf (resultbuf, format, args);
+  va_end (args);
+  return retval;
+}
+
+#if HAVE_SNPRINTF
+
+# if HAVE_DECL__SNPRINTF
+   /* Windows.  */
+#  define system_vsnprintf _vsnprintf
+# else
+   /* Unix.  */
+#  define system_vsnprintf vsnprintf
+# endif
+
+DLL_EXPORTED
+int
+libintl_vsnprintf (char *resultbuf, size_t length, const char *format, va_list args)
+{
+  if (strchr (format, '$') == NULL)
+    return system_vsnprintf (resultbuf, length, format, args);
+  else
+    {
+      size_t maxlength = length;
+      char *result = libintl_vasnprintf (resultbuf, &length, format, args);
+      if (result != resultbuf)
+	{
+	  if (maxlength > 0)
+	    {
+	      if (length < maxlength)
+		abort ();
+	      memcpy (resultbuf, result, maxlength - 1);
+	      resultbuf[maxlength - 1] = '\0';
+	    }
+	  free (result);
+	  return -1;
+	}
+      else
+	return length;
+    }
+}
+
+DLL_EXPORTED
+int
+libintl_snprintf (char *resultbuf, size_t length, const char *format, ...)
+{
+  va_list args;
+  int retval;
+
+  va_start (args, format);
+  retval = libintl_vsnprintf (resultbuf, length, format, args);
+  va_end (args);
+  return retval;
+}
+
+#endif
+
+#if HAVE_ASPRINTF
+
+DLL_EXPORTED
+int
+libintl_vasprintf (char **resultp, const char *format, va_list args)
+{
+  size_t length;
+  char *result = libintl_vasnprintf (NULL, &length, format, args);
+  if (result == NULL)
+    return -1;
+  *resultp = result;
+  return length;
+}
+
+DLL_EXPORTED
+int
+libintl_asprintf (char **resultp, const char *format, ...)
+{
+  va_list args;
+  int retval;
+
+  va_start (args, format);
+  retval = libintl_vasprintf (resultp, format, args);
+  va_end (args);
+  return retval;
+}
+
+#endif
+
+#if HAVE_FWPRINTF
+
+#include <wchar.h>
+
+#define WIDE_CHAR_VERSION 1
+
+/* Define auxiliary functions declared in "wprintf-parse.h".  */
+#include "printf-parse.c"
+
+/* Define functions declared in "vasnprintf.h".  */
+#define vasnwprintf libintl_vasnwprintf
+#include "vasnprintf.c"
+#if 0 /* not needed */
+#define asnwprintf libintl_asnwprintf
+#include "asnprintf.c"
+#endif
+
+# if HAVE_DECL__SNWPRINTF
+   /* Windows.  */
+#  define system_vswprintf _vsnwprintf
+# else
+   /* Unix.  */
+#  define system_vswprintf vswprintf
+# endif
+
+DLL_EXPORTED
+int
+libintl_vfwprintf (FILE *stream, const wchar_t *format, va_list args)
+{
+  if (wcschr (format, '$') == NULL)
+    return vfwprintf (stream, format, args);
+  else
+    {
+      size_t length;
+      wchar_t *result = libintl_vasnwprintf (NULL, &length, format, args);
+      int retval = -1;
+      if (result != NULL)
+	{
+	  size_t i;
+	  for (i = 0; i < length; i++)
+	    if (fputwc (result[i], stream) == WEOF)
+	      break;
+	  if (i == length)
+	    retval = length;
+	  free (result);
+	}
+      return retval;
+    }
+}
+
+DLL_EXPORTED
+int
+libintl_fwprintf (FILE *stream, const wchar_t *format, ...)
+{
+  va_list args;
+  int retval;
+
+  va_start (args, format);
+  retval = libintl_vfwprintf (stream, format, args);
+  va_end (args);
+  return retval;
+}
+
+DLL_EXPORTED
+int
+libintl_vwprintf (const wchar_t *format, va_list args)
+{
+  return libintl_vfwprintf (stdout, format, args);
+}
+
+DLL_EXPORTED
+int
+libintl_wprintf (const wchar_t *format, ...)
+{
+  va_list args;
+  int retval;
+
+  va_start (args, format);
+  retval = libintl_vwprintf (format, args);
+  va_end (args);
+  return retval;
+}
+
+DLL_EXPORTED
+int
+libintl_vswprintf (wchar_t *resultbuf, size_t length, const wchar_t *format, va_list args)
+{
+  if (wcschr (format, '$') == NULL)
+    return system_vswprintf (resultbuf, length, format, args);
+  else
+    {
+      size_t maxlength = length;
+      wchar_t *result = libintl_vasnwprintf (resultbuf, &length, format, args);
+      if (result != resultbuf)
+	{
+	  if (maxlength > 0)
+	    {
+	      if (length < maxlength)
+		abort ();
+	      memcpy (resultbuf, result, (maxlength - 1) * sizeof (wchar_t));
+	      resultbuf[maxlength - 1] = 0;
+	    }
+	  free (result);
+	  return -1;
+	}
+      else
+	return length;
+    }
+}
+
+DLL_EXPORTED
+int
+libintl_swprintf (wchar_t *resultbuf, size_t length, const wchar_t *format, ...)
+{
+  va_list args;
+  int retval;
+
+  va_start (args, format);
+  retval = libintl_vswprintf (resultbuf, length, format, args);
+  va_end (args);
+  return retval;
+}
+
+#endif
+
+#endif
diff --git a/gnu/usr.bin/texinfo/intl/relocatable.c b/gnu/usr.bin/texinfo/intl/relocatable.c
new file mode 100644
index 00000000000..bf7c7085485
--- /dev/null
+++ b/gnu/usr.bin/texinfo/intl/relocatable.c
@@ -0,0 +1,449 @@
+/* Provide relocatable packages.
+   Copyright (C) 2003 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2003.
+
+   This program 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, 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library 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.  */
+
+
+/* Tell glibc's <stdio.h> to provide a prototype for getline().
+   This must come before <config.h> because <config.h> may include
+   <features.h>, and once <features.h> has been included, it's too late.  */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE	1
+#endif
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+/* Specification.  */
+#include "relocatable.h"
+
+#if ENABLE_RELOCATABLE
+
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef NO_XMALLOC
+# define xmalloc malloc
+#else
+# include "xalloc.h"
+#endif
+
+#if defined _WIN32 || defined __WIN32__
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+#endif
+
+#if DEPENDS_ON_LIBCHARSET
+# include <libcharset.h>
+#endif
+#if DEPENDS_ON_LIBICONV && HAVE_ICONV
+# include <iconv.h>
+#endif
+#if DEPENDS_ON_LIBINTL && ENABLE_NLS
+# include <libintl.h>
+#endif
+
+/* Faked cheap 'bool'.  */
+#undef bool
+#undef false
+#undef true
+#define bool int
+#define false 0
+#define true 1
+
+/* Pathname support.
+   ISSLASH(C)           tests whether C is a directory separator character.
+   IS_PATH_WITH_DIR(P)  tests whether P contains a directory specification.
+ */
+#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
+  /* Win32, OS/2, DOS */
+# define ISSLASH(C) ((C) == '/' || (C) == '\\')
+# define HAS_DEVICE(P) \
+    ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
+     && (P)[1] == ':')
+# define IS_PATH_WITH_DIR(P) \
+    (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P))
+# define FILESYSTEM_PREFIX_LEN(P) (HAS_DEVICE (P) ? 2 : 0)
+#else
+  /* Unix */
+# define ISSLASH(C) ((C) == '/')
+# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
+# define FILESYSTEM_PREFIX_LEN(P) 0
+#endif
+
+/* Original installation prefix.  */
+static char *orig_prefix;
+static size_t orig_prefix_len;
+/* Current installation prefix.  */
+static char *curr_prefix;
+static size_t curr_prefix_len;
+/* These prefixes do not end in a slash.  Anything that will be concatenated
+   to them must start with a slash.  */
+
+/* Sets the original and the current installation prefix of this module.
+   Relocation simply replaces a pathname starting with the original prefix
+   by the corresponding pathname with the current prefix instead.  Both
+   prefixes should be directory names without trailing slash (i.e. use ""
+   instead of "/").  */
+static void
+set_this_relocation_prefix (const char *orig_prefix_arg,
+			    const char *curr_prefix_arg)
+{
+  if (orig_prefix_arg != NULL && curr_prefix_arg != NULL
+      /* Optimization: if orig_prefix and curr_prefix are equal, the
+	 relocation is a nop.  */
+      && strcmp (orig_prefix_arg, curr_prefix_arg) != 0)
+    {
+      /* Duplicate the argument strings.  */
+      char *memory;
+
+      orig_prefix_len = strlen (orig_prefix_arg);
+      curr_prefix_len = strlen (curr_prefix_arg);
+      memory = (char *) xmalloc (orig_prefix_len + 1 + curr_prefix_len + 1);
+#ifdef NO_XMALLOC
+      if (memory != NULL)
+#endif
+	{
+	  memcpy (memory, orig_prefix_arg, orig_prefix_len + 1);
+	  orig_prefix = memory;
+	  memory += orig_prefix_len + 1;
+	  memcpy (memory, curr_prefix_arg, curr_prefix_len + 1);
+	  curr_prefix = memory;
+	  return;
+	}
+    }
+  orig_prefix = NULL;
+  curr_prefix = NULL;
+  /* Don't worry about wasted memory here - this function is usually only
+     called once.  */
+}
+
+/* Sets the original and the current installation prefix of the package.
+   Relocation simply replaces a pathname starting with the original prefix
+   by the corresponding pathname with the current prefix instead.  Both
+   prefixes should be directory names without trailing slash (i.e. use ""
+   instead of "/").  */
+void
+set_relocation_prefix (const char *orig_prefix_arg, const char *curr_prefix_arg)
+{
+  set_this_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
+
+  /* Now notify all dependent libraries.  */
+#if DEPENDS_ON_LIBCHARSET
+  libcharset_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
+#endif
+#if DEPENDS_ON_LIBICONV && HAVE_ICONV && _LIBICONV_VERSION >= 0x0109
+  libiconv_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
+#endif
+#if DEPENDS_ON_LIBINTL && ENABLE_NLS && defined libintl_set_relocation_prefix
+  libintl_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
+#endif
+}
+
+#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR)
+
+/* Convenience function:
+   Computes the current installation prefix, based on the original
+   installation prefix, the original installation directory of a particular
+   file, and the current pathname of this file.  Returns NULL upon failure.  */
+#ifdef IN_LIBRARY
+#define compute_curr_prefix local_compute_curr_prefix
+static
+#endif
+const char *
+compute_curr_prefix (const char *orig_installprefix,
+		     const char *orig_installdir,
+		     const char *curr_pathname)
+{
+  const char *curr_installdir;
+  const char *rel_installdir;
+
+  if (curr_pathname == NULL)
+    return NULL;
+
+  /* Determine the relative installation directory, relative to the prefix.
+     This is simply the difference between orig_installprefix and
+     orig_installdir.  */
+  if (strncmp (orig_installprefix, orig_installdir, strlen (orig_installprefix))
+      != 0)
+    /* Shouldn't happen - nothing should be installed outside $(prefix).  */
+    return NULL;
+  rel_installdir = orig_installdir + strlen (orig_installprefix);
+
+  /* Determine the current installation directory.  */
+  {
+    const char *p_base = curr_pathname + FILESYSTEM_PREFIX_LEN (curr_pathname);
+    const char *p = curr_pathname + strlen (curr_pathname);
+    char *q;
+
+    while (p > p_base)
+      {
+	p--;
+	if (ISSLASH (*p))
+	  break;
+      }
+
+    q = (char *) xmalloc (p - curr_pathname + 1);
+#ifdef NO_XMALLOC
+    if (q == NULL)
+      return NULL;
+#endif
+    memcpy (q, curr_pathname, p - curr_pathname);
+    q[p - curr_pathname] = '\0';
+    curr_installdir = q;
+  }
+
+  /* Compute the current installation prefix by removing the trailing
+     rel_installdir from it.  */
+  {
+    const char *rp = rel_installdir + strlen (rel_installdir);
+    const char *cp = curr_installdir + strlen (curr_installdir);
+    const char *cp_base =
+      curr_installdir + FILESYSTEM_PREFIX_LEN (curr_installdir);
+
+    while (rp > rel_installdir && cp > cp_base)
+      {
+	bool same = false;
+	const char *rpi = rp;
+	const char *cpi = cp;
+
+	while (rpi > rel_installdir && cpi > cp_base)
+	  {
+	    rpi--;
+	    cpi--;
+	    if (ISSLASH (*rpi) || ISSLASH (*cpi))
+	      {
+		if (ISSLASH (*rpi) && ISSLASH (*cpi))
+		  same = true;
+		break;
+	      }
+#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
+	    /* Win32, OS/2, DOS - case insignificant filesystem */
+	    if ((*rpi >= 'a' && *rpi <= 'z' ? *rpi - 'a' + 'A' : *rpi)
+		!= (*cpi >= 'a' && *cpi <= 'z' ? *cpi - 'a' + 'A' : *cpi))
+	      break;
+#else
+	    if (*rpi != *cpi)
+	      break;
+#endif
+	  }
+	if (!same)
+	  break;
+	/* The last pathname component was the same.  opi and cpi now point
+	   to the slash before it.  */
+	rp = rpi;
+	cp = cpi;
+      }
+
+    if (rp > rel_installdir)
+      /* Unexpected: The curr_installdir does not end with rel_installdir.  */
+      return NULL;
+
+    {
+      size_t curr_prefix_len = cp - curr_installdir;
+      char *curr_prefix;
+
+      curr_prefix = (char *) xmalloc (curr_prefix_len + 1);
+#ifdef NO_XMALLOC
+      if (curr_prefix == NULL)
+	return NULL;
+#endif
+      memcpy (curr_prefix, curr_installdir, curr_prefix_len);
+      curr_prefix[curr_prefix_len] = '\0';
+
+      return curr_prefix;
+    }
+  }
+}
+
+#endif /* !IN_LIBRARY || PIC */
+
+#if defined PIC && defined INSTALLDIR
+
+/* Full pathname of shared library, or NULL.  */
+static char *shared_library_fullname;
+
+#if defined _WIN32 || defined __WIN32__
+
+/* Determine the full pathname of the shared library when it is loaded.  */
+
+BOOL WINAPI
+DllMain (HINSTANCE module_handle, DWORD event, LPVOID reserved)
+{
+  (void) reserved;
+
+  if (event == DLL_PROCESS_ATTACH)
+    {
+      /* The DLL is being loaded into an application's address range.  */
+      static char location[MAX_PATH];
+
+      if (!GetModuleFileName (module_handle, location, sizeof (location)))
+	/* Shouldn't happen.  */
+	return FALSE;
+
+      if (!IS_PATH_WITH_DIR (location))
+	/* Shouldn't happen.  */
+	return FALSE;
+
+      shared_library_fullname = strdup (location);
+    }
+
+  return TRUE;
+}
+
+#else /* Unix */
+
+static void
+find_shared_library_fullname ()
+{
+#if defined __linux__ && __GLIBC__ >= 2
+  /* Linux has /proc/self/maps. glibc 2 has the getline() function.  */
+  FILE *fp;
+
+  /* Open the current process' maps file.  It describes one VMA per line.  */
+  fp = fopen ("/proc/self/maps", "r");
+  if (fp)
+    {
+      unsigned long address = (unsigned long) &find_shared_library_fullname;
+      for (;;)
+	{
+	  unsigned long start, end;
+	  int c;
+
+	  if (fscanf (fp, "%lx-%lx", &start, &end) != 2)
+	    break;
+	  if (address >= start && address <= end - 1)
+	    {
+	      /* Found it.  Now see if this line contains a filename.  */
+	      while (c = getc (fp), c != EOF && c != '\n' && c != '/')
+		continue;
+	      if (c == '/')
+		{
+		  size_t size;
+		  int len;
+
+		  ungetc (c, fp);
+		  shared_library_fullname = NULL; size = 0;
+		  len = getline (&shared_library_fullname, &size, fp);
+		  if (len >= 0)
+		    {
+		      /* Success: filled shared_library_fullname.  */
+		      if (len > 0 && shared_library_fullname[len - 1] == '\n')
+			shared_library_fullname[len - 1] = '\0';
+		    }
+		}
+	      break;
+	    }
+	  while (c = getc (fp), c != EOF && c != '\n')
+	    continue;
+	}
+      fclose (fp);
+    }
+#endif
+}
+
+#endif /* WIN32 / Unix */
+
+/* Return the full pathname of the current shared library.
+   Return NULL if unknown.
+   Guaranteed to work only on Linux and Woe32.  */
+static char *
+get_shared_library_fullname ()
+{
+#if !(defined _WIN32 || defined __WIN32__)
+  static bool tried_find_shared_library_fullname;
+  if (!tried_find_shared_library_fullname)
+    {
+      find_shared_library_fullname ();
+      tried_find_shared_library_fullname = true;
+    }
+#endif
+  return shared_library_fullname;
+}
+
+#endif /* PIC */
+
+/* Returns the pathname, relocated according to the current installation
+   directory.  */
+const char *
+relocate (const char *pathname)
+{
+#if defined PIC && defined INSTALLDIR
+  static int initialized;
+
+  /* Initialization code for a shared library.  */
+  if (!initialized)
+    {
+      /* At this point, orig_prefix and curr_prefix likely have already been
+	 set through the main program's set_program_name_and_installdir
+	 function.  This is sufficient in the case that the library has
+	 initially been installed in the same orig_prefix.  But we can do
+	 better, to also cover the cases that 1. it has been installed
+	 in a different prefix before being moved to orig_prefix and (later)
+	 to curr_prefix, 2. unlike the program, it has not moved away from
+	 orig_prefix.  */
+      const char *orig_installprefix = INSTALLPREFIX;
+      const char *orig_installdir = INSTALLDIR;
+      const char *curr_prefix_better;
+
+      curr_prefix_better =
+	compute_curr_prefix (orig_installprefix, orig_installdir,
+			     get_shared_library_fullname ());
+      if (curr_prefix_better == NULL)
+	curr_prefix_better = curr_prefix;
+
+      set_relocation_prefix (orig_installprefix, curr_prefix_better);
+
+      initialized = 1;
+    }
+#endif
+
+  /* Note: It is not necessary to perform case insensitive comparison here,
+     even for DOS-like filesystems, because the pathname argument was
+     typically created from the same Makefile variable as orig_prefix came
+     from.  */
+  if (orig_prefix != NULL && curr_prefix != NULL
+      && strncmp (pathname, orig_prefix, orig_prefix_len) == 0)
+    {
+      if (pathname[orig_prefix_len] == '\0')
+	/* pathname equals orig_prefix.  */
+	return curr_prefix;
+      if (ISSLASH (pathname[orig_prefix_len]))
+	{
+	  /* pathname starts with orig_prefix.  */
+	  const char *pathname_tail = &pathname[orig_prefix_len];
+	  char *result =
+	    (char *) xmalloc (curr_prefix_len + strlen (pathname_tail) + 1);
+
+#ifdef NO_XMALLOC
+	  if (result != NULL)
+#endif
+	    {
+	      memcpy (result, curr_prefix, curr_prefix_len);
+	      strcpy (result + curr_prefix_len, pathname_tail);
+	      return result;
+	    }
+	}
+    }
+  /* Nothing to relocate.  */
+  return pathname;
+}
+
+#endif
diff --git a/gnu/usr.bin/texinfo/intl/relocatable.h b/gnu/usr.bin/texinfo/intl/relocatable.h
new file mode 100644
index 00000000000..48c5b71e215
--- /dev/null
+++ b/gnu/usr.bin/texinfo/intl/relocatable.h
@@ -0,0 +1,77 @@
+/* Provide relocatable packages.
+   Copyright (C) 2003 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2003.
+
+   This program 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, 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library 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 _RELOCATABLE_H
+#define _RELOCATABLE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* This can be enabled through the configure --enable-relocatable option.  */
+#if ENABLE_RELOCATABLE
+
+/* When building a DLL, we must export some functions.  Note that because
+   this is a private .h file, we don't need to use __declspec(dllimport)
+   in any case.  */
+#if defined _MSC_VER && BUILDING_DLL
+# define RELOCATABLE_DLL_EXPORTED __declspec(dllexport)
+#else
+# define RELOCATABLE_DLL_EXPORTED
+#endif
+
+/* Sets the original and the current installation prefix of the package.
+   Relocation simply replaces a pathname starting with the original prefix
+   by the corresponding pathname with the current prefix instead.  Both
+   prefixes should be directory names without trailing slash (i.e. use ""
+   instead of "/").  */
+extern RELOCATABLE_DLL_EXPORTED void
+       set_relocation_prefix (const char *orig_prefix,
+			      const char *curr_prefix);
+
+/* Returns the pathname, relocated according to the current installation
+   directory.  */
+extern const char * relocate (const char *pathname);
+
+/* Memory management: relocate() leaks memory, because it has to construct
+   a fresh pathname.  If this is a problem because your program calls
+   relocate() frequently, think about caching the result.  */
+
+/* Convenience function:
+   Computes the current installation prefix, based on the original
+   installation prefix, the original installation directory of a particular
+   file, and the current pathname of this file.  Returns NULL upon failure.  */
+extern const char * compute_curr_prefix (const char *orig_installprefix,
+					 const char *orig_installdir,
+					 const char *curr_pathname);
+
+#else
+
+/* By default, we use the hardwired pathnames.  */
+#define relocate(pathname) (pathname)
+
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RELOCATABLE_H */
diff --git a/gnu/usr.bin/texinfo/intl/textdomain.c b/gnu/usr.bin/texinfo/intl/textdomain.c
index 2e420ad7729..8745a8435e1 100644
--- a/gnu/usr.bin/texinfo/intl/textdomain.c
+++ b/gnu/usr.bin/texinfo/intl/textdomain.c
@@ -1,5 +1,5 @@
 /* Implementation of the textdomain(3) function.
-   Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -44,17 +44,17 @@
    names than the internal variables in GNU libc, otherwise programs
    using libintl.a cannot be linked statically.  */
 #if !defined _LIBC
-# define _nl_default_default_domain _nl_default_default_domain__
-# define _nl_current_default_domain _nl_current_default_domain__
+# define _nl_default_default_domain libintl_nl_default_default_domain
+# define _nl_current_default_domain libintl_nl_current_default_domain
 #endif
 
 /* @@ end of prolog @@ */
 
 /* Name of the default text domain.  */
-extern const char _nl_default_default_domain[];
+extern const char _nl_default_default_domain[] attribute_hidden;
 
 /* Default text domain in which entries for gettext(3) are to be found.  */
-extern const char *_nl_current_default_domain;
+extern const char *_nl_current_default_domain attribute_hidden;
 
 
 /* Names for the libintl functions are a problem.  They must not clash
@@ -67,18 +67,17 @@ extern const char *_nl_current_default_domain;
 #  define strdup(str) __strdup (str)
 # endif
 #else
-# define TEXTDOMAIN textdomain__
+# define TEXTDOMAIN libintl_textdomain
 #endif
 
 /* Lock variable to protect the global data in the gettext implementation.  */
-__libc_rwlock_define (extern, _nl_state_lock)
+__libc_rwlock_define (extern, _nl_state_lock attribute_hidden)
 
 /* Set the current default message catalog to DOMAINNAME.
    If DOMAINNAME is null, return the current default.
    If DOMAINNAME is "", reset to the default of "messages".  */
 char *
-TEXTDOMAIN (domainname)
-     const char *domainname;
+TEXTDOMAIN (const char *domainname)
 {
   char *new_domain;
   char *old_domain;
diff --git a/gnu/usr.bin/texinfo/intl/vasnprintf.c b/gnu/usr.bin/texinfo/intl/vasnprintf.c
new file mode 100644
index 00000000000..8a62282d73e
--- /dev/null
+++ b/gnu/usr.bin/texinfo/intl/vasnprintf.c
@@ -0,0 +1,887 @@
+/* vsprintf with automatic memory allocation.
+   Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
+
+   This program 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, 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library 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.  */
+
+/* Tell glibc's <stdio.h> to provide a prototype for snprintf().
+   This must come before <config.h> because <config.h> may include
+   <features.h>, and once <features.h> has been included, it's too late.  */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE    1
+#endif
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+#ifndef IN_LIBINTL
+# include <alloca.h>
+#endif
+
+/* Specification.  */
+#if WIDE_CHAR_VERSION
+# include "vasnwprintf.h"
+#else
+# include "vasnprintf.h"
+#endif
+
+#include <stdio.h>	/* snprintf(), sprintf() */
+#include <stdlib.h>	/* abort(), malloc(), realloc(), free() */
+#include <string.h>	/* memcpy(), strlen() */
+#include <errno.h>	/* errno */
+#include <limits.h>	/* CHAR_BIT */
+#include <float.h>	/* DBL_MAX_EXP, LDBL_MAX_EXP */
+#if WIDE_CHAR_VERSION
+# include "wprintf-parse.h"
+#else
+# include "printf-parse.h"
+#endif
+
+/* Checked size_t computations.  */
+#include "xsize.h"
+
+#ifdef HAVE_WCHAR_T
+# ifdef HAVE_WCSLEN
+#  define local_wcslen wcslen
+# else
+   /* Solaris 2.5.1 has wcslen() in a separate library libw.so. To avoid
+      a dependency towards this library, here is a local substitute.
+      Define this substitute only once, even if this file is included
+      twice in the same compilation unit.  */
+#  ifndef local_wcslen_defined
+#   define local_wcslen_defined 1
+static size_t
+local_wcslen (const wchar_t *s)
+{
+  const wchar_t *ptr;
+
+  for (ptr = s; *ptr != (wchar_t) 0; ptr++)
+    ;
+  return ptr - s;
+}
+#  endif
+# endif
+#endif
+
+#if WIDE_CHAR_VERSION
+# define VASNPRINTF vasnwprintf
+# define CHAR_T wchar_t
+# define DIRECTIVE wchar_t_directive
+# define DIRECTIVES wchar_t_directives
+# define PRINTF_PARSE wprintf_parse
+# define USE_SNPRINTF 1
+# if HAVE_DECL__SNWPRINTF
+   /* On Windows, the function swprintf() has a different signature than
+      on Unix; we use the _snwprintf() function instead.  */
+#  define SNPRINTF _snwprintf
+# else
+   /* Unix.  */
+#  define SNPRINTF swprintf
+# endif
+#else
+# define VASNPRINTF vasnprintf
+# define CHAR_T char
+# define DIRECTIVE char_directive
+# define DIRECTIVES char_directives
+# define PRINTF_PARSE printf_parse
+# define USE_SNPRINTF (HAVE_DECL__SNPRINTF || HAVE_SNPRINTF)
+# if HAVE_DECL__SNPRINTF
+   /* Windows.  */
+#  define SNPRINTF _snprintf
+# else
+   /* Unix.  */
+#  define SNPRINTF snprintf
+# endif
+#endif
+
+CHAR_T *
+VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list args)
+{
+  DIRECTIVES d;
+  arguments a;
+
+  if (PRINTF_PARSE (format, &d, &a) < 0)
+    {
+      errno = EINVAL;
+      return NULL;
+    }
+
+#define CLEANUP() \
+  free (d.dir);								\
+  if (a.arg)								\
+    free (a.arg);
+
+  if (printf_fetchargs (args, &a) < 0)
+    {
+      CLEANUP ();
+      errno = EINVAL;
+      return NULL;
+    }
+
+  {
+    size_t buf_neededlength;
+    CHAR_T *buf;
+    CHAR_T *buf_malloced;
+    const CHAR_T *cp;
+    size_t i;
+    DIRECTIVE *dp;
+    /* Output string accumulator.  */
+    CHAR_T *result;
+    size_t allocated;
+    size_t length;
+
+    /* Allocate a small buffer that will hold a directive passed to
+       sprintf or snprintf.  */
+    buf_neededlength =
+      xsum4 (7, d.max_width_length, d.max_precision_length, 6);
+#if HAVE_ALLOCA
+    if (buf_neededlength < 4000 / sizeof (CHAR_T))
+      {
+	buf = (CHAR_T *) alloca (buf_neededlength * sizeof (CHAR_T));
+	buf_malloced = NULL;
+      }
+    else
+#endif
+      {
+	size_t buf_memsize = xtimes (buf_neededlength, sizeof (CHAR_T));
+	if (size_overflow_p (buf_memsize))
+	  goto out_of_memory_1;
+	buf = (CHAR_T *) malloc (buf_memsize);
+	if (buf == NULL)
+	  goto out_of_memory_1;
+	buf_malloced = buf;
+      }
+
+    if (resultbuf != NULL)
+      {
+	result = resultbuf;
+	allocated = *lengthp;
+      }
+    else
+      {
+	result = NULL;
+	allocated = 0;
+      }
+    length = 0;
+    /* Invariants:
+       result is either == resultbuf or == NULL or malloc-allocated.
+       If length > 0, then result != NULL.  */
+
+    /* Ensures that allocated >= needed.  Aborts through a jump to
+       out_of_memory if needed is SIZE_MAX or otherwise too big.  */
+#define ENSURE_ALLOCATION(needed) \
+    if ((needed) > allocated)						     \
+      {									     \
+	size_t memory_size;						     \
+	CHAR_T *memory;							     \
+									     \
+	allocated = (allocated > 0 ? xtimes (allocated, 2) : 12);	     \
+	if ((needed) > allocated)					     \
+	  allocated = (needed);						     \
+	memory_size = xtimes (allocated, sizeof (CHAR_T));		     \
+	if (size_overflow_p (memory_size))				     \
+	  goto out_of_memory;						     \
+	if (result == resultbuf || result == NULL)			     \
+	  memory = (CHAR_T *) malloc (memory_size);			     \
+	else								     \
+	  memory = (CHAR_T *) realloc (result, memory_size);		     \
+	if (memory == NULL)						     \
+	  goto out_of_memory;						     \
+	if (result == resultbuf && length > 0)				     \
+	  memcpy (memory, result, length * sizeof (CHAR_T));		     \
+	result = memory;						     \
+      }
+
+    for (cp = format, i = 0, dp = &d.dir[0]; ; cp = dp->dir_end, i++, dp++)
+      {
+	if (cp != dp->dir_start)
+	  {
+	    size_t n = dp->dir_start - cp;
+	    size_t augmented_length = xsum (length, n);
+
+	    ENSURE_ALLOCATION (augmented_length);
+	    memcpy (result + length, cp, n * sizeof (CHAR_T));
+	    length = augmented_length;
+	  }
+	if (i == d.count)
+	  break;
+
+	/* Execute a single directive.  */
+	if (dp->conversion == '%')
+	  {
+	    size_t augmented_length;
+
+	    if (!(dp->arg_index == ARG_NONE))
+	      abort ();
+	    augmented_length = xsum (length, 1);
+	    ENSURE_ALLOCATION (augmented_length);
+	    result[length] = '%';
+	    length = augmented_length;
+	  }
+	else
+	  {
+	    if (!(dp->arg_index != ARG_NONE))
+	      abort ();
+
+	    if (dp->conversion == 'n')
+	      {
+		switch (a.arg[dp->arg_index].type)
+		  {
+		  case TYPE_COUNT_SCHAR_POINTER:
+		    *a.arg[dp->arg_index].a.a_count_schar_pointer = length;
+		    break;
+		  case TYPE_COUNT_SHORT_POINTER:
+		    *a.arg[dp->arg_index].a.a_count_short_pointer = length;
+		    break;
+		  case TYPE_COUNT_INT_POINTER:
+		    *a.arg[dp->arg_index].a.a_count_int_pointer = length;
+		    break;
+		  case TYPE_COUNT_LONGINT_POINTER:
+		    *a.arg[dp->arg_index].a.a_count_longint_pointer = length;
+		    break;
+#ifdef HAVE_LONG_LONG
+		  case TYPE_COUNT_LONGLONGINT_POINTER:
+		    *a.arg[dp->arg_index].a.a_count_longlongint_pointer = length;
+		    break;
+#endif
+		  default:
+		    abort ();
+		  }
+	      }
+	    else
+	      {
+		arg_type type = a.arg[dp->arg_index].type;
+		CHAR_T *p;
+		unsigned int prefix_count;
+		int prefixes[2];
+#if !USE_SNPRINTF
+		size_t tmp_length;
+		CHAR_T tmpbuf[700];
+		CHAR_T *tmp;
+
+		/* Allocate a temporary buffer of sufficient size for calling
+		   sprintf.  */
+		{
+		  size_t width;
+		  size_t precision;
+
+		  width = 0;
+		  if (dp->width_start != dp->width_end)
+		    {
+		      if (dp->width_arg_index != ARG_NONE)
+			{
+			  int arg;
+
+			  if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
+			    abort ();
+			  arg = a.arg[dp->width_arg_index].a.a_int;
+			  width = (arg < 0 ? (unsigned int) (-arg) : arg);
+			}
+		      else
+			{
+			  const CHAR_T *digitp = dp->width_start;
+
+			  do
+			    width = xsum (xtimes (width, 10), *digitp++ - '0');
+			  while (digitp != dp->width_end);
+			}
+		    }
+
+		  precision = 6;
+		  if (dp->precision_start != dp->precision_end)
+		    {
+		      if (dp->precision_arg_index != ARG_NONE)
+			{
+			  int arg;
+
+			  if (!(a.arg[dp->precision_arg_index].type == TYPE_INT))
+			    abort ();
+			  arg = a.arg[dp->precision_arg_index].a.a_int;
+			  precision = (arg < 0 ? 0 : arg);
+			}
+		      else
+			{
+			  const CHAR_T *digitp = dp->precision_start + 1;
+
+			  precision = 0;
+			  do
+			    precision = xsum (xtimes (precision, 10), *digitp++ - '0');
+			  while (digitp != dp->precision_end);
+			}
+		    }
+
+		  switch (dp->conversion)
+		    {
+
+		    case 'd': case 'i': case 'u':
+# ifdef HAVE_LONG_LONG
+		      if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
+			tmp_length =
+			  (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
+					  * 0.30103 /* binary -> decimal */
+					  * 2 /* estimate for FLAG_GROUP */
+					 )
+			  + 1 /* turn floor into ceil */
+			  + 1; /* account for leading sign */
+		      else
+# endif
+		      if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
+			tmp_length =
+			  (unsigned int) (sizeof (unsigned long) * CHAR_BIT
+					  * 0.30103 /* binary -> decimal */
+					  * 2 /* estimate for FLAG_GROUP */
+					 )
+			  + 1 /* turn floor into ceil */
+			  + 1; /* account for leading sign */
+		      else
+			tmp_length =
+			  (unsigned int) (sizeof (unsigned int) * CHAR_BIT
+					  * 0.30103 /* binary -> decimal */
+					  * 2 /* estimate for FLAG_GROUP */
+					 )
+			  + 1 /* turn floor into ceil */
+			  + 1; /* account for leading sign */
+		      break;
+
+		    case 'o':
+# ifdef HAVE_LONG_LONG
+		      if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
+			tmp_length =
+			  (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
+					  * 0.333334 /* binary -> octal */
+					 )
+			  + 1 /* turn floor into ceil */
+			  + 1; /* account for leading sign */
+		      else
+# endif
+		      if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
+			tmp_length =
+			  (unsigned int) (sizeof (unsigned long) * CHAR_BIT
+					  * 0.333334 /* binary -> octal */
+					 )
+			  + 1 /* turn floor into ceil */
+			  + 1; /* account for leading sign */
+		      else
+			tmp_length =
+			  (unsigned int) (sizeof (unsigned int) * CHAR_BIT
+					  * 0.333334 /* binary -> octal */
+					 )
+			  + 1 /* turn floor into ceil */
+			  + 1; /* account for leading sign */
+		      break;
+
+		    case 'x': case 'X':
+# ifdef HAVE_LONG_LONG
+		      if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
+			tmp_length =
+			  (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
+					  * 0.25 /* binary -> hexadecimal */
+					 )
+			  + 1 /* turn floor into ceil */
+			  + 2; /* account for leading sign or alternate form */
+		      else
+# endif
+		      if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
+			tmp_length =
+			  (unsigned int) (sizeof (unsigned long) * CHAR_BIT
+					  * 0.25 /* binary -> hexadecimal */
+					 )
+			  + 1 /* turn floor into ceil */
+			  + 2; /* account for leading sign or alternate form */
+		      else
+			tmp_length =
+			  (unsigned int) (sizeof (unsigned int) * CHAR_BIT
+					  * 0.25 /* binary -> hexadecimal */
+					 )
+			  + 1 /* turn floor into ceil */
+			  + 2; /* account for leading sign or alternate form */
+		      break;
+
+		    case 'f': case 'F':
+# ifdef HAVE_LONG_DOUBLE
+		      if (type == TYPE_LONGDOUBLE)
+			tmp_length =
+			  (unsigned int) (LDBL_MAX_EXP
+					  * 0.30103 /* binary -> decimal */
+					  * 2 /* estimate for FLAG_GROUP */
+					 )
+			  + 1 /* turn floor into ceil */
+			  + 10; /* sign, decimal point etc. */
+		      else
+# endif
+			tmp_length =
+			  (unsigned int) (DBL_MAX_EXP
+					  * 0.30103 /* binary -> decimal */
+					  * 2 /* estimate for FLAG_GROUP */
+					 )
+			  + 1 /* turn floor into ceil */
+			  + 10; /* sign, decimal point etc. */
+		      tmp_length = xsum (tmp_length, precision);
+		      break;
+
+		    case 'e': case 'E': case 'g': case 'G':
+		    case 'a': case 'A':
+		      tmp_length =
+			12; /* sign, decimal point, exponent etc. */
+		      tmp_length = xsum (tmp_length, precision);
+		      break;
+
+		    case 'c':
+# if defined HAVE_WINT_T && !WIDE_CHAR_VERSION
+		      if (type == TYPE_WIDE_CHAR)
+			tmp_length = MB_CUR_MAX;
+		      else
+# endif
+			tmp_length = 1;
+		      break;
+
+		    case 's':
+# ifdef HAVE_WCHAR_T
+		      if (type == TYPE_WIDE_STRING)
+			{
+			  tmp_length =
+			    local_wcslen (a.arg[dp->arg_index].a.a_wide_string);
+
+#  if !WIDE_CHAR_VERSION
+			  tmp_length = xtimes (tmp_length, MB_CUR_MAX);
+#  endif
+			}
+		      else
+# endif
+			tmp_length = strlen (a.arg[dp->arg_index].a.a_string);
+		      break;
+
+		    case 'p':
+		      tmp_length =
+			(unsigned int) (sizeof (void *) * CHAR_BIT
+					* 0.25 /* binary -> hexadecimal */
+				       )
+			  + 1 /* turn floor into ceil */
+			  + 2; /* account for leading 0x */
+		      break;
+
+		    default:
+		      abort ();
+		    }
+
+		  if (tmp_length < width)
+		    tmp_length = width;
+
+		  tmp_length = xsum (tmp_length, 1); /* account for trailing NUL */
+		}
+
+		if (tmp_length <= sizeof (tmpbuf) / sizeof (CHAR_T))
+		  tmp = tmpbuf;
+		else
+		  {
+		    size_t tmp_memsize = xtimes (tmp_length, sizeof (CHAR_T));
+
+		    if (size_overflow_p (tmp_memsize))
+		      /* Overflow, would lead to out of memory.  */
+		      goto out_of_memory;
+		    tmp = (CHAR_T *) malloc (tmp_memsize);
+		    if (tmp == NULL)
+		      /* Out of memory.  */
+		      goto out_of_memory;
+		  }
+#endif
+
+		/* Construct the format string for calling snprintf or
+		   sprintf.  */
+		p = buf;
+		*p++ = '%';
+		if (dp->flags & FLAG_GROUP)
+		  *p++ = '\'';
+		if (dp->flags & FLAG_LEFT)
+		  *p++ = '-';
+		if (dp->flags & FLAG_SHOWSIGN)
+		  *p++ = '+';
+		if (dp->flags & FLAG_SPACE)
+		  *p++ = ' ';
+		if (dp->flags & FLAG_ALT)
+		  *p++ = '#';
+		if (dp->flags & FLAG_ZERO)
+		  *p++ = '0';
+		if (dp->width_start != dp->width_end)
+		  {
+		    size_t n = dp->width_end - dp->width_start;
+		    memcpy (p, dp->width_start, n * sizeof (CHAR_T));
+		    p += n;
+		  }
+		if (dp->precision_start != dp->precision_end)
+		  {
+		    size_t n = dp->precision_end - dp->precision_start;
+		    memcpy (p, dp->precision_start, n * sizeof (CHAR_T));
+		    p += n;
+		  }
+
+		switch (type)
+		  {
+#ifdef HAVE_LONG_LONG
+		  case TYPE_LONGLONGINT:
+		  case TYPE_ULONGLONGINT:
+		    *p++ = 'l';
+		    /*FALLTHROUGH*/
+#endif
+		  case TYPE_LONGINT:
+		  case TYPE_ULONGINT:
+#ifdef HAVE_WINT_T
+		  case TYPE_WIDE_CHAR:
+#endif
+#ifdef HAVE_WCHAR_T
+		  case TYPE_WIDE_STRING:
+#endif
+		    *p++ = 'l';
+		    break;
+#ifdef HAVE_LONG_DOUBLE
+		  case TYPE_LONGDOUBLE:
+		    *p++ = 'L';
+		    break;
+#endif
+		  default:
+		    break;
+		  }
+		*p = dp->conversion;
+#if USE_SNPRINTF
+		p[1] = '%';
+		p[2] = 'n';
+		p[3] = '\0';
+#else
+		p[1] = '\0';
+#endif
+
+		/* Construct the arguments for calling snprintf or sprintf.  */
+		prefix_count = 0;
+		if (dp->width_arg_index != ARG_NONE)
+		  {
+		    if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
+		      abort ();
+		    prefixes[prefix_count++] = a.arg[dp->width_arg_index].a.a_int;
+		  }
+		if (dp->precision_arg_index != ARG_NONE)
+		  {
+		    if (!(a.arg[dp->precision_arg_index].type == TYPE_INT))
+		      abort ();
+		    prefixes[prefix_count++] = a.arg[dp->precision_arg_index].a.a_int;
+		  }
+
+#if USE_SNPRINTF
+		/* Prepare checking whether snprintf returns the count
+		   via %n.  */
+		ENSURE_ALLOCATION (xsum (length, 1));
+		result[length] = '\0';
+#endif
+
+		for (;;)
+		  {
+		    size_t maxlen;
+		    int count;
+		    int retcount;
+
+		    maxlen = allocated - length;
+		    count = -1;
+		    retcount = 0;
+
+#if USE_SNPRINTF
+# define SNPRINTF_BUF(arg) \
+		    switch (prefix_count)				    \
+		      {							    \
+		      case 0:						    \
+			retcount = SNPRINTF (result + length, maxlen, buf,  \
+					     arg, &count);		    \
+			break;						    \
+		      case 1:						    \
+			retcount = SNPRINTF (result + length, maxlen, buf,  \
+					     prefixes[0], arg, &count);	    \
+			break;						    \
+		      case 2:						    \
+			retcount = SNPRINTF (result + length, maxlen, buf,  \
+					     prefixes[0], prefixes[1], arg, \
+					     &count);			    \
+			break;						    \
+		      default:						    \
+			abort ();					    \
+		      }
+#else
+# define SNPRINTF_BUF(arg) \
+		    switch (prefix_count)				    \
+		      {							    \
+		      case 0:						    \
+			count = sprintf (tmp, buf, arg);		    \
+			break;						    \
+		      case 1:						    \
+			count = sprintf (tmp, buf, prefixes[0], arg);	    \
+			break;						    \
+		      case 2:						    \
+			count = sprintf (tmp, buf, prefixes[0], prefixes[1],\
+					 arg);				    \
+			break;						    \
+		      default:						    \
+			abort ();					    \
+		      }
+#endif
+
+		    switch (type)
+		      {
+		      case TYPE_SCHAR:
+			{
+			  int arg = a.arg[dp->arg_index].a.a_schar;
+			  SNPRINTF_BUF (arg);
+			}
+			break;
+		      case TYPE_UCHAR:
+			{
+			  unsigned int arg = a.arg[dp->arg_index].a.a_uchar;
+			  SNPRINTF_BUF (arg);
+			}
+			break;
+		      case TYPE_SHORT:
+			{
+			  int arg = a.arg[dp->arg_index].a.a_short;
+			  SNPRINTF_BUF (arg);
+			}
+			break;
+		      case TYPE_USHORT:
+			{
+			  unsigned int arg = a.arg[dp->arg_index].a.a_ushort;
+			  SNPRINTF_BUF (arg);
+			}
+			break;
+		      case TYPE_INT:
+			{
+			  int arg = a.arg[dp->arg_index].a.a_int;
+			  SNPRINTF_BUF (arg);
+			}
+			break;
+		      case TYPE_UINT:
+			{
+			  unsigned int arg = a.arg[dp->arg_index].a.a_uint;
+			  SNPRINTF_BUF (arg);
+			}
+			break;
+		      case TYPE_LONGINT:
+			{
+			  long int arg = a.arg[dp->arg_index].a.a_longint;
+			  SNPRINTF_BUF (arg);
+			}
+			break;
+		      case TYPE_ULONGINT:
+			{
+			  unsigned long int arg = a.arg[dp->arg_index].a.a_ulongint;
+			  SNPRINTF_BUF (arg);
+			}
+			break;
+#ifdef HAVE_LONG_LONG
+		      case TYPE_LONGLONGINT:
+			{
+			  long long int arg = a.arg[dp->arg_index].a.a_longlongint;
+			  SNPRINTF_BUF (arg);
+			}
+			break;
+		      case TYPE_ULONGLONGINT:
+			{
+			  unsigned long long int arg = a.arg[dp->arg_index].a.a_ulonglongint;
+			  SNPRINTF_BUF (arg);
+			}
+			break;
+#endif
+		      case TYPE_DOUBLE:
+			{
+			  double arg = a.arg[dp->arg_index].a.a_double;
+			  SNPRINTF_BUF (arg);
+			}
+			break;
+#ifdef HAVE_LONG_DOUBLE
+		      case TYPE_LONGDOUBLE:
+			{
+			  long double arg = a.arg[dp->arg_index].a.a_longdouble;
+			  SNPRINTF_BUF (arg);
+			}
+			break;
+#endif
+		      case TYPE_CHAR:
+			{
+			  int arg = a.arg[dp->arg_index].a.a_char;
+			  SNPRINTF_BUF (arg);
+			}
+			break;
+#ifdef HAVE_WINT_T
+		      case TYPE_WIDE_CHAR:
+			{
+			  wint_t arg = a.arg[dp->arg_index].a.a_wide_char;
+			  SNPRINTF_BUF (arg);
+			}
+			break;
+#endif
+		      case TYPE_STRING:
+			{
+			  const char *arg = a.arg[dp->arg_index].a.a_string;
+			  SNPRINTF_BUF (arg);
+			}
+			break;
+#ifdef HAVE_WCHAR_T
+		      case TYPE_WIDE_STRING:
+			{
+			  const wchar_t *arg = a.arg[dp->arg_index].a.a_wide_string;
+			  SNPRINTF_BUF (arg);
+			}
+			break;
+#endif
+		      case TYPE_POINTER:
+			{
+			  void *arg = a.arg[dp->arg_index].a.a_pointer;
+			  SNPRINTF_BUF (arg);
+			}
+			break;
+		      default:
+			abort ();
+		      }
+
+#if USE_SNPRINTF
+		    /* Portability: Not all implementations of snprintf()
+		       are ISO C 99 compliant.  Determine the number of
+		       bytes that snprintf() has produced or would have
+		       produced.  */
+		    if (count >= 0)
+		      {
+			/* Verify that snprintf() has NUL-terminated its
+			   result.  */
+			if (count < maxlen && result[length + count] != '\0')
+			  abort ();
+			/* Portability hack.  */
+			if (retcount > count)
+			  count = retcount;
+		      }
+		    else
+		      {
+			/* snprintf() doesn't understand the '%n'
+			   directive.  */
+			if (p[1] != '\0')
+			  {
+			    /* Don't use the '%n' directive; instead, look
+			       at the snprintf() return value.  */
+			    p[1] = '\0';
+			    continue;
+			  }
+			else
+			  {
+			    /* Look at the snprintf() return value.  */
+			    if (retcount < 0)
+			      {
+				/* HP-UX 10.20 snprintf() is doubly deficient:
+				   It doesn't understand the '%n' directive,
+				   *and* it returns -1 (rather than the length
+				   that would have been required) when the
+				   buffer is too small.  */
+				size_t bigger_need =
+				  xsum (xtimes (allocated, 2), 12);
+				ENSURE_ALLOCATION (bigger_need);
+				continue;
+			      }
+			    else
+			      count = retcount;
+			  }
+		      }
+#endif
+
+		    /* Attempt to handle failure.  */
+		    if (count < 0)
+		      {
+			if (!(result == resultbuf || result == NULL))
+			  free (result);
+			if (buf_malloced != NULL)
+			  free (buf_malloced);
+			CLEANUP ();
+			errno = EINVAL;
+			return NULL;
+		      }
+
+#if !USE_SNPRINTF
+		    if (count >= tmp_length)
+		      /* tmp_length was incorrectly calculated - fix the
+			 code above!  */
+		      abort ();
+#endif
+
+		    /* Make room for the result.  */
+		    if (count >= maxlen)
+		      {
+			/* Need at least count bytes.  But allocate
+			   proportionally, to avoid looping eternally if
+			   snprintf() reports a too small count.  */
+			size_t n =
+			  xmax (xsum (length, count), xtimes (allocated, 2));
+
+			ENSURE_ALLOCATION (n);
+#if USE_SNPRINTF
+			continue;
+#endif
+		      }
+
+#if USE_SNPRINTF
+		    /* The snprintf() result did fit.  */
+#else
+		    /* Append the sprintf() result.  */
+		    memcpy (result + length, tmp, count * sizeof (CHAR_T));
+		    if (tmp != tmpbuf)
+		      free (tmp);
+#endif
+
+		    length += count;
+		    break;
+		  }
+	      }
+	  }
+      }
+
+    /* Add the final NUL.  */
+    ENSURE_ALLOCATION (xsum (length, 1));
+    result[length] = '\0';
+
+    if (result != resultbuf && length + 1 < allocated)
+      {
+	/* Shrink the allocated memory if possible.  */
+	CHAR_T *memory;
+
+	memory = (CHAR_T *) realloc (result, (length + 1) * sizeof (CHAR_T));
+	if (memory != NULL)
+	  result = memory;
+      }
+
+    if (buf_malloced != NULL)
+      free (buf_malloced);
+    CLEANUP ();
+    *lengthp = length;
+    return result;
+
+  out_of_memory:
+    if (!(result == resultbuf || result == NULL))
+      free (result);
+    if (buf_malloced != NULL)
+      free (buf_malloced);
+  out_of_memory_1:
+    CLEANUP ();
+    errno = ENOMEM;
+    return NULL;
+  }
+}
+
+#undef SNPRINTF
+#undef USE_SNPRINTF
+#undef PRINTF_PARSE
+#undef DIRECTIVES
+#undef DIRECTIVE
+#undef CHAR_T
+#undef VASNPRINTF
diff --git a/gnu/usr.bin/texinfo/intl/vasnprintf.h b/gnu/usr.bin/texinfo/intl/vasnprintf.h
new file mode 100644
index 00000000000..65f1bc13dd2
--- /dev/null
+++ b/gnu/usr.bin/texinfo/intl/vasnprintf.h
@@ -0,0 +1,61 @@
+/* vsprintf with automatic memory allocation.
+   Copyright (C) 2002-2003 Free Software Foundation, Inc.
+
+   This program 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, 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library 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 _VASNPRINTF_H
+#define _VASNPRINTF_H
+
+/* Get va_list.  */
+#include <stdarg.h>
+
+/* Get size_t.  */
+#include <stddef.h>
+
+#ifndef __attribute__
+/* This feature is available in gcc versions 2.5 and later.  */
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
+#  define __attribute__(Spec) /* empty */
+# endif
+/* The __-protected variants of `format' and `printf' attributes
+   are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+#  define __format__ format
+#  define __printf__ printf
+# endif
+#endif
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+/* Write formatted output to a string dynamically allocated with malloc().
+   You can pass a preallocated buffer for the result in RESULTBUF and its
+   size in *LENGTHP; otherwise you pass RESULTBUF = NULL.
+   If successful, return the address of the string (this may be = RESULTBUF
+   if no dynamic memory allocation was necessary) and set *LENGTHP to the
+   number of resulting bytes, excluding the trailing NUL.  Upon error, set
+   errno and return NULL.  */
+extern char * asnprintf (char *resultbuf, size_t *lengthp, const char *format, ...)
+       __attribute__ ((__format__ (__printf__, 3, 4)));
+extern char * vasnprintf (char *resultbuf, size_t *lengthp, const char *format, va_list args)
+       __attribute__ ((__format__ (__printf__, 3, 0)));
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif /* _VASNPRINTF_H */
diff --git a/gnu/usr.bin/texinfo/intl/vasnwprintf.h b/gnu/usr.bin/texinfo/intl/vasnwprintf.h
new file mode 100644
index 00000000000..d3cef4cbcd2
--- /dev/null
+++ b/gnu/usr.bin/texinfo/intl/vasnwprintf.h
@@ -0,0 +1,46 @@
+/* vswprintf with automatic memory allocation.
+   Copyright (C) 2002-2003 Free Software Foundation, Inc.
+
+   This program 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, 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library 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 _VASNWPRINTF_H
+#define _VASNWPRINTF_H
+
+/* Get va_list.  */
+#include <stdarg.h>
+
+/* Get wchar_t, size_t.  */
+#include <stddef.h>
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+/* Write formatted output to a string dynamically allocated with malloc().
+   You can pass a preallocated buffer for the result in RESULTBUF and its
+   size in *LENGTHP; otherwise you pass RESULTBUF = NULL.
+   If successful, return the address of the string (this may be = RESULTBUF
+   if no dynamic memory allocation was necessary) and set *LENGTHP to the
+   number of resulting bytes, excluding the trailing NUL.  Upon error, set
+   errno and return NULL.  */
+extern wchar_t * asnwprintf (wchar_t *resultbuf, size_t *lengthp, const wchar_t *format, ...);
+extern wchar_t * vasnwprintf (wchar_t *resultbuf, size_t *lengthp, const wchar_t *format, va_list args);
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif /* _VASNWPRINTF_H */
diff --git a/gnu/usr.bin/texinfo/intl/wprintf-parse.h b/gnu/usr.bin/texinfo/intl/wprintf-parse.h
new file mode 100644
index 00000000000..24a2cfc28f3
--- /dev/null
+++ b/gnu/usr.bin/texinfo/intl/wprintf-parse.h
@@ -0,0 +1,75 @@
+/* Parse printf format string.
+   Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
+
+   This program 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, 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library 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 _WPRINTF_PARSE_H
+#define _WPRINTF_PARSE_H
+
+#include "printf-args.h"
+
+
+/* Flags */
+#define FLAG_GROUP	 1	/* ' flag */
+#define FLAG_LEFT	 2	/* - flag */
+#define FLAG_SHOWSIGN	 4	/* + flag */
+#define FLAG_SPACE	 8	/* space flag */
+#define FLAG_ALT	16	/* # flag */
+#define FLAG_ZERO	32
+
+/* arg_index value indicating that no argument is consumed.  */
+#define ARG_NONE	(~(size_t)0)
+
+/* A parsed directive.  */
+typedef struct
+{
+  const wchar_t* dir_start;
+  const wchar_t* dir_end;
+  int flags;
+  const wchar_t* width_start;
+  const wchar_t* width_end;
+  size_t width_arg_index;
+  const wchar_t* precision_start;
+  const wchar_t* precision_end;
+  size_t precision_arg_index;
+  wchar_t conversion; /* d i o u x X f e E g G c s p n U % but not C S */
+  size_t arg_index;
+}
+wchar_t_directive;
+
+/* A parsed format string.  */
+typedef struct
+{
+  size_t count;
+  wchar_t_directive *dir;
+  size_t max_width_length;
+  size_t max_precision_length;
+}
+wchar_t_directives;
+
+
+/* Parses the format string.  Fills in the number N of directives, and fills
+   in directives[0], ..., directives[N-1], and sets directives[N].dir_start
+   to the end of the format string.  Also fills in the arg_type fields of the
+   arguments and the needed count of arguments.  */
+#ifdef STATIC
+STATIC
+#else
+extern
+#endif
+int wprintf_parse (const wchar_t *format, wchar_t_directives *d, arguments *a);
+
+#endif /* _WPRINTF_PARSE_H */
diff --git a/gnu/usr.bin/texinfo/intl/xsize.h b/gnu/usr.bin/texinfo/intl/xsize.h
new file mode 100644
index 00000000000..362e24b7241
--- /dev/null
+++ b/gnu/usr.bin/texinfo/intl/xsize.h
@@ -0,0 +1,109 @@
+/* xsize.h -- Checked size_t computations.
+
+   Copyright (C) 2003 Free Software Foundation, Inc.
+
+   This program 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, 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
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library 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 _XSIZE_H
+#define _XSIZE_H
+
+/* Get size_t.  */
+#include <stddef.h>
+
+/* Get SIZE_MAX.  */
+#include <limits.h>
+#if HAVE_STDINT_H
+# include <stdint.h>
+#endif
+
+/* The size of memory objects is often computed through expressions of
+   type size_t. Example:
+      void* p = malloc (header_size + n * element_size).
+   These computations can lead to overflow.  When this happens, malloc()
+   returns a piece of memory that is way too small, and the program then
+   crashes while attempting to fill the memory.
+   To avoid this, the functions and macros in this file check for overflow.
+   The convention is that SIZE_MAX represents overflow.
+   malloc (SIZE_MAX) is not guaranteed to fail -- think of a malloc
+   implementation that uses mmap --, it's recommended to use size_overflow_p()
+   or size_in_bounds_p() before invoking malloc().
+   The example thus becomes:
+      size_t size = xsum (header_size, xtimes (n, element_size));
+      void *p = (size_in_bounds_p (size) ? malloc (size) : NULL);
+*/
+
+/* Convert an arbitrary value >= 0 to type size_t.  */
+#define xcast_size_t(N) \
+  ((N) <= SIZE_MAX ? (size_t) (N) : SIZE_MAX)
+
+/* Sum of two sizes, with overflow check.  */
+static inline size_t
+#if __GNUC__ >= 3
+__attribute__ ((__pure__))
+#endif
+xsum (size_t size1, size_t size2)
+{
+  size_t sum = size1 + size2;
+  return (sum >= size1 ? sum : SIZE_MAX);
+}
+
+/* Sum of three sizes, with overflow check.  */
+static inline size_t
+#if __GNUC__ >= 3
+__attribute__ ((__pure__))
+#endif
+xsum3 (size_t size1, size_t size2, size_t size3)
+{
+  return xsum (xsum (size1, size2), size3);
+}
+
+/* Sum of four sizes, with overflow check.  */
+static inline size_t
+#if __GNUC__ >= 3
+__attribute__ ((__pure__))
+#endif
+xsum4 (size_t size1, size_t size2, size_t size3, size_t size4)
+{
+  return xsum (xsum (xsum (size1, size2), size3), size4);
+}
+
+/* Maximum of two sizes, with overflow check.  */
+static inline size_t
+#if __GNUC__ >= 3
+__attribute__ ((__pure__))
+#endif
+xmax (size_t size1, size_t size2)
+{
+  /* No explicit check is needed here, because for any n:
+     max (SIZE_MAX, n) == SIZE_MAX and max (n, SIZE_MAX) == SIZE_MAX.  */
+  return (size1 >= size2 ? size1 : size2);
+}
+
+/* Multiplication of a count with an element size, with overflow check.
+   The count must be >= 0 and the element size must be > 0.
+   This is a macro, not an inline function, so that it works correctly even
+   when N is of a wider tupe and N > SIZE_MAX.  */
+#define xtimes(N, ELSIZE) \
+  ((N) <= SIZE_MAX / (ELSIZE) ? (size_t) (N) * (ELSIZE) : SIZE_MAX)
+
+/* Check for overflow.  */
+#define size_overflow_p(SIZE) \
+  ((SIZE) == SIZE_MAX)
+/* Check against overflow.  */
+#define size_in_bounds_p(SIZE) \
+  ((SIZE) != SIZE_MAX)
+
+#endif /* _XSIZE_H */
diff --git a/gnu/usr.bin/texinfo/lib/README b/gnu/usr.bin/texinfo/lib/README
index 6280ef53c9a..c491dcc6ea7 100644
--- a/gnu/usr.bin/texinfo/lib/README
+++ b/gnu/usr.bin/texinfo/lib/README
@@ -1,4 +1,13 @@
-Common routines for the Texinfo package.
+$Id: README,v 1.1.1.3 2006/07/17 16:03:41 espie Exp $
+texinfo/lib/README
+
+  Copyright (C) 2002 Free Software Foundation, Inc.
+
+  Copying and distribution of this file, with or without modification,
+  are permitted in any medium without royalty provided the copyright
+  notice and this notice are preserved.
+
+Common routines for the Texinfo programs.
 
 Many are common to other GNU packages as well.
-(On the FSF machines, check /home/gd/gnu/lib for the latest.)
+See the gnulib project at savannah: http://savannah.gnu.org/projects/gnulib
diff --git a/gnu/usr.bin/texinfo/lib/alloca.c b/gnu/usr.bin/texinfo/lib/alloca.c
index b102eb11bfe..d1d54475bbb 100644
--- a/gnu/usr.bin/texinfo/lib/alloca.c
+++ b/gnu/usr.bin/texinfo/lib/alloca.c
@@ -25,8 +25,20 @@
 # include <config.h>
 #endif
 
+#include <alloca.h>
+
+#include <string.h>
+#include <stdlib.h>
+
 #ifdef emacs
+# include "lisp.h"
 # include "blockinput.h"
+# ifdef EMACS_FREE
+#  undef free
+#  define free EMACS_FREE
+# endif
+#else
+# define memory_full() abort ()
 #endif
 
 /* If compiling with GCC 2, this file's not needed.  */
@@ -46,6 +58,8 @@
 you
 lose
 -- must know STACK_DIRECTION at compile-time
+/* Using #error here is not wise since this file should work for
+   old and obscure compilers.  */
 #    endif /* STACK_DIRECTION undefined */
 #   endif /* static */
 #  endif /* emacs */
@@ -60,31 +74,6 @@ long i00afunc ();
 #   define ADDRESS_FUNCTION(arg) &(arg)
 #  endif
 
-#  if __STDC__
-typedef void *pointer;
-#  else
-typedef char *pointer;
-#  endif
-
-#  ifndef NULL
-#   define NULL 0
-#  endif
-
-/* Different portions of Emacs need to call different versions of
-   malloc.  The Emacs executable needs alloca to call xmalloc, because
-   ordinary malloc isn't protected from input signals.  On the other
-   hand, the utilities in lib-src need alloca to call malloc; some of
-   them are very simple, and don't have an xmalloc routine.
-
-   Non-Emacs programs expect this to call xmalloc.
-
-   Callers below should use malloc.  */
-
-#  ifndef emacs
-#   define malloc xmalloc
-#  endif
-extern pointer malloc ();
-
 /* Define STACK_DIRECTION if you know the direction of stack
    growth for your system; otherwise it will be automatically
    deduced at run-time.
@@ -107,7 +96,7 @@ static int stack_dir;		/* 1 or -1 once known.  */
 #   define STACK_DIR	stack_dir
 
 static void
-find_stack_direction ()
+find_stack_direction (void)
 {
   static char *addr = NULL;	/* Address of first `dummy', once known.  */
   auto char dummy;		/* To get stack address.  */
@@ -160,8 +149,8 @@ static header *last_alloca_header = NULL;	/* -> last alloca header.  */
    caller, but that method cannot be made to work for some
    implementations of C, for example under Gould's UTX/32.  */
 
-pointer
-alloca (unsigned size)
+void *
+alloca (size_t size)
 {
   auto char probe;		/* Probes stack depth: */
   register char *depth = ADDRESS_FUNCTION (probe);
@@ -187,7 +176,7 @@ alloca (unsigned size)
 	{
 	  register header *np = hp->h.next;
 
-	  free ((pointer) hp);	/* Collect garbage.  */
+	  free (hp);		/* Collect garbage.  */
 
 	  hp = np;		/* -> next header.  */
 	}
@@ -207,17 +196,26 @@ alloca (unsigned size)
   /* Allocate combined header + user data storage.  */
 
   {
-    register pointer new = malloc (sizeof (header) + size);
     /* Address of header.  */
+    register header *new;
+
+    size_t combined_size = sizeof (header) + size;
+    if (combined_size < sizeof (header))
+      memory_full ();
+
+    new = malloc (combined_size);
+
+    if (! new)
+      memory_full ();
 
-    ((header *) new)->h.next = last_alloca_header;
-    ((header *) new)->h.deep = depth;
+    new->h.next = last_alloca_header;
+    new->h.deep = depth;
 
-    last_alloca_header = (header *) new;
+    last_alloca_header = new;
 
     /* User storage begins just after header.  */
 
-    return (pointer) ((char *) new + sizeof (header));
+    return (void *) (new + 1);
   }
 }
 
diff --git a/gnu/usr.bin/texinfo/lib/getopt.c b/gnu/usr.bin/texinfo/lib/getopt.c
index d176d3e7e72..95b3604f892 100644
--- a/gnu/usr.bin/texinfo/lib/getopt.c
+++ b/gnu/usr.bin/texinfo/lib/getopt.c
@@ -1,22 +1,23 @@
 /* Getopt for GNU.
-   NOTE: The canonical source of this file is maintained with the GNU
-   C Library.  Bugs can be reported to bug-glibc@gnu.org.
-
-   Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99
+   NOTE: getopt is now part of the C library, so if you don't know what
+   "Keep this file name-space clean" means, talk to drepper@gnu.org
+   before changing it!
+   Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001,2002,2003,2004
    	Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
 
-   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.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
+   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>.
@@ -27,37 +28,10 @@
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
-#else
-# if !defined __STDC__ || !__STDC__
-/* This is a separate conditional since some stdc systems
-   reject `defined (const)'.  */
-#  ifndef const
-#   define const
-#  endif
-# endif
 #endif
 
 #include <stdio.h>
 
-/* Comment out all this code if we are using the GNU C Library, and are not
-   actually compiling the library itself.  This code is part of the GNU C
-   Library, but also included in many other GNU distributions.  Compiling
-   and linking in this code is a waste when using the GNU C library
-   (especially if it is a shared library).  Rather than having every GNU
-   program understand `configure --with-gnu-libc' and omit the object files,
-   it is simpler to just do this in the source for each such file.  */
-
-#define GETOPT_INTERFACE_VERSION 2
-#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
-# include <gnu-versions.h>
-# if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
-#  define ELIDE_CODE
-# endif
-#endif
-
-#ifndef ELIDE_CODE
-
-
 /* This needs to come after some library #include
    to get __GNU_LIBRARY__ defined.  */
 #ifdef	__GNU_LIBRARY__
@@ -67,22 +41,25 @@
 # include <unistd.h>
 #endif	/* GNU C library.  */
 
+#include <string.h>
+
 #ifdef VMS
 # include <unixlib.h>
-# if HAVE_STRING_H - 0
-#  include <string.h>
-# endif
 #endif
 
-#ifndef _
-/* This is for other GNU distributions with internationalized messages.
-   When compiling libc, the _ macro is predefined.  */
-# ifdef HAVE_LIBINTL_H
-#  include <libintl.h>
-#  define _(msgid)	gettext (msgid)
-# else
-#  define _(msgid)	(msgid)
-# endif
+#ifdef _LIBC
+# include <libintl.h>
+#else
+# include "gettext.h"
+# define _(msgid) gettext (msgid)
+#endif
+
+#if defined _LIBC && defined USE_IN_LIBIO
+# include <wchar.h>
+#endif
+
+#ifndef attribute_hidden
+# define attribute_hidden
 #endif
 
 /* This version of `getopt' appears to the caller like standard Unix `getopt'
@@ -100,6 +77,7 @@
    they can distinguish the relative order of options and other arguments.  */
 
 #include "getopt.h"
+#include "getopt_int.h"
 
 /* For communication from `getopt' to the caller.
    When `getopt' finds an option that takes an argument,
@@ -124,21 +102,6 @@ char *optarg;
 /* 1003.2 says this must be 1 before any call.  */
 int optind = 1;
 
-/* Formerly, initialization of getopt depended on optind==0, which
-   causes problems with re-calling getopt as programs generally don't
-   know that. */
-
-int __getopt_initialized;
-
-/* The next char to be scanned in the option-element
-   in which the last option character we returned was found.
-   This allows us to pick up the scan where we left off.
-
-   If this is zero, or a null string, it means resume the scan
-   by advancing to the next ARGV-element.  */
-
-static char *nextchar;
-
 /* Callers store zero here to inhibit the error message
    for unrecognized options.  */
 
@@ -150,57 +113,12 @@ int opterr = 1;
 
 int optopt = '?';
 
-/* Describe how to deal with options that follow non-option ARGV-elements.
-
-   If the caller did not specify anything,
-   the default is REQUIRE_ORDER if the environment variable
-   POSIXLY_CORRECT is defined, PERMUTE otherwise.
+/* Keep a global copy of all internal members of getopt_data.  */
 
-   REQUIRE_ORDER means don't recognize them as options;
-   stop option processing when the first non-option is seen.
-   This is what Unix does.
-   This mode of operation is selected by either setting the environment
-   variable POSIXLY_CORRECT, or using `+' as the first character
-   of the list of option characters.
+static struct _getopt_data getopt_data;
 
-   PERMUTE is the default.  We permute the contents of ARGV as we scan,
-   so that eventually all the non-options are at the end.  This allows options
-   to be given in any order, even with programs that were not written to
-   expect this.
-
-   RETURN_IN_ORDER is an option available to programs that were written
-   to expect options and other ARGV-elements in any order and that care about
-   the ordering of the two.  We describe each non-option ARGV-element
-   as if it were the argument of an option with character code 1.
-   Using `-' as the first character of the list of option characters
-   selects this mode of operation.
-
-   The special argument `--' forces an end of option-scanning regardless
-   of the value of `ordering'.  In the case of RETURN_IN_ORDER, only
-   `--' can cause `getopt' to return -1 with `optind' != ARGC.  */
-
-static enum
-{
-  REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
-} ordering;
-
-/* Value of POSIXLY_CORRECT environment variable.  */
-static char *posixly_correct;
 
-#ifdef	__GNU_LIBRARY__
-/* We want to avoid inclusion of string.h with non-GNU libraries
-   because there are many ways it can cause trouble.
-   On some systems, it contains special magic macros that don't work
-   in GCC.  */
-# include <string.h>
-# define my_index	strchr
-#else
-
-# if HAVE_STRING_H
-#  include <string.h>
-# else
-#  include <strings.h>
-# endif
+#ifndef __GNU_LIBRARY__
 
 /* Avoid depending on library functions or files
    whose names are inconsistent.  */
@@ -209,79 +127,34 @@ static char *posixly_correct;
 extern char *getenv ();
 #endif
 
-static char *
-my_index (str, chr)
-     const char *str;
-     int chr;
-{
-  while (*str)
-    {
-      if (*str == chr)
-	return (char *) str;
-      str++;
-    }
-  return 0;
-}
-
-/* If using GCC, we can safely declare strlen this way.
-   If not using GCC, it is ok not to declare it.  */
-#ifdef __GNUC__
-/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h.
-   That was relevant to code that was here before.  */
-# if (!defined __STDC__ || !__STDC__) && !defined strlen
-/* gcc with -traditional declares the built-in strlen to return int,
-   and has done so at least since version 2.4.5. -- rms.  */
-extern int strlen (const char *);
-# endif /* not __STDC__ */
-#endif /* __GNUC__ */
-
 #endif /* not __GNU_LIBRARY__ */
 
-/* Handle permutation of arguments.  */
-
-/* Describe the part of ARGV that contains non-options that have
-   been skipped.  `first_nonopt' is the index in ARGV of the first of them;
-   `last_nonopt' is the index after the last of them.  */
-
-static int first_nonopt;
-static int last_nonopt;
-
 #ifdef _LIBC
+/* Stored original parameters.
+   XXX This is no good solution.  We should rather copy the args so
+   that we can compare them later.  But we must not use malloc(3).  */
+extern int __libc_argc;
+extern char **__libc_argv;
+
 /* Bash 2.0 gives us an environment variable containing flags
    indicating ARGV elements that should not be considered arguments.  */
 
+# ifdef USE_NONOPTION_FLAGS
 /* Defined in getopt_init.c  */
 extern char *__getopt_nonoption_flags;
+# endif
 
-static int nonoption_flags_max_len;
-static int nonoption_flags_len;
-
-static int original_argc;
-static char *const *original_argv;
-
-/* 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.  */
-static void
-__attribute__ ((unused))
-store_args_and_env (int argc, char *const *argv)
-{
-  /* XXX This is no good solution.  We should rather copy the args so
-     that we can compare them later.  But we must not use malloc(3).  */
-  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)						      \
+# ifdef USE_NONOPTION_FLAGS
+#  define SWAP_FLAGS(ch1, ch2) \
+  if (d->__nonoption_flags_len > 0)					      \
     {									      \
       char __tmp = __getopt_nonoption_flags[ch1];			      \
       __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2];	      \
       __getopt_nonoption_flags[ch2] = __tmp;				      \
     }
+# else
+#  define SWAP_FLAGS(ch1, ch2)
+# endif
 #else	/* !_LIBC */
 # define SWAP_FLAGS(ch1, ch2)
 #endif	/* _LIBC */
@@ -295,17 +168,12 @@ text_set_element (__libc_subinit, store_args_and_env);
    `first_nonopt' and `last_nonopt' are relocated so that they describe
    the new indices of the non-options in ARGV after they are moved.  */
 
-#if defined __STDC__ && __STDC__
-static void exchange (char **);
-#endif
-
 static void
-exchange (argv)
-     char **argv;
+exchange (char **argv, struct _getopt_data *d)
 {
-  int bottom = first_nonopt;
-  int middle = last_nonopt;
-  int top = optind;
+  int bottom = d->__first_nonopt;
+  int middle = d->__last_nonopt;
+  int top = d->optind;
   char *tem;
 
   /* Exchange the shorter segment with the far end of the longer segment.
@@ -313,23 +181,23 @@ exchange (argv)
      It leaves the longer segment in the right place overall,
      but it consists of two parts that need to be swapped next.  */
 
-#ifdef _LIBC
+#if defined _LIBC && defined USE_NONOPTION_FLAGS
   /* First make sure the handling of the `__getopt_nonoption_flags'
      string can work normally.  Our top argument must be in the range
      of the string.  */
-  if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len)
+  if (d->__nonoption_flags_len > 0 && top >= d->__nonoption_flags_max_len)
     {
       /* We must extend the array.  The user plays games with us and
 	 presents new arguments.  */
       char *new_str = malloc (top + 1);
       if (new_str == NULL)
-	nonoption_flags_len = nonoption_flags_max_len = 0;
+	d->__nonoption_flags_len = d->__nonoption_flags_max_len = 0;
       else
 	{
 	  memset (__mempcpy (new_str, __getopt_nonoption_flags,
-			     nonoption_flags_max_len),
-		  '\0', top + 1 - nonoption_flags_max_len);
-	  nonoption_flags_max_len = top + 1;
+			     d->__nonoption_flags_max_len),
+		  '\0', top + 1 - d->__nonoption_flags_max_len);
+	  d->__nonoption_flags_max_len = top + 1;
 	  __getopt_nonoption_flags = new_str;
 	}
     }
@@ -375,76 +243,71 @@ exchange (argv)
 
   /* Update records for the slots the non-options now occupy.  */
 
-  first_nonopt += (optind - last_nonopt);
-  last_nonopt = optind;
+  d->__first_nonopt += (d->optind - d->__last_nonopt);
+  d->__last_nonopt = d->optind;
 }
 
 /* Initialize the internal data when the first call is made.  */
 
-#if defined __STDC__ && __STDC__
-static const char *_getopt_initialize (int, char *const *, const char *);
-#endif
 static const char *
-_getopt_initialize (argc, argv, optstring)
-     int argc;
-     char *const *argv;
-     const char *optstring;
+_getopt_initialize (int argc, char *const *argv, const char *optstring,
+		    struct _getopt_data *d)
 {
   /* Start processing options with ARGV-element 1 (since ARGV-element 0
      is the program name); the sequence of previously skipped
      non-option ARGV-elements is empty.  */
 
-  first_nonopt = last_nonopt = optind;
+  d->__first_nonopt = d->__last_nonopt = d->optind;
 
-  nextchar = NULL;
+  d->__nextchar = NULL;
 
-  posixly_correct = getenv ("POSIXLY_CORRECT");
+  d->__posixly_correct = !!getenv ("POSIXLY_CORRECT");
 
   /* Determine how to handle the ordering of options and nonoptions.  */
 
   if (optstring[0] == '-')
     {
-      ordering = RETURN_IN_ORDER;
+      d->__ordering = RETURN_IN_ORDER;
       ++optstring;
     }
   else if (optstring[0] == '+')
     {
-      ordering = REQUIRE_ORDER;
+      d->__ordering = REQUIRE_ORDER;
       ++optstring;
     }
-  else if (posixly_correct != NULL)
-    ordering = REQUIRE_ORDER;
+  else if (d->__posixly_correct)
+    d->__ordering = REQUIRE_ORDER;
   else
-    ordering = PERMUTE;
+    d->__ordering = PERMUTE;
 
-#ifdef _LIBC
-  if (posixly_correct == NULL
-      && argc == original_argc && argv == original_argv)
+#if defined _LIBC && defined USE_NONOPTION_FLAGS
+  if (!d->__posixly_correct
+      && argc == __libc_argc && argv == __libc_argv)
     {
-      if (nonoption_flags_max_len == 0)
+      if (d->__nonoption_flags_max_len == 0)
 	{
 	  if (__getopt_nonoption_flags == NULL
 	      || __getopt_nonoption_flags[0] == '\0')
-	    nonoption_flags_max_len = -1;
+	    d->__nonoption_flags_max_len = -1;
 	  else
 	    {
 	      const char *orig_str = __getopt_nonoption_flags;
-	      int len = nonoption_flags_max_len = strlen (orig_str);
-	      if (nonoption_flags_max_len < argc)
-		nonoption_flags_max_len = argc;
+	      int len = d->__nonoption_flags_max_len = strlen (orig_str);
+	      if (d->__nonoption_flags_max_len < argc)
+		d->__nonoption_flags_max_len = argc;
 	      __getopt_nonoption_flags =
-		(char *) malloc (nonoption_flags_max_len);
+		(char *) malloc (d->__nonoption_flags_max_len);
 	      if (__getopt_nonoption_flags == NULL)
-		nonoption_flags_max_len = -1;
+		d->__nonoption_flags_max_len = -1;
 	      else
 		memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),
-			'\0', nonoption_flags_max_len - len);
+			'\0', d->__nonoption_flags_max_len - len);
 	    }
 	}
-      nonoption_flags_len = nonoption_flags_max_len;
+      d->__nonoption_flags_len = d->__nonoption_flags_max_len;
     }
   else
-    nonoption_flags_len = 0;
+    d->__nonoption_flags_len = 0;
 #endif
 
   return optstring;
@@ -507,63 +370,67 @@ _getopt_initialize (argc, argv, optstring)
    long-named options.  */
 
 int
-_getopt_internal (argc, argv, optstring, longopts, longind, long_only)
-     int argc;
-     char *const *argv;
-     const char *optstring;
-     const struct option *longopts;
-     int *longind;
-     int long_only;
+_getopt_internal_r (int argc, char *const *argv, const char *optstring,
+		    const struct option *longopts, int *longind,
+		    int long_only, struct _getopt_data *d)
 {
-  optarg = NULL;
+  int print_errors = d->opterr;
+  if (optstring[0] == ':')
+    print_errors = 0;
+
+  if (argc < 1)
+    return -1;
 
-  if (optind == 0 || !__getopt_initialized)
+  d->optarg = NULL;
+
+  if (d->optind == 0 || !d->__initialized)
     {
-      if (optind == 0)
-	optind = 1;	/* Don't scan ARGV[0], the program name.  */
-      optstring = _getopt_initialize (argc, argv, optstring);
-      __getopt_initialized = 1;
+      if (d->optind == 0)
+	d->optind = 1;	/* Don't scan ARGV[0], the program name.  */
+      optstring = _getopt_initialize (argc, argv, optstring, d);
+      d->__initialized = 1;
     }
 
   /* Test whether ARGV[optind] points to a non-option argument.
      Either it does not have option syntax, or there is an environment flag
      from the shell indicating it is not an option.  The later information
      is only used when the used in the GNU libc.  */
-#ifdef _LIBC
-# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0'	      \
-		      || (optind < nonoption_flags_len			      \
-			  && __getopt_nonoption_flags[optind] == '1'))
+#if defined _LIBC && defined USE_NONOPTION_FLAGS
+# define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0' \
+		      || (d->optind < d->__nonoption_flags_len		      \
+			  && __getopt_nonoption_flags[d->optind] == '1'))
 #else
-# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0')
+# define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0')
 #endif
 
-  if (nextchar == NULL || *nextchar == '\0')
+  if (d->__nextchar == NULL || *d->__nextchar == '\0')
     {
       /* Advance to the next ARGV-element.  */
 
       /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been
 	 moved back by the user (who may also have changed the arguments).  */
-      if (last_nonopt > optind)
-	last_nonopt = optind;
-      if (first_nonopt > optind)
-	first_nonopt = optind;
+      if (d->__last_nonopt > d->optind)
+	d->__last_nonopt = d->optind;
+      if (d->__first_nonopt > d->optind)
+	d->__first_nonopt = d->optind;
 
-      if (ordering == PERMUTE)
+      if (d->__ordering == PERMUTE)
 	{
 	  /* If we have just processed some options following some non-options,
 	     exchange them so that the options come first.  */
 
-	  if (first_nonopt != last_nonopt && last_nonopt != optind)
-	    exchange ((char **) argv);
-	  else if (last_nonopt != optind)
-	    first_nonopt = optind;
+	  if (d->__first_nonopt != d->__last_nonopt
+	      && d->__last_nonopt != d->optind)
+	    exchange ((char **) argv, d);
+	  else if (d->__last_nonopt != d->optind)
+	    d->__first_nonopt = d->optind;
 
 	  /* Skip any additional non-options
 	     and extend the range of non-options previously skipped.  */
 
-	  while (optind < argc && NONOPTION_P)
-	    optind++;
-	  last_nonopt = optind;
+	  while (d->optind < argc && NONOPTION_P)
+	    d->optind++;
+	  d->__last_nonopt = d->optind;
 	}
 
       /* The special ARGV-element `--' means premature end of options.
@@ -571,28 +438,29 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 	 then exchange with previous non-options as if it were an option,
 	 then skip everything else like a non-option.  */
 
-      if (optind != argc && !strcmp (argv[optind], "--"))
+      if (d->optind != argc && !strcmp (argv[d->optind], "--"))
 	{
-	  optind++;
+	  d->optind++;
 
-	  if (first_nonopt != last_nonopt && last_nonopt != optind)
-	    exchange ((char **) argv);
-	  else if (first_nonopt == last_nonopt)
-	    first_nonopt = optind;
-	  last_nonopt = argc;
+	  if (d->__first_nonopt != d->__last_nonopt
+	      && d->__last_nonopt != d->optind)
+	    exchange ((char **) argv, d);
+	  else if (d->__first_nonopt == d->__last_nonopt)
+	    d->__first_nonopt = d->optind;
+	  d->__last_nonopt = argc;
 
-	  optind = argc;
+	  d->optind = argc;
 	}
 
       /* If we have done all the ARGV-elements, stop the scan
 	 and back over any non-options that we skipped and permuted.  */
 
-      if (optind == argc)
+      if (d->optind == argc)
 	{
 	  /* Set the next-arg-index to point at the non-options
 	     that we previously skipped, so the caller will digest them.  */
-	  if (first_nonopt != last_nonopt)
-	    optind = first_nonopt;
+	  if (d->__first_nonopt != d->__last_nonopt)
+	    d->optind = d->__first_nonopt;
 	  return -1;
 	}
 
@@ -601,17 +469,17 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 
       if (NONOPTION_P)
 	{
-	  if (ordering == REQUIRE_ORDER)
+	  if (d->__ordering == REQUIRE_ORDER)
 	    return -1;
-	  optarg = argv[optind++];
+	  d->optarg = argv[d->optind++];
 	  return 1;
 	}
 
       /* We have found another option-ARGV-element.
 	 Skip the initial punctuation.  */
 
-      nextchar = (argv[optind] + 1
-		  + (longopts != NULL && argv[optind][1] == '-'));
+      d->__nextchar = (argv[d->optind] + 1
+		  + (longopts != NULL && argv[d->optind][1] == '-'));
     }
 
   /* Decode the current option-ARGV-element.  */
@@ -630,8 +498,9 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
      This distinction seems to be the most useful approach.  */
 
   if (longopts != NULL
-      && (argv[optind][1] == '-'
-	  || (long_only && (argv[optind][2] || !my_index (optstring, argv[optind][1])))))
+      && (argv[d->optind][1] == '-'
+	  || (long_only && (argv[d->optind][2]
+			    || !strchr (optstring, argv[d->optind][1])))))
     {
       char *nameend;
       const struct option *p;
@@ -641,15 +510,15 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
       int indfound = -1;
       int option_index;
 
-      for (nameend = nextchar; *nameend && *nameend != '='; nameend++)
+      for (nameend = d->__nextchar; *nameend && *nameend != '='; nameend++)
 	/* Do nothing.  */ ;
 
       /* Test all long options for either exact match
 	 or abbreviated matches.  */
       for (p = longopts, option_index = 0; p->name; p++, option_index++)
-	if (!strncmp (p->name, nextchar, nameend - nextchar))
+	if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar))
 	  {
-	    if ((unsigned int) (nameend - nextchar)
+	    if ((unsigned int) (nameend - d->__nextchar)
 		== (unsigned int) strlen (p->name))
 	      {
 		/* Exact match found.  */
@@ -664,70 +533,169 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 		pfound = p;
 		indfound = option_index;
 	      }
-	    else
+	    else if (long_only
+		     || pfound->has_arg != p->has_arg
+		     || pfound->flag != p->flag
+		     || pfound->val != p->val)
 	      /* Second or later nonexact match found.  */
 	      ambig = 1;
 	  }
 
       if (ambig && !exact)
 	{
-	  if (opterr)
-	    fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
-		     argv[0], argv[optind]);
-	  nextchar += strlen (nextchar);
-	  optind++;
-	  optopt = 0;
+	  if (print_errors)
+	    {
+#if defined _LIBC && defined USE_IN_LIBIO
+	      char *buf;
+
+	      if (__asprintf (&buf, _("%s: option `%s' is ambiguous\n"),
+			      argv[0], argv[d->optind]) >= 0)
+		{
+		  _IO_flockfile (stderr);
+
+		  int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+		  ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+
+		  if (_IO_fwide (stderr, 0) > 0)
+		    __fwprintf (stderr, L"%s", buf);
+		  else
+		    fputs (buf, stderr);
+
+		  ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+		  _IO_funlockfile (stderr);
+
+		  free (buf);
+		}
+#else
+	      fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
+		       argv[0], argv[d->optind]);
+#endif
+	    }
+	  d->__nextchar += strlen (d->__nextchar);
+	  d->optind++;
+	  d->optopt = 0;
 	  return '?';
 	}
 
       if (pfound != NULL)
 	{
 	  option_index = indfound;
-	  optind++;
+	  d->optind++;
 	  if (*nameend)
 	    {
 	      /* Don't test has_arg with >, because some C compilers don't
 		 allow it to be used on enums.  */
 	      if (pfound->has_arg)
-		optarg = nameend + 1;
+		d->optarg = nameend + 1;
 	      else
 		{
-		  if (opterr)
+		  if (print_errors)
 		    {
-		      if (argv[optind - 1][1] == '-')
-			/* --option */
-			fprintf (stderr,
-				 _("%s: option `--%s' doesn't allow an argument\n"),
-				 argv[0], pfound->name);
+#if defined _LIBC && defined USE_IN_LIBIO
+		      char *buf;
+		      int n;
+#endif
+
+		      if (argv[d->optind - 1][1] == '-')
+			{
+			  /* --option */
+#if defined _LIBC && defined USE_IN_LIBIO
+			  n = __asprintf (&buf, _("\
+%s: option `--%s' doesn't allow an argument\n"),
+					  argv[0], pfound->name);
+#else
+			  fprintf (stderr, _("\
+%s: option `--%s' doesn't allow an argument\n"),
+				   argv[0], pfound->name);
+#endif
+			}
 		      else
-			/* +option or -option */
-			fprintf (stderr,
-				 _("%s: option `%c%s' doesn't allow an argument\n"),
-				 argv[0], argv[optind - 1][0], pfound->name);
+			{
+			  /* +option or -option */
+#if defined _LIBC && defined USE_IN_LIBIO
+			  n = __asprintf (&buf, _("\
+%s: option `%c%s' doesn't allow an argument\n"),
+					  argv[0], argv[d->optind - 1][0],
+					  pfound->name);
+#else
+			  fprintf (stderr, _("\
+%s: option `%c%s' doesn't allow an argument\n"),
+				   argv[0], argv[d->optind - 1][0],
+				   pfound->name);
+#endif
+			}
+
+#if defined _LIBC && defined USE_IN_LIBIO
+		      if (n >= 0)
+			{
+			  _IO_flockfile (stderr);
+
+			  int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+			  ((_IO_FILE *) stderr)->_flags2
+			    |= _IO_FLAGS2_NOTCANCEL;
+
+			  if (_IO_fwide (stderr, 0) > 0)
+			    __fwprintf (stderr, L"%s", buf);
+			  else
+			    fputs (buf, stderr);
+
+			  ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+			  _IO_funlockfile (stderr);
+
+			  free (buf);
+			}
+#endif
 		    }
 
-		  nextchar += strlen (nextchar);
+		  d->__nextchar += strlen (d->__nextchar);
 
-		  optopt = pfound->val;
+		  d->optopt = pfound->val;
 		  return '?';
 		}
 	    }
 	  else if (pfound->has_arg == 1)
 	    {
-	      if (optind < argc)
-		optarg = argv[optind++];
+	      if (d->optind < argc)
+		d->optarg = argv[d->optind++];
 	      else
 		{
-		  if (opterr)
-		    fprintf (stderr,
-			   _("%s: option `%s' requires an argument\n"),
-			   argv[0], argv[optind - 1]);
-		  nextchar += strlen (nextchar);
-		  optopt = pfound->val;
+		  if (print_errors)
+		    {
+#if defined _LIBC && defined USE_IN_LIBIO
+		      char *buf;
+
+		      if (__asprintf (&buf, _("\
+%s: option `%s' requires an argument\n"),
+				      argv[0], argv[d->optind - 1]) >= 0)
+			{
+			  _IO_flockfile (stderr);
+
+			  int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+			  ((_IO_FILE *) stderr)->_flags2
+			    |= _IO_FLAGS2_NOTCANCEL;
+
+			  if (_IO_fwide (stderr, 0) > 0)
+			    __fwprintf (stderr, L"%s", buf);
+			  else
+			    fputs (buf, stderr);
+
+			  ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+			  _IO_funlockfile (stderr);
+
+			  free (buf);
+			}
+#else
+		      fprintf (stderr,
+			       _("%s: option `%s' requires an argument\n"),
+			       argv[0], argv[d->optind - 1]);
+#endif
+		    }
+		  d->__nextchar += strlen (d->__nextchar);
+		  d->optopt = pfound->val;
 		  return optstring[0] == ':' ? ':' : '?';
 		}
 	    }
-	  nextchar += strlen (nextchar);
+	  d->__nextchar += strlen (d->__nextchar);
 	  if (longind != NULL)
 	    *longind = option_index;
 	  if (pfound->flag)
@@ -742,23 +710,62 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 	 or the option starts with '--' or is not a valid short
 	 option, then it's an error.
 	 Otherwise interpret it as a short option.  */
-      if (!long_only || argv[optind][1] == '-'
-	  || my_index (optstring, *nextchar) == NULL)
+      if (!long_only || argv[d->optind][1] == '-'
+	  || strchr (optstring, *d->__nextchar) == NULL)
 	{
-	  if (opterr)
+	  if (print_errors)
 	    {
-	      if (argv[optind][1] == '-')
-		/* --option */
-		fprintf (stderr, _("%s: unrecognized option `--%s'\n"),
-			 argv[0], nextchar);
+#if defined _LIBC && defined USE_IN_LIBIO
+	      char *buf;
+	      int n;
+#endif
+
+	      if (argv[d->optind][1] == '-')
+		{
+		  /* --option */
+#if defined _LIBC && defined USE_IN_LIBIO
+		  n = __asprintf (&buf, _("%s: unrecognized option `--%s'\n"),
+				  argv[0], d->__nextchar);
+#else
+		  fprintf (stderr, _("%s: unrecognized option `--%s'\n"),
+			   argv[0], d->__nextchar);
+#endif
+		}
 	      else
-		/* +option or -option */
-		fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),
-			 argv[0], argv[optind][0], nextchar);
+		{
+		  /* +option or -option */
+#if defined _LIBC && defined USE_IN_LIBIO
+		  n = __asprintf (&buf, _("%s: unrecognized option `%c%s'\n"),
+				  argv[0], argv[d->optind][0], d->__nextchar);
+#else
+		  fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),
+			   argv[0], argv[d->optind][0], d->__nextchar);
+#endif
+		}
+
+#if defined _LIBC && defined USE_IN_LIBIO
+	      if (n >= 0)
+		{
+		  _IO_flockfile (stderr);
+
+		  int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+		  ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+
+		  if (_IO_fwide (stderr, 0) > 0)
+		    __fwprintf (stderr, L"%s", buf);
+		  else
+		    fputs (buf, stderr);
+
+		  ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+		  _IO_funlockfile (stderr);
+
+		  free (buf);
+		}
+#endif
 	    }
-	  nextchar = (char *) "";
-	  optind++;
-	  optopt = 0;
+	  d->__nextchar = (char *) "";
+	  d->optind++;
+	  d->optopt = 0;
 	  return '?';
 	}
     }
@@ -766,26 +773,63 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
   /* Look at and handle the next short option-character.  */
 
   {
-    char c = *nextchar++;
-    char *temp = my_index (optstring, c);
+    char c = *d->__nextchar++;
+    char *temp = strchr (optstring, c);
 
     /* Increment `optind' when we start to process its last character.  */
-    if (*nextchar == '\0')
-      ++optind;
+    if (*d->__nextchar == '\0')
+      ++d->optind;
 
     if (temp == NULL || c == ':')
       {
-	if (opterr)
+	if (print_errors)
 	  {
-	    if (posixly_correct)
-	      /* 1003.2 specifies the format of this message.  */
-	      fprintf (stderr, _("%s: illegal option -- %c\n"),
-		       argv[0], c);
+#if defined _LIBC && defined USE_IN_LIBIO
+	      char *buf;
+	      int n;
+#endif
+
+	    if (d->__posixly_correct)
+	      {
+		/* 1003.2 specifies the format of this message.  */
+#if defined _LIBC && defined USE_IN_LIBIO
+		n = __asprintf (&buf, _("%s: illegal option -- %c\n"),
+				argv[0], c);
+#else
+		fprintf (stderr, _("%s: illegal option -- %c\n"), argv[0], c);
+#endif
+	      }
 	    else
-	      fprintf (stderr, _("%s: invalid option -- %c\n"),
-		       argv[0], c);
+	      {
+#if defined _LIBC && defined USE_IN_LIBIO
+		n = __asprintf (&buf, _("%s: invalid option -- %c\n"),
+				argv[0], c);
+#else
+		fprintf (stderr, _("%s: invalid option -- %c\n"), argv[0], c);
+#endif
+	      }
+
+#if defined _LIBC && defined USE_IN_LIBIO
+	    if (n >= 0)
+	      {
+		_IO_flockfile (stderr);
+
+		int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+		((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+
+		if (_IO_fwide (stderr, 0) > 0)
+		  __fwprintf (stderr, L"%s", buf);
+		else
+		  fputs (buf, stderr);
+
+		((_IO_FILE *) stderr)->_flags2 = old_flags2;
+		_IO_funlockfile (stderr);
+
+		free (buf);
+	      }
+#endif
 	  }
-	optopt = c;
+	d->optopt = c;
 	return '?';
       }
     /* Convenience. Treat POSIX -W foo same as long option --foo */
@@ -800,22 +844,46 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 	int option_index;
 
 	/* This is an option that requires an argument.  */
-	if (*nextchar != '\0')
+	if (*d->__nextchar != '\0')
 	  {
-	    optarg = nextchar;
+	    d->optarg = d->__nextchar;
 	    /* If we end this ARGV-element by taking the rest as an arg,
 	       we must advance to the next element now.  */
-	    optind++;
+	    d->optind++;
 	  }
-	else if (optind == argc)
+	else if (d->optind == argc)
 	  {
-	    if (opterr)
+	    if (print_errors)
 	      {
 		/* 1003.2 specifies the format of this message.  */
+#if defined _LIBC && defined USE_IN_LIBIO
+		char *buf;
+
+		if (__asprintf (&buf,
+				_("%s: option requires an argument -- %c\n"),
+				argv[0], c) >= 0)
+		  {
+		    _IO_flockfile (stderr);
+
+		    int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+		    ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+
+		    if (_IO_fwide (stderr, 0) > 0)
+		      __fwprintf (stderr, L"%s", buf);
+		    else
+		      fputs (buf, stderr);
+
+		    ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+		    _IO_funlockfile (stderr);
+
+		    free (buf);
+		  }
+#else
 		fprintf (stderr, _("%s: option requires an argument -- %c\n"),
 			 argv[0], c);
+#endif
 	      }
-	    optopt = c;
+	    d->optopt = c;
 	    if (optstring[0] == ':')
 	      c = ':';
 	    else
@@ -823,22 +891,23 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 	    return c;
 	  }
 	else
-	  /* We already incremented `optind' once;
+	  /* We already incremented `d->optind' once;
 	     increment it again when taking next ARGV-elt as argument.  */
-	  optarg = argv[optind++];
+	  d->optarg = argv[d->optind++];
 
 	/* optarg is now the argument, see if it's in the
 	   table of longopts.  */
 
-	for (nextchar = nameend = optarg; *nameend && *nameend != '='; nameend++)
+	for (d->__nextchar = nameend = d->optarg; *nameend && *nameend != '=';
+	     nameend++)
 	  /* Do nothing.  */ ;
 
 	/* Test all long options for either exact match
 	   or abbreviated matches.  */
 	for (p = longopts, option_index = 0; p->name; p++, option_index++)
-	  if (!strncmp (p->name, nextchar, nameend - nextchar))
+	  if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar))
 	    {
-	      if ((unsigned int) (nameend - nextchar) == strlen (p->name))
+	      if ((unsigned int) (nameend - d->__nextchar) == strlen (p->name))
 		{
 		  /* Exact match found.  */
 		  pfound = p;
@@ -858,11 +927,36 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 	    }
 	if (ambig && !exact)
 	  {
-	    if (opterr)
-	      fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),
-		       argv[0], argv[optind]);
-	    nextchar += strlen (nextchar);
-	    optind++;
+	    if (print_errors)
+	      {
+#if defined _LIBC && defined USE_IN_LIBIO
+		char *buf;
+
+		if (__asprintf (&buf, _("%s: option `-W %s' is ambiguous\n"),
+				argv[0], argv[d->optind]) >= 0)
+		  {
+		    _IO_flockfile (stderr);
+
+		    int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+		    ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+
+		    if (_IO_fwide (stderr, 0) > 0)
+		      __fwprintf (stderr, L"%s", buf);
+		    else
+		      fputs (buf, stderr);
+
+		    ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+		    _IO_funlockfile (stderr);
+
+		    free (buf);
+		  }
+#else
+		fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),
+			 argv[0], argv[d->optind]);
+#endif
+	      }
+	    d->__nextchar += strlen (d->__nextchar);
+	    d->optind++;
 	    return '?';
 	  }
 	if (pfound != NULL)
@@ -873,33 +967,87 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 		/* Don't test has_arg with >, because some C compilers don't
 		   allow it to be used on enums.  */
 		if (pfound->has_arg)
-		  optarg = nameend + 1;
+		  d->optarg = nameend + 1;
 		else
 		  {
-		    if (opterr)
-		      fprintf (stderr, _("\
+		    if (print_errors)
+		      {
+#if defined _LIBC && defined USE_IN_LIBIO
+			char *buf;
+
+			if (__asprintf (&buf, _("\
+%s: option `-W %s' doesn't allow an argument\n"),
+					argv[0], pfound->name) >= 0)
+			  {
+			    _IO_flockfile (stderr);
+
+			    int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+			    ((_IO_FILE *) stderr)->_flags2
+			      |= _IO_FLAGS2_NOTCANCEL;
+
+			    if (_IO_fwide (stderr, 0) > 0)
+			      __fwprintf (stderr, L"%s", buf);
+			    else
+			      fputs (buf, stderr);
+
+			    ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+			    _IO_funlockfile (stderr);
+
+			    free (buf);
+			  }
+#else
+			fprintf (stderr, _("\
 %s: option `-W %s' doesn't allow an argument\n"),
-			       argv[0], pfound->name);
+				 argv[0], pfound->name);
+#endif
+		      }
 
-		    nextchar += strlen (nextchar);
+		    d->__nextchar += strlen (d->__nextchar);
 		    return '?';
 		  }
 	      }
 	    else if (pfound->has_arg == 1)
 	      {
-		if (optind < argc)
-		  optarg = argv[optind++];
+		if (d->optind < argc)
+		  d->optarg = argv[d->optind++];
 		else
 		  {
-		    if (opterr)
-		      fprintf (stderr,
-			       _("%s: option `%s' requires an argument\n"),
-			       argv[0], argv[optind - 1]);
-		    nextchar += strlen (nextchar);
+		    if (print_errors)
+		      {
+#if defined _LIBC && defined USE_IN_LIBIO
+			char *buf;
+
+			if (__asprintf (&buf, _("\
+%s: option `%s' requires an argument\n"),
+					argv[0], argv[d->optind - 1]) >= 0)
+			  {
+			    _IO_flockfile (stderr);
+
+			    int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+			    ((_IO_FILE *) stderr)->_flags2
+			      |= _IO_FLAGS2_NOTCANCEL;
+
+			    if (_IO_fwide (stderr, 0) > 0)
+			      __fwprintf (stderr, L"%s", buf);
+			    else
+			      fputs (buf, stderr);
+
+			    ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+			    _IO_funlockfile (stderr);
+
+			    free (buf);
+			  }
+#else
+			fprintf (stderr,
+				 _("%s: option `%s' requires an argument\n"),
+				 argv[0], argv[d->optind - 1]);
+#endif
+		      }
+		    d->__nextchar += strlen (d->__nextchar);
 		    return optstring[0] == ':' ? ':' : '?';
 		  }
 	      }
-	    nextchar += strlen (nextchar);
+	    d->__nextchar += strlen (d->__nextchar);
 	    if (longind != NULL)
 	      *longind = option_index;
 	    if (pfound->flag)
@@ -909,7 +1057,7 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 	      }
 	    return pfound->val;
 	  }
-	  nextchar = NULL;
+	  d->__nextchar = NULL;
 	  return 'W';	/* Let the application handle it.   */
       }
     if (temp[1] == ':')
@@ -917,35 +1065,59 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 	if (temp[2] == ':')
 	  {
 	    /* This is an option that accepts an argument optionally.  */
-	    if (*nextchar != '\0')
+	    if (*d->__nextchar != '\0')
 	      {
-		optarg = nextchar;
-		optind++;
+		d->optarg = d->__nextchar;
+		d->optind++;
 	      }
 	    else
-	      optarg = NULL;
-	    nextchar = NULL;
+	      d->optarg = NULL;
+	    d->__nextchar = NULL;
 	  }
 	else
 	  {
 	    /* This is an option that requires an argument.  */
-	    if (*nextchar != '\0')
+	    if (*d->__nextchar != '\0')
 	      {
-		optarg = nextchar;
+		d->optarg = d->__nextchar;
 		/* If we end this ARGV-element by taking the rest as an arg,
 		   we must advance to the next element now.  */
-		optind++;
+		d->optind++;
 	      }
-	    else if (optind == argc)
+	    else if (d->optind == argc)
 	      {
-		if (opterr)
+		if (print_errors)
 		  {
 		    /* 1003.2 specifies the format of this message.  */
+#if defined _LIBC && defined USE_IN_LIBIO
+		    char *buf;
+
+		    if (__asprintf (&buf, _("\
+%s: option requires an argument -- %c\n"),
+				    argv[0], c) >= 0)
+		      {
+			_IO_flockfile (stderr);
+
+			int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+			((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+
+			if (_IO_fwide (stderr, 0) > 0)
+			  __fwprintf (stderr, L"%s", buf);
+			else
+			  fputs (buf, stderr);
+
+			((_IO_FILE *) stderr)->_flags2 = old_flags2;
+			_IO_funlockfile (stderr);
+
+			free (buf);
+		      }
+#else
 		    fprintf (stderr,
-			   _("%s: option requires an argument -- %c\n"),
-			   argv[0], c);
+			     _("%s: option requires an argument -- %c\n"),
+			     argv[0], c);
+#endif
 		  }
-		optopt = c;
+		d->optopt = c;
 		if (optstring[0] == ':')
 		  c = ':';
 		else
@@ -954,8 +1126,8 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 	    else
 	      /* We already incremented `optind' once;
 		 increment it again when taking next ARGV-elt as argument.  */
-	      optarg = argv[optind++];
-	    nextchar = NULL;
+	      d->optarg = argv[d->optind++];
+	    d->__nextchar = NULL;
 	  }
       }
     return c;
@@ -963,10 +1135,26 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only)
 }
 
 int
-getopt (argc, argv, optstring)
-     int argc;
-     char *const *argv;
-     const char *optstring;
+_getopt_internal (int argc, char *const *argv, const char *optstring,
+		  const struct option *longopts, int *longind, int long_only)
+{
+  int result;
+
+  getopt_data.optind = optind;
+  getopt_data.opterr = opterr;
+
+  result = _getopt_internal_r (argc, argv, optstring, longopts,
+			       longind, long_only, &getopt_data);
+
+  optind = getopt_data.optind;
+  optarg = getopt_data.optarg;
+  optopt = getopt_data.optopt;
+
+  return result;
+}
+
+int
+getopt (int argc, char *const *argv, const char *optstring)
 {
   return _getopt_internal (argc, argv, optstring,
 			   (const struct option *) 0,
@@ -974,7 +1162,6 @@ getopt (argc, argv, optstring)
 			   0);
 }
 
-#endif	/* Not ELIDE_CODE.  */
 
 #ifdef TEST
 
@@ -982,9 +1169,7 @@ getopt (argc, argv, optstring)
    the above definition of `getopt'.  */
 
 int
-main (argc, argv)
-     int argc;
-     char **argv;
+main (int argc, char **argv)
 {
   int c;
   int digit_optind = 0;
diff --git a/gnu/usr.bin/texinfo/lib/getopt.h b/gnu/usr.bin/texinfo/lib/getopt.h
index ac6728f83d4..d3348a61cbd 100644
--- a/gnu/usr.bin/texinfo/lib/getopt.h
+++ b/gnu/usr.bin/texinfo/lib/getopt.h
@@ -1,169 +1,10 @@
-/* Declarations for getopt.
-   Copyright (C) 1989,90,91,92,93,94,96,97,98 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@gnu.org.
-   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.
+/* getopt.h -- wrapper for gnulib getopt_.h.
+   $Id: getopt.h,v 1.1.1.5 2006/07/17 16:03:41 espie Exp $
+   Copyright (C) 2004 Free Software Foundation, Inc.
 
-   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.
+   Copying and distribution of this file, with or without modification,
+   are permitted in any medium without royalty provided the copyright
+   notice and this notice are preserved.
+*/
 
-   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
-
-#ifndef __need_getopt
-# define _GETOPT_H 1
-#endif
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-/* For communication from `getopt' to the caller.
-   When `getopt' finds an option that takes an argument,
-   the argument value is returned here.
-   Also, when `ordering' is RETURN_IN_ORDER,
-   each non-option ARGV-element is returned here.  */
-
-extern char *optarg;
-
-/* Index in ARGV of the next element to be scanned.
-   This is used for communication to and from the caller
-   and for communication between successive calls to `getopt'.
-
-   On entry to `getopt', zero means this is the first call; initialize.
-
-   When `getopt' returns -1, this is the index of the first of the
-   non-option elements that the caller should itself scan.
-
-   Otherwise, `optind' communicates from one call to the next
-   how much of ARGV has been scanned so far.  */
-
-extern int optind;
-
-/* Callers store zero here to inhibit the error message `getopt' prints
-   for unrecognized options.  */
-
-extern int opterr;
-
-/* Set to an option character which was unrecognized.  */
-
-extern int optopt;
-
-#ifndef __need_getopt
-/* Describe the long-named options requested by the application.
-   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
-   of `struct option' terminated by an element containing a name which is
-   zero.
-
-   The field `has_arg' is:
-   no_argument		(or 0) if the option does not take an argument,
-   required_argument	(or 1) if the option requires an argument,
-   optional_argument 	(or 2) if the option takes an optional argument.
-
-   If the field `flag' is not NULL, it points to a variable that is set
-   to the value given in the field `val' when the option is found, but
-   left unchanged if the option is not found.
-
-   To have a long-named option do something other than set an `int' to
-   a compiled-in constant, such as set a value from `optarg', set the
-   option's `flag' field to zero and its `val' field to a nonzero
-   value (the equivalent single-letter option character, if there is
-   one).  For long options that have a zero `flag' field, `getopt'
-   returns the contents of the `val' field.  */
-
-struct option
-{
-# if defined __STDC__ && __STDC__
-  const char *name;
-# else
-  char *name;
-# endif
-  /* has_arg can't be an enum because some compilers complain about
-     type mismatches in all the code that assumes it is an int.  */
-  int has_arg;
-  int *flag;
-  int val;
-};
-
-/* Names for the values of the `has_arg' field of `struct option'.  */
-
-# define no_argument		0
-# define required_argument	1
-# define optional_argument	2
-#endif	/* need getopt */
-
-
-/* Get definitions and prototypes for functions to process the
-   arguments in ARGV (ARGC of them, minus the program name) for
-   options given in OPTS.
-
-   Return the option character from OPTS just read.  Return -1 when
-   there are no more options.  For unrecognized options, or options
-   missing arguments, `optopt' is set to the option letter, and '?' is
-   returned.
-
-   The OPTS string is a list of characters which are recognized option
-   letters, optionally followed by colons, specifying that that letter
-   takes an argument, to be placed in `optarg'.
-
-   If a letter in OPTS is followed by two colons, its argument is
-   optional.  This behavior is specific to the GNU `getopt'.
-
-   The argument `--' causes premature termination of argument
-   scanning, explicitly telling `getopt' that there are no more
-   options.
-
-   If OPTS begins with `--', then non-option arguments are treated as
-   arguments to the option '\0'.  This behavior is specific to the GNU
-   `getopt'.  */
-
-#if defined __STDC__ && __STDC__
-# ifdef __GNU_LIBRARY__
-/* Many other libraries have conflicting prototypes for getopt, with
-   differences in the consts, in stdlib.h.  To avoid compilation
-   errors, only prototype getopt for the GNU C library.  */
-extern int getopt (int __argc, char *const *__argv, const char *__shortopts);
-# else /* not __GNU_LIBRARY__ */
-extern int getopt ();
-# endif /* __GNU_LIBRARY__ */
-
-# ifndef __need_getopt
-extern int getopt_long (int __argc, char *const *__argv, const char *__shortopts,
-		        const struct option *__longopts, int *__longind);
-extern int getopt_long_only (int __argc, char *const *__argv,
-			     const char *__shortopts,
-		             const struct option *__longopts, int *__longind);
-
-/* Internal only.  Users should not call this directly.  */
-extern int _getopt_internal (int __argc, char *const *__argv,
-			     const char *__shortopts,
-		             const struct option *__longopts, int *__longind,
-			     int __long_only);
-# endif
-#else /* not __STDC__ */
-extern int getopt ();
-# ifndef __need_getopt
-extern int getopt_long ();
-extern int getopt_long_only ();
-
-extern int _getopt_internal ();
-# endif
-#endif /* __STDC__ */
-
-#ifdef	__cplusplus
-}
-#endif
-
-/* Make sure we later can get all the definitions and declarations.  */
-#undef __need_getopt
-
-#endif /* getopt.h */
+#include "getopt_.h"
diff --git a/gnu/usr.bin/texinfo/lib/getopt1.c b/gnu/usr.bin/texinfo/lib/getopt1.c
index 9c8256567c4..706f59c0837 100644
--- a/gnu/usr.bin/texinfo/lib/getopt1.c
+++ b/gnu/usr.bin/texinfo/lib/getopt1.c
@@ -1,57 +1,34 @@
 /* getopt_long and getopt_long_only entry points for GNU getopt.
-   Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98
+   Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2004
      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@gnu.org.
+   This file is part of the GNU C Library.
 
-   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.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
+   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>
-#else
-#if !defined __STDC__ || !__STDC__
-/* This is a separate conditional since some stdc systems
-   reject `defined (const)'.  */
-#ifndef const
-#define const
-#endif
-#endif
 #endif
 
-#include "getopt.h"
-
-#include <stdio.h>
-
-/* Comment out all this code if we are using the GNU C Library, and are not
-   actually compiling the library itself.  This code is part of the GNU C
-   Library, but also included in many other GNU distributions.  Compiling
-   and linking in this code is a waste when using the GNU C library
-   (especially if it is a shared library).  Rather than having every GNU
-   program understand `configure --with-gnu-libc' and omit the object files,
-   it is simpler to just do this in the source for each such file.  */
-
-#define GETOPT_INTERFACE_VERSION 2
-#if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
-#include <gnu-versions.h>
-#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
-#define ELIDE_CODE
-#endif
+#ifdef _LIBC
+# include <getopt.h>
+#else
+# include "getopt.h"
 #endif
+#include "getopt_int.h"
 
-#ifndef ELIDE_CODE
-
+#include <stdio.h>
 
 /* This needs to come after some library #include
    to get __GNU_LIBRARY__ defined.  */
@@ -64,43 +41,49 @@
 #endif
 
 int
-getopt_long (argc, argv, options, long_options, opt_index)
-     int argc;
-     char *const *argv;
-     const char *options;
-     const struct option *long_options;
-     int *opt_index;
+getopt_long (int argc, char *const *argv, const char *options,
+	     const struct option *long_options, int *opt_index)
 {
   return _getopt_internal (argc, argv, options, long_options, opt_index, 0);
 }
 
+int
+_getopt_long_r (int argc, char *const *argv, const char *options,
+		const struct option *long_options, int *opt_index,
+		struct _getopt_data *d)
+{
+  return _getopt_internal_r (argc, argv, options, long_options, opt_index,
+			     0, d);
+}
+
 /* Like getopt_long, but '-' as well as '--' can indicate a long option.
    If an option that starts with '-' (not '--') doesn't match a long option,
    but does match a short option, it is parsed as a short option
    instead.  */
 
 int
-getopt_long_only (argc, argv, options, long_options, opt_index)
-     int argc;
-     char *const *argv;
-     const char *options;
-     const struct option *long_options;
-     int *opt_index;
+getopt_long_only (int argc, char *const *argv, const char *options,
+		  const struct option *long_options, int *opt_index)
 {
   return _getopt_internal (argc, argv, options, long_options, opt_index, 1);
 }
 
+int
+_getopt_long_only_r (int argc, char *const *argv, const char *options,
+		     const struct option *long_options, int *opt_index,
+		     struct _getopt_data *d)
+{
+  return _getopt_internal_r (argc, argv, options, long_options, opt_index,
+			     1, d);
+}
 
-#endif	/* Not ELIDE_CODE.  */
 
 #ifdef TEST
 
 #include <stdio.h>
 
 int
-main (argc, argv)
-     int argc;
-     char **argv;
+main (int argc, char **argv)
 {
   int c;
   int digit_optind = 0;
diff --git a/gnu/usr.bin/texinfo/lib/getopt_.h b/gnu/usr.bin/texinfo/lib/getopt_.h
new file mode 100644
index 00000000000..c61768c691b
--- /dev/null
+++ b/gnu/usr.bin/texinfo/lib/getopt_.h
@@ -0,0 +1,176 @@
+/* Declarations for getopt.
+   Copyright (C) 1989-1994,1996-1999,2001,2003,2004
+   Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   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.  */
+
+#ifndef _GETOPT_H
+
+#ifndef __need_getopt
+# define _GETOPT_H 1
+#endif
+
+/* If __GNU_LIBRARY__ is not already defined, either we are being used
+   standalone, or this is the first header included in the source file.
+   If we are being used with glibc, we need to include <features.h>, but
+   that does not exist if we are standalone.  So: if __GNU_LIBRARY__ is
+   not defined, include <ctype.h>, which will pull in <features.h> for us
+   if it's from glibc.  (Why ctype.h?  It's guaranteed to exist and it
+   doesn't flood the namespace with stuff the way some other headers do.)  */
+#if !defined __GNU_LIBRARY__
+# include <ctype.h>
+#endif
+
+#ifndef __THROW
+# ifndef __GNUC_PREREQ
+#  define __GNUC_PREREQ(maj, min) (0)
+# endif
+# if defined __cplusplus && __GNUC_PREREQ (2,8)
+#  define __THROW	throw ()
+# else
+#  define __THROW
+# endif
+#endif
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+/* For communication from `getopt' to the caller.
+   When `getopt' finds an option that takes an argument,
+   the argument value is returned here.
+   Also, when `ordering' is RETURN_IN_ORDER,
+   each non-option ARGV-element is returned here.  */
+
+extern char *optarg;
+
+/* Index in ARGV of the next element to be scanned.
+   This is used for communication to and from the caller
+   and for communication between successive calls to `getopt'.
+
+   On entry to `getopt', zero means this is the first call; initialize.
+
+   When `getopt' returns -1, this is the index of the first of the
+   non-option elements that the caller should itself scan.
+
+   Otherwise, `optind' communicates from one call to the next
+   how much of ARGV has been scanned so far.  */
+
+extern int optind;
+
+/* Callers store zero here to inhibit the error message `getopt' prints
+   for unrecognized options.  */
+
+extern int opterr;
+
+/* Set to an option character which was unrecognized.  */
+
+extern int optopt;
+
+#ifndef __need_getopt
+/* Describe the long-named options requested by the application.
+   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
+   of `struct option' terminated by an element containing a name which is
+   zero.
+
+   The field `has_arg' is:
+   no_argument		(or 0) if the option does not take an argument,
+   required_argument	(or 1) if the option requires an argument,
+   optional_argument 	(or 2) if the option takes an optional argument.
+
+   If the field `flag' is not NULL, it points to a variable that is set
+   to the value given in the field `val' when the option is found, but
+   left unchanged if the option is not found.
+
+   To have a long-named option do something other than set an `int' to
+   a compiled-in constant, such as set a value from `optarg', set the
+   option's `flag' field to zero and its `val' field to a nonzero
+   value (the equivalent single-letter option character, if there is
+   one).  For long options that have a zero `flag' field, `getopt'
+   returns the contents of the `val' field.  */
+
+struct option
+{
+  const char *name;
+  /* has_arg can't be an enum because some compilers complain about
+     type mismatches in all the code that assumes it is an int.  */
+  int has_arg;
+  int *flag;
+  int val;
+};
+
+/* Names for the values of the `has_arg' field of `struct option'.  */
+
+# define no_argument		0
+# define required_argument	1
+# define optional_argument	2
+#endif	/* need getopt */
+
+
+/* Get definitions and prototypes for functions to process the
+   arguments in ARGV (ARGC of them, minus the program name) for
+   options given in OPTS.
+
+   Return the option character from OPTS just read.  Return -1 when
+   there are no more options.  For unrecognized options, or options
+   missing arguments, `optopt' is set to the option letter, and '?' is
+   returned.
+
+   The OPTS string is a list of characters which are recognized option
+   letters, optionally followed by colons, specifying that that letter
+   takes an argument, to be placed in `optarg'.
+
+   If a letter in OPTS is followed by two colons, its argument is
+   optional.  This behavior is specific to the GNU `getopt'.
+
+   The argument `--' causes premature termination of argument
+   scanning, explicitly telling `getopt' that there are no more
+   options.
+
+   If OPTS begins with `--', then non-option arguments are treated as
+   arguments to the option '\0'.  This behavior is specific to the GNU
+   `getopt'.  */
+
+#ifdef __GNU_LIBRARY__
+/* Many other libraries have conflicting prototypes for getopt, with
+   differences in the consts, in stdlib.h.  To avoid compilation
+   errors, only prototype getopt for the GNU C library.  */
+extern int getopt (int ___argc, char *const *___argv, const char *__shortopts)
+       __THROW;
+#else /* not __GNU_LIBRARY__ */
+extern int getopt ();
+#endif /* __GNU_LIBRARY__ */
+
+#ifndef __need_getopt
+extern int getopt_long (int ___argc, char *const *___argv,
+			const char *__shortopts,
+		        const struct option *__longopts, int *__longind)
+       __THROW;
+extern int getopt_long_only (int ___argc, char *const *___argv,
+			     const char *__shortopts,
+		             const struct option *__longopts, int *__longind)
+       __THROW;
+
+#endif
+
+#ifdef	__cplusplus
+}
+#endif
+
+/* Make sure we later can get all the definitions and declarations.  */
+#undef __need_getopt
+
+#endif /* getopt.h */
diff --git a/gnu/usr.bin/texinfo/lib/getopt_int.h b/gnu/usr.bin/texinfo/lib/getopt_int.h
new file mode 100644
index 00000000000..0c5eddeca96
--- /dev/null
+++ b/gnu/usr.bin/texinfo/lib/getopt_int.h
@@ -0,0 +1,129 @@
+/* Internal declarations for getopt.
+   Copyright (C) 1989-1994,1996-1999,2001,2003,2004
+   Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   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.  */
+
+#ifndef _GETOPT_INT_H
+#define _GETOPT_INT_H	1
+
+extern int _getopt_internal (int ___argc, char *const *___argv,
+			     const char *__shortopts,
+		             const struct option *__longopts, int *__longind,
+			     int __long_only);
+
+
+/* Reentrant versions which can handle parsing multiple argument
+   vectors at the same time.  */
+
+/* Data type for reentrant functions.  */
+struct _getopt_data
+{
+  /* These have exactly the same meaning as the corresponding global
+     variables, except that they are used for the reentrant
+     versions of getopt.  */
+  int optind;
+  int opterr;
+  int optopt;
+  char *optarg;
+
+  /* Internal members.  */
+
+  /* True if the internal members have been initialized.  */
+  int __initialized;
+
+  /* The next char to be scanned in the option-element
+     in which the last option character we returned was found.
+     This allows us to pick up the scan where we left off.
+
+     If this is zero, or a null string, it means resume the scan
+     by advancing to the next ARGV-element.  */
+  char *__nextchar;
+
+  /* Describe how to deal with options that follow non-option ARGV-elements.
+
+     If the caller did not specify anything,
+     the default is REQUIRE_ORDER if the environment variable
+     POSIXLY_CORRECT is defined, PERMUTE otherwise.
+
+     REQUIRE_ORDER means don't recognize them as options;
+     stop option processing when the first non-option is seen.
+     This is what Unix does.
+     This mode of operation is selected by either setting the environment
+     variable POSIXLY_CORRECT, or using `+' as the first character
+     of the list of option characters.
+
+     PERMUTE is the default.  We permute the contents of ARGV as we
+     scan, so that eventually all the non-options are at the end.
+     This allows options to be given in any order, even with programs
+     that were not written to expect this.
+
+     RETURN_IN_ORDER is an option available to programs that were
+     written to expect options and other ARGV-elements in any order
+     and that care about the ordering of the two.  We describe each
+     non-option ARGV-element as if it were the argument of an option
+     with character code 1.  Using `-' as the first character of the
+     list of option characters selects this mode of operation.
+
+     The special argument `--' forces an end of option-scanning regardless
+     of the value of `ordering'.  In the case of RETURN_IN_ORDER, only
+     `--' can cause `getopt' to return -1 with `optind' != ARGC.  */
+
+  enum
+    {
+      REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
+    } __ordering;
+
+  /* If the POSIXLY_CORRECT environment variable is set.  */
+  int __posixly_correct;
+
+
+  /* Handle permutation of arguments.  */
+
+  /* Describe the part of ARGV that contains non-options that have
+     been skipped.  `first_nonopt' is the index in ARGV of the first
+     of them; `last_nonopt' is the index after the last of them.  */
+
+  int __first_nonopt;
+  int __last_nonopt;
+
+#if defined _LIBC && defined USE_NONOPTION_FLAGS
+  int __nonoption_flags_max_len;
+  int __nonoption_flags_len;
+# endif
+};
+
+/* The initializer is necessary to set OPTIND and OPTERR to their
+   default values and to clear the initialization flag.  */
+#define _GETOPT_DATA_INITIALIZER	{ 1, 1 }
+
+extern int _getopt_internal_r (int ___argc, char *const *___argv,
+			       const char *__shortopts,
+			       const struct option *__longopts, int *__longind,
+			       int __long_only, struct _getopt_data *__data);
+
+extern int _getopt_long_r (int ___argc, char *const *___argv,
+			   const char *__shortopts,
+			   const struct option *__longopts, int *__longind,
+			   struct _getopt_data *__data);
+
+extern int _getopt_long_only_r (int ___argc, char *const *___argv,
+				const char *__shortopts,
+				const struct option *__longopts,
+				int *__longind,
+				struct _getopt_data *__data);
+
+#endif /* getopt_int.h */
diff --git a/gnu/usr.bin/texinfo/lib/gettext.h b/gnu/usr.bin/texinfo/lib/gettext.h
index 4ab74d92c29..835732e01fe 100644
--- a/gnu/usr.bin/texinfo/lib/gettext.h
+++ b/gnu/usr.bin/texinfo/lib/gettext.h
@@ -1,20 +1,19 @@
 /* Convenience header for conditional use of GNU <libintl.h>.
    Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.
 
-   This program 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, or (at your option)
+   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
-   Library General Public License for more details.
+   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 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 _LIBGETTEXT_H
 #define _LIBGETTEXT_H 1
@@ -27,13 +26,21 @@
 
 #else
 
+/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which
+   chokes if dcgettext is defined as a macro.  So include it now, to make
+   later inclusions of <locale.h> a NOP.  We don't include <libintl.h>
+   as well because people using "gettext.h" will not include <libintl.h>,
+   and also including <libintl.h> would fail on SunOS 4, whereas <locale.h>
+   is OK.  */
+#if defined(__sun)
+# include <locale.h>
+#endif
+
 /* Disabled NLS.
    The casts to 'const char *' serve the purpose of producing warnings
    for invalid uses of the value returned from these functions.
    On pre-ANSI systems without 'const', the config.h file is supposed to
    contain "#define const".  */
-#if 0
-/* no thanks, not ready to go const --karl, 26feb02 */
 # define gettext(Msgid) ((const char *) (Msgid))
 # define dgettext(Domainname, Msgid) ((const char *) (Msgid))
 # define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid))
@@ -46,20 +53,7 @@
 # define textdomain(Domainname) ((const char *) (Domainname))
 # define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname))
 # define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset))
-#else /* not 0 */
-# define gettext(Msgid) ((Msgid))
-# define dgettext(Domainname, Msgid) (Msgid)
-# define dcgettext(Domainname, Msgid, Category) (Msgid)
-# define ngettext(Msgid1, Msgid2, N) \
-    ((N) == 1 ? (Msgid1) : (Msgid2))
-# define dngettext(Domainname, Msgid1, Msgid2, N) \
-    ((N) == 1 ? (Msgid1) : (Msgid2))
-# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
-    ((N) == 1 ? (Msgid1) : (Msgid2))
-# define textdomain(Domainname) (Domainname)
-# define bindtextdomain(Domainname, Dirname) (Dirname)
-# define bind_textdomain_codeset(Domainname, Codeset) (Codeset)
-#endif /* 0 */
+
 #endif
 
 /* A pseudo function call that serves as a marker for the automated
diff --git a/gnu/usr.bin/texinfo/lib/memcpy.c b/gnu/usr.bin/texinfo/lib/memcpy.c
index b26d6a4fa89..fdca8de2c80 100644
--- a/gnu/usr.bin/texinfo/lib/memcpy.c
+++ b/gnu/usr.bin/texinfo/lib/memcpy.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1997, 2000, 2003 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,19 +20,19 @@
 # include <config.h>
 #endif
 
+#include <stddef.h>
+
 /* Copy LEN bytes starting at SRCADDR to DESTADDR.  Result undefined
    if the source overlaps with the destination.
    Return DESTADDR. */
 
-char *
-memcpy (destaddr, srcaddr, len)
-     char *destaddr;
-     const char *srcaddr;
-     int len;
+void *
+memcpy (void *destaddr, void const *srcaddr, size_t len)
 {
   char *dest = destaddr;
+  char const *src = srcaddr;
 
   while (len-- > 0)
-    *destaddr++ = *srcaddr++;
-  return dest;
+    *dest++ = *src++;
+  return destaddr;
 }
diff --git a/gnu/usr.bin/texinfo/lib/memmove.c b/gnu/usr.bin/texinfo/lib/memmove.c
index ea38e8df549..79cc7827396 100644
--- a/gnu/usr.bin/texinfo/lib/memmove.c
+++ b/gnu/usr.bin/texinfo/lib/memmove.c
@@ -7,13 +7,13 @@
 # include <config.h>
 #endif
 
+#include <stddef.h>
+
 void *
-memmove (dest, source, length)
-     char *dest;
-     const char *source;
-     unsigned length;
+memmove (void *dest0, void const *source0, size_t length)
 {
-  char *d0 = dest;
+  char *dest = dest0;
+  char const *source = source0;
   if (source < dest)
     /* Moving from low mem to hi mem; start at end.  */
     for (source += length, dest += length; length; --length)
@@ -24,5 +24,5 @@ memmove (dest, source, length)
       for (; length; --length)
 	*dest++ = *source++;
     }
-  return (void *) d0;
+  return dest0;
 }
diff --git a/gnu/usr.bin/texinfo/lib/mkstemp.c b/gnu/usr.bin/texinfo/lib/mkstemp.c
new file mode 100644
index 00000000000..f6312b64636
--- /dev/null
+++ b/gnu/usr.bin/texinfo/lib/mkstemp.c
@@ -0,0 +1,42 @@
+/* Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc.
+   This file is derived from the one in the GNU C Library.
+
+   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.  */
+
+#include <config.h>
+
+/* Disable the definition of mkstemp to rpl_mkstemp (from config.h) in this
+   file.  Otherwise, we'd get conflicting prototypes for rpl_mkstemp on
+   most systems.  */
+#undef mkstemp
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#ifndef __GT_FILE
+# define __GT_FILE 0
+#endif
+
+int __gen_tempname ();
+
+/* Generate a unique temporary file name from TEMPLATE.
+   The last six characters of TEMPLATE must be "XXXXXX";
+   they are replaced with a string that makes the filename unique.
+   Then open the file and return a fd. */
+int
+rpl_mkstemp (char *template)
+{
+  return __gen_tempname (template, __GT_FILE);
+}
diff --git a/gnu/usr.bin/texinfo/lib/strcase.h b/gnu/usr.bin/texinfo/lib/strcase.h
new file mode 100644
index 00000000000..f17e64832ff
--- /dev/null
+++ b/gnu/usr.bin/texinfo/lib/strcase.h
@@ -0,0 +1,35 @@
+/* Case-insensitive string comparison functions.
+   Copyright (C) 1995-1996, 2001, 2003 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.  */
+
+#ifndef _STRCASE_H
+#define _STRCASE_H
+
+#include <stddef.h>
+
+/* Compare strings S1 and S2, ignoring case, returning less than, equal to or
+   greater than zero if S1 is lexicographically less than, equal to or greater
+   than S2.
+   Note: This function does not work correctly in multibyte locales.  */
+extern int strcasecmp (const char *s1, const char *s2);
+
+/* Compare no more than N characters of strings S1 and S2, ignoring case,
+   returning less than, equal to or greater than zero if S1 is
+   lexicographically less than, equal to or greater than S2.
+   Note: This function can not work correctly in multibyte locales.  */
+extern int strncasecmp (const char *s1, const char *s2, size_t n);
+
+#endif /* _STRCASE_H */
diff --git a/gnu/usr.bin/texinfo/lib/strcasecmp.c b/gnu/usr.bin/texinfo/lib/strcasecmp.c
index ae7601de0fc..cf4ab88dbdf 100644
--- a/gnu/usr.bin/texinfo/lib/strcasecmp.c
+++ b/gnu/usr.bin/texinfo/lib/strcasecmp.c
@@ -29,7 +29,7 @@
 # define LENGTH_LIMIT_EXPR(Expr) 0
 #endif
 
-#include <sys/types.h>
+#include <stddef.h>
 #include <ctype.h>
 
 #define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch))
diff --git a/gnu/usr.bin/texinfo/lib/strdup.c b/gnu/usr.bin/texinfo/lib/strdup.c
index c0b05e2d150..8c88e310a5b 100644
--- a/gnu/usr.bin/texinfo/lib/strdup.c
+++ b/gnu/usr.bin/texinfo/lib/strdup.c
@@ -1,5 +1,7 @@
-/* strdup.c -- return a newly allocated copy of a string
-   Copyright (C) 1990, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1996, 1997, 1998, 2002, 2003, 2004 Free Software
+   Foundation, Inc.
+
+   This file is part of the GNU C Library.
 
    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
@@ -11,32 +13,44 @@
    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,
+   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.  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
-#ifdef STDC_HEADERS
-# include <string.h>
-# include <stdlib.h>
-#else
-char *malloc ();
-char *strcpy ();
+#ifndef _LIBC
+/* Get specification.  */
+# include "strdup.h"
 #endif
 
-/* Return a newly allocated copy of STR,
-   or 0 if out of memory. */
+#include <stdlib.h>
+#include <string.h>
+
+#undef __strdup
+#undef strdup
+
+#ifndef weak_alias
+# define __strdup strdup
+#endif
 
+/* Duplicate S, returning an identical malloc'd string.  */
 char *
-strdup (const char *str)
+__strdup (const char *s)
 {
-  char *newstr;
+  size_t len = strlen (s) + 1;
+  void *new = malloc (len);
 
-  newstr = (char *) malloc (strlen (str) + 1);
-  if (newstr)
-    strcpy (newstr, str);
-  return newstr;
+  if (new == NULL)
+    return NULL;
+
+  return (char *) memcpy (new, s, len);
 }
+#ifdef libc_hidden_def
+libc_hidden_def (__strdup)
+#endif
+#ifdef weak_alias
+weak_alias (__strdup, strdup)
+#endif
diff --git a/gnu/usr.bin/texinfo/lib/strdup.h b/gnu/usr.bin/texinfo/lib/strdup.h
new file mode 100644
index 00000000000..4dc6a391c8a
--- /dev/null
+++ b/gnu/usr.bin/texinfo/lib/strdup.h
@@ -0,0 +1,29 @@
+/* strdup.h -- duplicate a string
+   Copyright (C) 2004 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.  */
+
+#ifndef STRDUP_H_
+#define STRDUP_H_
+
+/* Get strdup declaration, if available.  */
+#include <string.h>
+
+#if !HAVE_DECL_STRDUP && !defined strdup
+/* Duplicate S, returning an identical malloc'd string.  */
+extern char *strdup (const char *s);
+#endif
+
+#endif /* STRDUP_H_ */
diff --git a/gnu/usr.bin/texinfo/lib/strerror.c b/gnu/usr.bin/texinfo/lib/strerror.c
index 661469173d9..7c17f1fbeff 100644
--- a/gnu/usr.bin/texinfo/lib/strerror.c
+++ b/gnu/usr.bin/texinfo/lib/strerror.c
@@ -1,43 +1,49 @@
-/*
- * strerror.c --- ANSI C compatible system error routine
- */
-
-/* 
- * Copyright (C) 1986, 1988, 1989, 1991 the Free Software Foundation, Inc.
- * From gawk.
- * 
- * 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.
- *
- */
-
-#if 0
-#include <stdio.h>
+/* strerror.c --- ANSI C compatible system error routine
+
+   Copyright (C) 1986, 1988, 1989, 1991, 2002, 2003 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.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
 #endif
 
+#include <limits.h>
+
+/* Don't include <stdio.h>, since it may or may not declare
+   sys_errlist and its declarations may collide with ours.  Just
+   declare the stuff that we need directly.  Standard hosted C89
+   implementations define strerror and they don't need this strerror
+   function, so take some liberties with the standard to cater to
+   ancient or limited freestanding implementations.  */
+int sprintf (char *, char const *, ...);
 extern int sys_nerr;
 extern char *sys_errlist[];
 
 char *
-strerror(n)
-int n;
+strerror (int n)
 {
-	static char mesg[30];
+  static char const fmt[] = "Unknown error (%d)";
+  static char mesg[sizeof fmt + sizeof n * CHAR_BIT / 3];
 
-	if (n < 0 || n >= sys_nerr) {
-		sprintf(mesg, "Unknown error (%d)", n);
-		return mesg;
-	} else
-		return sys_errlist[n];
+  if (n < 0 || n >= sys_nerr)
+    {
+      sprintf (mesg, fmt, n);
+      return mesg;
+    }
+  else
+    return sys_errlist[n];
 }
diff --git a/gnu/usr.bin/texinfo/lib/substring.c b/gnu/usr.bin/texinfo/lib/substring.c
index 64772334de5..f14fbbfae69 100644
--- a/gnu/usr.bin/texinfo/lib/substring.c
+++ b/gnu/usr.bin/texinfo/lib/substring.c
@@ -1,7 +1,7 @@
 /* substring.c -- extract substring.
-   $Id: substring.c,v 1.1.1.1 2000/02/09 01:24:23 espie Exp $
+   $Id: substring.c,v 1.1.1.2 2006/07/17 16:03:41 espie Exp $
 
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2004 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,13 +20,11 @@
 #include "system.h"
 
 char *
-substring (start, end)
-     char *start;
-     char *end;
+substring (const char *start, const char *end)
 {
   char *result = xmalloc (end - start + 1);
   char *scan_result = result;
-  char *scan = start;
+  const char *scan = start;
 
   while (scan < end)
     *scan_result++ = *scan++;
diff --git a/gnu/usr.bin/texinfo/lib/tempname.c b/gnu/usr.bin/texinfo/lib/tempname.c
new file mode 100644
index 00000000000..b3d0874ce99
--- /dev/null
+++ b/gnu/usr.bin/texinfo/lib/tempname.c
@@ -0,0 +1,344 @@
+/* tempname.c - generate the name of a temporary file.
+
+   Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002, 2003 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.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <sys/types.h>
+#include <assert.h>
+
+#include <errno.h>
+#ifndef __set_errno
+# define __set_errno(Val) errno = (Val)
+#endif
+
+#include <stdio.h>
+#ifndef P_tmpdir
+# define P_tmpdir "/tmp"
+#endif
+#ifndef TMP_MAX
+# define TMP_MAX 238328
+#endif
+#ifndef __GT_FILE
+# define __GT_FILE	0
+# define __GT_BIGFILE	1
+# define __GT_DIR	2
+# define __GT_NOCREATE	3
+#endif
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+#if HAVE_FCNTL_H || _LIBC
+# include <fcntl.h>
+#endif
+
+#if HAVE_SYS_TIME_H || _LIBC
+# include <sys/time.h>
+#endif
+
+#if HAVE_STDINT_H || _LIBC
+# include <stdint.h>
+#endif
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+
+#if HAVE_UNISTD_H || _LIBC
+# include <unistd.h>
+#endif
+
+#include <sys/stat.h>
+#if STAT_MACROS_BROKEN
+# undef S_ISDIR
+#endif
+#if !defined S_ISDIR && defined S_IFDIR
+# define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
+#endif
+#if !S_IRUSR && S_IREAD
+# define S_IRUSR S_IREAD
+#endif
+#if !S_IRUSR
+# define S_IRUSR 00400
+#endif
+#if !S_IWUSR && S_IWRITE
+# define S_IWUSR S_IWRITE
+#endif
+#if !S_IWUSR
+# define S_IWUSR 00200
+#endif
+#if !S_IXUSR && S_IEXEC
+# define S_IXUSR S_IEXEC
+#endif
+#if !S_IXUSR
+# define S_IXUSR 00100
+#endif
+
+#if _LIBC
+# define struct_stat64 struct stat64
+#else
+# define struct_stat64 struct stat
+# define __getpid getpid
+# define __gettimeofday gettimeofday
+# define __mkdir mkdir
+# define __open open
+# define __open64 open
+# define __lxstat64(version, path, buf) lstat (path, buf)
+# define __xstat64(version, path, buf) stat (path, buf)
+#endif
+
+#if ! (HAVE___SECURE_GETENV || _LIBC)
+# define __secure_getenv getenv
+#endif
+
+#ifdef _LIBC
+# include <hp-timing.h>
+# if HP_TIMING_AVAIL
+#  define RANDOM_BITS(Var) \
+  if (__builtin_expect (value == UINT64_C (0), 0))			      \
+    {									      \
+      /* If this is the first time this function is used initialize	      \
+	 the variable we accumulate the value in to some somewhat	      \
+	 random value.  If we'd not do this programs at startup time	      \
+	 might have a reduced set of possible names, at least on slow	      \
+	 machines.  */							      \
+      struct timeval tv;						      \
+      __gettimeofday (&tv, NULL);					      \
+      value = ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec;		      \
+    }									      \
+  HP_TIMING_NOW (Var)
+# endif
+#endif
+
+/* Use the widest available unsigned type if uint64_t is not
+   available.  The algorithm below extracts a number less than 62**6
+   (approximately 2**35.725) from uint64_t, so ancient hosts where
+   uintmax_t is only 32 bits lose about 3.725 bits of randomness,
+   which is better than not having mkstemp at all.  */
+#if !defined UINT64_MAX && !defined uint64_t
+# define uint64_t uintmax_t
+#endif
+
+/* Return nonzero if DIR is an existent directory.  */
+static int
+direxists (const char *dir)
+{
+  struct_stat64 buf;
+  return __xstat64 (_STAT_VER, dir, &buf) == 0 && S_ISDIR (buf.st_mode);
+}
+
+/* Path search algorithm, for tmpnam, tmpfile, etc.  If DIR is
+   non-null and exists, uses it; otherwise uses the first of $TMPDIR,
+   P_tmpdir, /tmp that exists.  Copies into TMPL a template suitable
+   for use with mk[s]temp.  Will fail (-1) if DIR is non-null and
+   doesn't exist, none of the searched dirs exists, or there's not
+   enough space in TMPL. */
+int
+__path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx,
+	       int try_tmpdir)
+{
+  const char *d;
+  size_t dlen, plen;
+
+  if (!pfx || !pfx[0])
+    {
+      pfx = "file";
+      plen = 4;
+    }
+  else
+    {
+      plen = strlen (pfx);
+      if (plen > 5)
+	plen = 5;
+    }
+
+  if (try_tmpdir)
+    {
+      d = __secure_getenv ("TMPDIR");
+      if (d != NULL && direxists (d))
+	dir = d;
+      else if (dir != NULL && direxists (dir))
+	/* nothing */ ;
+      else
+	dir = NULL;
+    }
+  if (dir == NULL)
+    {
+      if (direxists (P_tmpdir))
+	dir = P_tmpdir;
+      else if (strcmp (P_tmpdir, "/tmp") != 0 && direxists ("/tmp"))
+	dir = "/tmp";
+      else
+	{
+	  __set_errno (ENOENT);
+	  return -1;
+	}
+    }
+
+  dlen = strlen (dir);
+  while (dlen > 1 && dir[dlen - 1] == '/')
+    dlen--;			/* remove trailing slashes */
+
+  /* check we have room for "${dir}/${pfx}XXXXXX\0" */
+  if (tmpl_len < dlen + 1 + plen + 6 + 1)
+    {
+      __set_errno (EINVAL);
+      return -1;
+    }
+
+  sprintf (tmpl, "%.*s/%.*sXXXXXX", (int) dlen, dir, (int) plen, pfx);
+  return 0;
+}
+
+/* These are the characters used in temporary filenames.  */
+static const char letters[] =
+"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+
+/* Generate a temporary file name based on TMPL.  TMPL must match the
+   rules for mk[s]temp (i.e. end in "XXXXXX").  The name constructed
+   does not exist at the time of the call to __gen_tempname.  TMPL is
+   overwritten with the result.
+
+   KIND may be one of:
+   __GT_NOCREATE:	simply verify that the name does not exist
+			at the time of the call.
+   __GT_FILE:		create the file using open(O_CREAT|O_EXCL)
+			and return a read-write fd.  The file is mode 0600.
+   __GT_BIGFILE:	same as __GT_FILE but use open64().
+   __GT_DIR:		create a directory, which will be mode 0700.
+
+   We use a clever algorithm to get hard-to-predict names. */
+int
+__gen_tempname (char *tmpl, int kind)
+{
+  int len;
+  char *XXXXXX;
+  static uint64_t value;
+  uint64_t random_time_bits;
+  unsigned int count;
+  int fd = -1;
+  int save_errno = errno;
+  struct_stat64 st;
+
+  /* A lower bound on the number of temporary files to attempt to
+     generate.  The maximum total number of temporary file names that
+     can exist for a given template is 62**6.  It should never be
+     necessary to try all these combinations.  Instead if a reasonable
+     number of names is tried (we define reasonable as 62**3) fail to
+     give the system administrator the chance to remove the problems.  */
+  unsigned int attempts_min = 62 * 62 * 62;
+
+  /* The number of times to attempt to generate a temporary file.  To
+     conform to POSIX, this must be no smaller than TMP_MAX.  */
+  unsigned int attempts = attempts_min < TMP_MAX ? TMP_MAX : attempts_min;
+
+  len = strlen (tmpl);
+  if (len < 6 || strcmp (&tmpl[len - 6], "XXXXXX"))
+    {
+      __set_errno (EINVAL);
+      return -1;
+    }
+
+  /* This is where the Xs start.  */
+  XXXXXX = &tmpl[len - 6];
+
+  /* Get some more or less random data.  */
+#ifdef RANDOM_BITS
+  RANDOM_BITS (random_time_bits);
+#else
+# if HAVE_GETTIMEOFDAY || _LIBC
+  {
+    struct timeval tv;
+    __gettimeofday (&tv, NULL);
+    random_time_bits = ((uint64_t) tv.tv_usec << 16) ^ tv.tv_sec;
+  }
+# else
+  random_time_bits = time (NULL);
+# endif
+#endif
+  value += random_time_bits ^ __getpid ();
+
+  for (count = 0; count < attempts; value += 7777, ++count)
+    {
+      uint64_t v = value;
+
+      /* Fill in the random bits.  */
+      XXXXXX[0] = letters[v % 62];
+      v /= 62;
+      XXXXXX[1] = letters[v % 62];
+      v /= 62;
+      XXXXXX[2] = letters[v % 62];
+      v /= 62;
+      XXXXXX[3] = letters[v % 62];
+      v /= 62;
+      XXXXXX[4] = letters[v % 62];
+      v /= 62;
+      XXXXXX[5] = letters[v % 62];
+
+      switch (kind)
+	{
+	case __GT_FILE:
+	  fd = __open (tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
+	  break;
+
+	case __GT_BIGFILE:
+	  fd = __open64 (tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
+	  break;
+
+	case __GT_DIR:
+	  fd = __mkdir (tmpl, S_IRUSR | S_IWUSR | S_IXUSR);
+	  break;
+
+	case __GT_NOCREATE:
+	  /* This case is backward from the other three.  __gen_tempname
+	     succeeds if __xstat fails because the name does not exist.
+	     Note the continue to bypass the common logic at the bottom
+	     of the loop.  */
+	  if (__lxstat64 (_STAT_VER, tmpl, &st) < 0)
+	    {
+	      if (errno == ENOENT)
+		{
+		  __set_errno (save_errno);
+		  return 0;
+		}
+	      else
+		/* Give up now. */
+		return -1;
+	    }
+	  continue;
+
+	default:
+	  assert (! "invalid KIND in __gen_tempname");
+	}
+
+      if (fd >= 0)
+	{
+	  __set_errno (save_errno);
+	  return fd;
+	}
+      else if (errno != EEXIST)
+	return -1;
+    }
+
+  /* We got out of the loop because we ran out of combinations to try.  */
+  __set_errno (EEXIST);
+  return -1;
+}
diff --git a/gnu/usr.bin/texinfo/lib/xalloc.h b/gnu/usr.bin/texinfo/lib/xalloc.h
new file mode 100644
index 00000000000..d81f2a67648
--- /dev/null
+++ b/gnu/usr.bin/texinfo/lib/xalloc.h
@@ -0,0 +1,90 @@
+/* xalloc.h -- malloc with out-of-memory checking
+
+   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+   1999, 2000, 2003, 2004 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.  */
+
+#ifndef XALLOC_H_
+# define XALLOC_H_
+
+# include <stddef.h>
+
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+
+# ifndef __attribute__
+#  if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__
+#   define __attribute__(x)
+#  endif
+# endif
+
+# ifndef ATTRIBUTE_NORETURN
+#  define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
+# endif
+
+/* This function is always triggered when memory is exhausted.
+   It must be defined by the application, either explicitly
+   or by using gnulib's xalloc-die module.  This is the
+   function to call when one wants the program to die because of a
+   memory allocation failure.  */
+extern void xalloc_die (void) ATTRIBUTE_NORETURN;
+
+void *xmalloc (size_t s);
+void *xnmalloc (size_t n, size_t s);
+void *xzalloc (size_t s);
+void *xcalloc (size_t n, size_t s);
+void *xrealloc (void *p, size_t s);
+void *xnrealloc (void *p, size_t n, size_t s);
+void *x2realloc (void *p, size_t *pn);
+void *x2nrealloc (void *p, size_t *pn, size_t s);
+void *xclone (void const *p, size_t s);
+char *xstrdup (const char *str);
+
+/* Return 1 if an array of N objects, each of size S, cannot exist due
+   to size arithmetic overflow.  S must be positive and N must be
+   nonnegative.  This is a macro, not an inline function, so that it
+   works correctly even when SIZE_MAX < N.
+
+   By gnulib convention, SIZE_MAX represents overflow in size
+   calculations, so the conservative dividend to use here is
+   SIZE_MAX - 1, since SIZE_MAX might represent an overflowed value.
+   However, malloc (SIZE_MAX) fails on all known hosts where
+   sizeof (ptrdiff_t) <= sizeof (size_t), so do not bother to test for
+   exactly-SIZE_MAX allocations on such hosts; this avoids a test and
+   branch when S is known to be 1.  */
+# define xalloc_oversized(n, s) \
+    ((size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) < (n))
+
+/* These macros are deprecated; they will go away soon, and are retained
+   temporarily only to ease conversion to the functions described above.  */
+# define CCLONE(p, n) xclone (p, (n) * sizeof *(p))
+# define CLONE(p) xclone (p, sizeof *(p))
+# define NEW(type, var) type *var = xmalloc (sizeof (type))
+# define XCALLOC(type, n) xcalloc (n, sizeof (type))
+# define XMALLOC(type, n) xnmalloc (n, sizeof (type))
+# define XREALLOC(p, type, n) xnrealloc (p, n, sizeof (type))
+# define XFREE(p) free (p)
+
+
+# ifdef __cplusplus
+}
+# endif
+
+
+#endif /* !XALLOC_H_ */
diff --git a/gnu/usr.bin/texinfo/lib/xexit.c b/gnu/usr.bin/texinfo/lib/xexit.c
index a9376f57cfa..c5afacbb6d7 100644
--- a/gnu/usr.bin/texinfo/lib/xexit.c
+++ b/gnu/usr.bin/texinfo/lib/xexit.c
@@ -1,7 +1,7 @@
 /* xexit.c -- exit with attention to return values and closing stdout.
-   $Id: xexit.c,v 1.1.1.1 2000/02/09 01:24:24 espie Exp $
+   $Id: xexit.c,v 1.1.1.2 2006/07/17 16:03:41 espie Exp $
 
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2003, 2004 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
@@ -41,26 +41,27 @@
 #endif /* not EXIT_SUCCESS */
 
 
-/* Flush stdout first, exit if failure.  Otherwise, if EXIT_STATUS is
-   zero, exit successfully, else unsuccessfully.  */
-	
+/* Flush stdout first, exit if failure (therefore, xexit should be
+   called to exit every program, not just `return' from main).
+   Otherwise, if EXIT_STATUS is zero, exit successfully, else
+   unsuccessfully.  */
+
 void
-xexit (exit_status)
-     int exit_status;
+xexit (int exit_status)
 {
   if (ferror (stdout))
     {
-      fprintf (stderr, "ferror on stdout");
+      fputs (_("ferror on stdout\n"), stderr);
       exit_status = 1;
     }
   else if (fflush (stdout) != 0)
     {
-      fprintf (stderr, "fflush error on stdout");
+      fputs (_("fflush error on stdout\n"), stderr);
       exit_status = 1;
     }
-  
+
   exit_status = exit_status == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
-  
+
   exit (exit_status);
 }
 
diff --git a/gnu/usr.bin/texinfo/lib/xmalloc.c b/gnu/usr.bin/texinfo/lib/xmalloc.c
index 156989ed711..b91e4fce633 100644
--- a/gnu/usr.bin/texinfo/lib/xmalloc.c
+++ b/gnu/usr.bin/texinfo/lib/xmalloc.c
@@ -1,12 +1,6 @@
-/* xmalloc.c -- safe versions of malloc and realloc */
+/* xmalloc.c -- safe versions of malloc and realloc.
 
-/* This file is part of GNU Info, a program for reading online documentation
-   stored in Info format.
-
-   This file has appeared in prior works by the Free Software Foundation;
-   thus it carries copyright dates from 1988 through 1993.
-
-   Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993 Free Software
+   Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 2004 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -26,24 +20,20 @@
    Written by Brian Fox (bfox@ai.mit.edu). */
 
 #if !defined (ALREADY_HAVE_XMALLOC)
-#include <stdio.h>
-#include <sys/types.h>
+#include "system.h"
 
-extern void *malloc (), *realloc ();
-static void memory_error_and_abort ();
-
-/* **************************************************************** */
-/*								    */
-/*		   Memory Allocation and Deallocation.		    */
-/*								    */
-/* **************************************************************** */
+static void
+memory_error_and_abort (const char *fname)
+{
+  fprintf (stderr, "%s: Out of virtual memory!\n", fname);
+  abort ();
+}
 
 /* Return a pointer to free()able block of memory large enough
    to hold BYTES number of bytes.  If the memory cannot be allocated,
    print an error message and abort. */
 void *
-xmalloc (bytes)
-     int bytes;
+xmalloc (size_t bytes)
 {
   void *temp = malloc (bytes);
 
@@ -53,9 +43,7 @@ xmalloc (bytes)
 }
 
 void *
-xrealloc (pointer, bytes)
-     void *pointer;
-     int bytes;
+xrealloc (void *pointer, size_t bytes)
 {
   void *temp;
 
@@ -70,11 +58,4 @@ xrealloc (pointer, bytes)
   return (temp);
 }
 
-static void
-memory_error_and_abort (fname)
-     char *fname;
-{
-  fprintf (stderr, "%s: Out of virtual memory!\n", fname);
-  abort ();
-}
 #endif /* !ALREADY_HAVE_XMALLOC */
diff --git a/gnu/usr.bin/texinfo/lib/xstrdup.c b/gnu/usr.bin/texinfo/lib/xstrdup.c
index 38674cab18b..1182c592ac5 100644
--- a/gnu/usr.bin/texinfo/lib/xstrdup.c
+++ b/gnu/usr.bin/texinfo/lib/xstrdup.c
@@ -1,5 +1,5 @@
 /* xstrdup.c -- copy a string with out of memory checking
-   Copyright (C) 1990, 1996, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1996, 1998, 2001, 2003 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
@@ -19,23 +19,10 @@
 # include <config.h>
 #endif
 
-#ifndef PARAMS
-# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
-
-#if STDC_HEADERS || HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif
-
-#include <sys/types.h>
+/* Specification.  */
+#include "xalloc.h"
 
-char *xmalloc PARAMS ((size_t n));
+#include <string.h>
 
 /* Return a newly allocated copy of STRING.  */
 
diff --git a/gnu/usr.bin/texinfo/m4/ChangeLog b/gnu/usr.bin/texinfo/m4/ChangeLog
index 405f1327546..c0397848413 100644
--- a/gnu/usr.bin/texinfo/m4/ChangeLog
+++ b/gnu/usr.bin/texinfo/m4/ChangeLog
@@ -1,14 +1,51 @@
-2002-02-25  gettextize  <bug-gnu-gettext@gnu.org>
-
-	* codeset.m4: New file, from gettext-0.11.
-	* gettext.m4: New file, from gettext-0.11.
-	* glibc21.m4: New file, from gettext-0.11.
-	* iconv.m4: New file, from gettext-0.11.
-	* isc-posix.m4: New file, from gettext-0.11.
-	* lcmessage.m4: New file, from gettext-0.11.
-	* lib-ld.m4: New file, from gettext-0.11.
-	* lib-link.m4: New file, from gettext-0.11.
-	* lib-prefix.m4: New file, from gettext-0.11.
-	* progtest.m4: New file, from gettext-0.11.
-	* Makefile.am: New file.
+2004-02-05  gettextize  <bug-gnu-gettext@gnu.org>
 
+	* po.m4: Upgrade to gettext-0.14.1.
+
+2003-12-20  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* printf-posix.m4: Upgrade to gettext-0.13.1.
+
+2003-12-13  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* intmax.m4: New file, from gettext-0.13.
+	* longdouble.m4: New file, from gettext-0.13.
+	* longlong.m4: New file, from gettext-0.13.
+	* printf-posix.m4: New file, from gettext-0.13.
+	* signed.m4: New file, from gettext-0.13.
+	* size_max.m4: New file, from gettext-0.13.
+	* wchar_t.m4: New file, from gettext-0.13.
+	* wint_t.m4: New file, from gettext-0.13.
+	* xsize.m4: New file, from gettext-0.13.
+	* Makefile.am (EXTRA_DIST): Add the new files.
+
+2003-05-29  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* gettext.m4: Upgrade to gettext-0.12.1.
+	* inttypes_h.m4: Upgrade to gettext-0.12.1.
+	* lib-ld.m4: Upgrade to gettext-0.12.1.
+	* lib-link.m4: Upgrade to gettext-0.12.1.
+	* lib-prefix.m4: Upgrade to gettext-0.12.1.
+	* nls.m4: New file, from gettext-0.12.1.
+	* po.m4: New file, from gettext-0.12.1.
+	* progtest.m4: Upgrade to gettext-0.12.1.
+	* stdint_h.m4: Upgrade to gettext-0.12.1.
+	* uintmax_t.m4: Upgrade to gettext-0.12.1.
+	* ulonglong.m4: Upgrade to gettext-0.12.1.
+	* Makefile.am (EXTRA_DIST): Add the new files.
+
+2002-09-20  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* gettext.m4: Upgrade to gettext-0.11.5.
+	* iconv.m4: Upgrade to gettext-0.11.5.
+	* intdiv0.m4: New file, from gettext-0.11.5.
+	* inttypes.m4: New file, from gettext-0.11.5.
+	* inttypes_h.m4: New file, from gettext-0.11.5.
+	* inttypes-pri.m4: New file, from gettext-0.11.5.
+	* isc-posix.m4: Upgrade to gettext-0.11.5.
+	* lcmessage.m4: Upgrade to gettext-0.11.5.
+	* lib-link.m4: Upgrade to gettext-0.11.5.
+	* stdint_h.m4: New file, from gettext-0.11.5.
+	* uintmax_t.m4: New file, from gettext-0.11.5.
+	* ulonglong.m4: New file, from gettext-0.11.5.
+	* Makefile.am (EXTRA_DIST): Add the new files.
diff --git a/gnu/usr.bin/texinfo/m4/Makefile.am b/gnu/usr.bin/texinfo/m4/Makefile.am
index 60cca4c3c58..0ace7ea70bf 100644
--- a/gnu/usr.bin/texinfo/m4/Makefile.am
+++ b/gnu/usr.bin/texinfo/m4/Makefile.am
@@ -1 +1,24 @@
-EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4
+EXTRA_DIST = intmax.m4 longdouble.m4 longlong.m4 printf-posix.m4 signed.m4 size_max.m4 wchar_t.m4 wint_t.m4 xsize.m4  nls.m4 po.m4  \
+  check-decl.m4 \
+  codeset.m4 \
+  gettext.m4 \
+  glibc21.m4 \
+  iconv.m4 \
+  intdiv0.m4 \
+  inttypes-pri.m4 \
+  inttypes.m4 \
+  inttypes_h.m4 \
+  isc-posix.m4 \
+  lcmessage.m4 \
+  lib-ld.m4 \
+  lib-link.m4 \
+  lib-prefix.m4 \
+  mkstemp.m4 \
+  onceonly.m4 \
+  onceonly_2_57.m4 \
+  prereq.m4 \
+  progtest.m4 \
+  stdint_h.m4 \
+  strcase.m4 \
+  uintmax_t.m4 \
+  ulonglong.m4
diff --git a/gnu/usr.bin/texinfo/m4/Makefile.in b/gnu/usr.bin/texinfo/m4/Makefile.in
index 5f7f08d5bdd..ac7e83ddd54 100644
--- a/gnu/usr.bin/texinfo/m4/Makefile.in
+++ b/gnu/usr.bin/texinfo/m4/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6 from Makefile.am.
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,130 +13,259 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-SHELL = @SHELL@
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = m4
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
+	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \
+	$(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/onceonly_2_57.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/strcase.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
-HAVE_LIB = @HAVE_LIB@
+HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
+HAVE_SNPRINTF = @HAVE_SNPRINTF@
+HAVE_WPRINTF = @HAVE_WPRINTF@
+HELP2MAN = @HELP2MAN@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_WARNINGS_FALSE = @INSTALL_WARNINGS_FALSE@
+INSTALL_WARNINGS_TRUE = @INSTALL_WARNINGS_TRUE@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-LIB = @LIB@
+LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
-LTLIB = @LTLIB@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
 TERMLIBS = @TERMLIBS@
+TOOLS_ONLY_FALSE = @TOOLS_ONLY_FALSE@
+TOOLS_ONLY_TRUE = @TOOLS_ONLY_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
-EXTRA_DIST = codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4
-subdir = m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = ChangeLog Makefile.am Makefile.in
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+native_tools = @native_tools@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+EXTRA_DIST = intmax.m4 longdouble.m4 longlong.m4 printf-posix.m4 signed.m4 size_max.m4 wchar_t.m4 wint_t.m4 xsize.m4  nls.m4 po.m4  \
+  check-decl.m4 \
+  codeset.m4 \
+  gettext.m4 \
+  glibc21.m4 \
+  iconv.m4 \
+  intdiv0.m4 \
+  inttypes-pri.m4 \
+  inttypes.m4 \
+  inttypes_h.m4 \
+  isc-posix.m4 \
+  lcmessage.m4 \
+  lib-ld.m4 \
+  lib-link.m4 \
+  lib-prefix.m4 \
+  mkstemp.m4 \
+  onceonly.m4 \
+  onceonly_2_57.m4 \
+  prereq.m4 \
+  progtest.m4 \
+  stdint_h.m4 \
+  strcase.m4 \
+  uintmax_t.m4 \
+  ulonglong.m4
+
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  m4/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  m4/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-install-info-am:
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 uninstall-info-am:
 tags: TAGS
 TAGS:
 
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
 
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pR $$d/$$file $(distdir)$$dir \
-	    || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || cp -p $$d/$$file $(distdir)/$$file \
@@ -146,9 +275,7 @@ distdir: $(DISTFILES)
 check-am: all-am
 check: check-am
 all-am: Makefile
-
 installdirs:
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -160,7 +287,7 @@ install-am: all-am
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -168,7 +295,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -178,13 +305,15 @@ clean: clean-am
 clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -193,27 +322,38 @@ install-data-am:
 
 install-exec-am:
 
+install-info: install-info-am
+
 install-man:
 
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	uninstall uninstall-am uninstall-info-am
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-info-am
 
 # 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/gnu/usr.bin/texinfo/m4/check-decl.m4 b/gnu/usr.bin/texinfo/m4/check-decl.m4
new file mode 100644
index 00000000000..d70e1c90f8d
--- /dev/null
+++ b/gnu/usr.bin/texinfo/m4/check-decl.m4
@@ -0,0 +1,75 @@
+#serial 20
+
+dnl This is just a wrapper function to encapsulate this kludge.
+dnl Putting it in a separate file like this helps share it between
+dnl different packages.
+AC_DEFUN([gl_CHECK_DECLS],
+[
+  AC_REQUIRE([_gl_DECL_HEADERS])
+  AC_REQUIRE([AC_HEADER_TIME])
+  headers='
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#include <sys/types.h>
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
+#if HAVE_UTMP_H
+# include <utmp.h>
+#endif
+
+#if HAVE_GRP_H
+# include <grp.h>
+#endif
+
+#if HAVE_PWD_H
+# include <pwd.h>
+#endif
+'
+
+  AC_CHECK_DECLS([
+    free,
+    getenv,
+    geteuid,
+    getgrgid,
+    getlogin,
+    getpwuid,
+    getuid,
+    getutent,
+    lseek,
+    malloc,
+    memchr,
+    memrchr,
+    nanosleep,
+    realloc,
+    stpcpy,
+    strndup,
+    strnlen,
+    strstr,
+    strtoul,
+    strtoull,
+    ttyname], , , $headers)
+])
+
+dnl FIXME: when autoconf has support for it.
+dnl This is a little helper so we can require these header checks.
+AC_DEFUN([_gl_DECL_HEADERS],
+[
+  AC_REQUIRE([AC_HEADER_STDC])
+  AC_CHECK_HEADERS(grp.h memory.h pwd.h string.h strings.h stdlib.h \
+                   unistd.h sys/time.h utmp.h utmpx.h)
+])
diff --git a/gnu/usr.bin/texinfo/m4/gettext.m4 b/gnu/usr.bin/texinfo/m4/gettext.m4
index 520f973d8de..a9225d3771d 100644
--- a/gnu/usr.bin/texinfo/m4/gettext.m4
+++ b/gnu/usr.bin/texinfo/m4/gettext.m4
@@ -1,5 +1,5 @@
-# gettext.m4 serial 13 (gettext-0.11.1)
-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
+# gettext.m4 serial 29
+dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
@@ -17,7 +17,7 @@ dnl They are *not* in the public domain.
 
 dnl Authors:
 dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2002.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
 
 dnl Macro to add for using GNU gettext.
 
@@ -33,7 +33,9 @@ dnl    AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
 dnl    $(top_builddir)/intl/libintl.a will be created.
 dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
 dnl    implementations (in libc or libintl) without the ngettext() function
-dnl    will be ignored.
+dnl    will be ignored.  If NEEDSYMBOL is specified and is
+dnl    'need-formatstring-macros', then GNU gettext implementations that don't
+dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
 dnl INTLDIR is used to find the intl libraries.  If empty,
 dnl    the value `$(top_builddir)/intl/' is used.
 dnl
@@ -60,9 +62,9 @@ AC_DEFUN([AM_GNU_GETTEXT],
   ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
     [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
 ])])])])])
-  ifelse([$2], [], , [ifelse([$2], [need-ngettext], ,
+  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
     [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
-])])])
+])])])])
   define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
   define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
 
@@ -75,13 +77,23 @@ AC_DEFUN([AM_GNU_GETTEXT],
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
   AC_REQUIRE([AC_LIB_RPATH])
 
-  AC_MSG_CHECKING([whether NLS is requested])
-  dnl Default is enabled NLS
-  AC_ARG_ENABLE(nls,
-    [  --disable-nls           do not use Native Language Support],
-    USE_NLS=$enableval, USE_NLS=yes)
-  AC_MSG_RESULT($USE_NLS)
-  AC_SUBST(USE_NLS)
+  dnl Sometimes libintl requires libiconv, so first search for libiconv.
+  dnl Ideally we would do this search only after the
+  dnl      if test "$USE_NLS" = "yes"; then
+  dnl        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
+  dnl the configure script would need to contain the same shell code
+  dnl again, outside any 'if'. There are two solutions:
+  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
+  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
+  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
+  dnl documented, we avoid it.
+  ifelse(gt_included_intl, yes, , [
+    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+  ])
+
+  dnl Set USE_NLS.
+  AM_NLS
 
   ifelse(gt_included_intl, yes, [
     BUILD_INCLUDED_LIBINTL=no
@@ -110,13 +122,20 @@ AC_DEFUN([AM_GNU_GETTEXT],
         dnl to fall back to GNU NLS library.
 
         dnl Add a version number to the cache macros.
-        define([gt_api_version], ifelse([$2], [need-ngettext], 2, 1))
+        define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
         define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
         define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
 
         AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
          [AC_TRY_LINK([#include <libintl.h>
-extern int _nl_msg_cat_cntr;
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+], [])[extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;],
             [bindtextdomain ("", "");
 return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
@@ -141,30 +160,42 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
             LIBS="$LIBS $LIBINTL"
             dnl Now see whether libintl exists and does not depend on libiconv.
             AC_TRY_LINK([#include <libintl.h>
-extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+], [])[extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias ();],
               [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)],
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
               gt_cv_func_gnugettext_libintl=yes,
               gt_cv_func_gnugettext_libintl=no)
             dnl Now see whether libintl exists and depends on libiconv.
             if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
               LIBS="$LIBS $LIBICONV"
               AC_TRY_LINK([#include <libintl.h>
-extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+], [])[extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias ();],
                 [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)],
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
                [LIBINTL="$LIBINTL $LIBICONV"
                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
                 gt_cv_func_gnugettext_libintl=yes
@@ -180,7 +211,8 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
         dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
         if test "$gt_cv_func_gnugettext_libc" = "yes" \
            || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
-                && test "$PACKAGE" != gettext; }; then
+                && test "$PACKAGE" != gettext-runtime \
+                && test "$PACKAGE" != gettext-tools; }; then
           gt_use_preinstalled_gnugettext=yes
         else
           dnl Reset the values set by searching for libintl.
@@ -199,7 +231,6 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
 
       if test "$nls_cv_use_gnu_gettext" = "yes"; then
         dnl Mark actions used to generate GNU NLS library.
-        INTLOBJS="\$(GETTOBJS)"
         BUILD_INCLUDED_LIBINTL=yes
         USE_INCLUDED_LIBINTL=yes
         LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
@@ -224,6 +255,22 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
     fi
   fi
 
+  AC_MSG_CHECKING([whether to use NLS])
+  AC_MSG_RESULT([$USE_NLS])
+  if test "$USE_NLS" = "yes"; then
+    AC_MSG_CHECKING([where the gettext function comes from])
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
+        gt_source="external libintl"
+      else
+        gt_source="libc"
+      fi
+    else
+      gt_source="included intl directory"
+    fi
+    AC_MSG_RESULT([$gt_source])
+  fi
+
   if test "$USE_NLS" = "yes"; then
 
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
@@ -247,7 +294,7 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
   ifelse(gt_included_intl, yes, [
     dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
     dnl to 'yes' because some of the testsuite requires it.
-    if test "$PACKAGE" = gettext; then
+    if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
       BUILD_INCLUDED_LIBINTL=yes
     fi
 
@@ -255,7 +302,6 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
     AC_SUBST(BUILD_INCLUDED_LIBINTL)
     AC_SUBST(USE_INCLUDED_LIBINTL)
     AC_SUBST(CATOBJEXT)
-    AC_SUBST(INTLOBJS)
 
     dnl For backward compatibility. Some configure.ins may be using this.
     nls_cv_header_intl=
@@ -273,6 +319,12 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
     GENCAT=gencat
     AC_SUBST(GENCAT)
 
+    dnl For backward compatibility. Some Makefiles may be using this.
+    if test "$USE_INCLUDED_LIBINTL" = yes; then
+      INTLOBJS="\$(GETTOBJS)"
+    fi
+    AC_SUBST(INTLOBJS)
+
     dnl Enable libtool support if the surrounding package wishes it.
     INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
     AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
@@ -289,179 +341,6 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
 ])
 
 
-dnl Checks for all prerequisites of the po subdirectory,
-dnl except for USE_NLS.
-AC_DEFUN([AM_PO_SUBDIRS],
-[
-  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-  AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
-
-  dnl Perform the following tests also if --disable-nls has been given,
-  dnl because they are needed for "make dist" to work.
-
-  dnl Search for GNU msgfmt in the PATH.
-  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
-  dnl The second test excludes FreeBSD msgfmt.
-  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-    [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
-     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-
-  dnl Search for GNU xgettext 0.11 or newer in the PATH.
-  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
-  dnl The second test excludes FreeBSD xgettext.
-  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-    [$ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
-     (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
-    :)
-  dnl Remove leftover from FreeBSD xgettext call.
-  rm -f messages.po
-
-  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
-  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
-    [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
-
-  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
-  dnl Test whether we really found GNU msgfmt.
-  if test "$GMSGFMT" != ":"; then
-    dnl If it is no GNU msgfmt we define it as : so that the
-    dnl Makefiles still can work.
-    if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
-       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-      AC_MSG_RESULT(
-        [found $GMSGFMT program is not GNU msgfmt; ignore it])
-      GMSGFMT=":"
-    fi
-  fi
-
-  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
-  dnl Test whether we really found GNU xgettext.
-  if test "$XGETTEXT" != ":"; then
-    dnl If it is no GNU xgettext we define it as : so that the
-    dnl Makefiles still can work.
-    if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
-       (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
-      : ;
-    else
-      AC_MSG_RESULT(
-        [found xgettext program is not GNU xgettext; ignore it])
-      XGETTEXT=":"
-    fi
-    dnl Remove leftover from FreeBSD xgettext call.
-    rm -f messages.po
-  fi
-
-  AC_OUTPUT_COMMANDS([
-    for ac_file in $CONFIG_FILES; do
-      # Support "outfile[:infile[:infile...]]"
-      case "$ac_file" in
-        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-      esac
-      # PO directories have a Makefile.in generated from Makefile.in.in.
-      case "$ac_file" in */Makefile.in)
-        # Adjust a relative srcdir.
-        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-        # In autoconf-2.13 it is called $ac_given_srcdir.
-        # In autoconf-2.50 it is called $srcdir.
-        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-        case "$ac_given_srcdir" in
-          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-          /*) top_srcdir="$ac_given_srcdir" ;;
-          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
-        esac
-        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-          rm -f "$ac_dir/POTFILES"
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
-          # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
-          # on $ac_dir but don't depend on user-specified configuration
-          # parameters.
-          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
-            # The LINGUAS file contains the set of available languages.
-            if test -n "$ALL_LINGUAS"; then
-              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
-            fi
-            ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake.
-            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
-          fi
-          case "$ac_given_srcdir" in
-            .) srcdirpre= ;;
-            *) srcdirpre='$(srcdir)/' ;;
-          esac
-          POFILES=
-          GMOFILES=
-          UPDATEPOFILES=
-          DUMMYPOFILES=
-          for lang in $ALL_LINGUAS; do
-            POFILES="$POFILES $srcdirpre$lang.po"
-            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-          done
-          # CATALOGS depends on both $ac_dir and the user's LINGUAS
-          # environment variable.
-          INST_LINGUAS=
-          if test -n "$ALL_LINGUAS"; then
-            for presentlang in $ALL_LINGUAS; do
-              useit=no
-              if test "%UNSET%" != "$LINGUAS"; then
-                desiredlanguages="$LINGUAS"
-              else
-                desiredlanguages="$ALL_LINGUAS"
-              fi
-              for desiredlang in $desiredlanguages; do
-                # Use the presentlang catalog if desiredlang is
-                #   a. equal to presentlang, or
-                #   b. a variant of presentlang (because in this case,
-                #      presentlang can be used as a fallback for messages
-                #      which are not translated in the desiredlang catalog).
-                case "$desiredlang" in
-                  "$presentlang"*) useit=yes;;
-                esac
-              done
-              if test $useit = yes; then
-                INST_LINGUAS="$INST_LINGUAS $presentlang"
-              fi
-            done
-          fi
-          CATALOGS=
-          if test -n "$INST_LINGUAS"; then
-            for lang in $INST_LINGUAS; do
-              CATALOGS="$CATALOGS $lang.gmo"
-            done
-          fi
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
-          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
-          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
-            if test -f "$f"; then
-              case "$f" in
-                *.orig | *.bak | *~) ;;
-                *) cat "$f" >> "$ac_dir/Makefile" ;;
-              esac
-            fi
-          done
-        fi
-        ;;
-      esac
-    done],
-   [# Capture the value of obsolete $ALL_LINGUAS because we need it to compute
-    # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
-    # from automake.
-    eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
-    # Capture the value of LINGUAS because we need it to compute CATALOGS.
-    LINGUAS="${LINGUAS-%UNSET%}"
-   ])
-])
-
-
 dnl Checks for all prerequisites of the intl subdirectory,
 dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
 dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
@@ -475,22 +354,81 @@ AC_DEFUN([AM_INTL_SUBDIR],
   AC_REQUIRE([AC_ISC_POSIX])dnl
   AC_REQUIRE([AC_HEADER_STDC])dnl
   AC_REQUIRE([AC_C_CONST])dnl
+  AC_REQUIRE([bh_C_SIGNED])dnl
   AC_REQUIRE([AC_C_INLINE])dnl
   AC_REQUIRE([AC_TYPE_OFF_T])dnl
   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
+  AC_REQUIRE([gl_AC_TYPE_LONG_LONG])dnl
+  AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
+  AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
+  AC_REQUIRE([gt_TYPE_WINT_T])dnl
+  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
+  AC_REQUIRE([gt_TYPE_INTMAX_T])
+  AC_REQUIRE([gt_PRINTF_POSIX])
   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
   AC_REQUIRE([AC_FUNC_MMAP])dnl
-  AC_REQUIRE([jm_GLIBC21])dnl
-
+  AC_REQUIRE([gl_GLIBC21])dnl
+  AC_REQUIRE([gt_INTDIV0])dnl
+  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
+  AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
+  AC_REQUIRE([gt_INTTYPES_PRI])dnl
+  AC_REQUIRE([gl_XSIZE])dnl
+
+  AC_CHECK_TYPE([ptrdiff_t], ,
+    [AC_DEFINE([ptrdiff_t], [long],
+       [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
+    ])
   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
 stdlib.h string.h unistd.h sys/param.h])
-  AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \
-geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
-strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
+  AC_CHECK_FUNCS([asprintf fwprintf getcwd getegid geteuid getgid getuid \
+mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \
+strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \
+__fsetlocking])
+
+  dnl Use the _snprintf function only if it is declared (because on NetBSD it
+  dnl is defined as a weak alias of snprintf; we prefer to use the latter).
+  gt_CHECK_DECL(_snprintf, [#include <stdio.h>])
+  gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
+
+  dnl Use the *_unlocked functions only if they are declared.
+  dnl (because some of them were defined without being declared in Solaris
+  dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
+  dnl on Solaris 2.5.1 to run on Solaris 2.6).
+  dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
+  gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>])
+  gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>])
+  gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
+
+  case $gt_cv_func_printf_posix in
+    *yes) HAVE_POSIX_PRINTF=1 ;;
+    *) HAVE_POSIX_PRINTF=0 ;;
+  esac
+  AC_SUBST([HAVE_POSIX_PRINTF])
+  if test "$ac_cv_func_asprintf" = yes; then
+    HAVE_ASPRINTF=1
+  else
+    HAVE_ASPRINTF=0
+  fi
+  AC_SUBST([HAVE_ASPRINTF])
+  if test "$ac_cv_func_snprintf" = yes; then
+    HAVE_SNPRINTF=1
+  else
+    HAVE_SNPRINTF=0
+  fi
+  AC_SUBST([HAVE_SNPRINTF])
+  if test "$ac_cv_func_wprintf" = yes; then
+    HAVE_WPRINTF=1
+  else
+    HAVE_WPRINTF=0
+  fi
+  AC_SUBST([HAVE_WPRINTF])
 
   AM_ICONV
   AM_LANGINFO_CODESET
-  AM_LC_MESSAGES
+  if test $ac_cv_header_locale_h = yes; then
+    AM_LC_MESSAGES
+  fi
 
   dnl intl/plural.c is generated from intl/plural.y. It requires bison,
   dnl because plural.y uses bison specific features. It requires at least
@@ -525,17 +463,25 @@ changequote([,])dnl
 ])
 
 
-AC_DEFUN([AM_MKINSTALLDIRS],
+dnl gt_CHECK_DECL(FUNC, INCLUDES)
+dnl Check whether a function is declared.
+AC_DEFUN([gt_CHECK_DECL],
 [
-  dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
-  dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
-  dnl Try to locate is.
-  MKINSTALLDIRS=
-  if test -n "$ac_aux_dir"; then
-    MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-  fi
-  if test -z "$MKINSTALLDIRS"; then
-    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+  AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1,
+    [AC_TRY_COMPILE([$2], [
+#ifndef $1
+  char *p = (char *) $1;
+#endif
+], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)])
+  if test $ac_cv_have_decl_$1 = yes; then
+    gt_value=1
+  else
+    gt_value=0
   fi
-  AC_SUBST(MKINSTALLDIRS)
+  AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
+    [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
 ])
+
+
+dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
diff --git a/gnu/usr.bin/texinfo/m4/glibc21.m4 b/gnu/usr.bin/texinfo/m4/glibc21.m4
index 9c9f3db3036..32ca2242e04 100644
--- a/gnu/usr.bin/texinfo/m4/glibc21.m4
+++ b/gnu/usr.bin/texinfo/m4/glibc21.m4
@@ -1,5 +1,5 @@
-# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
+# glibc21.m4 serial 3
+dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
@@ -9,7 +9,7 @@ dnl the same distribution terms as the rest of that program.
 # Test for the GNU C Library, version 2.1 or newer.
 # From Bruno Haible.
 
-AC_DEFUN([jm_GLIBC21],
+AC_DEFUN([gl_GLIBC21],
   [
     AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
       ac_cv_gnu_library_2_1,
diff --git a/gnu/usr.bin/texinfo/m4/iconv.m4 b/gnu/usr.bin/texinfo/m4/iconv.m4
index f81e8b995f6..c5f3579827e 100644
--- a/gnu/usr.bin/texinfo/m4/iconv.m4
+++ b/gnu/usr.bin/texinfo/m4/iconv.m4
@@ -1,4 +1,4 @@
-# iconv.m4 serial AM3 (gettext-0.11)
+# iconv.m4 serial AM4 (gettext-0.11.3)
 dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -8,11 +8,8 @@ dnl the same distribution terms as the rest of that program.
 
 dnl From Bruno Haible.
 
-AC_DEFUN([AM_ICONV_LINK],
+AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
 [
-  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
-  dnl those with the standalone portable GNU libiconv installed).
-
   dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
   AC_REQUIRE([AC_LIB_RPATH])
@@ -20,6 +17,16 @@ AC_DEFUN([AM_ICONV_LINK],
   dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
   dnl accordingly.
   AC_LIB_LINKFLAGS_BODY([iconv])
+])
+
+AC_DEFUN([AM_ICONV_LINK],
+[
+  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
+  dnl those with the standalone portable GNU libiconv installed).
+
+  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+  dnl accordingly.
+  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
 
   dnl Add $INCICONV to CPPFLAGS before performing the following checks,
   dnl because if the user has installed libiconv and not disabled its use
@@ -69,7 +76,7 @@ AC_DEFUN([AM_ICONV_LINK],
 
 AC_DEFUN([AM_ICONV],
 [
-  AC_REQUIRE([AM_ICONV_LINK])
+  AM_ICONV_LINK
   if test "$am_cv_func_iconv" = yes; then
     AC_MSG_CHECKING([for iconv declaration])
     AC_CACHE_VAL(am_cv_proto_iconv, [
diff --git a/gnu/usr.bin/texinfo/m4/intdiv0.m4 b/gnu/usr.bin/texinfo/m4/intdiv0.m4
new file mode 100644
index 00000000000..55dddcf1c24
--- /dev/null
+++ b/gnu/usr.bin/texinfo/m4/intdiv0.m4
@@ -0,0 +1,72 @@
+# intdiv0.m4 serial 1 (gettext-0.11.3)
+dnl Copyright (C) 2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([gt_INTDIV0],
+[
+  AC_REQUIRE([AC_PROG_CC])dnl
+  AC_REQUIRE([AC_CANONICAL_HOST])dnl
+
+  AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
+    gt_cv_int_divbyzero_sigfpe,
+    [
+      AC_TRY_RUN([
+#include <stdlib.h>
+#include <signal.h>
+
+static void
+#ifdef __cplusplus
+sigfpe_handler (int sig)
+#else
+sigfpe_handler (sig) int sig;
+#endif
+{
+  /* Exit with code 0 if SIGFPE, with code 1 if any other signal.  */
+  exit (sig != SIGFPE);
+}
+
+int x = 1;
+int y = 0;
+int z;
+int nan;
+
+int main ()
+{
+  signal (SIGFPE, sigfpe_handler);
+/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP.  */
+#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
+  signal (SIGTRAP, sigfpe_handler);
+#endif
+/* Linux/SPARC yields signal SIGILL.  */
+#if defined (__sparc__) && defined (__linux__)
+  signal (SIGILL, sigfpe_handler);
+#endif
+
+  z = x / y;
+  nan = y / y;
+  exit (1);
+}
+], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
+        [
+          # Guess based on the CPU.
+          case "$host_cpu" in
+            alpha* | i[34567]86 | m68k | s390*)
+              gt_cv_int_divbyzero_sigfpe="guessing yes";;
+            *)
+              gt_cv_int_divbyzero_sigfpe="guessing no";;
+          esac
+        ])
+    ])
+  case "$gt_cv_int_divbyzero_sigfpe" in
+    *yes) value=1;;
+    *) value=0;;
+  esac
+  AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
+    [Define if integer division by zero raises signal SIGFPE.])
+])
diff --git a/gnu/usr.bin/texinfo/m4/intmax.m4 b/gnu/usr.bin/texinfo/m4/intmax.m4
new file mode 100644
index 00000000000..80f6526c6d4
--- /dev/null
+++ b/gnu/usr.bin/texinfo/m4/intmax.m4
@@ -0,0 +1,32 @@
+# intmax.m4 serial 2
+dnl Copyright (C) 2002-2004 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+dnl Test whether the system has the 'intmax_t' type, but don't attempt to
+dnl find a replacement if it is lacking.
+
+AC_DEFUN([gt_TYPE_INTMAX_T],
+[
+  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
+  AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
+    [AC_TRY_COMPILE([
+#include <stddef.h>
+#include <stdlib.h>
+#if HAVE_STDINT_H_WITH_UINTMAX
+#include <stdint.h>
+#endif
+#if HAVE_INTTYPES_H_WITH_UINTMAX
+#include <inttypes.h>
+#endif
+], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)])
+  if test $gt_cv_c_intmax_t = yes; then
+    AC_DEFINE(HAVE_INTMAX_T, 1,
+      [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
+  fi
+])
diff --git a/gnu/usr.bin/texinfo/m4/inttypes-pri.m4 b/gnu/usr.bin/texinfo/m4/inttypes-pri.m4
new file mode 100644
index 00000000000..fd007c31289
--- /dev/null
+++ b/gnu/usr.bin/texinfo/m4/inttypes-pri.m4
@@ -0,0 +1,32 @@
+# inttypes-pri.m4 serial 1 (gettext-0.11.4)
+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+
+# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
+# macros to non-string values.  This is the case on AIX 4.3.3.
+
+AC_DEFUN([gt_INTTYPES_PRI],
+[
+  AC_REQUIRE([gt_HEADER_INTTYPES_H])
+  if test $gt_cv_header_inttypes_h = yes; then
+    AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
+      gt_cv_inttypes_pri_broken,
+      [
+        AC_TRY_COMPILE([#include <inttypes.h>
+#ifdef PRId32
+char *p = PRId32;
+#endif
+], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
+      ])
+  fi
+  if test "$gt_cv_inttypes_pri_broken" = yes; then
+    AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
+      [Define if <inttypes.h> exists and defines unusable PRI* macros.])
+  fi
+])
diff --git a/gnu/usr.bin/texinfo/m4/inttypes.m4 b/gnu/usr.bin/texinfo/m4/inttypes.m4
new file mode 100644
index 00000000000..ab370ffe005
--- /dev/null
+++ b/gnu/usr.bin/texinfo/m4/inttypes.m4
@@ -0,0 +1,27 @@
+# inttypes.m4 serial 1 (gettext-0.11.4)
+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Paul Eggert.
+
+# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
+# <sys/types.h>.
+
+AC_DEFUN([gt_HEADER_INTTYPES_H],
+[
+  AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
+  [
+    AC_TRY_COMPILE(
+      [#include <sys/types.h>
+#include <inttypes.h>],
+      [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
+  ])
+  if test $gt_cv_header_inttypes_h = yes; then
+    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
+      [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
+  fi
+])
diff --git a/gnu/usr.bin/texinfo/m4/inttypes_h.m4 b/gnu/usr.bin/texinfo/m4/inttypes_h.m4
new file mode 100644
index 00000000000..79bba8763e1
--- /dev/null
+++ b/gnu/usr.bin/texinfo/m4/inttypes_h.m4
@@ -0,0 +1,28 @@
+# inttypes_h.m4 serial 6
+dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Paul Eggert.
+
+# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
+# doesn't clash with <sys/types.h>, and declares uintmax_t.
+
+AC_DEFUN([gl_AC_HEADER_INTTYPES_H],
+[
+  AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h,
+  [AC_TRY_COMPILE(
+    [#include <sys/types.h>
+#include <inttypes.h>],
+    [uintmax_t i = (uintmax_t) -1;],
+    gl_cv_header_inttypes_h=yes,
+    gl_cv_header_inttypes_h=no)])
+  if test $gl_cv_header_inttypes_h = yes; then
+    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
+      [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
+       and declares uintmax_t. ])
+  fi
+])
diff --git a/gnu/usr.bin/texinfo/m4/isc-posix.m4 b/gnu/usr.bin/texinfo/m4/isc-posix.m4
index dcaf3608f98..1319dd1c70a 100644
--- a/gnu/usr.bin/texinfo/m4/isc-posix.m4
+++ b/gnu/usr.bin/texinfo/m4/isc-posix.m4
@@ -1,4 +1,4 @@
-# isc-posix.m4 serial 1 (gettext-0.10.40)
+# isc-posix.m4 serial 2 (gettext-0.11.2)
 dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -6,6 +6,8 @@ dnl Public License, this file may be distributed as part of a program
 dnl that contains a configuration script generated by Autoconf, under
 dnl the same distribution terms as the rest of that program.
 
+# This file is not needed with autoconf-2.53 and newer.  Remove it in 2005.
+
 # This test replaces the one in autoconf.
 # Currently this macro should have the same name as the autoconf macro
 # because gettext's gettext.m4 (distributed in the automake package)
diff --git a/gnu/usr.bin/texinfo/m4/lcmessage.m4 b/gnu/usr.bin/texinfo/m4/lcmessage.m4
index ffbf915f1a9..ffd4008b825 100644
--- a/gnu/usr.bin/texinfo/m4/lcmessage.m4
+++ b/gnu/usr.bin/texinfo/m4/lcmessage.m4
@@ -1,4 +1,4 @@
-# lcmessage.m4 serial 2 (gettext-0.10.40)
+# lcmessage.m4 serial 3 (gettext-0.11.3)
 dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -21,12 +21,12 @@ dnl   Ulrich Drepper <drepper@cygnus.com>, 1995.
 # Check whether LC_MESSAGES is available in <locale.h>.
 
 AC_DEFUN([AM_LC_MESSAGES],
-  [if test $ac_cv_header_locale_h = yes; then
-    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+[
+  AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+    [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
        am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-    if test $am_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES, 1,
-        [Define if your <locale.h> file defines LC_MESSAGES.])
-    fi
-  fi])
+  if test $am_cv_val_LC_MESSAGES = yes; then
+    AC_DEFINE(HAVE_LC_MESSAGES, 1,
+      [Define if your <locale.h> file defines LC_MESSAGES.])
+  fi
+])
diff --git a/gnu/usr.bin/texinfo/m4/lib-ld.m4 b/gnu/usr.bin/texinfo/m4/lib-ld.m4
index ddb573234cb..38aeaec19f2 100644
--- a/gnu/usr.bin/texinfo/m4/lib-ld.m4
+++ b/gnu/usr.bin/texinfo/m4/lib-ld.m4
@@ -1,5 +1,5 @@
-# lib-ld.m4 serial 1 (gettext-0.11)
-dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
+# lib-ld.m4 serial 3 (gettext-0.13)
+dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
@@ -14,11 +14,12 @@ dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
 AC_DEFUN([AC_LIB_PROG_LD_GNU],
 [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
 [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  acl_cv_prog_gnu_ld=yes
-else
-  acl_cv_prog_gnu_ld=no
-fi])
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  acl_cv_prog_gnu_ld=yes ;;
+*)
+  acl_cv_prog_gnu_ld=no ;;
+esac])
 with_gnu_ld=$acl_cv_prog_gnu_ld
 ])
 
@@ -29,6 +30,19 @@ AC_DEFUN([AC_LIB_PROG_LD],
 test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
 AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
@@ -75,11 +89,12 @@ AC_CACHE_VAL(acl_cv_path_LD,
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some GNU ld's only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-	test "$with_gnu_ld" != yes && break
-      fi
+      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break ;;
+      *)
+	test "$with_gnu_ld" != yes && break ;;
+      esac
     fi
   done
   IFS="$ac_save_ifs"
diff --git a/gnu/usr.bin/texinfo/m4/lib-link.m4 b/gnu/usr.bin/texinfo/m4/lib-link.m4
index a16aa446054..eeb200d266d 100644
--- a/gnu/usr.bin/texinfo/m4/lib-link.m4
+++ b/gnu/usr.bin/texinfo/m4/lib-link.m4
@@ -1,5 +1,5 @@
-# lib-link.m4 serial 1 (gettext-0.11)
-dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+# lib-link.m4 serial 4 (gettext-0.12)
+dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
@@ -92,8 +92,7 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
 
 dnl Determine the platform dependent parameters needed to use rpath:
 dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
-dnl hardcode_direct, hardcode_minus_L,
-dnl sys_lib_search_path_spec, sys_lib_dlsearch_path_spec.
+dnl hardcode_direct, hardcode_minus_L.
 AC_DEFUN([AC_LIB_RPATH],
 [
   AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
@@ -114,8 +113,10 @@ AC_DEFUN([AC_LIB_RPATH],
   hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
   hardcode_direct="$acl_cv_hardcode_direct"
   hardcode_minus_L="$acl_cv_hardcode_minus_L"
-  sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
-  sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
+  dnl Determine whether the user wants rpath handling at all.
+  AC_ARG_ENABLE(rpath,
+    [  --disable-rpath         do not hardcode runtime library paths],
+    :, enable_rpath=yes)
 ])
 
 dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
@@ -131,7 +132,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
     eval additional_includedir=\"$includedir\"
     eval additional_libdir=\"$libdir\"
   ])
-  AC_ARG_WITH([lib$1-prefix],
+  AC_LIB_ARG_WITH([lib$1-prefix],
 [  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
   --without-lib$1-prefix     don't search for lib$1 in includedir and libdir],
 [
@@ -245,7 +246,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
               dnl Linking with a shared library. We attempt to hardcode its
               dnl directory into the executable's runpath, unless it's the
               dnl standard /usr/lib.
-              if test "X$found_dir" = "X/usr/lib"; then
+              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
                 dnl No hardcoding is needed.
                 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
               else
@@ -434,6 +435,35 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
                       fi
                     fi
                     ;;
+                  -R*)
+                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
+                    if test "$enable_rpath" != no; then
+                      dnl Potentially add DIR to rpathdirs.
+                      dnl The rpathdirs will be appended to $LIBNAME at the end.
+                      haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
+                      fi
+                      dnl Potentially add DIR to ltrpathdirs.
+                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                      haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
+                      fi
+                    fi
+                    ;;
                   -l*)
                     dnl Handle this in the next round.
                     names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
diff --git a/gnu/usr.bin/texinfo/m4/lib-prefix.m4 b/gnu/usr.bin/texinfo/m4/lib-prefix.m4
index b8b79ab9ad5..8aff5a9d206 100644
--- a/gnu/usr.bin/texinfo/m4/lib-prefix.m4
+++ b/gnu/usr.bin/texinfo/m4/lib-prefix.m4
@@ -1,5 +1,5 @@
-# lib-prefix.m4 serial 1 (gettext-0.11)
-dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+# lib-prefix.m4 serial 3 (gettext-0.13)
+dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
@@ -8,6 +8,13 @@ dnl the same distribution terms as the rest of that program.
 
 dnl From Bruno Haible.
 
+dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
+dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
+dnl require excessive bracketing.
+ifdef([AC_HELP_STRING],
+[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
+[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
+
 dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
 dnl to access previously installed libraries. The basic assumption is that
 dnl a user will want packages to use other packages he previously installed
@@ -26,7 +33,7 @@ AC_DEFUN([AC_LIB_PREFIX],
     eval additional_includedir=\"$includedir\"
     eval additional_libdir=\"$libdir\"
   ])
-  AC_ARG_WITH([lib-prefix],
+  AC_LIB_ARG_WITH([lib-prefix],
 [  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
   --without-lib-prefix    don't search for libraries in includedir and libdir],
 [
diff --git a/gnu/usr.bin/texinfo/m4/longdouble.m4 b/gnu/usr.bin/texinfo/m4/longdouble.m4
new file mode 100644
index 00000000000..1333d2f5707
--- /dev/null
+++ b/gnu/usr.bin/texinfo/m4/longdouble.m4
@@ -0,0 +1,30 @@
+# longdouble.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+dnl Test whether the compiler supports the 'long double' type.
+dnl Prerequisite: AC_PROG_CC
+
+AC_DEFUN([gt_TYPE_LONGDOUBLE],
+[
+  AC_CACHE_CHECK([for long double], gt_cv_c_long_double,
+    [if test "$GCC" = yes; then
+       gt_cv_c_long_double=yes
+     else
+       AC_TRY_COMPILE([
+         /* The Stardent Vistra knows sizeof(long double), but does not support it.  */
+         long double foo = 0.0;
+         /* On Ultrix 4.3 cc, long double is 4 and double is 8.  */
+         int array [2*(sizeof(long double) >= sizeof(double)) - 1];
+         ], ,
+         gt_cv_c_long_double=yes, gt_cv_c_long_double=no)
+     fi])
+  if test $gt_cv_c_long_double = yes; then
+    AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the 'long double' type.])
+  fi
+])
diff --git a/gnu/usr.bin/texinfo/m4/longlong.m4 b/gnu/usr.bin/texinfo/m4/longlong.m4
new file mode 100644
index 00000000000..028422b6121
--- /dev/null
+++ b/gnu/usr.bin/texinfo/m4/longlong.m4
@@ -0,0 +1,25 @@
+# longlong.m4 serial 5
+dnl Copyright (C) 1999-2004 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Paul Eggert.
+
+# Define HAVE_LONG_LONG if 'long long' works.
+
+AC_DEFUN([gl_AC_TYPE_LONG_LONG],
+[
+  AC_CACHE_CHECK([for long long], ac_cv_type_long_long,
+  [AC_TRY_LINK([long long ll = 1LL; int i = 63;],
+    [long long llmax = (long long) -1;
+     return ll << i | ll >> i | llmax / ll | llmax % ll;],
+    ac_cv_type_long_long=yes,
+    ac_cv_type_long_long=no)])
+  if test $ac_cv_type_long_long = yes; then
+    AC_DEFINE(HAVE_LONG_LONG, 1,
+      [Define if you have the 'long long' type.])
+  fi
+])
diff --git a/gnu/usr.bin/texinfo/m4/mkstemp.m4 b/gnu/usr.bin/texinfo/m4/mkstemp.m4
new file mode 100644
index 00000000000..82e1ce5853b
--- /dev/null
+++ b/gnu/usr.bin/texinfo/m4/mkstemp.m4
@@ -0,0 +1,66 @@
+#serial 6
+
+# On some hosts (e.g., HP-UX 10.20, SunOS 4.1.4, Solaris 2.5.1), mkstemp has a
+# silly limit that it can create no more than 26 files from a given template.
+# Other systems lack mkstemp altogether.
+# On OSF1/Tru64 V4.0F, the system-provided mkstemp function can create
+# only 32 files per process.
+# On systems like the above, arrange to use the replacement function.
+AC_DEFUN([gl_FUNC_MKSTEMP],
+[dnl
+  AC_REPLACE_FUNCS(mkstemp)
+  if test $ac_cv_func_mkstemp = no; then
+    gl_cv_func_mkstemp_limitations=yes
+  else
+    AC_CACHE_CHECK([for mkstemp limitations],
+      gl_cv_func_mkstemp_limitations,
+      [
+	AC_TRY_RUN([
+#         include <stdlib.h>
+	  int main ()
+	  {
+	    int i;
+	    for (i = 0; i < 70; i++)
+	      {
+		char template[] = "conftestXXXXXX";
+		int fd = mkstemp (template);
+		if (fd == -1)
+		  exit (1);
+		close (fd);
+	      }
+	    exit (0);
+	  }
+	  ],
+	gl_cv_func_mkstemp_limitations=no,
+	gl_cv_func_mkstemp_limitations=yes,
+	gl_cv_func_mkstemp_limitations=yes
+	)
+      ]
+    )
+  fi
+
+  if test $gl_cv_func_mkstemp_limitations = yes; then
+    AC_LIBOBJ(mkstemp)
+    AC_LIBOBJ(tempname)
+    AC_DEFINE(mkstemp, rpl_mkstemp,
+      [Define to rpl_mkstemp if the replacement function should be used.])
+    gl_PREREQ_MKSTEMP
+    gl_PREREQ_TEMPNAME
+  fi
+])
+
+# Prerequisites of lib/mkstemp.c.
+AC_DEFUN([gl_PREREQ_MKSTEMP],
+[
+])
+
+# Prerequisites of lib/tempname.c.
+AC_DEFUN([gl_PREREQ_TEMPNAME],
+[
+  AC_REQUIRE([AC_HEADER_STAT])
+  AC_CHECK_HEADERS_ONCE(fcntl.h sys/time.h unistd.h)
+  AC_CHECK_HEADERS(stdint.h)
+  AC_CHECK_FUNCS(__secure_getenv gettimeofday)
+  AC_CHECK_DECLS_ONCE(getenv)
+  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])
+])
diff --git a/gnu/usr.bin/texinfo/m4/nls.m4 b/gnu/usr.bin/texinfo/m4/nls.m4
new file mode 100644
index 00000000000..36bc49317c1
--- /dev/null
+++ b/gnu/usr.bin/texinfo/m4/nls.m4
@@ -0,0 +1,49 @@
+# nls.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+AC_DEFUN([AM_NLS],
+[
+  AC_MSG_CHECKING([whether NLS is requested])
+  dnl Default is enabled NLS
+  AC_ARG_ENABLE(nls,
+    [  --disable-nls           do not use Native Language Support],
+    USE_NLS=$enableval, USE_NLS=yes)
+  AC_MSG_RESULT($USE_NLS)
+  AC_SUBST(USE_NLS)
+])
+
+AC_DEFUN([AM_MKINSTALLDIRS],
+[
+  dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+  dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
+  dnl Try to locate it.
+  MKINSTALLDIRS=
+  if test -n "$ac_aux_dir"; then
+    case "$ac_aux_dir" in
+      /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
+      *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
+    esac
+  fi
+  if test -z "$MKINSTALLDIRS"; then
+    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+  fi
+  AC_SUBST(MKINSTALLDIRS)
+])
diff --git a/gnu/usr.bin/texinfo/m4/onceonly.m4 b/gnu/usr.bin/texinfo/m4/onceonly.m4
new file mode 100644
index 00000000000..f6fec37cbf2
--- /dev/null
+++ b/gnu/usr.bin/texinfo/m4/onceonly.m4
@@ -0,0 +1,63 @@
+# onceonly.m4 serial 3
+dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl This file defines some "once only" variants of standard autoconf macros.
+dnl   AC_CHECK_HEADERS_ONCE         like  AC_CHECK_HEADERS
+dnl   AC_CHECK_FUNCS_ONCE           like  AC_CHECK_FUNCS
+dnl   AC_CHECK_DECLS_ONCE           like  AC_CHECK_DECLS
+dnl   AC_REQUIRE([AC_HEADER_STDC])  like  AC_HEADER_STDC
+dnl The advantage is that the check for each of the headers/functions/decls
+dnl will be put only once into the 'configure' file. It keeps the size of
+dnl the 'configure' file down, and avoids redundant output when 'configure'
+dnl is run.
+dnl The drawback is that the checks cannot be conditionalized. If you write
+dnl   if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi
+dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to
+dnl empty, and the check will be inserted before the body of the AC_DEFUNed
+dnl function.
+
+dnl Autoconf version 2.57 or newer is recommended.
+AC_PREREQ(2.54)
+
+# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of
+# AC_CHECK_HEADERS(HEADER1 HEADER2 ...).
+AC_DEFUN([AC_CHECK_HEADERS_ONCE], [
+  :
+  AC_FOREACH([gl_HEADER_NAME], [$1], [
+    AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(defn([gl_HEADER_NAME]),
+                                                 [-./], [___])), [
+      AC_CHECK_HEADERS(gl_HEADER_NAME)
+    ])
+    AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME,
+                                                   [-./], [___])))
+  ])
+])
+
+# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of
+# AC_CHECK_FUNCS(FUNC1 FUNC2 ...).
+AC_DEFUN([AC_CHECK_FUNCS_ONCE], [
+  :
+  AC_FOREACH([gl_FUNC_NAME], [$1], [
+    AC_DEFUN([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]), [
+      AC_CHECK_FUNCS(defn([gl_FUNC_NAME]))
+    ])
+    AC_REQUIRE([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]))
+  ])
+])
+
+# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of
+# AC_CHECK_DECLS(DECL1, DECL2, ...).
+AC_DEFUN([AC_CHECK_DECLS_ONCE], [
+  :
+  AC_FOREACH([gl_DECL_NAME], [$1], [
+    AC_DEFUN([gl_CHECK_DECL_]defn([gl_DECL_NAME]), [
+      AC_CHECK_DECLS(defn([gl_DECL_NAME]))
+    ])
+    AC_REQUIRE([gl_CHECK_DECL_]defn([gl_DECL_NAME]))
+  ])
+])
diff --git a/gnu/usr.bin/texinfo/m4/onceonly_2_57.m4 b/gnu/usr.bin/texinfo/m4/onceonly_2_57.m4
new file mode 100644
index 00000000000..9fc510e06ee
--- /dev/null
+++ b/gnu/usr.bin/texinfo/m4/onceonly_2_57.m4
@@ -0,0 +1,86 @@
+# onceonly_2_57.m4 serial 3
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl This file defines some "once only" variants of standard autoconf macros.
+dnl   AC_CHECK_HEADERS_ONCE         like  AC_CHECK_HEADERS
+dnl   AC_CHECK_FUNCS_ONCE           like  AC_CHECK_FUNCS
+dnl   AC_CHECK_DECLS_ONCE           like  AC_CHECK_DECLS
+dnl   AC_REQUIRE([AC_HEADER_STDC])  like  AC_HEADER_STDC
+dnl The advantage is that the check for each of the headers/functions/decls
+dnl will be put only once into the 'configure' file. It keeps the size of
+dnl the 'configure' file down, and avoids redundant output when 'configure'
+dnl is run.
+dnl The drawback is that the checks cannot be conditionalized. If you write
+dnl   if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi
+dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to
+dnl empty, and the check will be inserted before the body of the AC_DEFUNed
+dnl function.
+
+dnl This is like onceonly.m4, except that it uses diversions to named sections
+dnl DEFAULTS and INIT_PREPARE in order to check all requested headers at once,
+dnl thus reducing the size of 'configure'. Works with autoconf-2.57. The
+dnl size reduction is ca. 9%.
+
+dnl Autoconf version 2.57 or newer is recommended.
+AC_PREREQ(2.54)
+
+# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of
+# AC_CHECK_HEADERS(HEADER1 HEADER2 ...).
+AC_DEFUN([AC_CHECK_HEADERS_ONCE], [
+  :
+  AC_FOREACH([gl_HEADER_NAME], [$1], [
+    AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME,
+                                                 [./-], [___])), [
+      m4_divert_text([INIT_PREPARE],
+        [gl_header_list="$gl_header_list gl_HEADER_NAME"])
+      gl_HEADERS_EXPANSION
+      AH_TEMPLATE(AS_TR_CPP([HAVE_]m4_defn([gl_HEADER_NAME])),
+        [Define to 1 if you have the <]m4_defn([gl_HEADER_NAME])[> header file.])
+    ])
+    AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME,
+                                                   [./-], [___])))
+  ])
+])
+m4_define([gl_HEADERS_EXPANSION], [
+  m4_divert_text([DEFAULTS], [gl_header_list=])
+  AC_CHECK_HEADERS([$gl_header_list])
+  m4_define([gl_HEADERS_EXPANSION], [])
+])
+
+# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of
+# AC_CHECK_FUNCS(FUNC1 FUNC2 ...).
+AC_DEFUN([AC_CHECK_FUNCS_ONCE], [
+  :
+  AC_FOREACH([gl_FUNC_NAME], [$1], [
+    AC_DEFUN([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]), [
+      m4_divert_text([INIT_PREPARE],
+        [gl_func_list="$gl_func_list gl_FUNC_NAME"])
+      gl_FUNCS_EXPANSION
+      AH_TEMPLATE(AS_TR_CPP([HAVE_]m4_defn([gl_FUNC_NAME])),
+        [Define to 1 if you have the `]m4_defn([gl_FUNC_NAME])[' function.])
+    ])
+    AC_REQUIRE([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]))
+  ])
+])
+m4_define([gl_FUNCS_EXPANSION], [
+  m4_divert_text([DEFAULTS], [gl_func_list=])
+  AC_CHECK_FUNCS([$gl_func_list])
+  m4_define([gl_FUNCS_EXPANSION], [])
+])
+
+# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of
+# AC_CHECK_DECLS(DECL1, DECL2, ...).
+AC_DEFUN([AC_CHECK_DECLS_ONCE], [
+  :
+  AC_FOREACH([gl_DECL_NAME], [$1], [
+    AC_DEFUN([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]), [
+      AC_CHECK_DECLS(m4_defn([gl_DECL_NAME]))
+    ])
+    AC_REQUIRE([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]))
+  ])
+])
diff --git a/gnu/usr.bin/texinfo/m4/po.m4 b/gnu/usr.bin/texinfo/m4/po.m4
new file mode 100644
index 00000000000..e1619988187
--- /dev/null
+++ b/gnu/usr.bin/texinfo/m4/po.m4
@@ -0,0 +1,426 @@
+# po.m4 serial 3 (gettext-0.14)
+dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+dnl Checks for all prerequisites of the po subdirectory.
+AC_DEFUN([AM_PO_SUBDIRS],
+[
+  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+  AC_REQUIRE([AC_PROG_INSTALL])dnl
+  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
+  AC_REQUIRE([AM_NLS])dnl
+
+  dnl Perform the following tests also if --disable-nls has been given,
+  dnl because they are needed for "make dist" to work.
+
+  dnl Search for GNU msgfmt in the PATH.
+  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
+  dnl The second test excludes FreeBSD msgfmt.
+  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+    [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
+     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+    :)
+  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+
+  dnl Search for GNU xgettext 0.12 or newer in the PATH.
+  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
+  dnl The second test excludes FreeBSD xgettext.
+  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+    [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
+     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+    :)
+  dnl Remove leftover from FreeBSD xgettext call.
+  rm -f messages.po
+
+  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
+  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
+    [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
+
+  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
+  dnl Test whether we really found GNU msgfmt.
+  if test "$GMSGFMT" != ":"; then
+    dnl If it is no GNU msgfmt we define it as : so that the
+    dnl Makefiles still can work.
+    if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
+       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+      : ;
+    else
+      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
+      AC_MSG_RESULT(
+        [found $GMSGFMT program is not GNU msgfmt; ignore it])
+      GMSGFMT=":"
+    fi
+  fi
+
+  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
+  dnl Test whether we really found GNU xgettext.
+  if test "$XGETTEXT" != ":"; then
+    dnl If it is no GNU xgettext we define it as : so that the
+    dnl Makefiles still can work.
+    if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
+       (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+      : ;
+    else
+      AC_MSG_RESULT(
+        [found xgettext program is not GNU xgettext; ignore it])
+      XGETTEXT=":"
+    fi
+    dnl Remove leftover from FreeBSD xgettext call.
+    rm -f messages.po
+  fi
+
+  AC_OUTPUT_COMMANDS([
+    for ac_file in $CONFIG_FILES; do
+      # Support "outfile[:infile[:infile...]]"
+      case "$ac_file" in
+        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+      esac
+      # PO directories have a Makefile.in generated from Makefile.in.in.
+      case "$ac_file" in */Makefile.in)
+        # Adjust a relative srcdir.
+        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+        # In autoconf-2.13 it is called $ac_given_srcdir.
+        # In autoconf-2.50 it is called $srcdir.
+        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+        case "$ac_given_srcdir" in
+          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+          /*) top_srcdir="$ac_given_srcdir" ;;
+          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+        esac
+        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+          rm -f "$ac_dir/POTFILES"
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+          POMAKEFILEDEPS="POTFILES.in"
+          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
+          # on $ac_dir but don't depend on user-specified configuration
+          # parameters.
+          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+            # The LINGUAS file contains the set of available languages.
+            if test -n "$OBSOLETE_ALL_LINGUAS"; then
+              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+            fi
+            ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+            # Hide the ALL_LINGUAS assigment from automake.
+            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+          else
+            # The set of available languages was given in configure.in.
+            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
+          fi
+          # Compute POFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+          # Compute UPDATEPOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+          # Compute DUMMYPOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+          # Compute GMOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+          case "$ac_given_srcdir" in
+            .) srcdirpre= ;;
+            *) srcdirpre='$(srcdir)/' ;;
+          esac
+          POFILES=
+          UPDATEPOFILES=
+          DUMMYPOFILES=
+          GMOFILES=
+          for lang in $ALL_LINGUAS; do
+            POFILES="$POFILES $srcdirpre$lang.po"
+            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+          done
+          # CATALOGS depends on both $ac_dir and the user's LINGUAS
+          # environment variable.
+          INST_LINGUAS=
+          if test -n "$ALL_LINGUAS"; then
+            for presentlang in $ALL_LINGUAS; do
+              useit=no
+              if test "%UNSET%" != "$LINGUAS"; then
+                desiredlanguages="$LINGUAS"
+              else
+                desiredlanguages="$ALL_LINGUAS"
+              fi
+              for desiredlang in $desiredlanguages; do
+                # Use the presentlang catalog if desiredlang is
+                #   a. equal to presentlang, or
+                #   b. a variant of presentlang (because in this case,
+                #      presentlang can be used as a fallback for messages
+                #      which are not translated in the desiredlang catalog).
+                case "$desiredlang" in
+                  "$presentlang"*) useit=yes;;
+                esac
+              done
+              if test $useit = yes; then
+                INST_LINGUAS="$INST_LINGUAS $presentlang"
+              fi
+            done
+          fi
+          CATALOGS=
+          if test -n "$INST_LINGUAS"; then
+            for lang in $INST_LINGUAS; do
+              CATALOGS="$CATALOGS $lang.gmo"
+            done
+          fi
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
+            if test -f "$f"; then
+              case "$f" in
+                *.orig | *.bak | *~) ;;
+                *) cat "$f" >> "$ac_dir/Makefile" ;;
+              esac
+            fi
+          done
+        fi
+        ;;
+      esac
+    done],
+   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
+    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
+    # from automake.
+    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+    # Capture the value of LINGUAS because we need it to compute CATALOGS.
+    LINGUAS="${LINGUAS-%UNSET%}"
+   ])
+])
+
+dnl Postprocesses a Makefile in a directory containing PO files.
+AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
+[
+  # When this code is run, in config.status, two variables have already been
+  # set:
+  # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
+  # - LINGUAS is the value of the environment variable LINGUAS at configure
+  #   time.
+
+changequote(,)dnl
+  # Adjust a relative srcdir.
+  ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+  ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+  ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+  # In autoconf-2.13 it is called $ac_given_srcdir.
+  # In autoconf-2.50 it is called $srcdir.
+  test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+  case "$ac_given_srcdir" in
+    .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+    /*) top_srcdir="$ac_given_srcdir" ;;
+    *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+  esac
+
+  # Find a way to echo strings without interpreting backslash.
+  if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
+    gt_echo='echo'
+  else
+    if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
+      gt_echo='printf %s\n'
+    else
+      echo_func () {
+        cat <<EOT
+$*
+EOT
+      }
+      gt_echo='echo_func'
+    fi
+  fi
+
+  # A sed script that extracts the value of VARIABLE from a Makefile.
+  sed_x_variable='
+# Test if the hold space is empty.
+x
+s/P/P/
+x
+ta
+# Yes it was empty. Look if we have the expected variable definition.
+/^[	 ]*VARIABLE[	 ]*=/{
+  # Seen the first line of the variable definition.
+  s/^[	 ]*VARIABLE[	 ]*=//
+  ba
+}
+bd
+:a
+# Here we are processing a line from the variable definition.
+# Remove comment, more precisely replace it with a space.
+s/#.*$/ /
+# See if the line ends in a backslash.
+tb
+:b
+s/\\$//
+# Print the line, without the trailing backslash.
+p
+tc
+# There was no trailing backslash. The end of the variable definition is
+# reached. Clear the hold space.
+s/^.*$//
+x
+bd
+:c
+# A trailing backslash means that the variable definition continues in the
+# next line. Put a nonempty string into the hold space to indicate this.
+s/^.*$/P/
+x
+:d
+'
+changequote([,])dnl
+
+  # Set POTFILES to the value of the Makefile variable POTFILES.
+  sed_x_POTFILES="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`"
+  POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
+  # Compute POTFILES_DEPS as
+  #   $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
+  POTFILES_DEPS=
+  for file in $POTFILES; do
+    POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
+  done
+  POMAKEFILEDEPS=""
+
+  if test -n "$OBSOLETE_ALL_LINGUAS"; then
+    test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+  fi
+  if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+    # The LINGUAS file contains the set of available languages.
+    ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+    POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+  else
+    # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
+    sed_x_LINGUAS="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`"
+    ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
+  fi
+  # Hide the ALL_LINGUAS assigment from automake.
+  eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+  # Compute POFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+  # Compute UPDATEPOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+  # Compute DUMMYPOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+  # Compute GMOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+  # Compute PROPERTIESFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
+  # Compute CLASSFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
+  # Compute QMFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
+  # Compute MSGFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
+  # Compute RESOURCESDLLFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
+  case "$ac_given_srcdir" in
+    .) srcdirpre= ;;
+    *) srcdirpre='$(srcdir)/' ;;
+  esac
+  POFILES=
+  UPDATEPOFILES=
+  DUMMYPOFILES=
+  GMOFILES=
+  PROPERTIESFILES=
+  CLASSFILES=
+  QMFILES=
+  MSGFILES=
+  RESOURCESDLLFILES=
+  for lang in $ALL_LINGUAS; do
+    POFILES="$POFILES $srcdirpre$lang.po"
+    UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+    DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+    GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+    PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
+    CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
+    QMFILES="$QMFILES $srcdirpre$lang.qm"
+    frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+    MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
+    frobbedlang=`echo $lang | sed -e 's/_/-/g'`
+    RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
+  done
+  # CATALOGS depends on both $ac_dir and the user's LINGUAS
+  # environment variable.
+  INST_LINGUAS=
+  if test -n "$ALL_LINGUAS"; then
+    for presentlang in $ALL_LINGUAS; do
+      useit=no
+      if test "%UNSET%" != "$LINGUAS"; then
+        desiredlanguages="$LINGUAS"
+      else
+        desiredlanguages="$ALL_LINGUAS"
+      fi
+      for desiredlang in $desiredlanguages; do
+        # Use the presentlang catalog if desiredlang is
+        #   a. equal to presentlang, or
+        #   b. a variant of presentlang (because in this case,
+        #      presentlang can be used as a fallback for messages
+        #      which are not translated in the desiredlang catalog).
+        case "$desiredlang" in
+          "$presentlang"*) useit=yes;;
+        esac
+      done
+      if test $useit = yes; then
+        INST_LINGUAS="$INST_LINGUAS $presentlang"
+      fi
+    done
+  fi
+  CATALOGS=
+  JAVACATALOGS=
+  QTCATALOGS=
+  TCLCATALOGS=
+  CSHARPCATALOGS=
+  if test -n "$INST_LINGUAS"; then
+    for lang in $INST_LINGUAS; do
+      CATALOGS="$CATALOGS $lang.gmo"
+      JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
+      QTCATALOGS="$QTCATALOGS $lang.qm"
+      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+      TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
+      frobbedlang=`echo $lang | sed -e 's/_/-/g'`
+      CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
+    done
+  fi
+
+  sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
+  if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
+    # Add dependencies that cannot be formulated as a simple suffix rule.
+    for lang in $ALL_LINGUAS; do
+      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+      cat >> "$ac_file.tmp" <<EOF
+$frobbedlang.msg: $lang.po
+	@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
+	\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+EOF
+    done
+  fi
+  if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
+    # Add dependencies that cannot be formulated as a simple suffix rule.
+    for lang in $ALL_LINGUAS; do
+      frobbedlang=`echo $lang | sed -e 's/_/-/g'`
+      cat >> "$ac_file.tmp" <<EOF
+$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
+	@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
+	\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+EOF
+    done
+  fi
+  if test -n "$POMAKEFILEDEPS"; then
+    cat >> "$ac_file.tmp" <<EOF
+Makefile: $POMAKEFILEDEPS
+EOF
+  fi
+  mv "$ac_file.tmp" "$ac_file"
+])
diff --git a/gnu/usr.bin/texinfo/m4/prereq.m4 b/gnu/usr.bin/texinfo/m4/prereq.m4
new file mode 100644
index 00000000000..e2588a29ed6
--- /dev/null
+++ b/gnu/usr.bin/texinfo/m4/prereq.m4
@@ -0,0 +1,129 @@
+#serial 40
+
+dnl We use gl_ for non Autoconf macros.
+m4_pattern_forbid([^gl_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
+
+# These are the prerequisite macros for files in the lib/
+# directory of the coreutils package.
+
+AC_DEFUN([gl_PREREQ],
+[
+  # We don't yet use c-stack.c.
+  # AC_REQUIRE([gl_C_STACK])
+
+  AC_REQUIRE([AM_FUNC_GETLINE])
+  AC_REQUIRE([AM_STDBOOL_H])
+  AC_REQUIRE([gl_FUNC_MKDIR_TRAILING_SLASH])
+  AC_REQUIRE([gl_FUNC_MKSTEMP])
+  AC_REQUIRE([gl_ALLOCSA])
+  AC_REQUIRE([gl_BACKUPFILE])
+  AC_REQUIRE([gl_CANON_HOST])
+  AC_REQUIRE([gl_CLOEXEC])
+  AC_REQUIRE([gl_CLOSEOUT])
+  AC_REQUIRE([gl_DIRNAME])
+  AC_REQUIRE([gl_ERROR])
+  AC_REQUIRE([gl_EXCLUDE])
+  AC_REQUIRE([gl_EXITFAIL])
+  AC_REQUIRE([gl_FILEBLOCKS])
+  AC_REQUIRE([gl_FILEMODE])
+  AC_REQUIRE([gl_FILE_TYPE])
+  AC_REQUIRE([gl_FSUSAGE])
+  AC_REQUIRE([gl_FUNC_ALLOCA])
+  AC_REQUIRE([gl_FUNC_ATEXIT])
+  AC_REQUIRE([gl_FUNC_DUP2])
+  AC_REQUIRE([gl_FUNC_EUIDACCESS])
+  AC_REQUIRE([gl_FUNC_FNMATCH_GNU])
+  AC_REQUIRE([gl_FUNC_GETHOSTNAME])
+  AC_REQUIRE([AC_FUNC_GETLOADAVG])
+  AC_REQUIRE([gl_FUNC_GETPASS])
+  AC_REQUIRE([gl_FUNC_GETUSERSHELL])
+  AC_REQUIRE([gl_FUNC_MEMCHR])
+  AC_REQUIRE([gl_FUNC_MEMCPY])
+  AC_REQUIRE([gl_FUNC_MEMMOVE])
+  AC_REQUIRE([gl_FUNC_MEMRCHR])
+  AC_REQUIRE([gl_FUNC_MEMSET])
+  AC_REQUIRE([gl_FUNC_MKTIME])
+  AC_REQUIRE([gl_FUNC_READLINK])
+  AC_REQUIRE([gl_FUNC_RMDIR])
+  AC_REQUIRE([gl_FUNC_RPMATCH])
+  AC_REQUIRE([gl_FUNC_SIG2STR])
+  AC_REQUIRE([gl_FUNC_STPCPY])
+  AC_REQUIRE([gl_FUNC_STRCSPN])
+  AC_REQUIRE([gl_FUNC_STRDUP])
+  AC_REQUIRE([gl_FUNC_STRNDUP])
+  AC_REQUIRE([gl_FUNC_STRNLEN])
+  AC_REQUIRE([gl_FUNC_STRPBRK])
+  AC_REQUIRE([gl_FUNC_STRSTR])
+  AC_REQUIRE([gl_FUNC_STRTOD])
+  AC_REQUIRE([gl_FUNC_STRTOIMAX])
+  AC_REQUIRE([gl_FUNC_STRTOLL])
+  AC_REQUIRE([gl_FUNC_STRTOL])
+  AC_REQUIRE([gl_FUNC_STRTOULL])
+  AC_REQUIRE([gl_FUNC_STRTOUL])
+  AC_REQUIRE([gl_FUNC_STRTOUMAX])
+  AC_REQUIRE([gl_FUNC_STRVERSCMP])
+  AC_REQUIRE([gl_FUNC_VASNPRINTF])
+  AC_REQUIRE([gl_FUNC_VASPRINTF])
+  AC_REQUIRE([gl_GETDATE])
+  AC_REQUIRE([gl_GETNDELIM2])
+  AC_REQUIRE([gl_GETOPT])
+  AC_REQUIRE([gl_GETPAGESIZE])
+  AC_REQUIRE([gl_GETUGROUPS])
+  AC_REQUIRE([gl_HARD_LOCALE])
+  AC_REQUIRE([gl_HASH])
+  AC_REQUIRE([gl_HUMAN])
+  AC_REQUIRE([gl_IDCACHE])
+  AC_REQUIRE([gl_INTTOSTR])
+  AC_REQUIRE([gl_LONG_OPTIONS])
+  AC_REQUIRE([gl_MAKEPATH])
+  AC_REQUIRE([gl_MBSWIDTH])
+  AC_REQUIRE([gl_MD5])
+  AC_REQUIRE([gl_MEMCOLL])
+  AC_REQUIRE([gl_MODECHANGE])
+  AC_REQUIRE([gl_MOUNTLIST])
+  AC_REQUIRE([gl_OBSTACK])
+  AC_REQUIRE([gl_PATHMAX])
+  AC_REQUIRE([gl_PATH_CONCAT])
+  AC_REQUIRE([gl_PHYSMEM])
+  AC_REQUIRE([gl_POSIXTM])
+  AC_REQUIRE([gl_POSIXVER])
+  AC_REQUIRE([gl_QUOTEARG])
+  AC_REQUIRE([gl_QUOTE])
+  AC_REQUIRE([gl_READTOKENS])
+  AC_REQUIRE([gl_READUTMP])
+  AC_REQUIRE([gl_REGEX])
+  AC_REQUIRE([gl_SAFE_READ])
+  AC_REQUIRE([gl_SAFE_WRITE])
+  AC_REQUIRE([gl_SAME])
+  AC_REQUIRE([gl_SAVEDIR])
+  AC_REQUIRE([gl_SAVE_CWD])
+  AC_REQUIRE([gl_SETTIME])
+  AC_REQUIRE([gl_SHA])
+  AC_REQUIRE([gl_STDIO_SAFER])
+  AC_REQUIRE([gl_STRCASE])
+  AC_REQUIRE([gl_TIMESPEC])
+  AC_REQUIRE([gl_UNICODEIO])
+  AC_REQUIRE([gl_UNISTD_SAFER])
+  AC_REQUIRE([gl_USERSPEC])
+  AC_REQUIRE([gl_UTIMECMP])
+  AC_REQUIRE([gl_UTIMENS])
+  AC_REQUIRE([gl_XALLOC])
+  AC_REQUIRE([gl_XGETCWD])
+  AC_REQUIRE([gl_XREADLINK])
+  AC_REQUIRE([gl_XSTRTOD])
+  AC_REQUIRE([gl_XSTRTOL])
+  AC_REQUIRE([gl_YESNO])
+  AC_REQUIRE([gl_FUNC_GLIBC_UNLOCKED_IO])
+  AC_REQUIRE([gl_FUNC_GNU_STRFTIME])
+  AC_REQUIRE([gl_FUNC_LSTAT])
+  AC_REQUIRE([AC_FUNC_MALLOC])
+  AC_REQUIRE([gl_FUNC_MEMCMP])
+  AC_REQUIRE([gl_FUNC_NANOSLEEP])
+  AC_REQUIRE([gl_FUNC_PUTENV])
+  AC_REQUIRE([AC_FUNC_REALLOC])
+  AC_REQUIRE([gl_FUNC_STAT])
+  AC_REQUIRE([gl_FUNC_UTIME])
+  AC_REQUIRE([gl_XSTRTOIMAX])
+  AC_REQUIRE([gl_XSTRTOUMAX])
+  AC_REQUIRE([vb_FUNC_RENAME])
+])
diff --git a/gnu/usr.bin/texinfo/m4/printf-posix.m4 b/gnu/usr.bin/texinfo/m4/printf-posix.m4
new file mode 100644
index 00000000000..186ba6a6d16
--- /dev/null
+++ b/gnu/usr.bin/texinfo/m4/printf-posix.m4
@@ -0,0 +1,46 @@
+# printf-posix.m4 serial 2 (gettext-0.13.1)
+dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+dnl Test whether the printf() function supports POSIX/XSI format strings with
+dnl positions.
+
+AC_DEFUN([gt_PRINTF_POSIX],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings],
+    gt_cv_func_printf_posix,
+    [
+      AC_TRY_RUN([
+#include <stdio.h>
+#include <string.h>
+/* The string "%2$d %1$d", with dollar characters protected from the shell's
+   dollar expansion (possibly an autoconf bug).  */
+static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' };
+static char buf[100];
+int main ()
+{
+  sprintf (buf, format, 33, 55);
+  return (strcmp (buf, "55 33") != 0);
+}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no,
+      [
+        AC_EGREP_CPP(notposix, [
+#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
+  notposix
+#endif
+        ], gt_cv_func_printf_posix="guessing no",
+           gt_cv_func_printf_posix="guessing yes")
+      ])
+    ])
+  case $gt_cv_func_printf_posix in
+    *yes)
+      AC_DEFINE(HAVE_POSIX_PRINTF, 1,
+        [Define if your printf() function supports format strings with positions.])
+      ;;
+  esac
+])
diff --git a/gnu/usr.bin/texinfo/m4/progtest.m4 b/gnu/usr.bin/texinfo/m4/progtest.m4
index 443c8e30630..8fe527ceceb 100644
--- a/gnu/usr.bin/texinfo/m4/progtest.m4
+++ b/gnu/usr.bin/texinfo/m4/progtest.m4
@@ -1,5 +1,5 @@
-# progtest.m4 serial 2 (gettext-0.10.40)
-dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
+# progtest.m4 serial 3 (gettext-0.12)
+dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
@@ -23,31 +23,63 @@ dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
 dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
 dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
 AC_DEFUN([AM_PATH_PROG_WITH_TEST],
-[# Extract the first word of "$2", so it can be a program name with args.
+[
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "$2", so it can be a program name with args.
 set dummy $2; ac_word=[$]2
 AC_MSG_CHECKING([for $ac_word])
 AC_CACHE_VAL(ac_cv_path_$1,
 [case "[$]$1" in
-  /*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-  ;;
+  [[\\/]]* | ?:[[\\/]]*)
+    ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+    ;;
   *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if [$3]; then
-	ac_cv_path_$1="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in ifelse([$5], , $PATH, [$5]); do
+      IFS="$ac_save_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          if [$3]; then
+            ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$ac_save_IFS"
 dnl If no 4th arg is given, leave the cache variable unset,
 dnl so AC_PATH_PROGS will keep looking.
 ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
 ])dnl
-  ;;
+    ;;
 esac])dnl
 $1="$ac_cv_path_$1"
 if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
diff --git a/gnu/usr.bin/texinfo/m4/signed.m4 b/gnu/usr.bin/texinfo/m4/signed.m4
new file mode 100644
index 00000000000..dc1f54f1069
--- /dev/null
+++ b/gnu/usr.bin/texinfo/m4/signed.m4
@@ -0,0 +1,19 @@
+# signed.m4 serial 1 (gettext-0.10.40)
+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([bh_C_SIGNED],
+[
+  AC_CACHE_CHECK([for signed], bh_cv_c_signed,
+   [AC_TRY_COMPILE(, [signed char x;], bh_cv_c_signed=yes, bh_cv_c_signed=no)])
+  if test $bh_cv_c_signed = no; then
+    AC_DEFINE(signed, ,
+              [Define to empty if the C compiler doesn't support this keyword.])
+  fi
+])
diff --git a/gnu/usr.bin/texinfo/m4/size_max.m4 b/gnu/usr.bin/texinfo/m4/size_max.m4
new file mode 100644
index 00000000000..5762fc333c5
--- /dev/null
+++ b/gnu/usr.bin/texinfo/m4/size_max.m4
@@ -0,0 +1,61 @@
+# size_max.m4 serial 2
+dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([gl_SIZE_MAX],
+[
+  AC_CHECK_HEADERS(stdint.h)
+  dnl First test whether the system already has SIZE_MAX.
+  AC_MSG_CHECKING([for SIZE_MAX])
+  result=
+  AC_EGREP_CPP([Found it], [
+#include <limits.h>
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif
+#ifdef SIZE_MAX
+Found it
+#endif
+], result=yes)
+  if test -z "$result"; then
+    dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
+    dnl than the type 'unsigned long'.
+    dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr',
+    dnl which is guaranteed to work from LONG_MIN to LONG_MAX.
+    _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi,
+      [#include <stddef.h>], result=?)
+    _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo,
+      [#include <stddef.h>], result=?)
+    _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
+      [#include <stddef.h>], result=?)
+    if test "$fits_in_uint" = 1; then
+      dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
+      dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
+      AC_TRY_COMPILE([#include <stddef.h>
+        extern size_t foo;
+        extern unsigned long foo;
+        ], [], fits_in_uint=0)
+    fi
+    if test -z "$result"; then
+      if test "$fits_in_uint" = 1; then
+        result="$res_hi$res_lo"U
+      else
+        result="$res_hi$res_lo"UL
+      fi
+    else
+      dnl Shouldn't happen, but who knows...
+      result='~(size_t)0'
+    fi
+  fi
+  AC_MSG_RESULT([$result])
+  if test "$result" != yes; then
+    AC_DEFINE_UNQUOTED([SIZE_MAX], [$result],
+      [Define as the maximum value of type 'size_t', if the system doesn't define it.])
+  fi
+])
diff --git a/gnu/usr.bin/texinfo/m4/stdint_h.m4 b/gnu/usr.bin/texinfo/m4/stdint_h.m4
new file mode 100644
index 00000000000..063c4344e3c
--- /dev/null
+++ b/gnu/usr.bin/texinfo/m4/stdint_h.m4
@@ -0,0 +1,28 @@
+# stdint_h.m4 serial 5
+dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Paul Eggert.
+
+# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
+# doesn't clash with <sys/types.h>, and declares uintmax_t.
+
+AC_DEFUN([gl_AC_HEADER_STDINT_H],
+[
+  AC_CACHE_CHECK([for stdint.h], gl_cv_header_stdint_h,
+  [AC_TRY_COMPILE(
+    [#include <sys/types.h>
+#include <stdint.h>],
+    [uintmax_t i = (uintmax_t) -1;],
+    gl_cv_header_stdint_h=yes,
+    gl_cv_header_stdint_h=no)])
+  if test $gl_cv_header_stdint_h = yes; then
+    AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
+      [Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
+       and declares uintmax_t. ])
+  fi
+])
diff --git a/gnu/usr.bin/texinfo/m4/strcase.m4 b/gnu/usr.bin/texinfo/m4/strcase.m4
new file mode 100644
index 00000000000..3fd25d0ce97
--- /dev/null
+++ b/gnu/usr.bin/texinfo/m4/strcase.m4
@@ -0,0 +1,39 @@
+# strcase.m4 serial 1
+dnl Copyright (C) 2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+AC_DEFUN([gl_STRCASE],
+[
+  gl_FUNC_STRCASECMP
+  gl_FUNC_STRNCASECMP
+])
+
+AC_DEFUN([gl_FUNC_STRCASECMP],
+[
+  AC_REPLACE_FUNCS(strcasecmp)
+  if test $ac_cv_func_strcasecmp = no; then
+    gl_PREREQ_STRCASECMP
+  fi
+])
+
+AC_DEFUN([gl_FUNC_STRNCASECMP],
+[
+  AC_REPLACE_FUNCS(strncasecmp)
+  if test $ac_cv_func_strncasecmp = no; then
+    gl_PREREQ_STRNCASECMP
+  fi
+])
+
+# Prerequisites of lib/strcasecmp.c.
+AC_DEFUN([gl_PREREQ_STRCASECMP], [
+  :
+])
+
+# Prerequisites of lib/strncasecmp.c.
+AC_DEFUN([gl_PREREQ_STRNCASECMP], [
+  :
+])
diff --git a/gnu/usr.bin/texinfo/m4/uintmax_t.m4 b/gnu/usr.bin/texinfo/m4/uintmax_t.m4
new file mode 100644
index 00000000000..a2bc218ce79
--- /dev/null
+++ b/gnu/usr.bin/texinfo/m4/uintmax_t.m4
@@ -0,0 +1,32 @@
+# uintmax_t.m4 serial 9
+dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Paul Eggert.
+
+AC_PREREQ(2.13)
+
+# Define uintmax_t to 'unsigned long' or 'unsigned long long'
+# if it is not already defined in <stdint.h> or <inttypes.h>.
+
+AC_DEFUN([gl_AC_TYPE_UINTMAX_T],
+[
+  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
+  if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
+    AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG])
+    test $ac_cv_type_unsigned_long_long = yes \
+      && ac_type='unsigned long long' \
+      || ac_type='unsigned long'
+    AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
+      [Define to unsigned long or unsigned long long
+       if <stdint.h> and <inttypes.h> don't define.])
+  else
+    AC_DEFINE(HAVE_UINTMAX_T, 1,
+      [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.])
+  fi
+])
diff --git a/gnu/usr.bin/texinfo/m4/ulonglong.m4 b/gnu/usr.bin/texinfo/m4/ulonglong.m4
new file mode 100644
index 00000000000..1123ccb8372
--- /dev/null
+++ b/gnu/usr.bin/texinfo/m4/ulonglong.m4
@@ -0,0 +1,25 @@
+# ulonglong.m4 serial 4
+dnl Copyright (C) 1999-2004 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Paul Eggert.
+
+# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works.
+
+AC_DEFUN([gl_AC_TYPE_UNSIGNED_LONG_LONG],
+[
+  AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
+  [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;],
+    [unsigned long long ullmax = (unsigned long long) -1;
+     return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
+    ac_cv_type_unsigned_long_long=yes,
+    ac_cv_type_unsigned_long_long=no)])
+  if test $ac_cv_type_unsigned_long_long = yes; then
+    AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
+      [Define if you have the 'unsigned long long' type.])
+  fi
+])
diff --git a/gnu/usr.bin/texinfo/m4/wchar_t.m4 b/gnu/usr.bin/texinfo/m4/wchar_t.m4
new file mode 100644
index 00000000000..d8fd1ec5c3b
--- /dev/null
+++ b/gnu/usr.bin/texinfo/m4/wchar_t.m4
@@ -0,0 +1,22 @@
+# wchar_t.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+dnl Test whether <stddef.h> has the 'wchar_t' type.
+dnl Prerequisite: AC_PROG_CC
+
+AC_DEFUN([gt_TYPE_WCHAR_T],
+[
+  AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t,
+    [AC_TRY_COMPILE([#include <stddef.h>
+       wchar_t foo = (wchar_t)'\0';], ,
+       gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)])
+  if test $gt_cv_c_wchar_t = yes; then
+    AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.])
+  fi
+])
diff --git a/gnu/usr.bin/texinfo/m4/wint_t.m4 b/gnu/usr.bin/texinfo/m4/wint_t.m4
new file mode 100644
index 00000000000..3d8d21594c0
--- /dev/null
+++ b/gnu/usr.bin/texinfo/m4/wint_t.m4
@@ -0,0 +1,22 @@
+# wint_t.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+dnl Test whether <wchar.h> has the 'wint_t' type.
+dnl Prerequisite: AC_PROG_CC
+
+AC_DEFUN([gt_TYPE_WINT_T],
+[
+  AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t,
+    [AC_TRY_COMPILE([#include <wchar.h>
+       wint_t foo = (wchar_t)'\0';], ,
+       gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)])
+  if test $gt_cv_c_wint_t = yes; then
+    AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.])
+  fi
+])
diff --git a/gnu/usr.bin/texinfo/m4/xsize.m4 b/gnu/usr.bin/texinfo/m4/xsize.m4
new file mode 100644
index 00000000000..9b7cf9b4930
--- /dev/null
+++ b/gnu/usr.bin/texinfo/m4/xsize.m4
@@ -0,0 +1,14 @@
+# xsize.m4 serial 2
+dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+AC_DEFUN([gl_XSIZE],
+[
+  dnl Prerequisites of lib/xsize.h.
+  AC_REQUIRE([gl_SIZE_MAX])
+  AC_CHECK_HEADERS(stdint.h)
+])
diff --git a/gnu/usr.bin/texinfo/makeinfo/README b/gnu/usr.bin/texinfo/makeinfo/README
index 1b45f02c4b2..7ae2b68d952 100644
--- a/gnu/usr.bin/texinfo/makeinfo/README
+++ b/gnu/usr.bin/texinfo/makeinfo/README
@@ -1,7 +1,16 @@
+$Id: README,v 1.1.1.5 2006/07/17 16:03:45 espie Exp $
+texinfo/makeinfo/README
+
+  Copyright (C) 2002 Free Software Foundation, Inc.
+
+  Copying and distribution of this file, with or without modification,
+  are permitted in any medium without royalty provided the copyright
+  notice and this notice are preserved.
+
 makeinfo is 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 (with --no-headers)
+makeinfo can also output other formats: plain ASCII (with --no-headers)
 or HTML (with --html) or XML (with --xml).
 
 The Emacs function M-x texinfo-format-buffer does more or less the same
diff --git a/gnu/usr.bin/texinfo/makeinfo/cmds.h b/gnu/usr.bin/texinfo/makeinfo/cmds.h
index 528b08512ec..2d68e5f30f5 100644
--- a/gnu/usr.bin/texinfo/makeinfo/cmds.h
+++ b/gnu/usr.bin/texinfo/makeinfo/cmds.h
@@ -1,7 +1,8 @@
 /* cmds.h -- declarations for cmds.c.
-   $Id: cmds.h,v 1.1.1.1 2000/02/09 01:25:09 espie Exp $
+   $Id: cmds.h,v 1.1.1.2 2006/07/17 16:03:46 espie Exp $
 
-   Copyright (C) 1998, 99 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2002, 2003, 2004 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
@@ -47,4 +48,166 @@ typedef struct
 
 extern COMMAND command_table[];
 
+typedef struct acronym_desc
+{
+  struct acronym_desc *next;
+  char *acronym;
+  char *description;
+} ACRONYM_DESC;
+
+/* Texinfo commands.  */
+extern void insert_self (int arg),
+  insert_space (int arg),
+  cm_ignore_line (void),
+  cm_ignore_arg (int arg, int start_pos, int end_pos),
+  cm_comment (void),
+  cm_no_op (void);
+
+/* Document structure and meta information.  */
+extern void cm_setfilename (void),
+  cm_settitle (void),
+  cm_documentdescription (void),
+  cm_node (void),
+  cm_menu (void),
+  cm_detailmenu (void),
+  cm_dircategory (void),
+  cm_direntry (void),
+  cm_bye (void);
+
+/* File inclusion.  */
+extern void cm_include (void),
+  cm_verbatiminclude (void);
+
+/* Cross referencing commands.  */
+extern void cm_anchor (int arg),
+  cm_xref (int arg),
+  cm_pxref (int arg),
+  cm_ref (int arg),
+  cm_inforef (int arg),
+  cm_uref (int arg);
+
+/* Special insertions.  */
+extern void cm_LaTeX (int arg),
+  cm_TeX (int arg),
+  cm_bullet (int arg),
+  cm_colon (void),
+  cm_comma (int arg),
+  cm_copyright (int arg),
+  cm_dots (int arg),
+  cm_enddots (int arg),
+  cm_equiv (int arg),
+  cm_error (int arg),
+  cm_expansion (int arg),
+  cm_image (int arg),
+  cm_insert_copying (void),
+  cm_minus (int arg),
+  cm_point (int arg),
+  cm_print (int arg),
+  cm_punct (int arg),
+  cm_registeredsymbol (int arg),
+  cm_result (int arg);
+
+/* Emphasis and markup.  */
+extern void cm_acronym (int arg),
+  cm_abbr (int arg),
+  cm_b (int arg),
+  cm_cite (int arg, int position),
+  cm_code (int arg),
+  cm_dfn (int arg, int position),
+  cm_dmn (int arg),
+  cm_email (int arg),
+  cm_emph (int arg),
+  cm_i (int arg),
+  cm_kbd (int arg),
+  cm_key (int arg),
+  cm_math (int arg),
+  cm_not_fixed_width (int arg, int start, int end),
+  cm_r (int arg),
+  cm_sansserif (int arg),
+  cm_sc (int arg, int start_pos, int end_pos),
+  cm_slanted (int arg),
+  cm_strong (int arg, int start_pos, int end_pos),
+  cm_tt (int arg),
+  cm_indicate_url (int arg, int start, int end),
+  cm_var (int arg, int start_pos, int end_pos),
+  cm_verb (int arg);
+
+/* Block environments.  */
+extern void cm_cartouche (void),
+  cm_group (void),
+  cm_display (void),
+  cm_smalldisplay (void),
+  cm_example (void),
+  cm_smallexample (void),
+  cm_smalllisp (void),
+  cm_lisp (void),
+  cm_format (void),
+  cm_smallformat (void),
+  cm_quotation (void),
+  cm_copying (void),
+  cm_flushleft (void),
+  cm_flushright (void),
+  cm_verbatim (void),
+  cm_end (void);
+
+/* Tables, lists, enumerations.  */
+extern void cm_table (void),
+  cm_ftable (void),
+  cm_vtable (void),
+  cm_itemize (void),
+  cm_enumerate (void),
+  cm_multitable (void),
+  cm_headitem (void),
+  cm_item (void),
+  cm_itemx (void),
+  cm_tab (void);
+
+extern void cm_center (void),
+  cm_exdent (void),
+  cm_indent (void),
+  cm_noindent (void),
+  cm_noindent_cmd (void);
+
+/* Line and page breaks.  */
+extern void cm_asterisk (void),
+  cm_sp (void),
+  cm_page (void);
+
+/* Non breaking words.  */
+extern void cm_tie (int arg),
+  cm_w (int arg);
+
+/* Title page creation.  */
+extern void cm_titlepage (void),
+  cm_author (void),
+  cm_titlepage_cmds (void),
+  cm_titlefont (int arg),
+  cm_today (int arg);
+
+/* Floats.  */
+extern void cm_float (void),
+  cm_caption (int arg),
+  cm_shortcaption (void),
+  cm_listoffloats (void);
+
+/* Indices.  */
+extern void cm_kindex (void),
+  cm_cindex (void),
+  cm_findex (void),
+  cm_pindex (void),
+  cm_vindex (void),
+  cm_tindex (void),
+  cm_defindex (void),
+  cm_defcodeindex (void),
+  cm_synindex (void),
+  cm_printindex (void);
+
+/* Conditionals. */
+extern void cm_set (void),
+  cm_clear (void),
+  cm_ifset (void),
+  cm_ifclear (void),
+  cm_ifeq (void),
+  cm_value (int arg, int start_pos, int end_pos);
+
 #endif /* !CMDS_H */
diff --git a/gnu/usr.bin/texinfo/makeinfo/defun.c b/gnu/usr.bin/texinfo/makeinfo/defun.c
index cf0e82384f4..84d4ab66647 100644
--- a/gnu/usr.bin/texinfo/makeinfo/defun.c
+++ b/gnu/usr.bin/texinfo/makeinfo/defun.c
@@ -1,7 +1,8 @@
 /* defun.c -- @defun and friends.
-   $Id: defun.c,v 1.1.1.2 2002/06/10 13:21:15 espie Exp $
+   $Id: defun.c,v 1.1.1.3 2006/07/17 16:03:46 espie Exp $
 
-   Copyright (C) 1998, 99, 2000, 01, 02 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 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
@@ -19,9 +20,11 @@
 
 #include "system.h"
 #include "defun.h"
-#include "docbook.h"
+#include "xml.h"
 #include "insertion.h"
 #include "makeinfo.h"
+#include "cmds.h"
+#include "html.h"
 
 
 #define DEFUN_SELF_DELIMITING(c) \
@@ -35,8 +38,7 @@ struct token_accumulator
 };
 
 static void
-initialize_token_accumulator (accumulator)
-     struct token_accumulator *accumulator;
+initialize_token_accumulator (struct token_accumulator *accumulator)
 {
   accumulator->length = 0;
   accumulator->index = 0;
@@ -44,9 +46,7 @@ initialize_token_accumulator (accumulator)
 }
 
 static void
-accumulate_token (accumulator, token)
-     struct token_accumulator *accumulator;
-     char *token;
+accumulate_token (struct token_accumulator *accumulator, char *token)
 {
   if (accumulator->index >= accumulator->length)
     {
@@ -61,8 +61,7 @@ accumulate_token (accumulator, token)
 /* Given STRING_POINTER pointing at an open brace, skip forward and return a
    pointer to just past the matching close brace. */
 static int
-scan_group_in_string (string_pointer)
-     char **string_pointer;
+scan_group_in_string (char **string_pointer)
 {
   char *scan_string = (*string_pointer) + 1;
   unsigned int level = 1;
@@ -103,8 +102,7 @@ scan_group_in_string (string_pointer)
    Contiguous whitespace characters are converted to a token
    consisting of a single space. */
 static char **
-args_from_string (string)
-     char *string;
+args_from_string (char *string)
 {
   struct token_accumulator accumulator;
   char *token_start, *token_end;
@@ -173,6 +171,15 @@ args_from_string (string)
           token_end = balanced ? (scan_string - 1) : scan_string;
         }
 
+      /* Make commas separate tokens so to differentiate them from
+         parameter types in XML output. */
+      else if (*scan_string == ',')
+	{
+          token_start = scan_string;
+          scan_string += 1;
+          token_end = scan_string;
+	}
+
       /* Otherwise a token is delimited by whitespace, parentheses,
          brackets, or braces.  A token is also ended by a command. */
       else
@@ -195,6 +202,14 @@ args_from_string (string)
                   break;
                 }
 
+	      /* End token if we are looking at a comma, as commas are
+		 delimiters too. */
+	      if (c == ',')
+		{
+		  scan_string--;
+		  break;
+		}
+
               /* If we encounter a command embedded within a token,
                  then end the token. */
               if (c == COMMAND_PREFIX)
@@ -213,12 +228,16 @@ args_from_string (string)
 }
 
 static void
-process_defun_args (defun_args, auto_var_p)
-     char **defun_args;
-     int auto_var_p;
+process_defun_args (char **defun_args, int auto_var_p)
 {
   int pending_space = 0;
 
+  if (xml)
+    {
+      xml_process_defun_args (defun_args, auto_var_p);
+      return;
+    }
+
   for (;;)
     {
       char *defun_arg = *defun_args++;
@@ -239,35 +258,28 @@ process_defun_args (defun_args, auto_var_p)
         }
 
       if (DEFUN_SELF_DELIMITING (defun_arg[0]))
-        add_char (defun_arg[0]);
-      else if (defun_arg[0] == '&')
-        if (html)
-          {
-            defun_arg = escape_string (xstrdup (defun_arg));
-            add_word (defun_arg);
-            free (defun_arg);
-          }
-        else
-          add_word (defun_arg);
-      else if (defun_arg[0] == COMMAND_PREFIX)
-        execute_string ("%s", defun_arg);
-      else if (auto_var_p)
-        if (html)
-          {
-            defun_arg = escape_string (xstrdup (defun_arg));
-            add_word (defun_arg);
-            free (defun_arg);
-          }
-        else
-          add_word (defun_arg);
+        {
+          /* Within @deffn and friends, texinfo.tex makes parentheses
+             sans serif and brackets bold.  We use roman instead.  */
+          if (html)
+            insert_html_tag (START, "");
+            
+          add_char (defun_arg[0]);
+          
+          if (html)
+            insert_html_tag (END, "");
+        }
+      /* else if (defun_arg[0] == '&' || defun_arg[0] == COMMAND_PREFIX) */
+        /* execute_string ("%s", defun_arg); */
+      /* else if (auto_var_p) */
+        /* execute_string ("%s", defun_arg); */
       else
-        add_word (defun_arg);
+        execute_string ("%s", defun_arg);
     }
 }
 
 static char *
-next_nonwhite_defun_arg (arg_pointer)
-     char ***arg_pointer;
+next_nonwhite_defun_arg (char ***arg_pointer)
 {
   char **scan = (*arg_pointer);
   char *arg = (*scan++);
@@ -287,10 +299,9 @@ next_nonwhite_defun_arg (arg_pointer)
 /* This is needed also in insertion.c.  */
 
 enum insertion_type
-get_base_type (type)
-     enum insertion_type type;
+get_base_type (int type)
 {
-  enum insertion_type base_type;
+  int base_type;
   switch (type)
     {
     case defivar:	base_type = defcv; break;
@@ -298,6 +309,7 @@ get_base_type (type)
     case defmethod:	base_type = defop; break;
     case defopt:	base_type = defvr; break;
     case defspec:	base_type = deffn; break;
+    case deftypecv:	base_type = deftypecv; break;
     case deftypefun:	base_type = deftypefn; break;
     case deftypeivar:	base_type = deftypeivar; break;
     case deftypemethod:	base_type = deftypemethod; break;
@@ -317,13 +329,14 @@ get_base_type (type)
    TYPE says which insertion this is.
    X_P, if nonzero, says not to start a new insertion. */
 static void
-defun_internal (type, x_p)
-     enum insertion_type type;
-     int x_p;
+defun_internal (int type, int x_p)
 {
-  enum insertion_type base_type;
+  int base_type;
   char **defun_args, **scan_args;
-  char *category, *defined_name, *type_name, *type_name2;
+  const char *category;
+  char *defined_name;
+  char *type_name = NULL;
+  char *type_name2 = NULL;
 
   {
     char *line;
@@ -345,6 +358,33 @@ defun_internal (type, x_p)
        Unfortunately, this means that you can't call macros, use @value, etc.
        inside @def.. commands, sigh.  */
     get_rest_of_line (0, &line);
+
+    /* Basic line continuation.  If a line ends with \s*@\s* concatanate
+       the next line. */
+    {
+      char *next_line, *new_line;
+      int i;
+
+      line_continuation:
+        i = strlen (line) - 1;
+
+        if (line[i] == '@' && line[i-1] != '@')
+          {
+            get_rest_of_line (0, &next_line);
+            new_line = (char *) xmalloc (i + strlen (next_line) + 2);
+            strncpy (new_line, line, i);
+            new_line[i] = '\0';
+            free (line);
+            strcat (new_line, " ");
+            strcat (new_line, next_line);
+            line = xstrdup (new_line);
+            free (next_line);
+            free (new_line);
+
+            goto line_continuation;
+          }
+    }
+
     defun_args = (args_from_string (line));
     free (line);
   }
@@ -389,7 +429,8 @@ defun_internal (type, x_p)
     }
 
   /* The class name.  */
-  if ((base_type == deftypefn)
+  if ((base_type == deftypecv)
+      || (base_type == deftypefn)
       || (base_type == deftypevr)
       || (base_type == defcv)
       || (base_type == defop)
@@ -400,8 +441,9 @@ defun_internal (type, x_p)
     type_name = next_nonwhite_defun_arg (&scan_args);
 
   /* The type name for typed languages.  */
-  if ((base_type == deftypemethod)
+  if ((base_type == deftypecv)
       || (base_type == deftypeivar)
+      || (base_type == deftypemethod)
       || (base_type == deftypeop)
      )
     type_name2 = next_nonwhite_defun_arg (&scan_args);
@@ -433,7 +475,7 @@ defun_internal (type, x_p)
   if (*scan_args && **scan_args && **scan_args == '(')
     warning ("`%c' follows defined name `%s' instead of whitespace",
              **scan_args, defined_name);
-    
+
   if (!x_p)
     begin_insertion (type);
 
@@ -442,124 +484,115 @@ defun_internal (type, x_p)
   current_indent -= default_indentation_increment;
   start_paragraph ();
 
-  if (!x_p) {
-    /* Start the definition on new paragraph.  */
-    if (html)
-      add_word ("<p>\n");
-    if (docbook)
-      docbook_begin_paragraph ();
-  }
-
-  if (!html && !docbook)
+  if (!html && !xml)
     switch (base_type)
       {
       case deffn:
       case defvr:
       case deftp:
-        execute_string (" -- %s: %s", category, defined_name);
+        execute_string (" --- %s: %s", category, defined_name);
         break;
       case deftypefn:
       case deftypevr:
-        execute_string (" -- %s: %s %s", category, type_name, defined_name);
+        execute_string (" --- %s: %s %s", category, type_name, defined_name);
         break;
       case defcv:
-        execute_string (" -- %s %s %s: %s", category, _("of"), type_name,
+        execute_string (" --- %s %s %s: %s", category, _("of"), type_name,
                         defined_name);
         break;
+      case deftypecv:
       case deftypeivar:
-        execute_string (" -- %s %s %s: %s %s", category, _("of"), type_name,
+        execute_string (" --- %s %s %s: %s %s", category, _("of"), type_name,
                         type_name2, defined_name);
         break;
       case defop:
-        execute_string (" -- %s %s %s: %s", category, _("on"), type_name,
+        execute_string (" --- %s %s %s: %s", category, _("on"), type_name,
                         defined_name);
         break;
       case deftypeop:
-        execute_string (" -- %s %s %s: %s %s", category, _("on"), type_name,
+        execute_string (" --- %s %s %s: %s %s", category, _("on"), type_name,
                         type_name2, defined_name);
         break;
       case deftypemethod:
-        execute_string (" -- %s %s %s: %s %s", category, _("on"), type_name,
+        execute_string (" --- %s %s %s: %s %s", category, _("on"), type_name,
                         type_name2, defined_name);
         break;
       }
-
-  if (html)
+  else if (html)
     {
       /* If this is not a @def...x version, it could only
          be a normal version @def.... So start the table here.  */
       if (!x_p)
-	{
-	  add_html_elt ("<table width=");
-	  add_word ("\"100%\">\n");
-	}
-
-      /* If this is an @def...x there has to be an other @def... before
-         it, so this is only a new row within an existing table.  With
-         two complete standalone tables the gap between them is too big.  */
-      add_word ("<tr>\n");
-      add_html_elt ("<td align=\"left\">");
+        insert_string ("<div class=\"defun\">\n");
+      else
+        rollback_empty_tag ("blockquote");
 
+      /* xx The single words (on, off) used here, should depend on
+         documentlanguage and NOT on gettext  --kama.  */
       switch (base_type)
         {
         case deffn:
         case defvr:
         case deftp:
-          /* <i> is for the following function arguments.  */
-          add_word ("<b>");
-          execute_string ("%s", defined_name);
-          add_word ("</b><i>");
-          break;
         case deftypefn:
         case deftypevr:
-          execute_string ("%s ", type_name);
-          add_word ("<b>");
-          execute_string ("%s", defined_name);
-          add_word ("</b><i>");
+          execute_string ("--- %s: ", category);
           break;
+
         case defcv:
+        case deftypecv:
+        case deftypeivar:
+	  execute_string ("--- %s %s %s: ", category, _("of"), type_name);
+	  break;
+
         case defop:
-          add_word ("<b>");
-          execute_string ("%s", defined_name);
-          add_word ("</b><i>");
-          break;
         case deftypemethod:
         case deftypeop:
-        case deftypeivar:
-          execute_string ("%s ", type_name2);
-          add_word ("<b>");
-          execute_string ("%s", defined_name);
-          add_word ("</b><i>");
-          break;
-        }
-    } /* if (html)... */
+	  execute_string ("--- %s %s %s: ", category, _("on"), type_name);
+	  break;
+	} /* switch (base_type)... */
 
-  if (docbook)
-    {
       switch (base_type)
         {
         case deffn:
         case defvr:
         case deftp:
-        case defcv:
-        case defop:
-          add_word_args ("<%s>%s</%s>", DB_FUNCTION, defined_name,
-                                        DB_FUNCTION);
+          /* <var> is for the following function arguments.  */
+          insert_html_tag (START, "b");
+          execute_string ("%s", defined_name);
+          insert_html_tag (END, "b");
+          insert_html_tag (START, "var");
           break;
         case deftypefn:
         case deftypevr:
-          add_word_args ("%s <%s>%s</%s>", type_name, DB_FUNCTION,
-                                           defined_name, DB_FUNCTION);
+          execute_string ("%s ", type_name);
+          insert_html_tag (START, "b");
+          execute_string ("%s", defined_name);
+          insert_html_tag (END, "b");
+          insert_html_tag (START, "var");
+          break;
+        case defcv:
+        case defop:
+          insert_html_tag (START, "b");
+          execute_string ("%s", defined_name);
+          insert_html_tag (END, "b");
+          insert_html_tag (START, "var");
           break;
+        case deftypecv:
+        case deftypeivar:
         case deftypemethod:
         case deftypeop:
-        case deftypeivar:
-          add_word_args ("%s <%s>%s</%s>", type_name2, DB_FUNCTION,
-                                           defined_name, DB_FUNCTION);
+          execute_string ("%s ", type_name2);
+          insert_html_tag (START, "b");
+          execute_string ("%s", defined_name);
+          insert_html_tag (END, "b");
+          insert_html_tag (START, "var");
           break;
         }
-
-    } /* if (docbook)... */
+    }
+  else if (xml)
+    xml_begin_def_term (base_type, category, defined_name, type_name,
+	type_name2);
 
   current_indent += default_indentation_increment;
 
@@ -589,95 +622,52 @@ defun_internal (type, x_p)
     }
 
   current_indent -= default_indentation_increment;
-  close_single_paragraph ();
-
-  if (html)
-    {
-      /* xx The single words (on, off) used here, should depend on
-         documentlanguage and NOT on gettext  --kama.  */
-      switch (base_type)
-        {
-        case deffn:
-        case defvr:
-        case deftp:
-        case deftypefn:
-        case deftypevr:
-          add_word ("</i>"); /* close italic area for arguments */
-          /* put the rest into the second column */
-	  add_word ("</td>\n");
-          add_html_elt ("<td align=\"right\">");
-          execute_string ("%s", category);
-          break;
-
-        case defcv:
-	  add_word ("</td>\n");
-	  add_html_elt ("<td align=\"right\">");
-	  execute_string ("%s %s %s", category, _("of"), type_name);
-	  break;
-
-        case defop:
-        case deftypemethod:
-        case deftypeop:
-	  add_word ("</i>");
-	  add_word ("</td>\n");
-	  add_html_elt ("<td align=\"right\">");
-	  execute_string ("%s %s %s", category, _("on"), type_name);
-	  break;
-
-        case deftypeivar:
-	  add_word ("</i>");
-	  add_word ("</td>\n");
-	  add_html_elt ("<td align=\"right\">");
-	  execute_string ("%s %s %s", category, _("of"), type_name);
-	  break;
-	} /* switch (base_type)... */
+  if (!html)
+    close_single_paragraph ();
 
-      add_word ("</td>\n"); /* close second column */
-      add_word ("</tr>\n"); /* close row */
-
-      /* This is needed because I have to know if the next line is
-         normal text or another @def..x.  If text follows, create a new
-         table to get the indentation for the following text.
-
-         This construction would fail if someone uses:
-          @deffn
-          @sp 2
-          @deffnx
-          .
-          @end deffn
-         But we don't care. */
-      if (!looking_at ("@def"))
-        {
-          add_word ("</table>\n");
-          add_html_elt ("<table width=\"95%\" align=\"center\">");
-          add_word ("\n<tr><td>\n");
-        }
-
-    } /* if (html)... */
+  /* Make an entry in the appropriate index.  (XML and
+     Docbook already got their entries, so skip them.)  */
+  if (!xml)
+    switch (base_type)
+      {
+      case deffn:
+      case deftypefn:
+	execute_string ("@findex %s\n", defined_name);
+	break;
+      case defcv:
+      case deftypecv:
+      case deftypevr:
+      case defvr:
+	execute_string ("@vindex %s\n", defined_name);
+	break;
+      case deftypeivar:
+	execute_string ("@vindex %s %s %s\n", defined_name, _("of"),
+                        type_name);
+	break;
+      case defop:
+      case deftypeop:
+      case deftypemethod:
+	execute_string ("@findex %s %s %s\n", defined_name, _("on"),
+                        type_name);
+	break;
+      case deftp:
+	execute_string ("@tindex %s\n", defined_name);
+	break;
+      }
 
-  /* Make an entry in the appropriate index. */
-  switch (base_type)
+  if (xml)
+    xml_end_def_term ();
+  else if (html)
     {
-    case deffn:
-    case deftypefn:
-      execute_string ("@findex %s\n", defined_name);
-      break;
-    case defvr:
-    case deftypevr:
-    case defcv:
-      execute_string ("@vindex %s\n", defined_name);
-      break;
-    case deftypeivar:
-      execute_string ("@vindex %s %s %s\n", defined_name, _("of"), type_name);
-      break;
-    case defop:
-    case deftypeop:
-    case deftypemethod:
-      execute_string ("@findex %s %s %s\n", defined_name, _("on"), type_name);
-      break;
-    case deftp:
-      execute_string ("@tindex %s\n", defined_name);
-      break;
+      inhibit_paragraph_indentation = 1;
+      no_indent = 1;
+      insert_html_tag (END, "var");
+      insert_string ("<br>\n");
+      /* Indent the definition a bit.  */
+      add_html_block_elt ("<blockquote>");
+      no_indent = 0;
+      inhibit_paragraph_indentation = 0;
+      paragraph_is_open = 0;
     }
 
   /* Deallocate the token list. */
@@ -696,29 +686,35 @@ defun_internal (type, x_p)
    If the name of the calling command ends in `x', then this is an extra
    entry included in the body of an insertion of the same type. */
 void
-cm_defun ()
+cm_defun (void)
 {
-  int x_p;
-  enum insertion_type type;
-  char *temp = xstrdup (command);
-
-  x_p = (command[strlen (command) - 1] == 'x');
+  int type;
+  char *base_command = xstrdup (command);  /* command with any `x' removed */
+  int x_p = (command[strlen (command) - 1] == 'x');
 
   if (x_p)
-    temp[strlen (temp) - 1] = 0;
+    base_command[strlen (base_command) - 1] = 0;
 
-  type = find_type_from_name (temp);
-  free (temp);
+  type = find_type_from_name (base_command);
 
   /* If we are adding to an already existing insertion, then make sure
      that we are already in an insertion of type TYPE. */
-  if (x_p && (!insertion_level || insertion_stack->insertion != type))
+  if (x_p)
     {
-      line_error (_("Must be in `%s' insertion to use `%sx'"),
-                  command, command);
-      discard_until ("\n");
-      return;
+      INSERTION_ELT *i = insertion_stack;
+      /* Skip over ifclear and ifset conditionals.  */
+      while (i && (i->insertion == ifset || i->insertion == ifclear))
+        i = i->next;
+        
+      if (!i || i->insertion != type)
+        {
+          line_error (_("Must be in `@%s' environment to use `@%s'"),
+                      base_command, command);
+          discard_until ("\n");
+          return;
+        }
     }
 
   defun_internal (type, x_p);
+  free (base_command);
 }
diff --git a/gnu/usr.bin/texinfo/makeinfo/defun.h b/gnu/usr.bin/texinfo/makeinfo/defun.h
index 9ab64483a7e..93c5006fe83 100644
--- a/gnu/usr.bin/texinfo/makeinfo/defun.h
+++ b/gnu/usr.bin/texinfo/makeinfo/defun.h
@@ -1,5 +1,5 @@
 /* defun.h -- declaration for defuns.
-   $Id: defun.h,v 1.1.1.1 2000/02/09 01:25:10 espie Exp $
+   $Id: defun.h,v 1.1.1.2 2006/07/17 16:03:46 espie Exp $
 
    Copyright (C) 1999 Free Software Foundation, Inc.
 
@@ -24,8 +24,8 @@
 
 #include "insertion.h"
 
-extern enum insertion_type get_base_type ();
-extern void cm_defun ();
+extern enum insertion_type get_base_type (int type);
+extern void cm_defun (void);
 
 #endif /* !DEFUN_H */
 
diff --git a/gnu/usr.bin/texinfo/makeinfo/files.c b/gnu/usr.bin/texinfo/makeinfo/files.c
index ccd0f0b0ec0..fd3ea326ad5 100644
--- a/gnu/usr.bin/texinfo/makeinfo/files.c
+++ b/gnu/usr.bin/texinfo/makeinfo/files.c
@@ -1,7 +1,8 @@
 /* files.c -- file-related functions for makeinfo.
-   $Id: files.c,v 1.1.1.2 2002/06/10 13:21:15 espie Exp $
+   $Id: files.c,v 1.1.1.3 2006/07/17 16:03:46 espie Exp $
 
-   Copyright (C) 1998, 99, 2000, 01, 02 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 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
@@ -19,15 +20,17 @@
 
 #include "system.h"
 #include "files.h"
+#include "html.h"
+#include "index.h"
 #include "macro.h"
 #include "makeinfo.h"
+#include "node.h"
 
 FSTACK *filestack = NULL;
 
 static int node_filename_stack_index = 0;
 static int node_filename_stack_size = 0;
 static char **node_filename_stack = NULL;
-
 
 /* Looking for include files.  */
 
@@ -35,9 +38,7 @@ static char **node_filename_stack = NULL;
    return the next one pointed to by INDEX, or NULL if there are no more.
    Advance INDEX to the character after the colon. */
 static char *
-extract_colon_unit (string, index)
-     char *string;
-     int *index;
+extract_colon_unit (char *string, int *index)
 {
   int start;
   int path_sep_char = PATH_SEP[0];
@@ -82,10 +83,8 @@ extract_colon_unit (string, index)
    When found, return the stat () info for FILENAME in FINFO.
    If PATH is NULL, only the current directory is searched.
    If the file could not be found, return a NULL pointer. */
-static char *
-get_file_info_in_path (filename, path, finfo)
-     char *filename, *path;
-     struct stat *finfo;
+char *
+get_file_info_in_path (char *filename, char *path, struct stat *finfo)
 {
   char *dir;
   int result, index = 0;
@@ -128,12 +127,68 @@ get_file_info_in_path (filename, path, finfo)
     }
   return NULL;
 }
+
+/* Prepend and append new paths to include_files_path.  */
+void
+prepend_to_include_path (char *path)
+{
+  if (!include_files_path)
+    {
+      include_files_path = xstrdup (path);
+      include_files_path = xrealloc (include_files_path,
+          strlen (include_files_path) + 3); /* 3 for ":.\0" */
+      strcat (strcat (include_files_path, PATH_SEP), ".");
+    }
+  else
+    {
+      char *tmp = xstrdup (include_files_path);
+      include_files_path = xrealloc (include_files_path,
+          strlen (include_files_path) + strlen (path) + 2); /* 2 for ":\0" */
+      strcpy (include_files_path, path);
+      strcat (include_files_path, PATH_SEP);
+      strcat (include_files_path, tmp);
+      free (tmp);
+    }
+}
+
+void
+append_to_include_path (char *path)
+{
+  if (!include_files_path)
+    include_files_path = xstrdup (".");
+
+  include_files_path = (char *) xrealloc (include_files_path,
+        2 + strlen (include_files_path) + strlen (path));
+  strcat (include_files_path, PATH_SEP);
+  strcat (include_files_path, path);
+}
+
+/* Remove the first path from the include_files_path.  */
+void
+pop_path_from_include_path (void)
+{
+  int i = 0;
+  char *tmp;
+
+  if (include_files_path)
+    for (i = 0; i < strlen (include_files_path)
+        && include_files_path[i] != ':'; i++);
+
+  /* Advance include_files_path to the next char from ':'  */
+  tmp = (char *) xmalloc (strlen (include_files_path) - i);
+  strcpy (tmp, (char *) include_files_path + i + 1);
+
+  free (include_files_path);
+  include_files_path = tmp;
+}
 
 /* Find and load the file named FILENAME.  Return a pointer to
-   the loaded file, or NULL if it can't be loaded. */
+   the loaded file, or NULL if it can't be loaded.  If USE_PATH is zero,
+   just look for the given file (this is used in handle_delayed_writes),
+   else search along include_files_path.   */
+
 char *
-find_and_load (filename)
-     char *filename;
+find_and_load (char *filename, int use_path)
 {
   struct stat fileinfo;
   long file_size;
@@ -143,7 +198,9 @@ find_and_load (filename)
 
   result = fullpath = NULL;
 
-  fullpath = get_file_info_in_path (filename, include_files_path, &fileinfo);
+  fullpath
+    = get_file_info_in_path (filename, use_path ? include_files_path : NULL, 
+                             &fileinfo);
 
   if (!fullpath)
     goto error_exit;
@@ -204,8 +261,8 @@ error_exit:
 }
 
 /* Pushing and popping files.  */
-void
-push_node_filename ()
+static void
+push_node_filename (void)
 {
   if (node_filename_stack_index + 1 > node_filename_stack_size)
     node_filename_stack = xrealloc
@@ -215,15 +272,15 @@ push_node_filename ()
   node_filename_stack_index++;
 }
 
-void
-pop_node_filename ()
+static void
+pop_node_filename (void)
 {
   node_filename = node_filename_stack[--node_filename_stack_index];
 }
 
 /* Save the state of the current input file. */
 void
-pushfile ()
+pushfile (void)
 {
   FSTACK *newstack = xmalloc (sizeof (FSTACK));
   newstack->filename = input_filename;
@@ -239,7 +296,7 @@ pushfile ()
 
 /* Make the current file globals be what is on top of the file stack. */
 void
-popfile ()
+popfile (void)
 {
   FSTACK *tos = filestack;
 
@@ -273,7 +330,7 @@ popfile ()
 
 /* Flush all open files on the file stack. */
 void
-flush_file_stack ()
+flush_file_stack (void)
 {
   while (filestack)
     {
@@ -288,8 +345,7 @@ flush_file_stack ()
 /* Return the index of the first character in the filename
    which is past all the leading directory characters.  */
 static int
-skip_directory_part (filename)
-     char *filename;
+skip_directory_part (char *filename)
 {
   int i = strlen (filename) - 1;
 
@@ -303,9 +359,8 @@ skip_directory_part (filename)
   return i;
 }
 
-char *
-filename_non_directory (name)
-     char *name;
+static char *
+filename_non_directory (char *name)
 {
   return xstrdup (name + skip_directory_part (name));
 }
@@ -314,17 +369,14 @@ filename_non_directory (name)
    filename without the path information, or extensions.
    This conses up a new string. */
 char *
-filename_part (filename)
-     char *filename;
+filename_part (char *filename)
 {
   char *basename = filename_non_directory (filename);
 
 #ifdef REMOVE_OUTPUT_EXTENSIONS
   /* See if there is an extension to remove.  If so, remove it. */
   {
-    char *temp;
-
-    temp = strrchr (basename, '.');
+    char *temp = strrchr (basename, '.');
     if (temp)
       *temp = 0;
   }
@@ -334,10 +386,8 @@ filename_part (filename)
 
 /* Return the pathname part of filename.  This can be NULL. */
 char *
-pathname_part (filename)
-     char *filename;
+pathname_part (char *filename)
 {
-  char *expand_filename ();
   char *result = NULL;
   int i;
 
@@ -354,72 +404,9 @@ pathname_part (filename)
   return result;
 }
 
-/* Return the expansion of FILENAME. */
-char *
-expand_filename (filename, input_name)
-     char *filename, *input_name;
-{
-  int i;
-  char *full_pathname ();
-
-  if (filename)
-    {
-      filename = full_pathname (filename);
-      if (IS_ABSOLUTE (filename)
-	  || (*filename == '.' &&
-	      (IS_SLASH (filename[1]) ||
-	       (filename[1] == '.' && IS_SLASH (filename[2])))))
-	return filename;
-    }
-  else
-    {
-      filename = filename_non_directory (input_name);
-
-      if (!*filename)
-        {
-          free (filename);
-          filename = xstrdup ("noname.texi");
-        }
-
-      for (i = strlen (filename) - 1; i; i--)
-        if (filename[i] == '.')
-          break;
-
-      if (!i)
-        i = strlen (filename);
-
-      if (i + 6 > (strlen (filename)))
-        filename = xrealloc (filename, i + 6);
-      strcpy (filename + i, html ? ".html" : ".info");
-      return filename;
-    }
-
-  if (IS_ABSOLUTE (input_name))
-    {
-      /* Make it so that relative names work. */
-      char *result;
-      
-      i = strlen (input_name) - 1;
-
-      result = xmalloc (1 + strlen (input_name) + strlen (filename));
-      strcpy (result, input_name);
-
-      while (!IS_SLASH (result[i]) && i)
-        i--;
-      if (IS_SLASH (result[i]))
-        i++;
-
-      strcpy (&result[i], filename);
-      free (filename);
-      return result;
-    }
-  return filename;
-}
-
 /* Return the full path to FILENAME. */
-char *
-full_pathname (filename)
-     char *filename;
+static char *
+full_pathname (char *filename)
 {
   int initial_character;
   char *result;
@@ -509,9 +496,68 @@ full_pathname (filename)
   return result;
 }
 
+/* Return the expansion of FILENAME. */
+char *
+expand_filename (char *filename, char *input_name)
+{
+  int i;
+
+  if (filename)
+    {
+      filename = full_pathname (filename);
+      if (IS_ABSOLUTE (filename)
+	  || (*filename == '.' &&
+	      (IS_SLASH (filename[1]) ||
+	       (filename[1] == '.' && IS_SLASH (filename[2])))))
+	return filename;
+    }
+  else
+    {
+      filename = filename_non_directory (input_name);
+
+      if (!*filename)
+        {
+          free (filename);
+          filename = xstrdup ("noname.texi");
+        }
+
+      for (i = strlen (filename) - 1; i; i--)
+        if (filename[i] == '.')
+          break;
+
+      if (!i)
+        i = strlen (filename);
+
+      if (i + 6 > (strlen (filename)))
+        filename = xrealloc (filename, i + 6);
+      strcpy (filename + i, html ? ".html" : ".info");
+      return filename;
+    }
+
+  if (IS_ABSOLUTE (input_name))
+    {
+      /* Make it so that relative names work. */
+      char *result;
+      
+      i = strlen (input_name) - 1;
+
+      result = xmalloc (1 + strlen (input_name) + strlen (filename));
+      strcpy (result, input_name);
+
+      while (!IS_SLASH (result[i]) && i)
+        i--;
+      if (IS_SLASH (result[i]))
+        i++;
+
+      strcpy (&result[i], filename);
+      free (filename);
+      return result;
+    }
+  return filename;
+}
+
 char *
-output_name_from_input_name (name)
-     char *name;
+output_name_from_input_name (char *name)
 {
   return expand_filename (NULL, name);
 }
@@ -523,8 +569,7 @@ output_name_from_input_name (name)
    never be longer than the original, otherwise we couldn't be sure we
    have enough space in the original string to modify it in place.  */
 char *
-normalize_filename (fname)
-     char *fname;
+normalize_filename (char *fname)
 {
   int maxlen;
   char orig[PATH_MAX + 1];
@@ -574,3 +619,166 @@ normalize_filename (fname)
 
   return fname;
 }
+
+/* Delayed writing functions.  A few of the commands
+   needs to be handled at the end, namely @contents,
+   @shortcontents, @printindex and @listoffloats.
+   These functions take care of that.  */
+static DELAYED_WRITE *delayed_writes = NULL;
+int handling_delayed_writes = 0;
+
+void
+register_delayed_write (char *delayed_command)
+{
+  DELAYED_WRITE *new;
+
+  if (!current_output_filename || !*current_output_filename)
+    {
+      /* Cannot register if we don't know what the output file is.  */
+      warning (_("`%s' omitted before output filename"), delayed_command);
+      return;
+    }
+
+  if (STREQ (current_output_filename, "-"))
+    {
+      /* Do not register a new write if the output file is not seekable.
+         Let the user know about it first, though.  */
+      warning (_("`%s' omitted since writing to stdout"), delayed_command);
+      return;
+    }
+
+  /* Don't complain if the user is writing /dev/null, since surely they
+     don't care, but don't register the delayed write, either.  */
+  if (FILENAME_CMP (current_output_filename, NULL_DEVICE) == 0
+      || FILENAME_CMP (current_output_filename, ALSO_NULL_DEVICE) == 0)
+    return;
+    
+  /* We need the HTML header in the output,
+     to get a proper output_position.  */
+  if (!executing_string && html)
+    html_output_head ();
+  /* Get output_position updated.  */
+  flush_output ();
+
+  new = xmalloc (sizeof (DELAYED_WRITE));
+  new->command = xstrdup (delayed_command);
+  new->filename = xstrdup (current_output_filename);
+  new->input_filename = xstrdup (input_filename);
+  new->position = output_position;
+  new->calling_line = line_number;
+  new->node = current_node ? xstrdup (current_node): "";
+
+  new->node_order = node_order;
+  new->index_order = index_counter;
+
+  new->next = delayed_writes;
+  delayed_writes = new;
+}
+
+void
+handle_delayed_writes (void)
+{
+  DELAYED_WRITE *temp = (DELAYED_WRITE *) reverse_list
+    ((GENERIC_LIST *) delayed_writes);
+  int position_shift_amount, line_number_shift_amount;
+  char *delayed_buf;
+
+  handling_delayed_writes = 1;
+
+  while (temp)
+    {
+      delayed_buf = find_and_load (temp->filename, 0);
+
+      if (output_paragraph_offset > 0)
+        {
+          error (_("Output buffer not empty."));
+          return;
+        }
+
+      if (!delayed_buf)
+        {
+          fs_error (temp->filename);
+          return;
+        }
+
+      output_stream = fopen (temp->filename, "w");
+      if (!output_stream)
+        {
+          fs_error (temp->filename);
+          return;
+        }
+
+      if (fwrite (delayed_buf, 1, temp->position, output_stream) != temp->position)
+        {
+          fs_error (temp->filename);
+          return;
+        }
+
+      {
+        int output_position_at_start = output_position;
+        int line_number_at_start = output_line_number;
+
+        /* In order to make warnings and errors
+           refer to the correct line number.  */
+        input_filename = temp->input_filename;
+        line_number = temp->calling_line;
+
+        execute_string ("%s", temp->command);
+        flush_output ();
+
+        /* Since the output file is modified, following delayed writes
+           need to be updated by this amount.  */
+        position_shift_amount = output_position - output_position_at_start;
+        line_number_shift_amount = output_line_number - line_number_at_start;
+      }
+
+      if (fwrite (delayed_buf + temp->position, 1,
+            input_text_length - temp->position, output_stream)
+          != input_text_length - temp->position
+          || fclose (output_stream) != 0)
+        fs_error (temp->filename);
+
+      /* Done with the buffer.  */
+      free (delayed_buf);
+
+      /* Update positions in tag table for nodes that are defined after
+         the line this delayed write is registered.  */
+      if (!html && !xml)
+        {
+          TAG_ENTRY *node;
+          for (node = tag_table; node; node = node->next_ent)
+            if (node->order > temp->node_order)
+              node->position += position_shift_amount;
+        }
+
+      /* Something similar for the line numbers in all of the defined
+         indices.  */
+      {
+        int i;
+        for (i = 0; i < defined_indices; i++)
+          if (name_index_alist[i])
+            {
+              char *name = ((INDEX_ALIST *) name_index_alist[i])->name;
+              INDEX_ELT *index;
+              for (index = index_list (name); index; index = index->next)
+                if ((no_headers || STREQ (index->node, temp->node))
+                    && index->entry_number > temp->index_order)
+                  index->output_line += line_number_shift_amount;
+            }
+      }
+
+      /* Shift remaining delayed positions
+         by the length of this write.  */
+      {
+        DELAYED_WRITE *future_write = temp->next;
+        while (future_write)
+          {
+            if (STREQ (temp->filename, future_write->filename))
+              future_write->position += position_shift_amount;
+            future_write = future_write->next;
+          }
+      }
+
+      temp = temp->next;
+    }
+}
diff --git a/gnu/usr.bin/texinfo/makeinfo/files.h b/gnu/usr.bin/texinfo/makeinfo/files.h
index 46ea8da4989..46c74fdc47b 100644
--- a/gnu/usr.bin/texinfo/makeinfo/files.h
+++ b/gnu/usr.bin/texinfo/makeinfo/files.h
@@ -1,7 +1,7 @@
 /* files.h -- declarations for files.c.
-   $Id: files.h,v 1.1.1.2 2002/06/10 13:21:15 espie Exp $
+   $Id: files.h,v 1.1.1.3 2006/07/17 16:03:46 espie Exp $
 
-   Copyright (C) 1998, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2002, 2004 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,13 +34,37 @@ typedef struct fstack
 } FSTACK;
 extern FSTACK *filestack;
 
-extern void pushfile (), popfile ();
-extern void flush_file_stack ();
-extern char *find_and_load ();
-extern char *output_name_from_input_name ();
-extern char *expand_filename ();
-extern char *filename_part ();
-extern char *pathname_part ();
-extern char *normalize_filename ();
+extern void pushfile (void);
+extern void popfile (void);
+extern void flush_file_stack (void);
+extern char *get_file_info_in_path (char *filename, char *path,
+    struct stat *finfo);
+extern char *find_and_load (char *filename, int use_path);
+extern char *output_name_from_input_name (char *name);
+extern char *expand_filename (char *filename, char *input_name);
+extern char *filename_part (char *filename);
+extern char *pathname_part (char *filename);
+extern char *normalize_filename (char *fname);
+extern void append_to_include_path (char *path);
+extern void prepend_to_include_path (char *path);
+extern void pop_path_from_include_path (void);
+extern void register_delayed_write (char *delayed_command);
+extern void handle_delayed_writes (void);
+
+typedef struct delayed_write
+{
+  struct delayed_write *next;
+  char *command;
+  char *filename;
+  char *input_filename;
+  char *node;
+  int position;
+  int calling_line;
+
+  int node_order;
+  int index_order;
+} DELAYED_WRITE;
+
+extern int handling_delayed_writes;
 
 #endif /* !FILES_H */
diff --git a/gnu/usr.bin/texinfo/makeinfo/float.c b/gnu/usr.bin/texinfo/makeinfo/float.c
new file mode 100644
index 00000000000..f72b5a02547
--- /dev/null
+++ b/gnu/usr.bin/texinfo/makeinfo/float.c
@@ -0,0 +1,430 @@
+/* float.c -- float environment functions.
+   $Id: float.c,v 1.1.1.1 2006/07/17 16:03:46 espie Exp $
+
+   Copyright (C) 2003, 2004 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.
+
+   Originally written by Alper Ersoy <dirt@gtk.org>.  */
+
+#include "system.h"
+#include "makeinfo.h"
+#include "cmds.h"
+#include "files.h"
+#include "float.h"
+#include "html.h"
+#include "sectioning.h"
+#include "xml.h"
+
+static FLOAT_ELT *float_stack = NULL;
+
+void
+add_new_float (char *id, char *title, char *shorttitle,
+    char *type, char *position)
+{
+  FLOAT_ELT *new = xmalloc (sizeof (FLOAT_ELT));
+  unsigned long num_len;
+
+  new->id = id;
+  new->type = type;
+  new->title = title;
+  new->shorttitle = shorttitle;
+  new->position = position;
+  new->title_used = 0;
+  new->defining_line = line_number - 1;
+
+  new->number = current_chapter_number ();
+  /* Append dot if not @unnumbered.  */
+  num_len = strlen (new->number);
+  if (num_len > 0)
+    {
+      new->number = xrealloc (new->number, num_len + 1 + 1);
+      new->number[num_len] = '.';
+      new->number[num_len+1] = '\0';
+    }
+
+  { /* Append the current float number.  */
+    unsigned len = strlen (new->number) + 21;  /* that's 64 bits */
+    char *s = xmalloc (len + 1);
+
+    sprintf (s, "%s%d", new->number,
+                count_floats_of_type_in_chapter (text_expansion (type),
+                                                 new->number) + 1); 
+    free (new->number);
+    new->number = xstrdup (s);
+  }
+
+  /* Plain text output needs sectioning number and its title,
+     when listing floats.  */
+  if (!html && !xml && no_headers)
+    {
+      new->section = current_sectioning_number ();
+      if (strlen (new->section) == 0)
+        new->section_name = current_sectioning_name ();
+      else
+        new->section_name = "";
+    }
+
+  new->next = float_stack;
+  float_stack = new;
+}
+
+int
+count_floats_of_type_in_chapter (char *type, char *chapter)
+{
+  int i = 0;
+  int l = strlen (chapter);
+  FLOAT_ELT *temp = float_stack;
+
+  while (temp && strncmp (temp->number, chapter, l) == 0)
+    {
+      if (strlen (temp->id) > 0 && STREQ (text_expansion (temp->type), type))
+        i++;
+      temp = temp->next;
+    }
+
+  return i;
+}
+
+char *
+current_float_title (void)
+{
+  return float_stack->title;
+}
+
+char *
+current_float_shorttitle (void)
+{
+  return float_stack->shorttitle;
+}
+
+char *
+current_float_type (void)
+{
+  return float_stack->type;
+}
+
+char *
+current_float_position (void)
+{
+  return float_stack->position;
+}
+
+char *
+current_float_number (void)
+{
+  return float_stack->number;
+}
+
+char *
+current_float_id (void)
+{
+  return float_stack->id;
+}
+
+char *
+get_float_ref (char *id)
+{
+  FLOAT_ELT *temp = float_stack;
+
+  while (temp)
+    {
+      if (STREQ (id, temp->id))
+        {
+          char *s = xmalloc (strlen (temp->type) + strlen (temp->number) + 2);
+          sprintf (s, "%s %s", temp->type, temp->number);
+          return s;
+        }
+      temp = temp->next;
+    }
+
+  return NULL;
+}
+
+static int
+float_type_exists (char *check_type)
+{
+  /* Check if the requested float_type exists in the floats stack.  */
+  FLOAT_ELT *temp;
+
+  for (temp = float_stack; temp; temp = temp->next)
+    if (STREQ (temp->type, check_type) && temp->id && *temp->id)
+      return 1;
+
+  return 0;
+}
+
+void
+cm_listoffloats (void)
+{
+  char *float_type;
+  get_rest_of_line (1, &float_type);
+
+  /* get_rest_of_line increments the line number by one,
+     so to make warnings/errors point to the correct line,
+     we decrement the line_number again.  */
+  if (!handling_delayed_writes)
+    line_number--;
+
+  if (handling_delayed_writes && !float_type_exists (float_type))
+    warning (_("Requested float type `%s' not previously used"), float_type);
+
+  if (xml)
+    {
+      xml_insert_element_with_attribute (LISTOFFLOATS, START,
+          "type=\"%s\"", text_expansion (float_type));
+      xml_insert_element (LISTOFFLOATS, END);
+    }
+  else if (!handling_delayed_writes)
+    {
+      int command_len = sizeof ("@ ") + strlen (command) + strlen (float_type);
+      char *list_command = xmalloc (command_len + 1);
+
+      /* These are for the text following @listoffloats command.
+         Handling them with delayed writes is too late.  */
+      close_paragraph ();
+      cm_noindent ();
+
+      sprintf (list_command, "@%s %s", command, float_type);
+      register_delayed_write (list_command);
+      free (list_command);
+    }
+  else if (float_type_exists (float_type))
+    {
+      FLOAT_ELT *temp = (FLOAT_ELT *) reverse_list
+        ((GENERIC_LIST *) float_stack);
+      FLOAT_ELT *new_start = temp;
+
+      if (html)
+        insert_string ("<ul class=\"listoffloats\">\n");
+      else
+        {
+          if (!no_headers)
+            insert_string ("* Menu:\n\n");
+        }
+
+      while (temp)
+        {
+          if (strlen (temp->id) > 0 && STREQ (float_type, temp->type))
+            {
+              if (html)
+                {
+                  /* A bit of space for HTML reabality.  */
+                  insert_string ("  ");
+                  add_html_block_elt ("<li>");
+
+                  /* Simply relying on @ref command doesn't work here, because
+                     commas in the caption may confuse the argument parsing.  */
+                  add_word ("<a href=\"");
+                  add_anchor_name (temp->id, 1);
+                  add_word ("\">");
+
+                  if (strlen (float_type) > 0)
+                    execute_string ("%s", float_type);
+
+                  if (strlen (temp->id) > 0)
+                    {
+                      if (strlen (float_type) > 0)
+                        add_char (' ');
+
+                      add_word (temp->number);
+                    }
+
+                  if (strlen (temp->title) > 0)
+                    {
+                      if (strlen (float_type) > 0
+                          || strlen (temp->id) > 0)
+                        insert_string (": ");
+
+                      execute_string ("%s", temp->title);
+                    }
+
+                  add_word ("</a>");
+
+                  add_html_block_elt ("</li>\n");
+                }
+              else
+                {
+                  char *entry;
+                  char *raw_entry;
+                  char *title = expansion (temp->title, 0);
+
+                  int len;
+                  int aux_chars_len; /* these are asterisk, colon, etc.  */
+                  int column_width; /* width of the first column in menus.  */
+                  int number_len; /* length of Figure X.Y: etc.   */
+                  int i = 0;
+
+                  /* Chosen widths are to match what @printindex produces.  */
+                  if (no_headers)
+                    {
+                      column_width = 43;
+                      /* We have only one auxiliary character, NULL.  */
+                      aux_chars_len = sizeof ("");
+                    }
+                  else
+                    {
+                      column_width = 37;
+                      /* We'll be adding an asterisk, followed by a space
+                         and then a colon after the title, to construct a
+                         proper menu item.  */
+                      aux_chars_len = sizeof ("* :");
+                    }
+
+                  /* Allocate enough space for possible expansion later.  */
+                  raw_entry = (char *) xmalloc (strlen (float_type)
+                      + strlen (temp->number) + strlen (title)
+                      + sizeof (":  "));
+
+                  sprintf (raw_entry, "%s %s", float_type, temp->number);
+
+                  if (strlen (title) > 0)
+                    strcat (raw_entry, ": ");
+
+                  number_len = strlen (raw_entry);
+
+                  len = strlen (title) + strlen (raw_entry);
+
+                  /* If we have a @shortcaption, try it if @caption is
+                     too long to fit on a line.  */
+                  if (len + aux_chars_len > column_width
+                      && strlen (temp->shorttitle) > 0)
+                    title = expansion (temp->shorttitle, 0);
+
+                  strcat (raw_entry, title);
+                  len = strlen (raw_entry);
+
+                  if (len + aux_chars_len > column_width)
+                    { /* Shorten long titles by looking for a space before
+                         column_width - strlen (" ...").  */
+                      /* -1 is for NULL, which is already in aux_chars_len.  */
+                      aux_chars_len += sizeof ("...") - 1;
+                      len = column_width - aux_chars_len;
+                      while (raw_entry[len] != ' ' && len >= 0)
+                        len--;
+
+                      /* Advance to the whitespace.  */
+                      len++;
+
+                      /* If we are at the end of, say, Figure X.Y:, but
+                         we have a title, then this means title does not
+                         contain any whitespaces.  Or it may be that we
+                         went as far as the beginning.  Just print as much
+                         as possible of the title.  */
+                      if (len == 0
+                          || (len == number_len && strlen (title) > 0))
+                        len = column_width - sizeof ("...");
+
+                      /* Break here.  */
+                      raw_entry[len] = 0;
+
+                      entry = xmalloc (len + aux_chars_len);
+
+                      if (!no_headers)
+                        strcpy (entry, "* ");
+                      else
+                        entry[0] = 0;
+
+                      strcat (entry, raw_entry);
+                      strcat (entry, "...");
+
+                      if (!no_headers)
+                        strcat (entry, ":");
+                    }
+                  else
+                    {
+                      entry = xmalloc (len + aux_chars_len);
+
+                      if (!no_headers)
+                        strcpy (entry, "* ");
+                      else
+                        entry[0] = 0;
+
+                      strcat (entry, raw_entry);
+
+                      if (!no_headers)
+                        strcat (entry, ":");
+                    }
+
+                  insert_string (entry);
+
+                  i = strlen (entry);
+                  /* We insert space chars until ``column_width + four spaces''
+                     is reached, to make the layout the same with what we produce
+                     for @printindex.  This is of course not obligatory, though
+                     easier on the eye.  -1 is for NULL.  */
+                  while (i < column_width + sizeof ("    ") - 1)
+                    {
+                      insert (' ');
+                      i++;
+                    }
+
+                  if (no_headers)
+                    {
+                      if (strlen (temp->section) > 0)
+                        { /* We got your number.  */
+                          insert_string ((char *) _("See "));
+                          insert_string (temp->section);
+                        }
+                      else
+                        { /* Sigh, @float in an @unnumbered. :-\  */
+                          insert_string ("\n          ");
+                          insert_string ((char *) _("See "));
+                          insert_string ("``");
+                          insert_string (expansion (temp->section_name, 0));
+                          insert_string ("''");
+                        }
+                    }
+                  else
+                    insert_string (temp->id);
+
+                  insert_string (".\n");
+
+                  free (entry);
+                  free (title);
+                }
+            }
+          temp = temp->next;
+        }
+
+      if (html)
+        {
+          inhibit_paragraph_indentation = 1;
+          insert_string ("</ul>\n\n");
+        }
+      else
+        insert ('\n');
+
+      /* Retain the original order of float stack.  */
+      temp = new_start;
+      float_stack = (FLOAT_ELT *) reverse_list ((GENERIC_LIST *) temp);
+    }
+
+  free (float_type);
+  /* Re-increment the line number, because get_rest_of_line
+     left us looking at the next line after the command.  */
+  line_number++;
+}
+
+int
+current_float_used_title (void)
+{
+	return float_stack->title_used;
+}
+
+void current_float_set_title_used (void)
+{
+	float_stack->title_used = 1;
+}
diff --git a/gnu/usr.bin/texinfo/makeinfo/float.h b/gnu/usr.bin/texinfo/makeinfo/float.h
new file mode 100644
index 00000000000..4c1dfc71e43
--- /dev/null
+++ b/gnu/usr.bin/texinfo/makeinfo/float.h
@@ -0,0 +1,56 @@
+/* float.h -- declarations for the float environment.
+   $Id: float.h,v 1.1.1.1 2006/07/17 16:03:46 espie Exp $
+
+   Copyright (C) 2003, 2004 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.
+
+   Written by Alper Ersoy <dirt@gtk.org>.  */
+
+#ifndef FLOAT_H
+#define FLOAT_H
+
+typedef struct float_elt
+{
+  struct float_elt *next;
+  char *id;
+  char *type;
+  char *title;
+  char *shorttitle;
+  char *position;
+  char *number;
+  char *section;
+  char *section_name;
+  short title_used;
+  int defining_line;
+} FLOAT_ELT;
+
+extern void add_new_float (char *id, char *title, char *shorttitle,
+    char *type, char *position);
+extern void current_float_set_title_used (void);
+
+/* Information retrieval about the current float env.  */
+extern char *current_float_id (void);
+extern char *current_float_title (void);
+extern char *current_float_shorttitle (void);
+extern char *current_float_type (void);
+extern char *current_float_position (void);
+extern char *current_float_number (void);
+extern char *get_float_ref (char *id);
+
+extern int count_floats_of_type_in_chapter (char *type, char *chapter);
+extern int current_float_used_title (void);
+
+#endif /* not FLOAT_H */
diff --git a/gnu/usr.bin/texinfo/makeinfo/footnote.c b/gnu/usr.bin/texinfo/makeinfo/footnote.c
index d88c3d95800..4626d36d913 100644
--- a/gnu/usr.bin/texinfo/makeinfo/footnote.c
+++ b/gnu/usr.bin/texinfo/makeinfo/footnote.c
@@ -1,7 +1,7 @@
 /* footnote.c -- footnotes for Texinfo.
-   $Id: footnote.c,v 1.1.1.2 2002/06/10 13:21:16 espie Exp $
+   $Id: footnote.c,v 1.1.1.3 2006/07/17 16:03:46 espie Exp $
 
-   Copyright (C) 1998, 99, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2002 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
@@ -21,7 +21,9 @@
 #include "footnote.h"
 #include "macro.h"
 #include "makeinfo.h"
+#include "node.h"
 #include "xml.h"
+#include "xref.h"
 
 /* Nonzero means that the footnote style for this document was set on
    the command line, which overrides any other settings. */
@@ -53,11 +55,10 @@ int already_outputting_pending_notes = 0;
 int footnote_style = end_node;
 int first_footnote_this_node = 1;
 int footnote_count = 0;
-
+
 /* Set the footnote style based on the style identifier in STRING. */
 int
-set_footnote_style (string)
-     char *string;
+set_footnote_style (char *string)
 {
   if (strcasecmp (string, "separate") == 0)
     footnote_style = separate_node;
@@ -70,7 +71,7 @@ set_footnote_style (string)
 }
 
 void
-cm_footnotestyle ()
+cm_footnotestyle (void)
 {
   char *arg;
 
@@ -95,9 +96,8 @@ FN *pending_notes = NULL;
 
 /* A method for remembering footnotes.  Note that this list gets output
    at the end of the current node. */
-void
-remember_note (marker, note)
-     char *marker, *note;
+static void
+remember_note (char *marker, char *note)
 {
   FN *temp = xmalloc (sizeof (FN));
 
@@ -111,7 +111,7 @@ remember_note (marker, note)
 
 /* How to get rid of existing footnotes. */
 static void
-free_pending_notes ()
+free_pending_notes (void)
 {
   FN *temp;
 
@@ -133,7 +133,7 @@ free_pending_notes ()
     footnote *{this is a footnote}
     where "*" is the (optional) marker character for this note. */
 void
-cm_footnote ()
+cm_footnote (void)
 {
   char *marker;
   char *note;
@@ -237,9 +237,12 @@ cm_footnote ()
      `fn-<n>', though that's unlikely. */
   if (html)
     {
-      add_html_elt ("<a rel=footnote href=");
-      add_word_args ("\"#fn-%d\"><sup>%s</sup></a>",
-		     current_footnote_number, marker);
+      /* Hyperlink also serves as an anchor (mnemonic: fnd is footnote
+         definition.)  */
+      add_html_elt ("<a rel=\"footnote\" href=");
+      add_word_args ("\"#fn-%d\" name=\"fnd-%d\"><sup>%s</sup></a>",
+		     current_footnote_number, current_footnote_number,
+                     marker);
     }
   else
     /* Your method should at least insert MARKER. */
@@ -282,7 +285,7 @@ cm_footnote ()
 
 /* Output the footnotes.  We are at the end of the current node. */
 void
-output_pending_notes ()
+output_pending_notes (void)
 {
   FN *footnote = pending_notes;
 
@@ -290,13 +293,13 @@ output_pending_notes ()
     return;
 
   if (html)
-    { /* The type= attribute is used just in case some weirdo browser
-         out there doesn't use numbers by default.  Since we rely on the
-         browser to produce the footnote numbers, we need to make sure
-         they ARE indeed numbers.  Pre-HTML4 browsers seem to not care.  */
-      add_word ("<hr><h4>");
-      add_word (_("Footnotes"));
-      add_word ("</h4>\n<ol type=\"1\">\n");
+    {
+      add_html_block_elt ("<div class=\"footnote\">\n<hr>\n");
+      /* We add an anchor here so @printindex can refer to this point
+         (as the node name) for entries defined in footnotes.  */
+      if (!splitting)
+        add_word ("<a name=\"texinfo-footnotes-in-document\"></a>");
+      add_word_args ("<h4>%s</h4>", (char *) _("Footnotes"));
     }
   else
     switch (footnote_style)
@@ -329,6 +332,7 @@ output_pending_notes ()
 
   /* Handle the footnotes in reverse order. */
   {
+    int save_in_fixed_width_font = in_fixed_width_font;
     FN **array = xmalloc ((footnote_count + 1) * sizeof (FN *));
     array[footnote_count] = NULL;
 
@@ -340,14 +344,18 @@ output_pending_notes ()
 
     filling_enabled = 1;
     indented_fill = 1;
+    in_fixed_width_font = 0;
 
     while ((footnote = array[++footnote_count]))
       {
         if (html)
           {
 	    /* Make the text of every footnote begin a separate paragraph.  */
-            add_word_args ("<li><a name=\"fn-%d\"></a>\n<p>",
-			   footnote->number);
+            add_html_block_elt ("<p class=\"footnote\"><small>");
+            /* Make footnote number a link to its definition.  */
+            add_word_args ("[<a name=\"fn-%d\" href=\"#fnd-%d\">%d</a>]",
+			   footnote->number, footnote->number, footnote->number);
+            add_word ("</small> ");
             already_outputting_pending_notes++;
             execute_string ("%s", footnote->note);
             already_outputting_pending_notes--;
@@ -372,10 +380,12 @@ output_pending_notes ()
       }
 
     if (html)
-      add_word ("</ol><hr>");
+      add_word ("<hr></div>");
     close_paragraph ();
     free (array);
+
+    in_fixed_width_font = save_in_fixed_width_font;
   }
-  
+
   free_pending_notes ();
 }
diff --git a/gnu/usr.bin/texinfo/makeinfo/footnote.h b/gnu/usr.bin/texinfo/makeinfo/footnote.h
index b5edb509ade..d221c376d6a 100644
--- a/gnu/usr.bin/texinfo/makeinfo/footnote.h
+++ b/gnu/usr.bin/texinfo/makeinfo/footnote.h
@@ -1,7 +1,8 @@
 /* footnote.h -- declarations for footnote.c.
-   $Id: footnote.h,v 1.1.1.1 2000/02/09 01:25:11 espie Exp $
+   $Id: footnote.h,v 1.1.1.2 2006/07/17 16:03:46 espie Exp $
 
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 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
@@ -27,11 +28,11 @@ extern int number_footnotes;
 extern int already_outputting_pending_notes;
 
 /* The Texinfo @commands.  */
-extern void cm_footnote ();
-extern void cm_footnotestyle ();
+extern void cm_footnote (void);
+extern void cm_footnotestyle (void);
 
-extern int set_footnote_style ();    /* called for -s option */
+extern int set_footnote_style (char *string);    /* called for -s option */
 
-extern void output_pending_notes (); /* called for output */
+extern void output_pending_notes (void); /* called for output */
 
 #endif /* !FOOTNOTE_H */
diff --git a/gnu/usr.bin/texinfo/makeinfo/html.c b/gnu/usr.bin/texinfo/makeinfo/html.c
index 5b245a057d6..b92dc3b6e3d 100644
--- a/gnu/usr.bin/texinfo/makeinfo/html.c
+++ b/gnu/usr.bin/texinfo/makeinfo/html.c
@@ -1,7 +1,8 @@
 /* html.c -- html-related utilities.
-   $Id: html.c,v 1.1.1.2 2002/06/10 13:21:16 espie Exp $
+   $Id: html.c,v 1.1.1.3 2006/07/17 16:03:46 espie Exp $
 
-   Copyright (C) 1999, 2000, 01, 02 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 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
@@ -19,80 +20,338 @@
 
 #include "system.h"
 #include "cmds.h"
+#include "files.h"
 #include "html.h"
 #include "lang.h"
 #include "makeinfo.h"
+#include "node.h"
 #include "sectioning.h"
 
+
+/* Append CHAR to BUFFER, (re)allocating as necessary.  We don't handle
+   null characters.  */
+
+typedef struct
+{
+  unsigned size;    /* allocated */
+  unsigned length;  /* used */
+  char *buffer;
+} buffer_type;
+
+static buffer_type *
+init_buffer (void)
+{
+  buffer_type *buf = xmalloc (sizeof (buffer_type));
+  buf->length = 0;
+  buf->size = 0;
+  buf->buffer = NULL;
+
+  return buf;
+}
+
+static void
+append_char (buffer_type *buf, int c)
+{
+  buf->length++;
+  if (buf->length >= buf->size)
+    {
+      buf->size += 100;
+      buf->buffer = xrealloc (buf->buffer, buf->size);
+    }
+  buf->buffer[buf->length - 1] = c;
+  buf->buffer[buf->length] = 0;
+}
+
+/* Read the cascading style-sheet file FILENAME.  Write out any @import
+   commands, which must come first, by the definition of css.  If the
+   file contains any actual css code following the @imports, return it;
+   else return NULL.  */
+static char *
+process_css_file (char *filename)
+{
+  int c;
+  int lastchar = 0;
+  FILE *f;
+  buffer_type *import_text = init_buffer ();
+  buffer_type *inline_text = init_buffer ();
+  unsigned lineno = 1;
+  enum { null_state, comment_state, import_state, inline_state } state
+    = null_state, prev_state;
+
+  prev_state = null_state;
+
+  /* read from stdin if `-' is the filename.  */
+  f = STREQ (filename, "-") ? stdin : fopen (filename, "r");
+  if (!f)
+    {
+      error (_("%s: could not open --css-file: %s"), progname, filename);
+      return NULL;
+    }
+
+  /* Read the file.  The @import statements must come at the beginning,
+     with only whitespace and comments allowed before any inline css code.  */
+  while ((c = getc (f)) >= 0)
+    {
+      if (c == '\n')
+        lineno++;
+
+      switch (state)
+        {
+        case null_state: /* between things */
+          if (c == '@')
+            { /* Only @import and @charset should switch into
+                 import_state, other @-commands, such as @media, should
+                 put us into inline_state.  I don't think any other css
+                 @-commands start with `i' or `c', although of course
+                 this will break when such a command is defined.  */
+              int nextchar = getc (f);
+              if (nextchar == 'i' || nextchar == 'c')
+                {
+                  append_char (import_text, c);
+                  state = import_state;
+                }
+              else
+                {
+                  ungetc (nextchar, f);  /* wasn't an @import */
+                  state = inline_state;
+                }
+            }
+          else if (c == '/')
+            { /* possible start of a comment */
+              int nextchar = getc (f);
+              if (nextchar == '*')
+                state = comment_state;
+              else
+                {
+                  ungetc (nextchar, f); /* wasn't a comment */
+                  state = inline_state;
+                }
+            }
+          else if (isspace (c))
+            ; /* skip whitespace; maybe should use c_isspace?  */
+
+          else
+            /* not an @import, not a comment, not whitespace: we must
+               have started the inline text.  */
+            state = inline_state;
+
+          if (state == inline_state)
+            append_char (inline_text, c);
+
+          if (state != null_state)
+            prev_state = null_state;
+          break;
+
+        case comment_state:
+          if (c == '/' && lastchar == '*')
+            state = prev_state;  /* end of comment */
+          break;  /* else ignore this comment char */
+
+        case import_state:
+          append_char (import_text, c);  /* include this import char */
+          if (c == ';')
+            { /* done with @import */
+              append_char (import_text, '\n');  /* make the output nice */
+              state = null_state;
+              prev_state = import_state;
+            }
+          break;
+
+        case inline_state:
+          /* No harm in writing out comments, so don't bother parsing
+             them out, just append everything.  */
+          append_char (inline_text, c);
+          break;
+        }
+
+      lastchar = c;
+    }
+
+  /* Reached the end of the file.  We should not be still in a comment.  */
+  if (state == comment_state)
+    warning (_("%s:%d: --css-file ended in comment"), filename, lineno);
+
+  /* Write the @import text, if any.  */
+  if (import_text->buffer)
+    {
+      add_word (import_text->buffer);
+      free (import_text->buffer);
+      free (import_text);
+    }
+
+  /* We're wasting the buffer struct memory, but so what.  */
+  return inline_text->buffer;
+}
+
+HSTACK *htmlstack = NULL;
+
 /* See html.h.  */
 int html_output_head_p = 0;
+int html_title_written = 0;
 
 void
-html_output_head ()
+html_output_head (void)
 {
-  static char *html_title = NULL;
-  static int html_title_written = 0;
+  static const char *html_title = NULL;
+  char *encoding;
 
   if (html_output_head_p)
     return;
   html_output_head_p = 1;
 
+  encoding = current_document_encoding ();
+
   /* The <title> should not have markup, so use text_expansion.  */
   if (!html_title)
-    html_title = title ? text_expansion (title) : _("Untitled");
+    html_title = escape_string (title ?
+        text_expansion (title) : (char *) _("Untitled"));
+
+  /* Make sure this is the very first string of the output document.  */
+  output_paragraph_offset = 0;
 
-  add_word_args ("<html lang=\"%s\">\n<head>\n<title>%s</title>\n",
-                 language_table[language_code].abbrev, html_title);
+  add_html_block_elt_args ("<html lang=\"%s\">\n<head>\n",
+      language_table[language_code].abbrev);
+
+  /* When splitting, add current node's name to title if it's available and not
+     Top.  */
+  if (splitting && current_node && !STREQ (current_node, "Top"))
+    add_word_args ("<title>%s - %s</title>\n",
+        escape_string (xstrdup (current_node)), html_title);
+  else
+    add_word_args ("<title>%s</title>\n",  html_title);
 
   add_word ("<meta http-equiv=\"Content-Type\" content=\"text/html");
-  if (document_encoding_code != no_encoding)
-    add_word_args ("; charset=%s",
-                   encoding_table[document_encoding_code].ecname);
+  if (encoding && *encoding)
+    add_word_args ("; charset=%s", encoding);
+                   
   add_word ("\">\n");
 
   if (!document_description)
     document_description = html_title;
 
-  add_word_args ("<meta name=description content=\"%s\">\n",
+  add_word_args ("<meta name=\"description\" content=\"%s\">\n",
                  document_description);
-  add_word_args ("<meta name=generator content=\"makeinfo %s\">\n", VERSION);
-  add_word ("<link href=\"http://www.gnu.org/software/texinfo/\" rel=generator-home>\n");
+  add_word_args ("<meta name=\"generator\" content=\"makeinfo %s\">\n",
+                 VERSION);
+
+  /* Navigation bar links.  */
+  if (!splitting)
+    add_word ("<link title=\"Top\" rel=\"top\" href=\"#Top\">\n");
+  else if (tag_table)
+    {
+      /* Always put a top link.  */
+      add_word ("<link title=\"Top\" rel=\"start\" href=\"index.html#Top\">\n");
+
+      /* We already have a top link, avoid duplication.  */
+      if (tag_table->up && !STREQ (tag_table->up, "Top"))
+        add_link (tag_table->up, "rel=\"up\"");
+
+      if (tag_table->prev)
+        add_link (tag_table->prev, "rel=\"prev\"");
+
+      if (tag_table->next)
+        add_link (tag_table->next, "rel=\"next\"");
+
+      /* fixxme: Look for a way to put links to various indices in the
+         document.  Also possible candidates to be added here are First and
+         Last links.  */
+    }
+  else
+    {
+      /* We are splitting, but we neither have a tag_table.  So this must be
+         index.html.  So put a link to Top. */
+      add_word ("<link title=\"Top\" rel=\"start\" href=\"#Top\">\n");
+    }
+
+  add_word ("<link href=\"http://www.gnu.org/software/texinfo/\" \
+rel=\"generator-home\" title=\"Texinfo Homepage\">\n");
 
   if (copying_text)
-    { /* copying_text has already been fully expanded in
-         begin_insertion (by full_expansion), so use insert_ rather than
-         add_.  It is not ideal that we include the html markup here within
-         <head>, but the alternative is to have yet more and different
-         expansions of the copying text.  Yuck.  */
+    { /* It is not ideal that we include the html markup here within
+         <head>, so we use text_expansion.  */
       insert_string ("<!--\n");
-      insert_string (copying_text);
+      insert_string (text_expansion (copying_text));
       insert_string ("-->\n");
     }
 
+  /* Put the style definitions in a comment for the sake of browsers
+     that don't support <style>.  */
+  add_word ("<meta http-equiv=\"Content-Style-Type\" content=\"text/css\">\n");
+  add_word ("<style type=\"text/css\"><!--\n");
+
+  {
+    char *css_inline = NULL;
+
+    if (css_include)
+      /* This writes out any @import commands from the --css-file,
+         and returns any actual css code following the imports.  */
+      css_inline = process_css_file (css_include);
+
+    /* This seems cleaner than adding <br>'s at the end of each line for
+       these "roman" displays.  It's hardly the end of the world if the
+       browser doesn't do <style>s, in any case; they'll just come out in
+       typewriter.  */
+#define CSS_FONT_INHERIT "font-family:inherit"
+    add_word_args ("  pre.display { %s }\n", CSS_FONT_INHERIT);
+    add_word_args ("  pre.format  { %s }\n", CSS_FONT_INHERIT);
+
+    /* Alternatively, we could do <font size=-1> in insertion.c, but this
+       way makes it easier to override.  */
+#define CSS_FONT_SMALLER "font-size:smaller"
+    add_word_args ("  pre.smalldisplay { %s; %s }\n", CSS_FONT_INHERIT,
+                   CSS_FONT_SMALLER);
+    add_word_args ("  pre.smallformat  { %s; %s }\n", CSS_FONT_INHERIT,
+                   CSS_FONT_SMALLER);
+    add_word_args ("  pre.smallexample { %s }\n", CSS_FONT_SMALLER);
+    add_word_args ("  pre.smalllisp    { %s }\n", CSS_FONT_SMALLER);
+
+    /* Since HTML doesn't have a sc element, we use span with a bit of
+       CSS spice instead.  */
+#define CSS_FONT_SMALL_CAPS "font-variant:small-caps"
+    add_word_args ("  span.sc    { %s }\n", CSS_FONT_SMALL_CAPS);
+
+    /* Roman (default) font class, closest we can come.  */
+#define CSS_FONT_ROMAN "font-family:serif; font-weight:normal;"
+    add_word_args ("  span.roman { %s } \n", CSS_FONT_ROMAN);
+
+    /* Sans serif font class.  */
+#define CSS_FONT_SANSSERIF "font-family:sans-serif; font-weight:normal;"
+    add_word_args ("  span.sansserif { %s } \n", CSS_FONT_SANSSERIF);
+
+    /* Write out any css code from the user's --css-file.  */
+    if (css_inline)
+      insert_string (css_inline);
+
+    add_word ("--></style>\n");
+  }
+
   add_word ("</head>\n<body>\n");
 
-  if (title && !html_title_written)
+  if (title && !html_title_written && titlepage_cmd_present)
     {
-      add_word_args ("<h1>%s</h1>\n", html_title);
+      add_word_args ("<h1 class=\"settitle\">%s</h1>\n", html_title);
       html_title_written = 1;
     }
-}
 
+  free (encoding);
+}
 
 /* Escape HTML special characters in the string if necessary,
    returning a pointer to a possibly newly-allocated one. */
 char *
-escape_string (string)
-     char * string;
+escape_string (char *string)
 {
-  int i=0, newlen=0;
-  char * newstring;
+  char *newstring;
+  int i = 0, newlen = 0;
 
   do
     {
       /* Find how much to allocate. */
       switch (string[i])
         {
+        case '"':
+          newlen += 6;          /* `&quot;' */
+          break;
         case '&':
           newlen += 5;          /* `&amp;' */
           break;
@@ -114,6 +373,10 @@ escape_string (string)
     {
       switch (string[i])
         {
+        case '"':
+          strcpy (newstring, "&quot;");
+          newstring += 6;
+          break;
         case '&':
           strcpy (newstring, "&amp;");
           newstring += 5;
@@ -135,33 +398,187 @@ escape_string (string)
   free (string);
   return newstring - newlen;
 }
+
+/* Save current tag.  */
+static void
+push_tag (char *tag, char *attribs)
+{
+  HSTACK *newstack = xmalloc (sizeof (HSTACK));
+
+  newstack->tag = tag;
+  newstack->attribs = xstrdup (attribs);
+  newstack->next = htmlstack;
+  htmlstack = newstack;
+}
+
+/* Get last tag.  */
+static void
+pop_tag (void)
+{
+  HSTACK *tos = htmlstack;
+
+  if (!tos)
+    {
+      line_error (_("[unexpected] no html tag to pop"));
+      return;
+    }
+
+  free (htmlstack->attribs);
+
+  htmlstack = htmlstack->next;
+  free (tos);
+}
+
+/* Check if tag is an empty or a whitespace only element.
+   If so, remove it, keeping whitespace intact.  */
+int
+rollback_empty_tag (char *tag)
+{
+  int check_position = output_paragraph_offset;
+  int taglen = strlen (tag);
+  int rollback_happened = 0;
+  char *contents = "";
+  char *contents_canon_white = "";
+
+  /* If output_paragraph is empty, we cannot rollback :-\  */
+  if (output_paragraph_offset <= 0)
+    return 0;
+
+  /* Find the end of the previous tag.  */
+  while (output_paragraph[check_position-1] != '>' && check_position > 0)
+    check_position--;
+
+  /* Save stuff between tag's end to output_paragraph's end.  */
+  if (check_position != output_paragraph_offset)
+    {
+      contents = xmalloc (output_paragraph_offset - check_position + 1);
+      memcpy (contents, output_paragraph + check_position,
+          output_paragraph_offset - check_position);
+
+      contents[output_paragraph_offset - check_position] = '\0';
+
+      contents_canon_white = xstrdup (contents);
+      canon_white (contents_canon_white);
+    }
+
+  /* Find the start of the previous tag.  */
+  while (output_paragraph[check_position-1] != '<' && check_position > 0)
+    check_position--;
+
+  /* Check to see if this is the tag.  */
+  if (strncmp ((char *) output_paragraph + check_position, tag, taglen) == 0
+      && (whitespace (output_paragraph[check_position + taglen])
+          || output_paragraph[check_position + taglen] == '>'))
+    {
+      if (!contents_canon_white || !*contents_canon_white)
+        {
+          /* Empty content after whitespace removal, so roll it back.  */
+          output_paragraph_offset = check_position - 1;
+          rollback_happened = 1;
+
+          /* Original contents may not be empty (whitespace.)  */
+          if (contents && *contents)
+            {
+              insert_string (contents);
+              free (contents);
+            }
+        }
+    }
+
+  return rollback_happened;
+}
 
 /* Open or close TAG according to START_OR_END. */
 void
-insert_html_tag (start_or_end, tag)
+#if defined (VA_FPRINTF) && __STDC__
+insert_html_tag_with_attribute (int start_or_end, char *tag, char *format, ...)
+#else
+insert_html_tag_with_attribute (start_or_end, tag, format, va_alist)
      int start_or_end;
      char *tag;
+     char *format;
+     va_dcl
+#endif
 {
-  if (!paragraph_is_open && (start_or_end == START))
+  char *old_tag = NULL;
+  char *old_attribs = NULL;
+  char formatted_attribs[2000]; /* xx no fixed limits */
+  int do_return = 0;
+  extern int in_html_elt;
+
+  if (start_or_end != START)
+    pop_tag ();
+
+  if (htmlstack)
     {
-      /* Need to compensate for the <p> we are about to insert, or
-	 else cm_xxx functions that call us will get wrong text
-	 between START and END.  */
-      adjust_braces_following (output_paragraph_offset, 3);
-      add_word ("<p>");
+      old_tag = htmlstack->tag;
+      old_attribs = htmlstack->attribs;
     }
-  add_char ('<');
-  if (start_or_end != START)
-    add_char ('/');
-  add_word (tag);
-  add_char ('>');
+  
+  if (format)
+    {
+#ifdef VA_SPRINTF
+      va_list ap;
+#endif
+
+      VA_START (ap, format);
+#ifdef VA_SPRINTF
+      VA_SPRINTF (formatted_attribs, format, ap);
+#else
+      sprintf (formatted_attribs, format, a1, a2, a3, a4, a5, a6, a7, a8);
+#endif
+      va_end (ap);
+    }
+  else
+    formatted_attribs[0] = '\0';
+
+  /* Exception: can nest multiple spans.  */
+  if (htmlstack
+      && STREQ (htmlstack->tag, tag)
+      && !(STREQ (tag, "span") && STREQ (old_attribs, formatted_attribs)))
+    do_return = 1;
+
+  if (start_or_end == START)
+    push_tag (tag, formatted_attribs);
+
+  if (do_return)
+    return;
+
+  in_html_elt++;
+
+  /* texinfo.tex doesn't support more than one font attribute
+     at the same time.  */
+  if ((start_or_end == START) && old_tag && *old_tag
+      && !rollback_empty_tag (old_tag))
+    add_word_args ("</%s>", old_tag);
+
+  if (*tag)
+    {
+      if (start_or_end == START)
+        add_word_args (format ? "<%s %s>" : "<%s>", tag, formatted_attribs);
+      else if (!rollback_empty_tag (tag))
+        /* Insert close tag only if we didn't rollback,
+           in which case the opening tag is removed.  */
+        add_word_args ("</%s>", tag);
+    }
+
+  if ((start_or_end != START) && old_tag && *old_tag)
+    add_word_args (strlen (old_attribs) > 0 ? "<%s %s>" : "<%s>",
+        old_tag, old_attribs);
+
+  in_html_elt--;
 }
 
+void
+insert_html_tag (int start_or_end, char *tag)
+{
+  insert_html_tag_with_attribute (start_or_end, tag, NULL);
+}
+
 /* Output an HTML <link> to the filename for NODE, including the
    other string as extra attributes. */
 void
-add_link (nodename, attributes)
-     char *nodename, *attributes;
+add_link (char *nodename, char *attributes)
 {
   if (nodename)
     {
@@ -169,39 +586,64 @@ add_link (nodename, attributes)
       add_word_args ("%s", attributes);
       add_word_args (" href=\"");
       add_anchor_name (nodename, 1);
-      add_word ("\"></a>\n");
+      add_word_args ("\" title=\"%s\">\n", nodename);
     }
 }
 
 /* Output NAME with characters escaped as appropriate for an anchor
-   name, i.e., escape URL special characters as %<n>.  */
+   name, i.e., escape URL special characters with our _00hh convention
+   if OLD is zero.  (See the manual for details on the new scheme.)
+   
+   If OLD is nonzero, generate the node name with the 4.6-and-earlier
+   convention of %hh (and more special characters output as-is, notably
+   - and *).  This is only so that external references to old names can
+   still work with HTML generated by the new makeinfo; the gcc folks
+   needed this.  Our own HTML does not refer to these names.  */
+
 void
-add_escaped_anchor_name (name)
-     char *name;
+add_escaped_anchor_name (char *name, int old)
 {
+  canon_white (name);
+
+  if (!old && !strchr ("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",
+                       *name))
+    { /* XHTML does not allow anything but an ASCII letter to start an
+         identifier.  Therefore kludge in this constant string if we
+         have a nonletter.  */
+      add_word ("g_t");
+    }
+
   for (; *name; name++)
     {
-      if (*name == '&')
-        add_word ("&amp;");
-      else if (! URL_SAFE_CHAR (*name))
+      if (cr_or_whitespace (*name))
+        add_char ('-');
+
+      else if (!old && !URL_SAFE_CHAR (*name))
         /* Cast so characters with the high bit set are treated as >128,
            for example o-umlaut should be 246, not -10.  */
+        add_word_args ("_00%x", (unsigned char) *name);
+
+      else if (old && !URL_SAFE_CHAR (*name) && !OLD_URL_SAFE_CHAR (*name))
+        /* Different output convention, but still cast as above.  */
         add_word_args ("%%%x", (unsigned char) *name);
+
       else
         add_char (*name);
     }
 }
 
 /* Insert the text for the name of a reference in an HTML anchor
-   appropriate for NODENAME.  If HREF is nonzero, it will be
-   appropriate for a href= attribute, rather than name= i.e., including
-   the `#' if it's an internal reference. */
+   appropriate for NODENAME.
+   
+   If HREF is zero, generate text for name= in the new node name
+     conversion convention.
+   If HREF is negative, generate text for name= in the old convention.
+   If HREF is positive, generate the name for an href= attribute, i.e.,
+     including the `#' if it's an internal reference.   */
 void
-add_anchor_name (nodename, href)
-     char *nodename;
-     int href;
+add_anchor_name (char *nodename, int href)
 {
-  if (href)
+  if (href > 0)
     {
       if (splitting)
 	add_url_name (nodename, href);
@@ -214,38 +656,52 @@ add_anchor_name (nodename, href)
   if (strcasecmp (nodename, "(dir)") == 0)
     /* Strip the parens, but keep the original letter-case.  */
     add_word_args ("%.3s", nodename + 1);
+  else if (strcasecmp (nodename, "top") == 0)
+    add_word ("Top");
   else
-    add_escaped_anchor_name (nodename);
+    add_escaped_anchor_name (nodename, href < 0);
 }
 
 /* Insert the text for the name of a reference in an HTML url, aprropriate
    for NODENAME */
 void
-add_url_name (nodename, href)
-     char *nodename;
-     int href;
+add_url_name (char *nodename, int href)
 {
     add_nodename_to_filename (nodename, href);
 }
 
-/* Only allow [-0-9a-zA-Z_.] when nodifying filenames.  This may
-   result in filename clashes; e.g.,
+/* Convert non [A-Za-z0-9] to _00xx, where xx means the hexadecimal
+   representation of the ASCII character.  Also convert spaces and
+   newlines to dashes.  */
+static void
+fix_filename (char *filename)
+{
+  int i;
+  int len = strlen (filename);
+  char *oldname = xstrdup (filename);
 
-   @node Foo ],,,
-   @node Foo [,,,
+  *filename = '\0';
 
-   both map to Foo--.html.  If that happens, cm_node will put all
-   the nodes whose file names clash on the same file.  */
-void
-fix_filename (filename)
-     char *filename;
-{
-  char *p;
-  for (p = filename; *p; p++)
+  for (i = 0; i < len; i++)
     {
-      if (!(isalnum (*p) || strchr ("-._", *p)))
-	*p = '-';
+      if (cr_or_whitespace (oldname[i]))
+        strcat (filename, "-");
+      else if (URL_SAFE_CHAR (oldname[i]))
+        strncat (filename, (char *) oldname + i, 1);
+      else
+        {
+          char *hexchar = xmalloc (6 * sizeof (char));
+          sprintf (hexchar, "_00%x", (unsigned char) oldname[i]);
+          strcat (filename, hexchar);
+          free (hexchar);
+        }
+
+      /* Check if we are nearing boundaries.  */
+      if (strlen (filename) >= PATH_MAX - 20)
+        break;
     }
+
+  free (oldname);
 }
 
 /* As we can't look-up a (forward-referenced) nodes' html filename
@@ -253,9 +709,7 @@ fix_filename (filename)
    nodenames are unique, and generate the html filename from the
    nodename, that's always known.  */
 static char *
-nodename_to_filename_1 (nodename, href)
-     char *nodename;
-     int href;
+nodename_to_filename_1 (char *nodename, int href)
 {
   char *p;
   char *filename;
@@ -295,8 +749,8 @@ nodename_to_filename_1 (nodename, href)
 	  p = strchr (nodename, ')');
 	  if (p == NULL)
 	    {
-	      line_error (_("Invalid node name: `%s'"), nodename);
-	      exit (1);
+	      line_error (_("[unexpected] invalid node name: `%s'"), nodename);
+	      xexit (1);
 	    }
 
 	  length = p - nodename - 1;
@@ -351,9 +805,7 @@ nodename_to_filename_1 (nodename, href)
 /* If necessary, ie, if current filename != filename of node, output
    the node name.  */
 void
-add_nodename_to_filename (nodename, href)
-     char *nodename;
-     int href;
+add_nodename_to_filename (char *nodename, int href)
 {
   /* for now, don't check: always output filename */
   char *filename = nodename_to_filename_1 (nodename, href);
@@ -362,8 +814,7 @@ add_nodename_to_filename (nodename, href)
 }
 
 char *
-nodename_to_filename (nodename)
-     char *nodename;
+nodename_to_filename (char *nodename)
 {
   /* The callers of nodename_to_filename use the result to produce
      <a href=, so call nodename_to_filename_1 with last arg non-zero.  */
diff --git a/gnu/usr.bin/texinfo/makeinfo/html.h b/gnu/usr.bin/texinfo/makeinfo/html.h
index 49aec6f9b83..e51299b17d8 100644
--- a/gnu/usr.bin/texinfo/makeinfo/html.h
+++ b/gnu/usr.bin/texinfo/makeinfo/html.h
@@ -1,7 +1,7 @@
 /* html.h -- declarations for html-related utilities.
-   $Id: html.h,v 1.1.1.2 2002/06/10 13:21:16 espie Exp $
+   $Id: html.h,v 1.1.1.3 2006/07/17 16:03:46 espie Exp $
 
-   Copyright (C) 1999, 2000, 02 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002, 2004 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,28 +20,46 @@
 #ifndef HTML_H
 #define HTML_H
 
+/* A stack of font tags.  */
+typedef struct hstack
+{
+  struct hstack *next;
+  char *tag;
+  char *attribs;
+} HSTACK;
+
 /* Nonzero if we have output the <head>.  */
 extern int html_output_head_p;
 
+/* Nonzero if we have output a title, from @titlefont or @settitle.  */
+extern int html_title_written;
+
 /* Perform the <head> output.  */
-extern void html_output_head ();
+extern void html_output_head (void);
 
 /* Escape &<>.  */
-extern char *escape_string (/* char * */);
+extern char *escape_string (char *);
 
 /* Open or close TAG according to START_OR_END.  */
-extern void insert_html_tag (/* int start_or_end, char *tag */);
+extern void insert_html_tag (int start_or_end, char *tag);
 
 /* Output HTML <link> to NODE, plus extra ATTRIBUTES.  */
-extern void add_link (/* char *node, char *attributes */);
+extern void add_link (char *nodename, char *attributes);
 
-/* Escape URL-special characters as %xy.  */
-extern void add_escaped_anchor_name (/* char *name */);
+/* Escape URL-special characters.  */
+extern void add_escaped_anchor_name (char *name, int old);
 
 /* See html.c.  */
-extern void add_anchor_name (/* nodename, href */);
-extern void add_url_name ( /* nodename, href */ );
-extern char* nodename_to_filename ( /* nodename */ );
-extern void add_nodename_to_filename ( /*nodename, href */ );
+extern void add_anchor_name (char *nodename, int href);
+extern void add_url_name (char *nodename, int href);
+extern void add_nodename_to_filename (char *nodename, int href);
+extern char *nodename_to_filename (char *nodename);
+extern int rollback_empty_tag (char *tag);
+
+#if defined (VA_FPRINTF) && __STDC__
+extern void insert_html_tag_with_attribute (int start_or_end, char *tag, char *format, ...);
+#else
+extern void insert_html_tag_with_attribute ();
+#endif
 
 #endif /* !HTML_H */
diff --git a/gnu/usr.bin/texinfo/makeinfo/index.c b/gnu/usr.bin/texinfo/makeinfo/index.c
index cb3ac3b6177..d29c87f8204 100644
--- a/gnu/usr.bin/texinfo/makeinfo/index.c
+++ b/gnu/usr.bin/texinfo/makeinfo/index.c
@@ -1,7 +1,8 @@
 /* index.c -- indexing for Texinfo.
-   $Id: index.c,v 1.1.1.2 2002/06/10 13:21:16 espie Exp $
+   $Id: index.c,v 1.1.1.3 2006/07/17 16:03:46 espie Exp $
 
-   Copyright (C) 1998, 99, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2002, 2003, 2004 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
@@ -18,59 +19,16 @@
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "system.h"
+#include "files.h"
+#include "footnote.h"
+#include "html.h"
 #include "index.h"
 #include "lang.h"
 #include "macro.h"
+#include "sectioning.h"
 #include "toc.h"
 #include "xml.h"
 
-/* An index element... */
-typedef struct index_elt
-{
-  struct index_elt *next;
-  char *entry;                  /* The index entry itself, after expansion. */
-  char *entry_text;             /* The original, non-expanded entry text. */
-  char *node;                   /* The node from whence it came. */
-  int code;                     /* Nonzero means add `@code{...}' when
-                                   printing this element. */
-  int defining_line;            /* Line number where this entry was written. */
-  char *defining_file;          /* Source file for defining_line. */
-} INDEX_ELT;
-
-
-/* A list of short-names for each index.
-   There are two indices into the the_indices array.
-   * read_index is the index that points to the list of index
-     entries that we will find if we ask for the list of entries for
-     this name.
-   * write_index is the index that points to the list of index entries
-     that we will add new entries to.
-
-   Initially, read_index and write_index are the same, but the
-   @syncodeindex and @synindex commands can change the list we add
-   entries to.
-
-   For example, after the commands
-     @cindex foo
-     @defindex ii
-     @synindex cp ii
-     @cindex bar
-
-   the cp index will contain the entry `foo', and the new ii
-   index will contain the entry `bar'.  This is consistent with the
-   way texinfo.tex handles the same situation.
-
-   In addition, for each index, it is remembered whether that index is
-   a code index or not.  Code indices have @code{} inserted around the
-   first word when they are printed with printindex. */
-typedef struct
-{
-  char *name;
-  int read_index;   /* index entries for `name' */
-  int write_index;  /* store index entries here, @synindex can change it */
-  int code;
-} INDEX_ALIST;
-
 INDEX_ALIST **name_index_alist = NULL;
 
 /* An array of pointers.  Each one is for a different index.  The
@@ -81,18 +39,24 @@ INDEX_ELT **the_indices = NULL;
 /* The number of defined indices. */
 int defined_indices = 0;
 
+/* This is the order of the index.  */
+int index_counter = 0;
+
 /* Stuff for defining commands on the fly. */
 COMMAND **user_command_array = NULL;
 int user_command_array_len = 0;
 
 /* How to compare index entries for sorting.  May be set to strcoll.  */
-int (*index_compare_fn) () = strcasecmp;
+int (*index_compare_fn) (const char *a, const char *b) = strcasecmp;
+
+/* Function to compare index entries for sorting.  (Calls
+   `index_compare_fn' above.)  */
+int index_element_compare (const void *element1, const void *element2);
 
 /* Find which element in the known list of indices has this name.
    Returns -1 if NAME isn't found. */
 static int
-find_index_offset (name)
-     char *name;
+find_index_offset (char *name)
 {
   int i;
   for (i = 0; i < defined_indices; i++)
@@ -103,9 +67,8 @@ find_index_offset (name)
 
 /* Return a pointer to the entry of (name . index) for this name.
    Return NULL if the index doesn't exist. */
-INDEX_ALIST *
-find_index (name)
-     char *name;
+static INDEX_ALIST *
+find_index (char *name)
 {
   int offset = find_index_offset (name);
   if (offset > -1)
@@ -116,11 +79,8 @@ find_index (name)
 
 /* User-defined commands, which happens only from user-defined indexes.
    Used to initialize the builtin indices, too.  */
-void
-define_user_command (name, proc, needs_braces_p)
-     char *name;
-     COMMAND_FUNCTION *proc;
-     int needs_braces_p;
+static void
+define_user_command (char *name, COMMAND_FUNCTION (*proc), int needs_braces_p)
 {
   int slot = user_command_array_len;
   user_command_array_len++;
@@ -139,8 +99,7 @@ define_user_command (name, proc, needs_braces_p)
 
 /* Please release me, let me go... */
 static void
-free_index (index)
-     INDEX_ELT *index;
+free_index (INDEX_ELT *index)
 {
   INDEX_ELT *temp;
 
@@ -159,8 +118,7 @@ free_index (index)
 /* Flush an index by name.  This will delete the list of entries that
    would be written by a @printindex command for this index. */
 static void
-undefindex (name)
-     char *name;
+undefindex (char *name)
 {
   int i;
   int which = find_index_offset (name);
@@ -180,11 +138,9 @@ undefindex (name)
   name_index_alist[which] = NULL;
 }
 
-/* Add the arguments to the current index command to the index NAME.
-   html fixxme generate specific html anchor */
+/* Add the arguments to the current index command to the index NAME.  */
 static void
-index_add_arg (name)
-     char *name;
+index_add_arg (char *name)
 {
   int which;
   char *index_entry;
@@ -216,17 +172,57 @@ index_add_arg (name)
   else
     {
       INDEX_ELT *new = xmalloc (sizeof (INDEX_ELT));
+
+      index_counter++;
+
+      /* Get output line number updated before doing anything.  */
+      if (!html && !xml)
+        flush_output ();
+
       new->next = the_indices[which];
-      new->entry_text = index_entry;
       new->entry = NULL;
-      new->node = current_node ? current_node : xstrdup ("");
+      new->entry_text = index_entry;
+      /* Since footnotes are handled at the very end of the document,
+         node name in the non-split HTML outputs always show the last
+         node.  We artificially make it ``Footnotes''.  */
+      if (html && !splitting && already_outputting_pending_notes)
+        new->node = xstrdup (_("Footnotes"));
+      else
+        new->node = current_node ? current_node : xstrdup ("");
+      if (!html && !xml && no_headers)
+        {
+          new->section = current_sectioning_number ();
+          if (strlen (new->section) == 0)
+            new->section_name = current_sectioning_name ();
+          else
+            new->section_name = "";
+        }
+      else
+        {
+          new->section = NULL;
+          new->section_name = NULL;
+        }
       new->code = tem->code;
       new->defining_line = line_number - 1;
+      new->output_line = no_headers ? output_line_number : node_line_number;
       /* We need to make a copy since input_filename may point to
          something that goes away, for example, inside a macro.
          (see the findexerr test).  */
       new->defining_file = xstrdup (input_filename);
+
+      if (html && splitting)
+        {
+          if (current_output_filename && *current_output_filename)
+            new->output_file = filename_part (current_output_filename);
+          else
+            new->output_file = xstrdup ("");
+        }
+      else
+        new->output_file = NULL;        
+
+      new->entry_number = index_counter;
       the_indices[which] = new;
+
 #if 0
       /* The index breaks if there are colons in the entry.
          -- This is true, but it's too painful to force changing index
@@ -238,14 +234,36 @@ index_add_arg (name)
         warning (_("Info cannot handle `:' in index entry `%s'"),
                  new->entry_text);
 #endif
+
+      if (html)
+        {
+          /* Anchor.  */
+          int removed_empty_elt = 0;
+
+          /* We must put the anchor outside the <dl> and <ul> blocks.  */
+          if (rollback_empty_tag ("dl"))
+            removed_empty_elt = 1;
+          else if (rollback_empty_tag ("ul"))
+            removed_empty_elt = 2;
+
+          add_word ("<a name=\"index-");
+          add_escaped_anchor_name (index_entry, 0);
+          add_word_args ("-%d\"></a>", index_counter);
+
+          if (removed_empty_elt == 1)
+            add_html_block_elt_args ("\n<dl>");
+          else if (removed_empty_elt == 2)
+            add_html_block_elt_args ("\n<ul>");
+        }
     }
+
   if (xml)
     xml_insert_indexterm (index_entry, name);
 }
 
 /* The function which user defined index commands call. */
 static void
-gen_index ()
+gen_index (void)
 {
   char *name = xstrdup (command);
   if (strlen (name) >= strlen ("index"))
@@ -257,9 +275,7 @@ gen_index ()
 /* Define an index known as NAME.  We assign the slot number.
    If CODE is nonzero, make this a code index. */
 static void
-defindex (name, code)
-     char *name;
-     int code;
+defindex (char *name, int code)
 {
   int i, slot;
 
@@ -299,9 +315,7 @@ defindex (name, code)
 
 /* Define an index NAME, implicitly @code if CODE is nonzero.  */
 static void
-top_defindex (name, code)
-     char *name;
-     int code;
+top_defindex (char *name, int code)
 {
   char *temp;
 
@@ -314,7 +328,7 @@ top_defindex (name, code)
 
 /* Set up predefined indices.  */
 void
-init_indices ()
+init_indices (void)
 {
   int i;
 
@@ -334,7 +348,6 @@ init_indices ()
   /* If there were existing indices, get rid of them now. */
   for (i = 0; i < defined_indices; i++)
     {
-      undefindex (name_index_alist[i]->name);
       if (name_index_alist[i])
         { /* Suppose we're called with two input files, and the first
              does a @synindex pg cp.  Then, when we get here to start
@@ -342,9 +355,15 @@ init_indices ()
              undefindex (because it's pointing to "cp").  So free it
              here; otherwise, when we try to define the pg index again
              just below, it will still point to cp.  */
-          free (name_index_alist[i]->name);
-          free (name_index_alist[i]);
-          name_index_alist[i] = NULL;
+          undefindex (name_index_alist[i]->name);
+
+          /* undefindex sets all this to null in some cases.  */
+          if (name_index_alist[i])
+            {
+              free (name_index_alist[i]->name);
+              free (name_index_alist[i]);
+              name_index_alist[i] = NULL;
+            }
         }
     }
 
@@ -359,9 +378,8 @@ init_indices ()
 
 /* Given an index name, return the offset in the_indices of this index,
    or -1 if there is no such index. */
-int
-translate_index (name)
-     char *name;
+static int
+translate_index (char *name)
 {
   INDEX_ALIST *which = find_index (name);
 
@@ -373,8 +391,7 @@ translate_index (name)
 
 /* Return the index list which belongs to NAME. */
 INDEX_ELT *
-index_list (name)
-     char *name;
+index_list (char *name)
 {
   int which = translate_index (name);
   if (which < 0)
@@ -385,8 +402,7 @@ index_list (name)
 
 /* Define a new index command.  Arg is name of index. */
 static void
-gen_defindex (code)
-     int code;
+gen_defindex (int code)
 {
   char *name;
   get_rest_of_line (0, &name);
@@ -408,13 +424,13 @@ gen_defindex (code)
 }
 
 void
-cm_defindex ()
+cm_defindex (void)
 {
   gen_defindex (0);
 }
 
 void
-cm_defcodeindex ()
+cm_defcodeindex (void)
 {
   gen_defindex (1);
 }
@@ -423,7 +439,7 @@ cm_defcodeindex ()
    Make the first one be a synonym for the second one, i.e. make the
    first one have the same index as the second one. */
 void
-cm_synindex ()
+cm_synindex (void)
 {
   int source, target;
   char *abbrev1, *abbrev2;
@@ -441,8 +457,11 @@ cm_synindex ()
     }
   else
     {
-      name_index_alist[target]->write_index
-        = name_index_alist[source]->write_index;
+      if (xml && !docbook)
+        xml_synindex (abbrev1, abbrev2);
+      else
+        name_index_alist[target]->write_index
+          = name_index_alist[source]->write_index;
     }
 
   free (abbrev1);
@@ -450,53 +469,53 @@ cm_synindex ()
 }
 
 void
-cm_pindex ()                    /* Pinhead index. */
+cm_pindex (void)                    /* Pinhead index. */
 {
   index_add_arg ("pg");
 }
 
 void
-cm_vindex ()                    /* Variable index. */
+cm_vindex (void)                    /* Variable index. */
 {
   index_add_arg ("vr");
 }
 
 void
-cm_kindex ()                    /* Key index. */
+cm_kindex (void)                    /* Key index. */
 {
   index_add_arg ("ky");
 }
 
 void
-cm_cindex ()                    /* Concept index. */
+cm_cindex (void)                    /* Concept index. */
 {
   index_add_arg ("cp");
 }
 
 void
-cm_findex ()                    /* Function index. */
+cm_findex (void)                    /* Function index. */
 {
   index_add_arg ("fn");
 }
 
 void
-cm_tindex ()                    /* Data Type index. */
+cm_tindex (void)                    /* Data Type index. */
 {
   index_add_arg ("tp");
 }
 
 int
-index_element_compare (element1, element2)
-     INDEX_ELT **element1, **element2;
+index_element_compare (const void *element1, const void *element2)
 {
-  return index_compare_fn ((*element1)->entry, (*element2)->entry);
+  INDEX_ELT **elt1 = (INDEX_ELT **) element1;
+  INDEX_ELT **elt2 = (INDEX_ELT **) element2;
+
+  return index_compare_fn ((*elt1)->entry, (*elt2)->entry);
 }
 
 /* Force all index entries to be unique. */
-void
-make_index_entries_unique (array, count)
-     INDEX_ELT **array;
-     int count;
+static void
+make_index_entries_unique (INDEX_ELT **array, int count)
 {
   int i, j;
   INDEX_ELT **copy;
@@ -551,16 +570,15 @@ make_index_entries_unique (array, count)
   free (copy);
 }
 
-/* Sort the index passed in INDEX, returning an array of
-   pointers to elements.  The array is terminated with a NULL
-   pointer.  We call qsort because it's supposed to be fast.
-   I think this looks bad. */
-INDEX_ELT **
-sort_index (index)
-     INDEX_ELT *index;
+
+/* Sort the index passed in INDEX, returning an array of pointers to
+   elements.  The array is terminated with a NULL pointer.  */
+
+static INDEX_ELT **
+sort_index (INDEX_ELT *index)
 {
   INDEX_ELT **array;
-  INDEX_ELT *temp = index;
+  INDEX_ELT *temp;
   int count = 0;
   int save_line_number = line_number;
   char *save_input_filename = input_filename;
@@ -573,35 +591,36 @@ sort_index (index)
      characters @AE{} etc., to sort incorrectly.  */
   html = 0;
 
-  while (temp)
-    {
-      count++;
-      temp = temp->next;
-    }
-
-  /* We have the length.  Make an array. */
-
+  for (temp = index, count = 0; temp; temp = temp->next, count++)
+    ;
+  /* We have the length, now we can allocate an array. */
   array = xmalloc ((count + 1) * sizeof (INDEX_ELT *));
-  count = 0;
-  temp = index;
 
-  while (temp)
+  for (temp = index, count = 0; temp; temp = temp->next, count++)
     {
-      array[count++] = temp;
+      /* Allocate new memory for the return array, since parts of the
+         original INDEX get freed.  Otherwise, if the document calls
+         @printindex twice on the same index, with duplicate entries,
+         we'll have garbage the second time.  There are cleaner ways to
+         deal, but this will suffice for now.  */
+      array[count] = xmalloc (sizeof (INDEX_ELT));
+      *(array[count]) = *(temp);  /* struct assignment, hope it's ok */
+
+      /* Adjust next pointers to use the new memory.  */
+      if (count > 0)
+        array[count-1]->next = array[count];
 
       /* Set line number and input filename to the source line for this
          index entry, as this expansion finds any errors.  */
-      line_number = array[count - 1]->defining_line;
-      input_filename = array[count - 1]->defining_file;
+      line_number = array[count]->defining_line;
+      input_filename = array[count]->defining_file;
 
       /* If this particular entry should be printed as a "code" index,
-         then expand it as @code{entry}, i.e. as in fixed-width font.  */
-      array[count-1]->entry = expansion (temp->entry_text,
-				         array[count-1]->code);
-
-      temp = temp->next;
+         then expand it as @code{entry}, i.e., as in fixed-width font.  */
+      array[count]->entry = expansion (temp->entry_text, array[count]->code);
     }
   array[count] = NULL;    /* terminate the array. */
+
   line_number = save_line_number;
   input_filename = save_input_filename;
   html = save_html;
@@ -619,61 +638,126 @@ sort_index (index)
       if (lang_env && !STREQ (lang_env, "C") && !STREQ (lang_env, "POSIX"))
         index_compare_fn = strcoll;
     }
-#endif /* HAVE_STRCOLL */    
+#endif /* HAVE_STRCOLL */
 
   /* Sort the array. */
   qsort (array, count, sizeof (INDEX_ELT *), index_element_compare);
+
+  /* Remove duplicate entries.  */
   make_index_entries_unique (array, count);
+
+  /* Replace the original index with the sorted one, in case the
+     document wants to print it again.  If the index wasn't empty.  */
+  if (index)
+    *index = **array;
+
   return array;
 }
 
+static void
+insert_index_output_line_no (int line_number, int output_line_number_len)
+{
+  int last_column;
+  int str_size = output_line_number_len + strlen (_("(line )"))
+    + sizeof (NULL);
+  char *out_line_no_str = (char *) xmalloc (str_size + 1);
+
+  /* Do not translate ``(line NNN)'' below for !no_headers case (Info output),
+     because it's something like the ``* Menu'' strings.  For plaintext output
+     it should be translated though.  */
+  sprintf (out_line_no_str,
+      no_headers ? _("(line %*d)") : "(line %*d)",
+      output_line_number_len, line_number);
+
+  {
+    int i = output_paragraph_offset; 
+    while (0 < i && output_paragraph[i-1] != '\n')
+      i--;
+    last_column = output_paragraph_offset - i;
+  }
+
+  if (last_column + strlen (out_line_no_str) > fill_column)
+    {
+      insert ('\n');
+      last_column = 0;
+    }
+
+  while (last_column + strlen (out_line_no_str) < fill_column)
+    {
+      insert (' ');
+      last_column++;
+    }
+
+  insert_string (out_line_no_str);
+  insert ('\n');
+
+  free (out_line_no_str);
+}
+
 /* Nonzero means that we are in the middle of printing an index. */
 int printing_index = 0;
 
 /* Takes one arg, a short name of an index to print.
    Outputs a menu of the sorted elements of the index. */
 void
-cm_printindex ()
+cm_printindex (void)
 {
+  char *index_name;
+  get_rest_of_line (0, &index_name);
+
+  /* get_rest_of_line increments the line number by one,
+     so to make warnings/errors point to the correct line,
+     we decrement the line_number again.  */
+  if (!handling_delayed_writes)
+    line_number--;
+
   if (xml && !docbook)
     {
-      char *index_name;
-      get_rest_of_line (0, &index_name);
       xml_insert_element (PRINTINDEX, START);
       insert_string (index_name);
       xml_insert_element (PRINTINDEX, END);
     }
+  else if (!handling_delayed_writes)
+    {
+      int command_len = sizeof ("@ ") + strlen (command) + strlen (index_name);
+      char *index_command = xmalloc (command_len + 1);
+
+      close_paragraph ();
+      if (docbook)
+        xml_begin_index ();
+
+      sprintf (index_command, "@%s %s", command, index_name);
+      register_delayed_write (index_command);
+      free (index_command);
+    }
   else
     {
       int item;
       INDEX_ELT *index;
       INDEX_ELT *last_index = 0;
       INDEX_ELT **array;
-      char *index_name;
       unsigned line_length;
       char *line;
       int saved_inhibit_paragraph_indentation = inhibit_paragraph_indentation;
       int saved_filling_enabled = filling_enabled;
       int saved_line_number = line_number;
       char *saved_input_filename = input_filename;
-
-      close_paragraph ();
-      get_rest_of_line (0, &index_name);
+      unsigned output_line_number_len;
 
       index = index_list (index_name);
       if (index == (INDEX_ELT *)-1)
-	{
-	  line_error (_("Unknown index `%s' in @printindex"), index_name);
-	  free (index_name);
-	  return;
-	}
-      
+        {
+          line_error (_("Unknown index `%s' in @printindex"), index_name);
+          free (index_name);
+          return;
+        }
+
       /* Do this before sorting, so execute_string is in the good environment */
       if (xml && docbook)
-	xml_begin_index ();
-      
+        xml_begin_index ();
+
       /* Do this before sorting, so execute_string in index_element_compare
-	 will give the same results as when we actually print.  */
+         will give the same results as when we actually print.  */
       printing_index = 1;
       filling_enabled = 0;
       inhibit_paragraph_indentation = 1;
@@ -682,178 +766,199 @@ cm_printindex ()
       xml_sort_index = 0;
       close_paragraph ();
       if (html)
-	add_word ("<ul compact>");
+        add_html_block_elt_args ("<ul class=\"index-%s\" compact>",
+                                 index_name);
       else if (!no_headers && !docbook)
-	add_word ("* Menu:\n\n");
-      
+        { /* Info.  Add magic cookie for info readers (to treat this
+             menu differently), and the usual start-of-menu.  */
+          add_char ('\0');
+          add_word ("\010[index");
+          add_char ('\0');
+          add_word ("\010]\n");
+          add_word ("* Menu:\n\n");
+        }
+
       me_inhibit_expansion++;
-      
+
       /* This will probably be enough.  */
       line_length = 100;
       line = xmalloc (line_length);
-      
+
+      {
+        char *max_output_line_number = (char *) xmalloc (25 * sizeof (char));
+
+        if (no_headers)
+          sprintf (max_output_line_number, "%d", output_line_number);
+        else
+          {
+            INDEX_ELT *tmp_entry = index;
+            unsigned tmp = 0;
+            for (tmp_entry = index; tmp_entry; tmp_entry = tmp_entry->next)
+              tmp = tmp_entry->output_line > tmp ? tmp_entry->output_line : tmp;
+            sprintf (max_output_line_number, "%d", tmp);
+          }
+
+        output_line_number_len = strlen (max_output_line_number);
+        free (max_output_line_number);
+      }
+
       for (item = 0; (index = array[item]); item++)
-	{
-	  /* A pathological document might have an index entry outside of any
-	     node.  Don't crash; try using the section name instead.  */
-	  char *index_node = index->node;
-	  
-	  line_number = index->defining_line;
-	  input_filename = index->defining_file;
-	  
-	  if ((!index_node || !*index_node) && html)
-	    index_node = toc_find_section_of_node (index_node);
-	  
-	  if (!index_node || !*index_node)
-	    {
-	      line_error (_("Entry for index `%s' outside of any node"),
-			  index_name);
-	      if (html || !no_headers)
-		index_node = _("(outside of any node)");
-	    }
-	  
-	  if (html)
-	    /* fixme: html: we should use specific index anchors pointing
-           to the actual location of the indexed position (but then we
-           have to find something to wrap the anchor around). */
-	    {
-	      if (last_index
-		  && STREQ (last_index->entry_text, index->entry_text))
-		add_word (", ");  /* Don't repeat the previous entry. */
-	      else
-		{
-		  /* In the HTML case, the expanded index entry is not
-		     good for us, since it was expanded for non-HTML mode
-		     inside sort_index.  So we need to HTML-escape and
-		     expand the original entry text here.  */
-		  char *escaped_entry = xstrdup (index->entry_text);
-		  char *expanded_entry;
-		  
-		  /* expansion() doesn't HTML-escape the argument, so need
-		     to do it separately.  */
-		  escaped_entry = escape_string (escaped_entry);
-		  expanded_entry = expansion (escaped_entry, index->code);
-		  add_word_args ("\n<li>%s: ", expanded_entry);
-		  free (escaped_entry);
-		  free (expanded_entry);
-		}
-	      add_word ("<a href=\"");
-	      if (index->node && *index->node)
-		{
-		  /* Make sure any non-macros in the node name are expanded.  */
-		  in_fixed_width_font++;
-		  index_node = expansion (index_node, 0);
-		  in_fixed_width_font--;
-		  add_anchor_name (index_node, 1);
-		  add_word_args ("\">%s</a>", index_node);
-		  free (index_node);
-		}
-	      else if (STREQ (index_node, _("(outside of any node)")))
-		{
-		  add_anchor_name (index_node, 1);
-		  add_word_args ("\">%s</a>", index_node);
-		}
-	      else
-		/* If we use the section instead of the (missing) node, then
-		   index_node already includes all we need except the #.  */
-		add_word_args ("#%s</a>", index_node);
-	    }
-	  else if (xml && docbook)
-	    {
-	      xml_insert_indexentry (index->entry, index_node);
-	    }
-	  else
-	    {
-	      unsigned new_length = strlen (index->entry);
-	      
-	      if (new_length < 50) /* minimum length used below */
-		new_length = 50;
-	      new_length += strlen (index_node) + 7; /* * : .\n\0 */
-	      
-	      if (new_length > line_length)
-		{
-		  line_length = new_length;
-		  line = xrealloc (line, line_length);
-		}
-	      /* Print the entry, nicely formatted.  We've already
-		 expanded any commands in index->entry, including any
-		 implicit @code.  Thus, can't call execute_string, since
-		 @@ has turned into @. */
-	      if (!no_headers)
-		{
-		  sprintf (line, "* %-37s  ", index->entry);
-		  line[2 + strlen (index->entry)] = ':';
-		  insert_string (line);
-		  /* Make sure any non-macros in the node name are expanded.  */
-		  in_fixed_width_font++;
-		  execute_string ("%s.\n", index_node);
-		  in_fixed_width_font--;
-		}
-	      else
-		{
-		  /* With --no-headers, the @node lines are gone, so
-		     there's little sense in referring to them in the
-		     index.  Instead, output the number or name of the
-		     section that corresponds to that node.  */
-		  char *section_name = toc_find_section_of_node (index_node);
-		  
-		  sprintf (line, "%-*s ", number_sections ? 50 : 1, index->entry);
-		  line[strlen (index->entry)] = ':';
-		  insert_string (line);
-		  if (section_name)
-		    {
-		      int idx = 0;
-		      unsigned ref_len = strlen (section_name) + 30;
-		      
-		      if (ref_len > line_length)
-			{
-			  line_length = ref_len;
-			  line = xrealloc (line, line_length);
-			}
-		      
-		      if (number_sections)
-			{
-			  while (section_name[idx]
-				 && (isdigit (section_name[idx])
-				     || (idx && section_name[idx] == '.')))
-			    idx++;
-			}
-		      if (idx)
-			sprintf (line, " See %.*s.\n", idx, section_name);
-		      else
-			sprintf (line, "\n          See ``%s''.\n", section_name);
-		      insert_string (line);
-		    }
-		  else
-		    {
-		      insert_string (" "); /* force a blank */
-		      execute_string ("See node %s.\n", index_node);
-		    }
-		}
-	    }
-	  
-	  /* Prevent `output_paragraph' from growing to the size of the
-	     whole index.  */
-	  flush_output ();
-	  last_index = index;
-	}
+        {
+          /* A pathological document might have an index entry outside of any
+             node.  Don't crash; try using the section name instead.  */
+          char *index_node = index->node;
+
+          line_number = index->defining_line;
+          input_filename = index->defining_file;
+
+          if ((!index_node || !*index_node) && html)
+            index_node = toc_find_section_of_node (index_node);
+
+          if (!index_node || !*index_node)
+            {
+              line_error (_("Entry for index `%s' outside of any node"),
+                          index_name);
+              if (html || !no_headers)
+                index_node = (char *) _("(outside of any node)");
+            }
+
+          if (html)
+            {
+              /* For HTML, we need to expand and HTML-escape the
+                 original entry text, at the same time.  Consider
+                 @cindex J@"urgen.  We want J&uuml;urgen.  We can't
+                 expand and then escape since we'll end up with
+                 J&amp;uuml;rgen.  We can't escape and then expand
+                 because then `expansion' will see J@&quot;urgen, and
+                 @&quot;urgen is not a command.  */
+              char *html_entry =
+                maybe_escaped_expansion (index->entry_text, index->code, 1);
+
+              add_html_block_elt_args ("\n<li><a href=\"%s#index-",
+                  (splitting && index->output_file) ? index->output_file : "");
+              add_escaped_anchor_name (index->entry_text, 0);
+              add_word_args ("-%d\">%s</a>: ", index->entry_number,
+                  html_entry);
+              free (html_entry);
+
+              add_word ("<a href=\"");
+              if (index->node && *index->node)
+                {
+                  /* Ensure any non-macros in the node name are expanded.  */
+                  char *expanded_index;
+
+                  in_fixed_width_font++;
+                  expanded_index = expansion (index_node, 0);
+                  in_fixed_width_font--;
+                  add_anchor_name (expanded_index, 1);
+		  expanded_index = escape_string (expanded_index);
+                  add_word_args ("\">%s</a>", expanded_index);
+                  free (expanded_index);
+                }
+              else if (STREQ (index_node, _("(outside of any node)")))
+                {
+                  add_anchor_name (index_node, 1);
+                  add_word_args ("\">%s</a>", index_node);
+                }
+              else
+                /* If we use the section instead of the (missing) node, then
+                   index_node already includes all we need except the #.  */
+                add_word_args ("#%s</a>", index_node);
+
+              add_html_block_elt ("</li>");
+            }
+          else if (xml && docbook)
+            {
+              /* In the DocBook case, the expanded index entry is not
+                 good for us, since it was expanded for non-DocBook mode
+                 inside sort_index.  So we send the original entry text
+                 to be used with execute_string.  */
+              xml_insert_indexentry (index->entry_text, index_node);
+            }
+          else
+            {
+              unsigned new_length = strlen (index->entry);
+
+              if (new_length < 50) /* minimum length used below */
+                new_length = 50;
+              new_length += strlen (index_node) + 7; /* * : .\n\0 */
+
+              if (new_length > line_length)
+                {
+                  line_length = new_length;
+                  line = xrealloc (line, line_length);
+                }
+              /* Print the entry, nicely formatted.  We've already
+                 expanded any commands in index->entry, including any
+                 implicit @code.  Thus, can't call execute_string, since
+                 @@ has turned into @. */
+              if (!no_headers)
+                {
+                  sprintf (line, "* %-37s  ", index->entry);
+                  line[2 + strlen (index->entry)] = ':';
+                  insert_string (line);
+                  /* Make sure any non-macros in the node name are expanded.  */
+                  in_fixed_width_font++;
+                  execute_string ("%s. ", index_node);
+                  insert_index_output_line_no (index->output_line,
+                      output_line_number_len);
+                  in_fixed_width_font--;
+                }
+              else
+                {
+                  /* With --no-headers, the @node lines are gone, so
+                     there's little sense in referring to them in the
+                     index.  Instead, output the number or name of the
+                     section that corresponds to that node.  */
+                  sprintf (line, "%-*s ", number_sections ? 46 : 1, index->entry);
+                  line[strlen (index->entry)] = ':';
+                  insert_string (line);
+
+                  if (strlen (index->section) > 0)
+                    { /* We got your number.  */
+                      insert_string ((char *) _("See "));
+                      insert_string (index->section);
+                    }
+                  else
+                    { /* Sigh, index in an @unnumbered. :-\  */
+                      insert_string ("\n          ");
+                      insert_string ((char *) _("See "));
+                      insert_string ("``");
+                      insert_string (expansion (index->section_name, 0));
+                      insert_string ("''");
+                    }
+
+                  insert_string (". ");
+                  insert_index_output_line_no (index->output_line,
+                      output_line_number_len);
+                }
+            }
+
+          /* Prevent `output_paragraph' from growing to the size of the
+             whole index.  */
+          flush_output ();
+          last_index = index;
+        }
 
       free (line);
-      free (index_name);
-      
+
       me_inhibit_expansion--;
-      
       printing_index = 0;
-      free (array);
+
       close_single_paragraph ();
       filling_enabled = saved_filling_enabled;
       inhibit_paragraph_indentation = saved_inhibit_paragraph_indentation;
       input_filename = saved_input_filename;
       line_number = saved_line_number;
-      
+
       if (html)
-	add_word ("</ul>");
+        add_html_block_elt ("</ul>");
       else if (xml && docbook)
-	xml_end_index ();
+        xml_end_index ();
     }
+
+  free (index_name);
+  /* Re-increment the line number, because get_rest_of_line
+     left us looking at the next line after the command.  */
+  line_number++;
 }
diff --git a/gnu/usr.bin/texinfo/makeinfo/index.h b/gnu/usr.bin/texinfo/makeinfo/index.h
index 0d155125310..a37e1ec5a51 100644
--- a/gnu/usr.bin/texinfo/makeinfo/index.h
+++ b/gnu/usr.bin/texinfo/makeinfo/index.h
@@ -1,5 +1,5 @@
 /* index.h -- declarations for index.c.
-   $Id: index.h,v 1.1.1.1 2000/02/09 01:25:16 espie Exp $
+   $Id: index.h,v 1.1.1.2 2006/07/17 16:03:46 espie Exp $
 
    Copyright (C) 1998, 99 Free Software Foundation, Inc.
 
@@ -27,10 +27,67 @@
 extern COMMAND **user_command_array;
 extern int user_command_array_len;
 
+/* An index element... */
+typedef struct index_elt
+{
+  struct index_elt *next;
+  char *entry;                  /* The index entry itself, after expansion. */
+  char *entry_text;             /* The original, non-expanded entry text. */
+  char *node;                   /* The node from whence it came. */
+  char *section;                /* Current section number we are in, */
+  char *section_name;           /* ... and its title.  */
+  int code;                     /* Nonzero means add `@code{...}' when
+                                   printing this element. */
+  int defining_line;            /* Line number where this entry was written. */
+  int output_line;              /* And line number where it is in the output. */
+  char *defining_file;          /* Source file for defining_line. */
+  char *output_file;            /* Output file for output_line. */
+  int entry_number;             /* Entry number.  */
+} INDEX_ELT;
+
+
+/* A list of short-names for each index.
+   There are two indices into the the_indices array.
+   * read_index is the index that points to the list of index
+     entries that we will find if we ask for the list of entries for
+     this name.
+   * write_index is the index that points to the list of index entries
+     that we will add new entries to.
+
+   Initially, read_index and write_index are the same, but the
+   @syncodeindex and @synindex commands can change the list we add
+   entries to.
+
+   For example, after the commands
+     @cindex foo
+     @defindex ii
+     @synindex cp ii
+     @cindex bar
+
+   the cp index will contain the entry `foo', and the new ii
+   index will contain the entry `bar'.  This is consistent with the
+   way texinfo.tex handles the same situation.
+
+   In addition, for each index, it is remembered whether that index is
+   a code index or not.  Code indices have @code{} inserted around the
+   first word when they are printed with printindex. */
+typedef struct
+{
+  char *name;
+  int read_index;   /* index entries for `name' */
+  int write_index;  /* store index entries here, @synindex can change it */
+  int code;
+} INDEX_ALIST;
+
+extern INDEX_ALIST **name_index_alist;
+
 /* Initialize all indices.  */
-extern void init_indices ();
+extern void init_indices (void);
+
+extern int defined_indices;
+extern int printing_index;
+extern int index_counter;
 
-/* Function to compare index entries for sorting.  */
-extern int (*index_compare_fn) ();
+INDEX_ELT *index_list (char *name);
 
 #endif /* !INDEX_H */
diff --git a/gnu/usr.bin/texinfo/makeinfo/insertion.h b/gnu/usr.bin/texinfo/makeinfo/insertion.h
index 3c83ed6f2b3..53c8f6d8845 100644
--- a/gnu/usr.bin/texinfo/makeinfo/insertion.h
+++ b/gnu/usr.bin/texinfo/makeinfo/insertion.h
@@ -1,7 +1,7 @@
 /* insertion.h -- declarations for insertion.c.
-   $Id: insertion.h,v 1.1.1.2 2002/06/10 13:21:17 espie Exp $
+   $Id: insertion.h,v 1.1.1.3 2006/07/17 16:03:47 espie Exp $
 
-   Copyright (C) 1998, 99, 2001, 02 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2001, 2002, 2003 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
@@ -24,14 +24,15 @@
 enum insertion_type
 { 
   cartouche, copying, defcv, deffn, defivar, defmac, defmethod, defop,
-  defopt, defspec, deftp, deftypefn, deftypefun, deftypeivar,
+  defopt, defspec, deftp, deftypecv, deftypefn, deftypefun, deftypeivar,
   deftypemethod, deftypeop, deftypevar, deftypevr, defun, defvar, defvr,
   detailmenu, direntry, display, documentdescription, enumerate,
-  example, flushleft, flushright, format, ftable, group, ifclear,
-  ifhtml, ifinfo, ifnothtml, ifnotinfo, ifnotplaintext, ifnottex,
-  ifplaintext, ifset, iftex, itemize, lisp, menu, multitable, quotation,
-  rawhtml, rawtex, smalldisplay, smallexample, smallformat, smalllisp,
-  verbatim, table, tex, vtable, bad_type
+  example, floatenv, flushleft, flushright, format, ftable, group,
+  ifclear, ifdocbook, ifhtml, ifinfo, ifnotdocbook, ifnothtml, ifnotinfo,
+  ifnotplaintext, ifnottex, ifnotxml, ifplaintext, ifset, iftex, ifxml,
+  itemize, lisp, menu, multitable, quotation, rawdocbook, rawhtml, rawtex,
+  rawxml, smalldisplay, smallexample, smallformat, smalllisp, verbatim,
+  table, tex, vtable, titlepage, bad_type
 };
 
 typedef struct istack_elt
@@ -42,12 +43,11 @@ typedef struct istack_elt
   int line_number;
   int filling_enabled;
   int indented_fill;
-  enum insertion_type insertion;
+  int insertion;
   int inhibited;
   int in_fixed_width_font;
 } INSERTION_ELT;
 
-
 extern int insertion_level;
 extern INSERTION_ELT *insertion_stack;
 extern int in_menu;
@@ -55,9 +55,24 @@ extern int in_detailmenu;
 extern int had_menu_commentary;
 extern int in_paragraph;
 
-extern void command_name_condition ();
-extern void cm_ifhtml (), cm_ifnothtml(), cm_html ();
-extern void cm_ifinfo (), cm_ifnotinfo ();
-extern void cm_ifplaintext (), cm_ifnotplaintext();
-extern void cm_iftex (), cm_ifnottex (), cm_tex ();
+extern int headitem_flag;
+extern int after_headitem;
+
+extern void init_insertion_stack (void);
+extern void command_name_condition (void);
+extern void cm_ifdocbook (void), cm_ifnotdocbook(void), cm_docbook (int arg);
+extern void cm_ifhtml (void), cm_ifnothtml(void), cm_html (int arg);
+extern void cm_ifinfo (void), cm_ifnotinfo (void);
+extern void cm_ifplaintext (void), cm_ifnotplaintext(void);
+extern void cm_iftex (void), cm_ifnottex (void), cm_tex (void);
+extern void cm_ifxml (void), cm_ifnotxml (void), cm_xml (int arg);
+extern void handle_verbatim_environment (int find_end_verbatim);
+extern void begin_insertion (enum insertion_type type);
+extern void pop_insertion (void);
+extern void discard_insertions (int specials_ok);
+
+extern int is_in_insertion_of_type (int type);
+extern int command_needs_braces (char *cmd);
+
+extern enum insertion_type find_type_from_name (char *name);
 #endif /* !INSERTION_H */
diff --git a/gnu/usr.bin/texinfo/makeinfo/lang.c b/gnu/usr.bin/texinfo/makeinfo/lang.c
index 53e570157e7..146804e5949 100644
--- a/gnu/usr.bin/texinfo/makeinfo/lang.c
+++ b/gnu/usr.bin/texinfo/makeinfo/lang.c
@@ -1,7 +1,8 @@
 /* lang.c -- language-dependent support.
-   $Id: lang.c,v 1.1.1.2 2002/06/10 13:21:17 espie Exp $
+   $Id: lang.c,v 1.1.1.3 2006/07/17 16:03:47 espie Exp $
 
-   Copyright (C) 1999, 2000, 01 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 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
@@ -21,6 +22,7 @@
 
 #include "system.h"
 #include "cmds.h"
+#include "files.h"
 #include "lang.h"
 #include "makeinfo.h"
 #include "xml.h"
@@ -31,10 +33,15 @@ encoding_code_type document_encoding_code = no_encoding;
 /* Current language code; default is English.  */
 language_code_type language_code = en;
 
+/* By default, unsupported encoding is an empty string.  */
+char *unknown_encoding = NULL;
+
+static iso_map_type us_ascii_map [] = {{NULL, 0, 0}}; /* ASCII map is trivial */
+
 /* Translation table between HTML and ISO Codes.  The last item is
    hopefully the Unicode. It might be possible that those Unicodes are
    not correct, cause I didn't check them. kama */
-iso_map_type iso8859_1_map [] = {
+static iso_map_type iso8859_1_map [] = {
   { "nbsp",   0xA0, 0x00A0 },
   { "iexcl",  0xA1, 0x00A1 },
   { "cent",   0xA2, 0x00A2 },
@@ -84,7 +91,7 @@ iso_map_type iso8859_1_map [] = {
   { "Iacute", 0xCD, 0x00CD },
   { "Icirc",  0xCE, 0x00CE },
   { "Iuml",   0xCF, 0x00CF },
-  { "ETH",    0xD0, 0x00D0 },  /* I don't know ;-( */
+  { "ETH",    0xD0, 0x00D0 },
   { "Ntilde", 0xD1, 0x00D1 },
   { "Ograve", 0xD2, 0x00D2 },
   { "Oacute", 0xD3, 0x00D3 },
@@ -131,31 +138,270 @@ iso_map_type iso8859_1_map [] = {
   { "uuml",   0xFC, 0x00FC },
   { "yacute", 0xFD, 0x00FD },
   { "thorn",  0xFE, 0x00FE },
-  { "yuml",   0xFF, 0x00FF }
+  { "yuml",   0xFF, 0x00FF },
+  { NULL, 0, 0 }
 };
 
-/* This might be put into structure below and NOT coded via define,
-   because some translation tables could contain different numbers of
-   characters, but for now it suffices.  */
-#define ISO_MAP_SIZE (sizeof (iso8859_1_map) / sizeof (iso8859_1_map[0]))
+
+/* ISO 8859-15, also known as Latin 9, differs from Latin 1 in only a
+   few positions.  http://www.cs.tut.fi/~jkorpela/latin9.html has a good
+   explanation and listing, summarized here.  The names are abbreviated
+   from the official Unicode names, to fit in a decent line length.
+
+  code position
+  dec	oct   hex   latin1 latin1 name	      latin9 latin9 name
+
+  164  0244  0xA4   U+00A4 currency symbol    U+20AC euro sign
+  166  0246  0xA6   U+00A6 broken bar	      U+0160 S with caron
+  168  0250  0xA8   U+00A8 diaeresis	      U+0161 s with caron
+  180  0264  0xB4   U+00B4 acute accent	      U+017D Z with caron
+  184  0270  0xB8   U+00B8 cedilla	      U+017E z with caron
+  188  0274  0xBC   U+00BC fraction 1/4	      U+0152 ligature OE
+  189  0275  0xBD   U+00BD fraction 1/2	      U+0153 ligature oe
+  190  0276  0xBE   U+00BE fraction 3/4	      U+0178 Y with diaeresis
+*/
+
+static iso_map_type iso8859_15_map [] = {
+  { "nbsp",   0xA0, 0x00A0 },
+  { "iexcl",  0xA1, 0x00A1 },
+  { "cent",   0xA2, 0x00A2 },
+  { "pound",  0xA3, 0x00A3 },
+  { "euro",   0xA4, 0x20AC },
+  { "yen",    0xA5, 0x00A5 },
+  { "Scaron", 0xA6, 0x0160 },
+  { "sect",   0xA7, 0x00A7 },
+  { "scaron", 0xA8, 0x0161 },
+  { "copy",   0xA9, 0x00A9 },
+  { "ordf",   0xAA, 0x00AA },
+  { "laquo",  0xAB, 0x00AB },
+  { "not",    0xAC, 0x00AC },
+  { "shy",    0xAD, 0x00AD },
+  { "reg",    0xAE, 0x00AE },
+  { "hibar",  0xAF, 0x00AF },
+  { "deg",    0xB0, 0x00B0 },
+  { "plusmn", 0xB1, 0x00B1 },
+  { "sup2",   0xB2, 0x00B2 },
+  { "sup3",   0xB3, 0x00B3 },
+  { "Zcaron", 0xB4, 0x017D },
+  { "micro",  0xB5, 0x00B5 },
+  { "para",   0xB6, 0x00B6 },
+  { "middot", 0xB7, 0x00B7 },
+  { "zcaron", 0xB8, 0x017E },
+  { "sup1",   0xB9, 0x00B9 },
+  { "ordm",   0xBA, 0x00BA },
+  { "raquo",  0xBB, 0x00BB },
+  { "OElig",  0xBC, 0x0152 },
+  { "oelig",  0xBD, 0x0153 },
+  { "Yuml",   0xBE, 0x0178 },
+  { "iquest", 0xBF, 0x00BF },
+  { "Agrave", 0xC0, 0x00C0 },
+  { "Aacute", 0xC1, 0x00C1 },
+  { "Acirc",  0xC2, 0x00C2 },
+  { "Atilde", 0xC3, 0x00C3 },
+  { "Auml",   0xC4, 0x00C4 },
+  { "Aring",  0xC5, 0x00C5 },
+  { "AElig",  0xC6, 0x00C6 },
+  { "Ccedil", 0xC7, 0x00C7 },
+  { "Ccedil", 0xC7, 0x00C7 },
+  { "Egrave", 0xC8, 0x00C8 },
+  { "Eacute", 0xC9, 0x00C9 },
+  { "Ecirc",  0xCA, 0x00CA },
+  { "Euml",   0xCB, 0x00CB },
+  { "Igrave", 0xCC, 0x00CC },
+  { "Iacute", 0xCD, 0x00CD },
+  { "Icirc",  0xCE, 0x00CE },
+  { "Iuml",   0xCF, 0x00CF },
+  { "ETH",    0xD0, 0x00D0 },
+  { "Ntilde", 0xD1, 0x00D1 },
+  { "Ograve", 0xD2, 0x00D2 },
+  { "Oacute", 0xD3, 0x00D3 },
+  { "Ocirc",  0xD4, 0x00D4 },
+  { "Otilde", 0xD5, 0x00D5 },
+  { "Ouml",   0xD6, 0x00D6 },
+  { "times",  0xD7, 0x00D7 },
+  { "Oslash", 0xD8, 0x00D8 },
+  { "Ugrave", 0xD9, 0x00D9 },
+  { "Uacute", 0xDA, 0x00DA },
+  { "Ucirc",  0xDB, 0x00DB },
+  { "Uuml",   0xDC, 0x00DC },
+  { "Yacute", 0xDD, 0x00DD },
+  { "THORN",  0xDE, 0x00DE },
+  { "szlig",  0xDF, 0x00DF },
+  { "agrave", 0xE0, 0x00E0 },
+  { "aacute", 0xE1, 0x00E1 },
+  { "acirc",  0xE2, 0x00E2 },
+  { "atilde", 0xE3, 0x00E3 },
+  { "auml",   0xE4, 0x00E4 },
+  { "aring",  0xE5, 0x00E5 },
+  { "aelig",  0xE6, 0x00E6 },
+  { "ccedil", 0xE7, 0x00E7 },
+  { "egrave", 0xE8, 0x00E8 },
+  { "eacute", 0xE9, 0x00E9 },
+  { "ecirc",  0xEA, 0x00EA },
+  { "euml",   0xEB, 0x00EB },
+  { "igrave", 0xEC, 0x00EC },
+  { "iacute", 0xED, 0x00ED },
+  { "icirc",  0xEE, 0x00EE },
+  { "iuml",   0xEF, 0x00EF },
+  { "eth",    0xF0, 0x00F0 },
+  { "ntilde", 0xF1, 0x00F1 },
+  { "ograve", 0xF2, 0x00F2 },
+  { "oacute", 0xF3, 0x00F3 },
+  { "ocirc",  0xF4, 0x00F4 },
+  { "otilde", 0xF5, 0x00F5 },
+  { "ouml",   0xF6, 0x00F6 },
+  { "divide", 0xF7, 0x00F7 },
+  { "oslash", 0xF8, 0x00F8 },
+  { "ugrave", 0xF9, 0x00F9 },
+  { "uacute", 0xFA, 0x00FA },
+  { "ucirc",  0xFB, 0x00FB },
+  { "uuml",   0xFC, 0x00FC },
+  { "yacute", 0xFD, 0x00FD },
+  { "thorn",  0xFE, 0x00FE },
+  { "yuml",   0xFF, 0x00FF },
+  { NULL, 0, 0 }
+};
+
+
+
+/* Date: Mon, 31 Mar 2003 00:19:28 +0200
+   From: Wojciech Polak <polak@gnu.org>
+...
+ * Primary Polish site for ogonki is http://www.agh.edu.pl/ogonki/,
+   but it's only in Polish language (it has some interesting links).
+
+ * A general site about ISO 8859-2 at http://nl.ijs.si/gnusl/cee/iso8859-2.html
+
+ * ISO 8859-2 Character Set at http://nl.ijs.si/gnusl/cee/charset.html
+   This site provides almost all information about iso-8859-2,
+   including the character table!!! (must see!)
+
+ * ISO 8859-2 and even HTML entities !!! (must see!)
+   http://people.ssh.fi/mtr/genscript/88592.txt
+
+ * (minor) http://www.agh.edu.pl/ogonki/plchars.html
+   One more table, this time it includes even information about Polish
+   characters in Unicode.
+*/
+
+static iso_map_type iso8859_2_map [] = {
+  { "nbsp",	0xA0, 0x00A0 }, /* NO-BREAK SPACE */
+  { "",	0xA1, 0x0104 }, /* LATIN CAPITAL LETTER A WITH OGONEK */
+  { "",	0xA2, 0x02D8 }, /* BREVE */
+  { "",	0xA3, 0x0141 }, /* LATIN CAPITAL LETTER L WITH STROKE */
+  { "curren",	0xA4, 0x00A4 }, /* CURRENCY SIGN */
+  { "",	0xA5, 0x013D }, /* LATIN CAPITAL LETTER L WITH CARON */
+  { "",	0xA6, 0x015A }, /* LATIN CAPITAL LETTER S WITH ACUTE */
+  { "sect",	0xA7, 0x00A7 }, /* SECTION SIGN */
+  { "uml",	0xA8, 0x00A8 }, /* DIAERESIS */
+  { "",	0xA9, 0x0160 }, /* LATIN CAPITAL LETTER S WITH CARON */
+  { "",	0xAA, 0x015E }, /* LATIN CAPITAL LETTER S WITH CEDILLA */
+  { "",	0xAB, 0x0164 }, /* LATIN CAPITAL LETTER T WITH CARON */
+  { "",	0xAC, 0x0179 }, /* LATIN CAPITAL LETTER Z WITH ACUTE */
+  { "shy",	0xAD, 0x00AD }, /* SOFT HYPHEN */
+  { "",	0xAE, 0x017D }, /* LATIN CAPITAL LETTER Z WITH CARON */
+  { "",	0xAF, 0x017B }, /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */
+  { "deg",	0xB0, 0x00B0 }, /* DEGREE SIGN */
+  { "",	0xB1, 0x0105 }, /* LATIN SMALL LETTER A WITH OGONEK */
+  { "",	0xB2, 0x02DB }, /* OGONEK */
+  { "",	0xB3, 0x0142 }, /* LATIN SMALL LETTER L WITH STROKE */
+  { "acute",	0xB4, 0x00B4 }, /* ACUTE ACCENT */
+  { "",	0xB5, 0x013E }, /* LATIN SMALL LETTER L WITH CARON */
+  { "",	0xB6, 0x015B }, /* LATIN SMALL LETTER S WITH ACUTE */
+  { "",	0xB7, 0x02C7 }, /* CARON (Mandarin Chinese third tone) */
+  { "cedil",	0xB8, 0x00B8 }, /* CEDILLA */
+  { "",	0xB9, 0x0161 }, /* LATIN SMALL LETTER S WITH CARON */
+  { "",	0xBA, 0x015F }, /* LATIN SMALL LETTER S WITH CEDILLA */
+  { "",	0xBB, 0x0165 }, /* LATIN SMALL LETTER T WITH CARON */
+  { "",	0xBC, 0x017A }, /* LATIN SMALL LETTER Z WITH ACUTE */
+  { "",	0xBD, 0x02DD }, /* DOUBLE ACUTE ACCENT */
+  { "",	0xBE, 0x017E }, /* LATIN SMALL LETTER Z WITH CARON */
+  { "",	0xBF, 0x017C }, /* LATIN SMALL LETTER Z WITH DOT ABOVE */
+  { "",	0xC0, 0x0154 }, /* LATIN CAPITAL LETTER R WITH ACUTE */
+  { "",	0xC1, 0x00C1 }, /* LATIN CAPITAL LETTER A WITH ACUTE */
+  { "",	0xC2, 0x00C2 }, /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
+  { "",	0xC3, 0x0102 }, /* LATIN CAPITAL LETTER A WITH BREVE */
+  { "",	0xC4, 0x00C4 }, /* LATIN CAPITAL LETTER A WITH DIAERESIS */
+  { "",	0xC5, 0x0139 }, /* LATIN CAPITAL LETTER L WITH ACUTE */
+  { "",	0xC6, 0x0106 }, /* LATIN CAPITAL LETTER C WITH ACUTE */
+  { "",	0xC7, 0x00C7 }, /* LATIN CAPITAL LETTER C WITH CEDILLA */
+  { "",	0xC8, 0x010C }, /* LATIN CAPITAL LETTER C WITH CARON */
+  { "",	0xC9, 0x00C9 }, /* LATIN CAPITAL LETTER E WITH ACUTE */
+  { "",	0xCA, 0x0118 }, /* LATIN CAPITAL LETTER E WITH OGONEK */
+  { "",	0xCB, 0x00CB }, /* LATIN CAPITAL LETTER E WITH DIAERESIS */
+  { "",	0xCC, 0x011A }, /* LATIN CAPITAL LETTER E WITH CARON */
+  { "",	0xCD, 0x00CD }, /* LATIN CAPITAL LETTER I WITH ACUTE */
+  { "",	0xCE, 0x00CE }, /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
+  { "",	0xCF, 0x010E }, /* LATIN CAPITAL LETTER D WITH CARON */
+  { "",	0xD0, 0x0110 }, /* LATIN CAPITAL LETTER D WITH STROKE */
+  { "",	0xD1, 0x0143 }, /* LATIN CAPITAL LETTER N WITH ACUTE */
+  { "",	0xD2, 0x0147 }, /* LATIN CAPITAL LETTER N WITH CARON */
+  { "",	0xD3, 0x00D3 }, /* LATIN CAPITAL LETTER O WITH ACUTE */
+  { "",	0xD4, 0x00D4 }, /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
+  { "",	0xD5, 0x0150 }, /* LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */
+  { "",	0xD6, 0x00D6 }, /* LATIN CAPITAL LETTER O WITH DIAERESIS */
+  { "times",	0xD7, 0x00D7 }, /* MULTIPLICATION SIGN */
+  { "",	0xD8, 0x0158 }, /* LATIN CAPITAL LETTER R WITH CARON */
+  { "",	0xD9, 0x016E }, /* LATIN CAPITAL LETTER U WITH RING ABOVE */
+  { "",	0xDA, 0x00DA }, /* LATIN CAPITAL LETTER U WITH ACUTE */
+  { "",	0xDB, 0x0170 }, /* LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */
+  { "",	0xDC, 0x00DC }, /* LATIN CAPITAL LETTER U WITH DIAERESIS */
+  { "",	0xDD, 0x00DD }, /* LATIN CAPITAL LETTER Y WITH ACUTE */
+  { "",	0xDE, 0x0162 }, /* LATIN CAPITAL LETTER T WITH CEDILLA */
+  { "",	0xDF, 0x00DF }, /* LATIN SMALL LETTER SHARP S (German) */
+  { "",	0xE0, 0x0155 }, /* LATIN SMALL LETTER R WITH ACUTE */
+  { "",	0xE1, 0x00E1 }, /* LATIN SMALL LETTER A WITH ACUTE */
+  { "",	0xE2, 0x00E2 }, /* LATIN SMALL LETTER A WITH CIRCUMFLEX */
+  { "",	0xE3, 0x0103 }, /* LATIN SMALL LETTER A WITH BREVE */
+  { "",	0xE4, 0x00E4 }, /* LATIN SMALL LETTER A WITH DIAERESIS */
+  { "",	0xE5, 0x013A }, /* LATIN SMALL LETTER L WITH ACUTE */
+  { "",	0xE6, 0x0107 }, /* LATIN SMALL LETTER C WITH ACUTE */
+  { "",	0xE7, 0x00E7 }, /* LATIN SMALL LETTER C WITH CEDILLA */
+  { "",	0xE8, 0x010D }, /* LATIN SMALL LETTER C WITH CARON */
+  { "",	0xE9, 0x00E9 }, /* LATIN SMALL LETTER E WITH ACUTE */
+  { "",	0xEA, 0x0119 }, /* LATIN SMALL LETTER E WITH OGONEK */
+  { "",	0xEB, 0x00EB }, /* LATIN SMALL LETTER E WITH DIAERESIS */
+  { "",	0xEC, 0x011B }, /* LATIN SMALL LETTER E WITH CARON */
+  { "",	0xED, 0x00ED }, /* LATIN SMALL LETTER I WITH ACUTE */
+  { "",	0xEE, 0x00EE }, /* LATIN SMALL LETTER I WITH CIRCUMFLEX */
+  { "",	0xEF, 0x010F }, /* LATIN SMALL LETTER D WITH CARON */
+  { "",	0xF0, 0x0111 }, /* LATIN SMALL LETTER D WITH STROKE */
+  { "",	0xF1, 0x0144 }, /* LATIN SMALL LETTER N WITH ACUTE */
+  { "",	0xF2, 0x0148 }, /* LATIN SMALL LETTER N WITH CARON */
+  { "",	0xF3, 0x00F3 }, /* LATIN SMALL LETTER O WITH ACUTE */
+  { "",	0xF4, 0x00F4 }, /* LATIN SMALL LETTER O WITH CIRCUMFLEX */
+  { "",	0xF5, 0x0151 }, /* LATIN SMALL LETTER O WITH DOUBLE ACUTE */
+  { "",	0xF6, 0x00F6 }, /* LATIN SMALL LETTER O WITH DIAERESIS */
+  { "divide",	0xF7, 0x00F7 }, /* DIVISION SIGN */
+  { "",	0xF8, 0x0159 }, /* LATIN SMALL LETTER R WITH CARON */
+  { "",	0xF9, 0x016F }, /* LATIN SMALL LETTER U WITH RING ABOVE */
+  { "",	0xFA, 0x00FA }, /* LATIN SMALL LETTER U WITH ACUTE */
+  { "",	0xFB, 0x0171 }, /* LATIN SMALL LETTER U WITH DOUBLE ACUTE */
+  { "",	0xFC, 0x00FC }, /* LATIN SMALL LETTER U WITH DIAERESIS */
+  { "",	0xFD, 0x00FD }, /* LATIN SMALL LETTER Y WITH ACUTE */
+  { "",	0xFE, 0x0163 }, /* LATIN SMALL LETTER T WITH CEDILLA */
+  { "",	0xFF, 0x02D9 }, /* DOT ABOVE (Mandarin Chinese light tone) */
+  { NULL, 0, 0 }
+};
 
 encoding_type encoding_table[] = {
   { no_encoding, "(no encoding)", NULL },
-  { ISO_8859_1,  "ISO-8859-1",  (iso_map_type *) iso8859_1_map },
-  { ISO_8859_2,  "ISO-8859-2",  NULL },
-  { ISO_8859_3,  "ISO-8859-3",  NULL },
-  { ISO_8859_4,  "ISO-8859-4",  NULL },
-  { ISO_8859_5,  "ISO-8859-5",  NULL },
-  { ISO_8859_6,  "ISO-8859-6",  NULL },
-  { ISO_8859_7,  "ISO-8859-7",  NULL },
-  { ISO_8859_8,  "ISO-8859-8",  NULL },
-  { ISO_8859_9,  "ISO-8859-9",  NULL },
-  { ISO_8859_10, "ISO-8859-10", NULL },
-  { ISO_8859_11, "ISO-8859-11", NULL },
-  { ISO_8859_12, "ISO-8859-12", NULL },
-  { ISO_8859_13, "ISO-8859-13", NULL },
-  { ISO_8859_14, "ISO-8859-14", NULL },
-  { ISO_8859_15, "ISO-8859-15", NULL },
+  { US_ASCII,    "US-ASCII",    us_ascii_map },
+  { ISO_8859_1,  "iso-8859-1",  (iso_map_type *) iso8859_1_map },
+  { ISO_8859_2,  "iso-8859-2",  (iso_map_type *) iso8859_2_map },
+  { ISO_8859_3,  "iso-8859-3",  NULL },
+  { ISO_8859_4,  "iso-8859-4",  NULL },
+  { ISO_8859_5,  "iso-8859-5",  NULL },
+  { ISO_8859_6,  "iso-8859-6",  NULL },
+  { ISO_8859_7,  "iso-8859-7",  NULL },
+  { ISO_8859_8,  "iso-8859-8",  NULL },
+  { ISO_8859_9,  "iso-8859-9",  NULL },
+  { ISO_8859_10, "iso-8859-10", NULL },
+  { ISO_8859_11, "iso-8859-11", NULL },
+  { ISO_8859_12, "iso-8859-12", NULL },
+  { ISO_8859_13, "iso-8859-13", NULL },
+  { ISO_8859_14, "iso-8859-14", NULL },
+  { ISO_8859_15, "iso-8859-15", (iso_map_type *) iso8859_15_map },
   { last_encoding_code, NULL, NULL }
 };
 
@@ -302,16 +548,19 @@ language_type language_table[] = {
   { zu, "zu", "Zulu" },
   { last_language_code, NULL, NULL }
 };
-
-
 
 /* @documentlanguage.  Maybe we'll do something useful with this in the
    future.  For now, we just recognize it.  */
+
+/* XML documents can make use of this data.  Unfortunately, it clashes with
+   the structure currently used.  So instead of enclosing content into
+   a language block, we just output an empty element.  Anyways, a stream based
+   parser can make good use of it.  */
 void
-cm_documentlanguage ()
+cm_documentlanguage (void)
 {
   language_code_type c;
-  char *lang_arg;  
+  char *lang_arg;
 
   /* Read the line with the language code on it.  */
   get_rest_of_line (0, &lang_arg);
@@ -330,6 +579,12 @@ cm_documentlanguage ()
   if (c == last_language_code)
     warning (_("%s is not a valid ISO 639 language code"), lang_arg);
 
+  if (xml && !docbook)
+    {
+      xml_insert_element_with_attribute (DOCUMENTLANGUAGE, START, "xml:lang=\"%s\"", lang_arg);
+      xml_insert_element (DOCUMENTLANGUAGE, END);
+    }
+
   free (lang_arg);
 }
 
@@ -339,8 +594,7 @@ cm_documentlanguage ()
    its equivalent.  */
 
 static int
-cm_search_iso_map (html)
-      char *html;
+cm_search_iso_map (char *html)
 {
   int i;
   iso_map_type *iso = encoding_table[document_encoding_code].isotab;
@@ -349,7 +603,7 @@ cm_search_iso_map (html)
   if (!iso)
     return -1;
 
-  for (i = 0; i < ISO_MAP_SIZE; i++)
+  for (i = 0; iso[i].html; i++)
     {
       if (strcmp (html, iso[i].html) == 0)
         return i;
@@ -362,46 +616,93 @@ cm_search_iso_map (html)
 /* @documentencoding.  Set the translation table.  */
 
 void
-cm_documentencoding ()
+cm_documentencoding (void)
 {
-  encoding_code_type enc;
-  char *enc_arg;
-  
-  get_rest_of_line (1, &enc_arg);
-
-  /* See if we have this encoding.  */
-  for (enc = ISO_8859_1; enc != last_encoding_code; enc++)
+  if (!handling_delayed_writes)
     {
-      if (strcasecmp (enc_arg, encoding_table[enc].ecname) == 0)
+      encoding_code_type enc;
+      char *enc_arg;
+
+      /* This is ugly and probably needs to apply to other commands'
+         argument parsing as well.  When we're doing @documentencoding,
+         we're generally in the frontmatter of the document, and so the.
+         expansion in html/xml/docbook would generally be the empty string.
+         (Because those modes wait until the first normal text of the
+         document to start outputting.)  The result would thus be a warning
+         "unrecognized encoding name `'".  Sigh.  */
+      int save_html = html;
+      int save_xml = xml;
+
+      html = 0;
+      xml = 0;
+      get_rest_of_line (1, &enc_arg);
+      html = save_html;
+      xml = save_xml;
+
+      /* See if we have this encoding.  */
+      for (enc = no_encoding+1; enc != last_encoding_code; enc++)
         {
-          document_encoding_code = enc;
-          break;
+          if (strcasecmp (enc_arg, encoding_table[enc].encname) == 0)
+            {
+              document_encoding_code = enc;
+              break;
+            }
+        }
+
+      /* If we didn't find this code, complain.  */
+      if (enc == last_encoding_code)
+        {
+          warning (_("unrecognized encoding name `%s'"), enc_arg);
+          /* Let the previous one go.  */
+          if (unknown_encoding && *unknown_encoding)
+            free (unknown_encoding);
+          unknown_encoding = xstrdup (enc_arg);
         }
+
+      else if (encoding_table[document_encoding_code].isotab == NULL)
+        warning (_("sorry, encoding `%s' not supported"), enc_arg);
+
+      free (enc_arg);
     }
+  else if (xml)
+    {
+      char *encoding = current_document_encoding ();
 
-  /* If we didn't find this code, complain.  */
-  if (enc == last_encoding_code)
-    warning (_("unrecogized encoding name `%s'"), enc_arg);
+      if (encoding && *encoding)
+        {
+          insert_string (" encoding=\"");
+          insert_string (encoding);
+          insert_string ("\"");
+        }
 
-  else if (encoding_table[document_encoding_code].isotab == NULL)
-    warning (_("sorry, encoding `%s' not supported"), enc_arg);
+      free (encoding);
+    }
+}
 
-  free (enc_arg);
+char *
+current_document_encoding (void)
+{
+  if (document_encoding_code != no_encoding)
+    return xstrdup (encoding_table[document_encoding_code].encname);
+  else if (unknown_encoding && *unknown_encoding)
+    return xstrdup (unknown_encoding);
+  else
+    return xstrdup ("");
 }
 
 
-/* If html or xml output, add HTML_STR to the output.  If not html and
+/* If html or xml output, add &HTML_STR; to the output.  If not html and
    the user requested encoded output, add the real 8-bit character
    corresponding to HTML_STR from the translation tables.  Otherwise,
    add INFO_STR.  */
 
-void
-add_encoded_char (html_str, info_str)
-      char *html_str;
-      char *info_str;
+static void
+add_encoded_char (char *html_str, char *info_str)
 {
-  if (html || xml)
+  if (html)
     add_word_args ("&%s;", html_str);
+  else if (xml)
+    xml_insert_entity (html_str);
   else if (enable_encoding)
     {
       /* Look for HTML_STR in the current translation table.  */
@@ -424,36 +725,56 @@ add_encoded_char (html_str, info_str)
 /* Output an accent for HTML or XML. */
 
 static void
-cm_accent_generic_html (arg, start, end, html_supported, single,
-                        html_solo_standalone, html_solo)
-     int arg, start, end;
-     char *html_supported;
-     int single;
-     int html_solo_standalone;
-     char *html_solo;
+cm_accent_generic_html (int arg, int start, int end, char *html_supported,
+    int single, int html_solo_standalone, char *html_solo)
 {
   static int valid_html_accent; /* yikes */
-  
+
   if (arg == START)
     { /* If HTML has good support for this character, use it.  */
       if (strchr (html_supported, curchar ()))
         { /* Yes; start with an ampersand.  The character itself
              will be added later in read_command (makeinfo.c).  */
+	  int saved_escape_html = escape_html;
+	  escape_html = 0;
           valid_html_accent = 1;
           add_char ('&');
+	  escape_html = saved_escape_html;
         }
       else
-        { 
-          valid_html_accent = 0;
-          if (html_solo_standalone)
-            { /* No special HTML support, so produce standalone char.  */
-              add_word_args ("&%s;", html_solo);
-            }
-          else
-            /* If the html_solo does not exist as standalone character
-               (namely &circ; &grave; &tilde;), then we use
-               the single character version instead.  */
-            add_char (single);
+        { /* @dotless{i} is not listed in html_supported but HTML entities
+	     starting with `i' can be used, such as &icirc;.  */
+	  int save_input_text_offset = input_text_offset;
+	  char *accent_contents;
+
+	  get_until_in_braces ("\n", &accent_contents);
+	  canon_white (accent_contents);
+
+	  if (strstr (accent_contents, "@dotless{i"))
+	    {
+	      add_word_args ("&%c", accent_contents[9]);
+	      valid_html_accent = 1;
+	    }
+	  else
+	    {
+	      /* Search for @dotless{} wasn't successful, so rewind.  */
+	      input_text_offset = save_input_text_offset;
+	      valid_html_accent = 0;
+	      if (html_solo_standalone)
+		{ /* No special HTML support, so produce standalone char.  */
+		  if (xml)
+		    xml_insert_entity (html_solo);
+		  else
+		    add_word_args ("&%s;", html_solo);
+		}
+	      else
+		/* If the html_solo does not exist as standalone character
+		   (namely &circ; &grave; &tilde;), then we use
+		   the single character version instead.  */
+		add_char (single);
+	    }
+
+	  free (accent_contents);
         }
     }
   else if (arg == END)
@@ -469,10 +790,8 @@ cm_accent_generic_html (arg, start, end, html_supported, single,
 
 
 static void
-cm_accent_generic_no_headers (arg, start, end, single, html_solo)
-     int arg, start, end;
-     int single;
-     char *html_solo;
+cm_accent_generic_no_headers (int arg, int start, int end, int single,
+    char *html_solo)
 {
   if (arg == END)
     {
@@ -485,7 +804,7 @@ cm_accent_generic_no_headers (arg, start, end, single, html_solo)
           buffer[0] = output_paragraph[end - 1];
           buffer[1] = 0;
           strcat (buffer, html_solo);
-          
+
           rc = cm_search_iso_map (buffer);
           if (rc >= 0)
             /* A little bit tricky ;-)
@@ -498,12 +817,15 @@ cm_accent_generic_no_headers (arg, start, end, single, html_solo)
           else
             { /* If we didn't find a translation for this character,
                  put the single instead. E.g., &Xuml; does not exist so X&uml;
-                 should be produced. */ 
-              warning (_("%s is an invalid ISO code, using %c"),
-                       buffer, single);
+                 should be produced. */
+              /* When the below warning is issued, an author has nothing
+                 wrong in their document, let alone anything ``fixable''
+                 on their side.  So it is commented out for now.  */
+              /* warning (_("%s is an invalid ISO code, using %c"),
+                       buffer, single); */
               add_char (single);
             }
-          
+
           free (buffer);
         }
     }
@@ -515,8 +837,7 @@ cm_accent_generic_no_headers (arg, start, end, single, html_solo)
    special HTML support.  */
 
 void
-cm_accent (arg)
-    int arg;
+cm_accent (int arg)
 {
   int old_escape_html = escape_html;
   escape_html = 0;
@@ -558,21 +879,21 @@ cm_accent (arg)
    exists as valid standalone character in HTML, e.g., &uml;.  */
 
 static void
-cm_accent_generic (arg, start, end, html_supported, single,
-                   html_solo_standalone, html_solo)
-     int arg, start, end;
-     char *html_supported;
-     int single;
-     int html_solo_standalone;
-     char *html_solo;
+cm_accent_generic (int arg, int start, int end, char *html_supported,
+    int single, int html_solo_standalone, char *html_solo)
 {
+  /* Accentuating space characters makes no sense, so issue a warning.  */
+  if (arg == START && isspace (input_text[input_text_offset]))
+    warning ("Accent command `@%s' must not be followed by whitespace",
+        command);
+
   if (html || xml)
     cm_accent_generic_html (arg, start, end, html_supported,
                             single, html_solo_standalone, html_solo);
   else if (no_headers)
     cm_accent_generic_no_headers (arg, start, end, single, html_solo);
   else if (arg == END)
-    { 
+    {
       if (enable_encoding)
         /* use 8-bit if available */
         cm_accent_generic_no_headers (arg, start, end, single, html_solo);
@@ -583,43 +904,37 @@ cm_accent_generic (arg, start, end, html_supported, single,
 }
 
 void
-cm_accent_umlaut (arg, start, end)
-     int arg, start, end;
+cm_accent_umlaut (int arg, int start, int end)
 {
   cm_accent_generic (arg, start, end, "aouAOUEeIiy", '"', 1, "uml");
 }
 
 void
-cm_accent_acute (arg, start, end)
-     int arg, start, end;
+cm_accent_acute (int arg, int start, int end)
 {
   cm_accent_generic (arg, start, end, "AEIOUYaeiouy", '\'', 1, "acute");
 }
 
 void
-cm_accent_cedilla (arg, start, end)
-     int arg, start, end;
+cm_accent_cedilla (int arg, int start, int end)
 {
   cm_accent_generic (arg, start, end, "Cc", ',', 1, "cedil");
 }
 
 void
-cm_accent_hat (arg, start, end)
-     int arg, start, end;
+cm_accent_hat (int arg, int start, int end)
 {
   cm_accent_generic (arg, start, end, "AEIOUaeiou", '^', 0, "circ");
 }
 
 void
-cm_accent_grave (arg, start, end)
-     int arg, start, end;
+cm_accent_grave (int arg, int start, int end)
 {
   cm_accent_generic (arg, start, end, "AEIOUaeiou", '`', 0, "grave");
 }
 
 void
-cm_accent_tilde (arg, start, end)
-     int arg, start, end;
+cm_accent_tilde (int arg, int start, int end)
 {
   cm_accent_generic (arg, start, end, "ANOano", '~', 0, "tilde");
 }
@@ -628,7 +943,7 @@ cm_accent_tilde (arg, start, end)
 
 /* Non-English letters/characters that don't insert themselves.  */
 void
-cm_special_char (arg)
+cm_special_char (int arg)
 {
   int old_escape_html = escape_html;
   escape_html = 0;
@@ -640,27 +955,35 @@ cm_special_char (arg)
           && command[1] == 0)
         { /* Lslash lslash Oslash oslash.
              Lslash and lslash aren't supported in HTML.  */
-          if ((html || xml) && command[0] == 'O')
+          if (command[0] == 'O')
             add_encoded_char ("Oslash", "/O");
-          else if ((html || xml) && command[0] == 'o')
+          else if (command[0] == 'o')
             add_encoded_char ("oslash", "/o");
           else
             add_word_args ("/%c", command[0]);
         }
       else if (strcmp (command, "exclamdown") == 0)
         add_encoded_char ("iexcl", "!");
-      else if (strcmp (command, "pounds") == 0)
-        add_encoded_char ("pound" , "#");
       else if (strcmp (command, "questiondown") == 0)
         add_encoded_char ("iquest", "?");
+      else if (strcmp (command, "euro") == 0)
+        /* http://www.cs.tut.fi/~jkorpela/html/euro.html suggests that
+           &euro; degrades best in old browsers.  */
+        add_encoded_char ("euro", "Euro ");
+      else if (strcmp (command, "pounds") == 0)
+        add_encoded_char ("pound" , "#");
+      else if (strcmp (command, "ordf") == 0)
+        add_encoded_char ("ordf" , "a");
+      else if (strcmp (command, "ordm") == 0)
+        add_encoded_char ("ordm" , "o");
       else if (strcmp (command, "AE") == 0)
         add_encoded_char ("AElig", command);
       else if (strcmp (command, "ae") == 0)
         add_encoded_char ("aelig",  command);
       else if (strcmp (command, "OE") == 0)
-        add_word ("&#140;", command);
+        add_encoded_char ("OElig", command);
       else if (strcmp (command, "oe") == 0)
-        add_word ("&#156;", command);
+        add_encoded_char ("oelig", command);
       else if (strcmp (command, "AA") == 0)
         add_encoded_char ("Aring", command);
       else if (strcmp (command, "aa") == 0)
@@ -675,8 +998,7 @@ cm_special_char (arg)
 
 /* Dotless i or j.  */
 void
-cm_dotless (arg, start, end)
-    int arg, start, end;
+cm_dotless (int arg, int start, int end)
 {
   if (arg == END)
     {
diff --git a/gnu/usr.bin/texinfo/makeinfo/lang.h b/gnu/usr.bin/texinfo/makeinfo/lang.h
index 1aad64cf374..634686d8d31 100644
--- a/gnu/usr.bin/texinfo/makeinfo/lang.h
+++ b/gnu/usr.bin/texinfo/makeinfo/lang.h
@@ -1,7 +1,7 @@
 /* lang.h -- declarations for language codes etc.
-   $Id: lang.h,v 1.1.1.2 2002/06/10 13:21:18 espie Exp $
+   $Id: lang.h,v 1.1.1.3 2006/07/17 16:03:47 espie Exp $
 
-   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003 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
@@ -73,33 +73,35 @@ extern language_type language_table[];
 
 
 
-/* The document encoding. This is usefull if we working e.g.
- * with german Texinfo so we can produce correct german umlaut
- * while creating output (--no-headers ASCII like).
- */
+/* The document encoding. This is useful to produce true 8-bit
+   characters according to the @documentencoding.  */
+
 typedef enum {
-    no_encoding,
-    ISO_8859_1,    /* default for en, de, */
-    ISO_8859_2,    /* actualy not supported like the rest below */
-    ISO_8859_3,
-    ISO_8859_4,
-    ISO_8859_5,
-    ISO_8859_6,
-    ISO_8859_7,
-    ISO_8859_8,
-    ISO_8859_9,
-    ISO_8859_10,
-    ISO_8859_11,
-    ISO_8859_12,
-    ISO_8859_13,
-    ISO_8859_14,
-    ISO_8859_15,
-    last_encoding_code
+  no_encoding,
+  US_ASCII,
+  ISO_8859_1,
+  ISO_8859_2,
+  ISO_8859_3,    /* this and none of the rest are supported. */
+  ISO_8859_4,
+  ISO_8859_5,
+  ISO_8859_6,
+  ISO_8859_7,
+  ISO_8859_8,
+  ISO_8859_9,
+  ISO_8859_10,
+  ISO_8859_11,
+  ISO_8859_12,
+  ISO_8859_13,
+  ISO_8859_14,
+  ISO_8859_15,
+  last_encoding_code
 } encoding_code_type;
 
 /* The current document encoding, or null if not set.  */
 extern encoding_code_type document_encoding_code;
 
+/* If an encoding is not supported, just keep it as a string.  */
+extern char *unknown_encoding;
 
 /* Maps an HTML abbreviation to ISO and Unicode codes for a given code.  */
 
@@ -117,7 +119,8 @@ typedef struct
 typedef struct
 {
   encoding_code_type ec; /* document encoding type (see above enum) */
-  char *ecname;          /* encoding name like ISO-8859-1 */
+  char *encname;         /* encoding name like "iso-8859-1", valid in
+                            HTML and Emacs */
   iso_map_type *isotab;  /* address of ISO translation table */
 } encoding_type;
 
@@ -126,12 +129,20 @@ extern encoding_type encoding_table[];
 
 
 /* The commands.  */
-extern void cm_documentlanguage (), cm_documentencoding ();
+extern void cm_documentlanguage (void),
+     cm_documentencoding (void);
 
 /* Accents, other non-English characters.  */
-void cm_accent (), cm_special_char (), cm_dotless ();
+void cm_accent (int arg), cm_special_char (int arg),
+     cm_dotless (int arg, int start, int end);
+
+extern void cm_accent_umlaut (int arg, int start, int end),
+     cm_accent_acute (int arg, int start, int end),
+     cm_accent_cedilla (int arg, int start, int end),
+     cm_accent_hat (int arg, int start, int end),
+     cm_accent_grave (int arg, int start, int end),
+     cm_accent_tilde (int arg, int start, int end);
 
-extern void cm_accent_umlaut (), cm_accent_acute (), cm_accent_cedilla (),
-  cm_accent_hat (), cm_accent_grave (), cm_accent_tilde ();
+extern char *current_document_encoding (void);
 
 #endif /* not LANG_H */
diff --git a/gnu/usr.bin/texinfo/makeinfo/macro.c b/gnu/usr.bin/texinfo/makeinfo/macro.c
index 50467f4cd61..66960edd959 100644
--- a/gnu/usr.bin/texinfo/makeinfo/macro.c
+++ b/gnu/usr.bin/texinfo/makeinfo/macro.c
@@ -1,7 +1,7 @@
 /* macro.c -- user-defined macros for Texinfo.
-   $Id: macro.c,v 1.1.1.2 2002/06/10 13:21:18 espie Exp $
+   $Id: macro.c,v 1.1.1.3 2006/07/17 16:03:47 espie Exp $
 
-   Copyright (C) 1998, 99, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2002, 2003 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
@@ -19,6 +19,7 @@
 
 #include "system.h"
 #include "cmds.h"
+#include "files.h"
 #include "macro.h"
 #include "makeinfo.h"
 #include "insertion.h"
@@ -54,8 +55,7 @@ int macro_list_size = 0;        /* Number of slots in total. */
 
 /* Return the length of the array in ARRAY. */
 int
-array_len (array)
-     char **array;
+array_len (char **array)
 {
   int i = 0;
 
@@ -66,8 +66,7 @@ array_len (array)
 }
 
 void
-free_array (array)
-     char **array;
+free_array (char **array)
 {
   if (array)
     {
@@ -81,8 +80,7 @@ free_array (array)
 
 /* Return the macro definition of NAME or NULL if NAME is not defined. */
 MACRO_DEF *
-find_macro (name)
-     char *name;
+find_macro (char *name)
 {
   int i;
   MACRO_DEF *def;
@@ -101,13 +99,9 @@ find_macro (name)
    and SOURCE_LINENO is the line number within that file.  If a macro already
    exists with NAME, then a warning is produced, and that previous
    definition is overwritten. */
-void
-add_macro (name, arglist, body, source_file, source_lineno, flags)
-     char *name;
-     char **arglist;
-     char *body;
-     char *source_file;
-     int source_lineno, flags;
+static void
+add_macro (char *name, char **arglist, char *body, char *source_file,
+    int source_lineno, int flags)
 {
   MACRO_DEF *def;
 
@@ -163,8 +157,7 @@ add_macro (name, arglist, body, source_file, source_lineno, flags)
 
 
 char **
-get_brace_args (quote_single)
-     int quote_single;
+get_brace_args (int quote_single)
 {
   char **arglist, *word;
   int arglist_index, arglist_size;
@@ -243,9 +236,8 @@ get_brace_args (quote_single)
   return arglist;
 }
 
-char **
-get_macro_args (def)
-    MACRO_DEF *def;
+static char **
+get_macro_args (MACRO_DEF *def)
 {
   int i;
   char *word;
@@ -298,9 +290,8 @@ get_macro_args (def)
 /* Substitute actual parameters for named parameters in body.
    The named parameters which appear in BODY must by surrounded
    reverse slashes, as in \foo\. */
-char *
-apply (named, actuals, body)
-     char **named, **actuals, *body;
+static char *
+apply (char **named, char **actuals, char *body)
 {
   int i;
   int new_body_index, new_body_size;
@@ -322,7 +313,7 @@ apply (named, actuals, body)
       else
         { /* Snarf parameter name, check against named parameters. */
           char *param;
-          int param_start, which, len;
+          int param_start, len;
 
           param_start = ++i;
           while (body[i] && body[i] != '\\')
@@ -336,29 +327,38 @@ apply (named, actuals, body)
           if (body[i]) /* move past \ */
             i++;
 
-          /* Now check against named parameters. */
-          for (which = 0; named && named[which]; which++)
-            if (STREQ (named[which], param))
-              break;
-
-          if (named && named[which])
-            {
-              text = which < length_of_actuals ? actuals[which] : NULL;
-              if (!text)
-                text = "";
-              len = strlen (text);
-            }
-          else
-            { /* not a parameter, either it's \\ (if len==0) or an
-                 error.  In either case, restore one \ at least.  */
-              if (len) {
-                warning (_("\\ in macro expansion followed by `%s' instead of \\ or parameter name"),
-                         param); 
-              }
+          if (len == 0)
+            { /* \\ always means \, even if macro has no args.  */
               len++;
               text = xmalloc (1 + len);
               sprintf (text, "\\%s", param);
             }
+          else
+            {
+              int which;
+              
+              /* Check against named parameters. */
+              for (which = 0; named && named[which]; which++)
+                if (STREQ (named[which], param))
+                  break;
+
+              if (named && named[which])
+                {
+                  text = which < length_of_actuals ? actuals[which] : NULL;
+                  if (!text)
+                    text = "";
+                  len = strlen (text);
+                  text = xstrdup (text);  /* so we can free it */
+                }
+              else
+                { /* not a parameter, so it's an error.  */
+                  warning (_("\\ in macro expansion followed by `%s' instead of parameter name"),
+                             param); 
+                  len++;
+                  text = xmalloc (1 + len);
+                  sprintf (text, "\\%s", param);
+                }
+            }
 
           if (strlen (param) + 2 < len)
             {
@@ -371,8 +371,7 @@ apply (named, actuals, body)
           strcpy (new_body + new_body_index, text);
           new_body_index += len;
 
-          if (!named || !named[which])
-            free (text);
+          free (text);
         }
     }
 
@@ -383,8 +382,7 @@ apply (named, actuals, body)
 /* Expand macro passed in DEF, a pointer to a MACRO_DEF, and
    return its expansion as a string.  */
 char *
-expand_macro (def)
-     MACRO_DEF *def;
+expand_macro (MACRO_DEF *def)
 {
   char **arglist;
   int num_args;
@@ -414,8 +412,7 @@ expand_macro (def)
 
 /* Execute the macro passed in DEF, a pointer to a MACRO_DEF.  */
 void
-execute_macro (def)
-     MACRO_DEF *def;
+execute_macro (MACRO_DEF *def)
 {
   char *execution_string;
   int start_line = line_number, end_line;
@@ -436,7 +433,8 @@ execute_macro (def)
       end_line = line_number;
       line_number = start_line;
 
-      if (macro_expansion_output_stream && !executing_string && !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);
@@ -454,21 +452,17 @@ execute_macro (def)
    set the ME_RECURSE flag.  MACTYPE is either "macro" or "rmacro", and
    tells us what the matching @end should be.  */
 static void
-define_macro (mactype, recursive)
-     char *mactype;
-     int recursive;
+define_macro (char *mactype, int recursive)
 {
-  int i;
-  char *name, **arglist, *body, *line, *last_end;
-  int body_size, body_index;
+  int i, start;
+  char *name, *line;
+  char *last_end = NULL;
+  char *body = NULL;
+  char **arglist = NULL;
+  int body_size = 0, body_index = 0;
   int depth = 1;
-  int defining_line = line_number;
   int flags = 0;
-
-  arglist = NULL;
-  body = NULL;
-  body_size = 0;
-  body_index = 0;
+  int defining_line = line_number;
 
   if (macro_expansion_output_stream && !executing_string)
     me_append_before_this_command ();
@@ -477,15 +471,13 @@ define_macro (mactype, recursive)
 
   /* Get the name of the macro.  This is the set of characters which are
      not whitespace and are not `{' immediately following the @macro. */
+  start = input_text_offset;
   {
-    int start = input_text_offset;
     int len;
 
-    for (i = start;
-         (i < input_text_length) &&
-         (input_text[i] != '{') &&
-         (!cr_or_whitespace (input_text[i]));
-         i++);
+    for (i = start; i < input_text_length && input_text[i] != '{'
+                    && !cr_or_whitespace (input_text[i]);
+         i++) ;
 
     len = i - start;
     name = xmalloc (1 + len);
@@ -645,7 +637,7 @@ define_macro (mactype, recursive)
           depth--;
           last_end = "macro";
         }
-      if (*line == COMMAND_PREFIX && strncmp (line + 1, "end rmacro", 9) == 0)
+      if (*line == COMMAND_PREFIX && strncmp (line + 1, "end rmacro", 10) == 0)
         {
           depth--;
           last_end = "rmacro";
@@ -689,17 +681,32 @@ define_macro (mactype, recursive)
   add_macro (name, arglist, body, input_filename, defining_line, flags);
 
   if (macro_expansion_output_stream && !executing_string)
-    remember_itext (input_text, input_text_offset);
+    {
+      /* Remember text for future expansions.  */
+      remember_itext (input_text, input_text_offset);
+
+      /* Bizarrely, output the @macro itself.  This is so texinfo.tex
+         will have a chance to read it when texi2dvi calls makeinfo -E.
+         The problem is that we don't really expand macros in all
+         contexts; a @table's @item is one.  And a fix is not obvious to
+         me, since it appears virtually identical to any other internal
+         expansion.  Just setting a variable in cm_item caused other
+         strange expansion problems.  */
+      write_region_to_macro_output ("@", 0, 1);
+      write_region_to_macro_output (mactype, 0, strlen (mactype));
+      write_region_to_macro_output (" ", 0, 1);
+      write_region_to_macro_output (input_text, start, input_text_offset);
+    }
 }
 
 void 
-cm_macro ()
+cm_macro (void)
 {
   define_macro ("macro", 0);
 }
 
 void 
-cm_rmacro ()
+cm_rmacro (void)
 {
   define_macro ("rmacro", 1);
 }
@@ -709,8 +716,7 @@ cm_rmacro ()
    returned. */
 
 static MACRO_DEF *
-delete_macro (name)
-     char *name;
+delete_macro (char *name)
 {
   int i;
   MACRO_DEF *def;
@@ -729,7 +735,7 @@ delete_macro (name)
 }
 
 void
-cm_unmacro ()
+cm_unmacro (void)
 {
   int i;
   char *line, *name;
@@ -777,9 +783,7 @@ cm_unmacro ()
 
 /* Set the value of POINTER's offset to OFFSET. */
 ITEXT *
-remember_itext (pointer, offset)
-     char *pointer;
-     int offset;
+remember_itext (char *pointer, int offset)
 {
   int i;
   ITEXT *itext = NULL;
@@ -833,8 +837,7 @@ remember_itext (pointer, offset)
 
 /* Forget the input text associated with POINTER. */
 void
-forget_itext (pointer)
-     char *pointer;
+forget_itext (char *pointer)
 {
   int i;
 
@@ -850,7 +853,7 @@ forget_itext (pointer)
 /* Append the text which appeared in input_text from the last offset to
    the character just before the command that we are currently executing. */
 void
-me_append_before_this_command ()
+me_append_before_this_command (void)
 {
   int i;
 
@@ -862,8 +865,7 @@ me_append_before_this_command ()
 /* Similar to execute_string, but only takes a single string argument,
    and remembers the input text location, etc. */
 void
-me_execute_string (execution_string)
-     char *execution_string;
+me_execute_string (char *execution_string)
 {
   int saved_escape_html = escape_html;
   int saved_in_paragraph = in_paragraph;
@@ -895,8 +897,7 @@ me_execute_string (execution_string)
    when we need to produce macro-expanded output for input which
    leaves no traces in the Info output.  */
 void
-me_execute_string_keep_state (execution_string, append_string)
-     char *execution_string, *append_string;
+me_execute_string_keep_state (char *execution_string, char *append_string)
 {
   int op_orig, opcol_orig, popen_orig;
   int fill_orig, newline_orig, indent_orig, meta_pos_orig;
@@ -926,8 +927,7 @@ me_execute_string_keep_state (execution_string, append_string)
 /* Append the text which appears in input_text from the last offset to
    the current OFFSET. */
 void
-append_to_expansion_output (offset)
-     int offset;
+append_to_expansion_output (int offset)
 {
   int i;
   ITEXT *itext = NULL;
@@ -951,9 +951,7 @@ append_to_expansion_output (offset)
 
 /* Only write this input text iff it appears in our itext list. */
 void
-maybe_write_itext (pointer, offset)
-     char *pointer;
-     int offset;
+maybe_write_itext (char *pointer, int offset)
 {
   int i;
   ITEXT *itext = NULL;
@@ -973,9 +971,7 @@ maybe_write_itext (pointer, offset)
 }
 
 void
-write_region_to_macro_output (string, start, end)
-     char *string;
-     int start, end;
+write_region_to_macro_output (char *string, int start, int end)
 {
   if (macro_expansion_output_stream)
     fwrite (string + start, 1, end - start, macro_expansion_output_stream);
@@ -992,14 +988,15 @@ typedef struct alias_struct
 
 static alias_type *aliases; 
 
-/* @alias */
+/* @alias aname = cmdname */
+
 void
-cm_alias ()
+cm_alias (void)
 {
   alias_type *a = xmalloc (sizeof (alias_type));
 
   skip_whitespace ();
-  get_until_in_line (1, "=", &(a->alias));
+  get_until_in_line (0, "=", &(a->alias));
   canon_white (a->alias);
 
   discard_until ("=");
@@ -1012,8 +1009,7 @@ cm_alias ()
 
 /* Perform an alias expansion.  Called from read_command.  */
 char *
-alias_expand (tok)
-     char *tok;
+alias_expand (char *tok)
 {
   alias_type *findit = aliases;
 
@@ -1054,7 +1050,7 @@ static enclosure_stack_type *enclosure_stack;
 
 /* @definfoenclose */
 void
-cm_definfoenclose ()
+cm_definfoenclose (void)
 {
   enclosure_type *e = xmalloc (sizeof (enclosure_type));
 
@@ -1073,8 +1069,7 @@ cm_definfoenclose ()
    return 1.  Else return 0.  */
 
 int
-enclosure_command (tok)
-     char *tok;
+enclosure_command (char *tok)
 {
   enclosure_type *findit = enclosures;
 
@@ -1096,8 +1091,7 @@ enclosure_command (tok)
 
 /* actually perform the enclosure expansion */
 void
-enclosure_expand (arg, start, end)
-     int arg, start, end;
+enclosure_expand (int arg, int start, int end)
 {
   if (arg == START)
     add_word (enclosure_stack->current->before);
diff --git a/gnu/usr.bin/texinfo/makeinfo/macro.h b/gnu/usr.bin/texinfo/makeinfo/macro.h
index 4fac46b268d..8607b938f8f 100644
--- a/gnu/usr.bin/texinfo/makeinfo/macro.h
+++ b/gnu/usr.bin/texinfo/makeinfo/macro.h
@@ -1,5 +1,5 @@
 /* macro.h -- declarations for macro.c.
-   $Id: macro.h,v 1.1.1.1 2000/02/09 01:25:23 espie Exp $
+   $Id: macro.h,v 1.1.1.2 2006/07/17 16:03:47 espie Exp $
 
    Copyright (C) 1998, 99 Free Software Foundation, Inc.
 
@@ -48,24 +48,30 @@ typedef struct {
 #define ME_RECURSE      0x01
 #define ME_QUOTE_ARG    0x02
 
-extern void execute_macro ();
-extern MACRO_DEF *find_macro ();
-extern char *expand_macro ();
+extern void execute_macro (MACRO_DEF *def);
+extern MACRO_DEF *find_macro (char *name);
+extern char *expand_macro (MACRO_DEF *def);
 
-extern ITEXT *remember_itext ();
-extern void forget_itext ();
-extern void maybe_write_itext ();
-extern void write_region_to_macro_output ();
-extern void append_to_expansion_output ();
-extern void me_append_before_this_command ();
-extern void me_execute_string ();
+extern ITEXT *remember_itext (char *pointer, int offset);
+extern void forget_itext (char *pointer);
+extern void maybe_write_itext (char *pointer, int offset);
+extern void write_region_to_macro_output (char *string, int start, int end);
+extern void append_to_expansion_output (int offset);
+extern void me_append_before_this_command (void);
+extern void me_execute_string (char *execution_string);
+extern void me_execute_string_keep_state (char *execution_string,
+    char *append_string);
 
-extern char *alias_expand ();
-extern int enclosure_command ();
-extern void enclosure_expand ();
+extern char *alias_expand (char *tok);
+extern int enclosure_command (char *tok);
+extern void enclosure_expand (int arg, int start, int end);
 
 /* The @commands.  */
-extern void cm_macro (), cm_rmacro (), cm_unmacro ();
-extern void cm_alias (), cm_definfoenclose ();
+extern void cm_macro (void), cm_rmacro (void), cm_unmacro (void);
+extern void cm_alias (void), cm_definfoenclose (void);
+
+extern int array_len (char **array);
+extern void free_array (char **array);
+extern char **get_brace_args (int quote_single);
 
 #endif /* not MACRO_H */
diff --git a/gnu/usr.bin/texinfo/makeinfo/multi.h b/gnu/usr.bin/texinfo/makeinfo/multi.h
new file mode 100644
index 00000000000..a173c16d347
--- /dev/null
+++ b/gnu/usr.bin/texinfo/makeinfo/multi.h
@@ -0,0 +1,28 @@
+/* multi.h -- declarations for multi.c.
+   $Id: multi.h,v 1.1.1.1 2006/07/17 16:03:48 espie Exp $
+
+   Copyright (C) 2004 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.
+   */
+
+#ifndef MULTI_H
+#define MULTI_H
+
+extern void do_multitable (void);
+extern void end_multitable (void);
+extern int multitable_item (void);
+
+#endif /* !MULTI_H */
diff --git a/gnu/usr.bin/texinfo/makeinfo/node.h b/gnu/usr.bin/texinfo/makeinfo/node.h
index 5c5517c8b57..9d65d915fc6 100644
--- a/gnu/usr.bin/texinfo/makeinfo/node.h
+++ b/gnu/usr.bin/texinfo/makeinfo/node.h
@@ -1,7 +1,7 @@
 /* node.h -- declarations for Node.
-   $Id: node.h,v 1.1.1.2 2002/06/10 13:21:22 espie Exp $
+   $Id: node.h,v 1.1.1.3 2006/07/17 16:03:48 espie Exp $
 
-   Copyright (C) 1996, 97, 98, 99, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2002 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,6 +22,8 @@
 #ifndef NODE_H
 #define NODE_H
 
+#include "xref.h"
+
 /* The various references that we know about. */
 /* What we remember for each node. */
 typedef struct tentry
@@ -39,6 +41,7 @@ typedef struct tentry
   int number;           /* Number for this node, relevant for HTML
                            splitting -- from use+define order, not just
                            define. */
+  int order;            /* The order of the tag, starting from zero.  */
   char *html_fname;	/* The HTML file to which this node is written
 			   (non-NULL only for HTML splitting).  */
 } TAG_ENTRY;
@@ -85,6 +88,9 @@ extern TAG_ENTRY *tag_table;
 /* Counter for setting node_ref.number; zero is Top. */
 extern int node_number;
 
+/* Node order counter.  */
+extern int node_order;
+
 /* The current node's section level. */
 extern int current_section;
 
@@ -92,22 +98,32 @@ extern int current_section;
    corresponding to the current node in HTML mode. */
 extern int outstanding_node;
 
-extern TAG_ENTRY *find_node ();
+extern TAG_ENTRY *find_node (char *name);
 
 /* A search string which is used to find a line defining a node. */
 DECLARE (char *, node_search_string, "\n@node ");
 
 /* Extract node name from a menu item. */
-extern char *glean_node_from_menu ();
+extern char *glean_node_from_menu (int remember_ref, enum reftype ref_type);
 
 /* Remember a node for later validation.  */
-extern void remember_node_reference ();
+extern void remember_node_reference (char *node, int line, enum reftype type);
 
 /* Remember the name of the current output file.  */
-extern void set_current_output_filename ();
+extern void set_current_output_filename (const char *fname);
 
 /* Expand macros and commands in the node name and canonicalize
    whitespace in the resulting expansion.  */
-extern char *expand_node_name ();
+extern char *expand_node_name (char *node);
+
+extern int number_of_node (char *node);
+
+extern void init_tag_table (void);
+extern void write_tag_table (char *filename);
+extern void free_node_references (void);
+extern void free_node_node_references (void);
+extern void validate_file (TAG_ENTRY *tag_table);
+extern void split_file (char *filename, int size);
+extern void clean_old_split_files (char *filename);
 
 #endif /* NODE_H */
diff --git a/gnu/usr.bin/texinfo/makeinfo/sectioning.c b/gnu/usr.bin/texinfo/makeinfo/sectioning.c
index cfaaf5f2af4..4353b994bd8 100644
--- a/gnu/usr.bin/texinfo/makeinfo/sectioning.c
+++ b/gnu/usr.bin/texinfo/makeinfo/sectioning.c
@@ -1,7 +1,7 @@
-/* sectioning.c -- all related stuff @chapter, @section... @contents
-   $Id: sectioning.c,v 1.1.1.2 2002/06/10 13:21:22 espie Exp $
+/* sectioning.c -- for @chapter, @section, ..., @contents ...
+   $Id: sectioning.c,v 1.1.1.3 2006/07/17 16:03:48 espie Exp $
 
-   Copyright (C) 1999, 2001, 02 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003, 2004 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
@@ -17,7 +17,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Written by Karl Heinz Marbaise <kama@hippo.fido.de>.  */
+   Originally written by Karl Heinz Marbaise <kama@hippo.fido.de>.  */
 
 #include "system.h"
 #include "cmds.h"
@@ -34,6 +34,7 @@ section_alist_type section_alist[] = {
   { "unnumberedsubsec",    4, ENUM_SECT_NO,  TOC_YES },
   { "unnumberedsec",       3, ENUM_SECT_NO,  TOC_YES },
   { "unnumbered",          2, ENUM_SECT_NO,  TOC_YES },
+  { "centerchap",          2, ENUM_SECT_NO,  TOC_YES },
 
   { "appendixsubsubsec",   5, ENUM_SECT_APP, TOC_YES },  /* numbered like A.X.X.X */
   { "appendixsubsec",      4, ENUM_SECT_APP, TOC_YES },
@@ -52,7 +53,7 @@ section_alist_type section_alist[] = {
   { "heading",             3, ENUM_SECT_NO,  TOC_NO },
   { "chapheading",         2, ENUM_SECT_NO,  TOC_NO },
   { "majorheading",        2, ENUM_SECT_NO,  TOC_NO },
-  
+
   { "top",                 1, ENUM_SECT_NO,  TOC_YES },
   { NULL,                  0, 0, 0 }
 };
@@ -81,14 +82,18 @@ static char *scoring_characters = "*=-.";
 /* Amount to offset the name of sectioning commands to levels by. */
 static int section_alist_offset = 0;
 
+/* These two variables are for @float, @cindex like commands that need to know
+   in which section they are used.  */
+/* Last value returned by get_sectioning_number.  */
+static char *last_sectioning_number = "";
+/* Last title used by sectioning_underscore, etc.  */
+static char *last_sectioning_title = "";
 
 /* num == ENUM_SECT_NO  means unnumbered (should never call this)
    num == ENUM_SECT_YES means numbered
    num == ENUM_SECT_APP means numbered like A.1 and so on */
-char *
-get_sectioning_number (level, num)
-      int level;
-      int num;
+static char *
+get_sectioning_number (int level, int num)
 {
   static char s[100]; /* should ever be enough for 99.99.99.99
                          Appendix A.1 */
@@ -103,10 +108,10 @@ get_sectioning_number (level, num)
     {
       p = s + strlen (s);
       if ((i == 0) && (enum_marker == APPENDIX_MAGIC))
-	sprintf (p, "%c.", numbers[i] + 64); /* Should be changed to
+        sprintf (p, "%c.", numbers[i] + 64); /* Should be changed to
                                                 be more portable */
       else
-	sprintf (p, "%d.", numbers[i]);
+        sprintf (p, "%d.", numbers[i]);
     }
 
   /* the last number is never followed by a dot */
@@ -114,9 +119,14 @@ get_sectioning_number (level, num)
   if ((num == ENUM_SECT_APP)
       && (i == 0)
       && (enum_marker == APPENDIX_MAGIC))
-    sprintf (p, _("Appendix %c "), numbers[i] + 64);
+    sprintf (p, _("Appendix %c"), numbers[i] + 64);
   else
-    sprintf (p, "%d ", numbers[i]);
+    sprintf (p, "%d", numbers[i]);
+
+  /* Poor man's cache :-)  */
+  if (strlen (last_sectioning_number))
+    free (last_sectioning_number);
+  last_sectioning_number = xstrdup (s);
 
   return s;
 }
@@ -124,8 +134,7 @@ get_sectioning_number (level, num)
 
 /* Set the level of @top to LEVEL.  Return the old level of @top. */
 int
-set_top_section_level (level)
-     int level;
+set_top_section_level (int level)
 {
   int i, result = -1;
 
@@ -141,9 +150,8 @@ set_top_section_level (level)
 
 
 /* return the index of the given sectioning command in section_alist */
-int
-search_sectioning (text)
-     char *text;
+static int
+search_sectioning (char *text)
 {
   int i;
   char *t;
@@ -151,7 +159,7 @@ search_sectioning (text)
   /* ignore the optional command prefix */
   if (text[0] == COMMAND_PREFIX)
     text++;
-  
+
   for (i = 0; (t = section_alist[i].name); i++)
     {
       if (strcmp (t, text) == 0)
@@ -161,11 +169,14 @@ search_sectioning (text)
     }
   return -1;
 }
-    
-/* Return an integer which identifies the type section present in TEXT. */
+
+/* Return an integer which identifies the type of section present in
+   TEXT -- 1 for @top, 2 for chapters, ..., 5 for subsubsections (as
+   specified in section_alist).  We take into account any @lowersections
+   and @raisesections.  If SECNAME is non-NULL, also return the
+   corresponding section name.  */
 int
-what_section (text)
-     char *text;
+what_section (char *text, char **secname)
 {
   int index, j;
   char *temp;
@@ -203,123 +214,215 @@ what_section (text)
     {
       return_val = section_alist[index].level + section_alist_offset;
       if (return_val < 0)
-	return_val = 0;
+        return_val = 0;
       else if (return_val > 5)
-          return_val = 5;
+        return_val = 5;
+
+      if (secname)
+        {
+          int i;
+          int alist_size = sizeof (section_alist) / sizeof(section_alist_type);
+          /* Find location of offset sectioning entry, but don't go off
+             either end of the array.  */
+          int index_offset = MAX (index - section_alist_offset, 0);
+          index_offset = MIN (index_offset, alist_size - 1);
+
+          /* Also make sure we don't go into the next "group" of
+             sectioning changes, e.g., change from an @appendix to an
+             @heading or some such.  */
+#define SIGN(expr) ((expr) < 0 ? -1 : 1)
+          for (i = index; i != index_offset; i -= SIGN (section_alist_offset))
+            {
+              /* As it happens, each group has unique .num/.toc values.  */
+              if (section_alist[i].num != section_alist[index_offset].num
+                  || section_alist[i].toc != section_alist[index_offset].toc)
+                break;
+            }
+          *secname = section_alist[i].name;
+        }
       return return_val;
     }
   return -1;
 }
 
-void
-sectioning_underscore (cmd)
-     char *cmd;
+/* Returns current top level division (ie. chapter, unnumbered) number.
+   - For chapters, returns the number.
+   - For unnumbered sections, returns empty string.
+   - For appendices, returns A, B, etc. */
+char *
+current_chapter_number (void)
 {
-  if (xml)
+  if (enum_marker == UNNUMBERED_MAGIC)
+    return xstrdup ("");
+  else if (enum_marker == APPENDIX_MAGIC)
     {
-      char *temp;
-      int level;
-      temp = xmalloc (2 + strlen (cmd));
-      temp[0] = COMMAND_PREFIX;
-      strcpy (&temp[1], cmd);
-      level = what_section (temp);
-      level -= 2;
-      free (temp);
-      xml_close_sections (level);
-      /* Mark the beginning of the section
-	 If the next command is printindex, we will remove
-	 the section and put an Index instead */
-      flush_output ();
-      xml_last_section_output_position = output_paragraph_offset;
-      
-      xml_insert_element (xml_element (cmd), START);
-      xml_insert_element (TITLE, START);
-      xml_open_section (level, cmd);
-      get_rest_of_line (0, &temp);
-      execute_string ("%s\n", temp);
-      free (temp);
-      xml_insert_element (TITLE, END);
-    } 
-  else 
+      char s[1];
+      sprintf (s, "%c", numbers[0] + 64);
+      return xstrdup (s);
+    }
+  else
     {
-  char character;
-  char *temp;
+      char s[5];
+      sprintf (s, "%d", numbers[0]);
+      return xstrdup (s);
+    }
+}
+
+/* Returns number of the last sectioning command used.  */
+char *
+current_sectioning_number (void)
+{
+  if (enum_marker == UNNUMBERED_MAGIC || !number_sections)
+    return xstrdup ("");
+  else
+    return xstrdup (last_sectioning_number);
+}
+
+/* Returns arguments of the last sectioning command used.  */
+char *
+current_sectioning_name (void)
+{
+  return xstrdup (last_sectioning_title);
+}
+
+/* insert_and_underscore, sectioning_underscore and sectioning_html call this.  */
+
+static char *
+handle_enum_increment (int level, int index)
+{
+  /* Here is how TeX handles enumeration:
+     - Anything starting with @unnumbered is not enumerated.
+     - @majorheading and the like are not enumberated.  */
+  int i;
+
+  /* First constraint above.  */
+  if (enum_marker == UNNUMBERED_MAGIC && level == 0)
+    return xstrdup ("");
+
+  /* Second constraint.  */
+  if (section_alist[index].num == ENUM_SECT_NO)
+    return xstrdup ("");
+
+  /* reset all counters which are one level deeper */
+  for (i = level; i < 3; i++)
+    numbers [i + 1] = 0;
+
+  numbers[level]++;
+  if (section_alist[index].num == ENUM_SECT_NO || enum_marker == UNNUMBERED_MAGIC
+      || !number_sections)
+    return xstrdup ("");
+  else
+    return xstrdup (get_sectioning_number (level, section_alist[index].num));
+}
+
+
+void
+sectioning_underscore (char *cmd)
+{
+  char *temp, *secname;
   int level;
+  
+  /* If we're not indenting the first paragraph, we shall make it behave
+     like @noindent is called directly after the section heading. */
+  if (! do_first_par_indent)
+    cm_noindent ();
 
   temp = xmalloc (2 + strlen (cmd));
   temp[0] = COMMAND_PREFIX;
   strcpy (&temp[1], cmd);
-  level = what_section (temp);
-  free (temp);
+  level = what_section (temp, &secname);
   level -= 2;
-
   if (level < 0)
     level = 0;
+  free (temp);
 
-  if (html)
-    sectioning_html (level, cmd);
-  else
+  /* If the argument to @top is empty, we try using the one from @settitle.
+     Warn if both are unusable.  */
+  if (STREQ (command, "top"))
     {
-      character = scoring_characters[level];
-      insert_and_underscore (level, character, cmd);
-	}
-    }
-}
+      int save_input_text_offset = input_text_offset;
 
-/* insert_and_underscore and sectioning_html are the
-   only functions which call this.
-   I have created this, because it was exactly the same
-   code in both functions. */
-static char *
-handle_enum_increment (level, index)
-     int level;
-     int index;
-{
-  /* special for unnumbered */
-  if (number_sections && section_alist[index].num == ENUM_SECT_NO)
-    {
-      if (level == 0
-	  && enum_marker != UNNUMBERED_MAGIC)
-	enum_marker = UNNUMBERED_MAGIC;
+      get_rest_of_line (0, &temp);
+
+      /* Due to get_rest_of_line ... */
+      line_number--;
+
+      if (strlen (temp) == 0 && (!title || strlen (title) == 0))
+        warning ("Must specify a title with least one of @settitle or @top");
+
+      input_text_offset = save_input_text_offset;
     }
-  /* enumerate only things which are allowed */
-  if (number_sections && section_alist[index].num)
+
+  if (xml)
     {
-      /* reset the marker if we get into enumerated areas */
-      if (section_alist[index].num == ENUM_SECT_YES
-	  && level == 0
-	  && enum_marker == UNNUMBERED_MAGIC)
-	enum_marker = 0;
-      /* This is special for appendix; if we got the first
-         time an appendix command then we are entering appendix.
-         Thats the point we have to start countint with A, B and so on. */
-      if (section_alist[index].num == ENUM_SECT_APP
-	  && level == 0
-	  && enum_marker != APPENDIX_MAGIC)
+      /* If the section appears in the toc, it means it's a real section
+	 unlike majorheading, chapheading etc. */
+      if (section_alist[search_sectioning (cmd)].toc == TOC_YES)
 	{
-	  enum_marker = APPENDIX_MAGIC;
-	  numbers [0] = 0; /* this means we start with Appendix A */
-	}
-  
-      /* only increment counters if we are not in unnumbered
-         area. This handles situations like this:
-         @unnumbered ....   This sets enum_marker to UNNUMBERED_MAGIC
-         @section ....   */
-      if (enum_marker != UNNUMBERED_MAGIC)
-	{
-	  int i;
+	  xml_close_sections (level);
+	  /* Mark the beginning of the section
+	     If the next command is printindex, we will remove
+	     the section and put an Index instead */
+	  flush_output ();
+	  xml_last_section_output_position = output_paragraph_offset;
+
+	  get_rest_of_line (0, &temp);
+
+          /* Use @settitle value if @top parameter is empty.  */
+          if (STREQ (command, "top") && strlen(temp) == 0)
+            temp = xstrdup (title ? title : "");
+
+          /* Docbook does not support @unnumbered at all.  So we provide numbers
+             that other formats use.  @appendix seems to be fine though, so we let
+             Docbook handle that as usual.  */
+          if (docbook && enum_marker != APPENDIX_MAGIC)
+            {
+              if (section_alist[search_sectioning (cmd)].num == ENUM_SECT_NO
+                  && section_alist[search_sectioning (cmd)].toc == TOC_YES)
+                xml_insert_element_with_attribute (xml_element (secname),
+                    START, "label=\"%s\" xreflabel=\"%s\"",
+                    handle_enum_increment (level, search_sectioning (cmd)),
+                    text_expansion (temp));
+              else
+                xml_insert_element_with_attribute (xml_element (secname),
+                    START, "label=\"%s\"",
+                    handle_enum_increment (level, search_sectioning (cmd)));
+            }
+          else
+            xml_insert_element (xml_element (secname), START);
 
-	  /* reset all counters which are one level deeper */
-	  for (i = level; i < 3; i++)
-	    numbers [i + 1] = 0;
-  
-	  numbers[level]++;
-	  return xstrdup
-	    (get_sectioning_number (level, section_alist[index].num));
+	  xml_insert_element (TITLE, START);
+	  xml_open_section (level, secname);
+	  execute_string ("%s", temp);
+	  xml_insert_element (TITLE, END);
+
+	  free (temp);
 	}
-    } /* if (number_sections)... */
+      else
+        {
+          if (docbook)
+            {
+              if (level > 0)
+                xml_insert_element_with_attribute (xml_element (secname), START,
+                    "renderas=\"sect%d\"", level);
+              else
+                xml_insert_element_with_attribute (xml_element (secname), START,
+                    "renderas=\"other\"");
+            }
+          else
+            xml_insert_element (xml_element (secname), START);
+
+          get_rest_of_line (0, &temp);
+          execute_string ("%s", temp);
+          free (temp);
 
-  return xstrdup ("");
+          xml_insert_element (xml_element (secname), END);
+        }
+    }
+  else if (html)
+    sectioning_html (level, secname);
+  else
+    insert_and_underscore (level, secname);
 }
 
 
@@ -327,16 +430,14 @@ handle_enum_increment (level, index)
    in a new, separate paragraph.  Directly underneath it, insert a
    line of WITH_CHAR, the same length of the inserted text. */
 void
-insert_and_underscore (level, with_char, cmd)
-     int level;
-     int with_char;
-     char *cmd;
+insert_and_underscore (int level, char *cmd)
 {
   int i, len;
   int index;
   int old_no_indent;
   unsigned char *starting_pos, *ending_pos;
   char *temp;
+  char with_char = scoring_characters[level];
 
   close_paragraph ();
   filling_enabled =  indented_fill = 0;
@@ -347,13 +448,23 @@ insert_and_underscore (level, with_char, cmd)
     append_to_expansion_output (input_text_offset + 1);
 
   get_rest_of_line (0, &temp);
+
+  /* Use @settitle value if @top parameter is empty.  */
+  if (STREQ (command, "top") && strlen(temp) == 0)
+    temp = xstrdup (title ? title : "");
+
   starting_pos = output_paragraph + output_paragraph_offset;
 
+  /* Poor man's cache for section title.  */
+  if (strlen (last_sectioning_title))
+    free (last_sectioning_title);
+  last_sectioning_title = xstrdup (temp);
+
   index = search_sectioning (cmd);
   if (index < 0)
     {
       /* should never happen, but a poor guy, named Murphy ... */
-      warning (_("Internal error (search_sectioning) \"%s\"!"), cmd);
+      warning (_("Internal error (search_sectioning) `%s'!"), cmd);
       return;
     }
 
@@ -362,7 +473,7 @@ insert_and_underscore (level, with_char, cmd)
      output.  */
 
   /* Step 1: produce "X.Y" and add it to Info output.  */
-  add_word (handle_enum_increment (level, index));
+  add_word_args ("%s ", handle_enum_increment (level, index));
 
   /* Step 2: add "SECTION-NAME" to both Info and macro-expanded output.  */
   if (macro_expansion_output_stream && !executing_string)
@@ -397,10 +508,9 @@ insert_and_underscore (level, with_char, cmd)
 /* Insert the text following input_text_offset up to the end of the
    line as an HTML heading element of the appropriate `level' and
    tagged as an anchor for the current node.. */
+
 void
-sectioning_html (level, cmd)
-     int level;
-     char *cmd;
+sectioning_html (int level, char *cmd)
 {
   static int toc_ref_count = 0;
   int index;
@@ -413,7 +523,8 @@ sectioning_html (level, cmd)
   old_no_indent = no_indent;
   no_indent = 1;
 
-  add_word_args ("<h%d>", level + 2); /* level 0 (chapter) is <h2> */
+  /* level 0 (chapter) is <h2>, and we go down from there.  */
+  add_html_block_elt_args ("<h%d class=\"%s\">", level + 2, cmd);
 
   /* If we are outside of any node, produce an anchor that
      the TOC could refer to.  */
@@ -426,8 +537,11 @@ sectioning_html (level, cmd)
       toc_anchor = substring (starting_pos + sizeof (a_name) - 1,
                               output_paragraph + output_paragraph_offset);
       /* This must be added after toc_anchor is extracted, since
-	 toc_anchor cannot include the closing </a>.  For details,
-	 see toc.c:toc_add_entry and toc.c:contents_update_html.  */
+         toc_anchor cannot include the closing </a>.  For details,
+         see toc.c:toc_add_entry and toc.c:contents_update_html.
+
+         Also, the anchor close must be output before the section name
+         in case the name itself contains an anchor. */
       add_word ("</a>");
     }
   starting_pos = output_paragraph + output_paragraph_offset;
@@ -437,6 +551,10 @@ sectioning_html (level, cmd)
 
   get_rest_of_line (0, &temp);
 
+  /* Use @settitle value if @top parameter is empty.  */
+  if (STREQ (command, "top") && strlen(temp) == 0)
+    temp = xstrdup (title ? title : "");
+
   index = search_sectioning (cmd);
   if (index < 0)
     {
@@ -446,7 +564,11 @@ sectioning_html (level, cmd)
     }
 
   /* Produce "X.Y" and add it to HTML output.  */
-  add_word (handle_enum_increment (level, index));
+  {
+    char *title_number = handle_enum_increment (level, index);
+    if (strlen (title_number) > 0)
+      add_word_args ("%s ", title_number);
+  }
 
   /* add the section name to both HTML and macro-expanded output.  */
   if (macro_expansion_output_stream && !executing_string)
@@ -480,7 +602,7 @@ sectioning_html (level, cmd)
 
 /* Shift the meaning of @section to @chapter. */
 void
-cm_raisesections ()
+cm_raisesections (void)
 {
   discard_until ("\n");
   section_alist_offset--;
@@ -488,7 +610,7 @@ cm_raisesections ()
 
 /* Shift the meaning of @chapter to @section. */
 void
-cm_lowersections ()
+cm_lowersections (void)
 {
   discard_until ("\n");
   section_alist_offset++;
@@ -496,8 +618,7 @@ cm_lowersections ()
 
 /* The command still works, but prints a warning message in addition. */
 void
-cm_ideprecated (arg, start, end)
-     int arg, start, end;
+cm_ideprecated (int arg, int start, int end)
 {
   warning (_("%c%s is obsolete; use %c%s instead"),
            COMMAND_PREFIX, command, COMMAND_PREFIX, command + 1);
@@ -508,7 +629,7 @@ cm_ideprecated (arg, start, end)
 /* Treat this just like @unnumbered.  The only difference is
    in node defaulting. */
 void
-cm_top ()
+cm_top (void)
 {
   /* It is an error to have more than one @top. */
   if (top_node_seen && strcmp (current_node, "Top") != 0)
@@ -523,7 +644,7 @@ cm_top ()
           if (tag->flags & TAG_FLAG_IS_TOP)
             {
               file_line_error (tag->filename, tag->line_no,
-			       _("Here is the %ctop node"), COMMAND_PREFIX);
+                               _("Here is the %ctop node"), COMMAND_PREFIX);
               return;
             }
           tag = tag->next_ent;
@@ -531,7 +652,6 @@ cm_top ()
     }
   else
     {
-      TAG_ENTRY *top_node = find_node ("Top");
       top_node_seen = 1;
 
       /* It is an error to use @top before using @node. */
@@ -573,7 +693,8 @@ cm_top ()
             if (input_text_offset < input_text_length)
               input_text_offset++;
 
-            this_section = what_section (input_text + input_text_offset);
+            this_section = what_section (input_text + input_text_offset,
+                                         NULL);
 
             /* If we found a sectioning command, then give the top section
                a level of this section - 1. */
@@ -587,42 +708,44 @@ cm_top ()
 
 /* The remainder of the text on this line is a chapter heading. */
 void
-cm_chapter ()
+cm_chapter (void)
 {
+  enum_marker = 0;
   sectioning_underscore ("chapter");
 }
 
 /* The remainder of the text on this line is a section heading. */
 void
-cm_section ()
+cm_section (void)
 {
   sectioning_underscore ("section");
 }
 
 /* The remainder of the text on this line is a subsection heading. */
 void
-cm_subsection ()
+cm_subsection (void)
 {
   sectioning_underscore ("subsection");
 }
 
 /* The remainder of the text on this line is a subsubsection heading. */
 void
-cm_subsubsection ()
+cm_subsubsection (void)
 {
   sectioning_underscore ("subsubsection");
 }
 
 /* The remainder of the text on this line is an unnumbered heading. */
 void
-cm_unnumbered ()
+cm_unnumbered (void)
 {
+  enum_marker = UNNUMBERED_MAGIC;
   sectioning_underscore ("unnumbered");
 }
 
 /* The remainder of the text on this line is an unnumbered section heading. */
 void
-cm_unnumberedsec ()
+cm_unnumberedsec (void)
 {
   sectioning_underscore ("unnumberedsec");
 }
@@ -630,7 +753,7 @@ cm_unnumberedsec ()
 /* The remainder of the text on this line is an unnumbered
    subsection heading. */
 void
-cm_unnumberedsubsec ()
+cm_unnumberedsubsec (void)
 {
   sectioning_underscore ("unnumberedsubsec");
 }
@@ -638,28 +761,32 @@ cm_unnumberedsubsec ()
 /* The remainder of the text on this line is an unnumbered
    subsubsection heading. */
 void
-cm_unnumberedsubsubsec ()
+cm_unnumberedsubsubsec (void)
 {
   sectioning_underscore ("unnumberedsubsubsec");
 }
 
 /* The remainder of the text on this line is an appendix heading. */
 void
-cm_appendix ()
+cm_appendix (void)
 {
+  /* Reset top level number so we start from Appendix A */
+  if (enum_marker != APPENDIX_MAGIC)
+    numbers [0] = 0;
+  enum_marker = APPENDIX_MAGIC;
   sectioning_underscore ("appendix");
 }
 
 /* The remainder of the text on this line is an appendix section heading. */
 void
-cm_appendixsec ()
+cm_appendixsec (void)
 {
   sectioning_underscore ("appendixsec");
 }
 
 /* The remainder of the text on this line is an appendix subsection heading. */
 void
-cm_appendixsubsec ()
+cm_appendixsubsec (void)
 {
   sectioning_underscore ("appendixsubsec");
 }
@@ -667,38 +794,38 @@ cm_appendixsubsec ()
 /* The remainder of the text on this line is an appendix
    subsubsection heading. */
 void
-cm_appendixsubsubsec ()
+cm_appendixsubsubsec (void)
 {
   sectioning_underscore ("appendixsubsubsec");
 }
 
 /* Compatibility functions substitute for chapter, section, etc. */
 void
-cm_majorheading ()
+cm_majorheading (void)
 {
   sectioning_underscore ("majorheading");
 }
 
 void
-cm_chapheading ()
+cm_chapheading (void)
 {
   sectioning_underscore ("chapheading");
 }
 
 void
-cm_heading ()
+cm_heading (void)
 {
   sectioning_underscore ("heading");
 }
 
 void
-cm_subheading ()
+cm_subheading (void)
 {
   sectioning_underscore ("subheading");
 }
 
 void
-cm_subsubheading ()
+cm_subsubheading (void)
 {
   sectioning_underscore ("subsubheading");
 }
diff --git a/gnu/usr.bin/texinfo/makeinfo/sectioning.h b/gnu/usr.bin/texinfo/makeinfo/sectioning.h
index 2941088f1f3..250c61dc2b3 100644
--- a/gnu/usr.bin/texinfo/makeinfo/sectioning.h
+++ b/gnu/usr.bin/texinfo/makeinfo/sectioning.h
@@ -1,7 +1,7 @@
 /* sectioning.h -- all related stuff @chapter, @section... @contents
-   $Id: sectioning.h,v 1.1.1.1 2000/02/09 01:25:31 espie Exp $
+   $Id: sectioning.h,v 1.1.1.2 2006/07/17 16:03:48 espie Exp $
 
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2003 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
@@ -23,28 +23,51 @@
 #define SECTIONING_H
 
 /* Sectioning.  */
-extern void
-  cm_chapter (), cm_unnumbered (), cm_appendix (), cm_top (),
-  cm_section (), cm_unnumberedsec (), cm_appendixsec (),
-  cm_subsection (), cm_unnumberedsubsec (), cm_appendixsubsec (),
-  cm_subsubsection (), cm_unnumberedsubsubsec (), cm_appendixsubsubsec (),
-  cm_heading (), cm_chapheading (), cm_subheading (), cm_subsubheading (),
-  cm_majorheading (), cm_raisesections (), cm_lowersections (),
 
-  cm_ideprecated ();
+/* Level 4.  */
+extern void cm_chapter (void),
+  cm_unnumbered (void),
+  cm_appendix (void),
+  cm_top (void);
+
+/* Level 3.  */
+extern void cm_section (void),
+  cm_unnumberedsec (void),
+  cm_appendixsec (void);
+
+/* Level 2.  */
+extern void cm_subsection (void),
+  cm_unnumberedsubsec (void),
+  cm_appendixsubsec (void);
+
+/* Level 1.  */
+extern void cm_subsubsection (void),
+  cm_unnumberedsubsubsec (void),
+  cm_appendixsubsubsec (void);
+
+/* Headings.  */
+extern void cm_heading (void),
+  cm_chapheading (void),
+  cm_subheading (void),
+  cm_subsubheading (void),
+  cm_majorheading (void);
+
+extern void cm_raisesections (void),
+  cm_lowersections (void),
+  cm_ideprecated (int arg, int start, int end);
 
 extern void
-  sectioning_underscore (), insert_and_underscore ();
-
-extern int what_section ();
-
-
+  sectioning_underscore (char *cmd),
+  insert_and_underscore (int level, char *cmd);
 
-/* is needed in node.c */
-extern int set_top_section_level ();
+/* needed in node.c */
+extern int set_top_section_level (int level);
 
-extern void sectioning_html ();
-extern int what_section ();
+extern void sectioning_html (int level, char *cmd);
+extern int what_section (char *text, char **secname);
+extern char *current_chapter_number (void),
+  *current_sectioning_number (void),
+  *current_sectioning_name (void);
 
 /* The argument of @settitle, used for HTML. */
 extern char *title;
diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/Makefile.am b/gnu/usr.bin/texinfo/makeinfo/tests/Makefile.am
index 2465c041524..4de96d7ee90 100644
--- a/gnu/usr.bin/texinfo/makeinfo/tests/Makefile.am
+++ b/gnu/usr.bin/texinfo/makeinfo/tests/Makefile.am
@@ -1,18 +1,36 @@
+# $Id: Makefile.am,v 1.1.1.3 2006/07/17 16:03:49 espie Exp $
 # Makefile.am for texinfo/tests/makeinfo.
-# Run automake in ../.. to produce Makefile.in from this.
+#
+# This file is free software; as a special exception the author 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.
 
-TESTS = accent accentenc cond \
+TESTS = accent accentenc \
+  cond \
+  copying \
+  defxcond \
   html-docdesc html-extrali html-min html-manuals html-para html-title \
+  html-top \
+  include-value \
   macro-at menu-whitespace \
   no-headers \
   node-expand node-value node-whitespace \
-  top top2
+  top \
+  twofiles
 
 noinst_SCRIPTS = $(TESTS)
 
 EXTRA_DIST = $(noinst_SCRIPTS) \
-  accent.txi accentenc.txi accent-text.txi cond.txi \
+  accent.txi accentenc.txi accent-text.txi \
+  cond.txi copying.txi \
+  defxcond.txi \
   html-docdesc.txi html-extrali.txi html-min.txi html-para.txi html-title.txi \
+  html-top.txi \
+  include-value.txi incl-incl.txi \
   macro-at.txi menu-whitespace.txi \
   node-expand.txi node-value.txi node-whitespace.txi \
-  top.txi top2.txi
+  top.txi # top2.txi
diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/Makefile.in b/gnu/usr.bin/texinfo/makeinfo/tests/Makefile.in
index 648211d6a99..b07976e4a02 100644
--- a/gnu/usr.bin/texinfo/makeinfo/tests/Makefile.in
+++ b/gnu/usr.bin/texinfo/makeinfo/tests/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6 from Makefile.am.
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,136 +14,252 @@
 
 @SET_MAKE@
 
+# $Id: Makefile.in,v 1.1.1.3 2006/07/17 16:03:49 espie Exp $
 # Makefile.am for texinfo/tests/makeinfo.
-# Run automake in ../.. to produce Makefile.in from this.
-SHELL = @SHELL@
+#
+# This file is free software; as a special exception the author 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.
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = makeinfo/tests
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \
+	$(top_srcdir)/m4/intmax.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/longdouble.m4 $(top_srcdir)/m4/longlong.m4 \
+	$(top_srcdir)/m4/mkstemp.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/onceonly_2_57.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/printf-posix.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/signed.m4 $(top_srcdir)/m4/size_max.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/strcase.m4 \
+	$(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \
+	$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wint_t.m4 \
+	$(top_srcdir)/m4/xsize.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SCRIPTS = $(noinst_SCRIPTS)
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
-HAVE_LIB = @HAVE_LIB@
+HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@
+HAVE_SNPRINTF = @HAVE_SNPRINTF@
+HAVE_WPRINTF = @HAVE_WPRINTF@
+HELP2MAN = @HELP2MAN@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTALL_WARNINGS_FALSE = @INSTALL_WARNINGS_FALSE@
+INSTALL_WARNINGS_TRUE = @INSTALL_WARNINGS_TRUE@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-LIB = @LIB@
+LDFLAGS = @LDFLAGS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
-LTLIB = @LTLIB@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 STRIP = @STRIP@
 TERMLIBS = @TERMLIBS@
+TOOLS_ONLY_FALSE = @TOOLS_ONLY_FALSE@
+TOOLS_ONLY_TRUE = @TOOLS_ONLY_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
-
-TESTS = accent accentenc cond \
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+native_tools = @native_tools@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+TESTS = accent accentenc \
+  cond \
+  copying \
+  defxcond \
   html-docdesc html-extrali html-min html-manuals html-para html-title \
+  html-top \
+  include-value \
   macro-at menu-whitespace \
   no-headers \
   node-expand node-value node-whitespace \
-  top top2
-
+  top \
+  twofiles
 
 noinst_SCRIPTS = $(TESTS)
-
 EXTRA_DIST = $(noinst_SCRIPTS) \
-  accent.txi accentenc.txi accent-text.txi cond.txi \
+  accent.txi accentenc.txi accent-text.txi \
+  cond.txi copying.txi \
+  defxcond.txi \
   html-docdesc.txi html-extrali.txi html-min.txi html-para.txi html-title.txi \
+  html-top.txi \
+  include-value.txi incl-incl.txi \
   macro-at.txi menu-whitespace.txi \
   node-expand.txi node-value.txi node-whitespace.txi \
-  top.txi top2.txi
-
-subdir = makeinfo/tests
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SCRIPTS = $(noinst_SCRIPTS)
+  top.txi # top2.txi
 
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  makeinfo/tests/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  makeinfo/tests/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-install-info-am:
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 uninstall-info-am:
 tags: TAGS
 TAGS:
 
+ctags: CTAGS
+CTAGS:
+
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; \
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
 	srcdir=$(srcdir); export srcdir; \
 	list='$(TESTS)'; \
 	if test -n "$$list"; then \
@@ -155,26 +271,29 @@ check-TESTS: $(TESTS)
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
 	      *" $$tst "*) \
-	        xpass=`expr $$xpass + 1`; \
-	        failed=`expr $$failed + 1`; \
-	        echo "XPASS: $$tst"; \
+		xpass=`expr $$xpass + 1`; \
+		failed=`expr $$failed + 1`; \
+		echo "XPASS: $$tst"; \
 	      ;; \
 	      *) \
-	        echo "PASS: $$tst"; \
+		echo "PASS: $$tst"; \
 	      ;; \
 	      esac; \
 	    elif test $$? -ne 77; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
 	      *" $$tst "*) \
-	        xfail=`expr $$xfail + 1`; \
-	        echo "XFAIL: $$tst"; \
+		xfail=`expr $$xfail + 1`; \
+		echo "XFAIL: $$tst"; \
 	      ;; \
 	      *) \
-	        failed=`expr $$failed + 1`; \
-	        echo "FAIL: $$tst"; \
+		failed=`expr $$failed + 1`; \
+		echo "FAIL: $$tst"; \
 	      ;; \
 	      esac; \
+	    else \
+	      skip=`expr $$skip + 1`; \
+	      echo "SKIP: $$tst"; \
 	    fi; \
 	  done; \
 	  if test "$$failed" -eq 0; then \
@@ -190,30 +309,49 @@ check-TESTS: $(TESTS)
 	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
 	    fi; \
 	  fi; \
-	  dashes=`echo "$$banner" | sed s/./=/g`; \
+	  dashes="$$banner"; \
+	  skipped=""; \
+	  if test "$$skip" -ne 0; then \
+	    skipped="($$skip tests were not run)"; \
+	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+	      dashes="$$skipped"; \
+	  fi; \
+	  report=""; \
+	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
+	    report="Please report to $(PACKAGE_BUGREPORT)"; \
+	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
+	      dashes="$$report"; \
+	  fi; \
+	  dashes=`echo "$$dashes" | sed s/./=/g`; \
 	  echo "$$dashes"; \
 	  echo "$$banner"; \
+	  test -z "$$skipped" || echo "$$skipped"; \
+	  test -z "$$report" || echo "$$report"; \
 	  echo "$$dashes"; \
 	  test "$$failed" -eq 0; \
 	else :; fi
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pR $$d/$$file $(distdir)$$dir \
-	    || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || cp -p $$d/$$file $(distdir)/$$file \
@@ -224,9 +362,7 @@ check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
 all-am: Makefile $(SCRIPTS)
-
 installdirs:
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -238,7 +374,7 @@ install-am: all-am
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -246,7 +382,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -256,13 +392,15 @@ clean: clean-am
 clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -271,27 +409,38 @@ install-data-am:
 
 install-exec-am:
 
+install-info: install-info-am
+
 install-man:
 
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
 .PHONY: all all-am check check-TESTS check-am clean clean-generic \
-	distclean distclean-generic distdir dvi dvi-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	uninstall uninstall-am uninstall-info-am
+	distclean distclean-generic distdir dvi dvi-am html html-am \
+	info info-am install install-am install-data install-data-am \
+	install-exec install-exec-am install-info install-info-am \
+	install-man install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+	uninstall-am uninstall-info-am
 
 # 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/gnu/usr.bin/texinfo/makeinfo/tests/accent b/gnu/usr.bin/texinfo/makeinfo/tests/accent
index dc008683200..16c69e8e0d3 100644
--- a/gnu/usr.bin/texinfo/makeinfo/tests/accent
+++ b/gnu/usr.bin/texinfo/makeinfo/tests/accent
@@ -1,16 +1,17 @@
 #!/bin/sh
 # Test accent output.
 
+unset TEXINFO_OUTPUT
 : ${srcdir=.}
 input=`basename $0`.txi
 
-# html
+# html.
 houtput=`basename $0`.html
 ../makeinfo --html --no-split -I$srcdir $srcdir/$input
 hexit_status=$?
 if test $hexit_status = 0; then
   grep '&igrave;' $houtput >/dev/null \
-  && grep '&acute;i' $houtput >/dev/null \
+  && grep '&acute;j' $houtput >/dev/null \
   && grep '&Oslash;' $houtput >/dev/null \
   && grep '/L' $houtput >/dev/null
   hexit_status=$?
diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/accent-text.txi b/gnu/usr.bin/texinfo/makeinfo/tests/accent-text.txi
index e1bd2dacbdf..4d9ef3ca587 100644
--- a/gnu/usr.bin/texinfo/makeinfo/tests/accent-text.txi
+++ b/gnu/usr.bin/texinfo/makeinfo/tests/accent-text.txi
@@ -54,7 +54,7 @@ es-zet or sharp S: @ss{}
 
 pounds sterling: @pounds{}      
 
-@c arg is command
+@c arg is command -- @dotless{i} is special-cased for HTML
 should be dotless i`: @`{@dotless{i}}
 
 should be dotless i': @'{@dotless{i}}
@@ -62,3 +62,12 @@ should be dotless i': @'{@dotless{i}}
 should be dotless i^: @^{@dotless{i}}
 
 should be dotless i": @"{@dotless{i}}
+
+@c arg is command -- @dotless{j}
+should be dotless j`: @`{@dotless{j}}
+
+should be dotless j': @'{@dotless{j}}
+
+should be dotless j^: @^{@dotless{j}}
+
+should be dotless j": @"{@dotless{j}}
diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/accentenc b/gnu/usr.bin/texinfo/makeinfo/tests/accentenc
index baf26b60186..be842c368b8 100644
--- a/gnu/usr.bin/texinfo/makeinfo/tests/accentenc
+++ b/gnu/usr.bin/texinfo/makeinfo/tests/accentenc
@@ -1,11 +1,16 @@
 #!/bin/sh
 # Test encoded accent info output.
 
+unset TEXINFO_OUTPUT
 : ${srcdir=.}
 input=`basename $0`.txi
 output=`basename $0`.info
 
-../makeinfo --enable-encoding --no-split -I$srcdir $srcdir/$input
+# we expect two invalid encoded characters:
+# accent-text.txi:45: warning: invalid encoded character `#156'.
+# accent-text.txi:45: warning: invalid encoded character `#140'.
+# These are oe and OE, and they are not supported in Latin 1.
+../makeinfo --enable-encoding --no-split -I$srcdir $srcdir/$input 2>/dev/null
 exit_status=$?
 if test $exit_status = 0; then
   grep 'ì' $output >/dev/null \
diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/cond b/gnu/usr.bin/texinfo/makeinfo/tests/cond
index 5f66e14afed..24a1cd4cb3a 100644
--- a/gnu/usr.bin/texinfo/makeinfo/tests/cond
+++ b/gnu/usr.bin/texinfo/makeinfo/tests/cond
@@ -1,6 +1,7 @@
 #!/bin/sh
 # Test conditional text.
 
+unset TEXINFO_OUTPUT
 : ${srcdir=.}
 
 # Default Info output.
diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/copying b/gnu/usr.bin/texinfo/makeinfo/tests/copying
new file mode 100755
index 00000000000..fa2cef93bf0
--- /dev/null
+++ b/gnu/usr.bin/texinfo/makeinfo/tests/copying
@@ -0,0 +1,13 @@
+#!/bin/sh
+# $Id: copying,v 1.1.1.1 2006/07/17 16:03:49 espie Exp $
+# Test @copying.  The configure script for tramp uses this to make sure
+# the makeinfo that is present supports @copying.
+
+unset TEXINFO_OUTPUT LANG LANGUAGE
+LC_ALL=POSIX; export LC_ALL
+: ${srcdir=.}
+
+../makeinfo -o copying.out $srcdir/copying.txi || exit 1
+fgrep 'produced by' copying.out >/dev/null || exit 2
+
+rm -f copying.out
diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/copying.txi b/gnu/usr.bin/texinfo/makeinfo/tests/copying.txi
new file mode 100644
index 00000000000..3b836795050
--- /dev/null
+++ b/gnu/usr.bin/texinfo/makeinfo/tests/copying.txi
@@ -0,0 +1,4 @@
+\input texinfo   @c -*-texinfo-*-
+@copying
+@end copying
+@bye
diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/defxcond b/gnu/usr.bin/texinfo/makeinfo/tests/defxcond
new file mode 100755
index 00000000000..e48986785d7
--- /dev/null
+++ b/gnu/usr.bin/texinfo/makeinfo/tests/defxcond
@@ -0,0 +1,16 @@
+#!/bin/sh
+# Test conditionalized @deffnx.
+# Report from: Akim Demaille <akim@epita.fr>, 14 Aug 2003 12:10:37 +0200.
+
+unset TEXINFO_OUTPUT
+: ${srcdir=.}
+
+test=defxcond
+
+../makeinfo -Dbar -o $test.out $srcdir/$test.txi || exit 1
+grep ' -- bar:' $test.out >/dev/null || exit 2
+
+../makeinfo -Ubar -o $test.out $srcdir/$test.txi || exit 3
+grep ' -- bar:' $test.out >/dev/null && exit 4
+
+rm -f $test.out
diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/defxcond.txi b/gnu/usr.bin/texinfo/makeinfo/tests/defxcond.txi
new file mode 100644
index 00000000000..a7af9e21e75
--- /dev/null
+++ b/gnu/usr.bin/texinfo/makeinfo/tests/defxcond.txi
@@ -0,0 +1,18 @@
+\input texinfo
+@setfilename defxcond.info
+
+@c set this from the command line.
+@c set bar
+
+@c deffnx inside conditional.
+@deffn foo
+
+@ifset bar
+@deffnx bar
+@end ifset
+
+Documentation.
+
+@end deffn
+
+@bye
diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/html-extrali.txi b/gnu/usr.bin/texinfo/makeinfo/tests/html-extrali.txi
index 281aa7b3193..d0c17e98785 100644
--- a/gnu/usr.bin/texinfo/makeinfo/tests/html-extrali.txi
+++ b/gnu/usr.bin/texinfo/makeinfo/tests/html-extrali.txi
@@ -1,7 +1,7 @@
 \input texinfo
 @setfilename menuli.info
 
-@c extra <li> generated after <menu>
+@c extra li generated after <menu>
 @c From: Marius Groeger <mag@sysgo.de>, 13nov98.
 
 @menu
diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/html-manuals b/gnu/usr.bin/texinfo/makeinfo/tests/html-manuals
index 5e9523c820e..93faafd2a76 100644
--- a/gnu/usr.bin/texinfo/makeinfo/tests/html-manuals
+++ b/gnu/usr.bin/texinfo/makeinfo/tests/html-manuals
@@ -1,11 +1,12 @@
 #!/bin/sh
+# $Id: html-manuals,v 1.1.1.2 2006/07/17 16:03:49 espie Exp $
 # Test that all the distribution manuals can be converted to HTML.
 
 : ${srcdir=.}
 
 for manual in info.texi info-stnd.texi texinfo.txi; do
   base=`echo $manual | sed 's/\.te*xi$//'`
-  ../makeinfo --html -I$srcdir/../../doc --no-split \
+  ../makeinfo --html -I$srcdir/../../doc -I../../doc --no-split \
               $srcdir/../../doc/$manual -o $base.html \
   || exit 1
   rm -f $base.html
diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/html-top b/gnu/usr.bin/texinfo/makeinfo/tests/html-top
new file mode 100755
index 00000000000..038404a49d1
--- /dev/null
+++ b/gnu/usr.bin/texinfo/makeinfo/tests/html-top
@@ -0,0 +1,13 @@
+#!/bin/sh
+# Test that a bare top node does not crash with --html.
+
+: ${srcdir=.}
+
+# But this input file is erroneous, so throw away errors.
+../makeinfo --no-split --force -o html-top.html --html $srcdir/html-top.txi \
+2>/dev/null
+test -s html-top.html
+exit_status=$?
+
+rm -f html-top.html
+exit $exit_status
diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/html-top.txi b/gnu/usr.bin/texinfo/makeinfo/tests/html-top.txi
new file mode 100644
index 00000000000..ade7214b0c2
--- /dev/null
+++ b/gnu/usr.bin/texinfo/makeinfo/tests/html-top.txi
@@ -0,0 +1,7 @@
+\input texinfo
+@setfilename top.info
+
+@node start
+@top
+
+@bye
diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/incl-incl.txi b/gnu/usr.bin/texinfo/makeinfo/tests/incl-incl.txi
new file mode 100644
index 00000000000..4efea484317
--- /dev/null
+++ b/gnu/usr.bin/texinfo/makeinfo/tests/incl-incl.txi
@@ -0,0 +1 @@
+This is the @emph{included} file (include-value2.txi).
diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/include-value b/gnu/usr.bin/texinfo/makeinfo/tests/include-value
new file mode 100755
index 00000000000..b55f6659322
--- /dev/null
+++ b/gnu/usr.bin/texinfo/makeinfo/tests/include-value
@@ -0,0 +1,22 @@
+#!/bin/sh
+# $Id: include-value,v 1.1.1.1 2006/07/17 16:03:49 espie Exp $
+# Test @value expansion in @include and @verbatiminclude names.
+
+unset TEXINFO_OUTPUT
+: ${srcdir=.}
+
+../makeinfo -I $srcdir $srcdir/include-value.txi
+exit_status=$?
+
+if test $exit_status = 0; then
+  # should have three instances of _included_,
+  # and three of {included}.
+  count=`grep _included_ include-value.info | wc -l`
+  test $count = 3 || exit_status=`expr $exit_status + 1`
+
+  count=`grep '{included}' include-value.info | wc -l`
+  test $count = 3 || exit_status=`expr $exit_status + 1`
+fi
+
+rm -f include-value.info
+exit $exit_status
diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/include-value.txi b/gnu/usr.bin/texinfo/makeinfo/tests/include-value.txi
new file mode 100644
index 00000000000..e636dc8e14d
--- /dev/null
+++ b/gnu/usr.bin/texinfo/makeinfo/tests/include-value.txi
@@ -0,0 +1,32 @@
+\input texinfo
+@setfilename include-value.info
+@c $Id: include-value.txi,v 1.1.1.1 2006/07/17 16:03:49 espie Exp $
+
+@set testvar incl-incl.txi
+
+@c test - in the variable name, and concatenation of text after.
+@set test-var incl-incl.tx
+
+@c test - in the variable name, and concatenation of text before and after.
+@set test_var ncl-incl.tx
+
+
+@node Top
+
+testvar include: @include @value{testvar}
+
+testvar verbatiminclude: @verbatiminclude @value{testvar}
+
+
+test-var include: @include @value{test-var}i
+
+test-var verbatiminclude: @verbatiminclude @value{test-var}i
+
+
+test_var include: @include i@value{test_var}i
+
+test_var verbatiminclude: @verbatiminclude i@value{test_var}i
+
+
+@bye
+
diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/macro-at b/gnu/usr.bin/texinfo/makeinfo/tests/macro-at
index 90841e89f11..a9dfdab3be9 100644
--- a/gnu/usr.bin/texinfo/makeinfo/tests/macro-at
+++ b/gnu/usr.bin/texinfo/makeinfo/tests/macro-at
@@ -1,6 +1,7 @@
 #!/bin/sh
 # Test @@ in macro expansions, etc.  --eliz, 14nov99.
 
+unset TEXINFO_OUTPUT
 : ${srcdir=.}
 ../makeinfo $srcdir/macro-at.txi || exit 1
 
diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/menu-whitespace b/gnu/usr.bin/texinfo/makeinfo/tests/menu-whitespace
index bdc84a13854..a01a38d5c04 100644
--- a/gnu/usr.bin/texinfo/makeinfo/tests/menu-whitespace
+++ b/gnu/usr.bin/texinfo/makeinfo/tests/menu-whitespace
@@ -1,6 +1,7 @@
 #!/bin/sh
 # Bug where whitespace after @menu caused confusion.
 
+unset TEXINFO_OUTPUT
 : ${srcdir=.}
 input=`basename $0`.txi
 
diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/no-headers b/gnu/usr.bin/texinfo/makeinfo/tests/no-headers
index 17570bb6f48..e0718713f32 100644
--- a/gnu/usr.bin/texinfo/makeinfo/tests/no-headers
+++ b/gnu/usr.bin/texinfo/makeinfo/tests/no-headers
@@ -2,6 +2,7 @@
 # Test that info.texi works with --no-headers (this includes node
 # pointer defaulting).
 
+unset TEXINFO_OUTPUT
 : ${srcdir=.}
 docdir=$srcdir/../../doc
 
diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/node-expand b/gnu/usr.bin/texinfo/makeinfo/tests/node-expand
index 12a67a43f82..26dee246478 100644
--- a/gnu/usr.bin/texinfo/makeinfo/tests/node-expand
+++ b/gnu/usr.bin/texinfo/makeinfo/tests/node-expand
@@ -1,6 +1,7 @@
 #!/bin/sh
 # Test command expansion in node names.
 
+unset TEXINFO_OUTPUT
 : ${srcdir=.}
 
 ../makeinfo --commands-in-node-names $srcdir/node-expand.txi
diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/node-expand.txi b/gnu/usr.bin/texinfo/makeinfo/tests/node-expand.txi
index 42cb614d308..c31be5a4ebc 100644
--- a/gnu/usr.bin/texinfo/makeinfo/tests/node-expand.txi
+++ b/gnu/usr.bin/texinfo/makeinfo/tests/node-expand.txi
@@ -14,7 +14,7 @@
 @ifnottex
 
 @node Top, (dir), (dir), (dir)
-@top
+@top Expansion in Node Names
 
 @end ifnottex
 
diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/node-value b/gnu/usr.bin/texinfo/makeinfo/tests/node-value
index 90c250bc17b..aff0be22dea 100644
--- a/gnu/usr.bin/texinfo/makeinfo/tests/node-value
+++ b/gnu/usr.bin/texinfo/makeinfo/tests/node-value
@@ -1,6 +1,7 @@
 #!/bin/sh
 # Test @value expansion in node names.
 
+unset TEXINFO_OUTPUT
 : ${srcdir=.}
 
 ../makeinfo $srcdir/node-value.txi
diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/node-whitespace b/gnu/usr.bin/texinfo/makeinfo/tests/node-whitespace
index 7cb568554dc..e4801089884 100644
--- a/gnu/usr.bin/texinfo/makeinfo/tests/node-whitespace
+++ b/gnu/usr.bin/texinfo/makeinfo/tests/node-whitespace
@@ -1,6 +1,7 @@
 #!/bin/sh
 # Test whitespace collapse in node names.
 
+unset TEXINFO_OUTPUT
 : ${srcdir=.}
 
 ../makeinfo $srcdir/node-whitespace.txi
diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/node-whitespace.txi b/gnu/usr.bin/texinfo/makeinfo/tests/node-whitespace.txi
index df1253fc507..04f0339a8c8 100644
--- a/gnu/usr.bin/texinfo/makeinfo/tests/node-whitespace.txi
+++ b/gnu/usr.bin/texinfo/makeinfo/tests/node-whitespace.txi
@@ -7,7 +7,7 @@
 @ifnottex
 
 @node Top
-@top
+@top Whitespace in Node Names
 
 @end ifnottex
 
diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/top b/gnu/usr.bin/texinfo/makeinfo/tests/top
index 852194a71cd..c1288f39fed 100644
--- a/gnu/usr.bin/texinfo/makeinfo/tests/top
+++ b/gnu/usr.bin/texinfo/makeinfo/tests/top
@@ -1,6 +1,7 @@
 #!/bin/sh
 # Test that a top node can be ignored.
 
+unset TEXINFO_OUTPUT
 : ${srcdir=.}
 ../makeinfo $srcdir/top.txi || exit 1
 
diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/twofiles b/gnu/usr.bin/texinfo/makeinfo/tests/twofiles
new file mode 100755
index 00000000000..156dd202523
--- /dev/null
+++ b/gnu/usr.bin/texinfo/makeinfo/tests/twofiles
@@ -0,0 +1,23 @@
+#!/bin/sh
+# $Id: twofiles,v 1.1.1.1 2006/07/17 16:03:49 espie Exp $
+# Test that an existing and nonexisting file doesn't cause a
+# segmentation fault.
+# From: Arkadiusz Miskiewicz <misiek@pld.ORG.PL>, 15 Feb 2003 13:22:49 +0100.
+
+unset TEXINFO_OUTPUT
+: ${srcdir=.}
+
+outfile=outfile
+errfile=errfile
+trap 'status=$?; rm -f $outfile $errfile && exit $status' 0
+
+../makeinfo -o /dev/null $srcdir/html-min.txi /nonexistent.texinfo \
+>$outfile 2>$errfile
+exit_status=$?
+
+# we expect one error message about /nonexistent.texinfo and bad exit status.
+test $exit_status -ne 0 \
+&& grep /nonexistent $errfile >/dev/null \
+&& exit_status=0
+
+exit $exit_status
diff --git a/gnu/usr.bin/texinfo/makeinfo/toc.c b/gnu/usr.bin/texinfo/makeinfo/toc.c
index b0a655cd35b..5ba794b5960 100644
--- a/gnu/usr.bin/texinfo/makeinfo/toc.c
+++ b/gnu/usr.bin/texinfo/makeinfo/toc.c
@@ -1,7 +1,7 @@
 /* toc.c -- table of contents handling.
-   $Id: toc.c,v 1.1.1.2 2002/06/10 13:21:22 espie Exp $
+   $Id: toc.c,v 1.1.1.3 2006/07/17 16:03:48 espie Exp $
 
-   Copyright (C) 1999, 2000, 01, 02 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003 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
@@ -17,7 +17,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Written by Karl Heinz Marbaise <kama@hippo.fido.de>.  */
+   Originally written by Karl Heinz Marbaise <kama@hippo.fido.de>.  */
 
 #include "system.h"
 #include "makeinfo.h"
@@ -30,36 +30,20 @@
 #include "makeinfo.h"
 #include "sectioning.h"
 #include "toc.h"
+#include "xml.h"
 
-
-
 /* array of toc entries */
 static TOC_ENTRY_ELT **toc_entry_alist = NULL;
 
 /* toc_counter start from 0 ... n for every @chapter, @section ... */
 static int toc_counter = 0;
-
-/* the file where we found the @contents directive */
-char *contents_filename;
-
-/* the file where we found the @shortcontents directive */
-char *shortcontents_filename;
-
-static const char contents_placebo[] = "\n...Table of Contents...\n";
-static const char shortcontents_placebo[] = "\n...Short Contents...\n";
-static const char lots_of_stars[] =
-"***************************************************************************";
-
 
 /* Routine to add an entry to the table of contents */
 int
-toc_add_entry (tocname, level, node_name, anchor)
-     char *tocname;
-     int level;
-     char *node_name;
-     char *anchor;
+toc_add_entry (char *tocname, int level, char *node_name, char *anchor)
 {
-  char *tocname_and_node, *expanded_node, *s, *d;
+  char *tocname_and_node, *expanded_node, *d;
+  char *s = NULL;
   char *filename = NULL;
 
   if (!node_name)
@@ -107,14 +91,11 @@ toc_add_entry (tocname, level, node_name, anchor)
         {
           for (; *s; s++)
             {
-              if (*s == '&')
-                {
-                  strcpy (d, "&amp;");
-                  d += 5;
-                }
+              if (cr_or_whitespace (*s))
+                *d++ = '-';
               else if (! URL_SAFE_CHAR (*s))
                 {
-                  sprintf (d, "%%%x", (unsigned char) *s);
+                  sprintf (d, "_00%x", (unsigned char) *s);
                   /* do this manually since sprintf returns char * on
                      SunOS 4 and other old systems.  */
                   while (*d)
@@ -165,8 +146,7 @@ toc_add_entry (tocname, level, node_name, anchor)
    more than a single chapter structioning command in a node,
    or if they have a node without any structuring commands.  */
 char *
-toc_find_section_of_node (node)
-     char *node;
+toc_find_section_of_node (char *node)
 {
   int i;
 
@@ -181,7 +161,7 @@ toc_find_section_of_node (node)
 
 /* free up memory used by toc entries */
 void
-toc_free ()
+toc_free (void)
 {
   int i;
 
@@ -199,13 +179,11 @@ toc_free ()
       toc_counter = 0; /* to be absolutley sure ;-) */
     }
 }
-
 
 /* Print table of contents in HTML.  */
 
 static void
-contents_update_html (fp)
-     FILE *fp;
+contents_update_html (void)
 {
   int i;
   int k;
@@ -216,9 +194,7 @@ contents_update_html (fp)
       /* no, so return to sender ;-) */
       return;
 
-  flush_output ();      /* in case we are writing stdout */
-
-  fprintf (fp, "\n<h2>%s</h2>\n<ul>\n", _("Table of Contents"));
+  add_html_block_elt_args ("\n<div class=\"contents\">\n<h2>%s</h2>\n<ul>\n", _("Table of Contents"));
 
   last_level = toc_entry_alist[0]->level;
 
@@ -230,14 +206,14 @@ contents_update_html (fp)
              @chapter ...
              @subsubsection ...      ? */
           for (k = 0; k < (toc_entry_alist[i]->level-last_level); k++)
-            fputs ("<ul>\n", fp);
+            add_html_block_elt ("<ul>\n");
         }
       else if (toc_entry_alist[i]->level < last_level)
         {
           /* @subsubsection ...
              @chapter ... this IS usual.*/
           for (k = 0; k < (last_level-toc_entry_alist[i]->level); k++)
-            fputs ("</ul>\n", fp);
+            add_word ("</li></ul>\n");
         }
 
       /* No double entries in TOC.  */
@@ -245,8 +221,11 @@ contents_update_html (fp)
 			 toc_entry_alist[i-1]->name) == 0))
         {
           /* each toc entry is a list item.  */
-          fputs ("<li>", fp);
+          add_word ("<li>");
 
+          /* Insert link -- to an external file if splitting, or
+             within the current document if not splitting.  */
+	  add_word ("<a ");
           /* For chapters (only), insert an anchor that the short contents
              will link to.  */
           if (toc_entry_alist[i]->level == 0)
@@ -259,13 +238,10 @@ contents_update_html (fp)
 		 ends, and use that in toc_FOO.  */
 	      while (*p && *p != '"')
 		p++;
-	      fprintf (fp, "<a name=\"toc_%.*s\"></a>\n    ",
+	      add_word_args ("name=\"toc_%.*s\" ",
 		       p - toc_entry_alist[i]->name, toc_entry_alist[i]->name);
 	    }
-
-          /* Insert link -- to an external file if splitting, or
-             within the current document if not splitting.  */
-	  fprintf (fp, "<a href=\"%s#%s</a>\n",
+	  add_word_args ("href=\"%s#%s</a>\n",
 		   splitting ? toc_entry_alist[i]->html_file : "",
 		   toc_entry_alist[i]->name);
         }
@@ -276,16 +252,15 @@ contents_update_html (fp)
   /* Go back to start level. */
   if (toc_entry_alist[0]->level < last_level)
     for (k = 0; k < (last_level-toc_entry_alist[0]->level); k++)
-      fputs ("</ul>\n", fp);
+      add_word ("</li></ul>\n");
 
-  fputs ("</ul>\n\n", fp);
+  add_word ("</li></ul>\n</div>\n\n");
 }
 
 /* print table of contents in ASCII (--no-headers)
    May be we should create a new command line switch --ascii ? */
 static void
-contents_update_info (fp)
-     FILE *fp;
+contents_update_info (void)
 {
   int i;
   int k;
@@ -293,41 +268,40 @@ contents_update_info (fp)
   if (!toc_counter)
       return;
 
-  flush_output ();      /* in case we are writing stdout */
-
-  fprintf (fp, "%s\n%.*s\n\n", _("Table of Contents"),
-           (int) strlen (_("Table of Contents")), lots_of_stars);
+  insert_string ((char *) _("Table of Contents"));
+  insert ('\n');
+  for (i = 0; i < strlen (_("Table of Contents")); i++)
+    insert ('*');
+  insert_string ("\n\n");
 
   for (i = 0; i < toc_counter; i++)
     {
       if (toc_entry_alist[i]->level == 0)
-        fputs ("\n", fp);
+        add_char ('\n');
 
       /* indention with two spaces per level, should this
          changed? */
       for (k = 0; k < toc_entry_alist[i]->level; k++)
-        fputs ("  ", fp);
+        insert_string ("  ");
 
-      fprintf (fp, "%s\n", toc_entry_alist[i]->name);
+      insert_string (toc_entry_alist[i]->name);
+      insert ('\n');
     }
-  fputs ("\n\n", fp);
+  insert_string ("\n\n");
 }
 
 /* shortcontents in HTML; Should this produce a standalone file? */
 static void
-shortcontents_update_html (fp)
-     FILE *fp;
+shortcontents_update_html (char *contents_filename)
 {
   int i;
-  char *toc_file;
+  char *toc_file = NULL;
 
   /* does exist any toc? */
   if (!toc_counter)
     return;
 
-  flush_output ();      /* in case we are writing stdout */
-
-  fprintf (fp, "\n<h2>%s</h2>\n<ul>\n", _("Short Contents"));
+  add_html_block_elt_args ("\n<div class=\"shortcontents\">\n<h2>%s</h2>\n<ul>\n", _("Short Contents"));
 
   if (contents_filename)
     toc_file = filename_part (contents_filename);
@@ -339,194 +313,76 @@ shortcontents_update_html (fp)
       if (toc_entry_alist[i]->level == 0)
 	{
 	  if (contents_filename)
-	    fprintf (fp, "<li><a href=\"%s#toc_%s</a>\n",
+	    add_word_args ("<li><a href=\"%s#toc_%s</a></li>\n",
 		     splitting ? toc_file : "", name);
 	  else
-	    fprintf (fp, "<a href=\"%s#%s</a>\n",
+	    add_word_args ("<a href=\"%s#%s</a>\n",
 		     splitting ? toc_entry_alist[i]->html_file : "", name);
 	}
     }
-  fputs ("</ul>\n\n", fp);
+  add_word ("</ul>\n</div>\n\n");
   if (contents_filename)
     free (toc_file);
 }
 
 /* short contents in ASCII (--no-headers).  */
 static void
-shortcontents_update_info (fp)
-     FILE *fp;
+shortcontents_update_info (void)
 {
   int i;
 
   if (!toc_counter)
       return;
 
-  flush_output ();      /* in case we are writing stdout */
-
-  fprintf (fp, "%s\n%.*s\n\n", _("Short Contents"),
-           (int) strlen (_("Short Contents")), lots_of_stars);
+  insert_string ((char *) _("Short Contents"));
+  insert ('\n');
+  for (i = 0; i < strlen (_("Short Contents")); i++)
+    insert ('*');
+  insert_string ("\n\n");
 
   for (i = 0; i < toc_counter; i++)
     {
       if (toc_entry_alist[i]->level == 0)
-        fprintf (fp, "%s\n", toc_entry_alist[i]->name);
-    }
-  fputs ("\n\n", fp);
-}
-
-
-static FILE *toc_fp;
-static char *toc_buf;
-
-static int
-rewrite_top (fname, placebo)
-     const char *fname, *placebo;
-{
-  int idx;
-
-  /* Can't rewrite standard output or the null device.  No point in
-     complaining.  */
-  if (STREQ (fname, "-")
-      || FILENAME_CMP (fname, NULL_DEVICE) == 0
-      || FILENAME_CMP (fname, ALSO_NULL_DEVICE) == 0)
-    return -1;
-
-  toc_buf = find_and_load (fname);
-
-  if (!toc_buf)
-    {
-      fs_error (fname);
-      return -1;
-    }
-
-  idx = search_forward (placebo, 0);
-
-  if (idx < 0)
-    {
-      error (_("%s: TOC should be here, but it was not found"), fname);
-      return -1;
-    }
-
-  toc_fp = fopen (fname, "w");
-  if (!toc_fp)
-    {
-      fs_error (fname);
-      return -1;
-    }
-
-  if (fwrite (toc_buf, 1, idx, toc_fp) != idx)
-    {
-      fs_error (fname);
-      return -1;
+        {
+          insert_string (toc_entry_alist[i]->name);
+          insert ('\n');
+        }
     }
-
-  return idx + strlen (placebo);
-}
-
-static void
-contents_update ()
-{
-  int cont_idx = rewrite_top (contents_filename, contents_placebo);
-
-  if (cont_idx < 0)
-    return;
-
-  if (html)
-    contents_update_html (toc_fp);
-  else
-    contents_update_info (toc_fp);
-
-  if (fwrite (toc_buf + cont_idx, 1, input_text_length - cont_idx, toc_fp)
-      != input_text_length - cont_idx
-      || fclose (toc_fp) != 0)
-    fs_error (contents_filename);
-}
-
-static void
-shortcontents_update ()
-{
-  int cont_idx = rewrite_top (shortcontents_filename, shortcontents_placebo);
-
-  if (cont_idx < 0)
-    return;
-
-  if (html)
-    shortcontents_update_html (toc_fp);
-  else
-    shortcontents_update_info (toc_fp);
-
-  if (fwrite (toc_buf + cont_idx, 1, input_text_length - cont_idx - 1, toc_fp)
-      != input_text_length - cont_idx - 1
-      || fclose (toc_fp) != 0)
-    fs_error (shortcontents_filename);
+  insert_string ("\n\n");
 }
 
 void
-toc_update ()
+cm_contents (int arg)
 {
-  if (!html && !no_headers)
-    return;
-
-  if (contents_filename)
-    contents_update ();
-  if (shortcontents_filename)
-    shortcontents_update ();
-}
+  /* the file where we found the @contents directive */
+  static char *contents_filename;
 
-void
-cm_contents (arg)
-     int arg;
-{
-  if ((html || no_headers) && arg == START)
+  /* No need to mess with delayed stuff for XML and Docbook.  */
+  if (xml)
     {
-      if (contents_filename)
+      if (arg == START)
         {
-          free (contents_filename);
-          contents_filename = NULL;
-        }
-
-      if (contents_filename && STREQ (contents_filename, "-"))
-        {
-          if (html)
-            contents_update_html (stdout);
-          else
-            contents_update_info (stdout);
-        }
-      else
-        {
-          if (!executing_string && html)
-            html_output_head ();
-          contents_filename = xstrdup (current_output_filename);
-          insert_string (contents_placebo); /* just mark it, for now */
+          int elt = STREQ (command, "contents") ? CONTENTS : SHORTCONTENTS;
+          xml_insert_element (elt, START);
+          xml_insert_element (elt, END);
         }
     }
-}
-
-void
-cm_shortcontents (arg)
-     int arg;
-{
-  if ((html || no_headers) && arg == START)
+  else if (!handling_delayed_writes)
     {
-      if (shortcontents_filename)
-        {
-          free (shortcontents_filename);
-          shortcontents_filename = NULL;
-        }
+      register_delayed_write (STREQ (command, "contents")
+          ? "@contents" : "@shortcontents");
 
-      if (shortcontents_filename && STREQ (shortcontents_filename, "-"))
+      if (html && STREQ (command, "contents"))
         {
-          if (html)
-            shortcontents_update_html (stdout);
-          else
-            shortcontents_update_info (stdout);
-        }
-      else
-        {
-          if (!executing_string && html)
-            html_output_head ();
-          shortcontents_filename = xstrdup (current_output_filename);
-          insert_string (shortcontents_placebo); /* just mark it, for now */
+          if (contents_filename)
+            free (contents_filename);
+          contents_filename = xstrdup (current_output_filename);
         }
     }
+  else if (html)
+    STREQ (command, "contents")
+      ? contents_update_html () : shortcontents_update_html (contents_filename);
+  else if (no_headers)
+    STREQ (command, "contents")
+      ? contents_update_info () : shortcontents_update_info ();
 }
diff --git a/gnu/usr.bin/texinfo/makeinfo/toc.h b/gnu/usr.bin/texinfo/makeinfo/toc.h
index 92128c01277..2cda7969ce5 100644
--- a/gnu/usr.bin/texinfo/makeinfo/toc.h
+++ b/gnu/usr.bin/texinfo/makeinfo/toc.h
@@ -1,5 +1,5 @@
 /* toc.h -- table of contents handling.
-   $Id: toc.h,v 1.1.1.2 2002/06/10 13:21:22 espie Exp $
+   $Id: toc.h,v 1.1.1.3 2006/07/17 16:03:48 espie Exp $
 
    Copyright (C) 1999 Free Software Foundation, Inc.
 
@@ -22,12 +22,6 @@
 #ifndef TOC_H
 #define TOC_H
 
-/* the file where we found the @contents directive */
-extern char *contents_filename;
-
-/* the file where we found the @shortcontents directive */
-extern char *shortcontents_filename;
-
 /* Structure to hold one entry for the toc. */
 typedef struct toc_entry_elt {
   char *name;
@@ -41,10 +35,11 @@ typedef struct toc_entry_elt {
 
 /* all routines which have relationship with TOC should start with
    toc_ (this is a kind of name-space) */
-extern int toc_add_entry (); /* return the number for the toc-entry */
-extern void toc_free ();
-extern char *toc_find_section_of_node ();
+extern int toc_add_entry (char *tocname, int level,
+    char *node_name, char *anchor); /* return the number for the toc-entry */
+extern void toc_free (void);
+extern char *toc_find_section_of_node (char *node);
 
-extern void cm_contents (), cm_shortcontents ();
+extern void cm_contents (int arg);
 
 #endif /* not TOC_H */
diff --git a/gnu/usr.bin/texinfo/makeinfo/xml.c b/gnu/usr.bin/texinfo/makeinfo/xml.c
index 9d4f5a09e54..2db02c97439 100644
--- a/gnu/usr.bin/texinfo/makeinfo/xml.c
+++ b/gnu/usr.bin/texinfo/makeinfo/xml.c
@@ -1,7 +1,7 @@
 /* xml.c -- xml output.
-   $Id: xml.c,v 1.1.1.1 2002/06/10 13:21:23 espie Exp $
+   $Id: xml.c,v 1.1.1.2 2006/07/17 16:03:49 espie Exp $
 
-   Copyright (C) 2001, 02 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004 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
@@ -17,11 +17,13 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Written by Philippe Martin <feloy@free.fr>.  */
+   Originally written by Philippe Martin <feloy@free.fr>.  */
 
 #include "system.h"
 #include "makeinfo.h"
 #include "insertion.h"
+#include "files.h"
+#include "float.h"
 #include "macro.h"
 #include "cmds.h"
 #include "lang.h"
@@ -31,285 +33,436 @@
 /* Options */
 int xml_index_divisions = 1;
 
-
-void xml_close_sections (/* int level */);
-
 typedef struct _element
 {
   char name[32];
   int contains_para;
   int contained_in_para;
+  int keep_space;
 } element;
 
 element texinfoml_element_list [] = {
-  { "texinfo",             1, 0 },
-  { "setfilename",         0, 0 },
-  { "titlefont",           0, 0 },
-  { "settitle",            0, 0 },
-
-  { "node",                1, 0 },
-  { "nodenext",            0, 0 },
-  { "nodeprev",            0, 0 },
-  { "nodeup",              0, 0 },
-
-  { "chapter",             1, 0 },
-  { "section",             1, 0 },
-  { "subsection",          1, 0 },
-  { "subsubsection",       1, 0 },
-
-  { "top",                 1, 0 },
-  { "unnumbered",          1, 0 },
-  { "unnumberedsec",       1, 0 },
-  { "unnumberedsubsec",    1, 0 },
-  { "unnumberedsubsubsec", 1, 0 },
-
-  { "appendix",            1, 0 },
-  { "appendixsec",         1, 0 },
-  { "appendixsubsec",      1, 0 },
-  { "appendixsubsubsec",   1, 0 },
-
-  { "majorheading",        1, 0 },
-  { "chapheading",         1, 0 },
-  { "heading",             1, 0 },
-  { "subheading",          1, 0 },
-  { "subsubheading",       1, 0 },
-
-  { "menu",                1, 0 },
-  { "menuentry",           1, 0 },
-  { "menutitle",           0, 0 },
-  { "menucomment",         1, 0 },
-  { "menunode",            0, 0 },
-  { "nodename",            0, 0 },
-
-  { "acronym",             0, 1 },
-  { "tt",                  0, 1 },
-  { "code",                0, 1 },
-  { "kbd",                 0, 1 },
-  { "url",                 0, 1 },
-  { "key",                 0, 1 },
-  { "var",                 0, 1 },
-  { "sc",                  0, 1 },
-  { "dfn",                 0, 1 },
-  { "emph",                0, 1 },
-  { "strong",              0, 1 },
-  { "cite",                0, 1 },
-  { "notfixedwidth",       0, 1 }, 
-  { "i",                   0, 1 },
-  { "b",                   0, 1 },
-  { "r",                   0, 1 },
-
-  { "title",               0, 0 },
-  { "ifinfo",              1, 0 },
-  { "sp",                  0, 0 },
-  { "center",              1, 0 },
-  { "dircategory",         0, 0 },
-  { "quotation",           1, 0 },
-  { "example",             1, 0 },
-  { "smallexample",        1, 0 },
-  { "lisp",                1, 0 },
-  { "smalllisp",           1, 0 },
-  { "cartouche",           1, 0 },
-  { "copying",             1, 0 },
-  { "format",              1, 0 },
-  { "smallformat",         1, 0 },
-  { "display",             1, 0 },
-  { "smalldisplay",        1, 0 },
-  { "footnote",            0, 1 },
-
-  { "itemize",             0, 0 },
-  { "itemfunction",        0, 0 },
-  { "item",                1, 0 },
-  { "enumerate",           0, 0 },
-  { "table",               0, 0 },
-  { "tableitem",           0, 0 }, /* not used */ /* TABLEITEM */
-  { "tableterm",           0, 0 }, /* not used */ /* TABLETERM */
-
-  { "indexterm",           0, 1 },
-
-  { "xref",                0, 1 },
-  { "xrefnodename",        0, 1 },
-  { "xrefinfoname",        0, 1 },
-  { "xrefprinteddesc",     0, 1 },
-  { "xrefinfofile",        0, 1 },
-  { "xrefprintedname",     0, 1 },
-
-  { "inforef",             0, 1 },
-  { "inforefnodename",     0, 1 },
-  { "inforefrefname",      0, 1 },
-  { "inforefinfoname",     0, 1 },
-
-  { "uref",                0, 1 },
-  { "urefurl",             0, 1 },
-  { "urefdesc",            0, 1 },
-  { "urefreplacement",     0, 1 },
-
-  { "email",               0, 1 },
-  { "emailaddress",        0, 1 },
-  { "emailname",           0, 1 },
-
-  { "group",               0, 0 },
-  
-  { "printindex",          0, 0 },
-  { "anchor",              0, 1 },
-  { "image",               0, 1 },
-  { "",                    0, 1 }, /* PRIMARY (docbook) */
-  { "",                    0, 1 }, /* SECONDARY (docbook) */
-  { "",                    0, 0 }, /* INFORMALFIGURE (docbook) */
-  { "",                    0, 0 }, /* MEDIAOBJECT (docbook) */
-  { "",                    0, 0 }, /* IMAGEOBJECT (docbook) */
-  { "",                    0, 0 }, /* IMAGEDATA (docbook) */
-  { "",                    0, 0 }, /* TEXTOBJECT (docbook) */
-  { "",                    0, 0 }, /* INDEXENTRY (docbook) */
-  { "",                    0, 0 }, /* PRIMARYIE (docbook) */
-  { "",                    0, 0 }, /* SECONDARYIE (docbook) */
-  { "",                    0, 0 }, /* INDEXDIV (docbook) */
-  { "multitable",          0, 0 },
-  { "",                    0, 0 }, /* TGROUP (docbook) */
-  { "columnfraction",      0, 0 }, 
-  { "",                    0, 0 }, /* TBODY (docbook) */
-  { "entry",               0, 0 }, /* ENTRY (docbook) */
-  { "row",                 0, 0 }, /* ROW (docbook) */
-  { "",                    0, 0 }, /* BOOKINFO (docbook) */
-  { "",                    0, 0 }, /* ABSTRACT (docbook) */
-  { "",                    0, 0 }, /* REPLACEABLE (docbook) */
-  { "para",                0, 0 } /* Must be last */
-  /* name / contains para / contained in para */
+  { "texinfo",             1, 0, 0 },
+  { "setfilename",         0, 0, 0 },
+  { "titlefont",           0, 0, 0 },
+  { "settitle",            0, 0, 0 },
+  { "documentdescription", 1, 0, 0 },
+
+  { "node",                1, 0, 0 },
+  { "nodenext",            0, 0, 0 },
+  { "nodeprev",            0, 0, 0 },
+  { "nodeup",              0, 0, 0 },
+
+  { "chapter",             1, 0, 0 },
+  { "section",             1, 0, 0 },
+  { "subsection",          1, 0, 0 },
+  { "subsubsection",       1, 0, 0 },
+
+  { "top",                 1, 0, 0 },
+  { "unnumbered",          1, 0, 0 },
+  { "unnumberedsec",       1, 0, 0 },
+  { "unnumberedsubsec",    1, 0, 0 },
+  { "unnumberedsubsubsec", 1, 0, 0 },
+
+  { "appendix",            1, 0, 0 },
+  { "appendixsec",         1, 0, 0 },
+  { "appendixsubsec",      1, 0, 0 },
+  { "appendixsubsubsec",   1, 0, 0 },
+
+  { "majorheading",        0, 0, 0 },
+  { "chapheading",         0, 0, 0 },
+  { "heading",             0, 0, 0 },
+  { "subheading",          0, 0, 0 },
+  { "subsubheading",       0, 0, 0 },
+
+  { "titlepage",           1, 0, 0 },
+  { "author",              0, 0, 0 },
+  { "booktitle",           0, 0, 0 },
+  { "booksubtitle",        0, 0, 0 },
+
+  { "menu",                1, 0, 0 },
+  { "detailmenu",          1, 0, 0 },
+  { "menuentry",           0, 0, 0 },
+  { "menutitle",           0, 0, 0 },
+  { "menucomment",         0, 0, 0 },
+  { "menunode",            0, 0, 0 },
+  { "nodename",            0, 0, 0 },
+
+  { "acronym",             0, 1, 0 },
+  { "acronymword",         0, 1, 0 },
+  { "acronymdesc",         0, 1, 0 },
+
+  { "abbrev",              0, 1, 0 },
+  { "abbrevword",          0, 1, 0 },
+  { "abbrevdesc",          0, 1, 0 },
+
+  { "tt",                  0, 1, 0 },
+  { "code",                0, 1, 0 },
+  { "command",             0, 1, 0 },
+  { "env",                 0, 1, 0 },
+  { "file",                0, 1, 0 },
+  { "option",              0, 1, 0 },
+  { "samp",                0, 1, 0 },
+  { "kbd",                 0, 1, 0 },
+  { "url",                 0, 1, 0 },
+  { "key",                 0, 1, 0 },
+  { "var",                 0, 1, 0 },
+  { "sc",                  0, 1, 0 },
+  { "dfn",                 0, 1, 0 },
+  { "emph",                0, 1, 0 },
+  { "strong",              0, 1, 0 },
+  { "cite",                0, 1, 0 },
+  { "notfixedwidth",       0, 1, 0 },
+  { "i",                   0, 1, 0 },
+  { "b",                   0, 1, 0 },
+  { "r",                   0, 1, 0 },
+  { "slanted",             0, 1, 0 },
+  { "sansserif",           0, 1, 0 },
+
+  { "exdent",              0, 0, 0 },
+
+  { "title",               0, 0, 0 },
+  { "ifinfo",              1, 0, 0 },
+  { "sp",                  0, 0, 0 },
+  { "center",              1, 0, 0 },
+  { "dircategory",         0, 0, 0 },
+  { "quotation",           1, 0, 0 },
+  { "example",             0, 0, 1 },
+  { "smallexample",        0, 0, 1 },
+  { "lisp",                0, 0, 1 },
+  { "smalllisp",           0, 0, 1 },
+  { "cartouche",           1, 0, 0 },
+  { "copying",             1, 0, 0 },
+  { "format",              0, 0, 1 },
+  { "smallformat",         0, 0, 1 },
+  { "display",             0, 0, 1 },
+  { "smalldisplay",        0, 0, 1 },
+  { "verbatim",            0, 0, 1 },
+  { "footnote",            0, 1, 0 },
+  { "",                    0, 1, 0 }, /* LINEANNOTATION (docbook) */
+
+  { "",                    1, 0, 0 }, /* TIP (docbook)       */
+  { "",                    1, 0, 0 }, /* NOTE (docbook)      */
+  { "",                    1, 0, 0 }, /* IMPORTANT (docbook) */
+  { "",                    1, 0, 0 }, /* WARNING (docbook)   */
+  { "",                    1, 0, 0 }, /* CAUTION (docbook)   */
+
+  { "itemize",             0, 0, 0 },
+  { "itemfunction",        0, 0, 0 },
+  { "item",                1, 0, 0 },
+  { "enumerate",           0, 0, 0 },
+  { "table",               0, 0, 0 },
+  { "tableitem",           0, 0, 0 },
+  { "tableterm",           0, 0, 0 },
+
+  { "indexterm",           0, 1, 0 },
+
+  { "math",                0, 1, 0 },
+
+  { "dmn",                 0, 1, 0 },
+
+  { "xref",                0, 1, 0 },
+  { "xrefnodename",        0, 1, 0 },
+  { "xrefinfoname",        0, 1, 0 },
+  { "xrefprinteddesc",     0, 1, 0 },
+  { "xrefinfofile",        0, 1, 0 },
+  { "xrefprintedname",     0, 1, 0 },
+
+  { "inforef",             0, 1, 0 },
+  { "inforefnodename",     0, 1, 0 },
+  { "inforefrefname",      0, 1, 0 },
+  { "inforefinfoname",     0, 1, 0 },
+
+  { "uref",                0, 1, 0 },
+  { "urefurl",             0, 1, 0 },
+  { "urefdesc",            0, 1, 0 },
+  { "urefreplacement",     0, 1, 0 },
+
+  { "email",               0, 1, 0 },
+  { "emailaddress",        0, 1, 0 },
+  { "emailname",           0, 1, 0 },
+
+  { "group",               0, 0, 0 },
+  { "float",               1, 0, 0 },
+  { "floattype",           0, 0, 0 },
+  { "floatpos",            0, 0, 0 },
+  { "caption",             0, 0, 0 },
+  { "shortcaption",        0, 0, 0 },
+
+  { "",                    0, 0, 0 }, /* TABLE (docbook) */
+  { "",                    0, 0, 0 }, /* FIGURE (docbook) */
+  { "",                    0, 0, 0 }, /* EXAMPLE (docbook) */
+  { "",                    1, 0, 0 }, /* SIDEBAR (docbook) */
+
+  { "printindex",          0, 0, 0 },
+  { "listoffloats",        0, 0, 0 },
+  { "anchor",              0, 1, 0 },
+
+  { "image",               0, 0, 0 },
+  { "inlineimage",         0, 1, 0 },
+  { "alttext",             0, 1, 0 },
+
+  { "",                    0, 1, 0 }, /* PRIMARY (docbook) */
+  { "",                    0, 1, 0 }, /* SECONDARY (docbook) */
+  { "",                    0, 0, 0 }, /* INFORMALFIGURE (docbook) */
+  { "",                    0, 0, 0 }, /* MEDIAOBJECT (docbook) */
+  { "",                    0, 0, 0 }, /* IMAGEOBJECT (docbook) */
+  { "",                    0, 0, 0 }, /* IMAGEDATA (docbook) */
+  { "",                    0, 0, 0 }, /* TEXTOBJECT (docbook) */
+  { "",                    0, 0, 0 }, /* INDEXENTRY (docbook) */
+  { "",                    0, 0, 0 }, /* PRIMARYIE (docbook) */
+  { "",                    0, 0, 0 }, /* SECONDARYIE (docbook) */
+  { "",                    0, 0, 0 }, /* INDEXDIV (docbook) */
+  { "multitable",          0, 0, 0 },
+  { "",                    0, 0, 0 }, /* TGROUP (docbook) */
+  { "columnfraction",      0, 0, 0 },
+  { "thead",               0, 0, 0 },
+  { "tbody",               0, 0, 0 },
+  { "entry",               0, 0, 0 },
+  { "row",                 0, 0, 0 },
+  { "",                    0, 0, 0 }, /* BOOKINFO (docbook) */
+  { "",                    0, 0, 0 }, /* ABSTRACT (docbook) */
+  { "",                    0, 0, 0 }, /* REPLACEABLE (docbook) */
+  { "",                    0, 0, 0 }, /* ENVAR (docbook) */
+  { "",                    0, 0, 0 }, /* COMMENT (docbook) */
+  { "",                    0, 0, 0 }, /* FUNCTION (docbook) */
+  { "",                    0, 0, 0 }, /* LEGALNOTICE (docbook) */
+
+  { "contents",            0, 0, 0 },
+  { "shortcontents",       0, 0, 0 },
+  { "documentlanguage",    0, 0, 0 },
+
+  { "setvalue",            0, 0, 0 },
+  { "clearvalue",          0, 0, 0 },
+
+  { "definition",          0, 0, 0 },
+  { "definitionterm",      0, 0, 0 },
+  { "definitionitem",      1, 0, 0 },
+  { "defcategory",         0, 0, 0 },
+  { "deffunction",         0, 0, 0 },
+  { "defvariable",         0, 0, 0 },
+  { "defparam",            0, 0, 0 },
+  { "defdelimiter",        0, 0, 0 },
+  { "deftype",             0, 0, 0 },
+  { "defparamtype",        0, 0, 0 },
+  { "defdatatype",         0, 0, 0 },
+  { "defclass",            0, 0, 0 },
+  { "defclassvar",         0, 0, 0 },
+  { "defoperation",        0, 0, 0 },
+
+  { "para",                0, 0, 0 } /* Must be last */
+  /* name / contains para / contained in para / preserve space */
 };
 
 element docbook_element_list [] = {
-  { "book",                0, 0 }, /* TEXINFO */
-  { "",                    0, 0 }, /* SETFILENAME */
-  { "",                    0, 0 }, /* TITLEINFO */
-  { "title",               0, 0 }, /* SETTITLE */
-
-  { "",                    1, 0 }, /* NODE */
-  { "",                    0, 0 }, /* NODENEXT */
-  { "",                    0, 0 }, /* NODEPREV */
-  { "",                    0, 0 }, /* NODEUP */
-
-  { "chapter",             1, 0 },
-  { "sect1",               1, 0 }, /* SECTION */
-  { "sect2",               1, 0 }, /* SUBSECTION */
-  { "sect3",               1, 0 }, /* SUBSUBSECTION */
-
-  { "chapter",             1, 0 }, /* TOP */
-  { "chapter",             1, 0 }, /* UNNUMBERED */
-  { "sect1",               1, 0 }, /* UNNUMBEREDSEC */
-  { "sect2",               1, 0 }, /* UNNUMBEREDSUBSEC */
-  { "sect3",               1, 0 }, /* UNNUMBEREDSUBSUBSEC */
-
-  { "appendix",            1, 0 },
-  { "sect1",               1, 0 }, /* APPENDIXSEC */
-  { "sect2",               1, 0 }, /* APPENDIXSUBSEC */
-  { "sect3",               1, 0 }, /* APPENDIXSUBSUBSEC */
-
-  { "chapter",             1, 0 }, /* MAJORHEADING */
-  { "chapter",             1, 0 }, /* CHAPHEADING */
-  { "sect1",               1, 0 }, /* HEADING */
-  { "sect2",               1, 0 }, /* SUBHEADING */
-  { "sect3",               1, 0 }, /* SUBSUBHEADING */
-
-  { "",                    1, 0 }, /* MENU */
-  { "",                    1, 0 }, /* MENUENTRY */
-  { "",                    0, 0 }, /* MENUTITLE */
-  { "",                    1, 0 }, /* MENUCOMMENT */
-  { "",                    0, 0 }, /* MENUNODE */
-  { "anchor",              0, 0 }, /* NODENAME */
-
-  { "acronym",             0, 1 },
-  { "wordasword",          0, 1 }, /* TT */
-  { "command",             0, 1 }, /* CODE */
-  { "userinput",           0, 1 }, /* KBD */
-  { "wordasword",          0, 1 }, /* URL */
-  { "keycap",              0, 1 }, /* KEY */
-  { "varname",             0, 1 }, /* VAR */
-  { "",                    0, 1 }, /* SC */
-  { "firstterm",           0, 1 }, /* DFN */
-  { "emphasis",            0, 1 }, /* EMPH */
-  { "emphasis",            0, 1 }, /* STRONG */
-  { "citation",            0, 1 }, /* CITE */
-  { "",                    0, 1 },  /* NOTFIXEDWIDTH */
-  { "wordasword",          0, 1 }, /* I */
-  { "wordasword",          0, 1 }, /* B */
-  { "",                    0, 1 }, /* R */
-
-  { "title",               0, 0 },
-  { "",                    1, 0 }, /* IFINFO */
-  { "",                    0, 0 }, /* SP */
-  { "",                    1, 0 }, /* CENTER */
-  { "",                    0, 0 }, /* DIRCATEGORY */
-  { "blockquote",          1, 0 }, /* QUOTATION */
-  { "screen",              0, 1 },
-  { "screen",              0, 1 }, /* SMALLEXAMPLE */
-  { "screen",              0, 1 }, /* LISP */
-  { "screen",              0, 1 }, /* SMALLLISP */
-  { "",                    1, 0 }, /* CARTOUCHE */
-  { "",                    1, 0 }, /* COPYING */
-  { "screen",              0, 1 }, /* FORMAT */
-  { "screen",              0, 1 }, /* SMALLFORMAT */
-  { "screen",              0, 1 }, /* DISPLAY */
-  { "screen",              0, 1 }, /* SMALLDISPLAY */
-  { "footnote",            0, 1 },
-
-  { "itemizedlist",        0, 0 }, /* ITEMIZE */
-  { "",                    0, 0 }, /* ITEMFUNCTION */
-  { "listitem",            1, 0 },
-  { "orderedlist",         0, 0 }, /* ENUMERATE */
-  { "variablelist",        0, 0 }, /* TABLE */
-  { "varlistentry",        0, 0 }, /* TABLEITEM */
-  { "term",                0, 0 }, /* TABLETERM */
-
-  { "indexterm",           0, 1 },
-
-  { "xref",                0, 1 }, /* XREF */
-  { "link",                0, 1 }, /* XREFNODENAME */
-  { "",                    0, 1 }, /* XREFINFONAME */
-  { "",                    0, 1 }, /* XREFPRINTEDDESC */
-  { "",                    0, 1 }, /* XREFINFOFILE */
-  { "",                    0, 1 }, /* XREFPRINTEDNAME */
-
-  { "",                    0, 1 }, /* INFOREF */
-  { "",                    0, 1 }, /* INFOREFNODENAME */
-  { "",                    0, 1 }, /* INFOREFREFNAME */
-  { "",                    0, 1 }, /* INFOREFINFONAME */
-
-  { "",                    0, 1 }, /* UREF */
-  { "",                    0, 1 }, /* UREFURL */
-  { "",                    0, 1 }, /* UREFDESC */
-  { "",                    0, 1 }, /* UREFREPLACEMENT */
-
-  { "ulink",               0, 1 }, /* EMAIL */
-  { "",                    0, 1 }, /* EMAILADDRESS */
-  { "",                    0, 1 }, /* EMAILNAME */
-
-  { "",                    0, 0 }, /* GROUP */
-  
-  { "index",               0, 0 }, /* PRINTINDEX */
-  { "",                    0, 1 }, /* ANCHOR */
-  { "",                    0, 1 }, /* IMAGE */
-  { "primary",             0, 1 }, /* PRIMARY */
-  { "secondary",           0, 1 },
-  { "informalfigure",      0, 0 },
-  { "mediaobject",         0, 0 },
-  { "imageobject",         0, 0 },
-  { "imagedata",           0, 0 },
-  { "textobject",          0, 0 },
-  { "indexentry",          0, 0 },
-  { "primaryie",           0, 0 },
-  { "secondaryie",         0, 0 },
-  { "indexdiv",            0, 0 },
-  { "informaltable",       0, 0 },
-  { "tgroup",              0, 0 },
-  { "colspec",             0, 0 },
-  { "tbody",               0, 0 },
-  { "entry",               0, 0 },
-  { "row",                 0, 0 },
-  { "bookinfo",            0, 0 },
-  { "abstract",            1, 0 },
-  { "replaceable",         0, 0 },
-
-  { "para",                0, 0 } /* Must be last */
-  /* name / contains para / contained in para */
+  { "book",                0, 0, 0 }, /* TEXINFO */
+  { "",                    0, 0, 0 }, /* SETFILENAME */
+  { "",                    0, 0, 0 }, /* TITLEINFO */
+  { "title",               0, 0, 0 }, /* SETTITLE */
+  { "",                    1, 0, 0 }, /* DOCUMENTDESCRIPTION (?) */
+
+  { "",                    1, 0, 0 }, /* NODE */
+  { "",                    0, 0, 0 }, /* NODENEXT */
+  { "",                    0, 0, 0 }, /* NODEPREV */
+  { "",                    0, 0, 0 }, /* NODEUP */
+
+  { "chapter",             1, 0, 0 },
+  { "sect1",               1, 0, 0 }, /* SECTION */
+  { "sect2",               1, 0, 0 }, /* SUBSECTION */
+  { "sect3",               1, 0, 0 }, /* SUBSUBSECTION */
+
+  { "chapter",             1, 0, 0 }, /* TOP */
+  { "chapter",             1, 0, 0 }, /* UNNUMBERED */
+  { "sect1",               1, 0, 0 }, /* UNNUMBEREDSEC */
+  { "sect2",               1, 0, 0 }, /* UNNUMBEREDSUBSEC */
+  { "sect3",               1, 0, 0 }, /* UNNUMBEREDSUBSUBSEC */
+
+  { "appendix",            1, 0, 0 },
+  { "sect1",               1, 0, 0 }, /* APPENDIXSEC */
+  { "sect2",               1, 0, 0 }, /* APPENDIXSUBSEC */
+  { "sect3",               1, 0, 0 }, /* APPENDIXSUBSUBSEC */
+
+  { "bridgehead",          0, 0, 0 }, /* MAJORHEADING */
+  { "bridgehead",          0, 0, 0 }, /* CHAPHEADING */
+  { "bridgehead",          0, 0, 0 }, /* HEADING */
+  { "bridgehead",          0, 0, 0 }, /* SUBHEADING */
+  { "bridgehead",          0, 0, 0 }, /* SUBSUBHEADING */
+
+  { "",                    0, 0, 0 }, /* TITLEPAGE */
+  { "",                    0, 0, 0 }, /* AUTHOR */
+  { "",                    0, 0, 0 }, /* BOOKTITLE */
+  { "",                    0, 0, 0 }, /* BOOKSUBTITLE */
+
+  { "",                    1, 0, 0 }, /* MENU */
+  { "",                    1, 0, 0 }, /* DETAILMENU */
+  { "",                    1, 0, 0 }, /* MENUENTRY */
+  { "",                    0, 0, 0 }, /* MENUTITLE */
+  { "",                    1, 0, 0 }, /* MENUCOMMENT */
+  { "",                    0, 0, 0 }, /* MENUNODE */
+  { "anchor",              0, 0, 0 }, /* NODENAME */
+
+  { "acronym",             0, 1, 0 },
+  { "",                    0, 1, 0 }, /* ACRONYMWORD */
+  { "",                    0, 1, 0 }, /* ACRONYMDESC */
+
+  { "abbrev",              0, 1, 0 },
+  { "",                    0, 1, 0 }, /* ABBREVWORD */
+  { "",                    0, 1, 0 }, /* ABBREVDESC */
+
+  { "literal",             0, 1, 0 }, /* TT */
+  { "literal",             0, 1, 0 }, /* CODE */
+  { "command",             0, 1, 0 }, /* COMMAND */
+  { "envar",               0, 1, 0 }, /* ENV */
+  { "filename",            0, 1, 0 }, /* FILE */
+  { "option",              0, 1, 0 }, /* OPTION */
+  { "literal",             0, 1, 0 }, /* SAMP */
+  { "userinput",           0, 1, 0 }, /* KBD */
+  { "wordasword",          0, 1, 0 }, /* URL */
+  { "keycap",              0, 1, 0 }, /* KEY */
+  { "replaceable",         0, 1, 0 }, /* VAR */
+  { "",                    0, 1, 0 }, /* SC */
+  { "firstterm",           0, 1, 0 }, /* DFN */
+  { "emphasis",            0, 1, 0 }, /* EMPH */
+  { "emphasis",            0, 1, 0 }, /* STRONG */
+  { "citetitle",           0, 1, 0 }, /* CITE */
+  { "",                    0, 1, 0 }, /* NOTFIXEDWIDTH */
+  { "wordasword",          0, 1, 0 }, /* I */
+  { "emphasis",            0, 1, 0 }, /* B */
+  { "",                    0, 1, 0 }, /* R */
+
+  { "",                    0, 0, 0 }, /* EXDENT */
+
+  { "title",               0, 0, 0 },
+  { "",                    1, 0, 0 }, /* IFINFO */
+  { "",                    0, 0, 0 }, /* SP */
+  { "",                    1, 0, 0 }, /* CENTER */
+  { "",                    0, 0, 0 }, /* DIRCATEGORY */
+  { "blockquote",          1, 0, 0 }, /* QUOTATION */
+  { "screen",              0, 0, 1 }, /* EXAMPLE */
+  { "screen",              0, 0, 1 }, /* SMALLEXAMPLE */
+  { "programlisting",      0, 0, 1 }, /* LISP */
+  { "programlisting",      0, 0, 1 }, /* SMALLLISP */
+  { "",                    1, 0, 0 }, /* CARTOUCHE */
+  { "",                    1, 0, 0 }, /* COPYING */
+  { "screen",              0, 1, 1 }, /* FORMAT */
+  { "screen",              0, 1, 1 }, /* SMALLFORMAT */
+  { "literallayout",       0, 1, 1 }, /* DISPLAY */
+  { "literallayout",       0, 1, 1 }, /* SMALLDISPLAY */
+  { "screen",              0, 0, 1 }, /* VERBATIM */
+  { "footnote",            0, 1, 0 },
+  { "lineannotation",      0, 1, 0 },
+
+  { "tip",                 1, 0, 0 },
+  { "note",                1, 0, 0 },
+  { "important",           1, 0, 0 },
+  { "warning",             1, 0, 0 },
+  { "caution",             1, 0, 0 },
+
+  { "itemizedlist",        0, 0, 0 }, /* ITEMIZE */
+  { "",                    0, 0, 0 }, /* ITEMFUNCTION */
+  { "listitem",            1, 0, 0 }, /* ITEM */
+  { "orderedlist",         0, 0, 0 }, /* ENUMERATE */
+  { "variablelist",        0, 0, 0 }, /* TABLE */
+  { "varlistentry",        0, 0, 0 }, /* TABLEITEM */
+  { "term",                0, 0, 0 }, /* TABLETERM */
+
+  { "indexterm",           0, 1, 0 }, /* INDEXTERM */
+
+  { "",                    0, 1, 0 }, /* MATH */
+
+  { "",                    0, 1, 0 }, /* DIMENSION */
+
+  { "xref",                0, 1, 0 }, /* XREF */
+  { "link",                0, 1, 0 }, /* XREFNODENAME */
+  { "",                    0, 1, 0 }, /* XREFINFONAME */
+  { "",                    0, 1, 0 }, /* XREFPRINTEDDESC */
+  { "",                    0, 1, 0 }, /* XREFINFOFILE */
+  { "",                    0, 1, 0 }, /* XREFPRINTEDNAME */
+
+  { "",                    0, 1, 0 }, /* INFOREF */
+  { "",                    0, 1, 0 }, /* INFOREFNODENAME */
+  { "",                    0, 1, 0 }, /* INFOREFREFNAME */
+  { "",                    0, 1, 0 }, /* INFOREFINFONAME */
+
+  { "ulink",               0, 1, 0 }, /* UREF */
+  { "",                    0, 1, 0 }, /* UREFURL */
+  { "",                    0, 1, 0 }, /* UREFDESC */
+  { "",                    0, 1, 0 }, /* UREFREPLACEMENT */
+
+  { "ulink",               0, 1, 0 }, /* EMAIL */
+  { "",                    0, 1, 0 }, /* EMAILADDRESS */
+  { "",                    0, 1, 0 }, /* EMAILNAME */
+
+  { "",                    0, 0, 0 }, /* GROUP */
+  { "",                    1, 0, 0 }, /* FLOAT */
+  { "",                    0, 0, 0 }, /* FLOATTYPE */
+  { "",                    0, 0, 0 }, /* FLOATPOS */
+  { "",                    0, 0, 0 }, /* CAPTION */
+  { "",                    0, 0, 0 }, /* SHORTCAPTION */
+
+  { "table",               0, 1, 0 },
+  { "figure",              0, 1, 0 },
+  { "example",             1, 1, 0 },
+  { "sidebar",             1, 0, 0 },
+
+  { "index",               0, 1, 0 }, /* PRINTINDEX */
+  { "",                    0, 1, 0 }, /* LISTOFFLOATS */
+  { "",                    0, 1, 0 }, /* ANCHOR */
+
+  { "",                    0, 0, 0 }, /* IMAGE */
+  { "inlinemediaobject",   0, 1, 0 }, /* INLINEIMAGE */
+  { "",                    0, 0, 0 }, /* IMAGEALTTEXT */
+
+  { "primary",             0, 1, 0 }, /* PRIMARY */
+  { "secondary",           0, 1, 0 },
+  { "informalfigure",      0, 0, 0 },
+  { "mediaobject",         0, 0, 0 },
+  { "imageobject",         0, 1, 0 },
+  { "imagedata",           0, 1, 0 },
+  { "textobject",          0, 1, 0 },
+  { "indexentry",          0, 0, 0 },
+  { "primaryie",           0, 0, 0 },
+  { "secondaryie",         0, 0, 0 },
+  { "indexdiv",            0, 0, 0 },
+  { "informaltable",       0, 0, 0 },
+  { "tgroup",              0, 0, 0 },
+  { "colspec",             0, 0, 0 },
+  { "thead",               0, 0, 0 },
+  { "tbody",               0, 0, 0 },
+  { "entry",               0, 0, 0 },
+  { "row",                 0, 0, 0 },
+  { "bookinfo",            0, 0, 0 },
+  { "abstract",            1, 0, 0 },
+  { "replaceable",         0, 0, 0 },
+  { "envar",               0, 1, 0 },
+  { "comment",             0, 0, 0 },
+  { "function",            0, 1, 0 },
+  { "legalnotice",         1, 0, 0 },
+
+  { "",                    0, 0, 0 }, /* CONTENTS (xml) */
+  { "",                    0, 0, 0 }, /* SHORTCONTENTS (xml) */
+  { "",                    0, 0, 0 }, /* DOCUMENT LANGUAGE (xml) */
+
+  { "",                    0, 0, 0 }, /* SETVALUE (xml) */
+  { "",                    0, 0, 0 }, /* CLEARVALUE (xml) */
+
+  { "blockquote",          1, 0, 0 }, /* DEFINITION */
+  { "screen",              0, 0, 1 }, /* DEFINITIONTERM */
+  { "",                    0, 0, 0 }, /* DEFINITIONITEM (xml) */
+  { "",                    0, 0, 0 }, /* DEFCATEGORY (xml) */
+  { "function",            0, 0, 0 }, /* DEFFUNCTION */
+  { "varname",             0, 0, 0 }, /* DEFVARIABLE */
+  { "varname",             0, 0, 0 }, /* DEFPARAM */
+  { "",                    0, 0, 0 }, /* DEFDELIMITER (xml) */
+  { "returnvalue",         0, 0, 0 }, /* DEFTYPE */
+  { "type",                0, 0, 0 }, /* DEFPARAMTYPE */
+  { "structname",          0, 0, 0 }, /* DEFDATATYPE */
+  { "classname",           0, 0, 0 }, /* DEFCLASS */
+  { "property",            0, 0, 0 }, /* DEFCLASSVAR */
+  { "methodname",          0, 0, 0 }, /* DEFOPERATION */
+
+  { "para",                0, 0, 0 } /* Must be last */
+  /* name / contains para / contained in para / preserve space */
 };
 
 element *xml_element_list = NULL;
@@ -324,8 +477,8 @@ typedef struct _replace_element
 
 /* Elements to replace - Docbook only
    -------------------
-   if `element_to_replace' have to be inserted 
-   as a child of `element_containing,' 
+   if `element_to_replace' have to be inserted
+   as a child of `element_containing,'
    use `element_replacing' instead.
 
    A value of `-1' for element_replacing means `do not use any element.'
@@ -339,6 +492,23 @@ replace_element replace_elements [] = {
   { CODE, DFN, -1 },
   { CODE, VAR, -1 },
   { EMPH, CODE, REPLACEABLE },
+  { VAR, VAR, -1},
+  { VAR, B, EMPH},
+  { B, CODE, ENVAR},
+  { CODE, I, EMPH},
+  { SAMP, VAR, -1 },
+  { FORMAT, BOOKINFO, ABSTRACT },
+  { QUOTATION, ABSTRACT, -1},
+  { LINEANNOTATION, LINEANNOTATION, -1 },
+  { LEGALNOTICE, ABSTRACT, -1 },
+  { QUOTATION, QUOTATION, -1 },
+  /* Formal versions of table and image elements.  */
+  { MULTITABLE, FLOAT, FLOATTABLE },
+  { INFORMALFIGURE, FLOAT, FLOATFIGURE },
+  { CARTOUCHE, FLOAT, FLOATCARTOUCHE },
+  /* Unnecessary markup in @defun blocks.  */
+  { VAR, DEFPARAM, -1 },
+  { CODE, DEFTYPE, -1 },
   /* Add your elements to replace here */
   {-1, 0, 0}
 };
@@ -349,82 +519,129 @@ int xml_node_open = 0;
 int xml_node_level = -1;
 int xml_in_para = 0;
 int xml_just_after_element = 0;
+int xml_keep_space = 0;
+
+int xml_no_indent = 0;
 
 int xml_no_para = 0;
 char *xml_node_id = NULL;
 int xml_sort_index = 0;
 
+int xml_in_xref_token = 0;
+int xml_in_bookinfo = 0;
+int xml_in_book_title = 0;
+int xml_in_abstract = 0;
+
+/* Non-zero if we are handling an element that can appear between
+   @item and @itemx, @deffn and @deffnx.  */
+int xml_dont_touch_items_defs = 0;
+
+/* We need to keep footnote state, because elements inside footnote may try
+   to close the previous parent para.  */
+static int xml_in_footnote = 0;
+
 static int xml_after_table_term = 0;
 static int book_started = 0;
 static int first_section_opened = 0;
-static int in_abstract = 0;
 
-static int xml_current_element ();
+static int xml_in_tableitem[256];
+static int xml_in_item[256];
+static int xml_table_level = 0;
 
-void 
-#if defined (VA_FPRINTF) && __STDC__
-xml_insert_element_with_attribute (int elt, int arg, char *format, ...);
-#else
-xml_insert_element_with_attribute ();
-#endif
+static int xml_in_def_item[256];
+static int xml_definition_level = 0;
+int xml_after_def_term = 0;
+
+static int in_table_title = 0;
 
+static int in_indexentry = 0;
+static int in_secondary = 0;
+static int in_indexterm = 0;
+
 char *
-xml_id (id)
-    char *id;
+xml_id (char *id)
 {
   char *tem = xmalloc (strlen (id) + 1);
   char *p = tem;
   strcpy (tem, id);
-  while (*p++)
-    {
-      if (*p == ' ' || *p == '&' || *p == '/' || *p == '+')
-	*p = '-';
+  while (*p)
+    { /* Check if a character is allowed in ID attributes.  This list differs
+         slightly from XML specs that it doesn't contain underscores.
+         See http://xml.coverpages.org/sgmlsyn/sgmlsyn.htm, ``9.3 Name''  */
+      if (!strchr ("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-.", *p))
+        *p = '-';
+      p++;
     }
   p = tem;
-  while (*p == '-')
+  /* First character can only be a letter.  */
+  if (!strchr ("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", *p))
     *p = 'i';
   return tem;
 }
 
 int
-xml_element (name)
-    char *name;
+xml_element (char *name)
 {
   int i;
   for (i=0; i<=PARA; i++)
     {
       if (strcasecmp (name, texinfoml_element_list[i].name) == 0)
-	return i;
+        return i;
     }
   printf ("Error xml_element\n");
   return -1;
 }
 
 void
-xml_begin_document (output_filename)
-    char *output_filename;
+xml_begin_document (char *output_filename)
 {
   if (book_started)
     return;
 
   book_started = 1;
+
+  /* Make sure this is the very first string of the output document.  */
+  output_paragraph_offset = 0;
+
+  insert_string ("<?xml version=\"1.0\"");
+
+  /* At this point, we register a delayed writing for document encoding,
+     so in the end, proper encoding attribute will be inserted here.
+     Since the user is unaware that we are implicitly executing this
+     command, we should disable warnings temporarily, in order to avoid
+     possible confusion.  (ie. if the output is not seekable,
+     register_delayed_write issues a warning.)  */
+  {
+    extern int print_warnings;
+    int save_print_warnings = print_warnings;
+    print_warnings = 0;
+    register_delayed_write ("@documentencoding");
+    print_warnings = save_print_warnings;
+  }
+
+  insert_string ("?>\n");
+
   if (docbook)
     {
-      insert_string ("<!DOCTYPE Book PUBLIC \"-//OASIS//DTD DocBook V3.1//EN\">");
+      insert_string ("<!DOCTYPE book PUBLIC \"-//OASIS//DTD DocBook XML V4.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd\" [\n  <!ENTITY tex \"TeX\">\n  <!ENTITY latex \"LaTeX\">\n]>");
       xml_element_list = docbook_element_list;
     }
   else
     {
-      insert_string ("<!DOCTYPE texinfo SYSTEM \"texinfo.dtd\">");
+      insert_string ("<!DOCTYPE texinfo PUBLIC \"-//GNU//DTD TexinfoML V");
+      insert_string (VERSION);
+      insert_string ("//EN\" \"http://www.gnu.org/software/texinfo/dtd/");
+      insert_string (VERSION);
+      insert_string ("/texinfo.dtd\">");
       xml_element_list = texinfoml_element_list;
     }
-  if (docbook)
+  if (language_code != last_language_code)
     {
-      if (language_code != last_language_code)
-	xml_insert_element_with_attribute (TEXINFO, START, "lang=\"%s\"", language_table[language_code].abbrev);
+      if (docbook)
+        xml_insert_element_with_attribute (TEXINFO, START, "lang=\"%s\"", language_table[language_code].abbrev);
+      else
+	xml_insert_element_with_attribute (TEXINFO, START, "xml:lang=\"%s\"", language_table[language_code].abbrev);
     }
-  else
-    xml_insert_element (TEXINFO, START);
   if (!docbook)
     {
       xml_insert_element (SETFILENAME, START);
@@ -437,64 +654,109 @@ xml_begin_document (output_filename)
 static int element_stack[256];
 static int element_stack_index = 0;
 
-static void 
-xml_push_current_element (elt)
-    int elt;
+static int
+xml_current_element (void)
+{
+  return element_stack[element_stack_index-1];
+}
+
+static void
+xml_push_current_element (int elt)
 {
   element_stack[element_stack_index++] = elt;
   if (element_stack_index > 200)
-    printf ("*** stack overflow (%d - %s) ***\n", 
-	    element_stack_index, 
-	    xml_element_list[elt].name);
+    printf ("*** stack overflow (%d - %s) ***\n",
+            element_stack_index,
+            xml_element_list[elt].name);
 }
 
-void
-xml_pop_current_element ()
+static void
+xml_pop_current_element (void)
 {
   element_stack_index--;
   if (element_stack_index < 0)
-    printf ("*** stack underflow (%d - %d) ***\n", 
-	    element_stack_index, 
-	    xml_current_element());
+    printf ("*** stack underflow (%d - %d) ***\n",
+            element_stack_index,
+            xml_current_element());
 }
 
-static int
-xml_current_element ()
+int
+xml_current_stack_index (void)
 {
-  return element_stack[element_stack_index-1];
+  return element_stack_index;
 }
 
-static void
-xml_indent ()
+void
+xml_end_current_element (void)
 {
-  int i;
-  insert ('\n');
-  for (i = 0; i < element_stack_index; i++)
-    insert (' ');
+  xml_insert_element (xml_current_element (), END);
 }
 
 static void
-xml_indent_end_para ()
+xml_indent (void)
 {
-  int i;
-  for (i = 0; i < element_stack_index; i++)
-    insert (' ');
+  if (xml_indentation_increment > 0)
+    {
+      int i;
+      if (output_paragraph[output_paragraph_offset-1] != '\n')
+        insert ('\n');
+      for (i = 0; i < element_stack_index * xml_indentation_increment; i++)
+        insert (' ');
+    }
+}
+
+void
+xml_start_para (void)
+{
+  if (xml_in_para || xml_in_footnote
+      || !xml_element_list[xml_current_element()].contains_para)
+    return;
+
+  while (output_paragraph[output_paragraph_offset-1] == '\n')
+    output_paragraph_offset--;
+  xml_indent ();
+
+  insert_string ("<para");
+  if (xml_no_indent)
+    insert_string (" role=\"continues\"");
+  insert_string (">");
+  xml_no_indent = 0;
+  xml_in_para = 1;
 }
 
 void
-xml_end_document ()
+xml_end_para (void)
+{
+  if (!xml_in_para || xml_in_footnote)
+    return;
+
+  while (cr_or_whitespace(output_paragraph[output_paragraph_offset-1]))
+    output_paragraph_offset--;
+
+  insert_string ("</para>");
+  if (xml_indentation_increment > 0)
+    insert ('\n');
+  xml_in_para = 0;
+}
+
+void
+xml_end_document (void)
 {
   if (xml_node_open)
     {
       if (xml_node_level != -1)
-	{
-	  xml_close_sections (xml_node_level);
-	  xml_node_level = -1;
-	}
+        {
+          xml_close_sections (xml_node_level);
+          xml_node_level = -1;
+        }
       xml_insert_element (NODE, END);
     }
+  else
+    xml_close_sections (xml_node_level);
+
   xml_insert_element (TEXINFO, END);
-  insert_string ("\n");
+  if (xml_indentation_increment == 0)
+    insert ('\n');
   insert_string ("<!-- Keep this comment at the end of the file\n\
 Local variables:\n\
 mode: sgml\n\
@@ -513,7 +775,7 @@ static int start_element_inserted = 1;
    the next function, since otherwise the Solaris SUNWspro compiler
    barfs because `element' is a typedef declared near the beginning of
    this file.  */
-void 
+void
 #if defined (VA_FPRINTF) && __STDC__
 xml_insert_element_with_attribute (int elt, int arg, char *format, ...)
 #else
@@ -526,80 +788,113 @@ xml_insert_element_with_attribute (elt, arg, format, va_alist)
 {
   /* Look at the replace_elements table to see if we have to change the element */
   if (xml_sort_index)
-    return;
+      return;
   if (docbook)
     {
       replace_element *element_list = replace_elements;
       while (element_list->element_to_replace >= 0)
-	{
-	  if ( ( (arg == START) &&
-		 (element_list->element_containing == xml_current_element ()) &&
-		 (element_list->element_to_replace == elt) ) ||
-	       ( (arg == END) &&
-		 (element_list->element_containing == element_stack[element_stack_index-1-start_element_inserted]) &&
-		 (element_list->element_to_replace == elt) ) )
-	    {
-	      elt = element_list->element_replacing;
-	      break;
-	    }
-	  element_list ++;
-	}
-      
+        {
+          if ( ( (arg == START) &&
+                 (element_list->element_containing == xml_current_element ()) &&
+                 (element_list->element_to_replace == elt) ) ||
+               ( (arg == END) &&
+                 (element_list->element_containing == element_stack[element_stack_index-1-start_element_inserted]) &&
+                 (element_list->element_to_replace == elt) ) )
+            {
+              elt = element_list->element_replacing;
+              break;
+            }
+          element_list ++;
+        }
+
       /* Forget the element */
       if (elt < 0)
-	{
-	  if (arg == START)
-	    start_element_inserted = 0;
-	  else
-	    /* Replace the default value, for the next time */
-	    start_element_inserted = 1;
-	  return;
-	}
+        {
+          if (arg == START)
+            start_element_inserted = 0;
+          else
+            /* Replace the default value, for the next time */
+            start_element_inserted = 1;
+          return;
+        }
     }
 
   if (!book_started)
     return;
 
-  if (xml_after_table_term && elt != TABLETERM)
+  if (!xml_dont_touch_items_defs && arg == START)
     {
-      xml_after_table_term = 0;
-      xml_insert_element (ITEM, START);
+      if (xml_after_table_term && elt != TABLETERM && xml_table_level
+          && !xml_in_item[xml_table_level])
+        {
+          xml_after_table_term = 0;
+          xml_insert_element (ITEM, START);
+          xml_in_item[xml_table_level] = 1;
+        }
+      else if (xml_after_def_term && elt != DEFINITIONTERM)
+        {
+          xml_after_def_term = 0;
+          xml_insert_element (DEFINITIONITEM, START);
+          xml_in_def_item[xml_definition_level] = 1;
+        }
     }
 
   if (docbook && !only_macro_expansion && (in_menu || in_detailmenu))
     return;
 
-  if (!xml_element_list[elt].name || !strlen (xml_element_list[elt].name))
+  if (executing_string && arg == END)
+    switch (elt)
+      {
+      case TABLEITEM:
+        xml_in_tableitem[xml_table_level] = 0;
+        break;
+      case ITEM:
+        xml_in_item[xml_table_level] = 0;
+        break;
+      case DEFINITIONTERM:
+        xml_in_def_item[xml_definition_level] = 0;
+        break;
+      }
+
+  /* We are special-casing FIGURE element for docbook.  It does appear in
+     the tag stack, but not in the output.  This is to make element replacement
+     work beautifully.  */
+  if (docbook && elt == FLOAT)
     {
-      /* printf ("Warning: Inserting empty element %d\n", elt);*/
+      if (arg == START)
+        xml_push_current_element (elt);
+      else
+        xml_pop_current_element ();
       return;
     }
 
-  if (arg == START && !xml_in_para && !xml_no_para
-      && xml_element_list[elt].contained_in_para 
-      && xml_element_list[xml_current_element()].contains_para )
+  if (!xml_element_list[elt].name || !strlen (xml_element_list[elt].name))
     {
-      xml_indent ();
-      insert_string ("<para>");
-      xml_in_para = 1;
+      /*printf ("Warning: Inserting empty element %d\n", elt);*/
+      return;
     }
 
+  if (arg == START && !xml_in_para && !xml_no_para
+      && xml_element_list[elt].contained_in_para)
+    xml_start_para ();
 
   if (arg == START && xml_in_para && !xml_element_list[elt].contained_in_para)
-    {
-      xml_indent_end_para ();
-      insert_string ("</para>");
-      xml_in_para = 0;
-    }
-  
+    xml_end_para ();
+
   if (arg == END && xml_in_para && !xml_element_list[elt].contained_in_para)
+    xml_end_para ();
+
+  if (docbook && xml_table_level && !in_table_title
+      && !xml_in_tableitem[xml_table_level] && !xml_in_item[xml_table_level]
+      && arg == START && elt != TABLEITEM && elt != TABLETERM
+      && !in_indexterm && xml_current_element() == TABLE)
     {
-      xml_indent_end_para ();
-      insert_string ("</para>");
-      xml_in_para = 0;
+      in_table_title = 1;
+      xml_insert_element (TITLE, START);
     }
 
-  if (arg == START && !xml_in_para && !xml_element_list[elt].contained_in_para)
+  if (arg == START && !xml_in_para && !xml_keep_space
+      && !xml_element_list[elt].contained_in_para)
     xml_indent ();
 
   if (arg == START)
@@ -607,11 +902,36 @@ xml_insert_element_with_attribute (elt, arg, format, va_alist)
   else
     xml_pop_current_element ();
 
+  /* Eat one newline before </example> and the like.  */
+  if (!docbook && arg == END
+      && (xml_element_list[elt].keep_space || elt == GROUP)
+      && output_paragraph[output_paragraph_offset-1] == '\n')
+    output_paragraph_offset--;
+
+  /* And eat whitespace before </entry> in @multitables.  */
+  if (arg == END && elt == ENTRY)
+      while (cr_or_whitespace(output_paragraph[output_paragraph_offset-1]))
+    output_paragraph_offset--;
+
+  /* Indent elements that can contain <para>.  */
+  if (arg == END && !xml_in_para && !xml_keep_space
+      && xml_element_list[elt].contains_para)
+    xml_indent ();
+
+  /* Here are the elements we want indented.  These do not contain <para>
+     directly.  */
+  if (arg == END && (elt == MENUENTRY || elt == ITEMIZE || elt == ENUMERATE
+        || elt == TABLEITEM || elt == TABLE
+        || elt == MULTITABLE || elt == TGROUP || elt == THEAD || elt == TBODY
+        || elt == ROW || elt == INFORMALFIGURE
+        || (!docbook && (elt == DEFINITION || elt == DEFINITIONTERM))))
+    xml_indent ();
+
   insert ('<');
   if (arg == END)
     insert ('/');
   insert_string (xml_element_list[elt].name);
-  
+
   /*  printf ("%s ", xml_element_list[elt].name);*/
 
   if (format)
@@ -626,7 +946,7 @@ xml_insert_element_with_attribute (elt, arg, format, va_alist)
       VA_SPRINTF (temp_string, format, ap);
 #else
       sprintf (temp_string, format, a1, a2, a3, a4, a5, a6, a7, a8);
-#endif 
+#endif
       insert (' ');
       insert_string (temp_string);
       va_end (ap);
@@ -636,13 +956,29 @@ xml_insert_element_with_attribute (elt, arg, format, va_alist)
     {
       insert_string (" id=\"");
       insert_string (xml_node_id);
-      insert_string ("\"");
+      insert ('"');
       free (xml_node_id);
       xml_node_id = NULL;
     }
 
+  if (xml_element_list[elt].keep_space)
+    {
+      if (arg == START)
+	{
+          if (!docbook)
+            insert_string (" xml:space=\"preserve\"");
+	  xml_keep_space++;
+	}
+      else
+	xml_keep_space--;
+    }
+
   insert ('>');
 
+  if (!xml_in_para && !xml_element_list[elt].contained_in_para
+      && xml_element_list[elt].contains_para && xml_indentation_increment > 0)
+    insert ('\n');
+
   xml_just_after_element = 1;
 }
 
@@ -664,17 +1000,16 @@ xml_insert_entity (char *entity_name)
   if (docbook && !only_macro_expansion && (in_menu || in_detailmenu))
     return;
 
-  if (!xml_in_para && !xml_no_para && !only_macro_expansion 
-      && xml_element_list[xml_current_element ()].contains_para)
-    {
-      insert_string ("<para>");
-      xml_in_para = 1;
-    }
+  if (!xml_in_para && !xml_no_para && !only_macro_expansion
+      && xml_element_list[xml_current_element ()].contains_para
+      && !in_fixed_width_font)
+    xml_start_para ();
+
   escape_html = 0;
-  insert ('&');
+  add_char ('&');
   escape_html = saved_escape_html;
   insert_string (entity_name);
-  insert (';');
+  add_char (';');
 }
 
 typedef struct _xml_section xml_section;
@@ -687,15 +1022,26 @@ struct _xml_section {
 xml_section *last_section = NULL;
 
 void
-xml_begin_node ()
+xml_begin_node (void)
 {
+  first_section_opened = 1;
+  if (xml_in_abstract)
+    {
+      xml_insert_element (ABSTRACT, END);
+      xml_in_abstract = 0;
+    }
+  if (xml_in_bookinfo)
+    {
+      xml_insert_element (BOOKINFO, END);
+      xml_in_bookinfo = 0;
+    }
   if (xml_node_open && ! docbook)
     {
       if (xml_node_level != -1)
-	{
-	  xml_close_sections (xml_node_level);
-	  xml_node_level = -1;
-	}
+        {
+          xml_close_sections (xml_node_level);
+          xml_node_level = -1;
+        }
       xml_insert_element (NODE, END);
     }
   xml_insert_element (NODE, START);
@@ -703,15 +1049,23 @@ xml_begin_node ()
 }
 
 void
-xml_close_sections (level)
-    int level;
+xml_close_sections (int level)
 {
-  if (!first_section_opened && in_abstract)
+  if (!first_section_opened)
     {
-      xml_insert_element (ABSTRACT, END);
-      xml_insert_element (BOOKINFO, END);
+      if (xml_in_abstract)
+	{
+	  xml_insert_element (ABSTRACT, END);
+	  xml_in_abstract = 0;
+	}
+      if (xml_in_bookinfo)
+	{
+	  xml_insert_element (BOOKINFO, END);
+	  xml_in_bookinfo = 0;
+	}
       first_section_opened = 1;
     }
+
   while (last_section && last_section->level >= level)
     {
       xml_section *temp = last_section;
@@ -724,9 +1078,7 @@ xml_close_sections (level)
 }
 
 void
-xml_open_section (level, name)
-    int level;
-    char *name;
+xml_open_section (int level, char *name)
 {
   xml_section *sect = (xml_section *) xmalloc (sizeof (xml_section));
 
@@ -741,8 +1093,7 @@ xml_open_section (level, name)
 }
 
 void
-xml_start_menu_entry (tem)
-    char *tem;
+xml_start_menu_entry (char *tem)
 {
   char *string;
   discard_until ("* ");
@@ -754,10 +1105,10 @@ xml_start_menu_entry (tem)
   if (xml_in_menu_entry)
     {
       if (xml_in_menu_entry_comment)
-	{
-	  xml_insert_element (MENUCOMMENT, END);
-	  xml_in_menu_entry_comment=0;
-	}
+        {
+          xml_insert_element (MENUCOMMENT, END);
+          xml_in_menu_entry_comment=0;
+        }
       xml_insert_element (MENUENTRY, END);
       xml_in_menu_entry=0;
     }
@@ -769,7 +1120,7 @@ xml_start_menu_entry (tem)
   add_word (string);
   xml_insert_element (MENUNODE, END);
   free (string);
-  
+
   /* The menu item may use macros, so expand them now.  */
   xml_insert_element (MENUTITLE, START);
   only_macro_expansion++;
@@ -786,21 +1137,22 @@ xml_start_menu_entry (tem)
       get_until_in_line (0, ".", &string);
       free (string);
     }
-  input_text_offset++;	/* discard the second colon or the period */
+  input_text_offset++;  /* discard the second colon or the period */
+  skip_whitespace_and_newlines();
   xml_insert_element (MENUCOMMENT, START);
   xml_in_menu_entry_comment ++;
 }
 
 void
-xml_end_menu ()
+xml_end_menu (void)
 {
   if (xml_in_menu_entry)
     {
       if (xml_in_menu_entry_comment)
-	{
-	  xml_insert_element (MENUCOMMENT, END);
-	  xml_in_menu_entry_comment --;
-	}
+        {
+          xml_insert_element (MENUCOMMENT, END);
+          xml_in_menu_entry_comment --;
+        }
       xml_insert_element (MENUENTRY, END);
       xml_in_menu_entry--;
     }
@@ -810,65 +1162,84 @@ xml_end_menu ()
 static int xml_last_character;
 
 void
-xml_add_char (character)
-    int character;
+xml_add_char (int character)
 {
   if (!book_started)
-    return;
+      return;
   if (docbook && !only_macro_expansion && (in_menu || in_detailmenu))
     return;
 
-  if (!first_section_opened && !in_abstract && xml_current_element () == TEXINFO
-      && !xml_no_para && character != '\r' && character != '\n' && character != ' ')
+  if (docbook && xml_table_level && !in_table_title
+      && !xml_in_item[xml_table_level] && !xml_in_tableitem[xml_table_level]
+      && !cr_or_whitespace (character) && !in_indexterm)
+    {
+      in_table_title = 1;
+      xml_insert_element (TITLE, START);
+    }
+
+  if (!first_section_opened && !xml_in_abstract && !xml_in_book_title
+      && !xml_no_para && character != '\r' && character != '\n'
+      && character != ' ' && !is_in_insertion_of_type (copying))
     {
-      xml_insert_element (BOOKINFO, START);
+      if (!xml_in_bookinfo)
+	{
+	  xml_insert_element (BOOKINFO, START);
+	  xml_in_bookinfo = 1;
+	}
       xml_insert_element (ABSTRACT, START);
-      in_abstract = 1;
+      xml_in_abstract = 1;
     }
 
-  if (xml_after_table_term && !xml_sort_index)
+  if (!xml_sort_index && !xml_in_xref_token && !xml_dont_touch_items_defs)
     {
-      xml_after_table_term = 0;
-      xml_insert_element (ITEM, START);
+      if (xml_after_table_term && xml_table_level
+          && !xml_in_item[xml_table_level])
+        {
+          xml_after_table_term = 0;
+          xml_insert_element (ITEM, START);
+          xml_in_item[xml_table_level] = 1;
+        }
+      else if (xml_after_def_term)
+        {
+          xml_after_def_term = 0;
+          xml_insert_element (DEFINITIONITEM, START);
+          xml_in_def_item[xml_definition_level] = 1;
+        }
     }
-  
+
   if (xml_just_after_element && !xml_in_para && !inhibit_paragraph_indentation)
     {
       if (character == '\r' || character == '\n' || character == '\t' || character == ' ')
-	return;
-      xml_just_after_element = 0;      
+        return;
+      xml_just_after_element = 0;
     }
-  
-  if (xml_element_list[xml_current_element()].contains_para 
-      && !xml_in_para && !only_macro_expansion && !xml_no_para)
+
+  if (xml_element_list[xml_current_element()].contains_para
+      && !xml_in_para && !only_macro_expansion && !xml_no_para
+      && !cr_or_whitespace (character) && !in_fixed_width_font)
+    xml_start_para ();
+
+  if (xml_in_para && character == '\n' && xml_last_character == '\n'
+      && !only_macro_expansion && !xml_no_para
+      && xml_element_list[xml_current_element()].contains_para )
     {
-      xml_indent ();
-      insert_string ("<para>\n");
-      xml_in_para = 1;
+      xml_end_para ();
+      xml_just_after_element = 1;
+      return;
     }
-  
-  if (xml_in_para)
+
+  if (xml_in_menu_entry_comment && character == '\n' && xml_last_character == '\n')
     {
-      if (character == '\n')
-	{
-	  if (xml_last_character == '\n' && !only_macro_expansion && !xml_no_para
-	      && xml_element_list[xml_current_element()].contains_para )
-	    {
-	      xml_indent_end_para ();
-	      insert_string ("</para>");
-	      xml_in_para = 0;
-	      xml_just_after_element = 1;
-	      if (xml_in_menu_entry_comment)
-		{
-		  xml_insert_element (MENUCOMMENT, END);
-		  xml_in_menu_entry_comment = 0;
-		  xml_insert_element (MENUENTRY, END);
-		  xml_in_menu_entry = 0;
-		}
-	    }
-	}
+      xml_insert_element (MENUCOMMENT, END);
+      xml_in_menu_entry_comment = 0;
+      xml_insert_element (MENUENTRY, END);
+      xml_in_menu_entry = 0;
     }
-  
+
+  if (xml_in_menu_entry_comment && whitespace(character)
+      && cr_or_whitespace(xml_last_character))
+    return;
+
   if (character == '\n' && !xml_in_para && !inhibit_paragraph_indentation)
     return;
 
@@ -878,34 +1249,139 @@ xml_add_char (character)
       insert_string ("&amp;");
   else if (character == '<' && escape_html)
       insert_string ("&lt;");
+  else if (character == '\n' && !xml_keep_space)
+    {
+      if (!xml_in_para && xml_just_after_element && !multitable_active)
+	return;
+      else
+	insert (docbook ? '\n' : ' ');
+    }
   else
     insert (character);
-  
+
   return;
 }
 
 void
-xml_insert_footnote (note)
-    char *note;
+xml_insert_footnote (char *note)
 {
+  if (!xml_in_para)
+    xml_start_para ();
+
+  xml_in_footnote = 1;
   xml_insert_element (FOOTNOTE, START);
   insert_string ("<para>");
   execute_string ("%s", note);
   insert_string ("</para>");
   xml_insert_element (FOOTNOTE, END);
+  xml_in_footnote = 0;
+}
+
+/* We need to keep the quotation stack ourself, because insertion_stack
+   loses item_function when we are closing the block, so we don't know
+   what to close then.  */
+typedef struct quotation_elt
+{
+  struct quotation_elt *next;
+  char *type;
+} QUOTATION_ELT;
+
+static QUOTATION_ELT *quotation_stack = NULL;
+
+void
+xml_insert_quotation (char *type, int arg)
+{
+  int quotation_started = 0;
+
+  if (arg == START)
+    {
+      QUOTATION_ELT *new = xmalloc (sizeof (QUOTATION_ELT));
+      new->type = xstrdup (type);
+      new->next = quotation_stack;
+      quotation_stack = new;
+    }
+  else
+    type = quotation_stack->type;
+
+  /* Make use of special quotation styles of Docbook if we can.  */
+  if (docbook && strlen(type))
+    {
+      /* Let's assume it started.  */
+      quotation_started = 1;
+
+      if (strcasecmp (type, "tip") == 0)
+        xml_insert_element (TIP, arg);
+      else if (strcasecmp (type, "note") == 0)
+        xml_insert_element (NOTE, arg);
+      else if (strcasecmp (type, "important") == 0)
+        xml_insert_element (IMPORTANT, arg);
+      else if (strcasecmp (type, "warning") == 0)
+        xml_insert_element (WARNING, arg);
+      else if (strcasecmp (type, "caution") == 0)
+        xml_insert_element (CAUTION, arg);
+      else
+        /* Didn't find a known quotation type :\ */
+        quotation_started = 0;
+    }
+
+  if (!quotation_started)
+    {
+      xml_insert_element (QUOTATION, arg);
+      if (strlen(type) && arg == START)
+        execute_string ("@b{%s:} ", type);
+    }
+
+  if (arg == END)
+    {
+      QUOTATION_ELT *temp = quotation_stack;
+      if (temp == NULL)
+        return;
+      quotation_stack = quotation_stack->next;
+      free(temp->type);
+      free(temp);
+    }
 }
 
+/* Starting generic docbook floats.  Just starts elt with correct label
+   and id attributes, and inserts title.  */
+void
+xml_begin_docbook_float (int elt)
+{
+  if (current_float_used_title ())	/* in a nested float */
+    {
+      xml_insert_element (elt, START);	/* just insert the tag */
+      return;
+    }
+
+
+  /* OK, need the title, tag, etc. */
+  if (elt == CARTOUCHE)    /* no labels on <sidebar> */
+    {
+       if (strlen (current_float_id ()) == 0)
+          xml_insert_element (elt, START);
+       else
+          xml_insert_element_with_attribute (elt, START,
+              "id=\"%s\"", xml_id (current_float_id ()));
+    }
+  else if (strlen (current_float_id ()) == 0)
+    xml_insert_element_with_attribute (elt, START, "label=\"\"");
+  else
+    xml_insert_element_with_attribute (elt, START,
+        "id=\"%s\" label=\"%s\"", xml_id (current_float_id ()),
+        current_float_number ());
+
+  xml_insert_element (TITLE, START);
+  execute_string ("%s", current_float_title ());
+  xml_insert_element (TITLE, END);
+
+  current_float_set_title_used ();	/* mark this title, tag, etc used */
+}
 
 /*
  * Lists and Tables
  */
-static int xml_in_item[256];
-static int xml_table_level = 0;
-
 void
-xml_begin_table (type, item_function)
-    enum insertion_type type;
-    char *item_function;
+xml_begin_table (int type, char *item_function)
 {
   switch (type)
     {
@@ -913,66 +1389,76 @@ xml_begin_table (type, item_function)
     case vtable:
     case table:
       /*if (docbook)*/ /* 05-08 */
-	{
-	  xml_insert_element (TABLE, START);
-	  xml_table_level ++;      
-	  xml_in_item[xml_table_level] = 0;
-	}
+        {
+          xml_insert_element (TABLE, START);
+          xml_table_level ++;
+          xml_in_tableitem[xml_table_level] = 0;
+          xml_in_item[xml_table_level] = 0;
+          xml_after_table_term = 0;
+        }
       break;
     case itemize:
       if (!docbook)
-	{
-	  xml_insert_element (ITEMIZE, START);
-	  xml_table_level ++;      
-	  xml_in_item[xml_table_level] = 0;
-	  xml_insert_element (ITEMFUNCTION, START);
-	  if (*item_function == COMMAND_PREFIX
-	      && item_function[strlen (item_function) - 1] != '}'
-	      && command_needs_braces (item_function + 1))
-	    execute_string ("%s{}", item_function);
-	  else
-	    execute_string ("%s", item_function);
-	  xml_insert_element (ITEMFUNCTION, END);
-	} 
-      else 
-	{
-	  xml_insert_element_with_attribute (ITEMIZE, START, 
-					     "mark=\"%s\"",
-					     (*item_function == COMMAND_PREFIX) ?
-					     &item_function[1] : item_function);
-	  xml_table_level ++;      
-	  xml_in_item[xml_table_level] = 0;
-	}
+        {
+          xml_insert_element (ITEMIZE, START);
+          xml_table_level ++;
+          xml_in_item[xml_table_level] = 0;
+          xml_insert_element (ITEMFUNCTION, START);
+          if (*item_function == COMMAND_PREFIX
+              && item_function[strlen (item_function) - 1] != '}'
+              && command_needs_braces (item_function + 1))
+            execute_string ("%s{}", item_function);
+          else
+            execute_string ("%s", item_function);
+          xml_insert_element (ITEMFUNCTION, END);
+        }
+      else
+        {
+          xml_insert_element_with_attribute (ITEMIZE, START,
+                                             "mark=\"%s\"",
+                                             (*item_function == COMMAND_PREFIX) ?
+                                             &item_function[1] : item_function);
+          xml_table_level ++;
+          xml_in_item[xml_table_level] = 0;
+        }
       break;
     }
 }
 
 void
-xml_end_table (type)
-    enum insertion_type type;
+xml_end_table (int type)
 {
   switch (type)
     {
     case ftable:
     case vtable:
     case table:
-      /*      if (docbook)*/ /* 05-08 */
-	{
-	  if (xml_in_item[xml_table_level])
-	    {
-	      xml_insert_element (ITEM, END);
-	      xml_insert_element (TABLEITEM, END);
-	      xml_in_item[xml_table_level] = 0;
-	    }
-	  xml_insert_element (TABLE, END);
-	  xml_table_level --;
-	}
+      if (xml_in_item[xml_table_level])
+        {
+          xml_insert_element (ITEM, END);
+          xml_in_item[xml_table_level] = 0;
+        }
+      if (xml_in_tableitem[xml_table_level])
+        {
+          xml_insert_element (TABLEITEM, END);
+          xml_in_tableitem[xml_table_level] = 0;
+        }
+      xml_insert_element (TABLE, END);
+      xml_after_table_term = 0;
+      xml_table_level --;
+
       break;
     case itemize:
       if (xml_in_item[xml_table_level])
+        {
+          xml_insert_element (ITEM, END);
+          xml_in_item[xml_table_level] = 0;
+        }
+      /* gnat-style manual contains an itemized list without items! */
+      if (in_table_title)
 	{
-	  xml_insert_element (ITEM, END);
-	  xml_in_item[xml_table_level] = 0;
+	  xml_insert_element (TITLE, END);
+	  in_table_title = 0;
 	}
       xml_insert_element (ITEMIZE, END);
       xml_table_level --;
@@ -981,7 +1467,7 @@ xml_end_table (type)
 }
 
 void
-xml_begin_item ()
+xml_begin_item (void)
 {
   if (xml_in_item[xml_table_level])
     xml_insert_element (ITEM, END);
@@ -991,71 +1477,83 @@ xml_begin_item ()
 }
 
 void
-xml_begin_table_item ()
+xml_begin_table_item (void)
 {
   if (!xml_after_table_term)
     {
       if (xml_in_item[xml_table_level])
+        xml_insert_element (ITEM, END);
+      if (xml_in_tableitem[xml_table_level])
+        xml_insert_element (TABLEITEM, END);
+
+      if (in_table_title)
 	{
-	  xml_insert_element (ITEM, END);
-	  xml_insert_element (TABLEITEM, END);
+	  in_table_title = 0;
+	  xml_insert_element (TITLE, END);
 	}
       xml_insert_element (TABLEITEM, START);
     }
   xml_insert_element (TABLETERM, START);
-  xml_in_item[xml_table_level] = 1;
+  xml_in_tableitem[xml_table_level] = 1;
+  xml_in_item[xml_table_level] = 0;
   xml_after_table_term = 0;
 }
 
 void
-xml_continue_table_item ()
+xml_continue_table_item (void)
 {
   xml_insert_element (TABLETERM, END);
   xml_after_table_term = 1;
+  xml_in_item[xml_table_level] = 0;
 }
 
 void
-xml_begin_enumerate (enum_arg)
-    char *enum_arg;
+xml_begin_enumerate (char *enum_arg)
 {
   if (!docbook)
     xml_insert_element_with_attribute (ENUMERATE, START, "first=\"%s\"", enum_arg);
   else
-    {    
+    {
       if (isdigit (*enum_arg))
-      {
-	if (enum_arg[0] == '1')
-	  xml_insert_element_with_attribute (ENUMERATE, START, 
-					     "numeration=\"Arabic\"", NULL);
-	else
-	  xml_insert_element_with_attribute (ENUMERATE, START, 
-					     "continuation=\"Continues\" numeration=\"Arabic\"", NULL);
-      }
+        {
+          int enum_val = atoi (enum_arg);
+
+          /* Have to check the value, not just the first digit.  */
+          if (enum_val == 0)
+            xml_insert_element_with_attribute (ENUMERATE, START,
+                "numeration=\"arabic\" role=\"0\"", NULL);
+          else if (enum_val == 1)
+            xml_insert_element_with_attribute (ENUMERATE, START,
+                "numeration=\"arabic\"", NULL);
+          else
+            xml_insert_element_with_attribute (ENUMERATE, START,
+                "continuation=\"continues\" numeration=\"arabic\"", NULL);
+        }
       else if (isupper (*enum_arg))
-	{
-	if (enum_arg[0] == 'A')
-	  xml_insert_element_with_attribute (ENUMERATE, START, 
-					     "numeration=\"Upperalpha\"", NULL);
-	else
-	  xml_insert_element_with_attribute (ENUMERATE, START, 
-					     "continuation=\"Continues\" numeration=\"Upperalpha\"", NULL);
-      }
+        {
+          if (enum_arg[0] == 'A')
+            xml_insert_element_with_attribute (ENUMERATE, START,
+                "numeration=\"upperalpha\"", NULL);
+          else
+            xml_insert_element_with_attribute (ENUMERATE, START,
+                "continuation=\"continues\" numeration=\"upperalpha\"", NULL);
+        }
       else
-	{
-	  if (enum_arg[0] == 'a')
-	  xml_insert_element_with_attribute (ENUMERATE, START, 
-					     "numeration=\"Loweralpha\"", NULL);
-	else
-	  xml_insert_element_with_attribute (ENUMERATE, START, 
-					     "continuation=\"Continues\" numeration=\"Loweralpha\"", NULL);
-	}      
+        {
+          if (enum_arg[0] == 'a')
+            xml_insert_element_with_attribute (ENUMERATE, START,
+                "numeration=\"loweralpha\"", NULL);
+          else
+            xml_insert_element_with_attribute (ENUMERATE, START,
+                "continuation=\"continues\" numeration=\"loweralpha\"", NULL);
+        }
     }
   xml_table_level ++;
   xml_in_item[xml_table_level] = 0;
 }
 
 void
-xml_end_enumerate ()
+xml_end_enumerate (void)
 {
   if (xml_in_item[xml_table_level])
     {
@@ -1067,8 +1565,7 @@ xml_end_enumerate ()
 }
 
 static void
-xml_insert_text_file (name_arg)
-    char *name_arg;
+xml_insert_text_file (char *name_arg)
 {
   char *fullname = xmalloc (strlen (name_arg) + 4 + 1);
   FILE *image_file;
@@ -1080,62 +1577,109 @@ xml_insert_text_file (name_arg)
       int ch;
       int save_inhibit_indentation = inhibit_paragraph_indentation;
       int save_filling_enabled = filling_enabled;
-      
+
       xml_insert_element (TEXTOBJECT, START);
       xml_insert_element (DISPLAY, START);
 
       inhibit_paragraph_indentation = 1;
       filling_enabled = 0;
       last_char_was_newline = 0;
-      
+
       /* Maybe we need to remove the final newline if the image
-	 file is only one line to allow in-line images.  On the
-	 other hand, they could just make the file without a
-	 final newline.  */
+         file is only one line to allow in-line images.  On the
+         other hand, they could just make the file without a
+         final newline.  */
       while ((ch = getc (image_file)) != EOF)
-	add_char (ch);
-      
+        add_char (ch);
+
       inhibit_paragraph_indentation = save_inhibit_indentation;
       filling_enabled = save_filling_enabled;
 
       xml_insert_element (DISPLAY, END);
       xml_insert_element (TEXTOBJECT, END);
-      
+
       if (fclose (image_file) != 0)
-	perror (fullname);
+        perror (fullname);
     }
   else
     warning (_("@image file `%s' unreadable: %s"), fullname,
-	     strerror (errno));
-  
+             strerror (errno));
+
   free (fullname);
 }
 
-void
-xml_insert_docbook_image (name_arg)
-    char *name_arg;
-{
-  xml_insert_element (INFORMALFIGURE, START);
-  xml_insert_element (MEDIAOBJECT, START);
+/* If NAME.EXT is accessible or FORCE is nonzero, insert a docbook
+   imagedata element for FMT.  Return 1 if inserted something, 0 else.  */
 
-  xml_insert_element (IMAGEOBJECT, START);
-  xml_insert_element_with_attribute (IMAGEDATA, START, "fileref=\"%s.eps\" format=\"eps\"", name_arg);
-  xml_pop_current_element ();
-  xml_insert_element (IMAGEOBJECT, END);
+static int
+try_docbook_image (const char *name, const char *ext, const char *fmt,
+                   int force)
+{
+  int used = 0;
+  char *fullname = xmalloc (strlen (name) + 1 + strlen (ext) + 1);
+  sprintf (fullname, "%s.%s", name, ext);
+
+  if (force || access (fullname, R_OK) == 0)
+   {
+     xml_insert_element (IMAGEOBJECT, START);
+     xml_insert_element_with_attribute (IMAGEDATA, START,
+       "fileref=\"%s\" format=\"%s\"", fullname, fmt);
+     xml_insert_element (IMAGEDATA, END);
+     xml_insert_element (IMAGEOBJECT, END);
+     used = 1;
+   }
+ 
+ free (fullname);
+ return used;
+}
 
-  xml_insert_element (IMAGEOBJECT, START);
-  xml_insert_element_with_attribute (IMAGEDATA, START, "fileref=\"%s.jpg\" format=\"jpg\"", name_arg);
-  xml_pop_current_element ();
-  xml_insert_element (IMAGEOBJECT, END);
 
+void
+xml_insert_docbook_image (char *name_arg)
+{
+  int found = 0;
+  int elt = xml_in_para ? INLINEIMAGE : MEDIAOBJECT;
+
+  if (is_in_insertion_of_type (floatenv))
+    xml_begin_docbook_float (INFORMALFIGURE);
+  else if (!xml_in_para)
+    xml_insert_element (INFORMALFIGURE, START);
+
+  xml_no_para++;
+
+  xml_insert_element (elt, START);
+
+  /* A selected few from http://docbook.org/tdg/en/html/imagedata.html.  */
+  if (try_docbook_image (name_arg, "eps", "EPS", 0))
+    found++;
+  if (try_docbook_image (name_arg, "gif", "GIF", 0))
+    found++;
+  if (try_docbook_image (name_arg, "jpg", "JPG", 0))
+    found++;
+  if (try_docbook_image (name_arg, "jpeg", "JPEG", 0))
+    found++;
+  if (try_docbook_image (name_arg, "pdf", "PDF", 0))
+    found++;
+  if (try_docbook_image (name_arg, "png", "PNG", 0))
+    found++;
+  if (try_docbook_image (name_arg, "svg", "SVG", 0))
+    found++;
+
+  /* If no luck so far, just assume we'll eventually have a jpg.  */
+  if (!found)
+    try_docbook_image (name_arg, "jpg", "JPG", 1);
+ 
   xml_insert_text_file (name_arg);
+  xml_insert_element (elt, END);
+
+  xml_no_para--;
 
-  xml_insert_element (MEDIAOBJECT, END);
-  xml_insert_element (INFORMALFIGURE, END);
+  if (elt == MEDIAOBJECT)
+    xml_insert_element (INFORMALFIGURE, END);
 }
 
 void
-xml_asterisk ()
+xml_asterisk (void)
 {
 }
 
@@ -1143,51 +1687,68 @@ xml_asterisk ()
 /*
  *     INDEX
  */
-/* Used to separate primary and secondary entries in an index */
-#define INDEX_SEP ", "
+/* Used to separate primary and secondary entries in an index -- we need
+   to have real multilivel indexing support, not just string analysis.  */
+#define INDEX_SEP "@this string will never appear@" /* was , */
 
-xml_insert_indexterm (indexterm, index)
-    char *indexterm;
-    char *index;
+typedef struct
 {
+  char *from;
+  char *to;
+} XML_SYNONYM;
+
+static XML_SYNONYM **xml_synonyms = NULL;
+static int xml_synonyms_count = 0;
+
+void
+xml_insert_indexterm (char *indexterm, char *index)
+{
+  /* @index commands can appear between @item and @itemx, @deffn and @deffnx.  */
   if (!docbook)
     {
+      /* Check to see if we need to do index redirection per @synindex.  */
+      int i;
+      for (i = 0; i < xml_synonyms_count; i++)
+        {
+          if (STREQ (xml_synonyms[i]->from, index))
+            index = xstrdup (xml_synonyms[i]->to);
+        }
+
+      xml_dont_touch_items_defs++;
       xml_insert_element_with_attribute (INDEXTERM, START, "index=\"%s\"", index);
+      in_indexterm = 1;
       execute_string ("%s", indexterm);
       xml_insert_element (INDEXTERM, END);
+      in_indexterm = 0;
+      xml_dont_touch_items_defs--;
     }
   else
-    {      
-      char *expanded;
-      char *primary = NULL, *secondary;
-      xml_sort_index = 1;
-      xml_no_para = 1;
-      expanded = expansion (indexterm);
-      xml_sort_index = 0;
-      xml_no_para = 0;
-      if (strstr (expanded+1, INDEX_SEP))
-	{
-	  primary = xmalloc (strlen (expanded) + 1);
-	  strcpy (primary, expanded);
-	  secondary = strstr (primary+1, INDEX_SEP);
-	  *secondary = '\0';
-	  secondary += strlen (INDEX_SEP);
-	}
+    {
+      char *primary = NULL, *secondary = NULL;
+      if (strstr (indexterm+1, INDEX_SEP))
+        {
+          primary = xmalloc (strlen (indexterm) + 1);
+          strcpy (primary, indexterm);
+          secondary = strstr (primary+1, INDEX_SEP);
+          *secondary = '\0';
+          secondary += strlen (INDEX_SEP);
+        }
       xml_insert_element_with_attribute (INDEXTERM, START, "role=\"%s\"", index);
+      in_indexterm = 1;
       xml_insert_element (PRIMARY, START);
       if (primary)
-	insert_string (primary);
+        execute_string ("%s", primary);
       else
-	insert_string (expanded);
+        execute_string ("%s", indexterm);
       xml_insert_element (PRIMARY, END);
       if (primary)
-	{
-	  xml_insert_element (SECONDARY, START);
-	  insert_string (secondary);
-	  xml_insert_element (SECONDARY, END);
-	}
+        {
+          xml_insert_element (SECONDARY, START);
+          execute_string ("%s", secondary);
+          xml_insert_element (SECONDARY, END);
+        }
       xml_insert_element (INDEXTERM, END);
-      free (expanded);
+      in_indexterm = 0;
     }
 }
 
@@ -1197,10 +1758,8 @@ static char last_division_letter = ' ';
 static char index_primary[2000]; /** xx no fixed limit */
 static int indexdivempty = 0;
 
-static int in_indexentry = 0;
-static int in_secondary = 0;
-static void 
-xml_close_indexentry ()
+static void
+xml_close_indexentry (void)
 {
   if (!in_indexentry)
     return;
@@ -1212,80 +1771,117 @@ xml_close_indexentry ()
 }
 
 void
-xml_begin_index ()
+xml_begin_index (void)
 {
-  /* 
-     We assume that we just opened a section, and so that the last output is
-     <SECTION ID="node-name"><TITLE>Title</TITLE>
-     where SECTION can be CHAPTER, ...
-   */
-
-  xml_section *temp = last_section;
-
-  int l = output_paragraph_offset-xml_last_section_output_position;
-  char *tmp = xmalloc (l+1);
-  char *p = tmp;
-  strncpy (tmp, output_paragraph, l);
-
-  /* We remove <SECTION */
-  tmp[l] = '\0';
-  while (*p != '<')
-    p++;
-  while (*p != ' ')
-    p++;
-
-  output_paragraph_offset = xml_last_section_output_position;
-  xml_last_section_output_position = 0;
-
-  xml_pop_current_element (); /* remove section element from elements stack */
-				
-  last_section = last_section->prev; /* remove section from sections stack */
-  free (temp->name);
-  free (temp);
-  
-  /* We put <INDEX> */
-  xml_insert_element (PRINTINDEX, START);
-  /* Remove the final > */
-  output_paragraph_offset--;
-
-  /* and put  ID="node-name"><TITLE>Title</TITLE> */
-  insert_string (p);
+  typedef struct xml_index_title {
+      struct xml_index_title *next;
+      char *title;
+  } XML_INDEX_TITLE;
 
-  if (xml_index_divisions)
+  static XML_INDEX_TITLE *xml_index_titles = NULL;
+
+  if (!handling_delayed_writes)
+    { /* We assume that we just opened a section, and so that the last output is
+         <SECTION ID="node-name"><TITLE>Title</TITLE>
+         where SECTION can be CHAPTER, ...  */
+
+      XML_INDEX_TITLE *new = xmalloc (sizeof (XML_INDEX_TITLE));
+      xml_section *temp = last_section;
+
+      int l = output_paragraph_offset-xml_last_section_output_position;
+      char *tmp = xmalloc (l+1);
+      char *p = tmp;
+      strncpy (tmp, (char *) output_paragraph, l);
+
+      /* We remove <SECTION */
+      tmp[l] = '\0';
+      while (*p != '<')
+        p++;
+      while (*p != ' ')
+        p++;
+      /* ... and its label attribute.  */
+      if (strncmp (p, " label=", 7) == 0)
+        {
+          p++;
+          while (*p != ' ')
+            p++;
+        }
+
+      output_paragraph_offset = xml_last_section_output_position;
+      xml_last_section_output_position = 0;
+
+      xml_pop_current_element (); /* remove section element from elements stack */
+
+      if (last_section)
+        last_section = last_section->prev; /* remove section from sections stack */
+      if (temp)
+        {
+          free (temp->name);
+          free (temp);
+        }
+
+      new->title = xstrdup (p);
+      new->next = xml_index_titles;
+      xml_index_titles = new;
+    }
+  else
     {
-      xml_insert_element (INDEXDIV, START);
-      indexdivempty = 1;
+      static int xml_index_titles_reversed = 0;
+
+      if (!xml_index_titles_reversed)
+        {
+          xml_index_titles = (XML_INDEX_TITLE *) reverse_list
+            ((GENERIC_LIST *) xml_index_titles);
+          xml_index_titles_reversed = 1;
+        }
+
+      /* We put <INDEX> */
+      xml_insert_element (PRINTINDEX, START);
+      if (xml_index_titles)
+        {
+          /* Remove the final > */
+          output_paragraph_offset--;
+          /* and put  ID="node-name"><TITLE>Title</TITLE> */
+          insert_string (xml_index_titles->title);
+          free (xml_index_titles->title);
+          xml_index_titles = xml_index_titles->next;
+        }
+
+      if (xml_index_divisions)
+        {
+          xml_insert_element (INDEXDIV, START);
+          indexdivempty = 1;
+        }
     }
 }
 
 void
-xml_end_index ()
+xml_end_index (void)
 {
   xml_close_indexentry ();
-  if (xml_index_divisions)    
+  if (xml_index_divisions)
     xml_insert_element (INDEXDIV, END);
-  xml_insert_element (PRINTINDEX, END);  
+  xml_insert_element (PRINTINDEX, END);
 }
 
-void
-xml_index_divide (entry)
-    char *entry;
+static void
+xml_index_divide (char *entry)
 {
   char c;
-  if (strlen (entry) > (strlen (xml_element_list[CODE].name) + 2) && 
-      strncmp (entry+1, xml_element_list[CODE].name, strlen (xml_element_list[CODE].name)) == 0)   
+  if (strlen (entry) > (strlen (xml_element_list[CODE].name) + 2) &&
+      strncmp (entry+1, xml_element_list[CODE].name, strlen (xml_element_list[CODE].name)) == 0)
     c = entry[strlen (xml_element_list[CODE].name)+2];
-  else 
+  else
     c = entry[0];
   if (tolower (c) != last_division_letter && isalpha (c))
     {
       last_division_letter = tolower (c);
       xml_close_indexentry ();
       if (!indexdivempty)
-	{
-	  xml_insert_element (INDEXDIV, END);
-	  xml_insert_element (INDEXDIV, START);
-	}
+        {
+          xml_insert_element (INDEXDIV, END);
+          xml_insert_element (INDEXDIV, START);
+        }
       xml_insert_element (TITLE, START);
       insert (toupper (c));
       xml_insert_element (TITLE, END);
@@ -1293,9 +1889,7 @@ xml_index_divide (entry)
 }
 
 void
-xml_insert_indexentry (entry, node)
-    char *entry;
-    char *node;
+xml_insert_indexentry (char *entry, char *node)
 {
   char *primary = NULL, *secondary;
   if (xml_index_divisions)
@@ -1311,23 +1905,23 @@ xml_insert_indexentry (entry, node)
       secondary += strlen (INDEX_SEP);
 
       if (in_secondary && strcmp (primary, index_primary) == 0)
-	{
-	  xml_insert_element (SECONDARYIE, END);
-	  xml_insert_element (SECONDARYIE, START);	  
-	  insert_string (secondary);
-	} 
+        {
+          xml_insert_element (SECONDARYIE, END);
+          xml_insert_element (SECONDARYIE, START);
+          execute_string ("%s", secondary);
+        }
       else
-	{
-	  xml_close_indexentry ();
-	  xml_insert_element (INDEXENTRY, START);
-	  in_indexentry = 1;
-	  xml_insert_element (PRIMARYIE, START);
-	  insert_string (primary);
-	  xml_insert_element (PRIMARYIE, END);
-	  xml_insert_element (SECONDARYIE, START);
-	  insert_string (secondary);
-	  in_secondary = 1;
-	}
+        {
+          xml_close_indexentry ();
+          xml_insert_element (INDEXENTRY, START);
+          in_indexentry = 1;
+          xml_insert_element (PRIMARYIE, START);
+          execute_string ("%s", primary);
+          xml_insert_element (PRIMARYIE, END);
+          xml_insert_element (SECONDARYIE, START);
+          execute_string ("%s", secondary);
+          in_secondary = 1;
+        }
     }
   else
     {
@@ -1335,11 +1929,20 @@ xml_insert_indexentry (entry, node)
       xml_insert_element (INDEXENTRY, START);
       in_indexentry = 1;
       xml_insert_element (PRIMARYIE, START);
-      insert_string (entry);
+      execute_string ("%s", entry);
     }
-  add_word_args (", %s", _("see "));
-  xml_insert_element_with_attribute (XREF, START, "linkend=\"%s\"", xml_id (node));
-  xml_pop_current_element ();
+  add_word (", ");
+
+  /* Don't link to @unnumbered sections directly.
+     We are disabling warnings temporarily, otherwise these xrefs
+     will cause bogus warnings about missing punctuation.  */
+  {
+    extern int print_warnings;
+    int save_print_warnings = print_warnings;
+    print_warnings = 0;
+    execute_string ("%cxref{%s}", COMMAND_PREFIX, xstrdup (node));
+    print_warnings = save_print_warnings;
+  }
 
   if (primary)
     {
@@ -1354,77 +1957,372 @@ xml_insert_indexentry (entry, node)
   /*  xml_insert_element (INDEXENTRY, END); */
 }
 
+void
+xml_synindex (char *from, char *to)
+{
+  int i, slot;
+
+  slot = -1;
+  for (i = 0; i < xml_synonyms_count; i++)
+    if (!xml_synonyms[i])
+      {
+        slot = i;
+        break;
+      }
+
+  if (slot < 0)
+    {
+      slot = xml_synonyms_count;
+      xml_synonyms_count++;
+
+      xml_synonyms = (XML_SYNONYM **) xrealloc (xml_synonyms,
+          (xml_synonyms_count + 1) * sizeof (XML_SYNONYM *));
+    }
+
+  xml_synonyms[slot] = xmalloc (sizeof (XML_SYNONYM));
+  xml_synonyms[slot]->from = xstrdup (from);
+  xml_synonyms[slot]->to = xstrdup (to);
+}
+
 /*
  * MULTITABLE
  */
+
+static int multitable_columns_count;
+static int *multitable_column_widths;
+
 void
-xml_begin_multitable (ncolumns, column_widths)
-    int ncolumns;
-    int *column_widths;
+xml_begin_multitable (int ncolumns, int *column_widths)
 {
   int i;
   if (docbook)
     {
-      xml_insert_element (MULTITABLE, START);
-      xml_insert_element_with_attribute (TGROUP, START, "cols=\"%d\"", ncolumns);
-      for (i=0; i<ncolumns; i++)
-	{
-	  xml_insert_element_with_attribute (COLSPEC, START, "colwidth=\"%d*\"", column_widths[i]);
-	  xml_pop_current_element ();
-	}
-      xml_insert_element (TBODY, START);
+      if (is_in_insertion_of_type (floatenv))
+        xml_begin_docbook_float (MULTITABLE);
+      else
+        xml_insert_element (MULTITABLE, START);
+
+      multitable_columns_count = ncolumns;
+      multitable_column_widths = xmalloc (sizeof (int) * ncolumns);
+      memcpy (multitable_column_widths, column_widths,
+          sizeof (int) * ncolumns);
+
       xml_no_para = 1;
     }
-  else 
+  else
     {
       xml_insert_element (MULTITABLE, START);
       for (i=0; i<ncolumns; i++)
-	{
-	  xml_insert_element (COLSPEC, START);
-	  add_word_args ("%d", column_widths[i]);
-	  xml_insert_element (COLSPEC, END);
-	}
+        {
+          xml_insert_element (COLSPEC, START);
+          add_word_args ("%d", column_widths[i]);
+          xml_insert_element (COLSPEC, END);
+        }
       xml_no_para = 1;
     }
 }
 
+static void
+xml_begin_multitable_group (void)
+{
+  int i;
+
+  xml_insert_element_with_attribute (TGROUP, START, "cols=\"%d\"",
+      multitable_columns_count);
+
+  for (i=0; i < multitable_columns_count; i++)
+    {
+      xml_insert_element_with_attribute (COLSPEC, START,
+          "colwidth=\"%d*\"", multitable_column_widths[i]);
+      xml_insert_element (COLSPEC, END);
+    }
+}
+
 void
-xml_end_multitable_row (first_row)
-    int first_row;
+xml_end_multitable_row (int first_row)
 {
   if (!first_row)
     {
       xml_insert_element (ENTRY, END);
       xml_insert_element (ROW, END);
     }
+
+  if (headitem_flag)
+    {
+      if (!first_row)
+        {
+          if (after_headitem)
+            xml_insert_element (THEAD, END);
+          else
+            xml_insert_element (TBODY, END);
+          xml_insert_element (TGROUP, END);
+        }
+
+      xml_begin_multitable_group ();
+      xml_insert_element (THEAD, START);
+    }
+  else if (first_row)
+    {
+      xml_begin_multitable_group ();
+      xml_insert_element (TBODY, START);
+    }
+  else if (after_headitem)
+    {
+      xml_insert_element (THEAD, END);
+      xml_insert_element (TBODY, START);
+    }
+  else if (first_row)
+    xml_insert_element (TBODY, START);
+
   xml_insert_element (ROW, START);
   xml_insert_element (ENTRY, START);
 }
 
 void
-xml_end_multitable_column ()
+xml_end_multitable_column (void)
 {
   xml_insert_element (ENTRY, END);
   xml_insert_element (ENTRY, START);
 }
 
 void
-xml_end_multitable ()
+xml_end_multitable (void)
 {
+  xml_insert_element (ENTRY, END);
+  xml_insert_element (ROW, END);
+
+  if (after_headitem)
+    {
+      if (docbook)
+        warning (_("@headitem as the last item of @multitable produces invalid Docbook documents"));
+      xml_insert_element (THEAD, END);
+    }
+  else
+    xml_insert_element (TBODY, END);
+
   if (docbook)
+    xml_insert_element (TGROUP, END);
+
+  xml_insert_element (MULTITABLE, END);
+  xml_no_para = 0;
+}
+
+/*
+ * Parameters in @def definitions
+ */
+
+#define DEFUN_SELF_DELIMITING(c) \
+  ((c) == '(' || (c) == ')' || (c) == '[' || (c) == ']')
+
+void
+xml_process_defun_args (char **defun_args, int auto_var_p)
+{
+  int pending_space = 0;
+  int just_after_paramtype = 0;
+
+  for (;;)
     {
-      xml_insert_element (ENTRY, END);
-      xml_insert_element (ROW, END);
-      xml_insert_element (TBODY, END);
-      xml_insert_element (TGROUP, END);
-      xml_insert_element (MULTITABLE, END);
-      xml_no_para = 0;
+      char *defun_arg = *defun_args++;
+
+      if (defun_arg == NULL)
+        break;
+
+      if (defun_arg[0] == ' ')
+        {
+          pending_space = 1;
+          continue;
+        }
+
+      if (pending_space)
+        {
+          add_char (' ');
+          pending_space = 0;
+        }
+
+      if (DEFUN_SELF_DELIMITING (defun_arg[0]))
+        {
+	  xml_insert_element (DEFDELIMITER, START);
+          add_char (defun_arg[0]);
+	  xml_insert_element (DEFDELIMITER, END);
+	  just_after_paramtype = 0;
+        }
+      else if (defun_arg[0] == '&')
+	{
+	  xml_insert_element (DEFPARAM, START);
+	  add_word (defun_arg);
+	  xml_insert_element (DEFPARAM, END);
+	  just_after_paramtype = 0;
+	}
+      else if (defun_arg[0] == COMMAND_PREFIX || just_after_paramtype)
+	{
+	  xml_insert_element (DEFPARAM, START);
+	  execute_string ("%s", defun_arg);
+	  xml_insert_element (DEFPARAM, END);
+	  just_after_paramtype = 0;
+	}
+      else if (defun_arg[0] == ',' || defun_arg[0] == ';')
+	{
+	  xml_insert_element (DEFDELIMITER, START);
+	  add_word (defun_arg);
+	  xml_insert_element (DEFDELIMITER, END);
+	  just_after_paramtype = 0;
+	}
+      else if (auto_var_p)
+	{
+	  xml_insert_element (DEFPARAM, START);
+	  add_word (defun_arg);
+	  xml_insert_element (DEFPARAM, END);
+	  just_after_paramtype = 0;
+	}
+      else
+	{
+	  xml_insert_element (DEFPARAMTYPE, START);
+	  add_word (defun_arg);
+	  xml_insert_element (DEFPARAMTYPE, END);
+	  just_after_paramtype = 1;
+	}
     }
-  else 
+}
+
+void
+xml_begin_definition (void)
+{
+  xml_insert_element (DEFINITION, START);
+  xml_definition_level ++;
+  xml_in_def_item[xml_definition_level] = 0;
+}
+
+void
+xml_end_definition (void)
+{
+  if (xml_in_def_item[xml_definition_level])
     {
-      xml_insert_element (ENTRY, END);
-      xml_insert_element (ROW, END);
-      xml_insert_element (MULTITABLE, END);
-      xml_no_para = 0;
+      xml_insert_element (DEFINITIONITEM, END);
+      xml_in_def_item[xml_definition_level] = 0;
+    }
+  xml_after_def_term = 0;
+  xml_insert_element (DEFINITION, END);
+  xml_definition_level --;
+}
+
+void
+xml_begin_def_term (int base_type, const char *category,
+    char *defined_name, char *type_name, char *type_name2)
+{
+  xml_after_def_term = 0;
+  xml_insert_element (DEFINITIONTERM, START);
+
+  /* Index entry */
+  switch (base_type)
+    {
+    case deffn:
+    case deftypefn:
+      execute_string ("@findex %s\n", defined_name);
+      break;
+    case defvr:
+    case deftypevr:
+    case defcv:
+      execute_string ("@vindex %s\n", defined_name);
+      break;
+    case deftypecv:
+    case deftypeivar:
+      execute_string ("@vindex %s %s %s\n", defined_name, _("of"), type_name);
+      break;
+    case deftypemethod:
+    case defop:
+    case deftypeop:
+      execute_string ("@findex %s %s %s\n", defined_name, _("on"), type_name);
+      break;
+    case deftp:
+      execute_string ("@tindex %s\n", defined_name);
+      break;
+    }
+
+  /* Start with category.  */
+  xml_insert_element (DEFCATEGORY, START);
+  execute_string (docbook ? "--- %s:" : "%s", category);
+  xml_insert_element (DEFCATEGORY, END);
+  add_char(' ');
+
+  /* Output type name first for typed definitions.  */
+  switch (base_type)
+    {
+    case deffn:
+    case defvr:
+    case deftp:
+      break;
+
+    case deftypefn:
+    case deftypevr:
+      xml_insert_element (DEFTYPE, START);
+      execute_string ("%s", type_name);
+      xml_insert_element (DEFTYPE, END);
+      add_char (' ');
+      break;
+
+    case deftypecv:
+    case deftypeivar:
+    case deftypemethod:
+    case deftypeop:
+      xml_insert_element (DEFTYPE, START);
+      execute_string ("%s", type_name2);
+      xml_insert_element (DEFTYPE, END);
+      add_char (' ');
+      break;
+
+    default:
+      xml_insert_element (DEFCLASS, START);
+      execute_string ("%s", type_name);
+      xml_insert_element (DEFCLASS, END);
+      add_char (' ');
+      break;
     }
+
+  /* Categorize rest of the definitions.  */
+  switch (base_type)
+    {
+    case deffn:
+    case deftypefn:
+      xml_insert_element (DEFFUNCTION, START);
+      execute_string ("%s", defined_name);
+      xml_insert_element (DEFFUNCTION, END);
+      break;
+
+    case defvr:
+    case deftypevr:
+      xml_insert_element (DEFVARIABLE, START);
+      execute_string ("%s", defined_name);
+      xml_insert_element (DEFVARIABLE, END);
+      break;
+
+    case deftp:
+      xml_insert_element (DEFDATATYPE, START);
+      execute_string ("%s", defined_name);
+      xml_insert_element (DEFDATATYPE, END);
+      break;
+
+    case defcv:
+    case deftypecv:
+    case deftypeivar:
+      xml_insert_element (DEFCLASSVAR, START);
+      execute_string ("%s", defined_name);
+      xml_insert_element (DEFCLASSVAR, END);
+      break;
+
+    case defop:
+    case deftypeop:
+    case deftypemethod:
+      /* Operation / Method */
+      xml_insert_element (DEFOPERATION, START);
+      execute_string ("%s", defined_name);
+      xml_insert_element (DEFOPERATION, END);
+      break;
+    }
+}
+
+void
+xml_end_def_term (void)
+{
+  xml_insert_element (DEFINITIONTERM, END);
+  xml_after_def_term = 1;
 }
diff --git a/gnu/usr.bin/texinfo/makeinfo/xml.h b/gnu/usr.bin/texinfo/makeinfo/xml.h
index e5849d37476..dd9b0f14f10 100644
--- a/gnu/usr.bin/texinfo/makeinfo/xml.h
+++ b/gnu/usr.bin/texinfo/makeinfo/xml.h
@@ -1,7 +1,7 @@
 /* xml.h -- xml output declarations.
-   $Id: xml.h,v 1.1.1.1 2002/06/10 13:21:23 espie Exp $
+   $Id: xml.h,v 1.1.1.2 2006/07/17 16:03:49 espie Exp $
 
-   Copyright (C) 2001, 02 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004 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
@@ -17,7 +17,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   Written by Philippe Martin <feloy@free.fr>.  */
+   Originally written by Philippe Martin <feloy@free.fr>.  */
 
 #ifndef XML_H
 #define XML_H
@@ -28,54 +28,132 @@
 extern int xml_index_divisions;
 extern int xml_sort_index;
 
+extern int xml_no_indent;
+
 extern int xml_node_open;
 extern int xml_no_para;
 extern char *xml_node_id;
 extern int xml_last_section_output_position;
 
+extern int xml_in_xref_token;
+extern int xml_in_bookinfo;
+extern int xml_in_book_title;
+extern int xml_in_abstract;
+
+/* Non-zero if we are handling an element that can appear between
+   @item and @itemx, @deffn and @deffnx.  */
+extern int xml_dont_touch_items_defs;
+
+/* Non-zero if whitespace in the source document should be kept as-is.  */
+extern int xml_keep_space;
+
 enum xml_element
 {
-  TEXINFO=0, SETFILENAME, TITLEFONT, SETTITLE, 
+  TEXINFO=0, SETFILENAME, TITLEFONT, SETTITLE, DOCUMENTDESCRIPTION,
   /* Node */
-  NODE /* 4 */, NODENEXT, NODEPREV, NODEUP,
+  NODE, NODENEXT, NODEPREV, NODEUP,
   /* Structuring */
-  CHAPTER /* 8 */, SECTION, SUBSECTION, SUBSUBSECTION,
-  TOP /* 12 */, UNNUMBERED, UNNUMBEREDSEC, UNNUMBEREDSUBSEC,
+  CHAPTER, SECTION, SUBSECTION, SUBSUBSECTION,
+  TOP, UNNUMBERED, UNNUMBEREDSEC, UNNUMBEREDSUBSEC,
     UNNUMBEREDSUBSUBSEC,  
-  APPENDIX /* 17 */, APPENDIXSEC, APPENDIXSUBSEC, APPENDIXSUBSUBSEC, 
-  MAJORHEADING /* 21 */, CHAPHEADING, HEADING, SUBHEADING, SUBSUBHEADING,
+  APPENDIX, APPENDIXSEC, APPENDIXSUBSEC, APPENDIXSUBSUBSEC, 
+  MAJORHEADING, CHAPHEADING, HEADING, SUBHEADING, SUBSUBHEADING,
+  /* Titlepage */
+  TITLEPAGE, AUTHOR, BOOKTITLE, BOOKSUBTITLE,
   /* Menu */
-  MENU /* 26 */, MENUENTRY, MENUTITLE, MENUCOMMENT, MENUNODE, NODENAME,
+  MENU, DETAILMENU, MENUENTRY, MENUTITLE, MENUCOMMENT, MENUNODE,
+  NODENAME,
   /* -- */
-  ACRONYM/* 32 */, TT, CODE, KBD, URL, KEY, VAR, SC, DFN, EMPH, STRONG,
-    CITE, NOTFIXEDWIDTH, I, B, R,  
+  ACRONYM, ACRONYMWORD, ACRONYMDESC,
+  ABBREV, ABBREVWORD, ABBREVDESC,
+  TT, CODE, COMMAND_TAG, ENV, FILE_TAG, OPTION, SAMP, KBD, URL, KEY,
+  VAR, SC, DFN, EMPH, STRONG, CITE, NOTFIXEDWIDTH, I, B, R, SLANTED, SANSSERIF,
+  EXDENT,
   TITLE, 
   IFINFO, 
   SP, CENTER,
   DIRCATEGORY,
   QUOTATION, EXAMPLE, SMALLEXAMPLE, LISP, SMALLLISP, CARTOUCHE,
-    COPYING, FORMAT, SMALLFORMAT, DISPLAY, SMALLDISPLAY,
-  FOOTNOTE, 
+    COPYING, FORMAT, SMALLFORMAT, DISPLAY, SMALLDISPLAY, VERBATIM,
+  FOOTNOTE, LINEANNOTATION,
+  TIP, NOTE, IMPORTANT, WARNING, CAUTION,
   ITEMIZE, ITEMFUNCTION, ITEM, ENUMERATE, TABLE, TABLEITEM, TABLETERM,
   INDEXTERM, 
+  MATH, DIMENSION,
   XREF, XREFNODENAME, XREFINFONAME, XREFPRINTEDDESC, XREFINFOFILE,
     XREFPRINTEDNAME, 
   INFOREF, INFOREFNODENAME, INFOREFREFNAME, INFOREFINFONAME, 
   UREF, UREFURL, UREFDESC, UREFREPLACEMENT,
   EMAIL, EMAILADDRESS, EMAILNAME,
-  GROUP,
-  PRINTINDEX,
+  GROUP, FLOAT, FLOATTYPE, FLOATPOS, CAPTION, SHORTCAPTION,
+  FLOATTABLE, FLOATFIGURE, FLOATEXAMPLE, FLOATCARTOUCHE,
+  PRINTINDEX, LISTOFFLOATS,
   ANCHOR, 
-  IMAGE,
+  IMAGE, INLINEIMAGE, IMAGEALTTEXT,
   PRIMARY, SECONDARY, INFORMALFIGURE, MEDIAOBJECT, IMAGEOBJECT,
     IMAGEDATA, TEXTOBJECT,  
   INDEXENTRY, PRIMARYIE, SECONDARYIE, INDEXDIV,
-  MULTITABLE, TGROUP, COLSPEC, TBODY, ENTRY, ROW,
-  BOOKINFO, ABSTRACT, REPLACEABLE,
+  MULTITABLE, TGROUP, COLSPEC, THEAD, TBODY, ENTRY, ROW,
+  BOOKINFO, ABSTRACT, REPLACEABLE, ENVAR, COMMENT, FUNCTION, LEGALNOTICE,
+  CONTENTS, SHORTCONTENTS, DOCUMENTLANGUAGE,
+  SETVALUE, CLEARVALUE,
+  DEFINITION, DEFINITIONTERM, DEFINITIONITEM,
+  DEFCATEGORY, DEFFUNCTION, DEFVARIABLE, DEFPARAM, DEFDELIMITER, DEFTYPE,
+  DEFPARAMTYPE, DEFDATATYPE, DEFCLASS, DEFCLASSVAR, DEFOPERATION,
   PARA
 };
 
-extern void xml_insert_element (/* int name, int arg */);
-extern char *xml_id (/* char *id */);
+extern void xml_add_char (int character),
+  xml_asterisk (void),
+  xml_insert_element (int elt, int arg),
+  xml_insert_entity (char *entity_name),
+  xml_insert_footnote (char *note),
+  xml_insert_quotation (char *type, int arg),
+  xml_insert_indexentry (char *entry, char *node),
+  xml_insert_indexterm (char *indexterm, char *index),
+  xml_insert_docbook_image (char *name_arg),
+  xml_synindex (char *from, char *to),
+  xml_start_para (void),
+  xml_end_para (void),
+  xml_begin_document (char *output_filename),
+  xml_end_document (void),
+  xml_start_menu_entry (char *tem),
+  xml_end_menu (void),
+  xml_end_current_element (void),
+  xml_open_section (int level, char *name),
+  xml_close_sections (int level),
+  xml_begin_node (void),
+  xml_begin_index (void),
+  xml_end_index (void),
+  xml_begin_multitable (int ncolumns, int *column_widths),
+  xml_end_multitable (void),
+  xml_end_multitable_row (int first_row),
+  xml_end_multitable_column (void),
+  xml_begin_table (int type, char *item_function),
+  xml_end_table (int type),
+  xml_begin_item (void),
+  xml_begin_table_item (void),
+  xml_continue_table_item (void),
+  xml_begin_enumerate (char *enum_arg),
+  xml_end_enumerate (void),
+  xml_begin_docbook_float (int elt);
+
+extern char *xml_id (char *id);
+
+extern void xml_begin_definition (void),
+  xml_end_definition (void),
+  xml_process_defun_args (char **defun_args, int auto_var_p),
+  xml_begin_def_term (int base_type, const char *category,
+      char *defined_name, char *type_name, char *type_name2),
+  xml_end_def_term (void);
+
+extern int xml_current_stack_index (void),
+  xml_element (char *name);
+
+#if defined (VA_FPRINTF) && __STDC__
+void xml_insert_element_with_attribute (int elt, int arg, char *format, ...);
+#else
+void xml_insert_element_with_attribute ();
+#endif
 
 #endif /* XML_H */
diff --git a/gnu/usr.bin/texinfo/makeinfo/xref.c b/gnu/usr.bin/texinfo/makeinfo/xref.c
new file mode 100644
index 00000000000..260cbca8309
--- /dev/null
+++ b/gnu/usr.bin/texinfo/makeinfo/xref.c
@@ -0,0 +1,620 @@
+/* xref.c -- cross references for Texinfo.
+   $Id: xref.c,v 1.1.1.1 2006/07/17 16:03:49 espie Exp $
+
+   Copyright (C) 2004 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.  */
+
+#include "system.h"
+#include "cmds.h"
+#include "float.h"
+#include "html.h"
+#include "index.h"
+#include "macro.h"
+#include "makeinfo.h"
+#include "node.h"
+#include "xml.h"
+#include "xref.h"
+
+/* Flags which control initial output string for xrefs. */
+int px_ref_flag = 0;
+int ref_flag = 0;
+
+/* Called in the multiple-argument case to make sure we generate a valid
+   Info reference.  In the single-argument case, the :: we output
+   suffices for the Info readers to find the end of the reference.  */
+static void
+add_xref_punctuation (void)
+{
+  if (px_ref_flag || ref_flag)  /* user inserts punct after @xref */
+    {
+      /* Check if there's already punctuation.  */
+      int next_char = next_nonwhitespace_character ();
+
+      if (next_char == -1)
+        /* EOF while looking for punctuation, let's
+           insert a period instead of crying.  */
+        add_char ('.');
+      else if (next_char != ',' && next_char != '.')
+        /* period and comma terminate xrefs, and nothing else.  Instead
+           of generating an Info reference that can't be followed,
+           though, just insert a period.  Not pretty, but functional.  */
+        add_char ('.');
+    }
+}
+
+/* Return next comma-delimited argument, but do not cross a close-brace
+   boundary.  Clean up whitespace, too.  If EXPAND is nonzero, replace
+   the entire brace-delimited argument list with its expansion before
+   looking for the next comma.  */
+char *
+get_xref_token (int expand)
+{
+  char *string = 0;
+
+  if (docbook)
+    xml_in_xref_token = 1;
+
+  if (expand)
+    {
+      int old_offset = input_text_offset;
+      int old_lineno = line_number;
+
+      get_until_in_braces ("}", &string);
+      if (curchar () == '}')    /* as opposed to end of text */
+        input_text_offset++;
+      if (input_text_offset > old_offset)
+        {
+          int limit = input_text_offset;
+
+          input_text_offset = old_offset;
+          line_number = old_lineno;
+          only_macro_expansion++;
+          replace_with_expansion (input_text_offset, &limit);
+          only_macro_expansion--;
+        }
+      free (string);
+    }
+
+  get_until_in_braces (",", &string);
+  if (curchar () == ',')
+    input_text_offset++;
+  fix_whitespace (string);
+
+  if (docbook)
+    xml_in_xref_token = 0;
+
+  return string;
+}
+
+
+/* NOTE: If you wonder why the HTML output is produced with such a
+   peculiar mix of calls to add_word and execute_string, here's the
+   reason.  get_xref_token (1) expands all macros in a reference, but
+   any other commands, like @value, @@, etc., are left intact.  To
+   expand them, we need to run the arguments through execute_string.
+   However, characters like <, &, > and others cannot be let into
+   execute_string, because they will be escaped.  See the mess?  */
+
+/* Make a cross reference. */
+void
+cm_xref (int arg)
+{
+  if (arg == START)
+    {
+      char *arg1 = get_xref_token (1); /* expands all macros in xref */
+      char *arg2 = get_xref_token (0);
+      char *arg3 = get_xref_token (0);
+      char *arg4 = get_xref_token (0);
+      char *arg5 = get_xref_token (0);
+      char *tem;
+
+      /* "@xref{,Foo,, Bar, Baz} is not valid usage of @xref.  The
+         first argument must never be blank." --rms.
+         We hereby comply by disallowing such constructs.  */
+      if (!*arg1)
+        line_error (_("First argument to cross-reference may not be empty"));
+
+      if (docbook)
+        {
+          if (!ref_flag)
+            add_word (px_ref_flag || printing_index
+                ? (char *) _("see ") : (char *) _("See "));
+
+          if (!*arg4 && !*arg5)
+            {
+              char *arg1_id = xml_id (arg1);
+
+              if (*arg2 || *arg3)
+                {
+                  xml_insert_element_with_attribute (XREFNODENAME, START,
+                                                     "linkend=\"%s\"", arg1_id);
+                  free (arg1_id);
+                  execute_string ("%s", *arg3 ? arg3 : arg2);
+                  xml_insert_element (XREFNODENAME, END);
+                }
+              else
+                {
+                  xml_insert_element_with_attribute (XREF, START,
+                                                     "linkend=\"%s\"", arg1_id);
+                  xml_insert_element (XREF, END);
+                  free (arg1_id);
+                }
+            }
+          else if (*arg5)
+            {
+              add_word_args (_("See section ``%s'' in "), *arg3 ? arg3 : arg1);
+              xml_insert_element (CITE, START);
+              add_word (arg5);
+              xml_insert_element (CITE, END);
+            }
+          else if (*arg4)
+            {
+              /* Very sad, we are losing xrefs made to ``info only'' books.  */
+            }
+        }
+      else if (xml)
+        {
+          if (!ref_flag)
+            add_word_args ("%s", px_ref_flag ? _("see ") : _("See "));
+
+          xml_insert_element (XREF, START);
+          xml_insert_element (XREFNODENAME, START);
+          execute_string ("%s", arg1);
+          xml_insert_element (XREFNODENAME, END);
+          if (*arg2)
+            {
+              xml_insert_element (XREFINFONAME, START);
+              execute_string ("%s", arg2);
+              xml_insert_element (XREFINFONAME, END);
+            }
+          if (*arg3)
+            {
+              xml_insert_element (XREFPRINTEDDESC, START);
+              execute_string ("%s", arg3);
+              xml_insert_element (XREFPRINTEDDESC, END);
+            }
+          if (*arg4)
+            {
+              xml_insert_element (XREFINFOFILE, START);
+              execute_string ("%s", arg4);
+              xml_insert_element (XREFINFOFILE, END);
+            }
+          if (*arg5)
+            {
+              xml_insert_element (XREFPRINTEDNAME, START);
+              execute_string ("%s", arg5);
+              xml_insert_element (XREFPRINTEDNAME, END);
+            }
+          xml_insert_element (XREF, END);
+        }
+      else if (html)
+        {
+          if (!ref_flag)
+            add_word_args ("%s", px_ref_flag ? _("see ") : _("See "));
+        }
+      else
+        add_word_args ("%s", px_ref_flag ? "*note " : "*Note ");
+
+      if (!xml)
+        {
+          if (*arg5 || *arg4)
+            {
+              /* arg1 - node name
+                 arg2 - reference name
+                 arg3 - title or topic (and reference name if arg2 is NULL)
+                 arg4 - info file name
+                 arg5 - printed manual title  */
+              char *ref_name;
+
+              if (!*arg2)
+                {
+                  if (*arg3)
+                    ref_name = arg3;
+                  else
+                    ref_name = arg1;
+                }
+              else
+                ref_name = arg2;
+
+              if (html)
+                { /* More to do eventually, down to Unicode
+                     Normalization Form C.  See the HTML Xref nodes in
+                     the manual.  */
+                  char *file_arg = arg4;
+                  add_html_elt ("<a href=");
+
+                  {
+                    /* If there's a directory part, ignore it.  */
+                    char *p = strrchr (file_arg, '/');
+                    if (p)
+                      file_arg = p + 1;
+
+                  /* If there's a dot, make it a NULL terminator, so the
+                     extension does not get into the way.  */
+                    p = strrchr (file_arg , '.');
+                    if (p != NULL)
+                      *p = 0;
+                  }
+                  
+                  if (! *file_arg)
+                warning (_("Empty file name for HTML cross reference in `%s'"),
+                           arg4);
+
+                  /* Note that if we are splitting, and the referenced
+                     tag is an anchor rather than a node, we will
+                     produce a reference to a file whose name is
+                     derived from the anchor name.  However, only
+                     nodes create files, so we are referencing a
+                     non-existent file.  cm_anchor, which see, deals
+                     with that problem.  */
+                  if (splitting)
+                    execute_string ("\"../%s/", file_arg);
+                  else
+                    execute_string ("\"%s.html", file_arg);
+                  /* Do not collapse -- to -, etc., in references.  */
+                  in_fixed_width_font++;
+                  tem = expansion (arg1, 0); /* expand @-commands in node */
+                  in_fixed_width_font--;
+                  add_anchor_name (tem, 1);
+                  free (tem);
+                  add_word ("\">");
+                  execute_string ("%s",ref_name);
+                  add_word ("</a>");
+                }
+              else
+                {
+                  execute_string ("%s:", ref_name);
+                  in_fixed_width_font++;
+                  execute_string (" (%s)%s", arg4, arg1);
+                  add_xref_punctuation ();
+                  in_fixed_width_font--;
+                }
+
+              /* Free all of the arguments found. */
+              if (arg1) free (arg1);
+              if (arg2) free (arg2);
+              if (arg3) free (arg3);
+              if (arg4) free (arg4);
+              if (arg5) free (arg5);
+              return;
+            }
+          else
+            remember_node_reference (arg1, line_number, followed_reference);
+
+          if (*arg3)
+            {
+              if (html)
+                {
+                  add_html_elt ("<a href=\"");
+                  in_fixed_width_font++;
+                  tem = expansion (arg1, 0);
+                  in_fixed_width_font--;
+                  add_anchor_name (tem, 1);
+                  free (tem);
+                  add_word ("\">");
+                  execute_string ("%s", *arg2 ? arg2 : arg3);
+                  add_word ("</a>");
+                }
+              else
+                {
+                  execute_string ("%s:", *arg2 ? arg2 : arg3);
+                  in_fixed_width_font++;
+                  execute_string (" %s", arg1);
+                  add_xref_punctuation ();
+                  in_fixed_width_font--;
+                }
+            }
+          else
+            {
+              if (html)
+                {
+                  add_html_elt ("<a href=\"");
+                  in_fixed_width_font++;
+                  tem = expansion (arg1, 0);
+                  in_fixed_width_font--;
+                  add_anchor_name (tem, 1);
+                  free (tem);
+                  add_word ("\">");
+                  if (*arg2)
+                    execute_string ("%s", arg2);
+                  else
+                    {
+                      char *fref = get_float_ref (arg1);
+                      execute_string ("%s", fref ? fref : arg1);
+                      free (fref);
+                    }
+                  add_word ("</a>");
+                }
+              else
+                {
+                  if (*arg2)
+                    {
+                      execute_string ("%s:", arg2);
+                      in_fixed_width_font++;
+                      execute_string (" %s", arg1);
+                      add_xref_punctuation ();
+                      in_fixed_width_font--;
+                    }
+                  else
+                    {
+                      char *fref = get_float_ref (arg1);
+                      if (fref)
+                        { /* Reference is being made to a float.  */
+                          execute_string ("%s:", fref);
+                          in_fixed_width_font++;
+                          execute_string (" %s", arg1);
+                          add_xref_punctuation ();
+                          in_fixed_width_font--;
+                        }
+                      else
+                        {
+                          in_fixed_width_font++;
+                          execute_string ("%s::", arg1);
+                          in_fixed_width_font--;
+                        }
+                    }
+                }
+            }
+        }
+      /* Free all of the arguments found. */
+      if (arg1) free (arg1);
+      if (arg2) free (arg2);
+      if (arg3) free (arg3);
+      if (arg4) free (arg4);
+      if (arg5) free (arg5);
+    }
+  else
+    { /* Check that the next non-whitespace character is valid to follow
+         an xref (so Info readers can find the node names).
+         `input_text_offset' is pointing at the "}" which ended the xref
+         command.  This is not used for @pxref or @ref, since we insert
+         the necessary punctuation above, if needed.  */
+      int temp = next_nonwhitespace_character ();
+
+      if (temp == -1)
+        warning (_("End of file reached while looking for `.' or `,'"));
+      else if (temp != '.' && temp != ',')
+        warning (_("`.' or `,' must follow @%s, not `%c'"), command, temp);
+    }
+}
+
+void
+cm_pxref (int arg)
+{
+  if (arg == START)
+    {
+      px_ref_flag++;
+      cm_xref (arg);
+      px_ref_flag--;
+    }
+  /* cm_xref isn't called with arg == END, which disables the code near
+     the end of cm_xref that checks for `.' or `,' after the
+     cross-reference.  This is because cm_xref generates the required
+     character itself (when needed) if px_ref_flag is set.  */
+}
+
+void
+cm_ref (int arg)
+{
+  /* See the comments in cm_pxref about the checks for punctuation.  */
+  if (arg == START)
+    {
+      ref_flag++;
+      cm_xref (arg);
+      ref_flag--;
+    }
+}
+
+void
+cm_inforef (int arg)
+{
+  if (arg == START)
+    {
+      char *node = get_xref_token (1); /* expands all macros in inforef */
+      char *pname = get_xref_token (0);
+      char *file = get_xref_token (0);
+
+      /* (see comments at cm_xref).  */
+      if (!*node)
+        line_error (_("First argument to @inforef may not be empty"));
+
+      if (xml && !docbook)
+        {
+          xml_insert_element (INFOREF, START);
+          xml_insert_element (INFOREFNODENAME, START);
+          execute_string ("%s", node);
+          xml_insert_element (INFOREFNODENAME, END);
+          if (*pname)
+            {
+              xml_insert_element (INFOREFREFNAME, START);
+              execute_string ("%s", pname);
+              xml_insert_element (INFOREFREFNAME, END);
+            }
+          xml_insert_element (INFOREFINFONAME, START);
+          execute_string ("%s", file);
+          xml_insert_element (INFOREFINFONAME, END);
+
+          xml_insert_element (INFOREF, END);
+        }
+      else if (html)
+        {
+          char *tem;
+
+          add_word ((char *) _("see "));
+          /* html fixxme: revisit this */
+          add_html_elt ("<a href=");
+          if (splitting)
+            execute_string ("\"../%s/", file);
+          else
+            execute_string ("\"%s.html", file);
+          tem = expansion (node, 0);
+          add_anchor_name (tem, 1);
+          add_word ("\">");
+          execute_string ("%s", *pname ? pname : tem);
+          add_word ("</a>");
+          free (tem);
+        }
+      else
+        {
+          if (*pname)
+            execute_string ("*note %s: (%s)%s", pname, file, node);
+          else
+            execute_string ("*note (%s)%s::", file, node);
+        }
+
+      free (node);
+      free (pname);
+      free (file);
+    }
+}
+
+/* A URL reference.  */
+void
+cm_uref (int arg)
+{
+  if (arg == START)
+    {
+      extern int printing_index;
+      char *url  = get_xref_token (1); /* expands all macros in uref */
+      char *desc = get_xref_token (0);
+      char *replacement = get_xref_token (0);
+
+      if (docbook)
+        {
+          xml_insert_element_with_attribute (UREF, START, "url=\"%s\"",
+              text_expansion (url));
+          if (*replacement)
+            execute_string ("%s", replacement);
+          else if (*desc)
+            execute_string ("%s", desc);
+          else
+            execute_string ("%s", url);
+          xml_insert_element (UREF, END);
+        }
+      else if (xml)
+        {
+          xml_insert_element (UREF, START);
+          xml_insert_element (UREFURL, START);
+          execute_string ("%s", url);
+          xml_insert_element (UREFURL, END);
+          if (*desc)
+            {
+              xml_insert_element (UREFDESC, START);
+              execute_string ("%s", desc);
+              xml_insert_element (UREFDESC, END);
+            }
+          if (*replacement)
+            {
+              xml_insert_element (UREFREPLACEMENT, START);
+              execute_string ("%s", replacement);
+              xml_insert_element (UREFREPLACEMENT, END);
+            }
+          xml_insert_element (UREF, END);
+        }
+      else if (html)
+        { /* never need to show the url */
+          add_html_elt ("<a href=");
+          /* don't collapse `--' etc. in the url */
+          in_fixed_width_font++;
+          execute_string ("\"%s\"", url);
+          in_fixed_width_font--;
+          add_word (">");
+          execute_string ("%s", *replacement ? replacement
+                                : (*desc ? desc : url));
+          add_word ("</a>");
+        }
+      else if (*replacement) /* do not show the url */
+        execute_string ("%s", replacement);
+      else if (*desc)        /* show both text and url */
+        {
+          execute_string ("%s ", desc);
+          in_fixed_width_font++;
+          execute_string ("(%s)", url);
+          in_fixed_width_font--;
+        }
+      else /* no text at all, so have the url to show */
+        {
+          in_fixed_width_font++;
+          execute_string ("%s%s%s",
+                          printing_index ? "" : "`",
+                          url,
+                          printing_index ? "" : "'");
+          in_fixed_width_font--;
+        }
+      if (url)
+        free (url);
+      if (desc)
+        free (desc);
+      if (replacement)
+        free (replacement);
+    }
+}
+
+/* An email reference.  */
+void
+cm_email (int arg)
+{
+  if (arg == START)
+    {
+      char *addr = get_xref_token (1); /* expands all macros in email */
+      char *name = get_xref_token (0);
+
+      if (xml && docbook)
+        {
+          xml_insert_element_with_attribute (EMAIL, START, "url=\"mailto:%s\"", addr);
+          if (*name)
+              execute_string ("%s", name);
+          xml_insert_element (EMAIL, END);
+        }
+      else if (xml)
+        {
+          xml_insert_element (EMAIL, START);
+          xml_insert_element (EMAILADDRESS, START);
+          execute_string ("%s", addr);
+          xml_insert_element (EMAILADDRESS, END);
+          if (*name)
+            {
+              xml_insert_element (EMAILNAME, START);
+              execute_string ("%s", name);
+              xml_insert_element (EMAILNAME, END);
+            }
+          xml_insert_element (EMAIL, END);
+        }
+      else if (html)
+        {
+          add_html_elt ("<a href=");
+          /* don't collapse `--' etc. in the address */
+          in_fixed_width_font++;
+          execute_string ("\"mailto:%s\"", addr);
+          in_fixed_width_font--;
+          add_word (">");
+          execute_string ("%s", *name ? name : addr);
+          add_word ("</a>");
+        }
+      else
+        {
+          execute_string ("%s%s", name, *name ? " "  : "");
+          in_fixed_width_font++;
+          execute_string ("<%s>", addr);
+          in_fixed_width_font--;
+        }
+
+      if (addr)
+        free (addr);
+      if (name)
+        free (name);
+    }
+}
diff --git a/gnu/usr.bin/texinfo/makeinfo/xref.h b/gnu/usr.bin/texinfo/makeinfo/xref.h
new file mode 100644
index 00000000000..7aa6d1d939c
--- /dev/null
+++ b/gnu/usr.bin/texinfo/makeinfo/xref.h
@@ -0,0 +1,30 @@
+/* xref.h -- declarations for the cross references.
+   $Id: xref.h,v 1.1.1.1 2006/07/17 16:03:49 espie Exp $
+
+   Copyright (C) 2004 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.  */
+
+#ifndef XREF_H
+#define XREF_H
+
+enum reftype
+{
+  menu_reference, followed_reference
+};
+
+extern char *get_xref_token (int expand);
+
+#endif /* not XREF_H */
diff --git a/gnu/usr.bin/texinfo/missing b/gnu/usr.bin/texinfo/missing
index 0a7fb5a2ace..64b5f901dd5 100644
--- a/gnu/usr.bin/texinfo/missing
+++ b/gnu/usr.bin/texinfo/missing
@@ -1,6 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
-# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+
+scriptversion=2004-09-07.08
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
+#   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -38,18 +42,24 @@ else
   configure_ac=configure.in
 fi
 
+msg="missing on your system"
+
 case "$1" in
 --run)
   # Try to run requested program, and just exit if it succeeds.
   run=
   shift
   "$@" && exit 0
+  # Exit code 63 means version mismatch.  This often happens
+  # when the user try to use an ancient version of a tool on
+  # a file that requires a minimum version.  In this case we
+  # we should proceed has if the program had been absent, or
+  # if --run hadn't been passed.
+  if test $? = 63; then
+    run=:
+    msg="probably too old"
+  fi
   ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
 
   -h|--h|--he|--hel|--help)
     echo "\
@@ -74,11 +84,15 @@ Supported PROGRAM values:
   lex          create \`lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file
   tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to <bug-automake@gnu.org>."
+    exit 0
     ;;
 
   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing 0.3 - GNU automake"
+    echo "missing $scriptversion (GNU Automake)"
+    exit 0
     ;;
 
   -*)
@@ -87,9 +101,44 @@ Supported PROGRAM values:
     exit 1
     ;;
 
-  aclocal)
+esac
+
+# Now exit if we have it, but it failed.  Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case "$1" in
+  lex|yacc)
+    # Not GNU programs, they don't have --version.
+    ;;
+
+  tar)
+    if test -n "$run"; then
+       echo 1>&2 "ERROR: \`tar' requires --run"
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       exit 1
+    fi
+    ;;
+
+  *)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       # Could not run --version or --help.  This is probably someone
+       # running `$TOOL --version' or `$TOOL --help' to check whether
+       # $TOOL exists and not knowing $TOOL uses missing.
+       exit 1
+    fi
+    ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
+  aclocal*)
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
          to install the \`Automake' and \`Perl' packages.  Grab them from
          any GNU archive site."
@@ -98,7 +147,7 @@ WARNING: \`$1' is missing on your system.  You should only need it if
 
   autoconf)
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified \`${configure_ac}'.  You might want to install the
          \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
          archive site."
@@ -107,7 +156,7 @@ WARNING: \`$1' is missing on your system.  You should only need it if
 
   autoheader)
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified \`acconfig.h' or \`${configure_ac}'.  You might want
          to install the \`Autoconf' and \`GNU m4' packages.  Grab them
          from any GNU archive site."
@@ -124,9 +173,9 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     touch $touch_files
     ;;
 
-  automake)
+  automake*)
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
          You might want to install the \`Automake' and \`Perl' packages.
          Grab them from any GNU archive site."
@@ -135,9 +184,32 @@ WARNING: \`$1' is missing on your system.  You should only need it if
 	   while read f; do touch "$f"; done
     ;;
 
+  autom4te)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, but is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.
+         You can get \`$1' as part of \`Autoconf' from any GNU
+         archive site."
+
+    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    if test -f "$file"; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo "#! /bin/sh"
+	echo "# Created by GNU Automake missing as a replacement of"
+	echo "#  $ $@"
+	echo "exit 0"
+	chmod +x $file
+	exit 1
+    fi
+    ;;
+
   bison|yacc)
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' $msg.  You should only need it if
          you modified a \`.y' file.  You may need the \`Bison' package
          in order for those modifications to take effect.  You can get
          \`Bison' from any GNU archive site."
@@ -167,7 +239,7 @@ WARNING: \`$1' is missing on your system.  You should only need it if
 
   lex|flex)
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified a \`.l' file.  You may need the \`Flex' package
          in order for those modifications to take effect.  You can get
          \`Flex' from any GNU archive site."
@@ -190,7 +262,7 @@ WARNING: \`$1' is missing on your system.  You should only need it if
 
   help2man)
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
 	 you modified a dependency of a manual page.  You may need the
 	 \`Help2man' package in order for those modifications to take
 	 effect.  You can get \`Help2man' from any GNU archive site."
@@ -209,13 +281,8 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     ;;
 
   makeinfo)
-    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
-       # We have makeinfo, but it failed.
-       exit 1
-    fi
-
     echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
+WARNING: \`$1' is $msg.  You should only need it if
          you modified a \`.texi' or \`.texinfo' file, or any other file
          indirectly affecting the aspect of the manual.  The spurious
          call might also be the consequence of using a buggy \`make' (AIX,
@@ -231,32 +298,28 @@ WARNING: \`$1' is missing on your system.  You should only need it if
 
   tar)
     shift
-    if test -n "$run"; then
-      echo 1>&2 "ERROR: \`tar' requires --run"
-      exit 1
-    fi
 
     # We have already tried tar in the generic part.
     # Look for gnutar/gtar before invocation to avoid ugly error
     # messages.
     if (gnutar --version > /dev/null 2>&1); then
-       gnutar ${1+"$@"} && exit 0
+       gnutar "$@" && exit 0
     fi
     if (gtar --version > /dev/null 2>&1); then
-       gtar ${1+"$@"} && exit 0
+       gtar "$@" && exit 0
     fi
     firstarg="$1"
     if shift; then
 	case "$firstarg" in
 	*o*)
 	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" ${1+"$@"} && exit 0
+	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
 	case "$firstarg" in
 	*h*)
 	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" ${1+"$@"} && exit 0
+	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
     fi
@@ -270,10 +333,10 @@ WARNING: I can't seem to be able to run \`tar' with the given arguments.
 
   *)
     echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         system.  You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+         You might have modified some files without having the
          proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequirements for installing
+         it often tells you about the needed prerequisites for installing
          this package.  You may also peek at any GNU archive site, in case
          some other package would contain this missing \`$1' program."
     exit 1
@@ -281,3 +344,10 @@ WARNING: \`$1' is needed, and you do not seem to have it handy on your
 esac
 
 exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/gnu/usr.bin/texinfo/po/LINGUAS b/gnu/usr.bin/texinfo/po/LINGUAS
index d5a32048a4e..295325dee2e 100644
--- a/gnu/usr.bin/texinfo/po/LINGUAS
+++ b/gnu/usr.bin/texinfo/po/LINGUAS
@@ -8,7 +8,12 @@ he
 hr
 ja
 nl
+nb
 no
+pl
+ro
 ru
 sv
+tr
+zh_CN
 zh_TW
diff --git a/gnu/usr.bin/texinfo/po/Makevars b/gnu/usr.bin/texinfo/po/Makevars
index 8b09f53b0f5..cf1c228c12f 100644
--- a/gnu/usr.bin/texinfo/po/Makevars
+++ b/gnu/usr.bin/texinfo/po/Makevars
@@ -20,6 +20,22 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
 # their copyright.
 COPYRIGHT_HOLDER = Free Software Foundation, Inc.
 
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = bug-texinfo@gnu.org
+
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
diff --git a/gnu/usr.bin/texinfo/po/Rules-quot b/gnu/usr.bin/texinfo/po/Rules-quot
index 5f46d237d25..9c2a995e300 100644
--- a/gnu/usr.bin/texinfo/po/Rules-quot
+++ b/gnu/usr.bin/texinfo/po/Rules-quot
@@ -4,6 +4,11 @@ DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.heade
 
 .SUFFIXES: .insert-header .po-update-en
 
+en@quot.po-create:
+	$(MAKE) en@quot.po-update
+en@boldquot.po-create:
+	$(MAKE) en@boldquot.po-update
+
 en@quot.po-update: en@quot.po-update-en
 en@boldquot.po-update: en@boldquot.po-update-en
 
diff --git a/gnu/usr.bin/texinfo/po/cs.gmo b/gnu/usr.bin/texinfo/po/cs.gmo
index 6579c80144b..03297906b1c 100644
--- a/gnu/usr.bin/texinfo/po/cs.gmo
+++ b/gnu/usr.bin/texinfo/po/cs.gmo
diff --git a/gnu/usr.bin/texinfo/po/cs.po b/gnu/usr.bin/texinfo/po/cs.po
index 4b6f284faf1..14c7d5ef5b3 100644
--- a/gnu/usr.bin/texinfo/po/cs.po
+++ b/gnu/usr.bin/texinfo/po/cs.po
@@ -7,7 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 4.0\n"
-"POT-Creation-Date: 2002-04-01 06:10-0800\n"
+"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
+"POT-Creation-Date: 2004-12-21 16:20-0800\n"
 "PO-Revision-Date: 2000-10-31 15:17+01:00\n"
 "Last-Translator: Vladimir Michl <Vladimir.Michl@seznam.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -15,132 +16,132 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: info/echo-area.c:283 info/session.c:712
+#: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr "Posun na následující znak"
 
-#: info/echo-area.c:295 info/session.c:728
+#: info/echo-area.c:296 info/session.c:705
 msgid "Move backward a character"
 msgstr "Posun na pøedcházející znak"
 
-#: info/echo-area.c:307
+#: info/echo-area.c:308
 msgid "Move to the start of this line"
 msgstr "Pøesun na zaèátek tohoto øádku"
 
-#: info/echo-area.c:312
+#: info/echo-area.c:313
 msgid "Move to the end of this line"
 msgstr "Pøesun na konec tohoto øádku"
 
-#: info/echo-area.c:320 info/session.c:746
+#: info/echo-area.c:321 info/session.c:723
 msgid "Move forward a word"
 msgstr "Posun na následující slovo"
 
-#: info/echo-area.c:360 info/session.c:795
+#: info/echo-area.c:361 info/session.c:772
 msgid "Move backward a word"
 msgstr "Posun na pøedcházející slovo"
 
-#: info/echo-area.c:400
+#: info/echo-area.c:401
 msgid "Delete the character under the cursor"
 msgstr "Smazání znaku pod kurzorem"
 
-#: info/echo-area.c:430
+#: info/echo-area.c:431
 msgid "Delete the character behind the cursor"
 msgstr "Smazání prvního znaku vlevo od kurzoru"
 
-#: info/echo-area.c:451
+#: info/echo-area.c:452
 msgid "Cancel or quit operation"
 msgstr "Zru¹ení nebo pøeru¹ení operace"
 
-#: info/echo-area.c:466
+#: info/echo-area.c:467
 msgid "Accept (or force completion of) this line"
 msgstr "Akceptování (nebo vnucené dokonèení) tohoto øádku"
 
-#: info/echo-area.c:471
+#: info/echo-area.c:472
 msgid "Insert next character verbatim"
 msgstr "Vlo¾ení dal¹ího znaku bez interpretace jeho funkce"
 
-#: info/echo-area.c:479
+#: info/echo-area.c:480
 msgid "Insert this character"
 msgstr "Vlo¾ení tohoto znaku"
 
-#: info/echo-area.c:497
+#: info/echo-area.c:498
 msgid "Insert a TAB character"
 msgstr "Vlo¾ení tabelátoru"
 
-#: info/echo-area.c:504
+#: info/echo-area.c:505
 msgid "Transpose characters at point"
 msgstr "Pøemístìní znaku na pozici"
 
-#: info/echo-area.c:555
+#: info/echo-area.c:556
 msgid "Yank back the contents of the last kill"
 msgstr "Vlo¾ení toho co bylo naposled smazáno"
 
-#: info/echo-area.c:562
+#: info/echo-area.c:563
 msgid "Kill ring is empty"
 msgstr "Kruhový buffer smazaných oblastí je prázdný"
 
-#: info/echo-area.c:575
+#: info/echo-area.c:576
 msgid "Yank back a previous kill"
 msgstr "Vlo¾ení naposledy smazaného úseku"
 
-#: info/echo-area.c:608
+#: info/echo-area.c:609
 msgid "Kill to the end of the line"
 msgstr "Smazání v¹eho od kurzoru a¾ do konce øádku"
 
-#: info/echo-area.c:621
+#: info/echo-area.c:622
 msgid "Kill to the beginning of the line"
 msgstr "Smazání v¹eho od zaèátku øádku do kurzoru"
 
-#: info/echo-area.c:633
+#: info/echo-area.c:634
 msgid "Kill the word following the cursor"
 msgstr "Smazání slova, od kurzoru do konce slova"
 
-#: info/echo-area.c:652
+#: info/echo-area.c:653
 msgid "Kill the word preceding the cursor"
 msgstr "Smazání slova, od zaèátku slova do kurzoru"
 
-#: info/echo-area.c:872 info/echo-area.c:932
+#: info/echo-area.c:868 info/echo-area.c:924
 msgid "No completions"
 msgstr "Doplnìní neexistují"
 
-#: info/echo-area.c:874
+#: info/echo-area.c:870
 msgid "Not complete"
 msgstr "Nekompletní"
 
-#: info/echo-area.c:919
+#: info/echo-area.c:911
 msgid "List possible completions"
 msgstr "Seznam mo¾ných doplnìní"
 
-#: info/echo-area.c:936
+#: info/echo-area.c:928
 msgid "Sole completion"
 msgstr "Jedinné doplnìní"
 
-#: info/echo-area.c:945
+#: info/echo-area.c:937
 msgid "One completion:\n"
 msgstr "Jedno doplnìní:\n"
 
-#: info/echo-area.c:946
+#: info/echo-area.c:938
 #, c-format
 msgid "%d completions:\n"
 msgstr "%d doplnìní:\n"
 
-#: info/echo-area.c:1092
+#: info/echo-area.c:1085
 msgid "Insert completion"
 msgstr "Vlo¾ení doplnìní"
 
-#: info/echo-area.c:1225
+#: info/echo-area.c:1220
 msgid "Building completions..."
 msgstr "Hledám doplnìní..."
 
-#: info/echo-area.c:1342
+#: info/echo-area.c:1340
 msgid "Scroll the completions window"
 msgstr "Odrolování obsahu okna s doplnìními"
 
-#: info/footnotes.c:212
+#: info/footnotes.c:213
 msgid "Footnotes could not be displayed"
 msgstr "Poznámky pod èarou nelze zobrazit"
 
-#: info/footnotes.c:238
+#: info/footnotes.c:239
 msgid "Show the footnotes associated with this node in another window"
 msgstr ""
 "Zobrazení poznámek pod èarou, vztahujících se k tomuto uzlu, v jiném oknì"
@@ -150,92 +151,92 @@ msgstr ""
 msgid "---------- Footnotes ----------"
 msgstr "---------------------\n"
 
-#: info/indices.c:175
+#: info/indices.c:172
 msgid "Look up a string in the index for this file"
 msgstr "Vyhledání øetìzce v rejstøíku tohoto souboru"
 
-#: info/indices.c:205
+#: info/indices.c:199
 msgid "Finding index entries..."
 msgstr "Jsou hledány polo¾ky rejstøíku..."
 
-#: info/indices.c:212
+#: info/indices.c:207
 msgid "No indices found."
 msgstr "®ádný rejstøík nebyl nalezen."
 
-#: info/indices.c:222
+#: info/indices.c:217
 msgid "Index entry: "
 msgstr "Polo¾ka rejstøíku: "
 
-#: info/indices.c:332
+#: info/indices.c:325
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr ""
 "Posun na dal¹í polo¾ku rejstøíku, odpovídající øetìzci z minulého pøíkazu `"
 "\\[index-search]'"
 
-#: info/indices.c:342
+#: info/indices.c:335
 msgid "No previous index search string."
 msgstr "Není zadán øetìzec, který se má vyhledávat v rejstøíku(cích)."
 
-#: info/indices.c:349
+#: info/indices.c:342
 msgid "No index entries."
 msgstr "Nejsou polo¾ky rejstøíku."
 
-#: info/indices.c:382
-#, c-format
-msgid "No %sindex entries containing \"%s\"."
+#: info/indices.c:375
+#, fuzzy, c-format
+msgid "No %sindex entries containing `%s'."
 msgstr "Ji¾ není %spolo¾ka rejstøíku, která obsahuje \"%s\"."
 
-#: info/indices.c:383
+#: info/indices.c:376
 msgid "more "
 msgstr "dal¹í "
 
-#: info/indices.c:393
+#: info/indices.c:386
 msgid "CAN'T SEE THIS"
 msgstr "TOTO NELZE VIDÌT"
 
-#: info/indices.c:429
-#, c-format
-msgid "Found \"%s\" in %s. (`\\[next-index-match]' tries to find next.)"
+#: info/indices.c:422
+#, fuzzy, c-format
+msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
 msgstr "Nalezeno \"%s\" v %s. (`\\[next-index-match]' - hledání dal¹í.)"
 
-#: info/indices.c:549
-#, c-format
-msgid "Scanning indices of \"%s\"..."
+#: info/indices.c:541
+#, fuzzy, c-format
+msgid "Scanning indices of `%s'..."
 msgstr "Prohledávám tyto rejstøíky \"%s\"..."
 
-#: info/indices.c:603
+#: info/indices.c:596
 #, c-format
-msgid "No available info files have \"%s\" in their indices."
+msgid "No available info files have `%s' in their indices."
 msgstr ""
 
-#: info/indices.c:632
+#: info/indices.c:622
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr ""
 "Vyhledání øetìzce ve v¹ech známých rejstøících info souborù a vytvoøení menu"
 
-#: info/indices.c:636
+#: info/indices.c:626
 msgid "Index apropos: "
 msgstr "Hledat v rejstøíku odkaz na:"
 
-#: info/indices.c:666
-#, c-format
+#: info/indices.c:654
+#, fuzzy, c-format
 msgid ""
 "\n"
-"* Menu: Nodes whoses indices contain \"%s\":\n"
+"* Menu: Nodes whose indices contain `%s':\n"
 msgstr ""
 "\n"
 "* Menu: Uzly jejich¾ rejstøíky obsahují \"%s\":\n"
 
-#: info/info.c:260 info/infokey.c:884
+#: info/info.c:275 info/infokey.c:899
+#, c-format
 msgid "Try --help for more information.\n"
 msgstr "Více informací mù¾ete získat pomocí pøepínaèe --help.\n"
 
-#: info/info.c:279 info/infokey.c:139 makeinfo/makeinfo.c:689
-#: util/install-info.c:1224 util/texindex.c:338
-#, c-format
+#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
+#: util/texindex.c:343
+#, 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"
@@ -248,16 +249,16 @@ msgstr ""
 "Public Licence). Více informací získáte ve zdrojových textech v souboru\n"
 "COPYING.\n"
 
-#: info/info.c:462
+#: info/info.c:498
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "odpovídající polo¾ky rejstøíku nebyly pro `%s' nalezeny\n"
 
-#: info/info.c:555
+#: info/info.c:590
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
 msgstr ""
 
-#: info/info.c:562
+#: info/info.c:597
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -274,10 +275,12 @@ msgid ""
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
 "  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
-"  -R, --raw-escapes            don't remove ANSI escapes from man pages.\n"
+"  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+"      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
 "  -O, --show-options, --usage  go to command-line options node.\n"
 "%s      --subnodes               recursively output menu items.\n"
+"  -w, --where, --location      print physical location of Info file.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
 "\n"
@@ -337,8 +340,8 @@ msgstr ""
 "obecné otázky smìøujte na <help-texinfo@gnu.org>. Pøipomínky k pøekladu\n"
 "zasílejte na adresu <cs@li.org> (èesky).\n"
 
-#: info/info.c:598 info/infokey.c:903 makeinfo/makeinfo.c:474
-#: util/install-info.c:421 util/texindex.c:286
+#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
+#: util/install-info.c:466 util/texindex.c:292
 #, fuzzy
 msgid ""
 "\n"
@@ -352,225 +355,225 @@ msgstr ""
 "obecné otázky smìøujte na <help-texinfo@gnu.org>. Pøipomínky k pøekladu\n"
 "zasílejte na <cs@li.org> (èesky).\n"
 
-#: info/info.c:632
+#: info/info.c:669
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "Uzel `%s' nelze nalézt."
 
-#: info/info.c:633
+#: info/info.c:670
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "Uzel `(%s)%s' nelze nalézt."
 
-#: info/info.c:634
+#: info/info.c:671
 msgid "Cannot find a window!"
 msgstr "Nelze nalézt okno!"
 
-#: info/info.c:635
+#: info/info.c:672
 msgid "Point doesn't appear within this window's node!"
 msgstr "Bod se nevyskutuje v oknì tohoto uzlu!"
 
-#: info/info.c:636
+#: info/info.c:673
 msgid "Cannot delete the last window."
 msgstr "Poslední okno nelze smazat."
 
-#: info/info.c:637
+#: info/info.c:674
 msgid "No menu in this node."
 msgstr "V tomto uzlu není menu."
 
-#: info/info.c:638
+#: info/info.c:675
 msgid "No footnotes in this node."
 msgstr "V tomto nejsou poznámky pod èarou."
 
-#: info/info.c:639
+#: info/info.c:676
 msgid "No cross references in this node."
 msgstr "V tomto uzlu není køí¾ový odkaz."
 
-#: info/info.c:640
+#: info/info.c:677
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Pro tento uzel není `%s' ukazatel."
 
-#: info/info.c:641
+#: info/info.c:678
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "Neznámý Info pøíkaz `%c'; zkuste `?' pro nápovìdu."
 
-#: info/info.c:642
+#: info/info.c:679
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr "Typ terminálu `%s' není dostateènì inteligentní pro provoz Infa."
 
-#: info/info.c:643
+#: info/info.c:680
 msgid "You are already at the last page of this node."
 msgstr "Ji¾ jste na poslední stránce tohoto uzlu."
 
-#: info/info.c:644
+#: info/info.c:681
 msgid "You are already at the first page of this node."
 msgstr "Ji¾ jste na první stránce tohoto uzlu."
 
-#: info/info.c:645
+#: info/info.c:682
 msgid "Only one window."
 msgstr "Pouze jedno okno."
 
-#: info/info.c:646
+#: info/info.c:683
 msgid "Resulting window would be too small."
 msgstr "Výsledné okno by bylo pøíli¹ malé."
 
-#: info/info.c:647
+#: info/info.c:684
 msgid "Not enough room for a help window, please delete a window."
 msgstr "Není volné místo pro okno nápovìdy, prosím sma¾te nìkteré okno."
 
-#: info/infodoc.c:45 info/infodoc.c:94
+#: info/infodoc.c:46 info/infodoc.c:95
 #, fuzzy
 msgid ""
 "Basic Commands in Info Windows\n"
 "******************************\n"
 msgstr "Základní pøíkazy v Info oknech\n"
 
-#: info/infodoc.c:48
+#: info/infodoc.c:49
 #, fuzzy
 msgid "\\%-10[quit-help]  Quit this help.\n"
 msgstr "  %-10s  Ukonèení prohlí¾ení nápovìdy.\n"
 
-#: info/infodoc.c:49
+#: info/infodoc.c:50
 #, fuzzy
 msgid "\\%-10[quit]  Quit Info altogether.\n"
 msgstr "  %-10s  Celkové ukonèení Infa.\n"
 
-#: info/infodoc.c:50
+#: info/infodoc.c:51
 #, fuzzy
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
 msgstr "  %-10s  Vyvolání prùvodce Infem.\n"
 
 # Udìlat patch na podtr¾ení
-#: info/infodoc.c:52 info/infodoc.c:101
+#: info/infodoc.c:53 info/infodoc.c:102
 #, fuzzy
 msgid ""
 "Selecting other nodes:\n"
 "----------------------\n"
 msgstr "Výbìr dal¹ích uzlù:\n"
 
-#: info/infodoc.c:54
+#: info/infodoc.c:55
 #, fuzzy
 msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
 msgstr "  %-10s  Pøesun na \"dal¹í\" uzel tohoto uzlu.\n"
 
-#: info/infodoc.c:55
+#: info/infodoc.c:56
 #, fuzzy
 msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
 msgstr "  %-10s  Pøesun na \"pøedchozí\" uzel tohoto uzlu.\n"
 
-#: info/infodoc.c:56
+#: info/infodoc.c:57
 #, fuzzy
 msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
 msgstr "  %-10s  Pøesun \"nahoru\" z aktuálního uzlu.\n"
 
-#: info/infodoc.c:57
+#: info/infodoc.c:58
 #, fuzzy
 msgid ""
 "\\%-10[menu-item]  Pick menu item specified by name.\n"
 "              Picking a menu item causes another node to be selected.\n"
 msgstr "              Vybírání polo¾ky menu zpùsobí zobrazení tohoto uzlu.\n"
 
-#: info/infodoc.c:59
+#: info/infodoc.c:60
 #, fuzzy
 msgid ""
 "\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
 msgstr "  %-10s  Následování køí¾ového odkazu. Ète název odkazu.\n"
 
-#: info/infodoc.c:60
+#: info/infodoc.c:61
 #, fuzzy
 msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
 msgstr "  %-10s  Pøesun na poslední uzel zobrazený v tomto oknì.\n"
 
-#: info/infodoc.c:61
+#: info/infodoc.c:62
 #, fuzzy
 msgid ""
 "\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
 msgstr "  %-10s  Skok na následující hypertextový odkaz v tomto uzlu.\n"
 
-#: info/infodoc.c:62
+#: info/infodoc.c:63
 #, fuzzy
 msgid ""
 "\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
 "node.\n"
 msgstr "  %-10s  Skok na následující hypertextový odkaz v tomto uzlu.\n"
 
-#: info/infodoc.c:63
+#: info/infodoc.c:64
 #, fuzzy
 msgid ""
 "\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
 msgstr "  %-10s  Následování hypertextového odkazu pod kurzorem.\n"
 
-#: info/infodoc.c:64
+#: info/infodoc.c:65
 #, fuzzy
 msgid ""
 "\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
 "node] (DIR)'.\n"
 msgstr "  %-10s  Pøesun do `adresáøového' uzlu. Rovnocenné s `g (DIR)'.\n"
 
-#: info/infodoc.c:65
+#: info/infodoc.c:66
 #, fuzzy
 msgid ""
 "\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
 msgstr "  %-10s  Pøesun do nejvy¹¹ího (Top) uzlu. Rovnocenné s `g Top'.\n"
 
-#: info/infodoc.c:67 info/infodoc.c:115
+#: info/infodoc.c:68 info/infodoc.c:116
 #, fuzzy
 msgid ""
 "Moving within a node:\n"
 "---------------------\n"
 msgstr "Pøesun uvnitø uzlu:\n"
 
-#: info/infodoc.c:69
-#, fuzzy
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
-msgstr "  %-10s  Následující stránka.\n"
-
 #: info/infodoc.c:70
 #, fuzzy
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
-msgstr "  %-10s  Pøedchozí stránka.\n"
-
-#: info/infodoc.c:71
-#, fuzzy
 msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
 msgstr "  %-10s  Pøesun na zaèátek aktuálního uzlu.\n"
 
-#: info/infodoc.c:72
+#: info/infodoc.c:71
 #, fuzzy
 msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
 msgstr "  %-10s  Pøesun na konec tohoto uzlu.\n"
 
-#: info/infodoc.c:73
+#: info/infodoc.c:72
 #, fuzzy
-msgid "\\%-10[scroll-forward]  Scroll forward 1 line.\n"
+msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
 msgstr "  %-10s  Posun o jeden øádek dopøedu.\n"
 
-#: info/infodoc.c:74
+#: info/infodoc.c:73
 #, fuzzy
-msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
+msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
 msgstr "  %-10s  Posun o jeden øádek dozadu.\n"
 
-#: info/infodoc.c:76 info/infodoc.c:124
+#: info/infodoc.c:74
+#, fuzzy
+msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
+msgstr "  %-10s  Následující stránka.\n"
+
+#: info/infodoc.c:75
+#, fuzzy
+msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
+msgstr "  %-10s  Pøedchozí stránka.\n"
+
+#: info/infodoc.c:77 info/infodoc.c:125
 #, fuzzy
 msgid ""
 "Other commands:\n"
 "---------------\n"
 msgstr "Dal¹í pøíkazy:\n"
 
-#: info/infodoc.c:78
+#: info/infodoc.c:79
 #, fuzzy
 msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
 msgstr "  %-10s  Výbìr první ... deváté polo¾ky menu uzlu.\n"
 
-#: info/infodoc.c:79
+#: info/infodoc.c:80
 #, fuzzy
 msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
 msgstr "  %-10s  Zobrazení poslední polo¾ky menu uzlu.\n"
 
-#: info/infodoc.c:80
+#: info/infodoc.c:81
 #, fuzzy
 msgid ""
 "\\%-10[index-search]  Search for a specified string in the index entries of "
@@ -579,14 +582,14 @@ msgid ""
 "found.\n"
 msgstr "              uzlu, na který ukazuje první nalezená polo¾ka.\n"
 
-#: info/infodoc.c:82
+#: info/infodoc.c:83
 #, fuzzy
 msgid ""
 "\\%-10[goto-node]  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr "              Také mù¾ete zadat jméno souboru ve tvaru (SOUBOR)UZEL.\n"
 
-#: info/infodoc.c:84
+#: info/infodoc.c:85
 #, fuzzy
 msgid ""
 "\\%-10[search]  Search forward for a specified string\n"
@@ -594,7 +597,7 @@ msgid ""
 msgstr ""
 "      a zobrazení uzlu, ve kterém je nalezen dal¹í výskyt tohoto øetìzce.\n"
 
-#: info/infodoc.c:86
+#: info/infodoc.c:87
 #, fuzzy
 msgid ""
 "\\%-10[search-backward]  Search backward for a specified string\n"
@@ -603,171 +606,171 @@ msgid ""
 msgstr ""
 "      a zobrazení uzlu, ve kterém je nalezen dal¹í výskyt tohoto øetìzce.\n"
 
-#: info/infodoc.c:97
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Quit this help.\n"
 msgstr "  %-10s  Ukonèení prohlí¾ení nápovìdy.\n"
 
-#: info/infodoc.c:98
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr "  %-10s  Celkové ukonèení Infa.\n"
 
-#: info/infodoc.c:99
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr "  %-10s  Vyvolání prùvodce Infem.\n"
 
-#: info/infodoc.c:103
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
 msgstr "  %-10s  Pøesun na \"dal¹í\" uzel tohoto uzlu.\n"
 
-#: info/infodoc.c:104
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
 msgstr "  %-10s  Pøesun na \"pøedchozí\" uzel tohoto uzlu.\n"
 
-#: info/infodoc.c:105
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
 msgstr "  %-10s  Pøesun \"nahoru\" z aktuálního uzlu.\n"
 
-#: info/infodoc.c:106
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Pick menu item specified by name.\n"
 msgstr "  %-10s  Vybrání polo¾ky menu zadané pomocí názvu.\n"
 
-#: info/infodoc.c:107
+#: info/infodoc.c:108
 msgid "              Picking a menu item causes another node to be selected.\n"
 msgstr "              Vybírání polo¾ky menu zpùsobí zobrazení tohoto uzlu.\n"
 
-#: info/infodoc.c:108
+#: info/infodoc.c:109
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
 msgstr "  %-10s  Následování køí¾ového odkazu. Ète název odkazu.\n"
 
-#: info/infodoc.c:109
+#: info/infodoc.c:110
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
 msgstr "  %-10s  Pøesun na poslední uzel zobrazený v tomto oknì.\n"
 
-#: info/infodoc.c:110
+#: info/infodoc.c:111
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
 msgstr "  %-10s  Skok na následující hypertextový odkaz v tomto uzlu.\n"
 
-#: info/infodoc.c:111
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
 msgstr "  %-10s  Následování hypertextového odkazu pod kurzorem.\n"
 
-#: info/infodoc.c:112
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
 msgstr "  %-10s  Pøesun do `adresáøového' uzlu. Rovnocenné s `g (DIR)'.\n"
 
-#: info/infodoc.c:113
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
 msgstr "  %-10s  Pøesun do nejvy¹¹ího (Top) uzlu. Rovnocenné s `g Top'.\n"
 
-#: info/infodoc.c:117
+#: info/infodoc.c:118
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
 msgstr "  %-10s  Následující stránka.\n"
 
-#: info/infodoc.c:118
+#: info/infodoc.c:119
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
 msgstr "  %-10s  Pøedchozí stránka.\n"
 
-#: info/infodoc.c:119
+#: info/infodoc.c:120
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
 msgstr "  %-10s  Pøesun na zaèátek aktuálního uzlu.\n"
 
-#: info/infodoc.c:120
+#: info/infodoc.c:121
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
 msgstr "  %-10s  Pøesun na konec tohoto uzlu.\n"
 
-#: info/infodoc.c:121
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
 msgstr "  %-10s  Posun o jeden øádek dopøedu.\n"
 
-#: info/infodoc.c:122
+#: info/infodoc.c:123
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
 msgstr "  %-10s  Posun o jeden øádek dozadu.\n"
 
-#: info/infodoc.c:126
+#: info/infodoc.c:127
 #, c-format
 msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
 msgstr "  %-10s  Výbìr první ... deváté polo¾ky menu uzlu.\n"
 
-#: info/infodoc.c:127
+#: info/infodoc.c:128
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
 msgstr "  %-10s  Zobrazení poslední polo¾ky menu uzlu.\n"
 
-#: info/infodoc.c:128
+#: info/infodoc.c:129
 #, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
 msgstr ""
 "  %-10s  Hledání zadaného øetìzce v rejstøíku tohoto Info souboru a výbìr\n"
 
-#: info/infodoc.c:129
+#: info/infodoc.c:130
 msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
 msgstr "              uzlu, na který ukazuje první nalezená polo¾ka.\n"
 
-#: info/infodoc.c:130
+#: info/infodoc.c:131
 #, c-format
 msgid "  %-10s  Move to node specified by name.\n"
 msgstr "  %-10s  Pøesun na uzel zadaný pomocí jména.\n"
 
-#: info/infodoc.c:131
+#: info/infodoc.c:132
 msgid ""
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr "              Také mù¾ete zadat jméno souboru ve tvaru (SOUBOR)UZEL.\n"
 
-#: info/infodoc.c:132
+#: info/infodoc.c:133
 #, fuzzy, c-format
 msgid "  %-10s  Search forward for a specified string,\n"
 msgstr "  %-10s  Hledání zadaného øetìzce v tomto Info souboru.\n"
 
-#: info/infodoc.c:133 info/infodoc.c:135
+#: info/infodoc.c:134 info/infodoc.c:136
 msgid ""
 "              and select the node in which the next occurrence is found.\n"
 msgstr ""
 "      a zobrazení uzlu, ve kterém je nalezen dal¹í výskyt tohoto øetìzce.\n"
 
-#: info/infodoc.c:134
+#: info/infodoc.c:135
 #, fuzzy, c-format
 msgid "  %-10s  Search backward for a specified string\n"
 msgstr "  %-10s  Hledání zadaného øetìzce v tomto Info souboru.\n"
 
-#: info/infodoc.c:313
+#: info/infodoc.c:316
 msgid "The current search path is:\n"
 msgstr "Aktuální hledací cesta je:\n"
 
-#: info/infodoc.c:316
+#: info/infodoc.c:320
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
 msgstr "Pøíkazy dostupné v Info oknech:\n"
 
-#: info/infodoc.c:319
+#: info/infodoc.c:324
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
 msgstr "Pøíkazy dostupné v zobrazovacím poli:\n"
 
-#: info/infodoc.c:340
+#: info/infodoc.c:347
 #, fuzzy, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
@@ -776,7 +779,7 @@ msgstr ""
 "Následující pøíkazy mohou být vykonány pouze pomocí M-x:\n"
 "\n"
 
-#: info/infodoc.c:343
+#: info/infodoc.c:351
 #, fuzzy
 msgid ""
 "The following commands cannot be invoked at all:\n"
@@ -785,158 +788,174 @@ msgstr ""
 "Následující pøíkazy mohou být vykonány pouze pomocí M-x:\n"
 "\n"
 
-#: info/infodoc.c:367
+#: info/infodoc.c:375
 msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
 msgstr ""
 "--- Pou¾ijte `\\[history-node]' nebo `\\[kill-node]' pro ukonèení ---\n"
 
-#: info/infodoc.c:477
+#: info/infodoc.c:485
 msgid "Display help message"
 msgstr "Zobrazení nápovìdy"
 
-#: info/infodoc.c:495
+#: info/infodoc.c:503
 msgid "Visit Info node `(info)Help'"
 msgstr "Zobrazení Info uzlu `(info)Help'"
 
-#: info/infodoc.c:638
+#: info/infodoc.c:641
 msgid "Print documentation for KEY"
 msgstr "Zobrazení dokumentace ke KLÁVESE"
 
-#: info/infodoc.c:650
+#: info/infodoc.c:653
 #, c-format
 msgid "Describe key: %s"
 msgstr "Popis klávesy: %s"
 
-#: info/infodoc.c:660
+#: info/infodoc.c:664
 #, c-format
 msgid "ESC %s is undefined."
 msgstr "ESC %s je nedefinováno."
 
-#: info/infodoc.c:676 info/infodoc.c:703
+#: info/infodoc.c:680 info/infodoc.c:709
 #, c-format
 msgid "%s is undefined."
 msgstr "%s je nedefinováno."
 
-#: info/infodoc.c:724
+#: info/infodoc.c:730
 #, c-format
 msgid "%s is defined to %s."
 msgstr "Klávesa %s je definována pro pøíkaz %s."
 
-#: info/infodoc.c:1151
+#: info/infodoc.c:1153
 msgid "Show what to type to execute a given command"
 msgstr "Ukázání co napsat pro spu¹tìní daného pøíkazu"
 
-#: info/infodoc.c:1155
+#: info/infodoc.c:1157
 msgid "Where is command: "
 msgstr "Kde je pøíkaz: "
 
-#: info/infodoc.c:1177
+#: info/infodoc.c:1179
 #, c-format
 msgid "`%s' is not on any keys"
 msgstr "Pøíkaz `%s' není na ¾ádné klávese"
 
-#: info/infodoc.c:1183
+#: info/infodoc.c:1186
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr "Pøíkaz %s mù¾e být vyvolán pouze pomocí %s."
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1190
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr "Pøíkaz %s mù¾e být vyvolán pomocí %s."
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1195
 #, c-format
 msgid "There is no function named `%s'"
 msgstr "Funkce `%s' není známa"
 
-#: info/infokey.c:164
+#: info/infokey.c:145
+#, 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 (C) %s 1996 Free Software Foundation, Inc.\n"
+"  Toto je volné programové vybavení, které je zcela BEZ ZÁRUKY. Podmínky "
+"pro\n"
+"kopírování a roz¹iøování naleznete v Obecné veøejné licenci GNU (GNU "
+"General\n"
+"Public Licence). Více informací získáte ve zdrojových textech v souboru\n"
+"COPYING.\n"
+
+#: info/infokey.c:170
 msgid "incorrect number of arguments"
 msgstr ""
 
-#: info/infokey.c:194
+#: info/infokey.c:201
 #, fuzzy, c-format
 msgid "cannot open input file `%s'"
 msgstr "Rouru do `%s' nelze otevøít."
 
-#: info/infokey.c:207
+#: info/infokey.c:215
 #, fuzzy, c-format
 msgid "cannot create output file `%s'"
 msgstr "Výstupní soubor `%s' nelze vytvoøit."
 
-#: info/infokey.c:217
+#: info/infokey.c:226
 #, c-format
 msgid "error writing to `%s'"
 msgstr ""
 
-#: info/infokey.c:222
+#: info/infokey.c:232
 #, fuzzy, c-format
 msgid "error closing output file `%s'"
 msgstr "Výstupní soubor `%s' nelze vytvoøit."
 
-#: info/infokey.c:443
+#: info/infokey.c:450
 msgid "key sequence too long"
 msgstr ""
 
-#: info/infokey.c:521
+#: info/infokey.c:529
 msgid "missing key sequence"
 msgstr ""
 
-#: info/infokey.c:600
+#: info/infokey.c:610
 msgid "NUL character (\\000) not permitted"
 msgstr ""
 
-#: info/infokey.c:629
+#: info/infokey.c:641
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr ""
 
-#: info/infokey.c:652
+#: info/infokey.c:665
 #, fuzzy
 msgid "missing action name"
 msgstr "%c%s chybìjící uzavírací závorka"
 
-#: info/infokey.c:667 info/infokey.c:733
+#: info/infokey.c:681 info/infokey.c:756
 msgid "section too long"
 msgstr ""
 
-#: info/infokey.c:673
+#: info/infokey.c:688
 #, fuzzy, c-format
 msgid "unknown action `%s'"
 msgstr "Neznámý pøíkaz `%s'"
 
-#: info/infokey.c:682
+#: info/infokey.c:698
 msgid "action name too long"
 msgstr ""
 
-#: info/infokey.c:694
+#: info/infokey.c:712
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr ""
 
-#: info/infokey.c:704
+#: info/infokey.c:723
 #, fuzzy
 msgid "missing variable name"
 msgstr "%s: chybí argument jména souboru.\n"
 
-#: info/infokey.c:712
+#: info/infokey.c:733
 msgid "missing `=' immediately after variable name"
 msgstr ""
 
-#: info/infokey.c:719
+#: info/infokey.c:741
 msgid "variable name too long"
 msgstr ""
 
-#: info/infokey.c:741
+#: info/infokey.c:765
 msgid "value too long"
 msgstr ""
 
-#: info/infokey.c:875
+#: info/infokey.c:890
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr ""
 
-#: info/infokey.c:891
+#: info/infokey.c:906
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -950,78 +969,84 @@ msgid ""
 "  --version            display version information and exit.\n"
 msgstr ""
 
-#: info/infomap.c:1397
+#: info/infomap.c:1500
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
 msgstr ""
 
-#: info/infomap.c:1400
+#: info/infomap.c:1503
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
 msgstr ""
 
-#: info/infomap.c:1413
+#: info/infomap.c:1516
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
 msgstr ""
 
-#: info/infomap.c:1431
+#: info/infomap.c:1535
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1437
+#: info/infomap.c:1544
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1450
+#: info/infomap.c:1560
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1470
+#: info/infomap.c:1581
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1608
+#: info/infomap.c:1716
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr ""
 
-#: info/infomap.c:1659
+#: info/infomap.c:1766
 msgid "Bad data in infokey file -- some var settings ignored"
 msgstr ""
 
-#: info/m-x.c:70
+#: info/m-x.c:69
 msgid "Read the name of an Info command and describe it"
 msgstr "Zadání jména pøíkazu a následné zobrazení jeho popisu"
 
-#: info/m-x.c:74
+#: info/m-x.c:73
 msgid "Describe command: "
 msgstr "Popis pøíkazu: "
 
-#: info/m-x.c:97
+#: info/m-x.c:96
 msgid "Read a command name in the echo area and execute it"
 msgstr "Zadání jména pøíkazu v zobrazovacím poli a jeho vykonání"
 
-#: info/m-x.c:141
+#: info/m-x.c:140
 msgid "Cannot execute an `echo-area' command here."
 msgstr "Pøíkaz zobrazovacího pole nelze vykonat zde."
 
-#: info/m-x.c:157
+#: info/m-x.c:154
+#, fuzzy, c-format
+msgid "Undefined command: %s"
+msgstr "Neznámý pøíkaz `%s'"
+
+#: info/m-x.c:160
 msgid "Set the height of the displayed window"
 msgstr "Nastavení vý¹ky obrazovky"
 
-#: info/m-x.c:170
+#: info/m-x.c:173
 #, c-format
 msgid "Set screen height to (%d): "
 msgstr "Vý¹ka obrazovky (%d): "
 
-#: info/makedoc.c:161 info/makedoc.c:169
+#: info/makedoc.c:162 info/makedoc.c:170
+#, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
 "\n"
@@ -1029,12 +1054,12 @@ msgstr ""
 "Pøi zpracování zdrojového souboru jsou vkládány tyto soubory:\n"
 "\n"
 
-#: info/makedoc.c:553
+#: info/makedoc.c:550
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "Se souborem %s nelze pracovat.\n"
 
-#: info/nodemenu.c:28
+#: info/nodemenu.c:31
 msgid ""
 "\n"
 "* Menu:\n"
@@ -1046,7 +1071,7 @@ msgstr ""
 "  (Soubor)Uzel                      Øádkù   Velikost Soubor\n"
 "  ------------                      -----   -------- ------"
 
-#: info/nodemenu.c:199
+#: info/nodemenu.c:202
 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"
@@ -1054,24 +1079,24 @@ msgstr ""
 "  Zde je seznam uzlù, které jste poslední dobou nav¹tívil. Vyberte jeden\n"
 "z tohoto menu, nebo u¾ijte `\\[history-node]' v tomto oknì.\n"
 
-#: info/nodemenu.c:219
+#: info/nodemenu.c:224
 msgid "Make a window containing a menu of all of the currently visited nodes"
 msgstr "Vytvoøení okna obsahujícího menu v¹ech aktuálnì nav¹tívených uzlù"
 
-#: info/nodemenu.c:299
+#: info/nodemenu.c:304
 msgid "Select a node which has been previously visited in a visible window"
 msgstr "Zobrazení uzlu, který byl zobrazen pøed tímto"
 
-#: info/nodemenu.c:311
+#: info/nodemenu.c:317
 msgid "Select visited node: "
 msgstr "Vyberte nav¹tívený uzel: "
 
-#: info/nodemenu.c:331 info/session.c:2235
+#: info/nodemenu.c:337 info/session.c:2264
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr "Odkaz se ztratil! (%s)."
 
-#: info/session.c:170
+#: info/session.c:162
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1080,442 +1105,442 @@ msgstr ""
 "Vítejte v programu Info verze %s. Stisknìte \\[get-help-window] pro "
 "nápovìdu, \\[menu-item] pro polo¾ku menu."
 
-#: info/session.c:643
+#: info/session.c:620
 msgid "Move down to the next line"
 msgstr "Posun dolù na dal¹í øádek"
 
-#: info/session.c:658
+#: info/session.c:635
 msgid "Move up to the previous line"
 msgstr "Posun nahoru na pøedchozí øádek"
 
-#: info/session.c:673
+#: info/session.c:650
 msgid "Move to the end of the line"
 msgstr "Pøesun na konec øádku"
 
-#: info/session.c:693
+#: info/session.c:670
 msgid "Move to the start of the line"
 msgstr "Pøesun na zaèátek øádku"
 
-#: info/session.c:885 makeinfo/node.c:1357
+#: info/session.c:860 makeinfo/node.c:1424
 msgid "Next"
 msgstr "Dal¹í"
 
-#: info/session.c:888
+#: info/session.c:863
 msgid "Following Next node..."
 msgstr "Pøechod na dal¹í uzel..."
 
-#: info/session.c:905
+#: info/session.c:881
 msgid "Selecting first menu item..."
 msgstr "Zobrazování první polo¾ky menu..."
 
-#: info/session.c:916
+#: info/session.c:893
 msgid "Selecting Next node..."
 msgstr "Zobrazování dal¹ího uzlu..."
 
-#: info/session.c:986
+#: info/session.c:964
 #, c-format
 msgid "Moving Up %d time(s), then Next."
 msgstr "Pøesouvání %d krát nahoru, potom na dal¹í."
 
-#: info/session.c:1010
+#: info/session.c:988
 msgid "No more nodes within this document."
 msgstr "V tomto dokumentu ji¾ nejsou dal¹í uzly."
 
-#: info/session.c:1034
+#: info/session.c:1011
 msgid "No `Prev' for this node."
 msgstr "Pro tento uzel není pøedchozí uzel."
 
-#: info/session.c:1037 info/session.c:1092
+#: info/session.c:1014 info/session.c:1073
 msgid "Moving Prev in this window."
 msgstr "Pøesun na pøedchozí uzel v tomto oknì."
 
-#: info/session.c:1051
+#: info/session.c:1030
 msgid "No `Prev' or `Up' for this node within this document."
 msgstr "V tomto dokumentu není pro tento uzel pøedchozí nebo vy¹¹í uzel."
 
-#: info/session.c:1054
+#: info/session.c:1034
 msgid "Moving Up in this window."
 msgstr "Pøesun nahoru v tomto oknì."
 
-#: info/session.c:1102
+#: info/session.c:1084
 msgid "Moving to `Prev's last menu item."
 msgstr "Pøesun na poslední polo¾ku menu pøedchozího uzlu."
 
-#: info/session.c:1113
+#: info/session.c:1095
 msgid "Move forwards or down through node structure"
 msgstr "Pøesun na následující uzel nebo na první ni¾¹í v uzlové struktuøe"
 
-#: info/session.c:1129
+#: info/session.c:1111
 msgid "Move backwards or up through node structure"
 msgstr "Pøesun na pøedchozí uzel nebo na první vy¹¹í v uzlové struktuøe"
 
-#: info/session.c:1229
+#: info/session.c:1205
 msgid "Scroll forward in this window"
 msgstr "Posun o stránku dolù v tomto oknì"
 
-#: info/session.c:1237
+#: info/session.c:1213
 msgid "Scroll forward in this window and set default window size"
 msgstr "Posun dopøedu v tomto oknì a nastavení implicitní velikosti okna"
 
-#: info/session.c:1245
+#: info/session.c:1221
 #, fuzzy
 msgid "Scroll forward in this window staying within node"
 msgstr "Posun o stránku dolù v tomto oknì"
 
-#: info/session.c:1253
+#: info/session.c:1229
 #, fuzzy
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr "Posun dopøedu v tomto oknì a nastavení implicitní velikosti okna"
 
-#: info/session.c:1261
+#: info/session.c:1237
 msgid "Scroll backward in this window"
 msgstr "Posun o stránku nahoru v tomto oknì"
 
-#: info/session.c:1269
+#: info/session.c:1245
 msgid "Scroll backward in this window and set default window size"
 msgstr "Posun dozadu v tomto oknì a nastavení implicitní velikosti okna"
 
-#: info/session.c:1278
+#: info/session.c:1254
 #, fuzzy
 msgid "Scroll backward in this window staying within node"
 msgstr "Posun o stránku nahoru v tomto oknì"
 
-#: info/session.c:1286
+#: info/session.c:1262
 #, fuzzy
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
 msgstr "Posun dozadu v tomto oknì a nastavení implicitní velikosti okna"
 
-#: info/session.c:1294
+#: info/session.c:1270
 msgid "Move to the start of this node"
 msgstr "Posun na zaèátek tohoto uzlu"
 
-#: info/session.c:1301
+#: info/session.c:1277
 msgid "Move to the end of this node"
 msgstr "Posun na konec tohoto uzlu"
 
-#: info/session.c:1308
+#: info/session.c:1284
 msgid "Scroll down by lines"
 msgstr "Posun dolù po øádcích"
 
-#: info/session.c:1325
+#: info/session.c:1301
 msgid "Scroll up by lines"
 msgstr "Posun nahoru po øádcích"
 
-#: info/session.c:1343
+#: info/session.c:1319
 msgid "Scroll down by half screen size"
 msgstr "Posun dolù o polovinu velikosti obrazovky"
 
-#: info/session.c:1369
+#: info/session.c:1345
 msgid "Scroll up by half screen size"
 msgstr "Posun nahoru o polovinu velikosti obrazovky"
 
-#: info/session.c:1398
+#: info/session.c:1374
 msgid "Select the next window"
 msgstr "Výbìr následujícího okna"
 
-#: info/session.c:1437
+#: info/session.c:1413
 msgid "Select the previous window"
 msgstr "Výbìr pøedchozího okna"
 
-#: info/session.c:1488
+#: info/session.c:1464
 msgid "Split the current window"
 msgstr "Rozdìlení aktuálního okna"
 
-#: info/session.c:1569
+#: info/session.c:1545
 msgid "Delete the current window"
 msgstr "Smazání aktuálního okna"
 
-#: info/session.c:1577
+#: info/session.c:1553
 msgid "Cannot delete a permanent window"
 msgstr "Permanentní okno nelze smazat"
 
-#: info/session.c:1610
+#: info/session.c:1585
 msgid "Delete all other windows"
 msgstr "Smazání v¹ech ostatních oknen"
 
-#: info/session.c:1656
+#: info/session.c:1631
 msgid "Scroll the other window"
 msgstr "Posun druhého okna o stránku dolù"
 
-#: info/session.c:1677
+#: info/session.c:1652
 msgid "Scroll the other window backward"
 msgstr "Posun druhého okna o stránku zpìt"
 
-#: info/session.c:1683
+#: info/session.c:1658
 msgid "Grow (or shrink) this window"
 msgstr "Zmìna velikosti okna"
 
-#: info/session.c:1694
+#: info/session.c:1669
 msgid "Divide the available screen space among the visible windows"
 msgstr "Zvìt¹ení nebo zmen¹ení oken na obrazovce tak, aby byla stejnì velká"
 
-#: info/session.c:1701
+#: info/session.c:1676
 msgid "Toggle the state of line wrapping in the current window"
 msgstr ""
 "Zmìna stavu zalamování v aktuálním oknì (zapnuto->vypni, vypnuto->zapni)"
 
-#: info/session.c:1880
+#: info/session.c:1848
 msgid "Select the Next node"
 msgstr "Zobrazení následujícího uzlu"
 
-#: info/session.c:1888
+#: info/session.c:1856
 msgid "Select the Prev node"
 msgstr "Zobrazení pøedchozího uzlu"
 
-#: info/session.c:1896
+#: info/session.c:1864
 msgid "Select the Up node"
 msgstr "Zobrazení vy¹¹ího uzlu"
 
-#: info/session.c:1903
+#: info/session.c:1871
 msgid "Select the last node in this file"
 msgstr "Zobrazení posledního uzlu v tomto souboru"
 
-#: info/session.c:1930 info/session.c:1963
+#: info/session.c:1898 info/session.c:1931
 msgid "This window has no additional nodes"
 msgstr "Toto okno nemá více dal¹ích uzlù"
 
-#: info/session.c:1936
+#: info/session.c:1904
 msgid "Select the first node in this file"
 msgstr "Zobrazení prvního uzlu v tomto souboru"
 
-#: info/session.c:1970
+#: info/session.c:1938
 msgid "Select the last item in this node's menu"
 msgstr "Zobrazení poslední polo¾ky menu tohoto uzlu"
 
-#: info/session.c:1976
+#: info/session.c:1944
 msgid "Select this menu item"
 msgstr "Zobrazení této polo¾ky menu"
 
-#: info/session.c:2005
+#: info/session.c:1977
 #, c-format
 msgid "There aren't %d items in this menu."
 msgstr "V tomto menu není %d. polo¾ka"
 
-#: info/session.c:2148
+#: info/session.c:2171 info/session.c:2172
 #, c-format
 msgid "Menu item (%s): "
 msgstr "Polo¾ka menu (%s): "
 
-#: info/session.c:2150
+#: info/session.c:2175
 msgid "Menu item: "
 msgstr "Polo¾ka menu: "
 
-#: info/session.c:2155
+#: info/session.c:2182 info/session.c:2183
 #, c-format
 msgid "Follow xref (%s): "
 msgstr "Následování køí¾ového odkazu (%s): "
 
-#: info/session.c:2157
+#: info/session.c:2186
 msgid "Follow xref: "
 msgstr "Následování køí¾ového odkazu: "
 
-#: info/session.c:2280
+#: info/session.c:2315
 msgid "Read a menu item and select its node"
 msgstr "Zadání jména polo¾ky menu a následné zobrazení"
 
-#: info/session.c:2288
+#: info/session.c:2323
 msgid "Read a footnote or cross reference and select its node"
 msgstr ""
 "Zadání jména poznámky pod èarou nebo køí¾ového odkazu a následné zobrazení"
 
-#: info/session.c:2294
+#: info/session.c:2329
 msgid "Move to the start of this node's menu"
 msgstr "Pøesun na zaèátek menu tohoto uzlu"
 
-#: info/session.c:2318
+#: info/session.c:2353
 msgid "Visit as many menu items at once as possible"
 msgstr ""
 "Nav¹tívení tolika polo¾ek menu, kolik je mo¾no. Ka¾dá polo¾ka v jiném oknì."
 
-#: info/session.c:2346
+#: info/session.c:2381
 msgid "Read a node name and select it"
 msgstr "Zadání jména uzlu a jeho následné zobrazení"
 
-#: info/session.c:2401 info/session.c:2405
+#: info/session.c:2436 info/session.c:2441
 msgid "Goto node: "
 msgstr "Pøesun na uzel: "
 
-#: info/session.c:2471
+#: info/session.c:2505
 #, c-format
 msgid "No menu in node `%s'."
 msgstr "V uzlu `%s' není menu."
 
-#: info/session.c:2516
+#: info/session.c:2551
 #, c-format
 msgid "No menu item `%s' in node `%s'."
 msgstr "Polo¾ka menu `%s' v uzlu `%s' není."
 
-#: info/session.c:2546
+#: info/session.c:2581
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
 msgstr "Uzel, na který se odkazuje `%s' v `%s', nelze najít."
 
-#: info/session.c:2597
+#: info/session.c:2631
 msgid "Read a list of menus starting from dir and follow them"
 msgstr "Ètení seznamu menu zaèínajíce v adresáøi a pokraèujíce dále"
 
-#: info/session.c:2599
+#: info/session.c:2633
 msgid "Follow menus: "
 msgstr "Následování menu: "
 
-#: info/session.c:2797
+#: info/session.c:2826
 msgid "Find the node describing program invocation"
 msgstr "Nalezení uzlu popisujícího pøepínaèe programu"
 
-#: info/session.c:2799
+#: info/session.c:2828
 #, c-format
 msgid "Find Invocation node of [%s]: "
 msgstr "Nalezení uzlu s pøepínaèi programu [%s]: "
 
-#: info/session.c:2837
+#: info/session.c:2866
 msgid "Read a manpage reference and select it"
 msgstr "Zadání jména manuálové stránky a následné zobrazení"
 
-#: info/session.c:2841
+#: info/session.c:2870
 msgid "Get Manpage: "
 msgstr "Manuálová stránka: "
 
-#: info/session.c:2871
+#: info/session.c:2900
 msgid "Select the node `Top' in this file"
 msgstr "Zobrazení nejvy¹¹ího uzlu v tomto souboru"
 
-#: info/session.c:2877
+#: info/session.c:2906
 msgid "Select the node `(dir)'"
 msgstr "Zobrazení uzlu `(dir)'"
 
-#: info/session.c:2897
+#: info/session.c:2923 info/session.c:2925
 #, c-format
 msgid "Kill node (%s): "
 msgstr "Zru¹ení uzlu (%s): "
 
-#: info/session.c:2951
+#: info/session.c:2977
 #, c-format
 msgid "Cannot kill node `%s'"
 msgstr "Uzel `%s' nelze zru¹it"
 
-#: info/session.c:2961
+#: info/session.c:2987
 msgid "Cannot kill the last node"
 msgstr "Poslední uzel nelze zru¹it"
 
-#: info/session.c:3047
+#: info/session.c:3073
 msgid "Select the most recently selected node"
 msgstr "Zobrazení poslední dobou nejvíce nav¹tìvovaných uzlù"
 
-#: info/session.c:3053
+#: info/session.c:3079
 msgid "Kill this node"
 msgstr "Zru¹ení tohoto uzlu"
 
-#: info/session.c:3061
+#: info/session.c:3087
 msgid "Read the name of a file and select it"
 msgstr "Zadání jména souboru a jeho následné zobrazení"
 
-#: info/session.c:3065
+#: info/session.c:3091
 msgid "Find file: "
 msgstr "Nalezení souboru: "
 
-#: info/session.c:3082
+#: info/session.c:3108
 #, c-format
 msgid "Cannot find `%s'."
 msgstr "Nelze najít `%s'."
 
-#: info/session.c:3127 info/session.c:3248
+#: info/session.c:3151 info/session.c:3269
 #, c-format
 msgid "Could not create output file `%s'."
 msgstr "Výstupní soubor `%s' nelze vytvoøit."
 
-#: info/session.c:3140 info/session.c:3265 info/session.c:3326
+#: info/session.c:3165 info/session.c:3287 info/session.c:3347
 msgid "Done."
 msgstr "Dokonèeno."
 
-#: info/session.c:3196
+#: info/session.c:3220
 #, c-format
 msgid "Writing node %s..."
 msgstr "Zapisování uzlu %s..."
 
-#: info/session.c:3274
+#: info/session.c:3296
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
 msgstr "Poslání obsahu tohoto uzlu pøíkazu INFO_PRINT_COMMAND"
 
-#: info/session.c:3310
+#: info/session.c:3331
 #, c-format
 msgid "Cannot open pipe to `%s'."
 msgstr "Rouru do `%s' nelze otevøít."
 
-#: info/session.c:3316
+#: info/session.c:3337
 #, c-format
 msgid "Printing node %s..."
 msgstr "Probíhá tisk uzlu %s..."
 
-#: info/session.c:3558
+#: info/session.c:3567
 #, c-format
 msgid "Searching subfile %s ..."
 msgstr "Probíhá hledání podsouboru %s..."
 
-#: info/session.c:3610
+#: info/session.c:3619
 msgid "Read a string and search for it case-sensitively"
 msgstr "Pøeètení øetìzce a jeho vyhledání (zále¾í na velikosti písmen)"
 
-#: info/session.c:3617
+#: info/session.c:3626
 msgid "Read a string and search for it"
 msgstr "Pøeètení øetìzce a jeho vyhledání"
 
-#: info/session.c:3625
+#: info/session.c:3634
 msgid "Read a string and search backward for it"
 msgstr "Pøeètení øetìzce a jeho vyhledání (zpìtné)"
 
-#: info/session.c:3667
+#: info/session.c:3670 info/session.c:3677
 #, c-format
 msgid "%s%sfor string [%s]: "
 msgstr "%s%søetìzce [%s]: "
 
-#: info/session.c:3668
+#: info/session.c:3671 info/session.c:3678
 msgid "Search backward"
 msgstr "Zpìtné hledání"
 
-#: info/session.c:3668
+#: info/session.c:3672 info/session.c:3678
 msgid "Search"
 msgstr "Hledání"
 
-#: info/session.c:3669
+#: info/session.c:3673 info/session.c:3679
 msgid " case-sensitively "
 msgstr " (velikost rozhoduje)"
 
-#: info/session.c:3669
+#: info/session.c:3674 info/session.c:3679
 msgid " "
 msgstr " "
 
-#: info/session.c:3709
+#: info/session.c:3718
 msgid "Search failed."
 msgstr "Nebylo nalezeno."
 
-#: info/session.c:3727
+#: info/session.c:3736
 msgid "Repeat last search in the same direction"
 msgstr "Opakování posledního hledání tím samým smìrem"
 
-#: info/session.c:3730 info/session.c:3740
+#: info/session.c:3739 info/session.c:3749
 msgid "No previous search string"
 msgstr "Není pøedchozí hledaný øetìzec"
 
-#: info/session.c:3737
+#: info/session.c:3746
 msgid "Repeat last search in the reverse direction"
 msgstr "Opakování posledního hledání opaèným smìrem"
 
-#: info/session.c:3755 info/session.c:3761
+#: info/session.c:3765 info/session.c:3771
 msgid "Search interactively for a string as you type it"
 msgstr "Vyhledávání zadávaného øetìzce hned pøi zadávání"
 
-#: info/session.c:3855
+#: info/session.c:3851
 msgid "I-search backward: "
 msgstr "zpìtné interaktivní hledání: "
 
-#: info/session.c:3857
+#: info/session.c:3853
 msgid "I-search: "
 msgstr "interaktivní hledání: "
 
-#: info/session.c:3882
+#: info/session.c:3878 info/session.c:3880
 msgid "Failing "
 msgstr "Bezvýsledné "
 
@@ -1531,27 +1556,27 @@ msgstr "Pøesun na následující køí¾ový odkaz"
 msgid "Select reference or menu item appearing on this line"
 msgstr "Zobrazení odkazu nebo polo¾ky menu, která je na tomto øádku"
 
-#: info/session.c:4381
+#: info/session.c:4382
 msgid "Cancel current operation"
 msgstr "Zru¹ení aktuální operace"
 
-#: info/session.c:4388
+#: info/session.c:4389
 msgid "Quit"
 msgstr "Ukonèení operace"
 
-#: info/session.c:4397
+#: info/session.c:4398
 msgid "Move the cursor to a specific line of the window"
 msgstr "Pøesun kurzoru na zadaný øádek okna"
 
-#: info/session.c:4429
+#: info/session.c:4430
 msgid "Redraw the display"
 msgstr "Pøekreslení obrazovky"
 
-#: info/session.c:4466
+#: info/session.c:4467
 msgid "Quit using Info"
 msgstr "Ukonèení Infa"
 
-#: info/session.c:4479
+#: info/session.c:4480
 msgid "Run command bound to this key's lowercase variant"
 msgstr ""
 
@@ -1561,27 +1586,29 @@ msgid "Unknown command (%s)."
 msgstr "Neznámý pøíkaz (%s)."
 
 #: info/session.c:4494
-msgid "\"\" is invalid"
-msgstr "Sekvence kláves \"\" je neplatná"
-
-#: info/session.c:4495
 #, c-format
 msgid "\"%s\" is invalid"
 msgstr "Sekvence kláves \"%s\" je neplatná"
 
-#: info/session.c:4713
+#: info/session.c:4495
+#, fuzzy, c-format
+msgid "`%s' is invalid"
+msgstr "Sekvence kláves \"%s\" je neplatná"
+
+#: info/session.c:4709
 msgid "Add this digit to the current numeric argument"
 msgstr "Pøidání této èíslice do aktuálního èíselného argumentu"
 
-#: info/session.c:4722
+#: info/session.c:4718
 msgid "Start (or multiply by 4) the current numeric argument"
 msgstr "Zaèátek (nebo dìlení ètyømi) aktuálního èíselného argumentu"
 
-#: info/session.c:4737
+#: info/session.c:4733
 msgid "Internally used by \\[universal-argument]"
 msgstr "Vnitønì u¾íváno funkcí \\[universal-argument]"
 
-#: info/tilde.c:344
+#: info/tilde.c:338
+#, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: Nedostatek virtuální pamìti!\n"
 
@@ -1650,230 +1677,264 @@ msgstr "Nastavení promìnné %s na hodnotu (%d): "
 msgid "Set %s to value (%s): "
 msgstr "Nastavení promìnné %s na hodnotu (%s): "
 
-#: info/window.c:1164
+#: info/window.c:1138
 msgid "--*** Tags out of Date ***"
 msgstr "--*** Znaèky jsou zastatalé ***"
 
-#: info/window.c:1175
+#: info/window.c:1149
 msgid "-----Info: (), lines ----, "
 msgstr "-----Info: (), øádkù ----, "
 
-#: info/window.c:1182
+#: info/window.c:1156
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr "-%s---Info: %s, øádkù: %d --%s--"
 
-#: info/window.c:1186
+#: info/window.c:1160
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr "-%s%s-Info: (%s)%s, øádkù: %d --%s--"
 
-#: info/window.c:1193
+#: info/window.c:1167
 #, c-format
 msgid " Subfile: %s"
 msgstr " Podsoubor: %s"
 
-#: lib/getopt.c:675
+#: lib/getopt.c:551 lib/getopt.c:570
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: pøepínaè `%s' není jednoznaèný\n"
 
-#: lib/getopt.c:700
+#: lib/getopt.c:603 lib/getopt.c:607
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: pøepínaè `--%s' musí být zadán bez argumentu\n"
 
-#: lib/getopt.c:705
+#: lib/getopt.c:616 lib/getopt.c:621
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: pøepínaè `%c%s' musí být zadán bez argumentu\n"
 
-#: lib/getopt.c:723 lib/getopt.c:896
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: pøepínaè `%s' vy¾aduje argument\n"
 
-#: lib/getopt.c:752
+#: lib/getopt.c:727 lib/getopt.c:730
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: neznámý pøepínaè `--%s'\n"
 
-#: lib/getopt.c:756
+#: lib/getopt.c:738 lib/getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: neznámý pøepínaè `%c%s'\n"
 
-#: lib/getopt.c:782
+#: lib/getopt.c:796 lib/getopt.c:799
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: neznámý pøepínaè -- %c\n"
 
-#: lib/getopt.c:785
+#: lib/getopt.c:805 lib/getopt.c:808
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: neznámý pøepínaè -- %c\n"
 
-#: lib/getopt.c:815 lib/getopt.c:945
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: pøepínaè vy¾aduje argument -- %c\n"
 
-#: lib/getopt.c:862
+#: lib/getopt.c:935 lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: pøepínaè `-W %s' není jednoznaèný\n"
 
-#: lib/getopt.c:880
+#: lib/getopt.c:978 lib/getopt.c:999
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: pøepínaè `-W %s' musí být zadán bez argumentu\n"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#, fuzzy, c-format
+msgid "arguments to @%s ignored"
+msgstr "©patný argument pro %c%s"
+
+#: makeinfo/cmds.c:585
 msgid "January"
 msgstr "Leden"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "February"
 msgstr "Únor"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "March"
 msgstr "Bøezen"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "April"
 msgstr "Duben"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "May"
 msgstr "Kvìten"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "June"
 msgstr "Èerven"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "July"
 msgstr "Èervenec"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "August"
 msgstr "Srpen"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "September"
 msgstr "Záøí"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "October"
 msgstr "Øíjen"
 
-#: makeinfo/cmds.c:517
+#: makeinfo/cmds.c:587
 msgid "November"
 msgstr "Listopad"
 
-#: makeinfo/cmds.c:517
+#: makeinfo/cmds.c:587
 msgid "December"
 msgstr "Prosinec"
 
-#: makeinfo/cmds.c:658
+#: makeinfo/cmds.c:936
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "nepravdìpodobný znak %c ve @var"
 
-#: makeinfo/cmds.c:701
+#: makeinfo/cmds.c:979
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "@sc argument je celý velkými písmeny, zbyteènì"
 
-#: makeinfo/cmds.c:759
+#: makeinfo/cmds.c:1034
 #, fuzzy, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "`@end' vy¾aduje `%s', ale vidí `%s'"
 
-#: makeinfo/cmds.c:789
+#: makeinfo/cmds.c:1074
 msgid "end of file inside verb block"
 msgstr ""
 
-#: makeinfo/cmds.c:797
+#: makeinfo/cmds.c:1082
 #, fuzzy, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "`@end' vy¾aduje `%s', ale vidí `%s'"
 
-#: makeinfo/cmds.c:942
+#: makeinfo/cmds.c:1112
+msgid ""
+"@strong{Note...} produces a spurious cross-reference in Info; reword to "
+"avoid that"
+msgstr ""
+
+#: makeinfo/cmds.c:1305
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "Pøíkaz %c%s je zastaralý"
 
-#: makeinfo/cmds.c:1014
+#: makeinfo/cmds.c:1414
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "@sp vy¾aduje kladný èíselný argument a ne `%s'"
 
-#: makeinfo/cmds.c:1348 makeinfo/cmds.c:1374 makeinfo/footnote.c:81
+#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "©patný argument pro %c%s"
 
-#: makeinfo/cmds.c:1358 makeinfo/makeinfo.c:4140
+#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
 msgid "asis"
 msgstr "asis"
 
-#: makeinfo/cmds.c:1360 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
 msgid "none"
 msgstr "none"
 
-#: makeinfo/defun.c:85
+#: makeinfo/cmds.c:1789
+#, fuzzy, c-format
+msgid "Bad argument to @%s"
+msgstr "©patný argument pro %c%s"
+
+#: makeinfo/cmds.c:1803
+msgid "insert"
+msgstr ""
+
+#: makeinfo/defun.c:84
 msgid "Missing `}' in @def arg"
 msgstr "Chybìjící `}' v argumentu @def"
 
-#: makeinfo/defun.c:363
+#: makeinfo/defun.c:403
 msgid "Function"
 msgstr "Funkce"
 
-#: makeinfo/defun.c:366
+#: makeinfo/defun.c:406
 msgid "Macro"
 msgstr "Makro"
 
-#: makeinfo/defun.c:369
+#: makeinfo/defun.c:409
 msgid "Special Form"
 msgstr "Speciální forma"
 
-#: makeinfo/defun.c:373
+#: makeinfo/defun.c:413
 msgid "Variable"
 msgstr "Promìnná"
 
-#: makeinfo/defun.c:376
+#: makeinfo/defun.c:416
 msgid "User Option"
 msgstr "U¾ivatelská volba"
 
-#: makeinfo/defun.c:380
+#: makeinfo/defun.c:420
 msgid "Instance Variable"
 msgstr "Instance promìnné"
 
-#: makeinfo/defun.c:384
+#: makeinfo/defun.c:424
 msgid "Method"
 msgstr "Metoda"
 
-#: makeinfo/defun.c:466 makeinfo/defun.c:470 makeinfo/defun.c:615
-#: makeinfo/defun.c:631 makeinfo/defun.c:671
+#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
+#: makeinfo/defun.c:644 makeinfo/xml.c:2229
 msgid "of"
 msgstr "z"
 
-#: makeinfo/defun.c:474 makeinfo/defun.c:478 makeinfo/defun.c:482
-#: makeinfo/defun.c:624 makeinfo/defun.c:676
+#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
 msgid "on"
 msgstr ""
 
-#: makeinfo/defun.c:717
+#: makeinfo/defun.c:711
 #, c-format
-msgid "Must be in `%s' insertion to use `%sx'"
+msgid "Must be in `@%s' environment to use `@%s'"
 msgstr ""
 
-#: makeinfo/files.c:448
+#: makeinfo/files.c:435
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr "%s: getwd: %s, %s\n"
 
+#: makeinfo/files.c:638
+#, c-format
+msgid "`%s' omitted before output filename"
+msgstr ""
+
+#: makeinfo/files.c:646
+#, c-format
+msgid "`%s' omitted since writing to stdout"
+msgstr ""
+
+#: makeinfo/files.c:694
+msgid "Output buffer not empty."
+msgstr ""
+
 #: makeinfo/footnote.c:150
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
@@ -1893,234 +1954,281 @@ msgstr "Poznámka pod èarou definována bez rodièovského uzlu"
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "Poznámka pod èarou definována bez rodièovského uzlu"
 
-#: makeinfo/footnote.c:298
+#: makeinfo/footnote.c:302 makeinfo/index.c:189
 msgid "Footnotes"
 msgstr "Poznámky pod èarou"
 
-#: makeinfo/html.c:42
+#: makeinfo/html.c:87
+#, c-format
+msgid "%s: could not open --css-file: %s"
+msgstr ""
+
+#: makeinfo/html.c:172
+#, c-format
+msgid "%s:%d: --css-file ended in comment"
+msgstr ""
+
+#: makeinfo/html.c:207
 msgid "Untitled"
 msgstr "Neoznaèeno"
 
-#: makeinfo/html.c:298
-#, c-format
-msgid "Invalid node name: `%s'"
+#: makeinfo/html.c:422
+msgid "[unexpected] no html tag to pop"
 msgstr ""
 
-#: makeinfo/index.c:213
+#: makeinfo/html.c:752
+#, fuzzy, c-format
+msgid "[unexpected] invalid node name: `%s'"
+msgstr "%s: neznámý pøepínaè `--%s'\n"
+
+#: makeinfo/index.c:169
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "Neznámý rejstøík `%s'"
 
-#: makeinfo/index.c:238
+#: makeinfo/index.c:234
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr ""
 
-#: makeinfo/index.c:396
+#: makeinfo/index.c:412
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "Rejstøík `%s' ji¾ existuje"
 
-#: makeinfo/index.c:439
+#: makeinfo/index.c:455
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "Neznámý rejstøík `%s' a/nebo `%s' v @synindex"
 
-#: makeinfo/index.c:666
+#: makeinfo/index.c:661
+msgid "(line )"
+msgstr ""
+
+#: makeinfo/index.c:669
+#, c-format
+msgid "(line %*d)"
+msgstr ""
+
+#: makeinfo/index.c:750
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "Neznámý rejstøík `%s' v @printindex"
 
-#: makeinfo/index.c:709
+#: makeinfo/index.c:819
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "Polo¾ka pro rejstøík `%s' je mimo v¹echny uzly"
 
-#: makeinfo/index.c:712 makeinfo/index.c:751
+#: makeinfo/index.c:822 makeinfo/index.c:858
 msgid "(outside of any node)"
 msgstr "(mimo v¹echny uzly)"
 
-#: makeinfo/insertion.c:198
+#: makeinfo/index.c:919 makeinfo/index.c:925
+msgid "See "
+msgstr "Viz"
+
+#: makeinfo/insertion.c:160
+msgid "@item not allowed in argument to @itemize"
+msgstr ""
+
+#: makeinfo/insertion.c:238
 msgid "Broken-Type in insertion_type_pname"
 msgstr "Chybný typ v insertion_type_pname"
 
-#: makeinfo/insertion.c:271
+#: makeinfo/insertion.c:334
 msgid "Enumeration stack overflow"
 msgstr "Výpoèetní zásobník pøetekl"
 
-#: makeinfo/insertion.c:303
+#: makeinfo/insertion.c:366
 #, c-format
 msgid "lettering overflow, restarting at %c"
 msgstr "písmenkování pøeteklo, znovu zaèínám na %c"
 
-#: makeinfo/insertion.c:538
+#: makeinfo/insertion.c:631
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
 msgstr "%s vy¾aduje argument : formátovaè pro %citem"
 
-#: makeinfo/insertion.c:693
+#: makeinfo/insertion.c:719
+#, c-format
+msgid "%cfloat environments cannot be nested"
+msgstr ""
+
+#: makeinfo/insertion.c:973
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
 msgstr "`@end' vy¾aduje `%s', ale vidí `%s'"
 
-#: makeinfo/insertion.c:931
+#: makeinfo/insertion.c:1337
 #, c-format
 msgid "No matching `%cend %s'"
 msgstr "Chybí odpovídající `%cend %s'"
 
-#: makeinfo/insertion.c:1084
+#: makeinfo/insertion.c:1592
 #, c-format
 msgid "%s requires letter or digit"
 msgstr "%s vy¾aduje písmeno nebo èíslici"
 
-#: makeinfo/insertion.c:1158
+#: makeinfo/insertion.c:1687
 msgid "end of file inside verbatim block"
 msgstr ""
 
-#: makeinfo/insertion.c:1318
+#: makeinfo/insertion.c:1913
+#, fuzzy, c-format
+msgid "@%s not meaningful outside `@float' environment"
+msgstr "@%s není myslitelné uvnitø `@%s' bloku"
+
+#: makeinfo/insertion.c:1949
 msgid "@menu seen before first @node, creating `Top' node"
 msgstr "@menu spatøeno pøed prvním @node, vytvoøen uzel `Top'"
 
-#: makeinfo/insertion.c:1319
+#: makeinfo/insertion.c:1950
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr ""
 "proto¾e vá¹ uzel @top by mìl být uzavøen v @ifnottex spí¹e ne¾ v @ifinfo?"
 
-#: makeinfo/insertion.c:1331
+#: makeinfo/insertion.c:1962
 msgid "@detailmenu seen before first node, creating `Top' node"
 msgstr "@detailmenu spatøeno pøed prvním uzlem, vytvoøen uzel `Top'"
 
-#: makeinfo/insertion.c:1346
+#: makeinfo/insertion.c:2018
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr ""
+
+#: makeinfo/insertion.c:2032
+#, fuzzy, c-format
+msgid "@%s not meaningful outside `@titlepage' environment"
+msgstr "@%s není myslitelné uvnitø `@%s' bloku"
+
+#: makeinfo/insertion.c:2063
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr "Nepárový `%c%s'"
 
-#: makeinfo/insertion.c:1353
+#: makeinfo/insertion.c:2068
 #, c-format
 msgid "`%c%s' needs something after it"
 msgstr "`%c%s' potøebuje nìjaký argument"
 
-#: makeinfo/insertion.c:1359
-#, c-format
-msgid "Bad argument to `%s', `%s', using `%s'"
+#: makeinfo/insertion.c:2074
+#, fuzzy, c-format
+msgid "Bad argument `%s' to `@%s', using `%s'"
 msgstr "Chybný argument pro `%s', `%s', pou¾ívám `%s'"
 
-#: makeinfo/insertion.c:1453
+#: makeinfo/insertion.c:2171
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
 msgstr "@%s není myslitelné uvnitø `@%s' bloku"
 
-#: makeinfo/insertion.c:1462
+#: makeinfo/insertion.c:2180
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "@itemx není myslitelný uvnitø `%s' bloku"
 
-#: makeinfo/insertion.c:1646
+#: makeinfo/insertion.c:2356
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "%c%s nalezen mimo vkládaný blok"
 
-#: makeinfo/lang.c:331
+#: makeinfo/lang.c:580
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "%s není platný kód jazyka (podle ISO 639)"
 
-#: makeinfo/lang.c:384
+#: makeinfo/lang.c:655
 #, fuzzy, c-format
-msgid "unrecogized encoding name `%s'"
+msgid "unrecognized encoding name `%s'"
 msgstr "%s: neznámý pøepínaè `--%s'\n"
 
-#: makeinfo/lang.c:387
+#: makeinfo/lang.c:663
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr ""
 
-#: makeinfo/lang.c:414
+#: makeinfo/lang.c:715
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr ""
 
-#: makeinfo/lang.c:502
-#, fuzzy, c-format
-msgid "%s is an invalid ISO code, using %c"
-msgstr "%s není platný kód jazyka (podle ISO 639)"
-
-#: makeinfo/lang.c:687
+#: makeinfo/lang.c:1009
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "%c%s vy¾aduje `i' nebo `j' jako argument, ne `%c'"
 
-#: makeinfo/lang.c:691
+#: makeinfo/lang.c:1013
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr "%c%s vy¾aduje jeden znak `i' nebo `j' jako argument"
 
-#: makeinfo/macro.c:134
+#: makeinfo/macro.c:128
 #, c-format
 msgid "macro `%s' previously defined"
 msgstr "makro `%s' ji¾ bylo definováno"
 
-#: makeinfo/macro.c:138
+#: makeinfo/macro.c:132
 #, c-format
 msgid "here is the previous definition of `%s'"
 msgstr "zde je pøedchozí definice `%s'"
 
 #: makeinfo/macro.c:355
-#, c-format
-msgid "\\ in macro expansion followed by `%s' instead of \\ or parameter name"
+#, fuzzy, c-format
+msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr "\\ pøi expanzi makra následováno `%s' místo \\ nebo jména parametru"
 
-#: makeinfo/macro.c:403
+#: makeinfo/macro.c:401
 #, c-format
 msgid "Macro `%s' called on line %d with too many args"
 msgstr "Makro `%s' volané na øádku %d s pøíli¹ mnoha argumenty"
 
-#: makeinfo/macro.c:594
+#: makeinfo/macro.c:586
 #, c-format
 msgid "%cend macro not found"
 msgstr "%cend makro nebylo nalezeno"
 
-#: makeinfo/macro.c:632
+#: makeinfo/macro.c:624
 msgid "@quote-arg only useful for single-argument macros"
 msgstr "@quote-arg je u¾iteèné pouze pro jedno-argumentová makra"
 
-#: makeinfo/macro.c:668
+#: makeinfo/macro.c:660
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "pomíchané @end %s s @%s"
 
-#: makeinfo/makeinfo.c:316
+#: makeinfo/makeinfo.c:184
 #, c-format
-msgid "%s:%d: warning: "
-msgstr "%s:%d: varování: "
-
-#: makeinfo/makeinfo.c:339
 msgid "Too many errors!  Gave up.\n"
 msgstr "Pøíli¹ mnoho chyb!  Konec.\n"
 
-#: makeinfo/makeinfo.c:350 makeinfo/makeinfo.c:2026
+#: makeinfo/makeinfo.c:302
+#, c-format
+msgid "%s:%d: warning: "
+msgstr "%s:%d: varování: "
+
+#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
 #, c-format
 msgid "Misplaced %c"
 msgstr "©patnì umístìný znak %c"
 
-#: makeinfo/makeinfo.c:370
+#: makeinfo/makeinfo.c:340
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Více informací získáte pøíkazem `%s --help'.\n"
 
-#: makeinfo/makeinfo.c:373
+#: makeinfo/makeinfo.c:343
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Pou¾ití: %s [PØEPÍNAÈ]... SOUBOR...\n"
 
-#: makeinfo/makeinfo.c:376
+#: makeinfo/makeinfo.c:346
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:380
+#: makeinfo/makeinfo.c:350
 #, c-format
 msgid ""
 "General options:\n"
@@ -2135,16 +2243,17 @@ msgid ""
 "      --version               display version information and exit.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:394
+#: makeinfo/makeinfo.c:364
 #, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output DocBook rather than Info.\n"
+"      --docbook             output Docbook XML rather than Info.\n"
 "      --html                output HTML rather than Info.\n"
-"      --xml                 output XML (TexinfoML) rather than Info.\n"
+"      --xml                 output Texinfo XML rather than Info.\n"
+"      --plaintext           output plain text rather than Info.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:401
+#: makeinfo/makeinfo.c:372
 msgid ""
 "General output options:\n"
 "  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
@@ -2160,7 +2269,7 @@ msgid ""
 "  -o, --output=FILE         output to FILE (directory if split HTML),\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:386
 #, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2179,44 +2288,69 @@ msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d).\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:433
+#: makeinfo/makeinfo.c:403
+msgid ""
+"Options for HTML:\n"
+"      --css-include=FILE        include FILE in HTML <style> output;\n"
+"                                  read stdin if FILE is -.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:409
+#, c-format
+msgid ""
+"Options for XML and Docbook:\n"
+"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"d).\n"
+"                                  If VAL is 0, ignorable whitespace is "
+"dropped.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:416
 msgid ""
 "Input file options:\n"
-"      --commands-in-node-names   allow @ commands in node names.\n"
-"  -D VAR                         define the variable VAR, as with @set.\n"
-"  -I DIR                         append DIR to the @include search path.\n"
-"  -P DIR                         prepend DIR to the @include search path.\n"
-"  -U VAR                         undefine the variable VAR, as with @clear.\n"
+"      --commands-in-node-names  allow @ commands in node names.\n"
+"  -D VAR                        define the variable VAR, as with @set.\n"
+"  -I DIR                        append DIR to the @include search path.\n"
+"  -P DIR                        prepend DIR to the @include search path.\n"
+"  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:442
+#: makeinfo/makeinfo.c:425
 msgid ""
 "Conditional processing in input:\n"
+"  --ifdocbook       process @ifdocbook and @docbook even if\n"
+"                      not generating Docbook.\n"
 "  --ifhtml          process @ifhtml and @html even if not generating HTML.\n"
 "  --ifinfo          process @ifinfo even if not generating Info.\n"
 "  --ifplaintext     process @ifplaintext even if not generating plain text.\n"
 "  --iftex           process @iftex and @tex; implies --no-split.\n"
+"  --ifxml           process @ifxml and @xml.\n"
+"  --no-ifdocbook    do not process @ifdocbook and @docbook text.\n"
 "  --no-ifhtml       do not process @ifhtml and @html text.\n"
 "  --no-ifinfo       do not process @ifinfo text.\n"
 "  --no-ifplaintext  do not process @ifplaintext text.\n"
 "  --no-iftex        do not process @iftex and @tex text.\n"
+"  --no-ifxml        do not process @ifxml and @xml text.\n"
+"\n"
+"  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:454
+#: makeinfo/makeinfo.c:444
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating HTML, --ifhtml is on and the others are off;\n"
 "  if generating Info, --ifinfo is on and the others are off;\n"
 "  if generating plain text, --ifplaintext is on and the others are off;\n"
+"  if generating XML, --ifxml is on and the others are off.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:461
+#: makeinfo/makeinfo.c:452
 #, fuzzy
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                     write Info to foo's @setfilename\n"
 "  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write XML to @setfilename\n"
+"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
 "  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
 "  makeinfo --no-headers foo.texi        write plain text to standard output\n"
 "\n"
@@ -2247,77 +2381,84 @@ msgstr ""
 "obecné otázky smìøujte na <help-texinfo@gnu.org>. Pøipomínky k pøekladu\n"
 "zasílejte na <cs@li.org> (èesky)."
 
-#: makeinfo/makeinfo.c:570 makeinfo/makeinfo.c:593 makeinfo/makeinfo.c:655
-#: makeinfo/makeinfo.c:676
+#: makeinfo/makeinfo.c:603
+#, c-format
+msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
+#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr "%s: %s argument musí být èíslo ne `%s'.\n"
 
-#: makeinfo/makeinfo.c:583
-#, c-format
-msgid "Couldn't open macro expansion output `%s'"
+#: makeinfo/makeinfo.c:660
+#, fuzzy, c-format
+msgid "%s: could not open macro expansion output `%s'"
 msgstr "Výstup %s pro expanzi makra nelze otevøít"
 
-#: makeinfo/makeinfo.c:586
-msgid "Cannot specify more than one macro expansion output"
-msgstr "Pro expanzi makra nelze zadat více ne¾ jeden výstup"
+#: makeinfo/makeinfo.c:665
+#, fuzzy, c-format
+msgid "%s: ignoring second macro expansion output `%s'.\n"
+msgstr "Výstup %s pro expanzi makra nelze otevøít"
 
-#: makeinfo/makeinfo.c:624
+#: makeinfo/makeinfo.c:707
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 "%s: argument pro --paragraph-indent musí být èíslo|`none'|`asis', ale ne `%"
 "s'.\n"
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 "%s: argument k --footnote-style musí být `separate'|`end', ale ne `%s'.\n"
 
-#: makeinfo/makeinfo.c:723
+#: makeinfo/makeinfo.c:806
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: chybí argument jména souboru.\n"
 
-#: makeinfo/makeinfo.c:898
+#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#, c-format
+msgid "Multiline command %c%s used improperly"
+msgstr ""
+
+#: makeinfo/makeinfo.c:1000
 #, c-format
 msgid "Expected `%s'"
 msgstr "Oèekáváno `%s'"
 
-#: makeinfo/makeinfo.c:1365
-msgid "File exists, but is not a directory"
-msgstr ""
-
-#: makeinfo/makeinfo.c:1366
+#: makeinfo/makeinfo.c:1479
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1414
+#: makeinfo/makeinfo.c:1525
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "Soubor `%s' nenalezen v `%s'"
 
-#: makeinfo/makeinfo.c:1496
+#: makeinfo/makeinfo.c:1605
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
 "%s: Vynechávám expanzi makra na stdout a expanze jde jako Info výstup.\n"
 
-#: makeinfo/makeinfo.c:1526
+#: makeinfo/makeinfo.c:1638
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "Vytváøím %s soubor `%s' ze souboru `%s'.\n"
 
-#: makeinfo/makeinfo.c:1561
+#: makeinfo/makeinfo.c:1673
 #, c-format
 msgid "This is %s, produced by makeinfo version %s from %s.\n"
 msgstr ""
 "Toto je Info soubor %s, produkován programem makeinfo verze %s ze souboru %"
 "s.\n"
 
-#: makeinfo/makeinfo.c:1583
+#: makeinfo/makeinfo.c:1709
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2325,327 +2466,319 @@ msgstr ""
 "%s: Výstupní soubor maker `%s' byl odstranìn, proto¾e byly nalezeny chyby;\n"
 "u¾ijte pøepínaè --force k ponechání souboru.\n"
 
-#: makeinfo/makeinfo.c:1627
+#: makeinfo/makeinfo.c:1773
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 "%s: Výstupní soubor `%s' byl odstranìn, proto¾e byly nalezeny chyby;\n"
 "u¾ijte pøepínaè --force k ponechání souboru.\n"
 
-#: makeinfo/makeinfo.c:1853
+#: makeinfo/makeinfo.c:2034
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "Neznámý pøíkaz `%s'"
 
-#: makeinfo/makeinfo.c:1875
+#: makeinfo/makeinfo.c:2056
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr "Pou¾ijte závorky k zadání pøíkazu jako argumentu @%s"
 
-#: makeinfo/makeinfo.c:2068
-#, c-format
-msgid "%c%s expected `{...}'"
+#: makeinfo/makeinfo.c:2314
+#, fuzzy, c-format
+msgid "%c%s expected braces"
 msgstr "%c%s oèekáváno `{...}'"
 
-#: makeinfo/makeinfo.c:2098
+#: makeinfo/makeinfo.c:2327
 msgid "Unmatched }"
 msgstr "Nepárová }"
 
-#: makeinfo/makeinfo.c:2148
+#: makeinfo/makeinfo.c:2375
 msgid "NO_NAME!"
 msgstr "Funkce neexistuje!"
 
-#: makeinfo/makeinfo.c:2169
+#: makeinfo/makeinfo.c:2396
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s chybìjící uzavírací závorka"
 
-#: makeinfo/makeinfo.c:2958
-msgid "First argument to cross-reference may not be empty"
-msgstr ""
-
-#: makeinfo/makeinfo.c:3018 makeinfo/makeinfo.c:3236 makeinfo/xml.c:1340
-msgid "see "
-msgstr "viz"
-
-#: makeinfo/makeinfo.c:3018
-msgid "See "
-msgstr "Viz"
-
-#: makeinfo/makeinfo.c:3164
-#, c-format
-msgid "`.' or `,' must follow cross reference, not %c"
-msgstr "`.' nebo `,' musí následovat za køí¾ovým odkazem, ale ne za %c"
-
-#: makeinfo/makeinfo.c:3212
-msgid "First argument to @inforef may not be empty"
-msgstr ""
-
-#: makeinfo/makeinfo.c:3427
+#: makeinfo/makeinfo.c:3309
 #, fuzzy, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "soubor `%s' v pøíkazu @image je neèitelný: %s"
 
-#: makeinfo/makeinfo.c:3440
+#: makeinfo/makeinfo.c:3315
 #, fuzzy, c-format
-msgid "No `%s.png' or `.jpg', and no extension supplied"
-msgstr "®ádný .png nebo .jpg soubor pro `%s'"
+msgid "No such file `%s'"
+msgstr "Soubor `%s' nenalezen v `%s'"
 
-#: makeinfo/makeinfo.c:3490
+#: makeinfo/makeinfo.c:3447
 #, fuzzy, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "soubor `%s' v pøíkazu @image je neèitelný: %s"
 
-#: makeinfo/makeinfo.c:3497
+#: makeinfo/makeinfo.c:3456
 msgid "@image missing filename argument"
 msgstr "pøíkaz @image postrádá jméno souboru"
 
-#: makeinfo/makeinfo.c:3690
+#: makeinfo/makeinfo.c:3675
+#, c-format
+msgid "undefined flag: %s"
+msgstr ""
+
+#: makeinfo/makeinfo.c:3676
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{Pro `%s' není hodnota}"
 
-#: makeinfo/makeinfo.c:3744
+#: makeinfo/makeinfo.c:3728
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s po¾aduje jméno"
 
-#: makeinfo/makeinfo.c:3850
+#: makeinfo/makeinfo.c:3834
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "Vstupní soubor skonèil a pøíkaz `@end %s' nebyl nalezen"
 
-#: makeinfo/makeinfo.c:4081
+#: makeinfo/makeinfo.c:4082
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr ""
 
-#: makeinfo/multi.c:226
+#: makeinfo/multi.c:116
 msgid "Missing } in @multitable template"
 msgstr "Chybìjící } v @multitable vzoru"
 
-#: makeinfo/multi.c:302
+#: makeinfo/multi.c:254
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "ignoruji zbloudilý text `%s' po pøíkazu @multitable"
 
-#: makeinfo/multi.c:375
+#: makeinfo/multi.c:393
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "Pøíli¹ mnoho sloupcù v multitabulkové polo¾ce (max %d)"
 
-#: makeinfo/multi.c:426
-#, c-format
-msgid "Cannot select column #%d in multitable"
+#: makeinfo/multi.c:555
+#, fuzzy, c-format
+msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "sloupec #%d v multitabulce nelze vybrat"
 
-#: makeinfo/multi.c:529
+#: makeinfo/multi.c:584
 msgid "ignoring @tab outside of multitable"
 msgstr "pøíkaz `@tab' ignorován, je mimo multitabulku"
 
-#: makeinfo/multi.c:565
+#: makeinfo/multi.c:632
+#, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** Vícesloupcový výstup z posledního øádku:\n"
 
-#: makeinfo/multi.c:568
+#: makeinfo/multi.c:635
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* sloupec #%d: výstup = %s\n"
 
-#: makeinfo/node.c:276
+#: makeinfo/node.c:280
 #, c-format
 msgid "Node `%s' previously defined at line %d"
 msgstr "Uzel `%s' ji¾ byl definován na øádku %d"
 
-#: makeinfo/node.c:594
+#: makeinfo/node.c:648
 #, c-format
 msgid "Formatting node %s...\n"
 msgstr "Formátování uzlu %s...\n"
 
-#: makeinfo/node.c:655
-#, c-format
-msgid "Node `%s' requires a sectioning command (e.g. %c%s)"
+#: makeinfo/node.c:716
+#, fuzzy, c-format
+msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
 msgstr "Uzel `%s' vy¾aduje pøíkaz na vytváøení sekcí (tøeba %c%s)"
 
-#: makeinfo/node.c:815
+#: makeinfo/node.c:879
 #, c-format
 msgid "No node name specified for `%c%s' command"
 msgstr "Pøíkazu `%c%s' nebyl zadán název uzlu"
 
-#: makeinfo/node.c:856 makeinfo/node.c:1075
+#: makeinfo/node.c:920 makeinfo/node.c:1151
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr ""
 
-#: makeinfo/node.c:859
+#: makeinfo/node.c:923
 msgid "This @anchor command ignored; references to it will not work"
 msgstr ""
 
-#: makeinfo/node.c:861 makeinfo/node.c:1078
+#: makeinfo/node.c:925 makeinfo/node.c:1154
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr ""
 
-#: makeinfo/node.c:891
+#: makeinfo/node.c:955
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
 msgstr ""
 
-#: makeinfo/node.c:920
-msgid "Node:"
-msgstr "Uzel:"
-
-#: makeinfo/node.c:930
+#: makeinfo/node.c:991
 msgid "Next:"
 msgstr "Dal¹í:"
 
-#: makeinfo/node.c:940
+#: makeinfo/node.c:1007
 msgid "Previous:"
 msgstr "Pøedchozí:"
 
-#: makeinfo/node.c:950
+#: makeinfo/node.c:1021
 msgid "Up:"
 msgstr "Nahoru:"
 
-#: makeinfo/node.c:1072
+#: makeinfo/node.c:1148
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr ""
 
-#: makeinfo/node.c:1077
+#: makeinfo/node.c:1153
 msgid "@anchor command ignored; references to it will not work"
 msgstr ""
 
-#: makeinfo/node.c:1277
-#, c-format
-msgid "%s reference to nonexistent node `%s'"
+#: makeinfo/node.c:1347
+#, fuzzy, c-format
+msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr "%s se odkazuje na neexistující uzel `%s'"
 
-#: makeinfo/node.c:1294
+#: makeinfo/node.c:1363
 msgid "Menu"
 msgstr "Menu"
 
-#: makeinfo/node.c:1296
+#: makeinfo/node.c:1365
 msgid "Cross"
 msgstr "Odkaz"
 
-#: makeinfo/node.c:1380
-#, c-format
-msgid "Next field of node `%s' not pointed to"
+#: makeinfo/node.c:1447
+#, fuzzy, c-format
+msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr "Následující uzel uzlu `%s' neukazuje na tento"
 
-#: makeinfo/node.c:1383
+#: makeinfo/node.c:1450
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "Tento uzel (%s) má chybný odkaz na pøedchozí uzel"
 
-#: makeinfo/node.c:1395
+#: makeinfo/node.c:1462
 msgid "Prev"
 msgstr "Pøedchozí"
 
-#: makeinfo/node.c:1438
+#: makeinfo/node.c:1505
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "Pøedchozí uzel uzlu `%s' neukazuje na tento"
 
-#: makeinfo/node.c:1442
+#: makeinfo/node.c:1509
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "Tento uzel (%s) má chybný odkaz na následující uzel"
 
-#: makeinfo/node.c:1454
+#: makeinfo/node.c:1521
 #, c-format
-msgid "`%s' has no Up field"
-msgstr "`%s' nemá zadán vy¹¹í uzel"
+msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
+msgstr ""
 
-#: makeinfo/node.c:1457
+#: makeinfo/node.c:1524
 msgid "Up"
 msgstr "Nahoru"
 
-#: makeinfo/node.c:1523
+#: makeinfo/node.c:1590
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr ""
 "Uzel `%s' postrádá polo¾ku menu pro `%s' navzdory tomu, ¾e je jeho vy¹¹ím "
 "uzlem"
 
-#: makeinfo/node.c:1552
+#: makeinfo/node.c:1619
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr "na uzel `%s' se bylo odkazováno %d krát"
 
-#: makeinfo/node.c:1566
+#: makeinfo/node.c:1633
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "uzel `%s' - nesmìøuje na nìj ¾ádný odkaz"
 
-#: makeinfo/sectioning.c:117
+#: makeinfo/node.c:1723
 #, c-format
-msgid "Appendix %c "
+msgid "Removing %s\n"
+msgstr ""
+
+#: makeinfo/node.c:1727
+#, fuzzy, c-format
+msgid "Can't remove file `%s': %s"
+msgstr "Výstupní soubor `%s' nelze vytvoøit."
+
+#: makeinfo/sectioning.c:122
+#, fuzzy, c-format
+msgid "Appendix %c"
 msgstr "Dodatek %c "
 
-#: makeinfo/sectioning.c:356 makeinfo/sectioning.c:444
+#: makeinfo/sectioning.c:467
+#, fuzzy, c-format
+msgid "Internal error (search_sectioning) `%s'!"
+msgstr "Interní chyba (hledání sekcí) \"%s\"!"
+
+#: makeinfo/sectioning.c:562
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
 msgstr "Interní chyba (hledání sekcí) \"%s\"!"
 
-#: makeinfo/sectioning.c:502
+#: makeinfo/sectioning.c:623
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr "%c%s je zastaralý; pou¾ijte %c%s"
 
-#: makeinfo/sectioning.c:518
+#: makeinfo/sectioning.c:639
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr "Uzel s %ctop jako sekcí ji¾ existuje"
 
-#: makeinfo/sectioning.c:526
+#: makeinfo/sectioning.c:647
 #, c-format
 msgid "Here is the %ctop node"
 msgstr "Ji¾ zde je nejvy¹¹í (%ctop) uzel"
 
-#: makeinfo/sectioning.c:543
+#: makeinfo/sectioning.c:663
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr "%ctop je pou¾it pøed %cnode, pøesmìrováno na %s"
 
-#: makeinfo/toc.c:221 makeinfo/toc.c:298 makeinfo/toc.c:299
+#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
 msgid "Table of Contents"
 msgstr "Obsah"
 
-#: makeinfo/toc.c:330 makeinfo/toc.c:366 makeinfo/toc.c:367
+#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
 msgid "Short Contents"
 msgstr "Krátký obsah"
 
-#: makeinfo/toc.c:406
-#, c-format
-msgid "%s: TOC should be here, but it was not found"
-msgstr "%s: Obsah bìl být zde, ale nebyl nalezen"
-
-#: makeinfo/xml.c:1108
+#: makeinfo/xml.c:1605
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "soubor `%s' v pøíkazu @image je neèitelný: %s"
 
-#: util/install-info.c:151
+#: makeinfo/xml.c:2097
+msgid ""
+"@headitem as the last item of @multitable produces invalid Docbook documents"
+msgstr ""
+
+#: util/install-info.c:154
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: varování: "
 
-#: util/install-info.c:176 util/install-info.c:189
-msgid "virtual memory exhausted"
-msgstr "virtuální pamì» vyèerpána"
-
-#: util/install-info.c:232
+#: util/install-info.c:203
 #, c-format
 msgid " for %s"
 msgstr " pro %s"
 
-#: util/install-info.c:381
+#: util/install-info.c:426
 #, c-format
 msgid "\tTry `%s --help' for a complete list of options.\n"
 msgstr "Více informací získáte pøíkazem `%s --help'.\n"
 
-#: util/install-info.c:389
+#: util/install-info.c:434
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
@@ -2717,8 +2850,8 @@ msgstr ""
 "obecné otázky smìøujte na <help-texinfo@gnu.org>. Pøipomínky\n"
 "k pøekladu zasílejte na <cs@li.org> (èesky).\n"
 
-#: util/install-info.c:444
-#, c-format
+#: util/install-info.c:488
+#, fuzzy, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
 "topmost node of the Info hierarchy, called (dir)Top.\n"
@@ -2734,7 +2867,7 @@ msgid ""
 "  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
 "  to select it.\n"
 "\n"
-"* Menu:\n"
+"%s\n"
 msgstr ""
 "  Toto je soubor .../info/dir, který obsahuje nejvy¹¹í uzly hierarchie\n"
 "Info dokumentù a je nazýván (dir)Top. Kdy¾ poprvé spustíte Info dostanete\n"
@@ -2755,99 +2888,101 @@ msgstr ""
 "\n"
 "* Menu:\n"
 
-#: util/install-info.c:467
+#: util/install-info.c:513
 #, c-format
 msgid "%s: could not read (%s) and could not create (%s)\n"
 msgstr "%s: %s nelze èíst a %s nelze vytvoøit\n"
 
-#: util/install-info.c:551
+#: util/install-info.c:600
 #, c-format
 msgid "%s: empty file"
 msgstr "%s: prázdný soubor"
 
-#: util/install-info.c:866 util/install-info.c:906
+#: util/install-info.c:913 util/install-info.c:953
 msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
 msgstr "START-INFO-DIR-ENTRY bez odpovídajícího END-INFO-DIR-ENTRY"
 
-#: util/install-info.c:901
+#: util/install-info.c:948
 msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
 msgstr "END-INFO-DIR-ENTRY bez pøedchozího START-INFO-DIR-ENTRY"
 
-#: util/install-info.c:1150 util/install-info.c:1160
+#: util/install-info.c:1191 util/install-info.c:1201
 #, c-format
-msgid "%s: Specify the Info directory only once.\n"
-msgstr "%s: Info adresáø zadejte pouze jednou.\n"
+msgid "%s: already have dir file: %s\n"
+msgstr ""
 
-#: util/install-info.c:1195
+#: util/install-info.c:1236
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr "%s: Info soubor zadejte pouze jednou.\n"
 
-#: util/install-info.c:1244
+#: util/install-info.c:1284
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr "nadbyteèný argument `%s' v pøíkazovém øádku"
 
-#: util/install-info.c:1248
+#: util/install-info.c:1288
 msgid "No input file specified; try --help for more information."
 msgstr ""
 "Vstupní soubor nezadán; pou¾itím pøepínaèe --help získáte bli¾¹í informace."
 
-#: util/install-info.c:1251
+#: util/install-info.c:1291
 msgid "No dir file specified; try --help for more information."
 msgstr ""
 "Adresáø nebyl zadán; pou¾itím pøepínaèe `--help' získáte bli¾¹í informace"
 
-#: util/install-info.c:1273
+#: util/install-info.c:1313
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr "v Info adresáøi `%s' není ¾ádná polo¾ka"
 
-#: util/install-info.c:1388
+#: util/install-info.c:1426
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr "polo¾ka menu `%s' ji¾ pro soubor `%s' existuje"
 
-#: util/install-info.c:1411
+#: util/install-info.c:1449
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr "pro `%s' nebyly nalezeny ¾ádné polo¾ky"
 
-#: util/texindex.c:245
+#: util/texindex.c:252
 msgid "display this help and exit"
 msgstr "vypí¹e tuto nápovìdu a skonèí"
 
-#: util/texindex.c:247
+#: util/texindex.c:254
 msgid "keep temporary files around after processing"
 msgstr "zanechá doèasné soubory po ukonèení"
 
-#: util/texindex.c:249
+#: util/texindex.c:256
 msgid "do not keep temporary files around after processing (default)"
 msgstr "nezanechá doèasné soubory po ukonèení"
 
-#: util/texindex.c:251
+#: util/texindex.c:258
 msgid "send output to FILE"
 msgstr "zapí¹e výstup do SOUBORu"
 
-#: util/texindex.c:253
+#: util/texindex.c:260
 msgid "display version information and exit"
 msgstr "vypí¹e oznaèení verze a skonèí"
 
-#: util/texindex.c:264
+#: util/texindex.c:270
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Pou¾ití: %s [PØEPÍNAÈ]... SOUBOR...\n"
 
-#: util/texindex.c:265
+#: util/texindex.c:271
+#, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr "Generuje seøazený rejstøík pro ka¾dý TeXovský výstupní SOUBOR.\n"
 
-#: util/texindex.c:268
+#: util/texindex.c:274
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr "SOUBOR... je obvykle `foo.%c%c' pro dokument `foo.texi'.\n"
 
-#: util/texindex.c:270
+#: util/texindex.c:276
+#, c-format
 msgid ""
 "\n"
 "Options:\n"
@@ -2855,31 +2990,72 @@ msgstr ""
 "\n"
 "Pøepínaèe:\n"
 
-#: util/texindex.c:887 util/texindex.c:921 util/texindex.c:997
-#: util/texindex.c:1025
+#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
+#: util/texindex.c:1011
 #, c-format
 msgid "%s: not a texinfo index file"
 msgstr "%s: není texinfovský rejstøík"
 
-#: util/texindex.c:982
+#: util/texindex.c:968
 #, c-format
 msgid "failure reopening %s"
 msgstr "soubor %s nepovedlo se znovu otevøít"
 
-#: util/texindex.c:1224
+#: util/texindex.c:1218
 #, c-format
 msgid "No page number in %s"
 msgstr "Na %s není èíslo stránky"
 
-#: util/texindex.c:1295
+#: util/texindex.c:1291
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "polo¾ka %s následuje za polo¾kou se sekundárním jménem"
 
-#: util/texindex.c:1633
-#, c-format
-msgid "%s; for file `%s'.\n"
-msgstr "%s; pro soubor `%s'.\n"
+#~ msgid "%s: Specify the Info directory only once.\n"
+#~ msgstr "%s: Info adresáø zadejte pouze jednou.\n"
+
+#~ msgid "\"\" is invalid"
+#~ msgstr "Sekvence kláves \"\" je neplatná"
+
+#, fuzzy
+#~ msgid "%s is an invalid ISO code, using %c"
+#~ msgstr "%s není platný kód jazyka (podle ISO 639)"
+
+#~ msgid "Cannot specify more than one macro expansion output"
+#~ msgstr "Pro expanzi makra nelze zadat více ne¾ jeden výstup"
+
+#~ msgid "see "
+#~ msgstr "viz"
+
+#~ msgid "`.' or `,' must follow cross reference, not %c"
+#~ msgstr "`.' nebo `,' musí následovat za køí¾ovým odkazem, ale ne za %c"
+
+#~ msgid "Node:"
+#~ msgstr "Uzel:"
+
+#~ msgid "%s: TOC should be here, but it was not found"
+#~ msgstr "%s: Obsah bìl být zde, ale nebyl nalezen"
+
+#~ msgid "virtual memory exhausted"
+#~ msgstr "virtuální pamì» vyèerpána"
+
+#, fuzzy
+#~ msgid "No `%s.png' or `.jpg', and no extension supplied"
+#~ msgstr "®ádný .png nebo .jpg soubor pro `%s'"
+
+#~ msgid "%s; for file `%s'.\n"
+#~ msgstr "%s; pro soubor `%s'.\n"
+
+#~ msgid "`%s' has no Up field"
+#~ msgstr "`%s' nemá zadán vy¹¹í uzel"
+
+#, fuzzy
+#~ msgid "\\%-10[scroll-forward]  Scroll forward 1 line.\n"
+#~ msgstr "  %-10s  Posun o jeden øádek dopøedu.\n"
+
+#, fuzzy
+#~ msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
+#~ msgstr "  %-10s  Posun o jeden øádek dozadu.\n"
 
 #, fuzzy
 #~ msgid ""
diff --git a/gnu/usr.bin/texinfo/po/da.gmo b/gnu/usr.bin/texinfo/po/da.gmo
index 850f0216189..55e147567a4 100644
--- a/gnu/usr.bin/texinfo/po/da.gmo
+++ b/gnu/usr.bin/texinfo/po/da.gmo
diff --git a/gnu/usr.bin/texinfo/po/da.po b/gnu/usr.bin/texinfo/po/da.po
index 929fa97118b..1b5524a8bc1 100644
--- a/gnu/usr.bin/texinfo/po/da.po
+++ b/gnu/usr.bin/texinfo/po/da.po
@@ -4,142 +4,143 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: texinfo 4.1c\n"
-"POT-Creation-Date: 2002-04-01 06:10-0800\n"
-"PO-Revision-Date: 2002-03-25 11:57GMT\n"
+"Project-Id-Version: texinfo 4.2e\n"
+"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
+"POT-Creation-Date: 2004-12-21 16:20-0800\n"
+"PO-Revision-Date: 2002-11-08 09:13GMT\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 0.9.5\n"
+"X-Generator: KBabel 0.9.6\n"
 
-#: info/echo-area.c:283 info/session.c:712
+#: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr "Gå et tegn frem"
 
-#: info/echo-area.c:295 info/session.c:728
+#: info/echo-area.c:296 info/session.c:705
 msgid "Move backward a character"
 msgstr "Gå et tegn tilbage"
 
-#: info/echo-area.c:307
+#: info/echo-area.c:308
 msgid "Move to the start of this line"
 msgstr "Gå til starten af linjen"
 
-#: info/echo-area.c:312
+#: info/echo-area.c:313
 msgid "Move to the end of this line"
 msgstr "Gå til slutning af linjen"
 
-#: info/echo-area.c:320 info/session.c:746
+#: info/echo-area.c:321 info/session.c:723
 msgid "Move forward a word"
 msgstr "Ryk et ord frem"
 
-#: info/echo-area.c:360 info/session.c:795
+#: info/echo-area.c:361 info/session.c:772
 msgid "Move backward a word"
 msgstr "Ryk et ord tilbage"
 
-#: info/echo-area.c:400
+#: info/echo-area.c:401
 msgid "Delete the character under the cursor"
 msgstr "Slet tegnet under markøren"
 
-#: info/echo-area.c:430
+#: info/echo-area.c:431
 msgid "Delete the character behind the cursor"
 msgstr "Slet tegnet efter markøren"
 
-#: info/echo-area.c:451
+#: info/echo-area.c:452
 msgid "Cancel or quit operation"
 msgstr "Afbryd eller afslut aktivitet"
 
-#: info/echo-area.c:466
+#: info/echo-area.c:467
 msgid "Accept (or force completion of) this line"
 msgstr "Acceptér (eller gennemtving afslutning af) linjen"
 
-#: info/echo-area.c:471
+#: info/echo-area.c:472
 msgid "Insert next character verbatim"
 msgstr "Indsæt næste tegn råt"
 
-#: info/echo-area.c:479
+#: info/echo-area.c:480
 msgid "Insert this character"
 msgstr "Indsæt dette tegn"
 
-#: info/echo-area.c:497
+#: info/echo-area.c:498
 msgid "Insert a TAB character"
 msgstr "Indsæt et tabulatortegn"
 
-#: info/echo-area.c:504
+#: info/echo-area.c:505
 msgid "Transpose characters at point"
 msgstr "Transponér tegn ved markør"
 
-#: info/echo-area.c:555
+#: info/echo-area.c:556
 msgid "Yank back the contents of the last kill"
 msgstr "Gendan indholdet fra sidste sletning"
 
-#: info/echo-area.c:562
+#: info/echo-area.c:563
 msgid "Kill ring is empty"
 msgstr "Skraldespand er tom"
 
-#: info/echo-area.c:575
+#: info/echo-area.c:576
 msgid "Yank back a previous kill"
 msgstr "Gendan en tidligere sletning"
 
-#: info/echo-area.c:608
+#: info/echo-area.c:609
 msgid "Kill to the end of the line"
 msgstr "Slet resten af linjen"
 
-#: info/echo-area.c:621
+#: info/echo-area.c:622
 msgid "Kill to the beginning of the line"
 msgstr "Slet bagud til linjestart"
 
-#: info/echo-area.c:633
+#: info/echo-area.c:634
 msgid "Kill the word following the cursor"
 msgstr "Slet resten af ordet"
 
-#: info/echo-area.c:652
+#: info/echo-area.c:653
 msgid "Kill the word preceding the cursor"
 msgstr "Slet ordet før markøren"
 
-#: info/echo-area.c:872 info/echo-area.c:932
+#: info/echo-area.c:868 info/echo-area.c:924
 msgid "No completions"
 msgstr "Ingen afslutninger"
 
-#: info/echo-area.c:874
+#: info/echo-area.c:870
 msgid "Not complete"
 msgstr "Ikke afsluttet"
 
-#: info/echo-area.c:919
+#: info/echo-area.c:911
 msgid "List possible completions"
 msgstr "Vis mulige afslutninger"
 
-#: info/echo-area.c:936
+#: info/echo-area.c:928
 msgid "Sole completion"
 msgstr "Eneste afslutning"
 
-#: info/echo-area.c:945
+#: info/echo-area.c:937
 msgid "One completion:\n"
 msgstr "Én afslutning:\n"
 
-#: info/echo-area.c:946
+#: info/echo-area.c:938
 #, c-format
 msgid "%d completions:\n"
 msgstr "%d afslutninger:\n"
 
-#: info/echo-area.c:1092
+#: info/echo-area.c:1085
 msgid "Insert completion"
 msgstr "Indsæt afslutning"
 
-#: info/echo-area.c:1225
+#: info/echo-area.c:1220
 msgid "Building completions..."
 msgstr "Opbygger afslutninger..."
 
-#: info/echo-area.c:1342
+#: info/echo-area.c:1340
 msgid "Scroll the completions window"
 msgstr "Rul afslutningsvinduet"
 
-#: info/footnotes.c:212
+#: info/footnotes.c:213
 msgid "Footnotes could not be displayed"
 msgstr "Fodnoter kunne ikke vises"
 
-#: info/footnotes.c:238
+#: info/footnotes.c:239
 msgid "Show the footnotes associated with this node in another window"
 msgstr "Vis fodnoter, det hører til dette emne i et andet vindue"
 
@@ -147,90 +148,90 @@ msgstr "Vis fodnoter, det hører til dette emne i et andet vindue"
 msgid "---------- Footnotes ----------"
 msgstr "---------- Fodnoter -----------"
 
-#: info/indices.c:175
+#: info/indices.c:172
 msgid "Look up a string in the index for this file"
 msgstr "Slå en tekst op i denne fils indeks."
 
-#: info/indices.c:205
+#: info/indices.c:199
 msgid "Finding index entries..."
 msgstr "Finder indeksindgange..."
 
-#: info/indices.c:212
+#: info/indices.c:207
 msgid "No indices found."
 msgstr "Fandt intet indeks."
 
-#: info/indices.c:222
+#: info/indices.c:217
 msgid "Index entry: "
 msgstr "Indeksindgang:"
 
-#: info/indices.c:332
+#: info/indices.c:325
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr "Gå til næste fundne indekspunkt fra sidste '\\[index-search]'-kommando"
 
-#: info/indices.c:342
+#: info/indices.c:335
 msgid "No previous index search string."
 msgstr "Ingen tidligere indeks søgetekst"
 
-#: info/indices.c:349
+#: info/indices.c:342
 msgid "No index entries."
 msgstr "Ingen indeksindgange."
 
-#: info/indices.c:382
-#, c-format
-msgid "No %sindex entries containing \"%s\"."
+#: info/indices.c:375
+#, fuzzy, c-format
+msgid "No %sindex entries containing `%s'."
 msgstr "Ingen %sindeksindgange indeholder \"%s\"."
 
-#: info/indices.c:383
+#: info/indices.c:376
 msgid "more "
 msgstr "mere "
 
-#: info/indices.c:393
+#: info/indices.c:386
 msgid "CAN'T SEE THIS"
 msgstr "KAN IKKE SE DETTE"
 
-#: info/indices.c:429
-#, c-format
-msgid "Found \"%s\" in %s. (`\\[next-index-match]' tries to find next.)"
+#: info/indices.c:422
+#, fuzzy, c-format
+msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
 msgstr "Fandt \"%s\" i %s. ('\\[next-index-match]' søger efter den næste.)"
 
-#: info/indices.c:549
-#, c-format
-msgid "Scanning indices of \"%s\"..."
+#: info/indices.c:541
+#, fuzzy, c-format
+msgid "Scanning indices of `%s'..."
 msgstr "Skimmer \"%s\"'s indekser..."
 
-#: info/indices.c:603
-#, c-format
-msgid "No available info files have \"%s\" in their indices."
+#: info/indices.c:596
+#, fuzzy, c-format
+msgid "No available info files have `%s' in their indices."
 msgstr "Ingen tilgængelige info-filer har \"%s\" i sit index."
 
-#: info/indices.c:632
+#: info/indices.c:622
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr ""
 "Gennemtrævl alle kendte Info-filers indekser for en tekst og opbyg en menu"
 
-#: info/indices.c:636
+#: info/indices.c:626
 msgid "Index apropos: "
 msgstr "Indeks apropos:"
 
-#: info/indices.c:666
-#, c-format
+#: info/indices.c:654
+#, fuzzy, c-format
 msgid ""
 "\n"
-"* Menu: Nodes whoses indices contain \"%s\":\n"
+"* Menu: Nodes whose indices contain `%s':\n"
 msgstr ""
 "\n"
 "* Menu: Emner, hvis indeks indeholder \"%s\":\n"
 
-#: info/info.c:260 info/infokey.c:884
+#: info/info.c:275 info/infokey.c:899
+#, c-format
 msgid "Try --help for more information.\n"
 msgstr "Prøv --help for mere information.\n"
 
-#: info/info.c:279 info/infokey.c:139 makeinfo/makeinfo.c:689
-#: util/install-info.c:1224 util/texindex.c:338
-#, c-format
+#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
+#: util/texindex.c:343
+#, 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"
@@ -240,17 +241,17 @@ msgstr ""
 "under GNU General Public License's betingelser.\n"
 "For mere information om dette, se filerne 'COPYING'.\n"
 
-#: info/info.c:462
+#: info/info.c:498
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "ingen indeksindgange blev fundet for '%s'\n"
 
-#: info/info.c:555
+#: info/info.c:590
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
 msgstr " -b, --speech-friendly        vær talesyntese-venlig.\n"
 
-#: info/info.c:562
-#, c-format
+#: info/info.c:597
+#, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
@@ -266,10 +267,12 @@ msgid ""
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
 "  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
-"  -R, --raw-escapes            don't remove ANSI escapes from man pages.\n"
+"  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+"      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
 "  -O, --show-options, --usage  go to command-line options node.\n"
 "%s      --subnodes               recursively output menu items.\n"
+"  -w, --where, --location      print physical location of Info file.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
 "\n"
@@ -322,8 +325,8 @@ msgstr ""
 "tilvalg\n"
 "  info -f ./xxx.info         vis filen ./xxx.info uden at søge i katalog\n"
 
-#: info/info.c:598 info/infokey.c:903 makeinfo/makeinfo.c:474
-#: util/install-info.c:421 util/texindex.c:286
+#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
+#: util/install-info.c:466 util/texindex.c:292
 msgid ""
 "\n"
 "Email bug reports to bug-texinfo@gnu.org,\n"
@@ -336,76 +339,76 @@ msgstr ""
 "oversættelsesfejl til claus_h@image.dk\n"
 "Texinfos hjemmeside: http://www.gnu.org/software/texinfo/"
 
-#: info/info.c:632
+#: info/info.c:669
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "Kan ikke finde emnet '%s'."
 
-#: info/info.c:633
+#: info/info.c:670
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "Kan ikke finde emnet '(%s)%s'."
 
-#: info/info.c:634
+#: info/info.c:671
 msgid "Cannot find a window!"
 msgstr "Kan ikke finde et vindue!"
 
-#: info/info.c:635
+#: info/info.c:672
 msgid "Point doesn't appear within this window's node!"
 msgstr "Punktet optræder ikke i dette vindues emne!"
 
-#: info/info.c:636
+#: info/info.c:673
 msgid "Cannot delete the last window."
 msgstr "Kan ikke slette det sidste vindue."
 
-#: info/info.c:637
+#: info/info.c:674
 msgid "No menu in this node."
 msgstr "Ingen menu i dette emne."
 
-#: info/info.c:638
+#: info/info.c:675
 msgid "No footnotes in this node."
 msgstr "Ingen fodnoter i dette emne."
 
-#: info/info.c:639
+#: info/info.c:676
 msgid "No cross references in this node."
 msgstr "Ingen krydsreferencer i dette emne."
 
-#: info/info.c:640
+#: info/info.c:677
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Ingen '%s'-peger mod dette emne."
 
-#: info/info.c:641
+#: info/info.c:678
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "Ukendt Info kommando '%c'; prøv '?' for hjælp."
 
-#: info/info.c:642
+#: info/info.c:679
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr "Info kan ikke køre på terminal type '%s'."
 
-#: info/info.c:643
+#: info/info.c:680
 msgid "You are already at the last page of this node."
 msgstr "Du er i forvejen ved emnets sidste side."
 
-#: info/info.c:644
+#: info/info.c:681
 msgid "You are already at the first page of this node."
 msgstr "Du er i forvejen ved emnets første side."
 
-#: info/info.c:645
+#: info/info.c:682
 msgid "Only one window."
 msgstr "Kun ét vindue."
 
-#: info/info.c:646
+#: info/info.c:683
 msgid "Resulting window would be too small."
 msgstr "Det resulterende vindue ville være for lille."
 
-#: info/info.c:647
+#: info/info.c:684
 msgid "Not enough room for a help window, please delete a window."
 msgstr "Ikke nok plads til et hjælpevindue. Fjern venligst et vindue."
 
-#: info/infodoc.c:45 info/infodoc.c:94
+#: info/infodoc.c:46 info/infodoc.c:95
 msgid ""
 "Basic Commands in Info Windows\n"
 "******************************\n"
@@ -413,19 +416,19 @@ msgstr ""
 "Grundlæggende kommandoer i Info-vinduer\n"
 "***************************************\n"
 
-#: info/infodoc.c:48
+#: info/infodoc.c:49
 msgid "\\%-10[quit-help]  Quit this help.\n"
 msgstr "\\%-10[quit-help]  Afslut denne hjælp.\n"
 
-#: info/infodoc.c:49
+#: info/infodoc.c:50
 msgid "\\%-10[quit]  Quit Info altogether.\n"
 msgstr "\\%-10[quit]  Afslut hele Info-programmet.\n"
 
-#: info/infodoc.c:50
+#: info/infodoc.c:51
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
 msgstr "\\%-10[get-info-help-node]  Kør info introduktionen.\n"
 
-#: info/infodoc.c:52 info/infodoc.c:101
+#: info/infodoc.c:53 info/infodoc.c:102
 msgid ""
 "Selecting other nodes:\n"
 "----------------------\n"
@@ -433,19 +436,19 @@ msgstr ""
 "Valg af ander emnder:\n"
 "---------------------\n"
 
-#: info/infodoc.c:54
+#: info/infodoc.c:55
 msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
 msgstr "\\%-10[next-node]  Flyt til emnet 'næste' i dette emne.\n"
 
-#: info/infodoc.c:55
+#: info/infodoc.c:56
 msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
 msgstr "\\%-10[prev-node]  Flyt til emnet 'Forrige' i dette emne.\n"
 
-#: info/infodoc.c:56
+#: info/infodoc.c:57
 msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
 msgstr "\\%-10[up-node]  Flyt til emnet 'Op' i dette emne.\n"
 
-#: info/infodoc.c:57
+#: info/infodoc.c:58
 msgid ""
 "\\%-10[menu-item]  Pick menu item specified by name.\n"
 "              Picking a menu item causes another node to be selected.\n"
@@ -453,24 +456,24 @@ msgstr ""
 "\\%-10[menu-item]  Vælg menupunkt angivet ved navn.\n"
 "              Valg af menupunkt vælger et andet emne.\n"
 
-#: info/infodoc.c:59
+#: info/infodoc.c:60
 msgid ""
 "\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
 msgstr ""
 "\\%-10[xref-item]  Følg en krydshenvisning.  Indlæser referencens navn.\n"
 
-#: info/infodoc.c:60
+#: info/infodoc.c:61
 msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
 msgstr "\\%-10[history-node]  Flyt til vinduets sidste synlige emne-felt.\n"
 
-#: info/infodoc.c:61
+#: info/infodoc.c:62
 msgid ""
 "\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
 msgstr ""
 "\\%-10[move-to-next-xref]  Hop til næste hypertekst-henvisning i dette "
 "emne.\n"
 
-#: info/infodoc.c:62
+#: info/infodoc.c:63
 msgid ""
 "\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
 "node.\n"
@@ -478,26 +481,26 @@ msgstr ""
 "\\%-10[move-to-prev-xref]  Hop til næste hypertekst-henvisning i dette "
 "emne.\n"
 
-#: info/infodoc.c:63
+#: info/infodoc.c:64
 msgid ""
 "\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
 msgstr ""
 "\\%-10[select-reference-this-line]  Følg hypertekst-henvisningen under "
 "markøren.\n"
 
-#: info/infodoc.c:64
+#: info/infodoc.c:65
 msgid ""
 "\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
 "node] (DIR)'.\n"
 msgstr ""
 "\\%-10[dir-node]  Flyt til emnet 'katalog'. Svarer til 'g (KATALOG)'.\n"
 
-#: info/infodoc.c:65
+#: info/infodoc.c:66
 msgid ""
 "\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
 msgstr "\\%-10[top-node]  Gå til emnet Top. Svarer til '\\[goto-node] Top'.\n"
 
-#: info/infodoc.c:67 info/infodoc.c:115
+#: info/infodoc.c:68 info/infodoc.c:116
 msgid ""
 "Moving within a node:\n"
 "---------------------\n"
@@ -505,31 +508,31 @@ msgstr ""
 "Bevægelser indenfor et emne:\n"
 "----------------------------\n"
 
-#: info/infodoc.c:69
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
-msgstr "\\%-10[scroll-forward]  Rul en side frem.\n"
-
 #: info/infodoc.c:70
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
-msgstr "\\%-10[scroll-backward]  Rul en side tilbage.\n"
-
-#: info/infodoc.c:71
 msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
 msgstr "\\%-10[beginning-of-node]  Gå til starten af emnet.\n"
 
-#: info/infodoc.c:72
+#: info/infodoc.c:71
 msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
 msgstr "\\%-10[end-of-node]  Gå til enden af emnet.\n"
 
+#: info/infodoc.c:72
+msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
+msgstr "\\%-10[næste linje]  Rul 1 linje frem.\n"
+
 #: info/infodoc.c:73
-msgid "\\%-10[scroll-forward]  Scroll forward 1 line.\n"
-msgstr "\\%-10[scroll-forward]  Rul 1 linje frem.\n"
+msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
+msgstr "\\%-10[forrige linje]  Rul en linje tilbage.\n"
 
 #: info/infodoc.c:74
-msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
-msgstr "\\%-10[scroll-backward]  Rul en linje tilbage.\n"
+msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
+msgstr "\\%-10[scroll-forward]  Rul en side frem.\n"
+
+#: info/infodoc.c:75
+msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
+msgstr "\\%-10[scroll-backward]  Rul en side tilbage.\n"
 
-#: info/infodoc.c:76 info/infodoc.c:124
+#: info/infodoc.c:77 info/infodoc.c:125
 msgid ""
 "Other commands:\n"
 "---------------\n"
@@ -537,15 +540,15 @@ msgstr ""
 "Andre kommandoer:\n"
 "-----------------\n"
 
-#: info/infodoc.c:78
+#: info/infodoc.c:79
 msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
 msgstr "\\%-10[menu-digit]  Vælg første til niende punkt i emnets menu.\n"
 
-#: info/infodoc.c:79
+#: info/infodoc.c:80
 msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
 msgstr "\\%-10[last-menu-item]  Vælg sidste punkt i emnets menu.\n"
 
-#: info/infodoc.c:80
+#: info/infodoc.c:81
 msgid ""
 "\\%-10[index-search]  Search for a specified string in the index entries of "
 "this Info\n"
@@ -557,7 +560,7 @@ msgstr ""
 "              og vælg det emne, der refereres til af den først fundne "
 "indgang.\n"
 
-#: info/infodoc.c:82
+#: info/infodoc.c:83
 msgid ""
 "\\%-10[goto-node]  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
@@ -565,7 +568,7 @@ msgstr ""
 "\\%-10[goto-node]  Gå til emne angivet ved navn.\n"
 "              Du kan også medtage filnavn, som (FILNAVN)EMNENAVN.\n"
 
-#: info/infodoc.c:84
+#: info/infodoc.c:85
 msgid ""
 "\\%-10[search]  Search forward for a specified string\n"
 "              and select the node in which the next occurrence is found.\n"
@@ -573,7 +576,7 @@ msgstr ""
 "\\%-10[search]  Søg fremad efter en given streng\n"
 "              og vælg emnet med den næste forekomst.\n"
 
-#: info/infodoc.c:86
+#: info/infodoc.c:87
 msgid ""
 "\\%-10[search-backward]  Search backward for a specified string\n"
 "              and select the node in which the previous occurrence is "
@@ -582,123 +585,123 @@ msgstr ""
 "\\%-10[search-backward]  Sæg baglæns efter en given streng\n"
 "              og vælg emnet med den forrige forekomst.\n"
 
-#: info/infodoc.c:97
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Quit this help.\n"
 msgstr "  %-10s  Afslut hjælp.\n"
 
-#: info/infodoc.c:98
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr "  %-10s  Afslut hele Info-programmet.\n"
 
-#: info/infodoc.c:99
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr "  %-10s  Kør info introduktionen.\n"
 
-#: info/infodoc.c:103
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
 msgstr "  %-10s  Flyt til emnet 'næste' i dette emne.\n"
 
-#: info/infodoc.c:104
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
 msgstr "  %-10s  Flyt til emnet 'Forrige' i dette emne.\n"
 
-#: info/infodoc.c:105
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
 msgstr "  %-10s  Gå et niveau op.\n"
 
-#: info/infodoc.c:106
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Pick menu item specified by name.\n"
 msgstr "  %-10s  Vælg menupunkt angivet ved navn.\n"
 
-#: info/infodoc.c:107
+#: info/infodoc.c:108
 msgid "              Picking a menu item causes another node to be selected.\n"
 msgstr "              Valg af menupunkt vælger et andet emne.\n"
 
-#: info/infodoc.c:108
+#: info/infodoc.c:109
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
 msgstr "  %-10s  Følg en krydshenvisning.  Indlæser referencens navn.\n"
 
-#: info/infodoc.c:109
+#: info/infodoc.c:110
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
 msgstr "  %-10s  Flyt til vinduets sidste synlige emne-felt.\n"
 
-#: info/infodoc.c:110
+#: info/infodoc.c:111
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
 msgstr "  %-10s  Hop til næste hypertekst-lænke i dette emne.\n"
 
-#: info/infodoc.c:111
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
 msgstr "  %-10s  Følg hypertekst-lænken under markøren.\n"
 
-#: info/infodoc.c:112
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
 msgstr "  %-10s  Flyt til emnet 'katalog'. Svarer til 'g (KATALOG)'.\n"
 
-#: info/infodoc.c:113
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
 msgstr "  %-10s  Gå til emnet Top. Svarer til 'g Top'.\n"
 
-#: info/infodoc.c:117
+#: info/infodoc.c:118
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
 msgstr "  %-10s  Rul en side frem.\n"
 
-#: info/infodoc.c:118
+#: info/infodoc.c:119
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
 msgstr "  %-10s  Rul en side tilbage.\n"
 
-#: info/infodoc.c:119
+#: info/infodoc.c:120
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
 msgstr "  %-10s  Gå til starten af emnet.\n"
 
-#: info/infodoc.c:120
+#: info/infodoc.c:121
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
 msgstr "  %-10s  Gå til enden af emnet.\n"
 
-#: info/infodoc.c:121
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
 msgstr "  %-10s  Rul 1 linje frem.\n"
 
-#: info/infodoc.c:122
+#: info/infodoc.c:123
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
 msgstr "  %-10s  Rul en linje tilbage.\n"
 
-#: info/infodoc.c:126
+#: info/infodoc.c:127
 #, c-format
 msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
 msgstr "  %-10s  Vælg første ... niende punkt i emnets menu.\n"
 
-#: info/infodoc.c:127
+#: info/infodoc.c:128
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
 msgstr "  %-10s  Vælg sidste punkt i emnets menu.\n"
 
-#: info/infodoc.c:128
+#: info/infodoc.c:129
 #, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
 msgstr ""
 "  %-10s  Søg efter en angivet tekst i denne Info-fils indeksindgange,\n"
 
-#: info/infodoc.c:129
+#: info/infodoc.c:130
 msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
@@ -706,36 +709,36 @@ msgstr ""
 "              og vælg det emne, der refereres til af den først fundne "
 "indgang.\n"
 
-#: info/infodoc.c:130
+#: info/infodoc.c:131
 #, c-format
 msgid "  %-10s  Move to node specified by name.\n"
 msgstr "  %-10s  Gå til emne angivet ved navn.\n"
 
-#: info/infodoc.c:131
+#: info/infodoc.c:132
 msgid ""
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr "              Du kan også medtage filnavn, som (FILNAVN)EMNENAVN.\n"
 
-#: info/infodoc.c:132
+#: info/infodoc.c:133
 #, c-format
 msgid "  %-10s  Search forward for a specified string,\n"
 msgstr "  %-10s  Søg fremad efter en given streng,\n"
 
-#: info/infodoc.c:133 info/infodoc.c:135
+#: info/infodoc.c:134 info/infodoc.c:136
 msgid ""
 "              and select the node in which the next occurrence is found.\n"
 msgstr "              og vælg emne med den næste forekomst.\n"
 
-#: info/infodoc.c:134
+#: info/infodoc.c:135
 #, c-format
 msgid "  %-10s  Search backward for a specified string\n"
 msgstr "  %-10s  Søg baglæns efter en given streng\n"
 
-#: info/infodoc.c:313
+#: info/infodoc.c:316
 msgid "The current search path is:\n"
 msgstr "Den nuværende søgesti er:\n"
 
-#: info/infodoc.c:316
+#: info/infodoc.c:320
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
@@ -743,7 +746,7 @@ msgstr ""
 "Tilgængelige kommandoer i infovinduer:\n"
 "\n"
 
-#: info/infodoc.c:319
+#: info/infodoc.c:324
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
@@ -751,7 +754,7 @@ msgstr ""
 "Tilgængelige kommandoer i ekko-område:\n"
 "\n"
 
-#: info/infodoc.c:340
+#: info/infodoc.c:347
 #, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
@@ -760,7 +763,7 @@ msgstr ""
 "Følgende kommandoer kan kun køres via %s:\n"
 "\n"
 
-#: info/infodoc.c:343
+#: info/infodoc.c:351
 msgid ""
 "The following commands cannot be invoked at all:\n"
 "\n"
@@ -768,156 +771,169 @@ msgstr ""
 "Følgende kommandoer kan slet ikke køres:\n"
 "\n"
 
-#: info/infodoc.c:367
+#: info/infodoc.c:375
 msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
 msgstr ""
 "--- Benyt '\\[history-node]' eller '\\[kill-node]' for at afslutte ---\n"
 
-#: info/infodoc.c:477
+#: info/infodoc.c:485
 msgid "Display help message"
 msgstr "Vis hjælp"
 
-#: info/infodoc.c:495
+#: info/infodoc.c:503
 msgid "Visit Info node `(info)Help'"
 msgstr "Besøg infoemnet '(info)Help'"
 
-#: info/infodoc.c:638
+#: info/infodoc.c:641
 msgid "Print documentation for KEY"
 msgstr "Vis dokumentation for TAST"
 
-#: info/infodoc.c:650
+#: info/infodoc.c:653
 #, c-format
 msgid "Describe key: %s"
 msgstr "Beskriv tast: %s"
 
-#: info/infodoc.c:660
+#: info/infodoc.c:664
 #, c-format
 msgid "ESC %s is undefined."
 msgstr "ESC %s er ikke defineret."
 
-#: info/infodoc.c:676 info/infodoc.c:703
+#: info/infodoc.c:680 info/infodoc.c:709
 #, c-format
 msgid "%s is undefined."
 msgstr "%s er ikke defineret."
 
-#: info/infodoc.c:724
+#: info/infodoc.c:730
 #, c-format
 msgid "%s is defined to %s."
 msgstr "%s er defineret til %s."
 
-#: info/infodoc.c:1151
+#: info/infodoc.c:1153
 msgid "Show what to type to execute a given command"
 msgstr "Vis hvad der skal tastes, for at udføre en given kommando"
 
-#: info/infodoc.c:1155
+#: info/infodoc.c:1157
 msgid "Where is command: "
 msgstr "Hvor er kommando: "
 
-#: info/infodoc.c:1177
+#: info/infodoc.c:1179
 #, c-format
 msgid "`%s' is not on any keys"
 msgstr "'%s' er ikke på nogen taster"
 
-#: info/infodoc.c:1183
+#: info/infodoc.c:1186
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr "%s kan kun udføres via %s."
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1190
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr "%s kan udføres via %s."
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1195
 #, c-format
 msgid "There is no function named `%s'"
 msgstr "Der er ingen funktion kaldet '%s'"
 
-#: info/infokey.c:164
+#: info/infokey.c:145
+#, 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 (C) %s Free Software Foundation, Inc.\n"
+"Der er INGEN garanti. Du må redistribuere denne software\n"
+"under GNU General Public License's betingelser.\n"
+"For mere information om dette, se filerne 'COPYING'.\n"
+
+#: info/infokey.c:170
 msgid "incorrect number of arguments"
 msgstr "ugyldigt antal parametre"
 
-#: info/infokey.c:194
+#: info/infokey.c:201
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "can ikke åbne inddata-filen '%s'."
 
-#: info/infokey.c:207
+#: info/infokey.c:215
 #, c-format
 msgid "cannot create output file `%s'"
 msgstr "kan ikke oprette uddatafil '%s'"
 
-#: info/infokey.c:217
+#: info/infokey.c:226
 #, c-format
 msgid "error writing to `%s'"
 msgstr "fejl under skrivning til '%s'"
 
-#: info/infokey.c:222
+#: info/infokey.c:232
 #, c-format
 msgid "error closing output file `%s'"
 msgstr "fejl under lukning af uddatafilen '%s'"
 
-#: info/infokey.c:443
+#: info/infokey.c:450
 msgid "key sequence too long"
 msgstr "nøglesekvens for lang"
 
-#: info/infokey.c:521
+#: info/infokey.c:529
 msgid "missing key sequence"
 msgstr "manglende nøglesekvens"
 
-#: info/infokey.c:600
+#: info/infokey.c:610
 msgid "NUL character (\\000) not permitted"
 msgstr "NUL-tegn (\\000) ikke tilladt"
 
-#: info/infokey.c:629
+#: info/infokey.c:641
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr "NUL-tegn (^%c) ikke tilladt"
 
-#: info/infokey.c:652
+#: info/infokey.c:665
 msgid "missing action name"
 msgstr "mangler handlingsnavn"
 
-#: info/infokey.c:667 info/infokey.c:733
+#: info/infokey.c:681 info/infokey.c:756
 msgid "section too long"
 msgstr "for langt afsnit"
 
-#: info/infokey.c:673
+#: info/infokey.c:688
 #, c-format
 msgid "unknown action `%s'"
 msgstr "ukendt handling '%s'"
 
-#: info/infokey.c:682
+#: info/infokey.c:698
 msgid "action name too long"
 msgstr "for langt handlingsnavn"
 
-#: info/infokey.c:694
+#: info/infokey.c:712
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr "ekstra tegn følger handlingen '%s'"
 
-#: info/infokey.c:704
+#: info/infokey.c:723
 msgid "missing variable name"
 msgstr "manglende variabelnavn"
 
-#: info/infokey.c:712
+#: info/infokey.c:733
 msgid "missing `=' immediately after variable name"
 msgstr "mangler '=' umiddelbart efter variabelnavn"
 
-#: info/infokey.c:719
+#: info/infokey.c:741
 msgid "variable name too long"
 msgstr "for langt variabelnavn"
 
-#: info/infokey.c:741
+#: info/infokey.c:765
 msgid "value too long"
 msgstr "for lang værdi"
 
-#: info/infokey.c:875
+#: info/infokey.c:890
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr "\"%s\", linje %u: "
 
-#: info/infokey.c:891
+#: info/infokey.c:906
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -944,22 +960,22 @@ msgstr ""
 "Oversæt infokey-kildefil til infokey-fil. Læser INDDATA-FIL (standard\n"
 "$HOME/.infokey) og skriver oversat key-fil til $HOME/.info.\n"
 
-#: info/infomap.c:1397
+#: info/infomap.c:1500
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
 msgstr "Ignorerer ugyldig infokey-fil '%s' - for lille"
 
-#: info/infomap.c:1400
+#: info/infomap.c:1503
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
 msgstr "Ignorerer ugyldig infokey-fil '%s' - for stor"
 
-#: info/infomap.c:1413
+#: info/infomap.c:1516
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
 msgstr "Fejl under læsning af infokey-fil '%s' - \"short read\""
 
-#: info/infomap.c:1431
+#: info/infomap.c:1535
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
@@ -967,12 +983,12 @@ msgstr ""
 "Ugyldig infokey-fil '%s' (ugyldige magiske tal) -- kør infokey for at "
 "opdatere den"
 
-#: info/infomap.c:1437
+#: info/infomap.c:1544
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
 msgstr "Din infokey-fil '%s' er for gammel -- kør infokey for at opdatere den"
 
-#: info/infomap.c:1450
+#: info/infomap.c:1560
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
@@ -980,7 +996,7 @@ msgstr ""
 "Ugyldig infokey-fil '%s' (ugyldig afsnitslængde) -- kør infokey for at "
 "opdatere den"
 
-#: info/infomap.c:1470
+#: info/infomap.c:1581
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
@@ -988,41 +1004,47 @@ msgstr ""
 "Ugyldig infokey-fil '%s' (ugyldig afsnitskode) -- kør infokey for at "
 "opdatere den"
 
-#: info/infomap.c:1608
+#: info/infomap.c:1716
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr "Ugyldige data i infokey-fil -- visse tastebindinger blev ignoreret"
 
-#: info/infomap.c:1659
+#: info/infomap.c:1766
 msgid "Bad data in infokey file -- some var settings ignored"
 msgstr ""
 "Ugyldige data i infokey-fil -- visse variabelindstillinger blev ignoreret"
 
-#: info/m-x.c:70
+#: info/m-x.c:69
 msgid "Read the name of an Info command and describe it"
 msgstr "Indlæs navnet på en info-kommando og beskriv den"
 
-#: info/m-x.c:74
+#: info/m-x.c:73
 msgid "Describe command: "
 msgstr "Beskriv kommando: "
 
-#: info/m-x.c:97
+#: info/m-x.c:96
 msgid "Read a command name in the echo area and execute it"
 msgstr "Indlæs et kommandonavn i ekko-området og udfør den"
 
-#: info/m-x.c:141
+#: info/m-x.c:140
 msgid "Cannot execute an `echo-area' command here."
 msgstr "Kan ikke udføre en 'ekko-område'-kommando her."
 
-#: info/m-x.c:157
+#: info/m-x.c:154
+#, fuzzy, c-format
+msgid "Undefined command: %s"
+msgstr "Ukendt kommando '%s'"
+
+#: info/m-x.c:160
 msgid "Set the height of the displayed window"
 msgstr "Sæt højden på det viste vindue"
 
-#: info/m-x.c:170
+#: info/m-x.c:173
 #, c-format
 msgid "Set screen height to (%d): "
 msgstr "Sæt skærmhøjden til (%d): "
 
-#: info/makedoc.c:161 info/makedoc.c:169
+#: info/makedoc.c:162 info/makedoc.c:170
+#, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
 "\n"
@@ -1030,12 +1052,12 @@ msgstr ""
 "   Kildetekster gennemtrævlet for at inkludere filen;\n"
 "\n"
 
-#: info/makedoc.c:553
+#: info/makedoc.c:550
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "Kunne ikke bearbejde filen %s.\n"
 
-#: info/nodemenu.c:28
+#: info/nodemenu.c:31
 msgid ""
 "\n"
 "* Menu:\n"
@@ -1047,7 +1069,7 @@ msgstr ""
 "  (Fil)Emne                         linjer  Størr. Indeholder fil\n"
 "  ----------                        -----   ----   ---------------"
 
-#: info/nodemenu.c:199
+#: info/nodemenu.c:202
 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"
@@ -1055,24 +1077,24 @@ msgstr ""
 "Her er menuen med emner, du har besøgt for nylig.\n"
 "Vælg et fra denne menu eller brug '\\[history-node]' i et andet vindue,\n"
 
-#: info/nodemenu.c:219
+#: info/nodemenu.c:224
 msgid "Make a window containing a menu of all of the currently visited nodes"
 msgstr "Opret et vindue med en menu, der indeholder alle nyligt besøgte emner"
 
-#: info/nodemenu.c:299
+#: info/nodemenu.c:304
 msgid "Select a node which has been previously visited in a visible window"
 msgstr "Vælg et emne, som tidligere har været besøgt i et synligt vindue"
 
-#: info/nodemenu.c:311
+#: info/nodemenu.c:317
 msgid "Select visited node: "
 msgstr "Vælg besøgt emne: "
 
-#: info/nodemenu.c:331 info/session.c:2235
+#: info/nodemenu.c:337 info/session.c:2264
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr "Referencen forsvandt! (%s)."
 
-#: info/session.c:170
+#: info/session.c:162
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1081,437 +1103,437 @@ msgstr ""
 "Velkommen til Info version %s. Skriv \\[get-help-window] for hjælp.  \\[menu-"
 "item] for menupunkt."
 
-#: info/session.c:643
+#: info/session.c:620
 msgid "Move down to the next line"
 msgstr "Gå ned til næste linje"
 
-#: info/session.c:658
+#: info/session.c:635
 msgid "Move up to the previous line"
 msgstr "Gå op til forrige linje"
 
-#: info/session.c:673
+#: info/session.c:650
 msgid "Move to the end of the line"
 msgstr "Gå til linjeslutning"
 
-#: info/session.c:693
+#: info/session.c:670
 msgid "Move to the start of the line"
 msgstr "Gå til linjestart"
 
-#: info/session.c:885 makeinfo/node.c:1357
+#: info/session.c:860 makeinfo/node.c:1424
 msgid "Next"
 msgstr "Næste"
 
-#: info/session.c:888
+#: info/session.c:863
 msgid "Following Next node..."
 msgstr "Følger emnet Næste..."
 
-#: info/session.c:905
+#: info/session.c:881
 msgid "Selecting first menu item..."
 msgstr "Vælger første menupunkt..."
 
-#: info/session.c:916
+#: info/session.c:893
 msgid "Selecting Next node..."
 msgstr "Vælger emnet 'Næste'..."
 
-#: info/session.c:986
+#: info/session.c:964
 #, c-format
 msgid "Moving Up %d time(s), then Next."
 msgstr "Går 'Op' %d gang(e), derefter 'Næste'."
 
-#: info/session.c:1010
+#: info/session.c:988
 msgid "No more nodes within this document."
 msgstr "Ikke flere emner i dette dokument."
 
-#: info/session.c:1034
+#: info/session.c:1011
 msgid "No `Prev' for this node."
 msgstr "Ingen 'Forrige' i dette emne."
 
-#: info/session.c:1037 info/session.c:1092
+#: info/session.c:1014 info/session.c:1073
 msgid "Moving Prev in this window."
 msgstr "Går til 'Forrige' i dette vindue."
 
-#: info/session.c:1051
+#: info/session.c:1030
 msgid "No `Prev' or `Up' for this node within this document."
 msgstr "Ingen 'Forrige' eller 'Op' for dette emne i dette dokument."
 
-#: info/session.c:1054
+#: info/session.c:1034
 msgid "Moving Up in this window."
 msgstr "Går 'Op' i dette vindue."
 
-#: info/session.c:1102
+#: info/session.c:1084
 msgid "Moving to `Prev's last menu item."
 msgstr "Går til 'Forrige's sidste menupunkt."
 
-#: info/session.c:1113
+#: info/session.c:1095
 msgid "Move forwards or down through node structure"
 msgstr "Gå frem eller ned gennem emne-strukturen"
 
-#: info/session.c:1129
+#: info/session.c:1111
 msgid "Move backwards or up through node structure"
 msgstr "Gå tilbage eller op gennem emne-strukturen"
 
-#: info/session.c:1229
+#: info/session.c:1205
 msgid "Scroll forward in this window"
 msgstr "Rul tilbage i vinduet"
 
-#: info/session.c:1237
+#: info/session.c:1213
 msgid "Scroll forward in this window and set default window size"
 msgstr "Rul frem i vinduet og sæt standard vinduesstørrelse"
 
-#: info/session.c:1245
+#: info/session.c:1221
 msgid "Scroll forward in this window staying within node"
 msgstr "Rul frem i vinduet i samme emne"
 
-#: info/session.c:1253
+#: info/session.c:1229
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr "Rul frem i vinduet i samme emne og sæt standard vinduesstørrelse"
 
-#: info/session.c:1261
+#: info/session.c:1237
 msgid "Scroll backward in this window"
 msgstr "Rul tilbage i vinduet"
 
-#: info/session.c:1269
+#: info/session.c:1245
 msgid "Scroll backward in this window and set default window size"
 msgstr "Rul tilbage i vinduet og sæt standard vinduesstørrelse"
 
-#: info/session.c:1278
+#: info/session.c:1254
 msgid "Scroll backward in this window staying within node"
 msgstr "Rul tilbage i vinduet indenfor samme emne"
 
-#: info/session.c:1286
+#: info/session.c:1262
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
 msgstr ""
 "Rul tilbage i vinduet indenfor samme emne og sæt standard vinduesstørrelse"
 
-#: info/session.c:1294
+#: info/session.c:1270
 msgid "Move to the start of this node"
 msgstr "Gå til starten af dette emne"
 
-#: info/session.c:1301
+#: info/session.c:1277
 msgid "Move to the end of this node"
 msgstr "Gå til slutningen af dette emne"
 
-#: info/session.c:1308
+#: info/session.c:1284
 msgid "Scroll down by lines"
 msgstr "Rul N linjer ned"
 
-#: info/session.c:1325
+#: info/session.c:1301
 msgid "Scroll up by lines"
 msgstr "Rul N linjer op"
 
-#: info/session.c:1343
+#: info/session.c:1319
 msgid "Scroll down by half screen size"
 msgstr "Rul en halv skærmstørrelse ned"
 
-#: info/session.c:1369
+#: info/session.c:1345
 msgid "Scroll up by half screen size"
 msgstr "Rul en halv skærmstørrelse op"
 
-#: info/session.c:1398
+#: info/session.c:1374
 msgid "Select the next window"
 msgstr "Vælg det næste vindue"
 
-#: info/session.c:1437
+#: info/session.c:1413
 msgid "Select the previous window"
 msgstr "Vælg det forrige vindue"
 
-#: info/session.c:1488
+#: info/session.c:1464
 msgid "Split the current window"
 msgstr "Opdel nuværende vindue"
 
-#: info/session.c:1569
+#: info/session.c:1545
 msgid "Delete the current window"
 msgstr "Slet nuværende vindue"
 
-#: info/session.c:1577
+#: info/session.c:1553
 msgid "Cannot delete a permanent window"
 msgstr "Kan ikke slette et permanent vindue"
 
-#: info/session.c:1610
+#: info/session.c:1585
 msgid "Delete all other windows"
 msgstr "Slet alle andre vinduer"
 
-#: info/session.c:1656
+#: info/session.c:1631
 msgid "Scroll the other window"
 msgstr "Rul det andet vindue"
 
-#: info/session.c:1677
+#: info/session.c:1652
 msgid "Scroll the other window backward"
 msgstr "Rul det andet vindue baglæns"
 
-#: info/session.c:1683
+#: info/session.c:1658
 msgid "Grow (or shrink) this window"
 msgstr "Forstør (eller formindsk) dette vindue"
 
-#: info/session.c:1694
+#: info/session.c:1669
 msgid "Divide the available screen space among the visible windows"
 msgstr "Fordel det tilgængelige skærmområde mellem de synlige vinduer"
 
-#: info/session.c:1701
+#: info/session.c:1676
 msgid "Toggle the state of line wrapping in the current window"
 msgstr "Vælg/fravælg linjeombrydning i nuværende vindue"
 
-#: info/session.c:1880
+#: info/session.c:1848
 msgid "Select the Next node"
 msgstr "Vælg emnet Næste"
 
-#: info/session.c:1888
+#: info/session.c:1856
 msgid "Select the Prev node"
 msgstr "Vælg emnet Forrige"
 
-#: info/session.c:1896
+#: info/session.c:1864
 msgid "Select the Up node"
 msgstr "Vælg emnet 'Op'"
 
-#: info/session.c:1903
+#: info/session.c:1871
 msgid "Select the last node in this file"
 msgstr "Vælg det sidste emne i filen"
 
-#: info/session.c:1930 info/session.c:1963
+#: info/session.c:1898 info/session.c:1931
 msgid "This window has no additional nodes"
 msgstr "Dette vindue har ingen yderligere emner"
 
-#: info/session.c:1936
+#: info/session.c:1904
 msgid "Select the first node in this file"
 msgstr "Vælg det første emne i filen"
 
-#: info/session.c:1970
+#: info/session.c:1938
 msgid "Select the last item in this node's menu"
 msgstr "Vælg det sidste punkt i emnets menu"
 
-#: info/session.c:1976
+#: info/session.c:1944
 msgid "Select this menu item"
 msgstr "Vælg dette menupunkt"
 
-#: info/session.c:2005
+#: info/session.c:1977
 #, c-format
 msgid "There aren't %d items in this menu."
 msgstr "Der er ikke %d punkter i denne menu."
 
-#: info/session.c:2148
+#: info/session.c:2171 info/session.c:2172
 #, c-format
 msgid "Menu item (%s): "
 msgstr "Menupunkt (%s): "
 
-#: info/session.c:2150
+#: info/session.c:2175
 msgid "Menu item: "
 msgstr "Menupunkt: "
 
-#: info/session.c:2155
+#: info/session.c:2182 info/session.c:2183
 #, c-format
 msgid "Follow xref (%s): "
 msgstr "Følg krydsreference (%s): "
 
-#: info/session.c:2157
+#: info/session.c:2186
 msgid "Follow xref: "
 msgstr "Følg krydsreference: "
 
-#: info/session.c:2280
+#: info/session.c:2315
 msgid "Read a menu item and select its node"
 msgstr "Indlæs et menupunkt og vælg dets emne"
 
-#: info/session.c:2288
+#: info/session.c:2323
 msgid "Read a footnote or cross reference and select its node"
 msgstr "Indlæs en fodnote eller krydsreference og vælg dets emne"
 
-#: info/session.c:2294
+#: info/session.c:2329
 msgid "Move to the start of this node's menu"
 msgstr "Flyt til starten af dette emnes menu"
 
-#: info/session.c:2318
+#: info/session.c:2353
 msgid "Visit as many menu items at once as possible"
 msgstr "Besøg så mange menupunkter på en gang, som det er muligt"
 
-#: info/session.c:2346
+#: info/session.c:2381
 msgid "Read a node name and select it"
 msgstr "Indlæs et emnenavn og vælg det"
 
-#: info/session.c:2401 info/session.c:2405
+#: info/session.c:2436 info/session.c:2441
 msgid "Goto node: "
 msgstr "Gå til emne: "
 
-#: info/session.c:2471
+#: info/session.c:2505
 #, c-format
 msgid "No menu in node `%s'."
 msgstr "Ingen menu i emne '%s'."
 
-#: info/session.c:2516
+#: info/session.c:2551
 #, c-format
 msgid "No menu item `%s' in node `%s'."
 msgstr "Intet menupunkt '%s' i emne '%s'."
 
-#: info/session.c:2546
+#: info/session.c:2581
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
 msgstr "Kunne ikke finde emnet, der refereres til af '%s' i '%s'."
 
-#: info/session.c:2597
+#: info/session.c:2631
 msgid "Read a list of menus starting from dir and follow them"
 msgstr "Indlæs en liste med menuer, der starter i katalog, og følg dem"
 
-#: info/session.c:2599
+#: info/session.c:2633
 msgid "Follow menus: "
 msgstr "Følg menuer: "
 
-#: info/session.c:2797
+#: info/session.c:2826
 msgid "Find the node describing program invocation"
 msgstr "Find emnet, der beskriver hvordan programmet startes"
 
-#: info/session.c:2799
+#: info/session.c:2828
 #, c-format
 msgid "Find Invocation node of [%s]: "
 msgstr "Find programstart emne for [%s]: "
 
-#: info/session.c:2837
+#: info/session.c:2866
 msgid "Read a manpage reference and select it"
 msgstr "Indlæs en man-side reference og vælg den"
 
-#: info/session.c:2841
+#: info/session.c:2870
 msgid "Get Manpage: "
 msgstr "Hent man-side: "
 
-#: info/session.c:2871
+#: info/session.c:2900
 msgid "Select the node `Top' in this file"
 msgstr "Vælg emnet 'Top' i filen"
 
-#: info/session.c:2877
+#: info/session.c:2906
 msgid "Select the node `(dir)'"
 msgstr "Vælg emnet '(katalog)'"
 
-#: info/session.c:2897
+#: info/session.c:2923 info/session.c:2925
 #, c-format
 msgid "Kill node (%s): "
 msgstr "Fjern emne (%s): "
 
-#: info/session.c:2951
+#: info/session.c:2977
 #, c-format
 msgid "Cannot kill node `%s'"
 msgstr "Kan ikke fjerne emnet '%s'"
 
-#: info/session.c:2961
+#: info/session.c:2987
 msgid "Cannot kill the last node"
 msgstr "Kan ikke fjerne det sidste emne"
 
-#: info/session.c:3047
+#: info/session.c:3073
 msgid "Select the most recently selected node"
 msgstr "Vælg det sidst valgt emne"
 
-#: info/session.c:3053
+#: info/session.c:3079
 msgid "Kill this node"
 msgstr "Fjern dette emne"
 
-#: info/session.c:3061
+#: info/session.c:3087
 msgid "Read the name of a file and select it"
 msgstr "Indlæs et filnavn og vælg det"
 
-#: info/session.c:3065
+#: info/session.c:3091
 msgid "Find file: "
 msgstr "Find fil: "
 
-#: info/session.c:3082
+#: info/session.c:3108
 #, c-format
 msgid "Cannot find `%s'."
 msgstr "Kan ikke finde '%s'."
 
-#: info/session.c:3127 info/session.c:3248
+#: info/session.c:3151 info/session.c:3269
 #, c-format
 msgid "Could not create output file `%s'."
 msgstr "Kunne ikke oprette uddatafil '%s'."
 
-#: info/session.c:3140 info/session.c:3265 info/session.c:3326
+#: info/session.c:3165 info/session.c:3287 info/session.c:3347
 msgid "Done."
 msgstr "Færdig."
 
-#: info/session.c:3196
+#: info/session.c:3220
 #, c-format
 msgid "Writing node %s..."
 msgstr "Skriver emnet %s..."
 
-#: info/session.c:3274
+#: info/session.c:3296
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
 msgstr ""
 "Udskriv indholdet af dette emne (ved videreførsel gennem INFO_PRINT_COMMAND)"
 
-#: info/session.c:3310
+#: info/session.c:3331
 #, c-format
 msgid "Cannot open pipe to `%s'."
 msgstr "Kan ikke åbne videreførsel til '%s'."
 
-#: info/session.c:3316
+#: info/session.c:3337
 #, c-format
 msgid "Printing node %s..."
 msgstr "Udskriver emnet %s..."
 
-#: info/session.c:3558
+#: info/session.c:3567
 #, c-format
 msgid "Searching subfile %s ..."
 msgstr "Leder efter underfilen %s ..."
 
-#: info/session.c:3610
+#: info/session.c:3619
 msgid "Read a string and search for it case-sensitively"
 msgstr "Indlæs en tekst og søg efter den uden versalfølsomhed"
 
-#: info/session.c:3617
+#: info/session.c:3626
 msgid "Read a string and search for it"
 msgstr "Indlæs en tekst og søg for den"
 
-#: info/session.c:3625
+#: info/session.c:3634
 msgid "Read a string and search backward for it"
 msgstr "Indlæs en tekst og søg baglæns efter den"
 
-#: info/session.c:3667
+#: info/session.c:3670 info/session.c:3677
 #, c-format
 msgid "%s%sfor string [%s]: "
 msgstr "%s%sefter tekst [%s]: "
 
-#: info/session.c:3668
+#: info/session.c:3671 info/session.c:3678
 msgid "Search backward"
 msgstr "Søg baglæns"
 
-#: info/session.c:3668
+#: info/session.c:3672 info/session.c:3678
 msgid "Search"
 msgstr "Søg"
 
-#: info/session.c:3669
+#: info/session.c:3673 info/session.c:3679
 msgid " case-sensitively "
 msgstr " versalfølsomt"
 
-#: info/session.c:3669
+#: info/session.c:3674 info/session.c:3679
 msgid " "
 msgstr " "
 
-#: info/session.c:3709
+#: info/session.c:3718
 msgid "Search failed."
 msgstr "Søgning mislykkedes."
 
-#: info/session.c:3727
+#: info/session.c:3736
 msgid "Repeat last search in the same direction"
 msgstr "Gentag sidste søgning i samme retning"
 
-#: info/session.c:3730 info/session.c:3740
+#: info/session.c:3739 info/session.c:3749
 msgid "No previous search string"
 msgstr "Ingen tidligere søgetekst"
 
-#: info/session.c:3737
+#: info/session.c:3746
 msgid "Repeat last search in the reverse direction"
 msgstr "Gentag sidste søgning i modsat retning"
 
-#: info/session.c:3755 info/session.c:3761
+#: info/session.c:3765 info/session.c:3771
 msgid "Search interactively for a string as you type it"
 msgstr "Søg interaktivt efter en tekst, mens du skriver den"
 
-#: info/session.c:3855
+#: info/session.c:3851
 msgid "I-search backward: "
 msgstr "I-søgning baglæns: "
 
-#: info/session.c:3857
+#: info/session.c:3853
 msgid "I-search: "
 msgstr "I-søgning: "
 
-#: info/session.c:3882
+#: info/session.c:3878 info/session.c:3880
 msgid "Failing "
 msgstr "Fejler "
 
@@ -1527,27 +1549,27 @@ msgstr "Gå til næste krydsreference"
 msgid "Select reference or menu item appearing on this line"
 msgstr "Vælg reference eller menupunkt, der optræder på denne linje"
 
-#: info/session.c:4381
+#: info/session.c:4382
 msgid "Cancel current operation"
 msgstr "Afbryd nuværende aktivitet"
 
-#: info/session.c:4388
+#: info/session.c:4389
 msgid "Quit"
 msgstr "Afslut"
 
-#: info/session.c:4397
+#: info/session.c:4398
 msgid "Move the cursor to a specific line of the window"
 msgstr "Flyt markør til bestemt linje i vinduet"
 
-#: info/session.c:4429
+#: info/session.c:4430
 msgid "Redraw the display"
 msgstr "Gentegn skærmen"
 
-#: info/session.c:4466
+#: info/session.c:4467
 msgid "Quit using Info"
 msgstr "Afslut info"
 
-#: info/session.c:4479
+#: info/session.c:4480
 msgid "Run command bound to this key's lowercase variant"
 msgstr "Kør kommandoen, der er bundet til denne tasts småbogstavs-variant"
 
@@ -1557,27 +1579,29 @@ msgid "Unknown command (%s)."
 msgstr "Ukendt kommando (%s)."
 
 #: info/session.c:4494
-msgid "\"\" is invalid"
-msgstr "\"\" er ugyldig"
-
-#: info/session.c:4495
 #, c-format
 msgid "\"%s\" is invalid"
 msgstr "\"%s\" er ugyldig"
 
-#: info/session.c:4713
+#: info/session.c:4495
+#, fuzzy, c-format
+msgid "`%s' is invalid"
+msgstr "\"%s\" er ugyldig"
+
+#: info/session.c:4709
 msgid "Add this digit to the current numeric argument"
 msgstr "Tilføj dette tegn til det nuværende numeriske parameter"
 
-#: info/session.c:4722
+#: info/session.c:4718
 msgid "Start (or multiply by 4) the current numeric argument"
 msgstr "Start (eller gang med 4) det nuværende numeriske parameter"
 
-#: info/session.c:4737
+#: info/session.c:4733
 msgid "Internally used by \\[universal-argument]"
 msgstr "Bruges internt af \\[universal-argument]"
 
-#: info/tilde.c:344
+#: info/tilde.c:338
+#, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: Virtuel hukommelse opbrugt!\n"
 
@@ -1646,230 +1670,264 @@ msgstr "Sæt %s til værdien (%d): "
 msgid "Set %s to value (%s): "
 msgstr "Sæt %s til værdien (%s): "
 
-#: info/window.c:1164
+#: info/window.c:1138
 msgid "--*** Tags out of Date ***"
 msgstr "--*** Mærker (tags) er forældede ***"
 
-#: info/window.c:1175
+#: info/window.c:1149
 msgid "-----Info: (), lines ----, "
 msgstr "-----Info: (), linjer ---, "
 
-#: info/window.c:1182
+#: info/window.c:1156
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr "-%s---Info: %s, %d linjer -%s--"
 
-#: info/window.c:1186
+#: info/window.c:1160
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr "-%s%s-Info: (%s)%s, %d linjer -%s--"
 
-#: info/window.c:1193
+#: info/window.c:1167
 #, c-format
 msgid " Subfile: %s"
 msgstr " Underfil: %s"
 
-#: lib/getopt.c:675
+#: lib/getopt.c:551 lib/getopt.c:570
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: tilvalg '%s' er flertydig\n"
 
-#: lib/getopt.c:700
+#: lib/getopt.c:603 lib/getopt.c:607
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: tilvalg '--%s' tillader ikke en parameter\n"
 
-#: lib/getopt.c:705
+#: lib/getopt.c:616 lib/getopt.c:621
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: tilvalg '%c%s' tillader ikke en parameter\n"
 
-#: lib/getopt.c:723 lib/getopt.c:896
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: tilvalg '%s' kræver en parameter\n"
 
-#: lib/getopt.c:752
+#: lib/getopt.c:727 lib/getopt.c:730
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: ukendt tilvalg '--%s'\n"
 
-#: lib/getopt.c:756
+#: lib/getopt.c:738 lib/getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: ukendt tilvalg '%c%s'\n"
 
-#: lib/getopt.c:782
+#: lib/getopt.c:796 lib/getopt.c:799
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: ugyldigt tilvalg -- %c\n"
 
-#: lib/getopt.c:785
+#: lib/getopt.c:805 lib/getopt.c:808
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ugyldigt tilvalg -- %c\n"
 
-#: lib/getopt.c:815 lib/getopt.c:945
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: tilvalg kræver en parameter -- %c\n"
 
-#: lib/getopt.c:862
+#: lib/getopt.c:935 lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: tilvalg '-W %s' er flertydigt\n"
 
-#: lib/getopt.c:880
+#: lib/getopt.c:978 lib/getopt.c:999
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: tilvalg '-W %s' tillader ikke en parameter\n"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#, fuzzy, c-format
+msgid "arguments to @%s ignored"
+msgstr "Ugyldigt argument til %c%s"
+
+#: makeinfo/cmds.c:585
 msgid "January"
 msgstr "januar"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "February"
 msgstr "februar"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "March"
 msgstr "marts"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "April"
 msgstr "april"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "May"
 msgstr "maj"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "June"
 msgstr "juni"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "July"
 msgstr "juli"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "August"
 msgstr "august"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "September"
 msgstr "september"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "October"
 msgstr "oktober"
 
-#: makeinfo/cmds.c:517
+#: makeinfo/cmds.c:587
 msgid "November"
 msgstr "november"
 
-#: makeinfo/cmds.c:517
+#: makeinfo/cmds.c:587
 msgid "December"
 msgstr "december"
 
-#: makeinfo/cmds.c:658
+#: makeinfo/cmds.c:936
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "usandsynligt tegn %c i @var"
 
-#: makeinfo/cmds.c:701
+#: makeinfo/cmds.c:979
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "@sc parameter er kun versaler, derfor ingen virkning"
 
-#: makeinfo/cmds.c:759
+#: makeinfo/cmds.c:1034
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "'{' forventedes, men fandt '%c'"
 
-#: makeinfo/cmds.c:789
+#: makeinfo/cmds.c:1074
 msgid "end of file inside verb block"
 msgstr "filslutning inden i en verb-blok"
 
-#: makeinfo/cmds.c:797
+#: makeinfo/cmds.c:1082
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "'}' forventedes, men fandt '%c'"
 
-#: makeinfo/cmds.c:942
+#: makeinfo/cmds.c:1112
+msgid ""
+"@strong{Note...} produces a spurious cross-reference in Info; reword to "
+"avoid that"
+msgstr ""
+
+#: makeinfo/cmds.c:1305
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s er forældet"
 
-#: makeinfo/cmds.c:1014
+#: makeinfo/cmds.c:1414
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "@sp kræver et positivt tal, ikke '%s'"
 
-#: makeinfo/cmds.c:1348 makeinfo/cmds.c:1374 makeinfo/footnote.c:81
+#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "Ugyldigt argument til %c%s"
 
-#: makeinfo/cmds.c:1358 makeinfo/makeinfo.c:4140
+#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
 msgid "asis"
 msgstr "asis"
 
-#: makeinfo/cmds.c:1360 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
 msgid "none"
 msgstr "none"
 
-#: makeinfo/defun.c:85
+#: makeinfo/cmds.c:1789
+#, fuzzy, c-format
+msgid "Bad argument to @%s"
+msgstr "Ugyldigt argument til %c%s"
+
+#: makeinfo/cmds.c:1803
+msgid "insert"
+msgstr ""
+
+#: makeinfo/defun.c:84
 msgid "Missing `}' in @def arg"
 msgstr "Manglende '}' i @def parameter"
 
-#: makeinfo/defun.c:363
+#: makeinfo/defun.c:403
 msgid "Function"
 msgstr "Funktion"
 
-#: makeinfo/defun.c:366
+#: makeinfo/defun.c:406
 msgid "Macro"
 msgstr "Makro"
 
-#: makeinfo/defun.c:369
+#: makeinfo/defun.c:409
 msgid "Special Form"
 msgstr "Specialform"
 
-#: makeinfo/defun.c:373
+#: makeinfo/defun.c:413
 msgid "Variable"
 msgstr "Variabel"
 
-#: makeinfo/defun.c:376
+#: makeinfo/defun.c:416
 msgid "User Option"
 msgstr "Brugerfunktion"
 
-#: makeinfo/defun.c:380
+#: makeinfo/defun.c:420
 msgid "Instance Variable"
 msgstr "Instansvariabel"
 
-#: makeinfo/defun.c:384
+#: makeinfo/defun.c:424
 msgid "Method"
 msgstr "Metode"
 
-#: makeinfo/defun.c:466 makeinfo/defun.c:470 makeinfo/defun.c:615
-#: makeinfo/defun.c:631 makeinfo/defun.c:671
+#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
+#: makeinfo/defun.c:644 makeinfo/xml.c:2229
 msgid "of"
 msgstr "for"
 
-#: makeinfo/defun.c:474 makeinfo/defun.c:478 makeinfo/defun.c:482
-#: makeinfo/defun.c:624 makeinfo/defun.c:676
+#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
 msgid "on"
 msgstr "på"
 
-#: makeinfo/defun.c:717
-#, c-format
-msgid "Must be in `%s' insertion to use `%sx'"
+#: makeinfo/defun.c:711
+#, fuzzy, c-format
+msgid "Must be in `@%s' environment to use `@%s'"
 msgstr "Skal være i '%s' indsætning for at bruge '%sx'"
 
-#: makeinfo/files.c:448
+#: makeinfo/files.c:435
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr "%s: getwd: %s, %s\n"
 
+#: makeinfo/files.c:638
+#, c-format
+msgid "`%s' omitted before output filename"
+msgstr ""
+
+#: makeinfo/files.c:646
+#, c-format
+msgid "`%s' omitted since writing to stdout"
+msgstr ""
+
+#: makeinfo/files.c:694
+msgid "Output buffer not empty."
+msgstr ""
+
 #: makeinfo/footnote.c:150
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
@@ -1888,227 +1946,274 @@ msgstr "Fodnote defineret uden forældre-emne"
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "Fodnoter indeni fodnoter er ikke tilladt"
 
-#: makeinfo/footnote.c:298
+#: makeinfo/footnote.c:302 makeinfo/index.c:189
 msgid "Footnotes"
 msgstr "Fodnoter"
 
-#: makeinfo/html.c:42
+#: makeinfo/html.c:87
+#, c-format
+msgid "%s: could not open --css-file: %s"
+msgstr ""
+
+#: makeinfo/html.c:172
+#, c-format
+msgid "%s:%d: --css-file ended in comment"
+msgstr ""
+
+#: makeinfo/html.c:207
 msgid "Untitled"
 msgstr "Uden titel"
 
-#: makeinfo/html.c:298
+#: makeinfo/html.c:422
+msgid "[unexpected] no html tag to pop"
+msgstr "[uventet] ingen html-mærker at \"pop\"'e"
+
+#: makeinfo/html.c:752
 #, c-format
-msgid "Invalid node name: `%s'"
-msgstr "Ugyldigt emnenavn: '%s'"
+msgid "[unexpected] invalid node name: `%s'"
+msgstr "[uventet] ugyldigt emnenavn: '%s'"
 
-#: makeinfo/index.c:213
+#: makeinfo/index.c:169
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "Ukendt indeks '%s'"
 
-#: makeinfo/index.c:238
+#: makeinfo/index.c:234
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr "Info kan ikke håndtere ':' i indeksindgangen '%s'"
 
-#: makeinfo/index.c:396
+#: makeinfo/index.c:412
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "Indeks '%s' eksisterer allerede"
 
-#: makeinfo/index.c:439
+#: makeinfo/index.c:455
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "Ukendt indeks '%s' og/eller '%s' i @synindex"
 
-#: makeinfo/index.c:666
+#: makeinfo/index.c:661
+msgid "(line )"
+msgstr ""
+
+#: makeinfo/index.c:669
+#, c-format
+msgid "(line %*d)"
+msgstr ""
+
+#: makeinfo/index.c:750
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "Ukendt indeks '%s' i @printindex"
 
-#: makeinfo/index.c:709
+#: makeinfo/index.c:819
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "Indgang til indeks '%s' udenfor et emne"
 
-#: makeinfo/index.c:712 makeinfo/index.c:751
+#: makeinfo/index.c:822 makeinfo/index.c:858
 msgid "(outside of any node)"
 msgstr "(udenfor et emne)"
 
-#: makeinfo/insertion.c:198
+#: makeinfo/index.c:919 makeinfo/index.c:925
+msgid "See "
+msgstr "Se "
+
+#: makeinfo/insertion.c:160
+msgid "@item not allowed in argument to @itemize"
+msgstr ""
+
+#: makeinfo/insertion.c:238
 msgid "Broken-Type in insertion_type_pname"
 msgstr "Broken-Type i insertion_type_pname"
 
-#: makeinfo/insertion.c:271
+#: makeinfo/insertion.c:334
 msgid "Enumeration stack overflow"
 msgstr "Overløb i optællingsstak (enumeration stack)"
 
-#: makeinfo/insertion.c:303
+#: makeinfo/insertion.c:366
 #, c-format
 msgid "lettering overflow, restarting at %c"
 msgstr "bogstavsoverløb, genstarter ved %c"
 
-#: makeinfo/insertion.c:538
+#: makeinfo/insertion.c:631
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
 msgstr "%s kræver en parameter: formatteringen for %citem"
 
-#: makeinfo/insertion.c:693
+#: makeinfo/insertion.c:719
+#, c-format
+msgid "%cfloat environments cannot be nested"
+msgstr ""
+
+#: makeinfo/insertion.c:973
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
 msgstr "'@end' forventede '%s', men fandt '%s'"
 
-#: makeinfo/insertion.c:931
+#: makeinfo/insertion.c:1337
 #, c-format
 msgid "No matching `%cend %s'"
 msgstr "Mangler en tilsvarende '%cend %s'"
 
-#: makeinfo/insertion.c:1084
+#: makeinfo/insertion.c:1592
 #, c-format
 msgid "%s requires letter or digit"
 msgstr "%s kræver et bogstav eller ciffer"
 
-#: makeinfo/insertion.c:1158
+#: makeinfo/insertion.c:1687
 msgid "end of file inside verbatim block"
 msgstr "filslutning indeni en verbatim-blok"
 
-#: makeinfo/insertion.c:1318
+#: makeinfo/insertion.c:1913
+#, fuzzy, c-format
+msgid "@%s not meaningful outside `@float' environment"
+msgstr "@%s giver ingen mening i en '@%s'-blok"
+
+#: makeinfo/insertion.c:1949
 msgid "@menu seen before first @node, creating `Top' node"
 msgstr "@menu fundet før første @node, opretter 'Top' emne"
 
-#: makeinfo/insertion.c:1319
+#: makeinfo/insertion.c:1950
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr "måske skulle dit @top emne indsættes i @ifnottex i stedet for @ifinfo?"
 
-#: makeinfo/insertion.c:1331
+#: makeinfo/insertion.c:1962
 msgid "@detailmenu seen before first node, creating `Top' node"
 msgstr "@detailmenu fundet før første emne, opretter emnet 'Top'"
 
-#: makeinfo/insertion.c:1346
+#: makeinfo/insertion.c:2018
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr ""
+
+#: makeinfo/insertion.c:2032
+#, fuzzy, c-format
+msgid "@%s not meaningful outside `@titlepage' environment"
+msgstr "@%s giver ingen mening i en '@%s'-blok"
+
+#: makeinfo/insertion.c:2063
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr "Uparret '%c%s'"
 
-#: makeinfo/insertion.c:1353
+#: makeinfo/insertion.c:2068
 #, c-format
 msgid "`%c%s' needs something after it"
 msgstr "'%c%s' kræver noget efterfølgende"
 
-#: makeinfo/insertion.c:1359
-#, c-format
-msgid "Bad argument to `%s', `%s', using `%s'"
+#: makeinfo/insertion.c:2074
+#, fuzzy, c-format
+msgid "Bad argument `%s' to `@%s', using `%s'"
 msgstr "Ugyldigt parameter '%s', '%s', benytter '%s'"
 
-#: makeinfo/insertion.c:1453
+#: makeinfo/insertion.c:2171
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
 msgstr "@%s giver ingen mening i en '@%s'-blok"
 
-#: makeinfo/insertion.c:1462
+#: makeinfo/insertion.c:2180
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "@itemx giver ingen mening i en '%s'-blok"
 
-#: makeinfo/insertion.c:1646
+#: makeinfo/insertion.c:2356
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "%c%s fundet udenfor en indsætningsblok"
 
-#: makeinfo/lang.c:331
+#: makeinfo/lang.c:580
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "%s er ikke en gyldig ISO 639 sprogkode"
 
-#: makeinfo/lang.c:384
-#, c-format
-msgid "unrecogized encoding name `%s'"
+#: makeinfo/lang.c:655
+#, fuzzy, c-format
+msgid "unrecognized encoding name `%s'"
 msgstr "ukendt indkodningsnavn '%s'"
 
-#: makeinfo/lang.c:387
+#: makeinfo/lang.c:663
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "beklager, indkodningen '%s' understøttes ikke"
 
-#: makeinfo/lang.c:414
+#: makeinfo/lang.c:715
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "ugyldig indkodet tegn '%s'"
 
-#: makeinfo/lang.c:502
-#, c-format
-msgid "%s is an invalid ISO code, using %c"
-msgstr "%s er en ugyldig ISO-kode, bruger %c"
-
-#: makeinfo/lang.c:687
+#: makeinfo/lang.c:1009
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "%c%s kræver 'i' eller 'j' som parameter, ikke '%c'"
 
-#: makeinfo/lang.c:691
+#: makeinfo/lang.c:1013
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr "%c%s kræver et enkelt tegn 'i' eller 'j' som parameter"
 
-#: makeinfo/macro.c:134
+#: makeinfo/macro.c:128
 #, c-format
 msgid "macro `%s' previously defined"
 msgstr "makro '%s' er allerede defineret"
 
-#: makeinfo/macro.c:138
+#: makeinfo/macro.c:132
 #, c-format
 msgid "here is the previous definition of `%s'"
 msgstr "her er den forrige definition af '%s'"
 
 #: makeinfo/macro.c:355
-#, c-format
-msgid "\\ in macro expansion followed by `%s' instead of \\ or parameter name"
+#, fuzzy, c-format
+msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr "\\ i makroudfoldelse fulgt af '%s' i stedet for \\ eller parameternavn"
 
-#: makeinfo/macro.c:403
+#: makeinfo/macro.c:401
 #, c-format
 msgid "Macro `%s' called on line %d with too many args"
 msgstr "Makro '%s' kaldt på linje %d med for mange parametre"
 
-#: makeinfo/macro.c:594
+#: makeinfo/macro.c:586
 #, c-format
 msgid "%cend macro not found"
 msgstr "%cend makro ikke fundet"
 
-#: makeinfo/macro.c:632
+#: makeinfo/macro.c:624
 msgid "@quote-arg only useful for single-argument macros"
 msgstr "@quote-arg kan kun bruges til makroer med et enkelt parameter"
 
-#: makeinfo/macro.c:668
+#: makeinfo/macro.c:660
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "uparret @end %s med @%s"
 
-#: makeinfo/makeinfo.c:316
+#: makeinfo/makeinfo.c:184
 #, c-format
-msgid "%s:%d: warning: "
-msgstr "%s:%d: advarsel: "
-
-#: makeinfo/makeinfo.c:339
 msgid "Too many errors!  Gave up.\n"
 msgstr "For mange fejl! Gav op.\n"
 
-#: makeinfo/makeinfo.c:350 makeinfo/makeinfo.c:2026
+#: makeinfo/makeinfo.c:302
+#, c-format
+msgid "%s:%d: warning: "
+msgstr "%s:%d: advarsel: "
+
+#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
 #, c-format
 msgid "Misplaced %c"
 msgstr "Fejlplaceret %c"
 
-#: makeinfo/makeinfo.c:370
+#: makeinfo/makeinfo.c:340
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Prøv '%s --help' for mere information.\n"
 
-#: makeinfo/makeinfo.c:373
+#: makeinfo/makeinfo.c:343
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Brug: %s [TILVALG]... TEXINFO-FIL...\n"
 
-#: makeinfo/makeinfo.c:376
+#: makeinfo/makeinfo.c:346
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -2118,7 +2223,7 @@ msgstr ""
 "Info-filer, der er lavet til at blive læst på skærmen med Emacs eller GNU "
 "Info.\n"
 
-#: makeinfo/makeinfo.c:380
+#: makeinfo/makeinfo.c:350
 #, c-format
 msgid ""
 "General options:\n"
@@ -2143,20 +2248,21 @@ msgstr ""
 "  -v, --verbose               forklar, hvad der sker.\n"
 "      --version               vis versionsoplysninger og afslut.\n"
 
-#: makeinfo/makeinfo.c:394
-#, no-wrap
+#: makeinfo/makeinfo.c:364
+#, fuzzy, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output DocBook rather than Info.\n"
+"      --docbook             output Docbook XML rather than Info.\n"
 "      --html                output HTML rather than Info.\n"
-"      --xml                 output XML (TexinfoML) rather than Info.\n"
+"      --xml                 output Texinfo XML rather than Info.\n"
+"      --plaintext           output plain text rather than Info.\n"
 msgstr ""
 "Valg af format på uddata (ellers laves Info):\n"
-"      --docbook             lav DocBook i stedet for Info.\n"
+"      --docbook             lav DocBook XML i stedet for Info.\n"
 "      --html                lav HTML i stedet for Info.\n"
-"      --xml                 lav XML (TexinfoML) i stedet for Info.\n"
+"      --xml                 lav Texinfo XML i stedet for Info.\n"
 
-#: makeinfo/makeinfo.c:401
+#: makeinfo/makeinfo.c:372
 msgid ""
 "General output options:\n"
 "  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
@@ -2174,8 +2280,7 @@ msgstr ""
 "Generelle uddatatilvalg:\n"
 "  -E, --macro-expand FIL    send makroekspanderet kildetekst til FIL.\n"
 "                            ignorér eventuelle @setfilename.\n"
-"      --no-headers          undertryk emneadskillere, Node:­linjer og "
-"menuer\n"
+"      --no-headers          undertryk emneadskillere, Node:­linjer og menuer\n"
 "                             fra Infos uddata (og lav dermed simpel tekst)\n"
 "                             og skriv som udgangspunkt til standard-ud."
 "n      --no-split            undertryk opdeling af Info eller HTML-uddata,\n"
@@ -2183,7 +2288,7 @@ msgstr ""
 "      --number-sections     lav afsnits- og sektionsnumre.\n"
 "  -o, --output=FILE         send til FIL (katalog i tilfældet opdelt HTML),\n"
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:386
 #, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2221,14 +2326,32 @@ msgstr ""
 "      --split-size=ANTAL      opdel Info-filer ved størrelsen ANTAL "
 "(standard %d).\n"
 
-#: makeinfo/makeinfo.c:433
+#: makeinfo/makeinfo.c:403
+msgid ""
+"Options for HTML:\n"
+"      --css-include=FILE        include FILE in HTML <style> output;\n"
+"                                  read stdin if FILE is -.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:409
+#, c-format
+msgid ""
+"Options for XML and Docbook:\n"
+"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"d).\n"
+"                                  If VAL is 0, ignorable whitespace is "
+"dropped.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:416
+#, fuzzy
 msgid ""
 "Input file options:\n"
-"      --commands-in-node-names   allow @ commands in node names.\n"
-"  -D VAR                         define the variable VAR, as with @set.\n"
-"  -I DIR                         append DIR to the @include search path.\n"
-"  -P DIR                         prepend DIR to the @include search path.\n"
-"  -U VAR                         undefine the variable VAR, as with @clear.\n"
+"      --commands-in-node-names  allow @ commands in node names.\n"
+"  -D VAR                        define the variable VAR, as with @set.\n"
+"  -I DIR                        append DIR to the @include search path.\n"
+"  -P DIR                        prepend DIR to the @include search path.\n"
+"  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
 "Inddata-tilvalg:\n"
 "      --commands-in-node-names   tillad @-kommandoer i emnenavne.\n"
@@ -2238,47 +2361,60 @@ msgstr ""
 "søgestien.\n"
 "  -U VAR                         afdefinér variablen VAR som med @clear.\n"
 
-#: makeinfo/makeinfo.c:442
+#: makeinfo/makeinfo.c:425
 #, fuzzy
 msgid ""
 "Conditional processing in input:\n"
+"  --ifdocbook       process @ifdocbook and @docbook even if\n"
+"                      not generating Docbook.\n"
 "  --ifhtml          process @ifhtml and @html even if not generating HTML.\n"
 "  --ifinfo          process @ifinfo even if not generating Info.\n"
 "  --ifplaintext     process @ifplaintext even if not generating plain text.\n"
 "  --iftex           process @iftex and @tex; implies --no-split.\n"
+"  --ifxml           process @ifxml and @xml.\n"
+"  --no-ifdocbook    do not process @ifdocbook and @docbook text.\n"
 "  --no-ifhtml       do not process @ifhtml and @html text.\n"
 "  --no-ifinfo       do not process @ifinfo text.\n"
 "  --no-ifplaintext  do not process @ifplaintext text.\n"
 "  --no-iftex        do not process @iftex and @tex text.\n"
+"  --no-ifxml        do not process @ifxml and @xml text.\n"
+"\n"
+"  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
 msgstr ""
 "Betinget behandling i inddata:\n"
-"     --ifhtml      behandl @ifhtml og @html selvom der ikke laves HTML.\n"
-"     --ifinfo      behandl @ifinfo-tekst selvom der laves HTML.\n"
-"     --iftex       behandl @iftex og @tex-tekster; underforstår --no-split.\n"
-"     --no-ifhtml   behandl ikke @ifhtml og @html-tekst.\n"
-"     --no-ifinfo   behandl ikke @ifinfo-tekst.\n"
-"     --no-iftex    behandl ikke @iftex og @tex-tekst.\n"
-
-#: makeinfo/makeinfo.c:454
+"  --ifhtml          behandl @ifhtml og @html selvom der ikke laves HTML.\n"
+"  --ifinfo          behandl @ifinfo-tekst selvom der laves HTML.\n"
+"  --ifplaintext     behandl @ifplaintext selvom der ikke laves ren tekst.\n"
+"  --iftex           behandl @iftex og @tex; underforstår --no-split.\n"
+"  --ifxml           behandl @ifxml og @xml.\n"
+"  --no-ifhtml       behandl ikke @ifhtml og @html-tekst.\n"
+"  --no-ifinfo       behandl ikke @ifinfo-tekst.\n"
+"  --no-ifplaintext  behandl ikke @ifplaintext-tekst.\n"
+"  --no-iftex        behandl ikke @iftex og @tex-tekst.\n"
+"  --no-ifxml        behandl ikke @ifxml og @xml-tekst.\n"
+
+#: makeinfo/makeinfo.c:444
 #, fuzzy
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating HTML, --ifhtml is on and the others are off;\n"
 "  if generating Info, --ifinfo is on and the others are off;\n"
 "  if generating plain text, --ifplaintext is on and the others are off;\n"
+"  if generating XML, --ifxml is on and the others are off.\n"
 msgstr ""
 "  Standarden for @if... betingelser afhænger af uddataformatet:\n"
 "  hvis der laves HTML, er --ifhtml aktiveret, mens de andre er "
 "deaktiverede;\n"
-"  hvis der laves Info eller ren tekst, er --ifinfo aktiveret og de andre er "
+"  hvis der laves Info er --ifinfo aktiveret og de andre er deaktiverede;\n"
+"  hvis der laves ren tekst er --ifplaintext aktiveret og de andre "
 "deaktiverede.\n"
 
-#: makeinfo/makeinfo.c:461
+#: makeinfo/makeinfo.c:452
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                     write Info to foo's @setfilename\n"
 "  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write XML to @setfilename\n"
+"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
 "  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
 "  makeinfo --no-headers foo.texi        write plain text to standard output\n"
 "\n"
@@ -2290,406 +2426,405 @@ msgstr ""
 "Eksempler:\n"
 "  makeinfo xxx.texi                    skriv Info til xxx's @setfilename\n"
 "  makeinfo --html xxx.texi             skriv HTML til @setfilename\n"
-"  makeinfo --xml xxx.texi              skriv XML til  @setfilename\n"
+"  makeinfo --xml xxx.texi              skriv Texinfo XML til  @setfilename\n"
 "  makeinfo --no-headers -o - xxx.texi  skriv simpel tekst til standard-ud\n"
 "\n"
 "  makeinfo --html --noheaders xxx.texi skriv html uden emnelinjer og menuer\n"
 "  makeinfo --number-sections xxx.texi  skriv Info med nummererede afsnit\n"
 "  makeinfo --no-split xxx.texi         skriv én Info-fil, uanset størrelsen\n"
 
-#: makeinfo/makeinfo.c:570 makeinfo/makeinfo.c:593 makeinfo/makeinfo.c:655
-#: makeinfo/makeinfo.c:676
+#: makeinfo/makeinfo.c:603
+#, c-format
+msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
+#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr "%s: %s parameter skal være et tal, ikke '%s'.\n"
 
-#: makeinfo/makeinfo.c:583
-#, c-format
-msgid "Couldn't open macro expansion output `%s'"
+#: makeinfo/makeinfo.c:660
+#, fuzzy, c-format
+msgid "%s: could not open macro expansion output `%s'"
 msgstr "Kunne ikke åbne makroudfoldelses-uddata '%s'"
 
-#: makeinfo/makeinfo.c:586
-msgid "Cannot specify more than one macro expansion output"
-msgstr "Kan ikke angive mere end én makroudfoldelses-uddata"
+#: makeinfo/makeinfo.c:665
+#, fuzzy, c-format
+msgid "%s: ignoring second macro expansion output `%s'.\n"
+msgstr "Kunne ikke åbne makroudfoldelses-uddata '%s'"
 
-#: makeinfo/makeinfo.c:624
+#: makeinfo/makeinfo.c:707
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 "%s: --paragraph-indent parameter skal være tal/'none'/'asis', ikke '%s'.\n"
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 "%s: --footnote-style parameter skal være 'separate' eller 'end', ikke '%s'.\n"
 
-#: makeinfo/makeinfo.c:723
+#: makeinfo/makeinfo.c:806
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: mangler filparameter.\n"
 
-#: makeinfo/makeinfo.c:898
+#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#, c-format
+msgid "Multiline command %c%s used improperly"
+msgstr ""
+
+#: makeinfo/makeinfo.c:1000
 #, c-format
 msgid "Expected `%s'"
 msgstr "Forventede '%s'"
 
-#: makeinfo/makeinfo.c:1365
-msgid "File exists, but is not a directory"
-msgstr "Filen eksisterer, men er ikke et katalog"
-
-#: makeinfo/makeinfo.c:1366
+#: makeinfo/makeinfo.c:1479
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "Kan ikke oprette kataloget '%s': %s"
 
-#: makeinfo/makeinfo.c:1414
+#: makeinfo/makeinfo.c:1525
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "Ingen '%s' fundet i '%s'"
 
-#: makeinfo/makeinfo.c:1496
+#: makeinfo/makeinfo.c:1605
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
 "%s: Undlader makroudfoldelse til standard-ud, da Info-uddata sendes der.\n"
 
-#: makeinfo/makeinfo.c:1526
+#: makeinfo/makeinfo.c:1638
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "Producerer %s file '%s' ud fra '%s'.\n"
 
-#: makeinfo/makeinfo.c:1561
+#: makeinfo/makeinfo.c:1673
 #, c-format
 msgid "This is %s, produced by makeinfo version %s from %s.\n"
 msgstr "Dette er %s, produceret med makeinfo version %s ud fra %s.\n"
 
-#: makeinfo/makeinfo.c:1583
+#: makeinfo/makeinfo.c:1709
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 "%s: Fjerner makro uddatafil '%s' grundet fejl; brug --force for at beholde.\n"
 
-#: makeinfo/makeinfo.c:1627
+#: makeinfo/makeinfo.c:1773
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 "%s: Fjerner uddatafil '%s' grundet fejl; brug --force for at beholde.\n"
 
-#: makeinfo/makeinfo.c:1853
+#: makeinfo/makeinfo.c:2034
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "Ukendt kommando '%s'"
 
-#: makeinfo/makeinfo.c:1875
+#: makeinfo/makeinfo.c:2056
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr "Benyt parenteser for at angive en kommando som parameter til @%s"
 
-#: makeinfo/makeinfo.c:2068
-#, c-format
-msgid "%c%s expected `{...}'"
+#: makeinfo/makeinfo.c:2314
+#, fuzzy, c-format
+msgid "%c%s expected braces"
 msgstr "%c%s forventede '{...}'"
 
-#: makeinfo/makeinfo.c:2098
+#: makeinfo/makeinfo.c:2327
 msgid "Unmatched }"
 msgstr "Uparret }"
 
-#: makeinfo/makeinfo.c:2148
+#: makeinfo/makeinfo.c:2375
 msgid "NO_NAME!"
 msgstr "INTET_NAVN!"
 
-#: makeinfo/makeinfo.c:2169
+#: makeinfo/makeinfo.c:2396
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s mangler højre parentes"
 
-#: makeinfo/makeinfo.c:2958
-msgid "First argument to cross-reference may not be empty"
-msgstr "Første parameter i krydsreferencen må ikke være tom"
-
-#: makeinfo/makeinfo.c:3018 makeinfo/makeinfo.c:3236 makeinfo/xml.c:1340
-msgid "see "
-msgstr "se "
-
-#: makeinfo/makeinfo.c:3018
-msgid "See "
-msgstr "Se "
-
-#: makeinfo/makeinfo.c:3164
-#, c-format
-msgid "`.' or `,' must follow cross reference, not %c"
-msgstr "en krydsreference må efterfølges af '.' eller ',', ikke %c"
-
-#: makeinfo/makeinfo.c:3212
-msgid "First argument to @inforef may not be empty"
-msgstr "Første parameter i @inforef må ikke være tom"
-
-#: makeinfo/makeinfo.c:3427
+#: makeinfo/makeinfo.c:3309
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "@image-fil '%s' (for HTML) er ulæselig: %s"
 
-#: makeinfo/makeinfo.c:3440
-#, c-format
-msgid "No `%s.png' or `.jpg', and no extension supplied"
-msgstr "Ingen `%s.png' eller `.jpg', og ingen filendelse angivet"
+#: makeinfo/makeinfo.c:3315
+#, fuzzy, c-format
+msgid "No such file `%s'"
+msgstr "Ingen '%s' fundet i '%s'"
 
-#: makeinfo/makeinfo.c:3490
+#: makeinfo/makeinfo.c:3447
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "@image-fil '%s' (for tekst) er ulæselig: %s"
 
-#: makeinfo/makeinfo.c:3497
+#: makeinfo/makeinfo.c:3456
 msgid "@image missing filename argument"
 msgstr "@image mangler filnavnsparameter"
 
-#: makeinfo/makeinfo.c:3690
+#: makeinfo/makeinfo.c:3675
+#, c-format
+msgid "undefined flag: %s"
+msgstr ""
+
+#: makeinfo/makeinfo.c:3676
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{Ingen værdi for '%s'}"
 
-#: makeinfo/makeinfo.c:3744
+#: makeinfo/makeinfo.c:3728
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s kræver et navn"
 
-#: makeinfo/makeinfo.c:3850
+#: makeinfo/makeinfo.c:3834
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "Nåede filslutning før samhørende @end %s"
 
-#: makeinfo/makeinfo.c:4081
+#: makeinfo/makeinfo.c:4082
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr "`%.40s...' er for langt til ekspansion; blev ikke ekspanderet"
 
-#: makeinfo/multi.c:226
+#: makeinfo/multi.c:116
 msgid "Missing } in @multitable template"
 msgstr "Manglende } i @multitable skabelon"
 
-#: makeinfo/multi.c:302
+#: makeinfo/multi.c:254
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "ignorerer vildfaren tekst '%s' efter @multitable"
 
-#: makeinfo/multi.c:375
+#: makeinfo/multi.c:393
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "For mange søjler i 'multitable' element (maks %d)"
 
-#: makeinfo/multi.c:426
+#: makeinfo/multi.c:555
 #, c-format
-msgid "Cannot select column #%d in multitable"
-msgstr "Kan ikke vælge kolonne %d i 'multitable'"
+msgid "[unexpected] cannot select column #%d in multitable"
+msgstr "[uventet] Kan ikke vælge kolonne %d i 'multitable'"
 
-#: makeinfo/multi.c:529
+#: makeinfo/multi.c:584
 msgid "ignoring @tab outside of multitable"
 msgstr "ignorerer @tab udenfor 'multitable'"
 
-#: makeinfo/multi.c:565
+#: makeinfo/multi.c:632
+#, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** Flerkolonne uddata fra sidste række:\n"
 
-#: makeinfo/multi.c:568
+#: makeinfo/multi.c:635
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* kolonne %d: uddata = %s\n"
 
-#: makeinfo/node.c:276
+#: makeinfo/node.c:280
 #, c-format
 msgid "Node `%s' previously defined at line %d"
 msgstr "Emne '%s' er tidligere defineret på linje %d"
 
-#: makeinfo/node.c:594
+#: makeinfo/node.c:648
 #, c-format
 msgid "Formatting node %s...\n"
 msgstr "Formatterer emne %s...\n"
 
-#: makeinfo/node.c:655
-#, c-format
-msgid "Node `%s' requires a sectioning command (e.g. %c%s)"
+#: makeinfo/node.c:716
+#, fuzzy, c-format
+msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
 msgstr "Emne '%s' kræver en sektionsopdelende kommando (f.eks. %c%s)"
 
-#: makeinfo/node.c:815
+#: makeinfo/node.c:879
 #, c-format
 msgid "No node name specified for `%c%s' command"
 msgstr "Intet emnenavn angivet for '%c%s'-kommandoen"
 
-#: makeinfo/node.c:856 makeinfo/node.c:1075
+#: makeinfo/node.c:920 makeinfo/node.c:1151
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr "Mål '%s' og emne '%s' ender med at have samme filnavn"
 
-#: makeinfo/node.c:859
+#: makeinfo/node.c:923
 msgid "This @anchor command ignored; references to it will not work"
 msgstr "Denne @anchor-kommando er ignoreret; referencer til den vil ikke virke"
 
-#: makeinfo/node.c:861 makeinfo/node.c:1078
+#: makeinfo/node.c:925 makeinfo/node.c:1154
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "Omdøb dette mål eller brug tilvalget '--no-split'"
 
-#: makeinfo/node.c:891
+#: makeinfo/node.c:955
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
 msgstr "Uventet streng i slutningen af opdelt HTML-fil '%s'"
 
-#: makeinfo/node.c:920
-msgid "Node:"
-msgstr "Emne:"
-
-#: makeinfo/node.c:930
+#: makeinfo/node.c:991
 msgid "Next:"
 msgstr "Næste:"
 
-#: makeinfo/node.c:940
+#: makeinfo/node.c:1007
 msgid "Previous:"
 msgstr "Forrige:"
 
-#: makeinfo/node.c:950
+#: makeinfo/node.c:1021
 msgid "Up:"
 msgstr "Op:"
 
-#: makeinfo/node.c:1072
+#: makeinfo/node.c:1148
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr "Målene '%s' og '%s' ender med at have samme filnavn"
 
-#: makeinfo/node.c:1077
+#: makeinfo/node.c:1153
 msgid "@anchor command ignored; references to it will not work"
 msgstr "@anchor-kommandoen ignoreres. Referencer til den vil ikke fungere"
 
-#: makeinfo/node.c:1277
-#, c-format
-msgid "%s reference to nonexistent node `%s'"
+#: makeinfo/node.c:1347
+#, fuzzy, c-format
+msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr "%s reference til ikke-eksisterende emne '%s'"
 
-#: makeinfo/node.c:1294
+#: makeinfo/node.c:1363
 msgid "Menu"
 msgstr "Menu"
 
-#: makeinfo/node.c:1296
+#: makeinfo/node.c:1365
 msgid "Cross"
 msgstr "Kryds"
 
-#: makeinfo/node.c:1380
-#, c-format
-msgid "Next field of node `%s' not pointed to"
+#: makeinfo/node.c:1447
+#, fuzzy, c-format
+msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr "'Næste'-felt i emne '%s' blive ikke peget på"
 
-#: makeinfo/node.c:1383
+#: makeinfo/node.c:1450
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "Dette emne (%s) har den ugyldige 'Forrige'"
 
-#: makeinfo/node.c:1395
+#: makeinfo/node.c:1462
 msgid "Prev"
 msgstr "Forrige"
 
-#: makeinfo/node.c:1438
+#: makeinfo/node.c:1505
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "Feltet 'Forrige' i emne '%s' bliver ikke peget på"
 
-#: makeinfo/node.c:1442
+#: makeinfo/node.c:1509
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "Dette emne (%s) har den ugyldige 'Næste'-felt"
 
-#: makeinfo/node.c:1454
+#: makeinfo/node.c:1521
 #, c-format
-msgid "`%s' has no Up field"
-msgstr "'%s' har intet 'Op'-felt"
+msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
+msgstr ""
 
-#: makeinfo/node.c:1457
+#: makeinfo/node.c:1524
 msgid "Up"
 msgstr "Op"
 
-#: makeinfo/node.c:1523
+#: makeinfo/node.c:1590
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr ""
 "Emnet '%s' mangler menupunkt for '%s' på trods af at det er dens 'Op'-mål"
 
-#: makeinfo/node.c:1552
+#: makeinfo/node.c:1619
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr "emne '%s' blev refereret %d gange"
 
-#: makeinfo/node.c:1566
+#: makeinfo/node.c:1633
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "ikke-refereret emne '%s'"
 
-#: makeinfo/sectioning.c:117
+#: makeinfo/node.c:1723
 #, c-format
-msgid "Appendix %c "
+msgid "Removing %s\n"
+msgstr ""
+
+#: makeinfo/node.c:1727
+#, fuzzy, c-format
+msgid "Can't remove file `%s': %s"
+msgstr "Kan ikke oprette kataloget '%s': %s"
+
+#: makeinfo/sectioning.c:122
+#, fuzzy, c-format
+msgid "Appendix %c"
 msgstr "Appendiks %c "
 
-#: makeinfo/sectioning.c:356 makeinfo/sectioning.c:444
+#: makeinfo/sectioning.c:467
+#, fuzzy, c-format
+msgid "Internal error (search_sectioning) `%s'!"
+msgstr "Intern fejl (search_sectioning) \"%s\"!"
+
+#: makeinfo/sectioning.c:562
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
 msgstr "Intern fejl (search_sectioning) \"%s\"!"
 
-#: makeinfo/sectioning.c:502
+#: makeinfo/sectioning.c:623
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr "%c%s er forældet; benyt i stedet %c%s"
 
-#: makeinfo/sectioning.c:518
+#: makeinfo/sectioning.c:639
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr "Emne med %ctop som sektion eksisterer allerede"
 
-#: makeinfo/sectioning.c:526
+#: makeinfo/sectioning.c:647
 #, c-format
 msgid "Here is the %ctop node"
 msgstr "Her er %ctop-emnet"
 
-#: makeinfo/sectioning.c:543
+#: makeinfo/sectioning.c:663
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr "%ctop benyttet før %cnode, benytter forvalget %s"
 
-#: makeinfo/toc.c:221 makeinfo/toc.c:298 makeinfo/toc.c:299
+#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
 msgid "Table of Contents"
 msgstr "Indhold"
 
-#: makeinfo/toc.c:330 makeinfo/toc.c:366 makeinfo/toc.c:367
+#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
 msgid "Short Contents"
 msgstr "Kort indhold"
 
-#: makeinfo/toc.c:406
-#, c-format
-msgid "%s: TOC should be here, but it was not found"
-msgstr "%s: 'Indhold' burde være her, men blev ikke fundet"
-
-#: makeinfo/xml.c:1108
+#: makeinfo/xml.c:1605
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image-fil '%s' er ulæselig: %s"
 
-#: util/install-info.c:151
+#: makeinfo/xml.c:2097
+msgid ""
+"@headitem as the last item of @multitable produces invalid Docbook documents"
+msgstr ""
+
+#: util/install-info.c:154
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: advarsel: "
 
-#: util/install-info.c:176 util/install-info.c:189
-msgid "virtual memory exhausted"
-msgstr "virtuel hukommelse opbrugt"
-
-#: util/install-info.c:232
+#: util/install-info.c:203
 #, c-format
 msgid " for %s"
 msgstr " for %s"
 
-#: util/install-info.c:381
+#: util/install-info.c:426
 #, c-format
 msgid "\tTry `%s --help' for a complete list of options.\n"
 msgstr "\tPrøv '%s --help' for en komplet tilvalgsliste.\n"
 
-#: util/install-info.c:389
+#: util/install-info.c:434
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
@@ -2757,8 +2892,8 @@ msgstr ""
 "                     informationerne i selve Info-filen.\n"
 " --version         vis denne versions-information og afslut.\n"
 
-#: util/install-info.c:444
-#, c-format
+#: util/install-info.c:488
+#, fuzzy, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
 "topmost node of the Info hierarchy, called (dir)Top.\n"
@@ -2774,7 +2909,7 @@ msgid ""
 "  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
 "  to select it.\n"
 "\n"
-"* Menu:\n"
+"%s\n"
 msgstr ""
 "Dette er filen .../info/dir, som indeholde det øverste\n"
 "emne i Info-hierakiet, kaldet (katalog)Top.\n"
@@ -2793,97 +2928,99 @@ msgstr ""
 "\n"
 "* Menu:\n"
 
-#: util/install-info.c:467
+#: util/install-info.c:513
 #, c-format
 msgid "%s: could not read (%s) and could not create (%s)\n"
 msgstr "%s: kunne ikke læse (%s) og kunne ikke oprette (%s)\n"
 
-#: util/install-info.c:551
+#: util/install-info.c:600
 #, c-format
 msgid "%s: empty file"
 msgstr "%s: tom fil"
 
-#: util/install-info.c:866 util/install-info.c:906
+#: util/install-info.c:913 util/install-info.c:953
 msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
 msgstr "START-INFO-DIR-ENTRY uden tilhørende END-INFO-DIR-ENTRY"
 
-#: util/install-info.c:901
+#: util/install-info.c:948
 msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
 msgstr "END-INFO-DIR-ENTRY uden tilhørende START-INFO-DIR-ENTRY"
 
-#: util/install-info.c:1150 util/install-info.c:1160
+#: util/install-info.c:1191 util/install-info.c:1201
 #, c-format
-msgid "%s: Specify the Info directory only once.\n"
-msgstr "%s: Angiv kun Info-kataloget én gang.\n"
+msgid "%s: already have dir file: %s\n"
+msgstr ""
 
-#: util/install-info.c:1195
+#: util/install-info.c:1236
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr "%s: Angiv kun Info-filen én gang.\n"
 
-#: util/install-info.c:1244
+#: util/install-info.c:1284
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr "overskydende kommandolinjeparameter '%s'"
 
-#: util/install-info.c:1248
+#: util/install-info.c:1288
 msgid "No input file specified; try --help for more information."
 msgstr "Ingen inddatafil angivet; prøv --help for mere information."
 
-#: util/install-info.c:1251
+#: util/install-info.c:1291
 msgid "No dir file specified; try --help for more information."
 msgstr "Intet katalog angivet; prøv --help for mere information."
 
-#: util/install-info.c:1273
+#: util/install-info.c:1313
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr "ingen infokatalog-indgang i '%s'"
 
-#: util/install-info.c:1388
+#: util/install-info.c:1426
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr "menupunkt '%s' eksisterer allerede i filen '%s'"
 
-#: util/install-info.c:1411
+#: util/install-info.c:1449
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr "ingen indgange fundet for '%s'; intet slettet"
 
-#: util/texindex.c:245
+#: util/texindex.c:252
 msgid "display this help and exit"
 msgstr "viser denne hjælp og afslutter"
 
-#: util/texindex.c:247
+#: util/texindex.c:254
 msgid "keep temporary files around after processing"
 msgstr "efterlad midlertidige filer"
 
-#: util/texindex.c:249
+#: util/texindex.c:256
 msgid "do not keep temporary files around after processing (default)"
 msgstr "efterlad ikke midlertidige filer (standard)"
 
-#: util/texindex.c:251
+#: util/texindex.c:258
 msgid "send output to FILE"
 msgstr "send uddata til FIL"
 
-#: util/texindex.c:253
+#: util/texindex.c:260
 msgid "display version information and exit"
 msgstr "vis versions-information og afslut"
 
-#: util/texindex.c:264
+#: util/texindex.c:270
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Brug: %s [TILVALG]... FIL...\n"
 
-#: util/texindex.c:265
+#: util/texindex.c:271
+#, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr "Opret et ordnet indeks for hver TeX uddata-FIL.\n"
 
-#: util/texindex.c:268
+#: util/texindex.c:274
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr "Normalt angives FIL... som 'xxx.%c%c' for dokumentet 'xxx.texi'.\n"
 
-#: util/texindex.c:270
+#: util/texindex.c:276
+#, c-format
 msgid ""
 "\n"
 "Options:\n"
@@ -2891,28 +3028,74 @@ msgstr ""
 "\n"
 "Tilvalg:\n"
 
-#: util/texindex.c:887 util/texindex.c:921 util/texindex.c:997
-#: util/texindex.c:1025
+#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
+#: util/texindex.c:1011
 #, c-format
 msgid "%s: not a texinfo index file"
 msgstr "%s: ikke en texinfo indeksfil"
 
-#: util/texindex.c:982
+#: util/texindex.c:968
 #, c-format
 msgid "failure reopening %s"
 msgstr "kunne ikke åbne %s"
 
-#: util/texindex.c:1224
+#: util/texindex.c:1218
 #, c-format
 msgid "No page number in %s"
 msgstr "Intet sidenummer i %s"
 
-#: util/texindex.c:1295
+#: util/texindex.c:1291
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "indgang %s følger en indgang med et sekundært navn"
 
-#: util/texindex.c:1633
-#, c-format
-msgid "%s; for file `%s'.\n"
-msgstr "%s; for filen '%s'.\n"
+#~ msgid "%s: Specify the Info directory only once.\n"
+#~ msgstr "%s: Angiv kun Info-kataloget én gang.\n"
+
+#~ msgid "\"\" is invalid"
+#~ msgstr "\"\" er ugyldig"
+
+#~ msgid "%s is an invalid ISO code, using %c"
+#~ msgstr "%s er en ugyldig ISO-kode, bruger %c"
+
+#~ msgid "Cannot specify more than one macro expansion output"
+#~ msgstr "Kan ikke angive mere end én makroudfoldelses-uddata"
+
+#~ msgid "File exists, but is not a directory"
+#~ msgstr "Filen eksisterer, men er ikke et katalog"
+
+#~ msgid "First argument to cross-reference may not be empty"
+#~ msgstr "Første parameter i krydsreferencen må ikke være tom"
+
+#~ msgid "see "
+#~ msgstr "se "
+
+#~ msgid "`.' or `,' must follow cross reference, not %c"
+#~ msgstr "en krydsreference må efterfølges af '.' eller ',', ikke %c"
+
+#~ msgid "First argument to @inforef may not be empty"
+#~ msgstr "Første parameter i @inforef må ikke være tom"
+
+#~ msgid "Node:"
+#~ msgstr "Emne:"
+
+#~ msgid "%s: TOC should be here, but it was not found"
+#~ msgstr "%s: 'Indhold' burde være her, men blev ikke fundet"
+
+#~ msgid "virtual memory exhausted"
+#~ msgstr "virtuel hukommelse opbrugt"
+
+#~ msgid "No `%s.png' or `.jpg', and no extension supplied"
+#~ msgstr "Ingen `%s.png' eller `.jpg', og ingen filendelse angivet"
+
+#~ msgid "%s; for file `%s'.\n"
+#~ msgstr "%s; for filen '%s'.\n"
+
+#~ msgid "`%s' has no Up field"
+#~ msgstr "'%s' har intet 'Op'-felt"
+
+#~ msgid "\\%-10[scroll-forward]  Scroll forward 1 line.\n"
+#~ msgstr "\\%-10[scroll-forward]  Rul 1 linje frem.\n"
+
+#~ msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
+#~ msgstr "\\%-10[scroll-backward]  Rul en linje tilbage.\n"
diff --git a/gnu/usr.bin/texinfo/po/de.gmo b/gnu/usr.bin/texinfo/po/de.gmo
index eba546b7599..af525d76fe9 100644
--- a/gnu/usr.bin/texinfo/po/de.gmo
+++ b/gnu/usr.bin/texinfo/po/de.gmo
diff --git a/gnu/usr.bin/texinfo/po/de.po b/gnu/usr.bin/texinfo/po/de.po
index 839b6591e87..6a63baa7534 100644
--- a/gnu/usr.bin/texinfo/po/de.po
+++ b/gnu/usr.bin/texinfo/po/de.po
@@ -1,10 +1,19 @@
 # German messages for GNU Texinfo
-# Copyright © 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
-# Michael Piefel <piefel@informatik.hu-berlin.de>, 2001, 2002.
+# Copyright © 2004 Free Software Foundation, Inc.
+# Michael Piefel <piefel@informatik.hu-berlin.de>, 2001, 2002, 2003, 2004.
 # Karl Eichwalder <ke@gnu.franken.de>, 1999, 2000.
 # Karl Eichwalder <ke@suse.de>, 1997, 1998, 1999.
 # Karl Eichwalder <ke@ke.Central.DE>, 1996.
 #
+# 2004-03-31
+# Along with this new update, I changed the quotes to
+# „German“ as opposed to »French« quotes.
+# MPi
+#
+# 2003-06-01
+# All translations revised for current CVS.
+# wl
+#
 # 2001-05-14
 # Update: version 4.0b
 # MPi
@@ -50,267 +59,261 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: texinfo 4.1c\n"
-"POT-Creation-Date: 2002-04-01 06:10-0800\n"
-"PO-Revision-Date: 2002-03-25 11:56:27+0100\n"
+"Project-Id-Version: texinfo 4.7.91\n"
+"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
+"POT-Creation-Date: 2004-12-21 16:20-0800\n"
+"PO-Revision-Date: 2004-12-13 11:53 +0100\n"
 "Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: info/echo-area.c:283 info/session.c:712
+#: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
-msgstr "Ein Zeichen vorwärts bewegen"
+msgstr "Ein Zeichen vorgehen"
 
-#: info/echo-area.c:295 info/session.c:728
+#: info/echo-area.c:296 info/session.c:705
 msgid "Move backward a character"
-msgstr "Ein Zeichen rückwärts bewegen"
+msgstr "Ein Zeichen zurückgehen"
 
-#: info/echo-area.c:307
+#: info/echo-area.c:308
 msgid "Move to the start of this line"
 msgstr "Zum Anfang dieser Zeile bewegen"
 
-#: info/echo-area.c:312
+#: info/echo-area.c:313
 msgid "Move to the end of this line"
 msgstr "Zum Ende dieser Zeile bewegen"
 
-#: info/echo-area.c:320 info/session.c:746
+#: info/echo-area.c:321 info/session.c:723
 msgid "Move forward a word"
-msgstr "Ein Wort vorwärts bewegen"
+msgstr "Ein Wort vorgehen"
 
-#: info/echo-area.c:360 info/session.c:795
+#: info/echo-area.c:361 info/session.c:772
 msgid "Move backward a word"
-msgstr "Ein Wort rückwärts bewegen"
+msgstr "Ein Wort zurückgehen"
 
-#: info/echo-area.c:400
+#: info/echo-area.c:401
 msgid "Delete the character under the cursor"
 msgstr "Das Zeichen unter dem Cursor löschen"
 
-# checkit
-#: info/echo-area.c:430
+#: info/echo-area.c:431
 msgid "Delete the character behind the cursor"
-msgstr "Das Zeichen hinter dem Cursor löschen"
+msgstr "Das Zeichen links vom Cursor löschen"
 
-#: info/echo-area.c:451
+#: info/echo-area.c:452
 msgid "Cancel or quit operation"
 msgstr "Operation abbrechen oder beenden"
 
-#: info/echo-area.c:466
+#: info/echo-area.c:467
 msgid "Accept (or force completion of) this line"
 msgstr "Akzeptiere diese Zeile (oder erzwinge ihre Vervollständigung)"
 
-#: info/echo-area.c:471
+#: info/echo-area.c:472
 msgid "Insert next character verbatim"
 msgstr "Das nächste Zeichen wörtlich eingeben"
 
-#: info/echo-area.c:479
+#: info/echo-area.c:480
 msgid "Insert this character"
 msgstr "Dieses Zeichen eingeben"
 
-# checkit
-#: info/echo-area.c:497
+#: info/echo-area.c:498
 msgid "Insert a TAB character"
-msgstr "Ein TAB-Zeichen eingeben"
+msgstr "Ein Tabulator-Zeichen eingeben"
 
-#: info/echo-area.c:504
+#: info/echo-area.c:505
 msgid "Transpose characters at point"
-msgstr "Zeichen am Point umstellen"
+msgstr "Zeichen an momentaner Position umstellen"
 
-#: info/echo-area.c:555
+#: info/echo-area.c:556
 msgid "Yank back the contents of the last kill"
-msgstr "Füge den Inhalt des letzten Killens ein"
+msgstr "Füge den Inhalt des letzten Löschvorgangs ein"
 
 # IMO muss "kill" auch im Folgenden wörtlich üs werden -ke-
-#: info/echo-area.c:562
+#: info/echo-area.c:563
 msgid "Kill ring is empty"
-msgstr "Der Kill-Ring ist leer"
+msgstr "Der Lösch-Ring ist leer"
 
-#: info/echo-area.c:575
+#: info/echo-area.c:576
 msgid "Yank back a previous kill"
-msgstr "Füge ein vorangehendes Killen ein"
+msgstr "Füge Inhalt eines vorangegangenen Löschvorgangs ein"
 
-#: info/echo-area.c:608
+#: info/echo-area.c:609
 msgid "Kill to the end of the line"
-msgstr "Bis zum Ende der Zeile killen"
+msgstr "Bis zum Ende der Zeile löschen"
 
-#: info/echo-area.c:621
+#: info/echo-area.c:622
 msgid "Kill to the beginning of the line"
-msgstr "Bis zum Anfang der Zeile killen"
+msgstr "Bis zum Anfang der Zeile löschen"
 
-#: info/echo-area.c:633
+#: info/echo-area.c:634
 msgid "Kill the word following the cursor"
-msgstr "Das dem Cursor folgende Wort killen"
+msgstr "Das dem Cursor folgende Wort löschen"
 
-#: info/echo-area.c:652
+#: info/echo-area.c:653
 msgid "Kill the word preceding the cursor"
-msgstr "Das dem Cursor vorangehende Wort killen"
+msgstr "Das dem Cursor vorangehende Wort löschen"
 
-#: info/echo-area.c:872 info/echo-area.c:932
+#: info/echo-area.c:868 info/echo-area.c:924
 msgid "No completions"
 msgstr "Keine Vervollständigungen"
 
-#: info/echo-area.c:874
+#: info/echo-area.c:870
 msgid "Not complete"
 msgstr "Nicht vollständig"
 
-#: info/echo-area.c:919
+#: info/echo-area.c:911
 msgid "List possible completions"
 msgstr "Mögliche Vervollständigungen auflisten"
 
-#: info/echo-area.c:936
+#: info/echo-area.c:928
 msgid "Sole completion"
 msgstr "Einzige Vervollständigung"
 
-#: info/echo-area.c:945
+#: info/echo-area.c:937
 msgid "One completion:\n"
 msgstr "Eine Vervollständigung:\n"
 
-#: info/echo-area.c:946
+#: info/echo-area.c:938
 #, c-format
 msgid "%d completions:\n"
 msgstr "%d Vervollständigungen:\n"
 
-#: info/echo-area.c:1092
+#: info/echo-area.c:1085
 msgid "Insert completion"
 msgstr "Vervollständigung einfügen"
 
-#: info/echo-area.c:1225
+#: info/echo-area.c:1220
 msgid "Building completions..."
-msgstr "Bilde Vervollständigungen..."
+msgstr "Vervollständigungen werden erstellt..."
 
-# checkit
-#: info/echo-area.c:1342
+#: info/echo-area.c:1340
 msgid "Scroll the completions window"
-msgstr "Vervollständigungs-Fenster »scrollen«"
+msgstr "Im Vervollständigungs-Fenster blättern"
 
-#: info/footnotes.c:212
+#: info/footnotes.c:213
 msgid "Footnotes could not be displayed"
 msgstr "Fußnoten können nicht angezeigt werden"
 
-#: info/footnotes.c:238
+#: info/footnotes.c:239
 msgid "Show the footnotes associated with this node in another window"
-msgstr "Zeige die mit diesem Knoten verbundenen Fußnoten im anderen Fenster"
+msgstr ""
+"Zeige die zu diesem Knoten gehörenden Fußnoten in einem anderen Fenster"
 
 #: info/footnotes.h:26
 msgid "---------- Footnotes ----------"
 msgstr "---------- Fußnoten ----------"
 
-#: info/indices.c:175
+#: info/indices.c:172
 msgid "Look up a string in the index for this file"
-msgstr "Sieh eine Zeichenkette im Index dieser Datei nach"
+msgstr "Eine Zeichenkette im Index dieser Datei suchen"
 
-#: info/indices.c:205
+#: info/indices.c:199
 msgid "Finding index entries..."
-msgstr "Suche Index-Einträge..."
+msgstr "Index-Einträge werden gesucht..."
 
-# checkit
-# oder sind "Einträge" gemeint? -ke-
-#: info/indices.c:212
+#: info/indices.c:207
 msgid "No indices found."
 msgstr "Keine Indizes gefunden."
 
-#: info/indices.c:222
+#: info/indices.c:217
 msgid "Index entry: "
 msgstr "Index-Eintrag: "
 
-#: info/indices.c:332
+#: info/indices.c:325
 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"
+"Zum nächsten übereinstimmenden Index-Eintrag vom letzten „\\[index-search]“-"
+"Befehl gehen"
 
-#: info/indices.c:342
+#: info/indices.c:335
 msgid "No previous index search string."
-msgstr "Keine vorangehende zu suchende Index-Zeichenkette."
+msgstr "Keine vorherige zu suchende Index-Zeichenkette."
 
-#: info/indices.c:349
+#: info/indices.c:342
 msgid "No index entries."
 msgstr "Keine Index-Einträge."
 
 # checkit
 # kann im Deutschen nachgebildet werden, aber... -ke-
-#: info/indices.c:382
+#: info/indices.c:375
 #, c-format
-msgid "No %sindex entries containing \"%s\"."
-msgstr "Keine %sIndex-Einträge beinhalten »%s«."
+msgid "No %sindex entries containing `%s'."
+msgstr "Keine %sindex-Einträge enthalten „%s“."
 
-#: info/indices.c:383
+#: info/indices.c:376
 msgid "more "
 msgstr "weiteren "
 
-#: info/indices.c:393
+#: info/indices.c:386
 msgid "CAN'T SEE THIS"
 msgstr "DIES IST NICHT ZU SEHEN"
 
-#: info/indices.c:429
+#: info/indices.c:422
 #, c-format
-msgid "Found \"%s\" in %s. (`\\[next-index-match]' tries to find next.)"
-msgstr ""
-"»%s« in %s gefunden. (»\\[next-index-match]« versucht, nächsten Eintrag zu "
-"finden.)"
+msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
+msgstr "„%s“ in %s gefunden. (Nächster Eintrag mit „\\[next-index-match]“.)"
 
-#: info/indices.c:549
+#: info/indices.c:541
 #, c-format
-msgid "Scanning indices of \"%s\"..."
-msgstr "Index von »%s« wird durchsucht..."
+msgid "Scanning indices of `%s'..."
+msgstr "Indizes von „%s“ werden durchsucht..."
 
-#: info/indices.c:603
+#: info/indices.c:596
 #, c-format
-msgid "No available info files have \"%s\" in their indices."
-msgstr "Keine verfügbare Info-Datei hat »%s« in ihrem Index."
+msgid "No available info files have `%s' in their indices."
+msgstr "Keine der verfügbaren Info-Dateien hat „%s“ in ihren Indizes."
 
-#: info/indices.c:632
+#: info/indices.c:622
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr ""
-"Durchsuche durch alle bekannten Info-Datei-Indizes nach einer Zeichenkette "
-"und bilde ein Menü"
+"Alle bekannten Info-Datei-Indizes nach einer Zeichenkette durchsuchen\n"
+"     und ein Menü erstellen"
 
-#: info/indices.c:636
+#: info/indices.c:626
 msgid "Index apropos: "
-msgstr "Index apropos: "
+msgstr "Index-Apropos: "
 
-#: info/indices.c:666
+#: info/indices.c:654
 #, c-format
 msgid ""
 "\n"
-"* Menu: Nodes whoses indices contain \"%s\":\n"
+"* Menu: Nodes whose indices contain `%s':\n"
 msgstr ""
 "\n"
-"* Menü: Knoten, deren Indizes »%s« beinhalten:\n"
+"* Menü: Knoten, deren Indizes „%s“ enthalten:\n"
 
-#: info/info.c:260 info/infokey.c:884
+#: info/info.c:275 info/infokey.c:899
+#, c-format
 msgid "Try --help for more information.\n"
-msgstr "»--help« gibt weitere Informationen.\n"
+msgstr "„--help“ gibt weitere Informationen.\n"
 
 # Hier de-Standard-Formulierung einsetzen!
-#: info/info.c:279 info/infokey.c:139 makeinfo/makeinfo.c:689
-#: util/install-info.c:1224 util/texindex.c:338
+#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
+#: util/texindex.c:343
 #, 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"
 "Es gibt KEINERLEI Garantie. Sie können diese Software unter den\n"
 "Bedingungen der GNU General Public License weiterverteilen.\n"
 "Für weiterführende Informationen zu diesen Fragen\n"
 "konsultieren Sie bitte die Datei namens COPYING.\n"
 
-#: info/info.c:462
+#: info/info.c:498
 #, c-format
 msgid "no index entries found for `%s'\n"
-msgstr "Keine Einträge für »%s« gefunden\n"
+msgstr "Keine Indexeinträge für „%s“ gefunden\n"
 
-#: info/info.c:555
+#: info/info.c:590
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
 msgstr "  -b, --speech-friendly     zu Sprachsynthesizern freundlich sein.\n"
 
 # Die "." am Zeilenende habe ich entfernt. -ke-
-#: info/info.c:562
+#: info/info.c:597
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -327,10 +330,12 @@ msgid ""
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
 "  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
-"  -R, --raw-escapes            don't remove ANSI escapes from man pages.\n"
+"  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+"      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
 "  -O, --show-options, --usage  go to command-line options node.\n"
 "%s      --subnodes               recursively output menu items.\n"
+"  -w, --where, --location      print physical location of Info file.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
 "\n"
@@ -352,49 +357,49 @@ msgstr ""
 "Zum Lesen von Dokumentation, die im Info-Format vorliegt.\n"
 "\n"
 "Optionen:\n"
-"      --apropos=ZKETTE      nach einer ZKETTE in allen Indizes aller Manual "
-"suchen\n"
+"      --apropos=ZKETTE      ZKETTE in allen Indizes sämtlicher Info-Dateien\n"
+"                              suchen\n"
 "  -d, --directory=VERZ      VERZ dem INFOPATH hinzufügen\n"
-"      --dribble=DATEI       Tasteneingaben des Benutzers in DATEI merken\n"
+"      --dribble=DATEI       Tasteneingaben des Nutzers in DATEI merken\n"
 "  -f, --file=DATEI          zu besuchende Info-DATEI angeben\n"
 "  -h, --help                diese Hilfe anzeigen\n"
-"      --index-search=KETTE  zu einem Knoten gehen, auf den der Indexeintrag "
-"KETTE\n"
-"                              zeigt\n"
-"  -n, --node=KNOTEN         Knoten in der ersten zu besuchenden Info-Datei "
-"angeben\n"
+"      --index-search=KETTE  zu einem Knoten gehen, auf den der Indexeintrag\n"
+"                              KETTE zeigt\n"
+"  -n, --node=KNOTEN         Knoten in der ersten zu besuchenden Info-Datei\n"
+"                              angeben\n"
 "  -o, --output=DATEI        ausgewählte Knoten nach DATEI ausgeben\n"
-"  -R, --raw-escapes         ANSI-Escapes aus Manpages nicht entfernen\n"
+"  -R, --raw-escapes         „rohe“ ANSI-Escapes ausgeben (Voreinstellung)\n"
+"      --no-raw-escapes      Escapes als wörtlichen Text ausgeben\n"
 "      --restore=DATEI       die beginnenden Tasteneingaben von DATEI lesen\n"
 "  -O, --show-options, --usage\n"
 "                            zum Knoten mit den Optionen für den "
-"Befehlsaufruf gehen\n"
-"%s      --subnodes            Menüpunkte rekursiv ausgeben\n"
-"      --vi-keys             vi- und less-artige Tastenbindungen benutzen\n"
+"Befehlsaufruf\n"
+"                              gehen\n"
+"%s      --subnodes            Menüeinträge rekursiv ausgeben\n"
+"  -w, --where, --location   physischen Ort des Info-Datei anzeigen\n"
+"      --vi-keys             Tastenbindungen ähnlich zu vi und less benutzen\n"
 "      --version             Programmversion anzeigen\n"
 "\n"
 "Der erste Parameter, der keine Option ist, ist der Menüeintrag, von dem aus\n"
-"gestartet werden soll; nach diesem Menüeintrag wird in allen »dir«-Datei\n"
+"gestartet werden soll; nach diesem Menüeintrag wird in allen „dir“-Datei\n"
 "gemäß dem INFOPATH gesucht.\n"
-"Wenn kein Menüeintrag angegeben wird, packt info alle »dir«-Dateien "
-"zusammen\n"
+"Wird kein Menüeintrag angegeben, packt info alle „dir“-Dateien zusammen\n"
 "und zeigt das Ergebnis an.\n"
-"Verbleibende Parameter werden als Namen von Menüeinträgen des zuerst "
-"besuchten\n"
-"Knotens angesehen.\n"
+"Verbleibende Parameter werden als Namen von Menüeinträgen des ersten zu\n"
+"besuchenden Knotens angesehen.\n"
 "\n"
 "Beispiele:\n"
-"  info                       Das oberste »dir«-Menü anzeigen\n"
-"  info emacs                 Beim emacs-Knoten im obersten »dir«-Menü "
+"  info                       das oberste „dir“-Menü anzeigen\n"
+"  info emacs                 beim emacs-Knoten im obersten „dir“-Menü "
 "beginnen\n"
-"  info emacs buffers         Beim buffers-Knoten im emacs-Manual beginnen\n"
-"  info --show-options emacs  Beim Knoten mit den emacs-Kommandozeilen-"
+"  info emacs buffers         beim buffers-Knoten im emacs-Manual beginnen\n"
+"  info --show-options emacs  beim Knoten mit den emacs-Kommandozeilen-"
 "Optionen\n"
 "                               beginnen\n"
-"  info -f ./foo.info         Datei ./foo.info anzeigen\n"
+"  info -f ./foo.info         datei ./foo.info anzeigen\n"
 
-#: info/info.c:598 info/infokey.c:903 makeinfo/makeinfo.c:474
-#: util/install-info.c:421 util/texindex.c:286
+#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
+#: util/install-info.c:466 util/texindex.c:292
 msgid ""
 "\n"
 "Email bug reports to bug-texinfo@gnu.org,\n"
@@ -402,80 +407,81 @@ msgid ""
 "Texinfo home page: http://www.gnu.org/software/texinfo/"
 msgstr ""
 "\n"
-"Fehlerberichte per E-Mail an bug-texinfo@gnu.org schicken,\n"
-"allgemeine Fragen und Gedankenaustausch an help-texinfo@gnu.org.\n"
+"Fehlerberichte (auf Englisch, mit LC_ALL=C) per E-Mail an bug-texinfo@gnu."
+"org\n"
+"schicken, allgemeine Fragen und Gedankenaustausch an help-texinfo@gnu.org.\n"
 "Texinfos Homepage: http://www.gnu.org/software/texinfo/"
 
-#: info/info.c:632
+#: info/info.c:669
 #, c-format
 msgid "Cannot find node `%s'."
-msgstr "Kann den Knoten »%s« nicht finden."
+msgstr "Knoten „%s“ nicht gefunden."
 
-#: info/info.c:633
+#: info/info.c:670
 #, c-format
 msgid "Cannot find node `(%s)%s'."
-msgstr "Kann den Knoten »(%s)%s« nicht finden."
+msgstr "Knoten „(%s)%s“ nicht gefunden."
 
-#: info/info.c:634
+#: info/info.c:671
 msgid "Cannot find a window!"
-msgstr "Kann kein Fenster finden!"
+msgstr "Kein Fenster gefunden!"
 
-#: info/info.c:635
+#: info/info.c:672
 msgid "Point doesn't appear within this window's node!"
-msgstr "Der Point erscheint nicht in dem Knoten dieses Fensters!"
+msgstr "Momentane Position erscheint nicht in dem Knoten dieses Fensters!"
 
-#: info/info.c:636
+#: info/info.c:673
 msgid "Cannot delete the last window."
 msgstr "Kann das letzte Fenster nicht löschen!"
 
-#: info/info.c:637
+#: info/info.c:674
 msgid "No menu in this node."
 msgstr "Kein Menü in diesem Knoten."
 
-#: info/info.c:638
+#: info/info.c:675
 msgid "No footnotes in this node."
 msgstr "Keine Fußnoten in diesem Knoten."
 
-#: info/info.c:639
+#: info/info.c:676
 msgid "No cross references in this node."
 msgstr "Keine Querverweise in diesem Knoten."
 
-#: info/info.c:640
+#: info/info.c:677
 #, c-format
 msgid "No `%s' pointer for this node."
-msgstr "Kein »%s«-Verweis für diesem Knoten."
+msgstr "Kein „%s“-Verweis für diesem Knoten."
 
-#: info/info.c:641
+#: info/info.c:678
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
-msgstr "Unbekannter Info-Befehl `%c'; `?' eingeben, um Hilfe zu bekommen."
+msgstr "Unbekannter Info-Befehl „%c“. „?“ eingeben, um Hilfe zu bekommen."
 
-#: info/info.c:642
+#: info/info.c:679
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
-msgstr "Der Terminaltyp `%s' ist nicht fähig genug, um Info laufen zu lassen."
+msgstr "Der Terminaltyp „%s“ ist nicht fähig genug, um Info auszuführen."
 
-#: info/info.c:643
+#: info/info.c:680
 msgid "You are already at the last page of this node."
 msgstr "Sie sind bereits auf der letzten Seite dieses Knotens."
 
-#: info/info.c:644
+#: info/info.c:681
 msgid "You are already at the first page of this node."
 msgstr "Sie sind bereits auf der ersten Seite dieses Knotens."
 
-#: info/info.c:645
+#: info/info.c:682
 msgid "Only one window."
 msgstr "Nur ein Fenster."
 
-#: info/info.c:646
+#: info/info.c:683
 msgid "Resulting window would be too small."
 msgstr "Das entstehende Fenster wäre zu klein."
 
-#: info/info.c:647
+#: info/info.c:684
 msgid "Not enough room for a help window, please delete a window."
-msgstr "Nicht genügend Platz für ein Hilfefenster, bitte ein Fenster löschen."
+msgstr "Nicht genügend Platz für ein Hilfefenster. Bitte ein Fenster löschen."
 
-#: info/infodoc.c:45 info/infodoc.c:94
+#: info/infodoc.c:46 info/infodoc.c:95
 msgid ""
 "Basic Commands in Info Windows\n"
 "******************************\n"
@@ -483,19 +489,19 @@ msgstr ""
 "Grundbefehle in Info-Fenstern\n"
 "*****************************\n"
 
-#: info/infodoc.c:48
+#: info/infodoc.c:49
 msgid "\\%-10[quit-help]  Quit this help.\n"
 msgstr "\\%-10[quit-help]  Diese Hilfe verlassen. \n"
 
-#: info/infodoc.c:49
+#: info/infodoc.c:50
 msgid "\\%-10[quit]  Quit Info altogether.\n"
 msgstr "\\%-10[quit]  Info gänzlich beenden.\n"
 
-#: info/infodoc.c:50
+#: info/infodoc.c:51
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
 msgstr "\\%-10[get-info-help-node]  Das Info-Tutorial aufrufen.\n"
 
-#: info/infodoc.c:52 info/infodoc.c:101
+#: info/infodoc.c:53 info/infodoc.c:102
 msgid ""
 "Selecting other nodes:\n"
 "----------------------\n"
@@ -503,110 +509,111 @@ msgstr ""
 "Andere Knoten wählen:\n"
 "---------------------\n"
 
-#: info/infodoc.c:54
+#: info/infodoc.c:55
 msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
-msgstr "\\%-10[next-node]  Zum nächsten Knoten (»next«) dieses Knoten gehen.\n"
+msgstr ""
+"\\%-10[next-node]  Zum nächsten Knoten („next“) dieses Knotens gehen.\n"
 
-#: info/infodoc.c:55
+#: info/infodoc.c:56
 msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
 msgstr ""
-"\\%-10[prev-node]  Zum vorherigen Knoten (»previous«) dieses Knoten gehen.\n"
+"\\%-10[prev-node]  Zum vorherigen Knoten („prev“) dieses Knotens gehen.\n"
 
-#: info/infodoc.c:56
+#: info/infodoc.c:57
 msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
-msgstr "\\%-10[up-node]  Von diesem Knoten aus hoch (»up«) gehen.\n"
+msgstr "\\%-10[up-node]  Von diesem Knoten aus aufwärts („up“) gehen.\n"
 
-#: info/infodoc.c:57
+#: info/infodoc.c:58
 msgid ""
 "\\%-10[menu-item]  Pick menu item specified by name.\n"
 "              Picking a menu item causes another node to be selected.\n"
 msgstr ""
-"\\%-10[menu-item]  Einen Menüeintrag per Namen auswählen.\n"
-"              Auswahl eines Menüeintrags führt zu Auswahl eines anderen "
-"Knotens.\n"
+"\\%-10[menu-item]  Einen Menüeintrag nach dem Namen auswählen.\n"
+"              Auswahl eines Menüeintrags führt zu Auswahl eines anderen\n"
+"              Knotens.\n"
 
-#: info/infodoc.c:59
+#: info/infodoc.c:60
 msgid ""
 "\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
 msgstr ""
-"\\%-10[xref-item]  Einem Querverweis folgen. Liest den Namen der Referenz.\n"
+"\\%-10[xref-item]  Einem Querverweis folgen. Liest den Namen des Verweises.\n"
 
-#: info/infodoc.c:60
+#: info/infodoc.c:61
 msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
 msgstr ""
-"\\%-10[history-node]  Zum letzten in diesem Fenster betrachteten Knoten "
+"\\%-10[history-node]  Zum letzten in diesem Fenster schon besuchten Knoten "
 "gehen.\n"
 
-#: info/infodoc.c:61
+#: info/infodoc.c:62
 msgid ""
 "\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
 msgstr ""
-"\\%-10[move-to-next-xref]  Vor zur nächsten Verknüpfung auf dieser Seite "
+"\\%-10[move-to-next-xref]  Zur nächsten Verknüpfung auf dieser Seite "
 "springen.\n"
 
-#: info/infodoc.c:62
+#: info/infodoc.c:63
 msgid ""
 "\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
 "node.\n"
 msgstr ""
-"\\%-10[move-to-prev-xref]  Zurück zur vorigen Verknüpfung auf dieser Seite "
+"\\%-10[move-to-prev-xref]  Zur vorigen Verknüpfung auf dieser Seite "
 "springen.\n"
 
-#: info/infodoc.c:63
+#: info/infodoc.c:64
 msgid ""
 "\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
 msgstr ""
 "\\%-10[select-reference-this-line]  Der Verknüpfung unter dem Cursor "
 "folgen.\n"
 
-#: info/infodoc.c:64
+#: info/infodoc.c:65
 msgid ""
 "\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
 "node] (DIR)'.\n"
 msgstr ""
-"\\%-10[dir-node]  Zum »directory«-Knoten springen. Gleichbedeutend zu `"
-"\\[goto-node] (DIR)'.\n"
+"\\%-10[dir-node]  Zum „directory“-Knoten springen. Das gleiche wie „\\[goto-"
+"node] (DIR)“.\n"
 
-#: info/infodoc.c:65
+#: info/infodoc.c:66
 msgid ""
 "\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
 msgstr ""
-"\\%-10[top-node]  Zum obersten Knoten springen. Gleichbedeutend zu `\\[goto-"
-"node] Top'.\n"
+"\\%-10[top-node]  Zum obersten Knoten springen. Das gleiche wie „\\[goto-"
+"node] Top“.\n"
 
-#: info/infodoc.c:67 info/infodoc.c:115
+#: info/infodoc.c:68 info/infodoc.c:116
 msgid ""
 "Moving within a node:\n"
 "---------------------\n"
 msgstr ""
-"Bewegung innerhalb eines Knoten:\n"
-"--------------------------------\n"
-
-#: info/infodoc.c:69
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
-msgstr "\\%-10[scroll-forward]  Eine Seite vorwärts blättern.\n"
+"Bewegung innerhalb eines Knotens:\n"
+"---------------------------------\n"
 
 #: info/infodoc.c:70
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
-msgstr "\\%-10[scroll-backward]  Eine Seite rückwärts blättern.\n"
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "\\%-10[beginning-of-node]  Zum Anfang dieses Knotens gehen.\n"
 
 #: info/infodoc.c:71
-msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
-msgstr "\\%-10[beginning-of-node]  Zum Anfang dieses Knoten gehen.\n"
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgstr "\\%-10[end-of-node]  Zum Ende dieses Knotens gehen.\n"
 
 #: info/infodoc.c:72
-msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
-msgstr "\\%-10[end-of-node]  Zum Ende dieses Knoten gehen.\n"
+msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
+msgstr "\\%-10[next-line]  Eine Zeile vorblättern.\n"
 
 #: info/infodoc.c:73
-msgid "\\%-10[scroll-forward]  Scroll forward 1 line.\n"
-msgstr "\\%-10[scroll-forward]  Eine Zeile vorwärts blättern.\n"
+msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
+msgstr "\\%-10[prev-line]  Eine Zeile zurückblättern.\n"
 
 #: info/infodoc.c:74
-msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
-msgstr "\\%-10[scroll-backward]  Eine Zeile rückwärts blättern.\n"
+msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
+msgstr "\\%-10[scroll-forward]  Eine Seite vorblättern.\n"
+
+#: info/infodoc.c:75
+msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
+msgstr "\\%-10[scroll-backward]  Eine Seite zurückblättern.\n"
 
-#: info/infodoc.c:76 info/infodoc.c:124
+#: info/infodoc.c:77 info/infodoc.c:125
 msgid ""
 "Other commands:\n"
 "---------------\n"
@@ -614,223 +621,214 @@ msgstr ""
 "Weitere Befehle:\n"
 "----------------\n"
 
-#: info/infodoc.c:78
+#: info/infodoc.c:79
 msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
 msgstr ""
-"\\%-10[menu-digit]  Ersten ... neunten Eintrag aus dem Menü des Knoten "
+"\\%-10[menu-digit]  Ersten ... neunten Eintrag aus dem Menü des Knotens "
 "wählen.\n"
 
-#: info/infodoc.c:79
+#: info/infodoc.c:80
 msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
 msgstr ""
-"\\%-10[last-menu-item]  Letzten Eintrag aus dem Menü des Knoten wählen.\n"
+"\\%-10[last-menu-item]  Letzten Eintrag aus dem Menü des Knotens wählen.\n"
 
-#: info/infodoc.c:80
+#: info/infodoc.c:81
 msgid ""
 "\\%-10[index-search]  Search for a specified string in the index entries of "
 "this Info\n"
 "              file, and select the node referenced by the first entry "
 "found.\n"
 msgstr ""
-"\\%-10[index-search]  Nach einer angegebenen Zeichenkette in den "
-"Indexeintägen dieser\n"
-"              Info-Datei suchen und zu dem Knoten springen, der vom ersten\n"
-"              gefundenen Eintrag referenziert wird.\n"
+"\\%-10[index-search]  Eine Zeichenkette in den Indexeintägen dieser Info-"
+"Datei\n"
+"              suchen und zu dem Knoten springen, auf den der erste\n"
+"              gefundene Eintrag verweist.\n"
 
-#: info/infodoc.c:82
+#: info/infodoc.c:83
 msgid ""
 "\\%-10[goto-node]  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr ""
-"\\%-10[goto-node]  Zum per Namen angegebenen Knoten springen.\n"
-"              Ein Dateiname kann mit angegeben werden, also (DATEI)"
-"KNOTENNAME.\n"
+"\\%-10[goto-node]  Knoten nach Namen auswählen und dorthin springen. Ein\n"
+"              Dateiname kann mit angegeben werden, also (DATEI)KNOTENNAME.\n"
 
-#: info/infodoc.c:84
+#: info/infodoc.c:85
 msgid ""
 "\\%-10[search]  Search forward for a specified string\n"
 "              and select the node in which the next occurrence is found.\n"
 msgstr ""
-"\\%-10[search]  Vorwärtssuche durch diese Info-Datei nach angegebener "
-"Zeichenkette\n"
-"              und den Knoten wählen, in dem das nächste Vorkommen gefunden "
-"wurde.\n"
+"\\%-10[search]  Angegebene Zeichenkette in Vorwärtsrichtung suchen und den\n"
+"              Knoten wählen, in dem der nächste Eintrag gefunden wurde.\n"
 
-#: info/infodoc.c:86
+#: info/infodoc.c:87
 msgid ""
 "\\%-10[search-backward]  Search backward for a specified string\n"
 "              and select the node in which the previous occurrence is "
 "found.\n"
 msgstr ""
-"\\%-10[search-backward]  Rückwärtssuche durch diese Info-Datei nach "
-"angegebener Zeichenkette\n"
-"              und den Knoten wählen, in dem das nächste Vorkommen gefunden "
-"wurde.\n"
+"\\%-10[search-backward]  Angegebene Zeichenkette in Rückwärtsrichtung "
+"suchen\n"
+"              und den Knoten wählen, in dem der nächste Eintrag gefunden\n"
+"              wurde.\n"
 
-#: info/infodoc.c:97
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Quit this help.\n"
 msgstr "  %-10s  Diese Hilfe verlassen.\n"
 
-#: info/infodoc.c:98
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr "  %-10s  Info gänzlich beenden.\n"
 
-#: info/infodoc.c:99
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr "  %-10s  Das Info-Tutorial aufrufen.\n"
 
-#: info/infodoc.c:103
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
-msgstr "  %-10s  Zum nächsten Knoten (»next«) dieses Knoten gehen.\n"
+msgstr "  %-10s  Zum nächsten Knoten („next“) dieses Knotens gehen.\n"
 
-#: info/infodoc.c:104
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
-msgstr "  %-10s  Zum vorherigen Knoten (»previous«) dieses Knoten gehen.\n"
+msgstr "  %-10s  Zum vorherigen Knoten („prev“) dieses Knotens gehen.\n"
 
-#: info/infodoc.c:105
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
-msgstr "  %-10s  Von diesem Knoten aus hoch (»up«) gehen.\n"
+msgstr "  %-10s  Von diesem Knoten aus aufwärts („up“) gehen.\n"
 
-#: info/infodoc.c:106
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Pick menu item specified by name.\n"
-msgstr "  %-10s  Einen Menüeintrag per Namen auswählen.\n"
+msgstr "  %-10s  Einen Menüeintrag nach dem Namen auswählen.\n"
 
-#: info/infodoc.c:107
+#: info/infodoc.c:108
 msgid "              Picking a menu item causes another node to be selected.\n"
 msgstr ""
-"              Auswahl eines Menüeintrags führt zu Auswahl eines anderen "
-"Knotens.\n"
+"              Auswahl eines Menüeintrags führt zu Auswahl eines anderen\n"
+"              Knotens.\n"
 
-#: info/infodoc.c:108
+#: info/infodoc.c:109
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
-msgstr "  %-10s  Einem Querverweis folgen. Liest den Namen der Referenz.\n"
+msgstr "  %-10s  Einem Querverweis folgen. Liest den Namen des Verweises.\n"
 
-#: info/infodoc.c:109
+#: info/infodoc.c:110
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
-msgstr "  %-10s  Zum letzten in diesem Fenster betrachteten Knoten gehen.\n"
+msgstr "  %-10s  Zum letzten in diesem Fenster gezeigten Knoten gehen.\n"
 
-#: info/infodoc.c:110
+#: info/infodoc.c:111
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
-msgstr "  %-10s  Vor zur nächsten Verknüpfung auf dieser Seite springen.\n"
+msgstr "  %-10s  Zur nächsten Verknüpfung auf dieser Seite springen.\n"
 
-#: info/infodoc.c:111
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
 msgstr "  %-10s  Der Verknüpfung unter dem Cursor folgen.\n"
 
-#: info/infodoc.c:112
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
-msgstr ""
-"  %-10s  Zum »directory«-Knoten springen. Gleichbedeutend mit »g (DIR)«.\n"
+msgstr "  %-10s  Zum „directory“-Knoten springen. Das gleiche wie „g (DIR)“.\n"
 
-#: info/infodoc.c:113
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
-msgstr "  %-10s  Zum »Top«-Knoten springen. Gleichbedeutend mit »g Top«.\n"
+msgstr "  %-10s  Zum „Top“-Knoten springen. Das gleiche wie „g Top“.\n"
 
-#: info/infodoc.c:117
+#: info/infodoc.c:118
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
-msgstr "  %-10s  Eine Seite vorwärts blättern.\n"
+msgstr "  %-10s  Eine Seite vorblättern.\n"
 
-#: info/infodoc.c:118
+#: info/infodoc.c:119
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
-msgstr "  %-10s  Eine Seite rückwärts blättern.\n"
+msgstr "  %-10s  Eine Seite zurückblättern.\n"
 
-#: info/infodoc.c:119
+#: info/infodoc.c:120
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
 msgstr "  %-10s  Zum Anfang dieses Knotens gehen.\n"
 
-#: info/infodoc.c:120
+#: info/infodoc.c:121
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
 msgstr "  %-10s  Zum Ende dieses Knotens gehen.\n"
 
-#: info/infodoc.c:121
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
-msgstr "  %-10s  Eine Zeile vorwärts blättern.\n"
+msgstr "  %-10s  Eine Zeile vorblättern.\n"
 
-#: info/infodoc.c:122
+#: info/infodoc.c:123
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
-msgstr "  %-10s  Eine Zeile rückwärts blättern.\n"
+msgstr "  %-10s  Eine Zeile zurückblättern.\n"
 
-#: info/infodoc.c:126
+#: info/infodoc.c:127
 #, c-format
 msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
-msgstr "  %-10s  Ersten ... neunten Eintrag aus dem Menü des Knoten wählen.\n"
+msgstr "  %-10s  Ersten ... neunten Eintrag aus dem Menü des Knotens wählen.\n"
 
-#: info/infodoc.c:127
+#: info/infodoc.c:128
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
-msgstr "  %-10s  Letzten Eintrag aus dem Menü des Knoten wählen.\n"
+msgstr "  %-10s  Letzten Eintrag aus dem Menü des Knotens wählen.\n"
 
-#: info/infodoc.c:128
+#: info/infodoc.c:129
 #, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
 msgstr ""
-"  %-10s  Nach einer Zeichenkette in den Indexeinträgen dieser Info-Datei\n"
+"  %-10s  Eine Zeichenkette in den Indexeinträgen dieser Info-Datei suchen\n"
 
-#: info/infodoc.c:129
+#: info/infodoc.c:130
 msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
 msgstr ""
-"      suchen und den Knoten auswählen, bezeichnet vom ersten gefundenen "
-"Eintrag.\n"
+"                    und zu dem Knoten springen, auf den der erste gefundene\n"
+"                    Eintrag verweist.\n"
 
-#: info/infodoc.c:130
+#: info/infodoc.c:131
 #, c-format
 msgid "  %-10s  Move to node specified by name.\n"
-msgstr "  %-10s  Zum per Namen angegebenen Knoten springen.\n"
+msgstr "  %-10s  Knoten nach Namen auswählen und dorthin springen. Ein\n"
 
-#: info/infodoc.c:131
+#: info/infodoc.c:132
 msgid ""
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr ""
-"              Ein Dateiname kann mit angegeben werden, also (DATEI)"
-"KNOTENNAME.\n"
+"              Dateiname kann mit angegeben werden, also (DATEI)KNOTENNAME.\n"
 
-#: info/infodoc.c:132
+#: info/infodoc.c:133
 #, c-format
 msgid "  %-10s  Search forward for a specified string,\n"
 msgstr ""
-"  %-10s  Vorwärtssuche durch diese Info-Datei nach angegebener Zeichenkette\n"
+"  %-10s  Angegebene Zeichenkette in Vorwärtsrichtung suchen und den Knoten\n"
 
-#: info/infodoc.c:133 info/infodoc.c:135
+#: info/infodoc.c:134 info/infodoc.c:136
 msgid ""
 "              and select the node in which the next occurrence is found.\n"
-msgstr ""
-"           und den Knoten wählen, in dem das nächste Vorkommen gefunden "
-"wurde.\n"
+msgstr "             wählen, in dem der nächste Eintrag gefunden wurde.\n"
 
-#: info/infodoc.c:134
+#: info/infodoc.c:135
 #, c-format
 msgid "  %-10s  Search backward for a specified string\n"
-msgstr ""
-"  %-10s  Rückwärtssuche durch diese Info-Datei nach angegebener "
-"Zeichenkette\n"
+msgstr "  %-10s  Angegebene Zeichenkette in Rückwärtsrichtung suchen\n"
 
-#: info/infodoc.c:313
+#: info/infodoc.c:316
 msgid "The current search path is:\n"
 msgstr "Der momentane Suchpfad ist:\n"
 
-#: info/infodoc.c:316
+#: info/infodoc.c:320
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
@@ -838,24 +836,24 @@ msgstr ""
 "Befehle, die in Info-Fenstern verfügbar sind:\n"
 "\n"
 
-#: info/infodoc.c:319
+#: info/infodoc.c:324
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
 msgstr ""
-"Befehle, die in der Echo-Area verfügbar sind:\n"
+"Befehle, die im Echo-Bereich verfügbar sind:\n"
 "\n"
 
-#: info/infodoc.c:340
+#: info/infodoc.c:347
 #, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
 "\n"
 msgstr ""
-"Die folgenden Befehle können nur via %s aufgerufen werden:\n"
+"Die folgenden Befehle können nur durch %s aufgerufen werden:\n"
 "\n"
 
-#: info/infodoc.c:343
+#: info/infodoc.c:351
 msgid ""
 "The following commands cannot be invoked at all:\n"
 "\n"
@@ -863,156 +861,171 @@ msgstr ""
 "Die folgenden Befehle können überhaupt nicht aufgerufen werden:\n"
 "\n"
 
-#: info/infodoc.c:367
+#: info/infodoc.c:375
 msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
 msgstr ""
-"--- »\\[history-node]« oder »\\[kill-node]« benutzen, um zu beenden ---\n"
+"--- „\\[history-node]“ oder „\\[kill-node]“ benutzen, um zu beenden ---\n"
 
-#: info/infodoc.c:477
+#: info/infodoc.c:485
 msgid "Display help message"
 msgstr "Diesen Hilfe-Text anzeigen"
 
-#: info/infodoc.c:495
+#: info/infodoc.c:503
 msgid "Visit Info node `(info)Help'"
-msgstr "Info-Knoten »(info)Help« besuchen"
+msgstr "Info-Knoten „(info)Help“ besuchen"
 
-#: info/infodoc.c:638
+#: info/infodoc.c:641
 msgid "Print documentation for KEY"
 msgstr "Dokumentation für KEY ausgeben"
 
-#: info/infodoc.c:650
+#: info/infodoc.c:653
 #, c-format
 msgid "Describe key: %s"
 msgstr "Beschreibe Taste: %s"
 
-#: info/infodoc.c:660
+#: info/infodoc.c:664
 #, c-format
 msgid "ESC %s is undefined."
 msgstr "ESC %s ist nicht definiert."
 
-#: info/infodoc.c:676 info/infodoc.c:703
+#: info/infodoc.c:680 info/infodoc.c:709
 #, c-format
 msgid "%s is undefined."
 msgstr "%s ist nicht definiert."
 
-#: info/infodoc.c:724
+#: info/infodoc.c:730
 #, c-format
 msgid "%s is defined to %s."
 msgstr "%s ist definiert als %s."
 
-#: info/infodoc.c:1151
+#: info/infodoc.c:1153
 msgid "Show what to type to execute a given command"
 msgstr "Anzeigen, was einzugeben ist, um einen gegebenen Befehl auszuführen"
 
-#: info/infodoc.c:1155
+#: info/infodoc.c:1157
 msgid "Where is command: "
 msgstr "Wo ist der Befehl: "
 
-#: info/infodoc.c:1177
+#: info/infodoc.c:1179
 #, c-format
 msgid "`%s' is not on any keys"
-msgstr "»%s« liegt auf keiner Taste"
+msgstr "Keine Taste mit „%s“ belegt"
 
-#: info/infodoc.c:1183
+#: info/infodoc.c:1186
 #, c-format
 msgid "%s can only be invoked via %s."
-msgstr "%s kann nur via %s aufgerufen werden."
+msgstr "%s kann nur durch %s aufgerufen werden."
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1190
 #, c-format
 msgid "%s can be invoked via %s."
-msgstr "%s kann via %s aufgerufen werden."
+msgstr "%s kann durch %s aufgerufen werden."
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1195
 #, c-format
 msgid "There is no function named `%s'"
-msgstr "Es gibt keine Funktion mit Namen »%s«"
+msgstr "Es gibt keine Funktion mit Namen „%s“"
 
-#: info/infokey.c:164
+# Hier de-Standard-Formulierung einsetzen!
+#: info/infokey.c:145
+#, 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"
+"Es gibt KEINERLEI Garantie. Sie können diese Software unter den\n"
+"Bedingungen der GNU General Public License weiterverteilen.\n"
+"Für weiterführende Informationen zu diesen Fragen\n"
+"konsultieren Sie bitte die Datei namens COPYING.\n"
+
+#: info/infokey.c:170
 msgid "incorrect number of arguments"
 msgstr "falsche Anzahl von Argumenten"
 
-#: info/infokey.c:194
+#: info/infokey.c:201
 #, c-format
 msgid "cannot open input file `%s'"
-msgstr "Eingabedatei »%s« kann nicht geöffnet werden."
+msgstr "Eingabedatei „%s“ kann nicht geöffnet werden."
 
-#: info/infokey.c:207
+#: info/infokey.c:215
 #, c-format
 msgid "cannot create output file `%s'"
-msgstr "Ausgabedatei »%s« kann nicht angelegt werden."
+msgstr "Ausgabedatei „%s“ kann nicht angelegt werden."
 
-#: info/infokey.c:217
+#: info/infokey.c:226
 #, c-format
 msgid "error writing to `%s'"
-msgstr "Fehler beim Schreiben von »%s«."
+msgstr "Fehler beim Schreiben von „%s“."
 
-#: info/infokey.c:222
+#: info/infokey.c:232
 #, c-format
 msgid "error closing output file `%s'"
-msgstr "Fehler beim Schließen der Ausgabedatei »%s«."
+msgstr "Fehler beim Schließen der Ausgabedatei „%s“."
 
-#: info/infokey.c:443
+#: info/infokey.c:450
 msgid "key sequence too long"
-msgstr "Schlüsselsequenz zu lang."
+msgstr "Tastenkombination zu lang."
 
-#: info/infokey.c:521
+#: info/infokey.c:529
 msgid "missing key sequence"
-msgstr "Fehlende Schlüsselsequenz."
+msgstr "Fehlende Tastenkombination."
 
-#: info/infokey.c:600
+#: info/infokey.c:610
 msgid "NUL character (\\000) not permitted"
 msgstr "NUL-Zeichen (\\000) nicht erlaubt."
 
-#: info/infokey.c:629
+#: info/infokey.c:641
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr "NUL-Zeichen (^%c) nicht erlaubt."
 
-#: info/infokey.c:652
+#: info/infokey.c:665
 msgid "missing action name"
 msgstr "Fehlender Befehlsname."
 
-#: info/infokey.c:667 info/infokey.c:733
+#: info/infokey.c:681 info/infokey.c:756
 msgid "section too long"
 msgstr "Abschnitt zu lang."
 
-#: info/infokey.c:673
+#: info/infokey.c:688
 #, c-format
 msgid "unknown action `%s'"
-msgstr "Unbekannter Befehl »%s«."
+msgstr "Unbekannter Befehl „%s“."
 
-#: info/infokey.c:682
+#: info/infokey.c:698
 msgid "action name too long"
 msgstr "Befehlsname zu lang."
 
-#: info/infokey.c:694
+#: info/infokey.c:712
 #, c-format
 msgid "extra characters following action `%s'"
-msgstr "Extrazeichen folgen Befehl »%s«."
+msgstr "Extrazeichen folgen Befehl „%s“."
 
-#: info/infokey.c:704
+#: info/infokey.c:723
 msgid "missing variable name"
 msgstr "Dateiname fehlt."
 
-#: info/infokey.c:712
+#: info/infokey.c:733
 msgid "missing `=' immediately after variable name"
-msgstr "Fehlendes »=« direkt hinter Variablenname."
+msgstr "Fehlendes „=“ direkt hinter Variablenname."
 
-#: info/infokey.c:719
+#: info/infokey.c:741
 msgid "variable name too long"
 msgstr "Variablenname zu lang"
 
-#: info/infokey.c:741
+#: info/infokey.c:765
 msgid "value too long"
 msgstr "Wert zu lang"
 
-#: info/infokey.c:875
+#: info/infokey.c:890
 #, c-format
 msgid "\"%s\", line %u: "
-msgstr "»%s«, Zeile %u: "
+msgstr "„%s“, Zeile %u: "
 
-#: info/infokey.c:891
+#: info/infokey.c:906
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1036,101 +1049,105 @@ msgstr ""
 "  --help                       diese Hilfe anzeigen und beenden\n"
 "  --version                    Versionsnummer anzeigen und beenden\n"
 
-#: info/infomap.c:1397
+#: info/infomap.c:1500
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
-msgstr "Ungültige Info-Schlüssel-Datei »%s« wird ignoriert - zu klein"
+msgstr "Ungültige Info-Schlüssel-Datei „%s“ wird ignoriert - zu klein"
 
-#: info/infomap.c:1400
+#: info/infomap.c:1503
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
-msgstr "Ungültige Info-Schlüssel-Datei »%s« wird ignoriert - zu groß"
+msgstr "Ungültige Info-Schlüssel-Datei „%s“ wird ignoriert - zu groß"
 
-#: info/infomap.c:1413
+#: info/infomap.c:1516
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
-msgstr "Fehler beim Lesen der Infokey-Datei »%s« - zu kurzes Lesen"
+msgstr "Fehler beim Lesen der Infokey-Datei „%s“ - zu kurzes Lesen"
 
-#: info/infomap.c:1431
+#: info/infomap.c:1535
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
 msgstr ""
-"Ungültige Infokey-Datei »%s« (fehlerhafte Magie) -- bitte mittels infokey "
+"Ungültige Infokey-Datei „%s“ (fehlerhafte Signatur) -- bitte mit infokey "
 "erneuern"
 
-#: info/infomap.c:1437
+#: info/infomap.c:1544
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
-msgstr "Ihre Infokey-Datei »%s« ist veraltet -- bitte mittels infokey erneuern"
+msgstr "Ihre Infokey-Datei „%s“ ist veraltet -- bitte mit infokey erneuern"
 
-#: info/infomap.c:1450
+#: info/infomap.c:1560
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
 msgstr ""
-"Ungültige Infokey-Datei »%s« (fehlerhafte Abschnittslänge) -- bitte mittels "
+"Ungültige Infokey-Datei „%s“ (fehlerhafte Abschnittslänge) -- bitte mit "
 "infokey erneuern"
 
-#: info/infomap.c:1470
+#: info/infomap.c:1581
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
 msgstr ""
-"Ungültige Infokey-Datei »%s« (fehlerhafter Abschnittscode) -- bitte mittels "
+"Ungültige Infokey-Datei „%s“ (fehlerhafter Abschnittscode) -- bitte mit "
 "infokey erneuern"
 
-#: info/infomap.c:1608
+#: info/infomap.c:1716
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr ""
 "Fehlerhafte Daten in Infokey-Datei -- einige Tastaturbindungen ignoriert"
 
-#: info/infomap.c:1659
+#: info/infomap.c:1766
 msgid "Bad data in infokey file -- some var settings ignored"
 msgstr ""
 "Fehlerhafte Daten in Infokey-Datei -- einige Variableneinstellungen ignoriert"
 
-#: info/m-x.c:70
+#: 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"
+msgstr "Namen eines Info-Befehls lesen und beschreiben"
 
-#: info/m-x.c:74
+#: info/m-x.c:73
 msgid "Describe command: "
 msgstr "Beschreibe den Befehl: "
 
-#: info/m-x.c:97
+#: 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"
+msgstr "Einen Befehlsnamen im Echo-Bereich lesen und ausführen"
 
-#: info/m-x.c:141
+#: info/m-x.c:140
 msgid "Cannot execute an `echo-area' command here."
-msgstr "Kann hier keinen »echo-area«-Befehl ausführen."
+msgstr "Befehl für Echo-Bereich hier nicht ausführbar."
+
+#: info/m-x.c:154
+#, c-format
+msgid "Undefined command: %s"
+msgstr "Undefinierter Befehl: %s"
 
-#: info/m-x.c:157
+#: info/m-x.c:160
 msgid "Set the height of the displayed window"
-msgstr "Setze die Höhe des angezeigten Fensters"
+msgstr "Höhe des angezeigten Fensters setzen"
 
-# checkit
-#: info/m-x.c:170
+#: info/m-x.c:173
 #, c-format
 msgid "Set screen height to (%d): "
-msgstr "Bildschirm-Höhe auf (%d) setzen: "
+msgstr "Setze Bildschirm-Höhe auf (%d): "
 
-# checkit
-#: info/makedoc.c:161 info/makedoc.c:169
+#: info/makedoc.c:162 info/makedoc.c:170
+#, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
 "\n"
 msgstr ""
-"   Quelldatei \"groveled\", damit diese Datei enthält:\n"
+"   Quelldateien durchsucht, damit diese Datei enthält:\n"
 "\n"
 
-#: info/makedoc.c:553
+#: info/makedoc.c:550
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
-msgstr "Datei »%s« ist nicht zu verändern.\n"
+msgstr "Datei „%s“ ist nicht veränderbar.\n"
 
-#: info/nodemenu.c:28
+#: info/nodemenu.c:31
 msgid ""
 "\n"
 "* Menu:\n"
@@ -1142,485 +1159,484 @@ msgstr ""
 "  (Datei)Knoten                     Zeilen  Größe  Beinhaltet Datei\n"
 "  -------------                     ------  -----  ----------------"
 
-#: info/nodemenu.c:199
+#: info/nodemenu.c:202
 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"
+"Hier ist das Menü der Knoten, die zuletzt besucht wurden.\n"
+"Einen Eintrag auswählen oder „\\[history-node]“ in einem anderen Fenster\n"
+"benützen.\n"
 
-#: info/nodemenu.c:219
+#: info/nodemenu.c:224
 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"
+msgstr "Ein Fenster mit einem Menü aller aktuell besuchten Knoten erzeugen"
 
-#: info/nodemenu.c:299
+#: info/nodemenu.c:304
 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"
+"Einen Knoten auswählen, der zuvor in einem sichtbaren Fenster\n"
+"     besucht wurde"
 
-#: info/nodemenu.c:311
+#: info/nodemenu.c:317
 msgid "Select visited node: "
-msgstr "Besuchten Knoten auswählen: "
+msgstr "Wähle besuchten Knoten aus: "
 
-#: info/nodemenu.c:331 info/session.c:2235
+#: info/nodemenu.c:337 info/session.c:2264
 #, c-format
 msgid "The reference disappeared! (%s)."
-msgstr "Der Verweispunkt ist verschwunden! (%s)."
+msgstr "Der Verweis ist verschwunden! (%s)."
 
-#: info/session.c:170
+#: info/session.c:162
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
 "for menu item."
 msgstr ""
-"Willkommen bei Info (Version %s). \"\\[get-help-window]\" eingeben, um Hilfe "
-"zu bekommen, \"\\[menu-item]\", Menüpunkt anzuzeigen."
+"Willkommen bei Info (Version %s). „\\[get-help-window]“ eingeben für Hilfe, "
+"„\\[menu-item]“ für Menüeintrag."
 
-#: info/session.c:643
+#: info/session.c:620
 msgid "Move down to the next line"
 msgstr "Eine Zeile nach unten bewegen"
 
-#: info/session.c:658
+#: info/session.c:635
 msgid "Move up to the previous line"
 msgstr "Eine Zeile nach oben bewegen"
 
-#: info/session.c:673
+#: info/session.c:650
 msgid "Move to the end of the line"
 msgstr "Zum Ende dieser Zeile bewegen"
 
-#: info/session.c:693
+#: info/session.c:670
 msgid "Move to the start of the line"
 msgstr "Zum Anfang der Zeile bewegen"
 
-#: info/session.c:885 makeinfo/node.c:1357
+#: info/session.c:860 makeinfo/node.c:1424
 msgid "Next"
-msgstr "Next"
+msgstr "nächstes"
 
-#: info/session.c:888
+#: info/session.c:863
 msgid "Following Next node..."
-msgstr "Folge »Next«-Knoten..."
+msgstr "Folge „nächsten“ (Next) Knoten..."
 
-#: info/session.c:905
+#: info/session.c:881
 msgid "Selecting first menu item..."
-msgstr "Wähle ersten Menüpunkt aus..."
+msgstr "Wähle ersten Menüeintrag aus..."
 
-#: info/session.c:916
+#: info/session.c:893
 msgid "Selecting Next node..."
-msgstr "Wähle »Next«-Knoten aus..."
+msgstr "Wähle „nächsten“ (Next) Knoten aus..."
 
-#: info/session.c:986
+#: info/session.c:964
 #, c-format
 msgid "Moving Up %d time(s), then Next."
-msgstr "%d mal aufwärts bewegen (»Up«), dann der Nächste (»Next«)."
+msgstr "Bewege %d mal „aufwärts“ (Up), dann „nächstes“ (Next)."
 
-#: info/session.c:1010
+#: info/session.c:988
 msgid "No more nodes within this document."
 msgstr "Keine weiteren Knoten in diesem Dokument."
 
-#: info/session.c:1034
+#: info/session.c:1011
 msgid "No `Prev' for this node."
-msgstr "Kein »Prev« für diesem Knoten."
+msgstr "Kein „voriges“ (Prev) für diesem Knoten."
 
-# checkit
-#: info/session.c:1037 info/session.c:1092
+#: info/session.c:1014 info/session.c:1073
 msgid "Moving Prev in this window."
-msgstr "Zum nächsten (»Prev«) in diesem Fenster bewegen."
+msgstr "Adjustiere „vorigen“ Knoten (Prev) in diesem Fenster."
 
-#: info/session.c:1051
+#: info/session.c:1030
 msgid "No `Prev' or `Up' for this node within this document."
-msgstr "Kein »Prev« oder »Up« für diesen Knoten innerhalb dieses Dokuments."
+msgstr ""
+"Kein „voriges“ (Prev) oder „aufwärts“ (Up) für diesen Knoten innerhalb "
+"dieses Dokuments."
 
-#: info/session.c:1054
+#: info/session.c:1034
 msgid "Moving Up in this window."
-msgstr "Nach »Up« in diesem Fenster bewegen."
+msgstr "Adjustiere „aufwärts“ (Up) in diesem Fenster."
 
-#: info/session.c:1102
+#: info/session.c:1084
 msgid "Moving to `Prev's last menu item."
-msgstr "Zum letzten Menüpunkt von »Prev« bewegen."
+msgstr "Bewege zum letzten Menüeintrag von „voriges“ (Prev)."
 
-#: info/session.c:1113
+#: info/session.c:1095
 msgid "Move forwards or down through node structure"
 msgstr "Vorwärts oder abwärts durch die Knotenstruktur bewegen"
 
-#: info/session.c:1129
+#: info/session.c:1111
 msgid "Move backwards or up through node structure"
 msgstr "Zurück oder aufwärts durch die Knotenstruktur bewegen"
 
-#: info/session.c:1229
+#: info/session.c:1205
 msgid "Scroll forward in this window"
-msgstr "In diesem Fenster vorwärts »scrollen«"
+msgstr "In diesem Fenster vorwärts blättern"
 
-#: info/session.c:1237
+#: info/session.c:1213
 msgid "Scroll forward in this window and set default window size"
 msgstr ""
-"In diesem Fenster vorwärts »scrollen« und die Standard-Fenstergröße setzen"
+"In diesem Fenster vorwärts blättern und die Standard-Fenstergröße setzen"
 
-#: info/session.c:1245
+#: info/session.c:1221
 msgid "Scroll forward in this window staying within node"
-msgstr "In diesem Fenster vorwärts »scrollen« und in Knoten bleiben"
+msgstr "In diesem Fenster vorwärts blättern ohne den Knoten zu verlassen"
 
-#: info/session.c:1253
+#: info/session.c:1229
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr ""
-"In diesem Fenster vorwärts »scrollen« und in Knoten bleiben und Standard-"
-"Fenstergröße setzen"
+"In diesem Fenster vorwärts blättern (ohne den Knoten zu verlassen)\n"
+"     und Standard-Fenstergröße setzen"
 
-#: info/session.c:1261
+#: info/session.c:1237
 msgid "Scroll backward in this window"
-msgstr "In diesem Fenster rückwärts »scrollen«"
+msgstr "In diesem Fenster zurückblättern"
 
-#: info/session.c:1269
+#: info/session.c:1245
 msgid "Scroll backward in this window and set default window size"
-msgstr ""
-"In diesem Fenster rückwärts »scrollen« und die Standard-Fenstergröße setzen"
+msgstr "In diesem Fenster zurückblättern und die Standard-Fenstergröße setzen"
 
-#: info/session.c:1278
+#: info/session.c:1254
 msgid "Scroll backward in this window staying within node"
-msgstr "In diesem Fenster rückwärts »scrollen« und in Knoten bleiben"
+msgstr "In diesem Fenster zurückblättern ohne den Knoten zu verlassen"
 
-#: info/session.c:1286
+#: info/session.c:1262
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
 msgstr ""
-"In diesem Fenster rückwärts »scrollen« und in Knoten bleiben und Standard-"
-"Fenstergröße setzen"
+"In diesem Fenster zurück blättern (ohne den Knoten zu verlassen)\n"
+"     und Standard-Fenstergröße setzen"
 
-#: info/session.c:1294
+#: info/session.c:1270
 msgid "Move to the start of this node"
 msgstr "Zum Anfang dieses Knotens bewegen"
 
-#: info/session.c:1301
+#: info/session.c:1277
 msgid "Move to the end of this node"
 msgstr "Zum Ende dieses Knotens bewegen"
 
-#: info/session.c:1308
+#: info/session.c:1284
 msgid "Scroll down by lines"
-msgstr "Zeilenweise abwärts scrollen"
+msgstr "Zeilenweise vorblättern"
 
-#: info/session.c:1325
+#: info/session.c:1301
 msgid "Scroll up by lines"
-msgstr "Zeilenweise zurück scrollen"
+msgstr "Zeilenweise zurück blättern"
 
-#: info/session.c:1343
+#: info/session.c:1319
 msgid "Scroll down by half screen size"
-msgstr "Einen halben Bildschirm abwärts scrollen"
+msgstr "Einen halben Bildschirm vorblättern"
 
-#: info/session.c:1369
+#: info/session.c:1345
 msgid "Scroll up by half screen size"
-msgstr "Einen halben Bildschirm zurück scrollen"
+msgstr "Einen halben Bildschirm zurückblättern"
 
-#: info/session.c:1398
+#: info/session.c:1374
 msgid "Select the next window"
 msgstr "Das nächste Fenster auswählen"
 
-#: info/session.c:1437
+#: info/session.c:1413
 msgid "Select the previous window"
 msgstr "Das vorige Fenster auswählen"
 
-#: info/session.c:1488
+#: info/session.c:1464
 msgid "Split the current window"
 msgstr "Aktuelles Fenster unterteilen"
 
-#: info/session.c:1569
+#: info/session.c:1545
 msgid "Delete the current window"
 msgstr "Aktuelles Fenster löschen"
 
-#: info/session.c:1577
+#: info/session.c:1553
 msgid "Cannot delete a permanent window"
 msgstr "Ein permanentes Fenster kann nicht gelöscht werden"
 
-#: info/session.c:1610
+#: info/session.c:1585
 msgid "Delete all other windows"
 msgstr "Alle anderen Fenster löschen"
 
-#: info/session.c:1656
+#: info/session.c:1631
 msgid "Scroll the other window"
-msgstr "Das andere Fenster »scrollen«"
+msgstr "Im anderen Fenster vorblättern"
 
-#: info/session.c:1677
+#: info/session.c:1652
 msgid "Scroll the other window backward"
-msgstr "Das andere Fenster rückwärts blättern"
+msgstr "Im anderen Fenster zurück blättern"
 
-#: info/session.c:1683
+#: info/session.c:1658
 msgid "Grow (or shrink) this window"
 msgstr "Aktuelles Fenster vergrößern (oder verkleinern)"
 
-#: info/session.c:1694
+#: info/session.c:1669
 msgid "Divide the available screen space among the visible windows"
 msgstr ""
 "Den vorhandenen Bildschirmplatz unter allen sichtbaren Fenstern aufteilen"
 
-#: info/session.c:1701
+#: info/session.c:1676
 msgid "Toggle the state of line wrapping in the current window"
 msgstr "Den Status des Zeilenumbruchs im aktuellen Fenster umschalten"
 
-#: info/session.c:1880
+#: info/session.c:1848
 msgid "Select the Next node"
-msgstr "Den »Next«-Knoten auswählen"
+msgstr "Den „nächsten“ Knoten (Next) auswählen"
 
-#: info/session.c:1888
+#: info/session.c:1856
 msgid "Select the Prev node"
-msgstr "Den »Prev«-Knoten auswählen"
+msgstr "Den „vorigen“ Knoten (Prev) auswählen"
 
-#: info/session.c:1896
+#: info/session.c:1864
 msgid "Select the Up node"
-msgstr "Den übergeordneten Knoten auswählen (»Up«)"
+msgstr "Den übergeordneten Knoten auswählen („aufwärts“, Up)"
 
-#: info/session.c:1903
+#: info/session.c:1871
 msgid "Select the last node in this file"
 msgstr "Den letzten Knoten dieser Datei auswählen"
 
-# checkit
-#: info/session.c:1930 info/session.c:1963
+#: info/session.c:1898 info/session.c:1931
 msgid "This window has no additional nodes"
-msgstr "Dies Fenster hat keine weiteren Knoten"
+msgstr "Dieses Fenster hat keine weiteren Knoten"
 
-#: info/session.c:1936
+#: info/session.c:1904
 msgid "Select the first node in this file"
 msgstr "Den ersten Knoten dieser Datei auswählen"
 
-#: info/session.c:1970
+#: info/session.c:1938
 msgid "Select the last item in this node's menu"
-msgstr "Den letzten Punkt des Menüs dieses Knotens auswählen"
+msgstr "Den letzten Menüeintrag dieses Knotens auswählen"
 
-#: info/session.c:1976
+#: info/session.c:1944
 msgid "Select this menu item"
-msgstr "Diesen Menüpunkt auswählen"
+msgstr "Diesen Menüeintrag auswählen"
 
-#: info/session.c:2005
+#: info/session.c:1977
 #, c-format
 msgid "There aren't %d items in this menu."
-msgstr "Es sind keine %d Punkte in diesem Menü."
+msgstr "Es sind keine %d Einträge in diesem Menü."
 
-#: info/session.c:2148
+#: info/session.c:2171 info/session.c:2172
 #, c-format
 msgid "Menu item (%s): "
-msgstr "Menüpunkt (%s): "
+msgstr "Menüeintrag (%s): "
 
-#: info/session.c:2150
+#: info/session.c:2175
 msgid "Menu item: "
-msgstr "Menüpunkt: "
+msgstr "Menüeintrag: "
 
-#: info/session.c:2155
+#: info/session.c:2182 info/session.c:2183
 #, c-format
 msgid "Follow xref (%s): "
 msgstr "Folge xref (%s): "
 
-#: info/session.c:2157
+#: info/session.c:2186
 msgid "Follow xref: "
 msgstr "Folge xref: "
 
-#: info/session.c:2280
+#: info/session.c:2315
 msgid "Read a menu item and select its node"
-msgstr "Einen Menüpunkt lesen und seinen Knoten auswählen"
+msgstr "Einen Menüeintrag lesen und seinen Knoten auswählen"
 
-#: info/session.c:2288
+#: info/session.c:2323
 msgid "Read a footnote or cross reference and select its node"
-msgstr "Fußnote oder Querverweis lesen und den Konote auswählen"
+msgstr "Fußnote oder Querverweis lesen und den Knoten auswählen"
 
-#: info/session.c:2294
+#: info/session.c:2329
 msgid "Move to the start of this node's menu"
 msgstr "Zum Anfang des Menüs dieses Knotens bewegen"
 
-#: info/session.c:2318
+#: info/session.c:2353
 msgid "Visit as many menu items at once as possible"
-msgstr "So viele Menüpunkte wie möglich auf einmal besuchen"
+msgstr "So viele Menüeinträge wie möglich auf einmal besuchen"
 
-#: info/session.c:2346
+#: info/session.c:2381
 msgid "Read a node name and select it"
 msgstr "Den Namen eines Knotens lesen und diesen auswählen"
 
-#: info/session.c:2401 info/session.c:2405
+#: info/session.c:2436 info/session.c:2441
 msgid "Goto node: "
 msgstr "Gehe zu Knoten: "
 
-#: info/session.c:2471
+#: info/session.c:2505
 #, c-format
 msgid "No menu in node `%s'."
-msgstr "Kein Menü im Knoten »%s«."
+msgstr "Kein Menü im Knoten „%s“."
 
-#: info/session.c:2516
+#: info/session.c:2551
 #, c-format
 msgid "No menu item `%s' in node `%s'."
-msgstr "Kein Menüpunkt »%s« im Knoten »%s«."
+msgstr "Kein Menüeintrag „%s“ im Knoten „%s“."
 
-#: info/session.c:2546
+#: info/session.c:2581
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
-msgstr ""
-"Unmöglich, einen Knoten zu finden, der von »%s« in »%s« referenziert wird."
+msgstr "Kann keinen Knoten finden, der von „%s“ in „%s“ referenziert wird."
 
-#: info/session.c:2597
+#: info/session.c:2631
 msgid "Read a list of menus starting from dir and follow them"
-msgstr "Menüliste lesen; bei »dir« beginnen und ihnen folgen"
+msgstr "Menüliste lesen; bei „dir“ beginnen und ihnen folgen"
 
-#: info/session.c:2599
+#: info/session.c:2633
 msgid "Follow menus: "
-msgstr "Menüs folgen: "
+msgstr "Folge Menüs: "
 
-#: info/session.c:2797
+#: info/session.c:2826
 msgid "Find the node describing program invocation"
-msgstr "Den Knoten finden, der den Programm-Aufruf beschreibt"
+msgstr "Den Knoten finden, der den Programmaufruf beschreibt"
 
-#: info/session.c:2799
+#: info/session.c:2828
 #, c-format
 msgid "Find Invocation node of [%s]: "
-msgstr "Finden den Aufruf-Knoten von [%s]: "
+msgstr "Finde den Programmaufruf-Knoten von [%s]: "
 
-#: info/session.c:2837
+#: info/session.c:2866
 msgid "Read a manpage reference and select it"
 msgstr "Einen Verweis auf eine Manpage lesen und diese auswählen"
 
-#: info/session.c:2841
+#: info/session.c:2870
 msgid "Get Manpage: "
 msgstr "Hole Manpage: "
 
-#: info/session.c:2871
+#: info/session.c:2900
 msgid "Select the node `Top' in this file"
-msgstr "Den Knoten »Top« dieser Datei auswählen"
+msgstr "Den Knoten „Top“ dieser Datei auswählen"
 
-#: info/session.c:2877
+#: info/session.c:2906
 msgid "Select the node `(dir)'"
-msgstr "Den Knoten »(dir)« auswählen"
+msgstr "Den Knoten „(dir)“ auswählen"
 
-#: info/session.c:2897
+#: info/session.c:2923 info/session.c:2925
 #, c-format
 msgid "Kill node (%s): "
-msgstr "Kille Knoten (%s): "
+msgstr "Lösche Information über Knoten (%s): "
 
-#: info/session.c:2951
+#: info/session.c:2977
 #, c-format
 msgid "Cannot kill node `%s'"
-msgstr "Kann Knoten »%s« nicht killen"
+msgstr "Kann Information über Knoten „%s“ nicht löschen"
 
-#: info/session.c:2961
+#: info/session.c:2987
 msgid "Cannot kill the last node"
-msgstr "Der letzte Knoten kann nicht gekillt werden"
+msgstr "Information über den letzten Knoten kann nicht gelöscht werden"
 
-#: info/session.c:3047
+#: info/session.c:3073
 msgid "Select the most recently selected node"
 msgstr "Den zuletzt gewählten Knoten auswählen"
 
-#: info/session.c:3053
+#: info/session.c:3079
 msgid "Kill this node"
-msgstr "Diesen Knoten killen"
+msgstr "Information über diesen Knoten löschen"
 
-#: info/session.c:3061
+#: info/session.c:3087
 msgid "Read the name of a file and select it"
 msgstr "Den Namen einer Datei lesen und diese auswählen"
 
-#: info/session.c:3065
+#: info/session.c:3091
 msgid "Find file: "
-msgstr "Datei finden: "
+msgstr "Finde Datei: "
 
-#: info/session.c:3082
+#: info/session.c:3108
 #, c-format
 msgid "Cannot find `%s'."
-msgstr "Kann »%s« nicht finden."
+msgstr "Kann „%s“ nicht finden."
 
-#: info/session.c:3127 info/session.c:3248
+#: info/session.c:3151 info/session.c:3269
 #, c-format
 msgid "Could not create output file `%s'."
-msgstr "Ausgabe-Datei »%s« kann nicht angelegt werden."
+msgstr "Ausgabe-Datei „%s“ kann nicht angelegt werden."
 
-#: info/session.c:3140 info/session.c:3265 info/session.c:3326
+#: info/session.c:3165 info/session.c:3287 info/session.c:3347
 msgid "Done."
 msgstr "Fertig."
 
-#: info/session.c:3196
+#: info/session.c:3220
 #, c-format
 msgid "Writing node %s..."
-msgstr "Schreibe Knoten »%s«..."
+msgstr "Knoten „%s“ wird geschrieben..."
 
-#: info/session.c:3274
+#: info/session.c:3296
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
-msgstr "Den Inhalt dieses Knotens durch INFO_PRINT_COMMAND pipen"
+msgstr ""
+"Den Inhalt dieses Knotens an INFO_PRINT_COMMAND weiterreichen\n"
+"     (mittels einer Pipe)"
 
-#: info/session.c:3310
+#: info/session.c:3331
 #, c-format
 msgid "Cannot open pipe to `%s'."
-msgstr "Kann nicht nach »%s« pipen."
+msgstr "Kann Daten nicht nach „%s“ weiterreichen (mittels einer Pipe)."
 
-#: info/session.c:3316
+#: info/session.c:3337
 #, c-format
 msgid "Printing node %s..."
-msgstr "Drucke Knoten »%s«..."
+msgstr "Knoten „%s“ wird gedruckt..."
 
-#: info/session.c:3558
+#: info/session.c:3567
 #, c-format
 msgid "Searching subfile %s ..."
-msgstr "Durchsuche Unterdatei »%s«..."
+msgstr "Unterdatei „%s“ wird durchsucht..."
 
-#: info/session.c:3610
+#: info/session.c:3619
 msgid "Read a string and search for it case-sensitively"
 msgstr ""
 "Eine Zeichenkette einlesen und danach gemäß Groß-/Kleinschreibung suchen"
 
-#: info/session.c:3617
+#: info/session.c:3626
 msgid "Read a string and search for it"
 msgstr "Eine Zeichenkette einlesen und danach suchen"
 
-#: info/session.c:3625
+#: info/session.c:3634
 msgid "Read a string and search backward for it"
-msgstr "Eine Zeichenkette einlesen und danach rückwärts suchen"
+msgstr "Eine Zeichenkette einlesen und danach in Rückwärtsrichtung suchen"
 
-# checkit
-#: info/session.c:3667
+#: info/session.c:3670 info/session.c:3677
 #, c-format
 msgid "%s%sfor string [%s]: "
-msgstr "%s%s nach Zeichenkette [%s]: "
+msgstr "%s%snach Zeichenkette [%s]: "
 
-#: info/session.c:3668
+#: info/session.c:3671 info/session.c:3678
 msgid "Search backward"
-msgstr "Suche rückwärts"
+msgstr "Suche in Rückwärtsrichtung "
 
-#: info/session.c:3668
+#: info/session.c:3672 info/session.c:3678
 msgid "Search"
 msgstr "Suche"
 
-#: info/session.c:3669
+#: info/session.c:3673 info/session.c:3679
 msgid " case-sensitively "
-msgstr "gemäß Groß-/Kleinschreibung"
+msgstr " gemäß Groß-/Kleinschreibung "
 
-#: info/session.c:3669
+#: info/session.c:3674 info/session.c:3679
 msgid " "
 msgstr " "
 
-#: info/session.c:3709
+#: info/session.c:3718
 msgid "Search failed."
 msgstr "Suche fehlgeschlagen."
 
-#: info/session.c:3727
+#: info/session.c:3736
 msgid "Repeat last search in the same direction"
 msgstr "Letzte Suche in der gleichen Richtung wiederholen"
 
-#: info/session.c:3730 info/session.c:3740
+#: info/session.c:3739 info/session.c:3749
 msgid "No previous search string"
 msgstr "Keine vorherige Such-Zeichenkette."
 
-#: info/session.c:3737
+#: info/session.c:3746
 msgid "Repeat last search in the reverse direction"
 msgstr "Letzte Suche in der entgegengesetzten Richtung wiederholen"
 
-#: info/session.c:3755 info/session.c:3761
+#: info/session.c:3765 info/session.c:3771
 msgid "Search interactively for a string as you type it"
-msgstr "Interaktiv nach einer Zeichenkette während der Eingabe suchen"
+msgstr "Interaktiv eine Zeichenkette während der Eingabe suchen"
 
-#: info/session.c:3855
+#: info/session.c:3851
 msgid "I-search backward: "
-msgstr "Interactive Suche rückwarts: "
+msgstr "Interactive Suche in Rückwärtsrichtung: "
 
-#: info/session.c:3857
+#: info/session.c:3853
 msgid "I-search: "
-msgstr "Interaktive Suche"
+msgstr "Interaktive Suche: "
 
 # checkit
-#: info/session.c:3882
+#: info/session.c:3878 info/session.c:3880
 msgid "Failing "
 msgstr "Fehlgeschlagen "
 
@@ -1634,34 +1650,33 @@ msgstr "Zum nächsten Querverweis bewegen"
 
 #: info/session.c:4359
 msgid "Select reference or menu item appearing on this line"
-msgstr "Verweis oder Menüpunkt auswählen, der auf dieser Zeile erscheint"
+msgstr "Verweis oder Menüeintrag auswählen, der auf dieser Zeile erscheint"
 
-# checkit
-#: info/session.c:4381
+#: info/session.c:4382
 msgid "Cancel current operation"
 msgstr "Momentane Operation abbrechen"
 
-#: info/session.c:4388
+#: info/session.c:4389
 msgid "Quit"
-msgstr "Ende"
+msgstr "Beenden"
 
-#: info/session.c:4397
+#: info/session.c:4398
 msgid "Move the cursor to a specific line of the window"
-msgstr "Den Cursor nach einer bestimmten Zeile des Fensters bewegen"
+msgstr "Den Cursor zu einer bestimmten Zeile des Fensters bewegen"
 
-#: info/session.c:4429
+#: info/session.c:4430
 msgid "Redraw the display"
 msgstr "Anzeige erneut darstellen"
 
-#: info/session.c:4466
+#: info/session.c:4467
 msgid "Quit using Info"
 msgstr "Info beenden"
 
-#: info/session.c:4479
+#: info/session.c:4480
 msgid "Run command bound to this key's lowercase variant"
 msgstr ""
-"Befehl ausführen, der an die kleingeschriebene Variante dieser Taste "
-"gebunden ist"
+"Befehl ausführen, der an die kleingeschriebene Variante dieser\n"
+"     Taste gebunden ist"
 
 #: info/session.c:4491
 #, c-format
@@ -1669,73 +1684,73 @@ msgid "Unknown command (%s)."
 msgstr "Unbekannter Befehl (%s)."
 
 #: info/session.c:4494
-msgid "\"\" is invalid"
-msgstr "»« ist ungültig"
+#, c-format
+msgid "\"%s\" is invalid"
+msgstr "„%s“ ist ungültig"
 
 #: info/session.c:4495
 #, c-format
-msgid "\"%s\" is invalid"
-msgstr "»%s« ist ungültig"
+msgid "`%s' is invalid"
+msgstr "„%s“ ist ungültig"
 
-#: info/session.c:4713
+#: info/session.c:4709
 msgid "Add this digit to the current numeric argument"
 msgstr "Diese Zahl dem aktuellen numerischen Argument hinzufügen"
 
-#: info/session.c:4722
+#: info/session.c:4718
 msgid "Start (or multiply by 4) the current numeric argument"
-msgstr "Beginne (oder multipliziere mit 4) das aktuelle nummerische Argument"
+msgstr "Beginne (oder multipliziere mit 4) das aktuelle numerische Argument"
 
-#: info/session.c:4737
+#: info/session.c:4733
 msgid "Internally used by \\[universal-argument]"
-msgstr "Intern gebraucht von \\[universal-argument]"
+msgstr "Intern verwendet von \\[universal-argument]"
 
-#: info/tilde.c:344
+#: info/tilde.c:338
+#, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: Kein Speicher mehr!\n"
 
 #: info/variables.c:37
 msgid "When \"On\", footnotes appear and disappear automatically"
-msgstr "Wenn »On«, dann erscheinen und verschwinden Fußnoten automatisch"
+msgstr "Wenn „On“, dann erscheinen und verschwinden Fußnoten automatisch"
 
 #: info/variables.c:41
 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 "
+"Wenn „On“, dann werden beim Anlegen oder Löschen eines Fensters die anderen "
 "Fenster angepasst"
 
 #: info/variables.c:45
 msgid "When \"On\", flash the screen instead of ringing the bell"
-msgstr "Wenn »On«, dann den Bildschirm blinken lassen, kein akustisches Signal"
+msgstr "Wenn „On“, dann den Bildschirm blinken lassen, kein akustisches Signal"
 
 #: info/variables.c:49
 msgid "When \"On\", errors cause the bell to ring"
-msgstr "Wenn »On«, dann lassen Fehler ein akustisches Signal ertönen"
+msgstr "Wenn „On“, dann erzeugen Fehler ein akustisches Signal"
 
-# checkit
 #: info/variables.c:53
 msgid "When \"On\", Info garbage collects files which had to be uncompressed"
 msgstr ""
-"Wenn »On«, Info \"garbage collectet\" Dateien, die ausgepackt werden müssen"
+"Wenn „On“, dann behält Info keine Dateien im Speicher, die ausgepackt werden "
+"mussten"
 
 #: info/variables.c:56
 msgid "When \"On\", the portion of the matched search string is highlighted"
 msgstr ""
-"Wenn »On«, die übereinstimmende gefundene Zeichenkette wird gekennzeichnet"
+"Wenn „On“, dann wird die übereinstimmende gefundene Zeichenkette markiert"
 
 #: info/variables.c:60
 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"
+msgstr "Kontrolliert, was passiert, wenn am Ende eines Knotens geblättert wird"
 
 #: info/variables.c:64
 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"
+"Anzahl der Zeilen zu blättern, wenn der Cursor aus dem Fenster bewegt wird"
 
 #: info/variables.c:68
 msgid "When \"On\", Info accepts and displays ISO Latin characters"
-msgstr "Wenn »On«, dann akzeptiert Info ISO-Latin-Zeichen und zeigt diese an"
+msgstr "Wenn „On“, dann akzeptiert Info ISO-Latin-Zeichen und zeigt diese an"
 
 #: info/variables.c:74
 msgid "Explain the use of a variable"
@@ -1763,242 +1778,278 @@ msgstr "Setze %s auf den Wert (%d): "
 msgid "Set %s to value (%s): "
 msgstr "Setze %s auf den Wert (%s): "
 
-#: info/window.c:1164
+#: info/window.c:1138
 msgid "--*** Tags out of Date ***"
 msgstr "--*** Tags veraltet ***"
 
-#: info/window.c:1175
+#: info/window.c:1149
 msgid "-----Info: (), lines ----, "
 msgstr "-----Info: (), Zeilen ----, "
 
-#: info/window.c:1182
+#: info/window.c:1156
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr "-%s---Info: %s, %d Zeilen --%s--"
 
-#: info/window.c:1186
+#: info/window.c:1160
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr "-%s%s-Info: (%s)%s, %d Zeilen --%s--"
 
-#: info/window.c:1193
+#: info/window.c:1167
 #, c-format
 msgid " Subfile: %s"
 msgstr " Unterdatei: %s"
 
-#: lib/getopt.c:675
+#: lib/getopt.c:551 lib/getopt.c:570
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: Option `%s' ist zweideutig\n"
+msgstr "%s: Option „%s“ ist nicht eindeutig\n"
 
-#: lib/getopt.c:700
+#: lib/getopt.c:603 lib/getopt.c:607
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: Option `--%s' erlaubt kein Argument\n"
+msgstr "%s: Option „--%s“ erlaubt kein Argument\n"
 
-#: lib/getopt.c:705
+#: lib/getopt.c:616 lib/getopt.c:621
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: Option `%c%s' erlaubt kein Argument\n"
+msgstr "%s: Option „%c%s“ erlaubt kein Argument\n"
 
-#: lib/getopt.c:723 lib/getopt.c:896
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: Option `%s' benötigt kein Argument\n"
+msgstr "%s: Option „%s“ benötigt ein Argument\n"
 
-#: lib/getopt.c:752
+#: lib/getopt.c:727 lib/getopt.c:730
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: nicht erkannte Option `--%s'\n"
+msgstr "%s: nicht erkannte Option „--%s“\n"
 
-#: lib/getopt.c:756
+#: lib/getopt.c:738 lib/getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: nicht erkannte Option `%c%s'\n"
+msgstr "%s: nicht erkannte Option „%c%s“\n"
 
-#: lib/getopt.c:782
+#: lib/getopt.c:796 lib/getopt.c:799
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: ungültige Option -- %c\n"
 
-#: lib/getopt.c:785
+#: lib/getopt.c:805 lib/getopt.c:808
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ungültige Option -- %c\n"
 
-#: lib/getopt.c:815 lib/getopt.c:945
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: Option verlangt ein Argument -- %c\n"
+msgstr "%s: Option benötigt ein Argument -- %c\n"
 
-#: lib/getopt.c:862
+#: lib/getopt.c:935 lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: Option `-W %s' ist zweideutig\n"
+msgstr "%s: Option „-W %s“ ist nicht eindeutig\n"
 
-#: lib/getopt.c:880
+#: lib/getopt.c:978 lib/getopt.c:999
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: Option `-W %s' erlaubt kein Argument\n"
+msgstr "%s: Option „-W %s“ erlaubt kein Argument\n"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#, c-format
+msgid "arguments to @%s ignored"
+msgstr "Argumente zu @%s ignoriert"
+
+#: makeinfo/cmds.c:585
 msgid "January"
 msgstr "Januar"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "February"
 msgstr "Februar"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "March"
 msgstr "März"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "April"
 msgstr "April"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "May"
 msgstr "Mai"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "June"
 msgstr "Juni"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "July"
 msgstr "Juli"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "August"
 msgstr "August"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "September"
 msgstr "September"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "October"
 msgstr "Oktober"
 
-#: makeinfo/cmds.c:517
+#: makeinfo/cmds.c:587
 msgid "November"
 msgstr "November"
 
-#: makeinfo/cmds.c:517
+#: makeinfo/cmds.c:587
 msgid "December"
 msgstr "Dezember"
 
-#: makeinfo/cmds.c:658
+#: makeinfo/cmds.c:936
 #, c-format
 msgid "unlikely character %c in @var"
-msgstr "ungutes Zeichen %c in @var"
+msgstr "wahrscheinlich falsches Zeichen „%c“ in @var"
 
-#: makeinfo/cmds.c:701
+#: makeinfo/cmds.c:979
 msgid "@sc argument all uppercase, thus no effect"
-msgstr "@sc Argument durchweg in Großbuchstaben, somit keine Wirkung"
+msgstr "Argument von @sc besteht nur aus Großbuchstaben, somit keine Wirkung"
 
-#: makeinfo/cmds.c:759
+#: makeinfo/cmds.c:1034
 #, c-format
 msgid "`{' expected, but saw `%c'"
-msgstr "»{« erwartet, aber bekam »%c«"
+msgstr "„{“ erwartet, jedoch „%c“ bekommen"
 
-#: makeinfo/cmds.c:789
+#: makeinfo/cmds.c:1074
 msgid "end of file inside verb block"
-msgstr "Dateiende innerhalb eines Verb-Blocks"
+msgstr "Dateiende innerhalb eines @verb-Blocks"
 
-#: makeinfo/cmds.c:797
+#: makeinfo/cmds.c:1082
 #, c-format
 msgid "`}' expected, but saw `%c'"
-msgstr "»}« erwartet, aber bekam »%c«"
+msgstr "„}“ erwartet, jedoch „%c“ bekommen"
+
+#: makeinfo/cmds.c:1112
+msgid ""
+"@strong{Note...} produces a spurious cross-reference in Info; reword to "
+"avoid that"
+msgstr ""
+"@strong{Bemerkung...} erzeugt einen Pseudo-Querverweis in Info; "
+"umformulieren, um das zu vermeiden"
 
-#: makeinfo/cmds.c:942
+#: makeinfo/cmds.c:1305
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s ist obsolet"
 
-#: makeinfo/cmds.c:1014
+#: makeinfo/cmds.c:1414
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
-msgstr "@sp erfordert ein positives numerisches Argument, nicht »%s«"
+msgstr "@sp erfordert ein positives numerisches Argument, nicht „%s“"
 
-#: makeinfo/cmds.c:1348 makeinfo/cmds.c:1374 makeinfo/footnote.c:81
+#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "Fehlerhaftes Argument zu %c%s"
 
-#: makeinfo/cmds.c:1358 makeinfo/makeinfo.c:4140
+#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
 msgid "asis"
 msgstr "genau"
 
-#: makeinfo/cmds.c:1360 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
 msgid "none"
 msgstr "kein"
 
-#: makeinfo/defun.c:85
+#: makeinfo/cmds.c:1789
+#, c-format
+msgid "Bad argument to @%s"
+msgstr "Fehlerhafte Argumente zu @%s"
+
+#: makeinfo/cmds.c:1803
+msgid "insert"
+msgstr "Einfügen"
+
+#: makeinfo/defun.c:84
 msgid "Missing `}' in @def arg"
-msgstr "Fehlende »}« beim @def Argument"
+msgstr "Fehlende „}“ bei @def Argument"
 
-#: makeinfo/defun.c:363
+#: makeinfo/defun.c:403
 msgid "Function"
 msgstr "Funktion"
 
-#: makeinfo/defun.c:366
+#: makeinfo/defun.c:406
 msgid "Macro"
 msgstr "Makro"
 
 # checkit
-#: makeinfo/defun.c:369
+#: makeinfo/defun.c:409
 msgid "Special Form"
 msgstr "Spezielle Form"
 
-#: makeinfo/defun.c:373
+#: makeinfo/defun.c:413
 msgid "Variable"
-msgstr "Variable: "
+msgstr "Variable"
 
-#: makeinfo/defun.c:376
+#: makeinfo/defun.c:416
 msgid "User Option"
-msgstr "User-Option"
+msgstr "Nutzeroption"
 
+# checkit
 # What does this mean? -ke-
-#: makeinfo/defun.c:380
+#: makeinfo/defun.c:420
 msgid "Instance Variable"
 msgstr "Instance Variable"
 
-#: makeinfo/defun.c:384
+#: makeinfo/defun.c:424
 msgid "Method"
 msgstr "Methode"
 
-#: makeinfo/defun.c:466 makeinfo/defun.c:470 makeinfo/defun.c:615
-#: makeinfo/defun.c:631 makeinfo/defun.c:671
+#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
+#: makeinfo/defun.c:644 makeinfo/xml.c:2229
 msgid "of"
 msgstr "aus"
 
-#: makeinfo/defun.c:474 makeinfo/defun.c:478 makeinfo/defun.c:482
-#: makeinfo/defun.c:624 makeinfo/defun.c:676
+#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
 msgid "on"
 msgstr "ein"
 
-# checkit
-#: makeinfo/defun.c:717
+#: makeinfo/defun.c:711
 #, c-format
-msgid "Must be in `%s' insertion to use `%sx'"
-msgstr "Muss in einer »%s«-Einfügung sein, um »%sx« zu benutzen"
+msgid "Must be in `@%s' environment to use `@%s'"
+msgstr "Muss in einer „@%s“-Umgebung sein, um „@%s“ zu benutzen"
 
-#: makeinfo/files.c:448
+#: makeinfo/files.c:435
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr "%s: getwd: %s, %s\n"
 
+#: makeinfo/files.c:638
+#, c-format
+msgid "`%s' omitted before output filename"
+msgstr "„%s“ weggelassen vor Ausgabedateiname"
+
+#: makeinfo/files.c:646
+#, c-format
+msgid "`%s' omitted since writing to stdout"
+msgstr "„%s“ weggelassen, da in Standardausgabe geschrieben wird"
+
+#: makeinfo/files.c:694
+msgid "Output buffer not empty."
+msgstr "Ausgabepuffer nicht leer."
+
 #: makeinfo/footnote.c:150
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
-msgstr "»%c%s« benötigt ein Argument »{...}«, nicht nur »%s«"
+msgstr "„%c%s“ benötigt ein Argument „{...}“, nicht nur „%s“"
 
 #: makeinfo/footnote.c:165
 #, c-format
 msgid "No closing brace for footnote `%s'"
-msgstr "Keine schließende Klammer für Fußnote »%s«"
+msgstr "Keine schließende Klammer für Fußnote „%s“"
 
 #: makeinfo/footnote.c:198
 msgid "Footnote defined without parent node"
@@ -2006,247 +2057,295 @@ msgstr "Fußnote außerhalb eines Elternknotens definiert"
 
 #: makeinfo/footnote.c:210
 msgid "Footnotes inside footnotes are not allowed"
-msgstr "Fußnote innerhalb von Fußnoten sind nicht erlaubt"
+msgstr "Fußnoten innerhalb von Fußnoten sind nicht erlaubt"
 
-#: makeinfo/footnote.c:298
+# HTML
+#: makeinfo/footnote.c:302 makeinfo/index.c:189
 msgid "Footnotes"
 msgstr "Fu&szlig;noten"
 
-#: makeinfo/html.c:42
+#: makeinfo/html.c:87
+#, c-format
+msgid "%s: could not open --css-file: %s"
+msgstr "%s: Konnte CSS-Datei nicht öffnen: %s"
+
+#: makeinfo/html.c:172
+#, c-format
+msgid "%s:%d: --css-file ended in comment"
+msgstr "%s:%d: CSS-Datei endete inmitten eines Kommentars"
+
+#: makeinfo/html.c:207
 msgid "Untitled"
 msgstr "Ohne Titel"
 
-#: makeinfo/html.c:298
+#: makeinfo/html.c:422
+msgid "[unexpected] no html tag to pop"
+msgstr "[unerwartet] kein HTML-Tag für Pop-Operation"
+
+#: makeinfo/html.c:752
 #, c-format
-msgid "Invalid node name: `%s'"
-msgstr "Ungültiger Knotenname: »%s«"
+msgid "[unexpected] invalid node name: `%s'"
+msgstr "[unerwartet] ungültiger Knotenname: „%s“"
 
-#: makeinfo/index.c:213
+#: makeinfo/index.c:169
 #, c-format
 msgid "Unknown index `%s'"
-msgstr "Unbekannter Index »%s«"
+msgstr "Unbekannter Index „%s“"
 
-#: makeinfo/index.c:238
+#: makeinfo/index.c:234
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
-msgstr "Info kann nicht mit »:« im Indexeintrag »%s« umgehen"
+msgstr "Info kann nicht mit „:“ im Indexeintrag „%s“ umgehen"
 
-#: makeinfo/index.c:396
+#: makeinfo/index.c:412
 #, c-format
 msgid "Index `%s' already exists"
-msgstr "Index »%s« existiert bereits"
+msgstr "Index „%s“ existiert bereits"
 
-#: makeinfo/index.c:439
+#: makeinfo/index.c:455
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
-msgstr "Unbekannter Index »%s« und/oder »%s« in @synindex"
+msgstr "Unbekannter Index „%s“ und/oder „%s“ in @synindex"
 
-#: makeinfo/index.c:666
+#: makeinfo/index.c:661
+msgid "(line )"
+msgstr "(Zeile )"
+
+#: makeinfo/index.c:669
+#, c-format
+msgid "(line %*d)"
+msgstr "(Zeile %*d)"
+
+#: makeinfo/index.c:750
 #, c-format
 msgid "Unknown index `%s' in @printindex"
-msgstr "\"Unbekannter Index »%s« in @printindex"
+msgstr "Unbekannter Index „%s“ in @printindex"
 
-#: makeinfo/index.c:709
+#: makeinfo/index.c:819
 #, c-format
 msgid "Entry for index `%s' outside of any node"
-msgstr "Eintrag für Index »%s« außerhalb jeglichen Knotens"
+msgstr "Eintrag für Index „%s“ außerhalb jeglichen Knotens"
 
-#: makeinfo/index.c:712 makeinfo/index.c:751
+#: makeinfo/index.c:822 makeinfo/index.c:858
 msgid "(outside of any node)"
 msgstr "(außerhalb jeglichen Knotens)"
 
+#: makeinfo/index.c:919 makeinfo/index.c:925
+msgid "See "
+msgstr "Siehe "
+
+#: makeinfo/insertion.c:160
+msgid "@item not allowed in argument to @itemize"
+msgstr "@item nicht im Argument für @itemize erlaubt"
+
+# checkit
 # What does this mean? -ke-
-#: makeinfo/insertion.c:198
+#: makeinfo/insertion.c:238
 msgid "Broken-Type in insertion_type_pname"
-msgstr "»Broken-Type« bei »insertion_type_pname«"
+msgstr "„Broken-Type“ bei „insertion_type_pname“"
 
-#: makeinfo/insertion.c:271
+#: makeinfo/insertion.c:334
 msgid "Enumeration stack overflow"
 msgstr "Überlauf bei den Zahlen der Aufzählung"
 
-#: makeinfo/insertion.c:303
+#: makeinfo/insertion.c:366
 #, c-format
 msgid "lettering overflow, restarting at %c"
-msgstr "Überlauf bei den Buchstaben der Aufzählung, Beginn wieder bei %c"
+msgstr "Überlauf bei den Buchstaben der Aufzählung. Beginne wieder bei %c"
 
-# checkit
-#: makeinfo/insertion.c:538
+# %citem ist ein Texinfo-Befehl
+#: makeinfo/insertion.c:631
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
-msgstr "%s benötigt ein Argument: der Formatierer für %citem"
+msgstr "%s benötigt ein Argument: den Formatierer für %citem"
+
+# %cfloat ist ein Texinfo-Befehl
+#: makeinfo/insertion.c:719
+#, c-format
+msgid "%cfloat environments cannot be nested"
+msgstr "%cfloat-Umgebungen können nicht verschachtelt sein"
 
-#: makeinfo/insertion.c:693
+#: makeinfo/insertion.c:973
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
-msgstr "»@end« erwartet »%s«, aber bekam »%s«"
+msgstr "„@end“ erwartete „%s“, bekam jedoch „%s“"
 
-#: makeinfo/insertion.c:931
+#: makeinfo/insertion.c:1337
 #, c-format
 msgid "No matching `%cend %s'"
-msgstr "Kein zutreffendes »%cend %s«"
+msgstr "Kein übereinstimmendes „%cend %s“"
 
-#: makeinfo/insertion.c:1084
+#: makeinfo/insertion.c:1592
 #, c-format
 msgid "%s requires letter or digit"
 msgstr "%s benötigt einen Buchstaben oder eine Zahl"
 
-#: makeinfo/insertion.c:1158
+#: makeinfo/insertion.c:1687
 msgid "end of file inside verbatim block"
-msgstr "Dateiende innerhalb eines wörtlichen Blocks"
+msgstr "Dateiende innerhalb eines „Verbatim“-Blocks"
 
-# checkit
-#: makeinfo/insertion.c:1318
+#: makeinfo/insertion.c:1913
+#, c-format
+msgid "@%s not meaningful outside `@float' environment"
+msgstr "@%s nicht sinnvoll außerhalb einer „@float“-Umgebung"
+
+#: makeinfo/insertion.c:1949
 msgid "@menu seen before first @node, creating `Top' node"
-msgstr "@menu vor dem ersten @node gesehen, »Top«-Knoten wird angelegt"
+msgstr "@menu vor ersten @node gefunden. „Top“-Knoten wird angelegt"
 
-#: makeinfo/insertion.c:1319
+#: makeinfo/insertion.c:1950
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr ""
 "vielleicht sollte der @top-Knoten eher von @ifnottex als von @ifinfo "
 "umschlossen werden?"
 
-# checkit
-#: makeinfo/insertion.c:1331
+#: makeinfo/insertion.c:1962
 msgid "@detailmenu seen before first node, creating `Top' node"
-msgstr "@detailmenu vor dem ersten Knoten gesehen,  »Top«-Knoten wird angelegt"
+msgstr "@detailmenu vor ersten @node gefunden. „Top“-Knoten wird angelegt"
+
+#: makeinfo/insertion.c:2018
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr ""
+"@%s nicht sinnvoll außerhalb von „@titlepage“- und „@quotation“-Umgebungen"
+
+#: makeinfo/insertion.c:2032
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' environment"
+msgstr "@%s nicht sinnvoll außerhalb einer „@titlepage“-Umgebung"
 
-#: makeinfo/insertion.c:1346
+#: makeinfo/insertion.c:2063
 #, c-format
 msgid "Unmatched `%c%s'"
-msgstr "Nicht übereinstimmendes »%c%s«"
+msgstr "Nicht übereinstimmendes „%c%s“"
 
-#: makeinfo/insertion.c:1353
+#: makeinfo/insertion.c:2068
 #, c-format
 msgid "`%c%s' needs something after it"
-msgstr "»%c%s« benötigt etwas nachfolgendes"
+msgstr "„%c%s“ benötigt etwas nachfolgendes"
 
-#: makeinfo/insertion.c:1359
+#: makeinfo/insertion.c:2074
 #, c-format
-msgid "Bad argument to `%s', `%s', using `%s'"
-msgstr "Fehlerhaftes Argument zu »%s«, »%s«, benutze »%s«"
+msgid "Bad argument `%s' to `@%s', using `%s'"
+msgstr "Fehlerhaftes Argument „%s“ zu „@%s“, benutze „%s“"
 
-#: makeinfo/insertion.c:1453
+#: makeinfo/insertion.c:2171
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
-msgstr "@%s nicht sinnvoll innerhalb eines »@%s«-Blocks"
+msgstr "@%s nicht sinnvoll innerhalb eines „@%s“-Blocks"
 
-#: makeinfo/insertion.c:1462
+#: makeinfo/insertion.c:2180
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
-msgstr "@itemx nicht sinnvoll innerhalb eines »%s«-Blocks"
+msgstr "@itemx nicht sinnvoll innerhalb eines „%s“-Blocks"
 
 # checkit
-#: makeinfo/insertion.c:1646
+#: makeinfo/insertion.c:2356
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "%c%s außerhalb eines Einfügungsblocks gefunden"
 
-#: makeinfo/lang.c:331
+#: makeinfo/lang.c:580
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
-msgstr "%s ist kein gültiger ISO-639-Language-Code"
+msgstr "%s ist kein gültiges ISO-639-Sprachkürzel"
 
-#: makeinfo/lang.c:384
+#: makeinfo/lang.c:655
 #, c-format
-msgid "unrecogized encoding name `%s'"
-msgstr "Nicht erkannter Kodierungsname »%s«"
+msgid "unrecognized encoding name `%s'"
+msgstr "nicht erkannter Kodierungsname „%s“"
 
-#: makeinfo/lang.c:387
+#: makeinfo/lang.c:663
 #, c-format
 msgid "sorry, encoding `%s' not supported"
-msgstr "Kodierung »%s« wird leider nicht unterstützt."
+msgstr "Kodierung „%s“ wird leider nicht unterstützt."
 
-#: makeinfo/lang.c:414
+#: makeinfo/lang.c:715
 #, c-format
 msgid "invalid encoded character `%s'"
-msgstr "Ungültiges kodiertes Zeichen: »%s«"
-
-#: makeinfo/lang.c:502
-#, c-format
-msgid "%s is an invalid ISO code, using %c"
-msgstr "%s ist kein gültiger ISO-639-Language-Code, benutze %c"
+msgstr "Ungültiges kodiertes Zeichen: „%s“"
 
-#: makeinfo/lang.c:687
+#: makeinfo/lang.c:1009
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
-msgstr "%c%s erwartet »i« oder »j« als Argument, nicht »%c«"
+msgstr "%c%s erwartet „i“ oder „j“ als Argument, nicht „%c“"
 
-#: makeinfo/lang.c:691
+#: makeinfo/lang.c:1013
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
-msgstr "%c%s erwartet einen einzelnen Buchstaben »i« oder »j» als Argument"
+msgstr "%c%s erwartet einen einzelnen Buchstaben „i“ oder „j“ als Argument"
 
-#: makeinfo/macro.c:134
+#: makeinfo/macro.c:128
 #, c-format
 msgid "macro `%s' previously defined"
-msgstr "Macro »%s« früher definiert"
+msgstr "Makro „%s“ früher definiert"
 
-#: makeinfo/macro.c:138
+#: makeinfo/macro.c:132
 #, c-format
 msgid "here is the previous definition of `%s'"
-msgstr "hier ist die frühere Definition von »%s«"
+msgstr "hier ist die frühere Definition von „%s“"
 
 #: makeinfo/macro.c:355
 #, c-format
-msgid "\\ in macro expansion followed by `%s' instead of \\ or parameter name"
+msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr ""
-"Dem \\ folgt in der Macro-Erweiterung »%s« anstelle von \\ oder einem "
-"Parameternamen"
+"Dem \\ in der Makro-Erweiterung folgt „%s“ anstelle eines Parameternamens"
 
-#: makeinfo/macro.c:403
+#: makeinfo/macro.c:401
 #, c-format
 msgid "Macro `%s' called on line %d with too many args"
-msgstr "Macro »%s« in Zeile %d mit zuvielen Argumenten aufgerufen"
+msgstr "Makro „%s“ in Zeile %d mit zuvielen Argumenten aufgerufen"
 
-#: makeinfo/macro.c:594
+#: makeinfo/macro.c:586
 #, c-format
 msgid "%cend macro not found"
-msgstr "%cend Macro nicht gefunden"
+msgstr "%cend Makro nicht gefunden"
 
-#: makeinfo/macro.c:632
+#: makeinfo/macro.c:624
 msgid "@quote-arg only useful for single-argument macros"
-msgstr "@quote-Argument nur sinnvoll, wenn das Macro nur ein Argument hat"
+msgstr "@quote-Argument nur sinnvoll, wenn das Makro nur ein Argument hat"
 
-#: makeinfo/macro.c:668
+#: makeinfo/macro.c:660
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "@end %s stimmt nicht mit @%s überein"
 
-#: makeinfo/makeinfo.c:316
+#: makeinfo/makeinfo.c:184
+#, c-format
+msgid "Too many errors!  Gave up.\n"
+msgstr "Zu viele Fehler! Abbruch.\n"
+
+#: makeinfo/makeinfo.c:302
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: Warnung: "
 
-#: makeinfo/makeinfo.c:339
-msgid "Too many errors!  Gave up.\n"
-msgstr "Zu viele Fehler!  Abbruch.\n"
-
-#: makeinfo/makeinfo.c:350 makeinfo/makeinfo.c:2026
+#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
 #, c-format
 msgid "Misplaced %c"
 msgstr "Fehlplazierte %c"
 
-#: makeinfo/makeinfo.c:370
+#: makeinfo/makeinfo.c:340
 #, c-format
 msgid "Try `%s --help' for more information.\n"
-msgstr "»%s --help« gibt weitere Informationen.\n"
+msgstr "„%s --help“ gibt weitere Informationen.\n"
 
-#: makeinfo/makeinfo.c:373
+#: makeinfo/makeinfo.c:343
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Aufruf: %s [OPTION]... TEXINFO-DATEI...\n"
 
-#: makeinfo/makeinfo.c:376
+#: makeinfo/makeinfo.c:346
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
 msgstr ""
 "Ãœbersetzt Texinfo-Quelldatei-Dokumentation in verschiedene andere Formate,\n"
-"standardmäßig in Info-Dateien, die online mittels gelesen werden können mit\n"
-"einem Info-Leser wie GNU Info (oder auch Emacs, TkInfo, etc.).\n"
+"standardmäßig in Info-Dateien, die online mit einem Info-Leser wie\n"
+"GNU Info (oder auch Emacs, TkInfo, etc.) gelesen werden können.\n"
 
-#: makeinfo/makeinfo.c:380
+#: makeinfo/makeinfo.c:350
 #, c-format
 msgid ""
 "General options:\n"
@@ -2272,20 +2371,22 @@ msgstr ""
 "  -v, --verbose               ausführlich die Bearbeitungschritte anzeigen\n"
 "      --version               Programmversion anzeigen und beenden\n"
 
-#: makeinfo/makeinfo.c:394
+#: makeinfo/makeinfo.c:364
 #, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output DocBook rather than Info.\n"
+"      --docbook             output Docbook XML rather than Info.\n"
 "      --html                output HTML rather than Info.\n"
-"      --xml                 output XML (TexinfoML) rather than Info.\n"
+"      --xml                 output Texinfo XML rather than Info.\n"
+"      --plaintext           output plain text rather than Info.\n"
 msgstr ""
 "Optionen zur Wahl des Ausgabeformats (Voreinstellung ist Info):\n"
-"      --docbook               DocBook anstelle von Info ausgeben\n"
+"      --docbook               DocBook XML anstelle von Info ausgeben\n"
 "      --html                  HTML anstelle von Info ausgeben\n"
-"      --xml                   XML (TexinfoML) anstelle von Info ausgeben\n"
+"      --xml                   Texinfo XML anstelle von Info ausgeben\n"
+"      --plaintext             einfachen Text anstelle von Info ausgeben\n"
 
-#: makeinfo/makeinfo.c:401
+#: makeinfo/makeinfo.c:372
 msgid ""
 "General output options:\n"
 "  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
@@ -2304,21 +2405,19 @@ msgstr ""
 "  -E, --macro-expand DATEI  originalen Quelltext mit expandierten Makros "
 "nach\n"
 "                            DATEI ausgeben, dabei @setfilename ignorieren\n"
-"      --no-headers          Knoten-Unterteiler, »Knoten:«-Kopfzeilen und "
+"      --no-headers          Knoten-Unterteiler, „Knoten:“-Kopfzeilen und "
 "Menüs\n"
-"                              unterdrücken aus Info-Ausgabe (also nur Text "
-"her-\n"
-"                              stellen) oder HTML (also kürzere Ausgabe);\n"
-"                              außerdem in die Standardausgabe schreiben\n"
+"                            unterdrücken in Info-Ausgabe (also nur Text\n"
+"                            erstellen) oder HTML (also kürzere Ausgabe);\n"
+"                            außerdem in die Standardausgabe schreiben\n"
 "      --no-split            Aufteilen langer Info-Dateien oder das Erzeugen\n"
 "                            einer HTML-Datei je Knoten unterdrücken\n"
 "      --number-sections     Kapitel-, Abschnitt- und Anhangzählungen "
 "ausgeben\n"
-"  -o, --output=DATEI        Ausgabe nach DATEI (Verzeichnis wenn "
-"aufgeteiltes\n"
-"                              HTML)\n"
+"  -o, --output=DATEI        Ausgabe nach DATEI (bzw. Verzeichnis wenn\n"
+"                            aufgeteiltes HTML)\n"
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:386
 #, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2339,83 +2438,127 @@ msgstr ""
 "Optionen für Info und Nur-Text:\n"
 "      --enable-encoding       akzentuierte und spezielle Zeichen in die "
 "Info-\n"
-"                                Ausgabe gemäß @documentencoding ausgeben\n"
+"                              Ausgabe gemäß @documentencoding ausgeben\n"
 "      --fill-column=ZAHL      Zeilen nach ZAHL Zeichen umbrechen (Standard %"
 "d)\n"
 "      --footnote-style=STIL   Fußnoten in Info gemäß STIL ausgeben:\n"
-"                                »separate«: Fußnoten in eigenen Knoten "
-"platzieren;\n"
-"                                »end«: Fußnoten an das Ende des Knotens "
+"                                „separate“: Fußnoten in eigenen Knoten\n"
+"                                            platzieren;\n"
+"                                „end“: Fußnoten an das Ende des Knotens "
 "setzen,\n"
-"                                  in dem sie definiert sind (Standard)\n"
+"                                       in dem sie definiert sind (Standard)\n"
 "      --paragraph-indent=WERT Info-Absätze mit WERT Leerzeichen einziehen\n"
 "                                (Standard %d);\n"
-"                                WERT ist »none«: nicht einziehen;\n"
-"                                WERT ist »asis«: existierende Einzüge "
+"                                WERT ist „none“: nicht einziehen;\n"
+"                                WERT ist „asis“: existierende Einzüge "
 "behalten\n"
-"      --split-size=GRÖßE      in GRÖßE große Dateien splitten (Standard %d)\n"
+"      --split-size=GRÖSSE     in GRÖSSE große Dateien splitten (Standard %"
+"d)\n"
+
+#: makeinfo/makeinfo.c:403
+msgid ""
+"Options for HTML:\n"
+"      --css-include=FILE        include FILE in HTML <style> output;\n"
+"                                  read stdin if FILE is -.\n"
+msgstr ""
+"Optionen für HTML:\n"
+"      --css-include=DATEI       DATEI in HTML-<style>-Ausgabe einfügen;\n"
+"                                  aus Standardeingabe, wenn DATEI „-“ ist\n"
+
+#: makeinfo/makeinfo.c:409
+#, c-format
+msgid ""
+"Options for XML and Docbook:\n"
+"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"d).\n"
+"                                  If VAL is 0, ignorable whitespace is "
+"dropped.\n"
+msgstr ""
+"Optionen für XML und Docbook:\n"
+"      --output-indent=WERT      XML-Elemente mit WERT Leerzeichen einrücken\n"
+"                                  (Voreinstellung: %d). Wenn WERT 0 ist, "
+"wird\n"
+"                                  ignorierbarer Leerraum weggelassen.\n"
 
-#: makeinfo/makeinfo.c:433
+#: makeinfo/makeinfo.c:416
 msgid ""
 "Input file options:\n"
-"      --commands-in-node-names   allow @ commands in node names.\n"
-"  -D VAR                         define the variable VAR, as with @set.\n"
-"  -I DIR                         append DIR to the @include search path.\n"
-"  -P DIR                         prepend DIR to the @include search path.\n"
-"  -U VAR                         undefine the variable VAR, as with @clear.\n"
+"      --commands-in-node-names  allow @ commands in node names.\n"
+"  -D VAR                        define the variable VAR, as with @set.\n"
+"  -I DIR                        append DIR to the @include search path.\n"
+"  -P DIR                        prepend DIR to the @include search path.\n"
+"  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
 "Eingabedatei-Optionen:\n"
 "      --commands-in-node-names   @-Befehle in Knotennamen zulassen\n"
-"  -D VAR                         eine Variable definieren, wie mit @set\n"
+"  -D VAR                         eine Variable definieren (wie mit @set)\n"
 "  -I VERZ                        VERZ an den Suchpfad für @include anhängen\n"
 "  -P VERZ                        VERZ dem Suchpfad für @include "
 "voranstellen\n"
-"  -U VAR                         eine Variable aufheben, wie mit @clear\n"
+"  -U VAR                         eine Variable aufheben (wie mit @clear)\n"
 
-#: makeinfo/makeinfo.c:442
-#, fuzzy
+#: makeinfo/makeinfo.c:425
 msgid ""
 "Conditional processing in input:\n"
+"  --ifdocbook       process @ifdocbook and @docbook even if\n"
+"                      not generating Docbook.\n"
 "  --ifhtml          process @ifhtml and @html even if not generating HTML.\n"
 "  --ifinfo          process @ifinfo even if not generating Info.\n"
 "  --ifplaintext     process @ifplaintext even if not generating plain text.\n"
 "  --iftex           process @iftex and @tex; implies --no-split.\n"
+"  --ifxml           process @ifxml and @xml.\n"
+"  --no-ifdocbook    do not process @ifdocbook and @docbook text.\n"
 "  --no-ifhtml       do not process @ifhtml and @html text.\n"
 "  --no-ifinfo       do not process @ifinfo text.\n"
 "  --no-ifplaintext  do not process @ifplaintext text.\n"
 "  --no-iftex        do not process @iftex and @tex text.\n"
+"  --no-ifxml        do not process @ifxml and @xml text.\n"
+"\n"
+"  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
 msgstr ""
 "Bedingte Verarbeitung in Eingabe:\n"
-"      --ifhtml     @ifhtml- und @html-Text auch bearbeiten, wenn kein\n"
-"                     HTML erzeugt wird\n"
-"      --ifinfo     @ifinfo-Text auch bearbeiten, wenn HTML erzeugt wird\n"
-"      --iftex      @iftex und @tex bearbeiten; impliziert --no-split\n"
-"      --no-ifhtml  @ifhtml- und @html-Text nicht bearbeiten\n"
-"      --no-ifinfo  @ifinfo-Text nicht bearbeiten\n"
-"      --no-iftex   @iftex- und @tex-Text nicht bearbeiten\n"
-
-#: makeinfo/makeinfo.c:454
-#, fuzzy
+"  --ifdocbook       @ifdocbook und @docbook bearbeiten, selbst wenn kein "
+"Docbook\n"
+"                      erzeugt wird\n"
+"  --ifhtml          @ifhtml und @html bearbeiten, selbst wenn kein HTML\n"
+"                      erzeugt wird\n"
+"  --ifinfo          @ifinfo bearbeiten, selbst wenn kein Info erzeugt wird\n"
+"  --ifplaintext     @ifplaintext bearbeiten, selbst wenn kein Text erzeugt "
+"wird\n"
+"  --iftex           @iftex und @tex bearbeiten; impliziert --no-split\n"
+"  --ifxml           @ifxml und @xml bearbeiten\n"
+"  --no-idocbook     @ifdocbook- und @docbook-Text nicht bearbeiten\n"
+"  --no-ifhtml       @ifhtml- und @html-Text nicht bearbeiten\n"
+"  --no-ifinfo       @ifinfo-Text nicht bearbeiten\n"
+"  --no-ifplaintext  @ifplaintext-Text nicht bearbeiten\n"
+"  --no-iftex        @iftex- und @tex-Text nicht bearbeiten\n"
+"  --no-ifxml        @ifxml und @xml nicht bearbeiten\n"
+"\n"
+"   Außerdem werden bei den --no-ifFORMAT-Optionen auch die entsprechenden\n"
+"   @ifnoFORMAT-Abschnitte bearbeitet.\n"
+
+#: makeinfo/makeinfo.c:444
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating HTML, --ifhtml is on and the others are off;\n"
 "  if generating Info, --ifinfo is on and the others are off;\n"
 "  if generating plain text, --ifplaintext is on and the others are off;\n"
+"  if generating XML, --ifxml is on and the others are off.\n"
 msgstr ""
 "  Die Voreinstellungen für die @if...-Bedingungen hängen vom Ausgabeformat "
 "ab:\n"
-"  wird HTML erzeugt, ist --ifhtml aktiviert und die anderen sind "
-"deaktiviert;\n"
-"  wird Info oder reiner Text erzeugt, ist --ifinfo aktiviert\n"
-"  und die anderen sind deaktiviert.\n"
+"  wird HTML erzeugt, ist --ifhtml an und die anderen sind aus;\n"
+"  wird Info erzeugt, ist --ifinfo an und die anderen sind aus;\n"
+"  wird reiner Text erzeugt, ist --ifplaintext an und die anderen sind aus;\n"
+"  wird XML erzeugt, ist --ifxml an und die anderen sind aus.\n"
 
 # Die "." am Zeilenende habe ich entfernt. -ke-
-#: makeinfo/makeinfo.c:461
+#: makeinfo/makeinfo.c:452
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                     write Info to foo's @setfilename\n"
 "  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write XML to @setfilename\n"
+"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
 "  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
 "  makeinfo --no-headers foo.texi        write plain text to standard output\n"
 "\n"
@@ -2425,432 +2568,439 @@ msgid ""
 "  makeinfo --no-split foo.texi          write one Info file however big\n"
 msgstr ""
 "Beispiele:\n"
-"  makeinfo foo.texi                    Info gemäß @setfilename von foo "
-"schreiben\n"
+"  makeinfo foo.texi                    Info gemäß @setfilename von foo\n"
+"                                         schreiben\n"
 "  makeinfo --html foo.texi             HTML gemäß @setfilename schreiben\n"
-"  makeinfo --xml foo.texi              XML gemäß @setfilename schreiben\n"
-"  makeinfo --docbook foo.texi          DocBook-XML gemäß @setfilename "
+"  makeinfo --xml foo.texi              Texinfo XML gemäß @setfilename "
 "schreiben\n"
-"  makeinfo --no-headers foo.texi       reinen Text in Standardausgabe "
+"  makeinfo --docbook foo.texi          DocBook XML gemäß @setfilename "
 "schreiben\n"
+"  makeinfo --no-headers foo.texi       reinen Text in Standardausgabe\n"
+"                                         schreiben\n"
 "\n"
-"  makeinfo --html --no-headers foo.texi  HTML ohne Menüs oder »Knoten«-"
+"  makeinfo --html --no-headers foo.texi  HTML ohne Menüs oder „Knoten“-"
 "Zeilen\n"
 "  makeinfo --number-sections foo.texi    Info mit nummerierten Abschnitten\n"
-"  makeinfo --no-split foo.texi           nur eine Info-Datei, sehr "
-"voluminös\n"
+"  makeinfo --no-split foo.texi           nur eine Info-Datei (kann groß "
+"sein)\n"
 
-#: makeinfo/makeinfo.c:570 makeinfo/makeinfo.c:593 makeinfo/makeinfo.c:655
-#: makeinfo/makeinfo.c:676
+#: makeinfo/makeinfo.c:603
+#, c-format
+msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
+msgstr "%s: Ignoriere nicht erkannten Wert „%s“ für TEXINFO_OUTPUT_FORMAT.\n"
+
+#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
+#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
-msgstr "%s: %s Argument muss numerisch sein, nicht »%s«.\n"
+msgstr "%s: %s Argument muss numerisch sein, nicht „%s“.\n"
 
-# checkit
-#: makeinfo/makeinfo.c:583
+#: makeinfo/makeinfo.c:660
 #, c-format
-msgid "Couldn't open macro expansion output `%s'"
-msgstr "Die Macro-Auflösung für »%s« kann nicht geöffnet werden"
+msgid "%s: could not open macro expansion output `%s'"
+msgstr "%s: Makro-Expansions-Ausgabedatei „%s“ kann nicht geöffnet werden"
 
-#: makeinfo/makeinfo.c:586
-msgid "Cannot specify more than one macro expansion output"
-msgstr "Mehr als eine Ausgabedatei darf nicht angegeben werden"
+#: makeinfo/makeinfo.c:665
+#, c-format
+msgid "%s: ignoring second macro expansion output `%s'.\n"
+msgstr "%s: ignoriere zweite Makro-Expansions-Ausgabedatei „%s“.\n"
 
-#: makeinfo/makeinfo.c:624
+#: makeinfo/makeinfo.c:707
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
-"%s: Arg für --paragraph-indent muss numerisch/»none«/»asis« sein, nicht »%"
-"s«.\n"
+"%s: Argument für --paragraph-indent muss numerisch, „none“ oder „asis“ sein, "
+"nicht „%s“.\n"
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:732
 #, 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"
+"%s: Argument für --footnote-style muss „separate“ oder „end“ sein, nicht „%"
+"s“.\n"
 
-#: makeinfo/makeinfo.c:723
+#: makeinfo/makeinfo.c:806
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: Datei-Angabe fehlt.\n"
 
-#: makeinfo/makeinfo.c:898
+#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
 #, c-format
-msgid "Expected `%s'"
-msgstr "Erwartet »%s«"
+msgid "Multiline command %c%s used improperly"
+msgstr "Mehrzeilen-Befehl %c%s inkorrekt verwendet"
 
-#: makeinfo/makeinfo.c:1365
-msgid "File exists, but is not a directory"
-msgstr "Datei existiert, ist aber kein Verzeichnis"
+#: makeinfo/makeinfo.c:1000
+#, c-format
+msgid "Expected `%s'"
+msgstr "Habe „%s“ erwartet"
 
-#: makeinfo/makeinfo.c:1366
+#: makeinfo/makeinfo.c:1479
 #, c-format
 msgid "Can't create directory `%s': %s"
-msgstr "Kann Verzeichnis »%s« nicht anlegen: %s"
+msgstr "Kann Verzeichnis „%s“ nicht anlegen: %s"
 
-#: makeinfo/makeinfo.c:1414
+#: makeinfo/makeinfo.c:1525
 #, c-format
 msgid "No `%s' found in `%s'"
-msgstr "Kein »%s« in »%s« gefunden"
+msgstr "Kein „%s“ in „%s“ gefunden"
 
-#: makeinfo/makeinfo.c:1496
+#: makeinfo/makeinfo.c:1605
 #, 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"
+"%s: Keine Makro-Auflösung nach der Standard-Ausgabe, da auch die Info-"
+"Ausgabe dorthin geht.\n"
 
-#: makeinfo/makeinfo.c:1526
+#: makeinfo/makeinfo.c:1638
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
-msgstr "Erzeuge %s Datei »%s« von »%s«.\n"
+msgstr "%s-Datei „%s“ von „%s“ wird erzeugt.\n"
 
-#: makeinfo/makeinfo.c:1561
+#: makeinfo/makeinfo.c:1673
 #, c-format
 msgid "This is %s, produced by makeinfo version %s from %s.\n"
 msgstr "Dies ist %s, hergestellt von Makeinfo Version %s aus %s.\n"
 
-#: makeinfo/makeinfo.c:1583
+#: makeinfo/makeinfo.c:1709
 #, 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"
+"%s: Entferne Makro-Ausgabe-Datei „%s“ wegen Fehler; --force benutzen, um "
+"Datei beizubehalten.\n"
 
-#: makeinfo/makeinfo.c:1627
+#: makeinfo/makeinfo.c:1773
 #, 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 "
+"%s: Entferne Ausgabe-Datei „%s“ wegen Fehler; --force benutzen, um diese "
 "beizubehalten.\n"
 
-#: makeinfo/makeinfo.c:1853
+#: makeinfo/makeinfo.c:2034
 #, c-format
 msgid "Unknown command `%s'"
-msgstr "Unbekannter Befehl »%s«"
+msgstr "Unbekannter Befehl „%s“"
 
-#: makeinfo/makeinfo.c:1875
+#: makeinfo/makeinfo.c:2056
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr ""
-"Geschweifte Klammern verwenden, um einen Befehl als Argument an »@%s« zu "
+"Geschweifte Klammern verwenden, um einen Befehl als Argument an „@%s“ zu "
 "geben"
 
-#: makeinfo/makeinfo.c:2068
+#: makeinfo/makeinfo.c:2314
 #, c-format
-msgid "%c%s expected `{...}'"
-msgstr "%c%s erwartete »{...}«"
+msgid "%c%s expected braces"
+msgstr "%c%s erwartete geschweifte Klammern"
 
-#: makeinfo/makeinfo.c:2098
+#: makeinfo/makeinfo.c:2327
 msgid "Unmatched }"
 msgstr "Nicht übereinstimmende }"
 
-#: makeinfo/makeinfo.c:2148
+#: makeinfo/makeinfo.c:2375
 msgid "NO_NAME!"
 msgstr "Kein_NAME!"
 
-#: makeinfo/makeinfo.c:2169
+#: makeinfo/makeinfo.c:2396
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s fehlende schließende Klammer"
 
-#: makeinfo/makeinfo.c:2958
-msgid "First argument to cross-reference may not be empty"
-msgstr "Erstes Argument für Querverweis darf nicht leer sein."
-
-#: makeinfo/makeinfo.c:3018 makeinfo/makeinfo.c:3236 makeinfo/xml.c:1340
-msgid "see "
-msgstr "siehe"
-
-#: makeinfo/makeinfo.c:3018
-msgid "See "
-msgstr "Siehe"
-
-# checkit
-#: makeinfo/makeinfo.c:3164
-#, c-format
-msgid "`.' or `,' must follow cross reference, not %c"
-msgstr "».« or »,« muss einem Querverweis folgen, nicht %c"
-
-#: makeinfo/makeinfo.c:3212
-msgid "First argument to @inforef may not be empty"
-msgstr "Erstes Argument für @inforef darf nicht leer sein."
-
-#: makeinfo/makeinfo.c:3427
+#: makeinfo/makeinfo.c:3309
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
-msgstr "@image-Datei »%s« (für HTML) nicht lesbar: %s"
+msgstr "@image-Datei „%s“ (für HTML) nicht lesbar: %s"
 
-#: makeinfo/makeinfo.c:3440
+#: makeinfo/makeinfo.c:3315
 #, c-format
-msgid "No `%s.png' or `.jpg', and no extension supplied"
-msgstr "Kein .png oder .jpg für »%s« und keine Erweiterung angegeben."
+msgid "No such file `%s'"
+msgstr "Kein Datei namens „%s“"
 
-#: makeinfo/makeinfo.c:3490
+#: makeinfo/makeinfo.c:3447
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
-msgstr "@image-Datei »%s« (für Text) nicht lesbar: %s"
+msgstr "@image-Datei „%s“ (für Text) nicht lesbar: %s"
 
-#: makeinfo/makeinfo.c:3497
+#: makeinfo/makeinfo.c:3456
 msgid "@image missing filename argument"
 msgstr "@image fehlt als Argument ein Dateiname"
 
+#: makeinfo/makeinfo.c:3675
+#, c-format
+msgid "undefined flag: %s"
+msgstr "undefiniertes Flag: %s"
+
 # checkit
-#: makeinfo/makeinfo.c:3690
+#: makeinfo/makeinfo.c:3676
 #, c-format
 msgid "{No value for `%s'}"
-msgstr "{Kein Wert für »%s«}"
+msgstr "{Kein Wert für „%s“}"
 
-#: makeinfo/makeinfo.c:3744
+#: makeinfo/makeinfo.c:3728
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s erfordert einen Namen"
 
-#: makeinfo/makeinfo.c:3850
+#: makeinfo/makeinfo.c:3834
 #, c-format
 msgid "Reached eof before matching @end %s"
-msgstr "Das Ende der Datei vor dem erforderlichen @end %s erreicht"
+msgstr "Dateiende vor erforderlichem „@end %s“ erreicht"
 
-#: makeinfo/makeinfo.c:4081
+#: makeinfo/makeinfo.c:4082
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
-msgstr "»%.40s...« ist zum Expandieren zu lang; nicht expandiert"
+msgstr "„%.40s...“ ist zum Expandieren zu lang; nicht expandiert"
 
-#: makeinfo/multi.c:226
+#: makeinfo/multi.c:116
 msgid "Missing } in @multitable template"
-msgstr "Fehlende »}« beim @multitable-Template"
+msgstr "Fehlende „}“ bei @multitable-Template"
 
-#: makeinfo/multi.c:302
+#: makeinfo/multi.c:254
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
-msgstr "irriger Text »%s« nach @multitable wird ignoriert"
+msgstr "nicht interpretierbarer Text „%s“ nach @multitable wird ignoriert"
 
-#: makeinfo/multi.c:375
+#: makeinfo/multi.c:393
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
-msgstr "zu viele Spalten im \"multitable\"-Eintrag (maximal %d)"
+msgstr "Zu viele Spalten im „@multitable“-Eintrag (maximal %d)"
 
-#: makeinfo/multi.c:426
+#: makeinfo/multi.c:555
 #, c-format
-msgid "Cannot select column #%d in multitable"
-msgstr "Spalte #%d kann in der \"multitable\" nicht ausgewählt werden"
+msgid "[unexpected] cannot select column #%d in multitable"
+msgstr "[unerwartet] Spalte %d kann in „multitable“ nicht ausgewählt werden"
 
-#: makeinfo/multi.c:529
+#: makeinfo/multi.c:584
 msgid "ignoring @tab outside of multitable"
-msgstr "@tab außerhalb der \"multitable\" wird übergangen"
+msgstr "@tab außerhalb einer „multitable“ wird ignoriert"
 
 # checkit
-#: makeinfo/multi.c:565
+#: makeinfo/multi.c:632
+#, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** Mehrspalten-Ausgabe von der letzten Zeile:\n"
 
-# checkit
-#: makeinfo/multi.c:568
+#: makeinfo/multi.c:635
 #, c-format
 msgid "* column #%d: output = %s\n"
-msgstr "* Spalte #%d: Ausgabe = %s\n"
+msgstr "* Spalte %d: Ausgabe = %s\n"
 
-#: makeinfo/node.c:276
+#: makeinfo/node.c:280
 #, c-format
 msgid "Node `%s' previously defined at line %d"
-msgstr "Knoten »%s« bereits zuvor in Zeile %d definiert"
+msgstr "Knoten „%s“ bereits in Zeile %d definiert"
 
-#: makeinfo/node.c:594
+#: makeinfo/node.c:648
 #, c-format
 msgid "Formatting node %s...\n"
-msgstr "Formatiere Knoten »%s«...\n"
+msgstr "Knoten „%s“ wird formatiert...\n"
 
-#: makeinfo/node.c:655
+#: makeinfo/node.c:716
 #, c-format
-msgid "Node `%s' requires a sectioning command (e.g. %c%s)"
-msgstr "Knoten »%s« benötigt einen Abschnittsbefehl (z.B. %c%s)"
+msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
+msgstr "Knoten „%s“ benötigt einen Abschnittsbefehl (z.B. %c%s)"
 
-#: makeinfo/node.c:815
+#: makeinfo/node.c:879
 #, c-format
 msgid "No node name specified for `%c%s' command"
-msgstr "Kein Knotenname für den Befehl »%c%s« angegeben"
+msgstr "Kein Knotenname für den Befehl „%c%s“ angegeben"
 
-#: makeinfo/node.c:856 makeinfo/node.c:1075
+#: makeinfo/node.c:920 makeinfo/node.c:1151
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
-msgstr "Anker »%s« und Knoten »%s« zeigen auf gleichen Dateinamen."
+msgstr "Anker „%s“ und Knoten „%s“ zeigen auf gleichen Dateinamen."
 
-#: makeinfo/node.c:859
+#: makeinfo/node.c:923
 msgid "This @anchor command ignored; references to it will not work"
 msgstr ""
-"Dieser @anchor-Befehl wird ignoriert; Referenzen auf ihn funktionieren nicht"
+"Dieser @anchor-Befehl wird ignoriert, da Verweise auf ihn nicht funktionieren"
 
-#: makeinfo/node.c:861 makeinfo/node.c:1078
+#: makeinfo/node.c:925 makeinfo/node.c:1154
 msgid "Rename this anchor or use the `--no-split' option"
-msgstr "Benennen Sie diesen Anker um oder benutzen Sie die Option »--no-split«"
+msgstr "Entweder diesen Anker umbenennen oder Option „--no-split“ verwenden"
 
-#: makeinfo/node.c:891
+#: makeinfo/node.c:955
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
-msgstr "Nicht erwartete Zeichenkette am Ende der gesplitteten HTML-Datei »%s«"
+msgstr "Unerwartete Zeichenkette am Ende der gesplitteten HTML-Datei „%s“"
 
-#: makeinfo/node.c:920
-msgid "Node:"
-msgstr "Knoten:"
-
-#: makeinfo/node.c:930
+# HTML
+#: makeinfo/node.c:991
 msgid "Next:"
-msgstr "N&auml;chster:"
+msgstr "n&auml;chstes:"
 
-#: makeinfo/node.c:940
+#: makeinfo/node.c:1007
 msgid "Previous:"
-msgstr "Vorheriger:"
+msgstr "voriges:"
 
-#: makeinfo/node.c:950
+# HTML
+#: makeinfo/node.c:1021
 msgid "Up:"
-msgstr "Aufw&auml;rts:"
+msgstr "aufw&auml;rts:"
 
-#: makeinfo/node.c:1072
+#: makeinfo/node.c:1148
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
-msgstr "Anker »%s« und »%s« zeigen auf gleichen Dateinamen."
+msgstr "Anker „%s“ und „%s“ zeigen auf gleichen Dateinamen."
 
-#: makeinfo/node.c:1077
+#: makeinfo/node.c:1153
 msgid "@anchor command ignored; references to it will not work"
-msgstr "@anchor-Befehl wird ignoriert; Referenzen auf ihn funktionieren nicht"
+msgstr ""
+"@anchor-Befehl wird ignoriert, da Referenzen auf ihn nicht funktionieren"
 
-#: makeinfo/node.c:1277
+#: makeinfo/node.c:1347
 #, c-format
-msgid "%s reference to nonexistent node `%s'"
-msgstr "%s Verweis auf den nicht existierenden Knoten »%s«"
+msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
+msgstr ""
+"%sverweis auf nicht existierenden Knoten „%s“ (vielleicht @section statt "
+"@subsection o.ä.?)"
 
-#: makeinfo/node.c:1294
+#: makeinfo/node.c:1363
 msgid "Menu"
-msgstr "Menu"
+msgstr "Menü"
 
-#: makeinfo/node.c:1296
+#: makeinfo/node.c:1365
 msgid "Cross"
-msgstr "Cross"
+msgstr "Quer"
 
-#: makeinfo/node.c:1380
+#: makeinfo/node.c:1447
 #, c-format
-msgid "Next field of node `%s' not pointed to"
-msgstr "Das Feld »nächstes« (Next) des Knotens »%s« verweist nicht auf"
+msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
+msgstr ""
+"Auf das Feld „nächstes“ (Next) des Knotens „%s“ wird nicht verwiesen "
+"(vielleicht @section statt @subsection o.ä.?)"
 
-#: makeinfo/node.c:1383
+#: makeinfo/node.c:1450
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr ""
-"Dieser Knoten (%s) hat einen fehlerhaften Eintrag im Feld »voriges« (Prev)"
+"Dieser Knoten (%s) hat den fehlerhaften Eintrag im Feld „voriges“ (Prev)"
 
-#: makeinfo/node.c:1395
+#: makeinfo/node.c:1462
 msgid "Prev"
-msgstr "Prev"
+msgstr "voriges"
 
-#: makeinfo/node.c:1438
+#: makeinfo/node.c:1505
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
-msgstr "Das Feld »voriges« (Prev) des Knotens »%s« verweist nicht auf"
+msgstr "Auf das Feld „voriges“ (Prev) des Knotens „%s“ wird nicht verwiesen"
 
-#: makeinfo/node.c:1442
+#: makeinfo/node.c:1509
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr ""
-"Dieser Knoten (%s) hat einen fehlerhaften Eintrag im Feld »nächstes« (Next)"
+"Dieser Knoten (%s) hat den fehlerhaften Eintrag im Feld „nächstes“ (Next)"
 
-#: makeinfo/node.c:1454
+#: makeinfo/node.c:1521
 #, c-format
-msgid "`%s' has no Up field"
-msgstr "»%s« hat kein »Up«-Feld"
+msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
+msgstr ""
+"„%s“ hat kein Feld „aufwärts“ (Up) (vielleicht @section statt @subsection o."
+"ä.?)"
 
-#: makeinfo/node.c:1457
+#: makeinfo/node.c:1524
 msgid "Up"
-msgstr "Up"
+msgstr "aufwärts"
 
-#: makeinfo/node.c:1523
+#: makeinfo/node.c:1590
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr ""
-"Dem Knoten »%s« fehlt ein Menüeintrag für »%s« obwohl er dessen "
-"übergeordnetes Ziel ist"
+"Dem Knoten „%s“ fehlt ein Menüeintrag für „%s“, obwohl er dessen Ziel für "
+"„aufwärts“ (Up) ist"
 
-#: makeinfo/node.c:1552
+#: makeinfo/node.c:1619
 #, c-format
 msgid "node `%s' has been referenced %d times"
-msgstr "Knoten »%s« wurde %d mal referenziert"
+msgstr "Knoten „%s“ wurde %d mal referenziert"
 
-#: makeinfo/node.c:1566
+#: makeinfo/node.c:1633
 #, c-format
 msgid "unreferenced node `%s'"
-msgstr "Nicht referenzierter Knoten »%s«"
+msgstr "Nicht referenzierter Knoten „%s“"
+
+#: makeinfo/node.c:1723
+#, c-format
+msgid "Removing %s\n"
+msgstr "Entferne %s\n"
+
+#: makeinfo/node.c:1727
+#, c-format
+msgid "Can't remove file `%s': %s"
+msgstr "Kann Datei „%s“ nicht entfernen: %s"
 
-#: makeinfo/sectioning.c:117
+#: makeinfo/sectioning.c:122
 #, c-format
-msgid "Appendix %c "
-msgstr "Anhang %c "
+msgid "Appendix %c"
+msgstr "Anhang %c"
 
-#: makeinfo/sectioning.c:356 makeinfo/sectioning.c:444
+#: makeinfo/sectioning.c:467
+#, c-format
+msgid "Internal error (search_sectioning) `%s'!"
+msgstr "Interner Fehler (search_sectioning) „%s“!"
+
+#: makeinfo/sectioning.c:562
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
-msgstr "Interner Fehler (search_sectioning) »%s«!"
+msgstr "Interner Fehler (search_sectioning) „%s“!"
 
-#: makeinfo/sectioning.c:502
+#: makeinfo/sectioning.c:623
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr "%c%s ist obsolet; %c%s stattdessen benutzen"
 
-#: makeinfo/sectioning.c:518
+#: makeinfo/sectioning.c:639
 #, c-format
 msgid "Node with %ctop as a section already exists"
-msgstr "Knoten mit %ctop als ein Abschnitt exisiert bereits"
+msgstr "Knoten mit %ctop als Abschnitt exisiert bereits"
 
-#: makeinfo/sectioning.c:526
+#: makeinfo/sectioning.c:647
 #, c-format
 msgid "Here is the %ctop node"
 msgstr "Hier ist der %ctop-Knoten"
 
-#: makeinfo/sectioning.c:543
+#: makeinfo/sectioning.c:663
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr "%ctop vor %cnode benutzt, Voreinstellung %s wird genommen"
 
-#: makeinfo/toc.c:221 makeinfo/toc.c:298 makeinfo/toc.c:299
+#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
 msgid "Table of Contents"
 msgstr "Inhaltsverzeichnis"
 
-#: makeinfo/toc.c:330 makeinfo/toc.c:366 makeinfo/toc.c:367
+#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
 msgid "Short Contents"
 msgstr "Inhalt in Kurzform"
 
-#: makeinfo/toc.c:406
-#, c-format
-msgid "%s: TOC should be here, but it was not found"
-msgstr "%s: Inhaltsverzeichnis sollte hier sein, jedoch nicht gefunden"
-
-#: makeinfo/xml.c:1108
+#: makeinfo/xml.c:1605
 #, c-format
 msgid "@image file `%s' unreadable: %s"
-msgstr "@image-Datei »%s« nicht lesbar: %s"
+msgstr "@image-Datei „%s“ nicht lesbar: %s"
 
-#: util/install-info.c:151
+#: makeinfo/xml.c:2097
+msgid ""
+"@headitem as the last item of @multitable produces invalid Docbook documents"
+msgstr ""
+"@headitem als letztes Element von @multitable erzeugt ungültige Docbook-"
+"Dokumente"
+
+#: util/install-info.c:154
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: Warnung: "
 
-# checkit
-#: util/install-info.c:176 util/install-info.c:189
-msgid "virtual memory exhausted"
-msgstr "kein Speicher mehr"
-
-#: util/install-info.c:232
+#: util/install-info.c:203
 #, c-format
 msgid " for %s"
 msgstr " für %s"
 
-#: util/install-info.c:381
+#: util/install-info.c:426
 #, c-format
 msgid "\tTry `%s --help' for a complete list of options.\n"
-msgstr "»%s --help« gibt weitere Informationen.\n"
+msgstr "\t„%s --help“ gibt weitere Informationen.\n"
 
 # Die "." am Zeilenende habe ich entfernt. -ke-
-#: util/install-info.c:389
+#: util/install-info.c:434
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
@@ -2888,23 +3038,21 @@ msgid ""
 msgstr ""
 "Aufruf: %s [OPTION]... [INFO-DATEI [VERZ-DATEI]]\n"
 "\n"
-"»dir«-Einträge von der INFO-DATEI in der Info-Verzeichnis-Datei VERZ-DATEI\n"
+"„dir“-Einträge von der INFO-DATEI in der Info-Verzeichnis-Datei VERZ-DATEI\n"
 "installieren oder löschen.\n"
 "\n"
 "Optionen:\n"
 " --delete          vorhandene Einträge für INFO-DATEI aus VERZ-DATEI "
 "löschen;\n"
 "                     keine neuen Einträge einfügen\n"
-" --dir-file=NAME   Name der Info-Verzeichnis-Datei angeben.  "
-"Gleichbedeutend\n"
+" --dir-file=NAME   Name der Info-Verzeichnis-Datei angeben. Gleichbedeutend\n"
 "                     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-Menüpunkts haben,\n"
-"                     zuzüglich Null oder mehrerer Extra-Zeilen, die mit\n"
-"                     Leerraum (\"whitespace\") beginnen.  Wenn mehr als ein\n"
-"                     Eintrag angegeben wird, werden alle hinzugefügt.  Wenn "
-"gar\n"
+" --entry=TEXT      TEXT als einen Info-Verzeichnis-Eintrag einfügen. TEXT\n"
+"                     soll die Form einer Zeile eines Info-Menüeintrags "
+"haben,\n"
+"                     zuzüglich mehrerer Extra-Zeilen (oder keiner), die mit\n"
+"                     Leerraum („whitespace“) beginnen. Wenn mehr als ein\n"
+"                     Eintrag angegeben wird, werden alle hinzugefügt. Wenn\n"
 "                     kein Eintrag angegeben wird, wird der Eintragstext der\n"
 "                     Info-Datei selbst entnommen.\n"
 " --help            diese Hilfe zeigen\n"
@@ -2914,19 +3062,18 @@ msgstr ""
 " --info-dir=VERZ   wie --dir-file=VERZ/dir\n"
 " --item=TEXT       wie --entry TEXT\n"
 "                     Ein Info-Verzeichnis-Eintrag ist nämlich ein "
-"Menüpunkt.\n"
+"Menüeintrag.\n"
 " --quiet           Warnungen unterdrücken\n"
 " --remove          wie --delete\n"
 " --section=ABSCHN  die Einträge dieser Datei in den Abschnitt ABSCHN des\n"
-"                     Verzeichnisses stellen.  Wenn mehr als ein Abschnitt\n"
-"                     angegeben wird, werden alle Einträge in jedem der\n"
-"                     Abschnitte hinzugefügt.  Wenn gar kein Abschnitt "
-"angegeben\n"
-"                     wird, wird der Eintragstext der Info-Datei selbst\n"
+"                     Verzeichnisses stellen. Wird mehr als ein Abschnitt\n"
+"                     angegeben, werden alle Einträge in jedem der\n"
+"                     Abschnitte hinzugefügt. Wird gar kein Abschnitt\n"
+"                     angegeben, wird der Eintragstext der Info-Datei selbst\n"
 "                     entnommen.\n"
 " --version         Programmversion anzeigen\n"
 
-#: util/install-info.c:444
+#: util/install-info.c:488
 #, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
@@ -2943,7 +3090,7 @@ msgid ""
 "  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
 "  to select it.\n"
 "\n"
-"* Menu:\n"
+"%s\n"
 msgstr ""
 "Dies ist die Datei .../info/dir, die den obersten Knoten der\n"
 "Info-Hierarchie enthält, genannt (dir)Top.\n"
@@ -2952,108 +3099,108 @@ msgstr ""
 "%s\tDies ist der Beginn 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"
+"  „q“ beendet Info, „?“ listet alle Info-Befehle auf, „d“ kehrt hierher\n"
+"  zurück, „h“ gibt eine Einsteiger-Hilfe, „mEmacs<Return>“ besucht das\n"
+"  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"
+"  Im Emacs kann man mit dem zweiten Mausknopf auf einen Menüeintrag oder\n"
+"  einen Querverweis klicken, um einen solchen auswählen.\n"
 "\n"
-"* Menü:\n"
+"%s\n"
 
-#: util/install-info.c:467
+#: util/install-info.c:513
 #, c-format
 msgid "%s: could not read (%s) and could not create (%s)\n"
-msgstr "%s: kann nicht gelesen (%s) und kann nicht angelegt werden (%s)\n"
+msgstr "%s: kann nicht gelesen (%s) und nicht angelegt werden (%s)\n"
 
-#: util/install-info.c:551
+#: util/install-info.c:600
 #, c-format
 msgid "%s: empty file"
 msgstr "%s: leere Datei"
 
-#: util/install-info.c:866 util/install-info.c:906
+#: util/install-info.c:913 util/install-info.c:953
 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:901
+#: util/install-info.c:948
 msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
 msgstr "END-INFO-DIR-ENTRY ohne START-INFO-DIR-ENTRY"
 
-#: util/install-info.c:1150 util/install-info.c:1160
+#: util/install-info.c:1191 util/install-info.c:1201
 #, c-format
-msgid "%s: Specify the Info directory only once.\n"
-msgstr "%s: Info-Verzeichnis nur einmal angeben.\n"
+msgid "%s: already have dir file: %s\n"
+msgstr "%s: Verzeichnisdatei schon vorhanden: %s\n"
 
-#: util/install-info.c:1195
+#: util/install-info.c:1236
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr "%s: Info-Datei nur einmal angeben.\n"
 
-# checkit
-#: util/install-info.c:1244
+#: util/install-info.c:1284
 #, c-format
 msgid "excess command line argument `%s'"
-msgstr "Kommandozeilen-Argument »%s« wird übergangen"
+msgstr "überflüssiges Kommandozeilen-Argument „%s“ wird übergangen"
 
-#: util/install-info.c:1248
+#: util/install-info.c:1288
 msgid "No input file specified; try --help for more information."
-msgstr "Keine Eingabe-Datei angegeben; »--help« gibt weitere Informationen."
+msgstr "Keine Eingabe-Datei angegeben; „--help“ gibt weitere Informationen."
 
-#: util/install-info.c:1251
+#: util/install-info.c:1291
 msgid "No dir file specified; try --help for more information."
-msgstr "Keine dir-Datei angegeben; »--help« gibt weitere Informationen."
+msgstr "Keine dir-Datei angegeben; „--help“ gibt weitere Informationen."
 
-#: util/install-info.c:1273
+#: util/install-info.c:1313
 #, c-format
 msgid "no info dir entry in `%s'"
-msgstr "Kein Info-Verzeichnis-Eintrag in »%s«"
+msgstr "Kein Info-Verzeichnis-Eintrag in „%s“"
 
-#: util/install-info.c:1388
+#: util/install-info.c:1426
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
-msgstr "Menüpunkt »%s« bereits vorhanden, für Datei »%s«"
+msgstr "Menüeintrag „%s“ bereits vorhanden, und zwar für Datei „%s“"
 
-#: util/install-info.c:1411
+#: util/install-info.c:1449
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
-msgstr "keine Einträge für »%s« gefunden; nichts entfernt"
+msgstr "keine Einträge für „%s“ gefunden; nichts entfernt"
 
-#: util/texindex.c:245
+#: util/texindex.c:252
 msgid "display this help and exit"
 msgstr "diese Hilfe anzeigen"
 
-#: util/texindex.c:247
+#: util/texindex.c:254
 msgid "keep temporary files around after processing"
-msgstr "temporäre Dateien bis nach der Verarbeitung aufheben"
+msgstr "temporäre Dateien nach Programmende nicht entfernen"
 
-#: util/texindex.c:249
+#: util/texindex.c:256
 msgid "do not keep temporary files around after processing (default)"
-msgstr "keine temporäre Dateien bis nach der Verarbeitung aufheben (Standard)"
+msgstr "temporäre Dateien nach Programmende entfernen (Standard)"
 
-#: util/texindex.c:251
+#: util/texindex.c:258
 msgid "send output to FILE"
 msgstr "Ausgabe nach DATEI schicken"
 
-#: util/texindex.c:253
+#: util/texindex.c:260
 msgid "display version information and exit"
 msgstr "Programmversion anzeigen"
 
-#: util/texindex.c:264
+#: util/texindex.c:270
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Aufruf: %s [OPTION]... DATEI...\n"
 
-#: util/texindex.c:265
+#: util/texindex.c:271
+#, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr "Erzeuge einen sortierten Index für jede TeX-Ausgabedatei.\n"
 
-#: util/texindex.c:268
+#: util/texindex.c:274
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
-msgstr "DATEI... ist normalerweise »foo.%c%c« für ein Dokument »foo.texi«.\n"
+msgstr "DATEI... ist normalerweise „foo.%c%c“ für ein Dokument „foo.texi“.\n"
 
-#: util/texindex.c:270
+#: util/texindex.c:276
+#, c-format
 msgid ""
 "\n"
 "Options:\n"
@@ -3061,51 +3208,60 @@ msgstr ""
 "\n"
 "Optionen:\n"
 
-#: util/texindex.c:887 util/texindex.c:921 util/texindex.c:997
-#: util/texindex.c:1025
+#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
+#: util/texindex.c:1011
 #, c-format
 msgid "%s: not a texinfo index file"
 msgstr "%s: keine Texinfo-Indexdatei"
 
-#: util/texindex.c:982
+#: util/texindex.c:968
 #, c-format
 msgid "failure reopening %s"
-msgstr "Fehler beim Wiederöffnen von »%s«"
+msgstr "Fehler beim Wiederöffnen von „%s“"
 
-#: util/texindex.c:1224
+#: util/texindex.c:1218
 #, c-format
 msgid "No page number in %s"
 msgstr "Keine Seitenzahl in %s"
 
-# checkit
-#: util/texindex.c:1295
+#: util/texindex.c:1291
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
-msgstr "Eintrag »%s« folgt einem Eintrag mit einem Zweitnamen"
+msgstr "Eintrag „%s“ direkt nach einem Untereintrag"
 
-#: util/texindex.c:1633
-#, c-format
-msgid "%s; for file `%s'.\n"
-msgstr "%s; für Datei »%s«.\n"
+#~ msgid "\"\" is invalid"
+#~ msgstr "„“ ist ungültig"
+
+#~ msgid "File exists, but is not a directory"
+#~ msgstr "Datei existiert, ist aber kein Verzeichnis"
+
+#~ msgid "First argument to cross-reference may not be empty"
+#~ msgstr "Erstes Argument für Querverweis darf nicht leer sein."
 
-#~ msgid ""
-#~ "Email bug reports to bug-texinfo@gnu.org,\n"
-#~ "general questions and discussion to help-texinfo@gnu.org."
-#~ msgstr ""
-#~ "Fehlerberichte per E-Mail an bug-texinfo@gnu.org schicken,\n"
-#~ "allgemeine Fragen und Gedankenaustausch an help-texinfo@gnu.org."
+#~ msgid "see "
+#~ msgstr "siehe "
 
-#~ msgid "Basic Commands in Info Windows\n"
-#~ msgstr "Grundbefehle in Info-Fenstern\n"
+#~ msgid "`.' or `,' must follow cross reference, not %c"
+#~ msgstr "„.“ or „,“ muss einem Querverweis folgen, nicht %c"
 
-#~ msgid "Moving within a node:\n"
-#~ msgstr "Innerhalb eines Knotens bewegen:\n"
+#~ msgid "First argument to @inforef may not be empty"
+#~ msgstr "Erstes Argument für @inforef darf nicht leer sein."
 
-#~ msgid "Selecting other nodes:\n"
-#~ msgstr "Andere Knoten auswählen:\n"
+#~ msgid "Node:"
+#~ msgstr "Knoten:"
+
+#~ msgid "%s: TOC should be here, but it was not found"
+#~ msgstr "%s: Inhaltsverzeichnis sollte hier sein, jedoch nicht gefunden"
+
+#~ msgid "%s: Specify the Info directory only once.\n"
+#~ msgstr "%s: Info-Verzeichnis nur einmal angeben.\n"
+
+# checkit
+#~ msgid "virtual memory exhausted"
+#~ msgstr "kein Speicher mehr"
 
-#~ msgid "Other commands:\n"
-#~ msgstr "Andere Befehle:\n"
+#~ msgid "No `%s.png' or `.jpg', and no extension supplied"
+#~ msgstr "Kein .png oder .jpg für „%s“ und keine Erweiterung angegeben."
 
-#~ msgid "%s' argument to @image command not found"
-#~ msgstr "%s'-Argument für @image-Befehl nicht gefunden"
+#~ msgid "`%s' has no Up field"
+#~ msgstr "„%s“ hat kein „Up“-Feld"
diff --git a/gnu/usr.bin/texinfo/po/de_AT.gmo b/gnu/usr.bin/texinfo/po/de_AT.gmo
index 0842096e409..2e74709de3b 100644
--- a/gnu/usr.bin/texinfo/po/de_AT.gmo
+++ b/gnu/usr.bin/texinfo/po/de_AT.gmo
diff --git a/gnu/usr.bin/texinfo/po/de_AT.po b/gnu/usr.bin/texinfo/po/de_AT.po
index 44ba2128791..51e8201c4cc 100644
--- a/gnu/usr.bin/texinfo/po/de_AT.po
+++ b/gnu/usr.bin/texinfo/po/de_AT.po
@@ -8,7 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 3.12d\n"
-"POT-Creation-Date: 2002-04-01 06:10-0800\n"
+"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
+"POT-Creation-Date: 2004-12-21 16:20-0800\n"
 "PO-Revision-Date: 1999-02-16 21:14+01:00\n"
 "Last-Translator: Karl Eichwalder <ke@suse.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -16,132 +17,132 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: info/echo-area.c:283 info/session.c:712
+#: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr ""
 
-#: info/echo-area.c:295 info/session.c:728
+#: info/echo-area.c:296 info/session.c:705
 msgid "Move backward a character"
 msgstr ""
 
-#: info/echo-area.c:307
+#: info/echo-area.c:308
 msgid "Move to the start of this line"
 msgstr ""
 
-#: info/echo-area.c:312
+#: info/echo-area.c:313
 msgid "Move to the end of this line"
 msgstr ""
 
-#: info/echo-area.c:320 info/session.c:746
+#: info/echo-area.c:321 info/session.c:723
 msgid "Move forward a word"
 msgstr ""
 
-#: info/echo-area.c:360 info/session.c:795
+#: info/echo-area.c:361 info/session.c:772
 msgid "Move backward a word"
 msgstr ""
 
-#: info/echo-area.c:400
+#: info/echo-area.c:401
 msgid "Delete the character under the cursor"
 msgstr ""
 
-#: info/echo-area.c:430
+#: info/echo-area.c:431
 msgid "Delete the character behind the cursor"
 msgstr ""
 
-#: info/echo-area.c:451
+#: info/echo-area.c:452
 msgid "Cancel or quit operation"
 msgstr ""
 
-#: info/echo-area.c:466
+#: info/echo-area.c:467
 msgid "Accept (or force completion of) this line"
 msgstr ""
 
-#: info/echo-area.c:471
+#: info/echo-area.c:472
 msgid "Insert next character verbatim"
 msgstr ""
 
-#: info/echo-area.c:479
+#: info/echo-area.c:480
 msgid "Insert this character"
 msgstr ""
 
-#: info/echo-area.c:497
+#: info/echo-area.c:498
 msgid "Insert a TAB character"
 msgstr ""
 
-#: info/echo-area.c:504
+#: info/echo-area.c:505
 msgid "Transpose characters at point"
 msgstr ""
 
-#: info/echo-area.c:555
+#: info/echo-area.c:556
 msgid "Yank back the contents of the last kill"
 msgstr ""
 
-#: info/echo-area.c:562
+#: info/echo-area.c:563
 msgid "Kill ring is empty"
 msgstr ""
 
-#: info/echo-area.c:575
+#: info/echo-area.c:576
 msgid "Yank back a previous kill"
 msgstr ""
 
-#: info/echo-area.c:608
+#: info/echo-area.c:609
 msgid "Kill to the end of the line"
 msgstr ""
 
-#: info/echo-area.c:621
+#: info/echo-area.c:622
 msgid "Kill to the beginning of the line"
 msgstr ""
 
-#: info/echo-area.c:633
+#: info/echo-area.c:634
 msgid "Kill the word following the cursor"
 msgstr ""
 
-#: info/echo-area.c:652
+#: info/echo-area.c:653
 msgid "Kill the word preceding the cursor"
 msgstr ""
 
-#: info/echo-area.c:872 info/echo-area.c:932
+#: info/echo-area.c:868 info/echo-area.c:924
 msgid "No completions"
 msgstr ""
 
-#: info/echo-area.c:874
+#: info/echo-area.c:870
 msgid "Not complete"
 msgstr ""
 
-#: info/echo-area.c:919
+#: info/echo-area.c:911
 msgid "List possible completions"
 msgstr ""
 
-#: info/echo-area.c:936
+#: info/echo-area.c:928
 msgid "Sole completion"
 msgstr ""
 
-#: info/echo-area.c:945
+#: info/echo-area.c:937
 msgid "One completion:\n"
 msgstr ""
 
-#: info/echo-area.c:946
+#: info/echo-area.c:938
 #, c-format
 msgid "%d completions:\n"
 msgstr ""
 
-#: info/echo-area.c:1092
+#: info/echo-area.c:1085
 msgid "Insert completion"
 msgstr ""
 
-#: info/echo-area.c:1225
+#: info/echo-area.c:1220
 msgid "Building completions..."
 msgstr ""
 
-#: info/echo-area.c:1342
+#: info/echo-area.c:1340
 msgid "Scroll the completions window"
 msgstr ""
 
-#: info/footnotes.c:212
+#: info/footnotes.c:213
 msgid "Footnotes could not be displayed"
 msgstr ""
 
-#: info/footnotes.c:238
+#: info/footnotes.c:239
 msgid "Show the footnotes associated with this node in another window"
 msgstr ""
 
@@ -149,102 +150,102 @@ msgstr ""
 msgid "---------- Footnotes ----------"
 msgstr ""
 
-#: info/indices.c:175
+#: info/indices.c:172
 msgid "Look up a string in the index for this file"
 msgstr ""
 
-#: info/indices.c:205
+#: info/indices.c:199
 msgid "Finding index entries..."
 msgstr ""
 
-#: info/indices.c:212
+#: info/indices.c:207
 msgid "No indices found."
 msgstr ""
 
-#: info/indices.c:222
+#: info/indices.c:217
 msgid "Index entry: "
 msgstr ""
 
-#: info/indices.c:332
+#: info/indices.c:325
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr ""
 
-#: info/indices.c:342
+#: info/indices.c:335
 msgid "No previous index search string."
 msgstr ""
 
-#: info/indices.c:349
+#: info/indices.c:342
 msgid "No index entries."
 msgstr ""
 
-#: info/indices.c:382
+#: info/indices.c:375
 #, c-format
-msgid "No %sindex entries containing \"%s\"."
+msgid "No %sindex entries containing `%s'."
 msgstr ""
 
-#: info/indices.c:383
+#: info/indices.c:376
 msgid "more "
 msgstr ""
 
-#: info/indices.c:393
+#: info/indices.c:386
 msgid "CAN'T SEE THIS"
 msgstr ""
 
-#: info/indices.c:429
+#: info/indices.c:422
 #, c-format
-msgid "Found \"%s\" in %s. (`\\[next-index-match]' tries to find next.)"
+msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
 msgstr ""
 
-#: info/indices.c:549
+#: info/indices.c:541
 #, c-format
-msgid "Scanning indices of \"%s\"..."
+msgid "Scanning indices of `%s'..."
 msgstr ""
 
-#: info/indices.c:603
+#: info/indices.c:596
 #, c-format
-msgid "No available info files have \"%s\" in their indices."
+msgid "No available info files have `%s' in their indices."
 msgstr ""
 
-#: info/indices.c:632
+#: info/indices.c:622
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr ""
 
-#: info/indices.c:636
+#: info/indices.c:626
 msgid "Index apropos: "
 msgstr ""
 
-#: info/indices.c:666
+#: info/indices.c:654
 #, c-format
 msgid ""
 "\n"
-"* Menu: Nodes whoses indices contain \"%s\":\n"
+"* Menu: Nodes whose indices contain `%s':\n"
 msgstr ""
 
-#: info/info.c:260 info/infokey.c:884
+#: info/info.c:275 info/infokey.c:899
+#, c-format
 msgid "Try --help for more information.\n"
 msgstr ""
 
-#: info/info.c:279 info/infokey.c:139 makeinfo/makeinfo.c:689
-#: util/install-info.c:1224 util/texindex.c:338
+#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
+#: util/texindex.c:343
 #, 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 ""
 
-#: info/info.c:462
+#: info/info.c:498
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr ""
 
-#: info/info.c:555
+#: info/info.c:590
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
 msgstr ""
 
-#: info/info.c:562
+#: info/info.c:597
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -261,10 +262,12 @@ msgid ""
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
 "  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
-"  -R, --raw-escapes            don't remove ANSI escapes from man pages.\n"
+"  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+"      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
 "  -O, --show-options, --usage  go to command-line options node.\n"
 "%s      --subnodes               recursively output menu items.\n"
+"  -w, --where, --location      print physical location of Info file.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
 "\n"
@@ -282,8 +285,8 @@ msgid ""
 "  info -f ./foo.info         show file ./foo.info, not searching dir\n"
 msgstr ""
 
-#: info/info.c:598 info/infokey.c:903 makeinfo/makeinfo.c:474
-#: util/install-info.c:421 util/texindex.c:286
+#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
+#: util/install-info.c:466 util/texindex.c:292
 msgid ""
 "\n"
 "Email bug reports to bug-texinfo@gnu.org,\n"
@@ -291,198 +294,198 @@ msgid ""
 "Texinfo home page: http://www.gnu.org/software/texinfo/"
 msgstr ""
 
-#: info/info.c:632
+#: info/info.c:669
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr ""
 
-#: info/info.c:633
+#: info/info.c:670
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr ""
 
-#: info/info.c:634
+#: info/info.c:671
 msgid "Cannot find a window!"
 msgstr ""
 
-#: info/info.c:635
+#: info/info.c:672
 msgid "Point doesn't appear within this window's node!"
 msgstr ""
 
-#: info/info.c:636
+#: info/info.c:673
 msgid "Cannot delete the last window."
 msgstr ""
 
-#: info/info.c:637
+#: info/info.c:674
 msgid "No menu in this node."
 msgstr ""
 
-#: info/info.c:638
+#: info/info.c:675
 msgid "No footnotes in this node."
 msgstr ""
 
-#: info/info.c:639
+#: info/info.c:676
 msgid "No cross references in this node."
 msgstr ""
 
-#: info/info.c:640
+#: info/info.c:677
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr ""
 
-#: info/info.c:641
+#: info/info.c:678
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr ""
 
-#: info/info.c:642
+#: info/info.c:679
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr ""
 
-#: info/info.c:643
+#: info/info.c:680
 msgid "You are already at the last page of this node."
 msgstr ""
 
-#: info/info.c:644
+#: info/info.c:681
 msgid "You are already at the first page of this node."
 msgstr ""
 
-#: info/info.c:645
+#: info/info.c:682
 msgid "Only one window."
 msgstr ""
 
-#: info/info.c:646
+#: info/info.c:683
 msgid "Resulting window would be too small."
 msgstr ""
 
-#: info/info.c:647
+#: info/info.c:684
 msgid "Not enough room for a help window, please delete a window."
 msgstr ""
 
-#: info/infodoc.c:45 info/infodoc.c:94
+#: info/infodoc.c:46 info/infodoc.c:95
 msgid ""
 "Basic Commands in Info Windows\n"
 "******************************\n"
 msgstr ""
 
-#: info/infodoc.c:48
+#: info/infodoc.c:49
 msgid "\\%-10[quit-help]  Quit this help.\n"
 msgstr ""
 
-#: info/infodoc.c:49
+#: info/infodoc.c:50
 msgid "\\%-10[quit]  Quit Info altogether.\n"
 msgstr ""
 
-#: info/infodoc.c:50
+#: info/infodoc.c:51
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
 msgstr ""
 
-#: info/infodoc.c:52 info/infodoc.c:101
+#: info/infodoc.c:53 info/infodoc.c:102
 msgid ""
 "Selecting other nodes:\n"
 "----------------------\n"
 msgstr ""
 
-#: info/infodoc.c:54
+#: info/infodoc.c:55
 msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
 msgstr ""
 
-#: info/infodoc.c:55
+#: info/infodoc.c:56
 msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
 msgstr ""
 
-#: info/infodoc.c:56
+#: info/infodoc.c:57
 msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
 msgstr ""
 
-#: info/infodoc.c:57
+#: info/infodoc.c:58
 msgid ""
 "\\%-10[menu-item]  Pick menu item specified by name.\n"
 "              Picking a menu item causes another node to be selected.\n"
 msgstr ""
 
-#: info/infodoc.c:59
+#: info/infodoc.c:60
 msgid ""
 "\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
 msgstr ""
 
-#: info/infodoc.c:60
+#: info/infodoc.c:61
 msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
 msgstr ""
 
-#: info/infodoc.c:61
+#: info/infodoc.c:62
 msgid ""
 "\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
 msgstr ""
 
-#: info/infodoc.c:62
+#: info/infodoc.c:63
 msgid ""
 "\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
 "node.\n"
 msgstr ""
 
-#: info/infodoc.c:63
+#: info/infodoc.c:64
 msgid ""
 "\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
 msgstr ""
 
-#: info/infodoc.c:64
+#: info/infodoc.c:65
 msgid ""
 "\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
 "node] (DIR)'.\n"
 msgstr ""
 
-#: info/infodoc.c:65
+#: info/infodoc.c:66
 msgid ""
 "\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
 msgstr ""
 
-#: info/infodoc.c:67 info/infodoc.c:115
+#: info/infodoc.c:68 info/infodoc.c:116
 msgid ""
 "Moving within a node:\n"
 "---------------------\n"
 msgstr ""
 
-#: info/infodoc.c:69
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
-msgstr ""
-
 #: info/infodoc.c:70
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
 msgstr ""
 
 #: info/infodoc.c:71
-msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
 msgstr ""
 
 #: info/infodoc.c:72
-msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
 msgstr ""
 
 #: info/infodoc.c:73
-msgid "\\%-10[scroll-forward]  Scroll forward 1 line.\n"
+msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
 msgstr ""
 
 #: info/infodoc.c:74
-msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
+msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
+msgstr ""
+
+#: info/infodoc.c:75
+msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
 msgstr ""
 
-#: info/infodoc.c:76 info/infodoc.c:124
+#: info/infodoc.c:77 info/infodoc.c:125
 msgid ""
 "Other commands:\n"
 "---------------\n"
 msgstr ""
 
-#: info/infodoc.c:78
+#: info/infodoc.c:79
 msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
 msgstr ""
 
-#: info/infodoc.c:79
+#: info/infodoc.c:80
 msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
 msgstr ""
 
-#: info/infodoc.c:80
+#: info/infodoc.c:81
 msgid ""
 "\\%-10[index-search]  Search for a specified string in the index entries of "
 "this Info\n"
@@ -490,349 +493,358 @@ msgid ""
 "found.\n"
 msgstr ""
 
-#: info/infodoc.c:82
+#: info/infodoc.c:83
 msgid ""
 "\\%-10[goto-node]  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr ""
 
-#: info/infodoc.c:84
+#: info/infodoc.c:85
 msgid ""
 "\\%-10[search]  Search forward for a specified string\n"
 "              and select the node in which the next occurrence is found.\n"
 msgstr ""
 
-#: info/infodoc.c:86
+#: info/infodoc.c:87
 msgid ""
 "\\%-10[search-backward]  Search backward for a specified string\n"
 "              and select the node in which the previous occurrence is "
 "found.\n"
 msgstr ""
 
-#: info/infodoc.c:97
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Quit this help.\n"
 msgstr ""
 
-#: info/infodoc.c:98
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr ""
 
-#: info/infodoc.c:99
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr ""
 
-#: info/infodoc.c:103
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
 msgstr ""
 
-#: info/infodoc.c:104
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
 msgstr ""
 
-#: info/infodoc.c:105
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
 msgstr ""
 
-#: info/infodoc.c:106
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Pick menu item specified by name.\n"
 msgstr ""
 
-#: info/infodoc.c:107
+#: info/infodoc.c:108
 msgid "              Picking a menu item causes another node to be selected.\n"
 msgstr ""
 
-#: info/infodoc.c:108
+#: info/infodoc.c:109
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
 msgstr ""
 
-#: info/infodoc.c:109
+#: info/infodoc.c:110
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
 msgstr ""
 
-#: info/infodoc.c:110
+#: info/infodoc.c:111
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
 msgstr ""
 
-#: info/infodoc.c:111
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
 msgstr ""
 
-#: info/infodoc.c:112
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
 msgstr ""
 
-#: info/infodoc.c:113
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
 msgstr ""
 
-#: info/infodoc.c:117
+#: info/infodoc.c:118
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
 msgstr ""
 
-#: info/infodoc.c:118
+#: info/infodoc.c:119
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
 msgstr ""
 
-#: info/infodoc.c:119
+#: info/infodoc.c:120
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
 msgstr ""
 
-#: info/infodoc.c:120
+#: info/infodoc.c:121
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
 msgstr ""
 
-#: info/infodoc.c:121
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
 msgstr ""
 
-#: info/infodoc.c:122
+#: info/infodoc.c:123
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
 msgstr ""
 
-#: info/infodoc.c:126
+#: info/infodoc.c:127
 #, c-format
 msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
 msgstr ""
 
-#: info/infodoc.c:127
+#: info/infodoc.c:128
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
 msgstr ""
 
-#: info/infodoc.c:128
+#: info/infodoc.c:129
 #, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
 msgstr ""
 
-#: info/infodoc.c:129
+#: info/infodoc.c:130
 msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
 msgstr ""
 
-#: info/infodoc.c:130
+#: info/infodoc.c:131
 #, c-format
 msgid "  %-10s  Move to node specified by name.\n"
 msgstr ""
 
-#: info/infodoc.c:131
+#: info/infodoc.c:132
 msgid ""
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr ""
 
-#: info/infodoc.c:132
+#: info/infodoc.c:133
 #, c-format
 msgid "  %-10s  Search forward for a specified string,\n"
 msgstr ""
 
-#: info/infodoc.c:133 info/infodoc.c:135
+#: info/infodoc.c:134 info/infodoc.c:136
 msgid ""
 "              and select the node in which the next occurrence is found.\n"
 msgstr ""
 
-#: info/infodoc.c:134
+#: info/infodoc.c:135
 #, c-format
 msgid "  %-10s  Search backward for a specified string\n"
 msgstr ""
 
-#: info/infodoc.c:313
+#: info/infodoc.c:316
 msgid "The current search path is:\n"
 msgstr ""
 
-#: info/infodoc.c:316
+#: info/infodoc.c:320
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
 msgstr ""
 
-#: info/infodoc.c:319
+#: info/infodoc.c:324
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
 msgstr ""
 
-#: info/infodoc.c:340
+#: info/infodoc.c:347
 #, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
 "\n"
 msgstr ""
 
-#: info/infodoc.c:343
+#: info/infodoc.c:351
 msgid ""
 "The following commands cannot be invoked at all:\n"
 "\n"
 msgstr ""
 
-#: info/infodoc.c:367
+#: info/infodoc.c:375
 msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
 msgstr ""
 
-#: info/infodoc.c:477
+#: info/infodoc.c:485
 msgid "Display help message"
 msgstr ""
 
-#: info/infodoc.c:495
+#: info/infodoc.c:503
 msgid "Visit Info node `(info)Help'"
 msgstr ""
 
-#: info/infodoc.c:638
+#: info/infodoc.c:641
 msgid "Print documentation for KEY"
 msgstr ""
 
-#: info/infodoc.c:650
+#: info/infodoc.c:653
 #, c-format
 msgid "Describe key: %s"
 msgstr ""
 
-#: info/infodoc.c:660
+#: info/infodoc.c:664
 #, c-format
 msgid "ESC %s is undefined."
 msgstr ""
 
-#: info/infodoc.c:676 info/infodoc.c:703
+#: info/infodoc.c:680 info/infodoc.c:709
 #, c-format
 msgid "%s is undefined."
 msgstr ""
 
-#: info/infodoc.c:724
+#: info/infodoc.c:730
 #, c-format
 msgid "%s is defined to %s."
 msgstr ""
 
-#: info/infodoc.c:1151
+#: info/infodoc.c:1153
 msgid "Show what to type to execute a given command"
 msgstr ""
 
-#: info/infodoc.c:1155
+#: info/infodoc.c:1157
 msgid "Where is command: "
 msgstr ""
 
-#: info/infodoc.c:1177
+#: info/infodoc.c:1179
 #, c-format
 msgid "`%s' is not on any keys"
 msgstr ""
 
-#: info/infodoc.c:1183
+#: info/infodoc.c:1186
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr ""
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1190
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr ""
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1195
 #, c-format
 msgid "There is no function named `%s'"
 msgstr ""
 
-#: info/infokey.c:164
+#: info/infokey.c:145
+#, 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 ""
+
+#: info/infokey.c:170
 msgid "incorrect number of arguments"
 msgstr ""
 
-#: info/infokey.c:194
+#: info/infokey.c:201
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr ""
 
-#: info/infokey.c:207
+#: info/infokey.c:215
 #, c-format
 msgid "cannot create output file `%s'"
 msgstr ""
 
-#: info/infokey.c:217
+#: info/infokey.c:226
 #, c-format
 msgid "error writing to `%s'"
 msgstr ""
 
-#: info/infokey.c:222
+#: info/infokey.c:232
 #, c-format
 msgid "error closing output file `%s'"
 msgstr ""
 
-#: info/infokey.c:443
+#: info/infokey.c:450
 msgid "key sequence too long"
 msgstr ""
 
-#: info/infokey.c:521
+#: info/infokey.c:529
 msgid "missing key sequence"
 msgstr ""
 
-#: info/infokey.c:600
+#: info/infokey.c:610
 msgid "NUL character (\\000) not permitted"
 msgstr ""
 
-#: info/infokey.c:629
+#: info/infokey.c:641
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr ""
 
-#: info/infokey.c:652
+#: info/infokey.c:665
 msgid "missing action name"
 msgstr ""
 
-#: info/infokey.c:667 info/infokey.c:733
+#: info/infokey.c:681 info/infokey.c:756
 msgid "section too long"
 msgstr ""
 
-#: info/infokey.c:673
+#: info/infokey.c:688
 #, c-format
 msgid "unknown action `%s'"
 msgstr ""
 
-#: info/infokey.c:682
+#: info/infokey.c:698
 msgid "action name too long"
 msgstr ""
 
-#: info/infokey.c:694
+#: info/infokey.c:712
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr ""
 
-#: info/infokey.c:704
+#: info/infokey.c:723
 msgid "missing variable name"
 msgstr ""
 
-#: info/infokey.c:712
+#: info/infokey.c:733
 msgid "missing `=' immediately after variable name"
 msgstr ""
 
-#: info/infokey.c:719
+#: info/infokey.c:741
 msgid "variable name too long"
 msgstr ""
 
-#: info/infokey.c:741
+#: info/infokey.c:765
 msgid "value too long"
 msgstr ""
 
-#: info/infokey.c:875
+#: info/infokey.c:890
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr ""
 
-#: info/infokey.c:891
+#: info/infokey.c:906
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -846,89 +858,95 @@ msgid ""
 "  --version            display version information and exit.\n"
 msgstr ""
 
-#: info/infomap.c:1397
+#: info/infomap.c:1500
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
 msgstr ""
 
-#: info/infomap.c:1400
+#: info/infomap.c:1503
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
 msgstr ""
 
-#: info/infomap.c:1413
+#: info/infomap.c:1516
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
 msgstr ""
 
-#: info/infomap.c:1431
+#: info/infomap.c:1535
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1437
+#: info/infomap.c:1544
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1450
+#: info/infomap.c:1560
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1470
+#: info/infomap.c:1581
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1608
+#: info/infomap.c:1716
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr ""
 
-#: info/infomap.c:1659
+#: info/infomap.c:1766
 msgid "Bad data in infokey file -- some var settings ignored"
 msgstr ""
 
-#: info/m-x.c:70
+#: info/m-x.c:69
 msgid "Read the name of an Info command and describe it"
 msgstr ""
 
-#: info/m-x.c:74
+#: info/m-x.c:73
 msgid "Describe command: "
 msgstr ""
 
-#: info/m-x.c:97
+#: info/m-x.c:96
 msgid "Read a command name in the echo area and execute it"
 msgstr ""
 
-#: info/m-x.c:141
+#: info/m-x.c:140
 msgid "Cannot execute an `echo-area' command here."
 msgstr ""
 
-#: info/m-x.c:157
+#: info/m-x.c:154
+#, c-format
+msgid "Undefined command: %s"
+msgstr ""
+
+#: info/m-x.c:160
 msgid "Set the height of the displayed window"
 msgstr ""
 
-#: info/m-x.c:170
+#: info/m-x.c:173
 #, c-format
 msgid "Set screen height to (%d): "
 msgstr ""
 
-#: info/makedoc.c:161 info/makedoc.c:169
+#: info/makedoc.c:162 info/makedoc.c:170
+#, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
 "\n"
 msgstr ""
 
-#: info/makedoc.c:553
+#: info/makedoc.c:550
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr ""
 
-#: info/nodemenu.c:28
+#: info/nodemenu.c:31
 msgid ""
 "\n"
 "* Menu:\n"
@@ -936,465 +954,465 @@ msgid ""
 "  ----------                        -----   ----   ---------------"
 msgstr ""
 
-#: info/nodemenu.c:199
+#: info/nodemenu.c:202
 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 ""
 
-#: info/nodemenu.c:219
+#: info/nodemenu.c:224
 msgid "Make a window containing a menu of all of the currently visited nodes"
 msgstr ""
 
-#: info/nodemenu.c:299
+#: info/nodemenu.c:304
 msgid "Select a node which has been previously visited in a visible window"
 msgstr ""
 
-#: info/nodemenu.c:311
+#: info/nodemenu.c:317
 msgid "Select visited node: "
 msgstr ""
 
-#: info/nodemenu.c:331 info/session.c:2235
+#: info/nodemenu.c:337 info/session.c:2264
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr ""
 
-#: info/session.c:170
+#: info/session.c:162
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
 "for menu item."
 msgstr ""
 
-#: info/session.c:643
+#: info/session.c:620
 msgid "Move down to the next line"
 msgstr ""
 
-#: info/session.c:658
+#: info/session.c:635
 msgid "Move up to the previous line"
 msgstr ""
 
-#: info/session.c:673
+#: info/session.c:650
 msgid "Move to the end of the line"
 msgstr ""
 
-#: info/session.c:693
+#: info/session.c:670
 msgid "Move to the start of the line"
 msgstr ""
 
-#: info/session.c:885 makeinfo/node.c:1357
+#: info/session.c:860 makeinfo/node.c:1424
 msgid "Next"
 msgstr ""
 
-#: info/session.c:888
+#: info/session.c:863
 msgid "Following Next node..."
 msgstr ""
 
-#: info/session.c:905
+#: info/session.c:881
 msgid "Selecting first menu item..."
 msgstr ""
 
-#: info/session.c:916
+#: info/session.c:893
 msgid "Selecting Next node..."
 msgstr ""
 
-#: info/session.c:986
+#: info/session.c:964
 #, c-format
 msgid "Moving Up %d time(s), then Next."
 msgstr ""
 
-#: info/session.c:1010
+#: info/session.c:988
 msgid "No more nodes within this document."
 msgstr ""
 
-#: info/session.c:1034
+#: info/session.c:1011
 msgid "No `Prev' for this node."
 msgstr ""
 
-#: info/session.c:1037 info/session.c:1092
+#: info/session.c:1014 info/session.c:1073
 msgid "Moving Prev in this window."
 msgstr ""
 
-#: info/session.c:1051
+#: info/session.c:1030
 msgid "No `Prev' or `Up' for this node within this document."
 msgstr ""
 
-#: info/session.c:1054
+#: info/session.c:1034
 msgid "Moving Up in this window."
 msgstr ""
 
-#: info/session.c:1102
+#: info/session.c:1084
 msgid "Moving to `Prev's last menu item."
 msgstr ""
 
-#: info/session.c:1113
+#: info/session.c:1095
 msgid "Move forwards or down through node structure"
 msgstr ""
 
-#: info/session.c:1129
+#: info/session.c:1111
 msgid "Move backwards or up through node structure"
 msgstr ""
 
-#: info/session.c:1229
+#: info/session.c:1205
 msgid "Scroll forward in this window"
 msgstr ""
 
-#: info/session.c:1237
+#: info/session.c:1213
 msgid "Scroll forward in this window and set default window size"
 msgstr ""
 
-#: info/session.c:1245
+#: info/session.c:1221
 msgid "Scroll forward in this window staying within node"
 msgstr ""
 
-#: info/session.c:1253
+#: info/session.c:1229
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr ""
 
-#: info/session.c:1261
+#: info/session.c:1237
 msgid "Scroll backward in this window"
 msgstr ""
 
-#: info/session.c:1269
+#: info/session.c:1245
 msgid "Scroll backward in this window and set default window size"
 msgstr ""
 
-#: info/session.c:1278
+#: info/session.c:1254
 msgid "Scroll backward in this window staying within node"
 msgstr ""
 
-#: info/session.c:1286
+#: info/session.c:1262
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
 msgstr ""
 
-#: info/session.c:1294
+#: info/session.c:1270
 msgid "Move to the start of this node"
 msgstr ""
 
-#: info/session.c:1301
+#: info/session.c:1277
 msgid "Move to the end of this node"
 msgstr ""
 
-#: info/session.c:1308
+#: info/session.c:1284
 msgid "Scroll down by lines"
 msgstr ""
 
-#: info/session.c:1325
+#: info/session.c:1301
 msgid "Scroll up by lines"
 msgstr ""
 
-#: info/session.c:1343
+#: info/session.c:1319
 msgid "Scroll down by half screen size"
 msgstr ""
 
-#: info/session.c:1369
+#: info/session.c:1345
 msgid "Scroll up by half screen size"
 msgstr ""
 
-#: info/session.c:1398
+#: info/session.c:1374
 msgid "Select the next window"
 msgstr ""
 
-#: info/session.c:1437
+#: info/session.c:1413
 msgid "Select the previous window"
 msgstr ""
 
-#: info/session.c:1488
+#: info/session.c:1464
 msgid "Split the current window"
 msgstr ""
 
-#: info/session.c:1569
+#: info/session.c:1545
 msgid "Delete the current window"
 msgstr ""
 
-#: info/session.c:1577
+#: info/session.c:1553
 msgid "Cannot delete a permanent window"
 msgstr ""
 
-#: info/session.c:1610
+#: info/session.c:1585
 msgid "Delete all other windows"
 msgstr ""
 
-#: info/session.c:1656
+#: info/session.c:1631
 msgid "Scroll the other window"
 msgstr ""
 
-#: info/session.c:1677
+#: info/session.c:1652
 msgid "Scroll the other window backward"
 msgstr ""
 
-#: info/session.c:1683
+#: info/session.c:1658
 msgid "Grow (or shrink) this window"
 msgstr ""
 
-#: info/session.c:1694
+#: info/session.c:1669
 msgid "Divide the available screen space among the visible windows"
 msgstr ""
 
-#: info/session.c:1701
+#: info/session.c:1676
 msgid "Toggle the state of line wrapping in the current window"
 msgstr ""
 
-#: info/session.c:1880
+#: info/session.c:1848
 msgid "Select the Next node"
 msgstr ""
 
-#: info/session.c:1888
+#: info/session.c:1856
 msgid "Select the Prev node"
 msgstr ""
 
-#: info/session.c:1896
+#: info/session.c:1864
 msgid "Select the Up node"
 msgstr ""
 
-#: info/session.c:1903
+#: info/session.c:1871
 msgid "Select the last node in this file"
 msgstr ""
 
-#: info/session.c:1930 info/session.c:1963
+#: info/session.c:1898 info/session.c:1931
 msgid "This window has no additional nodes"
 msgstr ""
 
-#: info/session.c:1936
+#: info/session.c:1904
 msgid "Select the first node in this file"
 msgstr ""
 
-#: info/session.c:1970
+#: info/session.c:1938
 msgid "Select the last item in this node's menu"
 msgstr ""
 
-#: info/session.c:1976
+#: info/session.c:1944
 msgid "Select this menu item"
 msgstr ""
 
-#: info/session.c:2005
+#: info/session.c:1977
 #, c-format
 msgid "There aren't %d items in this menu."
 msgstr ""
 
-#: info/session.c:2148
+#: info/session.c:2171 info/session.c:2172
 #, c-format
 msgid "Menu item (%s): "
 msgstr ""
 
-#: info/session.c:2150
+#: info/session.c:2175
 msgid "Menu item: "
 msgstr ""
 
-#: info/session.c:2155
+#: info/session.c:2182 info/session.c:2183
 #, c-format
 msgid "Follow xref (%s): "
 msgstr ""
 
-#: info/session.c:2157
+#: info/session.c:2186
 msgid "Follow xref: "
 msgstr ""
 
-#: info/session.c:2280
+#: info/session.c:2315
 msgid "Read a menu item and select its node"
 msgstr ""
 
-#: info/session.c:2288
+#: info/session.c:2323
 msgid "Read a footnote or cross reference and select its node"
 msgstr ""
 
-#: info/session.c:2294
+#: info/session.c:2329
 msgid "Move to the start of this node's menu"
 msgstr ""
 
-#: info/session.c:2318
+#: info/session.c:2353
 msgid "Visit as many menu items at once as possible"
 msgstr ""
 
-#: info/session.c:2346
+#: info/session.c:2381
 msgid "Read a node name and select it"
 msgstr ""
 
-#: info/session.c:2401 info/session.c:2405
+#: info/session.c:2436 info/session.c:2441
 msgid "Goto node: "
 msgstr ""
 
-#: info/session.c:2471
+#: info/session.c:2505
 #, c-format
 msgid "No menu in node `%s'."
 msgstr ""
 
-#: info/session.c:2516
+#: info/session.c:2551
 #, c-format
 msgid "No menu item `%s' in node `%s'."
 msgstr ""
 
-#: info/session.c:2546
+#: info/session.c:2581
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
 msgstr ""
 
-#: info/session.c:2597
+#: info/session.c:2631
 msgid "Read a list of menus starting from dir and follow them"
 msgstr ""
 
-#: info/session.c:2599
+#: info/session.c:2633
 msgid "Follow menus: "
 msgstr ""
 
-#: info/session.c:2797
+#: info/session.c:2826
 msgid "Find the node describing program invocation"
 msgstr ""
 
-#: info/session.c:2799
+#: info/session.c:2828
 #, c-format
 msgid "Find Invocation node of [%s]: "
 msgstr ""
 
-#: info/session.c:2837
+#: info/session.c:2866
 msgid "Read a manpage reference and select it"
 msgstr ""
 
-#: info/session.c:2841
+#: info/session.c:2870
 msgid "Get Manpage: "
 msgstr ""
 
-#: info/session.c:2871
+#: info/session.c:2900
 msgid "Select the node `Top' in this file"
 msgstr ""
 
-#: info/session.c:2877
+#: info/session.c:2906
 msgid "Select the node `(dir)'"
 msgstr ""
 
-#: info/session.c:2897
+#: info/session.c:2923 info/session.c:2925
 #, c-format
 msgid "Kill node (%s): "
 msgstr ""
 
-#: info/session.c:2951
+#: info/session.c:2977
 #, c-format
 msgid "Cannot kill node `%s'"
 msgstr ""
 
-#: info/session.c:2961
+#: info/session.c:2987
 msgid "Cannot kill the last node"
 msgstr ""
 
-#: info/session.c:3047
+#: info/session.c:3073
 msgid "Select the most recently selected node"
 msgstr ""
 
-#: info/session.c:3053
+#: info/session.c:3079
 msgid "Kill this node"
 msgstr ""
 
-#: info/session.c:3061
+#: info/session.c:3087
 msgid "Read the name of a file and select it"
 msgstr ""
 
-#: info/session.c:3065
+#: info/session.c:3091
 msgid "Find file: "
 msgstr ""
 
-#: info/session.c:3082
+#: info/session.c:3108
 #, c-format
 msgid "Cannot find `%s'."
 msgstr ""
 
-#: info/session.c:3127 info/session.c:3248
+#: info/session.c:3151 info/session.c:3269
 #, c-format
 msgid "Could not create output file `%s'."
 msgstr ""
 
-#: info/session.c:3140 info/session.c:3265 info/session.c:3326
+#: info/session.c:3165 info/session.c:3287 info/session.c:3347
 msgid "Done."
 msgstr ""
 
-#: info/session.c:3196
+#: info/session.c:3220
 #, c-format
 msgid "Writing node %s..."
 msgstr ""
 
-#: info/session.c:3274
+#: info/session.c:3296
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
 msgstr ""
 
-#: info/session.c:3310
+#: info/session.c:3331
 #, c-format
 msgid "Cannot open pipe to `%s'."
 msgstr ""
 
-#: info/session.c:3316
+#: info/session.c:3337
 #, c-format
 msgid "Printing node %s..."
 msgstr ""
 
-#: info/session.c:3558
+#: info/session.c:3567
 #, c-format
 msgid "Searching subfile %s ..."
 msgstr ""
 
-#: info/session.c:3610
+#: info/session.c:3619
 msgid "Read a string and search for it case-sensitively"
 msgstr ""
 
-#: info/session.c:3617
+#: info/session.c:3626
 msgid "Read a string and search for it"
 msgstr ""
 
-#: info/session.c:3625
+#: info/session.c:3634
 msgid "Read a string and search backward for it"
 msgstr ""
 
-#: info/session.c:3667
+#: info/session.c:3670 info/session.c:3677
 #, c-format
 msgid "%s%sfor string [%s]: "
 msgstr ""
 
-#: info/session.c:3668
+#: info/session.c:3671 info/session.c:3678
 msgid "Search backward"
 msgstr ""
 
-#: info/session.c:3668
+#: info/session.c:3672 info/session.c:3678
 msgid "Search"
 msgstr ""
 
-#: info/session.c:3669
+#: info/session.c:3673 info/session.c:3679
 msgid " case-sensitively "
 msgstr ""
 
-#: info/session.c:3669
+#: info/session.c:3674 info/session.c:3679
 msgid " "
 msgstr ""
 
-#: info/session.c:3709
+#: info/session.c:3718
 msgid "Search failed."
 msgstr ""
 
-#: info/session.c:3727
+#: info/session.c:3736
 msgid "Repeat last search in the same direction"
 msgstr ""
 
-#: info/session.c:3730 info/session.c:3740
+#: info/session.c:3739 info/session.c:3749
 msgid "No previous search string"
 msgstr ""
 
-#: info/session.c:3737
+#: info/session.c:3746
 msgid "Repeat last search in the reverse direction"
 msgstr ""
 
-#: info/session.c:3755 info/session.c:3761
+#: info/session.c:3765 info/session.c:3771
 msgid "Search interactively for a string as you type it"
 msgstr ""
 
-#: info/session.c:3855
+#: info/session.c:3851
 msgid "I-search backward: "
 msgstr ""
 
-#: info/session.c:3857
+#: info/session.c:3853
 msgid "I-search: "
 msgstr ""
 
-#: info/session.c:3882
+#: info/session.c:3878 info/session.c:3880
 msgid "Failing "
 msgstr ""
 
@@ -1410,27 +1428,27 @@ msgstr ""
 msgid "Select reference or menu item appearing on this line"
 msgstr ""
 
-#: info/session.c:4381
+#: info/session.c:4382
 msgid "Cancel current operation"
 msgstr ""
 
-#: info/session.c:4388
+#: info/session.c:4389
 msgid "Quit"
 msgstr ""
 
-#: info/session.c:4397
+#: info/session.c:4398
 msgid "Move the cursor to a specific line of the window"
 msgstr ""
 
-#: info/session.c:4429
+#: info/session.c:4430
 msgid "Redraw the display"
 msgstr ""
 
-#: info/session.c:4466
+#: info/session.c:4467
 msgid "Quit using Info"
 msgstr ""
 
-#: info/session.c:4479
+#: info/session.c:4480
 msgid "Run command bound to this key's lowercase variant"
 msgstr ""
 
@@ -1440,27 +1458,29 @@ msgid "Unknown command (%s)."
 msgstr ""
 
 #: info/session.c:4494
-msgid "\"\" is invalid"
+#, c-format
+msgid "\"%s\" is invalid"
 msgstr ""
 
 #: info/session.c:4495
 #, c-format
-msgid "\"%s\" is invalid"
+msgid "`%s' is invalid"
 msgstr ""
 
-#: info/session.c:4713
+#: info/session.c:4709
 msgid "Add this digit to the current numeric argument"
 msgstr ""
 
-#: info/session.c:4722
+#: info/session.c:4718
 msgid "Start (or multiply by 4) the current numeric argument"
 msgstr ""
 
-#: info/session.c:4737
+#: info/session.c:4733
 msgid "Internally used by \\[universal-argument]"
 msgstr ""
 
-#: info/tilde.c:344
+#: info/tilde.c:338
+#, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr ""
 
@@ -1526,230 +1546,264 @@ msgstr ""
 msgid "Set %s to value (%s): "
 msgstr ""
 
-#: info/window.c:1164
+#: info/window.c:1138
 msgid "--*** Tags out of Date ***"
 msgstr ""
 
-#: info/window.c:1175
+#: info/window.c:1149
 msgid "-----Info: (), lines ----, "
 msgstr ""
 
-#: info/window.c:1182
+#: info/window.c:1156
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr ""
 
-#: info/window.c:1186
+#: info/window.c:1160
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr ""
 
-#: info/window.c:1193
+#: info/window.c:1167
 #, c-format
 msgid " Subfile: %s"
 msgstr ""
 
-#: lib/getopt.c:675
+#: lib/getopt.c:551 lib/getopt.c:570
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr ""
 
-#: lib/getopt.c:700
+#: lib/getopt.c:603 lib/getopt.c:607
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr ""
 
-#: lib/getopt.c:705
+#: lib/getopt.c:616 lib/getopt.c:621
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr ""
 
-#: lib/getopt.c:723 lib/getopt.c:896
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
-#: lib/getopt.c:752
+#: lib/getopt.c:727 lib/getopt.c:730
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
 
-#: lib/getopt.c:756
+#: lib/getopt.c:738 lib/getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""
 
-#: lib/getopt.c:782
+#: lib/getopt.c:796 lib/getopt.c:799
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr ""
 
-#: lib/getopt.c:785
+#: lib/getopt.c:805 lib/getopt.c:808
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#: lib/getopt.c:815 lib/getopt.c:945
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
-#: lib/getopt.c:862
+#: lib/getopt.c:935 lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""
 
-#: lib/getopt.c:880
+#: lib/getopt.c:978 lib/getopt.c:999
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#, c-format
+msgid "arguments to @%s ignored"
+msgstr ""
+
+#: makeinfo/cmds.c:585
 msgid "January"
 msgstr "Jänner"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "February"
 msgstr ""
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "March"
 msgstr ""
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "April"
 msgstr ""
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "May"
 msgstr ""
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "June"
 msgstr ""
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "July"
 msgstr ""
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "August"
 msgstr ""
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "September"
 msgstr ""
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "October"
 msgstr ""
 
-#: makeinfo/cmds.c:517
+#: makeinfo/cmds.c:587
 msgid "November"
 msgstr ""
 
-#: makeinfo/cmds.c:517
+#: makeinfo/cmds.c:587
 msgid "December"
 msgstr ""
 
-#: makeinfo/cmds.c:658
+#: makeinfo/cmds.c:936
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr ""
 
-#: makeinfo/cmds.c:701
+#: makeinfo/cmds.c:979
 msgid "@sc argument all uppercase, thus no effect"
 msgstr ""
 
-#: makeinfo/cmds.c:759
+#: makeinfo/cmds.c:1034
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr ""
 
-#: makeinfo/cmds.c:789
+#: makeinfo/cmds.c:1074
 msgid "end of file inside verb block"
 msgstr ""
 
-#: makeinfo/cmds.c:797
+#: makeinfo/cmds.c:1082
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr ""
 
-#: makeinfo/cmds.c:942
+#: makeinfo/cmds.c:1112
+msgid ""
+"@strong{Note...} produces a spurious cross-reference in Info; reword to "
+"avoid that"
+msgstr ""
+
+#: makeinfo/cmds.c:1305
 #, c-format
 msgid "%c%s is obsolete"
 msgstr ""
 
-#: makeinfo/cmds.c:1014
+#: makeinfo/cmds.c:1414
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr ""
 
-#: makeinfo/cmds.c:1348 makeinfo/cmds.c:1374 makeinfo/footnote.c:81
+#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr ""
 
-#: makeinfo/cmds.c:1358 makeinfo/makeinfo.c:4140
+#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
 msgid "asis"
 msgstr ""
 
-#: makeinfo/cmds.c:1360 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
 msgid "none"
 msgstr ""
 
-#: makeinfo/defun.c:85
+#: makeinfo/cmds.c:1789
+#, c-format
+msgid "Bad argument to @%s"
+msgstr ""
+
+#: makeinfo/cmds.c:1803
+msgid "insert"
+msgstr ""
+
+#: makeinfo/defun.c:84
 msgid "Missing `}' in @def arg"
 msgstr ""
 
-#: makeinfo/defun.c:363
+#: makeinfo/defun.c:403
 msgid "Function"
 msgstr ""
 
-#: makeinfo/defun.c:366
+#: makeinfo/defun.c:406
 msgid "Macro"
 msgstr ""
 
-#: makeinfo/defun.c:369
+#: makeinfo/defun.c:409
 msgid "Special Form"
 msgstr ""
 
-#: makeinfo/defun.c:373
+#: makeinfo/defun.c:413
 msgid "Variable"
 msgstr ""
 
-#: makeinfo/defun.c:376
+#: makeinfo/defun.c:416
 msgid "User Option"
 msgstr ""
 
-#: makeinfo/defun.c:380
+#: makeinfo/defun.c:420
 msgid "Instance Variable"
 msgstr ""
 
-#: makeinfo/defun.c:384
+#: makeinfo/defun.c:424
 msgid "Method"
 msgstr ""
 
-#: makeinfo/defun.c:466 makeinfo/defun.c:470 makeinfo/defun.c:615
-#: makeinfo/defun.c:631 makeinfo/defun.c:671
+#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
+#: makeinfo/defun.c:644 makeinfo/xml.c:2229
 msgid "of"
 msgstr ""
 
-#: makeinfo/defun.c:474 makeinfo/defun.c:478 makeinfo/defun.c:482
-#: makeinfo/defun.c:624 makeinfo/defun.c:676
+#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
 msgid "on"
 msgstr ""
 
-#: makeinfo/defun.c:717
+#: makeinfo/defun.c:711
 #, c-format
-msgid "Must be in `%s' insertion to use `%sx'"
+msgid "Must be in `@%s' environment to use `@%s'"
 msgstr ""
 
-#: makeinfo/files.c:448
+#: makeinfo/files.c:435
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr ""
 
+#: makeinfo/files.c:638
+#, c-format
+msgid "`%s' omitted before output filename"
+msgstr ""
+
+#: makeinfo/files.c:646
+#, c-format
+msgid "`%s' omitted since writing to stdout"
+msgstr ""
+
+#: makeinfo/files.c:694
+msgid "Output buffer not empty."
+msgstr ""
+
 #: makeinfo/footnote.c:150
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
@@ -1768,233 +1822,280 @@ msgstr ""
 msgid "Footnotes inside footnotes are not allowed"
 msgstr ""
 
-#: makeinfo/footnote.c:298
+#: makeinfo/footnote.c:302 makeinfo/index.c:189
 msgid "Footnotes"
 msgstr ""
 
-#: makeinfo/html.c:42
+#: makeinfo/html.c:87
+#, c-format
+msgid "%s: could not open --css-file: %s"
+msgstr ""
+
+#: makeinfo/html.c:172
+#, c-format
+msgid "%s:%d: --css-file ended in comment"
+msgstr ""
+
+#: makeinfo/html.c:207
 msgid "Untitled"
 msgstr ""
 
-#: makeinfo/html.c:298
+#: makeinfo/html.c:422
+msgid "[unexpected] no html tag to pop"
+msgstr ""
+
+#: makeinfo/html.c:752
 #, c-format
-msgid "Invalid node name: `%s'"
+msgid "[unexpected] invalid node name: `%s'"
 msgstr ""
 
-#: makeinfo/index.c:213
+#: makeinfo/index.c:169
 #, c-format
 msgid "Unknown index `%s'"
 msgstr ""
 
-#: makeinfo/index.c:238
+#: makeinfo/index.c:234
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr ""
 
-#: makeinfo/index.c:396
+#: makeinfo/index.c:412
 #, c-format
 msgid "Index `%s' already exists"
 msgstr ""
 
-#: makeinfo/index.c:439
+#: makeinfo/index.c:455
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr ""
 
-#: makeinfo/index.c:666
+#: makeinfo/index.c:661
+msgid "(line )"
+msgstr ""
+
+#: makeinfo/index.c:669
+#, c-format
+msgid "(line %*d)"
+msgstr ""
+
+#: makeinfo/index.c:750
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr ""
 
-#: makeinfo/index.c:709
+#: makeinfo/index.c:819
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr ""
 
-#: makeinfo/index.c:712 makeinfo/index.c:751
+#: makeinfo/index.c:822 makeinfo/index.c:858
 msgid "(outside of any node)"
 msgstr ""
 
-#: makeinfo/insertion.c:198
+#: makeinfo/index.c:919 makeinfo/index.c:925
+msgid "See "
+msgstr ""
+
+#: makeinfo/insertion.c:160
+msgid "@item not allowed in argument to @itemize"
+msgstr ""
+
+#: makeinfo/insertion.c:238
 msgid "Broken-Type in insertion_type_pname"
 msgstr ""
 
-#: makeinfo/insertion.c:271
+#: makeinfo/insertion.c:334
 msgid "Enumeration stack overflow"
 msgstr ""
 
-#: makeinfo/insertion.c:303
+#: makeinfo/insertion.c:366
 #, c-format
 msgid "lettering overflow, restarting at %c"
 msgstr ""
 
-#: makeinfo/insertion.c:538
+#: makeinfo/insertion.c:631
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
 msgstr ""
 
-#: makeinfo/insertion.c:693
+#: makeinfo/insertion.c:719
+#, c-format
+msgid "%cfloat environments cannot be nested"
+msgstr ""
+
+#: makeinfo/insertion.c:973
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
 msgstr ""
 
-#: makeinfo/insertion.c:931
+#: makeinfo/insertion.c:1337
 #, c-format
 msgid "No matching `%cend %s'"
 msgstr ""
 
-#: makeinfo/insertion.c:1084
+#: makeinfo/insertion.c:1592
 #, c-format
 msgid "%s requires letter or digit"
 msgstr ""
 
-#: makeinfo/insertion.c:1158
+#: makeinfo/insertion.c:1687
 msgid "end of file inside verbatim block"
 msgstr ""
 
-#: makeinfo/insertion.c:1318
+#: makeinfo/insertion.c:1913
+#, c-format
+msgid "@%s not meaningful outside `@float' environment"
+msgstr ""
+
+#: makeinfo/insertion.c:1949
 msgid "@menu seen before first @node, creating `Top' node"
 msgstr ""
 
-#: makeinfo/insertion.c:1319
+#: makeinfo/insertion.c:1950
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr ""
 
-#: makeinfo/insertion.c:1331
+#: makeinfo/insertion.c:1962
 msgid "@detailmenu seen before first node, creating `Top' node"
 msgstr ""
 
-#: makeinfo/insertion.c:1346
+#: makeinfo/insertion.c:2018
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr ""
+
+#: makeinfo/insertion.c:2032
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' environment"
+msgstr ""
+
+#: makeinfo/insertion.c:2063
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr ""
 
-#: makeinfo/insertion.c:1353
+#: makeinfo/insertion.c:2068
 #, c-format
 msgid "`%c%s' needs something after it"
 msgstr ""
 
-#: makeinfo/insertion.c:1359
+#: makeinfo/insertion.c:2074
 #, c-format
-msgid "Bad argument to `%s', `%s', using `%s'"
+msgid "Bad argument `%s' to `@%s', using `%s'"
 msgstr ""
 
-#: makeinfo/insertion.c:1453
+#: makeinfo/insertion.c:2171
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
 msgstr ""
 
-#: makeinfo/insertion.c:1462
+#: makeinfo/insertion.c:2180
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
 msgstr ""
 
-#: makeinfo/insertion.c:1646
+#: makeinfo/insertion.c:2356
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr ""
 
-#: makeinfo/lang.c:331
+#: makeinfo/lang.c:580
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr ""
 
-#: makeinfo/lang.c:384
+#: makeinfo/lang.c:655
 #, c-format
-msgid "unrecogized encoding name `%s'"
+msgid "unrecognized encoding name `%s'"
 msgstr ""
 
-#: makeinfo/lang.c:387
+#: makeinfo/lang.c:663
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr ""
 
-#: makeinfo/lang.c:414
+#: makeinfo/lang.c:715
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr ""
 
-#: makeinfo/lang.c:502
-#, c-format
-msgid "%s is an invalid ISO code, using %c"
-msgstr ""
-
-#: makeinfo/lang.c:687
+#: makeinfo/lang.c:1009
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr ""
 
-#: makeinfo/lang.c:691
+#: makeinfo/lang.c:1013
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr ""
 
-#: makeinfo/macro.c:134
+#: makeinfo/macro.c:128
 #, c-format
 msgid "macro `%s' previously defined"
 msgstr ""
 
-#: makeinfo/macro.c:138
+#: makeinfo/macro.c:132
 #, c-format
 msgid "here is the previous definition of `%s'"
 msgstr ""
 
 #: makeinfo/macro.c:355
 #, c-format
-msgid "\\ in macro expansion followed by `%s' instead of \\ or parameter name"
+msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr ""
 
-#: makeinfo/macro.c:403
+#: makeinfo/macro.c:401
 #, c-format
 msgid "Macro `%s' called on line %d with too many args"
 msgstr ""
 
-#: makeinfo/macro.c:594
+#: makeinfo/macro.c:586
 #, c-format
 msgid "%cend macro not found"
 msgstr ""
 
-#: makeinfo/macro.c:632
+#: makeinfo/macro.c:624
 msgid "@quote-arg only useful for single-argument macros"
 msgstr ""
 
-#: makeinfo/macro.c:668
+#: makeinfo/macro.c:660
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:316
+#: makeinfo/makeinfo.c:184
 #, c-format
-msgid "%s:%d: warning: "
+msgid "Too many errors!  Gave up.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:339
-msgid "Too many errors!  Gave up.\n"
+#: makeinfo/makeinfo.c:302
+#, c-format
+msgid "%s:%d: warning: "
 msgstr ""
 
-#: makeinfo/makeinfo.c:350 makeinfo/makeinfo.c:2026
+#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
 #, c-format
 msgid "Misplaced %c"
 msgstr ""
 
-#: makeinfo/makeinfo.c:370
+#: makeinfo/makeinfo.c:340
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:373
+#: makeinfo/makeinfo.c:343
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:376
+#: makeinfo/makeinfo.c:346
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:380
+#: makeinfo/makeinfo.c:350
 #, c-format
 msgid ""
 "General options:\n"
@@ -2009,16 +2110,17 @@ msgid ""
 "      --version               display version information and exit.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:394
+#: makeinfo/makeinfo.c:364
 #, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output DocBook rather than Info.\n"
+"      --docbook             output Docbook XML rather than Info.\n"
 "      --html                output HTML rather than Info.\n"
-"      --xml                 output XML (TexinfoML) rather than Info.\n"
+"      --xml                 output Texinfo XML rather than Info.\n"
+"      --plaintext           output plain text rather than Info.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:401
+#: makeinfo/makeinfo.c:372
 msgid ""
 "General output options:\n"
 "  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
@@ -2034,7 +2136,7 @@ msgid ""
 "  -o, --output=FILE         output to FILE (directory if split HTML),\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:386
 #, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2053,43 +2155,68 @@ msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d).\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:433
+#: makeinfo/makeinfo.c:403
+msgid ""
+"Options for HTML:\n"
+"      --css-include=FILE        include FILE in HTML <style> output;\n"
+"                                  read stdin if FILE is -.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:409
+#, c-format
+msgid ""
+"Options for XML and Docbook:\n"
+"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"d).\n"
+"                                  If VAL is 0, ignorable whitespace is "
+"dropped.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:416
 msgid ""
 "Input file options:\n"
-"      --commands-in-node-names   allow @ commands in node names.\n"
-"  -D VAR                         define the variable VAR, as with @set.\n"
-"  -I DIR                         append DIR to the @include search path.\n"
-"  -P DIR                         prepend DIR to the @include search path.\n"
-"  -U VAR                         undefine the variable VAR, as with @clear.\n"
+"      --commands-in-node-names  allow @ commands in node names.\n"
+"  -D VAR                        define the variable VAR, as with @set.\n"
+"  -I DIR                        append DIR to the @include search path.\n"
+"  -P DIR                        prepend DIR to the @include search path.\n"
+"  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:442
+#: makeinfo/makeinfo.c:425
 msgid ""
 "Conditional processing in input:\n"
+"  --ifdocbook       process @ifdocbook and @docbook even if\n"
+"                      not generating Docbook.\n"
 "  --ifhtml          process @ifhtml and @html even if not generating HTML.\n"
 "  --ifinfo          process @ifinfo even if not generating Info.\n"
 "  --ifplaintext     process @ifplaintext even if not generating plain text.\n"
 "  --iftex           process @iftex and @tex; implies --no-split.\n"
+"  --ifxml           process @ifxml and @xml.\n"
+"  --no-ifdocbook    do not process @ifdocbook and @docbook text.\n"
 "  --no-ifhtml       do not process @ifhtml and @html text.\n"
 "  --no-ifinfo       do not process @ifinfo text.\n"
 "  --no-ifplaintext  do not process @ifplaintext text.\n"
 "  --no-iftex        do not process @iftex and @tex text.\n"
+"  --no-ifxml        do not process @ifxml and @xml text.\n"
+"\n"
+"  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:454
+#: makeinfo/makeinfo.c:444
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating HTML, --ifhtml is on and the others are off;\n"
 "  if generating Info, --ifinfo is on and the others are off;\n"
 "  if generating plain text, --ifplaintext is on and the others are off;\n"
+"  if generating XML, --ifxml is on and the others are off.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:461
+#: makeinfo/makeinfo.c:452
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                     write Info to foo's @setfilename\n"
 "  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write XML to @setfilename\n"
+"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
 "  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
 "  makeinfo --no-headers foo.texi        write plain text to standard output\n"
 "\n"
@@ -2099,393 +2226,392 @@ msgid ""
 "  makeinfo --no-split foo.texi          write one Info file however big\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:570 makeinfo/makeinfo.c:593 makeinfo/makeinfo.c:655
-#: makeinfo/makeinfo.c:676
+#: makeinfo/makeinfo.c:603
+#, c-format
+msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
+#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:583
+#: makeinfo/makeinfo.c:660
 #, c-format
-msgid "Couldn't open macro expansion output `%s'"
+msgid "%s: could not open macro expansion output `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:586
-msgid "Cannot specify more than one macro expansion output"
+#: makeinfo/makeinfo.c:665
+#, c-format
+msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:624
+#: makeinfo/makeinfo.c:707
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:723
+#: makeinfo/makeinfo.c:806
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:898
+#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
 #, c-format
-msgid "Expected `%s'"
+msgid "Multiline command %c%s used improperly"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1365
-msgid "File exists, but is not a directory"
+#: makeinfo/makeinfo.c:1000
+#, c-format
+msgid "Expected `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1366
+#: makeinfo/makeinfo.c:1479
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1414
+#: makeinfo/makeinfo.c:1525
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1496
+#: makeinfo/makeinfo.c:1605
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1526
+#: makeinfo/makeinfo.c:1638
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1561
+#: makeinfo/makeinfo.c:1673
 #, c-format
 msgid "This is %s, produced by makeinfo version %s from %s.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1583
+#: makeinfo/makeinfo.c:1709
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1627
+#: makeinfo/makeinfo.c:1773
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1853
+#: makeinfo/makeinfo.c:2034
 #, c-format
 msgid "Unknown command `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1875
+#: makeinfo/makeinfo.c:2056
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2068
+#: makeinfo/makeinfo.c:2314
 #, c-format
-msgid "%c%s expected `{...}'"
+msgid "%c%s expected braces"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2098
+#: makeinfo/makeinfo.c:2327
 msgid "Unmatched }"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2148
+#: makeinfo/makeinfo.c:2375
 msgid "NO_NAME!"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2169
+#: makeinfo/makeinfo.c:2396
 #, c-format
 msgid "%c%s missing close brace"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2958
-msgid "First argument to cross-reference may not be empty"
-msgstr ""
-
-#: makeinfo/makeinfo.c:3018 makeinfo/makeinfo.c:3236 makeinfo/xml.c:1340
-msgid "see "
-msgstr ""
-
-#: makeinfo/makeinfo.c:3018
-msgid "See "
-msgstr ""
-
-#: makeinfo/makeinfo.c:3164
-#, c-format
-msgid "`.' or `,' must follow cross reference, not %c"
-msgstr ""
-
-#: makeinfo/makeinfo.c:3212
-msgid "First argument to @inforef may not be empty"
-msgstr ""
-
-#: makeinfo/makeinfo.c:3427
+#: makeinfo/makeinfo.c:3309
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3440
+#: makeinfo/makeinfo.c:3315
 #, c-format
-msgid "No `%s.png' or `.jpg', and no extension supplied"
+msgid "No such file `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3490
+#: makeinfo/makeinfo.c:3447
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3497
+#: makeinfo/makeinfo.c:3456
 msgid "@image missing filename argument"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3690
+#: makeinfo/makeinfo.c:3675
+#, c-format
+msgid "undefined flag: %s"
+msgstr ""
+
+#: makeinfo/makeinfo.c:3676
 #, c-format
 msgid "{No value for `%s'}"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3744
+#: makeinfo/makeinfo.c:3728
 #, c-format
 msgid "%c%s requires a name"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3850
+#: makeinfo/makeinfo.c:3834
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:4081
+#: makeinfo/makeinfo.c:4082
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr ""
 
-#: makeinfo/multi.c:226
+#: makeinfo/multi.c:116
 msgid "Missing } in @multitable template"
 msgstr ""
 
-#: makeinfo/multi.c:302
+#: makeinfo/multi.c:254
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr ""
 
-#: makeinfo/multi.c:375
+#: makeinfo/multi.c:393
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr ""
 
-#: makeinfo/multi.c:426
+#: makeinfo/multi.c:555
 #, c-format
-msgid "Cannot select column #%d in multitable"
+msgid "[unexpected] cannot select column #%d in multitable"
 msgstr ""
 
-#: makeinfo/multi.c:529
+#: makeinfo/multi.c:584
 msgid "ignoring @tab outside of multitable"
 msgstr ""
 
-#: makeinfo/multi.c:565
+#: makeinfo/multi.c:632
+#, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr ""
 
-#: makeinfo/multi.c:568
+#: makeinfo/multi.c:635
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr ""
 
-#: makeinfo/node.c:276
+#: makeinfo/node.c:280
 #, c-format
 msgid "Node `%s' previously defined at line %d"
 msgstr ""
 
-#: makeinfo/node.c:594
+#: makeinfo/node.c:648
 #, c-format
 msgid "Formatting node %s...\n"
 msgstr ""
 
-#: makeinfo/node.c:655
+#: makeinfo/node.c:716
 #, c-format
-msgid "Node `%s' requires a sectioning command (e.g. %c%s)"
+msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
 msgstr ""
 
-#: makeinfo/node.c:815
+#: makeinfo/node.c:879
 #, c-format
 msgid "No node name specified for `%c%s' command"
 msgstr ""
 
-#: makeinfo/node.c:856 makeinfo/node.c:1075
+#: makeinfo/node.c:920 makeinfo/node.c:1151
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr ""
 
-#: makeinfo/node.c:859
+#: makeinfo/node.c:923
 msgid "This @anchor command ignored; references to it will not work"
 msgstr ""
 
-#: makeinfo/node.c:861 makeinfo/node.c:1078
+#: makeinfo/node.c:925 makeinfo/node.c:1154
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr ""
 
-#: makeinfo/node.c:891
+#: makeinfo/node.c:955
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
 msgstr ""
 
-#: makeinfo/node.c:920
-msgid "Node:"
-msgstr ""
-
-#: makeinfo/node.c:930
+#: makeinfo/node.c:991
 msgid "Next:"
 msgstr ""
 
-#: makeinfo/node.c:940
+#: makeinfo/node.c:1007
 msgid "Previous:"
 msgstr ""
 
-#: makeinfo/node.c:950
+#: makeinfo/node.c:1021
 msgid "Up:"
 msgstr ""
 
-#: makeinfo/node.c:1072
+#: makeinfo/node.c:1148
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr ""
 
-#: makeinfo/node.c:1077
+#: makeinfo/node.c:1153
 msgid "@anchor command ignored; references to it will not work"
 msgstr ""
 
-#: makeinfo/node.c:1277
+#: makeinfo/node.c:1347
 #, c-format
-msgid "%s reference to nonexistent node `%s'"
+msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1294
+#: makeinfo/node.c:1363
 msgid "Menu"
 msgstr ""
 
-#: makeinfo/node.c:1296
+#: makeinfo/node.c:1365
 msgid "Cross"
 msgstr ""
 
-#: makeinfo/node.c:1380
+#: makeinfo/node.c:1447
 #, c-format
-msgid "Next field of node `%s' not pointed to"
+msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1383
+#: makeinfo/node.c:1450
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr ""
 
-#: makeinfo/node.c:1395
+#: makeinfo/node.c:1462
 msgid "Prev"
 msgstr ""
 
-#: makeinfo/node.c:1438
+#: makeinfo/node.c:1505
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr ""
 
-#: makeinfo/node.c:1442
+#: makeinfo/node.c:1509
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr ""
 
-#: makeinfo/node.c:1454
+#: makeinfo/node.c:1521
 #, c-format
-msgid "`%s' has no Up field"
+msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1457
+#: makeinfo/node.c:1524
 msgid "Up"
 msgstr ""
 
-#: makeinfo/node.c:1523
+#: makeinfo/node.c:1590
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr ""
 
-#: makeinfo/node.c:1552
+#: makeinfo/node.c:1619
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr ""
 
-#: makeinfo/node.c:1566
+#: makeinfo/node.c:1633
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr ""
 
-#: makeinfo/sectioning.c:117
+#: makeinfo/node.c:1723
+#, c-format
+msgid "Removing %s\n"
+msgstr ""
+
+#: makeinfo/node.c:1727
+#, c-format
+msgid "Can't remove file `%s': %s"
+msgstr ""
+
+#: makeinfo/sectioning.c:122
+#, c-format
+msgid "Appendix %c"
+msgstr ""
+
+#: makeinfo/sectioning.c:467
 #, c-format
-msgid "Appendix %c "
+msgid "Internal error (search_sectioning) `%s'!"
 msgstr ""
 
-#: makeinfo/sectioning.c:356 makeinfo/sectioning.c:444
+#: makeinfo/sectioning.c:562
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
 msgstr ""
 
-#: makeinfo/sectioning.c:502
+#: makeinfo/sectioning.c:623
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr ""
 
-#: makeinfo/sectioning.c:518
+#: makeinfo/sectioning.c:639
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr ""
 
-#: makeinfo/sectioning.c:526
+#: makeinfo/sectioning.c:647
 #, c-format
 msgid "Here is the %ctop node"
 msgstr ""
 
-#: makeinfo/sectioning.c:543
+#: makeinfo/sectioning.c:663
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr ""
 
-#: makeinfo/toc.c:221 makeinfo/toc.c:298 makeinfo/toc.c:299
+#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
 msgid "Table of Contents"
 msgstr ""
 
-#: makeinfo/toc.c:330 makeinfo/toc.c:366 makeinfo/toc.c:367
+#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
 msgid "Short Contents"
 msgstr ""
 
-#: makeinfo/toc.c:406
+#: makeinfo/xml.c:1605
 #, c-format
-msgid "%s: TOC should be here, but it was not found"
+msgid "@image file `%s' unreadable: %s"
 msgstr ""
 
-#: makeinfo/xml.c:1108
-#, c-format
-msgid "@image file `%s' unreadable: %s"
+#: makeinfo/xml.c:2097
+msgid ""
+"@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
 
-#: util/install-info.c:151
+#: util/install-info.c:154
 #, c-format
 msgid "%s: warning: "
 msgstr ""
 
-#: util/install-info.c:176 util/install-info.c:189
-msgid "virtual memory exhausted"
-msgstr ""
-
-#: util/install-info.c:232
+#: util/install-info.c:203
 #, c-format
 msgid " for %s"
 msgstr ""
 
-#: util/install-info.c:381
+#: util/install-info.c:426
 #, c-format
 msgid "\tTry `%s --help' for a complete list of options.\n"
 msgstr ""
 
-#: util/install-info.c:389
+#: util/install-info.c:434
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
@@ -2522,7 +2648,7 @@ msgid ""
 " --version         display version information and exit.\n"
 msgstr ""
 
-#: util/install-info.c:444
+#: util/install-info.c:488
 #, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
@@ -2539,127 +2665,124 @@ msgid ""
 "  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
 "  to select it.\n"
 "\n"
-"* Menu:\n"
+"%s\n"
 msgstr ""
 
-#: util/install-info.c:467
+#: util/install-info.c:513
 #, c-format
 msgid "%s: could not read (%s) and could not create (%s)\n"
 msgstr ""
 
-#: util/install-info.c:551
+#: util/install-info.c:600
 #, c-format
 msgid "%s: empty file"
 msgstr ""
 
-#: util/install-info.c:866 util/install-info.c:906
+#: util/install-info.c:913 util/install-info.c:953
 msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
 msgstr ""
 
-#: util/install-info.c:901
+#: util/install-info.c:948
 msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
 msgstr ""
 
-#: util/install-info.c:1150 util/install-info.c:1160
+#: util/install-info.c:1191 util/install-info.c:1201
 #, c-format
-msgid "%s: Specify the Info directory only once.\n"
+msgid "%s: already have dir file: %s\n"
 msgstr ""
 
-#: util/install-info.c:1195
+#: util/install-info.c:1236
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr ""
 
-#: util/install-info.c:1244
+#: util/install-info.c:1284
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr ""
 
-#: util/install-info.c:1248
+#: util/install-info.c:1288
 msgid "No input file specified; try --help for more information."
 msgstr ""
 
-#: util/install-info.c:1251
+#: util/install-info.c:1291
 msgid "No dir file specified; try --help for more information."
 msgstr ""
 
-#: util/install-info.c:1273
+#: util/install-info.c:1313
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr ""
 
-#: util/install-info.c:1388
+#: util/install-info.c:1426
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr ""
 
-#: util/install-info.c:1411
+#: util/install-info.c:1449
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr ""
 
-#: util/texindex.c:245
+#: util/texindex.c:252
 msgid "display this help and exit"
 msgstr ""
 
-#: util/texindex.c:247
+#: util/texindex.c:254
 msgid "keep temporary files around after processing"
 msgstr ""
 
-#: util/texindex.c:249
+#: util/texindex.c:256
 msgid "do not keep temporary files around after processing (default)"
 msgstr ""
 
-#: util/texindex.c:251
+#: util/texindex.c:258
 msgid "send output to FILE"
 msgstr ""
 
-#: util/texindex.c:253
+#: util/texindex.c:260
 msgid "display version information and exit"
 msgstr ""
 
-#: util/texindex.c:264
+#: util/texindex.c:270
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr ""
 
-#: util/texindex.c:265
+#: util/texindex.c:271
+#, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr ""
 
-#: util/texindex.c:268
+#: util/texindex.c:274
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr ""
 
-#: util/texindex.c:270
+#: util/texindex.c:276
+#, c-format
 msgid ""
 "\n"
 "Options:\n"
 msgstr ""
 
-#: util/texindex.c:887 util/texindex.c:921 util/texindex.c:997
-#: util/texindex.c:1025
+#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
+#: util/texindex.c:1011
 #, c-format
 msgid "%s: not a texinfo index file"
 msgstr ""
 
-#: util/texindex.c:982
+#: util/texindex.c:968
 #, c-format
 msgid "failure reopening %s"
 msgstr ""
 
-#: util/texindex.c:1224
+#: util/texindex.c:1218
 #, c-format
 msgid "No page number in %s"
 msgstr ""
 
-#: util/texindex.c:1295
+#: util/texindex.c:1291
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr ""
-
-#: util/texindex.c:1633
-#, c-format
-msgid "%s; for file `%s'.\n"
-msgstr ""
diff --git a/gnu/usr.bin/texinfo/po/eo.gmo b/gnu/usr.bin/texinfo/po/eo.gmo
index 98aadb593e2..483829a6a6d 100644
--- a/gnu/usr.bin/texinfo/po/eo.gmo
+++ b/gnu/usr.bin/texinfo/po/eo.gmo
diff --git a/gnu/usr.bin/texinfo/po/eo.po b/gnu/usr.bin/texinfo/po/eo.po
index d09dfaf060a..9fef8519299 100644
--- a/gnu/usr.bin/texinfo/po/eo.po
+++ b/gnu/usr.bin/texinfo/po/eo.po
@@ -1,144 +1,145 @@
 # Esperanto translations for GNU Texinfo-4.0.
 # Copyright (C) 1999, 2002 Free Software Foundation, Inc.
-# Sergio Pokrovskij <pok@iis.nsk.su>, 1999, 2002
+# Sergio Pokrovskij <pok@iis.nsk.su>, 1999-2003
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: texinfo 4.1a\n"
-"POT-Creation-Date: 2002-04-01 06:10-0800\n"
-"PO-Revision-Date: 2002-03-13 10:05+06:00\n"
+"Project-Id-Version: texinfo 4.3c\n"
+"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
+"POT-Creation-Date: 2004-12-21 16:20-0800\n"
+"PO-Revision-Date: 2003-01-25 11:47+06:00\n"
 "Last-Translator: Sergio Pokrovskij <pok@iis.nsk.su>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=us-ascii\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: info/echo-area.c:283 info/session.c:712
+#: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr "Unu signon antauxen"
 
-#: info/echo-area.c:295 info/session.c:728
+#: info/echo-area.c:296 info/session.c:705
 msgid "Move backward a character"
 msgstr "Unu signon malantauxen"
 
-#: info/echo-area.c:307
+#: info/echo-area.c:308
 msgid "Move to the start of this line"
 msgstr "Al la komenco de cxi tiu linio"
 
-#: info/echo-area.c:312
+#: info/echo-area.c:313
 msgid "Move to the end of this line"
 msgstr "Al la fino de cxi tiu linio"
 
-#: info/echo-area.c:320 info/session.c:746
+#: info/echo-area.c:321 info/session.c:723
 msgid "Move forward a word"
 msgstr "Unu vorton antauxen"
 
-#: info/echo-area.c:360 info/session.c:795
+#: info/echo-area.c:361 info/session.c:772
 msgid "Move backward a word"
 msgstr "Unu vorton malantauxen"
 
-#: info/echo-area.c:400
+#: info/echo-area.c:401
 msgid "Delete the character under the cursor"
 msgstr "Forigu la signon subkursoran"
 
-#: info/echo-area.c:430
+#: info/echo-area.c:431
 msgid "Delete the character behind the cursor"
 msgstr "Forigu la signon jxus antaux la kursoro"
 
-#: info/echo-area.c:451
+#: info/echo-area.c:452
 msgid "Cancel or quit operation"
 msgstr "Rezigno aux eliro"
 
-#: info/echo-area.c:466
+#: info/echo-area.c:467
 msgid "Accept (or force completion of) this line"
 msgstr "Akceptu (aux kompletigu) cxi tiun linion"
 
-#: info/echo-area.c:471
+#: info/echo-area.c:472
 msgid "Insert next character verbatim"
 msgstr "Ensxovu la tujan signon sensxangxe"
 
-#: info/echo-area.c:479
+#: info/echo-area.c:480
 msgid "Insert this character"
 msgstr "Ensxovu tiun signon"
 
-#: info/echo-area.c:497
+#: info/echo-area.c:498
 msgid "Insert a TAB character"
 msgstr "Ensxovu TAB-signon"
 
-#: info/echo-area.c:504
+#: info/echo-area.c:505
 msgid "Transpose characters at point"
 msgstr "Permutu la signojn cxe la kursoro"
 
-#: info/echo-area.c:555
+#: info/echo-area.c:556
 msgid "Yank back the contents of the last kill"
 msgstr "Engluu la enhavon de la lasta forvisxo"
 
-#: info/echo-area.c:562
+#: info/echo-area.c:563
 msgid "Kill ring is empty"
 msgstr "Visxringo malplenas"
 
-#: info/echo-area.c:575
+#: info/echo-area.c:576
 msgid "Yank back a previous kill"
 msgstr "Regluu antauxan forvisxajxon"
 
-#: info/echo-area.c:608
+#: info/echo-area.c:609
 msgid "Kill to the end of the line"
 msgstr "Forvisxu ekde la kursoro gxis la fino de la linio"
 
-#: info/echo-area.c:621
+#: info/echo-area.c:622
 msgid "Kill to the beginning of the line"
 msgstr "Forvisxu ekde la kursoro gxis la komenco de la linio"
 
-#: info/echo-area.c:633
+#: info/echo-area.c:634
 msgid "Kill the word following the cursor"
 msgstr "Forvisxu la vorton tuj post la kursoro"
 
-#: info/echo-area.c:652
+#: info/echo-area.c:653
 msgid "Kill the word preceding the cursor"
 msgstr "Forvisxu la vorton jxus antaux la kursoro"
 
-#: info/echo-area.c:872 info/echo-area.c:932
+#: info/echo-area.c:868 info/echo-area.c:924
 msgid "No completions"
 msgstr "Kompletigo malestas"
 
-#: info/echo-area.c:874
+#: info/echo-area.c:870
 msgid "Not complete"
 msgstr "Nekompleta"
 
-#: info/echo-area.c:919
+#: info/echo-area.c:911
 msgid "List possible completions"
 msgstr "Eligu la eblajn kompletigojn"
 
-#: info/echo-area.c:936
+#: info/echo-area.c:928
 msgid "Sole completion"
 msgstr "Sola kompletigo"
 
-#: info/echo-area.c:945
+#: info/echo-area.c:937
 msgid "One completion:\n"
 msgstr "Unu kompletigo:\n"
 
-#: info/echo-area.c:946
+#: info/echo-area.c:938
 #, c-format
 msgid "%d completions:\n"
 msgstr "%d kompletigoj:\n"
 
-#: info/echo-area.c:1092
+#: info/echo-area.c:1085
 msgid "Insert completion"
 msgstr "Ensxovu la kompletigon"
 
-#: info/echo-area.c:1225
+#: info/echo-area.c:1220
 msgid "Building completions..."
 msgstr "Kompletigoj estas sercxataj ..."
 
-#: info/echo-area.c:1342
+#: info/echo-area.c:1340
 msgid "Scroll the completions window"
 msgstr "Rulumu la fenestron de kompletigoj"
 
-#: info/footnotes.c:212
+#: info/footnotes.c:213
 msgid "Footnotes could not be displayed"
 msgstr "La piednotoj ne eligeblas"
 
-#: info/footnotes.c:238
+#: info/footnotes.c:239
 msgid "Show the footnotes associated with this node in another window"
 msgstr "Montru la piednotojn el cxi tiu nodo en alia fenestro"
 
@@ -146,90 +147,90 @@ msgstr "Montru la piednotojn el cxi tiu nodo en alia fenestro"
 msgid "---------- Footnotes ----------"
 msgstr "---------- Piednotoj ----------"
 
-#: info/indices.c:175
+#: info/indices.c:172
 msgid "Look up a string in the index for this file"
 msgstr "Sercxu cxenon en la indekso por cxi tiu dosiero"
 
-#: info/indices.c:205
+#: info/indices.c:199
 msgid "Finding index entries..."
 msgstr "Estas sercxataj indeksaj artikoloj ..."
 
-#: info/indices.c:212
+#: info/indices.c:207
 msgid "No indices found."
 msgstr "Nenia indekso trovita."
 
-#: info/indices.c:222
+#: info/indices.c:217
 msgid "Index entry: "
 msgstr "Indeksa artikolo: "
 
-#: info/indices.c:332
+#: info/indices.c:325
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr ""
 "Pasu al la sekva indeksa ero kongrua al la lasta komando \"\\[index-search]\""
 
-#: info/indices.c:342
+#: info/indices.c:335
 msgid "No previous index search string."
 msgstr "Malestas antauxa cxeno por sercxo en indekso."
 
-#: info/indices.c:349
+#: info/indices.c:342
 msgid "No index entries."
 msgstr "Neniu indeksa artikolo."
 
-#: info/indices.c:382
-#, c-format
-msgid "No %sindex entries containing \"%s\"."
+#: info/indices.c:375
+#, fuzzy, c-format
+msgid "No %sindex entries containing `%s'."
 msgstr "En la indekso ne estas %sartikoloj kun \"%s\"."
 
-#: info/indices.c:383
+#: info/indices.c:376
 msgid "more "
 msgstr "pli da "
 
-#: info/indices.c:393
+#: info/indices.c:386
 msgid "CAN'T SEE THIS"
 msgstr "MALEBLAS VIDI CxI TION"
 
-#: info/indices.c:429
-#, c-format
-msgid "Found \"%s\" in %s. (`\\[next-index-match]' tries to find next.)"
+#: info/indices.c:422
+#, fuzzy, c-format
+msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
 msgstr "Trovita \"%s\" en %s.  (\"\\[next-index-match]\" sercxos la sekvan.)"
 
-#: info/indices.c:549
-#, c-format
-msgid "Scanning indices of \"%s\"..."
+#: info/indices.c:541
+#, fuzzy, c-format
+msgid "Scanning indices of `%s'..."
 msgstr "Sercxo en la indeksoj de \"%s\"..."
 
-#: info/indices.c:603
-#, c-format
-msgid "No available info files have \"%s\" in their indices."
+#: info/indices.c:596
+#, fuzzy, c-format
+msgid "No available info files have `%s' in their indices."
 msgstr "\"%s\" malestas en la indeksoj de la disponeblaj Info-dosieroj"
 
-#: info/indices.c:632
+#: info/indices.c:622
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr "Sercxu cxenon en cxiuj konataj indeksoj Info-dosieraj kaj faru menuon"
 
-#: info/indices.c:636
+#: info/indices.c:626
 msgid "Index apropos: "
 msgstr "Sercxu en indekso informon pri: "
 
-#: info/indices.c:666
-#, c-format
+#: info/indices.c:654
+#, fuzzy, c-format
 msgid ""
 "\n"
-"* Menu: Nodes whoses indices contain \"%s\":\n"
+"* Menu: Nodes whose indices contain `%s':\n"
 msgstr ""
 "\n"
 "* Menu: Nodoj kies indices entenas \"%s\":\n"
 
-#: info/info.c:260 info/infokey.c:884
+#: info/info.c:275 info/infokey.c:899
+#, c-format
 msgid "Try --help for more information.\n"
 msgstr "Por ricevi pli da informoj uzu la opcion \"--help\".\n"
 
-#: info/info.c:279 info/infokey.c:139 makeinfo/makeinfo.c:689
-#: util/install-info.c:1224 util/texindex.c:338
-#, c-format
+#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
+#: util/texindex.c:343
+#, 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"
@@ -239,17 +240,17 @@ msgstr ""
 "programo laux la kondicxoj de la GNUa Gxenerala Publika Permesilo.  Pluaj\n"
 "informoj troveblas en la dosieroj COPYING.\n"
 
-#: info/info.c:462
+#: info/info.c:498
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "por \"%s\" ne trovigxis indeksa artikolo\n"
 
-#: info/info.c:555
+#: info/info.c:590
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
 msgstr "  -b, --speech-friendly        estu afabla al la parolsinteziloj.\n"
 
-#: info/info.c:562
-#, c-format
+#: info/info.c:597
+#, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
@@ -265,10 +266,12 @@ msgid ""
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
 "  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
-"  -R, --raw-escapes            don't remove ANSI escapes from man pages.\n"
+"  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+"      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
 "  -O, --show-options, --usage  go to command-line options node.\n"
 "%s      --subnodes               recursively output menu items.\n"
+"  -w, --where, --location      print physical location of Info file.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
 "\n"
@@ -323,8 +326,8 @@ msgstr ""
 " info --show-options emacs  komencu per la Emaksaj komandliniaj opcioj\n"
 " info -f ./um.info          eligu la dosieron ./um.info sen atenti \"dir\"\n"
 
-#: info/info.c:598 info/infokey.c:903 makeinfo/makeinfo.c:474
-#: util/install-info.c:421 util/texindex.c:286
+#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
+#: util/install-info.c:466 util/texindex.c:292
 msgid ""
 "\n"
 "Email bug reports to bug-texinfo@gnu.org,\n"
@@ -338,76 +341,76 @@ msgstr ""
 "Por la diskutoj pri Esperanto-traduko uzu la dissendoliston\n"
 "<translation-team-eo@lists.sourceforge.net>."
 
-#: info/info.c:632
+#: info/info.c:669
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "La nodo \"%s\" ne troveblas."
 
-#: info/info.c:633
+#: info/info.c:670
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "La nodo \"(%s)%s\" ne troveblas."
 
-#: info/info.c:634
+#: info/info.c:671
 msgid "Cannot find a window!"
 msgstr "Maleblas trovi fenestron!"
 
-#: info/info.c:635
+#: info/info.c:672
 msgid "Point doesn't appear within this window's node!"
 msgstr "La muskursoro ne estas en cxi-fenestra nodo!"
 
-#: info/info.c:636
+#: info/info.c:673
 msgid "Cannot delete the last window."
 msgstr "Maleblas forigi la lastan fenestron"
 
-#: info/info.c:637
+#: info/info.c:674
 msgid "No menu in this node."
 msgstr "En cxi tiu nodo malestas menuo."
 
-#: info/info.c:638
+#: info/info.c:675
 msgid "No footnotes in this node."
 msgstr "Ne estas piednotoj en cxi tiu nodo."
 
-#: info/info.c:639
+#: info/info.c:676
 msgid "No cross references in this node."
 msgstr "Neniu referenco en cxi tiu nodo."
 
-#: info/info.c:640
+#: info/info.c:677
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Mankas ligilo \"%s\" por cxi tiu nodo."
 
-#: info/info.c:641
+#: info/info.c:678
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "Nekonata Info-komando \"%c\"; tajpu \"?\" por helpo."
 
-#: info/info.c:642
+#: info/info.c:679
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr "La terminaloj de tipo \"%s\" ne estas suficxe inteligentaj por Info."
 
-#: info/info.c:643
+#: info/info.c:680
 msgid "You are already at the last page of this node."
 msgstr "Tiu pagxo jam estas la lasta en cxi tiu nodo"
 
-#: info/info.c:644
+#: info/info.c:681
 msgid "You are already at the first page of this node."
 msgstr "Tio jam estas la unua pagxo de cxi tiu nodo"
 
-#: info/info.c:645
+#: info/info.c:682
 msgid "Only one window."
 msgstr "Nur unu fenestro."
 
-#: info/info.c:646
+#: info/info.c:683
 msgid "Resulting window would be too small."
 msgstr "La fenestro rezultos tro malgranda."
 
-#: info/info.c:647
+#: info/info.c:684
 msgid "Not enough room for a help window, please delete a window."
 msgstr "Mankas spaco por helpa fenestro, bv forigi iun fenestron."
 
-#: info/infodoc.c:45 info/infodoc.c:94
+#: info/infodoc.c:46 info/infodoc.c:95
 msgid ""
 "Basic Commands in Info Windows\n"
 "******************************\n"
@@ -415,19 +418,19 @@ msgstr ""
 "La cxefaj komandoj info-fenestraj\n"
 "*********************************\n"
 
-#: info/infodoc.c:48
+#: info/infodoc.c:49
 msgid "\\%-10[quit-help]  Quit this help.\n"
 msgstr "\\%-10[quit-help]  Forlasu cxi tiun helpon.\n"
 
-#: info/infodoc.c:49
+#: info/infodoc.c:50
 msgid "\\%-10[quit]  Quit Info altogether.\n"
 msgstr "\\%-10[quit-help]  Forlasu la tutan Info.\n"
 
-#: info/infodoc.c:50
+#: info/infodoc.c:51
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
 msgstr "\\%-10[get-info-help-node]  Voku la lernilon pri Info.\n"
 
-#: info/infodoc.c:52 info/infodoc.c:101
+#: info/infodoc.c:53 info/infodoc.c:102
 msgid ""
 "Selecting other nodes:\n"
 "----------------------\n"
@@ -435,22 +438,22 @@ msgstr ""
 "Por elekti aliajn nodojn:\n"
 "-------------------------\n"
 
-#: info/infodoc.c:54
+#: info/infodoc.c:55
 msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
 msgstr ""
 "\\%-10[next-node]  Iru al la tujsekva (\"Next\") nodo de cxi tiu nodo.\n"
 
-#: info/infodoc.c:55
+#: info/infodoc.c:56
 msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
 msgstr ""
 "\\%-10[prev-node]  Iru al la jxusantauxa (\"Previous\") nodo de cxi tiu "
 "nodo.\n"
 
-#: info/infodoc.c:56
+#: info/infodoc.c:57
 msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
 msgstr "\\%-10[up-node]  Iru al la tujsupra (\"Up\") nodo de cxi tiu nodo.\n"
 
-#: info/infodoc.c:57
+#: info/infodoc.c:58
 msgid ""
 "\\%-10[menu-item]  Pick menu item specified by name.\n"
 "              Picking a menu item causes another node to be selected.\n"
@@ -458,25 +461,25 @@ msgstr ""
 "\\%-10[menu-item]  Elektu menueron indikitan per nomo.\n"
 "      Elekto de menuero kauxzas transiron en alian nodon.\n"
 
-#: info/infodoc.c:59
+#: info/infodoc.c:60
 msgid ""
 "\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
 msgstr ""
 "\\%-10[xref-item]  Sekvu referencon  (legante la nomon de la referenco).\n"
 
-#: info/infodoc.c:60
+#: info/infodoc.c:61
 msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
 msgstr ""
 "\\%-10[history-node]  Revenu al la Lasta nodo vizitita en cxi tiu fenestro.\n"
 
-#: info/infodoc.c:61
+#: info/infodoc.c:62
 msgid ""
 "\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
 msgstr ""
 "\\%-10[move-to-next-xref]  Saltu sur la sekvan hipertekstan ligilon en cxi "
 "tiu nodo.\n"
 
-#: info/infodoc.c:62
+#: info/infodoc.c:63
 msgid ""
 "\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
 "node.\n"
@@ -484,14 +487,14 @@ msgstr ""
 "\\%-10[move-to-prev-xref]  Saltu sur la sekvan hipertekstan ligilon en cxi "
 "tiu nodo.\n"
 
-#: info/infodoc.c:63
+#: info/infodoc.c:64
 msgid ""
 "\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
 msgstr ""
 "\\%-10[select-reference-this-line]  Iru laux la subkursora hiperteksta "
 "ligo.\n"
 
-#: info/infodoc.c:64
+#: info/infodoc.c:65
 msgid ""
 "\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
 "node] (DIR)'.\n"
@@ -499,12 +502,12 @@ msgstr ""
 "\\%-10[dir-node]  Iru al la cxefkataloga nodo.  Ekvivalentas al \"g (DIR)"
 "\".\n"
 
-#: info/infodoc.c:65
+#: info/infodoc.c:66
 msgid ""
 "\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
 msgstr "\\%-10[top-node]  Iru al la radika nodo.  Ekvivalentas al \"g Top\".\n"
 
-#: info/infodoc.c:67 info/infodoc.c:115
+#: info/infodoc.c:68 info/infodoc.c:116
 msgid ""
 "Moving within a node:\n"
 "---------------------\n"
@@ -512,31 +515,31 @@ msgstr ""
 "Por movigxi ene de nodo:\n"
 "------------------------\n"
 
-#: info/infodoc.c:69
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
-msgstr "\\%-10[scroll-forward]  Unu pagxon antauxen.\n"
-
 #: info/infodoc.c:70
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
-msgstr "\\%-10[scroll-backward]  Unu pagxon malantauxen.\n"
-
-#: info/infodoc.c:71
 msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
 msgstr "\\%-10[beginning-of-node]  Iru al la komenco de cxi tiu nodo.\n"
 
-#: info/infodoc.c:72
+#: info/infodoc.c:71
 msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
 msgstr "\\%-10[end-of-node]  Iru al la fino de cxi tiu nodo.\n"
 
+#: info/infodoc.c:72
+msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
+msgstr "\\%-10[next-line]  Unu pagxon antauxen.\n"
+
 #: info/infodoc.c:73
-msgid "\\%-10[scroll-forward]  Scroll forward 1 line.\n"
-msgstr "\\%-10[scroll-forward]  Unu pagxon antauxen.\n"
+msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
+msgstr "\\%-10[next-line]  Unu pagxon malantauxen.\n"
 
 #: info/infodoc.c:74
-msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
+msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
+msgstr "\\%-10[scroll-forward]  Unu pagxon antauxen.\n"
+
+#: info/infodoc.c:75
+msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
 msgstr "\\%-10[scroll-backward]  Unu pagxon malantauxen.\n"
 
-#: info/infodoc.c:76 info/infodoc.c:124
+#: info/infodoc.c:77 info/infodoc.c:125
 msgid ""
 "Other commands:\n"
 "---------------\n"
@@ -544,17 +547,17 @@ msgstr ""
 "Ceteraj komandoj:\n"
 "-----------------\n"
 
-#: info/infodoc.c:78
+#: info/infodoc.c:79
 msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
 msgstr ""
 "\\%-10[menu-digit]  Elektu resp. la unuan ... la nauxan eron el cxi-noda "
 "menuo.\n"
 
-#: info/infodoc.c:79
+#: info/infodoc.c:80
 msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
 msgstr "\\%-10[last-menu-item]  Elektu la lastan eron de cxi-noda menuo.\n"
 
-#: info/infodoc.c:80
+#: info/infodoc.c:81
 msgid ""
 "\\%-10[index-search]  Search for a specified string in the index entries of "
 "this Info\n"
@@ -566,7 +569,7 @@ msgstr ""
 "      tiu info-dosiero kaj elektu la nodon referencatan de la unua trovita "
 "artikolo.\n"
 
-#: info/infodoc.c:82
+#: info/infodoc.c:83
 msgid ""
 "\\%-10[goto-node]  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
@@ -574,7 +577,7 @@ msgstr ""
 "\\%-10[goto-node]  Iru al nodo indikita per nomo.\n"
 "      Ankaux la dosiernomon vi povas inkludi, kiel en (DOSIERO)NODO.\n"
 
-#: info/infodoc.c:84
+#: info/infodoc.c:85
 msgid ""
 "\\%-10[search]  Search forward for a specified string\n"
 "              and select the node in which the next occurrence is found.\n"
@@ -582,7 +585,7 @@ msgstr ""
 "\\%-10[search]  Sercxu sube aperon de donita signocxeno kaj\n"
 "      vizitu la nodon en kiu trovigxos la sekva apero.\n"
 
-#: info/infodoc.c:86
+#: info/infodoc.c:87
 msgid ""
 "\\%-10[search-backward]  Search backward for a specified string\n"
 "              and select the node in which the previous occurrence is "
@@ -591,116 +594,116 @@ msgstr ""
 "\\%-10[search-backward]  Sercxu supre aperon de donita signocxeno kaj\n"
 "      vizitu la nodon en kiu trovigxos la jxusantauxa apero.\n"
 
-#: info/infodoc.c:97
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Quit this help.\n"
 msgstr "  %-10s  Forlasu cxi tiun helpon.\n"
 
-#: info/infodoc.c:98
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr "  %-10s  Forlasu la tutan Info.\n"
 
-#: info/infodoc.c:99
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr "  %-10s  Voku la lernilon pri Info.\n"
 
-#: info/infodoc.c:103
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
 msgstr "  %-10s  Iru al la tujsekva (\"Next\") nodo de cxi tiu nodo.\n"
 
-#: info/infodoc.c:104
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
 msgstr "  %-10s  Iru al la jxusantauxa (\"Previous\") nodo de cxi tiu nodo.\n"
 
-#: info/infodoc.c:105
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
 msgstr "  %-10s  Iru al la tujsupra (\"Up\") nodo de cxi tiu nodo.\n"
 
-#: info/infodoc.c:106
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Pick menu item specified by name.\n"
 msgstr "  %-10s  Iru al la tajpota menuero.\n"
 
-#: info/infodoc.c:107
+#: info/infodoc.c:108
 msgid "              Picking a menu item causes another node to be selected.\n"
 msgstr "      Elekto de menuero kauxzas transiron en alian nodon.\n"
 
-#: info/infodoc.c:108
+#: info/infodoc.c:109
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
 msgstr "  %-10s  Sekvu reFerencon  (legante la nomon de la referenco).\n"
 
-#: info/infodoc.c:109
+#: info/infodoc.c:110
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
 msgstr "  %-10s  Revenu al la Lasta nodo vizitita en cxi tiu fenestro.\n"
 
-#: info/infodoc.c:110
+#: info/infodoc.c:111
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
 msgstr "  %-10s  Saltu sur la sekvan hipertekstan ligilon en cxi tiu nodo.\n"
 
-#: info/infodoc.c:111
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
 msgstr "  %-10s  Iru laux la subkursora hiperteksta ligo.\n"
 
-#: info/infodoc.c:112
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
 msgstr "  %-10s  Iru al la cxefkataloga nodo.  Ekvivalentas al \"g (DIR)\".\n"
 
-#: info/infodoc.c:113
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
 msgstr "  %-10s  Iru al la radika nodo.  Ekvivalentas al \"g Top\".\n"
 
-#: info/infodoc.c:117
+#: info/infodoc.c:118
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
 msgstr "  %-10s  Unu pagxon antauxen.\n"
 
-#: info/infodoc.c:118
+#: info/infodoc.c:119
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
 msgstr "  %-10s  Unu pagxon malantauxen.\n"
 
-#: info/infodoc.c:119
+#: info/infodoc.c:120
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
 msgstr "  %-10s  Iru al la komenco de cxi tiu nodo.\n"
 
-#: info/infodoc.c:120
+#: info/infodoc.c:121
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
 msgstr "  %-10s  Iru al la fino de cxi tiu nodo.\n"
 
-#: info/infodoc.c:121
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
 msgstr "  %-10s  Unu pagxon antauxen.\n"
 
-#: info/infodoc.c:122
+#: info/infodoc.c:123
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
 msgstr "  %-10s  Unu pagxon malantauxen.\n"
 
-#: info/infodoc.c:126
+#: info/infodoc.c:127
 #, c-format
 msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
 msgstr "  %-10s  Elektu resp. la unuan ... la nauxan eron de cxi-noda menuo.\n"
 
-#: info/infodoc.c:127
+#: info/infodoc.c:128
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
 msgstr "  %-10s  Elektu la lastan eron de cxi-noda menuo.\n"
 
-#: info/infodoc.c:128
+#: info/infodoc.c:129
 #, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
@@ -708,43 +711,43 @@ msgstr ""
 "  %-10s  Sercxu indikotan signocxenon en la indeksaj artikoloj de cxi tiu "
 "Info-\n"
 
-#: info/infodoc.c:129
+#: info/infodoc.c:130
 msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
 msgstr ""
 "      dosiero kaj elektu la nodon referencatan de la unua trovita artikolo.\n"
 
-#: info/infodoc.c:130
+#: info/infodoc.c:131
 #, c-format
 msgid "  %-10s  Move to node specified by name.\n"
 msgstr "  %-10s  Vizitu nodon indikotan per la nomo.\n"
 
-#: info/infodoc.c:131
+#: info/infodoc.c:132
 msgid ""
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr "      Ankaux la dosiernomon vi povas inkludi, kiel en (DOSIERO)NODO.\n"
 
-#: info/infodoc.c:132
+#: info/infodoc.c:133
 #, c-format
 msgid "  %-10s  Search forward for a specified string,\n"
 msgstr "  %-10s  Sercxu sube indikotan signocxenon,\n"
 
-#: info/infodoc.c:133 info/infodoc.c:135
+#: info/infodoc.c:134 info/infodoc.c:136
 msgid ""
 "              and select the node in which the next occurrence is found.\n"
 msgstr "        kaj vizitu la nodon en kiu trovigxos la sekva apero.\n"
 
-#: info/infodoc.c:134
+#: info/infodoc.c:135
 #, c-format
 msgid "  %-10s  Search backward for a specified string\n"
 msgstr "  %-10s  Sercxu indikotan signocxenon supre en la dosiero,\n"
 
-#: info/infodoc.c:313
+#: info/infodoc.c:316
 msgid "The current search path is:\n"
 msgstr "La kuranta sercxvojo estas:\n"
 
-#: info/infodoc.c:316
+#: info/infodoc.c:320
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
@@ -752,7 +755,7 @@ msgstr ""
 "Komandoj disponeblaj en Info-fenestroj:\n"
 "\n"
 
-#: info/infodoc.c:319
+#: info/infodoc.c:324
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
@@ -760,7 +763,7 @@ msgstr ""
 "Komandoj disponeblaj en la ehxozono:\n"
 "\n"
 
-#: info/infodoc.c:340
+#: info/infodoc.c:347
 #, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
@@ -769,7 +772,7 @@ msgstr ""
 "La sekvaj komandoj vokeblas nur per  %s:\n"
 "\n"
 
-#: info/infodoc.c:343
+#: info/infodoc.c:351
 msgid ""
 "The following commands cannot be invoked at all:\n"
 "\n"
@@ -777,155 +780,168 @@ msgstr ""
 "La sekvaj komandoj neniel vokeblas:\n"
 "\n"
 
-#: info/infodoc.c:367
+#: info/infodoc.c:375
 msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
 msgstr "--- Uzu \"\\[history-node]\" aux \"\\[kill-node]\" por eliri ---\n"
 
-#: info/infodoc.c:477
+#: info/infodoc.c:485
 msgid "Display help message"
 msgstr "Eligu helpomesagxon"
 
-#: info/infodoc.c:495
+#: info/infodoc.c:503
 msgid "Visit Info node `(info)Help'"
 msgstr "Vizitu la Info-nodon \"(info)Help\""
 
-#: info/infodoc.c:638
+#: info/infodoc.c:641
 msgid "Print documentation for KEY"
 msgstr "Eligu la informon pri KLAVO"
 
-#: info/infodoc.c:650
+#: info/infodoc.c:653
 #, c-format
 msgid "Describe key: %s"
 msgstr "Priskribu klavon: %s"
 
-#: info/infodoc.c:660
+#: info/infodoc.c:664
 #, c-format
 msgid "ESC %s is undefined."
 msgstr "ESC %s estas nedifinita."
 
-#: info/infodoc.c:676 info/infodoc.c:703
+#: info/infodoc.c:680 info/infodoc.c:709
 #, c-format
 msgid "%s is undefined."
 msgstr "%s estas nedifinita."
 
-#: info/infodoc.c:724
+#: info/infodoc.c:730
 #, c-format
 msgid "%s is defined to %s."
 msgstr "%s estas ligita al %s."
 
-#: info/infodoc.c:1151
+#: info/infodoc.c:1153
 msgid "Show what to type to execute a given command"
 msgstr "Montru, kion tajpi por plenumi koncernan komandon"
 
-#: info/infodoc.c:1155
+#: info/infodoc.c:1157
 msgid "Where is command: "
 msgstr "Kie estas la komando: "
 
-#: info/infodoc.c:1177
+#: info/infodoc.c:1179
 #, c-format
 msgid "`%s' is not on any keys"
 msgstr "neniu klavo trovita por la komando \"%s\""
 
-#: info/infodoc.c:1183
+#: info/infodoc.c:1186
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr "%s vokeblas nur per %s."
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1190
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr "%s vokeblas per %s."
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1195
 #, c-format
 msgid "There is no function named `%s'"
 msgstr "Malestas funkcio nomata \"%s\""
 
-#: info/infokey.c:164
+#: info/infokey.c:145
+#, 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 (c) %s Free Software Foundation, Inc.\n"
+"NENIA garantio estas donita.  Vi rajtas pludoni ekzemplerojn de cxi tiu\n"
+"programo laux la kondicxoj de la GNUa Gxenerala Publika Permesilo.  Pluaj\n"
+"informoj troveblas en la dosieroj COPYING.\n"
+
+#: info/infokey.c:170
 msgid "incorrect number of arguments"
 msgstr "Malgxusta nombro da argumentoj"
 
-#: info/infokey.c:194
+#: info/infokey.c:201
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "ne malfermigxis eniga dosiero \"%s\""
 
-#: info/infokey.c:207
+#: info/infokey.c:215
 #, c-format
 msgid "cannot create output file `%s'"
 msgstr "maleblas krei eligan dosieron \"%s\""
 
-#: info/infokey.c:217
+#: info/infokey.c:226
 #, c-format
 msgid "error writing to `%s'"
 msgstr "eraro dum skribo en \"%s\""
 
-#: info/infokey.c:222
+#: info/infokey.c:232
 #, c-format
 msgid "error closing output file `%s'"
 msgstr "eraro dum fermo de eliga dosiero \"%s\""
 
-#: info/infokey.c:443
+#: info/infokey.c:450
 msgid "key sequence too long"
 msgstr "tro longa klavosekvenco"
 
-#: info/infokey.c:521
+#: info/infokey.c:529
 msgid "missing key sequence"
 msgstr "mankanta klavosekvenco"
 
-#: info/infokey.c:600
+#: info/infokey.c:610
 msgid "NUL character (\\000) not permitted"
 msgstr "NUL-signo (\\000) malpermesitas"
 
-#: info/infokey.c:629
+#: info/infokey.c:641
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr "NUL-signo (^%c) malpermesitas"
 
-#: info/infokey.c:652
+#: info/infokey.c:665
 msgid "missing action name"
 msgstr "mankas agonomo"
 
-#: info/infokey.c:667 info/infokey.c:733
+#: info/infokey.c:681 info/infokey.c:756
 msgid "section too long"
 msgstr "tro longa sekcio"
 
-#: info/infokey.c:673
+#: info/infokey.c:688
 #, c-format
 msgid "unknown action `%s'"
 msgstr "nekonata ago \"%s\"."
 
-#: info/infokey.c:682
+#: info/infokey.c:698
 msgid "action name too long"
 msgstr "tro longa agonomo"
 
-#: info/infokey.c:694
+#: info/infokey.c:712
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr "kromaj signoj post la ago \"%s\""
 
-#: info/infokey.c:704
+#: info/infokey.c:723
 msgid "missing variable name"
 msgstr "mankas nomo de variablo"
 
-#: info/infokey.c:712
+#: info/infokey.c:733
 msgid "missing `=' immediately after variable name"
 msgstr "mankas \"=\" tuj post variablonomo"
 
-#: info/infokey.c:719
+#: info/infokey.c:741
 msgid "variable name too long"
 msgstr "tro longa variablonomo"
 
-#: info/infokey.c:741
+#: info/infokey.c:765
 msgid "value too long"
 msgstr "tro longa valoro"
 
-#: info/infokey.c:875
+#: info/infokey.c:890
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr "\"%s\", linio %u: "
 
-#: info/infokey.c:891
+#: info/infokey.c:906
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -945,82 +961,88 @@ msgstr ""
 " --help                   Eligu cxi tiun helpeton kaj finu.\n"
 " --version                Eligu la version de la programo kaj finu.\n"
 
-#: info/infomap.c:1397
+#: info/infomap.c:1500
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
 msgstr "La misa infoklava dosiero \"%s\" ignorita (tro mallonga)"
 
-#: info/infomap.c:1400
+#: info/infomap.c:1503
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
 msgstr "La misa infoklava dosiero \"%s\" ignorita (tro longa)"
 
-#: info/infomap.c:1413
+#: info/infomap.c:1516
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
 msgstr "Eraro dum lego de infoklava dosiero \"%s\" (tro frue elcxerpita)"
 
-#: info/infomap.c:1431
+#: info/infomap.c:1535
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
 msgstr ""
 "Misa infoklava dosiero \"%s\" (magiaj nombroj); aktualigu gxin per infokey"
 
-#: info/infomap.c:1437
+#: info/infomap.c:1544
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
 msgstr "Via infoklava dosiero \"%s\" malaktualas; aktualigu gxin per infokey"
 
-#: info/infomap.c:1450
+#: info/infomap.c:1560
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
 msgstr ""
 "Misa infoklava dosiero \"%s\" (misa sekcilongo) -- aktualigu gxin per infokey"
 
-#: info/infomap.c:1470
+#: info/infomap.c:1581
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
 msgstr ""
 "Misa infoklava dosiero \"%s\" (misa sekcikodo); aktualigu gxin per infokey"
 
-#: info/infomap.c:1608
+#: info/infomap.c:1716
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr "Misaj datumoj en infoklava dosiero -- iuj klavasociajxoj ne validos"
 
-#: info/infomap.c:1659
+#: info/infomap.c:1766
 msgid "Bad data in infokey file -- some var settings ignored"
 msgstr ""
 "Misaj datumoj en infoklava dosiero -- iuj valorizoj de variabloj ne validos"
 
-#: info/m-x.c:70
+#: info/m-x.c:69
 msgid "Read the name of an Info command and describe it"
 msgstr "Legu la nomon de Info-komando kaj priskribu gxin"
 
-#: info/m-x.c:74
+#: info/m-x.c:73
 msgid "Describe command: "
 msgstr "Priskribu komandon: "
 
-#: info/m-x.c:97
+#: info/m-x.c:96
 msgid "Read a command name in the echo area and execute it"
 msgstr "Legu en la ehxozono nomon de komando kaj gxin plenumu"
 
-#: info/m-x.c:141
+#: info/m-x.c:140
 msgid "Cannot execute an `echo-area' command here."
 msgstr "Maleblas plenumi ehxozonan (\"echo-area-\") komandon cxi tie."
 
-#: info/m-x.c:157
+#: info/m-x.c:154
+#, fuzzy, c-format
+msgid "Undefined command: %s"
+msgstr "Nekonata komando \"%s\"."
+
+#: info/m-x.c:160
 msgid "Set the height of the displayed window"
 msgstr "Fiksu la alton de la prezentata fenestro"
 
-#: info/m-x.c:170
+#: info/m-x.c:173
 #, c-format
 msgid "Set screen height to (%d): "
 msgstr "Alto de la ekrano estu (%d): "
 
-#: info/makedoc.c:161 info/makedoc.c:169
+#: info/makedoc.c:162 info/makedoc.c:170
+#, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
 "\n"
@@ -1028,12 +1050,12 @@ msgstr ""
 "   La fontodosieroj tralaboritaj por fari cxi tiun dosieron:\n"
 "\n"
 
-#: info/makedoc.c:553
+#: info/makedoc.c:550
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "Maleblas prilabori la dosieron %s.\n"
 
-#: info/nodemenu.c:28
+#: info/nodemenu.c:31
 msgid ""
 "\n"
 "* Menu:\n"
@@ -1045,7 +1067,7 @@ msgstr ""
 "  (Dosiero)Nodo                     Linioj  Longo  Entenanta Dosiero\n"
 "  --------------                    ------  -----  -----------------"
 
-#: info/nodemenu.c:199
+#: info/nodemenu.c:202
 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"
@@ -1053,24 +1075,24 @@ msgstr ""
 "Jen la menuo de nodoj kiujn vi lastatempe vizitis.\n"
 "Elektu iun el la menuo, aux uzu \"\\[history-node]\" en alia fenestro.\n"
 
-#: info/nodemenu.c:219
+#: info/nodemenu.c:224
 msgid "Make a window containing a menu of all of the currently visited nodes"
 msgstr "Faru fenestron entenantan menuon de cxiuj nune vizititaj nodoj"
 
-#: info/nodemenu.c:299
+#: info/nodemenu.c:304
 msgid "Select a node which has been previously visited in a visible window"
 msgstr "Elektu nodon jam vizititan en videbla fenestro"
 
-#: info/nodemenu.c:311
+#: info/nodemenu.c:317
 msgid "Select visited node: "
 msgstr "Elektu vizititan nodon: "
 
-#: info/nodemenu.c:331 info/session.c:2235
+#: info/nodemenu.c:337 info/session.c:2264
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr "La referenco malaperis! (%s)."
 
-#: info/session.c:170
+#: info/session.c:162
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1079,109 +1101,109 @@ msgstr ""
 "Bonvenon al Info, versio %s.  Tajpu \\[get-help-window] por helpo, \\[menu-"
 "item] por menuero."
 
-#: info/session.c:643
+#: info/session.c:620
 msgid "Move down to the next line"
 msgstr "Mallevigxu al la sekva linio"
 
-#: info/session.c:658
+#: info/session.c:635
 msgid "Move up to the previous line"
 msgstr "Levigxu al la antauxa linio"
 
-#: info/session.c:673
+#: info/session.c:650
 msgid "Move to the end of the line"
 msgstr "Iru al la fino de la linio"
 
-#: info/session.c:693
+#: info/session.c:670
 msgid "Move to the start of the line"
 msgstr "Iru al la komenco de la linio"
 
-#: info/session.c:885 makeinfo/node.c:1357
+#: info/session.c:860 makeinfo/node.c:1424
 msgid "Next"
 msgstr "Sekva"
 
-#: info/session.c:888
+#: info/session.c:863
 msgid "Following Next node..."
 msgstr "Estas legata la nodo \"Next\" ..."
 
-#: info/session.c:905
+#: info/session.c:881
 msgid "Selecting first menu item..."
 msgstr "La unua menuero estas elektata ..."
 
-#: info/session.c:916
+#: info/session.c:893
 msgid "Selecting Next node..."
 msgstr "La nodo \"Next\" estas elektata ..."
 
-#: info/session.c:986
+#: info/session.c:964
 #, c-format
 msgid "Moving Up %d time(s), then Next."
 msgstr "%d-foje supren, poste al la sekva (\"Next\")."
 
-#: info/session.c:1010
+#: info/session.c:988
 msgid "No more nodes within this document."
 msgstr "Malestas pluaj referencoj en la dokumento."
 
-#: info/session.c:1034
+#: info/session.c:1011
 msgid "No `Prev' for this node."
 msgstr "Mankas ligilo \"Prev\" por cxi tiu nodo."
 
-#: info/session.c:1037 info/session.c:1092
+#: info/session.c:1014 info/session.c:1073
 msgid "Moving Prev in this window."
 msgstr "Iro al la antauxa nodo \"Prev\" en cxi tiu fenestro."
 
-#: info/session.c:1051
+#: info/session.c:1030
 msgid "No `Prev' or `Up' for this node within this document."
 msgstr "En la dokumento mankas ligilo(j) \"Prev\" aux \"Up\" por tiu nodo."
 
-#: info/session.c:1054
+#: info/session.c:1034
 msgid "Moving Up in this window."
 msgstr "Levigxo al la nodo \"Up\" en cxi tiu fenestro."
 
-#: info/session.c:1102
+#: info/session.c:1084
 msgid "Moving to `Prev's last menu item."
 msgstr "Iro al la lasta menuero de la nodo \"Prev\"."
 
-#: info/session.c:1113
+#: info/session.c:1095
 msgid "Move forwards or down through node structure"
 msgstr "Movu antauxen aux malsupren en la strukturo de nodoj"
 
-#: info/session.c:1129
+#: info/session.c:1111
 msgid "Move backwards or up through node structure"
 msgstr "Movu malantauxen aux supren en la strukturo de nodoj"
 
-#: info/session.c:1229
+#: info/session.c:1205
 msgid "Scroll forward in this window"
 msgstr "Rulumu antauxen en cxi tiu fenestro"
 
-#: info/session.c:1237
+#: info/session.c:1213
 msgid "Scroll forward in this window and set default window size"
 msgstr ""
 "Rulumu antauxen en cxi tiu fenestro kaj fiksu defauxltan fenestrograndon"
 
-#: info/session.c:1245
+#: info/session.c:1221
 msgid "Scroll forward in this window staying within node"
 msgstr "Rulumu antauxen en cxi tiu fenestro sed restu en la nodo"
 
-#: info/session.c:1253
+#: info/session.c:1229
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr ""
 "Rulumu antauxen en cxi tiu fenestro restante en la nodo kaj\n"
 "fiksu defauxltan fenestrograndon"
 
-#: info/session.c:1261
+#: info/session.c:1237
 msgid "Scroll backward in this window"
 msgstr "Rulumu malantauxen en cxi tiu fenestro"
 
-#: info/session.c:1269
+#: info/session.c:1245
 msgid "Scroll backward in this window and set default window size"
 msgstr ""
 "Rulumu malantauxen en cxi tiu fenestro kaj fiksu defauxltan fenestrograndon"
 
-#: info/session.c:1278
+#: info/session.c:1254
 msgid "Scroll backward in this window staying within node"
 msgstr "Rulumu malantauxen en cxi tiu fenestro sed restu en la nodo"
 
-#: info/session.c:1286
+#: info/session.c:1262
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
@@ -1189,332 +1211,332 @@ msgstr ""
 "Rulumu malantauxen en cxi tiu fenestro restante en la nodo kaj\n"
 "     fiksu defauxltan fenestrograndon"
 
-#: info/session.c:1294
+#: info/session.c:1270
 msgid "Move to the start of this node"
 msgstr "Iru al la komenco de cxi tiu nodo"
 
-#: info/session.c:1301
+#: info/session.c:1277
 msgid "Move to the end of this node"
 msgstr "Iru al la fino de cxi tiu nodo"
 
-#: info/session.c:1308
+#: info/session.c:1284
 msgid "Scroll down by lines"
 msgstr "Linie rulumu suben"
 
-#: info/session.c:1325
+#: info/session.c:1301
 msgid "Scroll up by lines"
 msgstr "Linie rulumu supren"
 
-#: info/session.c:1343
+#: info/session.c:1319
 msgid "Scroll down by half screen size"
 msgstr "Duonekrane rulumu suben"
 
-#: info/session.c:1369
+#: info/session.c:1345
 msgid "Scroll up by half screen size"
 msgstr "Duonekrane rulumu supren"
 
-#: info/session.c:1398
+#: info/session.c:1374
 msgid "Select the next window"
 msgstr "Elektu la sekvan fenestron"
 
-#: info/session.c:1437
+#: info/session.c:1413
 msgid "Select the previous window"
 msgstr "Elektu la antauxan fenestron"
 
-#: info/session.c:1488
+#: info/session.c:1464
 msgid "Split the current window"
 msgstr "Disfendu la kurantan fenestron"
 
-#: info/session.c:1569
+#: info/session.c:1545
 msgid "Delete the current window"
 msgstr "Forigu la kurantan fenestron"
 
-#: info/session.c:1577
+#: info/session.c:1553
 msgid "Cannot delete a permanent window"
 msgstr "Maleblas forigi fenestron permanentan"
 
-#: info/session.c:1610
+#: info/session.c:1585
 msgid "Delete all other windows"
 msgstr "Forigu cxiujn ceterajn fenestrojn"
 
-#: info/session.c:1656
+#: info/session.c:1631
 msgid "Scroll the other window"
 msgstr "Rulumu la alian fenestron"
 
-#: info/session.c:1677
+#: info/session.c:1652
 msgid "Scroll the other window backward"
 msgstr "Rulumu la alian fenestron malantauxen"
 
-#: info/session.c:1683
+#: info/session.c:1658
 msgid "Grow (or shrink) this window"
 msgstr "(Mal)pligrandigu cxi tiun fenestron"
 
-#: info/session.c:1694
+#: info/session.c:1669
 msgid "Divide the available screen space among the visible windows"
 msgstr "Dispartigu la disponeblan ekranspacon inter la videblaj fenestroj"
 
-#: info/session.c:1701
+#: info/session.c:1676
 msgid "Toggle the state of line wrapping in the current window"
 msgstr "Baskulsxaltu la regximon de linifaldo en la kuranta fenestro"
 
-#: info/session.c:1880
+#: info/session.c:1848
 msgid "Select the Next node"
 msgstr "Elektu la nodon sekvan (\"Next\")"
 
-#: info/session.c:1888
+#: info/session.c:1856
 msgid "Select the Prev node"
 msgstr "Elektu la nodon antauxan (\"Prev\")"
 
-#: info/session.c:1896
+#: info/session.c:1864
 msgid "Select the Up node"
 msgstr "Elektu la nodon supran (\"Up\")"
 
-#: info/session.c:1903
+#: info/session.c:1871
 msgid "Select the last node in this file"
 msgstr "Elektu la lastan nodon en cxi tiu dosiero"
 
-#: info/session.c:1930 info/session.c:1963
+#: info/session.c:1898 info/session.c:1931
 msgid "This window has no additional nodes"
 msgstr "Cxi tiu fenestro ne havas pluajn nodojn"
 
-#: info/session.c:1936
+#: info/session.c:1904
 msgid "Select the first node in this file"
 msgstr "Elektu la unuan nodon en cxi tiu dosiero"
 
-#: info/session.c:1970
+#: info/session.c:1938
 msgid "Select the last item in this node's menu"
 msgstr "Elektu la lastan eron en la menuo de cxi tiu nodo"
 
-#: info/session.c:1976
+#: info/session.c:1944
 msgid "Select this menu item"
 msgstr "Elektu cxi tiun menueron"
 
-#: info/session.c:2005
+#: info/session.c:1977
 #, c-format
 msgid "There aren't %d items in this menu."
 msgstr "Cxi tiu menuo ne havas %d erojn."
 
-#: info/session.c:2148
+#: info/session.c:2171 info/session.c:2172
 #, c-format
 msgid "Menu item (%s): "
 msgstr "Menuero (%s): "
 
-#: info/session.c:2150
+#: info/session.c:2175
 msgid "Menu item: "
 msgstr "Menuero: "
 
-#: info/session.c:2155
+#: info/session.c:2182 info/session.c:2183
 #, c-format
 msgid "Follow xref (%s): "
 msgstr "Sekvu referencon (%s): "
 
-#: info/session.c:2157
+#: info/session.c:2186
 msgid "Follow xref: "
 msgstr "Sekvu referencon: "
 
-#: info/session.c:2280
+#: info/session.c:2315
 msgid "Read a menu item and select its node"
 msgstr "Legu menueron kaj elektu gxian nodon"
 
-#: info/session.c:2288
+#: info/session.c:2323
 msgid "Read a footnote or cross reference and select its node"
 msgstr "Legu piednoton aux referencon kaj elektu gxian nodon"
 
-#: info/session.c:2294
+#: info/session.c:2329
 msgid "Move to the start of this node's menu"
 msgstr "Iru al la komenco de la menuo de cxi tiu nodo"
 
-#: info/session.c:2318
+#: info/session.c:2353
 msgid "Visit as many menu items at once as possible"
 msgstr ""
 "Vizitu samtempe kiom eble plej multe da menueroj (cxiun en aparta fenestro)"
 
-#: info/session.c:2346
+#: info/session.c:2381
 msgid "Read a node name and select it"
 msgstr "Legu nodnomon kaj elektu la nodon"
 
-#: info/session.c:2401 info/session.c:2405
+#: info/session.c:2436 info/session.c:2441
 msgid "Goto node: "
 msgstr "Iru al la nodo: "
 
-#: info/session.c:2471
+#: info/session.c:2505
 #, c-format
 msgid "No menu in node `%s'."
 msgstr "En la nodo \"%s\" malestas menuo."
 
-#: info/session.c:2516
+#: info/session.c:2551
 #, c-format
 msgid "No menu item `%s' in node `%s'."
 msgstr "Menuero \"%s\" malestas en la nodo \"%s\"."
 
-#: info/session.c:2546
+#: info/session.c:2581
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
 msgstr "Maleblas trovi nodon referencatan per \"%s\" en \"%s\"."
 
-#: info/session.c:2597
+#: info/session.c:2631
 msgid "Read a list of menus starting from dir and follow them"
 msgstr "Legu liston da menuoj, komencante per dir kaj sekvante ilin"
 
-#: info/session.c:2599
+#: info/session.c:2633
 msgid "Follow menus: "
 msgstr "Sekvu menuojn: "
 
-#: info/session.c:2797
+#: info/session.c:2826
 msgid "Find the node describing program invocation"
 msgstr "Trovu la nodon priskribantan programvokon"
 
-#: info/session.c:2799
+#: info/session.c:2828
 #, c-format
 msgid "Find Invocation node of [%s]: "
 msgstr "Trovu la voknodon de [%s]: "
 
-#: info/session.c:2837
+#: info/session.c:2866
 msgid "Read a manpage reference and select it"
 msgstr "Legu referencon al manlibra pagxo kaj gxin elektu"
 
-#: info/session.c:2841
+#: info/session.c:2870
 msgid "Get Manpage: "
 msgstr "Manlibran pagxon: "
 
-#: info/session.c:2871
+#: info/session.c:2900
 msgid "Select the node `Top' in this file"
 msgstr "Elektu la nodon \"Top\" en cxi tiu dosiero"
 
-#: info/session.c:2877
+#: info/session.c:2906
 msgid "Select the node `(dir)'"
 msgstr "Elektu la nodon \"(dir)\""
 
-#: info/session.c:2897
+#: info/session.c:2923 info/session.c:2925
 #, c-format
 msgid "Kill node (%s): "
 msgstr "Forvisxu la nodon (%s): "
 
-#: info/session.c:2951
+#: info/session.c:2977
 #, c-format
 msgid "Cannot kill node `%s'"
 msgstr "Maleblas forigi la nodon \"%s\""
 
-#: info/session.c:2961
+#: info/session.c:2987
 msgid "Cannot kill the last node"
 msgstr "Maleblas forigi la lastan nodon"
 
-#: info/session.c:3047
+#: info/session.c:3073
 msgid "Select the most recently selected node"
 msgstr "Elektu nodon plej jxuse elektitan"
 
-#: info/session.c:3053
+#: info/session.c:3079
 msgid "Kill this node"
 msgstr "Forvisxu cxi tiun nodon"
 
-#: info/session.c:3061
+#: info/session.c:3087
 msgid "Read the name of a file and select it"
 msgstr "Legu la dosiernomon kaj gxin elektu"
 
-#: info/session.c:3065
+#: info/session.c:3091
 msgid "Find file: "
 msgstr "Trovu la dosieron: "
 
-#: info/session.c:3082
+#: info/session.c:3108
 #, c-format
 msgid "Cannot find `%s'."
 msgstr "Maleblas trovi \"%s\"."
 
-#: info/session.c:3127 info/session.c:3248
+#: info/session.c:3151 info/session.c:3269
 #, c-format
 msgid "Could not create output file `%s'."
 msgstr "Maleblas krei eligan dosieron \"%s\"."
 
-#: info/session.c:3140 info/session.c:3265 info/session.c:3326
+#: info/session.c:3165 info/session.c:3287 info/session.c:3347
 msgid "Done."
 msgstr "Prete."
 
-#: info/session.c:3196
+#: info/session.c:3220
 #, c-format
 msgid "Writing node %s..."
 msgstr "Estas skribata la nodo \"%s\" ..."
 
-#: info/session.c:3274
+#: info/session.c:3296
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
 msgstr "La enhavon de cxi tiu nodo metu en la dukton per INFO_PRINT_COMMAND"
 
-#: info/session.c:3310
+#: info/session.c:3331
 #, c-format
 msgid "Cannot open pipe to `%s'."
 msgstr "Ne malfermigxis dukto al \"%s\"."
 
-#: info/session.c:3316
+#: info/session.c:3337
 #, c-format
 msgid "Printing node %s..."
 msgstr "Estas printata la nodo \"%s\" ..."
 
-#: info/session.c:3558
+#: info/session.c:3567
 #, c-format
 msgid "Searching subfile %s ..."
 msgstr "Estas sercxata la subdosiero \"%s\" ..."
 
-#: info/session.c:3610
+#: info/session.c:3619
 msgid "Read a string and search for it case-sensitively"
 msgstr "Legu cxenon kaj sercxu gxin usklecodistinge"
 
-#: info/session.c:3617
+#: info/session.c:3626
 msgid "Read a string and search for it"
 msgstr "Legu cxenon kaj gxin sercxu"
 
-#: info/session.c:3625
+#: info/session.c:3634
 msgid "Read a string and search backward for it"
 msgstr "Legu cxenon kaj gxin sercxu malantauxen"
 
-#: info/session.c:3667
+#: info/session.c:3670 info/session.c:3677
 #, c-format
 msgid "%s%sfor string [%s]: "
 msgstr "%s%spor signocxeno [%s]: "
 
-#: info/session.c:3668
+#: info/session.c:3671 info/session.c:3678
 msgid "Search backward"
 msgstr "Sercxu malantauxen"
 
-#: info/session.c:3668
+#: info/session.c:3672 info/session.c:3678
 msgid "Search"
 msgstr "Sercxu"
 
-#: info/session.c:3669
+#: info/session.c:3673 info/session.c:3679
 msgid " case-sensitively "
 msgstr " usklecodistinge"
 
-#: info/session.c:3669
+#: info/session.c:3674 info/session.c:3679
 msgid " "
 msgstr " "
 
-#: info/session.c:3709
+#: info/session.c:3718
 msgid "Search failed."
 msgstr "Sercxo fiaskis."
 
-#: info/session.c:3727
+#: info/session.c:3736
 msgid "Repeat last search in the same direction"
 msgstr "Ripetu la jxusan sercxon samdirekte"
 
-#: info/session.c:3730 info/session.c:3740
+#: info/session.c:3739 info/session.c:3749
 msgid "No previous search string"
 msgstr "Malestas pli frua sercxocxeno."
 
-#: info/session.c:3737
+#: info/session.c:3746
 msgid "Repeat last search in the reverse direction"
 msgstr "Ripetu la jxusan sercxon alidirekte"
 
-#: info/session.c:3755 info/session.c:3761
+#: info/session.c:3765 info/session.c:3771
 msgid "Search interactively for a string as you type it"
 msgstr "Interaktive sercxu cxenon tajpatan"
 
-#: info/session.c:3855
+#: info/session.c:3851
 msgid "I-search backward: "
 msgstr "Interaktiva sercxo malantauxen: "
 
-#: info/session.c:3857
+#: info/session.c:3853
 msgid "I-search: "
 msgstr "Interaktiva sercxo: "
 
-#: info/session.c:3882
+#: info/session.c:3878 info/session.c:3880
 msgid "Failing "
 msgstr "Fiasko "
 
@@ -1530,27 +1552,27 @@ msgstr "Iru al la sekva referenco"
 msgid "Select reference or menu item appearing on this line"
 msgstr "Elektu la referencon aux la menueron de cxi tiu linio"
 
-#: info/session.c:4381
+#: info/session.c:4382
 msgid "Cancel current operation"
 msgstr "Cxesigu la kurantan operacion"
 
-#: info/session.c:4388
+#: info/session.c:4389
 msgid "Quit"
 msgstr "Finu"
 
-#: info/session.c:4397
+#: info/session.c:4398
 msgid "Move the cursor to a specific line of the window"
 msgstr "Movu la kursoron sur indikitan linion de la fenestro"
 
-#: info/session.c:4429
+#: info/session.c:4430
 msgid "Redraw the display"
 msgstr "Refresxigi la ekranon"
 
-#: info/session.c:4466
+#: info/session.c:4467
 msgid "Quit using Info"
 msgstr "Eliru el Info"
 
-#: info/session.c:4479
+#: info/session.c:4480
 msgid "Run command bound to this key's lowercase variant"
 msgstr "Plenumi komandon asociitan kun cxi tiu klavo minuskligita"
 
@@ -1560,27 +1582,29 @@ msgid "Unknown command (%s)."
 msgstr "Komando nekonata (%s)."
 
 #: info/session.c:4494
-msgid "\"\" is invalid"
-msgstr "\"\" ne validas"
-
-#: info/session.c:4495
 #, c-format
 msgid "\"%s\" is invalid"
 msgstr "\"%s\" ne validas"
 
-#: info/session.c:4713
+#: info/session.c:4495
+#, fuzzy, c-format
+msgid "`%s' is invalid"
+msgstr "\"%s\" ne validas"
+
+#: info/session.c:4709
 msgid "Add this digit to the current numeric argument"
 msgstr "Aldonu tiun ciferon al la kuranta argumento nombra"
 
-#: info/session.c:4722
+#: info/session.c:4718
 msgid "Start (or multiply by 4) the current numeric argument"
 msgstr "Komencu (aux 4-obligu) la kurantan argumenton nombran"
 
-#: info/session.c:4737
+#: info/session.c:4733
 msgid "Internally used by \\[universal-argument]"
 msgstr "Uzata interne de \\[universal-argument]"
 
-#: info/tilde.c:344
+#: info/tilde.c:338
+#, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: Virtuala memoro elcxerpita!\n"
 
@@ -1649,230 +1673,264 @@ msgstr "Variablo %s ricevu la valoron (%d): "
 msgid "Set %s to value (%s): "
 msgstr "%s ricevu la valoron (%s): "
 
-#: info/window.c:1164
+#: info/window.c:1138
 msgid "--*** Tags out of Date ***"
 msgstr "--*** Etikedoj malaktualigxis ***"
 
-#: info/window.c:1175
+#: info/window.c:1149
 msgid "-----Info: (), lines ----, "
 msgstr "-----Info: (), linioj ----, "
 
-#: info/window.c:1182
+#: info/window.c:1156
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr "-%s---Info: %s, %d linioj --%s--"
 
-#: info/window.c:1186
+#: info/window.c:1160
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr "-%s%s-Info: (%s)%s, %d linioj --%s--"
 
-#: info/window.c:1193
+#: info/window.c:1167
 #, c-format
 msgid " Subfile: %s"
 msgstr " Subdosiero: %s"
 
-#: lib/getopt.c:675
+#: lib/getopt.c:551 lib/getopt.c:570
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: opcio \"%s\" estas ambigua\n"
 
-#: lib/getopt.c:700
+#: lib/getopt.c:603 lib/getopt.c:607
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: opcio \"--%s\" ne toleras argumenton\n"
 
-#: lib/getopt.c:705
+#: lib/getopt.c:616 lib/getopt.c:621
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: opcio \"%c%s\" ne toleras argumenton\n"
 
-#: lib/getopt.c:723 lib/getopt.c:896
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: opcio \"%s\" bezonas argumenton\n"
 
-#: lib/getopt.c:752
+#: lib/getopt.c:727 lib/getopt.c:730
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: nekonata opcio \"--%s\"\n"
 
-#: lib/getopt.c:756
+#: lib/getopt.c:738 lib/getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: nekonata opcio \"%c%s\"\n"
 
-#: lib/getopt.c:782
+#: lib/getopt.c:796 lib/getopt.c:799
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: misa opcio -- %c\n"
 
-#: lib/getopt.c:785
+#: lib/getopt.c:805 lib/getopt.c:808
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: nevalida opcio -- %c\n"
 
-#: lib/getopt.c:815 lib/getopt.c:945
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: opcio bezonas argumenton -- %c\n"
 
-#: lib/getopt.c:862
+#: lib/getopt.c:935 lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: opcio \"-W %s\" estas ambigua\n"
 
-#: lib/getopt.c:880
+#: lib/getopt.c:978 lib/getopt.c:999
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: opcio \"-W %s\" ne toleras argumenton\n"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#, fuzzy, c-format
+msgid "arguments to @%s ignored"
+msgstr "Misa argumento por %c%s"
+
+#: makeinfo/cmds.c:585
 msgid "January"
 msgstr "januaro"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "February"
 msgstr "februaro"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "March"
 msgstr "marto"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "April"
 msgstr "aprilo"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "May"
 msgstr "majo"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "June"
 msgstr "junio"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "July"
 msgstr "julio"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "August"
 msgstr "auxgusto"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "September"
 msgstr "septembro"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "October"
 msgstr "oktobro"
 
-#: makeinfo/cmds.c:517
+#: makeinfo/cmds.c:587
 msgid "November"
 msgstr "novembro"
 
-#: makeinfo/cmds.c:517
+#: makeinfo/cmds.c:587
 msgid "December"
 msgstr "decembro"
 
-#: makeinfo/cmds.c:658
+#: makeinfo/cmds.c:936
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "dubinda signo \"%c\" en @var"
 
-#: makeinfo/cmds.c:701
+#: makeinfo/cmds.c:979
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "argumento de @sc tuta majuskla, do neniel sxangxita"
 
-#: makeinfo/cmds.c:759
+#: makeinfo/cmds.c:1034
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "\"{\" atendata, sed \"%c\" ricevita"
 
-#: makeinfo/cmds.c:789
+#: makeinfo/cmds.c:1074
 msgid "end of file inside verb block"
 msgstr "dosierfino ene de pretarangxita bloko (verb block)"
 
-#: makeinfo/cmds.c:797
+#: makeinfo/cmds.c:1082
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "\"}\" atendata, sed \"%c\" ricevita"
 
-#: makeinfo/cmds.c:942
+#: makeinfo/cmds.c:1112
+msgid ""
+"@strong{Note...} produces a spurious cross-reference in Info; reword to "
+"avoid that"
+msgstr ""
+
+#: makeinfo/cmds.c:1305
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s arkaikigxis"
 
-#: makeinfo/cmds.c:1014
+#: makeinfo/cmds.c:1414
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "@sp bezonas ne \"%s\" sed pozitivan argumenton nombran"
 
-#: makeinfo/cmds.c:1348 makeinfo/cmds.c:1374 makeinfo/footnote.c:81
+#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "Misa argumento por %c%s"
 
-#: makeinfo/cmds.c:1358 makeinfo/makeinfo.c:4140
+#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
 msgid "asis"
 msgstr "asis"
 
-#: makeinfo/cmds.c:1360 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
 msgid "none"
 msgstr "none"
 
-#: makeinfo/defun.c:85
+#: makeinfo/cmds.c:1789
+#, fuzzy, c-format
+msgid "Bad argument to @%s"
+msgstr "Misa argumento por %c%s"
+
+#: makeinfo/cmds.c:1803
+msgid "insert"
+msgstr ""
+
+#: makeinfo/defun.c:84
 msgid "Missing `}' in @def arg"
 msgstr "Mankas \"}\" en la argumento de @def"
 
-#: makeinfo/defun.c:363
+#: makeinfo/defun.c:403
 msgid "Function"
 msgstr "Funkcio"
 
-#: makeinfo/defun.c:366
+#: makeinfo/defun.c:406
 msgid "Macro"
 msgstr "Makroo"
 
-#: makeinfo/defun.c:369
+#: makeinfo/defun.c:409
 msgid "Special Form"
 msgstr "Speciala Formo"
 
-#: makeinfo/defun.c:373
+#: makeinfo/defun.c:413
 msgid "Variable"
 msgstr "Variablo"
 
-#: makeinfo/defun.c:376
+#: makeinfo/defun.c:416
 msgid "User Option"
 msgstr "Uzula opcio"
 
-#: makeinfo/defun.c:380
+#: makeinfo/defun.c:420
 msgid "Instance Variable"
 msgstr "Ekzemplera variablo"
 
-#: makeinfo/defun.c:384
+#: makeinfo/defun.c:424
 msgid "Method"
 msgstr "Metodo"
 
-#: makeinfo/defun.c:466 makeinfo/defun.c:470 makeinfo/defun.c:615
-#: makeinfo/defun.c:631 makeinfo/defun.c:671
+#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
+#: makeinfo/defun.c:644 makeinfo/xml.c:2229
 msgid "of"
 msgstr "de"
 
-#: makeinfo/defun.c:474 makeinfo/defun.c:478 makeinfo/defun.c:482
-#: makeinfo/defun.c:624 makeinfo/defun.c:676
+#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
 msgid "on"
 msgstr "sur"
 
-#: makeinfo/defun.c:717
-#, c-format
-msgid "Must be in `%s' insertion to use `%sx'"
+#: makeinfo/defun.c:711
+#, fuzzy, c-format
+msgid "Must be in `@%s' environment to use `@%s'"
 msgstr "Nur en \"%s\"-ensxovo uzeblas \"%sx\"."
 
-#: makeinfo/files.c:448
+#: makeinfo/files.c:435
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr "%s: getwd: %s, %s\n"
 
+#: makeinfo/files.c:638
+#, c-format
+msgid "`%s' omitted before output filename"
+msgstr ""
+
+#: makeinfo/files.c:646
+#, c-format
+msgid "`%s' omitted since writing to stdout"
+msgstr ""
+
+#: makeinfo/files.c:694
+msgid "Output buffer not empty."
+msgstr ""
+
 #: makeinfo/footnote.c:150
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
@@ -1891,228 +1949,275 @@ msgstr "Piednoto difinita sen patra nodo"
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "Maleblas fari piednoton al piednoto"
 
-#: makeinfo/footnote.c:298
+#: makeinfo/footnote.c:302 makeinfo/index.c:189
 msgid "Footnotes"
 msgstr "Piednotoj"
 
-#: makeinfo/html.c:42
+#: makeinfo/html.c:87
+#, c-format
+msgid "%s: could not open --css-file: %s"
+msgstr ""
+
+#: makeinfo/html.c:172
+#, c-format
+msgid "%s:%d: --css-file ended in comment"
+msgstr ""
+
+#: makeinfo/html.c:207
 msgid "Untitled"
 msgstr "Sen titolo"
 
-#: makeinfo/html.c:298
+#: makeinfo/html.c:422
+msgid "[unexpected] no html tag to pop"
+msgstr "[neatendite] mankas HTML-etikedo por elstakigo"
+
+#: makeinfo/html.c:752
 #, c-format
-msgid "Invalid node name: `%s'"
-msgstr "Misa nodnomo: \"%s\""
+msgid "[unexpected] invalid node name: `%s'"
+msgstr "[neatendite] misa nodnomo: \"%s\""
 
-#: makeinfo/index.c:213
+#: makeinfo/index.c:169
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "Nekonata indekso \"%s\""
 
-#: makeinfo/index.c:238
+#: makeinfo/index.c:234
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr "Info ne povas trakti \":\" en indeksa artikolo \"%s\""
 
-#: makeinfo/index.c:396
+#: makeinfo/index.c:412
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "Jam estas indekso \"%s\""
 
-#: makeinfo/index.c:439
+#: makeinfo/index.c:455
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "Nekonata indekso \"%s\" kajaux \"%s\" en @synindex"
 
-#: makeinfo/index.c:666
+#: makeinfo/index.c:661
+msgid "(line )"
+msgstr ""
+
+#: makeinfo/index.c:669
+#, c-format
+msgid "(line %*d)"
+msgstr ""
+
+#: makeinfo/index.c:750
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "Nekonata indekso \"%s\" en @printindex"
 
-#: makeinfo/index.c:709
+#: makeinfo/index.c:819
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "Artikolo por indekso \"%s\" estas ekster iu ajn nodo"
 
-#: makeinfo/index.c:712 makeinfo/index.c:751
+#: makeinfo/index.c:822 makeinfo/index.c:858
 msgid "(outside of any node)"
 msgstr "(ekster iu ajn nodo)"
 
-#: makeinfo/insertion.c:198
+#: makeinfo/index.c:919 makeinfo/index.c:925
+msgid "See "
+msgstr "Vidu "
+
+#: makeinfo/insertion.c:160
+msgid "@item not allowed in argument to @itemize"
+msgstr ""
+
+#: makeinfo/insertion.c:238
 msgid "Broken-Type in insertion_type_pname"
 msgstr "Misa tipo en la funkcio insertion_type_pname"
 
-#: makeinfo/insertion.c:271
+#: makeinfo/insertion.c:334
 msgid "Enumeration stack overflow"
 msgstr "Troo en la stako de enumeracioj"
 
-#: makeinfo/insertion.c:303
+#: makeinfo/insertion.c:366
 #, c-format
 msgid "lettering overflow, restarting at %c"
 msgstr "mankas sekva enumeracia litero, rekomencite ekde %c"
 
-#: makeinfo/insertion.c:538
+#: makeinfo/insertion.c:631
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
 msgstr "%s bezonas argumenton: la arangxilon por %citem"
 
-#: makeinfo/insertion.c:693
+#: makeinfo/insertion.c:719
+#, c-format
+msgid "%cfloat environments cannot be nested"
+msgstr ""
+
+#: makeinfo/insertion.c:973
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
 msgstr "\"@end\" atendis \"%s\", sed renkontis \"%s\""
 
-#: makeinfo/insertion.c:931
+#: makeinfo/insertion.c:1337
 #, c-format
 msgid "No matching `%cend %s'"
 msgstr "Mankas para \"%cend %s\""
 
-#: makeinfo/insertion.c:1084
+#: makeinfo/insertion.c:1592
 #, c-format
 msgid "%s requires letter or digit"
 msgstr "%s bezonas literon aux ciferon"
 
-#: makeinfo/insertion.c:1158
+#: makeinfo/insertion.c:1687
 msgid "end of file inside verbatim block"
 msgstr "dosierfino ene de pretarangxita bloko"
 
-#: makeinfo/insertion.c:1318
+#: makeinfo/insertion.c:1913
+#, fuzzy, c-format
+msgid "@%s not meaningful outside `@float' environment"
+msgstr "@%s estas sensenca ene de bloko \"@%s\""
+
+#: makeinfo/insertion.c:1949
 msgid "@menu seen before first @node, creating `Top' node"
 msgstr "@menu jam antaux la unua @nodo; nodo \"Top\" kreitas"
 
-#: makeinfo/insertion.c:1319
+#: makeinfo/insertion.c:1950
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr "eble via @top-nodo staru sub @ifnottex anstataux sub @ifinfo?"
 
-#: makeinfo/insertion.c:1331
+#: makeinfo/insertion.c:1962
 msgid "@detailmenu seen before first node, creating `Top' node"
 msgstr "@detailmenu renkontita jam antaux la unua nodo; nodo \"Top\" kreitas"
 
-#: makeinfo/insertion.c:1346
+#: makeinfo/insertion.c:2018
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr ""
+
+#: makeinfo/insertion.c:2032
+#, fuzzy, c-format
+msgid "@%s not meaningful outside `@titlepage' environment"
+msgstr "@%s estas sensenca ene de bloko \"@%s\""
+
+#: makeinfo/insertion.c:2063
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr "Mankas para \"%c%s\""
 
-#: makeinfo/insertion.c:1353
+#: makeinfo/insertion.c:2068
 #, c-format
 msgid "`%c%s' needs something after it"
 msgstr "\"%c%s\" bezonas post si ion"
 
-#: makeinfo/insertion.c:1359
-#, c-format
-msgid "Bad argument to `%s', `%s', using `%s'"
+#: makeinfo/insertion.c:2074
+#, fuzzy, c-format
+msgid "Bad argument `%s' to `@%s', using `%s'"
 msgstr "Misa argumento por \"%s\", \"%s\", uzanta \"%s\""
 
-#: makeinfo/insertion.c:1453
+#: makeinfo/insertion.c:2171
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
 msgstr "@%s estas sensenca ene de bloko \"@%s\""
 
-#: makeinfo/insertion.c:1462
+#: makeinfo/insertion.c:2180
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "@itemx estas sensenca ene de bloko \"%s\""
 
-#: makeinfo/insertion.c:1646
+#: makeinfo/insertion.c:2356
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "%c%s renkontita ekster \"insertion block\""
 
-#: makeinfo/lang.c:331
+#: makeinfo/lang.c:580
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "%s ne estas valida lingvokodo laux ISO 639"
 
-#: makeinfo/lang.c:384
-#, c-format
-msgid "unrecogized encoding name `%s'"
+#: makeinfo/lang.c:655
+#, fuzzy, c-format
+msgid "unrecognized encoding name `%s'"
 msgstr "nekonata nomo de kodosistemo: %s\""
 
-#: makeinfo/lang.c:387
+#: makeinfo/lang.c:663
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "Pardonon, la kodo \"%s\" ne estas disponebla"
 
-#: makeinfo/lang.c:414
+#: makeinfo/lang.c:715
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "misa kodoprezento: \"%s\""
 
-#: makeinfo/lang.c:502
-#, c-format
-msgid "%s is an invalid ISO code, using %c"
-msgstr "\"%s\" ne estas valida ISO-kodo; estos \"%c\" anstatauxe"
-
-#: makeinfo/lang.c:687
+#: makeinfo/lang.c:1009
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "%c%s atendas argumenton \"i\" aux \"j\", ne \"%c\""
 
-#: makeinfo/lang.c:691
+#: makeinfo/lang.c:1013
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr "%c%s akceptas nur solsignan argumenton \"i\" aux \"j\""
 
-#: makeinfo/macro.c:134
+#: makeinfo/macro.c:128
 #, c-format
 msgid "macro `%s' previously defined"
 msgstr "makroo \"%s\" jam difinita antauxe"
 
-#: makeinfo/macro.c:138
+#: makeinfo/macro.c:132
 #, c-format
 msgid "here is the previous definition of `%s'"
 msgstr "cxi tie estas la antauxa difino de \"%s\""
 
 #: makeinfo/macro.c:355
-#, c-format
-msgid "\\ in macro expansion followed by `%s' instead of \\ or parameter name"
+#, fuzzy, c-format
+msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr ""
 "en makroo, \\ sekvata de \"%s\" (anstataux de \\ aux nomo de parametro)"
 
-#: makeinfo/macro.c:403
+#: makeinfo/macro.c:401
 #, c-format
 msgid "Macro `%s' called on line %d with too many args"
 msgstr "Makroo \"%s\" en la linio %d havas troan argumenton"
 
-#: makeinfo/macro.c:594
+#: makeinfo/macro.c:586
 #, c-format
 msgid "%cend macro not found"
 msgstr "makroo %cend ne trovigxis"
 
-#: makeinfo/macro.c:632
+#: makeinfo/macro.c:624
 msgid "@quote-arg only useful for single-argument macros"
 msgstr "@quote-arg utilas nur en sol-argumentaj makrooj"
 
-#: makeinfo/macro.c:668
+#: makeinfo/macro.c:660
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "misa @end %s por @%s"
 
-#: makeinfo/makeinfo.c:316
+#: makeinfo/makeinfo.c:184
 #, c-format
-msgid "%s:%d: warning: "
-msgstr "%s:%d: averto: "
-
-#: makeinfo/makeinfo.c:339
 msgid "Too many errors!  Gave up.\n"
 msgstr "Tro multe da eraroj!  Halt'.\n"
 
-#: makeinfo/makeinfo.c:350 makeinfo/makeinfo.c:2026
+#: makeinfo/makeinfo.c:302
+#, c-format
+msgid "%s:%d: warning: "
+msgstr "%s:%d: averto: "
+
+#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
 #, c-format
 msgid "Misplaced %c"
 msgstr "Misloka %c"
 
-#: makeinfo/makeinfo.c:370
+#: makeinfo/makeinfo.c:340
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Por pluaj detaloj tajpu \"%s --help\".\n"
 
-#: makeinfo/makeinfo.c:373
+#: makeinfo/makeinfo.c:343
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Uzmaniero: %s [OPCIO]... TEXINFO-DOSIERO...\n"
 
-#: makeinfo/makeinfo.c:376
+#: makeinfo/makeinfo.c:346
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -2122,7 +2227,7 @@ msgstr ""
 "Info-dosierojn tauxgajn por dialoga legado per Emakso aux per auxtonoma GNU-"
 "Info.\n"
 
-#: makeinfo/makeinfo.c:380
+#: makeinfo/makeinfo.c:350
 #, c-format
 msgid ""
 "General options:\n"
@@ -2149,24 +2254,21 @@ msgstr ""
 "      --version               Eligu la nomon, la version de la programo kaj "
 "eliru.\n"
 
-#: makeinfo/makeinfo.c:394
+#: makeinfo/makeinfo.c:364
 #, fuzzy, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output DocBook rather than Info.\n"
+"      --docbook             output Docbook XML rather than Info.\n"
 "      --html                output HTML rather than Info.\n"
-"      --xml                 output XML (TexinfoML) rather than Info.\n"
+"      --xml                 output Texinfo XML rather than Info.\n"
+"      --plaintext           output plain text rather than Info.\n"
 msgstr ""
 "Por elekti celformon (defauxlte, Info):\n"
 "      --docbook             Generu en DocBook anstataux en Info.\n"
 "      --html                Generu en HTML anstataux en Info.\n"
-"      --no-headers          Generu platan tekston, sen dispartigi en nodojn,\n"
-"                              sen fari la liniojn \"Node:\";\n"
-"                              eligu en la cxefeligujon manke de --output.\n"
 "      --xml                 Generu en XML (TexinfoML) anstataux en Info.\n"
 
-#: makeinfo/makeinfo.c:401
-#, fuzzy
+#: makeinfo/makeinfo.c:372
 msgid ""
 "General output options:\n"
 "  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
@@ -2184,6 +2286,11 @@ msgstr ""
 "Gxeneralaj opcioj generadaj:\n"
 "  -E, --macro-expand DOSIER  Konservu makrotraktitan fontajxon en DOSIERo,\n"
 "                               sen atenti cxiajn @setfilename.\n"
+"      --no-headers           Generu platan tekston, sen dispartigi en "
+"nodojn,\n"
+"                               sen fari la \"Node:\"liniojn kaj menuojn; "
+"krome,\n"
+"                               eligu en la cxefeligujon manke de --output.\n"
 "      --no-split             Ne disfendu grandan Info- aux HTML-dosieron,\n"
 "                               faru unu solan rezultan dosieron.\n"
 "      --number-sections      Generu kun la numeroj de cxapitroj, sekcioj "
@@ -2191,7 +2298,7 @@ msgstr ""
 "  -o, --output=DOSIER        Skribu en DOSIERon (DOSIERujon, por fenda "
 "HTML).\n"
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:386
 #, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2227,14 +2334,32 @@ msgstr ""
 "ensxovon.\n"
 "      --split-size=N          Fendu en dosierojn po  N  (defauxlte %d).\n"
 
-#: makeinfo/makeinfo.c:433
+#: makeinfo/makeinfo.c:403
+msgid ""
+"Options for HTML:\n"
+"      --css-include=FILE        include FILE in HTML <style> output;\n"
+"                                  read stdin if FILE is -.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:409
+#, c-format
+msgid ""
+"Options for XML and Docbook:\n"
+"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"d).\n"
+"                                  If VAL is 0, ignorable whitespace is "
+"dropped.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:416
+#, fuzzy
 msgid ""
 "Input file options:\n"
-"      --commands-in-node-names   allow @ commands in node names.\n"
-"  -D VAR                         define the variable VAR, as with @set.\n"
-"  -I DIR                         append DIR to the @include search path.\n"
-"  -P DIR                         prepend DIR to the @include search path.\n"
-"  -U VAR                         undefine the variable VAR, as with @clear.\n"
+"      --commands-in-node-names  allow @ commands in node names.\n"
+"  -D VAR                        define the variable VAR, as with @set.\n"
+"  -I DIR                        append DIR to the @include search path.\n"
+"  -P DIR                        prepend DIR to the @include search path.\n"
+"  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
 "Opcioj pri la fontodosieroj:\n"
 "  --commands-in-node-names    Permesu @-komandojn en nodnomoj.\n"
@@ -2246,48 +2371,62 @@ msgstr ""
 "  -U VAR                      Maldifinu la variablon  VAR,  kiel per "
 "@clear.\n"
 
-#: makeinfo/makeinfo.c:442
+#: makeinfo/makeinfo.c:425
 #, fuzzy
 msgid ""
 "Conditional processing in input:\n"
+"  --ifdocbook       process @ifdocbook and @docbook even if\n"
+"                      not generating Docbook.\n"
 "  --ifhtml          process @ifhtml and @html even if not generating HTML.\n"
 "  --ifinfo          process @ifinfo even if not generating Info.\n"
 "  --ifplaintext     process @ifplaintext even if not generating plain text.\n"
 "  --iftex           process @iftex and @tex; implies --no-split.\n"
+"  --ifxml           process @ifxml and @xml.\n"
+"  --no-ifdocbook    do not process @ifdocbook and @docbook text.\n"
 "  --no-ifhtml       do not process @ifhtml and @html text.\n"
 "  --no-ifinfo       do not process @ifinfo text.\n"
 "  --no-ifplaintext  do not process @ifplaintext text.\n"
 "  --no-iftex        do not process @iftex and @tex text.\n"
+"  --no-ifxml        do not process @ifxml and @xml text.\n"
+"\n"
+"  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
 msgstr ""
 "Kondicxa traktado cxe enigo:\n"
-"  --ifhtml     Traktu la pecojn sub @ifhtml kaj @html ecx se\n"
-"                  HTML ne estas generata\n"
-"  --ifinfo     Traktu la pecojn sub @ifinfo ecx generante HTML\n"
-"  --iftex      Traktu la pecojn sub @iftex kaj @tex; implicas --no-split.\n"
-"  --no-ifhtml  Ne traktu la pecojn sub @ifhtml kaj @html.\n"
-"  --no-ifinfo  Ne traktu la pecojn sub @ifinfo.\n"
-"  --no-iftex   Ne traktu la pecojn sub @iftex and @tex.\n"
-
-#: makeinfo/makeinfo.c:454
+"  --ifhtml         Traktu la pecojn sub @ifhtml kaj @html ecx se ne\n"
+"                      HTML estas generata\n"
+"  --ifinfo         Traktu la pecojn sub @ifinfo ecx se ne Info generatas\n"
+"  --ifplaintext    Traktu la pecojn sub @ifplaintext ecx se alia formo ol\n"
+"                      plata teksto estas generata\n"
+"  --iftex          Traktu la pecojn sub @iftex kaj @tex; implicas --no-"
+"split\n"
+"  --ifxml          Traktu la pecojn sub @ifxml kaj @xml\n"
+"  --no-ifhtml      Ne traktu la pecojn sub @ifhtml kaj @html\n"
+"  --no-ifinfo      Ne traktu la pecojn sub @ifinfo.\n"
+"  --no-ifplaintext Ne traktu la pecojn sub @ifplaintext\n"
+"  --no-iftex       Ne traktu la pecojn sub @iftex kaj @tex\n"
+"  --no-ifxml       Ne traktu la pecojn sub @ifxml kaj @xml\n"
+
+#: makeinfo/makeinfo.c:444
 #, fuzzy
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating HTML, --ifhtml is on and the others are off;\n"
 "  if generating Info, --ifinfo is on and the others are off;\n"
 "  if generating plain text, --ifplaintext is on and the others are off;\n"
+"  if generating XML, --ifxml is on and the others are off.\n"
 msgstr ""
 "La defauxlta konduto de la @if...-frazoj dependas je la celata formo:\n"
 "se HTML estas generata, --ifhtml sxaltigxas kaj la ceteraj, malsxaltigxas;\n"
-"se Info aux plata teksto estas generata, --ifinfo  sxaltigxas kaj la\n"
-"ceteraj, malsxaltigxas.\n"
+"cxe Info-generado, --ifinfo  sxaltigxas kaj la ceteraj, malsxaltigxas; \n"
+"se plata teksto estas generata, --ifplaintext  sxaltigxas kaj la ceteraj,\n"
+"malsxaltigxas.\n"
 
-#: makeinfo/makeinfo.c:461
-#, fuzzy
+#: makeinfo/makeinfo.c:452
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                     write Info to foo's @setfilename\n"
 "  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write XML to @setfilename\n"
+"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
 "  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
 "  makeinfo --no-headers foo.texi        write plain text to standard output\n"
 "\n"
@@ -2297,83 +2436,97 @@ msgid ""
 "  makeinfo --no-split foo.texi          write one Info file however big\n"
 msgstr ""
 "Ekzemploj:\n"
-"  makeinfo UM.texi                    konservu Info laux @setfilename de UM\n"
-"  makeinfo --html UM.texi             konservu HTML laux @setfilename de UM\n"
-"  makeinfo --no-headers -o - UM.texi  sendu platan tekston en cxefeligujon\n"
-"  makeinfo --number-sections UM.texi  konservu Info kun la sekcinumeroj\n"
-"  makeinfo --no-split UM.texi         faru unu Info-dosieron, kiom ajn "
+" makeinfo UM.texi                     konservu Info laux @setfilename\n"
+" makeinfo --html UM.texi              konservu HTML laux @setfilename\n"
+" makeinfo --xml UM.texi               konservu Texinfo-XML laux "
+"@setfilename\n"
+" makeinfo --docbook UM.texi           konservu DocBook-XML laux "
+"@setfilename\n"
+" makeinfo --no-headers -o - UM.texi   sendu platan tekston en cxefeligujon\n"
+"\n"
+" makeinfo --html --no-headers UM.texi konservu HTML sen \"Node:\"-linioj, "
+"menuoj\n"
+" makeinfo --number-sections UM.texi   konservu Info kun la sekcinumeroj\n"
+" makeinfo --no-split UM.texi          faru unu Info-dosieron, kiom ajn "
 "grandan\n"
 
-#: makeinfo/makeinfo.c:570 makeinfo/makeinfo.c:593 makeinfo/makeinfo.c:655
-#: makeinfo/makeinfo.c:676
+#: makeinfo/makeinfo.c:603
+#, c-format
+msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
+#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr "%s: la argumento %s devas esti nombra, ne \"%s\".\n"
 
-#: makeinfo/makeinfo.c:583
-#, c-format
-msgid "Couldn't open macro expansion output `%s'"
+#: makeinfo/makeinfo.c:660
+#, fuzzy, c-format
+msgid "%s: could not open macro expansion output `%s'"
 msgstr "Fiaskis malfermo de makrotraktada eligdosiero \"%s\""
 
-#: makeinfo/makeinfo.c:586
-msgid "Cannot specify more than one macro expansion output"
-msgstr "Ne povas esti pli ol unu makrotraktada eligdosiero"
+#: makeinfo/makeinfo.c:665
+#, fuzzy, c-format
+msgid "%s: ignoring second macro expansion output `%s'.\n"
+msgstr "Fiaskis malfermo de makrotraktada eligdosiero \"%s\""
 
-#: makeinfo/makeinfo.c:624
+#: makeinfo/makeinfo.c:707
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 "%s: argumento de la opcio --paragraph-indent estu nombra, \"none\" aux\n"
 "\"asis\", ne \"%s\".\n"
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 "%s: argumento de la opcio --footnote-style estu \"separate\" aux\n"
 "\"end\", ne \"%s\".\n"
 
-#: makeinfo/makeinfo.c:723
+#: makeinfo/makeinfo.c:806
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: mankas dosiera argumento.\n"
 
-#: makeinfo/makeinfo.c:898
+#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#, c-format
+msgid "Multiline command %c%s used improperly"
+msgstr ""
+
+#: makeinfo/makeinfo.c:1000
 #, c-format
 msgid "Expected `%s'"
 msgstr "\"%s\" atendatas"
 
-#: makeinfo/makeinfo.c:1365
-msgid "File exists, but is not a directory"
-msgstr ""
-
-#: makeinfo/makeinfo.c:1366
+#: makeinfo/makeinfo.c:1479
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "Provo krei dosierujon \"%s\" malsukcesis: %s"
 
-#: makeinfo/makeinfo.c:1414
+#: makeinfo/makeinfo.c:1525
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "Neniu \"%s\" trovita en \"%s\""
 
-#: makeinfo/makeinfo.c:1496
+#: makeinfo/makeinfo.c:1605
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
 "%s: Makrotraktitajxo ne trafos en la cxefeligujon cxar Info iras tien.\n"
 
-#: makeinfo/makeinfo.c:1526
+#: makeinfo/makeinfo.c:1638
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "%s-dosiero \"%s\" estas generata el \"%s\".\n"
 
-#: makeinfo/makeinfo.c:1561
+#: makeinfo/makeinfo.c:1673
 #, c-format
 msgid "This is %s, produced by makeinfo version %s from %s.\n"
 msgstr "Cxi tiun dosieron %s generis Makeinfo-%s el %s.\n"
 
-#: makeinfo/makeinfo.c:1583
+#: makeinfo/makeinfo.c:1709
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2381,326 +2534,320 @@ msgstr ""
 "%s: La eligdosiero \"%s\" por makrotraktitajxo forigitas cxar estis eraroj;\n"
 "uzu la opcion --force por gxin reteni.\n"
 
-#: makeinfo/makeinfo.c:1627
+#: makeinfo/makeinfo.c:1773
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 "%s: La eligdosiero \"%s\" forigitas cxar estis eraroj;\n"
 "uzu la opcion --force por gxin reteni.\n"
 
-#: makeinfo/makeinfo.c:1853
+#: makeinfo/makeinfo.c:2034
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "Nekonata komando \"%s\"."
 
-#: makeinfo/makeinfo.c:1875
+#: makeinfo/makeinfo.c:2056
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr "Uzu vinkulojn por pasigi al \"@%s\" komandan argumenton"
 
-#: makeinfo/makeinfo.c:2068
-#, c-format
-msgid "%c%s expected `{...}'"
+#: makeinfo/makeinfo.c:2314
+#, fuzzy, c-format
+msgid "%c%s expected braces"
 msgstr "%c%s postulas vinkulojn \"{...}\""
 
-#: makeinfo/makeinfo.c:2098
+#: makeinfo/makeinfo.c:2327
 msgid "Unmatched }"
 msgstr "Senpara \"}\""
 
-#: makeinfo/makeinfo.c:2148
+#: makeinfo/makeinfo.c:2375
 msgid "NO_NAME!"
 msgstr "SEN_NOMO!"
 
-#: makeinfo/makeinfo.c:2169
+#: makeinfo/makeinfo.c:2396
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s sen \"}\""
 
-#: makeinfo/makeinfo.c:2958
-msgid "First argument to cross-reference may not be empty"
-msgstr "La unua argumento de internoda referenco ne vaku"
-
-#: makeinfo/makeinfo.c:3018 makeinfo/makeinfo.c:3236 makeinfo/xml.c:1340
-msgid "see "
-msgstr "vidu "
-
-#: makeinfo/makeinfo.c:3018
-msgid "See "
-msgstr "Vidu "
-
-#: makeinfo/makeinfo.c:3164
-#, c-format
-msgid "`.' or `,' must follow cross reference, not %c"
-msgstr "Referencon devas sekvi punkto aux komo, ne %c"
-
-#: makeinfo/makeinfo.c:3212
-msgid "First argument to @inforef may not be empty"
-msgstr "La unua argumento de @inforef ne vaku"
-
-#: makeinfo/makeinfo.c:3427
+#: makeinfo/makeinfo.c:3309
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "por HTML, la dosiero \"%s\" en la komando @image estas nelegebla: %s"
 
-#: makeinfo/makeinfo.c:3440
-#, c-format
-msgid "No `%s.png' or `.jpg', and no extension supplied"
-msgstr "Troveblas nek \"%s.png\" nek \".jpg\", kaj sufikso mankas"
+#: makeinfo/makeinfo.c:3315
+#, fuzzy, c-format
+msgid "No such file `%s'"
+msgstr "Neniu \"%s\" trovita en \"%s\""
 
-#: makeinfo/makeinfo.c:3490
+#: makeinfo/makeinfo.c:3447
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "bilddosiero \"%s\" (por teksto) estas nelegebla: %s"
 
-#: makeinfo/makeinfo.c:3497
+#: makeinfo/makeinfo.c:3456
 msgid "@image missing filename argument"
 msgstr "mankas dosiera argumento en la komando @image"
 
-#: makeinfo/makeinfo.c:3690
+#: makeinfo/makeinfo.c:3675
+#, c-format
+msgid "undefined flag: %s"
+msgstr ""
+
+#: makeinfo/makeinfo.c:3676
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{Mankas Valoro Por \"%s\"}"
 
-#: makeinfo/makeinfo.c:3744
+#: makeinfo/makeinfo.c:3728
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s bezonas nomon"
 
-#: makeinfo/makeinfo.c:3850
+#: makeinfo/makeinfo.c:3834
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "Pli frue ol la para @end %s renkontigxis dosierfino"
 
-#: makeinfo/makeinfo.c:4081
+#: makeinfo/makeinfo.c:4082
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
-msgstr ""
+msgstr "\"%.40s...\" tro longas por malvolvo; malvolvo ne okazos"
 
-#: makeinfo/multi.c:226
+#: makeinfo/multi.c:116
 msgid "Missing } in @multitable template"
 msgstr "Mankas \"}\" en la sxablono de @multitable"
 
-#: makeinfo/multi.c:302
+#: makeinfo/multi.c:254
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "la misa teksto \"%s\" post @multitable estas ignorita"
 
-#: makeinfo/multi.c:375
+#: makeinfo/multi.c:393
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "Tro da kolumnoj en elemento de \"multitable\" (%d maksimume)"
 
-#: makeinfo/multi.c:426
+#: makeinfo/multi.c:555
 #, c-format
-msgid "Cannot select column #%d in multitable"
-msgstr "Maleblas elekti %d-an kolumnon en \"multitable\"."
+msgid "[unexpected] cannot select column #%d in multitable"
+msgstr "[neatendite] maleblas elekti %d-an kolumnon en \"multitable\"."
 
-#: makeinfo/multi.c:529
+#: makeinfo/multi.c:584
 msgid "ignoring @tab outside of multitable"
 msgstr "komando @tab ekster \"multitable\"; ignorita"
 
-#: makeinfo/multi.c:565
+#: makeinfo/multi.c:632
+#, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** Multekolumna eligo el la lasta linio:\n"
 
-#: makeinfo/multi.c:568
+#: makeinfo/multi.c:635
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* kolumno %d-a: eligajxo = %s\n"
 
-#: makeinfo/node.c:276
+#: makeinfo/node.c:280
 #, c-format
 msgid "Node `%s' previously defined at line %d"
 msgstr "Nodo \"%s\" jam difinita en la linio %d"
 
-#: makeinfo/node.c:594
+#: makeinfo/node.c:648
 #, c-format
 msgid "Formatting node %s...\n"
 msgstr "Estas arangxata la nodo \"%s\" ...\n"
 
-#: makeinfo/node.c:655
+#: makeinfo/node.c:716
 #, c-format
-msgid "Node `%s' requires a sectioning command (e.g. %c%s)"
-msgstr "Nodo \"%s\" bezonas subdividan komandon (e.g. %c%s)"
+msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
+msgstr "Nodo \"%s\" bezonas subdividan komandon (ekz-e %c%s)"
 
-#: makeinfo/node.c:815
+#: makeinfo/node.c:879
 #, c-format
 msgid "No node name specified for `%c%s' command"
 msgstr "Mankas nodnomo por la komando \"%c%s\""
 
-#: makeinfo/node.c:856 makeinfo/node.c:1075
+#: makeinfo/node.c:920 makeinfo/node.c:1151
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr "Dosiernoma kolizio por la ankro \"%s\" kaj la nodo \"%s\""
 
-#: makeinfo/node.c:859
+#: makeinfo/node.c:923
 msgid "This @anchor command ignored; references to it will not work"
 msgstr ""
 "Cxi tiu @anchor-komando estas ignorita; la referencoj al gxi ne funkcios"
 
-#: makeinfo/node.c:861 makeinfo/node.c:1078
+#: makeinfo/node.c:925 makeinfo/node.c:1154
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "Alinomu la ankron aux uzu la opcion \"--no-split\""
 
-#: makeinfo/node.c:891
+#: makeinfo/node.c:955
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
 msgstr "Nekonvena signocxeno fine de disfendita HTML-dosiero \"%s\""
 
-#: makeinfo/node.c:920
-msgid "Node:"
-msgstr "Nodo:"
-
-#: makeinfo/node.c:930
+#: makeinfo/node.c:991
 msgid "Next:"
 msgstr "Sekva:"
 
-#: makeinfo/node.c:940
+#: makeinfo/node.c:1007
 msgid "Previous:"
 msgstr "Antauxa:"
 
-#: makeinfo/node.c:950
+#: makeinfo/node.c:1021
 msgid "Up:"
 msgstr "Supre:"
 
-#: makeinfo/node.c:1072
+#: makeinfo/node.c:1148
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr "Dosiernoma kolizio por la ankroj \"%s\" kaj \"%s\""
 
-#: makeinfo/node.c:1077
+#: makeinfo/node.c:1153
 msgid "@anchor command ignored; references to it will not work"
 msgstr "Ignorita @anchor-komando; la referencoj al gxi ne funkcios"
 
-#: makeinfo/node.c:1277
+#: makeinfo/node.c:1347
 #, c-format
-msgid "%s reference to nonexistent node `%s'"
-msgstr "%s referencas neekzistantan nodon \"%s\""
+msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
+msgstr "%s referencas neekzistantan nodon \"%s\" (cxu eraro en sekciarangxo?)"
 
-#: makeinfo/node.c:1294
+#: makeinfo/node.c:1363
 msgid "Menu"
 msgstr "Menuo"
 
-#: makeinfo/node.c:1296
+#: makeinfo/node.c:1365
 msgid "Cross"
 msgstr "Referenco"
 
-#: makeinfo/node.c:1380
+#: makeinfo/node.c:1447
 #, c-format
-msgid "Next field of node `%s' not pointed to"
-msgstr "La kampo \"Next\" de la nodo \"%s\" ne estas reciprokita"
+msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
+msgstr ""
+"La kampo \"Next\" de la nodo \"%s\" ne estas reciprokita (cxu misa "
+"sekciarangxo?)"
 
-#: makeinfo/node.c:1383
+#: makeinfo/node.c:1450
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "Cxi tiu nodo (\"%s\") havas eraran kampon \"Prev\""
 
-#: makeinfo/node.c:1395
+#: makeinfo/node.c:1462
 msgid "Prev"
 msgstr "Antauxa"
 
-#: makeinfo/node.c:1438
+#: makeinfo/node.c:1505
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "La kampo \"Prev\" de la nodo \"%s\" ne estas reciprokita"
 
-#: makeinfo/node.c:1442
+#: makeinfo/node.c:1509
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "Cxi tiu nodo (\"%s\") havas eraran kampon \"Next\""
 
-#: makeinfo/node.c:1454
+#: makeinfo/node.c:1521
 #, c-format
-msgid "`%s' has no Up field"
-msgstr "La nodo \"%s\" malhavas kampon \"Up\""
+msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
+msgstr "\"%s\" malhavas kampon \"Up\" (cxu eraro en sekciarangxo?)"
 
-#: makeinfo/node.c:1457
+#: makeinfo/node.c:1524
 msgid "Up"
 msgstr "Supre"
 
-#: makeinfo/node.c:1523
+#: makeinfo/node.c:1590
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr "En \"%s\" mankas menuero por \"%s\", malgraux ties ligilo \"Up\"\""
 
-#: makeinfo/node.c:1552
+#: makeinfo/node.c:1619
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr "la nodo \"%s\" estis referencita %d fojojn"
 
-#: makeinfo/node.c:1566
+#: makeinfo/node.c:1633
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "la nodo \"%s\" ne estas referencita"
 
-#: makeinfo/sectioning.c:117
+#: makeinfo/node.c:1723
 #, c-format
-msgid "Appendix %c "
+msgid "Removing %s\n"
+msgstr ""
+
+#: makeinfo/node.c:1727
+#, fuzzy, c-format
+msgid "Can't remove file `%s': %s"
+msgstr "Provo krei dosierujon \"%s\" malsukcesis: %s"
+
+#: makeinfo/sectioning.c:122
+#, fuzzy, c-format
+msgid "Appendix %c"
 msgstr "Aldono %c"
 
-#: makeinfo/sectioning.c:356 makeinfo/sectioning.c:444
+#: makeinfo/sectioning.c:467
+#, fuzzy, c-format
+msgid "Internal error (search_sectioning) `%s'!"
+msgstr "Interna eraro (search_sectioning) \"%s\"!"
+
+#: makeinfo/sectioning.c:562
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
 msgstr "Interna eraro (search_sectioning) \"%s\"!"
 
-#: makeinfo/sectioning.c:502
+#: makeinfo/sectioning.c:623
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr "%c%s arkaikigxis; uzu %c%s anstatauxe"
 
-#: makeinfo/sectioning.c:518
+#: makeinfo/sectioning.c:639
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr "Jam estas nodo kun sekcio %ctop"
 
-#: makeinfo/sectioning.c:526
+#: makeinfo/sectioning.c:647
 #, c-format
 msgid "Here is the %ctop node"
 msgstr "Jen estas la nodo %ctop"
 
-#: makeinfo/sectioning.c:543
+#: makeinfo/sectioning.c:663
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr "%ctop aperis pli frue ol %cnode; la defauxlto uzota estas %s"
 
-#: makeinfo/toc.c:221 makeinfo/toc.c:298 makeinfo/toc.c:299
+#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
 msgid "Table of Contents"
 msgstr "Enhavtabelo"
 
-#: makeinfo/toc.c:330 makeinfo/toc.c:366 makeinfo/toc.c:367
+#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
 msgid "Short Contents"
 msgstr "Maldetala enhavtabelo"
 
-#: makeinfo/toc.c:406
-#, c-format
-msgid "%s: TOC should be here, but it was not found"
-msgstr "%s: cxi tie mankas enhavtabelo"
-
-#: makeinfo/xml.c:1108
+#: makeinfo/xml.c:1605
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "dosiero \"%s\" en la komando @image estas nelegebla: %s"
 
-#: util/install-info.c:151
+#: makeinfo/xml.c:2097
+msgid ""
+"@headitem as the last item of @multitable produces invalid Docbook documents"
+msgstr ""
+
+#: util/install-info.c:154
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: averto: "
 
-#: util/install-info.c:176 util/install-info.c:189
-msgid "virtual memory exhausted"
-msgstr "virtuala memoro elcxerpitas"
-
-#: util/install-info.c:232
+#: util/install-info.c:203
 #, c-format
 msgid " for %s"
 msgstr " por %s"
 
-#: util/install-info.c:381
+#: util/install-info.c:426
 #, c-format
 msgid "\tTry `%s --help' for a complete list of options.\n"
 msgstr "\tPor ricevi kompletan liston da opcioj tajpu \"%s --help\".\n"
 
-#: util/install-info.c:389
+#: util/install-info.c:434
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
@@ -2769,7 +2916,7 @@ msgstr ""
 "                    ili determinigxos el la informoj de la Info-dosiero.\n"
 "--version         Eligu la nomon, la version de la programo kaj eliru.\n"
 
-#: util/install-info.c:444
+#: util/install-info.c:488
 #, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
@@ -2786,7 +2933,7 @@ msgid ""
 "  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
 "  to select it.\n"
 "\n"
-"* Menu:\n"
+"%s\n"
 msgstr ""
 "Cxi tio estas la dosiero .../info/dir, entenanta la pinton de la \n"
 "la hierarkio Info -- la cxefkatalogan nodon nomatan (dir)Top.\n"
@@ -2802,99 +2949,101 @@ msgstr ""
 "  Se vi legas per Emakso, alklaku menueron aux referencon per la 2-a\n"
 "  musbutono por elekti la temon.\n"
 "\n"
-"* Menu:\n"
+"%s\n"
 
-#: util/install-info.c:467
+#: util/install-info.c:513
 #, c-format
 msgid "%s: could not read (%s) and could not create (%s)\n"
 msgstr "%s: ne povas legi (%s) kaj ne povas krei (%s)\n"
 
-#: util/install-info.c:551
+#: util/install-info.c:600
 #, c-format
 msgid "%s: empty file"
 msgstr "%s: malplena dosiero"
 
-#: util/install-info.c:866 util/install-info.c:906
+#: util/install-info.c:913 util/install-info.c:953
 msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
 msgstr "START-INFO-DIR-ENTRY sen para END-INFO-DIR-ENTRY"
 
-#: util/install-info.c:901
+#: util/install-info.c:948
 msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
 msgstr "END-INFO-DIR-ENTRY sen para START-INFO-DIR-ENTRY"
 
-#: util/install-info.c:1150 util/install-info.c:1160
+#: util/install-info.c:1191 util/install-info.c:1201
 #, c-format
-msgid "%s: Specify the Info directory only once.\n"
-msgstr "%s: Indiku la Info-katalogon solfoje.\n"
+msgid "%s: already have dir file: %s\n"
+msgstr ""
 
-#: util/install-info.c:1195
+#: util/install-info.c:1236
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr "%s: Indiku la Info-dosieron solfoje.\n"
 
-#: util/install-info.c:1244
+#: util/install-info.c:1284
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr "troa argumento komandlinia: \"%s\""
 
-#: util/install-info.c:1248
+#: util/install-info.c:1288
 msgid "No input file specified; try --help for more information."
 msgstr "Mankas enigdosiero; provu --help por pluaj informoj."
 
-#: util/install-info.c:1251
+#: util/install-info.c:1291
 msgid "No dir file specified; try --help for more information."
 msgstr "Mankas dosiero Info-katalogo (dir); provu --help por pluaj informoj."
 
-#: util/install-info.c:1273
+#: util/install-info.c:1313
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr "Nenia informo por Info-katalogo trovigxis en \"%s\""
 
-#: util/install-info.c:1388
+#: util/install-info.c:1426
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr "menuero \"%s\" jam ekzistas (por la dosiero \"%s\")"
 
-#: util/install-info.c:1411
+#: util/install-info.c:1449
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr "Trovigxis nenia informo Info-kataloga pri \"%s\"; nenio igxis forigita"
 
-#: util/texindex.c:245
+#: util/texindex.c:252
 msgid "display this help and exit"
 msgstr "eligu cxi tiun helpon kaj eliru"
 
-#: util/texindex.c:247
+#: util/texindex.c:254
 msgid "keep temporary files around after processing"
 msgstr "konservu la labordosierojn post la traktado"
 
-#: util/texindex.c:249
+#: util/texindex.c:256
 msgid "do not keep temporary files around after processing (default)"
 msgstr "ne konservu la labordosierojn post la traktado (defauxlto)"
 
-#: util/texindex.c:251
+#: util/texindex.c:258
 msgid "send output to FILE"
 msgstr "sendu la eligajxon en DOSIEROn"
 
-#: util/texindex.c:253
+#: util/texindex.c:260
 msgid "display version information and exit"
 msgstr "eligu la uzatan version kaj eliru"
 
-#: util/texindex.c:264
+#: util/texindex.c:270
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Uzmaniero: %s [OPCIO]... DOSIERO...\n"
 
-#: util/texindex.c:265
+#: util/texindex.c:271
+#, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr "Generu ordigitan indekson por cxiu TeX-a elig-DOSIERO.\n"
 
-#: util/texindex.c:268
+#: util/texindex.c:274
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr "Kutime DOSIERO... estas \"umo.%c%c\" por dokumento \"umo.texi\".\n"
 
-#: util/texindex.c:270
+#: util/texindex.c:276
+#, c-format
 msgid ""
 "\n"
 "Options:\n"
@@ -2902,28 +3051,65 @@ msgstr ""
 "\n"
 "Opcioj:\n"
 
-#: util/texindex.c:887 util/texindex.c:921 util/texindex.c:997
-#: util/texindex.c:1025
+#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
+#: util/texindex.c:1011
 #, c-format
 msgid "%s: not a texinfo index file"
 msgstr "%s: ne indeksa dosiero laux Texinfo"
 
-#: util/texindex.c:982
+#: util/texindex.c:968
 #, c-format
 msgid "failure reopening %s"
 msgstr "fiasko cxe remalfermo de %s"
 
-#: util/texindex.c:1224
+#: util/texindex.c:1218
 #, c-format
 msgid "No page number in %s"
 msgstr "Mankas pagxnumero en %s"
 
-#: util/texindex.c:1295
+#: util/texindex.c:1291
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "la artikolo %s sekvas artikolon kun kromnomo"
 
-#: util/texindex.c:1633
-#, c-format
-msgid "%s; for file `%s'.\n"
-msgstr "%s; por la dosiero \"%s\".\n"
+#~ msgid "%s: Specify the Info directory only once.\n"
+#~ msgstr "%s: Indiku la Info-katalogon solfoje.\n"
+
+#~ msgid "\"\" is invalid"
+#~ msgstr "\"\" ne validas"
+
+#~ msgid "%s is an invalid ISO code, using %c"
+#~ msgstr "\"%s\" ne estas valida ISO-kodo; estos \"%c\" anstatauxe"
+
+#~ msgid "Cannot specify more than one macro expansion output"
+#~ msgstr "Ne povas esti pli ol unu makrotraktada eligdosiero"
+
+#~ msgid "File exists, but is not a directory"
+#~ msgstr "La dosiero ekzistas, sed gxi ne estas dosierujo"
+
+#~ msgid "First argument to cross-reference may not be empty"
+#~ msgstr "La unua argumento de internoda referenco ne vaku"
+
+#~ msgid "see "
+#~ msgstr "vidu "
+
+#~ msgid "`.' or `,' must follow cross reference, not %c"
+#~ msgstr "Referencon devas sekvi punkto aux komo, ne %c"
+
+#~ msgid "First argument to @inforef may not be empty"
+#~ msgstr "La unua argumento de @inforef ne vaku"
+
+#~ msgid "Node:"
+#~ msgstr "Nodo:"
+
+#~ msgid "%s: TOC should be here, but it was not found"
+#~ msgstr "%s: cxi tie mankas enhavtabelo"
+
+#~ msgid "virtual memory exhausted"
+#~ msgstr "virtuala memoro elcxerpitas"
+
+#~ msgid "No `%s.png' or `.jpg', and no extension supplied"
+#~ msgstr "Troveblas nek \"%s.png\" nek \".jpg\", kaj sufikso mankas"
+
+#~ msgid "%s; for file `%s'.\n"
+#~ msgstr "%s; por la dosiero \"%s\".\n"
diff --git a/gnu/usr.bin/texinfo/po/he.gmo b/gnu/usr.bin/texinfo/po/he.gmo
index 0e5b97b15d1..37652ea6973 100644
--- a/gnu/usr.bin/texinfo/po/he.gmo
+++ b/gnu/usr.bin/texinfo/po/he.gmo
diff --git a/gnu/usr.bin/texinfo/po/he.po b/gnu/usr.bin/texinfo/po/he.po
index fc96b2a7b5b..9f4f519bfac 100644
--- a/gnu/usr.bin/texinfo/po/he.po
+++ b/gnu/usr.bin/texinfo/po/he.po
@@ -4,141 +4,142 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: texinfo 4.1c\n"
-"POT-Creation-Date: 2002-04-01 06:10-0800\n"
-"PO-Revision-Date: 2002-03-24 18:31+0200\n"
+"Project-Id-Version: texinfo 4.2\n"
+"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
+"POT-Creation-Date: 2004-12-21 16:20-0800\n"
+"PO-Revision-Date: 2002-04-03 12:31+0300\n"
 "Last-Translator: Eli Zaretskii <eliz@gnu.org>\n"
 "Language-Team: Hebrew <eliz@gnu.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: info/echo-area.c:283 info/session.c:712
+#: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr "äîéã÷ ãçà åú ïîñ ææä"
 
-#: info/echo-area.c:295 info/session.c:728
+#: info/echo-area.c:296 info/session.c:705
 msgid "Move backward a character"
 msgstr "äøåçà ãçà åú ïîñ ææä"
 
-#: info/echo-area.c:307
+#: info/echo-area.c:308
 msgid "Move to the start of this line"
 msgstr "äøåùä úìéçúì ïîñ ææä"
 
-#: info/echo-area.c:312
+#: info/echo-area.c:313
 msgid "Move to the end of this line"
 msgstr "äøåùä óåñì ïîñ ææä"
 
-#: info/echo-area.c:320 info/session.c:746
+#: info/echo-area.c:321 info/session.c:723
 msgid "Move forward a word"
 msgstr "äîéã÷ úçà äìéî ïîñ ææä"
 
-#: info/echo-area.c:360 info/session.c:795
+#: info/echo-area.c:361 info/session.c:772
 msgid "Move backward a word"
 msgstr "äøåçà úçà äìéî ïîñ ææä"
 
-#: info/echo-area.c:400
+#: info/echo-area.c:401
 msgid "Delete the character under the cursor"
 msgstr "åéìò ïîñäù åúä ÷çî"
 
-#: info/echo-area.c:430
+#: info/echo-area.c:431
 msgid "Delete the character behind the cursor"
 msgstr "ïîñä éðôìù åúä ÷çî"
 
-#: info/echo-area.c:451
+#: info/echo-area.c:452
 msgid "Cancel or quit operation"
 msgstr "äðåøçà äìåòô ÷ñôä åà ìèá"
 
-#: info/echo-area.c:466
+#: info/echo-area.c:467
 msgid "Accept (or force completion of) this line"
 msgstr "(êøåö ùé íà äúåà íìùä) òåöéáì åæ äøåù ìá÷"
 
-#: info/echo-area.c:471
+#: info/echo-area.c:472
 msgid "Insert next character verbatim"
 msgstr "éìåìéî ïôåàá àáä åúä óñåä"
 
-#: info/echo-area.c:479
+#: info/echo-area.c:480
 msgid "Insert this character"
 msgstr "äæ åú óñåä"
 
-#: info/echo-area.c:497
+#: info/echo-area.c:498
 msgid "Insert a TAB character"
 msgstr "TAB óñåä"
 
-#: info/echo-area.c:504
+#: info/echo-area.c:505
 msgid "Transpose characters at point"
 msgstr "ïîñä ãéìù íéåú éðù ìù øãñ äðù"
 
-#: info/echo-area.c:555
+#: info/echo-area.c:556
 msgid "Yank back the contents of the last kill"
 msgstr "äðåøçà ä÷éçî ìù ïëåú øæçä"
 
-#: info/echo-area.c:562
+#: info/echo-area.c:563
 msgid "Kill ring is empty"
 msgstr "ä÷éø úå÷éçîä úøéâà úòáè"
 
-#: info/echo-area.c:575
+#: info/echo-area.c:576
 msgid "Yank back a previous kill"
 msgstr "úîãå÷ ä÷éçî ïëåú øæçä"
 
-#: info/echo-area.c:608
+#: info/echo-area.c:609
 msgid "Kill to the end of the line"
 msgstr "äøåùä óåñ ãò ÷çî"
 
-#: info/echo-area.c:621
+#: info/echo-area.c:622
 msgid "Kill to the beginning of the line"
 msgstr "äøåù úìéçú ãò ÷çî"
 
-#: info/echo-area.c:633
+#: info/echo-area.c:634
 msgid "Kill the word following the cursor"
 msgstr "ïîñä éøçàù äìéîä ÷çî"
 
-#: info/echo-area.c:652
+#: info/echo-area.c:653
 msgid "Kill the word preceding the cursor"
 msgstr "ïîñä éðôìù äìéîä ÷çî"
 
-#: info/echo-area.c:872 info/echo-area.c:932
+#: info/echo-area.c:868 info/echo-area.c:924
 msgid "No completions"
 msgstr "äîìùä óà ïéà"
 
-#: info/echo-area.c:874
+#: info/echo-area.c:870
 msgid "Not complete"
 msgstr "íìù àì"
 
-#: info/echo-area.c:919
+#: info/echo-area.c:911
 msgid "List possible completions"
 msgstr "úåéøùôà úåîìùä âöä"
 
-#: info/echo-area.c:936
+#: info/echo-area.c:928
 msgid "Sole completion"
 msgstr "äãéçé äîìùä"
 
-#: info/echo-area.c:945
+#: info/echo-area.c:937
 msgid "One completion:\n"
 msgstr "             :úçà äîìùä\n"
 
-#: info/echo-area.c:946
+#: info/echo-area.c:938
 #, c-format
 msgid "%d completions:\n"
 msgstr "             :úåîìùä %d\n"
 
-#: info/echo-area.c:1092
+#: info/echo-area.c:1085
 msgid "Insert completion"
 msgstr "äîìùä óñåä"
 
-#: info/echo-area.c:1225
+#: info/echo-area.c:1220
 msgid "Building completions..."
 msgstr "...úåîìùä úîéùø áéëøî"
 
-#: info/echo-area.c:1342
+#: info/echo-area.c:1340
 msgid "Scroll the completions window"
 msgstr "úåîìùää ïåìç úà ìåìâ"
 
-#: info/footnotes.c:212
+#: info/footnotes.c:213
 msgid "Footnotes could not be displayed"
 msgstr "íééìåù úåøòä âéöäì ïúéð àì"
 
-#: info/footnotes.c:238
+#: info/footnotes.c:239
 msgid "Show the footnotes associated with this node in another window"
 msgstr "åæ ä÷ñéôì íééìåù úåøòä âöä"
 
@@ -146,90 +147,90 @@ msgstr "åæ ä÷ñéôì íééìåù úåøòä âöä"
 msgid "---------- Footnotes ----------"
 msgstr "---------- Footnotes ----------"
 
-#: info/indices.c:175
+#: info/indices.c:172
 msgid "Look up a string in the index for this file"
 msgstr "äæ õáå÷ ìù ñ÷ãðéàá úæåøçî ùôç"
 
-#: info/indices.c:205
+#: info/indices.c:199
 msgid "Finding index entries..."
 msgstr "...íéñ÷ãðéàä ìë úà ÷øåñ"
 
-#: info/indices.c:212
+#: info/indices.c:207
 msgid "No indices found."
 msgstr ".ñ÷ãðéà óà àöîð àì"
 
-#: info/indices.c:222
+#: info/indices.c:217
 msgid "Index entry: "
 msgstr "Index entry: "
 
-#: info/indices.c:332
+#: info/indices.c:325
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr "äðåøçà `\\[index-search]' úãå÷ôî úæåøçî íàåúä óñåð ñ÷ãðéà èéøô ùôç"
 
-#: info/indices.c:342
+#: info/indices.c:335
 msgid "No previous index search string."
 msgstr ".ñ÷ãðéàá ùåôéçì úîãå÷ úæåøçî ïéà"
 
-#: info/indices.c:349
+#: info/indices.c:342
 msgid "No index entries."
 msgstr ".ñ÷ãðéà éèéøô åàöîð àì"
 
-#: info/indices.c:382
-#, c-format
-msgid "No %sindex entries containing \"%s\"."
+#: info/indices.c:375
+#, fuzzy, c-format
+msgid "No %sindex entries containing `%s'."
 msgstr ".\"%s\" úæåøçî íéìéëîä ñ÷ãðéà éèéøô%s ïéà"
 
-#: info/indices.c:383
+#: info/indices.c:376
 msgid "more "
 msgstr " øúåé"
 
-#: info/indices.c:393
+#: info/indices.c:386
 msgid "CAN'T SEE THIS"
 msgstr "!úåàøéäì êéøö åðéàù èñ÷è"
 
-#: info/indices.c:429
-#, c-format
-msgid "Found \"%s\" in %s. (`\\[next-index-match]' tries to find next.)"
+#: info/indices.c:422
+#, fuzzy, c-format
+msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
 msgstr "(.ãåò àåöîì äñðé `\\[next-index-match]') .\"%s\" èéøô %s-á éúàöî"
 
-#: info/indices.c:549
-#, c-format
-msgid "Scanning indices of \"%s\"..."
+#: info/indices.c:541
+#, fuzzy, c-format
+msgid "Scanning indices of `%s'..."
 msgstr "...\"%s\" ìù íéñ÷ãðéàä ìë úà ÷øåñ"
 
-#: info/indices.c:603
-#, c-format
-msgid "No available info files have \"%s\" in their indices."
+#: info/indices.c:596
+#, fuzzy, c-format
+msgid "No available info files have `%s' in their indices."
 msgstr ".åìù ñ÷ãðéàá \"%s\" ìéëî ïàë íéð÷úåîäî Info õáå÷ óà"
 
-#: info/indices.c:632
+#: info/indices.c:622
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr ""
 "úàöîù äîî èéøôú äðáå úæåøçî íäá ùôç ,íéòåãé Info éöá÷ ìù íéñ÷ãðéàä ìëá èèç"
 
-#: info/indices.c:636
+#: info/indices.c:626
 msgid "Index apropos: "
 msgstr "Index apropos: "
 
-#: info/indices.c:666
-#, c-format
+#: info/indices.c:654
+#, fuzzy, c-format
 msgid ""
 "\n"
-"* Menu: Nodes whoses indices contain \"%s\":\n"
+"* Menu: Nodes whose indices contain `%s':\n"
 msgstr ""
 "\n"
 "* Menu: (úåîéàúîä úåà÷ñôäå \"%s\" íéìéëîä ñ÷ãðéà éèéøô)\n"
 
-#: info/info.c:260 info/infokey.c:884
+#: info/info.c:275 info/infokey.c:899
+#, c-format
 msgid "Try --help for more information.\n"
 msgstr ".øúåé áø òãéî úâöäì --help äñð\n"
 
-#: info/info.c:279 info/infokey.c:139 makeinfo/makeinfo.c:689
-#: util/install-info.c:1224 util/texindex.c:338
-#, c-format
+#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
+#: util/texindex.c:343
+#, 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"
@@ -239,18 +240,18 @@ msgstr ""
 "         .GNU General Public License ïåéùøä éàðúì íàúäá\n"
 "           .COPYING õáå÷á åðééò ,åìà íéðéðòá èåøéô øúéì\n"
 
-#: info/info.c:462
+#: info/info.c:498
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "`%s' úæåøçî íéìéëîä ñ÷ãðéà éèéøô ïéà\n"
 
-#: info/info.c:555
+#: info/info.c:590
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
 msgstr ""
 "      .øåáéã æúðñîì åîéàúäì éãë êñîì äáéúë ïôåà äðù -b, --speech-friendly\n"
 
-#: info/info.c:562
-#, c-format
+#: info/info.c:597
+#, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
@@ -266,10 +267,12 @@ msgid ""
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
 "  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
-"  -R, --raw-escapes            don't remove ANSI escapes from man pages.\n"
+"  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+"      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
 "  -O, --show-options, --usage  go to command-line options node.\n"
 "%s      --subnodes               recursively output menu items.\n"
+"  -w, --where, --location      print physical location of Info file.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
 "\n"
@@ -324,8 +327,8 @@ msgstr ""
 "                           ,bug-texinfo@gnu.org-ì äì÷ú éçååéã çåìùì àð\n"
 "                   .help-texinfo@gnu.org-ì ïåéãì íéàùåðå úåéììë úåìàùå\n"
 
-#: info/info.c:598 info/infokey.c:903 makeinfo/makeinfo.c:474
-#: util/install-info.c:421 util/texindex.c:286
+#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
+#: util/install-info.c:466 util/texindex.c:292
 msgid ""
 "\n"
 "Email bug reports to bug-texinfo@gnu.org,\n"
@@ -337,76 +340,76 @@ msgstr ""
 "               .help-texinfo@gnu.org-ì ïåéãì íéàùåðå úåéììë úåìàùå\n"
 "         .http://www.gnu.org/software/texinfo/ :Texinfo ìù úéáä óã"
 
-#: info/info.c:632
+#: info/info.c:669
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr ".äàöîð àì `%s' ä÷ñéô"
 
-#: info/info.c:633
+#: info/info.c:670
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr ".äàöîð àì `%s' õáå÷á `%s' ä÷ñéô"
 
-#: info/info.c:634
+#: info/info.c:671
 msgid "Cannot find a window!"
 msgstr "!ïåìç óà àöîð àì"
 
-#: info/info.c:635
+#: info/info.c:672
 msgid "Point doesn't appear within this window's node!"
 msgstr "!äæ ïåìçá úâöåîä ä÷ñéôá àöîð åðéà ïîñä"
 
-#: info/info.c:636
+#: info/info.c:673
 msgid "Cannot delete the last window."
 msgstr ".ãéçé ïåìç ÷åçîì ïúéð àì"
 
-#: info/info.c:637
+#: info/info.c:674
 msgid "No menu in this node."
 msgstr ".íéèéøôú ïéà åæ ä÷ñéôá"
 
-#: info/info.c:638
+#: info/info.c:675
 msgid "No footnotes in this node."
 msgstr ".íééìåù úåøòä ïéà åæ ä÷ñéôá"
 
-#: info/info.c:639
+#: info/info.c:676
 msgid "No cross references in this node."
 msgstr ".íéøåùé÷ ïéà åæ ä÷ñéôá"
 
-#: info/info.c:640
+#: info/info.c:677
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr ".%sì äééðôä ïéà åæ ä÷ñéôá"
 
-#: info/info.c:641
+#: info/info.c:678
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr ".äøæò úìá÷ì `?' äñð ;Info-ì úøëåî äðéà `%c' äãå÷ô"
 
-#: info/info.c:642
+#: info/info.c:679
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr ".Info õéøäì éãë åéã ììëåùî åðéà `%s' âåñî âö"
 
-#: info/info.c:643
+#: info/info.c:680
 msgid "You are already at the last page of this node."
 msgstr ".åæ ä÷ñéô ìù ïåøçàä ãåîòá øáë ä/úà"
 
-#: info/info.c:644
+#: info/info.c:681
 msgid "You are already at the first page of this node."
 msgstr ".åæ ä÷ñéô ìù ïåùàøä ãåîòá øáë ä/úà"
 
-#: info/info.c:645
+#: info/info.c:682
 msgid "Only one window."
 msgstr ".ãçà ïåìç ÷ø íéé÷"
 
-#: info/info.c:646
+#: info/info.c:683
 msgid "Resulting window would be too small."
 msgstr ".éãî øúåé ïè÷ äéä ïåìçä"
 
-#: info/info.c:647
+#: info/info.c:684
 msgid "Not enough room for a help window, please delete a window."
 msgstr ".åäùìë ïåìç ÷åçîì àð ;äøæò ïåìç âéöäì íå÷î ÷éôñî ïéà"
 
-#: info/infodoc.c:45 info/infodoc.c:94
+#: info/infodoc.c:46 info/infodoc.c:95
 msgid ""
 "Basic Commands in Info Windows\n"
 "******************************\n"
@@ -414,19 +417,19 @@ msgstr ""
 "                     Info úåðåìçá úåéñéñá úåãå÷ô\n"
 "                     ***************************\n"
 
-#: info/infodoc.c:48
+#: info/infodoc.c:49
 msgid "\\%-10[quit-help]  Quit this help.\n"
 msgstr "\\%-10[quit-help]  äæ äøæò ïåìç øåâñ\n"
 
-#: info/infodoc.c:49
+#: info/infodoc.c:50
 msgid "\\%-10[quit]  Quit Info altogether.\n"
 msgstr "\\%-10[quit]  Info úéðëúî éøîâì àö\n"
 
-#: info/infodoc.c:50
+#: info/infodoc.c:51
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
 msgstr "\\%-10[get-info-help-node]  Info ùîúùîì êéøãî âöä\n"
 
-#: info/infodoc.c:52 info/infodoc.c:101
+#: info/infodoc.c:53 info/infodoc.c:102
 msgid ""
 "Selecting other nodes:\n"
 "----------------------\n"
@@ -434,19 +437,19 @@ msgstr ""
 "                           :úåøçà úåà÷ñéôá äøéçá\n"
 "                           ---------------------\n"
 
-#: info/infodoc.c:54
+#: info/infodoc.c:55
 msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
 msgstr "\\%-10[next-node]  úéçëåð ä÷ñéô éøçà äàáä ä÷ñéôì øåáò\n"
 
-#: info/infodoc.c:55
+#: info/infodoc.c:56
 msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
 msgstr "\\%-10[prev-node]  úéçëåð ä÷ñéô éðôìù ä÷ñéôì øåáò\n"
 
-#: info/infodoc.c:56
+#: info/infodoc.c:57
 msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
 msgstr "\\%-10[up-node]  úéçëåð ä÷ñéô ìù áà-ú÷ñéôì øåáò\n"
 
-#: info/infodoc.c:57
+#: info/infodoc.c:58
 msgid ""
 "\\%-10[menu-item]  Pick menu item specified by name.\n"
 "              Picking a menu item causes another node to be selected.\n"
@@ -454,43 +457,43 @@ msgstr ""
 "\\%-10[menu-item]  åîù é\"ôò èéøôúî óéòñ øçá\n"
 "            .úøçà ä÷ñéôì øáòîì úîøåâ èéøôúî äøéçá\n"
 
-#: info/infodoc.c:59
+#: info/infodoc.c:60
 msgid ""
 "\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
 msgstr "\\%-10[xref-item]  øåùé÷ä íù àøå÷ ;øåùé÷ øçà áå÷ò\n"
 
-#: info/infodoc.c:60
+#: info/infodoc.c:61
 msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
 msgstr "\\%-10[history-node]  äæ ïåìçá äâöåäù äðåøçàä ä÷ñéôì øåæç\n"
 
-#: info/infodoc.c:61
+#: info/infodoc.c:62
 msgid ""
 "\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
 msgstr "\\%-10[move-to-next-xref]  úéçëåð ä÷ñéôá àáä øåùé÷ì ïîñ ææä\n"
 
-#: info/infodoc.c:62
+#: info/infodoc.c:63
 msgid ""
 "\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
 "node.\n"
 msgstr "\\%-10[move-to-prev-xref]  úéçëåð ä÷ñéôá íãå÷ä øåùé÷ì ïîñ ææä\n"
 
-#: info/infodoc.c:63
+#: info/infodoc.c:64
 msgid ""
 "\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
 msgstr "\\%-10[select-reference-this-line]  åéìò àöîð ïîñäù øåùé÷ éøçà áå÷ò\n"
 
-#: info/infodoc.c:64
+#: info/infodoc.c:65
 msgid ""
 "\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
 "node] (DIR)'.\n"
 msgstr "\\%-10[dir-node]  `\\[goto-node] (DIR)'-ì êøò-äååù ;DIR ä÷ñéôì øåáò\n"
 
-#: info/infodoc.c:65
+#: info/infodoc.c:66
 msgid ""
 "\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
 msgstr "\\%-10[top-node]  `\\[goto-node] Top'-ì êøò-äååù ;Top ä÷ñéôì øåáò\n"
 
-#: info/infodoc.c:67 info/infodoc.c:115
+#: info/infodoc.c:68 info/infodoc.c:116
 msgid ""
 "Moving within a node:\n"
 "---------------------\n"
@@ -498,31 +501,33 @@ msgstr ""
 "                           :ä÷ñéô êåúá ïîñ úòåðú\n"
 "                           ---------------------\n"
 
-#: info/infodoc.c:69
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
-msgstr "\\%-10[scroll-forward]  äîéã÷ ãçà óã ìåìâ\n"
-
 #: info/infodoc.c:70
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
-msgstr "\\%-10[scroll-backward]  äøåçà ãçà óã ìåìâ\n"
-
-#: info/infodoc.c:71
 msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
 msgstr "\\%-10[beginning-of-node]  úéçëåð ä÷ñéô úìéçúì ïîñ ææä\n"
 
-#: info/infodoc.c:72
+#: info/infodoc.c:71
 msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
 msgstr "\\%-10[end-of-node]  úéçëåð ä÷ñéô óåñì ïîñ ææä\n"
 
+#: info/infodoc.c:72
+#, fuzzy
+msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
+msgstr "  %-10s  äîéã÷ úçà äøåù ïîñ ææä\n"
+
 #: info/infodoc.c:73
-msgid "\\%-10[scroll-forward]  Scroll forward 1 line.\n"
-msgstr "\\%-10[scroll-forward]  äîéã÷ úçà äøåù ïîñ ææä\n"
+#, fuzzy
+msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
+msgstr "  %-10s  äøåçà úçà äøåù ïîñ ææä\n"
 
 #: info/infodoc.c:74
-msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
+msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
+msgstr "\\%-10[scroll-forward]  äîéã÷ ãçà óã ìåìâ\n"
+
+#: info/infodoc.c:75
+msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
 msgstr "\\%-10[scroll-backward]  äøåçà ãçà óã ìåìâ\n"
 
-#: info/infodoc.c:76 info/infodoc.c:124
+#: info/infodoc.c:77 info/infodoc.c:125
 msgid ""
 "Other commands:\n"
 "---------------\n"
@@ -530,15 +535,15 @@ msgstr ""
 "                                   :úåøçà úåãå÷ô\n"
 "                                   -------------\n"
 
-#: info/infodoc.c:78
+#: info/infodoc.c:79
 msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
 msgstr "\\%-10[menu-digit]  úéçëåðä ä÷ñéôä èéøôúá éòéùú ãò ïåùàø óéòñ øçá\n"
 
-#: info/infodoc.c:79
+#: info/infodoc.c:80
 msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
 msgstr "\\%-10[last-menu-item]  úéçëåðä ä÷ñéôä èéøôúá ïåøçà óéòñ øçá\n"
 
-#: info/infodoc.c:80
+#: info/infodoc.c:81
 msgid ""
 "\\%-10[index-search]  Search for a specified string in the index entries of "
 "this Info\n"
@@ -548,7 +553,7 @@ msgstr ""
 "\\%-10[index-search]  øåáòå äæ Info õáå÷ ìù íéñ÷ãðéàá úæåøçî ùôç\n"
 "                 íàåú àöîðù ïåùàø ñ÷ãðéà èéøô äòéáöî äéìà ä÷ñéôì\n"
 
-#: info/infodoc.c:82
+#: info/infodoc.c:83
 msgid ""
 "\\%-10[goto-node]  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
@@ -556,7 +561,7 @@ msgstr ""
 "\\%-10[goto-node]  äîù é\"ôò ä÷ñéôì øåáò\n"
 "              .(FILENAME)NODENAME-á åîë ä÷ñéôä íùî ÷ìçë õáå÷ íù ïééöì ïúéð\n"
 
-#: info/infodoc.c:84
+#: info/infodoc.c:85
 msgid ""
 "\\%-10[search]  Search forward for a specified string\n"
 "              and select the node in which the next occurrence is found.\n"
@@ -564,7 +569,7 @@ msgstr ""
 "\\%-10[search]  äæ Info õå÷á êìéàå ïàëî úæåøçî ùôç\n"
 "                    .úæåøçîä äàöîð äá ä÷ñéôì øåáòå\n"
 
-#: info/infodoc.c:86
+#: info/infodoc.c:87
 msgid ""
 "\\%-10[search-backward]  Search backward for a specified string\n"
 "              and select the node in which the previous occurrence is "
@@ -573,158 +578,158 @@ msgstr ""
 "\\%-10[search-backward]  äæ Info õå÷á äøåçàå ïàëî úæåøçî ùôç\n"
 "                              .úæåøçîä äàöîð äá ä÷ñéôì øåáòå\n"
 
-#: info/infodoc.c:97
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Quit this help.\n"
 msgstr "  %-10s  äæ äøæò ïåìç øåâñ\n"
 
-#: info/infodoc.c:98
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr "  %-10s  Info úéðëúî éøîâì àö\n"
 
-#: info/infodoc.c:99
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr "  %-10s  Info ùîúùîì êéøãî âöä\n"
 
-#: info/infodoc.c:103
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
 msgstr "  %-10s  úéçëåð ä÷ñéô éøçà äàáä ä÷ñéôì øåáò\n"
 
-#: info/infodoc.c:104
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
 msgstr "  %-10s  úéçëåð ä÷ñéô éðôìù ä÷ñéôì øåáò\n"
 
-#: info/infodoc.c:105
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
 msgstr "  %-10s  úéçëåð ä÷ñéô ìù áà-ú÷ñéôì øåáò\n"
 
-#: info/infodoc.c:106
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Pick menu item specified by name.\n"
 msgstr "  %-10s  åîù é\"ôò èéøôúî óéòñ øçá\n"
 
-#: info/infodoc.c:107
+#: info/infodoc.c:108
 msgid "              Picking a menu item causes another node to be selected.\n"
 msgstr "              .úøçà ä÷ñéôì øáòîì úîøåâ èéøôúî äøéçá\n"
 
-#: info/infodoc.c:108
+#: info/infodoc.c:109
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
 msgstr "  %-10s  øåùé÷ä íù àøå÷ ;øåùé÷ øçà áå÷ò\n"
 
-#: info/infodoc.c:109
+#: info/infodoc.c:110
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
 msgstr "  %-10s  äæ ïåìçá äâöåäù äðåøçàä ä÷ñéôì øåæç\n"
 
-#: info/infodoc.c:110
+#: info/infodoc.c:111
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
 msgstr "  %-10s  úéçëåð ä÷ñéôá àáä øåùé÷ì ïîñ ææä\n"
 
-#: info/infodoc.c:111
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
 msgstr "  %-10s  åéìò àöîð ïîñäù øåùé÷ éøçà áå÷ò\n"
 
-#: info/infodoc.c:112
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
 msgstr "  %-10s  `g (DIR)'-ì êøò-äååù ;DIR ä÷ñéôì øåáò\n"
 
-#: info/infodoc.c:113
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
 msgstr "  %-10s  `g Top'-ì êøò-äååù ;Top ä÷ñéôì øåáò\n"
 
-#: info/infodoc.c:117
+#: info/infodoc.c:118
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
 msgstr "  %-10s  äîéã÷ ãçà óã ìåìâ\n"
 
-#: info/infodoc.c:118
+#: info/infodoc.c:119
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
 msgstr "  %-10s  äøåçà ãçà óã ìåìâ\n"
 
-#: info/infodoc.c:119
+#: info/infodoc.c:120
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
 msgstr "  %-10s  úéçëåð ä÷ñéô úìéçúì ïîñ ææä\n"
 
-#: info/infodoc.c:120
+#: info/infodoc.c:121
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
 msgstr "  %-10s úéçëåð ä÷ñéô óåñì ïîñ ææä\n"
 
-#: info/infodoc.c:121
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
 msgstr "  %-10s  äîéã÷ úçà äøåù ïîñ ææä\n"
 
-#: info/infodoc.c:122
+#: info/infodoc.c:123
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
 msgstr "  %-10s  äøåçà úçà äøåù ïîñ ææä\n"
 
-#: info/infodoc.c:126
+#: info/infodoc.c:127
 #, c-format
 msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
 msgstr "  %-10s  úéçëåðä ä÷ñéôä èéøôúá éòéùú ãò ïåùàø óéòñ øçá\n"
 
-#: info/infodoc.c:127
+#: info/infodoc.c:128
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
 msgstr "  %-10s  úéçëåðä ä÷ñéôä èéøôúá ïåøçà óéòñ øçá\n"
 
-#: info/infodoc.c:128
+#: info/infodoc.c:129
 #, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
 msgstr "  %-10s  øåáòå äæ Info õáå÷ ìù íéñ÷ãðéàá úæåøçî ùôç\n"
 
-#: info/infodoc.c:129
+#: info/infodoc.c:130
 msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
 msgstr "              íàåú àöîðù ïåùàø ñ÷ãðéà èéøô äòéáöî äéìà ä÷ñéôì\n"
 
-#: info/infodoc.c:130
+#: info/infodoc.c:131
 #, c-format
 msgid "  %-10s  Move to node specified by name.\n"
 msgstr "  %-10s  äîù é\"ôò ä÷ñéôì øåáò\n"
 
-#: info/infodoc.c:131
+#: info/infodoc.c:132
 msgid ""
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr ""
 "              .(FILENAME)NODENAME-á åîë ä÷ñéôä íùî ÷ìçë õáå÷ íù ïééöì ïúéð\n"
 
-#: info/infodoc.c:132
+#: info/infodoc.c:133
 #, c-format
 msgid "  %-10s  Search forward for a specified string,\n"
 msgstr "  %-10s  äæ Info õáå÷á êìéàå ïàëî úæåøçî ùôç\n"
 
-#: info/infodoc.c:133 info/infodoc.c:135
+#: info/infodoc.c:134 info/infodoc.c:136
 msgid ""
 "              and select the node in which the next occurrence is found.\n"
 msgstr "              .úæåøçîä äàöîð äá ä÷ñéôì øåáòå\n"
 
-#: info/infodoc.c:134
+#: info/infodoc.c:135
 #, c-format
 msgid "  %-10s  Search backward for a specified string\n"
 msgstr "  %-10s  äæ Info õáå÷á äøåçàå ïàëî úæåøçî ùôç\n"
 
-#: info/infodoc.c:313
+#: info/infodoc.c:316
 msgid "The current search path is:\n"
 msgstr "                               :àéä úéçëåð ùåôéç úîéùø\n"
 
-#: info/infodoc.c:316
+#: info/infodoc.c:320
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
@@ -732,7 +737,7 @@ msgstr ""
 "                                 :Info úåðåìçá úåéøùôà úåãå÷ô\n"
 "\n"
 
-#: info/infodoc.c:319
+#: info/infodoc.c:324
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
@@ -740,7 +745,7 @@ msgstr ""
 "                                :úåãå÷ôä úøåùá úåéøùôà úåãå÷ô\n"
 "\n"
 
-#: info/infodoc.c:340
+#: info/infodoc.c:347
 #, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
@@ -749,7 +754,7 @@ msgstr ""
 "                :ãáìá %s úåòöîàá ìéòôäì ïúéð úåàáä úåãå÷ôä úà\n"
 "\n"
 
-#: info/infodoc.c:343
+#: info/infodoc.c:351
 msgid ""
 "The following commands cannot be invoked at all:\n"
 "\n"
@@ -757,155 +762,168 @@ msgstr ""
 "                        :ììë äìòôäì úåðúéð ïðéà úåàáä úåãå÷ôä\n"
 "\n"
 
-#: info/infodoc.c:367
+#: info/infodoc.c:375
 msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
 msgstr "--- `\\[kill-node]' åà `\\[history-node]' ù÷ä äàéöéì ---\n"
 
-#: info/infodoc.c:477
+#: info/infodoc.c:485
 msgid "Display help message"
 msgstr "äøæò êñî âöä"
 
-#: info/infodoc.c:495
+#: info/infodoc.c:503
 msgid "Visit Info node `(info)Help'"
 msgstr "Info úëøòîá ùåîéùì êéøãî âöä"
 
-#: info/infodoc.c:638
+#: info/infodoc.c:641
 msgid "Print documentation for KEY"
 msgstr "íéåñî ù÷î øåáò ãåòéú âöä"
 
-#: info/infodoc.c:650
+#: info/infodoc.c:653
 #, c-format
 msgid "Describe key: %s"
 msgstr "Describe key: %s"
 
-#: info/infodoc.c:660
+#: info/infodoc.c:664
 #, c-format
 msgid "ESC %s is undefined."
 msgstr ".øãâåî åðéà \"ESC %s\""
 
-#: info/infodoc.c:676 info/infodoc.c:703
+#: info/infodoc.c:680 info/infodoc.c:709
 #, c-format
 msgid "%s is undefined."
 msgstr ".øãâåî åðéà \"%s\""
 
-#: info/infodoc.c:724
+#: info/infodoc.c:730
 #, c-format
 msgid "%s is defined to %s."
 msgstr "%s is defined to %s."
 
-#: info/infodoc.c:1151
+#: info/infodoc.c:1153
 msgid "Show what to type to execute a given command"
 msgstr "úîéåñî äãå÷ô úìòôäì ãéì÷äì äî âöä"
 
-#: info/infodoc.c:1155
+#: info/infodoc.c:1157
 msgid "Where is command: "
 msgstr "Where is command: "
 
-#: info/infodoc.c:1177
+#: info/infodoc.c:1179
 #, c-format
 msgid "`%s' is not on any keys"
 msgstr "åäùìë ù÷îì äøåù÷ äðéà `%s' äãå÷ôä"
 
-#: info/infodoc.c:1183
+#: info/infodoc.c:1186
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr ".`%s' úìòôäì äãéçéä êøãä àåä `%s'"
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1190
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr ".%s äãå÷ôä úà ìéòôé %s"
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1195
 #, c-format
 msgid "There is no function named `%s'"
 msgstr ".úîéé÷ äðéà `%s' íùá äéö÷ðåô"
 
-#: info/infokey.c:164
+#: info/infokey.c:145
+#, 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 (C) %s Free Software Foundation, Inc.\n"
+"åæ äðëåú õéôäì íëúåëæ .úåéøçà áúëá äååìî äðéà åæ úéðëåú\n"
+"         .GNU General Public License ïåéùøä éàðúì íàúäá\n"
+"           .COPYING õáå÷á åðééò ,åìà íéðéðòá èåøéô øúéì\n"
+
+#: info/infokey.c:170
 msgid "incorrect number of arguments"
 msgstr "éåâù äãå÷ôì íéèðîåâøàä øôñî"
 
-#: info/infokey.c:194
+#: info/infokey.c:201
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "`%s' èì÷ õáå÷ úçéúôá äì÷ú"
 
-#: info/infokey.c:207
+#: info/infokey.c:215
 #, c-format
 msgid "cannot create output file `%s'"
 msgstr "`%s' èìô õáå÷ úøéöéá äì÷ú"
 
-#: info/infokey.c:217
+#: info/infokey.c:226
 #, c-format
 msgid "error writing to `%s'"
 msgstr "`%s'-ì äáéúëá äì÷ú"
 
-#: info/infokey.c:222
+#: info/infokey.c:232
 #, c-format
 msgid "error closing output file `%s'"
 msgstr "`%s' èìô õáå÷ úøéâñá äì÷ú"
 
-#: info/infokey.c:443
+#: info/infokey.c:450
 msgid "key sequence too long"
 msgstr "éãî äëåøà íéù÷î úøãñ"
 
-#: info/infokey.c:521
+#: info/infokey.c:529
 msgid "missing key sequence"
 msgstr "äøñç íéù÷î úøãñ"
 
-#: info/infokey.c:600
+#: info/infokey.c:610
 msgid "NUL character (\\000) not permitted"
 msgstr "øåñà (\\000) ÷éø åúá ùåîéùä"
 
-#: info/infokey.c:629
+#: info/infokey.c:641
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr "øåñà (^%c) ÷éø åúá ùåîéùä"
 
-#: info/infokey.c:652
+#: info/infokey.c:665
 msgid "missing action name"
 msgstr "äãå÷ô íù øñç"
 
-#: info/infokey.c:667 info/infokey.c:733
+#: info/infokey.c:681 info/infokey.c:756
 msgid "section too long"
 msgstr "éãî êåøà ÷ìç"
 
-#: info/infokey.c:673
+#: info/infokey.c:688
 #, c-format
 msgid "unknown action `%s'"
 msgstr "äòåãé äððéà `%s' äãå÷ô"
 
-#: info/infokey.c:682
+#: info/infokey.c:698
 msgid "action name too long"
 msgstr "éãî êåøà äãå÷ô íù"
 
-#: info/infokey.c:694
+#: info/infokey.c:712
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr "`%s' äãå÷ôì êùîäá íéøúåéî íéåú"
 
-#: info/infokey.c:704
+#: info/infokey.c:723
 msgid "missing variable name"
 msgstr "äðúùîä íù øñç"
 
-#: info/infokey.c:712
+#: info/infokey.c:733
 msgid "missing `=' immediately after variable name"
 msgstr "äðúùîä íù éøçà ãéî `=' øñç"
 
-#: info/infokey.c:719
+#: info/infokey.c:741
 msgid "variable name too long"
 msgstr "éãî êåøà äðúùîä íù"
 
-#: info/infokey.c:741
+#: info/infokey.c:765
 msgid "value too long"
 msgstr "éãî êåøà êøò"
 
-#: info/infokey.c:875
+#: info/infokey.c:890
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr "\"%s\" õáå÷á %u äøåùá "
 
-#: info/infokey.c:891
+#: info/infokey.c:906
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -929,80 +947,86 @@ msgstr ""
 "                  .àöå úéðëúä úñøéâ ìò òãéî âöä   --version\n"
 "\n"
 
-#: info/infomap.c:1397
+#: info/infomap.c:1500
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
 msgstr "ïé÷ú infokey õáå÷ úåéäì éãëá éãî ïè÷ -- `%s' õáå÷î íìòúî"
 
-#: info/infomap.c:1400
+#: info/infomap.c:1503
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
 msgstr "ïé÷ú infokey õáå÷ úåéäì éãëá éãî ìåãâ -- `%s' õáå÷î íìòúî"
 
-#: info/infomap.c:1413
+#: info/infomap.c:1516
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
 msgstr "àø÷ð õáå÷ä ìë àì - `%s' infokey õáå÷ úàéø÷á äì÷ú"
 
-#: info/infomap.c:1431
+#: info/infomap.c:1535
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
 msgstr ""
 "åðåëãò êøåöì infokey õøä -- (éåâù íñ÷ øôñî) ïé÷ú åðéà `%s' infokey õáå÷"
 
-#: info/infomap.c:1437
+#: info/infomap.c:1544
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
 msgstr "åðåëãò êøåöì infokey õøä -- ïëãåòî åðéà `%s' infokey õáå÷"
 
-#: info/infomap.c:1450
+#: info/infomap.c:1560
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
 msgstr ""
 "åðåëãò êøåöì infokey õøä -- (éåâù ÷ìç êøåà) ïé÷ú åðéà `%s' infokey õáå÷"
 
-#: info/infomap.c:1470
+#: info/infomap.c:1581
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
 msgstr "åðåëãò êøåöì infokey õøä -- (éåâù ÷ìç ãå÷) ïé÷ú åðéà `%s' infokey õáå÷"
 
-#: info/infomap.c:1608
+#: info/infomap.c:1716
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr "äðìòôú àì úåãçà íéù÷î úåøãâä -- infokey õáå÷á íééåâù íéðåúð"
 
-#: info/infomap.c:1659
+#: info/infomap.c:1766
 msgid "Bad data in infokey file -- some var settings ignored"
 msgstr "ó÷åúá àì úåãçà íéðúùî úåøãâä -- infokey õáå÷á íééåâù íéðåúð"
 
-#: info/m-x.c:70
+#: info/m-x.c:69
 msgid "Read the name of an Info command and describe it"
 msgstr "äúåà øàúå Info úãå÷ô ìù íù àø÷"
 
-#: info/m-x.c:74
+#: info/m-x.c:73
 msgid "Describe command: "
 msgstr "Describe command: "
 
-#: info/m-x.c:97
+#: info/m-x.c:96
 msgid "Read a command name in the echo area and execute it"
 msgstr "äúåà òöáå úåãå÷ôä úøåùî äãå÷ô ìù íù àø÷"
 
-#: info/m-x.c:141
+#: info/m-x.c:140
 msgid "Cannot execute an `echo-area' command here."
 msgstr ".äæ áöîá `echo-area' úãå÷ô òöáì ïúéð àì"
 
-#: info/m-x.c:157
+#: info/m-x.c:154
+#, fuzzy, c-format
+msgid "Undefined command: %s"
+msgstr "`%s' úøëåî-éúìá äàøåä"
+
+#: info/m-x.c:160
 msgid "Set the height of the displayed window"
 msgstr "âöåîä ïåìçä äáåâ úà äðù"
 
-#: info/m-x.c:170
+#: info/m-x.c:173
 #, c-format
 msgid "Set screen height to (%d): "
 msgstr "Set screen height to (%d): "
 
-#: info/makedoc.c:161 info/makedoc.c:169
+#: info/makedoc.c:162 info/makedoc.c:170
+#, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
 "\n"
@@ -1010,12 +1034,12 @@ msgstr ""
 "                  :íéììåë äæ õáå÷ì åãáåòù øå÷î éöá÷\n"
 "\n"
 
-#: info/makedoc.c:553
+#: info/makedoc.c:550
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr ".%s õáå÷ ãáòì ïúéð àì\n"
 
-#: info/nodemenu.c:28
+#: info/nodemenu.c:31
 msgid ""
 "\n"
 "* Menu:\n"
@@ -1027,7 +1051,7 @@ msgstr ""
 "  (õáå÷)ä÷ñéô                    úåøåù 'ñî  ìãåâ        áà-õáå÷\n"
 "  -----------                    ---------  ----        -------"
 
-#: info/nodemenu.c:199
+#: info/nodemenu.c:202
 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"
@@ -1035,24 +1059,24 @@ msgstr ""
 "                .äðåøçàì úø÷éá ïäá úåà÷ñéôä úîéùøî ïëåäù èéøôú ïìäì\n"
 "            .øçà ïåìçá `\\[history-node]' ìòôä åà èéøôúäî ä÷ñéô øçá\n"
 
-#: info/nodemenu.c:219
+#: info/nodemenu.c:224
 msgid "Make a window containing a menu of all of the currently visited nodes"
 msgstr "äðåøçàì úø÷éá ïäá úåà÷ñéôä ìë ìù èéøôú íò ïåìç âöä"
 
-#: info/nodemenu.c:299
+#: info/nodemenu.c:304
 msgid "Select a node which has been previously visited in a visible window"
 msgstr "úåðåìçä ãçàá íãå÷ úâöä äúåà ä÷ñéô øçá"
 
-#: info/nodemenu.c:311
+#: info/nodemenu.c:317
 msgid "Select visited node: "
 msgstr "Select visited node: "
 
-#: info/nodemenu.c:331 info/session.c:2235
+#: info/nodemenu.c:337 info/session.c:2264
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr "!íìòð (%s) øåùé÷ä ìù ãòéä"
 
-#: info/session.c:170
+#: info/session.c:162
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1061,343 +1085,343 @@ msgstr ""
 ".âöåîä èéøôúäî äøéçáì \\[menu-item] ,àøæò úìá÷ì \\[get-help-window] ù÷ä .%s "
 "àñøéâ Info úéðëúì íéàáä íéëåøá"
 
-#: info/session.c:643
+#: info/session.c:620
 msgid "Move down to the next line"
 msgstr "äàáä äøåùì ïîñ ææä"
 
-#: info/session.c:658
+#: info/session.c:635
 msgid "Move up to the previous line"
 msgstr "úîãå÷ä äøåùì ïîñ ææä"
 
-#: info/session.c:673
+#: info/session.c:650
 msgid "Move to the end of the line"
 msgstr "äøåùä óåñì ïîñ ææä"
 
-#: info/session.c:693
+#: info/session.c:670
 msgid "Move to the start of the line"
 msgstr "äææ ñîï ìúçéìú äùåøä"
 
-#: info/session.c:885 makeinfo/node.c:1357
+#: info/session.c:860 makeinfo/node.c:1424
 msgid "Next"
 msgstr "Next äãù"
 
-#: info/session.c:888
+#: info/session.c:863
 msgid "Following Next node..."
 msgstr "...äàáä ä÷ñéôì øáåò"
 
-#: info/session.c:905
+#: info/session.c:881
 msgid "Selecting first menu item..."
 msgstr "...èéøôúäî ïåùàø óéòñ øçåá"
 
-#: info/session.c:916
+#: info/session.c:893
 msgid "Selecting Next node..."
 msgstr "...äàáä ä÷ñéôá øçåá"
 
-#: info/session.c:986
+#: info/session.c:964
 #, c-format
 msgid "Moving Up %d time(s), then Next."
 msgstr ".äàáä ä÷ñéôä øçåá æàå ,úåà÷ñéôä õòá úå/äîø %d äìåò"
 
-#: info/session.c:1010
+#: info/session.c:988
 msgid "No more nodes within this document."
 msgstr ".äæ êîñîá úåà÷ñéô øúåé ïéà"
 
-#: info/session.c:1034
+#: info/session.c:1011
 msgid "No `Prev' for this node."
 msgstr ".åæ ä÷ñéôá `Prev' øåùé÷ ïéà"
 
-#: info/session.c:1037 info/session.c:1092
+#: info/session.c:1014 info/session.c:1073
 msgid "Moving Prev in this window."
 msgstr ".äæ ïåìçá úîãå÷ ä÷ñéôì øáåò"
 
-#: info/session.c:1051
+#: info/session.c:1030
 msgid "No `Prev' or `Up' for this node within this document."
 msgstr ".åæ ä÷ñéô øåáò `Up'-å `Prev' ììåë åðéà äæ êîñî"
 
-#: info/session.c:1054
+#: info/session.c:1034
 msgid "Moving Up in this window."
 msgstr ".äæ ïåìçá íàä ú÷ñôì øáåò"
 
-#: info/session.c:1102
+#: info/session.c:1084
 msgid "Moving to `Prev's last menu item."
 msgstr ".úîãå÷ ä÷ñéô ìù èéøôúá ïåøçà óéòñì øáåò"
 
-#: info/session.c:1113
+#: info/session.c:1095
 msgid "Move forwards or down through node structure"
 msgstr ".úåà÷ñéôä äðáîá øúåé ÷åîò åà äîéã÷ òåð"
 
-#: info/session.c:1129
+#: info/session.c:1111
 msgid "Move backwards or up through node structure"
 msgstr ".úåà÷ñéôä äðáîá äìòî éôìë åà äøåçà òåð"
 
-#: info/session.c:1229
+#: info/session.c:1205
 msgid "Scroll forward in this window"
 msgstr ".äæ ïåìçá äîéã÷ ìåìâ"
 
-#: info/session.c:1237
+#: info/session.c:1213
 msgid "Scroll forward in this window and set default window size"
 msgstr "ïåìç ìãåâ ìù ç\"îøá êøò äðùå äæ ïåìçá äîéã÷ ìåìâ"
 
-#: info/session.c:1245
+#: info/session.c:1221
 msgid "Scroll forward in this window staying within node"
 msgstr "úéçëåðä ä÷ñéôäî úàöì éìáî äæ ïåìçá äîéã÷ ìåìâ"
 
-#: info/session.c:1253
+#: info/session.c:1229
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr ""
 "ïåìç ìãåâ ìù ç\"îøá êøò äðùå úéçëåðä ä÷ñéôäî úàöì éìáî äæ ïåìçá äîéã÷ ìåìâ"
 
-#: info/session.c:1261
+#: info/session.c:1237
 msgid "Scroll backward in this window"
 msgstr "äæ ïåìçá äøåçà ìåìâ"
 
-#: info/session.c:1269
+#: info/session.c:1245
 msgid "Scroll backward in this window and set default window size"
 msgstr "ïåìç ìãåâ ìù ç\"îøá êøò äðùå äæ ïåìçá äøåçà ìåìâ"
 
-#: info/session.c:1278
+#: info/session.c:1254
 msgid "Scroll backward in this window staying within node"
 msgstr "úéçëåðä ä÷ñéôäî úàöì éìáî äæ ïåìçá äøåçà ìåìâ"
 
-#: info/session.c:1286
+#: info/session.c:1262
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
 msgstr ""
 "ïåìç ìãåâ ìù ç\"îøá êøò äðùå úéçëåðä ä÷ñéôäî úàöì éìáî äæ ïåìçá äøåçà ìåìâ"
 
-#: info/session.c:1294
+#: info/session.c:1270
 msgid "Move to the start of this node"
 msgstr "åæ ä÷ñéô úìéçúì ïîñ ææä"
 
-#: info/session.c:1301
+#: info/session.c:1277
 msgid "Move to the end of this node"
 msgstr "åæ ä÷ñéô óåñì ïîñ ææä"
 
-#: info/session.c:1308
+#: info/session.c:1284
 msgid "Scroll down by lines"
 msgstr "äèî éôìë úåøåù N ìåìâ"
 
-#: info/session.c:1325
+#: info/session.c:1301
 msgid "Scroll up by lines"
 msgstr "äìòî éôìë úåøåù N ìåìâ"
 
-#: info/session.c:1343
+#: info/session.c:1319
 msgid "Scroll down by half screen size"
 msgstr "äèî éôìë äâåöú éöç ìåìâ"
 
-#: info/session.c:1369
+#: info/session.c:1345
 msgid "Scroll up by half screen size"
 msgstr "äìòî éôìë äâåöú éöç ìåìâ"
 
-#: info/session.c:1398
+#: info/session.c:1374
 msgid "Select the next window"
 msgstr "àáä ïåìçá øçá"
 
-#: info/session.c:1437
+#: info/session.c:1413
 msgid "Select the previous window"
 msgstr "íãå÷ä ïåìçá øçá"
 
-#: info/session.c:1488
+#: info/session.c:1464
 msgid "Split the current window"
 msgstr "íééðùì éçëåðä ïåìçä ÷ìç"
 
-#: info/session.c:1569
+#: info/session.c:1545
 msgid "Delete the current window"
 msgstr "éçëåðä ïåìçä úà øñä"
 
-#: info/session.c:1577
+#: info/session.c:1553
 msgid "Cannot delete a permanent window"
 msgstr "òåá÷ ïåìç øéñäì ïúéð àì"
 
-#: info/session.c:1610
+#: info/session.c:1585
 msgid "Delete all other windows"
 msgstr "éçëåðä ãáìî úåðåìçä ìë úà øñä"
 
-#: info/session.c:1656
+#: info/session.c:1631
 msgid "Scroll the other window"
 msgstr "àáä ïåìçá ìåìâ"
 
-#: info/session.c:1677
+#: info/session.c:1652
 msgid "Scroll the other window backward"
 msgstr "àáä ïåìçá äøåçà ìåìâ"
 
-#: info/session.c:1683
+#: info/session.c:1658
 msgid "Grow (or shrink) this window"
 msgstr "äæ ïåìç (ïè÷ä åà) ìãâä"
 
-#: info/session.c:1694
+#: info/session.c:1669
 msgid "Divide the available screen space among the visible windows"
 msgstr "íéâöåîä úåðåìçä ìë ïéá äâåöúä çèù ÷ìç"
 
-#: info/session.c:1701
+#: info/session.c:1676
 msgid "Toggle the state of line wrapping in the current window"
 msgstr "éçëåðä ïåìçá åùìâù úåøåù úâöä áöî äðù"
 
-#: info/session.c:1880
+#: info/session.c:1848
 msgid "Select the Next node"
 msgstr "äàáä ä÷ñéôá øåáò"
 
-#: info/session.c:1888
+#: info/session.c:1856
 msgid "Select the Prev node"
 msgstr "úîãå÷ä ä÷ñéôì øåáò"
 
-#: info/session.c:1896
+#: info/session.c:1864
 msgid "Select the Up node"
 msgstr "ìòîù ä÷ñéôì øåáò"
 
-#: info/session.c:1903
+#: info/session.c:1871
 msgid "Select the last node in this file"
 msgstr "äæ êîñîá äðåøçàä ä÷ñéôì øåáò"
 
-#: info/session.c:1930 info/session.c:1963
+#: info/session.c:1898 info/session.c:1931
 msgid "This window has no additional nodes"
 msgstr "äæ ïåìçá úåà÷ñéô øúåé ïéà"
 
-#: info/session.c:1936
+#: info/session.c:1904
 msgid "Select the first node in this file"
 msgstr "äæ êîñîá äðåùàøä ä÷ñéôì øåáò"
 
-#: info/session.c:1970
+#: info/session.c:1938
 msgid "Select the last item in this node's menu"
 msgstr "åæä ä÷ñéôä èéøôúî ïåøçàä óéòñá øçá"
 
-#: info/session.c:1976
+#: info/session.c:1944
 msgid "Select this menu item"
 msgstr "èéøôúäî äæ óéòñá øçá"
 
-#: info/session.c:2005
+#: info/session.c:1977
 #, c-format
 msgid "There aren't %d items in this menu."
 msgstr ".íéôéòñ %d ïéà äæ èéøôúá"
 
-#: info/session.c:2148
+#: info/session.c:2171 info/session.c:2172
 #, c-format
 msgid "Menu item (%s): "
 msgstr "Menu item (%s): "
 
-#: info/session.c:2150
+#: info/session.c:2175
 msgid "Menu item: "
 msgstr "Menu item: "
 
-#: info/session.c:2155
+#: info/session.c:2182 info/session.c:2183
 #, c-format
 msgid "Follow xref (%s): "
 msgstr "Follow xref (%s): "
 
-#: info/session.c:2157
+#: info/session.c:2186
 msgid "Follow xref: "
 msgstr "Follow xref: "
 
-#: info/session.c:2280
+#: info/session.c:2315
 msgid "Read a menu item and select its node"
 msgstr "äîéàúîä ä÷ñéôì øåáòå èéøôúî óéòñ íù àø÷"
 
-#: info/session.c:2288
+#: info/session.c:2323
 msgid "Read a footnote or cross reference and select its node"
 msgstr "äîéàúîä ä÷ñéôì øåáòå øåùé÷ åà äøòä ìù íù àø÷"
 
-#: info/session.c:2294
+#: info/session.c:2329
 msgid "Move to the start of this node's menu"
 msgstr "åæ ä÷ñéôá èéøôúä úìéçúì ïîñ ææä"
 
-#: info/session.c:2318
+#: info/session.c:2353
 msgid "Visit as many menu items at once as possible"
 msgstr "äæ èéøôúî íéôéòñ ìù øùôàä ìëë áø øôñî âöä"
 
-#: info/session.c:2346
+#: info/session.c:2381
 msgid "Read a node name and select it"
 msgstr "äéìà øåáòå ä÷ñéô ìù íù àø÷"
 
-#: info/session.c:2401 info/session.c:2405
+#: info/session.c:2436 info/session.c:2441
 msgid "Goto node: "
 msgstr "Goto node: "
 
-#: info/session.c:2471
+#: info/session.c:2505
 #, c-format
 msgid "No menu in node `%s'."
 msgstr ".íéèéøôú `%s' ïéà ä÷ñéôá"
 
-#: info/session.c:2516
+#: info/session.c:2551
 #, c-format
 msgid "No menu item `%s' in node `%s'."
 msgstr ".`%s' óéòñ ïéà `%s' ä÷ñéô ìù èéøôúá"
 
-#: info/session.c:2546
+#: info/session.c:2581
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
 msgstr ".`%s' óéòñá äéìà øù÷î `%s'-á èéøôúä øùà ä÷ñéô éúàöî àì"
 
-#: info/session.c:2597
+#: info/session.c:2631
 msgid "Read a list of menus starting from dir and follow them"
 msgstr "íäéøçà áå÷òå dir-î äìéçúîä èéøôú éôéòñ úøãéñ àø÷"
 
-#: info/session.c:2599
+#: info/session.c:2633
 msgid "Follow menus: "
 msgstr "Follow menus: "
 
-#: info/session.c:2797
+#: info/session.c:2826
 msgid "Find the node describing program invocation"
 msgstr "úéðëúä õéøäì ãöéë úøàúîä ä÷ñéôä úà àöî"
 
-#: info/session.c:2799
+#: info/session.c:2828
 #, c-format
 msgid "Find Invocation node of [%s]: "
 msgstr "Find Invocation node of [%s]: "
 
-#: info/session.c:2837
+#: info/session.c:2866
 msgid "Read a manpage reference and select it"
 msgstr "åúåà âöäå manpage-ì äééðôä àø÷"
 
-#: info/session.c:2841
+#: info/session.c:2870
 msgid "Get Manpage: "
 msgstr "Get Manpage: "
 
-#: info/session.c:2871
+#: info/session.c:2900
 msgid "Select the node `Top' in this file"
 msgstr "äæ êîñîá (`Top') úéùàøä ä÷ñéôì øåáò"
 
-#: info/session.c:2877
+#: info/session.c:2906
 msgid "Select the node `(dir)'"
 msgstr "`(dir)' ä÷ñéôì øåáò"
 
-#: info/session.c:2897
+#: info/session.c:2923 info/session.c:2925
 #, c-format
 msgid "Kill node (%s): "
 msgstr "Kill node (%s): "
 
-#: info/session.c:2951
+#: info/session.c:2977
 #, c-format
 msgid "Cannot kill node `%s'"
 msgstr "`%s' ä÷ñéô ÷ìñì úåøùôà ïéà"
 
-#: info/session.c:2961
+#: info/session.c:2987
 msgid "Cannot kill the last node"
 msgstr "äãéçé ä÷ñéô ÷ìñì úåøùôà ïéà"
 
-#: info/session.c:3047
+#: info/session.c:3073
 msgid "Select the most recently selected node"
 msgstr "äâöåäù äðåøçàä ä÷ñéôì øåæç"
 
-#: info/session.c:3053
+#: info/session.c:3079
 msgid "Kill this node"
 msgstr "åæ ä÷ñéô ÷ìñ"
 
-#: info/session.c:3061
+#: info/session.c:3087
 msgid "Read the name of a file and select it"
 msgstr "åúåà âöäå õáå÷ ìù íù àø÷"
 
-#: info/session.c:3065
+#: info/session.c:3091
 msgid "Find file: "
 msgstr "Find file: "
 
-#: info/session.c:3082
+#: info/session.c:3108
 #, c-format
 msgid "Cannot find `%s'."
 msgstr ".àöîð àì `%s' õáå÷"
 
-#: info/session.c:3127 info/session.c:3248
+#: info/session.c:3151 info/session.c:3269
 #, c-format
 msgid "Could not create output file `%s'."
 msgstr ".`%s' èìô õáå÷ úøéöéá äì÷ú"
@@ -1405,103 +1429,103 @@ msgstr ".`%s' èìô õáå÷ úøéöéá äì÷ú"
 # Note that this needs to make sense when displayed to the _right_ of
 # the translated "Writing node foo..." and  "Printing node foo...",
 # no matter whether the following word is masculine or feminine!
-#: info/session.c:3140 info/session.c:3265 info/session.c:3326
+#: info/session.c:3165 info/session.c:3287 info/session.c:3347
 msgid "Done."
 msgstr "á äçìöä"
 
 # No ellipsis because that would look awkward when the translation of
 # "Done." is appended.
-#: info/session.c:3196
+#: info/session.c:3220
 #, c-format
 msgid "Writing node %s..."
 msgstr "`%s' ä÷ñéô èìô"
 
-#: info/session.c:3274
+#: info/session.c:3296
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
 msgstr "INFO_PRINT_COMMAND êøã åæ ä÷ñéô ïëåú ñôãä"
 
-#: info/session.c:3310
+#: info/session.c:3331
 #, c-format
 msgid "Cannot open pipe to `%s'."
 msgstr ".`%s'-ì ÷éôà úçéúôá äì÷ú"
 
 # No ellipsis because that would look awkward when the translation of
 # "Done." is appended.
-#: info/session.c:3316
+#: info/session.c:3337
 #, c-format
 msgid "Printing node %s..."
 msgstr "%s ä÷ñéô úñôãä"
 
-#: info/session.c:3558
+#: info/session.c:3567
 #, c-format
 msgid "Searching subfile %s ..."
 msgstr "... %s õáå÷-úú ÷øåñ"
 
-#: info/session.c:3610
+#: info/session.c:3619
 msgid "Read a string and search for it case-sensitively"
 msgstr "úåéùéøá úåáùçúä êåú äúåà ùôçå úæåøçî àø÷"
 
-#: info/session.c:3617
+#: info/session.c:3626
 msgid "Read a string and search for it"
 msgstr "äúåà ùôçå úæåøçî àø÷"
 
-#: info/session.c:3625
+#: info/session.c:3634
 msgid "Read a string and search backward for it"
 msgstr "äøåçà äúåà ùôçå úæåøçî àø÷"
 
-#: info/session.c:3667
+#: info/session.c:3670 info/session.c:3677
 #, c-format
 msgid "%s%sfor string [%s]: "
 msgstr "%s%sfor string [%s]: "
 
 # The following 4 are untranslated because they are used with the
 # format string above in a prompt, and we don't translate prompts.
-#: info/session.c:3668
+#: info/session.c:3671 info/session.c:3678
 msgid "Search backward"
 msgstr "Search backward"
 
-#: info/session.c:3668
+#: info/session.c:3672 info/session.c:3678
 msgid "Search"
 msgstr "Search"
 
-#: info/session.c:3669
+#: info/session.c:3673 info/session.c:3679
 msgid " case-sensitively "
 msgstr " case-sensitively "
 
-#: info/session.c:3669
+#: info/session.c:3674 info/session.c:3679
 msgid " "
 msgstr " "
 
-#: info/session.c:3709
+#: info/session.c:3718
 msgid "Search failed."
 msgstr ".äàöîð àì úæåøçîä"
 
-#: info/session.c:3727
+#: info/session.c:3736
 msgid "Repeat last search in the same direction"
 msgstr "ïååéë åúåàá ïåøçà ùåôéç ìò øåæç"
 
-#: info/session.c:3730 info/session.c:3740
+#: info/session.c:3739 info/session.c:3749
 msgid "No previous search string"
 msgstr "ïåøçà ùåôéçî úæåøçî ïéà"
 
-#: info/session.c:3737
+#: info/session.c:3746
 msgid "Repeat last search in the reverse direction"
 msgstr "êåôä ïååéëá ïåøçà ùåôéç ìò øåæç"
 
-#: info/session.c:3755 info/session.c:3761
+#: info/session.c:3765 info/session.c:3771
 msgid "Search interactively for a string as you type it"
 msgstr "äúåà ä/ãéì÷î ä/úàù éãë êåú úæåøçî ùôç"
 
-#: info/session.c:3855
+#: info/session.c:3851
 msgid "I-search backward: "
 msgstr "I-search backward: "
 
-#: info/session.c:3857
+#: info/session.c:3853
 msgid "I-search: "
 msgstr "I-search: "
 
 # Untranslated because is used with the I-search: prompt.
-#: info/session.c:3882
+#: info/session.c:3878 info/session.c:3880
 msgid "Failing "
 msgstr "Failing "
 
@@ -1517,27 +1541,27 @@ msgstr "àáä øåùé÷ì ïîñ ææä"
 msgid "Select reference or menu item appearing on this line"
 msgstr "úéçëåðä äøåùá òéôåîä èéøôúî óéòñ åà øåùé÷ øçà áå÷ò"
 
-#: info/session.c:4381
+#: info/session.c:4382
 msgid "Cancel current operation"
 msgstr "úéçëåð äìåòô ìèá"
 
-#: info/session.c:4388
+#: info/session.c:4389
 msgid "Quit"
 msgstr "ìèåá"
 
-#: info/session.c:4397
+#: info/session.c:4398
 msgid "Move the cursor to a specific line of the window"
 msgstr "äæ ïåìçá úîéåñî äøåùì ïîñ ææä"
 
-#: info/session.c:4429
+#: info/session.c:4430
 msgid "Redraw the display"
 msgstr "äâåöú ùãç"
 
-#: info/session.c:4466
+#: info/session.c:4467
 msgid "Quit using Info"
 msgstr "Info úéðëåúî àö"
 
-#: info/session.c:4479
+#: info/session.c:4480
 msgid "Run command bound to this key's lowercase variant"
 msgstr "äæ ù÷î ìù úåðè÷ úåéúåà úñøéâì äøåù÷ä äãå÷ô ìòôä"
 
@@ -1547,27 +1571,29 @@ msgid "Unknown command (%s)."
 msgstr ".(%s) úøëåî-éúìá äãå÷ô"
 
 #: info/session.c:4494
-msgid "\"\" is invalid"
-msgstr "\"\" äéåâù äãå÷ô"
-
-#: info/session.c:4495
 #, c-format
 msgid "\"%s\" is invalid"
 msgstr "\"%s\" äéåâù äãå÷ô"
 
-#: info/session.c:4713
+#: info/session.c:4495
+#, fuzzy, c-format
+msgid "`%s' is invalid"
+msgstr "\"%s\" äéåâù äãå÷ô"
+
+#: info/session.c:4709
 msgid "Add this digit to the current numeric argument"
 msgstr "éçëåð éøîåð èðîåâøàì åæ äøôñ óñåä"
 
-#: info/session.c:4722
+#: info/session.c:4718
 msgid "Start (or multiply by 4) the current numeric argument"
 msgstr "4-á íéé÷ êøò ìåôë åà ,éøîåð èðîåâøà ìù äãì÷ä ìçúä"
 
-#: info/session.c:4737
+#: info/session.c:4733
 msgid "Internally used by \\[universal-argument]"
 msgstr "åæ äãå÷ôá ùîúùî \\[universal-argument]"
 
-#: info/tilde.c:344
+#: info/tilde.c:338
+#, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "!éåðô ïåøëæ øúåé ïéà :readline\n"
 
@@ -1634,231 +1660,265 @@ msgstr "Set %s to value (%d): "
 msgid "Set %s to value (%s): "
 msgstr "Set %s to value (%s): "
 
-#: info/window.c:1164
+#: info/window.c:1138
 msgid "--*** Tags out of Date ***"
 msgstr "--*** úðëãåòî äðéà Tags úìáè ***-- "
 
-#: info/window.c:1175
+#: info/window.c:1149
 msgid "-----Info: (), lines ----, "
 msgstr "-----Info: (), lines ----, "
 
-#: info/window.c:1182
+#: info/window.c:1156
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr "-%s---Info: %s, %d lines --%s--"
 
-#: info/window.c:1186
+#: info/window.c:1160
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr "-%s%s-Info: (%s)%s, %d lines --%s--"
 
-#: info/window.c:1193
+#: info/window.c:1167
 #, c-format
 msgid " Subfile: %s"
 msgstr " Subfile: %s"
 
-#: lib/getopt.c:675
+#: lib/getopt.c:551 lib/getopt.c:570
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s úéðëú øåáò éòîùî-ãç åðéà `%s' ïééôàî\n"
 
-#: lib/getopt.c:700
+#: lib/getopt.c:603 lib/getopt.c:607
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `--%s' ïééôàî\n"
 
-#: lib/getopt.c:705
+#: lib/getopt.c:616 lib/getopt.c:621
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `%c%s' ïééôàî\n"
 
-#: lib/getopt.c:723 lib/getopt.c:896
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s úéðëú øåáò èðîåâøà áééçî `%s' ïééôàî\n"
 
-#: lib/getopt.c:752
+#: lib/getopt.c:727 lib/getopt.c:730
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s úéðëú øåáò `--%s' ääåæî-éúìá ïééôàî\n"
 
-#: lib/getopt.c:756
+#: lib/getopt.c:738 lib/getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s úéðëú øåáò `%c%s' ääåæî-éúìá ïééôàî\n"
 
-#: lib/getopt.c:782
+#: lib/getopt.c:796 lib/getopt.c:799
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: é÷åç-éúìá ïééôàî -- %c\n"
 
-#: lib/getopt.c:785
+#: lib/getopt.c:805 lib/getopt.c:808
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s úéðëú øåáò éåâù ïééôàî -- %c\n"
 
-#: lib/getopt.c:815 lib/getopt.c:945
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: èðîåâøà áééçî ïééôàî -- %c\n"
 
-#: lib/getopt.c:862
+#: lib/getopt.c:935 lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s úéðëú øåáò éòîùî-ãç åðéà `-W %s' ïééôàî\n"
 
-#: lib/getopt.c:880
+#: lib/getopt.c:978 lib/getopt.c:999
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `-W %s' ïééôàî\n"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#, fuzzy, c-format
+msgid "arguments to @%s ignored"
+msgstr "%c%s-ì éåâù èðîåâøà"
+
+#: makeinfo/cmds.c:585
 msgid "January"
 msgstr "øàåðé"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "February"
 msgstr "øàåøáô"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "March"
 msgstr "õøî"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "April"
 msgstr "ìéøôà"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "May"
 msgstr "éàî"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "June"
 msgstr "éðåé"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "July"
 msgstr "éìåé"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "August"
 msgstr "èñåâåà"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "September"
 msgstr "øáîèôñ"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "October"
 msgstr "øáåè÷åà"
 
-#: makeinfo/cmds.c:517
+#: makeinfo/cmds.c:587
 msgid "November"
 msgstr "øáîáåð"
 
-#: makeinfo/cmds.c:517
+#: makeinfo/cmds.c:587
 msgid "December"
 msgstr "øáîöã"
 
-#: makeinfo/cmds.c:658
+#: makeinfo/cmds.c:936
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "@var êåúá %c øéáñ-éúìá åú"
 
-#: makeinfo/cmds.c:701
+#: makeinfo/cmds.c:979
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "è÷ôà ìë @sc-ì ïéà ïëì ,úåìåãâ úåéúåàá åìåë @sc ìù èðîåâøà"
 
-#: makeinfo/cmds.c:759
+#: makeinfo/cmds.c:1034
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "%c àöîð êà ,`{' ì\"ö"
 
-#: makeinfo/cmds.c:789
+#: makeinfo/cmds.c:1074
 msgid "end of file inside verb block"
 msgstr "verb êåúá õáå÷ óåñ"
 
-#: makeinfo/cmds.c:797
+#: makeinfo/cmds.c:1082
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "%c àöîð êà ,`}' ì\"ö"
 
-#: makeinfo/cmds.c:942
+#: makeinfo/cmds.c:1112
+msgid ""
+"@strong{Note...} produces a spurious cross-reference in Info; reword to "
+"avoid that"
+msgstr ""
+
+#: makeinfo/cmds.c:1305
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "ïùåéî åðéä %c%s"
 
-#: makeinfo/cmds.c:1014
+#: makeinfo/cmds.c:1414
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "`%s' àì ,éáåéç øôñî àåäù èðîåâøà ùøåã @sp"
 
-#: makeinfo/cmds.c:1348 makeinfo/cmds.c:1374 makeinfo/footnote.c:81
+#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "%c%s-ì éåâù èðîåâøà"
 
-#: makeinfo/cmds.c:1358 makeinfo/makeinfo.c:4140
+#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
 msgid "asis"
 msgstr "àåäù åîë"
 
-#: makeinfo/cmds.c:1360 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
 msgid "none"
 msgstr "ïéà"
 
-#: makeinfo/defun.c:85
+#: makeinfo/cmds.c:1789
+#, fuzzy, c-format
+msgid "Bad argument to @%s"
+msgstr "%c%s-ì éåâù èðîåâøà"
+
+#: makeinfo/cmds.c:1803
+msgid "insert"
+msgstr ""
+
+#: makeinfo/defun.c:84
 msgid "Missing `}' in @def arg"
 msgstr "@def ìù èðîåâøàá `}' øñç"
 
 # It would be hilarious to translate those...
-#: makeinfo/defun.c:363
+#: makeinfo/defun.c:403
 msgid "Function"
 msgstr "Function"
 
-#: makeinfo/defun.c:366
+#: makeinfo/defun.c:406
 msgid "Macro"
 msgstr "Macro"
 
-#: makeinfo/defun.c:369
+#: makeinfo/defun.c:409
 msgid "Special Form"
 msgstr "Special Form"
 
-#: makeinfo/defun.c:373
+#: makeinfo/defun.c:413
 msgid "Variable"
 msgstr "Variable"
 
-#: makeinfo/defun.c:376
+#: makeinfo/defun.c:416
 msgid "User Option"
 msgstr "User Option"
 
-#: makeinfo/defun.c:380
+#: makeinfo/defun.c:420
 msgid "Instance Variable"
 msgstr "Instance Variable"
 
-#: makeinfo/defun.c:384
+#: makeinfo/defun.c:424
 msgid "Method"
 msgstr "Method"
 
-#: makeinfo/defun.c:466 makeinfo/defun.c:470 makeinfo/defun.c:615
-#: makeinfo/defun.c:631 makeinfo/defun.c:671
+#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
+#: makeinfo/defun.c:644 makeinfo/xml.c:2229
 msgid "of"
 msgstr "of"
 
-#: makeinfo/defun.c:474 makeinfo/defun.c:478 makeinfo/defun.c:482
-#: makeinfo/defun.c:624 makeinfo/defun.c:676
+#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
 msgid "on"
 msgstr "on"
 
-#: makeinfo/defun.c:717
-#, c-format
-msgid "Must be in `%s' insertion to use `%sx'"
+#: makeinfo/defun.c:711
+#, fuzzy, c-format
+msgid "Must be in `@%s' environment to use `@%s'"
 msgstr "`%s' êåúá ÷øå êà ùåîéùá øúåî `%sx'"
 
-#: makeinfo/files.c:448
+#: makeinfo/files.c:435
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr "%s úéðëúá %s-å %s øåáò äàéâù ìò çååéã getwd/getcwd\n"
 
+#: makeinfo/files.c:638
+#, c-format
+msgid "`%s' omitted before output filename"
+msgstr ""
+
+#: makeinfo/files.c:646
+#, c-format
+msgid "`%s' omitted since writing to stdout"
+msgstr ""
+
+#: makeinfo/files.c:694
+msgid "Output buffer not empty."
+msgstr ""
+
 #: makeinfo/footnote.c:150
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
@@ -1877,228 +1937,275 @@ msgstr "ä÷ñéôì õåçî íééìåù úøòä"
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "íééìåù úåøòä êåúá íééìåù úåøòäá äëéîú ïéà"
 
-#: makeinfo/footnote.c:298
+#: makeinfo/footnote.c:302 makeinfo/index.c:189
 msgid "Footnotes"
 msgstr "íééìåù úåøòä"
 
-#: makeinfo/html.c:42
+#: makeinfo/html.c:87
+#, c-format
+msgid "%s: could not open --css-file: %s"
+msgstr ""
+
+#: makeinfo/html.c:172
+#, c-format
+msgid "%s:%d: --css-file ended in comment"
+msgstr ""
+
+#: makeinfo/html.c:207
 msgid "Untitled"
 msgstr "úøúåë àìì"
 
-#: makeinfo/html.c:298
-#, c-format
-msgid "Invalid node name: `%s'"
+#: makeinfo/html.c:422
+msgid "[unexpected] no html tag to pop"
+msgstr ""
+
+#: makeinfo/html.c:752
+#, fuzzy, c-format
+msgid "[unexpected] invalid node name: `%s'"
 msgstr "`%s' :éåâù (node) ä÷ñéô íù"
 
-#: makeinfo/index.c:213
+#: makeinfo/index.c:169
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "`%s' øëåî-éúìá ñ÷ãðéà"
 
-#: makeinfo/index.c:238
+#: makeinfo/index.c:234
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr "`%s' ñ÷ãðéà èéøôá `:' ììâá ìùëéé Info"
 
-#: makeinfo/index.c:396
+#: makeinfo/index.c:412
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "øãâåî øáë `%s' ñ÷ãðéà"
 
-#: makeinfo/index.c:439
+#: makeinfo/index.c:455
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "øëåî-éúìá ñ÷ãðéà åðéä @synindex-á `%s' åà `%s'"
 
-#: makeinfo/index.c:666
+#: makeinfo/index.c:661
+msgid "(line )"
+msgstr ""
+
+#: makeinfo/index.c:669
+#, c-format
+msgid "(line %*d)"
+msgstr ""
+
+#: makeinfo/index.c:750
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "@printindex-á `%s' øëåî-éúìá ñ÷ãðéà"
 
-#: makeinfo/index.c:709
+#: makeinfo/index.c:819
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "ä÷ñéô ìëì õåçî øãâåî `%s' ñ÷ãðéà èéøô"
 
-#: makeinfo/index.c:712 makeinfo/index.c:751
+#: makeinfo/index.c:822 makeinfo/index.c:858
 msgid "(outside of any node)"
 msgstr "(ä÷ñéô ìëì õåçî)"
 
-#: makeinfo/insertion.c:198
+#: makeinfo/index.c:919 makeinfo/index.c:925
+msgid "See "
+msgstr "See "
+
+#: makeinfo/insertion.c:160
+msgid "@item not allowed in argument to @itemize"
+msgstr ""
+
+#: makeinfo/insertion.c:238
 msgid "Broken-Type in insertion_type_pname"
 msgstr "insertion_type_pname-á éåâù type"
 
-#: makeinfo/insertion.c:271
+#: makeinfo/insertion.c:334
 msgid "Enumeration stack overflow"
 msgstr "@enumerate-á úéðñçî úùéìâ"
 
-#: makeinfo/insertion.c:303
+#: makeinfo/insertion.c:366
 #, c-format
 msgid "lettering overflow, restarting at %c"
 msgstr "%c-á ùãçî ìéçúî ,åìöåð úåéúåàä ìë"
 
-#: makeinfo/insertion.c:538
+#: makeinfo/insertion.c:631
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
 msgstr "%s úàøåäá %citem øåáò áåöéò úèéù :èðîåâøà ùøãð"
 
-#: makeinfo/insertion.c:693
+#: makeinfo/insertion.c:719
+#, c-format
+msgid "%cfloat environments cannot be nested"
+msgstr ""
+
+#: makeinfo/insertion.c:973
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
 msgstr "`%s' àöîð íìåà ,`%s' ì\"ö `@end' éøçà"
 
-#: makeinfo/insertion.c:931
+#: makeinfo/insertion.c:1337
 #, c-format
 msgid "No matching `%cend %s'"
 msgstr "íàåú `%cend %s' øñç"
 
-#: makeinfo/insertion.c:1084
+#: makeinfo/insertion.c:1592
 #, c-format
 msgid "%s requires letter or digit"
 msgstr "äøôñ åà úåà ùøåã %s"
 
-#: makeinfo/insertion.c:1158
+#: makeinfo/insertion.c:1687
 msgid "end of file inside verbatim block"
 msgstr "verbatim êåúá õáå÷ óåñ"
 
-#: makeinfo/insertion.c:1318
+#: makeinfo/insertion.c:1913
+#, fuzzy, c-format
+msgid "@%s not meaningful outside `@float' environment"
+msgstr "`@%s' êåúá @%s-ì úåòîùî ïéà"
+
+#: makeinfo/insertion.c:1949
 msgid "@menu seen before first @node, creating `Top' node"
 msgstr "`Top' ú÷ñéô øöåé ,äðåùàøä ä÷ñéôä éðôì àöîð @menu"
 
-#: makeinfo/insertion.c:1319
+#: makeinfo/insertion.c:1950
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr "?@ifinfo íå÷îá @ifnottex-á úô÷åî úåéäì äúéä äëéøö @top ú÷ñéô éë ïëúééä"
 
-#: makeinfo/insertion.c:1331
+#: makeinfo/insertion.c:1962
 msgid "@detailmenu seen before first node, creating `Top' node"
 msgstr "`Top' ú÷ñéô øöåé ,äðåùàøä ä÷ñéôä éðôì àöîð @detailmenu"
 
-#: makeinfo/insertion.c:1346
+#: makeinfo/insertion.c:2018
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr ""
+
+#: makeinfo/insertion.c:2032
+#, fuzzy, c-format
+msgid "@%s not meaningful outside `@titlepage' environment"
+msgstr "`@%s' êåúá @%s-ì úåòîùî ïéà"
+
+#: makeinfo/insertion.c:2063
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr "âåæ-ïá åì ïéàù `%c%s'"
 
-#: makeinfo/insertion.c:1353
+#: makeinfo/insertion.c:2068
 #, c-format
 msgid "`%c%s' needs something after it"
 msgstr "åéøçà àåáéù åäùî êéøö `%c%s'"
 
-#: makeinfo/insertion.c:1359
-#, c-format
-msgid "Bad argument to `%s', `%s', using `%s'"
+#: makeinfo/insertion.c:2074
+#, fuzzy, c-format
+msgid "Bad argument `%s' to `@%s', using `%s'"
 msgstr "`%s'-ì èðîåâøàë íéàúî åðéà `%s'-ù íåùî `%s'-á éúùîúùä"
 
-#: makeinfo/insertion.c:1453
+#: makeinfo/insertion.c:2171
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
 msgstr "`@%s' êåúá @%s-ì úåòîùî ïéà"
 
-#: makeinfo/insertion.c:1462
+#: makeinfo/insertion.c:2180
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "`%s' êåúá @itemx-ì úåòîùî ïéà"
 
-#: makeinfo/insertion.c:1646
+#: makeinfo/insertion.c:2356
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "äñðëä ÷åìá ìëì õåçî %c%s àöîð"
 
-#: makeinfo/lang.c:331
+#: makeinfo/lang.c:580
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "ISO 639 é\"ò íéøëåîä ïåùìä éðîéñî ãçà åðéà %s"
 
-#: makeinfo/lang.c:384
-#, c-format
-msgid "unrecogized encoding name `%s'"
+#: makeinfo/lang.c:655
+#, fuzzy, c-format
+msgid "unrecognized encoding name `%s'"
 msgstr "`%s' øëåî-éúìá ãåãé÷ íù"
 
-#: makeinfo/lang.c:387
+#: makeinfo/lang.c:663
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "êîúð åðéà `%s' ãåãé÷ ,íéøòèöî"
 
-#: makeinfo/lang.c:414
+#: makeinfo/lang.c:715
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "`%s' éåâù ããå÷î åú"
 
-#: makeinfo/lang.c:502
-#, c-format
-msgid "%s is an invalid ISO code, using %c"
-msgstr "éåâù ISO ãå÷ åðéä %s éë %c-á ùîúùî"
-
-#: makeinfo/lang.c:687
+#: makeinfo/lang.c:1009
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "`j' åà `i' úåéäì áééç øùà ,%c%s ìù èðîåâøà úåéäì íéàúî åðéà `%c'"
 
-#: makeinfo/lang.c:691
+#: makeinfo/lang.c:1013
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr "èðîåâøàë `j' åà `i' ãéçé åú ìá÷î %c%s"
 
-#: makeinfo/macro.c:134
+#: makeinfo/macro.c:128
 #, c-format
 msgid "macro `%s' previously defined"
 msgstr "íãï÷ øãâåä øáë `%s' åø÷àî"
 
-#: makeinfo/macro.c:138
+#: makeinfo/macro.c:132
 #, c-format
 msgid "here is the previous definition of `%s'"
 msgstr "äðåùàøì øãâåä `%s' ïàë"
 
 #: makeinfo/macro.c:355
-#, c-format
-msgid "\\ in macro expansion followed by `%s' instead of \\ or parameter name"
+#, fuzzy, c-format
+msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr "øèîøô íù åà \\ íå÷îá ,åø÷àî úáçøäá \\ úåá÷òá `%s'"
 
-#: makeinfo/macro.c:403
+#: makeinfo/macro.c:401
 #, c-format
 msgid "Macro `%s' called on line %d with too many args"
 msgstr "éãî íéáø íéèðîåâøà úììåë `%s' åø÷àîì %d äøåùá äúìéçúù äàéø÷"
 
-#: makeinfo/macro.c:594
+#: makeinfo/macro.c:586
 #, c-format
 msgid "%cend macro not found"
 msgstr "àöîð àì %cend macro"
 
-#: makeinfo/macro.c:632
+#: makeinfo/macro.c:624
 msgid "@quote-arg only useful for single-argument macros"
 msgstr "ãéçé èðîåâøà ìòá åø÷àî êåúá ÷ø éùåîéù @quote-arg"
 
-#: makeinfo/macro.c:668
+#: makeinfo/macro.c:660
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "@end %s úà íàåú åðéà @%s"
 
+#: makeinfo/makeinfo.c:184
+#, c-format
+msgid "Too many errors!  Gave up.\n"
+msgstr ".íééãé éúîøä  !úàéâù éãî øúåé\n"
+
 # Not translated because Emacs recognizes warningsby this template.
-#: makeinfo/makeinfo.c:316
+#: makeinfo/makeinfo.c:302
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: warning: "
 
-#: makeinfo/makeinfo.c:339
-msgid "Too many errors!  Gave up.\n"
-msgstr ".íééãé éúîøä  !úàéâù éãî øúåé\n"
-
-#: makeinfo/makeinfo.c:350 makeinfo/makeinfo.c:2026
+#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
 #, c-format
 msgid "Misplaced %c"
 msgstr "åîå÷îá åðéàù %c"
 
-#: makeinfo/makeinfo.c:370
+#: makeinfo/makeinfo.c:340
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ".`%s --help' äñð øúé èåøôì\n"
 
-#: makeinfo/makeinfo.c:373
+#: makeinfo/makeinfo.c:343
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "%s [íéðééôàî]... TEXINFO-õáå÷... :ùåîéùä ïôåà\n"
 
-#: makeinfo/makeinfo.c:376
+#: makeinfo/makeinfo.c:346
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -2106,7 +2213,7 @@ msgstr ""
 " ìãçî úøéøáë ,íéøçà íéðåù íéèîøåôì Texinfo øå÷î úôùá ãåòéú íâøú\n"
 ".GNU Info  úéðëú åà Emacs úøæòá äàéø÷ì íéîéàúîä Info éöá÷ øöééî \n"
 
-#: makeinfo/makeinfo.c:380
+#: makeinfo/makeinfo.c:350
 #, c-format
 msgid ""
 "General options:\n"
@@ -2130,20 +2237,21 @@ msgstr ""
 "                    .úéðëúä úìåòô ìò èåøô âöä  -v, --verbose\n"
 "               .àöå äðëúä úñøéâ éáâì òãéî âöä      --version\n"
 
-#: makeinfo/makeinfo.c:394
-#, no-wrap
+#: makeinfo/makeinfo.c:364
+#, fuzzy, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output DocBook rather than Info.\n"
+"      --docbook             output Docbook XML rather than Info.\n"
 "      --html                output HTML rather than Info.\n"
-"      --xml                 output XML (TexinfoML) rather than Info.\n"
+"      --xml                 output Texinfo XML rather than Info.\n"
+"      --plaintext           output plain text rather than Info.\n"
 msgstr ""
 "                                                         :èìôä èîøåô úøéçá\n"
 "           .Info íå÷îá DocBook èîøåôá èìô ïëä      --docbook\n"
 "              .Info íå÷îá HTML èîøåôá èìô ïëä      --html\n"
 "               .Info íå÷îá XML èîøåôá èìô ïëä      --xml\n"
 
-#: makeinfo/makeinfo.c:401
+#: makeinfo/makeinfo.c:372
 msgid ""
 "General output options:\n"
 "  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
@@ -2169,7 +2277,7 @@ msgstr ""
 "               .èìô õáå÷á úåà÷ñéôå íé÷øô øøôñ      --number-sections\n"
 "     .(HTML èìô íà äé÷éú) FILE õáå÷ì èìô áåúë  -o, --output=FILE\n"
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:386
 #, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2200,14 +2308,32 @@ msgstr ""
 "      .øå÷îá äúéäù éôë äææä ìò øåîù ,`asis'\n"
 "     .(%d ç\"îøá) NUM ìãåâá íéöá÷-úúì Info ÷ìç      --split-size=NUM\n"
 
-#: makeinfo/makeinfo.c:433
+#: makeinfo/makeinfo.c:403
+msgid ""
+"Options for HTML:\n"
+"      --css-include=FILE        include FILE in HTML <style> output;\n"
+"                                  read stdin if FILE is -.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:409
+#, c-format
+msgid ""
+"Options for XML and Docbook:\n"
+"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"d).\n"
+"                                  If VAL is 0, ignorable whitespace is "
+"dropped.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:416
+#, fuzzy
 msgid ""
 "Input file options:\n"
-"      --commands-in-node-names   allow @ commands in node names.\n"
-"  -D VAR                         define the variable VAR, as with @set.\n"
-"  -I DIR                         append DIR to the @include search path.\n"
-"  -P DIR                         prepend DIR to the @include search path.\n"
-"  -U VAR                         undefine the variable VAR, as with @clear.\n"
+"      --commands-in-node-names  allow @ commands in node names.\n"
+"  -D VAR                        define the variable VAR, as with @set.\n"
+"  -I DIR                        append DIR to the @include search path.\n"
+"  -P DIR                        prepend DIR to the @include search path.\n"
+"  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
 "                                                     :èì÷ éöá÷ ìù íéðééôàî\n"
 "          .úåà÷ñéôä úåîùá @ úãå÷ôá ùåîéù äùøä     --commands-in-node-names\n"
@@ -2216,45 +2342,57 @@ msgstr ""
 "       .@include ìù ùåôéç úîéùø ùàøá DIR óñåä  -P DIR\n"
 "      .@clear úãå÷ôá åîë ,VAR äðúùî úøãâä ìèá  -U VAR\n"
 
-#: makeinfo/makeinfo.c:442
+#: makeinfo/makeinfo.c:425
 #, fuzzy
 msgid ""
 "Conditional processing in input:\n"
+"  --ifdocbook       process @ifdocbook and @docbook even if\n"
+"                      not generating Docbook.\n"
 "  --ifhtml          process @ifhtml and @html even if not generating HTML.\n"
 "  --ifinfo          process @ifinfo even if not generating Info.\n"
 "  --ifplaintext     process @ifplaintext even if not generating plain text.\n"
 "  --iftex           process @iftex and @tex; implies --no-split.\n"
+"  --ifxml           process @ifxml and @xml.\n"
+"  --no-ifdocbook    do not process @ifdocbook and @docbook text.\n"
 "  --no-ifhtml       do not process @ifhtml and @html text.\n"
 "  --no-ifinfo       do not process @ifinfo text.\n"
 "  --no-ifplaintext  do not process @ifplaintext text.\n"
 "  --no-iftex        do not process @iftex and @tex text.\n"
+"  --no-ifxml        do not process @ifxml and @xml text.\n"
+"\n"
+"  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
 msgstr ""
 "                                                         :èì÷á äðúåî ãåáéò\n"
 " .HTML åðéà èìôä íà åìéôà @html-å @ifhtml ãáò       --ifhtml\n"
-"   .HTML àåä èìôä íà åìéôà @ifinfo-á èñëè ãáò       --ifinfo\n"
-"  .--no-split òîúùîá;@tex-å @iftex-á èñëè ãáò       --iftex\n"
+"  .Info åðéà èìôä íà åìéôà @ifinfo-á èñëè ãáò       --ifinfo\n"
+".é÷ð èñëè åðéà èìôä íà åìéôà @ifplaintext ãáò       --ifplaintext\n"
+" .--no-split òîúùîá ;@tex-å @iftex-á èñëè ãáò       --iftex\n"
 "              .@html-å @ifhtml-á èñëè ãáòú ìà       --no-ifhtml\n"
 "                      .@ifinfo-á èñëè ãáòú ìà       --no-ifinfo\n"
+"                 .@ifplaintext-á èñëè ãáòú ìà       --no-ifplaintext\n"
 "                .@tex-å @iftex-á èñëè ãáòú ìà       --no-iftex\n"
 
-#: makeinfo/makeinfo.c:454
+#: makeinfo/makeinfo.c:444
 #, fuzzy
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating HTML, --ifhtml is on and the others are off;\n"
 "  if generating Info, --ifinfo is on and the others are off;\n"
 "  if generating plain text, --ifplaintext is on and the others are off;\n"
+"  if generating XML, --ifxml is on and the others are off.\n"
 msgstr ""
 "                       :èìôä èîøåôá äéåìú @if... úåéðúä øåáò ìãçîä úøéøá\n"
 "                ;íéìòôåî íðéà øúéä ìëå ìòôåî --ifhtml  ,HTML àåä èìôä íà\n"
 "        .íéìòôåî íðéà øúéä ìëå ìòôåî --ifinfo  ,èñëè åà Info àåä èìôä íà\n"
+"           .íéìòôåî íðéà øúéä ìëå ìòôåî --ifplaintext  ,èñëè àåä èìôä íà\n"
 
-#: makeinfo/makeinfo.c:461
+#: makeinfo/makeinfo.c:452
+#, fuzzy
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                     write Info to foo's @setfilename\n"
 "  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write XML to @setfilename\n"
+"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
 "  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
 "  makeinfo --no-headers foo.texi        write plain text to standard output\n"
 "\n"
@@ -2274,396 +2412,395 @@ msgstr ""
 "             úåà÷ñéô øåøôñ íò Info èìô  makeinfo --number-sections foo.texi\n"
 "   äéäéù ìëë ìåãâ ,ãéçé õáå÷á Info èìô  makeinfo --no-split foo.texi\n"
 
-#: makeinfo/makeinfo.c:570 makeinfo/makeinfo.c:593 makeinfo/makeinfo.c:655
-#: makeinfo/makeinfo.c:676
+#: makeinfo/makeinfo.c:603
+#, c-format
+msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
+#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr ".%s ïééôàî øåáò %s é\"ò ùøãðë ,éøîåð èðîåâøà åðéà `%s'\n"
 
-#: makeinfo/makeinfo.c:583
-#, c-format
-msgid "Couldn't open macro expansion output `%s'"
+#: makeinfo/makeinfo.c:660
+#, fuzzy, c-format
+msgid "%s: could not open macro expansion output `%s'"
 msgstr "`%s' åø÷àî úåáçøä èìô úçéúôá äì÷ú"
 
-#: makeinfo/makeinfo.c:586
-msgid "Cannot specify more than one macro expansion output"
-msgstr "åø÷àîä úåáçøä èìôì ãçà õáå÷ ÷ø ïééöì ïúéð"
+#: makeinfo/makeinfo.c:665
+#, fuzzy, c-format
+msgid "%s: ignoring second macro expansion output `%s'.\n"
+msgstr "`%s' åø÷àî úåáçøä èìô úçéúôá äì÷ú"
 
-#: makeinfo/makeinfo.c:624
+#: makeinfo/makeinfo.c:707
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 "%s: `%s' àì ,`asis'/`none'/éøîåð úåéäì --paragraph-indent ìù èðîåâøà ìò\n"
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 "%s: `%s' àì ,`end' åà `separate' úåéäì --footnote-style ìù èðîåâøà ìò\n"
 
-#: makeinfo/makeinfo.c:723
+#: makeinfo/makeinfo.c:806
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr ".õáå÷ íù øñç %s úéðëúì\n"
 
-#: makeinfo/makeinfo.c:898
+#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#, c-format
+msgid "Multiline command %c%s used improperly"
+msgstr ""
+
+#: makeinfo/makeinfo.c:1000
 #, c-format
 msgid "Expected `%s'"
 msgstr "`%s' éåôö äéä ïàë"
 
-#: makeinfo/makeinfo.c:1365
-msgid "File exists, but is not a directory"
-msgstr "äöéçî åððéàù íéé÷ õáå÷ àöîð"
-
-#: makeinfo/makeinfo.c:1366
+#: makeinfo/makeinfo.c:1479
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "`%s' äé÷éú úøéöéá (%s) äì÷ú"
 
-#: makeinfo/makeinfo.c:1414
+#: makeinfo/makeinfo.c:1525
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "`%s' àöîð àì `%s' õáå÷á"
 
-#: makeinfo/makeinfo.c:1496
+#: makeinfo/makeinfo.c:1605
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr "%s: .íùì ïååëî èìôù íåùî åèîùåé éð÷ú èìô õåøòì åø÷àî úåáçøä\n"
 
-#: makeinfo/makeinfo.c:1526
+#: makeinfo/makeinfo.c:1638
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr ".%s èîøåôá `%s'-ì `%s' õáå÷ ãáòî\n"
 
-#: makeinfo/makeinfo.c:1561
+#: makeinfo/makeinfo.c:1673
 #, c-format
 msgid "This is %s, produced by makeinfo version %s from %s.\n"
 msgstr "This is %s, produced by makeinfo version %s from %s.\n"
 
-#: makeinfo/makeinfo.c:1583
+#: makeinfo/makeinfo.c:1709
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
 msgstr "%s: .åøîùì --force-á ùîúùä ;úåì÷ú á÷ò ÷çîéé `%s' åø÷àî úåáçøä õáå÷\n"
 
-#: makeinfo/makeinfo.c:1627
+#: makeinfo/makeinfo.c:1773
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr "%s: .åøîùì --force-á ùîúùä ;úåì÷ú á÷ò ÷çîéé `%s' èìô õáå÷\n"
 
-#: makeinfo/makeinfo.c:1853
+#: makeinfo/makeinfo.c:2034
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "`%s' úøëåî-éúìá äàøåä"
 
-#: makeinfo/makeinfo.c:1875
+#: makeinfo/makeinfo.c:2056
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr "íéìñìåñî íééøâåñá êøåö ùé ,@%s-ì èðîåâøà äéäú äàøåäù éãë"
 
-#: makeinfo/makeinfo.c:2068
-#, c-format
-msgid "%c%s expected `{...}'"
+#: makeinfo/makeinfo.c:2314
+#, fuzzy, c-format
+msgid "%c%s expected braces"
 msgstr "`{...}'-ì äôéö %c%s"
 
-#: makeinfo/makeinfo.c:2098
+#: makeinfo/makeinfo.c:2327
 msgid "Unmatched }"
 msgstr "âåæ-ïá åì ïéàù }"
 
-#: makeinfo/makeinfo.c:2148
+#: makeinfo/makeinfo.c:2375
 msgid "NO_NAME!"
 msgstr "NO_NAME!"
 
-#: makeinfo/makeinfo.c:2169
+#: makeinfo/makeinfo.c:2396
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s-ì øñç éðîé øâåñ"
 
-#: makeinfo/makeinfo.c:2958
-msgid "First argument to cross-reference may not be empty"
-msgstr "÷éø úåéäì ìåëé åðéà øåùé÷ ìù ïåùàø èðîåâøà"
-
-#: makeinfo/makeinfo.c:3018 makeinfo/makeinfo.c:3236 makeinfo/xml.c:1340
-msgid "see "
-msgstr "see "
-
-#: makeinfo/makeinfo.c:3018
-msgid "See "
-msgstr "See "
-
-#: makeinfo/makeinfo.c:3164
-#, c-format
-msgid "`.' or `,' must follow cross reference, not %c"
-msgstr "%c àìå `,' åà `.' àåáì êéøö øåùé÷ éøçà"
-
-#: makeinfo/makeinfo.c:3212
-msgid "First argument to @inforef may not be empty"
-msgstr "÷éø úåéäì ìåëé åðéà @inforef ìù ïåùàø èðîåâøà"
-
-#: makeinfo/makeinfo.c:3427
+#: makeinfo/makeinfo.c:3309
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "(HTML øåáò ùøãð) @image øåáò `%s' õáå÷ úàéø÷á (%s) äì÷ú"
 
-#: makeinfo/makeinfo.c:3440
-#, c-format
-msgid "No `%s.png' or `.jpg', and no extension supplied"
-msgstr "úøçà úîåéñ äðéåö àìå åàöîð àì .jpg-å `%s.png'"
+#: makeinfo/makeinfo.c:3315
+#, fuzzy, c-format
+msgid "No such file `%s'"
+msgstr "`%s' àöîð àì `%s' õáå÷á"
 
-#: makeinfo/makeinfo.c:3490
+#: makeinfo/makeinfo.c:3447
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "(èñëè øåáò ùøãð) @image øåáò `%s' õáå÷ úàéø÷á (%s) äì÷ú"
 
-#: makeinfo/makeinfo.c:3497
+#: makeinfo/makeinfo.c:3456
 msgid "@image missing filename argument"
 msgstr "@image úàøåäá øñç õáå÷ íù"
 
-#: makeinfo/makeinfo.c:3690
+#: makeinfo/makeinfo.c:3675
+#, c-format
+msgid "undefined flag: %s"
+msgstr ""
+
+#: makeinfo/makeinfo.c:3676
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{No value for `%s'}"
 
-#: makeinfo/makeinfo.c:3744
+#: makeinfo/makeinfo.c:3728
 #, c-format
 msgid "%c%s requires a name"
 msgstr "íù ùøåã %c%s"
 
-#: makeinfo/makeinfo.c:3850
+#: makeinfo/makeinfo.c:3834
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "íàåú @end %s éðôì øîâð èì÷ õáå÷"
 
-#: makeinfo/makeinfo.c:4081
+#: makeinfo/makeinfo.c:4082
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr "áçøåé àì ;åáéçøäì éãëî êåøà `%.40s...'"
 
-#: makeinfo/multi.c:226
+#: makeinfo/multi.c:116
 msgid "Missing } in @multitable template"
 msgstr "} øñç @multitable ìù úéðáúá"
 
-#: makeinfo/multi.c:302
+#: makeinfo/multi.c:254
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "@multiline éøçà `%s' øúåéî èñëèî éúîìòúä"
 
-#: makeinfo/multi.c:375
+#: makeinfo/multi.c:393
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "(%d ãò øúåî) multitable ìù @item-á úåãåîò éãî øúåé"
 
-#: makeinfo/multi.c:426
-#, c-format
-msgid "Cannot select column #%d in multitable"
+#: makeinfo/multi.c:555
+#, fuzzy, c-format
+msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "multitable-á %d 'ñî äãåîò úøéçáá äì÷ú"
 
-#: makeinfo/multi.c:529
+#: makeinfo/multi.c:584
 msgid "ignoring @tab outside of multitable"
 msgstr "multitable-ì õåçî @tab-î éúîìòúä"
 
 # The following two look like debugging output, and aren't compiled.
-#: makeinfo/multi.c:565
+#: makeinfo/multi.c:632
+#, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** Multicolumn output from last row:\n"
 
-#: makeinfo/multi.c:568
+#: makeinfo/multi.c:635
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* column #%d: output = %s\n"
 
-#: makeinfo/node.c:276
+#: makeinfo/node.c:280
 #, c-format
 msgid "Node `%s' previously defined at line %d"
 msgstr "`%s' ä÷ñéô úøãâä øáë %d äøåùá"
 
-#: makeinfo/node.c:594
+#: makeinfo/node.c:648
 #, c-format
 msgid "Formatting node %s...\n"
 msgstr "...%s ä÷ñéô ãáòî úòë\n"
 
-#: makeinfo/node.c:655
-#, c-format
-msgid "Node `%s' requires a sectioning command (e.g. %c%s)"
+#: makeinfo/node.c:716
+#, fuzzy, c-format
+msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
 msgstr "`%s' ä÷ñéôá (%c%s ïåâë) ÷åñéô úàøåäá êøåö ùé"
 
-#: makeinfo/node.c:815
+#: makeinfo/node.c:879
 #, c-format
 msgid "No node name specified for `%c%s' command"
 msgstr "ä÷ñéô íù àìì `%c%s' äàøåä"
 
-#: makeinfo/node.c:856 makeinfo/node.c:1075
+#: makeinfo/node.c:920 makeinfo/node.c:1151
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr "õáå÷ íù åúåàì úåîâøåúî `%s' øåùé÷ úéåúå `%s' ä÷ñéô"
 
-#: makeinfo/node.c:859
+#: makeinfo/node.c:923
 msgid "This @anchor command ignored; references to it will not work"
 msgstr "åìòôé àì åæ úéåú ìà íéøåùé÷ ;òöåáú àì åæ @anchor úàøåä"
 
-#: makeinfo/node.c:861 makeinfo/node.c:1078
+#: makeinfo/node.c:925 makeinfo/node.c:1154
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "`--no-split' ïééôàîá ùîúùä åà úéåúä íù äðù"
 
-#: makeinfo/node.c:891
+#: makeinfo/node.c:955
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
 msgstr "`%s' ÷ìåçî HTML õáå÷ íåéñá äéåôö-éúìá úæåøçî"
 
-#: makeinfo/node.c:920
-msgid "Node:"
-msgstr "Node:"
-
-#: makeinfo/node.c:930
+#: makeinfo/node.c:991
 msgid "Next:"
 msgstr "Next:"
 
-#: makeinfo/node.c:940
+#: makeinfo/node.c:1007
 msgid "Previous:"
 msgstr "Previous:"
 
-#: makeinfo/node.c:950
+#: makeinfo/node.c:1021
 msgid "Up:"
 msgstr "Up:"
 
-#: makeinfo/node.c:1072
+#: makeinfo/node.c:1148
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr "õáå÷ íù åúåàì úåîâøåúî `%s-å `%s' øåùé÷ úåéåú"
 
-#: makeinfo/node.c:1077
+#: makeinfo/node.c:1153
 msgid "@anchor command ignored; references to it will not work"
 msgstr "åìòôé àì åæ úéåú ìà íéøåùé÷ ;òöåáú àì @anchor úàøåä"
 
-#: makeinfo/node.c:1277
-#, c-format
-msgid "%s reference to nonexistent node `%s'"
+#: makeinfo/node.c:1347
+#, fuzzy, c-format
+msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr "%sá `%s' úîéé÷ äððéàù ä÷ñéôì äééðôä"
 
-#: makeinfo/node.c:1294
+#: makeinfo/node.c:1363
 msgid "Menu"
 msgstr "èéøôú"
 
-#: makeinfo/node.c:1296
+#: makeinfo/node.c:1365
 msgid "Cross"
 msgstr "øåùé÷"
 
-#: makeinfo/node.c:1380
-#, c-format
-msgid "Next field of node `%s' not pointed to"
+#: makeinfo/node.c:1447
+#, fuzzy, c-format
+msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr "äøæç äòéáöî äðéà `%s' ä÷ñéô ìù Next äãùá ä÷ñéôä"
 
-#: makeinfo/node.c:1383
+#: makeinfo/node.c:1450
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "éåâù Prev äãù úìòá àéä (%s) åæ ä÷ñéô"
 
-#: makeinfo/node.c:1395
+#: makeinfo/node.c:1462
 msgid "Prev"
 msgstr "Prev äãù"
 
-#: makeinfo/node.c:1438
+#: makeinfo/node.c:1505
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "äøæç äòéáöî äðéà `%s' ä÷ñéô ìù Prev äãùá ä÷ñéôä"
 
-#: makeinfo/node.c:1442
+#: makeinfo/node.c:1509
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "éåâù Next äãù úìòá àéä (%s) åæ ä÷ñéô"
 
-#: makeinfo/node.c:1454
+#: makeinfo/node.c:1521
 #, c-format
-msgid "`%s' has no Up field"
-msgstr "Up äãù ïéà `%s'-ì"
+msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
+msgstr ""
 
-#: makeinfo/node.c:1457
+#: makeinfo/node.c:1524
 msgid "Up"
 msgstr "Up äãù"
 
-#: makeinfo/node.c:1523
+#: makeinfo/node.c:1590
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr "äøæçá òéáöîù èéøôú óéòñ ïéà ìáà ,`%s' ìò òéáöî `%s' ä÷ñéô ìù Up äãù"
 
-#: makeinfo/node.c:1552
+#: makeinfo/node.c:1619
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr "`%s' ä÷ñéôì íéøåùé÷ %d éúøôñ"
 
-#: makeinfo/node.c:1566
+#: makeinfo/node.c:1633
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "øåùé÷ óà ïéà `%s' ä÷ñéôì"
 
-#: makeinfo/sectioning.c:117
+#: makeinfo/node.c:1723
 #, c-format
-msgid "Appendix %c "
+msgid "Removing %s\n"
+msgstr ""
+
+#: makeinfo/node.c:1727
+#, fuzzy, c-format
+msgid "Can't remove file `%s': %s"
+msgstr "`%s' äé÷éú úøéöéá (%s) äì÷ú"
+
+#: makeinfo/sectioning.c:122
+#, fuzzy, c-format
+msgid "Appendix %c"
 msgstr "Appendix %c "
 
-#: makeinfo/sectioning.c:356 makeinfo/sectioning.c:444
+#: makeinfo/sectioning.c:467
+#, fuzzy, c-format
+msgid "Internal error (search_sectioning) `%s'!"
+msgstr "!\"%s\" (search_sectioning) úéîéðô äðëåú úì÷ú"
+
+#: makeinfo/sectioning.c:562
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
 msgstr "!\"%s\" (search_sectioning) úéîéðô äðëåú úì÷ú"
 
-#: makeinfo/sectioning.c:502
+#: makeinfo/sectioning.c:623
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr "%c%s-á ùîúùäì óéãò ;úðùåéî äðéä %c%s äàøåä"
 
-#: makeinfo/sectioning.c:518
+#: makeinfo/sectioning.c:639
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr "íãå÷ äøãâåä øáë %ctop íò ä÷ñéô"
 
-#: makeinfo/sectioning.c:526
+#: makeinfo/sectioning.c:647
 #, c-format
 msgid "Here is the %ctop node"
 msgstr "%ctop ú÷ñéô ìù íå÷îä åäæ"
 
-#: makeinfo/sectioning.c:543
+#: makeinfo/sectioning.c:663
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr "éîöòá @node éúôñåä ,%cnode éðôì %ctop-á äùîúùä %s ä÷ñéô"
 
-#: makeinfo/toc.c:221 makeinfo/toc.c:298 makeinfo/toc.c:299
+#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
 msgid "Table of Contents"
 msgstr "Table of Contents"
 
-#: makeinfo/toc.c:330 makeinfo/toc.c:366 makeinfo/toc.c:367
+#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
 msgid "Short Contents"
 msgstr "Short Contents"
 
-#: makeinfo/toc.c:406
-#, c-format
-msgid "%s: TOC should be here, but it was not found"
-msgstr "àöîð àì êà ,%s õáå÷á úåéäì äéä øåîà íéðééðò ïëåú"
-
-#: makeinfo/xml.c:1108
+#: makeinfo/xml.c:1605
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image øåáò `%s' õáå÷ úàéø÷á (%s) äì÷ú"
 
-#: util/install-info.c:151
+#: makeinfo/xml.c:2097
+msgid ""
+"@headitem as the last item of @multitable produces invalid Docbook documents"
+msgstr ""
+
+#: util/install-info.c:154
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: warning: "
 
-#: util/install-info.c:176 util/install-info.c:189
-msgid "virtual memory exhausted"
-msgstr "éìàèøéåä ïåøëæä øîâð"
-
-#: util/install-info.c:232
+#: util/install-info.c:203
 #, c-format
 msgid " for %s"
 msgstr " for %s"
 
-#: util/install-info.c:381
+#: util/install-info.c:426
 #, c-format
 msgid "\tTry `%s --help' for a complete list of options.\n"
 msgstr ".íéðééôàî ìù äàìî äîéùø úìá÷ì `%s --help' äñð\n"
 
-#: util/install-info.c:389
+#: util/install-info.c:434
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
@@ -2729,8 +2866,8 @@ msgstr ""
 "                      .àöå úéðëúä úñøéâ ìò òãéî âöä   --version\n"
 "\n"
 
-#: util/install-info.c:444
-#, c-format
+#: util/install-info.c:488
+#, fuzzy, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
 "topmost node of the Info hierarchy, called (dir)Top.\n"
@@ -2746,7 +2883,7 @@ msgid ""
 "  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
 "  to select it.\n"
 "\n"
-"* Menu:\n"
+"%s\n"
 msgstr ""
 "This is the file .../info/dir, which contains the\n"
 "topmost node of the Info hierarchy, called (dir)Top.\n"
@@ -2764,97 +2901,99 @@ msgstr ""
 "\n"
 "* Menu:\n"
 
-#: util/install-info.c:467
+#: util/install-info.c:513
 #, c-format
 msgid "%s: could not read (%s) and could not create (%s)\n"
 msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
 
-#: util/install-info.c:551
+#: util/install-info.c:600
 #, c-format
 msgid "%s: empty file"
 msgstr "÷éø åðéä %s õáå÷"
 
-#: util/install-info.c:866 util/install-info.c:906
+#: util/install-info.c:913 util/install-info.c:953
 msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
 msgstr "íàåú END-INFO-DIR-ENTRY àìì START-INFO-DIR-ENTRY"
 
-#: util/install-info.c:901
+#: util/install-info.c:948
 msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
 msgstr "íàåú START-INFO-DIR-ENTRY àìì END-INFO-DIR-ENTRY"
 
-#: util/install-info.c:1150 util/install-info.c:1160
+#: util/install-info.c:1191 util/install-info.c:1201
 #, c-format
-msgid "%s: Specify the Info directory only once.\n"
-msgstr ".ãáìá úçà íòô %s-ì Info úéé÷éú ïééöì ïúéð\n"
+msgid "%s: already have dir file: %s\n"
+msgstr ""
 
-#: util/install-info.c:1195
+#: util/install-info.c:1236
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr ".ãáìá úçà íòô %s-ì Info õáå÷ ïééöì ïúéð\n"
 
-#: util/install-info.c:1244
+#: util/install-info.c:1284
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr "`%s' øúåéî èðîåâøà"
 
-#: util/install-info.c:1248
+#: util/install-info.c:1288
 msgid "No input file specified; try --help for more information."
 msgstr ".äøæò úìá÷ì --help äñð ;èì÷ õáå÷ ïåéö ïéà"
 
-#: util/install-info.c:1251
+#: util/install-info.c:1291
 msgid "No dir file specified; try --help for more information."
 msgstr ".äøæò úìá÷ì --help äñð ;dir õáå÷ ïåéö ïéà"
 
-#: util/install-info.c:1273
+#: util/install-info.c:1313
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr "`%s'-á éùàø èéøôú éôéòñ ïéà"
 
-#: util/install-info.c:1388
+#: util/install-info.c:1426
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr "`%s' óéòñ éùàøä èéøôúá íéé÷ øáë `%s' õáå÷ì"
 
-#: util/install-info.c:1411
+#: util/install-info.c:1449
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr "÷çîð àì íåìë ;`%s' øåáò èéøôú éôéòñ åàöîð àì"
 
-#: util/texindex.c:245
+#: util/texindex.c:252
 msgid "display this help and exit"
 msgstr "úéðëúäî àöå äæ äøæò êñî âöä"
 
-#: util/texindex.c:247
+#: util/texindex.c:254
 msgid "keep temporary files around after processing"
 msgstr "ãåáéòä êìäîá íéøöåðä íééðîæ íéöá÷ ÷çîú ìà"
 
-#: util/texindex.c:249
+#: util/texindex.c:256
 msgid "do not keep temporary files around after processing (default)"
 msgstr "(ç\"îøá) ãåáéòä êìäîá íéøöåðä íééðîæ íéöá÷ ÷çî"
 
-#: util/texindex.c:251
+#: util/texindex.c:258
 msgid "send output to FILE"
 msgstr "FILE õáå÷ì èìô äðôä"
 
-#: util/texindex.c:253
+#: util/texindex.c:260
 msgid "display version information and exit"
 msgstr "àöå úéðëúä úñøéâ ìò òãéî âöä"
 
-#: util/texindex.c:264
+#: util/texindex.c:270
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "%s [OPTION]... FILE... :ùåîéùä ïôåà\n"
 
-#: util/texindex.c:265
+#: util/texindex.c:271
+#, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr ".TeX é\"ò áúëðù FILE õáå÷ ìëì ïééåîî ñ÷ãðéà ïëä\n"
 
-#: util/texindex.c:268
+#: util/texindex.c:274
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr ".`foo.%c%c' íùá íéàø÷ð `foo.texi' êîñî øåáò FILE éöá÷ ììë êøãá\n"
 
-#: util/texindex.c:270
+#: util/texindex.c:276
+#, c-format
 msgid ""
 "\n"
 "Options:\n"
@@ -2862,28 +3001,74 @@ msgstr ""
 "\n"
 "                                                :íéðééôàî\n"
 
-#: util/texindex.c:887 util/texindex.c:921 util/texindex.c:997
-#: util/texindex.c:1025
+#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
+#: util/texindex.c:1011
 #, c-format
 msgid "%s: not a texinfo index file"
 msgstr "texinfo ìù ñ÷ãðéà õáå÷ åðéà `%s'"
 
-#: util/texindex.c:982
+#: util/texindex.c:968
 #, c-format
 msgid "failure reopening %s"
 msgstr "%s ìù úùãåçî äçéúôá äì÷ú"
 
-#: util/texindex.c:1224
+#: util/texindex.c:1218
 #, c-format
 msgid "No page number in %s"
 msgstr "ãåîò øôñî ïéà %s-á"
 
-#: util/texindex.c:1295
+#: util/texindex.c:1291
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "éðùî íù ìòá èéøô úåá÷òá àá %s èéøô"
 
-#: util/texindex.c:1633
-#, c-format
-msgid "%s; for file `%s'.\n"
-msgstr ".%s äì÷ú äúø÷ `%s' õáå÷á\n"
+#~ msgid "%s: Specify the Info directory only once.\n"
+#~ msgstr ".ãáìá úçà íòô %s-ì Info úéé÷éú ïééöì ïúéð\n"
+
+#~ msgid "\"\" is invalid"
+#~ msgstr "\"\" äéåâù äãå÷ô"
+
+#~ msgid "%s is an invalid ISO code, using %c"
+#~ msgstr "éåâù ISO ãå÷ åðéä %s éë %c-á ùîúùî"
+
+#~ msgid "Cannot specify more than one macro expansion output"
+#~ msgstr "åø÷àîä úåáçøä èìôì ãçà õáå÷ ÷ø ïééöì ïúéð"
+
+#~ msgid "File exists, but is not a directory"
+#~ msgstr "äöéçî åððéàù íéé÷ õáå÷ àöîð"
+
+#~ msgid "First argument to cross-reference may not be empty"
+#~ msgstr "÷éø úåéäì ìåëé åðéà øåùé÷ ìù ïåùàø èðîåâøà"
+
+#~ msgid "see "
+#~ msgstr "see "
+
+#~ msgid "`.' or `,' must follow cross reference, not %c"
+#~ msgstr "%c àìå `,' åà `.' àåáì êéøö øåùé÷ éøçà"
+
+#~ msgid "First argument to @inforef may not be empty"
+#~ msgstr "÷éø úåéäì ìåëé åðéà @inforef ìù ïåùàø èðîåâøà"
+
+#~ msgid "Node:"
+#~ msgstr "Node:"
+
+#~ msgid "%s: TOC should be here, but it was not found"
+#~ msgstr "àöîð àì êà ,%s õáå÷á úåéäì äéä øåîà íéðééðò ïëåú"
+
+#~ msgid "virtual memory exhausted"
+#~ msgstr "éìàèøéåä ïåøëæä øîâð"
+
+#~ msgid "No `%s.png' or `.jpg', and no extension supplied"
+#~ msgstr "úøçà úîåéñ äðéåö àìå åàöîð àì .jpg-å `%s.png'"
+
+#~ msgid "%s; for file `%s'.\n"
+#~ msgstr ".%s äì÷ú äúø÷ `%s' õáå÷á\n"
+
+#~ msgid "`%s' has no Up field"
+#~ msgstr "Up äãù ïéà `%s'-ì"
+
+#~ msgid "\\%-10[scroll-forward]  Scroll forward 1 line.\n"
+#~ msgstr "\\%-10[scroll-forward]  äîéã÷ úçà äøåù ïîñ ææä\n"
+
+#~ msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
+#~ msgstr "\\%-10[scroll-backward]  äøåçà ãçà óã ìåìâ\n"
diff --git a/gnu/usr.bin/texinfo/po/hr.gmo b/gnu/usr.bin/texinfo/po/hr.gmo
index ff3c2c64448..35e246213b3 100644
--- a/gnu/usr.bin/texinfo/po/hr.gmo
+++ b/gnu/usr.bin/texinfo/po/hr.gmo
diff --git a/gnu/usr.bin/texinfo/po/hr.po b/gnu/usr.bin/texinfo/po/hr.po
index 3d64d1528bb..abde350e683 100644
--- a/gnu/usr.bin/texinfo/po/hr.po
+++ b/gnu/usr.bin/texinfo/po/hr.po
@@ -1,254 +1,260 @@
 # Texinfo project .po file for hr_HR localization
 # Copyright (C) 2002 Free Software Foundation, Inc.
 # Mirsad Todorovac <mtodorov_69@yahoo.com>, 2002.
+#     ... wishes to thank to everybody who helped in good faith.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: texinfo 4.0f\n"
-"POT-Creation-Date: 2002-04-01 06:10-0800\n"
-"PO-Revision-Date: 2002-01-24 00:14-MET\n"
+"Project-Id-Version: texinfo 4.2\n"
+"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
+"POT-Creation-Date: 2004-12-21 16:20-0800\n"
+"PO-Revision-Date: 2002-04-26 13:49-MET+DST (UTC+2)\n"
 "Last-Translator: Mirsad Todorovac <mtodorov_69@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: info/echo-area.c:283 info/session.c:712
+#: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr "Pomakni se znak unaprijed"
 
-#: info/echo-area.c:295 info/session.c:728
+#: info/echo-area.c:296 info/session.c:705
 msgid "Move backward a character"
 msgstr "Pomakni se znak unazad"
 
-#: info/echo-area.c:307
+#: info/echo-area.c:308
 msgid "Move to the start of this line"
 msgstr "Pomakni se na poèetak tekuæe linije"
 
-#: info/echo-area.c:312
+#: info/echo-area.c:313
 msgid "Move to the end of this line"
 msgstr "Pomakni se na kraj tekuæe linije"
 
-#: info/echo-area.c:320 info/session.c:746
+#: info/echo-area.c:321 info/session.c:723
 msgid "Move forward a word"
 msgstr "Pomakni se rijeè unaprijed"
 
-#: info/echo-area.c:360 info/session.c:795
+#: info/echo-area.c:361 info/session.c:772
 msgid "Move backward a word"
 msgstr "Pomakni se rijeè unazad"
 
-#: info/echo-area.c:400
+#: info/echo-area.c:401
 msgid "Delete the character under the cursor"
 msgstr "Obri¹i znak ispod kursora"
 
-#: info/echo-area.c:430
+#: info/echo-area.c:431
 msgid "Delete the character behind the cursor"
 msgstr "Obri¹i znak iza kursora"
 
-#: info/echo-area.c:451
+#: info/echo-area.c:452
 msgid "Cancel or quit operation"
 msgstr "Poni¹ti ili prekini operaciju"
 
-#: info/echo-area.c:466
+#: info/echo-area.c:467
 msgid "Accept (or force completion of) this line"
 msgstr "Prihvaæanje (ili tra¾enje kompletiranja) linije"
 
-#: info/echo-area.c:471
+#: info/echo-area.c:472
 msgid "Insert next character verbatim"
 msgstr "Umetni slijedeæi znak doslovno"
 
-#: info/echo-area.c:479
+#: info/echo-area.c:480
 msgid "Insert this character"
 msgstr "Umetni tekuæi znak"
 
-#: info/echo-area.c:497
+#: info/echo-area.c:498
 msgid "Insert a TAB character"
 msgstr "Umetni znak TAB"
 
-#: info/echo-area.c:504
+#: info/echo-area.c:505
 msgid "Transpose characters at point"
-msgstr "Zamijeni mjesta znakovima kod kurzora"
+msgstr "Zamijeni mjesta znakovima pod kurzorom"
 
-#: info/echo-area.c:555
+#: info/echo-area.c:556
 msgid "Yank back the contents of the last kill"
 msgstr "Povrati zadnji obrisani sadr¾aj"
 
-#: info/echo-area.c:562
+#: info/echo-area.c:563
 msgid "Kill ring is empty"
 msgstr "Spremnik za obrisani sadr¾aj je prazan"
 
-#: info/echo-area.c:575
+#: info/echo-area.c:576
 msgid "Yank back a previous kill"
 msgstr "Povrati prije obrisani sadr¾aj"
 
-#: info/echo-area.c:608
+#: info/echo-area.c:609
 msgid "Kill to the end of the line"
 msgstr "Obri¹i tekst do kraja retka"
 
-#: info/echo-area.c:621
+#: info/echo-area.c:622
 msgid "Kill to the beginning of the line"
 msgstr "Obri¹i tekst do poèetka retka"
 
-#: info/echo-area.c:633
+#: info/echo-area.c:634
 msgid "Kill the word following the cursor"
 msgstr "Obri¹i rijeè iza kurzora"
 
-#: info/echo-area.c:652
+#: info/echo-area.c:653
 msgid "Kill the word preceding the cursor"
 msgstr "Obri¹i rijeè ispred kurzora"
 
-#: info/echo-area.c:872 info/echo-area.c:932
+#: info/echo-area.c:868 info/echo-area.c:924
 msgid "No completions"
 msgstr "Ne mogu kompletirati"
 
-#: info/echo-area.c:874
+#: info/echo-area.c:870
 msgid "Not complete"
 msgstr "Nije dovr¹eno"
 
-#: info/echo-area.c:919
+#: info/echo-area.c:911
 msgid "List possible completions"
 msgstr "Izlistaj moguæe varijante kompletiranja"
 
-#: info/echo-area.c:936
+#: info/echo-area.c:928
 msgid "Sole completion"
 msgstr "Jedino moguæe kompletiranje"
 
-#: info/echo-area.c:945
+#: info/echo-area.c:937
 msgid "One completion:\n"
 msgstr "Jedno kompletiranje:\n"
 
-#: info/echo-area.c:946
+#: info/echo-area.c:938
 #, c-format
 msgid "%d completions:\n"
 msgstr "%d kompletiranja:\n"
 
-#: info/echo-area.c:1092
+#: info/echo-area.c:1085
 msgid "Insert completion"
 msgstr "Umetni kompletiranje"
 
-#: info/echo-area.c:1225
+#: info/echo-area.c:1220
 msgid "Building completions..."
 msgstr "Izgraðujem varijante kompletiranja..."
 
-#: info/echo-area.c:1342
+#: info/echo-area.c:1340
 msgid "Scroll the completions window"
 msgstr "'Skrolaj' prozor za varijante kompletiranja"
 
-#: info/footnotes.c:212
+#: info/footnotes.c:213
 msgid "Footnotes could not be displayed"
 msgstr "Ne mogu prikazati fusnote"
 
-#: info/footnotes.c:238
+#: info/footnotes.c:239
 msgid "Show the footnotes associated with this node in another window"
 msgstr "Prika¾i fusnote povezane s ovim èvorom u drugom prozoru"
 
 #: info/footnotes.h:26
 msgid "---------- Footnotes ----------"
-msgstr "---------- Fusnote ----------"
+msgstr "----------- Fusnote -----------"
 
-#: info/indices.c:175
+#: info/indices.c:172
 msgid "Look up a string in the index for this file"
 msgstr "Potra¾i niz u indeksu ove datoteke"
 
-#: info/indices.c:205
+#: info/indices.c:199
 msgid "Finding index entries..."
 msgstr "Tra¾im stavke indeksa..."
 
-#: info/indices.c:212
+#: info/indices.c:207
 msgid "No indices found."
 msgstr "Nije pronaðen indeks."
 
-#: info/indices.c:222
+#: info/indices.c:217
 msgid "Index entry: "
 msgstr "Stavka indeksa: "
 
-#: info/indices.c:332
+#: info/indices.c:325
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr ""
 "Idi na slijedeæu podudarajuæu stavki indeksa zadnje `\\[index-search]' "
 "naredbe"
 
-#: info/indices.c:342
+#: info/indices.c:335
 msgid "No previous index search string."
 msgstr "Nema prethodnog zadanog niza za pretra¾ivanje indeksa."
 
-#: info/indices.c:349
+#: info/indices.c:342
 msgid "No index entries."
 msgstr "Nema stavaka indeksa."
 
-#: info/indices.c:382
-#, c-format
-msgid "No %sindex entries containing \"%s\"."
+#: info/indices.c:375
+#, fuzzy, c-format
+msgid "No %sindex entries containing `%s'."
 msgstr "Nema stavaka %sindeksa koje sadr¾e \"%s\"."
 
-#: info/indices.c:383
+#: info/indices.c:376
 msgid "more "
 msgstr "jo¹ "
 
-#: info/indices.c:393
+#: info/indices.c:386
 msgid "CAN'T SEE THIS"
 msgstr "NE MOGU VIDJETI OVO"
 
-#: info/indices.c:429
-#, c-format
-msgid "Found \"%s\" in %s. (`\\[next-index-match]' tries to find next.)"
+#: info/indices.c:422
+#, fuzzy, c-format
+msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
 msgstr ""
 "Prona¹ao \"%s\" u %s. (`\\[next-index-match]' poku¹ava naæi slijedeæi.)"
 
-#: info/indices.c:549
-#, c-format
-msgid "Scanning indices of \"%s\"..."
+#: info/indices.c:541
+#, fuzzy, c-format
+msgid "Scanning indices of `%s'..."
 msgstr "Skeniram indekse od \"%s\"..."
 
-#: info/indices.c:603
-#, c-format
-msgid "No available info files have \"%s\" in their indices."
+#: info/indices.c:596
+#, fuzzy, c-format
+msgid "No available info files have `%s' in their indices."
 msgstr "Niti jedna raspolo¾iva info datoteka ne sadr¾i \"%s\" u svom indeksu."
 
-#: info/indices.c:632
+#: info/indices.c:622
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr "Propu¾i kroz sve poznate indekse u potrazi za nizom i slo¾i meni"
 
-#: info/indices.c:636
+#: info/indices.c:626
 msgid "Index apropos: "
 msgstr "Indeks apropos: "
 
-#: info/indices.c:666
-#, c-format
+#: info/indices.c:654
+#, fuzzy, c-format
 msgid ""
 "\n"
-"* Menu: Nodes whoses indices contain \"%s\":\n"
+"* Menu: Nodes whose indices contain `%s':\n"
 msgstr ""
 "\n"
 "* Meni: Èvorovi èiji indeksi sadr¾e \"%s\":\n"
 
-#: info/info.c:260 info/infokey.c:884
+#: info/info.c:275 info/infokey.c:899
+#, c-format
 msgid "Try --help for more information.\n"
 msgstr "Poku¹ajte --help za vi¹e informacija.\n"
 
-#: info/info.c:279 info/infokey.c:139 makeinfo/makeinfo.c:689
-#: util/install-info.c:1224 util/texindex.c:338
-#, c-format
+#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
+#: util/texindex.c:343
+#, 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 (C) %s Free Software Foundation, Inc.\n"
+"S ovim programom NE DOLAZE GARANCIJE.  Mo¾ete redistribuirati ovaj software\n"
+"pod uvjetima GNU General Public License.\n"
+"Za vi¹e informacija o ovim stvarima, pogledajte datoteke imena COPYING.\n"
 
-#: info/info.c:462
+#: info/info.c:498
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "nijedna stavka indeksa nije naðena za `%s'\n"
 
-#: info/info.c:555
-#, fuzzy
+#: info/info.c:590
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
 msgstr ""
-" --speech-friendly        vi¹e prijateljski prema sintetizatorima govora.\n"
+"  -b, --speech-friendly        budi vi¹e prijateljski prema sintetizatorima "
+"govora.\n"
 
-#: info/info.c:562
+#: info/info.c:597
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -265,10 +271,12 @@ msgid ""
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
 "  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
-"  -R, --raw-escapes            don't remove ANSI escapes from man pages.\n"
+"  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+"      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
 "  -O, --show-options, --usage  go to command-line options node.\n"
 "%s      --subnodes               recursively output menu items.\n"
+"  -w, --where, --location      print physical location of Info file.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
 "\n"
@@ -289,25 +297,31 @@ msgstr ""
 "\n"
 "Èitanje dokumentacije u Info formatu.\n"
 "\n"
-"Options:\n"
-" --apropos=SUBJEKT        potra¾i SUBJEKT u svim indeksima svih priruènika.\n"
-" --directory=DIR          didaj DIR u INFOPATH.\n"
-" --dribble=IMEDAT         zapamti korisnikovo tipkanje u IMEDAT.\n"
-" --file=IMEDATOTEKE       zadaje ime Info datoteke koju se posjeæuje.\n"
-" --help                   ispi¹i ovu pomoæ i zavr¹i s radom.\n"
-" --index-search=NIZ       idi na èvor na koji pokazuje stavka indeksa NIZ.\n"
-" --node=IMEÈVORA          zadaje èvorove u prvoj posjeæenoj info datoteci.\n"
-" --output=IMEDATOTEKE     ispi¹i izabrane èvorove u IMEDATOTEKE.\n"
-" --restore=IMEDATOTEKE    èitaj inicijalne tipke iz IMEDATOTEKE.\n"
-" --show-options, --usage  idi na èvor sa opcijama komandne linije.\n"
-"%s --subnodes               rekurzivno ispi¹i stavke menija.\n"
-" --vi-keys                koristi tipke kao ¹to su u vi-u i less-u.\n"
-" --version                ispi¹i informaciju o verziji i zavr¹i s radom.\n"
+"Opcije:\n"
+"     --apropos=SUBJEKT        potra¾i SUBJEKT u svim indeksima svih "
+"priruènika.\n"
+" -d, --directory=DIR          dodaj DIR u INFOPATH.\n"
+"     --dribble=IMEDAT         zapamti korisnikovo tipkanje u IMEDAT.\n"
+" -f, --file=IMEDATOTEKE       zadaje ime Info datoteke koju se posjeæuje.\n"
+" -h, --help                   ispi¹i ovu pomoæ i zavr¹i s radom.\n"
+"     --index-search=NIZ       idi na èvor na koji pokazuje stavka indeksa "
+"NIZ.\n"
+" -n, --node=IMEÈVORA          zadaje èvorove u prvoj posjeæenoj info "
+"datoteci.\n"
+" -o, --output=IMEDATOTEKE     ispi¹i izabrane èvorove u IMEDATOTEKE.\n"
+" -R, --raw-escapes            ne uklanjaj ANSI escape sekvence iz man "
+"stranica.\n"
+"     --restore=IMEDATOTEKE    èitaj inicijalne tipke iz IMEDATOTEKE.\n"
+" -O, --show-options, --usage  idi na èvor sa opcijama komandne linije.\n"
+"%s     --subnodes               rekurzivno ispi¹i stavke menija.\n"
+"     --vi-keys                koristi tipke kao ¹to su u vi-u i less-u.\n"
+"     --version                ispi¹i informaciju o verziji i zavr¹i s "
+"radom.\n"
 "\n"
 "Prvi argument koji nije opcija, ako je prisutan, je stavka menija od koje\n"
-"se poèinje; nju se tra¾i u svim `dir' daotekama kroz INFOPATH.\n"
+"se poèinje; nju se tra¾i u svim `dir' datotekama kroz INFOPATH.\n"
 "Ako nije prisutan, info spaja (merge) sve `dir' datoteke i prikazuje\n"
-"resultat. Eventualni preostali argumenti se tretiraju kao imena stavki\n"
+"rezultat. Eventualni preostali argumenti se tretiraju kao imena stavki\n"
 "menija relativno od inicijalno posjeæenog èvora.\n"
 "\n"
 "Primjeri:\n"
@@ -317,426 +331,430 @@ msgstr ""
 "priruènika\n"
 "  info --show-options emacs  zapoèni u èvoru s emacsovim komandnim opcijama\n"
 "  info -f ./foo.info         prika¾i datoteku ./foo.info, zaobilazeæi dir\n"
-"\n"
-"Izvje¹taje o bugovima molimo slati emailom na bug-texinfo@gnu.org,\n"
-"generalna pitanja i diskusije na help-texinfo@gnu.org.\n"
-"Pitanja i kritike glede translacije slati na lokalizacija@linux.hr.\n"
 
-#: info/info.c:598 info/infokey.c:903 makeinfo/makeinfo.c:474
-#: util/install-info.c:421 util/texindex.c:286
+#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
+#: util/install-info.c:466 util/texindex.c:292
 msgid ""
 "\n"
 "Email bug reports to bug-texinfo@gnu.org,\n"
 "general questions and discussion to help-texinfo@gnu.org.\n"
 "Texinfo home page: http://www.gnu.org/software/texinfo/"
 msgstr ""
+"\n"
+"Izvje¹taje o bugovima molimo slati emailom na bug-texinfo@gnu.org\n"
+"(na engleskom), generalna pitanja i diskusije na help-texinfo@gnu.org.\n"
+"Texinfo matièna stranica: http://www.gnu.org/software/texinfo/\n"
+"Pitanja i kritike glede translacije slati na adresu lokalizacija@linux.hr."
 
-#: info/info.c:632
+#: info/info.c:669
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "Ne mogu naæi èvor `%s'."
 
-#: info/info.c:633
+#: info/info.c:670
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "Ne mogu naæi èvor `(%s)%s'."
 
-#: info/info.c:634
+#: info/info.c:671
 msgid "Cannot find a window!"
 msgstr "Ne mogu naæi prozor!"
 
-#: info/info.c:635
+#: info/info.c:672
 msgid "Point doesn't appear within this window's node!"
 msgstr "Toèka se ne nalazi unutar èvora ovog prozora!"
 
-#: info/info.c:636
+#: info/info.c:673
 msgid "Cannot delete the last window."
 msgstr "Ne mogu dokinuti zadnji prozor."
 
-#: info/info.c:637
+#: info/info.c:674
 msgid "No menu in this node."
 msgstr "Nema menija u ovom èvoru."
 
-#: info/info.c:638
+#: info/info.c:675
 msgid "No footnotes in this node."
 msgstr "Nema fusnota u ovom èvoru."
 
-#: info/info.c:639
+#: info/info.c:676
 msgid "No cross references in this node."
 msgstr "Nema unakrsnih referenci u ovom èvoru."
 
-#: info/info.c:640
+#: info/info.c:677
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Nema `%s' pokazivaèa za ovaj èvor."
 
-#: info/info.c:641
+#: info/info.c:678
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "Nepoznata Info naredba `%c'; poku¹ajte `?' za pomoæ."
 
-#: info/info.c:642
+#: info/info.c:679
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr "Terminal tipa `%s' nema dovoljno sposobnosti da izvodi Info."
 
-#: info/info.c:643
+#: info/info.c:680
 msgid "You are already at the last page of this node."
 msgstr "Veæ se nalazite na zadnjoj stranici ovog èvora."
 
-#: info/info.c:644
+#: info/info.c:681
 msgid "You are already at the first page of this node."
 msgstr "Veæ se nalazite na prvoj stranici ovog èvora."
 
-#: info/info.c:645
+#: info/info.c:682
 msgid "Only one window."
 msgstr "Samo jedan prozor."
 
-#: info/info.c:646
+#: info/info.c:683
 msgid "Resulting window would be too small."
 msgstr "Nastali prozor bi bio premalen."
 
-#: info/info.c:647
+#: info/info.c:684
 msgid "Not enough room for a help window, please delete a window."
 msgstr "Nema dovoljno mjesta za prozor za pomoæ, molimo dokinite jedan prozor."
 
-#: info/infodoc.c:45 info/infodoc.c:94
-#, fuzzy
+#: info/infodoc.c:46 info/infodoc.c:95
 msgid ""
 "Basic Commands in Info Windows\n"
 "******************************\n"
-msgstr "Osnovne naredbe u Info Prozorima\n"
+msgstr ""
+"Osnovne naredbe u Info prozorima\n"
+"********************************\n"
 
-#: info/infodoc.c:48
-#, fuzzy
+#: info/infodoc.c:49
 msgid "\\%-10[quit-help]  Quit this help.\n"
-msgstr "  %-10s  Napusti ovu pomoæ.\n"
+msgstr "\\%-10[quit-help]  Napusti ovu pomoæ.\n"
 
-#: info/infodoc.c:49
-#, fuzzy
+#: info/infodoc.c:50
 msgid "\\%-10[quit]  Quit Info altogether.\n"
-msgstr "  %-10s  Potpuno zavr¹i s radom (Quit).\n"
+msgstr "\\%-10[quit]  Potpuno zavr¹i s radom (Quit).\n"
 
-#: info/infodoc.c:50
-#, fuzzy
+#: info/infodoc.c:51
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
-msgstr "  %-10s  Pozovi Info priruènik.\n"
+msgstr "\\%-10[get-info-help-node]  Pozovi Info priruènik.\n"
 
-#: info/infodoc.c:52 info/infodoc.c:101
-#, fuzzy
+#: info/infodoc.c:53 info/infodoc.c:102
 msgid ""
 "Selecting other nodes:\n"
 "----------------------\n"
-msgstr "Selektiranje drugih èvorova:\n"
+msgstr ""
+"Izabir drugih èvorova:\n"
+"----------------------\n"
 
-#: info/infodoc.c:54
-#, fuzzy
+#: info/infodoc.c:55
 msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
-msgstr "  %-10s  Idi na slijedeæi (`next') èvor u odnosu na ovaj.\n"
+msgstr "\\%-10[next-node]  Idi na slijedeæi (`next') èvor u odnosu na ovaj.\n"
 
-#: info/infodoc.c:55
-#, fuzzy
+#: info/infodoc.c:56
 msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
-msgstr "  %-10s  Idi na prethodni (`previous') èvor u odnosu na ovaj.\n"
+msgstr ""
+"\\%-10[prev-node]  Idi na prethodni (`previous') èvor u odnosu na ovaj.\n"
 
-#: info/infodoc.c:56
-#, fuzzy
+#: info/infodoc.c:57
 msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
-msgstr "  %-10s  Idi navi¹e (`up') od ovog èvora.\n"
+msgstr "\\%-10[up-node]  Idi navi¹e (`up') od ovog èvora.\n"
 
-#: info/infodoc.c:57
-#, fuzzy
+#: info/infodoc.c:58
 msgid ""
 "\\%-10[menu-item]  Pick menu item specified by name.\n"
 "              Picking a menu item causes another node to be selected.\n"
-msgstr "              Odabiranje stavke menija selektira drugi èvor.\n"
+msgstr ""
+"\\%-10[menu-item]  Izaberi stavku menija zadanu imenom.\n"
+"              Izabiranje stavke menija selektira drugi èvor.\n"
 
-#: info/infodoc.c:59
-#, fuzzy
+#: info/infodoc.c:60
 msgid ""
 "\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
-msgstr "  %-10s  Slijedi unakrsnu referencu.  Èita ime reference.\n"
+msgstr "\\%-10[xref-item]  Slijedi unakrsnu referencu.  Èita ime reference.\n"
 
-#: info/infodoc.c:60
-#, fuzzy
+#: info/infodoc.c:61
 msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
-msgstr "  %-10s  Pomakni se do posljednjeg vidljivog èvora u ovom prozoru.\n"
+msgstr ""
+"\\%-10[history-node]  Pomakni se do posljednjeg vidljivog èvora u ovom "
+"prozoru.\n"
 
-#: info/infodoc.c:61
-#, fuzzy
+#: info/infodoc.c:62
 msgid ""
 "\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
-msgstr "  %-10s  Preskoèi do slijedeæeg hipertekst linka unutar ovog èvora.\n"
+msgstr ""
+"\\%-10[move-to-next-xref]  Preskoèi do slijedeæeg hipertekst linka unutar "
+"ovog èvora.\n"
 
-#: info/infodoc.c:62
-#, fuzzy
+#: info/infodoc.c:63
 msgid ""
 "\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
 "node.\n"
-msgstr "  %-10s  Preskoèi do slijedeæeg hipertekst linka unutar ovog èvora.\n"
+msgstr ""
+"\\%-10[move-to-prev-xref]  Preskoèi do slijedeæeg hipertekst linka unutar "
+"ovog èvora.\n"
 
-#: info/infodoc.c:63
-#, fuzzy
+#: info/infodoc.c:64
 msgid ""
 "\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
-msgstr "  %-10s  SLijedi hipertekst link ispod kursora.\n"
+msgstr ""
+"\\%-10[select-reference-this-line]  Slijedi hipertekst link ispod kursora.\n"
 
-#: info/infodoc.c:64
-#, fuzzy
+#: info/infodoc.c:65
 msgid ""
 "\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
 "node] (DIR)'.\n"
-msgstr "  %-10s  Pomakni se na `directory' èvor.  Ekvivalentno `g (DIR)'.\n"
+msgstr ""
+"\\%-10[dir-node]  Pomakni se na `directory' èvor.  Ekvivalentno `\\[goto-"
+"node] (DIR)'.\n"
 
-#: info/infodoc.c:65
-#, fuzzy
+#: info/infodoc.c:66
 msgid ""
 "\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
-msgstr "  %-10s  Idi na Top (vr¹ni) èvor.  Ekvivalentno `g Top'.\n"
+msgstr ""
+"\\%-10[top-node]  Idi na Top (vr¹ni) èvor.  Ekvivalentno `\\[goto-node] "
+"Top'.\n"
 
-#: info/infodoc.c:67 info/infodoc.c:115
-#, fuzzy
+#: info/infodoc.c:68 info/infodoc.c:116
 msgid ""
 "Moving within a node:\n"
 "---------------------\n"
-msgstr "Pomicanje unutar èvora:\n"
-
-#: info/infodoc.c:69
-#, fuzzy
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
-msgstr "  %-10s  'Skrolaj stranicu naprijed.\n"
+msgstr ""
+"Pomicanje unutar èvora:\n"
+"-----------------------\n"
 
 #: info/infodoc.c:70
-#, fuzzy
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
-msgstr "  %-10s  'Skrolaj' stranicu unazad.\n"
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "\\%-10[beginning-of-node]  Idi na poèetak ovog èvora.\n"
 
 #: info/infodoc.c:71
-#, fuzzy
-msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
-msgstr "  %-10s  Idi na poèetak ovog èvora.\n"
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgstr "\\%-10[end-of-node]  Idi na kraj ovog èvora.\n"
 
 #: info/infodoc.c:72
 #, fuzzy
-msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
-msgstr "  %-10s  Idi na kraj ovog èvora.\n"
+msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
+msgstr "  %-10s  'Skrolaj' naprijed 1 redak.\n"
 
 #: info/infodoc.c:73
 #, fuzzy
-msgid "\\%-10[scroll-forward]  Scroll forward 1 line.\n"
-msgstr "  %-10s  'Skrolaj' naprijed 1 redak.\n"
+msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
+msgstr "  %-10s  'Skrolaj' unazad 1 redak.\n"
 
 #: info/infodoc.c:74
-#, fuzzy
-msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
-msgstr "  %-10s  'Skrolaj' unazad 1 redak.\n"
+msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
+msgstr "\\%-10[scroll-forward]  'Skrolaj stranicu naprijed.\n"
 
-#: info/infodoc.c:76 info/infodoc.c:124
-#, fuzzy
+#: info/infodoc.c:75
+msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
+msgstr "\\%-10[scroll-backward]  'Skrolaj' stranicu unazad.\n"
+
+#: info/infodoc.c:77 info/infodoc.c:125
 msgid ""
 "Other commands:\n"
 "---------------\n"
-msgstr "Druge naredbe:\n"
+msgstr ""
+"Druge naredbe:\n"
+"--------------\n"
 
-#: info/infodoc.c:78
-#, fuzzy
+#: info/infodoc.c:79
 msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
-msgstr "  %-10s  Odaberi prvu ... devetu stavku u èvorovom meniju.\n"
+msgstr ""
+"\\%-10[menu-digit]  Odaberi prvu ... devetu stavku u èvorovom meniju.\n"
 
-#: info/infodoc.c:79
-#, fuzzy
+#: info/infodoc.c:80
 msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
-msgstr "  %-10s  Odaberi zadnju stavku u èvorovom meniju.\n"
+msgstr "\\%-10[last-menu-item]  Odaberi zadnju stavku u meniju èvora.\n"
 
-#: info/infodoc.c:80
-#, fuzzy
+#: info/infodoc.c:81
 msgid ""
 "\\%-10[index-search]  Search for a specified string in the index entries of "
 "this Info\n"
 "              file, and select the node referenced by the first entry "
 "found.\n"
-msgstr "datoteke, i selektiraj èvor referenciran prvom naðenom stavkom.\n"
+msgstr ""
+"\\%-10[index-search]  Tra¾i zadani niz u indeksnim stavkama ove Info "
+"datoteke\n"
+"              i selektiraj èvor referenciran prvom naðenom stavkom.\n"
 
-#: info/infodoc.c:82
-#, fuzzy
+#: info/infodoc.c:83
 msgid ""
 "\\%-10[goto-node]  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr ""
+"\\%-10[goto-node]  Pomakni se na èvor zadan imenom.\n"
 "              Mo¾ete takoðer ukljuèiti ime datoteke, kao u (DATOTEKA)"
 "IME_ÈVORA.\n"
 
-#: info/infodoc.c:84
-#, fuzzy
+#: info/infodoc.c:85
 msgid ""
 "\\%-10[search]  Search forward for a specified string\n"
 "              and select the node in which the next occurrence is found.\n"
 msgstr ""
+"\\%-10[search]  Tra¾i unaprijed za zadanim nizom\n"
 "              i selektiraj èvor u kojem je slijedeæa pojava niza naðena.\n"
 
-#: info/infodoc.c:86
-#, fuzzy
+#: info/infodoc.c:87
 msgid ""
 "\\%-10[search-backward]  Search backward for a specified string\n"
 "              and select the node in which the previous occurrence is "
 "found.\n"
 msgstr ""
+"\\%-10[search-backward]  Tra¾i unazad zadani niz\n"
 "              i selektiraj èvor u kojem je slijedeæa pojava niza naðena.\n"
 
-#: info/infodoc.c:97
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Quit this help.\n"
 msgstr "  %-10s  Napusti ovu pomoæ.\n"
 
-#: info/infodoc.c:98
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr "  %-10s  Potpuno zavr¹i s radom (Quit).\n"
 
-#: info/infodoc.c:99
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr "  %-10s  Pozovi Info priruènik.\n"
 
-#: info/infodoc.c:103
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
 msgstr "  %-10s  Idi na slijedeæi (`next') èvor u odnosu na ovaj.\n"
 
-#: info/infodoc.c:104
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
 msgstr "  %-10s  Idi na prethodni (`previous') èvor u odnosu na ovaj.\n"
 
-#: info/infodoc.c:105
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
 msgstr "  %-10s  Idi navi¹e (`up') od ovog èvora.\n"
 
-#: info/infodoc.c:106
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Pick menu item specified by name.\n"
 msgstr "  %-10s  Odaberi stavku menija specificirane imenom.\n"
 
-#: info/infodoc.c:107
+#: info/infodoc.c:108
 msgid "              Picking a menu item causes another node to be selected.\n"
 msgstr "              Odabiranje stavke menija selektira drugi èvor.\n"
 
-#: info/infodoc.c:108
+#: info/infodoc.c:109
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
 msgstr "  %-10s  Slijedi unakrsnu referencu.  Èita ime reference.\n"
 
-#: info/infodoc.c:109
+#: info/infodoc.c:110
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
 msgstr "  %-10s  Pomakni se do posljednjeg vidljivog èvora u ovom prozoru.\n"
 
-#: info/infodoc.c:110
+#: info/infodoc.c:111
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
 msgstr "  %-10s  Preskoèi do slijedeæeg hipertekst linka unutar ovog èvora.\n"
 
-#: info/infodoc.c:111
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
-msgstr "  %-10s  SLijedi hipertekst link ispod kursora.\n"
+msgstr "  %-10s  Slijedi hipertekst link ispod kursora.\n"
 
-#: info/infodoc.c:112
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
 msgstr "  %-10s  Pomakni se na `directory' èvor.  Ekvivalentno `g (DIR)'.\n"
 
-#: info/infodoc.c:113
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
-msgstr "  %-10s  Idi na Top (vr¹ni) èvor.  Ekvivalentno `g Top'.\n"
+msgstr "  %-10s  Idi na Top (vr¹ni) èvor.  Ekvivalentno s `g Top'.\n"
 
-#: info/infodoc.c:117
+#: info/infodoc.c:118
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
-msgstr "  %-10s  'Skrolaj stranicu naprijed.\n"
+msgstr "  %-10s  'Skrolaj' stranicu naprijed.\n"
 
-#: info/infodoc.c:118
+#: info/infodoc.c:119
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
 msgstr "  %-10s  'Skrolaj' stranicu unazad.\n"
 
-#: info/infodoc.c:119
+#: info/infodoc.c:120
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
 msgstr "  %-10s  Idi na poèetak ovog èvora.\n"
 
-#: info/infodoc.c:120
+#: info/infodoc.c:121
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
 msgstr "  %-10s  Idi na kraj ovog èvora.\n"
 
-#: info/infodoc.c:121
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
 msgstr "  %-10s  'Skrolaj' naprijed 1 redak.\n"
 
-#: info/infodoc.c:122
+#: info/infodoc.c:123
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
 msgstr "  %-10s  'Skrolaj' unazad 1 redak.\n"
 
-#: info/infodoc.c:126
+#: info/infodoc.c:127
 #, c-format
 msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
 msgstr "  %-10s  Odaberi prvu ... devetu stavku u èvorovom meniju.\n"
 
-#: info/infodoc.c:127
+#: info/infodoc.c:128
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
 msgstr "  %-10s  Odaberi zadnju stavku u èvorovom meniju.\n"
 
-#: info/infodoc.c:128
+#: info/infodoc.c:129
 #, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
 msgstr "  %-10s  Tra¾i zadani niz u indeks stavkama ove Info\n"
 
-#: info/infodoc.c:129
+#: info/infodoc.c:130
 msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
-msgstr "datoteke, i selektiraj èvor referenciran prvom naðenom stavkom.\n"
+msgstr ""
+"              datoteke, i selektiraj èvor referenciran prvom naðenom "
+"stavkom.\n"
 
-#: info/infodoc.c:130
+#: info/infodoc.c:131
 #, c-format
 msgid "  %-10s  Move to node specified by name.\n"
 msgstr "  %-10s  Idi na èvor zadan imenom.\n"
 
-#: info/infodoc.c:131
+#: info/infodoc.c:132
 msgid ""
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr ""
 "              Mo¾ete takoðer ukljuèiti ime datoteke, kao u (DATOTEKA)"
 "IME_ÈVORA.\n"
 
-#: info/infodoc.c:132
-#, fuzzy, c-format
+#: info/infodoc.c:133
+#, c-format
 msgid "  %-10s  Search forward for a specified string,\n"
-msgstr "  %-10s  Tra¾i zadani niz prema naprijed kroz ovu Info datoteku,\n"
+msgstr "  %-10s  Tra¾i prema naprijed zadani niz,\n"
 
-#: info/infodoc.c:133 info/infodoc.c:135
+#: info/infodoc.c:134 info/infodoc.c:136
 msgid ""
 "              and select the node in which the next occurrence is found.\n"
 msgstr ""
 "              i selektiraj èvor u kojem je slijedeæa pojava niza naðena.\n"
 
-#: info/infodoc.c:134
-#, fuzzy, c-format
+#: info/infodoc.c:135
+#, c-format
 msgid "  %-10s  Search backward for a specified string\n"
-msgstr "  %-10s  Tra¾i zadani niz prema natrag u ovoj Info datoteci,\n"
+msgstr "  %-10s  Tra¾i unazad zadani niz,\n"
 
-#: info/infodoc.c:313
+#: info/infodoc.c:316
 msgid "The current search path is:\n"
 msgstr "Trenutni put pretra¾ivanja je:\n"
 
-#: info/infodoc.c:316
+#: info/infodoc.c:320
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
@@ -744,7 +762,7 @@ msgstr ""
 "Naredbe raspolo¾ive u Info prozorima:\n"
 "\n"
 
-#: info/infodoc.c:319
+#: info/infodoc.c:324
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
@@ -752,7 +770,7 @@ msgstr ""
 "Naredbe raspolo¾ive u echo podruèju:\n"
 "\n"
 
-#: info/infodoc.c:340
+#: info/infodoc.c:347
 #, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
@@ -761,7 +779,7 @@ msgstr ""
 "Slijedeæe naredbe mogu biti pozvane pomoæu %s:\n"
 "\n"
 
-#: info/infodoc.c:343
+#: info/infodoc.c:351
 msgid ""
 "The following commands cannot be invoked at all:\n"
 "\n"
@@ -769,158 +787,171 @@ msgstr ""
 "Slijedeæe naredbe ne mogu uopæe biti pozvane:\n"
 "\n"
 
-#: info/infodoc.c:367
+#: info/infodoc.c:375
 msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
 msgstr "--- Upotrijebi `\\[history-node]' ili `\\[kill-node]' za izlaz ---\n"
 
-#: info/infodoc.c:477
+#: info/infodoc.c:485
 msgid "Display help message"
 msgstr "Ispi¹i poruku za pomoæ"
 
-#: info/infodoc.c:495
+#: info/infodoc.c:503
 msgid "Visit Info node `(info)Help'"
 msgstr "Posjeti Info èvor `(info)Help'"
 
-#: info/infodoc.c:638
+#: info/infodoc.c:641
 msgid "Print documentation for KEY"
 msgstr "Ispi¹i dokumentaciju za TIPKU"
 
-#: info/infodoc.c:650
+#: info/infodoc.c:653
 #, c-format
 msgid "Describe key: %s"
 msgstr "Opi¹i tipku: %s"
 
-#: info/infodoc.c:660
+#: info/infodoc.c:664
 #, c-format
 msgid "ESC %s is undefined."
 msgstr "ESC %s nije definiran."
 
-#: info/infodoc.c:676 info/infodoc.c:703
+#: info/infodoc.c:680 info/infodoc.c:709
 #, c-format
 msgid "%s is undefined."
 msgstr "%s nije definiran."
 
-#: info/infodoc.c:724
+#: info/infodoc.c:730
 #, c-format
 msgid "%s is defined to %s."
 msgstr "%s je definiran kao %s."
 
-#: info/infodoc.c:1151
+#: info/infodoc.c:1153
 msgid "Show what to type to execute a given command"
 msgstr "Poka¾i ¹to otipkati da se izvr¹i data naredba"
 
-#: info/infodoc.c:1155
+#: info/infodoc.c:1157
 msgid "Where is command: "
 msgstr "Gdje je naredba: "
 
-#: info/infodoc.c:1177
+#: info/infodoc.c:1179
 #, c-format
 msgid "`%s' is not on any keys"
 msgstr "`%s' nije niti na jednoj tipki"
 
-#: info/infodoc.c:1183
+#: info/infodoc.c:1186
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr "%s mo¾e biti pozvan samo putem %s."
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1190
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr "%s mo¾e biti pozvan putem %s."
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1195
 #, c-format
 msgid "There is no function named `%s'"
 msgstr "Ne postoji funkcija `%s'"
 
-#: info/infokey.c:164
+#: info/infokey.c:145
+#, 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 (C) %s Free Software Foundation, Inc.\n"
+"S ovim programom NE DOLAZE GARANCIJE.  Mo¾ete redistribuirati ovaj software\n"
+"pod uvjetima GNU General Public License.\n"
+"Za vi¹e informacija o ovim stvarima, pogledajte datoteke imena COPYING.\n"
+
+#: info/infokey.c:170
 msgid "incorrect number of arguments"
 msgstr "pogre¹an broj argumenata"
 
-#: info/infokey.c:194
+#: info/infokey.c:201
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "ne mogu otvoriti ulaznu datoteku `%s'"
 
-#: info/infokey.c:207
+#: info/infokey.c:215
 #, c-format
 msgid "cannot create output file `%s'"
 msgstr "ne mogu kreirati izlaznu datoteku `%s'"
 
-#: info/infokey.c:217
+#: info/infokey.c:226
 #, c-format
 msgid "error writing to `%s'"
 msgstr "gre¹ka pri pisanju u `%s'"
 
-#: info/infokey.c:222
+#: info/infokey.c:232
 #, c-format
 msgid "error closing output file `%s'"
 msgstr "gre¹ka pri zatvaranju izlazne datoteke `%s'"
 
-#: info/infokey.c:443
+#: info/infokey.c:450
 msgid "key sequence too long"
 msgstr "niz tipaka predugaèak"
 
-#: info/infokey.c:521
+#: info/infokey.c:529
 msgid "missing key sequence"
 msgstr "nedostaje niz tipaka"
 
-#: info/infokey.c:600
+#: info/infokey.c:610
 msgid "NUL character (\\000) not permitted"
 msgstr "NUL znak (\\000) nije dozvoljen"
 
-#: info/infokey.c:629
+#: info/infokey.c:641
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr "NUL znak (^%c) nije dozvoljen"
 
-#: info/infokey.c:652
+#: info/infokey.c:665
 msgid "missing action name"
 msgstr "nedostaje ime akcije"
 
 # this needs to be clarified and verified against info program, since
 # I'm not sure what kind of section they're talking about
-#: info/infokey.c:667 info/infokey.c:733
+#: info/infokey.c:681 info/infokey.c:756
 msgid "section too long"
 msgstr "predugaèki odlomak"
 
-#: info/infokey.c:673
+#: info/infokey.c:688
 #, c-format
 msgid "unknown action `%s'"
 msgstr "nepoznata akcija `%s'"
 
-#: info/infokey.c:682
+#: info/infokey.c:698
 msgid "action name too long"
 msgstr "predugaèko ime akcije"
 
-#: info/infokey.c:694
+#: info/infokey.c:712
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr "suvi¹ni znaci slijede akciju `%s'"
 
-#: info/infokey.c:704
+#: info/infokey.c:723
 msgid "missing variable name"
 msgstr "nedostaje ime varijable"
 
-#: info/infokey.c:712
+#: info/infokey.c:733
 msgid "missing `=' immediately after variable name"
-msgstr "inedostaje `=' odmah iza imena varijable"
+msgstr "nedostaje `=' odmah iza imena varijable"
 
-#: info/infokey.c:719
+#: info/infokey.c:741
 msgid "variable name too long"
 msgstr "ime varijable predugaèko"
 
-#: info/infokey.c:741
+#: info/infokey.c:765
 msgid "value too long"
 msgstr "predugaèka vrijednost"
 
-#: info/infokey.c:875
+#: info/infokey.c:890
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr "\"%s\", redak %u: "
 
-#: info/infokey.c:891
-#, fuzzy, c-format
+#: info/infokey.c:906
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
 "\n"
@@ -934,34 +965,32 @@ msgid ""
 msgstr ""
 "Kori¹tenje: %s [OPCIJA]... [ULAZNA-DATOTEKA]\n"
 "\n"
-"Opcije:\n"
-"  --output DATOTEKA            izlaz u DATOTEKA umjesto u $HOME/.info\n"
-"  --help                       ispi¹i ovu pomoæ i zavr¹i.\n"
-"  --version                    ispi¹i informaciju o verziji i zavr¹i.\n"
+"Kompiliraj infokey izvornu datoteku u infokey datoteku.  Èita ULAZNA-"
+"DATOTEKA\n"
+"(default $HOME/.infokey) i pi¹e kompiliranu key datoteku u (default)\n"
+"$HOME/.info.\n"
 "\n"
-"Prevedi infokey izvornu datoteku u infokey datoteku. Èita ULAZNA-DATOTEKA\n"
-"(podrazumno $HOME/.infokey) i ispisuje prevedenu key datoteku u $HOME/."
-"info.\n"
-"\n"
-"©aljite izvje¹zaje u bugovima na email bug-texinfo@gnu.org,\n"
-"opæa pitanja i diskusije na help-texinfo@gnu.org.\n"
+"Opcije:\n"
+"  --output DATOTEKA   izlaz u DATOTEKA umjesto u $HOME/.info\n"
+"  --help              ispi¹i ovu pomoæ i zavr¹i s radom.\n"
+"  --version           ispi¹i ovu informaciju o verziji i zavr¹i s radom.\n"
 
-#: info/infomap.c:1397
+#: info/infomap.c:1500
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
 msgstr "Ignoriram neispravnu infokey datoteku `%s' - premalena"
 
-#: info/infomap.c:1400
+#: info/infomap.c:1503
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
 msgstr "Ignoriram neispravnu infokey datoteku `%s' - prevelika"
 
-#: info/infomap.c:1413
+#: info/infomap.c:1516
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
 msgstr "Pogre¹ka pri èitanju infokey datoteke `%s' - prekratki read"
 
-#: info/infomap.c:1431
+#: info/infomap.c:1535
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
@@ -969,13 +998,13 @@ msgstr ""
 "Neispravna infokey datoteka `%s' (pogre¹ni magic number) -- pokreni infokey "
 "da se obnovi"
 
-#: info/infomap.c:1437
+#: info/infomap.c:1544
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
 msgstr ""
 "Va¹a infokey datoteka `%s' je istekla -- pokrenite infokey da se obnovi"
 
-#: info/infomap.c:1450
+#: info/infomap.c:1560
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
@@ -983,7 +1012,7 @@ msgstr ""
 "Neispravna infokey datoteka `%s' (bad section length) -- pokrenite infokey "
 "da se obnovi"
 
-#: info/infomap.c:1470
+#: info/infomap.c:1581
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
@@ -991,54 +1020,60 @@ msgstr ""
 "Neispravna infokey datoteka `%s' (bad section code) -- pokrenite infokey da "
 "se obnovi"
 
-#: info/infomap.c:1608
+#: info/infomap.c:1716
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr ""
-"Pogre¹ni podatci u infokey datoteci -- neka povezivanja tipki zanemarena"
+"Pogre¹ni podaci u infokey datoteci -- neka povezivanja tipki zanemarena"
 
-#: info/infomap.c:1659
+#: info/infomap.c:1766
 msgid "Bad data in infokey file -- some var settings ignored"
-msgstr "Pogre¹ni podatci u infokey datoteci -- neke var postavke ignorirane"
+msgstr "Pogre¹ni podaci u infokey datoteci -- neke var postavke ignorirane"
 
-#: info/m-x.c:70
+#: info/m-x.c:69
 msgid "Read the name of an Info command and describe it"
 msgstr "Proèitaj ime Info naredbe i opi¹i je"
 
-#: info/m-x.c:74
+#: info/m-x.c:73
 msgid "Describe command: "
 msgstr "Opi¹i naredbu: "
 
-#: info/m-x.c:97
+#: info/m-x.c:96
 msgid "Read a command name in the echo area and execute it"
 msgstr "Proèitaj ime naredbe u echo podruèju i izvr¹i je"
 
-#: info/m-x.c:141
+#: info/m-x.c:140
 msgid "Cannot execute an `echo-area' command here."
 msgstr "Ne mogu izvr¹iti komandu za echo podruèje ovdje."
 
-#: info/m-x.c:157
+#: info/m-x.c:154
+#, fuzzy, c-format
+msgid "Undefined command: %s"
+msgstr "Nepoznata naredba (%s)."
+
+#: info/m-x.c:160
 msgid "Set the height of the displayed window"
 msgstr "Postavi visinu prikazanog prozora"
 
-#: info/m-x.c:170
+#: info/m-x.c:173
 #, c-format
 msgid "Set screen height to (%d): "
 msgstr "Postavi velièinu screena na (%d): "
 
-#: info/makedoc.c:161 info/makedoc.c:169
+#: info/makedoc.c:162 info/makedoc.c:170
+#, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
 "\n"
 msgstr ""
-"   Izvorne datoteke prepzane da se ukljuèi ova datoteka:\n"
+"   Izvorne datoteke prepuzane da se ukljuèi ova datoteka:\n"
 "\n"
 
-#: info/makedoc.c:553
+#: info/makedoc.c:550
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "Neuspjelo rukovanje datotekom %s.\n"
 
-#: info/nodemenu.c:28
+#: info/nodemenu.c:31
 msgid ""
 "\n"
 "* Menu:\n"
@@ -1050,7 +1085,7 @@ msgstr ""
 "  (Datoteka)Èvor                    Redaka  Vel.   Sadr¾i datoteku\n"
 "  --------------                    ------  ----   ---------------"
 
-#: info/nodemenu.c:199
+#: info/nodemenu.c:202
 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"
@@ -1058,24 +1093,24 @@ msgstr ""
 "Ovdje je popis èvorova koje ste nedavno posjetili.\n"
 "Odaberite jedan s menija, ili koristite `\\[history-node]' u drugom prozoru\n"
 
-#: info/nodemenu.c:219
+#: info/nodemenu.c:224
 msgid "Make a window containing a menu of all of the currently visited nodes"
 msgstr "Naèini prozor sadr¾avajuæi meni svih dosad posjeæenih èvorova"
 
-#: info/nodemenu.c:299
+#: info/nodemenu.c:304
 msgid "Select a node which has been previously visited in a visible window"
 msgstr "Izaberi èvor koji je prethodno bio posjeæen u vidljivi prozor"
 
-#: info/nodemenu.c:311
+#: info/nodemenu.c:317
 msgid "Select visited node: "
 msgstr "Izaberi posjeæeni èvor: "
 
-#: info/nodemenu.c:331 info/session.c:2235
+#: info/nodemenu.c:337 info/session.c:2264
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr "Referenca je nestala! (%s)."
 
-#: info/session.c:170
+#: info/session.c:162
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1084,109 +1119,109 @@ msgstr ""
 "Dobrodo¹li u Info verzija %s. Otipkajte \\[get-help-window] za pomoæ, "
 "\\[menu-item] za stavku menija."
 
-#: info/session.c:643
+#: info/session.c:620
 msgid "Move down to the next line"
 msgstr "Pomakni se dolje to slijedeæeg retka"
 
-#: info/session.c:658
+#: info/session.c:635
 msgid "Move up to the previous line"
 msgstr "Pomakni se gore do prethodnog retka"
 
-#: info/session.c:673
+#: info/session.c:650
 msgid "Move to the end of the line"
 msgstr "Pomakni se do kraja retka"
 
-#: info/session.c:693
+#: info/session.c:670
 msgid "Move to the start of the line"
-msgstr "Pomekni se na poèetak retka"
+msgstr "Pomakni se na poèetak retka"
 
-#: info/session.c:885 makeinfo/node.c:1357
+#: info/session.c:860 makeinfo/node.c:1424
 msgid "Next"
 msgstr "Next"
 
-#: info/session.c:888
+#: info/session.c:863
 msgid "Following Next node..."
 msgstr "Slijedim Next (slijedeæi) èvor..."
 
-#: info/session.c:905
+#: info/session.c:881
 msgid "Selecting first menu item..."
 msgstr "Izabirem prvu stavku menija..."
 
-#: info/session.c:916
+#: info/session.c:893
 msgid "Selecting Next node..."
 msgstr "Selektiram Next (slijedeæi) èvor..."
 
-#: info/session.c:986
+#: info/session.c:964
 #, c-format
 msgid "Moving Up %d time(s), then Next."
 msgstr "Pomièem se gore (Up) %d put(a), onda Next."
 
-#: info/session.c:1010
+#: info/session.c:988
 msgid "No more nodes within this document."
 msgstr "Nema vi¹e èvorova u ovom dokumentu."
 
-#: info/session.c:1034
+#: info/session.c:1011
 msgid "No `Prev' for this node."
 msgstr "Nema `Prev' (prethodni) za ovaj èvor."
 
-#: info/session.c:1037 info/session.c:1092
+#: info/session.c:1014 info/session.c:1073
 msgid "Moving Prev in this window."
 msgstr "Idemo na Prev (prethodni) u ovom prozoru."
 
-#: info/session.c:1051
+#: info/session.c:1030
 msgid "No `Prev' or `Up' for this node within this document."
 msgstr "Nema `Prev' ni `Up' za ovaj èvor unutar dokumenta."
 
-#: info/session.c:1054
+#: info/session.c:1034
 msgid "Moving Up in this window."
 msgstr "Idem gore (Up) u ovom prozoru."
 
-#: info/session.c:1102
+#: info/session.c:1084
 msgid "Moving to `Prev's last menu item."
 msgstr "Idem na zadnju stavku `Prev'-ovog menija."
 
-#: info/session.c:1113
+#: info/session.c:1095
 msgid "Move forwards or down through node structure"
 msgstr "Idi naprijed ili nani¾e kruz strukturu èvorova"
 
-#: info/session.c:1129
+#: info/session.c:1111
 msgid "Move backwards or up through node structure"
 msgstr "Idi unatrag ili gore kroz strukturu èvorova"
 
-#: info/session.c:1229
+#: info/session.c:1205
 msgid "Scroll forward in this window"
 msgstr "'Skrolaj' prema gore u ovom prozoru"
 
-#: info/session.c:1237
+#: info/session.c:1213
 msgid "Scroll forward in this window and set default window size"
 msgstr ""
 "'Skrolaj' prema dolje u ovom prozoru i postavi inicijalnu velièinu prozora"
 
-#: info/session.c:1245
+#: info/session.c:1221
 msgid "Scroll forward in this window staying within node"
 msgstr "'Skrolaj' prema dolje u ovom prozoru ostajuæi unutar èvora"
 
-#: info/session.c:1253
+#: info/session.c:1229
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr ""
 "'Skrolaj' prema dolje u ovom prozoru ostajuæi unutar èvora i postavi "
 "inicijalnu velièinu prozora"
 
-#: info/session.c:1261
+#: info/session.c:1237
 msgid "Scroll backward in this window"
 msgstr "'Skrolaj' prema gore u ovom prozoru"
 
-#: info/session.c:1269
+#: info/session.c:1245
 msgid "Scroll backward in this window and set default window size"
 msgstr ""
 "'Skrolaj' prema gore u ovom prozoru i postavi inicijalnu velièinu prozora"
 
-#: info/session.c:1278
+#: info/session.c:1254
 msgid "Scroll backward in this window staying within node"
 msgstr "'Skrolaj' prema gore u ovom prozoru ostajuæi unutar èvora"
 
-#: info/session.c:1286
+#: info/session.c:1262
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
@@ -1194,332 +1229,332 @@ msgstr ""
 "'Skrolaj' prema gore u ovom prozoru ostajuæi unutar èvora i postavi "
 "inicijalnu velièinu prozora"
 
-#: info/session.c:1294
+#: info/session.c:1270
 msgid "Move to the start of this node"
 msgstr "Pomakni se na poèetak trenutnog èvora"
 
-#: info/session.c:1301
+#: info/session.c:1277
 msgid "Move to the end of this node"
 msgstr "Pomakni se na kraj trenutnog èvora"
 
-#: info/session.c:1308
+#: info/session.c:1284
 msgid "Scroll down by lines"
 msgstr "'Skrolaj' dolje za redaka"
 
-#: info/session.c:1325
+#: info/session.c:1301
 msgid "Scroll up by lines"
 msgstr "'Skrolaj' gore za redaka"
 
-#: info/session.c:1343
+#: info/session.c:1319
 msgid "Scroll down by half screen size"
 msgstr "'Skrolaj' dolje za polovinu velièine ekrana"
 
-#: info/session.c:1369
+#: info/session.c:1345
 msgid "Scroll up by half screen size"
 msgstr "'Skrolaj' gore za polovinu velièine ekrana"
 
-#: info/session.c:1398
+#: info/session.c:1374
 msgid "Select the next window"
 msgstr "Selektiraj slijedeæi prozor"
 
-#: info/session.c:1437
+#: info/session.c:1413
 msgid "Select the previous window"
 msgstr "Selektiraj prethodni prozor"
 
-#: info/session.c:1488
+#: info/session.c:1464
 msgid "Split the current window"
 msgstr "Raspolovi trenutni prozor"
 
-#: info/session.c:1569
+#: info/session.c:1545
 msgid "Delete the current window"
 msgstr "Obri¹i trenutni prozor"
 
-#: info/session.c:1577
+#: info/session.c:1553
 msgid "Cannot delete a permanent window"
 msgstr "Ne mogu obrisati permanentni prozor"
 
-#: info/session.c:1610
+#: info/session.c:1585
 msgid "Delete all other windows"
 msgstr "Obri¹i sve ostale prozore"
 
-#: info/session.c:1656
+#: info/session.c:1631
 msgid "Scroll the other window"
 msgstr "'Skrolaj' drugi prozor"
 
-#: info/session.c:1677
+#: info/session.c:1652
 msgid "Scroll the other window backward"
 msgstr "'Skrolaj' drugi prozor unazad"
 
-#: info/session.c:1683
+#: info/session.c:1658
 msgid "Grow (or shrink) this window"
 msgstr "Poveæaj (ili smanji) ovaj prozor"
 
-#: info/session.c:1694
+#: info/session.c:1669
 msgid "Divide the available screen space among the visible windows"
 msgstr "Podijeli vidljivu povr¹inu ekrana izmeðu vidljivih prozora"
 
-#: info/session.c:1701
+#: info/session.c:1676
 msgid "Toggle the state of line wrapping in the current window"
 msgstr "Promijeni stanje prelamanja linija u trenutnom prozoru"
 
-#: info/session.c:1880
+#: info/session.c:1848
 msgid "Select the Next node"
 msgstr "Prika¾i Next (slijedeæi) èvor"
 
-#: info/session.c:1888
+#: info/session.c:1856
 msgid "Select the Prev node"
 msgstr "Prika¾i Prev (prethodni) èvor"
 
-#: info/session.c:1896
+#: info/session.c:1864
 msgid "Select the Up node"
 msgstr "Prika¾i Up (gornji) èvor"
 
-#: info/session.c:1903
+#: info/session.c:1871
 msgid "Select the last node in this file"
 msgstr "Prika¾i posljednji èvor u ovoj datoteci"
 
-#: info/session.c:1930 info/session.c:1963
+#: info/session.c:1898 info/session.c:1931
 msgid "This window has no additional nodes"
 msgstr "Ovaj prozor nema dodatnih èvorova"
 
-#: info/session.c:1936
+#: info/session.c:1904
 msgid "Select the first node in this file"
 msgstr "Prika¾i prvi èvor u ovoj datoteci"
 
-#: info/session.c:1970
+#: info/session.c:1938
 msgid "Select the last item in this node's menu"
 msgstr "Prika¾i zadnji èvor u ovoj datoteci"
 
-#: info/session.c:1976
+#: info/session.c:1944
 msgid "Select this menu item"
 msgstr "Selektiraj ovu stavku menija"
 
-#: info/session.c:2005
+#: info/session.c:1977
 #, c-format
 msgid "There aren't %d items in this menu."
 msgstr "Nema %d stavaka u ovom meniju."
 
-#: info/session.c:2148
+#: info/session.c:2171 info/session.c:2172
 #, c-format
 msgid "Menu item (%s): "
 msgstr "Stavka menija (%s): "
 
-#: info/session.c:2150
+#: info/session.c:2175
 msgid "Menu item: "
 msgstr "Stavka menija: "
 
-#: info/session.c:2155
+#: info/session.c:2182 info/session.c:2183
 #, c-format
 msgid "Follow xref (%s): "
 msgstr "Slijedi xref (%s): "
 
-#: info/session.c:2157
+#: info/session.c:2186
 msgid "Follow xref: "
 msgstr "Slijedi xref: "
 
-#: info/session.c:2280
+#: info/session.c:2315
 msgid "Read a menu item and select its node"
 msgstr "Èitaj stavku menija i selektiraj njen èvor"
 
-#: info/session.c:2288
+#: info/session.c:2323
 msgid "Read a footnote or cross reference and select its node"
 msgstr "Èitaj fusnotu ili referencu i selektiraj njezin èvor"
 
-#: info/session.c:2294
+#: info/session.c:2329
 msgid "Move to the start of this node's menu"
 msgstr "Idi na poèetak menija ovog èvora"
 
-#: info/session.c:2318
+#: info/session.c:2353
 msgid "Visit as many menu items at once as possible"
 msgstr "Posjeti ¹to je vi¹e moguæe stavki odjednom"
 
-#: info/session.c:2346
+#: info/session.c:2381
 msgid "Read a node name and select it"
 msgstr "Èitaj ime èvora i selektiraj ga"
 
-#: info/session.c:2401 info/session.c:2405
+#: info/session.c:2436 info/session.c:2441
 msgid "Goto node: "
 msgstr "Idi na èvor: "
 
-#: info/session.c:2471
+#: info/session.c:2505
 #, c-format
 msgid "No menu in node `%s'."
 msgstr "Nema menija u èvoru `%s'."
 
-#: info/session.c:2516
+#: info/session.c:2551
 #, c-format
 msgid "No menu item `%s' in node `%s'."
 msgstr "Nema stavke menija `%s' u èvoru `%s'."
 
-#: info/session.c:2546
+#: info/session.c:2581
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
 msgstr "Ne mogu naæi èvor referenciran od `%s' u `%s'."
 
-#: info/session.c:2597
+#: info/session.c:2631
 msgid "Read a list of menus starting from dir and follow them"
 msgstr "Èitaj listu menija poèev¹i od dir i slijedi ih"
 
-#: info/session.c:2599
+#: info/session.c:2633
 msgid "Follow menus: "
 msgstr "Slijedi menije: "
 
-#: info/session.c:2797
+#: info/session.c:2826
 msgid "Find the node describing program invocation"
 msgstr "Pronaði èvor koji opisuje pozivanje programa"
 
-#: info/session.c:2799
+#: info/session.c:2828
 #, c-format
 msgid "Find Invocation node of [%s]: "
-msgstr "Naði pozivanje (Invocation) èvor od [%s]: "
+msgstr "Naði èvor pozivanja (Invocation) od [%s]: "
 
-#: info/session.c:2837
+#: info/session.c:2866
 msgid "Read a manpage reference and select it"
 msgstr "Proèitaj referentnu man stranicu i selektiraj je"
 
-#: info/session.c:2841
+#: info/session.c:2870
 msgid "Get Manpage: "
 msgstr "Dobavi man stranicu: "
 
-#: info/session.c:2871
+#: info/session.c:2900
 msgid "Select the node `Top' in this file"
 msgstr "Selektiraj èvor `Top' u ovoj datoteci"
 
-#: info/session.c:2877
+#: info/session.c:2906
 msgid "Select the node `(dir)'"
 msgstr "Selektiraj èvor `(dir)'"
 
-#: info/session.c:2897
+#: info/session.c:2923 info/session.c:2925
 #, c-format
 msgid "Kill node (%s): "
 msgstr "Poni¹ti èvor (%s): "
 
-#: info/session.c:2951
+#: info/session.c:2977
 #, c-format
 msgid "Cannot kill node `%s'"
 msgstr "Ne mogu poni¹titi èvor `%s'"
 
-#: info/session.c:2961
+#: info/session.c:2987
 msgid "Cannot kill the last node"
 msgstr "Ne mogu poni¹titi zadnji èvor"
 
-#: info/session.c:3047
+#: info/session.c:3073
 msgid "Select the most recently selected node"
 msgstr "Selektiraj najzadnji odabrani èvor"
 
-#: info/session.c:3053
+#: info/session.c:3079
 msgid "Kill this node"
 msgstr "Poni¹ti ovaj èvor"
 
-#: info/session.c:3061
+#: info/session.c:3087
 msgid "Read the name of a file and select it"
 msgstr "Proèitaj ime datoteke i selektiraj ga"
 
-#: info/session.c:3065
+#: info/session.c:3091
 msgid "Find file: "
 msgstr "Naði datoteku: "
 
-#: info/session.c:3082
+#: info/session.c:3108
 #, c-format
 msgid "Cannot find `%s'."
 msgstr "Ne mogu naæi `%s'."
 
-#: info/session.c:3127 info/session.c:3248
+#: info/session.c:3151 info/session.c:3269
 #, c-format
 msgid "Could not create output file `%s'."
 msgstr "Ne mogu kreirati izlaznu datoteku `%s'."
 
-#: info/session.c:3140 info/session.c:3265 info/session.c:3326
+#: info/session.c:3165 info/session.c:3287 info/session.c:3347
 msgid "Done."
 msgstr "Gotovo."
 
-#: info/session.c:3196
+#: info/session.c:3220
 #, c-format
 msgid "Writing node %s..."
 msgstr "Ispisujem èvor %s..."
 
-#: info/session.c:3274
+#: info/session.c:3296
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
 msgstr ""
 "Propusti sadr¾aj ovog èvora kroz cjevovod (pipe) prema INFO_PRINT_COMMAND"
 
-#: info/session.c:3310
+#: info/session.c:3331
 #, c-format
 msgid "Cannot open pipe to `%s'."
 msgstr "Ne mogu otvoriti cjevovod (pipe) prema `%s'."
 
-#: info/session.c:3316
+#: info/session.c:3337
 #, c-format
 msgid "Printing node %s..."
 msgstr "Ispisujem èvor %s..."
 
-#: info/session.c:3558
+#: info/session.c:3567
 #, c-format
 msgid "Searching subfile %s ..."
 msgstr "Tra¾im poddatoteku %s ..."
 
-#: info/session.c:3610
+#: info/session.c:3619
 msgid "Read a string and search for it case-sensitively"
 msgstr "Èitaj niz znakova i kreni u potragu za njim (case-sensitive)"
 
-#: info/session.c:3617
+#: info/session.c:3626
 msgid "Read a string and search for it"
 msgstr "Èitaj niz znakova i potra¾i ga"
 
-#: info/session.c:3625
+#: info/session.c:3634
 msgid "Read a string and search backward for it"
 msgstr "Èitaj niz znakova i potra¾i ga unatrag"
 
-#: info/session.c:3667
+#: info/session.c:3670 info/session.c:3677
 #, c-format
 msgid "%s%sfor string [%s]: "
 msgstr "%s%sza niz znakova [%s]: "
 
-#: info/session.c:3668
+#: info/session.c:3671 info/session.c:3678
 msgid "Search backward"
 msgstr "Tra¾i unazad"
 
-#: info/session.c:3668
+#: info/session.c:3672 info/session.c:3678
 msgid "Search"
 msgstr "Tra¾i"
 
-#: info/session.c:3669
+#: info/session.c:3673 info/session.c:3679
 msgid " case-sensitively "
 msgstr " (case-sensitive) "
 
-#: info/session.c:3669
+#: info/session.c:3674 info/session.c:3679
 msgid " "
 msgstr " "
 
-#: info/session.c:3709
+#: info/session.c:3718
 msgid "Search failed."
 msgstr "Pretra¾ivanje neuspjelo."
 
-#: info/session.c:3727
+#: info/session.c:3736
 msgid "Repeat last search in the same direction"
 msgstr "Ponovi zadnje pretra¾ivanje u istom pravcu"
 
-#: info/session.c:3730 info/session.c:3740
+#: info/session.c:3739 info/session.c:3749
 msgid "No previous search string"
-msgstr "Nema prethodnog trazenog niza"
+msgstr "Nema prethodnog tra¾enog niza"
 
-#: info/session.c:3737
+#: info/session.c:3746
 msgid "Repeat last search in the reverse direction"
 msgstr "Ponovi zadnje pretra¾ivanje u suprotnom pravcu"
 
-#: info/session.c:3755 info/session.c:3761
+#: info/session.c:3765 info/session.c:3771
 msgid "Search interactively for a string as you type it"
 msgstr "Tra¾i niz interaktivno kako ga tipkate"
 
-#: info/session.c:3855
+#: info/session.c:3851
 msgid "I-search backward: "
-msgstr "I-pretraga unazad"
+msgstr "I-pretraga unazad: "
 
-#: info/session.c:3857
+#: info/session.c:3853
 msgid "I-search: "
 msgstr "I-pretraga: "
 
-#: info/session.c:3882
+#: info/session.c:3878 info/session.c:3880
 msgid "Failing "
 msgstr "Neuspjela "
 
@@ -1535,29 +1570,29 @@ msgstr "Idi na slijedeæu referencu"
 msgid "Select reference or menu item appearing on this line"
 msgstr "Selektiraj referencu ili stavku menija koja se pojavljuje u retku"
 
-#: info/session.c:4381
+#: info/session.c:4382
 msgid "Cancel current operation"
 msgstr "Poni¹ti trenutnu operaciju"
 
-#: info/session.c:4388
+#: info/session.c:4389
 msgid "Quit"
 msgstr "Zavr¹i (Quit)"
 
-#: info/session.c:4397
+#: info/session.c:4398
 msgid "Move the cursor to a specific line of the window"
 msgstr "Pomakni kurzor na specificirani redak prozora"
 
-#: info/session.c:4429
+#: info/session.c:4430
 msgid "Redraw the display"
 msgstr "Osvje¾i prikaz"
 
-#: info/session.c:4466
+#: info/session.c:4467
 msgid "Quit using Info"
 msgstr "Zavr¹i kori¹tenje Info-a"
 
-#: info/session.c:4479
+#: info/session.c:4480
 msgid "Run command bound to this key's lowercase variant"
-msgstr ""
+msgstr "Izvr¹i naredbu povezanu s malim slovom varijantom ove tipke"
 
 #: info/session.c:4491
 #, c-format
@@ -1565,27 +1600,29 @@ msgid "Unknown command (%s)."
 msgstr "Nepoznata naredba (%s)."
 
 #: info/session.c:4494
-msgid "\"\" is invalid"
-msgstr "\"\" je neispravno"
-
-#: info/session.c:4495
 #, c-format
 msgid "\"%s\" is invalid"
 msgstr "\"%s\" je neispravno"
 
-#: info/session.c:4713
+#: info/session.c:4495
+#, fuzzy, c-format
+msgid "`%s' is invalid"
+msgstr "\"%s\" je neispravno"
+
+#: info/session.c:4709
 msgid "Add this digit to the current numeric argument"
 msgstr "Dodaj ovu znamenku trenutnom numerièkom argumentu"
 
-#: info/session.c:4722
+#: info/session.c:4718
 msgid "Start (or multiply by 4) the current numeric argument"
 msgstr "Zapoèni (ili pomno¾i s 4) trenutni numerièki argument"
 
-#: info/session.c:4737
+#: info/session.c:4733
 msgid "Internally used by \\[universal-argument]"
 msgstr "Interno kori¹ten od \\[universal-argument]"
 
-#: info/tilde.c:344
+#: info/tilde.c:338
+#, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: Premalo virtualne memorije!\n"
 
@@ -1653,232 +1690,266 @@ msgstr "Postavi %s na vrijednost (%d): "
 #: info/variables.c:164
 #, c-format
 msgid "Set %s to value (%s): "
-msgstr "Postavi %s na vrijednost (%s):"
+msgstr "Postavi %s na vrijednost (%s): "
 
-#: info/window.c:1164
+#: info/window.c:1138
 msgid "--*** Tags out of Date ***"
 msgstr "--*** Tagovima istekao rok trajanja ***"
 
-#: info/window.c:1175
+#: info/window.c:1149
 msgid "-----Info: (), lines ----, "
 msgstr "-----Info: (), redaka ----,"
 
-#: info/window.c:1182
+#: info/window.c:1156
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr "-%s---Info: %s, %d redaka --%s--"
 
-#: info/window.c:1186
+#: info/window.c:1160
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr "-%s%s-Info: (%s)%s, %d redaka --%s--"
 
-#: info/window.c:1193
+#: info/window.c:1167
 #, c-format
 msgid " Subfile: %s"
 msgstr " Poddatoteka: %s"
 
-#: lib/getopt.c:675
+#: lib/getopt.c:551 lib/getopt.c:570
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: opcija `%s' nije jednoznaèna\n"
 
-#: lib/getopt.c:700
+#: lib/getopt.c:603 lib/getopt.c:607
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: opcija `--%s' ne dopu¹ta argument\n"
 
-#: lib/getopt.c:705
+#: lib/getopt.c:616 lib/getopt.c:621
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: opcija `%c%s' ne dopu¹ta argument\n"
 
-#: lib/getopt.c:723 lib/getopt.c:896
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: opcija `%s' tra¾i neophodan argument\n"
 
-#: lib/getopt.c:752
+#: lib/getopt.c:727 lib/getopt.c:730
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: nepoznata opcija `--%s'\n"
 
-#: lib/getopt.c:756
+#: lib/getopt.c:738 lib/getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: nepoznata opcija `%c%s'\n"
 
-#: lib/getopt.c:782
+#: lib/getopt.c:796 lib/getopt.c:799
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: nedozvoljena opcija -- %c\n"
 
-#: lib/getopt.c:785
+#: lib/getopt.c:805 lib/getopt.c:808
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: pogre¹na opcija -- %c\n"
 
-#: lib/getopt.c:815 lib/getopt.c:945
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: opcija zahtijeva argument -- %c\n"
 
-#: lib/getopt.c:862
+#: lib/getopt.c:935 lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: opcija `-W %s' nije jednoznaèna\n"
 
-#: lib/getopt.c:880
+#: lib/getopt.c:978 lib/getopt.c:999
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: opcija `-W %s' ne dopu¹ta argument\n"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#, c-format
+msgid "arguments to @%s ignored"
+msgstr ""
+
+#: makeinfo/cmds.c:585
 msgid "January"
 msgstr ""
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "February"
 msgstr ""
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "March"
 msgstr ""
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "April"
 msgstr ""
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "May"
 msgstr ""
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "June"
 msgstr ""
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "July"
 msgstr ""
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "August"
 msgstr ""
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "September"
 msgstr ""
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "October"
 msgstr ""
 
-#: makeinfo/cmds.c:517
+#: makeinfo/cmds.c:587
 msgid "November"
 msgstr ""
 
-#: makeinfo/cmds.c:517
+#: makeinfo/cmds.c:587
 msgid "December"
 msgstr ""
 
-#: makeinfo/cmds.c:658
+#: makeinfo/cmds.c:936
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr ""
 
-#: makeinfo/cmds.c:701
+#: makeinfo/cmds.c:979
 msgid "@sc argument all uppercase, thus no effect"
 msgstr ""
 
-#: makeinfo/cmds.c:759
+#: makeinfo/cmds.c:1034
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr ""
 
-#: makeinfo/cmds.c:789
+#: makeinfo/cmds.c:1074
 msgid "end of file inside verb block"
 msgstr ""
 
-#: makeinfo/cmds.c:797
+#: makeinfo/cmds.c:1082
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr ""
 
-#: makeinfo/cmds.c:942
+#: makeinfo/cmds.c:1112
+msgid ""
+"@strong{Note...} produces a spurious cross-reference in Info; reword to "
+"avoid that"
+msgstr ""
+
+#: makeinfo/cmds.c:1305
 #, c-format
 msgid "%c%s is obsolete"
 msgstr ""
 
-#: makeinfo/cmds.c:1014
+#: makeinfo/cmds.c:1414
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr ""
 
-#: makeinfo/cmds.c:1348 makeinfo/cmds.c:1374 makeinfo/footnote.c:81
+#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr ""
 
-#: makeinfo/cmds.c:1358 makeinfo/makeinfo.c:4140
+#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
 msgid "asis"
 msgstr ""
 
-#: makeinfo/cmds.c:1360 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
 msgid "none"
 msgstr ""
 
-#: makeinfo/defun.c:85
+#: makeinfo/cmds.c:1789
+#, c-format
+msgid "Bad argument to @%s"
+msgstr ""
+
+#: makeinfo/cmds.c:1803
+msgid "insert"
+msgstr ""
+
+#: makeinfo/defun.c:84
 msgid "Missing `}' in @def arg"
 msgstr ""
 
-#: makeinfo/defun.c:363
+#: makeinfo/defun.c:403
 msgid "Function"
 msgstr ""
 
-#: makeinfo/defun.c:366
+#: makeinfo/defun.c:406
 msgid "Macro"
 msgstr ""
 
-#: makeinfo/defun.c:369
+#: makeinfo/defun.c:409
 msgid "Special Form"
 msgstr ""
 
-#: makeinfo/defun.c:373
+#: makeinfo/defun.c:413
 msgid "Variable"
 msgstr ""
 
-#: makeinfo/defun.c:376
+#: makeinfo/defun.c:416
 msgid "User Option"
 msgstr ""
 
-#: makeinfo/defun.c:380
+#: makeinfo/defun.c:420
 msgid "Instance Variable"
 msgstr ""
 
-#: makeinfo/defun.c:384
+#: makeinfo/defun.c:424
 msgid "Method"
 msgstr ""
 
-#: makeinfo/defun.c:466 makeinfo/defun.c:470 makeinfo/defun.c:615
-#: makeinfo/defun.c:631 makeinfo/defun.c:671
+#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
+#: makeinfo/defun.c:644 makeinfo/xml.c:2229
 msgid "of"
 msgstr ""
 
-#: makeinfo/defun.c:474 makeinfo/defun.c:478 makeinfo/defun.c:482
-#: makeinfo/defun.c:624 makeinfo/defun.c:676
+#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
 msgid "on"
 msgstr ""
 
-#: makeinfo/defun.c:717
+#: makeinfo/defun.c:711
 #, c-format
-msgid "Must be in `%s' insertion to use `%sx'"
+msgid "Must be in `@%s' environment to use `@%s'"
 msgstr ""
 
-#: makeinfo/files.c:448
+#: makeinfo/files.c:435
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr ""
 
+#: makeinfo/files.c:638
+#, c-format
+msgid "`%s' omitted before output filename"
+msgstr ""
+
+#: makeinfo/files.c:646
+#, c-format
+msgid "`%s' omitted since writing to stdout"
+msgstr ""
+
+#: makeinfo/files.c:694
+msgid "Output buffer not empty."
+msgstr ""
+
 #: makeinfo/footnote.c:150
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
@@ -1897,233 +1968,280 @@ msgstr ""
 msgid "Footnotes inside footnotes are not allowed"
 msgstr ""
 
-#: makeinfo/footnote.c:298
+#: makeinfo/footnote.c:302 makeinfo/index.c:189
 msgid "Footnotes"
 msgstr ""
 
-#: makeinfo/html.c:42
+#: makeinfo/html.c:87
+#, c-format
+msgid "%s: could not open --css-file: %s"
+msgstr ""
+
+#: makeinfo/html.c:172
+#, c-format
+msgid "%s:%d: --css-file ended in comment"
+msgstr ""
+
+#: makeinfo/html.c:207
 msgid "Untitled"
 msgstr ""
 
-#: makeinfo/html.c:298
+#: makeinfo/html.c:422
+msgid "[unexpected] no html tag to pop"
+msgstr ""
+
+#: makeinfo/html.c:752
 #, c-format
-msgid "Invalid node name: `%s'"
+msgid "[unexpected] invalid node name: `%s'"
 msgstr ""
 
-#: makeinfo/index.c:213
+#: makeinfo/index.c:169
 #, c-format
 msgid "Unknown index `%s'"
 msgstr ""
 
-#: makeinfo/index.c:238
+#: makeinfo/index.c:234
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr ""
 
-#: makeinfo/index.c:396
+#: makeinfo/index.c:412
 #, c-format
 msgid "Index `%s' already exists"
 msgstr ""
 
-#: makeinfo/index.c:439
+#: makeinfo/index.c:455
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr ""
 
-#: makeinfo/index.c:666
+#: makeinfo/index.c:661
+msgid "(line )"
+msgstr ""
+
+#: makeinfo/index.c:669
+#, c-format
+msgid "(line %*d)"
+msgstr ""
+
+#: makeinfo/index.c:750
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr ""
 
-#: makeinfo/index.c:709
+#: makeinfo/index.c:819
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr ""
 
-#: makeinfo/index.c:712 makeinfo/index.c:751
+#: makeinfo/index.c:822 makeinfo/index.c:858
 msgid "(outside of any node)"
 msgstr ""
 
-#: makeinfo/insertion.c:198
+#: makeinfo/index.c:919 makeinfo/index.c:925
+msgid "See "
+msgstr ""
+
+#: makeinfo/insertion.c:160
+msgid "@item not allowed in argument to @itemize"
+msgstr ""
+
+#: makeinfo/insertion.c:238
 msgid "Broken-Type in insertion_type_pname"
 msgstr ""
 
-#: makeinfo/insertion.c:271
+#: makeinfo/insertion.c:334
 msgid "Enumeration stack overflow"
 msgstr ""
 
-#: makeinfo/insertion.c:303
+#: makeinfo/insertion.c:366
 #, c-format
 msgid "lettering overflow, restarting at %c"
 msgstr ""
 
-#: makeinfo/insertion.c:538
+#: makeinfo/insertion.c:631
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
 msgstr ""
 
-#: makeinfo/insertion.c:693
+#: makeinfo/insertion.c:719
+#, c-format
+msgid "%cfloat environments cannot be nested"
+msgstr ""
+
+#: makeinfo/insertion.c:973
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
 msgstr ""
 
-#: makeinfo/insertion.c:931
+#: makeinfo/insertion.c:1337
 #, c-format
 msgid "No matching `%cend %s'"
 msgstr ""
 
-#: makeinfo/insertion.c:1084
+#: makeinfo/insertion.c:1592
 #, c-format
 msgid "%s requires letter or digit"
 msgstr ""
 
-#: makeinfo/insertion.c:1158
+#: makeinfo/insertion.c:1687
 msgid "end of file inside verbatim block"
 msgstr ""
 
-#: makeinfo/insertion.c:1318
+#: makeinfo/insertion.c:1913
+#, c-format
+msgid "@%s not meaningful outside `@float' environment"
+msgstr ""
+
+#: makeinfo/insertion.c:1949
 msgid "@menu seen before first @node, creating `Top' node"
 msgstr ""
 
-#: makeinfo/insertion.c:1319
+#: makeinfo/insertion.c:1950
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr ""
 
-#: makeinfo/insertion.c:1331
+#: makeinfo/insertion.c:1962
 msgid "@detailmenu seen before first node, creating `Top' node"
 msgstr ""
 
-#: makeinfo/insertion.c:1346
+#: makeinfo/insertion.c:2018
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr ""
+
+#: makeinfo/insertion.c:2032
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' environment"
+msgstr ""
+
+#: makeinfo/insertion.c:2063
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr ""
 
-#: makeinfo/insertion.c:1353
+#: makeinfo/insertion.c:2068
 #, c-format
 msgid "`%c%s' needs something after it"
 msgstr ""
 
-#: makeinfo/insertion.c:1359
+#: makeinfo/insertion.c:2074
 #, c-format
-msgid "Bad argument to `%s', `%s', using `%s'"
+msgid "Bad argument `%s' to `@%s', using `%s'"
 msgstr ""
 
-#: makeinfo/insertion.c:1453
+#: makeinfo/insertion.c:2171
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
 msgstr ""
 
-#: makeinfo/insertion.c:1462
+#: makeinfo/insertion.c:2180
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
 msgstr ""
 
-#: makeinfo/insertion.c:1646
+#: makeinfo/insertion.c:2356
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr ""
 
-#: makeinfo/lang.c:331
+#: makeinfo/lang.c:580
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr ""
 
-#: makeinfo/lang.c:384
-#, c-format
-msgid "unrecogized encoding name `%s'"
-msgstr ""
+#: makeinfo/lang.c:655
+#, fuzzy, c-format
+msgid "unrecognized encoding name `%s'"
+msgstr "%s: nepoznata opcija `%c%s'\n"
 
-#: makeinfo/lang.c:387
+#: makeinfo/lang.c:663
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr ""
 
-#: makeinfo/lang.c:414
+#: makeinfo/lang.c:715
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr ""
 
-#: makeinfo/lang.c:502
-#, c-format
-msgid "%s is an invalid ISO code, using %c"
-msgstr ""
-
-#: makeinfo/lang.c:687
+#: makeinfo/lang.c:1009
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr ""
 
-#: makeinfo/lang.c:691
+#: makeinfo/lang.c:1013
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr ""
 
-#: makeinfo/macro.c:134
+#: makeinfo/macro.c:128
 #, c-format
 msgid "macro `%s' previously defined"
 msgstr ""
 
-#: makeinfo/macro.c:138
+#: makeinfo/macro.c:132
 #, c-format
 msgid "here is the previous definition of `%s'"
 msgstr ""
 
 #: makeinfo/macro.c:355
 #, c-format
-msgid "\\ in macro expansion followed by `%s' instead of \\ or parameter name"
+msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr ""
 
-#: makeinfo/macro.c:403
+#: makeinfo/macro.c:401
 #, c-format
 msgid "Macro `%s' called on line %d with too many args"
 msgstr ""
 
-#: makeinfo/macro.c:594
+#: makeinfo/macro.c:586
 #, c-format
 msgid "%cend macro not found"
 msgstr ""
 
-#: makeinfo/macro.c:632
+#: makeinfo/macro.c:624
 msgid "@quote-arg only useful for single-argument macros"
 msgstr ""
 
-#: makeinfo/macro.c:668
+#: makeinfo/macro.c:660
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:316
+#: makeinfo/makeinfo.c:184
 #, c-format
-msgid "%s:%d: warning: "
+msgid "Too many errors!  Gave up.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:339
-msgid "Too many errors!  Gave up.\n"
+#: makeinfo/makeinfo.c:302
+#, c-format
+msgid "%s:%d: warning: "
 msgstr ""
 
-#: makeinfo/makeinfo.c:350 makeinfo/makeinfo.c:2026
+#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
 #, c-format
 msgid "Misplaced %c"
 msgstr ""
 
-#: makeinfo/makeinfo.c:370
+#: makeinfo/makeinfo.c:340
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:373
+#: makeinfo/makeinfo.c:343
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:376
+#: makeinfo/makeinfo.c:346
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:380
+#: makeinfo/makeinfo.c:350
 #, c-format
 msgid ""
 "General options:\n"
@@ -2138,16 +2256,17 @@ msgid ""
 "      --version               display version information and exit.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:394
+#: makeinfo/makeinfo.c:364
 #, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output DocBook rather than Info.\n"
+"      --docbook             output Docbook XML rather than Info.\n"
 "      --html                output HTML rather than Info.\n"
-"      --xml                 output XML (TexinfoML) rather than Info.\n"
+"      --xml                 output Texinfo XML rather than Info.\n"
+"      --plaintext           output plain text rather than Info.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:401
+#: makeinfo/makeinfo.c:372
 msgid ""
 "General output options:\n"
 "  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
@@ -2163,7 +2282,7 @@ msgid ""
 "  -o, --output=FILE         output to FILE (directory if split HTML),\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:386
 #, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2182,43 +2301,68 @@ msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d).\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:433
+#: makeinfo/makeinfo.c:403
+msgid ""
+"Options for HTML:\n"
+"      --css-include=FILE        include FILE in HTML <style> output;\n"
+"                                  read stdin if FILE is -.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:409
+#, c-format
+msgid ""
+"Options for XML and Docbook:\n"
+"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"d).\n"
+"                                  If VAL is 0, ignorable whitespace is "
+"dropped.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:416
 msgid ""
 "Input file options:\n"
-"      --commands-in-node-names   allow @ commands in node names.\n"
-"  -D VAR                         define the variable VAR, as with @set.\n"
-"  -I DIR                         append DIR to the @include search path.\n"
-"  -P DIR                         prepend DIR to the @include search path.\n"
-"  -U VAR                         undefine the variable VAR, as with @clear.\n"
+"      --commands-in-node-names  allow @ commands in node names.\n"
+"  -D VAR                        define the variable VAR, as with @set.\n"
+"  -I DIR                        append DIR to the @include search path.\n"
+"  -P DIR                        prepend DIR to the @include search path.\n"
+"  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:442
+#: makeinfo/makeinfo.c:425
 msgid ""
 "Conditional processing in input:\n"
+"  --ifdocbook       process @ifdocbook and @docbook even if\n"
+"                      not generating Docbook.\n"
 "  --ifhtml          process @ifhtml and @html even if not generating HTML.\n"
 "  --ifinfo          process @ifinfo even if not generating Info.\n"
 "  --ifplaintext     process @ifplaintext even if not generating plain text.\n"
 "  --iftex           process @iftex and @tex; implies --no-split.\n"
+"  --ifxml           process @ifxml and @xml.\n"
+"  --no-ifdocbook    do not process @ifdocbook and @docbook text.\n"
 "  --no-ifhtml       do not process @ifhtml and @html text.\n"
 "  --no-ifinfo       do not process @ifinfo text.\n"
 "  --no-ifplaintext  do not process @ifplaintext text.\n"
 "  --no-iftex        do not process @iftex and @tex text.\n"
+"  --no-ifxml        do not process @ifxml and @xml text.\n"
+"\n"
+"  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:454
+#: makeinfo/makeinfo.c:444
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating HTML, --ifhtml is on and the others are off;\n"
 "  if generating Info, --ifinfo is on and the others are off;\n"
 "  if generating plain text, --ifplaintext is on and the others are off;\n"
+"  if generating XML, --ifxml is on and the others are off.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:461
+#: makeinfo/makeinfo.c:452
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                     write Info to foo's @setfilename\n"
 "  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write XML to @setfilename\n"
+"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
 "  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
 "  makeinfo --no-headers foo.texi        write plain text to standard output\n"
 "\n"
@@ -2228,393 +2372,392 @@ msgid ""
 "  makeinfo --no-split foo.texi          write one Info file however big\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:570 makeinfo/makeinfo.c:593 makeinfo/makeinfo.c:655
-#: makeinfo/makeinfo.c:676
+#: makeinfo/makeinfo.c:603
 #, c-format
-msgid "%s: %s arg must be numeric, not `%s'.\n"
+msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:583
+#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
+#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
 #, c-format
-msgid "Couldn't open macro expansion output `%s'"
+msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:586
-msgid "Cannot specify more than one macro expansion output"
+#: makeinfo/makeinfo.c:660
+#, fuzzy, c-format
+msgid "%s: could not open macro expansion output `%s'"
+msgstr "Ne mogu kreirati izlaznu datoteku `%s'."
+
+#: makeinfo/makeinfo.c:665
+#, c-format
+msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:624
+#: makeinfo/makeinfo.c:707
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:723
+#: makeinfo/makeinfo.c:806
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:898
+#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
 #, c-format
-msgid "Expected `%s'"
+msgid "Multiline command %c%s used improperly"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1365
-msgid "File exists, but is not a directory"
+#: makeinfo/makeinfo.c:1000
+#, c-format
+msgid "Expected `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1366
+#: makeinfo/makeinfo.c:1479
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1414
+#: makeinfo/makeinfo.c:1525
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1496
+#: makeinfo/makeinfo.c:1605
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1526
+#: makeinfo/makeinfo.c:1638
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1561
+#: makeinfo/makeinfo.c:1673
 #, c-format
 msgid "This is %s, produced by makeinfo version %s from %s.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1583
+#: makeinfo/makeinfo.c:1709
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1627
+#: makeinfo/makeinfo.c:1773
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1853
+#: makeinfo/makeinfo.c:2034
 #, c-format
 msgid "Unknown command `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1875
+#: makeinfo/makeinfo.c:2056
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2068
+#: makeinfo/makeinfo.c:2314
 #, c-format
-msgid "%c%s expected `{...}'"
+msgid "%c%s expected braces"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2098
+#: makeinfo/makeinfo.c:2327
 msgid "Unmatched }"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2148
+#: makeinfo/makeinfo.c:2375
 msgid "NO_NAME!"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2169
+#: makeinfo/makeinfo.c:2396
 #, c-format
 msgid "%c%s missing close brace"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2958
-msgid "First argument to cross-reference may not be empty"
-msgstr ""
-
-#: makeinfo/makeinfo.c:3018 makeinfo/makeinfo.c:3236 makeinfo/xml.c:1340
-msgid "see "
-msgstr ""
-
-#: makeinfo/makeinfo.c:3018
-msgid "See "
-msgstr ""
-
-#: makeinfo/makeinfo.c:3164
-#, c-format
-msgid "`.' or `,' must follow cross reference, not %c"
-msgstr ""
-
-#: makeinfo/makeinfo.c:3212
-msgid "First argument to @inforef may not be empty"
-msgstr ""
-
-#: makeinfo/makeinfo.c:3427
+#: makeinfo/makeinfo.c:3309
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3440
-#, c-format
-msgid "No `%s.png' or `.jpg', and no extension supplied"
-msgstr ""
+#: makeinfo/makeinfo.c:3315
+#, fuzzy, c-format
+msgid "No such file `%s'"
+msgstr "Nema menija u èvoru `%s'."
 
-#: makeinfo/makeinfo.c:3490
+#: makeinfo/makeinfo.c:3447
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3497
+#: makeinfo/makeinfo.c:3456
 msgid "@image missing filename argument"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3690
+#: makeinfo/makeinfo.c:3675
+#, c-format
+msgid "undefined flag: %s"
+msgstr ""
+
+#: makeinfo/makeinfo.c:3676
 #, c-format
 msgid "{No value for `%s'}"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3744
+#: makeinfo/makeinfo.c:3728
 #, c-format
 msgid "%c%s requires a name"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3850
+#: makeinfo/makeinfo.c:3834
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:4081
+#: makeinfo/makeinfo.c:4082
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr ""
 
-#: makeinfo/multi.c:226
+#: makeinfo/multi.c:116
 msgid "Missing } in @multitable template"
 msgstr ""
 
-#: makeinfo/multi.c:302
+#: makeinfo/multi.c:254
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr ""
 
-#: makeinfo/multi.c:375
+#: makeinfo/multi.c:393
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr ""
 
-#: makeinfo/multi.c:426
+#: makeinfo/multi.c:555
 #, c-format
-msgid "Cannot select column #%d in multitable"
+msgid "[unexpected] cannot select column #%d in multitable"
 msgstr ""
 
-#: makeinfo/multi.c:529
+#: makeinfo/multi.c:584
 msgid "ignoring @tab outside of multitable"
 msgstr ""
 
-#: makeinfo/multi.c:565
+#: makeinfo/multi.c:632
+#, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr ""
 
-#: makeinfo/multi.c:568
+#: makeinfo/multi.c:635
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr ""
 
-#: makeinfo/node.c:276
+#: makeinfo/node.c:280
 #, c-format
 msgid "Node `%s' previously defined at line %d"
 msgstr ""
 
-#: makeinfo/node.c:594
+#: makeinfo/node.c:648
 #, c-format
 msgid "Formatting node %s...\n"
 msgstr ""
 
-#: makeinfo/node.c:655
+#: makeinfo/node.c:716
 #, c-format
-msgid "Node `%s' requires a sectioning command (e.g. %c%s)"
+msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
 msgstr ""
 
-#: makeinfo/node.c:815
+#: makeinfo/node.c:879
 #, c-format
 msgid "No node name specified for `%c%s' command"
 msgstr ""
 
-#: makeinfo/node.c:856 makeinfo/node.c:1075
+#: makeinfo/node.c:920 makeinfo/node.c:1151
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr ""
 
-#: makeinfo/node.c:859
+#: makeinfo/node.c:923
 msgid "This @anchor command ignored; references to it will not work"
 msgstr ""
 
-#: makeinfo/node.c:861 makeinfo/node.c:1078
+#: makeinfo/node.c:925 makeinfo/node.c:1154
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr ""
 
-#: makeinfo/node.c:891
+#: makeinfo/node.c:955
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
 msgstr ""
 
-#: makeinfo/node.c:920
-msgid "Node:"
-msgstr ""
-
-#: makeinfo/node.c:930
+#: makeinfo/node.c:991
 msgid "Next:"
 msgstr ""
 
-#: makeinfo/node.c:940
+#: makeinfo/node.c:1007
 msgid "Previous:"
 msgstr ""
 
-#: makeinfo/node.c:950
+#: makeinfo/node.c:1021
 msgid "Up:"
 msgstr ""
 
-#: makeinfo/node.c:1072
+#: makeinfo/node.c:1148
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr ""
 
-#: makeinfo/node.c:1077
+#: makeinfo/node.c:1153
 msgid "@anchor command ignored; references to it will not work"
 msgstr ""
 
-#: makeinfo/node.c:1277
+#: makeinfo/node.c:1347
 #, c-format
-msgid "%s reference to nonexistent node `%s'"
+msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1294
+#: makeinfo/node.c:1363
 msgid "Menu"
 msgstr ""
 
-#: makeinfo/node.c:1296
+#: makeinfo/node.c:1365
 msgid "Cross"
 msgstr ""
 
-#: makeinfo/node.c:1380
+#: makeinfo/node.c:1447
 #, c-format
-msgid "Next field of node `%s' not pointed to"
+msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1383
+#: makeinfo/node.c:1450
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr ""
 
-#: makeinfo/node.c:1395
+#: makeinfo/node.c:1462
 msgid "Prev"
 msgstr ""
 
-#: makeinfo/node.c:1438
+#: makeinfo/node.c:1505
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr ""
 
-#: makeinfo/node.c:1442
+#: makeinfo/node.c:1509
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr ""
 
-#: makeinfo/node.c:1454
+#: makeinfo/node.c:1521
 #, c-format
-msgid "`%s' has no Up field"
+msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1457
+#: makeinfo/node.c:1524
 msgid "Up"
 msgstr ""
 
-#: makeinfo/node.c:1523
+#: makeinfo/node.c:1590
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr ""
 
-#: makeinfo/node.c:1552
+#: makeinfo/node.c:1619
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr ""
 
-#: makeinfo/node.c:1566
+#: makeinfo/node.c:1633
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr ""
 
-#: makeinfo/sectioning.c:117
+#: makeinfo/node.c:1723
 #, c-format
-msgid "Appendix %c "
+msgid "Removing %s\n"
 msgstr ""
 
-#: makeinfo/sectioning.c:356 makeinfo/sectioning.c:444
+#: makeinfo/node.c:1727
+#, fuzzy, c-format
+msgid "Can't remove file `%s': %s"
+msgstr "ne mogu kreirati izlaznu datoteku `%s'"
+
+#: makeinfo/sectioning.c:122
+#, c-format
+msgid "Appendix %c"
+msgstr ""
+
+#: makeinfo/sectioning.c:467
+#, c-format
+msgid "Internal error (search_sectioning) `%s'!"
+msgstr ""
+
+#: makeinfo/sectioning.c:562
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
 msgstr ""
 
-#: makeinfo/sectioning.c:502
+#: makeinfo/sectioning.c:623
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr ""
 
-#: makeinfo/sectioning.c:518
+#: makeinfo/sectioning.c:639
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr ""
 
-#: makeinfo/sectioning.c:526
+#: makeinfo/sectioning.c:647
 #, c-format
 msgid "Here is the %ctop node"
 msgstr ""
 
-#: makeinfo/sectioning.c:543
+#: makeinfo/sectioning.c:663
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr ""
 
-#: makeinfo/toc.c:221 makeinfo/toc.c:298 makeinfo/toc.c:299
+#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
 msgid "Table of Contents"
 msgstr ""
 
-#: makeinfo/toc.c:330 makeinfo/toc.c:366 makeinfo/toc.c:367
+#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
 msgid "Short Contents"
 msgstr ""
 
-#: makeinfo/toc.c:406
+#: makeinfo/xml.c:1605
 #, c-format
-msgid "%s: TOC should be here, but it was not found"
+msgid "@image file `%s' unreadable: %s"
 msgstr ""
 
-#: makeinfo/xml.c:1108
-#, c-format
-msgid "@image file `%s' unreadable: %s"
+#: makeinfo/xml.c:2097
+msgid ""
+"@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
 
-#: util/install-info.c:151
+#: util/install-info.c:154
 #, c-format
 msgid "%s: warning: "
 msgstr ""
 
-#: util/install-info.c:176 util/install-info.c:189
-msgid "virtual memory exhausted"
-msgstr ""
-
-#: util/install-info.c:232
+#: util/install-info.c:203
 #, c-format
 msgid " for %s"
 msgstr ""
 
-#: util/install-info.c:381
+#: util/install-info.c:426
 #, c-format
 msgid "\tTry `%s --help' for a complete list of options.\n"
 msgstr ""
 
-#: util/install-info.c:389
+#: util/install-info.c:434
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
@@ -2651,7 +2794,7 @@ msgid ""
 " --version         display version information and exit.\n"
 msgstr ""
 
-#: util/install-info.c:444
+#: util/install-info.c:488
 #, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
@@ -2668,130 +2811,136 @@ msgid ""
 "  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
 "  to select it.\n"
 "\n"
-"* Menu:\n"
+"%s\n"
 msgstr ""
 
-#: util/install-info.c:467
+#: util/install-info.c:513
 #, c-format
 msgid "%s: could not read (%s) and could not create (%s)\n"
 msgstr ""
 
-#: util/install-info.c:551
+#: util/install-info.c:600
 #, c-format
 msgid "%s: empty file"
 msgstr ""
 
-#: util/install-info.c:866 util/install-info.c:906
+#: util/install-info.c:913 util/install-info.c:953
 msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
 msgstr ""
 
-#: util/install-info.c:901
+#: util/install-info.c:948
 msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
 msgstr ""
 
-#: util/install-info.c:1150 util/install-info.c:1160
+#: util/install-info.c:1191 util/install-info.c:1201
 #, c-format
-msgid "%s: Specify the Info directory only once.\n"
+msgid "%s: already have dir file: %s\n"
 msgstr ""
 
-#: util/install-info.c:1195
+#: util/install-info.c:1236
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr ""
 
-#: util/install-info.c:1244
+#: util/install-info.c:1284
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr ""
 
-#: util/install-info.c:1248
+#: util/install-info.c:1288
 msgid "No input file specified; try --help for more information."
 msgstr ""
 
-#: util/install-info.c:1251
+#: util/install-info.c:1291
 msgid "No dir file specified; try --help for more information."
 msgstr ""
 
-#: util/install-info.c:1273
+#: util/install-info.c:1313
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr ""
 
-#: util/install-info.c:1388
+#: util/install-info.c:1426
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr ""
 
-#: util/install-info.c:1411
+#: util/install-info.c:1449
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr ""
 
-#: util/texindex.c:245
+#: util/texindex.c:252
 msgid "display this help and exit"
 msgstr ""
 
-#: util/texindex.c:247
+#: util/texindex.c:254
 msgid "keep temporary files around after processing"
 msgstr ""
 
-#: util/texindex.c:249
+#: util/texindex.c:256
 msgid "do not keep temporary files around after processing (default)"
 msgstr ""
 
-#: util/texindex.c:251
+#: util/texindex.c:258
 msgid "send output to FILE"
 msgstr ""
 
-#: util/texindex.c:253
+#: util/texindex.c:260
 msgid "display version information and exit"
 msgstr ""
 
-#: util/texindex.c:264
+#: util/texindex.c:270
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr ""
 
-#: util/texindex.c:265
+#: util/texindex.c:271
+#, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr ""
 
-#: util/texindex.c:268
+#: util/texindex.c:274
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr ""
 
-#: util/texindex.c:270
+#: util/texindex.c:276
+#, c-format
 msgid ""
 "\n"
 "Options:\n"
 msgstr ""
 
-#: util/texindex.c:887 util/texindex.c:921 util/texindex.c:997
-#: util/texindex.c:1025
+#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
+#: util/texindex.c:1011
 #, c-format
 msgid "%s: not a texinfo index file"
 msgstr ""
 
-#: util/texindex.c:982
+#: util/texindex.c:968
 #, c-format
 msgid "failure reopening %s"
 msgstr ""
 
-#: util/texindex.c:1224
+#: util/texindex.c:1218
 #, c-format
 msgid "No page number in %s"
 msgstr ""
 
-#: util/texindex.c:1295
+#: util/texindex.c:1291
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr ""
 
-#: util/texindex.c:1633
-#, c-format
-msgid "%s; for file `%s'.\n"
-msgstr ""
+#~ msgid "\"\" is invalid"
+#~ msgstr "\"\" je neispravno"
+
+#~ msgid "\\%-10[scroll-forward]  Scroll forward 1 line.\n"
+#~ msgstr "\\%-10[scroll-forward]  'Skrolaj' naprijed 1 redak.\n"
+
+#~ msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
+#~ msgstr "\\%-10[scroll-backward]  'Skrolaj' unazad 1 redak.\n"
 
 #~ msgid ""
 #~ "Basic Commands in Info Windows\n"
@@ -2901,14 +3050,43 @@ msgstr ""
 #~ "datoteku,\n"
 #~ "              i selektiraj èvor u kojem je slijedeæa pojava niza naðena.\n"
 
-#~ msgid "******************************\n"
-#~ msgstr "********************************\n"
+#~ msgid "Basic Commands in Info Windows\n"
+#~ msgstr "Osnovne naredbe u Info Prozorima\n"
+
+#~ msgid "Moving within a node:\n"
+#~ msgstr "Pomicanje unutar èvora:\n"
 
-#~ msgid "---------------------\n"
-#~ msgstr "-----------------------\n"
+#~ msgid "Selecting other nodes:\n"
+#~ msgstr "Selektiranje drugih èvorova:\n"
 
-#~ msgid "----------------------\n"
-#~ msgstr "----------------------------\n"
+#~ msgid "Other commands:\n"
+#~ msgstr "Druge naredbe:\n"
 
-#~ msgid "---------------\n"
-#~ msgstr "--------------\n"
+#~ msgid ""
+#~ "Usage: %s [OPTION]... [INPUT-FILE]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  --output FILENAME            output to FILENAME instead of $HOME/.info\n"
+#~ "  --help                       display this help and exit.\n"
+#~ "  --version                    display version information and exit.\n"
+#~ "\n"
+#~ "Compile infokey source file to infokey file.  Reads INPUT-FILE (default\n"
+#~ "$HOME/.infokey) and writes compiled key file to $HOME/.info.\n"
+#~ "\n"
+#~ "Email bug reports to bug-texinfo@gnu.org,\n"
+#~ "general questions and discussion to help-texinfo@gnu.org.\n"
+#~ msgstr ""
+#~ "Kori¹tenje: %s [OPCIJA]... [ULAZNA-DATOTEKA]\n"
+#~ "\n"
+#~ "Opcije:\n"
+#~ "  --output DATOTEKA            izlaz u DATOTEKA umjesto u $HOME/.info\n"
+#~ "  --help                       ispi¹i ovu pomoæ i zavr¹i.\n"
+#~ "  --version                    ispi¹i informaciju o verziji i zavr¹i.\n"
+#~ "\n"
+#~ "Prevedi infokey izvornu datoteku u infokey datoteku. Èita ULAZNA-"
+#~ "DATOTEKA\n"
+#~ "(podrazumno $HOME/.infokey) i ispisuje prevedenu key datoteku u $HOME/."
+#~ "info.\n"
+#~ "\n"
+#~ "©aljite izvje¹zaje u bugovima na email bug-texinfo@gnu.org,\n"
+#~ "opæa pitanja i diskusije na help-texinfo@gnu.org.\n"
diff --git a/gnu/usr.bin/texinfo/po/ja.gmo b/gnu/usr.bin/texinfo/po/ja.gmo
index 110b524f554..ff3f98bcc5e 100644
--- a/gnu/usr.bin/texinfo/po/ja.gmo
+++ b/gnu/usr.bin/texinfo/po/ja.gmo
diff --git a/gnu/usr.bin/texinfo/po/ja.po b/gnu/usr.bin/texinfo/po/ja.po
index 38321b07fec..c94fc3ad937 100644
--- a/gnu/usr.bin/texinfo/po/ja.po
+++ b/gnu/usr.bin/texinfo/po/ja.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU texinfo 4.0f\n"
-"POT-Creation-Date: 2002-04-01 06:10-0800\n"
+"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
+"POT-Creation-Date: 2004-12-21 16:20-0800\n"
 "PO-Revision-Date: 2002-01-23 20:46+0900\n"
 "Last-Translator: Daisuke Yamashita <yamad@mb.infoweb.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -13,132 +14,132 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: info/echo-area.c:283 info/session.c:712
+#: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr "°ìʸ»úʬ¿Ê¤á¤ë"
 
-#: info/echo-area.c:295 info/session.c:728
+#: info/echo-area.c:296 info/session.c:705
 msgid "Move backward a character"
 msgstr "°ìʸ»úʬÌ᤹"
 
-#: info/echo-area.c:307
+#: info/echo-area.c:308
 msgid "Move to the start of this line"
 msgstr "¹ÔƬ¤Ë°ÜÆ°"
 
-#: info/echo-area.c:312
+#: info/echo-area.c:313
 msgid "Move to the end of this line"
 msgstr "¹ÔËö¤Ë°ÜÆ°"
 
-#: info/echo-area.c:320 info/session.c:746
+#: info/echo-area.c:321 info/session.c:723
 msgid "Move forward a word"
 msgstr "ñ¸ì°ì¤Äʬ¿Ê¤á¤ë"
 
-#: info/echo-area.c:360 info/session.c:795
+#: info/echo-area.c:361 info/session.c:772
 msgid "Move backward a word"
 msgstr "ñ¸ì°ì¤ÄʬÌ᤹"
 
-#: info/echo-area.c:400
+#: info/echo-area.c:401
 msgid "Delete the character under the cursor"
 msgstr "¥«¡¼¥½¥ë°ÌÃÖ¤Îʸ»ú¤òºï½ü"
 
-#: info/echo-area.c:430
+#: info/echo-area.c:431
 msgid "Delete the character behind the cursor"
 msgstr "¥«¡¼¥½¥ë¤Î¸å¤í¤Îʸ»ú¤òºï½ü"
 
-#: info/echo-area.c:451
+#: info/echo-area.c:452
 msgid "Cancel or quit operation"
 msgstr "¥­¥ã¥ó¥»¥ë¡¢Áàºî¤Î¼è¤ê»ß¤á"
 
-#: info/echo-area.c:466
+#: info/echo-area.c:467
 msgid "Accept (or force completion of) this line"
 msgstr "¤³¤Î¹Ô¤ò¼õ¤±Æþ¤ì¤ë(Ëô¤ÏÊä´°¤µ¤»¤ë)"
 
-#: info/echo-area.c:471
+#: info/echo-area.c:472
 msgid "Insert next character verbatim"
 msgstr "¼¡¤Îʸ»ú¤ò¤½¤Î¤Þ¤ÞÁÞÆþ¤¹¤ë"
 
-#: info/echo-area.c:479
+#: info/echo-area.c:480
 msgid "Insert this character"
 msgstr "¤³¤Îʸ»ú¤òÁÞÆþ¤¹¤ë"
 
-#: info/echo-area.c:497
+#: info/echo-area.c:498
 msgid "Insert a TAB character"
 msgstr "¥¿¥Öʸ»ú¤òÁÞÆþ¤¹¤ë"
 
-#: info/echo-area.c:504
+#: info/echo-area.c:505
 msgid "Transpose characters at point"
 msgstr "ʸ»ú¤Î¸ò´¹"
 
-#: info/echo-area.c:555
+#: info/echo-area.c:556
 msgid "Yank back the contents of the last kill"
 msgstr "¥­¥ë¥ê¥ó¥°¤ÎÆâÍƤòŽ¤ê¤Ä¤±¤ë"
 
-#: info/echo-area.c:562
+#: info/echo-area.c:563
 msgid "Kill ring is empty"
 msgstr "¥­¥ë¥ê¥ó¥°¤¬¶õ¤Ç¤¹"
 
-#: info/echo-area.c:575
+#: info/echo-area.c:576
 msgid "Yank back a previous kill"
 msgstr "°ÊÁ°¤Î¥­¥ë¥ê¥ó¥°ÆâÍƤòÁÞÆþ¤¹¤ë"
 
-#: info/echo-area.c:608
+#: info/echo-area.c:609
 msgid "Kill to the end of the line"
 msgstr "¹ÔËö¤Þ¤Ç¤òÀÚ¤ê¼è¤ë"
 
-#: info/echo-area.c:621
+#: info/echo-area.c:622
 msgid "Kill to the beginning of the line"
 msgstr "¹ÔƬ¤Þ¤Ç¤òÀÚ¤ê¼è¤ë"
 
-#: info/echo-area.c:633
+#: info/echo-area.c:634
 msgid "Kill the word following the cursor"
 msgstr "ñ¸ì¤Î¥«¡¼¥½¥ë¤è¤ê¤â¸å¤òÀÚ¤ê¼è¤ë"
 
-#: info/echo-area.c:652
+#: info/echo-area.c:653
 msgid "Kill the word preceding the cursor"
 msgstr "ñ¸ì¤Î¥«¡¼¥½¥ë¤è¤êÁ°¤òÀÚ¤ê¼è¤ë"
 
-#: info/echo-area.c:872 info/echo-area.c:932
+#: info/echo-area.c:868 info/echo-area.c:924
 msgid "No completions"
 msgstr "Êä´°¸õÊ䤬¤¢¤ê¤Þ¤»¤ó"
 
-#: info/echo-area.c:874
+#: info/echo-area.c:870
 msgid "Not complete"
 msgstr "Êä´°¤Ç¤­¤Þ¤»¤ó"
 
-#: info/echo-area.c:919
+#: info/echo-area.c:911
 msgid "List possible completions"
 msgstr "Êä´°¥ê¥¹¥È"
 
-#: info/echo-area.c:936
+#: info/echo-area.c:928
 msgid "Sole completion"
 msgstr "Êä´°¤ò¹Ê¤ê¹þ¤ß¤Þ¤·¤¿"
 
-#: info/echo-area.c:945
+#: info/echo-area.c:937
 msgid "One completion:\n"
 msgstr "1 ¤Ä¤ÎÊä´°:\n"
 
-#: info/echo-area.c:946
+#: info/echo-area.c:938
 #, c-format
 msgid "%d completions:\n"
 msgstr "%d ¸Ä¤ÎÊä´°\n"
 
-#: info/echo-area.c:1092
+#: info/echo-area.c:1085
 msgid "Insert completion"
 msgstr "Êä´°¤òÁÞÆþ"
 
-#: info/echo-area.c:1225
+#: info/echo-area.c:1220
 msgid "Building completions..."
 msgstr "Êä´°¥ê¥¹¥È¤òºîÀ®Ãæ..."
 
-#: info/echo-area.c:1342
+#: info/echo-area.c:1340
 msgid "Scroll the completions window"
 msgstr "Êä´°¥¦¥£¥ó¥É¥¦¤ò¥¹¥¯¥í¡¼¥ë"
 
-#: info/footnotes.c:212
+#: info/footnotes.c:213
 msgid "Footnotes could not be displayed"
 msgstr "µÓÃí¤òɽ¼¨¤Ç¤­¤Þ¤»¤ó"
 
-#: info/footnotes.c:238
+#: info/footnotes.c:239
 msgid "Show the footnotes associated with this node in another window"
 msgstr "¾¤Î¥¦¥£¥ó¥É¥¦Æâ¤Ë¤³¤Î¥Î¡¼¥É¤È´ØÏ¢¤·¤¿µÓÃí¤òɽ¼¨"
 
@@ -146,90 +147,90 @@ msgstr "¾¤Î¥¦¥£¥ó¥É¥¦Æâ¤Ë¤³¤Î¥Î¡¼¥É¤È´ØÏ¢¤·¤¿µÓÃí¤òɽ¼¨"
 msgid "---------- Footnotes ----------"
 msgstr "------------ µÓÃí ------------"
 
-#: info/indices.c:175
+#: info/indices.c:172
 msgid "Look up a string in the index for this file"
 msgstr "¤³¤Î¥Õ¥¡¥¤¥ë¤Î¸«½Ð¤·¤«¤éʸ»úÎó¤ò¸¡º÷¤¹¤ë"
 
-#: info/indices.c:205
+#: info/indices.c:199
 msgid "Finding index entries..."
 msgstr "¸«½Ð¤·¹àÌܤò¸«¤Ä¤±¤Æ¤¤¤Þ¤¹"
 
-#: info/indices.c:212
+#: info/indices.c:207
 msgid "No indices found."
 msgstr "¹àÌܤ¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: info/indices.c:222
+#: info/indices.c:217
 msgid "Index entry: "
 msgstr "¸«½Ð¤·¹àÌÜ: "
 
-#: info/indices.c:332
+#: info/indices.c:325
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr "ľÁ°¤Î `\\[index-search]' ¥³¥Þ¥ó¥É¤È°ìÃפ·¤¿¸«½Ð¤·¥¢¥¤¥Æ¥à¤òé¤ë"
 
-#: info/indices.c:342
+#: info/indices.c:335
 msgid "No previous index search string."
 msgstr "Á°¤Î¸«½Ð¤·¸¡º÷ʸ»úÎ󤬤¢¤ê¤Þ¤»¤ó"
 
-#: info/indices.c:349
+#: info/indices.c:342
 msgid "No index entries."
 msgstr "¸«½Ð¤·¹àÌܤ¬¤¢¤ê¤Þ¤»¤ó"
 
-#: info/indices.c:382
-#, c-format
-msgid "No %sindex entries containing \"%s\"."
+#: info/indices.c:375
+#, fuzzy, c-format
+msgid "No %sindex entries containing `%s'."
 msgstr "\"%2$s\" ¤ò´Þ¤à%1$s¸«½Ð¤·¹àÌܤ¬¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: info/indices.c:383
+#: info/indices.c:376
 msgid "more "
 msgstr "¤³¤ì°Ê¾å¤Î"
 
-#: info/indices.c:393
+#: info/indices.c:386
 msgid "CAN'T SEE THIS"
 msgstr "*¤³¤ì¤ò¸«¤é¤ì¤Þ¤»¤ó*"
 
-#: info/indices.c:429
-#, c-format
-msgid "Found \"%s\" in %s. (`\\[next-index-match]' tries to find next.)"
+#: info/indices.c:422
+#, fuzzy, c-format
+msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
 msgstr ""
 "%1$s ¤«¤é \"%2$s\" ¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿¡£(`\\[next-index-match]' ¤Ç¼¡¤òõ¤·¤Þ¤¹)"
 
-#: info/indices.c:549
-#, c-format
-msgid "Scanning indices of \"%s\"..."
+#: info/indices.c:541
+#, fuzzy, c-format
+msgid "Scanning indices of `%s'..."
 msgstr "\"%s\" ¤Î¸«½Ð¤·¤òÄ´¤Ù¤Æ¤¤¤Þ¤¹..."
 
-#: info/indices.c:603
-#, c-format
-msgid "No available info files have \"%s\" in their indices."
+#: info/indices.c:596
+#, fuzzy, c-format
+msgid "No available info files have `%s' in their indices."
 msgstr "¥¤¥ó¥Ç¥Ã¥¯¥¹¤Ë \"%s\" ¤ò»ý¤Ã¤Æ¤¤¤ë info ¥Õ¥¡¥¤¥ë¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: info/indices.c:632
+#: info/indices.c:622
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr "Á´¤Æ¤Î info ¥Õ¥¡¥¤¥ëʸ»úÎ󤫤鸫½Ð¤·¤òÁöºº¤·¡¢¥á¥Ë¥å¡¼¤òºîÀ®"
 
-#: info/indices.c:636
+#: info/indices.c:626
 msgid "Index apropos: "
 msgstr "¸ì¶ç¤ò´Þ¤à¹àÌܤò¸¡º÷: "
 
-#: info/indices.c:666
-#, c-format
+#: info/indices.c:654
+#, fuzzy, c-format
 msgid ""
 "\n"
-"* Menu: Nodes whoses indices contain \"%s\":\n"
+"* Menu: Nodes whose indices contain `%s':\n"
 msgstr ""
 "\n"
 "* ¥á¥Ë¥å¡¼: \"%s\" ¤ò´Þ¤à¸«½Ð¤·¹àÌÜ\n"
 
-#: info/info.c:260 info/infokey.c:884
+#: info/info.c:275 info/infokey.c:899
+#, c-format
 msgid "Try --help for more information.\n"
 msgstr "¾Ü¤·¤¯¤Ï --help ¥ª¥×¥·¥ç¥ó¤ò»î¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: info/info.c:279 info/infokey.c:139 makeinfo/makeinfo.c:689
-#: util/install-info.c:1224 util/texindex.c:338
-#, c-format
+#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
+#: util/texindex.c:343
+#, 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"
@@ -245,17 +246,17 @@ msgstr ""
 "¤³¤Î¥½¥Õ¥È¥¦¥§¥¢¤òºÆÇÛÉۤǤ­¤Þ¤¹¡£¤³¤ì¤é¤Ë¤Ä¤¤¤Æ¤Î¤è¤ê¾Ü¤·¤¤ÀâÌÀ¤Ï¡¢COPYING\n"
 "¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤ò¸«¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: info/info.c:462
+#: info/info.c:498
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "`%s' ¤ËÂФ¹¤ë¹àÌܤ¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
 
-#: info/info.c:555
+#: info/info.c:590
 #, fuzzy
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
 msgstr " --speech-friendly        ²»À¼¹çÀ®´ï¤ËÂФ¹¤ë¿ÆÏÂÀ­¤ò¹â¤á¤ë\n"
 
-#: info/info.c:562
+#: info/info.c:597
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -272,10 +273,12 @@ msgid ""
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
 "  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
-"  -R, --raw-escapes            don't remove ANSI escapes from man pages.\n"
+"  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+"      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
 "  -O, --show-options, --usage  go to command-line options node.\n"
 "%s      --subnodes               recursively output menu items.\n"
+"  -w, --where, --location      print physical location of Info file.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
 "\n"
@@ -329,8 +332,8 @@ msgstr ""
 "Email ¤Ë¤è¤ë¥Ð¥°¥ì¥Ý¡¼¥È¤Ï bug-texinfo@gnu.org¡¢\n"
 "°ìÈÌŪ¤Ê¼ÁÌä¤äµÄÏÀ¤Ï help-texinfo@gnu.org ¤Þ¤Ç¡£\n"
 
-#: info/info.c:598 info/infokey.c:903 makeinfo/makeinfo.c:474
-#: util/install-info.c:421 util/texindex.c:286
+#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
+#: util/install-info.c:466 util/texindex.c:292
 #, fuzzy
 msgid ""
 "\n"
@@ -342,121 +345,121 @@ msgstr ""
 "Email ¤Ë¤è¤ë¥Ð¥°¥ì¥Ý¡¼¥È¤Ï bug-texinfo@gnu.org¡¢\n"
 "°ìÈÌŪ¤Ê¼ÁÌä¤äµÄÏÀ¤Ï help-texinfo@gnu.org ¤Þ¤Ç¡£\n"
 
-#: info/info.c:632
+#: info/info.c:669
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "`%s' ¥Î¡¼¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£"
 
-#: info/info.c:633
+#: info/info.c:670
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "`(%s)%s' ¥Î¡¼¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: info/info.c:634
+#: info/info.c:671
 msgid "Cannot find a window!"
 msgstr "¥¦¥£¥ó¥É¥¦¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: info/info.c:635
+#: info/info.c:672
 msgid "Point doesn't appear within this window's node!"
 msgstr "¤³¤Î¥¦¥£¥ó¥É¥¦¥Î¡¼¥ÉÆâ¤Ë¥Ý¥¤¥ó¥È¤¬¸½¤ì¤Þ¤»¤ó¡ª"
 
-#: info/info.c:636
+#: info/info.c:673
 msgid "Cannot delete the last window."
 msgstr "ºÇ¸å¤Î¥¦¥£¥ó¥É¥¦¤Ïºï½ü¤Ç¤­¤Þ¤»¤ó"
 
-#: info/info.c:637
+#: info/info.c:674
 msgid "No menu in this node."
 msgstr "¤³¤Î¥Î¡¼¥É¤Ë¥á¥Ë¥å¡¼¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: info/info.c:638
+#: info/info.c:675
 msgid "No footnotes in this node."
 msgstr "¤³¤Î¥Î¡¼¥É¤ËµÓÃí¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: info/info.c:639
+#: info/info.c:676
 msgid "No cross references in this node."
 msgstr "¤³¤Î¥Î¡¼¥É¤ËÁê¸ß»²¾È¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: info/info.c:640
+#: info/info.c:677
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "¤³¤Î¥Î¡¼¥É¤Î `%s' ¥Ý¥¤¥ó¥¿¤¬¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: info/info.c:641
+#: info/info.c:678
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "̤ÃΤΠInfo ¥³¥Þ¥ó¥É `%c' -- `?' ¤Ç¥Ø¥ë¥×¤ò¸«¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: info/info.c:642
+#: info/info.c:679
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr "üËö¥¿¥¤¥× `%s' ¤Ï Info ¤òÆ°¤«¤»¤ë¤Û¤ÉÍø¸ý¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: info/info.c:643
+#: info/info.c:680
 msgid "You are already at the last page of this node."
 msgstr "¤³¤³¤Ï¤â¤¦¡¢¤³¤Î¥Î¡¼¥É¤ÎºÇ½ª¥Ú¡¼¥¸¤Ç¤¹¡£"
 
-#: info/info.c:644
+#: info/info.c:681
 msgid "You are already at the first page of this node."
 msgstr "¤³¤³¤Ï¤â¤¦¡¢¤³¤Î¥Î¡¼¥É¤ÎºÇ½é¤Î¥Ú¡¼¥¸¤Ç¤¹¡£"
 
-#: info/info.c:645
+#: info/info.c:682
 msgid "Only one window."
 msgstr "Í£°ì¤Î¥¦¥£¥ó¥É¥¦¡£"
 
-#: info/info.c:646
+#: info/info.c:683
 msgid "Resulting window would be too small."
 msgstr "·ë²Ì¥¦¥£¥ó¥É¥¦¤¬¾®¤µ¤¹¤®¤ëÍͤǤ¹"
 
-#: info/info.c:647
+#: info/info.c:684
 msgid "Not enough room for a help window, please delete a window."
 msgstr ""
 "¥Ø¥ë¥×¥¦¥£¥ó¥É¥¦ÍѤξì½ê¤¬Â­¤ê¤Þ¤»¤ó¡¢¥¦¥£¥ó¥É¥¦¤ò°ì¤Äºï½ü¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: info/infodoc.c:45 info/infodoc.c:94
+#: info/infodoc.c:46 info/infodoc.c:95
 #, fuzzy
 msgid ""
 "Basic Commands in Info Windows\n"
 "******************************\n"
 msgstr "Info ¥¦¥£¥ó¥É¥¦Æâ¤Î´ðËÜ¥³¥Þ¥ó¥É\n"
 
-#: info/infodoc.c:48
+#: info/infodoc.c:49
 #, fuzzy
 msgid "\\%-10[quit-help]  Quit this help.\n"
 msgstr "  %-10s  ¤³¤Î¥Ø¥ë¥×¤ò½ªÎ»¤¹¤ë¡£\n"
 
-#: info/infodoc.c:49
+#: info/infodoc.c:50
 #, fuzzy
 msgid "\\%-10[quit]  Quit Info altogether.\n"
 msgstr "  %-10s  Info ¤â°ì½ï¤Ë½ªÎ»¤¹¤ë¡£\n"
 
-#: info/infodoc.c:50
+#: info/infodoc.c:51
 #, fuzzy
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
 msgstr "  %-10s  Info ¥Á¥å¡¼¥È¥ê¥¢¥ë¤òµ¯Æ°¤¹¤ë¡£\n"
 
-#: info/infodoc.c:52 info/infodoc.c:101
+#: info/infodoc.c:53 info/infodoc.c:102
 #, fuzzy
 msgid ""
 "Selecting other nodes:\n"
 "----------------------\n"
 msgstr "¾¤Î¥Î¡¼¥É¤òÁªÂò¤¹¤ë:\n"
 
-#: info/infodoc.c:54
+#: info/infodoc.c:55
 #, fuzzy
 msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
 msgstr "  %-10s  ¤³¤Î¥Î¡¼¥É¤Î `¼¡' ¤Î¥Î¡¼¥É¤Ø°ÜÆ°¤¹¤ë¡£\n"
 
-#: info/infodoc.c:55
+#: info/infodoc.c:56
 #, fuzzy
 msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
 msgstr "  %-10s  ¤³¤Î¥Î¡¼¥É¤Î `Á°' ¤Î¥Î¡¼¥É¤Ø°ÜÆ°¤¹¤ë¡£\n"
 
-#: info/infodoc.c:56
+#: info/infodoc.c:57
 #, fuzzy
 msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
 msgstr "  %-10s  ¤³¤Î¥Î¡¼¥É¤«¤é `¾å' ¤Ø°ÜÆ°¤¹¤ë¡£\n"
 
-#: info/infodoc.c:57
+#: info/infodoc.c:58
 #, fuzzy
 msgid ""
 "\\%-10[menu-item]  Pick menu item specified by name.\n"
@@ -464,104 +467,104 @@ msgid ""
 msgstr ""
 "             ¥á¥Ë¥å¡¼¥¢¥¤¥Æ¥à¤ÎÁªÂò¤Ç¡¢Â¾¤Î¥Î¡¼¥É¤¬ÁªÂò¤µ¤ì¤ë»ö¤Ë¤Ê¤ë¡£\n"
 
-#: info/infodoc.c:59
+#: info/infodoc.c:60
 #, fuzzy
 msgid ""
 "\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
 msgstr "  %-10s  Áê¸ß»²¾È¤òé¤ë¡£»²¾È̾¤òÆɤ߼è¤ë¡£\n"
 
-#: info/infodoc.c:60
+#: info/infodoc.c:61
 #, fuzzy
 msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
 msgstr "  %-10s  ¤³¤Î¥¦¥£¥ó¥É¥¦¤ÇºÇ¸å¤Ë¸«¤¿¥Î¡¼¥É¤Ø°ÜÆ°¤¹¤ë¡£\n"
 
-#: info/infodoc.c:61
+#: info/infodoc.c:62
 #, fuzzy
 msgid ""
 "\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
 msgstr "  %-10s  ¤³¤Î¥Î¡¼¥ÉÆâ¤Î¼¡¤Î¥Ï¥¤¥Ñ¡¼¥ê¥ó¥¯¤Ø¥¹¥­¥Ã¥×¤¹¤ë¡£\n"
 
-#: info/infodoc.c:62
+#: info/infodoc.c:63
 #, fuzzy
 msgid ""
 "\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
 "node.\n"
 msgstr "  %-10s  ¤³¤Î¥Î¡¼¥ÉÆâ¤Î¼¡¤Î¥Ï¥¤¥Ñ¡¼¥ê¥ó¥¯¤Ø¥¹¥­¥Ã¥×¤¹¤ë¡£\n"
 
-#: info/infodoc.c:63
+#: info/infodoc.c:64
 #, fuzzy
 msgid ""
 "\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
 msgstr "  %-10s  ¥«¡¼¥½¥ë°ÌÃ֤Υϥ¤¥Ñ¡¼¥ê¥ó¥¯¤òé¤ë¡£\n"
 
-#: info/infodoc.c:64
+#: info/infodoc.c:65
 #, fuzzy
 msgid ""
 "\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
 "node] (DIR)'.\n"
 msgstr "  %-10s  `¥Ç¥£¥ì¥¯¥È¥ê' ¥Î¡¼¥É¤Ø°ÜÆ°¡£`g (DIR)' ¤ÈƱ¤¸¡£\n"
 
-#: info/infodoc.c:65
+#: info/infodoc.c:66
 #, fuzzy
 msgid ""
 "\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
 msgstr "  %-10s  Top ¥Î¡¼¥É¤Ø°ÜÆ°¡£`g Top' ¤ÈƱ¤¸¡£\n"
 
-#: info/infodoc.c:67 info/infodoc.c:115
+#: info/infodoc.c:68 info/infodoc.c:116
 #, fuzzy
 msgid ""
 "Moving within a node:\n"
 "---------------------\n"
 msgstr "¥Î¡¼¥ÉÆâ¤Ç¤Î°ÜÆ°:\n"
 
-#: info/infodoc.c:69
-#, fuzzy
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
-msgstr "  %-10s  1 ¥Ú¡¼¥¸Ê¬Á°Êý¤Ø¿Ê¤á¤ë¡£\n"
-
 #: info/infodoc.c:70
 #, fuzzy
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
-msgstr "  %-10s  1 ¥Ú¡¼¥¸Ê¬¸åÊý¤ØÌ᤹¡£\n"
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "  %-10s  ¸½ºß¤Î¥Î¡¼¥É¤ÎÀèƬ¤Ø°ÜÆ°¤¹¤ë¡£\n"
 
 #: info/infodoc.c:71
 #, fuzzy
-msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
 msgstr "  %-10s  ¸½ºß¤Î¥Î¡¼¥É¤ÎÀèƬ¤Ø°ÜÆ°¤¹¤ë¡£\n"
 
 #: info/infodoc.c:72
 #, fuzzy
-msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
-msgstr "  %-10s  ¸½ºß¤Î¥Î¡¼¥É¤ÎÀèƬ¤Ø°ÜÆ°¤¹¤ë¡£\n"
+msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
+msgstr "  %-10s  1 ¹ÔʬÁ°Êý¤Ø¤¹¤¹¤á¤ë¡£\n"
 
 #: info/infodoc.c:73
 #, fuzzy
-msgid "\\%-10[scroll-forward]  Scroll forward 1 line.\n"
-msgstr "  %-10s  1 ¹ÔʬÁ°Êý¤Ø¤¹¤¹¤á¤ë¡£\n"
+msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
+msgstr "  %-10s  1 ¹Ôʬ¸åÊý¤ØÌ᤹¡£\n"
 
 #: info/infodoc.c:74
 #, fuzzy
-msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
-msgstr "  %-10s  1 ¹Ôʬ¸åÊý¤ØÌ᤹¡£\n"
+msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
+msgstr "  %-10s  1 ¥Ú¡¼¥¸Ê¬Á°Êý¤Ø¿Ê¤á¤ë¡£\n"
+
+#: info/infodoc.c:75
+#, fuzzy
+msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
+msgstr "  %-10s  1 ¥Ú¡¼¥¸Ê¬¸åÊý¤ØÌ᤹¡£\n"
 
-#: info/infodoc.c:76 info/infodoc.c:124
+#: info/infodoc.c:77 info/infodoc.c:125
 #, fuzzy
 msgid ""
 "Other commands:\n"
 "---------------\n"
 msgstr "¤½¤Î¾¤Î¥³¥Þ¥ó¥É:\n"
 
-#: info/infodoc.c:78
+#: info/infodoc.c:79
 #, fuzzy
 msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
 msgstr "  %-10s  ¥Î¡¼¥É¥á¥Ë¥å¡¼¤ÎºÇ½é¤«¤é 9 ÈÖÌÜËø¤Î¥¢¥¤¥Æ¥à¤òÁªÂò¤¹¤ë¡£\n"
 
-#: info/infodoc.c:79
+#: info/infodoc.c:80
 #, fuzzy
 msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
 msgstr "  %-10s  ¥Î¡¼¥É¥á¥Ë¥å¡¼¤ÎºÇ¸å¤Î¥¢¥¤¥Æ¥à¤òÁªÂò¤¹¤ë¡£\n"
 
-#: info/infodoc.c:80
+#: info/infodoc.c:81
 #, fuzzy
 msgid ""
 "\\%-10[index-search]  Search for a specified string in the index entries of "
@@ -570,7 +573,7 @@ msgid ""
 "found.\n"
 msgstr "          ºÇ½é¤Ë¸«¤Ä¤«¤Ã¤¿¹àÌܤ¬»²¾È¤·¤Æ¤¤¤ë¥Î¡¼¥É¤òÁªÂò¤¹¤ë¡£\n"
 
-#: info/infodoc.c:82
+#: info/infodoc.c:83
 #, fuzzy
 msgid ""
 "\\%-10[goto-node]  Move to node specified by name.\n"
@@ -579,14 +582,14 @@ msgstr ""
 "               (¥Õ¥¡¥¤¥ë̾)¥Î¡¼¥É̾ ¤ÎÍͤˡ¢¥Õ¥¡¥¤¥ë̾¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ"
 "¤¹¡£\n"
 
-#: info/infodoc.c:84
+#: info/infodoc.c:85
 #, fuzzy
 msgid ""
 "\\%-10[search]  Search forward for a specified string\n"
 "              and select the node in which the next occurrence is found.\n"
 msgstr "               ¸«¤Ä¤«¤Ã¤¿¤â¤Î¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¥Î¡¼¥É¤òÁªÂò¤¹¤ë¡£\n"
 
-#: info/infodoc.c:86
+#: info/infodoc.c:87
 #, fuzzy
 msgid ""
 "\\%-10[search-backward]  Search backward for a specified string\n"
@@ -594,173 +597,173 @@ msgid ""
 "found.\n"
 msgstr "               ¸«¤Ä¤«¤Ã¤¿¤â¤Î¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¥Î¡¼¥É¤òÁªÂò¤¹¤ë¡£\n"
 
-#: info/infodoc.c:97
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Quit this help.\n"
 msgstr "  %-10s  ¤³¤Î¥Ø¥ë¥×¤ò½ªÎ»¤¹¤ë¡£\n"
 
-#: info/infodoc.c:98
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr "  %-10s  Info ¤â°ì½ï¤Ë½ªÎ»¤¹¤ë¡£\n"
 
-#: info/infodoc.c:99
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr "  %-10s  Info ¥Á¥å¡¼¥È¥ê¥¢¥ë¤òµ¯Æ°¤¹¤ë¡£\n"
 
-#: info/infodoc.c:103
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
 msgstr "  %-10s  ¤³¤Î¥Î¡¼¥É¤Î `¼¡' ¤Î¥Î¡¼¥É¤Ø°ÜÆ°¤¹¤ë¡£\n"
 
-#: info/infodoc.c:104
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
 msgstr "  %-10s  ¤³¤Î¥Î¡¼¥É¤Î `Á°' ¤Î¥Î¡¼¥É¤Ø°ÜÆ°¤¹¤ë¡£\n"
 
-#: info/infodoc.c:105
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
 msgstr "  %-10s  ¤³¤Î¥Î¡¼¥É¤«¤é `¾å' ¤Ø°ÜÆ°¤¹¤ë¡£\n"
 
-#: info/infodoc.c:106
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Pick menu item specified by name.\n"
 msgstr "  %-10s  ̾Á°¤Ç»ØÄꤷ¤¿¥á¥Ë¥å¡¼¥¢¥¤¥Æ¥à¤òÁªÂò¤¹¤ë¡£\n"
 
-#: info/infodoc.c:107
+#: info/infodoc.c:108
 msgid "              Picking a menu item causes another node to be selected.\n"
 msgstr ""
 "             ¥á¥Ë¥å¡¼¥¢¥¤¥Æ¥à¤ÎÁªÂò¤Ç¡¢Â¾¤Î¥Î¡¼¥É¤¬ÁªÂò¤µ¤ì¤ë»ö¤Ë¤Ê¤ë¡£\n"
 
-#: info/infodoc.c:108
+#: info/infodoc.c:109
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
 msgstr "  %-10s  Áê¸ß»²¾È¤òé¤ë¡£»²¾È̾¤òÆɤ߼è¤ë¡£\n"
 
-#: info/infodoc.c:109
+#: info/infodoc.c:110
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
 msgstr "  %-10s  ¤³¤Î¥¦¥£¥ó¥É¥¦¤ÇºÇ¸å¤Ë¸«¤¿¥Î¡¼¥É¤Ø°ÜÆ°¤¹¤ë¡£\n"
 
-#: info/infodoc.c:110
+#: info/infodoc.c:111
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
 msgstr "  %-10s  ¤³¤Î¥Î¡¼¥ÉÆâ¤Î¼¡¤Î¥Ï¥¤¥Ñ¡¼¥ê¥ó¥¯¤Ø¥¹¥­¥Ã¥×¤¹¤ë¡£\n"
 
-#: info/infodoc.c:111
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
 msgstr "  %-10s  ¥«¡¼¥½¥ë°ÌÃ֤Υϥ¤¥Ñ¡¼¥ê¥ó¥¯¤òé¤ë¡£\n"
 
-#: info/infodoc.c:112
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
 msgstr "  %-10s  `¥Ç¥£¥ì¥¯¥È¥ê' ¥Î¡¼¥É¤Ø°ÜÆ°¡£`g (DIR)' ¤ÈƱ¤¸¡£\n"
 
-#: info/infodoc.c:113
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
 msgstr "  %-10s  Top ¥Î¡¼¥É¤Ø°ÜÆ°¡£`g Top' ¤ÈƱ¤¸¡£\n"
 
-#: info/infodoc.c:117
+#: info/infodoc.c:118
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
 msgstr "  %-10s  1 ¥Ú¡¼¥¸Ê¬Á°Êý¤Ø¿Ê¤á¤ë¡£\n"
 
-#: info/infodoc.c:118
+#: info/infodoc.c:119
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
 msgstr "  %-10s  1 ¥Ú¡¼¥¸Ê¬¸åÊý¤ØÌ᤹¡£\n"
 
-#: info/infodoc.c:119
+#: info/infodoc.c:120
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
 msgstr "  %-10s  ¸½ºß¤Î¥Î¡¼¥É¤ÎÀèƬ¤Ø°ÜÆ°¤¹¤ë¡£\n"
 
-#: info/infodoc.c:120
+#: info/infodoc.c:121
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
 msgstr "  %-10s  ¸½ºß¤Î¥Î¡¼¥É¤ÎÀèƬ¤Ø°ÜÆ°¤¹¤ë¡£\n"
 
-#: info/infodoc.c:121
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
 msgstr "  %-10s  1 ¹ÔʬÁ°Êý¤Ø¤¹¤¹¤á¤ë¡£\n"
 
-#: info/infodoc.c:122
+#: info/infodoc.c:123
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
 msgstr "  %-10s  1 ¹Ôʬ¸åÊý¤ØÌ᤹¡£\n"
 
-#: info/infodoc.c:126
+#: info/infodoc.c:127
 #, c-format
 msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
 msgstr "  %-10s  ¥Î¡¼¥É¥á¥Ë¥å¡¼¤ÎºÇ½é¤«¤é 9 ÈÖÌÜËø¤Î¥¢¥¤¥Æ¥à¤òÁªÂò¤¹¤ë¡£\n"
 
-#: info/infodoc.c:127
+#: info/infodoc.c:128
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
 msgstr "  %-10s  ¥Î¡¼¥É¥á¥Ë¥å¡¼¤ÎºÇ¸å¤Î¥¢¥¤¥Æ¥à¤òÁªÂò¤¹¤ë¡£\n"
 
-#: info/infodoc.c:128
+#: info/infodoc.c:129
 #, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
 msgstr ""
 "  %-10s  ¸½ºß¤Î Info ¥Õ¥¡¥¤¥ë¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¹àÌܤǡ¢Ê¸»úÎó¤ò»ØÄꤷ¤Æ¸¡º÷¤·¡¢\n"
 
-#: info/infodoc.c:129
+#: info/infodoc.c:130
 msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
 msgstr "          ºÇ½é¤Ë¸«¤Ä¤«¤Ã¤¿¹àÌܤ¬»²¾È¤·¤Æ¤¤¤ë¥Î¡¼¥É¤òÁªÂò¤¹¤ë¡£\n"
 
-#: info/infodoc.c:130
+#: info/infodoc.c:131
 #, c-format
 msgid "  %-10s  Move to node specified by name.\n"
 msgstr "  %-10s  ̾Á°¤Ç»ØÄꤵ¤ì¤¿¥Î¡¼¥É¤Ë°ÜÆ°¤¹¤ë¡£\n"
 
-#: info/infodoc.c:131
+#: info/infodoc.c:132
 msgid ""
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr ""
 "               (¥Õ¥¡¥¤¥ë̾)¥Î¡¼¥É̾ ¤ÎÍͤˡ¢¥Õ¥¡¥¤¥ë̾¤ò´Þ¤á¤ë¤³¤È¤¬¤Ç¤­¤Þ"
 "¤¹¡£\n"
 
-#: info/infodoc.c:132
+#: info/infodoc.c:133
 #, fuzzy, c-format
 msgid "  %-10s  Search forward for a specified string,\n"
 msgstr "  %-10s  ¸½ºß¤Î Info ¥Õ¥¡¥¤¥ëÁ´ÂΤò¡¢»ØÄꤵ¤ì¤¿Ê¸»úÎó¤ÇÁ°Êý¸¡º÷¤·¡¢\n"
 
-#: info/infodoc.c:133 info/infodoc.c:135
+#: info/infodoc.c:134 info/infodoc.c:136
 msgid ""
 "              and select the node in which the next occurrence is found.\n"
 msgstr "               ¸«¤Ä¤«¤Ã¤¿¤â¤Î¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë¥Î¡¼¥É¤òÁªÂò¤¹¤ë¡£\n"
 
-#: info/infodoc.c:134
+#: info/infodoc.c:135
 #, fuzzy, c-format
 msgid "  %-10s  Search backward for a specified string\n"
 msgstr "\\\\  %-10s  ¸½ºß¤Î Info ¥Õ¥¡¥¤¥ë¤ò¡¢»ØÄꤵ¤ì¤¿Ê¸»úÎó¤Ç¸åÊý¸¡º÷¤·¡¢\n"
 
-#: info/infodoc.c:313
+#: info/infodoc.c:316
 msgid "The current search path is:\n"
 msgstr "¸½ºß¤Î¸¡º÷¥Ñ¥¹:\n"
 
-#: info/infodoc.c:316
+#: info/infodoc.c:320
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
 msgstr "Info ¥¦¥£¥ó¥É¥¦¤ÇÍøÍѲÄǽ¤Ê¥³¥Þ¥ó¥É:\n"
 
-#: info/infodoc.c:319
+#: info/infodoc.c:324
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
 msgstr "¥¨¥³¡¼Îΰè¤ÇÍøÍѲÄǽ¤Ê¥³¥Þ¥ó¥É:\n"
 
-#: info/infodoc.c:340
+#: info/infodoc.c:347
 #, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
@@ -769,7 +772,7 @@ msgstr ""
 "°Ê²¼¤Î¥³¥Þ¥ó¥É¤Ï¡¢%s ¤òÄ̤¸¤Æ¤Î¤ßµ¯Æ°¤Ç¤­¤Þ¤¹:\n"
 "\n"
 
-#: info/infodoc.c:343
+#: info/infodoc.c:351
 msgid ""
 "The following commands cannot be invoked at all:\n"
 "\n"
@@ -777,156 +780,175 @@ msgstr ""
 "°Ê²¼¤Î¥³¥Þ¥ó¥É¤Ï¡¢Á´¤¯µ¯Æ°¤¹¤ë»ö¤¬¤Ç¤­¤Þ¤»¤ó:\n"
 "\n"
 
-#: info/infodoc.c:367
+#: info/infodoc.c:375
 msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
 msgstr ""
 "--- ½ªÎ»¤¹¤ë¤Ë¤Ï `\\[history-node]' ¤« `\\[kill-node]' ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤ ---\n"
 
-#: info/infodoc.c:477
+#: info/infodoc.c:485
 msgid "Display help message"
 msgstr "»È¤¤Êý¤òɽ¼¨¤¹¤ë"
 
-#: info/infodoc.c:495
+#: info/infodoc.c:503
 msgid "Visit Info node `(info)Help'"
 msgstr "`(info)Help' ¥Î¡¼¥É¤Ë°ÜÆ°¤¹¤ë"
 
-#: info/infodoc.c:638
+#: info/infodoc.c:641
 msgid "Print documentation for KEY"
 msgstr "¥­¡¼Áàºî¤òɽ¼¨¤¹¤ë"
 
-#: info/infodoc.c:650
+#: info/infodoc.c:653
 #, c-format
 msgid "Describe key: %s"
 msgstr "¥­¡¼¤ÎÀâÌÀ: %s"
 
-#: info/infodoc.c:660
+#: info/infodoc.c:664
 #, c-format
 msgid "ESC %s is undefined."
 msgstr "ESC %s ¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: info/infodoc.c:676 info/infodoc.c:703
+#: info/infodoc.c:680 info/infodoc.c:709
 #, c-format
 msgid "%s is undefined."
 msgstr "%s ¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: info/infodoc.c:724
+#: info/infodoc.c:730
 #, c-format
 msgid "%s is defined to %s."
 msgstr "%s ¤Ï %s ¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£"
 
-#: info/infodoc.c:1151
+#: info/infodoc.c:1153
 msgid "Show what to type to execute a given command"
 msgstr "Í¿¤¨¤é¤ì¤¿¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤¹¤ë¤Î¤Ë¡¢²¿¤ò¥¿¥¤¥×¤¹¤ë¤«¤òɽ¼¨¤¹¤ë"
 
-#: info/infodoc.c:1155
+#: info/infodoc.c:1157
 msgid "Where is command: "
 msgstr "¤É¤Î¥³¥Þ¥ó¥É: "
 
-#: info/infodoc.c:1177
+#: info/infodoc.c:1179
 #, c-format
 msgid "`%s' is not on any keys"
 msgstr "`%s' ¤Ï¥­¡¼³ä¤êÅö¤Æ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: info/infodoc.c:1183
+#: info/infodoc.c:1186
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr "%s ¤Ï %s ¤òÄ̤¸¤Æ¤Î¤ß¸Æ¤Ó½Ð¤»¤Þ¤¹¡£"
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1190
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr "%s ¤Ï %s ¤òÄ̤¸¤Æ¸Æ¤Ó½Ð¤»¤Þ¤¹"
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1195
 #, c-format
 msgid "There is no function named `%s'"
 msgstr "`%s' ¤È¤¤¤¦µ¡Ç½¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: info/infokey.c:164
+#: info/infokey.c:145
+#, 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 (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"
+"\n"
+"ÌõÃí: Èó¾ï¤Ë½ÅÍפÊʸ¾Ï¤Î¤¿¤á¡¢¸¶Ê¸¤ò»Ä¤·¤Æ¤¤¤Þ¤¹¡£\n"
+"  -- »²¹ÍÌõ\n"
+"°ìÀÚ¤ÎÊݾڤϤ¢¤ê¤Þ¤»¤ó¡£¤¢¤Ê¤¿¤Ï¡¢GNU General Public Licence ¤Îʸ¸À¤Î²¼¤Ç¡¢\n"
+"¤³¤Î¥½¥Õ¥È¥¦¥§¥¢¤òºÆÇÛÉۤǤ­¤Þ¤¹¡£¤³¤ì¤é¤Ë¤Ä¤¤¤Æ¤Î¤è¤ê¾Ü¤·¤¤ÀâÌÀ¤Ï¡¢COPYING\n"
+"¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤ò¸«¤Æ¤¯¤À¤µ¤¤¡£\n"
+
+#: info/infokey.c:170
 msgid "incorrect number of arguments"
 msgstr "°ú¿ô¤Î¿ô»ú¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹"
 
-#: info/infokey.c:194
+#: info/infokey.c:201
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë `%s' ¤ò³«¤±¤Þ¤»¤ó"
 
-#: info/infokey.c:207
+#: info/infokey.c:215
 #, c-format
 msgid "cannot create output file `%s'"
 msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë `%s' ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó"
 
-#: info/infokey.c:217
+#: info/infokey.c:226
 #, c-format
 msgid "error writing to `%s'"
 msgstr "`%s' ¤Ø¤Î½ñ¤­¹þ¤ßÃæ¤Î¥¨¥é¡¼"
 
-#: info/infokey.c:222
+#: info/infokey.c:232
 #, c-format
 msgid "error closing output file `%s'"
 msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë `%s' ¤òÊĤ¸¤ëºÝ¤Î¥¨¥é¡¼"
 
-#: info/infokey.c:443
+#: info/infokey.c:450
 msgid "key sequence too long"
 msgstr "¥­¡¼ÆþÎÏÎó¤¬Ä¹¤¹¤®¤Þ¤¹"
 
-#: info/infokey.c:521
+#: info/infokey.c:529
 msgid "missing key sequence"
 msgstr "¥­¡¼ÆþÎÏÎó¤ò·ç¤¤¤Æ¤¤¤Þ¤¹"
 
-#: info/infokey.c:600
+#: info/infokey.c:610
 msgid "NUL character (\\000) not permitted"
 msgstr "NUL ʸ»ú (\\000) ¤Ï»È¤¨¤Þ¤»¤ó"
 
-#: info/infokey.c:629
+#: info/infokey.c:641
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr "NUL ʸ»ú (^%c) ¤Ï»È¤¨¤Þ¤»¤ó"
 
-#: info/infokey.c:652
+#: info/infokey.c:665
 msgid "missing action name"
 msgstr "¥¢¥¯¥·¥ç¥ó̾¤ò·ç¤¤¤Æ¤¤¤Þ¤¹"
 
-#: info/infokey.c:667 info/infokey.c:733
+#: info/infokey.c:681 info/infokey.c:756
 msgid "section too long"
 msgstr "¥»¥¯¥·¥ç¥ó¤¬Ä¹¤¹¤®¤Þ¤¹"
 
-#: info/infokey.c:673
+#: info/infokey.c:688
 #, c-format
 msgid "unknown action `%s'"
 msgstr "ÉÔÌÀ¤Ê¥¢¥¯¥·¥ç¥ó `%s'"
 
-#: info/infokey.c:682
+#: info/infokey.c:698
 msgid "action name too long"
 msgstr "¥¢¥¯¥·¥ç¥ó̾¤¬Ä¹¤¹¤®¤Þ¤¹"
 
-#: info/infokey.c:694
+#: info/infokey.c:712
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr "¥¢¥¯¥·¥ç¥ó `%s' ¤Ë;ʬ¤Êʸ»ú¤¬Â³¤¤¤Æ¤¤¤Þ¤¹"
 
-#: info/infokey.c:704
+#: info/infokey.c:723
 msgid "missing variable name"
 msgstr "ÊÑ¿ô̾¤ò·ç¤¤¤Æ¤¤¤Þ¤¹"
 
-#: info/infokey.c:712
+#: info/infokey.c:733
 msgid "missing `=' immediately after variable name"
 msgstr "ÊÑ¿ô̾¤Îľ¸å¤Î `=' ¤ò·ç¤¤¤Æ¤¤¤Þ¤¹"
 
-#: info/infokey.c:719
+#: info/infokey.c:741
 msgid "variable name too long"
 msgstr "ÊÑ¿ô̾¤¬Ä¹¤¹¤®¤Þ¤¹"
 
-#: info/infokey.c:741
+#: info/infokey.c:765
 msgid "value too long"
 msgstr "Ãͤ¬Ä¹¤¹¤®¤Þ¤¹"
 
-#: info/infokey.c:875
+#: info/infokey.c:890
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr "\"%s\", %u ¹ÔÌÜ: "
 
-#: info/infokey.c:891
+#: info/infokey.c:906
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -954,22 +976,22 @@ msgstr ""
 "¥Ð¥°¥ì¥Ý¡¼¥È¤Ï bug-texinfo@gnu.org ¤Ø¡¢\n"
 "°ìÈÌŪ¤Ê¼ÁÌä¤äµÄÏÀ¤Ï help-texinfo@gnu.org ¤Ø¡£\n"
 
-#: info/infomap.c:1397
+#: info/infomap.c:1500
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
 msgstr "ÉÔŬÀÚ¤Ê infokey ¥Õ¥¡¥¤¥ë `%s' ¤ò̵»ë¤·¤Þ¤¹ - ¾®¤µ¤¹¤®¤Þ¤¹"
 
-#: info/infomap.c:1400
+#: info/infomap.c:1503
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
 msgstr "ÉÔŬÀÚ¤Ê infokey ¥Õ¥¡¥¤¥ë `%s' ¤ò̵»ë¤·¤Þ¤¹ - Â礭¤¹¤®¤Þ¤¹"
 
-#: info/infomap.c:1413
+#: info/infomap.c:1516
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
 msgstr "infokey ¥Õ¥¡¥¤¥ë `%s' Æɹþ¤ßÃæ¤Î¥¨¥é¡¼ -- Á´¤ÆÆɹþ¤á¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: info/infomap.c:1431
+#: info/infomap.c:1535
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
@@ -977,13 +999,13 @@ msgstr ""
 "infokey ¥Õ¥¡¥¤¥ë `%s' ¤¬ÉÔŬÀÚ (¥Þ¥¸¥Ã¥¯Èֹ椬°ã¤¦) ¤Ç¤¹ -- infokey ¤ò¼Â¹Ô¤·"
 "¤Æ¹¹¿·¤·¤Þ¤·¤ç¤¦"
 
-#: info/infomap.c:1437
+#: info/infomap.c:1544
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
 msgstr ""
 "¤¢¤Ê¤¿¤Î infokey ¥Õ¥¡¥¤¥ë `%s' ¤Ï¸Å¤¤¤Ç¤¹ -- infokey ¤ò¼Â¹Ô¤·¤Æ¹¹¿·¤·¤Þ¤·¤ç¤¦"
 
-#: info/infomap.c:1450
+#: info/infomap.c:1560
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
@@ -991,7 +1013,7 @@ msgstr ""
 "infokey ¥Õ¥¡¥¤¥ë `%s' ¤¬ÉÔŬÀڤǤ¹ (¥»¥¯¥·¥ç¥óŤ¬ÉÔÀµ¤Ç¤¹) -- infokey ¤ò¼Â¹Ô"
 "¤·¤Æ¹¹¿·¤·¤Þ¤·¤ç¤¦"
 
-#: info/infomap.c:1470
+#: info/infomap.c:1581
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
@@ -999,43 +1021,49 @@ msgstr ""
 "infokey ¥Õ¥¡¥¤¥ë `%s' ¤¬ÉÔŬÀڤǤ¹ (¥»¥¯¥·¥ç¥ó¥³¡¼¥É¤¬ÉÔÀµ¤Ç¤¹) -- infokey ¤ò"
 "¼Â¹Ô¤·¤Æ¹¹¿·¤·¤Þ¤·¤ç¤¦"
 
-#: info/infomap.c:1608
+#: info/infomap.c:1716
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr ""
 "infokey ¥Õ¥¡¥¤¥ë¤ËÉÔÀµ¤Ê¥Ç¡¼¥¿¤¬¤¢¤ê¤Þ¤¹ -- ´ö¤Ä¤«¤Î¥­¡¼¥Ð¥¤¥ó¥É¤¬Ìµ»ë¤µ¤ì¤Þ"
 "¤·¤¿"
 
-#: info/infomap.c:1659
+#: info/infomap.c:1766
 msgid "Bad data in infokey file -- some var settings ignored"
 msgstr ""
 "infokey ¥Õ¥¡¥¤¥ë¤ËÉÔÀµ¤Ê¥Ç¡¼¥¿¤¬¤¢¤ê¤Þ¤¹ -- ´ö¤Ä¤«¤ÎÊÑ¿ôÀßÄ̵꤬»ë¤µ¤ì¤Þ¤·¤¿"
 
-#: info/m-x.c:70
+#: info/m-x.c:69
 msgid "Read the name of an Info command and describe it"
 msgstr "Info ¥³¥Þ¥ó¥É̾¤È¤½¤ÎÀâÌÀ¤òÆɤà"
 
-#: info/m-x.c:74
+#: info/m-x.c:73
 msgid "Describe command: "
 msgstr "ÀâÌÀ¤¹¤ë¥³¥Þ¥ó¥É: "
 
-#: info/m-x.c:97
+#: info/m-x.c:96
 msgid "Read a command name in the echo area and execute it"
 msgstr "¥¨¥³¡¼Îΰè¤Ç¥³¥Þ¥ó¥É̾¤òÆɤߡ¢¼Â¹Ô¤¹¤ë"
 
-#: info/m-x.c:141
+#: info/m-x.c:140
 msgid "Cannot execute an `echo-area' command here."
 msgstr "¤³¤³¤Ç¤Ï `echo-area' ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: info/m-x.c:157
+#: info/m-x.c:154
+#, fuzzy, c-format
+msgid "Undefined command: %s"
+msgstr "ÃΤé¤Ê¤¤¥³¥Þ¥ó¥É `%s'"
+
+#: info/m-x.c:160
 msgid "Set the height of the displayed window"
 msgstr "ɽ¼¨¤µ¤ì¤ë¥¦¥£¥ó¥É¥¦¤Î¹â¤µ¤òÀßÄê"
 
-#: info/m-x.c:170
+#: info/m-x.c:173
 #, c-format
 msgid "Set screen height to (%d): "
 msgstr "¥¹¥¯¥ê¡¼¥ó¤Î¹â¤µ¤ò¥»¥Ã¥È (%d): "
 
-#: info/makedoc.c:161 info/makedoc.c:169
+#: info/makedoc.c:162 info/makedoc.c:170
+#, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
 "\n"
@@ -1043,12 +1071,12 @@ msgstr ""
 "   ¤³¤Î¥Õ¥¡¥¤¥ë¤òºî¤ë¸µ¤Ë¤Ê¤Ã¤¿¥Õ¥¡¥¤¥ë:\n"
 "\n"
 
-#: info/makedoc.c:553
+#: info/makedoc.c:550
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤ò¾å¼ê¤¯½èÍý¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: info/nodemenu.c:28
+#: info/nodemenu.c:31
 msgid ""
 "\n"
 "* Menu:\n"
@@ -1060,7 +1088,7 @@ msgstr ""
 "  (¥Õ¥¡¥¤¥ë)¥Î¡¼¥É                  ¹Ô¿ô   ¥µ¥¤¥º  ´Þ¤Þ¤ì¤ë¥Õ¥¡¥¤¥ë\n"
 "  ----------------                  -----   ----   ----------------"
 
-#: info/nodemenu.c:199
+#: info/nodemenu.c:202
 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"
@@ -1070,24 +1098,24 @@ msgstr ""
 "¤¤¡£\n"
 "\n"
 
-#: info/nodemenu.c:219
+#: info/nodemenu.c:224
 msgid "Make a window containing a menu of all of the currently visited nodes"
 msgstr "ºÇ¶áˬ¤ì¤¿¥Î¡¼¥ÉÁ´¤Æ¤Î¥á¥Ë¥å¡¼¤ò´Þ¤ó¤Ç¤¤¤ë¥¦¥£¥ó¥É¥¦¤òºîÀ®"
 
-#: info/nodemenu.c:299
+#: info/nodemenu.c:304
 msgid "Select a node which has been previously visited in a visible window"
 msgstr "ɽ¼¨¤µ¤ì¤Æ¤¤¤ë¥¦¥£¥ó¥É¥¦Æâ¤Î¡¢°ÊÁ°Ë¬¤ì¤¿»ö¤Î¤¢¤ë¥Î¡¼¥É¤òÁªÂò"
 
-#: info/nodemenu.c:311
+#: info/nodemenu.c:317
 msgid "Select visited node: "
 msgstr "ˬ¤ì¤¿¥Î¡¼¥É¤òÁªÂò: "
 
-#: info/nodemenu.c:331 info/session.c:2235
+#: info/nodemenu.c:337 info/session.c:2264
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr "¤½¤Î»²¾È¤Ï¾Ã¤¨¤Þ¤·¤¿! (%s)¡£"
 
-#: info/session.c:170
+#: info/session.c:162
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1096,107 +1124,107 @@ msgstr ""
 "Info ¥Ð¡¼¥¸¥ç¥ó %s ¤Ë¤è¤¦¤³¤½¡£\\[get-help-window] ¤Ç»È¤¤Êý¡¢\\[menu-item] ¤Ç"
 "¥á¥Ë¥å¡¼¹àÌܤò¸Æ¤Ó½Ð¤»¤Þ¤¹¡£"
 
-#: info/session.c:643
+#: info/session.c:620
 msgid "Move down to the next line"
 msgstr "¼¡¤Î¹Ô¤Ë°ÜÆ°"
 
-#: info/session.c:658
+#: info/session.c:635
 msgid "Move up to the previous line"
 msgstr "Á°¤Î¹Ô¤Ë°ÜÆ°"
 
-#: info/session.c:673
+#: info/session.c:650
 msgid "Move to the end of the line"
 msgstr "¹ÔËö¤Ë°ÜÆ°"
 
-#: info/session.c:693
+#: info/session.c:670
 msgid "Move to the start of the line"
 msgstr "¹ÔƬ¤Ë°ÜÆ°"
 
-#: info/session.c:885 makeinfo/node.c:1357
+#: info/session.c:860 makeinfo/node.c:1424
 msgid "Next"
 msgstr "¼¡"
 
-#: info/session.c:888
+#: info/session.c:863
 msgid "Following Next node..."
 msgstr "¼¡ ¤Î¥Î¡¼¥É¤òé¤Ã¤Æ¤¤¤Þ¤¹..."
 
-#: info/session.c:905
+#: info/session.c:881
 msgid "Selecting first menu item..."
 msgstr "ºÇ½é¤Î¥á¥Ë¥å¡¼¹àÌܤòÁªÂò..."
 
-#: info/session.c:916
+#: info/session.c:893
 msgid "Selecting Next node..."
 msgstr "¼¡ ¤Î¥Î¡¼¥É¤òÁªÂò..."
 
-#: info/session.c:986
+#: info/session.c:964
 #, c-format
 msgid "Moving Up %d time(s), then Next."
 msgstr "%d ²ó ¾å ¤Ë°ÜÆ°¤·¡¢¤½¤³¤Ç ¼¡ ¤Ø¡£"
 
-#: info/session.c:1010
+#: info/session.c:988
 msgid "No more nodes within this document."
 msgstr "¤³¤Î¥É¥­¥å¥á¥ó¥È¤Ë¤Ï¡¢¤³¤ì°Ê¾å¤Î¥Î¡¼¥É¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: info/session.c:1034
+#: info/session.c:1011
 msgid "No `Prev' for this node."
 msgstr "¤³¤Î¥Î¡¼¥É¤Î `Á°' ¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: info/session.c:1037 info/session.c:1092
+#: info/session.c:1014 info/session.c:1073
 msgid "Moving Prev in this window."
 msgstr "¤³¤Î¥¦¥£¥ó¥É¥¦¤Î Á° ¤Ë°ÜÆ°¤·¤Þ¤¹¡£"
 
-#: info/session.c:1051
+#: info/session.c:1030
 msgid "No `Prev' or `Up' for this node within this document."
 msgstr "¤³¤Î¥É¥­¥å¥á¥ó¥È¤Ç¤Ï¡¢¤³¤Î¥Î¡¼¥É¤Î `Á°' ¤ä `¾å' ¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: info/session.c:1054
+#: info/session.c:1034
 msgid "Moving Up in this window."
 msgstr "¤³¤Î¥¦¥£¥ó¥É¥¦¤Î ¾å ¤Ë°ÜÆ°¤·¤Þ¤¹¡£"
 
-#: info/session.c:1102
+#: info/session.c:1084
 msgid "Moving to `Prev's last menu item."
 msgstr "`Á°' ¤ÎºÇ¸å¤Î¥á¥Ë¥å¡¼¹àÌܤ˰ÜÆ°¤·¤Þ¤¹¡£"
 
-#: info/session.c:1113
+#: info/session.c:1095
 msgid "Move forwards or down through node structure"
 msgstr "¥Î¡¼¥É¹½Â¤¤òÄ̤¸¤Æ¿Ê¤á¤¿¤ê²¼¤¬¤Ã¤¿¤ê¤¹¤ë"
 
-#: info/session.c:1129
+#: info/session.c:1111
 msgid "Move backwards or up through node structure"
 msgstr "¥Î¡¼¥É¹½Â¤¤òÄ̤¸¤ÆÌá¤Ã¤¿¤ê¾å¤¬¤Ã¤¿¤ê¤¹¤ë"
 
-#: info/session.c:1229
+#: info/session.c:1205
 msgid "Scroll forward in this window"
 msgstr "¤³¤Î¥¦¥£¥ó¥É¥¦¤ò¥¹¥¯¥í¡¼¥ë¥À¥¦¥ó"
 
-#: info/session.c:1237
+#: info/session.c:1213
 msgid "Scroll forward in this window and set default window size"
 msgstr "¤³¤Î¥¦¥£¥ó¥É¥¦¤ò¥¹¥¯¥í¡¼¥ë¤·¡¢¥Ç¥Õ¥©¥ë¥È¥¦¥£¥ó¥É¥¦¥µ¥¤¥º¤òÀßÄê"
 
-#: info/session.c:1245
+#: info/session.c:1221
 msgid "Scroll forward in this window staying within node"
 msgstr "¤³¤Î¥¦¥£¥ó¥É¥¦¤ò¥Î¡¼¥ÉÈÏ°ÏÆâ¤ÇÁ°Êý¥¹¥¯¥í¡¼¥ë"
 
-#: info/session.c:1253
+#: info/session.c:1229
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr ""
 "¤³¤Î¥¦¥£¥ó¥É¥¦¤ò¥Î¡¼¥ÉÈÏ°ÏÆâ¤ÇÁ°Êý¥¹¥¯¥í¡¼¥ë¤·¡¢¥Ç¥Õ¥©¥ë¥È¥¦¥£¥ó¥É¥¦¥µ¥¤¥º¤ò"
 "ÀßÄê"
 
-#: info/session.c:1261
+#: info/session.c:1237
 msgid "Scroll backward in this window"
 msgstr "¤³¤Î¥¦¥£¥ó¥É¥¦¤òµÕ¥¹¥¯¥í¡¼¥ë"
 
-#: info/session.c:1269
+#: info/session.c:1245
 msgid "Scroll backward in this window and set default window size"
 msgstr "¤³¤Î¥¦¥£¥ó¥É¥¦¤òµÕ¥¹¥¯¥í¡¼¥ë¤·¡¢¥Ç¥Õ¥©¥ë¥È¥¦¥£¥ó¥É¥¦¥µ¥¤¥º¤òÀßÄê"
 
-#: info/session.c:1278
+#: info/session.c:1254
 msgid "Scroll backward in this window staying within node"
 msgstr "¤³¤Î¥¦¥£¥ó¥É¥¦¤ò¥Î¡¼¥ÉÈÏ°ÏÆâ¤Ç¸åÊý¥¹¥¯¥í¡¼¥ë"
 
-#: info/session.c:1286
+#: info/session.c:1262
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
@@ -1204,331 +1232,331 @@ msgstr ""
 "¤³¤Î¥¦¥£¥ó¥É¥¦¤ò¥Î¡¼¥ÉÈÏ°ÏÆâ¤Ç¸åÊý¥¹¥¯¥í¡¼¥ë¤·¡¢¥Ç¥Õ¥©¥ë¥È¥¦¥£¥ó¥É¥¦¥µ¥¤¥º¤ò"
 "ÀßÄê"
 
-#: info/session.c:1294
+#: info/session.c:1270
 msgid "Move to the start of this node"
 msgstr "¤³¤Î¥Î¡¼¥É¤ÎºÇ½é¤Ë°ÜÆ°"
 
-#: info/session.c:1301
+#: info/session.c:1277
 msgid "Move to the end of this node"
 msgstr "¤³¤Î¥Î¡¼¥É¤ÎºÇ¸å¤Ë°ÜÆ°"
 
-#: info/session.c:1308
+#: info/session.c:1284
 msgid "Scroll down by lines"
 msgstr "¹Ô¿ô¤Ë¤è¤ë¥¹¥¯¥í¡¼¥ë"
 
-#: info/session.c:1325
+#: info/session.c:1301
 msgid "Scroll up by lines"
 msgstr "¹Ô¿ô¤Ë¤è¤ëµÕ¥¹¥¯¥í¡¼¥ë"
 
-#: info/session.c:1343
+#: info/session.c:1319
 msgid "Scroll down by half screen size"
 msgstr "²èÌÌ¥µ¥¤¥º¤ÎȾʬ¥¹¥¯¥í¡¼¥ë"
 
-#: info/session.c:1369
+#: info/session.c:1345
 msgid "Scroll up by half screen size"
 msgstr "²èÌÌ¥µ¥¤¥º¤ÎȾʬµÕ¥¹¥¯¥í¡¼¥ë"
 
-#: info/session.c:1398
+#: info/session.c:1374
 msgid "Select the next window"
 msgstr "¼¡¤Î¥¦¥£¥ó¥É¥¦¤òÁªÂò"
 
-#: info/session.c:1437
+#: info/session.c:1413
 msgid "Select the previous window"
 msgstr "Á°¤Î¥¦¥£¥ó¥É¥¦¤òÁªÂò"
 
-#: info/session.c:1488
+#: info/session.c:1464
 msgid "Split the current window"
 msgstr "¸½ºß¤Î¥¦¥£¥ó¥É¥¦¤òʬ³ä"
 
-#: info/session.c:1569
+#: info/session.c:1545
 msgid "Delete the current window"
 msgstr "¸½ºß¤Î¥¦¥£¥ó¥É¥¦¤òºï½ü"
 
-#: info/session.c:1577
+#: info/session.c:1553
 msgid "Cannot delete a permanent window"
 msgstr "±Êµ×¥¦¥£¥ó¥É¥¦¤Ïºï½ü¤Ç¤­¤Þ¤»¤ó"
 
-#: info/session.c:1610
+#: info/session.c:1585
 msgid "Delete all other windows"
 msgstr "¾¤Î¥¦¥£¥ó¥É¥¦¤òºï½ü"
 
-#: info/session.c:1656
+#: info/session.c:1631
 msgid "Scroll the other window"
 msgstr "¾¤Î¥¦¥£¥ó¥É¥¦¤ò¥¹¥¯¥í¡¼¥ë"
 
-#: info/session.c:1677
+#: info/session.c:1652
 msgid "Scroll the other window backward"
 msgstr "¾¤Î¥¦¥£¥ó¥É¥¦¤òµÕ¥¹¥¯¥í¡¼¥ë"
 
-#: info/session.c:1683
+#: info/session.c:1658
 msgid "Grow (or shrink) this window"
 msgstr "¤³¤Î¥¦¥£¥ó¥É¥¦¤òÂ礭¤¯¤¹¤ë(¤Þ¤¿¤Ï¾®¤µ¤¯¤¹¤ë)"
 
-#: info/session.c:1694
+#: info/session.c:1669
 msgid "Divide the available screen space among the visible windows"
 msgstr "²Ä»ë¥¦¥£¥ó¥É¥¦¤ÎÍøÍѲÄǽ¥¹¥¯¥ê¡¼¥ó¶õ´Ö¤òʬ³ä¤¹¤ë"
 
-#: info/session.c:1701
+#: info/session.c:1676
 msgid "Toggle the state of line wrapping in the current window"
 msgstr "¸½ºß¤Î¥¦¥£¥ó¥É¥¦¤Ë¶Ø§½èÍý¤ò»Ü¤¹"
 
-#: info/session.c:1880
+#: info/session.c:1848
 msgid "Select the Next node"
 msgstr "¼¡ ¥Î¡¼¥É¤òÁªÂò"
 
-#: info/session.c:1888
+#: info/session.c:1856
 msgid "Select the Prev node"
 msgstr "Á° ¥Î¡¼¥É¤òÁªÂò"
 
-#: info/session.c:1896
+#: info/session.c:1864
 msgid "Select the Up node"
 msgstr "¾å ¥Î¡¼¥É¤òÁªÂò"
 
-#: info/session.c:1903
+#: info/session.c:1871
 msgid "Select the last node in this file"
 msgstr "¤³¤Î¥Õ¥¡¥¤¥ë¤ÎºÇ¸å¤Î¥Î¡¼¥É¤òÁªÂò"
 
-#: info/session.c:1930 info/session.c:1963
+#: info/session.c:1898 info/session.c:1931
 msgid "This window has no additional nodes"
 msgstr "¤³¤Î¥¦¥£¥ó¥É¥¦¤Ë¤Ï¥Î¡¼¥É¤¬ÉÕ¤¤¤Æ¤¤¤Þ¤»¤ó"
 
-#: info/session.c:1936
+#: info/session.c:1904
 msgid "Select the first node in this file"
 msgstr "¤³¤Î¥Õ¥¡¥¤¥ë¤ÎºÇ½é¤Î¥Î¡¼¥É¤òÁªÂò"
 
-#: info/session.c:1970
+#: info/session.c:1938
 msgid "Select the last item in this node's menu"
 msgstr "¤³¤Î¥Î¡¼¥É¤Î¥á¥Ë¥å¡¼Æâ¤Ç¤ÎºÇ¸å¤Î¹àÌܤòÁªÂò"
 
-#: info/session.c:1976
+#: info/session.c:1944
 msgid "Select this menu item"
 msgstr "¤³¤Î¥á¥Ë¥å¡¼¹àÌܤòÁªÂò"
 
-#: info/session.c:2005
+#: info/session.c:1977
 #, c-format
 msgid "There aren't %d items in this menu."
 msgstr "¤³¤Î¥á¥Ë¥å¡¼¤Ë %d ¸Ä¤Î¹àÌܤ¬¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: info/session.c:2148
+#: info/session.c:2171 info/session.c:2172
 #, c-format
 msgid "Menu item (%s): "
 msgstr "¥á¥Ë¥å¡¼¹àÌÜ (%s): "
 
-#: info/session.c:2150
+#: info/session.c:2175
 msgid "Menu item: "
 msgstr "¥á¥Ë¥å¡¼¹àÌÜ: "
 
-#: info/session.c:2155
+#: info/session.c:2182 info/session.c:2183
 #, c-format
 msgid "Follow xref (%s): "
 msgstr "»²¾ÈÀè (%s): "
 
-#: info/session.c:2157
+#: info/session.c:2186
 msgid "Follow xref: "
 msgstr "»²¾ÈÀè: "
 
-#: info/session.c:2280
+#: info/session.c:2315
 msgid "Read a menu item and select its node"
 msgstr "¥á¥Ë¥å¡¼¤òÆɤó¤Ç¡¢¤½¤Î¥Î¡¼¥É¤òÁªÂò¤¹¤ë"
 
-#: info/session.c:2288
+#: info/session.c:2323
 msgid "Read a footnote or cross reference and select its node"
 msgstr "µÓÃí¤äÁê¸ß»²¾È¤òÆɤó¤Ç¡¢¤½¤Î¥Î¡¼¥É¤òÁªÂò¤¹¤ë"
 
-#: info/session.c:2294
+#: info/session.c:2329
 msgid "Move to the start of this node's menu"
 msgstr "¤³¤Î¥Î¡¼¥É¥á¥Ë¥å¡¼¤ÎÀèƬ¤Ë°ÜÆ°¤¹¤ë"
 
-#: info/session.c:2318
+#: info/session.c:2353
 msgid "Visit as many menu items at once as possible"
 msgstr "²Äǽ¤Ê¸Â¤ê¿¤¯¤Î¥á¥Ë¥å¡¼¹àÌܤذìÅÙ¤Ëˬ¤ì¤ë"
 
-#: info/session.c:2346
+#: info/session.c:2381
 msgid "Read a node name and select it"
 msgstr "¥Î¡¼¥É̾¤òÆɤó¤Ç¡¢ÁªÂò¤¹¤ë"
 
-#: info/session.c:2401 info/session.c:2405
+#: info/session.c:2436 info/session.c:2441
 msgid "Goto node: "
 msgstr "¥Î¡¼¥É¤Ø°ÜÆ°: "
 
-#: info/session.c:2471
+#: info/session.c:2505
 #, c-format
 msgid "No menu in node `%s'."
 msgstr "¥Î¡¼¥É `%s' ¤Ë¥á¥Ë¥å¡¼¤¬¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: info/session.c:2516
+#: info/session.c:2551
 #, c-format
 msgid "No menu item `%s' in node `%s'."
 msgstr "¥á¥Ë¥å¡¼¥¢¥¤¥Æ¥à `%s' ¤Ï¥Î¡¼¥É `%s' Ãæ¤Ë¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: info/session.c:2546
+#: info/session.c:2581
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
 msgstr "`%s' ¤«¤é»²¾È¤µ¤ì¤Æ¤¤¤ë¥Î¡¼¥É¤ò¸«¤Ä¤±¤é¤ì¤Þ¤»¤ó(`%s' Ãæ)"
 
-#: info/session.c:2597
+#: info/session.c:2631
 msgid "Read a list of menus starting from dir and follow them"
 msgstr "dir ¤«¤é¥á¥Ë¥å¡¼³«»Ï¥ê¥¹¥È¤òÆɤߡ¢¤½¤ì¤òé¤ë"
 
-#: info/session.c:2599
+#: info/session.c:2633
 msgid "Follow menus: "
 msgstr "¥á¥Ë¥å¡¼¤Ë³¤¯: "
 
-#: info/session.c:2797
+#: info/session.c:2826
 msgid "Find the node describing program invocation"
 msgstr "¥×¥í¥°¥é¥àµ¯Æ°¤Ë´Ø¤¹¤ëÀâÌÀ¤Î¥Î¡¼¥É¤ò¸«¤Ä¤±¤ë"
 
-#: info/session.c:2799
+#: info/session.c:2828
 #, c-format
 msgid "Find Invocation node of [%s]: "
 msgstr "[%s] ¤Îµ¯Æ°¥Î¡¼¥É¤ò¸«¤Ä¤±¤ë: "
 
-#: info/session.c:2837
+#: info/session.c:2866
 msgid "Read a manpage reference and select it"
 msgstr "man ¥Ú¡¼¥¸¤Ø¤Î»²¾È¤òÆɤó¤Ç¡¢ÁªÂò¤¹¤ë"
 
-#: info/session.c:2841
+#: info/session.c:2870
 msgid "Get Manpage: "
 msgstr "Man ¥Ú¡¼¥¸¤òɽ¼¨: "
 
-#: info/session.c:2871
+#: info/session.c:2900
 msgid "Select the node `Top' in this file"
 msgstr "¤³¤Î¥Õ¥¡¥¤¥ë¤Î `ÀèƬ' ¥Î¡¼¥É¤òÁªÂò"
 
-#: info/session.c:2877
+#: info/session.c:2906
 msgid "Select the node `(dir)'"
 msgstr "`(dir)'¥Î¡¼¥É¤òÁªÂò¤¹¤ë"
 
-#: info/session.c:2897
+#: info/session.c:2923 info/session.c:2925
 #, c-format
 msgid "Kill node (%s): "
 msgstr "¥Î¡¼¥É¤ÎÀÚ¤ê¼è¤ê (%s): "
 
-#: info/session.c:2951
+#: info/session.c:2977
 #, c-format
 msgid "Cannot kill node `%s'"
 msgstr "`%s' ¥Î¡¼¥É¤òÀÚ¤ê¼è¤ì¤Þ¤»¤ó"
 
-#: info/session.c:2961
+#: info/session.c:2987
 msgid "Cannot kill the last node"
 msgstr "ºÇ¸å¤Î¥Î¡¼¥É¤ÏÀÚ¤ê¼è¤ì¤Þ¤»¤ó"
 
-#: info/session.c:3047
+#: info/session.c:3073
 msgid "Select the most recently selected node"
 msgstr "ºÇ¸å¤ËÁªÂò¤µ¤ì¤¿¥Î¡¼¥É¤òÁªÂò¤¹¤ë"
 
-#: info/session.c:3053
+#: info/session.c:3079
 msgid "Kill this node"
 msgstr "¤³¤Î¥Î¡¼¥É¤òÀÚ¤ê¼è¤ë"
 
-#: info/session.c:3061
+#: info/session.c:3087
 msgid "Read the name of a file and select it"
 msgstr "¥Õ¥¡¥¤¥ë̾¤òÆɤó¤ÇÁªÂò¤¹¤ë"
 
-#: info/session.c:3065
+#: info/session.c:3091
 msgid "Find file: "
 msgstr "¥Õ¥¡¥¤¥ë¤ò¸«¤Ä¤±¤ë: "
 
-#: info/session.c:3082
+#: info/session.c:3108
 #, c-format
 msgid "Cannot find `%s'."
 msgstr "`%s' ¤ò¸«¤Ä¤±¤é¤ì¤Þ¤»¤ó¡£"
 
-#: info/session.c:3127 info/session.c:3248
+#: info/session.c:3151 info/session.c:3269
 #, c-format
 msgid "Could not create output file `%s'."
 msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë `%s' ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó¡£"
 
-#: info/session.c:3140 info/session.c:3265 info/session.c:3326
+#: info/session.c:3165 info/session.c:3287 info/session.c:3347
 msgid "Done."
 msgstr "´°Î»¡£"
 
-#: info/session.c:3196
+#: info/session.c:3220
 #, c-format
 msgid "Writing node %s..."
 msgstr "¥Î¡¼¥É %s ¤Î½ñ¤­¹þ¤ß..."
 
-#: info/session.c:3274
+#: info/session.c:3296
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
 msgstr "INFO_PRINT_COMMAND ¤Ë¤è¤Ã¤Æ¤³¤Î¥Î¡¼¥É¤ÎÆâÍƤò¥Ñ¥¤¥×¤¹¤ë"
 
-#: info/session.c:3310
+#: info/session.c:3331
 #, c-format
 msgid "Cannot open pipe to `%s'."
 msgstr "`%s' ¤Ø¤Î¥Ñ¥¤¥×¤ò³«¤±¤Þ¤»¤ó¡£"
 
-#: info/session.c:3316
+#: info/session.c:3337
 #, c-format
 msgid "Printing node %s..."
 msgstr "¥Î¡¼¥É `%s' ¤ò°õºþ..."
 
-#: info/session.c:3558
+#: info/session.c:3567
 #, c-format
 msgid "Searching subfile %s ..."
 msgstr "Éû¥Õ¥¡¥¤¥ë %s ¤òõ¤·¤Æ¤¤¤Þ¤¹ ..."
 
-#: info/session.c:3610
+#: info/session.c:3619
 msgid "Read a string and search for it case-sensitively"
 msgstr "ʸ»úÎó¤òÆɤߡ¢Âçʸ»ú¾®Ê¸»ú¤Î¶èÊ̤ò¤Ä¤±¤Æ¸¡º÷¤¹¤ë"
 
-#: info/session.c:3617
+#: info/session.c:3626
 msgid "Read a string and search for it"
 msgstr "ʸ»úÎó¤òÆɤó¤Ç¸¡º÷¤¹¤ë"
 
-#: info/session.c:3625
+#: info/session.c:3634
 msgid "Read a string and search backward for it"
 msgstr "ʸ»úÎó¤òÆɤó¤Ç¸åÊý¸¡º÷¤¹¤ë"
 
-#: info/session.c:3667
+#: info/session.c:3670 info/session.c:3677
 #, c-format
 msgid "%s%sfor string [%s]: "
 msgstr "ʸ»úÎó¤Ø¤Î%s%s [%s]: "
 
-#: info/session.c:3668
+#: info/session.c:3671 info/session.c:3678
 msgid "Search backward"
 msgstr "¸åÊý¸¡º÷"
 
-#: info/session.c:3668
+#: info/session.c:3672 info/session.c:3678
 msgid "Search"
 msgstr "¸¡º÷"
 
-#: info/session.c:3669
+#: info/session.c:3673 info/session.c:3679
 msgid " case-sensitively "
 msgstr "(Âçʸ»ú¾®Ê¸»ú¤Î¶èÊ̤ò¤Ä¤±¤Æ) "
 
-#: info/session.c:3669
+#: info/session.c:3674 info/session.c:3679
 msgid " "
 msgstr " "
 
-#: info/session.c:3709
+#: info/session.c:3718
 msgid "Search failed."
 msgstr "¸¡º÷¤Ë¼ºÇÔ¡£"
 
-#: info/session.c:3727
+#: info/session.c:3736
 msgid "Repeat last search in the same direction"
 msgstr "Ʊ°ìÊý¸þ¤ÇºÇ¸å¤Î¸¡º÷¤ò·«¤êÊÖ¤¹"
 
-#: info/session.c:3730 info/session.c:3740
+#: info/session.c:3739 info/session.c:3749
 msgid "No previous search string"
 msgstr "Á°¤Î¸¡º÷ʸ»úÎ󤬤¢¤ê¤Þ¤»¤ó"
 
-#: info/session.c:3737
+#: info/session.c:3746
 msgid "Repeat last search in the reverse direction"
 msgstr "µÕÊý¸þ¤ÇºÇ¸å¤Î¸¡º÷¤ò·«¤êÊÖ¤¹"
 
-#: info/session.c:3755 info/session.c:3761
+#: info/session.c:3765 info/session.c:3771
 msgid "Search interactively for a string as you type it"
 msgstr "ÆþÎϤ·¤¿Ê¸»úÎó¤ÎÂÐÏÃŪ¤Ê¸¡º÷"
 
-#: info/session.c:3855
+#: info/session.c:3851
 msgid "I-search backward: "
 msgstr "Ã༡¸åÊý¸¡º÷: "
 
-#: info/session.c:3857
+#: info/session.c:3853
 msgid "I-search: "
 msgstr "Ã༡¸¡º÷: "
 
-#: info/session.c:3882
+#: info/session.c:3878 info/session.c:3880
 msgid "Failing "
 msgstr "¼ºÇÔ "
 
@@ -1544,27 +1572,27 @@ msgstr "¼¡¤ÎÁê¸ß»²¾È¤Ë°ÜÆ°"
 msgid "Select reference or menu item appearing on this line"
 msgstr "»²¾È¤Þ¤¿¤Ï¡¢¤³¤Î¹Ô¤Ë¸½¤ì¤¿¥á¥Ë¥å¡¼¹àÌܤòÁªÂò"
 
-#: info/session.c:4381
+#: info/session.c:4382
 msgid "Cancel current operation"
 msgstr "¸½ºß¤ÎÁàºî¤òÃæ»ß"
 
-#: info/session.c:4388
+#: info/session.c:4389
 msgid "Quit"
 msgstr "»ß¤á¤Þ¤·¤¿"
 
-#: info/session.c:4397
+#: info/session.c:4398
 msgid "Move the cursor to a specific line of the window"
 msgstr "¥¦¥£¥ó¥É¥¦¤Î»ØÄê¹Ô¤Ë¥«¡¼¥½¥ë¤ò°ÜÆ°"
 
-#: info/session.c:4429
+#: info/session.c:4430
 msgid "Redraw the display"
 msgstr "²èÌ̤κÆÉÁ²è"
 
-#: info/session.c:4466
+#: info/session.c:4467
 msgid "Quit using Info"
 msgstr "Info ¤Î»ÈÍѤò½ªÎ»"
 
-#: info/session.c:4479
+#: info/session.c:4480
 msgid "Run command bound to this key's lowercase variant"
 msgstr "¤³¤Î¥­¡¼¤Î¾®Ê¸»ú¤Ë¥Ð¥¤¥ó¥É¤µ¤ì¤¿¥³¥Þ¥ó¥É¤ò¼Â¹Ô"
 
@@ -1574,27 +1602,29 @@ msgid "Unknown command (%s)."
 msgstr "ÉÔÌÀ¤Ê¥³¥Þ¥ó¥É (%s) ¤Ç¤¹¡£"
 
 #: info/session.c:4494
-msgid "\"\" is invalid"
-msgstr "\"\" ¤Ï̵¸ú¤Ç¤¹"
-
-#: info/session.c:4495
 #, c-format
 msgid "\"%s\" is invalid"
 msgstr "\"%s\" ¤Ï̵¸ú¤Ç¤¹"
 
-#: info/session.c:4713
+#: info/session.c:4495
+#, fuzzy, c-format
+msgid "`%s' is invalid"
+msgstr "\"%s\" ¤Ï̵¸ú¤Ç¤¹"
+
+#: info/session.c:4709
 msgid "Add this digit to the current numeric argument"
 msgstr "¸½ºß¤Î¿ôÃÍ°ú¿ô¤Ë¤³¤Î¿ôÃͤò²Ã¤¨¤ë"
 
-#: info/session.c:4722
+#: info/session.c:4718
 msgid "Start (or multiply by 4) the current numeric argument"
 msgstr "¸½ºß¤Î¿ôÃÍ°ú¿ô¤ò³«»Ï(Ëô¤Ï 4 Çܤ¹¤ë)"
 
-#: info/session.c:4737
+#: info/session.c:4733
 msgid "Internally used by \\[universal-argument]"
 msgstr "ÆâÉôŪ¤Ë \\[universal-argument] ¤Ë¤è¤Ã¤ÆÍøÍѤµ¤ì¤Þ¤¹"
 
-#: info/tilde.c:344
+#: info/tilde.c:338
+#, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: ²¾ÁÛ¥á¥â¥ê¤ò»È¤¤²Ì¤¿¤·¤Þ¤·¤¿!\n"
 
@@ -1660,230 +1690,264 @@ msgstr "%s ¤ËÃͤòÀßÄê (%d): "
 msgid "Set %s to value (%s): "
 msgstr "%s ¤ËÃͤòÀßÄê (%s): "
 
-#: info/window.c:1164
+#: info/window.c:1138
 msgid "--*** Tags out of Date ***"
 msgstr "--*** µì¼°¤Î¥¿¥° ***"
 
-#: info/window.c:1175
+#: info/window.c:1149
 msgid "-----Info: (), lines ----, "
 msgstr "-----Info: (), ¹Ô¿ô ----, "
 
-#: info/window.c:1182
+#: info/window.c:1156
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr "-%s---Info: %s, %d ¹Ô --%s--"
 
-#: info/window.c:1186
+#: info/window.c:1160
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr "-%s%s-Info: (%s)%s, %d ¹Ô --%s--"
 
-#: info/window.c:1193
+#: info/window.c:1167
 #, c-format
 msgid " Subfile: %s"
 msgstr " Éû¥Õ¥¡¥¤¥ë: %s"
 
-#: lib/getopt.c:675
+#: lib/getopt.c:551 lib/getopt.c:570
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤ÏÛ£Ëæ¤Ç¤¹\n"
 
-#: lib/getopt.c:700
+#: lib/getopt.c:603 lib/getopt.c:607
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `--%s' ¤Ï°ú¿ô¤¬ÉÔÍפǤ¹\n"
 
-#: lib/getopt.c:705
+#: lib/getopt.c:616 lib/getopt.c:621
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `%c%s' ¤Ï°ú¿ô¤¬ÉÔÍפǤ¹\n"
 
-#: lib/getopt.c:723 lib/getopt.c:896
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤Ë¤Ï¡¢°ú¿ô¤¬É¬ÍפǤ¹\n"
 
-#: lib/getopt.c:752
+#: lib/getopt.c:727 lib/getopt.c:730
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: `--%s' ¤Ïǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó¤Ç¤¹\n"
 
-#: lib/getopt.c:756
+#: lib/getopt.c:738 lib/getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: `%c%s' ¤Ïǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó¤Ç¤¹\n"
 
-#: lib/getopt.c:782
+#: lib/getopt.c:796 lib/getopt.c:799
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: ÉÔÀµ¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"
 
-#: lib/getopt.c:785
+#: lib/getopt.c:805 lib/getopt.c:808
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ̵¸ú¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"
 
-#: lib/getopt.c:815 lib/getopt.c:945
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: ¥ª¥×¥·¥ç¥ó¤Ï°ú¿ô¤òÍ׵ᤷ¤Þ¤¹ -- %c\n"
 
-#: lib/getopt.c:862
+#: lib/getopt.c:935 lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: `-W %s' ¥ª¥×¥·¥ç¥ó¤¬Û£Ëæ¤Ç¤¹\n"
 
-#: lib/getopt.c:880
+#: lib/getopt.c:978 lib/getopt.c:999
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: `-W %s' ¥ª¥×¥·¥ç¥ó¤Ë¤Ï°ú¿ô¤¬ÉÔÍפǤ¹\n"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#, fuzzy, c-format
+msgid "arguments to @%s ignored"
+msgstr "%c%s ¤ËÂФ¹¤ëÉÔÀµ¤Ê°ú¿ô"
+
+#: makeinfo/cmds.c:585
 msgid "January"
 msgstr "°ì·î"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "February"
 msgstr "Æó·î"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "March"
 msgstr "»°·î"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "April"
 msgstr "»Í·î"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "May"
 msgstr "¸Þ·î"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "June"
 msgstr "Ï»·î"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "July"
 msgstr "¼··î"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "August"
 msgstr "Ȭ·î"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "September"
 msgstr "¶å·î"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "October"
 msgstr "½½·î"
 
-#: makeinfo/cmds.c:517
+#: makeinfo/cmds.c:587
 msgid "November"
 msgstr "½½°ì·î"
 
-#: makeinfo/cmds.c:517
+#: makeinfo/cmds.c:587
 msgid "December"
 msgstr "½½Æó·î"
 
-#: makeinfo/cmds.c:658
+#: makeinfo/cmds.c:936
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "@var ¤Ç»È¤¨¤½¤¦¤Ë¤Ê¤¤Ê¸»ú %c"
 
-#: makeinfo/cmds.c:701
+#: makeinfo/cmds.c:979
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "Á´¤ÆÂçʸ»ú¤Î @sc °ú¿ô¡¢½¾¤Ã¤Æ¸ú²Ì¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: makeinfo/cmds.c:759
+#: makeinfo/cmds.c:1034
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "`{' ¤¬¤¢¤ë¤Ï¤º¤Ç¤¹¤¬¡¢`%c' ¤Ç¤·¤¿"
 
-#: makeinfo/cmds.c:789
+#: makeinfo/cmds.c:1074
 msgid "end of file inside verb block"
 msgstr "verb ¥Ö¥í¥Ã¥¯Æâ¤Ç¥Õ¥¡¥¤¥ëËöÈø¤È¤Ê¤ê¤Þ¤·¤¿"
 
-#: makeinfo/cmds.c:797
+#: makeinfo/cmds.c:1082
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "`}' ¤¬¤¢¤ë¤Ï¤º¤Ç¤¹¤¬¡¢`%c' ¤Ç¤·¤¿"
 
-#: makeinfo/cmds.c:942
+#: makeinfo/cmds.c:1112
+msgid ""
+"@strong{Note...} produces a spurious cross-reference in Info; reword to "
+"avoid that"
+msgstr ""
+
+#: makeinfo/cmds.c:1305
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s ¤ÏÇѤ줿̿Îá¤Ç¤¹"
 
-#: makeinfo/cmds.c:1014
+#: makeinfo/cmds.c:1414
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "@sp ¤Ë¤Ï `%s' ¤Ç¤Ï¤Ê¤¯¡¢Àµ¤Î¿ôÃͤòÍ¿¤¨¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
-#: makeinfo/cmds.c:1348 makeinfo/cmds.c:1374 makeinfo/footnote.c:81
+#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "%c%s ¤ËÂФ¹¤ëÉÔÀµ¤Ê°ú¿ô"
 
-#: makeinfo/cmds.c:1358 makeinfo/makeinfo.c:4140
+#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
 msgid "asis"
 msgstr "¤½¤Î¤Þ¤Þ"
 
-#: makeinfo/cmds.c:1360 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
 msgid "none"
 msgstr "¤Ê¤·"
 
-#: makeinfo/defun.c:85
+#: makeinfo/cmds.c:1789
+#, fuzzy, c-format
+msgid "Bad argument to @%s"
+msgstr "%c%s ¤ËÂФ¹¤ëÉÔÀµ¤Ê°ú¿ô"
+
+#: makeinfo/cmds.c:1803
+msgid "insert"
+msgstr ""
+
+#: makeinfo/defun.c:84
 msgid "Missing `}' in @def arg"
 msgstr "@def °ú¿ô¤Ë `}' ¤ò˺¤ì¤Æ¤¤¤Þ¤¹"
 
-#: makeinfo/defun.c:363
+#: makeinfo/defun.c:403
 msgid "Function"
 msgstr "µ¡Ç½"
 
-#: makeinfo/defun.c:366
+#: makeinfo/defun.c:406
 msgid "Macro"
 msgstr "¥Þ¥¯¥í"
 
-#: makeinfo/defun.c:369
+#: makeinfo/defun.c:409
 msgid "Special Form"
 msgstr "Æü췿"
 
-#: makeinfo/defun.c:373
+#: makeinfo/defun.c:413
 msgid "Variable"
 msgstr "ÊÑ¿ô"
 
-#: makeinfo/defun.c:376
+#: makeinfo/defun.c:416
 msgid "User Option"
 msgstr "¥æ¡¼¥¶¥ª¥×¥·¥ç¥ó"
 
-#: makeinfo/defun.c:380
+#: makeinfo/defun.c:420
 msgid "Instance Variable"
 msgstr "¥¤¥ó¥¹¥¿¥ó¥¹ÊÑ¿ô"
 
-#: makeinfo/defun.c:384
+#: makeinfo/defun.c:424
 msgid "Method"
 msgstr "¥á¥½¥Ã¥É"
 
-#: makeinfo/defun.c:466 makeinfo/defun.c:470 makeinfo/defun.c:615
-#: makeinfo/defun.c:631 makeinfo/defun.c:671
+#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
+#: makeinfo/defun.c:644 makeinfo/xml.c:2229
 msgid "of"
 msgstr "of"
 
-#: makeinfo/defun.c:474 makeinfo/defun.c:478 makeinfo/defun.c:482
-#: makeinfo/defun.c:624 makeinfo/defun.c:676
+#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
 msgid "on"
 msgstr "on"
 
-#: makeinfo/defun.c:717
-#, c-format
-msgid "Must be in `%s' insertion to use `%sx'"
+#: makeinfo/defun.c:711
+#, fuzzy, c-format
+msgid "Must be in `@%s' environment to use `@%s'"
 msgstr "`%2$sx' ¤ò»È¤¦¤¿¤á¤Ë¤Ï `%1$s' ÁÞÆþ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
-#: makeinfo/files.c:448
+#: makeinfo/files.c:435
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr "%s: getwd: %s, %s\n"
 
+#: makeinfo/files.c:638
+#, c-format
+msgid "`%s' omitted before output filename"
+msgstr ""
+
+#: makeinfo/files.c:646
+#, c-format
+msgid "`%s' omitted since writing to stdout"
+msgstr ""
+
+#: makeinfo/files.c:694
+msgid "Output buffer not empty."
+msgstr ""
+
 #: makeinfo/footnote.c:150
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
@@ -1903,227 +1967,274 @@ msgstr "µÓÃí¤Ë¿Æ¥Î¡¼¥É¤ÎÄêµÁ¤¬¤¢¤ê¤Þ¤»¤ó"
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "µÓÃí¤Ë¿Æ¥Î¡¼¥É¤ÎÄêµÁ¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: makeinfo/footnote.c:298
+#: makeinfo/footnote.c:302 makeinfo/index.c:189
 msgid "Footnotes"
 msgstr "µÓÃí"
 
-#: makeinfo/html.c:42
+#: makeinfo/html.c:87
+#, c-format
+msgid "%s: could not open --css-file: %s"
+msgstr ""
+
+#: makeinfo/html.c:172
+#, c-format
+msgid "%s:%d: --css-file ended in comment"
+msgstr ""
+
+#: makeinfo/html.c:207
 msgid "Untitled"
 msgstr "̵Âê"
 
-#: makeinfo/html.c:298
-#, c-format
-msgid "Invalid node name: `%s'"
+#: makeinfo/html.c:422
+msgid "[unexpected] no html tag to pop"
+msgstr ""
+
+#: makeinfo/html.c:752
+#, fuzzy, c-format
+msgid "[unexpected] invalid node name: `%s'"
 msgstr "ÉÔŬÀڤʥΡ¼¥É̾¤Ç¤¹: `%s'"
 
-#: makeinfo/index.c:213
+#: makeinfo/index.c:169
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "ÉÔÌÀ¤Ê¥¤¥ó¥Ç¥Ã¥¯¥¹ `%s'"
 
-#: makeinfo/index.c:238
+#: makeinfo/index.c:234
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr ""
 
-#: makeinfo/index.c:396
+#: makeinfo/index.c:412
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "¸«½Ð¤· `%s' ¤Ï´û¤Ë¸ºß¤·¤Þ¤¹"
 
-#: makeinfo/index.c:439
+#: makeinfo/index.c:455
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "@synindex ¤Ë¡¢ÃΤé¤Ê¤¤¸«½Ð¤· `%s' ¤ä `%s' ¤¬¤¢¤ê¤Þ¤¹"
 
-#: makeinfo/index.c:666
+#: makeinfo/index.c:661
+msgid "(line )"
+msgstr ""
+
+#: makeinfo/index.c:669
+#, c-format
+msgid "(line %*d)"
+msgstr ""
+
+#: makeinfo/index.c:750
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "@printindex ¤Ë¡¢ÃΤé¤Ê¤¤¸«½Ð¤· `%s' ¤¬¤¢¤ê¤Þ¤¹"
 
-#: makeinfo/index.c:709
+#: makeinfo/index.c:819
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "¸«½Ð¤· `%s' ¤Î¥¨¥ó¥È¥ê¤Ï¤¢¤é¤æ¤ë¥Î¡¼¥É¤Î³°Â¦¤Ç¤¹"
 
-#: makeinfo/index.c:712 makeinfo/index.c:751
+#: makeinfo/index.c:822 makeinfo/index.c:858
 msgid "(outside of any node)"
 msgstr "(¤¢¤é¤æ¤ë¥Î¡¼¥É¤Î³°Â¦)"
 
-#: makeinfo/insertion.c:198
+#: makeinfo/index.c:919 makeinfo/index.c:925
+msgid "See "
+msgstr "See "
+
+#: makeinfo/insertion.c:160
+msgid "@item not allowed in argument to @itemize"
+msgstr ""
+
+#: makeinfo/insertion.c:238
 msgid "Broken-Type in insertion_type_pname"
 msgstr "insertion_type_pname Ãæ¤Ë²õ¤ì¤¿·¿¤¬¤¢¤ê¤Þ¤¹"
 
-#: makeinfo/insertion.c:271
+#: makeinfo/insertion.c:334
 msgid "Enumeration stack overflow"
 msgstr "ÎóµóÍÑ¥¹¥¿¥Ã¥¯¤¬¥ª¡¼¥Ð¥Õ¥í¡¼¤·¤Þ¤·¤¿"
 
-#: makeinfo/insertion.c:303
+#: makeinfo/insertion.c:366
 #, c-format
 msgid "lettering overflow, restarting at %c"
 msgstr "¥é¥Ù¥ëʸ»ú¤¬¥ª¡¼¥Ð¡¼¥Õ¥í¡¼¡¢%c ¤ËÌᤷ¤Þ¤¹"
 
-#: makeinfo/insertion.c:538
+#: makeinfo/insertion.c:631
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
 msgstr "%s ¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹: %citem ¤òÀ°·Á¤¹¤ë¤¿¤á"
 
-#: makeinfo/insertion.c:693
+#: makeinfo/insertion.c:719
+#, c-format
+msgid "%cfloat environments cannot be nested"
+msgstr ""
+
+#: makeinfo/insertion.c:973
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
 msgstr "`@end' ¤Ë¤Ï `%s' ¤¬É¬ÍפǤ¹¤¬¡¢`%s' ¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿"
 
-#: makeinfo/insertion.c:931
+#: makeinfo/insertion.c:1337
 #, c-format
 msgid "No matching `%cend %s'"
 msgstr "`%cend %s' ¤È¤ÎÂбþ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: makeinfo/insertion.c:1084
+#: makeinfo/insertion.c:1592
 #, c-format
 msgid "%s requires letter or digit"
 msgstr "%s ¤Ë¤Ï±Ñ¿ôʸ»ú¤¬É¬ÍפǤ¹"
 
-#: makeinfo/insertion.c:1158
+#: makeinfo/insertion.c:1687
 msgid "end of file inside verbatim block"
 msgstr "verbatim ¥Ö¥í¥Ã¥¯Ãæ¤Ç¥Õ¥¡¥¤¥ë¤ÎËöÈø¤È¤Ê¤ê¤Þ¤·¤¿"
 
-#: makeinfo/insertion.c:1318
+#: makeinfo/insertion.c:1913
+#, fuzzy, c-format
+msgid "@%s not meaningful outside `@float' environment"
+msgstr "`@%2$s' ¥Ö¥í¥Ã¥¯Æ⦤ǤΠ@%1$s ¤Ï¡¢¤¢¤Þ¤ê°ÕÌ£¤¬¤¢¤ê¤Þ¤»¤ó"
+
+#: makeinfo/insertion.c:1949
 msgid "@menu seen before first @node, creating `Top' node"
 msgstr "@menu ¤¬ºÇ½é¤Î @node °ÊÁ°¤Ë¸½¤ì¤Þ¤·¤¿¡£`Top' ¥Î¡¼¥É¤ò¤Ä¤¯¤ê¤Þ¤¹"
 
-#: makeinfo/insertion.c:1319
+#: makeinfo/insertion.c:1950
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr "¿ʬ @top ¥Î¡¼¥É¤Ï @ifinfo ¤è¤ê¤Ï @ifnottex ¤Ëʤ¤ï¤ì¤ë¤Ù¤­¤Ç¤Ï¡©"
 
-#: makeinfo/insertion.c:1331
+#: makeinfo/insertion.c:1962
 msgid "@detailmenu seen before first node, creating `Top' node"
 msgstr "@detailmenu ¤¬ºÇ½é¤Î¥Î¡¼¥É°ÊÁ°¤Ë¸½¤ì¤Þ¤·¤¿¡£`ĺÅÀ' ¥Î¡¼¥É¤òºî¤ê¤Þ¤¹"
 
-#: makeinfo/insertion.c:1346
+#: makeinfo/insertion.c:2018
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr ""
+
+#: makeinfo/insertion.c:2032
+#, fuzzy, c-format
+msgid "@%s not meaningful outside `@titlepage' environment"
+msgstr "`@%2$s' ¥Ö¥í¥Ã¥¯Æ⦤ǤΠ@%1$s ¤Ï¡¢¤¢¤Þ¤ê°ÕÌ£¤¬¤¢¤ê¤Þ¤»¤ó"
+
+#: makeinfo/insertion.c:2063
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr "`%c%s' ¤È¤ÎÂбþ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: makeinfo/insertion.c:1353
+#: makeinfo/insertion.c:2068
 #, c-format
 msgid "`%c%s' needs something after it"
 msgstr "`%c%s' ¤Î¸å¤í¤Ë¤Ï²¿¤«¤¬É¬ÍפǤ¹"
 
-#: makeinfo/insertion.c:1359
-#, c-format
-msgid "Bad argument to `%s', `%s', using `%s'"
+#: makeinfo/insertion.c:2074
+#, fuzzy, c-format
+msgid "Bad argument `%s' to `@%s', using `%s'"
 msgstr "`%s' ¤ËÂФ¹¤ëÉÔÀµ¤Ê°ú¿ô `%s'¡£`%s' ¤ò»È¤¤¤Þ¤¹"
 
-#: makeinfo/insertion.c:1453
+#: makeinfo/insertion.c:2171
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
 msgstr "`@%2$s' ¥Ö¥í¥Ã¥¯Æ⦤ǤΠ@%1$s ¤Ï¡¢¤¢¤Þ¤ê°ÕÌ£¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: makeinfo/insertion.c:1462
+#: makeinfo/insertion.c:2180
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "`%s' ¥Ö¥í¥Ã¥¯Æ⦤ǤΠ@itemx ¤Ï¡¢¤¢¤Þ¤ê°ÕÌ£¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: makeinfo/insertion.c:1646
+#: makeinfo/insertion.c:2356
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "ÁÞÆþ¥Ö¥í¥Ã¥¯³°¤Ç¡¢%c%s ¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿"
 
-#: makeinfo/lang.c:331
+#: makeinfo/lang.c:580
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "%s ¤ÏÍ­¸ú¤Ê ISO 639 ¸À¸ì¥³¡¼¥É¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: makeinfo/lang.c:384
-#, c-format
-msgid "unrecogized encoding name `%s'"
+#: makeinfo/lang.c:655
+#, fuzzy, c-format
+msgid "unrecognized encoding name `%s'"
 msgstr "¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°Ì¾ `%s' ¤òǧ¼±¤Ç¤­¤Þ¤»¤ó"
 
-#: makeinfo/lang.c:387
+#: makeinfo/lang.c:663
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "»ÄÇ°¤Ê¤¬¤é¡¢¥¨¥ó¥³¡¼¥É `%s' ¤Ï¼õ¤±ÉÕ¤±¤é¤ì¤Þ¤»¤ó"
 
-#: makeinfo/lang.c:414
+#: makeinfo/lang.c:715
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "¥¨¥ó¥³¡¼¥Éʸ»ú `%s' ¤¬Ìµ¸ú¤Ç¤¹"
 
-#: makeinfo/lang.c:502
-#, c-format
-msgid "%s is an invalid ISO code, using %c"
-msgstr "%s ¤ÏÉÔŬÀÚ¤Ê ISO ¥³¡¼¥É¤Ç¤¹¡£%c ¤ò»È¤¤¤Þ¤¹"
-
-#: makeinfo/lang.c:687
+#: makeinfo/lang.c:1009
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "%c%s ¤Ï `%c' ¤Ç¤Ï¤Ê¤¯¡¢`i' ¤« `j' ¤ò°ú¿ô¤È¤·¤ÆɬÍפȤ·¤Þ¤¹"
 
-#: makeinfo/lang.c:691
+#: makeinfo/lang.c:1013
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr "%c%s ¤Ï°ú¿ô¤È¤·¤Æ `i' ¤« `j' ¤Î¤¤¤º¤ì¤«°ìʸ»ú¤¬É¬ÍפǤ¹"
 
-#: makeinfo/macro.c:134
+#: makeinfo/macro.c:128
 #, c-format
 msgid "macro `%s' previously defined"
 msgstr "¥Þ¥¯¥í `%s' ¤Ï°ÊÁ°¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: makeinfo/macro.c:138
+#: makeinfo/macro.c:132
 #, c-format
 msgid "here is the previous definition of `%s'"
 msgstr "¤³¤³¤Ï¡¢`%s' ¤ÎÁ°¤ÎÄêµÁ¤Ç¤¹"
 
 #: makeinfo/macro.c:355
-#, c-format
-msgid "\\ in macro expansion followed by `%s' instead of \\ or parameter name"
+#, fuzzy, c-format
+msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr "¥Þ¥¯¥íŸ³«Æâ¤Î \\ ¤Î¸å¤í¤Ë \\ ¤ä¥Ñ¥é¥á¥¿Ì¾¤Ç¤Ï¤Ê¤¯ `%s' ¤¬Â³¤¤¤Æ¤¤¤Þ¤¹"
 
-#: makeinfo/macro.c:403
+#: makeinfo/macro.c:401
 #, c-format
 msgid "Macro `%s' called on line %d with too many args"
 msgstr "¥Þ¥¯¥í `%s' ¸Æ¤Ó½Ð¤·(%d¹ÔÌÜ)¤Î°ú¿ô¤¬Â¿¤¹¤®¤Þ¤¹"
 
-#: makeinfo/macro.c:594
+#: makeinfo/macro.c:586
 #, c-format
 msgid "%cend macro not found"
 msgstr "%cend ¥Þ¥¯¥í¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: makeinfo/macro.c:632
+#: makeinfo/macro.c:624
 msgid "@quote-arg only useful for single-argument macros"
 msgstr "@quote-arg ¤Ï¡¢°ú¿ô¤ò°ì¤ÄÍ¿¤¨¤¿¤È¤­¤Î¤ßÍ­¸ú¤Ç¤¹"
 
-#: makeinfo/macro.c:668
+#: makeinfo/macro.c:660
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "@%2$s ¤È°ìÃפ·¤Ê¤¤ @end %1$s"
 
-#: makeinfo/makeinfo.c:316
+#: makeinfo/makeinfo.c:184
 #, c-format
-msgid "%s:%d: warning: "
-msgstr "%s:%d: ·Ù¹ð: "
-
-#: makeinfo/makeinfo.c:339
 msgid "Too many errors!  Gave up.\n"
 msgstr "¥¨¥é¡¼¤¬Â¿¤¹¤®¤Þ¤¹!  Äü¤á¤Þ¤·¤¿¡£\n"
 
-#: makeinfo/makeinfo.c:350 makeinfo/makeinfo.c:2026
+#: makeinfo/makeinfo.c:302
+#, c-format
+msgid "%s:%d: warning: "
+msgstr "%s:%d: ·Ù¹ð: "
+
+#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
 #, c-format
 msgid "Misplaced %c"
 msgstr "´Ö°ã¤Ã¤¿°ÌÃÖ¤Ë %c"
 
-#: makeinfo/makeinfo.c:370
+#: makeinfo/makeinfo.c:340
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "¾Ü¤·¤¯¤Ï `%s --help' ¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: makeinfo/makeinfo.c:373
+#: makeinfo/makeinfo.c:343
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... TEXINFO¥Õ¥¡¥¤¥ë...\n"
 
-#: makeinfo/makeinfo.c:376
+#: makeinfo/makeinfo.c:346
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -2131,7 +2242,7 @@ msgstr ""
 "Texinfo ¥½¡¼¥¹Ê¸½ñ¤òÍÍ¡¹¤Ê·Á¼°¤ÇÆɤá¤ë¤è¤¦¤ËÊÑ´¹¤·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï\n"
 "¥ª¥ó¥é¥¤¥ó¤Ç Emacs ¤äñÆȤΠGNU Info ¤ÇÆɤà¤Î¤ËŬ¤·¤¿ Info ¥Õ¥¡¥¤¥ë¤Ç¤¹¡£\n"
 
-#: makeinfo/makeinfo.c:380
+#: makeinfo/makeinfo.c:350
 #, c-format
 msgid ""
 "General options:\n"
@@ -2157,13 +2268,14 @@ msgstr ""
 "  -v, --verbose               ¹Ô¤Ê¤ï¤ì¤ë»ö¤òÀâÌÀ¤¹¤ë¡£\n"
 "      --version               ¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»¤¹¤ë¡£\n"
 
-#: makeinfo/makeinfo.c:394
+#: makeinfo/makeinfo.c:364
 #, fuzzy, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output DocBook rather than Info.\n"
+"      --docbook             output Docbook XML rather than Info.\n"
 "      --html                output HTML rather than Info.\n"
-"      --xml                 output XML (TexinfoML) rather than Info.\n"
+"      --xml                 output Texinfo XML rather than Info.\n"
+"      --plaintext           output plain text rather than Info.\n"
 msgstr ""
 "½ÐÎÏ·Á¼°¥»¥¯¥·¥ç¥ó (¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï Info ¤òÀ¸À®¤·¤Þ¤¹):\n"
 "      --docbook             Info ¤Ç¤Ï¤Ê¤¯ DocBook ¤ò½ÐÎϤ¹¤ë¡£\n"
@@ -2173,7 +2285,7 @@ msgstr ""
 "                              ¤Ä¤±¤Ê¤¤¤Èɸ½à½ÐÎϤ˽ñ¤­¹þ¤à\n"
 "      --xml                 Info ¤Ç¤Ï¤Ê¤¯ XML (TexinfoML) ·Á¼°¤Ç½ÐÎϤ¹¤ë¡£\n"
 
-#: makeinfo/makeinfo.c:401
+#: makeinfo/makeinfo.c:372
 #, fuzzy
 msgid ""
 "General output options:\n"
@@ -2198,7 +2310,7 @@ msgstr ""
 "  -o, --output=FILE         FILE ¤Ø½ÐÎϤ¹¤ë (ʬ³ä HTML ¤Î¾ì¹ç¥Ç¥£¥ì¥¯¥È"
 "¥ê)¡£\n"
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:386
 #, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2230,14 +2342,32 @@ msgstr ""
 "                                ¤À¤È¡¢´û¸¤Î»ú²¼¤²¤ò¤½¤Î¤Þ¤Þ»È¤¦¡£\n"
 "      --split-size=NUM        Info ¥Õ¥¡¥¤¥ë¥µ¥¤¥º¤ò NUM ¤Çʬ³ä (default %d)\n"
 
-#: makeinfo/makeinfo.c:433
+#: makeinfo/makeinfo.c:403
+msgid ""
+"Options for HTML:\n"
+"      --css-include=FILE        include FILE in HTML <style> output;\n"
+"                                  read stdin if FILE is -.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:409
+#, c-format
+msgid ""
+"Options for XML and Docbook:\n"
+"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"d).\n"
+"                                  If VAL is 0, ignorable whitespace is "
+"dropped.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:416
+#, fuzzy
 msgid ""
 "Input file options:\n"
-"      --commands-in-node-names   allow @ commands in node names.\n"
-"  -D VAR                         define the variable VAR, as with @set.\n"
-"  -I DIR                         append DIR to the @include search path.\n"
-"  -P DIR                         prepend DIR to the @include search path.\n"
-"  -U VAR                         undefine the variable VAR, as with @clear.\n"
+"      --commands-in-node-names  allow @ commands in node names.\n"
+"  -D VAR                        define the variable VAR, as with @set.\n"
+"  -I DIR                        append DIR to the @include search path.\n"
+"  -P DIR                        prepend DIR to the @include search path.\n"
+"  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
 "ÆþÎÏ¥Õ¥¡¥¤¥ë¥ª¥×¥·¥ç¥ó:\n"
 "      --commands-in-node-names   ¥Î¡¼¥É̾Ãæ¤Î @ ¥³¥Þ¥ó¥É¤òµö²Ä¤¹¤ë¡£\n"
@@ -2246,18 +2376,25 @@ msgstr ""
 "  -P DIR                         @include õº÷¥Ñ¥¹¤ÎÀèƬ¤Ë DIR ¤òÁÞÆþ¤¹¤ë¡£\n"
 "  -U VAR                         ÊÑ¿ô VAR ¤ò̤ÄêµÁ¤Ë¤¹¤ë¡£@clear ¤ÈƱ¤¸¡£\n"
 
-#: makeinfo/makeinfo.c:442
+#: makeinfo/makeinfo.c:425
 #, fuzzy
 msgid ""
 "Conditional processing in input:\n"
+"  --ifdocbook       process @ifdocbook and @docbook even if\n"
+"                      not generating Docbook.\n"
 "  --ifhtml          process @ifhtml and @html even if not generating HTML.\n"
 "  --ifinfo          process @ifinfo even if not generating Info.\n"
 "  --ifplaintext     process @ifplaintext even if not generating plain text.\n"
 "  --iftex           process @iftex and @tex; implies --no-split.\n"
+"  --ifxml           process @ifxml and @xml.\n"
+"  --no-ifdocbook    do not process @ifdocbook and @docbook text.\n"
 "  --no-ifhtml       do not process @ifhtml and @html text.\n"
 "  --no-ifinfo       do not process @ifinfo text.\n"
 "  --no-ifplaintext  do not process @ifplaintext text.\n"
 "  --no-iftex        do not process @iftex and @tex text.\n"
+"  --no-ifxml        do not process @ifxml and @xml text.\n"
+"\n"
+"  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
 msgstr ""
 "ÆþÎϤξò·ïŪ½èÍý:\n"
 "     --ifhtml      HTML À¸À®¤Ç¤Ê¤¯¤Æ¤â¡¢@ifhtml ¤ä @html ¤ò½èÍý¤¹¤ë¡£\n"
@@ -2267,25 +2404,26 @@ msgstr ""
 "     --no-ifinfo   @ifinfo ¥Æ¥¯¥¹¥È¤ò½èÍý¤·¤Ê¤¤¡£\n"
 "     --no-iftex    @iftex ¤ä @tex ¥Æ¥¯¥¹¥È¤ò½èÍý¤·¤Ê¤¤¡£\n"
 
-#: makeinfo/makeinfo.c:454
+#: makeinfo/makeinfo.c:444
 #, fuzzy
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating HTML, --ifhtml is on and the others are off;\n"
 "  if generating Info, --ifinfo is on and the others are off;\n"
 "  if generating plain text, --ifplaintext is on and the others are off;\n"
+"  if generating XML, --ifxml is on and the others are off.\n"
 msgstr ""
 "  Æä˻ØÄ꤬¤Ê¤±¤ì¤Ð¡¢@if... ¾ò·ï¤Ï½ÐÎÏ·Á¼°¼¡Âè¤È¤Ê¤ê¤Þ¤¹:\n"
 "  HTML ¤òÀ¸À®¤¹¤ë¤Ê¤é --ifhtml ¤¬Í­¸ú¤Ç¾¤Ï̵¸ú¤Ç¤¹¡£\n"
 "  Info ¤ä¥×¥ì¥¤¥ó¥Æ¥¯¥¹¥È¤òÀ¸À®¤¹¤ë¤Ê¤é --ifinfo ¤¬Í­¸ú¤Ç¾¤Ï̵¸ú¤Ç¤¹¡£\n"
 
-#: makeinfo/makeinfo.c:461
+#: makeinfo/makeinfo.c:452
 #, fuzzy
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                     write Info to foo's @setfilename\n"
 "  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write XML to @setfilename\n"
+"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
 "  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
 "  makeinfo --no-headers foo.texi        write plain text to standard output\n"
 "\n"
@@ -2301,76 +2439,83 @@ msgstr ""
 "  makeinfo --number-sections foo.texi  Àá¤ËÈÖ¹æ¤òÉÕ¤±¤¿ Info ¤ò½ÐÎÏ\n"
 "  makeinfo --no-split foo.texi         Â礭¤µ¤Ë´Ø¤ï¤é¤º°ì¤Ä¤Î Info ¤ò½ÐÎÏ\n"
 
-#: makeinfo/makeinfo.c:570 makeinfo/makeinfo.c:593 makeinfo/makeinfo.c:655
-#: makeinfo/makeinfo.c:676
+#: makeinfo/makeinfo.c:603
+#, c-format
+msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
+#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr "%s: %s °ú¿ô¤Ï `%s' ¤Ç¤Ï¤Ê¤¯¤Æ¡¢¿ôÃͤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n"
 
-#: makeinfo/makeinfo.c:583
-#, c-format
-msgid "Couldn't open macro expansion output `%s'"
+#: makeinfo/makeinfo.c:660
+#, fuzzy, c-format
+msgid "%s: could not open macro expansion output `%s'"
 msgstr "¥Þ¥¯¥í³ÈÄ¥½ÐÎÏ `%s' ¤ò³«¤±¤Þ¤»¤ó"
 
-#: makeinfo/makeinfo.c:586
-msgid "Cannot specify more than one macro expansion output"
-msgstr "Ê£¿ô¤Î¥Þ¥¯¥í³ÈÄ¥½ÐÎϤò»ØÄê¤Ç¤­¤Þ¤»¤ó"
+#: makeinfo/makeinfo.c:665
+#, fuzzy, c-format
+msgid "%s: ignoring second macro expansion output `%s'.\n"
+msgstr "¥Þ¥¯¥í³ÈÄ¥½ÐÎÏ `%s' ¤ò³«¤±¤Þ¤»¤ó"
 
-#: makeinfo/makeinfo.c:624
+#: makeinfo/makeinfo.c:707
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 "%s: --paragraph-indent °ú¿ô¤Ï `%s' ¤Ç¤Ï¤Ê¤¯¡¢¿ôÃÍ/`none'/`asis' ¤Ç¤Ê¤±¤ì¤Ð\n"
 "    ¤Ê¤ê¤Þ¤»¤ó¡£\n"
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 "%s: --footnote-style °ú¿ô¤Ï `%s' ¤Ç¤Ï¤Ê¤¯¡¢`separate' Ëô¤Ï `end' ¤Ç¤Ê¤±¤ì¤Ð\n"
 "    ¤Ê¤ê¤Þ¤»¤ó¡£\n"
 
-#: makeinfo/makeinfo.c:723
+#: makeinfo/makeinfo.c:806
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: ¥Õ¥¡¥¤¥ë°ú¿ô¤ò˺¤ì¤Æ¤¤¤Þ¤¹¤è\n"
 
-#: makeinfo/makeinfo.c:898
+#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#, c-format
+msgid "Multiline command %c%s used improperly"
+msgstr ""
+
+#: makeinfo/makeinfo.c:1000
 #, c-format
 msgid "Expected `%s'"
 msgstr "¤³¤³¤Ç¤Ï `%s' ¤¬Í׵ᤵ¤ì¤Þ¤¹"
 
-#: makeinfo/makeinfo.c:1365
-msgid "File exists, but is not a directory"
-msgstr ""
-
-#: makeinfo/makeinfo.c:1366
+#: makeinfo/makeinfo.c:1479
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê `%s' ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: makeinfo/makeinfo.c:1414
+#: makeinfo/makeinfo.c:1525
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "`%2$s' ¤Ë `%1$s' ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: makeinfo/makeinfo.c:1496
+#: makeinfo/makeinfo.c:1605
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr "%s: Info ¤Î½ÐÎϤò¹Ô¤Ê¤¦¤Î¤Ç¡¢¥Þ¥¯¥í³ÈÄ¥¤òɸ½à½ÐÎϤ˽ÐÎϤ·¤Þ¤»¤ó¡£\n"
 
-#: makeinfo/makeinfo.c:1526
+#: makeinfo/makeinfo.c:1638
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "`%3$s' ¤«¤é %1$s ¥Õ¥¡¥¤¥ë `%2$s' ¤òºîÀ®¤·¤Þ¤¹¡£\n"
 
-#: makeinfo/makeinfo.c:1561
+#: makeinfo/makeinfo.c:1673
 #, c-format
 msgid "This is %s, produced by makeinfo version %s from %s.\n"
 msgstr ""
 "¤³¤ì¤Ï %1$s¡¢%3$s ¤è¤ê makeinfo ¥Ð¡¼¥¸¥ç¥ó %2$s ¤Ë¤è¤Ã¤ÆºîÀ®¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: makeinfo/makeinfo.c:1583
+#: makeinfo/makeinfo.c:1709
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2378,326 +2523,318 @@ msgstr ""
 "%s: ¥¨¥é¡¼¤Ë¤è¤ê¡¢¥Þ¥¯¥í½ÐÎÏ¥Õ¥¡¥¤¥ë `%s' ¤òºï½ü¤·¤Þ¤¹¡£\n"
 "       -- »Ä¤·¤¿¤¤¾ì¹ç¤Ë¤Ï `--force' ¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: makeinfo/makeinfo.c:1627
+#: makeinfo/makeinfo.c:1773
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 "%s: ¥¨¥é¡¼¤Ë¤è¤ê¡¢½ÐÎÏ¥Õ¥¡¥¤¥ë `%s' ¤òºï½ü¤·¤Þ¤¹¡£\n"
 "       -- »Ä¤·¤¿¤¤¾ì¹ç¤Ë¤Ï `--force' ¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: makeinfo/makeinfo.c:1853
+#: makeinfo/makeinfo.c:2034
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "ÃΤé¤Ê¤¤¥³¥Þ¥ó¥É `%s'"
 
-#: makeinfo/makeinfo.c:1875
+#: makeinfo/makeinfo.c:2056
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr "@%s ¤Ø¤Î°ú¿ô¤È¤·¤Æ¥³¥Þ¥ó¥É¤òÍ¿¤¨¤ë¤Ë¤Ï¡¢¥Ö¥ì¡¼¥¹¤ò»È¤¤¤Þ¤·¤ç¤¦"
 
-#: makeinfo/makeinfo.c:2068
-#, c-format
-msgid "%c%s expected `{...}'"
+#: makeinfo/makeinfo.c:2314
+#, fuzzy, c-format
+msgid "%c%s expected braces"
 msgstr "%c%s ¤Ë¤Ï `{...}' ¤¬É¬ÍפǤ¹"
 
-#: makeinfo/makeinfo.c:2098
+#: makeinfo/makeinfo.c:2327
 msgid "Unmatched }"
 msgstr "Âбþ¤Î¤Ê¤¤ }"
 
-#: makeinfo/makeinfo.c:2148
+#: makeinfo/makeinfo.c:2375
 msgid "NO_NAME!"
 msgstr "̾Á°¤¬Ìµ¤¤¡ª"
 
-#: makeinfo/makeinfo.c:2169
+#: makeinfo/makeinfo.c:2396
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "ÊĤ¸¤ë¥Ö¥ì¡¼¥¹¤Î¤Ê¤¤ %c%s"
 
-#: makeinfo/makeinfo.c:2958
-msgid "First argument to cross-reference may not be empty"
-msgstr "Áê¸ß»²¾È¤Ø¤ÎÂè°ì°ú¿ô¤¬¶õ¤Ç¤¢¤Ã¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó"
-
-#: makeinfo/makeinfo.c:3018 makeinfo/makeinfo.c:3236 makeinfo/xml.c:1340
-msgid "see "
-msgstr "see "
-
-#: makeinfo/makeinfo.c:3018
-msgid "See "
-msgstr "See "
-
-#: makeinfo/makeinfo.c:3164
-#, c-format
-msgid "`.' or `,' must follow cross reference, not %c"
-msgstr "`.' ¤ä ',' ¤Ï %c ¤Ç¤Ï¤Ê¤¯¡¢Áê¸ß»²¾È¤Ë³¤±¤é¤ì¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
-
-#: makeinfo/makeinfo.c:3212
-msgid "First argument to @inforef may not be empty"
-msgstr "@inforef ¤Ø¤ÎÂè°ì°ú¿ô¤Ï¶õ¤Ç¤¢¤Ã¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó"
-
-#: makeinfo/makeinfo.c:3427
+#: makeinfo/makeinfo.c:3309
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "@image ¥Õ¥¡¥¤¥ë `%s' (HTML ÍÑ) ¤¬Æɤá¤Þ¤»¤ó: %s"
 
-#: makeinfo/makeinfo.c:3440
-#, c-format
-msgid "No `%s.png' or `.jpg', and no extension supplied"
-msgstr "`%s.png' ¤ä `.jpg' ¤¬¤Ê¤¯¡¢³ÈÄ¥»Ò¤¬¤Ä¤±¤é¤ì¤Æ¤¤¤Þ¤»¤ó"
+#: makeinfo/makeinfo.c:3315
+#, fuzzy, c-format
+msgid "No such file `%s'"
+msgstr "`%2$s' ¤Ë `%1$s' ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: makeinfo/makeinfo.c:3490
+#: makeinfo/makeinfo.c:3447
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "@image ¥Õ¥¡¥¤¥ë `%s' (text ÍÑ) ¤¬Æɤá¤Þ¤»¤ó: %s"
 
-#: makeinfo/makeinfo.c:3497
+#: makeinfo/makeinfo.c:3456
 msgid "@image missing filename argument"
 msgstr "@image ¤Ë¥Õ¥¡¥¤¥ë̾¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: makeinfo/makeinfo.c:3690
+#: makeinfo/makeinfo.c:3675
+#, c-format
+msgid "undefined flag: %s"
+msgstr ""
+
+#: makeinfo/makeinfo.c:3676
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{`%s' ¤ÎÃͤ¬¤Ê¤¤}"
 
-#: makeinfo/makeinfo.c:3744
+#: makeinfo/makeinfo.c:3728
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s ¤Ë¤Ï̾Á°¤¬É¬ÍפǤ¹"
 
-#: makeinfo/makeinfo.c:3850
+#: makeinfo/makeinfo.c:3834
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "@end %s ¤ÎÂбþ¤ÎÁ°¤Ë¥Õ¥¡¥¤¥ë¤Î½ª¤ê¤Ë½Ð¤¯¤ï¤·¤Þ¤·¤¿"
 
-#: makeinfo/makeinfo.c:4081
+#: makeinfo/makeinfo.c:4082
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr ""
 
-#: makeinfo/multi.c:226
+#: makeinfo/multi.c:116
 msgid "Missing } in @multitable template"
 msgstr "@multitable ¥Æ¥ó¥×¥ì¡¼¥È¤Ë } ¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: makeinfo/multi.c:302
+#: makeinfo/multi.c:254
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "@multitable ¤Î¸å¤í¤Î¥Æ¥¯¥¹¥È `%s' ¤ò̵»ë¤·¤Þ¤¹"
 
-#: makeinfo/multi.c:375
+#: makeinfo/multi.c:393
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "¥Þ¥ë¥Á¥Æ¡¼¥Ö¥ë¹àÌÜÆâ¤Î¥«¥é¥à¿ô¤¬Â¿¤¹¤®¤Þ¤¹(ºÇÂç %d)"
 
-#: makeinfo/multi.c:426
-#, c-format
-msgid "Cannot select column #%d in multitable"
+#: makeinfo/multi.c:555
+#, fuzzy, c-format
+msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "¥Þ¥ë¥Á¥Æ¡¼¥Ö¥ëÆâ¤Ç¤Ï¡¢Âè %d ¹Ô¤òÁªÂò¤Ç¤­¤Þ¤»¤ó"
 
-#: makeinfo/multi.c:529
+#: makeinfo/multi.c:584
 msgid "ignoring @tab outside of multitable"
 msgstr "¥Þ¥ë¥Á¥Æ¡¼¥Ö¥ë¤Î³°Â¦¤Î @tab ¤ò̵»ë¤·¤Þ¤¹"
 
-#: makeinfo/multi.c:565
+#: makeinfo/multi.c:632
+#, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** ¥Þ¥ë¥Á¥«¥é¥à¤ÎºÇ¸å¤ÎÎ󤫤é½ÐÎÏ\n"
 
-#: makeinfo/multi.c:568
+#: makeinfo/multi.c:635
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* Âè %d ¥«¥é¥à: ½ÐÎÏ = %s\n"
 
-#: makeinfo/node.c:276
+#: makeinfo/node.c:280
 #, c-format
 msgid "Node `%s' previously defined at line %d"
 msgstr "¥Î¡¼¥É `%s' Á°(%d ¹ÔÌÜ)¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: makeinfo/node.c:594
+#: makeinfo/node.c:648
 #, c-format
 msgid "Formatting node %s...\n"
 msgstr "¥Î¡¼¥É %s ¤òÀ°·ÁÃæ...\n"
 
-#: makeinfo/node.c:655
-#, c-format
-msgid "Node `%s' requires a sectioning command (e.g. %c%s)"
+#: makeinfo/node.c:716
+#, fuzzy, c-format
+msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
 msgstr "¥Î¡¼¥É `%s' ¤Ë¤Ï¥»¥¯¥·¥ç¥óÍÑ¥³¥Þ¥ó¥É¤¬É¬ÍפǤ¹(Îã: %c%s)"
 
-#: makeinfo/node.c:815
+#: makeinfo/node.c:879
 #, c-format
 msgid "No node name specified for `%c%s' command"
 msgstr "`%c%s' ¥³¥Þ¥ó¥É¤Ë»ØÄꤵ¤ì¤¿¥Î¡¼¥É̾¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: makeinfo/node.c:856 makeinfo/node.c:1075
+#: makeinfo/node.c:920 makeinfo/node.c:1151
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr "¥¢¥ó¥«¡¼ `%s' ¤È¥Î¡¼¥É `%s' ¤¬Æ±¤¸¥Õ¥¡¥¤¥ë¤ò¥Þ¥Ã¥×¤·¤Æ¤¤¤Þ¤¹"
 
-#: makeinfo/node.c:859
+#: makeinfo/node.c:923
 msgid "This @anchor command ignored; references to it will not work"
 msgstr "¤³¤Î @anchor ¥³¥Þ¥ó¥É¤Ï̵»ë¤µ¤ì¤Þ¤¹ -- ¤½¤³¤Ø¤Î»²¾È¤ÏÆ°ºî¤·¤Þ¤»¤ó"
 
-#: makeinfo/node.c:861 makeinfo/node.c:1078
+#: makeinfo/node.c:925 makeinfo/node.c:1154
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "¤³¤Î¥¢¥ó¥«¡¼Ì¾¤òÊѹ¹¤¹¤ë¤« `--no-split' ¥ª¥×¥·¥ç¥ó¤ò»È¤¤¤Þ¤·¤ç¤¦"
 
-#: makeinfo/node.c:891
+#: makeinfo/node.c:955
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
 msgstr "split-HTML ¥Õ¥¡¥¤¥ë `%s' ¤Î½ª¤ê¤Ë¡¢¤¢¤ë¤Ï¤º¤Î¤Ê¤¤Ê¸»úÎ󤬤¢¤ê¤Þ¤¹"
 
-#: makeinfo/node.c:920
-msgid "Node:"
-msgstr "¥Î¡¼¥É:"
-
-#: makeinfo/node.c:930
+#: makeinfo/node.c:991
 msgid "Next:"
 msgstr "¼¡:"
 
-#: makeinfo/node.c:940
+#: makeinfo/node.c:1007
 msgid "Previous:"
 msgstr "Á°:"
 
-#: makeinfo/node.c:950
+#: makeinfo/node.c:1021
 msgid "Up:"
 msgstr "¾å:"
 
-#: makeinfo/node.c:1072
+#: makeinfo/node.c:1148
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr "¥¢¥ó¥«¡¼ `%s' ¤È `%s' ¤¬Æ±¤¸¥Õ¥¡¥¤¥ë̾¤Ë¥Þ¥Ã¥×¤·¤Æ¤¤¤Þ¤¹"
 
-#: makeinfo/node.c:1077
+#: makeinfo/node.c:1153
 msgid "@anchor command ignored; references to it will not work"
 msgstr "@anchor ¥³¥Þ¥ó¥É¤Ï̵»ë¤µ¤ì¤Þ¤¹ -- ¤½¤³¤Ø¤Î»²¾È¤ÏÆ°ºî¤·¤Þ¤»¤ó"
 
-#: makeinfo/node.c:1277
-#, c-format
-msgid "%s reference to nonexistent node `%s'"
+#: makeinfo/node.c:1347
+#, fuzzy, c-format
+msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr "%s ¤Ï¸ºß¤·¤Ê¤¤¥Î¡¼¥É `%s' ¤ò»²¾È¤·¤Æ¤¤¤Þ¤¹"
 
-#: makeinfo/node.c:1294
+#: makeinfo/node.c:1363
 msgid "Menu"
 msgstr "¥á¥Ë¥å¡¼"
 
-#: makeinfo/node.c:1296
+#: makeinfo/node.c:1365
 msgid "Cross"
 msgstr "Áê¸ß"
 
-#: makeinfo/node.c:1380
-#, c-format
-msgid "Next field of node `%s' not pointed to"
+#: makeinfo/node.c:1447
+#, fuzzy, c-format
+msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr "¥Î¡¼¥É `%s' ¤Î¼¡¤Î¥Õ¥£¡¼¥ë¥É¤¬¥Î¡¼¥É¤ò»Ø¤·¤Æ¤¤¤Þ¤»¤ó -- "
 
-#: makeinfo/node.c:1383
+#: makeinfo/node.c:1450
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "¤³¤Î¥Î¡¼¥É (%s) ¤Ï¤­¤Á¤ó¤È Á° ¤ò»ý¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: makeinfo/node.c:1395
+#: makeinfo/node.c:1462
 msgid "Prev"
 msgstr "Á°"
 
-#: makeinfo/node.c:1438
+#: makeinfo/node.c:1505
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "¥Î¡¼¥É `%s' ¤ÎÁ°¤Î¥Õ¥£¡¼¥ë¥É¤¬¥Î¡¼¥É¤ò»Ø¤·¤Æ¤¤¤Þ¤»¤ó -- "
 
-#: makeinfo/node.c:1442
+#: makeinfo/node.c:1509
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "¤³¤Î¥Î¡¼¥É (%s) ¤Ï¤­¤Á¤ó¤È ¼¡ ¤ò»ý¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: makeinfo/node.c:1454
+#: makeinfo/node.c:1521
 #, c-format
-msgid "`%s' has no Up field"
-msgstr "`%s' ¤Ë ¾å ¥Õ¥£¡¼¥ë¥É¤¬¤¢¤ê¤Þ¤»¤ó"
+msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
+msgstr ""
 
-#: makeinfo/node.c:1457
+#: makeinfo/node.c:1524
 msgid "Up"
 msgstr "¾å"
 
-#: makeinfo/node.c:1523
+#: makeinfo/node.c:1590
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr ""
 "¥Î¡¼¥É `%s' ¤Ë¤Ï ¾å°Ì¹àÌܤ¬¤¢¤ë¤Î¤Ë¡¢`%s' ¤Ø¤Î¥á¥Ë¥å¡¼¥¢¥¤¥Æ¥à¤ò·ç¤¤¤Æ¤¤¤Þ¤¹"
 
-#: makeinfo/node.c:1552
+#: makeinfo/node.c:1619
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr "¥Î¡¼¥É `%s' ¤Ï´û¤Ë %d ²ó»²¾È¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: makeinfo/node.c:1566
+#: makeinfo/node.c:1633
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "»²¾È¤µ¤ì¤Æ¤¤¤Ê¤¤¥Î¡¼¥É `%s'"
 
-#: makeinfo/sectioning.c:117
+#: makeinfo/node.c:1723
 #, c-format
-msgid "Appendix %c "
+msgid "Removing %s\n"
+msgstr ""
+
+#: makeinfo/node.c:1727
+#, fuzzy, c-format
+msgid "Can't remove file `%s': %s"
+msgstr "¥Ç¥£¥ì¥¯¥È¥ê `%s' ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: %s"
+
+#: makeinfo/sectioning.c:122
+#, fuzzy, c-format
+msgid "Appendix %c"
 msgstr "ÉÕÏ¿ %c "
 
-#: makeinfo/sectioning.c:356 makeinfo/sectioning.c:444
+#: makeinfo/sectioning.c:467
+#, fuzzy, c-format
+msgid "Internal error (search_sectioning) `%s'!"
+msgstr "ÆâÉô¥¨¥é¡¼ (Àáõº÷Ãæ) \"%s\"!"
+
+#: makeinfo/sectioning.c:562
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
 msgstr "ÆâÉô¥¨¥é¡¼ (Àáõº÷Ãæ) \"%s\"!"
 
-#: makeinfo/sectioning.c:502
+#: makeinfo/sectioning.c:623
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr "%c%s ¤ÏÇѻߤ·¤Þ¤·¤¿¡£ -- Âå¤ï¤ê¤Ë %c%s ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤"
 
-#: makeinfo/sectioning.c:518
+#: makeinfo/sectioning.c:639
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr "%ctop ¤Î¥Î¡¼¥É¤Ï¡¢¥»¥¯¥·¥ç¥ó¤È¤·¤Æ´û¤Ë¸ºß¤·¤Þ¤¹"
 
-#: makeinfo/sectioning.c:526
+#: makeinfo/sectioning.c:647
 #, c-format
 msgid "Here is the %ctop node"
 msgstr "¤³¤³¤Ï %ctop ¥Î¡¼¥É¤Ç¤¹"
 
-#: makeinfo/sectioning.c:543
+#: makeinfo/sectioning.c:663
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr "%ctop ¤¬ %cnode ¤ÎÁ°¤Ë»È¤ï¤ì¤Þ¤·¤¿¡¢%s ¤Ë·è¤á¤¦¤Á¤·¤Þ¤¹"
 
-#: makeinfo/toc.c:221 makeinfo/toc.c:298 makeinfo/toc.c:299
+#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
 msgid "Table of Contents"
 msgstr "Ìܼ¡"
 
-#: makeinfo/toc.c:330 makeinfo/toc.c:366 makeinfo/toc.c:367
+#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
 msgid "Short Contents"
 msgstr "´Ê°×Ìܼ¡"
 
-#: makeinfo/toc.c:406
-#, c-format
-msgid "%s: TOC should be here, but it was not found"
-msgstr "%s: TOC ¤¬¤³¤³¤Ë¤¢¤ë¤Ï¤º¤Ê¤Î¤Ë¡¢¸«¤Ä¤«¤ê¤Þ¤»¤ó"
-
-#: makeinfo/xml.c:1108
+#: makeinfo/xml.c:1605
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image ¥Õ¥¡¥¤¥ë `%s' ¤¬Æɤá¤Þ¤»¤ó: %s"
 
-#: util/install-info.c:151
+#: makeinfo/xml.c:2097
+msgid ""
+"@headitem as the last item of @multitable produces invalid Docbook documents"
+msgstr ""
+
+#: util/install-info.c:154
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: ·Ù¹ð: "
 
-#: util/install-info.c:176 util/install-info.c:189
-msgid "virtual memory exhausted"
-msgstr "²¾ÁÛ¥á¥â¥ê¤ò»È¤¤²Ì¤¿¤·¤Þ¤·¤¿"
-
-#: util/install-info.c:232
+#: util/install-info.c:203
 #, c-format
 msgid " for %s"
 msgstr " %s"
 
-#: util/install-info.c:381
+#: util/install-info.c:426
 #, c-format
 msgid "\tTry `%s --help' for a complete list of options.\n"
 msgstr "\t´°Á´¤Ê ¥ª¥×¥·¥ç¥ó¥ê¥¹¥È¤òÆÀ¤ë¤Ë¤Ï `%s --help' ¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: util/install-info.c:389
+#: util/install-info.c:434
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
@@ -2769,8 +2906,8 @@ msgstr ""
 "Email ¤Ë¤è¤ë¥Ð¥°¥ì¥Ý¡¼¥È¤Ï bug-texinfo@gnu.org¡¢\n"
 "°ìÈÌŪ¤Ê¼ÁÌä¤äµÄÏÀ¤Ï help-texinfo@gnu.org ¤Þ¤Ç¡£\n"
 
-#: util/install-info.c:444
-#, c-format
+#: util/install-info.c:488
+#, fuzzy, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
 "topmost node of the Info hierarchy, called (dir)Top.\n"
@@ -2786,7 +2923,7 @@ msgid ""
 "  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
 "  to select it.\n"
 "\n"
-"* Menu:\n"
+"%s\n"
 msgstr ""
 "¤³¤ì¤¬¡¢(dir)Top ¤È¸Æ¤Ð¤ì¤ë Info ³¬ÁؤκǾå°Ì¥Î¡¼¥É¤Î´Þ¤á¤é¤ì¤Æ¤¤¤ë\n"
 ".../info/dir ¥Õ¥¡¥¤¥ë¤Ç¤¹¡£\n"
@@ -2807,100 +2944,102 @@ msgstr ""
 "\n"
 "* ¥á¥Ë¥å¡¼:\n"
 
-#: util/install-info.c:467
+#: util/install-info.c:513
 #, c-format
 msgid "%s: could not read (%s) and could not create (%s)\n"
 msgstr "%s: (%s) ¤òÆɤ᤺¡¢(%s) ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
 
-#: util/install-info.c:551
+#: util/install-info.c:600
 #, c-format
 msgid "%s: empty file"
 msgstr "%s: ¶õ¤Î¥Õ¥¡¥¤¥ë"
 
-#: util/install-info.c:866 util/install-info.c:906
+#: util/install-info.c:913 util/install-info.c:953
 msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
 msgstr "START-INFO-DIR-ENTRY ¤ËÂбþ¤¹¤ë END-INFO-DIR-ENTRY ¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: util/install-info.c:901
+#: util/install-info.c:948
 msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
 msgstr "END-INFO-DIR-ENTRY ¤ËÂбþ¤¹¤ë START-INFO-DIR-ENTRY ¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: util/install-info.c:1150 util/install-info.c:1160
+#: util/install-info.c:1191 util/install-info.c:1201
 #, c-format
-msgid "%s: Specify the Info directory only once.\n"
-msgstr "%s: Info ¥Ç¥£¥ì¥¯¥È¥ê¤Ï°ìÅÙ¤À¤±»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£\n"
+msgid "%s: already have dir file: %s\n"
+msgstr ""
 
-#: util/install-info.c:1195
+#: util/install-info.c:1236
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr "%s: Info ¥Õ¥¡¥¤¥ë¤Ï°ìÅÙ¤À¤±»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: util/install-info.c:1244
+#: util/install-info.c:1284
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr "¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô¤¬Â¿¤¹¤®¤Þ¤¹ `%s'"
 
-#: util/install-info.c:1248
+#: util/install-info.c:1288
 msgid "No input file specified; try --help for more information."
 msgstr ""
 "ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó -- ¾Ü¤·¤¯¤Ï --help ÉդǼ¹Ԥ·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: util/install-info.c:1251
+#: util/install-info.c:1291
 msgid "No dir file specified; try --help for more information."
 msgstr ""
 "dir ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó -- ¾Ü¤·¤¯¤Ï --help ÉդǼ¹Ԥ·¤Æ²¼¤µ¤¤¡£"
 
-#: util/install-info.c:1273
+#: util/install-info.c:1313
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr "`%s' ¤Ë Info dir ÍѤιàÌܤ¬¤¢¤ê¤Þ¤»¤ó"
 
-#: util/install-info.c:1388
+#: util/install-info.c:1426
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr "¥á¥Ë¥å¡¼¹àÌÜ `%s' ¤Ï¡¢`%s' ¤Ë´û¤Ë¸ºß¤·¤Þ¤¹"
 
-#: util/install-info.c:1411
+#: util/install-info.c:1449
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr "`%s' ¹àÌܤ¬¸«¤Ä¤«¤ê¤Þ¤»¤ó -- ²¿¤âºï½ü¤·¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: util/texindex.c:245
+#: util/texindex.c:252
 msgid "display this help and exit"
 msgstr "»È¤¤Êý¤òɽ¼¨¤·¤Æ½ªÎ»¤·¤Þ¤¹"
 
-#: util/texindex.c:247
+#: util/texindex.c:254
 msgid "keep temporary files around after processing"
 msgstr "½èÍý¤Î¸å¤Ë¥Æ¥ó¥Ý¥é¥ê¥Õ¥¡¥¤¥ë¤ò»Ä¤·¤Æ¤ª¤­¤Þ¤¹"
 
-#: util/texindex.c:249
+#: util/texindex.c:256
 msgid "do not keep temporary files around after processing (default)"
 msgstr "½èÍý¤Î¤¢¤È¤Ë¥Æ¥ó¥Ý¥é¥ê¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Þ¤¹ (default)"
 
-#: util/texindex.c:251
+#: util/texindex.c:258
 msgid "send output to FILE"
 msgstr "½ÐÎϤò FILE ¤ËÁ÷¤ê¤Þ¤¹"
 
-#: util/texindex.c:253
+#: util/texindex.c:260
 msgid "display version information and exit"
 msgstr "¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»¤·¤Þ¤¹"
 
-#: util/texindex.c:264
+#: util/texindex.c:270
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... ¥Õ¥¡¥¤¥ë...\n"
 
-#: util/texindex.c:265
+#: util/texindex.c:271
+#, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr "TeX ¤Î°Ù¤Î¥½¡¼¥ÈºÑ¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹\n"
 
-#: util/texindex.c:268
+#: util/texindex.c:274
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr ""
 "`foo.texi' ʸ½ñ¤ËÂФ·¤Æ¤Ï¡¢Ä̾ï¤Ï¥Õ¥¡¥¤¥ë¤È¤·¤Æ `foo.%c%c' ¤ò»ØÄꤷ¤Þ¤¹¡£\n"
 
-#: util/texindex.c:270
+#: util/texindex.c:276
+#, c-format
 msgid ""
 "\n"
 "Options:\n"
@@ -2908,31 +3047,76 @@ msgstr ""
 "\n"
 "¥ª¥×¥·¥ç¥ó:\n"
 
-#: util/texindex.c:887 util/texindex.c:921 util/texindex.c:997
-#: util/texindex.c:1025
+#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
+#: util/texindex.c:1011
 #, c-format
 msgid "%s: not a texinfo index file"
 msgstr "%s: texinfo ¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: util/texindex.c:982
+#: util/texindex.c:968
 #, c-format
 msgid "failure reopening %s"
 msgstr "%s ¤ÎºÆ¥ª¡¼¥×¥ó¤Ë¼ºÇÔ"
 
-#: util/texindex.c:1224
+#: util/texindex.c:1218
 #, c-format
 msgid "No page number in %s"
 msgstr "%s ¤Ë¥Ú¡¼¥¸Èֹ椬¤¢¤ê¤Þ¤»¤ó"
 
-#: util/texindex.c:1295
+#: util/texindex.c:1291
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "%s ¹àÌܤËÆó¤ÄÌܤιàÌÜ̾¤¬Â³¤¤¤Æ¤¤¤Þ¤¹"
 
-#: util/texindex.c:1633
-#, c-format
-msgid "%s; for file `%s'.\n"
-msgstr "%s -- ¥Õ¥¡¥¤¥ë `%s'¡£\n"
+#~ msgid "%s: Specify the Info directory only once.\n"
+#~ msgstr "%s: Info ¥Ç¥£¥ì¥¯¥È¥ê¤Ï°ìÅÙ¤À¤±»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£\n"
+
+#~ msgid "\"\" is invalid"
+#~ msgstr "\"\" ¤Ï̵¸ú¤Ç¤¹"
+
+#~ msgid "%s is an invalid ISO code, using %c"
+#~ msgstr "%s ¤ÏÉÔŬÀÚ¤Ê ISO ¥³¡¼¥É¤Ç¤¹¡£%c ¤ò»È¤¤¤Þ¤¹"
+
+#~ msgid "Cannot specify more than one macro expansion output"
+#~ msgstr "Ê£¿ô¤Î¥Þ¥¯¥í³ÈÄ¥½ÐÎϤò»ØÄê¤Ç¤­¤Þ¤»¤ó"
+
+#~ msgid "First argument to cross-reference may not be empty"
+#~ msgstr "Áê¸ß»²¾È¤Ø¤ÎÂè°ì°ú¿ô¤¬¶õ¤Ç¤¢¤Ã¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó"
+
+#~ msgid "see "
+#~ msgstr "see "
+
+#~ msgid "`.' or `,' must follow cross reference, not %c"
+#~ msgstr "`.' ¤ä ',' ¤Ï %c ¤Ç¤Ï¤Ê¤¯¡¢Áê¸ß»²¾È¤Ë³¤±¤é¤ì¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
+
+#~ msgid "First argument to @inforef may not be empty"
+#~ msgstr "@inforef ¤Ø¤ÎÂè°ì°ú¿ô¤Ï¶õ¤Ç¤¢¤Ã¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó"
+
+#~ msgid "Node:"
+#~ msgstr "¥Î¡¼¥É:"
+
+#~ msgid "%s: TOC should be here, but it was not found"
+#~ msgstr "%s: TOC ¤¬¤³¤³¤Ë¤¢¤ë¤Ï¤º¤Ê¤Î¤Ë¡¢¸«¤Ä¤«¤ê¤Þ¤»¤ó"
+
+#~ msgid "virtual memory exhausted"
+#~ msgstr "²¾ÁÛ¥á¥â¥ê¤ò»È¤¤²Ì¤¿¤·¤Þ¤·¤¿"
+
+#~ msgid "No `%s.png' or `.jpg', and no extension supplied"
+#~ msgstr "`%s.png' ¤ä `.jpg' ¤¬¤Ê¤¯¡¢³ÈÄ¥»Ò¤¬¤Ä¤±¤é¤ì¤Æ¤¤¤Þ¤»¤ó"
+
+#~ msgid "%s; for file `%s'.\n"
+#~ msgstr "%s -- ¥Õ¥¡¥¤¥ë `%s'¡£\n"
+
+#~ msgid "`%s' has no Up field"
+#~ msgstr "`%s' ¤Ë ¾å ¥Õ¥£¡¼¥ë¥É¤¬¤¢¤ê¤Þ¤»¤ó"
+
+#, fuzzy
+#~ msgid "\\%-10[scroll-forward]  Scroll forward 1 line.\n"
+#~ msgstr "  %-10s  1 ¹ÔʬÁ°Êý¤Ø¤¹¤¹¤á¤ë¡£\n"
+
+#, fuzzy
+#~ msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
+#~ msgstr "  %-10s  1 ¹Ôʬ¸åÊý¤ØÌ᤹¡£\n"
 
 #~ msgid ""
 #~ "Email bug reports to bug-texinfo@gnu.org,\n"
diff --git a/gnu/usr.bin/texinfo/po/nb.gmo b/gnu/usr.bin/texinfo/po/nb.gmo
new file mode 100644
index 00000000000..d29bd4223a4
--- /dev/null
+++ b/gnu/usr.bin/texinfo/po/nb.gmo
diff --git a/gnu/usr.bin/texinfo/po/nb.po b/gnu/usr.bin/texinfo/po/nb.po
new file mode 100644
index 00000000000..316de2e825d
--- /dev/null
+++ b/gnu/usr.bin/texinfo/po/nb.po
@@ -0,0 +1,3108 @@
+# Norwegian translation of messages for GNU Texinfo 4.6 (bokmål dialect).
+# Copyright (C) 1999 Free Software Foundation, Inc.
+# Trond Endrestøl <Trond.Endrestol@gtf.ol.no>, 1998.
+#
+# Send this file as an gzipped attachment to:
+# translation@iro.umontreal.ca
+# with the subject:
+# TP-Robot PACKAGE-VERSION.TEAM.po
+#
+# The subject for the Norwegian bokmål translation of GNU Texinfo 4.7.90
+# would then be:
+# TP-Robot texinfo-4.7.90.nb.po
+#
+# Here's the URL for the Norwegian translation team:
+# http://www2.iro.umontreal.ca/~pinard/po/registry.cgi?team=no
+#
+# Here's the URL for the current translations of GNU Texinfo:
+# http://www2.iro.umontreal.ca/~pinard/po/registry.cgi?domain=texinfo
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: texinfo 4.7.90\n"
+"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
+"POT-Creation-Date: 2004-12-21 16:20-0800\n"
+"PO-Revision-Date: 2004-12-05 15:37+0100\n"
+"Last-Translator: Trond Endrestøl <Trond.Endrestol@gtf.ol.no>\n"
+"Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: info/echo-area.c:284 info/session.c:689
+msgid "Move forward a character"
+msgstr "Flytte forover et tegn"
+
+#: info/echo-area.c:296 info/session.c:705
+msgid "Move backward a character"
+msgstr "Flytte bakover et tegn"
+
+#: info/echo-area.c:308
+msgid "Move to the start of this line"
+msgstr "Flytte til starten av denne linjen"
+
+#: info/echo-area.c:313
+msgid "Move to the end of this line"
+msgstr "Flytte til slutten av denne linjen"
+
+#: info/echo-area.c:321 info/session.c:723
+msgid "Move forward a word"
+msgstr "Flytte forover et ord"
+
+#: info/echo-area.c:361 info/session.c:772
+msgid "Move backward a word"
+msgstr "Flytte tilbake et ord"
+
+#: info/echo-area.c:401
+msgid "Delete the character under the cursor"
+msgstr "Slette tegnet under markøren"
+
+#: info/echo-area.c:431
+msgid "Delete the character behind the cursor"
+msgstr "Slette tegnet bak markøren"
+
+#: info/echo-area.c:452
+msgid "Cancel or quit operation"
+msgstr "Avbryte eller avslutte operasjon"
+
+#: info/echo-area.c:467
+msgid "Accept (or force completion of) this line"
+msgstr "Godta (eller tvinge fullføring av) denne linjen"
+
+#: info/echo-area.c:472
+msgid "Insert next character verbatim"
+msgstr "Sette inn neste tegn ordrett"
+
+#: info/echo-area.c:480
+msgid "Insert this character"
+msgstr "Sette inn dette tegnet"
+
+#: info/echo-area.c:498
+msgid "Insert a TAB character"
+msgstr "Sette inn en tabulator"
+
+#: info/echo-area.c:505
+msgid "Transpose characters at point"
+msgstr "Transponere tegnet ved punktet"
+
+#: info/echo-area.c:556
+msgid "Yank back the contents of the last kill"
+msgstr "Rykke tilbake innholdet fra forrige felling"
+
+#: info/echo-area.c:563
+msgid "Kill ring is empty"
+msgstr "Fellingsringen er tom"
+
+#: info/echo-area.c:576
+msgid "Yank back a previous kill"
+msgstr "Rykke tilbake en tidligere felling"
+
+#: info/echo-area.c:609
+msgid "Kill to the end of the line"
+msgstr "Slette til slutten av linjen"
+
+#: info/echo-area.c:622
+msgid "Kill to the beginning of the line"
+msgstr "Slette til begynnelsen av linjen"
+
+#: info/echo-area.c:634
+msgid "Kill the word following the cursor"
+msgstr "Slette ordet etter markøren"
+
+#: info/echo-area.c:653
+msgid "Kill the word preceding the cursor"
+msgstr "Slette ordet før markøren"
+
+#: info/echo-area.c:868 info/echo-area.c:924
+msgid "No completions"
+msgstr "Ingen fullføringer"
+
+#: info/echo-area.c:870
+msgid "Not complete"
+msgstr "Ikke fullstendig"
+
+#: info/echo-area.c:911
+msgid "List possible completions"
+msgstr "Liste mulige fullføringer"
+
+#: info/echo-area.c:928
+msgid "Sole completion"
+msgstr "Eneste fullføring"
+
+#: info/echo-area.c:937
+msgid "One completion:\n"
+msgstr "En fullføring:\n"
+
+#: info/echo-area.c:938
+#, c-format
+msgid "%d completions:\n"
+msgstr "%d fullføringer:\n"
+
+#: info/echo-area.c:1085
+msgid "Insert completion"
+msgstr "Sett inn fullføring"
+
+#: info/echo-area.c:1220
+msgid "Building completions..."
+msgstr "Bygger fullføringer..."
+
+#: info/echo-area.c:1340
+msgid "Scroll the completions window"
+msgstr "Rulle fullføringsvinduet"
+
+#: info/footnotes.c:213
+msgid "Footnotes could not be displayed"
+msgstr "Fotnoter kunne ikke vises"
+
+#: info/footnotes.c:239
+msgid "Show the footnotes associated with this node in another window"
+msgstr "Vise fotnotene assosiert med denne noden i et annet vindu"
+
+#: info/footnotes.h:26
+msgid "---------- Footnotes ----------"
+msgstr "---------- Fotnoter -----------"
+
+#: info/indices.c:172
+msgid "Look up a string in the index for this file"
+msgstr "Lete opp en streng i indeksen til denne filen"
+
+#: info/indices.c:199
+msgid "Finding index entries..."
+msgstr "Finner indeksinnslag..."
+
+#: info/indices.c:207
+msgid "No indices found."
+msgstr "Ingen indekser funnet."
+
+#: info/indices.c:217
+msgid "Index entry: "
+msgstr "Indeksinnslag: "
+
+#: info/indices.c:325
+msgid ""
+"Go to the next matching index item from the last `\\[index-search]' command"
+msgstr ""
+"Gå til det neste passende indeksinnslaget fra forrige '\\[index-search]'-"
+"kommando"
+
+#: info/indices.c:335
+msgid "No previous index search string."
+msgstr "Ingen tidligere indekssøkestrenger."
+
+#: info/indices.c:342
+msgid "No index entries."
+msgstr "Ingen indeksinnslag."
+
+#: info/indices.c:375
+#, c-format
+msgid "No %sindex entries containing `%s'."
+msgstr "Ingen %sindeksinnslag inneholdende «%s»."
+
+#: info/indices.c:376
+msgid "more "
+msgstr "mer "
+
+#: info/indices.c:386
+msgid "CAN'T SEE THIS"
+msgstr "KAN IKKE SE DETTE"
+
+#: info/indices.c:422
+#, c-format
+msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
+msgstr "Fant «%s» i %s. («\\[next-index-match]» prøver å finne den neste.)"
+
+#: info/indices.c:541
+#, c-format
+msgid "Scanning indices of `%s'..."
+msgstr "Sjekker indekser i «%s»..."
+
+#: info/indices.c:596
+#, c-format
+msgid "No available info files have `%s' in their indices."
+msgstr "Ingen av de tilgjengelig infofilene har «%s» i deres indekser."
+
+#: info/indices.c:622
+msgid "Grovel all known info file's indices for a string and build a menu"
+msgstr ""
+"Kravle gjennom alle kjente infofilers indekser etter en streng\n"
+"       og bygge opp en meny"
+
+#: info/indices.c:626
+msgid "Index apropos: "
+msgstr "Indeksapropos: "
+
+#: info/indices.c:654
+#, c-format
+msgid ""
+"\n"
+"* Menu: Nodes whose indices contain `%s':\n"
+msgstr ""
+"\n"
+"* Menu: Noder med indekser som inneholder «%s»:\n"
+
+#: info/info.c:275 info/infokey.c:899
+#, c-format
+msgid "Try --help for more information.\n"
+msgstr "Prøv --help for mer informasjon.\n"
+
+#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
+#: util/texindex.c:343
+#, c-format
+msgid ""
+"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 ""
+"Det finnes INGEN garanti.  Du kan redistribuere denne programvaren\n"
+"etter betingelsene i GNU General Public License.  For mer informasjon\n"
+"om dette, se filen COPYING.\n"
+
+#: info/info.c:498
+#, c-format
+msgid "no index entries found for `%s'\n"
+msgstr "ingen innslag funnet for «%s»\n"
+
+#: info/info.c:590
+msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
+msgstr ""
+"  -b, --speech-friendly        vær vennlig ovenfor talesyntetisatorer.\n"
+
+#: info/info.c:597
+#, c-format
+msgid ""
+"Usage: %s [OPTION]... [MENU-ITEM...]\n"
+"\n"
+"Read documentation in Info format.\n"
+"\n"
+"Options:\n"
+"      --apropos=STRING         look up STRING in all indices of all "
+"manuals.\n"
+"  -d, --directory=DIR          add DIR to INFOPATH.\n"
+"      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
+"  -f, --file=FILENAME          specify Info file to visit.\n"
+"  -h, --help                   display this help and exit.\n"
+"      --index-search=STRING    go to node pointed by index entry STRING.\n"
+"  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
+"  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+"  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+"      --no-raw-escapes         output escapes as literal text.\n"
+"      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
+"  -O, --show-options, --usage  go to command-line options node.\n"
+"%s      --subnodes               recursively output menu items.\n"
+"  -w, --where, --location      print physical location of Info file.\n"
+"      --vi-keys                use vi-like and less-like key bindings.\n"
+"      --version                display version information and exit.\n"
+"\n"
+"The first non-option argument, if present, is the menu entry to start from;\n"
+"it is searched for in all `dir' files along INFOPATH.\n"
+"If it is not present, info merges all `dir' files and shows the result.\n"
+"Any remaining arguments are treated as the names of menu\n"
+"items relative to the initial node visited.\n"
+"\n"
+"Examples:\n"
+"  info                       show top-level dir menu\n"
+"  info emacs                 start at emacs node from top-level dir\n"
+"  info emacs buffers         start at buffers node within emacs manual\n"
+"  info --show-options emacs  start at node with emacs' command line options\n"
+"  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+msgstr ""
+"Bruksmåte: %s [VALG]... [MENYPUNKT...]\n"
+"\n"
+"Lese dokumentasjon i Infoformat.\n"
+"\n"
+"Valg:\n"
+"     --apropos=EMNE           søke etter EMNE i alle indeksene til alle "
+"Infofilene.\n"
+" -d, --directory=KAT          legge til KAT til INFOPATH.\n"
+"     --dribble=FILNAVN        huske brukerens tastetrykk i FILNAVN.\n"
+" -f, --file=FILNAVN           angi Infofilen som skal besøkes.\n"
+" -h, --help                   vise denne hjelpen og avslutte.\n"
+"     --index-search=STRENG    gå til noden pekt på av indeksoppslaget "
+"STRENG.\n"
+" -n, --node=NODENAVN          angi noder i første besøkte Infofil.\n"
+" -o, --output=FILNAVN         skrive ut utvalgte noder til FILNAVN.\n"
+" -R, --raw-escapes            ikke fjern ANSI-escapes fra mansider.\n"
+"     --restore=FILNAVN        lese innledende tastetrykk fra FILNAVN.\n"
+" -O, --show-options, --usage  gå til kommandolinje-valg-noden.\n"
+"%s     --subnodes               rekursivt skrive ut menypunkter.\n"
+"     --vi-keys                bruke vi-aktige og less-aktige "
+"tastebindinger.\n"
+"     --version                vise programversjon og avslutte.\n"
+"\n"
+"Det første ikke-valg-argumentet, dersom tilstede, er menypunktet som du\n"
+"starter fra; det blir søkt etter i alle «dir»-filer langs med INFOPATH.\n"
+"Dersom menypunktet ikke er tilstede, vil info flette sammen alle\n"
+"«dir»-filene og vise resultatet.  Øvrige gjenværende argumenter blir\n"
+"behandlet som navnene til menypunktene relativ til den første besøkte\n"
+"noden.\n"
+"\n"
+"Eksempler:\n"
+"  info                       vise toppnivå dirmeny\n"
+"  info emacs                 starte ved emacs-noden fra toppnivå dir\n"
+"  info emacs buffers         starte ved buffers-noden i emacs-manualen\n"
+"  info --show-options emacs  starte ved emacs kommandolinjevalg\n"
+"  info -f ./foo.info         vise filen ./foo.info, ikke søke gjennom dir\n"
+
+#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
+#: util/install-info.c:466 util/texindex.c:292
+msgid ""
+"\n"
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr ""
+"\n"
+"Send bugrapporter til bug-texinfo@gnu.org,\n"
+"generelle spørsmål og diskusjoner til help-texinfo@gnu.org.\n"
+"Websida for Texinfo: http://www.gnu.org/software/texinfo/"
+
+#: info/info.c:669
+#, c-format
+msgid "Cannot find node `%s'."
+msgstr "Kan ikke finne noden «%s»."
+
+#: info/info.c:670
+#, c-format
+msgid "Cannot find node `(%s)%s'."
+msgstr "Kan ikke finne noden «(%s)%s»."
+
+#: info/info.c:671
+msgid "Cannot find a window!"
+msgstr "Kan ikke finne et vindu!"
+
+#: info/info.c:672
+msgid "Point doesn't appear within this window's node!"
+msgstr "Markøren vises ikke innen dette vinduets node!"
+
+#: info/info.c:673
+msgid "Cannot delete the last window."
+msgstr "Kan ikke slette det siste vinduet."
+
+#: info/info.c:674
+msgid "No menu in this node."
+msgstr "Ingen meny i denne noden."
+
+#: info/info.c:675
+msgid "No footnotes in this node."
+msgstr "Ingen fotnoter i denne noden."
+
+#: info/info.c:676
+msgid "No cross references in this node."
+msgstr "Ingen kryssreferanser i denne noden."
+
+#: info/info.c:677
+#, c-format
+msgid "No `%s' pointer for this node."
+msgstr "Ingen «%s»-peker for denne noden."
+
+#: info/info.c:678
+#, c-format
+msgid "Unknown Info command `%c'; try `?' for help."
+msgstr "Ukjent Info-kommando «%c»; prøv «?» for hjelp."
+
+#: info/info.c:679
+#, c-format
+msgid "Terminal type `%s' is not smart enough to run Info."
+msgstr "Terminaltypen «%s» er ikke smart nok for å kjøre Info."
+
+#: info/info.c:680
+msgid "You are already at the last page of this node."
+msgstr "Du er allerede på den siste siden av denne noden."
+
+#: info/info.c:681
+msgid "You are already at the first page of this node."
+msgstr "Du er allerede på den første siden til denne noden."
+
+#: info/info.c:682
+msgid "Only one window."
+msgstr "Bare et vindu."
+
+#: info/info.c:683
+msgid "Resulting window would be too small."
+msgstr "Resulterende vindu ville blitt for lite."
+
+#: info/info.c:684
+msgid "Not enough room for a help window, please delete a window."
+msgstr "Ikke nok plass for et hjelpevindu, vennligst slett et vindu."
+
+# The next translation should match the length of this one
+#: info/infodoc.c:46 info/infodoc.c:95
+msgid ""
+"Basic Commands in Info Windows\n"
+"******************************\n"
+msgstr ""
+"Grunnleggende kommandoer i infovinduer\n"
+"**************************************\n"
+
+#: info/infodoc.c:49
+msgid "\\%-10[quit-help]  Quit this help.\n"
+msgstr "\\%-10[quit-help]  Avslutte denne hjelpen.\n"
+
+#: info/infodoc.c:50
+msgid "\\%-10[quit]  Quit Info altogether.\n"
+msgstr "\\%-10[quit]  Avslutte Info fullstendig.\n"
+
+#: info/infodoc.c:51
+msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
+msgstr "\\%-10[get-info-help-node]  Starte Infoopplæring.\n"
+
+# The next translation should match the length of this one
+#: info/infodoc.c:53 info/infodoc.c:102
+msgid ""
+"Selecting other nodes:\n"
+"----------------------\n"
+msgstr ""
+"Velger andre noder:\n"
+"-------------------\n"
+
+#: info/infodoc.c:55
+msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
+msgstr "\\%-10[next-node]  Flytte til neste node etter denne noden.\n"
+
+#: info/infodoc.c:56
+msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
+msgstr "\\%-10[prev-node]  Flytte til forrige node før denne noden.\n"
+
+#: info/infodoc.c:57
+msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
+msgstr "\\%-10[up-node]  Flytte «opp» fra denne noden.\n"
+
+#: info/infodoc.c:58
+msgid ""
+"\\%-10[menu-item]  Pick menu item specified by name.\n"
+"              Picking a menu item causes another node to be selected.\n"
+msgstr ""
+"\\%-10[menu-item]  Velge et menypunkt angitt ved navn.\n"
+"              Valg av et menypunkt fører til at en annen node blir valgt.\n"
+
+#: info/infodoc.c:60
+msgid ""
+"\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
+msgstr ""
+"\\%-10[history-node]  Følge en kryssreferanse.  Leser navnet til "
+"referansen.\n"
+
+#: info/infodoc.c:61
+msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
+msgstr ""
+"\\%-10[history-node]  Flytte til den siste noden sett i dette vinduet.\n"
+
+#: info/infodoc.c:62
+msgid ""
+"\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
+msgstr ""
+"\\%-10[move-to-prev-xref]  Flytte til neste hypertekstlenke innen denne "
+"noden.\n"
+
+#: info/infodoc.c:63
+msgid ""
+"\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
+"node.\n"
+msgstr ""
+"\\%-10[move-to-prev-xref]  Flytte til neste hypertekstlenke innen denne "
+"noden.\n"
+
+#: info/infodoc.c:64
+msgid ""
+"\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
+msgstr "\\%-10[dir-node]  Følge hypertekstlenken under markøren.\n"
+
+#: info/infodoc.c:65
+msgid ""
+"\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
+"node] (DIR)'.\n"
+msgstr ""
+"\\%-10[dir-node]  Flytte til «katalog»-noden.  Det samme som «\\[goto-node] "
+"(DIR)».\n"
+
+#: info/infodoc.c:66
+msgid ""
+"\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
+msgstr ""
+"\\%-10[top-node]  Flytte til «Top»-noden.  Det samme som «\\[goto-node] "
+"Top».\n"
+
+# The next translation should match the length of this one
+#: info/infodoc.c:68 info/infodoc.c:116
+msgid ""
+"Moving within a node:\n"
+"---------------------\n"
+msgstr ""
+"Flytte innen en node:\n"
+"---------------------\n"
+
+#: info/infodoc.c:70
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "\\%-10[beginning-of-node]  Gå til begynnelsen av denne noden.\n"
+
+#: info/infodoc.c:71
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgstr "\\%-10[end-of-node]  Gå til slutten av denne noden.\n"
+
+#: info/infodoc.c:72
+msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
+msgstr "\\%-10[next-line]  Rulle forover 1 linje.\n"
+
+#: info/infodoc.c:73
+msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
+msgstr "\\%-10[prev-line]  Rulle bakover 1 linje.\n"
+
+#: info/infodoc.c:74
+msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
+msgstr "\\%-10[scroll-forward]  Rulle forover en side.\n"
+
+#: info/infodoc.c:75
+msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
+msgstr "\\%-10[scroll-backward]  Rulle bakover en side.\n"
+
+# The next translation should match the length of this one
+#: info/infodoc.c:77 info/infodoc.c:125
+msgid ""
+"Other commands:\n"
+"---------------\n"
+msgstr ""
+"Andre kommandoer:\n"
+"-----------------\n"
+
+#: info/infodoc.c:79
+msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
+msgstr "\\%-10[menu-digit]  Velge første ... niende punkt i nodens meny.\n"
+
+#: info/infodoc.c:80
+msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
+msgstr "\\%-10[last-menu-item]  Velge det siste punktet i nodens meny.\n"
+
+#: info/infodoc.c:81
+msgid ""
+"\\%-10[index-search]  Search for a specified string in the index entries of "
+"this Info\n"
+"              file, and select the node referenced by the first entry "
+"found.\n"
+msgstr ""
+"\\%-10[index-search]  Søke etter en angitt streng blant indeksinnslagene i "
+"denne\n"
+"              infofilen og velge noden til det første innslaget som blir "
+"funnet.\n"
+
+#: info/infodoc.c:83
+msgid ""
+"\\%-10[goto-node]  Move to node specified by name.\n"
+"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
+msgstr ""
+"\\%-10[goto-node]  Flytte til en node angitt ved navn.\n"
+"              Du kan like godt inkludere et filnavn, som i (FILNAVN)"
+"NODENAVN.\n"
+
+#: info/infodoc.c:85
+msgid ""
+"\\%-10[search]  Search forward for a specified string\n"
+"              and select the node in which the next occurrence is found.\n"
+msgstr ""
+"\\%-10[search]  Søke forover etter en angitt streng\n"
+"              og velge den noden som den neste forekomsten blir funnet i.\n"
+
+#: info/infodoc.c:87
+msgid ""
+"\\%-10[search-backward]  Search backward for a specified string\n"
+"              and select the node in which the previous occurrence is "
+"found.\n"
+msgstr ""
+"\\%-10[search-backward]  Søke baklengs etter en angitt streng\n"
+"              og velge den noden som den neste forekomsten blir funnet i.\n"
+
+#: info/infodoc.c:98
+#, c-format
+msgid "  %-10s  Quit this help.\n"
+msgstr "  %-10s  Avslutte denne hjelpen.\n"
+
+#: info/infodoc.c:99
+#, c-format
+msgid "  %-10s  Quit Info altogether.\n"
+msgstr "  %-10s  Avslutte Info fullstendig.\n"
+
+#: info/infodoc.c:100
+#, c-format
+msgid "  %-10s  Invoke the Info tutorial.\n"
+msgstr "  %-10s  Starte Infoopplæring.\n"
+
+#: info/infodoc.c:104
+#, c-format
+msgid "  %-10s  Move to the `next' node of this node.\n"
+msgstr "  %-10s  Flytte til «neste»-noden etter denne noden.\n"
+
+#: info/infodoc.c:105
+#, c-format
+msgid "  %-10s  Move to the `previous' node of this node.\n"
+msgstr "  %-10s  Flytte til «forrige»-noden før denne noden.\n"
+
+#: info/infodoc.c:106
+#, c-format
+msgid "  %-10s  Move `up' from this node.\n"
+msgstr "  %-10s  Flytte «opp» fra denne noden.\n"
+
+#: info/infodoc.c:107
+#, c-format
+msgid "  %-10s  Pick menu item specified by name.\n"
+msgstr "  %-10s  Velge menypunkt spesifisert ved navn.\n"
+
+#: info/infodoc.c:108
+msgid "              Picking a menu item causes another node to be selected.\n"
+msgstr ""
+"              Valg av menypunkt fører til at en annen node blir valgt.\n"
+
+#: info/infodoc.c:109
+#, c-format
+msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
+msgstr "  %-10s  Følge en kryssreferanse.  Leser navnet til referansen.\n"
+
+#: info/infodoc.c:110
+#, c-format
+msgid "  %-10s  Move to the last node seen in this window.\n"
+msgstr "  %-10s  Flytte til den siste noden sett i dette vinduet.\n"
+
+#: info/infodoc.c:111
+#, c-format
+msgid "  %-10s  Skip to next hypertext link within this node.\n"
+msgstr "  %-10s  Flytte til neste hypertekstlenke innen denne noden.\n"
+
+#: info/infodoc.c:112
+#, c-format
+msgid "  %-10s  Follow the hypertext link under cursor.\n"
+msgstr "  %-10s  Følge hypertekstlenken under markøren.\n"
+
+#: info/infodoc.c:113
+#, c-format
+msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
+msgstr "  %-10s  Flytte til «katalog»-noden.  Det samme som «g (DIR)».\n"
+
+#: info/infodoc.c:114
+#, c-format
+msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
+msgstr "  %-10s  Flytte til «Top»-noden.  Det samme som «g Top».\n"
+
+#: info/infodoc.c:118
+#, c-format
+msgid "  %-10s  Scroll forward a page.\n"
+msgstr "  %-10s  Rulle forover en side.\n"
+
+#: info/infodoc.c:119
+#, c-format
+msgid "  %-10s  Scroll backward a page.\n"
+msgstr "  %-10s  Rulle bakover en side.\n"
+
+#: info/infodoc.c:120
+#, c-format
+msgid "  %-10s  Go to the beginning of this node.\n"
+msgstr "  %-10s  Gå til begynnelsen av denne noden.\n"
+
+#: info/infodoc.c:121
+#, c-format
+msgid "  %-10s  Go to the end of this node.\n"
+msgstr "  %-10s  Gå til slutten av denne noden.\n"
+
+#: info/infodoc.c:122
+#, c-format
+msgid "  %-10s  Scroll forward 1 line.\n"
+msgstr "  %-10s  Rulle forover 1 linje.\n"
+
+#: info/infodoc.c:123
+#, c-format
+msgid "  %-10s  Scroll backward 1 line.\n"
+msgstr "  %-10s  Rulle bakover 1 linje.\n"
+
+#: info/infodoc.c:127
+#, c-format
+msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
+msgstr "  %-10s  Velge første ... niende punkt i nodens meny.\n"
+
+#: info/infodoc.c:128
+#, c-format
+msgid "  %-10s  Pick last item in node's menu.\n"
+msgstr "  %-10s  Velge det siste punktet i nodens meny.\n"
+
+# This translation is connected to the next one
+#: info/infodoc.c:129
+#, c-format
+msgid ""
+"  %-10s  Search for a specified string in the index entries of this Info\n"
+msgstr "  %-10s  Søke etter en spesifikk streng i indeksinnslagene i denne\n"
+
+#: info/infodoc.c:130
+msgid ""
+"              file, and select the node referenced by the first entry "
+"found.\n"
+msgstr ""
+"              infofil, og velge noden referert av det første oppslaget "
+"funnet.\n"
+
+#: info/infodoc.c:131
+#, c-format
+msgid "  %-10s  Move to node specified by name.\n"
+msgstr "  %-10s  Flytte til noden spesifisert av navn.\n"
+
+#: info/infodoc.c:132
+msgid ""
+"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
+msgstr ""
+"              Du kan like godt inkludere et filnavn, som i (FILNAVN)"
+"NODENAVN.\n"
+
+#: info/infodoc.c:133
+#, c-format
+msgid "  %-10s  Search forward for a specified string,\n"
+msgstr ""
+"  %-10s  Søke forlengs gjennom denne Infofilen for en spesifikk streng,\n"
+
+#: info/infodoc.c:134 info/infodoc.c:136
+msgid ""
+"              and select the node in which the next occurrence is found.\n"
+msgstr ""
+"              og velge den noden som i det neste tilfellet blir funnet.\n"
+
+#: info/infodoc.c:135
+#, c-format
+msgid "  %-10s  Search backward for a specified string\n"
+msgstr ""
+"  %-10s  Søke baklengs gjennom denne Infofilen for en spesifikk streng,\n"
+
+#: info/infodoc.c:316
+msgid "The current search path is:\n"
+msgstr "Gjeldende søkesti er:\n"
+
+#: info/infodoc.c:320
+msgid ""
+"Commands available in Info windows:\n"
+"\n"
+msgstr ""
+"Kommandoer tilgjengelig i Infovinduer:\n"
+"\n"
+
+#: info/infodoc.c:324
+msgid ""
+"Commands available in the echo area:\n"
+"\n"
+msgstr ""
+"Kommandoer tilgjengelig i ekkoområdet:\n"
+"\n"
+
+#: info/infodoc.c:347
+#, c-format
+msgid ""
+"The following commands can only be invoked via %s:\n"
+"\n"
+msgstr ""
+"Følgende kommandoer kan bare bli påkallet via %s:\n"
+"\n"
+
+#: info/infodoc.c:351
+msgid ""
+"The following commands cannot be invoked at all:\n"
+"\n"
+msgstr ""
+"Følgende kommandoer kan ikke bli påkallet i det hele tatt:\n"
+"\n"
+
+#: info/infodoc.c:375
+msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
+msgstr "--- Bruk «\\[history-node]» eller «\\[kill-node]» for å avslutte ---\n"
+
+#: info/infodoc.c:485
+msgid "Display help message"
+msgstr "Vise hjelpemelding"
+
+#: info/infodoc.c:503
+msgid "Visit Info node `(info)Help'"
+msgstr "Vise infonoden «(info)Help»"
+
+#: info/infodoc.c:641
+msgid "Print documentation for KEY"
+msgstr "Skrive ut dokumentasjonen for KEY"
+
+#: info/infodoc.c:653
+#, c-format
+msgid "Describe key: %s"
+msgstr "Beskriv tast: %s"
+
+#: info/infodoc.c:664
+#, c-format
+msgid "ESC %s is undefined."
+msgstr "ESC %s er udefinert."
+
+#: info/infodoc.c:680 info/infodoc.c:709
+#, c-format
+msgid "%s is undefined."
+msgstr "%s er udefinert."
+
+#: info/infodoc.c:730
+#, c-format
+msgid "%s is defined to %s."
+msgstr "%s er definert som %s."
+
+#: info/infodoc.c:1153
+msgid "Show what to type to execute a given command"
+msgstr "Vise hva som må tastes for å utføre en gitt kommando"
+
+#: info/infodoc.c:1157
+msgid "Where is command: "
+msgstr "Hvor er kommandoen: "
+
+#: info/infodoc.c:1179
+#, c-format
+msgid "`%s' is not on any keys"
+msgstr "«%s» er ikke på noen taster"
+
+#: info/infodoc.c:1186
+#, c-format
+msgid "%s can only be invoked via %s."
+msgstr "%s kan bare bli påkallet via %s."
+
+#: info/infodoc.c:1190
+#, c-format
+msgid "%s can be invoked via %s."
+msgstr "%s kan bli påkallet via %s."
+
+#: info/infodoc.c:1195
+#, c-format
+msgid "There is no function named `%s'"
+msgstr "Det finnes ingen funksjon ved navn «%s»"
+
+#: info/infokey.c:145
+#, 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 (C) %s Free Software Foundation, Inc.\n"
+"Det finnes INGEN garanti.  Du kan redistribuere denne programvaren\n"
+"etter betingelsene i GNU General Public License.  For mer informasjon\n"
+"om dette, se filen COPYING.\n"
+
+#: info/infokey.c:170
+msgid "incorrect number of arguments"
+msgstr "unøyaktig antall argumenter"
+
+#: info/infokey.c:201
+#, c-format
+msgid "cannot open input file `%s'"
+msgstr "Kan ikke åpne inputfilen «%s»"
+
+#: info/infokey.c:215
+#, c-format
+msgid "cannot create output file `%s'"
+msgstr "Kunne ikke opprette outputfila «%s»"
+
+#: info/infokey.c:226
+#, c-format
+msgid "error writing to `%s'"
+msgstr "feil ved skriving til «%s»"
+
+#: info/infokey.c:232
+#, c-format
+msgid "error closing output file `%s'"
+msgstr "Feil ved lukking av outputfila «%s»"
+
+#: info/infokey.c:450
+msgid "key sequence too long"
+msgstr "tastesekvensen er for lang"
+
+#: info/infokey.c:529
+msgid "missing key sequence"
+msgstr "manglende tastesekvens"
+
+#: info/infokey.c:610
+msgid "NUL character (\\000) not permitted"
+msgstr "NULL-tegn (\\000) er ikke tillatt"
+
+#: info/infokey.c:641
+#, c-format
+msgid "NUL character (^%c) not permitted"
+msgstr "NULL-tegn (^%c) er ikke tillatt"
+
+#: info/infokey.c:665
+msgid "missing action name"
+msgstr "manglende handlingsnavn"
+
+#: info/infokey.c:681 info/infokey.c:756
+msgid "section too long"
+msgstr "avdeling for lang"
+
+#: info/infokey.c:688
+#, c-format
+msgid "unknown action `%s'"
+msgstr "Ukjent handling «%s»"
+
+#: info/infokey.c:698
+msgid "action name too long"
+msgstr "handlingsnavn for langt"
+
+#: info/infokey.c:712
+#, c-format
+msgid "extra characters following action `%s'"
+msgstr "ekstra tegn følger handlingen «%s»"
+
+#: info/infokey.c:723
+msgid "missing variable name"
+msgstr "manglende variabelnavn"
+
+#: info/infokey.c:733
+msgid "missing `=' immediately after variable name"
+msgstr "manglende «=» umiddelbart etter variabelnavn"
+
+#: info/infokey.c:741
+msgid "variable name too long"
+msgstr "variabelnavn for langt"
+
+#: info/infokey.c:765
+msgid "value too long"
+msgstr "verdi for lang"
+
+#: info/infokey.c:890
+#, c-format
+msgid "\"%s\", line %u: "
+msgstr "«%s», linje %u: "
+
+#: info/infokey.c:906
+#, c-format
+msgid ""
+"Usage: %s [OPTION]... [INPUT-FILE]\n"
+"\n"
+"Compile infokey source file to infokey file.  Reads INPUT-FILE (default\n"
+"$HOME/.infokey) and writes compiled key file to (by default) $HOME/.info.\n"
+"\n"
+"Options:\n"
+"  --output FILE        output to FILE instead of $HOME/.info\n"
+"  --help               display this help and exit.\n"
+"  --version            display version information and exit.\n"
+msgstr ""
+"Bruksmåte: %s [VALG]... [INPUTFIL]\n"
+"\n"
+"Kompilere infokey-kildefil til infokeyfil.  Leser INPUTFIL (standard\n"
+"$HOME/.infokey) og skriver kompilert keyfil til $HOME/.info.\n"
+"\n"
+"Valg:\n"
+"  --output FIL                 skrive ut til FIL istedet for $HOME/.info.\n"
+"  --help                       vise denne hjelpen og avslutte.\n"
+"  --version                    vise programversjon og avslutte.\n"
+
+#: info/infomap.c:1500
+#, c-format
+msgid "Ignoring invalid infokey file `%s' - too small"
+msgstr "Ignorerer ugyldig infokeyfil «%s» - for liten"
+
+#: info/infomap.c:1503
+#, c-format
+msgid "Ignoring invalid infokey file `%s' - too big"
+msgstr "Ignorerer ugyldig infokeyfil «%s» - for stor"
+
+#: info/infomap.c:1516
+#, c-format
+msgid "Error reading infokey file `%s' - short read"
+msgstr "Feil ved lesing av infokeyfil «%s» - for kort"
+
+#: info/infomap.c:1535
+#, c-format
+msgid ""
+"Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
+msgstr ""
+"Ugyldig infokeyfil «%s» (feil magiske tall) -- kjør infokey for å oppdatere "
+"den"
+
+#: info/infomap.c:1544
+#, c-format
+msgid "Your infokey file `%s' is out of date -- run infokey to update it"
+msgstr "Din infokeyfil «%s» er utdatert -- kjør infokey for å oppdatere den"
+
+#: info/infomap.c:1560
+#, c-format
+msgid ""
+"Invalid infokey file `%s' (bad section length) -- run infokey to update it"
+msgstr ""
+"Ugyldig infokeyfil «%s» (feil avdelingslengde) -- kjør infokey for å "
+"oppdatere den"
+
+#: info/infomap.c:1581
+#, c-format
+msgid ""
+"Invalid infokey file `%s' (bad section code) -- run infokey to update it"
+msgstr ""
+"Ugyldig infokeyfil «%s» (feil avdelingskode) -- kjør infokey for å oppdatere "
+"den"
+
+#: info/infomap.c:1716
+msgid "Bad data in infokey file -- some key bindings ignored"
+msgstr "Feil data i infokeyfil -- noen tastebindinger ble ignorert"
+
+#: info/infomap.c:1766
+msgid "Bad data in infokey file -- some var settings ignored"
+msgstr "Feil data i infokeyfil -- noen variabelinnstillinger ble ignorert"
+
+#: info/m-x.c:69
+msgid "Read the name of an Info command and describe it"
+msgstr "Lese inn navnet på en infokommando og beskrive den"
+
+#: info/m-x.c:73
+msgid "Describe command: "
+msgstr "Beskriv kommandoen: "
+
+#: info/m-x.c:96
+msgid "Read a command name in the echo area and execute it"
+msgstr "Lese et kommandonavn i ekkoområdet og utføre den"
+
+#: info/m-x.c:140
+msgid "Cannot execute an `echo-area' command here."
+msgstr "Kan ikke utføre en «echo-area»-kommando her."
+
+#: info/m-x.c:154
+#, c-format
+msgid "Undefined command: %s"
+msgstr "udefinert kommando: %s"
+
+#: info/m-x.c:160
+msgid "Set the height of the displayed window"
+msgstr "Sette høyden på det viste vinduet"
+
+#: info/m-x.c:173
+#, c-format
+msgid "Set screen height to (%d): "
+msgstr "Sette skjermhøyde til (%d): "
+
+#: info/makedoc.c:162 info/makedoc.c:170
+#, c-format
+msgid ""
+"   Source files groveled to make this file include:\n"
+"\n"
+msgstr ""
+"   Kildefiler søkt gjennom for å lage denne filen inkluderer:\n"
+"\n"
+
+#: info/makedoc.c:550
+#, c-format
+msgid "Couldn't manipulate the file %s.\n"
+msgstr "Kunne ikke manipulere filen %s.\n"
+
+#: info/nodemenu.c:31
+msgid ""
+"\n"
+"* Menu:\n"
+"  (File)Node                        Lines   Size   Containing File\n"
+"  ----------                        -----   ----   ---------------"
+msgstr ""
+"\n"
+"* Menu:\n"
+"  (Fil)Node                         Linjer  Str.   Inneholdene fil\n"
+"  ---------                         ------  ----   ---------------"
+
+#: info/nodemenu.c:202
+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 ""
+"Her er menyen over nodene du har nylig besøkt.\n"
+"Velg en fra denne menyen, eller bruk «\\[history-node]» i et annet vindu.\n"
+
+#: info/nodemenu.c:224
+msgid "Make a window containing a menu of all of the currently visited nodes"
+msgstr "Lag et vindu inneholdene en meny over alle de nylig besøkte nodene"
+
+#: info/nodemenu.c:304
+msgid "Select a node which has been previously visited in a visible window"
+msgstr "Velge en node som har blitt tidligere besøkt i et synlig vindu"
+
+#: info/nodemenu.c:317
+msgid "Select visited node: "
+msgstr "Velg besøkt node: "
+
+#: info/nodemenu.c:337 info/session.c:2264
+#, c-format
+msgid "The reference disappeared! (%s)."
+msgstr "Referansen forsvant! (%s)."
+
+#: info/session.c:162
+#, c-format
+msgid ""
+"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
+"for menu item."
+msgstr ""
+"Velkommen til Info versjon %s. Trykk «\\[get-help-window]» for hjelp,\n"
+"«\\[menu-item]» for menypunkt."
+
+#: info/session.c:620
+msgid "Move down to the next line"
+msgstr "Flytte ned til neste linje"
+
+#: info/session.c:635
+msgid "Move up to the previous line"
+msgstr "Flytte opp til den forrige linjen"
+
+#: info/session.c:650
+msgid "Move to the end of the line"
+msgstr "Flytte til slutten av linjen"
+
+#: info/session.c:670
+msgid "Move to the start of the line"
+msgstr "Flytte til starten av linjen"
+
+#: info/session.c:860 makeinfo/node.c:1424
+msgid "Next"
+msgstr "neste"
+
+#: info/session.c:863
+msgid "Following Next node..."
+msgstr "Følger nestenoden..."
+
+#: info/session.c:881
+msgid "Selecting first menu item..."
+msgstr "Velger første menypunkt..."
+
+#: info/session.c:893
+msgid "Selecting Next node..."
+msgstr "Velger nestenoden..."
+
+#: info/session.c:964
+#, c-format
+msgid "Moving Up %d time(s), then Next."
+msgstr "Flytter opp %d gang(er), deretter neste."
+
+#: info/session.c:988
+msgid "No more nodes within this document."
+msgstr "Ingen flere noder i dette dokumentet."
+
+#: info/session.c:1011
+msgid "No `Prev' for this node."
+msgstr "Ingen «forrige» for denne noden."
+
+#: info/session.c:1014 info/session.c:1073
+msgid "Moving Prev in this window."
+msgstr "Flytter til forrige i dette vinduet."
+
+#: info/session.c:1030
+msgid "No `Prev' or `Up' for this node within this document."
+msgstr "Ingen «forrige» eller «opp» for denne noden i dette dokumentet."
+
+#: info/session.c:1034
+msgid "Moving Up in this window."
+msgstr "Flytter opp i dette vinduet."
+
+#: info/session.c:1084
+msgid "Moving to `Prev's last menu item."
+msgstr "Flytter til «forrige»s siste menypunkt."
+
+#: info/session.c:1095
+msgid "Move forwards or down through node structure"
+msgstr "Flytte forover eller ned gjennom nodestrukturen"
+
+#: info/session.c:1111
+msgid "Move backwards or up through node structure"
+msgstr "Flytte tilbake eller opp gjennom nodestrukturen"
+
+#: info/session.c:1205
+msgid "Scroll forward in this window"
+msgstr "Rulle forover i dette vinduet"
+
+#: info/session.c:1213
+msgid "Scroll forward in this window and set default window size"
+msgstr "Rulle forover i dette vinduet og sette standard vindustørrelse"
+
+#: info/session.c:1221
+msgid "Scroll forward in this window staying within node"
+msgstr "Rulle forover i dette vinduet, men forbli innenfor noden"
+
+#: info/session.c:1229
+msgid ""
+"Scroll forward in this window staying within node and set default window size"
+msgstr ""
+"Rulle forover i dette vinduet, forbli innenfor noden og sette standard "
+"vindustørrelse"
+
+#: info/session.c:1237
+msgid "Scroll backward in this window"
+msgstr "Rulle bakover i dette vinduet"
+
+#: info/session.c:1245
+msgid "Scroll backward in this window and set default window size"
+msgstr "Rulle bakover i dette vinduet og sette standard vindustørrelse"
+
+#: info/session.c:1254
+msgid "Scroll backward in this window staying within node"
+msgstr "Rulle bakover i dette vinduet, men forbli innenfor noden"
+
+#: info/session.c:1262
+msgid ""
+"Scroll backward in this window staying within node and set default window "
+"size"
+msgstr ""
+"Rulle bakover i dette vinduet, forbli innenfor noden og sette standard "
+"vindustørrelse"
+
+#: info/session.c:1270
+msgid "Move to the start of this node"
+msgstr "Flytte til starten av denne noden"
+
+#: info/session.c:1277
+msgid "Move to the end of this node"
+msgstr "Flytte til slutten av denne noden"
+
+#: info/session.c:1284
+msgid "Scroll down by lines"
+msgstr "Rulle ned pr. antall linjer"
+
+#: info/session.c:1301
+msgid "Scroll up by lines"
+msgstr "Rulle opp pr. antall linjer"
+
+#: info/session.c:1319
+msgid "Scroll down by half screen size"
+msgstr "Rulle ned en halv side"
+
+#: info/session.c:1345
+msgid "Scroll up by half screen size"
+msgstr "Rulle opp en halv side"
+
+#: info/session.c:1374
+msgid "Select the next window"
+msgstr "Velge neste vindu"
+
+#: info/session.c:1413
+msgid "Select the previous window"
+msgstr "Velge forrige vindu"
+
+#: info/session.c:1464
+msgid "Split the current window"
+msgstr "Dele gjeldende vindu"
+
+#: info/session.c:1545
+msgid "Delete the current window"
+msgstr "Slette den gjeldende vindu"
+
+#: info/session.c:1553
+msgid "Cannot delete a permanent window"
+msgstr "Kan ikke slette et permanent vindu"
+
+#: info/session.c:1585
+msgid "Delete all other windows"
+msgstr "Slette alle andre vinduer"
+
+#: info/session.c:1631
+msgid "Scroll the other window"
+msgstr "Rulle det andre vinduet"
+
+#: info/session.c:1652
+msgid "Scroll the other window backward"
+msgstr "Rulle det andre vinduet bakover"
+
+#: info/session.c:1658
+msgid "Grow (or shrink) this window"
+msgstr "Øke (eller minke) dette vinduet"
+
+#: info/session.c:1669
+msgid "Divide the available screen space among the visible windows"
+msgstr "Dele den tilgjengelige skjermplassen mellom de synlige vinduene"
+
+#: info/session.c:1676
+msgid "Toggle the state of line wrapping in the current window"
+msgstr "Veksle tilstanden til linjebryting i gjeldende vindu"
+
+#: info/session.c:1848
+msgid "Select the Next node"
+msgstr "Velge neste node"
+
+#: info/session.c:1856
+msgid "Select the Prev node"
+msgstr "Velge forrige node"
+
+#: info/session.c:1864
+msgid "Select the Up node"
+msgstr "Velge oppnoden"
+
+#: info/session.c:1871
+msgid "Select the last node in this file"
+msgstr "Velge den siste noden i denne filen"
+
+#: info/session.c:1898 info/session.c:1931
+msgid "This window has no additional nodes"
+msgstr "Dette vinduet har ingen andre noder"
+
+#: info/session.c:1904
+msgid "Select the first node in this file"
+msgstr "Velge første node i denne filen"
+
+#: info/session.c:1938
+msgid "Select the last item in this node's menu"
+msgstr "Velge det siste punktet i nodens meny"
+
+#: info/session.c:1944
+msgid "Select this menu item"
+msgstr "Velge dette menypunktet"
+
+#: info/session.c:1977
+#, c-format
+msgid "There aren't %d items in this menu."
+msgstr "Det er ikke %d punkter i denne menyen."
+
+#: info/session.c:2171 info/session.c:2172
+#, c-format
+msgid "Menu item (%s): "
+msgstr "Menypunkt (%s): "
+
+#: info/session.c:2175
+msgid "Menu item: "
+msgstr "Menypunkt: "
+
+#: info/session.c:2182 info/session.c:2183
+#, c-format
+msgid "Follow xref (%s): "
+msgstr "Følge kryssreferanse (%s): "
+
+#: info/session.c:2186
+msgid "Follow xref: "
+msgstr "Følge kryssreferanse: "
+
+#: info/session.c:2315
+msgid "Read a menu item and select its node"
+msgstr "Lese et menyvalg og velge dens node"
+
+#: info/session.c:2323
+msgid "Read a footnote or cross reference and select its node"
+msgstr "Lese en fotnote eller kryssreferanse og velge dens node"
+
+#: info/session.c:2329
+msgid "Move to the start of this node's menu"
+msgstr "Flytte til starten av denne nodens meny"
+
+#: info/session.c:2353
+msgid "Visit as many menu items at once as possible"
+msgstr "Besøke så mange menypunkter som mulig samtidig"
+
+#: info/session.c:2381
+msgid "Read a node name and select it"
+msgstr "Lese et nodenavn og velge det"
+
+#: info/session.c:2436 info/session.c:2441
+msgid "Goto node: "
+msgstr "Gå til node: "
+
+#: info/session.c:2505
+#, c-format
+msgid "No menu in node `%s'."
+msgstr "Ingen meny i noden «%s»."
+
+#: info/session.c:2551
+#, c-format
+msgid "No menu item `%s' in node `%s'."
+msgstr "Ingen menypunkt «%s» i noden «%s»."
+
+#: info/session.c:2581
+#, c-format
+msgid "Unable to find node referenced by `%s' in `%s'."
+msgstr "Klarte ikke å finne noden referert av «%s» i «%s»."
+
+#: info/session.c:2631
+msgid "Read a list of menus starting from dir and follow them"
+msgstr "Lese en liste over menyer fra dir og følge dem"
+
+#: info/session.c:2633
+msgid "Follow menus: "
+msgstr "Følge menyer: "
+
+#: info/session.c:2826
+msgid "Find the node describing program invocation"
+msgstr "Finne noden som beskriver bruksmåten for programmet"
+
+#: info/session.c:2828
+#, c-format
+msgid "Find Invocation node of [%s]: "
+msgstr "Finne Invocation-noden til [%s]: "
+
+#: info/session.c:2866
+msgid "Read a manpage reference and select it"
+msgstr "Lese en manualside-referanse og velge den"
+
+#: info/session.c:2870
+msgid "Get Manpage: "
+msgstr "Hent manualsiden: "
+
+#: info/session.c:2900
+msgid "Select the node `Top' in this file"
+msgstr "Velge «Top»-noden i denne filen"
+
+#: info/session.c:2906
+msgid "Select the node `(dir)'"
+msgstr "Velge noden «(dir)»"
+
+#: info/session.c:2923 info/session.c:2925
+#, c-format
+msgid "Kill node (%s): "
+msgstr "Slette noden (%s): "
+
+#: info/session.c:2977
+#, c-format
+msgid "Cannot kill node `%s'"
+msgstr "Kan ikke slette noden «%s»"
+
+#: info/session.c:2987
+msgid "Cannot kill the last node"
+msgstr "Kan ikke slette den forrige noden"
+
+#: info/session.c:3073
+msgid "Select the most recently selected node"
+msgstr "Velge den sist valgte noden"
+
+#: info/session.c:3079
+msgid "Kill this node"
+msgstr "Slette denne noden"
+
+#: info/session.c:3087
+msgid "Read the name of a file and select it"
+msgstr "Lese inn navnet på en fil og velge den"
+
+#: info/session.c:3091
+msgid "Find file: "
+msgstr "Finne fil: "
+
+#: info/session.c:3108
+#, c-format
+msgid "Cannot find `%s'."
+msgstr "Kan ikke finne «%s»."
+
+#: info/session.c:3151 info/session.c:3269
+#, c-format
+msgid "Could not create output file `%s'."
+msgstr "Kunne ikke opprette utskriftsfil «%s»."
+
+#: info/session.c:3165 info/session.c:3287 info/session.c:3347
+msgid "Done."
+msgstr "Ferdig."
+
+#: info/session.c:3220
+#, c-format
+msgid "Writing node %s..."
+msgstr "Skriver noden «%s»..."
+
+# I need a better substitute for the verb «to pipe».
+# «Å pipe» sounds no good to me.
+#: info/session.c:3296
+msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
+msgstr "«Pipe» innholdet av denne noden gjennom INFO_PRINT_COMMAND"
+
+#: info/session.c:3331
+#, c-format
+msgid "Cannot open pipe to `%s'."
+msgstr "Kan ikke åpne «pipe» til «%s»."
+
+#: info/session.c:3337
+#, c-format
+msgid "Printing node %s..."
+msgstr "Skriver ut noden «%s»..."
+
+#: info/session.c:3567
+#, c-format
+msgid "Searching subfile %s ..."
+msgstr "Søker i delfil «%s»..."
+
+#: info/session.c:3619
+msgid "Read a string and search for it case-sensitively"
+msgstr ""
+"Lese inn en streng og søke etter den med skille på store og små bokstaver"
+
+#: info/session.c:3626
+msgid "Read a string and search for it"
+msgstr "Lese inn en streng og søke etter den"
+
+#: info/session.c:3634
+msgid "Read a string and search backward for it"
+msgstr "Lese inn en streng og søke bakover etter den"
+
+#: info/session.c:3670 info/session.c:3677
+#, c-format
+msgid "%s%sfor string [%s]: "
+msgstr "%s%setter streng [%s]: "
+
+#: info/session.c:3671 info/session.c:3678
+msgid "Search backward"
+msgstr "Søke bakover"
+
+#: info/session.c:3672 info/session.c:3678
+msgid "Search"
+msgstr "Søke"
+
+#: info/session.c:3673 info/session.c:3679
+msgid " case-sensitively "
+msgstr " med skille på store og små bokstaver "
+
+#: info/session.c:3674 info/session.c:3679
+msgid " "
+msgstr " "
+
+#: info/session.c:3718
+msgid "Search failed."
+msgstr "Søk mislyktes"
+
+#: info/session.c:3736
+msgid "Repeat last search in the same direction"
+msgstr "Gjenta forrige søk i samme retning"
+
+#: info/session.c:3739 info/session.c:3749
+msgid "No previous search string"
+msgstr "Ingen tidligere søkestreng"
+
+#: info/session.c:3746
+msgid "Repeat last search in the reverse direction"
+msgstr "Gjenta forrige søk i motsatt retning"
+
+#: info/session.c:3765 info/session.c:3771
+msgid "Search interactively for a string as you type it"
+msgstr "Søke interaktivt for en streng mens du skriver"
+
+#: info/session.c:3851
+msgid "I-search backward: "
+msgstr "I-søk bakover: "
+
+#: info/session.c:3853
+msgid "I-search: "
+msgstr "I-søk: "
+
+#: info/session.c:3878 info/session.c:3880
+msgid "Failing "
+msgstr "Mislyktes "
+
+#: info/session.c:4340
+msgid "Move to the previous cross reference"
+msgstr "Flytte til forrige kryssreferanse"
+
+#: info/session.c:4349
+msgid "Move to the next cross reference"
+msgstr "Flytte til neste kryssreferanse"
+
+#: info/session.c:4359
+msgid "Select reference or menu item appearing on this line"
+msgstr "Velge referanse eller menypunkt på denne linjen"
+
+#: info/session.c:4382
+msgid "Cancel current operation"
+msgstr "Avbryte gjeldende operasjon"
+
+#: info/session.c:4389
+msgid "Quit"
+msgstr "Avbrutt"
+
+#: info/session.c:4398
+msgid "Move the cursor to a specific line of the window"
+msgstr "Flytte markøren til en angitt linje i vinduet"
+
+#: info/session.c:4430
+msgid "Redraw the display"
+msgstr "Tegne skjermen på nytt"
+
+#: info/session.c:4467
+msgid "Quit using Info"
+msgstr "Avslutte Info"
+
+#: info/session.c:4480
+msgid "Run command bound to this key's lowercase variant"
+msgstr "Kjør kommandoen knyttet til denne tastens «liten-bokstav-variant»"
+
+#: info/session.c:4491
+#, c-format
+msgid "Unknown command (%s)."
+msgstr "Ukjent kommando (%s)."
+
+#: info/session.c:4494
+#, c-format
+msgid "\"%s\" is invalid"
+msgstr "«%s» er ugyldig"
+
+#: info/session.c:4495
+#, c-format
+msgid "`%s' is invalid"
+msgstr "«%s» er ugyldig"
+
+#: info/session.c:4709
+msgid "Add this digit to the current numeric argument"
+msgstr "Legge til dette siffret til det gjeldende numeriske argumentet"
+
+#: info/session.c:4718
+msgid "Start (or multiply by 4) the current numeric argument"
+msgstr "Starte (eller multiplisere med 4) den gjeldende numeriske argumentet"
+
+#: info/session.c:4733
+msgid "Internally used by \\[universal-argument]"
+msgstr "Brukt internt av \\[universal-argument]"
+
+#: info/tilde.c:338
+#, c-format
+msgid "readline: Out of virtual memory!\n"
+msgstr "readline: Tomt for virtuelt minne!\n"
+
+#: info/variables.c:37
+msgid "When \"On\", footnotes appear and disappear automatically"
+msgstr "Når «On», oppstår og forsvinner fotnoter automatisk"
+
+#: info/variables.c:41
+msgid "When \"On\", creating or deleting a window resizes other windows"
+msgstr ""
+"Når «On», laging eller fjerning av vinduer endrer størrelsen på andre vinduer"
+
+#: info/variables.c:45
+msgid "When \"On\", flash the screen instead of ringing the bell"
+msgstr "Når «On», blink skjermen istedet for å ringe i bjellen."
+
+#: info/variables.c:49
+msgid "When \"On\", errors cause the bell to ring"
+msgstr "Når «On», feil får bjellen til å ringe"
+
+#: info/variables.c:53
+msgid "When \"On\", Info garbage collects files which had to be uncompressed"
+msgstr "Når «On», Info søppelhenter filer som måtte dekomprimeres"
+
+#: info/variables.c:56
+msgid "When \"On\", the portion of the matched search string is highlighted"
+msgstr "Når «On», den delen av en matchende søkestreng blir uthevet"
+
+#: info/variables.c:60
+msgid "Controls what happens when scrolling is requested at the end of a node"
+msgstr ""
+"Kontrollerer hva som skjer når rulling er ønsket ved slutten av en node"
+
+#: info/variables.c:64
+msgid "The number lines to scroll when the cursor moves out of the window"
+msgstr "Antall linjer som skal rulles når markøren flyttes utenfor vinduet"
+
+#: info/variables.c:68
+msgid "When \"On\", Info accepts and displays ISO Latin characters"
+msgstr "Når «On», aksepterer og viser Info ISO-Latin-tegn"
+
+#: info/variables.c:74
+msgid "Explain the use of a variable"
+msgstr "Forklar bruken av en variabel"
+
+#: info/variables.c:80
+msgid "Describe variable: "
+msgstr "Beskriv variabel: "
+
+#: info/variables.c:99
+msgid "Set the value of an Info variable"
+msgstr "Sette verdien til en Infovariabel"
+
+#: info/variables.c:105
+msgid "Set variable: "
+msgstr "Sett variabel: "
+
+#: info/variables.c:123
+#, c-format
+msgid "Set %s to value (%d): "
+msgstr "Sette %s til verdien (%d): "
+
+#: info/variables.c:164
+#, c-format
+msgid "Set %s to value (%s): "
+msgstr "Sette %s til verdien (%s): "
+
+#: info/window.c:1138
+msgid "--*** Tags out of Date ***"
+msgstr "--*** Tagger er ute av synk ***"
+
+#: info/window.c:1149
+msgid "-----Info: (), lines ----, "
+msgstr "-----Info: (), linjer ----, "
+
+#: info/window.c:1156
+#, c-format
+msgid "-%s---Info: %s, %d lines --%s--"
+msgstr "-%s---Info: %s, %d linjer --%s--"
+
+#: info/window.c:1160
+#, c-format
+msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
+msgstr "-%s%s-Info: (%s)%s, %d linjer --%s--"
+
+#: info/window.c:1167
+#, c-format
+msgid " Subfile: %s"
+msgstr " Delfil: %s"
+
+#: lib/getopt.c:551 lib/getopt.c:570
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: valget «%s» er flertydig\n"
+
+#: lib/getopt.c:603 lib/getopt.c:607
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: valget «--%s» tillater ikke et argument\n"
+
+#: lib/getopt.c:616 lib/getopt.c:621
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: valget «%c%s» tillater ikke et argument\n"
+
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: valget «%s» krever et argument\n"
+
+#: lib/getopt.c:727 lib/getopt.c:730
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: ukjent valg «--%s»\n"
+
+#: lib/getopt.c:738 lib/getopt.c:741
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: ukjent valg «%c%s»\n"
+
+#: lib/getopt.c:796 lib/getopt.c:799
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: ulovlig valg -- %c\n"
+
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ugyldig valg -- %c\n"
+
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: valget krever et argument -- %c\n"
+
+#: lib/getopt.c:935 lib/getopt.c:954
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: valget «-W %s» er flertydig\n"
+
+#: lib/getopt.c:978 lib/getopt.c:999
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: valget «-W %s» tillater ikke et argument\n"
+
+#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#, c-format
+msgid "arguments to @%s ignored"
+msgstr "argumentene til @%s ble ignorert"
+
+#: makeinfo/cmds.c:585
+msgid "January"
+msgstr "januar"
+
+#: makeinfo/cmds.c:585
+msgid "February"
+msgstr "februar"
+
+#: makeinfo/cmds.c:585
+msgid "March"
+msgstr "mars"
+
+#: makeinfo/cmds.c:585
+msgid "April"
+msgstr "april"
+
+#: makeinfo/cmds.c:585
+msgid "May"
+msgstr "mai"
+
+#: makeinfo/cmds.c:586
+msgid "June"
+msgstr "juni"
+
+#: makeinfo/cmds.c:586
+msgid "July"
+msgstr "juli"
+
+#: makeinfo/cmds.c:586
+msgid "August"
+msgstr "august"
+
+#: makeinfo/cmds.c:586
+msgid "September"
+msgstr "september"
+
+#: makeinfo/cmds.c:586
+msgid "October"
+msgstr "oktober"
+
+#: makeinfo/cmds.c:587
+msgid "November"
+msgstr "november"
+
+#: makeinfo/cmds.c:587
+msgid "December"
+msgstr "desember"
+
+#: makeinfo/cmds.c:936
+#, c-format
+msgid "unlikely character %c in @var"
+msgstr "usannsynlig tegn %c i @var"
+
+#: makeinfo/cmds.c:979
+msgid "@sc argument all uppercase, thus no effect"
+msgstr "@sc-argument med store bokstaver, dermed ingen effekt"
+
+#: makeinfo/cmds.c:1034
+#, c-format
+msgid "`{' expected, but saw `%c'"
+msgstr "«{» forventet, men så «%c»"
+
+#: makeinfo/cmds.c:1074
+msgid "end of file inside verb block"
+msgstr "slutt-på-fila inne i verb-blokk"
+
+#: makeinfo/cmds.c:1082
+#, c-format
+msgid "`}' expected, but saw `%c'"
+msgstr "«{» forventet, men så «%c»"
+
+#: makeinfo/cmds.c:1112
+msgid ""
+"@strong{Note...} produces a spurious cross-reference in Info; reword to "
+"avoid that"
+msgstr ""
+"@strong{Note...} lager en overflødig kryssreferanse i Info; skriv om for å "
+"unngå dette"
+
+#: makeinfo/cmds.c:1305
+#, c-format
+msgid "%c%s is obsolete"
+msgstr "%c%s er utgått"
+
+#: makeinfo/cmds.c:1414
+#, c-format
+msgid "@sp requires a positive numeric argument, not `%s'"
+msgstr "@sp krever et positivt numerisk argument, ikke `%s'"
+
+#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
+#, c-format
+msgid "Bad argument to %c%s"
+msgstr "Ugyldig argument til %c%s"
+
+#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
+msgid "asis"
+msgstr "asis"
+
+#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
+msgid "none"
+msgstr "none"
+
+#: makeinfo/cmds.c:1789
+#, c-format
+msgid "Bad argument to @%s"
+msgstr "Ugyldig argument til @%s"
+
+#: makeinfo/cmds.c:1803
+msgid "insert"
+msgstr "insert"
+
+#: makeinfo/defun.c:84
+msgid "Missing `}' in @def arg"
+msgstr "Manglende «}» i @def-arg"
+
+#: makeinfo/defun.c:403
+msgid "Function"
+msgstr "Funksjon"
+
+#: makeinfo/defun.c:406
+msgid "Macro"
+msgstr "Makro"
+
+#: makeinfo/defun.c:409
+msgid "Special Form"
+msgstr "Spesiell form"
+
+#: makeinfo/defun.c:413
+msgid "Variable"
+msgstr "Variabel"
+
+#: makeinfo/defun.c:416
+msgid "User Option"
+msgstr "Brukervalg"
+
+#: makeinfo/defun.c:420
+msgid "Instance Variable"
+msgstr "Forekomst"
+
+#: makeinfo/defun.c:424
+msgid "Method"
+msgstr "Metode"
+
+#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
+#: makeinfo/defun.c:644 makeinfo/xml.c:2229
+msgid "of"
+msgstr "av"
+
+#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
+msgid "on"
+msgstr "på"
+
+#: makeinfo/defun.c:711
+#, c-format
+msgid "Must be in `@%s' environment to use `@%s'"
+msgstr "Må være i et «@%s»-miljø for å bruke «@%s»"
+
+#: makeinfo/files.c:435
+#, c-format
+msgid "%s: getwd: %s, %s\n"
+msgstr "%s: getwd: %s, %s\n"
+
+#: makeinfo/files.c:638
+#, c-format
+msgid "`%s' omitted before output filename"
+msgstr "`%s' utelatt før outputfilnavn"
+
+#: makeinfo/files.c:646
+#, c-format
+msgid "`%s' omitted since writing to stdout"
+msgstr "`%s' utelatt pga skriving til stdout"
+
+#: makeinfo/files.c:694
+msgid "Output buffer not empty."
+msgstr "Outputbuffer er ikke tomt."
+
+#: makeinfo/footnote.c:150
+#, c-format
+msgid "`%c%s' needs an argument `{...}', not just `%s'"
+msgstr "«%c%s» trenger et argument «{...}», ikke bare «%s»"
+
+#: makeinfo/footnote.c:165
+#, c-format
+msgid "No closing brace for footnote `%s'"
+msgstr "Ingen avsluttende krøllparentes for fotnoten «%s»"
+
+#: makeinfo/footnote.c:198
+msgid "Footnote defined without parent node"
+msgstr "Fotnote definert uten foreldrenode"
+
+#: makeinfo/footnote.c:210
+msgid "Footnotes inside footnotes are not allowed"
+msgstr "Fotnoter i fotnoter er ikke tillatt"
+
+#: makeinfo/footnote.c:302 makeinfo/index.c:189
+msgid "Footnotes"
+msgstr "Fotnoter"
+
+#: makeinfo/html.c:87
+#, c-format
+msgid "%s: could not open --css-file: %s"
+msgstr "%s: kunne ikke åpne --css-file: %s"
+
+#: makeinfo/html.c:172
+#, c-format
+msgid "%s:%d: --css-file ended in comment"
+msgstr "%s:%d: --css-file endte i en kommentar"
+
+#: makeinfo/html.c:207
+msgid "Untitled"
+msgstr "Uten navn"
+
+#: makeinfo/html.c:422
+msgid "[unexpected] no html tag to pop"
+msgstr "[uforventet] kunne ikke poppe neste htmltagg"
+
+#: makeinfo/html.c:752
+#, c-format
+msgid "[unexpected] invalid node name: `%s'"
+msgstr "[uforventet] ugyldig nodenavn: «%s»"
+
+#: makeinfo/index.c:169
+#, c-format
+msgid "Unknown index `%s'"
+msgstr "Ukjent indeks «%s»"
+
+#: makeinfo/index.c:234
+#, c-format
+msgid "Info cannot handle `:' in index entry `%s'"
+msgstr "Info kan ikke håndtere `:' i indeksinnslaget `%s'"
+
+#: makeinfo/index.c:412
+#, c-format
+msgid "Index `%s' already exists"
+msgstr "Indeksen «%s» eksisterer allerede"
+
+#: makeinfo/index.c:455
+#, c-format
+msgid "Unknown index `%s' and/or `%s' in @synindex"
+msgstr "Ukjent indeks «%s» og/eller «%s» i @synindex"
+
+#: makeinfo/index.c:661
+msgid "(line )"
+msgstr "(linje )"
+
+#: makeinfo/index.c:669
+#, c-format
+msgid "(line %*d)"
+msgstr "(linje %*d)"
+
+#: makeinfo/index.c:750
+#, c-format
+msgid "Unknown index `%s' in @printindex"
+msgstr "Ukjent indeks «%s» i @printindex"
+
+#: makeinfo/index.c:819
+#, c-format
+msgid "Entry for index `%s' outside of any node"
+msgstr "Innslag for indeksen «%s» utenfor node"
+
+#: makeinfo/index.c:822 makeinfo/index.c:858
+msgid "(outside of any node)"
+msgstr "(utenfor noder)"
+
+#: makeinfo/index.c:919 makeinfo/index.c:925
+msgid "See "
+msgstr "Se "
+
+#: makeinfo/insertion.c:160
+msgid "@item not allowed in argument to @itemize"
+msgstr "@item er ikke tillatt som argument til @itemize"
+
+#: makeinfo/insertion.c:238
+msgid "Broken-Type in insertion_type_pname"
+msgstr "Broken-Type i insertion_type_pname"
+
+#: makeinfo/insertion.c:334
+msgid "Enumeration stack overflow"
+msgstr "Stakkoverflyt ved oppramsing"
+
+#: makeinfo/insertion.c:366
+#, c-format
+msgid "lettering overflow, restarting at %c"
+msgstr "bokstavoverflyt, starter på nytt ved %c"
+
+#: makeinfo/insertion.c:631
+#, c-format
+msgid "%s requires an argument: the formatter for %citem"
+msgstr "%s krever et argument: formattereren for %citem"
+
+#: makeinfo/insertion.c:719
+#, c-format
+msgid "%cfloat environments cannot be nested"
+msgstr "%cfloat-miljøer kan ikke nøstes"
+
+#: makeinfo/insertion.c:973
+#, c-format
+msgid "`@end' expected `%s', but saw `%s'"
+msgstr "`@end' forventet «%s», men så «%s»"
+
+#: makeinfo/insertion.c:1337
+#, c-format
+msgid "No matching `%cend %s'"
+msgstr "Ingen tilsvarende «%cend %s»"
+
+#: makeinfo/insertion.c:1592
+#, c-format
+msgid "%s requires letter or digit"
+msgstr "%s krever en bokstav eller et siffer"
+
+#: makeinfo/insertion.c:1687
+msgid "end of file inside verbatim block"
+msgstr "slutt-på-filen inne i verbatimblokk"
+
+#: makeinfo/insertion.c:1913
+#, c-format
+msgid "@%s not meaningful outside `@float' environment"
+msgstr "@%s er meningsløs utenfor et «@float»-miljø"
+
+#: makeinfo/insertion.c:1949
+msgid "@menu seen before first @node, creating `Top' node"
+msgstr "@menu sett før første @node, oppretter «Top»-noden"
+
+#: makeinfo/insertion.c:1950
+msgid ""
+"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
+msgstr ""
+"kanskje burde din @top-node bli pakket inn i @ifnottex istedet for @ifinfo?"
+
+#: makeinfo/insertion.c:1962
+msgid "@detailmenu seen before first node, creating `Top' node"
+msgstr "@detailmenu sett før første node, oppretter «Top»-noden"
+
+#: makeinfo/insertion.c:2018
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr "@%s gir ikke mening utenfor «@titlepage»- og «@quotation»-miljøer"
+
+#: makeinfo/insertion.c:2032
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' environment"
+msgstr "@%s er meningsløs utenfor et «@titlepage»-miljø"
+
+#: makeinfo/insertion.c:2063
+#, c-format
+msgid "Unmatched `%c%s'"
+msgstr "Umatchet «%c%s»"
+
+#: makeinfo/insertion.c:2068
+#, c-format
+msgid "`%c%s' needs something after it"
+msgstr "«%c%s» trenger noe etter den"
+
+#: makeinfo/insertion.c:2074
+#, c-format
+msgid "Bad argument `%s' to `@%s', using `%s'"
+msgstr "Ugyldig argument «%s» til «%s», bruker «%s»"
+
+#: makeinfo/insertion.c:2171
+#, c-format
+msgid "@%s not meaningful inside `@%s' block"
+msgstr "@%s er meningsløs innenfor en «@%s»-blokk"
+
+#: makeinfo/insertion.c:2180
+#, c-format
+msgid "@itemx not meaningful inside `%s' block"
+msgstr "@itemx er meningsløs innenfor en «@%s»-blokk"
+
+#: makeinfo/insertion.c:2356
+#, c-format
+msgid "%c%s found outside of an insertion block"
+msgstr "%c%s funnet utenfor en innsettingsblokk"
+
+#: makeinfo/lang.c:580
+#, c-format
+msgid "%s is not a valid ISO 639 language code"
+msgstr "%s er ikke en gyldig ISO 639-språkkode"
+
+#: makeinfo/lang.c:655
+#, c-format
+msgid "unrecognized encoding name `%s'"
+msgstr "ugjenkjennelig kodingsnavn «%s»"
+
+#: makeinfo/lang.c:663
+#, c-format
+msgid "sorry, encoding `%s' not supported"
+msgstr "beklager, kodingen «%s» er ikke støttet"
+
+#: makeinfo/lang.c:715
+#, c-format
+msgid "invalid encoded character `%s'"
+msgstr "Ugyldig kodet tegn «%s»"
+
+#: makeinfo/lang.c:1009
+#, c-format
+msgid "%c%s expects `i' or `j' as argument, not `%c'"
+msgstr "%c%s forventer «i» eller «j» som argument, ikke «%c»"
+
+#: makeinfo/lang.c:1013
+#, c-format
+msgid "%c%s expects a single character `i' or `j' as argument"
+msgstr "%c%s forventer et enkelt tegn, «i» eller «j» som argument"
+
+#: makeinfo/macro.c:128
+#, c-format
+msgid "macro `%s' previously defined"
+msgstr "makroen «%s» er tidligere definert"
+
+#: makeinfo/macro.c:132
+#, c-format
+msgid "here is the previous definition of `%s'"
+msgstr "her er den tidligere definisjonen av «%s»"
+
+#: makeinfo/macro.c:355
+#, c-format
+msgid "\\ in macro expansion followed by `%s' instead of parameter name"
+msgstr "\\ i makroekspansjon fulgt av «%s» istedet for parameternavn"
+
+#: makeinfo/macro.c:401
+#, c-format
+msgid "Macro `%s' called on line %d with too many args"
+msgstr "Makroen «%s» kalt på linje %d med for mange argumenter"
+
+#: makeinfo/macro.c:586
+#, c-format
+msgid "%cend macro not found"
+msgstr "%cend macro ikke funnet"
+
+#: makeinfo/macro.c:624
+msgid "@quote-arg only useful for single-argument macros"
+msgstr "@quote-arg bare brukbart når makroen bare tar et argument"
+
+#: makeinfo/macro.c:660
+#, c-format
+msgid "mismatched @end %s with @%s"
+msgstr "umatchet @end %s med @%s"
+
+#: makeinfo/makeinfo.c:184
+#, c-format
+msgid "Too many errors!  Gave up.\n"
+msgstr "For mange feil!  Ga opp.\n"
+
+#: makeinfo/makeinfo.c:302
+#, c-format
+msgid "%s:%d: warning: "
+msgstr "%s:%d: advarsel: "
+
+#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
+#, c-format
+msgid "Misplaced %c"
+msgstr "Feilplassert %c"
+
+#: makeinfo/makeinfo.c:340
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "Prøv «%s --help» for mer informasjon.\n"
+
+#: makeinfo/makeinfo.c:343
+#, c-format
+msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
+msgstr "Bruksmåte: %s [VALG]... TEXINFOFIL...\n"
+
+#: makeinfo/makeinfo.c:346
+msgid ""
+"Translate Texinfo source documentation to various other formats, by default\n"
+"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
+msgstr ""
+"Oversette Texinfodokumentasjon til forskjellige andre formater:\n"
+"Infofiler for lesing online med Emacs eller den frittstående GNU Info.\n"
+
+#: makeinfo/makeinfo.c:350
+#, c-format
+msgid ""
+"General options:\n"
+"      --error-limit=NUM       quit after NUM errors (default %d).\n"
+"      --force                 preserve output even if errors.\n"
+"      --help                  display this help and exit.\n"
+"      --no-validate           suppress node cross-reference validation.\n"
+"      --no-warn               suppress warnings (but not errors).\n"
+"      --reference-limit=NUM   warn about at most NUM references (default %"
+"d).\n"
+"  -v, --verbose               explain what is being done.\n"
+"      --version               display version information and exit.\n"
+msgstr ""
+"Generelle valg:\n"
+"      --error-limit=ANT       avbryte etter ANT feil (standard %d).\n"
+"      --force                 bevare output selv med feil.\n"
+"      --help                  vise denne hjelpen og avslutte.\n"
+"      --no-validate           undertrykke sjekking av kryssreferanser.\n"
+"      --no-warn               undertrykke advarsler (men ikke feil).\n"
+"      --reference-limit=ANT   advare om på det meste ANT referanser "
+"(standard %d).\n"
+"  -v, --verbose               forklare hva som blir gjort.\n"
+"      --version               vise programversjon og avslutte.\n"
+
+#: makeinfo/makeinfo.c:364
+#, no-wrap
+msgid ""
+"Output format selection (default is to produce Info):\n"
+"      --docbook             output Docbook XML rather than Info.\n"
+"      --html                output HTML rather than Info.\n"
+"      --xml                 output Texinfo XML rather than Info.\n"
+"      --plaintext           output plain text rather than Info.\n"
+msgstr ""
+"Valg av outputformat (standard er å produsere Info):\n"
+"      --docbook             generere DocBook XML i stedet for Info.\n"
+"      --html                generere HTML i stedet for Info.\n"
+"      --xml                 generere Texinfo XML i stedet for Info.\n"
+"      --plaintext           generere ren tekst i stedet for Info.\n"
+
+#: makeinfo/makeinfo.c:372
+msgid ""
+"General output options:\n"
+"  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
+"                            ignoring any @setfilename.\n"
+"      --no-headers          suppress node separators, Node: lines, and "
+"menus\n"
+"                              from Info output (thus producing plain text)\n"
+"                              or from HTML (thus producing shorter output);\n"
+"                              also, write to standard output by default.\n"
+"      --no-split            suppress splitting of Info or HTML output,\n"
+"                            generate only one output file.\n"
+"      --number-sections     output chapter and sectioning numbers.\n"
+"  -o, --output=FILE         output to FILE (directory if split HTML),\n"
+msgstr ""
+"Generelle outputvalg:\n"
+"  -E, --macro-expand FIL    sende makroekspandert kilde til FIL,\n"
+"                              ignorerer enhver @setfilename.\n"
+"      --no-headers          undertrykke nodeseparatorer, Node:-linjer og "
+"menyer\n"
+"                              fra Info-output (og dermed produsere ren "
+"tekst)\n"
+"                              eller fra HTML (og dermed produsere kortere "
+"output);\n"
+"                              standard er å skrive til standard ut.\n"
+"      --no-split            undertrykke splitting av Info- eller HTML-"
+"output,\n"
+"                              generere bare en outputfil.\n"
+"      --number-sections     nummerere kapitler og avdelinger (section).\n"
+"  -o, --output=FIL          sende output til FIL (eller katalog dersom "
+"splittet HTML),\n"
+
+#: makeinfo/makeinfo.c:386
+#, c-format
+msgid ""
+"Options for Info and plain text:\n"
+"      --enable-encoding       output accented and special characters in\n"
+"                                Info output based on @documentencoding.\n"
+"      --fill-column=NUM       break Info lines at NUM characters (default %"
+"d).\n"
+"      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
+"                                `separate' to put them in their own node;\n"
+"                                `end' to put them at the end of the node\n"
+"                                  in which they are defined (default).\n"
+"      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default %"
+"d).\n"
+"                                If VAL is `none', do not indent; if VAL is\n"
+"                                `asis', preserve existing indentation.\n"
+"      --split-size=NUM        split Info files at size NUM (default %d).\n"
+msgstr ""
+"Valg for Infooutput og ren tekst:\n"
+"      --enable-encoding       skrive ut spesialtegn og tegn med aksenter i\n"
+"                                Infooutput basert på @documentencoding.\n"
+"      --fill-column=ANT       bryte Infolinjer ved ANT tegn (standard %d).\n"
+"      --footnote-style=STIL   generere fotnoter i Info i henhold til STIL:\n"
+"                                «separate» for å legge fotnotene i egne "
+"noder;\n"
+"                                «end» for å legge fotnotene i slutten av "
+"hver node\n"
+"                                  der fotnotene er definert (standard).\n"
+"      --paragraph-indent=ANT  rykke inn Infoavsnitt med ANT mellomrom "
+"(standard %d).\n"
+"                                Dersom ANT er «none» rykkes ikke avsnittene "
+"inn;\n"
+"                                Dersom ANT er «asis» bevares eksisterende "
+"innrykk.\n"
+"      --split-size=ANT        splitte Infofilene ved lengde ANT (standard %"
+"d).\n"
+
+#: makeinfo/makeinfo.c:403
+msgid ""
+"Options for HTML:\n"
+"      --css-include=FILE        include FILE in HTML <style> output;\n"
+"                                  read stdin if FILE is -.\n"
+msgstr ""
+"Valg for HTML:\n"
+"      --css-include=FIL         inkluder FIL i HTML <style>-taggen;\n"
+"                                  les stdin dersom FIL er -.\n"
+
+#: makeinfo/makeinfo.c:409
+#, c-format
+msgid ""
+"Options for XML and Docbook:\n"
+"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"d).\n"
+"                                  If VAL is 0, ignorable whitespace is "
+"dropped.\n"
+msgstr ""
+"Valg for XML og DocBook:\n"
+"      --output-index=ANT         innrykk XML-elementer med ANT mellomrom "
+"(standard %d).\n"
+"                                  Dersom ANT er 0, blir ignorerbart tomrom "
+"ikke brukt.\n"
+
+#: makeinfo/makeinfo.c:416
+msgid ""
+"Input file options:\n"
+"      --commands-in-node-names  allow @ commands in node names.\n"
+"  -D VAR                        define the variable VAR, as with @set.\n"
+"  -I DIR                        append DIR to the @include search path.\n"
+"  -P DIR                        prepend DIR to the @include search path.\n"
+"  -U VAR                        undefine the variable VAR, as with @clear.\n"
+msgstr ""
+"Valg for inputfil:\n"
+"      --commands-in-node-names   tillate @-kommandoer i nodenavn.\n"
+"  -D VAR                         definer variabelen VAR, som om @set "
+"brukes.\n"
+"  -I KAT                         legg til KAT på slutten av @include-"
+"søkestien.\n"
+"  -P KAT                         legg til KAT på starten av @include-"
+"søkestien.\n"
+"  -U VAR                         udefiner variabelen VAR, som om @clear "
+"brukes.\n"
+
+#: makeinfo/makeinfo.c:425
+msgid ""
+"Conditional processing in input:\n"
+"  --ifdocbook       process @ifdocbook and @docbook even if\n"
+"                      not generating Docbook.\n"
+"  --ifhtml          process @ifhtml and @html even if not generating HTML.\n"
+"  --ifinfo          process @ifinfo even if not generating Info.\n"
+"  --ifplaintext     process @ifplaintext even if not generating plain text.\n"
+"  --iftex           process @iftex and @tex; implies --no-split.\n"
+"  --ifxml           process @ifxml and @xml.\n"
+"  --no-ifdocbook    do not process @ifdocbook and @docbook text.\n"
+"  --no-ifhtml       do not process @ifhtml and @html text.\n"
+"  --no-ifinfo       do not process @ifinfo text.\n"
+"  --no-ifplaintext  do not process @ifplaintext text.\n"
+"  --no-iftex        do not process @iftex and @tex text.\n"
+"  --no-ifxml        do not process @ifxml and @xml text.\n"
+"\n"
+"  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
+msgstr ""
+"Betinget behandling av input:\n"
+"  --ifdocbook        behandle @ifdocbook og @docbook selv om\n"
+"                       DocBook ikke skal genereres.\n"
+"  --ifhtml           behandle @ifhtml og @html selv om HTML ikke skal "
+"genereres.\n"
+"  --ifinfo           behandle @ifinfo selv når info ikke skal genereres.\n"
+"  --ifplaintext      behandle @ifplaintext selv om ren tekst ikke skal "
+"genereres.\n"
+"  --iftex            behandle @iftex og @tex; innebærer --no-split.\n"
+"  --ifxml            behandle @ifxml og @xml.\n"
+"  --no-ifdocbook     ikke behandle @ifdocbook og @docbook.\n"
+"  --no-ifhtml        ikke behandle @ifhtml og @html.\n"
+"  --no-ifinfo        ikke behandle @ifinfo.\n"
+"  --no-ifplaintext   ikke behandle @ifplaintext.\n"
+"  --no-iftex         ikke behandle @iftex og @tex.\n"
+"  --no-ifxml         ikke behandle @ifxml og @xml.\n"
+
+#: makeinfo/makeinfo.c:444
+msgid ""
+"  The defaults for the @if... conditionals depend on the output format:\n"
+"  if generating HTML, --ifhtml is on and the others are off;\n"
+"  if generating Info, --ifinfo is on and the others are off;\n"
+"  if generating plain text, --ifplaintext is on and the others are off;\n"
+"  if generating XML, --ifxml is on and the others are off.\n"
+msgstr ""
+"  Standardverdiene for @if...-betingelsene avhenger av outputformatet:\n"
+"  dersom HTML genereres er --ifhtml påslått og de andre av;\n"
+"  dersom Info genereres er --ifinfo påslått og de andre av;\n"
+"  dersom ren tekst genereres er --ifplaintext påslått og de andre av;\n"
+"  dersom XML genereres er --ifxml påslått og de andre av.\n"
+
+#: makeinfo/makeinfo.c:452
+msgid ""
+"Examples:\n"
+"  makeinfo foo.texi                     write Info to foo's @setfilename\n"
+"  makeinfo --html foo.texi              write HTML to @setfilename\n"
+"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
+"  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
+"  makeinfo --no-headers foo.texi        write plain text to standard output\n"
+"\n"
+"  makeinfo --html --no-headers foo.texi write html without node lines, "
+"menus\n"
+"  makeinfo --number-sections foo.texi   write Info with numbered sections\n"
+"  makeinfo --no-split foo.texi          write one Info file however big\n"
+msgstr ""
+"Eksempler:\n"
+"  makeinfo foo.texi                     skrive Info til foos @setfilename\n"
+"  makeinfo --html foo.texi              skrive HTML til @setfilename\n"
+"  makeinfo --xml foo.texi               skrive Texinfo XML til @setfilename\n"
+"  makeinfo --docbook foo.texi           skrive Docbook XML til @setfilename\n"
+"  makeinfo --no-headers foo.texi        skrive ren tekst til standard ut\n"
+"\n"
+"  makeinfo --html --no-headers foo.texi skrive HTML uten nodelinjer\n"
+"  makeinfo --number-sections foo.texi   skrive Info med nummererte avsnitt\n"
+"  makeinfo --no-split foo.texi          skrive en Infofil uansett størrelse\n"
+
+#: makeinfo/makeinfo.c:603
+#, c-format
+msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
+msgstr "%s: Ignorerer ugjenkjennelig TEXINFO_OUTPUT_FORMAT-verdi «%s».\n"
+
+#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
+#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
+#, c-format
+msgid "%s: %s arg must be numeric, not `%s'.\n"
+msgstr "%s: %s arg må være numerisk, ikke «%s».\n"
+
+#: makeinfo/makeinfo.c:660
+#, c-format
+msgid "%s: could not open macro expansion output `%s'"
+msgstr "%s: kunne ikke åpne makroekspansjonoutput «%s»"
+
+#: makeinfo/makeinfo.c:665
+#, c-format
+msgid "%s: ignoring second macro expansion output `%s'.\n"
+msgstr "%s: ignorerer sekundær makroekspansjonoutpur «%s».\n"
+
+#: makeinfo/makeinfo.c:707
+#, c-format
+msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
+msgstr ""
+"%s: --paragraph-indent arg må være numerisk/«none»/«asis», ikke «%s».\n"
+
+#: makeinfo/makeinfo.c:732
+#, c-format
+msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
+msgstr "%s: --footnote-style arg må være «separate» eller «end», ikke «%s».\n"
+
+#: makeinfo/makeinfo.c:806
+#, c-format
+msgid "%s: missing file argument.\n"
+msgstr "%s: mangler filargument.\n"
+
+#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#, c-format
+msgid "Multiline command %c%s used improperly"
+msgstr "Flerlinjekommandoen %c%s brukes ikke riktig"
+
+#: makeinfo/makeinfo.c:1000
+#, c-format
+msgid "Expected `%s'"
+msgstr "Forventet «%s»"
+
+#: makeinfo/makeinfo.c:1479
+#, c-format
+msgid "Can't create directory `%s': %s"
+msgstr "Kan ikke opprette katalogen «%s»: %s"
+
+#: makeinfo/makeinfo.c:1525
+#, c-format
+msgid "No `%s' found in `%s'"
+msgstr "Ingen «%s» funnet i «%s»"
+
+#: makeinfo/makeinfo.c:1605
+#, c-format
+msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
+msgstr ""
+"%s: Hopper over makroekspansjon til stdout siden Info-output også sendes "
+"dit.\n"
+
+#: makeinfo/makeinfo.c:1638
+#, c-format
+msgid "Making %s file `%s' from `%s'.\n"
+msgstr "Lager %s-filen «%s» fra «%s».\n"
+
+#: makeinfo/makeinfo.c:1673
+#, c-format
+msgid "This is %s, produced by makeinfo version %s from %s.\n"
+msgstr "Dette er %s, produsert av makeinfo versjon %s fra %s.\n"
+
+#: makeinfo/makeinfo.c:1709
+#, c-format
+msgid ""
+"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
+msgstr ""
+"%s: Fjerner makroutskriftsfilen «%s» på grunn av feil; bruk --force for å "
+"bevare.\n"
+
+#: makeinfo/makeinfo.c:1773
+#, c-format
+msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
+msgstr ""
+"%s: Fjerner utskriftsfilen «%s» på grunn av feil; bruk --force for å "
+"bevare.\n"
+
+#: makeinfo/makeinfo.c:2034
+#, c-format
+msgid "Unknown command `%s'"
+msgstr "Ukjent kommando «%s»"
+
+#: makeinfo/makeinfo.c:2056
+#, c-format
+msgid "Use braces to give a command as an argument to @%s"
+msgstr "Bruk krøllparenteser for å gi en kommando som et argument til @%s"
+
+#: makeinfo/makeinfo.c:2314
+#, c-format
+msgid "%c%s expected braces"
+msgstr "%c%s forventet krøllparanteser"
+
+#: makeinfo/makeinfo.c:2327
+msgid "Unmatched }"
+msgstr "Umatchet }"
+
+#: makeinfo/makeinfo.c:2375
+msgid "NO_NAME!"
+msgstr "INTET_NAVN!"
+
+#: makeinfo/makeinfo.c:2396
+#, c-format
+msgid "%c%s missing close brace"
+msgstr "%c%s mangler avsluttende krøllparentes"
+
+#: makeinfo/makeinfo.c:3309
+#, c-format
+msgid "@image file `%s' (for HTML) not readable: %s"
+msgstr "@image-fil «%s» (for HTML) er uleselig: %s"
+
+#: makeinfo/makeinfo.c:3315
+#, c-format
+msgid "No such file `%s'"
+msgstr "«%s» er ingen fil"
+
+#: makeinfo/makeinfo.c:3447
+#, c-format
+msgid "@image file `%s' (for text) unreadable: %s"
+msgstr "@image-fil «%s» (for tekstformat) er uleselig: %s"
+
+#: makeinfo/makeinfo.c:3456
+msgid "@image missing filename argument"
+msgstr "@image mangler filnavn"
+
+#: makeinfo/makeinfo.c:3675
+#, c-format
+msgid "undefined flag: %s"
+msgstr "udefinert flagg: %s"
+
+#: makeinfo/makeinfo.c:3676
+#, c-format
+msgid "{No value for `%s'}"
+msgstr "{Ingen verdi for «%s»}"
+
+#: makeinfo/makeinfo.c:3728
+#, c-format
+msgid "%c%s requires a name"
+msgstr "%c%s krever et navn"
+
+#: makeinfo/makeinfo.c:3834
+#, c-format
+msgid "Reached eof before matching @end %s"
+msgstr "Traff slutt-på-filen før matchende @end %s"
+
+#: makeinfo/makeinfo.c:4082
+#, c-format
+msgid "`%.40s...' is too long for expansion; not expanded"
+msgstr "`%.40s...' er for lang for ekspansjon; ikke ekspandert"
+
+#: makeinfo/multi.c:116
+msgid "Missing } in @multitable template"
+msgstr "Manglende «}» i @multitable-mal"
+
+#: makeinfo/multi.c:254
+#, c-format
+msgid "ignoring stray text `%s' after @multitable"
+msgstr "ignorerer løs tekst «%s» etter @multitable"
+
+#: makeinfo/multi.c:393
+#, c-format
+msgid "Too many columns in multitable item (max %d)"
+msgstr "For mange kolonner i multitabellrad (maks %d)"
+
+#: makeinfo/multi.c:555
+#, c-format
+msgid "[unexpected] cannot select column #%d in multitable"
+msgstr "[uforventet] kan ikke velge kolonne #%d i multitabell"
+
+#: makeinfo/multi.c:584
+msgid "ignoring @tab outside of multitable"
+msgstr "ignorerer @tab utenfor multitabell"
+
+#: makeinfo/multi.c:632
+#, c-format
+msgid "** Multicolumn output from last row:\n"
+msgstr "** Multikolonne-output fra siste rad:\n"
+
+#: makeinfo/multi.c:635
+#, c-format
+msgid "* column #%d: output = %s\n"
+msgstr "* kolonne #%d output = %s\n"
+
+#: makeinfo/node.c:280
+#, c-format
+msgid "Node `%s' previously defined at line %d"
+msgstr "Noden «%s» er tidligere definert ved linje %d"
+
+#: makeinfo/node.c:648
+#, c-format
+msgid "Formatting node %s...\n"
+msgstr "Skriver noden %s...\n"
+
+#: makeinfo/node.c:716
+#, c-format
+msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
+msgstr "Noden «%s» krever en inndelingskommando (f.eks. %c%s)"
+
+#: makeinfo/node.c:879
+#, c-format
+msgid "No node name specified for `%c%s' command"
+msgstr "Ingen nodenavn spesifisert for «%c%s»-kommandoen"
+
+#: makeinfo/node.c:920 makeinfo/node.c:1151
+#, c-format
+msgid "Anchor `%s' and node `%s' map to the same file name"
+msgstr "Ankeret «%s» og noden «%s» blir knyttet til det samme filnavnet"
+
+#: makeinfo/node.c:923
+msgid "This @anchor command ignored; references to it will not work"
+msgstr ""
+"Denne @anchor-kommandoen ble ignorert, referanser til den vil ikke virke"
+
+#: makeinfo/node.c:925 makeinfo/node.c:1154
+msgid "Rename this anchor or use the `--no-split' option"
+msgstr "Omdøpe dette ankeret eller bruk «--no-split»-valget"
+
+#: makeinfo/node.c:955
+#, c-format
+msgid "Unexpected string at end of split-HTML file `%s'"
+msgstr "Uforventet streng ved slutten av splitt-HTML-fila «%s»"
+
+#: makeinfo/node.c:991
+msgid "Next:"
+msgstr "Neste:"
+
+#: makeinfo/node.c:1007
+msgid "Previous:"
+msgstr "Forrige:"
+
+#: makeinfo/node.c:1021
+msgid "Up:"
+msgstr "Opp:"
+
+#: makeinfo/node.c:1148
+#, c-format
+msgid "Anchors `%s' and `%s' map to the same file name"
+msgstr "Ankrene «%s» og «%s» peker til det samme filnavnet"
+
+#: makeinfo/node.c:1153
+msgid "@anchor command ignored; references to it will not work"
+msgstr "@anchor-kommando ignorert; referanser til den vil ikke virke"
+
+#: makeinfo/node.c:1347
+#, c-format
+msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
+msgstr ""
+"%s referanse til ikke-eksisterende node «%s» (kanskje ugyldig inndeling?)"
+
+#: makeinfo/node.c:1363
+msgid "Menu"
+msgstr "Meny"
+
+#: makeinfo/node.c:1365
+msgid "Cross"
+msgstr "Kryss"
+
+#: makeinfo/node.c:1447
+#, c-format
+msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
+msgstr ""
+"Nestefeltet til noden «%s» er ikke pekt på (kanskje ugyldig inndeling?)"
+
+#: makeinfo/node.c:1450
+#, c-format
+msgid "This node (%s) has the bad Prev"
+msgstr "Denne noden (%s) har den dårlige forrigepekeren"
+
+#: makeinfo/node.c:1462
+msgid "Prev"
+msgstr "forrige"
+
+#: makeinfo/node.c:1505
+#, c-format
+msgid "Prev field of node `%s' not pointed to"
+msgstr "Forrigefeltet til noden «%s» er ikke pekt på"
+
+#: makeinfo/node.c:1509
+#, c-format
+msgid "This node (%s) has the bad Next"
+msgstr "Denne noden (%s) har den dårlige nestepekeren"
+
+#: makeinfo/node.c:1521
+#, c-format
+msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
+msgstr "`%s' har ingen Up-felt (kanskje feil inndeling?)"
+
+#: makeinfo/node.c:1524
+msgid "Up"
+msgstr "opp"
+
+#: makeinfo/node.c:1590
+#, c-format
+msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
+msgstr "Noden «%s» mangler et menypunkt for «%s» selv om den er dens oppmål"
+
+#: makeinfo/node.c:1619
+#, c-format
+msgid "node `%s' has been referenced %d times"
+msgstr "noden «%s» har blitt referert %d ganger"
+
+#: makeinfo/node.c:1633
+#, c-format
+msgid "unreferenced node `%s'"
+msgstr "ureferert node «%s»"
+
+#: makeinfo/node.c:1723
+#, c-format
+msgid "Removing %s\n"
+msgstr "Fjerner %s\n"
+
+#: makeinfo/node.c:1727
+#, c-format
+msgid "Can't remove file `%s': %s"
+msgstr "Kan ikke slette filen «%s»: %s"
+
+#: makeinfo/sectioning.c:122
+#, c-format
+msgid "Appendix %c"
+msgstr "Vedlegg %c"
+
+#: makeinfo/sectioning.c:467
+#, c-format
+msgid "Internal error (search_sectioning) `%s'!"
+msgstr "Intern feil (search_sectioning) «%s»!"
+
+#: makeinfo/sectioning.c:562
+#, c-format
+msgid "Internal error (search_sectioning) \"%s\"!"
+msgstr "Intern feil (search_sectioning) «%s»!"
+
+#: makeinfo/sectioning.c:623
+#, c-format
+msgid "%c%s is obsolete; use %c%s instead"
+msgstr "%c%s er avlegs; bruk %c%s i stedet"
+
+#: makeinfo/sectioning.c:639
+#, c-format
+msgid "Node with %ctop as a section already exists"
+msgstr "Node med %ctop som en seksjon eksisterer allerede"
+
+#: makeinfo/sectioning.c:647
+#, c-format
+msgid "Here is the %ctop node"
+msgstr "Her er %ctop-noden"
+
+#: makeinfo/sectioning.c:663
+#, c-format
+msgid "%ctop used before %cnode, defaulting to %s"
+msgstr "%ctop brukt før %cnode, benytter %s"
+
+#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
+msgid "Table of Contents"
+msgstr "Innholdsfortegnelse"
+
+#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
+msgid "Short Contents"
+msgstr "Kort innholdsfortegnelse"
+
+#: makeinfo/xml.c:1605
+#, c-format
+msgid "@image file `%s' unreadable: %s"
+msgstr "@image-fil «%s» er uleselig: %s"
+
+#: makeinfo/xml.c:2097
+msgid ""
+"@headitem as the last item of @multitable produces invalid Docbook documents"
+msgstr ""
+"@headitem som siste punkt i en @multitable fører til uyldige DocBook-"
+"dokumenter"
+
+#: util/install-info.c:154
+#, c-format
+msgid "%s: warning: "
+msgstr "%s: advarsel: "
+
+#: util/install-info.c:203
+#, c-format
+msgid " for %s"
+msgstr " for %s"
+
+#: util/install-info.c:426
+#, c-format
+msgid "\tTry `%s --help' for a complete list of options.\n"
+msgstr "\tPrøv «%s --help» for en komplett liste over valg.\n"
+
+#: util/install-info.c:434
+#, c-format
+msgid ""
+"Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+"\n"
+"Install or delete dir entries from INFO-FILE in the Info directory file\n"
+"DIR-FILE.\n"
+"\n"
+"Options:\n"
+" --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
+"                     don't insert any new entries.\n"
+" --dir-file=NAME   specify file name of Info directory file.\n"
+"                     This is equivalent to using the DIR-FILE argument.\n"
+" --entry=TEXT      insert TEXT as an Info directory entry.\n"
+"                     TEXT should have the form of an Info menu item line\n"
+"                     plus zero or more extra lines starting with "
+"whitespace.\n"
+"                     If you specify more than one entry, they are all "
+"added.\n"
+"                     If you don't specify any entries, they are determined\n"
+"                     from information in the Info file itself.\n"
+" --help            display this help and exit.\n"
+" --info-file=FILE  specify Info file to install in the directory.\n"
+"                     This is equivalent to using the INFO-FILE argument.\n"
+" --info-dir=DIR    same as --dir-file=DIR/dir.\n"
+" --item=TEXT       same as --entry TEXT.\n"
+"                     An Info directory entry is actually a menu item.\n"
+" --quiet           suppress warnings.\n"
+" --remove          same as --delete.\n"
+" --section=SEC     put this file's entries in section SEC of the directory.\n"
+"                     If you specify more than one section, all the entries\n"
+"                     are added in each of the sections.\n"
+"                     If you don't specify any sections, they are determined\n"
+"                     from information in the Info file itself.\n"
+" --version         display version information and exit.\n"
+msgstr ""
+"Bruksmåte: %s [VALG]... [INFOFIL [DIRFIL]]\n"
+"\n"
+"Installere eller slette dir-innslag fra INFOFIL i Info-katalogfilen\n"
+"DIRFIL.\n"
+"\n"
+"Valg:\n"
+" --delete          slette eksisterende innslag for INFOFIL fra DIRFIL;\n"
+"                     ikke sett inn noe nye innslag.\n"
+" --dir-file=NAVN   angi filnavnet til Info-katalogfilen.\n"
+"                     Dette er det samme som å bruke DIRFIL-argumentet.\n"
+" --entry=TEKST     sette inn TEKST som en Info-kataloginnslag.\n"
+"                     TEKST bør ha form som et Info-menypunkt\n"
+"                     pluss null eller flere linjer som starter med "
+"whitespace.\n"
+"                     Dersom du angir mer enn et innslag, blir alle lagt "
+"til.\n"
+"                     Dersom du ikke angir noen innslag, blir de bestemt\n"
+"                     fra informasjon i selve Infofilen.\n"
+" --help            vise denne hjelpen og avslutte.\n"
+" --info-file=FIL   angi Infofilen som skal installeres i katalogen.\n"
+"                     Dette er det samme som å bruke INFOFIL-argumentet.\n"
+" --info-dir=DIR    det samme som --dir-file=DIR/dir.\n"
+" --item=TEKST      det samme som --entry TEKST.\n"
+"                     Et Info-kataloginnslag er egentlig et menypunkt.\n"
+" --quiet           undertrykke advarsler.\n"
+" --remove          det samme som --delete.\n"
+" --section=AVS     putte denne filens innslag i avsnittet AVS i katalogen.\n"
+"                     Dersom du angir mer enn et avsnitt, blir alle "
+"innslagene\n"
+"                     lagt til i hver av avsnittene.\n"
+"                     Dersom du ikke angir noen avsnitt, blir de bestemt\n"
+"                     fra informasjon i selve Infofilen.\n"
+" --version         vise programversjon og avslutte.\n"
+
+#: util/install-info.c:488
+#, c-format
+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"
+"%s\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"
+"  \"h\" gives a primer for first-timers,\n"
+"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+"\n"
+"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
+"  to select it.\n"
+"\n"
+"%s\n"
+msgstr ""
+"Dette er filen .../info/dir, som inneholder den øverste\n"
+"noden i Info-hierarkiet, kalt (dir)Top.\n"
+"Første gangen du starter Info begynner du i denne noden.\n"
+"\n"
+"%s\tDette er toppen av INFO-treet\n"
+"\n"
+"  Denne katalognoden gir en meny over alle hovedemner.\n"
+"  Inntasting av «q» avslutter, «?» lister alle Info-kommandoene, «d» "
+"returner hit,\n"
+"  «h» gir en innføring for nybegynnere,\n"
+"  «mEmacs<Return>» besøker Emacs-manualen, osv.\n"
+"\n"
+"  I Emacs kan du klikke med musknapp 2 på et menypunkt eller kryssreferanse\n"
+"  for å velge den.\n"
+"\n"
+"%s\n"
+
+#: util/install-info.c:513
+#, c-format
+msgid "%s: could not read (%s) and could not create (%s)\n"
+msgstr "%s: kunne ikke lese (%s) og kunne ikke opprette (%s)\n"
+
+#: util/install-info.c:600
+#, c-format
+msgid "%s: empty file"
+msgstr "%s: tom fil"
+
+#: util/install-info.c:913 util/install-info.c:953
+msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
+msgstr "START-INFO-DIR-ENTRY uten tilhørende END-INFO-DIR-ENTRY"
+
+#: util/install-info.c:948
+msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+msgstr "END-INFO-DIR-ENTRY uten tilhørende START-INFO-DIR-ENTRY"
+
+#: util/install-info.c:1191 util/install-info.c:1201
+#, c-format
+msgid "%s: already have dir file: %s\n"
+msgstr "%s: har allerede en dirfil: %s\n"
+
+#: util/install-info.c:1236
+#, c-format
+msgid "%s: Specify the Info file only once.\n"
+msgstr "%s: Spesifiser infofilen bare en gang.\n"
+
+#: util/install-info.c:1284
+#, c-format
+msgid "excess command line argument `%s'"
+msgstr "overflødig argument på kommandolinjen «%s»"
+
+#: util/install-info.c:1288
+msgid "No input file specified; try --help for more information."
+msgstr "Ingen innfil angitt; prøv --help for mer informasjon."
+
+#: util/install-info.c:1291
+msgid "No dir file specified; try --help for more information."
+msgstr "Ingen dir-fil angitt; prøv --help for mer informasjon."
+
+#: util/install-info.c:1313
+#, c-format
+msgid "no info dir entry in `%s'"
+msgstr "ingen info-dir-oppføring i «%s»"
+
+#: util/install-info.c:1426
+#, c-format
+msgid "menu item `%s' already exists, for file `%s'"
+msgstr "menypunktet «%s» eksisterer allerede for filen «%s»"
+
+#: util/install-info.c:1449
+#, c-format
+msgid "no entries found for `%s'; nothing deleted"
+msgstr "fant ingen oppføringer for «%s»; ingenting slettet"
+
+#: util/texindex.c:252
+msgid "display this help and exit"
+msgstr "vise denne hjelpen og avslutte"
+
+#: util/texindex.c:254
+msgid "keep temporary files around after processing"
+msgstr "bevar midlertidige filer etter behandling"
+
+#: util/texindex.c:256
+msgid "do not keep temporary files around after processing (default)"
+msgstr "ikke bevar midlertidige filer etter behandling (standard)"
+
+#: util/texindex.c:258
+msgid "send output to FILE"
+msgstr "sende utdata til FILE"
+
+#: util/texindex.c:260
+msgid "display version information and exit"
+msgstr "vise programversjon og avslutte"
+
+#: util/texindex.c:270
+#, c-format
+msgid "Usage: %s [OPTION]... FILE...\n"
+msgstr "Bruksmåte: %s [VALG]... FIL...\n"
+
+#: util/texindex.c:271
+#, c-format
+msgid "Generate a sorted index for each TeX output FILE.\n"
+msgstr "Generere en sortert indeks for hver TeX-outputfil.\n"
+
+#: util/texindex.c:274
+#, c-format
+msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
+msgstr ""
+"Vanligvis er FIL... angitt som «foo.%c%c» for et dokument «foo.texi».\n"
+
+#: util/texindex.c:276
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"Valg:\n"
+
+#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
+#: util/texindex.c:1011
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: ikke en texinfo-indeksfil"
+
+#: util/texindex.c:968
+#, c-format
+msgid "failure reopening %s"
+msgstr "feil ved gjenåpning av %s"
+
+#: util/texindex.c:1218
+#, c-format
+msgid "No page number in %s"
+msgstr "Ingen sidenummer i %s"
+
+#: util/texindex.c:1291
+#, c-format
+msgid "entry %s follows an entry with a secondary name"
+msgstr "oppføring %s følger en oppføring med et annet navn"
diff --git a/gnu/usr.bin/texinfo/po/nl.gmo b/gnu/usr.bin/texinfo/po/nl.gmo
index 0bf4b9e3b0f..81ecd32f915 100644
--- a/gnu/usr.bin/texinfo/po/nl.gmo
+++ b/gnu/usr.bin/texinfo/po/nl.gmo
diff --git a/gnu/usr.bin/texinfo/po/nl.po b/gnu/usr.bin/texinfo/po/nl.po
index 04cde1b3817..20ae5111ce1 100644
--- a/gnu/usr.bin/texinfo/po/nl.po
+++ b/gnu/usr.bin/texinfo/po/nl.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 3.12\n"
-"POT-Creation-Date: 2002-04-01 06:10-0800\n"
+"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
+"POT-Creation-Date: 2004-12-21 16:20-0800\n"
 "PO-Revision-Date: 1998-04-16 22:35+02:00\n"
 "Last-Translator: Ivo Timmermans <zarq@iname.com>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -13,139 +14,139 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: info/echo-area.c:283 info/session.c:712
+#: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr "Beweeg een teken naar voren"
 
-#: info/echo-area.c:295 info/session.c:728
+#: info/echo-area.c:296 info/session.c:705
 msgid "Move backward a character"
 msgstr "Beweeg een teken naar achteren"
 
-#: info/echo-area.c:307
+#: info/echo-area.c:308
 msgid "Move to the start of this line"
 msgstr "Ga naar het begin van deze regel"
 
-#: info/echo-area.c:312
+#: info/echo-area.c:313
 msgid "Move to the end of this line"
 msgstr "Ga naar het einde van deze regel"
 
-#: info/echo-area.c:320 info/session.c:746
+#: info/echo-area.c:321 info/session.c:723
 msgid "Move forward a word"
 msgstr "Beweeg een woord naar voren"
 
-#: info/echo-area.c:360 info/session.c:795
+#: info/echo-area.c:361 info/session.c:772
 msgid "Move backward a word"
 msgstr "Beweeg een woord naar achteren"
 
-#: info/echo-area.c:400
+#: info/echo-area.c:401
 msgid "Delete the character under the cursor"
 msgstr "Verwijder het teken onder de cursor"
 
-#: info/echo-area.c:430
+#: info/echo-area.c:431
 msgid "Delete the character behind the cursor"
 msgstr "Verwijder het teken achter de cursor"
 
-#: info/echo-area.c:451
+#: info/echo-area.c:452
 msgid "Cancel or quit operation"
 msgstr "Annuleer of beëindig operatie"
 
 # completion?
-#: info/echo-area.c:466
+#: info/echo-area.c:467
 msgid "Accept (or force completion of) this line"
 msgstr "Accepteer (of forceer voltooiïng van) deze regel"
 
-#: info/echo-area.c:471
+#: info/echo-area.c:472
 msgid "Insert next character verbatim"
 msgstr "Voeg volgend teken letterlijk in"
 
-#: info/echo-area.c:479
+#: info/echo-area.c:480
 msgid "Insert this character"
 msgstr "Voeg dit teken in"
 
-#: info/echo-area.c:497
+#: info/echo-area.c:498
 msgid "Insert a TAB character"
 msgstr "Voeg een TAB code in"
 
-#: info/echo-area.c:504
+#: info/echo-area.c:505
 msgid "Transpose characters at point"
 msgstr "Transponeer karakters op een punt"
 
 # kill?
-#: info/echo-area.c:555
+#: info/echo-area.c:556
 msgid "Yank back the contents of the last kill"
 msgstr "Zet de inhoud van de laatste kill terug"
 
-#: info/echo-area.c:562
+#: info/echo-area.c:563
 msgid "Kill ring is empty"
 msgstr "Kill ring is leeg"
 
 # kill?
-#: info/echo-area.c:575
+#: info/echo-area.c:576
 msgid "Yank back a previous kill"
 msgstr "Zet een eerdere kill terug"
 
 # kill?
-#: info/echo-area.c:608
+#: info/echo-area.c:609
 msgid "Kill to the end of the line"
 msgstr "Verwijder tot aan het einde van de regel"
 
 # kill?
-#: info/echo-area.c:621
+#: info/echo-area.c:622
 msgid "Kill to the beginning of the line"
 msgstr "Verwijder tot aan het begin van de regel"
 
 # kill?
-#: info/echo-area.c:633
+#: info/echo-area.c:634
 msgid "Kill the word following the cursor"
 msgstr "Verwijder het woord na de cursor"
 
 # kill?
-#: info/echo-area.c:652
+#: info/echo-area.c:653
 msgid "Kill the word preceding the cursor"
 msgstr "Verwijder het woord voor de cursor"
 
-#: info/echo-area.c:872 info/echo-area.c:932
+#: info/echo-area.c:868 info/echo-area.c:924
 msgid "No completions"
 msgstr "Geen voltooiïngen"
 
-#: info/echo-area.c:874
+#: info/echo-area.c:870
 msgid "Not complete"
 msgstr "Niet compleet"
 
-#: info/echo-area.c:919
+#: info/echo-area.c:911
 msgid "List possible completions"
 msgstr "Geef een lijst van mogelijke voltooiïngen"
 
-#: info/echo-area.c:936
+#: info/echo-area.c:928
 msgid "Sole completion"
 msgstr "Enige voltooiïng"
 
-#: info/echo-area.c:945
+#: info/echo-area.c:937
 msgid "One completion:\n"
 msgstr "Een voltooiïng:\n"
 
-#: info/echo-area.c:946
+#: info/echo-area.c:938
 #, c-format
 msgid "%d completions:\n"
 msgstr "%d voltooiïngen:\n"
 
-#: info/echo-area.c:1092
+#: info/echo-area.c:1085
 msgid "Insert completion"
 msgstr "Voeg voltooiïng in"
 
-#: info/echo-area.c:1225
+#: info/echo-area.c:1220
 msgid "Building completions..."
 msgstr "Voltooiïngen aan het bouwen..."
 
-#: info/echo-area.c:1342
+#: info/echo-area.c:1340
 msgid "Scroll the completions window"
 msgstr "Verschuif het voltooiïngsvenster"
 
-#: info/footnotes.c:212
+#: info/footnotes.c:213
 msgid "Footnotes could not be displayed"
 msgstr "De voetnoten konden niet weergegeven worden"
 
-#: info/footnotes.c:238
+#: info/footnotes.c:239
 msgid "Show the footnotes associated with this node in another window"
 msgstr ""
 "Laat de voetnoten zien die met deze pagina verbonden zijn in een ander "
@@ -158,96 +159,95 @@ msgstr ""
 "---------- Voetnoten ----------\n"
 "\n"
 
-#: info/indices.c:175
+#: info/indices.c:172
 msgid "Look up a string in the index for this file"
 msgstr "Zoek een string op in de index voor dit bestand"
 
-#: info/indices.c:205
+#: info/indices.c:199
 msgid "Finding index entries..."
 msgstr "Zoeken naar index ingangen..."
 
-#: info/indices.c:212
+#: info/indices.c:207
 msgid "No indices found."
 msgstr "Geen indices gevonden."
 
-#: info/indices.c:222
+#: info/indices.c:217
 msgid "Index entry: "
 msgstr "Index ingang: "
 
-#: info/indices.c:332
+#: info/indices.c:325
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr ""
 "Ga naar de volgende overeenkomende index-ingang van het laatste `\\[index-"
 "search]' commando"
 
-#: info/indices.c:342
+#: info/indices.c:335
 msgid "No previous index search string."
 msgstr "Geen eerdere index zoek string."
 
-#: info/indices.c:349
+#: info/indices.c:342
 msgid "No index entries."
 msgstr "Geen index ingangen."
 
-#: info/indices.c:382
-#, c-format
-msgid "No %sindex entries containing \"%s\"."
+#: info/indices.c:375
+#, fuzzy, c-format
+msgid "No %sindex entries containing `%s'."
 msgstr "Geen index ingangen %sdie \"%s\" bevatten."
 
-#: info/indices.c:383
+#: info/indices.c:376
 msgid "more "
 msgstr "meer "
 
-#: info/indices.c:393
+#: info/indices.c:386
 msgid "CAN'T SEE THIS"
 msgstr "KAN DIT NIET ZIEN"
 
-#: info/indices.c:429
-#, c-format
-msgid "Found \"%s\" in %s. (`\\[next-index-match]' tries to find next.)"
+#: info/indices.c:422
+#, fuzzy, c-format
+msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
 msgstr ""
 "\"%s\" gevonden in %s. (`\\[next-index-match]' probeert de volgende te "
 "vinden.)"
 
-#: info/indices.c:549
-#, c-format
-msgid "Scanning indices of \"%s\"..."
+#: info/indices.c:541
+#, fuzzy, c-format
+msgid "Scanning indices of `%s'..."
 msgstr "Zoeken in indices van \"%s\"..."
 
-#: info/indices.c:603
+#: info/indices.c:596
 #, c-format
-msgid "No available info files have \"%s\" in their indices."
+msgid "No available info files have `%s' in their indices."
 msgstr ""
 
-#: info/indices.c:632
+#: info/indices.c:622
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr ""
 "Doorzoek alle bekende indices van info-bestanden voor een string en maak een "
 "menu"
 
-#: info/indices.c:636
+#: info/indices.c:626
 msgid "Index apropos: "
 msgstr "Index apropos: "
 
-#: info/indices.c:666
-#, c-format
+#: info/indices.c:654
+#, fuzzy, c-format
 msgid ""
 "\n"
-"* Menu: Nodes whoses indices contain \"%s\":\n"
+"* Menu: Nodes whose indices contain `%s':\n"
 msgstr ""
 "\n"
 "* Menu: Pagina's waarvan de indices \"%s\" bevatten:\n"
 
-#: info/info.c:260 info/infokey.c:884
-#, fuzzy
+#: info/info.c:275 info/infokey.c:899
+#, fuzzy, c-format
 msgid "Try --help for more information.\n"
 msgstr "Probeer --help voor meer informatie."
 
-#: info/info.c:279 info/infokey.c:139 makeinfo/makeinfo.c:689
-#: util/install-info.c:1224 util/texindex.c:338
-#, c-format
+#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
+#: util/texindex.c:343
+#, 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"
@@ -257,16 +257,16 @@ msgstr ""
 "onder de voorwaarden van de GNU General Public License.\n"
 "Voor meer informatie hierover, zie de bestanden met de naam COPYING.\n"
 
-#: info/info.c:462
+#: info/info.c:498
 #, fuzzy, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "geen ingangen gevonden\n"
 
-#: info/info.c:555
+#: info/info.c:590
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
 msgstr ""
 
-#: info/info.c:562
+#: info/info.c:597
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -283,10 +283,12 @@ msgid ""
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
 "  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
-"  -R, --raw-escapes            don't remove ANSI escapes from man pages.\n"
+"  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+"      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
 "  -O, --show-options, --usage  go to command-line options node.\n"
 "%s      --subnodes               recursively output menu items.\n"
+"  -w, --where, --location      print physical location of Info file.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
 "\n"
@@ -332,8 +334,8 @@ msgstr ""
 "Meld fouten in het programma aan bug-texinfo@gnu.org;\n"
 "meld onjuistheden in de vertaling aan nl@li.org."
 
-#: info/info.c:598 info/infokey.c:903 makeinfo/makeinfo.c:474
-#: util/install-info.c:421 util/texindex.c:286
+#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
+#: util/install-info.c:466 util/texindex.c:292
 msgid ""
 "\n"
 "Email bug reports to bug-texinfo@gnu.org,\n"
@@ -341,167 +343,167 @@ msgid ""
 "Texinfo home page: http://www.gnu.org/software/texinfo/"
 msgstr ""
 
-#: info/info.c:632
+#: info/info.c:669
 #, fuzzy, c-format
 msgid "Cannot find node `%s'."
 msgstr "Kan pagina `%s' niet verwijderen"
 
-#: info/info.c:633
+#: info/info.c:670
 #, fuzzy, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "Kan pagina `%s' niet verwijderen"
 
-#: info/info.c:634
+#: info/info.c:671
 #, fuzzy
 msgid "Cannot find a window!"
 msgstr "Kan een permanent venster niet verwijderen"
 
-#: info/info.c:635
+#: info/info.c:672
 msgid "Point doesn't appear within this window's node!"
 msgstr ""
 
-#: info/info.c:636
+#: info/info.c:673
 #, fuzzy
 msgid "Cannot delete the last window."
 msgstr "Kan een permanent venster niet verwijderen"
 
-#: info/info.c:637
+#: info/info.c:674
 #, fuzzy
 msgid "No menu in this node."
 msgstr "Er is geen menu op deze pagina."
 
-#: info/info.c:638
+#: info/info.c:675
 #, fuzzy
 msgid "No footnotes in this node."
 msgstr "Geen verwijzingen in deze pagina."
 
-#: info/info.c:639
+#: info/info.c:676
 msgid "No cross references in this node."
 msgstr "Geen verwijzingen in deze pagina."
 
-#: info/info.c:640
+#: info/info.c:677
 #, fuzzy, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Geen \"Volgende\" wijzer voor deze pagina."
 
-#: info/info.c:641
+#: info/info.c:678
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr ""
 
-#: info/info.c:642
+#: info/info.c:679
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr ""
 
-#: info/info.c:643
+#: info/info.c:680
 #, fuzzy
 msgid "You are already at the last page of this node."
 msgstr "Ga naar het begin van deze pagina"
 
-#: info/info.c:644
+#: info/info.c:681
 #, fuzzy
 msgid "You are already at the first page of this node."
 msgstr "Ga naar het begin van deze pagina"
 
-#: info/info.c:645
+#: info/info.c:682
 msgid "Only one window."
 msgstr ""
 
-#: info/info.c:646
+#: info/info.c:683
 msgid "Resulting window would be too small."
 msgstr ""
 
-#: info/info.c:647
+#: info/info.c:684
 msgid "Not enough room for a help window, please delete a window."
 msgstr ""
 
-#: info/infodoc.c:45 info/infodoc.c:94
+#: info/infodoc.c:46 info/infodoc.c:95
 #, fuzzy
 msgid ""
 "Basic Commands in Info Windows\n"
 "******************************\n"
 msgstr "Basiscommando's in Info Vensters"
 
-#: info/infodoc.c:48
+#: info/infodoc.c:49
 #, fuzzy
 msgid "\\%-10[quit-help]  Quit this help.\n"
 msgstr "Geen \"Vorige\" voor deze pagina."
 
-#: info/infodoc.c:49
+#: info/infodoc.c:50
 msgid "\\%-10[quit]  Quit Info altogether.\n"
 msgstr ""
 
-#: info/infodoc.c:50
+#: info/infodoc.c:51
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
 msgstr ""
 
-#: info/infodoc.c:52 info/infodoc.c:101
+#: info/infodoc.c:53 info/infodoc.c:102
 #, fuzzy
 msgid ""
 "Selecting other nodes:\n"
 "----------------------\n"
 msgstr "Selecteer de `Vorige' pagina"
 
-#: info/infodoc.c:54
+#: info/infodoc.c:55
 #, fuzzy
 msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
 msgstr "Ga naar het einde van deze pagina"
 
-#: info/infodoc.c:55
+#: info/infodoc.c:56
 #, fuzzy
 msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
 msgstr "Ga naar het einde van deze pagina"
 
-#: info/infodoc.c:56
+#: info/infodoc.c:57
 #, fuzzy
 msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
 msgstr "Geen \"Vorige\" voor deze pagina."
 
-#: info/infodoc.c:57
+#: info/infodoc.c:58
 msgid ""
 "\\%-10[menu-item]  Pick menu item specified by name.\n"
 "              Picking a menu item causes another node to be selected.\n"
 msgstr ""
 
-#: info/infodoc.c:59
+#: info/infodoc.c:60
 msgid ""
 "\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
 msgstr ""
 
-#: info/infodoc.c:60
+#: info/infodoc.c:61
 #, fuzzy
 msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
 msgstr "Selecteer de laatste pagina in dit bestand"
 
-#: info/infodoc.c:61
+#: info/infodoc.c:62
 msgid ""
 "\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
 msgstr ""
 
-#: info/infodoc.c:62
+#: info/infodoc.c:63
 msgid ""
 "\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
 "node.\n"
 msgstr ""
 
-#: info/infodoc.c:63
+#: info/infodoc.c:64
 msgid ""
 "\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
 msgstr ""
 
-#: info/infodoc.c:64
+#: info/infodoc.c:65
 msgid ""
 "\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
 "node] (DIR)'.\n"
 msgstr ""
 
-#: info/infodoc.c:65
+#: info/infodoc.c:66
 msgid ""
 "\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
 msgstr ""
 
-#: info/infodoc.c:67 info/infodoc.c:115
+#: info/infodoc.c:68 info/infodoc.c:116
 #, fuzzy
 msgid ""
 "Moving within a node:\n"
@@ -510,54 +512,54 @@ msgstr ""
 "---------- Voetnoten ----------\n"
 "\n"
 
-#: info/infodoc.c:69
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
-msgstr ""
-
-#: info/infodoc.c:70
-#, fuzzy
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
-msgstr "Schuif terug in dit venster"
-
 # kill?
-#: info/infodoc.c:71
+#: info/infodoc.c:70
 #, fuzzy
 msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
 msgstr "Verwijder tot aan het begin van de regel"
 
-#: info/infodoc.c:72
+#: info/infodoc.c:71
 #, fuzzy
 msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
 msgstr "Ga naar het einde van deze pagina"
 
+#: info/infodoc.c:72
+#, fuzzy
+msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
+msgstr "Schuif terug in dit venster"
+
 #: info/infodoc.c:73
 #, fuzzy
-msgid "\\%-10[scroll-forward]  Scroll forward 1 line.\n"
+msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
 msgstr "Schuif terug in dit venster"
 
 #: info/infodoc.c:74
+msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
+msgstr ""
+
+#: info/infodoc.c:75
 #, fuzzy
-msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
+msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
 msgstr "Schuif terug in dit venster"
 
-#: info/infodoc.c:76 info/infodoc.c:124
+#: info/infodoc.c:77 info/infodoc.c:125
 #, fuzzy
 msgid ""
 "Other commands:\n"
 "---------------\n"
 msgstr "Waar is het commando: "
 
-#: info/infodoc.c:78
+#: info/infodoc.c:79
 #, fuzzy
 msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
 msgstr "Selecteer de laatste keuze in het menu van deze pagina"
 
-#: info/infodoc.c:79
+#: info/infodoc.c:80
 #, fuzzy
 msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
 msgstr "Selecteer de laatste keuze in het menu van deze pagina"
 
-#: info/infodoc.c:80
+#: info/infodoc.c:81
 msgid ""
 "\\%-10[index-search]  Search for a specified string in the index entries of "
 "this Info\n"
@@ -565,190 +567,190 @@ msgid ""
 "found.\n"
 msgstr ""
 
-#: info/infodoc.c:82
+#: info/infodoc.c:83
 msgid ""
 "\\%-10[goto-node]  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr ""
 
-#: info/infodoc.c:84
+#: info/infodoc.c:85
 msgid ""
 "\\%-10[search]  Search forward for a specified string\n"
 "              and select the node in which the next occurrence is found.\n"
 msgstr ""
 
-#: info/infodoc.c:86
+#: info/infodoc.c:87
 msgid ""
 "\\%-10[search-backward]  Search backward for a specified string\n"
 "              and select the node in which the previous occurrence is "
 "found.\n"
 msgstr ""
 
-#: info/infodoc.c:97
+#: info/infodoc.c:98
 #, fuzzy, c-format
 msgid "  %-10s  Quit this help.\n"
 msgstr "Geen \"Vorige\" voor deze pagina."
 
-#: info/infodoc.c:98
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr ""
 
-#: info/infodoc.c:99
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr ""
 
-#: info/infodoc.c:103
+#: info/infodoc.c:104
 #, fuzzy, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
 msgstr "Ga naar het einde van deze pagina"
 
-#: info/infodoc.c:104
+#: info/infodoc.c:105
 #, fuzzy, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
 msgstr "Ga naar het einde van deze pagina"
 
-#: info/infodoc.c:105
+#: info/infodoc.c:106
 #, fuzzy, c-format
 msgid "  %-10s  Move `up' from this node.\n"
 msgstr "Geen \"Vorige\" voor deze pagina."
 
-#: info/infodoc.c:106
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Pick menu item specified by name.\n"
 msgstr ""
 
-#: info/infodoc.c:107
+#: info/infodoc.c:108
 msgid "              Picking a menu item causes another node to be selected.\n"
 msgstr ""
 
-#: info/infodoc.c:108
+#: info/infodoc.c:109
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
 msgstr ""
 
-#: info/infodoc.c:109
+#: info/infodoc.c:110
 #, fuzzy, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
 msgstr "Selecteer de laatste pagina in dit bestand"
 
-#: info/infodoc.c:110
+#: info/infodoc.c:111
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
 msgstr ""
 
-#: info/infodoc.c:111
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
 msgstr ""
 
-#: info/infodoc.c:112
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
 msgstr ""
 
-#: info/infodoc.c:113
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
 msgstr ""
 
-#: info/infodoc.c:117
+#: info/infodoc.c:118
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
 msgstr ""
 
-#: info/infodoc.c:118
+#: info/infodoc.c:119
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
 msgstr ""
 
 # kill?
-#: info/infodoc.c:119
+#: info/infodoc.c:120
 #, fuzzy, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
 msgstr "Verwijder tot aan het begin van de regel"
 
-#: info/infodoc.c:120
+#: info/infodoc.c:121
 #, fuzzy, c-format
 msgid "  %-10s  Go to the end of this node.\n"
 msgstr "Ga naar het einde van deze pagina"
 
-#: info/infodoc.c:121
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
 msgstr ""
 
-#: info/infodoc.c:122
+#: info/infodoc.c:123
 #, fuzzy, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
 msgstr "Schuif terug in dit venster"
 
-#: info/infodoc.c:126
+#: info/infodoc.c:127
 #, fuzzy, c-format
 msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
 msgstr "Selecteer de laatste keuze in het menu van deze pagina"
 
-#: info/infodoc.c:127
+#: info/infodoc.c:128
 #, fuzzy, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
 msgstr "Selecteer de laatste keuze in het menu van deze pagina"
 
-#: info/infodoc.c:128
+#: info/infodoc.c:129
 #, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
 msgstr ""
 
-#: info/infodoc.c:129
+#: info/infodoc.c:130
 msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
 msgstr ""
 
-#: info/infodoc.c:130
+#: info/infodoc.c:131
 #, c-format
 msgid "  %-10s  Move to node specified by name.\n"
 msgstr ""
 
-#: info/infodoc.c:131
+#: info/infodoc.c:132
 msgid ""
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr ""
 
-#: info/infodoc.c:132
+#: info/infodoc.c:133
 #, c-format
 msgid "  %-10s  Search forward for a specified string,\n"
 msgstr ""
 
-#: info/infodoc.c:133 info/infodoc.c:135
+#: info/infodoc.c:134 info/infodoc.c:136
 msgid ""
 "              and select the node in which the next occurrence is found.\n"
 msgstr ""
 
-#: info/infodoc.c:134
+#: info/infodoc.c:135
 #, fuzzy, c-format
 msgid "  %-10s  Search backward for a specified string\n"
 msgstr "Schuif terug in dit venster"
 
-#: info/infodoc.c:313
+#: info/infodoc.c:316
 msgid "The current search path is:\n"
 msgstr ""
 
-#: info/infodoc.c:316
+#: info/infodoc.c:320
 #, fuzzy
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
 msgstr "Basiscommando's in Info Vensters"
 
-#: info/infodoc.c:319
+#: info/infodoc.c:324
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
 msgstr ""
 
-#: info/infodoc.c:340
+#: info/infodoc.c:347
 #, fuzzy, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
@@ -757,7 +759,7 @@ msgstr ""
 "De volgende commando's kunnen alleen aangeroepen worden via M-x:\n"
 "\n"
 
-#: info/infodoc.c:343
+#: info/infodoc.c:351
 #, fuzzy
 msgid ""
 "The following commands cannot be invoked at all:\n"
@@ -766,158 +768,171 @@ msgstr ""
 "De volgende commando's kunnen alleen aangeroepen worden via M-x:\n"
 "\n"
 
-#: info/infodoc.c:367
+#: info/infodoc.c:375
 msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
 msgstr ""
 "--- Gebruik `\\[history-node]' of `\\[kill-node]' om te beëindigen ---\n"
 
-#: info/infodoc.c:477
+#: info/infodoc.c:485
 msgid "Display help message"
 msgstr "Geef een help boodschap"
 
-#: info/infodoc.c:495
+#: info/infodoc.c:503
 msgid "Visit Info node `(info)Help'"
 msgstr "Ga naar Info pagina `(info)Help'"
 
-#: info/infodoc.c:638
+#: info/infodoc.c:641
 msgid "Print documentation for KEY"
 msgstr "Geef uitleg over KEY"
 
-#: info/infodoc.c:650
+#: info/infodoc.c:653
 #, c-format
 msgid "Describe key: %s"
 msgstr "Omschrijf toets: %s"
 
-#: info/infodoc.c:660
+#: info/infodoc.c:664
 #, c-format
 msgid "ESC %s is undefined."
 msgstr "ESC %s is niet gedefinieerd."
 
-#: info/infodoc.c:676 info/infodoc.c:703
+#: info/infodoc.c:680 info/infodoc.c:709
 #, c-format
 msgid "%s is undefined."
 msgstr "%s is niet gedefinieerd."
 
-#: info/infodoc.c:724
+#: info/infodoc.c:730
 #, c-format
 msgid "%s is defined to %s."
 msgstr "%s is gedefinieerd als %s."
 
-#: info/infodoc.c:1151
+#: info/infodoc.c:1153
 msgid "Show what to type to execute a given command"
 msgstr ""
 
-#: info/infodoc.c:1155
+#: info/infodoc.c:1157
 msgid "Where is command: "
 msgstr "Waar is het commando: "
 
-#: info/infodoc.c:1177
+#: info/infodoc.c:1179
 #, c-format
 msgid "`%s' is not on any keys"
 msgstr "`%s' is niet toegekend aan een toets"
 
-#: info/infodoc.c:1183
+#: info/infodoc.c:1186
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr "%s kan alleen aangeroepen worden via %s."
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1190
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr "%s kan aangeroepen worden via %s."
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1195
 #, c-format
 msgid "There is no function named `%s'"
 msgstr "Er is geen functie met de naam `%s'"
 
-#: info/infokey.c:164
+#: info/infokey.c:145
+#, 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 (C) %s Free Software Foundation, Inc.\n"
+"Er is GEEN garantie.  Je mag deze programmatuur herdistribueren\n"
+"onder de voorwaarden van de GNU General Public License.\n"
+"Voor meer informatie hierover, zie de bestanden met de naam COPYING.\n"
+
+#: info/infokey.c:170
 msgid "incorrect number of arguments"
 msgstr ""
 
-#: info/infokey.c:194
+#: info/infokey.c:201
 #, fuzzy, c-format
 msgid "cannot open input file `%s'"
 msgstr "Kan pijp naar \"%s\" niet openen."
 
-#: info/infokey.c:207
+#: info/infokey.c:215
 #, fuzzy, c-format
 msgid "cannot create output file `%s'"
 msgstr "Kan uitvoerbestand \"%s\" niet vinden."
 
-#: info/infokey.c:217
+#: info/infokey.c:226
 #, c-format
 msgid "error writing to `%s'"
 msgstr ""
 
-#: info/infokey.c:222
+#: info/infokey.c:232
 #, fuzzy, c-format
 msgid "error closing output file `%s'"
 msgstr "Kan uitvoerbestand \"%s\" niet vinden."
 
-#: info/infokey.c:443
+#: info/infokey.c:450
 msgid "key sequence too long"
 msgstr ""
 
-#: info/infokey.c:521
+#: info/infokey.c:529
 msgid "missing key sequence"
 msgstr ""
 
-#: info/infokey.c:600
+#: info/infokey.c:610
 msgid "NUL character (\\000) not permitted"
 msgstr ""
 
-#: info/infokey.c:629
+#: info/infokey.c:641
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr ""
 
-#: info/infokey.c:652
+#: info/infokey.c:665
 #, fuzzy
 msgid "missing action name"
 msgstr "%c%s ontbrekende afsluitende accolade"
 
-#: info/infokey.c:667 info/infokey.c:733
+#: info/infokey.c:681 info/infokey.c:756
 msgid "section too long"
 msgstr ""
 
-#: info/infokey.c:673
+#: info/infokey.c:688
 #, fuzzy, c-format
 msgid "unknown action `%s'"
 msgstr "Onbekend commando `%s'"
 
-#: info/infokey.c:682
+#: info/infokey.c:698
 msgid "action name too long"
 msgstr ""
 
-#: info/infokey.c:694
+#: info/infokey.c:712
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr ""
 
-#: info/infokey.c:704
+#: info/infokey.c:723
 #, fuzzy
 msgid "missing variable name"
 msgstr "%s: ontbrekend bestandsargument\n"
 
-#: info/infokey.c:712
+#: info/infokey.c:733
 msgid "missing `=' immediately after variable name"
 msgstr ""
 
-#: info/infokey.c:719
+#: info/infokey.c:741
 msgid "variable name too long"
 msgstr ""
 
-#: info/infokey.c:741
+#: info/infokey.c:765
 msgid "value too long"
 msgstr ""
 
-#: info/infokey.c:875
+#: info/infokey.c:890
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr ""
 
-#: info/infokey.c:891
+#: info/infokey.c:906
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -931,78 +946,84 @@ msgid ""
 "  --version            display version information and exit.\n"
 msgstr ""
 
-#: info/infomap.c:1397
+#: info/infomap.c:1500
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
 msgstr ""
 
-#: info/infomap.c:1400
+#: info/infomap.c:1503
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
 msgstr ""
 
-#: info/infomap.c:1413
+#: info/infomap.c:1516
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
 msgstr ""
 
-#: info/infomap.c:1431
+#: info/infomap.c:1535
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1437
+#: info/infomap.c:1544
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1450
+#: info/infomap.c:1560
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1470
+#: info/infomap.c:1581
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1608
+#: info/infomap.c:1716
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr ""
 
-#: info/infomap.c:1659
+#: info/infomap.c:1766
 msgid "Bad data in infokey file -- some var settings ignored"
 msgstr ""
 
-#: info/m-x.c:70
+#: info/m-x.c:69
 msgid "Read the name of an Info command and describe it"
 msgstr "Lees de naam van een Info commando en geef een omschrijving"
 
-#: info/m-x.c:74
+#: info/m-x.c:73
 msgid "Describe command: "
 msgstr "Omschrijf commando: "
 
-#: info/m-x.c:97
+#: info/m-x.c:96
 msgid "Read a command name in the echo area and execute it"
 msgstr "Lees de naam van een commando in de weergeefruimte en voer dat uit"
 
-#: info/m-x.c:141
+#: info/m-x.c:140
 msgid "Cannot execute an `echo-area' command here."
 msgstr "Kan hier geen `echo-area' commando uitvoeren."
 
-#: info/m-x.c:157
+#: info/m-x.c:154
+#, fuzzy, c-format
+msgid "Undefined command: %s"
+msgstr "Onbekend commando `%s'"
+
+#: info/m-x.c:160
 msgid "Set the height of the displayed window"
 msgstr "Zet de hoogte van het weergegeven venster"
 
-#: info/m-x.c:170
+#: info/m-x.c:173
 #, c-format
 msgid "Set screen height to (%d): "
 msgstr "Zet schermhoogte op (%d): "
 
-#: info/makedoc.c:161 info/makedoc.c:169
+#: info/makedoc.c:162 info/makedoc.c:170
+#, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
 "\n"
@@ -1010,12 +1031,12 @@ msgstr ""
 "   Bronbestanden veranderd om dit bestand in te voegen:\n"
 "\n"
 
-#: info/makedoc.c:553
+#: info/makedoc.c:550
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "Kon het bestand %s niet manipuleren.\n"
 
-#: info/nodemenu.c:28
+#: info/nodemenu.c:31
 msgid ""
 "\n"
 "* Menu:\n"
@@ -1027,7 +1048,7 @@ msgstr ""
 "  (Bestand)Pagina                  Regels Grootte   Bevat Bestand\n"
 "  ---------------                   -----   ----   ---------------"
 
-#: info/nodemenu.c:199
+#: info/nodemenu.c:202
 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"
@@ -1036,24 +1057,24 @@ msgstr ""
 "Selecteer er een uit dit menu, of gebruik `\\[history-node]' in een ander "
 "venster.\n"
 
-#: info/nodemenu.c:219
+#: info/nodemenu.c:224
 msgid "Make a window containing a menu of all of the currently visited nodes"
 msgstr "Maak een venster met een menu van alle bekeken pagina's"
 
-#: info/nodemenu.c:299
+#: info/nodemenu.c:304
 msgid "Select a node which has been previously visited in a visible window"
 msgstr "Selecteer een pagina die voorheen bekeken is in een zichtbaar venster"
 
-#: info/nodemenu.c:311
+#: info/nodemenu.c:317
 msgid "Select visited node: "
 msgstr "Selecteer een bezochte pagina: "
 
-#: info/nodemenu.c:331 info/session.c:2235
+#: info/nodemenu.c:337 info/session.c:2264
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr "De verwijzing is verdwenen! (%s)."
 
-#: info/session.c:170
+#: info/session.c:162
 #, fuzzy, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1062,460 +1083,460 @@ msgstr ""
 "Welkom bij Info versie %s. \"\\[get-help-window]\" voor hulp, \"\\[menu-item]"
 "\" voor een menukeuze."
 
-#: info/session.c:643
+#: info/session.c:620
 msgid "Move down to the next line"
 msgstr "Ga naar de volgende regel"
 
-#: info/session.c:658
+#: info/session.c:635
 msgid "Move up to the previous line"
 msgstr "Ga naar de vorige regel"
 
-#: info/session.c:673
+#: info/session.c:650
 msgid "Move to the end of the line"
 msgstr "Ga naar het einde van de regel"
 
-#: info/session.c:693
+#: info/session.c:670
 msgid "Move to the start of the line"
 msgstr "Ga naar het begin van de regel"
 
-#: info/session.c:885 makeinfo/node.c:1357
+#: info/session.c:860 makeinfo/node.c:1424
 #, fuzzy
 msgid "Next"
 msgstr "Volgende"
 
-#: info/session.c:888
+#: info/session.c:863
 #, fuzzy
 msgid "Following Next node..."
 msgstr "\"Volgende\" pagina aan het volgen..."
 
-#: info/session.c:905
+#: info/session.c:881
 msgid "Selecting first menu item..."
 msgstr "Ik selecteer de eerste keuze uit het menu..."
 
-#: info/session.c:916
+#: info/session.c:893
 #, fuzzy
 msgid "Selecting Next node..."
 msgstr "Ik selecteer de \"Volgende\" pagina..."
 
-#: info/session.c:986
+#: info/session.c:964
 #, c-format
 msgid "Moving Up %d time(s), then Next."
 msgstr ""
 
-#: info/session.c:1010
+#: info/session.c:988
 #, fuzzy
 msgid "No more nodes within this document."
 msgstr "Geen verwijzingen in deze pagina."
 
-#: info/session.c:1034
+#: info/session.c:1011
 #, fuzzy
 msgid "No `Prev' for this node."
 msgstr "Geen \"Vorige\" voor deze pagina."
 
-#: info/session.c:1037 info/session.c:1092
+#: info/session.c:1014 info/session.c:1073
 #, fuzzy
 msgid "Moving Prev in this window."
 msgstr "Ik beweeg \"Vorige\" naar dit venster."
 
-#: info/session.c:1051
+#: info/session.c:1030
 #, fuzzy
 msgid "No `Prev' or `Up' for this node within this document."
 msgstr "Geen \"Vorige\" of \"Omhoog\" voor deze pagina."
 
-#: info/session.c:1054
+#: info/session.c:1034
 #, fuzzy
 msgid "Moving Up in this window."
 msgstr "Ik ga \"Omhoog\" in dit venster."
 
-#: info/session.c:1102
+#: info/session.c:1084
 #, fuzzy
 msgid "Moving to `Prev's last menu item."
 msgstr "Ik ga naar de laatste keuze van het menu van \"Vorige\"."
 
-#: info/session.c:1113
+#: info/session.c:1095
 msgid "Move forwards or down through node structure"
 msgstr "Beweeg naar voren of beneden door de paginastructuur"
 
-#: info/session.c:1129
+#: info/session.c:1111
 msgid "Move backwards or up through node structure"
 msgstr "Beweeg naar achteren of boven door de paginastructuur"
 
-#: info/session.c:1229
+#: info/session.c:1205
 msgid "Scroll forward in this window"
 msgstr "Schuif verder in dit venster"
 
-#: info/session.c:1237
+#: info/session.c:1213
 #, fuzzy
 msgid "Scroll forward in this window and set default window size"
 msgstr "Schuif verder in dit venster"
 
-#: info/session.c:1245
+#: info/session.c:1221
 #, fuzzy
 msgid "Scroll forward in this window staying within node"
 msgstr "Schuif verder in dit venster"
 
-#: info/session.c:1253
+#: info/session.c:1229
 #, fuzzy
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr "Schuif verder in dit venster"
 
-#: info/session.c:1261
+#: info/session.c:1237
 msgid "Scroll backward in this window"
 msgstr "Schuif terug in dit venster"
 
-#: info/session.c:1269
+#: info/session.c:1245
 #, fuzzy
 msgid "Scroll backward in this window and set default window size"
 msgstr "Schuif terug in dit venster"
 
-#: info/session.c:1278
+#: info/session.c:1254
 #, fuzzy
 msgid "Scroll backward in this window staying within node"
 msgstr "Schuif terug in dit venster"
 
-#: info/session.c:1286
+#: info/session.c:1262
 #, fuzzy
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
 msgstr "Schuif terug in dit venster"
 
-#: info/session.c:1294
+#: info/session.c:1270
 msgid "Move to the start of this node"
 msgstr "Ga naar het begin van deze pagina"
 
-#: info/session.c:1301
+#: info/session.c:1277
 msgid "Move to the end of this node"
 msgstr "Ga naar het einde van deze pagina"
 
-#: info/session.c:1308
+#: info/session.c:1284
 msgid "Scroll down by lines"
 msgstr ""
 
-#: info/session.c:1325
+#: info/session.c:1301
 msgid "Scroll up by lines"
 msgstr ""
 
-#: info/session.c:1343
+#: info/session.c:1319
 msgid "Scroll down by half screen size"
 msgstr ""
 
-#: info/session.c:1369
+#: info/session.c:1345
 msgid "Scroll up by half screen size"
 msgstr ""
 
-#: info/session.c:1398
+#: info/session.c:1374
 msgid "Select the next window"
 msgstr "Selecteer het volgende venster"
 
-#: info/session.c:1437
+#: info/session.c:1413
 msgid "Select the previous window"
 msgstr "Selecteer het vorige venster"
 
-#: info/session.c:1488
+#: info/session.c:1464
 msgid "Split the current window"
 msgstr "Splits het huidige venster"
 
-#: info/session.c:1569
+#: info/session.c:1545
 msgid "Delete the current window"
 msgstr "Verwijder het huidige venster"
 
-#: info/session.c:1577
+#: info/session.c:1553
 msgid "Cannot delete a permanent window"
 msgstr "Kan een permanent venster niet verwijderen"
 
-#: info/session.c:1610
+#: info/session.c:1585
 msgid "Delete all other windows"
 msgstr "Verwijder alle andere vensters"
 
-#: info/session.c:1656
+#: info/session.c:1631
 msgid "Scroll the other window"
 msgstr "Verschuif het andere venster"
 
-#: info/session.c:1677
+#: info/session.c:1652
 #, fuzzy
 msgid "Scroll the other window backward"
 msgstr "Verschuif het andere venster"
 
-#: info/session.c:1683
+#: info/session.c:1658
 msgid "Grow (or shrink) this window"
 msgstr "Vergroot (of verklein) dit venster"
 
-#: info/session.c:1694
+#: info/session.c:1669
 msgid "Divide the available screen space among the visible windows"
 msgstr "Verdeel de beschikbare schermruimte tussen de zichtbare vensters"
 
-#: info/session.c:1701
+#: info/session.c:1676
 msgid "Toggle the state of line wrapping in the current window"
 msgstr "Verander de status van regeldoorlopen in het huidige venster"
 
-#: info/session.c:1880
+#: info/session.c:1848
 #, fuzzy
 msgid "Select the Next node"
 msgstr "Selecteer de `Volgende' pagina"
 
-#: info/session.c:1888
+#: info/session.c:1856
 #, fuzzy
 msgid "Select the Prev node"
 msgstr "Selecteer de `Vorige' pagina"
 
-#: info/session.c:1896
+#: info/session.c:1864
 #, fuzzy
 msgid "Select the Up node"
 msgstr "Selecteer de `Omhoog' pagina"
 
-#: info/session.c:1903
+#: info/session.c:1871
 msgid "Select the last node in this file"
 msgstr "Selecteer de laatste pagina in dit bestand"
 
-#: info/session.c:1930 info/session.c:1963
+#: info/session.c:1898 info/session.c:1931
 msgid "This window has no additional nodes"
 msgstr "Dit venster heeft geen extra pagina's"
 
-#: info/session.c:1936
+#: info/session.c:1904
 msgid "Select the first node in this file"
 msgstr "Selecteer de eerste pagina in dit bestand"
 
-#: info/session.c:1970
+#: info/session.c:1938
 msgid "Select the last item in this node's menu"
 msgstr "Selecteer de laatste keuze in het menu van deze pagina"
 
-#: info/session.c:1976
+#: info/session.c:1944
 msgid "Select this menu item"
 msgstr "Selecteer deze menukeuze"
 
-#: info/session.c:2005
+#: info/session.c:1977
 #, c-format
 msgid "There aren't %d items in this menu."
 msgstr "Er zijn geen %d keuzes in dit menu."
 
-#: info/session.c:2148
+#: info/session.c:2171 info/session.c:2172
 #, c-format
 msgid "Menu item (%s): "
 msgstr "Menukeuze (%s): "
 
-#: info/session.c:2150
+#: info/session.c:2175
 msgid "Menu item: "
 msgstr "Menukeuze: "
 
-#: info/session.c:2155
+#: info/session.c:2182 info/session.c:2183
 #, c-format
 msgid "Follow xref (%s): "
 msgstr "Volg verwijzing (%s): "
 
-#: info/session.c:2157
+#: info/session.c:2186
 msgid "Follow xref: "
 msgstr "Volg verwijzing: "
 
-#: info/session.c:2280
+#: info/session.c:2315
 msgid "Read a menu item and select its node"
 msgstr "Lees een menukeuze en selecteer zijn pagina"
 
-#: info/session.c:2288
+#: info/session.c:2323
 msgid "Read a footnote or cross reference and select its node"
 msgstr "Lees een voetnoot of verwijzing en selecteer zijn pagina"
 
-#: info/session.c:2294
+#: info/session.c:2329
 msgid "Move to the start of this node's menu"
 msgstr "Ga naar het begin van het menu van deze pagina"
 
-#: info/session.c:2318
+#: info/session.c:2353
 msgid "Visit as many menu items at once as possible"
 msgstr "Ga naar zo veel mogelijk menukeuzes tegelijk"
 
-#: info/session.c:2346
+#: info/session.c:2381
 msgid "Read a node name and select it"
 msgstr "Lees de naam van een pagina en selecteer die"
 
-#: info/session.c:2401 info/session.c:2405
+#: info/session.c:2436 info/session.c:2441
 #, fuzzy
 msgid "Goto node: "
 msgstr "Ga naar Pagina: "
 
-#: info/session.c:2471
+#: info/session.c:2505
 #, fuzzy, c-format
 msgid "No menu in node `%s'."
 msgstr "Geen pagina's meer."
 
-#: info/session.c:2516
+#: info/session.c:2551
 #, fuzzy, c-format
 msgid "No menu item `%s' in node `%s'."
 msgstr "Er is geen menukeuze \"%s\" op deze pagina."
 
-#: info/session.c:2546
+#: info/session.c:2581
 #, fuzzy, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
 msgstr "Kon de pagina, waarnaar verwezen werd door \"%s\", niet vinden."
 
-#: info/session.c:2597
+#: info/session.c:2631
 msgid "Read a list of menus starting from dir and follow them"
 msgstr ""
 
-#: info/session.c:2599
+#: info/session.c:2633
 #, fuzzy
 msgid "Follow menus: "
 msgstr "Volg verwijzing: "
 
-#: info/session.c:2797
+#: info/session.c:2826
 msgid "Find the node describing program invocation"
 msgstr ""
 
-#: info/session.c:2799
+#: info/session.c:2828
 #, c-format
 msgid "Find Invocation node of [%s]: "
 msgstr ""
 
 # manpage?
-#: info/session.c:2837
+#: info/session.c:2866
 msgid "Read a manpage reference and select it"
 msgstr "Lees een manpagina verwijzing en selecteer die"
 
-#: info/session.c:2841
+#: info/session.c:2870
 msgid "Get Manpage: "
 msgstr "Ga naar manpagina: "
 
-#: info/session.c:2871
+#: info/session.c:2900
 msgid "Select the node `Top' in this file"
 msgstr "Selecteer de `Top' pagina in dit bestand"
 
-#: info/session.c:2877
+#: info/session.c:2906
 msgid "Select the node `(dir)'"
 msgstr "Selecteer de pagina `(dir)'"
 
-#: info/session.c:2897
+#: info/session.c:2923 info/session.c:2925
 #, c-format
 msgid "Kill node (%s): "
 msgstr "Verwijder pagina (%s): "
 
-#: info/session.c:2951
+#: info/session.c:2977
 #, c-format
 msgid "Cannot kill node `%s'"
 msgstr "Kan pagina `%s' niet verwijderen"
 
-#: info/session.c:2961
+#: info/session.c:2987
 msgid "Cannot kill the last node"
 msgstr "Kan de laatste pagina niet verwijderen"
 
-#: info/session.c:3047
+#: info/session.c:3073
 msgid "Select the most recently selected node"
 msgstr "Selecteer de laatst geselecteerde pagina"
 
-#: info/session.c:3053
+#: info/session.c:3079
 msgid "Kill this node"
 msgstr "Sluit deze pagina"
 
-#: info/session.c:3061
+#: info/session.c:3087
 msgid "Read the name of a file and select it"
 msgstr "Lees de naam van een bestand en selecteer die"
 
-#: info/session.c:3065
+#: info/session.c:3091
 msgid "Find file: "
 msgstr "Vind bestand: "
 
-#: info/session.c:3082
+#: info/session.c:3108
 #, fuzzy, c-format
 msgid "Cannot find `%s'."
 msgstr "Kan \"%s\" niet vinden."
 
-#: info/session.c:3127 info/session.c:3248
+#: info/session.c:3151 info/session.c:3269
 #, fuzzy, c-format
 msgid "Could not create output file `%s'."
 msgstr "Kan uitvoerbestand \"%s\" niet vinden."
 
-#: info/session.c:3140 info/session.c:3265 info/session.c:3326
+#: info/session.c:3165 info/session.c:3287 info/session.c:3347
 msgid "Done."
 msgstr "Klaar."
 
-#: info/session.c:3196
+#: info/session.c:3220
 #, fuzzy, c-format
 msgid "Writing node %s..."
 msgstr "Bezig met schrijven van pagina \"%s\"..."
 
-#: info/session.c:3274
+#: info/session.c:3296
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
 msgstr "Sluis de inhoud van deze pagina door INFO_PRINT_COMMAND"
 
-#: info/session.c:3310
+#: info/session.c:3331
 #, fuzzy, c-format
 msgid "Cannot open pipe to `%s'."
 msgstr "Kan pijp naar \"%s\" niet openen."
 
-#: info/session.c:3316
+#: info/session.c:3337
 #, fuzzy, c-format
 msgid "Printing node %s..."
 msgstr "Bezig met afdrukken van pagina \"%s\"..."
 
-#: info/session.c:3558
+#: info/session.c:3567
 #, fuzzy, c-format
 msgid "Searching subfile %s ..."
 msgstr "Bezig met zoeken naar sub-bestand \"%s\"..."
 
-#: info/session.c:3610
+#: info/session.c:3619
 #, fuzzy
 msgid "Read a string and search for it case-sensitively"
 msgstr "Lees een tekenreeks en zoek daar naar"
 
-#: info/session.c:3617
+#: info/session.c:3626
 msgid "Read a string and search for it"
 msgstr "Lees een tekenreeks en zoek daar naar"
 
-#: info/session.c:3625
+#: info/session.c:3634
 #, fuzzy
 msgid "Read a string and search backward for it"
 msgstr "Lees een tekenreeks en zoek daar naar"
 
-#: info/session.c:3667
+#: info/session.c:3670 info/session.c:3677
 #, fuzzy, c-format
 msgid "%s%sfor string [%s]: "
 msgstr "%s voor tekenreeks [%s]: "
 
-#: info/session.c:3668
+#: info/session.c:3671 info/session.c:3678
 msgid "Search backward"
 msgstr "Achteruit zoeken"
 
-#: info/session.c:3668
+#: info/session.c:3672 info/session.c:3678
 msgid "Search"
 msgstr "Zoek"
 
-#: info/session.c:3669
+#: info/session.c:3673 info/session.c:3679
 msgid " case-sensitively "
 msgstr ""
 
-#: info/session.c:3669
+#: info/session.c:3674 info/session.c:3679
 msgid " "
 msgstr ""
 
-#: info/session.c:3709
+#: info/session.c:3718
 msgid "Search failed."
 msgstr "Niet gevonden."
 
-#: info/session.c:3727
+#: info/session.c:3736
 msgid "Repeat last search in the same direction"
 msgstr ""
 
-#: info/session.c:3730 info/session.c:3740
+#: info/session.c:3739 info/session.c:3749
 #, fuzzy
 msgid "No previous search string"
 msgstr "Geen eerdere index zoek string."
 
-#: info/session.c:3737
+#: info/session.c:3746
 msgid "Repeat last search in the reverse direction"
 msgstr ""
 
-#: info/session.c:3755 info/session.c:3761
+#: info/session.c:3765 info/session.c:3771
 msgid "Search interactively for a string as you type it"
 msgstr "Zoek interactief naar een string als je het intypt"
 
-#: info/session.c:3855
+#: info/session.c:3851
 msgid "I-search backward: "
 msgstr "Achteruit I-zoeken: "
 
-#: info/session.c:3857
+#: info/session.c:3853
 msgid "I-search: "
 msgstr "I-zoeken: "
 
-#: info/session.c:3882
+#: info/session.c:3878 info/session.c:3880
 msgid "Failing "
 msgstr "Niet gelukt: "
 
@@ -1531,29 +1552,29 @@ msgstr "Ga naar de volgende verwijzing"
 msgid "Select reference or menu item appearing on this line"
 msgstr "Selecteer verwijzing of menukeuze van deze regel"
 
-#: info/session.c:4381
+#: info/session.c:4382
 msgid "Cancel current operation"
 msgstr "Annuleer huidige operatie"
 
 # Zie Cancel current action
-#: info/session.c:4388
+#: info/session.c:4389
 msgid "Quit"
 msgstr "Afgebroken"
 
-#: info/session.c:4397
+#: info/session.c:4398
 #, fuzzy
 msgid "Move the cursor to a specific line of the window"
 msgstr "Beweeg de cursor naar een bepaalde regel van het venster"
 
-#: info/session.c:4429
+#: info/session.c:4430
 msgid "Redraw the display"
 msgstr "Herschrijf het venster"
 
-#: info/session.c:4466
+#: info/session.c:4467
 msgid "Quit using Info"
 msgstr "Stop met Info"
 
-#: info/session.c:4479
+#: info/session.c:4480
 msgid "Run command bound to this key's lowercase variant"
 msgstr ""
 
@@ -1563,27 +1584,29 @@ msgid "Unknown command (%s)."
 msgstr "Onbekend commando (%s)."
 
 #: info/session.c:4494
-msgid "\"\" is invalid"
-msgstr "\"\" is ongeldig"
-
-#: info/session.c:4495
 #, c-format
 msgid "\"%s\" is invalid"
 msgstr "\"%s\" is ongeldig"
 
-#: info/session.c:4713
+#: info/session.c:4495
+#, fuzzy, c-format
+msgid "`%s' is invalid"
+msgstr "\"%s\" is ongeldig"
+
+#: info/session.c:4709
 msgid "Add this digit to the current numeric argument"
 msgstr "Voeg dit cijfer toe aan het huidige numerieke argument"
 
-#: info/session.c:4722
+#: info/session.c:4718
 msgid "Start (or multiply by 4) the current numeric argument"
 msgstr "Begin een nieuw numeriek argument of vermenigvuldig het huidige met 4"
 
-#: info/session.c:4737
+#: info/session.c:4733
 msgid "Internally used by \\[universal-argument]"
 msgstr "Intern gebruikt door \\[universeel-argument]"
 
-#: info/tilde.c:344
+#: info/tilde.c:338
+#, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: Geen virtueel geheugen meer!\n"
 
@@ -1658,235 +1681,269 @@ msgstr "Geef een waarde voor %s (%d): "
 msgid "Set %s to value (%s): "
 msgstr "Geef een waarde voor %s (%s): "
 
-#: info/window.c:1164
+#: info/window.c:1138
 msgid "--*** Tags out of Date ***"
 msgstr "--*** Tags zijn verouderd ***"
 
-#: info/window.c:1175
+#: info/window.c:1149
 msgid "-----Info: (), lines ----, "
 msgstr "-----Info: (), regels ----, "
 
-#: info/window.c:1182
+#: info/window.c:1156
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr "-%s---Info: %s, %d regels --%s--"
 
-#: info/window.c:1186
+#: info/window.c:1160
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr "-%s%s-Info: (%s)%s, %d regels --%s--"
 
-#: info/window.c:1193
+#: info/window.c:1167
 #, c-format
 msgid " Subfile: %s"
 msgstr "Sub-bestand: %s"
 
-#: lib/getopt.c:675
+#: lib/getopt.c:551 lib/getopt.c:570
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: optie `%s' is dubbelzinnig\n"
 
-#: lib/getopt.c:700
+#: lib/getopt.c:603 lib/getopt.c:607
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: optie `--%s' staat geen argumenten toe\n"
 
-#: lib/getopt.c:705
+#: lib/getopt.c:616 lib/getopt.c:621
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: optie `%c%s' staat geen argumenten toe\n"
 
-#: lib/getopt.c:723 lib/getopt.c:896
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: optie `%s' vereist een argument\n"
 
-#: lib/getopt.c:752
+#: lib/getopt.c:727 lib/getopt.c:730
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: onbekende optie `--%s'\n"
 
-#: lib/getopt.c:756
+#: lib/getopt.c:738 lib/getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: onbekende optie `%c%s'\n"
 
 # Dit is de POSIX versie van de volgende melding
-#: lib/getopt.c:782
+#: lib/getopt.c:796 lib/getopt.c:799
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: ongeldige optie -- %c\n"
 
 # Dezelfde tekst als hiervoor
-#: lib/getopt.c:785
+#: lib/getopt.c:805 lib/getopt.c:808
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ongeldige optie -- %c\n"
 
-#: lib/getopt.c:815 lib/getopt.c:945
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: optie vereist een argument -- %c\n"
 
-#: lib/getopt.c:862
+#: lib/getopt.c:935 lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: optie `-W %s' is dubbelzinnig\n"
 
-#: lib/getopt.c:880
+#: lib/getopt.c:978 lib/getopt.c:999
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: optie `-W %s' staat geen argumenten toe\n"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#, fuzzy, c-format
+msgid "arguments to @%s ignored"
+msgstr "Verkeerd argument voor %c%s"
+
+#: makeinfo/cmds.c:585
 msgid "January"
 msgstr "Januari"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "February"
 msgstr "Februari"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "March"
 msgstr "Maart"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "April"
 msgstr "April"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "May"
 msgstr "Mei"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "June"
 msgstr "Juni"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "July"
 msgstr "Juli"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "August"
 msgstr "Augustus"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "September"
 msgstr "September"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "October"
 msgstr "Oktober"
 
-#: makeinfo/cmds.c:517
+#: makeinfo/cmds.c:587
 msgid "November"
 msgstr "November"
 
-#: makeinfo/cmds.c:517
+#: makeinfo/cmds.c:587
 msgid "December"
 msgstr "December"
 
-#: makeinfo/cmds.c:658
+#: makeinfo/cmds.c:936
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr ""
 
-#: makeinfo/cmds.c:701
+#: makeinfo/cmds.c:979
 msgid "@sc argument all uppercase, thus no effect"
 msgstr ""
 
-#: makeinfo/cmds.c:759
+#: makeinfo/cmds.c:1034
 #, fuzzy, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "`%cend' verwachtte `%s', maar heb `%s' gezien"
 
-#: makeinfo/cmds.c:789
+#: makeinfo/cmds.c:1074
 msgid "end of file inside verb block"
 msgstr ""
 
-#: makeinfo/cmds.c:797
+#: makeinfo/cmds.c:1082
 #, fuzzy, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "`%cend' verwachtte `%s', maar heb `%s' gezien"
 
-#: makeinfo/cmds.c:942
+#: makeinfo/cmds.c:1112
+msgid ""
+"@strong{Note...} produces a spurious cross-reference in Info; reword to "
+"avoid that"
+msgstr ""
+
+#: makeinfo/cmds.c:1305
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s is verouderd"
 
-#: makeinfo/cmds.c:1014
+#: makeinfo/cmds.c:1414
 #, fuzzy, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "%csp vereist een postief numeriek argument"
 
-#: makeinfo/cmds.c:1348 makeinfo/cmds.c:1374 makeinfo/footnote.c:81
+#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "Verkeerd argument voor %c%s"
 
-#: makeinfo/cmds.c:1358 makeinfo/makeinfo.c:4140
+#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
 msgid "asis"
 msgstr "asis"
 
-#: makeinfo/cmds.c:1360 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
 msgid "none"
 msgstr "geen"
 
-#: makeinfo/defun.c:85
+#: makeinfo/cmds.c:1789
+#, fuzzy, c-format
+msgid "Bad argument to @%s"
+msgstr "Verkeerd argument voor %c%s"
+
+#: makeinfo/cmds.c:1803
+msgid "insert"
+msgstr ""
+
+#: makeinfo/defun.c:84
 #, fuzzy
 msgid "Missing `}' in @def arg"
 msgstr "Ontbrekende `}' in het argument voor %cdef"
 
-#: makeinfo/defun.c:363
+#: makeinfo/defun.c:403
 msgid "Function"
 msgstr "Functie"
 
-#: makeinfo/defun.c:366
+#: makeinfo/defun.c:406
 msgid "Macro"
 msgstr "Makro"
 
-#: makeinfo/defun.c:369
+#: makeinfo/defun.c:409
 msgid "Special Form"
 msgstr "Speciaal Formulier"
 
-#: makeinfo/defun.c:373
+#: makeinfo/defun.c:413
 msgid "Variable"
 msgstr "Variabele"
 
-#: makeinfo/defun.c:376
+#: makeinfo/defun.c:416
 msgid "User Option"
 msgstr "Gebruikersoptie"
 
-#: makeinfo/defun.c:380
+#: makeinfo/defun.c:420
 msgid "Instance Variable"
 msgstr "Instantievariabele"
 
-#: makeinfo/defun.c:384
+#: makeinfo/defun.c:424
 msgid "Method"
 msgstr "Methode"
 
-#: makeinfo/defun.c:466 makeinfo/defun.c:470 makeinfo/defun.c:615
-#: makeinfo/defun.c:631 makeinfo/defun.c:671
+#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
+#: makeinfo/defun.c:644 makeinfo/xml.c:2229
 msgid "of"
 msgstr ""
 
-#: makeinfo/defun.c:474 makeinfo/defun.c:478 makeinfo/defun.c:482
-#: makeinfo/defun.c:624 makeinfo/defun.c:676
+#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
 #, fuzzy
 msgid "on"
 msgstr "geen"
 
 # Is die x een foutje?
-#: makeinfo/defun.c:717
+#: makeinfo/defun.c:711
 #, fuzzy, c-format
-msgid "Must be in `%s' insertion to use `%sx'"
+msgid "Must be in `@%s' environment to use `@%s'"
 msgstr "Moet in een `%s' `insertion' zitten om `%s'x te gebruiken"
 
-#: makeinfo/files.c:448
+#: makeinfo/files.c:435
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr "%s: getwd: %s, %s\n"
 
+#: makeinfo/files.c:638
+#, c-format
+msgid "`%s' omitted before output filename"
+msgstr ""
+
+#: makeinfo/files.c:646
+#, c-format
+msgid "`%s' omitted since writing to stdout"
+msgstr ""
+
+#: makeinfo/files.c:694
+msgid "Output buffer not empty."
+msgstr ""
+
 #: makeinfo/footnote.c:150
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
@@ -1908,240 +1965,287 @@ msgstr "Voetnoot gedefinieerd zonder referentie pagina"
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "Voetnoot gedefinieerd zonder referentie pagina"
 
-#: makeinfo/footnote.c:298
+#: makeinfo/footnote.c:302 makeinfo/index.c:189
 #, fuzzy
 msgid "Footnotes"
 msgstr "-Voetnoten"
 
-#: makeinfo/html.c:42
-msgid "Untitled"
+#: makeinfo/html.c:87
+#, c-format
+msgid "%s: could not open --css-file: %s"
 msgstr ""
 
-#: makeinfo/html.c:298
+#: makeinfo/html.c:172
 #, c-format
-msgid "Invalid node name: `%s'"
+msgid "%s:%d: --css-file ended in comment"
 msgstr ""
 
-#: makeinfo/index.c:213
+#: makeinfo/html.c:207
+msgid "Untitled"
+msgstr ""
+
+#: makeinfo/html.c:422
+msgid "[unexpected] no html tag to pop"
+msgstr ""
+
+#: makeinfo/html.c:752
+#, fuzzy, c-format
+msgid "[unexpected] invalid node name: `%s'"
+msgstr "%s: onbekende optie `--%s'\n"
+
+#: makeinfo/index.c:169
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "Onbekende index `%s'"
 
-#: makeinfo/index.c:238
+#: makeinfo/index.c:234
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr ""
 
-#: makeinfo/index.c:396
+#: makeinfo/index.c:412
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "Index `%s' bestaat al"
 
-#: makeinfo/index.c:439
+#: makeinfo/index.c:455
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "Onbekende index `%s' en/of `%s' in @synindex"
 
-#: makeinfo/index.c:666
+#: makeinfo/index.c:661
+msgid "(line )"
+msgstr ""
+
+#: makeinfo/index.c:669
+#, c-format
+msgid "(line %*d)"
+msgstr ""
+
+#: makeinfo/index.c:750
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "Onbekende index `%s' in @printindex"
 
-#: makeinfo/index.c:709
+#: makeinfo/index.c:819
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr ""
 
-#: makeinfo/index.c:712 makeinfo/index.c:751
+#: makeinfo/index.c:822 makeinfo/index.c:858
 msgid "(outside of any node)"
 msgstr ""
 
-#: makeinfo/insertion.c:198
+#: makeinfo/index.c:919 makeinfo/index.c:925
+msgid "See "
+msgstr ""
+
+#: makeinfo/insertion.c:160
+msgid "@item not allowed in argument to @itemize"
+msgstr ""
+
+#: makeinfo/insertion.c:238
 msgid "Broken-Type in insertion_type_pname"
 msgstr "Verkeerd-Type in insertion_type_pname"
 
-#: makeinfo/insertion.c:271
+#: makeinfo/insertion.c:334
 msgid "Enumeration stack overflow"
 msgstr "Enumeratiestapel overloop"
 
 # FIXME: hoe vertaal je `lettering'? tegenover enumerating
-#: makeinfo/insertion.c:303
+#: makeinfo/insertion.c:366
 #, c-format
 msgid "lettering overflow, restarting at %c"
 msgstr "lettering overloop, start opnieuw bij %c"
 
 # FIXME: formatter?
-#: makeinfo/insertion.c:538
+#: makeinfo/insertion.c:631
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
 msgstr "%s vereist een argument: de formatteerder voor %citem"
 
-#: makeinfo/insertion.c:693
+#: makeinfo/insertion.c:719
+#, c-format
+msgid "%cfloat environments cannot be nested"
+msgstr ""
+
+#: makeinfo/insertion.c:973
 #, fuzzy, c-format
 msgid "`@end' expected `%s', but saw `%s'"
 msgstr "`%cend' verwachtte `%s', maar heb `%s' gezien"
 
-#: makeinfo/insertion.c:931
+#: makeinfo/insertion.c:1337
 #, c-format
 msgid "No matching `%cend %s'"
 msgstr "Geen overeenkomende `%cend %s'"
 
-#: makeinfo/insertion.c:1084
+#: makeinfo/insertion.c:1592
 #, c-format
 msgid "%s requires letter or digit"
 msgstr "%s vereist een letter of cijfer"
 
-#: makeinfo/insertion.c:1158
+#: makeinfo/insertion.c:1687
 msgid "end of file inside verbatim block"
 msgstr ""
 
-#: makeinfo/insertion.c:1318
+#: makeinfo/insertion.c:1913
+#, fuzzy, c-format
+msgid "@%s not meaningful outside `@float' environment"
+msgstr "%citemx is zinloos in een `%s' blok"
+
+#: makeinfo/insertion.c:1949
 #, fuzzy
 msgid "@menu seen before first @node, creating `Top' node"
 msgstr "%cmenu gezien voor de eerste pagina"
 
-#: makeinfo/insertion.c:1319
+#: makeinfo/insertion.c:1950
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr ""
 
-#: makeinfo/insertion.c:1331
+#: makeinfo/insertion.c:1962
 #, fuzzy
 msgid "@detailmenu seen before first node, creating `Top' node"
 msgstr "%cmenu gezien voor de eerste pagina"
 
-#: makeinfo/insertion.c:1346
+#: makeinfo/insertion.c:2018
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr ""
+
+#: makeinfo/insertion.c:2032
+#, fuzzy, c-format
+msgid "@%s not meaningful outside `@titlepage' environment"
+msgstr "%citemx is zinloos in een `%s' blok"
+
+#: makeinfo/insertion.c:2063
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr "Niet overeenkomende `%c%s'"
 
-#: makeinfo/insertion.c:1353
+#: makeinfo/insertion.c:2068
 #, c-format
 msgid "`%c%s' needs something after it"
 msgstr "`%c%s' verwacht er iets na"
 
-#: makeinfo/insertion.c:1359
-#, c-format
-msgid "Bad argument to `%s', `%s', using `%s'"
+#: makeinfo/insertion.c:2074
+#, fuzzy, c-format
+msgid "Bad argument `%s' to `@%s', using `%s'"
 msgstr "Verkeerd argument voor `%s', `%s', gebruik `%s'"
 
-#: makeinfo/insertion.c:1453
+#: makeinfo/insertion.c:2171
 #, fuzzy, c-format
 msgid "@%s not meaningful inside `@%s' block"
 msgstr "%citemx is zinloos in een `%s' blok"
 
-#: makeinfo/insertion.c:1462
+#: makeinfo/insertion.c:2180
 #, fuzzy, c-format
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "%citemx is zinloos in een `%s' blok"
 
-#: makeinfo/insertion.c:1646
+#: makeinfo/insertion.c:2356
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "%c%s buiten een invoeg-blok gevonden"
 
-#: makeinfo/lang.c:331
+#: makeinfo/lang.c:580
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr ""
 
-#: makeinfo/lang.c:384
+#: makeinfo/lang.c:655
 #, fuzzy, c-format
-msgid "unrecogized encoding name `%s'"
+msgid "unrecognized encoding name `%s'"
 msgstr "%s: onbekende optie `--%s'\n"
 
-#: makeinfo/lang.c:387
+#: makeinfo/lang.c:663
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr ""
 
-#: makeinfo/lang.c:414
+#: makeinfo/lang.c:715
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr ""
 
-#: makeinfo/lang.c:502
-#, c-format
-msgid "%s is an invalid ISO code, using %c"
-msgstr ""
-
-#: makeinfo/lang.c:687
+#: makeinfo/lang.c:1009
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "%c%s verwacht `i' of `j' als argument, niet `%c'"
 
-#: makeinfo/lang.c:691
+#: makeinfo/lang.c:1013
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr "%c%s verwacht één enkele `i' of `j' als argument"
 
-#: makeinfo/macro.c:134
+#: makeinfo/macro.c:128
 #, c-format
 msgid "macro `%s' previously defined"
 msgstr "makro `%s' al eerder gedefinieerd"
 
-#: makeinfo/macro.c:138
+#: makeinfo/macro.c:132
 #, c-format
 msgid "here is the previous definition of `%s'"
 msgstr "hier is de vorige definitie van `%s'"
 
 #: makeinfo/macro.c:355
 #, c-format
-msgid "\\ in macro expansion followed by `%s' instead of \\ or parameter name"
+msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr ""
 
-#: makeinfo/macro.c:403
+#: makeinfo/macro.c:401
 #, fuzzy, c-format
 msgid "Macro `%s' called on line %d with too many args"
 msgstr "Makro `%s' aangeroepen met te veel argumenten"
 
-#: makeinfo/macro.c:594
+#: makeinfo/macro.c:586
 #, c-format
 msgid "%cend macro not found"
 msgstr "%cend makro niet gevonden"
 
-#: makeinfo/macro.c:632
+#: makeinfo/macro.c:624
 #, fuzzy
 msgid "@quote-arg only useful for single-argument macros"
 msgstr ""
 "%cquote-arg is allen nuttig indien de makro slechts een argument verwacht"
 
-#: makeinfo/macro.c:668
+#: makeinfo/macro.c:660
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:316
+#: makeinfo/makeinfo.c:184
 #, c-format
-msgid "%s:%d: warning: "
-msgstr "%s:%d: waarschuwing: "
-
-#: makeinfo/makeinfo.c:339
 msgid "Too many errors!  Gave up.\n"
 msgstr "Te veel fouten!  Ik heb het maar opgegeven.\n"
 
-#: makeinfo/makeinfo.c:350 makeinfo/makeinfo.c:2026
+#: makeinfo/makeinfo.c:302
+#, c-format
+msgid "%s:%d: warning: "
+msgstr "%s:%d: waarschuwing: "
+
+#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
 #, c-format
 msgid "Misplaced %c"
 msgstr "Verkeerd geplaatste %c"
 
-#: makeinfo/makeinfo.c:370
+#: makeinfo/makeinfo.c:340
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Probeer `%s --help' voor meer informatie.\n"
 
-#: makeinfo/makeinfo.c:373
+#: makeinfo/makeinfo.c:343
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Aanroep: %s [OPTIE]... BESTAND...\n"
 
-#: makeinfo/makeinfo.c:376
+#: makeinfo/makeinfo.c:346
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:380
+#: makeinfo/makeinfo.c:350
 #, c-format
 msgid ""
 "General options:\n"
@@ -2156,16 +2260,17 @@ msgid ""
 "      --version               display version information and exit.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:394
+#: makeinfo/makeinfo.c:364
 #, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output DocBook rather than Info.\n"
+"      --docbook             output Docbook XML rather than Info.\n"
 "      --html                output HTML rather than Info.\n"
-"      --xml                 output XML (TexinfoML) rather than Info.\n"
+"      --xml                 output Texinfo XML rather than Info.\n"
+"      --plaintext           output plain text rather than Info.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:401
+#: makeinfo/makeinfo.c:372
 msgid ""
 "General output options:\n"
 "  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
@@ -2181,7 +2286,7 @@ msgid ""
 "  -o, --output=FILE         output to FILE (directory if split HTML),\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:386
 #, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2200,43 +2305,68 @@ msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d).\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:433
+#: makeinfo/makeinfo.c:403
+msgid ""
+"Options for HTML:\n"
+"      --css-include=FILE        include FILE in HTML <style> output;\n"
+"                                  read stdin if FILE is -.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:409
+#, c-format
+msgid ""
+"Options for XML and Docbook:\n"
+"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"d).\n"
+"                                  If VAL is 0, ignorable whitespace is "
+"dropped.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:416
 msgid ""
 "Input file options:\n"
-"      --commands-in-node-names   allow @ commands in node names.\n"
-"  -D VAR                         define the variable VAR, as with @set.\n"
-"  -I DIR                         append DIR to the @include search path.\n"
-"  -P DIR                         prepend DIR to the @include search path.\n"
-"  -U VAR                         undefine the variable VAR, as with @clear.\n"
+"      --commands-in-node-names  allow @ commands in node names.\n"
+"  -D VAR                        define the variable VAR, as with @set.\n"
+"  -I DIR                        append DIR to the @include search path.\n"
+"  -P DIR                        prepend DIR to the @include search path.\n"
+"  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:442
+#: makeinfo/makeinfo.c:425
 msgid ""
 "Conditional processing in input:\n"
+"  --ifdocbook       process @ifdocbook and @docbook even if\n"
+"                      not generating Docbook.\n"
 "  --ifhtml          process @ifhtml and @html even if not generating HTML.\n"
 "  --ifinfo          process @ifinfo even if not generating Info.\n"
 "  --ifplaintext     process @ifplaintext even if not generating plain text.\n"
 "  --iftex           process @iftex and @tex; implies --no-split.\n"
+"  --ifxml           process @ifxml and @xml.\n"
+"  --no-ifdocbook    do not process @ifdocbook and @docbook text.\n"
 "  --no-ifhtml       do not process @ifhtml and @html text.\n"
 "  --no-ifinfo       do not process @ifinfo text.\n"
 "  --no-ifplaintext  do not process @ifplaintext text.\n"
 "  --no-iftex        do not process @iftex and @tex text.\n"
+"  --no-ifxml        do not process @ifxml and @xml text.\n"
+"\n"
+"  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:454
+#: makeinfo/makeinfo.c:444
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating HTML, --ifhtml is on and the others are off;\n"
 "  if generating Info, --ifinfo is on and the others are off;\n"
 "  if generating plain text, --ifplaintext is on and the others are off;\n"
+"  if generating XML, --ifxml is on and the others are off.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:461
+#: makeinfo/makeinfo.c:452
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                     write Info to foo's @setfilename\n"
 "  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write XML to @setfilename\n"
+"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
 "  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
 "  makeinfo --no-headers foo.texi        write plain text to standard output\n"
 "\n"
@@ -2246,61 +2376,69 @@ msgid ""
 "  makeinfo --no-split foo.texi          write one Info file however big\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:570 makeinfo/makeinfo.c:593 makeinfo/makeinfo.c:655
-#: makeinfo/makeinfo.c:676
+#: makeinfo/makeinfo.c:603
+#, c-format
+msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
+#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr "%s: %s argument moet numeriek zijn, niet `%s'.\n"
 
 # Vanaf hier
-#: makeinfo/makeinfo.c:583
-#, c-format
-msgid "Couldn't open macro expansion output `%s'"
+#: makeinfo/makeinfo.c:660
+#, fuzzy, c-format
+msgid "%s: could not open macro expansion output `%s'"
 msgstr "Kon uitvoer `%s' voor makro-uitbreiding niet openen"
 
-#: makeinfo/makeinfo.c:586
-msgid "Cannot specify more than one macro expansion output"
-msgstr "Je kunt niet meer dan een uitvoer voor makro-uitbreiding geven"
+# Vanaf hier
+#: makeinfo/makeinfo.c:665
+#, fuzzy, c-format
+msgid "%s: ignoring second macro expansion output `%s'.\n"
+msgstr "Kon uitvoer `%s' voor makro-uitbreiding niet openen"
 
-#: makeinfo/makeinfo.c:624
+#: makeinfo/makeinfo.c:707
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 "%s: argument voor --paragraph-indent moet numeriek, `none' of `asis' zijn, "
 "niet `%s'.\n"
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 "%s: argument voor --footnote-style moet `separate' of `end' zijn, niet `%"
 "s'.\n"
 
-#: makeinfo/makeinfo.c:723
+#: makeinfo/makeinfo.c:806
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: ontbrekend bestandsargument\n"
 
-#: makeinfo/makeinfo.c:898
+#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#, c-format
+msgid "Multiline command %c%s used improperly"
+msgstr ""
+
+#: makeinfo/makeinfo.c:1000
 #, c-format
 msgid "Expected `%s'"
 msgstr "Verwachtte `%s'"
 
-#: makeinfo/makeinfo.c:1365
-msgid "File exists, but is not a directory"
-msgstr ""
-
-#: makeinfo/makeinfo.c:1366
+#: makeinfo/makeinfo.c:1479
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1414
+#: makeinfo/makeinfo.c:1525
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "Geen `%s' gevonden in `%s'"
 
-#: makeinfo/makeinfo.c:1496
+#: makeinfo/makeinfo.c:1605
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
@@ -2308,17 +2446,17 @@ msgstr ""
 "uitvoer\n"
 "van Info gaat daar al heen.\n"
 
-#: makeinfo/makeinfo.c:1526
+#: makeinfo/makeinfo.c:1638
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "Bezig met het maken van een %s-bestand `%s' van `%s'.\n"
 
-#: makeinfo/makeinfo.c:1561
+#: makeinfo/makeinfo.c:1673
 #, fuzzy, c-format
 msgid "This is %s, produced by makeinfo version %s from %s.\n"
 msgstr "Dit is Info bestand %s, gemaakt door Makeinfo versie %d.%d"
 
-#: makeinfo/makeinfo.c:1583
+#: makeinfo/makeinfo.c:1709
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2326,338 +2464,329 @@ msgstr ""
 "%s: makro uitvoer bestand `%s' weggehaald wegens fouten; gebruik --force om "
 "te bewaren.\n"
 
-#: makeinfo/makeinfo.c:1627
+#: makeinfo/makeinfo.c:1773
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 "%s: uitvoer bestand `%s' weggehaald wegens fouten; gebruik --force om te "
 "bewaren.\n"
 
-#: makeinfo/makeinfo.c:1853
+#: makeinfo/makeinfo.c:2034
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "Onbekend commando `%s'"
 
-#: makeinfo/makeinfo.c:1875
+#: makeinfo/makeinfo.c:2056
 #, fuzzy, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr "commandoregel-argument `%s' te veel"
 
-#: makeinfo/makeinfo.c:2068
-#, c-format
-msgid "%c%s expected `{...}'"
+#: makeinfo/makeinfo.c:2314
+#, fuzzy, c-format
+msgid "%c%s expected braces"
 msgstr "%c%s verwachtte `{...}'"
 
-#: makeinfo/makeinfo.c:2098
+#: makeinfo/makeinfo.c:2327
 msgid "Unmatched }"
 msgstr "Niet-overeenkomende }"
 
-#: makeinfo/makeinfo.c:2148
+#: makeinfo/makeinfo.c:2375
 msgid "NO_NAME!"
 msgstr "GEEN_NAAM!"
 
-#: makeinfo/makeinfo.c:2169
+#: makeinfo/makeinfo.c:2396
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s ontbrekende afsluitende accolade"
 
-#: makeinfo/makeinfo.c:2958
-msgid "First argument to cross-reference may not be empty"
-msgstr ""
-
-#: makeinfo/makeinfo.c:3018 makeinfo/makeinfo.c:3236 makeinfo/xml.c:1340
-msgid "see "
-msgstr ""
-
-#: makeinfo/makeinfo.c:3018
-msgid "See "
-msgstr ""
-
-#: makeinfo/makeinfo.c:3164
-#, c-format
-msgid "`.' or `,' must follow cross reference, not %c"
-msgstr "`.' of `,' moeten op een verwijzing volgen, niet %c"
-
-#: makeinfo/makeinfo.c:3212
-msgid "First argument to @inforef may not be empty"
-msgstr ""
-
-#: makeinfo/makeinfo.c:3427
+#: makeinfo/makeinfo.c:3309
 #, fuzzy, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "@image bestand `%s' onleesbaar: %s"
 
-#: makeinfo/makeinfo.c:3440
-#, c-format
-msgid "No `%s.png' or `.jpg', and no extension supplied"
-msgstr ""
+#: makeinfo/makeinfo.c:3315
+#, fuzzy, c-format
+msgid "No such file `%s'"
+msgstr "Geen `%s' gevonden in `%s'"
 
-#: makeinfo/makeinfo.c:3490
+#: makeinfo/makeinfo.c:3447
 #, fuzzy, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "@image bestand `%s' onleesbaar: %s"
 
-#: makeinfo/makeinfo.c:3497
+#: makeinfo/makeinfo.c:3456
 msgid "@image missing filename argument"
 msgstr "ontbrekend bestandsnaam argument voor @image"
 
-#: makeinfo/makeinfo.c:3690
+#: makeinfo/makeinfo.c:3675
+#, c-format
+msgid "undefined flag: %s"
+msgstr ""
+
+#: makeinfo/makeinfo.c:3676
 #, fuzzy, c-format
 msgid "{No value for `%s'}"
 msgstr "{Geen waarde voor \"%s\"}"
 
-#: makeinfo/makeinfo.c:3744
+#: makeinfo/makeinfo.c:3728
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s vereist een naam"
 
-#: makeinfo/makeinfo.c:3850
+#: makeinfo/makeinfo.c:3834
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "Kwam bestandseinde tegen voor een overeenkomende @end %s"
 
-#: makeinfo/makeinfo.c:4081
+#: makeinfo/makeinfo.c:4082
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr ""
 
-#: makeinfo/multi.c:226
+#: makeinfo/multi.c:116
 #, fuzzy
 msgid "Missing } in @multitable template"
 msgstr "Ontbrekende `}' in het argument voor %cdef"
 
-#: makeinfo/multi.c:302
+#: makeinfo/multi.c:254
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "onbeheerde tekst `%s' na @multitable genegeerd"
 
-#: makeinfo/multi.c:375
+#: makeinfo/multi.c:393
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "Te veel kolommen in `multitable' item (maximaal %d)"
 
-#: makeinfo/multi.c:426
-#, c-format
-msgid "Cannot select column #%d in multitable"
+#: makeinfo/multi.c:555
+#, fuzzy, c-format
+msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "Kan kolom #%d niet selecteren in `multitabel'"
 
-#: makeinfo/multi.c:529
+#: makeinfo/multi.c:584
 msgid "ignoring @tab outside of multitable"
 msgstr "@tab buiten een `multitable' genegeerd"
 
-#: makeinfo/multi.c:565
+#: makeinfo/multi.c:632
+#, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** Multikolom uitvoer van laatste regel:\n"
 
-#: makeinfo/multi.c:568
+#: makeinfo/multi.c:635
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* kolom #%d: uitvoer = %s\n"
 
-#: makeinfo/node.c:276
+#: makeinfo/node.c:280
 #, fuzzy, c-format
 msgid "Node `%s' previously defined at line %d"
 msgstr "makro `%s' al eerder gedefinieerd"
 
-#: makeinfo/node.c:594
+#: makeinfo/node.c:648
 #, c-format
 msgid "Formatting node %s...\n"
 msgstr "Pagina %s wordt geformatteerd...\n"
 
-#: makeinfo/node.c:655
-#, c-format
-msgid "Node `%s' requires a sectioning command (e.g. %c%s)"
+#: makeinfo/node.c:716
+#, fuzzy, c-format
+msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
 msgstr "Pagina `%s' vereist een sectiecommando (bijv. %c%s)"
 
-#: makeinfo/node.c:815
+#: makeinfo/node.c:879
 #, c-format
 msgid "No node name specified for `%c%s' command"
 msgstr ""
 
-#: makeinfo/node.c:856 makeinfo/node.c:1075
+#: makeinfo/node.c:920 makeinfo/node.c:1151
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr ""
 
-#: makeinfo/node.c:859
+#: makeinfo/node.c:923
 msgid "This @anchor command ignored; references to it will not work"
 msgstr ""
 
-#: makeinfo/node.c:861 makeinfo/node.c:1078
+#: makeinfo/node.c:925 makeinfo/node.c:1154
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr ""
 
-#: makeinfo/node.c:891
+#: makeinfo/node.c:955
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
 msgstr ""
 
-#: makeinfo/node.c:920
-#, fuzzy
-msgid "Node:"
-msgstr "Volgende"
-
-#: makeinfo/node.c:930
+#: makeinfo/node.c:991
 #, fuzzy
 msgid "Next:"
 msgstr "Volgende"
 
-#: makeinfo/node.c:940
+#: makeinfo/node.c:1007
 #, fuzzy
 msgid "Previous:"
 msgstr "Vorige"
 
-#: makeinfo/node.c:950
+#: makeinfo/node.c:1021
 #, fuzzy
 msgid "Up:"
 msgstr "Omhoog"
 
-#: makeinfo/node.c:1072
+#: makeinfo/node.c:1148
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr ""
 
-#: makeinfo/node.c:1077
+#: makeinfo/node.c:1153
 msgid "@anchor command ignored; references to it will not work"
 msgstr ""
 
-#: makeinfo/node.c:1277
-#, c-format
-msgid "%s reference to nonexistent node `%s'"
+#: makeinfo/node.c:1347
+#, fuzzy, c-format
+msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr "%s verwijst naar niet-bestaande pagina `%s'"
 
-#: makeinfo/node.c:1294
+#: makeinfo/node.c:1363
 #, fuzzy
 msgid "Menu"
 msgstr "* Menu:\n"
 
-#: makeinfo/node.c:1296
+#: makeinfo/node.c:1365
 msgid "Cross"
 msgstr ""
 
 # Deze zes meldingen:
 # next, prev en up niet vertalen, dit is wat er in de broncode staat.
 # Het is duidelijker indien onvertaald.
-#: makeinfo/node.c:1380
+#: makeinfo/node.c:1447
 #, fuzzy, c-format
-msgid "Next field of node `%s' not pointed to"
+msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr "Het `next'-veld van pagina `%s' wijst niet terug op"
 
-#: makeinfo/node.c:1383
+#: makeinfo/node.c:1450
 #, fuzzy, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "Deze node (`%s') is degene met het foute `next'-veld"
 
-#: makeinfo/node.c:1395
+#: makeinfo/node.c:1462
 #, fuzzy
 msgid "Prev"
 msgstr "Vorige"
 
-#: makeinfo/node.c:1438
+#: makeinfo/node.c:1505
 #, fuzzy, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "Het `prev'-veld van node (`%s') wijst niet terug op"
 
-#: makeinfo/node.c:1442
+#: makeinfo/node.c:1509
 #, fuzzy, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "Deze node (`%s') is degene met het foute `next'-veld"
 
-#: makeinfo/node.c:1454
-#, fuzzy, c-format
-msgid "`%s' has no Up field"
-msgstr "Node `%s' heeft geen `up'-veld"
+#: makeinfo/node.c:1521
+#, c-format
+msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
+msgstr ""
 
-#: makeinfo/node.c:1457
+#: makeinfo/node.c:1524
 #, fuzzy
 msgid "Up"
 msgstr "Omhoog"
 
-#: makeinfo/node.c:1523
+#: makeinfo/node.c:1590
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr ""
 
 # Eigenlijk zouden hier de %s en de %d omgedraaid moeten worden:
 # `Er wordt %d keer naar %s verwezen'
-#: makeinfo/node.c:1552
+#: makeinfo/node.c:1619
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr "er wordt naar pagina `%s' %d keer verwezen"
 
-#: makeinfo/node.c:1566
+#: makeinfo/node.c:1633
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "naar pagina `%s' wordt niet verwezen"
 
-#: makeinfo/sectioning.c:117
+#: makeinfo/node.c:1723
+#, c-format
+msgid "Removing %s\n"
+msgstr ""
+
+#: makeinfo/node.c:1727
+#, fuzzy, c-format
+msgid "Can't remove file `%s': %s"
+msgstr "Kan uitvoerbestand \"%s\" niet vinden."
+
+#: makeinfo/sectioning.c:122
 #, c-format
-msgid "Appendix %c "
+msgid "Appendix %c"
 msgstr ""
 
-#: makeinfo/sectioning.c:356 makeinfo/sectioning.c:444
+#: makeinfo/sectioning.c:467
+#, c-format
+msgid "Internal error (search_sectioning) `%s'!"
+msgstr ""
+
+#: makeinfo/sectioning.c:562
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
 msgstr ""
 
-#: makeinfo/sectioning.c:502
+#: makeinfo/sectioning.c:623
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr "%c%s is verouderd; gebruik in plaats daarvan %c%s"
 
-#: makeinfo/sectioning.c:518
+#: makeinfo/sectioning.c:639
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr "Pagina met %ctop als sectie bestaat al"
 
-#: makeinfo/sectioning.c:526
+#: makeinfo/sectioning.c:647
 #, c-format
 msgid "Here is the %ctop node"
 msgstr "Hier is de %ctop pagina"
 
-#: makeinfo/sectioning.c:543
+#: makeinfo/sectioning.c:663
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr "%ctop wordt voor %cnode gebruikt, neem standaard %s aan"
 
-#: makeinfo/toc.c:221 makeinfo/toc.c:298 makeinfo/toc.c:299
+#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
 msgid "Table of Contents"
 msgstr ""
 
-#: makeinfo/toc.c:330 makeinfo/toc.c:366 makeinfo/toc.c:367
+#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
 msgid "Short Contents"
 msgstr ""
 
-#: makeinfo/toc.c:406
-#, c-format
-msgid "%s: TOC should be here, but it was not found"
-msgstr ""
-
-#: makeinfo/xml.c:1108
+#: makeinfo/xml.c:1605
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image bestand `%s' onleesbaar: %s"
 
-#: util/install-info.c:151
+#: makeinfo/xml.c:2097
+msgid ""
+"@headitem as the last item of @multitable produces invalid Docbook documents"
+msgstr ""
+
+#: util/install-info.c:154
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: waarschuwing: "
 
-#: util/install-info.c:176 util/install-info.c:189
-msgid "virtual memory exhausted"
-msgstr "virtuele geheugen vol"
-
-#: util/install-info.c:232
+#: util/install-info.c:203
 #, c-format
 msgid " for %s"
 msgstr " voor %s"
 
-#: util/install-info.c:381
+#: util/install-info.c:426
 #, c-format
 msgid "\tTry `%s --help' for a complete list of options.\n"
 msgstr "\tProbeer `%s --help' voor een volledige lijst van opties.\n"
 
-#: util/install-info.c:389
+#: util/install-info.c:434
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
@@ -2727,7 +2856,7 @@ msgstr ""
 "Meld fouten in het programma aan bug-texinfo@gno.org;\n"
 "meld onjuistheden in de vertaling aan nl@li.org.\n"
 
-#: util/install-info.c:444
+#: util/install-info.c:488
 #, fuzzy, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
@@ -2744,7 +2873,7 @@ msgid ""
 "  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
 "  to select it.\n"
 "\n"
-"* Menu:\n"
+"%s\n"
 msgstr ""
 "Dit is het bestand .../info/dir, dat de bovenste pagina van de Info\n"
 "structuur bevat, genaamd (dir)Top. De eerste keer dat je Info start,\n"
@@ -2763,98 +2892,100 @@ msgstr ""
 "\n"
 "* Menu:\n"
 
-#: util/install-info.c:467
+#: util/install-info.c:513
 #, c-format
 msgid "%s: could not read (%s) and could not create (%s)\n"
 msgstr "%s: niet leesbaar (%s) en het kon ook niet aanmaken (%s)\n"
 
-#: util/install-info.c:551
+#: util/install-info.c:600
 #, c-format
 msgid "%s: empty file"
 msgstr ""
 
-#: util/install-info.c:866 util/install-info.c:906
+#: util/install-info.c:913 util/install-info.c:953
 msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
 msgstr "START-INFO-DIR-ENTRY zonder overeenkomende END-INFO-DIR-ENTRY"
 
-#: util/install-info.c:901
+#: util/install-info.c:948
 msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
 msgstr "END-INFO-DIR-ENTRY zonder overeenkomende START-INFO-DIR-ENTRY"
 
-#: util/install-info.c:1150 util/install-info.c:1160
+#: util/install-info.c:1191 util/install-info.c:1201
 #, c-format
-msgid "%s: Specify the Info directory only once.\n"
-msgstr "%s: Geef de Info inhoud slechts een keer.\n"
+msgid "%s: already have dir file: %s\n"
+msgstr ""
 
-#: util/install-info.c:1195
+#: util/install-info.c:1236
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr "%s: Geef het Info bestand slechts een keer.\n"
 
-#: util/install-info.c:1244
+#: util/install-info.c:1284
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr "commandoregel-argument `%s' te veel"
 
-#: util/install-info.c:1248
+#: util/install-info.c:1288
 msgid "No input file specified; try --help for more information."
 msgstr "Geen invoerbestand gegeven; probeer --help voor meer informatie."
 
-#: util/install-info.c:1251
+#: util/install-info.c:1291
 msgid "No dir file specified; try --help for more information."
 msgstr "Geen inhoudbestand gegeven; probeer --help voor meer informatie."
 
-#: util/install-info.c:1273
+#: util/install-info.c:1313
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr "geen info inhoudsingang in `%s'"
 
-#: util/install-info.c:1388
+#: util/install-info.c:1426
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr "menukeuze `%s' bestaat al, voor bestand `%s'"
 
-#: util/install-info.c:1411
+#: util/install-info.c:1449
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr "geen ingangen voor `%s' gevonden; niets verwijderd"
 
-#: util/texindex.c:245
+#: util/texindex.c:252
 msgid "display this help and exit"
 msgstr "geef deze hulp en beëindig"
 
-#: util/texindex.c:247
+#: util/texindex.c:254
 msgid "keep temporary files around after processing"
 msgstr "behoud tijdelijke bestanden na verwerking"
 
-#: util/texindex.c:249
+#: util/texindex.c:256
 msgid "do not keep temporary files around after processing (default)"
 msgstr "behoud de tijdelijke bestanden na verwerking niet (standaard)"
 
-#: util/texindex.c:251
+#: util/texindex.c:258
 msgid "send output to FILE"
 msgstr "stuur uitvoor naar BESTAND"
 
-#: util/texindex.c:253
+#: util/texindex.c:260
 msgid "display version information and exit"
 msgstr "geef versie informatie en beëindig"
 
-#: util/texindex.c:264
+#: util/texindex.c:270
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Aanroep: %s [OPTIE]... BESTAND...\n"
 
-#: util/texindex.c:265
+#: util/texindex.c:271
+#, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr "Maak een gesorteerde index voor elk TeX uitvoer BESTAND.\n"
 
-#: util/texindex.c:268
+#: util/texindex.c:274
 #, fuzzy, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr ""
 "Normaal gesproken is BESTAND... `foo.??' voor een dokument `foo.texi'.\n"
 
-#: util/texindex.c:270
+#: util/texindex.c:276
+#, c-format
 msgid ""
 "\n"
 "Options:\n"
@@ -2862,32 +2993,57 @@ msgstr ""
 "\n"
 "Opties:\n"
 
-#: util/texindex.c:887 util/texindex.c:921 util/texindex.c:997
-#: util/texindex.c:1025
+#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
+#: util/texindex.c:1011
 #, c-format
 msgid "%s: not a texinfo index file"
 msgstr "%s: geen texinfo inhoudbestand"
 
-#: util/texindex.c:982
+#: util/texindex.c:968
 #, c-format
 msgid "failure reopening %s"
 msgstr "fout bij het heropenen van %s"
 
-#: util/texindex.c:1224
+#: util/texindex.c:1218
 #, c-format
 msgid "No page number in %s"
 msgstr ""
 
 # FIXME: secondary
-#: util/texindex.c:1295
+#: util/texindex.c:1291
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "ingang %s volgt op een ingang met een alternatieve naam"
 
-#: util/texindex.c:1633
-#, c-format
-msgid "%s; for file `%s'.\n"
-msgstr "%s; voor bestand `%s'.\n"
+#~ msgid "%s: Specify the Info directory only once.\n"
+#~ msgstr "%s: Geef de Info inhoud slechts een keer.\n"
+
+#~ msgid "\"\" is invalid"
+#~ msgstr "\"\" is ongeldig"
+
+#~ msgid "Cannot specify more than one macro expansion output"
+#~ msgstr "Je kunt niet meer dan een uitvoer voor makro-uitbreiding geven"
+
+#~ msgid "`.' or `,' must follow cross reference, not %c"
+#~ msgstr "`.' of `,' moeten op een verwijzing volgen, niet %c"
+
+#, fuzzy
+#~ msgid "Node:"
+#~ msgstr "Volgende"
+
+#~ msgid "virtual memory exhausted"
+#~ msgstr "virtuele geheugen vol"
+
+#~ msgid "%s; for file `%s'.\n"
+#~ msgstr "%s; voor bestand `%s'.\n"
+
+#, fuzzy
+#~ msgid "`%s' has no Up field"
+#~ msgstr "Node `%s' heeft geen `up'-veld"
+
+#, fuzzy
+#~ msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
+#~ msgstr "Schuif terug in dit venster"
 
 #, fuzzy
 #~ msgid "----------------------\n"
diff --git a/gnu/usr.bin/texinfo/po/no.gmo b/gnu/usr.bin/texinfo/po/no.gmo
index ef5e48e22aa..af281d5266d 100644
--- a/gnu/usr.bin/texinfo/po/no.gmo
+++ b/gnu/usr.bin/texinfo/po/no.gmo
diff --git a/gnu/usr.bin/texinfo/po/no.po b/gnu/usr.bin/texinfo/po/no.po
index 33dd714c90f..c117a14ea93 100644
--- a/gnu/usr.bin/texinfo/po/no.po
+++ b/gnu/usr.bin/texinfo/po/no.po
@@ -1,144 +1,145 @@
-# Norwegian translation of messages for Texinfo 4.0i (bokm�ål dialect).
+# Norwegian translation of messages for Texinfo 4.6 (bokmål dialect).
 # Copyright (C) 1999 Free Software Foundation, Inc.
-# Trond Endrest�øl <endrestol@hotmail.com>, 1998.
+# Trond Endrestøl <trond@ramstind.gtf.ol.no>, 1998.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Texinfo 4.0i\n"
-"POT-Creation-Date: 2002-04-01 06:10-0800\n"
-"PO-Revision-Date: 2002-02-25 23:06+01:00\n"
-"Last-Translator: Trond Endrest�øl <trond@ramstind.gtf.ol.no>\n"
-"Language-Team: Norwegian-bokm�ål <no@li.org>\n"
+"Project-Id-Version: Texinfo 4.6\n"
+"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
+"POT-Creation-Date: 2004-12-21 16:20-0800\n"
+"PO-Revision-Date: 2003-07-14 13:13+02:00\n"
+"Last-Translator: Trond Endrestøl <trond@ramstind.gtf.ol.no>\n"
+"Language-Team: Norwegian-bokmål <no@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: info/echo-area.c:283 info/session.c:712
+#: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr "Flytte forover et tegn"
 
-#: info/echo-area.c:295 info/session.c:728
+#: info/echo-area.c:296 info/session.c:705
 msgid "Move backward a character"
 msgstr "Flytte bakover et tegn"
 
-#: info/echo-area.c:307
+#: info/echo-area.c:308
 msgid "Move to the start of this line"
 msgstr "Flytte til starten av denne linjen"
 
-#: info/echo-area.c:312
+#: info/echo-area.c:313
 msgid "Move to the end of this line"
 msgstr "Flytte til slutten av denne linjen"
 
-#: info/echo-area.c:320 info/session.c:746
+#: info/echo-area.c:321 info/session.c:723
 msgid "Move forward a word"
 msgstr "Flytte forover et ord"
 
-#: info/echo-area.c:360 info/session.c:795
+#: info/echo-area.c:361 info/session.c:772
 msgid "Move backward a word"
 msgstr "Flytte tilbake et ord"
 
-#: info/echo-area.c:400
+#: info/echo-area.c:401
 msgid "Delete the character under the cursor"
-msgstr "Slette tegnet under mark�øren"
+msgstr "Slette tegnet under markøren"
 
-#: info/echo-area.c:430
+#: info/echo-area.c:431
 msgid "Delete the character behind the cursor"
-msgstr "Slette tegnet bak mark�øren"
+msgstr "Slette tegnet bak markøren"
 
-#: info/echo-area.c:451
+#: info/echo-area.c:452
 msgid "Cancel or quit operation"
 msgstr "Avbryte eller avslutte operasjon"
 
-#: info/echo-area.c:466
+#: info/echo-area.c:467
 msgid "Accept (or force completion of) this line"
-msgstr "Godta (eller tvinge fullf�øring av) denne linjen"
+msgstr "Godta (eller tvinge fullføring av) denne linjen"
 
-#: info/echo-area.c:471
+#: info/echo-area.c:472
 msgid "Insert next character verbatim"
 msgstr "Sette inn neste tegn ordrett"
 
-#: info/echo-area.c:479
+#: info/echo-area.c:480
 msgid "Insert this character"
 msgstr "Sette inn dette tegnet"
 
-#: info/echo-area.c:497
+#: info/echo-area.c:498
 msgid "Insert a TAB character"
 msgstr "Sette inn en tabulator"
 
-#: info/echo-area.c:504
+#: info/echo-area.c:505
 msgid "Transpose characters at point"
 msgstr "Transponere tegnet ved punktet"
 
-#: info/echo-area.c:555
+#: info/echo-area.c:556
 msgid "Yank back the contents of the last kill"
 msgstr "Rykke tilbake innholdet fra forrige felling"
 
-#: info/echo-area.c:562
+#: info/echo-area.c:563
 msgid "Kill ring is empty"
 msgstr "Fellingsringen er tom"
 
-#: info/echo-area.c:575
+#: info/echo-area.c:576
 msgid "Yank back a previous kill"
 msgstr "Rykke tilbake en tidligere felling"
 
-#: info/echo-area.c:608
+#: info/echo-area.c:609
 msgid "Kill to the end of the line"
 msgstr "Slette til slutten av linjen"
 
-#: info/echo-area.c:621
+#: info/echo-area.c:622
 msgid "Kill to the beginning of the line"
 msgstr "Slette til begynnelsen av linjen"
 
-#: info/echo-area.c:633
+#: info/echo-area.c:634
 msgid "Kill the word following the cursor"
-msgstr "Slette ordet etter mark�øren"
+msgstr "Slette ordet etter markøren"
 
-#: info/echo-area.c:652
+#: info/echo-area.c:653
 msgid "Kill the word preceding the cursor"
-msgstr "Slette ordet f�ør mark�øren"
+msgstr "Slette ordet før markøren"
 
-#: info/echo-area.c:872 info/echo-area.c:932
+#: info/echo-area.c:868 info/echo-area.c:924
 msgid "No completions"
-msgstr "Ingen fullf�øringer"
+msgstr "Ingen fullføringer"
 
-#: info/echo-area.c:874
+#: info/echo-area.c:870
 msgid "Not complete"
 msgstr "Ikke fullstendig"
 
-#: info/echo-area.c:919
+#: info/echo-area.c:911
 msgid "List possible completions"
-msgstr "Liste mulige fullf�øringer"
+msgstr "Liste mulige fullføringer"
 
-#: info/echo-area.c:936
+#: info/echo-area.c:928
 msgid "Sole completion"
-msgstr "Eneste fullf�øring"
+msgstr "Eneste fullføring"
 
-#: info/echo-area.c:945
+#: info/echo-area.c:937
 msgid "One completion:\n"
-msgstr "En fullf�øring:\n"
+msgstr "En fullføring:\n"
 
-#: info/echo-area.c:946
+#: info/echo-area.c:938
 #, c-format
 msgid "%d completions:\n"
-msgstr "%d fullf�øringer:\n"
+msgstr "%d fullføringer:\n"
 
-#: info/echo-area.c:1092
+#: info/echo-area.c:1085
 msgid "Insert completion"
-msgstr "Sett inn fullf�øring"
+msgstr "Sett inn fullføring"
 
-#: info/echo-area.c:1225
+#: info/echo-area.c:1220
 msgid "Building completions..."
-msgstr "Bygger fullf�øringer..."
+msgstr "Bygger fullføringer..."
 
-#: info/echo-area.c:1342
+#: info/echo-area.c:1340
 msgid "Scroll the completions window"
-msgstr "Rulle fullf�øringsvinduet"
+msgstr "Rulle fullføringsvinduet"
 
-#: info/footnotes.c:212
+#: info/footnotes.c:213
 msgid "Footnotes could not be displayed"
 msgstr "Fotnoter kunne ikke vises"
 
-#: info/footnotes.c:238
+#: info/footnotes.c:239
 msgid "Show the footnotes associated with this node in another window"
 msgstr "Vise fotnotene assosiert med denne noden i et annet vindu"
 
@@ -146,93 +147,93 @@ msgstr "Vise fotnotene assosiert med denne noden i et annet vindu"
 msgid "---------- Footnotes ----------"
 msgstr "---------- Fotnoter -----------"
 
-#: info/indices.c:175
+#: info/indices.c:172
 msgid "Look up a string in the index for this file"
 msgstr "Lete opp en streng i indeksen til denne filen"
 
-#: info/indices.c:205
+#: info/indices.c:199
 msgid "Finding index entries..."
 msgstr "Finner indeksinnslag..."
 
-#: info/indices.c:212
+#: info/indices.c:207
 msgid "No indices found."
 msgstr "Ingen indekser funnet."
 
-#: info/indices.c:222
+#: info/indices.c:217
 msgid "Index entry: "
 msgstr "Indeksinnslag: "
 
-#: info/indices.c:332
+#: info/indices.c:325
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr ""
-"G�å til det neste passende indeksinnslaget fra forrige '\\[index-search]'-"
+"Gå til det neste passende indeksinnslaget fra forrige '\\[index-search]'-"
 "kommando"
 
-#: info/indices.c:342
+#: info/indices.c:335
 msgid "No previous index search string."
-msgstr "Ingen tidligere indekss�økestrenger."
+msgstr "Ingen tidligere indekssøkestrenger."
 
-#: info/indices.c:349
+#: info/indices.c:342
 msgid "No index entries."
 msgstr "Ingen indeksinnslag."
 
-#: info/indices.c:382
-#, c-format
-msgid "No %sindex entries containing \"%s\"."
-msgstr "Ingen %sindeksinnslag inneholdende �«%s�»."
+#: info/indices.c:375
+#, fuzzy, c-format
+msgid "No %sindex entries containing `%s'."
+msgstr "Ingen %sindeksinnslag inneholdende «%s»."
 
-#: info/indices.c:383
+#: info/indices.c:376
 msgid "more "
 msgstr "mer "
 
-#: info/indices.c:393
+#: info/indices.c:386
 msgid "CAN'T SEE THIS"
 msgstr "KAN IKKE SE DETTE"
 
-#: info/indices.c:429
-#, c-format
-msgid "Found \"%s\" in %s. (`\\[next-index-match]' tries to find next.)"
-msgstr "Fant �«%s�» i %s. (�«\\[next-index-match]�» pr�øver �å finne den neste.)"
+#: info/indices.c:422
+#, fuzzy, c-format
+msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
+msgstr "Fant «%s» i %s. («\\[next-index-match]» prøver å finne den neste.)"
 
-#: info/indices.c:549
-#, c-format
-msgid "Scanning indices of \"%s\"..."
-msgstr "Sjekker indekser i �«%s�»..."
+#: info/indices.c:541
+#, fuzzy, c-format
+msgid "Scanning indices of `%s'..."
+msgstr "Sjekker indekser i «%s»..."
 
-#: info/indices.c:603
-#, c-format
-msgid "No available info files have \"%s\" in their indices."
-msgstr "Ingen av de tilgjengelig infofilene har �«%s�» i deres indekser."
+#: info/indices.c:596
+#, fuzzy, c-format
+msgid "No available info files have `%s' in their indices."
+msgstr "Ingen av de tilgjengelig infofilene har «%s» i deres indekser."
 
-#: info/indices.c:632
+#: info/indices.c:622
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr ""
 "Kravle gjennom alle kjente infofilers indekser etter en streng\n"
 "       og bygge opp en meny"
 
-#: info/indices.c:636
+#: info/indices.c:626
 msgid "Index apropos: "
 msgstr "Indeksapropos: "
 
-#: info/indices.c:666
-#, c-format
+#: info/indices.c:654
+#, fuzzy, c-format
 msgid ""
 "\n"
-"* Menu: Nodes whoses indices contain \"%s\":\n"
+"* Menu: Nodes whose indices contain `%s':\n"
 msgstr ""
 "\n"
-"* Menu: Noder med indekser som inneholder �«%s�»:\n"
+"* Menu: Noder med indekser som inneholder «%s»:\n"
 
-#: info/info.c:260 info/infokey.c:884
+#: info/info.c:275 info/infokey.c:899
+#, c-format
 msgid "Try --help for more information.\n"
-msgstr "Pr�øv --help for mer informasjon.\n"
+msgstr "Prøv --help for mer informasjon.\n"
 
-#: info/info.c:279 info/infokey.c:139 makeinfo/makeinfo.c:689
-#: util/install-info.c:1224 util/texindex.c:338
-#, c-format
+#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
+#: util/texindex.c:343
+#, 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"
@@ -242,17 +243,17 @@ msgstr ""
 "etter betingelsene i GNU General Public License.  For mer informasjon\n"
 "om dette, se filen COPYING.\n"
 
-#: info/info.c:462
+#: info/info.c:498
 #, c-format
 msgid "no index entries found for `%s'\n"
-msgstr "ingen innslag funnet for �«%s�»\n"
+msgstr "ingen innslag funnet for «%s»\n"
 
-#: info/info.c:555
-#, fuzzy
+#: info/info.c:590
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
-msgstr " --speech-friendly        v�ær vennlig ovenfor talesyntetisatorer.\n"
+msgstr ""
+"  -b, --speech-friendly        vær vennlig ovenfor talesyntetisatorer.\n"
 
-#: info/info.c:562
+#: info/info.c:597
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -269,10 +270,12 @@ msgid ""
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
 "  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
-"  -R, --raw-escapes            don't remove ANSI escapes from man pages.\n"
+"  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+"      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
 "  -O, --show-options, --usage  go to command-line options node.\n"
 "%s      --subnodes               recursively output menu items.\n"
+"  -w, --where, --location      print physical location of Info file.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
 "\n"
@@ -289,46 +292,48 @@ msgid ""
 "  info --show-options emacs  start at node with emacs' command line options\n"
 "  info -f ./foo.info         show file ./foo.info, not searching dir\n"
 msgstr ""
-"Bruksm�åte: %s [VALG]... [MENYPUNKT...]\n"
+"Bruksmåte: %s [VALG]... [MENYPUNKT...]\n"
 "\n"
 "Lese dokumentasjon i Infoformat.\n"
 "\n"
 "Valg:\n"
-" --apropos=EMNE           s�øke etter EMNE i alle indeksene til alle "
+"     --apropos=EMNE           søke etter EMNE i alle indeksene til alle "
 "Infofilene.\n"
-" --directory=KAT          legge til KAT til INFOPATH.\n"
-" --dribble=FILNAVN        huske brukerens tastetrykk i FILNAVN.\n"
-" --file=FILNAVN           angi Infofilen som skal bes�økes.\n"
-" --help                   vise denne hjelpen og avslutte.\n"
-" --index-search=STRENG    g�å til noden pekt p�å av indeksoppslaget STRENG.\n"
-" --node=NODENAVN          angi noder i f�ørste bes�økte Infofil.\n"
-" --output=FILNAVN         skrive ut utvalgte noder til FILNAVN.\n"
-" --raw-escapes            ikke fjern ANSI-escapes fra mansider.\n"
-" --restore=FILNAVN        lese innledende tastetrykk fra FILNAVN.\n"
-" --show-options, --usage  g�å til kommandolinje-valg-noden.\n"
-"%s --subnodes               rekursivt skrive ut menypunkter.\n"
-" --vi-keys                bruke vi-aktige og less-aktige tastebindinger.\n"
-" --version                vise programversjon og avslutte.\n"
+" -d, --directory=KAT          legge til KAT til INFOPATH.\n"
+"     --dribble=FILNAVN        huske brukerens tastetrykk i FILNAVN.\n"
+" -f, --file=FILNAVN           angi Infofilen som skal besøkes.\n"
+" -h, --help                   vise denne hjelpen og avslutte.\n"
+"     --index-search=STRENG    gå til noden pekt på av indeksoppslaget "
+"STRENG.\n"
+" -n, --node=NODENAVN          angi noder i første besøkte Infofil.\n"
+" -o, --output=FILNAVN         skrive ut utvalgte noder til FILNAVN.\n"
+" -R, --raw-escapes            ikke fjern ANSI-escapes fra mansider.\n"
+"     --restore=FILNAVN        lese innledende tastetrykk fra FILNAVN.\n"
+" -O, --show-options, --usage  gå til kommandolinje-valg-noden.\n"
+"%s     --subnodes               rekursivt skrive ut menypunkter.\n"
+"     --vi-keys                bruke vi-aktige og less-aktige "
+"tastebindinger.\n"
+"     --version                vise programversjon og avslutte.\n"
 "\n"
-"Det f�ørste ikke-valg-argumentet, dersom tilstede, er menypunktet som du\n"
-"starter fra; det blir s�økt etter i alle �«dir�»-filer langs med INFOPATH.\n"
-"Dersom det ikke er tilstede, vil info flette sammen alle �«dir�»-filene\n"
-"og vise resultatet.  �Øvrige gjenv�ærende argumenter blir behandlet som\n"
-"navnene til menypunktene relativ til den f�ørste bes�økte noden.\n"
+"Det første ikke-valg-argumentet, dersom tilstede, er menypunktet som du\n"
+"starter fra; det blir søkt etter i alle «dir»-filer langs med INFOPATH.\n"
+"Dersom menypunktet ikke er tilstede, vil info flette sammen alle\n"
+"«dir»-filene og vise resultatet.  Øvrige gjenværende argumenter blir\n"
+"behandlet som navnene til menypunktene relativ til den første besøkte\n"
+"noden.\n"
 "\n"
 "Eksempler:\n"
-"  info                       vise toppniv�å dirmeny\n"
-"  info emacs                 starte ved emacs-noden fra toppniv�å dir\n"
+"  info                       vise toppnivå dirmeny\n"
+"  info emacs                 starte ved emacs-noden fra toppnivå dir\n"
 "  info emacs buffers         starte ved buffers-noden i emacs-manualen\n"
 "  info --show-options emacs  starte ved emacs kommandolinjevalg\n"
-"  info -f ./foo.info         vise filen ./foo.info, ikke s�øke gjennom dir\n"
+"  info -f ./foo.info         vise filen ./foo.info, ikke søke gjennom dir\n"
 "\n"
 "Send bugrapport til bug-texinfo@gnu.org,\n"
-"generelle sp�ørsm�ål og diskusjoner til help-texinfo@gnu.org.\n"
+"generelle spørsmål og diskusjoner til help-texinfo@gnu.org.\n"
 
-#: info/info.c:598 info/infokey.c:903 makeinfo/makeinfo.c:474
-#: util/install-info.c:421 util/texindex.c:286
-#, fuzzy
+#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
+#: util/install-info.c:466 util/texindex.c:292
 msgid ""
 "\n"
 "Email bug reports to bug-texinfo@gnu.org,\n"
@@ -337,79 +342,80 @@ msgid ""
 msgstr ""
 "\n"
 "Send bugrapporter til bug-texinfo@gnu.org,\n"
-"generelle sp�ørsm�ål og diskusjoner til help-texinfo@gnu.org.\n"
+"generelle spørsmål og diskusjoner til help-texinfo@gnu.org.\n"
+"Websida for Texinfo: http://www.gnu.org/software/texinfo/"
 
-#: info/info.c:632
+#: info/info.c:669
 #, c-format
 msgid "Cannot find node `%s'."
-msgstr "Kan ikke finne noden �«%s�»."
+msgstr "Kan ikke finne noden «%s»."
 
-#: info/info.c:633
+#: info/info.c:670
 #, c-format
 msgid "Cannot find node `(%s)%s'."
-msgstr "Kan ikke finne noden �«(%s)%s�»."
+msgstr "Kan ikke finne noden «(%s)%s»."
 
-#: info/info.c:634
+#: info/info.c:671
 msgid "Cannot find a window!"
 msgstr "Kan ikke finne et vindu!"
 
-#: info/info.c:635
+#: info/info.c:672
 msgid "Point doesn't appear within this window's node!"
-msgstr "Mark�øren vises ikke innen dette vinduets node!"
+msgstr "Markøren vises ikke innen dette vinduets node!"
 
-#: info/info.c:636
+#: info/info.c:673
 msgid "Cannot delete the last window."
 msgstr "Kan ikke slette det siste vinduet."
 
-#: info/info.c:637
+#: info/info.c:674
 msgid "No menu in this node."
 msgstr "Ingen meny i denne noden."
 
-#: info/info.c:638
+#: info/info.c:675
 msgid "No footnotes in this node."
 msgstr "Ingen fotnoter i denne noden."
 
-#: info/info.c:639
+#: info/info.c:676
 msgid "No cross references in this node."
 msgstr "Ingen kryssreferanser i denne noden."
 
-#: info/info.c:640
+#: info/info.c:677
 #, c-format
 msgid "No `%s' pointer for this node."
-msgstr "Ingen �«%s�»-peker for denne noden."
+msgstr "Ingen «%s»-peker for denne noden."
 
-#: info/info.c:641
+#: info/info.c:678
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
-msgstr "Ukjent Info-kommando �«%c�»; pr�øv �«?�» for hjelp."
+msgstr "Ukjent Info-kommando «%c»; prøv «?» for hjelp."
 
-#: info/info.c:642
+#: info/info.c:679
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
-msgstr "Terminaltypen �«%s�» er ikke smart nok for �å kj�øre Info."
+msgstr "Terminaltypen «%s» er ikke smart nok for å kjøre Info."
 
-#: info/info.c:643
+#: info/info.c:680
 msgid "You are already at the last page of this node."
-msgstr "Du er allerede p�å den siste siden av denne noden."
+msgstr "Du er allerede på den siste siden av denne noden."
 
-#: info/info.c:644
+#: info/info.c:681
 msgid "You are already at the first page of this node."
-msgstr "Du er allerede p�å den f�ørste siden til denne noden."
+msgstr "Du er allerede på den første siden til denne noden."
 
-#: info/info.c:645
+#: info/info.c:682
 msgid "Only one window."
 msgstr "Bare et vindu."
 
-#: info/info.c:646
+#: info/info.c:683
 msgid "Resulting window would be too small."
 msgstr "Resulterende vindu ville blitt for lite."
 
-#: info/info.c:647
+#: info/info.c:684
 msgid "Not enough room for a help window, please delete a window."
 msgstr "Ikke nok plass for et hjelpevindu, vennligst slett et vindu."
 
 # The next translation should match the length of this one
-#: info/infodoc.c:45 info/infodoc.c:94
+#: info/infodoc.c:46 info/infodoc.c:95
 msgid ""
 "Basic Commands in Info Windows\n"
 "******************************\n"
@@ -417,20 +423,20 @@ msgstr ""
 "Grunnleggende kommandoer i infovinduer\n"
 "**************************************\n"
 
-#: info/infodoc.c:48
+#: info/infodoc.c:49
 msgid "\\%-10[quit-help]  Quit this help.\n"
 msgstr "\\%-10[quit-help]  Avslutte denne hjelpen.\n"
 
-#: info/infodoc.c:49
+#: info/infodoc.c:50
 msgid "\\%-10[quit]  Quit Info altogether.\n"
 msgstr "\\%-10[quit]  Avslutte Info fullstendig.\n"
 
-#: info/infodoc.c:50
+#: info/infodoc.c:51
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
-msgstr "\\%-10[get-info-help-node]  Starte Infooppl�æring.\n"
+msgstr "\\%-10[get-info-help-node]  Starte Infoopplæring.\n"
 
 # The next translation should match the length of this one
-#: info/infodoc.c:52 info/infodoc.c:101
+#: info/infodoc.c:53 info/infodoc.c:102
 msgid ""
 "Selecting other nodes:\n"
 "----------------------\n"
@@ -438,46 +444,46 @@ msgstr ""
 "Velger andre noder:\n"
 "-------------------\n"
 
-#: info/infodoc.c:54
+#: info/infodoc.c:55
 msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
 msgstr "\\%-10[next-node]  Flytte til neste node etter denne noden.\n"
 
-#: info/infodoc.c:55
+#: info/infodoc.c:56
 msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
-msgstr "\\%-10[prev-node]  Flytte til forrige node f�ør denne noden.\n"
+msgstr "\\%-10[prev-node]  Flytte til forrige node før denne noden.\n"
 
-#: info/infodoc.c:56
+#: info/infodoc.c:57
 msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
-msgstr "\\%-10[up-node]  Flytte �«opp�» fra denne noden.\n"
+msgstr "\\%-10[up-node]  Flytte «opp» fra denne noden.\n"
 
-#: info/infodoc.c:57
+#: info/infodoc.c:58
 msgid ""
 "\\%-10[menu-item]  Pick menu item specified by name.\n"
 "              Picking a menu item causes another node to be selected.\n"
 msgstr ""
 "\\%-10[menu-item]  Velge et menypunkt angitt ved navn.\n"
-"              Valg av et menypunkt f�ører til at en annen node blir valgt.\n"
+"              Valg av et menypunkt fører til at en annen node blir valgt.\n"
 
-#: info/infodoc.c:59
+#: info/infodoc.c:60
 msgid ""
 "\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
 msgstr ""
-"\\%-10[history-node]  F�ølge en kryssreferanse.  Leser navnet til "
+"\\%-10[history-node]  Følge en kryssreferanse.  Leser navnet til "
 "referansen.\n"
 
-#: info/infodoc.c:60
+#: info/infodoc.c:61
 msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
 msgstr ""
 "\\%-10[history-node]  Flytte til den siste noden sett i dette vinduet.\n"
 
-#: info/infodoc.c:61
+#: info/infodoc.c:62
 msgid ""
 "\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
 msgstr ""
 "\\%-10[move-to-prev-xref]  Flytte til neste hypertekstlenke innen denne "
 "noden.\n"
 
-#: info/infodoc.c:62
+#: info/infodoc.c:63
 msgid ""
 "\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
 "node.\n"
@@ -485,28 +491,28 @@ msgstr ""
 "\\%-10[move-to-prev-xref]  Flytte til neste hypertekstlenke innen denne "
 "noden.\n"
 
-#: info/infodoc.c:63
+#: info/infodoc.c:64
 msgid ""
 "\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
-msgstr "\\%-10[dir-node]  F�ølge hypertekstlenken under mark�øren.\n"
+msgstr "\\%-10[dir-node]  Følge hypertekstlenken under markøren.\n"
 
-#: info/infodoc.c:64
+#: info/infodoc.c:65
 msgid ""
 "\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
 "node] (DIR)'.\n"
 msgstr ""
-"\\%-10[dir-node]  Flytte til �«katalog�»-noden.  Det samme som �«\\[goto-node] "
-"(DIR)�».\n"
+"\\%-10[dir-node]  Flytte til «katalog»-noden.  Det samme som «\\[goto-node] "
+"(DIR)».\n"
 
-#: info/infodoc.c:65
+#: info/infodoc.c:66
 msgid ""
 "\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
 msgstr ""
-"\\%-10[top-node]  Flytte til �«Top�»-noden.  Det samme som �«\\[goto-node] "
-"Top�».\n"
+"\\%-10[top-node]  Flytte til «Top»-noden.  Det samme som «\\[goto-node] "
+"Top».\n"
 
 # The next translation should match the length of this one
-#: info/infodoc.c:67 info/infodoc.c:115
+#: info/infodoc.c:68 info/infodoc.c:116
 msgid ""
 "Moving within a node:\n"
 "---------------------\n"
@@ -514,34 +520,32 @@ msgstr ""
 "Flytte innen en node:\n"
 "---------------------\n"
 
-#: info/infodoc.c:69
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
-msgstr "\\%-10[scroll-forward]  Rulle forover en side.\n"
-
 #: info/infodoc.c:70
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
-msgstr "\\%-10[scroll-backward]  Rulle bakover en side.\n"
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "\\%-10[beginning-of-node]  Gå til begynnelsen av denne noden.\n"
 
 #: info/infodoc.c:71
-msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
-msgstr "\\%-10[beginning-of-node]  G�å til begynnelsen av denne noden.\n"
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgstr "\\%-10[end-of-node]  Gå til slutten av denne noden.\n"
 
 #: info/infodoc.c:72
-msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
-msgstr "\\%-10[end-of-node]  G�å til slutten av denne noden.\n"
+msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
+msgstr "\\%-10[next-line]  Rulle forover 1 linje.\n"
 
 #: info/infodoc.c:73
-#, fuzzy
-msgid "\\%-10[scroll-forward]  Scroll forward 1 line.\n"
-msgstr "\\%-10[1scroll-forward]  Rulle forover 1 linje.\n"
+msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
+msgstr "\\%-10[prev-line]  Rulle bakover 1 linje.\n"
 
 #: info/infodoc.c:74
-#, fuzzy
-msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
-msgstr "\\%-10[1scroll-backward]  Rulle bakover 1 linje.\n"
+msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
+msgstr "\\%-10[scroll-forward]  Rulle forover en side.\n"
+
+#: info/infodoc.c:75
+msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
+msgstr "\\%-10[scroll-backward]  Rulle bakover en side.\n"
 
 # The next translation should match the length of this one
-#: info/infodoc.c:76 info/infodoc.c:124
+#: info/infodoc.c:77 info/infodoc.c:125
 msgid ""
 "Other commands:\n"
 "---------------\n"
@@ -549,27 +553,27 @@ msgstr ""
 "Andre kommandoer:\n"
 "-----------------\n"
 
-#: info/infodoc.c:78
+#: info/infodoc.c:79
 msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
-msgstr "\\%-10[menu-digit]  Velge f�ørste ... niende punkt i nodens meny.\n"
+msgstr "\\%-10[menu-digit]  Velge første ... niende punkt i nodens meny.\n"
 
-#: info/infodoc.c:79
+#: info/infodoc.c:80
 msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
 msgstr "\\%-10[last-menu-item]  Velge det siste punktet i nodens meny.\n"
 
-#: info/infodoc.c:80
+#: info/infodoc.c:81
 msgid ""
 "\\%-10[index-search]  Search for a specified string in the index entries of "
 "this Info\n"
 "              file, and select the node referenced by the first entry "
 "found.\n"
 msgstr ""
-"\\%-10[index-search]  S�øke etter en angitt streng blant indeksinnslagene i "
+"\\%-10[index-search]  Søke etter en angitt streng blant indeksinnslagene i "
 "denne\n"
-"              infofilen og velge noden til det f�ørste innslaget som blir "
+"              infofilen og velge noden til det første innslaget som blir "
 "funnet.\n"
 
-#: info/infodoc.c:82
+#: info/infodoc.c:83
 msgid ""
 "\\%-10[goto-node]  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
@@ -578,183 +582,183 @@ msgstr ""
 "              Du kan like godt inkludere et filnavn, som i (FILNAVN)"
 "NODENAVN.\n"
 
-#: info/infodoc.c:84
+#: info/infodoc.c:85
 msgid ""
 "\\%-10[search]  Search forward for a specified string\n"
 "              and select the node in which the next occurrence is found.\n"
 msgstr ""
-"\\%-10[search]  S�øke forover etter en angitt streng\n"
+"\\%-10[search]  Søke forover etter en angitt streng\n"
 "              og velge den noden som den neste forekomsten blir funnet i.\n"
 
-#: info/infodoc.c:86
+#: info/infodoc.c:87
 msgid ""
 "\\%-10[search-backward]  Search backward for a specified string\n"
 "              and select the node in which the previous occurrence is "
 "found.\n"
 msgstr ""
-"\\%-10[search-backward]  S�øke baklengs etter en angitt streng\n"
+"\\%-10[search-backward]  Søke baklengs etter en angitt streng\n"
 "              og velge den noden som den neste forekomsten blir funnet i.\n"
 
-#: info/infodoc.c:97
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Quit this help.\n"
 msgstr "  %-10s  Avslutte denne hjelpen.\n"
 
-#: info/infodoc.c:98
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr "  %-10s  Avslutte Info fullstendig.\n"
 
-#: info/infodoc.c:99
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
-msgstr "  %-10s  Starte Infooppl�æring.\n"
+msgstr "  %-10s  Starte Infoopplæring.\n"
 
-#: info/infodoc.c:103
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
-msgstr "  %-10s  Flytte til �«neste�»-noden etter denne noden.\n"
+msgstr "  %-10s  Flytte til «neste»-noden etter denne noden.\n"
 
-#: info/infodoc.c:104
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
-msgstr "  %-10s  Flytte til �«forrige�»-noden f�ør denne noden.\n"
+msgstr "  %-10s  Flytte til «forrige»-noden før denne noden.\n"
 
-#: info/infodoc.c:105
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
-msgstr "  %-10s  Flytte �«opp�» fra denne noden.\n"
+msgstr "  %-10s  Flytte «opp» fra denne noden.\n"
 
-#: info/infodoc.c:106
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Pick menu item specified by name.\n"
 msgstr "  %-10s  Velge menypunkt spesifisert ved navn.\n"
 
-#: info/infodoc.c:107
+#: info/infodoc.c:108
 msgid "              Picking a menu item causes another node to be selected.\n"
 msgstr ""
-"              Valg av menypunkt f�ører til at en annen node blir valgt.\n"
+"              Valg av menypunkt fører til at en annen node blir valgt.\n"
 
-#: info/infodoc.c:108
+#: info/infodoc.c:109
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
-msgstr "  %-10s  F�ølge en kryssreferanse.  Leser navnet til referansen.\n"
+msgstr "  %-10s  Følge en kryssreferanse.  Leser navnet til referansen.\n"
 
-#: info/infodoc.c:109
+#: info/infodoc.c:110
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
 msgstr "  %-10s  Flytte til den siste noden sett i dette vinduet.\n"
 
-#: info/infodoc.c:110
+#: info/infodoc.c:111
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
 msgstr "  %-10s  Flytte til neste hypertekstlenke innen denne noden.\n"
 
-#: info/infodoc.c:111
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
-msgstr "  %-10s  F�ølge hypertekstlenken under mark�øren.\n"
+msgstr "  %-10s  Følge hypertekstlenken under markøren.\n"
 
-#: info/infodoc.c:112
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
-msgstr "  %-10s  Flytte til �«katalog�»-noden.  Det samme som �«g (DIR)�».\n"
+msgstr "  %-10s  Flytte til «katalog»-noden.  Det samme som «g (DIR)».\n"
 
-#: info/infodoc.c:113
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
-msgstr "  %-10s  Flytte til �«Top�»-noden.  Det samme som �«g Top�».\n"
+msgstr "  %-10s  Flytte til «Top»-noden.  Det samme som «g Top».\n"
 
-#: info/infodoc.c:117
+#: info/infodoc.c:118
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
 msgstr "  %-10s  Rulle forover en side.\n"
 
-#: info/infodoc.c:118
+#: info/infodoc.c:119
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
 msgstr "  %-10s  Rulle bakover en side.\n"
 
-#: info/infodoc.c:119
+#: info/infodoc.c:120
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
-msgstr "  %-10s  G�å til begynnelsen av denne noden.\n"
+msgstr "  %-10s  Gå til begynnelsen av denne noden.\n"
 
-#: info/infodoc.c:120
+#: info/infodoc.c:121
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
-msgstr "  %-10s  G�å til slutten av denne noden.\n"
+msgstr "  %-10s  Gå til slutten av denne noden.\n"
 
-#: info/infodoc.c:121
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
 msgstr "  %-10s  Rulle forover 1 linje.\n"
 
-#: info/infodoc.c:122
+#: info/infodoc.c:123
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
 msgstr "  %-10s  Rulle bakover 1 linje.\n"
 
-#: info/infodoc.c:126
+#: info/infodoc.c:127
 #, c-format
 msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
-msgstr "  %-10s  Velge f�ørste ... niende punkt i nodens meny.\n"
+msgstr "  %-10s  Velge første ... niende punkt i nodens meny.\n"
 
-#: info/infodoc.c:127
+#: info/infodoc.c:128
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
 msgstr "  %-10s  Velge det siste punktet i nodens meny.\n"
 
 # This translation is connected to the next one
-#: info/infodoc.c:128
+#: info/infodoc.c:129
 #, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
-msgstr "  %-10s  S�øke etter en spesifikk streng i indeksinnslagene i denne\n"
+msgstr "  %-10s  Søke etter en spesifikk streng i indeksinnslagene i denne\n"
 
-#: info/infodoc.c:129
+#: info/infodoc.c:130
 msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
 msgstr ""
-"              infofil, og velge noden referert av det f�ørste oppslaget "
+"              infofil, og velge noden referert av det første oppslaget "
 "funnet.\n"
 
-#: info/infodoc.c:130
+#: info/infodoc.c:131
 #, c-format
 msgid "  %-10s  Move to node specified by name.\n"
 msgstr "  %-10s  Flytte til noden spesifisert av navn.\n"
 
-#: info/infodoc.c:131
+#: info/infodoc.c:132
 msgid ""
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr ""
 "              Du kan like godt inkludere et filnavn, som i (FILNAVN)"
 "NODENAVN.\n"
 
-#: info/infodoc.c:132
+#: info/infodoc.c:133
 #, c-format
 msgid "  %-10s  Search forward for a specified string,\n"
 msgstr ""
-"  %-10s  S�øke forlengs gjennom denne Infofilen for en spesifikk streng,\n"
+"  %-10s  Søke forlengs gjennom denne Infofilen for en spesifikk streng,\n"
 
-#: info/infodoc.c:133 info/infodoc.c:135
+#: info/infodoc.c:134 info/infodoc.c:136
 msgid ""
 "              and select the node in which the next occurrence is found.\n"
 msgstr ""
 "              og velge den noden som i det neste tilfellet blir funnet.\n"
 
-#: info/infodoc.c:134
+#: info/infodoc.c:135
 #, c-format
 msgid "  %-10s  Search backward for a specified string\n"
 msgstr ""
-"  %-10s  S�øke baklengs gjennom denne Infofilen for en spesifikk streng,\n"
+"  %-10s  Søke baklengs gjennom denne Infofilen for en spesifikk streng,\n"
 
-#: info/infodoc.c:313
+#: info/infodoc.c:316
 msgid "The current search path is:\n"
-msgstr "Gjeldende s�økesti er:\n"
+msgstr "Gjeldende søkesti er:\n"
 
-#: info/infodoc.c:316
+#: info/infodoc.c:320
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
@@ -762,181 +766,194 @@ msgstr ""
 "Kommandoer tilgjengelig i Infovinduer:\n"
 "\n"
 
-#: info/infodoc.c:319
+#: info/infodoc.c:324
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
 msgstr ""
-"Kommandoer tilgjengelig i ekkoomr�ådet:\n"
+"Kommandoer tilgjengelig i ekkoområdet:\n"
 "\n"
 
-#: info/infodoc.c:340
+#: info/infodoc.c:347
 #, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
 "\n"
 msgstr ""
-"F�ølgende kommandoer kan bare bli p�åkallet via %s:\n"
+"Følgende kommandoer kan bare bli påkallet via %s:\n"
 "\n"
 
-#: info/infodoc.c:343
+#: info/infodoc.c:351
 msgid ""
 "The following commands cannot be invoked at all:\n"
 "\n"
 msgstr ""
-"F�ølgende kommandoer kan ikke bli p�åkallet i det hele tatt:\n"
+"Følgende kommandoer kan ikke bli påkallet i det hele tatt:\n"
 "\n"
 
-#: info/infodoc.c:367
+#: info/infodoc.c:375
 msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
-msgstr "--- Bruk �«\\[history-node]�» eller �«\\[kill-node]�» for �å avslutte ---\n"
+msgstr "--- Bruk «\\[history-node]» eller «\\[kill-node]» for å avslutte ---\n"
 
-#: info/infodoc.c:477
+#: info/infodoc.c:485
 msgid "Display help message"
 msgstr "Vise hjelpemelding"
 
-#: info/infodoc.c:495
+#: info/infodoc.c:503
 msgid "Visit Info node `(info)Help'"
-msgstr "Vise infonoden �«(info)Help�»"
+msgstr "Vise infonoden «(info)Help»"
 
-#: info/infodoc.c:638
+#: info/infodoc.c:641
 msgid "Print documentation for KEY"
 msgstr "Skrive ut dokumentasjonen for KEY"
 
-#: info/infodoc.c:650
+#: info/infodoc.c:653
 #, c-format
 msgid "Describe key: %s"
 msgstr "Beskriv tast: %s"
 
-#: info/infodoc.c:660
+#: info/infodoc.c:664
 #, c-format
 msgid "ESC %s is undefined."
 msgstr "ESC %s er udefinert."
 
-#: info/infodoc.c:676 info/infodoc.c:703
+#: info/infodoc.c:680 info/infodoc.c:709
 #, c-format
 msgid "%s is undefined."
 msgstr "%s er udefinert."
 
-#: info/infodoc.c:724
+#: info/infodoc.c:730
 #, c-format
 msgid "%s is defined to %s."
 msgstr "%s er definert som %s."
 
-#: info/infodoc.c:1151
+#: info/infodoc.c:1153
 msgid "Show what to type to execute a given command"
-msgstr "Vise hva som m�å tastes for �å utf�øre en gitt kommando"
+msgstr "Vise hva som må tastes for å utføre en gitt kommando"
 
-#: info/infodoc.c:1155
+#: info/infodoc.c:1157
 msgid "Where is command: "
 msgstr "Hvor er kommandoen: "
 
-#: info/infodoc.c:1177
+#: info/infodoc.c:1179
 #, c-format
 msgid "`%s' is not on any keys"
-msgstr "�«%s�» er ikke p�å noen taster"
+msgstr "«%s» er ikke på noen taster"
 
-#: info/infodoc.c:1183
+#: info/infodoc.c:1186
 #, c-format
 msgid "%s can only be invoked via %s."
-msgstr "%s kan bare bli p�åkallet via %s."
+msgstr "%s kan bare bli påkallet via %s."
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1190
 #, c-format
 msgid "%s can be invoked via %s."
-msgstr "%s kan bli p�åkallet via %s."
+msgstr "%s kan bli påkallet via %s."
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1195
 #, c-format
 msgid "There is no function named `%s'"
-msgstr "Det finnes ingen funksjon ved navn �«%s�»"
+msgstr "Det finnes ingen funksjon ved navn «%s»"
+
+#: info/infokey.c:145
+#, 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 (C) %s Free Software Foundation, Inc.\n"
+"Det finnes INGEN garanti.  Du kan redistribuere denne programvaren\n"
+"etter betingelsene i GNU General Public License.  For mer informasjon\n"
+"om dette, se filen COPYING.\n"
 
-#: info/infokey.c:164
+#: info/infokey.c:170
 msgid "incorrect number of arguments"
-msgstr "un�øyaktig antall argumenter"
+msgstr "unøyaktig antall argumenter"
 
-#: info/infokey.c:194
+#: info/infokey.c:201
 #, c-format
 msgid "cannot open input file `%s'"
-msgstr "Kan ikke �åpne inputfilen �«%s�»"
+msgstr "Kan ikke åpne inputfilen «%s»"
 
-#: info/infokey.c:207
+#: info/infokey.c:215
 #, c-format
 msgid "cannot create output file `%s'"
-msgstr "Kunne ikke opprette outputfila �«%s�»"
+msgstr "Kunne ikke opprette outputfila «%s»"
 
-#: info/infokey.c:217
+#: info/infokey.c:226
 #, c-format
 msgid "error writing to `%s'"
-msgstr "feil ved skriving til �«%s�»"
+msgstr "feil ved skriving til «%s»"
 
-#: info/infokey.c:222
+#: info/infokey.c:232
 #, c-format
 msgid "error closing output file `%s'"
-msgstr "Feil ved lukking av outputfila �«%s�»"
+msgstr "Feil ved lukking av outputfila «%s»"
 
-#: info/infokey.c:443
+#: info/infokey.c:450
 msgid "key sequence too long"
 msgstr "tastesekvensen er for lang"
 
-#: info/infokey.c:521
+#: info/infokey.c:529
 msgid "missing key sequence"
 msgstr "manglende tastesekvens"
 
-#: info/infokey.c:600
+#: info/infokey.c:610
 msgid "NUL character (\\000) not permitted"
 msgstr "NULL-tegn (\\000) er ikke tillatt"
 
-#: info/infokey.c:629
+#: info/infokey.c:641
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr "NULL-tegn (^%c) er ikke tillatt"
 
-#: info/infokey.c:652
+#: info/infokey.c:665
 msgid "missing action name"
 msgstr "manglende handlingsnavn"
 
-#: info/infokey.c:667 info/infokey.c:733
+#: info/infokey.c:681 info/infokey.c:756
 msgid "section too long"
 msgstr "avdeling for lang"
 
-#: info/infokey.c:673
+#: info/infokey.c:688
 #, c-format
 msgid "unknown action `%s'"
-msgstr "Ukjent handling �«%s�»"
+msgstr "Ukjent handling «%s»"
 
-#: info/infokey.c:682
+#: info/infokey.c:698
 msgid "action name too long"
 msgstr "handlingsnavn for langt"
 
-#: info/infokey.c:694
+#: info/infokey.c:712
 #, c-format
 msgid "extra characters following action `%s'"
-msgstr "ekstra tegn f�ølger handlingen �«%s�»"
+msgstr "ekstra tegn følger handlingen «%s»"
 
-#: info/infokey.c:704
+#: info/infokey.c:723
 msgid "missing variable name"
 msgstr "manglende variabelnavn"
 
-#: info/infokey.c:712
+#: info/infokey.c:733
 msgid "missing `=' immediately after variable name"
-msgstr "manglende �«=�» umiddelbart etter variabelnavn"
+msgstr "manglende «=» umiddelbart etter variabelnavn"
 
-#: info/infokey.c:719
+#: info/infokey.c:741
 msgid "variable name too long"
 msgstr "variabelnavn for langt"
 
-#: info/infokey.c:741
+#: info/infokey.c:765
 msgid "value too long"
 msgstr "verdi for lang"
 
-#: info/infokey.c:875
+#: info/infokey.c:890
 #, c-format
 msgid "\"%s\", line %u: "
-msgstr "�«%s�», linje %u: "
+msgstr "«%s», linje %u: "
 
-#: info/infokey.c:891
-#, fuzzy, c-format
+#: info/infokey.c:906
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
 "\n"
@@ -948,111 +965,113 @@ msgid ""
 "  --help               display this help and exit.\n"
 "  --version            display version information and exit.\n"
 msgstr ""
-"Bruksm�åte: %s [VALG]... [INPUTFIL]\n"
+"Bruksmåte: %s [VALG]... [INPUTFIL]\n"
 "\n"
 "Kompilere infokey-kildefil til infokeyfil.  Leser INPUTFIL (standard\n"
-"$HOME/.infokey) og skriver kompilert tastfil til $HOME/.info.\n"
+"$HOME/.infokey) og skriver kompilert keyfil til $HOME/.info.\n"
 "\n"
 "Valg:\n"
-"  --output FILNAVN             skrive ut til FILNAVN istedet for $HOME/."
-"info.\n"
+"  --output FIL                 skrive ut til FIL istedet for $HOME/.info.\n"
 "  --help                       vise denne hjelpen og avslutte.\n"
 "  --version                    vise programversjon og avslutte.\n"
-"\n"
-"Send bugrapporter til bug-texinfo@gnu.org,\n"
-"generelle sp�ørsm�ål og diskusjoner til help-texinfo@gnu.org.\n"
 
-#: info/infomap.c:1397
+#: info/infomap.c:1500
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
-msgstr "Ignorerer ugyldig infokeyfil �«%s�» - for liten"
+msgstr "Ignorerer ugyldig infokeyfil «%s» - for liten"
 
-#: info/infomap.c:1400
+#: info/infomap.c:1503
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
-msgstr "Ignorerer ugyldig infokeyfil �«%s�» - for stor"
+msgstr "Ignorerer ugyldig infokeyfil «%s» - for stor"
 
-#: info/infomap.c:1413
+#: info/infomap.c:1516
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
-msgstr "Feil ved lesing av infokeyfil �«%s�» - for kort"
+msgstr "Feil ved lesing av infokeyfil «%s» - for kort"
 
-#: info/infomap.c:1431
+#: info/infomap.c:1535
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
 msgstr ""
-"Ugyldig infokeyfil �«%s�» (feil magiske tall) -- kj�ør infokey for �å oppdatere "
+"Ugyldig infokeyfil «%s» (feil magiske tall) -- kjør infokey for å oppdatere "
 "den"
 
-#: info/infomap.c:1437
+#: info/infomap.c:1544
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
-msgstr "Din infokeyfil �«%s�» er utdatert -- kj�ør infokey for �å oppdatere den"
+msgstr "Din infokeyfil «%s» er utdatert -- kjør infokey for å oppdatere den"
 
-#: info/infomap.c:1450
+#: info/infomap.c:1560
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
 msgstr ""
-"Ugyldig infokeyfil �«%s�» (feil avdelingslengde) -- kj�ør infokey for �å "
+"Ugyldig infokeyfil «%s» (feil avdelingslengde) -- kjør infokey for å "
 "oppdatere den"
 
-#: info/infomap.c:1470
+#: info/infomap.c:1581
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
 msgstr ""
-"Ugyldig infokeyfil �«%s�» (feil avdelingskode) -- kj�ør infokey for �å oppdatere "
+"Ugyldig infokeyfil «%s» (feil avdelingskode) -- kjør infokey for å oppdatere "
 "den"
 
-#: info/infomap.c:1608
+#: info/infomap.c:1716
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr "Feil data i infokeyfil -- noen tastebindinger ble ignorert"
 
-#: info/infomap.c:1659
+#: info/infomap.c:1766
 msgid "Bad data in infokey file -- some var settings ignored"
 msgstr "Feil data i infokeyfil -- noen variabelinnstillinger ble ignorert"
 
-#: info/m-x.c:70
+#: info/m-x.c:69
 msgid "Read the name of an Info command and describe it"
-msgstr "Lese inn navnet p�å en infokommando og beskrive den"
+msgstr "Lese inn navnet på en infokommando og beskrive den"
 
-#: info/m-x.c:74
+#: info/m-x.c:73
 msgid "Describe command: "
 msgstr "Beskriv kommandoen: "
 
-#: info/m-x.c:97
+#: info/m-x.c:96
 msgid "Read a command name in the echo area and execute it"
-msgstr "Lese et kommandonavn i ekkoomr�ådet og utf�øre den"
+msgstr "Lese et kommandonavn i ekkoområdet og utføre den"
 
-#: info/m-x.c:141
+#: info/m-x.c:140
 msgid "Cannot execute an `echo-area' command here."
-msgstr "Kan ikke utf�øre en �«echo-area�»-kommando her."
+msgstr "Kan ikke utføre en «echo-area»-kommando her."
 
-#: info/m-x.c:157
+#: info/m-x.c:154
+#, fuzzy, c-format
+msgid "Undefined command: %s"
+msgstr "udefinert flagg: %s"
+
+#: info/m-x.c:160
 msgid "Set the height of the displayed window"
-msgstr "Sette h�øyden p�å det viste vinduet"
+msgstr "Sette høyden på det viste vinduet"
 
-#: info/m-x.c:170
+#: info/m-x.c:173
 #, c-format
 msgid "Set screen height to (%d): "
-msgstr "Sette skjermh�øyde til (%d): "
+msgstr "Sette skjermhøyde til (%d): "
 
-#: info/makedoc.c:161 info/makedoc.c:169
+#: info/makedoc.c:162 info/makedoc.c:170
+#, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
 "\n"
 msgstr ""
-"   Kildefiler s�økt gjennom for �å lage denne filen inkluderer:\n"
+"   Kildefiler søkt gjennom for å lage denne filen inkluderer:\n"
 "\n"
 
-#: info/makedoc.c:553
+#: info/makedoc.c:550
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "Kunne ikke manipulere filen %s.\n"
 
-#: info/nodemenu.c:28
+#: info/nodemenu.c:31
 msgid ""
 "\n"
 "* Menu:\n"
@@ -1064,476 +1083,476 @@ msgstr ""
 "  (Fil)Node                         Linjer  Str.   Inneholdene fil\n"
 "  ---------                         ------  ----   ---------------"
 
-#: info/nodemenu.c:199
+#: info/nodemenu.c:202
 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 ""
-"Her er menyen over nodene du har nylig bes�økt.\n"
-"Velg en fra denne menyen, eller bruk �«\\[history-node]�» i et annet vindu.\n"
+"Her er menyen over nodene du har nylig besøkt.\n"
+"Velg en fra denne menyen, eller bruk «\\[history-node]» i et annet vindu.\n"
 
-#: info/nodemenu.c:219
+#: info/nodemenu.c:224
 msgid "Make a window containing a menu of all of the currently visited nodes"
-msgstr "Lag et vindu inneholdene en meny over alle de nylig bes�økte nodene"
+msgstr "Lag et vindu inneholdene en meny over alle de nylig besøkte nodene"
 
-#: info/nodemenu.c:299
+#: info/nodemenu.c:304
 msgid "Select a node which has been previously visited in a visible window"
-msgstr "Velge en node som har blitt tidligere bes�økt i et synlig vindu"
+msgstr "Velge en node som har blitt tidligere besøkt i et synlig vindu"
 
-#: info/nodemenu.c:311
+#: info/nodemenu.c:317
 msgid "Select visited node: "
-msgstr "Velg bes�økt node: "
+msgstr "Velg besøkt node: "
 
-#: info/nodemenu.c:331 info/session.c:2235
+#: info/nodemenu.c:337 info/session.c:2264
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr "Referansen forsvant! (%s)."
 
-#: info/session.c:170
+#: info/session.c:162
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
 "for menu item."
 msgstr ""
-"Velkommen til Info versjon %s. Trykk �«\\[get-help-window]�» for hjelp,\n"
-"�«\\[menu-item]�» for menypunkt."
+"Velkommen til Info versjon %s. Trykk «\\[get-help-window]» for hjelp,\n"
+"«\\[menu-item]» for menypunkt."
 
-#: info/session.c:643
+#: info/session.c:620
 msgid "Move down to the next line"
 msgstr "Flytte ned til neste linje"
 
-#: info/session.c:658
+#: info/session.c:635
 msgid "Move up to the previous line"
 msgstr "Flytte opp til den forrige linjen"
 
-#: info/session.c:673
+#: info/session.c:650
 msgid "Move to the end of the line"
 msgstr "Flytte til slutten av linjen"
 
-#: info/session.c:693
+#: info/session.c:670
 msgid "Move to the start of the line"
 msgstr "Flytte til starten av linjen"
 
-#: info/session.c:885 makeinfo/node.c:1357
+#: info/session.c:860 makeinfo/node.c:1424
 msgid "Next"
 msgstr "neste"
 
-#: info/session.c:888
+#: info/session.c:863
 msgid "Following Next node..."
-msgstr "F�ølger nestenoden..."
+msgstr "Følger nestenoden..."
 
-#: info/session.c:905
+#: info/session.c:881
 msgid "Selecting first menu item..."
-msgstr "Velger f�ørste menypunkt..."
+msgstr "Velger første menypunkt..."
 
-#: info/session.c:916
+#: info/session.c:893
 msgid "Selecting Next node..."
 msgstr "Velger nestenoden..."
 
-#: info/session.c:986
+#: info/session.c:964
 #, c-format
 msgid "Moving Up %d time(s), then Next."
 msgstr "Flytter opp %d gang(er), deretter neste."
 
-#: info/session.c:1010
+#: info/session.c:988
 msgid "No more nodes within this document."
 msgstr "Ingen flere noder i dette dokumentet."
 
-#: info/session.c:1034
+#: info/session.c:1011
 msgid "No `Prev' for this node."
-msgstr "Ingen �«forrige�» for denne noden."
+msgstr "Ingen «forrige» for denne noden."
 
-#: info/session.c:1037 info/session.c:1092
+#: info/session.c:1014 info/session.c:1073
 msgid "Moving Prev in this window."
 msgstr "Flytter til forrige i dette vinduet."
 
-#: info/session.c:1051
+#: info/session.c:1030
 msgid "No `Prev' or `Up' for this node within this document."
-msgstr "Ingen �«forrige�» eller �«opp�» for denne noden i dette dokumentet."
+msgstr "Ingen «forrige» eller «opp» for denne noden i dette dokumentet."
 
-#: info/session.c:1054
+#: info/session.c:1034
 msgid "Moving Up in this window."
 msgstr "Flytter opp i dette vinduet."
 
-#: info/session.c:1102
+#: info/session.c:1084
 msgid "Moving to `Prev's last menu item."
-msgstr "Flytter til �«forrige�»s siste menypunkt."
+msgstr "Flytter til «forrige»s siste menypunkt."
 
-#: info/session.c:1113
+#: info/session.c:1095
 msgid "Move forwards or down through node structure"
 msgstr "Flytte forover eller ned gjennom nodestrukturen"
 
-#: info/session.c:1129
+#: info/session.c:1111
 msgid "Move backwards or up through node structure"
 msgstr "Flytte tilbake eller opp gjennom nodestrukturen"
 
-#: info/session.c:1229
+#: info/session.c:1205
 msgid "Scroll forward in this window"
 msgstr "Rulle forover i dette vinduet"
 
-#: info/session.c:1237
+#: info/session.c:1213
 msgid "Scroll forward in this window and set default window size"
-msgstr "Rulle forover i dette vinduet og sette standard vindust�ørrelse"
+msgstr "Rulle forover i dette vinduet og sette standard vindustørrelse"
 
-#: info/session.c:1245
+#: info/session.c:1221
 msgid "Scroll forward in this window staying within node"
 msgstr "Rulle forover i dette vinduet, men forbli innenfor noden"
 
-#: info/session.c:1253
+#: info/session.c:1229
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr ""
 "Rulle forover i dette vinduet, forbli innenfor noden og sette standard "
-"vindust�ørrelse"
+"vindustørrelse"
 
-#: info/session.c:1261
+#: info/session.c:1237
 msgid "Scroll backward in this window"
 msgstr "Rulle bakover i dette vinduet"
 
-#: info/session.c:1269
+#: info/session.c:1245
 msgid "Scroll backward in this window and set default window size"
-msgstr "Rulle bakover i dette vinduet og sette standard vindust�ørrelse"
+msgstr "Rulle bakover i dette vinduet og sette standard vindustørrelse"
 
-#: info/session.c:1278
+#: info/session.c:1254
 msgid "Scroll backward in this window staying within node"
 msgstr "Rulle bakover i dette vinduet, men forbli innenfor noden"
 
-#: info/session.c:1286
+#: info/session.c:1262
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
 msgstr ""
 "Rulle bakover i dette vinduet, forbli innenfor noden og sette standard "
-"vindust�ørrelse"
+"vindustørrelse"
 
-#: info/session.c:1294
+#: info/session.c:1270
 msgid "Move to the start of this node"
 msgstr "Flytte til starten av denne noden"
 
-#: info/session.c:1301
+#: info/session.c:1277
 msgid "Move to the end of this node"
 msgstr "Flytte til slutten av denne noden"
 
-#: info/session.c:1308
+#: info/session.c:1284
 msgid "Scroll down by lines"
 msgstr "Rulle ned pr. antall linjer"
 
-#: info/session.c:1325
+#: info/session.c:1301
 msgid "Scroll up by lines"
 msgstr "Rulle opp pr. antall linjer"
 
-#: info/session.c:1343
+#: info/session.c:1319
 msgid "Scroll down by half screen size"
 msgstr "Rulle ned en halv side"
 
-#: info/session.c:1369
+#: info/session.c:1345
 msgid "Scroll up by half screen size"
 msgstr "Rulle opp en halv side"
 
-#: info/session.c:1398
+#: info/session.c:1374
 msgid "Select the next window"
 msgstr "Velge neste vindu"
 
-#: info/session.c:1437
+#: info/session.c:1413
 msgid "Select the previous window"
 msgstr "Velge forrige vindu"
 
-#: info/session.c:1488
+#: info/session.c:1464
 msgid "Split the current window"
 msgstr "Dele gjeldende vindu"
 
-#: info/session.c:1569
+#: info/session.c:1545
 msgid "Delete the current window"
 msgstr "Slette den gjeldende vindu"
 
-#: info/session.c:1577
+#: info/session.c:1553
 msgid "Cannot delete a permanent window"
 msgstr "Kan ikke slette et permanent vindu"
 
-#: info/session.c:1610
+#: info/session.c:1585
 msgid "Delete all other windows"
 msgstr "Slette alle andre vinduer"
 
-#: info/session.c:1656
+#: info/session.c:1631
 msgid "Scroll the other window"
 msgstr "Rulle det andre vinduet"
 
-#: info/session.c:1677
+#: info/session.c:1652
 msgid "Scroll the other window backward"
 msgstr "Rulle det andre vinduet bakover"
 
-#: info/session.c:1683
+#: info/session.c:1658
 msgid "Grow (or shrink) this window"
-msgstr "�Øke (eller minke) dette vinduet"
+msgstr "Øke (eller minke) dette vinduet"
 
-#: info/session.c:1694
+#: info/session.c:1669
 msgid "Divide the available screen space among the visible windows"
 msgstr "Dele den tilgjengelige skjermplassen mellom de synlige vinduene"
 
-#: info/session.c:1701
+#: info/session.c:1676
 msgid "Toggle the state of line wrapping in the current window"
 msgstr "Veksle tilstanden til linjebryting i gjeldende vindu"
 
-#: info/session.c:1880
+#: info/session.c:1848
 msgid "Select the Next node"
 msgstr "Velge neste node"
 
-#: info/session.c:1888
+#: info/session.c:1856
 msgid "Select the Prev node"
 msgstr "Velge forrige node"
 
-#: info/session.c:1896
+#: info/session.c:1864
 msgid "Select the Up node"
 msgstr "Velge oppnoden"
 
-#: info/session.c:1903
+#: info/session.c:1871
 msgid "Select the last node in this file"
 msgstr "Velge den siste noden i denne filen"
 
-#: info/session.c:1930 info/session.c:1963
+#: info/session.c:1898 info/session.c:1931
 msgid "This window has no additional nodes"
 msgstr "Dette vinduet har ingen andre noder"
 
-#: info/session.c:1936
+#: info/session.c:1904
 msgid "Select the first node in this file"
-msgstr "Velge f�ørste node i denne filen"
+msgstr "Velge første node i denne filen"
 
-#: info/session.c:1970
+#: info/session.c:1938
 msgid "Select the last item in this node's menu"
 msgstr "Velge det siste punktet i nodens meny"
 
-#: info/session.c:1976
+#: info/session.c:1944
 msgid "Select this menu item"
 msgstr "Velge dette menypunktet"
 
-#: info/session.c:2005
+#: info/session.c:1977
 #, c-format
 msgid "There aren't %d items in this menu."
 msgstr "Det er ikke %d punkter i denne menyen."
 
-#: info/session.c:2148
+#: info/session.c:2171 info/session.c:2172
 #, c-format
 msgid "Menu item (%s): "
 msgstr "Menypunkt (%s): "
 
-#: info/session.c:2150
+#: info/session.c:2175
 msgid "Menu item: "
 msgstr "Menypunkt: "
 
-#: info/session.c:2155
+#: info/session.c:2182 info/session.c:2183
 #, c-format
 msgid "Follow xref (%s): "
-msgstr "F�ølge kryssreferanse (%s): "
+msgstr "Følge kryssreferanse (%s): "
 
-#: info/session.c:2157
+#: info/session.c:2186
 msgid "Follow xref: "
-msgstr "F�ølge kryssreferanse: "
+msgstr "Følge kryssreferanse: "
 
-#: info/session.c:2280
+#: info/session.c:2315
 msgid "Read a menu item and select its node"
 msgstr "Lese et menyvalg og velge dens node"
 
-#: info/session.c:2288
+#: info/session.c:2323
 msgid "Read a footnote or cross reference and select its node"
 msgstr "Lese en fotnote eller kryssreferanse og velge dens node"
 
-#: info/session.c:2294
+#: info/session.c:2329
 msgid "Move to the start of this node's menu"
 msgstr "Flytte til starten av denne nodens meny"
 
-#: info/session.c:2318
+#: info/session.c:2353
 msgid "Visit as many menu items at once as possible"
-msgstr "Bes�øke s�å mange menypunkter som mulig samtidig"
+msgstr "Besøke så mange menypunkter som mulig samtidig"
 
-#: info/session.c:2346
+#: info/session.c:2381
 msgid "Read a node name and select it"
 msgstr "Lese et nodenavn og velge det"
 
-#: info/session.c:2401 info/session.c:2405
+#: info/session.c:2436 info/session.c:2441
 msgid "Goto node: "
-msgstr "G�å til node: "
+msgstr "Gå til node: "
 
-#: info/session.c:2471
+#: info/session.c:2505
 #, c-format
 msgid "No menu in node `%s'."
-msgstr "Ingen meny i noden �«%s�»."
+msgstr "Ingen meny i noden «%s»."
 
-#: info/session.c:2516
+#: info/session.c:2551
 #, c-format
 msgid "No menu item `%s' in node `%s'."
-msgstr "Ingen menypunkt �«%s�» i noden �«%s�»."
+msgstr "Ingen menypunkt «%s» i noden «%s»."
 
-#: info/session.c:2546
+#: info/session.c:2581
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
-msgstr "Klarte ikke �å finne noden referert av �«%s�» i �«%s�»."
+msgstr "Klarte ikke å finne noden referert av «%s» i «%s»."
 
-#: info/session.c:2597
+#: info/session.c:2631
 msgid "Read a list of menus starting from dir and follow them"
-msgstr "Lese en liste over menyer fra dir og f�ølge dem"
+msgstr "Lese en liste over menyer fra dir og følge dem"
 
-#: info/session.c:2599
+#: info/session.c:2633
 msgid "Follow menus: "
-msgstr "F�ølge menyer: "
+msgstr "Følge menyer: "
 
-#: info/session.c:2797
+#: info/session.c:2826
 msgid "Find the node describing program invocation"
-msgstr "Finne noden som beskriver bruksm�åten for programmet"
+msgstr "Finne noden som beskriver bruksmåten for programmet"
 
-#: info/session.c:2799
+#: info/session.c:2828
 #, c-format
 msgid "Find Invocation node of [%s]: "
 msgstr "Finne Invocation-noden til [%s]: "
 
-#: info/session.c:2837
+#: info/session.c:2866
 msgid "Read a manpage reference and select it"
 msgstr "Lese en manualside-referanse og velge den"
 
-#: info/session.c:2841
+#: info/session.c:2870
 msgid "Get Manpage: "
 msgstr "Hent manualsiden: "
 
-#: info/session.c:2871
+#: info/session.c:2900
 msgid "Select the node `Top' in this file"
-msgstr "Velge �«Top�»-noden i denne filen"
+msgstr "Velge «Top»-noden i denne filen"
 
-#: info/session.c:2877
+#: info/session.c:2906
 msgid "Select the node `(dir)'"
-msgstr "Velge noden �«(dir)�»"
+msgstr "Velge noden «(dir)»"
 
-#: info/session.c:2897
+#: info/session.c:2923 info/session.c:2925
 #, c-format
 msgid "Kill node (%s): "
 msgstr "Slette noden (%s): "
 
-#: info/session.c:2951
+#: info/session.c:2977
 #, c-format
 msgid "Cannot kill node `%s'"
-msgstr "Kan ikke slette noden �«%s�»"
+msgstr "Kan ikke slette noden «%s»"
 
-#: info/session.c:2961
+#: info/session.c:2987
 msgid "Cannot kill the last node"
 msgstr "Kan ikke slette den forrige noden"
 
-#: info/session.c:3047
+#: info/session.c:3073
 msgid "Select the most recently selected node"
 msgstr "Velge den sist valgte noden"
 
-#: info/session.c:3053
+#: info/session.c:3079
 msgid "Kill this node"
 msgstr "Slette denne noden"
 
-#: info/session.c:3061
+#: info/session.c:3087
 msgid "Read the name of a file and select it"
-msgstr "Lese inn navnet p�å en fil og velge den"
+msgstr "Lese inn navnet på en fil og velge den"
 
-#: info/session.c:3065
+#: info/session.c:3091
 msgid "Find file: "
 msgstr "Finne fil: "
 
-#: info/session.c:3082
+#: info/session.c:3108
 #, c-format
 msgid "Cannot find `%s'."
-msgstr "Kan ikke finne �«%s�»."
+msgstr "Kan ikke finne «%s»."
 
-#: info/session.c:3127 info/session.c:3248
+#: info/session.c:3151 info/session.c:3269
 #, c-format
 msgid "Could not create output file `%s'."
-msgstr "Kunne ikke opprette utskriftsfil �«%s�»."
+msgstr "Kunne ikke opprette utskriftsfil «%s»."
 
-#: info/session.c:3140 info/session.c:3265 info/session.c:3326
+#: info/session.c:3165 info/session.c:3287 info/session.c:3347
 msgid "Done."
 msgstr "Ferdig."
 
-#: info/session.c:3196
+#: info/session.c:3220
 #, c-format
 msgid "Writing node %s..."
-msgstr "Skriver noden �«%s�»..."
+msgstr "Skriver noden «%s»..."
 
-# I need a better substitute for the verb �«to pipe�».
-# �«�Å pipe�» sounds no good to me.
-#: info/session.c:3274
+# I need a better substitute for the verb «to pipe».
+# «Å pipe» sounds no good to me.
+#: info/session.c:3296
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
-msgstr "�«Pipe�» innholdet av denne noden gjennom INFO_PRINT_COMMAND"
+msgstr "«Pipe» innholdet av denne noden gjennom INFO_PRINT_COMMAND"
 
-#: info/session.c:3310
+#: info/session.c:3331
 #, c-format
 msgid "Cannot open pipe to `%s'."
-msgstr "Kan ikke �åpne �«pipe�» til �«%s�»."
+msgstr "Kan ikke åpne «pipe» til «%s»."
 
-#: info/session.c:3316
+#: info/session.c:3337
 #, c-format
 msgid "Printing node %s..."
-msgstr "Skriver ut noden �«%s�»..."
+msgstr "Skriver ut noden «%s»..."
 
-#: info/session.c:3558
+#: info/session.c:3567
 #, c-format
 msgid "Searching subfile %s ..."
-msgstr "S�øker i delfil �«%s�»..."
+msgstr "Søker i delfil «%s»..."
 
-#: info/session.c:3610
+#: info/session.c:3619
 msgid "Read a string and search for it case-sensitively"
 msgstr ""
-"Lese inn en streng og s�øke etter den med skille p�å store og sm�å bokstaver"
+"Lese inn en streng og søke etter den med skille på store og små bokstaver"
 
-#: info/session.c:3617
+#: info/session.c:3626
 msgid "Read a string and search for it"
-msgstr "Lese inn en streng og s�øke etter den"
+msgstr "Lese inn en streng og søke etter den"
 
-#: info/session.c:3625
+#: info/session.c:3634
 msgid "Read a string and search backward for it"
-msgstr "Lese inn en streng og s�øke bakover etter den"
+msgstr "Lese inn en streng og søke bakover etter den"
 
-#: info/session.c:3667
+#: info/session.c:3670 info/session.c:3677
 #, c-format
 msgid "%s%sfor string [%s]: "
 msgstr "%s%setter streng [%s]: "
 
-#: info/session.c:3668
+#: info/session.c:3671 info/session.c:3678
 msgid "Search backward"
-msgstr "S�øke bakover"
+msgstr "Søke bakover"
 
-#: info/session.c:3668
+#: info/session.c:3672 info/session.c:3678
 msgid "Search"
-msgstr "S�øke"
+msgstr "Søke"
 
-#: info/session.c:3669
+#: info/session.c:3673 info/session.c:3679
 msgid " case-sensitively "
-msgstr " med skille p�å store og sm�å bokstaver "
+msgstr " med skille på store og små bokstaver "
 
-#: info/session.c:3669
+#: info/session.c:3674 info/session.c:3679
 msgid " "
 msgstr " "
 
-#: info/session.c:3709
+#: info/session.c:3718
 msgid "Search failed."
-msgstr "S�øk mislyktes"
+msgstr "Søk mislyktes"
 
-#: info/session.c:3727
+#: info/session.c:3736
 msgid "Repeat last search in the same direction"
-msgstr "Gjenta forrige s�øk i samme retning"
+msgstr "Gjenta forrige søk i samme retning"
 
-#: info/session.c:3730 info/session.c:3740
+#: info/session.c:3739 info/session.c:3749
 msgid "No previous search string"
-msgstr "Ingen tidligere s�økestreng"
+msgstr "Ingen tidligere søkestreng"
 
-#: info/session.c:3737
+#: info/session.c:3746
 msgid "Repeat last search in the reverse direction"
-msgstr "Gjenta forrige s�øk i motsatt retning"
+msgstr "Gjenta forrige søk i motsatt retning"
 
-#: info/session.c:3755 info/session.c:3761
+#: info/session.c:3765 info/session.c:3771
 msgid "Search interactively for a string as you type it"
-msgstr "S�øke interaktivt for en streng mens du skriver"
+msgstr "Søke interaktivt for en streng mens du skriver"
 
-#: info/session.c:3855
+#: info/session.c:3851
 msgid "I-search backward: "
-msgstr "I-s�øk bakover: "
+msgstr "I-søk bakover: "
 
-#: info/session.c:3857
+#: info/session.c:3853
 msgid "I-search: "
-msgstr "I-s�øk: "
+msgstr "I-søk: "
 
-#: info/session.c:3882
+#: info/session.c:3878 info/session.c:3880
 msgid "Failing "
 msgstr "Mislyktes "
 
@@ -1547,31 +1566,31 @@ msgstr "Flytte til neste kryssreferanse"
 
 #: info/session.c:4359
 msgid "Select reference or menu item appearing on this line"
-msgstr "Velge referanse eller menypunkt p�å denne linjen"
+msgstr "Velge referanse eller menypunkt på denne linjen"
 
-#: info/session.c:4381
+#: info/session.c:4382
 msgid "Cancel current operation"
 msgstr "Avbryte gjeldende operasjon"
 
-#: info/session.c:4388
+#: info/session.c:4389
 msgid "Quit"
 msgstr "Avbrutt"
 
-#: info/session.c:4397
+#: info/session.c:4398
 msgid "Move the cursor to a specific line of the window"
-msgstr "Flytte mark�øren til en angitt linje i vinduet"
+msgstr "Flytte markøren til en angitt linje i vinduet"
 
-#: info/session.c:4429
+#: info/session.c:4430
 msgid "Redraw the display"
-msgstr "Tegne skjermen p�å nytt"
+msgstr "Tegne skjermen på nytt"
 
-#: info/session.c:4466
+#: info/session.c:4467
 msgid "Quit using Info"
 msgstr "Avslutte Info"
 
-#: info/session.c:4479
+#: info/session.c:4480
 msgid "Run command bound to this key's lowercase variant"
-msgstr "Kj�ør kommandoen knyttet til denne tastens �«liten-bokstav-variant�»"
+msgstr "Kjør kommandoen knyttet til denne tastens «liten-bokstav-variant»"
 
 #: info/session.c:4491
 #, c-format
@@ -1579,67 +1598,69 @@ msgid "Unknown command (%s)."
 msgstr "Ukjent kommando (%s)."
 
 #: info/session.c:4494
-msgid "\"\" is invalid"
-msgstr "�«�» er ugyldig"
-
-#: info/session.c:4495
 #, c-format
 msgid "\"%s\" is invalid"
-msgstr "�«%s�» er ugyldig"
+msgstr "«%s» er ugyldig"
+
+#: info/session.c:4495
+#, fuzzy, c-format
+msgid "`%s' is invalid"
+msgstr "«%s» er ugyldig"
 
-#: info/session.c:4713
+#: info/session.c:4709
 msgid "Add this digit to the current numeric argument"
 msgstr "Legge til dette siffret til det gjeldende numeriske argumentet"
 
-#: info/session.c:4722
+#: info/session.c:4718
 msgid "Start (or multiply by 4) the current numeric argument"
 msgstr "Starte (eller multiplisere med 4) den gjeldende numeriske argumentet"
 
-#: info/session.c:4737
+#: info/session.c:4733
 msgid "Internally used by \\[universal-argument]"
 msgstr "Brukt internt av \\[universal-argument]"
 
-#: info/tilde.c:344
+#: info/tilde.c:338
+#, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: Tomt for virtuelt minne!\n"
 
 #: info/variables.c:37
 msgid "When \"On\", footnotes appear and disappear automatically"
-msgstr "N�år �«On�», oppst�år og forsvinner fotnoter automatisk"
+msgstr "Når «On», oppstår og forsvinner fotnoter automatisk"
 
 #: info/variables.c:41
 msgid "When \"On\", creating or deleting a window resizes other windows"
 msgstr ""
-"N�år �«On�», laging eller fjerning av vinduer endrer st�ørrelsen p�å andre vinduer"
+"Når «On», laging eller fjerning av vinduer endrer størrelsen på andre vinduer"
 
 #: info/variables.c:45
 msgid "When \"On\", flash the screen instead of ringing the bell"
-msgstr "N�år �«On�», blink skjermen istedet for �å ringe i bjellen."
+msgstr "Når «On», blink skjermen istedet for å ringe i bjellen."
 
 #: info/variables.c:49
 msgid "When \"On\", errors cause the bell to ring"
-msgstr "N�år �«On�», feil f�år bjellen til �å ringe"
+msgstr "Når «On», feil får bjellen til å ringe"
 
 #: info/variables.c:53
 msgid "When \"On\", Info garbage collects files which had to be uncompressed"
-msgstr "N�år �«On�», Info s�øppelhenter filer som m�åtte dekomprimeres"
+msgstr "Når «On», Info søppelhenter filer som måtte dekomprimeres"
 
 #: info/variables.c:56
 msgid "When \"On\", the portion of the matched search string is highlighted"
-msgstr "N�år �«On�», den delen av en matchende s�økestreng blir uthevet"
+msgstr "Når «On», den delen av en matchende søkestreng blir uthevet"
 
 #: info/variables.c:60
 msgid "Controls what happens when scrolling is requested at the end of a node"
 msgstr ""
-"Kontrollerer hva som skjer n�år rulling er �ønsket ved slutten av en node"
+"Kontrollerer hva som skjer når rulling er ønsket ved slutten av en node"
 
 #: info/variables.c:64
 msgid "The number lines to scroll when the cursor moves out of the window"
-msgstr "Antall linjer som skal rulles n�år mark�øren flyttes utenfor vinduet"
+msgstr "Antall linjer som skal rulles når markøren flyttes utenfor vinduet"
 
 #: info/variables.c:68
 msgid "When \"On\", Info accepts and displays ISO Latin characters"
-msgstr "N�år �«On�», aksepterer og viser Info ISO-Latin-tegn"
+msgstr "Når «On», aksepterer og viser Info ISO-Latin-tegn"
 
 #: info/variables.c:74
 msgid "Explain the use of a variable"
@@ -1667,479 +1688,559 @@ msgstr "Sette %s til verdien (%d): "
 msgid "Set %s to value (%s): "
 msgstr "Sette %s til verdien (%s): "
 
-#: info/window.c:1164
+#: info/window.c:1138
 msgid "--*** Tags out of Date ***"
 msgstr "--*** Tagger er ute av synk ***"
 
-#: info/window.c:1175
+#: info/window.c:1149
 msgid "-----Info: (), lines ----, "
 msgstr "-----Info: (), linjer ----, "
 
-#: info/window.c:1182
+#: info/window.c:1156
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr "-%s---Info: %s, %d linjer --%s--"
 
-#: info/window.c:1186
+#: info/window.c:1160
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr "-%s%s-Info: (%s)%s, %d linjer --%s--"
 
-#: info/window.c:1193
+#: info/window.c:1167
 #, c-format
 msgid " Subfile: %s"
 msgstr " Delfil: %s"
 
-#: lib/getopt.c:675
+#: lib/getopt.c:551 lib/getopt.c:570
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: valget �«%s�» er flertydig\n"
+msgstr "%s: valget «%s» er flertydig\n"
 
-#: lib/getopt.c:700
+#: lib/getopt.c:603 lib/getopt.c:607
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: valget �«--%s�» tillater ikke et argument\n"
+msgstr "%s: valget «--%s» tillater ikke et argument\n"
 
-#: lib/getopt.c:705
+#: lib/getopt.c:616 lib/getopt.c:621
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: valget �«%c%s�» tillater ikke et argument\n"
+msgstr "%s: valget «%c%s» tillater ikke et argument\n"
 
-#: lib/getopt.c:723 lib/getopt.c:896
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: valget �«%s�» krever et argument\n"
+msgstr "%s: valget «%s» krever et argument\n"
 
-#: lib/getopt.c:752
+#: lib/getopt.c:727 lib/getopt.c:730
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: ukjent valg �«--%s�»\n"
+msgstr "%s: ukjent valg «--%s»\n"
 
-#: lib/getopt.c:756
+#: lib/getopt.c:738 lib/getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: ukjent valg �«%c%s�»\n"
+msgstr "%s: ukjent valg «%c%s»\n"
 
-#: lib/getopt.c:782
+#: lib/getopt.c:796 lib/getopt.c:799
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: ulovlig valg -- %c\n"
 
-#: lib/getopt.c:785
+#: lib/getopt.c:805 lib/getopt.c:808
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ugyldig valg -- %c\n"
 
-#: lib/getopt.c:815 lib/getopt.c:945
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: valget krever et argument -- %c\n"
 
-#: lib/getopt.c:862
+#: lib/getopt.c:935 lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: valget �«-W %s�» er flertydig\n"
+msgstr "%s: valget «-W %s» er flertydig\n"
 
-#: lib/getopt.c:880
+#: lib/getopt.c:978 lib/getopt.c:999
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: valget �«-W %s�» tillater ikke et argument\n"
+msgstr "%s: valget «-W %s» tillater ikke et argument\n"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#, fuzzy, c-format
+msgid "arguments to @%s ignored"
+msgstr "Ugyldig argument til %c%s"
+
+#: makeinfo/cmds.c:585
 msgid "January"
 msgstr "januar"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "February"
 msgstr "februar"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "March"
 msgstr "mars"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "April"
 msgstr "april"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "May"
 msgstr "mai"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "June"
 msgstr "juni"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "July"
 msgstr "juli"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "August"
 msgstr "august"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "September"
 msgstr "september"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "October"
 msgstr "oktober"
 
-#: makeinfo/cmds.c:517
+#: makeinfo/cmds.c:587
 msgid "November"
 msgstr "november"
 
-#: makeinfo/cmds.c:517
+#: makeinfo/cmds.c:587
 msgid "December"
 msgstr "desember"
 
-#: makeinfo/cmds.c:658
+#: makeinfo/cmds.c:936
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "usannsynlig tegn %c i @var"
 
-#: makeinfo/cmds.c:701
+#: makeinfo/cmds.c:979
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "@sc-argument med store bokstaver, dermed ingen effekt"
 
-#: makeinfo/cmds.c:759
+#: makeinfo/cmds.c:1034
 #, c-format
 msgid "`{' expected, but saw `%c'"
-msgstr "�«{�» forventet, men s�å �«%c�»"
+msgstr "«{» forventet, men så «%c»"
 
-#: makeinfo/cmds.c:789
+#: makeinfo/cmds.c:1074
 msgid "end of file inside verb block"
-msgstr "slutt-p�å-fila inne i verb-blokk"
+msgstr "slutt-på-fila inne i verb-blokk"
 
-#: makeinfo/cmds.c:797
+#: makeinfo/cmds.c:1082
 #, c-format
 msgid "`}' expected, but saw `%c'"
-msgstr "�«{�» forventet, men s�å �«%c�»"
+msgstr "«{» forventet, men så «%c»"
 
-#: makeinfo/cmds.c:942
+#: makeinfo/cmds.c:1112
+msgid ""
+"@strong{Note...} produces a spurious cross-reference in Info; reword to "
+"avoid that"
+msgstr ""
+
+#: makeinfo/cmds.c:1305
 #, c-format
 msgid "%c%s is obsolete"
-msgstr "%c%s er utg�ått"
+msgstr "%c%s er utgått"
 
-#: makeinfo/cmds.c:1014
+#: makeinfo/cmds.c:1414
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "@sp krever et positivt numerisk argument, ikke `%s'"
 
-#: makeinfo/cmds.c:1348 makeinfo/cmds.c:1374 makeinfo/footnote.c:81
+#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "Ugyldig argument til %c%s"
 
-#: makeinfo/cmds.c:1358 makeinfo/makeinfo.c:4140
+#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
 msgid "asis"
 msgstr "asis"
 
-#: makeinfo/cmds.c:1360 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
 msgid "none"
 msgstr "none"
 
-#: makeinfo/defun.c:85
+#: makeinfo/cmds.c:1789
+#, fuzzy, c-format
+msgid "Bad argument to @%s"
+msgstr "Ugyldig argument til %c%s"
+
+#: makeinfo/cmds.c:1803
+msgid "insert"
+msgstr "insert"
+
+#: makeinfo/defun.c:84
 msgid "Missing `}' in @def arg"
-msgstr "Manglende �«}�» i @def-arg"
+msgstr "Manglende «}» i @def-arg"
 
-#: makeinfo/defun.c:363
+#: makeinfo/defun.c:403
 msgid "Function"
 msgstr "Funksjon"
 
-#: makeinfo/defun.c:366
+#: makeinfo/defun.c:406
 msgid "Macro"
 msgstr "Makro"
 
-#: makeinfo/defun.c:369
+#: makeinfo/defun.c:409
 msgid "Special Form"
 msgstr "Spesiell form"
 
-#: makeinfo/defun.c:373
+#: makeinfo/defun.c:413
 msgid "Variable"
 msgstr "Variabel"
 
-#: makeinfo/defun.c:376
+#: makeinfo/defun.c:416
 msgid "User Option"
 msgstr "Brukervalg"
 
-#: makeinfo/defun.c:380
+#: makeinfo/defun.c:420
 msgid "Instance Variable"
 msgstr "Forekomst"
 
-#: makeinfo/defun.c:384
+#: makeinfo/defun.c:424
 msgid "Method"
 msgstr "Metode"
 
-#: makeinfo/defun.c:466 makeinfo/defun.c:470 makeinfo/defun.c:615
-#: makeinfo/defun.c:631 makeinfo/defun.c:671
+#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
+#: makeinfo/defun.c:644 makeinfo/xml.c:2229
 msgid "of"
 msgstr "av"
 
-#: makeinfo/defun.c:474 makeinfo/defun.c:478 makeinfo/defun.c:482
-#: makeinfo/defun.c:624 makeinfo/defun.c:676
+#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
 msgid "on"
-msgstr "p�å"
+msgstr "på"
 
-#: makeinfo/defun.c:717
+#: makeinfo/defun.c:711
 #, c-format
-msgid "Must be in `%s' insertion to use `%sx'"
-msgstr "M�å v�ære i en �«%s�»-innsetting for �å bruke �«%sx�»"
+msgid "Must be in `@%s' environment to use `@%s'"
+msgstr "Må være i et «@%s»-miljø for å bruke «@%s»"
 
-#: makeinfo/files.c:448
+#: makeinfo/files.c:435
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr "%s: getwd: %s, %s\n"
 
+#: makeinfo/files.c:638
+#, c-format
+msgid "`%s' omitted before output filename"
+msgstr ""
+
+#: makeinfo/files.c:646
+#, c-format
+msgid "`%s' omitted since writing to stdout"
+msgstr ""
+
+#: makeinfo/files.c:694
+msgid "Output buffer not empty."
+msgstr ""
+
 #: makeinfo/footnote.c:150
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
-msgstr "�«%c%s�» trenger et argument �«{...}�», ikke bare �«%s�»"
+msgstr "«%c%s» trenger et argument «{...}», ikke bare «%s»"
 
 #: makeinfo/footnote.c:165
 #, c-format
 msgid "No closing brace for footnote `%s'"
-msgstr "Ingen avsluttende kr�øllparentes for fotnoten �«%s�»"
+msgstr "Ingen avsluttende krøllparentes for fotnoten «%s»"
 
 #: makeinfo/footnote.c:198
 msgid "Footnote defined without parent node"
 msgstr "Fotnote definert uten foreldrenode"
 
 #: makeinfo/footnote.c:210
-#, fuzzy
 msgid "Footnotes inside footnotes are not allowed"
-msgstr "Fotnote definert uten foreldrenode"
+msgstr "Fotnoter i fotnoter er ikke tillatt"
 
-#: makeinfo/footnote.c:298
+#: makeinfo/footnote.c:302 makeinfo/index.c:189
 msgid "Footnotes"
 msgstr "Fotnoter"
 
-#: makeinfo/html.c:42
+#: makeinfo/html.c:87
+#, c-format
+msgid "%s: could not open --css-file: %s"
+msgstr "%s: kunne ikke åpne --css-file: %s"
+
+#: makeinfo/html.c:172
+#, c-format
+msgid "%s:%d: --css-file ended in comment"
+msgstr "%s:%d: --css-file endte i en kommentar"
+
+#: makeinfo/html.c:207
 msgid "Untitled"
 msgstr "Uten navn"
 
-#: makeinfo/html.c:298
+#: makeinfo/html.c:422
+msgid "[unexpected] no html tag to pop"
+msgstr "[uforventet] kunne ikke poppe neste htmltagg"
+
+#: makeinfo/html.c:752
 #, c-format
-msgid "Invalid node name: `%s'"
-msgstr "Ugyldig nodenavn: �«%s�»"
+msgid "[unexpected] invalid node name: `%s'"
+msgstr "[uforventet] ugyldig nodenavn: «%s»"
 
-#: makeinfo/index.c:213
+#: makeinfo/index.c:169
 #, c-format
 msgid "Unknown index `%s'"
-msgstr "Ukjent indeks �«%s�»"
+msgstr "Ukjent indeks «%s»"
 
-#: makeinfo/index.c:238
+#: makeinfo/index.c:234
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
-msgstr "Info kan ikke h�åndtere `:' i indeksinnslaget `%s'"
+msgstr "Info kan ikke håndtere `:' i indeksinnslaget `%s'"
 
-#: makeinfo/index.c:396
+#: makeinfo/index.c:412
 #, c-format
 msgid "Index `%s' already exists"
-msgstr "Indeksen �«%s�» eksisterer allerede"
+msgstr "Indeksen «%s» eksisterer allerede"
 
-#: makeinfo/index.c:439
+#: makeinfo/index.c:455
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
-msgstr "Ukjent indeks �«%s�» og/eller �«%s�» i @synindex"
+msgstr "Ukjent indeks «%s» og/eller «%s» i @synindex"
 
-#: makeinfo/index.c:666
+#: makeinfo/index.c:661
+msgid "(line )"
+msgstr ""
+
+#: makeinfo/index.c:669
+#, c-format
+msgid "(line %*d)"
+msgstr ""
+
+#: makeinfo/index.c:750
 #, c-format
 msgid "Unknown index `%s' in @printindex"
-msgstr "Ukjent indeks �«%s�» i @printindex"
+msgstr "Ukjent indeks «%s» i @printindex"
 
-#: makeinfo/index.c:709
+#: makeinfo/index.c:819
 #, c-format
 msgid "Entry for index `%s' outside of any node"
-msgstr "Innslag for indeksen �«%s�» utenfor node"
+msgstr "Innslag for indeksen «%s» utenfor node"
 
-#: makeinfo/index.c:712 makeinfo/index.c:751
+#: makeinfo/index.c:822 makeinfo/index.c:858
 msgid "(outside of any node)"
 msgstr "(utenfor noder)"
 
-#: makeinfo/insertion.c:198
+#: makeinfo/index.c:919 makeinfo/index.c:925
+msgid "See "
+msgstr "Se "
+
+#: makeinfo/insertion.c:160
+msgid "@item not allowed in argument to @itemize"
+msgstr "@item er ikke tillatt som argument til @itemize"
+
+#: makeinfo/insertion.c:238
 msgid "Broken-Type in insertion_type_pname"
 msgstr "Broken-Type i insertion_type_pname"
 
-#: makeinfo/insertion.c:271
+#: makeinfo/insertion.c:334
 msgid "Enumeration stack overflow"
 msgstr "Stakkoverflyt ved oppramsing"
 
-#: makeinfo/insertion.c:303
+#: makeinfo/insertion.c:366
 #, c-format
 msgid "lettering overflow, restarting at %c"
-msgstr "bokstavoverflyt, starter p�å nytt ved %c"
+msgstr "bokstavoverflyt, starter på nytt ved %c"
 
-#: makeinfo/insertion.c:538
+#: makeinfo/insertion.c:631
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
 msgstr "%s krever et argument: formattereren for %citem"
 
-#: makeinfo/insertion.c:693
+#: makeinfo/insertion.c:719
+#, c-format
+msgid "%cfloat environments cannot be nested"
+msgstr ""
+
+#: makeinfo/insertion.c:973
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
-msgstr "`@end' forventet �«%s�», men s�å �«%s�»"
+msgstr "`@end' forventet «%s», men så «%s»"
 
-#: makeinfo/insertion.c:931
+#: makeinfo/insertion.c:1337
 #, c-format
 msgid "No matching `%cend %s'"
-msgstr "Ingen tilsvarende �«%cend %s�»"
+msgstr "Ingen tilsvarende «%cend %s»"
 
-#: makeinfo/insertion.c:1084
+#: makeinfo/insertion.c:1592
 #, c-format
 msgid "%s requires letter or digit"
 msgstr "%s krever en bokstav eller et siffer"
 
-#: makeinfo/insertion.c:1158
+#: makeinfo/insertion.c:1687
 msgid "end of file inside verbatim block"
-msgstr "slutt-p�å-filen inne i verbatimblokk"
+msgstr "slutt-på-filen inne i verbatimblokk"
 
-#: makeinfo/insertion.c:1318
+#: makeinfo/insertion.c:1913
+#, fuzzy, c-format
+msgid "@%s not meaningful outside `@float' environment"
+msgstr "@%s er meningsløs innenfor en «%s»-blokk"
+
+#: makeinfo/insertion.c:1949
 msgid "@menu seen before first @node, creating `Top' node"
-msgstr "@menu sett f�ør f�ørste @node, oppretter �«Top�»-noden"
+msgstr "@menu sett før første @node, oppretter «Top»-noden"
 
-#: makeinfo/insertion.c:1319
+#: makeinfo/insertion.c:1950
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr ""
 "kanskje burde din @top-node bli pakket inn i @ifnottex istedet for @ifinfo?"
 
-#: makeinfo/insertion.c:1331
+#: makeinfo/insertion.c:1962
 msgid "@detailmenu seen before first node, creating `Top' node"
-msgstr "@detailmenu sett f�ør f�ørste node, oppretter �«Top�»-noden"
+msgstr "@detailmenu sett før første node, oppretter «Top»-noden"
+
+#: makeinfo/insertion.c:2018
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr ""
+
+#: makeinfo/insertion.c:2032
+#, fuzzy, c-format
+msgid "@%s not meaningful outside `@titlepage' environment"
+msgstr "@%s er meningsløs innenfor en «%s»-blokk"
 
-#: makeinfo/insertion.c:1346
+#: makeinfo/insertion.c:2063
 #, c-format
 msgid "Unmatched `%c%s'"
-msgstr "Umatchet �«%c%s�»"
+msgstr "Umatchet «%c%s»"
 
-#: makeinfo/insertion.c:1353
+#: makeinfo/insertion.c:2068
 #, c-format
 msgid "`%c%s' needs something after it"
-msgstr "�«%c%s�» trenger noe etter den"
+msgstr "«%c%s» trenger noe etter den"
 
-#: makeinfo/insertion.c:1359
-#, c-format
-msgid "Bad argument to `%s', `%s', using `%s'"
-msgstr "Ugyldig argument til �«%s�», �«%s�», bruker �«%s�»"
+#: makeinfo/insertion.c:2074
+#, fuzzy, c-format
+msgid "Bad argument `%s' to `@%s', using `%s'"
+msgstr "Ugyldig argument til «%s», «%s», bruker «%s»"
 
-#: makeinfo/insertion.c:1453
+#: makeinfo/insertion.c:2171
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
-msgstr "@%s er meningsl�øs innenfor en �«%s�»-blokk"
+msgstr "@%s er meningsløs innenfor en «%s»-blokk"
 
-#: makeinfo/insertion.c:1462
+#: makeinfo/insertion.c:2180
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
-msgstr "@itemx er meningsl�øs innenfor en �«%s�»-blokk"
+msgstr "@itemx er meningsløs innenfor en «%s»-blokk"
 
-#: makeinfo/insertion.c:1646
+#: makeinfo/insertion.c:2356
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "%c%s funnet utenfor en innsettingsblokk"
 
-#: makeinfo/lang.c:331
+#: makeinfo/lang.c:580
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
-msgstr "%s er ikke en gyldig ISO 639-spr�åkkode"
+msgstr "%s er ikke en gyldig ISO 639-språkkode"
 
-#: makeinfo/lang.c:384
+#: makeinfo/lang.c:655
 #, c-format
-msgid "unrecogized encoding name `%s'"
-msgstr "ukjent kodingsnavn �«%s�»"
+msgid "unrecognized encoding name `%s'"
+msgstr "ugjenkjennelig kodingsnavn «%s»"
 
-#: makeinfo/lang.c:387
+#: makeinfo/lang.c:663
 #, c-format
 msgid "sorry, encoding `%s' not supported"
-msgstr "beklager, kodingen �«%s�» er ikke st�øttet"
+msgstr "beklager, kodingen «%s» er ikke støttet"
 
-#: makeinfo/lang.c:414
+#: makeinfo/lang.c:715
 #, c-format
 msgid "invalid encoded character `%s'"
-msgstr "Ugyldig kodet tegn �«%s�»"
+msgstr "Ugyldig kodet tegn «%s»"
 
-#: makeinfo/lang.c:502
-#, c-format
-msgid "%s is an invalid ISO code, using %c"
-msgstr "%s er en ugyldig ISO-kode, bruker %c"
-
-#: makeinfo/lang.c:687
+#: makeinfo/lang.c:1009
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
-msgstr "%c%s forventer �«i�» eller �«j�» som argument, ikke �«%c�»"
+msgstr "%c%s forventer «i» eller «j» som argument, ikke «%c»"
 
-#: makeinfo/lang.c:691
+#: makeinfo/lang.c:1013
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
-msgstr "%c%s forventer et enkelt tegn, �«i�» eller �«j�» som argument"
+msgstr "%c%s forventer et enkelt tegn, «i» eller «j» som argument"
 
-#: makeinfo/macro.c:134
+#: makeinfo/macro.c:128
 #, c-format
 msgid "macro `%s' previously defined"
-msgstr "makroen �«%s�» er tidligere definert"
+msgstr "makroen «%s» er tidligere definert"
 
-#: makeinfo/macro.c:138
+#: makeinfo/macro.c:132
 #, c-format
 msgid "here is the previous definition of `%s'"
-msgstr "her er den tidligere definisjonen av �«%s�»"
+msgstr "her er den tidligere definisjonen av «%s»"
 
 #: makeinfo/macro.c:355
 #, c-format
-msgid "\\ in macro expansion followed by `%s' instead of \\ or parameter name"
-msgstr "\\ i makroekspansjon fulgt av �«%s�» istedet for \\ eller parameternavn"
+msgid "\\ in macro expansion followed by `%s' instead of parameter name"
+msgstr "\\ i makroekspansjon fulgt av «%s» istedet for parameternavn"
 
-#: makeinfo/macro.c:403
+#: makeinfo/macro.c:401
 #, c-format
 msgid "Macro `%s' called on line %d with too many args"
-msgstr "Makroen �«%s�» kalt p�å linje %d med for mange argumenter"
+msgstr "Makroen «%s» kalt på linje %d med for mange argumenter"
 
-#: makeinfo/macro.c:594
+#: makeinfo/macro.c:586
 #, c-format
 msgid "%cend macro not found"
 msgstr "%cend macro ikke funnet"
 
-#: makeinfo/macro.c:632
+#: makeinfo/macro.c:624
 msgid "@quote-arg only useful for single-argument macros"
-msgstr "@quote-arg bare brukbart n�år makroen bare tar et argument"
+msgstr "@quote-arg bare brukbart når makroen bare tar et argument"
 
-#: makeinfo/macro.c:668
+#: makeinfo/macro.c:660
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "umatchet @end %s med @%s"
 
-#: makeinfo/makeinfo.c:316
+#: makeinfo/makeinfo.c:184
 #, c-format
-msgid "%s:%d: warning: "
-msgstr "%s:%d: advarsel: "
-
-#: makeinfo/makeinfo.c:339
 msgid "Too many errors!  Gave up.\n"
 msgstr "For mange feil!  Ga opp.\n"
 
-#: makeinfo/makeinfo.c:350 makeinfo/makeinfo.c:2026
+#: makeinfo/makeinfo.c:302
+#, c-format
+msgid "%s:%d: warning: "
+msgstr "%s:%d: advarsel: "
+
+#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
 #, c-format
 msgid "Misplaced %c"
 msgstr "Feilplassert %c"
 
-#: makeinfo/makeinfo.c:370
+#: makeinfo/makeinfo.c:340
 #, c-format
 msgid "Try `%s --help' for more information.\n"
-msgstr "Pr�øv �«%s --help�» for mer informasjon.\n"
+msgstr "Prøv «%s --help» for mer informasjon.\n"
 
-#: makeinfo/makeinfo.c:373
+#: makeinfo/makeinfo.c:343
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
-msgstr "Bruksm�åte: %s [VALG]... TEXINFOFIL...\n"
+msgstr "Bruksmåte: %s [VALG]... TEXINFOFIL...\n"
 
-#: makeinfo/makeinfo.c:376
+#: makeinfo/makeinfo.c:346
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
 msgstr ""
 "Oversette Texinfodokumentasjon til forskjellige andre formater:\n"
-"Infofiler for lesing online med Emacs eller den frittst�ående GNU Info.\n"
+"Infofiler for lesing online med Emacs eller den frittstående GNU Info.\n"
 
-#: makeinfo/makeinfo.c:380
+#: makeinfo/makeinfo.c:350
 #, c-format
 msgid ""
 "General options:\n"
@@ -2159,29 +2260,26 @@ msgstr ""
 "      --help                  vise denne hjelpen og avslutte.\n"
 "      --no-validate           undertrykke sjekking av kryssreferanser.\n"
 "      --no-warn               undertrykke advarsler (men ikke feil).\n"
-"      --reference-limit=ANT   advare om p�å det meste ANT referanser "
+"      --reference-limit=ANT   advare om på det meste ANT referanser "
 "(standard %d).\n"
 "  -v, --verbose               forklare hva som blir gjort.\n"
 "      --version               vise programversjon og avslutte.\n"
 
-#: makeinfo/makeinfo.c:394
+#: makeinfo/makeinfo.c:364
 #, fuzzy, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output DocBook rather than Info.\n"
+"      --docbook             output Docbook XML rather than Info.\n"
 "      --html                output HTML rather than Info.\n"
-"      --xml                 output XML (TexinfoML) rather than Info.\n"
+"      --xml                 output Texinfo XML rather than Info.\n"
+"      --plaintext           output plain text rather than Info.\n"
 msgstr ""
-"Valg av outputformat (standard er �å produsere Info):\n"
-"      --docbook             generere DocBook i stedet for Info.\n"
+"Valg av outputformat (standard er å produsere Info):\n"
+"      --docbook             generere DocBook XML i stedet for Info.\n"
 "      --html                generere HTML i stedet for Info.\n"
-"      --no-headers          generere plain text, undertrykke Info-nodeseparatorer\n"
-"                              og Node:-linjer; i tillegg skriv til standard output\n"
-"                              med mindre --output er gitt.\n"
-"      --xml                 generere XML (TexinfoML) i stedet for Info.\n"
+"      --xml                 generere Texinfo XML i stedet for Info.\n"
 
-#: makeinfo/makeinfo.c:401
-#, fuzzy
+#: makeinfo/makeinfo.c:372
 msgid ""
 "General output options:\n"
 "  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
@@ -2198,16 +2296,23 @@ msgid ""
 msgstr ""
 "Generelle outputvalg:\n"
 "  -E, --macro-expand FIL    sende makroekspandert kilde til FIL,\n"
-"                            ignorerer enhver @setfilename.\n"
+"                              ignorerer enhver @setfilename.\n"
+"      --no-headers          undertrykke nodeseparatorer, Node:-linjer og "
+"menyer\n"
+"                              fra Info-output (og dermed produsere ren "
+"tekst)\n"
+"                              eller fra HTML (og dermed produsere kortere "
+"output);\n"
+"                              standard er å skrive til standard ut.\n"
 "      --no-split            undertrykke splitting av Info- eller HTML-"
 "output,\n"
-"                            generere bare en outputfil.\n"
+"                              generere bare en outputfil.\n"
 "      --number-sections     nummerere kapitler og avdelinger (section).\n"
-"  -o, --output=FIL          sende output til FIL (katalog dersom splittet "
-"HTML),\n"
+"  -o, --output=FIL          sende output til FIL (eller katalog dersom "
+"splittet HTML),\n"
 
-# Denne mangler oversettelse, m�å rettes snarest.
-#: makeinfo/makeinfo.c:415
+# Denne mangler oversettelse, må rettes snarest.
+#: makeinfo/makeinfo.c:386
 #, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2228,84 +2333,120 @@ msgstr ""
 "Valg for Infooutput og ren tekst:\n"
 "      --enable-encoding       skrive ut spesialtegn og tegn med aksenter i"
 "\\n\n"
-"                                Infooutput basert p�å @documentencoding.\\n\n"
+"                                Infooutput basert på @documentencoding.\\n\n"
 "      --fill-column=ANT       bryte Infolinjer ved ANT tegn (standard %d).\n"
 "      --footnote-style=STIL   generere fotnoter i Info i henhold til STIL:\n"
-"                                �«separate�» for �å legge fotnotene i egne "
+"                                «separate» for å legge fotnotene i egne "
 "noder;\n"
-"                                �«end�» for �å legge fotnotene i slutten av "
+"                                «end» for å legge fotnotene i slutten av "
 "hver node\n"
 "                                  der fotnotene er definert (standard).\n"
 "      --paragraph-indent=ANT  rykke inn Infoavsnitt med ANT mellomrom "
 "(standard %d).\n"
-"                                Dersom ANT er �«none�» rykkes ikke avsnittene "
+"                                Dersom ANT er «none» rykkes ikke avsnittene "
 "inn;\n"
-"                                Dersom ANT er �«asis�» bevares eksisterende "
+"                                Dersom ANT er «asis» bevares eksisterende "
 "innrykk.\n"
 "      --split-size=ANT        splitte Infofilene ved lengde ANT (standard %"
 "d).\n"
 
-#: makeinfo/makeinfo.c:433
+#: makeinfo/makeinfo.c:403
+msgid ""
+"Options for HTML:\n"
+"      --css-include=FILE        include FILE in HTML <style> output;\n"
+"                                  read stdin if FILE is -.\n"
+msgstr ""
+"Valg for HTML:\n"
+"      --css-include=FIL         inkluder FIL i HTML <style>-taggen;\n"
+"                                  les stdin dersom FIL er -.\n"
+
+#: makeinfo/makeinfo.c:409
+#, fuzzy, c-format
+msgid ""
+"Options for XML and Docbook:\n"
+"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"d).\n"
+"                                  If VAL is 0, ignorable whitespace is "
+"dropped.\n"
+msgstr ""
+"Valg for HTML:\n"
+"      --css-include=FIL         inkluder FIL i HTML <style>-taggen;\n"
+"                                  les stdin dersom FIL er -.\n"
+
+#: makeinfo/makeinfo.c:416
 msgid ""
 "Input file options:\n"
-"      --commands-in-node-names   allow @ commands in node names.\n"
-"  -D VAR                         define the variable VAR, as with @set.\n"
-"  -I DIR                         append DIR to the @include search path.\n"
-"  -P DIR                         prepend DIR to the @include search path.\n"
-"  -U VAR                         undefine the variable VAR, as with @clear.\n"
+"      --commands-in-node-names  allow @ commands in node names.\n"
+"  -D VAR                        define the variable VAR, as with @set.\n"
+"  -I DIR                        append DIR to the @include search path.\n"
+"  -P DIR                        prepend DIR to the @include search path.\n"
+"  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
-"Inputvalg:\n"
+"Valg for inputfil:\n"
 "      --commands-in-node-names   tillate @-kommandoer i nodenavn.\n"
 "  -D VAR                         definer variabelen VAR, som om @set "
 "brukes.\n"
-"  -I KAT                         legg til KAT p�å slutten av @include-"
-"s�økestien.\n"
-"  -P KAT                         legg til KAT p�å starten av @include-"
-"s�økestien.\n"
+"  -I KAT                         legg til KAT på slutten av @include-"
+"søkestien.\n"
+"  -P KAT                         legg til KAT på starten av @include-"
+"søkestien.\n"
 "  -U VAR                         udefiner variabelen VAR, som om @clear "
 "brukes.\n"
 
-#: makeinfo/makeinfo.c:442
+#: makeinfo/makeinfo.c:425
 #, fuzzy
 msgid ""
 "Conditional processing in input:\n"
+"  --ifdocbook       process @ifdocbook and @docbook even if\n"
+"                      not generating Docbook.\n"
 "  --ifhtml          process @ifhtml and @html even if not generating HTML.\n"
 "  --ifinfo          process @ifinfo even if not generating Info.\n"
 "  --ifplaintext     process @ifplaintext even if not generating plain text.\n"
 "  --iftex           process @iftex and @tex; implies --no-split.\n"
+"  --ifxml           process @ifxml and @xml.\n"
+"  --no-ifdocbook    do not process @ifdocbook and @docbook text.\n"
 "  --no-ifhtml       do not process @ifhtml and @html text.\n"
 "  --no-ifinfo       do not process @ifinfo text.\n"
 "  --no-ifplaintext  do not process @ifplaintext text.\n"
 "  --no-iftex        do not process @iftex and @tex text.\n"
+"  --no-ifxml        do not process @ifxml and @xml text.\n"
+"\n"
+"  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
 msgstr ""
 "Betinget behandling av input:\n"
-"     --ifhtml      behandle @ifhtml og @html selv om HTML ikke skal "
+"  --ifhtml           behandle @ifhtml og @html selv om HTML ikke skal "
 "genereres.\n"
-"     --ifinfo      behandle @ifinfo selv n�år HTML skal genereres.\n"
-"     --iftex       behandle @iftex og @tex; inneb�ærer --no-split.\n"
-"     --no-ifhtml   ikke behandle @ifhtml og @html.\n"
-"     --no-ifinfo   ikke behandle @ifinfo.\n"
-"     --no-iftex    ikke behandle @iftex og @tex.\n"
-
-#: makeinfo/makeinfo.c:454
-#, fuzzy
+"  --ifinfo           behandle @ifinfo selv når HTML skal genereres.\n"
+"  --ifplaintext      behandle @ifplaintext selv om ren tekst ikke skal "
+"genereres.\n"
+"  --iftex            behandle @iftex og @tex; innebærer --no-split.\n"
+"  --ifxml            behandle @ifxml og @xml.\n"
+"  --no-ifhtml        ikke behandle @ifhtml og @html.\n"
+"  --no-ifinfo        ikke behandle @ifinfo.\n"
+"  --no-ifplaintext   ikke behandle @ifplaintext.\n"
+"  --no-iftex         ikke behandle @iftex og @tex.\n"
+"  --no-ifxml         ikke behandle @ifxml og @xml.\n"
+
+#: makeinfo/makeinfo.c:444
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating HTML, --ifhtml is on and the others are off;\n"
 "  if generating Info, --ifinfo is on and the others are off;\n"
 "  if generating plain text, --ifplaintext is on and the others are off;\n"
+"  if generating XML, --ifxml is on and the others are off.\n"
 msgstr ""
 "  Standardverdiene for @if...-betingelsene avhenger av outputformatet:\n"
-"  dersom HTML genereres er --ifhtml p�åsl�ått og de andre av;\n"
-"  dersom Info eller ren tekst genereres er --ifinfo p�åsl�ått og de andre av.\n"
+"  dersom HTML genereres er --ifhtml påslått og de andre av;\n"
+"  dersom Info genereres er --ifinfo påslått og de andre av;\n"
+"  dersom ren tekst genereres er --ifplaintext påslått og de andre av;\n"
+"  dersom XML genereres er --ifxml påslått og de andre av.\n"
 
-#: makeinfo/makeinfo.c:461
-#, fuzzy
+#: makeinfo/makeinfo.c:452
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                     write Info to foo's @setfilename\n"
 "  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write XML to @setfilename\n"
+"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
 "  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
 "  makeinfo --no-headers foo.texi        write plain text to standard output\n"
 "\n"
@@ -2316,407 +2457,412 @@ msgid ""
 msgstr ""
 "Eksempler:\n"
 "  makeinfo foo.texi                     skrive Info til foos @setfilename\n"
-"  makeinfo --html foo.texi              skrive HTML til foos @setfilename\n"
-"  makeinfo --no-headers -o - foo.texi   skrive ren tekst til standard ut\n"
+"  makeinfo --html foo.texi              skrive HTML til @setfilename\n"
+"  makeinfo --xml foo.texi               skrive Texinfo XML til @setfilename\n"
+"  makeinfo --docbook foo.texi           skrive Docbook XML til @setfilename\n"
+"  makeinfo --no-headers foo.texi        skrive ren tekst til standard ut\n"
+"\n"
+"  makeinfo --html --no-headers foo.texi skrive HTML uten nodelinjer\n"
 "  makeinfo --number-sections foo.texi   skrive Info med nummererte avsnitt\n"
-"  makeinfo --no-split foo.texi          skrive en Infofil uansett st�ørrelse\n"
+"  makeinfo --no-split foo.texi          skrive en Infofil uansett størrelse\n"
 
-#: makeinfo/makeinfo.c:570 makeinfo/makeinfo.c:593 makeinfo/makeinfo.c:655
-#: makeinfo/makeinfo.c:676
+#: makeinfo/makeinfo.c:603
 #, c-format
-msgid "%s: %s arg must be numeric, not `%s'.\n"
-msgstr "%s: %s arg m�å v�ære numerisk, ikke �«%s�».\n"
+msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
+msgstr ""
 
-#: makeinfo/makeinfo.c:583
+#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
+#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
 #, c-format
-msgid "Couldn't open macro expansion output `%s'"
-msgstr "Kunne ikke �åpne filen �«%s�» for utskrift av makroekspansjon"
+msgid "%s: %s arg must be numeric, not `%s'.\n"
+msgstr "%s: %s arg må være numerisk, ikke «%s».\n"
 
-#: makeinfo/makeinfo.c:586
-msgid "Cannot specify more than one macro expansion output"
-msgstr "Kan ikke angi mer enn en fil for utskrift av makroekspansjon"
+#: makeinfo/makeinfo.c:660
+#, fuzzy, c-format
+msgid "%s: could not open macro expansion output `%s'"
+msgstr "Kunne ikke åpne filen «%s» for utskrift av makroekspansjon"
 
-#: makeinfo/makeinfo.c:624
+#: makeinfo/makeinfo.c:665
+#, fuzzy, c-format
+msgid "%s: ignoring second macro expansion output `%s'.\n"
+msgstr "Kunne ikke åpne filen «%s» for utskrift av makroekspansjon"
+
+#: makeinfo/makeinfo.c:707
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
-"%s: --paragraph-indent arg m�å v�ære numerisk/�«none�»/�«asis�», ikke �«%s�».\n"
+"%s: --paragraph-indent arg må være numerisk/«none»/«asis», ikke «%s».\n"
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
-msgstr "%s: --footnote-style arg m�å v�ære �«separate�» eller �«end�», ikke �«%s�».\n"
+msgstr "%s: --footnote-style arg må være «separate» eller «end», ikke «%s».\n"
 
-#: makeinfo/makeinfo.c:723
+#: makeinfo/makeinfo.c:806
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: mangler filargument.\n"
 
-#: makeinfo/makeinfo.c:898
+#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
 #, c-format
-msgid "Expected `%s'"
-msgstr "Forventet �«%s�»"
-
-#: makeinfo/makeinfo.c:1365
-msgid "File exists, but is not a directory"
+msgid "Multiline command %c%s used improperly"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1366
+#: makeinfo/makeinfo.c:1000
+#, c-format
+msgid "Expected `%s'"
+msgstr "Forventet «%s»"
+
+#: makeinfo/makeinfo.c:1479
 #, c-format
 msgid "Can't create directory `%s': %s"
-msgstr "Kan ikke opprette katalogen �«%s�»: %s"
+msgstr "Kan ikke opprette katalogen «%s»: %s"
 
-#: makeinfo/makeinfo.c:1414
+#: makeinfo/makeinfo.c:1525
 #, c-format
 msgid "No `%s' found in `%s'"
-msgstr "Ingen �«%s�» funnet i �«%s�»"
+msgstr "Ingen «%s» funnet i «%s»"
 
-#: makeinfo/makeinfo.c:1496
+#: makeinfo/makeinfo.c:1605
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
-"%s: Hopper over makroekspansjon til stdout siden Info-output ogs�å sendes "
+"%s: Hopper over makroekspansjon til stdout siden Info-output også sendes "
 "dit.\n"
 
-#: makeinfo/makeinfo.c:1526
+#: makeinfo/makeinfo.c:1638
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
-msgstr "Lager %s-filen �«%s�» fra �«%s�».\n"
+msgstr "Lager %s-filen «%s» fra «%s».\n"
 
-#: makeinfo/makeinfo.c:1561
+#: makeinfo/makeinfo.c:1673
 #, c-format
 msgid "This is %s, produced by makeinfo version %s from %s.\n"
 msgstr "Dette er %s, produsert av makeinfo versjon %s fra %s.\n"
 
-#: makeinfo/makeinfo.c:1583
+#: makeinfo/makeinfo.c:1709
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
-"%s: Fjerner makroutskriftsfilen �«%s�» p�å grunn av feil; bruk --force for �å "
+"%s: Fjerner makroutskriftsfilen «%s» på grunn av feil; bruk --force for å "
 "bevare.\n"
 
-#: makeinfo/makeinfo.c:1627
+#: makeinfo/makeinfo.c:1773
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
-"%s: Fjerner utskriftsfilen �«%s�» p�å grunn av feil; bruk --force for �å "
+"%s: Fjerner utskriftsfilen «%s» på grunn av feil; bruk --force for å "
 "bevare.\n"
 
-#: makeinfo/makeinfo.c:1853
+#: makeinfo/makeinfo.c:2034
 #, c-format
 msgid "Unknown command `%s'"
-msgstr "Ukjent kommando �«%s�»"
+msgstr "Ukjent kommando «%s»"
 
-#: makeinfo/makeinfo.c:1875
+#: makeinfo/makeinfo.c:2056
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
-msgstr "Bruk kr�øllparenteser for �å gi en kommando som et argument til @%s"
+msgstr "Bruk krøllparenteser for å gi en kommando som et argument til @%s"
 
-#: makeinfo/makeinfo.c:2068
+#: makeinfo/makeinfo.c:2314
 #, c-format
-msgid "%c%s expected `{...}'"
-msgstr "%c%s forventet �«{...}�»"
+msgid "%c%s expected braces"
+msgstr "%c%s forventet krøllparanteser"
 
-#: makeinfo/makeinfo.c:2098
+#: makeinfo/makeinfo.c:2327
 msgid "Unmatched }"
 msgstr "Umatchet }"
 
-#: makeinfo/makeinfo.c:2148
+#: makeinfo/makeinfo.c:2375
 msgid "NO_NAME!"
 msgstr "INTET_NAVN!"
 
-#: makeinfo/makeinfo.c:2169
+#: makeinfo/makeinfo.c:2396
 #, c-format
 msgid "%c%s missing close brace"
-msgstr "%c%s mangler avsluttende kr�øllparentes"
-
-#: makeinfo/makeinfo.c:2958
-msgid "First argument to cross-reference may not be empty"
-msgstr "Det f�ørste argumentet til kryssreferanser kan ikke v�ære tomt"
-
-#: makeinfo/makeinfo.c:3018 makeinfo/makeinfo.c:3236 makeinfo/xml.c:1340
-msgid "see "
-msgstr "se "
-
-#: makeinfo/makeinfo.c:3018
-msgid "See "
-msgstr "Se "
+msgstr "%c%s mangler avsluttende krøllparentes"
 
-#: makeinfo/makeinfo.c:3164
-#, c-format
-msgid "`.' or `,' must follow cross reference, not %c"
-msgstr "�«.�» eller �«,�» m�å f�ølge kryssreferanser, ikke %c"
-
-#: makeinfo/makeinfo.c:3212
-msgid "First argument to @inforef may not be empty"
-msgstr "Det f�ørste argumentet til @inforef kan ikke v�ære tomt"
-
-#: makeinfo/makeinfo.c:3427
+#: makeinfo/makeinfo.c:3309
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
-msgstr "@image-fil �«%s�» (for HTML) er uleselig: %s"
+msgstr "@image-fil «%s» (for HTML) er uleselig: %s"
 
-#: makeinfo/makeinfo.c:3440
+#: makeinfo/makeinfo.c:3315
 #, c-format
-msgid "No `%s.png' or `.jpg', and no extension supplied"
-msgstr "Ingen �«%s.png�» eller �«.jpg�» og ingen filutvidelse oppgitt"
+msgid "No such file `%s'"
+msgstr "«%s» er ingen fil"
 
-#: makeinfo/makeinfo.c:3490
+#: makeinfo/makeinfo.c:3447
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
-msgstr "@image-fil �«%s�» (for tekstformat) er uleselig: %s"
+msgstr "@image-fil «%s» (for tekstformat) er uleselig: %s"
 
-#: makeinfo/makeinfo.c:3497
+#: makeinfo/makeinfo.c:3456
 msgid "@image missing filename argument"
 msgstr "@image mangler filnavn"
 
-#: makeinfo/makeinfo.c:3690
+#: makeinfo/makeinfo.c:3675
+#, c-format
+msgid "undefined flag: %s"
+msgstr "udefinert flagg: %s"
+
+#: makeinfo/makeinfo.c:3676
 #, c-format
 msgid "{No value for `%s'}"
-msgstr "{Ingen verdi for �«%s�»}"
+msgstr "{Ingen verdi for «%s»}"
 
-#: makeinfo/makeinfo.c:3744
+#: makeinfo/makeinfo.c:3728
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s krever et navn"
 
-#: makeinfo/makeinfo.c:3850
+#: makeinfo/makeinfo.c:3834
 #, c-format
 msgid "Reached eof before matching @end %s"
-msgstr "Traff slutt-p�å-filen f�ør matchende @end %s"
+msgstr "Traff slutt-på-filen før matchende @end %s"
 
-#: makeinfo/makeinfo.c:4081
+#: makeinfo/makeinfo.c:4082
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
-msgstr ""
+msgstr "`%.40s...' er for lang for ekspansjon; ikke ekspandert"
 
-#: makeinfo/multi.c:226
+#: makeinfo/multi.c:116
 msgid "Missing } in @multitable template"
-msgstr "Manglende �«}�» i @multitable-mal"
+msgstr "Manglende «}» i @multitable-mal"
 
-#: makeinfo/multi.c:302
+#: makeinfo/multi.c:254
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
-msgstr "ignorerer l�øs tekst �«%s�» etter @multitable"
+msgstr "ignorerer løs tekst «%s» etter @multitable"
 
-#: makeinfo/multi.c:375
+#: makeinfo/multi.c:393
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "For mange kolonner i multitabellrad (maks %d)"
 
-#: makeinfo/multi.c:426
+#: makeinfo/multi.c:555
 #, c-format
-msgid "Cannot select column #%d in multitable"
-msgstr "Kan ikke velge kolonne #%d i multitabell"
+msgid "[unexpected] cannot select column #%d in multitable"
+msgstr "[uforventet] kan ikke velge kolonne #%d i multitabell"
 
-#: makeinfo/multi.c:529
+#: makeinfo/multi.c:584
 msgid "ignoring @tab outside of multitable"
 msgstr "ignorerer @tab utenfor multitabell"
 
-#: makeinfo/multi.c:565
+#: makeinfo/multi.c:632
+#, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** Multikolonne-output fra siste rad:\n"
 
-#: makeinfo/multi.c:568
+#: makeinfo/multi.c:635
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* kolonne #%d output = %s\n"
 
-#: makeinfo/node.c:276
+#: makeinfo/node.c:280
 #, c-format
 msgid "Node `%s' previously defined at line %d"
-msgstr "Noden �«%s�» er tidligere definert ved linje %d"
+msgstr "Noden «%s» er tidligere definert ved linje %d"
 
-#: makeinfo/node.c:594
+#: makeinfo/node.c:648
 #, c-format
 msgid "Formatting node %s...\n"
 msgstr "Skriver noden %s...\n"
 
-#: makeinfo/node.c:655
+#: makeinfo/node.c:716
 #, c-format
-msgid "Node `%s' requires a sectioning command (e.g. %c%s)"
-msgstr "Noden �«%s�» krever en inndelingskommando (f.eks. %c%s)"
+msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
+msgstr "Noden «%s» krever en inndelingskommando (f.eks. %c%s)"
 
-#: makeinfo/node.c:815
+#: makeinfo/node.c:879
 #, c-format
 msgid "No node name specified for `%c%s' command"
-msgstr "Ingen nodenavn spesifisert for �«%c%s�»-kommandoen"
+msgstr "Ingen nodenavn spesifisert for «%c%s»-kommandoen"
 
-#: makeinfo/node.c:856 makeinfo/node.c:1075
+#: makeinfo/node.c:920 makeinfo/node.c:1151
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
-msgstr "Ankeret �«%s�» og noden �«%s�» blir knyttet til det samme filnavnet"
+msgstr "Ankeret «%s» og noden «%s» blir knyttet til det samme filnavnet"
 
-#: makeinfo/node.c:859
+#: makeinfo/node.c:923
 msgid "This @anchor command ignored; references to it will not work"
 msgstr ""
 "Denne @anchor-kommandoen ble ignorert, referanser til den vil ikke virke"
 
-#: makeinfo/node.c:861 makeinfo/node.c:1078
+#: makeinfo/node.c:925 makeinfo/node.c:1154
 msgid "Rename this anchor or use the `--no-split' option"
-msgstr "Omd�øpe dette ankeret eller bruk �«--no-split�»-valget"
+msgstr "Omdøpe dette ankeret eller bruk «--no-split»-valget"
 
-#: makeinfo/node.c:891
+#: makeinfo/node.c:955
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
-msgstr "Uforventet streng ved slutten av splitt-HTML-fila �«%s�»"
+msgstr "Uforventet streng ved slutten av splitt-HTML-fila «%s»"
 
-#: makeinfo/node.c:920
-msgid "Node:"
-msgstr "Node:"
-
-#: makeinfo/node.c:930
+#: makeinfo/node.c:991
 msgid "Next:"
 msgstr "Neste:"
 
-#: makeinfo/node.c:940
+#: makeinfo/node.c:1007
 msgid "Previous:"
 msgstr "Forrige:"
 
-#: makeinfo/node.c:950
+#: makeinfo/node.c:1021
 msgid "Up:"
 msgstr "Opp:"
 
-#: makeinfo/node.c:1072
+#: makeinfo/node.c:1148
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
-msgstr "Ankrene �«%s�» og �«%s�» peker til det samme filnavnet"
+msgstr "Ankrene «%s» og «%s» peker til det samme filnavnet"
 
-#: makeinfo/node.c:1077
+#: makeinfo/node.c:1153
 msgid "@anchor command ignored; references to it will not work"
 msgstr "@anchor-kommando ignorert; referanser til den vil ikke virke"
 
-#: makeinfo/node.c:1277
+#: makeinfo/node.c:1347
 #, c-format
-msgid "%s reference to nonexistent node `%s'"
-msgstr "%s referanse til ikke-eksisterende node �«%s�»"
+msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
+msgstr ""
+"%s referanse til ikke-eksisterende node «%s» (kanskje ugyldig inndeling?)"
 
-#: makeinfo/node.c:1294
+#: makeinfo/node.c:1363
 msgid "Menu"
 msgstr "Meny"
 
-#: makeinfo/node.c:1296
+#: makeinfo/node.c:1365
 msgid "Cross"
 msgstr "Kryss"
 
-#: makeinfo/node.c:1380
+#: makeinfo/node.c:1447
 #, c-format
-msgid "Next field of node `%s' not pointed to"
-msgstr "Nestefeltet til noden �«%s�» er ikke pekt p�å"
+msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
+msgstr ""
+"Nestefeltet til noden «%s» er ikke pekt på (kanskje ugyldig inndeling?)"
 
-#: makeinfo/node.c:1383
+#: makeinfo/node.c:1450
 #, c-format
 msgid "This node (%s) has the bad Prev"
-msgstr "Denne noden (%s) har den d�årlige forrigepekeren"
+msgstr "Denne noden (%s) har den dårlige forrigepekeren"
 
-#: makeinfo/node.c:1395
+#: makeinfo/node.c:1462
 msgid "Prev"
 msgstr "forrige"
 
-#: makeinfo/node.c:1438
+#: makeinfo/node.c:1505
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
-msgstr "Forrigefeltet til noden �«%s�» er ikke pekt p�å"
+msgstr "Forrigefeltet til noden «%s» er ikke pekt på"
 
-#: makeinfo/node.c:1442
+#: makeinfo/node.c:1509
 #, c-format
 msgid "This node (%s) has the bad Next"
-msgstr "Denne noden (%s) har den d�årlige nestepekeren"
+msgstr "Denne noden (%s) har den dårlige nestepekeren"
 
-#: makeinfo/node.c:1454
+#: makeinfo/node.c:1521
 #, c-format
-msgid "`%s' has no Up field"
-msgstr "�«%s�» har ikke et oppfelt"
+msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
+msgstr "`%s' har ingen Up-felt (kanskje feil inndeling?)"
 
-#: makeinfo/node.c:1457
+#: makeinfo/node.c:1524
 msgid "Up"
 msgstr "opp"
 
-#: makeinfo/node.c:1523
+#: makeinfo/node.c:1590
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
-msgstr "Noden �«%s�» mangler et menypunkt for �«%s�» selv om den er dens oppm�ål"
+msgstr "Noden «%s» mangler et menypunkt for «%s» selv om den er dens oppmål"
 
-#: makeinfo/node.c:1552
+#: makeinfo/node.c:1619
 #, c-format
 msgid "node `%s' has been referenced %d times"
-msgstr "noden �«%s�» har blitt referert %d ganger"
+msgstr "noden «%s» har blitt referert %d ganger"
 
-#: makeinfo/node.c:1566
+#: makeinfo/node.c:1633
 #, c-format
 msgid "unreferenced node `%s'"
-msgstr "ureferert node �«%s�»"
+msgstr "ureferert node «%s»"
 
-#: makeinfo/sectioning.c:117
+#: makeinfo/node.c:1723
 #, c-format
-msgid "Appendix %c "
+msgid "Removing %s\n"
+msgstr ""
+
+#: makeinfo/node.c:1727
+#, fuzzy, c-format
+msgid "Can't remove file `%s': %s"
+msgstr "Kan ikke opprette katalogen «%s»: %s"
+
+#: makeinfo/sectioning.c:122
+#, fuzzy, c-format
+msgid "Appendix %c"
 msgstr "Vedlegg %c "
 
-#: makeinfo/sectioning.c:356 makeinfo/sectioning.c:444
+#: makeinfo/sectioning.c:467
+#, fuzzy, c-format
+msgid "Internal error (search_sectioning) `%s'!"
+msgstr "Intern feil (search_sectioning) «%s»!"
+
+#: makeinfo/sectioning.c:562
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
-msgstr "Intern feil (search_sectioning) �«%s�»!"
+msgstr "Intern feil (search_sectioning) «%s»!"
 
-#: makeinfo/sectioning.c:502
+#: makeinfo/sectioning.c:623
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr "%c%s er avlegs; bruk %c%s i stedet"
 
-#: makeinfo/sectioning.c:518
+#: makeinfo/sectioning.c:639
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr "Node med %ctop som en seksjon eksisterer allerede"
 
-#: makeinfo/sectioning.c:526
+#: makeinfo/sectioning.c:647
 #, c-format
 msgid "Here is the %ctop node"
 msgstr "Her er %ctop-noden"
 
-#: makeinfo/sectioning.c:543
+#: makeinfo/sectioning.c:663
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
-msgstr "%ctop brukt f�ør %cnode, benytter %s"
+msgstr "%ctop brukt før %cnode, benytter %s"
 
-#: makeinfo/toc.c:221 makeinfo/toc.c:298 makeinfo/toc.c:299
+#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
 msgid "Table of Contents"
 msgstr "Innholdsfortegnelse"
 
-#: makeinfo/toc.c:330 makeinfo/toc.c:366 makeinfo/toc.c:367
+#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
 msgid "Short Contents"
 msgstr "Kort innholdsfortegnelse"
 
-#: makeinfo/toc.c:406
-#, c-format
-msgid "%s: TOC should be here, but it was not found"
-msgstr "%s: TOC burde v�ære her, men ble ikke funnet"
-
-#: makeinfo/xml.c:1108
+#: makeinfo/xml.c:1605
 #, c-format
 msgid "@image file `%s' unreadable: %s"
-msgstr "@image-fil �«%s�» er uleselig: %s"
+msgstr "@image-fil «%s» er uleselig: %s"
 
-#: util/install-info.c:151
+#: makeinfo/xml.c:2097
+msgid ""
+"@headitem as the last item of @multitable produces invalid Docbook documents"
+msgstr ""
+
+#: util/install-info.c:154
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: advarsel: "
 
-#: util/install-info.c:176 util/install-info.c:189
-msgid "virtual memory exhausted"
-msgstr "virtuelt minne utt�ømt"
-
-#: util/install-info.c:232
+#: util/install-info.c:203
 #, c-format
 msgid " for %s"
 msgstr " for %s"
 
-#: util/install-info.c:381
+#: util/install-info.c:426
 #, c-format
 msgid "\tTry `%s --help' for a complete list of options.\n"
-msgstr "\tPr�øv �«%s --help�» for en komplett liste over valg.\n"
+msgstr "\tPrøv «%s --help» for en komplett liste over valg.\n"
 
-#: util/install-info.c:389
-#, fuzzy, c-format
+#: util/install-info.c:434
+#, c-format
 msgid ""
 "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
 "\n"
@@ -2751,7 +2897,7 @@ msgid ""
 "                     from information in the Info file itself.\n"
 " --version         display version information and exit.\n"
 msgstr ""
-"Bruksm�åte: %s [VALG]... [INFOFIL [DIRFIL]]\n"
+"Bruksmåte: %s [VALG]... [INFOFIL [DIRFIL]]\n"
 "\n"
 "Installere eller slette dir-innslag fra INFOFIL i Info-katalogfilen\n"
 "DIRFIL.\n"
@@ -2760,9 +2906,9 @@ msgstr ""
 " --delete          slette eksisterende innslag for INFOFIL fra DIRFIL;\n"
 "                     ikke sett inn noe nye innslag.\n"
 " --dir-file=NAVN   angi filnavnet til Info-katalogfilen.\n"
-"                     Dette er det samme som �å bruke DIRFIL-argumentet.\n"
+"                     Dette er det samme som å bruke DIRFIL-argumentet.\n"
 " --entry=TEKST     sette inn TEKST som en Info-kataloginnslag.\n"
-"                     TEKST b�ør ha form som et Info-menypunkt\n"
+"                     TEKST bør ha form som et Info-menypunkt\n"
 "                     pluss null eller flere linjer som starter med "
 "whitespace.\n"
 "                     Dersom du angir mer enn et innslag, blir alle lagt "
@@ -2771,7 +2917,7 @@ msgstr ""
 "                     fra informasjon i selve Infofilen.\n"
 " --help            vise denne hjelpen og avslutte.\n"
 " --info-file=FIL   angi Infofilen som skal installeres i katalogen.\n"
-"                     Dette er det samme som �å bruke INFOFIL-argumentet.\n"
+"                     Dette er det samme som å bruke INFOFIL-argumentet.\n"
 " --info-dir=DIR    det samme som --dir-file=DIR/dir.\n"
 " --item=TEKST      det samme som --entry TEKST.\n"
 "                     Et Info-kataloginnslag er egentlig et menypunkt.\n"
@@ -2784,11 +2930,8 @@ msgstr ""
 "                     Dersom du ikke angir noen avsnitt, blir de bestemt\n"
 "                     fra informasjon i selve Infofilen.\n"
 " --version         vise programversjon og avslutte.\n"
-"\n"
-"Send bugrapporter til bug-texinfo@gnu.org,\n"
-"generelle sp�ørsm�ål og diskusjoner til help-texinfo@gnu.org.\n"
 
-#: util/install-info.c:444
+#: util/install-info.c:488
 #, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
@@ -2805,117 +2948,119 @@ msgid ""
 "  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
 "  to select it.\n"
 "\n"
-"* Menu:\n"
+"%s\n"
 msgstr ""
-"Dette er filen .../info/dir, som inneholder de �øverste\n"
-"nodene i Info-hierarkiet, kalt (dir)Top.\n"
-"F�ørste gangen du starter Info begynner du i denne noden.\n"
+"Dette er filen .../info/dir, som inneholder den øverste\n"
+"noden i Info-hierarkiet, kalt (dir)Top.\n"
+"Første gangen du starter Info begynner du i denne noden.\n"
 "\n"
 "%s\tDette er toppen av INFO-treet\n"
 "\n"
 "  Denne katalognoden gir en meny over alle hovedemner.\n"
-"  Inntasting av �«q�» avslutter, �«?�» lister alle Info-kommandoene, �«d�» "
+"  Inntasting av «q» avslutter, «?» lister alle Info-kommandoene, «d» "
 "returner hit,\n"
-"  �«h�» gir en innf�øring for nybegynnere,\n"
-"  �«mEmacs<Return>�» bes�øker Emacs-manualen, osv.\n"
+"  «h» gir en innføring for nybegynnere,\n"
+"  «mEmacs<Return>» besøker Emacs-manualen, osv.\n"
 "\n"
-"  I Emacs kan du klikke med musknapp 2 p�å et menypunkt eller kryssreferanse\n"
-"  for �å velge den.\n"
+"  I Emacs kan du klikke med musknapp 2 på et menypunkt eller kryssreferanse\n"
+"  for å velge den.\n"
 "\n"
-"* Menu:\n"
+"%s\n"
 
-#: util/install-info.c:467
+#: util/install-info.c:513
 #, c-format
 msgid "%s: could not read (%s) and could not create (%s)\n"
 msgstr "%s: kunne ikke lese (%s) og kunne ikke opprette (%s)\n"
 
-#: util/install-info.c:551
+#: util/install-info.c:600
 #, c-format
 msgid "%s: empty file"
 msgstr "%s: tom fil"
 
-#: util/install-info.c:866 util/install-info.c:906
+#: util/install-info.c:913 util/install-info.c:953
 msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
-msgstr "START-INFO-DIR-ENTRY uten tilh�ørende END-INFO-DIR-ENTRY"
+msgstr "START-INFO-DIR-ENTRY uten tilhørende END-INFO-DIR-ENTRY"
 
-#: util/install-info.c:901
+#: util/install-info.c:948
 msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
-msgstr "END-INFO-DIR-ENTRY uten tilh�ørende START-INFO-DIR-ENTRY"
+msgstr "END-INFO-DIR-ENTRY uten tilhørende START-INFO-DIR-ENTRY"
 
-#: util/install-info.c:1150 util/install-info.c:1160
+#: util/install-info.c:1191 util/install-info.c:1201
 #, c-format
-msgid "%s: Specify the Info directory only once.\n"
-msgstr "%s: Spesifiser infokatalogen bare en gang.\n"
+msgid "%s: already have dir file: %s\n"
+msgstr ""
 
-#: util/install-info.c:1195
+#: util/install-info.c:1236
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr "%s: Spesifiser infofilen bare en gang.\n"
 
-#: util/install-info.c:1244
+#: util/install-info.c:1284
 #, c-format
 msgid "excess command line argument `%s'"
-msgstr "overfl�ødig argument p�å kommandolinjen �«%s�»"
+msgstr "overflødig argument på kommandolinjen «%s»"
 
-#: util/install-info.c:1248
+#: util/install-info.c:1288
 msgid "No input file specified; try --help for more information."
-msgstr "Ingen innfil angitt; pr�øv --help for mer informasjon."
+msgstr "Ingen innfil angitt; prøv --help for mer informasjon."
 
-#: util/install-info.c:1251
+#: util/install-info.c:1291
 msgid "No dir file specified; try --help for more information."
-msgstr "Ingen dir-fil angitt; pr�øv --help for mer informasjon."
+msgstr "Ingen dir-fil angitt; prøv --help for mer informasjon."
 
-#: util/install-info.c:1273
+#: util/install-info.c:1313
 #, c-format
 msgid "no info dir entry in `%s'"
-msgstr "ingen info-dir-oppf�øring i �«%s�»"
+msgstr "ingen info-dir-oppføring i «%s»"
 
-#: util/install-info.c:1388
+#: util/install-info.c:1426
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
-msgstr "menypunktet �«%s�» eksisterer allerede for filen �«%s�»"
+msgstr "menypunktet «%s» eksisterer allerede for filen «%s»"
 
-#: util/install-info.c:1411
+#: util/install-info.c:1449
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
-msgstr "fant ingen oppf�øringer for �«%s�»; ingenting slettet"
+msgstr "fant ingen oppføringer for «%s»; ingenting slettet"
 
-#: util/texindex.c:245
+#: util/texindex.c:252
 msgid "display this help and exit"
 msgstr "vise denne hjelpen og avslutte"
 
-#: util/texindex.c:247
+#: util/texindex.c:254
 msgid "keep temporary files around after processing"
 msgstr "bevar midlertidige filer etter behandling"
 
-#: util/texindex.c:249
+#: util/texindex.c:256
 msgid "do not keep temporary files around after processing (default)"
 msgstr "ikke bevar midlertidige filer etter behandling (standard)"
 
-#: util/texindex.c:251
+#: util/texindex.c:258
 msgid "send output to FILE"
 msgstr "sende utdata til FILE"
 
-#: util/texindex.c:253
+#: util/texindex.c:260
 msgid "display version information and exit"
 msgstr "vise programversjon og avslutte"
 
-#: util/texindex.c:264
+#: util/texindex.c:270
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
-msgstr "Bruksm�åte: %s [VALG]... FIL...\n"
+msgstr "Bruksmåte: %s [VALG]... FIL...\n"
 
-#: util/texindex.c:265
+#: util/texindex.c:271
+#, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr "Generere en sortert indeks for hver TeX-outputfil.\n"
 
-#: util/texindex.c:268
+#: util/texindex.c:274
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr ""
-"Vanligvis er FIL... angitt som �«foo.%c%c�» for et dokument �«foo.texi�».\n"
+"Vanligvis er FIL... angitt som «foo.%c%c» for et dokument «foo.texi».\n"
 
-#: util/texindex.c:270
+#: util/texindex.c:276
+#, c-format
 msgid ""
 "\n"
 "Options:\n"
@@ -2923,35 +3068,56 @@ msgstr ""
 "\n"
 "Valg:\n"
 
-#: util/texindex.c:887 util/texindex.c:921 util/texindex.c:997
-#: util/texindex.c:1025
+#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
+#: util/texindex.c:1011
 #, c-format
 msgid "%s: not a texinfo index file"
 msgstr "%s: ikke en texinfo-indeksfil"
 
-#: util/texindex.c:982
+#: util/texindex.c:968
 #, c-format
 msgid "failure reopening %s"
-msgstr "feil ved gjen�åpning av %s"
+msgstr "feil ved gjenåpning av %s"
 
-#: util/texindex.c:1224
+#: util/texindex.c:1218
 #, c-format
 msgid "No page number in %s"
 msgstr "Ingen sidenummer i %s"
 
-#: util/texindex.c:1295
+#: util/texindex.c:1291
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
-msgstr "oppf�øring %s f�ølger en oppf�øring med et annet navn"
+msgstr "oppføring %s følger en oppføring med et annet navn"
 
-#: util/texindex.c:1633
-#, c-format
-msgid "%s; for file `%s'.\n"
-msgstr "%s; for filen %s.\n"
+#~ msgid "%s: Specify the Info directory only once.\n"
+#~ msgstr "%s: Spesifiser infokatalogen bare en gang.\n"
+
+#~ msgid "\"\" is invalid"
+#~ msgstr "«» er ugyldig"
+
+#~ msgid "%s is an invalid ISO code, using %c"
+#~ msgstr "%s er en ugyldig ISO-kode, bruker %c"
+
+#~ msgid "Cannot specify more than one macro expansion output"
+#~ msgstr "Kan ikke angi mer enn en fil for utskrift av makroekspansjon"
+
+#~ msgid "File exists, but is not a directory"
+#~ msgstr "Fila eksisterer, men er ikke en katalog"
+
+#~ msgid "First argument to cross-reference may not be empty"
+#~ msgstr "Det første argumentet til kryssreferanser kan ikke være tomt"
+
+#~ msgid "see "
+#~ msgstr "se "
+
+#~ msgid "`.' or `,' must follow cross reference, not %c"
+#~ msgstr "«.» eller «,» må følge kryssreferanser, ikke %c"
+
+#~ msgid "First argument to @inforef may not be empty"
+#~ msgstr "Det første argumentet til @inforef kan ikke være tomt"
+
+#~ msgid "Node:"
+#~ msgstr "Node:"
 
-#~ msgid ""
-#~ "Email bug reports to bug-texinfo@gnu.org,\n"
-#~ "general questions and discussion to help-texinfo@gnu.org."
-#~ msgstr ""
-#~ "Send bugrapporter til bug-texinfo@gnu.org,\n"
-#~ "generelle sp�ørsm�ål og diskusjoner til help-texinfo@gnu.org."
+#~ msgid "%s: TOC should be here, but it was not found"
+#~ msgstr "%s: TOC burde være her, men ble ikke funnet"
diff --git a/gnu/usr.bin/texinfo/po/pl.gmo b/gnu/usr.bin/texinfo/po/pl.gmo
new file mode 100644
index 00000000000..a09723256aa
--- /dev/null
+++ b/gnu/usr.bin/texinfo/po/pl.gmo
diff --git a/gnu/usr.bin/texinfo/po/pl.po b/gnu/usr.bin/texinfo/po/pl.po
new file mode 100644
index 00000000000..60f787a0f62
--- /dev/null
+++ b/gnu/usr.bin/texinfo/po/pl.po
@@ -0,0 +1,3111 @@
+# Polish translation for texinfo.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the texinfo package.
+# Jakub Bogusz <qboosh@pld-linux.org>, 2003-2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: texinfo 4.7.90\n"
+"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
+"POT-Creation-Date: 2004-12-21 16:20-0800\n"
+"PO-Revision-Date: 2004-12-05 12:24+0100\n"
+"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
+"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: info/echo-area.c:284 info/session.c:689
+msgid "Move forward a character"
+msgstr "Przesuniêcie do przodu o znak"
+
+#: info/echo-area.c:296 info/session.c:705
+msgid "Move backward a character"
+msgstr "Przesuniêcie do ty³u o znak"
+
+#: info/echo-area.c:308
+msgid "Move to the start of this line"
+msgstr "Przej¶cie na pocz±tek tej linii"
+
+#: info/echo-area.c:313
+msgid "Move to the end of this line"
+msgstr "Przej¶cie na koniec tej linii"
+
+#: info/echo-area.c:321 info/session.c:723
+msgid "Move forward a word"
+msgstr "Przesuniêcie do przodu o s³owo"
+
+#: info/echo-area.c:361 info/session.c:772
+msgid "Move backward a word"
+msgstr "Przesuniêcie do ty³u o s³owo"
+
+#: info/echo-area.c:401
+msgid "Delete the character under the cursor"
+msgstr "Usuniêcie znaku pod kursorem"
+
+#: info/echo-area.c:431
+msgid "Delete the character behind the cursor"
+msgstr "Usuniêcie znaku za kursorem"
+
+#: info/echo-area.c:452
+msgid "Cancel or quit operation"
+msgstr "Anulowanie lub rezygnacja z operacji"
+
+#: info/echo-area.c:467
+msgid "Accept (or force completion of) this line"
+msgstr "Przyjêcie (lub wymuszenie dokoñczenia) tej linii"
+
+#: info/echo-area.c:472
+msgid "Insert next character verbatim"
+msgstr "Wstawienie nastêpnego znaku dos³ownie"
+
+#: info/echo-area.c:480
+msgid "Insert this character"
+msgstr "Wstawienie tego znaku"
+
+#: info/echo-area.c:498
+msgid "Insert a TAB character"
+msgstr "Wstawienie znaku TAB"
+
+#: info/echo-area.c:505
+msgid "Transpose characters at point"
+msgstr "Przestawienie znaków w miejscu"
+
+#: info/echo-area.c:556
+msgid "Yank back the contents of the last kill"
+msgstr "Wstawienie zawarto¶ci ostatniego wyciêcia"
+
+#: info/echo-area.c:563
+msgid "Kill ring is empty"
+msgstr "Zakres wyciêcia jest pusty"
+
+#: info/echo-area.c:576
+msgid "Yank back a previous kill"
+msgstr "Wstawienie poprzedniego wyciêcia"
+
+#: info/echo-area.c:609
+msgid "Kill to the end of the line"
+msgstr "Wyciêcie na koniec linii"
+
+#: info/echo-area.c:622
+msgid "Kill to the beginning of the line"
+msgstr "Wyciêcie na pocz±tek linii"
+
+#: info/echo-area.c:634
+msgid "Kill the word following the cursor"
+msgstr "Wyciêcie s³owa za kursorem"
+
+#: info/echo-area.c:653
+msgid "Kill the word preceding the cursor"
+msgstr "Wyciêcie s³owa przed kursorem"
+
+#: info/echo-area.c:868 info/echo-area.c:924
+msgid "No completions"
+msgstr "Brak uzupe³nieñ"
+
+#: info/echo-area.c:870
+msgid "Not complete"
+msgstr "Nie dokoñczono"
+
+#: info/echo-area.c:911
+msgid "List possible completions"
+msgstr "Wypisanie mo¿liwych uzupe³nieñ"
+
+#: info/echo-area.c:928
+msgid "Sole completion"
+msgstr "Jedyne uzupe³nienie"
+
+#: info/echo-area.c:937
+msgid "One completion:\n"
+msgstr "Jedno uzupe³nienie:\n"
+
+#: info/echo-area.c:938
+#, c-format
+msgid "%d completions:\n"
+msgstr "%d uzupe³nieñ:\n"
+
+#: info/echo-area.c:1085
+msgid "Insert completion"
+msgstr "Wstawienie uzupe³nienia"
+
+#: info/echo-area.c:1220
+msgid "Building completions..."
+msgstr "Tworzenie uzupe³nieñ..."
+
+#: info/echo-area.c:1340
+msgid "Scroll the completions window"
+msgstr "Przewijanie okna uzupe³nieñ"
+
+#: info/footnotes.c:213
+msgid "Footnotes could not be displayed"
+msgstr "Przypisy nie mog± byæ wy¶wietlone"
+
+#: info/footnotes.c:239
+msgid "Show the footnotes associated with this node in another window"
+msgstr "Pokazanie przypisów zwi±zanych z tym wêz³em w innym oknie"
+
+#: info/footnotes.h:26
+msgid "---------- Footnotes ----------"
+msgstr "---------- Przypisy -----------"
+
+#: info/indices.c:172
+msgid "Look up a string in the index for this file"
+msgstr "Szukanie ³añcucha w indeksie tego pliku"
+
+#: info/indices.c:199
+msgid "Finding index entries..."
+msgstr "Szukanie wpisów w indeksie..."
+
+#: info/indices.c:207
+msgid "No indices found."
+msgstr "Nie znaleziono indeksów."
+
+#: info/indices.c:217
+msgid "Index entry: "
+msgstr "Wpis indeksu: "
+
+#: info/indices.c:325
+msgid ""
+"Go to the next matching index item from the last `\\[index-search]' command"
+msgstr ""
+"Przej¶cie do nastêpnego pasuj±cego elementu z ostatniego `\\[index-search]'"
+
+#: info/indices.c:335
+msgid "No previous index search string."
+msgstr "Brak poprzedniego ³añcucha szukanego w indeksie."
+
+#: info/indices.c:342
+msgid "No index entries."
+msgstr "Brak wpisów w indeksie."
+
+#: info/indices.c:375
+#, c-format
+msgid "No %sindex entries containing `%s'."
+msgstr "Nie ma %swpisów w indeksie zawieraj±cych `%s'."
+
+#: info/indices.c:376
+msgid "more "
+msgstr "wiêcej "
+
+#: info/indices.c:386
+msgid "CAN'T SEE THIS"
+msgstr "NIE MO¯NA TEGO ZOBACZYÆ"
+
+#: info/indices.c:422
+#, c-format
+msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
+msgstr ""
+"Znaleziono `%s' w %s. (`\\[next-index-match]' próbuje znale¼æ nastêpne.)"
+
+#: info/indices.c:541
+#, c-format
+msgid "Scanning indices of `%s'..."
+msgstr "Przeszukiwanie indeksów `%s'..."
+
+#: info/indices.c:596
+#, c-format
+msgid "No available info files have `%s' in their indices."
+msgstr "¯aden z dostêpnych plików info nie zawiera `%s' w swoich indeksach."
+
+#: info/indices.c:622
+msgid "Grovel all known info file's indices for a string and build a menu"
+msgstr "Szukanie ³añcucha w znanych indeksach plików info i zbudowanie menu"
+
+#: info/indices.c:626
+msgid "Index apropos: "
+msgstr "Indeks dla ³añcucha: "
+
+#: info/indices.c:654
+#, c-format
+msgid ""
+"\n"
+"* Menu: Nodes whose indices contain `%s':\n"
+msgstr ""
+"\n"
+"* Menu: Wêz³y, których indeksy zawieraj± `%s':\n"
+
+#: info/info.c:275 info/infokey.c:899
+#, c-format
+msgid "Try --help for more information.\n"
+msgstr "Wiêcej informacji mo¿na uzyskaæ przez --help.\n"
+
+#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
+#: util/texindex.c:343
+#, c-format
+msgid ""
+"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 ""
+"Autorzy nie daj± ¯ADNYCH gwarancji. Ten program mo¿na rozprowadzaæ\n"
+"zachowuj±c warunki Powszechnej Licencji Publicznej GNU (General Public\n"
+"License).\n"
+"Wiêcej informacji na ten temat mo¿na znale¼æ w plikach o nazwie COPYING.\n"
+
+#: info/info.c:498
+#, c-format
+msgid "no index entries found for `%s'\n"
+msgstr "nie znaleziono wpisów w indeksie dla `%s'\n"
+
+#: info/info.c:590
+msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
+msgstr "  -b, --speech-friendly        tryb przyjazny dla syntezatorów mowy.\n"
+
+#: info/info.c:597
+#, c-format
+msgid ""
+"Usage: %s [OPTION]... [MENU-ITEM...]\n"
+"\n"
+"Read documentation in Info format.\n"
+"\n"
+"Options:\n"
+"      --apropos=STRING         look up STRING in all indices of all "
+"manuals.\n"
+"  -d, --directory=DIR          add DIR to INFOPATH.\n"
+"      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
+"  -f, --file=FILENAME          specify Info file to visit.\n"
+"  -h, --help                   display this help and exit.\n"
+"      --index-search=STRING    go to node pointed by index entry STRING.\n"
+"  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
+"  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+"  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+"      --no-raw-escapes         output escapes as literal text.\n"
+"      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
+"  -O, --show-options, --usage  go to command-line options node.\n"
+"%s      --subnodes               recursively output menu items.\n"
+"  -w, --where, --location      print physical location of Info file.\n"
+"      --vi-keys                use vi-like and less-like key bindings.\n"
+"      --version                display version information and exit.\n"
+"\n"
+"The first non-option argument, if present, is the menu entry to start from;\n"
+"it is searched for in all `dir' files along INFOPATH.\n"
+"If it is not present, info merges all `dir' files and shows the result.\n"
+"Any remaining arguments are treated as the names of menu\n"
+"items relative to the initial node visited.\n"
+"\n"
+"Examples:\n"
+"  info                       show top-level dir menu\n"
+"  info emacs                 start at emacs node from top-level dir\n"
+"  info emacs buffers         start at buffers node within emacs manual\n"
+"  info --show-options emacs  start at node with emacs' command line options\n"
+"  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+msgstr ""
+"Sk³adnia: %s [OPCJA]... [ELEMENT-MENU...]\n"
+"\n"
+"Przegl±danie dokumentacji w formacie Info.\n"
+"\n"
+"Opcje:\n"
+"      --apropos=£AÑCUCH        szukanie £AÑCUCHA we wszystkich indeksach\n"
+"                                 wszystkich podrêczników.\n"
+"  -d, --directory=KATALOG      dodanie katalogu do INFOPATH.\n"
+"      --dribble=PLIK           zapamiêtanie sekwencji klawiszy w PLIKU.\n"
+"  -f, --file=PLIK              podanie pliku Info do odwiedzenia.\n"
+"  -h, --help                   wy¶wietlenie tego opisu i zakoñczenie pracy.\n"
+"      --index-search=£AÑCUCH   przej¶cie do wêz³a za £AÑCUCHEM w indeksie.\n"
+"  -n, --node=WÊZE£             podanie wêz³a w pierwszym odwiedzanym pliku.\n"
+"  -o, --output=PLIK            zapis wybranych wêz³ów do PLIKU.\n"
+"  -R, --raw-escapes            wypisywanie sekwencji ANSI (domy¶lne).\n"
+"      --no-raw-escapes         wypisywanie sekwencji jako dos³ownego "
+"tekstu.\n"
+"      --restore=PLIK           czytanie pocz±tkowej sekwencji klawiszy z "
+"PLIKU.\n"
+"  -O, --show-options, --usage  przej¶cie do wêz³a z opcjami linii poleceñ.\n"
+"%s      --subnodes               rekurencyjne wypisanie elementów menu.\n"
+"  -w, --where, --location      wy¶wietlenie fizycznego po³o¿enia pliku "
+"Info.\n"
+"      --vi-keys                u¿ywanie klawiszy w stylu programów vi i "
+"less.\n"
+"      --version                wy¶wietlenie informacji o wersji i "
+"zakoñczenie.\n"
+"\n"
+"Pierwszy argument nie bêd±cy opcj±, je¶li jest obecny, jest wpisem menu, od\n"
+"którego program ma zacz±æ pracê;\n"
+"jest poszukiwany we wszystkich plikach `dir' le¿±cych w INFOPATH.\n"
+"Je¶li nie jest obecny, info ³±czy wszystkie pliki `dir' i pokazuje wynik.\n"
+"Wszystkie pozosta³e argumenty s± traktowane jako nazwy elementów menu "
+"wzglêdem\n"
+"pocz±tkowo odwiedzonego wêz³a.\n"
+"\n"
+"Przyk³ady:\n"
+"  info                       pokazanie menu katalogów g³ównego poziomu\n"
+"  info emacs                 rozpoczêcie od wêz³a emacs z g³ównego katalogu\n"
+"  info emacs buffers         rozpoczêcie od wêz³a buffers w podrêczniku "
+"emacsa\n"
+"  info --show-options emacs  rozpoczêcie od wêz³a z opisem linii poleceñ "
+"emacsa\n"
+"  info -f ./foo.info         pokazanie pliku ./foo.info, z pominiêciem "
+"katalogu\n"
+
+#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
+#: util/install-info.c:466 util/texindex.c:292
+msgid ""
+"\n"
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr ""
+"\n"
+"Raporty o b³êdach prosimy wysy³aæ poczt± elektroniczn± na adres\n"
+"bug-texinfo@gnu.org, ogólne pytania i dyskusjê na help-texinfo@gnu.org.\n"
+"Strona domowa texinfo: http://www.gnu.org/software/texinfo/"
+
+#: info/info.c:669
+#, c-format
+msgid "Cannot find node `%s'."
+msgstr "Nie mo¿na znale¼æ wêz³a `%s'."
+
+#: info/info.c:670
+#, c-format
+msgid "Cannot find node `(%s)%s'."
+msgstr "Nie mo¿na znale¼æ wêz³a `(%s)%s'."
+
+#: info/info.c:671
+msgid "Cannot find a window!"
+msgstr "Nie mo¿na znale¼æ okna!"
+
+#: info/info.c:672
+msgid "Point doesn't appear within this window's node!"
+msgstr "Kropka nie wystêpuje w wê¼le z tego okna!"
+
+#: info/info.c:673
+msgid "Cannot delete the last window."
+msgstr "Nie mo¿na usun±æ ostatniego okna."
+
+#: info/info.c:674
+msgid "No menu in this node."
+msgstr "Brak menu w tym wê¼le."
+
+#: info/info.c:675
+msgid "No footnotes in this node."
+msgstr "Brak przypisów w tym wê¼le."
+
+#: info/info.c:676
+msgid "No cross references in this node."
+msgstr "Brak odsy³aczy w tym wê¼le."
+
+#: info/info.c:677
+#, c-format
+msgid "No `%s' pointer for this node."
+msgstr "Brak wska¼nika `%s' dla tego wêz³a."
+
+#: info/info.c:678
+#, c-format
+msgid "Unknown Info command `%c'; try `?' for help."
+msgstr "Nieznane polecenie Info `%c'; `?' przywo³uje pomoc."
+
+#: info/info.c:679
+#, c-format
+msgid "Terminal type `%s' is not smart enough to run Info."
+msgstr "Typ terminala `%s' nie jest wystarczaj±cy do uruchomienia Info."
+
+#: info/info.c:680
+msgid "You are already at the last page of this node."
+msgstr "To ju¿ jest ostatnia strona tego wêz³a."
+
+#: info/info.c:681
+msgid "You are already at the first page of this node."
+msgstr "To ju¿ jest pierwsza strona tego wêz³a."
+
+#: info/info.c:682
+msgid "Only one window."
+msgstr "Tylko jedno okno."
+
+#: info/info.c:683
+msgid "Resulting window would be too small."
+msgstr "Wynikowe okno by³oby zbyt ma³e."
+
+#: info/info.c:684
+msgid "Not enough room for a help window, please delete a window."
+msgstr "Za ma³o miejsca na okno pomocy, proszê usun±æ okno."
+
+#: info/infodoc.c:46 info/infodoc.c:95
+msgid ""
+"Basic Commands in Info Windows\n"
+"******************************\n"
+msgstr ""
+"Podstawowe polecenia w oknach Info\n"
+"**********************************\n"
+
+#: info/infodoc.c:49
+msgid "\\%-10[quit-help]  Quit this help.\n"
+msgstr "\\%-10[quit-help]  Opuszczenie tej pomocy.\n"
+
+#: info/infodoc.c:50
+msgid "\\%-10[quit]  Quit Info altogether.\n"
+msgstr "\\%-10[quit]  Opuszczenie ca³ego Info.\n"
+
+#: info/infodoc.c:51
+msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
+msgstr "\\%-10[get-info-help-node]  Uruchomienie tutoriala Info.\n"
+
+#: info/infodoc.c:53 info/infodoc.c:102
+msgid ""
+"Selecting other nodes:\n"
+"----------------------\n"
+msgstr ""
+"Wybór innych wêz³ów:\n"
+"--------------------\n"
+
+#: info/infodoc.c:55
+msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
+msgstr "\\%-10[next-node]  Przej¶cie do wêz³a \"nastêpny\" tego wêz³a.\n"
+
+#: info/infodoc.c:56
+msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
+msgstr "\\%-10[prev-node]  Przej¶cie do wêz³a \"poprzedni\" tego wêz³a.\n"
+
+#: info/infodoc.c:57
+msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
+msgstr "\\%-10[up-node]  Przej¶cie do wêz³a \"w górê\" tego wêz³a.\n"
+
+#: info/infodoc.c:58
+msgid ""
+"\\%-10[menu-item]  Pick menu item specified by name.\n"
+"              Picking a menu item causes another node to be selected.\n"
+msgstr ""
+"\\%-10[menu-item]  Wybranie elementu menu zadanego nazw±.\n"
+"              Wybranie elementu menu powoduje wybranie innego wêz³a.\n"
+
+#: info/infodoc.c:60
+msgid ""
+"\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
+msgstr ""
+"\\%-10[xref-item]  Przej¶cie za odsy³aczem. Odczytuje nazwê odsy³acza.\n"
+
+#: info/infodoc.c:61
+msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
+msgstr ""
+"\\%-10[history-node]  Przej¶cie do ostatniego wêz³a widocznego w tym oknie.\n"
+
+#: info/infodoc.c:62
+msgid ""
+"\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
+msgstr ""
+"\\%-10[move-to-next-xref]  Przej¶cie do nastêpnego odno¶nika hipertekstowego "
+"w tym wê¼le.\n"
+
+#: info/infodoc.c:63
+msgid ""
+"\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
+"node.\n"
+msgstr ""
+"\\%-10[move-to-prev-xref]  Przej¶cie do poprzedniego odno¶nika "
+"hipertekstowego w tym wê¼le.\n"
+
+#: info/infodoc.c:64
+msgid ""
+"\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
+msgstr ""
+"\\%-10[select-reference-this-line]  Przej¶cie za odno¶nikiem hipertekstowym "
+"pod kursorem.\n"
+
+#: info/infodoc.c:65
+msgid ""
+"\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
+"node] (DIR)'.\n"
+msgstr ""
+"\\%-10[dir-node]  Przej¶cie do wêz³a `directory' (katalog). Równoznaczne `"
+"\\[goto-node] (DIR)'.\n"
+
+#: info/infodoc.c:66
+msgid ""
+"\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
+msgstr ""
+"\\%-10[top-node]  Przej¶cie do wêz³a Szczytowy. Równoznaczne `\\[goto-node] "
+"Top'.\n"
+
+#: info/infodoc.c:68 info/infodoc.c:116
+msgid ""
+"Moving within a node:\n"
+"---------------------\n"
+msgstr ""
+"Poruszanie siê w ramach wêz³a:\n"
+"------------------------------\n"
+
+#: info/infodoc.c:70
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "\\%-10[beginning-of-node]  Przej¶cie na pocz±tek tego wêz³a.\n"
+
+#: info/infodoc.c:71
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgstr "\\%-10[end-of-node]  Przej¶cie na koniec tego wêz³a.\n"
+
+#: info/infodoc.c:72
+msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
+msgstr "\\%-10[next-line]  Przewiniêcie do przodu o 1 liniê.\n"
+
+#: info/infodoc.c:73
+msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
+msgstr "\\%-10[prev-line]  Przewiniêcie do ty³u o 1 liniê.\n"
+
+#: info/infodoc.c:74
+msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
+msgstr "\\%-10[scroll-forward]  Przewiniêcie do przodu o stronê.\n"
+
+#: info/infodoc.c:75
+msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
+msgstr "\\%-10[scroll-backward]  Przewiniêcie do ty³u o stronê.\n"
+
+#: info/infodoc.c:77 info/infodoc.c:125
+msgid ""
+"Other commands:\n"
+"---------------\n"
+msgstr ""
+"Inne polecenia:\n"
+"---------------\n"
+
+#: info/infodoc.c:79
+msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
+msgstr ""
+"\\%-10[menu-digit]  Wybranie pierwszego ... dziewi±tego elementu z menu "
+"wêz³a.\n"
+
+#: info/infodoc.c:80
+msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
+msgstr "\\%-10[last-menu-item]  Wybranie ostatniego elementu z menu wêz³a.\n"
+
+#: info/infodoc.c:81
+msgid ""
+"\\%-10[index-search]  Search for a specified string in the index entries of "
+"this Info\n"
+"              file, and select the node referenced by the first entry "
+"found.\n"
+msgstr ""
+"\\%-10[index-search]  Szukanie podanego ³añcucha we wpisach indeksu tego "
+"pliku Info\n"
+"              i wybranie wêz³a wskazywanego przez pierwszy znaleziony wpis.\n"
+
+#: info/infodoc.c:83
+msgid ""
+"\\%-10[goto-node]  Move to node specified by name.\n"
+"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
+msgstr ""
+"\\%-10[goto-node]  Przej¶cie do wêz³a zadanego nazw±.\n"
+"              Mo¿na do³±czyæ tak¿e nazwê pliku w postaci (PLIK)WÊZE£.\n"
+
+#: info/infodoc.c:85
+msgid ""
+"\\%-10[search]  Search forward for a specified string\n"
+"              and select the node in which the next occurrence is found.\n"
+msgstr ""
+"\\%-10[search]  Szukanie podanego ³añcucha w przód\n"
+"              i wybranie wêz³a, w którym znaleziono nastêpne wyst±pienie.\n"
+
+#: info/infodoc.c:87
+msgid ""
+"\\%-10[search-backward]  Search backward for a specified string\n"
+"              and select the node in which the previous occurrence is "
+"found.\n"
+msgstr ""
+"\\%-10[search-backward]  Szukanie podanego ³añcucha w ty³\n"
+"              i wybranie wêz³a, w którym znaleziono poprzednie wyst±pienie.\n"
+
+#: info/infodoc.c:98
+#, c-format
+msgid "  %-10s  Quit this help.\n"
+msgstr "  %-10s  Opuszczenie tej pomocy.\n"
+
+#: info/infodoc.c:99
+#, c-format
+msgid "  %-10s  Quit Info altogether.\n"
+msgstr "  %-10s  Opuszczenie ca³ego Info.\n"
+
+#: info/infodoc.c:100
+#, c-format
+msgid "  %-10s  Invoke the Info tutorial.\n"
+msgstr "  %-10s  Uruchomienie tutoriala Info.\n"
+
+#: info/infodoc.c:104
+#, c-format
+msgid "  %-10s  Move to the `next' node of this node.\n"
+msgstr "  %-10s  Przej¶cie do wêz³a `nastêpny' tego wêz³a.\n"
+
+#: info/infodoc.c:105
+#, c-format
+msgid "  %-10s  Move to the `previous' node of this node.\n"
+msgstr "  %-10s  Przej¶cie do wêz³a `poprzedni' tego wêz³a.\n"
+
+#: info/infodoc.c:106
+#, c-format
+msgid "  %-10s  Move `up' from this node.\n"
+msgstr "  %-10s  Przej¶cie do wêz³a `w górê' tego wêz³a.\n"
+
+#: info/infodoc.c:107
+#, c-format
+msgid "  %-10s  Pick menu item specified by name.\n"
+msgstr "  %-10s  Wybranie elementu menu zadanego nazw±.\n"
+
+#: info/infodoc.c:108
+msgid "              Picking a menu item causes another node to be selected.\n"
+msgstr "              Wybranie elementu menu powoduje wybranie innego wêz³a.\n"
+
+#: info/infodoc.c:109
+#, c-format
+msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
+msgstr "  %-10s  Przej¶cie za odsy³aczem. Odczytuje nazwê odsy³acza.\n"
+
+#: info/infodoc.c:110
+#, c-format
+msgid "  %-10s  Move to the last node seen in this window.\n"
+msgstr "  %-10s  Przej¶cie do ostatniego wêz³a widocznego w tym oknie.\n"
+
+#: info/infodoc.c:111
+#, c-format
+msgid "  %-10s  Skip to next hypertext link within this node.\n"
+msgstr ""
+"  %-10s  Przej¶cie do nastêpnego odno¶nika hipertekstowego w tym wê¼le.\n"
+
+#: info/infodoc.c:112
+#, c-format
+msgid "  %-10s  Follow the hypertext link under cursor.\n"
+msgstr "  %-10s  Przej¶cie za odno¶nikiem hipertekstowym pod kursorem.\n"
+
+#: info/infodoc.c:113
+#, c-format
+msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
+msgstr ""
+"  %-10s  Przej¶cie do wêz³a `directory' (katalog). Równoznaczne `g (DIR)'.\n"
+
+#: info/infodoc.c:114
+#, c-format
+msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
+msgstr "  %-10s  Przej¶cie do wêz³a Szczytowy. Równoznaczne `g Top'.\n"
+
+#: info/infodoc.c:118
+#, c-format
+msgid "  %-10s  Scroll forward a page.\n"
+msgstr "  %-10s  Przewiniêcie do przodu o stronê.\n"
+
+#: info/infodoc.c:119
+#, c-format
+msgid "  %-10s  Scroll backward a page.\n"
+msgstr "  %-10s  Przewiniêcie do ty³u o stronê.\n"
+
+#: info/infodoc.c:120
+#, c-format
+msgid "  %-10s  Go to the beginning of this node.\n"
+msgstr "  %-10s  Przej¶cie na pocz±tek tego wêz³a.\n"
+
+#: info/infodoc.c:121
+#, c-format
+msgid "  %-10s  Go to the end of this node.\n"
+msgstr "  %-10s  Przej¶cie na koniec tego wêz³a.\n"
+
+#: info/infodoc.c:122
+#, c-format
+msgid "  %-10s  Scroll forward 1 line.\n"
+msgstr "  %-10s  Przewiniêcie do przodu o 1 liniê.\n"
+
+#: info/infodoc.c:123
+#, c-format
+msgid "  %-10s  Scroll backward 1 line.\n"
+msgstr "  %-10s  Przewiniêcie do ty³u o 1 liniê.\n"
+
+#: info/infodoc.c:127
+#, c-format
+msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
+msgstr "  %-10s  Wybranie pierwszego ... dziewi±tego elementu z menu wêz³a.\n"
+
+#: info/infodoc.c:128
+#, c-format
+msgid "  %-10s  Pick last item in node's menu.\n"
+msgstr "  %-10s  Wybranie ostatniego elementu z menu wêz³a.\n"
+
+#: info/infodoc.c:129
+#, c-format
+msgid ""
+"  %-10s  Search for a specified string in the index entries of this Info\n"
+msgstr ""
+"  %-10s  Szukanie podanego ³añcucha we wpisach indeksu tego pliku Info\n"
+
+#: info/infodoc.c:130
+msgid ""
+"              file, and select the node referenced by the first entry "
+"found.\n"
+msgstr ""
+"              i wybranie wêz³a wskazywanego przez pierwszy znaleziony wpis.\n"
+
+#: info/infodoc.c:131
+#, c-format
+msgid "  %-10s  Move to node specified by name.\n"
+msgstr "  %-10s  Przej¶cie do wêz³a zadanego nazw±.\n"
+
+#: info/infodoc.c:132
+msgid ""
+"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
+msgstr ""
+"              Mo¿na do³±czyæ tak¿e nazwê pliku w postaci (PLIK)WÊZE£.\n"
+
+#: info/infodoc.c:133
+#, c-format
+msgid "  %-10s  Search forward for a specified string,\n"
+msgstr "  %-10s  Szukanie podanego ³añcucha w przód\n"
+
+#: info/infodoc.c:134 info/infodoc.c:136
+msgid ""
+"              and select the node in which the next occurrence is found.\n"
+msgstr ""
+"              i wybranie wêz³a, w którym znaleziono nastêpne wyst±pienie.\n"
+
+#: info/infodoc.c:135
+#, c-format
+msgid "  %-10s  Search backward for a specified string\n"
+msgstr "  %-10s  Szukanie podanego ³añcucha w ty³\n"
+
+#: info/infodoc.c:316
+msgid "The current search path is:\n"
+msgstr "Aktualna ¶cie¿ka poszukiwania to:\n"
+
+#: info/infodoc.c:320
+msgid ""
+"Commands available in Info windows:\n"
+"\n"
+msgstr ""
+"Polecenia dostêpne w oknach Info:\n"
+"\n"
+
+#: info/infodoc.c:324
+msgid ""
+"Commands available in the echo area:\n"
+"\n"
+msgstr ""
+"Polecenia dostêpne w obszarze echo:\n"
+"\n"
+
+#: info/infodoc.c:347
+#, c-format
+msgid ""
+"The following commands can only be invoked via %s:\n"
+"\n"
+msgstr ""
+"Nastêpuj±ce polecenia mo¿na wywo³aæ tylko przez %s:\n"
+"\n"
+
+#: info/infodoc.c:351
+msgid ""
+"The following commands cannot be invoked at all:\n"
+"\n"
+msgstr ""
+"Nastêpuj±cych poleceñ nie mo¿na w ogóle wywo³aæ:\n"
+"\n"
+
+#: info/infodoc.c:375
+msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
+msgstr "--- Wyj¶æ mo¿na u¿ywaj±c `\\[history-node]' lub `\\[kill-node]' ---\n"
+
+#: info/infodoc.c:485
+msgid "Display help message"
+msgstr "Wy¶wietlenie pomocy"
+
+#: info/infodoc.c:503
+msgid "Visit Info node `(info)Help'"
+msgstr "Odwiedzenie wêz³a Info `(info)Help'"
+
+#: info/infodoc.c:641
+msgid "Print documentation for KEY"
+msgstr "Wy¶wietlenie dokumentacji dla KLAWISZA"
+
+#: info/infodoc.c:653
+#, c-format
+msgid "Describe key: %s"
+msgstr "Opis klawisza: %s"
+
+#: info/infodoc.c:664
+#, c-format
+msgid "ESC %s is undefined."
+msgstr "ESC %s jest niezdefiniowany."
+
+#: info/infodoc.c:680 info/infodoc.c:709
+#, c-format
+msgid "%s is undefined."
+msgstr "%s jest niezdefiniowany."
+
+#: info/infodoc.c:730
+#, c-format
+msgid "%s is defined to %s."
+msgstr "%s jest zdefiniowany na %s."
+
+#: info/infodoc.c:1153
+msgid "Show what to type to execute a given command"
+msgstr "Pokazanie co nacisn±æ, aby wykonaæ zadane polecenie"
+
+#: info/infodoc.c:1157
+msgid "Where is command: "
+msgstr "Polecenie do znalezienia: "
+
+#: info/infodoc.c:1179
+#, c-format
+msgid "`%s' is not on any keys"
+msgstr "`%s' nie ma pod ¿adnym klawiszem"
+
+#: info/infodoc.c:1186
+#, c-format
+msgid "%s can only be invoked via %s."
+msgstr "%s mo¿na wywo³aæ tylko przez %s."
+
+#: info/infodoc.c:1190
+#, c-format
+msgid "%s can be invoked via %s."
+msgstr "%s mo¿na wywo³aæ przez %s."
+
+#: info/infodoc.c:1195
+#, c-format
+msgid "There is no function named `%s'"
+msgstr "Nie ma funkcji o nazwie `%s'"
+
+#: info/infokey.c:145
+#, 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 (C) %s Free Software Foundation, Inc.\n"
+"Autorzy nie daj± ¯ADNYCH gwarancji. Ten program mo¿na rozprowadzaæ\n"
+"zachowuj±c warunki Powszechnej Licencji Publicznej GNU (General Public\n"
+"License).\n"
+"Wiêcej informacji na ten temat mo¿na znale¼æ w plikach o nazwie COPYING.\n"
+
+#: info/infokey.c:170
+msgid "incorrect number of arguments"
+msgstr "b³êdna liczba argumentów"
+
+#: info/infokey.c:201
+#, c-format
+msgid "cannot open input file `%s'"
+msgstr "nie mo¿na otworzyæ pliku wej¶ciowego `%s'"
+
+#: info/infokey.c:215
+#, c-format
+msgid "cannot create output file `%s'"
+msgstr "nie mo¿na utworzyæ pliku wyj¶ciowego `%s'"
+
+#: info/infokey.c:226
+#, c-format
+msgid "error writing to `%s'"
+msgstr "b³±d podczas zapisu do `%s'"
+
+#: info/infokey.c:232
+#, c-format
+msgid "error closing output file `%s'"
+msgstr "b³±d podczas zamykania pliku wyj¶ciowego `%s'"
+
+#: info/infokey.c:450
+msgid "key sequence too long"
+msgstr "sekwencja klawiszy zbyt d³uga"
+
+#: info/infokey.c:529
+msgid "missing key sequence"
+msgstr "brak sekwencji klawiszy"
+
+#: info/infokey.c:610
+msgid "NUL character (\\000) not permitted"
+msgstr "znak NUL (\\000) nie jest dozwolony"
+
+#: info/infokey.c:641
+#, c-format
+msgid "NUL character (^%c) not permitted"
+msgstr "znak NUL (^%c) nie jest dozwolony"
+
+#: info/infokey.c:665
+msgid "missing action name"
+msgstr "brakuj±ca nazwa akcji"
+
+#: info/infokey.c:681 info/infokey.c:756
+msgid "section too long"
+msgstr "sekcja zbyt d³uga"
+
+#: info/infokey.c:688
+#, c-format
+msgid "unknown action `%s'"
+msgstr "nieznana akcja `%s'"
+
+#: info/infokey.c:698
+msgid "action name too long"
+msgstr "nazwa akcji zbyt d³uga"
+
+#: info/infokey.c:712
+#, c-format
+msgid "extra characters following action `%s'"
+msgstr "nadmiarowe znaki po akcji `%s'"
+
+#: info/infokey.c:723
+msgid "missing variable name"
+msgstr "brakuj±ca nazwa zmiennej"
+
+#: info/infokey.c:733
+msgid "missing `=' immediately after variable name"
+msgstr "brakuj±cy `=' bezpo¶rednio po nazwie zmiennej"
+
+#: info/infokey.c:741
+msgid "variable name too long"
+msgstr "nazwa zmiennej zbyt d³uga"
+
+#: info/infokey.c:765
+msgid "value too long"
+msgstr "warto¶æ zbyt d³uga"
+
+#: info/infokey.c:890
+#, c-format
+msgid "\"%s\", line %u: "
+msgstr "\"%s\", linia %u: "
+
+#: info/infokey.c:906
+#, c-format
+msgid ""
+"Usage: %s [OPTION]... [INPUT-FILE]\n"
+"\n"
+"Compile infokey source file to infokey file.  Reads INPUT-FILE (default\n"
+"$HOME/.infokey) and writes compiled key file to (by default) $HOME/.info.\n"
+"\n"
+"Options:\n"
+"  --output FILE        output to FILE instead of $HOME/.info\n"
+"  --help               display this help and exit.\n"
+"  --version            display version information and exit.\n"
+msgstr ""
+"Sk³adnia: %s [OPCJA]... [PLIK-WEJ¦CIOWY]\n"
+"\n"
+"Kompilowanie pliku ¼ród³owego infokey do pliku infokey. Odczytywany jest\n"
+"PLIK-WEJ¦CIOWY (domy¶lnie $HOME/.infokey), a skompilowany plik klawiszy\n"
+"zapisywany jest (domy¶lnie) do $HOME/.info.\n"
+"\n"
+"Opcje:\n"
+"  --output PLIK        zapis do PLIKU zamiast do $HOME/.info\n"
+"  --help               wy¶wietlenie tej pomocy i zakoñczenie.\n"
+"  --version            wy¶wietlenie informacji o wersji i zakoñczenie.\n"
+
+#: info/infomap.c:1500
+#, c-format
+msgid "Ignoring invalid infokey file `%s' - too small"
+msgstr "Zignorowany b³êdny plik infokey `%s' - zbyt ma³y"
+
+#: info/infomap.c:1503
+#, c-format
+msgid "Ignoring invalid infokey file `%s' - too big"
+msgstr "Zignorowany b³êdny plik infokey `%s' - zbyt du¿y"
+
+#: info/infomap.c:1516
+#, c-format
+msgid "Error reading infokey file `%s' - short read"
+msgstr "B³±d podczas czytania pliku infokey `%s' - skrócony odczyt"
+
+#: info/infomap.c:1535
+#, c-format
+msgid ""
+"Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
+msgstr ""
+"B³êdny plik infokey `%s' (z³e liczby magiczne) - mo¿na go uaktualniæ infokey"
+
+#: info/infomap.c:1544
+#, c-format
+msgid "Your infokey file `%s' is out of date -- run infokey to update it"
+msgstr ""
+"Plik infokey `%s' jest przestarza³y - mo¿na go uaktualniæ poleceniem infokey"
+
+#: info/infomap.c:1560
+#, c-format
+msgid ""
+"Invalid infokey file `%s' (bad section length) -- run infokey to update it"
+msgstr ""
+"B³êdny plik infokey `%s' (z³a d³ugo¶æ sekcji) - mo¿na go uaktualniæ infokey"
+
+#: info/infomap.c:1581
+#, c-format
+msgid ""
+"Invalid infokey file `%s' (bad section code) -- run infokey to update it"
+msgstr ""
+"B³êdny plik infokey `%s' (z³y kod sekcji) - mo¿na go uaktualniæ przez infokey"
+
+#: info/infomap.c:1716
+msgid "Bad data in infokey file -- some key bindings ignored"
+msgstr "B³êdne dane w pliku infokey - czê¶æ przypisañ klawiszy zignorowana"
+
+#: info/infomap.c:1766
+msgid "Bad data in infokey file -- some var settings ignored"
+msgstr "B³êdne dane w pliku infokey - czê¶æ ustawieñ zmiennych zignorowana"
+
+#: info/m-x.c:69
+msgid "Read the name of an Info command and describe it"
+msgstr "Odczytanie nazwy polecenia Info i opisanie go"
+
+#: info/m-x.c:73
+msgid "Describe command: "
+msgstr "Opis polecenia: "
+
+#: info/m-x.c:96
+msgid "Read a command name in the echo area and execute it"
+msgstr "Odczytanie nazwy polecenia w obszarze echo i wykonanie go"
+
+#: info/m-x.c:140
+msgid "Cannot execute an `echo-area' command here."
+msgstr "Nie mo¿na tutaj wykonaæ polecenia `echo-area'."
+
+#: info/m-x.c:154
+#, c-format
+msgid "Undefined command: %s"
+msgstr "Niezdefiniowane polecenie: %s"
+
+#: info/m-x.c:160
+msgid "Set the height of the displayed window"
+msgstr "Ustawienie wysoko¶ci wy¶wietlanego okna"
+
+#: info/m-x.c:173
+#, c-format
+msgid "Set screen height to (%d): "
+msgstr "Ustawienie wysoko¶ci ekranu na (%d): "
+
+#: info/makedoc.c:162 info/makedoc.c:170
+#, c-format
+msgid ""
+"   Source files groveled to make this file include:\n"
+"\n"
+msgstr ""
+"   Pliki ¼ród³owe przeszukane, aby ten plik zawiera³:\n"
+"\n"
+
+#: info/makedoc.c:550
+#, c-format
+msgid "Couldn't manipulate the file %s.\n"
+msgstr "Nie mo¿na obrabiaæ pliku %s.\n"
+
+#: info/nodemenu.c:31
+msgid ""
+"\n"
+"* Menu:\n"
+"  (File)Node                        Lines   Size   Containing File\n"
+"  ----------                        -----   ----   ---------------"
+msgstr ""
+"\n"
+"* Menu:\n"
+"  (Plik)Wêze³                       Linie  Rozmiar Zawiera plik\n"
+"  -----------                       -----  ------- ------------"
+
+#: info/nodemenu.c:202
+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 ""
+"Oto jest menu ostatnio odwiedzonych wêz³ów.\n"
+"Mo¿na wybraæ jeden z tego menu lub u¿yæ `\\[history-node]' w innym oknie.\n"
+
+#: info/nodemenu.c:224
+msgid "Make a window containing a menu of all of the currently visited nodes"
+msgstr ""
+"Utworzenie okna zawieraj±cego menu wszystkich aktualnie odwiedzanych wêz³ów"
+
+#: info/nodemenu.c:304
+msgid "Select a node which has been previously visited in a visible window"
+msgstr "Wybranie wêz³a, który by³ poprzednio odwiedzony w widocznym oknie"
+
+#: info/nodemenu.c:317
+msgid "Select visited node: "
+msgstr "Wybranie widocznego wêz³a: "
+
+#: info/nodemenu.c:337 info/session.c:2264
+#, c-format
+msgid "The reference disappeared! (%s)."
+msgstr "Odsy³acz znikn±³! (%s)."
+
+#: info/session.c:162
+#, c-format
+msgid ""
+"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
+"for menu item."
+msgstr ""
+"Witamy w Info w wersji %s. \\[get-help-window] pokazuje pomoc, \\[menu-item] "
+"wybiera element menu."
+
+#: info/session.c:620
+msgid "Move down to the next line"
+msgstr "Przej¶cie w dó³ do nastêpnej linii"
+
+#: info/session.c:635
+msgid "Move up to the previous line"
+msgstr "Przej¶cie w górê do poprzedniej linii"
+
+#: info/session.c:650
+msgid "Move to the end of the line"
+msgstr "Przej¶cie na koniec linii"
+
+#: info/session.c:670
+msgid "Move to the start of the line"
+msgstr "Przej¶cie na pocz±tek linii"
+
+#: info/session.c:860 makeinfo/node.c:1424
+msgid "Next"
+msgstr "Nastêpny"
+
+#: info/session.c:863
+msgid "Following Next node..."
+msgstr "Przej¶cie do wêz³a Nastêpny..."
+
+#: info/session.c:881
+msgid "Selecting first menu item..."
+msgstr "Wybranie pierwszego elementu menu..."
+
+#: info/session.c:893
+msgid "Selecting Next node..."
+msgstr "Wybranie wêz³a Nastêpny..."
+
+#: info/session.c:964
+#, c-format
+msgid "Moving Up %d time(s), then Next."
+msgstr "Przej¶cie W górê %d raz(y), potem Nastêpny."
+
+#: info/session.c:988
+msgid "No more nodes within this document."
+msgstr "Nie ma wiêcej wêz³ów w tym dokumencie."
+
+#: info/session.c:1011
+msgid "No `Prev' for this node."
+msgstr "Nie ma wêz³a `Poprzedni' dla tego wêz³a."
+
+#: info/session.c:1014 info/session.c:1073
+msgid "Moving Prev in this window."
+msgstr "Przej¶cie do wêz³a Poprzedni w tym oknie."
+
+#: info/session.c:1030
+msgid "No `Prev' or `Up' for this node within this document."
+msgstr ""
+"Nie ma wêz³ów `Poprzedni' ani `W górê' dla tego wêz³a w tym dokumencie."
+
+#: info/session.c:1034
+msgid "Moving Up in this window."
+msgstr "Przej¶cie do wêz³a W górê w tym oknie."
+
+#: info/session.c:1084
+msgid "Moving to `Prev's last menu item."
+msgstr "Przej¶cie do ostatniego elementu menu wêz³a Poprzedni."
+
+#: info/session.c:1095
+msgid "Move forwards or down through node structure"
+msgstr "Przej¶cie do przodu lub w dó³ struktury wêz³a"
+
+#: info/session.c:1111
+msgid "Move backwards or up through node structure"
+msgstr "Przej¶cie do ty³u lub w górê struktury wêz³a"
+
+#: info/session.c:1205
+msgid "Scroll forward in this window"
+msgstr "Przewijanie do przodu w tym oknie"
+
+#: info/session.c:1213
+msgid "Scroll forward in this window and set default window size"
+msgstr ""
+"Przewijanie do przodu w tym oknie i ustawienie domy¶lnego rozmiaru okna"
+
+#: info/session.c:1221
+msgid "Scroll forward in this window staying within node"
+msgstr "Przewijanie do przodu w tym oknie pozostaj±c wewn±trz wêz³a"
+
+#: info/session.c:1229
+msgid ""
+"Scroll forward in this window staying within node and set default window size"
+msgstr ""
+"Przewijanie do przodu w tym oknie wewn. wêz³a i ust. domy¶lnego rozmiaru okna"
+
+#: info/session.c:1237
+msgid "Scroll backward in this window"
+msgstr "Przewijanie do ty³u w tym oknie"
+
+#: info/session.c:1245
+msgid "Scroll backward in this window and set default window size"
+msgstr "Przewijanie do ty³u w tym oknie i ustawienie domy¶lnego rozmiaru okna"
+
+#: info/session.c:1254
+msgid "Scroll backward in this window staying within node"
+msgstr "Przewijanie do ty³u w tym oknie pozostaj±c wewn±trz wêz³a"
+
+#: info/session.c:1262
+msgid ""
+"Scroll backward in this window staying within node and set default window "
+"size"
+msgstr ""
+"Przewijanie do ty³u w tym oknie wewn. wêz³a i ust. domy¶lnego rozmiaru okna"
+
+#: info/session.c:1270
+msgid "Move to the start of this node"
+msgstr "Przej¶cie na pocz±tek tego wêz³a"
+
+#: info/session.c:1277
+msgid "Move to the end of this node"
+msgstr "Przej¶cie na koniec tego wêz³a"
+
+#: info/session.c:1284
+msgid "Scroll down by lines"
+msgstr "Przewijanie w dó³ po linii"
+
+#: info/session.c:1301
+msgid "Scroll up by lines"
+msgstr "Przewijanie w górê po linii"
+
+#: info/session.c:1319
+msgid "Scroll down by half screen size"
+msgstr "Przewijanie w dó³ po po³owie rozmiaru ekranu"
+
+#: info/session.c:1345
+msgid "Scroll up by half screen size"
+msgstr "Przewijanie w górê po po³owie rozmiaru ekranu"
+
+#: info/session.c:1374
+msgid "Select the next window"
+msgstr "Wybranie nastêpnego okna"
+
+#: info/session.c:1413
+msgid "Select the previous window"
+msgstr "Wybranie poprzedniego okna"
+
+#: info/session.c:1464
+msgid "Split the current window"
+msgstr "Podzielenie aktualnego okna"
+
+#: info/session.c:1545
+msgid "Delete the current window"
+msgstr "Usuniêcie aktualnego okna"
+
+#: info/session.c:1553
+msgid "Cannot delete a permanent window"
+msgstr "Nie mo¿na usun±æ sta³ego okna"
+
+#: info/session.c:1585
+msgid "Delete all other windows"
+msgstr "Usuniêcie wszystkich innych okien"
+
+#: info/session.c:1631
+msgid "Scroll the other window"
+msgstr "Przewijanie innego okna"
+
+#: info/session.c:1652
+msgid "Scroll the other window backward"
+msgstr "Przewijanie innego okna do ty³u"
+
+#: info/session.c:1658
+msgid "Grow (or shrink) this window"
+msgstr "Powiêkszenie (lub zmniejszenie) tego okna"
+
+#: info/session.c:1669
+msgid "Divide the available screen space among the visible windows"
+msgstr "Podzielenie dostêpnego miejsca na ekranie miêdzy widoczne okna"
+
+#: info/session.c:1676
+msgid "Toggle the state of line wrapping in the current window"
+msgstr "Zmiana stanu zawijania linii w aktualnym oknie"
+
+#: info/session.c:1848
+msgid "Select the Next node"
+msgstr "Wybranie wêz³a Nastêpny"
+
+#: info/session.c:1856
+msgid "Select the Prev node"
+msgstr "Wybranie wêz³a Poprzedni"
+
+#: info/session.c:1864
+msgid "Select the Up node"
+msgstr "Wybranie wêz³a W górê"
+
+#: info/session.c:1871
+msgid "Select the last node in this file"
+msgstr "Wybranie ostatniego wêz³a w tym pliku"
+
+#: info/session.c:1898 info/session.c:1931
+msgid "This window has no additional nodes"
+msgstr "To okno nie ma dodatkowych wêz³ów"
+
+#: info/session.c:1904
+msgid "Select the first node in this file"
+msgstr "Wybranie pierwszego wêz³a w tym pliku"
+
+#: info/session.c:1938
+msgid "Select the last item in this node's menu"
+msgstr "Wybranie ostatniego elementu w menu tego wêz³a"
+
+#: info/session.c:1944
+msgid "Select this menu item"
+msgstr "Wybranie tego elementu menu"
+
+#: info/session.c:1977
+#, c-format
+msgid "There aren't %d items in this menu."
+msgstr "Nie ma %d elementów w tym menu."
+
+#: info/session.c:2171 info/session.c:2172
+#, c-format
+msgid "Menu item (%s): "
+msgstr "Element menu (%s): "
+
+#: info/session.c:2175
+msgid "Menu item: "
+msgstr "Element menu: "
+
+#: info/session.c:2182 info/session.c:2183
+#, c-format
+msgid "Follow xref (%s): "
+msgstr "Przej¶cie za odno¶nikiem (%s): "
+
+#: info/session.c:2186
+msgid "Follow xref: "
+msgstr "Przej¶cie za odno¶nikiem: "
+
+#: info/session.c:2315
+msgid "Read a menu item and select its node"
+msgstr "Odczytanie elementu menu i wybranie jego wêz³a"
+
+#: info/session.c:2323
+msgid "Read a footnote or cross reference and select its node"
+msgstr "Odczytanie przypisu lub odsy³acza i wybranie jego wêz³a"
+
+#: info/session.c:2329
+msgid "Move to the start of this node's menu"
+msgstr "Przej¶cie na pocz±tek menu tego wêz³a"
+
+#: info/session.c:2353
+msgid "Visit as many menu items at once as possible"
+msgstr "Odwiedzenie jednocze¶nie jak najwiêkszej liczby elementów menu"
+
+#: info/session.c:2381
+msgid "Read a node name and select it"
+msgstr "Odczytanie nazwy wêz³a i wybranie go"
+
+#: info/session.c:2436 info/session.c:2441
+msgid "Goto node: "
+msgstr "Przej¶cie do wêz³a: "
+
+#: info/session.c:2505
+#, c-format
+msgid "No menu in node `%s'."
+msgstr "Brak menu w wê¼le `%s'."
+
+#: info/session.c:2551
+#, c-format
+msgid "No menu item `%s' in node `%s'."
+msgstr "Brak elementu menu `%s' w wê¼le `%s'."
+
+#: info/session.c:2581
+#, c-format
+msgid "Unable to find node referenced by `%s' in `%s'."
+msgstr "Nie mo¿na znale¼æ wêz³a wskazywanego przez `%s' w `%s'."
+
+#: info/session.c:2631
+msgid "Read a list of menus starting from dir and follow them"
+msgstr "Odczytanie listy menu pocz±wszy od katalogu i pod±¿anie za ni±"
+
+#: info/session.c:2633
+msgid "Follow menus: "
+msgstr "Pod±¿anie za menu: "
+
+#: info/session.c:2826
+msgid "Find the node describing program invocation"
+msgstr "Szukanie wêz³a opisuj±cego wywo³anie programu"
+
+#: info/session.c:2828
+#, c-format
+msgid "Find Invocation node of [%s]: "
+msgstr "Szukanie wêz³a Invocation dla [%s]: "
+
+#: info/session.c:2866
+msgid "Read a manpage reference and select it"
+msgstr "Odczytanie odno¶nika do strony podrêcznika i wybranie go"
+
+#: info/session.c:2870
+msgid "Get Manpage: "
+msgstr "Pobranie strony podrêcznika: "
+
+#: info/session.c:2900
+msgid "Select the node `Top' in this file"
+msgstr "Wybranie wêz³a `Szczytowy' w tym pliku"
+
+#: info/session.c:2906
+msgid "Select the node `(dir)'"
+msgstr "Wybranie wêz³a `(dir)'"
+
+#: info/session.c:2923 info/session.c:2925
+#, c-format
+msgid "Kill node (%s): "
+msgstr "Zabicie wêz³a (%s): "
+
+#: info/session.c:2977
+#, c-format
+msgid "Cannot kill node `%s'"
+msgstr "Nie mo¿na zabiæ wêz³a `%s'"
+
+#: info/session.c:2987
+msgid "Cannot kill the last node"
+msgstr "Nie mo¿na zabiæ ostatniego wêz³a"
+
+#: info/session.c:3073
+msgid "Select the most recently selected node"
+msgstr "Wybranie ostatnio wybranego wêz³a"
+
+#: info/session.c:3079
+msgid "Kill this node"
+msgstr "Zabicie tego wêz³a"
+
+#: info/session.c:3087
+msgid "Read the name of a file and select it"
+msgstr "Odczytanie nazwy pliku i wybranie go"
+
+#: info/session.c:3091
+msgid "Find file: "
+msgstr "Szukanie pliku: "
+
+#: info/session.c:3108
+#, c-format
+msgid "Cannot find `%s'."
+msgstr "Nie mo¿na znale¼æ `%s'."
+
+#: info/session.c:3151 info/session.c:3269
+#, c-format
+msgid "Could not create output file `%s'."
+msgstr "Nie mo¿na utworzyæ pliku wyj¶ciowego `%s'."
+
+#: info/session.c:3165 info/session.c:3287 info/session.c:3347
+msgid "Done."
+msgstr "Gotowe."
+
+#: info/session.c:3220
+#, c-format
+msgid "Writing node %s..."
+msgstr "Zapisywanie wêz³a %s..."
+
+#: info/session.c:3296
+msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
+msgstr "Przepuszczenie zawarto¶ci tego pliku przez INFO_PRINT_COMMAND"
+
+#: info/session.c:3331
+#, c-format
+msgid "Cannot open pipe to `%s'."
+msgstr "Nie mo¿na otworzyæ potoku do `%s'."
+
+#: info/session.c:3337
+#, c-format
+msgid "Printing node %s..."
+msgstr "Drukowanie wêz³a %s..."
+
+#: info/session.c:3567
+#, c-format
+msgid "Searching subfile %s ..."
+msgstr "Szukanie podpliku %s ..."
+
+#: info/session.c:3619
+msgid "Read a string and search for it case-sensitively"
+msgstr "Odczytanie ³añcucha i poszukiwanie go uwzglêdniaj±c wielko¶æ liter"
+
+#: info/session.c:3626
+msgid "Read a string and search for it"
+msgstr "Odczytanie ³añcucha i poszukiwanie go"
+
+#: info/session.c:3634
+msgid "Read a string and search backward for it"
+msgstr "Odczytanie ³añcucha i poszukiwanie go w ty³"
+
+#: info/session.c:3670 info/session.c:3677
+#, c-format
+msgid "%s%sfor string [%s]: "
+msgstr "%s%s³añcucha [%s]: "
+
+#: info/session.c:3671 info/session.c:3678
+msgid "Search backward"
+msgstr "Poszukiwanie w ty³"
+
+#: info/session.c:3672 info/session.c:3678
+msgid "Search"
+msgstr "Poszukiwanie"
+
+#: info/session.c:3673 info/session.c:3679
+msgid " case-sensitively "
+msgstr " uwzglêdniaj±c wielko¶æ liter "
+
+#: info/session.c:3674 info/session.c:3679
+msgid " "
+msgstr " "
+
+#: info/session.c:3718
+msgid "Search failed."
+msgstr "Poszukiwanie nie powiod³o siê."
+
+#: info/session.c:3736
+msgid "Repeat last search in the same direction"
+msgstr "Powtórzenie ostatniego poszukiwania w tym samym kierunku"
+
+#: info/session.c:3739 info/session.c:3749
+msgid "No previous search string"
+msgstr "Brak poprzedniego szukanego ³añcucha"
+
+#: info/session.c:3746
+msgid "Repeat last search in the reverse direction"
+msgstr "Powtórzenie ostatniego poszukiwania w odwrotnym kierunku"
+
+#: info/session.c:3765 info/session.c:3771
+msgid "Search interactively for a string as you type it"
+msgstr "Interaktywne poszukiwanie ³añcucha w trakcie wpisywania go"
+
+#: info/session.c:3851
+msgid "I-search backward: "
+msgstr "Interaktywne poszukiwanie wstecz: "
+
+#: info/session.c:3853
+msgid "I-search: "
+msgstr "Interaktywne poszukiwanie: "
+
+#: info/session.c:3878 info/session.c:3880
+msgid "Failing "
+msgstr "Bez powodzenia "
+
+#: info/session.c:4340
+msgid "Move to the previous cross reference"
+msgstr "Przej¶cie do poprzedniego odsy³acza"
+
+#: info/session.c:4349
+msgid "Move to the next cross reference"
+msgstr "Przej¶cie do nastêpnego odsy³acza"
+
+#: info/session.c:4359
+msgid "Select reference or menu item appearing on this line"
+msgstr "Wybranie odsy³acza lub elementu menu wystêpuj±cego w tej linii"
+
+#: info/session.c:4382
+msgid "Cancel current operation"
+msgstr "Anulowanie bie¿±cej operacji"
+
+#: info/session.c:4389
+msgid "Quit"
+msgstr "Wyj¶cie"
+
+#: info/session.c:4398
+msgid "Move the cursor to a specific line of the window"
+msgstr "Przesuniêcie kursora do podanej linii w oknie"
+
+#: info/session.c:4430
+msgid "Redraw the display"
+msgstr "Odrysowanie ekranu"
+
+#: info/session.c:4467
+msgid "Quit using Info"
+msgstr "Wyj¶cie z Info"
+
+#: info/session.c:4480
+msgid "Run command bound to this key's lowercase variant"
+msgstr "Uruchomienie polecenia przypisanego do wariantu klawisza z ma³± liter±"
+
+#: info/session.c:4491
+#, c-format
+msgid "Unknown command (%s)."
+msgstr "Nieznane polecenie (%s)."
+
+#: info/session.c:4494
+#, c-format
+msgid "\"%s\" is invalid"
+msgstr "\"%s\" jest niepoprawne"
+
+#: info/session.c:4495
+#, c-format
+msgid "`%s' is invalid"
+msgstr "`%s' jest niepoprawne"
+
+#: info/session.c:4709
+msgid "Add this digit to the current numeric argument"
+msgstr "Dodanie tej cyfry do aktualnego argumentu liczbowego"
+
+#: info/session.c:4718
+msgid "Start (or multiply by 4) the current numeric argument"
+msgstr "Rozpoczêcie (lub pomno¿enie przez 4) aktualnego argumentu liczbowego"
+
+#: info/session.c:4733
+msgid "Internally used by \\[universal-argument]"
+msgstr "Wewnêtrznie u¿ywane przez \\[universal-argument]"
+
+#: info/tilde.c:338
+#, c-format
+msgid "readline: Out of virtual memory!\n"
+msgstr "readline: Zabrak³o pamiêci wirtualnej!\n"
+
+#: info/variables.c:37
+msgid "When \"On\", footnotes appear and disappear automatically"
+msgstr "Je¶li \"On\", przypisy pojawiaj± siê i znikaj± automatycznie"
+
+#: info/variables.c:41
+msgid "When \"On\", creating or deleting a window resizes other windows"
+msgstr "Je¶li \"On\", tworzenie lub usuwanie okna zmienia rozmiar innych okien"
+
+#: info/variables.c:45
+msgid "When \"On\", flash the screen instead of ringing the bell"
+msgstr "Je¶li \"On\", migniêcie ekranu zamiast d¼wiêkowego dzwonka"
+
+#: info/variables.c:49
+msgid "When \"On\", errors cause the bell to ring"
+msgstr "Je¶li \"On\", b³êdy wywo³uj± sygna³ ostrzegawczy"
+
+#: info/variables.c:53
+msgid "When \"On\", Info garbage collects files which had to be uncompressed"
+msgstr "Je¶li \"On\", Info sprz±ta pliki, które musia³y zostaæ rozpakowane"
+
+#: info/variables.c:56
+msgid "When \"On\", the portion of the matched search string is highlighted"
+msgstr "Je¶li \"On\", dopasowana czê¶æ szukanego ³añcucha jest pod¶wietlana"
+
+#: info/variables.c:60
+msgid "Controls what happens when scrolling is requested at the end of a node"
+msgstr "Kontrola, co dzieje siê przy próbie przewijania na koñcu wêz³a"
+
+#: info/variables.c:64
+msgid "The number lines to scroll when the cursor moves out of the window"
+msgstr "Liczba linii do przewiniêcia kiedy kursor wychodzi za okno"
+
+#: info/variables.c:68
+msgid "When \"On\", Info accepts and displays ISO Latin characters"
+msgstr "Je¶li \"On\", Info przyjmuje i wy¶wietla znaki ISO Latin"
+
+#: info/variables.c:74
+msgid "Explain the use of a variable"
+msgstr "Wyja¶nienie u¿ycia zmiennej"
+
+#: info/variables.c:80
+msgid "Describe variable: "
+msgstr "Opisanie zmiennej: "
+
+#: info/variables.c:99
+msgid "Set the value of an Info variable"
+msgstr "Ustawienie warto¶ci zmiennej Info"
+
+#: info/variables.c:105
+msgid "Set variable: "
+msgstr "Ustawienie zmiennej: "
+
+#: info/variables.c:123
+#, c-format
+msgid "Set %s to value (%d): "
+msgstr "Ustawienie %s na warto¶æ (%d): "
+
+#: info/variables.c:164
+#, c-format
+msgid "Set %s to value (%s): "
+msgstr "Ustawienie %s na warto¶æ (%s): "
+
+#: info/window.c:1138
+msgid "--*** Tags out of Date ***"
+msgstr "--*** Znaczniki s± nieaktualne ***"
+
+#: info/window.c:1149
+msgid "-----Info: (), lines ----, "
+msgstr "-----Info: (), linii ----, "
+
+#: info/window.c:1156
+#, c-format
+msgid "-%s---Info: %s, %d lines --%s--"
+msgstr "-%s---Info: %s, %d linii --%s--"
+
+#: info/window.c:1160
+#, c-format
+msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
+msgstr "-%s%s-Info: (%s)%s, %d linii --%s--"
+
+#: info/window.c:1167
+#, c-format
+msgid " Subfile: %s"
+msgstr " Podplik: %s"
+
+#: lib/getopt.c:551 lib/getopt.c:570
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: opcja `%s' jest niejednoznaczna\n"
+
+#: lib/getopt.c:603 lib/getopt.c:607
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: opcja `--%s' nie przyjmuje argumentów\n"
+
+#: lib/getopt.c:616 lib/getopt.c:621
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: opcja `%c%s' nie przyjmuje argumentów\n"
+
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: opcja `%s' wymaga argumentu\n"
+
+#: lib/getopt.c:727 lib/getopt.c:730
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: nierozpoznana opcja `--%s'\n"
+
+#: lib/getopt.c:738 lib/getopt.c:741
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: nierozpoznana opcja `%c%s'\n"
+
+#: lib/getopt.c:796 lib/getopt.c:799
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: nieprawid³owa opcja -- %c\n"
+
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: b³êdna opcja -- %c\n"
+
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: opcja wymaga argumentu -- %c\n"
+
+#: lib/getopt.c:935 lib/getopt.c:954
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: opcja `-W %s' jest niejednoznaczna\n"
+
+#: lib/getopt.c:978 lib/getopt.c:999
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: opcja `-W %s' nie przyjmuje argumentu\n"
+
+#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#, c-format
+msgid "arguments to @%s ignored"
+msgstr "zignorowano argumenty dla @%s"
+
+#: makeinfo/cmds.c:585
+msgid "January"
+msgstr "stycznia"
+
+#: makeinfo/cmds.c:585
+msgid "February"
+msgstr "lutego"
+
+#: makeinfo/cmds.c:585
+msgid "March"
+msgstr "marca"
+
+#: makeinfo/cmds.c:585
+msgid "April"
+msgstr "kwietnia"
+
+#: makeinfo/cmds.c:585
+msgid "May"
+msgstr "maja"
+
+#: makeinfo/cmds.c:586
+msgid "June"
+msgstr "czerwca"
+
+#: makeinfo/cmds.c:586
+msgid "July"
+msgstr "lipca"
+
+#: makeinfo/cmds.c:586
+msgid "August"
+msgstr "sierpnia"
+
+#: makeinfo/cmds.c:586
+msgid "September"
+msgstr "wrze¶nia"
+
+#: makeinfo/cmds.c:586
+msgid "October"
+msgstr "pa¼dziernika"
+
+#: makeinfo/cmds.c:587
+msgid "November"
+msgstr "listopada"
+
+#: makeinfo/cmds.c:587
+msgid "December"
+msgstr "grudnia"
+
+#: makeinfo/cmds.c:936
+#, c-format
+msgid "unlikely character %c in @var"
+msgstr "niechciany znak %c w @var"
+
+#: makeinfo/cmds.c:979
+msgid "@sc argument all uppercase, thus no effect"
+msgstr "argument @sc zawiera same wielkie litery, wiêc brak efektu"
+
+#: makeinfo/cmds.c:1034
+#, c-format
+msgid "`{' expected, but saw `%c'"
+msgstr "oczekiwano `{', ale napotkano `%c'"
+
+#: makeinfo/cmds.c:1074
+msgid "end of file inside verb block"
+msgstr "koniec pliku wewn±trz bloku verb"
+
+#: makeinfo/cmds.c:1082
+#, c-format
+msgid "`}' expected, but saw `%c'"
+msgstr "oczekiwano `}', ale napotkano `%c'"
+
+#: makeinfo/cmds.c:1112
+msgid ""
+"@strong{Note...} produces a spurious cross-reference in Info; reword to "
+"avoid that"
+msgstr ""
+"@string{Note...} tworzy nieprawdziwe odniesienia w Info; nale¿y "
+"przeredagowaæ aby zapobiec temu"
+
+#: makeinfo/cmds.c:1305
+#, c-format
+msgid "%c%s is obsolete"
+msgstr "%c%s jest przestarza³e"
+
+#: makeinfo/cmds.c:1414
+#, c-format
+msgid "@sp requires a positive numeric argument, not `%s'"
+msgstr "@sp wymaga argumentu bêd±cego liczb± dodatni±, a nie `%s'"
+
+#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
+#, c-format
+msgid "Bad argument to %c%s"
+msgstr "Z³y argument dla %c%s"
+
+#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
+msgid "asis"
+msgstr "zachowaj"
+
+#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
+msgid "none"
+msgstr "brak"
+
+#: makeinfo/cmds.c:1789
+#, c-format
+msgid "Bad argument to @%s"
+msgstr "Z³y argument dla @%s"
+
+#: makeinfo/cmds.c:1803
+msgid "insert"
+msgstr "wstaw"
+
+#: makeinfo/defun.c:84
+msgid "Missing `}' in @def arg"
+msgstr "Brakuje `}' w argumencie @def"
+
+#: makeinfo/defun.c:403
+msgid "Function"
+msgstr "Funkcja"
+
+#: makeinfo/defun.c:406
+msgid "Macro"
+msgstr "Makro"
+
+#: makeinfo/defun.c:409
+msgid "Special Form"
+msgstr "Forma specjalna"
+
+#: makeinfo/defun.c:413
+msgid "Variable"
+msgstr "Zmienna"
+
+#: makeinfo/defun.c:416
+msgid "User Option"
+msgstr "Opcja u¿ytkownika"
+
+#: makeinfo/defun.c:420
+msgid "Instance Variable"
+msgstr "Instancja zmiennej"
+
+#: makeinfo/defun.c:424
+msgid "Method"
+msgstr "Metoda"
+
+#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
+#: makeinfo/defun.c:644 makeinfo/xml.c:2229
+msgid "of"
+msgstr "typu"
+
+#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
+msgid "on"
+msgstr "na"
+
+#: makeinfo/defun.c:711
+#, c-format
+msgid "Must be in `@%s' environment to use `@%s'"
+msgstr "Trzeba byæ w ¶rodowisku `@%s', aby u¿yæ `@%s'"
+
+#: makeinfo/files.c:435
+#, c-format
+msgid "%s: getwd: %s, %s\n"
+msgstr "%s: getwd: %s, %s\n"
+
+#: makeinfo/files.c:638
+#, c-format
+msgid "`%s' omitted before output filename"
+msgstr "Pominiêto `%s' przed nazw± pliku wyj¶ciowego"
+
+#: makeinfo/files.c:646
+#, c-format
+msgid "`%s' omitted since writing to stdout"
+msgstr "Pominiêto `%s' przy zapisie na standardowe wyj¶cie"
+
+#: makeinfo/files.c:694
+msgid "Output buffer not empty."
+msgstr "Bufor wyj¶ciowy niepusty."
+
+#: makeinfo/footnote.c:150
+#, c-format
+msgid "`%c%s' needs an argument `{...}', not just `%s'"
+msgstr "`%c%s' wymaga argumentu `{...}', a nie tylko `%s'"
+
+#: makeinfo/footnote.c:165
+#, c-format
+msgid "No closing brace for footnote `%s'"
+msgstr "Nie zamkniêty nawias dla przypisu `%s'"
+
+#: makeinfo/footnote.c:198
+msgid "Footnote defined without parent node"
+msgstr "Zdefiniowano przypis bez wêz³a nadrzêdnego"
+
+#: makeinfo/footnote.c:210
+msgid "Footnotes inside footnotes are not allowed"
+msgstr "Przypisy wewn±trz przypisów nie s± dozwolone"
+
+#: makeinfo/footnote.c:302 makeinfo/index.c:189
+msgid "Footnotes"
+msgstr "Przypisy"
+
+#: makeinfo/html.c:87
+#, c-format
+msgid "%s: could not open --css-file: %s"
+msgstr "%s: nie mo¿na otworzyæ pliku css: %s"
+
+#: makeinfo/html.c:172
+#, c-format
+msgid "%s:%d: --css-file ended in comment"
+msgstr "%s:%d: plik css zakoñczy³ siê wewn±trz komentarza"
+
+#: makeinfo/html.c:207
+msgid "Untitled"
+msgstr "Bez tytu³u"
+
+#: makeinfo/html.c:422
+msgid "[unexpected] no html tag to pop"
+msgstr "[nieoczekiwane] brak znacznika html do zdjêcia"
+
+#: makeinfo/html.c:752
+#, c-format
+msgid "[unexpected] invalid node name: `%s'"
+msgstr "[nieoczekiwane] b³êdna nazwa wêz³a: `%s'"
+
+#: makeinfo/index.c:169
+#, c-format
+msgid "Unknown index `%s'"
+msgstr "Nieznany indeks `%s'"
+
+#: makeinfo/index.c:234
+#, c-format
+msgid "Info cannot handle `:' in index entry `%s'"
+msgstr "Info nie mo¿e obs³u¿yæ `:' we wpisie indeksu `%s'"
+
+#: makeinfo/index.c:412
+#, c-format
+msgid "Index `%s' already exists"
+msgstr "Indeks `%s' ju¿ istnieje"
+
+#: makeinfo/index.c:455
+#, c-format
+msgid "Unknown index `%s' and/or `%s' in @synindex"
+msgstr "Nieznany indeks `%s' i/lub `%s' w @synindex"
+
+#: makeinfo/index.c:661
+msgid "(line )"
+msgstr "(linia )"
+
+#: makeinfo/index.c:669
+#, c-format
+msgid "(line %*d)"
+msgstr "(linia %*d)"
+
+#: makeinfo/index.c:750
+#, c-format
+msgid "Unknown index `%s' in @printindex"
+msgstr "Nieznany indeks `%s' w @printindex"
+
+#: makeinfo/index.c:819
+#, c-format
+msgid "Entry for index `%s' outside of any node"
+msgstr "Wpis dla indeksu `%s' poza jakimkolwiek wêz³em"
+
+#: makeinfo/index.c:822 makeinfo/index.c:858
+msgid "(outside of any node)"
+msgstr "(poza jakimkolwiek wêz³em)"
+
+#: makeinfo/index.c:919 makeinfo/index.c:925
+msgid "See "
+msgstr "Patrz "
+
+#: makeinfo/insertion.c:160
+msgid "@item not allowed in argument to @itemize"
+msgstr "@item nie jest dozwolone w argumencie @itemize"
+
+#: makeinfo/insertion.c:238
+msgid "Broken-Type in insertion_type_pname"
+msgstr "Broken-Type w insertion_type_pname"
+
+#: makeinfo/insertion.c:334
+msgid "Enumeration stack overflow"
+msgstr "Przepe³nienie stosu numerowania"
+
+#: makeinfo/insertion.c:366
+#, c-format
+msgid "lettering overflow, restarting at %c"
+msgstr "przepe³nienie, restart od %c"
+
+#: makeinfo/insertion.c:631
+#, c-format
+msgid "%s requires an argument: the formatter for %citem"
+msgstr "%s wymaga argumentu: formatowania dla %citem"
+
+#: makeinfo/insertion.c:719
+#, c-format
+msgid "%cfloat environments cannot be nested"
+msgstr "¦rodowiska %cfloat nie mog± byæ zagnie¿d¿one"
+
+#: makeinfo/insertion.c:973
+#, c-format
+msgid "`@end' expected `%s', but saw `%s'"
+msgstr "`@end' oczekiwa³o `%s', ale napotkano `%s'"
+
+#: makeinfo/insertion.c:1337
+#, c-format
+msgid "No matching `%cend %s'"
+msgstr "Brak pasuj±cego `%cend %s'"
+
+#: makeinfo/insertion.c:1592
+#, c-format
+msgid "%s requires letter or digit"
+msgstr "%s wymaga litery lub cyfry"
+
+#: makeinfo/insertion.c:1687
+msgid "end of file inside verbatim block"
+msgstr "koniec pliku wewn±trz bloku dos³ownego"
+
+#: makeinfo/insertion.c:1913
+#, c-format
+msgid "@%s not meaningful outside `@float' environment"
+msgstr "@%s nic nie znaczy poza ¶rodowiskiem `@float'"
+
+#: makeinfo/insertion.c:1949
+msgid "@menu seen before first @node, creating `Top' node"
+msgstr "napotkano @menu przed pierwszym @node, tworzenie wêz³a `Top'"
+
+#: makeinfo/insertion.c:1950
+msgid ""
+"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
+msgstr "mo¿e wêze³ @top powinien byæ otoczony @ifnottex, a nie @ifinfo?"
+
+#: makeinfo/insertion.c:1962
+msgid "@detailmenu seen before first node, creating `Top' node"
+msgstr "napotkano @detailmenu przed pierwszym wêz³em, tworzenie wêz³a `Top'"
+
+#: makeinfo/insertion.c:2018
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr "@%s nic nie znaczy poza ¶rodowiskami `@titlepage' i `@quotation'"
+
+#: makeinfo/insertion.c:2032
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' environment"
+msgstr "@%s nic nie znaczy poza ¶rodowiskiem `@titlepage'"
+
+#: makeinfo/insertion.c:2063
+#, c-format
+msgid "Unmatched `%c%s'"
+msgstr "Niedopasowane `%c%s'"
+
+#: makeinfo/insertion.c:2068
+#, c-format
+msgid "`%c%s' needs something after it"
+msgstr "`%c%s' wymaga czego¶ po sobie"
+
+#: makeinfo/insertion.c:2074
+#, c-format
+msgid "Bad argument `%s' to `@%s', using `%s'"
+msgstr "Z³y argument `%s' dla `@%s', u¿ycie `%s'"
+
+#: makeinfo/insertion.c:2171
+#, c-format
+msgid "@%s not meaningful inside `@%s' block"
+msgstr "@%s nic nie znaczy wewn±trz bloku `@%s'"
+
+#: makeinfo/insertion.c:2180
+#, c-format
+msgid "@itemx not meaningful inside `%s' block"
+msgstr "@itemx nic nie znaczy wewn±trz bloku `%s'"
+
+#: makeinfo/insertion.c:2356
+#, c-format
+msgid "%c%s found outside of an insertion block"
+msgstr "znaleziono %c%s na zewn±trz bloku wstawki"
+
+#: makeinfo/lang.c:580
+#, c-format
+msgid "%s is not a valid ISO 639 language code"
+msgstr "%s nie jest poprawnym kodem jêzyka zgodnym z ISO 639"
+
+#: makeinfo/lang.c:655
+#, c-format
+msgid "unrecognized encoding name `%s'"
+msgstr "nierozpoznana nazwa kodowania `%s'"
+
+#: makeinfo/lang.c:663
+#, c-format
+msgid "sorry, encoding `%s' not supported"
+msgstr "niestety kodowanie `%s' nie jest obs³ugiwane"
+
+#: makeinfo/lang.c:715
+#, c-format
+msgid "invalid encoded character `%s'"
+msgstr "b³êdnie zakodowany znak `%s'"
+
+#: makeinfo/lang.c:1009
+#, c-format
+msgid "%c%s expects `i' or `j' as argument, not `%c'"
+msgstr "%c%s oczekuje `i' lub `j' jako argumentu, a nie `%c'"
+
+#: makeinfo/lang.c:1013
+#, c-format
+msgid "%c%s expects a single character `i' or `j' as argument"
+msgstr "%c%s oczekuje pojedynczego znaku `i' lub `j' jako argumentu"
+
+#: makeinfo/macro.c:128
+#, c-format
+msgid "macro `%s' previously defined"
+msgstr "makro `%s' ju¿ zosta³o zdefiniowane"
+
+#: makeinfo/macro.c:132
+#, c-format
+msgid "here is the previous definition of `%s'"
+msgstr "oto poprzednia definicja `%s'"
+
+#: makeinfo/macro.c:355
+#, c-format
+msgid "\\ in macro expansion followed by `%s' instead of parameter name"
+msgstr "po \\ w rozwiniêciu makra wystêpuje `%s' zamiast nazwy parametru"
+
+#: makeinfo/macro.c:401
+#, c-format
+msgid "Macro `%s' called on line %d with too many args"
+msgstr "Makro `%s' wywo³ane w linii %d ze zbyt du¿± liczb± argumentów"
+
+#: makeinfo/macro.c:586
+#, c-format
+msgid "%cend macro not found"
+msgstr "nie znaleziono makra %cend"
+
+#: makeinfo/macro.c:624
+msgid "@quote-arg only useful for single-argument macros"
+msgstr "@quote-arg jest u¿yteczne tylko do makr jednoargumentowych"
+
+#: makeinfo/macro.c:660
+#, c-format
+msgid "mismatched @end %s with @%s"
+msgstr "niedopasowane @end %s do @%s"
+
+#: makeinfo/makeinfo.c:184
+#, c-format
+msgid "Too many errors!  Gave up.\n"
+msgstr "Zbyt du¿o b³êdów! Poddajê siê.\n"
+
+#: makeinfo/makeinfo.c:302
+#, c-format
+msgid "%s:%d: warning: "
+msgstr "%s:%d: uwaga: "
+
+#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
+#, c-format
+msgid "Misplaced %c"
+msgstr "¬le umieszczone %c"
+
+#: makeinfo/makeinfo.c:340
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "Polecenie `%s --help' poda wiêcej informacji.\n"
+
+#: makeinfo/makeinfo.c:343
+#, c-format
+msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
+msgstr "Sk³adnia: %s [OPCJA]... PLIK-TEXINFO...\n"
+
+#: makeinfo/makeinfo.c:346
+msgid ""
+"Translate Texinfo source documentation to various other formats, by default\n"
+"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
+msgstr ""
+"T³umaczenie ¼ród³owej dokumentacji Texinfo do ró¿nych innych formatów,\n"
+"domy¶lnie plików Info nadaj±cych siê do czytania pod Emacsem lub "
+"samodzielnym\n"
+"GNU Info.\n"
+
+#: makeinfo/makeinfo.c:350
+#, c-format
+msgid ""
+"General options:\n"
+"      --error-limit=NUM       quit after NUM errors (default %d).\n"
+"      --force                 preserve output even if errors.\n"
+"      --help                  display this help and exit.\n"
+"      --no-validate           suppress node cross-reference validation.\n"
+"      --no-warn               suppress warnings (but not errors).\n"
+"      --reference-limit=NUM   warn about at most NUM references (default %"
+"d).\n"
+"  -v, --verbose               explain what is being done.\n"
+"      --version               display version information and exit.\n"
+msgstr ""
+"Opcje ogólne:\n"
+"      --error-limit=ILE       zakoñczenie po ILU b³êdach (domy¶lnie %d).\n"
+"      --force                 zachowanie wyj¶cia nawet w przypadku b³êdów.\n"
+"      --help                  wy¶wietlenie tego opisu i zakoñczenie.\n"
+"      --no-validate           pominiêcie kontroli odsy³aczy miêdzy wêz³ami.\n"
+"      --no-warn               pominiêcie ostrze¿eñ (ale nie b³êdów).\n"
+"      --reference-limit=ILE   ostrze¿enie o najwy¿ej ILU odsy³aczach\n"
+"                                (domy¶lnie %d).\n"
+"  -v, --verbose               wyja¶nianie co siê dzieje.\n"
+"      --version               wy¶wietlenie informacji o wersji i "
+"zakoñczenie.\n"
+
+#: makeinfo/makeinfo.c:364
+#, no-wrap
+msgid ""
+"Output format selection (default is to produce Info):\n"
+"      --docbook             output Docbook XML rather than Info.\n"
+"      --html                output HTML rather than Info.\n"
+"      --xml                 output Texinfo XML rather than Info.\n"
+"      --plaintext           output plain text rather than Info.\n"
+msgstr ""
+"Wybór formatu wyj¶ciowego (domy¶lnym jest info):\n"
+"      --docbook             wyprodukowanie DocBook XML zamiast Info.\n"
+"      --html                wyprodukowanie HTML zamiast Info.\n"
+"      --xml                 wyprodukowanie Texinfo XML zamiast Info.\n"
+"      --plaintext           wyprodukowanie czystego tekstu zamiast Info.\n"
+
+#: makeinfo/makeinfo.c:372
+msgid ""
+"General output options:\n"
+"  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
+"                            ignoring any @setfilename.\n"
+"      --no-headers          suppress node separators, Node: lines, and "
+"menus\n"
+"                              from Info output (thus producing plain text)\n"
+"                              or from HTML (thus producing shorter output);\n"
+"                              also, write to standard output by default.\n"
+"      --no-split            suppress splitting of Info or HTML output,\n"
+"                            generate only one output file.\n"
+"      --number-sections     output chapter and sectioning numbers.\n"
+"  -o, --output=FILE         output to FILE (directory if split HTML),\n"
+msgstr ""
+"Ogólne opcje dotycz±ce wyj¶cia:\n"
+"  -E, --macro-expand PLIK   zapis ¼róde³ z rozwiniêtymi makrami do PLIKU.\n"
+"      --no-headers          pominiêcie separatorów wêz³ów, linii Node, oraz\n"
+"                              menu z wyj¶cia Info (zapisanie czystego "
+"tekstu)\n"
+"                              lub z HTML (zapisanie krótszego pliku);\n"
+"                              tak¿e pisanie domy¶lnie na standardowe "
+"wyj¶cie.\n"
+"      --no-split            pominiêcie dzielenia Info lub HTML, generowanie\n"
+"                              tylko jednego pliku wyj¶ciowego.\n"
+"      --number-sections     zapisywanie numerów rozdzia³ów i sekcji.\n"
+"  -o, --output=PLIK         zapisanie do PLIKU (katalogu w przypadku "
+"dzielonego\n"
+"                              HTML), ignoruj±c wszelkie @setfilename.\n"
+
+#: makeinfo/makeinfo.c:386
+#, c-format
+msgid ""
+"Options for Info and plain text:\n"
+"      --enable-encoding       output accented and special characters in\n"
+"                                Info output based on @documentencoding.\n"
+"      --fill-column=NUM       break Info lines at NUM characters (default %"
+"d).\n"
+"      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
+"                                `separate' to put them in their own node;\n"
+"                                `end' to put them at the end of the node\n"
+"                                  in which they are defined (default).\n"
+"      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default %"
+"d).\n"
+"                                If VAL is `none', do not indent; if VAL is\n"
+"                                `asis', preserve existing indentation.\n"
+"      --split-size=NUM        split Info files at size NUM (default %d).\n"
+msgstr ""
+"Opcje dla Info i czystego tekstu:\n"
+"      --enable-encoding       zapis znaków z akcentami i specjalnych w "
+"pliku\n"
+"                                Info w zale¿no¶ci od @documentencoding.\n"
+"      --fill-column=ILE       ³amanie linii Info po ILU znakach (domy¶lnie %"
+"d).\n"
+"      --footnote-style=STYL   zapis stopek w Info zgodnie ze STYLEM:\n"
+"                                `separate' - umieszczenie ich we w³asnym "
+"wê¼le;\n"
+"                                `end' - umieszczenie na koñcu wêz³a, w "
+"którym\n"
+"                                  zosta³y zdefiniowane (domy¶lne).\n"
+"      --paragraph-indent=ILE  wciêcia akapitów Info o ILE spacji (domy¶lnie %"
+"d).\n"
+"                                Je¶li ILE to `none' lub `brak', bez wciêæ;\n"
+"                                je¶li ILE to `asis' lub `zachowaj', "
+"zachowanie\n"
+"                                istniej±cych wciêæ.\n"
+"      --split-size=ROZMIAR    podzia³ Info na pliki o ROZMIARZE (domy¶lnie %"
+"d).\n"
+
+#: makeinfo/makeinfo.c:403
+msgid ""
+"Options for HTML:\n"
+"      --css-include=FILE        include FILE in HTML <style> output;\n"
+"                                  read stdin if FILE is -.\n"
+msgstr ""
+"Opcje dla HTML:\n"
+"      --css-include=PLIK        do³±czenie PLIKU w wyj¶ciu HTML <style>;\n"
+"                                  je¶li PLIK to -, czytane jest standardowe\n"
+"                                  wej¶cie\n"
+
+#: makeinfo/makeinfo.c:409
+#, c-format
+msgid ""
+"Options for XML and Docbook:\n"
+"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"d).\n"
+"                                  If VAL is 0, ignorable whitespace is "
+"dropped.\n"
+msgstr ""
+"Opcje dla XML i Docbooka:\n"
+"      --output-indent=ILE       wciêcia elementów XML o ILE spacji "
+"(domy¶lnie\n"
+"                                  %d). Je¶li ILE jest 0, pomijalne spacje "
+"s±\n"
+"                                  usuwane.\n"
+
+#: makeinfo/makeinfo.c:416
+msgid ""
+"Input file options:\n"
+"      --commands-in-node-names  allow @ commands in node names.\n"
+"  -D VAR                        define the variable VAR, as with @set.\n"
+"  -I DIR                        append DIR to the @include search path.\n"
+"  -P DIR                        prepend DIR to the @include search path.\n"
+"  -U VAR                        undefine the variable VAR, as with @clear.\n"
+msgstr ""
+"Opcje dla pliku wej¶ciowego:\n"
+"      --commands-in-node-names  dopuszczenie poleceñ @ w nazwach wêz³ów.\n"
+"  -D ZMIENNA                    zdefiniowanie ZMIENNEJ, tak jak przez @set.\n"
+"  -I KATALOG                    do³±czenie KATALOGU na pocz±tku ¶cie¿ki\n"
+"                                  poszukiwañ dla @include.\n"
+"  -P KATALOG                    do³±czenie KATALOGU na koñcu ¶cie¿ki\n"
+"                                  poszukiwañ dla @include.\n"
+"  -U ZMIENNA                    usuniêcie definicji ZMIENNEJ, tak jak "
+"@clear.\n"
+
+#: makeinfo/makeinfo.c:425
+msgid ""
+"Conditional processing in input:\n"
+"  --ifdocbook       process @ifdocbook and @docbook even if\n"
+"                      not generating Docbook.\n"
+"  --ifhtml          process @ifhtml and @html even if not generating HTML.\n"
+"  --ifinfo          process @ifinfo even if not generating Info.\n"
+"  --ifplaintext     process @ifplaintext even if not generating plain text.\n"
+"  --iftex           process @iftex and @tex; implies --no-split.\n"
+"  --ifxml           process @ifxml and @xml.\n"
+"  --no-ifdocbook    do not process @ifdocbook and @docbook text.\n"
+"  --no-ifhtml       do not process @ifhtml and @html text.\n"
+"  --no-ifinfo       do not process @ifinfo text.\n"
+"  --no-ifplaintext  do not process @ifplaintext text.\n"
+"  --no-iftex        do not process @iftex and @tex text.\n"
+"  --no-ifxml        do not process @ifxml and @xml text.\n"
+"\n"
+"  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
+msgstr ""
+"Warunkowe przetwarzanie wej¶cia:\n"
+"  --ifdocbook       przetwarzanie @ifdocbook i @docbook nawet je¶li nie "
+"jest\n"
+"                      generowany Docbook.\n"
+"  --ifhtml          przetwarzanie @ifhtml i @html nawet je¶li nie jest\n"
+"                      generowany HTML.\n"
+"  --ifinfo          przetwarzanie @ifinfo nawet je¶li nie jest generowane "
+"Info.\n"
+"  --ifplaintext     przetwarzanie @ifplaintext nawet je¶li nie jest "
+"generowany\n"
+"                      czysty tekst.\n"
+"  --iftex           przetwarzanie @iftex i @tex; wymusza --no-split.\n"
+"  --ifxml           przetwarzanie @ifxml i @xml.\n"
+"  --no-ifdocbook    nie przetwarzanie tekstu @ifdocbook i @docbook.\n"
+"  --no-ifhtml       nie przetwarzanie tekstu @ifhtml i @html.\n"
+"  --no-ifinfo       nie przetwarzanie tekstu @ifinfo.\n"
+"  --no-ifplaintext  nie przetwarzanie tekstu @ifplaintext.\n"
+"  --no-iftex        nie przetwarzanie tekstu @iftex i @tex.\n"
+"  --no-ifxml        nie przetwarzanie tekstu @ifxml i @xml.\n"
+"\n"
+"  Ponadto opcje --no-ifFORMAT powoduj± przetwarzanie tekstu @ifnotFORMAT.\n"
+
+#: makeinfo/makeinfo.c:444
+msgid ""
+"  The defaults for the @if... conditionals depend on the output format:\n"
+"  if generating HTML, --ifhtml is on and the others are off;\n"
+"  if generating Info, --ifinfo is on and the others are off;\n"
+"  if generating plain text, --ifplaintext is on and the others are off;\n"
+"  if generating XML, --ifxml is on and the others are off.\n"
+msgstr ""
+"  Domy¶lne opcje dla warunków @if... zale¿± od formatu wyj¶ciowego:\n"
+"  je¶li generowany jest HTML, --ifhtml jest w³±czone, a reszta wy³±czona;\n"
+"  je¶li generowane jest Info, --ifinfo jest w³±czone, a reszta wy³±czona;\n"
+"  je¶li generowany jest tekst, --ifplaintext jest w³±czony, a inne "
+"wy³±czone;\n"
+"  je¶li generowany jest XML, --ifxml jest w³±czone, a reszta wy³±czona.\n"
+
+#: makeinfo/makeinfo.c:452
+msgid ""
+"Examples:\n"
+"  makeinfo foo.texi                     write Info to foo's @setfilename\n"
+"  makeinfo --html foo.texi              write HTML to @setfilename\n"
+"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
+"  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
+"  makeinfo --no-headers foo.texi        write plain text to standard output\n"
+"\n"
+"  makeinfo --html --no-headers foo.texi write html without node lines, "
+"menus\n"
+"  makeinfo --number-sections foo.texi   write Info with numbered sections\n"
+"  makeinfo --no-split foo.texi          write one Info file however big\n"
+msgstr ""
+"Przyk³ady:\n"
+"  makeinfo foo.texi                     zapisanie Info do @setfilename z "
+"foo\n"
+"  makeinfo --html foo.texi              zapisanie HTML do @setfilename\n"
+"  makeinfo --xml foo.texi               zapisanie Texinfo XML do "
+"@setfilename\n"
+"  makeinfo --docbook foo.texi           zapisanie DocBook XML do "
+"@setfilename\n"
+"  makeinfo --no-headers foo.texi        zapisanie czystego tekstu na\n"
+"                                          standardowe wyj¶cie\n"
+"\n"
+"  makeinfo --html --no-headers foo.texi zapisanie HTML bez linii wêz³ów i "
+"menu\n"
+"  makeinfo --number-sections foo.texi   zapisanie Info z numerowanymi "
+"sekcjami\n"
+"  makeinfo --no-split foo.texi          zapisanie jednego wielkiego pliku "
+"Info\n"
+
+#: makeinfo/makeinfo.c:603
+#, c-format
+msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
+msgstr "%s: Zignorowano nierozpoznan± warto¶æ TEXINFO_OUTPUT_FORMAT `%s'.\n"
+
+#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
+#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
+#, c-format
+msgid "%s: %s arg must be numeric, not `%s'.\n"
+msgstr "%s: argument %s musi byæ liczb±, a nie `%s'.\n"
+
+#: makeinfo/makeinfo.c:660
+#, c-format
+msgid "%s: could not open macro expansion output `%s'"
+msgstr "%s: nie mo¿na otworzyæ wyj¶cia `%s' do zapisu rozwiniêæ makr"
+
+#: makeinfo/makeinfo.c:665
+#, c-format
+msgid "%s: ignoring second macro expansion output `%s'.\n"
+msgstr "%s: zignorowano drugie wyj¶cie `%s' do zapisu rozwiniêæ makr.\n"
+
+#: makeinfo/makeinfo.c:707
+#, c-format
+msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
+msgstr ""
+"%s: argument --paragraph-indent musi byæ liczb±/`none'/`asis', a nie `%s'.\n"
+
+#: makeinfo/makeinfo.c:732
+#, c-format
+msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
+msgstr ""
+"%s: argumentem --footnote-style musi byæ `separate' lub `end', a nie `%s'.\n"
+
+#: makeinfo/makeinfo.c:806
+#, c-format
+msgid "%s: missing file argument.\n"
+msgstr "%s: brakuj±cy argument plikowy.\n"
+
+#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#, c-format
+msgid "Multiline command %c%s used improperly"
+msgstr "Niew³a¶ciwie u¿yte wieloliniowe polecenie %c%s"
+
+#: makeinfo/makeinfo.c:1000
+#, c-format
+msgid "Expected `%s'"
+msgstr "Oczekiwano `%s'"
+
+#: makeinfo/makeinfo.c:1479
+#, c-format
+msgid "Can't create directory `%s': %s"
+msgstr "Nie mo¿na utworzyæ katalogu `%s': %s"
+
+#: makeinfo/makeinfo.c:1525
+#, c-format
+msgid "No `%s' found in `%s'"
+msgstr "Nie znaleziono `%s' w `%s'"
+
+#: makeinfo/makeinfo.c:1605
+#, c-format
+msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
+msgstr ""
+"%s: nie zapisywanie rozwiniêæ makr na stdout, bo tam zapisywane jest Info.\n"
+
+#: makeinfo/makeinfo.c:1638
+#, c-format
+msgid "Making %s file `%s' from `%s'.\n"
+msgstr "Tworzenie pliku %s `%s' z `%s'.\n"
+
+#: makeinfo/makeinfo.c:1673
+#, c-format
+msgid "This is %s, produced by makeinfo version %s from %s.\n"
+msgstr "To jest %s, wyprodukowany przez makeinfo w wersji %s z %s.\n"
+
+#: makeinfo/makeinfo.c:1709
+#, c-format
+msgid ""
+"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
+msgstr ""
+"%s: Usuwanie pliku wyj¶cia makr `%s' z powodu b³êdów; --force pozwoli "
+"zachowaæ.\n"
+
+#: makeinfo/makeinfo.c:1773
+#, c-format
+msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
+msgstr ""
+"%s: Usuwanie pliku wyj¶ciowego `%s' z powodu b³êdów; --force pozwoli "
+"zachowaæ.\n"
+
+#: makeinfo/makeinfo.c:2034
+#, c-format
+msgid "Unknown command `%s'"
+msgstr "Nieznane polecenie `%s'"
+
+#: makeinfo/makeinfo.c:2056
+#, c-format
+msgid "Use braces to give a command as an argument to @%s"
+msgstr ""
+"Nale¿y u¿yæ nawiasów klamrowych, aby podaæ polecenie jako argument dla @%s"
+
+#: makeinfo/makeinfo.c:2314
+#, c-format
+msgid "%c%s expected braces"
+msgstr "%c%s oczekiwa³o nawiasów klamrowych"
+
+#: makeinfo/makeinfo.c:2327
+msgid "Unmatched }"
+msgstr "Niedopasowany }"
+
+#: makeinfo/makeinfo.c:2375
+msgid "NO_NAME!"
+msgstr "BEZ_NAZWY!"
+
+#: makeinfo/makeinfo.c:2396
+#, c-format
+msgid "%c%s missing close brace"
+msgstr "w %c%s brakuje klamry zamykaj±cej"
+
+#: makeinfo/makeinfo.c:3309
+#, c-format
+msgid "@image file `%s' (for HTML) not readable: %s"
+msgstr "Plik @image `%s' (dla HTML) nieczytelny: %s"
+
+#: makeinfo/makeinfo.c:3315
+#, c-format
+msgid "No such file `%s'"
+msgstr "Nie ma pliku `%s'"
+
+#: makeinfo/makeinfo.c:3447
+#, c-format
+msgid "@image file `%s' (for text) unreadable: %s"
+msgstr "Plik @image `%s' (dla tekstu) nieczytelny: %s"
+
+#: makeinfo/makeinfo.c:3456
+msgid "@image missing filename argument"
+msgstr "Po @image brakuje argumentu plikowego"
+
+#: makeinfo/makeinfo.c:3675
+#, c-format
+msgid "undefined flag: %s"
+msgstr "niezdefiniowana flaga: %s"
+
+#: makeinfo/makeinfo.c:3676
+#, c-format
+msgid "{No value for `%s'}"
+msgstr "{Brak warto¶ci dla `%s'}"
+
+#: makeinfo/makeinfo.c:3728
+#, c-format
+msgid "%c%s requires a name"
+msgstr "%c%s wymaga nazwy"
+
+#: makeinfo/makeinfo.c:3834
+#, c-format
+msgid "Reached eof before matching @end %s"
+msgstr "Osi±gniêto koniec pliku przed znalezieniem @end %s"
+
+#: makeinfo/makeinfo.c:4082
+#, c-format
+msgid "`%.40s...' is too long for expansion; not expanded"
+msgstr "`%.40s...' jest zbyt d³ugie do rozwiniêcia; nie rozwiniêto"
+
+#: makeinfo/multi.c:116
+msgid "Missing } in @multitable template"
+msgstr "Brakuj±cy } we wzorcu @multitable"
+
+#: makeinfo/multi.c:254
+#, c-format
+msgid "ignoring stray text `%s' after @multitable"
+msgstr "zignorowano zab³±kany tekst `%s' po @multitable"
+
+#: makeinfo/multi.c:393
+#, c-format
+msgid "Too many columns in multitable item (max %d)"
+msgstr "Zbyt du¿o kolumn w elemencie multitable (maksymalnie %d)"
+
+#: makeinfo/multi.c:555
+#, c-format
+msgid "[unexpected] cannot select column #%d in multitable"
+msgstr "[nieoczekiwane] nie mo¿na wybraæ kolumny #%d w multitable"
+
+#: makeinfo/multi.c:584
+msgid "ignoring @tab outside of multitable"
+msgstr "zignorowano @tab poza multitable"
+
+#: makeinfo/multi.c:632
+#, c-format
+msgid "** Multicolumn output from last row:\n"
+msgstr "** Wielokolumnowe wyj¶cie z ostatniego wiersza:\n"
+
+#: makeinfo/multi.c:635
+#, c-format
+msgid "* column #%d: output = %s\n"
+msgstr "* kolumna #%d: wyj¶cie = %s\n"
+
+#: makeinfo/node.c:280
+#, c-format
+msgid "Node `%s' previously defined at line %d"
+msgstr "Wêze³ `%s' poprzednio zdefiniowany w linii %d"
+
+#: makeinfo/node.c:648
+#, c-format
+msgid "Formatting node %s...\n"
+msgstr "Formatowanie wêz³a %s...\n"
+
+#: makeinfo/node.c:716
+#, c-format
+msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
+msgstr "Wêze³ `%s' wymaga polecenia wybieraj±cego (np. %c%s)"
+
+#: makeinfo/node.c:879
+#, c-format
+msgid "No node name specified for `%c%s' command"
+msgstr "Nie podano nazwy wêz³a dla polecenia `%c%s'"
+
+#: makeinfo/node.c:920 makeinfo/node.c:1151
+#, c-format
+msgid "Anchor `%s' and node `%s' map to the same file name"
+msgstr "Znacznik `%s' i wêze³ `%s' odwzorowuj± siê na t± sam± nazwê pliku"
+
+#: makeinfo/node.c:923
+msgid "This @anchor command ignored; references to it will not work"
+msgstr "Zignorowano to polecenie @anchor; wskazania na nie nie bêd± dzia³a³y"
+
+#: makeinfo/node.c:925 makeinfo/node.c:1154
+msgid "Rename this anchor or use the `--no-split' option"
+msgstr "Nale¿y zmieniæ ten znacznik lub u¿yæ opcji `--no-split'"
+
+#: makeinfo/node.c:955
+#, c-format
+msgid "Unexpected string at end of split-HTML file `%s'"
+msgstr "Nieoczekiwany ³añcuch na koñcu pliku dzielonego HTML `%s'"
+
+#: makeinfo/node.c:991
+msgid "Next:"
+msgstr "Nastêpny:"
+
+#: makeinfo/node.c:1007
+msgid "Previous:"
+msgstr "Poprzedni:"
+
+#: makeinfo/node.c:1021
+msgid "Up:"
+msgstr "W górê:"
+
+#: makeinfo/node.c:1148
+#, c-format
+msgid "Anchors `%s' and `%s' map to the same file name"
+msgstr "Znaczniki `%s' i `%s' odwzorowuj± siê na t± sam± nazwê pliku"
+
+#: makeinfo/node.c:1153
+msgid "@anchor command ignored; references to it will not work"
+msgstr "zignorowano polecenie @anchor; wskazania na nie nie bêd± dzia³a³y"
+
+#: makeinfo/node.c:1347
+#, c-format
+msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
+msgstr ""
+"%s wskazuje na nieistniej±cy wêze³ `%s' (mo¿e b³êdny podzia³ na sekcje?)"
+
+#: makeinfo/node.c:1363
+msgid "Menu"
+msgstr "Menu"
+
+#: makeinfo/node.c:1365
+msgid "Cross"
+msgstr "Odsy³acz"
+
+#: makeinfo/node.c:1447
+#, c-format
+msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
+msgstr ""
+"Pole Nastêpny wêz³a `%s' nie wskazywane (mo¿e b³êdny podzia³ na sekcje?)"
+
+#: makeinfo/node.c:1450
+#, c-format
+msgid "This node (%s) has the bad Prev"
+msgstr "Ten wêze³ (%s) ma z³e pole Poprzedni"
+
+#: makeinfo/node.c:1462
+msgid "Prev"
+msgstr "Poprzedni"
+
+#: makeinfo/node.c:1505
+#, c-format
+msgid "Prev field of node `%s' not pointed to"
+msgstr "Pole Poprzedni wêz³a `%s' nie wskazywane"
+
+#: makeinfo/node.c:1509
+#, c-format
+msgid "This node (%s) has the bad Next"
+msgstr "Ten wêze³ (%s) ma z³e pole Nastêpny"
+
+#: makeinfo/node.c:1521
+#, c-format
+msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
+msgstr "`%s' nie ma pola W górê (mo¿e b³êdny podzia³ na sekcje?)"
+
+#: makeinfo/node.c:1524
+msgid "Up"
+msgstr "W górê"
+
+#: makeinfo/node.c:1590
+#, c-format
+msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
+msgstr ""
+"Wêze³ `%s' nie ma elementu menu dla `%s' pomimo bycia jego celem W górê"
+
+#: makeinfo/node.c:1619
+#, c-format
+msgid "node `%s' has been referenced %d times"
+msgstr "wêze³ `%s' by³ wskazywany %d razy"
+
+#: makeinfo/node.c:1633
+#, c-format
+msgid "unreferenced node `%s'"
+msgstr "nie wskazywany wêze³ `%s'"
+
+#: makeinfo/node.c:1723
+#, c-format
+msgid "Removing %s\n"
+msgstr "Usuwanie %s\n"
+
+#: makeinfo/node.c:1727
+#, c-format
+msgid "Can't remove file `%s': %s"
+msgstr "Nie mo¿na usun±æ pliku `%s': %s"
+
+#: makeinfo/sectioning.c:122
+#, c-format
+msgid "Appendix %c"
+msgstr "Za³±cznik %c"
+
+#: makeinfo/sectioning.c:467
+#, c-format
+msgid "Internal error (search_sectioning) `%s'!"
+msgstr "B³±d wewnêtrzny (search_sectioning) `%s'!"
+
+#: makeinfo/sectioning.c:562
+#, c-format
+msgid "Internal error (search_sectioning) \"%s\"!"
+msgstr "B³±d wewnêtrzny (search_sectioning) \"%s\"!"
+
+#: makeinfo/sectioning.c:623
+#, c-format
+msgid "%c%s is obsolete; use %c%s instead"
+msgstr "%c%s jest przestarza³e; nale¿y u¿yæ %c%s"
+
+#: makeinfo/sectioning.c:639
+#, c-format
+msgid "Node with %ctop as a section already exists"
+msgstr "Wêze³ z %ctop jako sekcj± ju¿ istnieje"
+
+#: makeinfo/sectioning.c:647
+#, c-format
+msgid "Here is the %ctop node"
+msgstr "Tutaj jest wêze³ %ctop"
+
+#: makeinfo/sectioning.c:663
+#, c-format
+msgid "%ctop used before %cnode, defaulting to %s"
+msgstr "%ctop u¿yty przed %cnode, u¿ycie domy¶lnego %s"
+
+#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
+msgid "Table of Contents"
+msgstr "Spis tre¶ci"
+
+#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
+msgid "Short Contents"
+msgstr "Skrót tre¶ci"
+
+#: makeinfo/xml.c:1605
+#, c-format
+msgid "@image file `%s' unreadable: %s"
+msgstr "Plik @image `%s' nieczytelny: %s"
+
+#: makeinfo/xml.c:2097
+msgid ""
+"@headitem as the last item of @multitable produces invalid Docbook documents"
+msgstr ""
+"@headitem jako ostatni element @multitable tworzy niepoprawne dokumenty "
+"Docbook"
+
+#: util/install-info.c:154
+#, c-format
+msgid "%s: warning: "
+msgstr "%s: uwaga: "
+
+#: util/install-info.c:203
+#, c-format
+msgid " for %s"
+msgstr " dla %s"
+
+#: util/install-info.c:426
+#, c-format
+msgid "\tTry `%s --help' for a complete list of options.\n"
+msgstr "\t`%s --help' poda pe³n± listê opcji.\n"
+
+#: util/install-info.c:434
+#, c-format
+msgid ""
+"Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+"\n"
+"Install or delete dir entries from INFO-FILE in the Info directory file\n"
+"DIR-FILE.\n"
+"\n"
+"Options:\n"
+" --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
+"                     don't insert any new entries.\n"
+" --dir-file=NAME   specify file name of Info directory file.\n"
+"                     This is equivalent to using the DIR-FILE argument.\n"
+" --entry=TEXT      insert TEXT as an Info directory entry.\n"
+"                     TEXT should have the form of an Info menu item line\n"
+"                     plus zero or more extra lines starting with "
+"whitespace.\n"
+"                     If you specify more than one entry, they are all "
+"added.\n"
+"                     If you don't specify any entries, they are determined\n"
+"                     from information in the Info file itself.\n"
+" --help            display this help and exit.\n"
+" --info-file=FILE  specify Info file to install in the directory.\n"
+"                     This is equivalent to using the INFO-FILE argument.\n"
+" --info-dir=DIR    same as --dir-file=DIR/dir.\n"
+" --item=TEXT       same as --entry TEXT.\n"
+"                     An Info directory entry is actually a menu item.\n"
+" --quiet           suppress warnings.\n"
+" --remove          same as --delete.\n"
+" --section=SEC     put this file's entries in section SEC of the directory.\n"
+"                     If you specify more than one section, all the entries\n"
+"                     are added in each of the sections.\n"
+"                     If you don't specify any sections, they are determined\n"
+"                     from information in the Info file itself.\n"
+" --version         display version information and exit.\n"
+msgstr ""
+"Sk³adnia: %s [OPCJA]... [PLIK-INFO [PLIK-KATALOGU]]\n"
+"\n"
+"Instalacja lub usuniêcie wpisów katalogu dla PLIKU-INFO w pliku katalogu\n"
+"Info PLIK-KATALOGU.\n"
+"\n"
+"Opcje:\n"
+" --delete          usuniêcie istniej±cych wpisów dla PLIKU-INFO\n"
+"                     z PLIKU-KATALOGU; nie wstawianie nowych wpisów.\n"
+" --dir-file=NAZWA  podanie nazwy pliku z katalogiem Info.\n"
+"                     Jest to odpowiednik u¿ycia argumentu PLIK-KATALOGU.\n"
+" --entry=TEKST     wstawienie TEKSTU jako wpisu katalogu Info.\n"
+"                     TEKST powinien mieæ formê linii elementu menu Info\n"
+"                     z zerem lub wiêcej linii zaczynaj±cymi siê od spacji.\n"
+"                     Je¶li podano wiêcej ni¿ jeden wpis, wszystkie s± "
+"dodawane.\n"
+"                     Je¶li nie podano ¿adnego wpisu, s± okre¶lane na "
+"podstawie\n"
+"                     informacji w samym pliku Info.\n"
+" --help            wy¶wietlenie tego opisu i zakoñczenie.\n"
+" --info-file=PLIK  podanie pliku Info do zainstalowania w katalogu.\n"
+"                     Jest to odpowiednik u¿ycia argumentu PLIK-INFO.\n"
+" --info-dir=KAT    to samo co --dir-file=KAT/dir.\n"
+" --item=TEKST      to samo co --entry TEKST.\n"
+"                     Wpis w katalogu Info jest elementem menu.\n"
+" --quiet           pominiêcie ostrze¿eñ.\n"
+" --remove          to samo co --delete.\n"
+" --section=SEKCJA  umieszczenie wpisów dla tego pliku w danej SEKCJI "
+"katalogu.\n"
+"                     Je¶li podano wiêcej ni¿ jedn± sekcjê, wszystkie wpisy "
+"s±\n"
+"                     dodawane do ka¿dej z sekcji.\n"
+"                     Je¶li nie podano ¿adnej sekcji, s± okre¶lane na "
+"podstawie\n"
+"                     informacji w samym pliku Info.\n"
+" --version         wy¶wietlenie informacji o wersji i zakoñczenie.\n"
+
+#: util/install-info.c:488
+#, c-format
+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"
+"%s\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"
+"  \"h\" gives a primer for first-timers,\n"
+"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+"\n"
+"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
+"  to select it.\n"
+"\n"
+"%s\n"
+msgstr ""
+"To jest plik .../info/dir, zawieraj±cy najwy¿szy\n"
+"wêze³ hierarchii Info, o nazwie (dir)Top.\n"
+"Przy pierwszym uruchomieniu Info zaczyna siê od tego wêz³a.\n"
+"\n"
+"%s\tOto wierzcho³ek drzewa INFO\n"
+"\n"
+"  To (wêze³ Katalog) zawiera menu dla g³ównych tematów.\n"
+"  Naci¶niêcie \"q\" koñczy przegl±danie, \"?\" wy¶wietla wszystkie "
+"polecenia\n"
+"  Info, \"d\" wraca tutaj, \"h\" pokazuje wprowadzenie dla nowicjuszy,\n"
+"  \"mEmacs<Return>\" odwiedza podrêcznik Emacsa itd.\n"
+"\n"
+"  W Emacsie mo¿na klikn±æ drugim przyciskiem myszy na elemencie menu lub\n"
+"  odsy³aczu, aby go wybraæ.\n"
+"\n"
+"%s\n"
+
+#: util/install-info.c:513
+#, c-format
+msgid "%s: could not read (%s) and could not create (%s)\n"
+msgstr "%s: nie mo¿na odczytaæ (%s) ani utworzyæ (%s)\n"
+
+#: util/install-info.c:600
+#, c-format
+msgid "%s: empty file"
+msgstr "%s: pusty plik"
+
+#: util/install-info.c:913 util/install-info.c:953
+msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
+msgstr "START-INFO-DIR-ENTRY bez odpowiadaj±cego END-INFO-DIR-ENTRY"
+
+#: util/install-info.c:948
+msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+msgstr "END-INFO-DIR-ENTRY bez odpowiadaj±cego START-INFO-DIR-ENTRY"
+
+#: util/install-info.c:1191 util/install-info.c:1201
+#, c-format
+msgid "%s: already have dir file: %s\n"
+msgstr "%s: plik katalogu ju¿ istnieje: %s\n"
+
+#: util/install-info.c:1236
+#, c-format
+msgid "%s: Specify the Info file only once.\n"
+msgstr "%s: Nale¿y podaæ plik Info tylko raz.\n"
+
+#: util/install-info.c:1284
+#, c-format
+msgid "excess command line argument `%s'"
+msgstr "nadmiarowy argument linii poleceñ `%s'"
+
+#: util/install-info.c:1288
+msgid "No input file specified; try --help for more information."
+msgstr "Nie podano pliku wej¶ciowego; --help mo¿e podaæ wiêcej informacji."
+
+#: util/install-info.c:1291
+msgid "No dir file specified; try --help for more information."
+msgstr "Nie podano pliku katalogu; --help mo¿e podaæ wiêcej informacji."
+
+#: util/install-info.c:1313
+#, c-format
+msgid "no info dir entry in `%s'"
+msgstr "brak wpisu do katalogu info w `%s'"
+
+#: util/install-info.c:1426
+#, c-format
+msgid "menu item `%s' already exists, for file `%s'"
+msgstr "element menu `%s' ju¿ istnieje, dla pliku `%s'"
+
+#: util/install-info.c:1449
+#, c-format
+msgid "no entries found for `%s'; nothing deleted"
+msgstr "nie znaleziono wpisów dla `%s'; nic nie usuniêto"
+
+#: util/texindex.c:252
+msgid "display this help and exit"
+msgstr "wy¶wietlenie tego opisu i zakoñczenie"
+
+#: util/texindex.c:254
+msgid "keep temporary files around after processing"
+msgstr "zachowanie plików tymczasowych po przetwarzaniu"
+
+#: util/texindex.c:256
+msgid "do not keep temporary files around after processing (default)"
+msgstr "nie zachowywanie plików tymczasowych po przetwarzaniu (domy¶lne)"
+
+#: util/texindex.c:258
+msgid "send output to FILE"
+msgstr "zapisanie wyj¶cia do PLIKU"
+
+#: util/texindex.c:260
+msgid "display version information and exit"
+msgstr "wy¶wietlenie informacji o wersji i zakoñczenie"
+
+#: util/texindex.c:270
+#, c-format
+msgid "Usage: %s [OPTION]... FILE...\n"
+msgstr "Sk³adnia: %s [OPCJA]... PLIK...\n"
+
+#: util/texindex.c:271
+#, c-format
+msgid "Generate a sorted index for each TeX output FILE.\n"
+msgstr ""
+"Generowanie posortowanego indeksu dla ka¿dego PLIKU wyj¶ciowego w TeXu.\n"
+
+#: util/texindex.c:274
+#, c-format
+msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
+msgstr ""
+"Zazwyczaj PLIK... podaje siê jako `foo.%c%c' dla dokumentu `foo.texi'.\n"
+
+#: util/texindex.c:276
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"Opcje:\n"
+
+#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
+#: util/texindex.c:1011
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: nie jest plikiem indeksu texinfo"
+
+#: util/texindex.c:968
+#, c-format
+msgid "failure reopening %s"
+msgstr "b³±d podczas ponownego otwierania %s"
+
+#: util/texindex.c:1218
+#, c-format
+msgid "No page number in %s"
+msgstr "Brak numeru strony w %s"
+
+#: util/texindex.c:1291
+#, c-format
+msgid "entry %s follows an entry with a secondary name"
+msgstr "wpis %s wyst±pi³ po wpisie z dodatkow± nazw±"
diff --git a/gnu/usr.bin/texinfo/po/ro.gmo b/gnu/usr.bin/texinfo/po/ro.gmo
new file mode 100644
index 00000000000..3a4129a8a99
--- /dev/null
+++ b/gnu/usr.bin/texinfo/po/ro.gmo
diff --git a/gnu/usr.bin/texinfo/po/ro.po b/gnu/usr.bin/texinfo/po/ro.po
new file mode 100644
index 00000000000..7979e8f3ff2
--- /dev/null
+++ b/gnu/usr.bin/texinfo/po/ro.po
@@ -0,0 +1,3125 @@
+# Mesajele în limba românã pentru texinfo.
+# Copyright (C) 2003 Free Software Foundation, Inc.
+# Acest fiºier este distribuit sub aceeaºi licenþã ca ºi pachetul texinfo.
+# Laurentiu Buzdugan <lbuz@rolix.org>, 2003, 2004.
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: texinfo 4.7.90\n"
+"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
+"POT-Creation-Date: 2004-12-21 16:20-0800\n"
+"PO-Revision-Date: 2004-12-04 12:00+05\n"
+"Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
+"Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: info/echo-area.c:284 info/session.c:689
+msgid "Move forward a character"
+msgstr "Mergi înainte un caracter"
+
+#: info/echo-area.c:296 info/session.c:705
+msgid "Move backward a character"
+msgstr "Mergi înapoi un caracter"
+
+#: info/echo-area.c:308
+msgid "Move to the start of this line"
+msgstr "Mergi la începutul acestei linii"
+
+#: info/echo-area.c:313
+msgid "Move to the end of this line"
+msgstr "Mergi la sfârºitul acestei linii"
+
+#: info/echo-area.c:321 info/session.c:723
+msgid "Move forward a word"
+msgstr "Mergi înainte un cuvânt"
+
+#: info/echo-area.c:361 info/session.c:772
+msgid "Move backward a word"
+msgstr "Mergi înapoi un cuvânt"
+
+#: info/echo-area.c:401
+msgid "Delete the character under the cursor"
+msgstr "ªterge caracterul de sub cursor"
+
+#: info/echo-area.c:431
+msgid "Delete the character behind the cursor"
+msgstr "ªterge caracterul din stânga cursorului"
+
+#: info/echo-area.c:452
+msgid "Cancel or quit operation"
+msgstr "Renunþã sau terminã operaþiunea"
+
+#: info/echo-area.c:467
+msgid "Accept (or force completion of) this line"
+msgstr "Acceptã (sau forþeazã completarea) acestei linii"
+
+#: info/echo-area.c:472
+msgid "Insert next character verbatim"
+msgstr "Insereazã urmãtorul caracter identic (verbatim)"
+
+#: info/echo-area.c:480
+msgid "Insert this character"
+msgstr "Insereazã acest caracter"
+
+#: info/echo-area.c:498
+msgid "Insert a TAB character"
+msgstr "Insereazã un caracter TAB"
+
+#: info/echo-area.c:505
+msgid "Transpose characters at point"
+msgstr "Transpune caracterele la acest punct"
+
+#: info/echo-area.c:556
+msgid "Yank back the contents of the last kill"
+msgstr "Extrage înapoi conþinutul ultimei ºtergeri (kill)"
+
+#: info/echo-area.c:563
+msgid "Kill ring is empty"
+msgstr "Inelul de ºtergeri (kill) e gol"
+
+#: info/echo-area.c:576
+msgid "Yank back a previous kill"
+msgstr "Extrage înapoi o ºtergere (kill) anterioarã"
+
+#: info/echo-area.c:609
+msgid "Kill to the end of the line"
+msgstr "ªterge (kill) pânã la sfârºitul liniei"
+
+#: info/echo-area.c:622
+msgid "Kill to the beginning of the line"
+msgstr "ªterge (kill) pânã la începutul liniei"
+
+#: info/echo-area.c:634
+msgid "Kill the word following the cursor"
+msgstr "ªterge (kill) cuvântul din dreapta cursorului"
+
+#: info/echo-area.c:653
+msgid "Kill the word preceding the cursor"
+msgstr "ªterge (kill) cuvãntul din stânga cursorului"
+
+#: info/echo-area.c:868 info/echo-area.c:924
+msgid "No completions"
+msgstr "Nici o completare"
+
+#: info/echo-area.c:870
+msgid "Not complete"
+msgstr "Nu e completat"
+
+#: info/echo-area.c:911
+msgid "List possible completions"
+msgstr "Enumerã completãrile posibile"
+
+#: info/echo-area.c:928
+msgid "Sole completion"
+msgstr "O singurã completare"
+
+#: info/echo-area.c:937
+msgid "One completion:\n"
+msgstr "O completare:\n"
+
+#: info/echo-area.c:938
+#, c-format
+msgid "%d completions:\n"
+msgstr "%d completãri:\n"
+
+#: info/echo-area.c:1085
+msgid "Insert completion"
+msgstr "Insereazã completarea"
+
+#: info/echo-area.c:1220
+msgid "Building completions..."
+msgstr "Construim completãrile..."
+
+#: info/echo-area.c:1340
+msgid "Scroll the completions window"
+msgstr "Scroll fereastra de completãri"
+
+#: info/footnotes.c:213
+msgid "Footnotes could not be displayed"
+msgstr "Notele de subsol nu pot fi afiºate"
+
+#: info/footnotes.c:239
+msgid "Show the footnotes associated with this node in another window"
+msgstr "Aratã notele de subsol asociate cu acest nod în aceastã fereastrã"
+
+#: info/footnotes.h:26
+msgid "---------- Footnotes ----------"
+msgstr "------- Note de subsol  -------"
+
+#: info/indices.c:172
+msgid "Look up a string in the index for this file"
+msgstr "Cautã un ºir în indexul acestui fiºier"
+
+#: info/indices.c:199
+msgid "Finding index entries..."
+msgstr "Cãutãm intrãri în index..."
+
+#: info/indices.c:207
+msgid "No indices found."
+msgstr "Nici am gãsit nici un index."
+
+#: info/indices.c:217
+msgid "Index entry: "
+msgstr "Intrare în index: "
+
+#: info/indices.c:325
+msgid ""
+"Go to the next matching index item from the last `\\[index-search]' command"
+msgstr ""
+"Mergi la urmãtorul articol de index ce se potriveºte ultimei comenzi `"
+"\\[index-search]'"
+
+#: info/indices.c:335
+msgid "No previous index search string."
+msgstr "Nu existã nici un ºir cãutat anterior."
+
+#: info/indices.c:342
+msgid "No index entries."
+msgstr "Nici o intrare în index."
+
+#: info/indices.c:375
+#, c-format
+msgid "No %sindex entries containing `%s'."
+msgstr "Nici o intrare în %sindex conþinând `%s'."
+
+#: info/indices.c:376
+msgid "more "
+msgstr "mai mult"
+
+#: info/indices.c:386
+msgid "CAN'T SEE THIS"
+msgstr "NU POT VEDEA ACEASTA"
+
+#: info/indices.c:422
+#, c-format
+msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
+msgstr ""
+"Am gãsit `%s' în %s. (`\\[next-index-match]' încearcã sã gãseascã urmãtorul.)"
+
+#: info/indices.c:541
+#, c-format
+msgid "Scanning indices of `%s'..."
+msgstr "Scanãm indexurile pentru `%s'..."
+
+#: info/indices.c:596
+#, c-format
+msgid "No available info files have `%s' in their indices."
+msgstr "Nici un fiºier info nu are `%s' în indexurile lor."
+
+#: info/indices.c:622
+msgid "Grovel all known info file's indices for a string and build a menu"
+msgstr ""
+"Cautã în toþi indexurile fiºierului pentru un ºir ºi contruieºte un meniu"
+
+#: info/indices.c:626
+msgid "Index apropos: "
+msgstr "Index apropos: "
+
+#: info/indices.c:654
+#, c-format
+msgid ""
+"\n"
+"* Menu: Nodes whose indices contain `%s':\n"
+msgstr ""
+"\n"
+"* Meniu: Noduri a cãror indexurile conþin `%s':\n"
+
+#: info/info.c:275 info/infokey.c:899
+#, c-format
+msgid "Try --help for more information.\n"
+msgstr "Încercaþi --help pentru informaþii suplimentare.\n"
+
+#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
+#: util/texindex.c:343
+#, c-format
+msgid ""
+"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 ""
+"Nu existã NICI o garanþie.  Puteþi redistribui acest software conform\n"
+"termenilor Licenþei Publice Generale GNU (GNU GPL). Pentru informaþii\n"
+"suplimentare despre aceste chestiuni, vedeþi fiºierul numit COPYING.\n"
+
+#: info/info.c:498
+#, c-format
+msgid "no index entries found for `%s'\n"
+msgstr "nici o intrare de index a fost gãsitã pentru `%s'\n"
+
+#: info/info.c:590
+msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
+msgstr ""
+"  -b, --speech-friendly        fii prietenos cu sintetizatoarele de "
+"vorbire.\n"
+
+#: info/info.c:597
+#, c-format
+msgid ""
+"Usage: %s [OPTION]... [MENU-ITEM...]\n"
+"\n"
+"Read documentation in Info format.\n"
+"\n"
+"Options:\n"
+"      --apropos=STRING         look up STRING in all indices of all "
+"manuals.\n"
+"  -d, --directory=DIR          add DIR to INFOPATH.\n"
+"      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
+"  -f, --file=FILENAME          specify Info file to visit.\n"
+"  -h, --help                   display this help and exit.\n"
+"      --index-search=STRING    go to node pointed by index entry STRING.\n"
+"  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
+"  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+"  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+"      --no-raw-escapes         output escapes as literal text.\n"
+"      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
+"  -O, --show-options, --usage  go to command-line options node.\n"
+"%s      --subnodes               recursively output menu items.\n"
+"  -w, --where, --location      print physical location of Info file.\n"
+"      --vi-keys                use vi-like and less-like key bindings.\n"
+"      --version                display version information and exit.\n"
+"\n"
+"The first non-option argument, if present, is the menu entry to start from;\n"
+"it is searched for in all `dir' files along INFOPATH.\n"
+"If it is not present, info merges all `dir' files and shows the result.\n"
+"Any remaining arguments are treated as the names of menu\n"
+"items relative to the initial node visited.\n"
+"\n"
+"Examples:\n"
+"  info                       show top-level dir menu\n"
+"  info emacs                 start at emacs node from top-level dir\n"
+"  info emacs buffers         start at buffers node within emacs manual\n"
+"  info --show-options emacs  start at node with emacs' command line options\n"
+"  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+msgstr ""
+"Folosire: %s [OPÞIUNE]... [ARTICOL-MENIU...]\n"
+"\n"
+"Citeºte documentaþie în formatul Info.\n"
+"\n"
+"Opþiuni:\n"
+"      --apropos=ªIR            cautã ªIR în toþi indexurile tuturor "
+"manualelor.\n"
+"  -d, --directory=DIR          adaugã DIR la INFOPATH.\n"
+"      --dribble=NUMEFIªIER     aminteºte ce tasteazã utilizatorul în "
+"NUMEFIªIER.\n"
+"  -f, --file=NUMEFIªIER        specificã fiºierul Info de vizitat.\n"
+"  -h, --help                   afiºeazã acest mesaj ºi terminã.\n"
+"      --index-search=STRING    mergi la nodul referit de intrarea indexului "
+"ªIR.\n"
+"  -n, --node=NUMENOD           specificã nodurile în primul fiºier Info "
+"vizitat.\n"
+"  -o, --output=NUMEFIªIER      scrie nodurile selectate în NUMEFIªIER.\n"
+"  -R, --raw-escapes            scrie \"raw\" escape-uri ANSI (implicit).\n"
+"      --no-raw-escapes         scrie escape-urile ca text normal.\n"
+"      --restore=NUMEFIªIER     citeºte apãsãrile de teste iniþiale din "
+"NUMEFIªIER.\n"
+"  -O, --show-options, --usage  mergi la nodul cu opþiunile liniei de "
+"comandã.\n"
+"%s      --subnodes             afiºeazã recursiv articolele de meniu.\n"
+"  -w, --where, --location      afiºeazã locaþia fizicã a fiºierului Info.\n"
+"      --vi-keys                foloseºte key bindings similare cu cele din "
+"vi ºi less.\n"
+"      --version                afiºeazã informaþii versiune ºi terminã.\n"
+"\n"
+"Primul argument ce nu e o opþiune, dacã e prezent, este articolul de meniu\n"
+"de la care se începe; acesta este cãutat în toate fiºierele `dir' din\n"
+"INFOPATH. Dacã acesta nu este prezent, info combinã toate fiºierele `dir'\n"
+"ºi aratã rezultatul. Restul argumentelor sunt tratate ca nume de articole\n"
+"de meniu relative la nodul vizitat iniþial.\n"
+"\n"
+"Exemple:\n"
+"  info                      aratã conþinutul dir-ectorului din meniul\n"
+"                              nivelului de vârf\n"
+"  info emacs                începe la nodul emacs din dir-ectorul nivelului\n"
+"                              de vârf\n"
+"  info emacs buffers        începe la nodul buffere din manualul emacs\n"
+"  info --show-options emacs începe la nodul cu opþiunile liniei de\n"
+"                               comandã pentru emacs\n"
+"  info -f ./foo.info        aratã fiºierul ./foo.info, nu cãuta dir\n"
+
+#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
+#: util/install-info.c:466 util/texindex.c:292
+msgid ""
+"\n"
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr ""
+"\n"
+"Trimiteþi emailuri raportând bug-uri la bug-texinfo@gnu.org,\n"
+"întrebãri generale ºi discuþii la help-texinfo@gnu.org.\n"
+"Texinfo homepage: http://www.gnu.org/software/texinfo/"
+
+#: info/info.c:669
+#, c-format
+msgid "Cannot find node `%s'."
+msgstr "Nu pot gãsi nodul `%s'."
+
+#: info/info.c:670
+#, c-format
+msgid "Cannot find node `(%s)%s'."
+msgstr "Nu pot gãsi nodul `(%s)%s'."
+
+#: info/info.c:671
+msgid "Cannot find a window!"
+msgstr "Nu pot gãsi o fereastrã!"
+
+#: info/info.c:672
+msgid "Point doesn't appear within this window's node!"
+msgstr "Punctul nu apare în interiorul nodului acestei ferestre!"
+
+#: info/info.c:673
+msgid "Cannot delete the last window."
+msgstr "Nu pot ºterge ultima fereastrã."
+
+#: info/info.c:674
+msgid "No menu in this node."
+msgstr "Nici un meniu în acest nod"
+
+#: info/info.c:675
+msgid "No footnotes in this node."
+msgstr "Nici o notã de subsol în acest nod."
+
+#: info/info.c:676
+msgid "No cross references in this node."
+msgstr "Nici o referinþã la acelaºi pasaj în acest nod."
+
+#: info/info.c:677
+#, c-format
+msgid "No `%s' pointer for this node."
+msgstr "Nici un pointer `%s' pentru acest nod."
+
+#: info/info.c:678
+#, c-format
+msgid "Unknown Info command `%c'; try `?' for help."
+msgstr "Comandã Info necunoscutã `%c';încercaþi `?' pentru ajutor."
+
+#: info/info.c:679
+#, c-format
+msgid "Terminal type `%s' is not smart enough to run Info."
+msgstr "Terminalul de tip `%s' nu e destul de deºtept sã ruleze Info."
+
+#: info/info.c:680
+msgid "You are already at the last page of this node."
+msgstr "Sunteþi deja la ultima paginã a acestui nod."
+
+#: info/info.c:681
+msgid "You are already at the first page of this node."
+msgstr "Sunteþi deja la prima paginã a acestui nod."
+
+#: info/info.c:682
+msgid "Only one window."
+msgstr "O singurã fereastrã."
+
+#: info/info.c:683
+msgid "Resulting window would be too small."
+msgstr "Fereastra rezultantã ar fi prea micã."
+
+#: info/info.c:684
+msgid "Not enough room for a help window, please delete a window."
+msgstr "Nu e destul spaþiu pentru o fereastrã de ajutor, ºtergeþi o fereastrã."
+
+#: info/infodoc.c:46 info/infodoc.c:95
+msgid ""
+"Basic Commands in Info Windows\n"
+"******************************\n"
+msgstr ""
+"Comenzi de bazã în Fereastra Info\n"
+"*********************************\n"
+
+#: info/infodoc.c:49
+msgid "\\%-10[quit-help]  Quit this help.\n"
+msgstr "\\%-10[quit-help]  Terminã acest ajutor.\n"
+
+#: info/infodoc.c:50
+msgid "\\%-10[quit]  Quit Info altogether.\n"
+msgstr "\\%-10[quit]  Terminã Info complet.\n"
+
+#: info/infodoc.c:51
+msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
+msgstr "\\%-10[get-info-help-node]  Invocaþi tutorialul Info.\n"
+
+#: info/infodoc.c:53 info/infodoc.c:102
+msgid ""
+"Selecting other nodes:\n"
+"----------------------\n"
+msgstr ""
+"Selectaþi alte noduri:\n"
+"----------------------\n"
+
+#: info/infodoc.c:55
+msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
+msgstr "\\%-10[next-node]  Mergi la \"urmãtorul\" nod al acestui nod.\n"
+
+#: info/infodoc.c:56
+msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
+msgstr "\\%-10[prev-node]  Mergi la nodul \"precedent\" al acestui nod.\n"
+
+#: info/infodoc.c:57
+msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
+msgstr "\\%-10[up-node]  Mergi în \"sus\" de la acest nod.\n"
+
+#: info/infodoc.c:58
+msgid ""
+"\\%-10[menu-item]  Pick menu item specified by name.\n"
+"              Picking a menu item causes another node to be selected.\n"
+msgstr ""
+"\\%-10[menu-item]  Alege articol meniu specificat prin nume.\n"
+"              Alegând un articol de meniu face ca alt nod sã fie selectat.\n"
+
+#: info/infodoc.c:60
+msgid ""
+"\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
+msgstr ""
+"\\%-10[xref-item]  Urmeazã o referinþã încruciºatã. Citeºte numele "
+"referinþei.\n"
+
+#: info/infodoc.c:61
+msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
+msgstr ""
+"\\%-10[history-node]  Mergi la ultimul nod vãzut în aceastã fereastrã.\n"
+
+#: info/infodoc.c:62
+msgid ""
+"\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
+msgstr ""
+"\\%-10[move-to-next-xref]  Sãri la urmãtoarea legãturã hypertext din acest "
+"nod.\n"
+
+#: info/infodoc.c:63
+msgid ""
+"\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
+"node.\n"
+msgstr ""
+"\\%-10[move-to-prev-xref]  Sãri la legãtura hypertext precedentã din acest "
+"nod.\n"
+
+#: info/infodoc.c:64
+msgid ""
+"\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
+msgstr ""
+"\\%-10[select-reference-this-line]  Urmeazã legãtura hypertext de sub "
+"cursor.\n"
+
+#: info/infodoc.c:65
+msgid ""
+"\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
+"node] (DIR)'.\n"
+msgstr ""
+"\\%-10[dir-node]  Mergi la nodul `director'.  Echivalent cu `\\[goto-node] "
+"(DIR)'.\n"
+
+#: info/infodoc.c:66
+msgid ""
+"\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
+msgstr ""
+"\\%-10[top-node]  Mergi la nodul Vârf.  Echivalent cu `\\[goto-node] Top'.\n"
+
+#: info/infodoc.c:68 info/infodoc.c:116
+msgid ""
+"Moving within a node:\n"
+"---------------------\n"
+msgstr ""
+"Mergi în interiorul nodului:\n"
+"----------------------------\n"
+
+#: info/infodoc.c:70
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "\\%-10[beginning-of-node]  Mergi la începutul acestui nod.\n"
+
+#: info/infodoc.c:71
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgstr "\\%-10[end-of-node]  Mergi la sfârºitul acestui nod.\n"
+
+#: info/infodoc.c:72
+msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
+msgstr "\\%-10[next-line]  Scroll înainte 1 linie.\n"
+
+#: info/infodoc.c:73
+msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
+msgstr "\\%-10[prev-line]  Scroll înapoi 1 linie.\n"
+
+#: info/infodoc.c:74
+msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
+msgstr "\\%-10[scroll-forward]  Scroll înainte o paginã.\n"
+
+#: info/infodoc.c:75
+msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
+msgstr "\\%-10[scroll-backward]  Scroll înapoi o paginã.\n"
+
+#: info/infodoc.c:77 info/infodoc.c:125
+msgid ""
+"Other commands:\n"
+"---------------\n"
+msgstr ""
+"Alte comenzi:\n"
+"-------------\n"
+
+#: info/infodoc.c:79
+msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
+msgstr ""
+"\\%-10[menu-digit]  Alege primul ... al nouãlea articol în meniul nodului.\n"
+
+#: info/infodoc.c:80
+msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
+msgstr "\\%-10[last-menu-item]  Alege ultimul articol în meniul nodului.\n"
+
+#: info/infodoc.c:81
+msgid ""
+"\\%-10[index-search]  Search for a specified string in the index entries of "
+"this Info\n"
+"              file, and select the node referenced by the first entry "
+"found.\n"
+msgstr ""
+"\\%-10[index-search]  Cautã ºirul specificat în intrãrile indexului acestui\n"
+"            fiºier Info ºi selecteazã nodul referit de prima intrare "
+"gãsitã.\n"
+
+#: info/infodoc.c:83
+msgid ""
+"\\%-10[goto-node]  Move to node specified by name.\n"
+"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
+msgstr ""
+"\\%-10[goto-node]  Mergi la nodul specificat prin nume.\n"
+"             Puteþi include ºi un nume de fiºier, ca în (NUMEFIªIER)"
+"NUMENOD.\n"
+
+#: info/infodoc.c:85
+msgid ""
+"\\%-10[search]  Search forward for a specified string\n"
+"              and select the node in which the next occurrence is found.\n"
+msgstr ""
+"\\%-10[search]  Cautã înainte un ºir specificat\n"
+"              ºi selecteazã nodul în care acesta este gãsit.\n"
+
+#: info/infodoc.c:87
+msgid ""
+"\\%-10[search-backward]  Search backward for a specified string\n"
+"              and select the node in which the previous occurrence is "
+"found.\n"
+msgstr ""
+"\\%-10[search-backward]  Cautã înapoi un ºir specificat\n"
+"              ºi selecteazã nodul în care acesta este gãsit.\n"
+
+#: info/infodoc.c:98
+#, c-format
+msgid "  %-10s  Quit this help.\n"
+msgstr "  %-10s  Terminã acest ajutor.\n"
+
+#: info/infodoc.c:99
+#, c-format
+msgid "  %-10s  Quit Info altogether.\n"
+msgstr "  %-10s  Terminã Info complet.\n"
+
+#: info/infodoc.c:100
+#, c-format
+msgid "  %-10s  Invoke the Info tutorial.\n"
+msgstr "  %-10s  Invocã tuturialul Info.\n"
+
+#: info/infodoc.c:104
+#, c-format
+msgid "  %-10s  Move to the `next' node of this node.\n"
+msgstr "  %-10s  Mergi la nodul `urmãtor' acestui nod.\n"
+
+#: info/infodoc.c:105
+#, c-format
+msgid "  %-10s  Move to the `previous' node of this node.\n"
+msgstr "  %-10s  Mergi la nodul `precedent' acestui nod.\n"
+
+#: info/infodoc.c:106
+#, c-format
+msgid "  %-10s  Move `up' from this node.\n"
+msgstr "  %-10s  Mergi în `sus' de la acest nod.\n"
+
+#: info/infodoc.c:107
+#, c-format
+msgid "  %-10s  Pick menu item specified by name.\n"
+msgstr "  %-10s  Alege articolul de meniu specificat prin nume.\n"
+
+#: info/infodoc.c:108
+msgid "              Picking a menu item causes another node to be selected.\n"
+msgstr ""
+"              Alegând un articol de meniu face ca alt nod sã fie selectat.\n"
+
+#: info/infodoc.c:109
+#, c-format
+msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
+msgstr ""
+"  %-10s  Urmeazã referinþã la acelaºi pasaj. Citeºte numele referinþei.\n"
+
+#: info/infodoc.c:110
+#, c-format
+msgid "  %-10s  Move to the last node seen in this window.\n"
+msgstr "  %-10s  Mergi la ultimul nod vãzut în aceastã fereastrã.\n"
+
+#: info/infodoc.c:111
+#, c-format
+msgid "  %-10s  Skip to next hypertext link within this node.\n"
+msgstr "  %-10s  Sãri la urmãtoarea legãturã hypertext din acest nod.\n"
+
+#: info/infodoc.c:112
+#, c-format
+msgid "  %-10s  Follow the hypertext link under cursor.\n"
+msgstr "  %-10s  Sãri la legãtura hypertext de sub cursor.\n"
+
+#: info/infodoc.c:113
+#, c-format
+msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
+msgstr "  %-10s  Mergi la nodul `director'.  Echivalent cu `g (DIR)'.\n"
+
+#: info/infodoc.c:114
+#, c-format
+msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
+msgstr "  %-10s  Mergi la nodul Vârf.  Echivalent cu `g Top'.\n"
+
+#: info/infodoc.c:118
+#, c-format
+msgid "  %-10s  Scroll forward a page.\n"
+msgstr "  %-10s  Scroll înainte o paginã.\n"
+
+#: info/infodoc.c:119
+#, c-format
+msgid "  %-10s  Scroll backward a page.\n"
+msgstr "  %-10s  Scroll înapoi o paginã.\n"
+
+#: info/infodoc.c:120
+#, c-format
+msgid "  %-10s  Go to the beginning of this node.\n"
+msgstr "  %-10s  Mergi la începutul acestui nod.\n"
+
+#: info/infodoc.c:121
+#, c-format
+msgid "  %-10s  Go to the end of this node.\n"
+msgstr "  %-10s  Mergi la sfârºitul acestui nod.\n"
+
+#: info/infodoc.c:122
+#, c-format
+msgid "  %-10s  Scroll forward 1 line.\n"
+msgstr "  %-10s  Scroll înainte 1 linie.\n"
+
+#: info/infodoc.c:123
+#, c-format
+msgid "  %-10s  Scroll backward 1 line.\n"
+msgstr "  %-10s  Scroll înapoi 1 linie.\n"
+
+#: info/infodoc.c:127
+#, c-format
+msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
+msgstr "  %-10s  Alege primul ... al nouãlea articol în meniul nodului.\n"
+
+#: info/infodoc.c:128
+#, c-format
+msgid "  %-10s  Pick last item in node's menu.\n"
+msgstr "  %-10s  Alege ultimul articol în meniul nodului.\n"
+
+#: info/infodoc.c:129
+#, c-format
+msgid ""
+"  %-10s  Search for a specified string in the index entries of this Info\n"
+msgstr ""
+"  %-10s  Cautã ºirul specificat în intrãrile indexului acestui fiºier Info\n"
+
+#: info/infodoc.c:130
+msgid ""
+"              file, and select the node referenced by the first entry "
+"found.\n"
+msgstr "              ºi selecteazã nodul referit de prima intrare gãsitã.\n"
+
+#: info/infodoc.c:131
+#, c-format
+msgid "  %-10s  Move to node specified by name.\n"
+msgstr "  %-10s  Mergi la nodul specificat prin nume.\n"
+
+#: info/infodoc.c:132
+msgid ""
+"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
+msgstr ""
+"              Puteþi include ºi un nume de fiºier, ca în (NUMEFIªIER)"
+"NUMENOD.\n"
+
+#: info/infodoc.c:133
+#, c-format
+msgid "  %-10s  Search forward for a specified string,\n"
+msgstr "  %-10s  Cautã înainte un ºir specificat,\n"
+
+#: info/infodoc.c:134 info/infodoc.c:136
+msgid ""
+"              and select the node in which the next occurrence is found.\n"
+msgstr "              ºi selecteazã nodul în care acesta este gãsit.\n"
+
+#: info/infodoc.c:135
+#, c-format
+msgid "  %-10s  Search backward for a specified string\n"
+msgstr "  %-10s  Cautã înapoi un ºir specificat\n"
+
+#: info/infodoc.c:316
+msgid "The current search path is:\n"
+msgstr "Calea curentã de cãutare este:\n"
+
+#: info/infodoc.c:320
+msgid ""
+"Commands available in Info windows:\n"
+"\n"
+msgstr ""
+"Comenzile disponibile în fereastra Info:\n"
+"\n"
+
+#: info/infodoc.c:324
+msgid ""
+"Commands available in the echo area:\n"
+"\n"
+msgstr ""
+"Comenzile disponibile în zona de ecou:\n"
+"\n"
+
+#: info/infodoc.c:347
+#, c-format
+msgid ""
+"The following commands can only be invoked via %s:\n"
+"\n"
+msgstr ""
+"Urmãtoarele comenzi pot fi invocate via %s\n"
+"\n"
+
+#: info/infodoc.c:351
+msgid ""
+"The following commands cannot be invoked at all:\n"
+"\n"
+msgstr ""
+"Urmãtoarele comenzi nu pot fi deloc invocate:\n"
+"\n"
+
+#: info/infodoc.c:375
+msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
+msgstr ""
+"--- Folosiþi `\\[history-node]' sau `\\[kill-node]' pentru a termina ---\n"
+
+#: info/infodoc.c:485
+msgid "Display help message"
+msgstr "Afiºeazã mesaj de ajutor"
+
+#: info/infodoc.c:503
+msgid "Visit Info node `(info)Help'"
+msgstr "Viziteazã nodul Info `(info)Ajutor'"
+
+#: info/infodoc.c:641
+msgid "Print documentation for KEY"
+msgstr "Tipãreºte documentaþie pentru tastã (KEY)"
+
+#: info/infodoc.c:653
+#, c-format
+msgid "Describe key: %s"
+msgstr "Descrie tastã (key): %s"
+
+#: info/infodoc.c:664
+#, c-format
+msgid "ESC %s is undefined."
+msgstr "ESC %s nu este definit(ã)."
+
+#: info/infodoc.c:680 info/infodoc.c:709
+#, c-format
+msgid "%s is undefined."
+msgstr "%s nu este definit(ã)."
+
+#: info/infodoc.c:730
+#, c-format
+msgid "%s is defined to %s."
+msgstr "%s este definit(ã) ca %s."
+
+#: info/infodoc.c:1153
+msgid "Show what to type to execute a given command"
+msgstr "Aratã ce trebuie tasta pentru a executa o anumitã comandã"
+
+#: info/infodoc.c:1157
+msgid "Where is command: "
+msgstr "Unde este comanda: "
+
+#: info/infodoc.c:1179
+#, c-format
+msgid "`%s' is not on any keys"
+msgstr "`%s' nu este pe nici o tastã"
+
+#: info/infodoc.c:1186
+#, c-format
+msgid "%s can only be invoked via %s."
+msgstr "%s poate fi invocat doar via %s."
+
+#: info/infodoc.c:1190
+#, c-format
+msgid "%s can be invoked via %s."
+msgstr "%s poate fi invocat via %s."
+
+#: info/infodoc.c:1195
+#, c-format
+msgid "There is no function named `%s'"
+msgstr "Nu existã nii o funcþie numitã `%s'"
+
+#: info/infokey.c:145
+#, 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 (C) %s Free Software Foundation, Inc.\n"
+"Nu existã NICI o garanþie.  Puteþi redistribui acest software conform\n"
+"termenilor Licenþei Publice Generale GNU (GNU GPL). Pentru informaþii\n"
+"suplimentare despre aceste chestiuni, vedeþi fiºierul numit COPYING.\n"
+
+#: info/infokey.c:170
+msgid "incorrect number of arguments"
+msgstr "numãr incorect de argumente"
+
+#: info/infokey.c:201
+#, c-format
+msgid "cannot open input file `%s'"
+msgstr "nu pot deschide fiºierul de intrare `%s'"
+
+#: info/infokey.c:215
+#, c-format
+msgid "cannot create output file `%s'"
+msgstr "nu pot crea fiºierul de ieºire `%s'"
+
+#: info/infokey.c:226
+#, c-format
+msgid "error writing to `%s'"
+msgstr "eroare la scrierea în `%s'"
+
+#: info/infokey.c:232
+#, c-format
+msgid "error closing output file `%s'"
+msgstr "eroare la închiderea fiºierului de ieºire `%s'"
+
+#: info/infokey.c:450
+msgid "key sequence too long"
+msgstr "secvenþã de taste prea lungã"
+
+#: info/infokey.c:529
+msgid "missing key sequence"
+msgstr "secvenþã de taste inexistentã"
+
+#: info/infokey.c:610
+msgid "NUL character (\\000) not permitted"
+msgstr "caracterul NUL (\\000) nu este permis"
+
+#: info/infokey.c:641
+#, c-format
+msgid "NUL character (^%c) not permitted"
+msgstr "caracterul NUL (^%c) nu este permis"
+
+#: info/infokey.c:665
+msgid "missing action name"
+msgstr "nume de acþiune inexistent"
+
+#: info/infokey.c:681 info/infokey.c:756
+msgid "section too long"
+msgstr "secþiune prea lungã"
+
+#: info/infokey.c:688
+#, c-format
+msgid "unknown action `%s'"
+msgstr "acþiune necunoscutã `%s'"
+
+#: info/infokey.c:698
+msgid "action name too long"
+msgstr "nume de acþiune prea lung"
+
+#: info/infokey.c:712
+#, c-format
+msgid "extra characters following action `%s'"
+msgstr "extra caractere dupã acþiunea `%s'"
+
+#: info/infokey.c:723
+msgid "missing variable name"
+msgstr "nume de variabilã inexistent"
+
+#: info/infokey.c:733
+msgid "missing `=' immediately after variable name"
+msgstr "caracterul `=' lipseºte imediat dupã numele de variabilã"
+
+#: info/infokey.c:741
+msgid "variable name too long"
+msgstr "nume de variabilã prea lung"
+
+#: info/infokey.c:765
+msgid "value too long"
+msgstr "valoare prea lungã"
+
+#: info/infokey.c:890
+#, c-format
+msgid "\"%s\", line %u: "
+msgstr "\"%s\", linia %u: "
+
+#: info/infokey.c:906
+#, c-format
+msgid ""
+"Usage: %s [OPTION]... [INPUT-FILE]\n"
+"\n"
+"Compile infokey source file to infokey file.  Reads INPUT-FILE (default\n"
+"$HOME/.infokey) and writes compiled key file to (by default) $HOME/.info.\n"
+"\n"
+"Options:\n"
+"  --output FILE        output to FILE instead of $HOME/.info\n"
+"  --help               display this help and exit.\n"
+"  --version            display version information and exit.\n"
+msgstr ""
+"Folosire: %s [OPÞIUNE]... [FIªIER-INTRAre]\n"
+"\n"
+"Compileazã fiºierul sursã infokey în fiºier infokey. Citeºte FIªIER-INTRARE\n"
+"(implicit $HOME/.infokey) ºi scrie fiºierul cod compilat în (implicit)\n"
+"$HOME/.info.\n"
+"\n"
+"Opþiuni:\n"
+"  --output FIªIER\tieºire în FIªIER în loc de $HOME/.info\n"
+"  --help\t\tafiºeazã acest ajutor ºi terminã.\n"
+"  --version\t\tafiºeazã informaþii versiune ºi terminã.\n"
+
+#: info/infomap.c:1500
+#, c-format
+msgid "Ignoring invalid infokey file `%s' - too small"
+msgstr "Ignorãm fiºier infokey incorect `%s' - prea mic"
+
+#: info/infomap.c:1503
+#, c-format
+msgid "Ignoring invalid infokey file `%s' - too big"
+msgstr "Ignorãm fiºier infokey incorect `%s' - prea mare"
+
+#: info/infomap.c:1516
+#, c-format
+msgid "Error reading infokey file `%s' - short read"
+msgstr "Eroare la citirea fiºierului infokey `%s' - citit scurt"
+
+#: info/infomap.c:1535
+#, c-format
+msgid ""
+"Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
+msgstr ""
+"Fiºier infokey incorect `%s' (bad magic numbers) -- rulaþi infokey pentru a-"
+"l actualiza"
+
+#: info/infomap.c:1544
+#, c-format
+msgid "Your infokey file `%s' is out of date -- run infokey to update it"
+msgstr ""
+"Fiºierul d-voastrã infokey `%s' este vechi - rulaþi infokey pentru a-l "
+"actualiza"
+
+#: info/infomap.c:1560
+#, c-format
+msgid ""
+"Invalid infokey file `%s' (bad section length) -- run infokey to update it"
+msgstr ""
+"Fiºier infokey incorect `%s' (bad section length) -- rulaþi infokey pentru a-"
+"l actualiza"
+
+#: info/infomap.c:1581
+#, c-format
+msgid ""
+"Invalid infokey file `%s' (bad section code) -- run infokey to update it"
+msgstr ""
+"Fiºier infokey incorect `%s' (bad section code) -- rulaþi infokey pentru a-l "
+"actualiza"
+
+#: info/infomap.c:1716
+msgid "Bad data in infokey file -- some key bindings ignored"
+msgstr "Date incorecte în fiºierul infokey -- unele legãturi de taste ignorate"
+
+#: info/infomap.c:1766
+msgid "Bad data in infokey file -- some var settings ignored"
+msgstr ""
+"Date incorecte în fiºierul infokey -- unele setãri de variabile ignorate"
+
+#: info/m-x.c:69
+msgid "Read the name of an Info command and describe it"
+msgstr "citeºte numele unei comenzi Info ºi descrie-o"
+
+#: info/m-x.c:73
+msgid "Describe command: "
+msgstr "Descrie comanda: "
+
+#: info/m-x.c:96
+msgid "Read a command name in the echo area and execute it"
+msgstr "Citeºte un nume de comandã în zona ecou ºi executã-o"
+
+#: info/m-x.c:140
+msgid "Cannot execute an `echo-area' command here."
+msgstr "Nu pot executa o comandã `zonã ecou' aici."
+
+#: info/m-x.c:154
+#, c-format
+msgid "Undefined command: %s"
+msgstr "Comandã nedefinitã: %s"
+
+#: info/m-x.c:160
+msgid "Set the height of the displayed window"
+msgstr "Seteazã înãlþimea ferestrei de afiºare"
+
+#: info/m-x.c:173
+#, c-format
+msgid "Set screen height to (%d): "
+msgstr "Seteazã înãlþimea ecranului ls (%d): "
+
+#: info/makedoc.c:162 info/makedoc.c:170
+#, c-format
+msgid ""
+"   Source files groveled to make this file include:\n"
+"\n"
+msgstr ""
+"   Fiºierele sursã (groveled) pentru a include acest fiºier:\n"
+"\n"
+
+#: info/makedoc.c:550
+#, c-format
+msgid "Couldn't manipulate the file %s.\n"
+msgstr "Nu ap putut manipula fiºierul %s.\n"
+
+#: info/nodemenu.c:31
+msgid ""
+"\n"
+"* Menu:\n"
+"  (File)Node                        Lines   Size   Containing File\n"
+"  ----------                        -----   ----   ---------------"
+msgstr ""
+"\n"
+"* Meniu:\n"
+"  (Fiºier)Nod                        Linii   Mãrime   Conþine fiºier\n"
+"  -----------                        -----   ------   --------------"
+
+#: info/nodemenu.c:202
+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 ""
+"Aici este meniul cu nodurile pe care le-aþi vizitat recent.\n"
+"Selectaþi un nod din acest meniu, sau folosiþi `\\[history-node]' în altã "
+"fereastrã\n"
+
+#: info/nodemenu.c:224
+msgid "Make a window containing a menu of all of the currently visited nodes"
+msgstr ""
+"Creazã o fereastrã care conþine un meniu cu toate nodurile vizitate recent"
+
+#: info/nodemenu.c:304
+msgid "Select a node which has been previously visited in a visible window"
+msgstr ""
+"Selecteazã un nod care a fost vizitat anterior într-o fereastrã vizibilã"
+
+#: info/nodemenu.c:317
+msgid "Select visited node: "
+msgstr "Selecteazã nodul vizitat: "
+
+#: info/nodemenu.c:337 info/session.c:2264
+#, c-format
+msgid "The reference disappeared! (%s)."
+msgstr "Referinþa a dispãrut! (%s)."
+
+#: info/session.c:162
+#, c-format
+msgid ""
+"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
+"for menu item."
+msgstr ""
+"Bine aþi venit la Info versiunea %s. Tastaþi \\[get-help-window] pentru "
+"ajutor, \\[menu-item] pentru un articol din meniu."
+
+#: info/session.c:620
+msgid "Move down to the next line"
+msgstr "Mergi la linia urmãtoare"
+
+#: info/session.c:635
+msgid "Move up to the previous line"
+msgstr "Mergi la linia precedentã"
+
+#: info/session.c:650
+msgid "Move to the end of the line"
+msgstr "Mergi la sfârºitul liniei"
+
+#: info/session.c:670
+msgid "Move to the start of the line"
+msgstr "Mergi la începutul liniei"
+
+#: info/session.c:860 makeinfo/node.c:1424
+msgid "Next"
+msgstr "Urmãtor"
+
+#: info/session.c:863
+msgid "Following Next node..."
+msgstr "Urmeazã nodul Urmãtor..."
+
+#: info/session.c:881
+msgid "Selecting first menu item..."
+msgstr "Selectare primul articol din meniu..."
+
+#: info/session.c:893
+msgid "Selecting Next node..."
+msgstr "Selectare nod Urmãtor..."
+
+#: info/session.c:964
+#, c-format
+msgid "Moving Up %d time(s), then Next."
+msgstr "Merg în Sus %d ori, apoi Urmãtor."
+
+#: info/session.c:988
+msgid "No more nodes within this document."
+msgstr "Nu mai sunt alte noduri în acest document."
+
+#: info/session.c:1011
+msgid "No `Prev' for this node."
+msgstr "Nici un `Prec' pentru acest nod."
+
+#: info/session.c:1014 info/session.c:1073
+msgid "Moving Prev in this window."
+msgstr "Mut Prec în aceatã fereastã"
+
+#: info/session.c:1030
+msgid "No `Prev' or `Up' for this node within this document."
+msgstr "Nici un `Prec' sau `Sus' pentru acest nod în acest document."
+
+#: info/session.c:1034
+msgid "Moving Up in this window."
+msgstr "Merg în Sus în aceastã fe"
+
+#: info/session.c:1084
+msgid "Moving to `Prev's last menu item."
+msgstr "Merg la ultimul articol din meniul `Prec'"
+
+#: info/session.c:1095
+msgid "Move forwards or down through node structure"
+msgstr "Mergi înainte sau jos prin structura de noduri"
+
+#: info/session.c:1111
+msgid "Move backwards or up through node structure"
+msgstr "Mergi înapoi sau sus prin structura de noduri"
+
+#: info/session.c:1205
+msgid "Scroll forward in this window"
+msgstr "Scroll înainte în aceastã fereastrã"
+
+#: info/session.c:1213
+msgid "Scroll forward in this window and set default window size"
+msgstr ""
+"Scroll înainte în aceastã fereastrã ºi seteazã dimensiunea implicitã a "
+"ferestrei"
+
+#: info/session.c:1221
+msgid "Scroll forward in this window staying within node"
+msgstr "Scroll înainte în aceastã fereastrã, rãmâi în nod"
+
+#: info/session.c:1229
+msgid ""
+"Scroll forward in this window staying within node and set default window size"
+msgstr ""
+"Scroll înainte în aceastã fereastrã, rãmâi în nod ºi seteazã dimensiunea "
+"implicitã a ferestrei"
+
+#: info/session.c:1237
+msgid "Scroll backward in this window"
+msgstr "Scroll înapoi în acestã fereastrã"
+
+#: info/session.c:1245
+msgid "Scroll backward in this window and set default window size"
+msgstr ""
+"Scroll înapoi în acestã fereastrã ºi seteazã dimensiunea implicitã a "
+"ferestrei"
+
+#: info/session.c:1254
+msgid "Scroll backward in this window staying within node"
+msgstr "Scroll înapoi în aceastã fereastrã, rãmâi în nod"
+
+#: info/session.c:1262
+msgid ""
+"Scroll backward in this window staying within node and set default window "
+"size"
+msgstr ""
+"Scroll înapoi în aceastã fereastrã, rãmâi în nod ºi seteazã dimensiunea "
+"implicitã a ferestrei"
+
+#: info/session.c:1270
+msgid "Move to the start of this node"
+msgstr "Mergi la începutul acestui nod"
+
+#: info/session.c:1277
+msgid "Move to the end of this node"
+msgstr "Mergi la sfârºitul acestui nod"
+
+#: info/session.c:1284
+msgid "Scroll down by lines"
+msgstr "Scroll jos pe linii"
+
+#: info/session.c:1301
+msgid "Scroll up by lines"
+msgstr "Scroll sus pe linii"
+
+#: info/session.c:1319
+msgid "Scroll down by half screen size"
+msgstr "Scroll jos jumãtate de ecran"
+
+#: info/session.c:1345
+msgid "Scroll up by half screen size"
+msgstr "Scroll sus jumãtate de ecran"
+
+#: info/session.c:1374
+msgid "Select the next window"
+msgstr "Selecteazã fereastra urmãtoare"
+
+#: info/session.c:1413
+msgid "Select the previous window"
+msgstr "Selecteazã fereastra precedentã"
+
+#: info/session.c:1464
+msgid "Split the current window"
+msgstr "Împarte fereastra curentã"
+
+#: info/session.c:1545
+msgid "Delete the current window"
+msgstr "ªterge fereastra curentã"
+
+#: info/session.c:1553
+msgid "Cannot delete a permanent window"
+msgstr "Nu pot ºterge o fereastrã permanentã"
+
+#: info/session.c:1585
+msgid "Delete all other windows"
+msgstr "ªterge toate celelalte ferestre"
+
+#: info/session.c:1631
+msgid "Scroll the other window"
+msgstr "Scroll-eazã cealaltã fereastrã"
+
+#: info/session.c:1652
+msgid "Scroll the other window backward"
+msgstr "Scroll-eazã cealaltã fereastrã înapoi"
+
+#: info/session.c:1658
+msgid "Grow (or shrink) this window"
+msgstr "Creºte sau micºoreazã aceastã fereastrã"
+
+#: info/session.c:1669
+msgid "Divide the available screen space among the visible windows"
+msgstr "Împarte spaþiul de ecran disponibil între ferestrele vizibile"
+
+#: info/session.c:1676
+msgid "Toggle the state of line wrapping in the current window"
+msgstr "Comutã starea reformatãrii de linie (wrapping) în fereastra curentã"
+
+#: info/session.c:1848
+msgid "Select the Next node"
+msgstr "Selecteazã nodul Urmãtor"
+
+#: info/session.c:1856
+msgid "Select the Prev node"
+msgstr "Selectezã nodul Prec"
+
+#: info/session.c:1864
+msgid "Select the Up node"
+msgstr "Selecteazã nodul Sus"
+
+#: info/session.c:1871
+msgid "Select the last node in this file"
+msgstr "Selecteazã ultimul nod din acest fiºier"
+
+#: info/session.c:1898 info/session.c:1931
+msgid "This window has no additional nodes"
+msgstr "Acestã fereastrã nu mai are nici un nod"
+
+#: info/session.c:1904
+msgid "Select the first node in this file"
+msgstr "Selecteazã primul nod din acest fiºier"
+
+#: info/session.c:1938
+msgid "Select the last item in this node's menu"
+msgstr "Selecteazã ultimul articol din meniul acestui nod"
+
+#: info/session.c:1944
+msgid "Select this menu item"
+msgstr "Selecteazã acest articol de meniu"
+
+#: info/session.c:1977
+#, c-format
+msgid "There aren't %d items in this menu."
+msgstr "Nu existã %d articole în acest meniu"
+
+#: info/session.c:2171 info/session.c:2172
+#, c-format
+msgid "Menu item (%s): "
+msgstr "Articol meniu (%s): "
+
+#: info/session.c:2175
+msgid "Menu item: "
+msgstr "Articol meniu: "
+
+#: info/session.c:2182 info/session.c:2183
+#, c-format
+msgid "Follow xref (%s): "
+msgstr "Urmeazã ref (%s): "
+
+#: info/session.c:2186
+msgid "Follow xref: "
+msgstr "Urmeazã ref: "
+
+#: info/session.c:2315
+msgid "Read a menu item and select its node"
+msgstr "Citeºte un articol de meniu ºi selecteazã nodul sãu"
+
+#: info/session.c:2323
+msgid "Read a footnote or cross reference and select its node"
+msgstr "Citeºte o notã de subsol sau referinþã ºi selecteazã nodul sãu"
+
+#: info/session.c:2329
+msgid "Move to the start of this node's menu"
+msgstr "Mergi la începutul meniului acestui nod"
+
+#: info/session.c:2353
+msgid "Visit as many menu items at once as possible"
+msgstr "Viziteazã cât mai multe articole de meniu posibile deodatã"
+
+#: info/session.c:2381
+msgid "Read a node name and select it"
+msgstr "Citeºte numele unui nod ºi selecteazã-l"
+
+#: info/session.c:2436 info/session.c:2441
+msgid "Goto node: "
+msgstr "Du-te la nod: "
+
+#: info/session.c:2505
+#, c-format
+msgid "No menu in node `%s'."
+msgstr "Nici un meniu în nod `%s'."
+
+#: info/session.c:2551
+#, c-format
+msgid "No menu item `%s' in node `%s'."
+msgstr "Nici un articol de meniu `%s' în nod `%s'."
+
+#: info/session.c:2581
+#, c-format
+msgid "Unable to find node referenced by `%s' in `%s'."
+msgstr "Nu pot gãsi nodul referit de `%s' în `%s'."
+
+#: info/session.c:2631
+msgid "Read a list of menus starting from dir and follow them"
+msgstr "Citeºte o listã de meniuri pornind din dir ºi urmãreºte-le"
+
+#: info/session.c:2633
+msgid "Follow menus: "
+msgstr "Urmeazã meniurile: "
+
+#: info/session.c:2826
+msgid "Find the node describing program invocation"
+msgstr "Gãseºte nodul ce descrie invocarea programului"
+
+#: info/session.c:2828
+#, c-format
+msgid "Find Invocation node of [%s]: "
+msgstr "Gãseºte nodul Invocare pentru [%s]: "
+
+#: info/session.c:2866
+msgid "Read a manpage reference and select it"
+msgstr "Citeºte o referinþã de paginã de manul ºi selecteazã-o"
+
+#: info/session.c:2870
+msgid "Get Manpage: "
+msgstr "Obþine paginã manual (manpage): "
+
+#: info/session.c:2900
+msgid "Select the node `Top' in this file"
+msgstr "Selecteazã nodul `Vârf' în acest fiºier"
+
+#: info/session.c:2906
+msgid "Select the node `(dir)'"
+msgstr "Selecteazã nodul `(dir)'"
+
+#: info/session.c:2923 info/session.c:2925
+#, c-format
+msgid "Kill node (%s): "
+msgstr "Distruge nodul (%s): "
+
+#: info/session.c:2977
+#, c-format
+msgid "Cannot kill node `%s'"
+msgstr "Nu pot distruge nodul `%s'"
+
+#: info/session.c:2987
+msgid "Cannot kill the last node"
+msgstr "Nu pot distruge ultimul nod"
+
+#: info/session.c:3073
+msgid "Select the most recently selected node"
+msgstr "Selecteazã cel mai recent nod selectat"
+
+#: info/session.c:3079
+msgid "Kill this node"
+msgstr "Distruge acest nod"
+
+#: info/session.c:3087
+msgid "Read the name of a file and select it"
+msgstr "Citeºte numele unui fiºier ºi selecteazã-l"
+
+#: info/session.c:3091
+msgid "Find file: "
+msgstr "Gãseºte fiºier: "
+
+#: info/session.c:3108
+#, c-format
+msgid "Cannot find `%s'."
+msgstr "Nu pot gãsi `%s'."
+
+#: info/session.c:3151 info/session.c:3269
+#, c-format
+msgid "Could not create output file `%s'."
+msgstr "Nu am putut crea fiºier ieºire `%s'."
+
+#: info/session.c:3165 info/session.c:3287 info/session.c:3347
+msgid "Done."
+msgstr "Terminat."
+
+#: info/session.c:3220
+#, c-format
+msgid "Writing node %s..."
+msgstr "Scriu nod %s..."
+
+#: info/session.c:3296
+msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
+msgstr "Conectez (pipe) conþinutul acestui nod prin INFO_PRINT_COMMAND"
+
+#: info/session.c:3331
+#, c-format
+msgid "Cannot open pipe to `%s'."
+msgstr "Nu pot deschide conexiune (pipe) cãtre `%s'."
+
+#: info/session.c:3337
+#, c-format
+msgid "Printing node %s..."
+msgstr "Tipãresc nod %s..."
+
+#: info/session.c:3567
+#, c-format
+msgid "Searching subfile %s ..."
+msgstr "Caut subfiºier %s ..."
+
+#: info/session.c:3619
+msgid "Read a string and search for it case-sensitively"
+msgstr "Citeºte un ºir ºi cautã-l þinând cont de litere mari/mici"
+
+#: info/session.c:3626
+msgid "Read a string and search for it"
+msgstr "Citeºte un ºir ºi cautã-l"
+
+#: info/session.c:3634
+msgid "Read a string and search backward for it"
+msgstr "Citeºte un ºir ºi cautã-l înapoi"
+
+#: info/session.c:3670 info/session.c:3677
+#, c-format
+msgid "%s%sfor string [%s]: "
+msgstr "%s%s pentru ºir [%s]: "
+
+#: info/session.c:3671 info/session.c:3678
+msgid "Search backward"
+msgstr "Cautã înapoi"
+
+#: info/session.c:3672 info/session.c:3678
+msgid "Search"
+msgstr "Cautã"
+
+#: info/session.c:3673 info/session.c:3679
+msgid " case-sensitively "
+msgstr " þinând cont de litere mari/mici"
+
+#: info/session.c:3674 info/session.c:3679
+msgid " "
+msgstr " "
+
+#: info/session.c:3718
+msgid "Search failed."
+msgstr "Cãutare eºuatã."
+
+#: info/session.c:3736
+msgid "Repeat last search in the same direction"
+msgstr "Repetã ultima cãutare în aceeaºi direcþie"
+
+#: info/session.c:3739 info/session.c:3749
+msgid "No previous search string"
+msgstr "Nici un ºir cãutat anterior"
+
+#: info/session.c:3746
+msgid "Repeat last search in the reverse direction"
+msgstr "Repetã ultima cãutare în direcþie opusã"
+
+#: info/session.c:3765 info/session.c:3771
+msgid "Search interactively for a string as you type it"
+msgstr "Cautã interactiv pentru un ºir pe mãsurã ce este introdus"
+
+#: info/session.c:3851
+msgid "I-search backward: "
+msgstr "I-cautã înapoi: "
+
+#: info/session.c:3853
+msgid "I-search: "
+msgstr "I-cautã: "
+
+#: info/session.c:3878 info/session.c:3880
+msgid "Failing "
+msgstr "Eºuez "
+
+#: info/session.c:4340
+msgid "Move to the previous cross reference"
+msgstr "Mergi la referinþa precedentã"
+
+#: info/session.c:4349
+msgid "Move to the next cross reference"
+msgstr "Mergi la referinþa urmãtoare"
+
+#: info/session.c:4359
+msgid "Select reference or menu item appearing on this line"
+msgstr "Selecteazã referinþa sau articolul de meniu ce apare pe acestã linie"
+
+#: info/session.c:4382
+msgid "Cancel current operation"
+msgstr "Renunþã la operaþia curentã"
+
+#: info/session.c:4389
+msgid "Quit"
+msgstr "Ieºi"
+
+#: info/session.c:4398
+msgid "Move the cursor to a specific line of the window"
+msgstr "Mutã cursorul la o anumitã linie din fereastrã"
+
+#: info/session.c:4430
+msgid "Redraw the display"
+msgstr "Redeseneazã ecranul"
+
+#: info/session.c:4467
+msgid "Quit using Info"
+msgstr "Ieºi din Info"
+
+#: info/session.c:4480
+msgid "Run command bound to this key's lowercase variant"
+msgstr "Ruleazã comanda legatã de litera micã de pe tastã"
+
+#: info/session.c:4491
+#, c-format
+msgid "Unknown command (%s)."
+msgstr "Comandã necunoscutã (%s)."
+
+#: info/session.c:4494
+#, c-format
+msgid "\"%s\" is invalid"
+msgstr "\"%s\" este invalid"
+
+#: info/session.c:4495
+#, c-format
+msgid "`%s' is invalid"
+msgstr "`%s' este invalid"
+
+#: info/session.c:4709
+msgid "Add this digit to the current numeric argument"
+msgstr "Adaugã aceastã cifrã la argumentul numeric curent"
+
+#: info/session.c:4718
+msgid "Start (or multiply by 4) the current numeric argument"
+msgstr "Începe (sau înmulþeºte cu 4) argumentul numeric curent"
+
+#: info/session.c:4733
+msgid "Internally used by \\[universal-argument]"
+msgstr "Folosit intern de \\[argument-universal]"
+
+#: info/tilde.c:338
+#, c-format
+msgid "readline: Out of virtual memory!\n"
+msgstr "readline: Nu mai am memorie virtualã!\n"
+
+#: info/variables.c:37
+msgid "When \"On\", footnotes appear and disappear automatically"
+msgstr "Când \"Activ\", notele de subsol apar ºi dispar automatic"
+
+#: info/variables.c:41
+msgid "When \"On\", creating or deleting a window resizes other windows"
+msgstr ""
+"Când \"Activ\", crearea ºi ºtergere unei ferestre redimensioneazã alte "
+"ferestre"
+
+#: info/variables.c:45
+msgid "When \"On\", flash the screen instead of ringing the bell"
+msgstr "Când \"Activ\", scânteiazã ecreanul în loc sã suni clopoþelul"
+
+#: info/variables.c:49
+msgid "When \"On\", errors cause the bell to ring"
+msgstr "Când \"Activ\", erorile face sã sune clopoþelul"
+
+#: info/variables.c:53
+msgid "When \"On\", Info garbage collects files which had to be uncompressed"
+msgstr ""
+"Când \"Activ\", Info colecteazã la gunoi fiºierele care au trebuit "
+"decompresate"
+
+#: info/variables.c:56
+msgid "When \"On\", the portion of the matched search string is highlighted"
+msgstr "Când \"Activ\", porþiunea din ºir care s-a potrivit este evidenþiatã"
+
+#: info/variables.c:60
+msgid "Controls what happens when scrolling is requested at the end of a node"
+msgstr ""
+"Controleazã ce se întâmplã când este cerut scroll la sfârºitul unui nod"
+
+#: info/variables.c:64
+msgid "The number lines to scroll when the cursor moves out of the window"
+msgstr ""
+"Numãrul de linii pentru scroll când cursorul se mutã în afara ferestrei"
+
+#: info/variables.c:68
+msgid "When \"On\", Info accepts and displays ISO Latin characters"
+msgstr "Când \"Activ\", Info acceptã ºi afiºeazã caractere ISO Latin"
+
+#: info/variables.c:74
+msgid "Explain the use of a variable"
+msgstr "Explicã folosirea unei variabile"
+
+#: info/variables.c:80
+msgid "Describe variable: "
+msgstr "Descrie variabila: "
+
+#: info/variables.c:99
+msgid "Set the value of an Info variable"
+msgstr "Seteazã valoarea unei variabile Info"
+
+#: info/variables.c:105
+msgid "Set variable: "
+msgstr "Seteazã variabilã: "
+
+#: info/variables.c:123
+#, c-format
+msgid "Set %s to value (%d): "
+msgstr "Seteazã %s cu valoarea (%d): "
+
+#: info/variables.c:164
+#, c-format
+msgid "Set %s to value (%s): "
+msgstr "Seteazã %s cu valoarea (%s): "
+
+#: info/window.c:1138
+msgid "--*** Tags out of Date ***"
+msgstr "--*** Tag-uri Vechi ***"
+
+#: info/window.c:1149
+msgid "-----Info: (), lines ----, "
+msgstr "-----Info: (), linii ----, "
+
+#: info/window.c:1156
+#, c-format
+msgid "-%s---Info: %s, %d lines --%s--"
+msgstr "-%s---Info: %s, %d linii --%s--"
+
+#: info/window.c:1160
+#, c-format
+msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
+msgstr "-%s%s-Info: (%s)%s, %d linii --%s--"
+
+#: info/window.c:1167
+#, c-format
+msgid " Subfile: %s"
+msgstr " Subfiºier: %s"
+
+#: lib/getopt.c:551 lib/getopt.c:570
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: opþiunea `%s' este ambiguã\n"
+
+#: lib/getopt.c:603 lib/getopt.c:607
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: opþiunea `--%s' nu permite un argument\n"
+
+#: lib/getopt.c:616 lib/getopt.c:621
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: opþiunea `%c%s' nu permite un argument\n"
+
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: opþiunea `%s' necesitã un argument\n"
+
+#: lib/getopt.c:727 lib/getopt.c:730
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: opþiune nerecunoscutã `--%s'\n"
+
+#: lib/getopt.c:738 lib/getopt.c:741
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: opþiune nerecunoscutã `%c%s'\n"
+
+#: lib/getopt.c:796 lib/getopt.c:799
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: opþiune ilegalã -- %c\n"
+
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: opþiune invalidã -- %c\n"
+
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: opþiunea necesitã un argument -- %c\n"
+
+#: lib/getopt.c:935 lib/getopt.c:954
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: opþiunea `-W %s' este ambiguã\n"
+
+#: lib/getopt.c:978 lib/getopt.c:999
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: opþiunea `-W %s' nu permite un argument\n"
+
+#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#, c-format
+msgid "arguments to @%s ignored"
+msgstr "argumentele pentru @%s ignorate"
+
+#: makeinfo/cmds.c:585
+msgid "January"
+msgstr "Ianuarie"
+
+#: makeinfo/cmds.c:585
+msgid "February"
+msgstr "Februarie"
+
+#: makeinfo/cmds.c:585
+msgid "March"
+msgstr "Martie"
+
+#: makeinfo/cmds.c:585
+msgid "April"
+msgstr "Aprilie"
+
+#: makeinfo/cmds.c:585
+msgid "May"
+msgstr "Mai"
+
+#: makeinfo/cmds.c:586
+msgid "June"
+msgstr "Iunie"
+
+#: makeinfo/cmds.c:586
+msgid "July"
+msgstr "Iulie"
+
+#: makeinfo/cmds.c:586
+msgid "August"
+msgstr "August"
+
+#: makeinfo/cmds.c:586
+msgid "September"
+msgstr "Septembrie"
+
+#: makeinfo/cmds.c:586
+msgid "October"
+msgstr "Octombrie"
+
+#: makeinfo/cmds.c:587
+msgid "November"
+msgstr "Noiembrie"
+
+#: makeinfo/cmds.c:587
+msgid "December"
+msgstr "Decembrie"
+
+#: makeinfo/cmds.c:936
+#, c-format
+msgid "unlikely character %c in @var"
+msgstr "caracter neverosimil %c în @var"
+
+#: makeinfo/cmds.c:979
+msgid "@sc argument all uppercase, thus no effect"
+msgstr "argumentul @sc în litere mari, prin urmare fãrã efect"
+
+#: makeinfo/cmds.c:1034
+#, c-format
+msgid "`{' expected, but saw `%c'"
+msgstr "`{' aºteptat, dar am vãzut `%c'"
+
+#: makeinfo/cmds.c:1074
+msgid "end of file inside verb block"
+msgstr "sfârºit de fiºier în interiorul blocului de verb"
+
+#: makeinfo/cmds.c:1082
+#, c-format
+msgid "`}' expected, but saw `%c'"
+msgstr "`}' aºteptat, dar am vãzut `%c'"
+
+#: makeinfo/cmds.c:1112
+msgid ""
+"@strong{Note...} produces a spurious cross-reference in Info; reword to "
+"avoid that"
+msgstr ""
+"@strong{Notã...] produce o referinþã încruciºatã falsã în Info; reformulaþi "
+"pentru a o evita"
+
+#: makeinfo/cmds.c:1305
+#, c-format
+msgid "%c%s is obsolete"
+msgstr "%c%s este depãsit"
+
+#: makeinfo/cmds.c:1414
+#, c-format
+msgid "@sp requires a positive numeric argument, not `%s'"
+msgstr "@sp necesitã un argument numeric pozitiv, nu `%s'"
+
+#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
+#, c-format
+msgid "Bad argument to %c%s"
+msgstr "Argument nepotrivit pentru %c%s"
+
+#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
+msgid "asis"
+msgstr "aºacume"
+
+#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
+msgid "none"
+msgstr "nimic"
+
+#: makeinfo/cmds.c:1789
+#, c-format
+msgid "Bad argument to @%s"
+msgstr "Argument nepotrivit pentru @%s"
+
+#: makeinfo/cmds.c:1803
+msgid "insert"
+msgstr "insereazã"
+
+#: makeinfo/defun.c:84
+msgid "Missing `}' in @def arg"
+msgstr "Lipseºte `}' în @def arg"
+
+#: makeinfo/defun.c:403
+msgid "Function"
+msgstr "Funcþie"
+
+#: makeinfo/defun.c:406
+msgid "Macro"
+msgstr "Macro"
+
+#: makeinfo/defun.c:409
+msgid "Special Form"
+msgstr "Formã Specialº"
+
+#: makeinfo/defun.c:413
+msgid "Variable"
+msgstr "Variabilã"
+
+#: makeinfo/defun.c:416
+msgid "User Option"
+msgstr "Opþiune Utilizator"
+
+#: makeinfo/defun.c:420
+msgid "Instance Variable"
+msgstr "Instanþiere Variabilã"
+
+#: makeinfo/defun.c:424
+msgid "Method"
+msgstr "Metodã"
+
+#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
+#: makeinfo/defun.c:644 makeinfo/xml.c:2229
+msgid "of"
+msgstr "din"
+
+#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
+msgid "on"
+msgstr "pe"
+
+#: makeinfo/defun.c:711
+#, c-format
+msgid "Must be in `@%s' environment to use `@%s'"
+msgstr "Trebuie sã fiþi în mediul `@%s' pentru a folosi `@%s'"
+
+#: makeinfo/files.c:435
+#, c-format
+msgid "%s: getwd: %s, %s\n"
+msgstr "%s: getwd: %s, %s\n"
+
+#: makeinfo/files.c:638
+#, c-format
+msgid "`%s' omitted before output filename"
+msgstr "`%s' omis înainte de numele fiºierului de ieºire"
+
+#: makeinfo/files.c:646
+#, c-format
+msgid "`%s' omitted since writing to stdout"
+msgstr "`%s' omis întrucât scriu la ieºirea standard (stdout)"
+
+#: makeinfo/files.c:694
+msgid "Output buffer not empty."
+msgstr "Buffer-ul de ieºire nu este gol."
+
+#: makeinfo/footnote.c:150
+#, c-format
+msgid "`%c%s' needs an argument `{...}', not just `%s'"
+msgstr "`%c%s' necesitã un argument `{...}', nu numai `%s'"
+
+#: makeinfo/footnote.c:165
+#, c-format
+msgid "No closing brace for footnote `%s'"
+msgstr "Nici o parantezã de închidere pentru nota de subsol `%s'"
+
+#: makeinfo/footnote.c:198
+msgid "Footnote defined without parent node"
+msgstr "Nota de subsol definitã fãrã nod pãrinte"
+
+#: makeinfo/footnote.c:210
+msgid "Footnotes inside footnotes are not allowed"
+msgstr "Nu sun permise note de subsol în note de subsol"
+
+#: makeinfo/footnote.c:302 makeinfo/index.c:189
+msgid "Footnotes"
+msgstr "Note de subsol"
+
+#: makeinfo/html.c:87
+#, c-format
+msgid "%s: could not open --css-file: %s"
+msgstr "%s: nu am putut deschide --css-file: %s"
+
+#: makeinfo/html.c:172
+#, c-format
+msgid "%s:%d: --css-file ended in comment"
+msgstr "%s:%d: --css-file s-a terminat cu un comentariu"
+
+#: makeinfo/html.c:207
+msgid "Untitled"
+msgstr "Fãrã titlu"
+
+#: makeinfo/html.c:422
+msgid "[unexpected] no html tag to pop"
+msgstr "[neaºteptat] nici un tag html de ridicat"
+
+#: makeinfo/html.c:752
+#, c-format
+msgid "[unexpected] invalid node name: `%s'"
+msgstr "[neaºteptat] nume de nod invalid: `%s'"
+
+#: makeinfo/index.c:169
+#, c-format
+msgid "Unknown index `%s'"
+msgstr "Index necunoscut `%s'"
+
+#: makeinfo/index.c:234
+#, c-format
+msgid "Info cannot handle `:' in index entry `%s'"
+msgstr "Info nu poate folosi `:' în intrarea de index `%s'"
+
+#: makeinfo/index.c:412
+#, c-format
+msgid "Index `%s' already exists"
+msgstr "Indez-ul `%s' existã deja"
+
+#: makeinfo/index.c:455
+#, c-format
+msgid "Unknown index `%s' and/or `%s' in @synindex"
+msgstr "Index-ul necunoscut `%s' ºi/sau `%s' în @synindex"
+
+#: makeinfo/index.c:661
+msgid "(line )"
+msgstr "(linie )"
+
+#: makeinfo/index.c:669
+#, c-format
+msgid "(line %*d)"
+msgstr "(linia %*d)"
+
+#: makeinfo/index.c:750
+#, c-format
+msgid "Unknown index `%s' in @printindex"
+msgstr "Index necunoscut `%s' în @printindex"
+
+#: makeinfo/index.c:819
+#, c-format
+msgid "Entry for index `%s' outside of any node"
+msgstr "Intrarea pentru index-ul `%s' în afara oricãrui nod"
+
+#: makeinfo/index.c:822 makeinfo/index.c:858
+msgid "(outside of any node)"
+msgstr "(în afara oricãrui nod)"
+
+#: makeinfo/index.c:919 makeinfo/index.c:925
+msgid "See "
+msgstr "Vezi "
+
+#: makeinfo/insertion.c:160
+msgid "@item not allowed in argument to @itemize"
+msgstr "@item nu este permis în argument la @itemize"
+
+#: makeinfo/insertion.c:238
+msgid "Broken-Type in insertion_type_pname"
+msgstr "Tip-Greºit în insertion_type_pname"
+
+#: makeinfo/insertion.c:334
+msgid "Enumeration stack overflow"
+msgstr "Stivã de enumerare inundatã (overflow)"
+
+#: makeinfo/insertion.c:366
+#, c-format
+msgid "lettering overflow, restarting at %c"
+msgstr "inundate (overflow) la tipãrire, reîncep la %c"
+
+#: makeinfo/insertion.c:631
+#, c-format
+msgid "%s requires an argument: the formatter for %citem"
+msgstr "%s necesitã un argument: formatatorul pentru %citem"
+
+#: makeinfo/insertion.c:719
+#, c-format
+msgid "%cfloat environments cannot be nested"
+msgstr "mediile %cfloat nu pot fi încuibãrite"
+
+#: makeinfo/insertion.c:973
+#, c-format
+msgid "`@end' expected `%s', but saw `%s'"
+msgstr "`@end' a aºteptat `%s', dar a vãzut `%s'"
+
+#: makeinfo/insertion.c:1337
+#, c-format
+msgid "No matching `%cend %s'"
+msgstr "Nici o potrivire %cend %s'"
+
+#: makeinfo/insertion.c:1592
+#, c-format
+msgid "%s requires letter or digit"
+msgstr "%s necesitã litere sau cifre"
+
+#: makeinfo/insertion.c:1687
+msgid "end of file inside verbatim block"
+msgstr "sfârºit de fiºier în interiorul blocului neformatat (verbatim)"
+
+#: makeinfo/insertion.c:1913
+#, c-format
+msgid "@%s not meaningful outside `@float' environment"
+msgstr "@%s nu are sens în exteriorul mediului `@float'"
+
+#: makeinfo/insertion.c:1949
+msgid "@menu seen before first @node, creating `Top' node"
+msgstr "@menu vãzut înainte de primul @node, creez nodul `Vârf'"
+
+#: makeinfo/insertion.c:1950
+msgid ""
+"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
+msgstr ""
+"probabil cã nodul d-voastrã @top ar trebui împachetat în @ifnottex în loc de "
+"@ifinfo?"
+
+#: makeinfo/insertion.c:1962
+msgid "@detailmenu seen before first node, creating `Top' node"
+msgstr "@detailmenu vãzut înainte de primul nod, creez nodul `Vârf'"
+
+#: makeinfo/insertion.c:2018
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr "@%s nu are sens în exteriorul mediilor `@titlepage' ºi `@quotation'"
+
+#: makeinfo/insertion.c:2032
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' environment"
+msgstr "@%s nu are sens în exteriorul mediului `@titlepage'"
+
+#: makeinfo/insertion.c:2063
+#, c-format
+msgid "Unmatched `%c%s'"
+msgstr "`%c%s' fãrã pereche"
+
+#: makeinfo/insertion.c:2068
+#, c-format
+msgid "`%c%s' needs something after it"
+msgstr "`%c%s' necesitã ceva dupã el"
+
+#: makeinfo/insertion.c:2074
+#, c-format
+msgid "Bad argument `%s' to `@%s', using `%s'"
+msgstr "Argument greºit `%s' pentru `@%s', folosesc `%s'"
+
+#: makeinfo/insertion.c:2171
+#, c-format
+msgid "@%s not meaningful inside `@%s' block"
+msgstr "@%s nu are sens în interiorul blocului `@%s'"
+
+#: makeinfo/insertion.c:2180
+#, c-format
+msgid "@itemx not meaningful inside `%s' block"
+msgstr "@itemx nu are sens în interiorul blocului `%s'"
+
+#: makeinfo/insertion.c:2356
+#, c-format
+msgid "%c%s found outside of an insertion block"
+msgstr "%c%s gãsit în afara unui bloc de inserare"
+
+#: makeinfo/lang.c:580
+#, c-format
+msgid "%s is not a valid ISO 639 language code"
+msgstr "%s nu este un cod de limbã valid conform ISO 639"
+
+#: makeinfo/lang.c:655
+#, c-format
+msgid "unrecognized encoding name `%s'"
+msgstr "nume de codare nerecunoscut `%s'"
+
+#: makeinfo/lang.c:663
+#, c-format
+msgid "sorry, encoding `%s' not supported"
+msgstr "ne pare rãu, codarea `%s' nu este suportatã"
+
+#: makeinfo/lang.c:715
+#, c-format
+msgid "invalid encoded character `%s'"
+msgstr "caracter codat invalid `%s'"
+
+#: makeinfo/lang.c:1009
+#, c-format
+msgid "%c%s expects `i' or `j' as argument, not `%c'"
+msgstr "%c%s aºteaptã `i' sau `j' ca argument, nu `%c'"
+
+#: makeinfo/lang.c:1013
+#, c-format
+msgid "%c%s expects a single character `i' or `j' as argument"
+msgstr "%c%s aºteaptã un singur caracter `i' sau `j' ca argument"
+
+#: makeinfo/macro.c:128
+#, c-format
+msgid "macro `%s' previously defined"
+msgstr "macro-ul `%s' definit anterior"
+
+#: makeinfo/macro.c:132
+#, c-format
+msgid "here is the previous definition of `%s'"
+msgstr "aici este definiþia anterioarã a lui `%s'"
+
+#: makeinfo/macro.c:355
+#, c-format
+msgid "\\ in macro expansion followed by `%s' instead of parameter name"
+msgstr "\\ in expansiunea macro urmatã de `%s' în loc de nume parametru"
+
+#: makeinfo/macro.c:401
+#, c-format
+msgid "Macro `%s' called on line %d with too many args"
+msgstr "Macro `%s' chemat pe linia %d cu prea multe argumente"
+
+#: makeinfo/macro.c:586
+#, c-format
+msgid "%cend macro not found"
+msgstr "%cend macro nu a fost gãsit"
+
+#: makeinfo/macro.c:624
+msgid "@quote-arg only useful for single-argument macros"
+msgstr "@quote-arg folositor numai pentru macro-uri cu un singur argument"
+
+#: makeinfo/macro.c:660
+#, c-format
+msgid "mismatched @end %s with @%s"
+msgstr "nepotrivire @end %s cu @%s"
+
+#: makeinfo/makeinfo.c:184
+#, c-format
+msgid "Too many errors!  Gave up.\n"
+msgstr "Prea multe erori!  Am renunþat.\n"
+
+#: makeinfo/makeinfo.c:302
+#, c-format
+msgid "%s:%d: warning: "
+msgstr "%s:%d: avertisment: "
+
+#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
+#, c-format
+msgid "Misplaced %c"
+msgstr "%c nelalocul lui"
+
+#: makeinfo/makeinfo.c:340
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "Încercaþi `%s --help' pentru informaþii suplimentare.\n"
+
+#: makeinfo/makeinfo.c:343
+#, c-format
+msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
+msgstr "Folosire: %s [OPÞIUNE]... FIªIER-TEXINFO...\n"
+
+#: makeinfo/makeinfo.c:346
+msgid ""
+"Translate Texinfo source documentation to various other formats, by default\n"
+"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
+msgstr ""
+"Translateazã documentaþia sursã Texinfo în diferite alte formate, implicit\n"
+"fiºiere Info potrivite pentru citit online cu Emacs sau GNU Info.\n"
+
+#: makeinfo/makeinfo.c:350
+#, c-format
+msgid ""
+"General options:\n"
+"      --error-limit=NUM       quit after NUM errors (default %d).\n"
+"      --force                 preserve output even if errors.\n"
+"      --help                  display this help and exit.\n"
+"      --no-validate           suppress node cross-reference validation.\n"
+"      --no-warn               suppress warnings (but not errors).\n"
+"      --reference-limit=NUM   warn about at most NUM references (default %"
+"d).\n"
+"  -v, --verbose               explain what is being done.\n"
+"      --version               display version information and exit.\n"
+msgstr ""
+"General options:\n"
+"      --error-limit=NUM       terminã dupã NUM erori (implicit %d).\n"
+"      --force                 pãstreazã ieºire echiar ºi dacã sunt erori.\n"
+"      --help                  afiºeazã acest mesaj ºi terminã.\n"
+"      --no-validate           eliminã validarea referinþelor.\n"
+"      --no-warn               eliminã avertismentele (dar nu erorile).\n"
+"      --reference-limit=NUM   avertizeazã despre cel mult NUM referinþe "
+"(implicit %d).\n"
+"  -v, --verbose               explicã ce se executã.\n"
+"      --version               afiºeazã informaþii despre versiune ºi "
+"terminã.\n"
+
+#: makeinfo/makeinfo.c:364
+#, no-wrap
+msgid ""
+"Output format selection (default is to produce Info):\n"
+"      --docbook             output Docbook XML rather than Info.\n"
+"      --html                output HTML rather than Info.\n"
+"      --xml                 output Texinfo XML rather than Info.\n"
+"      --plaintext           output plain text rather than Info.\n"
+msgstr ""
+"Selecþia formatului de ieºire (implicit este sã creeze Info):\n"
+"      --docbook             ieºire DocBook XML în loc de Info.\n"
+"      --html                ieºire HTML în loc de Info.\n"
+"      --xml                 ieºire Texinfo XML în loc de Info.\n"
+"      --plaintext           ieºire text simplu în loc de Info.\n"
+
+#: makeinfo/makeinfo.c:372
+msgid ""
+"General output options:\n"
+"  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
+"                            ignoring any @setfilename.\n"
+"      --no-headers          suppress node separators, Node: lines, and "
+"menus\n"
+"                              from Info output (thus producing plain text)\n"
+"                              or from HTML (thus producing shorter output);\n"
+"                              also, write to standard output by default.\n"
+"      --no-split            suppress splitting of Info or HTML output,\n"
+"                            generate only one output file.\n"
+"      --number-sections     output chapter and sectioning numbers.\n"
+"  -o, --output=FILE         output to FILE (directory if split HTML),\n"
+msgstr ""
+"Opþiuni de ieºire generale:\n"
+"  -E, --macro-expand FIªIER ieºire macro-expandatã în FIªIER.\n"
+"                            ignorînd orice @setfilename.\n"
+"      --no-headers          eliminã noduri separatoare, Nod: linii ºi "
+"meniuri\n"
+"                             din ieºire Info (producând text simplu)\n"
+"                             sau din HTML (producând ieºire mai scurtã);\n"
+"                             de asemenea, scrie implicit la ieºirea "
+"standard.\n"
+"      --no-split            eliminã împãrþirea ieºirii Info sau HTML,\n"
+"                            genereazã un singur fiºier de ieºire.\n"
+"      --number-sections     scrie numere de capitole ºi secþiuni.\n"
+"  -o, --output=FIªIER       scrie în FIªIER (director dacã multiple HTML),\n"
+
+#: makeinfo/makeinfo.c:386
+#, c-format
+msgid ""
+"Options for Info and plain text:\n"
+"      --enable-encoding       output accented and special characters in\n"
+"                                Info output based on @documentencoding.\n"
+"      --fill-column=NUM       break Info lines at NUM characters (default %"
+"d).\n"
+"      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
+"                                `separate' to put them in their own node;\n"
+"                                `end' to put them at the end of the node\n"
+"                                  in which they are defined (default).\n"
+"      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default %"
+"d).\n"
+"                                If VAL is `none', do not indent; if VAL is\n"
+"                                `asis', preserve existing indentation.\n"
+"      --split-size=NUM        split Info files at size NUM (default %d).\n"
+msgstr ""
+"Options for Info and plain text:\n"
+"      --enable-encoding      genereazã caractere accentuate ºi speciale în\n"
+"                                ieºire Info bazat pe @documentencoding.\n"
+"      --fill-column=NUM      sparge liniile Info la NUM caractere (implicit %"
+"d).\n"
+"      --footnote-style=STIL  genereazã note de subsol în Info conform cu "
+"STIL:\n"
+"                                `separate' pentru a le pune in propriul lor "
+"nod;\n"
+"                                `end' pentru a le pune la sfârºitul nodului\n"
+"                                  în care sunt definite (implicit).\n"
+"      --paragraph-indent=VAL  precede paragrafele Info cu VAL spaþii "
+"(implicit %d).\n"
+"                                dacã VAL este `none', nu pune spaþii; dacã "
+"VAL\n"
+"                                este `asis', pãstrezã spaþiile existente.\n"
+"      --split-size=NUM        împarte fiºierele Info de dimens. NUM "
+"(implicit %d).\n"
+
+#: makeinfo/makeinfo.c:403
+msgid ""
+"Options for HTML:\n"
+"      --css-include=FILE        include FILE in HTML <style> output;\n"
+"                                  read stdin if FILE is -.\n"
+msgstr ""
+"Opþiuni pentru HTML:\n"
+"      --css-include=FIªIER      include FIªIER în HTML <stil> ieºire;\n"
+"                                  citeºte stdin dacã FIªIER este -.\n"
+
+#: makeinfo/makeinfo.c:409
+#, c-format
+msgid ""
+"Options for XML and Docbook:\n"
+"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"d).\n"
+"                                  If VAL is 0, ignorable whitespace is "
+"dropped.\n"
+msgstr ""
+"Opþiuni pentru HTML:\n"
+"      --css-include=FIªIER      aliniazã elemente XML cu VAL spaþii "
+"(implicit %d)\n"
+"                                  dacã VAL e 0, spaþiile goale ce pot fi "
+"ignorate nu sunt afiºate.\n"
+
+#: makeinfo/makeinfo.c:416
+msgid ""
+"Input file options:\n"
+"      --commands-in-node-names  allow @ commands in node names.\n"
+"  -D VAR                        define the variable VAR, as with @set.\n"
+"  -I DIR                        append DIR to the @include search path.\n"
+"  -P DIR                        prepend DIR to the @include search path.\n"
+"  -U VAR                        undefine the variable VAR, as with @clear.\n"
+msgstr ""
+"Opþiuni fiºier de intrare:\n"
+"      --commands-in-node-names  permite comenzi @ în numele nodurilor.\n"
+"  -D VAR                        defineºte variabila VAR, ca ºi @set.\n"
+"  -I DIR                        adaugã DIR la calea de cãutare @include.\n"
+"  -P DIR                        prepend DIR la calea de cãutare @include.\n"
+"  -U VAR                        nedefineºte variabila VAR, ca ºi @clear.\n"
+
+#: makeinfo/makeinfo.c:425
+msgid ""
+"Conditional processing in input:\n"
+"  --ifdocbook       process @ifdocbook and @docbook even if\n"
+"                      not generating Docbook.\n"
+"  --ifhtml          process @ifhtml and @html even if not generating HTML.\n"
+"  --ifinfo          process @ifinfo even if not generating Info.\n"
+"  --ifplaintext     process @ifplaintext even if not generating plain text.\n"
+"  --iftex           process @iftex and @tex; implies --no-split.\n"
+"  --ifxml           process @ifxml and @xml.\n"
+"  --no-ifdocbook    do not process @ifdocbook and @docbook text.\n"
+"  --no-ifhtml       do not process @ifhtml and @html text.\n"
+"  --no-ifinfo       do not process @ifinfo text.\n"
+"  --no-ifplaintext  do not process @ifplaintext text.\n"
+"  --no-iftex        do not process @iftex and @tex text.\n"
+"  --no-ifxml        do not process @ifxml and @xml text.\n"
+"\n"
+"  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
+msgstr ""
+"Procesare condiþionalã în intrare:\n"
+"  --ifdocbook       proceseazã @ifdocbook º @docbook chiar dacã\n"
+"                      nu generezi Docbook.\n"
+"  --ifhtml          proceseazã @ifhtml ºi @html chiar dacã nu generezi "
+"HTML.\n"
+"  --ifinfo          proceseazã @ifinfo chiar dacã nu generezi Info.\n"
+"  --ifplaintext     proceseazã @ifplaintext chiar dacã nu generezi text "
+"simplu.\n"
+"  --iftex           proceseazã @iftex ºi @tex; implicã --no-split.\n"
+"  --ifxml           proceseazã @ifxml ºi @xml.\n"
+"  --no-ifdocbook    nu procesa text @ifdocbook ºi @docbook.\n"
+"  --no-ifhtml       nu procesa text @ifhtml ºi @html.\n"
+"  --no-ifinfo       nu procesa text @ifinfo.\n"
+"  --no-ifplaintext  nu procesa text @ifplaintext.\n"
+"  --no-iftex        nu procesa text @iftex ºi @tex.\n"
+"  --no-ifxml        nu procesa text @ifxml ºi @xml.\n"
+"\n"
+"  De asemenea, pentru opþiunile --no-ifFORMAT, proceseazã text "
+"@ifnotFORMAT.\n"
+
+#: makeinfo/makeinfo.c:444
+msgid ""
+"  The defaults for the @if... conditionals depend on the output format:\n"
+"  if generating HTML, --ifhtml is on and the others are off;\n"
+"  if generating Info, --ifinfo is on and the others are off;\n"
+"  if generating plain text, --ifplaintext is on and the others are off;\n"
+"  if generating XML, --ifxml is on and the others are off.\n"
+msgstr ""
+"  Valori implicite pentru condiþionalele @if... depind de formatul de "
+"ieºire:\n"
+"  dacã generaþi HTML, --ifhtml este selectat iar restul sunt deselectate;\n"
+"  dacã generaþi, --ifinfo este selectat iar restul sunt deselectate;\n"
+"  dacã generaþi text simplu, --ifplaintext este selectat iar restul sunt "
+"deselectate;\n"
+
+#: makeinfo/makeinfo.c:452
+msgid ""
+"Examples:\n"
+"  makeinfo foo.texi                     write Info to foo's @setfilename\n"
+"  makeinfo --html foo.texi              write HTML to @setfilename\n"
+"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
+"  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
+"  makeinfo --no-headers foo.texi        write plain text to standard output\n"
+"\n"
+"  makeinfo --html --no-headers foo.texi write html without node lines, "
+"menus\n"
+"  makeinfo --number-sections foo.texi   write Info with numbered sections\n"
+"  makeinfo --no-split foo.texi          write one Info file however big\n"
+msgstr ""
+"Exemple:\n"
+"  makeinfo foo.texi                     scrie Info în @setfilename-ul lui "
+"foo\n"
+"  makeinfo --html foo.texi              scrie HTML în @setfilename\n"
+"  makeinfo --xml foo.texi               scrie Texinfo XML în @setfilename\n"
+"  makeinfo --docbook foo.texi           scrie DocBook XML în @setfilename\n"
+"  makeinfo --no-headers foo.texi        scrie text simplu la ieºirea "
+"standard\n"
+"\n"
+"  makeinfo --html --no-headers foo.texi scrie html fãrã linii de noduri, "
+"meniuri\n"
+"  makeinfo --number-sections foo.texi   scrie Info fãrã secþiuni numerotate\n"
+"  makeinfo --no-split foo.texi          scrie un singur fiºier Info "
+"indiferent cât de mare\n"
+
+#: makeinfo/makeinfo.c:603
+#, c-format
+msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
+msgstr "%s: Ignor valoare nerecunoscutã TEXINFO_OUTPUT_FORMAT `%s'.\n"
+
+#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
+#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
+#, c-format
+msgid "%s: %s arg must be numeric, not `%s'.\n"
+msgstr "%s: %s arg trebuie sã fie numeric, nu `%s'.\n"
+
+#: makeinfo/makeinfo.c:660
+#, c-format
+msgid "%s: could not open macro expansion output `%s'"
+msgstr "%s: nu am putut deschide ieºirea expansiunii macro-ului `%s'"
+
+#: makeinfo/makeinfo.c:665
+#, c-format
+msgid "%s: ignoring second macro expansion output `%s'.\n"
+msgstr "%s: nu am putut deschide ieºirea expansiunii macro-ului `%s'.\n"
+
+#: makeinfo/makeinfo.c:707
+#, c-format
+msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
+msgstr ""
+"%s: --paragraph-indent arg trebuie sã fie numeric/`none'/`asis', nu `%s'.\n"
+
+#: makeinfo/makeinfo.c:732
+#, c-format
+msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
+msgstr ""
+"%s: --footnote-style arg trebuie sã fie `separate' sau `end', nu `%s'.\n"
+
+#: makeinfo/makeinfo.c:806
+#, c-format
+msgid "%s: missing file argument.\n"
+msgstr "%s: lipseºte fiºierul argument.\n"
+
+#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#, c-format
+msgid "Multiline command %c%s used improperly"
+msgstr "Comandã pe multiple linii %c%s folositã incorect"
+
+#: makeinfo/makeinfo.c:1000
+#, c-format
+msgid "Expected `%s'"
+msgstr "Am aºteptat `%s'"
+
+#: makeinfo/makeinfo.c:1479
+#, c-format
+msgid "Can't create directory `%s': %s"
+msgstr "Nu pot crea directorul `%s': %s"
+
+#: makeinfo/makeinfo.c:1525
+#, c-format
+msgid "No `%s' found in `%s'"
+msgstr "Nici un `%s' nu a fost gãsit în `%s'"
+
+#: makeinfo/makeinfo.c:1605
+#, c-format
+msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
+msgstr ""
+"%s: Omite expasiunea macro la ieºire întrucât ieºirea Info merge acolo.\n"
+
+#: makeinfo/makeinfo.c:1638
+#, c-format
+msgid "Making %s file `%s' from `%s'.\n"
+msgstr "Creez fiºierul %s `%s' din `%s'.\n"
+
+#: makeinfo/makeinfo.c:1673
+#, c-format
+msgid "This is %s, produced by makeinfo version %s from %s.\n"
+msgstr "Acesta este %s, produs de makeinfo versiunea %s din %s.\n"
+
+#: makeinfo/makeinfo.c:1709
+#, c-format
+msgid ""
+"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
+msgstr ""
+"%s: ªterg fiºierul de ieºire macro `%s' din cauza erorilor; folosiþi --force "
+"pentru a-l pãstra.\n"
+
+#: makeinfo/makeinfo.c:1773
+#, c-format
+msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
+msgstr ""
+"%s: fiºierul de ieºire `%s' din cauza erorilor; folosiþi --force pentru a-l "
+"pãstra.\n"
+
+#: makeinfo/makeinfo.c:2034
+#, c-format
+msgid "Unknown command `%s'"
+msgstr "Comandã necunoscutã `%s'"
+
+#: makeinfo/makeinfo.c:2056
+#, c-format
+msgid "Use braces to give a command as an argument to @%s"
+msgstr "Folosiþi paranteze pentru a da o comandã ca argument lui @%s"
+
+#: makeinfo/makeinfo.c:2314
+#, c-format
+msgid "%c%s expected braces"
+msgstr "%c%s am aºteptat paranteze"
+
+#: makeinfo/makeinfo.c:2327
+msgid "Unmatched }"
+msgstr "} fãrã pereche"
+
+#: makeinfo/makeinfo.c:2375
+msgid "NO_NAME!"
+msgstr "NICI_UN_NUME!"
+
+#: makeinfo/makeinfo.c:2396
+#, c-format
+msgid "%c%s missing close brace"
+msgstr "%c%s lipseºte paranteza de închidere"
+
+#: makeinfo/makeinfo.c:3309
+#, c-format
+msgid "@image file `%s' (for HTML) not readable: %s"
+msgstr "Fiºierul @image `%s' (pentru HTML) nu poate fi citit: %s"
+
+#: makeinfo/makeinfo.c:3315
+#, c-format
+msgid "No such file `%s'"
+msgstr "Nici un fiºier `%s'"
+
+#: makeinfo/makeinfo.c:3447
+#, c-format
+msgid "@image file `%s' (for text) unreadable: %s"
+msgstr "Fiºierul @image `%s' (pentru text) nu poate fi citit: %s"
+
+#: makeinfo/makeinfo.c:3456
+msgid "@image missing filename argument"
+msgstr "@image lipseºte fiºierul argument."
+
+#: makeinfo/makeinfo.c:3675
+#, c-format
+msgid "undefined flag: %s"
+msgstr "marcaj nedefinit: %s"
+
+#: makeinfo/makeinfo.c:3676
+#, c-format
+msgid "{No value for `%s'}"
+msgstr "{Nici o valoare pentru `%s'}"
+
+#: makeinfo/makeinfo.c:3728
+#, c-format
+msgid "%c%s requires a name"
+msgstr "%c%s necesitã un nume"
+
+#: makeinfo/makeinfo.c:3834
+#, c-format
+msgid "Reached eof before matching @end %s"
+msgstr "Am ajuns la eof înainte de a potrivi @end %s"
+
+#: makeinfo/makeinfo.c:4082
+#, c-format
+msgid "`%.40s...' is too long for expansion; not expanded"
+msgstr "`%.40s...' este prea lung pentru expansiune; nu a fost expandat"
+
+#: makeinfo/multi.c:116
+msgid "Missing } in @multitable template"
+msgstr "} lipsã în ºablonul @multitable"
+
+#: makeinfo/multi.c:254
+#, c-format
+msgid "ignoring stray text `%s' after @multitable"
+msgstr "ignor text aiurea `%s' dupã @multitable"
+
+#: makeinfo/multi.c:393
+#, c-format
+msgid "Too many columns in multitable item (max %d)"
+msgstr "Prea multe coloane în articol multitabel (max %d)"
+
+#: makeinfo/multi.c:555
+#, c-format
+msgid "[unexpected] cannot select column #%d in multitable"
+msgstr "[neaºteptat] nu pot selecta coloana #%d în multitabel"
+
+#: makeinfo/multi.c:584
+msgid "ignoring @tab outside of multitable"
+msgstr "ignor @tab în afara multitabelului"
+
+#: makeinfo/multi.c:632
+#, c-format
+msgid "** Multicolumn output from last row:\n"
+msgstr "** Ieºirea multitabel din ultimul rând:\n"
+
+#: makeinfo/multi.c:635
+#, c-format
+msgid "* column #%d: output = %s\n"
+msgstr "* coloana #%d: ieºire = %s\n"
+
+#: makeinfo/node.c:280
+#, c-format
+msgid "Node `%s' previously defined at line %d"
+msgstr "Nodul `%s' definit anterior la linia %d"
+
+#: makeinfo/node.c:648
+#, c-format
+msgid "Formatting node %s...\n"
+msgstr "Formatez nodul %s...\n"
+
+#: makeinfo/node.c:716
+#, c-format
+msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
+msgstr "Nodul `%s' cere o comandã de secþionare (ex., %c%s)"
+
+#: makeinfo/node.c:879
+#, c-format
+msgid "No node name specified for `%c%s' command"
+msgstr "Nici un nume specificat pentru comanda `%c%s'"
+
+#: makeinfo/node.c:920 makeinfo/node.c:1151
+#, c-format
+msgid "Anchor `%s' and node `%s' map to the same file name"
+msgstr "Ancoraj `%s' ºi nodul `%s' aratã cãtre acelaºi nume de fiºier"
+
+#: makeinfo/node.c:923
+msgid "This @anchor command ignored; references to it will not work"
+msgstr ""
+"Aceastã comandã @anchor ignoratã; referinþele cãtre acesta nu vor merge"
+
+#: makeinfo/node.c:925 makeinfo/node.c:1154
+msgid "Rename this anchor or use the `--no-split' option"
+msgstr "Redenumeºte acest ancoraj sau foloseºte opþiunea `--no-split'"
+
+#: makeinfo/node.c:955
+#, c-format
+msgid "Unexpected string at end of split-HTML file `%s'"
+msgstr "ªir neaºteptat la sfârºitul fiºierului HTML spart `%s'"
+
+#: makeinfo/node.c:991
+msgid "Next:"
+msgstr "Urmãtor:"
+
+#: makeinfo/node.c:1007
+msgid "Previous:"
+msgstr "Precedent:"
+
+#: makeinfo/node.c:1021
+msgid "Up:"
+msgstr "Sus:"
+
+#: makeinfo/node.c:1148
+#, c-format
+msgid "Anchors `%s' and `%s' map to the same file name"
+msgstr "Ancoraj `%s' ºi `%s' aratã cãtre acelaºi nume de fiºier"
+
+#: makeinfo/node.c:1153
+msgid "@anchor command ignored; references to it will not work"
+msgstr "Comandã @anchor ignoratã; referinþele cãtre acesta nu vor merge"
+
+#: makeinfo/node.c:1347
+#, c-format
+msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
+msgstr ""
+"referinþa %s cãtre nodul inexistent `%s' (probabil secþionare incorectã?)"
+
+#: makeinfo/node.c:1363
+msgid "Menu"
+msgstr "Meniu"
+
+#: makeinfo/node.c:1365
+msgid "Cross"
+msgstr "Traverseazã"
+
+#: makeinfo/node.c:1447
+#, c-format
+msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
+msgstr ""
+"Urmãtorul câmp de nod `%s' nu este referit (probabil secþionare incorectã?)"
+
+#: makeinfo/node.c:1450
+#, c-format
+msgid "This node (%s) has the bad Prev"
+msgstr "Acest nod (%s) are un Prec incorect"
+
+#: makeinfo/node.c:1462
+msgid "Prev"
+msgstr "Prec"
+
+#: makeinfo/node.c:1505
+#, c-format
+msgid "Prev field of node `%s' not pointed to"
+msgstr "Câmpul Prec al nodului `%s' nu este referit"
+
+#: makeinfo/node.c:1509
+#, c-format
+msgid "This node (%s) has the bad Next"
+msgstr "Acest nod (%s) are referinþa Urmãtor incorectã"
+
+#: makeinfo/node.c:1521
+#, c-format
+msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
+msgstr "`%s' nu are nici un câmp Sus (probabil secþionare incorectã?)"
+
+#: makeinfo/node.c:1524
+msgid "Up"
+msgstr "Sus"
+
+#: makeinfo/node.c:1590
+#, c-format
+msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
+msgstr "Nodului `%s' îi lipseºte articolul pentru `%s' deºi îi este þinta Sus"
+
+#: makeinfo/node.c:1619
+#, c-format
+msgid "node `%s' has been referenced %d times"
+msgstr "nodul `%s' a fost referit de %d ori"
+
+#: makeinfo/node.c:1633
+#, c-format
+msgid "unreferenced node `%s'"
+msgstr "nod nereferit `%s'"
+
+#: makeinfo/node.c:1723
+#, c-format
+msgid "Removing %s\n"
+msgstr "ªterg %s\n"
+
+#: makeinfo/node.c:1727
+#, c-format
+msgid "Can't remove file `%s': %s"
+msgstr "Nu pot ºterge fisierul `%s': %s"
+
+#: makeinfo/sectioning.c:122
+#, c-format
+msgid "Appendix %c"
+msgstr "Anexã %c"
+
+#: makeinfo/sectioning.c:467
+#, c-format
+msgid "Internal error (search_sectioning) `%s'!"
+msgstr "Eroare internã (search_sectioning) `%s'!"
+
+#: makeinfo/sectioning.c:562
+#, c-format
+msgid "Internal error (search_sectioning) \"%s\"!"
+msgstr "Eroare internã (search_sectioning) \"%s\"!"
+
+#: makeinfo/sectioning.c:623
+#, c-format
+msgid "%c%s is obsolete; use %c%s instead"
+msgstr "%c%s este depãºitã; foloseºte %c%s în schimb"
+
+#: makeinfo/sectioning.c:639
+#, c-format
+msgid "Node with %ctop as a section already exists"
+msgstr "Nodul cu %ctop ca ºi secþiune existã deja"
+
+#: makeinfo/sectioning.c:647
+#, c-format
+msgid "Here is the %ctop node"
+msgstr "Aici este nodul %ctop"
+
+#: makeinfo/sectioning.c:663
+#, c-format
+msgid "%ctop used before %cnode, defaulting to %s"
+msgstr "%ctop folosit înaintea lui %cnode, implicit cãtre %s"
+
+#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
+msgid "Table of Contents"
+msgstr "Cuprins"
+
+#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
+msgid "Short Contents"
+msgstr "Rezumate"
+
+#: makeinfo/xml.c:1605
+#, c-format
+msgid "@image file `%s' unreadable: %s"
+msgstr "Fiºierul @image `%s' nu poate fi citit: %s"
+
+#: makeinfo/xml.c:2097
+msgid ""
+"@headitem as the last item of @multitable produces invalid Docbook documents"
+msgstr ""
+"@headitem ca ultimul articol din @multitable produce documenteDocbook "
+"invalide"
+
+#: util/install-info.c:154
+#, c-format
+msgid "%s: warning: "
+msgstr "%s: avertisment: "
+
+#: util/install-info.c:203
+#, c-format
+msgid " for %s"
+msgstr " pentru %s"
+
+#: util/install-info.c:426
+#, c-format
+msgid "\tTry `%s --help' for a complete list of options.\n"
+msgstr "\tÎncercaþi `%s --help' pentru o lipsã completã de opþiuni.\n"
+
+#: util/install-info.c:434
+#, c-format
+msgid ""
+"Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+"\n"
+"Install or delete dir entries from INFO-FILE in the Info directory file\n"
+"DIR-FILE.\n"
+"\n"
+"Options:\n"
+" --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
+"                     don't insert any new entries.\n"
+" --dir-file=NAME   specify file name of Info directory file.\n"
+"                     This is equivalent to using the DIR-FILE argument.\n"
+" --entry=TEXT      insert TEXT as an Info directory entry.\n"
+"                     TEXT should have the form of an Info menu item line\n"
+"                     plus zero or more extra lines starting with "
+"whitespace.\n"
+"                     If you specify more than one entry, they are all "
+"added.\n"
+"                     If you don't specify any entries, they are determined\n"
+"                     from information in the Info file itself.\n"
+" --help            display this help and exit.\n"
+" --info-file=FILE  specify Info file to install in the directory.\n"
+"                     This is equivalent to using the INFO-FILE argument.\n"
+" --info-dir=DIR    same as --dir-file=DIR/dir.\n"
+" --item=TEXT       same as --entry TEXT.\n"
+"                     An Info directory entry is actually a menu item.\n"
+" --quiet           suppress warnings.\n"
+" --remove          same as --delete.\n"
+" --section=SEC     put this file's entries in section SEC of the directory.\n"
+"                     If you specify more than one section, all the entries\n"
+"                     are added in each of the sections.\n"
+"                     If you don't specify any sections, they are determined\n"
+"                     from information in the Info file itself.\n"
+" --version         display version information and exit.\n"
+msgstr ""
+"Usage: %s [OPÞIUNE]... [FIªIER-INFO [FIªIER-DIR]]\n"
+"\n"
+"Instaleazã sau ºterge intrãri dir din FIªIER-INFO în fiºier director Info \n"
+"FIªIER-DIR.\n"
+"\n"
+"Opþiuni:\n"
+" --delete          ºterge intrãri existente pentru FIªIER-INFO din FIªIER-"
+"DIR;\n"
+"                     nu insera nici o nouã intrare.\n"
+" --dir-file=NUME   specificã nume fiºier pentru fiºierul director Info.\n"
+"                     This is equivalent to using the DIR-FILE argument.\n"
+" --entry=TEXT      insereazã TEXT ca o intrare de director Info.\n"
+"                     TEXT ar trebui sã aibã forma unei linii articol meniu "
+"Info \n"
+"                     plus zero sau mai multe extra linii începând cu "
+"spaþiu.\n"
+"                     Dacã precizaþi mai mult de o intrare, toate sunt "
+"adãugate.\n"
+"                     Dacã nu precizaþi nici o intrare, ele sunt determinate\n"
+"                     din informaþiile din fiºierul Info.\n"
+" --help            afiºeazã acest mesaj ºi terminã.\n"
+" --info-file=FIªIER  specificã fiºierul Info de instalat în director.\n"
+"                     Acesta este echivalent cu folosirea argumentului FIªIER-"
+"INFO.\n"
+" --info-dir=DIR    acelaºi efect ca --dir-file=DIR/dir.\n"
+" --item=TEXT       acelaºi efect ca --entry TEXT.\n"
+"                     O intrare director Info este de fapt un articol de "
+"meniu.\n"
+" --quiet           suprimã avertismentele.\n"
+" --remove          acelaºi efect ca --delete.\n"
+" --section=SEC     pune intrãrile acestui fiºier în secþiunea SEC, toate\n"
+"                     intrãrile sunt adãugate în fiecare dintre secþiuni.\n"
+"                     Dacã nu specificaþi nici o secþiune, acestea sunt\n"
+"                     determinate din informaþiile din fiºierul Info.\n"
+" --version         afiºeazã informaþii depre versiune ºi terminã.\n"
+
+#: util/install-info.c:488
+#, c-format
+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"
+"%s\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"
+"  \"h\" gives a primer for first-timers,\n"
+"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+"\n"
+"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
+"  to select it.\n"
+"\n"
+"%s\n"
+msgstr ""
+"Acesta este fiºierul .../info/dir, care conþine nodul\n"
+"cel mai de sus din ierarhia Info, numit (dir)Top.\n"
+"Prima datã când porniþi Info veþi vedea acest nod.\n"
+"\n"
+"%s\tAcesta este vârful arborelui INFO\n"
+"\n"
+"  Acesta (nodul Director) furnizeazã un meniu cu subiecte majore.\n"
+"  Apãsând \"q\" terminã, \"?\" enumerã toate comenzile Info, \"d\" vã aduce "
+"aici,\n"
+"  \"h\" furnizeazã un tutorial pentru începãtori,\n"
+"  \"mEmacs<Return>\" viziteazã manualul Emacs, etc.\n"
+"\n"
+"  În Emacs, puteþi face clic cu butonul 2 al mausului pe un articol de "
+"meniu\n"
+"  sau o referinþã pentru a o selecta.\n"
+"\n"
+"%s\n"
+
+#: util/install-info.c:513
+#, c-format
+msgid "%s: could not read (%s) and could not create (%s)\n"
+msgstr "%s: nu am putut citi (%s) ºi nu am putut crea (%s)\n"
+
+#: util/install-info.c:600
+#, c-format
+msgid "%s: empty file"
+msgstr "%s: fiºier gol"
+
+#: util/install-info.c:913 util/install-info.c:953
+msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
+msgstr "START-INFO-DIR-ENTRY fãrã un END-INFO-DIR-ENTRY corespunzãtor"
+
+#: util/install-info.c:948
+msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+msgstr "END-INFO-DIR-ENTRY fãrã un  START-INFO-DIR-ENTRY corespunzãtor"
+
+#: util/install-info.c:1191 util/install-info.c:1201
+#, c-format
+msgid "%s: already have dir file: %s\n"
+msgstr "%s: are deja fiºier dir: %s\n"
+
+#: util/install-info.c:1236
+#, c-format
+msgid "%s: Specify the Info file only once.\n"
+msgstr "%s: Specificã fiºierul Info o singurã datã.\n"
+
+#: util/install-info.c:1284
+#, c-format
+msgid "excess command line argument `%s'"
+msgstr "argument suplimentar în linia de comandã `%s'"
+
+#: util/install-info.c:1288
+msgid "No input file specified; try --help for more information."
+msgstr ""
+"Nici un fiºier de intrare specificat; încercaþi --help pentru informaþii "
+"suplimentare."
+
+#: util/install-info.c:1291
+msgid "No dir file specified; try --help for more information."
+msgstr ""
+"Nici un fiºier dir specificat; încercaþi --help pentru informaþii "
+"suplimentare."
+
+#: util/install-info.c:1313
+#, c-format
+msgid "no info dir entry in `%s'"
+msgstr "nici o intrare dir info în `%s'"
+
+#: util/install-info.c:1426
+#, c-format
+msgid "menu item `%s' already exists, for file `%s'"
+msgstr "articol meniu `%s' existã deja, pentru fiºier `%s'"
+
+#: util/install-info.c:1449
+#, c-format
+msgid "no entries found for `%s'; nothing deleted"
+msgstr "nici o intrare gãsitã pentru `%s'; n-am ºters nimic"
+
+#: util/texindex.c:252
+msgid "display this help and exit"
+msgstr "afiºeazã acest mesaj ºi terminã"
+
+#: util/texindex.c:254
+msgid "keep temporary files around after processing"
+msgstr "pãstreazã fiºierele temporare dupã procesare"
+
+#: util/texindex.c:256
+msgid "do not keep temporary files around after processing (default)"
+msgstr "nu pãstra fiºierele temporare dupã procesare (implicit)"
+
+#: util/texindex.c:258
+msgid "send output to FILE"
+msgstr "trimite ieºire în FIªIER"
+
+#: util/texindex.c:260
+msgid "display version information and exit"
+msgstr "afiºeazã informaþii despre versiune ºi terminã"
+
+#: util/texindex.c:270
+#, c-format
+msgid "Usage: %s [OPTION]... FILE...\n"
+msgstr "Folosire: %s [OPÞIUNI]... FIªIER...\n"
+
+#: util/texindex.c:271
+#, c-format
+msgid "Generate a sorted index for each TeX output FILE.\n"
+msgstr "Genereazã un index sortat pentru fiecare FIªIER de ieºire TeX.\n"
+
+#: util/texindex.c:274
+#, c-format
+msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
+msgstr ""
+"De obicei FIªIER... este specificat ca `foo.%c%c' pentru un document 'foo."
+"texi'.\n"
+
+#: util/texindex.c:276
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"Opþiuni:\n"
+
+#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
+#: util/texindex.c:1011
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: nu este un fiºier index texinfo"
+
+#: util/texindex.c:968
+#, c-format
+msgid "failure reopening %s"
+msgstr "am eºuat sã redeschid %s"
+
+#: util/texindex.c:1218
+#, c-format
+msgid "No page number in %s"
+msgstr "Nici un numãr de paginã în %s"
+
+#: util/texindex.c:1291
+#, c-format
+msgid "entry %s follows an entry with a secondary name"
+msgstr "intrarea %s urmeazã o intrare cu nume secundar"
+
+#~ msgid "%s: Specify the Info directory only once.\n"
+#~ msgstr "%s: Specificã directorul Info o singurã datã.\n"
diff --git a/gnu/usr.bin/texinfo/po/ru.gmo b/gnu/usr.bin/texinfo/po/ru.gmo
index a7514c84bc5..04eba1eaeea 100644
--- a/gnu/usr.bin/texinfo/po/ru.gmo
+++ b/gnu/usr.bin/texinfo/po/ru.gmo
diff --git a/gnu/usr.bin/texinfo/po/ru.po b/gnu/usr.bin/texinfo/po/ru.po
index e70f43db9ba..b245a565d08 100644
--- a/gnu/usr.bin/texinfo/po/ru.po
+++ b/gnu/usr.bin/texinfo/po/ru.po
@@ -1,144 +1,145 @@
 # ðÅÒÅ×ÏÄÙ ÓÏÏÂÝÅÎÉÊ ÄÌÑ GNU Texinfo.
 # Copyright (C) 1999 Free Software Foundation, Inc.
-# Oleg S. Tihonov <ost@tatnipi.ru>, 1999, 2001, 2002
+# Oleg S. Tihonov <ost@tatnipi.ru>, 1999, 2001, 2002, 2003, 2004
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: texinfo 4.1c\n"
-"POT-Creation-Date: 2002-04-01 06:10-0800\n"
-"PO-Revision-Date: 2002-03-26 08:35+0300\n"
-"Last-Translator: Oleg S. Tihonov <tihonov@ffke-campus.mipt.ru>\n"
+"Project-Id-Version: texinfo 4.7.92\n"
+"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
+"POT-Creation-Date: 2004-12-21 16:20-0800\n"
+"PO-Revision-Date: 2004-12-16 08:19+0300\n"
+"Last-Translator: Oleg S. Tihonov <ost@tatnipi.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: info/echo-area.c:283 info/session.c:712
+#: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr "óÍÅÓÔÉÔØÓÑ ÎÁ ÓÉÍ×ÏÌ ×ÐÅÒÅÄ"
 
-#: info/echo-area.c:295 info/session.c:728
+#: info/echo-area.c:296 info/session.c:705
 msgid "Move backward a character"
 msgstr "óÍÅÓÔÉÔØÓÑ ÎÁ ÓÉÍ×ÏÌ ÎÁÚÁÄ"
 
-#: info/echo-area.c:307
+#: info/echo-area.c:308
 msgid "Move to the start of this line"
 msgstr "óÍÅÓÔÉÔØÓÑ × ÎÁÞÁÌÏ ÓÔÒÏËÉ"
 
-#: info/echo-area.c:312
+#: info/echo-area.c:313
 msgid "Move to the end of this line"
 msgstr "óÍÅÓÔÉÔØÓÑ × ËÏÎÅÃ ÓÔÒÏËÉ"
 
-#: info/echo-area.c:320 info/session.c:746
+#: info/echo-area.c:321 info/session.c:723
 msgid "Move forward a word"
 msgstr "óÍÅÓÔÉÔØÓÑ ÎÁ ÓÌÏ×Ï ×ÐÅÒÅÄ"
 
-#: info/echo-area.c:360 info/session.c:795
+#: info/echo-area.c:361 info/session.c:772
 msgid "Move backward a word"
 msgstr "óÍÅÓÔÉÔØÓÑ ÎÁ ÓÌÏ×Ï ÎÁÚÁÄ"
 
-#: info/echo-area.c:400
+#: info/echo-area.c:401
 msgid "Delete the character under the cursor"
 msgstr "õÄÁÌÉÔØ ÓÌÅÄÕÀÝÉÊ ÓÉÍ×ÏÌ"
 
-#: info/echo-area.c:430
+#: info/echo-area.c:431
 msgid "Delete the character behind the cursor"
 msgstr "õÄÁÌÉÔØ ÐÒÅÄÙÄÕÝÉÊ ÓÉÍ×ÏÌ"
 
-#: info/echo-area.c:451
+#: info/echo-area.c:452
 msgid "Cancel or quit operation"
 msgstr "ïÔÍÅÎÉÔØ ÉÌÉ ÐÒÅÒ×ÁÔØ ÄÅÊÓÔ×ÉÅ"
 
-#: info/echo-area.c:466
+#: info/echo-area.c:467
 msgid "Accept (or force completion of) this line"
 msgstr "ðÒÉÎÑÔØ (ÉÌÉ ÚÁ×ÅÒÛÉÔØ) ÔÅËÕÝÕÀ ÓÔÒÏËÕ"
 
-#: info/echo-area.c:471
+#: info/echo-area.c:472
 msgid "Insert next character verbatim"
 msgstr "÷ÓÔÁ×ÉÔØ ÓÌÅÄÕÀÝÉÊ ÓÉÍ×ÏÌ \"ËÁË ÅÓÔØ\""
 
-#: info/echo-area.c:479
+#: info/echo-area.c:480
 msgid "Insert this character"
 msgstr "÷ÓÔÁ×ÉÔØ ÜÔÏÔ ÓÉÍ×ÏÌ"
 
-#: info/echo-area.c:497
+#: info/echo-area.c:498
 msgid "Insert a TAB character"
 msgstr "÷ÓÔÁ×ÉÔØ ÓÉÍ×ÏÌ ÔÁÂÕÌÑÃÉÉ"
 
-#: info/echo-area.c:504
+#: info/echo-area.c:505
 msgid "Transpose characters at point"
 msgstr "ðÅÒÅÓÔÁ×ÉÔØ ÓÉÍ×ÏÌÙ ×ÏËÒÕÇ ÔÏÞËÉ"
 
-#: info/echo-area.c:555
+#: info/echo-area.c:556
 msgid "Yank back the contents of the last kill"
 msgstr "÷ÏÓÓÔÁÎÏ×ÉÔØ ÐÏÓÌÅÄÎÉÊ ÕÎÉÞÔÏÖÅÎÎÙÊ ÔÅËÓÔ"
 
-#: info/echo-area.c:562
+#: info/echo-area.c:563
 msgid "Kill ring is empty"
 msgstr "ëÏÌØÃÏ ÕÎÉÞÔÏÖÅÎÉÊ ÐÕÓÔÏ"
 
-#: info/echo-area.c:575
+#: info/echo-area.c:576
 msgid "Yank back a previous kill"
 msgstr "÷ÏÓÓÔÁÎÏ×ÉÔØ ÐÒÅÄÛÅÓÔ×ÕÀÝÉÊ ÕÎÉÞÔÏÖÅÎÎÙÊ ÔÅËÓÔ"
 
-#: info/echo-area.c:608
+#: info/echo-area.c:609
 msgid "Kill to the end of the line"
 msgstr "õÎÉÞÔÏÖÉÔØ ÔÅËÓÔ ÄÏ ËÏÎÃÁ ÓÔÒÏËÉ"
 
-#: info/echo-area.c:621
+#: info/echo-area.c:622
 msgid "Kill to the beginning of the line"
 msgstr "õÎÉÞÔÏÖÉÔØ ÔÅËÓÔ ÄÏ ÎÁÞÁÌÁ ÓÔÒÏËÉ"
 
-#: info/echo-area.c:633
+#: info/echo-area.c:634
 msgid "Kill the word following the cursor"
 msgstr "õÎÉÞÔÏÖÉÔØ ÓÌÅÄÕÀÝÅÅ ÓÌÏ×Ï"
 
-#: info/echo-area.c:652
+#: info/echo-area.c:653
 msgid "Kill the word preceding the cursor"
 msgstr "õÎÉÞÔÏÖÉÔØ ÐÒÅÄÙÄÕÝÅÅ ÓÌÏ×Ï"
 
-#: info/echo-area.c:872 info/echo-area.c:932
+#: info/echo-area.c:868 info/echo-area.c:924
 msgid "No completions"
 msgstr "úÁ×ÅÒÛÅÎÉÊ ÎÅÔ"
 
-#: info/echo-area.c:874
+#: info/echo-area.c:870
 msgid "Not complete"
 msgstr "îÅ ÚÁ×ÅÒÛÅÎÏ"
 
-#: info/echo-area.c:919
+#: info/echo-area.c:911
 msgid "List possible completions"
 msgstr "ðÏËÁÚÁÔØ ×ÏÚÍÏÖÎÙÅ ÚÁ×ÅÒÛÅÎÉÑ"
 
-#: info/echo-area.c:936
+#: info/echo-area.c:928
 msgid "Sole completion"
 msgstr "åÄÉÎÓÔ×ÅÎÎÏÅ ÚÁ×ÅÒÛÅÎÉÅ"
 
-#: info/echo-area.c:945
+#: info/echo-area.c:937
 msgid "One completion:\n"
 msgstr "åÄÉÎÓÔ×ÅÎÎÏÅ ÚÁ×ÅÒÛÅÎÉÅ:\n"
 
-#: info/echo-area.c:946
+#: info/echo-area.c:938
 #, c-format
 msgid "%d completions:\n"
 msgstr "úÁ×ÅÒÛÅÎÉÊ: %d :\n"
 
-#: info/echo-area.c:1092
+#: info/echo-area.c:1085
 msgid "Insert completion"
 msgstr "÷ÓÔÁ×ÉÔØ ÚÁ×ÅÒÛÅÎÉÅ"
 
-#: info/echo-area.c:1225
+#: info/echo-area.c:1220
 msgid "Building completions..."
 msgstr "óÏÓÔÁ×ÌÅÎÉÅ ÚÁ×ÅÒÛÅÎÉÊ..."
 
-#: info/echo-area.c:1342
+#: info/echo-area.c:1340
 msgid "Scroll the completions window"
 msgstr "ðÒÏËÒÕÔÉÔØ ÏËÎÏ ÚÁ×ÅÒÛÅÎÉÊ"
 
-#: info/footnotes.c:212
+#: info/footnotes.c:213
 msgid "Footnotes could not be displayed"
 msgstr "óÎÏÓËÉ ÎÅ ÍÏÇÕÔ ÂÙÔØ ÐÏËÁÚÁÎÙ"
 
-#: info/footnotes.c:238
+#: info/footnotes.c:239
 msgid "Show the footnotes associated with this node in another window"
 msgstr "ðÏËÁÚÁÔØ ÓÎÏÓËÉ, Ó×ÑÚÁÎÎÙÅ Ó ÜÔÏÊ ÎÏÄÏÊ, × ÄÒÕÇÏÍ ÏËÎÅ"
 
@@ -146,117 +147,115 @@ msgstr "ðÏËÁÚÁÔØ ÓÎÏÓËÉ, Ó×ÑÚÁÎÎÙÅ Ó ÜÔÏÊ ÎÏÄÏÊ, × ÄÒÕÇÏÍ ÏËÎÅ"
 msgid "---------- Footnotes ----------"
 msgstr "----------   óÎÏÓËÉ  ----------"
 
-#: info/indices.c:175
+#: info/indices.c:172
 msgid "Look up a string in the index for this file"
 msgstr "îÁÊÔÉ ÓÔÒÏËÕ × ÁÌÆÁ×ÉÔÎÏÍ ÕËÁÚÁÔÅÌÅ ÄÌÑ ÄÁÎÎÏÇÏ ÆÁÊÌÁ"
 
-#: info/indices.c:205
+#: info/indices.c:199
 msgid "Finding index entries..."
 msgstr "ðÏÉÓË  × ÁÌÆÁ×ÉÔÎÏÍ ÕËÁÚÁÔÅÌÅ..."
 
-#: info/indices.c:212
+#: info/indices.c:207
 msgid "No indices found."
 msgstr "îÅ ÎÁÊÄÅÎ ÁÌÆÁ×ÉÔÎÙÊ ÕËÁÚÁÔÅÌØ."
 
-#: info/indices.c:222
+#: info/indices.c:217
 msgid "Index entry: "
 msgstr "ðÕÎËÔ × ÁÌÆÁ×ÉÔÎÏÍ ÕËÁÚÁÔÅÌÅ: "
 
-#: info/indices.c:332
+#: info/indices.c:325
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr ""
 "ðÅÒÅÊÔÉ Ë ÓÌÅÄÕÀÝÅÍÕ ÐÕÎËÔÕ ÁÌÆÁ×ÉÔÎÏÇÏ ÕËÁÚÁÔÅÌÑ, ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÍÕ\n"
 "ÐÏÓÌÅÄÎÅÊ ËÏÍÁÎÄÅ `\\[index-search]'"
 
-#: info/indices.c:342
+#: info/indices.c:335
 msgid "No previous index search string."
 msgstr "óÔÒÏËÁ ÐÏÉÓËÁ × ÁÌÆÁ×ÉÔÎÏÍ ÕËÁÚÁÔÅÌÅ ÎÅ ÂÙÌÁ ÒÁÎØÛÅ ÚÁÄÁÎÁ."
 
-#: info/indices.c:349
+#: info/indices.c:342
 msgid "No index entries."
 msgstr "îÅ ÎÁÊÄÅÎ ÁÌÆÁ×ÉÔÎÙÊ ÕËÁÚÁÔÅÌØ."
 
-#: info/indices.c:382
+#: info/indices.c:375
 #, c-format
-msgid "No %sindex entries containing \"%s\"."
-msgstr "÷ ÁÌÆÁ×ÉÔÎÏÍ ÕËÁÚÁÔÅÌÅ %sÎÅ ÎÁÊÄÅÎÏ ÐÕÎËÔÏ×, ÓÏÄÅÒÖÁÝÉÈ \"%s\"."
+msgid "No %sindex entries containing `%s'."
+msgstr "÷ ÁÌÆÁ×ÉÔÎÏÍ ÕËÁÚÁÔÅÌÅ %s ÎÅ ÎÁÊÄÅÎÏ ÐÕÎËÔÏ×, ÓÏÄÅÒÖÁÝÉÈ `%s'."
 
-#: info/indices.c:383
+#: info/indices.c:376
 msgid "more "
 msgstr "ÂÏÌØÛÅ "
 
-#: info/indices.c:393
+#: info/indices.c:386
 msgid "CAN'T SEE THIS"
 msgstr "üÔÏ ÎÅ×ÉÄÉÍÙÊ ÔÅËÓÔ!"
 
-#: info/indices.c:429
+#: info/indices.c:422
 #, c-format
-msgid "Found \"%s\" in %s. (`\\[next-index-match]' tries to find next.)"
+msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
 msgstr ""
-"îÁÊÄÅÎÁ \"%s\" × %s. (`\\[next-index-match]' ÚÁÐÕÓËÁÅÔ ÐÏ×ÔÏÒÎÙÊ ÐÏÉÓË.)"
+"îÁÊÄÅÎÁ `%s' × %s. (`\\[next-index-match]' ÎÁÈÏÄÉÔ ÓÌÅÄÕÀÝÅÅ ÓÏ×ÐÁÄÅÎÉÅ.)"
 
-#: info/indices.c:549
+#: info/indices.c:541
 #, c-format
-msgid "Scanning indices of \"%s\"..."
-msgstr "ðÏÉÓË × ÁÌÆÁ×ÉÔÎÏÍ ÕËÁÚÁÔÅÌÅ ÆÁÊÌÁ \"%s\"..."
+msgid "Scanning indices of `%s'..."
+msgstr "ðÏÉÓË × ÁÌÆÁ×ÉÔÎÏÍ ÕËÁÚÁÔÅÌÅ ÆÁÊÌÁ `%s'..."
 
-#: info/indices.c:603
+#: info/indices.c:596
 #, c-format
-msgid "No available info files have \"%s\" in their indices."
-msgstr ""
-"îÉ ÏÄÉÎ ÉÚ info-ÆÁÊÌÏ× ÎÅ ÓÏÄÅÒÖÉÔ \"%s\" × Ó×ÏÉÈ ÁÌÆÁ×ÉÔÎÙÈ ÕËÁÚÁÔÅÌÑÈ."
+msgid "No available info files have `%s' in their indices."
+msgstr "îÉ ÏÄÉÎ ÉÚ info-ÆÁÊÌÏ× ÎÅ ÓÏÄÅÒÖÉÔ `%s' × ÁÌÆÁ×ÉÔÎÙÈ ÕËÁÚÁÔÅÌÑÈ."
 
-#: info/indices.c:632
+#: info/indices.c:622
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr ""
 "úÁÐÕÓËÁÅÔ ÐÏÉÓË ÓÔÒÏËÉ × ÁÌÆÁ×ÉÔÎÙÈ ÕËÁÚÁÔÅÌÑÈ ×ÓÅÈ Info-ÆÁÊÌÏ× É ÓÏÚÄÁÅÔ "
 "ÍÅÎÀ"
 
-#: info/indices.c:636
+#: info/indices.c:626
 msgid "Index apropos: "
 msgstr "ëÌÀÞÅ×ÏÅ ÓÌÏ×Ï ÄÌÑ ÐÏÉÓËÁ: "
 
-#: info/indices.c:666
+#: info/indices.c:654
 #, c-format
 msgid ""
 "\n"
-"* Menu: Nodes whoses indices contain \"%s\":\n"
+"* Menu: Nodes whose indices contain `%s':\n"
 msgstr ""
 "\n"
-"* Menu: îÏÄÙ, ÞØÉ ÁÌÆÁ×ÉÔÎÙÅ ÕËÁÚÁÔÅÌÉ ÓÏÄÅÒÖÁÔ \"%s\":\n"
+"* Menu: îÏÄÙ, ÞØÉ ÁÌÆÁ×ÉÔÎÙÅ ÕËÁÚÁÔÅÌÉ ÓÏÄÅÒÖÁÔ `%s':\n"
 
-#: info/info.c:260 info/infokey.c:884
+#: info/info.c:275 info/infokey.c:899
+#, c-format
 msgid "Try --help for more information.\n"
 msgstr "ðÏÐÒÏÂÕÊÔÅ --help ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ.\n"
 
-#: info/info.c:279 info/infokey.c:139 makeinfo/makeinfo.c:689
-#: util/install-info.c:1224 util/texindex.c:338
+#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
+#: util/texindex.c:343
 #, 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 (C) %s Free Software Foundation, Inc.\n"
 "íÙ îå ÐÒÅÄÏÓÔÁ×ÌÑÅÍ ÇÁÒÁÎÔÉÊ.  ÷Ù ÍÏÖÅÔÅ ÒÁÓÐÒÏÓÔÒÁÎÑÔØ ÜÔÉ ÐÒÏÇÒÁÍÍÙ, ÐÒÉ\n"
 "ÓÏÂÌÀÄÅÎÉÉ ÕÓÌÏ×ÉÊ õÎÉ×ÅÒÓÁÌØÎÏÊ ïÂÝÅÓÔ×ÅÎÎÏÊ ìÉÃÅÎÚÉÉ GNU.\n"
 "äÌÑ ÐÏÌÕÞÅÎÉÑ ÐÏÄÒÏÂÎÏÊ ÉÎÆÏÒÍÁÃÉÉ Ï ×ÏÚÍÏÖÎÏÓÔÉ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÑ ÓÍÏÔÒÉÔÅ\n"
 "ÆÁÊÌ COPYING.\n"
 
-#: info/info.c:462
+#: info/info.c:498
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "ÄÌÑ `%s' ÎÅ ÎÁÊÄÅÎÏ ×ÈÏÖÄÅÎÉÊ × ÉÍÅÎÎÏÍ ÕËÁÚÁÔÅÌÅ\n"
 
-#: info/info.c:555
+#: info/info.c:590
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
 msgstr ""
 "  -b, --speech-friendly       ×Ù×ÏÄÉÔØ × ÆÏÒÍÁÔÅ, ÕÄÏÂÎÏÍ ÄÌÑ ÓÉÎÔÅÚÁÔÏÒÏ× "
 "ÒÅÞÉ.\n"
 
-#: info/info.c:562
+#: info/info.c:597
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -273,10 +272,12 @@ msgid ""
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
 "  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
-"  -R, --raw-escapes            don't remove ANSI escapes from man pages.\n"
+"  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+"      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
 "  -O, --show-options, --usage  go to command-line options node.\n"
 "%s      --subnodes               recursively output menu items.\n"
+"  -w, --where, --location      print physical location of Info file.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
 "\n"
@@ -302,15 +303,17 @@ msgstr ""
 "                          ×ÓÅÈ ÒÕËÏ×ÏÄÓÔ×.\n"
 "  -d, --directory=ëáôáìïç ÄÏÂÁ×ÉÔØ ëáôáìïç Ë INFOPATH.\n"
 "      --dribble=æáêì      ÚÁÐÉÓÁÔØ ××ÏÄÉÍÙÅ ÐÏÌØÚÏ×ÁÔÅÌÅÍ ÚÎÁËÉ × æáêì.\n"
-"  -f, --file=æáêì         ÐÒÏÓÍÏÔÒÅÔØ ÚÁÄÁÎÎÙÊ æáêì.\n"
+"  -f, --file=æáêì         ÐÏËÁÚÁÔØ ÚÁÄÁÎÎÙÊ æáêì.\n"
 "  -h, --help              ÐÏËÁÚÁÔØ ÜÔÕ ÓÐÒÁ×ËÕ É ×ÙÊÔÉ.\n"
 "      --index-search=óôòïëá    ÐÅÒÅÊÔÉ Ë ÎÏÄÅ, ÎÁ ËÏÔÏÒÕÀ ÓÓÙÌÁÅÔÓÑ "
 "ÚÁÄÁÎÎÏÅ\n"
 "                          óôòïëïê ×ÈÏÖÄÅÎÉÅ ÉÍÅÎÎÏÇÏ ÕËÁÚÁÔÅÌÑ.\n"
 "  -n, --node=îïäá         ÎÁÞÁÔØ ÐÒÏÓÍÏÔÒ Ó ÚÁÄÁÎÎÏÊ îïäù.\n"
 "  -o, --output=æáêì       ÚÁÐÉÓÁÔØ ×ÙÂÒÁÎÎÙÅ ÎÏÄÙ × æáêì.\n"
-"  -R, --raw-escapes       ÎÅ ÕÄÁÌÑÔØ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔÉ ÉÚ ÓÔÒÁÎÉà "
-"man.\n"
+"  -R, --raw-escapes       ×Ù×ÏÄÉÔØ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔÉ ANSI (ÐÏ "
+"ÕÍÏÌÞÁÎÉÀ).\n"
+"      --no-raw-escapes    ×Ù×ÏÄÉÔØ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔÉ ËÁË ÂÕË×ÁÌØÎÙÊ "
+"ÔÅËÓÔ.\n"
 "      --restore=æáêì      ÐÒÏÞÉÔÁÔØ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ÎÁÖÁÔÙÈ ËÌÁ×ÉÛ ÉÚ "
 "æáêìá.\n"
 "  -O, --show-options, --usage ÐÅÒÅÊÔÉ Ë ÎÏÄÅ, ÏÐÉÓÙ×ÁÀÝÅÊ ËÌÀÞÉ ËÏÍÁÎÄÎÏÊ "
@@ -333,8 +336,8 @@ msgstr ""
 "  info --show-options emacs  ÎÁÞÁÔØ Ó ÎÏÄÙ, ÏÐÉÓÙ×ÁÀÝÅÊ ËÌÀÞÉ emacs\n"
 "  info -f ./foo.info         ÐÏËÁÚÁÔØ ÆÁÊÌ ./foo.info, ÎÅ ÉÓËÁÔØ dir\n"
 
-#: info/info.c:598 info/infokey.c:903 makeinfo/makeinfo.c:474
-#: util/install-info.c:421 util/texindex.c:286
+#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
+#: util/install-info.c:466 util/texindex.c:292
 msgid ""
 "\n"
 "Email bug reports to bug-texinfo@gnu.org,\n"
@@ -346,78 +349,78 @@ msgstr ""
 "ÏÂÝÅÅ ÏÂÓÕÖÄÅÎÉÅ É ×ÏÐÒÏÓÙ ÎÁÐÒÁ×ÌÑÊÔÅ ÐÏ ÁÄÒÅÓÕ help-texinfo@gnu.org.\n"
 "äÏÍÁÛÎÁÑ ÓÔÒÁÎÉÃÁ Texinfo: http://www.gnu.org/software/texinfo/"
 
-#: info/info.c:632
+#: info/info.c:669
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÎÏÄÕ `%s'."
 
-#: info/info.c:633
+#: info/info.c:670
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÎÏÄÕ `(%s)%s'."
 
-#: info/info.c:634
+#: info/info.c:671
 msgid "Cannot find a window!"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÏËÎÏ!"
 
-#: info/info.c:635
+#: info/info.c:672
 msgid "Point doesn't appear within this window's node!"
 msgstr "ôÏÞËÁ ÎÁÈÏÄÉÔÓÑ ×ÎÅ ÎÏÄÙ ÜÔÏÇÏ ÏËÎÁ!"
 
-#: info/info.c:636
+#: info/info.c:673
 msgid "Cannot delete the last window."
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÐÏÓÌÅÄÎÅÅ ÏËÎÏ."
 
-#: info/info.c:637
+#: info/info.c:674
 msgid "No menu in this node."
 msgstr "÷ ÜÔÏÊ ÎÏÄÅ ÎÅÔ ÍÅÎÀ."
 
-#: info/info.c:638
+#: info/info.c:675
 msgid "No footnotes in this node."
 msgstr "îÁ ÜÔÏÊ ÎÏÄÅ ÎÅÔ ÓÓÙÌÏË."
 
-#: info/info.c:639
+#: info/info.c:676
 msgid "No cross references in this node."
 msgstr "îÁ ÜÔÏÊ ÎÏÄÅ ÎÅÔ ÓÓÙÌÏË."
 
-#: info/info.c:640
+#: info/info.c:677
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "äÌÑ ÜÔÏÊ ÎÏÄÙ ÎÅÔ ÓÓÙÌËÉ `%s'."
 
-#: info/info.c:641
+#: info/info.c:678
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "ëÏÍÁÎÄÁ Info `%c' ÎÅÉÚ×ÅÓÔÎÁ; ÐÏÐÒÏÂÕÊÔÅ `?' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÓÐÒÁ×ËÉ."
 
-#: info/info.c:642
+#: info/info.c:679
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr ""
 "ôÅÒÍÉÎÁÌ ÔÉÐÁ `%s' ÎÅ ÏÂÌÁÄÁÅÔ ÄÏÓÔÁÔÏÞÎÙÍÉ ×ÏÚÍÏÖÎÏÓÔÑÍÉ ÄÌÑ ÚÁÐÕÓËÁ Info."
 
-#: info/info.c:643
+#: info/info.c:680
 msgid "You are already at the last page of this node."
 msgstr "÷Ù ÕÖÅ ÎÁÈÏÄÉÔÅÓØ ÎÁ ÐÏÓÌÅÄÎÅÊ ÓÔÒÁÎÉÃÅ ÜÔÏÊ ÎÏÄÙ."
 
-#: info/info.c:644
+#: info/info.c:681
 msgid "You are already at the first page of this node."
 msgstr "÷Ù ÕÖÅ ÎÁÈÏÄÉÔÅÓØ ÎÁ ÐÅÒ×ÏÊ ÓÔÒÁÎÉÃÅ ÜÔÏÊ ÎÏÄÙ."
 
-#: info/info.c:645
+#: info/info.c:682
 msgid "Only one window."
 msgstr "ôÏÌØËÏ ÏÄÎÏ ÏËÎÏ."
 
-#: info/info.c:646
+#: info/info.c:683
 msgid "Resulting window would be too small."
 msgstr "ðÏÌÕÞÉ×ÛÅÅÓÑ ÏËÎÏ ÂÙÌÏ ÂÙ ÓÌÉÛËÏÍ ÍÁÌÅÎØËÉÍ."
 
-#: info/info.c:647
+#: info/info.c:684
 msgid "Not enough room for a help window, please delete a window."
 msgstr ""
 "îÅ È×ÁÔÁÅÔ ÍÅÓÔÁ ÄÌÑ ÓÐÒÁ×ÏÞÎÏÇÏ ÏËÎÁ, ÐÏÖÁÌÕÊÓÔÁ, ÕÄÁÌÉÔÅ ËÁËÏÅ-ÎÉÂÕÄØ ÏËÎÏ."
 
-#: info/infodoc.c:45 info/infodoc.c:94
+#: info/infodoc.c:46 info/infodoc.c:95
 msgid ""
 "Basic Commands in Info Windows\n"
 "******************************\n"
@@ -425,19 +428,19 @@ msgstr ""
 "ïÓÎÏ×ÎÙÅ ËÏÍÁÎÄÙ × ÏËÎÁÈ Info\n"
 "******************************\n"
 
-#: info/infodoc.c:48
+#: info/infodoc.c:49
 msgid "\\%-10[quit-help]  Quit this help.\n"
-msgstr "  %-10[quit-help]  ðÏËÉÎÕÔØ ÜÔÕ ÓÐÒÁ×ËÕ.\n"
+msgstr "\\%-10[quit-help]  ðÏËÉÎÕÔØ ÜÔÕ ÓÐÒÁ×ËÕ.\n"
 
-#: info/infodoc.c:49
+#: info/infodoc.c:50
 msgid "\\%-10[quit]  Quit Info altogether.\n"
-msgstr "  %-10[quit]  ðÏËÉÎÕÔØ ÔÁËÖÅ Info.\n"
+msgstr "\\%-10[quit]  ðÏËÉÎÕÔØ ÔÁËÖÅ Info.\n"
 
-#: info/infodoc.c:50
+#: info/infodoc.c:51
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
-msgstr "  %-10[get-info-help-node]  ÷ÙÚ×ÁÔØ ÏÂÕÞÁÀÝÅÅ ÒÕËÏ×ÏÄÓÔ×Ï.\n"
+msgstr "\\%-10[get-info-help-node]  ÷ÙÚ×ÁÔØ ÏÂÕÞÁÀÝÅÅ ÒÕËÏ×ÏÄÓÔ×Ï.\n"
 
-#: info/infodoc.c:52 info/infodoc.c:101
+#: info/infodoc.c:53 info/infodoc.c:102
 msgid ""
 "Selecting other nodes:\n"
 "----------------------\n"
@@ -445,19 +448,19 @@ msgstr ""
 "÷ÙÂÏÒ ÄÒÕÇÏÊ ÎÏÄÙ:\n"
 "------------------\n"
 
-#: info/infodoc.c:54
+#: info/infodoc.c:55
 msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
-msgstr "  %-10[next-node]  ðÅÒÅÊÔÉ Ë \"ÓÌÅÄÕÀÝÅÊ\" ÎÏÄÅ.\n"
+msgstr "\\%-10[next-node]  ðÅÒÅÊÔÉ Ë \"ÓÌÅÄÕÀÝÅÊ\" ÎÏÄÅ.\n"
 
-#: info/infodoc.c:55
+#: info/infodoc.c:56
 msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
-msgstr "  %-10[prev-node]  ðÅÒÅÊÔÉ Ë \"ÐÒÅÄÙÄÕÝÅÊ\" ÎÏÄÅ.\n"
+msgstr "\\%-10[prev-node]  ðÅÒÅÊÔÉ Ë \"ÐÒÅÄÙÄÕÝÅÊ\" ÎÏÄÅ.\n"
 
-#: info/infodoc.c:56
+#: info/infodoc.c:57
 msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
-msgstr "  %-10[up-node]  ðÅÒÅÊÔÉ Ë ÎÏÄÅ \"××ÅÒÈ\".\n"
+msgstr "\\%-10[up-node]  ðÅÒÅÊÔÉ Ë ÎÏÄÅ \"××ÅÒÈ\".\n"
 
-#: info/infodoc.c:57
+#: info/infodoc.c:58
 msgid ""
 "\\%-10[menu-item]  Pick menu item specified by name.\n"
 "              Picking a menu item causes another node to be selected.\n"
@@ -465,48 +468,48 @@ msgstr ""
 "\\%-10[menu-item]  ðÅÒÅÊÔÉ Ë ÐÕÎËÔÕ ÍÅÎÀ, ÚÁÄÁ×ÁÅÍÏÍÕ ÐÏ ÉÍÅÎÉ.\n"
 "              ðÒÉ ÐÅÒÅÈÏÄÅ Ë ÚÁÄÁÎÎÏÍÕ ÐÕÎËÔÕ ÍÅÎÀ ×ÙÂÉÒÁÅÔÓÑ ÄÒÕÇÁÑ ÎÏÄÁ.\n"
 
-#: info/infodoc.c:59
+#: info/infodoc.c:60
 msgid ""
 "\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
-msgstr "  %-10[xref-item]  ðÅÒÅÊÔÉ ÐÏ ÓÓÙÌËÅ.  óÞÉÔÙ×ÁÅÔ ÉÍÑ ÓÓÙÌËÉ.\n"
+msgstr "\\%-10[xref-item]  ðÅÒÅÊÔÉ ÐÏ ÓÓÙÌËÅ.  óÞÉÔÙ×ÁÅÔ ÉÍÑ ÓÓÙÌËÉ.\n"
 
-#: info/infodoc.c:60
+#: info/infodoc.c:61
 msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
-msgstr "  %-10[history-node]  ðÅÒÅÊÔÉ ÎÁ ÐÏÓÌÅÄÎÀÀ ÎÏÄÕ × ÜÔÏÍ ÏËÎÅ.\n"
+msgstr "\\%-10[history-node]  ðÅÒÅÊÔÉ ÎÁ ÐÏÓÌÅÄÎÀÀ ÎÏÄÕ × ÜÔÏÍ ÏËÎÅ.\n"
 
-#: info/infodoc.c:61
+#: info/infodoc.c:62
 msgid ""
 "\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
 msgstr ""
-"  %-10[move-to-next-xref]  ðÅÒÅÍÅÓÔÉÔØÓÑ Ë ÓÌÅÄÕÀÝÅÊ ÇÉÐÅÒÓÓÙÌËÅ × ÜÔÏÊ "
+"\\%-10[move-to-next-xref]  ðÅÒÅÍÅÓÔÉÔØÓÑ Ë ÓÌÅÄÕÀÝÅÊ ÇÉÐÅÒÓÓÙÌËÅ × ÜÔÏÊ "
 "ÎÏÄÅ.\n"
 
-#: info/infodoc.c:62
+#: info/infodoc.c:63
 msgid ""
 "\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
 "node.\n"
 msgstr ""
-"  %-10[move-to-prev-xref]  ðÅÒÅÍÅÓÔÉÔØÓÑ Ë ÓÌÅÄÕÀÝÅÊ ÇÉÐÅÒÓÓÙÌËÅ × ÜÔÏÊ "
+"\\%-10[move-to-prev-xref]  ðÅÒÅÍÅÓÔÉÔØÓÑ Ë ÓÌÅÄÕÀÝÅÊ ÇÉÐÅÒÓÓÙÌËÅ × ÜÔÏÊ "
 "ÎÏÄÅ.\n"
 
-#: info/infodoc.c:63
+#: info/infodoc.c:64
 msgid ""
 "\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
 msgstr ""
-"  %-10[select-reference-this-line]  ðÅÒÅÊÔÉ ÐÏ ÇÉÐÅÒÓÓÙÌËÅ ÐÏÄ ËÕÒÓÏÒÏÍ.\n"
+"\\%-10[select-reference-this-line]  ðÅÒÅÊÔÉ ÐÏ ÇÉÐÅÒÓÓÙÌËÅ ÐÏÄ ËÕÒÓÏÒÏÍ.\n"
 
-#: info/infodoc.c:64
+#: info/infodoc.c:65
 msgid ""
 "\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
 "node] (DIR)'.\n"
-msgstr "  %-10[dir-node]  ðÅÒÅÊÔÉ Ë ËÏÒÎÅ×ÏÊ ÎÏÄÅ.  üË×É×ÁÌÅÎÔÎÏ `g (DIR)'.\n"
+msgstr "\\%-10[dir-node]  ðÅÒÅÊÔÉ Ë ËÏÒÎÅ×ÏÊ ÎÏÄÅ.  üË×É×ÁÌÅÎÔÎÏ `g (DIR)'.\n"
 
-#: info/infodoc.c:65
+#: info/infodoc.c:66
 msgid ""
 "\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
-msgstr "  %-10[top-node]  ðÅÒÅÊÔÉ Ë ÎÏÄÅ Top.  üË×É×ÁÌÅÎÔÎÏ `g Top'.\n"
+msgstr "\\%-10[top-node]  ðÅÒÅÊÔÉ Ë ÎÏÄÅ Top.  üË×É×ÁÌÅÎÔÎÏ `g Top'.\n"
 
-#: info/infodoc.c:67 info/infodoc.c:115
+#: info/infodoc.c:68 info/infodoc.c:116
 msgid ""
 "Moving within a node:\n"
 "---------------------\n"
@@ -514,31 +517,31 @@ msgstr ""
 "ðÅÒÅÍÅÝÅÎÉÅ ×ÎÕÔÒÉ ÎÏÄÙ:\n"
 "------------------------\n"
 
-#: info/infodoc.c:69
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
-msgstr "  %-10[scroll-forward]  ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ×ÐÅÒÅÄ.\n"
-
 #: info/infodoc.c:70
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
-msgstr "  %-10[scroll-backward]  ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ÎÁÚÁÄ.\n"
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "\\%-10[beginning-of-node]  ðÅÒÅÍÅÓÔÉÔØÓÑ × ÎÁÞÁÌÏ ÜÔÏÊ ÎÏÄÙ.\n"
 
 #: info/infodoc.c:71
-msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
-msgstr "  %-10[beginning-of-node]  ðÅÒÅÍÅÓÔÉÔØÓÑ × ÎÁÞÁÌÏ ÜÔÏÊ ÎÏÄÙ.\n"
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgstr "\\%-10[end-of-node]  ðÅÒÅÍÅÓÔÉÔØÓÑ × ËÏÎÅà ÜÔÏÊ ÎÏÄÙ.\n"
 
 #: info/infodoc.c:72
-msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
-msgstr "  %-10[end-of-node]  ðÅÒÅÍÅÓÔÉÔØÓÑ × ËÏÎÅà ÜÔÏÊ ÎÏÄÙ.\n"
+msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
+msgstr "\\%-10[next-line]  ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ×ÐÅÒÅÄ.\n"
 
 #: info/infodoc.c:73
-msgid "\\%-10[scroll-forward]  Scroll forward 1 line.\n"
-msgstr "  %-10[scroll-forward]  ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ×ÐÅÒÅÄ.\n"
+msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
+msgstr "\\%-10[prev-line]  ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ÎÁÚÁÄ.\n"
 
 #: info/infodoc.c:74
-msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
-msgstr "  %-10[scroll-backward]  ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ÎÁÚÁÄ.\n"
+msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
+msgstr "\\%-10[scroll-forward]  ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ×ÐÅÒÅÄ.\n"
 
-#: info/infodoc.c:76 info/infodoc.c:124
+#: info/infodoc.c:75
+msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
+msgstr "\\%-10[scroll-backward]  ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ÎÁÚÁÄ.\n"
+
+#: info/infodoc.c:77 info/infodoc.c:125
 msgid ""
 "Other commands:\n"
 "---------------\n"
@@ -546,16 +549,16 @@ msgstr ""
 "äÒÕÇÉÅ ËÏÍÁÎÄÙ:\n"
 "---------------\n"
 
-#: info/infodoc.c:78
+#: info/infodoc.c:79
 msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
 msgstr ""
-"  %-10[menu-digit]  ÷ÙÂÒÁÔØ ÐÅÒ×ÙÊ ... ÄÅ×ÑÔÙÊ ÐÕÎËÔ ÍÅÎÀ × ÔÅËÕÝÅÊ ÎÏÄÅ.\n"
+"\\%-10[menu-digit]  ÷ÙÂÒÁÔØ ÐÅÒ×ÙÊ ... ÄÅ×ÑÔÙÊ ÐÕÎËÔ ÍÅÎÀ × ÔÅËÕÝÅÊ ÎÏÄÅ.\n"
 
-#: info/infodoc.c:79
+#: info/infodoc.c:80
 msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
-msgstr "  %-10[last-menu-item]  ÷ÙÂÒÁÔØ ÐÏÓÌÅÄÎÉÊ ÐÕÎËÔ ÍÅÎÀ × ÔÅËÕÝÅÊ ÎÏÄÅ\n"
+msgstr "\\%-10[last-menu-item]  ÷ÙÂÒÁÔØ ÐÏÓÌÅÄÎÉÊ ÐÕÎËÔ ÍÅÎÀ × ÔÅËÕÝÅÊ ÎÏÄÅ\n"
 
-#: info/infodoc.c:80
+#: info/infodoc.c:81
 msgid ""
 "\\%-10[index-search]  Search for a specified string in the index entries of "
 "this Info\n"
@@ -565,7 +568,7 @@ msgstr ""
 "\\%-10[index-search]  éÓËÁÔØ ÚÁÄÁÎÎÕÀ ÓÔÒÏËÕ × ÁÌÆÁ×ÉÔÎÙÈ ÕËÁÚÁÔÅÌÑÈ\n"
 "              Info-ÆÁÊÌÁ É ×ÙÂÒÁÔØ ÎÏÄÕ ÐÏ ÐÅÒ×ÏÊ ÎÁÊÄÅÎÎÏÊ ÓÓÙÌËÅ.\n"
 
-#: info/infodoc.c:82
+#: info/infodoc.c:83
 msgid ""
 "\\%-10[goto-node]  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
@@ -573,7 +576,7 @@ msgstr ""
 "\\%-10[goto-node]  ðÅÒÅÊÔÉ Ë ÎÏÄÅ, ÚÁÄÁÎÎÏÊ ÐÏ ÉÍÅÎÉ.\n"
 "              ÷Ù ÍÏÖÅÔÅ ÚÁÄÁÔØ ÔÁËÖÅ ÉÍÑ ÆÁÊÌÁ, ÎÁÐÒÉÍÅÒ (æáêì)îïäá.\n"
 
-#: info/infodoc.c:84
+#: info/infodoc.c:85
 msgid ""
 "\\%-10[search]  Search forward for a specified string\n"
 "              and select the node in which the next occurrence is found.\n"
@@ -582,7 +585,7 @@ msgstr ""
 "×\n"
 "              ÎÏÄÅ, × ËÏÔÏÒÏÊ ÎÁÊÄÅÎÏ ÓÌÅÄÕÀÝÅÅ ×ÈÏÖÄÅÎÉÅ.\n"
 
-#: info/infodoc.c:86
+#: info/infodoc.c:87
 msgid ""
 "\\%-10[search-backward]  Search backward for a specified string\n"
 "              and select the node in which the previous occurrence is "
@@ -591,117 +594,117 @@ msgstr ""
 "\\%-10[search-backward]  éÓËÁÔØ ÕËÁÚÁÎÎÕÀ ÓÔÒÏËÕ × ÔÅËÕÝÅÍ Info-ÆÁÊÌÅ ×\n"
 "              ÎÏÄÅ, × ËÏÔÏÒÏÊ ÎÁÊÄÅÎÏ ÓÌÅÄÕÀÝÅÅ ×ÈÏÖÄÅÎÉÅ.\n"
 
-#: info/infodoc.c:97
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Quit this help.\n"
 msgstr "  %-10s  ðÏËÉÎÕÔØ ÜÔÕ ÓÐÒÁ×ËÕ.\n"
 
-#: info/infodoc.c:98
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr "  %-10s  ðÏËÉÎÕÔØ ÔÁËÖÅ Info.\n"
 
-#: info/infodoc.c:99
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr "  %-10s  ÷ÙÚ×ÁÔØ ÏÂÕÞÁÀÝÅÅ ÒÕËÏ×ÏÄÓÔ×Ï.\n"
 
-#: info/infodoc.c:103
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
 msgstr "  %-10s  ðÅÒÅÊÔÉ Ë `ÓÌÅÄÕÀÝÅÊ' ÎÏÄÅ.\n"
 
-#: info/infodoc.c:104
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
 msgstr "  %-10s  ðÅÒÅÊÔÉ Ë `ÐÒÅÄÙÄÕÝÅÊ' ÎÏÄÅ.\n"
 
-#: info/infodoc.c:105
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
 msgstr "  %-10s  ðÅÒÅÊÔÉ Ë ÎÏÄÅ `××ÅÒÈ'.\n"
 
-#: info/infodoc.c:106
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Pick menu item specified by name.\n"
 msgstr "  %-10s  ðÅÒÅÊÔÉ Ë ÚÁÄÁÎÎÏÍÕ ÐÕÎËÔÕ ÍÅÎÀ.\n"
 
-#: info/infodoc.c:107
+#: info/infodoc.c:108
 msgid "              Picking a menu item causes another node to be selected.\n"
 msgstr ""
 "              ðÒÉ ÐÅÒÅÈÏÄÅ Ë ÚÁÄÁÎÎÏÍÕ ÐÕÎËÔÕ ÍÅÎÀ ×ÙÂÉÒÁÅÔÓÑ ÄÒÕÇÁÑ ÎÏÄÁ.\n"
 
-#: info/infodoc.c:108
+#: info/infodoc.c:109
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
 msgstr "  %-10s  ðÅÒÅÊÔÉ ÐÏ ÓÓÙÌËÅ.  óÞÉÔÙ×ÁÅÔ ÉÍÑ ÓÓÙÌËÉ.\n"
 
-#: info/infodoc.c:109
+#: info/infodoc.c:110
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
 msgstr "  %-10s  ðÅÒÅÊÔÉ ÎÁ ÐÏÓÌÅÄÎÀÀ ÎÏÄÕ × ÜÔÏÍ ÏËÎÅ.\n"
 
-#: info/infodoc.c:110
+#: info/infodoc.c:111
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
 msgstr "  %-10s  ðÅÒÅÍÅÓÔÉÔØÓÑ Ë ÓÌÅÄÕÀÝÅÊ ÇÉÐÅÒÓÓÙÌËÅ × ÜÔÏÊ ÎÏÄÅ.\n"
 
-#: info/infodoc.c:111
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
 msgstr "  %-10s  ðÅÒÅÊÔÉ ÐÏ ÇÉÐÅÒÓÓÙÌËÅ ÐÏÄ ËÕÒÓÏÒÏÍ.\n"
 
-#: info/infodoc.c:112
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
 msgstr "  %-10s  ðÅÒÅÊÔÉ Ë ËÏÒÎÅ×ÏÊ ÎÏÄÅ.  üË×É×ÁÌÅÎÔÎÏ `g (DIR)'.\n"
 
-#: info/infodoc.c:113
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
 msgstr "  %-10s  ðÅÒÅÊÔÉ Ë ÎÏÄÅ Top.  üË×É×ÁÌÅÎÔÎÏ `g Top'.\n"
 
-#: info/infodoc.c:117
+#: info/infodoc.c:118
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
 msgstr "  %-10s  ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ×ÐÅÒÅÄ.\n"
 
-#: info/infodoc.c:118
+#: info/infodoc.c:119
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
 msgstr "  %-10s  ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ÎÁÚÁÄ.\n"
 
-#: info/infodoc.c:119
+#: info/infodoc.c:120
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
 msgstr "  %-10s  ðÅÒÅÍÅÓÔÉÔØÓÑ × ÎÁÞÁÌÏ ÜÔÏÊ ÎÏÄÙ.\n"
 
-#: info/infodoc.c:120
+#: info/infodoc.c:121
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
 msgstr "  %-10s  ðÅÒÅÍÅÓÔÉÔØÓÑ × ËÏÎÅà ÜÔÏÊ ÎÏÄÙ.\n"
 
-#: info/infodoc.c:121
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
 msgstr "  %-10s  ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ×ÐÅÒÅÄ.\n"
 
-#: info/infodoc.c:122
+#: info/infodoc.c:123
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
 msgstr "  %-10s  ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ÎÁÚÁÄ.\n"
 
-#: info/infodoc.c:126
+#: info/infodoc.c:127
 #, c-format
 msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
 msgstr "  %-10s  ÷ÙÂÒÁÔØ ÐÅÒ×ÙÊ ... ÄÅ×ÑÔÙÊ ÐÕÎËÔ ÍÅÎÀ × ÔÅËÕÝÅÊ ÎÏÄÅ.\n"
 
-#: info/infodoc.c:127
+#: info/infodoc.c:128
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
 msgstr "  %-10s  ÷ÙÂÒÁÔØ ÐÏÓÌÅÄÎÉÊ ÐÕÎËÔ ÍÅÎÀ × ÔÅËÕÝÅÊ ÎÏÄÅ\n"
 
-#: info/infodoc.c:128
+#: info/infodoc.c:129
 #, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
@@ -709,42 +712,42 @@ msgstr ""
 "  %-10s  ðÒÏÉÚ×ÅÓÔÉ ÐÏÉÓË ÚÁÄÁÎÎÏÊ ÓÔÒÏËÉ ÓÒÅÄÉ ×ÈÏÖÄÅÎÉÊ ÉÍÅÎÎÙÈ ÕËÁÚÁÔÅÌÅÊ "
 "ÜÔÏÇÏ\n"
 
-#: info/infodoc.c:129
+#: info/infodoc.c:130
 msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
 msgstr "              Info-ÆÁÊÌÁ É ×ÙÂÒÁÔØ ÎÏÄÕ ÐÏ ÐÅÒ×ÏÊ ÎÁÊÄÅÎÎÏÊ ÓÓÙÌËÅ.\n"
 
-#: info/infodoc.c:130
+#: info/infodoc.c:131
 #, c-format
 msgid "  %-10s  Move to node specified by name.\n"
 msgstr "  %-10s  ðÅÒÅÊÔÉ Ë ÚÁÄÁÎÎÏÊ ÎÏÄÅ.\n"
 
-#: info/infodoc.c:131
+#: info/infodoc.c:132
 msgid ""
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr "              ÷Ù ÍÏÖÅÔÅ ÚÁÄÁÔØ ÔÁËÖÅ ÉÍÑ ÆÁÊÌÁ, ÎÁÐÒÉÍÅÒ (æáêì)îïäá.\n"
 
-#: info/infodoc.c:132
+#: info/infodoc.c:133
 #, c-format
 msgid "  %-10s  Search forward for a specified string,\n"
 msgstr "  %-10s  îÁÊÔÉ ÚÁÄÁÎÎÕÀ ÓÔÒÏËÕ, É ÐÅÒÅÊÔÉ Ë\n"
 
-#: info/infodoc.c:133 info/infodoc.c:135
+#: info/infodoc.c:134 info/infodoc.c:136
 msgid ""
 "              and select the node in which the next occurrence is found.\n"
 msgstr "              ÎÏÄÅ, × ËÏÔÏÒÏÊ ÎÁÊÄÅÎÏ ÓÌÅÄÕÀÝÅÅ ×ÈÏÖÄÅÎÉÅ.\n"
 
-#: info/infodoc.c:134
+#: info/infodoc.c:135
 #, c-format
 msgid "  %-10s  Search backward for a specified string\n"
 msgstr "  %-10s  îÁÊÔÉ ÚÁÄÁÎÎÕÀ ÓÔÒÏËÕ × ÏÂÒÁÔÎÏÍ ÎÁÐÒÁ×ÌÅÎÉÉ, É ÐÅÒÅÊÔÉ Ë\n"
 
-#: info/infodoc.c:313
+#: info/infodoc.c:316
 msgid "The current search path is:\n"
 msgstr "ôÅËÕÝÉÊ ÐÕÔØ ÐÏÉÓËÁ:\n"
 
-#: info/infodoc.c:316
+#: info/infodoc.c:320
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
@@ -752,7 +755,7 @@ msgstr ""
 "ëÏÍÁÎÄÙ, ÄÏÓÔÕÐÎÙÅ × ÏËÎÁÈ Info:\n"
 "\n"
 
-#: info/infodoc.c:319
+#: info/infodoc.c:324
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
@@ -760,7 +763,7 @@ msgstr ""
 "ëÏÍÁÎÄÙ, ÄÏÓÔÕÐÎÙÅ × ÜÈÏ-ÏÂÌÁÓÔÉ:\n"
 "\n"
 
-#: info/infodoc.c:340
+#: info/infodoc.c:347
 #, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
@@ -769,7 +772,7 @@ msgstr ""
 "óÌÅÄÕÀÝÉÅ ËÏÍÁÎÄÙ ÍÏÇÕÔ ÂÙÔØ ×ÙÚ×ÁÎÙ ÔÏÌØËÏ Ó ÐÏÍÏÝØÀ %s:\n"
 "\n"
 
-#: info/infodoc.c:343
+#: info/infodoc.c:351
 msgid ""
 "The following commands cannot be invoked at all:\n"
 "\n"
@@ -777,156 +780,170 @@ msgstr ""
 "óÌÅÄÕÀÝÉÅ ËÏÍÁÎÄÙ ×ÏÏÂÝÅ ÎÅ ÍÏÇÕÔ ÂÙÔØ ×ÙÚ×ÁÎÙ:\n"
 "\n"
 
-#: info/infodoc.c:367
+#: info/infodoc.c:375
 msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
 msgstr ""
 "--- éÓÐÏÌØÚÕÊÔÅ `\\[history-node]' ÉÌÉ `\\[kill-node]' ÄÌÑ ×ÙÈÏÄÁ ---\n"
 
-#: info/infodoc.c:477
+#: info/infodoc.c:485
 msgid "Display help message"
 msgstr "ðÏËÁÚÁÔØ ÓÐÒÁ×ËÕ"
 
-#: info/infodoc.c:495
+#: info/infodoc.c:503
 msgid "Visit Info node `(info)Help'"
 msgstr "ïÂÒÁÔÉÔØÓÑ Ë Info-ÎÏÄÅ `(info)Help'"
 
-#: info/infodoc.c:638
+#: info/infodoc.c:641
 msgid "Print documentation for KEY"
 msgstr "ðÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ëìá÷éûå"
 
-#: info/infodoc.c:650
+#: info/infodoc.c:653
 #, c-format
 msgid "Describe key: %s"
 msgstr "ïÐÉÓÁÔØ ËÌÁ×ÉÛÕ: %s"
 
-#: info/infodoc.c:660
+#: info/infodoc.c:664
 #, c-format
 msgid "ESC %s is undefined."
 msgstr "ESC %s ÎÅÏÐÒÅÄÅÌÅÎÏ."
 
-#: info/infodoc.c:676 info/infodoc.c:703
+#: info/infodoc.c:680 info/infodoc.c:709
 #, c-format
 msgid "%s is undefined."
 msgstr "%s ÎÅÏÐÒÅÄÅÌÅÎÏ."
 
-#: info/infodoc.c:724
+#: info/infodoc.c:730
 #, c-format
 msgid "%s is defined to %s."
 msgstr "%s ÐÒÉ×ÑÚÁÎÏ Ë %s."
 
-#: info/infodoc.c:1151
+#: info/infodoc.c:1153
 msgid "Show what to type to execute a given command"
 msgstr "ðÏËÁÚÙ×ÁÅÔ, ÞÔÏ ÎÕÖÎÏ ÎÁÐÅÞÁÔÁÔØ, ÞÔÏÂÙ ×ÙÐÏÌÎÉÔØ ÄÁÎÎÕÀ ËÏÍÁÎÄÕ"
 
-#: info/infodoc.c:1155
+#: info/infodoc.c:1157
 msgid "Where is command: "
 msgstr "ëÏÍÁÎÄÁ: "
 
-#: info/infodoc.c:1177
+#: info/infodoc.c:1179
 #, c-format
 msgid "`%s' is not on any keys"
 msgstr "`%s' ÎÅ ÐÒÉ×ÑÚÁÎÁ ÎÉ Ë ËÁËÉÍ ËÌÁ×ÉÛÁÍ"
 
-#: info/infodoc.c:1183
+#: info/infodoc.c:1186
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr "%s ÍÏÖÅÔ ÂÙÔØ ×ÙÚ×ÁÎÁ ÔÏÌØËÏ Ó ÐÏÍÏÝØÀ %s."
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1190
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr "%s ÍÏÖÅÔ ÂÙÔØ ×ÙÚ×ÁÎÁ Ó ÐÏÍÏÝØÀ %s."
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1195
 #, c-format
 msgid "There is no function named `%s'"
 msgstr "æÕÎËÃÉÉ Ó ÉÍÅÎÅÍ `%s' ÎÅÔ"
 
-#: info/infokey.c:164
+#: info/infokey.c:145
+#, 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 (C) %s Free Software Foundation, Inc.\n"
+"íÙ îå ÐÒÅÄÏÓÔÁ×ÌÑÅÍ ÇÁÒÁÎÔÉÊ.  ÷Ù ÍÏÖÅÔÅ ÒÁÓÐÒÏÓÔÒÁÎÑÔØ ÜÔÉ ÐÒÏÇÒÁÍÍÙ, ÐÒÉ\n"
+"ÓÏÂÌÀÄÅÎÉÉ ÕÓÌÏ×ÉÊ õÎÉ×ÅÒÓÁÌØÎÏÊ ïÂÝÅÓÔ×ÅÎÎÏÊ ìÉÃÅÎÚÉÉ GNU.\n"
+"äÌÑ ÐÏÌÕÞÅÎÉÑ ÐÏÄÒÏÂÎÏÊ ÉÎÆÏÒÍÁÃÉÉ Ï ×ÏÚÍÏÖÎÏÓÔÉ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÑ ÓÍÏÔÒÉÔÅ\n"
+"ÆÁÊÌ COPYING.\n"
+
+#: info/infokey.c:170
 msgid "incorrect number of arguments"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÞÉÓÌÏ ÁÒÇÕÍÅÎÔÏ×"
 
-#: info/infokey.c:194
+#: info/infokey.c:201
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ `%s'"
 
-#: info/infokey.c:207
+#: info/infokey.c:215
 #, c-format
 msgid "cannot create output file `%s'"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ `%s'"
 
-#: info/infokey.c:217
+#: info/infokey.c:226
 #, c-format
 msgid "error writing to `%s'"
 msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ × `%s'"
 
-#: info/infokey.c:222
+#: info/infokey.c:232
 #, c-format
 msgid "error closing output file `%s'"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁËÒÙÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ `%s'"
 
-#: info/infokey.c:443
+#: info/infokey.c:450
 msgid "key sequence too long"
 msgstr "ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ËÌÀÞÅÊ ÓÌÉÛËÏÍ ÄÌÉÎÎÁÑ"
 
-#: info/infokey.c:521
+#: info/infokey.c:529
 msgid "missing key sequence"
 msgstr "ÐÒÏÐÕÝÅÎÁ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ËÌÀÞÅÊ"
 
-#: info/infokey.c:600
+#: info/infokey.c:610
 msgid "NUL character (\\000) not permitted"
 msgstr "ÚÎÁË NUL (\\000) ÎÅÄÏÐÕÓÔÉÍ"
 
-#: info/infokey.c:629
+#: info/infokey.c:641
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr "ÚÎÁË NUL (^%c) ÎÅÄÏÐÕÓÔÉÍ"
 
-#: info/infokey.c:652
+#: info/infokey.c:665
 msgid "missing action name"
 msgstr "ÐÒÏÐÕÝÅÎÏ ÉÍÑ ÄÅÊÓÔ×ÉÑ"
 
-#: info/infokey.c:667 info/infokey.c:733
+#: info/infokey.c:681 info/infokey.c:756
 msgid "section too long"
 msgstr "ÒÁÚÄÅÌ ÓÌÉÛËÏÍ ×ÅÌÉË"
 
-#: info/infokey.c:673
+#: info/infokey.c:688
 #, c-format
 msgid "unknown action `%s'"
 msgstr "îÅÉÚ×ÅÓÔÎÏÅ ÄÅÊÓÔ×ÉÅ `%s'"
 
-#: info/infokey.c:682
+#: info/infokey.c:698
 msgid "action name too long"
 msgstr "ÉÍÑ ÄÅÊÓÔ×ÉÑ ÓÌÉÛËÏÍ ÄÌÉÎÎÏÅ"
 
-#: info/infokey.c:694
+#: info/infokey.c:712
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr "ÌÉÛÎÉÅ ÚÎÁËÉ ÐÏÓÌÅ ÄÅÊÓÔ×ÉÑ `%s'"
 
-#: info/infokey.c:704
+#: info/infokey.c:723
 msgid "missing variable name"
 msgstr "ÐÒÏÐÕÝÅÎÏ ÉÍÑ ÐÅÒÅÍÅÎÎÏÊ"
 
-#: info/infokey.c:712
+#: info/infokey.c:733
 msgid "missing `=' immediately after variable name"
 msgstr "ÐÒÏÐÕÝÅÎ ÚÎÁË `=' ÓÒÁÚÕ ÐÏÓÌÅ ÉÍÅÎÉ ÐÅÒÅÍÅÎÎÏÊ"
 
-#: info/infokey.c:719
+#: info/infokey.c:741
 msgid "variable name too long"
 msgstr "ÉÍÑ ÐÅÒÅÍÅÎÎÏÊ ÓÌÉÛËÏÍ ÄÌÉÎÎÏÅ"
 
-#: info/infokey.c:741
+#: info/infokey.c:765
 msgid "value too long"
 msgstr "ÚÎÁÞÅÎÉÅ ÓÌÉÛËÏÍ ÄÌÉÎÎÏÅ"
 
-#: info/infokey.c:875
+#: info/infokey.c:890
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr "\"%s\", ÓÔÒÏËÁ %u: "
 
-#: info/infokey.c:891
+#: info/infokey.c:906
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -951,22 +968,22 @@ msgstr ""
 "  --help                       ÐÏËÁÚÁÔØ ÜÔÕ ÓÐÒÁ×ËÕ É ×ÙÊÔÉ\n"
 "  --version                    ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n"
 
-#: info/infomap.c:1397
+#: info/infomap.c:1500
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
 msgstr "îÅÐÒÁ×ÉÌØÎÙÊ ÆÁÊÌ infokey `%s' ÉÇÎÏÒÉÒÕÅÔÓÑ - ÓÌÉÛËÏÍ ÍÁÌÅÎØËÉÊ"
 
-#: info/infomap.c:1400
+#: info/infomap.c:1503
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
 msgstr "îÅÐÒÁ×ÉÌØÎÙÊ ÆÁÊÌ infokey `%s' ÉÇÎÏÒÉÒÕÅÔÓÑ - ÓÌÉÛËÏÍ ÂÏÌØÛÏÊ"
 
-#: info/infomap.c:1413
+#: info/infomap.c:1516
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
 msgstr "ïÛÉÂËÁ ÞÔÅÎÉÑ ÆÁÊÌÁ infokey `%s' - ÞÔÅÎÉÅ ÐÒÅÒ×ÁÎÏ"
 
-#: info/infomap.c:1431
+#: info/infomap.c:1535
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
@@ -974,19 +991,19 @@ msgstr ""
 "æÁÊÌ infokey `%s' ÎÅÐÒÉÅÍÌÅÍ (ÎÅ×ÅÒÎÁÑ ÓÉÇÎÁÔÕÒÁ) -- ÚÁÐÕÓÔÉÔÅ infokey, "
 "ÞÔÏÂÙ ÏÂÎÏ×ÉÔØ ÅÇÏ"
 
-#: info/infomap.c:1437
+#: info/infomap.c:1544
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
 msgstr "æÁÊÌ infokey `%s' ÕÓÔÁÒÅÌ -- ÚÁÐÕÓÔÉÔÅ infokey, ÞÔÏÂÙ ÏÂÎÏ×ÉÔØ ÅÇÏ"
 
-#: info/infomap.c:1450
+#: info/infomap.c:1560
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
 msgstr ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
 
-#: info/infomap.c:1470
+#: info/infomap.c:1581
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
@@ -994,43 +1011,49 @@ msgstr ""
 "æÁÊÌ infokey `%s' ÎÅÐÒÉÅÍÌÅÍ (ÎÅ×ÅÒÎÙÊ ËÏÄ ÒÁÚÄÅÌÁ) -- ÚÁÐÕÓÔÉÔÅ infokey, "
 "ÞÔÏÂÙ ÏÂÎÏ×ÉÔØ ÅÇÏ"
 
-#: info/infomap.c:1608
+#: info/infomap.c:1716
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr ""
 "ðÏ×ÒÅÖÄÅÎÎÙÅ ÄÁÎÎÙÅ × ÆÁÊÌÅ infokey -- ÎÅËÏÔÏÒÙÅ ÐÒÉ×ÑÚËÉ ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎÙ"
 
-#: info/infomap.c:1659
+#: info/infomap.c:1766
 msgid "Bad data in infokey file -- some var settings ignored"
 msgstr ""
 "ðÏ×ÒÅÖÄÅÎÎÙÅ ÄÁÎÎÙÅ × ÆÁÊÌÅ infokey -- ÎÅËÏÔÏÒÙÅ ÕÓÔÁÎÏ×ËÉ ÐÅÒÅÍÅÎÎÙÈ "
 "ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎÙ"
 
-#: info/m-x.c:70
+#: info/m-x.c:69
 msgid "Read the name of an Info command and describe it"
 msgstr "óÞÉÔÁÔØ ÉÍÑ ËÏÍÁÎÄÙ Info É ÐÏËÁÚÁÔØ ÅÅ ÏÐÉÓÁÎÉÅ"
 
-#: info/m-x.c:74
+#: info/m-x.c:73
 msgid "Describe command: "
 msgstr "ïÐÉÓÁÔØ ËÏÍÁÎÄÕ: "
 
-#: info/m-x.c:97
+#: info/m-x.c:96
 msgid "Read a command name in the echo area and execute it"
 msgstr "óÞÉÔÁÔØ ÉÍÑ ËÏÍÁÎÄÙ × ÜÈÏ-ÏÂÌÁÓÔÉ É ÉÓÐÏÌÎÉÔØ ÅÅ"
 
-#: info/m-x.c:141
+#: info/m-x.c:140
 msgid "Cannot execute an `echo-area' command here."
 msgstr "úÄÅÓØ ÎÅÌØÚÑ ×ÙÐÏÌÎÉÔØ ËÏÍÁÎÄÕ ÜÈÏ-ÏÂÌÁÓÔÉ."
 
-#: info/m-x.c:157
+#: info/m-x.c:154
+#, c-format
+msgid "Undefined command: %s"
+msgstr "îÅÏÐÒÅÄÅÌÅÎÎÁÑ ËÏÍÁÎÄÁ: %s"
+
+#: info/m-x.c:160
 msgid "Set the height of the displayed window"
 msgstr "õÓÔÁÎÏ×ÉÔØ ×ÙÓÏÔÕ ÏÔÏÂÒÁÖÁÅÍÏÇÏ ÏËÎÁ"
 
-#: info/m-x.c:170
+#: info/m-x.c:173
 #, c-format
 msgid "Set screen height to (%d): "
 msgstr "õÓÔÁÎÏ×ÉÔØ ×ÙÓÏÔÕ ÜËÒÁÎÁ ÒÁ×ÎÏÊ (%d): "
 
-#: info/makedoc.c:161 info/makedoc.c:169
+#: info/makedoc.c:162 info/makedoc.c:170
+#, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
 "\n"
@@ -1038,12 +1061,12 @@ msgstr ""
 "   üÔÏÔ ÆÁÊÌ ×ËÌÀÞÁÅÔ:\n"
 "\n"
 
-#: info/makedoc.c:553
+#: info/makedoc.c:550
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÂÒÁÂÏÔÁÔØ ÆÁÊÌ %s.\n"
 
-#: info/nodemenu.c:28
+#: info/nodemenu.c:31
 msgid ""
 "\n"
 "* Menu:\n"
@@ -1055,7 +1078,7 @@ msgstr ""
 "  (æÁÊÌ)îÏÄÁ                         óÔÒÏË  òÁÚÍÅÒ  æÁÊÌ\n"
 "  ----------                         -----  ------  ----"
 
-#: info/nodemenu.c:199
+#: info/nodemenu.c:202
 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"
@@ -1063,24 +1086,24 @@ msgstr ""
 "üÔÏ ÍÅÎÀ ÒÁÎÅÅ ÐÏÓÅÝÅÎÎÙÈ ×ÁÍÉ ÎÏÄ.\n"
 "÷ÙÂÅÒÉÔÅ ÏÄÎÕ ÉÚ ÍÅÎÀ ÉÌÉ ÉÓÐÏÌØÚÕÊÔÅ `\\[history-node]' × ÄÒÕÇÏÍ ÏËÎÅ.\n"
 
-#: info/nodemenu.c:219
+#: info/nodemenu.c:224
 msgid "Make a window containing a menu of all of the currently visited nodes"
 msgstr "óÏÚÄÁÔØ ÏËÎÏ, ÓÏÄÅÒÖÁÝÅÅ ÍÅÎÀ ÐÏÓÅÝÅÎÎÙÈ ÒÁÎÅÅ ÎÏÄ"
 
-#: info/nodemenu.c:299
+#: info/nodemenu.c:304
 msgid "Select a node which has been previously visited in a visible window"
 msgstr "÷ÙÂÒÁÔØ ÒÁÎÅÅ ÐÏÓÅÝÅÎÎÕÀ ÎÏÄÕ × ×ÉÄÉÍÏÍ ÏËÎÅ"
 
-#: info/nodemenu.c:311
+#: info/nodemenu.c:317
 msgid "Select visited node: "
 msgstr "÷ÙÂÒÁÔØ ÐÏÓÅÝÅÎÎÕÀ ÒÁÎÅÅ ÎÏÄÕ: "
 
-#: info/nodemenu.c:331 info/session.c:2235
+#: info/nodemenu.c:337 info/session.c:2264
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr "óÓÙÌËÁ ÉÓÞÅÚÌÁ! (%s)."
 
-#: info/session.c:170
+#: info/session.c:162
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1089,107 +1112,107 @@ msgstr ""
 "äÏÂÒÏ ÐÏÖÁÌÏ×ÁÔØ × Info ×ÅÒÓÉÉ %s. \\[get-help-window] -- ÓÐÒÁ×ËÁ, \\[menu-"
 "item] ×ÙÂÉÒÁÅÔ ÐÕÎËÔ ÍÅÎÀ."
 
-#: info/session.c:643
+#: info/session.c:620
 msgid "Move down to the next line"
 msgstr "óÍÅÓÔÉÔØÓÑ ÎÁ ÓÔÒÏËÕ ÎÉÖÅ"
 
-#: info/session.c:658
+#: info/session.c:635
 msgid "Move up to the previous line"
 msgstr "óÍÅÓÔÉÔØÓÑ ÎÁ ÓÔÒÏËÕ ×ÙÛÅ"
 
-#: info/session.c:673
+#: info/session.c:650
 msgid "Move to the end of the line"
 msgstr "óÍÅÓÔÉÔØÓÑ × ËÏÎÅÃ ÓÔÒÏËÉ"
 
-#: info/session.c:693
+#: info/session.c:670
 msgid "Move to the start of the line"
 msgstr "óÍÅÓÔÉÔØÓÑ × ÎÁÞÁÌÏ ÓÔÒÏËÉ"
 
-#: info/session.c:885 makeinfo/node.c:1357
+#: info/session.c:860 makeinfo/node.c:1424
 msgid "Next"
 msgstr "óÌÅÄÕÀÝÁÑ"
 
-#: info/session.c:888
+#: info/session.c:863
 msgid "Following Next node..."
 msgstr "ðÅÒÅÈÏÄ ÎÁ ÎÏÄÕ \"óÌÅÄÕÀÝÁÑ\"..."
 
-#: info/session.c:905
+#: info/session.c:881
 msgid "Selecting first menu item..."
 msgstr "÷ÙÂÉÒÁÅÔÓÑ ÐÅÒ×ÙÊ ÐÕÎËÔ ÍÅÎÀ..."
 
-#: info/session.c:916
+#: info/session.c:893
 msgid "Selecting Next node..."
 msgstr "÷ÙÂÉÒÁÅÔÓÑ ÎÏÄÁ \"óÌÅÄÕÀÝÁÑ\"..."
 
-#: info/session.c:986
+#: info/session.c:964
 #, c-format
 msgid "Moving Up %d time(s), then Next."
 msgstr "ðÅÒÅÍÅÝÅÎÉÅ \"÷×ÅÒÈ\" %d ÒÁÚ(Á), ÚÁÔÅÍ \"óÌÅÄÕÀÝÁÑ\"."
 
-#: info/session.c:1010
+#: info/session.c:988
 msgid "No more nodes within this document."
 msgstr "÷ ÜÔÏÍ ÄÏËÕÍÅÎÔÅ ÂÏÌØÛÅ ÎÅÔ ÎÏÄ."
 
-#: info/session.c:1034
+#: info/session.c:1011
 msgid "No `Prev' for this node."
 msgstr "äÌÑ ÜÔÏÊ ÎÏÄÙ ÎÅÔ ÓÓÙÌËÉ `ðÒÅÄÙÄÕÝÁÑ'."
 
-#: info/session.c:1037 info/session.c:1092
+#: info/session.c:1014 info/session.c:1073
 msgid "Moving Prev in this window."
 msgstr "ðÅÒÅÈÏÄ ÎÁ ÎÏÄÕ \"ðÒÅÄÙÄÕÝÁÑ\" × ÜÔÏÍ ÏËÎÅ."
 
-#: info/session.c:1051
+#: info/session.c:1030
 msgid "No `Prev' or `Up' for this node within this document."
 msgstr "÷ ÜÔÏÍ ÄÏËÕÍÅÎÔÅ ÎÅÔ ÓÓÙÌËÉ `ðÒÅÄÙÄÕÝÁÑ' ÉÌÉ `÷×ÅÒÈ' ÄÌÑ ÜÔÏÊ ÎÏÄÙ."
 
-#: info/session.c:1054
+#: info/session.c:1034
 msgid "Moving Up in this window."
 msgstr "ðÅÒÅÈÏÄ ÎÁ ÎÏÄÕ \"÷×ÅÒÈ\" × ÜÔÏÍ ÏËÎÅ."
 
-#: info/session.c:1102
+#: info/session.c:1084
 msgid "Moving to `Prev's last menu item."
 msgstr "ðÅÒÅÈÏÄ ÎÁ ÐÏÓÌÅÄÎÉÊ ÐÕÎËÔ ÍÅÎÀ ÎÏÄÙ `ðÒÅÄÙÄÕÝÁÑ'."
 
-#: info/session.c:1113
+#: info/session.c:1095
 msgid "Move forwards or down through node structure"
 msgstr "ðÒÏÄ×ÉÇÁÔØÓÑ ×ÐÅÒÅÄ ÉÌÉ ×ÎÉÚ ÐÏ ÓÔÒÕËÔÕÒÅ ÎÏÄ"
 
-#: info/session.c:1129
+#: info/session.c:1111
 msgid "Move backwards or up through node structure"
 msgstr "ðÒÏÄ×ÉÇÁÔØÓÑ ÎÁÚÁÄ ÉÌÉ ××ÅÒÈ ÐÏ ÓÔÒÕËÔÕÒÅ ÎÏÄ"
 
-#: info/session.c:1229
+#: info/session.c:1205
 msgid "Scroll forward in this window"
 msgstr "ðÒÏËÒÕÔÉÔØ ×ÐÅÒÅÄ ÔÅËÕÝÅÅ ÏËÎÏ"
 
-#: info/session.c:1237
+#: info/session.c:1213
 msgid "Scroll forward in this window and set default window size"
 msgstr "ðÒÏËÒÕÔÉÔØ ÔÅËÕÝÅÅ ÏËÎÏ ×ÐÅÒÅÄ É ÕÓÔÁÎÏ×ÉÔØ ÒÁÚÍÅÒ ÏËÎÁ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
-#: info/session.c:1245
+#: info/session.c:1221
 msgid "Scroll forward in this window staying within node"
 msgstr "ðÒÏËÒÕÔÉÔØ ×ÐÅÒÅÄ ÔÅËÕÝÅÅ ÏËÎÏ, ÏÓÔÁ×ÁÑÓØ × ÔÅËÕÝÅÊ ÎÏÄÅ"
 
-#: info/session.c:1253
+#: info/session.c:1229
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr ""
 "ðÒÏËÒÕÔÉÔØ ÔÅËÕÝÅÅ ÏËÎÏ ×ÐÅÒÅÄ, ÏÓÔÁ×ÁÑÓØ × ÔÅËÕÝÅÊ ÎÏÄÅ, É ÕÓÔÁÎÏ×ÉÔØ "
 "ÒÁÚÍÅÒ ÏËÎÁ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
-#: info/session.c:1261
+#: info/session.c:1237
 msgid "Scroll backward in this window"
 msgstr "ðÒÏËÒÕÔÉÔØ ÎÁÚÁÄ ÔÅËÕÝÅÅ ÏËÎÏ"
 
-#: info/session.c:1269
+#: info/session.c:1245
 msgid "Scroll backward in this window and set default window size"
 msgstr "ðÒÏËÒÕÔÉÔØ ÔÅËÕÝÅÅ ÏËÎÏ ÎÁÚÁÄ É ÕÓÔÁÎÏ×ÉÔØ ÒÁÚÍÅÒ ÏËÎÁ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
-#: info/session.c:1278
+#: info/session.c:1254
 msgid "Scroll backward in this window staying within node"
 msgstr "ðÒÏËÒÕÔÉÔØ ÎÁÚÁÄ ÔÅËÕÝÅÅ ÏËÎÏ, ÏÓÔÁ×ÁÑÓØ × ÔÅËÕÝÅÊ ÎÏÄÅ"
 
-#: info/session.c:1286
+#: info/session.c:1262
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
@@ -1197,333 +1220,333 @@ msgstr ""
 "ðÒÏËÒÕÔÉÔØ ÔÅËÕÝÅÅ ÏËÎÏ ÎÁÚÁÄ, ÏÓÔÁ×ÁÑÓØ × ÔÅËÕÝÅÊ ÎÏÄÅ, É ÕÓÔÁÎÏ×ÉÔØ ÒÁÚÍÅÒ "
 "ÏËÎÁ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
-#: info/session.c:1294
+#: info/session.c:1270
 msgid "Move to the start of this node"
 msgstr "ðÅÒÅÍÅÓÔÉÔØÓÑ × ÎÁÞÁÌÏ ÎÏÄÙ"
 
-#: info/session.c:1301
+#: info/session.c:1277
 msgid "Move to the end of this node"
 msgstr "ðÅÒÅÍÅÓÔÉÔØÓÑ × ËÏÎÅà ÎÏÄÙ"
 
-#: info/session.c:1308
+#: info/session.c:1284
 msgid "Scroll down by lines"
 msgstr "ðÒÏËÒÕÔÉÔØ ÎÁ ÎÅÓËÏÌØËÏ ÓÔÒÏË ×ÎÉÚ"
 
-#: info/session.c:1325
+#: info/session.c:1301
 msgid "Scroll up by lines"
 msgstr "ðÒÏËÒÕÔÉÔØ ÎÁ ÎÅÓËÏÌØËÏ ÓÔÒÏË ××ÅÒÈ"
 
-#: info/session.c:1343
+#: info/session.c:1319
 msgid "Scroll down by half screen size"
 msgstr "ðÒÏËÒÕÔÉÔØ ÎÁ ÐÏÌÜËÒÁÎÁ ×ÎÉÚ"
 
-#: info/session.c:1369
+#: info/session.c:1345
 msgid "Scroll up by half screen size"
 msgstr "ðÒÏËÒÕÔÉÔØ ÎÁ ÐÏÌÜËÒÁÎÁ ××ÅÒÈ"
 
-#: info/session.c:1398
+#: info/session.c:1374
 msgid "Select the next window"
 msgstr "÷ÙÂÒÁÔØ ÓÌÅÄÕÀÝÅÅ ÏËÎÏ"
 
-#: info/session.c:1437
+#: info/session.c:1413
 msgid "Select the previous window"
 msgstr "÷ÙÂÒÁÔØ ÐÒÅÄÙÄÕÝÅÅ ÏËÎÏ"
 
-#: info/session.c:1488
+#: info/session.c:1464
 msgid "Split the current window"
 msgstr "òÁÚÂÉÔØ ÔÅËÕÝÅÅ ÏËÎÏ"
 
-#: info/session.c:1569
+#: info/session.c:1545
 msgid "Delete the current window"
 msgstr "õÄÁÌÉÔØ ÔÅËÕÝÅÅ ÏËÎÏ"
 
-#: info/session.c:1577
+#: info/session.c:1553
 msgid "Cannot delete a permanent window"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÐÏÓÔÏÑÎÎÏÅ ÏËÎÏ"
 
-#: info/session.c:1610
+#: info/session.c:1585
 msgid "Delete all other windows"
 msgstr "õÄÁÌÉÔØ ×ÓÅ ÏÓÔÁÌØÎÙÅ ÏËÎÁ"
 
-#: info/session.c:1656
+#: info/session.c:1631
 msgid "Scroll the other window"
 msgstr "ðÒÏËÒÕÔÉÔØ ÄÒÕÇÏÅ ÏËÎÏ"
 
-#: info/session.c:1677
+#: info/session.c:1652
 msgid "Scroll the other window backward"
 msgstr "ðÒÏËÒÕÔÉÔØ ÄÒÕÇÏÅ ÏËÎÏ ÎÁÚÁÄ"
 
-#: info/session.c:1683
+#: info/session.c:1658
 msgid "Grow (or shrink) this window"
 msgstr "õ×ÅÌÉÞÉÔØ (ÉÌÉ ÕÍÅÎØÛÉÔØ) ÔÅËÕÝÅÅ ÏËÎÏ"
 
-#: info/session.c:1694
+#: info/session.c:1669
 msgid "Divide the available screen space among the visible windows"
 msgstr "òÁÚÄÅÌÉÔØ ÄÏÓÔÕÐÎÏÅ ÍÅÓÔÏ ÎÁ ÜËÒÁÎÅ ÍÅÖÄÕ ×ÉÄÉÍÙÍÉ ÏËÎÁÍÉ"
 
-#: info/session.c:1701
+#: info/session.c:1676
 msgid "Toggle the state of line wrapping in the current window"
 msgstr "ðÅÒÅËÌÀÞÉÔØ ÒÅÖÉÍ ÒÁÚÂÉ×ÁÎÉÑ ÓÔÒÏË × ÔÅËÕÝÅÍ ÏËÎÅ"
 
-#: info/session.c:1880
+#: info/session.c:1848
 msgid "Select the Next node"
 msgstr "ðÅÒÅÊÔÉ ÎÁ `óÌÅÄÕÀÝÕÀ' ÎÏÄÕ"
 
-#: info/session.c:1888
+#: info/session.c:1856
 msgid "Select the Prev node"
 msgstr "ðÅÒÅÊÔÉ ÎÁ `ðÒÅÄÙÄÕÝÕÀ' ÎÏÄÕ"
 
-#: info/session.c:1896
+#: info/session.c:1864
 msgid "Select the Up node"
 msgstr "ðÅÒÅÊÔÉ ÎÁ `÷ÅÒÈÎÀÀ' ÎÏÄÕ"
 
-#: info/session.c:1903
+#: info/session.c:1871
 msgid "Select the last node in this file"
 msgstr "ðÅÒÅÊÔÉ ÎÁ ÐÏÓÌÅÄÎÀÀ ÎÏÄÕ × ÆÁÊÌÅ"
 
-#: info/session.c:1930 info/session.c:1963
+#: info/session.c:1898 info/session.c:1931
 msgid "This window has no additional nodes"
 msgstr "üÔÏ ÏËÎÏ ÎÅ ÉÍÅÅÔ ÄÏÐÏÌÎÉÔÅÌØÎÙÈ ÎÏÄ"
 
-#: info/session.c:1936
+#: info/session.c:1904
 msgid "Select the first node in this file"
 msgstr "ðÅÒÅÊÔÉ ÎÁ ÐÅÒ×ÕÀ ÎÏÄÕ × ÆÁÊÌÅ"
 
-#: info/session.c:1970
+#: info/session.c:1938
 msgid "Select the last item in this node's menu"
 msgstr "÷ÙÂÒÁÔØ ÐÏÓÌÅÄÎÉÊ ÐÕÎËÔ ÍÅÎÀ × ÔÅËÕÝÅÊ ÎÏÄÅ"
 
-#: info/session.c:1976
+#: info/session.c:1944
 msgid "Select this menu item"
 msgstr "÷ÙÂÒÁÔØ ÚÁÄÁÎÎÙÊ ÐÕÎËÔ ÍÅÎÀ"
 
-#: info/session.c:2005
+#: info/session.c:1977
 #, c-format
 msgid "There aren't %d items in this menu."
 msgstr "÷ ÜÔÏÍ ÍÅÎÀ ÎÅÔ %d ÐÕÎËÔÏ×."
 
-#: info/session.c:2148
+#: info/session.c:2171 info/session.c:2172
 #, c-format
 msgid "Menu item (%s): "
 msgstr "ðÕÎËÔ ÍÅÎÀ (%s): "
 
-#: info/session.c:2150
+#: info/session.c:2175
 msgid "Menu item: "
 msgstr "ðÕÎËÔ ÍÅÎÀ: "
 
-#: info/session.c:2155
+#: info/session.c:2182 info/session.c:2183
 #, c-format
 msgid "Follow xref (%s): "
 msgstr "ðÅÒÅÊÔÉ ÐÏ ÓÓÙÌËÅ (%s): "
 
-#: info/session.c:2157
+#: info/session.c:2186
 msgid "Follow xref: "
 msgstr "ðÅÒÅÊÔÉ ÐÏ ÓÓÙÌËÅ: "
 
-#: info/session.c:2280
+#: info/session.c:2315
 msgid "Read a menu item and select its node"
 msgstr "óÞÉÔÁÔØ ÉÍÑ ÐÕÎËÔÁ ÍÅÎÀ É ÐÅÒÅÊÔÉ Ë ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÊ ÎÏÄÅ"
 
-#: info/session.c:2288
+#: info/session.c:2323
 msgid "Read a footnote or cross reference and select its node"
 msgstr "óÞÉÔÁÔØ ÉÍÑ ÓÓÙÌËÉ ÉÌÉ ÓÎÏÓËÉ É ÐÅÒÅÊÔÉ Ë ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÊ ÎÏÄÅ"
 
-#: info/session.c:2294
+#: info/session.c:2329
 msgid "Move to the start of this node's menu"
 msgstr "óÍÅÓÔÉÔØÓÑ Ë ÎÁÞÁÌÕ ÍÅÎÀ ÔÅËÕÝÅÊ ÎÏÄÙ"
 
-#: info/session.c:2318
+#: info/session.c:2353
 msgid "Visit as many menu items at once as possible"
 msgstr "ðÒÏÓÍÏÔÒÅÔØ ÏÄÎÏ×ÒÅÍÅÎÎÏ ËÁË ÍÏÖÎÏ ÂÏÌØÛÅ ÎÏÄ"
 
-#: info/session.c:2346
+#: info/session.c:2381
 msgid "Read a node name and select it"
 msgstr "óÞÉÔÁÔØ ÉÍÑ ÎÏÄÙ É ÐÅÒÅÊÔÉ Ë ÎÅÊ"
 
-#: info/session.c:2401 info/session.c:2405
+#: info/session.c:2436 info/session.c:2441
 msgid "Goto node: "
 msgstr "ðÅÒÅÊÔÉ Ë ÎÏÄÅ: "
 
-#: info/session.c:2471
+#: info/session.c:2505
 #, c-format
 msgid "No menu in node `%s'."
 msgstr "÷ ÎÏÄÅ `%s' ÎÅÔ ÍÅÎÀ."
 
-#: info/session.c:2516
+#: info/session.c:2551
 #, c-format
 msgid "No menu item `%s' in node `%s'."
 msgstr "ðÕÎËÔ ÍÅÎÀ `%s' ÏÔÓÕÔÓÔ×ÕÅÔ × ÎÏÄÅ `%s'."
 
-#: info/session.c:2546
+#: info/session.c:2581
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÎÏÄÕ ÐÏ ÓÓÙÌËÅ `%s' × `%s'."
 
-#: info/session.c:2597
+#: info/session.c:2631
 msgid "Read a list of menus starting from dir and follow them"
 msgstr "óÞÉÔÁÔØ ÓÐÉÓÏË ÍÅÎÀ, ÎÁÞÉÎÁÀÝÉÊÓÑ Ó dir É ÐÒÏÓÌÅÄÏ×ÁÔØ ÐÏ ÎÉÍ"
 
-#: info/session.c:2599
+#: info/session.c:2633
 msgid "Follow menus: "
 msgstr "ðÒÏÓÌÅÄÏ×ÁÔØ ÐÏ ÍÅÎÀ: "
 
-#: info/session.c:2797
+#: info/session.c:2826
 msgid "Find the node describing program invocation"
 msgstr "îÁÈÏÄÉÔ ÎÏÄÕ, ÒÁÓÓËÁÚÙ×ÁÀÝÕÀ, ËÁË ×ÙÚÙ×ÁÔØ ÐÒÏÇÒÁÍÍÕ"
 
-#: info/session.c:2799
+#: info/session.c:2828
 #, c-format
 msgid "Find Invocation node of [%s]: "
 msgstr "îÁÊÔÉ ÎÏÄÕ Invocation ÄÌÑ [%s]: "
 
-#: info/session.c:2837
+#: info/session.c:2866
 msgid "Read a manpage reference and select it"
 msgstr "óÞÉÔÁÔØ ÉÍÑ manpage É ÐÅÒÅÊÔÉ Ë ÎÅÊ"
 
-#: info/session.c:2841
+#: info/session.c:2870
 msgid "Get Manpage: "
 msgstr "ðÒÏÓÍÏÔÒÅÔØ manpage: "
 
-#: info/session.c:2871
+#: info/session.c:2900
 msgid "Select the node `Top' in this file"
 msgstr "ðÅÒÅÊÔÉ ÎÁ `ðÅÒ×ÕÀ' ÎÏÄÕ"
 
-#: info/session.c:2877
+#: info/session.c:2906
 msgid "Select the node `(dir)'"
 msgstr "ðÅÒÅÊÔÉ ÎÁ ÎÏÄÕ `(dir)'"
 
-#: info/session.c:2897
+#: info/session.c:2923 info/session.c:2925
 #, c-format
 msgid "Kill node (%s): "
 msgstr "õÄÁÌÉÔØ ÎÏÄÕ (%s): "
 
-#: info/session.c:2951
+#: info/session.c:2977
 #, c-format
 msgid "Cannot kill node `%s'"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÎÏÄÕ `%s'"
 
-#: info/session.c:2961
+#: info/session.c:2987
 msgid "Cannot kill the last node"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÐÏÓÌÅÄÎÀÀ ÎÏÄÕ"
 
-#: info/session.c:3047
+#: info/session.c:3073
 msgid "Select the most recently selected node"
 msgstr "ðÅÒÅÊÔÉ Ë ÐÏÓÌÅÄÎÅÊ ×ÙÂÒÁÎÎÏÊ ÎÏÄÅ"
 
-#: info/session.c:3053
+#: info/session.c:3079
 msgid "Kill this node"
 msgstr "õÄÁÌÉÔØ ÔÅËÕÝÕÀ ÎÏÄÕ"
 
-#: info/session.c:3061
+#: info/session.c:3087
 msgid "Read the name of a file and select it"
 msgstr "óÞÉÔÁÔØ ÉÍÑ ÆÁÊÌÁ É ÐÅÒÅÊÔÉ Ë ÎÅÍÕ"
 
-#: info/session.c:3065
+#: info/session.c:3091
 msgid "Find file: "
 msgstr "ïÂÒÁÔÉÔØÓÑ Ë ÆÁÊÌÕ: "
 
-#: info/session.c:3082
+#: info/session.c:3108
 #, c-format
 msgid "Cannot find `%s'."
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ `%s'."
 
-#: info/session.c:3127 info/session.c:3248
+#: info/session.c:3151 info/session.c:3269
 #, c-format
 msgid "Could not create output file `%s'."
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ `%s'."
 
-#: info/session.c:3140 info/session.c:3265 info/session.c:3326
+#: info/session.c:3165 info/session.c:3287 info/session.c:3347
 msgid "Done."
 msgstr "úÁ×ÅÒÛÅÎÏ."
 
-#: info/session.c:3196
+#: info/session.c:3220
 #, c-format
 msgid "Writing node %s..."
 msgstr "úÁÐÉÓØ ÎÏÄÙ %s..."
 
-#: info/session.c:3274
+#: info/session.c:3296
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
 msgstr "îÁÐÒÁ×ÉÔØ ÓÏÄÅÒÖÉÍÏÅ ÜÔÏÊ ÎÏÄÙ ÎÁ ×ÈÏÄ ËÏÍÁÎÄÙ INFO_PRINT_COMMAND"
 
-#: info/session.c:3310
+#: info/session.c:3331
 #, c-format
 msgid "Cannot open pipe to `%s'."
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ËÁÎÁÌ Ë `%s'."
 
-#: info/session.c:3316
+#: info/session.c:3337
 #, c-format
 msgid "Printing node %s..."
 msgstr "ðÅÞÁÔØ ÎÏÄÙ %s..."
 
-#: info/session.c:3558
+#: info/session.c:3567
 #, c-format
 msgid "Searching subfile %s ..."
 msgstr "ðÏÉÓË ÆÁÊÌÁ %s ..."
 
-#: info/session.c:3610
+#: info/session.c:3619
 msgid "Read a string and search for it case-sensitively"
 msgstr "óÞÉÔÁÔØ ÓÔÒÏËÕ É ÚÁÐÕÓÔÉÔØ ÒÅÇÉÓÔÒÏÚÁ×ÉÓÉÍÙÊ ÐÏÉÓË"
 
-#: info/session.c:3617
+#: info/session.c:3626
 msgid "Read a string and search for it"
 msgstr "óÞÉÔÁÔØ ÓÔÒÏËÕ É ÚÁÐÕÓÔÉÔØ ÐÏÉÓË"
 
-#: info/session.c:3625
+#: info/session.c:3634
 msgid "Read a string and search backward for it"
 msgstr "óÞÉÔÁÔØ ÓÔÒÏËÕ É ÚÁÐÕÓÔÉÔØ ÐÏÉÓË × ÏÂÒÁÔÎÏÍ ÎÁÐÒÁ×ÌÅÎÉÉ"
 
-#: info/session.c:3667
+#: info/session.c:3670 info/session.c:3677
 #, c-format
 msgid "%s%sfor string [%s]: "
 msgstr "%s%s ÓÔÒÏËÉ [%s]: "
 
-#: info/session.c:3668
+#: info/session.c:3671 info/session.c:3678
 msgid "Search backward"
 msgstr "ïÂÒÁÔÎÙÊ ÐÏÉÓË"
 
-#: info/session.c:3668
+#: info/session.c:3672 info/session.c:3678
 msgid "Search"
 msgstr "ðÏÉÓË"
 
-#: info/session.c:3669
+#: info/session.c:3673 info/session.c:3679
 msgid " case-sensitively "
 msgstr " c ÕÞÅÔÏÍ ÒÅÇÉÓÔÒÁ "
 
-#: info/session.c:3669
+#: info/session.c:3674 info/session.c:3679
 msgid " "
 msgstr " "
 
-#: info/session.c:3709
+#: info/session.c:3718
 msgid "Search failed."
 msgstr "îÅ ÎÁÊÄÅÎÏ"
 
-#: info/session.c:3727
+#: info/session.c:3736
 msgid "Repeat last search in the same direction"
 msgstr "ðÏ×ÔÏÒÉÔØ ÐÏÓÌÅÄÎÉÊ ÐÏÉÓË × ÔÏÍ ÖÅ ÎÁÐÒÁ×ÌÅÎÉÉ"
 
-#: info/session.c:3730 info/session.c:3740
+#: info/session.c:3739 info/session.c:3749
 msgid "No previous search string"
 msgstr "îÅÔ ÓÔÒÏËÉ ÐÒÅÄÙÄÕÝÅÇÏ ÐÏÉÓËÁ"
 
-#: info/session.c:3737
+#: info/session.c:3746
 msgid "Repeat last search in the reverse direction"
 msgstr "ðÏ×ÔÏÒÉÔØ ÐÏÓÌÅÄÎÉÊ ÐÏÉÓË × ÏÂÒÁÔÎÏÍ ÎÁÐÒÁ×ÌÅÎÉÉ"
 
-#: info/session.c:3755 info/session.c:3761
+#: info/session.c:3765 info/session.c:3771
 msgid "Search interactively for a string as you type it"
 msgstr "úÁÐÕÓÔÉÔØ ÉÎÔÅÒÁËÔÉ×ÎÙÊ ÎÁÒÁÝÉ×ÁÅÍÙÊ ÐÏÉÓË"
 
-#: info/session.c:3855
+#: info/session.c:3851
 msgid "I-search backward: "
 msgstr "îÁÒÁÝÉ×ÁÅÍÙÊ ÏÂÒÁÔÎÙÊ ÐÏÉÓË: "
 
-#: info/session.c:3857
+#: info/session.c:3853
 msgid "I-search: "
 msgstr "îÁÒÁÝÉ×ÁÅÍÙÊ ÐÏÉÓË: "
 
-#: info/session.c:3882
+#: info/session.c:3878 info/session.c:3880
 msgid "Failing "
-msgstr "îÅ ÎÁÊÄÅÎÏ.  "
+msgstr "îÅ ÎÁÊÄÅÎÏ "
 
 #: info/session.c:4340
 msgid "Move to the previous cross reference"
@@ -1537,27 +1560,27 @@ msgstr "óÍÅÓÔÉÔØÓÑ Ë ÓÌÅÄÕÀÝÅÊ ÓÓÙÌËÅ"
 msgid "Select reference or menu item appearing on this line"
 msgstr "÷ÙÂÒÁÔØ ÓÓÙÌËÕ ÉÌÉ ÐÕÎËÔ ÍÅÎÀ, ÎÁÈÏÄÑÝÉÊÓÑ ÎÁ ÄÁÎÎÏÊ ÓÔÒÏËÅ"
 
-#: info/session.c:4381
+#: info/session.c:4382
 msgid "Cancel current operation"
 msgstr "ïÔÍÅÎÉÔØ ×ÙÐÏÌÎÅÎÉÅ ÔÅËÕÝÅÊ ËÏÍÁÎÄÙ"
 
-#: info/session.c:4388
+#: info/session.c:4389
 msgid "Quit"
 msgstr "÷ÙÈÏÄ"
 
-#: info/session.c:4397
+#: info/session.c:4398
 msgid "Move the cursor to a specific line of the window"
 msgstr "ðÅÒÅÍÅÓÔÉÔØ ËÕÒÓÏÒ Ë ÚÁÄÁÎÎÏÊ ÓÔÒÏËÅ ÏËÎÁ"
 
-#: info/session.c:4429
+#: info/session.c:4430
 msgid "Redraw the display"
 msgstr "ðÅÒÅÒÉÓÏ×ÁÔØ ÜËÒÁÎ"
 
-#: info/session.c:4466
+#: info/session.c:4467
 msgid "Quit using Info"
 msgstr "÷ÙÊÔÉ ÉÚ Info"
 
-#: info/session.c:4479
+#: info/session.c:4480
 msgid "Run command bound to this key's lowercase variant"
 msgstr "úÁÐÕÓÔÉÔØ ËÏÍÁÎÄÕ, ÐÒÉ×ÑÚÁÎÎÕÀ Ë ÜÔÏÊ ËÌÁ×ÉÛÅ × ÎÉÖÎÅÍ ÒÅÇÉÓÔÒÅ"
 
@@ -1567,27 +1590,29 @@ msgid "Unknown command (%s)."
 msgstr "îÅÉÚ×ÅÓÔÎÁÑ ËÏÍÁÎÄÁ (%s)."
 
 #: info/session.c:4494
-msgid "\"\" is invalid"
-msgstr "\"\" ÎÅ×ÅÒÎÁÑ ËÏÍÁÎÄÁ"
-
-#: info/session.c:4495
 #, c-format
 msgid "\"%s\" is invalid"
 msgstr "\"%s\" ÎÅ×ÅÒÎÁÑ ËÏÍÁÎÄÁ"
 
-#: info/session.c:4713
+#: info/session.c:4495
+#, c-format
+msgid "`%s' is invalid"
+msgstr "`%s' ÎÅ×ÅÒÎÏ"
+
+#: info/session.c:4709
 msgid "Add this digit to the current numeric argument"
 msgstr "äÏÂÁ×ÌÑÅÔ ÃÉÆÒÕ Ë ÔÅËÕÝÅÍÕ ÞÉÓÌÏ×ÏÍÕ ÁÒÇÕÍÅÎÔÕ"
 
-#: info/session.c:4722
+#: info/session.c:4718
 msgid "Start (or multiply by 4) the current numeric argument"
 msgstr "îÁÞÁÔØ (ÉÌÉ ÕÍÎÏÖÉÔØ ÎÁ 4) ÔÅËÕÝÉÊ ÞÉÓÌÏ×ÏÊ ÁÒÇÕÍÅÎÔ"
 
-#: info/session.c:4737
+#: info/session.c:4733
 msgid "Internally used by \\[universal-argument]"
 msgstr "éÓÐÏÌØÚÕÅÔÓÑ ÆÕÎËÃÉÅÊ \\[universal-argument]"
 
-#: info/tilde.c:344
+#: info/tilde.c:338
+#, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: ÷ÉÒÔÕÁÌØÎÁÑ ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ!\n"
 
@@ -1655,230 +1680,267 @@ msgstr "õÓÔÁÎÏ×ÉÔØ ÚÎÁÞÅÎÉÅ %s ÒÁ×ÎÙÍ (%d): "
 msgid "Set %s to value (%s): "
 msgstr "õÓÔÁÎÏ×ÉÔØ ÚÎÁÞÅÎÉÅ %s ÒÁ×ÎÙÍ (%s): "
 
-#: info/window.c:1164
+#: info/window.c:1138
 msgid "--*** Tags out of Date ***"
 msgstr "--*** ôÅÇÉ ÕÓÔÁÒÅÌÉ ***"
 
-#: info/window.c:1175
+#: info/window.c:1149
 msgid "-----Info: (), lines ----, "
 msgstr "-----Info: (), ÓÔÒÏË ----, "
 
-#: info/window.c:1182
+#: info/window.c:1156
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr "-%s---Info: %s, ÓÔÒÏË: %d --%s--"
 
-#: info/window.c:1186
+#: info/window.c:1160
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr "-%s%s-Info: (%s)%s, ÓÔÒÏË: %d --%s--"
 
-#: info/window.c:1193
+#: info/window.c:1167
 #, c-format
 msgid " Subfile: %s"
 msgstr " æÁÊÌ: %s"
 
-#: lib/getopt.c:675
+#: lib/getopt.c:551 lib/getopt.c:570
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `%s'\n"
 
-#: lib/getopt.c:700
+#: lib/getopt.c:603 lib/getopt.c:607
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: ËÌÀÞ `--%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
 
-#: lib/getopt.c:705
+#: lib/getopt.c:616 lib/getopt.c:621
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: ËÌÀÞ `%c%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
 
-#: lib/getopt.c:723 lib/getopt.c:896
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: ËÌÀÞ `%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ\n"
 
-#: lib/getopt.c:752
+#: lib/getopt.c:727 lib/getopt.c:730
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `--%s'\n"
 
-#: lib/getopt.c:756
+#: lib/getopt.c:738 lib/getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `%c%s'\n"
 
-#: lib/getopt.c:782
+#: lib/getopt.c:796 lib/getopt.c:799
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: ÎÅÄÏÐÕÓÔÉÍÙÊ ËÌÀÞ -- %c\n"
 
-#: lib/getopt.c:785
+#: lib/getopt.c:805 lib/getopt.c:808
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ÎÅ×ÅÒÎÙÊ ËÌÀÞ -- %c\n"
 
-#: lib/getopt.c:815 lib/getopt.c:945
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: ËÌÀÞ %c ÄÏÌÖÅÎ ÂÙ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ\n"
 
-#: lib/getopt.c:862
+#: lib/getopt.c:935 lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `-W %s'\n"
 
-#: lib/getopt.c:880
+#: lib/getopt.c:978 lib/getopt.c:999
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: ËÌÀÞ `-W %s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#, c-format
+msgid "arguments to @%s ignored"
+msgstr "ÁÒÇÕÍÅÎÔÙ ÄÌÑ @%s ÉÇÎÏÒÉÒÏ×ÁÎÙ"
+
+#: makeinfo/cmds.c:585
 msgid "January"
 msgstr "ÑÎ×ÁÒÑ"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "February"
 msgstr "ÆÅ×ÒÁÌÑ"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "March"
 msgstr "ÍÁÒÔÁ"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "April"
 msgstr "ÁÐÒÅÌÑ"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "May"
 msgstr "ÍÁÑ"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "June"
 msgstr "ÉÀÎÑ"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "July"
 msgstr "ÉÀÌÑ"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "August"
 msgstr "Á×ÇÕÓÔÁ"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "September"
 msgstr "ÓÅÎÔÑÂÒÑ"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "October"
 msgstr "ÏËÔÑÂÒÑ"
 
-#: makeinfo/cmds.c:517
+#: makeinfo/cmds.c:587
 msgid "November"
 msgstr "ÎÏÑÂÒÑ"
 
-#: makeinfo/cmds.c:517
+#: makeinfo/cmds.c:587
 msgid "December"
 msgstr "ÄÅËÁÂÒÑ"
 
-#: makeinfo/cmds.c:658
+#: makeinfo/cmds.c:936
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "ÍÁÌÏ×ÅÒÏÑÔÎÙÊ ÚÎÁË %c × @var"
 
-#: makeinfo/cmds.c:701
+#: makeinfo/cmds.c:979
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "×ÅÓØ ÁÒÇÕÍÅÎÔ @sc ÎÁÂÒÁÎ ÚÁÇÌÁ×ÎÙÍÉ ÂÕË×ÁÍÉ, ÒÅÚÕÌØÔÁÔÁ ÎÅ ÂÕÄÅÔ"
 
-#: makeinfo/cmds.c:759
+#: makeinfo/cmds.c:1034
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "ÏÖÉÄÁÌÏÓØ `{', ×ÓÔÒÅÞÅÎÏ `%c'"
 
-#: makeinfo/cmds.c:789
+#: makeinfo/cmds.c:1074
 msgid "end of file inside verb block"
 msgstr "ËÏÎÅà ÆÁÊÌÁ ×ÓÔÒÅÞÅÎ ×ÎÕÔÒÉ ÎÅÏËÏÎÞÅÎÎÏÇÏ ÂÌÏËÁ"
 
-#: makeinfo/cmds.c:797
+#: makeinfo/cmds.c:1082
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "ÏÖÉÄÁÌÏÓØ `}', ×ÓÔÒÅÞÅÎÏ `%c'"
 
-#: makeinfo/cmds.c:942
+#: makeinfo/cmds.c:1112
+msgid ""
+"@strong{Note...} produces a spurious cross-reference in Info; reword to "
+"avoid that"
+msgstr ""
+"@strong{Note...} ÓÏÚÄÁÅÔ × Info ÌÏÖÎÕÀ ÐÅÒÅËÒÅÓÔÎÕÀ ÓÓÙÌËÕ; ÐÅÒÅÆÒÁÚÉÒÕÊÔÅ "
+"ÔÅËÓÔ, ÞÔÏÂÙ ÉÚÂÅÖÁÔØ ÜÔÏÇÏ"
+
+#: makeinfo/cmds.c:1305
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "ëÏÍÁÎÄÁ %c%s ÕÓÔÁÒÅÌÁ É ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ"
 
-#: makeinfo/cmds.c:1014
+#: makeinfo/cmds.c:1414
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "ËÏÍÁÎÄÅ @sp ÎÕÖÎÏ ÕËÁÚÁÔØ ÐÏÌÏÖÉÔÅÌØÎÙÊ ÞÉÓÌÏ×ÏÊ ÁÒÇÕÍÅÎÔ, Á ÎÅ `%s'"
 
-#: makeinfo/cmds.c:1348 makeinfo/cmds.c:1374 makeinfo/footnote.c:81
+#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "ðÌÏÈÏÊ ÁÒÇÕÍÅÎÔ ÄÌÑ %c%s"
 
-#: makeinfo/cmds.c:1358 makeinfo/makeinfo.c:4140
+#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
 msgid "asis"
 msgstr "asis"
 
-#: makeinfo/cmds.c:1360 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
 msgid "none"
 msgstr "none"
 
-#: makeinfo/defun.c:85
+#: makeinfo/cmds.c:1789
+#, c-format
+msgid "Bad argument to @%s"
+msgstr "ðÌÏÈÏÊ ÁÒÇÕÍÅÎÔ ÄÌÑ @%s"
+
+# ???
+#: makeinfo/cmds.c:1803
+msgid "insert"
+msgstr "insert"
+
+#: makeinfo/defun.c:84
 msgid "Missing `}' in @def arg"
 msgstr "÷ ÁÒÇÕÍÅÎÔÅ @def ÐÒÏÐÕÝÅÎÁ `}'"
 
-#: makeinfo/defun.c:363
+#: makeinfo/defun.c:403
 msgid "Function"
 msgstr "æÕÎËÃÉÑ"
 
-#: makeinfo/defun.c:366
+#: makeinfo/defun.c:406
 msgid "Macro"
 msgstr "íÁËÒÏ"
 
-#: makeinfo/defun.c:369
+#: makeinfo/defun.c:409
 msgid "Special Form"
 msgstr "óÐÅÃÉÁÌØÎÁÑ ÆÏÒÍÁ"
 
-#: makeinfo/defun.c:373
+#: makeinfo/defun.c:413
 msgid "Variable"
 msgstr "ðÅÒÅÍÅÎÎÁÑ"
 
-#: makeinfo/defun.c:376
+#: makeinfo/defun.c:416
 msgid "User Option"
 msgstr "ðÏÌØÚÏ×ÁÔÅÌØÓËÉÊ ÐÁÒÁÍÅÔÒ"
 
-#: makeinfo/defun.c:380
+#: makeinfo/defun.c:420
 msgid "Instance Variable"
 msgstr "ðÅÒÅÍÅÎÎÁÑ ÜËÚÅÍÐÌÑÒÁ"
 
-#: makeinfo/defun.c:384
+#: makeinfo/defun.c:424
 msgid "Method"
 msgstr "íÅÔÏÄ"
 
-#: makeinfo/defun.c:466 makeinfo/defun.c:470 makeinfo/defun.c:615
-#: makeinfo/defun.c:631 makeinfo/defun.c:671
+#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
+#: makeinfo/defun.c:644 makeinfo/xml.c:2229
 msgid "of"
 msgstr "ÉÚ"
 
-#: makeinfo/defun.c:474 makeinfo/defun.c:478 makeinfo/defun.c:482
-#: makeinfo/defun.c:624 makeinfo/defun.c:676
+#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
 msgid "on"
 msgstr "ÎÁÄ"
 
-#: makeinfo/defun.c:717
+#: makeinfo/defun.c:711
 #, c-format
-msgid "Must be in `%s' insertion to use `%sx'"
-msgstr "ëÏÍÁÎÄÕ `%sx'  ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÔÏÌØËÏ ×Ï ×ÓÔÁ×ËÅ `%s'"
+msgid "Must be in `@%s' environment to use `@%s'"
+msgstr "îÕÖÎÏ ÂÙÔØ × ÂÌÏËÅ `@%s', ÞÔÏÂÙ ÉÓÐÏÌØÚÏ×ÁÔØ `@%s'"
 
-#: makeinfo/files.c:448
+#: makeinfo/files.c:435
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr "%s: getwd: %s, %s\n"
 
+#: makeinfo/files.c:638
+#, c-format
+msgid "`%s' omitted before output filename"
+msgstr "ÐÅÒÅÄ ÉÍÅÎÅÍ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ ÏÐÕÝÅÎÏ `%s'"
+
+#: makeinfo/files.c:646
+#, c-format
+msgid "`%s' omitted since writing to stdout"
+msgstr "`%s' ÏÐÕÝÅÎÏ, ÐÏÓËÏÌØËÕ ÐÅÞÁÔØ ÉÄÅÔ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ"
+
+#: makeinfo/files.c:694
+msgid "Output buffer not empty."
+msgstr "÷ÙÈÏÄÎÏÊ ÂÕÆÅÒ ÎÅ ÐÕÓÔ."
+
 #: makeinfo/footnote.c:150
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
@@ -1897,229 +1959,277 @@ msgstr "óÎÏÓËÁ ÏÐÒÅÄÅÌÅÎÁ ÂÅÚ ÒÏÄÉÔÅÌØÓËÏÊ ÎÏÄÙ"
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "óÎÏÓËÉ ÉÚ ÓÎÏÓÏË ÚÁÐÒÅÝÅÎÙ"
 
-#: makeinfo/footnote.c:298
+#: makeinfo/footnote.c:302 makeinfo/index.c:189
 msgid "Footnotes"
 msgstr "óÎÏÓËÉ"
 
-#: makeinfo/html.c:42
+#: makeinfo/html.c:87
+#, c-format
+msgid "%s: could not open --css-file: %s"
+msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ css-ÆÁÊÌ: %s"
+
+#: makeinfo/html.c:172
+#, c-format
+msgid "%s:%d: --css-file ended in comment"
+msgstr "%s:%d: css-ÆÁÊÌ ÏÂÒÙ×ÁÅÔÓÑ × ËÏÍÍÅÎÔÁÒÉÉ"
+
+#: makeinfo/html.c:207
 msgid "Untitled"
 msgstr "âÅÚ ÚÁÇÏÌÏ×ËÁ"
 
-#: makeinfo/html.c:298
+#: makeinfo/html.c:422
+msgid "[unexpected] no html tag to pop"
+msgstr ""
+"[ÎÅÐÒÅÄ×ÉÄÅÎÎÁÑ ÓÉÔÕÁÃÉÑ] × ÓÔÅËÅ html-ÔÅÇÏ× ÎÅÔ ÜÌÅÍÅÎÔÁ ÄÌÑ ×ÙÔÁÌËÉ×ÁÎÉÑ"
+
+#: makeinfo/html.c:752
 #, c-format
-msgid "Invalid node name: `%s'"
-msgstr "îÅ×ÅÒÎÏÅ ÉÍÑ ÎÏÄÙ: `%s'"
+msgid "[unexpected] invalid node name: `%s'"
+msgstr "[ÎÅÐÒÅÄ×ÉÄÅÎÎÁÑ ÓÉÔÕÁÃÉÑ] ÎÅ×ÅÒÎÏÅ ÉÍÑ ÎÏÄÙ: `%s'"
 
-#: makeinfo/index.c:213
+#: makeinfo/index.c:169
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "éÍÅÎÎÏÊ ÕËÁÚÁÔÅÌØ `%s' ÎÅÉÚ×ÅÓÔÅÎ"
 
-#: makeinfo/index.c:238
+#: makeinfo/index.c:234
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr ""
 "Info ÎÅ ÍÏÖÅÔ ÏÂÒÁÂÏÔÁÔØ ÚÎÁË `:' ×Ï ×ÈÏÖÄÅÎÉÉ ÁÌÆÁ×ÉÔÎÏÇÏ ÕËÁÚÁÔÅÌÑ `%s'"
 
-#: makeinfo/index.c:396
+#: makeinfo/index.c:412
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "éÍÅÎÎÏÊ ÕËÁÚÁÔÅÌØ `%s' ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ"
 
-#: makeinfo/index.c:439
+#: makeinfo/index.c:455
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "îÅÉÚ×ÅÓÔÅÎ ÉÍÅÎÎÏÊ ÕËÁÚÁÔÅÌØ `%s' É/ÉÌÉ `%s' × @synindex"
 
-#: makeinfo/index.c:666
+#: makeinfo/index.c:661
+msgid "(line )"
+msgstr "(ÓÔÒÏËÁ )"
+
+#: makeinfo/index.c:669
+#, c-format
+msgid "(line %*d)"
+msgstr "(ÓÔÒÏËÁ %*d)"
+
+#: makeinfo/index.c:750
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "îÅÉÚ×ÅÓÔÅÎ ÉÍÅÎÎÏÊ ÕËÁÚÁÔÅÌØ `%s' × @printindex"
 
-#: makeinfo/index.c:709
+#: makeinfo/index.c:819
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "÷ÈÏÖÄÅÎÉÅ ÄÌÑ ÉÍÅÎÎÏÇÏ ÕËÁÚÁÔÅÌÑ `%s' ×ÎÅ ÎÏÄÙ"
 
-#: makeinfo/index.c:712 makeinfo/index.c:751
+#: makeinfo/index.c:822 makeinfo/index.c:858
 msgid "(outside of any node)"
 msgstr "(×ÎÅ ËÁËÏÊ-ÌÉÂÏ ÎÏÄÙ)"
 
-#: makeinfo/insertion.c:198
+#: makeinfo/index.c:919 makeinfo/index.c:925
+msgid "See "
+msgstr "óÍÏÔÒÉÔÅ "
+
+#: makeinfo/insertion.c:160
+msgid "@item not allowed in argument to @itemize"
+msgstr "ÎÅÌØÚÑ ÚÁÄÁ×ÁÔØ @item × ÁÒÇÕÍÅÎÔÅ ÄÌÑ @itemize"
+
+#: makeinfo/insertion.c:238
 msgid "Broken-Type in insertion_type_pname"
 msgstr "Broken-Type × insertion_type_pname"
 
-#: makeinfo/insertion.c:271
+#: makeinfo/insertion.c:334
 msgid "Enumeration stack overflow"
 msgstr "ðÅÒÅÐÏÌÎÅÎÉÅ ÓÔÅËÁ ÐÅÒÅÞÉÓÌÅÎÉÑ"
 
-#: makeinfo/insertion.c:303
+#: makeinfo/insertion.c:366
 #, c-format
 msgid "lettering overflow, restarting at %c"
 msgstr "ÚÁËÏÎÞÉÌÓÑ ÁÌÆÁ×ÉÔ, ×ÏÚ×ÒÁÔ ÎÁ %c"
 
-#: makeinfo/insertion.c:538
+#: makeinfo/insertion.c:631
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
 msgstr "%s ÄÏÌÖÎÁ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ: ÆÏÒÍÁÔÏÍ ÄÌÑ %citem"
 
-#: makeinfo/insertion.c:693
+#: makeinfo/insertion.c:719
+#, c-format
+msgid "%cfloat environments cannot be nested"
+msgstr "ÂÌÏËÉ %cfloat ÎÅÌØÚÑ ×ËÌÁÄÙ×ÁÔØ ÄÒÕÇ × ÄÒÕÇÁ"
+
+#: makeinfo/insertion.c:973
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
 msgstr "ÏÖÉÄÁÌÏÓØ `@end' Ó `%s', ×ÓÔÒÅÞÅÎÏ `%s'"
 
-#: makeinfo/insertion.c:931
+#: makeinfo/insertion.c:1337
 #, c-format
 msgid "No matching `%cend %s'"
 msgstr "îÅÔ ÐÁÒÎÏÊ `%cend %s'"
 
-#: makeinfo/insertion.c:1084
+#: makeinfo/insertion.c:1592
 #, c-format
 msgid "%s requires letter or digit"
 msgstr "%s ÔÒÅÂÕÅÔ ÂÕË×Ù ÉÌÉ ÃÉÆÒÙ"
 
-#: makeinfo/insertion.c:1158
+#: makeinfo/insertion.c:1687
 msgid "end of file inside verbatim block"
 msgstr "ËÏÎÅà ÆÁÊÌÁ ×ÓÔÒÅÞÅÎ ×ÎÕÔÒÉ ÎÅÏËÏÎÞÅÎÎÏÇÏ ÂÌÏËÁ"
 
-#: makeinfo/insertion.c:1318
+#: makeinfo/insertion.c:1913
+#, c-format
+msgid "@%s not meaningful outside `@float' environment"
+msgstr "@%s ÎÅ ÉÍÅÅÔ ÓÍÙÓÌÁ ×ÎÅ ÂÌÏËÁ `@float'"
+
+#: makeinfo/insertion.c:1949
 msgid "@menu seen before first @node, creating `Top' node"
 msgstr "@menu ×ÓÔÒÅÞÅÎÏ ÐÅÒÅÄ ÐÅÒ×ÏÊ @node, ÂÕÄÅÔ ÓÏÚÄÁÎÁ ÎÏÄÁ `Top'"
 
-#: makeinfo/insertion.c:1319
+#: makeinfo/insertion.c:1950
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr ""
 "×ÅÒÏÑÔÎÏ, ×ÁÛÁ ÎÏÄÁ @top ÄÏÌÖÎÁ ÂÙÔØ × ÂÌÏËÅ @ifnottex, Á ÎÅ × @ifinfo?"
 
-#: makeinfo/insertion.c:1331
+#: makeinfo/insertion.c:1962
 msgid "@detailmenu seen before first node, creating `Top' node"
 msgstr "@detailmenu ×ÓÔÒÅÞÅÎÏ ÐÅÒÅÄ ÐÅÒ×ÏÊ @node, ÂÕÄÅÔ ÓÏÚÄÁÎÁ ÎÏÄÁ `Top'"
 
-#: makeinfo/insertion.c:1346
+#: makeinfo/insertion.c:2018
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr "@%s ÎÅ ÉÍÅÅÔ ÓÍÙÓÌÁ ×ÎÅ ÂÌÏËÁ `@titlepage' ÉÌÉ `@quotation'"
+
+#: makeinfo/insertion.c:2032
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' environment"
+msgstr "@%s ÎÅ ÉÍÅÅÔ ÓÍÙÓÌÁ ×ÎÅ ÂÌÏËÁ `@titlepage'"
+
+#: makeinfo/insertion.c:2063
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr "îÅÐÁÒÎÁÑ `%c%s'"
 
-#: makeinfo/insertion.c:1353
+#: makeinfo/insertion.c:2068
 #, c-format
 msgid "`%c%s' needs something after it"
 msgstr "ðÏÓÌÅ `%c%s' ÄÏÌÖÎÏ ÞÔÏ-ÔÏ ÉÄÔÉ"
 
-#: makeinfo/insertion.c:1359
+#: makeinfo/insertion.c:2074
 #, c-format
-msgid "Bad argument to `%s', `%s', using `%s'"
-msgstr "ðÌÏÈÏÊ ÁÒÇÕÍÅÎÔ `%s', `%s', ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÎ `%s'"
+msgid "Bad argument `%s' to `@%s', using `%s'"
+msgstr "ðÌÏÈÏÊ ÁÒÇÕÍÅÎÔ `%s' ÄÌÑ `@%s', ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÎ `%s'"
 
-#: makeinfo/insertion.c:1453
+#: makeinfo/insertion.c:2171
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
 msgstr "@%s ÎÅ ÉÍÅÅÔ ÓÍÙÓÌÁ ×ÎÕÔÒÉ ÂÌÏËÁ `@%s'"
 
-#: makeinfo/insertion.c:1462
+#: makeinfo/insertion.c:2180
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "@itemx ÎÅ ÉÍÅÅÔ ÓÍÙÓÌÁ ×ÎÕÔÒÉ ÂÌÏËÁ `%s'"
 
-#: makeinfo/insertion.c:1646
+#: makeinfo/insertion.c:2356
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "%c%s ×ÓÔÒÅÞÅÎÁ ×ÎÅ ÂÌÏËÁ ×ÓÔÁ×ËÉ"
 
-#: makeinfo/lang.c:331
+#: makeinfo/lang.c:580
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ×ÅÒÎÙÍ ËÏÄÏÍ ÑÚÙËÁ ÉÚ ISO 639"
 
-#: makeinfo/lang.c:384
+#: makeinfo/lang.c:655
 #, c-format
-msgid "unrecogized encoding name `%s'"
-msgstr "ÉÍÑ ËÏÄÉÒÏ×ËÉ `%s' ÎÅÒÁÓÐÏÚÎÁÎÏ"
+msgid "unrecognized encoding name `%s'"
+msgstr "ÉÍÑ ËÏÄÉÒÏ×ËÉ `%s' ÎÅ ÒÁÓÐÏÚÎÁÎÏ"
 
-#: makeinfo/lang.c:387
+#: makeinfo/lang.c:663
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "ÉÚ×ÉÎÉÔÅ, ËÏÄÉÒÏ×ËÁ `%s' ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
 
-#: makeinfo/lang.c:414
+#: makeinfo/lang.c:715
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÏ ÚÁËÏÄÉÒÏ×ÁÎÎÙÊ ÚÎÁË `%s'"
 
-#: makeinfo/lang.c:502
-#, c-format
-msgid "%s is an invalid ISO code, using %c"
-msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ×ÅÒÎÙÍ ËÏÄÏÍ ISO, ÉÓÐÏÌØÚÕÅÔÓÑ %c"
-
-#: makeinfo/lang.c:687
+#: makeinfo/lang.c:1009
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "%c%s ÏÖÉÄÁÅÔ × ËÁÞÅÓÔ×Å ÁÒÇÕÍÅÎÔÁ `i' ÉÌÉ `j', Á ÎÅ `%c'"
 
-#: makeinfo/lang.c:691
+#: makeinfo/lang.c:1013
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr "%c%s ÏÖÉÄÁÅÔ × ËÁÞÅÓÔ×Å ÁÒÇÕÍÅÎÔÁ ÏÄÉÎ ÓÉÍ×ÏÌ `i' ÉÌÉ `j'"
 
-#: makeinfo/macro.c:134
+#: makeinfo/macro.c:128
 #, c-format
 msgid "macro `%s' previously defined"
 msgstr "ÍÁËÒÏ `%s' ÂÙÌÏ ÏÐÒÅÄÅÌÅÎÏ ÒÁÎØÛÅ"
 
-#: makeinfo/macro.c:138
+#: makeinfo/macro.c:132
 #, c-format
 msgid "here is the previous definition of `%s'"
 msgstr "ÍÅÓÔÏ ÐÒÅÄÙÄÕÝÅÇÏ ÏÐÒÅÄÅÌÅÎÉÑ `%s'"
 
 #: makeinfo/macro.c:355
 #, c-format
-msgid "\\ in macro expansion followed by `%s' instead of \\ or parameter name"
-msgstr "ÐÏÓÌÅ \\ × ÒÁÓËÒÙÔÉÉ ÍÁËÒÏ ÓÔÏÉÔ `%s', Á ÎÅ \\ ÉÌÉ ÉÍÑ ÐÁÒÁÍÅÔÒÁ"
+msgid "\\ in macro expansion followed by `%s' instead of parameter name"
+msgstr "ÐÏÓÌÅ \\ × ÒÁÓËÒÙÔÉÉ ÍÁËÒÏ ÓÔÏÉÔ `%s', Á ÎÅ ÉÍÑ ÐÁÒÁÍÅÔÒÁ"
 
-#: makeinfo/macro.c:403
+#: makeinfo/macro.c:401
 #, c-format
 msgid "Macro `%s' called on line %d with too many args"
 msgstr "íÁËÒÏ `%s' ×ÙÚ×ÁÎÏ ÎÁ ÓÔÒÏËÅ %d Ó ÉÚÌÉÛÎÉÍÉ ÁÒÇÕÍÅÎÔÁÍÉ"
 
-#: makeinfo/macro.c:594
+#: makeinfo/macro.c:586
 #, c-format
 msgid "%cend macro not found"
 msgstr "ÎÅ ×ÓÔÒÅÞÅÎÏ %cend macro"
 
-#: makeinfo/macro.c:632
+#: makeinfo/macro.c:624
 msgid "@quote-arg only useful for single-argument macros"
 msgstr "@quote-arg ÐÏÌÅÚÎÁ, ÔÏÌØËÏ ÅÓÌÉ ÍÁËÒÏ ÐÒÉÎÉÍÁÅÔ ÏÄÉÎ ÁÒÇÕÍÅÎÔ"
 
-#: makeinfo/macro.c:668
+#: makeinfo/macro.c:660
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "ÎÅÐÁÒÎÙÅ @end %s É @%s"
 
-#: makeinfo/makeinfo.c:316
+#: makeinfo/makeinfo.c:184
 #, c-format
-msgid "%s:%d: warning: "
-msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: "
-
-#: makeinfo/makeinfo.c:339
 msgid "Too many errors!  Gave up.\n"
 msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÏÛÉÂÏË! ïÓÔÁÎÏ×ËÁ.\n"
 
-#: makeinfo/makeinfo.c:350 makeinfo/makeinfo.c:2026
+#: makeinfo/makeinfo.c:302
+#, c-format
+msgid "%s:%d: warning: "
+msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: "
+
+#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
 #, c-format
 msgid "Misplaced %c"
 msgstr "úÄÅÓØ ÎÅ ÄÏÌÖÎÏ ÂÙÔØ %c"
 
-#: makeinfo/makeinfo.c:370
+#: makeinfo/makeinfo.c:340
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ.\n"
 
-#: makeinfo/makeinfo.c:373
+#: makeinfo/makeinfo.c:343
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... TEXINFO-æáêì...\n"
 
-#: makeinfo/makeinfo.c:376
+#: makeinfo/makeinfo.c:346
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -2128,7 +2238,7 @@ msgstr ""
 "ÕÍÏÌÞÁÎÉÀ × Info-ÆÁÊÌÙ, ËÏÔÏÒÙÅ ÍÏÖÎÏ ÞÉÔÁÔØ Ó ÐÏÍÏÝØÀ Emacs ÉÌÉ\n"
 "ÏÔÄÅÌØÎÏÊ ÐÒÏÇÒÁÍÍÙ GNU Info.\n"
 
-#: makeinfo/makeinfo.c:380
+#: makeinfo/makeinfo.c:350
 #, c-format
 msgid ""
 "General options:\n"
@@ -2156,20 +2266,22 @@ msgstr ""
 "  -v, --verbose                 ÐÏÑÓÎÑÔØ ÄÅÊÓÔ×ÉÑ.\n"
 "      --version                 ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ.\n"
 
-#: makeinfo/makeinfo.c:394
+#: makeinfo/makeinfo.c:364
 #, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output DocBook rather than Info.\n"
+"      --docbook             output Docbook XML rather than Info.\n"
 "      --html                output HTML rather than Info.\n"
-"      --xml                 output XML (TexinfoML) rather than Info.\n"
+"      --xml                 output Texinfo XML rather than Info.\n"
+"      --plaintext           output plain text rather than Info.\n"
 msgstr ""
 "÷ÙÂÏÒ ×ÙÈÏÄÎÏÇÏ ÆÏÒÍÁÔÁ (ÐÏ ÕÍÏÌÞÁÎÉÀ ×Ù×ÏÄÉÔÓÑ Info):\n"
-"      --docbook             ×Ù×ÏÄÉÔØ × ÆÏÒÍÁÔÅ DocBook, Á ÎÅ Info.\n"
+"      --docbook             ×Ù×ÏÄÉÔØ × ÆÏÒÍÁÔÅ DocBook XML, Á ÎÅ Info.\n"
 "      --html                ×Ù×ÏÄÉÔØ × ÆÏÒÍÁÔÅ HTML, Á ÎÅ Info.\n"
-"      --xml                 ×Ù×ÏÄÉÔØ × ÆÏÒÍÁÔÅ XML (TexinfoML), Á ÎÅ × Info.\n"
+"      --xml                 ×Ù×ÏÄÉÔØ × ÆÏÒÍÁÔÅ Texinfo XML, Á ÎÅ × Info.\n"
+"      --plaintext           ×Ù×ÏÄÉÔØ ÐÒÏÓÔÏÊ ÔÅËÓÔ, Á ÎÅ Info.\n"
 
-#: makeinfo/makeinfo.c:401
+#: makeinfo/makeinfo.c:372
 msgid ""
 "General output options:\n"
 "  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
@@ -2200,7 +2312,7 @@ msgstr ""
 " -o, --output=æáêì         ×Ù×ÏÄÉÔØ × ÕËÁÚÁÎÎÙÊ æáêì (ËÁÔÁÌÏÇ ÄÌÑ HTML Ó \n"
 "                           ÒÁÚÂÉÅÎÉÅÍ).\n"
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:386
 #, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2238,70 +2350,111 @@ msgstr ""
 "      --split-size=òáúíåò     ÒÁÚÂÉ×ÁÔØ ÎÁ ÆÁÊÌÙ ÚÁÄÁÎÎÏÇÏ òáúíåòá (ÐÏ\n"
 "                                ÕÍÏÌÞÁÎÉÀ %d).\n"
 
-#: makeinfo/makeinfo.c:433
+#: makeinfo/makeinfo.c:403
+msgid ""
+"Options for HTML:\n"
+"      --css-include=FILE        include FILE in HTML <style> output;\n"
+"                                  read stdin if FILE is -.\n"
+msgstr ""
+"ëÌÀÞÉ ÄÌÑ HTML:\n"
+"      --css-include=æáêì        ×ËÌÀÞÉÔØ æáêì × ÔÅÇ <style> × ×Ù×ÏÄÅ HTML;\n"
+"                                ÞÉÔÁÔØ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ, ÅÓÌÉ æáêì ÚÁÄÁÎ ËÁË "
+"-.\n"
+
+#: makeinfo/makeinfo.c:409
+#, c-format
+msgid ""
+"Options for XML and Docbook:\n"
+"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"d).\n"
+"                                  If VAL is 0, ignorable whitespace is "
+"dropped.\n"
+msgstr ""
+"ëÌÀÞÉ ÄÌÑ XML É Docbook:\n"
+"      --output-indent=þéóìï     ÄÅÌÁÔØ ÄÌÑ XML-ÜÌÅÍÅÎÔÏ× ÏÔÓÔÕÐÙ ÎÁ "
+"ÚÁÄÁÎÎÏÅ \n"
+"                                  þéóìï ÐÒÏÂÅÌÏ× (ÐÏ ÕÍÏÌÞÁÎÉÀ %d).\n"
+"                                åÓÌÉ þéóìï ÒÁ×ÎÏ ÎÕÌÀ, ÎÅÚÎÁÞÁÝÉÅ ÐÒÏÂÅÌÙ "
+"ÏÐÕÓËÁÀÔÓÑ.\n"
+
+#: makeinfo/makeinfo.c:416
 msgid ""
 "Input file options:\n"
-"      --commands-in-node-names   allow @ commands in node names.\n"
-"  -D VAR                         define the variable VAR, as with @set.\n"
-"  -I DIR                         append DIR to the @include search path.\n"
-"  -P DIR                         prepend DIR to the @include search path.\n"
-"  -U VAR                         undefine the variable VAR, as with @clear.\n"
+"      --commands-in-node-names  allow @ commands in node names.\n"
+"  -D VAR                        define the variable VAR, as with @set.\n"
+"  -I DIR                        append DIR to the @include search path.\n"
+"  -P DIR                        prepend DIR to the @include search path.\n"
+"  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
 "ëÌÀÞÉ, ÕÐÒÁ×ÌÑÀÝÉÅ ×ÈÏÄÎÙÍÉ ÆÁÊÌÁÍÉ:\n"
 "      --commands-in-node-names   ÐÏÚ×ÏÌÉÔØ ÉÓÐÏÌØÚÏ×ÁÎÉÅ @-ËÏÍÁÎÄ × ÉÍÅÎÁÈ "
 "ÎÏÄ.\n"
-" -D ðåòåíåîîáñ           ÏÐÒÅÄÅÌÉÔØ ÐÅÒÅÍÅÎÎÕÀ, ÁÎÁÌÏÇÉÞÎÏ ÉÓÐÏÌØÚÏ×ÁÎÉÀ "
+" -D ðåòåíåîîáñ           ÏÐÒÅÄÅÌÉÔØ ðåòåíåîîõà, ÁÎÁÌÏÇÉÞÎÏ ÉÓÐÏÌØÚÏ×ÁÎÉÀ "
 "@set.\n"
 " -I ëáôáìïç              ÄÏÂÁ×ÉÔØ ëáôáìïç × ËÏÎÅà ÓÐÉÓËÁ ÐÏÉÓËÁ ×ËÌÀÞÁÅÍÙÈ\n"
-"                           ÆÁÊÌÏ×.\n"
+"                           ÆÁÊÌÏ× @include.\n"
 " -P ëáôáìïç              ÄÏÂÁ×ÉÔØ ëáôáìïç × ÎÁÞÁÌÏ ÓÐÉÓËÁ ÐÏÉÓËÁ ×ËÌÀÞÁÅÍÙÈ\n"
-"                           ÆÁÊÌÏ×.\n"
-" -U ðåòåíåîîáñ           ÓÄÅÌÁÔØ ÐÅÒÅÍÅÎÎÕÀ ÎÅÏÐÒÅÄÅÌÅÎÎÏÊ, ÁÎÁÌÏÇÉÞÎÏ\n"
+"                           ÆÁÊÌÏ× @include.\n"
+" -U ðåòåíåîîáñ           ÓÄÅÌÁÔØ ðåòåíåîîõà ÎÅÏÐÒÅÄÅÌÅÎÎÏÊ, ÁÎÁÌÏÇÉÞÎÏ\n"
 "                           ÉÓÐÏÌØÚÏ×ÁÎÉÀ @clear.\n"
 
-#: makeinfo/makeinfo.c:442
-#, fuzzy
+#: makeinfo/makeinfo.c:425
 msgid ""
 "Conditional processing in input:\n"
+"  --ifdocbook       process @ifdocbook and @docbook even if\n"
+"                      not generating Docbook.\n"
 "  --ifhtml          process @ifhtml and @html even if not generating HTML.\n"
 "  --ifinfo          process @ifinfo even if not generating Info.\n"
 "  --ifplaintext     process @ifplaintext even if not generating plain text.\n"
 "  --iftex           process @iftex and @tex; implies --no-split.\n"
+"  --ifxml           process @ifxml and @xml.\n"
+"  --no-ifdocbook    do not process @ifdocbook and @docbook text.\n"
 "  --no-ifhtml       do not process @ifhtml and @html text.\n"
 "  --no-ifinfo       do not process @ifinfo text.\n"
 "  --no-ifplaintext  do not process @ifplaintext text.\n"
 "  --no-iftex        do not process @iftex and @tex text.\n"
+"  --no-ifxml        do not process @ifxml and @xml text.\n"
+"\n"
+"  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
 msgstr ""
 "õÓÌÏ×ÎÁÑ ÏÂÒÁÂÏÔËÁ ÉÓÈÏÄÎÏÇÏ ÔÅËÓÔÁ:\n"
-"     --ifhtml      ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @ifhtml É @html,\n"
-"                   ÖÅ ÐÒÉ ×Ù×ÏÄÅ ÎÅ × ÆÏÒÍÁÔÅ HTML.\n"
-"     --ifinfo      ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @ifinfo, ÄÁÖÅ ÐÒÉ\n"
-"                     ×Ù×ÏÄÅ × ÆÏÒÍÁÔÅ HTML.\n"
-"     --iftex       ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @iftex É @tex,\n"
-"                     ÐÏÄÒÁÚÕÍÅ×ÁÅÔ --no-split.\n"
-"     --no-ifhtml   ÎÅ ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @ifhtml É @html.\n"
-"     --no-ifinfo   ÎÅ ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @ifinfo.\n"
-"     --no-iftex    ÎÅ ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @iftex É @tex.\n"
-
-#: makeinfo/makeinfo.c:454
-#, fuzzy
+"  --ifhtml          ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @ifhtml É @html,\n"
+"                      ÄÁÖÅ ÐÒÉ ×Ù×ÏÄÅ ÎÅ × ÆÏÒÍÁÔÅ HTML.\n"
+"  --ifinfo          ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @ifinfo, ÄÁÖÅ ÐÒÉ\n"
+"                      ×Ù×ÏÄÅ ÎÅ × ÆÏÒÍÁÔÅ Info.\n"
+"  --ifplaintext     ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @ifplaintext, ÄÁÖÅ ÐÒÉ\n"
+"                      ×Ù×ÏÄÅ ÎÅ × ÆÏÒÍÁÔÅ ÐÒÏÓÔÏÇÏ ÔÅËÓÔÁ.\n"
+"  --iftex           ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @iftex É @tex;\n"
+"                      ÐÏÄÒÁÚÕÍÅ×ÁÅÔ --no-split.\n"
+"  --ifxml           ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @ifxml É @xml.\n"
+"  --no-ifhtml       ÎÅ ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @ifhtml É @html.\n"
+"  --no-ifinfo       ÎÅ ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @ifinfo.\n"
+"  --no-ifplaintext  ÎÅ ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @ifplaintext.\n"
+"  --no-iftex        ÎÅ ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @iftex É @tex.\n"
+"  --no-ifxml        ÎÅ ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @ifxml É @xml.\n"
+"\n"
+"  ëÒÏÍÅ ÔÏÇÏ, ÄÌÑ ËÌÀÞÅÊ --no-ifæïòíáô, ÏÂÒÁÂÁÔÙ×ÁÔØ ÂÌÏËÉ @ifnotæïòíáô.\n"
+
+#: makeinfo/makeinfo.c:444
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating HTML, --ifhtml is on and the others are off;\n"
 "  if generating Info, --ifinfo is on and the others are off;\n"
 "  if generating plain text, --ifplaintext is on and the others are off;\n"
+"  if generating XML, --ifxml is on and the others are off.\n"
 msgstr ""
-"  ïÂÒÁÂÏÔËÁ ÕÓÌÏ×ÎÙÈ ËÏÍÁÎÄ @if... ÚÁ×ÉÓÉÔ ÏÔ ×ÙÈÏÄÎÏÇÏ ÆÏÒÍÁÔÁ:\n"
+"ðÏ ÕÍÏÌÞÁÎÉÀ ÏÂÒÁÂÏÔËÁ ÕÓÌÏ×ÎÙÈ ËÏÍÁÎÄ @if... ÚÁ×ÉÓÉÔ ÏÔ ×ÙÈÏÄÎÏÇÏ ÆÏÒÍÁÔÁ:\n"
 "  ÐÒÉ ×Ù×ÏÄÅ HTML ×ËÌÀÞÅÎ --ifhtml, Á ÏÓÔÁÌØÎÙÅ ×ÙËÌÀÞÅÎÙ;\n"
-"  ÐÒÉ ×Ù×ÏÄÅ Info ÉÌÉ ÐÒÏÓÔÏÇÏ ÔÅËÓÔÁ ×ËÌÀÞÅÎ --ifinfo, Á ÏÓÔÁÌØÎÙÅ "
-"×ÙËÌÀÞÅÎÙ.\n"
+"  ÐÒÉ ×Ù×ÏÄÅ Info ×ËÌÀÞÅÎ --ifinfo, Á ÏÓÔÁÌØÎÙÅ ×ÙËÌÀÞÅÎÙ;\n"
+"  ÐÒÉ ×Ù×ÏÄÅ ÐÒÏÓÔÏÇÏ ÔÅËÓÔÁ ×ËÌÀÞÅÎ --ifplaintext, ÏÓÔÁÌØÎÙÅ ×ÙËÌÀÞÅÎÙ;\n"
+"  ÐÒÉ ×Ù×ÏÄÅ XML ×ËÌÀÞÅÎ --ifxml, ÏÓÔÁÌØÎÙÅ ×ÙËÌÀÞÅÎÙ.\n"
 
-#: makeinfo/makeinfo.c:461
+#: makeinfo/makeinfo.c:452
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                     write Info to foo's @setfilename\n"
 "  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write XML to @setfilename\n"
+"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
 "  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
 "  makeinfo --no-headers foo.texi        write plain text to standard output\n"
 "\n"
@@ -2312,8 +2465,8 @@ msgid ""
 msgstr ""
 "ðÒÉÍÅÒÙ:\n"
 "  makeinfo foo.texi                    ÚÁÐÉÓÁÔØ Info × @setfilename ÉÚ foo\n"
-"  makeinfo --html foo.texi             ÚÁÐÉÓÁÔØ HTML × @setfilename ÉÚ foo\n"
-"  makeinfo --xml foo.texi              ÚÁÐÉÓÁÔØ XML × @setfilename\n"
+"  makeinfo --html foo.texi             ÚÁÐÉÓÁÔØ HTML × @setfilename\n"
+"  makeinfo --xml foo.texi              ÚÁÐÉÓÁÔØ Texinfo XML × @setfilename\n"
 "  makeinfo --docbook foo.texi          ÚÁÐÉÓÁÔØ DocBook XML × @setfilename\n"
 "  makeinfo --no-headers -o - foo.texi  ÚÁÐÉÓÁÔØ ÐÒÏÓÔÏÊ ÔÅËÓÔ ÎÁ "
 "ÓÔÁÎÄÁÒÔÎÙÊ\n"
@@ -2322,78 +2475,85 @@ msgstr ""
 "  makeinfo --html --no-headers foo.texi ÚÁÐÉÓÁÔØ HTML ÂÅÚ ÍÅÎÀ É ÓÔÒÏË ÎÏÄÙ\n"
 "  makeinfo --number-sections foo.texi  ÚÁÐÉÓÁÔØ Info Ó ÎÕÍÅÒÏ×ÁÎÎÙÍÉ "
 "ÒÁÚÄÅÌÁÍÉ\n"
-"  makeinfo --no-split foo.texi         ÚÁÐÉÓÁÔØ ÏÄÉÎ ÂÏÌØÛÏÊ Info\n"
+"  makeinfo --no-split foo.texi         ÚÁÐÉÓÁÔØ ÏÄÉÎ ÂÏÌØÛÏÊ Info-ÆÁÊÌ\n"
 
-#: makeinfo/makeinfo.c:570 makeinfo/makeinfo.c:593 makeinfo/makeinfo.c:655
-#: makeinfo/makeinfo.c:676
+#: makeinfo/makeinfo.c:603
+#, c-format
+msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
+msgstr "%s: ÎÅÉÚ×ÅÓÔÎÏÅ ÚÎÁÞÅÎÉÅ TEXINFO_OUTPUT_FORMAT `%s' ÉÇÎÏÒÉÒÏ×ÁÎÏ.\n"
+
+#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
+#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr "%s: %s ÁÒÇÕÍÅÎÔ ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏ×ÙÍ, ÎÅ `%s'.\n"
 
-#: makeinfo/makeinfo.c:583
+#: makeinfo/makeinfo.c:660
 #, c-format
-msgid "Couldn't open macro expansion output `%s'"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ ÍÁËÒÏÒÁÓÛÉÒÅÎÉÑ `%s'"
+msgid "%s: could not open macro expansion output `%s'"
+msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ ÍÁËÒÏÒÁÓÛÉÒÅÎÉÑ `%s'"
 
-#: makeinfo/makeinfo.c:586
-msgid "Cannot specify more than one macro expansion output"
-msgstr "íÏÖÎÏ ÚÁÄÁÔØ ÔÏÌØËÏ ÏÄÉÎ ×ÙÈÏÄÎÏÊ ÆÁÊÌ ÍÁËÒÏÒÁÓÛÉÒÅÎÉÑ"
+#: makeinfo/makeinfo.c:665
+#, c-format
+msgid "%s: ignoring second macro expansion output `%s'.\n"
+msgstr "%s: ×ÔÏÒÏÊ ×ÙÈÏÄÎÏÊ ÆÁÊÌ ÍÁËÒÏÒÁÓÛÉÒÅÎÉÑ `%s' ÉÇÎÏÒÉÒÏ×ÁÎ.\n"
 
-#: makeinfo/makeinfo.c:624
+#: makeinfo/makeinfo.c:707
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 "%s: ÁÒÇÕÍÅÎÔ --paragraph-indent ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏ×ÙÍ, ÉÌÉ\n"
 "`none', ÉÌÉ `asis'; ÎÅ `%s'.\n"
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 "%s: ÁÒÇÕÍÅÎÔ --footnote-style ÄÏÌÖÅÎ ÂÙÔØ `separate' ÉÌÉ `end'; Á ÎÅ `%s'.\n"
 
-#: makeinfo/makeinfo.c:723
+#: makeinfo/makeinfo.c:806
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: ÐÒÏÐÕÝÅÎ ÁÒÇÕÍÅÎÔ, ÚÁÄÁÀÝÉÊ ÆÁÊÌ.\n"
 
-#: makeinfo/makeinfo.c:898
+#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#, c-format
+msgid "Multiline command %c%s used improperly"
+msgstr "îÅÐÒÁ×ÉÌØÎÏ ÉÓÐÏÌØÚÏ×ÁÎÁ ÍÎÏÇÏÓÔÒÏÞÎÁÑ ËÏÍÁÎÄÁ %c%s"
+
+#: makeinfo/makeinfo.c:1000
 #, c-format
 msgid "Expected `%s'"
 msgstr "ïÖÉÄÁÅÔÓÑ `%s'"
 
-#: makeinfo/makeinfo.c:1365
-msgid "File exists, but is not a directory"
-msgstr "æÁÊÌ ÓÕÝÅÓÔ×ÕÅÔ, ÎÏ ÎÅ Ñ×ÌÑÅÔÓÑ ËÁÔÁÌÏÇÏÍ"
-
-#: makeinfo/makeinfo.c:1366
+#: makeinfo/makeinfo.c:1479
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ËÁÔÁÌÏÇ `%s': %s"
 
-#: makeinfo/makeinfo.c:1414
+#: makeinfo/makeinfo.c:1525
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "`%s' ÎÅ ÎÁÊÄÅÎ × `%s'"
 
-#: makeinfo/makeinfo.c:1496
+#: makeinfo/makeinfo.c:1605
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
 "%s: òÁÓËÒÙÔÉÅ ÍÁËÒÏÓÏ× × ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ ÎÅ ÐÒÏÉÚ×ÏÄÉÔÓÑ,\n"
 "ÔÁË ËÁË ÔÕÄÁ ÎÁÐÒÁ×ÌÅÎ ×Ù×ÏÄ × ÆÏÒÍÁÔÅ Info.\n"
 
-#: makeinfo/makeinfo.c:1526
+#: makeinfo/makeinfo.c:1638
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "óÏÚÄÁÎÉÅ %s-ÆÁÊÌÁ `%s' ÉÚ `%s'.\n"
 
-#: makeinfo/makeinfo.c:1561
+#: makeinfo/makeinfo.c:1673
 #, c-format
 msgid "This is %s, produced by makeinfo version %s from %s.\n"
 msgstr "üÔÏ %s, ÓÏÚÄÁÎÎÙÊ makeinfo ×ÅÒÓÉÉ %s ÉÚ %s.\n"
 
-#: makeinfo/makeinfo.c:1583
+#: makeinfo/makeinfo.c:1709
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2401,328 +2561,326 @@ msgstr ""
 "%s: õÄÁÌÅÎÉÅ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ ÍÁËÒÏÒÁÓÛÉÒÅÎÉÊ `%s' -- ÂÙÌÉ ÏÛÉÂËÉ;\n"
 "ÉÓÐÏÌØÚÕÊÔÅ --force, ÞÔÏÂÙ ÐÒÉÎÕÄÉÔÅÌØÎÏ ÓÏÈÒÁÎÉÔØ ÒÅÚÕÌØÔÁÔÙ.\n"
 
-#: makeinfo/makeinfo.c:1627
+#: makeinfo/makeinfo.c:1773
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 "%s: õÄÁÌÅÎÉÅ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ `%s' -- ÂÙÌÉ ÏÛÉÂËÉ;\n"
 "ÉÓÐÏÌØÚÕÊÔÅ --force, ÞÔÏÂÙ ÐÒÉÎÕÄÉÔÅÌØÎÏ ÓÏÈÒÁÎÉÔØ ÒÅÚÕÌØÔÁÔÙ.\n"
 
-#: makeinfo/makeinfo.c:1853
+#: makeinfo/makeinfo.c:2034
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "îÅÉÚ×ÅÓÔÎÁÑ ËÏÍÁÎÄÁ `%s'"
 
-#: makeinfo/makeinfo.c:1875
+#: makeinfo/makeinfo.c:2056
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr ""
 "éÓÐÏÌØÚÕÊÔÅ ÆÉÇÕÒÎÙÅ ÓËÏÂËÉ, ÞÔÏÂÙ ÐÅÒÅÄÁÔØ @%s ËÏÍÁÎÄÕ × ËÁÞÅÓÔ×Å ÁÒÇÕÍÅÎÔÁ"
 
-#: makeinfo/makeinfo.c:2068
+#: makeinfo/makeinfo.c:2314
 #, c-format
-msgid "%c%s expected `{...}'"
-msgstr "%c%s ÐÏÄÒÁÚÕÍÅ×ÁÅÔ `{...}'"
+msgid "%c%s expected braces"
+msgstr "%c%s ÐÏÄÒÁÚÕÍÅ×ÁÅÔ ÆÉÇÕÒÎÙÅ ÓËÏÂËÉ"
 
-#: makeinfo/makeinfo.c:2098
+#: makeinfo/makeinfo.c:2327
 msgid "Unmatched }"
 msgstr "îÅÐÁÒÎÁÑ }"
 
-#: makeinfo/makeinfo.c:2148
+#: makeinfo/makeinfo.c:2375
 msgid "NO_NAME!"
 msgstr "âåú_éíåîé!"
 
-#: makeinfo/makeinfo.c:2169
+#: makeinfo/makeinfo.c:2396
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s ÐÒÏÐÕÝÅÎÁ ÚÁËÒÙ×ÁÀÝÁÑ ÓËÏÂËÁ"
 
-#: makeinfo/makeinfo.c:2958
-msgid "First argument to cross-reference may not be empty"
-msgstr "ðÅÒ×ÙÊ ÁÒÇÕÍÅÎÔ ÐÅÒÅËÒÅÓÔÎÏÊ ÓÓÙÌËÉ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÐÕÓÔÙÍ"
-
-#: makeinfo/makeinfo.c:3018 makeinfo/makeinfo.c:3236 makeinfo/xml.c:1340
-msgid "see "
-msgstr "ÓÍÏÔÒÉÔÅ "
-
-#: makeinfo/makeinfo.c:3018
-msgid "See "
-msgstr "óÍÏÔÒÉÔÅ "
-
-#: makeinfo/makeinfo.c:3164
-#, c-format
-msgid "`.' or `,' must follow cross reference, not %c"
-msgstr "ÐÏÓÌÅ ÓÓÙÌËÉ ÄÏÌÖÎÙ ÓÌÅÄÏ×ÁÔØ `.' ÉÌÉ `,', ×ÓÔÒÅÞÅÎÏ %c"
-
-#: makeinfo/makeinfo.c:3212
-msgid "First argument to @inforef may not be empty"
-msgstr "ðÅÒ×ÙÊ ÁÒÇÕÍÅÎÔ @inforef ÎÅ ÍÏÖÅÔ ÂÙÔØ ÐÕÓÔÙÍ"
-
-#: makeinfo/makeinfo.c:3427
+#: makeinfo/makeinfo.c:3309
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÆÁÊÌ `%s' × ËÏÍÁÎÄÅ @image (ÄÌÑ HTML): %s"
 
-#: makeinfo/makeinfo.c:3440
+#: makeinfo/makeinfo.c:3315
 #, c-format
-msgid "No `%s.png' or `.jpg', and no extension supplied"
-msgstr "îÅ ÎÁÊÄÅÎ ÆÁÊÌ `%s.png' ÉÌÉ `.jpg', Á ÒÁÓÛÉÒÅÎÉÅ ÎÅ ÚÁÄÁÎÏ"
+msgid "No such file `%s'"
+msgstr "æÁÊÌ `%s' ÎÅ ÓÕÝÅÓÔ×ÕÅÔ"
 
-#: makeinfo/makeinfo.c:3490
+#: makeinfo/makeinfo.c:3447
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÆÁÊÌ `%s' × ËÏÍÁÎÄÅ @image (ÄÌÑ ÔÅËÓÔÁ): %s"
 
-#: makeinfo/makeinfo.c:3497
+#: makeinfo/makeinfo.c:3456
 msgid "@image missing filename argument"
 msgstr "ÐÏÓÌÅ @image ÐÒÏÐÕÝÅÎ ÁÒÇÕÍÅÎÔ ÚÁÄÁÀÝÉÊ ÆÁÊÌ "
 
-#: makeinfo/makeinfo.c:3690
+#: makeinfo/makeinfo.c:3675
+#, c-format
+msgid "undefined flag: %s"
+msgstr "ÎÅÏÐÒÅÄÅÌÅÎÎÙÊ ÆÌÁÇ: %s"
+
+#: makeinfo/makeinfo.c:3676
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{úÎÁÞÅÎÉÅ `%s' ÎÅ ÚÁÄÁÎÏ}"
 
-#: makeinfo/makeinfo.c:3744
+#: makeinfo/makeinfo.c:3728
 #, c-format
 msgid "%c%s requires a name"
 msgstr "ËÏÍÁÎÄÅ %c%s ÎÕÖÎÏ ÕËÁÚÁÔØ ÉÍÑ"
 
-#: makeinfo/makeinfo.c:3850
+#: makeinfo/makeinfo.c:3834
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "ëÏÎÅà ÆÁÊÌÁ ÒÁÎØÛÅ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÊ ËÏÍÁÎÄÙ @end %s"
 
-#: makeinfo/makeinfo.c:4081
+#: makeinfo/makeinfo.c:4082
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr "`%.40s...' ÓÌÉÛËÏÍ ×ÅÌÉËÏ; ÎÅ×ÏÚÍÏÖÎÏ ÒÁÓËÒÙÔØ"
 
-#: makeinfo/multi.c:226
+#: makeinfo/multi.c:116
 msgid "Missing } in @multitable template"
 msgstr "÷ ÛÁÂÌÏÎÅ @multitable ÐÒÏÐÕÝÅÎÁ `}'"
 
-#: makeinfo/multi.c:302
+#: makeinfo/multi.c:254
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "ÔÅËÓÔ `%s' ÐÏÓÌÅ @multitable ÉÇÎÏÒÉÒÏ×ÁÎ"
 
-#: makeinfo/multi.c:375
+#: makeinfo/multi.c:393
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ËÏÌÏÎÏË × ÜÌÅÍÅÎÔÅ ÔÁÂÌÉÃÙ (ÍÁËÓÉÍÕÍ %d)"
 
-#: makeinfo/multi.c:426
+#: makeinfo/multi.c:555
 #, c-format
-msgid "Cannot select column #%d in multitable"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÂÒÁÔØ ËÏÌÏÎËÕ %d × ÔÁÂÌÉÃÅ"
+msgid "[unexpected] cannot select column #%d in multitable"
+msgstr "[ÎÅÐÒÅÄ×ÉÄÅÎÎÁÑ ÓÉÔÕÁÃÉÑ] ÎÅ×ÏÚÍÏÖÎÏ ×ÙÂÒÁÔØ ËÏÌÏÎËÕ #%d × ÔÁÂÌÉÃÅ"
 
-#: makeinfo/multi.c:529
+#: makeinfo/multi.c:584
 msgid "ignoring @tab outside of multitable"
 msgstr "@tab ×ÎÅ ÔÁÂÌÉÃÙ ÉÇÎÏÒÉÒÏ×ÁÎ"
 
-# ???
-#: makeinfo/multi.c:565
+#: makeinfo/multi.c:632
+#, c-format
 msgid "** Multicolumn output from last row:\n"
-msgstr "á ÚÁÞÅÍ Ñ ÄÏÌÖÅÎ ÜÔÏ ÐÅÒÅ×ÏÄÉÔØ?\n"
+msgstr "** íÎÏÇÏËÏÌÏÎÏÞÎÙÊ ×Ù×ÏÄ ÉÚ ÐÏÓÌÅÄÎÅÊ ÓÔÒÏËÉ:\n"
 
-#: makeinfo/multi.c:568
+#: makeinfo/multi.c:635
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* ËÏÌÏÎËÁ %d: ×Ù×ÏÄ = %s\n"
 
-#: makeinfo/node.c:276
+#: makeinfo/node.c:280
 #, c-format
 msgid "Node `%s' previously defined at line %d"
 msgstr "îÏÄÁ `%s' ÂÙÌÁ ÒÁÎÅÅ ÏÐÒÅÄÅÌÅÎÁ × ÓÔÒÏËÅ %d"
 
-#: makeinfo/node.c:594
+#: makeinfo/node.c:648
 #, c-format
 msgid "Formatting node %s...\n"
 msgstr "æÏÒÍÁÔÉÒÏ×ÁÎÉÅ ÎÏÄÙ %s...\n"
 
-#: makeinfo/node.c:655
+#: makeinfo/node.c:716
 #, c-format
-msgid "Node `%s' requires a sectioning command (e.g. %c%s)"
-msgstr "äÌÑ ÎÏÄÙ `%s' ÔÒÅÂÕÅÔÓÑ ËÏÍÁÎÄÁ ÏÐÉÓÁÎÉÑ ÓÔÒÕËÔÕÒÙ ÇÌÁ× (e.g. %c%s)"
+msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
+msgstr "äÌÑ ÎÏÄÙ `%s' ÔÒÅÂÕÅÔÓÑ ËÏÍÁÎÄÁ ÏÐÉÓÁÎÉÑ ÓÔÒÕËÔÕÒÙ ÇÌÁ× (ÎÁÐÒ. %c%s)"
 
-#: makeinfo/node.c:815
+#: makeinfo/node.c:879
 #, c-format
 msgid "No node name specified for `%c%s' command"
 msgstr "äÌÑ ËÏÍÁÎÄÙ `%c%s' ÎÅ ÚÁÄÁÎÏ ÉÍÑ ÎÏÄÙ"
 
-#: makeinfo/node.c:856 makeinfo/node.c:1075
+#: makeinfo/node.c:920 makeinfo/node.c:1151
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr "íÁÒËÅÒ `%s' É ÎÏÄÁ `%s' ÓÓÙÌÁÀÔÓÑ ÎÁ ÏÄÎÏ É ÔÏ ÖÅ ÉÍÑ ÆÁÊÌÁ"
 
-#: makeinfo/node.c:859
+#: makeinfo/node.c:923
 msgid "This @anchor command ignored; references to it will not work"
 msgstr "äÁÎÎÁÑ ËÏÍÁÎÄÁ @anchor ÉÇÎÏÒÉÒÕÅÔÓÑ; ÓÓÙÌËÉ ÎÁ ÎÅÅ ÎÅ ÂÕÄÕÔ ÒÁÂÏÔÁÔØ"
 
-#: makeinfo/node.c:861 makeinfo/node.c:1078
+#: makeinfo/node.c:925 makeinfo/node.c:1154
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "ðÅÒÅÉÍÅÎÕÊÔÅ ÜÔÏÔ ÍÁÒËÅÒ ÉÌÉ ÉÓÐÏÌØÚÕÊÔÅ ËÌÀÞ `--no-split'"
 
-#: makeinfo/node.c:891
+#: makeinfo/node.c:955
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
 msgstr "îÅÏÖÉÄÁÎÎÁÑ ÓÔÒÏËÁ × ËÏÎÃÅ ÒÁÚÂÉÔÏÇÏ HTML-ÆÁÊÌÁ `%s'"
 
-#: makeinfo/node.c:920
-msgid "Node:"
-msgstr "óÌÅÄÕÀÝÁÑ:"
-
-#: makeinfo/node.c:930
+#: makeinfo/node.c:991
 msgid "Next:"
 msgstr "óÌÅÄÕÀÝÁÑ:"
 
-#: makeinfo/node.c:940
+#: makeinfo/node.c:1007
 msgid "Previous:"
 msgstr "ðÒÅÄÙÄÕÝÁÑ:"
 
-#: makeinfo/node.c:950
+#: makeinfo/node.c:1021
 msgid "Up:"
 msgstr "÷×ÅÒÈ:"
 
-#: makeinfo/node.c:1072
+#: makeinfo/node.c:1148
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr "íÁÒËÅÒÙ `%s' É `%s' ÓÓÙÌÁÀÔÓÑ ÎÁ ÏÄÎÏ É ÔÏ ÖÅ ÉÍÑ ÆÁÊÌÁ"
 
-#: makeinfo/node.c:1077
+#: makeinfo/node.c:1153
 msgid "@anchor command ignored; references to it will not work"
 msgstr "ëÏÍÁÎÄÁ @anchor ÉÇÎÏÒÉÒÕÅÔÓÑ; ÓÓÙÌËÉ ÎÁ ÎÅÅ ÎÅ ÂÕÄÕÔ ÒÁÂÏÔÁÔØ"
 
 #  ÚÄÅÓØ %s ÍÏÖÅÔ ÂÙÔØ `cross' ÉÌÉ `menu'
-#: makeinfo/node.c:1277
+#: makeinfo/node.c:1347
 #, c-format
-msgid "%s reference to nonexistent node `%s'"
-msgstr "%s ÎÁ ÎÅÓÕÝÅÓÔ×ÕÀÝÕÀ ÎÏÄÕ `%s'"
+msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
+msgstr ""
+"%s ÎÁ ÎÅÓÕÝÅÓÔ×ÕÀÝÕÀ ÎÏÄÕ `%s' (×ÏÚÍÏÖÎÏ, ÎÅÐÒÁ×ÉÌØÎÏ ÏÐÉÓÁÎÁ ÓÔÒÕËÔÕÒÁ "
+"ÇÌÁ×?)"
 
-#: makeinfo/node.c:1294
+#: makeinfo/node.c:1363
 msgid "Menu"
 msgstr "óÓÙÌËÁ ÉÚ ÍÅÎÀ"
 
-#: makeinfo/node.c:1296
+#: makeinfo/node.c:1365
 msgid "Cross"
 msgstr "ðÅÒÅËÒÅÓÔÎÁÑ ÓÓÙÌËÁ"
 
-#: makeinfo/node.c:1380
+#: makeinfo/node.c:1447
 #, c-format
-msgid "Next field of node `%s' not pointed to"
-msgstr "îÁ ÐÏÌÅ Next ÎÏÄÙ `%s' ÎÅÔ ÓÓÙÌÏË"
+msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
+msgstr ""
+"îÁ ÐÏÌÅ Next ÎÏÄÙ `%s' ÎÅÔ ÓÓÙÌÏË (×ÏÚÍÏÖÎÏ, ÎÅÐÒÁ×ÉÌØÎÏ ÏÐÉÓÁÎÁ ÓÔÒÕËÔÕÒÁ "
+"ÇÌÁ×?)"
 
-#: makeinfo/node.c:1383
+#: makeinfo/node.c:1450
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "÷ ÜÔÏÊ ÎÏÄÅ (%s) ÎÅÐÒÁ×ÉÌØÎÙÊ ÕËÁÚÁÔÅÌØ Prev"
 
-#: makeinfo/node.c:1395
+#: makeinfo/node.c:1462
 msgid "Prev"
 msgstr "ðÒÅÄÙÄÕÝÁÑ"
 
-#: makeinfo/node.c:1438
+#: makeinfo/node.c:1505
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "îÁ ÐÏÌÅ Prev ÎÏÄÙ `%s' ÎÅÔ ÓÓÙÌÏË"
 
-#: makeinfo/node.c:1442
+#: makeinfo/node.c:1509
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "÷ ÜÔÏÊ ÎÏÄÅ (%s) ÎÅÐÒÁ×ÉÌØÎÙÊ ÕËÁÚÁÔÅÌØ Next"
 
-#: makeinfo/node.c:1454
+#: makeinfo/node.c:1521
 #, c-format
-msgid "`%s' has no Up field"
-msgstr "÷ ÎÏÄÅ `%s' ÎÅÔ ÐÏÌÑ Up"
+msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
+msgstr ""
+"÷ ÎÏÄÅ `%s' ÎÅÔ ÐÏÌÑ Up (×ÏÚÍÏÖÎÏ, ÎÅÐÒÁ×ÉÌØÎÏ ÏÐÉÓÁÎÁ ÓÔÒÕËÔÕÒÁ ÇÌÁ×?)"
 
-#: makeinfo/node.c:1457
+#: makeinfo/node.c:1524
 msgid "Up"
 msgstr "÷×ÅÒÈ"
 
-#: makeinfo/node.c:1523
+#: makeinfo/node.c:1590
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr "îÏÄÁ `%s' ÎÅ ÉÍÅÅÔ ÐÕÎËÔÁ ÍÅÎÀ ÄÌÑ `%s', ÈÏÔÑ ÎÁ ÎÅÅ ÓÓÙÌÁÅÔÓÑ ÐÏÌÅ Up"
 
-#: makeinfo/node.c:1552
+#: makeinfo/node.c:1619
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr "ÎÁ ÎÏÄÕ `%s' ÐÏÑ×ÉÌÏÓØ %d ÓÓÙÌÏË"
 
-#: makeinfo/node.c:1566
+#: makeinfo/node.c:1633
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "ÎÁ ÎÏÄÕ `%s' ÎÅÔ ÓÓÙÌÏË"
 
-#: makeinfo/sectioning.c:117
+#: makeinfo/node.c:1723
+#, c-format
+msgid "Removing %s\n"
+msgstr "õÄÁÌÅÎÉÅ %s\n"
+
+#: makeinfo/node.c:1727
+#, c-format
+msgid "Can't remove file `%s': %s"
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÆÁÊÌ `%s': %s"
+
+#: makeinfo/sectioning.c:122
+#, c-format
+msgid "Appendix %c"
+msgstr "ðÒÉÌÏÖÅÎÉÅ %c"
+
+#: makeinfo/sectioning.c:467
 #, c-format
-msgid "Appendix %c "
-msgstr "ðÒÉÌÏÖÅÎÉÅ %c "
+msgid "Internal error (search_sectioning) `%s'!"
+msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ (search_sectioning) `%s'!"
 
-#: makeinfo/sectioning.c:356 makeinfo/sectioning.c:444
+#: makeinfo/sectioning.c:562
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
 msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ (search_sectioning) \"%s\"!"
 
-#: makeinfo/sectioning.c:502
+#: makeinfo/sectioning.c:623
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr "ëÏÍÁÎÄÁ %c%s ÕÓÔÁÒÅÌÁ; ÉÓÐÏÌØÚÕÊÔÅ ×ÍÅÓÔÏ ÎÅÅ %c%s"
 
-#: makeinfo/sectioning.c:518
+#: makeinfo/sectioning.c:639
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr "îÏÄÁ Ó %ctop × ËÁÞÅÓÔ×Å ÒÁÚÄÅÌÁ ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ"
 
-#: makeinfo/sectioning.c:526
+#: makeinfo/sectioning.c:647
 #, c-format
 msgid "Here is the %ctop node"
 msgstr "úÄÅÓØ ÎÁÈÏÄÉÔÓÑ ÎÏÄÁ %ctop"
 
-#: makeinfo/sectioning.c:543
+#: makeinfo/sectioning.c:663
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr "%ctop ×ÓÔÒÅÞÅÎÁ ÐÅÒÅÄ %cnode, ÐÏ ÕÍÏÌÞÁÎÉÀ ÉÓÐÏÌØÚÕÅÔÓÑ %s"
 
-#: makeinfo/toc.c:221 makeinfo/toc.c:298 makeinfo/toc.c:299
+#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
 msgid "Table of Contents"
 msgstr "óÏÄÅÒÖÁÎÉÅ"
 
-#: makeinfo/toc.c:330 makeinfo/toc.c:366 makeinfo/toc.c:367
+#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
 msgid "Short Contents"
 msgstr "ëÒÁÔËÏÅ ÓÏÄÅÒÖÁÎÉÅ"
 
-#: makeinfo/toc.c:406
-#, c-format
-msgid "%s: TOC should be here, but it was not found"
-msgstr "%s: ÚÄÅÓØ ÄÏÌÖÎÏ ÂÙÔØ ÓÏÄÅÒÁÖÁÎÉÅ, ÎÏ ÏÎÏ ÎÅ ÎÁÊÄÅÎÏ"
-
-#: makeinfo/xml.c:1108
+#: makeinfo/xml.c:1605
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ @image ÆÁÊÌ `%s': %s"
 
-#: util/install-info.c:151
+#: makeinfo/xml.c:2097
+msgid ""
+"@headitem as the last item of @multitable produces invalid Docbook documents"
+msgstr ""
+"ÉÓÐÏÌØÚÏ×ÁÎÉÅ @headitem × ËÁÞÅÓÔ×Å ÐÏÓÌÅÄÎÅÇÏ ÜÌÅÍÅÎÔÁ @multitable ×ÙÄÁÅÔ "
+"ÎÅËÏÒÒÅËÔÎÙÅ ÄÏËÕÍÅÎÔÙ Docbook"
+
+#: util/install-info.c:154
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: "
 
-#: util/install-info.c:176 util/install-info.c:189
-msgid "virtual memory exhausted"
-msgstr "×ÉÒÔÕÁÌØÎÁÑ ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ"
-
-#: util/install-info.c:232
+#: util/install-info.c:203
 #, c-format
 msgid " for %s"
 msgstr " ÄÌÑ %s"
 
-#: util/install-info.c:381
+#: util/install-info.c:426
 #, c-format
 msgid "\tTry `%s --help' for a complete list of options.\n"
 msgstr "\túÁÐÕÓÔÉÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÐÏÌÎÏÇÏ ÓÐÉÓËÁ ËÌÀÞÅÊ.\n"
 
-#: util/install-info.c:389
+#: util/install-info.c:434
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
@@ -2794,7 +2952,7 @@ msgstr ""
 "                   × ÓÅËÃÉÉ, ÚÁÄÁÎÎÙÅ × Info-ÆÁÊÌÅ.\n"
 " --version         ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ.\n"
 
-#: util/install-info.c:444
+#: util/install-info.c:488
 #, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
@@ -2811,12 +2969,12 @@ msgid ""
 "  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
 "  to select it.\n"
 "\n"
-"* Menu:\n"
+"%s\n"
 msgstr ""
 "üÔÏ ÆÁÊÌ .../info/dir, ÓÏÄÅÒÖÁÝÉÊ ËÏÒÎÅ×ÕÀ ÎÏÄÕ ÉÅÒÁÒÈÉÉ Info,\n"
 "ÎÁÚÙ×ÁÅÍÕÀ (dir)Top.  ðÒÉ ×ÙÚÏ×Å Info ×Ù ×ÉÄÉÔÅ ÜÔÕ ÎÏÄÕ.\n"
 "\n"
-"%s      üÔÏ ËÏÒÎÅ×ÁÑ ÎÏÄÁ ÉÅÒÁÒÈÉÉ Info\n"
+"%s\tüÔÏ ËÏÒÎÅ×ÁÑ ÎÏÄÁ ÉÅÒÁÒÈÉÉ Info\n"
 "\n"
 "  úÄÅÓØ (× ËÁÔÁÌÏÇÅ Info) ÐÒÅÄÓÔÁ×ÌÅÎÏ ÍÅÎÀ ÐÏ ÏÓÎÏ×ÎÙÍ ÔÅÍÁÍ.\n"
 "  îÁÖÍÉÔÅ \"q\" ÞÔÏÂÙ ×ÙÊÔÉ, \"?\" ÞÔÏÂÙ ÐÏÓÍÏÔÒÅÔØ ×ÓÅ ËÏÍÁÎÄÙ Info,\n"
@@ -2827,105 +2985,107 @@ msgstr ""
 "  ÷ Emacs ×Ù ÍÏÖÅÔÅ ÎÁÖÁÔØ ×ÔÏÒÕÀ ËÎÏÐËÕ ÍÙÛÉ ÎÁ ÐÕÎËÔÅ ÍÅÎÀ ÉÌÉ ÓÓÙÌËÅ,\n"
 "  ÞÔÏÂÙ ÐÅÒÅÊÔÉ Ë ÎÅÍÕ.\n"
 "\n"
-"* Menu:\n"
+"%s\n"
 
-#: util/install-info.c:467
+#: util/install-info.c:513
 #, c-format
 msgid "%s: could not read (%s) and could not create (%s)\n"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ (%s) É ÓÏÚÄÁÔØ (%s)\n"
 
-#: util/install-info.c:551
+#: util/install-info.c:600
 #, c-format
 msgid "%s: empty file"
 msgstr "%s: ÐÕÓÔÏÊ ÆÁÊÌ"
 
-#: util/install-info.c:866 util/install-info.c:906
+#: util/install-info.c:913 util/install-info.c:953
 msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
 msgstr "START-INFO-DIR-ENTRY ÂÅÚ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ END-INFO-DIR-ENTRY"
 
-#: util/install-info.c:901
+#: util/install-info.c:948
 msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
 msgstr "END-INFO-DIR-ENTRY ÂÅÚ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ START-INFO-DIR-ENTRY"
 
-#: util/install-info.c:1150 util/install-info.c:1160
+#: util/install-info.c:1191 util/install-info.c:1201
 #, c-format
-msgid "%s: Specify the Info directory only once.\n"
-msgstr "%s: íÏÖÎÏ ÚÁÄÁÔØ ÔÏÌØËÏ ÏÄÉÎ ËÁÔÁÌÏÇ Info.\n"
+msgid "%s: already have dir file: %s\n"
+msgstr "%s: ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ ÆÁÊÌ dir: %s\n"
 
-#: util/install-info.c:1195
+#: util/install-info.c:1236
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr "%s: íÏÖÎÏ ÚÁÄÁÔØ ÔÏÌØËÏ ÏÄÉÎ Info-ÆÁÊÌ.\n"
 
-#: util/install-info.c:1244
+#: util/install-info.c:1284
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr "ÉÚÌÉÛÎÉÊ ÁÒÇÕÍÅÎÔ `%s'"
 
-#: util/install-info.c:1248
+#: util/install-info.c:1288
 msgid "No input file specified; try --help for more information."
 msgstr ""
 "îÅ ÚÁÄÁÎ ×ÈÏÄÎÏÊ ÆÁÊÌ.\n"
 "ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ."
 
-#: util/install-info.c:1251
+#: util/install-info.c:1291
 msgid "No dir file specified; try --help for more information."
 msgstr ""
 "îÅ ÚÁÄÁÎ ÆÁÊÌ ËÁÔÁÌÏÇÁ.\n"
 "ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ."
 
-#: util/install-info.c:1273
+#: util/install-info.c:1313
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr "× `%s' ÎÅÔ ×ÈÏÖÄÅÎÉÑ ÄÌÑ ËÁÔÁÌÏÇÁ Info"
 
-#: util/install-info.c:1388
+#: util/install-info.c:1426
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr "ÐÕÎËÔ ÍÅÎÀ `%s' ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ, ÄÌÑ ÆÁÊÌÁ `%s'"
 
-#: util/install-info.c:1411
+#: util/install-info.c:1449
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr "ÎÅ ÎÁÊÄÅÎÏ ×ÈÏÖÄÅÎÉÊ ÄÌÑ `%s'; ÎÉÞÅÇÏ ÎÅ ÕÄÁÌÅÎÏ"
 
-#: util/texindex.c:245
+#: util/texindex.c:252
 msgid "display this help and exit"
 msgstr "ÐÏËÁÚÁÔØ ÜÔÕ ÓÐÒÁ×ËÕ É ×ÙÊÔÉ"
 
-#: util/texindex.c:247
+#: util/texindex.c:254
 msgid "keep temporary files around after processing"
 msgstr "ÓÏÈÒÁÎÑÔØ ×ÒÅÍÅÎÎÙÅ ÆÁÊÌÙ ÐÏÓÌÅ ÒÁÂÏÔÙ"
 
-#: util/texindex.c:249
+#: util/texindex.c:256
 msgid "do not keep temporary files around after processing (default)"
 msgstr "ÎÅ ÓÏÈÒÁÎÑÔØ ×ÒÅÍÅÎÎÙÅ ÆÁÊÌÙ (ÐÏ ÕÍÏÌÞÁÎÉÀ)"
 
-#: util/texindex.c:251
+#: util/texindex.c:258
 msgid "send output to FILE"
 msgstr "ÚÁÐÉÓÁÔØ ×Ù×ÏÄ × æáêì"
 
-#: util/texindex.c:253
+#: util/texindex.c:260
 msgid "display version information and exit"
 msgstr "ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ"
 
-#: util/texindex.c:264
+#: util/texindex.c:270
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... æáêì...\n"
 
-#: util/texindex.c:265
+#: util/texindex.c:271
+#, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr ""
 "óÏÚÄÁÅÔ ÓÏÒÔÉÒÏ×ÁÎÎÙÊ ÁÌÆÁ×ÉÔÎÙÊ ÕËÁÚÁÔÅÌØ ÄÌÑ\n"
 "ËÁÖÄÏÇÏ ×ÙÈÏÄÎÏÇÏ TeX-ÆÁÊÌÁ.\n"
 
-#: util/texindex.c:268
+#: util/texindex.c:274
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr "æáêì... ÄÌÑ ÄÏËÕÍÅÎÔÁ `foo.texi' ÏÂÙÞÎÏ ÚÁÄÁÅÔÓÑ ËÁË `foo.%c%c'.\n"
 
-#: util/texindex.c:270
+#: util/texindex.c:276
+#, c-format
 msgid ""
 "\n"
 "Options:\n"
@@ -2933,28 +3093,23 @@ msgstr ""
 "\n"
 "ëÌÀÞÉ:\n"
 
-#: util/texindex.c:887 util/texindex.c:921 util/texindex.c:997
-#: util/texindex.c:1025
+#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
+#: util/texindex.c:1011
 #, c-format
 msgid "%s: not a texinfo index file"
 msgstr "%s: ÎÅ texinfo-ÆÁÊÌ Ó ÁÌÆÁ×ÉÔÎÙÍ ÕËÁÚÁÔÅÌÅÍ"
 
-#: util/texindex.c:982
+#: util/texindex.c:968
 #, c-format
 msgid "failure reopening %s"
 msgstr "ÏÛÉÂËÁ ÐÏ×ÔÏÒÎÏÇÏ ÏÔËÒÙÔÉÑ %s"
 
-#: util/texindex.c:1224
+#: util/texindex.c:1218
 #, c-format
 msgid "No page number in %s"
 msgstr "÷ %s ÎÅÔ ÎÏÍÅÒÁ ÓÔÒÁÎÉÃÙ"
 
-#: util/texindex.c:1295
+#: util/texindex.c:1291
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "ÚÁ ×ÈÏÖÄÅÎÉÅÍ %s ÓÌÅÄÕÅÔ ×ÈÏÖÄÅÎÉÅ Ó ×ÔÏÒÉÞÎÙÍ ÉÍÅÎÅÍ"
-
-#: util/texindex.c:1633
-#, c-format
-msgid "%s; for file `%s'.\n"
-msgstr "%s; ÄÌÑ ÆÁÊÌÁ `%s'.\n"
diff --git a/gnu/usr.bin/texinfo/po/stamp-po b/gnu/usr.bin/texinfo/po/stamp-po
new file mode 100644
index 00000000000..9788f70238c
--- /dev/null
+++ b/gnu/usr.bin/texinfo/po/stamp-po
@@ -0,0 +1 @@
+timestamp
diff --git a/gnu/usr.bin/texinfo/po/sv.gmo b/gnu/usr.bin/texinfo/po/sv.gmo
index 322c599346f..ab3833a478c 100644
--- a/gnu/usr.bin/texinfo/po/sv.gmo
+++ b/gnu/usr.bin/texinfo/po/sv.gmo
diff --git a/gnu/usr.bin/texinfo/po/sv.po b/gnu/usr.bin/texinfo/po/sv.po
index 6649e6ec389..ad89cd65aca 100644
--- a/gnu/usr.bin/texinfo/po/sv.po
+++ b/gnu/usr.bin/texinfo/po/sv.po
@@ -1,144 +1,145 @@
 # Swedish messages for texinfo.
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-# Christian Rose <menthos@menthos.com>, 2001, 2002.
+# Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Christian Rose <menthos@menthos.com>, 2001, 2002, 2003, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: texinfo 4.1c\n"
-"POT-Creation-Date: 2002-04-01 06:10-0800\n"
-"PO-Revision-Date: 2002-03-24 12:16+0100\n"
+"Project-Id-Version: texinfo 4.7.91\n"
+"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
+"POT-Creation-Date: 2004-12-21 16:20-0800\n"
+"PO-Revision-Date: 2004-12-12 22:41+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: info/echo-area.c:283 info/session.c:712
+#: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr "Gå ett tecken framåt"
 
-#: info/echo-area.c:295 info/session.c:728
+#: info/echo-area.c:296 info/session.c:705
 msgid "Move backward a character"
 msgstr "Gå ett tecken bakåt"
 
-#: info/echo-area.c:307
+#: info/echo-area.c:308
 msgid "Move to the start of this line"
 msgstr "Gå till början på raden"
 
-#: info/echo-area.c:312
+#: info/echo-area.c:313
 msgid "Move to the end of this line"
 msgstr "Gå till slutet på raden"
 
-#: info/echo-area.c:320 info/session.c:746
+#: info/echo-area.c:321 info/session.c:723
 msgid "Move forward a word"
 msgstr "Gå ett ord framåt"
 
-#: info/echo-area.c:360 info/session.c:795
+#: info/echo-area.c:361 info/session.c:772
 msgid "Move backward a word"
 msgstr "Gå ett ord bakåt"
 
-#: info/echo-area.c:400
+#: info/echo-area.c:401
 msgid "Delete the character under the cursor"
 msgstr "Ta bort tecknet under markören"
 
-#: info/echo-area.c:430
+#: info/echo-area.c:431
 msgid "Delete the character behind the cursor"
 msgstr "Ta bort tecknet bakom markören"
 
-#: info/echo-area.c:451
+#: info/echo-area.c:452
 msgid "Cancel or quit operation"
 msgstr "Avbryt eller avsluta operation"
 
-#: info/echo-area.c:466
+#: info/echo-area.c:467
 msgid "Accept (or force completion of) this line"
 msgstr "Acceptera (eller tvinga komplettering av) denna rad"
 
-#: info/echo-area.c:471
+#: info/echo-area.c:472
 msgid "Insert next character verbatim"
 msgstr "Infoga nästa tecken ordagrant"
 
-#: info/echo-area.c:479
+#: info/echo-area.c:480
 msgid "Insert this character"
 msgstr "Infoga detta tecken"
 
-#: info/echo-area.c:497
+#: info/echo-area.c:498
 msgid "Insert a TAB character"
 msgstr "Infoga ett TABULATOR-tecken"
 
-#: info/echo-area.c:504
+#: info/echo-area.c:505
 msgid "Transpose characters at point"
 msgstr "Transponera tecken vid punkt"
 
-#: info/echo-area.c:555
+#: info/echo-area.c:556
 msgid "Yank back the contents of the last kill"
 msgstr "Ryck tillbaka innehållet i det senaste dödandet"
 
-#: info/echo-area.c:562
+#: info/echo-area.c:563
 msgid "Kill ring is empty"
 msgstr "Dödsringen är tom"
 
-#: info/echo-area.c:575
+#: info/echo-area.c:576
 msgid "Yank back a previous kill"
 msgstr "Ryck tillbaka ett tidigare dödande"
 
-#: info/echo-area.c:608
+#: info/echo-area.c:609
 msgid "Kill to the end of the line"
 msgstr "Döda till slutet på raden"
 
-#: info/echo-area.c:621
+#: info/echo-area.c:622
 msgid "Kill to the beginning of the line"
 msgstr "Döda till början på raden"
 
-#: info/echo-area.c:633
+#: info/echo-area.c:634
 msgid "Kill the word following the cursor"
 msgstr "Döda ordet efter markören"
 
-#: info/echo-area.c:652
+#: info/echo-area.c:653
 msgid "Kill the word preceding the cursor"
 msgstr "Döda ordet före markören"
 
-#: info/echo-area.c:872 info/echo-area.c:932
+#: info/echo-area.c:868 info/echo-area.c:924
 msgid "No completions"
 msgstr "Inga kompletteringar"
 
-#: info/echo-area.c:874
+#: info/echo-area.c:870
 msgid "Not complete"
 msgstr "Inte fullständig"
 
-#: info/echo-area.c:919
+#: info/echo-area.c:911
 msgid "List possible completions"
 msgstr "Visa möjliga kompletteringar"
 
-#: info/echo-area.c:936
+#: info/echo-area.c:928
 msgid "Sole completion"
 msgstr "Enda komplettering"
 
-#: info/echo-area.c:945
+#: info/echo-area.c:937
 msgid "One completion:\n"
 msgstr "En komplettering:\n"
 
-#: info/echo-area.c:946
+#: info/echo-area.c:938
 #, c-format
 msgid "%d completions:\n"
 msgstr "%d kompletteringar:\n"
 
-#: info/echo-area.c:1092
+#: info/echo-area.c:1085
 msgid "Insert completion"
 msgstr "Infoga komplettering"
 
-#: info/echo-area.c:1225
+#: info/echo-area.c:1220
 msgid "Building completions..."
 msgstr "Bygger kompletteringar..."
 
-#: info/echo-area.c:1342
+#: info/echo-area.c:1340
 msgid "Scroll the completions window"
 msgstr "Rulla kompletteringsfönstret"
 
-#: info/footnotes.c:212
+#: info/footnotes.c:213
 msgid "Footnotes could not be displayed"
 msgstr "Fotnoter kunde inte visas"
 
-#: info/footnotes.c:238
+#: info/footnotes.c:239
 msgid "Show the footnotes associated with this node in another window"
 msgstr "Visa fotnoterna som är associerade med denna nod i ett annat fönster"
 
@@ -146,34 +147,34 @@ msgstr "Visa fotnoterna som är associerade med denna nod i ett annat fönster"
 msgid "---------- Footnotes ----------"
 msgstr "---------- Fotnoter -----------"
 
-#: info/indices.c:175
+#: info/indices.c:172
 msgid "Look up a string in the index for this file"
 msgstr "Slå upp en sträng i indexet för denna fil"
 
-#: info/indices.c:205
+#: info/indices.c:199
 msgid "Finding index entries..."
 msgstr "Söker indexposter..."
 
-#: info/indices.c:212
+#: info/indices.c:207
 msgid "No indices found."
 msgstr "Inga index hittades."
 
-#: info/indices.c:222
+#: info/indices.c:217
 msgid "Index entry: "
 msgstr "Indexpost: "
 
-#: info/indices.c:332
+#: info/indices.c:325
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr ""
 "Gå till nästa matchande indexpost från det senaste \"\\[index-search]\"-"
 "kommandot"
 
-#: info/indices.c:342
+#: info/indices.c:335
 msgid "No previous index search string."
 msgstr "Det finns ingen tidigare indexsöksträng."
 
-#: info/indices.c:349
+#: info/indices.c:342
 msgid "No index entries."
 msgstr "Inga indexposter."
 
@@ -185,79 +186,78 @@ msgstr "Inga indexposter."
 # Please don't use this type of construct, use two complete sentences
 # instead and an outer if statement.
 #
-#: info/indices.c:382
+#: info/indices.c:375
 #, c-format
-msgid "No %sindex entries containing \"%s\"."
+msgid "No %sindex entries containing `%s'."
 msgstr "Inga %sindexposter som innehåller \"%s\"."
 
-#: info/indices.c:383
+#: info/indices.c:376
 msgid "more "
 msgstr "fler "
 
-#: info/indices.c:393
+#: info/indices.c:386
 msgid "CAN'T SEE THIS"
 msgstr "KAN INTE SE DETTA"
 
-#: info/indices.c:429
+#: info/indices.c:422
 #, c-format
-msgid "Found \"%s\" in %s. (`\\[next-index-match]' tries to find next.)"
-msgstr "Hittade \"%s\" i %s (\"\\[next-index-match]\" försöker hitta nästa)."
+msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
+msgstr "Hittade \"%s\" i %s. (\"\\[next-index-match]\" försöker hitta nästa)."
 
-#: info/indices.c:549
+#: info/indices.c:541
 #, c-format
-msgid "Scanning indices of \"%s\"..."
+msgid "Scanning indices of `%s'..."
 msgstr "Genomsöker index av \"%s\"..."
 
-#: info/indices.c:603
+#: info/indices.c:596
 #, c-format
-msgid "No available info files have \"%s\" in their indices."
+msgid "No available info files have `%s' in their indices."
 msgstr "Inga tillgängliga infofiler har \"%s\" i deras index."
 
-#: info/indices.c:632
+#: info/indices.c:622
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr "Gräv i alla kända infofilers index efter en sträng och bygg en meny"
 
-#: info/indices.c:636
+#: info/indices.c:626
 msgid "Index apropos: "
 msgstr "Index-apropos: "
 
-#: info/indices.c:666
+#: info/indices.c:654
 #, c-format
 msgid ""
 "\n"
-"* Menu: Nodes whoses indices contain \"%s\":\n"
+"* Menu: Nodes whose indices contain `%s':\n"
 msgstr ""
 "\n"
 "* Meny: Noder vars index innehåller \"%s\":\n"
 
-#: info/info.c:260 info/infokey.c:884
+#: info/info.c:275 info/infokey.c:899
+#, c-format
 msgid "Try --help for more information.\n"
 msgstr "Prova --help för mer information.\n"
 
-#: info/info.c:279 info/infokey.c:139 makeinfo/makeinfo.c:689
-#: util/install-info.c:1224 util/texindex.c:338
+#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
+#: util/texindex.c:343
 #, 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"
 "Det finns INGEN garanti. Du kan vidaredistribuera denna programvara\n"
 "under villkoren i GNU General Public License.\n"
 "Se filen COPYING för mer information om detta.\n"
 
-#: info/info.c:462
+#: info/info.c:498
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "inga indexposter för \"%s\" hittades\n"
 
-#: info/info.c:555
+#: info/info.c:590
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
 msgstr " -b, --speech-friendly        var vänlig mot talsyntesprogram.\n"
 
-#: info/info.c:562
+#: info/info.c:597
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -274,10 +274,12 @@ msgid ""
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
 "  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
-"  -R, --raw-escapes            don't remove ANSI escapes from man pages.\n"
+"  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+"      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
 "  -O, --show-options, --usage  go to command-line options node.\n"
 "%s      --subnodes               recursively output menu items.\n"
+"  -w, --where, --location      print physical location of Info file.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
 "\n"
@@ -309,12 +311,13 @@ msgstr ""
 "                               STRÄNG.\n"
 "  -n, --node=NODNAMN           ange noder i den först besökta Info-filen.\n"
 "  -o, --output=FILNAMN         skriv ut valda noder till FILNAMN.\n"
-"  -R, --raw-escapes            ta inte bort ANSI-styrkoder från\n"
-"                               manualsidor.\n"
+"  -R, --raw-escapes            skriv ut \"råa\" ANSI-styrkoder (standard).\n"
+"      --no-raw-escapes         skriv ut styrkoder som text.\n"
 "      --restore=FILNAMN        läs initiala tangentnedtryckningar från\n"
 "                               FILNAMN.\n"
 "  -O, --show-options, --usage  gå till noden för kommandoradsflaggor.\n"
 "%s      --subnodes               skriv ut menyposter rekursivt.\n"
+"  -w, --where, --location      skriv ut den fysiska platsen för Info-filen.\n"
 "      --vi-keys                använd vi- och less-liknande\n"
 "                               snabbtangenter.\n"
 "      --version                visa versionsinformation och avsluta.\n"
@@ -332,8 +335,8 @@ msgstr ""
 "  info --show-options emacs  börja på noden med emacs kommandoradsflaggor\n"
 "  info -f ./foo.info         visa filen ./foo.info, sök inte i katalogen\n"
 
-#: info/info.c:598 info/infokey.c:903 makeinfo/makeinfo.c:474
-#: util/install-info.c:421 util/texindex.c:286
+#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
+#: util/install-info.c:466 util/texindex.c:292
 msgid ""
 "\n"
 "Email bug reports to bug-texinfo@gnu.org,\n"
@@ -346,77 +349,77 @@ msgstr ""
 "och synpunkter på översättningen till sv@li.org.\n"
 "Hemsida för texinfo: http://www.gnu.org/software/texinfo/"
 
-#: info/info.c:632
+#: info/info.c:669
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "Kan inte hitta noden \"%s\"."
 
-#: info/info.c:633
+#: info/info.c:670
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "Kan inte hitta noden \"(%s)%s\"."
 
-#: info/info.c:634
+#: info/info.c:671
 msgid "Cannot find a window!"
 msgstr "Kan inte hitta ett fönster!"
 
-#: info/info.c:635
+#: info/info.c:672
 msgid "Point doesn't appear within this window's node!"
 msgstr "Punkten finns inte inom detta fönsters nod!"
 
-#: info/info.c:636
+#: info/info.c:673
 msgid "Cannot delete the last window."
 msgstr "Kan inte ta bort det sista fönstret."
 
-#: info/info.c:637
+#: info/info.c:674
 msgid "No menu in this node."
 msgstr "Ingen meny i denna nod."
 
-#: info/info.c:638
+#: info/info.c:675
 msgid "No footnotes in this node."
 msgstr "Inga fotnoter i denna nod."
 
-#: info/info.c:639
+#: info/info.c:676
 msgid "No cross references in this node."
 msgstr "Inga korsreferenser i denna nod."
 
-#: info/info.c:640
+#: info/info.c:677
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Ingen \"%s\"-pekare för denna nod."
 
-#: info/info.c:641
+#: info/info.c:678
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "Okänt Info-kommando \"%c\". Prova \"?\" för hjälp."
 
-#: info/info.c:642
+#: info/info.c:679
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr "Terminaltypen \"%s\" är inte tillräckligt smart för att köra Info."
 
-#: info/info.c:643
+#: info/info.c:680
 msgid "You are already at the last page of this node."
 msgstr "Du är redan på sista sidan för denna nod."
 
-#: info/info.c:644
+#: info/info.c:681
 msgid "You are already at the first page of this node."
 msgstr "Du är redan på första sidan för denna nod."
 
-#: info/info.c:645
+#: info/info.c:682
 msgid "Only one window."
 msgstr "Endast ett fönster."
 
-#: info/info.c:646
+#: info/info.c:683
 msgid "Resulting window would be too small."
 msgstr "Resulterande fönstret skulle bli för litet."
 
-#: info/info.c:647
+#: info/info.c:684
 msgid "Not enough room for a help window, please delete a window."
 msgstr ""
 "Inte tillräckligt med utrymme för ett hjälpfönster, ta bort ett fönster."
 
-#: info/infodoc.c:45 info/infodoc.c:94
+#: info/infodoc.c:46 info/infodoc.c:95
 msgid ""
 "Basic Commands in Info Windows\n"
 "******************************\n"
@@ -424,19 +427,19 @@ msgstr ""
 "Grundläggande kommandon i Info-fönster\n"
 "**************************************\n"
 
-#: info/infodoc.c:48
+#: info/infodoc.c:49
 msgid "\\%-10[quit-help]  Quit this help.\n"
 msgstr "\\%-10[quit-help]  Avsluta denna hjälp.\n"
 
-#: info/infodoc.c:49
+#: info/infodoc.c:50
 msgid "\\%-10[quit]  Quit Info altogether.\n"
 msgstr "\\%-10[quit]  Avsluta Info helt.\n"
 
-#: info/infodoc.c:50
+#: info/infodoc.c:51
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
 msgstr "\\%-10[get-info-help-node]  Starta Info-handboken.\n"
 
-#: info/infodoc.c:52 info/infodoc.c:101
+#: info/infodoc.c:53 info/infodoc.c:102
 msgid ""
 "Selecting other nodes:\n"
 "----------------------\n"
@@ -444,19 +447,19 @@ msgstr ""
 "Välja andra noder:\n"
 "------------------\n"
 
-#: info/infodoc.c:54
+#: info/infodoc.c:55
 msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
 msgstr "\\%-10[next-node]  Gå till nästa nod från denna nod.\n"
 
-#: info/infodoc.c:55
+#: info/infodoc.c:56
 msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
 msgstr "\\%-10[prev-node]  Gå till föregående nod från denna nod.\n"
 
-#: info/infodoc.c:56
+#: info/infodoc.c:57
 msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
 msgstr "\\%-10[up-node]  Gå upp från denna nod.\n"
 
-#: info/infodoc.c:57
+#: info/infodoc.c:58
 msgid ""
 "\\%-10[menu-item]  Pick menu item specified by name.\n"
 "              Picking a menu item causes another node to be selected.\n"
@@ -464,49 +467,49 @@ msgstr ""
 "\\%-10[menu-item]  Välj den menypost som anges med namn.\n"
 "              Att välja en menypost gör att en annan nod väljs.\n"
 
-#: info/infodoc.c:59
+#: info/infodoc.c:60
 msgid ""
 "\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
 msgstr ""
 "\\%-10[xref-item]  Följ en korsreferens. Läser namnet på en referens.\n"
 
-#: info/infodoc.c:60
+#: info/infodoc.c:61
 msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
 msgstr "\\%-10[history-node]  Gå till den sista noden i detta fönster.\n"
 
-#: info/infodoc.c:61
+#: info/infodoc.c:62
 msgid ""
 "\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
 msgstr ""
 "\\%-10[move-to-next-xref]  Hoppa till nästa hypertextlänk i denna nod.\n"
 
-#: info/infodoc.c:62
+#: info/infodoc.c:63
 msgid ""
 "\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
 "node.\n"
 msgstr ""
 "\\%-10[move-to-prev-xref]  Hoppa till nästa hypertextlänk i denna nod.\n"
 
-#: info/infodoc.c:63
+#: info/infodoc.c:64
 msgid ""
 "\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
 msgstr ""
 "\\%-10[select-reference-this-line]  Följ hypertextlänken under markören.\n"
 
-#: info/infodoc.c:64
+#: info/infodoc.c:65
 msgid ""
 "\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
 "node] (DIR)'.\n"
 msgstr ""
 "\\%-10[dir-node]  Gå till \"directory\"-noden. Likvärdigt med \"g (DIR)\".\n"
 
-#: info/infodoc.c:65
+#: info/infodoc.c:66
 msgid ""
 "\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
 msgstr ""
 "\\%-10[top-node]  Gå till den översta noden. Likvärdigt med \"g Top\".\n"
 
-#: info/infodoc.c:67 info/infodoc.c:115
+#: info/infodoc.c:68 info/infodoc.c:116
 msgid ""
 "Moving within a node:\n"
 "---------------------\n"
@@ -514,31 +517,31 @@ msgstr ""
 "Förflyttning inom en nod:\n"
 "-------------------------\n"
 
-#: info/infodoc.c:69
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
-msgstr "\\%-10[scroll-forward]  Rulla en sida framåt.\n"
-
 #: info/infodoc.c:70
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
-msgstr "\\%-10[scroll-backward]  Rulla en sida bakåt.\n"
-
-#: info/infodoc.c:71
 msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
 msgstr "\\%-10[beginning-of-node]  Gå till början på denna nod.\n"
 
-#: info/infodoc.c:72
+#: info/infodoc.c:71
 msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
-msgstr "\\%-10[end-of-node]  Gå till slutet av denna nod.\n"
+msgstr "\\%-10[end-of-node]  Gå till slutet på denna nod.\n"
+
+#: info/infodoc.c:72
+msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
+msgstr "\\%-10[next-line]  Rulla en rad framåt.\n"
 
 #: info/infodoc.c:73
-msgid "\\%-10[scroll-forward]  Scroll forward 1 line.\n"
-msgstr "\\%-10[scroll-forward]  Rulla en rad framåt.\n"
+msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
+msgstr "\\%-10[prev-line]  Rulla en rad bakåt.\n"
 
 #: info/infodoc.c:74
-msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
-msgstr "\\%-10[scroll-backward]  Rulla en rad bakåt.\n"
+msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
+msgstr "\\%-10[scroll-forward]  Rulla en sida framåt.\n"
 
-#: info/infodoc.c:76 info/infodoc.c:124
+#: info/infodoc.c:75
+msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
+msgstr "\\%-10[scroll-backward]  Rulla en sida bakåt.\n"
+
+#: info/infodoc.c:77 info/infodoc.c:125
 msgid ""
 "Other commands:\n"
 "---------------\n"
@@ -546,15 +549,15 @@ msgstr ""
 "Andra kommandon:\n"
 "----------------\n"
 
-#: info/infodoc.c:78
+#: info/infodoc.c:79
 msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
 msgstr "\\%-10[menu-digit]  Välj första ... nionde objektet i nodens meny.\n"
 
-#: info/infodoc.c:79
+#: info/infodoc.c:80
 msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
 msgstr "\\%-10[last-menu-item]  Välj det sista objektet i nodens meny.\n"
 
-#: info/infodoc.c:80
+#: info/infodoc.c:81
 msgid ""
 "\\%-10[index-search]  Search for a specified string in the index entries of "
 "this Info\n"
@@ -565,7 +568,7 @@ msgstr ""
 "              Info-fil, och välj noden som refereras av den första posten\n"
 "              som hittas.\n"
 
-#: info/infodoc.c:82
+#: info/infodoc.c:83
 msgid ""
 "\\%-10[goto-node]  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
@@ -574,7 +577,7 @@ msgstr ""
 "              Du kan även inkludera ett filnamn, som exempelvis\n"
 "              (FILNAMN)NODNAMN.\n"
 
-#: info/infodoc.c:84
+#: info/infodoc.c:85
 msgid ""
 "\\%-10[search]  Search forward for a specified string\n"
 "              and select the node in which the next occurrence is found.\n"
@@ -582,7 +585,7 @@ msgstr ""
 "\\%-10[search]  Sök framåt efter en angiven sträng\n"
 "              och välj den nod i vilken nästa förekomst hittas.\n"
 
-#: info/infodoc.c:86
+#: info/infodoc.c:87
 msgid ""
 "\\%-10[search-backward]  Search backward for a specified string\n"
 "              and select the node in which the previous occurrence is "
@@ -591,111 +594,111 @@ msgstr ""
 "\\%-10[search-backward]  Sök bakåt efter en angiven sträng\n"
 "              och välj den nod i vilken nästa förekomst hittas.\n"
 
-#: info/infodoc.c:97
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Quit this help.\n"
 msgstr "  %-10s  Avsluta denna hjälp.\n"
 
-#: info/infodoc.c:98
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr "  %-10s  Avsluta Info helt.\n"
 
-#: info/infodoc.c:99
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr "  %-10s  Starta Info-handboken.\n"
 
-#: info/infodoc.c:103
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
 msgstr "  %-10s  Gå till nästa nod från denna nod.\n"
 
-#: info/infodoc.c:104
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
 msgstr "  %-10s  Gå till föregående nod från denna nod.\n"
 
-#: info/infodoc.c:105
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
 msgstr "  %-10s  Gå upp från denna nod.\n"
 
-#: info/infodoc.c:106
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Pick menu item specified by name.\n"
 msgstr "  %-10s  Välj angiven menypost.\n"
 
-#: info/infodoc.c:107
+#: info/infodoc.c:108
 msgid "              Picking a menu item causes another node to be selected.\n"
 msgstr "              Att välja en menypost gör att en annan nod väljs.\n"
 
-#: info/infodoc.c:108
+#: info/infodoc.c:109
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
 msgstr "  %-10s  Följ en korsreferens. Läser namnet på en referens.\n"
 
-#: info/infodoc.c:109
+#: info/infodoc.c:110
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
 msgstr "  %-10s  Gå till den sista noden i detta fönster.\n"
 
-#: info/infodoc.c:110
+#: info/infodoc.c:111
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
 msgstr "  %-10s  Hoppa till nästa hypertextlänk i denna nod.\n"
 
-#: info/infodoc.c:111
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
 msgstr "  %-10s  Följ hypertextlänken under markören.\n"
 
-#: info/infodoc.c:112
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
 msgstr "  %-10s  Gå till \"directory\"-noden. Likvärdigt med \"g (DIR)\".\n"
 
-#: info/infodoc.c:113
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
 msgstr "  %-10s  Gå till den översta noden. Likvärdigt med \"g Top\".\n"
 
-#: info/infodoc.c:117
+#: info/infodoc.c:118
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
 msgstr "  %-10s  Rulla en sida framåt.\n"
 
-#: info/infodoc.c:118
+#: info/infodoc.c:119
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
 msgstr "  %-10s  Rulla en sida bakåt.\n"
 
-#: info/infodoc.c:119
+#: info/infodoc.c:120
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
 msgstr "  %-10s  Gå till början på denna nod.\n"
 
-#: info/infodoc.c:120
+#: info/infodoc.c:121
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
-msgstr "  %-10s  Gå till slutet av denna nod.\n"
+msgstr "  %-10s  Gå till slutet på denna nod.\n"
 
-#: info/infodoc.c:121
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
 msgstr "  %-10s  Rulla en rad framåt.\n"
 
-#: info/infodoc.c:122
+#: info/infodoc.c:123
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
 msgstr "  %-10s  Rulla en rad bakåt.\n"
 
-#: info/infodoc.c:126
+#: info/infodoc.c:127
 #, c-format
 msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
 msgstr "  %-10s  Välj första ... nionde objektet i nodens meny.\n"
 
-#: info/infodoc.c:127
+#: info/infodoc.c:128
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
 msgstr "  %-10s  Välj det sista objektet i nodens meny.\n"
@@ -714,13 +717,13 @@ msgstr "  %-10s  Välj det sista objektet i nodens meny.\n"
 # but also puzzle the pieces of the sentence together again so that it
 # makes some sense, in order to be able to translate in the first place.
 #
-#: info/infodoc.c:128
+#: info/infodoc.c:129
 #, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
 msgstr "  %-10s  Sök efter en angiven sträng i indexposterna i denna\n"
 
-#: info/infodoc.c:129
+#: info/infodoc.c:130
 msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
@@ -728,12 +731,12 @@ msgstr ""
 "              Info-fil, och välj noden som refereras av den första posten\n"
 "              som hittas.\n"
 
-#: info/infodoc.c:130
+#: info/infodoc.c:131
 #, c-format
 msgid "  %-10s  Move to node specified by name.\n"
 msgstr "  %-10s  Gå till den nod som anges.\n"
 
-#: info/infodoc.c:131
+#: info/infodoc.c:132
 msgid ""
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr ""
@@ -754,12 +757,12 @@ msgstr ""
 # but also puzzle the pieces of the sentence together again so that it
 # makes some sense, in order to be able to translate in the first place.
 #
-#: info/infodoc.c:132
+#: info/infodoc.c:133
 #, c-format
 msgid "  %-10s  Search forward for a specified string,\n"
 msgstr "  %-10s  Sök framåt efter en angiven sträng,\n"
 
-#: info/infodoc.c:133 info/infodoc.c:135
+#: info/infodoc.c:134 info/infodoc.c:136
 msgid ""
 "              and select the node in which the next occurrence is found.\n"
 msgstr "              och välj den nod i vilken nästa förekomst hittas.\n"
@@ -778,16 +781,16 @@ msgstr "              och välj den nod i vilken nästa förekomst hittas.\n"
 # but also puzzle the pieces of the sentence together again so that it
 # makes some sense, in order to be able to translate in the first place.
 #
-#: info/infodoc.c:134
+#: info/infodoc.c:135
 #, c-format
 msgid "  %-10s  Search backward for a specified string\n"
 msgstr "  %-10s  Sök bakåt efter en angiven sträng,\n"
 
-#: info/infodoc.c:313
+#: info/infodoc.c:316
 msgid "The current search path is:\n"
 msgstr "Den aktuella sökvägen är:\n"
 
-#: info/infodoc.c:316
+#: info/infodoc.c:320
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
@@ -795,7 +798,7 @@ msgstr ""
 "Kommandon som är tillgängliga i Info-fönster:\n"
 "\n"
 
-#: info/infodoc.c:319
+#: info/infodoc.c:324
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
@@ -803,7 +806,7 @@ msgstr ""
 "Kommandon som är tillgängliga i echo-området:\n"
 "\n"
 
-#: info/infodoc.c:340
+#: info/infodoc.c:347
 #, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
@@ -812,7 +815,7 @@ msgstr ""
 "Följande kommandon kan endast startas via %s:\n"
 "\n"
 
-#: info/infodoc.c:343
+#: info/infodoc.c:351
 msgid ""
 "The following commands cannot be invoked at all:\n"
 "\n"
@@ -820,156 +823,169 @@ msgstr ""
 "Följande kommandon kan inte startas alls:\n"
 "\n"
 
-#: info/infodoc.c:367
+#: info/infodoc.c:375
 msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
 msgstr ""
 "--- Använd \"\\[history-node]\" eller \"\\[kill-node]\" för att avsluta ---\n"
 
-#: info/infodoc.c:477
+#: info/infodoc.c:485
 msgid "Display help message"
 msgstr "Visa hjälpmeddelande"
 
-#: info/infodoc.c:495
+#: info/infodoc.c:503
 msgid "Visit Info node `(info)Help'"
 msgstr "Besök Info-noden \"(info)Help\""
 
-#: info/infodoc.c:638
+#: info/infodoc.c:641
 msgid "Print documentation for KEY"
 msgstr "Visa dokumentationen för NYCKEL"
 
-#: info/infodoc.c:650
+#: info/infodoc.c:653
 #, c-format
 msgid "Describe key: %s"
 msgstr "Beskriv nyckel: %s"
 
-#: info/infodoc.c:660
+#: info/infodoc.c:664
 #, c-format
 msgid "ESC %s is undefined."
 msgstr "ESC %s är odefinierad."
 
-#: info/infodoc.c:676 info/infodoc.c:703
+#: info/infodoc.c:680 info/infodoc.c:709
 #, c-format
 msgid "%s is undefined."
 msgstr "%s är odefinierad."
 
-#: info/infodoc.c:724
+#: info/infodoc.c:730
 #, c-format
 msgid "%s is defined to %s."
 msgstr "%s är definierad till %s."
 
-#: info/infodoc.c:1151
+#: info/infodoc.c:1153
 msgid "Show what to type to execute a given command"
 msgstr "Visa vad som ska anges för att köra ett angivet kommando"
 
-#: info/infodoc.c:1155
+#: info/infodoc.c:1157
 msgid "Where is command: "
 msgstr "Var är kommando: "
 
-#: info/infodoc.c:1177
+#: info/infodoc.c:1179
 #, c-format
 msgid "`%s' is not on any keys"
 msgstr "\"%s\" finns inte på några tangenter"
 
-#: info/infodoc.c:1183
+#: info/infodoc.c:1186
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr "%s kan endast startas via %s."
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1190
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr "%s kan startas via %s."
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1195
 #, c-format
 msgid "There is no function named `%s'"
 msgstr "Det finns ingen funktion med namnet \"%s\""
 
-#: info/infokey.c:164
+#: info/infokey.c:145
+#, 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"
+"Det finns INGEN garanti. Du kan vidaredistribuera denna programvara\n"
+"under villkoren i GNU General Public License.\n"
+"Se filen COPYING för mer information om detta.\n"
+
+#: info/infokey.c:170
 msgid "incorrect number of arguments"
 msgstr "felaktigt antal argument"
 
-#: info/infokey.c:194
+#: info/infokey.c:201
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "kan inte öppna indatafilen \"%s\""
 
-#: info/infokey.c:207
+#: info/infokey.c:215
 #, c-format
 msgid "cannot create output file `%s'"
 msgstr "kan inte skapa utdatafilen \"%s\""
 
-#: info/infokey.c:217
+#: info/infokey.c:226
 #, c-format
 msgid "error writing to `%s'"
 msgstr "fel vid skrivning till \"%s\""
 
-#: info/infokey.c:222
+#: info/infokey.c:232
 #, c-format
 msgid "error closing output file `%s'"
 msgstr "fel vid stängning av utdatafilen \"%s\""
 
-#: info/infokey.c:443
+#: info/infokey.c:450
 msgid "key sequence too long"
 msgstr "nyckelsekvensen är för lång"
 
-#: info/infokey.c:521
+#: info/infokey.c:529
 msgid "missing key sequence"
 msgstr "nyckelsekvens saknas"
 
-#: info/infokey.c:600
+#: info/infokey.c:610
 msgid "NUL character (\\000) not permitted"
 msgstr "NUL-tecknet (\\000) är inte tillåtet"
 
-#: info/infokey.c:629
+#: info/infokey.c:641
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr "NUL-tecknet (^%c) är inte tillåtet"
 
-#: info/infokey.c:652
+#: info/infokey.c:665
 msgid "missing action name"
 msgstr "åtgärdsnamn saknas"
 
-#: info/infokey.c:667 info/infokey.c:733
+#: info/infokey.c:681 info/infokey.c:756
 msgid "section too long"
 msgstr "avsnittet är för långt"
 
-#: info/infokey.c:673
+#: info/infokey.c:688
 #, c-format
 msgid "unknown action `%s'"
 msgstr "okänd åtgärd \"%s\""
 
-#: info/infokey.c:682
+#: info/infokey.c:698
 msgid "action name too long"
 msgstr "åtgärdsnamnet är för långt"
 
-#: info/infokey.c:694
+#: info/infokey.c:712
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr "extra tecken följer på åtgärden \"%s\""
 
-#: info/infokey.c:704
+#: info/infokey.c:723
 msgid "missing variable name"
 msgstr "variabelnamn saknas"
 
-#: info/infokey.c:712
+#: info/infokey.c:733
 msgid "missing `=' immediately after variable name"
 msgstr "\"=\" saknas direkt efter variabelnamnet"
 
-#: info/infokey.c:719
+#: info/infokey.c:741
 msgid "variable name too long"
 msgstr "variabelnamnet är för långt"
 
-#: info/infokey.c:741
+#: info/infokey.c:765
 msgid "value too long"
 msgstr "värdet är för långt"
 
-#: info/infokey.c:875
+#: info/infokey.c:890
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr "\"%s\", rad %u: "
 
-#: info/infokey.c:891
+#: info/infokey.c:906
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -993,22 +1009,22 @@ msgstr ""
 "  --help               visa denna hjälptext och avsluta.\n"
 "  --version            visa versionsinformation och avsluta.\n"
 
-#: info/infomap.c:1397
+#: info/infomap.c:1500
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
 msgstr "Ignorerar ogiltig infonyckelfil \"%s\" - för liten"
 
-#: info/infomap.c:1400
+#: info/infomap.c:1503
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
 msgstr "Ignorerar ogiltig infonyckelfil \"%s\" - för stor"
 
-#: info/infomap.c:1413
+#: info/infomap.c:1516
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
 msgstr "Fel vid läsning av infonyckelfilen \"%s\" - kort läsning"
 
-#: info/infomap.c:1431
+#: info/infomap.c:1535
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
@@ -1016,13 +1032,13 @@ msgstr ""
 "Ogiltig infonyckelfil \"%s\" (felaktiga magiska nummer) -- kör infokey för\n"
 "att uppdatera den"
 
-#: info/infomap.c:1437
+#: info/infomap.c:1544
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
 msgstr ""
 "Din infonyckelfil \"%s\" är för gammal -- kör infokey för att uppdatera den"
 
-#: info/infomap.c:1450
+#: info/infomap.c:1560
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
@@ -1030,7 +1046,7 @@ msgstr ""
 "Ogiltig infonyckelfil \"%s\" (felaktig asvnittslängd) -- kör infokey för\n"
 "att uppdatera den"
 
-#: info/infomap.c:1470
+#: info/infomap.c:1581
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
@@ -1038,40 +1054,46 @@ msgstr ""
 "ogiltig infonyckelfil \"%s\" (felaktig avsnittskod) -- kör infokey för att\n"
 "uppdatera den"
 
-#: info/infomap.c:1608
+#: info/infomap.c:1716
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr "Felaktig data i infonyckelfil -- en del bindningar ignorerades"
 
-#: info/infomap.c:1659
+#: info/infomap.c:1766
 msgid "Bad data in infokey file -- some var settings ignored"
 msgstr "Felaktig data i infonyckelfil -- en del inställningar ignorerades"
 
-#: info/m-x.c:70
+#: info/m-x.c:69
 msgid "Read the name of an Info command and describe it"
 msgstr "Läs namnet på ett Info-kommando och beskriv det"
 
-#: info/m-x.c:74
+#: info/m-x.c:73
 msgid "Describe command: "
 msgstr "Beskriv kommando: "
 
-#: info/m-x.c:97
+#: info/m-x.c:96
 msgid "Read a command name in the echo area and execute it"
 msgstr "Läs ett kommandonamn i echo-området och kör det"
 
-#: info/m-x.c:141
+#: info/m-x.c:140
 msgid "Cannot execute an `echo-area' command here."
 msgstr "Kan inte köra ett \"echo-area\"-kommando här."
 
-#: info/m-x.c:157
+#: info/m-x.c:154
+#, c-format
+msgid "Undefined command: %s"
+msgstr "Odefinierat kommando: %s"
+
+#: info/m-x.c:160
 msgid "Set the height of the displayed window"
 msgstr "Ställ in höjden på det visade fönstret"
 
-#: info/m-x.c:170
+#: info/m-x.c:173
 #, c-format
 msgid "Set screen height to (%d): "
 msgstr "Ställ in skärmhöjden till (%d): "
 
-#: info/makedoc.c:161 info/makedoc.c:169
+#: info/makedoc.c:162 info/makedoc.c:170
+#, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
 "\n"
@@ -1079,12 +1101,12 @@ msgstr ""
 "   Källkodsfiler som grävdes igenom för att göra att denna fil inkluderar:\n"
 "\n"
 
-#: info/makedoc.c:553
+#: info/makedoc.c:550
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "Kunde inte manipulera filen %s.\n"
 
-#: info/nodemenu.c:28
+#: info/nodemenu.c:31
 msgid ""
 "\n"
 "* Menu:\n"
@@ -1096,7 +1118,7 @@ msgstr ""
 "  (Fil)Nod                          Rader   Storl. Innehållande fil\n"
 "  --------                          -----   ------ ----------------"
 
-#: info/nodemenu.c:199
+#: info/nodemenu.c:202
 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"
@@ -1105,25 +1127,25 @@ msgstr ""
 "Välj en från denna meny eller använd\"\\[history-node]\" i ett annat "
 "fönster.\n"
 
-#: info/nodemenu.c:219
+#: info/nodemenu.c:224
 msgid "Make a window containing a menu of all of the currently visited nodes"
 msgstr ""
 "Skapa ett fönster som innehåller en meny med alla nyligen besökta noder"
 
-#: info/nodemenu.c:299
+#: info/nodemenu.c:304
 msgid "Select a node which has been previously visited in a visible window"
 msgstr "Välj en nod som har besökts nyligen i ett synligt fönster"
 
-#: info/nodemenu.c:311
+#: info/nodemenu.c:317
 msgid "Select visited node: "
 msgstr "Välj besökt nod: "
 
-#: info/nodemenu.c:331 info/session.c:2235
+#: info/nodemenu.c:337 info/session.c:2264
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr "Referensen försvann! (%s)."
 
-#: info/session.c:170
+#: info/session.c:162
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1132,108 +1154,108 @@ msgstr ""
 "Välkommen till Info version %s. Skriv in \\[get-help-window] för hjälp, "
 "\\[menu-item] för menypost."
 
-#: info/session.c:643
+#: info/session.c:620
 msgid "Move down to the next line"
 msgstr "Gå ned till nästa rad"
 
-#: info/session.c:658
+#: info/session.c:635
 msgid "Move up to the previous line"
 msgstr "Gå upp till föregående rad"
 
-#: info/session.c:673
+#: info/session.c:650
 msgid "Move to the end of the line"
 msgstr "Gå till slutet på raden"
 
-#: info/session.c:693
+#: info/session.c:670
 msgid "Move to the start of the line"
 msgstr "Gå till början på raden"
 
 # src/menus.c:332
-#: info/session.c:885 makeinfo/node.c:1357
+#: info/session.c:860 makeinfo/node.c:1424
 msgid "Next"
 msgstr "Nästa"
 
-#: info/session.c:888
+#: info/session.c:863
 msgid "Following Next node..."
 msgstr "Följer nästa-nod..."
 
-#: info/session.c:905
+#: info/session.c:881
 msgid "Selecting first menu item..."
 msgstr "Väljer första menyposten..."
 
-#: info/session.c:916
+#: info/session.c:893
 msgid "Selecting Next node..."
 msgstr "Väljer nästa nod..."
 
-#: info/session.c:986
+#: info/session.c:964
 #, c-format
 msgid "Moving Up %d time(s), then Next."
 msgstr "Går upp %d gång(er), sedan Nästa."
 
-#: info/session.c:1010
+#: info/session.c:988
 msgid "No more nodes within this document."
 msgstr "Inga fler noder i detta dokument."
 
-#: info/session.c:1034
+#: info/session.c:1011
 msgid "No `Prev' for this node."
 msgstr "Ingen \"Föreg\" för denna nod."
 
-#: info/session.c:1037 info/session.c:1092
+#: info/session.c:1014 info/session.c:1073
 msgid "Moving Prev in this window."
 msgstr "Gå till föregående i detta fönster."
 
-#: info/session.c:1051
+#: info/session.c:1030
 msgid "No `Prev' or `Up' for this node within this document."
 msgstr "Inget \"Prev\" eller \"Up\" för denna nod inom detta dokument."
 
-#: info/session.c:1054
+#: info/session.c:1034
 msgid "Moving Up in this window."
 msgstr "Går upp i detta fönster."
 
-#: info/session.c:1102
+#: info/session.c:1084
 msgid "Moving to `Prev's last menu item."
 msgstr "Gå till \"Föreg\"s senaste menypost."
 
-#: info/session.c:1113
+#: info/session.c:1095
 msgid "Move forwards or down through node structure"
 msgstr "Gå framåt eller nedåt i nodstrukturen"
 
-#: info/session.c:1129
+#: info/session.c:1111
 msgid "Move backwards or up through node structure"
 msgstr "Gå bakåt eller upp i nodstrukturen"
 
-#: info/session.c:1229
+#: info/session.c:1205
 msgid "Scroll forward in this window"
 msgstr "Rulla framåt i detta fönster"
 
-#: info/session.c:1237
+#: info/session.c:1213
 msgid "Scroll forward in this window and set default window size"
 msgstr "Rulla framåt i detta fönster och ställ in standardfönsterstorleken"
 
-#: info/session.c:1245
+#: info/session.c:1221
 msgid "Scroll forward in this window staying within node"
 msgstr "Rulla framåt i detta fönster och stanna inom noden"
 
-#: info/session.c:1253
+#: info/session.c:1229
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr ""
 "Rulla framåt i detta fönster och stanna inom noden och ställ in "
 "standardfönsterstorleken"
 
-#: info/session.c:1261
+#: info/session.c:1237
 msgid "Scroll backward in this window"
 msgstr "Rulla bakåt i detta fönster"
 
-#: info/session.c:1269
+#: info/session.c:1245
 msgid "Scroll backward in this window and set default window size"
 msgstr "Rulla bakåt i detta fönster och ställ in standardfönsterstorleken"
 
-#: info/session.c:1278
+#: info/session.c:1254
 msgid "Scroll backward in this window staying within node"
 msgstr "Rulla bakåt i detta fönster och stanna inom noden"
 
-#: info/session.c:1286
+#: info/session.c:1262
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
@@ -1241,278 +1263,278 @@ msgstr ""
 "Rulla bakåt i detta fönster och stanna inom noden och ställ in "
 "standardfönsterstorleken"
 
-#: info/session.c:1294
+#: info/session.c:1270
 msgid "Move to the start of this node"
 msgstr "Gå till början på denna nod"
 
-#: info/session.c:1301
+#: info/session.c:1277
 msgid "Move to the end of this node"
 msgstr "Gå till slutet på denna nod"
 
-#: info/session.c:1308
+#: info/session.c:1284
 msgid "Scroll down by lines"
 msgstr "Rulla nedåt radvis"
 
-#: info/session.c:1325
+#: info/session.c:1301
 msgid "Scroll up by lines"
 msgstr "Rulla uppåt radvis"
 
-#: info/session.c:1343
+#: info/session.c:1319
 msgid "Scroll down by half screen size"
 msgstr "Rulla nedåt med halva skärmstorleken"
 
-#: info/session.c:1369
+#: info/session.c:1345
 msgid "Scroll up by half screen size"
 msgstr "Rulla uppåt med halva skärmstorleken"
 
-#: info/session.c:1398
+#: info/session.c:1374
 msgid "Select the next window"
 msgstr "Välj nästa fönster"
 
-#: info/session.c:1437
+#: info/session.c:1413
 msgid "Select the previous window"
 msgstr "Välj föregående fönster"
 
-#: info/session.c:1488
+#: info/session.c:1464
 msgid "Split the current window"
 msgstr "Dela aktuellt fönster"
 
-#: info/session.c:1569
+#: info/session.c:1545
 msgid "Delete the current window"
 msgstr "Ta bort aktuellt fönster"
 
-#: info/session.c:1577
+#: info/session.c:1553
 msgid "Cannot delete a permanent window"
 msgstr "Kan inte ta bort ett permanent fönster"
 
-#: info/session.c:1610
+#: info/session.c:1585
 msgid "Delete all other windows"
 msgstr "Ta bort alla andra fönster"
 
-#: info/session.c:1656
+#: info/session.c:1631
 msgid "Scroll the other window"
 msgstr "Rulla det andra fönstret"
 
-#: info/session.c:1677
+#: info/session.c:1652
 msgid "Scroll the other window backward"
 msgstr "Rulla det andra fönstret bakåt"
 
-#: info/session.c:1683
+#: info/session.c:1658
 msgid "Grow (or shrink) this window"
 msgstr "Väx (eller krymp) detta fönster"
 
-#: info/session.c:1694
+#: info/session.c:1669
 msgid "Divide the available screen space among the visible windows"
 msgstr "Dela det tillgängliga skärmutrymmet mellan de synliga fönstren"
 
-#: info/session.c:1701
+#: info/session.c:1676
 msgid "Toggle the state of line wrapping in the current window"
 msgstr "Växla tillståndet för radbrytning i det aktuella fönstret"
 
-#: info/session.c:1880
+#: info/session.c:1848
 msgid "Select the Next node"
 msgstr "Välj nästa nod"
 
-#: info/session.c:1888
+#: info/session.c:1856
 msgid "Select the Prev node"
 msgstr "Välj föregående nod"
 
-#: info/session.c:1896
+#: info/session.c:1864
 msgid "Select the Up node"
 msgstr "Välj uppnoden"
 
-#: info/session.c:1903
+#: info/session.c:1871
 msgid "Select the last node in this file"
 msgstr "Välj den sista noden i denna fil"
 
-#: info/session.c:1930 info/session.c:1963
+#: info/session.c:1898 info/session.c:1931
 msgid "This window has no additional nodes"
 msgstr "Detta fönster har inga ytterligare noder"
 
-#: info/session.c:1936
+#: info/session.c:1904
 msgid "Select the first node in this file"
 msgstr "Välj den första noden i denna fil"
 
-#: info/session.c:1970
+#: info/session.c:1938
 msgid "Select the last item in this node's menu"
 msgstr "Välj det sista objektet i denna nods meny"
 
-#: info/session.c:1976
+#: info/session.c:1944
 msgid "Select this menu item"
 msgstr "Välj denna menypost"
 
-#: info/session.c:2005
+#: info/session.c:1977
 #, c-format
 msgid "There aren't %d items in this menu."
 msgstr "Det finns inte %d poster i denna meny."
 
-#: info/session.c:2148
+#: info/session.c:2171 info/session.c:2172
 #, c-format
 msgid "Menu item (%s): "
 msgstr "Menypost (%s): "
 
-#: info/session.c:2150
+#: info/session.c:2175
 msgid "Menu item: "
 msgstr "Menypost: "
 
-#: info/session.c:2155
+#: info/session.c:2182 info/session.c:2183
 #, c-format
 msgid "Follow xref (%s): "
 msgstr "Följ xref (%s): "
 
-#: info/session.c:2157
+#: info/session.c:2186
 msgid "Follow xref: "
 msgstr "Följ xref: "
 
-#: info/session.c:2280
+#: info/session.c:2315
 msgid "Read a menu item and select its node"
 msgstr "Läs en menypost och välj dess nod"
 
-#: info/session.c:2288
+#: info/session.c:2323
 msgid "Read a footnote or cross reference and select its node"
 msgstr "Läs en fotnot eller korsreferens och välj dess nod"
 
-#: info/session.c:2294
+#: info/session.c:2329
 msgid "Move to the start of this node's menu"
 msgstr "Gå till början på denna nods meny"
 
-#: info/session.c:2318
+#: info/session.c:2353
 msgid "Visit as many menu items at once as possible"
 msgstr "Besök så många menyposter som möjligt samtidigt"
 
-#: info/session.c:2346
+#: info/session.c:2381
 msgid "Read a node name and select it"
 msgstr "Läs ett nodnamn och välj det"
 
-#: info/session.c:2401 info/session.c:2405
+#: info/session.c:2436 info/session.c:2441
 msgid "Goto node: "
 msgstr "Gå till nod: "
 
-#: info/session.c:2471
+#: info/session.c:2505
 #, c-format
 msgid "No menu in node `%s'."
 msgstr "Ingen meny i noden \"%s\"."
 
-#: info/session.c:2516
+#: info/session.c:2551
 #, c-format
 msgid "No menu item `%s' in node `%s'."
 msgstr "Ingen menypost \"%s\" i noden \"%s\"."
 
-#: info/session.c:2546
+#: info/session.c:2581
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
 msgstr "Kan inte hitta noden som refereras av \"%s\" i \"%s\"."
 
-#: info/session.c:2597
+#: info/session.c:2631
 msgid "Read a list of menus starting from dir and follow them"
 msgstr "Läs en lista med menyer som börjar med katalog, och följ dem"
 
-#: info/session.c:2599
+#: info/session.c:2633
 msgid "Follow menus: "
 msgstr "Följ menyer: "
 
-#: info/session.c:2797
+#: info/session.c:2826
 msgid "Find the node describing program invocation"
 msgstr "Hitta den nod som beskriver start av programmet"
 
-#: info/session.c:2799
+#: info/session.c:2828
 #, c-format
 msgid "Find Invocation node of [%s]: "
 msgstr "Hitta programstartnod för [%s]: "
 
-#: info/session.c:2837
+#: info/session.c:2866
 msgid "Read a manpage reference and select it"
 msgstr "Läs en referens till manualsida och välj den"
 
-#: info/session.c:2841
+#: info/session.c:2870
 msgid "Get Manpage: "
 msgstr "Hämta manualsida: "
 
-#: info/session.c:2871
+#: info/session.c:2900
 msgid "Select the node `Top' in this file"
 msgstr "Välj noden \"Top\" i denna fil"
 
-#: info/session.c:2877
+#: info/session.c:2906
 msgid "Select the node `(dir)'"
 msgstr "Välj noden \"(dir)\""
 
-#: info/session.c:2897
+#: info/session.c:2923 info/session.c:2925
 #, c-format
 msgid "Kill node (%s): "
 msgstr "Döda noden (%s): "
 
-#: info/session.c:2951
+#: info/session.c:2977
 #, c-format
 msgid "Cannot kill node `%s'"
 msgstr "Kan inte döda noden \"%s\""
 
-#: info/session.c:2961
+#: info/session.c:2987
 msgid "Cannot kill the last node"
 msgstr "Kan inte döda den sista noden"
 
-#: info/session.c:3047
+#: info/session.c:3073
 msgid "Select the most recently selected node"
 msgstr "Välj den senast valda noden"
 
-#: info/session.c:3053
+#: info/session.c:3079
 msgid "Kill this node"
 msgstr "Döda denna nod"
 
-#: info/session.c:3061
+#: info/session.c:3087
 msgid "Read the name of a file and select it"
 msgstr "Läs namnet på en fil och välj den"
 
-#: info/session.c:3065
+#: info/session.c:3091
 msgid "Find file: "
 msgstr "Sök fil: "
 
-#: info/session.c:3082
+#: info/session.c:3108
 #, c-format
 msgid "Cannot find `%s'."
 msgstr "Kan inte hitta \"%s\"."
 
-#: info/session.c:3127 info/session.c:3248
+#: info/session.c:3151 info/session.c:3269
 #, c-format
 msgid "Could not create output file `%s'."
 msgstr "Kunde inte skapa utdatafilen \"%s\"."
 
-#: info/session.c:3140 info/session.c:3265 info/session.c:3326
+#: info/session.c:3165 info/session.c:3287 info/session.c:3347
 msgid "Done."
 msgstr "Färdig."
 
-#: info/session.c:3196
+#: info/session.c:3220
 #, c-format
 msgid "Writing node %s..."
 msgstr "Skriver noden %s..."
 
-#: info/session.c:3274
+#: info/session.c:3296
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
 msgstr "Skicka innehållet i denna nod i rör till INFO_PRINT_COMMAND"
 
-#: info/session.c:3310
+#: info/session.c:3331
 #, c-format
 msgid "Cannot open pipe to `%s'."
 msgstr "Kan inte öppna rör till \"%s\"."
 
-#: info/session.c:3316
+#: info/session.c:3337
 #, c-format
 msgid "Printing node %s..."
 msgstr "Skriver ut noden %s..."
 
-#: info/session.c:3558
+#: info/session.c:3567
 #, c-format
 msgid "Searching subfile %s ..."
 msgstr "Söker i underfilen %s..."
 
-#: info/session.c:3610
+#: info/session.c:3619
 msgid "Read a string and search for it case-sensitively"
 msgstr "Läs en sträng och sök efter den skiftlägeskänsligt"
 
-#: info/session.c:3617
+#: info/session.c:3626
 msgid "Read a string and search for it"
 msgstr "Läs en sträng och sök efter den"
 
-#: info/session.c:3625
+#: info/session.c:3634
 msgid "Read a string and search backward for it"
 msgstr "Läs en sträng och sök baklänges efter den"
 
@@ -1535,56 +1557,56 @@ msgstr "Läs en sträng och sök baklänges efter den"
 # messages themselves. Yes, this will result in many more messages, but
 # those will be translatable, while the current design isn't.
 #
-#: info/session.c:3667
+#: info/session.c:3670 info/session.c:3677
 #, c-format
 msgid "%s%sfor string [%s]: "
 msgstr "%s%sefter stängen [%s]: "
 
-#: info/session.c:3668
+#: info/session.c:3671 info/session.c:3678
 msgid "Search backward"
 msgstr "Sök baklänges"
 
-#: info/session.c:3668
+#: info/session.c:3672 info/session.c:3678
 msgid "Search"
 msgstr "Sök"
 
-#: info/session.c:3669
+#: info/session.c:3673 info/session.c:3679
 msgid " case-sensitively "
 msgstr " skiljandes på VERSALER/gemener "
 
-#: info/session.c:3669
+#: info/session.c:3674 info/session.c:3679
 msgid " "
 msgstr " "
 
-#: info/session.c:3709
+#: info/session.c:3718
 msgid "Search failed."
 msgstr "Sökningen misslyckades."
 
-#: info/session.c:3727
+#: info/session.c:3736
 msgid "Repeat last search in the same direction"
 msgstr "Upprepa den senaste sökningen i samma riktning"
 
-#: info/session.c:3730 info/session.c:3740
+#: info/session.c:3739 info/session.c:3749
 msgid "No previous search string"
 msgstr "Ingen tidigare söksträng"
 
-#: info/session.c:3737
+#: info/session.c:3746
 msgid "Repeat last search in the reverse direction"
 msgstr "Upprepa den senaste sökningen i omvänd riktning"
 
-#: info/session.c:3755 info/session.c:3761
+#: info/session.c:3765 info/session.c:3771
 msgid "Search interactively for a string as you type it"
 msgstr "Sök interaktivt efter en sträng allteftersom du skriver den"
 
-#: info/session.c:3855
+#: info/session.c:3851
 msgid "I-search backward: "
 msgstr "I-sök baklänges: "
 
-#: info/session.c:3857
+#: info/session.c:3853
 msgid "I-search: "
 msgstr "I-sök: "
 
-#: info/session.c:3882
+#: info/session.c:3878 info/session.c:3880
 msgid "Failing "
 msgstr "Misslyckas "
 
@@ -1600,27 +1622,27 @@ msgstr "Gå till nästa korsreferens"
 msgid "Select reference or menu item appearing on this line"
 msgstr "Välj referens eller menypost som finns på denna rad"
 
-#: info/session.c:4381
+#: info/session.c:4382
 msgid "Cancel current operation"
 msgstr "Avbryt aktuell åtgärd"
 
-#: info/session.c:4388
+#: info/session.c:4389
 msgid "Quit"
 msgstr "Avsluta"
 
-#: info/session.c:4397
+#: info/session.c:4398
 msgid "Move the cursor to a specific line of the window"
 msgstr "Flytta markören till en specifik rad i fönstret"
 
-#: info/session.c:4429
+#: info/session.c:4430
 msgid "Redraw the display"
 msgstr "Rita om displayen"
 
-#: info/session.c:4466
+#: info/session.c:4467
 msgid "Quit using Info"
 msgstr "Avsluta användandet av Info"
 
-#: info/session.c:4479
+#: info/session.c:4480
 msgid "Run command bound to this key's lowercase variant"
 msgstr "Kör kommando som är knutet till denna tangents gemena variant"
 
@@ -1630,27 +1652,29 @@ msgid "Unknown command (%s)."
 msgstr "Okänt kommando (%s)."
 
 #: info/session.c:4494
-msgid "\"\" is invalid"
-msgstr "\"\" är ogiltigt"
+#, c-format
+msgid "\"%s\" is invalid"
+msgstr "\"%s\" är ogiltigt"
 
 #: info/session.c:4495
 #, c-format
-msgid "\"%s\" is invalid"
+msgid "`%s' is invalid"
 msgstr "\"%s\" är ogiltigt"
 
-#: info/session.c:4713
+#: info/session.c:4709
 msgid "Add this digit to the current numeric argument"
 msgstr "Lägg till denna siffra till det aktuella numeriska argumentet"
 
-#: info/session.c:4722
+#: info/session.c:4718
 msgid "Start (or multiply by 4) the current numeric argument"
 msgstr "Börja (eller multiplicera med 4) det numeriska argumentet"
 
-#: info/session.c:4737
+#: info/session.c:4733
 msgid "Internally used by \\[universal-argument]"
 msgstr "Används internt av \\[universal-argument]"
 
-#: info/tilde.c:344
+#: info/tilde.c:338
+#, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: Slut på virtuellt minne!\n"
 
@@ -1719,236 +1743,274 @@ msgstr "Ställ in %s till värdet (%d): "
 msgid "Set %s to value (%s): "
 msgstr "Ställ in %s till värdet (%s): "
 
-#: info/window.c:1164
+#: info/window.c:1138
 msgid "--*** Tags out of Date ***"
 msgstr "--*** För gamla taggar ***"
 
-#: info/window.c:1175
+#: info/window.c:1149
 msgid "-----Info: (), lines ----, "
 msgstr "-----Info: (), rader ----, "
 
-#: info/window.c:1182
+#: info/window.c:1156
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr "-%s---Info: %s, %d rader --%s--"
 
-#: info/window.c:1186
+#: info/window.c:1160
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr "-%s%s-Info: (%s)%s, %d rader --%s--"
 
-#: info/window.c:1193
+#: info/window.c:1167
 #, c-format
 msgid " Subfile: %s"
 msgstr " Underfil: %s"
 
-#: lib/getopt.c:675
+#: lib/getopt.c:551 lib/getopt.c:570
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: flaggan \"%s\" är flertydig\n"
 
-#: lib/getopt.c:700
+#: lib/getopt.c:603 lib/getopt.c:607
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: flaggan \"--%s\" tillåter inget argument\n"
 
-#: lib/getopt.c:705
+#: lib/getopt.c:616 lib/getopt.c:621
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: flaggan \"%c%s\" tillåter inget argument\n"
 
-#: lib/getopt.c:723 lib/getopt.c:896
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: flaggan \"%s\" kräver ett argument\n"
 
-#: lib/getopt.c:752
+#: lib/getopt.c:727 lib/getopt.c:730
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: okänd flagga \"--%s\"\n"
 
-#: lib/getopt.c:756
+#: lib/getopt.c:738 lib/getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: okänd flagga \"%c%s\"\n"
 
-#: lib/getopt.c:782
+#: lib/getopt.c:796 lib/getopt.c:799
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: otillåten flagga -- %c\n"
 
-#: lib/getopt.c:785
+#: lib/getopt.c:805 lib/getopt.c:808
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ogiltig flagga -- %c\n"
 
-#: lib/getopt.c:815 lib/getopt.c:945
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: flaggan kräver ett argument -- %c\n"
 
-#: lib/getopt.c:862
+#: lib/getopt.c:935 lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: flaggan \"-W %s\" är flertydig\n"
 
-#: lib/getopt.c:880
+#: lib/getopt.c:978 lib/getopt.c:999
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: flaggan \"-W %s\" tillåter inget argument\n"
 
+#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#, c-format
+msgid "arguments to @%s ignored"
+msgstr "argument till @%s ignorerades"
+
 # This is broken
 #
 # The translator should not need to translate this - it is all present
 # in libc and can be used with nl_langinfo(), strftime() and friends.
 #
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "January"
 msgstr "januari"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "February"
 msgstr "februari"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "March"
 msgstr "mars"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "April"
 msgstr "april"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "May"
 msgstr "maj"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "June"
 msgstr "juni"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "July"
 msgstr "juli"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "August"
 msgstr "augusti"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "September"
 msgstr "september"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "October"
 msgstr "oktober"
 
-#: makeinfo/cmds.c:517
+#: makeinfo/cmds.c:587
 msgid "November"
 msgstr "november"
 
-#: makeinfo/cmds.c:517
+#: makeinfo/cmds.c:587
 msgid "December"
 msgstr "december"
 
-#: makeinfo/cmds.c:658
+#: makeinfo/cmds.c:936
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "osannolikt tecken %c i @var"
 
-#: makeinfo/cmds.c:701
+#: makeinfo/cmds.c:979
 msgid "@sc argument all uppercase, thus no effect"
 msgstr ""
 "@sc-argumentet är enbart med stora bokstäver, därför har det ingen effekt"
 
-#: makeinfo/cmds.c:759
+#: makeinfo/cmds.c:1034
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "\"{\" förväntades, men såg \"%c\""
 
-#: makeinfo/cmds.c:789
+#: makeinfo/cmds.c:1074
 msgid "end of file inside verb block"
 msgstr "filslut inuti verb-block"
 
-#: makeinfo/cmds.c:797
+#: makeinfo/cmds.c:1082
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "\"}\" förväntades, men såg \"%c\""
 
-#: makeinfo/cmds.c:942
+# Är det kombinationen "@strong{Note:.." eller bara @strong{} rent allmänt som
+# orsakar problem?
+#: makeinfo/cmds.c:1112
+msgid ""
+"@strong{Note...} produces a spurious cross-reference in Info; reword to "
+"avoid that"
+msgstr ""
+"@strong{Obs...} skapar en falsk korsreferens i Info; formulera om för att "
+"undvika detta"
+
+#: makeinfo/cmds.c:1305
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s är föråldrat"
 
-#: makeinfo/cmds.c:1014
+#: makeinfo/cmds.c:1414
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "@sp kräver ett positivt numeriskt argument, inte \"%s\""
 
-#: makeinfo/cmds.c:1348 makeinfo/cmds.c:1374 makeinfo/footnote.c:81
+#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "Felaktigt argument till %c%s"
 
-#: makeinfo/cmds.c:1358 makeinfo/makeinfo.c:4140
+#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
 msgid "asis"
 msgstr "oförändrad"
 
-#: makeinfo/cmds.c:1360 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
 msgid "none"
 msgstr "ingen"
 
-#: makeinfo/defun.c:85
+#: makeinfo/cmds.c:1789
+#, c-format
+msgid "Bad argument to @%s"
+msgstr "Felaktigt argument till @%s"
+
+#: makeinfo/cmds.c:1803
+msgid "insert"
+msgstr "infoga"
+
+#: makeinfo/defun.c:84
 msgid "Missing `}' in @def arg"
 msgstr "\"}\" saknas i @def-argumentet"
 
-#: makeinfo/defun.c:363
+#: makeinfo/defun.c:403
 msgid "Function"
 msgstr "Funktion"
 
-#: makeinfo/defun.c:366
+#: makeinfo/defun.c:406
 msgid "Macro"
 msgstr "Makro"
 
-#: makeinfo/defun.c:369
+#: makeinfo/defun.c:409
 msgid "Special Form"
 msgstr "Specialform"
 
-#: makeinfo/defun.c:373
+#: makeinfo/defun.c:413
 msgid "Variable"
 msgstr "Variabel"
 
-#: makeinfo/defun.c:376
+#: makeinfo/defun.c:416
 msgid "User Option"
 msgstr "Användarflagga"
 
-#: makeinfo/defun.c:380
+#: makeinfo/defun.c:420
 msgid "Instance Variable"
 msgstr "Instansvariabel"
 
-#: makeinfo/defun.c:384
+#: makeinfo/defun.c:424
 msgid "Method"
 msgstr "Metod"
 
-#: makeinfo/defun.c:466 makeinfo/defun.c:470 makeinfo/defun.c:615
-#: makeinfo/defun.c:631 makeinfo/defun.c:671
+#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
+#: makeinfo/defun.c:644 makeinfo/xml.c:2229
 msgid "of"
 msgstr "av"
 
-#: makeinfo/defun.c:474 makeinfo/defun.c:478 makeinfo/defun.c:482
-#: makeinfo/defun.c:624 makeinfo/defun.c:676
+#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
 msgid "on"
 msgstr "på"
 
-#: makeinfo/defun.c:717
+#: makeinfo/defun.c:711
 #, c-format
-msgid "Must be in `%s' insertion to use `%sx'"
-msgstr "Måste vara i \"%s\"-insättningen för att använda \"%sx\""
+msgid "Must be in `@%s' environment to use `@%s'"
+msgstr "Måste vara i \"@%s\"-omgivning för att använda \"@%s\""
 
-#: makeinfo/files.c:448
+#: makeinfo/files.c:435
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr "%s: getwd: %s, %s\n"
 
+#: makeinfo/files.c:638
+#, c-format
+msgid "`%s' omitted before output filename"
+msgstr "\"%s\" utelämnades innan utdatafilnamnet"
+
+#: makeinfo/files.c:646
+#, c-format
+msgid "`%s' omitted since writing to stdout"
+msgstr "\"%s\" utelämnades efter skrivning till standard ut"
+
+#: makeinfo/files.c:694
+msgid "Output buffer not empty."
+msgstr "Utdatabufferten är inte tom."
+
 #: makeinfo/footnote.c:150
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
@@ -1967,228 +2029,276 @@ msgstr "Fotnoten definierad utan föräldernod"
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "Fotnoter inuti fotnoter är inte tillåtet"
 
-#: makeinfo/footnote.c:298
+#: makeinfo/footnote.c:302 makeinfo/index.c:189
 msgid "Footnotes"
 msgstr "Fotnoter"
 
-#: makeinfo/html.c:42
+#: makeinfo/html.c:87
+#, c-format
+msgid "%s: could not open --css-file: %s"
+msgstr "%s: kunde inte öppna --css-fil: %s"
+
+#: makeinfo/html.c:172
+#, c-format
+msgid "%s:%d: --css-file ended in comment"
+msgstr "%s:%d: --css-fil slutade med kommentar"
+
+#: makeinfo/html.c:207
 msgid "Untitled"
 msgstr "Namnlös"
 
-#: makeinfo/html.c:298
+# to pop?
+#: makeinfo/html.c:422
+msgid "[unexpected] no html tag to pop"
+msgstr "[oväntat] ingen html-tagg att poppa"
+
+#: makeinfo/html.c:752
 #, c-format
-msgid "Invalid node name: `%s'"
-msgstr "Ogiltigt nodnamn: \"%s\""
+msgid "[unexpected] invalid node name: `%s'"
+msgstr "[oväntat] ogiltigt nodnamn: \"%s\""
 
-#: makeinfo/index.c:213
+#: makeinfo/index.c:169
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "Okänt index \"%s\""
 
-#: makeinfo/index.c:238
+#: makeinfo/index.c:234
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr "Info kan inte hantera \":\" i indexposten \"%s\""
 
-#: makeinfo/index.c:396
+#: makeinfo/index.c:412
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "Indexet \"%s\" finns redan"
 
-#: makeinfo/index.c:439
+#: makeinfo/index.c:455
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "Okänt index \"%s\" och/eller \"%s\" i @synindex"
 
-#: makeinfo/index.c:666
+#: makeinfo/index.c:661
+msgid "(line )"
+msgstr "(rad )"
+
+#: makeinfo/index.c:669
+#, c-format
+msgid "(line %*d)"
+msgstr "(rad %*d)"
+
+#: makeinfo/index.c:750
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "Okänt index \"%s\" i @printindex"
 
-#: makeinfo/index.c:709
+#: makeinfo/index.c:819
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "Posten för index \"%s\" är utanför alla noder"
 
-#: makeinfo/index.c:712 makeinfo/index.c:751
+#: makeinfo/index.c:822 makeinfo/index.c:858
 msgid "(outside of any node)"
 msgstr "(utanför alla noder)"
 
-#: makeinfo/insertion.c:198
+#: makeinfo/index.c:919 makeinfo/index.c:925
+msgid "See "
+msgstr "Se "
+
+#: makeinfo/insertion.c:160
+msgid "@item not allowed in argument to @itemize"
+msgstr "@item är inte tillåtet i argument till @itemize"
+
+#: makeinfo/insertion.c:238
 msgid "Broken-Type in insertion_type_pname"
 msgstr "Felaktig typ i insertion_type_pname"
 
-#: makeinfo/insertion.c:271
+#: makeinfo/insertion.c:334
 msgid "Enumeration stack overflow"
 msgstr "Uppräkningsstacken har flödat över"
 
-#: makeinfo/insertion.c:303
+#: makeinfo/insertion.c:366
 #, c-format
 msgid "lettering overflow, restarting at %c"
 msgstr "bokstaveringen har flödat över, startar om vid %c"
 
-#: makeinfo/insertion.c:538
+#: makeinfo/insertion.c:631
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
 msgstr "%s kräver ett argument: formateraren för %citem"
 
-#: makeinfo/insertion.c:693
+#: makeinfo/insertion.c:719
+#, c-format
+msgid "%cfloat environments cannot be nested"
+msgstr "%cfloat-omgivningar kan inte nästlas"
+
+#: makeinfo/insertion.c:973
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
 msgstr "\"@end\" förväntade \"%s\", men såg \"%s\""
 
-#: makeinfo/insertion.c:931
+#: makeinfo/insertion.c:1337
 #, c-format
 msgid "No matching `%cend %s'"
 msgstr "Inget matchande \"%cend %s\""
 
-#: makeinfo/insertion.c:1084
+#: makeinfo/insertion.c:1592
 #, c-format
 msgid "%s requires letter or digit"
 msgstr "%s kräver bokstav eller siffra"
 
-#: makeinfo/insertion.c:1158
+#: makeinfo/insertion.c:1687
 msgid "end of file inside verbatim block"
 msgstr "filslut inuti bokstavligt block"
 
-#: makeinfo/insertion.c:1318
+#: makeinfo/insertion.c:1913
+#, c-format
+msgid "@%s not meaningful outside `@float' environment"
+msgstr "@%s är inte meningsfullt utanför \"@float\"-omgivning"
+
+#: makeinfo/insertion.c:1949
 msgid "@menu seen before first @node, creating `Top' node"
 msgstr "@menu sågs innan första @node, skapar \"Top\"-nod"
 
-#: makeinfo/insertion.c:1319
+#: makeinfo/insertion.c:1950
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr "din @top-nod ska kanske packas i @ifnottex istället för @ifinfo?"
 
-#: makeinfo/insertion.c:1331
+#: makeinfo/insertion.c:1962
 msgid "@detailmenu seen before first node, creating `Top' node"
 msgstr "@detailmenu sågs innan första noden, skapar \"Top\"-nod"
 
-#: makeinfo/insertion.c:1346
+#: makeinfo/insertion.c:2018
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr ""
+"@%s är inte meningsfullt utanför \"@titlepage\"- och \"@quotation\"-omgivning"
+
+#: makeinfo/insertion.c:2032
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' environment"
+msgstr "@%s är inte meningsfullt utanför \"@titlepage\"-omgivning"
+
+#: makeinfo/insertion.c:2063
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr "Ensamt \"%c%s\""
 
-#: makeinfo/insertion.c:1353
+#: makeinfo/insertion.c:2068
 #, c-format
 msgid "`%c%s' needs something after it"
 msgstr "\"%c%s\" kräver någonting efter sig"
 
-#: makeinfo/insertion.c:1359
+#: makeinfo/insertion.c:2074
 #, c-format
-msgid "Bad argument to `%s', `%s', using `%s'"
-msgstr "Felaktigt argument till \"%s\", \"%s\", använder \"%s\""
+msgid "Bad argument `%s' to `@%s', using `%s'"
+msgstr "Felaktigt argument \"%s\" till \"@%s\", använder \"%s\""
 
-#: makeinfo/insertion.c:1453
+#: makeinfo/insertion.c:2171
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
 msgstr "@%s är inte meningsfullt inuti \"@%s\"-block"
 
-#: makeinfo/insertion.c:1462
+#: makeinfo/insertion.c:2180
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "@itemx är inte meningsfullt inuti \"%s\"-block"
 
-#: makeinfo/insertion.c:1646
+#: makeinfo/insertion.c:2356
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "%c%s hittades utanför ett insättningsblock"
 
-#: makeinfo/lang.c:331
+#: makeinfo/lang.c:580
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "%s är inte en giltig landskod enligt ISO 639"
 
-#: makeinfo/lang.c:384
+#: makeinfo/lang.c:655
 #, c-format
-msgid "unrecogized encoding name `%s'"
-msgstr "okänd kodningsnamn \"%s\""
+msgid "unrecognized encoding name `%s'"
+msgstr "okänt kodningsnamn \"%s\""
 
-#: makeinfo/lang.c:387
+#: makeinfo/lang.c:663
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "tyvärr, kodningen \"%s\" stöds inte"
 
-#: makeinfo/lang.c:414
+#: makeinfo/lang.c:715
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "ogiltigt kodat tecken \"%s\""
 
-#: makeinfo/lang.c:502
-#, c-format
-msgid "%s is an invalid ISO code, using %c"
-msgstr "%s är en ogiltig ISO-kod, använder %c"
-
-#: makeinfo/lang.c:687
+#: makeinfo/lang.c:1009
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "%c%s förväntar \"i\" eller \"j\" som argument, inte \"%c\""
 
-#: makeinfo/lang.c:691
+#: makeinfo/lang.c:1013
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr "%c%s förväntar ett ensamt tecken \"i\" eller \"j\" som argument"
 
-#: makeinfo/macro.c:134
+#: makeinfo/macro.c:128
 #, c-format
 msgid "macro `%s' previously defined"
 msgstr "makrot \"%s\" är redan definierat"
 
-#: makeinfo/macro.c:138
+#: makeinfo/macro.c:132
 #, c-format
 msgid "here is the previous definition of `%s'"
 msgstr "här är den tidigare definitionen av \"%s\""
 
 #: makeinfo/macro.c:355
 #, c-format
-msgid "\\ in macro expansion followed by `%s' instead of \\ or parameter name"
-msgstr ""
-"\\ i makroutökning följdes av \"%s\" istället för \\ eller parameternamn"
+msgid "\\ in macro expansion followed by `%s' instead of parameter name"
+msgstr "\\ i makroutökning följdes av \"%s\" istället för parameternamn"
 
-#: makeinfo/macro.c:403
+#: makeinfo/macro.c:401
 #, c-format
 msgid "Macro `%s' called on line %d with too many args"
 msgstr "Makrot \"%s\" anropades på rad %d med för många argument"
 
-#: makeinfo/macro.c:594
+#: makeinfo/macro.c:586
 #, c-format
 msgid "%cend macro not found"
 msgstr "Makrot %cend hittades inte"
 
-#: makeinfo/macro.c:632
+#: makeinfo/macro.c:624
 msgid "@quote-arg only useful for single-argument macros"
 msgstr "@quote-arg är endast användbart för makron med ett argument"
 
-#: makeinfo/macro.c:668
+#: makeinfo/macro.c:660
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "@end %s och @%s passar inte"
 
-#: makeinfo/makeinfo.c:316
+#: makeinfo/makeinfo.c:184
 #, c-format
-msgid "%s:%d: warning: "
-msgstr "%s:%d: varning: "
-
-#: makeinfo/makeinfo.c:339
 msgid "Too many errors!  Gave up.\n"
 msgstr "För många fel! Gav upp.\n"
 
-#: makeinfo/makeinfo.c:350 makeinfo/makeinfo.c:2026
+#: makeinfo/makeinfo.c:302
+#, c-format
+msgid "%s:%d: warning: "
+msgstr "%s:%d: varning: "
+
+#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
 #, c-format
 msgid "Misplaced %c"
 msgstr "Felplacerat %c"
 
-#: makeinfo/makeinfo.c:370
+#: makeinfo/makeinfo.c:340
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Prova \"%s --help\" för mer information.\n"
 
-#: makeinfo/makeinfo.c:373
+#: makeinfo/makeinfo.c:343
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Användning: %s [FLAGGA]... TEXINFO-FIL...\n"
 
-#: makeinfo/makeinfo.c:376
+#: makeinfo/makeinfo.c:346
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
@@ -2196,7 +2306,7 @@ msgstr ""
 "Översätt Texinfo-källdokumentation till diverse andra format, som standard\n"
 "infofiler som är lämpliga för läsning med Emacs eller GNU Info.\n"
 
-#: makeinfo/makeinfo.c:380
+#: makeinfo/makeinfo.c:350
 #, c-format
 msgid ""
 "General options:\n"
@@ -2221,20 +2331,22 @@ msgstr ""
 "  -v, --verbose               förklara vad som görs.\n"
 "      --version               visa versionsinformation och avsluta.\n"
 
-#: makeinfo/makeinfo.c:394
+#: makeinfo/makeinfo.c:364
 #, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output DocBook rather than Info.\n"
+"      --docbook             output Docbook XML rather than Info.\n"
 "      --html                output HTML rather than Info.\n"
-"      --xml                 output XML (TexinfoML) rather than Info.\n"
+"      --xml                 output Texinfo XML rather than Info.\n"
+"      --plaintext           output plain text rather than Info.\n"
 msgstr ""
 "Val av utdataformat (standard är att producera Info):\n"
-"      --docbook             generera DocBook istället för Info.\n"
+"      --docbook             generera Docbook XML istället för Info.\n"
 "      --html                generera HTML istället för Info.\n"
-"      --xml                 generera XML (TexinfoML) istället för Info.\n"
+"      --xml                 generera Texinfo XML istället för Info.\n"
+"      --plaintext           generera vanlig text istället för Info.\n"
 
-#: makeinfo/makeinfo.c:401
+#: makeinfo/makeinfo.c:372
 msgid ""
 "General output options:\n"
 "  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
@@ -2262,7 +2374,7 @@ msgstr ""
 "      --number-sections     generera kapitel- och avsnittsnummer.\n"
 "  -o, --output=FIL          generera till FIL (katalog om delad HTML),\n"
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:386
 #, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2299,14 +2411,38 @@ msgstr ""
 "      --split-size=ANTAL      dela upp Info-filer vid storleken ANTAL\n"
 "                                (standardvärde %d).\n"
 
-#: makeinfo/makeinfo.c:433
+#: makeinfo/makeinfo.c:403
+msgid ""
+"Options for HTML:\n"
+"      --css-include=FILE        include FILE in HTML <style> output;\n"
+"                                  read stdin if FILE is -.\n"
+msgstr ""
+"Flaggor för HTML:\n"
+"      --css-include=FIL          inkludera FIL i HTML <style>-utdata;\n"
+"                                   läs standard in om FIL är -.\n"
+
+#: makeinfo/makeinfo.c:409
+#, c-format
+msgid ""
+"Options for XML and Docbook:\n"
+"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"d).\n"
+"                                  If VAL is 0, ignorable whitespace is "
+"dropped.\n"
+msgstr ""
+"Flaggor för XML och Docbook:\n"
+"      --output-indent=VÄRDE     dra in XML-element med VÄRDE blanksteg\n"
+"                                  (standard %d). Om VÄRDE är 0 kastas\n"
+"                                  mellanrum som kan ignoreras.\n"
+
+#: makeinfo/makeinfo.c:416
 msgid ""
 "Input file options:\n"
-"      --commands-in-node-names   allow @ commands in node names.\n"
-"  -D VAR                         define the variable VAR, as with @set.\n"
-"  -I DIR                         append DIR to the @include search path.\n"
-"  -P DIR                         prepend DIR to the @include search path.\n"
-"  -U VAR                         undefine the variable VAR, as with @clear.\n"
+"      --commands-in-node-names  allow @ commands in node names.\n"
+"  -D VAR                        define the variable VAR, as with @set.\n"
+"  -I DIR                        append DIR to the @include search path.\n"
+"  -P DIR                        prepend DIR to the @include search path.\n"
+"  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
 "Flaggor för indatafil:\n"
 "      --commands-in-node-names   tillåt @-kommandon i nodnamn.\n"
@@ -2318,45 +2454,63 @@ msgstr ""
 "  -U VARIABEL                    odefiniera variabeln VARIABEL, som med "
 "@clear.\n"
 
-#: makeinfo/makeinfo.c:442
-#, fuzzy
+#: makeinfo/makeinfo.c:425
 msgid ""
 "Conditional processing in input:\n"
+"  --ifdocbook       process @ifdocbook and @docbook even if\n"
+"                      not generating Docbook.\n"
 "  --ifhtml          process @ifhtml and @html even if not generating HTML.\n"
 "  --ifinfo          process @ifinfo even if not generating Info.\n"
 "  --ifplaintext     process @ifplaintext even if not generating plain text.\n"
 "  --iftex           process @iftex and @tex; implies --no-split.\n"
+"  --ifxml           process @ifxml and @xml.\n"
+"  --no-ifdocbook    do not process @ifdocbook and @docbook text.\n"
 "  --no-ifhtml       do not process @ifhtml and @html text.\n"
 "  --no-ifinfo       do not process @ifinfo text.\n"
 "  --no-ifplaintext  do not process @ifplaintext text.\n"
 "  --no-iftex        do not process @iftex and @tex text.\n"
+"  --no-ifxml        do not process @ifxml and @xml text.\n"
+"\n"
+"  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
 msgstr ""
 "Villkorlig behandling i indata:\n"
-"     --ifhtml      behandla @ifhtml och @html även om inte HTML genereras.\n"
-"     --ifinfo      behandla @ifinfo-text även om HTML genereras.\n"
-"     --iftex       behandla @iftex och @tex-text; medför --no-split.\n"
-"     --no-ifhtml   behandla inte @ifhtml- och @html-text.\n"
-"     --no-ifinfo   behandla inte @ifinfo-text.\n"
-"     --no-iftex    behandla inte @iftex- och @tex-text.\n"
-
-#: makeinfo/makeinfo.c:454
-#, fuzzy
+"  --ifdocbook       behandla @ifdocbook och @docbook även om inte\n"
+"                      Docbook genereras.\n"
+"  --ifhtml          behandla @ifhtml och @html även om inte HTML genereras.\n"
+"  --ifinfo          behandla @ifinfo-text även om inte Info genereras.\n"
+"  --ifplaintext     behandla @ifplaintext även om inte vanlig text\n"
+"                    genereras.\n"
+"  --iftex           behandla @iftex och @tex-text; medför --no-split.\n"
+"  --ifxml           behandla @ifxml och @xml.\n"
+"  --no-ifdocbook    behandla inte @ifdocbook- och @docbook-text.\n"
+"  --no-ifhtml       behandla inte @ifhtml- och @html-text.\n"
+"  --no-ifinfo       behandla inte @ifinfo-text.\n"
+"  --no-ifplaintext  behandla inte @ifplaintext-text.\n"
+"  --no-iftex        behandla inte @iftex- och @tex-text.\n"
+"  --no-ifxml        behandla inte @ifxml- och @xml-text.\n"
+"\n"
+"  Dessutom, för flaggorna --no-ifFORMAT, behandla @ifnotFORMAT-text.\n"
+
+#: makeinfo/makeinfo.c:444
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating HTML, --ifhtml is on and the others are off;\n"
 "  if generating Info, --ifinfo is on and the others are off;\n"
 "  if generating plain text, --ifplaintext is on and the others are off;\n"
+"  if generating XML, --ifxml is on and the others are off.\n"
 msgstr ""
 "  Standardvärdena för @if...-villkoren beror på utdataformatet:\n"
 "  om HTML genereras är --ifhtml på och de andra av;\n"
-"  om Info eller vanlig text genereras är --ifinfo på och de andra av.\n"
+"  om Info genereras är --ifinfo på och de andra av;\n"
+"  om vanlig text genereras är --ifplaintext på och de andra av;\n"
+"  om XML genereras är --ifxml på och de andra av.\n"
 
-#: makeinfo/makeinfo.c:461
+#: makeinfo/makeinfo.c:452
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                     write Info to foo's @setfilename\n"
 "  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write XML to @setfilename\n"
+"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
 "  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
 "  makeinfo --no-headers foo.texi        write plain text to standard output\n"
 "\n"
@@ -2368,7 +2522,7 @@ msgstr ""
 "Exempel:\n"
 "  makeinfo apa.texi                     skriv Info till apas @setfilename\n"
 "  makeinfo --html apa.texi              skriv HTML till @setfilename\n"
-"  makeinfo --xml apa.texi               skriv XML till @setfilename\n"
+"  makeinfo --xml apa.texi               skriv Texinfo XML till @setfilename\n"
 "  makeinfo --docbook apa.texi           skriv DocBook XML till @setfilename\n"
 "  makeinfo --no-headers apa.texi        skriv vanlig text till standard ut\n"
 "  makeinfo --html --no-headers apa.texi skriv html utan nodrader och menyer\n"
@@ -2376,60 +2530,67 @@ msgstr ""
 "  makeinfo --no-split apa.texi          skriv en Info-fil hur stor den än "
 "är\n"
 
-#: makeinfo/makeinfo.c:570 makeinfo/makeinfo.c:593 makeinfo/makeinfo.c:655
-#: makeinfo/makeinfo.c:676
+#: makeinfo/makeinfo.c:603
+#, c-format
+msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
+msgstr "%s: Ignorerar okänt TEXINFO_OUTPUT_FORMAT-värde \"%s\".\n"
+
+#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
+#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr "%s: argumentet %s måste vara numeriskt, inte \"%s\".\n"
 
-#: makeinfo/makeinfo.c:583
+#: makeinfo/makeinfo.c:660
 #, c-format
-msgid "Couldn't open macro expansion output `%s'"
-msgstr "Kunde inte öppna makroexpansionsutdata \"%s\""
+msgid "%s: could not open macro expansion output `%s'"
+msgstr "%s: kunde inte öppna makroexpansionsutdata \"%s\""
 
-#: makeinfo/makeinfo.c:586
-msgid "Cannot specify more than one macro expansion output"
-msgstr "Kan inte ange mer än en makroexpansionsutdata"
+#: makeinfo/makeinfo.c:665
+#, c-format
+msgid "%s: ignoring second macro expansion output `%s'.\n"
+msgstr "%s: ignorerar andra makroexpansionsutdata \"%s\".\n"
 
-#: makeinfo/makeinfo.c:624
+#: makeinfo/makeinfo.c:707
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 "%s: argumentet --paragraph-indent måste vara numeriskt/\"none\"/\"asis\", "
 "inte \"%s\".\n"
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 "%s: argumentet --footnote-style måste vara \"separate\" eller \"end\", inte "
 "\"%s\".\n"
 
-#: makeinfo/makeinfo.c:723
+#: makeinfo/makeinfo.c:806
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: filargument saknas.\n"
 
-#: makeinfo/makeinfo.c:898
+#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#, c-format
+msgid "Multiline command %c%s used improperly"
+msgstr "Flerradskommandot %c%s används felaktigt"
+
+#: makeinfo/makeinfo.c:1000
 #, c-format
 msgid "Expected `%s'"
 msgstr "\"%s\" förväntades"
 
-#: makeinfo/makeinfo.c:1365
-msgid "File exists, but is not a directory"
-msgstr "Filen finns men är ingen katalog"
-
-#: makeinfo/makeinfo.c:1366
+#: makeinfo/makeinfo.c:1479
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "Kan inte skapa katalogen \"%s\": %s"
 
-#: makeinfo/makeinfo.c:1414
+#: makeinfo/makeinfo.c:1525
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "Inget \"%s\" hittades i \"%s\""
 
-#: makeinfo/makeinfo.c:1496
+#: makeinfo/makeinfo.c:1605
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
@@ -2440,17 +2601,17 @@ msgstr ""
 #         no_headers ? "text" : (html ? "HTML" : "info"),
 #         output_filename, input_filename);
 #
-#: makeinfo/makeinfo.c:1526
+#: makeinfo/makeinfo.c:1638
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "Skapar %s-fil \"%s\" från \"%s\".\n"
 
-#: makeinfo/makeinfo.c:1561
+#: makeinfo/makeinfo.c:1673
 #, c-format
 msgid "This is %s, produced by makeinfo version %s from %s.\n"
 msgstr "Detta är %s, skapad av makeinfo version %s från %s.\n"
 
-#: makeinfo/makeinfo.c:1583
+#: makeinfo/makeinfo.c:1709
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2458,330 +2619,328 @@ msgstr ""
 "%s: Tar bort makroutdatafilen \"%s\" på grund av fel; använd --force för att "
 "bevara.\n"
 
-#: makeinfo/makeinfo.c:1627
+#: makeinfo/makeinfo.c:1773
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 "%s: Tar bort utdatafilen \"%s\" på grund av fel; använd --force för att "
 "bevara.\n"
 
-#: makeinfo/makeinfo.c:1853
+#: makeinfo/makeinfo.c:2034
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "Okänt kommando \"%s\""
 
-#: makeinfo/makeinfo.c:1875
+#: makeinfo/makeinfo.c:2056
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr "Använd klamrar för att ge ett komamndo som ett argument till @%s"
 
-#: makeinfo/makeinfo.c:2068
+#: makeinfo/makeinfo.c:2314
 #, c-format
-msgid "%c%s expected `{...}'"
-msgstr "%c%s förväntades \"{...}\""
+msgid "%c%s expected braces"
+msgstr "%c%s förväntade klamrar"
 
-#: makeinfo/makeinfo.c:2098
+#: makeinfo/makeinfo.c:2327
 msgid "Unmatched }"
 msgstr "Ensam }"
 
-#: makeinfo/makeinfo.c:2148
+#: makeinfo/makeinfo.c:2375
 msgid "NO_NAME!"
 msgstr "INGET_NAMN!"
 
-#: makeinfo/makeinfo.c:2169
+#: makeinfo/makeinfo.c:2396
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s saknar avslutande klammer"
 
-#: makeinfo/makeinfo.c:2958
-msgid "First argument to cross-reference may not be empty"
-msgstr "Första argumentet till korsreferens kan inte vara tomt"
-
-#: makeinfo/makeinfo.c:3018 makeinfo/makeinfo.c:3236 makeinfo/xml.c:1340
-msgid "see "
-msgstr "se "
-
-#: makeinfo/makeinfo.c:3018
-msgid "See "
-msgstr "Se "
-
-#: makeinfo/makeinfo.c:3164
-#, c-format
-msgid "`.' or `,' must follow cross reference, not %c"
-msgstr "\".\" eller \",\" måste följa på korsreferens, inte %c"
-
-#: makeinfo/makeinfo.c:3212
-msgid "First argument to @inforef may not be empty"
-msgstr "Första argumentet till @inforef kan inte vara tomt"
-
-#: makeinfo/makeinfo.c:3427
+#: makeinfo/makeinfo.c:3309
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "@image-filen \"%s\" (för HTML) är oläslig: %s"
 
-#: makeinfo/makeinfo.c:3440
+#: makeinfo/makeinfo.c:3315
 #, c-format
-msgid "No `%s.png' or `.jpg', and no extension supplied"
-msgstr "Ingen \"%s.png\" eller \".jpg\" och ingen filändelse angiven"
+msgid "No such file `%s'"
+msgstr "Det finns ingen sådan fil \"%s\""
 
-#: makeinfo/makeinfo.c:3490
+#: makeinfo/makeinfo.c:3447
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "@image-filen \"%s\" (för text) är oläslig: %s"
 
-#: makeinfo/makeinfo.c:3497
+#: makeinfo/makeinfo.c:3456
 msgid "@image missing filename argument"
 msgstr "@image saknar filnamnsargument"
 
-#: makeinfo/makeinfo.c:3690
+#: makeinfo/makeinfo.c:3675
+#, c-format
+msgid "undefined flag: %s"
+msgstr "odefinierad flagga: %s"
+
+#: makeinfo/makeinfo.c:3676
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{Inget värde för \"%s\"}"
 
-#: makeinfo/makeinfo.c:3744
+#: makeinfo/makeinfo.c:3728
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s kräver ett namn"
 
-#: makeinfo/makeinfo.c:3850
+#: makeinfo/makeinfo.c:3834
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "Nådde filslut innan matchande @end %s"
 
-#: makeinfo/makeinfo.c:4081
+#: makeinfo/makeinfo.c:4082
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr "\"%.40s...\" är för lång för expansion; inte expanderad"
 
-#: makeinfo/multi.c:226
+#: makeinfo/multi.c:116
 msgid "Missing } in @multitable template"
 msgstr "Ett } saknas i @multitable-mall"
 
-#: makeinfo/multi.c:302
+#: makeinfo/multi.c:254
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "ignorerar lös text \"%s\" efter @multitable"
 
-#: makeinfo/multi.c:375
+#: makeinfo/multi.c:393
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "För många kolumner i multitabellsobjekt (max %d)"
 
-#: makeinfo/multi.c:426
+#: makeinfo/multi.c:555
 #, c-format
-msgid "Cannot select column #%d in multitable"
-msgstr "Kan inte välja kolumn %d i multitabell"
+msgid "[unexpected] cannot select column #%d in multitable"
+msgstr "[oväntat] kan inte välja kolumn %d i multitabell"
 
-#: makeinfo/multi.c:529
+#: makeinfo/multi.c:584
 msgid "ignoring @tab outside of multitable"
 msgstr "ignorerar @tab utanför multitabell"
 
-#: makeinfo/multi.c:565
+#: makeinfo/multi.c:632
+#, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** Utdata på flera kolumner från senaste raden:\n"
 
-#: makeinfo/multi.c:568
+#: makeinfo/multi.c:635
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* kolumn %d: utdata = %s\n"
 
-#: makeinfo/node.c:276
+#: makeinfo/node.c:280
 #, c-format
 msgid "Node `%s' previously defined at line %d"
 msgstr "Noden \"%s\" är tidigare definierad på rad %d"
 
-#: makeinfo/node.c:594
+#: makeinfo/node.c:648
 #, c-format
 msgid "Formatting node %s...\n"
 msgstr "Formaterar noden %s...\n"
 
-#: makeinfo/node.c:655
+#: makeinfo/node.c:716
 #, c-format
-msgid "Node `%s' requires a sectioning command (e.g. %c%s)"
-msgstr "Noden \"%s\" kräver ett avsnittskommando (t.ex. %c%s)"
+msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
+msgstr "Noden \"%s\" kräver ett kommando för avsnittsindelning (t.ex. %c%s)"
 
-#: makeinfo/node.c:815
+#: makeinfo/node.c:879
 #, c-format
 msgid "No node name specified for `%c%s' command"
 msgstr "Inget nodnamn angivet för kommandot \"%c%s\""
 
-#: makeinfo/node.c:856 makeinfo/node.c:1075
+#: makeinfo/node.c:920 makeinfo/node.c:1151
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr "Ankaret \"%s\" och noden \"%s\" mappas till samma filnamn"
 
-#: makeinfo/node.c:859
+#: makeinfo/node.c:923
 msgid "This @anchor command ignored; references to it will not work"
 msgstr ""
 "Detta @anchor-kommando ignoreras; referenser till det kommer inte att fungera"
 
-#: makeinfo/node.c:861 makeinfo/node.c:1078
+#: makeinfo/node.c:925 makeinfo/node.c:1154
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "Byt namn på detta ankare eller använd flaggan \"--no-split\""
 
-#: makeinfo/node.c:891
+#: makeinfo/node.c:955
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
 msgstr "Oväntad sträng vid slutet på den delade HTML-filen \"%s\""
 
-#: makeinfo/node.c:920
-msgid "Node:"
-msgstr "Nod:"
-
 # src/menus.c:332
-#: makeinfo/node.c:930
+#: makeinfo/node.c:991
 msgid "Next:"
 msgstr "Nästa:"
 
-#: makeinfo/node.c:940
+#: makeinfo/node.c:1007
 msgid "Previous:"
 msgstr "Föregående:"
 
-#: makeinfo/node.c:950
+#: makeinfo/node.c:1021
 msgid "Up:"
 msgstr "Upp:"
 
-#: makeinfo/node.c:1072
+#: makeinfo/node.c:1148
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr "Ankarna \"%s\" och \"%s\" mappas till samma filnamn"
 
-#: makeinfo/node.c:1077
+#: makeinfo/node.c:1153
 msgid "@anchor command ignored; references to it will not work"
 msgstr ""
 "@anchor-kommandot ignoreras; referenser till det kommer inte att fungera"
 
-#: makeinfo/node.c:1277
+#: makeinfo/node.c:1347
 #, c-format
-msgid "%s reference to nonexistent node `%s'"
-msgstr "%s-referens till ickeexisterande noden \"%s\""
+msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
+msgstr ""
+"%s-referens till ickeexisterande noden \"%s\" (kanske felaktig "
+"avsnittsindelning?)"
 
-#: makeinfo/node.c:1294
+#: makeinfo/node.c:1363
 msgid "Menu"
 msgstr "Meny"
 
-#: makeinfo/node.c:1296
+#: makeinfo/node.c:1365
 msgid "Cross"
 msgstr "Kors"
 
-#: makeinfo/node.c:1380
+#: makeinfo/node.c:1447
 #, c-format
-msgid "Next field of node `%s' not pointed to"
-msgstr "Nästa fält i noden \"%s\" pekas inte till"
+msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
+msgstr ""
+"Nästa fält i noden \"%s\" pekas inte till (kanske felaktig "
+"avsnittsindelning?)"
 
-#: makeinfo/node.c:1383
+#: makeinfo/node.c:1450
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "Denna nod (%s) har den felaktiga föregående-noden"
 
-#: makeinfo/node.c:1395
+#: makeinfo/node.c:1462
 msgid "Prev"
 msgstr "Föreg"
 
-#: makeinfo/node.c:1438
+#: makeinfo/node.c:1505
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "Föregående-fältet i noden \"%s\" pekas inte till"
 
-#: makeinfo/node.c:1442
+#: makeinfo/node.c:1509
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "Denna nod (%s) har den felaktiga nästa-noden"
 
-#: makeinfo/node.c:1454
+#: makeinfo/node.c:1521
 #, c-format
-msgid "`%s' has no Up field"
-msgstr "\"%s\" har inget upp-fält"
+msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
+msgstr "\"%s\" har inget upp-fält (kanske felaktig avsnittsindelning?)"
 
-#: makeinfo/node.c:1457
+#: makeinfo/node.c:1524
 msgid "Up"
 msgstr "Upp"
 
-#: makeinfo/node.c:1523
+#: makeinfo/node.c:1590
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr "Noden \"%s\" saknar menypost för \"%s\" trots att den är dess Upp-mål"
 
-#: makeinfo/node.c:1552
+#: makeinfo/node.c:1619
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr "noden \"%s\" har refererats %d gånger"
 
-#: makeinfo/node.c:1566
+#: makeinfo/node.c:1633
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "orefererad nod \"%s\""
 
-#: makeinfo/sectioning.c:117
+#: makeinfo/node.c:1723
+#, c-format
+msgid "Removing %s\n"
+msgstr "Tar bort %s\n"
+
+#: makeinfo/node.c:1727
+#, c-format
+msgid "Can't remove file `%s': %s"
+msgstr "Kan inte ta bort filen \"%s\": %s"
+
+#: makeinfo/sectioning.c:122
+#, c-format
+msgid "Appendix %c"
+msgstr "Appendix %c"
+
+#: makeinfo/sectioning.c:467
 #, c-format
-msgid "Appendix %c "
-msgstr "Appendix %c "
+msgid "Internal error (search_sectioning) `%s'!"
+msgstr "Internt fel (search_sectioning) \"%s\"!"
 
-#: makeinfo/sectioning.c:356 makeinfo/sectioning.c:444
+#: makeinfo/sectioning.c:562
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
 msgstr "Internt fel (search_sectioning) \"%s\"!"
 
-#: makeinfo/sectioning.c:502
+#: makeinfo/sectioning.c:623
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr "%c%s är föråldrat; använd %c%s istället"
 
-#: makeinfo/sectioning.c:518
+#: makeinfo/sectioning.c:639
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr "En nod med %ctop som en sektion finns redan"
 
-#: makeinfo/sectioning.c:526
+#: makeinfo/sectioning.c:647
 #, c-format
 msgid "Here is the %ctop node"
 msgstr "Här är %ctop-noden"
 
-#: makeinfo/sectioning.c:543
+#: makeinfo/sectioning.c:663
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr "%ctop användes innan %cnode, använder %s som standard"
 
-#: makeinfo/toc.c:221 makeinfo/toc.c:298 makeinfo/toc.c:299
+#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
 msgid "Table of Contents"
 msgstr "Innehållsförteckning"
 
-#: makeinfo/toc.c:330 makeinfo/toc.c:366 makeinfo/toc.c:367
+#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
 msgid "Short Contents"
 msgstr "Kort innehållsförteckning"
 
-#: makeinfo/toc.c:406
-#, c-format
-msgid "%s: TOC should be here, but it was not found"
-msgstr "%s: Innehållsförteckningen skulle vara här, men hittades inte"
-
-#: makeinfo/xml.c:1108
+#: makeinfo/xml.c:1605
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image-filen \"%s\" är oläslig: %s"
 
-#: util/install-info.c:151
+#: makeinfo/xml.c:2097
+msgid ""
+"@headitem as the last item of @multitable produces invalid Docbook documents"
+msgstr ""
+"@headitem som det sista objektet i @multitable genererar ogiltiga Docbook-"
+"dokument"
+
+#: util/install-info.c:154
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: varning: "
 
-#: util/install-info.c:176 util/install-info.c:189
-msgid "virtual memory exhausted"
-msgstr "virtuellt minne slut"
-
 # char *s = concat ("", strerror (errno), _(" for %s"));
 #
-#: util/install-info.c:232
+#: util/install-info.c:203
 #, c-format
 msgid " for %s"
 msgstr " för %s"
 
-#: util/install-info.c:381
+#: util/install-info.c:426
 #, c-format
 msgid "\tTry `%s --help' for a complete list of options.\n"
 msgstr "\tProva \"%s --help\" för en fullständig lista med flaggor.\n"
 
-#: util/install-info.c:389
+#: util/install-info.c:434
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
@@ -2848,7 +3007,7 @@ msgstr ""
 "                     information i själva Info-filen.\n"
 " --version         visa versionsinformation och avsluta.\n"
 
-#: util/install-info.c:444
+#: util/install-info.c:488
 #, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
@@ -2865,7 +3024,7 @@ msgid ""
 "  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
 "  to select it.\n"
 "\n"
-"* Menu:\n"
+"%s\n"
 msgstr ""
 "Detta är filen .../info/dir som innehåller den översta noden i\n"
 "Info-hierarkin som kallas (kat)Top.\n"
@@ -2881,100 +3040,102 @@ msgstr ""
 "  I Emacs kan du klicka med musknapp 2 på en menypost eller korsreferens\n"
 "  för att välja den.\n"
 "\n"
-"* Meny:\n"
+"%s\n"
 
-#: util/install-info.c:467
+#: util/install-info.c:513
 #, c-format
 msgid "%s: could not read (%s) and could not create (%s)\n"
 msgstr "%s: kunde inte läsa (%s) och kunde inte skapa (%s)\n"
 
-#: util/install-info.c:551
+#: util/install-info.c:600
 #, c-format
 msgid "%s: empty file"
 msgstr "%s: tom fil"
 
-#: util/install-info.c:866 util/install-info.c:906
+#: util/install-info.c:913 util/install-info.c:953
 msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
 msgstr "START-INFO-DIR-ENTRY utan matchande END-INFO-DIR-ENTRY"
 
-#: util/install-info.c:901
+#: util/install-info.c:948
 msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
 msgstr "END-INFO-DIR-ENTRY utan matchande START-INFO-DIR-ENTRY"
 
-#: util/install-info.c:1150 util/install-info.c:1160
+#: util/install-info.c:1191 util/install-info.c:1201
 #, c-format
-msgid "%s: Specify the Info directory only once.\n"
-msgstr "%s: Ange Info-katalogen endast en gång.\n"
+msgid "%s: already have dir file: %s\n"
+msgstr "%s: har redan katalogfilen: %s\n"
 
-#: util/install-info.c:1195
+#: util/install-info.c:1236
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr "%s: Ange Info-filen endast en gång.\n"
 
-#: util/install-info.c:1244
+#: util/install-info.c:1284
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr "för många kommandoradsargument \"%s\""
 
-#: util/install-info.c:1248
+#: util/install-info.c:1288
 msgid "No input file specified; try --help for more information."
 msgstr "Ingen indatafil angiven; prova --help för mer information."
 
-#: util/install-info.c:1251
+#: util/install-info.c:1291
 msgid "No dir file specified; try --help for more information."
 msgstr "Ingen katalogfil angiven; prova --help för mer information."
 
-#: util/install-info.c:1273
+#: util/install-info.c:1313
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr "ingen info-katalogpost i \"%s\""
 
-#: util/install-info.c:1388
+#: util/install-info.c:1426
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr "menyposten \"%s\" finns redan, för filen \"%s\""
 
-#: util/install-info.c:1411
+#: util/install-info.c:1449
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr "inga poster hittades för \"%s\"; ingenting togs bort"
 
-#: util/texindex.c:245
+#: util/texindex.c:252
 msgid "display this help and exit"
 msgstr "visa denna hjälptext och avsluta"
 
-#: util/texindex.c:247
+#: util/texindex.c:254
 msgid "keep temporary files around after processing"
 msgstr "behåll temporära filer efter behandling"
 
-#: util/texindex.c:249
+#: util/texindex.c:256
 msgid "do not keep temporary files around after processing (default)"
 msgstr "behåll inte temporära filer efter behandling (standardalternativ)"
 
-#: util/texindex.c:251
+#: util/texindex.c:258
 msgid "send output to FILE"
 msgstr "skicka utdata till FIL"
 
-#: util/texindex.c:253
+#: util/texindex.c:260
 msgid "display version information and exit"
 msgstr "visa versionsinformation och avsluta"
 
-#: util/texindex.c:264
+#: util/texindex.c:270
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Användning: %s [FLAGGA]... FIL...\n"
 
-#: util/texindex.c:265
+#: util/texindex.c:271
+#, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr "Generera ett sorterat index för varje TeX-utdataFIL.\n"
 
-#: util/texindex.c:268
+#: util/texindex.c:274
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr ""
 "Vanligtvis anges FIL... som \"apa.%c%c\" för ett dokument \"apa.texi\".\n"
 
-#: util/texindex.c:270
+#: util/texindex.c:276
+#, c-format
 msgid ""
 "\n"
 "Options:\n"
@@ -2982,31 +3143,95 @@ msgstr ""
 "\n"
 "Flaggor:\n"
 
-#: util/texindex.c:887 util/texindex.c:921 util/texindex.c:997
-#: util/texindex.c:1025
+#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
+#: util/texindex.c:1011
 #, c-format
 msgid "%s: not a texinfo index file"
 msgstr "%s: inte en texinfo-indexfil"
 
-#: util/texindex.c:982
+#: util/texindex.c:968
 #, c-format
 msgid "failure reopening %s"
 msgstr "misslyckande vid återöppnande av %s"
 
-#: util/texindex.c:1224
+#: util/texindex.c:1218
 #, c-format
 msgid "No page number in %s"
 msgstr "Inget sidnummer i %s"
 
-#: util/texindex.c:1295
+#: util/texindex.c:1291
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "posten %s följer på en post med ett sekundärt namn"
 
-#: util/texindex.c:1633
-#, c-format
-msgid "%s; for file `%s'.\n"
-msgstr "%s; för filen \"%s\".\n"
+#~ msgid "%s: Specify the Info directory only once.\n"
+#~ msgstr "%s: Ange Info-katalogen endast en gång.\n"
+
+#~ msgid "(line)"
+#~ msgstr "(rad)"
+
+#~ msgid "line"
+#~ msgstr "rad"
+
+#~ msgid "line %*d"
+#~ msgstr "rad %*d"
+
+#~ msgid "(line %d)"
+#~ msgstr "(rad %d)"
+
+#~ msgid "line %d"
+#~ msgstr "rad %d"
+
+#~ msgid "Appendix %c "
+#~ msgstr "Appendix %c "
+
+#~ msgid "\"\" is invalid"
+#~ msgstr "\"\" är ogiltigt"
+
+#~ msgid "%s is an invalid ISO code, using %c"
+#~ msgstr "%s är en ogiltig ISO-kod, använder %c"
+
+#~ msgid "Cannot specify more than one macro expansion output"
+#~ msgstr "Kan inte ange mer än en makroexpansionsutdata"
+
+#~ msgid "File exists, but is not a directory"
+#~ msgstr "Filen finns men är ingen katalog"
+
+#~ msgid "First argument to cross-reference may not be empty"
+#~ msgstr "Första argumentet till korsreferens kan inte vara tomt"
+
+#~ msgid "see "
+#~ msgstr "se "
+
+#~ msgid "`.' or `,' must follow cross reference, not %c"
+#~ msgstr "\".\" eller \",\" måste följa på korsreferens, inte %c"
+
+#~ msgid "First argument to @inforef may not be empty"
+#~ msgstr "Första argumentet till @inforef kan inte vara tomt"
+
+#~ msgid "Node:"
+#~ msgstr "Nod:"
+
+#~ msgid "%s: TOC should be here, but it was not found"
+#~ msgstr "%s: Innehållsförteckningen skulle vara här, men hittades inte"
+
+#~ msgid "virtual memory exhausted"
+#~ msgstr "virtuellt minne slut"
+
+#~ msgid "No `%s.png' or `.jpg', and no extension supplied"
+#~ msgstr "Ingen \"%s.png\" eller \".jpg\" och ingen filändelse angiven"
+
+#~ msgid "%s; for file `%s'.\n"
+#~ msgstr "%s; för filen \"%s\".\n"
+
+#~ msgid "`%s' has no Up field"
+#~ msgstr "\"%s\" har inget upp-fält"
+
+#~ msgid "\\%-10[scroll-forward]  Scroll forward 1 line.\n"
+#~ msgstr "\\%-10[scroll-forward]  Rulla en rad framåt.\n"
+
+#~ msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
+#~ msgstr "\\%-10[scroll-backward]  Rulla en rad bakåt.\n"
 
 #~ msgid ""
 #~ "Email bug reports to bug-texinfo@gnu.org,\n"
@@ -3070,7 +3295,7 @@ msgstr "%s; för filen \"%s\".\n"
 #~ " --footnote-style=STIL     generera fotnoter enligt STIL:\n"
 #~ "                            \"separate\" för att placera fotnoter i sin\n"
 #~ "                            egen nod,\n"
-#~ "                            \"end\" för att placera fotnoter i slutet av\n"
+#~ "                            \"end\" för att placera fotnoter i slutet på\n"
 #~ "                            den nod där de är definierade (standard).\n"
 #~ " --force                   bevara utdata även om fel påträffas.\n"
 #~ " --help                    visa denna hjälptext och avsluta.\n"
diff --git a/gnu/usr.bin/texinfo/po/texinfo.pot b/gnu/usr.bin/texinfo/po/texinfo.pot
index 7e27b4f93d1..90756421544 100644
--- a/gnu/usr.bin/texinfo/po/texinfo.pot
+++ b/gnu/usr.bin/texinfo/po/texinfo.pot
@@ -7,7 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-04-01 06:10-0800\n"
+"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
+"POT-Creation-Date: 2004-12-21 16:20-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,132 +16,132 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: info/echo-area.c:283 info/session.c:712
+#: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr ""
 
-#: info/echo-area.c:295 info/session.c:728
+#: info/echo-area.c:296 info/session.c:705
 msgid "Move backward a character"
 msgstr ""
 
-#: info/echo-area.c:307
+#: info/echo-area.c:308
 msgid "Move to the start of this line"
 msgstr ""
 
-#: info/echo-area.c:312
+#: info/echo-area.c:313
 msgid "Move to the end of this line"
 msgstr ""
 
-#: info/echo-area.c:320 info/session.c:746
+#: info/echo-area.c:321 info/session.c:723
 msgid "Move forward a word"
 msgstr ""
 
-#: info/echo-area.c:360 info/session.c:795
+#: info/echo-area.c:361 info/session.c:772
 msgid "Move backward a word"
 msgstr ""
 
-#: info/echo-area.c:400
+#: info/echo-area.c:401
 msgid "Delete the character under the cursor"
 msgstr ""
 
-#: info/echo-area.c:430
+#: info/echo-area.c:431
 msgid "Delete the character behind the cursor"
 msgstr ""
 
-#: info/echo-area.c:451
+#: info/echo-area.c:452
 msgid "Cancel or quit operation"
 msgstr ""
 
-#: info/echo-area.c:466
+#: info/echo-area.c:467
 msgid "Accept (or force completion of) this line"
 msgstr ""
 
-#: info/echo-area.c:471
+#: info/echo-area.c:472
 msgid "Insert next character verbatim"
 msgstr ""
 
-#: info/echo-area.c:479
+#: info/echo-area.c:480
 msgid "Insert this character"
 msgstr ""
 
-#: info/echo-area.c:497
+#: info/echo-area.c:498
 msgid "Insert a TAB character"
 msgstr ""
 
-#: info/echo-area.c:504
+#: info/echo-area.c:505
 msgid "Transpose characters at point"
 msgstr ""
 
-#: info/echo-area.c:555
+#: info/echo-area.c:556
 msgid "Yank back the contents of the last kill"
 msgstr ""
 
-#: info/echo-area.c:562
+#: info/echo-area.c:563
 msgid "Kill ring is empty"
 msgstr ""
 
-#: info/echo-area.c:575
+#: info/echo-area.c:576
 msgid "Yank back a previous kill"
 msgstr ""
 
-#: info/echo-area.c:608
+#: info/echo-area.c:609
 msgid "Kill to the end of the line"
 msgstr ""
 
-#: info/echo-area.c:621
+#: info/echo-area.c:622
 msgid "Kill to the beginning of the line"
 msgstr ""
 
-#: info/echo-area.c:633
+#: info/echo-area.c:634
 msgid "Kill the word following the cursor"
 msgstr ""
 
-#: info/echo-area.c:652
+#: info/echo-area.c:653
 msgid "Kill the word preceding the cursor"
 msgstr ""
 
-#: info/echo-area.c:872 info/echo-area.c:932
+#: info/echo-area.c:868 info/echo-area.c:924
 msgid "No completions"
 msgstr ""
 
-#: info/echo-area.c:874
+#: info/echo-area.c:870
 msgid "Not complete"
 msgstr ""
 
-#: info/echo-area.c:919
+#: info/echo-area.c:911
 msgid "List possible completions"
 msgstr ""
 
-#: info/echo-area.c:936
+#: info/echo-area.c:928
 msgid "Sole completion"
 msgstr ""
 
-#: info/echo-area.c:945
+#: info/echo-area.c:937
 msgid "One completion:\n"
 msgstr ""
 
-#: info/echo-area.c:946
+#: info/echo-area.c:938
 #, c-format
 msgid "%d completions:\n"
 msgstr ""
 
-#: info/echo-area.c:1092
+#: info/echo-area.c:1085
 msgid "Insert completion"
 msgstr ""
 
-#: info/echo-area.c:1225
+#: info/echo-area.c:1220
 msgid "Building completions..."
 msgstr ""
 
-#: info/echo-area.c:1342
+#: info/echo-area.c:1340
 msgid "Scroll the completions window"
 msgstr ""
 
-#: info/footnotes.c:212
+#: info/footnotes.c:213
 msgid "Footnotes could not be displayed"
 msgstr ""
 
-#: info/footnotes.c:238
+#: info/footnotes.c:239
 msgid "Show the footnotes associated with this node in another window"
 msgstr ""
 
@@ -148,102 +149,102 @@ msgstr ""
 msgid "---------- Footnotes ----------"
 msgstr ""
 
-#: info/indices.c:175
+#: info/indices.c:172
 msgid "Look up a string in the index for this file"
 msgstr ""
 
-#: info/indices.c:205
+#: info/indices.c:199
 msgid "Finding index entries..."
 msgstr ""
 
-#: info/indices.c:212
+#: info/indices.c:207
 msgid "No indices found."
 msgstr ""
 
-#: info/indices.c:222
+#: info/indices.c:217
 msgid "Index entry: "
 msgstr ""
 
-#: info/indices.c:332
+#: info/indices.c:325
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr ""
 
-#: info/indices.c:342
+#: info/indices.c:335
 msgid "No previous index search string."
 msgstr ""
 
-#: info/indices.c:349
+#: info/indices.c:342
 msgid "No index entries."
 msgstr ""
 
-#: info/indices.c:382
+#: info/indices.c:375
 #, c-format
-msgid "No %sindex entries containing \"%s\"."
+msgid "No %sindex entries containing `%s'."
 msgstr ""
 
-#: info/indices.c:383
+#: info/indices.c:376
 msgid "more "
 msgstr ""
 
-#: info/indices.c:393
+#: info/indices.c:386
 msgid "CAN'T SEE THIS"
 msgstr ""
 
-#: info/indices.c:429
+#: info/indices.c:422
 #, c-format
-msgid "Found \"%s\" in %s. (`\\[next-index-match]' tries to find next.)"
+msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
 msgstr ""
 
-#: info/indices.c:549
+#: info/indices.c:541
 #, c-format
-msgid "Scanning indices of \"%s\"..."
+msgid "Scanning indices of `%s'..."
 msgstr ""
 
-#: info/indices.c:603
+#: info/indices.c:596
 #, c-format
-msgid "No available info files have \"%s\" in their indices."
+msgid "No available info files have `%s' in their indices."
 msgstr ""
 
-#: info/indices.c:632
+#: info/indices.c:622
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr ""
 
-#: info/indices.c:636
+#: info/indices.c:626
 msgid "Index apropos: "
 msgstr ""
 
-#: info/indices.c:666
+#: info/indices.c:654
 #, c-format
 msgid ""
 "\n"
-"* Menu: Nodes whoses indices contain \"%s\":\n"
+"* Menu: Nodes whose indices contain `%s':\n"
 msgstr ""
 
-#: info/info.c:260 info/infokey.c:884
+#: info/info.c:275 info/infokey.c:899
+#, c-format
 msgid "Try --help for more information.\n"
 msgstr ""
 
-#: info/info.c:279 info/infokey.c:139 makeinfo/makeinfo.c:689
-#: util/install-info.c:1224 util/texindex.c:338
+#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
+#: util/texindex.c:343
 #, 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 ""
 
-#: info/info.c:462
+#: info/info.c:498
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr ""
 
-#: info/info.c:555
+#: info/info.c:590
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
 msgstr ""
 
-#: info/info.c:562
+#: info/info.c:597
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -260,10 +261,12 @@ msgid ""
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
 "  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
-"  -R, --raw-escapes            don't remove ANSI escapes from man pages.\n"
+"  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+"      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
 "  -O, --show-options, --usage  go to command-line options node.\n"
 "%s      --subnodes               recursively output menu items.\n"
+"  -w, --where, --location      print physical location of Info file.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
 "\n"
@@ -281,8 +284,8 @@ msgid ""
 "  info -f ./foo.info         show file ./foo.info, not searching dir\n"
 msgstr ""
 
-#: info/info.c:598 info/infokey.c:903 makeinfo/makeinfo.c:474
-#: util/install-info.c:421 util/texindex.c:286
+#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
+#: util/install-info.c:466 util/texindex.c:292
 msgid ""
 "\n"
 "Email bug reports to bug-texinfo@gnu.org,\n"
@@ -290,198 +293,198 @@ msgid ""
 "Texinfo home page: http://www.gnu.org/software/texinfo/"
 msgstr ""
 
-#: info/info.c:632
+#: info/info.c:669
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr ""
 
-#: info/info.c:633
+#: info/info.c:670
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr ""
 
-#: info/info.c:634
+#: info/info.c:671
 msgid "Cannot find a window!"
 msgstr ""
 
-#: info/info.c:635
+#: info/info.c:672
 msgid "Point doesn't appear within this window's node!"
 msgstr ""
 
-#: info/info.c:636
+#: info/info.c:673
 msgid "Cannot delete the last window."
 msgstr ""
 
-#: info/info.c:637
+#: info/info.c:674
 msgid "No menu in this node."
 msgstr ""
 
-#: info/info.c:638
+#: info/info.c:675
 msgid "No footnotes in this node."
 msgstr ""
 
-#: info/info.c:639
+#: info/info.c:676
 msgid "No cross references in this node."
 msgstr ""
 
-#: info/info.c:640
+#: info/info.c:677
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr ""
 
-#: info/info.c:641
+#: info/info.c:678
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr ""
 
-#: info/info.c:642
+#: info/info.c:679
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr ""
 
-#: info/info.c:643
+#: info/info.c:680
 msgid "You are already at the last page of this node."
 msgstr ""
 
-#: info/info.c:644
+#: info/info.c:681
 msgid "You are already at the first page of this node."
 msgstr ""
 
-#: info/info.c:645
+#: info/info.c:682
 msgid "Only one window."
 msgstr ""
 
-#: info/info.c:646
+#: info/info.c:683
 msgid "Resulting window would be too small."
 msgstr ""
 
-#: info/info.c:647
+#: info/info.c:684
 msgid "Not enough room for a help window, please delete a window."
 msgstr ""
 
-#: info/infodoc.c:45 info/infodoc.c:94
+#: info/infodoc.c:46 info/infodoc.c:95
 msgid ""
 "Basic Commands in Info Windows\n"
 "******************************\n"
 msgstr ""
 
-#: info/infodoc.c:48
+#: info/infodoc.c:49
 msgid "\\%-10[quit-help]  Quit this help.\n"
 msgstr ""
 
-#: info/infodoc.c:49
+#: info/infodoc.c:50
 msgid "\\%-10[quit]  Quit Info altogether.\n"
 msgstr ""
 
-#: info/infodoc.c:50
+#: info/infodoc.c:51
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
 msgstr ""
 
-#: info/infodoc.c:52 info/infodoc.c:101
+#: info/infodoc.c:53 info/infodoc.c:102
 msgid ""
 "Selecting other nodes:\n"
 "----------------------\n"
 msgstr ""
 
-#: info/infodoc.c:54
+#: info/infodoc.c:55
 msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
 msgstr ""
 
-#: info/infodoc.c:55
+#: info/infodoc.c:56
 msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
 msgstr ""
 
-#: info/infodoc.c:56
+#: info/infodoc.c:57
 msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
 msgstr ""
 
-#: info/infodoc.c:57
+#: info/infodoc.c:58
 msgid ""
 "\\%-10[menu-item]  Pick menu item specified by name.\n"
 "              Picking a menu item causes another node to be selected.\n"
 msgstr ""
 
-#: info/infodoc.c:59
+#: info/infodoc.c:60
 msgid ""
 "\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
 msgstr ""
 
-#: info/infodoc.c:60
+#: info/infodoc.c:61
 msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
 msgstr ""
 
-#: info/infodoc.c:61
+#: info/infodoc.c:62
 msgid ""
 "\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
 msgstr ""
 
-#: info/infodoc.c:62
+#: info/infodoc.c:63
 msgid ""
 "\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
 "node.\n"
 msgstr ""
 
-#: info/infodoc.c:63
+#: info/infodoc.c:64
 msgid ""
 "\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
 msgstr ""
 
-#: info/infodoc.c:64
+#: info/infodoc.c:65
 msgid ""
 "\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
 "node] (DIR)'.\n"
 msgstr ""
 
-#: info/infodoc.c:65
+#: info/infodoc.c:66
 msgid ""
 "\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
 msgstr ""
 
-#: info/infodoc.c:67 info/infodoc.c:115
+#: info/infodoc.c:68 info/infodoc.c:116
 msgid ""
 "Moving within a node:\n"
 "---------------------\n"
 msgstr ""
 
-#: info/infodoc.c:69
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
-msgstr ""
-
 #: info/infodoc.c:70
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
 msgstr ""
 
 #: info/infodoc.c:71
-msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
 msgstr ""
 
 #: info/infodoc.c:72
-msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
 msgstr ""
 
 #: info/infodoc.c:73
-msgid "\\%-10[scroll-forward]  Scroll forward 1 line.\n"
+msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
 msgstr ""
 
 #: info/infodoc.c:74
-msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
+msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
+msgstr ""
+
+#: info/infodoc.c:75
+msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
 msgstr ""
 
-#: info/infodoc.c:76 info/infodoc.c:124
+#: info/infodoc.c:77 info/infodoc.c:125
 msgid ""
 "Other commands:\n"
 "---------------\n"
 msgstr ""
 
-#: info/infodoc.c:78
+#: info/infodoc.c:79
 msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
 msgstr ""
 
-#: info/infodoc.c:79
+#: info/infodoc.c:80
 msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
 msgstr ""
 
-#: info/infodoc.c:80
+#: info/infodoc.c:81
 msgid ""
 "\\%-10[index-search]  Search for a specified string in the index entries of "
 "this Info\n"
@@ -489,349 +492,358 @@ msgid ""
 "found.\n"
 msgstr ""
 
-#: info/infodoc.c:82
+#: info/infodoc.c:83
 msgid ""
 "\\%-10[goto-node]  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr ""
 
-#: info/infodoc.c:84
+#: info/infodoc.c:85
 msgid ""
 "\\%-10[search]  Search forward for a specified string\n"
 "              and select the node in which the next occurrence is found.\n"
 msgstr ""
 
-#: info/infodoc.c:86
+#: info/infodoc.c:87
 msgid ""
 "\\%-10[search-backward]  Search backward for a specified string\n"
 "              and select the node in which the previous occurrence is "
 "found.\n"
 msgstr ""
 
-#: info/infodoc.c:97
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Quit this help.\n"
 msgstr ""
 
-#: info/infodoc.c:98
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr ""
 
-#: info/infodoc.c:99
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr ""
 
-#: info/infodoc.c:103
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
 msgstr ""
 
-#: info/infodoc.c:104
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
 msgstr ""
 
-#: info/infodoc.c:105
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
 msgstr ""
 
-#: info/infodoc.c:106
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Pick menu item specified by name.\n"
 msgstr ""
 
-#: info/infodoc.c:107
+#: info/infodoc.c:108
 msgid "              Picking a menu item causes another node to be selected.\n"
 msgstr ""
 
-#: info/infodoc.c:108
+#: info/infodoc.c:109
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
 msgstr ""
 
-#: info/infodoc.c:109
+#: info/infodoc.c:110
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
 msgstr ""
 
-#: info/infodoc.c:110
+#: info/infodoc.c:111
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
 msgstr ""
 
-#: info/infodoc.c:111
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
 msgstr ""
 
-#: info/infodoc.c:112
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
 msgstr ""
 
-#: info/infodoc.c:113
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
 msgstr ""
 
-#: info/infodoc.c:117
+#: info/infodoc.c:118
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
 msgstr ""
 
-#: info/infodoc.c:118
+#: info/infodoc.c:119
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
 msgstr ""
 
-#: info/infodoc.c:119
+#: info/infodoc.c:120
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
 msgstr ""
 
-#: info/infodoc.c:120
+#: info/infodoc.c:121
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
 msgstr ""
 
-#: info/infodoc.c:121
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
 msgstr ""
 
-#: info/infodoc.c:122
+#: info/infodoc.c:123
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
 msgstr ""
 
-#: info/infodoc.c:126
+#: info/infodoc.c:127
 #, c-format
 msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
 msgstr ""
 
-#: info/infodoc.c:127
+#: info/infodoc.c:128
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
 msgstr ""
 
-#: info/infodoc.c:128
+#: info/infodoc.c:129
 #, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
 msgstr ""
 
-#: info/infodoc.c:129
+#: info/infodoc.c:130
 msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
 msgstr ""
 
-#: info/infodoc.c:130
+#: info/infodoc.c:131
 #, c-format
 msgid "  %-10s  Move to node specified by name.\n"
 msgstr ""
 
-#: info/infodoc.c:131
+#: info/infodoc.c:132
 msgid ""
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr ""
 
-#: info/infodoc.c:132
+#: info/infodoc.c:133
 #, c-format
 msgid "  %-10s  Search forward for a specified string,\n"
 msgstr ""
 
-#: info/infodoc.c:133 info/infodoc.c:135
+#: info/infodoc.c:134 info/infodoc.c:136
 msgid ""
 "              and select the node in which the next occurrence is found.\n"
 msgstr ""
 
-#: info/infodoc.c:134
+#: info/infodoc.c:135
 #, c-format
 msgid "  %-10s  Search backward for a specified string\n"
 msgstr ""
 
-#: info/infodoc.c:313
+#: info/infodoc.c:316
 msgid "The current search path is:\n"
 msgstr ""
 
-#: info/infodoc.c:316
+#: info/infodoc.c:320
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
 msgstr ""
 
-#: info/infodoc.c:319
+#: info/infodoc.c:324
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
 msgstr ""
 
-#: info/infodoc.c:340
+#: info/infodoc.c:347
 #, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
 "\n"
 msgstr ""
 
-#: info/infodoc.c:343
+#: info/infodoc.c:351
 msgid ""
 "The following commands cannot be invoked at all:\n"
 "\n"
 msgstr ""
 
-#: info/infodoc.c:367
+#: info/infodoc.c:375
 msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
 msgstr ""
 
-#: info/infodoc.c:477
+#: info/infodoc.c:485
 msgid "Display help message"
 msgstr ""
 
-#: info/infodoc.c:495
+#: info/infodoc.c:503
 msgid "Visit Info node `(info)Help'"
 msgstr ""
 
-#: info/infodoc.c:638
+#: info/infodoc.c:641
 msgid "Print documentation for KEY"
 msgstr ""
 
-#: info/infodoc.c:650
+#: info/infodoc.c:653
 #, c-format
 msgid "Describe key: %s"
 msgstr ""
 
-#: info/infodoc.c:660
+#: info/infodoc.c:664
 #, c-format
 msgid "ESC %s is undefined."
 msgstr ""
 
-#: info/infodoc.c:676 info/infodoc.c:703
+#: info/infodoc.c:680 info/infodoc.c:709
 #, c-format
 msgid "%s is undefined."
 msgstr ""
 
-#: info/infodoc.c:724
+#: info/infodoc.c:730
 #, c-format
 msgid "%s is defined to %s."
 msgstr ""
 
-#: info/infodoc.c:1151
+#: info/infodoc.c:1153
 msgid "Show what to type to execute a given command"
 msgstr ""
 
-#: info/infodoc.c:1155
+#: info/infodoc.c:1157
 msgid "Where is command: "
 msgstr ""
 
-#: info/infodoc.c:1177
+#: info/infodoc.c:1179
 #, c-format
 msgid "`%s' is not on any keys"
 msgstr ""
 
-#: info/infodoc.c:1183
+#: info/infodoc.c:1186
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr ""
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1190
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr ""
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1195
 #, c-format
 msgid "There is no function named `%s'"
 msgstr ""
 
-#: info/infokey.c:164
+#: info/infokey.c:145
+#, 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 ""
+
+#: info/infokey.c:170
 msgid "incorrect number of arguments"
 msgstr ""
 
-#: info/infokey.c:194
+#: info/infokey.c:201
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr ""
 
-#: info/infokey.c:207
+#: info/infokey.c:215
 #, c-format
 msgid "cannot create output file `%s'"
 msgstr ""
 
-#: info/infokey.c:217
+#: info/infokey.c:226
 #, c-format
 msgid "error writing to `%s'"
 msgstr ""
 
-#: info/infokey.c:222
+#: info/infokey.c:232
 #, c-format
 msgid "error closing output file `%s'"
 msgstr ""
 
-#: info/infokey.c:443
+#: info/infokey.c:450
 msgid "key sequence too long"
 msgstr ""
 
-#: info/infokey.c:521
+#: info/infokey.c:529
 msgid "missing key sequence"
 msgstr ""
 
-#: info/infokey.c:600
+#: info/infokey.c:610
 msgid "NUL character (\\000) not permitted"
 msgstr ""
 
-#: info/infokey.c:629
+#: info/infokey.c:641
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr ""
 
-#: info/infokey.c:652
+#: info/infokey.c:665
 msgid "missing action name"
 msgstr ""
 
-#: info/infokey.c:667 info/infokey.c:733
+#: info/infokey.c:681 info/infokey.c:756
 msgid "section too long"
 msgstr ""
 
-#: info/infokey.c:673
+#: info/infokey.c:688
 #, c-format
 msgid "unknown action `%s'"
 msgstr ""
 
-#: info/infokey.c:682
+#: info/infokey.c:698
 msgid "action name too long"
 msgstr ""
 
-#: info/infokey.c:694
+#: info/infokey.c:712
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr ""
 
-#: info/infokey.c:704
+#: info/infokey.c:723
 msgid "missing variable name"
 msgstr ""
 
-#: info/infokey.c:712
+#: info/infokey.c:733
 msgid "missing `=' immediately after variable name"
 msgstr ""
 
-#: info/infokey.c:719
+#: info/infokey.c:741
 msgid "variable name too long"
 msgstr ""
 
-#: info/infokey.c:741
+#: info/infokey.c:765
 msgid "value too long"
 msgstr ""
 
-#: info/infokey.c:875
+#: info/infokey.c:890
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr ""
 
-#: info/infokey.c:891
+#: info/infokey.c:906
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -845,89 +857,95 @@ msgid ""
 "  --version            display version information and exit.\n"
 msgstr ""
 
-#: info/infomap.c:1397
+#: info/infomap.c:1500
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
 msgstr ""
 
-#: info/infomap.c:1400
+#: info/infomap.c:1503
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
 msgstr ""
 
-#: info/infomap.c:1413
+#: info/infomap.c:1516
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
 msgstr ""
 
-#: info/infomap.c:1431
+#: info/infomap.c:1535
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1437
+#: info/infomap.c:1544
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1450
+#: info/infomap.c:1560
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1470
+#: info/infomap.c:1581
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1608
+#: info/infomap.c:1716
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr ""
 
-#: info/infomap.c:1659
+#: info/infomap.c:1766
 msgid "Bad data in infokey file -- some var settings ignored"
 msgstr ""
 
-#: info/m-x.c:70
+#: info/m-x.c:69
 msgid "Read the name of an Info command and describe it"
 msgstr ""
 
-#: info/m-x.c:74
+#: info/m-x.c:73
 msgid "Describe command: "
 msgstr ""
 
-#: info/m-x.c:97
+#: info/m-x.c:96
 msgid "Read a command name in the echo area and execute it"
 msgstr ""
 
-#: info/m-x.c:141
+#: info/m-x.c:140
 msgid "Cannot execute an `echo-area' command here."
 msgstr ""
 
-#: info/m-x.c:157
+#: info/m-x.c:154
+#, c-format
+msgid "Undefined command: %s"
+msgstr ""
+
+#: info/m-x.c:160
 msgid "Set the height of the displayed window"
 msgstr ""
 
-#: info/m-x.c:170
+#: info/m-x.c:173
 #, c-format
 msgid "Set screen height to (%d): "
 msgstr ""
 
-#: info/makedoc.c:161 info/makedoc.c:169
+#: info/makedoc.c:162 info/makedoc.c:170
+#, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
 "\n"
 msgstr ""
 
-#: info/makedoc.c:553
+#: info/makedoc.c:550
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr ""
 
-#: info/nodemenu.c:28
+#: info/nodemenu.c:31
 msgid ""
 "\n"
 "* Menu:\n"
@@ -935,465 +953,465 @@ msgid ""
 "  ----------                        -----   ----   ---------------"
 msgstr ""
 
-#: info/nodemenu.c:199
+#: info/nodemenu.c:202
 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 ""
 
-#: info/nodemenu.c:219
+#: info/nodemenu.c:224
 msgid "Make a window containing a menu of all of the currently visited nodes"
 msgstr ""
 
-#: info/nodemenu.c:299
+#: info/nodemenu.c:304
 msgid "Select a node which has been previously visited in a visible window"
 msgstr ""
 
-#: info/nodemenu.c:311
+#: info/nodemenu.c:317
 msgid "Select visited node: "
 msgstr ""
 
-#: info/nodemenu.c:331 info/session.c:2235
+#: info/nodemenu.c:337 info/session.c:2264
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr ""
 
-#: info/session.c:170
+#: info/session.c:162
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
 "for menu item."
 msgstr ""
 
-#: info/session.c:643
+#: info/session.c:620
 msgid "Move down to the next line"
 msgstr ""
 
-#: info/session.c:658
+#: info/session.c:635
 msgid "Move up to the previous line"
 msgstr ""
 
-#: info/session.c:673
+#: info/session.c:650
 msgid "Move to the end of the line"
 msgstr ""
 
-#: info/session.c:693
+#: info/session.c:670
 msgid "Move to the start of the line"
 msgstr ""
 
-#: info/session.c:885 makeinfo/node.c:1357
+#: info/session.c:860 makeinfo/node.c:1424
 msgid "Next"
 msgstr ""
 
-#: info/session.c:888
+#: info/session.c:863
 msgid "Following Next node..."
 msgstr ""
 
-#: info/session.c:905
+#: info/session.c:881
 msgid "Selecting first menu item..."
 msgstr ""
 
-#: info/session.c:916
+#: info/session.c:893
 msgid "Selecting Next node..."
 msgstr ""
 
-#: info/session.c:986
+#: info/session.c:964
 #, c-format
 msgid "Moving Up %d time(s), then Next."
 msgstr ""
 
-#: info/session.c:1010
+#: info/session.c:988
 msgid "No more nodes within this document."
 msgstr ""
 
-#: info/session.c:1034
+#: info/session.c:1011
 msgid "No `Prev' for this node."
 msgstr ""
 
-#: info/session.c:1037 info/session.c:1092
+#: info/session.c:1014 info/session.c:1073
 msgid "Moving Prev in this window."
 msgstr ""
 
-#: info/session.c:1051
+#: info/session.c:1030
 msgid "No `Prev' or `Up' for this node within this document."
 msgstr ""
 
-#: info/session.c:1054
+#: info/session.c:1034
 msgid "Moving Up in this window."
 msgstr ""
 
-#: info/session.c:1102
+#: info/session.c:1084
 msgid "Moving to `Prev's last menu item."
 msgstr ""
 
-#: info/session.c:1113
+#: info/session.c:1095
 msgid "Move forwards or down through node structure"
 msgstr ""
 
-#: info/session.c:1129
+#: info/session.c:1111
 msgid "Move backwards or up through node structure"
 msgstr ""
 
-#: info/session.c:1229
+#: info/session.c:1205
 msgid "Scroll forward in this window"
 msgstr ""
 
-#: info/session.c:1237
+#: info/session.c:1213
 msgid "Scroll forward in this window and set default window size"
 msgstr ""
 
-#: info/session.c:1245
+#: info/session.c:1221
 msgid "Scroll forward in this window staying within node"
 msgstr ""
 
-#: info/session.c:1253
+#: info/session.c:1229
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr ""
 
-#: info/session.c:1261
+#: info/session.c:1237
 msgid "Scroll backward in this window"
 msgstr ""
 
-#: info/session.c:1269
+#: info/session.c:1245
 msgid "Scroll backward in this window and set default window size"
 msgstr ""
 
-#: info/session.c:1278
+#: info/session.c:1254
 msgid "Scroll backward in this window staying within node"
 msgstr ""
 
-#: info/session.c:1286
+#: info/session.c:1262
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
 msgstr ""
 
-#: info/session.c:1294
+#: info/session.c:1270
 msgid "Move to the start of this node"
 msgstr ""
 
-#: info/session.c:1301
+#: info/session.c:1277
 msgid "Move to the end of this node"
 msgstr ""
 
-#: info/session.c:1308
+#: info/session.c:1284
 msgid "Scroll down by lines"
 msgstr ""
 
-#: info/session.c:1325
+#: info/session.c:1301
 msgid "Scroll up by lines"
 msgstr ""
 
-#: info/session.c:1343
+#: info/session.c:1319
 msgid "Scroll down by half screen size"
 msgstr ""
 
-#: info/session.c:1369
+#: info/session.c:1345
 msgid "Scroll up by half screen size"
 msgstr ""
 
-#: info/session.c:1398
+#: info/session.c:1374
 msgid "Select the next window"
 msgstr ""
 
-#: info/session.c:1437
+#: info/session.c:1413
 msgid "Select the previous window"
 msgstr ""
 
-#: info/session.c:1488
+#: info/session.c:1464
 msgid "Split the current window"
 msgstr ""
 
-#: info/session.c:1569
+#: info/session.c:1545
 msgid "Delete the current window"
 msgstr ""
 
-#: info/session.c:1577
+#: info/session.c:1553
 msgid "Cannot delete a permanent window"
 msgstr ""
 
-#: info/session.c:1610
+#: info/session.c:1585
 msgid "Delete all other windows"
 msgstr ""
 
-#: info/session.c:1656
+#: info/session.c:1631
 msgid "Scroll the other window"
 msgstr ""
 
-#: info/session.c:1677
+#: info/session.c:1652
 msgid "Scroll the other window backward"
 msgstr ""
 
-#: info/session.c:1683
+#: info/session.c:1658
 msgid "Grow (or shrink) this window"
 msgstr ""
 
-#: info/session.c:1694
+#: info/session.c:1669
 msgid "Divide the available screen space among the visible windows"
 msgstr ""
 
-#: info/session.c:1701
+#: info/session.c:1676
 msgid "Toggle the state of line wrapping in the current window"
 msgstr ""
 
-#: info/session.c:1880
+#: info/session.c:1848
 msgid "Select the Next node"
 msgstr ""
 
-#: info/session.c:1888
+#: info/session.c:1856
 msgid "Select the Prev node"
 msgstr ""
 
-#: info/session.c:1896
+#: info/session.c:1864
 msgid "Select the Up node"
 msgstr ""
 
-#: info/session.c:1903
+#: info/session.c:1871
 msgid "Select the last node in this file"
 msgstr ""
 
-#: info/session.c:1930 info/session.c:1963
+#: info/session.c:1898 info/session.c:1931
 msgid "This window has no additional nodes"
 msgstr ""
 
-#: info/session.c:1936
+#: info/session.c:1904
 msgid "Select the first node in this file"
 msgstr ""
 
-#: info/session.c:1970
+#: info/session.c:1938
 msgid "Select the last item in this node's menu"
 msgstr ""
 
-#: info/session.c:1976
+#: info/session.c:1944
 msgid "Select this menu item"
 msgstr ""
 
-#: info/session.c:2005
+#: info/session.c:1977
 #, c-format
 msgid "There aren't %d items in this menu."
 msgstr ""
 
-#: info/session.c:2148
+#: info/session.c:2171 info/session.c:2172
 #, c-format
 msgid "Menu item (%s): "
 msgstr ""
 
-#: info/session.c:2150
+#: info/session.c:2175
 msgid "Menu item: "
 msgstr ""
 
-#: info/session.c:2155
+#: info/session.c:2182 info/session.c:2183
 #, c-format
 msgid "Follow xref (%s): "
 msgstr ""
 
-#: info/session.c:2157
+#: info/session.c:2186
 msgid "Follow xref: "
 msgstr ""
 
-#: info/session.c:2280
+#: info/session.c:2315
 msgid "Read a menu item and select its node"
 msgstr ""
 
-#: info/session.c:2288
+#: info/session.c:2323
 msgid "Read a footnote or cross reference and select its node"
 msgstr ""
 
-#: info/session.c:2294
+#: info/session.c:2329
 msgid "Move to the start of this node's menu"
 msgstr ""
 
-#: info/session.c:2318
+#: info/session.c:2353
 msgid "Visit as many menu items at once as possible"
 msgstr ""
 
-#: info/session.c:2346
+#: info/session.c:2381
 msgid "Read a node name and select it"
 msgstr ""
 
-#: info/session.c:2401 info/session.c:2405
+#: info/session.c:2436 info/session.c:2441
 msgid "Goto node: "
 msgstr ""
 
-#: info/session.c:2471
+#: info/session.c:2505
 #, c-format
 msgid "No menu in node `%s'."
 msgstr ""
 
-#: info/session.c:2516
+#: info/session.c:2551
 #, c-format
 msgid "No menu item `%s' in node `%s'."
 msgstr ""
 
-#: info/session.c:2546
+#: info/session.c:2581
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
 msgstr ""
 
-#: info/session.c:2597
+#: info/session.c:2631
 msgid "Read a list of menus starting from dir and follow them"
 msgstr ""
 
-#: info/session.c:2599
+#: info/session.c:2633
 msgid "Follow menus: "
 msgstr ""
 
-#: info/session.c:2797
+#: info/session.c:2826
 msgid "Find the node describing program invocation"
 msgstr ""
 
-#: info/session.c:2799
+#: info/session.c:2828
 #, c-format
 msgid "Find Invocation node of [%s]: "
 msgstr ""
 
-#: info/session.c:2837
+#: info/session.c:2866
 msgid "Read a manpage reference and select it"
 msgstr ""
 
-#: info/session.c:2841
+#: info/session.c:2870
 msgid "Get Manpage: "
 msgstr ""
 
-#: info/session.c:2871
+#: info/session.c:2900
 msgid "Select the node `Top' in this file"
 msgstr ""
 
-#: info/session.c:2877
+#: info/session.c:2906
 msgid "Select the node `(dir)'"
 msgstr ""
 
-#: info/session.c:2897
+#: info/session.c:2923 info/session.c:2925
 #, c-format
 msgid "Kill node (%s): "
 msgstr ""
 
-#: info/session.c:2951
+#: info/session.c:2977
 #, c-format
 msgid "Cannot kill node `%s'"
 msgstr ""
 
-#: info/session.c:2961
+#: info/session.c:2987
 msgid "Cannot kill the last node"
 msgstr ""
 
-#: info/session.c:3047
+#: info/session.c:3073
 msgid "Select the most recently selected node"
 msgstr ""
 
-#: info/session.c:3053
+#: info/session.c:3079
 msgid "Kill this node"
 msgstr ""
 
-#: info/session.c:3061
+#: info/session.c:3087
 msgid "Read the name of a file and select it"
 msgstr ""
 
-#: info/session.c:3065
+#: info/session.c:3091
 msgid "Find file: "
 msgstr ""
 
-#: info/session.c:3082
+#: info/session.c:3108
 #, c-format
 msgid "Cannot find `%s'."
 msgstr ""
 
-#: info/session.c:3127 info/session.c:3248
+#: info/session.c:3151 info/session.c:3269
 #, c-format
 msgid "Could not create output file `%s'."
 msgstr ""
 
-#: info/session.c:3140 info/session.c:3265 info/session.c:3326
+#: info/session.c:3165 info/session.c:3287 info/session.c:3347
 msgid "Done."
 msgstr ""
 
-#: info/session.c:3196
+#: info/session.c:3220
 #, c-format
 msgid "Writing node %s..."
 msgstr ""
 
-#: info/session.c:3274
+#: info/session.c:3296
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
 msgstr ""
 
-#: info/session.c:3310
+#: info/session.c:3331
 #, c-format
 msgid "Cannot open pipe to `%s'."
 msgstr ""
 
-#: info/session.c:3316
+#: info/session.c:3337
 #, c-format
 msgid "Printing node %s..."
 msgstr ""
 
-#: info/session.c:3558
+#: info/session.c:3567
 #, c-format
 msgid "Searching subfile %s ..."
 msgstr ""
 
-#: info/session.c:3610
+#: info/session.c:3619
 msgid "Read a string and search for it case-sensitively"
 msgstr ""
 
-#: info/session.c:3617
+#: info/session.c:3626
 msgid "Read a string and search for it"
 msgstr ""
 
-#: info/session.c:3625
+#: info/session.c:3634
 msgid "Read a string and search backward for it"
 msgstr ""
 
-#: info/session.c:3667
+#: info/session.c:3670 info/session.c:3677
 #, c-format
 msgid "%s%sfor string [%s]: "
 msgstr ""
 
-#: info/session.c:3668
+#: info/session.c:3671 info/session.c:3678
 msgid "Search backward"
 msgstr ""
 
-#: info/session.c:3668
+#: info/session.c:3672 info/session.c:3678
 msgid "Search"
 msgstr ""
 
-#: info/session.c:3669
+#: info/session.c:3673 info/session.c:3679
 msgid " case-sensitively "
 msgstr ""
 
-#: info/session.c:3669
+#: info/session.c:3674 info/session.c:3679
 msgid " "
 msgstr ""
 
-#: info/session.c:3709
+#: info/session.c:3718
 msgid "Search failed."
 msgstr ""
 
-#: info/session.c:3727
+#: info/session.c:3736
 msgid "Repeat last search in the same direction"
 msgstr ""
 
-#: info/session.c:3730 info/session.c:3740
+#: info/session.c:3739 info/session.c:3749
 msgid "No previous search string"
 msgstr ""
 
-#: info/session.c:3737
+#: info/session.c:3746
 msgid "Repeat last search in the reverse direction"
 msgstr ""
 
-#: info/session.c:3755 info/session.c:3761
+#: info/session.c:3765 info/session.c:3771
 msgid "Search interactively for a string as you type it"
 msgstr ""
 
-#: info/session.c:3855
+#: info/session.c:3851
 msgid "I-search backward: "
 msgstr ""
 
-#: info/session.c:3857
+#: info/session.c:3853
 msgid "I-search: "
 msgstr ""
 
-#: info/session.c:3882
+#: info/session.c:3878 info/session.c:3880
 msgid "Failing "
 msgstr ""
 
@@ -1409,27 +1427,27 @@ msgstr ""
 msgid "Select reference or menu item appearing on this line"
 msgstr ""
 
-#: info/session.c:4381
+#: info/session.c:4382
 msgid "Cancel current operation"
 msgstr ""
 
-#: info/session.c:4388
+#: info/session.c:4389
 msgid "Quit"
 msgstr ""
 
-#: info/session.c:4397
+#: info/session.c:4398
 msgid "Move the cursor to a specific line of the window"
 msgstr ""
 
-#: info/session.c:4429
+#: info/session.c:4430
 msgid "Redraw the display"
 msgstr ""
 
-#: info/session.c:4466
+#: info/session.c:4467
 msgid "Quit using Info"
 msgstr ""
 
-#: info/session.c:4479
+#: info/session.c:4480
 msgid "Run command bound to this key's lowercase variant"
 msgstr ""
 
@@ -1439,27 +1457,29 @@ msgid "Unknown command (%s)."
 msgstr ""
 
 #: info/session.c:4494
-msgid "\"\" is invalid"
+#, c-format
+msgid "\"%s\" is invalid"
 msgstr ""
 
 #: info/session.c:4495
 #, c-format
-msgid "\"%s\" is invalid"
+msgid "`%s' is invalid"
 msgstr ""
 
-#: info/session.c:4713
+#: info/session.c:4709
 msgid "Add this digit to the current numeric argument"
 msgstr ""
 
-#: info/session.c:4722
+#: info/session.c:4718
 msgid "Start (or multiply by 4) the current numeric argument"
 msgstr ""
 
-#: info/session.c:4737
+#: info/session.c:4733
 msgid "Internally used by \\[universal-argument]"
 msgstr ""
 
-#: info/tilde.c:344
+#: info/tilde.c:338
+#, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr ""
 
@@ -1525,230 +1545,264 @@ msgstr ""
 msgid "Set %s to value (%s): "
 msgstr ""
 
-#: info/window.c:1164
+#: info/window.c:1138
 msgid "--*** Tags out of Date ***"
 msgstr ""
 
-#: info/window.c:1175
+#: info/window.c:1149
 msgid "-----Info: (), lines ----, "
 msgstr ""
 
-#: info/window.c:1182
+#: info/window.c:1156
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr ""
 
-#: info/window.c:1186
+#: info/window.c:1160
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr ""
 
-#: info/window.c:1193
+#: info/window.c:1167
 #, c-format
 msgid " Subfile: %s"
 msgstr ""
 
-#: lib/getopt.c:675
+#: lib/getopt.c:551 lib/getopt.c:570
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr ""
 
-#: lib/getopt.c:700
+#: lib/getopt.c:603 lib/getopt.c:607
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr ""
 
-#: lib/getopt.c:705
+#: lib/getopt.c:616 lib/getopt.c:621
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr ""
 
-#: lib/getopt.c:723 lib/getopt.c:896
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
-#: lib/getopt.c:752
+#: lib/getopt.c:727 lib/getopt.c:730
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
 
-#: lib/getopt.c:756
+#: lib/getopt.c:738 lib/getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""
 
-#: lib/getopt.c:782
+#: lib/getopt.c:796 lib/getopt.c:799
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr ""
 
-#: lib/getopt.c:785
+#: lib/getopt.c:805 lib/getopt.c:808
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#: lib/getopt.c:815 lib/getopt.c:945
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
-#: lib/getopt.c:862
+#: lib/getopt.c:935 lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""
 
-#: lib/getopt.c:880
+#: lib/getopt.c:978 lib/getopt.c:999
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#, c-format
+msgid "arguments to @%s ignored"
+msgstr ""
+
+#: makeinfo/cmds.c:585
 msgid "January"
 msgstr ""
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "February"
 msgstr ""
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "March"
 msgstr ""
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "April"
 msgstr ""
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "May"
 msgstr ""
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "June"
 msgstr ""
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "July"
 msgstr ""
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "August"
 msgstr ""
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "September"
 msgstr ""
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "October"
 msgstr ""
 
-#: makeinfo/cmds.c:517
+#: makeinfo/cmds.c:587
 msgid "November"
 msgstr ""
 
-#: makeinfo/cmds.c:517
+#: makeinfo/cmds.c:587
 msgid "December"
 msgstr ""
 
-#: makeinfo/cmds.c:658
+#: makeinfo/cmds.c:936
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr ""
 
-#: makeinfo/cmds.c:701
+#: makeinfo/cmds.c:979
 msgid "@sc argument all uppercase, thus no effect"
 msgstr ""
 
-#: makeinfo/cmds.c:759
+#: makeinfo/cmds.c:1034
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr ""
 
-#: makeinfo/cmds.c:789
+#: makeinfo/cmds.c:1074
 msgid "end of file inside verb block"
 msgstr ""
 
-#: makeinfo/cmds.c:797
+#: makeinfo/cmds.c:1082
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr ""
 
-#: makeinfo/cmds.c:942
+#: makeinfo/cmds.c:1112
+msgid ""
+"@strong{Note...} produces a spurious cross-reference in Info; reword to "
+"avoid that"
+msgstr ""
+
+#: makeinfo/cmds.c:1305
 #, c-format
 msgid "%c%s is obsolete"
 msgstr ""
 
-#: makeinfo/cmds.c:1014
+#: makeinfo/cmds.c:1414
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr ""
 
-#: makeinfo/cmds.c:1348 makeinfo/cmds.c:1374 makeinfo/footnote.c:81
+#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr ""
 
-#: makeinfo/cmds.c:1358 makeinfo/makeinfo.c:4140
+#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
 msgid "asis"
 msgstr ""
 
-#: makeinfo/cmds.c:1360 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
 msgid "none"
 msgstr ""
 
-#: makeinfo/defun.c:85
+#: makeinfo/cmds.c:1789
+#, c-format
+msgid "Bad argument to @%s"
+msgstr ""
+
+#: makeinfo/cmds.c:1803
+msgid "insert"
+msgstr ""
+
+#: makeinfo/defun.c:84
 msgid "Missing `}' in @def arg"
 msgstr ""
 
-#: makeinfo/defun.c:363
+#: makeinfo/defun.c:403
 msgid "Function"
 msgstr ""
 
-#: makeinfo/defun.c:366
+#: makeinfo/defun.c:406
 msgid "Macro"
 msgstr ""
 
-#: makeinfo/defun.c:369
+#: makeinfo/defun.c:409
 msgid "Special Form"
 msgstr ""
 
-#: makeinfo/defun.c:373
+#: makeinfo/defun.c:413
 msgid "Variable"
 msgstr ""
 
-#: makeinfo/defun.c:376
+#: makeinfo/defun.c:416
 msgid "User Option"
 msgstr ""
 
-#: makeinfo/defun.c:380
+#: makeinfo/defun.c:420
 msgid "Instance Variable"
 msgstr ""
 
-#: makeinfo/defun.c:384
+#: makeinfo/defun.c:424
 msgid "Method"
 msgstr ""
 
-#: makeinfo/defun.c:466 makeinfo/defun.c:470 makeinfo/defun.c:615
-#: makeinfo/defun.c:631 makeinfo/defun.c:671
+#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
+#: makeinfo/defun.c:644 makeinfo/xml.c:2229
 msgid "of"
 msgstr ""
 
-#: makeinfo/defun.c:474 makeinfo/defun.c:478 makeinfo/defun.c:482
-#: makeinfo/defun.c:624 makeinfo/defun.c:676
+#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
 msgid "on"
 msgstr ""
 
-#: makeinfo/defun.c:717
+#: makeinfo/defun.c:711
 #, c-format
-msgid "Must be in `%s' insertion to use `%sx'"
+msgid "Must be in `@%s' environment to use `@%s'"
 msgstr ""
 
-#: makeinfo/files.c:448
+#: makeinfo/files.c:435
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr ""
 
+#: makeinfo/files.c:638
+#, c-format
+msgid "`%s' omitted before output filename"
+msgstr ""
+
+#: makeinfo/files.c:646
+#, c-format
+msgid "`%s' omitted since writing to stdout"
+msgstr ""
+
+#: makeinfo/files.c:694
+msgid "Output buffer not empty."
+msgstr ""
+
 #: makeinfo/footnote.c:150
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
@@ -1767,233 +1821,280 @@ msgstr ""
 msgid "Footnotes inside footnotes are not allowed"
 msgstr ""
 
-#: makeinfo/footnote.c:298
+#: makeinfo/footnote.c:302 makeinfo/index.c:189
 msgid "Footnotes"
 msgstr ""
 
-#: makeinfo/html.c:42
+#: makeinfo/html.c:87
+#, c-format
+msgid "%s: could not open --css-file: %s"
+msgstr ""
+
+#: makeinfo/html.c:172
+#, c-format
+msgid "%s:%d: --css-file ended in comment"
+msgstr ""
+
+#: makeinfo/html.c:207
 msgid "Untitled"
 msgstr ""
 
-#: makeinfo/html.c:298
+#: makeinfo/html.c:422
+msgid "[unexpected] no html tag to pop"
+msgstr ""
+
+#: makeinfo/html.c:752
 #, c-format
-msgid "Invalid node name: `%s'"
+msgid "[unexpected] invalid node name: `%s'"
 msgstr ""
 
-#: makeinfo/index.c:213
+#: makeinfo/index.c:169
 #, c-format
 msgid "Unknown index `%s'"
 msgstr ""
 
-#: makeinfo/index.c:238
+#: makeinfo/index.c:234
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr ""
 
-#: makeinfo/index.c:396
+#: makeinfo/index.c:412
 #, c-format
 msgid "Index `%s' already exists"
 msgstr ""
 
-#: makeinfo/index.c:439
+#: makeinfo/index.c:455
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr ""
 
-#: makeinfo/index.c:666
+#: makeinfo/index.c:661
+msgid "(line )"
+msgstr ""
+
+#: makeinfo/index.c:669
+#, c-format
+msgid "(line %*d)"
+msgstr ""
+
+#: makeinfo/index.c:750
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr ""
 
-#: makeinfo/index.c:709
+#: makeinfo/index.c:819
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr ""
 
-#: makeinfo/index.c:712 makeinfo/index.c:751
+#: makeinfo/index.c:822 makeinfo/index.c:858
 msgid "(outside of any node)"
 msgstr ""
 
-#: makeinfo/insertion.c:198
+#: makeinfo/index.c:919 makeinfo/index.c:925
+msgid "See "
+msgstr ""
+
+#: makeinfo/insertion.c:160
+msgid "@item not allowed in argument to @itemize"
+msgstr ""
+
+#: makeinfo/insertion.c:238
 msgid "Broken-Type in insertion_type_pname"
 msgstr ""
 
-#: makeinfo/insertion.c:271
+#: makeinfo/insertion.c:334
 msgid "Enumeration stack overflow"
 msgstr ""
 
-#: makeinfo/insertion.c:303
+#: makeinfo/insertion.c:366
 #, c-format
 msgid "lettering overflow, restarting at %c"
 msgstr ""
 
-#: makeinfo/insertion.c:538
+#: makeinfo/insertion.c:631
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
 msgstr ""
 
-#: makeinfo/insertion.c:693
+#: makeinfo/insertion.c:719
+#, c-format
+msgid "%cfloat environments cannot be nested"
+msgstr ""
+
+#: makeinfo/insertion.c:973
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
 msgstr ""
 
-#: makeinfo/insertion.c:931
+#: makeinfo/insertion.c:1337
 #, c-format
 msgid "No matching `%cend %s'"
 msgstr ""
 
-#: makeinfo/insertion.c:1084
+#: makeinfo/insertion.c:1592
 #, c-format
 msgid "%s requires letter or digit"
 msgstr ""
 
-#: makeinfo/insertion.c:1158
+#: makeinfo/insertion.c:1687
 msgid "end of file inside verbatim block"
 msgstr ""
 
-#: makeinfo/insertion.c:1318
+#: makeinfo/insertion.c:1913
+#, c-format
+msgid "@%s not meaningful outside `@float' environment"
+msgstr ""
+
+#: makeinfo/insertion.c:1949
 msgid "@menu seen before first @node, creating `Top' node"
 msgstr ""
 
-#: makeinfo/insertion.c:1319
+#: makeinfo/insertion.c:1950
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr ""
 
-#: makeinfo/insertion.c:1331
+#: makeinfo/insertion.c:1962
 msgid "@detailmenu seen before first node, creating `Top' node"
 msgstr ""
 
-#: makeinfo/insertion.c:1346
+#: makeinfo/insertion.c:2018
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr ""
+
+#: makeinfo/insertion.c:2032
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' environment"
+msgstr ""
+
+#: makeinfo/insertion.c:2063
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr ""
 
-#: makeinfo/insertion.c:1353
+#: makeinfo/insertion.c:2068
 #, c-format
 msgid "`%c%s' needs something after it"
 msgstr ""
 
-#: makeinfo/insertion.c:1359
+#: makeinfo/insertion.c:2074
 #, c-format
-msgid "Bad argument to `%s', `%s', using `%s'"
+msgid "Bad argument `%s' to `@%s', using `%s'"
 msgstr ""
 
-#: makeinfo/insertion.c:1453
+#: makeinfo/insertion.c:2171
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
 msgstr ""
 
-#: makeinfo/insertion.c:1462
+#: makeinfo/insertion.c:2180
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
 msgstr ""
 
-#: makeinfo/insertion.c:1646
+#: makeinfo/insertion.c:2356
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr ""
 
-#: makeinfo/lang.c:331
+#: makeinfo/lang.c:580
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr ""
 
-#: makeinfo/lang.c:384
+#: makeinfo/lang.c:655
 #, c-format
-msgid "unrecogized encoding name `%s'"
+msgid "unrecognized encoding name `%s'"
 msgstr ""
 
-#: makeinfo/lang.c:387
+#: makeinfo/lang.c:663
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr ""
 
-#: makeinfo/lang.c:414
+#: makeinfo/lang.c:715
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr ""
 
-#: makeinfo/lang.c:502
-#, c-format
-msgid "%s is an invalid ISO code, using %c"
-msgstr ""
-
-#: makeinfo/lang.c:687
+#: makeinfo/lang.c:1009
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr ""
 
-#: makeinfo/lang.c:691
+#: makeinfo/lang.c:1013
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr ""
 
-#: makeinfo/macro.c:134
+#: makeinfo/macro.c:128
 #, c-format
 msgid "macro `%s' previously defined"
 msgstr ""
 
-#: makeinfo/macro.c:138
+#: makeinfo/macro.c:132
 #, c-format
 msgid "here is the previous definition of `%s'"
 msgstr ""
 
 #: makeinfo/macro.c:355
 #, c-format
-msgid "\\ in macro expansion followed by `%s' instead of \\ or parameter name"
+msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr ""
 
-#: makeinfo/macro.c:403
+#: makeinfo/macro.c:401
 #, c-format
 msgid "Macro `%s' called on line %d with too many args"
 msgstr ""
 
-#: makeinfo/macro.c:594
+#: makeinfo/macro.c:586
 #, c-format
 msgid "%cend macro not found"
 msgstr ""
 
-#: makeinfo/macro.c:632
+#: makeinfo/macro.c:624
 msgid "@quote-arg only useful for single-argument macros"
 msgstr ""
 
-#: makeinfo/macro.c:668
+#: makeinfo/macro.c:660
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:316
+#: makeinfo/makeinfo.c:184
 #, c-format
-msgid "%s:%d: warning: "
+msgid "Too many errors!  Gave up.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:339
-msgid "Too many errors!  Gave up.\n"
+#: makeinfo/makeinfo.c:302
+#, c-format
+msgid "%s:%d: warning: "
 msgstr ""
 
-#: makeinfo/makeinfo.c:350 makeinfo/makeinfo.c:2026
+#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
 #, c-format
 msgid "Misplaced %c"
 msgstr ""
 
-#: makeinfo/makeinfo.c:370
+#: makeinfo/makeinfo.c:340
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:373
+#: makeinfo/makeinfo.c:343
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:376
+#: makeinfo/makeinfo.c:346
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:380
+#: makeinfo/makeinfo.c:350
 #, c-format
 msgid ""
 "General options:\n"
@@ -2008,16 +2109,17 @@ msgid ""
 "      --version               display version information and exit.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:394
+#: makeinfo/makeinfo.c:364
 #, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output DocBook rather than Info.\n"
+"      --docbook             output Docbook XML rather than Info.\n"
 "      --html                output HTML rather than Info.\n"
-"      --xml                 output XML (TexinfoML) rather than Info.\n"
+"      --xml                 output Texinfo XML rather than Info.\n"
+"      --plaintext           output plain text rather than Info.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:401
+#: makeinfo/makeinfo.c:372
 msgid ""
 "General output options:\n"
 "  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
@@ -2033,7 +2135,7 @@ msgid ""
 "  -o, --output=FILE         output to FILE (directory if split HTML),\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:386
 #, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2052,43 +2154,68 @@ msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d).\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:433
+#: makeinfo/makeinfo.c:403
+msgid ""
+"Options for HTML:\n"
+"      --css-include=FILE        include FILE in HTML <style> output;\n"
+"                                  read stdin if FILE is -.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:409
+#, c-format
+msgid ""
+"Options for XML and Docbook:\n"
+"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"d).\n"
+"                                  If VAL is 0, ignorable whitespace is "
+"dropped.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:416
 msgid ""
 "Input file options:\n"
-"      --commands-in-node-names   allow @ commands in node names.\n"
-"  -D VAR                         define the variable VAR, as with @set.\n"
-"  -I DIR                         append DIR to the @include search path.\n"
-"  -P DIR                         prepend DIR to the @include search path.\n"
-"  -U VAR                         undefine the variable VAR, as with @clear.\n"
+"      --commands-in-node-names  allow @ commands in node names.\n"
+"  -D VAR                        define the variable VAR, as with @set.\n"
+"  -I DIR                        append DIR to the @include search path.\n"
+"  -P DIR                        prepend DIR to the @include search path.\n"
+"  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:442
+#: makeinfo/makeinfo.c:425
 msgid ""
 "Conditional processing in input:\n"
+"  --ifdocbook       process @ifdocbook and @docbook even if\n"
+"                      not generating Docbook.\n"
 "  --ifhtml          process @ifhtml and @html even if not generating HTML.\n"
 "  --ifinfo          process @ifinfo even if not generating Info.\n"
 "  --ifplaintext     process @ifplaintext even if not generating plain text.\n"
 "  --iftex           process @iftex and @tex; implies --no-split.\n"
+"  --ifxml           process @ifxml and @xml.\n"
+"  --no-ifdocbook    do not process @ifdocbook and @docbook text.\n"
 "  --no-ifhtml       do not process @ifhtml and @html text.\n"
 "  --no-ifinfo       do not process @ifinfo text.\n"
 "  --no-ifplaintext  do not process @ifplaintext text.\n"
 "  --no-iftex        do not process @iftex and @tex text.\n"
+"  --no-ifxml        do not process @ifxml and @xml text.\n"
+"\n"
+"  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:454
+#: makeinfo/makeinfo.c:444
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating HTML, --ifhtml is on and the others are off;\n"
 "  if generating Info, --ifinfo is on and the others are off;\n"
 "  if generating plain text, --ifplaintext is on and the others are off;\n"
+"  if generating XML, --ifxml is on and the others are off.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:461
+#: makeinfo/makeinfo.c:452
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                     write Info to foo's @setfilename\n"
 "  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write XML to @setfilename\n"
+"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
 "  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
 "  makeinfo --no-headers foo.texi        write plain text to standard output\n"
 "\n"
@@ -2098,393 +2225,392 @@ msgid ""
 "  makeinfo --no-split foo.texi          write one Info file however big\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:570 makeinfo/makeinfo.c:593 makeinfo/makeinfo.c:655
-#: makeinfo/makeinfo.c:676
+#: makeinfo/makeinfo.c:603
+#, c-format
+msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
+#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:583
+#: makeinfo/makeinfo.c:660
 #, c-format
-msgid "Couldn't open macro expansion output `%s'"
+msgid "%s: could not open macro expansion output `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:586
-msgid "Cannot specify more than one macro expansion output"
+#: makeinfo/makeinfo.c:665
+#, c-format
+msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:624
+#: makeinfo/makeinfo.c:707
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:723
+#: makeinfo/makeinfo.c:806
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:898
+#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
 #, c-format
-msgid "Expected `%s'"
+msgid "Multiline command %c%s used improperly"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1365
-msgid "File exists, but is not a directory"
+#: makeinfo/makeinfo.c:1000
+#, c-format
+msgid "Expected `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1366
+#: makeinfo/makeinfo.c:1479
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1414
+#: makeinfo/makeinfo.c:1525
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1496
+#: makeinfo/makeinfo.c:1605
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1526
+#: makeinfo/makeinfo.c:1638
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1561
+#: makeinfo/makeinfo.c:1673
 #, c-format
 msgid "This is %s, produced by makeinfo version %s from %s.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1583
+#: makeinfo/makeinfo.c:1709
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1627
+#: makeinfo/makeinfo.c:1773
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1853
+#: makeinfo/makeinfo.c:2034
 #, c-format
 msgid "Unknown command `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1875
+#: makeinfo/makeinfo.c:2056
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2068
+#: makeinfo/makeinfo.c:2314
 #, c-format
-msgid "%c%s expected `{...}'"
+msgid "%c%s expected braces"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2098
+#: makeinfo/makeinfo.c:2327
 msgid "Unmatched }"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2148
+#: makeinfo/makeinfo.c:2375
 msgid "NO_NAME!"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2169
+#: makeinfo/makeinfo.c:2396
 #, c-format
 msgid "%c%s missing close brace"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2958
-msgid "First argument to cross-reference may not be empty"
-msgstr ""
-
-#: makeinfo/makeinfo.c:3018 makeinfo/makeinfo.c:3236 makeinfo/xml.c:1340
-msgid "see "
-msgstr ""
-
-#: makeinfo/makeinfo.c:3018
-msgid "See "
-msgstr ""
-
-#: makeinfo/makeinfo.c:3164
-#, c-format
-msgid "`.' or `,' must follow cross reference, not %c"
-msgstr ""
-
-#: makeinfo/makeinfo.c:3212
-msgid "First argument to @inforef may not be empty"
-msgstr ""
-
-#: makeinfo/makeinfo.c:3427
+#: makeinfo/makeinfo.c:3309
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3440
+#: makeinfo/makeinfo.c:3315
 #, c-format
-msgid "No `%s.png' or `.jpg', and no extension supplied"
+msgid "No such file `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3490
+#: makeinfo/makeinfo.c:3447
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3497
+#: makeinfo/makeinfo.c:3456
 msgid "@image missing filename argument"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3690
+#: makeinfo/makeinfo.c:3675
+#, c-format
+msgid "undefined flag: %s"
+msgstr ""
+
+#: makeinfo/makeinfo.c:3676
 #, c-format
 msgid "{No value for `%s'}"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3744
+#: makeinfo/makeinfo.c:3728
 #, c-format
 msgid "%c%s requires a name"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3850
+#: makeinfo/makeinfo.c:3834
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:4081
+#: makeinfo/makeinfo.c:4082
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr ""
 
-#: makeinfo/multi.c:226
+#: makeinfo/multi.c:116
 msgid "Missing } in @multitable template"
 msgstr ""
 
-#: makeinfo/multi.c:302
+#: makeinfo/multi.c:254
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr ""
 
-#: makeinfo/multi.c:375
+#: makeinfo/multi.c:393
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr ""
 
-#: makeinfo/multi.c:426
+#: makeinfo/multi.c:555
 #, c-format
-msgid "Cannot select column #%d in multitable"
+msgid "[unexpected] cannot select column #%d in multitable"
 msgstr ""
 
-#: makeinfo/multi.c:529
+#: makeinfo/multi.c:584
 msgid "ignoring @tab outside of multitable"
 msgstr ""
 
-#: makeinfo/multi.c:565
+#: makeinfo/multi.c:632
+#, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr ""
 
-#: makeinfo/multi.c:568
+#: makeinfo/multi.c:635
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr ""
 
-#: makeinfo/node.c:276
+#: makeinfo/node.c:280
 #, c-format
 msgid "Node `%s' previously defined at line %d"
 msgstr ""
 
-#: makeinfo/node.c:594
+#: makeinfo/node.c:648
 #, c-format
 msgid "Formatting node %s...\n"
 msgstr ""
 
-#: makeinfo/node.c:655
+#: makeinfo/node.c:716
 #, c-format
-msgid "Node `%s' requires a sectioning command (e.g. %c%s)"
+msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
 msgstr ""
 
-#: makeinfo/node.c:815
+#: makeinfo/node.c:879
 #, c-format
 msgid "No node name specified for `%c%s' command"
 msgstr ""
 
-#: makeinfo/node.c:856 makeinfo/node.c:1075
+#: makeinfo/node.c:920 makeinfo/node.c:1151
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr ""
 
-#: makeinfo/node.c:859
+#: makeinfo/node.c:923
 msgid "This @anchor command ignored; references to it will not work"
 msgstr ""
 
-#: makeinfo/node.c:861 makeinfo/node.c:1078
+#: makeinfo/node.c:925 makeinfo/node.c:1154
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr ""
 
-#: makeinfo/node.c:891
+#: makeinfo/node.c:955
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
 msgstr ""
 
-#: makeinfo/node.c:920
-msgid "Node:"
-msgstr ""
-
-#: makeinfo/node.c:930
+#: makeinfo/node.c:991
 msgid "Next:"
 msgstr ""
 
-#: makeinfo/node.c:940
+#: makeinfo/node.c:1007
 msgid "Previous:"
 msgstr ""
 
-#: makeinfo/node.c:950
+#: makeinfo/node.c:1021
 msgid "Up:"
 msgstr ""
 
-#: makeinfo/node.c:1072
+#: makeinfo/node.c:1148
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr ""
 
-#: makeinfo/node.c:1077
+#: makeinfo/node.c:1153
 msgid "@anchor command ignored; references to it will not work"
 msgstr ""
 
-#: makeinfo/node.c:1277
+#: makeinfo/node.c:1347
 #, c-format
-msgid "%s reference to nonexistent node `%s'"
+msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1294
+#: makeinfo/node.c:1363
 msgid "Menu"
 msgstr ""
 
-#: makeinfo/node.c:1296
+#: makeinfo/node.c:1365
 msgid "Cross"
 msgstr ""
 
-#: makeinfo/node.c:1380
+#: makeinfo/node.c:1447
 #, c-format
-msgid "Next field of node `%s' not pointed to"
+msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1383
+#: makeinfo/node.c:1450
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr ""
 
-#: makeinfo/node.c:1395
+#: makeinfo/node.c:1462
 msgid "Prev"
 msgstr ""
 
-#: makeinfo/node.c:1438
+#: makeinfo/node.c:1505
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr ""
 
-#: makeinfo/node.c:1442
+#: makeinfo/node.c:1509
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr ""
 
-#: makeinfo/node.c:1454
+#: makeinfo/node.c:1521
 #, c-format
-msgid "`%s' has no Up field"
+msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1457
+#: makeinfo/node.c:1524
 msgid "Up"
 msgstr ""
 
-#: makeinfo/node.c:1523
+#: makeinfo/node.c:1590
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr ""
 
-#: makeinfo/node.c:1552
+#: makeinfo/node.c:1619
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr ""
 
-#: makeinfo/node.c:1566
+#: makeinfo/node.c:1633
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr ""
 
-#: makeinfo/sectioning.c:117
+#: makeinfo/node.c:1723
+#, c-format
+msgid "Removing %s\n"
+msgstr ""
+
+#: makeinfo/node.c:1727
+#, c-format
+msgid "Can't remove file `%s': %s"
+msgstr ""
+
+#: makeinfo/sectioning.c:122
+#, c-format
+msgid "Appendix %c"
+msgstr ""
+
+#: makeinfo/sectioning.c:467
 #, c-format
-msgid "Appendix %c "
+msgid "Internal error (search_sectioning) `%s'!"
 msgstr ""
 
-#: makeinfo/sectioning.c:356 makeinfo/sectioning.c:444
+#: makeinfo/sectioning.c:562
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
 msgstr ""
 
-#: makeinfo/sectioning.c:502
+#: makeinfo/sectioning.c:623
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr ""
 
-#: makeinfo/sectioning.c:518
+#: makeinfo/sectioning.c:639
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr ""
 
-#: makeinfo/sectioning.c:526
+#: makeinfo/sectioning.c:647
 #, c-format
 msgid "Here is the %ctop node"
 msgstr ""
 
-#: makeinfo/sectioning.c:543
+#: makeinfo/sectioning.c:663
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr ""
 
-#: makeinfo/toc.c:221 makeinfo/toc.c:298 makeinfo/toc.c:299
+#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
 msgid "Table of Contents"
 msgstr ""
 
-#: makeinfo/toc.c:330 makeinfo/toc.c:366 makeinfo/toc.c:367
+#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
 msgid "Short Contents"
 msgstr ""
 
-#: makeinfo/toc.c:406
+#: makeinfo/xml.c:1605
 #, c-format
-msgid "%s: TOC should be here, but it was not found"
+msgid "@image file `%s' unreadable: %s"
 msgstr ""
 
-#: makeinfo/xml.c:1108
-#, c-format
-msgid "@image file `%s' unreadable: %s"
+#: makeinfo/xml.c:2097
+msgid ""
+"@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
 
-#: util/install-info.c:151
+#: util/install-info.c:154
 #, c-format
 msgid "%s: warning: "
 msgstr ""
 
-#: util/install-info.c:176 util/install-info.c:189
-msgid "virtual memory exhausted"
-msgstr ""
-
-#: util/install-info.c:232
+#: util/install-info.c:203
 #, c-format
 msgid " for %s"
 msgstr ""
 
-#: util/install-info.c:381
+#: util/install-info.c:426
 #, c-format
 msgid "\tTry `%s --help' for a complete list of options.\n"
 msgstr ""
 
-#: util/install-info.c:389
+#: util/install-info.c:434
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
@@ -2521,7 +2647,7 @@ msgid ""
 " --version         display version information and exit.\n"
 msgstr ""
 
-#: util/install-info.c:444
+#: util/install-info.c:488
 #, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
@@ -2538,127 +2664,124 @@ msgid ""
 "  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
 "  to select it.\n"
 "\n"
-"* Menu:\n"
+"%s\n"
 msgstr ""
 
-#: util/install-info.c:467
+#: util/install-info.c:513
 #, c-format
 msgid "%s: could not read (%s) and could not create (%s)\n"
 msgstr ""
 
-#: util/install-info.c:551
+#: util/install-info.c:600
 #, c-format
 msgid "%s: empty file"
 msgstr ""
 
-#: util/install-info.c:866 util/install-info.c:906
+#: util/install-info.c:913 util/install-info.c:953
 msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
 msgstr ""
 
-#: util/install-info.c:901
+#: util/install-info.c:948
 msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
 msgstr ""
 
-#: util/install-info.c:1150 util/install-info.c:1160
+#: util/install-info.c:1191 util/install-info.c:1201
 #, c-format
-msgid "%s: Specify the Info directory only once.\n"
+msgid "%s: already have dir file: %s\n"
 msgstr ""
 
-#: util/install-info.c:1195
+#: util/install-info.c:1236
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr ""
 
-#: util/install-info.c:1244
+#: util/install-info.c:1284
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr ""
 
-#: util/install-info.c:1248
+#: util/install-info.c:1288
 msgid "No input file specified; try --help for more information."
 msgstr ""
 
-#: util/install-info.c:1251
+#: util/install-info.c:1291
 msgid "No dir file specified; try --help for more information."
 msgstr ""
 
-#: util/install-info.c:1273
+#: util/install-info.c:1313
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr ""
 
-#: util/install-info.c:1388
+#: util/install-info.c:1426
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr ""
 
-#: util/install-info.c:1411
+#: util/install-info.c:1449
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr ""
 
-#: util/texindex.c:245
+#: util/texindex.c:252
 msgid "display this help and exit"
 msgstr ""
 
-#: util/texindex.c:247
+#: util/texindex.c:254
 msgid "keep temporary files around after processing"
 msgstr ""
 
-#: util/texindex.c:249
+#: util/texindex.c:256
 msgid "do not keep temporary files around after processing (default)"
 msgstr ""
 
-#: util/texindex.c:251
+#: util/texindex.c:258
 msgid "send output to FILE"
 msgstr ""
 
-#: util/texindex.c:253
+#: util/texindex.c:260
 msgid "display version information and exit"
 msgstr ""
 
-#: util/texindex.c:264
+#: util/texindex.c:270
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr ""
 
-#: util/texindex.c:265
+#: util/texindex.c:271
+#, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr ""
 
-#: util/texindex.c:268
+#: util/texindex.c:274
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr ""
 
-#: util/texindex.c:270
+#: util/texindex.c:276
+#, c-format
 msgid ""
 "\n"
 "Options:\n"
 msgstr ""
 
-#: util/texindex.c:887 util/texindex.c:921 util/texindex.c:997
-#: util/texindex.c:1025
+#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
+#: util/texindex.c:1011
 #, c-format
 msgid "%s: not a texinfo index file"
 msgstr ""
 
-#: util/texindex.c:982
+#: util/texindex.c:968
 #, c-format
 msgid "failure reopening %s"
 msgstr ""
 
-#: util/texindex.c:1224
+#: util/texindex.c:1218
 #, c-format
 msgid "No page number in %s"
 msgstr ""
 
-#: util/texindex.c:1295
+#: util/texindex.c:1291
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr ""
-
-#: util/texindex.c:1633
-#, c-format
-msgid "%s; for file `%s'.\n"
-msgstr ""
diff --git a/gnu/usr.bin/texinfo/po/tr.gmo b/gnu/usr.bin/texinfo/po/tr.gmo
new file mode 100644
index 00000000000..09fa6558c68
--- /dev/null
+++ b/gnu/usr.bin/texinfo/po/tr.gmo
diff --git a/gnu/usr.bin/texinfo/po/tr.po b/gnu/usr.bin/texinfo/po/tr.po
new file mode 100644
index 00000000000..6745a02f04f
--- /dev/null
+++ b/gnu/usr.bin/texinfo/po/tr.po
@@ -0,0 +1,3123 @@
+# translation of texinfo-4.7.92.po to Turkish
+# texinfo-4.7.92 Türkçe Çevirisi
+# Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+# This file is distributed under the same license as the texinfo package.
+# Eyüp Hakan Duran <hakan_duran@hotmail.com>, 2002, 2004.
+msgid ""
+msgstr ""
+"Project-Id-Version: texinfo-4.7.92\n"
+"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
+"POT-Creation-Date: 2004-12-21 16:20-0800\n"
+"PO-Revision-Date: 2004-12-21 21:22+0200\n"
+"Last-Translator: Eyüp Hakan Duran <hakan_duran@hotmail.com>\n"
+"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-9\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.3\n"
+
+#: info/echo-area.c:284 info/session.c:689
+msgid "Move forward a character"
+msgstr "Bir karakter ileri gider"
+
+#: info/echo-area.c:296 info/session.c:705
+msgid "Move backward a character"
+msgstr "Bir karakter geri gider"
+
+#: info/echo-area.c:308
+msgid "Move to the start of this line"
+msgstr "Satýrýn baþlangýcýna gider"
+
+#: info/echo-area.c:313
+msgid "Move to the end of this line"
+msgstr "Satýrýn sonuna gider"
+
+#: info/echo-area.c:321 info/session.c:723
+msgid "Move forward a word"
+msgstr "Bir kelime ileri gider"
+
+#: info/echo-area.c:361 info/session.c:772
+msgid "Move backward a word"
+msgstr "Bir kelime geri gider"
+
+#: info/echo-area.c:401
+msgid "Delete the character under the cursor"
+msgstr "Ýmlecin altýndaki karakteri siler"
+
+#: info/echo-area.c:431
+msgid "Delete the character behind the cursor"
+msgstr "Ýmleçden önceki karakteri siler"
+
+#: info/echo-area.c:452
+msgid "Cancel or quit operation"
+msgstr "Ýþlemi keser ya da çýkar"
+
+#: info/echo-area.c:467
+msgid "Accept (or force completion of) this line"
+msgstr "Bu satýrý kabul eder (ya da tamamlanmasý için zorlar)"
+
+#: info/echo-area.c:472
+msgid "Insert next character verbatim"
+msgstr "Sonraki karakteri aynen yerleþtirir"
+
+#: info/echo-area.c:480
+msgid "Insert this character"
+msgstr "Bu karakteri yerleþtirir"
+
+#: info/echo-area.c:498
+msgid "Insert a TAB character"
+msgstr "Bir TAB karakteri yerleþtirir"
+
+#: info/echo-area.c:505
+msgid "Transpose characters at point"
+msgstr "Verilen yerde karakterleri yer deðiþtirir"
+
+#: info/echo-area.c:556
+msgid "Yank back the contents of the last kill"
+msgstr "Son silinenin içeriði kadar geri çeker"
+
+#: info/echo-area.c:563
+msgid "Kill ring is empty"
+msgstr "Silinen zincir boþ"
+
+#: info/echo-area.c:576
+msgid "Yank back a previous kill"
+msgstr "Bir önceki silinen kadar geri çeker"
+
+#: info/echo-area.c:609
+msgid "Kill to the end of the line"
+msgstr "Satýrýn sonuna kadar siler"
+
+#: info/echo-area.c:622
+msgid "Kill to the beginning of the line"
+msgstr "Satýrýn baþýna kadar siler"
+
+#: info/echo-area.c:634
+msgid "Kill the word following the cursor"
+msgstr "Ýmleçten sonraki kelimeyi siler"
+
+#: info/echo-area.c:653
+msgid "Kill the word preceding the cursor"
+msgstr "Ýmleçten önceki kelimeyi siler"
+
+#: info/echo-area.c:868 info/echo-area.c:924
+msgid "No completions"
+msgstr "Tamamlama yok"
+
+#: info/echo-area.c:870
+msgid "Not complete"
+msgstr "Bitmedi"
+
+#: info/echo-area.c:911
+msgid "List possible completions"
+msgstr "Olasý tamamlamalarý listeler"
+
+#: info/echo-area.c:928
+msgid "Sole completion"
+msgstr "Tek tamamlama"
+
+#: info/echo-area.c:937
+msgid "One completion:\n"
+msgstr "Bir tamamlama:\n"
+
+#: info/echo-area.c:938
+#, c-format
+msgid "%d completions:\n"
+msgstr "%d tamamlama:\n"
+
+#: info/echo-area.c:1085
+msgid "Insert completion"
+msgstr "Tamamlamayý yerleþtir"
+
+#: info/echo-area.c:1220
+msgid "Building completions..."
+msgstr "Tamamlamalarý oluþturuyor..."
+
+#: info/echo-area.c:1340
+msgid "Scroll the completions window"
+msgstr "Tamamlama penceresini kaydýrýr"
+
+#: info/footnotes.c:213
+msgid "Footnotes could not be displayed"
+msgstr "Dipnotlar gösterilemedi"
+
+#: info/footnotes.c:239
+msgid "Show the footnotes associated with this node in another window"
+msgstr "Diðer penceredeki bu düðümle iliþkili dipnotlarý gösterir"
+
+#: info/footnotes.h:26
+msgid "---------- Footnotes ----------"
+msgstr "----------- Dipnotlar ---------"
+
+#: info/indices.c:172
+msgid "Look up a string in the index for this file"
+msgstr "Bu dosyada indeks içinde bir dizgeyi arar"
+
+#: info/indices.c:199
+msgid "Finding index entries..."
+msgstr "indeks girdilerini buluyor..."
+
+#: info/indices.c:207
+msgid "No indices found."
+msgstr "Hiç indis yok."
+
+#: info/indices.c:217
+msgid "Index entry: "
+msgstr "indeks giriþi: "
+
+#: info/indices.c:325
+msgid ""
+"Go to the next matching index item from the last `\\[index-search]' command"
+msgstr ""
+"Son `\\[index-search]'komutundan bir sonraki eþleþen indeks öðesine gider"
+
+#: info/indices.c:335
+msgid "No previous index search string."
+msgstr "Daha önce bir indeks arama dizgesi yok."
+
+#: info/indices.c:342
+msgid "No index entries."
+msgstr "Hiç indeks girdisi yok."
+
+#: info/indices.c:375
+#, c-format
+msgid "No %sindex entries containing `%s'."
+msgstr "`%s' içeren %sindex girdisi yok."
+
+#: info/indices.c:376
+msgid "more "
+msgstr "daha"
+
+#: info/indices.c:386
+msgid "CAN'T SEE THIS"
+msgstr "BU GÖRÜLMEZ"
+
+#: info/indices.c:422
+#, c-format
+msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
+msgstr ""
+"`%s' bulundu - %s içinde. (`\\[next-index-match]' sonrakini bulmayý dener.)"
+
+#: info/indices.c:541
+#, c-format
+msgid "Scanning indices of `%s'..."
+msgstr "`%s' indislerini tarýyor..."
+
+#: info/indices.c:596
+#, c-format
+msgid "No available info files have `%s' in their indices."
+msgstr "Mevcut bilgi dosyalarýndan hiçbirisinin indisinde `%s' yok."
+
+#: info/indices.c:622
+msgid "Grovel all known info file's indices for a string and build a menu"
+msgstr ""
+"Bir dizge için tüm bilinen bilgi dosyalarýnýn indislerinide ekleyerek bir "
+"menu oluþturur"
+
+#: info/indices.c:626
+msgid "Index apropos: "
+msgstr "Ýndeks hakkýnda:"
+
+#: info/indices.c:654
+#, c-format
+msgid ""
+"\n"
+"* Menu: Nodes whose indices contain `%s':\n"
+msgstr ""
+"\n"
+"* Menü: `%s' indislerini içeren düðümler:\n"
+
+#: info/info.c:275 info/infokey.c:899
+#, c-format
+msgid "Try --help for more information.\n"
+msgstr "Daha fazla bilgi için --help seçeneðini kullanýn.\n"
+
+#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
+#: util/texindex.c:343
+#, c-format
+msgid ""
+"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 ""
+"Garanti yoktur. Bu yazýlýmý GNU Genel Kamu Lisansý koþullarý\n"
+"altýnda daðýtabilirsiniz. Bu konuda daha fazla bilgi için\n"
+"COPYING isimli dosyaya bakýn.\n"
+
+#: info/info.c:498
+#, c-format
+msgid "no index entries found for `%s'\n"
+msgstr "`%s' için indeks girdisi yok.\n"
+
+#: info/info.c:590
+msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
+msgstr ""
+"  -b, --speech-friendly       konuþma sentezcilerine dostça davranýr.\n"
+
+#: info/info.c:597
+#, c-format
+msgid ""
+"Usage: %s [OPTION]... [MENU-ITEM...]\n"
+"\n"
+"Read documentation in Info format.\n"
+"\n"
+"Options:\n"
+"      --apropos=STRING         look up STRING in all indices of all "
+"manuals.\n"
+"  -d, --directory=DIR          add DIR to INFOPATH.\n"
+"      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
+"  -f, --file=FILENAME          specify Info file to visit.\n"
+"  -h, --help                   display this help and exit.\n"
+"      --index-search=STRING    go to node pointed by index entry STRING.\n"
+"  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
+"  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+"  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+"      --no-raw-escapes         output escapes as literal text.\n"
+"      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
+"  -O, --show-options, --usage  go to command-line options node.\n"
+"%s      --subnodes               recursively output menu items.\n"
+"  -w, --where, --location      print physical location of Info file.\n"
+"      --vi-keys                use vi-like and less-like key bindings.\n"
+"      --version                display version information and exit.\n"
+"\n"
+"The first non-option argument, if present, is the menu entry to start from;\n"
+"it is searched for in all `dir' files along INFOPATH.\n"
+"If it is not present, info merges all `dir' files and shows the result.\n"
+"Any remaining arguments are treated as the names of menu\n"
+"items relative to the initial node visited.\n"
+"\n"
+"Examples:\n"
+"  info                       show top-level dir menu\n"
+"  info emacs                 start at emacs node from top-level dir\n"
+"  info emacs buffers         start at buffers node within emacs manual\n"
+"  info --show-options emacs  start at node with emacs' command line options\n"
+"  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+msgstr ""
+"Kullaným: %s [SEÇENEK]... [MENÜ-ÖÐESÝ...]\n"
+"\n"
+"Info biçeminde belge okur\n"
+"\n"
+"Seçenekler:\n"
+"      --apropos=DÝZGE          DÝZGE'yi tüm elkitaplarýnýn tüm indislerinde "
+"ara.\n"
+"  -d, --directory=DIR          DIR'ý INFOPATH'a ekle.\n"
+"      --dribble=DOSYAADI       DOSYAADI'ndaki kullanýcý tuþbasýmlarýný "
+"anýmsa.\n"
+"  -f, --file=DOSYAADI          uðranacak Info dosyasýný belirle.\n"
+"  -h, --help                   bu yardýmý görüntüle ve çýk.\n"
+"      --index-search=DÝZGE     DÝZGE indeks giriþince iþaret edilen düðüme "
+"git.\n"
+"  -n, --node=DÜÐÜMADI          ilk uðranan Info dosyasýndaki düðümleri "
+"belirle.\n"
+"  -o, --output=DOSYAADI        seçili düðümleri DOSYAADI'na çýkar.\n"
+"  -R, --raw-escapes            klavuz sayfalarýndan ANSI kaçýþlarýný (esc) "
+"silme.\n"
+"      --restore=DOSYAADI       ilk tuþ vuruþlarýný DOSYAADI'ndan oku.\n"
+"  -O, --show-options, --usage  komut-satýrý seçenekler düðümüne git.\n"
+"%s      --subnodes               menü öðelerini özyinelemeli çýkar.\n"
+"      --vi-keys                vi ve less benzeri tuþ baðlayýcýlarý kullan.\n"
+"      --version                sürüm bilgisini göster ve çýk.\n"
+"\n"
+"Eðer mevcutsa, ilk seçenek-olmayan argüman, baþlanacak menü giriþidir;\n"
+"INFOPATH boyunca tüm `dir' dosyalarýnda aranýr.\n"
+"Mevcut deðilse, bilgi tüm `dir' dosyalarýný birleþtirip sonucu gösterir.\n"
+"Kalan tüm argümanlar, ilk uðranan düðüme göreceli olarak\n"
+"menü öðesi adlarý muamelesi görür.\n"
+"\n"
+"Örnekler:\n"
+"  info                       üst-düzey dir menüsünü göster\n"
+"  info emacs                 üst-düzey dir'den emacs düðümünde baþla\n"
+"  info emacs buffers         emacs klavuzu içindeki tampon düðümden baþla\n"
+"  info --show-options emacs  emacs'ýn komut satýrý seçenekleri olan düðümden "
+"baþla\n"
+"  info -f ./foo.info         dir'i aramadan ./foo.info dosyasýný göster\n"
+
+#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
+#: util/install-info.c:466 util/texindex.c:292
+msgid ""
+"\n"
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr ""
+"\n"
+"Yazýlým hatalarýný bug-texinfo@gnu.org'a,\n"
+"genel soru ve tartýþmalarý help-texinfo@gnu.org'a gönderiniz.\n"
+"Texinfo anasayfasý: http://www.gnu.org/software/texinfo/"
+
+#: info/info.c:669
+#, c-format
+msgid "Cannot find node `%s'."
+msgstr "`%s' düðümü bulunamadý."
+
+#: info/info.c:670
+#, c-format
+msgid "Cannot find node `(%s)%s'."
+msgstr "`(%s)%s' düðümü bulunamadý."
+
+#: info/info.c:671
+msgid "Cannot find a window!"
+msgstr "Bir pencere bulunamadý!"
+
+#: info/info.c:672
+msgid "Point doesn't appear within this window's node!"
+msgstr "Orasý bu pencerenin düðümü gibi görünmüyor!"
+
+#: info/info.c:673
+msgid "Cannot delete the last window."
+msgstr "Son pencere silinemez."
+
+#: info/info.c:674
+msgid "No menu in this node."
+msgstr "Bu düðümde menü yok."
+
+#: info/info.c:675
+msgid "No footnotes in this node."
+msgstr "Bu düðümde dipnot yok."
+
+#: info/info.c:676
+msgid "No cross references in this node."
+msgstr "Bu düðümde çapraz baþvuru yok."
+
+#: info/info.c:677
+#, c-format
+msgid "No `%s' pointer for this node."
+msgstr "Bu düðüm için `%s' yer gösterici yok."
+
+#: info/info.c:678
+#, c-format
+msgid "Unknown Info command `%c'; try `?' for help."
+msgstr "Info komutu `%c' bilinmiyor; yardým almak için `?' deneyin."
+
+#: info/info.c:679
+#, c-format
+msgid "Terminal type `%s' is not smart enough to run Info."
+msgstr "`%s' terminal türü Info çalýþtýrmak için yeterince akýllý deðil."
+
+#: info/info.c:680
+msgid "You are already at the last page of this node."
+msgstr "Zaten bu düðümün son sayfasýndasýnýz."
+
+#: info/info.c:681
+msgid "You are already at the first page of this node."
+msgstr "Zaten bu düðümün ilk sayfasýndasýnýz."
+
+#: info/info.c:682
+msgid "Only one window."
+msgstr "Sadece bir pencere."
+
+#: info/info.c:683
+msgid "Resulting window would be too small."
+msgstr "Pencere çok küçük olacaktý."
+
+#: info/info.c:684
+msgid "Not enough room for a help window, please delete a window."
+msgstr "Bir yardým penceresi için yer yok, lütfen bir pencere silin."
+
+#: info/infodoc.c:46 info/infodoc.c:95
+msgid ""
+"Basic Commands in Info Windows\n"
+"******************************\n"
+msgstr ""
+"Info Pencerelerindeki Temel Komutlar\n"
+"************************************\n"
+
+#: info/infodoc.c:49
+msgid "\\%-10[quit-help]  Quit this help.\n"
+msgstr "\\%-10[quit help]  Bu yardýmdan çýkar \n"
+
+#: info/infodoc.c:50
+msgid "\\%-10[quit]  Quit Info altogether.\n"
+msgstr "\\%-10[quit]  Info'dan büsbütün çýkar.\n"
+
+#: info/infodoc.c:51
+msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
+msgstr "\\%-10[get-info-help-node]  Info öðreticiyi çaðýrýr.\n"
+
+#: info/infodoc.c:53 info/infodoc.c:102
+msgid ""
+"Selecting other nodes:\n"
+"----------------------\n"
+msgstr ""
+"Diðer düðümleri seçme:\n"
+"----------------------\n"
+
+#: info/infodoc.c:55
+msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
+msgstr "\\%-10[next-node]  Bu düðümün \"next\" düðümüne gider.\n"
+
+#: info/infodoc.c:56
+msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
+msgstr "\\%-10[prev-node]  Bu düðümün \"previous\" düðümüne gider.\n"
+
+#: info/infodoc.c:57
+msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
+msgstr "\\%-10[up-node]  Bu düðümden \"up\" gider.\n"
+
+#: info/infodoc.c:58
+msgid ""
+"\\%-10[menu-item]  Pick menu item specified by name.\n"
+"              Picking a menu item causes another node to be selected.\n"
+msgstr ""
+"\\%-10[menu-item]  Ýsmini belirterek menü öðesi seçin.\n"
+"              Menü öðesi seçmek, bir baþka düðümün seçilmesine yolaçar.\n"
+
+#: info/infodoc.c:60
+msgid ""
+"\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
+msgstr ""
+"\\%-10[xref-item]  Bir çapraz baþvuruyu izler.  Baþvurunun adýný okur.\n"
+
+#: info/infodoc.c:61
+msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
+msgstr "\\%-10[history-node]  Bu pencerede görünen en son düðüme gider.\n"
+
+#: info/infodoc.c:62
+msgid ""
+"\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
+msgstr ""
+"\\%-10[move-to-next-xref]  Bu düðüm içinde sonraki URL linkine atlar.\n"
+
+#: info/infodoc.c:63
+msgid ""
+"\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
+"node.\n"
+msgstr "\\%-10[move-to-prev-xref]  Bu düðüm içinde önceki URL linkine atlar.\n"
+
+#: info/infodoc.c:64
+msgid ""
+"\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
+msgstr ""
+"\\%-10[select-reference-this-line]  Ýmleç altýndaki URL linkini izler.\n"
+
+#: info/infodoc.c:65
+msgid ""
+"\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
+"node] (DIR)'.\n"
+msgstr ""
+"\\%-10[dir-node]  `dizin' düðümüne gider.  `\\[goto-node] (DIR)'a eþdeðer.\n"
+
+#: info/infodoc.c:66
+msgid ""
+"\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
+msgstr ""
+"\\%-10[top-node]  En üst düðüme gider.  `\\[goto-node] Top'a eþdeðer.\n"
+
+#: info/infodoc.c:68 info/infodoc.c:116
+msgid ""
+"Moving within a node:\n"
+"---------------------\n"
+msgstr ""
+"Bir düðüm içinde dolaþým:\n"
+"-------------------------\n"
+
+#: info/infodoc.c:70
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "\\%-10[beginning-of-node]  Bu düðümün baþlangýcýna gider.\n"
+
+#: info/infodoc.c:71
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgstr "\\%-10[end-of-node]  Bu düðümün sonuna gider.\n"
+
+#: info/infodoc.c:72
+msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
+msgstr "\\%-10[next-line]  Bir satýr ileri kaydýrýr.\n"
+
+#: info/infodoc.c:73
+msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
+msgstr "\\%-10[prev-line]  Bir satýr geri kaydýrýr.\n"
+
+#: info/infodoc.c:74
+msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
+msgstr "\\%-10[scroll-forward]  Ýleriye doðru bir sayfa kaydýrýr.\n"
+
+#: info/infodoc.c:75
+msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
+msgstr "\\%-10[scroll-backward]  Geriye doðru bir sayfa kaydýrýr.\n"
+
+#: info/infodoc.c:77 info/infodoc.c:125
+msgid ""
+"Other commands:\n"
+"---------------\n"
+msgstr ""
+"Diðer komutlar:\n"
+"---------------\n"
+
+#: info/infodoc.c:79
+msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
+msgstr "\\%-10[menu-digit]  Düðümün menüsündeki ilk ...inci öðeyi seçer.\n"
+
+#: info/infodoc.c:80
+msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
+msgstr "\\%-10[last-menu-item]  Düðümün menüsündeki son öðeyi seçer.\n"
+
+#: info/infodoc.c:81
+msgid ""
+"\\%-10[index-search]  Search for a specified string in the index entries of "
+"this Info\n"
+"              file, and select the node referenced by the first entry "
+"found.\n"
+msgstr ""
+"\\%-10[index-search]  Bu Info dosyasýndaki indeks girdileri içinde belirli "
+"bir dizgeyi arar\n"
+"              ve bulunan ilk girdi tarafýndan gönderme yapýlan düðümü "
+"seçer.\n"
+
+#: info/infodoc.c:83
+msgid ""
+"\\%-10[goto-node]  Move to node specified by name.\n"
+"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
+msgstr ""
+"\\%-10[goto-node]  Ýsmiyle belirtilen düðüme gider.\n"
+"              (DOSYAADI)DÜÐÜMADI þeklinde bir dosya adý da "
+"ekleyebilirsiniz.\n"
+
+#: info/infodoc.c:85
+msgid ""
+"\\%-10[search]  Search forward for a specified string\n"
+"              and select the node in which the next occurrence is found.\n"
+msgstr ""
+"\\%-10[search]  Belirli bir dizgeyi ileriye doðru arar\n"
+"              ve sonraki bulunanýn içinde olduðu düðümü seçer.\n"
+
+#: info/infodoc.c:87
+msgid ""
+"\\%-10[search-backward]  Search backward for a specified string\n"
+"              and select the node in which the previous occurrence is "
+"found.\n"
+msgstr ""
+"\\%-10[search-backward]  Belirli bir dizgeyi geriye doðru arar\n"
+"              ve önceki bulunanýn içinde olduðu düðümü seçer.\n"
+
+#: info/infodoc.c:98
+#, c-format
+msgid "  %-10s  Quit this help.\n"
+msgstr "  %-10s  Bu yardým penceresinden çýkar.\n"
+
+#: info/infodoc.c:99
+#, c-format
+msgid "  %-10s  Quit Info altogether.\n"
+msgstr "  %-10s  Info büsbütün çýkar.\n"
+
+#: info/infodoc.c:100
+#, c-format
+msgid "  %-10s  Invoke the Info tutorial.\n"
+msgstr "  %-10s  Info öðreticiyi yardýma çaðýrýr.\n"
+
+#: info/infodoc.c:104
+#, c-format
+msgid "  %-10s  Move to the `next' node of this node.\n"
+msgstr "  %-10s  Bu düðümün `sonraki' düðümüne gider.\n"
+
+#: info/infodoc.c:105
+#, c-format
+msgid "  %-10s  Move to the `previous' node of this node.\n"
+msgstr "  %-10s  Bu düðümün `önceki' düðümüne gider.\n"
+
+#: info/infodoc.c:106
+#, c-format
+msgid "  %-10s  Move `up' from this node.\n"
+msgstr "  %-10s  Bu düðümden `yukarý' gider.\n"
+
+#: info/infodoc.c:107
+#, c-format
+msgid "  %-10s  Pick menu item specified by name.\n"
+msgstr "  %-10s  Ýsmi ile belirtilen menü öðesini seçer.\n"
+
+#: info/infodoc.c:108
+msgid "              Picking a menu item causes another node to be selected.\n"
+msgstr ""
+"              Diðer düðümün seçilmesine sebep olan bir menü öðesini "
+"seçiyor.\n"
+
+#: info/infodoc.c:109
+#, c-format
+msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
+msgstr "  %-10s  Bir çapraz baþvuruyu izler. Baþvuru ismini okur.\n"
+
+#: info/infodoc.c:110
+#, c-format
+msgid "  %-10s  Move to the last node seen in this window.\n"
+msgstr "  %-10s  Bu pencerede görünen son düðüme gider.\n"
+
+#: info/infodoc.c:111
+#, c-format
+msgid "  %-10s  Skip to next hypertext link within this node.\n"
+msgstr "  %-10s  Bu düðümün içinden sonraki URL baðýna atlar.\n"
+
+#: info/infodoc.c:112
+#, c-format
+msgid "  %-10s  Follow the hypertext link under cursor.\n"
+msgstr "  %-10s  Ýmleç altýndaki URL baðýný izler.\n"
+
+#: info/infodoc.c:113
+#, c-format
+msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
+msgstr "  %-10s  `dizin' düðümüne gider. `g (DÝZÝN)' ile eþdeðer.\n"
+
+#: info/infodoc.c:114
+#, c-format
+msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
+msgstr "  %-10s  Üst düðüme gider. `g Top' ile eþdeðer.\n"
+
+#: info/infodoc.c:118
+#, c-format
+msgid "  %-10s  Scroll forward a page.\n"
+msgstr "  %-10s  Bir sayfa ileri kaydýrýr.\n"
+
+#: info/infodoc.c:119
+#, c-format
+msgid "  %-10s  Scroll backward a page.\n"
+msgstr "  %-10s  Bir sayfa geri kaydýrýr.\n"
+
+#: info/infodoc.c:120
+#, c-format
+msgid "  %-10s  Go to the beginning of this node.\n"
+msgstr "  %-10s  Bu düðümün baþlangýcýna gider.\n"
+
+#: info/infodoc.c:121
+#, c-format
+msgid "  %-10s  Go to the end of this node.\n"
+msgstr "  %-10s  Bu düðümün sonuna gider.\n"
+
+#: info/infodoc.c:122
+#, c-format
+msgid "  %-10s  Scroll forward 1 line.\n"
+msgstr "  %-10s  Bir satýr ileri kaydýrýr.\n"
+
+#: info/infodoc.c:123
+#, c-format
+msgid "  %-10s  Scroll backward 1 line.\n"
+msgstr "  %-10s  Bir satýr geri kaydýrýr.\n"
+
+#: info/infodoc.c:127
+#, c-format
+msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
+msgstr "  %-10s  Önce seçer ... düðüm menüsündeki dokuzuncu öðe.\n"
+
+#: info/infodoc.c:128
+#, c-format
+msgid "  %-10s  Pick last item in node's menu.\n"
+msgstr "  %-10s  Düðüm menüsündeki son öðeyi seçer.\n"
+
+#: info/infodoc.c:129
+#, c-format
+msgid ""
+"  %-10s  Search for a specified string in the index entries of this Info\n"
+msgstr "  %-10s  Bu Info'nun indeks girdilerinde belirtilen bir dizgeyi arar\n"
+
+#: info/infodoc.c:130
+msgid ""
+"              file, and select the node referenced by the first entry "
+"found.\n"
+msgstr ""
+"              dosyasý ve bulunan ilk girdi tarafýndan baðýntýlanan düðümü "
+"seçer.\n"
+
+#: info/infodoc.c:131
+#, c-format
+msgid "  %-10s  Move to node specified by name.\n"
+msgstr "  %-10s  ismiyle belirtilen düðüme gider.\n"
+
+#: info/infodoc.c:132
+msgid ""
+"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
+msgstr ""
+"              (DOSYAÝSMÝ)DÜÐÜMÝSMÝ þeklinde bir dosyayý dahil "
+"edebilirsiniz.\n"
+
+#: info/infodoc.c:133
+#, c-format
+msgid "  %-10s  Search forward for a specified string,\n"
+msgstr "  %-10s  Belirli bir dizgeyi ileriye doðru arar,\n"
+
+#: info/infodoc.c:134 info/infodoc.c:136
+msgid ""
+"              and select the node in which the next occurrence is found.\n"
+msgstr "              ve bulunan sonraki oluþumdaki düðümü seçer.\n"
+
+#: info/infodoc.c:135
+#, c-format
+msgid "  %-10s  Search backward for a specified string\n"
+msgstr "  %-10s  Belirli bir dizgeyi geriye doðru arar\n"
+
+#: info/infodoc.c:316
+msgid "The current search path is:\n"
+msgstr "Þu anki arama yolu:\n"
+
+#: info/infodoc.c:320
+msgid ""
+"Commands available in Info windows:\n"
+"\n"
+msgstr ""
+"Info pencerelerinde kullanýlabilecek komutlar:\n"
+"\n"
+
+#: info/infodoc.c:324
+msgid ""
+"Commands available in the echo area:\n"
+"\n"
+msgstr ""
+"Eko alanýnda kullanýlabilecek komutlar:\n"
+"\n"
+
+#: info/infodoc.c:347
+#, c-format
+msgid ""
+"The following commands can only be invoked via %s:\n"
+"\n"
+msgstr ""
+"Aþaðýdaki komutlar yalnýzca %s aracýlýðýyla çaðrýlabilirler:\n"
+"\n"
+
+#: info/infodoc.c:351
+msgid ""
+"The following commands cannot be invoked at all:\n"
+"\n"
+msgstr "  tümü\n"
+
+#: info/infodoc.c:375
+msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
+msgstr ""
+"--- Çýkmak için `\\[geçmiþ-düðüm]' ya da `\\[kaldýrýlan-düðüm]' kullanýn "
+"---\n"
+
+#: info/infodoc.c:485
+msgid "Display help message"
+msgstr "Bu yardým iletisini gösterir"
+
+#: info/infodoc.c:503
+msgid "Visit Info node `(info)Help'"
+msgstr "Info düðümünü `(info)Help' ziyaret eder"
+
+#: info/infodoc.c:641
+msgid "Print documentation for KEY"
+msgstr "KEY ile ilgili belgeleri basar"
+
+#: info/infodoc.c:653
+#, c-format
+msgid "Describe key: %s"
+msgstr "Tuþ açýklamasý: %s"
+
+#: info/infodoc.c:664
+#, c-format
+msgid "ESC %s is undefined."
+msgstr "ESC %s atanmamýþ."
+
+#: info/infodoc.c:680 info/infodoc.c:709
+#, c-format
+msgid "%s is undefined."
+msgstr "%s atanmamýþ."
+
+#: info/infodoc.c:730
+#, c-format
+msgid "%s is defined to %s."
+msgstr "%s %s olarak atanmýþ."
+
+#: info/infodoc.c:1153
+msgid "Show what to type to execute a given command"
+msgstr "Verilen komutu çalýþtýracak türü gösterir"
+
+#: info/infodoc.c:1157
+msgid "Where is command: "
+msgstr "Komutun yeri: "
+
+#: info/infodoc.c:1179
+#, c-format
+msgid "`%s' is not on any keys"
+msgstr "`%s' bir tuþ üzerinde deðil"
+
+#: info/infodoc.c:1186
+#, c-format
+msgid "%s can only be invoked via %s."
+msgstr "%s sadece %s üzerinden çaðrýlabilir."
+
+#: info/infodoc.c:1190
+#, c-format
+msgid "%s can be invoked via %s."
+msgstr "%s, %s üzerinden çaðrýlabilir."
+
+#: info/infodoc.c:1195
+#, c-format
+msgid "There is no function named `%s'"
+msgstr "`%s' isimli bir iþlev yok"
+
+#: info/infokey.c:145
+#, 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 ""
+"Kopyahakký (C) %s Free Software Foundation, Inc.\n"
+"Garanti yoktur. Bu yazýlýmý GNU Genel Kamu Lisansý koþullarý\n"
+"altýnda daðýtabilirsiniz. Bu konuda daha fazla bilgi için\n"
+"COPYING isimli dosyaya bakýn.\n"
+
+#: info/infokey.c:170
+msgid "incorrect number of arguments"
+msgstr "argüman sayýsý yanlýþ"
+
+#: info/infokey.c:201
+#, c-format
+msgid "cannot open input file `%s'"
+msgstr "`%s' girdi dosyasý açýlamýyor"
+
+#: info/infokey.c:215
+#, c-format
+msgid "cannot create output file `%s'"
+msgstr "`%s' çýktý dosyasý oluþturulamýyor"
+
+#: info/infokey.c:226
+#, c-format
+msgid "error writing to `%s'"
+msgstr "`%s''e yazma hatasý"
+
+#: info/infokey.c:232
+#, c-format
+msgid "error closing output file `%s'"
+msgstr "`%s' çýktý dosyasýný kapatmada hata"
+
+#: info/infokey.c:450
+msgid "key sequence too long"
+msgstr "anahtar sýralamasý çok uzun"
+
+#: info/infokey.c:529
+msgid "missing key sequence"
+msgstr "anahtar sýralamasý kayýp"
+
+#: info/infokey.c:610
+msgid "NUL character (\\000) not permitted"
+msgstr "NUL karakterine (\\000) izin verilmiyor"
+
+#: info/infokey.c:641
+#, c-format
+msgid "NUL character (^%c) not permitted"
+msgstr "NUL karakterine (^%c) izin verilmiyor"
+
+#: info/infokey.c:665
+msgid "missing action name"
+msgstr "kayýp eylem adý"
+
+#: info/infokey.c:681 info/infokey.c:756
+msgid "section too long"
+msgstr "bölüm çok uzun"
+
+#: info/infokey.c:688
+#, c-format
+msgid "unknown action `%s'"
+msgstr "bilinmeyen eylem `%s'"
+
+#: info/infokey.c:698
+msgid "action name too long"
+msgstr "eylem adý çok uzun"
+
+#: info/infokey.c:712
+#, c-format
+msgid "extra characters following action `%s'"
+msgstr "`%s' eylemini izleyen fazladan karakterler"
+
+#: info/infokey.c:723
+msgid "missing variable name"
+msgstr "kayýp deðiþken adý"
+
+#: info/infokey.c:733
+msgid "missing `=' immediately after variable name"
+msgstr "deðiþken adýndan hemen sonra kayýp `=' "
+
+#: info/infokey.c:741
+msgid "variable name too long"
+msgstr "deðiþken adý çok uzun"
+
+#: info/infokey.c:765
+msgid "value too long"
+msgstr "deðer çok uzun"
+
+#: info/infokey.c:890
+#, c-format
+msgid "\"%s\", line %u: "
+msgstr "\"%s\", satýr %u: "
+
+#: info/infokey.c:906
+#, c-format
+msgid ""
+"Usage: %s [OPTION]... [INPUT-FILE]\n"
+"\n"
+"Compile infokey source file to infokey file.  Reads INPUT-FILE (default\n"
+"$HOME/.infokey) and writes compiled key file to (by default) $HOME/.info.\n"
+"\n"
+"Options:\n"
+"  --output FILE        output to FILE instead of $HOME/.info\n"
+"  --help               display this help and exit.\n"
+"  --version            display version information and exit.\n"
+msgstr ""
+"Kullaným: %s [SEÇENEK]... [GÝRDÝ-DOSYASI]\n"
+"\n"
+"infokey kaynak dosyasýný infokey dosyasýna derler.  GÝRDÝ-DOSYASI'ný\n"
+"okur (öntanýmlý $HOME/.infokey) ve derlenmiþ dosyayý $HOME/.info \n"
+"dosyasýna (öntanýmlý) yazar\n"
+"\n"
+"Seçenekler:\n"
+"  --output DOSYA        çýktý, $HOME/.info yerine DOSYA'ya\n"
+"  --help                bu yardýmý gösterir ve çýkar\n"
+"  --version             sürüm bilgisini gösterir ve çýkar.\n"
+
+#: info/infomap.c:1500
+#, c-format
+msgid "Ignoring invalid infokey file `%s' - too small"
+msgstr "Geçersiz infokey dosyasý `%s' yoksayýlýyor - çok küçük"
+
+#: info/infomap.c:1503
+#, c-format
+msgid "Ignoring invalid infokey file `%s' - too big"
+msgstr "Geçersiz infokey dosyasý `%s' yoksayýlýyor - çok büyük"
+
+#: info/infomap.c:1516
+#, c-format
+msgid "Error reading infokey file `%s' - short read"
+msgstr "infokey dosyasý `%s' okumada hata - çok kýsa"
+
+#: info/infomap.c:1535
+#, c-format
+msgid ""
+"Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
+msgstr ""
+"Geçersiz infokey dosyasý `%s' (hatalý sihirli numaralar) -- güncellemek için "
+"infokey yürütün"
+
+#: info/infomap.c:1544
+#, c-format
+msgid "Your infokey file `%s' is out of date -- run infokey to update it"
+msgstr "infokey dosyanýz `%s' eskimiþ -- güncellemek için infokey yürütün"
+
+#: info/infomap.c:1560
+#, c-format
+msgid ""
+"Invalid infokey file `%s' (bad section length) -- run infokey to update it"
+msgstr ""
+"Geçersiz infokey dosyasý `%s' (hatalý bölüm uzunluðu) -- güncellemek için "
+"infokey yürütün"
+
+#: info/infomap.c:1581
+#, c-format
+msgid ""
+"Invalid infokey file `%s' (bad section code) -- run infokey to update it"
+msgstr ""
+"Geçersiz infokey dosyasý `%s' (hatalý bölüm kodu) -- güncellemek için "
+"infokey yürütün"
+
+#: info/infomap.c:1716
+msgid "Bad data in infokey file -- some key bindings ignored"
+msgstr "Infokey dosyasýnda hatalý veri -- bazý tuþ baðlantýlarý yoksayýldý"
+
+#: info/infomap.c:1766
+msgid "Bad data in infokey file -- some var settings ignored"
+msgstr "Infokey dosyasýnda hatalý veri -- bazý deðiþken ayarlarý yoksayýldý"
+
+#: info/m-x.c:69
+msgid "Read the name of an Info command and describe it"
+msgstr "Bir Info komut ismini okur ve onu açýklar"
+
+#: info/m-x.c:73
+msgid "Describe command: "
+msgstr "Komut açýklamasý: "
+
+#: info/m-x.c:96
+msgid "Read a command name in the echo area and execute it"
+msgstr "Eko alanýndan komut ismini okur ve onu çalýþtýrýr"
+
+#: info/m-x.c:140
+msgid "Cannot execute an `echo-area' command here."
+msgstr "Bir `eko-alaný' komutu burada çalýþtýrýlamaz."
+
+#: info/m-x.c:154
+#, c-format
+msgid "Undefined command: %s"
+msgstr "tanýmlanmamýþ komut: %s"
+
+#: info/m-x.c:160
+msgid "Set the height of the displayed window"
+msgstr "Gösterilen pencerenin yüksekliði belirtilir"
+
+#: info/m-x.c:173
+#, c-format
+msgid "Set screen height to (%d): "
+msgstr "Ekran yüksekliðini (%d) ye ayarlar: "
+
+#: info/makedoc.c:162 info/makedoc.c:170
+#, c-format
+msgid ""
+"   Source files groveled to make this file include:\n"
+"\n"
+msgstr ""
+"   Bu dosyanýn içermesini saðlamak için peþi sýra sürüklenen kaynak "
+"dosyalar:\n"
+"\n"
+
+#: info/makedoc.c:550
+#, c-format
+msgid "Couldn't manipulate the file %s.\n"
+msgstr "%s dosyasý manipüle edilemedi.\n"
+
+#: info/nodemenu.c:31
+msgid ""
+"\n"
+"* Menu:\n"
+"  (File)Node                        Lines   Size   Containing File\n"
+"  ----------                        -----   ----   ---------------"
+msgstr ""
+"\n"
+"* Menü:\n"
+"  (Dosya)Düðüm                     Satýr   Boyut   Ýçerdiði Dosya\n"
+"  ------------                     -----   -----   --------------"
+
+#: info/nodemenu.c:202
+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 ""
+"Son zamanlarda uðradýðýnýz düðüm menüsünü görmektesiniz.\n"
+"Ya bu menüden seçin, ya da baþka bir pencerede `\\[history-node]' kullanýn.\n"
+
+#: info/nodemenu.c:224
+msgid "Make a window containing a menu of all of the currently visited nodes"
+msgstr ""
+"Son zamanlarda uðradýðýnýz tüm düðümlerin menüsünü içeren bir pencere "
+"oluþturur"
+
+#: info/nodemenu.c:304
+msgid "Select a node which has been previously visited in a visible window"
+msgstr "Daha önce, görünür bir pencereden uðradýðýnýz bir düðüm seçiniz"
+
+#: info/nodemenu.c:317
+msgid "Select visited node: "
+msgstr "Uðramýþ olduðunuz düðümü seçiniz: "
+
+#: info/nodemenu.c:337 info/session.c:2264
+#, c-format
+msgid "The reference disappeared! (%s)."
+msgstr "Referans yokoldu! (%s)."
+
+#: info/session.c:162
+#, c-format
+msgid ""
+"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
+"for menu item."
+msgstr ""
+"Info sürüm %s'e hoþgeldiniz. Yardým için \\[get-help-window], menü öðesi "
+"için \\[menu-item] yazýnýz."
+
+#: info/session.c:620
+msgid "Move down to the next line"
+msgstr "Sonraki satýra (aþaðý) gider"
+
+#: info/session.c:635
+msgid "Move up to the previous line"
+msgstr "Önceki satýra (yukarý) gider"
+
+#: info/session.c:650
+msgid "Move to the end of the line"
+msgstr "Satýr sonuna gider"
+
+#: info/session.c:670
+msgid "Move to the start of the line"
+msgstr "Satýr baþýna gider"
+
+#: info/session.c:860 makeinfo/node.c:1424
+msgid "Next"
+msgstr "Sonraki"
+
+#: info/session.c:863
+msgid "Following Next node..."
+msgstr "Sonraki düðümü izliyor..."
+
+#: info/session.c:881
+msgid "Selecting first menu item..."
+msgstr "Ýlk menü öðesi seçiliyor..."
+
+#: info/session.c:893
+msgid "Selecting Next node..."
+msgstr "Sonraki düðüm seçiliyor..."
+
+#: info/session.c:964
+#, c-format
+msgid "Moving Up %d time(s), then Next."
+msgstr "%d kez Yukarý gidip, Sonrakine geçiliyor."
+
+#: info/session.c:988
+msgid "No more nodes within this document."
+msgstr "Bu belge içinde baþka düðüm yok."
+
+#: info/session.c:1011
+msgid "No `Prev' for this node."
+msgstr "Bu düðüm için baþka `Önceki' yok."
+
+#: info/session.c:1014 info/session.c:1073
+msgid "Moving Prev in this window."
+msgstr "Bu pencerede Öncekine gidiliyor."
+
+#: info/session.c:1030
+msgid "No `Prev' or `Up' for this node within this document."
+msgstr "Bu belge içinde, bu düðüm için `Önceki' ya da `Yukarý' yok."
+
+#: info/session.c:1034
+msgid "Moving Up in this window."
+msgstr "Bu pencere içinde Yukarýya gidiliyor."
+
+#: info/session.c:1084
+msgid "Moving to `Prev's last menu item."
+msgstr "`Önceki'nin son menü öðesine gidiliyor."
+
+#: info/session.c:1095
+msgid "Move forwards or down through node structure"
+msgstr "Düðüm yapýsý içinde ileriye ya da aþaðýya gider"
+
+#: info/session.c:1111
+msgid "Move backwards or up through node structure"
+msgstr "Düðüm yapýsý içinde geriye ya da yukarýya gider"
+
+#: info/session.c:1205
+msgid "Scroll forward in this window"
+msgstr "Bu pencerede ileriye doðru kaydýrýr"
+
+#: info/session.c:1213
+msgid "Scroll forward in this window and set default window size"
+msgstr ""
+"Bu pencerede ileriye doðru kaydýrýr ve öntanýmlý pencere boyutuna ayarlar"
+
+#: info/session.c:1221
+msgid "Scroll forward in this window staying within node"
+msgstr "Bu pencerede, düðüm içinde kalarak ileriye doðru kaydýrýr"
+
+#: info/session.c:1229
+msgid ""
+"Scroll forward in this window staying within node and set default window size"
+msgstr ""
+"Bu pencerede, düðüm içinde kalarak ileriye doðru kaydýrýr ve öntanýmlý "
+"pencere boyutunu ayarlar"
+
+#: info/session.c:1237
+msgid "Scroll backward in this window"
+msgstr "Bu pencerede geriye doðru kaydýrýr"
+
+#: info/session.c:1245
+msgid "Scroll backward in this window and set default window size"
+msgstr ""
+"Bu pencerede geriye doðru kaydýrýr ve öntanýmlý pencere boyutunu ayarlar"
+
+#: info/session.c:1254
+msgid "Scroll backward in this window staying within node"
+msgstr "Bu pencerede, düðüm içinde kalarak geriye doðru kaydýrýr"
+
+#: info/session.c:1262
+msgid ""
+"Scroll backward in this window staying within node and set default window "
+"size"
+msgstr "geri ve set öntanýmlý"
+
+#: info/session.c:1270
+msgid "Move to the start of this node"
+msgstr "Bu düðümün baþlangýcýna gider"
+
+#: info/session.c:1277
+msgid "Move to the end of this node"
+msgstr "Bu düðümün sonuna gider"
+
+#: info/session.c:1284
+msgid "Scroll down by lines"
+msgstr "Aþaðýya doðru satýr kaydýrýr"
+
+#: info/session.c:1301
+msgid "Scroll up by lines"
+msgstr "Yukarýya doðru satýr kaydýrýr"
+
+#: info/session.c:1319
+msgid "Scroll down by half screen size"
+msgstr "Aþaðýya doðru yarým ekran boyutu kaydýrýr"
+
+#: info/session.c:1345
+msgid "Scroll up by half screen size"
+msgstr "Yukarýya doðru yarým ekran boyutu kaydýrýr"
+
+#: info/session.c:1374
+msgid "Select the next window"
+msgstr "Sonraki pencereyi seçer"
+
+#: info/session.c:1413
+msgid "Select the previous window"
+msgstr "Önceki pencereyi seçer"
+
+#: info/session.c:1464
+msgid "Split the current window"
+msgstr "Mevcut pencereyi böler"
+
+#: info/session.c:1545
+msgid "Delete the current window"
+msgstr "Mevcut pencereyi siler"
+
+#: info/session.c:1553
+msgid "Cannot delete a permanent window"
+msgstr "Kalýcý bir pencere silinemez"
+
+#: info/session.c:1585
+msgid "Delete all other windows"
+msgstr "Diðer tüm pencereleri siler"
+
+#: info/session.c:1631
+msgid "Scroll the other window"
+msgstr "Diðer pencereyi kaydýrýr"
+
+#: info/session.c:1652
+msgid "Scroll the other window backward"
+msgstr "Diðer pencereyi geriye doðru kaydýrýr"
+
+#: info/session.c:1658
+msgid "Grow (or shrink) this window"
+msgstr "Bu pencereyi büyütür (ya da küçültür)"
+
+#: info/session.c:1669
+msgid "Divide the available screen space among the visible windows"
+msgstr "Mevcut ekran boþluðunu görünür pencereler arasýnda bölüþtürür"
+
+#: info/session.c:1676
+msgid "Toggle the state of line wrapping in the current window"
+msgstr "Mevcut penceredeki satýr sarma durumunu deðiþtirir"
+
+#: info/session.c:1848
+msgid "Select the Next node"
+msgstr "Sonraki düðümü seçer"
+
+#: info/session.c:1856
+msgid "Select the Prev node"
+msgstr "Önceki düðümü seçer"
+
+#: info/session.c:1864
+msgid "Select the Up node"
+msgstr "Üstteki düðümü seçer"
+
+#: info/session.c:1871
+msgid "Select the last node in this file"
+msgstr "Bu dosyadaki son düðümü seçer"
+
+#: info/session.c:1898 info/session.c:1931
+msgid "This window has no additional nodes"
+msgstr "Bu pencerenin baþka düðümü yok"
+
+#: info/session.c:1904
+msgid "Select the first node in this file"
+msgstr "Bu dosyadaki ilk düðümü seçer"
+
+#: info/session.c:1938
+msgid "Select the last item in this node's menu"
+msgstr "Bu düðümün menüsündeki son öðeyi seçer"
+
+#: info/session.c:1944
+msgid "Select this menu item"
+msgstr "Bu menü öðesini seçer"
+
+#: info/session.c:1977
+#, c-format
+msgid "There aren't %d items in this menu."
+msgstr "Bu menüde %d adet öðe yok."
+
+#: info/session.c:2171 info/session.c:2172
+#, c-format
+msgid "Menu item (%s): "
+msgstr "Menü öðesi (%s): "
+
+#: info/session.c:2175
+msgid "Menu item: "
+msgstr "Menü öðesi: "
+
+#: info/session.c:2182 info/session.c:2183
+#, c-format
+msgid "Follow xref (%s): "
+msgstr "Ýzlenecek xref (%s): "
+
+#: info/session.c:2186
+msgid "Follow xref: "
+msgstr "Ýzlenecek xref: "
+
+#: info/session.c:2315
+msgid "Read a menu item and select its node"
+msgstr "Bir menü öðesini okur ve düðümünü seçer"
+
+#: info/session.c:2323
+msgid "Read a footnote or cross reference and select its node"
+msgstr "Oku yada ve select"
+
+#: info/session.c:2329
+msgid "Move to the start of this node's menu"
+msgstr "Bu düðüm menüsünün baþlangýcýna gider"
+
+#: info/session.c:2353
+msgid "Visit as many menu items at once as possible"
+msgstr "Tek seferde mümkün olan en fazla sayýda menü öðesine uðrar"
+
+#: info/session.c:2381
+msgid "Read a node name and select it"
+msgstr "Bir düðüm adý okur ve seçer"
+
+#: info/session.c:2436 info/session.c:2441
+msgid "Goto node: "
+msgstr "Düðüme gider: "
+
+#: info/session.c:2505
+#, c-format
+msgid "No menu in node `%s'."
+msgstr "Menüsü olmayan düðüm `%s'."
+
+#: info/session.c:2551
+#, c-format
+msgid "No menu item `%s' in node `%s'."
+msgstr "`%2$s' düðümünde `%1$s' menü öðesi yok."
+
+#: info/session.c:2581
+#, c-format
+msgid "Unable to find node referenced by `%s' in `%s'."
+msgstr "`%2$s''de `%1$s' tarafýndan baþvurulan düðüm bulunamadý."
+
+#: info/session.c:2631
+msgid "Read a list of menus starting from dir and follow them"
+msgstr "Dizinden baþlayarak bir menü listesini oku ve izle"
+
+#: info/session.c:2633
+msgid "Follow menus: "
+msgstr "Menüleri izle: "
+
+#: info/session.c:2826
+msgid "Find the node describing program invocation"
+msgstr "Program çaðýrmayý açýklayan düðümü bulur"
+
+#: info/session.c:2828
+#, c-format
+msgid "Find Invocation node of [%s]: "
+msgstr "[%s]'in çaðýrma düðümünü bulur: "
+
+#: info/session.c:2866
+msgid "Read a manpage reference and select it"
+msgstr "Bir klavuz sayfasý baþvurusunu okur ve seçer"
+
+#: info/session.c:2870
+msgid "Get Manpage: "
+msgstr "Alýnacak klavuz sayfasý: "
+
+#: info/session.c:2900
+msgid "Select the node `Top' in this file"
+msgstr "Bu dosyadaki `En Üst' düðümü seç"
+
+#: info/session.c:2906
+msgid "Select the node `(dir)'"
+msgstr "`(dizin)' düðümünü seç"
+
+#: info/session.c:2923 info/session.c:2925
+#, c-format
+msgid "Kill node (%s): "
+msgstr "Düðümü öldür (%s): "
+
+#: info/session.c:2977
+#, c-format
+msgid "Cannot kill node `%s'"
+msgstr "Öldürülemeyen düðüm `%s' "
+
+#: info/session.c:2987
+msgid "Cannot kill the last node"
+msgstr "Son düðüm öldürülemiyor"
+
+#: info/session.c:3073
+msgid "Select the most recently selected node"
+msgstr "En son seçilen düðümü seçer"
+
+#: info/session.c:3079
+msgid "Kill this node"
+msgstr "Bu düðümü öldürür"
+
+#: info/session.c:3087
+msgid "Read the name of a file and select it"
+msgstr "Bir dosyanýn adýný okur ve seçer"
+
+#: info/session.c:3091
+msgid "Find file: "
+msgstr "Dosyayý bul: "
+
+#: info/session.c:3108
+#, c-format
+msgid "Cannot find `%s'."
+msgstr "`%s' bulunamýyor."
+
+#: info/session.c:3151 info/session.c:3269
+#, c-format
+msgid "Could not create output file `%s'."
+msgstr "Çýktý dosyasý `%s' oluþturulamýyor."
+
+#: info/session.c:3165 info/session.c:3287 info/session.c:3347
+msgid "Done."
+msgstr "Bitti."
+
+#: info/session.c:3220
+#, c-format
+msgid "Writing node %s..."
+msgstr "%s düðümü yazýlýyor..."
+
+#: info/session.c:3296
+msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
+msgstr "Bu düðümün içeriðini INFO_PRINT_COMMAND üzerinden veri yolla"
+
+#: info/session.c:3331
+#, c-format
+msgid "Cannot open pipe to `%s'."
+msgstr "Veri yolu `%s''e açýlamýyor."
+
+#: info/session.c:3337
+#, c-format
+msgid "Printing node %s..."
+msgstr "%s düðümü yazdýrýlýyor..."
+
+#: info/session.c:3567
+#, c-format
+msgid "Searching subfile %s ..."
+msgstr "%s altdosyasý aranýyor ..."
+
+#: info/session.c:3619
+msgid "Read a string and search for it case-sensitively"
+msgstr "Bir dizge okur ve onu büyük/küçük harf duyarlý þekilde arar"
+
+#: info/session.c:3626
+msgid "Read a string and search for it"
+msgstr "Bir dizge okur ve (onu) arar"
+
+#: info/session.c:3634
+msgid "Read a string and search backward for it"
+msgstr "Bir dizge okur ve (onu) geriye doðru arar"
+
+#: info/session.c:3670 info/session.c:3677
+#, c-format
+msgid "%s%sfor string [%s]: "
+msgstr "%s%s için dizge [%s]: "
+
+#: info/session.c:3671 info/session.c:3678
+msgid "Search backward"
+msgstr "Geriye doðru ara"
+
+#: info/session.c:3672 info/session.c:3678
+msgid "Search"
+msgstr "Ara"
+
+#: info/session.c:3673 info/session.c:3679
+msgid " case-sensitively "
+msgstr " büyük/küçük harf duyarlý þekilde "
+
+#: info/session.c:3674 info/session.c:3679
+msgid " "
+msgstr " "
+
+#: info/session.c:3718
+msgid "Search failed."
+msgstr "Arama baþarýsýz"
+
+#: info/session.c:3736
+msgid "Repeat last search in the same direction"
+msgstr "Son aramayý ayný yönde yineler"
+
+#: info/session.c:3739 info/session.c:3749
+msgid "No previous search string"
+msgstr "Daha önceden arama dizgesi yok"
+
+#: info/session.c:3746
+msgid "Repeat last search in the reverse direction"
+msgstr "Son aramayý ters yönde yineler"
+
+#: info/session.c:3765 info/session.c:3771
+msgid "Search interactively for a string as you type it"
+msgstr "Bir dizgeyi siz yazarken etkileþimli þekilde arar"
+
+#: info/session.c:3851
+msgid "I-search backward: "
+msgstr "I-arama, geriye doðru: "
+
+#: info/session.c:3853
+msgid "I-search: "
+msgstr "I-arama: "
+
+#: info/session.c:3878 info/session.c:3880
+msgid "Failing "
+msgstr "Baþarýlamýyor "
+
+#: info/session.c:4340
+msgid "Move to the previous cross reference"
+msgstr "Önceki çapraz baþvuruya gider"
+
+#: info/session.c:4349
+msgid "Move to the next cross reference"
+msgstr "Sonraki çapraz baþvuruya gider"
+
+#: info/session.c:4359
+msgid "Select reference or menu item appearing on this line"
+msgstr "Bu satýrdaki referans ya da menü öðesini seçer"
+
+#: info/session.c:4382
+msgid "Cancel current operation"
+msgstr "Mevcut iþlemi iptal eder"
+
+#: info/session.c:4389
+msgid "Quit"
+msgstr "Çýk"
+
+#: info/session.c:4398
+msgid "Move the cursor to a specific line of the window"
+msgstr "Ýmleci pencerenin belirli bir satýrýna taþýr"
+
+#: info/session.c:4430
+msgid "Redraw the display"
+msgstr "Görüntüyü yeniden çizer"
+
+#: info/session.c:4467
+msgid "Quit using Info"
+msgstr "Info'dan çýkar"
+
+#: info/session.c:4480
+msgid "Run command bound to this key's lowercase variant"
+msgstr "Bu tuþun küçük harfine atanmýþ komutu yürütür"
+
+#: info/session.c:4491
+#, c-format
+msgid "Unknown command (%s)."
+msgstr "Bilinmeyen komut (%s)."
+
+#: info/session.c:4494
+#, c-format
+msgid "\"%s\" is invalid"
+msgstr "\"%s\" geçersiz"
+
+#: info/session.c:4495
+#, c-format
+msgid "`%s' is invalid"
+msgstr "`%s' geçersiz"
+
+#: info/session.c:4709
+msgid "Add this digit to the current numeric argument"
+msgstr "Mevcut sayýsal argümana bu sayýyý ekle"
+
+#: info/session.c:4718
+msgid "Start (or multiply by 4) the current numeric argument"
+msgstr "Mevcut sayýsal argümaný baþlat (ya da 4'le çarp)"
+
+#: info/session.c:4733
+msgid "Internally used by \\[universal-argument]"
+msgstr "Dahili olarak \\[universal argument] tarafýndan kullanýlýyor"
+
+#: info/tilde.c:338
+#, c-format
+msgid "readline: Out of virtual memory!\n"
+msgstr "okuma-satýrý: Sanal bellek tükendi!\n"
+
+#: info/variables.c:37
+msgid "When \"On\", footnotes appear and disappear automatically"
+msgstr "\"Açýk\" olduðunda, dipnotlar otomatik olarak görünür ve kaybolur"
+
+#: info/variables.c:41
+msgid "When \"On\", creating or deleting a window resizes other windows"
+msgstr ""
+"\"Açýk\" olduðunda, bir pencereyi oluþturma ya da silme, diðerlerini yeniden "
+"boyutlandýrýr"
+
+#: info/variables.c:45
+msgid "When \"On\", flash the screen instead of ringing the bell"
+msgstr "\"Açýk\" olduðunda, zil çalýnacaðýna ekran yanýp söner"
+
+#: info/variables.c:49
+msgid "When \"On\", errors cause the bell to ring"
+msgstr "\"Açýk\" olduðunda, hatalar zilin çalmasýna neden olur"
+
+#: info/variables.c:53
+msgid "When \"On\", Info garbage collects files which had to be uncompressed"
+msgstr ""
+"\"Açýk\" olduðunda Info çöpü, sýkýþtýrmasý açýlmak zorunda olan dosyalarý "
+"biriktirir"
+
+#: info/variables.c:56
+msgid "When \"On\", the portion of the matched search string is highlighted"
+msgstr "\"Açýk\" olduðunda, arama dizgesinin eþleþen kýsmý ýþýklandýrýlýr"
+
+#: info/variables.c:60
+msgid "Controls what happens when scrolling is requested at the end of a node"
+msgstr "Bir düðüm sonunda kaydýrma istendiðinde ne olacaðýný kontrol eder"
+
+#: info/variables.c:64
+msgid "The number lines to scroll when the cursor moves out of the window"
+msgstr "Ýmleç penceere dýþýna taþýndýðýnda kaydýrýlacak satýr sayýsý"
+
+#: info/variables.c:68
+msgid "When \"On\", Info accepts and displays ISO Latin characters"
+msgstr ""
+"\"Açýk\" olduðunda Info, ISO Latin karakterleri kabul eder ve görüntüler"
+
+#: info/variables.c:74
+msgid "Explain the use of a variable"
+msgstr "Bir deðiþkenin kullanýmýný açýklar"
+
+#: info/variables.c:80
+msgid "Describe variable: "
+msgstr "Açýklanacak deðiþken: "
+
+#: info/variables.c:99
+msgid "Set the value of an Info variable"
+msgstr "Bir Info deðiþkeninin deðerini belirler"
+
+#: info/variables.c:105
+msgid "Set variable: "
+msgstr "Deðiþkeni ata: "
+
+#: info/variables.c:123
+#, c-format
+msgid "Set %s to value (%d): "
+msgstr "%s'e atanacak deðer (%d): "
+
+#: info/variables.c:164
+#, c-format
+msgid "Set %s to value (%s): "
+msgstr "%s'e atanacak deðer (%s): "
+
+#: info/window.c:1138
+msgid "--*** Tags out of Date ***"
+msgstr "..*** Eskimiþ Etiketler ***"
+
+#: info/window.c:1149
+msgid "-----Info: (), lines ----, "
+msgstr "-----Info: (), satýr ----, "
+
+#: info/window.c:1156
+#, c-format
+msgid "-%s---Info: %s, %d lines --%s--"
+msgstr "-%s---Info: %s, %d satýr --%s--"
+
+#: info/window.c:1160
+#, c-format
+msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
+msgstr "-%s%s-Info: (%s)%s, %d satýr --%s--"
+
+#: info/window.c:1167
+#, c-format
+msgid " Subfile: %s"
+msgstr " Altdosya: %s"
+
+#: lib/getopt.c:551 lib/getopt.c:570
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: `%s' seçeneði belirsiz\n"
+
+#: lib/getopt.c:603 lib/getopt.c:607
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: `--%s' seçeneði argümansýz kullanýlýr\n"
+
+#: lib/getopt.c:616 lib/getopt.c:621
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: `%c%s' seçeneði argümansýz kullanýlýr\n"
+
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: `%s' seçeneði bir argümanla kullanýlýr\n"
+
+#: lib/getopt.c:727 lib/getopt.c:730
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: `--%s' seçeneði bilinmiyor\n"
+
+#: lib/getopt.c:738 lib/getopt.c:741
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: `%c%s' seçeneði bilinmiyor\n"
+
+#: lib/getopt.c:796 lib/getopt.c:799
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: kuraldýþý seçenek -- %c\n"
+
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: geçersiz seçenek -- %c\n"
+
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: seçenek bir argümanla kullanýlýr -- %c\n"
+
+#: lib/getopt.c:935 lib/getopt.c:954
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: `-W %s' seçeneði belirsiz\n"
+
+#: lib/getopt.c:978 lib/getopt.c:999
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: `-W %s' seçeneði argümansýz kullanýlýr\n"
+
+#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#, c-format
+msgid "arguments to @%s ignored"
+msgstr "@%s'ye argümanlar yok sayýldý"
+
+#: makeinfo/cmds.c:585
+msgid "January"
+msgstr "Ocak"
+
+#: makeinfo/cmds.c:585
+msgid "February"
+msgstr "Þubat"
+
+#: makeinfo/cmds.c:585
+msgid "March"
+msgstr "Mart"
+
+#: makeinfo/cmds.c:585
+msgid "April"
+msgstr "Nisan"
+
+#: makeinfo/cmds.c:585
+msgid "May"
+msgstr "Mayýs"
+
+#: makeinfo/cmds.c:586
+msgid "June"
+msgstr "Haziran"
+
+#: makeinfo/cmds.c:586
+msgid "July"
+msgstr "Temmuz"
+
+#: makeinfo/cmds.c:586
+msgid "August"
+msgstr "Aðustos"
+
+#: makeinfo/cmds.c:586
+msgid "September"
+msgstr "Eylül"
+
+#: makeinfo/cmds.c:586
+msgid "October"
+msgstr "Ekim"
+
+#: makeinfo/cmds.c:587
+msgid "November"
+msgstr "Kasým"
+
+#: makeinfo/cmds.c:587
+msgid "December"
+msgstr "Aralýk"
+
+#: makeinfo/cmds.c:936
+#, c-format
+msgid "unlikely character %c in @var"
+msgstr "@var içinde düþük olasýlýklý karakter %c"
+
+#: makeinfo/cmds.c:979
+msgid "@sc argument all uppercase, thus no effect"
+msgstr "@sc argümaný tamamen büyükharf(le yazýlmýþ), etkisiz"
+
+#: makeinfo/cmds.c:1034
+#, c-format
+msgid "`{' expected, but saw `%c'"
+msgstr "`{' beklenirdi, `%c' görüldü"
+
+#: makeinfo/cmds.c:1074
+msgid "end of file inside verb block"
+msgstr "fiil bloðu içinde dosya sonu"
+
+#: makeinfo/cmds.c:1082
+#, c-format
+msgid "`}' expected, but saw `%c'"
+msgstr "`}' beklenirdi, `%c' görüldü"
+
+#: makeinfo/cmds.c:1112
+msgid ""
+"@strong{Note...} produces a spurious cross-reference in Info; reword to "
+"avoid that"
+msgstr ""
+"@strong{Not...} Info'da sahte bir çapraz-baþvuru oluþturur; bundan kaçýnmak "
+"için yazýmý deðiþtirin"
+
+#: makeinfo/cmds.c:1305
+#, c-format
+msgid "%c%s is obsolete"
+msgstr "%c%s kullanýmdan kalkmýþ"
+
+#: makeinfo/cmds.c:1414
+#, c-format
+msgid "@sp requires a positive numeric argument, not `%s'"
+msgstr "@sp pozitif bir sayýsal argüman gerektirir, `%s' deðil"
+
+#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
+#, c-format
+msgid "Bad argument to %c%s"
+msgstr "%c%s'ye hatalý argüman"
+
+#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
+msgid "asis"
+msgstr "asis"
+
+#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
+msgid "none"
+msgstr "yok"
+
+#: makeinfo/cmds.c:1789
+#, c-format
+msgid "Bad argument to @%s"
+msgstr "@%s'ye hatalý argüman"
+
+#: makeinfo/cmds.c:1803
+msgid "insert"
+msgstr "ekle"
+
+#: makeinfo/defun.c:84
+msgid "Missing `}' in @def arg"
+msgstr "@def arg'da kayýp `}'"
+
+#: makeinfo/defun.c:403
+msgid "Function"
+msgstr "Ýþlev"
+
+#: makeinfo/defun.c:406
+msgid "Macro"
+msgstr "Makro"
+
+#: makeinfo/defun.c:409
+msgid "Special Form"
+msgstr "Özel Form"
+
+#: makeinfo/defun.c:413
+msgid "Variable"
+msgstr "Deðiþken"
+
+#: makeinfo/defun.c:416
+msgid "User Option"
+msgstr "Kullanýcý Seçeneði"
+
+#: makeinfo/defun.c:420
+msgid "Instance Variable"
+msgstr "Durum Deðiþkeni"
+
+#: makeinfo/defun.c:424
+msgid "Method"
+msgstr "Yöntem"
+
+#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
+#: makeinfo/defun.c:644 makeinfo/xml.c:2229
+msgid "of"
+msgstr "kapalý"
+
+#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
+msgid "on"
+msgstr "açýk"
+
+#: makeinfo/defun.c:711
+#, c-format
+msgid "Must be in `@%s' environment to use `@%s'"
+msgstr "`@%s' kullanmak için `@%s' ortamý içinde ol(un)malýdýr"
+
+#: makeinfo/files.c:435
+#, c-format
+msgid "%s: getwd: %s, %s\n"
+msgstr "%s: getwd: %s, %s\n"
+
+#: makeinfo/files.c:638
+#, c-format
+msgid "`%s' omitted before output filename"
+msgstr "`%s' çýktý dosya adýndan önce yok sayýldý"
+
+#: makeinfo/files.c:646
+#, c-format
+msgid "`%s' omitted since writing to stdout"
+msgstr "stdout'a yazýlýyor olduðundan `%s' yok sayýldý"
+
+#: makeinfo/files.c:694
+msgid "Output buffer not empty."
+msgstr "Çýktý tamponu boþ deðil"
+
+#: makeinfo/footnote.c:150
+#, c-format
+msgid "`%c%s' needs an argument `{...}', not just `%s'"
+msgstr "`%c%s' bir argüman gereksinir `{   }', yalnýzca `%s' deðil"
+
+#: makeinfo/footnote.c:165
+#, c-format
+msgid "No closing brace for footnote `%s'"
+msgstr "Dipnot `%s' için kapama } yok"
+
+#: makeinfo/footnote.c:198
+msgid "Footnote defined without parent node"
+msgstr "Dipnot, ebeveyn düðümsüz tanýmlanmýþ"
+
+#: makeinfo/footnote.c:210
+msgid "Footnotes inside footnotes are not allowed"
+msgstr "Dipnot içi dipnotlara izin verilmez"
+
+#: makeinfo/footnote.c:302 makeinfo/index.c:189
+msgid "Footnotes"
+msgstr "Dipnotlar"
+
+#: makeinfo/html.c:87
+#, c-format
+msgid "%s: could not open --css-file: %s"
+msgstr "%s: açýlamayan --css-dosyasý: %s"
+
+#: makeinfo/html.c:172
+#, c-format
+msgid "%s:%d: --css-file ended in comment"
+msgstr "%s:%d: --css-dosyasý yorum içinde sonlandý"
+
+#: makeinfo/html.c:207
+msgid "Untitled"
+msgstr "Adsýz"
+
+#: makeinfo/html.c:422
+msgid "[unexpected] no html tag to pop"
+msgstr "hayýr :"
+
+#: makeinfo/html.c:752
+#, c-format
+msgid "[unexpected] invalid node name: `%s'"
+msgstr "[beklenmeyen] geçersiz düðüm ismi: `%s'"
+
+#: makeinfo/index.c:169
+#, c-format
+msgid "Unknown index `%s'"
+msgstr "Bilinmeyen indeks `%s'"
+
+#: makeinfo/index.c:234
+#, c-format
+msgid "Info cannot handle `:' in index entry `%s'"
+msgstr "Info, `%s' indeks girdisindeki `:''yi kullanamýyor"
+
+#: makeinfo/index.c:412
+#, c-format
+msgid "Index `%s' already exists"
+msgstr "Ýndeks `%s' zaten mevcut"
+
+#: makeinfo/index.c:455
+#, c-format
+msgid "Unknown index `%s' and/or `%s' in @synindex"
+msgstr "Bilinmeyen indeks `%1$s' ve/veya @synindex içinde `%2$s'"
+
+#: makeinfo/index.c:661
+msgid "(line )"
+msgstr "(satýr )"
+
+#: makeinfo/index.c:669
+#, c-format
+msgid "(line %*d)"
+msgstr "(satýr %*d)"
+
+#: makeinfo/index.c:750
+#, c-format
+msgid "Unknown index `%s' in @printindex"
+msgstr "@printindex içinde bilinmeyen indeks `%s'"
+
+#: makeinfo/index.c:819
+#, c-format
+msgid "Entry for index `%s' outside of any node"
+msgstr "`%s' indeks girdisi tüm düðümlerin dýþýnda"
+
+#: makeinfo/index.c:822 makeinfo/index.c:858
+msgid "(outside of any node)"
+msgstr "(tüm düðümlerin dýþýnda)"
+
+#: makeinfo/index.c:919 makeinfo/index.c:925
+msgid "See "
+msgstr "Bkz "
+
+#: makeinfo/insertion.c:160
+msgid "@item not allowed in argument to @itemize"
+msgstr "@item, @itemize'a argüman olarak kullanýlamaz"
+
+#: makeinfo/insertion.c:238
+msgid "Broken-Type in insertion_type_pname"
+msgstr "insertion_type_pname içinde Kýrýk-Tip"
+
+#: makeinfo/insertion.c:334
+msgid "Enumeration stack overflow"
+msgstr "Numaralandýrma yýðýn taþmasý"
+
+#: makeinfo/insertion.c:366
+#, c-format
+msgid "lettering overflow, restarting at %c"
+msgstr "harflendirme taþmasý, %c'den yeniden baþlanýyor"
+
+#: makeinfo/insertion.c:631
+#, c-format
+msgid "%s requires an argument: the formatter for %citem"
+msgstr "%s bir argüman gerektirir: %c öðesi için biçimlendirici"
+
+#: makeinfo/insertion.c:719
+#, c-format
+msgid "%cfloat environments cannot be nested"
+msgstr "%cfloat çevreler içiçelendirilemez"
+
+#: makeinfo/insertion.c:973
+#, c-format
+msgid "`@end' expected `%s', but saw `%s'"
+msgstr "`@end'  `%1$s' beklerdi, `%2$s' gördü"
+
+#: makeinfo/insertion.c:1337
+#, c-format
+msgid "No matching `%cend %s'"
+msgstr "Eþleþen `%cend %s' yok"
+
+#: makeinfo/insertion.c:1592
+#, c-format
+msgid "%s requires letter or digit"
+msgstr "%s harf ya da rakam gerektirir"
+
+#: makeinfo/insertion.c:1687
+msgid "end of file inside verbatim block"
+msgstr "verbatim bloðu içinde dosya sonu"
+
+#: makeinfo/insertion.c:1913
+#, c-format
+msgid "@%s not meaningful outside `@float' environment"
+msgstr "`@float' çevresi dýþýnda @%s anlamlý deðil"
+
+#: makeinfo/insertion.c:1949
+msgid "@menu seen before first @node, creating `Top' node"
+msgstr "önce Üst"
+
+#: makeinfo/insertion.c:1950
+msgid ""
+"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
+msgstr ""
+"belki de sizin @top düðümünüz, @ifinfo'dan ziyade @ifnottex içine "
+"sarýlmalýdýr?"
+
+#: makeinfo/insertion.c:1962
+msgid "@detailmenu seen before first node, creating `Top' node"
+msgstr "@detailmenu ilk düðümden önce görüldü, `En Üst' düðüm oluþturuluyor"
+
+#: makeinfo/insertion.c:2018
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr "`@titlepage' ve `@quotation' çevreleri dýþýnda @%s anlamlý deðil"
+
+#: makeinfo/insertion.c:2032
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' environment"
+msgstr "`@titlepage' çevresi dýþýnda @%s anlamlý deðil"
+
+#: makeinfo/insertion.c:2063
+#, c-format
+msgid "Unmatched `%c%s'"
+msgstr "Eþleþmeyen `%c%s'"
+
+#: makeinfo/insertion.c:2068
+#, c-format
+msgid "`%c%s' needs something after it"
+msgstr "`%c%s' sonrasýnda birþeyler gereklidir"
+
+#: makeinfo/insertion.c:2074
+#, c-format
+msgid "Bad argument `%s' to `@%s', using `%s'"
+msgstr "`%2$s''e hatalý argüman, `%1$s', `%3$s' kullanýlýyor"
+
+#: makeinfo/insertion.c:2171
+#, c-format
+msgid "@%s not meaningful inside `@%s' block"
+msgstr "`@%s' bloðu içinde @%s anlamlý deðil"
+
+#: makeinfo/insertion.c:2180
+#, c-format
+msgid "@itemx not meaningful inside `%s' block"
+msgstr "`%s' bloðunun içinde @itemx anlamlý deðil"
+
+#: makeinfo/insertion.c:2356
+#, c-format
+msgid "%c%s found outside of an insertion block"
+msgstr "%c%s, bir ekleme bloðunun dýþýnda bulundu"
+
+#: makeinfo/lang.c:580
+#, c-format
+msgid "%s is not a valid ISO 639 language code"
+msgstr "%s geçerli bir ISO 639 dil kodu deðildir"
+
+#: makeinfo/lang.c:655
+#, c-format
+msgid "unrecognized encoding name `%s'"
+msgstr "tanýnmayan kodlama adý `%s'"
+
+#: makeinfo/lang.c:663
+#, c-format
+msgid "sorry, encoding `%s' not supported"
+msgstr "üzgünüm, `%s' kodlamasý desteklenmiyor"
+
+#: makeinfo/lang.c:715
+#, c-format
+msgid "invalid encoded character `%s'"
+msgstr "geçersiz kodlanmýþ karakter `%s'"
+
+#: makeinfo/lang.c:1009
+#, c-format
+msgid "%c%s expects `i' or `j' as argument, not `%c'"
+msgstr "%c%s argüman olarak `i' ya da `j' gerektirir, %c deðil"
+
+#: makeinfo/lang.c:1013
+#, c-format
+msgid "%c%s expects a single character `i' or `j' as argument"
+msgstr "%c%s argüman olarak tek karakter, `i' ya da `j' gerektirir"
+
+#: makeinfo/macro.c:128
+#, c-format
+msgid "macro `%s' previously defined"
+msgstr "makro `%s' daha önce tanýmlanmýþ"
+
+#: makeinfo/macro.c:132
+#, c-format
+msgid "here is the previous definition of `%s'"
+msgstr "iþte `%s''nin önceki tanýmý"
+
+#: makeinfo/macro.c:355
+#, c-format
+msgid "\\ in macro expansion followed by `%s' instead of parameter name"
+msgstr "makro geniþlemesindeki \\'i, parametre adý yerine `%s' izliyor"
+
+#: makeinfo/macro.c:401
+#, c-format
+msgid "Macro `%s' called on line %d with too many args"
+msgstr "Makro `%s', %d satýrýnda çok sayýda arg.la çaðrýldý"
+
+#: makeinfo/macro.c:586
+#, c-format
+msgid "%cend macro not found"
+msgstr "%cson makrosu bulunamadý"
+
+#: makeinfo/macro.c:624
+msgid "@quote-arg only useful for single-argument macros"
+msgstr "@quote arg.ý yalnýzca tek argümanlý makrolarda yararlý"
+
+#: makeinfo/macro.c:660
+#, c-format
+msgid "mismatched @end %s with @%s"
+msgstr "@%s ile eþleþmeyen @end %s"
+
+#: makeinfo/makeinfo.c:184
+#, c-format
+msgid "Too many errors!  Gave up.\n"
+msgstr "Çok sayýda hata!  Vazgeçildi.\n"
+
+#: makeinfo/makeinfo.c:302
+#, c-format
+msgid "%s:%d: warning: "
+msgstr "%s:%d: uyarý: "
+
+#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
+#, c-format
+msgid "Misplaced %c"
+msgstr "Yanlýþ yerleþtirilmiþ %c"
+
+#: makeinfo/makeinfo.c:340
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "Daha fazla bilgi için `%s --help' yazýn.\n"
+
+#: makeinfo/makeinfo.c:343
+#, c-format
+msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
+msgstr "Kullaným: %s [SEÇENEK]... TEXINFO-DOSYASI...\n"
+
+#: makeinfo/makeinfo.c:346
+msgid ""
+"Translate Texinfo source documentation to various other formats, by default\n"
+"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
+msgstr ""
+"Öntanýmlý olarak Texinfo kaynak belgelerini diðer çeþitli biçemlere çevirir\n"
+"Info dosyalarý çevrimiçi Emacs ya da tek baþýna GNU Info'yla okunmak için "
+"uygundur.\n"
+
+#: makeinfo/makeinfo.c:350
+#, c-format
+msgid ""
+"General options:\n"
+"      --error-limit=NUM       quit after NUM errors (default %d).\n"
+"      --force                 preserve output even if errors.\n"
+"      --help                  display this help and exit.\n"
+"      --no-validate           suppress node cross-reference validation.\n"
+"      --no-warn               suppress warnings (but not errors).\n"
+"      --reference-limit=NUM   warn about at most NUM references (default %"
+"d).\n"
+"  -v, --verbose               explain what is being done.\n"
+"      --version               display version information and exit.\n"
+msgstr ""
+"Genel seçenekler:\n"
+"      --error-limit=ADET      ADET hatadan sonra çýkar (öntanýmlý %d).\n"
+"      --force                 hatalarda dahi çýktýyý korur.\n"
+"      --help                  bu yardýmý görüntüler ve çýkar.\n"
+"      --no-validate           düðüm çapraz-baþvuru onaylamasýný baskýlar.\n"
+"      --no-warn               uyarýlarý baskýlar (fakat hatalarý deðil).\n"
+"      --reference-limit=ADET  en fazla ADET referansta uyar (öntanýmlý %d).\n"
+"  -v, --verbose               ne yapýlýyor olduðunu açýklar.\n"
+"      --version               sürüm bilgisini görüntüler ve çýkar.\n"
+
+#: makeinfo/makeinfo.c:364
+#, no-wrap
+msgid ""
+"Output format selection (default is to produce Info):\n"
+"      --docbook             output Docbook XML rather than Info.\n"
+"      --html                output HTML rather than Info.\n"
+"      --xml                 output Texinfo XML rather than Info.\n"
+"      --plaintext           output plain text rather than Info.\n"
+msgstr ""
+"Çýktý biçem seçimi (öntanýmlýsý Info üretmektir):\n"
+"      --docbook              Info yerine DocBook çýktýsý üretir.\n"
+"      --html                 Info yerine HTML çýktýsý üretir.\n"
+"      --xml                  Info yerine XML (TexinfoML) çýktýsý üretir.\n"
+"      --plaintext            Info yerine salt metin çýktýsý üretir.\n"
+
+#: makeinfo/makeinfo.c:372
+msgid ""
+"General output options:\n"
+"  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
+"                            ignoring any @setfilename.\n"
+"      --no-headers          suppress node separators, Node: lines, and "
+"menus\n"
+"                              from Info output (thus producing plain text)\n"
+"                              or from HTML (thus producing shorter output);\n"
+"                              also, write to standard output by default.\n"
+"      --no-split            suppress splitting of Info or HTML output,\n"
+"                            generate only one output file.\n"
+"      --number-sections     output chapter and sectioning numbers.\n"
+"  -o, --output=FILE         output to FILE (directory if split HTML),\n"
+msgstr ""
+"Genel çýktý seçenekleri:\n"
+"  -E, --macro-expand DOSYA   makro-geniþletilmiþ kaynak çýktýsýný herhangi "
+"bir\n"
+"                             @setfilename'i yoksayarak DOSYA'ya yazar.\n"
+"      --no-headers           Info çýktýsýnda düðüm ayraçlarýný, Node:\n"
+"                               satýrlarýný ve menüleri baskýlar (daha kýsa "
+"çýktý\n"
+"                               üretmek üzere); ayrýca, öntanýmlý olarak\n"
+"                               standart çýktýya yazar.\n"
+"      --no-split             Info ya da HTML çýktýsýnýn bölünmesini "
+"baskýlar,\n"
+"                             yalnýzca bir çýktý dosyasý oluþturur.\n"
+"      --number-sections      bölüm ve kýsým numaralarýnýn çýktýsýný alýr.\n"
+"  -o, --output=DOSYA         çýktýyý DOSYA'ya yazar (bölünmüþ HTML ise "
+"dizine).\n"
+
+#: makeinfo/makeinfo.c:386
+#, c-format
+msgid ""
+"Options for Info and plain text:\n"
+"      --enable-encoding       output accented and special characters in\n"
+"                                Info output based on @documentencoding.\n"
+"      --fill-column=NUM       break Info lines at NUM characters (default %"
+"d).\n"
+"      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
+"                                `separate' to put them in their own node;\n"
+"                                `end' to put them at the end of the node\n"
+"                                  in which they are defined (default).\n"
+"      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default %"
+"d).\n"
+"                                If VAL is `none', do not indent; if VAL is\n"
+"                                `asis', preserve existing indentation.\n"
+"      --split-size=NUM        split Info files at size NUM (default %d).\n"
+msgstr ""
+"Info ve salt metin için seçenekler:\n"
+"      --enable-encoding       aksanlý ve özel karakterlerin çýktýsýný "
+"@documentencoding'e\n"
+"                                dayalý olarak Info çýktýsýna yazar.\n"
+"      --fill-column=ADET       Info satýrlarýný ADET karakterde bitir "
+"(öntanýmlý %d)\n"
+"      --footnote-style=STÝL   Info'da dipnotlarýn çýktýsýný STÝL'e göre "
+"yazar:\n"
+"                                 kendi düðümlerine koymak için `separate';\n"
+"                                 tanýmlandýklarý düðümün sonuna koymak için\n"
+"                                 `end' (öntanýmlý).\n"
+"      --paragraph-indet=DEG   Info paragraflarýný DEG boþluk girintiler "
+"(öntanýmlý %d).\n"
+"                                Eðer DEG `none' ise girintilemez; eðer DEG\n"
+"                                `asis' ise mevcut girintiyi korur.\n"
+"      --spilt-size=NUM        Info dosyalarýný NUM boyutuna böler (öntanýmlý "
+"%d).\n"
+
+#: makeinfo/makeinfo.c:403
+msgid ""
+"Options for HTML:\n"
+"      --css-include=FILE        include FILE in HTML <style> output;\n"
+"                                  read stdin if FILE is -.\n"
+msgstr ""
+"HTML seçenekleri:\n"
+"      --css-include=DOSYA        DOSYA'yý HTML <style> çýktýsýnda içer;\n"
+"                                   eðer DOSYA - ise stdin'i oku.\n"
+
+#: makeinfo/makeinfo.c:409
+#, c-format
+msgid ""
+"Options for XML and Docbook:\n"
+"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"d).\n"
+"                                  If VAL is 0, ignorable whitespace is "
+"dropped.\n"
+msgstr ""
+"XML ve Docbook için seçenekler:\n"
+"      --output-indent=DEÐER        XML elementlerini DEÐER kadar boþluk "
+"girintilendir (öntanýmlý %d).\n"
+"                                     eðer DEÐER 0 ise yok sayýlabilen beyaz "
+"boþluk silinir..\n"
+
+#: makeinfo/makeinfo.c:416
+msgid ""
+"Input file options:\n"
+"      --commands-in-node-names  allow @ commands in node names.\n"
+"  -D VAR                        define the variable VAR, as with @set.\n"
+"  -I DIR                        append DIR to the @include search path.\n"
+"  -P DIR                        prepend DIR to the @include search path.\n"
+"  -U VAR                        undefine the variable VAR, as with @clear.\n"
+msgstr ""
+"Girdi dosyasý seçenekleri:\n"
+"      --commands-in-node-names   düðüm adlarýnda @ komutlarýna izin verir.\n"
+"  -D VAR                         VAR deðiþkenini, @set ile olduðu gibi "
+"tanýmlar.\n"
+"  -I DIR                         DIR'ý @include arama yolu sonuna ekler.\n"
+"  -P DIR                         DIR'ý @include arama yolu baþýna ekler.\n"
+"  -U VAR                         VAR deðiþkeninin tanýmýný, @clear ile "
+"olduðu gibi geri alýr.\n"
+
+#: makeinfo/makeinfo.c:425
+msgid ""
+"Conditional processing in input:\n"
+"  --ifdocbook       process @ifdocbook and @docbook even if\n"
+"                      not generating Docbook.\n"
+"  --ifhtml          process @ifhtml and @html even if not generating HTML.\n"
+"  --ifinfo          process @ifinfo even if not generating Info.\n"
+"  --ifplaintext     process @ifplaintext even if not generating plain text.\n"
+"  --iftex           process @iftex and @tex; implies --no-split.\n"
+"  --ifxml           process @ifxml and @xml.\n"
+"  --no-ifdocbook    do not process @ifdocbook and @docbook text.\n"
+"  --no-ifhtml       do not process @ifhtml and @html text.\n"
+"  --no-ifinfo       do not process @ifinfo text.\n"
+"  --no-ifplaintext  do not process @ifplaintext text.\n"
+"  --no-iftex        do not process @iftex and @tex text.\n"
+"  --no-ifxml        do not process @ifxml and @xml text.\n"
+"\n"
+"  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
+msgstr ""
+"Girdide koþullu iþlem:\n"
+"  --ifdocbook       Docbook oluþturulmuyorsa bile @ifdocbook\n"
+"                      ve @docbook'u iþler.\n"
+"  --ifhtml          HTML oluþturulmuyorsa bile @ifhtml ve @html'yi iþler.\n"
+"  --ifinfo          Info oluþturulmuyorsa bile @ifinfo'yu iþler.\n"
+"  --ifplaintext     Salt metin oluþturulmuyorsa bile @ifplaintext'i iþler.\n"
+"  --iftex           @iftex ve @tex iþler; --no-split anlamýna gelir.\n"
+"  --ifxml           @ifxml ve @xml'i iþler\n"
+"  --no-ifdocbook    @ifdocbook ve @docbook metnini iþlemez.\n"
+"  --no-ifhtml       @ifhtml ve @html metin iþlemez.\n"
+"  --no-ifinfo       @ifinfo metin iþlemez.\n"
+"  --no-ifplaintext  @ifplintext metin iþlemez.\n"
+"  --no-iftex        @iftex ve @tex metin iþlemez.\n"
+"  --no-ifxml        @ifxml ve @xml metin iþlemez.\n"
+"\n"
+"  Ayrýca --no-ifFORMAT seçenekleri için ifnotFORMAT metnini iþler.\n"
+
+#: makeinfo/makeinfo.c:444
+msgid ""
+"  The defaults for the @if... conditionals depend on the output format:\n"
+"  if generating HTML, --ifhtml is on and the others are off;\n"
+"  if generating Info, --ifinfo is on and the others are off;\n"
+"  if generating plain text, --ifplaintext is on and the others are off;\n"
+"  if generating XML, --ifxml is on and the others are off.\n"
+msgstr ""
+"  @if... koþullularýnýn öntanýmlýlarý çýktý formatýna baðlýdýr:\n"
+"  eðer HTML oluþturuluyorsa, --ifhtml açýk, diðerleri kapalýdýr;\n"
+"  eðer Info oluþturuluyorsa, --ifinfo açýk, diðerleri kapalýdýr;\n"
+"  eðer salt metin oluþturuluyorsa, --ifplaintext açýk, diðerleri kapalýdýr;\n"
+"  eðer XML oluþturuluyorsa, --ifxml açýk, deiðerleri kapalýdýr.\n"
+
+#: makeinfo/makeinfo.c:452
+msgid ""
+"Examples:\n"
+"  makeinfo foo.texi                     write Info to foo's @setfilename\n"
+"  makeinfo --html foo.texi              write HTML to @setfilename\n"
+"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
+"  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
+"  makeinfo --no-headers foo.texi        write plain text to standard output\n"
+"\n"
+"  makeinfo --html --no-headers foo.texi write html without node lines, "
+"menus\n"
+"  makeinfo --number-sections foo.texi   write Info with numbered sections\n"
+"  makeinfo --no-split foo.texi          write one Info file however big\n"
+msgstr ""
+"Örnekler:\n"
+"  makeinfo foo.texi                     foo'nun @setfilename'ine Info yazar\n"
+"  makeinfo --html foo.texi              @setfilename'e HTML yazar\n"
+"  makeinfo --xml foo.texi               @setfilename'e XML yazar\n"
+"  makeinfo --docbook foo.texi           @setfilename'e DocBook XML yazar\n"
+"  makeinfo --no-headers foo.texi        standart çýktýya salt metin yazar\n"
+"\n"
+"  makeinfo --html --no-headres foo.texi düðüm çizgisiz, menüsüz html yazar\n"
+"  makeinfe --number-sections foo.texi   numaralanmýþ kýsýmlarý olan Info "
+"yazar\n"
+"  makeinfo --no-split foo.texi          ne büyüklükte olursa olsun tek Info "
+"dosyasý yazar\n"
+
+#: makeinfo/makeinfo.c:603
+#, c-format
+msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
+msgstr "%s: Tanýnamayan TEXINFO_OUTPUT_FORMAT deðeri `%s' yok sayýlýyor.\n"
+
+#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
+#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
+#, c-format
+msgid "%s: %s arg must be numeric, not `%s'.\n"
+msgstr "%1$s: %2$s arg sayýsal olmalýdýr, `%3$s' deðil.\n"
+
+#: makeinfo/makeinfo.c:660
+#, c-format
+msgid "%s: could not open macro expansion output `%s'"
+msgstr "%s:makro geniþleme çýktýsý `%s' açýlamadý"
+
+#: makeinfo/makeinfo.c:665
+#, c-format
+msgid "%s: ignoring second macro expansion output `%s'.\n"
+msgstr "%s: ikinci makro geniþleme çýktýsý yok sayýlýyor `%s'.\n"
+
+#: makeinfo/makeinfo.c:707
+#, c-format
+msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
+msgstr ""
+"%1$s: --paragraph-indent arg. sayýsal/`none'/`asis' olmalýdýr, `%2$s' "
+"deðil.\n"
+
+#: makeinfo/makeinfo.c:732
+#, c-format
+msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
+msgstr ""
+"%1$s: --footnote-style arg. `separate' ya da `end' olmalýdýr, `%2$s' deðil.\n"
+
+#: makeinfo/makeinfo.c:806
+#, c-format
+msgid "%s: missing file argument.\n"
+msgstr "%s: dosya argümaný eksik.\n"
+
+#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#, c-format
+msgid "Multiline command %c%s used improperly"
+msgstr "Çok satýrlý komut %c%s uygunsuz kullanýldý"
+
+#: makeinfo/makeinfo.c:1000
+#, c-format
+msgid "Expected `%s'"
+msgstr "`%s' gerekir"
+
+#: makeinfo/makeinfo.c:1479
+#, c-format
+msgid "Can't create directory `%s': %s"
+msgstr "`%1$s' dizini oluþturulamýyor: %2$s"
+
+#: makeinfo/makeinfo.c:1525
+#, c-format
+msgid "No `%s' found in `%s'"
+msgstr "`%2$s' içinde `%1$s' yok"
+
+#: makeinfo/makeinfo.c:1605
+#, c-format
+msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
+msgstr ""
+"%s: Makro geniþlemesini, Info çýktýsý da oraya gittiðinden, stdout'a "
+"atlatýyor.\n"
+
+#: makeinfo/makeinfo.c:1638
+#, c-format
+msgid "Making %s file `%s' from `%s'.\n"
+msgstr "`%3$s''den %1$s dosya `%2$s' yapýlýyor.\n"
+
+#: makeinfo/makeinfo.c:1673
+#, c-format
+msgid "This is %s, produced by makeinfo version %s from %s.\n"
+msgstr "Bu %1$s, makeinfo sürümü %2$s tarafýndan, %3$s'den üretilmiþtir.\n"
+
+#: makeinfo/makeinfo.c:1709
+#, c-format
+msgid ""
+"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
+msgstr ""
+"%1$s: Makro çýktý dosyasý `%2$s' hatalardan dolayý siliniyor; korumak için --"
+"force kullanýnýz.\n"
+
+#: makeinfo/makeinfo.c:1773
+#, c-format
+msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
+msgstr ""
+"%1$s: Çýktý dosyasý `%2$s' hatalardan dolayý siliniyor; korumak için --force "
+"kullanýnýz.\n"
+
+#: makeinfo/makeinfo.c:2034
+#, c-format
+msgid "Unknown command `%s'"
+msgstr "Bilinmeyen komut `%s'"
+
+#: makeinfo/makeinfo.c:2056
+#, c-format
+msgid "Use braces to give a command as an argument to @%s"
+msgstr "@%s'e argüman olarak bir komut vermek için {} kullanýn"
+
+#: makeinfo/makeinfo.c:2314
+#, c-format
+msgid "%c%s expected braces"
+msgstr "%c%s küme parantezi bekledi"
+
+#: makeinfo/makeinfo.c:2327
+msgid "Unmatched }"
+msgstr "Eþleþmemiþ }"
+
+#: makeinfo/makeinfo.c:2375
+msgid "NO_NAME!"
+msgstr "ÝSÝMSÝZ!"
+
+#: makeinfo/makeinfo.c:2396
+#, c-format
+msgid "%c%s missing close brace"
+msgstr "%c%s eksik kapama }"
+
+#: makeinfo/makeinfo.c:3309
+#, c-format
+msgid "@image file `%s' (for HTML) not readable: %s"
+msgstr "@image dosyasý `%1$s' (HTML için) okunamýyor: %2$s"
+
+#: makeinfo/makeinfo.c:3315
+#, c-format
+msgid "No such file `%s'"
+msgstr "`%s' adýnda dosya yok"
+
+#: makeinfo/makeinfo.c:3447
+#, c-format
+msgid "@image file `%s' (for text) unreadable: %s"
+msgstr "@image dosyasý `%1$s' (metin için) okunamýyor: %2$s"
+
+#: makeinfo/makeinfo.c:3456
+msgid "@image missing filename argument"
+msgstr "@image eksik dosyaadý argümaný"
+
+#: makeinfo/makeinfo.c:3675
+#, c-format
+msgid "undefined flag: %s"
+msgstr "tanýmlanmamýþ bayrak: %s"
+
+#: makeinfo/makeinfo.c:3676
+#, c-format
+msgid "{No value for `%s'}"
+msgstr "(`%s' için deðer yok)"
+
+#: makeinfo/makeinfo.c:3728
+#, c-format
+msgid "%c%s requires a name"
+msgstr "%c%s bir isim gerektirir"
+
+#: makeinfo/makeinfo.c:3834
+#, c-format
+msgid "Reached eof before matching @end %s"
+msgstr "Eþleþen @end %s'den önce dosya sonuna ulaþýldý"
+
+#: makeinfo/makeinfo.c:4082
+#, c-format
+msgid "`%.40s...' is too long for expansion; not expanded"
+msgstr "`%.40s...' geniþleme için çok uzun; geniþletilmedi"
+
+#: makeinfo/multi.c:116
+msgid "Missing } in @multitable template"
+msgstr "@multitable þablonunda eksik }"
+
+#: makeinfo/multi.c:254
+#, c-format
+msgid "ignoring stray text `%s' after @multitable"
+msgstr "@multitable'dan sonraki baþýboþ metin `%s' yoksayýlýyor"
+
+#: makeinfo/multi.c:393
+#, c-format
+msgid "Too many columns in multitable item (max %d)"
+msgstr "Çok-tablolu öðede, çok fazla sütun (maks %d)"
+
+#: makeinfo/multi.c:555
+#, c-format
+msgid "[unexpected] cannot select column #%d in multitable"
+msgstr "[beklenmeyen] çok-tabloluda sütun #%d seçilemiyor"
+
+#: makeinfo/multi.c:584
+msgid "ignoring @tab outside of multitable"
+msgstr "çok-tablolunun dýþýndaki @tab yoksayýlýyor"
+
+#: makeinfo/multi.c:632
+#, c-format
+msgid "** Multicolumn output from last row:\n"
+msgstr "**Son satýrdan çok-sütunlu çýktý:\n"
+
+#: makeinfo/multi.c:635
+#, c-format
+msgid "* column #%d: output = %s\n"
+msgstr "* sütun #%d: çýktý = %s\n"
+
+#: makeinfo/node.c:280
+#, c-format
+msgid "Node `%s' previously defined at line %d"
+msgstr "Düðüm `%s' daha önce satýr %d'de tanýmlandý"
+
+#: makeinfo/node.c:648
+#, c-format
+msgid "Formatting node %s...\n"
+msgstr "Düðüm %s biçimleniyor...\n"
+
+#: makeinfo/node.c:716
+#, c-format
+msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
+msgstr "Düðüm `%s' bir bölümleme komutu gerektirir (ör: %c%s)"
+
+#: makeinfo/node.c:879
+#, c-format
+msgid "No node name specified for `%c%s' command"
+msgstr "`%c%s' komutu için bir düðüm adý belirtilmedi"
+
+#: makeinfo/node.c:920 makeinfo/node.c:1151
+#, c-format
+msgid "Anchor `%s' and node `%s' map to the same file name"
+msgstr "Çýpa `%1$s' ve düðüm `%2$s' ayný dosya adýna yönlendiriyor"
+
+#: makeinfo/node.c:923
+msgid "This @anchor command ignored; references to it will not work"
+msgstr "Bu @anchor komutu yoksayýldý; buraya yönelik baþvurular çalýþmayacak"
+
+#: makeinfo/node.c:925 makeinfo/node.c:1154
+msgid "Rename this anchor or use the `--no-split' option"
+msgstr "Bu çýpayý yeniden adlandýrýn ya da `--no-split' seçeneðini kullanýn"
+
+#: makeinfo/node.c:955
+#, c-format
+msgid "Unexpected string at end of split-HTML file `%s'"
+msgstr "Bölünmüþ-HTML dosyasýnýn sonunda beklenmeyen dizge `%s'"
+
+#: makeinfo/node.c:991
+msgid "Next:"
+msgstr "Sonraki:"
+
+#: makeinfo/node.c:1007
+msgid "Previous:"
+msgstr "Önceki:"
+
+#: makeinfo/node.c:1021
+msgid "Up:"
+msgstr "Yukarý:"
+
+#: makeinfo/node.c:1148
+#, c-format
+msgid "Anchors `%s' and `%s' map to the same file name"
+msgstr "`%1$s' ve `%2$s' çýpalarý ayný dosya adýna yönlendiriyor"
+
+#: makeinfo/node.c:1153
+msgid "@anchor command ignored; references to it will not work"
+msgstr "@anchor komutu yoksayýldý; buraya yönelik baþvurular çalýþmayacak"
+
+#: makeinfo/node.c:1347
+#, c-format
+msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
+msgstr "%s baþvuru mevcut olmayan düðüme `%s' (yanlýþ bölümleme nedeniyle?)"
+
+#: makeinfo/node.c:1363
+msgid "Menu"
+msgstr "Menü"
+
+#: makeinfo/node.c:1365
+msgid "Cross"
+msgstr "Çapraz"
+
+#: makeinfo/node.c:1447
+#, c-format
+msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
+msgstr ""
+"Düðüm `%s''in sonraki alaný þuraya iþaret etmiyor (yanlýþ bölümleme "
+"nedeniyle?)"
+
+#: makeinfo/node.c:1450
+#, c-format
+msgid "This node (%s) has the bad Prev"
+msgstr "Bu düðüm (%s) hatalý Önceki'ne sahip"
+
+#: makeinfo/node.c:1462
+msgid "Prev"
+msgstr "Önceki"
+
+#: makeinfo/node.c:1505
+#, c-format
+msgid "Prev field of node `%s' not pointed to"
+msgstr "Düðüm `%s''in önceki alaný þuraya iþaret etmiyor"
+
+#: makeinfo/node.c:1509
+#, c-format
+msgid "This node (%s) has the bad Next"
+msgstr "Bu düðüm (%s) hatalý Sonraki'ne sahip"
+
+#: makeinfo/node.c:1521
+#, c-format
+msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
+msgstr "`%s''in Yukarý alaný yok (yanlýþ bölümleme nedeniyle?)"
+
+#: makeinfo/node.c:1524
+msgid "Up"
+msgstr "Yukarý"
+
+#: makeinfo/node.c:1590
+#, c-format
+msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
+msgstr ""
+"Düðüm `%s', Yukarý hedefi olmasýna karþýn, `%s' için eksik menü öðesi "
+"içeriyor"
+
+#: makeinfo/node.c:1619
+#, c-format
+msgid "node `%s' has been referenced %d times"
+msgstr "düðüm `%s''e %d kez baþvuruldu"
+
+#: makeinfo/node.c:1633
+#, c-format
+msgid "unreferenced node `%s'"
+msgstr "baþvurulmamýþ düðüm `%s'"
+
+#: makeinfo/node.c:1723
+#, c-format
+msgid "Removing %s\n"
+msgstr "%s siliniyor\n"
+
+#: makeinfo/node.c:1727
+#, c-format
+msgid "Can't remove file `%s': %s"
+msgstr "`%s' dosyasý silinemiyor: %s"
+
+#: makeinfo/sectioning.c:122
+#, c-format
+msgid "Appendix %c"
+msgstr "Ek %c "
+
+#: makeinfo/sectioning.c:467
+#, c-format
+msgid "Internal error (search_sectioning) `%s'!"
+msgstr "Dahili hata (search_sectioning) `%s'!"
+
+#: makeinfo/sectioning.c:562
+#, c-format
+msgid "Internal error (search_sectioning) \"%s\"!"
+msgstr "Dahili hata (search_sectioning) \"%s\"!"
+
+#: makeinfo/sectioning.c:623
+#, c-format
+msgid "%c%s is obsolete; use %c%s instead"
+msgstr "%c%s kullanýmdan kalkmýþ; yerine %c%s kullanýn"
+
+#: makeinfo/sectioning.c:639
+#, c-format
+msgid "Node with %ctop as a section already exists"
+msgstr "%cüst'lü düðüm bir bölüm olarak zaten var"
+
+#: makeinfo/sectioning.c:647
+#, c-format
+msgid "Here is the %ctop node"
+msgstr "Ýþte %cüst düðüm"
+
+#: makeinfo/sectioning.c:663
+#, c-format
+msgid "%ctop used before %cnode, defaulting to %s"
+msgstr "%cüst, %cdüðümden önce kullanýldý, %s'e öntanýmlanýyor"
+
+#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
+msgid "Table of Contents"
+msgstr "Ýçindekiler Tablosu"
+
+#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
+msgid "Short Contents"
+msgstr "Kýsa Ýçerik"
+
+#: makeinfo/xml.c:1605
+#, c-format
+msgid "@image file `%s' unreadable: %s"
+msgstr "@image dosyasý `%1$s' okunamýyor: %2$s"
+
+#: makeinfo/xml.c:2097
+msgid ""
+"@headitem as the last item of @multitable produces invalid Docbook documents"
+msgstr "@multitable'ýn son öðesi @headitem geçersiz Docbook belgeleri üretiyor"
+
+#: util/install-info.c:154
+#, c-format
+msgid "%s: warning: "
+msgstr "%s: uyarý: "
+
+#: util/install-info.c:203
+#, c-format
+msgid " for %s"
+msgstr " %s için"
+
+#: util/install-info.c:426
+#, c-format
+msgid "\tTry `%s --help' for a complete list of options.\n"
+msgstr "\tSeçeneklerin tam bir listesi için `%s --help''i deneyiniz.\n"
+
+#: util/install-info.c:434
+#, c-format
+msgid ""
+"Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+"\n"
+"Install or delete dir entries from INFO-FILE in the Info directory file\n"
+"DIR-FILE.\n"
+"\n"
+"Options:\n"
+" --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
+"                     don't insert any new entries.\n"
+" --dir-file=NAME   specify file name of Info directory file.\n"
+"                     This is equivalent to using the DIR-FILE argument.\n"
+" --entry=TEXT      insert TEXT as an Info directory entry.\n"
+"                     TEXT should have the form of an Info menu item line\n"
+"                     plus zero or more extra lines starting with "
+"whitespace.\n"
+"                     If you specify more than one entry, they are all "
+"added.\n"
+"                     If you don't specify any entries, they are determined\n"
+"                     from information in the Info file itself.\n"
+" --help            display this help and exit.\n"
+" --info-file=FILE  specify Info file to install in the directory.\n"
+"                     This is equivalent to using the INFO-FILE argument.\n"
+" --info-dir=DIR    same as --dir-file=DIR/dir.\n"
+" --item=TEXT       same as --entry TEXT.\n"
+"                     An Info directory entry is actually a menu item.\n"
+" --quiet           suppress warnings.\n"
+" --remove          same as --delete.\n"
+" --section=SEC     put this file's entries in section SEC of the directory.\n"
+"                     If you specify more than one section, all the entries\n"
+"                     are added in each of the sections.\n"
+"                     If you don't specify any sections, they are determined\n"
+"                     from information in the Info file itself.\n"
+" --version         display version information and exit.\n"
+msgstr ""
+"Kullaným: %s [SEÇENEK]... [INFO-DOSYASI [DIR-DOSYASI]]\n"
+"\n"
+"Info dizin dosyasý DIR-DOSYASI içindeki INFO-DOSYASI'ndan dizin girdilerini\n"
+"kurar ya da siler.\n"
+"\n"
+"Seçenekler:\n"
+" --delete          INFO-DOSYASI için mevcut girdileri DIR-DOSYASI'ndan "
+"siler;\n"
+"                     yeni girdi eklemez.\n"
+" --dir-file=ÝSÝM   Info dizin dosyasýnýn adýný belirler.\n"
+"                     Bu, DIR-DOSYASI argümanýný kullanmaya eþdeðerdir.\n"
+" --entry=METÝN     METÝN'i bir Info dizin girdisi olarak ekler.\n"
+"                     METÝN, bir Info öðe satýrý þeklinde olmalý\n"
+"                     artý, boþlukla baþlayan sýfýr ya da daha çok fazladan "
+"satýrý bulunmalýdýr.\n"
+"                     Birden fazla girdi belirtirseniz hepsi eklenir.\n"
+"                     Hiç girdi belirtmezseniz, (girdiler) Info dosyasýndaki "
+"bilgiden\n"
+"                     belirlenir.\n"
+" --help            bu yardýmý görüntüler ve çýkar.\n"
+" --info-file=DOSYA dizine kurulacak Info dosyasýný belirler.\n"
+"                     Bu, INFO-DOSYASI argümanýný kullanmaya eþdeðerdir.\n"
+" --info-dir=DIR    --dir-file=DIR/dir ile ayný.\n"
+" --item=METÝN      --entry METÝN ile ayný.\n"
+"                     Bir Info dizin girdisi, gerçekte bir menü öðesidir.\n"
+" --quiet           uyarýlarý baskýlar.\n"
+" --remove          --delete ile ayný.\n"
+" --section=KIS     bu dosyanýn girdilerini dizinin KIS bölümüne koyar.\n"
+"                     Bir bölümden fazlasýný belirtirseniz, tüm girdiler\n"
+"                     herbir bölüme eklenir.\n"
+"                     Hiçbir bölüm belirtmezseniz, (bölümler) Info "
+"dosyasýndaki bilgiden\n"
+"                     belirlenir.\n"
+" --version           sürüm bilgisini görüntüler ve çýkar.\n"
+
+#: util/install-info.c:488
+#, c-format
+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"
+"%s\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"
+"  \"h\" gives a primer for first-timers,\n"
+"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+"\n"
+"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
+"  to select it.\n"
+"\n"
+"%s\n"
+msgstr ""
+"Bu, .../info/dir dosyasý olup, (dir)Üst adý verilen, Info\n"
+"hiyerarþisinin en üst düðümünü içerir.\n"
+"Info'yu ilk çalýþtýrdýðýnýzda bu düðüme bakarak baþlýyor olursunuz.\n"
+"\n"
+"%s\tBu, INFO aðacýnýn tepesidir\n"
+"\n"
+"  Bu (Dizin düðümü), temel konularýn bir menüsünü verir.\n"
+"  \"q\" tuþuyla çýkar, \"?\" ile tüm Info komutlarýný listeler, \"d\" ile "
+"buraya döner,\n"
+"  \"h\" ile yeni baþlayanlar için bir klavuz alabilir,\n"
+"  \"mEmacs<Return>\" ile Emacs klavuzunu ziyaret edebilirsiniz, vs.\n"
+"\n"
+"  Emacs'ta, bir menü öðesi ya da çapraz baþvuru üzerinde sað fare tuþunu\n"
+"  týklayarak seçim yapabilirsiniz.\n"
+"\n"
+"%s\n"
+
+#: util/install-info.c:513
+#, c-format
+msgid "%s: could not read (%s) and could not create (%s)\n"
+msgstr "%1$s: (%2$s) okunamýyor ve (%3$s) oluþturulamýyor\n"
+
+#: util/install-info.c:600
+#, c-format
+msgid "%s: empty file"
+msgstr "%s: boþ dosya"
+
+#: util/install-info.c:913 util/install-info.c:953
+msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
+msgstr "Eþleþen END-INFO-DIR-ENTRY'siz START-INFO-DIR-ENTRY"
+
+#: util/install-info.c:948
+msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+msgstr "Eþleþen START-INFO-DIR-ENTRY'siz END-INFO-DIR-ENTRY"
+
+#: util/install-info.c:1191 util/install-info.c:1201
+#, c-format
+msgid "%s: already have dir file: %s\n"
+msgstr "%s: zaten dir dosyasý var: %s\n"
+
+#: util/install-info.c:1236
+#, c-format
+msgid "%s: Specify the Info file only once.\n"
+msgstr "%s: Info dosyasýný yalnýzca bir kez belirtin.\n"
+
+#: util/install-info.c:1284
+#, c-format
+msgid "excess command line argument `%s'"
+msgstr "fazladan komut satýrý argümaný `%s'"
+
+#: util/install-info.c:1288
+msgid "No input file specified; try --help for more information."
+msgstr "Girdi dosyasý belirtilmemiþ; daha fazla bilgi için --help deneyin."
+
+#: util/install-info.c:1291
+msgid "No dir file specified; try --help for more information."
+msgstr "dizin dosyasý belirtilmemiþ; daha fazla bilgi için --help deneyin."
+
+#: util/install-info.c:1313
+#, c-format
+msgid "no info dir entry in `%s'"
+msgstr "`%s' içinde info dizin girdisi yok"
+
+#: util/install-info.c:1426
+#, c-format
+msgid "menu item `%s' already exists, for file `%s'"
+msgstr "`%2$s' dosyasý için menü öðesi `%1$s' zaten mevcut"
+
+#: util/install-info.c:1449
+#, c-format
+msgid "no entries found for `%s'; nothing deleted"
+msgstr "`%s' için girdi bulunamadý; hiçbir þey silinmedi"
+
+#: util/texindex.c:252
+msgid "display this help and exit"
+msgstr "bu yardýmý görüntüler ve çýkar"
+
+#: util/texindex.c:254
+msgid "keep temporary files around after processing"
+msgstr "iþlemden sonra geçici dosyalarý etrafta bulundurur"
+
+#: util/texindex.c:256
+msgid "do not keep temporary files around after processing (default)"
+msgstr "iþlemden sonra geçici dosyalarý etrafta bulundurmaz (öntanýmlý)"
+
+#: util/texindex.c:258
+msgid "send output to FILE"
+msgstr "çýktýyý DOSYA'ya gönderir"
+
+#: util/texindex.c:260
+msgid "display version information and exit"
+msgstr "sürüm bilgisini görüntüler ve çýkar"
+
+#: util/texindex.c:270
+#, c-format
+msgid "Usage: %s [OPTION]... FILE...\n"
+msgstr "Kullaným: %s [SEÇENEK]... DOSYA...\n"
+
+#: util/texindex.c:271
+#, c-format
+msgid "Generate a sorted index for each TeX output FILE.\n"
+msgstr "Her TeX çýktý DOSYAsý için sýralanmýþ bir indeks oluþturur.\n"
+
+#: util/texindex.c:274
+#, c-format
+msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
+msgstr ""
+"Genellikle DOSYA... bir `foo.texi' belgesi için `foo.%c%c' olarak "
+"belirtilir.\n"
+
+#: util/texindex.c:276
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"Seçenekler:\n"
+
+#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
+#: util/texindex.c:1011
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: bir texinfo indeks dosyasý deðil"
+
+#: util/texindex.c:968
+#, c-format
+msgid "failure reopening %s"
+msgstr "%s'i yeniden açmada hata"
+
+#: util/texindex.c:1218
+#, c-format
+msgid "No page number in %s"
+msgstr "%s'de sayfa numarasý yok"
+
+#: util/texindex.c:1291
+#, c-format
+msgid "entry %s follows an entry with a secondary name"
+msgstr "%s girdisi, ikincil isimli bir girdiyi takip ediyor"
+
+#~ msgid "\"\" is invalid"
+#~ msgstr "\"\" geçersiz"
+
+#~ msgid "%s is an invalid ISO code, using %c"
+#~ msgstr "%s geçersiz bir ISO kodu, %c kullanýlýyor"
+
+#~ msgid "Cannot specify more than one macro expansion output"
+#~ msgstr "Birden fazla makro geniþleme çýktýsý belirtilemez"
+
+#~ msgid "File exists, but is not a directory"
+#~ msgstr "Dosya mevcut, ancak bir dizin deðil"
+
+#~ msgid "First argument to cross-reference may not be empty"
+#~ msgstr "Çapraz baþvuru kurulacak ilk argüman boþ olmayabilir"
+
+#~ msgid "see "
+#~ msgstr "bkz "
+
+#~ msgid "`.' or `,' must follow cross reference, not %c"
+#~ msgstr "`.' ya da `,' çapraz baþvuruyu izlemelidir, %c'yi deðil"
+
+#~ msgid "First argument to @inforef may not be empty"
+#~ msgstr "@inforef'e ilk argüman boþ olmayabilir"
+
+#~ msgid "Node:"
+#~ msgstr "Düðüm:"
+
+#~ msgid "%s: TOC should be here, but it was not found"
+#~ msgstr "%s: Ýçindekiler burada olmalýydý, ama bulunamadý"
+
+#~ msgid "%s: Specify the Info directory only once.\n"
+#~ msgstr "%s: Info dizinini yalnýzca bir kez belirtin.\n"
diff --git a/gnu/usr.bin/texinfo/po/zh_CN.gmo b/gnu/usr.bin/texinfo/po/zh_CN.gmo
new file mode 100644
index 00000000000..2c5fc242354
--- /dev/null
+++ b/gnu/usr.bin/texinfo/po/zh_CN.gmo
diff --git a/gnu/usr.bin/texinfo/po/zh_CN.po b/gnu/usr.bin/texinfo/po/zh_CN.po
new file mode 100644
index 00000000000..3ac45341101
--- /dev/null
+++ b/gnu/usr.bin/texinfo/po/zh_CN.po
@@ -0,0 +1,3050 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2002 Free Software Foundation, Inc.
+# This file is distributed under the same license as the texinfo package.
+# Wang Li <charles@linux.net.cn>, 2002.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: texinfo 4.2\n"
+"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
+"POT-Creation-Date: 2004-12-21 16:20-0800\n"
+"PO-Revision-Date: 2002-05-06 16:10+0800\n"
+"Last-Translator: Wang Li <charles@linux.net.cn>\n"
+"Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=gb2312\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: info/echo-area.c:284 info/session.c:689
+msgid "Move forward a character"
+msgstr "ÏòÇ°Òƶ¯Ò»¸ö×Ö·û"
+
+#: info/echo-area.c:296 info/session.c:705
+msgid "Move backward a character"
+msgstr "ÏòºóÒƶ¯Ò»¸ö×Ö·û"
+
+#: info/echo-area.c:308
+msgid "Move to the start of this line"
+msgstr "Òƶ¯µ½±¾ÐеĿªÍ·"
+
+#: info/echo-area.c:313
+msgid "Move to the end of this line"
+msgstr "Òƶ¯µ½±¾ÐеÄĩβ"
+
+#: info/echo-area.c:321 info/session.c:723
+msgid "Move forward a word"
+msgstr "ÏòÇ°Òƶ¯Ò»¸öµ¥´Ê"
+
+#: info/echo-area.c:361 info/session.c:772
+msgid "Move backward a word"
+msgstr "ÏòºóÒƶ¯Ò»¸öµ¥´Ê"
+
+#: info/echo-area.c:401
+msgid "Delete the character under the cursor"
+msgstr "ɾ³ý¹â±êλÖõÄ×Ö·û"
+
+#: info/echo-area.c:431
+msgid "Delete the character behind the cursor"
+msgstr "ɾ³ý¹â±êÖ®ºóµÄ×Ö·û"
+
+#: info/echo-area.c:452
+msgid "Cancel or quit operation"
+msgstr "È¡Ïû»òÍ˳ö²Ù×÷"
+
+#: info/echo-area.c:467
+msgid "Accept (or force completion of) this line"
+msgstr "½ÓÊÜ(»òÇ¿ÖÆÍê³É)±¾ÐÐ"
+
+#: info/echo-area.c:472
+msgid "Insert next character verbatim"
+msgstr "Ô­Ñù²åÈëÏÂÒ»¸ö×Ö·û"
+
+#: info/echo-area.c:480
+msgid "Insert this character"
+msgstr "²åÈë¸Ã×Ö·û"
+
+#: info/echo-area.c:498
+msgid "Insert a TAB character"
+msgstr "²åÈëÒ»¸ö tab ×Ö·û"
+
+#: info/echo-area.c:505
+msgid "Transpose characters at point"
+msgstr "±ä»»¹â±ê´¦×Ö·ûµÄ´ÎÐò"
+
+#: info/echo-area.c:556
+msgid "Yank back the contents of the last kill"
+msgstr "Õ³Ìù×îºóÒ»´Î¼ôÇеÄÄÚÈÝ"
+
+#: info/echo-area.c:563
+msgid "Kill ring is empty"
+msgstr "¼ôÌù²¾Îª¿Õ"
+
+#: info/echo-area.c:576
+msgid "Yank back a previous kill"
+msgstr "Õ³ÌùÉϴμôÇÐ"
+
+#: info/echo-area.c:609
+msgid "Kill to the end of the line"
+msgstr "¼ôÇÐÖÁ±¾ÐÐĩβ"
+
+#: info/echo-area.c:622
+msgid "Kill to the beginning of the line"
+msgstr "¼ôÇÐÖÁ±¾ÐпªÍ·"
+
+#: info/echo-area.c:634
+msgid "Kill the word following the cursor"
+msgstr "¼ôÇйâ±êÖ®ºóµÄµ¥´Ê"
+
+#: info/echo-area.c:653
+msgid "Kill the word preceding the cursor"
+msgstr "¼ôÇйâ±ê֮ǰµÄµ¥´Ê"
+
+#: info/echo-area.c:868 info/echo-area.c:924
+msgid "No completions"
+msgstr "ûÓв¹Æë"
+
+#: info/echo-area.c:870
+msgid "Not complete"
+msgstr "δ²¹Æë"
+
+#: info/echo-area.c:911
+msgid "List possible completions"
+msgstr "ÁоٿÉÄܵIJ¹Æë"
+
+#: info/echo-area.c:928
+msgid "Sole completion"
+msgstr "ΨһµÄ²¹Æë"
+
+#: info/echo-area.c:937
+msgid "One completion:\n"
+msgstr "Ò»¸ö²¹Æ룺\n"
+
+#: info/echo-area.c:938
+#, c-format
+msgid "%d completions:\n"
+msgstr "%d ¸ö²¹Æ룺\n"
+
+#: info/echo-area.c:1085
+msgid "Insert completion"
+msgstr "²åÈë²¹Æë"
+
+#: info/echo-area.c:1220
+msgid "Building completions..."
+msgstr "ÕýÔÚ´´½¨²¹Æë..."
+
+#: info/echo-area.c:1340
+msgid "Scroll the completions window"
+msgstr "¹ö¶¯²¹Æë´°¿Ú"
+
+#: info/footnotes.c:213
+msgid "Footnotes could not be displayed"
+msgstr "ÎÞ·¨ÏÔʾ½Å×¢"
+
+#: info/footnotes.c:239
+msgid "Show the footnotes associated with this node in another window"
+msgstr "ÔÚÁíÒ»¸ö´°¿ÚÖÐÏÔʾÓڸýڵãÏà¹ØµÄ½Å×¢"
+
+#: info/footnotes.h:26
+msgid "---------- Footnotes ----------"
+msgstr "---------- ½Å×¢ ----------"
+
+#: info/indices.c:172
+msgid "Look up a string in the index for this file"
+msgstr "ÔÚ±¾ÎļþµÄË÷ÒýÖÐËÑË÷×Ö·û´®"
+
+#: info/indices.c:199
+msgid "Finding index entries..."
+msgstr "ÕýÔÚËÑË÷Ë÷ÒýÌõÄ¿..."
+
+#: info/indices.c:207
+msgid "No indices found."
+msgstr "δÕÒµ½Ë÷Òý¡£"
+
+#: info/indices.c:217
+msgid "Index entry: "
+msgstr "Ë÷ÒýÌõÄ¿£º"
+
+#: info/indices.c:325
+msgid ""
+"Go to the next matching index item from the last `\\[index-search]' command"
+msgstr "´Ó×îºóÒ»¸ö¡°\\[index-search]¡±ÃüÁîתÒƵ½ÏÂÒ»¸öÆ¥ÅäµÄË÷ÒýÏîÄ¿"
+
+#: info/indices.c:335
+msgid "No previous index search string."
+msgstr "ûÓÐÉÏÒ»¸öË÷ÒýËÑË÷×Ö·û´®¡£"
+
+#: info/indices.c:342
+msgid "No index entries."
+msgstr "ûÓÐË÷ÒýÌõÄ¿¡£"
+
+#: info/indices.c:375
+#, fuzzy, c-format
+msgid "No %sindex entries containing `%s'."
+msgstr "ûÓÐ %sË÷ÒýÌõÄ¿º¬ÓС°%s¡±¡£"
+
+#: info/indices.c:376
+msgid "more "
+msgstr "¸ü¶à "
+
+#: info/indices.c:386
+msgid "CAN'T SEE THIS"
+msgstr "¿´²»µ½Õâ¸ö"
+
+#: info/indices.c:422
+#, fuzzy, c-format
+msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
+msgstr ""
+"ÔÚ %2$s ÖÐÕÒµ½¡°%1$s¡±¡£(¡°\\[next-index-match]¡±½«ÊÔͼѰÕÒÏÂÒ»¸öÆ¥Åä¡£)"
+
+#: info/indices.c:541
+#, fuzzy, c-format
+msgid "Scanning indices of `%s'..."
+msgstr "ÕýÔÚËÑË÷¡°%s¡±µÄË÷Òý..."
+
+#: info/indices.c:596
+#, fuzzy, c-format
+msgid "No available info files have `%s' in their indices."
+msgstr "ÔÚ¿ÉÓÃµÄ info ÎļþµÄË÷ÒýÖоù²»º¬ÓС°%s¡±¡£"
+
+#: info/indices.c:622
+msgid "Grovel all known info file's indices for a string and build a menu"
+msgstr "ÕûÀíËùÓÐÒÑÖª info Îļþº¬Óб»²éѯ×Ö·û´®µÄË÷Òý²¢½¨Á¢Ò»¸ö²Ëµ¥"
+
+#: info/indices.c:626
+msgid "Index apropos: "
+msgstr "Ë÷Òýº¬ÓУº"
+
+#: info/indices.c:654
+#, fuzzy, c-format
+msgid ""
+"\n"
+"* Menu: Nodes whose indices contain `%s':\n"
+msgstr ""
+"\n"
+"* ²Ëµ¥£ºÆäË÷Òýº¬ÓС°%s¡±µÄ½Úµã£º\n"
+
+#: info/info.c:275 info/infokey.c:899
+#, c-format
+msgid "Try --help for more information.\n"
+msgstr "³¢ÊÔ --¸ü¶àµÄÇóÖúÐÅÏ¢¡£\n"
+
+#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
+#: util/texindex.c:343
+#, fuzzy, c-format
+msgid ""
+"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 ""
+"°æȨËùÓÐ (C) %s ×ÔÓÉÈí¼þ»ù½ð»á¡£\n"
+"±¾Èí¼þûÓÐÈκε£±£¡£Äú¿ÉÒÔ°´ÕÕͨÓÃ\n"
+"¹«¹²Ðí¿ÉÖ¤(GPL)µÄÌõ¿î·¢Ðб¾Èí¼þ¡£\n"
+"Õâ·½ÃæµÄÏêÇ飬ÇëÔĶÁÃûΪ COPYING µÄÎļþ¡£\n"
+
+#: info/info.c:498
+#, c-format
+msgid "no index entries found for `%s'\n"
+msgstr "ÕÒ²»µ½º¬ÓС°%s¡±µÄË÷Òý\n"
+
+#: info/info.c:590
+msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
+msgstr ""
+
+#: info/info.c:597
+#, fuzzy, c-format
+msgid ""
+"Usage: %s [OPTION]... [MENU-ITEM...]\n"
+"\n"
+"Read documentation in Info format.\n"
+"\n"
+"Options:\n"
+"      --apropos=STRING         look up STRING in all indices of all "
+"manuals.\n"
+"  -d, --directory=DIR          add DIR to INFOPATH.\n"
+"      --dribble=FILENAME       remember user keystrokes in FILENAME.\n"
+"  -f, --file=FILENAME          specify Info file to visit.\n"
+"  -h, --help                   display this help and exit.\n"
+"      --index-search=STRING    go to node pointed by index entry STRING.\n"
+"  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
+"  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
+"  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+"      --no-raw-escapes         output escapes as literal text.\n"
+"      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
+"  -O, --show-options, --usage  go to command-line options node.\n"
+"%s      --subnodes               recursively output menu items.\n"
+"  -w, --where, --location      print physical location of Info file.\n"
+"      --vi-keys                use vi-like and less-like key bindings.\n"
+"      --version                display version information and exit.\n"
+"\n"
+"The first non-option argument, if present, is the menu entry to start from;\n"
+"it is searched for in all `dir' files along INFOPATH.\n"
+"If it is not present, info merges all `dir' files and shows the result.\n"
+"Any remaining arguments are treated as the names of menu\n"
+"items relative to the initial node visited.\n"
+"\n"
+"Examples:\n"
+"  info                       show top-level dir menu\n"
+"  info emacs                 start at emacs node from top-level dir\n"
+"  info emacs buffers         start at buffers node within emacs manual\n"
+"  info --show-options emacs  start at node with emacs' command line options\n"
+"  info -f ./foo.info         show file ./foo.info, not searching dir\n"
+msgstr ""
+"Ó÷¨£º%s [Ñ¡Ïî]... [²Ëµ¥Ïî...]\n"
+"\n"
+"ÔĶÁ Info ¸ñʽµÄÎĵµ¡£\n"
+"\n"
+"Ñ¡Ï\n"
+"      --apropos=STRING         ÔÚËùÓÐÊÖ²áµÄËùÓÐË÷ÒýÖÐËÑË÷ STRING¡£\n"
+"  -d, --directory=DIR          ½«Ä¿Â¼ DIR Ìí¼Óµ½ INFOPATH ÖС£\n"
+"      --dribble=FILENAME       ½«Óû§µÄ°´¼ü¼Ç¼ÔÚÎļþ FILENAME ÖС£\n"
+"  -f, --file=FILENAME          Ö¸¶¨ÒªÔĶÁµÄ Info Îļþ¡£\n"
+"  -h, --help                   ÏÔʾ¸ÃÇóÖúÐÅÏ¢²¢Í˳ö¡£\n"
+"      --index-search=STRING    תÒƵ½Ë÷ÒýÌõÄ¿ STRING ËùÖ¸ÏòµÄ½Úµã¡£\n"
+"  -n, --node=NODENAME          Ö¸¶¨Ê×ÏÈÔĶÁµÄ Info ÎļþÖеĽڵ㡣\n"
+"  -o, --output=FILENAME        ½«Ñ¡ÖеĽڵãÊä³öµ½Îļþ FILENAME ÖС£\n"
+"  -R, --raw-escapes            ²»ÒªÉ¾³ýÀ´×Ô man Ò³ÃæµÄ ANSI תÒå·û¡£\n"
+"      --restore=FILENAME       ´ÓÎļþ FILENAME ÖжÁÈ¡³õʼ°´¼ü¡£\n"
+"  -O, --show-options, --usage  תÒƵ½ÃüÁîÐÐÑ¡Ïî½Úµã¡£\n"
+"%s      --subnodes               µÝ¹éÊä³ö²Ëµ¥ÌõÄ¿¡£\n"
+"      --vi-keys                ʹÓÃÀà vi ºÍÀà less µÄ°´¼ü°ó¶¨¡£\n"
+"      --version                ÏÔʾ°æ±¾ÐÅÏ¢²¢Í˳ö¡£\n"
+"\n"
+"Èç¹û´æÔÚ·ÇÑ¡Ïî²ÎÊý£¬ÔòµÚÒ»¸ö·ÇÑ¡Ïî²ÎÊý¾ÍÊÇÆðµã²Ëµ¥ÌõÄ¿£»\n"
+"ËüÊÇ´Ó INFOPATH Öеġ°dir¡±ÎļþÖÐËÑË÷¶øµÃµÄ¡£\n"
+"Èç¹ûËÑË÷²»µ½£¬info ¾ÍºÏ²¢ËùÓеġ°dir¡±Îļþ²¢ÏÔʾºÏ²¢½á¹û¡£\n"
+"ËùÓÐÊ£ÓàµÄ²ÎÊý¾ù×÷ΪÏà¶ÔÓÚÔĶÁµÄ³õʼ½ÚµãµÄ²Ëµ¥ÏîÄ¿Ãû³Æ¡£\n"
+"\n"
+"ʾÀý£º\n"
+"  info                       ÏÔʾ¶¥²ãĿ¼²Ëµ¥\n"
+"  info emacs                 ´Ó¶¥²ãĿ¼ÖÐµÄ emacs ½Úµã¿ªÊ¼\n"
+"  info emacs buffers         ´Ó emacs ÊÖ²áµÄ buffers ½Úµã¿ªÊ¼\n"
+"  info --show-options emacs  ´Ó emacs µÄÃüÁîÐÐÑ¡Ïî½Úµã¿ªÊ¼\n"
+"  info -f ./foo.info         ÏÔʾÎļþ ./foo.info£¬¶ø²»ÊÇËÑË÷Ŀ¼\n"
+
+#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
+#: util/install-info.c:466 util/texindex.c:292
+msgid ""
+"\n"
+"Email bug reports to bug-texinfo@gnu.org,\n"
+"general questions and discussion to help-texinfo@gnu.org.\n"
+"Texinfo home page: http://www.gnu.org/software/texinfo/"
+msgstr ""
+"\n"
+"Ç뽫´íÎ󱨸淢Ë͵½ bug-texinfo@gnu.org£¬\n"
+"Ò»°ãµÄÎÊÌâºÍÌÖÂÛÇë·¢Ë͵½ help-texinfo@gnu.org¡£\n"
+"Texinfo Ö÷Ò³£ºhttp://www.gnu.org/software/texinfo/"
+
+#: info/info.c:669
+#, c-format
+msgid "Cannot find node `%s'."
+msgstr "ÎÞ·¨ÕÒµ½½Úµã¡°%s¡±¡£"
+
+#: info/info.c:670
+#, c-format
+msgid "Cannot find node `(%s)%s'."
+msgstr "ÎÞ·¨ÕÒµ½½Úµã¡°(%s)%s¡±¡£"
+
+#: info/info.c:671
+msgid "Cannot find a window!"
+msgstr "ÎÞ·¨ÕÒµ½Ò»¸ö´°¿Ú£¡"
+
+#: info/info.c:672
+msgid "Point doesn't appear within this window's node!"
+msgstr "¹â±êûÓгöÏÖÔڸô°¿ÚµÄ½ÚµãÖ®ÖУ¡"
+
+#: info/info.c:673
+msgid "Cannot delete the last window."
+msgstr "ÎÞ·¨É¾³ý×îºóµÄ´°¿Ú¡£"
+
+#: info/info.c:674
+msgid "No menu in this node."
+msgstr "¸Ã½ÚµãÖÐûÓв˵¥¡£"
+
+#: info/info.c:675
+msgid "No footnotes in this node."
+msgstr "¸Ã½ÚµãÖÐûÓнÅ×¢¡£"
+
+#: info/info.c:676
+msgid "No cross references in this node."
+msgstr "¸Ã½ÚµãÖÐûÓн»²æÒýÓá£"
+
+#: info/info.c:677
+#, c-format
+msgid "No `%s' pointer for this node."
+msgstr "¸Ã½ÚµãÖÐûÓС°%s¡±Ö¸Õë"
+
+#: info/info.c:678
+#, c-format
+msgid "Unknown Info command `%c'; try `?' for help."
+msgstr "δ֪µÄ Info ÃüÁî¡°%c¡±£»ÇëÒÔ¡°?¡±»ñµÃ°ïÖú¡£"
+
+#: info/info.c:679
+#, c-format
+msgid "Terminal type `%s' is not smart enough to run Info."
+msgstr "ÖÕ¶ËÀàÐÍ¡°%s¡±µÄÄÜÁ¦²»×ãÒÔÖ§³Ö Info µÄÔËÐС£"
+
+#: info/info.c:680
+msgid "You are already at the last page of this node."
+msgstr "ÄúÒѾ­ÔڸýڵãµÄ×îºóÒ»¸öÒ³ÃæÖÐÁË¡£"
+
+#: info/info.c:681
+msgid "You are already at the first page of this node."
+msgstr "ÄúÒѾ­ÔڸýڵãµÄµÚÒ»Ò³ÖÐÁË¡£"
+
+#: info/info.c:682
+msgid "Only one window."
+msgstr "Ö»ÓÐÒ»¸ö´°¿Ú¡£"
+
+#: info/info.c:683
+msgid "Resulting window would be too small."
+msgstr "½á¹û´°¿Ú½«»á̫С¡£"
+
+#: info/info.c:684
+msgid "Not enough room for a help window, please delete a window."
+msgstr "ûÓÐ×ã¹»µÄ¿Õ¼äÓÃÓÚÇóÖú´°¿Ú£¬Çëɾ³ýÒ»¸ö´°¿Ú¡£"
+
+#: info/infodoc.c:46 info/infodoc.c:95
+msgid ""
+"Basic Commands in Info Windows\n"
+"******************************\n"
+msgstr ""
+"Info ´°¿ÚÖеĻù±¾ÃüÁî\n"
+"******************************\n"
+
+#: info/infodoc.c:49
+msgid "\\%-10[quit-help]  Quit this help.\n"
+msgstr "\\%-10[quit-help]  Í˳ö¸ÃÇóÖú¡£\n"
+
+#: info/infodoc.c:50
+msgid "\\%-10[quit]  Quit Info altogether.\n"
+msgstr "\\%-10[quit]  Ò»²¢Í˳ö Info¡£\n"
+
+#: info/infodoc.c:51
+msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
+msgstr "\\%-10[get-info-help-node]  µ÷Óà Info ½Ì³Ì¡£\n"
+
+#: info/infodoc.c:53 info/infodoc.c:102
+msgid ""
+"Selecting other nodes:\n"
+"----------------------\n"
+msgstr ""
+"Ñ¡ÔñÆäËü½Úµã£º\n"
+"----------------------\n"
+
+#: info/infodoc.c:55
+msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
+msgstr "\\%-10[next-node]  Òƶ¯µ½±¾½ÚµãµÄ¡°ÏÂÒ»¸ö¡±½Úµã¡£\n"
+
+#: info/infodoc.c:56
+msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
+msgstr "\\%-10[prev-node]  Òƶ¯µ½±¾½ÚµãµÄ¡°ÉÏÒ»¸ö¡±½Úµã¡£\n"
+
+#: info/infodoc.c:57
+msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
+msgstr "\\%-10[up-node]  Òƶ¯µ½±¾½ÚµãµÄ¡°Éϲ㡱½Úµã¡£\n"
+
+#: info/infodoc.c:58
+msgid ""
+"\\%-10[menu-item]  Pick menu item specified by name.\n"
+"              Picking a menu item causes another node to be selected.\n"
+msgstr ""
+"\\%-10[menu-item]  Ñ¡È¡ÓÉÃû³ÆÖ¸¶¨µÄ²Ëµ¥ÏîÄ¿¡£\n"
+"              Ñ¡È¡Ò»¸ö²Ëµ¥ÏîÄ¿µ¼ÖÂÑ¡ÖÐÁíÒ»¸ö½Úµã¡£\n"
+
+#: info/infodoc.c:60
+msgid ""
+"\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
+msgstr "\\%-10[xref-item]  ¸úËæ½»²æÒýÓ᣶ÁÈ¡ÒýÓõÄÃû³Æ¡£\n"
+
+#: info/infodoc.c:61
+msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
+msgstr "\\%-10[history-node]  Òƶ¯µ½±¾´°¿ÚµÄ×îºóÒ»¸ö¿É¼ûµÄ½Úµã¡£\n"
+
+#: info/infodoc.c:62
+msgid ""
+"\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
+msgstr "\\%-10[move-to-next-xref]  Ìøתµ½±¾½ÚµãÖеÄÏÂÒ»¸ö³¬Îı¾Á¬½Ó¡£\n"
+
+#: info/infodoc.c:63
+msgid ""
+"\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
+"node.\n"
+msgstr "\\%-10[move-to-prev-xref]  Ìøתµ½±¾½ÚµãÖеÄÉÏÒ»¸ö³¬Îı¾Á¬½Ó¡£\n"
+
+#: info/infodoc.c:64
+msgid ""
+"\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
+msgstr "\\%-10[select-reference-this-line]  ¸úËæ¹â±êϵij¬Îı¾Á¬½Ó¡£\n"
+
+#: info/infodoc.c:65
+msgid ""
+"\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
+"node] (DIR)'.\n"
+msgstr ""
+"\\%-10[dir-node]  Òƶ¯µ½¡°directory¡±½Úµã¡£µÈ¼ÛÓÚ¡°\\[goto-node] (DIR)¡±¡£\n"
+
+#: info/infodoc.c:66
+msgid ""
+"\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
+msgstr "\\%-10[top-node]  Òƶ¯µ½¶¥²ã½Úµã¡£µÈ¼ÛÓÚ¡°\\[goto-node] Top¡±¡£\n"
+
+#: info/infodoc.c:68 info/infodoc.c:116
+msgid ""
+"Moving within a node:\n"
+"---------------------\n"
+msgstr ""
+"ÔÚÒ»¸ö½ÚµãÖÐÒƶ¯£º\n"
+"---------------------\n"
+
+#: info/infodoc.c:70
+msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
+msgstr "\\%-10[beginning-of-node]  Òƶ¯µ½±¾½ÚµãµÄ¿ªÍ·¡£\n"
+
+#: info/infodoc.c:71
+msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
+msgstr "\\%-10[end-of-node]  Òƶ¯µ½±¾½ÚµãµÄĩβ¡£\n"
+
+#: info/infodoc.c:72
+#, fuzzy
+msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
+msgstr "  %-10s  ÏòÇ°¹ö¶¯Ò»ÐС£\n"
+
+#: info/infodoc.c:73
+#, fuzzy
+msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
+msgstr "  %-10s  Ïòºó¹ö¶¯Ò»ÐС£\n"
+
+#: info/infodoc.c:74
+msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
+msgstr "\\%-10[scroll-forward]  ÏòÇ°¹ö¶¯Ò»Ò³¡£\n"
+
+#: info/infodoc.c:75
+msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
+msgstr "\\%-10[scroll-backward]  Ïòºó¹ö¶¯Ò»Ò³¡£\n"
+
+#: info/infodoc.c:77 info/infodoc.c:125
+msgid ""
+"Other commands:\n"
+"---------------\n"
+msgstr ""
+"ÆäËüÃüÁ\n"
+"---------------\n"
+
+#: info/infodoc.c:79
+msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
+msgstr "\\%-10[menu-digit]  Ñ¡È¡½Úµã²Ëµ¥ÖеĵÚÒ»ÖÁµÚ¾Å¸öÏîÄ¿¡£\n"
+
+#: info/infodoc.c:80
+msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
+msgstr "\\%-10[last-menu-item]  Ñ¡È¡½Úµã²Ëµ¥µÄ×îºóÒ»¸öÏîÄ¿¡£\n"
+
+#: info/infodoc.c:81
+msgid ""
+"\\%-10[index-search]  Search for a specified string in the index entries of "
+"this Info\n"
+"              file, and select the node referenced by the first entry "
+"found.\n"
+msgstr ""
+"\\%-10[index-search]  ÔÚ±¾ Info ÎļþµÄË÷ÒýÌõÄ¿ÖÐËÑË÷Ö¸¶¨µÄ×Ö·û´®£¬\n"
+"              ²¢Ñ¡ÔñµÚÒ»¸öÕÒµ½µÄÌõÄ¿ËùÒýÓõĽڵ㡣\n"
+
+#: info/infodoc.c:83
+msgid ""
+"\\%-10[goto-node]  Move to node specified by name.\n"
+"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
+msgstr ""
+"\\%-10[goto-node]  Òƶ¯µ½ÓÉÃû×ÖÖ¸¶¨µÄ½Úµã¡£\n"
+"              Äú»¹¿ÉÒÔÒÔ (ÎļþÃû)½ÚµãÃû µÄÐÎʽ¸ø³öÎļþÃû¡£\n"
+
+#: info/infodoc.c:85
+msgid ""
+"\\%-10[search]  Search forward for a specified string\n"
+"              and select the node in which the next occurrence is found.\n"
+msgstr ""
+"\\%-10[search]  ÏòÇ°ËÑË÷Ö¸¶¨µÄ×Ö·û´®\n"
+"              ²¢Ñ¡ÔñËùÕÒµ½µÄÏÂÒ»¸öʵÀýËùÔڵĽڵ㡣\n"
+
+#: info/infodoc.c:87
+msgid ""
+"\\%-10[search-backward]  Search backward for a specified string\n"
+"              and select the node in which the previous occurrence is "
+"found.\n"
+msgstr ""
+"\\%-10[search-backward]  ÏòºóËÑË÷Ö¸¶¨µÄ×Ö·û´®\n"
+"              ²¢Ñ¡ÔñËùÕÒµ½µÄÉÏÒ»¸öʵÀýËùÔڵĽڵ㡣\n"
+
+#: info/infodoc.c:98
+#, c-format
+msgid "  %-10s  Quit this help.\n"
+msgstr "  %-10s  Í˳ö±¾ÇóÖú¡£\n"
+
+#: info/infodoc.c:99
+#, c-format
+msgid "  %-10s  Quit Info altogether.\n"
+msgstr "  %-10s  Ò»²¢Í˳ö Info¡£\n"
+
+#: info/infodoc.c:100
+#, c-format
+msgid "  %-10s  Invoke the Info tutorial.\n"
+msgstr "  %-10s  µ÷Óà Info ½Ì³Ì¡£\n"
+
+#: info/infodoc.c:104
+#, c-format
+msgid "  %-10s  Move to the `next' node of this node.\n"
+msgstr "  %-10s  Òƶ¯µ½±¾½ÚµãµÄ¡°ÏÂÒ»¸ö¡±½Úµã¡£\n"
+
+#: info/infodoc.c:105
+#, c-format
+msgid "  %-10s  Move to the `previous' node of this node.\n"
+msgstr "  %-10s  Òƶ¯µ½±¾½ÚµãµÄ¡°ÉÏÒ»¸ö¡±½Úµã¡£\n"
+
+#: info/infodoc.c:106
+#, c-format
+msgid "  %-10s  Move `up' from this node.\n"
+msgstr "  %-10s  Òƶ¯µ½±¾½ÚµãµÄ¡°Éϲ㡱½Úµã¡£\n"
+
+#: info/infodoc.c:107
+#, c-format
+msgid "  %-10s  Pick menu item specified by name.\n"
+msgstr "  %-10s  Ñ¡È¡ÓÉÃû³ÆÖ¸¶¨µÄ²Ëµ¥ÏîÄ¿¡£\n"
+
+#: info/infodoc.c:108
+msgid "              Picking a menu item causes another node to be selected.\n"
+msgstr "              Ñ¡È¡Ò»¸ö²Ëµ¥ÏîÄ¿½«Ñ¡ÖÐÁíÒ»¸ö½Úµã¡£\n"
+
+#: info/infodoc.c:109
+#, c-format
+msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
+msgstr "  %-10s  ¸úËæ½»²æÒýÓ᣶ÁÈ¡ÒýÓõÄÃû³Æ¡£\n"
+
+#: info/infodoc.c:110
+#, c-format
+msgid "  %-10s  Move to the last node seen in this window.\n"
+msgstr "  %-10s  Òƶ¯µ½±¾´°¿ÚÖеÄ×îºóÒ»¸ö¿É¼ûµÄ½Úµã¡£\n"
+
+#: info/infodoc.c:111
+#, c-format
+msgid "  %-10s  Skip to next hypertext link within this node.\n"
+msgstr "  %-10s  Ìøתµ½±¾½ÚµãÖеÄÏÂÒ»¸ö³¬Îı¾Á¬½Ó¡£\n"
+
+#: info/infodoc.c:112
+#, c-format
+msgid "  %-10s  Follow the hypertext link under cursor.\n"
+msgstr "  %-10s  ¸úËæ¹â±êλÖõij¬Îı¾Á¬½Ó¡£\n"
+
+#: info/infodoc.c:113
+#, c-format
+msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
+msgstr "  %-10s  Òƶ¯µ½¡°directory¡±½Úµã¡£µÈ¼ÛÓÚ¡°g (DIR)¡±¡£\n"
+
+#: info/infodoc.c:114
+#, c-format
+msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
+msgstr "  %-10s  Òƶ¯µ½¶¥²ã½Úµã¡£µÈ¼ÛÓÚ¡°g Top¡±¡£\n"
+
+#: info/infodoc.c:118
+#, c-format
+msgid "  %-10s  Scroll forward a page.\n"
+msgstr "  %-10s  ÏòÇ°¹ö¶¯Ò»Ò³¡£\n"
+
+#: info/infodoc.c:119
+#, c-format
+msgid "  %-10s  Scroll backward a page.\n"
+msgstr "  %-10s  Ïòºó¹ö¶¯Ò»Ò³¡£\n"
+
+#: info/infodoc.c:120
+#, c-format
+msgid "  %-10s  Go to the beginning of this node.\n"
+msgstr "  %-10s  תÒƵ½±¾½ÚµãµÄ¿ªÍ·¡£\n"
+
+#: info/infodoc.c:121
+#, c-format
+msgid "  %-10s  Go to the end of this node.\n"
+msgstr "  %-10s  תÒƵ½±¾½ÚµãµÄĩβ¡£\n"
+
+#: info/infodoc.c:122
+#, c-format
+msgid "  %-10s  Scroll forward 1 line.\n"
+msgstr "  %-10s  ÏòÇ°¹ö¶¯Ò»ÐС£\n"
+
+#: info/infodoc.c:123
+#, c-format
+msgid "  %-10s  Scroll backward 1 line.\n"
+msgstr "  %-10s  Ïòºó¹ö¶¯Ò»ÐС£\n"
+
+#: info/infodoc.c:127
+#, c-format
+msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
+msgstr "  %-10s  Ñ¡È¡½Úµã²Ëµ¥ÖеĵÚÒ»ÖÁµÚ¾Å¸öÏîÄ¿¡£\n"
+
+#: info/infodoc.c:128
+#, c-format
+msgid "  %-10s  Pick last item in node's menu.\n"
+msgstr "  %-10s  Ñ¡È¡½Úµã²Ëµ¥ÖеÄ×îºóÒ»¸öÏîÄ¿¡£\n"
+
+#: info/infodoc.c:129
+#, c-format
+msgid ""
+"  %-10s  Search for a specified string in the index entries of this Info\n"
+msgstr "  %-10s  ÔÚ±¾ Info ÎļþÖеÄË÷ÒýÌõÄ¿ÖÐËÑË÷Ö¸¶¨µÄ×Ö·û´®£¬\n"
+
+#: info/infodoc.c:130
+msgid ""
+"              file, and select the node referenced by the first entry "
+"found.\n"
+msgstr "              ²¢Ñ¡ÔñµÚÒ»¸öÕÒµ½µÄÌõÄ¿ËùÒýÓõĽڵ㡣\n"
+
+#: info/infodoc.c:131
+#, c-format
+msgid "  %-10s  Move to node specified by name.\n"
+msgstr "  %-10s  Òƶ¯µ½ÓÉÃû×ÖÖ¸¶¨µÄ½Úµã¡£\n"
+
+#: info/infodoc.c:132
+msgid ""
+"              You may include a filename as well, as in (FILENAME)NODENAME.\n"
+msgstr "              Äú»¹¿ÉÒÔͬʱ¸ø³öÎļþÃû£¬ÐÎʽΪ (ÎļþÃû)½ÚµãÃû¡£\n"
+
+#: info/infodoc.c:133
+#, c-format
+msgid "  %-10s  Search forward for a specified string,\n"
+msgstr "  %-10s  ÏòÇ°ËÑË÷Ö¸¶¨µÄ×Ö·û´®£¬\n"
+
+#: info/infodoc.c:134 info/infodoc.c:136
+msgid ""
+"              and select the node in which the next occurrence is found.\n"
+msgstr "              ²¢Ñ¡ÔñÕÒµ½µÄÏÂÒ»¸öʵÀýËùÔڵĽڵ㡣\n"
+
+#: info/infodoc.c:135
+#, c-format
+msgid "  %-10s  Search backward for a specified string\n"
+msgstr "  %-10s  ÏòºóËÑË÷Ö¸¶¨µÄ×Ö·û´®\n"
+
+#: info/infodoc.c:316
+msgid "The current search path is:\n"
+msgstr "µ±Ç°ËÑË÷·¾¶Îª£º\n"
+
+#: info/infodoc.c:320
+msgid ""
+"Commands available in Info windows:\n"
+"\n"
+msgstr ""
+"Info ´°¿ÚÖпÉÓõÄÃüÁ\n"
+"\n"
+
+#: info/infodoc.c:324
+msgid ""
+"Commands available in the echo area:\n"
+"\n"
+msgstr ""
+"»ØÏÔÇøÖпÉÓõÄÃüÁ\n"
+"\n"
+
+#: info/infodoc.c:347
+#, c-format
+msgid ""
+"The following commands can only be invoked via %s:\n"
+"\n"
+msgstr ""
+"ÒÔÏÂÃüÁîÖ»ÄÜͨ¹ý %s µ÷Óãº\n"
+"\n"
+
+#: info/infodoc.c:351
+msgid ""
+"The following commands cannot be invoked at all:\n"
+"\n"
+msgstr ""
+"ÒÔÏÂÃüÁî¸ù±¾ÎÞ·¨µ÷Óãº\n"
+"\n"
+
+#: info/infodoc.c:375
+msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
+msgstr "--- Óá°\\[history-node]¡±»ò¡°\\[kill-node]¡±Í˳ö ---\n"
+
+#: info/infodoc.c:485
+msgid "Display help message"
+msgstr "ÏÔʾÇóÖúÏûÏ¢"
+
+#: info/infodoc.c:503
+msgid "Visit Info node `(info)Help'"
+msgstr "·ÃÎÊ Info ½Úµã¡°(info)Help¡±"
+
+#: info/infodoc.c:641
+msgid "Print documentation for KEY"
+msgstr "´òÓ¡¹ØÓÚ KEY µÄÎĵµ"
+
+#: info/infodoc.c:653
+#, c-format
+msgid "Describe key: %s"
+msgstr "˵Ã÷°´¼ü£º%s"
+
+#: info/infodoc.c:664
+#, c-format
+msgid "ESC %s is undefined."
+msgstr "ESC %s 䶨Òå¡£"
+
+#: info/infodoc.c:680 info/infodoc.c:709
+#, c-format
+msgid "%s is undefined."
+msgstr "%s 䶨Òå¡£"
+
+#: info/infodoc.c:730
+#, c-format
+msgid "%s is defined to %s."
+msgstr "%s ±»¶¨ÒåΪ %s¡£"
+
+#: info/infodoc.c:1153
+msgid "Show what to type to execute a given command"
+msgstr "ÏÔʾִÐиø¶¨ÃüÁîËùÐèµÄ°´¼ü"
+
+#: info/infodoc.c:1157
+msgid "Where is command: "
+msgstr ""
+
+#: info/infodoc.c:1179
+#, c-format
+msgid "`%s' is not on any keys"
+msgstr "¡°%s¡±Î´°ó¶¨µ½Èκΰ´¼ü"
+
+#: info/infodoc.c:1186
+#, c-format
+msgid "%s can only be invoked via %s."
+msgstr "%s ²»ÄÜͨ¹ý %s µ÷Óá£"
+
+#: info/infodoc.c:1190
+#, c-format
+msgid "%s can be invoked via %s."
+msgstr "%s ¿ÉÒÔͨ¹ý %s µ÷Óá£"
+
+#: info/infodoc.c:1195
+#, c-format
+msgid "There is no function named `%s'"
+msgstr "ûÓÐÃûΪ¡°%s¡±µÄº¯Êý"
+
+#: info/infokey.c:145
+#, 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 ""
+"°æȨËùÓÐ (C) %s ×ÔÓÉÈí¼þ»ù½ð»á¡£\n"
+"±¾Èí¼þûÓÐÈκε£±£¡£Äú¿ÉÒÔ°´ÕÕͨÓÃ\n"
+"¹«¹²Ðí¿ÉÖ¤(GPL)µÄÌõ¿î·¢Ðб¾Èí¼þ¡£\n"
+"Õâ·½ÃæµÄÏêÇ飬ÇëÔĶÁÃûΪ COPYING µÄÎļþ¡£\n"
+
+#: info/infokey.c:170
+msgid "incorrect number of arguments"
+msgstr "´íÎóµÄ²ÎÊýÊý"
+
+#: info/infokey.c:201
+#, c-format
+msgid "cannot open input file `%s'"
+msgstr "ÎÞ·¨´ò¿ªÊäÈëÎļþ¡°%s¡±"
+
+#: info/infokey.c:215
+#, c-format
+msgid "cannot create output file `%s'"
+msgstr "ÎÞ·¨´´½¨Êä³öÎļþ¡°%s¡±"
+
+#: info/infokey.c:226
+#, c-format
+msgid "error writing to `%s'"
+msgstr "дÈë¡°%s¡±Ê±³ö´í"
+
+#: info/infokey.c:232
+#, c-format
+msgid "error closing output file `%s'"
+msgstr "¹Ø±ÕÊä³öÎļþ¡°%s¡±Ê±³ö´í"
+
+#: info/infokey.c:450
+msgid "key sequence too long"
+msgstr "°´¼üÐòÁйý³¤"
+
+#: info/infokey.c:529
+msgid "missing key sequence"
+msgstr "ÒÅ©°´¼üÐòÁÐ"
+
+#: info/infokey.c:610
+msgid "NUL character (\\000) not permitted"
+msgstr "²»ÔÊÐíµÄ¿Õ×Ö·û (\\\\000)"
+
+#: info/infokey.c:641
+#, c-format
+msgid "NUL character (^%c) not permitted"
+msgstr "²»ÔÊÐíµÄ¿Õ×Ö·û (^%c)"
+
+#: info/infokey.c:665
+msgid "missing action name"
+msgstr "ÒÅ©¶¯×÷Ãû³Æ"
+
+#: info/infokey.c:681 info/infokey.c:756
+msgid "section too long"
+msgstr "½ÚÌ«³¤"
+
+#: info/infokey.c:688
+#, c-format
+msgid "unknown action `%s'"
+msgstr "δ֪µÄ¶¯×÷¡°%s¡±"
+
+#: info/infokey.c:698
+msgid "action name too long"
+msgstr "¶¯×÷Ãû¹ý³¤"
+
+#: info/infokey.c:712
+#, c-format
+msgid "extra characters following action `%s'"
+msgstr "¶¯×÷¡°%s¡±Ö®ºó³öÏÖ¶îÍâµÄ×Ö·û"
+
+#: info/infokey.c:723
+msgid "missing variable name"
+msgstr "ÒÅ©±äÁ¿Ãû"
+
+#: info/infokey.c:733
+msgid "missing `=' immediately after variable name"
+msgstr "±äÁ¿ÃûÖ®ºóÒÅ©ÁË¡°=¡±"
+
+#: info/infokey.c:741
+msgid "variable name too long"
+msgstr "±äÁ¿Ãû¹ý³¤"
+
+#: info/infokey.c:765
+msgid "value too long"
+msgstr "Öµ¹ý³¤"
+
+#: info/infokey.c:890
+#, c-format
+msgid "\"%s\", line %u: "
+msgstr "¡°%s¡±£¬ÐÐ %u£º"
+
+#: info/infokey.c:906
+#, c-format
+msgid ""
+"Usage: %s [OPTION]... [INPUT-FILE]\n"
+"\n"
+"Compile infokey source file to infokey file.  Reads INPUT-FILE (default\n"
+"$HOME/.infokey) and writes compiled key file to (by default) $HOME/.info.\n"
+"\n"
+"Options:\n"
+"  --output FILE        output to FILE instead of $HOME/.info\n"
+"  --help               display this help and exit.\n"
+"  --version            display version information and exit.\n"
+msgstr ""
+"Ó÷¨£º%s [Ñ¡Ïî]... [ÊäÈëÎļþ]\n"
+"\n"
+"½« infokey Ô´Îļþ±àÒëΪ infokey Îļþ¡£¶ÁÈ¡ÊäÈëÎļþ(ĬÈÏΪ\n"
+"$HOME/.infokey) ²¢½«±àÒëÍê³ÉµÄ¼üÎļþдÈëµ½ (ĬÈÏΪ) $HOME/.info¡£\n"
+"\n"
+"Ñ¡Ï\n"
+"  --output FILE        Êä³öµ½Îļþ FILE ¶ø²»ÊÇ $HOME/.info ÖС£\n"
+"  --help               ÏÔʾ¸ÃÇóÖúÐÅÏ¢²¢Í˳ö¡£\n"
+"  --version            ÏÔʾ°æ±¾ÐÅÏ¢²¢Í˳ö¡£\n"
+
+#: info/infomap.c:1500
+#, c-format
+msgid "Ignoring invalid infokey file `%s' - too small"
+msgstr "ºöÂÔ·Ç·¨µÄ infokey Îļþ¡°%s¡± - ̫С"
+
+#: info/infomap.c:1503
+#, c-format
+msgid "Ignoring invalid infokey file `%s' - too big"
+msgstr "ºöÂÔ·Ç·¨µÄ infokey Îļþ¡°%s¡± - Ì«´ó"
+
+#: info/infomap.c:1516
+#, c-format
+msgid "Error reading infokey file `%s' - short read"
+msgstr "¶ÁÈë infokey Îļþ¡°%s¡±Ê±³ö´í - ¶ÁÈëÖжÏ"
+
+#: info/infomap.c:1535
+#, c-format
+msgid ""
+"Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
+msgstr "·Ç·¨µÄ infokey Îļþ¡°%s¡± (´íÎóµÄ magic ±àºÅ) -- ÔËÐÐ infokey ÒÔ±ã¸üÐÂ"
+
+#: info/infomap.c:1544
+#, c-format
+msgid "Your infokey file `%s' is out of date -- run infokey to update it"
+msgstr "ÄúµÄ infokey Îļþ¡°%s¡± ¹ýʱÁË -- ÔËÐÐ infokey ÒÔ±ã¸üÐÂ"
+
+#: info/infomap.c:1560
+#, c-format
+msgid ""
+"Invalid infokey file `%s' (bad section length) -- run infokey to update it"
+msgstr "·Ç·¨µÄ infokey Îļþ¡°%s¡± (´íÎóµÄ½Ú³¤¶È) -- ÔËÐÐ infokey ÒÔ±ã¸üÐÂ"
+
+#: info/infomap.c:1581
+#, c-format
+msgid ""
+"Invalid infokey file `%s' (bad section code) -- run infokey to update it"
+msgstr "·Ç·¨µÄ infokey Îļþ¡°%s¡± (´íÎóµÄ½Ú±àÂë) -- ÔËÐÐ infokey ÒÔ±ã¸üÐÂ"
+
+#: info/infomap.c:1716
+msgid "Bad data in infokey file -- some key bindings ignored"
+msgstr "infokey ÎļþÖеĴíÎóÊý¾Ý -- ºöÂÔijЩ°´¼ü°ó¶¨"
+
+#: info/infomap.c:1766
+msgid "Bad data in infokey file -- some var settings ignored"
+msgstr "infokey ÎļþÖеĴíÎóÊý¾Ý -- ºöÂÔijЩ±äÁ¿ÉèÖÃ"
+
+#: info/m-x.c:69
+msgid "Read the name of an Info command and describe it"
+msgstr "¶ÁÈ¡ Info ÃüÁîÃû³Æ²¢ËµÃ÷Ëü"
+
+#: info/m-x.c:73
+msgid "Describe command: "
+msgstr "˵Ã÷ÃüÁ"
+
+#: info/m-x.c:96
+msgid "Read a command name in the echo area and execute it"
+msgstr "ÔÚ»ØÏÔÇø¶ÁÈëÃüÁîÃû²¢Ö´ÐÐËü"
+
+#: info/m-x.c:140
+msgid "Cannot execute an `echo-area' command here."
+msgstr "ÎÞ·¨ÔÚÕâÀïÔËÐС°»ØÏÔÇø¡±ÃüÁî¡£"
+
+#: info/m-x.c:154
+#, fuzzy, c-format
+msgid "Undefined command: %s"
+msgstr "δ֪µÄÃüÁî¡°%s¡±"
+
+#: info/m-x.c:160
+msgid "Set the height of the displayed window"
+msgstr "É趨ÏÔʾ´°¿ÚµÄ¸ß¶È"
+
+#: info/m-x.c:173
+#, c-format
+msgid "Set screen height to (%d): "
+msgstr "½«ÆÁÄ»¸ß¶ÈÉèÖÃΪ (%d)£º"
+
+#: info/makedoc.c:162 info/makedoc.c:170
+#, c-format
+msgid ""
+"   Source files groveled to make this file include:\n"
+"\n"
+msgstr ""
+"   ÕûÀíÔ´ÎļþÒÔʹ±¾Îļþ°üÀ¨£º\n"
+"\n"
+
+#: info/makedoc.c:550
+#, c-format
+msgid "Couldn't manipulate the file %s.\n"
+msgstr "ÎÞ·¨²Ù×÷Îļþ %s¡£\n"
+
+#: info/nodemenu.c:31
+msgid ""
+"\n"
+"* Menu:\n"
+"  (File)Node                        Lines   Size   Containing File\n"
+"  ----------                        -----   ----   ---------------"
+msgstr ""
+"\n"
+"* ²Ëµ¥£º\n"
+"  (Îļþ)½Úµã                         ÐÐ      ´óС    º¬ÓÐÎļþ\n"
+"  ----------                        -----   ----   ---------------"
+
+#: info/nodemenu.c:202
+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 ""
+"ÕâÀïÊÇÄú×î½ü·ÃÎʽڵãµÄ²Ëµ¥¡£\n"
+"´Ó²Ëµ¥ÖÐÑ¡ÔñÒ»¸ö£¬»òÔÚÆäËü´°¿ÚÖÐʹÓá°\\[history-node]¡±¡£\n"
+
+#: info/nodemenu.c:224
+msgid "Make a window containing a menu of all of the currently visited nodes"
+msgstr "ʹһ¸ö´°¿Úº¬ÓÐÒ»¸ö°üÀ¨ËùÓе±Ç°·ÃÎʽڵãµÄ²Ëµ¥"
+
+#: info/nodemenu.c:304
+msgid "Select a node which has been previously visited in a visible window"
+msgstr "Ñ¡ÔñÒ»¸öÒѾ­ÔڿɼûµÄ´°¿ÚÖзÃÎʵĽڵã"
+
+#: info/nodemenu.c:317
+msgid "Select visited node: "
+msgstr "Ñ¡ÔñÒÑ·ÃÎʵĽڵ㣺"
+
+#: info/nodemenu.c:337 info/session.c:2264
+#, c-format
+msgid "The reference disappeared! (%s)."
+msgstr "ÒýÓÃÏûʧÁË£¡(%s)¡£"
+
+#: info/session.c:162
+#, c-format
+msgid ""
+"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
+"for menu item."
+msgstr ""
+"»¶Ó­Ê¹Óà Info %s °æ¡£ÊäÈë \\[get-help-window] ÒÔ»ñµÃ°ïÖú£¬\\[menu-item] ½«µÃ"
+"µ½²Ëµ¥¡£"
+
+#: info/session.c:620
+msgid "Move down to the next line"
+msgstr "ÏòÏÂÒƶ¯µ½ÏÂÒ»ÐÐ"
+
+#: info/session.c:635
+msgid "Move up to the previous line"
+msgstr "ÏòÉÏÒƶ¯µ½ÉÏÒ»ÐÐ"
+
+#: info/session.c:650
+msgid "Move to the end of the line"
+msgstr "Òƶ¯µ½ÐеÄĩβ"
+
+#: info/session.c:670
+msgid "Move to the start of the line"
+msgstr "Òƶ¯µ½ÐеĿªÍ·"
+
+#: info/session.c:860 makeinfo/node.c:1424
+msgid "Next"
+msgstr "ÏÂÒ»¸ö"
+
+#: info/session.c:863
+msgid "Following Next node..."
+msgstr "¸úËæÏÂÒ»¸ö½Úµã..."
+
+#: info/session.c:881
+msgid "Selecting first menu item..."
+msgstr "Ñ¡ÔñµÚÒ»¸ö²Ëµ¥Ïî..."
+
+#: info/session.c:893
+msgid "Selecting Next node..."
+msgstr "Ñ¡ÔñÏÂÒ»¸ö½Úµã..."
+
+#: info/session.c:964
+#, c-format
+msgid "Moving Up %d time(s), then Next."
+msgstr "ÏòÉÏÒƶ¯ %d ´Î£¬¶øºóºóÒÆ¡£"
+
+#: info/session.c:988
+msgid "No more nodes within this document."
+msgstr "±¾ÎĵµÖÐûÓиü¶àµÄ½Úµã¡£"
+
+#: info/session.c:1011
+msgid "No `Prev' for this node."
+msgstr "±¾½ÚµãûÓС°ÉÏÒ»¸ö¡±¡£"
+
+#: info/session.c:1014 info/session.c:1073
+msgid "Moving Prev in this window."
+msgstr "ÔÚ±¾´°¿ÚÖÐÏòÉÏÒƶ¯¡£"
+
+#: info/session.c:1030
+msgid "No `Prev' or `Up' for this node within this document."
+msgstr "ÔÚ±¾ÎĵµÖÐûÓб¾½ÚµãµÄ¡°ÉÏÒ»¸ö¡±»ò¡°Éϲ㡱½Úµã¡£"
+
+#: info/session.c:1034
+msgid "Moving Up in this window."
+msgstr "ÔÚ±¾´°¿ÚÖÐÏòÉϲãÒƶ¯"
+
+#: info/session.c:1084
+msgid "Moving to `Prev's last menu item."
+msgstr "Òƶ¯µ½Ç°Ò»¸öµÄ×îºóÒ»¸ö²Ëµ¥ÏîÄ¿¡£"
+
+#: info/session.c:1095
+msgid "Move forwards or down through node structure"
+msgstr "ÔÚ½Úµã½á¹¹ÖÐÏòÇ°»òÏòϲãÒƶ¯"
+
+#: info/session.c:1111
+msgid "Move backwards or up through node structure"
+msgstr "ÔÚ½Úµã½á¹¹ÖÐÏòºó»òÏòÉϲãÒƶ¯"
+
+#: info/session.c:1205
+msgid "Scroll forward in this window"
+msgstr "ÔÚ±¾´°¿ÚÖÐÏòÇ°¹ö¶¯"
+
+#: info/session.c:1213
+msgid "Scroll forward in this window and set default window size"
+msgstr "ÔÚ±¾´°¿ÚÖÐÏòÇ°¹ö¶¯²¢ÉèÖÃΪĬÈÏ´°¿Ú´óС"
+
+#: info/session.c:1221
+msgid "Scroll forward in this window staying within node"
+msgstr "ÔÚ±¾´°¿ÚÖÐÏòÇ°¹ö¶¯(²»´©Ô½½Úµã)"
+
+#: info/session.c:1229
+msgid ""
+"Scroll forward in this window staying within node and set default window size"
+msgstr "ÔÚ±¾´°¿ÚÖÐÏòÇ°¹ö¶¯(²»´©Ô½½Úµã)²¢ÉèÖÃĬÈÏ´°¿Ú´óС"
+
+#: info/session.c:1237
+msgid "Scroll backward in this window"
+msgstr "ÔÚ±¾´°¿ÚÖÐÏòºó¹ö¶¯"
+
+#: info/session.c:1245
+msgid "Scroll backward in this window and set default window size"
+msgstr "ÔÚ±¾´°¿ÚÖÐÏòºó¹ö¶¯²¢ÉèÖÃΪĬÈÏ´°¿Ú´óС"
+
+#: info/session.c:1254
+msgid "Scroll backward in this window staying within node"
+msgstr "ÔÚ±¾´°¿ÚÖÐÏòºó¹ö¶¯(²»´©Ô½½Úµã)"
+
+#: info/session.c:1262
+msgid ""
+"Scroll backward in this window staying within node and set default window "
+"size"
+msgstr "ÔÚ±¾´°¿ÚÖÐÏòºó¹ö¶¯(²»´©Ô½½Úµã)²¢ÉèÖÃΪĬÈÏ´°¿Ú´óС"
+
+#: info/session.c:1270
+msgid "Move to the start of this node"
+msgstr "Òƶ¯µ½±¾½ÚµãµÄ¿ªÍ·"
+
+#: info/session.c:1277
+msgid "Move to the end of this node"
+msgstr "Òƶ¯µ½±¾½ÚµãµÄĩβ"
+
+#: info/session.c:1284
+msgid "Scroll down by lines"
+msgstr "°´ÐÐÏòϹö¶¯"
+
+#: info/session.c:1301
+msgid "Scroll up by lines"
+msgstr "°´ÐÐÏòÉϹö¶¯"
+
+#: info/session.c:1319
+msgid "Scroll down by half screen size"
+msgstr "ÏòϹö¶¯°ë¸öÆÁÄ»"
+
+#: info/session.c:1345
+msgid "Scroll up by half screen size"
+msgstr "ÏòÉϹö¶¯°ë¸öÆÁÄ»"
+
+#: info/session.c:1374
+msgid "Select the next window"
+msgstr "Ñ¡ÔñÏÂÒ»¸ö´°¿Ú"
+
+#: info/session.c:1413
+msgid "Select the previous window"
+msgstr "Ñ¡ÔñÉÏÒ»¸ö´°¿Ú"
+
+#: info/session.c:1464
+msgid "Split the current window"
+msgstr "²ð·Öµ±Ç°´°¿Ú"
+
+#: info/session.c:1545
+msgid "Delete the current window"
+msgstr "ɾ³ýµ±Ç°´°¿Ú"
+
+#: info/session.c:1553
+msgid "Cannot delete a permanent window"
+msgstr "ÎÞ·¨É¾³ýÓÀ¾Ã´°¿Ú"
+
+#: info/session.c:1585
+msgid "Delete all other windows"
+msgstr "ɾ³ýËùÓÐÆäËü´°¿Ú"
+
+#: info/session.c:1631
+msgid "Scroll the other window"
+msgstr "¹ö¶¯ÆäËü´°¿Ú"
+
+#: info/session.c:1652
+msgid "Scroll the other window backward"
+msgstr "Ïòºó¹ö¶¯ÆäËü´°¿Ú"
+
+#: info/session.c:1658
+msgid "Grow (or shrink) this window"
+msgstr "À©´ó(»òËõС)±¾´°¿Ú"
+
+#: info/session.c:1669
+msgid "Divide the available screen space among the visible windows"
+msgstr "ÔڿɼûµÄ´°¿Ú¼ä·ÖÅä¿ÉÓõÄÆÁÄ»¿Õ¼ä"
+
+#: info/session.c:1676
+msgid "Toggle the state of line wrapping in the current window"
+msgstr "ÔÚµ±Ç°´°¿ÚÖÐÇл»ÐоíÈÆ״̬"
+
+#: info/session.c:1848
+msgid "Select the Next node"
+msgstr "Ñ¡ÔñÏÂÒ»¸ö½Úµã"
+
+#: info/session.c:1856
+msgid "Select the Prev node"
+msgstr "Ñ¡ÔñÉÏÒ»¸ö½Úµã"
+
+#: info/session.c:1864
+msgid "Select the Up node"
+msgstr "Ñ¡ÔñÉϲã½Úµã"
+
+#: info/session.c:1871
+msgid "Select the last node in this file"
+msgstr "Ñ¡Ôñ±¾ÎļþµÄ×îºóÒ»¸ö½Úµã"
+
+#: info/session.c:1898 info/session.c:1931
+msgid "This window has no additional nodes"
+msgstr "¸Ã´°¿ÚûÓи½¼Ó½Úµã"
+
+#: info/session.c:1904
+msgid "Select the first node in this file"
+msgstr "Ñ¡Ôñ±¾ÎļþµÄµÚÒ»¸ö½Úµã"
+
+#: info/session.c:1938
+msgid "Select the last item in this node's menu"
+msgstr "Ñ¡Ôñ±¾½Úµã²Ëµ¥ÖеÄ×îºóÒ»Ïî"
+
+#: info/session.c:1944
+msgid "Select this menu item"
+msgstr "Ñ¡Ôñ±¾²Ëµ¥ÏîÄ¿"
+
+#: info/session.c:1977
+#, c-format
+msgid "There aren't %d items in this menu."
+msgstr "±¾²Ëµ¥ÖÐûÓÐµÚ %d ¸öÏîÄ¿¡£"
+
+#: info/session.c:2171 info/session.c:2172
+#, c-format
+msgid "Menu item (%s): "
+msgstr "²Ëµ¥Ïî (%s)£º"
+
+#: info/session.c:2175
+msgid "Menu item: "
+msgstr "²Ëµ¥Ï"
+
+#: info/session.c:2182 info/session.c:2183
+#, c-format
+msgid "Follow xref (%s): "
+msgstr "¸úËæ½»²æÒýÓà (%s)£º"
+
+#: info/session.c:2186
+msgid "Follow xref: "
+msgstr "¸úËæ½»²æÒýÓãº"
+
+#: info/session.c:2315
+msgid "Read a menu item and select its node"
+msgstr "¶ÁÈ¡²Ëµ¥ÏѡÔñËüµÄ½Úµã"
+
+#: info/session.c:2323
+msgid "Read a footnote or cross reference and select its node"
+msgstr "¶ÁÈ¡½Å×¢»ò½»²æÒýÓò¢Ñ¡ÔñËüµÄ½Úµã"
+
+#: info/session.c:2329
+msgid "Move to the start of this node's menu"
+msgstr "Òƶ¯µ½±¾½Úµã²Ëµ¥µÄ¿ªÍ·"
+
+#: info/session.c:2353
+msgid "Visit as many menu items at once as possible"
+msgstr "Á¢¿Ì·ÃÎʾ¡¿ÉÄܶàµÄ²Ëµ¥Ïî"
+
+#: info/session.c:2381
+msgid "Read a node name and select it"
+msgstr "¶ÁÈ¡½ÚµãÃû²¢Ñ¡ÔñËü"
+
+#: info/session.c:2436 info/session.c:2441
+msgid "Goto node: "
+msgstr "תµ½½Úµã£º"
+
+#: info/session.c:2505
+#, c-format
+msgid "No menu in node `%s'."
+msgstr "½Úµã¡°%s¡±ÖÐûÓв˵¥¡£"
+
+#: info/session.c:2551
+#, c-format
+msgid "No menu item `%s' in node `%s'."
+msgstr "½Úµã¡°%2$s¡±ÖÐûÓв˵¥Ïî¡°%1$s¡±¡£"
+
+#: info/session.c:2581
+#, c-format
+msgid "Unable to find node referenced by `%s' in `%s'."
+msgstr "ÎÞ·¨ÔÚ¡°%2$s¡±ÖÐÕÒµ½ÓÉ¡°%1$s¡±ÒýÓõĽڵ㡣"
+
+#: info/session.c:2631
+msgid "Read a list of menus starting from dir and follow them"
+msgstr "¶ÁÈ¡×Ô dir ¿ªÊ¼µÄ²Ëµ¥µÄÁÐ±í²¢¸úËæËüÃÇ"
+
+#: info/session.c:2633
+msgid "Follow menus: "
+msgstr "¸úËæ²Ëµ¥£º"
+
+#: info/session.c:2826
+msgid "Find the node describing program invocation"
+msgstr "Ñ°ÕÒ˵Ã÷³ÌÐòµ÷ÓõĽڵã"
+
+#: info/session.c:2828
+#, c-format
+msgid "Find Invocation node of [%s]: "
+msgstr "Ñ°ÕÒ [%s] µÄµ÷Óýڵ㣺"
+
+#: info/session.c:2866
+msgid "Read a manpage reference and select it"
+msgstr "¶ÁÈ¡Ò»¸ö man ÊÖ²áµÄÒýÓò¢Ñ¡ÔñËü"
+
+#: info/session.c:2870
+msgid "Get Manpage: "
+msgstr "»ñÈ¡ man Êֲ᣺"
+
+#: info/session.c:2900
+msgid "Select the node `Top' in this file"
+msgstr "Ñ¡Ôñ±¾ÎļþÖеġ°¶¥¡±½Úµã"
+
+#: info/session.c:2906
+msgid "Select the node `(dir)'"
+msgstr "Ñ¡Ôñ½Úµã¡°(dir)¡±"
+
+#: info/session.c:2923 info/session.c:2925
+#, c-format
+msgid "Kill node (%s): "
+msgstr "ɾ³ý½Úµã (%s)£º"
+
+#: info/session.c:2977
+#, c-format
+msgid "Cannot kill node `%s'"
+msgstr "ÎÞ·¨É¾³ý½Úµã¡°%s¡±"
+
+#: info/session.c:2987
+msgid "Cannot kill the last node"
+msgstr "ÎÞ·¨É¾³ý×îºóµÄ½Úµã"
+
+#: info/session.c:3073
+msgid "Select the most recently selected node"
+msgstr "Ñ¡Ôñ×î½üÑ¡ÔñµÄ½Úµã"
+
+#: info/session.c:3079
+msgid "Kill this node"
+msgstr "ɾ³ý±¾½Úµã"
+
+#: info/session.c:3087
+msgid "Read the name of a file and select it"
+msgstr "¶ÁÈ¡ÎļþÃû²¢Ñ¡ÔñËü"
+
+#: info/session.c:3091
+msgid "Find file: "
+msgstr "Ñ°ÕÒÎļþ£º"
+
+#: info/session.c:3108
+#, c-format
+msgid "Cannot find `%s'."
+msgstr "ÎÞ·¨Ñ°ÕÒ¡°%s¡±¡£"
+
+#: info/session.c:3151 info/session.c:3269
+#, c-format
+msgid "Could not create output file `%s'."
+msgstr "ÎÞ·¨´´½¨Êä³öÎļþ¡°%s¡±¡£"
+
+#: info/session.c:3165 info/session.c:3287 info/session.c:3347
+msgid "Done."
+msgstr "Íê³É¡£"
+
+#: info/session.c:3220
+#, c-format
+msgid "Writing node %s..."
+msgstr "ÕýÔÚдÈë½Úµã %s..."
+
+#: info/session.c:3296
+msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
+msgstr "ͨ¹ý¹ÜµÀ½«±¾½ÚµãµÄÄÚÈÝÊä³öµ½ INFO_PRINT_COMMAND"
+
+#: info/session.c:3331
+#, c-format
+msgid "Cannot open pipe to `%s'."
+msgstr "ÎÞ·¨´ò¿ªµ½¡°%s¡±µÄ¹ÜµÀ¡£"
+
+#: info/session.c:3337
+#, c-format
+msgid "Printing node %s..."
+msgstr "ÕýÔÚ´òÓ¡½Úµã %s..."
+
+#: info/session.c:3567
+#, c-format
+msgid "Searching subfile %s ..."
+msgstr "ÕýÔÚËÑË÷×ÓÎļþ %s ..."
+
+#: info/session.c:3619
+msgid "Read a string and search for it case-sensitively"
+msgstr "¶ÁÈ¡Ò»¸ö×Ö·û´®²¢ÒÔ´óСдÃô¸ÐµÄ·½Ê½ËÑË÷Ëü"
+
+#: info/session.c:3626
+msgid "Read a string and search for it"
+msgstr "¶ÁÈ¡Ò»¸ö×Ö·û´®²¢ËÑË÷Ëü"
+
+#: info/session.c:3634
+msgid "Read a string and search backward for it"
+msgstr "¶ÁÈ¡Ò»¸ö×Ö·û´®²¢ÏòºóËÑË÷Ëü"
+
+#: info/session.c:3670 info/session.c:3677
+#, c-format
+msgid "%s%sfor string [%s]: "
+msgstr "%2$s%1$s×Ö·û´® [%3$s]£º"
+
+#: info/session.c:3671 info/session.c:3678
+msgid "Search backward"
+msgstr "ÏòºóËÑË÷"
+
+#: info/session.c:3672 info/session.c:3678
+msgid "Search"
+msgstr "ËÑË÷"
+
+#: info/session.c:3673 info/session.c:3679
+msgid " case-sensitively "
+msgstr "´óСдÃô¸ÐµØ"
+
+#: info/session.c:3674 info/session.c:3679
+msgid " "
+msgstr " "
+
+#: info/session.c:3718
+msgid "Search failed."
+msgstr "ËÑË÷ʧ°Ü¡£"
+
+#: info/session.c:3736
+msgid "Repeat last search in the same direction"
+msgstr "ÒÔÏàͬµÄ·½ÏòÖظ´×îºóµÄËÑË÷"
+
+#: info/session.c:3739 info/session.c:3749
+msgid "No previous search string"
+msgstr "ûÓÐÉÏ´ÎËÑË÷×Ö·û´®"
+
+#: info/session.c:3746
+msgid "Repeat last search in the reverse direction"
+msgstr "ÒÔÏà·´µÄ·½ÏòÖظ´×îºóµÄËÑË÷"
+
+#: info/session.c:3765 info/session.c:3771
+msgid "Search interactively for a string as you type it"
+msgstr "ÔÚÄãÊäÈëµÄͬʱ½»»¥Ê½µØËÑË÷×Ö·û´®"
+
+#: info/session.c:3851
+msgid "I-search backward: "
+msgstr "ÏòºóµÝÔöËÑË÷£º"
+
+#: info/session.c:3853
+msgid "I-search: "
+msgstr "µÝÔöËÑË÷£º"
+
+#: info/session.c:3878 info/session.c:3880
+msgid "Failing "
+msgstr "ʧ°Ü "
+
+#: info/session.c:4340
+msgid "Move to the previous cross reference"
+msgstr "Òƶ¯µ½ÉÏÒ»¸ö½»²æÒýÓÃ"
+
+#: info/session.c:4349
+msgid "Move to the next cross reference"
+msgstr "Òƶ¯µ½ÏÂÒ»¸ö½»²æÒýÓÃ"
+
+#: info/session.c:4359
+msgid "Select reference or menu item appearing on this line"
+msgstr "Ñ¡Ôñ³öÏÖÔÚ±¾ÐÐÖеÄÒýÓûò²Ëµ¥Ïî"
+
+#: info/session.c:4382
+msgid "Cancel current operation"
+msgstr "È¡Ïûµ±Ç°²Ù×÷"
+
+#: info/session.c:4389
+msgid "Quit"
+msgstr "Í˳ö"
+
+#: info/session.c:4398
+msgid "Move the cursor to a specific line of the window"
+msgstr "½«¹â±êÒƶ¯µ½´°¿ÚµÄÖ¸¶¨ÐÐ"
+
+#: info/session.c:4430
+msgid "Redraw the display"
+msgstr "ÖØ»­ÏÔʾ"
+
+#: info/session.c:4467
+msgid "Quit using Info"
+msgstr "Í˳ö Info"
+
+#: info/session.c:4480
+msgid "Run command bound to this key's lowercase variant"
+msgstr "ÔËÐе½°ó¶¨µ½±¾°´¼üµÄСд°æ±¾µÄÃüÁî"
+
+#: info/session.c:4491
+#, c-format
+msgid "Unknown command (%s)."
+msgstr "δ֪µÄÃüÁî (%s)¡£"
+
+#: info/session.c:4494
+#, c-format
+msgid "\"%s\" is invalid"
+msgstr "¡°%s¡±Îª·Ç·¨"
+
+#: info/session.c:4495
+#, fuzzy, c-format
+msgid "`%s' is invalid"
+msgstr "¡°%s¡±Îª·Ç·¨"
+
+#: info/session.c:4709
+msgid "Add this digit to the current numeric argument"
+msgstr "½«±¾Êý×ÖÌí¼Óµ½µ±Ç°ÊýÖµ²ÎÊýÖÐ"
+
+#: info/session.c:4718
+msgid "Start (or multiply by 4) the current numeric argument"
+msgstr "¿ªÆô(»ò³ËÒÔ 4)µ±Ç°ÊýÖµ²ÎÊý"
+
+#: info/session.c:4733
+msgid "Internally used by \\[universal-argument]"
+msgstr "ÓÉ \\[universal-argument] ÄÚ²¿Ê¹ÓÃ"
+
+#: info/tilde.c:338
+#, c-format
+msgid "readline: Out of virtual memory!\n"
+msgstr "readline£ºÐéÄâÄÚ´æºÄ¾¡£¡\n"
+
+#: info/variables.c:37
+msgid "When \"On\", footnotes appear and disappear automatically"
+msgstr "ÔÚ¡°¿ª¡±Ê±£¬½Å×¢½«×Ô¶¯³öÏÖ»òÏûʧ"
+
+#: info/variables.c:41
+msgid "When \"On\", creating or deleting a window resizes other windows"
+msgstr "ÔÚ¡°¿ª¡±Ê±£¬´´½¨»òɾ³ý´°¿Úʱ¸Ä±äÆäËü´°¿ÚµÄ´óС"
+
+#: info/variables.c:45
+msgid "When \"On\", flash the screen instead of ringing the bell"
+msgstr "ÔÚ¡°¿ª¡±Ê±£¬½«Ë¢ÐÂÆÁÄ»¶ø²»ÊÇÃùµÑ"
+
+#: info/variables.c:49
+msgid "When \"On\", errors cause the bell to ring"
+msgstr "ÔÚ¡°¿ª¡±Ê±£¬³ö´íʱ½«ÃùµÑ"
+
+#: info/variables.c:53
+msgid "When \"On\", Info garbage collects files which had to be uncompressed"
+msgstr "ÔÚ¡°¿ª¡±Ê±£¬Info À¬»øÊÕ¼¯ÄÇЩ±ØÐë½âѹËõµÄÎļþ"
+
+#: info/variables.c:56
+msgid "When \"On\", the portion of the matched search string is highlighted"
+msgstr "ÔÚ¡°¿ª¡±Ê±£¬ËÑË÷×Ö·û´®µÄÆ¥Å䲿·Ö½«±»Í»³öÏÔʾ"
+
+#: info/variables.c:60
+msgid "Controls what happens when scrolling is requested at the end of a node"
+msgstr "¿ØÖÆÔÚ½Úµãĩβʱ³öÏÖ¹ö¶¯ÇëÇ󽫷¢Éúʲô"
+
+#: info/variables.c:64
+msgid "The number lines to scroll when the cursor moves out of the window"
+msgstr "µ±¹â±êÒƳö´°¿ÚÊÇËù¹ö¶¯µÄÐÐÊý"
+
+#: info/variables.c:68
+msgid "When \"On\", Info accepts and displays ISO Latin characters"
+msgstr "ÔÚ¡°¿ª¡±Ê±£¬Info ½ÓÊܲ¢ÏÔʾ ISO À­¶¡×Ö·û"
+
+#: info/variables.c:74
+msgid "Explain the use of a variable"
+msgstr "½âÊͱäÁ¿µÄÓ÷¨"
+
+#: info/variables.c:80
+msgid "Describe variable: "
+msgstr "˵Ã÷±äÁ¿£º"
+
+#: info/variables.c:99
+msgid "Set the value of an Info variable"
+msgstr "É趨 Info ±äÁ¿µÄÖµ"
+
+#: info/variables.c:105
+msgid "Set variable: "
+msgstr "É趨±äÁ¿£º"
+
+#: info/variables.c:123
+#, c-format
+msgid "Set %s to value (%d): "
+msgstr "½« %s É趨Ϊֵ (%d)£º"
+
+#: info/variables.c:164
+#, c-format
+msgid "Set %s to value (%s): "
+msgstr "½« %s É趨Ϊֵ (%s)£º"
+
+#: info/window.c:1138
+msgid "--*** Tags out of Date ***"
+msgstr "--*** ±ê¼Ç¹ýÆÚ ***"
+
+#: info/window.c:1149
+msgid "-----Info: (), lines ----, "
+msgstr "-----Info£º()£¬ÐÐ ----£¬"
+
+#: info/window.c:1156
+#, c-format
+msgid "-%s---Info: %s, %d lines --%s--"
+msgstr "-%s---Info£º%s£¬%d ÐÐ --%s--"
+
+#: info/window.c:1160
+#, c-format
+msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
+msgstr "-%s%s-Info£º(%s)%s£¬%d ÐÐ --%s--"
+
+#: info/window.c:1167
+#, c-format
+msgid " Subfile: %s"
+msgstr " ×ÓÎļþ£º%s"
+
+#: lib/getopt.c:551 lib/getopt.c:570
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s£ºÑ¡Ïî¡°%s¡±º¬Òå²»Ã÷È·\n"
+
+#: lib/getopt.c:603 lib/getopt.c:607
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s£ºÑ¡Ïî¡°--%s¡±²»½ÓÊܲÎÊý\n"
+
+#: lib/getopt.c:616 lib/getopt.c:621
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s£ºÑ¡Ïî¡°%c%s¡±²»½ÓÊܲÎÊý\n"
+
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s£ºÑ¡Ïî¡°%s¡±ÐèÒªÒ»¸ö²ÎÊý\n"
+
+#: lib/getopt.c:727 lib/getopt.c:730
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s£º²»ÄÜʶ±ðµÄÑ¡Ïî¡°--%s¡±\n"
+
+#: lib/getopt.c:738 lib/getopt.c:741
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s£º²»ÄÜʶ±ðµÄÑ¡Ïî¡°%c%s¡±\n"
+
+#: lib/getopt.c:796 lib/getopt.c:799
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s£º·Ç·¨Ñ¡Ïî -- %c\n"
+
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s£ºÎÞЧѡÏî -- %c\n"
+
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s£ºÑ¡ÏîÐèÒªÒ»¸ö²ÎÊý -- %c\n"
+
+#: lib/getopt.c:935 lib/getopt.c:954
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s£ºÑ¡Ïî¡°-W %s¡±µÄº¬Òå²»Çå\n"
+
+#: lib/getopt.c:978 lib/getopt.c:999
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s£ºÑ¡Ïî¡°-W %s¡±²»½ÓÊܲÎÊý\n"
+
+#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#, fuzzy, c-format
+msgid "arguments to @%s ignored"
+msgstr "%c%s µÄ´íÎó²ÎÊý"
+
+#: makeinfo/cmds.c:585
+msgid "January"
+msgstr "Ò»ÔÂ"
+
+#: makeinfo/cmds.c:585
+msgid "February"
+msgstr "¶þÔÂ"
+
+#: makeinfo/cmds.c:585
+msgid "March"
+msgstr "ÈýÔÂ"
+
+#: makeinfo/cmds.c:585
+msgid "April"
+msgstr "ËÄÔÂ"
+
+#: makeinfo/cmds.c:585
+msgid "May"
+msgstr "ÎåÔÂ"
+
+#: makeinfo/cmds.c:586
+msgid "June"
+msgstr "ÁùÔÂ"
+
+#: makeinfo/cmds.c:586
+msgid "July"
+msgstr "ÆßÔÂ"
+
+#: makeinfo/cmds.c:586
+msgid "August"
+msgstr "°ËÔÂ"
+
+#: makeinfo/cmds.c:586
+msgid "September"
+msgstr "¾ÅÔÂ"
+
+#: makeinfo/cmds.c:586
+msgid "October"
+msgstr "Ê®ÔÂ"
+
+#: makeinfo/cmds.c:587
+msgid "November"
+msgstr "ʮһÔÂ"
+
+#: makeinfo/cmds.c:587
+msgid "December"
+msgstr "Ê®¶þÔÂ"
+
+#: makeinfo/cmds.c:936
+#, c-format
+msgid "unlikely character %c in @var"
+msgstr "@var Öв»¿É¿¿µÄ×Ö·û %c"
+
+#: makeinfo/cmds.c:979
+msgid "@sc argument all uppercase, thus no effect"
+msgstr "@sc µÄ²ÎÊýÈ«²¿Îª´óд£¬Òò´ËÎÞЧ"
+
+#: makeinfo/cmds.c:1034
+#, c-format
+msgid "`{' expected, but saw `%c'"
+msgstr "ӦΪ¡°{¡±£¬µ«¿´µ½ÁË¡°%c¡±"
+
+#: makeinfo/cmds.c:1074
+msgid "end of file inside verb block"
+msgstr "ÎļþÔÚÔ­ÎÄ¿éÖнáÊø"
+
+#: makeinfo/cmds.c:1082
+#, c-format
+msgid "`}' expected, but saw `%c'"
+msgstr "ӦΪ¡°}¡±£¬µ«¿´µ½ÁË¡°%c¡±"
+
+#: makeinfo/cmds.c:1112
+msgid ""
+"@strong{Note...} produces a spurious cross-reference in Info; reword to "
+"avoid that"
+msgstr ""
+
+#: makeinfo/cmds.c:1305
+#, c-format
+msgid "%c%s is obsolete"
+msgstr "%c%s Òѹýʱ"
+
+#: makeinfo/cmds.c:1414
+#, c-format
+msgid "@sp requires a positive numeric argument, not `%s'"
+msgstr "@sp ÐèÒªÕýÊý²ÎÊý£¬¶ø²»ÊÇ¡°%s¡±"
+
+#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
+#, c-format
+msgid "Bad argument to %c%s"
+msgstr "%c%s µÄ´íÎó²ÎÊý"
+
+#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
+msgid "asis"
+msgstr "asis"
+
+#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
+msgid "none"
+msgstr "none"
+
+#: makeinfo/cmds.c:1789
+#, fuzzy, c-format
+msgid "Bad argument to @%s"
+msgstr "%c%s µÄ´íÎó²ÎÊý"
+
+#: makeinfo/cmds.c:1803
+msgid "insert"
+msgstr ""
+
+#: makeinfo/defun.c:84
+msgid "Missing `}' in @def arg"
+msgstr "@def µÄ²ÎÊýÒÅ©ÁË¡°}¡±"
+
+#: makeinfo/defun.c:403
+msgid "Function"
+msgstr "º¯Êý"
+
+#: makeinfo/defun.c:406
+msgid "Macro"
+msgstr "ºê"
+
+#: makeinfo/defun.c:409
+msgid "Special Form"
+msgstr "ÌØÊâÐÎʽ"
+
+#: makeinfo/defun.c:413
+msgid "Variable"
+msgstr "±äÁ¿"
+
+#: makeinfo/defun.c:416
+msgid "User Option"
+msgstr "Óû§Ñ¡Ïî"
+
+#: makeinfo/defun.c:420
+msgid "Instance Variable"
+msgstr "ʵÀý±äÁ¿"
+
+#: makeinfo/defun.c:424
+msgid "Method"
+msgstr "·½·¨"
+
+#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
+#: makeinfo/defun.c:644 makeinfo/xml.c:2229
+msgid "of"
+msgstr ""
+
+#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
+msgid "on"
+msgstr ""
+
+#: makeinfo/defun.c:711
+#, c-format
+msgid "Must be in `@%s' environment to use `@%s'"
+msgstr ""
+
+#: makeinfo/files.c:435
+#, c-format
+msgid "%s: getwd: %s, %s\n"
+msgstr "%s£ºgetwd£º%s£¬%s\n"
+
+#: makeinfo/files.c:638
+#, c-format
+msgid "`%s' omitted before output filename"
+msgstr ""
+
+#: makeinfo/files.c:646
+#, c-format
+msgid "`%s' omitted since writing to stdout"
+msgstr ""
+
+#: makeinfo/files.c:694
+msgid "Output buffer not empty."
+msgstr ""
+
+#: makeinfo/footnote.c:150
+#, c-format
+msgid "`%c%s' needs an argument `{...}', not just `%s'"
+msgstr "¡°%c%s¡±ÐèÒª²ÎÊý¡°{...}¡±£¬¶ø²»½ö½öÊÇ¡°%s¡±"
+
+#: makeinfo/footnote.c:165
+#, c-format
+msgid "No closing brace for footnote `%s'"
+msgstr "½Å×¢¡°%s¡±Ã»Óбպϻ¨À¨ºÅ"
+
+#: makeinfo/footnote.c:198
+msgid "Footnote defined without parent node"
+msgstr "¶¨ÒåµÄ½ÅעûÓи¸½Úµã"
+
+#: makeinfo/footnote.c:210
+msgid "Footnotes inside footnotes are not allowed"
+msgstr "½Å×¢ÄڵĽÅ×¢ÊDz»ÔÊÐíµÄ"
+
+#: makeinfo/footnote.c:302 makeinfo/index.c:189
+msgid "Footnotes"
+msgstr "½Å×¢"
+
+#: makeinfo/html.c:87
+#, c-format
+msgid "%s: could not open --css-file: %s"
+msgstr ""
+
+#: makeinfo/html.c:172
+#, c-format
+msgid "%s:%d: --css-file ended in comment"
+msgstr ""
+
+#: makeinfo/html.c:207
+msgid "Untitled"
+msgstr "ÎÞ±êÌâ"
+
+#: makeinfo/html.c:422
+msgid "[unexpected] no html tag to pop"
+msgstr ""
+
+#: makeinfo/html.c:752
+#, fuzzy, c-format
+msgid "[unexpected] invalid node name: `%s'"
+msgstr "ÎÞЧµÄ½Å×¢Ãû£º¡°%s¡±"
+
+#: makeinfo/index.c:169
+#, c-format
+msgid "Unknown index `%s'"
+msgstr "δ֪µÄË÷Òý¡°%s¡±"
+
+#: makeinfo/index.c:234
+#, c-format
+msgid "Info cannot handle `:' in index entry `%s'"
+msgstr "Info ÎÞ·¨´¦ÀíË÷ÒýÌõÄ¿¡°%s¡±Öеġ°:¡±"
+
+#: makeinfo/index.c:412
+#, c-format
+msgid "Index `%s' already exists"
+msgstr "Ë÷Òý¡°%s¡±ÒѾ­´æÔÚ"
+
+#: makeinfo/index.c:455
+#, c-format
+msgid "Unknown index `%s' and/or `%s' in @synindex"
+msgstr "@synindex ÖеÄδ֪Ë÷Òý¡°%s¡±ºÍ/»ò¡°%s¡±"
+
+#: makeinfo/index.c:661
+msgid "(line )"
+msgstr ""
+
+#: makeinfo/index.c:669
+#, c-format
+msgid "(line %*d)"
+msgstr ""
+
+#: makeinfo/index.c:750
+#, c-format
+msgid "Unknown index `%s' in @printindex"
+msgstr "@printindex ÖеÄδ֪Ë÷Òý¡°%s¡±"
+
+#: makeinfo/index.c:819
+#, c-format
+msgid "Entry for index `%s' outside of any node"
+msgstr "¹ØÓÚË÷Òý¡°%s¡±µÄÌõÄ¿³¬³öÁËËùÓнڵã"
+
+#: makeinfo/index.c:822 makeinfo/index.c:858
+msgid "(outside of any node)"
+msgstr "(³¬³öÈκνڵã)"
+
+#: makeinfo/index.c:919 makeinfo/index.c:925
+msgid "See "
+msgstr "²ÎÔÄ "
+
+#: makeinfo/insertion.c:160
+msgid "@item not allowed in argument to @itemize"
+msgstr ""
+
+#: makeinfo/insertion.c:238
+msgid "Broken-Type in insertion_type_pname"
+msgstr "insertion_type_pname ÖеĴíÎóÀàÐÍ"
+
+#: makeinfo/insertion.c:334
+msgid "Enumeration stack overflow"
+msgstr "ö¾ÙÕ»Òç³ö"
+
+#: makeinfo/insertion.c:366
+#, c-format
+msgid "lettering overflow, restarting at %c"
+msgstr "×Ö·û±àºÅÒç³ö£¬´Ó %c ÖØпªÊ¼"
+
+#: makeinfo/insertion.c:631
+#, c-format
+msgid "%s requires an argument: the formatter for %citem"
+msgstr ""
+
+#: makeinfo/insertion.c:719
+#, c-format
+msgid "%cfloat environments cannot be nested"
+msgstr ""
+
+#: makeinfo/insertion.c:973
+#, c-format
+msgid "`@end' expected `%s', but saw `%s'"
+msgstr "¡°@end¡±ÐèÒª¡°%s¡±£¬µ«¿´µ½¡°%s¡±"
+
+#: makeinfo/insertion.c:1337
+#, c-format
+msgid "No matching `%cend %s'"
+msgstr "ûÓÐÆ¥ÅäµÄ¡°%cend %s¡±"
+
+#: makeinfo/insertion.c:1592
+#, c-format
+msgid "%s requires letter or digit"
+msgstr "%s ÐèÒª×Öĸ»òÊý×Ö"
+
+#: makeinfo/insertion.c:1687
+msgid "end of file inside verbatim block"
+msgstr "ÎļþÔÚÔ­ÎÄ¿éÖнáÊø"
+
+#: makeinfo/insertion.c:1913
+#, fuzzy, c-format
+msgid "@%s not meaningful outside `@float' environment"
+msgstr "ÔÚ¡°@%2$s¡±¿éÖС°@%1$s¡±ÊÇûÓÐÒâÒåµÄ"
+
+#: makeinfo/insertion.c:1949
+msgid "@menu seen before first @node, creating `Top' node"
+msgstr "ÔÚµÚÒ»¸ö½Úµã֮ǰÓöµ½ @menu£¬ÕýÔÚ´´½¨¡°¶¥¡±½Úµã"
+
+#: makeinfo/insertion.c:1950
+msgid ""
+"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
+msgstr "ÄúµÄ @top ½Úµã¿ÉÄÜÓ¦¸Ã°üº¬ÔÚ @ifnottex ¶ø²»ÊÇ @ifinfo ÖУ¿"
+
+#: makeinfo/insertion.c:1962
+msgid "@detailmenu seen before first node, creating `Top' node"
+msgstr "ÔÚµÚÒ»¸ö½Úµã֮ǰÓöµ½ @detailmenu£¬ÕýÔÚ´´½¨¡°¶¥¡±½Úµã"
+
+#: makeinfo/insertion.c:2018
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr ""
+
+#: makeinfo/insertion.c:2032
+#, fuzzy, c-format
+msgid "@%s not meaningful outside `@titlepage' environment"
+msgstr "ÔÚ¡°@%2$s¡±¿éÖС°@%1$s¡±ÊÇûÓÐÒâÒåµÄ"
+
+#: makeinfo/insertion.c:2063
+#, c-format
+msgid "Unmatched `%c%s'"
+msgstr "δƥÅäµÄ¡°%c%s¡±"
+
+#: makeinfo/insertion.c:2068
+#, c-format
+msgid "`%c%s' needs something after it"
+msgstr "¡°%c%s¡±Ö®ºóÐèÒªÓÐЩʲô"
+
+#: makeinfo/insertion.c:2074
+#, fuzzy, c-format
+msgid "Bad argument `%s' to `@%s', using `%s'"
+msgstr "¡°%s¡±µÄ´íÎó²ÎÊý£¬¡°%s¡±£¬Ê¹Óá°%s¡±"
+
+#: makeinfo/insertion.c:2171
+#, c-format
+msgid "@%s not meaningful inside `@%s' block"
+msgstr "ÔÚ¡°@%2$s¡±¿éÖС°@%1$s¡±ÊÇûÓÐÒâÒåµÄ"
+
+#: makeinfo/insertion.c:2180
+#, c-format
+msgid "@itemx not meaningful inside `%s' block"
+msgstr "ÔÚ¡°%s¡±¿éÖÐ @itemx ÊÇûÓÐÒâÒåµÄ"
+
+#: makeinfo/insertion.c:2356
+#, c-format
+msgid "%c%s found outside of an insertion block"
+msgstr "ÔÚ²åÈë¿éÖ®Íâ·¢ÏÖÁË %c%s"
+
+#: makeinfo/lang.c:580
+#, c-format
+msgid "%s is not a valid ISO 639 language code"
+msgstr "%s ÔÚ ISO 639 ÓïÑÔ±àÂëÖÐÊÇÎÞЧµÄ"
+
+#: makeinfo/lang.c:655
+#, fuzzy, c-format
+msgid "unrecognized encoding name `%s'"
+msgstr "²»ÄÜʶ±ðµÄ±àÂëÃû³Æ¡°%s¡±"
+
+#: makeinfo/lang.c:663
+#, c-format
+msgid "sorry, encoding `%s' not supported"
+msgstr "±§Ç¸£¬²»Ö§³Ö±àÂë¡°%s¡±"
+
+#: makeinfo/lang.c:715
+#, c-format
+msgid "invalid encoded character `%s'"
+msgstr "ÎÞЧµÄ±àÂë×Ö·û¡°%s¡±"
+
+#: makeinfo/lang.c:1009
+#, c-format
+msgid "%c%s expects `i' or `j' as argument, not `%c'"
+msgstr "%c%s µÄ²ÎÊýӦΪ¡°i¡±»ò¡°j¡±£¬¶ø²»ÊÇ¡°%c¡±"
+
+#: makeinfo/lang.c:1013
+#, c-format
+msgid "%c%s expects a single character `i' or `j' as argument"
+msgstr "%c%s ÐèÒªÒÔµ¥¸ö×Ö·û¡°i¡±»ò¡°j¡±Îª²ÎÊý"
+
+#: makeinfo/macro.c:128
+#, c-format
+msgid "macro `%s' previously defined"
+msgstr "ºê¡°%s¡±ÒÑÔÚÇ°Ã涨Òå"
+
+#: makeinfo/macro.c:132
+#, c-format
+msgid "here is the previous definition of `%s'"
+msgstr "ÕâÀïÊÇ¡°%s¡±Ç°ÃæµÄ¶¨Òå"
+
+#: makeinfo/macro.c:355
+#, c-format
+msgid "\\ in macro expansion followed by `%s' instead of parameter name"
+msgstr ""
+
+#: makeinfo/macro.c:401
+#, c-format
+msgid "Macro `%s' called on line %d with too many args"
+msgstr "ÔÚµÚ %2$d ÐÐÖÐÒÔ¹ý¶àµÄ²ÎÊýµ÷Óúꡰ%1$s¡±"
+
+#: makeinfo/macro.c:586
+#, c-format
+msgid "%cend macro not found"
+msgstr "ÕÒ²»µ½ºê %cend"
+
+#: makeinfo/macro.c:624
+msgid "@quote-arg only useful for single-argument macros"
+msgstr "@quote-arg Ö»¶Ôµ¥²ÎÊýºêÓÐÓÃ"
+
+#: makeinfo/macro.c:660
+#, c-format
+msgid "mismatched @end %s with @%s"
+msgstr "@end %s ºÍ @%s ²»Æ¥Åä"
+
+#: makeinfo/makeinfo.c:184
+#, c-format
+msgid "Too many errors!  Gave up.\n"
+msgstr "¹ý¶àµÄ´íÎ󣡷ÅÆú¡£\n"
+
+#: makeinfo/makeinfo.c:302
+#, c-format
+msgid "%s:%d: warning: "
+msgstr "%s£º%d£º¾¯¸æ£º"
+
+#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
+#, c-format
+msgid "Misplaced %c"
+msgstr "´íÎó·ÅÖÃµÄ %c"
+
+#: makeinfo/makeinfo.c:340
+#, c-format
+msgid "Try `%s --help' for more information.\n"
+msgstr "ÊÔÓá°%s --help¡±ÒÔ»ñÈ¡¸ü¶àÐÅÏ¢¡£\n"
+
+#: makeinfo/makeinfo.c:343
+#, c-format
+msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
+msgstr "Ó÷¨£º%s [Ñ¡Ïî]... TEXINFO-Îļþ...\n"
+
+#: makeinfo/makeinfo.c:346
+msgid ""
+"Translate Texinfo source documentation to various other formats, by default\n"
+"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
+msgstr ""
+"½« Texinfo Ô´Îļþת»»ÎªÆäËü¸÷ÖÖ¸ñʽ£¬Ä¬ÈÏת»»ÎªÊÊÓÚ\n"
+"ÓÉ Emacs »ò¶ÀÁ¢ GNU Info ÔÚÏßä¯ÀÀµÄ Info Îļþ¡£\n"
+
+#: makeinfo/makeinfo.c:350
+#, c-format
+msgid ""
+"General options:\n"
+"      --error-limit=NUM       quit after NUM errors (default %d).\n"
+"      --force                 preserve output even if errors.\n"
+"      --help                  display this help and exit.\n"
+"      --no-validate           suppress node cross-reference validation.\n"
+"      --no-warn               suppress warnings (but not errors).\n"
+"      --reference-limit=NUM   warn about at most NUM references (default %"
+"d).\n"
+"  -v, --verbose               explain what is being done.\n"
+"      --version               display version information and exit.\n"
+msgstr ""
+"ͨÓÃÑ¡Ï\n"
+"      --error-limit=NUM       ÔÚ NUM ¸ö´íÎóºóÍ˳ö (ĬÈÏΪ %d).\n"
+"      --force                 ¼´Ê±³öÏÖ´íÎóÒ²±£ÁôÊä³öÎļþ¡£\n"
+"      --help                  ÏÔʾ¸ÃÇóÖúÐÅÏ¢²¢Í˳ö¡£\n"
+"      --no-validate           ²»½øÐн»²æÒýÓüì²é¡£\n"
+"      --no-warn               ²»Êä³ö¾¯¸æ (²»Éæ¼°´íÎó)¡£\n"
+"      --reference-limit=NUM   ¶ÔÖÁ¶à NUM ¸öÒýÓýøÐо¯¸æ (ĬÈÏΪ %d)¡£\n"
+"  -v, --verbose               ½âÊͶ¼×öÁËЩʲô¡£\n"
+"      --version               ÏÔʾ°æ±¾ÐÅÏ¢²¢Í˳ö¡£\n"
+
+#: makeinfo/makeinfo.c:364
+#, fuzzy, no-wrap
+msgid ""
+"Output format selection (default is to produce Info):\n"
+"      --docbook             output Docbook XML rather than Info.\n"
+"      --html                output HTML rather than Info.\n"
+"      --xml                 output Texinfo XML rather than Info.\n"
+"      --plaintext           output plain text rather than Info.\n"
+msgstr ""
+"Êä³ö¸ñʽѡÔñ (ĬÈÏÉú³É Info Îļþ)£º\n"
+"      --docbook             Êä³ö DocBook ¶ø²»ÊÇ Info¡£\n"
+"      --html                Êä³ö HTML ¶ø²»ÊÇ Info¡£\n"
+"      --xml                 Êä³ö XML (TexinfoML) ¶ø²»ÊÇ Info¡£\n"
+
+#: makeinfo/makeinfo.c:372
+msgid ""
+"General output options:\n"
+"  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
+"                            ignoring any @setfilename.\n"
+"      --no-headers          suppress node separators, Node: lines, and "
+"menus\n"
+"                              from Info output (thus producing plain text)\n"
+"                              or from HTML (thus producing shorter output);\n"
+"                              also, write to standard output by default.\n"
+"      --no-split            suppress splitting of Info or HTML output,\n"
+"                            generate only one output file.\n"
+"      --number-sections     output chapter and sectioning numbers.\n"
+"  -o, --output=FILE         output to FILE (directory if split HTML),\n"
+msgstr ""
+"ͨÓÃÊä³öÑ¡Ï\n"
+"  -E, --macro-expand FILE   ½«ºêÀ©Õ¹Ô´Êä³öµ½Îļþ FILE¡£\n"
+"                            ºöÂÔËùÓÐ @setfilename¡£\n"
+"      --no-headers          ²»ÔÚ Info Êä³ö»ò HTML Êä³öÖÐÉú³É½Úµã·Ö¸ô·û£¬\n"
+"                              ½Úµã£ºÐУ¬ºÍ²Ëµ¥¡£´Ó¶øÉú³ÉÆÕͨÎı¾(Info\n"
+"                              Êä³ö)»ò½Ï¶ÌµÄÊä³ö(HTML Êä³ö)£»\n"
+"                              ´ËÍâ, ĬÈÏÊä³öµ½±ê×¼Êä³ö¡£\n"
+"      --no-split            ²»ÊÇÉú³É·Ö¸îµÄ Info »ò HTML Êä³ö£¬\n"
+"                            ¶øÊÇÉú³Éµ¥¸öÊä³öÎļþ¡£\n"
+"      --number-sections     Êä³öÕ½ڱàºÅ¡£\n"
+"  -o, --output=FILE         Êä³öµ½Îļþ FILE (Èç¹ûÊÇ·Ö¸îµÄ HTML ÔòΪĿ¼)£¬\n"
+
+#: makeinfo/makeinfo.c:386
+#, c-format
+msgid ""
+"Options for Info and plain text:\n"
+"      --enable-encoding       output accented and special characters in\n"
+"                                Info output based on @documentencoding.\n"
+"      --fill-column=NUM       break Info lines at NUM characters (default %"
+"d).\n"
+"      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
+"                                `separate' to put them in their own node;\n"
+"                                `end' to put them at the end of the node\n"
+"                                  in which they are defined (default).\n"
+"      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default %"
+"d).\n"
+"                                If VAL is `none', do not indent; if VAL is\n"
+"                                `asis', preserve existing indentation.\n"
+"      --split-size=NUM        split Info files at size NUM (default %d).\n"
+msgstr ""
+"Info ºÍÆÕͨÎı¾Ñ¡Ï\n"
+"      --enable-encoding       ¸ù¾Ý @documentencoding Êä³ö Info Êä³öÖеÄ\n"
+"                                ÖØÒôºÍÌØÊâ×Ö·û¡£\n"
+"      --fill-column=NUM       ÔÚµÚ NUM ¸ö×Ö·û´¦ÇÐ·Ö Info ÐÐ (ĬÈÏΪ %d)¡£\n"
+"      --footnote-style=STYLE  ¸ù¾Ý STYLE Êä³ö Info ÖеĽÅ×¢£º\n"
+"                                ¡°separate¡±½«½Å×¢ÖÃÓÚ¶ÀÁ¢µÄ½Úµã£»\n"
+"                                ¡°end¡±½«½Å×¢ÖÃÓÚ¶¨ÒåËüµÄ½ÚµãµÄĩβ(ĬÈÏ)¡£\n"
+"      --paragraph-indent=VAL  ½« Info ¶Î¶ÔÆëµ½ VAL ¸ö¿Õ¸ñ (ĬÈÏΪ %d).\n"
+"                                Èç¹û VAL Ϊ¡°none¡±£¬Ôò²»¶ÔÆ룻Èç¹û VAL Ϊ\n"
+"                                ¡°asis¡±£¬±£ÁôÏÖÓеĶÔÆë¡£\n"
+"      --split-size=NUM        ÔÚ´óС NUM µÄʱºò²ð·Ö Info Îļþ (ĬÈÏΪ %d)¡£\n"
+
+#: makeinfo/makeinfo.c:403
+msgid ""
+"Options for HTML:\n"
+"      --css-include=FILE        include FILE in HTML <style> output;\n"
+"                                  read stdin if FILE is -.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:409
+#, c-format
+msgid ""
+"Options for XML and Docbook:\n"
+"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"d).\n"
+"                                  If VAL is 0, ignorable whitespace is "
+"dropped.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:416
+#, fuzzy
+msgid ""
+"Input file options:\n"
+"      --commands-in-node-names  allow @ commands in node names.\n"
+"  -D VAR                        define the variable VAR, as with @set.\n"
+"  -I DIR                        append DIR to the @include search path.\n"
+"  -P DIR                        prepend DIR to the @include search path.\n"
+"  -U VAR                        undefine the variable VAR, as with @clear.\n"
+msgstr ""
+"ÊäÈëÎļþÑ¡Ï\n"
+"      --commands-in-node-names   ÔÊÐíÔÚ½ÚµãÃûÖÐʹÓà @ ÃüÁî¡£\n"
+"  -D VAR                         ¶¨Òå±äÁ¿ VAR£¬¾ÍÏó @set¡£\n"
+"  -I DIR                         ½« DIR ¸½¼Óµ½ @include ËÑË÷·¾¶Ö®ºó¡£\n"
+"  -P DIR                         ½« DIR ×·¼Óµ½ @include ËÑË÷·¾¶Ö®Ç°¡£\n"
+"  -U VAR                         È¡Ïû±äÁ¿ VAR µÄ¶¨Ò壬¾ÍÏó @clear¡£\n"
+
+#: makeinfo/makeinfo.c:425
+#, fuzzy
+msgid ""
+"Conditional processing in input:\n"
+"  --ifdocbook       process @ifdocbook and @docbook even if\n"
+"                      not generating Docbook.\n"
+"  --ifhtml          process @ifhtml and @html even if not generating HTML.\n"
+"  --ifinfo          process @ifinfo even if not generating Info.\n"
+"  --ifplaintext     process @ifplaintext even if not generating plain text.\n"
+"  --iftex           process @iftex and @tex; implies --no-split.\n"
+"  --ifxml           process @ifxml and @xml.\n"
+"  --no-ifdocbook    do not process @ifdocbook and @docbook text.\n"
+"  --no-ifhtml       do not process @ifhtml and @html text.\n"
+"  --no-ifinfo       do not process @ifinfo text.\n"
+"  --no-ifplaintext  do not process @ifplaintext text.\n"
+"  --no-iftex        do not process @iftex and @tex text.\n"
+"  --no-ifxml        do not process @ifxml and @xml text.\n"
+"\n"
+"  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
+msgstr ""
+"ÊäÈëÖеÄÌõ¼þ´¦Àí£º\n"
+"  --ifhtml          ¼´Ê¹²»ÊÇÉú³É HTML Ò²´¦Àí @ifhtml ºÍ @html¡£\n"
+"  --ifinfo          ¼´Ê¹²»ÊÇÉú³É Info Ò²´¦Àí @ifinfo¡£\n"
+"  --ifplaintext     ¼´Ê¹²»ÊÇÉú³ÉÆÕͨÎı¾Ò²´¦Àí @ifplaintext¡£\n"
+"  --iftex           ´¦Àí @iftex ºÍ @tex£»Òþº¬ --no-split¡£\n"
+"  --no-ifhtml       ²»Òª´¦Àí @ifhtml ºÍ @html Îı¾¡£\n"
+"  --no-ifinfo       ²»Òª´¦Àí @ifinfo Îı¾¡£\n"
+"  --no-ifplaintext  ²»Òª´¦Àí @ifplaintext Îı¾¡£\n"
+"  --no-iftex        ²»Òª´¦Àí @iftex ºÍ @tex Îı¾¡£\n"
+
+#: makeinfo/makeinfo.c:444
+#, fuzzy
+msgid ""
+"  The defaults for the @if... conditionals depend on the output format:\n"
+"  if generating HTML, --ifhtml is on and the others are off;\n"
+"  if generating Info, --ifinfo is on and the others are off;\n"
+"  if generating plain text, --ifplaintext is on and the others are off;\n"
+"  if generating XML, --ifxml is on and the others are off.\n"
+msgstr ""
+"  @if... Ìõ¼þµÄĬÈÏÖµÒÐÀµÓÚÊä³ö¸ñʽ£º\n"
+"  Èç¹ûÉú³É HTML£¬Ôò --ifhtml ĬÈÏ¿ªÆô¶øÆäËüµÄĬÈϹرգ»\n"
+"  Èç¹ûÉú³É Info£¬Ôò --ifinfo ĬÈÏ¿ªÆô¶øÆäËüµÄĬÈϹرգ»\n"
+"  Èç¹ûÉú³ÉÆÕͨÎı¾£¬Ôò --ifplaintext ĬÈÏ¿ªÆô¶øÆäËüĬÈϹرգ»\n"
+
+#: makeinfo/makeinfo.c:452
+#, fuzzy
+msgid ""
+"Examples:\n"
+"  makeinfo foo.texi                     write Info to foo's @setfilename\n"
+"  makeinfo --html foo.texi              write HTML to @setfilename\n"
+"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
+"  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
+"  makeinfo --no-headers foo.texi        write plain text to standard output\n"
+"\n"
+"  makeinfo --html --no-headers foo.texi write html without node lines, "
+"menus\n"
+"  makeinfo --number-sections foo.texi   write Info with numbered sections\n"
+"  makeinfo --no-split foo.texi          write one Info file however big\n"
+msgstr ""
+"ʾÀý£º\n"
+"  makeinfo foo.texi                     ½« Info дÈëµ½ foo µÄ @setfilename\n"
+"  makeinfo --html foo.texi              ½« HTML дÈëµ½ @setfilename\n"
+"  makeinfo --xml foo.texi               ½« XML дÈëµ½ @setfilename\n"
+"  makeinfo --docbook foo.texi           ½« DocBook XML дÈëµ½ @setfilename\n"
+"  makeinfo --no-headers foo.texi        ½«ÆÕͨÎı¾Ð´Èëµ½±ê×¼Êä³ö\n"
+"\n"
+"  makeinfo --html --no-headers foo.texi Êä³ö html ¶ø²»Êä³ö½ÚµãÐкͲ˵¥\n"
+"  makeinfo --number-sections foo.texi   Êä³ö´øÓбàºÅµÄ½ÚµÄ Info\n"
+"  makeinfo --no-split foo.texi          Êä³öµ¥¸ö Info Îļþ¶ø²»ÂÛ´óС\n"
+
+#: makeinfo/makeinfo.c:603
+#, c-format
+msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
+#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
+#, c-format
+msgid "%s: %s arg must be numeric, not `%s'.\n"
+msgstr "%s£º%s ²ÎÊý±ØÐëΪÊýÖµ£¬¶ø²»ÊÇ¡°%s¡±¡£\n"
+
+#: makeinfo/makeinfo.c:660
+#, fuzzy, c-format
+msgid "%s: could not open macro expansion output `%s'"
+msgstr "ÎÞ·¨´ò¿ªºêÀ©Õ¹Êä³ö¡°%s¡±"
+
+#: makeinfo/makeinfo.c:665
+#, fuzzy, c-format
+msgid "%s: ignoring second macro expansion output `%s'.\n"
+msgstr "ÎÞ·¨´ò¿ªºêÀ©Õ¹Êä³ö¡°%s¡±"
+
+#: makeinfo/makeinfo.c:707
+#, c-format
+msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
+msgstr ""
+"%s£º--paragraph-indent µÄ²ÎÊý±ØÐëΪÊýÖµ/¡°none¡±/¡°asis¡±£¬¶ø²»ÊÇ¡°%s¡±¡£\n"
+
+#: makeinfo/makeinfo.c:732
+#, c-format
+msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
+msgstr ""
+"%s£º--footnote-style µÄ²ÎÊý±ØÐëΪ¡°separate¡±»ò¡°end¡±£¬¶ø²»ÊÇ¡°%s¡±¡£\n"
+
+#: makeinfo/makeinfo.c:806
+#, c-format
+msgid "%s: missing file argument.\n"
+msgstr "%s£ºÒÅ©Îļþ²ÎÊý¡£\n"
+
+#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#, c-format
+msgid "Multiline command %c%s used improperly"
+msgstr ""
+
+#: makeinfo/makeinfo.c:1000
+#, c-format
+msgid "Expected `%s'"
+msgstr "ӦΪ¡°%s¡±"
+
+#: makeinfo/makeinfo.c:1479
+#, c-format
+msgid "Can't create directory `%s': %s"
+msgstr "ÎÞ·¨´´½¨Ä¿Â¼¡°%s¡±£º%s"
+
+#: makeinfo/makeinfo.c:1525
+#, c-format
+msgid "No `%s' found in `%s'"
+msgstr "ÔÚ¡°%2$s¡±ÖÐÕÒ²»µ½¡°%1$s¡±"
+
+#: makeinfo/makeinfo.c:1605
+#, c-format
+msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:1638
+#, c-format
+msgid "Making %s file `%s' from `%s'.\n"
+msgstr "´Ó¡°%3$s¡±´´½¨ %1$s Îļþ¡°%2$s¡±¡£\n"
+
+#: makeinfo/makeinfo.c:1673
+#, c-format
+msgid "This is %s, produced by makeinfo version %s from %s.\n"
+msgstr "ÕâÊÇ %s£¬ÓÉ makeinfo °æ±¾ %s ´Ó %s Éú³É¡£\n"
+
+#: makeinfo/makeinfo.c:1709
+#, c-format
+msgid ""
+"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
+msgstr "%s£ºÓÉÓÚ´íÎóɾ³ýºêÊä³öÎļþ¡°%s¡±£»Óà --force ±£ÁôºêÊä³ö¡£\n"
+
+#: makeinfo/makeinfo.c:1773
+#, c-format
+msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
+msgstr "%s£ºÓÉÓÚ´íÎóɾ³ýºêÊä³öÎļþ¡°%s¡±£»Óà --force ±£ÁôºêÊä³ö¡£\n"
+
+#: makeinfo/makeinfo.c:2034
+#, c-format
+msgid "Unknown command `%s'"
+msgstr "δ֪µÄÃüÁî¡°%s¡±"
+
+#: makeinfo/makeinfo.c:2056
+#, c-format
+msgid "Use braces to give a command as an argument to @%s"
+msgstr "ʹÓû¨À¨ºÅ½«Ò»¸öÃüÁîÓÃ×÷ @%s µÄ²ÎÊý"
+
+#: makeinfo/makeinfo.c:2314
+#, fuzzy, c-format
+msgid "%c%s expected braces"
+msgstr "%c%s ÐèÒª¡°{...}¡±"
+
+#: makeinfo/makeinfo.c:2327
+msgid "Unmatched }"
+msgstr "²»Æ¥ÅäµÄ }"
+
+#: makeinfo/makeinfo.c:2375
+msgid "NO_NAME!"
+msgstr "ÎÞÃû×Ö£¡"
+
+#: makeinfo/makeinfo.c:2396
+#, c-format
+msgid "%c%s missing close brace"
+msgstr "%c%s ÒÅ©±ÕºÏ»¨À¨ºÅ"
+
+#: makeinfo/makeinfo.c:3309
+#, c-format
+msgid "@image file `%s' (for HTML) not readable: %s"
+msgstr "@image Îļþ¡°%s¡±(¶Ô HTML)²»¿É¶Á£º%s"
+
+#: makeinfo/makeinfo.c:3315
+#, fuzzy, c-format
+msgid "No such file `%s'"
+msgstr "ÔÚ¡°%2$s¡±ÖÐÕÒ²»µ½¡°%1$s¡±"
+
+#: makeinfo/makeinfo.c:3447
+#, c-format
+msgid "@image file `%s' (for text) unreadable: %s"
+msgstr "@image Îļþ¡°%s¡±(¶ÔÎı¾)²»¿É¶Á£º%s"
+
+#: makeinfo/makeinfo.c:3456
+msgid "@image missing filename argument"
+msgstr "@image ÒÅ©ÎļþÃû²ÎÊý"
+
+#: makeinfo/makeinfo.c:3675
+#, c-format
+msgid "undefined flag: %s"
+msgstr ""
+
+#: makeinfo/makeinfo.c:3676
+#, c-format
+msgid "{No value for `%s'}"
+msgstr "{ûÓС°%s¡±µÄÖµ}"
+
+#: makeinfo/makeinfo.c:3728
+#, c-format
+msgid "%c%s requires a name"
+msgstr "%c%s ÐèÒªÒ»¸öÃû×Ö"
+
+#: makeinfo/makeinfo.c:3834
+#, c-format
+msgid "Reached eof before matching @end %s"
+msgstr "ÎļþÔÚÓöµ½Æ¥ÅäµÄ @end %s Ç°¾Í½áÊøÁË"
+
+#: makeinfo/makeinfo.c:4082
+#, c-format
+msgid "`%.40s...' is too long for expansion; not expanded"
+msgstr "¡°%.40s...¡±À©Õ¹ÆðÀ´Ì«³¤£»Î´À©Õ¹"
+
+#: makeinfo/multi.c:116
+msgid "Missing } in @multitable template"
+msgstr "@multitable Ä£°åÖÐÒÅ©ÁË }"
+
+#: makeinfo/multi.c:254
+#, c-format
+msgid "ignoring stray text `%s' after @multitable"
+msgstr "ºöÂÔ @multitable Ö®ºóµÄ¹ýÊ£Îı¾¡°%s¡±"
+
+#: makeinfo/multi.c:393
+#, c-format
+msgid "Too many columns in multitable item (max %d)"
+msgstr "ÔÚ¶àÁбí¸ñÏîÄ¿Öк¬ÓÐÌ«¶àµÄÁÐ (×î´óΪ %d)"
+
+#: makeinfo/multi.c:555
+#, fuzzy, c-format
+msgid "[unexpected] cannot select column #%d in multitable"
+msgstr "ÎÞ·¨ÔÚ¶àÁбí¸ñÖÐÑ¡ÔñµÚ %d ÁÐ"
+
+#: makeinfo/multi.c:584
+msgid "ignoring @tab outside of multitable"
+msgstr "ºöÂÔ¶àÁбí¸ñÍâµÄ @tab"
+
+#: makeinfo/multi.c:632
+#, c-format
+msgid "** Multicolumn output from last row:\n"
+msgstr "** ×îºóÒ»ÐеĶàÁÐÊä³ö£º\n"
+
+#: makeinfo/multi.c:635
+#, c-format
+msgid "* column #%d: output = %s\n"
+msgstr "* ÁÐ #%d£ºÊä³ö = %s\n"
+
+#: makeinfo/node.c:280
+#, c-format
+msgid "Node `%s' previously defined at line %d"
+msgstr "½Úµã¡°%s¡±ÔÚÇ°ÃæµÄ(µÚ %d ÐÐ)¶¨Òå"
+
+#: makeinfo/node.c:648
+#, c-format
+msgid "Formatting node %s...\n"
+msgstr "ÕýÔÚ¸ñʽ»¯½Úµã %s...\n"
+
+#: makeinfo/node.c:716
+#, fuzzy, c-format
+msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
+msgstr "½Úµã¡°%s¡±ÐèÒªÒ»¸ö½ÚÃüÁî (ÀýÈ磺%c%s)"
+
+#: makeinfo/node.c:879
+#, c-format
+msgid "No node name specified for `%c%s' command"
+msgstr "ûÓÐΪ¡°%c%s¡±ÃüÁîÖ¸¶¨½ÚÃû³Æ"
+
+#: makeinfo/node.c:920 makeinfo/node.c:1151
+#, c-format
+msgid "Anchor `%s' and node `%s' map to the same file name"
+msgstr "Anchor¡°%s¡±ºÍ½Úµã¡°%s¡±Ó³É䵽ͬһ¸öÎļþÃû"
+
+#: makeinfo/node.c:923
+msgid "This @anchor command ignored; references to it will not work"
+msgstr "ºöÂԸà @anchor ÃüÁ¶ÔËüµÄÒýÓý«ÎÞ·¨¹¤×÷"
+
+#: makeinfo/node.c:925 makeinfo/node.c:1154
+msgid "Rename this anchor or use the `--no-split' option"
+msgstr "ÖØÃüÃû anchor »òʹÓá°--no-split¡±Ñ¡Ïî"
+
+#: makeinfo/node.c:955
+#, c-format
+msgid "Unexpected string at end of split-HTML file `%s'"
+msgstr "ÔÚ·ÖÁ¢ HTML Îļþ¡°%s¡±µÄĩβµÄÒâÍâ×Ö·û´®"
+
+#: makeinfo/node.c:991
+msgid "Next:"
+msgstr "ÏÂÒ»¸ö£º"
+
+#: makeinfo/node.c:1007
+msgid "Previous:"
+msgstr "ÉÏÒ»¸ö£º"
+
+#: makeinfo/node.c:1021
+msgid "Up:"
+msgstr "Éϲ㣺"
+
+#: makeinfo/node.c:1148
+#, c-format
+msgid "Anchors `%s' and `%s' map to the same file name"
+msgstr "Anchor¡°%s¡±ºÍ¡°%s¡±Ó³É䵽ͬһ¸öÎļþÃû"
+
+#: makeinfo/node.c:1153
+msgid "@anchor command ignored; references to it will not work"
+msgstr "ºöÂÔ @anchor ÃüÁ¶ÔËüµÄÒýÓý«²»Äܹ¤×÷"
+
+#: makeinfo/node.c:1347
+#, fuzzy, c-format
+msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
+msgstr "%sÒýÓõ½²»´æÔڵĽڵ㡰%s¡±"
+
+#: makeinfo/node.c:1363
+msgid "Menu"
+msgstr "²Ëµ¥"
+
+#: makeinfo/node.c:1365
+msgid "Cross"
+msgstr "½»²æÒýÓÃ"
+
+#: makeinfo/node.c:1447
+#, fuzzy, c-format
+msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
+msgstr "½Úµã¡°%s¡±µÄÏÂÒ»¸öÓòûÓÐÖ¸Ïò"
+
+#: makeinfo/node.c:1450
+#, c-format
+msgid "This node (%s) has the bad Prev"
+msgstr "¸Ã½Úµã (%s) º¬ÓдíÎóµÄÉÏÒ»¸ö"
+
+#: makeinfo/node.c:1462
+msgid "Prev"
+msgstr "ÉÏÒ»¸ö"
+
+#: makeinfo/node.c:1505
+#, c-format
+msgid "Prev field of node `%s' not pointed to"
+msgstr "½Úµã¡°%s¡±µÄÉÏÒ»¸öÓòûÓÐÖ¸Ïò"
+
+#: makeinfo/node.c:1509
+#, c-format
+msgid "This node (%s) has the bad Next"
+msgstr "¸Ã½Úµã (%s) º¬ÓдíÎóµÄÏÂÒ»¸ö"
+
+#: makeinfo/node.c:1521
+#, c-format
+msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
+msgstr ""
+
+#: makeinfo/node.c:1524
+msgid "Up"
+msgstr "Éϲã"
+
+#: makeinfo/node.c:1590
+#, c-format
+msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
+msgstr "¾¡¹Ü½Úµã¡°%s¡±ÊÇ¡°%s¡±µÄÉϲã½Úµã£¬µ«È±ÉÙÏà¹ØµÄ²Ëµ¥Ïî"
+
+#: makeinfo/node.c:1619
+#, c-format
+msgid "node `%s' has been referenced %d times"
+msgstr "½Úµã¡°%s¡±Òѱ»ÒýÓÃÁË %d ´Î"
+
+#: makeinfo/node.c:1633
+#, c-format
+msgid "unreferenced node `%s'"
+msgstr "δÒýÓõĽڵ㡰%s¡±"
+
+#: makeinfo/node.c:1723
+#, c-format
+msgid "Removing %s\n"
+msgstr ""
+
+#: makeinfo/node.c:1727
+#, fuzzy, c-format
+msgid "Can't remove file `%s': %s"
+msgstr "ÎÞ·¨´´½¨Ä¿Â¼¡°%s¡±£º%s"
+
+#: makeinfo/sectioning.c:122
+#, fuzzy, c-format
+msgid "Appendix %c"
+msgstr "¸½Â¼ %c "
+
+#: makeinfo/sectioning.c:467
+#, fuzzy, c-format
+msgid "Internal error (search_sectioning) `%s'!"
+msgstr "ÄÚ²¿´íÎó (search_sectioning) ¡°%s¡±£¡"
+
+#: makeinfo/sectioning.c:562
+#, c-format
+msgid "Internal error (search_sectioning) \"%s\"!"
+msgstr "ÄÚ²¿´íÎó (search_sectioning) ¡°%s¡±£¡"
+
+#: makeinfo/sectioning.c:623
+#, c-format
+msgid "%c%s is obsolete; use %c%s instead"
+msgstr "%c%s Òѹýʱ£»Óà %c%s ´úÌæ"
+
+#: makeinfo/sectioning.c:639
+#, c-format
+msgid "Node with %ctop as a section already exists"
+msgstr "´øÓÐ %ctop µÄ½Úµã×÷Ϊһ¸ö½ÚÒѾ­´æÔÚ"
+
+#: makeinfo/sectioning.c:647
+#, c-format
+msgid "Here is the %ctop node"
+msgstr "ÕâÀïÊÇ %ctop ½Úµã"
+
+#: makeinfo/sectioning.c:663
+#, c-format
+msgid "%ctop used before %cnode, defaulting to %s"
+msgstr "%ctop ÔÚ %cnode ֮ǰʹÓã¬Ä¬ÈÏΪ %s"
+
+#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
+msgid "Table of Contents"
+msgstr "Ŀ¼"
+
+#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
+msgid "Short Contents"
+msgstr "¼ò¶ÌĿ¼"
+
+#: makeinfo/xml.c:1605
+#, c-format
+msgid "@image file `%s' unreadable: %s"
+msgstr "@image Îļþ¡°%s¡±²»¿É¶Á£º%s"
+
+#: makeinfo/xml.c:2097
+msgid ""
+"@headitem as the last item of @multitable produces invalid Docbook documents"
+msgstr ""
+
+#: util/install-info.c:154
+#, c-format
+msgid "%s: warning: "
+msgstr "%s£º¾¯¸æ£º"
+
+#: util/install-info.c:203
+#, c-format
+msgid " for %s"
+msgstr ""
+
+#: util/install-info.c:426
+#, c-format
+msgid "\tTry `%s --help' for a complete list of options.\n"
+msgstr "\tÊÔÓá°%s --help¡±ÒÔ»ñµÃÑ¡ÏîµÄÍêÕûÁÐ±í¡£\n"
+
+#: util/install-info.c:434
+#, c-format
+msgid ""
+"Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
+"\n"
+"Install or delete dir entries from INFO-FILE in the Info directory file\n"
+"DIR-FILE.\n"
+"\n"
+"Options:\n"
+" --delete          delete existing entries for INFO-FILE from DIR-FILE;\n"
+"                     don't insert any new entries.\n"
+" --dir-file=NAME   specify file name of Info directory file.\n"
+"                     This is equivalent to using the DIR-FILE argument.\n"
+" --entry=TEXT      insert TEXT as an Info directory entry.\n"
+"                     TEXT should have the form of an Info menu item line\n"
+"                     plus zero or more extra lines starting with "
+"whitespace.\n"
+"                     If you specify more than one entry, they are all "
+"added.\n"
+"                     If you don't specify any entries, they are determined\n"
+"                     from information in the Info file itself.\n"
+" --help            display this help and exit.\n"
+" --info-file=FILE  specify Info file to install in the directory.\n"
+"                     This is equivalent to using the INFO-FILE argument.\n"
+" --info-dir=DIR    same as --dir-file=DIR/dir.\n"
+" --item=TEXT       same as --entry TEXT.\n"
+"                     An Info directory entry is actually a menu item.\n"
+" --quiet           suppress warnings.\n"
+" --remove          same as --delete.\n"
+" --section=SEC     put this file's entries in section SEC of the directory.\n"
+"                     If you specify more than one section, all the entries\n"
+"                     are added in each of the sections.\n"
+"                     If you don't specify any sections, they are determined\n"
+"                     from information in the Info file itself.\n"
+" --version         display version information and exit.\n"
+msgstr ""
+"Ó÷¨£º%s [Ñ¡Ïî]... [INFO-Îļþ [DIR-Îļþ]]\n"
+"\n"
+"½« INFO-ÎļþÖеÄĿ¼ÌõÄ¿°²×°µ½ Info Ŀ¼Îļþ DIR-ÎļþÖУ¬»ò´ÓÖÐ\n"
+"ɾ³ý¡£\n"
+"\n"
+"Ñ¡Ï\n"
+" --delete          ´Ó DIR-ÎļþÖÐɾ³ý¹ØÓÚ INFO-ÎļþµÄÏÖÓÐÌõÄ¿£»\n"
+"                     ²»É¾³ýÈκÎÐÂÌõÄ¿¡£\n"
+" --dir-file=NAME   Ö¸¶¨ Info Ŀ¼ÎļþµÄÎļþÃû¡£\n"
+"                     ÕâµÈ¼ÛÓÚʹÓà DIR-Îļþ²ÎÊý¡£\n"
+" --entry=TEXT      ½« TEXT ×÷Ϊ Info Ŀ¼ÌõÄ¿²åÈë¡£\n"
+"                     TEXT µÄÐÎʽӦ¸ÃÊÇ Info ²Ëµ¥ÏîÄ¿\n"
+"                     ÐÐÒÔ¼°Áã¸ö»ò¶à¸öÒԿհ׿ªÍ·µÄÐС£\n"
+"                     Èç¹ûÄúÖ¸Ã÷¶à¸öÌõÄ¿£¬½«È«²¿Ìí¼Ó¡£\n"
+"                     Èç¹ûÄúδָÃ÷ÈκÎÌõÄ¿£¬ËüÃǽ«´Ó\n"
+"                     Info Îļþ×ÔÉíµÄÐÅÏ¢À´Åжϡ£\n"
+" --help            ÏÔʾ±¾ÇóÖúÐÅÏ¢²¢Í˳ö¡£\n"
+" --info-file=FILE  Ö¸¶¨Òª°²×°µ½Ä¿Â¼ÖÐµÄ Info Îļþ¡£\n"
+"                     ÕâµÈ¼ÛÓÚʹÓà INFO-Îļþ²ÎÊý¡£\n"
+" --info-dir=DIR    µÈͬÓÚ --dir-file=DIR/dir¡£\n"
+" --item=TEXT       µÈͬÓÚ --entry Îı¾¡£\n"
+"                     Info Ŀ¼ÌõĿʵ¼ÊÉÏÊDz˵¥ÏîÄ¿¡£\n"
+" --quiet           ²»ÒªÊä³ö¾¯¸æ¡£\n"
+" --remove          µÈͬÓÚ --delete¡£\n"
+" --section=SEC     ½«¸ÃÎļþµÄÌõÄ¿´æ´¢µ½Ä¿Â¼µÄ½Ú SEC ÖС£\n"
+"                     Èç¹ûÄúÖ¸Ã÷¶àÓÚÒ»¸ö½Ú£¬½«¼ÓÈë¸÷¸ö\n"
+"                     ½ÚÖеÄËùÓÐÌõÄ¿¡£\n"
+"                     Èç¹ûÄúδָÃ÷Èκνڣ¬½«¸ù¾Ý Info\n"
+"                     Îļþ×ÔÉíµÄÐÅÏ¢À´ÅжÏËüÃÇ¡£\n"
+" --version         ÏÔʾ°æ±¾ÐÅÏ¢²¢Í˳ö¡£\n"
+
+#: util/install-info.c:488
+#, fuzzy, c-format
+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"
+"%s\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"
+"  \"h\" gives a primer for first-timers,\n"
+"  \"mEmacs<Return>\" visits the Emacs manual, etc.\n"
+"\n"
+"  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
+"  to select it.\n"
+"\n"
+"%s\n"
+msgstr ""
+"ÕâÊÇÎļþ .../info/dir£¬Ëüº¬ÓÐ Info ²ã´Î\n"
+"½á¹¹µÄ×²ã½Úµã£¬³ÆΪ (dir)Top¡£\n"
+"ÄúµÚÒ»´Îµ÷Óà Info Äú½«´Ó¸Ã½Úµã¿ªÊ¼¡£\n"
+"\n"
+"%s\tÕâÊÇ INFO Ê÷µÄ¶¥\n"
+"\n"
+"  ÕâÀï (the Directory node) ¸ø³öÁËÖ÷ÒªÖ÷ÌâµÄ²Ëµ¥¡£\n"
+"  ÊäÈë¡°q¡±½«Í˳ö£¬ÊäÈë¡°?¡±½«ÁоÙËùÓÐ Info ÃüÁÊäÈë\n"
+"  ¡°d¡±½«·µ»ØÕâÀï¡£ÊäÈë¡°h¡±½«¸ø³õ´ÎʹÓõÄÓû§Ò»¸öÕªÒª£¬\n"
+"  ÊäÈë¡°mEmacs<Return>¡±½«·ÃÎÊ Emacs ÊֲᣬµÈµÈ¡£\n"
+"\n"
+"  ÔÚ EmacsÖУ¬Äú¿ÉÒÔÔڲ˵¥ÏîÄ¿»ò½»²æÒýÓÃÉϵã»÷Êó±êÓÒ¼üÒÔ\n"
+"  Ñ¡ÔñËü¡£\n"
+"\n"
+"* ²Ëµ¥£º\n"
+
+#: util/install-info.c:513
+#, c-format
+msgid "%s: could not read (%s) and could not create (%s)\n"
+msgstr "%s£º¼´ÎÞ·¨¶ÁÈë (%s) Ò²ÎÞ·¨´´½¨ (%s)\n"
+
+#: util/install-info.c:600
+#, c-format
+msgid "%s: empty file"
+msgstr "%s£º¿ÕÎļþ"
+
+#: util/install-info.c:913 util/install-info.c:953
+msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
+msgstr "START-INFO-DIR-ENTRY ûÓÐÆ¥ÅäµÄ END-INFO-DIR-ENTRY"
+
+#: util/install-info.c:948
+msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
+msgstr "END-INFO-DIR-ENTRY ûÓÐÆ¥ÅäµÄ START-INFO-DIR-ENTRY"
+
+#: util/install-info.c:1191 util/install-info.c:1201
+#, c-format
+msgid "%s: already have dir file: %s\n"
+msgstr ""
+
+#: util/install-info.c:1236
+#, c-format
+msgid "%s: Specify the Info file only once.\n"
+msgstr "%s£ºInfo ÎļþÖ»Ó¦¸ÃÖ¸¶¨Ò»´Î¡£\n"
+
+#: util/install-info.c:1284
+#, c-format
+msgid "excess command line argument `%s'"
+msgstr "¶àÓàµÄÃüÁîÐвÎÊý¡°%s¡±"
+
+#: util/install-info.c:1288
+msgid "No input file specified; try --help for more information."
+msgstr "ûÓÐÖ¸¶¨Êä³öÎļþ£»ÊÔÓà --help ÒÔ»ñµÃ¸ü¶àÐÅÏ¢¡£"
+
+#: util/install-info.c:1291
+msgid "No dir file specified; try --help for more information."
+msgstr "ûÓÐÖ¸¶¨Ä¿Â¼Îļþ£»ÊÔÓà --help ÒÔ»ñµÃ¸ü¶àÐÅÏ¢¡£"
+
+#: util/install-info.c:1313
+#, c-format
+msgid "no info dir entry in `%s'"
+msgstr "¡°%s¡±ÖÐûÓÐ info Ŀ¼ÌõÄ¿"
+
+#: util/install-info.c:1426
+#, c-format
+msgid "menu item `%s' already exists, for file `%s'"
+msgstr "ÔÚÎļþ¡°%2$s¡±Öв˵¥Ïî¡°%1$s¡±ÒÑ´æÔÚ"
+
+#: util/install-info.c:1449
+#, c-format
+msgid "no entries found for `%s'; nothing deleted"
+msgstr "ÕÒ²»µ½¹ØÓÚ¡°%s¡±µÄÌõÄ¿£»Î´É¾³ý"
+
+#: util/texindex.c:252
+msgid "display this help and exit"
+msgstr "ÏÔʾ¸ÃÇóÖúÐÅÏ¢²¢Í˳ö"
+
+#: util/texindex.c:254
+msgid "keep temporary files around after processing"
+msgstr "ÔÚ´¦ÀíÖ®ºó±£ÁôÁÙʱÎļþ"
+
+#: util/texindex.c:256
+msgid "do not keep temporary files around after processing (default)"
+msgstr "ÔÚ´¦ÀíÖ®ºóɾ³ýÁÙʱÎļþ (ĬÈÏ)"
+
+#: util/texindex.c:258
+msgid "send output to FILE"
+msgstr "½«Êä³öËÍÈë FILE"
+
+#: util/texindex.c:260
+msgid "display version information and exit"
+msgstr "ÏÔʾ°æ±¾ÐÅÏ¢²¢Í˳ö"
+
+#: util/texindex.c:270
+#, c-format
+msgid "Usage: %s [OPTION]... FILE...\n"
+msgstr "Ó÷¨£º%s [Ñ¡Ïî]... Îļþ...\n"
+
+#: util/texindex.c:271
+#, c-format
+msgid "Generate a sorted index for each TeX output FILE.\n"
+msgstr "Ϊÿ¸ö TeX Êä³öÎļþÉú³ÉÅÅÐòµÄË÷Òý¡£\n"
+
+#: util/texindex.c:274
+#, c-format
+msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
+msgstr "¶ÔÓÚÎĵµ¡°foo.texi¡±£¬FILE... ͨ³£Îª¡°foo.%c%c¡±µÄÐÎʽ¡£\n"
+
+#: util/texindex.c:276
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"Ñ¡Ï\n"
+
+#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
+#: util/texindex.c:1011
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s£º²»ÊÇ texinfo Ë÷ÒýÎļþ"
+
+#: util/texindex.c:968
+#, c-format
+msgid "failure reopening %s"
+msgstr "ÖØдò¿ª %s ʧ°Ü"
+
+#: util/texindex.c:1218
+#, c-format
+msgid "No page number in %s"
+msgstr "%s ÖÐûÓÐÒ³Âë"
+
+#: util/texindex.c:1291
+#, c-format
+msgid "entry %s follows an entry with a secondary name"
+msgstr "ÌõÄ¿ %s ³öÏÖÔÚ¾ßÓдÎÒªÃû³ÆµÄÌõÄ¿Ö®ºó"
+
+#~ msgid "%s: Specify the Info directory only once.\n"
+#~ msgstr "%s£ºInfo Ŀ¼ֻӦ¸ÃÖ¸¶¨Ò»´Î¡£\n"
+
+#~ msgid "\"\" is invalid"
+#~ msgstr "¡°¡±Îª·Ç·¨"
+
+#~ msgid "%s is an invalid ISO code, using %c"
+#~ msgstr "%s ÊÇ·Ç·¨µÄ ISO Â룬ʹÓà %c"
+
+#~ msgid "Cannot specify more than one macro expansion output"
+#~ msgstr "ÎÞ·¨Ö¸¶¨¶à¸öºêÀ©Õ¹Êä³ö"
+
+#~ msgid "File exists, but is not a directory"
+#~ msgstr "Îļþ´æÔÚ£¬µ«²»ÊÇĿ¼"
+
+#~ msgid "First argument to cross-reference may not be empty"
+#~ msgstr "½»²æÒýÓõĵÚÒ»¸ö²ÎÊý²»ÄÜΪ¿Õ"
+
+#~ msgid "see "
+#~ msgstr "²ÎÔÄ "
+
+#~ msgid "`.' or `,' must follow cross reference, not %c"
+#~ msgstr "¡°.¡±»ò¡°,¡±Ö®ºó±ØÐëΪ½»²æÒýÓ㬶ø²»ÊÇ %c"
+
+#~ msgid "First argument to @inforef may not be empty"
+#~ msgstr "@inforef µÄµÚÒ»¸ö²ÎÊý²»ÄÜΪ¿Õ"
+
+#~ msgid "Node:"
+#~ msgstr "½Úµã£º"
+
+#~ msgid "%s: TOC should be here, but it was not found"
+#~ msgstr "%s£ºÄ¿Â¼Ó¦¸ÃÔÚÕâÀµ«Ëü²¢Î´³öÏÖ"
+
+#~ msgid "virtual memory exhausted"
+#~ msgstr "ÐéÄâÄÚ´æºÄ¾¡"
+
+#~ msgid "No `%s.png' or `.jpg', and no extension supplied"
+#~ msgstr "²»ÊÇ¡°%s.png¡±»ò¡°.jpg¡±£¬¶øÇÒûÓиø³öÀ©Õ¹Ãû"
+
+#~ msgid "%s; for file `%s'.\n"
+#~ msgstr "%s£»Îļþ¡°%s¡±¡£\n"
+
+#~ msgid "`%s' has no Up field"
+#~ msgstr "¡°%s¡±Ã»ÓÐÉϲãÓò"
+
+#~ msgid "\\%-10[scroll-forward]  Scroll forward 1 line.\n"
+#~ msgstr "\\%-10[scroll-forward]  ÏòÇ°¹ö¶¯Ò»ÐС£\n"
+
+#~ msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
+#~ msgstr "\\%-10[scroll-backward]  Ïòºó¹ö¶¯Ò»ÐС£\n"
diff --git a/gnu/usr.bin/texinfo/po/zh_TW.gmo b/gnu/usr.bin/texinfo/po/zh_TW.gmo
index b06e41326c7..0b973198cdd 100644
--- a/gnu/usr.bin/texinfo/po/zh_TW.gmo
+++ b/gnu/usr.bin/texinfo/po/zh_TW.gmo
diff --git a/gnu/usr.bin/texinfo/po/zh_TW.po b/gnu/usr.bin/texinfo/po/zh_TW.po
index 8182698151c..404a08953a3 100644
--- a/gnu/usr.bin/texinfo/po/zh_TW.po
+++ b/gnu/usr.bin/texinfo/po/zh_TW.po
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 4.1\n"
-"POT-Creation-Date: 2002-04-01 06:10-0800\n"
+"Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
+"POT-Creation-Date: 2004-12-21 16:20-0800\n"
 "PO-Revision-Date: 2002-03-08 04:56+0800\n"
 "Last-Translator: Abel Cheung <maddog@linux.org.hk>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -13,132 +14,132 @@ msgstr ""
 "Content-Type: text/plain; charset=Big5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: info/echo-area.c:283 info/session.c:712
+#: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr "¦V«e²¾°Ê¤@­Ó¦r¤¸"
 
-#: info/echo-area.c:295 info/session.c:728
+#: info/echo-area.c:296 info/session.c:705
 msgid "Move backward a character"
 msgstr "¦V«á²¾°Ê¤@­Ó¦r¤¸"
 
-#: info/echo-area.c:307
+#: info/echo-area.c:308
 msgid "Move to the start of this line"
 msgstr "²¾¦Ü¥»¦æ¶}ÀY"
 
-#: info/echo-area.c:312
+#: info/echo-area.c:313
 msgid "Move to the end of this line"
 msgstr "²¾¦Ü¥»¦æµ²§À"
 
-#: info/echo-area.c:320 info/session.c:746
+#: info/echo-area.c:321 info/session.c:723
 msgid "Move forward a word"
 msgstr "¦V«e²¾°Ê¤@­Ó¦r"
 
-#: info/echo-area.c:360 info/session.c:795
+#: info/echo-area.c:361 info/session.c:772
 msgid "Move backward a word"
 msgstr "¦V«á²¾°Ê¤@­Ó¦r"
 
-#: info/echo-area.c:400
+#: info/echo-area.c:401
 msgid "Delete the character under the cursor"
 msgstr "§R°£´å¼Ð¦ì¸mªº¦r¤¸"
 
-#: info/echo-area.c:430
+#: info/echo-area.c:431
 msgid "Delete the character behind the cursor"
 msgstr "§R°£´å¼Ð¦ì¸m«áªº¦r¤¸"
 
-#: info/echo-area.c:451
+#: info/echo-area.c:452
 msgid "Cancel or quit operation"
 msgstr "¨ú®ø©Îµ²§ô¥Ø«eªº°Ê§@"
 
-#: info/echo-area.c:466
+#: info/echo-area.c:467
 msgid "Accept (or force completion of) this line"
 msgstr "±µ¨ü (©Î±j­¢§¹¦¨) ¥»¦æ"
 
-#: info/echo-area.c:471
+#: info/echo-area.c:472
 msgid "Insert next character verbatim"
 msgstr "¤£§@Âà´«, ´¡¤J¤U¤@­Ó¦r¤¸"
 
-#: info/echo-area.c:479
+#: info/echo-area.c:480
 msgid "Insert this character"
 msgstr "´¡¤J¥»¦r¤¸"
 
-#: info/echo-area.c:497
+#: info/echo-area.c:498
 msgid "Insert a TAB character"
 msgstr "´¡¤J¤@­Ó TAB ¦r¤¸"
 
-#: info/echo-area.c:504
+#: info/echo-area.c:505
 msgid "Transpose characters at point"
 msgstr "ÅÜ´«´å¼Ð¦ì¸mªº¦r¤¸ªº¶¶§Ç"
 
-#: info/echo-area.c:555
+#: info/echo-area.c:556
 msgid "Yank back the contents of the last kill"
 msgstr "¶K¤J¤W¤@¦¸°Å¤Uªº¤º®e"
 
-#: info/echo-area.c:562
+#: info/echo-area.c:563
 msgid "Kill ring is empty"
 msgstr "°Å¶Kï¨S¦³¤º®e"
 
-#: info/echo-area.c:575
+#: info/echo-area.c:576
 msgid "Yank back a previous kill"
 msgstr "¶K¤W«e¦¸ªº°Å¤U¤º®e"
 
-#: info/echo-area.c:608
+#: info/echo-area.c:609
 msgid "Kill to the end of the line"
 msgstr "§R°£¦Ü¥»¦æµ²§À, ¨Ã¸m¤J°Å¶Kï"
 
-#: info/echo-area.c:621
+#: info/echo-area.c:622
 msgid "Kill to the beginning of the line"
 msgstr "§R°£¦Ü¥»¦æ¶}ÀY, ¨Ã¸m¤J°Å¶Kï"
 
-#: info/echo-area.c:633
+#: info/echo-area.c:634
 msgid "Kill the word following the cursor"
 msgstr "§R°£´å¼Ð«áªº³æ¦r, ¨Ã¸m¤J°Å¶Kï"
 
-#: info/echo-area.c:652
+#: info/echo-area.c:653
 msgid "Kill the word preceding the cursor"
 msgstr "§R°£´å¼Ð«eªº³æ¦r, ¨Ã¸m¤J°Å¶Kï"
 
-#: info/echo-area.c:872 info/echo-area.c:932
+#: info/echo-area.c:868 info/echo-area.c:924
 msgid "No completions"
 msgstr "¨S¦³¥i¯àªº§¹¦¨¥y"
 
-#: info/echo-area.c:874
+#: info/echo-area.c:870
 msgid "Not complete"
 msgstr "¥¼§¹¦¨"
 
-#: info/echo-area.c:919
+#: info/echo-area.c:911
 msgid "List possible completions"
 msgstr "¦C¥X¥i¯àªº§¹¦¨¥y"
 
-#: info/echo-area.c:936
+#: info/echo-area.c:928
 msgid "Sole completion"
 msgstr "³æ¤@ªº§¹¦¨¥y"
 
-#: info/echo-area.c:945
+#: info/echo-area.c:937
 msgid "One completion:\n"
 msgstr "¤@­Ó§¹¦¨¥y:\n"
 
-#: info/echo-area.c:946
+#: info/echo-area.c:938
 #, c-format
 msgid "%d completions:\n"
 msgstr "%d ­Ó§¹¦¨¥y:\n"
 
-#: info/echo-area.c:1092
+#: info/echo-area.c:1085
 msgid "Insert completion"
 msgstr "´¡¤J§¹¦¨¥y"
 
-#: info/echo-area.c:1225
+#: info/echo-area.c:1220
 msgid "Building completions..."
 msgstr "«Ø¥ß§¹¦¨¥y¤¤..."
 
-#: info/echo-area.c:1342
+#: info/echo-area.c:1340
 msgid "Scroll the completions window"
 msgstr "±²°Ê§¹¦¨¥y¤À¹jµøµ¡"
 
-#: info/footnotes.c:212
+#: info/footnotes.c:213
 msgid "Footnotes could not be displayed"
 msgstr "µLªkÅã¥Üµù¸}"
 
-#: info/footnotes.c:238
+#: info/footnotes.c:239
 msgid "Show the footnotes associated with this node in another window"
 msgstr "±N¥»¸`ÂIªºµù¸}Åã¥Ü¦b¥t¤@­Ó¤À¹jµøµ¡¤º"
 
@@ -147,89 +148,89 @@ msgstr "±N¥»¸`ÂIªºµù¸}Åã¥Ü¦b¥t¤@­Ó¤À¹jµøµ¡¤º"
 msgid "---------- Footnotes ----------"
 msgstr "---------------------\n"
 
-#: info/indices.c:175
+#: info/indices.c:172
 msgid "Look up a string in the index for this file"
 msgstr "¦b¥»Àɮתº¯Á¤Þ¤º¬d¸ß¦r¦ê"
 
-#: info/indices.c:205
+#: info/indices.c:199
 msgid "Finding index entries..."
 msgstr "§ä´M¯Á¤Þ¶µ¥Ø..."
 
-#: info/indices.c:212
+#: info/indices.c:207
 msgid "No indices found."
 msgstr "§ä¤£¨ì¯Á¤Þ"
 
-#: info/indices.c:222
+#: info/indices.c:217
 msgid "Index entry: "
 msgstr "¯Á¤Þ¶µ¥Ø: "
 
-#: info/indices.c:332
+#: info/indices.c:325
 msgid ""
 "Go to the next matching index item from the last `\\[index-search]' command"
 msgstr "²¾°Ê¦Ü¤U¤@­Ó²Å¦X¤W¤@¦¸ªº `\\[index-search] ©R¥Oªº·j´M¶µ¥Ø"
 
-#: info/indices.c:342
+#: info/indices.c:335
 msgid "No previous index search string."
 msgstr "¨S¦³«e¤@­Ó¯Á¤Þ·j´M¦r¦ê"
 
-#: info/indices.c:349
+#: info/indices.c:342
 msgid "No index entries."
 msgstr "¨S¦³¯Á¤Þ¶µ¥Ø."
 
-#: info/indices.c:382
-#, c-format
-msgid "No %sindex entries containing \"%s\"."
+#: info/indices.c:375
+#, fuzzy, c-format
+msgid "No %sindex entries containing `%s'."
 msgstr "¨S¦³ %s¯Á¤Þ¶µ¥Ø¥]§t \"%s\"."
 
-#: info/indices.c:383
+#: info/indices.c:376
 msgid "more "
 msgstr "§ó¦hªº "
 
-#: info/indices.c:393
+#: info/indices.c:386
 msgid "CAN'T SEE THIS"
 msgstr ""
 
-#: info/indices.c:429
-#, c-format
-msgid "Found \"%s\" in %s. (`\\[next-index-match]' tries to find next.)"
+#: info/indices.c:422
+#, fuzzy, c-format
+msgid "Found `%s' in %s. (`\\[next-index-match]' tries to find next.)"
 msgstr "§ä¨ì \"%s\" ¦b %s ¤§¤¤. (`\\[next-index-match]' ¹Á¸Õ­n§ä¨ì¤U¤@­Ó¦r¦ê.)"
 
-#: info/indices.c:549
-#, c-format
-msgid "Scanning indices of \"%s\"..."
+#: info/indices.c:541
+#, fuzzy, c-format
+msgid "Scanning indices of `%s'..."
 msgstr "±½ºË \"%s\" ªº¯Á¤Þ¤¤..."
 
-#: info/indices.c:603
+#: info/indices.c:596
 #, c-format
-msgid "No available info files have \"%s\" in their indices."
+msgid "No available info files have `%s' in their indices."
 msgstr ""
 
-#: info/indices.c:632
+#: info/indices.c:622
 msgid "Grovel all known info file's indices for a string and build a menu"
 msgstr "¾ã²z©Ò¦³¤wª¾ info Àɤ¤¥]§t¬d¸ß¦r¦êªº¯Á¤Þ, ¨Ã«Ø¥ß¤@­Ó¿ï³æ"
 
-#: info/indices.c:636
+#: info/indices.c:626
 msgid "Index apropos: "
 msgstr ""
 
-#: info/indices.c:666
-#, c-format
+#: info/indices.c:654
+#, fuzzy, c-format
 msgid ""
 "\n"
-"* Menu: Nodes whoses indices contain \"%s\":\n"
+"* Menu: Nodes whose indices contain `%s':\n"
 msgstr ""
 "\n"
 "* Menu: ¨ä¯Á¤Þ¤¤¥]§t \"%s\" ªº¸`ÂI:\n"
 
-#: info/info.c:260 info/infokey.c:884
+#: info/info.c:275 info/infokey.c:899
+#, c-format
 msgid "Try --help for more information.\n"
 msgstr "¸Õ¸Õ --help ¥H¨ú±o§ó¦hªº¸ê°T.\n"
 
-#: info/info.c:279 info/infokey.c:139 makeinfo/makeinfo.c:689
-#: util/install-info.c:1224 util/texindex.c:338
-#, c-format
+#: info/info.c:295 makeinfo/makeinfo.c:766 util/install-info.c:1266
+#: util/texindex.c:343
+#, 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"
@@ -239,16 +240,16 @@ msgstr ""
 "(GNU General Public License) ªº±ø´Ú¤U´²§G¥»³nÅé.\n"
 "±ýª¾§ó¦hªº¸Ô±¡, ½Ð¬ÝÀɦW¬° COPYING ªºÀÉ®×.\n"
 
-#: info/info.c:462
+#: info/info.c:498
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "§ä¤£¨ì¥]§t `%s' ªº¯Á¤Þ¶µ¥Ø\n"
 
-#: info/info.c:555
+#: info/info.c:590
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
 msgstr ""
 
-#: info/info.c:562
+#: info/info.c:597
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -265,10 +266,12 @@ msgid ""
 "      --index-search=STRING    go to node pointed by index entry STRING.\n"
 "  -n, --node=NODENAME          specify nodes in first visited Info file.\n"
 "  -o, --output=FILENAME        output selected nodes to FILENAME.\n"
-"  -R, --raw-escapes            don't remove ANSI escapes from man pages.\n"
+"  -R, --raw-escapes            output \"raw\" ANSI escapes (default).\n"
+"      --no-raw-escapes         output escapes as literal text.\n"
 "      --restore=FILENAME       read initial keystrokes from FILENAME.\n"
 "  -O, --show-options, --usage  go to command-line options node.\n"
 "%s      --subnodes               recursively output menu items.\n"
+"  -w, --where, --location      print physical location of Info file.\n"
 "      --vi-keys                use vi-like and less-like key bindings.\n"
 "      --version                display version information and exit.\n"
 "\n"
@@ -319,8 +322,8 @@ msgstr ""
 "µ{¦¡¯äÂÎ, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ¦^³ø¦Ü bug-texinfo@gnu.org,\n"
 "¤@¯ë°ÝÃD»P°Q½×, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ±H¨ì help-texinfo@gnu.org.\n"
 
-#: info/info.c:598 info/infokey.c:903 makeinfo/makeinfo.c:474
-#: util/install-info.c:421 util/texindex.c:286
+#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
+#: util/install-info.c:466 util/texindex.c:292
 #, fuzzy
 msgid ""
 "\n"
@@ -332,224 +335,224 @@ msgstr ""
 "µ{¦¡¯äÂÎ, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ¦^³ø¦Ü bug-texinfo@gnu.org,\n"
 "¤@¯ë°ÝÃD»P°Q½×, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ±H¨ì help-texinfo@gnu.org.\n"
 
-#: info/info.c:632
+#: info/info.c:669
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "§ä¤£¨ì `%s' ¸`ÂI."
 
-#: info/info.c:633
+#: info/info.c:670
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "§ä¤£¨ì `(%s)%s' ¸`ÂI."
 
-#: info/info.c:634
+#: info/info.c:671
 msgid "Cannot find a window!"
 msgstr "§ä¤£¨ì¤À¹jµøµ¡!"
 
-#: info/info.c:635
+#: info/info.c:672
 msgid "Point doesn't appear within this window's node!"
 msgstr "´å¼Ð¦ì¸m¤£¦b¥»¤À¹jµøµ¡ªº¸`ÂI¤º!"
 
-#: info/info.c:636
+#: info/info.c:673
 msgid "Cannot delete the last window."
 msgstr "µLªk§R°£¤W¤@­Ó¤À¹jµøµ¡."
 
-#: info/info.c:637
+#: info/info.c:674
 msgid "No menu in this node."
 msgstr "¥»¸`ÂI¨S¦³¿ï³æ."
 
-#: info/info.c:638
+#: info/info.c:675
 msgid "No footnotes in this node."
 msgstr "¥»¸`ÂI¨S¦³µù¸}."
 
-#: info/info.c:639
+#: info/info.c:676
 msgid "No cross references in this node."
 msgstr "¥»¸`ÂI¨S¦³¥æ¤¬°Ñ·Ó."
 
-#: info/info.c:640
+#: info/info.c:677
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "¥»¸`ÂI¨S¦³ `%s' pointer."
 
-#: info/info.c:641
+#: info/info.c:678
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "¥¼ª¾ªº Info ©R¥O `%c'; ¸Õ¸Õ `?' ¥H¨ú±o¨D§U¸ê°T."
 
-#: info/info.c:642
+#: info/info.c:679
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr "²×ºÝ¾÷Ãþ«¬ `%s' µLªk¤ä´©°õ¦æ Info ©Ò»Ýªº»Ý¨D."
 
-#: info/info.c:643
+#: info/info.c:680
 msgid "You are already at the last page of this node."
 msgstr "±z¤w¦b¥»¸`ÂIªº³Ì«á¤@­¶."
 
-#: info/info.c:644
+#: info/info.c:681
 msgid "You are already at the first page of this node."
 msgstr "±z¤w¦b¥»¸`ÂIªº²Ä¤@­¶."
 
-#: info/info.c:645
+#: info/info.c:682
 msgid "Only one window."
 msgstr "¥u¦³¤@­Ó¤À¹jµøµ¡."
 
-#: info/info.c:646
+#: info/info.c:683
 msgid "Resulting window would be too small."
 msgstr "²£¥Íªº¤À¹jµøµ¡·|¤Ó¤p."
 
-#: info/info.c:647
+#: info/info.c:684
 msgid "Not enough room for a help window, please delete a window."
 msgstr "³Ñ¤UªºªÅ¶¡¤Ó¤p, µLªk®e¯Ç¨D§U¤À¹jµøµ¡, ½Ð§R°£¤@­Ó¤À¹jµøµ¡."
 
-#: info/infodoc.c:45 info/infodoc.c:94
+#: info/infodoc.c:46 info/infodoc.c:95
 #, fuzzy
 msgid ""
 "Basic Commands in Info Windows\n"
 "******************************\n"
 msgstr "******************************\n"
 
-#: info/infodoc.c:48
+#: info/infodoc.c:49
 #, fuzzy
 msgid "\\%-10[quit-help]  Quit this help.\n"
 msgstr "  %-10s  µ²§ô¥»¨D§U.\n"
 
-#: info/infodoc.c:49
+#: info/infodoc.c:50
 #, fuzzy
 msgid "\\%-10[quit]  Quit Info altogether.\n"
 msgstr "  %-10s  ¤@¨Öµ²§ô Info µ{¦¡.\n"
 
-#: info/infodoc.c:50
+#: info/infodoc.c:51
 #, fuzzy
 msgid "\\%-10[get-info-help-node]  Invoke the Info tutorial.\n"
 msgstr "  %-10s  °õ¦æ Info «ü¾É½Òµ{.\n"
 
-#: info/infodoc.c:52 info/infodoc.c:101
+#: info/infodoc.c:53 info/infodoc.c:102
 #, fuzzy
 msgid ""
 "Selecting other nodes:\n"
 "----------------------\n"
 msgstr "----------------------\n"
 
-#: info/infodoc.c:54
+#: info/infodoc.c:55
 #, fuzzy
 msgid "\\%-10[next-node]  Move to the \"next\" node of this node.\n"
 msgstr "  %-10s  ²¾¦Ü¥»¸`ÂIªº '¤U¤@­Ó (next)' ¸`ÂI.\n"
 
-#: info/infodoc.c:55
+#: info/infodoc.c:56
 #, fuzzy
 msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
 msgstr "  %-10s  ²¾¦Ü¥»¸`ÂIªº '¤W¤@­Ó (previous)' ¸`ÂI.\n"
 
-#: info/infodoc.c:56
+#: info/infodoc.c:57
 #, fuzzy
 msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
 msgstr "  %-10s  ²¾¦Ü¥»¸`ÂIªº '¤W¤@¼h (up)' ¸`ÂI.\n"
 
-#: info/infodoc.c:57
+#: info/infodoc.c:58
 #, fuzzy
 msgid ""
 "\\%-10[menu-item]  Pick menu item specified by name.\n"
 "              Picking a menu item causes another node to be selected.\n"
 msgstr "              ¿ï¨ú¿ï³æ¶µ¥Ø¥H¿ï¾Ü¥t¤@­Ó¸`ÂI.\n"
 
-#: info/infodoc.c:59
+#: info/infodoc.c:60
 #, fuzzy
 msgid ""
 "\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
 msgstr "  %-10s  ¸òÀH¥æ¤¬°Ñ·Ó.  Ū¨ú°Ñ·Óªº¦WºÙ.\n"
 
-#: info/infodoc.c:60
+#: info/infodoc.c:61
 #, fuzzy
 msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
 msgstr "  %-10s  ²¾°Ê¦Ü¥»¤À¹jµøµ¡¤¤, ¤W¤@­ÓÆ[¬Ýªº¸`ÂI.\n"
 
-#: info/infodoc.c:61
+#: info/infodoc.c:62
 #, fuzzy
 msgid ""
 "\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
 msgstr "  %-10s  ¸õ¨ì¥»¸`ÂI¤¤ªº¤U¤@­Ó¶W¥»¤å³sµ².\n"
 
-#: info/infodoc.c:62
+#: info/infodoc.c:63
 #, fuzzy
 msgid ""
 "\\%-10[move-to-prev-xref]  Skip to previous hypertext link within this "
 "node.\n"
 msgstr "  %-10s  ¸õ¨ì¥»¸`ÂI¤¤ªº¤U¤@­Ó¶W¥»¤å³sµ².\n"
 
-#: info/infodoc.c:63
+#: info/infodoc.c:64
 #, fuzzy
 msgid ""
 "\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
 msgstr "  %-10s  ¸òÀH´å¼Ð¤Uªº¶W¥»¤å³sµ².\n"
 
-#: info/infodoc.c:64
+#: info/infodoc.c:65
 #, fuzzy
 msgid ""
 "\\%-10[dir-node]  Move to the `directory' node.  Equivalent to `\\[goto-"
 "node] (DIR)'.\n"
 msgstr "  %-10s  ²¾¦Ü `directory' ¸`ÂI.  ¦P `g (DIR)'.\n"
 
-#: info/infodoc.c:65
+#: info/infodoc.c:66
 #, fuzzy
 msgid ""
 "\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] Top'.\n"
 msgstr "  %-10s  ²¾¦Ü Top ¸`ÂI.  ¦P `g TOP'.\n"
 
-#: info/infodoc.c:67 info/infodoc.c:115
+#: info/infodoc.c:68 info/infodoc.c:116
 #, fuzzy
 msgid ""
 "Moving within a node:\n"
 "---------------------\n"
 msgstr "---------------------\n"
 
-#: info/infodoc.c:69
-#, fuzzy
-msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
-msgstr "  %-10s  ¦V«e±²°Ê¤@­¶.\n"
-
 #: info/infodoc.c:70
 #, fuzzy
-msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
-msgstr "  %-10s  ¦V«á±²°Ê¤@­¶.\n"
-
-#: info/infodoc.c:71
-#, fuzzy
 msgid "\\%-10[beginning-of-node]  Go to the beginning of this node.\n"
 msgstr "  %-10s  ²¾¦Ü¥»¸`ÂIªº¶}ÀY.\n"
 
-#: info/infodoc.c:72
+#: info/infodoc.c:71
 #, fuzzy
 msgid "\\%-10[end-of-node]  Go to the end of this node.\n"
 msgstr "  %-10s  ²¾¦Ü¥»¸`ÂIªºµ²§À.\n"
 
-#: info/infodoc.c:73
+#: info/infodoc.c:72
 #, fuzzy
-msgid "\\%-10[scroll-forward]  Scroll forward 1 line.\n"
+msgid "\\%-10[next-line]  Scroll forward 1 line.\n"
 msgstr "  %-10s  ©¹«e±²°Ê¤@¦æ.\n"
 
-#: info/infodoc.c:74
+#: info/infodoc.c:73
 #, fuzzy
-msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
+msgid "\\%-10[prev-line]  Scroll backward 1 line.\n"
 msgstr "  %-10s  ©¹«á±²°Ê¤@¦æ.\n"
 
-#: info/infodoc.c:76 info/infodoc.c:124
+#: info/infodoc.c:74
+#, fuzzy
+msgid "\\%-10[scroll-forward]  Scroll forward a page.\n"
+msgstr "  %-10s  ¦V«e±²°Ê¤@­¶.\n"
+
+#: info/infodoc.c:75
+#, fuzzy
+msgid "\\%-10[scroll-backward]  Scroll backward a page.\n"
+msgstr "  %-10s  ¦V«á±²°Ê¤@­¶.\n"
+
+#: info/infodoc.c:77 info/infodoc.c:125
 #, fuzzy
 msgid ""
 "Other commands:\n"
 "---------------\n"
 msgstr "---------------\n"
 
-#: info/infodoc.c:78
+#: info/infodoc.c:79
 #, fuzzy
 msgid "\\%-10[menu-digit]  Pick first ... ninth item in node's menu.\n"
 msgstr "  %-10s  ¬D¿ï¸`ÂI¥Ø¿ý¤¤ªº²Ä¤@­Ó...²Ä¤E­Ó¶µ¥Ø.\n"
 
-#: info/infodoc.c:79
+#: info/infodoc.c:80
 #, fuzzy
 msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
 msgstr "  %-10s  ¬D¿ï¸`ÂI¥Ø¿ýªº³Ì«á¤@­Ó¶µ¥Ø.\n"
 
-#: info/infodoc.c:80
+#: info/infodoc.c:81
 #, fuzzy
 msgid ""
 "\\%-10[index-search]  Search for a specified string in the index entries of "
@@ -558,21 +561,21 @@ msgid ""
 "found.\n"
 msgstr "              ¨Ã¥B¿ï¾Ü²Ä¤@­Ó·j´M¨ìªº¶µ¥Ø©Ò°Ñ·Óªº¸`ÂI.\n"
 
-#: info/infodoc.c:82
+#: info/infodoc.c:83
 #, fuzzy
 msgid ""
 "\\%-10[goto-node]  Move to node specified by name.\n"
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr "              ±z¤]¥i¥H¥]§tÀɦW, ¦p: (ÀɦW)¸`ÂI¦W.\n"
 
-#: info/infodoc.c:84
+#: info/infodoc.c:85
 #, fuzzy
 msgid ""
 "\\%-10[search]  Search forward for a specified string\n"
 "              and select the node in which the next occurrence is found.\n"
 msgstr "              ¨Ã¥B¿ï¾Ü¤U¤@­Ó·j´M¨ìªº¦r¦ê©Ò¦bªº¸`ÂI.\n"
 
-#: info/infodoc.c:86
+#: info/infodoc.c:87
 #, fuzzy
 msgid ""
 "\\%-10[search-backward]  Search backward for a specified string\n"
@@ -580,157 +583,157 @@ msgid ""
 "found.\n"
 msgstr "              ¨Ã¥B¿ï¾Ü¤U¤@­Ó·j´M¨ìªº¦r¦ê©Ò¦bªº¸`ÂI.\n"
 
-#: info/infodoc.c:97
+#: info/infodoc.c:98
 #, c-format
 msgid "  %-10s  Quit this help.\n"
 msgstr "  %-10s  µ²§ô¥»¨D§U.\n"
 
-#: info/infodoc.c:98
+#: info/infodoc.c:99
 #, c-format
 msgid "  %-10s  Quit Info altogether.\n"
 msgstr "  %-10s  ¤@¨Öµ²§ô Info µ{¦¡.\n"
 
-#: info/infodoc.c:99
+#: info/infodoc.c:100
 #, c-format
 msgid "  %-10s  Invoke the Info tutorial.\n"
 msgstr "  %-10s  °õ¦æ Info «ü¾É½Òµ{.\n"
 
-#: info/infodoc.c:103
+#: info/infodoc.c:104
 #, c-format
 msgid "  %-10s  Move to the `next' node of this node.\n"
 msgstr "  %-10s  ²¾¦Ü¥»¸`ÂIªº '¤U¤@­Ó (next)' ¸`ÂI.\n"
 
-#: info/infodoc.c:104
+#: info/infodoc.c:105
 #, c-format
 msgid "  %-10s  Move to the `previous' node of this node.\n"
 msgstr "  %-10s  ²¾¦Ü¥»¸`ÂIªº '¤W¤@­Ó (previous)' ¸`ÂI.\n"
 
-#: info/infodoc.c:105
+#: info/infodoc.c:106
 #, c-format
 msgid "  %-10s  Move `up' from this node.\n"
 msgstr "  %-10s  ²¾¦Ü¥»¸`ÂIªº '¤W¤@¼h (up)' ¸`ÂI.\n"
 
-#: info/infodoc.c:106
+#: info/infodoc.c:107
 #, c-format
 msgid "  %-10s  Pick menu item specified by name.\n"
 msgstr "  %-10s  ¥H¦WºÙ¿ï¨ú¿ï³æ¶µ¥Ø.\n"
 
-#: info/infodoc.c:107
+#: info/infodoc.c:108
 msgid "              Picking a menu item causes another node to be selected.\n"
 msgstr "              ¿ï¨ú¿ï³æ¶µ¥Ø¥H¿ï¾Ü¥t¤@­Ó¸`ÂI.\n"
 
-#: info/infodoc.c:108
+#: info/infodoc.c:109
 #, c-format
 msgid "  %-10s  Follow a cross reference.  Reads name of reference.\n"
 msgstr "  %-10s  ¸òÀH¥æ¤¬°Ñ·Ó.  Ū¨ú°Ñ·Óªº¦WºÙ.\n"
 
-#: info/infodoc.c:109
+#: info/infodoc.c:110
 #, c-format
 msgid "  %-10s  Move to the last node seen in this window.\n"
 msgstr "  %-10s  ²¾°Ê¦Ü¥»¤À¹jµøµ¡¤¤, ¤W¤@­ÓÆ[¬Ýªº¸`ÂI.\n"
 
-#: info/infodoc.c:110
+#: info/infodoc.c:111
 #, c-format
 msgid "  %-10s  Skip to next hypertext link within this node.\n"
 msgstr "  %-10s  ¸õ¨ì¥»¸`ÂI¤¤ªº¤U¤@­Ó¶W¥»¤å³sµ².\n"
 
-#: info/infodoc.c:111
+#: info/infodoc.c:112
 #, c-format
 msgid "  %-10s  Follow the hypertext link under cursor.\n"
 msgstr "  %-10s  ¸òÀH´å¼Ð¤Uªº¶W¥»¤å³sµ².\n"
 
-#: info/infodoc.c:112
+#: info/infodoc.c:113
 #, c-format
 msgid "  %-10s  Move to the `directory' node.  Equivalent to `g (DIR)'.\n"
 msgstr "  %-10s  ²¾¦Ü `directory' ¸`ÂI.  ¦P `g (DIR)'.\n"
 
-#: info/infodoc.c:113
+#: info/infodoc.c:114
 #, c-format
 msgid "  %-10s  Move to the Top node.  Equivalent to `g Top'.\n"
 msgstr "  %-10s  ²¾¦Ü Top ¸`ÂI.  ¦P `g TOP'.\n"
 
-#: info/infodoc.c:117
+#: info/infodoc.c:118
 #, c-format
 msgid "  %-10s  Scroll forward a page.\n"
 msgstr "  %-10s  ¦V«e±²°Ê¤@­¶.\n"
 
-#: info/infodoc.c:118
+#: info/infodoc.c:119
 #, c-format
 msgid "  %-10s  Scroll backward a page.\n"
 msgstr "  %-10s  ¦V«á±²°Ê¤@­¶.\n"
 
-#: info/infodoc.c:119
+#: info/infodoc.c:120
 #, c-format
 msgid "  %-10s  Go to the beginning of this node.\n"
 msgstr "  %-10s  ²¾¦Ü¥»¸`ÂIªº¶}ÀY.\n"
 
-#: info/infodoc.c:120
+#: info/infodoc.c:121
 #, c-format
 msgid "  %-10s  Go to the end of this node.\n"
 msgstr "  %-10s  ²¾¦Ü¥»¸`ÂIªºµ²§À.\n"
 
-#: info/infodoc.c:121
+#: info/infodoc.c:122
 #, c-format
 msgid "  %-10s  Scroll forward 1 line.\n"
 msgstr "  %-10s  ©¹«e±²°Ê¤@¦æ.\n"
 
-#: info/infodoc.c:122
+#: info/infodoc.c:123
 #, c-format
 msgid "  %-10s  Scroll backward 1 line.\n"
 msgstr "  %-10s  ©¹«á±²°Ê¤@¦æ.\n"
 
-#: info/infodoc.c:126
+#: info/infodoc.c:127
 #, c-format
 msgid "  %-10s  Pick first ... ninth item in node's menu.\n"
 msgstr "  %-10s  ¬D¿ï¸`ÂI¥Ø¿ý¤¤ªº²Ä¤@­Ó...²Ä¤E­Ó¶µ¥Ø.\n"
 
-#: info/infodoc.c:127
+#: info/infodoc.c:128
 #, c-format
 msgid "  %-10s  Pick last item in node's menu.\n"
 msgstr "  %-10s  ¬D¿ï¸`ÂI¥Ø¿ýªº³Ì«á¤@­Ó¶µ¥Ø.\n"
 
-#: info/infodoc.c:128
+#: info/infodoc.c:129
 #, c-format
 msgid ""
 "  %-10s  Search for a specified string in the index entries of this Info\n"
 msgstr "  %-10s  ¦b¥» Info Àɪº¯Á¤Þ¶µ¥Ø¤¤, ·j´M¤@­Ó«ü©wªº¦r¦ê,\n"
 
-#: info/infodoc.c:129
+#: info/infodoc.c:130
 msgid ""
 "              file, and select the node referenced by the first entry "
 "found.\n"
 msgstr "              ¨Ã¥B¿ï¾Ü²Ä¤@­Ó·j´M¨ìªº¶µ¥Ø©Ò°Ñ·Óªº¸`ÂI.\n"
 
-#: info/infodoc.c:130
+#: info/infodoc.c:131
 #, c-format
 msgid "  %-10s  Move to node specified by name.\n"
 msgstr "  %-10s  ²¾°Ê¨ì«ü©w¦WºÙªº¸`ÂI.\n"
 
-#: info/infodoc.c:131
+#: info/infodoc.c:132
 msgid ""
 "              You may include a filename as well, as in (FILENAME)NODENAME.\n"
 msgstr "              ±z¤]¥i¥H¥]§tÀɦW, ¦p: (ÀɦW)¸`ÂI¦W.\n"
 
-#: info/infodoc.c:132
+#: info/infodoc.c:133
 #, fuzzy, c-format
 msgid "  %-10s  Search forward for a specified string,\n"
 msgstr "  %-10s  ¦b¥» Info Àɤ¤, ¦V«e·j´M¤@­Ó«ü©wªº¦r¦ê,\n"
 
-#: info/infodoc.c:133 info/infodoc.c:135
+#: info/infodoc.c:134 info/infodoc.c:136
 msgid ""
 "              and select the node in which the next occurrence is found.\n"
 msgstr "              ¨Ã¥B¿ï¾Ü¤U¤@­Ó·j´M¨ìªº¦r¦ê©Ò¦bªº¸`ÂI.\n"
 
-#: info/infodoc.c:134
+#: info/infodoc.c:135
 #, fuzzy, c-format
 msgid "  %-10s  Search backward for a specified string\n"
 msgstr "  %-10s  ¦b¥» Info Àɤ¤, ¦V«á·j´M¤@­Ó«ü©wªº¦r¦ê,\n"
 
-#: info/infodoc.c:313
+#: info/infodoc.c:316
 msgid "The current search path is:\n"
 msgstr "¥Ø«eªº·j´M¸ô®|¬°:\n"
 
-#: info/infodoc.c:316
+#: info/infodoc.c:320
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
@@ -738,7 +741,7 @@ msgstr ""
 "¦b Info ¤À¹jµøµ¡¤¤¥i¥Îªº«ü¥O:\n"
 "\n"
 
-#: info/infodoc.c:319
+#: info/infodoc.c:324
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
@@ -746,7 +749,7 @@ msgstr ""
 "¦^À³°Ï¤¤¥i¥Îªº«ü¥O:\n"
 "\n"
 
-#: info/infodoc.c:340
+#: info/infodoc.c:347
 #, fuzzy, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
@@ -755,7 +758,7 @@ msgstr ""
 "¥H¤Uªº«ü¥O, ¥u¥i¸g¥Ñ M-x °õ¦æ:\n"
 "\n"
 
-#: info/infodoc.c:343
+#: info/infodoc.c:351
 #, fuzzy
 msgid ""
 "The following commands cannot be invoked at all:\n"
@@ -764,157 +767,170 @@ msgstr ""
 "¥H¤Uªº«ü¥O, ¥u¥i¸g¥Ñ M-x °õ¦æ:\n"
 "\n"
 
-#: info/infodoc.c:367
+#: info/infodoc.c:375
 msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
 msgstr "--- ¨Ï¥Î `\\[history-node]' ©Î `\\[kill-node]' Â÷¶}---\n"
 
-#: info/infodoc.c:477
+#: info/infodoc.c:485
 msgid "Display help message"
 msgstr "Åã¥Ü¨D§U°T®§"
 
-#: info/infodoc.c:495
+#: info/infodoc.c:503
 msgid "Visit Info node `(info)Help'"
 msgstr "«ô³X Info ¸`ÂI `(info)Help'"
 
-#: info/infodoc.c:638
+#: info/infodoc.c:641
 msgid "Print documentation for KEY"
 msgstr "¦C¥X KEY ªº¤å¥ó"
 
-#: info/infodoc.c:650
+#: info/infodoc.c:653
 #, c-format
 msgid "Describe key: %s"
 msgstr "´y­z«öÁä«ü¥O: %s"
 
-#: info/infodoc.c:660
+#: info/infodoc.c:664
 #, c-format
 msgid "ESC %s is undefined."
 msgstr "ESC %s ¥¼©w¸q."
 
-#: info/infodoc.c:676 info/infodoc.c:703
+#: info/infodoc.c:680 info/infodoc.c:709
 #, c-format
 msgid "%s is undefined."
 msgstr "%s ¥¼©w¸q."
 
-#: info/infodoc.c:724
+#: info/infodoc.c:730
 #, c-format
 msgid "%s is defined to %s."
 msgstr "%s ©w¸q¦¨ %s."
 
-#: info/infodoc.c:1151
+#: info/infodoc.c:1153
 msgid "Show what to type to execute a given command"
 msgstr "Åã¥Ü°õ¦æ¬Y©R¥O©Ò»ÝÁä¤Jªº«öÁä"
 
-#: info/infodoc.c:1155
+#: info/infodoc.c:1157
 msgid "Where is command: "
 msgstr ""
 
-#: info/infodoc.c:1177
+#: info/infodoc.c:1179
 #, c-format
 msgid "`%s' is not on any keys"
 msgstr "`%s' ¥¼Ãìµ²¨ì¥ô¦ó«öÁä"
 
-#: info/infodoc.c:1183
+#: info/infodoc.c:1186
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr "%s ¥u¯à¸g¥Ñ %s °õ¦æ."
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1190
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr "%s ¥i¸g¥Ñ %s °õ¦æ."
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1195
 #, c-format
 msgid "There is no function named `%s'"
 msgstr "¨S¦³¦W¬° `%s' ªº¨ç¦¡"
 
-#: info/infokey.c:164
+#: info/infokey.c:145
+#, 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 (C) %s ¦Û¥Ñ³nÅé°òª÷·| Free Software Foundation, Inc.\n"
+"¥»³nÅé*¤£§@¥ô¦ó«OÃÒ*. ±z¥i¦b GNU ¤½¦@±ÂÅv \n"
+"(GNU General Public License) ªº±ø´Ú¤U´²§G¥»³nÅé.\n"
+"±ýª¾§ó¦hªº¸Ô±¡, ½Ð¬ÝÀɦW¬° COPYING ªºÀÉ®×.\n"
+
+#: info/infokey.c:170
 msgid "incorrect number of arguments"
 msgstr ""
 
-#: info/infokey.c:194
+#: info/infokey.c:201
 #, fuzzy, c-format
 msgid "cannot open input file `%s'"
 msgstr "µLªk¶}±Ò¦Ü `%s' ªººÞ¹D."
 
-#: info/infokey.c:207
+#: info/infokey.c:215
 #, fuzzy, c-format
 msgid "cannot create output file `%s'"
 msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
 
-#: info/infokey.c:217
+#: info/infokey.c:226
 #, c-format
 msgid "error writing to `%s'"
 msgstr ""
 
-#: info/infokey.c:222
+#: info/infokey.c:232
 #, fuzzy, c-format
 msgid "error closing output file `%s'"
 msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
 
-#: info/infokey.c:443
+#: info/infokey.c:450
 msgid "key sequence too long"
 msgstr ""
 
-#: info/infokey.c:521
+#: info/infokey.c:529
 msgid "missing key sequence"
 msgstr ""
 
-#: info/infokey.c:600
+#: info/infokey.c:610
 msgid "NUL character (\\000) not permitted"
 msgstr ""
 
-#: info/infokey.c:629
+#: info/infokey.c:641
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr ""
 
-#: info/infokey.c:652
+#: info/infokey.c:665
 #, fuzzy
 msgid "missing action name"
 msgstr "%c%s ¿òº|¥k¤j¬A¸¹"
 
-#: info/infokey.c:667 info/infokey.c:733
+#: info/infokey.c:681 info/infokey.c:756
 msgid "section too long"
 msgstr ""
 
-#: info/infokey.c:673
+#: info/infokey.c:688
 #, fuzzy, c-format
 msgid "unknown action `%s'"
 msgstr "¥¼ª¾ªº©R¥O `%s'"
 
-#: info/infokey.c:682
+#: info/infokey.c:698
 msgid "action name too long"
 msgstr ""
 
-#: info/infokey.c:694
+#: info/infokey.c:712
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr ""
 
-#: info/infokey.c:704
+#: info/infokey.c:723
 #, fuzzy
 msgid "missing variable name"
 msgstr "%s: ¿òº|Àɮפ޼Æ.\n"
 
-#: info/infokey.c:712
+#: info/infokey.c:733
 msgid "missing `=' immediately after variable name"
 msgstr ""
 
-#: info/infokey.c:719
+#: info/infokey.c:741
 msgid "variable name too long"
 msgstr ""
 
-#: info/infokey.c:741
+#: info/infokey.c:765
 msgid "value too long"
 msgstr ""
 
-#: info/infokey.c:875
+#: info/infokey.c:890
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr ""
 
-#: info/infokey.c:891
+#: info/infokey.c:906
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -928,89 +944,95 @@ msgid ""
 "  --version            display version information and exit.\n"
 msgstr ""
 
-#: info/infomap.c:1397
+#: info/infomap.c:1500
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too small"
 msgstr ""
 
-#: info/infomap.c:1400
+#: info/infomap.c:1503
 #, c-format
 msgid "Ignoring invalid infokey file `%s' - too big"
 msgstr ""
 
-#: info/infomap.c:1413
+#: info/infomap.c:1516
 #, c-format
 msgid "Error reading infokey file `%s' - short read"
 msgstr ""
 
-#: info/infomap.c:1431
+#: info/infomap.c:1535
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1437
+#: info/infomap.c:1544
 #, c-format
 msgid "Your infokey file `%s' is out of date -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1450
+#: info/infomap.c:1560
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section length) -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1470
+#: info/infomap.c:1581
 #, c-format
 msgid ""
 "Invalid infokey file `%s' (bad section code) -- run infokey to update it"
 msgstr ""
 
-#: info/infomap.c:1608
+#: info/infomap.c:1716
 msgid "Bad data in infokey file -- some key bindings ignored"
 msgstr ""
 
-#: info/infomap.c:1659
+#: info/infomap.c:1766
 msgid "Bad data in infokey file -- some var settings ignored"
 msgstr ""
 
-#: info/m-x.c:70
+#: info/m-x.c:69
 msgid "Read the name of an Info command and describe it"
 msgstr "Ū¨ú Info ©R¥Oªº¦WºÙ, ¨Ã¥B´y­z¥¦"
 
-#: info/m-x.c:74
+#: info/m-x.c:73
 msgid "Describe command: "
 msgstr "´y­z©R¥O: "
 
-#: info/m-x.c:97
+#: info/m-x.c:96
 msgid "Read a command name in the echo area and execute it"
 msgstr "¦b¦^À³°Ï¤¤Åª¨ú©R¥O¦WºÙ, ¨Ã¥B°õ¦æ¥¦"
 
-#: info/m-x.c:141
+#: info/m-x.c:140
 msgid "Cannot execute an `echo-area' command here."
 msgstr "µLªk¦b³o¸Ì°õ¦æ `echo-area' ©R¥O."
 
-#: info/m-x.c:157
+#: info/m-x.c:154
+#, fuzzy, c-format
+msgid "Undefined command: %s"
+msgstr "¥¼ª¾ªº©R¥O `%s'"
+
+#: info/m-x.c:160
 msgid "Set the height of the displayed window"
 msgstr "³]©wÅã¥Üµøµ¡ªº°ª«×"
 
-#: info/m-x.c:170
+#: info/m-x.c:173
 #, c-format
 msgid "Set screen height to (%d): "
 msgstr "³]©w¿Ã¹õ°ª«×¬° (%d): "
 
-#: info/makedoc.c:161 info/makedoc.c:169
+#: info/makedoc.c:162 info/makedoc.c:170
+#, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
 "\n"
 msgstr ""
 
-#: info/makedoc.c:553
+#: info/makedoc.c:550
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "µLªk³B²zÀÉ®× %s.\n"
 
-#: info/nodemenu.c:28
+#: info/nodemenu.c:31
 msgid ""
 "\n"
 "* Menu:\n"
@@ -1022,7 +1044,7 @@ msgstr ""
 "  (ÀÉ®×)¸`ÂI                        ¦æ ¼Æ   ¤j¤p    ¥]  §t  ÀÉ  ®×\n"
 "  ----------                        -----   ----   ---------------"
 
-#: info/nodemenu.c:199
+#: info/nodemenu.c:202
 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"
@@ -1030,24 +1052,24 @@ msgstr ""
 "³o¬O±z³Ìªñ«ô³X¹Lªº¸`ÂI¿ï³æ.\n"
 "¦Û¥»¿ï³æ¿ï¨ú¤@¶µ, ©Î¬O¦b¥t¤@­Ó¤À¹jµøµ¡¨Ï¥Î `\\[history-node]' ©R¥O.\n"
 
-#: info/nodemenu.c:219
+#: info/nodemenu.c:224
 msgid "Make a window containing a menu of all of the currently visited nodes"
 msgstr "²£¥Í¤@­Ó¤À¹jµøµ¡, ¥]§t©Ò¦³³Ìªñ«ô³X¹Lªº¸`ÂI¿ï³æ"
 
-#: info/nodemenu.c:299
+#: info/nodemenu.c:304
 msgid "Select a node which has been previously visited in a visible window"
 msgstr "¿ï¨ú¤§«e¦b¥i¨£¤À¹jµøµ¡«ô³X¹Lªº¸`ÂI"
 
-#: info/nodemenu.c:311
+#: info/nodemenu.c:317
 msgid "Select visited node: "
 msgstr "¿ï¨ú«ô³X¹Lªº¸`ÂI: "
 
-#: info/nodemenu.c:331 info/session.c:2235
+#: info/nodemenu.c:337 info/session.c:2264
 #, c-format
 msgid "The reference disappeared! (%s)."
 msgstr "¥æ¤¬°Ñ·Ó¤£¨£¤F! (%s)."
 
-#: info/session.c:170
+#: info/session.c:162
 #, c-format
 msgid ""
 "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1056,439 +1078,439 @@ msgstr ""
 "Åwªï¨Ï¥Î Info ª©¥» %s. Áä¤J \\[get-help-window] ¥H¨ú±o¨D§U¸ê°T, \\[menu-"
 "item] ¥H¨ú±o¿ï³æ¶µ¥Ø."
 
-#: info/session.c:643
+#: info/session.c:620
 msgid "Move down to the next line"
 msgstr "²¾¦Ü¤U¤@¦æ"
 
-#: info/session.c:658
+#: info/session.c:635
 msgid "Move up to the previous line"
 msgstr "²¾¦Ü¤W¤@¦æ"
 
-#: info/session.c:673
+#: info/session.c:650
 msgid "Move to the end of the line"
 msgstr "²¾¦Ü¥»¦æµ²§À"
 
-#: info/session.c:693
+#: info/session.c:670
 msgid "Move to the start of the line"
 msgstr "²¾¦Ü¥»¦æ¶}ÀY"
 
-#: info/session.c:885 makeinfo/node.c:1357
+#: info/session.c:860 makeinfo/node.c:1424
 msgid "Next"
 msgstr "¤U¤@­Ó"
 
-#: info/session.c:888
+#: info/session.c:863
 msgid "Following Next node..."
 msgstr "¸òÀH¤U¤@­Ó¸`ÂI..."
 
-#: info/session.c:905
+#: info/session.c:881
 msgid "Selecting first menu item..."
 msgstr "¿ï¨ú²Ä¤@­Ó¿ï³æ¶µ¥Ø..."
 
-#: info/session.c:916
+#: info/session.c:893
 msgid "Selecting Next node..."
 msgstr "¿ï¨ú¤U¤@­Ó¸`ÂI..."
 
-#: info/session.c:986
+#: info/session.c:964
 #, c-format
 msgid "Moving Up %d time(s), then Next."
 msgstr "©¹¤W¤@¼h²¾°Ê %d ¦¸, µM«á©¹¤U¤@­Ó¤è¦V²¾°Ê."
 
-#: info/session.c:1010
+#: info/session.c:988
 msgid "No more nodes within this document."
 msgstr "¥»¤å¥ó¤¤¨S¦³§ó¦hªº¸`ÂI¤F."
 
-#: info/session.c:1034
+#: info/session.c:1011
 msgid "No `Prev' for this node."
 msgstr "¥»¸`ÂI¨S¦³ `¤W¤@­Ó (Prev)' ¸`ÂI."
 
-#: info/session.c:1037 info/session.c:1092
+#: info/session.c:1014 info/session.c:1073
 msgid "Moving Prev in this window."
 msgstr "¦V¥»¤À¹jµøµ¡ªº ¤W¤@­Ó (Prev) ¸`ÂI²¾°Ê."
 
-#: info/session.c:1051
+#: info/session.c:1030
 msgid "No `Prev' or `Up' for this node within this document."
 msgstr "¦b¥»¤å¥ó¤¤, ¥»¸`ÂI¨S¦³ `¤W¤@­Ó (Prev)' ¸`ÂI©Î `¤W¤@¼h (Up)' ¸`ÂI."
 
-#: info/session.c:1054
+#: info/session.c:1034
 msgid "Moving Up in this window."
 msgstr "¦V¥»¤À¹jµøµ¡ªº¤W¤@¼h¸`ÂI²¾°Ê."
 
-#: info/session.c:1102
+#: info/session.c:1084
 msgid "Moving to `Prev's last menu item."
 msgstr "²¾¦Ü«e¤@­Ó¸`ÂIªº³Ì«á¤@­Ó¥Ø¿ý¶µ¥Ø."
 
-#: info/session.c:1113
+#: info/session.c:1095
 msgid "Move forwards or down through node structure"
 msgstr "¦b¸`ÂIµ²ºc¤¤, ©¹«e©Î©¹¤U²¾°Ê"
 
-#: info/session.c:1129
+#: info/session.c:1111
 msgid "Move backwards or up through node structure"
 msgstr "¦b¸`ÂIµ²ºc¤¤, ©¹«á©Î©¹¤U²¾°Ê"
 
-#: info/session.c:1229
+#: info/session.c:1205
 msgid "Scroll forward in this window"
 msgstr "¦b¥»¤À¹jµøµ¡¤¤¦V«e±²°Ê"
 
-#: info/session.c:1237
+#: info/session.c:1213
 msgid "Scroll forward in this window and set default window size"
 msgstr "¦b¥»¤À¹jµøµ¡¤¤¦V«e±²°Ê, ¨Ã¥B³]©w¦¨¹w³]ªº¤À¹jµøµ¡¤Ø¤o"
 
-#: info/session.c:1245
+#: info/session.c:1221
 #, fuzzy
 msgid "Scroll forward in this window staying within node"
 msgstr "¦b¥»¤À¹jµøµ¡¤¤¦V«e±²°Ê"
 
-#: info/session.c:1253
+#: info/session.c:1229
 #, fuzzy
 msgid ""
 "Scroll forward in this window staying within node and set default window size"
 msgstr "¦b¥»¤À¹jµøµ¡¤¤¦V«e±²°Ê, ¨Ã¥B³]©w¦¨¹w³]ªº¤À¹jµøµ¡¤Ø¤o"
 
-#: info/session.c:1261
+#: info/session.c:1237
 msgid "Scroll backward in this window"
 msgstr "¦b¥»¤À¹jµøµ¡¤¤¦V«á±²°Ê"
 
-#: info/session.c:1269
+#: info/session.c:1245
 msgid "Scroll backward in this window and set default window size"
 msgstr "¦b¥»¤À¹jµøµ¡¤¤¦V«á±²°Ê, ¨Ã¥B³]©w¦¨¹w³]ªº¤À¹jµøµ¡¤Ø¤o"
 
-#: info/session.c:1278
+#: info/session.c:1254
 #, fuzzy
 msgid "Scroll backward in this window staying within node"
 msgstr "¦b¥»¤À¹jµøµ¡¤¤¦V«á±²°Ê"
 
-#: info/session.c:1286
+#: info/session.c:1262
 #, fuzzy
 msgid ""
 "Scroll backward in this window staying within node and set default window "
 "size"
 msgstr "¦b¥»¤À¹jµøµ¡¤¤¦V«á±²°Ê, ¨Ã¥B³]©w¦¨¹w³]ªº¤À¹jµøµ¡¤Ø¤o"
 
-#: info/session.c:1294
+#: info/session.c:1270
 msgid "Move to the start of this node"
 msgstr "²¾¦Ü¥»¸`ÂIªº°_ÂI"
 
-#: info/session.c:1301
+#: info/session.c:1277
 msgid "Move to the end of this node"
 msgstr "²¾¦Ü¥»¸`ÂIªºµ²§À"
 
-#: info/session.c:1308
+#: info/session.c:1284
 msgid "Scroll down by lines"
 msgstr "¤@¦æ¦æ¦V¤U±²°Ê"
 
-#: info/session.c:1325
+#: info/session.c:1301
 msgid "Scroll up by lines"
 msgstr "¤@¦æ¦æ¦V¤W±²°Ê"
 
-#: info/session.c:1343
+#: info/session.c:1319
 msgid "Scroll down by half screen size"
 msgstr "¦V¤U±²°Ê¥b­Ó¿Ã¹õªº¤j¤p"
 
-#: info/session.c:1369
+#: info/session.c:1345
 msgid "Scroll up by half screen size"
 msgstr "¦V¤W±²°Ê¥b­Ó¿Ã¹õªº¤j¤p"
 
-#: info/session.c:1398
+#: info/session.c:1374
 msgid "Select the next window"
 msgstr "¿ï¾Ü¤U¤@­Ó¤À¹jµøµ¡"
 
-#: info/session.c:1437
+#: info/session.c:1413
 msgid "Select the previous window"
 msgstr "¿ï¾Ü«e¤@­Ó¤À¹jµøµ¡"
 
-#: info/session.c:1488
+#: info/session.c:1464
 msgid "Split the current window"
 msgstr "¤À¹j¥Ø«eªº¤À¹jµøµ¡"
 
-#: info/session.c:1569
+#: info/session.c:1545
 msgid "Delete the current window"
 msgstr "§R°£¥Ø«eªº¤À¹jµøµ¡"
 
-#: info/session.c:1577
+#: info/session.c:1553
 msgid "Cannot delete a permanent window"
 msgstr "µLªk§R°£©T©wªº¤À¹jµøµ¡"
 
-#: info/session.c:1610
+#: info/session.c:1585
 msgid "Delete all other windows"
 msgstr "§R°£©Ò¦³¨ä¥¦ªº¤À¹jµøµ¡"
 
-#: info/session.c:1656
+#: info/session.c:1631
 msgid "Scroll the other window"
 msgstr "±²°Ê¥t¤@­Ó¤À¹jµøµ¡"
 
-#: info/session.c:1677
+#: info/session.c:1652
 msgid "Scroll the other window backward"
 msgstr "¦V«á±²°Ê¥t¤@­Ó¤À¹jµøµ¡"
 
-#: info/session.c:1683
+#: info/session.c:1658
 msgid "Grow (or shrink) this window"
 msgstr "ÂX¤j (©ÎÁY¤p) ³o­Ó¤À¹jµøµ¡"
 
-#: info/session.c:1694
+#: info/session.c:1669
 msgid "Divide the available screen space among the visible windows"
 msgstr "¦b¥i¥Îªº¿Ã¹õªÅ¶¡¤¤, ¥­§¡¤À³Î©Ò¦³ªº¥i¨£¤À¹jµøµ¡"
 
-#: info/session.c:1701
+#: info/session.c:1676
 msgid "Toggle the state of line wrapping in the current window"
 msgstr "¤Á´«¥Ø«e¤À¹jµøµ¡ªº¦Û°Ê´«¦æª¬ºA"
 
-#: info/session.c:1880
+#: info/session.c:1848
 msgid "Select the Next node"
 msgstr "¿ï¨ú ¤U¤@­Ó ¸`ÂI"
 
-#: info/session.c:1888
+#: info/session.c:1856
 msgid "Select the Prev node"
 msgstr "¿ï¨ú «e¤@­Ó ¸`ÂI"
 
-#: info/session.c:1896
+#: info/session.c:1864
 msgid "Select the Up node"
 msgstr "¿ï¨ú ¤W¤@¼h ¸`ÂI"
 
-#: info/session.c:1903
+#: info/session.c:1871
 msgid "Select the last node in this file"
 msgstr "¿ï¨ú¥»Àɮתº³Ì«á¤@­Ó¸`ÂI"
 
-#: info/session.c:1930 info/session.c:1963
+#: info/session.c:1898 info/session.c:1931
 msgid "This window has no additional nodes"
 msgstr "¥»¤À¹jµøµ¡¨S¦³ÃB¥~ªº¸`ÂI"
 
-#: info/session.c:1936
+#: info/session.c:1904
 msgid "Select the first node in this file"
 msgstr "¿ï¨ú¥»Àɮתº²Ä¤@­Ó¸`ÂI"
 
-#: info/session.c:1970
+#: info/session.c:1938
 msgid "Select the last item in this node's menu"
 msgstr "¿ï¨ú¥»¸`ÂI¿ï³æ¤¤, ³Ì«á¤@­Ó¶µ¥Ø"
 
-#: info/session.c:1976
+#: info/session.c:1944
 msgid "Select this menu item"
 msgstr "¿ï¾Ü³o¤@­Ó¿ï³æ¶µ¥Ø"
 
-#: info/session.c:2005
+#: info/session.c:1977
 #, c-format
 msgid "There aren't %d items in this menu."
 msgstr "¥»¿ï³æ¤¤¨S¦³ %d ­Ó¶µ¥Ø"
 
-#: info/session.c:2148
+#: info/session.c:2171 info/session.c:2172
 #, c-format
 msgid "Menu item (%s): "
 msgstr "¿ï³æ¶µ¥Ø (%s): "
 
-#: info/session.c:2150
+#: info/session.c:2175
 msgid "Menu item: "
 msgstr "¿ï³æ¶µ¥Ø: "
 
-#: info/session.c:2155
+#: info/session.c:2182 info/session.c:2183
 #, c-format
 msgid "Follow xref (%s): "
 msgstr "¸òÀH¥æ¤¬°Ñ·Ó (%s): "
 
-#: info/session.c:2157
+#: info/session.c:2186
 msgid "Follow xref: "
 msgstr "¸òÀH¥æ¤¬°Ñ·Ó: "
 
-#: info/session.c:2280
+#: info/session.c:2315
 msgid "Read a menu item and select its node"
 msgstr "Ū¨ú¤@­Ó¿ï³æ¶µ¥Ø, ¨Ã¥B¿ï¾Ü¥¦ªº¸`ÂI"
 
-#: info/session.c:2288
+#: info/session.c:2323
 msgid "Read a footnote or cross reference and select its node"
 msgstr "Ū¨ú¤@­Óµù¸}©Î¥æ¤¬°Ñ·Ó, ¨Ã¥B¿ï¾Ü¥¦ªº¸`ÂI"
 
-#: info/session.c:2294
+#: info/session.c:2329
 msgid "Move to the start of this node's menu"
 msgstr "²¾¦Ü¥»¸`ÂIªº¿ï³æ¶}ÀY"
 
-#: info/session.c:2318
+#: info/session.c:2353
 msgid "Visit as many menu items at once as possible"
 msgstr "¾¨¥i¯à¤@¦¸«ô³X³Ì¦h­Ó¿ï³æ¶µ¥Ø"
 
-#: info/session.c:2346
+#: info/session.c:2381
 msgid "Read a node name and select it"
 msgstr "Ū¨ú¸`ÂI¦WºÙ, ¨Ã¥B¿ï¾Ü¥¦"
 
-#: info/session.c:2401 info/session.c:2405
+#: info/session.c:2436 info/session.c:2441
 msgid "Goto node: "
 msgstr "¸õ¦Ü¸`ÂI: "
 
-#: info/session.c:2471
+#: info/session.c:2505
 #, c-format
 msgid "No menu in node `%s'."
 msgstr "¸`ÂI `%s' ¤¤¨S¦³¿ï³æ."
 
-#: info/session.c:2516
+#: info/session.c:2551
 #, c-format
 msgid "No menu item `%s' in node `%s'."
 msgstr "¿ï³æ¶µ¥Ø `%s' ¤£¦b¸`ÂI `%s' ¤¤."
 
-#: info/session.c:2546
+#: info/session.c:2581
 #, c-format
 msgid "Unable to find node referenced by `%s' in `%s'."
 msgstr "³Q°Ñ·Óªº¸`ÂI `%s' ¦b `%s' ¤¤§ä¤£¨ì."
 
-#: info/session.c:2597
+#: info/session.c:2631
 msgid "Read a list of menus starting from dir and follow them"
 msgstr "Ū¨ú¦Û dir ¶}©lªº¸`ÂI±ø¦C, ¨Ã¥B¸òÀH¥¦­Ì"
 
-#: info/session.c:2599
+#: info/session.c:2633
 msgid "Follow menus: "
 msgstr "¸òÀH¿ï³æ: "
 
-#: info/session.c:2797
+#: info/session.c:2826
 msgid "Find the node describing program invocation"
 msgstr "§ä´M´y­zµ{¦¡°õ¦æ¤èªkªº¸`ÂI"
 
-#: info/session.c:2799
+#: info/session.c:2828
 #, c-format
 msgid "Find Invocation node of [%s]: "
 msgstr "§ä´M [%s] ªº°õ¦æ¤èªk¸`ÂI: "
 
-#: info/session.c:2837
+#: info/session.c:2866
 msgid "Read a manpage reference and select it"
 msgstr "Ū¨ú½u¤W¤â¥U (manpage) ªº°Ñ·Ó, ¨Ã¥B¿ï¾Ü¥¦"
 
-#: info/session.c:2841
+#: info/session.c:2870
 msgid "Get Manpage: "
 msgstr "¨ú±o½u¤W¤â¥U (Manpage): "
 
-#: info/session.c:2871
+#: info/session.c:2900
 msgid "Select the node `Top' in this file"
 msgstr "¿ï¨ú¥»Àɮפ¤ªº `Top' ¸`ÂI"
 
-#: info/session.c:2877
+#: info/session.c:2906
 msgid "Select the node `(dir)'"
 msgstr "¿ï¨ú¸`ÂI `(dir)'"
 
-#: info/session.c:2897
+#: info/session.c:2923 info/session.c:2925
 #, c-format
 msgid "Kill node (%s): "
 msgstr "§R°£¸`ÂI (%s): "
 
-#: info/session.c:2951
+#: info/session.c:2977
 #, c-format
 msgid "Cannot kill node `%s'"
 msgstr "µLªk§R°£¸`ÂI `%s'"
 
-#: info/session.c:2961
+#: info/session.c:2987
 msgid "Cannot kill the last node"
 msgstr "µLªk§R°£¤W¤@­Ó¸`ÂI"
 
-#: info/session.c:3047
+#: info/session.c:3073
 msgid "Select the most recently selected node"
 msgstr "¿ï¾Ü³Ìªñ¤@¦¸³Q¿ï¾Üªº¸`ÂI"
 
-#: info/session.c:3053
+#: info/session.c:3079
 msgid "Kill this node"
 msgstr "§R°£¥»¸`ÂI"
 
-#: info/session.c:3061
+#: info/session.c:3087
 msgid "Read the name of a file and select it"
 msgstr "Ū¨úÀɮצWºÙ, µM«á¿ï¨ú¥¦"
 
-#: info/session.c:3065
+#: info/session.c:3091
 msgid "Find file: "
 msgstr "§ä´MÀÉ®×: "
 
-#: info/session.c:3082
+#: info/session.c:3108
 #, c-format
 msgid "Cannot find `%s'."
 msgstr "µLªk§ä¨ì `%s'."
 
-#: info/session.c:3127 info/session.c:3248
+#: info/session.c:3151 info/session.c:3269
 #, c-format
 msgid "Could not create output file `%s'."
 msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
 
-#: info/session.c:3140 info/session.c:3265 info/session.c:3326
+#: info/session.c:3165 info/session.c:3287 info/session.c:3347
 msgid "Done."
 msgstr "§¹¦¨."
 
-#: info/session.c:3196
+#: info/session.c:3220
 #, c-format
 msgid "Writing node %s..."
 msgstr "¼g¤J¸`ÂI %s ¤¤..."
 
-#: info/session.c:3274
+#: info/session.c:3296
 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
 msgstr "±N¥»¸`ÂIªº¤º®e, ¸g¥ÑºÞ¹D (pipe) °e¦Ü INFO_PRINT_COMMAND"
 
-#: info/session.c:3310
+#: info/session.c:3331
 #, c-format
 msgid "Cannot open pipe to `%s'."
 msgstr "µLªk¶}±Ò¦Ü `%s' ªººÞ¹D."
 
-#: info/session.c:3316
+#: info/session.c:3337
 #, c-format
 msgid "Printing node %s..."
 msgstr "¦C¦L¸`ÂI %s ¤¤..."
 
-#: info/session.c:3558
+#: info/session.c:3567
 #, c-format
 msgid "Searching subfile %s ..."
 msgstr "·j´M¤lÀÉ®× %s ..."
 
-#: info/session.c:3610
+#: info/session.c:3619
 msgid "Read a string and search for it case-sensitively"
 msgstr "Ū¨ú¤@­Ó¦r¦ê, µM«á¥H°Ï¤À¤j¤p¼g¤è¦¡·j´M"
 
-#: info/session.c:3617
+#: info/session.c:3626
 msgid "Read a string and search for it"
 msgstr "Ū¨ú¤@­Ó¦r¦ê, µM«á·j´M"
 
-#: info/session.c:3625
+#: info/session.c:3634
 msgid "Read a string and search backward for it"
 msgstr "Ū¨ú¤@­Ó¦r¦ê, µM«á¦V«á·j´M"
 
-#: info/session.c:3667
+#: info/session.c:3670 info/session.c:3677
 #, c-format
 msgid "%s%sfor string [%s]: "
 msgstr "%s%s [%s]: "
 
-#: info/session.c:3668
+#: info/session.c:3671 info/session.c:3678
 msgid "Search backward"
 msgstr "¦V«á·j´M¦r¦ê"
 
-#: info/session.c:3668
+#: info/session.c:3672 info/session.c:3678
 msgid "Search"
 msgstr "·j´M¦r¦ê"
 
-#: info/session.c:3669
+#: info/session.c:3673 info/session.c:3679
 msgid " case-sensitively "
 msgstr ", ¥H°Ï¤À¤j¤p¼gªº¤è¦¡"
 
-#: info/session.c:3669
+#: info/session.c:3674 info/session.c:3679
 msgid " "
 msgstr " "
 
-#: info/session.c:3709
+#: info/session.c:3718
 msgid "Search failed."
 msgstr "·j´M¥¢±Ñ."
 
-#: info/session.c:3727
+#: info/session.c:3736
 msgid "Repeat last search in the same direction"
 msgstr "¥H¦P¼Ëªº·j´M¤è¦V­«ÂФW¦¸ªº·j´M"
 
-#: info/session.c:3730 info/session.c:3740
+#: info/session.c:3739 info/session.c:3749
 msgid "No previous search string"
 msgstr "¨S¦³«e¤@¦¸ªº·j´M¦r¦ê"
 
-#: info/session.c:3737
+#: info/session.c:3746
 msgid "Repeat last search in the reverse direction"
 msgstr "¥H¬Û¤Ïªº·j´M¤è¦V­«ÂФW¦¸ªº·j´M"
 
-#: info/session.c:3755 info/session.c:3761
+#: info/session.c:3765 info/session.c:3771
 msgid "Search interactively for a string as you type it"
 msgstr "¥H¤¬°Ê¤è¦¡, Ãä¿é¤J¦r¦êÃä·j´M"
 
-#: info/session.c:3855
+#: info/session.c:3851
 msgid "I-search backward: "
 msgstr "¤Ï¦V¤¬°Ê·j´M: "
 
-#: info/session.c:3857
+#: info/session.c:3853
 msgid "I-search: "
 msgstr "¤¬°Ê·j´M: "
 
-#: info/session.c:3882
+#: info/session.c:3878 info/session.c:3880
 msgid "Failing "
 msgstr "¥¢±Ñ "
 
@@ -1504,27 +1526,27 @@ msgstr "²¾°Ê¦Ü¤U¤@­Ó¥æ¤¬°Ñ·Ó"
 msgid "Select reference or menu item appearing on this line"
 msgstr "¿ï¾Ü¥X²{¦b¥»¦æªº°Ñ·Ó©Î¿ï³æ¶µ¥Ø"
 
-#: info/session.c:4381
+#: info/session.c:4382
 msgid "Cancel current operation"
 msgstr "¨ú®ø¥Ø«eªº§@·~"
 
-#: info/session.c:4388
+#: info/session.c:4389
 msgid "Quit"
 msgstr "µ²§ô"
 
-#: info/session.c:4397
+#: info/session.c:4398
 msgid "Move the cursor to a specific line of the window"
 msgstr "²¾°Ê´å¼Ð¦Ü¤À¹jµøµ¡¤¤ªº«ü©w¦ì¸m"
 
-#: info/session.c:4429
+#: info/session.c:4430
 msgid "Redraw the display"
 msgstr "­«Ã¸µe­±"
 
-#: info/session.c:4466
+#: info/session.c:4467
 msgid "Quit using Info"
 msgstr "µ²§ô¨Ï¥Î Info"
 
-#: info/session.c:4479
+#: info/session.c:4480
 msgid "Run command bound to this key's lowercase variant"
 msgstr ""
 
@@ -1534,27 +1556,29 @@ msgid "Unknown command (%s)."
 msgstr "¥¼ª¾ªº©R¥O (%s)."
 
 #: info/session.c:4494
-msgid "\"\" is invalid"
-msgstr "\"\" ¤£¦Xªk"
-
-#: info/session.c:4495
 #, c-format
 msgid "\"%s\" is invalid"
 msgstr "\"%s\" ¤£¦Xªk"
 
-#: info/session.c:4713
+#: info/session.c:4495
+#, fuzzy, c-format
+msgid "`%s' is invalid"
+msgstr "\"%s\" ¤£¦Xªk"
+
+#: info/session.c:4709
 msgid "Add this digit to the current numeric argument"
 msgstr "±N¥»¼Æ¦r¥[¦Ü¥Ø«eªº¼Æ­È¤Þ¼Æ"
 
-#: info/session.c:4722
+#: info/session.c:4718
 msgid "Start (or multiply by 4) the current numeric argument"
 msgstr "¶}©l¥Ø«eªº¼Æ­È¤Þ¼Æ (©Î¬O­¼¥H 4)"
 
-#: info/session.c:4737
+#: info/session.c:4733
 msgid "Internally used by \\[universal-argument]"
 msgstr "¦b¤º³¡³Q \\[universal-argument] ¨Ï¥Î"
 
-#: info/tilde.c:344
+#: info/tilde.c:338
+#, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: ¯ÓºÉµêÀÀ°O¾ÐÅé!\n"
 
@@ -1620,230 +1644,264 @@ msgstr "³]©w %s ªº¼Æ­È (%d): "
 msgid "Set %s to value (%s): "
 msgstr "³]©w %s ªº¼Æ­È (%s): "
 
-#: info/window.c:1164
+#: info/window.c:1138
 msgid "--*** Tags out of Date ***"
 msgstr ""
 
-#: info/window.c:1175
+#: info/window.c:1149
 msgid "-----Info: (), lines ----, "
 msgstr "-----Info: (), ¦æ¼Æ  ----, "
 
-#: info/window.c:1182
+#: info/window.c:1156
 #, c-format
 msgid "-%s---Info: %s, %d lines --%s--"
 msgstr "-%s---Info: %s, ¦@ %d ¦æ --%s--"
 
-#: info/window.c:1186
+#: info/window.c:1160
 #, c-format
 msgid "-%s%s-Info: (%s)%s, %d lines --%s--"
 msgstr "-%s%s-Info: (%s)%s, ¦@ %d ¦æ --%s--"
 
-#: info/window.c:1193
+#: info/window.c:1167
 #, c-format
 msgid " Subfile: %s"
 msgstr " ¤lÀÉ®×: %s"
 
-#: lib/getopt.c:675
+#: lib/getopt.c:551 lib/getopt.c:570
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: ¿ï¶µ `%s' ¤£©ú\n"
 
-#: lib/getopt.c:700
+#: lib/getopt.c:603 lib/getopt.c:607
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
 msgstr "%s: ¿ï¶µ `--%s' ¤£¥i§t¦³¤Þ¼Æ\n"
 
-#: lib/getopt.c:705
+#: lib/getopt.c:616 lib/getopt.c:621
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
 msgstr "%s: ¿ï¶µ `%c%s' ¤£¥i§t¦³¤Þ¼Æ\n"
 
-#: lib/getopt.c:723 lib/getopt.c:896
+#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: ¿ï¶µ `%s' ¥²¶·§t¦³¤Þ¼Æ\n"
 
-#: lib/getopt.c:752
+#: lib/getopt.c:727 lib/getopt.c:730
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: ¥¼ª¾ªº¿ï¶µ `--%s'\n"
 
-#: lib/getopt.c:756
+#: lib/getopt.c:738 lib/getopt.c:741
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: ¥¼ª¾ªº¿ï¶µ `%c%s'\n"
 
-#: lib/getopt.c:782
+#: lib/getopt.c:796 lib/getopt.c:799
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: ¤£¦Xªkªº¿ï¶µ -- %c\n"
 
-#: lib/getopt.c:785
+#: lib/getopt.c:805 lib/getopt.c:808
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: µL®Äªº¿ï¶µ -- %c\n"
 
-#: lib/getopt.c:815 lib/getopt.c:945
+#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: ¿ï¶µ¥²¶·§t¦³¤Þ¼Æ -- %c\n"
 
-#: lib/getopt.c:862
+#: lib/getopt.c:935 lib/getopt.c:954
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: ¿ï¶µ `-W %s' ¤£©ú½T\n"
 
-#: lib/getopt.c:880
+#: lib/getopt.c:978 lib/getopt.c:999
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: ¿ï¶µ `-W %s' ¤£¥i§t¦³¤Þ¼Æ\n"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#, fuzzy, c-format
+msgid "arguments to @%s ignored"
+msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
+
+#: makeinfo/cmds.c:585
 msgid "January"
 msgstr "¤@¤ë"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "February"
 msgstr "¤G¤ë"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "March"
 msgstr "¤T¤ë"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "April"
 msgstr "¥|¤ë"
 
-#: makeinfo/cmds.c:515
+#: makeinfo/cmds.c:585
 msgid "May"
 msgstr "¤­¤ë"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "June"
 msgstr "¤»¤ë"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "July"
 msgstr "¤C¤ë"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "August"
 msgstr "¤K¤ë"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "September"
 msgstr "¤E¤ë"
 
-#: makeinfo/cmds.c:516
+#: makeinfo/cmds.c:586
 msgid "October"
 msgstr "¤Q¤ë"
 
-#: makeinfo/cmds.c:517
+#: makeinfo/cmds.c:587
 msgid "November"
 msgstr "¤Q¤@¤ë"
 
-#: makeinfo/cmds.c:517
+#: makeinfo/cmds.c:587
 msgid "December"
 msgstr "¤Q¤G¤ë"
 
-#: makeinfo/cmds.c:658
+#: makeinfo/cmds.c:936
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr ""
 
-#: makeinfo/cmds.c:701
+#: makeinfo/cmds.c:979
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "@sc ªº¤Þ¼Æ¥þ¬O¤j¼g, ©Ò¥H¨S¦³§@¥Î"
 
-#: makeinfo/cmds.c:759
+#: makeinfo/cmds.c:1034
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr ""
 
-#: makeinfo/cmds.c:789
+#: makeinfo/cmds.c:1074
 msgid "end of file inside verb block"
 msgstr ""
 
-#: makeinfo/cmds.c:797
+#: makeinfo/cmds.c:1082
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr ""
 
-#: makeinfo/cmds.c:942
+#: makeinfo/cmds.c:1112
+msgid ""
+"@strong{Note...} produces a spurious cross-reference in Info; reword to "
+"avoid that"
+msgstr ""
+
+#: makeinfo/cmds.c:1305
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s ¤w¼o¤î¤£¥Î"
 
-#: makeinfo/cmds.c:1014
+#: makeinfo/cmds.c:1414
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "@sp ¥²¶·¦³¤@­Ó¥¿¾ã¼Æªº¤Þ¼Æ, ¦Ó¤£¬O `%s'"
 
-#: makeinfo/cmds.c:1348 makeinfo/cmds.c:1374 makeinfo/footnote.c:81
+#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
 
-#: makeinfo/cmds.c:1358 makeinfo/makeinfo.c:4140
+#: makeinfo/cmds.c:1773 makeinfo/makeinfo.c:4142
 msgid "asis"
 msgstr ""
 
-#: makeinfo/cmds.c:1360 makeinfo/makeinfo.c:4142
+#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
 msgid "none"
 msgstr ""
 
-#: makeinfo/defun.c:85
+#: makeinfo/cmds.c:1789
+#, fuzzy, c-format
+msgid "Bad argument to @%s"
+msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
+
+#: makeinfo/cmds.c:1803
+msgid "insert"
+msgstr ""
+
+#: makeinfo/defun.c:84
 msgid "Missing `}' in @def arg"
 msgstr "@def °Ñ¼Æ¤¤¿òº| `}'"
 
-#: makeinfo/defun.c:363
+#: makeinfo/defun.c:403
 msgid "Function"
 msgstr ""
 
-#: makeinfo/defun.c:366
+#: makeinfo/defun.c:406
 msgid "Macro"
 msgstr ""
 
-#: makeinfo/defun.c:369
+#: makeinfo/defun.c:409
 msgid "Special Form"
 msgstr ""
 
-#: makeinfo/defun.c:373
+#: makeinfo/defun.c:413
 msgid "Variable"
 msgstr ""
 
-#: makeinfo/defun.c:376
+#: makeinfo/defun.c:416
 msgid "User Option"
 msgstr ""
 
-#: makeinfo/defun.c:380
+#: makeinfo/defun.c:420
 msgid "Instance Variable"
 msgstr ""
 
-#: makeinfo/defun.c:384
+#: makeinfo/defun.c:424
 msgid "Method"
 msgstr ""
 
-#: makeinfo/defun.c:466 makeinfo/defun.c:470 makeinfo/defun.c:615
-#: makeinfo/defun.c:631 makeinfo/defun.c:671
+#: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
+#: makeinfo/defun.c:644 makeinfo/xml.c:2229
 msgid "of"
 msgstr ""
 
-#: makeinfo/defun.c:474 makeinfo/defun.c:478 makeinfo/defun.c:482
-#: makeinfo/defun.c:624 makeinfo/defun.c:676
+#: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
 msgid "on"
 msgstr ""
 
-#: makeinfo/defun.c:717
+#: makeinfo/defun.c:711
 #, c-format
-msgid "Must be in `%s' insertion to use `%sx'"
+msgid "Must be in `@%s' environment to use `@%s'"
 msgstr ""
 
-#: makeinfo/files.c:448
+#: makeinfo/files.c:435
 #, c-format
 msgid "%s: getwd: %s, %s\n"
 msgstr "%s: getwd: %s, %s\n"
 
+#: makeinfo/files.c:638
+#, c-format
+msgid "`%s' omitted before output filename"
+msgstr ""
+
+#: makeinfo/files.c:646
+#, c-format
+msgid "`%s' omitted since writing to stdout"
+msgstr ""
+
+#: makeinfo/files.c:694
+msgid "Output buffer not empty."
+msgstr ""
+
 #: makeinfo/footnote.c:150
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
@@ -1863,233 +1921,280 @@ msgstr "©w¸qµù¸}, ¦ý¬O¨S¦³¤÷¸`ÂI"
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "©w¸qµù¸}, ¦ý¬O¨S¦³¤÷¸`ÂI"
 
-#: makeinfo/footnote.c:298
+#: makeinfo/footnote.c:302 makeinfo/index.c:189
 msgid "Footnotes"
 msgstr "µù¸}"
 
-#: makeinfo/html.c:42
-msgid "Untitled"
+#: makeinfo/html.c:87
+#, c-format
+msgid "%s: could not open --css-file: %s"
 msgstr ""
 
-#: makeinfo/html.c:298
+#: makeinfo/html.c:172
 #, c-format
-msgid "Invalid node name: `%s'"
+msgid "%s:%d: --css-file ended in comment"
 msgstr ""
 
-#: makeinfo/index.c:213
+#: makeinfo/html.c:207
+msgid "Untitled"
+msgstr ""
+
+#: makeinfo/html.c:422
+msgid "[unexpected] no html tag to pop"
+msgstr ""
+
+#: makeinfo/html.c:752
+#, fuzzy, c-format
+msgid "[unexpected] invalid node name: `%s'"
+msgstr "%s: ¥¼ª¾ªº¿ï¶µ `%c%s'\n"
+
+#: makeinfo/index.c:169
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "¥¼ª¾ªº¯Á¤Þ `%s'"
 
-#: makeinfo/index.c:238
+#: makeinfo/index.c:234
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr ""
 
-#: makeinfo/index.c:396
+#: makeinfo/index.c:412
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "¯Á¤Þ `%s' ¤w¦s¦b"
 
-#: makeinfo/index.c:439
+#: makeinfo/index.c:455
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "@synindex ¤¤¦³¥¼ª¾ªº¯Á¤Þ `%s' »P/©Î `%s'"
 
-#: makeinfo/index.c:666
+#: makeinfo/index.c:661
+msgid "(line )"
+msgstr ""
+
+#: makeinfo/index.c:669
+#, c-format
+msgid "(line %*d)"
+msgstr ""
+
+#: makeinfo/index.c:750
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "@printindex ¤¤¦³¥¼ª¾ªº¯Á¤Þ `%s'"
 
-#: makeinfo/index.c:709
+#: makeinfo/index.c:819
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "¯Á¤Þ `%s' ªº¶µ¥Ø¤£¦b¥ô¦óªº¸`ÂI¤º"
 
-#: makeinfo/index.c:712 makeinfo/index.c:751
+#: makeinfo/index.c:822 makeinfo/index.c:858
 msgid "(outside of any node)"
 msgstr "(¤£¦b¥ô¦óªº¸`ÂI¤º)"
 
-#: makeinfo/insertion.c:198
+#: makeinfo/index.c:919 makeinfo/index.c:925
+msgid "See "
+msgstr ""
+
+#: makeinfo/insertion.c:160
+msgid "@item not allowed in argument to @itemize"
+msgstr ""
+
+#: makeinfo/insertion.c:238
 msgid "Broken-Type in insertion_type_pname"
 msgstr ""
 
-#: makeinfo/insertion.c:271
+#: makeinfo/insertion.c:334
 msgid "Enumeration stack overflow"
 msgstr ""
 
-#: makeinfo/insertion.c:303
+#: makeinfo/insertion.c:366
 #, c-format
 msgid "lettering overflow, restarting at %c"
 msgstr ""
 
-#: makeinfo/insertion.c:538
+#: makeinfo/insertion.c:631
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
 msgstr ""
 
-#: makeinfo/insertion.c:693
+#: makeinfo/insertion.c:719
+#, c-format
+msgid "%cfloat environments cannot be nested"
+msgstr ""
+
+#: makeinfo/insertion.c:973
 #, c-format
 msgid "`@end' expected `%s', but saw `%s'"
 msgstr ""
 
-#: makeinfo/insertion.c:931
+#: makeinfo/insertion.c:1337
 #, c-format
 msgid "No matching `%cend %s'"
 msgstr "No matching `%cend %s'"
 
-#: makeinfo/insertion.c:1084
+#: makeinfo/insertion.c:1592
 #, c-format
 msgid "%s requires letter or digit"
 msgstr "%s ¥²¶·­n¦³¦r¤¸©Î¬O¼Æ¦r"
 
-#: makeinfo/insertion.c:1158
+#: makeinfo/insertion.c:1687
 msgid "end of file inside verbatim block"
 msgstr ""
 
-#: makeinfo/insertion.c:1318
+#: makeinfo/insertion.c:1913
+#, fuzzy, c-format
+msgid "@%s not meaningful outside `@float' environment"
+msgstr "@%s ¦b `@%s' °Ï¶ô¤§¤º, ¨Ã¤£¨ã¦³·N¸q"
+
+#: makeinfo/insertion.c:1949
 msgid "@menu seen before first @node, creating `Top' node"
 msgstr "@menu ¦b²Ä¤@­Ó @node ¤§«e¥X²{, ±N«Ø¥ß `Top' ¸`ÂI"
 
-#: makeinfo/insertion.c:1319
+#: makeinfo/insertion.c:1950
 msgid ""
 "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr "¤]³\±zÀ³¸Ó§â @top ¸`ÂI¥]§t¦b @ifnottex, ¦Ó¤£¬O @ifinfo?"
 
-#: makeinfo/insertion.c:1331
+#: makeinfo/insertion.c:1962
 msgid "@detailmenu seen before first node, creating `Top' node"
 msgstr "¦b²Ä¤@­Ó¸`ÂI¤§«e¥X²{ @detailmenu, ±N«Ø¥ß `Top' ¸`ÂI"
 
-#: makeinfo/insertion.c:1346
+#: makeinfo/insertion.c:2018
+#, c-format
+msgid "@%s not meaningful outside `@titlepage' and `@quotation' environments"
+msgstr ""
+
+#: makeinfo/insertion.c:2032
+#, fuzzy, c-format
+msgid "@%s not meaningful outside `@titlepage' environment"
+msgstr "@%s ¦b `@%s' °Ï¶ô¤§¤º, ¨Ã¤£¨ã¦³·N¸q"
+
+#: makeinfo/insertion.c:2063
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr "¥¼°t¹ïªº `%c%s'"
 
-#: makeinfo/insertion.c:1353
+#: makeinfo/insertion.c:2068
 #, c-format
 msgid "`%c%s' needs something after it"
 msgstr "¦b `%c%s' ¤§«á¥²¶·­n¦³ªF¦è"
 
-#: makeinfo/insertion.c:1359
-#, c-format
-msgid "Bad argument to `%s', `%s', using `%s'"
-msgstr ""
+#: makeinfo/insertion.c:2074
+#, fuzzy, c-format
+msgid "Bad argument `%s' to `@%s', using `%s'"
+msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
 
-#: makeinfo/insertion.c:1453
+#: makeinfo/insertion.c:2171
 #, c-format
 msgid "@%s not meaningful inside `@%s' block"
 msgstr "@%s ¦b `@%s' °Ï¶ô¤§¤º, ¨Ã¤£¨ã¦³·N¸q"
 
-#: makeinfo/insertion.c:1462
+#: makeinfo/insertion.c:2180
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "`%s' °Ï¶ô¤§¤º, @itemx ¨ÃµL·N¸q"
 
-#: makeinfo/insertion.c:1646
+#: makeinfo/insertion.c:2356
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr ""
 
-#: makeinfo/lang.c:331
+#: makeinfo/lang.c:580
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "%s ¤£¬O¤@­Ó¦Xªkªº ISO 639 »y¨¥½X"
 
-#: makeinfo/lang.c:384
+#: makeinfo/lang.c:655
 #, fuzzy, c-format
-msgid "unrecogized encoding name `%s'"
+msgid "unrecognized encoding name `%s'"
 msgstr "%s: ¥¼ª¾ªº¿ï¶µ `%c%s'\n"
 
-#: makeinfo/lang.c:387
+#: makeinfo/lang.c:663
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr ""
 
-#: makeinfo/lang.c:414
+#: makeinfo/lang.c:715
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr ""
 
-#: makeinfo/lang.c:502
-#, fuzzy, c-format
-msgid "%s is an invalid ISO code, using %c"
-msgstr "%s ¤£¬O¤@­Ó¦Xªkªº ISO 639 »y¨¥½X"
-
-#: makeinfo/lang.c:687
+#: makeinfo/lang.c:1009
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "%c%s ´Á±æ¨Ï¥Î `i' ©Î `j' §@¬°¤Þ¼Æ, ¦Ó¤£¬O `%c'"
 
-#: makeinfo/lang.c:691
+#: makeinfo/lang.c:1013
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr "%c%s ´Á±æ¨Ï¥Î¤@­Ó¦r¥À `i' ©Î `j' §@¬°¤Þ¼Æ"
 
-#: makeinfo/macro.c:134
+#: makeinfo/macro.c:128
 #, c-format
 msgid "macro `%s' previously defined"
 msgstr "¥¨¶° `%s' ¤w©w¸q¹L"
 
-#: makeinfo/macro.c:138
+#: makeinfo/macro.c:132
 #, c-format
 msgid "here is the previous definition of `%s'"
 msgstr "³o¸Ì¬O `%s' ¤§«eªº©w¸q"
 
 #: makeinfo/macro.c:355
 #, c-format
-msgid "\\ in macro expansion followed by `%s' instead of \\ or parameter name"
+msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr ""
 
-#: makeinfo/macro.c:403
+#: makeinfo/macro.c:401
 #, c-format
 msgid "Macro `%s' called on line %d with too many args"
 msgstr "¥¨¶° `%s' ¦b²Ä %d ¦æ³Q©I¥s, ¦ý¬O¤Þ¼Æ¹L¦h"
 
-#: makeinfo/macro.c:594
+#: makeinfo/macro.c:586
 #, c-format
 msgid "%cend macro not found"
 msgstr ""
 
-#: makeinfo/macro.c:632
+#: makeinfo/macro.c:624
 msgid "@quote-arg only useful for single-argument macros"
 msgstr "@quote-arg ¥u¦b³æ¤@¤Þ¼Æªº¥¨¶°¦³¥Î"
 
-#: makeinfo/macro.c:668
+#: makeinfo/macro.c:660
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "@end %s »P @%s ¤£²Å¦X"
 
-#: makeinfo/makeinfo.c:316
+#: makeinfo/makeinfo.c:184
 #, c-format
-msgid "%s:%d: warning: "
-msgstr "%s:%d: ĵ§i: "
-
-#: makeinfo/makeinfo.c:339
 msgid "Too many errors!  Gave up.\n"
 msgstr "¿ù»~¹L¦h! ©ñ±ó.\n"
 
-#: makeinfo/makeinfo.c:350 makeinfo/makeinfo.c:2026
+#: makeinfo/makeinfo.c:302
+#, c-format
+msgid "%s:%d: warning: "
+msgstr "%s:%d: ĵ§i: "
+
+#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
 #, c-format
 msgid "Misplaced %c"
 msgstr "»~¸mªº %c"
 
-#: makeinfo/makeinfo.c:370
+#: makeinfo/makeinfo.c:340
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "¸Õ¸Õ `%s --help' ¥H¨ú±o§ó¦hªº¸ê°T.\n"
 
-#: makeinfo/makeinfo.c:373
+#: makeinfo/makeinfo.c:343
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "¥Îªk: %s [OPTION]... FILE...\n"
 
-#: makeinfo/makeinfo.c:376
+#: makeinfo/makeinfo.c:346
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
 "Info files suitable for reading online with Emacs or standalone GNU Info.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:380
+#: makeinfo/makeinfo.c:350
 #, c-format
 msgid ""
 "General options:\n"
@@ -2104,16 +2209,17 @@ msgid ""
 "      --version               display version information and exit.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:394
+#: makeinfo/makeinfo.c:364
 #, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
-"      --docbook             output DocBook rather than Info.\n"
+"      --docbook             output Docbook XML rather than Info.\n"
 "      --html                output HTML rather than Info.\n"
-"      --xml                 output XML (TexinfoML) rather than Info.\n"
+"      --xml                 output Texinfo XML rather than Info.\n"
+"      --plaintext           output plain text rather than Info.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:401
+#: makeinfo/makeinfo.c:372
 msgid ""
 "General output options:\n"
 "  -E, --macro-expand FILE   output macro-expanded source to FILE.\n"
@@ -2129,7 +2235,7 @@ msgid ""
 "  -o, --output=FILE         output to FILE (directory if split HTML),\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:386
 #, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2148,44 +2254,69 @@ msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d).\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:433
+#: makeinfo/makeinfo.c:403
+msgid ""
+"Options for HTML:\n"
+"      --css-include=FILE        include FILE in HTML <style> output;\n"
+"                                  read stdin if FILE is -.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:409
+#, c-format
+msgid ""
+"Options for XML and Docbook:\n"
+"      --output-indent=VAL       indent XML elements by VAL spaces (default %"
+"d).\n"
+"                                  If VAL is 0, ignorable whitespace is "
+"dropped.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:416
 msgid ""
 "Input file options:\n"
-"      --commands-in-node-names   allow @ commands in node names.\n"
-"  -D VAR                         define the variable VAR, as with @set.\n"
-"  -I DIR                         append DIR to the @include search path.\n"
-"  -P DIR                         prepend DIR to the @include search path.\n"
-"  -U VAR                         undefine the variable VAR, as with @clear.\n"
+"      --commands-in-node-names  allow @ commands in node names.\n"
+"  -D VAR                        define the variable VAR, as with @set.\n"
+"  -I DIR                        append DIR to the @include search path.\n"
+"  -P DIR                        prepend DIR to the @include search path.\n"
+"  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:442
+#: makeinfo/makeinfo.c:425
 msgid ""
 "Conditional processing in input:\n"
+"  --ifdocbook       process @ifdocbook and @docbook even if\n"
+"                      not generating Docbook.\n"
 "  --ifhtml          process @ifhtml and @html even if not generating HTML.\n"
 "  --ifinfo          process @ifinfo even if not generating Info.\n"
 "  --ifplaintext     process @ifplaintext even if not generating plain text.\n"
 "  --iftex           process @iftex and @tex; implies --no-split.\n"
+"  --ifxml           process @ifxml and @xml.\n"
+"  --no-ifdocbook    do not process @ifdocbook and @docbook text.\n"
 "  --no-ifhtml       do not process @ifhtml and @html text.\n"
 "  --no-ifinfo       do not process @ifinfo text.\n"
 "  --no-ifplaintext  do not process @ifplaintext text.\n"
 "  --no-iftex        do not process @iftex and @tex text.\n"
+"  --no-ifxml        do not process @ifxml and @xml text.\n"
+"\n"
+"  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:454
+#: makeinfo/makeinfo.c:444
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating HTML, --ifhtml is on and the others are off;\n"
 "  if generating Info, --ifinfo is on and the others are off;\n"
 "  if generating plain text, --ifplaintext is on and the others are off;\n"
+"  if generating XML, --ifxml is on and the others are off.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:461
+#: makeinfo/makeinfo.c:452
 #, fuzzy
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                     write Info to foo's @setfilename\n"
 "  makeinfo --html foo.texi              write HTML to @setfilename\n"
-"  makeinfo --xml foo.texi               write XML to @setfilename\n"
+"  makeinfo --xml foo.texi               write Texinfo XML to @setfilename\n"
 "  makeinfo --docbook foo.texi           write DocBook XML to @setfilename\n"
 "  makeinfo --no-headers foo.texi        write plain text to standard output\n"
 "\n"
@@ -2209,393 +2340,392 @@ msgstr ""
 "µ{¦¡¯äÂÎ, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ¦^³ø¦Ü bug-texinfo@gnu.org,\n"
 "¤@¯ë°ÝÃD»P°Q½×, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ±H¨ì help-texinfo@gnu.org."
 
-#: makeinfo/makeinfo.c:570 makeinfo/makeinfo.c:593 makeinfo/makeinfo.c:655
-#: makeinfo/makeinfo.c:676
+#: makeinfo/makeinfo.c:603
+#, c-format
+msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:647 makeinfo/makeinfo.c:673 makeinfo/makeinfo.c:692
+#: makeinfo/makeinfo.c:722 makeinfo/makeinfo.c:743
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr "%s: %s ¤Þ¼Æ¥²¶·¬°¼Æ­È, ¦Ó¤£¬O `%s'.\n"
 
-#: makeinfo/makeinfo.c:583
-#, c-format
-msgid "Couldn't open macro expansion output `%s'"
-msgstr ""
+#: makeinfo/makeinfo.c:660
+#, fuzzy, c-format
+msgid "%s: could not open macro expansion output `%s'"
+msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
 
-#: makeinfo/makeinfo.c:586
-msgid "Cannot specify more than one macro expansion output"
+#: makeinfo/makeinfo.c:665
+#, c-format
+msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:624
+#: makeinfo/makeinfo.c:707
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr "%s: --paragraph-indent ªº¤Þ¼Æ¥²¶·¬° ¼Æ­È/`none'/`asis', ¦Ó¤£¬O `%s'.\n"
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr "%s: --footnote-style ªº¤Þ¼Æ¥²¶·¬° `separate' ©Î `end', ¦Ó¤£¬O `%s'.\n"
 
-#: makeinfo/makeinfo.c:723
+#: makeinfo/makeinfo.c:806
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: ¿òº|Àɮפ޼Æ.\n"
 
-#: makeinfo/makeinfo.c:898
+#: makeinfo/makeinfo.c:997 makeinfo/makeinfo.c:3991
+#, c-format
+msgid "Multiline command %c%s used improperly"
+msgstr ""
+
+#: makeinfo/makeinfo.c:1000
 #, c-format
 msgid "Expected `%s'"
 msgstr "Expected `%s'"
 
-#: makeinfo/makeinfo.c:1365
-msgid "File exists, but is not a directory"
-msgstr ""
-
-#: makeinfo/makeinfo.c:1366
+#: makeinfo/makeinfo.c:1479
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1414
+#: makeinfo/makeinfo.c:1525
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "`%s' ¥¼¥X²{¦b `%s' ¤º"
 
-#: makeinfo/makeinfo.c:1496
+#: makeinfo/makeinfo.c:1605
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1526
+#: makeinfo/makeinfo.c:1638
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1561
+#: makeinfo/makeinfo.c:1673
 #, c-format
 msgid "This is %s, produced by makeinfo version %s from %s.\n"
 msgstr "³o¬O %s, ¥Ñ makeinfo ª©¥» %s ¦Û %s ²£¥Íªº.\n"
 
-#: makeinfo/makeinfo.c:1583
+#: makeinfo/makeinfo.c:1709
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
 msgstr "%s: ¦]¬°¿ù»~, ²¾°£¥¨¶°¿é¥XÀÉ `%s'; ­Y­n«O¦s¥¦, ½Ð¨Ï¥Î --force ¿ï¶µ.\n"
 
-#: makeinfo/makeinfo.c:1627
+#: makeinfo/makeinfo.c:1773
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr "%s: ¦]¬°¿ù»~, ²¾°£¿é¥XÀÉ `%s'; ­Y­n«O¦s¥¦, ½Ð¨Ï¥Î --force ¿ï¶µ.\n"
 
-#: makeinfo/makeinfo.c:1853
+#: makeinfo/makeinfo.c:2034
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "¥¼ª¾ªº©R¥O `%s'"
 
-#: makeinfo/makeinfo.c:1875
+#: makeinfo/makeinfo.c:2056
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr "¨Ï¥Î¤j¬A¸¹±N©R¥O¥]°_¨Ó, ¥H§@¬° @%s ªº¤Þ¼Æ"
 
-#: makeinfo/makeinfo.c:2068
-#, c-format
-msgid "%c%s expected `{...}'"
+#: makeinfo/makeinfo.c:2314
+#, fuzzy, c-format
+msgid "%c%s expected braces"
 msgstr "%c%s ¹w­p­n¦³ `{...}'"
 
-#: makeinfo/makeinfo.c:2098
+#: makeinfo/makeinfo.c:2327
 msgid "Unmatched }"
 msgstr "¥¼°t¹ïªº }"
 
-#: makeinfo/makeinfo.c:2148
+#: makeinfo/makeinfo.c:2375
 msgid "NO_NAME!"
 msgstr "NO_NAME!"
 
-#: makeinfo/makeinfo.c:2169
+#: makeinfo/makeinfo.c:2396
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s ¿òº|¥k¤j¬A¸¹"
 
-#: makeinfo/makeinfo.c:2958
-msgid "First argument to cross-reference may not be empty"
-msgstr ""
-
-#: makeinfo/makeinfo.c:3018 makeinfo/makeinfo.c:3236 makeinfo/xml.c:1340
-msgid "see "
-msgstr ""
-
-#: makeinfo/makeinfo.c:3018
-msgid "See "
-msgstr ""
-
-#: makeinfo/makeinfo.c:3164
-#, c-format
-msgid "`.' or `,' must follow cross reference, not %c"
-msgstr "`.' ©Î `,' ¥²¶·¸òµÛ¥æ¤¬°Ñ·Ó, ¦Ó¤£¬O %c"
-
-#: makeinfo/makeinfo.c:3212
-msgid "First argument to @inforef may not be empty"
-msgstr ""
-
-#: makeinfo/makeinfo.c:3427
+#: makeinfo/makeinfo.c:3309
 #, fuzzy, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "@image ÀÉ®× `%s' µLªkŪ¨ú: %s"
 
-#: makeinfo/makeinfo.c:3440
-#, c-format
-msgid "No `%s.png' or `.jpg', and no extension supplied"
-msgstr ""
+#: makeinfo/makeinfo.c:3315
+#, fuzzy, c-format
+msgid "No such file `%s'"
+msgstr "`%s' ¥¼¥X²{¦b `%s' ¤º"
 
-#: makeinfo/makeinfo.c:3490
+#: makeinfo/makeinfo.c:3447
 #, fuzzy, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "@image ÀÉ®× `%s' µLªkŪ¨ú: %s"
 
-#: makeinfo/makeinfo.c:3497
+#: makeinfo/makeinfo.c:3456
 msgid "@image missing filename argument"
 msgstr "@image ¨S¦³ÀɦW¤Þ¼Æ"
 
-#: makeinfo/makeinfo.c:3690
+#: makeinfo/makeinfo.c:3675
+#, c-format
+msgid "undefined flag: %s"
+msgstr ""
+
+#: makeinfo/makeinfo.c:3676
 #, c-format
 msgid "{No value for `%s'}"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3744
+#: makeinfo/makeinfo.c:3728
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s ¥²¶·­n¦³¦WºÙ"
 
-#: makeinfo/makeinfo.c:3850
+#: makeinfo/makeinfo.c:3834
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "¦b°t¹ïªº @end %s ¤§«e, ¥ý¨ì¹FÀÉ®×µ²§À"
 
-#: makeinfo/makeinfo.c:4081
+#: makeinfo/makeinfo.c:4082
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr ""
 
-#: makeinfo/multi.c:226
+#: makeinfo/multi.c:116
 msgid "Missing } in @multitable template"
 msgstr "¦b @multitable ¼Ëª©¤¤, ¨S¦³ }"
 
-#: makeinfo/multi.c:302
+#: makeinfo/multi.c:254
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr ""
 
-#: makeinfo/multi.c:375
+#: makeinfo/multi.c:393
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "multitable ¶µ¥Ø¤¤¦³¤Ó¦hªºÄæ¦ì (³Ì¤j­È¬° %d)"
 
-#: makeinfo/multi.c:426
-#, c-format
-msgid "Cannot select column #%d in multitable"
+#: makeinfo/multi.c:555
+#, fuzzy, c-format
+msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "µLªk¿ï¨ú multitable ¤¤ªºÄæ¦ì #%d"
 
-#: makeinfo/multi.c:529
+#: makeinfo/multi.c:584
 msgid "ignoring @tab outside of multitable"
 msgstr "©¿²¤ multitable ¥~ªº @tab"
 
-#: makeinfo/multi.c:565
+#: makeinfo/multi.c:632
+#, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr ""
 
-#: makeinfo/multi.c:568
+#: makeinfo/multi.c:635
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* Äæ¦ì #%d: ¿é¥X = %s\n"
 
-#: makeinfo/node.c:276
+#: makeinfo/node.c:280
 #, c-format
 msgid "Node `%s' previously defined at line %d"
 msgstr "¸`ÂI `%s' ¤w¦b²Ä %d ¦æ©w¸q¹L¤F"
 
-#: makeinfo/node.c:594
+#: makeinfo/node.c:648
 #, c-format
 msgid "Formatting node %s...\n"
 msgstr "½s±Æ¸`ÂI %s ªº®æ¦¡¤¤...\n"
 
-#: makeinfo/node.c:655
-#, c-format
-msgid "Node `%s' requires a sectioning command (e.g. %c%s)"
+#: makeinfo/node.c:716
+#, fuzzy, c-format
+msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
 msgstr "¸`ÂI `%s' ¥²¶·¨Ï¥Î¤À¬q©R¥O (sectioning command) (¨Ò¦p: %c%s)"
 
-#: makeinfo/node.c:815
+#: makeinfo/node.c:879
 #, c-format
 msgid "No node name specified for `%c%s' command"
 msgstr "`%c%s' ©R¥O¤¤¥¼«ü©w¸`ÂI¦WºÙ"
 
-#: makeinfo/node.c:856 makeinfo/node.c:1075
+#: makeinfo/node.c:920 makeinfo/node.c:1151
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr ""
 
-#: makeinfo/node.c:859
+#: makeinfo/node.c:923
 msgid "This @anchor command ignored; references to it will not work"
 msgstr ""
 
-#: makeinfo/node.c:861 makeinfo/node.c:1078
+#: makeinfo/node.c:925 makeinfo/node.c:1154
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr ""
 
-#: makeinfo/node.c:891
+#: makeinfo/node.c:955
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
 msgstr ""
 
-#: makeinfo/node.c:920
-msgid "Node:"
-msgstr "¸`ÂI:"
-
-#: makeinfo/node.c:930
+#: makeinfo/node.c:991
 msgid "Next:"
 msgstr "¤U¤@­Ó:"
 
-#: makeinfo/node.c:940
+#: makeinfo/node.c:1007
 msgid "Previous:"
 msgstr "¤W¤@­Ó:"
 
-#: makeinfo/node.c:950
+#: makeinfo/node.c:1021
 msgid "Up:"
 msgstr "¤W¤@¼h:"
 
-#: makeinfo/node.c:1072
+#: makeinfo/node.c:1148
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr ""
 
-#: makeinfo/node.c:1077
+#: makeinfo/node.c:1153
 msgid "@anchor command ignored; references to it will not work"
 msgstr ""
 
-#: makeinfo/node.c:1277
-#, c-format
-msgid "%s reference to nonexistent node `%s'"
+#: makeinfo/node.c:1347
+#, fuzzy, c-format
+msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr "%s °Ñ·Ó¨ì¤£¦s¦bªº¸`ÂI: `%s'"
 
-#: makeinfo/node.c:1294
+#: makeinfo/node.c:1363
 msgid "Menu"
 msgstr "¥Ø¿ý"
 
-#: makeinfo/node.c:1296
+#: makeinfo/node.c:1365
 msgid "Cross"
 msgstr ""
 
-#: makeinfo/node.c:1380
+#: makeinfo/node.c:1447
 #, c-format
-msgid "Next field of node `%s' not pointed to"
+msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1383
+#: makeinfo/node.c:1450
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "¥»¸`ÂI (%s) ªº «e¤@­Ó (Prev) ¸`ÂI¦³°ÝÃD"
 
-#: makeinfo/node.c:1395
+#: makeinfo/node.c:1462
 msgid "Prev"
 msgstr "«e¤@­Ó"
 
-#: makeinfo/node.c:1438
+#: makeinfo/node.c:1505
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr ""
 
-#: makeinfo/node.c:1442
+#: makeinfo/node.c:1509
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "¥»¸`ÂI (%s) ªº ¤U¤@­Ó (Next) ¸`ÂI¦³°ÝÃD"
 
-#: makeinfo/node.c:1454
+#: makeinfo/node.c:1521
 #, c-format
-msgid "`%s' has no Up field"
-msgstr "`%s' ¨S¦³ ¤W¤@¼h (Up) Äæ¦ì"
+msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
+msgstr ""
 
-#: makeinfo/node.c:1457
+#: makeinfo/node.c:1524
 msgid "Up"
 msgstr "¤W¤@¼h"
 
-#: makeinfo/node.c:1523
+#: makeinfo/node.c:1590
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr ""
 
-#: makeinfo/node.c:1552
+#: makeinfo/node.c:1619
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr "¸`ÂI `%s' ¤w³Q°Ñ·Ó %d ¦¸"
 
-#: makeinfo/node.c:1566
+#: makeinfo/node.c:1633
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "¥¼³Q°Ñ·Óªº¸`ÂI `%s'"
 
-#: makeinfo/sectioning.c:117
+#: makeinfo/node.c:1723
 #, c-format
-msgid "Appendix %c "
+msgid "Removing %s\n"
+msgstr ""
+
+#: makeinfo/node.c:1727
+#, fuzzy, c-format
+msgid "Can't remove file `%s': %s"
+msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
+
+#: makeinfo/sectioning.c:122
+#, fuzzy, c-format
+msgid "Appendix %c"
 msgstr "ªþ¿ý %c"
 
-#: makeinfo/sectioning.c:356 makeinfo/sectioning.c:444
+#: makeinfo/sectioning.c:467
+#, fuzzy, c-format
+msgid "Internal error (search_sectioning) `%s'!"
+msgstr "¤º³¡¿ù»~ (search_sectioning) \"%s\"!"
+
+#: makeinfo/sectioning.c:562
 #, c-format
 msgid "Internal error (search_sectioning) \"%s\"!"
 msgstr "¤º³¡¿ù»~ (search_sectioning) \"%s\"!"
 
-#: makeinfo/sectioning.c:502
+#: makeinfo/sectioning.c:623
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 msgstr "%c%s ¤w¼o±ó¤£¥Î; ½Ð§ï¥Î %c%s"
 
-#: makeinfo/sectioning.c:518
+#: makeinfo/sectioning.c:639
 #, c-format
 msgid "Node with %ctop as a section already exists"
 msgstr ""
 
-#: makeinfo/sectioning.c:526
+#: makeinfo/sectioning.c:647
 #, c-format
 msgid "Here is the %ctop node"
 msgstr ""
 
-#: makeinfo/sectioning.c:543
+#: makeinfo/sectioning.c:663
 #, c-format
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr ""
 
-#: makeinfo/toc.c:221 makeinfo/toc.c:298 makeinfo/toc.c:299
+#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
 msgid "Table of Contents"
 msgstr ""
 
-#: makeinfo/toc.c:330 makeinfo/toc.c:366 makeinfo/toc.c:367
+#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
 msgid "Short Contents"
 msgstr ""
 
-#: makeinfo/toc.c:406
-#, c-format
-msgid "%s: TOC should be here, but it was not found"
-msgstr ""
-
-#: makeinfo/xml.c:1108
+#: makeinfo/xml.c:1605
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image ÀÉ®× `%s' µLªkŪ¨ú: %s"
 
-#: util/install-info.c:151
+#: makeinfo/xml.c:2097
+msgid ""
+"@headitem as the last item of @multitable produces invalid Docbook documents"
+msgstr ""
+
+#: util/install-info.c:154
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: ĵ§i: "
 
-#: util/install-info.c:176 util/install-info.c:189
-msgid "virtual memory exhausted"
-msgstr "µêÀÀ°O¾ÐÅé¯ÓºÉ"
-
-#: util/install-info.c:232
+#: util/install-info.c:203
 #, c-format
 msgid " for %s"
 msgstr ""
 
-#: util/install-info.c:381
+#: util/install-info.c:426
 #, c-format
 msgid "\tTry `%s --help' for a complete list of options.\n"
 msgstr "\t¸Õ¸Õ Try `%s --help' ¥H¨ú±o§¹¾ãªº°Ñ¼Æ¦Cªí.\n"
 
-#: util/install-info.c:389
+#: util/install-info.c:434
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
@@ -2664,8 +2794,8 @@ msgstr ""
 "µ{¦¡¯äÂÎ, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ¦^³ø¦Ü bug-texinfo@gnu.org,\n"
 "¤@¯ë°ÝÃD»P°Q½×, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ±H¨ì help-texinfo@gnu.org.\n"
 
-#: util/install-info.c:444
-#, c-format
+#: util/install-info.c:488
+#, fuzzy, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
 "topmost node of the Info hierarchy, called (dir)Top.\n"
@@ -2681,7 +2811,7 @@ msgid ""
 "  In Emacs, you can click mouse button 2 on a menu item or cross reference\n"
 "  to select it.\n"
 "\n"
-"* Menu:\n"
+"%s\n"
 msgstr ""
 "³o¬OÀÉ®× .../info/dir, ¸Ì­±¥]§t¦³ Info ¿ï³æ¬[ºc¤¤³Ì¤W¼hªº¸`ÂI,\n"
 "ºÙ¬° (dir) TOP.\n"
@@ -2699,97 +2829,99 @@ msgstr ""
 "\n"
 "* Menu:\n"
 
-#: util/install-info.c:467
+#: util/install-info.c:513
 #, c-format
 msgid "%s: could not read (%s) and could not create (%s)\n"
 msgstr "%s: µLªkŪ¨ú (%s), ¦Ó¥BµLªk«Ø¥ß (%s)\n"
 
-#: util/install-info.c:551
+#: util/install-info.c:600
 #, c-format
 msgid "%s: empty file"
 msgstr "%s: ªÅÀÉ®×"
 
-#: util/install-info.c:866 util/install-info.c:906
+#: util/install-info.c:913 util/install-info.c:953
 msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
 msgstr "¦³ START-INFO-DIR-ENTRY, ¦ý¬O¨S¦³¬Û¹ïÀ³ªº END-INFO-DIR-ENTRY"
 
-#: util/install-info.c:901
+#: util/install-info.c:948
 msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
 msgstr "¦³ END-INFO-DIR-ENTRY, ¦ý¬O¨S¦³¬Û¹ïÀ³ªº START-INFO-DIR-ENTRY"
 
-#: util/install-info.c:1150 util/install-info.c:1160
+#: util/install-info.c:1191 util/install-info.c:1201
 #, c-format
-msgid "%s: Specify the Info directory only once.\n"
-msgstr "%s: ¥u¦³«ü©w Info ¥Ø¿ý¤@¦¸.\n"
+msgid "%s: already have dir file: %s\n"
+msgstr ""
 
-#: util/install-info.c:1195
+#: util/install-info.c:1236
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr "%s: ¥u¦³«ü©w Info Àɮפ@¦¸.\n"
 
-#: util/install-info.c:1244
+#: util/install-info.c:1284
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr "¦h¾lªº©R¥O¦C¤Þ¼Æ `%s'"
 
-#: util/install-info.c:1248
+#: util/install-info.c:1288
 msgid "No input file specified; try --help for more information."
 msgstr "¥¼«ü©w¿é¤JÀÉ®×; ¸Õ¸Õ --help ¥H¨ú±o§ó¦hªº¸ê°T."
 
-#: util/install-info.c:1251
+#: util/install-info.c:1291
 msgid "No dir file specified; try --help for more information."
 msgstr "¥¼«ü©w dir ÀÉ®×; ¸Õ¸Õ --help ¥H¨ú±o¨ú¦hªº¸ê°T."
 
-#: util/install-info.c:1273
+#: util/install-info.c:1313
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr "`%s' ¤º¨S¦³ info dir ¶µ¥Ø"
 
-#: util/install-info.c:1388
+#: util/install-info.c:1426
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr "¥Ø¿ý¶µ¥Ø `%s' ¤w¦s¦b, ¬Oµ¹ÀÉ®× `%s' ªº"
 
-#: util/install-info.c:1411
+#: util/install-info.c:1449
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr "§ä¤£¨ì `%s' ªº¶µ¥Ø; ¥¼§R°£¥ô¦ó¶µ¥Ø"
 
-#: util/texindex.c:245
+#: util/texindex.c:252
 msgid "display this help and exit"
 msgstr "Åã¥Ü¨D§U¸ê°T, µM«áÂ÷¶}"
 
-#: util/texindex.c:247
+#: util/texindex.c:254
 msgid "keep temporary files around after processing"
 msgstr "³B²z§¹²¦«á, ¤£²¾°£¼È¦sÀÉ"
 
-#: util/texindex.c:249
+#: util/texindex.c:256
 msgid "do not keep temporary files around after processing (default)"
 msgstr "³B²z§¹²¦«á, ²¾°£¼È¦sÀÉ (¹w³]­È)"
 
-#: util/texindex.c:251
+#: util/texindex.c:258
 msgid "send output to FILE"
 msgstr "±N¿é¥X°e¦Ü FILE"
 
-#: util/texindex.c:253
+#: util/texindex.c:260
 msgid "display version information and exit"
 msgstr "Åã¥Üª©¥»¸ê°T, µM«áÂ÷¶}"
 
-#: util/texindex.c:264
+#: util/texindex.c:270
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "¥Îªk: %s [OPTION]... FILE...\n"
 
-#: util/texindex.c:265
+#: util/texindex.c:271
+#, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr "¬°¨C­Ó TeX ¿é¥X FILE ²£¥Í¤@­Ó±Æ§Çªº¯Á¤Þ.\n"
 
-#: util/texindex.c:268
+#: util/texindex.c:274
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr "³q±`¤å¥ó `foo.texi' ªº FILE... ¤Þ¼Æ·|«ü©w¬° `foo.%c%c'.\n"
 
-#: util/texindex.c:270
+#: util/texindex.c:276
+#, c-format
 msgid ""
 "\n"
 "Options:\n"
@@ -2797,31 +2929,56 @@ msgstr ""
 "\n"
 "¿ï¶µ:\n"
 
-#: util/texindex.c:887 util/texindex.c:921 util/texindex.c:997
-#: util/texindex.c:1025
+#: util/texindex.c:876 util/texindex.c:910 util/texindex.c:983
+#: util/texindex.c:1011
 #, c-format
 msgid "%s: not a texinfo index file"
 msgstr "%s: ¤£¬O¤@­Ó texinfo ¯Á¤ÞÀÉ"
 
-#: util/texindex.c:982
+#: util/texindex.c:968
 #, c-format
 msgid "failure reopening %s"
 msgstr "­«·s¶}±Ò %s ®Éµo¥Í¿ù»~"
 
-#: util/texindex.c:1224
+#: util/texindex.c:1218
 #, c-format
 msgid "No page number in %s"
 msgstr "¦b %s ¤¤¨S¦³­¶½X"
 
-#: util/texindex.c:1295
+#: util/texindex.c:1291
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr ""
 
-#: util/texindex.c:1633
-#, c-format
-msgid "%s; for file `%s'.\n"
-msgstr ""
+#~ msgid "%s: Specify the Info directory only once.\n"
+#~ msgstr "%s: ¥u¦³«ü©w Info ¥Ø¿ý¤@¦¸.\n"
+
+#~ msgid "\"\" is invalid"
+#~ msgstr "\"\" ¤£¦Xªk"
+
+#, fuzzy
+#~ msgid "%s is an invalid ISO code, using %c"
+#~ msgstr "%s ¤£¬O¤@­Ó¦Xªkªº ISO 639 »y¨¥½X"
+
+#~ msgid "`.' or `,' must follow cross reference, not %c"
+#~ msgstr "`.' ©Î `,' ¥²¶·¸òµÛ¥æ¤¬°Ñ·Ó, ¦Ó¤£¬O %c"
+
+#~ msgid "Node:"
+#~ msgstr "¸`ÂI:"
+
+#~ msgid "virtual memory exhausted"
+#~ msgstr "µêÀÀ°O¾ÐÅé¯ÓºÉ"
+
+#~ msgid "`%s' has no Up field"
+#~ msgstr "`%s' ¨S¦³ ¤W¤@¼h (Up) Äæ¦ì"
+
+#, fuzzy
+#~ msgid "\\%-10[scroll-forward]  Scroll forward 1 line.\n"
+#~ msgstr "  %-10s  ©¹«e±²°Ê¤@¦æ.\n"
+
+#, fuzzy
+#~ msgid "\\%-10[scroll-backward]  Scroll backward 1 line.\n"
+#~ msgstr "  %-10s  ©¹«á±²°Ê¤@¦æ.\n"
 
 #, fuzzy
 #~ msgid ""
diff --git a/gnu/usr.bin/texinfo/util/README b/gnu/usr.bin/texinfo/util/README
index 20d7bdafd86..cbb4858871d 100644
--- a/gnu/usr.bin/texinfo/util/README
+++ b/gnu/usr.bin/texinfo/util/README
@@ -1,10 +1,14 @@
+$Id: README,v 1.1.1.4 2006/07/17 16:03:49 espie Exp $
+texinfo/util/README
+
+  Copyright (C) 2002 Free Software Foundation, Inc.
+
+  Copying and distribution of this file, with or without modification,
+  are permitted in any medium without royalty provided the copyright
+  notice and this notice are preserved.
+
 Assorted Texinfo-related programs and scripts.
 
 texindex, texi2dvi, and install-info get installed.
 The other items here are for your amusement and/or hacking pleasure.
 
-You may also be interested in a2ps, an ASCII->PostScript program which
-has a Texinfo style option.  Available from
-http://www.inf.enst.fr/~demaille/a2ps/ and
-ftp://ftp.enst.fr/pub/unix/a2ps/.
-
diff --git a/gnu/usr.bin/texinfo/util/dir-example b/gnu/usr.bin/texinfo/util/dir-example
new file mode 100644
index 00000000000..b0977415fff
--- /dev/null
+++ b/gnu/usr.bin/texinfo/util/dir-example
@@ -0,0 +1,482 @@
+This is the directory file `dir' a.k.a. `DIR', which contains the
+  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.
+rms suggested that we follow the categories of the Free Software
+  Directory (http://www.gnu.org/directory/) where possible.  Since
+  capitalization in the directory is random, I've chosen to use
+  `minimum' capitals, just the first word and proper nouns.
+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.1.1.1 2006/07/17 16:03:50 espie Exp $
+
+File: dir,	Node: Top,	This is the top of the INFO tree.
+
+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:
+
+Basics
+* Bash: (bash).                 The GNU Bourne-Again SHell.
+* BC: (bc).                     Arbitrary precision calculator language.
+* Common options: (coreutils)Common options.      Common options.
+* Coreutils: (coreutils).       Core GNU (file, text, shell) utilities.
+* DC: (dc).                     Postfix desk calculator.
+* Date input formats: (coreutils)Date input formats.
+* File permissions: (coreutils)File permissions.  Access modes.
+* Finding files: (find).        Operating on files matching certain criteria.
+* Gcal: (gcal).                 GNU calendar program.
+* Time: (time).                 Measuring program resource usage.
+
+Text creation and manipulation
+* Diffutils: (diff).            Comparing and merging files.
+* Ed: (ed).                     Line editor.
+* Gawk: (gawk).                 A text scanning and processing language.
+* grep: (grep).                 Print lines matching a pattern.
+* m4: (m4).			General-purpose text macro processor.
+* sed: (sed).                   Stream EDitor.
+* Wdiff: (wdiff).               Word difference finder and related tools.
+
+Texinfo documentation system
+* Info: (info).                 Documentation browsing system.
+* Texi2HTML: (texi2html).  Texinfo to HTML Converter.
+* Texinfo: (texinfo).           The GNU documentation format.
+* info standalone: (info-stnd).                 Standalone Info reader.
+* infokey: (info-stnd)Invoking infokey.         Compile Info customizations.
+* install-info: (texinfo)Invoking install-info. Updating info/dir entries.
+* makeinfo: (texinfo)Creating an Info File.     Translate Texinfo source.
+* texi2dvi: (texinfo)Format with texi2dvi.      Printing Texinfo documentation.
+* texindex: (texinfo)Format with tex/texindex.  Sorting Texinfo index files.
+
+Archiving
+* Cpio: (cpio).                 Copy-in-copy-out archiver to tape or disk.
+* Shar utilities: (sharutils).  Shell archiver, uuencode/uudecode.
+* Tar: (tar).                   Making tape (or disk) archives.
+
+Compression
+* bzip2: (bzip2).               General (de)compression of files (blocksort).
+* Gzip: (gzip).                 General (de)compression of files (lzw).
+
+Email
+* Anubis: (anubis).             The GNU outgoing mail processor.
+* Mailutils: (mailutils).       Utilities & library for mailboxes, protocols.
+
+Network applications
+* Gawkinet: (gawkinet).         TCP/IP Internetworking With `gawk'.
+* Wget: (wget).                 Non-interactive network downloader.
+
+Printing Tools
+* a2ps: (a2ps).                    PostScript Generating Utility
+* PreScript: (a2ps) PreScript.     Input language for a2ps
+* card: (a2ps) card.               Print Reference Cards
+* fixps: (a2ps) fixps.             Fixing Some Ill Designed PostScript Files
+* fixnt: (a2ps) fixnt.             Fixing Microsoft NT PostScript Files
+* pdiff: (a2ps) pdiff.             Produce Pretty Comparison of Files
+* psmandup: (a2ps) psmandup.       Printing Duplex on Simplex Printers
+* psset: (a2ps) psset.             Inserting calls to setpagedevice
+
+Software development
+* As: (as).                     Assembler.
+* Autoconf: (autoconf).         Create source code configuration scripts.
+* Binutils: (binutils).         ar/copy/objdump/nm/size/strip/ranlib.
+* automake: (automake).         Making Makefile.in's.
+* bison: (bison).               GNU parser generator (Yacc replacement).
+* Cpp: (cpp).		        The GNU C preprocessor.
+* Cpplib: (cppinternals).       Cpplib internals.
+* CVS: (cvs).                   Concurrent versions system for source control.
+* DejaGnu: (dejagnu).           Testing framework.
+* Gdb: (gdb).                   The GNU debugger.
+* egcs: (egcs).                 Experimental GNU C compiler.
+* Flex: (flex).                 A fast scanner generator.
+* g77: (g77).                   GNU Fortran 77 compiler.
+* Gasp: (gasp).                 GNU Assembler preprocessor.
+* gcc: (gcc).                   The GNU Compiler Collection.
+* gccinstall: (gccinstall).     Installing the GNU Compiler Collection.
+* gccint: (gccint).             Internals of the GNU Compiler Collection.
+* Gnats: (gnats).               Cygnus bug tracking system.
+* Gnulib: (gnulib).             Source files to share among distributions.
+* Gperf: (gperf).               Perfect hash function generator.
+* Gprof: (gprof).               Profiler.
+* Guile Reference: (guile).     The Guile reference manual.
+* Guile Tutorial: (guile-tut).	The Guile Tutorial.
+* Identifier DB: (id-utils).    Identifier database utilities.
+* Indent: (indent).             Prettyprinter for programs.
+* Ld: (ld).                     Linker.
+* Libtool: (libtool).           Generic library support script.
+* Make: (make).                 Remake files automatically.
+* Remsync: (remsync).           Remote synchronization of directory trees.
+* Send PR: (send-pr).           Cygnus bug reporting for Gnats.
+* Source config: (cfg-paper).   Some theory on configuring source packages.
+* help2man: (help2man).         Automatic manual page generation from -help.
+
+Emacs
+* Ada mode: (ada-mode). The GNU Emacs mode for editing Ada.
+* Autotype: (autotype). Convenient features for text that you enter frequently
+                          in Emacs.
+* CC Mode: (ccmode).   Emacs mode for editing C, C++, Objective-C,
+                          Java, Pike, and IDL code.
+* CL: (cl).		Partial Common Lisp support for Emacs Lisp.
+* Dired-X: (dired-x).   Dired Extra Features.
+* EUDC: (eudc).   A client for directory servers (LDAP, PH)
+* Ebrowse: (ebrowse).   A C++ class browser for Emacs.
+* Ediff: (ediff).       A visual interface for comparing and merging programs.
+* Emacs: (emacs).	The extensible self-documenting text editor.
+* Elisp: (elisp).               GNU Emacs Lisp reference manual.
+* Emacs FAQ: (efaq).	Frequently Asked Questions about Emacs.
+* Emacs MIME: (emacs-mime).   The MIME de/composition library.
+* Eshell: (eshell).     A command shell implemented in Emacs Lisp.
+* Forms: (forms).	Emacs package for editing data bases
+			  by filling in forms.
+* Gnus: (gnus).         The newsreader Gnus.
+* IDLWAVE: (idlwave).	Major mode and shell for IDL and WAVE/CL files.
+* Intro Elisp: (emacs-lisp-intro). Introduction to Elisp programming.
+
+* AUC TeX: (auctex).            Editing (La)TeX files.
+* MH-E: (mh-e).		Emacs interface to the MH mail system.
+* Message: (message).   Mail and news composition mode that goes with Gnus.
+* PCL-CVS: (pcl-cvs).	Emacs front-end to CVS.
+* RefTeX: (reftex).	Emacs support for LaTeX cross-references and citations.
+* SC: (sc).		Supercite lets you cite parts of messages you're
+			  replying to, in flexible ways.
+* Speedbar: (speedbar).        File/Tag summarizing utility.
+* TRAMP: (tramp).       Transparent Remote Access, Multiple Protocol
+                          Emacs remote file access via rsh and rcp.
+* VIP: (vip).		An older VI-emulation for Emacs.
+* VIPER: (viper).       The newest Emacs VI-emulation mode.
+                          (also, A VI Plan for Emacs Rescue or the VI PERil.)
+* VM: (vm).             View Mail for Emacs.
+* Widget: (widget).     Documenting the "widget" package used by the
+                           Emacs Custom facility.
+* WoMan: (woman).       Browse UN*X Manual Pages `Wo (without) Man'.
+
+Typesetting
+* Font utilities: (fontu).      Programs for font manipulation.
+* Groff: (groff).               The GNU troff document formatting system.
+* GV: (gv).                     The GNU PostScript and PDF viewer.
+
+GNU Gettext Utilities
+* ISO3166: (gettext)Country Codes.             ISO 3166 country codes.
+* ISO639: (gettext)Language Codes.             ISO 639 language codes.
+* xgettext: (gettext)xgettext Invocation.      Extract strings into a PO file.
+* autopoint: (gettext)autopoint Invocation.    Copy gettext infrastructure.
+* envsubst: (gettext)envsubst Invocation.      Expand environment variables.
+* gettext: (gettext).                          GNU gettext utilities.
+* gettextize: (gettext)gettextize Invocation.  Prepare a package for gettext.
+* msgattrib: (gettext)msgattrib Invocation.    Select part of a PO file.
+* msgcat: (gettext)msgcat Invocation.          Combine several PO files.
+* msgcmp: (gettext)msgcmp Invocation.          Compare a PO file and template.
+* msgcomm: (gettext)msgcomm Invocation.        Match two PO files.
+* msgconv: (gettext)msgconv Invocation.        Convert PO file to encoding.
+* msgen: (gettext)msgen Invocation.            Create an English PO file.
+* msgexec: (gettext)msgexec Invocation.        Process a PO file.
+* msgfilter: (gettext)msgfilter Invocation.    Pipe a PO file through a filter.
+* msgfmt: (gettext)msgfmt Invocation.          Make MO files out of PO files.
+* msggrep: (gettext)msggrep Invocation.        Select part of a PO file.
+* msginit: (gettext)msginit Invocation.        Create a fresh PO file.
+* msgmerge: (gettext)msgmerge Invocation.      Update a PO file from template.
+* msgunfmt: (gettext)msgunfmt Invocation.      Uncompile MO file into PO file.
+* msguniq: (gettext)msguniq Invocation.        Unify duplicates for PO file.
+* ngettext: (gettext)ngettext Invocation.      Translate a message with plural.
+
+Software libraries
+* Annotate: (annotate).         High-level GDB to GUI's.
+* Bfd: (bfd).                   The Binary File Descriptor library.
+* CVS protocol: (cvsclient).    CVS client/server protocol specification.
+* Gdb-Internals: (gdbint).      The GNU debugger's internals.
+* GDB library: (libgdb).        Application programming interface to GDB.
+* GDBM: (gdbm).                 Hashed databases.
+* GDK: (gdk).                   General drawing kit.
+* GTK: (gtk).                   GIMP toolkit.
+* History: (history).           Recall previous lines of input.
+* Ld internals: (ldint).        GNU linker internals.
+* Libc: (libc).                 C library.
+* Mmalloc: (mmalloc).           The GNU mapped-malloc package.
+* Stabs: (stabs).               The "stabs" debugging information format.
+* Readline: (readline).         General command-line interface.
+* Regex: (regex).               Regular expressions.
+* Termcap: (termcap).           All about /etc/termcap.
+
+C++ libraries
+* Iostream: (iostream).         C++ input/output.
+* Libg++: (libg++).             C++ classes.
+* autosprintf: (autosprintf).   Support for printf format strings in C++.
+
+GNU organization
+* Maintain: (maintain).         GNU maintainer guidelines.
+* Standards: (standards).       GNU coding standards.
+* Tasks: (tasks).               GNU task list.
+
+GNU music project
+* LilyPond: (lilypond).                        The GNU music typesetter.
+* LilyPond internals: (lilypond-internals).    LilyPond internals.
+* ly2dvi: (lilypond)Invoking ly2dvi::          Titling LilyPond scores.
+* convert-ly: (lilypond)Invoking convert-ly::  Older LilyPond versions.
+* midi2ly: (lilypond)Invoking midi2ly::        Importing MIDI.
+* etf2ly: (lilypond)Invoking etf2ly::          Importing Finale.
+* abc2ly: (lilypond)Invoking abc2ly::          Importing ABC.
+* pmx2ly: (lilypond)Invoking pmx2ly::          Importing PMX.
+* musedata2ly: (lilypond)Invoking musedata2ly::Importing Musedata.
+* mup2ly: (lilypond)Invoking mup2ly::          Importing MUP.
+
+TeX
+* Afm2tfm: (dvips)Invoking afm2tfm.  Making Type 1 fonts available to TeX.
+* Dvips: (dvips).               DVI-to-PostScript translator.
+* DVI-to-PNG: (dvipng).         DVI to Portable Network Graphics (PNG).
+* Eplain: (eplain).             Expanding on plain TeX.
+* Kpathsearch: (kpathsea).      File lookup along search paths.
+* LaTeX: (latex).               LaTeX.
+* MakeIndex: (makeindex).       Index creation for TeX.
+* Naming TeX fonts: (fontname). Filenames for TeX fonts.
+* TDS: (tds).                   Standard TeX directory structure.
+* TeXDraw: (texdraw).           Drawing PostScript diagrams within TeX.
+* Web2c: (web2c).               TeX, Metafont, and their companion programs.
+
+DOS
+* GNUish: (gnuish).             GNU utilities for DOS.
+* Mtools: (mtools).             Access DOS disks from Unix.
+
+Science
+* R FAQ: (R-FAQ).               The R statistical language FAQ.
+
+Other things
+* Amd: (am-utils).              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.
+* Netpbm: (netpbm).             Images/graphics manipulation programs.
+* 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).             Terminal multiplexer.
+
+Individual utilities
+* 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.
+* autoconf: (autoconf)autoconf Invocation.
+                                How to create configuration scripts
+* autoheader: (autoconf)autoheader Invocation.
+                                How to create configuration templates
+* autom4te: (autoconf)autom4te Invocation.
+                                The Autoconf executables backbone
+* autoreconf: (autoconf)autoreconf Invocation.
+                                Remaking multiple `configure' scripts
+* autoscan: (autoconf)autoscan Invocation.
+                                Semi-automatic `configure.ac' writing
+* autoupdate: (autoconf)autoupdate Invocation.
+                                Automatic update of `configure.ac'
+* awk: (gawk)Invoking gawk.                     Text scanning and processing.
+* basename: (coreutils)basename invocation.     Strip directory and suffix.
+* bibtex: (web2c)BibTeX invocation.             Maintaining bibliographies.
+* c++filt: (binutils)c++filt.                   Demangle C++ symbols.
+* cat: (coreutils)cat invocation.               Concatenate and write files.
+* chgrp: (coreutils)chgrp invocation.           Change file groups.
+* chmod: (coreutils)chmod invocation.           Change file permissions.
+* chown: (coreutils)chown invocation.           Change file owners/groups.
+* chroot: (coreutils)chroot invocation.         Specify the root directory.
+* cksum: (coreutils)cksum invocation.           Print POSIX CRC checksum.
+* cmp: (diff)Invoking cmp.                      Compare 2 files byte by byte.
+* comm: (coreutils)comm invocation.             Compare sorted files by line.
+* comsatd: (mailutils)comsatd.                  Comsat daemon.
+* config.status: (autoconf)config.status Invocation. Recreating configurations.
+* configure: (autoconf)configure Invocation.    Configuring a package.
+* cp: (coreutils)cp invocation.                 Copy files.
+* csplit: (coreutils)csplit invocation.         Split by context.
+* cut: (coreutils)cut invocation.               Print selected parts of lines.
+* date: (coreutils)date invocation.             Print/set system date and time.
+* dd: (coreutils)dd invocation.                 Copy and convert a file.
+* df: (coreutils)df invocation.                 Report filesystem disk usage.
+* diff: (diff)Invoking diff.                    Compare 2 files line by line.
+* diff3: (diff)Invoking diff3.                  Compare 3 files line by line.
+* dir: (coreutils)dir invocation.               List directories briefly.
+* dircolors: (coreutils)dircolors invocation.   Color setup for ls.
+* dirname: (coreutils)dirname invocation.       Strip non-directory suffix.
+* dmp: (web2c)Dmp invocation.                   Troff->MPX (MetaPost pictures).
+* du: (coreutils)du invocation.                 Report on disk usage.
+* dvicopy: (web2c)DVIcopy invocation.           Virtual font expansion
+* dvipng: (dvipng)Invoking dvipng.              A DVI-to-PNG translator.
+* dvitomp: (web2c)DVItoMP invocation.           DVI to MPX (MetaPost pictures).
+* dvitype: (web2c)DVItype invocation.           DVI to human-readable text.
+* echo: (coreutils)echo invocation.             Print a line of text.
+* edit-pr: (gnats)Invoking edit-pr.             Changing bugs.
+* egrep: (grep)Invoking.                        grep -E.
+* eid: (id-utils)eid invocation.                Invoking an editor on matches.
+* env: (coreutils)env invocation.               Modify the environment.
+* expand: (coreutils)expand invocation.         Convert tabs to spaces.
+* expr: (coreutils)expr invocation.             Evaluate expressions.
+* factor: (coreutils)factor invocation.         Print prime factors
+* false: (coreutils)false invocation.           Do nothing, unsuccessfully.
+* fgrep: (fgrep)Invoking.                       grep -F.
+* 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: (coreutils)fmt invocation.               Reformat paragraph text.
+* fold: (coreutils)fold invocation.             Wrap long input lines.
+* frm: (mailutils)frm.                          List headers from a mailbox.
+* gcal2txt: (gcal)Invoking gcal2txt.            Calendar resource to text file.
+* 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.
+* git: (git).                                   GNU interactive tools.
+* groups: (coreutils)groups invocation.         Print group names a user is in.
+* guimb: (mailutils)guimb.                      Mailbox processing language.
+* gunzip: (gzip)Overview.                       Decompression.
+* gzexe: (gzip)Overview.			Compress executables.
+* head: (coreutils)head invocation.             Output the first part of files.
+* hostid: (coreutils)hostid invocation.         Print numeric host identifier.
+* hostname: (coreutils)hostname invocation.     Print or set system name.
+* id: (coreutils)id invocation.                 Print real/effective uid/gid.
+* idx: (id-utils)idx invocation.                Testing mkid scanners.
+* ifnames: (autoconf)ifnames Invocation.        Listing conditionals in source.
+* iid: (id-utils)iid invocation.                Interactive complex queries.
+* imap4d: (mailutils)imap4d.                    IMAP4 daemon.
+* inimf: (web2c)inimf invocation.               Initial Metafont.
+* inimp: (web2c)inimp invocation.               Initial MetaPost.
+* initex: (web2c)initex invocation.             Initial TeX.
+* install: (coreutils)install invocation.       Copy and change attributes.
+* join: (coreutils)join invocation.             Join lines on a common field.
+* kill: (coreutils)kill invocation.             Send a signal to processes.
+* kpsewhich: (kpathsea)Invoking kpsewhich.      TeX file searching.
+* libtoolize: (libtool)Invoking libtoolize.     Adding libtool support.
+* lid: (id-utils)lid invocation.                Matching identifier patterns.
+* link: (coreutils)link invocation.             Make hard links between files.
+* ln: (coreutils)ln invocation.                 Make links between files.
+* locate: (find)Invoking locate.                Finding files in a database.
+* logname: (coreutils)logname invocation.       Print current login name.
+* ls: (coreutils)ls invocation.                 List directory contents.
+* mail-files: (sharutils)mail-files invocation. Send files to remote site.
+* mail.local: (mailutils)mail.local.            Deliver mail to local mailbox.
+* mail: (mailutils)mail.                        Send and receive mail.
+* mailshar: (sharutils)mailshar invocation.     Make and send a shell archive.
+* 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: (coreutils)md5sum invocation.         Print or check message-digests.
+* mdiff: (wdiff)mdiff invocation.               Line cluster finder.
+* messages: (mailutils)messages.                Count messages in mailbox.
+* mf: (web2c)mf invocation.                     Creating typeface families.
+* mft: (web2c)MFT invocation.                   Prettyprinting Metafont source.
+* mgetty: (mgetty).                             Faxes, voicemail and more.
+* mkdir: (coreutils)mkdir invocation.           Create directories.
+* mkfifo: (coreutils)mkfifo invocation.         Create FIFOs (named pipes).
+* mkid: (id-utils)mkid invocation.              Creating an ID database.
+* mknod: (coreutils)mknod invocation.           Create special files.
+* mp: (web2c)mp invocation.                     Creating technical diagrams.
+* mpto: (web2c)MPto invocation.                 MetaPost label extraction.
+* mv: (coreutils)mv invocation.                 Rename files.
+* newer: (web2c)Newer invocation.               Compare modification times.
+* nice: (coreutils)nice invocation.             Modify scheduling priority.
+* nl: (coreutils)nl invocation.                 Number lines and write files.
+* nlmconv: (binutils)nlmconv.                   Convert object to NetWare LM.
+* nm: (binutils)nm.                             List symbols in object files.
+* nohup: (coreutils)nohup invocation.           Immunize to hangups.
+* objcopy: (binutils)objcopy.                   Copy/translate object files.
+* objdump: (binutils)objdump.                   Display info from object files.
+* od: (coreutils)od invocation.                 Dump files in octal, etc.
+* paste: (coreutils)paste invocation.           Merge lines of files.
+* patch: (diff)Invoking patch.                  Apply a patch to a file.
+* patgen: (web2c)Patgen invocation.             Creating hyphenation patterns.
+* pathchk: (coreutils)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.
+* pltotf: (web2c)PLtoTF invocation.             Property list to TFM.
+* pooltype: (web2c)Pooltype invocation.         Display WEB pool files.
+* pop3d: (mailutils)pop3d.                      POP3 daemon.
+* pr: (coreutils)pr invocation.                 Paginate or columnate files.
+* pr-addr: (gnats)pr-addr.                      Bug report address retrieval.
+* pr-edit: (gnats)pr-edit.                      The edit-pr driver.
+* printenv: (coreutils)printenv invocation.     Print environment variables.
+* printf: (coreutils)printf invocation.         Format and print data.
+* protoize: (gcc)Running Protoize.		Add prototypes to sources.
+* ptx: (coreutils)ptx invocation.               Produce permuted indexes.
+* pwd: (coreutils)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.
+* readlink: (coreutils)readlink invocation.     Print referent of a symlink.
+* readmsg: (mailutils)readmsg.                  Extract messages from a folder.
+* rm: (coreutils)rm invocation.                 Remove files.
+* rmdir: (coreutils)rmdir invocation.           Remove empty directories.
+* sdiff: (diff)Invoking sdiff.                  Merge 2 files side-by-side.
+* send-pr: (gnats)Invoking send-pr.             Submitting bugs.
+* seq: (coreutils)seq invocation.               Print numeric sequences
+* shar: (sharutils)shar invocation.             Create shell archive.
+* shred: (coreutils)shred invocation.           Remove files more securely.
+* sieve: (mailutils)sieve.                      Mail filtering utility.
+* size: (binutils)size.                         List object file section sizes.
+* sleep: (coreutils)sleep invocation.           Delay for a specified time.
+* sort: (coreutils)sort invocation.             Sort text files.
+* split: (coreutils)split invocation.           Split into fixed-size pieces.
+* stat: (coreutils)stat invocation.             Report file(system) status.
+* strings: (binutils)strings.                   List printable strings.
+* strip: (binutils)strip.                       Discard symbols.
+* stty: (coreutils)stty invocation.             Print/change terminal settings.
+* su: (coreutils)su invocation.                 Modify user and group id.
+* sum: (coreutils)sum invocation.               Print traditional checksum.
+* sync: (coreutils)sync invocation.             Synchronize memory and disk.
+* tabs: (tput)Invoking tabs.                    Tab settings.
+* tac: (coreutils)tac invocation.               Reverse files.
+* tail: (coreutils)tail invocation.             Output the last part of files.
+* tangle: (web2c)Tangle invocation.             WEB to Pascal.
+* tar: (tar)tar invocation.                     Invoking GNU `tar'.
+* tcal: (gcal)Invoking tcal.                    Run Gcal with tomorrow's date.
+* tee: (coreutils)tee invocation.               Redirect to multiple files.
+* test: (coreutils)test invocation.             File/string tests.
+* testsuite: (autoconf)testsuite Invocation.    Running an Autotest test suite.
+* tex: (web2c)tex invocation.                   Typesetting.
+* tftopl: (web2c)TFtoPL invocation.             TFM -> property list.
+* touch: (coreutils)touch invocation.           Change file timestamps.
+* tput: (tput)Invoking tput.                    Termcap in shell scripts.
+* tr: (coreutils)tr invocation.                 Translate characters.
+* true: (coreutils)true invocation.             Do nothing, successfully.
+* tsort: (coreutils)tsort invocation.           Topological sort.
+* tty: (coreutils)tty invocation.               Print terminal name.
+* txt2gcal: (gcal)Invoking txt2gcal.            Calendar text to resource file.
+* umb-scheme: (umb-scheme).                     UMB Scheme Interpreter.
+* uname: (coreutils)uname invocation.           Print system information.
+* unexpand: (coreutils)unexpand invocation.     Convert spaces to tabs.
+* unify: (wdiff)unify invocation.               Diff format converter.
+* uniq: (coreutils)uniq invocation.             Uniquify files.
+* unlink: (coreutils)unlink invocation.         Removal via unlink(2).
+* unprotoize: (gcc)Running Protoize.		Remove prototypes from sources.
+* unshar: (sharutils)unshar invocation.         Extract from shell archive.
+* updatedb: (find)Invoking updatedb.            Building the locate database.
+* users: (coreutils)users invocation.           Print current user names.
+* vdir: (coreutils)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: (coreutils)wc invocation.                 Line, word, and byte counts.
+* weave: (web2c)Weave invocation.               WEB to TeX.
+* who: (coreutils)who invocation.               Print who is logged in.
+* whoami: (coreutils)whoami invocation.         Print effective user id.
+* xargs: (find)Invoking xargs.                  Operating on many files.
+* yes: (coreutils)yes invocation.               Print a string indefinitely.
+* zcat: (gzip)Overview.                         Decompression to stdout.
+* zdiff: (gzip)Overview.                        Compare compressed files.
+* zforce: (gzip)Overview.                       Force .gz extension on files.
+* zgrep: (gzip)Overview.                        Search compressed files.
+* zmore: (gzip)Overview.                        Decompression output by pages.
+* zsh: (zsh).                                   An enhanced Bourne shell.
diff --git a/gnu/usr.bin/texinfo/util/fix-info-dir b/gnu/usr.bin/texinfo/util/fix-info-dir
index bf0901caa30..b1144ed6a4e 100644
--- a/gnu/usr.bin/texinfo/util/fix-info-dir
+++ b/gnu/usr.bin/texinfo/util/fix-info-dir
@@ -1,7 +1,7 @@
 #!/bin/sh
 #fix-info-dir (GNU texinfo)
 VERSION=1.1
-#Copyright (C) 1998 Free Software Foundation, Inc.
+#Copyright (C) 1998, 2003 Free Software Foundation, Inc.
 #fix-info-dir comes with NO WARRANTY, to the extent permitted by law.
 #You may redistribute copies of fix-info-dir
 #under the terms of the GNU General Public License.
@@ -118,7 +118,7 @@ if test "$CREATE_NODE"; then
 		else
 			SKELETON="$ORIGINAL_DIR/$1"
 		fi
-		if test ! -r "$SKELETON" -a -f "$SKELETON"; then
+		if test ! -r "$SKELETON" && test -f "$SKELETON"; then
 			echo "$0:$LINENO: $SKELETON is not readable">&2
 			exit 2
 		fi
diff --git a/gnu/usr.bin/texinfo/util/gdoc b/gnu/usr.bin/texinfo/util/gdoc
new file mode 100644
index 00000000000..3c52fb04593
--- /dev/null
+++ b/gnu/usr.bin/texinfo/util/gdoc
@@ -0,0 +1,914 @@
+#!/usr/bin/perl
+
+## Copyright (c) 2002, 2003 Simon Josefsson                      ##
+##                    added -texinfo, -listfunc                  ##
+##                    man page revamp                            ##
+##                    various improvements                       ##
+## Copyright (c) 1998 Michael Zucchi, All Rights Reserved        ##
+##                    hacked to allow -tex option --nmav         ##
+##                                                               ##
+## This software falls under the GNU Public License. Please read ##
+##              the COPYING file for more information            ##
+
+#
+# This will read a 'c' file and scan for embedded comments in the
+# style of gnome comments (+minor extensions - see below).
+#
+# This program is modified by Nikos Mavroyanopoulos, for the gnutls
+# project.
+
+# Note: This only supports 'c'.
+
+# usage:
+# gdoc [ -docbook | -html | -text | -man | -tex | -texinfo | -listfunc ]
+#      [ -sourceversion verno ] [ -includefuncprefix ] [ -bugsto address ]
+#      [ -seeinfo infonode ] [ -copyright notice ] [ -verbatimcopying ]
+#      [ -function funcname [ -function funcname ...] ] c file(s)s > outputfil
+e
+#
+#  Set output format using one of -docbook, -html, -text, -man, -tex,
+#  -texinfo, or -listfunc.  Default is man.
+#
+#  -sourceversion
+#       Version number for source code, e.g. '1.0.4'.  Used in 'man' headers.
+#       Defaults to using current date.
+#
+#  -includefuncprefix
+#       For man pages, generate a #include <FILE.h> based on the function
+#       prefix.  For example, a function gss_init_sec_context will generate
+#       an include statement of #include <gss.h>.
+#
+#  -bugsto address
+#       For man pages, include a section about reporting bugs and mention
+#       the given e-mail address, e.g 'bug-libidn@gnu.org'.
+#
+#  -seeinfo infonode
+#       For man pages, include a section that point to an info manual
+#       for more information.
+#
+#  -copyright notice
+#       For man pages, include a copyright section with the given
+#       notice after a preamble.  Use, e.g., '2002, 2003 Simon Josefsson'.
+#
+#  -verbatimcopying
+#       For man pages, and when the -copyright parameter is used,
+#       add a licensing statement that say verbatim copying is permitted.
+#
+#  -function funcname
+#       If set, then only generate documentation for the given function(s).  A
+ll
+#       other functions are ignored.
+#
+#  c files - list of 'c' files to process
+#
+#  All output goes to stdout, with errors to stderr.
+
+#
+# format of comments.
+# In the following table, (...)? signifies optional structure.
+#                         (...)* signifies 0 or more structure elements
+# /**
+#  * function_name(:)? (- short description)?
+# (* @parameterx: (description of parameter x)?)*
+# (* a blank line)?
+#  * (Description:)? (Description of function)?
+#  * (Section header: (section description)? )*
+#  (*)?*/
+#
+# So .. the trivial example would be:
+#
+# /**
+#  * my_function
+#  **/
+#
+# If the Description: header tag is ommitted, then there must be a blank line
+# after the last parameter specification.
+# e.g.
+# /**
+#  * my_function - does my stuff
+#  * @my_arg: its mine damnit
+#  *
+#  * Does my stuff explained. 
+#  */
+#
+#  or, could also use:
+# /**
+#  * my_function - does my stuff
+#  * @my_arg: its mine damnit
+#  * Description: Does my stuff explained. 
+#  */
+# etc.
+#
+# All descriptions can be multiline, apart from the short function description
+.
+#
+# All descriptive text is further processed, scanning for the following specia
+l
+# patterns, which are highlighted appropriately.
+#
+# 'funcname()' - function
+# '$ENVVAR' - environmental variable
+# '&struct_name' - name of a structure
+# '@parameter' - name of a parameter
+# '%CONST' - name of a constant.
+
+#
+# Extensions for LaTeX:
+#
+# 1. the symbol '->' will be replaced with a rightarrow
+# 2. x^y with ${x}^{y}$.
+# 3. xxx\: with xxx:
+
+use POSIX qw(strftime);
+
+# match expressions used to find embedded type information
+$type_constant = "\\\%(\\w+)";
+$type_func = "(\\w+\\(\\))";
+$type_param = "\\\@(\\w+)";
+$type_struct = "\\\&(\\w+)";
+$type_env = "(\\\$\\w+)";
+
+
+# Output conversion substitutions.
+#  One for each output format
+
+# these work fairly well
+%highlights_html = ( $type_constant, "<i>\$1</i>",
+                     $type_func, "<b>\$1</b>",
+                     $type_struct, "<i>\$1</i>",
+                     $type_param, "<tt><b>\$1</b></tt>" );
+$blankline_html = "<p>";
+
+%highlights_texinfo = ( $type_constant, "\\\@var{\$1}",
+                        $type_func, "\\\@code{\$1}",
+                        $type_struct, "\\\@code{\$1}",
+                        $type_param, "\\\@code{\$1}" );
+$blankline_texinfo = "";
+
+%highlights_tex = ( $type_constant, "{\\\\it \$1}",
+                     $type_func, "{\\\\bf \$1}",
+                     $type_struct, "{\\\\it \$1}",
+                     $type_param, "{\\\\bf \$1}" );
+$blankline_tex = "\\\\";
+
+# sgml, docbook format
+%highlights_sgml = ( $type_constant, "<replaceable class=\"option\">\$1</repla
+ceable>",
+                     $type_func, "<function>\$1</function>",
+                     $type_struct, "<structname>\$1</structname>",
+                     $type_env, "<envar>\$1</envar>",
+                     $type_param, "<parameter>\$1</parameter>" );
+$blankline_sgml = "</para><para>\n";
+
+# these are pretty rough
+%highlights_man = ( $type_constant, "\\n.I \\\"\$1\\\"\\n",
+                    $type_func, "\\n.B \\\"\$1\\\"\\n",
+                    $type_struct, "\\n.I \\\"\$1\\\"\\n",
+                    $type_param."([\.\, ]*)\n?", "\\n.I \\\"\$1\$2\\\"\\n" );
+$blankline_man = "";
+
+# text-mode
+%highlights_text = ( $type_constant, "\$1",
+                     $type_func, "\$1",
+                     $type_struct, "\$1",
+                     $type_param, "\$1" );
+$blankline_text = "";
+
+
+sub usage {
+    print "Usage: $0 [ -v ] [ -docbook | -html | -text | -man | -tex | -texinf
+o  -listfunc ]\n";
+    print "         [ -sourceversion verno ] [ -includefuncprefix ]\n";
+    print "         [ -bugsto address ] [ -seeinfo infonode ] [ -copyright not
+ice]\n";
+    print "         [ -verbatimcopying ]\n";
+    print "         [ -function funcname [ -function funcname ...] ]\n";
+    print "         c source file(s) > outputfile\n";
+    exit 1;
+}
+
+# read arguments
+if ($#ARGV==-1) {
+    usage();
+}
+
+$verbose = 0;
+$output_mode = "man";
+%highlights = %highlights_man;
+$blankline = $blankline_man;
+$modulename = "API Documentation";
+$sourceversion = strftime "%Y-%m-%d", localtime;
+$function_only = 0;
+while ($ARGV[0] =~ m/^-(.*)/) {
+    $cmd = shift @ARGV;
+    if ($cmd eq "-html") {
+        $output_mode = "html";
+        %highlights = %highlights_html;
+        $blankline = $blankline_html;
+    } elsif ($cmd eq "-man") {
+        $output_mode = "man";
+        %highlights = %highlights_man;
+        $blankline = $blankline_man;
+    } elsif ($cmd eq "-tex") {
+        $output_mode = "tex";
+        %highlights = %highlights_tex;
+        $blankline = $blankline_tex;
+    } elsif ($cmd eq "-texinfo") {
+        $output_mode = "texinfo";
+        %highlights = %highlights_texinfo;
+        $blankline = $blankline_texinfo;
+    } elsif ($cmd eq "-text") {
+        $output_mode = "text";
+        %highlights = %highlights_text;
+        $blankline = $blankline_text;
+    } elsif ($cmd eq "-docbook") {
+        $output_mode = "sgml";
+        %highlights = %highlights_sgml;
+        $blankline = $blankline_sgml;
+    } elsif ($cmd eq "-listfunc") {
+        $output_mode = "listfunc";
+    } elsif ($cmd eq "-module") { # not needed for sgml, inherits from calling
+ document
+        $modulename = shift @ARGV;
+    } elsif ($cmd eq "-sourceversion") {
+        $sourceversion = shift @ARGV;
+    } elsif ($cmd eq "-includefuncprefix") {
+        $includefuncprefix = 1;
+    } elsif ($cmd eq "-bugsto") {
+        $bugsto = shift @ARGV;
+    } elsif ($cmd eq "-copyright") {
+        $copyright = shift @ARGV;
+    } elsif ($cmd eq "-verbatimcopying") {
+        $verbatimcopying = 1;
+    } elsif ($cmd eq "-seeinfo") {
+        $seeinfo = shift @ARGV;
+    } elsif ($cmd eq "-function") { # to only output specific functions
+        $function_only = 1;
+        $function = shift @ARGV;
+        $function_table{$function} = 1;
+    } elsif ($cmd eq "-v") {
+        $verbose = 1;
+    } elsif (($cmd eq "-h") || ($cmd eq "--help")) {
+        usage();
+    }
+}
+
+##
+# dumps section contents to arrays/hashes intended for that purpose.
+#
+sub dump_section {
+    my $name = shift @_;
+    my $contents = join "\n", @_;
+
+    if ($name =~ m/$type_constant/) {
+        $name = $1;
+#       print STDERR "constant section '$1' = '$contents'\n";
+        $constants{$name} = $contents;
+    } elsif ($name =~ m/$type_param/) {
+#       print STDERR "parameter def '$1' = '$contents'\n";
+        $name = $1;
+        $parameters{$name} = $contents;
+    } else {
+#       print STDERR "other section '$name' = '$contents'\n";
+        $sections{$name} = $contents;
+        push @sectionlist, $name;
+    }
+}
+
+##
+# output function
+#
+# parameters, a hash.
+#  function => "function name"
+#  parameterlist => @list of parameters
+#  parameters => %parameter descriptions
+#  sectionlist => @list of sections
+#  sections => %descriont descriptions
+#  
+
+sub repstr {
+    $pattern = shift;
+    $repl = shift;
+    $match1 = shift;
+    $match2 = shift;
+    $match3 = shift;
+    $match4 = shift;
+
+    $output = $repl;
+    $output =~ s,\$1,$match1,g;
+    $output =~ s,\$2,$match2,g;
+    $output =~ s,\$3,$match3,g;
+    $output =~ s,\$4,$match4,g;
+
+    eval "\$return = qq/$output/";
+
+#    print "pattern $pattern matched 1=$match1 2=$match2 3=$match3 4=$match4 r
+eplace $repl yielded $output interpolated $return\n";
+
+    $return;
+}
+
+sub output_highlight {
+    my $contents = join "\n", @_;
+    my $line;
+
+    foreach $pattern (keys %highlights) {
+#       print "scanning pattern $pattern ($highlights{$pattern})\n";
+        $contents =~ s:$pattern:repstr($pattern, $highlights{$pattern}, $1, $2
+, $3, $4):gse;
+    }
+    foreach $line (split "\n", $contents) {
+        if ($line eq ""){
+            print $lineprefix, $blankline;
+        } else {
+            print $lineprefix, $line;
+        }
+        print "\n";
+    }
+}
+
+sub just_highlight {
+    my $contents = join "\n", @_;
+    my $line;
+    my $ret = "";
+
+    foreach $pattern (keys %highlights) {
+#       print "scanning pattern $pattern ($highlights{$pattern})\n";
+        $contents =~ s:$pattern:repstr($pattern, $highlights{$pattern}, $1, $2
+, $3, $4):gse;
+    }
+    foreach $line (split "\n", $contents) {
+        if ($line eq ""){
+            $ret = $ret . $lineprefix . $blankline;
+        } else {
+            $ret = $ret . $lineprefix . $line;
+        }
+        $ret = $ret . "\n";
+    }
+
+    return $ret;
+}
+
+# output in texinfo
+sub output_texinfo {
+    my %args = %{$_[0]};
+    my ($parameter, $section);
+    my $count;
+
+    print "\@deftypefun {" . $args{'functiontype'} . "} ";
+    print "{".$args{'function'}."} ";
+    print "(";
+    $count = 0;
+    foreach $parameter (@{$args{'parameterlist'}}) {
+        print $args{'parametertypes'}{$parameter}." \@var{".$parameter."}";
+        if ($count != $#{$args{'parameterlist'}}) {
+            $count++;
+            print ", ";
+        }
+    }
+    print ")\n";
+    foreach $parameter (@{$args{'parameterlist'}}) {
+        if ($args{'parameters'}{$parameter}) {
+            print "\@var{".$parameter."}: ";
+            output_highlight($args{'parameters'}{$parameter});
+            print "\n";
+        }
+    }
+    foreach $section (@{$args{'sectionlist'}}) {
+        print "\n\@strong{$section:} " if $section ne $section_default;
+        $args{'sections'}{$section} =~ s:([{}]):\@\1:gs;
+        output_highlight($args{'sections'}{$section});
+    }
+    print "\@end deftypefun\n\n";
+}
+
+# output in html
+sub output_html {
+    my %args = %{$_[0]};
+    my ($parameter, $section);
+    my $count;
+    print "\n\n<a name=\"". $args{'function'} . "\">&nbsp</a><h2>Function</h2>
+\n";
+
+    print "<i>".$args{'functiontype'}."</i>\n";
+    print "<b>".$args{'function'}."</b>\n";
+    print "(";
+    $count = 0;
+    foreach $parameter (@{$args{'parameterlist'}}) {
+        print "<i>".$args{'parametertypes'}{$parameter}."</i> <b>".$parameter.
+"</b>\n";
+        if ($count != $#{$args{'parameterlist'}}) {
+            $count++;
+            print ", ";
+        }
+    }
+    print ")\n";
+
+    print "<h3>Arguments</h3>\n";
+    print "<dl>\n";
+    foreach $parameter (@{$args{'parameterlist'}}) {
+        print "<dt><i>".$args{'parametertypes'}{$parameter}."</i> <b>".$parame
+ter."</b>\n";
+        print "<dd>";
+        output_highlight($args{'parameters'}{$parameter});
+    }
+    print "</dl>\n";
+    foreach $section (@{$args{'sectionlist'}}) {
+        print "<h3>$section</h3>\n";
+        print "<ul>\n";
+        output_highlight($args{'sections'}{$section});
+        print "</ul>\n";
+    }
+    print "<hr>\n";
+}
+
+# output in tex
+sub output_tex {
+    my %args = %{$_[0]};
+    my ($parameter, $section);
+    my $count;
+    my $func = $args{'function'};
+    my $param;
+    my $param2;
+    my $sec;
+    my $check;
+    my $type;
+
+    $func =~ s/_/\\_/g;
+
+    print "\n\n\\subsection{". $func . "}\n\\label{" . $args{'function'} . "}\
+n";
+
+    $type = $args{'functiontype'};
+    $type =~ s/_/\\_/g;
+
+    print "{\\it ".$type."}\n";
+    print "{\\bf ".$func."}\n";
+    print "(";
+    $count = 0;
+    foreach $parameter (@{$args{'parameterlist'}}) {
+        $param = $args{'parametertypes'}{$parameter};
+        $param2 = $parameter;
+        $param =~ s/_/\\_/g;
+        $param2 =~ s/_/\\_/g;
+
+        print "{\\it ".$param."} {\\bf ".$param2."}";
+        if ($count != $#{$args{'parameterlist'}}) {
+            $count++;
+            print ", ";
+        }
+    }
+    print ")\n";
+
+    print "\n{\\large{Arguments}}\n";
+
+    print "\\begin{itemize}\n";
+    $check=0;
+    foreach $parameter (@{$args{'parameterlist'}}) {
+        $param1 = $args{'parametertypes'}{$parameter};
+        $param1 =~ s/_/\\_/g;
+        $param2 = $parameter;
+        $param2 =~ s/_/\\_/g;
+
+        $check = 1;
+        print "\\item {\\it ".$param1."} {\\bf ".$param2."}: \n";
+#       print "\n";
+
+        $param3 = $args{'parameters'}{$parameter};
+        $param3 =~ s/&([a-zA-Z\_]+)/{\\it \1}/g;
+
+        $out = just_highlight($param3);
+        $out =~ s/_/\\_/g;
+        print $out;
+    }
+    if ($check==0) {
+        print "\\item void\n";
+    }
+    print "\\end{itemize}\n";
+
+    foreach $section (@{$args{'sectionlist'}}) {
+        $sec = $section;
+        $sec =~ s/_/\\_/g;
+        $sec =~ s/&([a-zA-Z\_]+)/{\\it \1}/g;
+
+        print "\n{\\large{$sec}}\\\\\n";
+        print "\\begin{rmfamily}\n";
+
+        $sec = $args{'sections'}{$section};
+        $sec =~ s/\\:/:/g;
+        $sec =~ s/&([a-zA-Z\_]+)/{\\it \1}/g;
+        $sec =~ s/->/\$\\rightarrow\$/g;
+        $sec =~ s/([0-9]+)\^([0-9]+)/\$\{\1\}\^\{\2\}\$/g;
+
+        $out = just_highlight($sec);
+        $out =~ s/_/\\_/g;
+
+        print $out;
+        print "\\end{rmfamily}\n";
+    }
+    print "\n";
+}
+
+
+# output in sgml DocBook
+sub output_sgml {
+    my %args = %{$_[0]};
+    my ($parameter, $section);
+    my $count;
+    my $id;
+
+    $id = $args{'module'}."-".$args{'function'};
+    $id =~ s/[^A-Za-z0-9]/-/g;
+
+    print "<refentry>\n";
+    print "<refmeta>\n";
+    print "<refentrytitle><phrase id=\"$id\">".$args{'function'}."</phrase></r
+efentrytitle>\n";
+    print "</refmeta>\n";
+    print "<refnamediv>\n";
+    print " <refname>".$args{'function'}."</refname>\n";
+    print " <refpurpose>\n";
+    print "  ".$args{'purpose'}."\n";
+    print " </refpurpose>\n";
+    print "</refnamediv>\n";
+
+    print "<refsynopsisdiv>\n";
+    print " <title>Synopsis</title>\n";
+    print "  <funcsynopsis>\n";
+    print "   <funcdef>".$args{'functiontype'}." ";
+    print "<function>".$args{'function'}." ";
+    print "</function></funcdef>\n";
+
+#    print "<refsect1>\n";
+#    print " <title>Synopsis</title>\n";
+#    print "  <funcsynopsis>\n";
+#    print "   <funcdef>".$args{'functiontype'}." ";
+#    print "<function>".$args{'function'}." ";
+#    print "</function></funcdef>\n";
+
+    $count = 0;
+    if ($#{$args{'parameterlist'}} >= 0) {
+        foreach $parameter (@{$args{'parameterlist'}}) {
+            print "   <paramdef>".$args{'parametertypes'}{$parameter};
+            print " <parameter>$parameter</parameter></paramdef>\n";
+        }
+    } else {
+        print "  <void>\n";
+    }
+    print "  </funcsynopsis>\n";
+    print "</refsynopsisdiv>\n";
+#    print "</refsect1>\n";
+
+    # print parameters
+    print "<refsect1>\n <title>Arguments</title>\n";
+#    print "<para>\nArguments\n";
+    if ($#{$args{'parameterlist'}} >= 0) {
+        print " <variablelist>\n";
+        foreach $parameter (@{$args{'parameterlist'}}) {
+            print "  <varlistentry>\n   <term><parameter>$parameter</parameter
+></term>\n";
+            print "   <listitem>\n    <para>\n";
+            $lineprefix="     ";
+            output_highlight($args{'parameters'}{$parameter});
+            print "    </para>\n   </listitem>\n  </varlistentry>\n";
+        }
+        print " </variablelist>\n";
+    } else {
+        print " <para>\n  None\n </para>\n";
+    }
+    print "</refsect1>\n";
+
+    # print out each section
+    $lineprefix="   ";
+    foreach $section (@{$args{'sectionlist'}}) {
+        print "<refsect1>\n <title>$section</title>\n <para>\n";
+#       print "<para>\n$section\n";
+        if ($section =~ m/EXAMPLE/i) {
+            print "<example><para>\n";
+        }
+        output_highlight($args{'sections'}{$section});
+#       print "</para>";
+        if ($section =~ m/EXAMPLE/i) {
+            print "</para></example>\n";
+        }
+        print " </para>\n</refsect1>\n";
+    }
+
+    print "\n\n";
+}
+
+##
+# output in man
+sub output_man {
+    my %args = %{$_[0]};
+    my ($parameter, $section);
+    my $count;
+
+    print ".TH \"$args{'function'}\" 3 \"$args{'sourceversion'}\" \"". $args{'
+module'} . "\" \"". $args{'module'} . "\"\n";
+
+    print ".SH NAME\n";
+
+    print $args{'function'}."\n";
+
+    print ".SH SYNOPSIS\n";
+    print ".B #include <". lc((split /_/, $args{'function'})[0]) . ".h>\n"
+        if $args{'includefuncprefix'};
+    print ".sp\n";
+    print ".BI \"".$args{'functiontype'}." ".$args{'function'}."(";
+    $count = 0;
+    foreach $parameter (@{$args{'parameterlist'}}) {
+        print $args{'parametertypes'}{$parameter}." \" ".$parameter." \"";
+        if ($count != $#{$args{'parameterlist'}}) {
+            $count++;
+            print ", ";
+        }
+    }
+    print ");\"\n";
+
+    print ".SH ARGUMENTS\n";
+    foreach $parameter (@{$args{'parameterlist'}}) {
+        print ".IP \"".$args{'parametertypes'}{$parameter}." ".$parameter."\" 
+12\n";
+        output_highlight($args{'parameters'}{$parameter});
+    }
+    foreach $section (@{$args{'sectionlist'}}) {
+        print ".SH \"" . uc($section) . "\"\n";
+        output_highlight($args{'sections'}{$section});
+    }
+
+    if ($args{'bugsto'}) {
+        print ".SH \"REPORTING BUGS\"\n";
+        print "Report bugs to <". $args{'bugsto'} . ">.\n";
+    }
+
+    if ($args{'copyright'}) {
+        print ".SH COPYRIGHT\n";
+        print "Copyright \\(co ". $args{'copyright'} . ".\n";
+        if ($args{'verbatimcopying'}) {
+            print ".br\n";
+            print "Permission is granted to make and distribute verbatim copie
+s of this\n";
+            print "manual provided the copyright notice and this permission no
+tice are\n";
+            print "preserved on all copies.\n";
+        }
+    }
+
+    if ($args{'seeinfo'}) {
+        print ".SH \"SEE ALSO\"\n";
+        print "The full documentation for\n";
+        print ".B " . $args{'module'} . "\n";
+        print "is maintained as a Texinfo manual.  If the\n";
+        print ".B info\n";
+        print "and\n";
+        print ".B " . $args{'module'} . "\n";
+        print "programs are properly installed at your site, the command\n";
+        print ".IP\n";
+        print ".B info " . $args{'seeinfo'} . "\n";
+        print ".PP\n";
+        print "should give you access to the complete manual.\n";
+    }
+}
+
+sub output_listfunc {
+    my %args = %{$_[0]};
+    print $args{'function'} . "\n";
+}
+
+##
+# output in text
+sub output_text {
+    my %args = %{$_[0]};
+    my ($parameter, $section);
+
+    print "Function = ".$args{'function'}."\n";
+    print "  return type: ".$args{'functiontype'}."\n\n";
+    foreach $parameter (@{$args{'parameterlist'}}) {
+        print " ".$args{'parametertypes'}{$parameter}." ".$parameter."\n";
+        print "    -> ".$args{'parameters'}{$parameter}."\n";
+    }
+    foreach $section (@{$args{'sectionlist'}}) {
+        print " $section:\n";
+        print "    -> ";
+        output_highlight($args{'sections'}{$section});
+    }
+}
+
+##
+# generic output function - calls the right one based
+# on current output mode.
+sub output_function {
+#    output_html(@_);
+    eval "output_".$output_mode."(\@_);";
+}
+
+
+##
+# takes a function prototype and spits out all the details
+# stored in the global arrays/hsahes.
+sub dump_function {
+    my $prototype = shift @_;
+
+    if ($prototype =~ m/^()([a-zA-Z0-9_~:]+)\s*\(([^\)]*)\)/ ||
+        $prototype =~ m/^(\w+)\s+([a-zA-Z0-9_~:]+)\s*\(([^\)]*)\)/ ||
+        $prototype =~ m/^(\w+\s*\*)\s*([a-zA-Z0-9_~:]+)\s*\(([^\)]*)\)/ ||
+        $prototype =~ m/^(\w+\s+\w+)\s+([a-zA-Z0-9_~:]+)\s*\(([^\)]*)\)/ ||
+        $prototype =~ m/^(\w+\s+\w+\s*\*)\s*([a-zA-Z0-9_~:]+)\s*\(([^\)]*)\)/)
+  {
+        $return_type = $1;
+        $function_name = $2;
+        $args = $3;
+
+#       print STDERR "ARGS = '$args'\n";
+
+        foreach $arg (split ',', $args) {
+            # strip leading/trailing spaces
+            $arg =~ s/^\s*//;
+            $arg =~ s/\s*$//;
+#           print STDERR "SCAN ARG: '$arg'\n";
+            @args = split('\s', $arg);
+
+#           print STDERR " -> @args\n";
+            $param = pop @args;
+#           print STDERR " -> @args\n";
+            if ($param =~ m/^(\*+)(.*)/) {
+                $param = $2;
+                push @args, $1;
+            }
+            if ($param =~ m/^(.*)(\[\])$/) {
+                $param = $1;
+                push @args, $2;
+            }
+#           print STDERR " :> @args\n";
+            $type = join " ", @args;
+
+            if ($parameters{$param} eq "" && $param != "void") {
+                $parameters{$param} = "-- undescribed --";
+                print STDERR "Warning($lineno): Function parameter '$param' no
+t described in '$function_name'\n";
+            }
+
+            push @parameterlist, $param;
+            $parametertypes{$param} = $type;
+
+#           print STDERR "param = '$param', type = '$type'\n";
+        }
+    } else {
+        print STDERR "Error($lineno): cannot understand prototype: '$prototype
+'\n";
+        return;
+    }
+
+    if ($function_only==0 || defined($function_table{$function_name})) {
+        output_function({'function' => $function_name,
+                         'module' => $modulename,
+                         'sourceversion' => $sourceversion,
+                         'includefuncprefix' => $includefuncprefix,
+                         'bugsto' => $bugsto,
+                         'copyright' => $copyright,
+                         'verbatimcopying' => $verbatimcopying,
+                         'seeinfo' => $seeinfo,
+                         'functiontype' => $return_type,
+                         'parameterlist' => \@parameterlist,
+                         'parameters' => \%parameters,
+                         'parametertypes' => \%parametertypes,
+                         'sectionlist' => \@sectionlist,
+                         'sections' => \%sections,
+                         'purpose' => $function_purpose
+                         });
+    }
+}
+
+######################################################################
+# main
+# states
+# 0 - normal code
+# 1 - looking for function name
+# 2 - scanning field start.
+# 3 - scanning prototype.
+$state = 0;
+$section = "";
+
+$doc_special = "\@\%\$\&";
+
+$doc_start = "^/\\*\\*\$";
+$doc_end = "\\*/";
+$doc_com = "\\s*\\*\\s*";
+$doc_func = $doc_com."(\\w+):?";
+$doc_sect = $doc_com."([".$doc_special."[:upper:]][\\w ]+):(.*)";
+$doc_content = $doc_com."(.*)";
+
+%constants = ();
+%parameters = ();
+@parameterlist = ();
+%sections = ();
+@sectionlist = ();
+
+$contents = "";
+$section_default = "Description";       # default section
+$section = $section_default;
+
+$lineno = 0;
+foreach $file (@ARGV) {
+    if (!open(IN,"<$file")) {
+        print STDERR "Error: Cannot open file $file\n";
+        next;
+    }
+    while (<IN>) {
+        $lineno++;
+
+        if ($state == 0) {
+            if (/$doc_start/o) {
+                $state = 1;             # next line is always the function nam
+e
+            }
+        } elsif ($state == 1) { # this line is the function name (always)
+            if (/$doc_func/o) {
+                $function = $1;
+                $state = 2;
+                if (/-(.*)/) {
+                    $function_purpose = $1;
+                } else {
+                    $function_purpose = "";
+                }
+                if ($verbose) {
+                    print STDERR "Info($lineno): Scanning doc for $function\n"
+;
+                }
+            } else {
+                print STDERR "WARN($lineno): Cannot understand $_ on line $lin
+eno",
+                " - I thought it was a doc line\n";
+                $state = 0;
+            }
+        } elsif ($state == 2) { # look for head: lines, and include content
+            if (/$doc_sect/o) {
+                $newsection = $1;
+                $newcontents = $2;
+
+                if ($contents ne "") {
+                    dump_section($section, $contents);
+                    $section = $section_default;
+                }
+
+                $contents = $newcontents;
+                if ($contents ne "") {
+                    $contents .= "\n";
+                }
+                $section = $newsection;
+            } elsif (/$doc_end/) {
+
+                if ($contents ne "") {
+                    dump_section($section, $contents);
+                    $section = $section_default;
+                    $contents = "";
+                }
+
+#           print STDERR "end of doc comment, looking for prototype\n";
+                $prototype = "";
+                $state = 3;
+            } elsif (/$doc_content/) {
+                # miguel-style comment kludge, look for blank lines after
+                # @parameter line to signify start of description
+                if ($1 eq "" && $section =~ m/^@/) {
+                    dump_section($section, $contents);
+                    $section = $section_default;
+                    $contents = "";
+                } else {
+                    $contents .= $1."\n";
+                }
+            } else {
+                # i dont know - bad line?  ignore.
+                print STDERR "WARNING($lineno): bad line: $_"; 
+            }
+        } elsif ($state == 3) { # scanning for function { (end of prototype)
+            if (m#\s*/\*\s+MACDOC\s*#io) {
+              # do nothing
+            }
+            elsif (/([^\{]*)/) {
+                $prototype .= $1;
+            }
+            if (/\{/) {
+                $prototype =~ s@/\*.*?\*/@@gos; # strip comments.
+                $prototype =~ s@[\r\n]+@ @gos; # strip newlines/cr's.
+                $prototype =~ s@^ +@@gos; # strip leading spaces
+                dump_function($prototype);
+
+                $function = "";
+                %constants = ();
+                %parameters = ();
+                %parametertypes = ();
+                @parameterlist = ();
+                %sections = ();
+                @sectionlist = ();
+                $prototype = "";
+
+                $state = 0;
+            }
+        }
+    }
+}
+
+
+
diff --git a/gnu/usr.bin/texinfo/util/gendocs.sh b/gnu/usr.bin/texinfo/util/gendocs.sh
new file mode 100755
index 00000000000..0f7f97e9f1a
--- /dev/null
+++ b/gnu/usr.bin/texinfo/util/gendocs.sh
@@ -0,0 +1,285 @@
+#!/bin/sh
+# gendocs.sh -- generate a GNU manual in many formats.  This script is
+#   mentioned in maintain.texi.  See the help message below for usage details.
+# $Id: gendocs.sh,v 1.1.1.1 2006/07/17 16:03:50 espie Exp $
+# 
+# Copyright (C) 2003, 2004 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, 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.
+#
+# Original author: Mohit Agarwal.
+# Send bug reports and any other correspondence to bug-texinfo@gnu.org.
+
+prog="`basename \"$0\"`"
+srcdir=`pwd`
+
+scripturl="http://savannah.gnu.org/cgi-bin/viewcvs/texinfo/texinfo/util/gendocs.sh"
+templateurl="http://savannah.gnu.org/cgi-bin/viewcvs/texinfo/texinfo/util/gendocs_template"
+
+: ${MAKEINFO="makeinfo"}
+: ${TEXI2DVI="texi2dvi -t @finalout"}
+: ${DVIPS="dvips"}
+: ${DOCBOOK2TXT="docbook2txt"}
+: ${DOCBOOK2HTML="docbook2html"}
+: ${DOCBOOK2PDF="docbook2pdf"}
+: ${DOCBOOK2PS="docbook2ps"}
+: ${GENDOCS_TEMPLATE_DIR="."}
+unset CDPATH
+
+rcs_revision='$Revision: 1.1.1.1 $'
+rcs_version=`set - $rcs_revision; echo $2`
+program=`echo $0 | sed -e 's!.*/!!'`
+version="gendocs.sh $rcs_version
+
+Copyright (C) 2003 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."
+
+usage="Usage: $prog [OPTION]... PACKAGE MANUAL-TITLE
+
+Generate various output formats from PACKAGE.texinfo (or .texi or .txi) source.
+See the GNU Maintainers document for a more extensive discussion:
+  http://www.gnu.org/prep/maintain_toc.html
+
+Options:
+  -o OUTDIR   write files into OUTDIR, instead of manual/.
+  --docbook   convert to DocBook too (xml, txt, html, pdf and ps).
+  --html ARG  pass indicated ARG to makeinfo for HTML targets.
+  --help      display this help and exit successfully.
+  --version   display version information and exit successfully.
+
+Simple example: $prog emacs \"GNU Emacs Manual\"
+
+Typical sequence:
+  cd YOURPACKAGESOURCE/doc
+  wget \"$scripturl\"
+  wget \"$templateurl\"
+  $prog YOURMANUAL \"GNU YOURMANUAL - One-line description\"
+
+Output will be in a new subdirectory \"manual\" (by default, use -o OUTDIR
+to override).  Move all the new files into your web CVS tree, as
+explained in the Web Pages node of maintain.texi.
+
+MANUAL-TITLE is included as part of the HTML <title> of the overall
+manual/index.html file.  It should include the name of the package being
+documented.  manual/index.html is created by substitution from the file
+$GENDOCS_TEMPLATE_DIR/gendocs_template.  (Feel free to modify the
+generic template for your own purposes.)
+
+If you have several manuals, you'll need to run this script several
+times with different YOURMANUAL values, specifying a different output
+directory with -o each time.  Then write (by hand) an overall index.html
+with links to them all.
+
+You can set the environment variables MAKEINFO, TEXI2DVI, and DVIPS to
+control the programs that get executed, and GENDOCS_TEMPLATE_DIR to
+control where the gendocs_template file is looked for.
+
+Email bug reports or enhancement requests to bug-texinfo@gnu.org.
+"
+
+calcsize()
+{
+  size="`ls -ksl $1 | awk '{print $1}'`"
+  echo $size
+}
+
+outdir=manual
+html=
+PACKAGE=
+MANUAL_TITLE=
+
+while test $# -gt 0; do
+  case $1 in
+    --help) echo "$usage"; exit 0;;
+    --version) echo "$version"; exit 0;;
+    -o) shift; outdir=$1;;
+    --docbook) docbook=yes;;
+    --html) shift; html=$1;;
+    -*)
+      echo "$0: Unknown or ambiguous option \`$1'." >&2
+      echo "$0: Try \`--help' for more information." >&2
+      exit 1;;
+    *)
+      if test -z "$PACKAGE"; then
+        PACKAGE=$1
+      elif test -z "$MANUAL_TITLE"; then
+        MANUAL_TITLE=$1
+      else
+        echo "$0: extra non-option argument \`$1'." >&2
+        exit 1
+      fi;;
+  esac
+  shift
+done
+
+if test -s $srcdir/$PACKAGE.texinfo; then
+  srcfile=$srcdir/$PACKAGE.texinfo
+elif test -s $srcdir/$PACKAGE.texi; then
+  srcfile=$srcdir/$PACKAGE.texi
+elif test -s $srcdir/$PACKAGE.txi; then
+  srcfile=$srcdir/$PACKAGE.txi
+else
+  echo "$0: cannot find .texinfo or .texi or .txi for $PACKAGE in $srcdir." >&2
+  exit 1
+fi
+
+if test ! -r $GENDOCS_TEMPLATE_DIR/gendocs_template; then
+  echo "$0: cannot read $GENDOCS_TEMPLATE_DIR/gendocs_template." >&2
+  echo "$0: it is available from $templateurl." >&2
+  exit 1
+fi
+
+echo Generating output formats for $srcfile
+
+cmd="${MAKEINFO} -o $PACKAGE.info $srcfile"
+echo "Generating info files... ($cmd)"
+$cmd
+mkdir -p $outdir/
+tar czf $outdir/$PACKAGE.info.tar.gz $PACKAGE.info*
+info_tgz_size="`calcsize $outdir/$PACKAGE.info.tar.gz`"
+# do not mv the info files, there's no point in having them available
+# separately on the web.
+
+cmd="${TEXI2DVI} $srcfile"
+echo "Generating dvi ... ($cmd)"
+$cmd
+
+# now, before we compress dvi:
+echo Generating postscript...
+${DVIPS} $PACKAGE -o
+gzip -f -9 $PACKAGE.ps
+ps_gz_size="`calcsize $PACKAGE.ps.gz`"
+mv $PACKAGE.ps.gz $outdir/
+
+# compress/finish dvi:
+gzip -f -9 $PACKAGE.dvi
+dvi_gz_size="`calcsize $PACKAGE.dvi.gz`"
+mv $PACKAGE.dvi.gz $outdir/
+
+cmd="${TEXI2DVI} --pdf $srcfile"
+echo "Generating pdf ... ($cmd)"
+$cmd
+pdf_size="`calcsize $PACKAGE.pdf`"
+mv $PACKAGE.pdf $outdir/
+
+cmd="${MAKEINFO} -o $PACKAGE.txt --no-split --no-headers $srcfile"
+echo "Generating ASCII... ($cmd)"
+$cmd
+ascii_size="`calcsize $PACKAGE.txt`"
+gzip -f -9 -c $PACKAGE.txt >$outdir/$PACKAGE.txt.gz
+ascii_gz_size="`calcsize $outdir/$PACKAGE.txt.gz`"
+mv $PACKAGE.txt $outdir/
+
+cmd="${MAKEINFO} --no-split --html -o $PACKAGE.html $html $srcfile"
+echo "Generating monolithic html... ($cmd)"
+rm -rf $PACKAGE.html  # in case a directory is left over
+$cmd
+html_mono_size="`calcsize $PACKAGE.html`"
+gzip -f -9 -c $PACKAGE.html >$outdir/$PACKAGE.html.gz
+html_mono_gz_size="`calcsize $outdir/$PACKAGE.html.gz`"
+mv $PACKAGE.html $outdir/
+
+cmd="${MAKEINFO} --html -o $PACKAGE.html $html $srcfile"
+echo "Generating html by node... ($cmd)"
+$cmd
+split_html_dir=$PACKAGE.html
+(
+  cd ${split_html_dir} || exit 1
+  tar -czf ../$outdir/${PACKAGE}.html_node.tar.gz -- *.html
+)
+html_node_tgz_size="`calcsize $outdir/${PACKAGE}.html_node.tar.gz`"
+rm -f $outdir/html_node/*.html
+mkdir -p $outdir/html_node/
+mv ${split_html_dir}/*.html $outdir/html_node/
+rmdir ${split_html_dir}
+
+echo Making .tar.gz for sources...
+srcfiles=`ls *.texinfo *.texi *.txi *.eps 2>/dev/null`
+tar cvzfh $outdir/$PACKAGE.texi.tar.gz $srcfiles
+texi_tgz_size="`calcsize $outdir/$PACKAGE.texi.tar.gz`"
+
+if test -n "$docbook"; then
+  cmd="${MAKEINFO} -o - --docbook $srcfile > ${srcdir}/$PACKAGE-db.xml"
+  echo "Generating docbook XML... $(cmd)"
+  eval $cmd
+  docbook_xml_size="`calcsize $PACKAGE-db.xml`"
+  gzip -f -9 -c $PACKAGE-db.xml >$outdir/$PACKAGE-db.xml.gz
+  docbook_xml_gz_size="`calcsize $outdir/$PACKAGE-db.xml.gz`"
+  mv $PACKAGE-db.xml $outdir/
+
+  cmd="${DOCBOOK2HTML} -o $split_html_db_dir ${outdir}/$PACKAGE-db.xml"
+  echo "Generating docbook HTML... ($cmd)"
+  $cmd
+  split_html_db_dir=html_node_db
+  (
+    cd ${split_html_db_dir} || exit 1
+    tar -czf ../$outdir/${PACKAGE}.html_node_db.tar.gz -- *.html
+  )
+  html_node_db_tgz_size="`calcsize $outdir/${PACKAGE}.html_node_db.tar.gz`"
+  rm -f $outdir/html_node_db/*.html
+  mkdir -p $outdir/html_node_db
+  mv ${split_html_db_dir}/*.html $outdir/html_node_db/
+  rmdir ${split_html_db_dir}
+
+  cmd="${DOCBOOK2TXT} ${outdir}/$PACKAGE-db.xml"
+  echo "Generating docbook ASCII... ($cmd)"
+  $cmd
+  docbook_ascii_size="`calcsize $PACKAGE-db.txt`"
+  mv $PACKAGE-db.txt $outdir/
+
+  cmd="${DOCBOOK2PS} ${outdir}/$PACKAGE-db.xml"
+  echo "Generating docbook PS... $(cmd)"
+  $cmd
+  gzip -f -9 -c $PACKAGE-db.ps >$outdir/$PACKAGE-db.ps.gz
+  docbook_ps_gz_size="`calcsize $outdir/$PACKAGE-db.ps.gz`"
+  mv $PACKAGE-db.ps $outdir/
+
+  cmd="${DOCBOOK2PDF} ${outdir}/$PACKAGE-db.xml"
+  echo "Generating docbook PDF... ($cmd)"
+  $cmd
+  docbook_pdf_size="`calcsize $PACKAGE-db.pdf`"
+  mv $PACKAGE-db.pdf $outdir/
+fi
+
+echo Writing index file...
+curdate="`date '+%B %d, %Y'`"
+sed \
+   -e "s!%%TITLE%%!$MANUAL_TITLE!g" \
+   -e "s!%%DATE%%!$curdate!g" \
+   -e "s!%%PACKAGE%%!$PACKAGE!g" \
+   -e "s!%%HTML_MONO_SIZE%%!$html_mono_size!g" \
+   -e "s!%%HTML_MONO_GZ_SIZE%%!$html_mono_gz_size!g" \
+   -e "s!%%HTML_NODE_TGZ_SIZE%%!$html_node_tgz_size!g" \
+   -e "s!%%INFO_TGZ_SIZE%%!$info_tgz_size!g" \
+   -e "s!%%DVI_GZ_SIZE%%!$dvi_gz_size!g" \
+   -e "s!%%PDF_SIZE%%!$pdf_size!g" \
+   -e "s!%%PS_GZ_SIZE%%!$ps_gz_size!g" \
+   -e "s!%%ASCII_SIZE%%!$ascii_size!g" \
+   -e "s!%%ASCII_GZ_SIZE%%!$ascii_gz_size!g" \
+   -e "s!%%TEXI_TGZ_SIZE%%!$texi_tgz_size!g" \
+   -e "s!%%DOCBOOK_HTML_NODE_TGZ_SIZE%%!$html_node_db_tgz_size!g" \
+   -e "s!%%DOCBOOK_ASCII_SIZE%%!$docbook_ascii_size!g" \
+   -e "s!%%DOCBOOK_PS_GZ_SIZE%%!$docbook_ps_gz_size!g" \
+   -e "s!%%DOCBOOK_PDF_SIZE%%!$docbook_pdf_size!g" \
+   -e "s!%%DOCBOOK_XML_SIZE%%!$docbook_xml_size!g" \
+   -e "s!%%DOCBOOK_XML_GZ_SIZE%%!$docbook_xml_gz_size!g" \
+   -e "s,%%SCRIPTURL%%,$scripturl,g" \
+   -e "s!%%SCRIPTNAME%%!$prog!g" \
+$GENDOCS_TEMPLATE_DIR/gendocs_template >$outdir/index.html
+
+echo "Done!  See $outdir/ subdirectory for new files."
diff --git a/gnu/usr.bin/texinfo/util/gendocs_template b/gnu/usr.bin/texinfo/util/gendocs_template
new file mode 100755
index 00000000000..6f0e0958b48
--- /dev/null
+++ b/gnu/usr.bin/texinfo/util/gendocs_template
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!-- $Id: gendocs_template,v 1.1.1.1 2006/07/17 16:03:50 espie Exp $ -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+<head>
+<title>%%TITLE%% - GNU Project - Free Software Foundation (FSF)</title>
+<meta http-equiv="content-type" content='text/html; charset=utf-8' />
+<link rel="stylesheet" type="text/css" href="/gnu.css" />
+<link rev="made" href="webmasters@gnu.org" />
+</head>
+
+<!-- This document is in XML, and xhtml 1.0 -->
+<!-- Please make sure to properly nest your tags -->
+<!-- and ensure that your final document validates -->
+<!-- consistent with W3C xhtml 1.0 and CSS standards -->
+<!-- See validator.w3.org -->
+
+<body>
+
+<h3>%%TITLE%%</h3>
+
+<address>Free Software Foundation</address>
+<address>last updated %%DATE%%</address>
+<p>
+<a href="/graphics/gnu-head.jpg">
+	<img src="/graphics/gnu-head-sm.jpg"
+	alt=" [image of the head of a GNU] "
+	width="129" height="122" />
+</a>
+<a href="/philosophy/gif.html">(no gifs due to patent problems)</a>
+</p>
+<hr />
+
+<p>This manual (%%PACKAGE%%) is available in the following formats:</p>
+
+<ul>
+  <li><a href="%%PACKAGE%%.html">HTML 
+      (%%HTML_MONO_SIZE%%K characters)</a> - entirely on one web page.</li>
+  <li><a href="html_node/index.html">HTML</a> - with one web page per
+      node.</li>
+  <li><a href="%%PACKAGE%%.html.gz">HTML compressed
+      (%%HTML_MONO_GZ_SIZE%%K gzipped characters)</a> - entirely on 
+      one web page.</li>
+  <li><a href="%%PACKAGE%%.html_node.tar.gz">HTML compressed
+      (%%HTML_NODE_TGZ_SIZE%%K gzipped tar file)</a> -
+      with one web page per node.</li>
+  <li><a href="%%PACKAGE%%.info.tar.gz">Info document
+      (%%INFO_TGZ_SIZE%%K characters gzipped tar file)</a>.</li>
+  <li><a href="%%PACKAGE%%.txt">ASCII text
+      (%%ASCII_SIZE%%K characters)</a>.</li>
+  <li><a href="%%PACKAGE%%.txt.gz">ASCII text compressed
+      (%%ASCII_GZ_SIZE%%K gzipped characters)</a>.</li>
+  <li><a href="%%PACKAGE%%.dvi.gz">TeX dvi file
+      (%%DVI_GZ_SIZE%%K characters gzipped)</a>.</li>
+  <li><a href="%%PACKAGE%%.ps.gz">PostScript file
+      (%%PS_GZ_SIZE%%K characters gzipped)</a>.</li>
+  <li><a href="%%PACKAGE%%.pdf">PDF file
+      (%%PDF_SIZE%%K characters)</a>.</li>
+  <li><a href="%%PACKAGE%%.texi.tar.gz">Texinfo source
+      (%%TEXI_TGZ_SIZE%%K characters gzipped tar file)</a></li>
+</ul>
+
+<p>(This page generated by the <a href="%%SCRIPTURL%%">%%SCRIPTNAME%%
+script</a>.)</p>
+
+<div class="copyright">
+<p>
+Return to the <a href="/home.html">GNU Project home page</a>.
+</p>
+
+<p>
+Please send FSF &amp; GNU inquiries to 
+<a href="mailto:gnu@gnu.org"><em>gnu@gnu.org</em></a>.
+There are also <a href="/home.html#ContactInfo">other ways to contact</a> 
+the FSF.
+<br />
+Please send broken links and other corrections (or suggestions) to
+<a href="mailto:webmasters@gnu.org"><em>webmasters@gnu.org</em></a>.
+</p>
+
+<p>
+Copyright (C) 2004 Free Software Foundation, Inc.,
+59 Temple Place - Suite 330, Boston, MA 02111, USA
+<br />
+Verbatim copying and distribution of this entire article is
+permitted in any medium, provided this notice is preserved.
+</p>
+
+<p>
+Updated:
+<!-- timestamp start -->
+$Date: 2006/07/17 16:03:50 $ $Author: espie $
+<!-- timestamp end -->
+</p>
+</div>
+
+</body>
+</html>
diff --git a/gnu/usr.bin/texinfo/util/infosrch b/gnu/usr.bin/texinfo/util/infosrch
new file mode 100755
index 00000000000..7fae78e8b84
--- /dev/null
+++ b/gnu/usr.bin/texinfo/util/infosrch
@@ -0,0 +1,104 @@
+#!/usr/local/bin/perl -w
+# $Id: infosrch,v 1.1.1.1 2006/07/17 16:03:50 espie Exp $
+# infosrch does a regex search on an info manual.
+# By Harry Putnam <reader@newsguy.com>.
+
+($myscript = $0) =~ s:^.*/::; 
+$six = '';
+
+if($ARGV[0] eq "help"){
+   &usage;
+   exit;
+}
+if($ARGV[0] eq "-e"){
+   shift;
+   $six = "true";
+}
+if(!$ARGV[1]){
+   &usage;
+   exit;
+}
+
+$target = shift;
+$regex  = shift;
+
+$shell_proc  =  "info --output - --subnodes 2>/dev/null $target";
+
+open(SHELL_PROC," $shell_proc|");
+while(<SHELL_PROC>){
+  chomp;
+  push @lines,$_;
+} 
+close(SHELL_PROC);
+$cnt = 0;
+for(@lines){
+   if(/$regex/ && !$six){
+      print "$target\n   $lines[($cnt-1)]\n<$cnt> $lines[$cnt]\n   $lines[($cnt+1)]\n";
+      print "-- \n";
+   }elsif(/$regex/ && $six){
+        print "$target\n";
+        if($lines[($cnt-6)]){
+           print "    $lines[($cnt-6)]\n";
+        }
+        if($lines[($cnt-5)]){
+           print "    $lines[($cnt-5)]\n";
+        }
+        if($lines[($cnt-4)]){
+           print "    $lines[($cnt-4)]\n";
+        }
+        if($lines[($cnt-3)]){
+           print "    $lines[($cnt-3)]\n";
+        }
+        if($lines[($cnt-2)]){
+           print "    $lines[($cnt-2)]\n";
+        }
+        if($lines[($cnt-1)]){
+           print "    $lines[($cnt-1)]\n";
+        }
+        if($lines[$cnt]){
+           print "$cnt $lines[$cnt]\n";
+        }
+        if($lines[($cnt+1)]){
+           print "    $lines[($cnt+1)]\n";
+        }
+        if($lines[($cnt+2)]){
+           print "    $lines[($cnt+2)]\n";
+        }
+        if($lines[($cnt+3)]){
+           print "    $lines[($cnt+3)]\n";
+        }
+        if($lines[($cnt+4)]){
+           print "    $lines[($cnt+4)]\n";
+        }
+        if($lines[($cnt+5)]){
+           print "    $lines[($cnt+5)]\n";
+        }
+        if($lines[($cnt+6)]){
+           print "    $lines[($cnt+6)]\n";
+        }
+        print "-- \n";
+     }
+     $cnt++;
+}        
+
+sub usage {
+  print <<EOM;
+
+Purpose: Extract full text from info node and search it by regex
+Usage: $myscript [-e] TARGET REGEX
+
+Where TARGET is an info node such as `emacs', `bash' etc, and
+REGEX is what you want to find in it.
+
+The -e flag is not required but if used then 6 lines preceding and six
+lines following any hits will be printed.  The default (with no -e flag)
+is to print one line before and after.
+
+The output has the line number prepended to the line containing the
+actual regex.
+
+Info command used:
+  info --output - --subnodes 2>/dev/null TARGET
+
+EOM
+}
diff --git a/gnu/usr.bin/texinfo/util/install-info-html b/gnu/usr.bin/texinfo/util/install-info-html
index f63c97e79b8..89a7168e9cb 100644
--- a/gnu/usr.bin/texinfo/util/install-info-html
+++ b/gnu/usr.bin/texinfo/util/install-info-html
@@ -1,5 +1,5 @@
 #!@BASH@
-# $Id: install-info-html,v 1.1.1.1 2002/06/10 13:21:26 espie Exp $
+# $Id: install-info-html,v 1.1.1.2 2006/07/17 16:03:50 espie Exp $
 
 name=install-info-html
 version=1.0
@@ -109,13 +109,13 @@ shift `expr $OPTIND - 1`
 #
 # Input file name
 #
-if [ -z "$all" -a -z "$1" ]; then
+if [ -z "$all" ] && [ -z "$1" ]; then
 	help
 	echo "$name: No HTML documents given"
 	exit 2
 fi
 
-if [ -n "$all" -a -n "$1" ]; then
+if [ -n "$all" ] && [ -n "$1" ]; then
 	echo "$name: --all specified, ignoring DIRECTORY-DIRs"
 fi
 
diff --git a/gnu/usr.bin/texinfo/util/tex3patch b/gnu/usr.bin/texinfo/util/tex3patch
index 1708c7588bb..046c7946459 100644
--- a/gnu/usr.bin/texinfo/util/tex3patch
+++ b/gnu/usr.bin/texinfo/util/tex3patch
@@ -17,8 +17,7 @@ if [ -z "$dir" ]; then
   dir='.'
 fi
 
-if [ \( 2 -lt $# \) -o \
-     \( ! -f $dir/texinfo.tex \)   ]; then
+if [ 2 -lt $# ] || [ ! -f "$dir/texinfo.tex" ]; then
   echo "To patch texinfo.tex for peaceful coexistence with Unix TeX 3.0,"
   echo "run    $0"
   echo "with no arguments in the same directory as texinfo.tex; or run"
@@ -36,7 +35,7 @@ echo "Checking for \`dummy.tfm'"
 ( cd $TMPDIR; tex '\relax \batchmode \font\foo=dummy \bye' )
 
 grep -s '3.0' $TMPDIR/texput.log
-if [ 1 = "$?" -a "$ANYVERSION" != "yes" ]; then
+if [ 1 = "$?" ] && [ "$ANYVERSION" != "yes" ]; then
 	echo "You probably do not need this patch,"
         echo "since your TeX does not seem to be version 3.0."
 	echo "If you insist on applying the patch, run $0"
diff --git a/gnu/usr.bin/texinfo/util/texi-docstring-magic.el b/gnu/usr.bin/texinfo/util/texi-docstring-magic.el
index c645fbcf699..641173b2e49 100644
--- a/gnu/usr.bin/texinfo/util/texi-docstring-magic.el
+++ b/gnu/usr.bin/texinfo/util/texi-docstring-magic.el
@@ -5,7 +5,7 @@
 ;; Copyright (C) 1998 David Aspinall
 ;; Maintainer:  David Aspinall <da@dcs.ed.ac.uk>
 ;;
-;; $Id: texi-docstring-magic.el,v 1.1.1.1 2000/02/09 01:26:24 espie Exp $
+;; $Id: texi-docstring-magic.el,v 1.1.1.2 2006/07/17 16:03:50 espie Exp $
 ;;
 ;; This package is distributed under the terms of the 
 ;; GNU General Public License, Version 2.   
diff --git a/gnu/usr.bin/texinfo/util/texi2pdf b/gnu/usr.bin/texinfo/util/texi2pdf
new file mode 100755
index 00000000000..28ab8ce0d95
--- /dev/null
+++ b/gnu/usr.bin/texinfo/util/texi2pdf
@@ -0,0 +1,19 @@
+#!/bin/sh
+# $Id: texi2pdf,v 1.1.1.1 2006/07/17 16:03:51 espie Exp $
+# Written by Thomas Esser.  Public domain.
+# Execute texi2dvi --pdf.
+
+test -f /bin/sh5 && test -z "$RUNNING_SH5" \
+  && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \
+  && { RUNNING_SH5=true; export RUNNING_SH5; exec /bin/sh5 $0 ${1+"$@"}; }
+unset RUNNING_SH5
+
+test -f /bin/bsh && test -z "$RUNNING_BSH" \
+  && { UNAMES=`uname -s`; test "x$UNAMES" = xAIX; } 2>/dev/null \
+  && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; }
+unset RUNNING_BSH
+
+# hack around a bug in zsh:
+test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
+
+texi2dvi --pdf ${1+"$@"}
diff --git a/gnu/usr.bin/texinfo/util/texinfo-cat.in b/gnu/usr.bin/texinfo/util/texinfo-cat.in
new file mode 100644
index 00000000000..f0f0674ec8b
--- /dev/null
+++ b/gnu/usr.bin/texinfo/util/texinfo-cat.in
@@ -0,0 +1,3 @@
+OVERRIDE YES
+
+PUBLIC "-//GNU//DTD TexinfoML V__VERSION__//EN" "texinfo.dtd"
diff --git a/gnu/usr.bin/texinfo/util/texinfo.dtd b/gnu/usr.bin/texinfo/util/texinfo.dtd
new file mode 100644
index 00000000000..7e73da5fc16
--- /dev/null
+++ b/gnu/usr.bin/texinfo/util/texinfo.dtd
@@ -0,0 +1,484 @@
+<!-- $Id: texinfo.dtd,v 1.1.1.1 2006/07/17 16:03:49 espie Exp $
+   Document Type Definition for Texinfo.
+
+   Author: Philippe Martin (feloy@free.fr)
+   Contributors:
+           Karl Eichwalder (keichwa@gmx.net)
+           Alper Ersoy (dirt@gtk.org)
+
+   Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+
+  Copying and distribution of this file, with or without modification,
+  are permitted in any medium without royalty provided the copyright
+  notice and this notice are preserved.
+
+-->
+
+<!-- ENTITIES -->
+
+<!-- Meta-information -->
+<!ENTITY % metainformation "setfilename | settitle | dircategory
+                            | documentdescription">
+<!ENTITY % variables "setvalue | clearvalue">
+
+<!-- Document language -->
+<!ENTITY % lang "documentlanguage">
+
+<!-- Language codes -->
+<!ENTITY % languagecodes "aa|ab|af|am|ar|as|ay|az|ba|be|bg|bh|bi|bn|bo|br|ca|co|cs|cy|da|de|dz|el|en|eo|es|et|eu|fa|fi|fj|fo|fr|fy|ga|gd|gl|gn|gu|ha|he|hi|hr|hu|hy|ia|id|ie|ik|is|it|iu|ja|jw|ka|kk|kl|km|kn|ko|ks|ku|ky|la|ln|lo|lt|lv|mg|mi|mk|ml|mn|mo|mr|ms|mt|my|na|ne|nl|no|oc|om|or|pa|pl|ps|pt|qu|rm|rn|ro|ru|rw|sa|sd|sg|sh|si|sk|sl|sm|sn|so|sq|sr|ss|st|su|sv|sw|ta|te|tg|th|ti|tk|tl|tn|to|tr|ts|tt|tw|ug|uk|ur|uz|vi|vo|wo|xh|yi|yo|za|zh|zu">
+
+<!-- ToC -->
+<!ENTITY % toc "contents | shortcontents">
+
+<!-- Title page -->
+<!ENTITY % titlepage_cmds "author | booktitle | booksubtitle">
+
+<!-- block -->
+<!-- ***** -->
+<!ENTITY % block "menu | para | quotation | example | smallexample | lisp
+                  | smalllisp | cartouche | copying
+                  | format | smallformat | display
+                  | smalldisplay | itemize | enumerate | sp | center | group
+                  | table | multitable | definition">
+
+<!-- API definitions -->
+<!-- *************** -->
+<!ENTITY % definition.cmds "defcategory | deffunction | defvariable | defparam
+                            | defdelimiter | deftype | defparamtype | defdatatype
+                            | defclass | defclassvar | defoperation">
+
+<!-- Headings -->
+<!-- ******** -->
+<!ENTITY % headings "majorheading | chapheading | heading | subheading
+                     | subsubheading">
+
+
+<!-- Sectioning -->
+<!-- ********** -->
+<!ENTITY % section.level1 "top | chapter | unnumbered | appendix">
+
+<!ENTITY % section.level2 "section | unnumberedsec | appendixsec">
+
+<!ENTITY % section.level3 "subsection | unnumberedsubsec | appendixsubsec">
+
+<!ENTITY % section.level4 "subsubsection | unnumberedsubsubsec 
+                           | appendixsubsubsec">
+
+<!ENTITY % section.all "%section.level1; | %section.level2; | %section.level3;
+                        | %section.level4;">
+
+
+<!ENTITY % section.level1.content "(%block;
+                                   | %section.level2;
+                                   | %section.level3;
+                                   | %section.level4;
+                                   | verbatim | titlepage | %toc;
+                                   | %lang; | %variables;
+                                   | %headings;
+                                   | printindex)*">
+
+<!ENTITY % section.level2.content "(%block;
+                                   | %section.level3;
+                                   | %section.level4;
+                                   | verbatim | titlepage | %toc;
+                                   | %lang; | %variables;
+                                   | %headings;)*">
+
+<!ENTITY % section.level3.content "(%block;
+                                   | %section.level4;
+                                   | verbatim | titlepage | %toc;
+                                   | %lang; | %variables;
+                                   | %headings;)*">
+
+<!ENTITY % section.level4.content "(%block;
+                                    | verbatim | titlepage | %toc;
+                                    | %lang; | %variables;
+                                    | %headings;)*">
+
+
+<!-- Inline -->
+<!-- ****** -->
+<!ENTITY % Inline.emphasize "strong | emph">
+<!ENTITY % Inline.fonts "b | i | r | sansserif | slanted | titlefont | tt">
+<!ENTITY % Inline.footnote "footnote">
+<!ENTITY % Inline.markup "code | command | env | file | option | samp
+                          | dfn | cite | key | kbd | var | acronym | url"> 
+<!ENTITY % Inline.math "math">
+<!ENTITY % Inline.reference "xref | inforef | indexterm | email | uref">
+<!ENTITY % Inline.smallcaps "sc">
+
+<!ENTITY % Inline.phrase
+           "%Inline.emphasize; | %Inline.smallcaps; | %Inline.fonts;
+            | %Inline.markup; | %Inline.math; | %Inline.reference;
+            | %Inline.footnote; ">
+
+
+<!-- ************ -->
+<!-- * ELEMENTS * -->
+<!-- ************ -->
+
+<!-- TOP Level Element -->
+<!-- ***************** -->
+<!ELEMENT texinfo ((%metainformation; | titlepage | node | %block; | %toc;
+                    | %variables; | %lang;)* )>
+<!ATTLIST texinfo xml:lang (%languagecodes;) 'en'>
+
+<!-- meta-information -->
+<!ELEMENT setfilename (#PCDATA)>
+<!ELEMENT settitle    (#PCDATA | %Inline.phrase; | footnote)*>
+<!ELEMENT dircategory (#PCDATA)>
+
+<!ELEMENT setvalue    (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT clearvalue  EMPTY>
+<!ATTLIST setvalue
+                name CDATA #REQUIRED>
+<!ATTLIST clearvalue
+                name CDATA #REQUIRED>
+
+<!-- ToC -->
+<!ELEMENT contents      EMPTY>
+<!ELEMENT shortcontents EMPTY>
+
+<!-- Document language -->
+<!ELEMENT documentlanguage EMPTY>
+<!ATTLIST documentlanguage xml:lang (%languagecodes;) 'en'>
+
+<!-- Titlepage -->
+<!ELEMENT titlepage    (%titlepage_cmds; | %block;)*>
+<!ELEMENT author       (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT booktitle    (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT booksubtitle (#PCDATA | %Inline.phrase;)*>
+
+<!-- NODES -->
+<!-- ***** -->
+<!ELEMENT node (nodename, nodenext?, nodeprev?, nodeup?,
+                (%section.all; | %block; | %toc; | %lang; | image)*) >
+
+<!ELEMENT nodename (#PCDATA)>
+<!ELEMENT nodenext (#PCDATA)>
+<!ELEMENT nodeprev (#PCDATA)>
+<!ELEMENT nodeup   (#PCDATA)>
+
+<!-- SECTIONING -->
+<!-- ********** -->
+
+<!ELEMENT top           (title?, (%section.level1.content;))>
+
+<!ELEMENT chapter       (title?, (%section.level1.content;))>
+<!ELEMENT section       (title?, (%section.level2.content;))>
+<!ELEMENT subsection    (title?, (%section.level3.content;))>
+<!ELEMENT subsubsection (title?, (%section.level4.content;))>
+
+<!ELEMENT unnumbered          (title?, (%section.level1.content;))>
+<!ELEMENT unnumberedsec       (title?, (%section.level2.content;))>
+<!ELEMENT unnumberedsubsec    (title?, (%section.level3.content;))>
+<!ELEMENT unnumberedsubsubsec (title?, (%section.level4.content;))>
+
+<!ELEMENT appendix          (title?, (%section.level1.content;))>
+<!ELEMENT appendixsec       (title?, (%section.level2.content;))>
+<!ELEMENT appendixsubsec    (title?, (%section.level3.content;))>
+<!ELEMENT appendixsubsubsec (title?, (%section.level4.content;))>
+
+<!-- Headings and titles -->
+<!ELEMENT majorheading  (#PCDATA | %Inline.phrase; | footnote)*>
+<!ELEMENT chapheading   (#PCDATA | %Inline.phrase; | footnote)*>
+<!ELEMENT heading       (#PCDATA | %Inline.phrase; | footnote)*>
+<!ELEMENT subheading    (#PCDATA | %Inline.phrase; | footnote)*>
+<!ELEMENT subsubheading (#PCDATA | %Inline.phrase; | footnote)*>
+<!ELEMENT title         (#PCDATA | %Inline.phrase; | footnote)*>
+
+<!-- Negative Indentation in Blocks -->
+<!ELEMENT exdent       (#PCDATA | %Inline.phrase;)*>
+
+<!-- BLOCK Elements -->
+<!-- ************** -->
+
+<!ELEMENT quotation    (%block; | %Inline.phrase; | exdent)*>
+<!ELEMENT documentdescription (#PCDATA | %block; | %Inline.phrase;)*>
+<!ELEMENT example      (#PCDATA | %block; | %Inline.phrase; | exdent)*>
+<!ELEMENT smallexample (#PCDATA | %block; | %Inline.phrase; | exdent)*>
+<!ELEMENT lisp         (#PCDATA | %block; | %Inline.phrase; | exdent)*>
+<!ELEMENT smalllisp    (#PCDATA | %block; | %Inline.phrase; | exdent)*>
+<!ELEMENT cartouche    (#PCDATA | %block; | %Inline.phrase; | exdent)*>
+<!ELEMENT copying      (#PCDATA | %block; | %Inline.phrase; | exdent)*>
+<!ELEMENT format       (#PCDATA | %block; | %Inline.phrase; | exdent)*>
+<!ELEMENT smallformat  (#PCDATA | %block; | %Inline.phrase; | exdent)*>
+<!ELEMENT display      (#PCDATA | %block; | %Inline.phrase; | exdent)*>
+<!ELEMENT smalldisplay (#PCDATA | %block; | %Inline.phrase; | exdent)*>
+<!ELEMENT center       (#PCDATA | %block; | %Inline.phrase; | exdent)*>
+<!ELEMENT group        (#PCDATA | %block; | %Inline.phrase; | exdent)*>
+
+<!ELEMENT image        (alttext)>
+<!ELEMENT alttext      (#PCDATA)>
+<!ATTLIST image
+            name      CDATA #REQUIRED
+            extension CDATA #REQUIRED
+            width     CDATA #REQUIRED
+            height    CDATA #REQUIRED>
+
+<!-- Whitespace in these elements are always preserved -->
+<!ATTLIST example      xml:space (preserve) #FIXED 'preserve'>
+<!ATTLIST smallexample xml:space (preserve) #FIXED 'preserve'>
+<!ATTLIST lisp         xml:space (preserve) #FIXED 'preserve'>
+<!ATTLIST smalllisp    xml:space (preserve) #FIXED 'preserve'>
+<!ATTLIST display      xml:space (preserve) #FIXED 'preserve'>
+<!ATTLIST smalldisplay xml:space (preserve) #FIXED 'preserve'>
+<!ATTLIST format       xml:space (preserve) #FIXED 'preserve'>
+<!ATTLIST smallformat  xml:space (preserve) #FIXED 'preserve'>
+
+<!ELEMENT verbatim     (#PCDATA)>
+<!ATTLIST verbatim     xml:space (preserve) #FIXED 'preserve'>
+
+<!ELEMENT para         (#PCDATA | %Inline.phrase; | footnote | %lang;)*>
+<!ATTLIST para
+          role CDATA #IMPLIED>
+
+<!ELEMENT menu (menuentry | detailmenu | para)*>
+<!ELEMENT detailmenu (menuentry | para)*>
+<!ELEMENT menuentry (menunode?, menutitle?, menucomment?)>
+<!ELEMENT menunode (#PCDATA)>
+<!ELEMENT menutitle (#PCDATA)>
+<!ELEMENT menucomment (#PCDATA | para)*>
+
+<!-- Floating displays -->
+<!ELEMENT float (floattype, floatpos, (%block;)*, caption?)>
+<!ATTLIST float
+          name CDATA #IMPLIED>
+<!ELEMENT floattype (#PCDATA)>
+<!ELEMENT floatpos (#PCDATA)>
+<!ELEMENT caption (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT listoffloats EMPTY>
+<!ATTLIST listoffloats
+          type CDATA #IMPLIED>
+
+<!-- Lists -->
+<!ELEMENT itemize (itemfunction, (item | itemize | enumerate | indexterm)*)>
+<!ELEMENT enumerate (enumarg?, (item | itemize | enumerate)*)>
+<!ATTLIST enumerate
+          first CDATA #IMPLIED>
+
+<!ELEMENT item (%block;)*>
+<!ELEMENT enumarg (#PCDATA)>
+
+<!ELEMENT itemfunction (#PCDATA | %Inline.phrase;)*>
+
+<!-- Tables -->
+<!ELEMENT table (tableitem | indexterm)+>
+<!ELEMENT tableitem ((tableterm, indexterm*)+, item?)>
+<!ELEMENT tableterm (#PCDATA | %Inline.phrase;)*>
+
+<!ELEMENT multitable (columnfraction*, thead?, tbody)>
+<!ELEMENT columnfraction (#PCDATA)>
+<!ELEMENT thead (row+)>
+<!ELEMENT tbody (row+)>
+<!ELEMENT row (entry*)>
+<!ELEMENT entry (#PCDATA | %Inline.phrase;)*>
+
+<!-- API definitions -->
+<!ELEMENT definition (definitionterm | definitionitem)+>
+<!ELEMENT definitionterm (%definition.cmds; | indexterm)+>
+<!ELEMENT definitionitem (%block;)*>
+
+<!ELEMENT defcategory  (#PCDATA | %Inline.phrase; | footnote)*>
+<!ELEMENT deffunction  (#PCDATA | %Inline.phrase; | footnote)*>
+<!ELEMENT defvariable  (#PCDATA | %Inline.phrase; | footnote)*>
+<!ELEMENT defparam     (#PCDATA | %Inline.phrase; | footnote)*>
+<!ELEMENT defdelimiter (#PCDATA | %Inline.phrase; | footnote)*>
+<!ELEMENT deftype      (#PCDATA | %Inline.phrase; | footnote)*>
+<!ELEMENT defparamtype (#PCDATA | %Inline.phrase; | footnote)*>
+<!ELEMENT defdatatype  (#PCDATA | %Inline.phrase; | footnote)*>
+<!ELEMENT defclass     (#PCDATA | %Inline.phrase; | footnote)*>
+<!ELEMENT defclassvar  (#PCDATA | %Inline.phrase; | footnote)*>
+<!ELEMENT defoperation (#PCDATA | %Inline.phrase; | footnote)*>
+
+<!-- INLINE Elements -->
+<!-- *************** -->
+
+<!-- Emphasize -->
+<!ELEMENT strong (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT emph   (#PCDATA | %Inline.phrase;)*>
+
+<!-- small caps -->
+<!ELEMENT sc (#PCDATA | %Inline.phrase;)*>
+
+<!-- fonts -->
+<!ELEMENT i  (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT b  (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT tt (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT r  (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT notfixedwidth (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT titlefont   (#PCDATA | %Inline.phrase;)*>
+
+<!-- markup -->
+<!ELEMENT code    (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT command (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT env     (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT file    (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT option  (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT samp    (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT dfn     (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT cite    (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT key     (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT kbd     (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT var     (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT url     (#PCDATA | %Inline.phrase;)*>
+
+<!ELEMENT acronym (acronymword, acronymdesc?)>
+<!ELEMENT acronymword (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT acronymdesc (#PCDATA | %Inline.phrase;)*>
+
+<!ELEMENT abbrev (abbrevword, abbrevdesc?)>
+<!ELEMENT abbrevword (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT abbrevdesc (#PCDATA | %Inline.phrase;)*>
+
+<!-- math -->
+<!ELEMENT math    (#PCDATA | %Inline.phrase;)*>
+
+<!-- reference -->
+<!ELEMENT anchor EMPTY>
+<!ATTLIST anchor
+          name CDATA #IMPLIED>
+
+<!ELEMENT xref (xrefnodename | xrefinfoname | xrefinfofile
+                | xrefprintedname | xrefprinteddesc)*>
+<!ELEMENT xrefnodename    (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT xrefinfoname    (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT xrefinfofile    (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT xrefprintedname (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT xrefprinteddesc (#PCDATA | %Inline.phrase;)*>
+
+<!ELEMENT inforef (inforefnodename | inforefrefname | inforefinfoname)*>
+<!ELEMENT inforefnodename (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT inforefrefname  (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT inforefinfoname (#PCDATA | %Inline.phrase;)*>
+
+<!ELEMENT indexterm (#PCDATA | %Inline.phrase;)*>
+<!ATTLIST indexterm
+          index CDATA #IMPLIED>
+
+<!ELEMENT email (emailaddress, emailname?)>
+<!ELEMENT emailaddress (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT emailname (#PCDATA | %Inline.phrase;)*>
+
+<!ELEMENT uref (urefurl, urefdesc?, urefreplacement?)>
+<!ELEMENT urefurl         (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT urefdesc        (#PCDATA | %Inline.phrase;)*>
+<!ELEMENT urefreplacement (#PCDATA | %Inline.phrase;)*>
+
+<!ELEMENT footnote (para)>
+
+
+<!ELEMENT neos      EMPTY>
+
+<!ENTITY tex        "TeX">        <!-- Should become an element. -->
+<!ENTITY latex      "LaTeX">      <!-- Should become an element. -->
+<!ENTITY ellipsis   "&#x2026;">
+<!ENTITY lt         "&#x3c;">
+<!ENTITY gt         "&#x3e;">
+<!ENTITY bullet     "&#x2022;">
+<!ENTITY copyright  "&#xa9;">
+<!ENTITY registered "&#xae;">
+<!ENTITY euro       "&#x20ac;">
+<!ENTITY pounds     "&#xa3;">
+<!ENTITY minus      "&#x2212;">
+<!ENTITY linebreak  "&#xa;">      <!-- Should become an element. -->
+<!ENTITY space      " ">          <!-- Should become an element. -->
+<!ENTITY dots       "&#x2026;<neos/>">
+<!ENTITY enddots    "&#x2026;">
+<!ENTITY amp        "&#x26;">
+<!ENTITY ldquo      "&#x201c;">
+<!ENTITY rdquo      "&#x201d;">
+<!ENTITY mdash      "&#x2014;">
+<!ENTITY ndash      "&#x2013;">
+<!ENTITY period     ".<neos/>">
+<!ENTITY eosperiod  ".">
+<!ENTITY quest      "?<neos/>">
+<!ENTITY eosquest   "?">
+<!ENTITY excl       "!<neos/>">
+<!ENTITY eosexcl    "!">
+
+<!ENTITY auml "&#xe4;">
+<!ENTITY ouml "&#xf6;">
+<!ENTITY uuml "&#xfc;">
+<!ENTITY Auml "&#xc4;">
+<!ENTITY Ouml "&#xd6;">
+<!ENTITY Uuml "&#xdc;">
+<!ENTITY Euml "&#xcb;">
+<!ENTITY euml "&#xeb;">
+<!ENTITY Iuml "&#xcf;">
+<!ENTITY iuml "&#xef;">
+<!ENTITY yuml "&#xff;">
+<!ENTITY uml  "&#xa8;">
+
+<!ENTITY Aacute "&#xc1;">
+<!ENTITY Eacute "&#xc9;">
+<!ENTITY Iacute "&#xcd;">
+<!ENTITY Oacute "&#xd3;">
+<!ENTITY Uacute "&#xda;">
+<!ENTITY Yacute "&#xdd;">
+<!ENTITY aacute "&#xe1;">
+<!ENTITY eacute "&#xe9;">
+<!ENTITY iacute "&#xed;">
+<!ENTITY oacute "&#xf3;">
+<!ENTITY uacute "&#xfa;">
+<!ENTITY yacute "&#xfd;">
+
+<!ENTITY ccedil "&#xe7;">
+<!ENTITY Ccedil "&#xc7;">
+
+<!ENTITY Acirc "&#xc2;">
+<!ENTITY Ecirc "&#xca;">
+<!ENTITY Icirc "&#xc3;">
+<!ENTITY Ocirc "&#xd4;">
+<!ENTITY Ucirc "&#xdb;">
+<!ENTITY acirc "&#xe2;">
+<!ENTITY ecirc "&#xea;">
+<!ENTITY icirc "&#xee;">
+<!ENTITY ocirc "&#xf4;">
+<!ENTITY ucirc "&#xfb;">
+
+<!ENTITY Agrave "&#xc0;">
+<!ENTITY Egrave "&#xc8;">
+<!ENTITY Igrave "&#xcc;">
+<!ENTITY Ograve "&#xd2;">
+<!ENTITY Ugrave "&#xd9;">
+<!ENTITY agrave "&#xe0;">
+<!ENTITY egrave "&#xe8;">
+<!ENTITY igrave "&#xec;">
+<!ENTITY ograve "&#xf2;">
+<!ENTITY ugrave "&#xf9;">
+
+<!ENTITY Atilde "&#xc3;">
+<!ENTITY Ntilde "&#xd1;">
+<!ENTITY Otilde "&#xd5;">
+<!ENTITY atilde "&#xe3;">
+<!ENTITY ntilde "&#xf1;">
+<!ENTITY otilde "&#xf5;">
+
+<!ENTITY oslash "&#xf8;">
+<!ENTITY Oslash "&#xd8;">
+
+<!ENTITY ordm "&#xba;">
+<!ENTITY ordf "&#xaa;">
+
+<!ENTITY iexcl "&#xa1;">
+<!ENTITY pound "&#xa3;">
+<!ENTITY iquest "&#xbf;">
+<!ENTITY AElig "&#xc6;">
+<!ENTITY aelig "&#xe6;">
+<!ENTITY OElig "&#x152;">
+<!ENTITY oelig "&#x153;">
+<!ENTITY Aring "&#xc5;">
+<!ENTITY aring "&#xe5;">
+<!ENTITY szlig "&#xdf;">
+
+<!ENTITY macr "&#xaf;">
+
+
+<!-- fixxme: not yet classified -->
+
+<!ELEMENT sp (#PCDATA)>
+<!ATTLIST sp
+          lines CDATA #IMPLIED>
+<!ELEMENT printindex (#PCDATA)>
+
diff --git a/gnu/usr.bin/texinfo/util/texinfo.xsl b/gnu/usr.bin/texinfo/util/texinfo.xsl
new file mode 100644
index 00000000000..201ae7f5396
--- /dev/null
+++ b/gnu/usr.bin/texinfo/util/texinfo.xsl
@@ -0,0 +1,242 @@
+<?xml version='1.0'?>
+<!-- $Id: texinfo.xsl,v 1.1.1.1 2006/07/17 16:03:49 espie Exp $ -->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version="1.0">
+
+<xsl:output method="html" indent="yes"/>
+
+<!-- root rule -->
+<xsl:template match="/">
+   <html>
+    <head><title>
+     <xsl:apply-templates select="TEXINFO/SETTITLE" mode="head"/>
+    </title></head>
+     <body bgcolor="#FFFFFF"><xsl:apply-templates/>
+</body></html>
+</xsl:template>
+
+
+<xsl:template match="TEXINFO">
+  <xsl:apply-templates/>
+</xsl:template>
+
+
+<xsl:template match="TEXINFO/SETFILENAME">
+</xsl:template>
+
+<xsl:template match="TEXINFO/SETTITLE" mode="head">
+  <xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template match="TEXINFO/SETTITLE">
+  <h1><xsl:apply-templates/></h1>
+</xsl:template>
+
+
+<xsl:template match="TEXINFO/DIRCATEGORY">
+</xsl:template>
+
+<xsl:template match="//PARA">
+  <p><xsl:apply-templates/></p>
+</xsl:template>
+
+<xsl:template match="//EMPH">
+  <i><xsl:apply-templates/></i>
+</xsl:template>
+
+<!-- The node -->
+<xsl:template match="TEXINFO/NODE">
+ <hr/>
+ <p>
+ <xsl:apply-templates select="NODENAME" mode="select"/>
+ <xsl:apply-templates select="NODEPREV" mode="select"/>
+ <xsl:apply-templates select="NODEUP" mode="select"/>
+ <xsl:apply-templates select="NODENEXT" mode="select"/>
+ <xsl:apply-templates/>
+  <h2>Footnotes</h2>
+  <ol>
+  <xsl:apply-templates select=".//FOOTNOTE" mode="footnote"/>
+   </ol>
+ </p>
+</xsl:template>
+
+<xsl:template match="TEXINFO/NODE/NODENAME" mode="select">
+<h2>
+ <a>
+ <xsl:attribute name="name">
+  <xsl:apply-templates/>
+ </xsl:attribute>
+ <xsl:apply-templates/>
+ </a>
+</h2>
+</xsl:template>
+
+<xsl:template match="TEXINFO/NODE/NODENAME"/>
+
+
+<xsl:template match="TEXINFO/NODE/NODEPREV" mode="select">
+ [ <b>Previous: </b>
+ <a>
+ <xsl:attribute name="href">
+  <xsl:text>#</xsl:text>
+  <xsl:apply-templates/>
+ </xsl:attribute>
+ <xsl:apply-templates/>
+ </a> ]
+</xsl:template>
+
+<xsl:template match="TEXINFO/NODE/NODEPREV"/>
+	
+<xsl:template match="TEXINFO/NODE/NODEUP" mode="select">
+ [ <b>Up: </b>
+ <a>
+ <xsl:attribute name="href">
+  <xsl:text>#</xsl:text>
+  <xsl:apply-templates/>
+ </xsl:attribute>
+ <xsl:apply-templates/>
+ </a> ]
+</xsl:template>
+
+<xsl:template match="TEXINFO/NODE/NODEUP"/>
+
+<xsl:template match="TEXINFO/NODE/NODENEXT" mode="select">
+ [ <b>Next: </b>
+ <a>
+ <xsl:attribute name="href">
+  <xsl:text>#</xsl:text>
+  <xsl:apply-templates/>
+ </xsl:attribute>
+ <xsl:apply-templates/>
+ </a> ]
+</xsl:template>
+
+<xsl:template match="TEXINFO/NODE/NODENEXT"/>
+
+<!-- Menu -->
+<xsl:template match="//MENU">
+ <h3>Menu</h3>
+ <xsl:apply-templates/>
+</xsl:template> 
+
+<xsl:template match="//MENU/MENUENTRY">
+ <a>
+ <xsl:attribute name="href">
+  <xsl:text>#</xsl:text>
+  <xsl:apply-templates select="MENUNODE"/>
+ </xsl:attribute>
+ <xsl:apply-templates select="MENUTITLE"/>
+ </a>: 
+ <xsl:apply-templates select="MENUCOMMENT"/>
+ <br/>
+</xsl:template>
+
+<xsl:template match="//MENU/MENUENTRY/MENUNODE">
+ <xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template match="//MENU/MENUENTRY/MENUTITLE">
+ <xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template match="//MENU/MENUENTRY/MENUCOMMENT">
+ <xsl:apply-templates mode="menucomment"/>
+</xsl:template>
+
+<xsl:template match="PARA" mode="menucomment">
+ <xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template match="//PARA">
+ <p><xsl:apply-templates/></p>
+</xsl:template>
+
+<!-- LISTS -->
+<xsl:template match="//ITEMIZE">
+ <ul>
+  <xsl:apply-templates/>
+ </ul>
+</xsl:template>
+
+<xsl:template match="//ITEMIZE/ITEM">
+ <li>
+  <xsl:apply-templates/>
+ </li>
+</xsl:template>
+
+<xsl:template match="//ENUMERATE">
+ <ol>
+  <xsl:apply-templates/>
+ </ol>
+</xsl:template>
+
+<xsl:template match="//ENUMERATE/ITEM">
+ <li>
+  <xsl:apply-templates/>
+ </li>
+</xsl:template>
+
+<!-- INLINE -->
+<xsl:template match="//CODE">
+ <tt>
+  <xsl:apply-templates/>
+ </tt>
+</xsl:template>
+
+<xsl:template match="//DFN">
+ <i><b>
+  <xsl:apply-templates/>
+ </b></i>
+</xsl:template>
+
+<xsl:template match="//STRONG">
+ <b>
+  <xsl:apply-templates/>
+ </b>
+</xsl:template>
+
+<xsl:template match="//CENTER">
+ <center>
+  <xsl:apply-templates/>
+ </center>
+</xsl:template>
+
+<xsl:template match="//VAR">
+ <i>
+  <xsl:apply-templates/>
+ </i>
+</xsl:template>
+
+<xsl:template match="//KBD">
+ <tt>
+  <xsl:apply-templates/>
+ </tt>
+</xsl:template>
+
+<xsl:template match="//KEY">
+ <b>
+  <xsl:apply-templates/>
+ </b>
+</xsl:template>
+
+<!-- BLOCKS -->
+<xsl:template match="//DISPLAY">
+ <pre>
+  <xsl:apply-templates/>
+ </pre>
+</xsl:template>
+
+
+<!-- INDEX -->
+<xsl:template match="//INDEXTERM">
+</xsl:template>
+
+<!-- FOOTNOTE -->
+<xsl:template match="//FOOTNOTE">
+</xsl:template>
+
+<xsl:template match="//FOOTNOTE" mode="footnote">
+ <li><xsl:apply-templates/></li>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/gnu/usr.bin/texinfo/util/txitextest b/gnu/usr.bin/texinfo/util/txitextest
new file mode 100755
index 00000000000..afd2521ebd0
--- /dev/null
+++ b/gnu/usr.bin/texinfo/util/txitextest
@@ -0,0 +1,77 @@
+#!/bin/sh
+# $Id: txitextest,v 1.1.1.1 2006/07/17 16:03:51 espie Exp $
+# Test texinfo.tex changes by running various manuals through with an
+# old version, saving the .ps result from dvips, doing the same with a
+# new version, and comparing.  Idea from Stepan Kasal.
+# 
+# Another option is to run the manuals all the way through using
+# texi2dvi, which tests in another way.
+
+tsrc=/u/texinfo/src
+PATH=$tsrc/util:$PATH
+
+tdoc=$tsrc/doc
+default_manuals="$tdoc/texinfo.txi $tdoc/info.texi $tdoc/info-stnd.texi"
+
+olddir=$HOME/gnu/src/gnulib/config
+newdir=$tdoc
+tempdir=/u/texinfo/@tests/testdir
+full=false
+manuals=
+
+while test $# -gt 0; do
+  case $1 in
+  --f*) full=true;;
+  --o*) shift; olddir="$1";;
+  --n*) shift; newdir="$1";;
+  --t*) shift; tempdir="$1";;
+  -*) echo "$0: unknown option \`$1'." >&2; exit 1;;
+  *) manuals="$manuals $1";;
+  esac
+  shift
+done
+
+test -z "$manuals" && manuals=$default_manuals
+initial_dir=`pwd`
+
+cd $tempdir || exit 1
+rm -f *
+
+run_tex() \
+{
+  TEXINPUTS=.:$mandir: tex $manual \
+  || { echo "tex $manual failed." >&2; exit 1; }
+}
+
+for manual in $manuals; do
+  mandir=`dirname $manual`
+  test $mandir = . && mandir=$initial_dir
+  manual_base=`basename "$manual" | sed 's/\.[^.]*$//'`
+  
+  rm -f $manual_base.* texinfo.tex
+  ln -s $newdir/texinfo.tex texinfo.tex
+
+  if $full; then
+    # instead of comparing, do full test of just the new texinfo.tex.
+    echo "$0: testing $manual_base... (tex)"
+    texi2dvi $manual || { echo "texi2dvi $manual failed." >&2; exit 1; }
+    echo "$0: testing $manual_base... (pdf)"
+    texi2dvi --pdf $manual \
+    || { echo "texi2dvi --pdf $manual failed." >&2; exit 1; }
+   
+  else
+    echo "$0: testing $manual_base... (new)"
+    run_tex
+    dvips $manual_base -o || exit 1
+    mv $manual_base.ps new.$manual_base.ps
+
+    echo "$0: testing $manual_base... (old)"
+    rm -f $manual_base.* texinfo.tex
+    ln -s $olddir/texinfo.tex texinfo.tex
+    run_tex
+    dvips $manual_base -o || exit 1
+    mv $manual_base.ps old.$manual_base.ps
+
+    diff -U0 old.$manual_base.ps new.$manual_base.ps
+  fi
+done