From: Don Armstrong <don@donarmstrong.com>
Date: Sun, 1 Jul 2012 17:58:09 +0000 (-0700)
Subject: apply Julian's patch to fix install-info warnings
X-Git-Tag: debian/2.16.0-1_exp+1~42
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=refs%2Fheads%2Fbugs%2F567849;p=lilypond.git

apply Julian's patch to fix install-info warnings
---

diff --git a/Documentation/changes.tely b/Documentation/changes.tely
index babd796462..a80e85f22b 100644
--- a/Documentation/changes.tely
+++ b/Documentation/changes.tely
@@ -29,6 +29,11 @@ See user manual, \NAME\
 @end macro
 
 
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
+* LilyPond Changes: (lilypond-changes).   Changes to recent versions.
+@end direntry
+
 @documentencoding utf-8
 @documentlanguage en
 @afourpaper
diff --git a/Documentation/contributor.texi b/Documentation/contributor.texi
index 26b3a26fbb..fea04bd8e1 100644
--- a/Documentation/contributor.texi
+++ b/Documentation/contributor.texi
@@ -13,6 +13,11 @@
 @documentlanguage en
 @afourpaper
 
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
+* LilyPond Contributor Guide: (lilypond-contributor).  Technical issues and policies for contributors.
+@end direntry
+
 @macro manualIntro
 This manual documents contributing to LilyPond version
 @version{}.  It discusses technical issues and policies that
diff --git a/Documentation/cs/learning.tely b/Documentation/cs/learning.tely
index ddf058918f..8fb1e47977 100755
--- a/Documentation/cs/learning.tely
+++ b/Documentation/cs/learning.tely
@@ -12,6 +12,11 @@
 @settitle Příručka k učení se
 @afourpaper
 
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
+* Příručka LilyPond k učení se: (lilypond-learning).  Začátek je zde.
+@end direntry
+
 @macro manualIntro
 Tento soubor poskytuje úvod pro LilyPond verze
 @version{}.
diff --git a/Documentation/cs/web.texi b/Documentation/cs/web.texi
index d43cb374ce..a4e1fe242f 100644
--- a/Documentation/cs/web.texi
+++ b/Documentation/cs/web.texi
@@ -58,7 +58,6 @@ License''.
 @c expected to be found in lilypond/ subdirectory.
 @dircategory GNU LilyPond --- the music typesetter
 @direntry
-* Příručka LilyPond k učení se: (lilypond-learning).  Začátek je zde.
 * Slovníček: (music-glossary).               Překlad pojmů z angličtiny do dalších řečí.
 * Příručka pro zápis not v LilyPondu: (lilypond-notation).                           Příručka pro zápis not v LilyPondu.
 * Úryvky LilyPondu: (lilypond-snippets).         Mnoho triků, rad a příkladů.
diff --git a/Documentation/de/essay.tely b/Documentation/de/essay.tely
index fa64560f7b..6e63bd3a7a 100644
--- a/Documentation/de/essay.tely
+++ b/Documentation/de/essay.tely
@@ -11,6 +11,10 @@
 @documentencoding UTF-8
 @documentlanguage de
 
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
+* LilyPond automatischen Musiksatz: (lilypond-essay).  Automatischen Musiksatz von LilyPond.
+@end direntry
 
 @c Translators: Till Paala
 
diff --git a/Documentation/de/extending.tely b/Documentation/de/extending.tely
index 059e71df31..c33c1ee66e 100644
--- a/Documentation/de/extending.tely
+++ b/Documentation/de/extending.tely
@@ -13,6 +13,11 @@
 @documentlanguage de
 @afourpaper
 
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
+* LilyPond Erweiterung: (lilypond-extending).  Wie man die Funktionalität von LilyPond erweitern kann.
+@end direntry
+
 @c Translators: Till Paala
 
 @macro manualIntro
diff --git a/Documentation/de/learning.tely b/Documentation/de/learning.tely
index 82617cdc61..b3c96fd694 100644
--- a/Documentation/de/learning.tely
+++ b/Documentation/de/learning.tely
@@ -12,6 +12,11 @@
 @settitle LilyPond Handbuch zum Lernen
 @afourpaper
 
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
+* LilyPond Handbuch zum Lernen: (lilypond-learning).  Hier beginnen.
+@end direntry
+
 @macro manualIntro
 Diese Datei stellt eine Einleitung für LilyPond Version
 @version{} zur Verfügung.
