Doc build: move info direntry to web.texi.

Since web.texi is the "general" manual, it makes more sense to have
it here.  notation.tely is now specifically the notation reference.

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index b4cac7e1357470c20e3e66d7597602b78927bb01..13f7d7ceb01495c14cf7e126e1ade3570eb53e28 100644 (file)
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -76,7 +76,7 @@ source-links = $(outdir)/source\
 HTML_PAGE_NAMES= translations index
 OUT_HTML_FILES += $(HTML_PAGE_NAMES:%=$(outdir)/%.html)
 
-MAIN_INFO_DOC = lilypond-notation
+MAIN_INFO_DOC = lilypond-web
 INFO_DOCS = lilypond-usage lilypond-changes lilypond-contributor lilypond-internals \
  lilypond-essay lilypond-learning lilypond-notation music-glossary \
  lilypond-web lilypond-extending

diff --git a/Documentation/notation.tely b/Documentation/notation.tely
index d11c6bb4421c0616754878f14893ec7356853ab5..8fff375a7ae52743ce5e387f06c9207859d124ec 100644 (file)
--- a/Documentation/notation.tely
+++ b/Documentation/notation.tely
@@ -28,43 +28,6 @@ Copyright @copyright{} 1999--2009 by the authors.
 @set FDL
 @include macros.itexi
 
-@c  TODO: all the direntry stuff should be moved to general.texi
-@c  Keep this here, since it pertains to the direntry below.
-@ignore
-Distributions will want to install lilypond.info in postinstall, doing:
-
-    install-info --info-dir=/usr/share/info out[-www]/lilypond.info
-
-  * Prepend GNU for dir, must be unique.
-
-  * Do not list the `lilypond' node at toplevel, so that `info lilypond'
-    goes to Top.
-
-  * List all commands in direntry.
-
-@c  * lilypond: (lilypond-application)Running LilyPond.      Invoking the
-@c    LilyPond  program.
-@end ignore
-
-@c Info files are no longer installed in a subdirectory, images are
-@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-application). Installing and running applications.
-* LilyPond Website: (lilypond-general).    Preview of new website.
-* abc2ly: (lilypond-application)Invoking abc2ly.      Importing ABC.      
-* convert-ly: (lilypond-application)Updating files with convert-ly. Older LilyPond versions.
-* etf2ly: (lilypond-application)Invoking etf2ly.      Importing Finale.
-* lilypond-book: (lilypond-application)LilyPond-book. Integrating text and music.
-* midi2ly: (lilypond-application)Invoking midi2ly.    Importing MIDI.
-* musicxml2ly: (lilypond-application)Invoking musicxml2ly.  Importing MusicXML.
-@end direntry
-
 @c don't remove this comment.
 @ignore
 @omfcreator Han-Wen Nienhuys, Jan Nieuwenhuizen and Graham Percival

diff --git a/Documentation/web.texi b/Documentation/web.texi
index 209316c012cb693e32c60dc9aaaf4cd4f87cef33..417b0ab988ab247c4e63de05155740fe21e15911 100644 (file)
--- a/Documentation/web.texi
+++ b/Documentation/web.texi
@@ -150,9 +150,47 @@ Read more in our @ref{Introduction}!
 @contents
 
 
+@c ****************** GENERAL STUFF FOR INFO ************
+@ignore
+Distributions will want to install lilypond.info in postinstall, doing:
+
+    install-info --info-dir=/usr/share/info out[-www]/lilypond-web.info
+
+  * Prepend GNU for dir, must be unique.
+
+  * Do not list the `lilypond' node at toplevel, so that `info lilypond'
+    goes to Top.
+
+  * List all commands in direntry.
+
+@c  * lilypond: (lilypond-application)Running LilyPond.      Invoking the
+@c    LilyPond  program.
+@end ignore
+
+@c Info files are no longer installed in a subdirectory, images are
+@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-application). Installing and running applications.
+* LilyPond Website: (lilypond-general).    Preview of new website.
+* abc2ly: (lilypond-application)Invoking abc2ly.      Importing ABC.      
+* convert-ly: (lilypond-application)Updating files with convert-ly. Older LilyPond versions.
+* etf2ly: (lilypond-application)Invoking etf2ly.      Importing Finale.
+* lilypond-book: (lilypond-application)LilyPond-book. Integrating text and music.
+* midi2ly: (lilypond-application)Invoking midi2ly.    Importing MIDI.
+* musicxml2ly: (lilypond-application)Invoking musicxml2ly.  Importing MusicXML.
+@end direntry
+
+
 @include web/introduction.itexi
 @include web/download.itexi
 @include web/manuals.itexi
 @include web/community.itexi
 
+
 @bye