*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 8086fb3d539cd75311785c29d7d912e2a4fcad5b..1689c9f5a51b7bff84af66b95a8612d05d7ff4dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-26  Carl Sorensen  <carldsorensen@comcast.net>
+
+       * Documentation/user/notation.itely (Fret diagrams): Remove raggedright
+       from options for the example so fret-diagrams won't overlap
+       one another.
+       
+
 2004-10-26  Werner Lemberg  <wl@gnu.org>
 
        * scripts/lilypond-book.py: Some additional formatting for
@@ -206,6 +213,9 @@
 
 2004-10-18  Carl Sorensen  <carldsorensen@comcast.net>
 
+       * Documentation/user/notation.itely (Fret diagrams): Add documentation
+       for fret diagram markups to user manual
+
        * scm/fret-diagrams.scm (fret-diagram-terse): Fix mistake in internal
        documentation for fret-diagram-terse
 

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index d63bdcd4aa2b0d1b43613b1eb75fe03f9a0da44a..0e61b8cd83b1d4b874137f1c042e992b03beff35 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -4740,7 +4740,7 @@ Fret diagrams can be added to music as a markup to the desired note. The
 markup contains information about the desired fret diagram, as shown in the
 following example
 
-@lilypond[verbatim, raggedright, quote]
+@lilypond[verbatim, quote]
 \context Voice {
   d' ^\markup \fret-diagram #"6-x;5-x;4-o;3-2;2-3;1-2;"
   fis' ^\markup \override #'(size . 0.75) {