diff --git a/Documentation/de/notation.tely b/Documentation/de/notation.tely
index aec979e5b7..d00fae5bef 100644
--- a/Documentation/de/notation.tely
+++ b/Documentation/de/notation.tely
@@ -11,6 +11,11 @@
 @setfilename lilypond.info
 @settitle LilyPond Benutzerhandbuch
 
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
+* LilyPond Notationshandbuch: (lilypond-notation).                           LilyPond Notationshandbuch.
+@end direntry
+
 @c Translators: Till Paala
 
 @afourpaper
diff --git a/Documentation/de/usage.tely b/Documentation/de/usage.tely
index 84da2438e7..2f577dc178 100644
--- a/Documentation/de/usage.tely
+++ b/Documentation/de/usage.tely
@@ -12,7 +12,17 @@
 @settitle GNU LilyPond Programmbenutzung
 @afourpaper
 
-
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
+* LilyPond Application Usage: (lilypond-usage). Programme installieren und benutzen.
+* lilypond: (lilypond-usage)LilyPond starten.  Das LilyPond-Programm aufrufen.
+* abc2ly: (lilypond-usage)abc2ly starten.      ABC-Notation importieren.
+* convert-ly: (lilypond-usage)Dateien mit convert-ly aktualisieren. Ältere LilyPond-Versionen
+* etf2ly: (lilypond-usage)etf2ly starten.      Finale-Dateien importieren.
+* lilypond-book: (lilypond-usage)LilyPond-book. Text und Musik integrieren.
+* midi2ly: (lilypond-usage)midi2ly starten.    MIDI importieren.
+* musicxml2ly: (lilypond-usage)musicxml2ly starten.  MusicXML-Dateien importieren.
+@end direntry
 
 @macro manualIntro
 Diese Datei erklärt, wie man die Programme, die mit LilyPond
diff --git a/Documentation/de/web.texi b/Documentation/de/web.texi
index d6fcc28f77..1b46a9189c 100644
--- a/Documentation/de/web.texi
+++ b/Documentation/de/web.texi
@@ -58,20 +58,10 @@ License''.
 @c expected to be found in lilypond/ subdirectory.
 @dircategory GNU LilyPond --- the music typesetter
 @direntry
-* LilyPond Handbuch zum Lernen: (lilypond-learning).  Hier beginnen.
 * Glossar: (music-glossary).               Begriffsübersetzungen von Englisch in andere Sprachen.
-* LilyPond Notationshandbuch: (lilypond-notation).                           LilyPond Notationshandbuch.
 * LilyPond Schnipsel: (lilypond-snippets).         Viele Tricks, Tipps und Beispiele.
 * LilyPond Referenz der Interna: (lilypond-internals).  Definitionen zum Einstellen.
-* LilyPond Application Usage: (lilypond-usage). Programme installieren und benutzen.
 * LilyPond Webseite: (lilypond-web).    Vorschau der neuen Webseite.
-* lilypond: (lilypond-usage)LilyPond starten.  Das LilyPond-Programm aufrufen.
-* abc2ly: (lilypond-usage)abc2ly starten.      ABC-Notation importieren.
-* convert-ly: (lilypond-usage)Dateien mit convert-ly aktualisieren. Ältere LilyPond-Versionen
-* etf2ly: (lilypond-usage)etf2ly starten.      Finale-Dateien importieren.
-* lilypond-book: (lilypond-usage)LilyPond-book. Text und Musik integrieren.
-* midi2ly: (lilypond-usage)midi2ly starten.    MIDI importieren.
-* musicxml2ly: (lilypond-usage)musicxml2ly starten.  MusicXML-Dateien importieren.
 @end direntry
 
 
diff --git a/Documentation/es/changes.tely b/Documentation/es/changes.tely
index d945d1dd2b..224816ac70 100644
--- a/Documentation/es/changes.tely
+++ b/Documentation/es/changes.tely
@@ -36,6 +36,11 @@ Véase el manual del usuario, \NAME\
 @end macro
 
 
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
+* LilyPond Changes: (lilypond-changes).   Funcionalidades nuevas.
+@end direntry
+
 @documentencoding UTF-8
 @documentlanguage es
 @afourpaper
diff --git a/Documentation/es/essay.tely b/Documentation/es/essay.tely
index be0e9f6a07..72f1963f79 100644
--- a/Documentation/es/essay.tely
+++ b/Documentation/es/essay.tely
@@ -13,6 +13,11 @@
 @documentlanguage es
 @afourpaper
 
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
+* Las funciones de grabado musical automatizado: (lilypond-essay).  Las funciones de grabado musical automatizado dentro de LilyPond.
+@end direntry
+
 @c translator: Francisco Vila
 
 @macro manualIntro
