From: John Mandereau <john.mandereau@gmail.com>
Date: Tue, 10 Jun 2008 21:25:36 +0000 (+0200)
Subject: Fix docs cross-references
X-Git-Tag: release/2.11.49-1~1^2~6
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=cc6d562a71f60fa43fab4593f4dfdc1262aa6648;p=lilypond.git

Fix docs cross-references
---

diff --git a/Documentation/user/input.itely b/Documentation/user/input.itely
index 5e77708f3d..f1e44d7ed8 100644
--- a/Documentation/user/input.itely
+++ b/Documentation/user/input.itely
@@ -109,7 +109,7 @@ Learning Manual:
 
 @rlearning{Working on input files},
 @rlearning{Music expressions explained},
-@rlearning{Score is a single (compound) musical expression}.
+@rlearning{Score is a (single) compound musical expression}.
 
 
 @node Multiple scores in a book
diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index 3164ff5476..cc190425fc 100644
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -829,9 +829,6 @@ instrument (or vocal) groups.
 @item
 @ruser{Input syntax}:
 
-@item
-@ruser{Non-musical notation}:
-
 @item
 @ruser{Spacing issues}:
 discusses issues which affect the global output, such as selecting
@@ -856,7 +853,7 @@ contains a set of useful reference books for those who wish to
 know more on notation and engraving.
 
 @item
-@rlearning{Scheme tutorial}:
+@ref{Scheme tutorial}:
 presents a short introduction to Scheme, the programming
 language that music functions use.
 
@@ -866,7 +863,7 @@ are a set of tables showing the chord names, MIDI instruments, a
 list of color names, and the Feta font.
 
 @item
-@rlearning{Templates}:
+@ref{Templates}:
 of LilyPond pieces.  Just cut and paste a
 template into a file, add notes, and you're done!
 
diff --git a/Documentation/user/keyboards.itely b/Documentation/user/keyboards.itely
index 07ba0043d4..7adae697ef 100644
--- a/Documentation/user/keyboards.itely
+++ b/Documentation/user/keyboards.itely
@@ -176,8 +176,8 @@ Learning Manual:
 @rlearning{Fixing overlapping notation}.
 
 Notation Reference:
-@ruser{Stems},
-@ruser{Automatic beams}.
+@ref{Stems},
+@ref{Automatic beams}.
 
 Snippets:
 @rlsr{Keyboards}.
diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely
index 599e2ae36d..6ec15809b3 100644
--- a/Documentation/user/lilypond-book.itely
+++ b/Documentation/user/lilypond-book.itely
@@ -974,7 +974,7 @@ the automated method with @command{lilypond-book}.
 @subsection Many quotes from a large score
 
 If you need to quote many fragments from a large score, you can also use
-the clip systems feature, see @ruser{Extracting fragments of notation}.
+the clip systems feature, see @ruser{Extracting fragments of music}.
 
 
 @node Inserting LilyPond output into OpenOffice.org
diff --git a/lily/text-interface.cc b/lily/text-interface.cc
index 757f1d277c..12e2e36e3e 100644
--- a/lily/text-interface.cc
+++ b/lily/text-interface.cc
@@ -137,7 +137,7 @@ Text_interface::is_markup_list (SCM x)
 
 
 ADD_INTERFACE (Text_interface,
-	       "A Scheme markup text, see @ruser{Text markup} and"
+	       "A Scheme markup text, see @ruser{Formatting text} and"
 	       " @ruser{New markup command definition}.\n"
 	       "\n"
 	       "There are two important commands:"
diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index 5303e3cbc0..26c735e16e 100644
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -316,8 +316,8 @@ if this column is the start of a system.")
      (line-positions ,list? "Vertical positions of staff lines.")
      (line-thickness ,number? "The thickness of the tie or slur
 contour.")
-     (long-text ,markup? "Text markup.  See @ruser{Text
-markup}.")
+     (long-text ,markup? "Text markup.  See @ruser{Formatting
+text}.")
 
      (max-beam-connect ,integer? "Maximum number of beams to connect
 to beams from this stem.  Further beams are typeset as beamlets.")
@@ -522,7 +522,7 @@ through flag on.")
 typeset.  Valid choices depend on the @code{stencil} callback reading
 this property.")
 
-     (text ,markup? "Text markup.  See @ruser{Text markup}.")
+     (text ,markup? "Text markup.  See @ruser{Formatting text}.")
 ;;FIXME -- Should both be the same?
      (text-direction ,ly:dir? "This controls the ordering of the
 words.  The default @code{RIGHT} is for roman text.  Arabic or Hebrew