Replace inappropriate @inforef with @ref

Also delete @glossaryref macro unused and only defined for Info.

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index 599a89727699a02d2ebe6e622d3db102c021ccf2..fb4e0e779adf1c184103bc0ce9c3fa3c9e418bbb 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -241,7 +241,7 @@
 
 @macro rglos{TEXT}
 @vindex \TEXT\
-@inforef{\TEXT\,,music-glossary,Music Glossary}
+@ref{\TEXT\,,,music-glossary,Music Glossary}
 @end macro
 
 @macro rlearning{TEXT}
@@ -265,7 +265,7 @@
 
 @macro rinternals{TEXT}
 @vindex \TEXT\
-@inforef{\TEXT\,,lilypond-internals,Internals Reference}
+@ref{\TEXT\,,,lilypond-internals,Internals Reference}
 @end macro
 
 @end ifinfo

diff --git a/scm/documentation-generate.scm b/scm/documentation-generate.scm
index 94dbf27a240f4fae79c912ab5d88db4c113117fb..0d56e2c4a9b97db3e4e77f80018ab47f981fe75f 100644 (file)
--- a/scm/documentation-generate.scm
+++ b/scm/documentation-generate.scm
@@ -120,12 +120,7 @@
 @c ***** info *****
 
 @macro ruser{NAME}
-@inforef{\\NAME\\,,,lilypond}
-@cindex \\NAME\\
-@end macro
-
-@macro glossaryref{NAME}
-@inforef{\\NAME\\,,lilypond/music-glossary}
+@ref{\\NAME\\,,,lilypond}
 @cindex \\NAME\\
 @end macro