diff --git a/Documentation/es/extending.tely b/Documentation/es/extending.tely
index 97fad5ad72..9f09ee13d1 100644
--- a/Documentation/es/extending.tely
+++ b/Documentation/es/extending.tely
@@ -13,6 +13,11 @@
 @documentlanguage es
 @afourpaper
 
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
+* LilyPond Extensión: (lilypond-extending).  Extender las funcionalidades de LilyPond.
+@end direntry
+
 @c translator: Francisco Vila
 
 @macro manualIntro
diff --git a/Documentation/es/learning.tely b/Documentation/es/learning.tely
index 6241e00812..19e54a7416 100644
--- a/Documentation/es/learning.tely
+++ b/Documentation/es/learning.tely
@@ -13,6 +13,11 @@
 @documentlanguage es
 @afourpaper
 
+@dircategory GNU LilyPond: el tipografiador de música
+@direntry
+* Manual de aprendizaje de LilyPond: (lilypond-learning).  Comience por aquí.
+@end direntry
+
 @macro manualIntro
 Este archivo ofrece una introducción al programa LilyPond versión
 @version{}.
diff --git a/Documentation/es/notation.tely b/Documentation/es/notation.tely
index 8f942d7bb5..ef95ba9c9e 100644
--- a/Documentation/es/notation.tely
+++ b/Documentation/es/notation.tely
@@ -13,6 +13,11 @@
 @documentlanguage es
 @afourpaper
 
+@dircategory GNU LilyPond: el tipografiador de música
+@direntry
+* LilyPond: (lilypond-notation).                      Referencia de la notación con LilyPond.
+@end direntry
+
 @macro manualIntro
 Este manual ofrece una referencia para toda la notación musical que se
 puede producir con LilyPond versión @version{}.  Da por sentado que el
diff --git a/Documentation/es/usage.tely b/Documentation/es/usage.tely
index 836db06069..d0d9b24934 100644
--- a/Documentation/es/usage.tely
+++ b/Documentation/es/usage.tely
@@ -13,6 +13,18 @@
 @documentlanguage es
 @afourpaper
 
+@dircategory GNU LilyPond: el tipografiador de música
+@direntry
+* Utilización del programa: (lilypond-usage). Instalación y ejecución de las aplicaciones.
+* lilypond: (lilypond-usage)Ejecutar LilyPond.      Invocar el programa LilyPond.
+* abc2ly: (lilypond-usage)Invocación de abc2ly.      Importación de ABC.
+* convert-ly: (lilypond-usage)Actualización de archivos mediante convert-ly. Versiones antiguas de LilyPond.
+* etf2ly: (lilypond-usage)Invocar etf2ly.      Importación de Finale.
+* lilypond-book: (lilypond-usage)LilyPond-book. Intergrar texto y música.
+* midi2ly: (lilypond-usage)Invocar midi2ly.    Importación de MIDI.
+* musicxml2ly: (lilypond-usage)Invocar musicxml2ly.  Importación de MusicXML.
+@end direntry
+
 @c Translators: Francisco Vila
 
 @macro manualIntro
diff --git a/Documentation/es/web.texi b/Documentation/es/web.texi
index 6759fdb1ad..aa44c75f72 100644
--- a/Documentation/es/web.texi
+++ b/Documentation/es/web.texi
@@ -57,20 +57,10 @@ Free Documentation License''.
 @c expected to be found in lilypond/ subdirectory.
 @dircategory GNU LilyPond: el tipografiador de música
 @direntry
-* Manual de aprendizaje de LilyPond: (lilypond-learning).  Comience por aquí.
 * Glosario musical: (music-glossary).                 Para usuarios de habla no inglesa.
-* LilyPond: (lilypond-notation).                      Referencia de la notación con LilyPond.
 * Fragmentos de código de LilyPond: (lilypond-snippets).         Consejos, trucos y ejemplos cortos.
 * Referencia de funcionamiento interno: (lilypond-internals).  Definiciones para la construcción de trucos.
-* Utilización del programa: (lilypond-usage). Instalación y ejecución de las aplicaciones.
 * Página web: (lilypond-web).    Vista previa de la nueva página.
-* lilypond: (lilypond-usage)Ejecutar LilyPond.      Invocar el programa LilyPond.
-* abc2ly: (lilypond-usage)Invocación de abc2ly.      Importación de ABC.
-* convert-ly: (lilypond-usage)Actualización de archivos mediante convert-ly. Versiones antiguas de LilyPond.
-* etf2ly: (lilypond-usage)Invocar etf2ly.      Importación de Finale.
-* lilypond-book: (lilypond-usage)LilyPond-book. Intergrar texto y música.
-* midi2ly: (lilypond-usage)Invocar midi2ly.    Importación de MIDI.
-* musicxml2ly: (lilypond-usage)Invocar musicxml2ly.  Importación de MusicXML.
 @end direntry
 
 
