Doc: NR Moved Appendix C to CG

Issue 3015

4 files changed, 15 insertions, 17 deletions

diff --git a/Documentation/contributor.texi b/Documentation/contributor.texi
index 74d03bd1b7..9541883b74 100644
--- a/Documentation/contributor.texi
+++ b/Documentation/contributor.texi
@@ -66,6 +66,7 @@ Copyright @copyright{} 2007--2012 by the authors.
 
 Appendices
 
+* LilyPond grammar::
 * GNU Free Documentation License:: License of this document.
 @end menu
 
@@ -91,7 +92,14 @@ Appendices
 @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
-
diff --git a/Documentation/extending/scheme-tutorial.itely b/Documentation/extending/scheme-tutorial.itely
index 65a28c62d2..a87c6f91f0 100644
--- a/Documentation/extending/scheme-tutorial.itely
+++ b/Documentation/extending/scheme-tutorial.itely
@@ -660,7 +660,7 @@ Now LilyPond's input is structured into tokens and expressions, much
 like human language is structured into words and sentences.  LilyPond
 has a lexer that recognizes tokens (literal numbers, strings, Scheme
 elements, pitches and so on), and a parser that understands the syntax,
-@ruser{LilyPond grammar}.  Once it knows that a particular syntax rule
+@rcontrib{LilyPond grammar}.  Once it knows that a particular syntax rule
 applies, it executes actions associated with it.
 
 The hash mark@tie{}@code{#} method of embedding Scheme is a natural fit
diff --git a/Documentation/notation.tely b/Documentation/notation.tely
index 098d4f3593..517c4dc046 100644
--- a/Documentation/notation.tely
+++ b/Documentation/notation.tely
@@ -58,7 +58,6 @@ Appendices
 
 * Notation manual tables::         Tables and charts.
 * Cheat sheet::                    Summary of LilyPond syntax.
-* LilyPond grammar::               Syntax diagram for LilyPond parser.
 * GNU Free Documentation License:: License of this document.
 * LilyPond command index::
 * LilyPond index::
@@ -84,16 +83,6 @@ Appendices
 @include notation/cheatsheet.itely
 
 
-
-@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
 
 
diff --git a/Documentation/notation/notation-appendices.itely b/Documentation/notation/notation-appendices.itely
index e74dae6184..75c12d4e4d 100644
--- a/Documentation/notation/notation-appendices.itely
+++ b/Documentation/notation/notation-appendices.itely
@@ -1530,6 +1530,7 @@ created for midi, layout and paper blocks.
 
 @cindex parser
 @cindex Bison
+@cindex LilyPond grammar
 @cindex grammar for LilyPond
 @cindex BNF
 
@@ -1542,10 +1543,10 @@ cannot be achieved the file is invalid and an appropriate error
 message is produced.  The syntactic groupings and the rules for
 constructing the groupings from their parts for the LilyPond syntax
 are defined in @file{lily/parser.yy} and shown in Backus Normal Form
-(BNF) in @ref{LilyPond grammar}.  This file is used to build the
-parser during the program build by the parser generator, Bison.  It
-is part of the source code and is not included in the LilyPond
-binary installation.
+(BNF) in @rcontrib{LilyPond grammar}.  This file is used to build the
+parser during the program build by the parser generator, Bison.  It is
+part of the source code and is not included in the LilyPond binary
+installation.
 
 
 @node parser variable