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

[lilypond.git] / Documentation / user / macros.itexi

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index 25daba0a820a8238617bb061949647ce1a91e926..4302b1e7a9d58834cfe893321dcdf47d942d5652 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -8,6 +8,10 @@
 
 @include version.itexi
 
+@c don't replace quotes with directed quotes
+@set txicodequoteundirected
+@set txicodequotebacktick
+
 @c   ***** Displaying text *****
 
 @c we need this since @q{\} doesn't work with makeinfo 4.11 --
@@ -288,22 +292,14 @@
 @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}
 @ref{\TEXT\,,,lilypond,Notation Reference}
 @end macro
 
-@macro rusernamed{TEXT,DISPLAY,DISPLAY}
+@macro rusernamed{TEXT,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}
 @ref{\TEXT\,,,lilypond-program,Application Usage}
 @end macro
@@ -312,10 +308,6 @@ notation reference, @ref{\TEXT\,,\DISPLAY\,lilypond,Notation Reference}
 @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
@@ -326,12 +318,12 @@ program usage manual, @ref{\TEXT\,,\DISPLAY\,lilypond-program,Application Usage}
 
 @macro rinternals{TEXT}
 @vindex \TEXT\
-@code{\TEXT\}
+@ref{\TEXT\,,,lilypond-internals,Internals Reference}
 @end macro
 
 @macro rinternalsnamed{TEXT,DISPLAY}
 @vindex \TEXT\
-@code{\DISPLAY\}
+@ref{\TEXT\,,\DISPLAY\,lilypond-internals,Internals Reference}
 @end macro
 
 @end iftex