diff --git a/Documentation/essay.tely b/Documentation/essay.tely
index bb6d7b9e4f..f785d9ab63 100644
--- a/Documentation/essay.tely
+++ b/Documentation/essay.tely
@@ -13,6 +13,11 @@
 @documentlanguage en
 @afourpaper
 
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
+* LilyPond Engraving Functions: (lilypond-essay).  Automatic engraving functions within LilyPond.
+@end direntry
+
 @macro manualIntro
 This essay discusses automatic music engraving functions within
 LilyPond version @version{}.
diff --git a/Documentation/extending.tely b/Documentation/extending.tely
index 684f7216c3..e001ce9f06 100644
--- a/Documentation/extending.tely
+++ b/Documentation/extending.tely
@@ -13,6 +13,11 @@
 @documentlanguage en
 @afourpaper
 
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
+* LilyPond Extending: (lilypond-extending).  How to extend LilyPond's functionality.
+@end direntry
+
 @macro manualIntro
 This file explains how to extend the functionality of
 LilyPond version @version{}.
diff --git a/Documentation/fr/essay.tely b/Documentation/fr/essay.tely
index f06b103b25..6351040a8e 100644
--- a/Documentation/fr/essay.tely
+++ b/Documentation/fr/essay.tely
@@ -16,6 +16,11 @@
 @documentlanguage fr
 @afourpaper
 
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
+* La gravure musicale automatisée: (lilypond-essay).  La gravure musicale automatisée de LilyPond.
+@end direntry
+
 @macro manualIntro
 Cet essai traite de la gravure de la musique et de la notation assistée
 par ordinateur à l'aide de LilyPond version @version{}.
diff --git a/Documentation/fr/learning.tely b/Documentation/fr/learning.tely
index 0caa86178b..2403f732c6 100644
--- a/Documentation/fr/learning.tely
+++ b/Documentation/fr/learning.tely
@@ -13,6 +13,11 @@
 
 @afourpaper
 
+@dircategory GNU LilyPond -- le typographe de musique
+@direntry
+* Manuel d'initiation à LilyPond: (lilypond-learning).       Les premiers pas.
+@end direntry
+
 @macro manualIntro
 Ce document constitue le manuel d'initiation à GNU LilyPond
 @version{}.
diff --git a/Documentation/fr/notation.tely b/Documentation/fr/notation.tely
index 0018eac716..18b6e7edcb 100644
--- a/Documentation/fr/notation.tely
+++ b/Documentation/fr/notation.tely
@@ -13,6 +13,11 @@
 @documentlanguage fr
 @afourpaper
 
+@dircategory GNU LilyPond -- le typographe de musique
+@direntry
+* Manuel de notation: (lilypond-notation).                   Gravure de musique avec LilyPond.
+@end direntry
+
 @macro manualIntro
 Ce document constitue le manuel de notation de GNU LilyPond
 @version{}.  Sa lecture requiert une familiarité avec le contenu
diff --git a/Documentation/fr/usage.tely b/Documentation/fr/usage.tely
index d4e14102fa..472b6ca57a 100644
--- a/Documentation/fr/usage.tely
+++ b/Documentation/fr/usage.tely
@@ -13,6 +13,17 @@
 @documentlanguage fr
 @afourpaper
 
+@dircategory GNU LilyPond -- le typographe de musique
+@direntry
+* Manuel d'utilisation: (lilypond-usage).                    Installation et exécution des programmes.
+* abc2ly: (lilypond-usage) Lancement de abc2ly.              Import de fichier ABC.
+* convert-ly: (lilypond-usage) Mise à jour de fichiers.      Pour d'anciens fichiers LilyPond.
+* etf2ly: (lilypond-usage) Lancement de etf2ly.              Import de fichier Finale.
+* lilypond-book: (lilypond-usage) LilyPond-book.             Association musique-texte.
+* midi2ly: (lilypond-usage) Lancement de midi2ly.            Import de fichier MIDI.
+* musicxml2ly: (lilypond-usage) Lancement de musicxml2ly.    Import de fichier MusicXML.
+@end direntry
+
 @c Translators: John Mandereau, Jean-Charles Malahieude
 
 @macro manualIntro
diff --git a/Documentation/fr/web.texi b/Documentation/fr/web.texi
index 92701f936a..ddcd2e9714 100644
--- a/Documentation/fr/web.texi
+++ b/Documentation/fr/web.texi
@@ -59,19 +59,10 @@ License''.
 @c expected to be found in lilypond/ subdirectory.
 @dircategory GNU LilyPond -- le typographe de musique
 @direntry
