* Documentation/user/lilypond-book.itely: small cleanups

[lilypond.git] / Documentation / user / refman.itely

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index cf00ed0ab0bf4eb8c2b99947afed22cab98a6f16..aa864ff09675a1e3807a30ed5d558b441091a113 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -497,16 +497,27 @@ a lilypond export option:
 
 @itemize @bullet
 @item
-@uref{http://denemo.sourceforge.net/, Denemo} was once intended as
+Denemo was once intended as
 a LilyPond graphical user interface.  It run on Gnome/GTK.
+
+@quotation
+@uref{http://denemo.sourceforge.net/}
+@end  quotation
+
 @item
-@uref{http://rnvs.informatik.tu-chemnitz.de/~jan/noteedit/noteedit.html, Noteedit}
- is a graphical score editor that runs under KDE/Qt.
+ Noteedit, a graphical score editor that runs under KDE/Qt.
+@quotation
+@uref{http://rnvs.informatik.tu-chemnitz.de/~jan/noteedit/noteedit.html,}
+@end quotation
+
 @item
-@uref{http://rosegarden.sf.net/, RoseGarden}
- was the inspiration for naming LilyPond.  Nowadays it has been
-rewritten from scratch and supports LilyPond export as of version
-0.1.6.
+RoseGarden was once the inspiration for naming LilyPond.  Nowadays it
+has been rewritten from scratch and supports LilyPond export as of
+version 0.1.6.
+
+@quotation
+@uref{http://rosegarden.sf.net/}
+@end quotation
 @end itemize
 
 Another option is to enter the music using your favorite MIDI
@@ -2924,27 +2935,16 @@ is given though the fingering mechanism, e.g. @code{c4-3} for a C
 quarter on the third string. The string 1 is the lowest one, and the
 tuning defaults to the standard guitar tuning (with 6 strings).
 
-<<<<<<< refman.itely
 @lilypond[fragment,verbatim]
-=======
-@c FIXME  TabStaff is broken
-@lily pond[fragment,verbatim]
-@example
->>>>>>> 1.152
   \context TabStaff <
-    \notes @{
+    \notes {
       \property Staff.Stem \override #'direction = #1
       
       a,4-2 c'-5 a-4 e'-6
       e-3 c'-5 a-4 e'-6
-    @}
+    }
   >  
-<<<<<<< refman.itely
 @end lilypond
-=======
-@end example
-@c @end lilypond
->>>>>>> 1.152
 
 @node Non-guitar tablatures
 @subsection Non-guitar tablatures
@@ -4201,7 +4201,8 @@ marking:
 
 \score {
   \notes\relative c'' {
-    a1^#`((columns (font-relative-size . -1)) ,dotted-eight-note " = 64")
+    a1^#`((columns (font-relative-size . -1))
+           ,dotted-eight-note " = 64")
   }
   \paper {
     linewidth = -1.
@@ -4500,7 +4501,7 @@ value assigned in the @code{\paper} block), systems are evenly
 distributed vertically on the last page.  This might produce ugly
 results in case there are not enough systems on the last page.  Note
 that @command{lilypond-book} ignores @code{lastpagefill}.  See
-@ref{Insert music snippets into your texts using lilypond-book} for
+@ref{lilypond-book: integrating text and music} for
 more information.
 
 @cindex @code{lastpagefill}