Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into dev...

Conflicts:

	input/lsr/lilypond-snippets.tely

diff --cc Documentation/user/music-glossary.tely
Simple merge

diff --cc input/lsr/lilypond-snippets.tely
index 0a7b8b003f342efa19c59f71cf3be28e83fb41e1,29d814ab571e125a19e8da8b79a5a2848a5df196..678d93b87cdb4d3f1988411bd904b1e16b89db9f
--- 1/input/lsr/lilypond-snippets.tely
--- 2/input/lsr/lilypond-snippets.tely
+++ b/input/lsr/lilypond-snippets.tely
@@@ -19,42 -19,23 +19,42 @@@
  @unnumberedsec \TEXT\
  @end macro
  
 -@ifnottex
 +@ifhtml
 +
 +@ifset bigpage
 +
 +@macro rlearning{NAME}
 +See also Learning Manual, section
 +@ref{\NAME\,,,lilypond-learning-big-page,Learning Manual}.
 +@end macro
 +
  @macro ruser{NAME}
- These snippets illustrate the User Manual,
+ These snippets illustrate the Notation Reference,
 -section @ref{\NAME\,,,lilypond,Notation Reference}.
 +section @ref{\NAME\,,,lilypond-big-page,Notation Reference}.
  @end macro
  
 +@end ifset
 +
 +
 +@ifclear bigpage
 +
  @macro rlearning{NAME}
  See also Learning Manual, section
  @ref{\NAME\,,,lilypond-learning,Learning Manual}.
  @end macro
 -@end ifnottex
  
 -@iftex
  @macro ruser{NAME}
- These snippets illustrate the User Manual,
 -These snippets illustrate @ref{\NAME\,,,lilypond,Notation Reference}.
++These snippets illustrate the Notation Reference,
 +section @ref{\NAME\,,,lilypond,Notation Reference}.
  @end macro
  
 +@end ifclear
 +
 +@end ifhtml
 +
 +
 +@ifnothtml
 +
  @macro rlearning{NAME}
  See also @ref{\NAME\,,,lilypond-learning,Learning Manual}.
  @end macro