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

Conflicts:

	Documentation/user/macros.itexi
	buildscripts/add_html_footer.py
	stepmake/stepmake/generic-targets.make

diff --cc Documentation/user/macros.itexi
index 639cd02fc80c026a4b8162a46473e7a0a49581f8,07cf74a547fc187bf6d24aac8b3cdbcfee89369b..25daba0a820a8238617bb061949647ce1a91e926
--- 1/Documentation/user/macros.itexi
--- 2/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@@ -278,29 -281,29 +281,41 @@@
  @end macro
  
  @macro rlearning{TEXT}
- learning manual, @ref{\TEXT\,,,lilypond-learning,Learning Manual}
+ @ref{\TEXT\,,,lilypond-learning,Learning Manual}
+ @end macro
+ 
+ @macro rlearningnamed{TEXT,DISPLAY}
+ @ref{\TEXT\,,\DISPLAY\,lilypond-learning,Learning Manual}
  @end macro
  
 +@macro rlearningnamed{TEXT,DISPLAY}
 +learning manual, @ref{\TEXT\,,\DISPLAY\,lilypond-learning,Learning Manual}
 +@end macro
 +
  @macro ruser{TEXT}
- notation reference, @ref{\TEXT\,,,lilypond,Notation Reference}
+ @ref{\TEXT\,,,lilypond,Notation Reference}
+ @end macro
+ 
+ @macro rusernamed{TEXT,DISPLAY,DISPLAY}
+ @ref{\TEXT\,,\DISPLAY\,lilypond,Notation Reference}
  @end macro
  
 +@macro rusernamed{TEXT,DISPLAY,DISPLAY}
 +notation reference, @ref{\TEXT\,,\DISPLAY\,lilypond,Notation Reference}
 +@end macro
 +
  @macro rprogram{TEXT}
- program usage manual, @ref{\TEXT\,,,lilypond-program,Application Usage}
+ @ref{\TEXT\,,,lilypond-program,Application Usage}
+ @end macro
+ 
+ @macro rprogramnamed{TEXT,DISPLAY}
+ @ref{\TEXT\,,\DISPLAY\,lilypond-program,Application Usage}
  @end macro
  
 +@macro rprogramnamed{TEXT,DISPLAY}
 +program usage manual, @ref{\TEXT\,,\DISPLAY\,lilypond-program,Application Usage}
 +@end macro
 +
  @macro rlsr{TEXT}
  @ref{\TEXT\,,,lilypond-snippets,Snippets}
  @end macro

diff --cc buildscripts/add_html_footer.py
Simple merge

diff --cc stepmake/stepmake/generic-targets.make
index f4f1390769b28589290a43223dfc3b3e325d78e2,03074040805a8427b0abb87470e9708c37bb80ce..a9ba8453e1020782ff955bf2b5c3066a6f096c73
--- 1/stepmake/stepmake/generic-targets.make
--- 2/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@@ -1,6 -1,5 +1,6 @@@
- .PHONY : all clean config default dist dist exe help html lib TAGS\
 -.PHONY : all clean bin-clean config default dist doc exe help\
 -         html lib TAGS po
++.PHONY : all clean bin-clean config default dist doc exe help html lib TAGS\
 +       po web web-1 WWW-1 WWW-2 WWW-post local-WWW-1 local-WWW-2\
 +       web-install
  
  all:   default
        $(LOOP)