-* Manuel d'initiation à LilyPond: (lilypond-learning).       Les premiers pas.
 * Glossaire musicologique: (music-glossary).                 Pour l'utilisateur non anglophone.
-* Manuel de notation: (lilypond-notation).                   Gravure de musique avec LilyPond.
 * Morceaux choisis de LilyPond: (lilypond-snippets).         Petits trucs, astuces et exemples.
 * Référence des propriétés internes: (lilypond-internals).   Définitions pour les retouches.
-* Manuel d'utilisation: (lilypond-usage).                    Installation et exécution des programmes.
 * LilyPond Website: (lilypond-web).                          Prévisualisation du site.
-* abc2ly: (lilypond-usage) Lancement de abc2ly.              Import de fichier ABC.
-* convert-ly: (lilypond-usage) Mise à jour de fichiers.      Pour d'anciens fichiers LilyPond.
-* etf2ly: (lilypond-usage) Lancement de etf2ly.              Import de fichier Finale.
-* lilypond-book: (lilypond-usage) LilyPond-book.             Association musique-texte.
-* midi2ly: (lilypond-usage) Lancement de midi2ly.            Import de fichier MIDI.
-* musicxml2ly: (lilypond-usage) Lancement de musicxml2ly.    Import de fichier MusicXML.
 @end direntry
 
 
diff --git a/Documentation/hu/learning.tely b/Documentation/hu/learning.tely
index af7864ae2c..f4abf82a0a 100644
--- a/Documentation/hu/learning.tely
+++ b/Documentation/hu/learning.tely
@@ -13,6 +13,11 @@
 @documentlanguage hu
 @afourpaper
 
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
+* Tankönyv: (lilypond-learning).  Itt kezdd az olvasást.
+@end direntry
+
 @c Translators: Harmath Dénes
 
 @macro manualIntro
diff --git a/Documentation/hu/usage.tely b/Documentation/hu/usage.tely
index 03c6277c7f..ff6083e9d9 100644
--- a/Documentation/hu/usage.tely
+++ b/Documentation/hu/usage.tely
@@ -13,6 +13,18 @@
 @documentlanguage hu
 @afourpaper
 
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
+* Használat: (lilypond-usage). Az alkalmazás használata.
+* lilypond: (lilypond-usage)A lilypond futtatása.      Kották szedése.
+* abc2ly: (lilypond-usage)Az abc2ly futtatása.      ABC fájlok importálása.
+* convert-ly: (lilypond-usage)A convert-ly futtatása. Konvertálás régebbi verziókról.
+* etf2ly: (lilypond-usage)Az etf2ly futtatása.      Finale fájlok importálása.
+* lilypond-book: (lilypond-usage)A lilypond-book futtatása. Szöveg és zene integrálása.
+* midi2ly: (lilypond-usage)A midi2ly futtatása.    MIDI fájlok importálása.
+* musicxml2ly: (lilypond-usage)A musicxml2ly futtatása.  MusicXML fájlok importálása.
+@end direntry
+
 @c translator: Team-hu
 
 @macro manualIntro
diff --git a/Documentation/hu/web.texi b/Documentation/hu/web.texi
index 857678b4a7..af6db5c453 100644
--- a/Documentation/hu/web.texi
+++ b/Documentation/hu/web.texi
@@ -59,20 +59,11 @@ License''.
 @c expected to be found in lilypond/ subdirectory.
 @dircategory GNU LilyPond --- the music typesetter
 @direntry
-* Tankönyv: (lilypond-learning).  Itt kezdd az olvasást.
 * Fogalomtár: (music-glossary).               Többnyelvű szószedet.
 * Kottaírás: (lilypond-notation).                           A kottaírás kézikönyve.
 * Kódrészletek: (lilypond-snippets).         Tippek, trükkök, példák.
 * Belső működés: (lilypond-internals).  A belső működés referenciája.
-* Használat: (lilypond-usage). Az alkalmazás használata.
 * Web: (lilypond-web).    A weboldal.
-* lilypond: (lilypond-usage)A lilypond futtatása.      Kották szedése.
-* abc2ly: (lilypond-usage)Az abc2ly futtatása.      ABC fájlok importálása.
-* convert-ly: (lilypond-usage)A convert-ly futtatása. Konvertálás régebbi verziókról.
-* etf2ly: (lilypond-usage)Az etf2ly futtatása.      Finale fájlok importálása.
-* lilypond-book: (lilypond-usage)A lilypond-book futtatása. Szöveg és zene integrálása.
-* midi2ly: (lilypond-usage)A midi2ly futtatása.    MIDI fájlok importálása.
-* musicxml2ly: (lilypond-usage)A musicxml2ly futtatása.  MusicXML fájlok importálása.
 @end direntry
 
 
