Merge branch 'master' into lilypond/translation

* master:
  Minor fixes from mailist/bugs.

diff --git a/Documentation/user/basic-notation.itely b/Documentation/user/basic-notation.itely
index d3f61f2bc8a980d3b80934aa62f775682a247696..73faf518bd30d007bb528f29ef78d3cef85b4220 100644 (file)
--- a/Documentation/user/basic-notation.itely
+++ b/Documentation/user/basic-notation.itely
@@ -3015,15 +3015,27 @@ c2\glissando c,
 @end lilypond
 
 
+@commonprop
+
+@lilypond[quote,ragged-right,verbatim]
+I = \once \override NoteColumn #'ignore-collision = ##t
+
+\relative <<
+  { \oneVoice \stemDown f2 \glissando \stemNeutral a } \\
+  { \oneVoice \I c2 \glissando \I d, }
+>>
+@end lilypond
+
+
+
 @seealso
 
-Program reference: @internalsref{Glissando}.
+Program reference: @internalsref{lissando}.
 
 Example files:
 @lsr{expressive,glissando.ly}, @lsr{expressive,line-styles.ly}
 
 
-
 @refbugs
 
 Printing text over the line (such as @emph{gliss.}) is not supported.

diff --git a/Documentation/user/setup.itely b/Documentation/user/setup.itely
index 38d8f93b2b887eeed000c9d4dc31b3411d2e9570..0283957fa5fe1ac046d140e49e7897a864f674de 100644 (file)
--- a/Documentation/user/setup.itely
+++ b/Documentation/user/setup.itely
@@ -100,7 +100,7 @@ There is support from different text editors for LilyPond.
 @menu
 * Emacs mode::                  
 * Vim mode::                    
-* LilyPondTool::                
+* jEdit::                       
 * TexShop::                     
 * TextMate::                    
 @end menu
@@ -162,8 +162,8 @@ where $@{LILYPOND_VERSION@} is your lilypond version.  If Lilypond was not
 installed in @file{/usr/local/}, then change this path accordingly.
 
 
-@node LilyPondTool
-@subsection LilyPondTool
+@node jEdit
+@subsection jEdit
 
 Created as a plugin for the @uref{http://@/www@/.jedit@/.org@/,jEdit}
 text editor, LilyPondTool is the most feature-rich text-based tool for