X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-context-properties.scm;h=04b57afaceef21496507df5ab01a7a0d8ae9a759;hb=HEAD;hp=3ee68e5e6a5ebceba368c151b01e13effddc64aa;hpb=77320a48ed671c658f04256d087880c1701eb746;p=lilypond.git

diff --git a/scm/define-context-properties.scm b/scm/define-context-properties.scm
index 3ee68e5e6a..04b57aface 100644
--- a/scm/define-context-properties.scm
+++ b/scm/define-context-properties.scm
@@ -28,7 +28,7 @@
 
 
   (if (not (equal? #f (object-property symbol 'translation-doc)))
-      (ly:error (_ "symbol ~S redefined" symbol)))
+      (ly:error (_ "symbol ~S redefined") symbol))
 
   (set-object-property! symbol 'translation-type? type?)
   (set-object-property! symbol 'translation-doc description)
@@ -64,7 +64,7 @@ numbers.  Can be @code{numbers} for going back to the same number or
 @code{numbers-with-letters} for going back to the same number with letter
 suffixes.  No setting will not go back in measure-number time.")
      (alternativeRestores ,symbol-list? "Timing variables that are
-restored to their value at the end of the first alternative in
+restored to their value at the start of the first alternative in
 subsequent alternatives.")
      (associatedVoice ,string? "Name of the context (see
 @code{associatedVoiceType} for its type, usually @code{Voice}) that
@@ -673,6 +673,8 @@ Example:
 @noindent
 This will create a start-repeat bar in this staff only.  Valid values
 are described in @file{scm/bar-line.scm}.")
+     (suspendRestMerging ,boolean? "When using the Merge_rest_engraver do not
+                         merge rests when this is set to true.")
      )))