Merge tag 'upstream/2.18.0' into debian-experimental

[lilypond.git] / Documentation / contributor.texi

diff --git a/Documentation/contributor.texi b/Documentation/contributor.texi
index 26b3a26fbbf00ef0416c2bde966bfcfe253ad4f1..e540c724a570e4a0bc8f470599a64e424dbc2d7d 100644 (file)
--- 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
@@ -25,7 +30,7 @@ information about different jobs, see @rweb{Help us}.
 
 @c `Contributor's Guide' was born 2007-09-15 with git commit 48f3356...
 @macro copyrightDeclare
-Copyright @copyright{} 2007--2011 by the authors.
+Copyright @copyright{} 2007--2012 by the authors.
 @end macro
 
 @set FDL
@@ -61,10 +66,12 @@ Copyright @copyright{} 2007--2011 by the authors.
 * Programming work::
 * Release work::
 * Build system notes::
+* Modifying the feta font::
 * Administrative policies::
 
 Appendices
 
+* LilyPond grammar::
 * GNU Free Documentation License:: License of this document.
 @end menu
 
@@ -87,9 +94,17 @@ Appendices
 @include contributor/programming-work.itexi
 @include contributor/release-work.itexi
 @include contributor/build-notes.itexi
+@include contributor/feta-font.itexi
 @include contributor/administration.itexi
 
+@node LilyPond grammar
+@appendix LilyPond grammar
+
+This appendix contains a description of the LilyPond grammar, as
+output from the parser.
+
+@verbatiminclude ly-grammar.txt
+
 @include fdl.itexi
 
 @bye
-