lilypond-1.3.37

diff --git a/Documentation/user/properties.itely b/Documentation/user/properties.itely
index 101274a2b8fb6de0b46861c7c2791e639571471d..3b92694c797f35a7564fa60e34090fa6319d6092 100644 (file)
--- a/Documentation/user/properties.itely
+++ b/Documentation/user/properties.itely
@@ -149,6 +149,11 @@ c''16 \property Staff.fontSize = -2 c''16
     automatic collision resolution.  The value is the shift amount
     expressed in @code{note_width}, as set in the paper section.
 
+@item @code{collisionMergeDotted}@indexcode{collisionMergeDotted} @propertytype{boolean}
+
+Merge noteheads in collisions, even if they have a different number of
+dots. This normal notation for polyphonic guitar music.
+
 @mudelafile[verbatim]{force-hshift.sly}