Merge branch 'master' into nested-bookparts

[lilypond.git] / Documentation / user / input.itely

diff --git a/Documentation/user/input.itely b/Documentation/user/input.itely
index 2896c2139174c55c97190eca50ba53a7a87ea778..7c199fef71247d4aa649605d8153b8f529547f61 100644 (file)
--- a/Documentation/user/input.itely
+++ b/Documentation/user/input.itely
@@ -7,7 +7,7 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c \version "2.11.61"
+@c \version "2.11.57"
 
 @node General input and output
 @chapter General input and output
@@ -287,7 +287,7 @@ foo = @{ c4 d e d @}
 @end example
 
 This can be used later on in the file by entering @code{\foo}.  The
-name of a variable should have alphabetic characters only; no
+name of an variable should have alphabetic characters only; no
 numbers, underscores or dashes.
 
 @end itemize
@@ -373,32 +373,32 @@ Subsubtitle, centered below the subtitle.
 
 @funindex poet
 @item poet
-Name of the poet, flush-left below the subsubtitle.
-
-@funindex instrument
-@item instrument
-Name of the instrument, centered below the subsubtitle.  Also
-centered at the top of pages (other than the first page).
+Name of the poet, flush-left below the subtitle.
 
 @funindex composer
 @item composer
-Name of the composer, flush-right below the subsubtitle.
+Name of the composer, flush-right below the subtitle.
 
 @funindex meter
 @item meter
 Meter string, flush-left below the poet.
 
+@funindex opus
+@item opus
+Name of the opus, flush-right below the composer.
+
 @funindex arranger
 @item arranger
-Name of the arranger, flush-right below the composer.
+Name of the arranger, flush-right below the opus.
+
+@funindex instrument
+@item instrument
+Name of the instrument, centered below the arranger.  Also
+centered at the top of pages (other than the first page).
 
 @funindex piece
 @item piece
-Name of the piece, flush-left below the meter.
-
-@funindex opus
-@item opus
-Name of the opus, flush-right below the arranger.
+Name of the piece, flush-left below the instrument.
 
 @cindex page breaks, forcing
 @funindex breakbefore
@@ -498,14 +498,14 @@ Note that the music expression must come before the @code{\header}.
 }
 @end lilypond
 
-@funindex print-all-headers
+@funindex printallheaders
 @noindent
 You may change this behavior (and print all the headers when defining
 @code{\header} inside @code{\score}) by using
 
 @example
 \paper@{
-  print-all-headers = ##t
+  printallheaders=##t
 @}
 @end example