--- introduction.itexi	2009-11-23 02:02:51.000000000 +0100
+++ introduction.itexi.new	2009-11-23 02:07:43.000000000 +0100
@@ -862,6 +862,25 @@
 @divEnd
 
 @divClass{column-center-top}
address@hidden Mixed environment: Frescobaldi
+
address@hidden,png,
+  (click to enlarge),frescobaldi-lilypond-editor,png,right}
+
address@hidden,,,}
address@hidden,,,}
+
address@hidden://www.frescobaldi.org}
+
+Frescobaldi is a dedicated LilyPond music and text editor with
+built-in PDF previewer, a powerful score wizard and many editing
+features.  It is built on top of the KDE4 libraries and runs
+currently on all flavours of Linux and other UNIX-like operating
+systems.
+
address@hidden
+
address@hidden
 @subheading Text environment: Emacs and Vim
 
 @sourceimage{logo-linux,,,}
@@ -891,22 +910,26 @@
 
 @help insert text and a graphic(s)
 
address@hidden Mixed environment: Frescobaldi
address@hidden Mixed environment: LilyKDE
 
address@hidden,png,
-  (click to enlarge),frescobaldi-lilypond-editor,png,right}
address@hidden,png,
+  (click to enlarge),lilykde-screenshot,png,right}
 
 @sourceimage{logo-linux,,,}
 @sourceimage{logo-freebsd,,,}
 
address@hidden://www.frescobaldi.org}
address@hidden://lilykde.googlecode.com/}
 
-Frescobaldi is a dedicated LilyPond music and text editor with
-built-in PDF previewer, a powerful score wizard and many editing
-features.  It is built on top of the KDE4 libraries and runs
-currently on all flavours of Linux and other UNIX-like operating
-systems.
+LilyKDE is a plugin for KDE's text editor
address@hidden://kate-editor.org/,Kate}.  It has a powerful Score
+Wizard to quickly setup a LilyPond document and an embedded
+PDF viewer.
+
+LilyKDE can use @uref{http://www.volny.cz/smilauer/rumor/,Rumor},
+so music can entered by playing on a MIDI keyboard.
 
+Other features are lyric hyphenation and running LilyPond on
+multiple files at once from within the KDE file manager.
 
 @subsubheading Text environment: TexShop
 
@@ -914,14 +937,11 @@
 
 @uref{http://@/www@/.uoregon@/.edu/~koch/texshop}
 
-The
address@hidden://@/www@/.uoregon@/.edu/~koch/texshop/index@/.html,TexShop}
-editor for address@hidden can be extended to run LilyPond,
+The TexShop editor for address@hidden can be extended to run LilyPond,
 @command{lilypond-book} and @command{convert-ly} from within the editor,
 using the extensions available at
 @uref{http://@/www@/.dimi@/.uniud@/.it/vitacolo/freesoftware@/.html#desktoppub}.
 
-
 @ignore
 TODO: ask somebody to sponsor/check these.  -gp
 
@@ -935,50 +955,25 @@
 @example
 mkdir -p /Library/Application\ Support/TextMate/Bundles
 cd /Library/Application\ Support/TextMate/Bundles
-svn co http://macromates.com/svn/Bundles/trunk/Bundles/Lilypond.tmbundle/
+svn co http://svn.textmate.org/trunk/Bundles/LilyPond.tmbundle/
 @end example
 @end ignore
 
address@hidden Mixed environment: LilyKDE
-
address@hidden,png,
-  (click to enlarge),lilykde-screenshot,png,right}
-
address@hidden,,,}
address@hidden,,,}
-
address@hidden://lilykde.googlecode.com/}
-
address@hidden://lilykde.googlecode.com/,LilyKDE} is a plugin for
-KDE's text editor @uref{http://kate-editor.org/,Kate}.  It has a
-powerful Score Wizard to quickly setup a LilyPond document and an
-embedded PDF viewer.
-
-LilyKDE can use @uref{http://www.volny.cz/smilauer/rumor/,Rumor},
-so music can entered by playing on a MIDI keyboard.
address@hidden
 
-Other features are lyric hyphenation and running LilyPond on
-multiple files at once from within the KDE file manager.
address@hidden
address@hidden Other programs can export LilyPond code
 
address@hidden
+TODO: change url back to full adress, to make it readable in printouts -ch
address@hidden ignore
 
 @help clean up this list, check links, etc.
 
-Other programs can export LilyPond code:
address@hidden Graphical environments:
 
 @itemize
 @item
address@hidden://www@/.volny@/.cz/smilauer/rumor/rumor@/.html,Rumor}, a realtime
-monophonic MIDI to LilyPond converter.
address@hidden
address@hidden://nicolas@/.sceaux@/.free@/.fr/lilypond/lyqi@/.html,lyqi}, an
-Emacs major mode.
address@hidden
address@hidden://@/www@/.nongnu@/.org/@/xml2ly/,xml2ly}, which imports
address@hidden://@/www@/.musicxml@/.com/xml@/.html,MusicXML}
address@hidden
address@hidden://@/common-lisp@/.net/project/fomus/,FOMUS},
-a LISP library to generate music notation
address@hidden
 @uref{http://@/noteedit@/.berlios@/.de,NoteEdit}
 which imports @uref{http://@/www@/.musicxml@/.com/xml@/.html,MusicXML}
 @item
@@ -995,6 +990,23 @@
 @uref{http://canorus.org,Canorus} can also export to LilyPond, but is still
 beta-software. Testers welcome though.
 @end itemize
+
address@hidden Command Line Tools:
+
address@hidden
address@hidden
address@hidden://www@/.volny@/.cz/smilauer/rumor/rumor@/.html,Rumor}, a realtime
+monophonic MIDI to LilyPond converter.
address@hidden
address@hidden://nicolas@/.sceaux@/.free@/.fr/lilypond/lyqi@/.html,lyqi}, an
+Emacs major mode.
address@hidden
address@hidden://@/www@/.nongnu@/.org/@/xml2ly/,xml2ly}, which imports
address@hidden://@/www@/.musicxml@/.com/xml@/.html,MusicXML}
address@hidden
address@hidden://@/common-lisp@/.net/project/fomus/,FOMUS},
+a LISP library to generate music notation
address@hidden itemize
 @divEnd
 
 
@@ -1031,7 +1043,3 @@
 @divEnd
 
 @divEnd
-
-
-
-