From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Wed, 13 Aug 2008 12:58:33 +0000 (+0200)
Subject: Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into dev... 
X-Git-Tag: release/2.11.58-1~32^2~62
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=091e3f8f91e1eff1e81f25896ca3736be5560149;p=lilypond.git

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

Conflicts:

	input/lsr/lilypond-snippets.tely
---

091e3f8f91e1eff1e81f25896ca3736be5560149
diff --cc input/lsr/lilypond-snippets.tely
index 0a7b8b003f,29d814ab57..678d93b87c
--- a/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