Merge remote-tracking branch 'origin/master' into translation

[lilypond.git] / Documentation / snippets / suppressing-warnings-for-clashing-note-columns.ly

diff --git a/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly b/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly
index 9fbc73ce6b229a4311416455726c8be89c08f224..726b2978d3be7bd57c6948c9d035b152036b45f4 100644 (file)
--- a/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly
+++ b/Documentation/snippets/suppressing-warnings-for-clashing-note-columns.ly
@@ -1,7 +1,10 @@
-%% Do not edit this file; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.di.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
 %% This file is in the public domain.
-\version "2.13.20"
+\version "2.18.0"
 
 \header {
   lsrtags = "simultaneous-notes, tweaks-and-overrides"
@@ -12,13 +15,16 @@ the same position, and both voices have no shift or the same shift
 specified, the error message @samp{warning: ignoring too many clashing
 note columns} will appear when compiling the LilyPond file.  This
 message can be suppressed by setting the @code{'ignore-collision}
-property of the @code{NoteColumn} object to @code{#t}.
+property of the @code{NoteColumn} object to @code{#t}. Please note that
+this does not just suppress warnings  but stops LilyPond trying to
+resolve collisions at all and so may have  unintended results unless
+used with care.
 
 "
   doctitle = "Suppressing warnings for clashing note columns"
 } % begin verbatim
 
-ignore = \override NoteColumn #'ignore-collision = ##t
+ignore = \override NoteColumn.ignore-collision = ##t
 
 \relative c' {
   <<