diff --git a/Documentation/it/learning.tely b/Documentation/it/learning.tely
index 8506e46951..80daf93faa 100644
--- a/Documentation/it/learning.tely
+++ b/Documentation/it/learning.tely
@@ -13,6 +13,11 @@
 @documentlanguage it
 @afourpaper
 
+@dircategory GNU LilyPond --- il compositore tipografico di musica
+@direntry
+* Manuale di Apprendimento di LilyPond: (lilypond-learning).    Comincia da qui.
+@end direntry
+
 @macro manualIntro
 Questo file fornisce un'introduzione alla versione di LilyPond
 @version{}.
diff --git a/Documentation/it/usage.tely b/Documentation/it/usage.tely
index 08e4169431..47192fd0e8 100644
--- a/Documentation/it/usage.tely
+++ b/Documentation/it/usage.tely
@@ -13,6 +13,18 @@
 @documentlanguage it
 @afourpaper
 
+@dircategory GNU LilyPond --- il compositore tipografico di musica
+@direntry
+* Uso del Programma: (lilypond-usage).                    Istallazione e esecuzione delle applicazioni.
+* lilypond: (lilypond-usage)Eseguire lilypond.                  Invocare il programma LilyPond.
+* abc2ly: (lilypond-usage)Invocare abc2ly.                      Importare ABC.
+* convert-ly: (lilypond-usage)Aggiornare i file con convert-ly. Versioni precedenti di LilyPond.
+* etf2ly: (lilypond-usage)Invocare etf2ly.                      Importare Finale.
+* lilypond-book: (lilypond-usage)lilypond-book.                 Integrare testo e musica.
+* midi2ly: (lilypond-usage)Invocare midi2ly.                    Importare MIDI.
+* musicxml2ly: (lilypond-usage)Invocare musicxml2ly.            Importare MusicXML.
+@end direntry
+
 @c Translators: Federico Bruni
 @c Translation checkers: Luca Rossetto Casel
 
diff --git a/Documentation/it/web.texi b/Documentation/it/web.texi
index 2e9719de71..1e25fc4cdd 100644
--- a/Documentation/it/web.texi
+++ b/Documentation/it/web.texi
@@ -192,15 +192,7 @@ Distributions will want to install lilypond.info in postinstall, doing:
 * LilyPond: (lilypond-notation).                                Guida alla Notazione di LilyPond.
 * Frammenti di Codice di LilyPond: (lilypond-snippets).         Piccoli trucchi, consigli, e esempi.
 * Guida al Funzionamento Interno: (lilypond-internals).         Definizioni per le modifiche manuali.
-* Uso del Programma: (lilypond-application).                    Istallazione e esecuzione delle applicazioni.
 * Sito web: (lilypond-web).                                     Anteprima del nuovo sito.
-* lilypond: (lilypond-usage)Eseguire lilypond.                  Invocare il programma LilyPond.
-* abc2ly: (lilypond-usage)Invocare abc2ly.                      Importare ABC.
-* convert-ly: (lilypond-usage)Aggiornare i file con convert-ly. Versioni precedenti di LilyPond.
-* etf2ly: (lilypond-usage)Invocare etf2ly.                      Importare Finale.
-* lilypond-book: (lilypond-usage)lilypond-book.                 Integrare testo e musica.
-* midi2ly: (lilypond-usage)Invocare midi2ly.                    Importare MIDI.
-* musicxml2ly: (lilypond-usage)Invocare musicxml2ly.            Importare MusicXML.
 @end direntry
 
 
diff --git a/Documentation/ja/learning.tely b/Documentation/ja/learning.tely
index bdcff5494d..ee6e6535b4 100644
--- a/Documentation/ja/learning.tely
+++ b/Documentation/ja/learning.tely
@@ -13,6 +13,11 @@
 @documentlanguage ja
 @afourpaper
 
+@dircategory GNU LilyPond --- 楽譜譜刻プログラム
+@direntry
+* LilyPond 学習マニュアル: (lilypond-learning).        ここから始めてください。
+@end direntry
+
 @macro manualIntro
 このマニュアルは LilyPond バージョン @version{} の導入部です。
 @end macro
diff --git a/Documentation/ja/notation.tely b/Documentation/ja/notation.tely
index 572f63e6e1..3fec07e38f 100644
--- a/Documentation/ja/notation.tely
+++ b/Documentation/ja/notation.tely
@@ -12,6 +12,11 @@
 @documentlanguage ja
 @afourpaper
 
