Merge branch 'master' into dev/texi2html

[lilypond.git] / input / regression / markup-user.ly

diff --git a/input/regression/markup-user.ly b/input/regression/markup-user.ly
index f632a71961bd05695fa45391a661bb22bebc6780..2619982d28945ff1f9a80042824888da947eaff5 100644 (file)
--- a/input/regression/markup-user.ly
+++ b/input/regression/markup-user.ly
@@ -1,20 +1,17 @@
 
 \header {
-
-  texidoc = "Own markup commands may be defined by using the
-    @code{def-markup-command} scheme macro."
-
-
+  texidoc = "Users may define non-standard markup commands using
+the @code{define-markup-command} scheme macro."
 }
 
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
   
 
 
-\version "2.6.0" % to be updated
+\version "2.11.51"
 
-#(def-markup-command (upcase paper props str) (string?)
+#(define-markup-command (upcase paper props str) (string?)
   "Upcase the string characters. Syntax: \\upcase #\"string\""
   (interpret-markup paper props (make-simple-markup (string-upcase str))))