+@dircategory GNU LilyPond --- 楽譜譜刻プログラム
+@direntry
+* LilyPond: (lilypond-notation).                       LilyPond 記譜法リファレンス。
+@end direntry
+
 @macro manualIntro
 このマニュアルは LilyPond バージョン @version{} で提供される@c
 すべての記譜法についての参照を提供します。@c
diff --git a/Documentation/ja/usage.tely b/Documentation/ja/usage.tely
index 3091af4cc1..db39a20ae3 100644
--- a/Documentation/ja/usage.tely
+++ b/Documentation/ja/usage.tely
@@ -13,6 +13,19 @@
 @documentlanguage ja
 @afourpaper
 
+@dircategory GNU LilyPond --- 楽譜譜刻プログラム
+@direntry
+* LilyPond アプリケーション使用方法: (lilypond-usage). アプリケーションを@c
+インスールして、実行する方法。
+* lilypond: (lilypond-usage)lilypond を実行する.       LilyPond を呼び出す。
+* abc2ly: (lilypond-usage)abc2ly を呼び出す.           ABC をインポートする。
+* convert-ly: (lilypond-usage)convert-ly でファイルを更新する. 古い LilyPond バージョン。
+* etf2ly: (lilypond-usage)etf2ly を呼び出す.           Finale をインポートする。
+* lilypond-book: (lilypond-usage)lilypond-book.        文章と楽譜を統合する。
+* midi2ly: (lilypond-usage)midi2ly を呼び出す.         MIDI をインポートする。
+* musicxml2ly: (lilypond-usage)musicxml2ly を呼び出す. MusicXML をインポートする。
+@end direntry
+
 @macro manualIntro
 このマニュアルは LilyPond バージョン @version{} で配布される@c
 プログラムの実効方法について説明します。@c
diff --git a/Documentation/ja/web.texi b/Documentation/ja/web.texi
index 03ee564b39..2aceb97f42 100644
--- a/Documentation/ja/web.texi
+++ b/Documentation/ja/web.texi
@@ -55,22 +55,12 @@ GNU フリー文書利用許諾契約書バージョン 1.1 またはフリー 
 @c expected to be found in lilypond/ subdirectory.
 @dircategory GNU LilyPond --- 楽譜譜刻プログラム
 @direntry
-* LilyPond 学習マニュアル: (lilypond-learning).        ここから始めてください。
 * 音楽用語集: (music-glossary).                        非英語圏のユーザ向け。
-* LilyPond: (lilypond-notation).                       LilyPond 記譜法リファレンス。
 * LilyPond コード断片集: (lilypond-snippets).          ちょっとしたテクニック、@c
 TIPS、それに例。
 * LilyPond 内部リファレンス: (lilypond-internals).     調整するための定義。
-* LilyPond アプリケーション使用方法: (lilypond-usage). アプリケーションを@c
 インスールして、実行する方法。
 * LilyPond Web サイト: (lilypond-web).                 新しい Web サイトのプレビュー。
-* lilypond: (lilypond-usage)lilypond を実行する.       LilyPond を呼び出す。
-* abc2ly: (lilypond-usage)abc2ly を呼び出す.           ABC をインポートする。
-* convert-ly: (lilypond-usage)convert-ly でファイルを更新する. 古い LilyPond バージョン。
-* etf2ly: (lilypond-usage)etf2ly を呼び出す.           Finale をインポートする。
-* lilypond-book: (lilypond-usage)lilypond-book.        文章と楽譜を統合する。
-* midi2ly: (lilypond-usage)midi2ly を呼び出す.         MIDI をインポートする。
-* musicxml2ly: (lilypond-usage)musicxml2ly を呼び出す. MusicXML をインポートする。
 @end direntry
 
 
diff --git a/Documentation/learning.tely b/Documentation/learning.tely
index 65b9addbe2..6b5ed3f96c 100644
--- a/Documentation/learning.tely
+++ b/Documentation/learning.tely
@@ -13,6 +13,11 @@
 @documentlanguage en
 @afourpaper
 
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
+* LilyPond Learning Manual: (lilypond-learning).  Start here.
+@end direntry
+
 @macro manualIntro
 This file provides an introduction to LilyPond version
 @version{}.
diff --git a/Documentation/music-glossary.tely b/Documentation/music-glossary.tely
index d822de1dfe..7b33b47e54 100644
--- a/Documentation/music-glossary.tely
+++ b/Documentation/music-glossary.tely
@@ -6,6 +6,11 @@
 @documentlanguage en
 @afourpaper
 
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
+* Music Glossary: (music-glossary).               For non-English users.
+@end direntry
+
 @macro manualIntro
 This glossary provides definitions and translations of musical
 terms used in the documentation manuals for LilyPond version
diff --git a/Documentation/nl/learning.tely b/Documentation/nl/learning.tely
index 89eb6e8670..85bcc52faf 100644
--- a/Documentation/nl/learning.tely
+++ b/Documentation/nl/learning.tely
@@ -19,6 +19,11 @@
 @documentlanguage nl
 @afourpaper
 
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
+* LilyPond Learning Manual: (lilypond-learning).  Start here.
+@end direntry
+
 @macro manualIntro
 This file provides an introduction to LilyPond version
 @version{}.
diff --git a/Documentation/notation.tely b/Documentation/notation.tely
index 84297d59da..a406ce7e60 100644
--- a/Documentation/notation.tely
+++ b/Documentation/notation.tely
@@ -13,6 +13,11 @@
 @documentlanguage en
 @afourpaper
 
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
+* LilyPond: (lilypond-notation).                           LilyPond Notation Reference.
+@end direntry
+
 @macro manualIntro
 This manual provides a reference for all notation that can be
 produced with LilyPond version @version{}.  It assumes that
diff --git a/Documentation/snippets.tely b/Documentation/snippets.tely
index b44f4c5a90..441e1e4b50 100644
--- a/Documentation/snippets.tely
+++ b/Documentation/snippets.tely
@@ -6,6 +6,11 @@
 @documentlanguage en
 @afourpaper
 
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
+* LilyPond Snippets: (lilypond-snippets).         Short tricks, tips, and examples.
+@end direntry
+
 @macro manualIntro
 This document shows a selected set of LilyPond snippets from the
 @uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}
diff --git a/Documentation/usage.tely b/Documentation/usage.tely
index e2d2e7c3cd..7ee53467e3 100644
--- a/Documentation/usage.tely
+++ b/Documentation/usage.tely
@@ -13,6 +13,18 @@
 @documentlanguage en
 @afourpaper
 
+@dircategory GNU LilyPond --- the music typesetter
+@direntry
+* LilyPond Application Usage: (lilypond-usage). Installing and running applications.
+* lilypond: (lilypond-usage)Running lilypond.      Invoking the LilyPond program.
+* abc2ly: (lilypond-usage)Invoking abc2ly.      Importing ABC.
+* convert-ly: (lilypond-usage)Updating files with convert-ly. Older LilyPond versions.
+* etf2ly: (lilypond-usage)Invoking etf2ly.      Importing Finale.
+* lilypond-book: (lilypond-usage)lilypond-book. Integrating text and music.
+* midi2ly: (lilypond-usage)Invoking midi2ly.    Importing MIDI.
+* musicxml2ly: (lilypond-usage)Invoking musicxml2ly.  Importing MusicXML.
+@end direntry
+
 @macro manualIntro
 This file explains how to execute the programs distributed with
 LilyPond version @version{}.  In addition, it suggests some
diff --git a/Documentation/web.texi b/Documentation/web.texi
index 90d9f79251..94c0e72d99 100644
--- a/Documentation/web.texi
+++ b/Documentation/web.texi
@@ -56,20 +56,8 @@ License''.
 @c expected to be found in lilypond/ subdirectory.
 @dircategory GNU LilyPond --- the music typesetter
 @direntry
-* LilyPond Learning Manual: (lilypond-learning).  Start here.
-* Music Glossary: (music-glossary).               For non-English users.
-* LilyPond: (lilypond-notation).                           LilyPond Notation Reference.
-* LilyPond Snippets: (lilypond-snippets).         Short tricks, tips, and examples.
 * LilyPond Internals Reference: (lilypond-internals).  Definitions for tweaking.
-* LilyPond Application Usage: (lilypond-usage). Installing and running applications.
 * LilyPond Website: (lilypond-web).    Preview of new website.
-* lilypond: (lilypond-usage)Running lilypond.      Invoking the LilyPond program.
-* abc2ly: (lilypond-usage)Invoking abc2ly.      Importing ABC.
-* convert-ly: (lilypond-usage)Updating files with convert-ly. Older LilyPond versions.
-* etf2ly: (lilypond-usage)Invoking etf2ly.      Importing Finale.
-* lilypond-book: (lilypond-usage)lilypond-book. Integrating text and music.
-* midi2ly: (lilypond-usage)Invoking midi2ly.    Importing MIDI.
-* musicxml2ly: (lilypond-usage)Invoking musicxml2ly.  Importing MusicXML.
 @end direntry