Merge branch 'master' of ssh+git://gpercival@git.sv.gnu.org/srv/git/lilypond

diff --git a/Documentation/user/running.itely b/Documentation/user/running.itely
index 0bd3042408774351a6249d9d2720884316d49b18..ff4af0cf17153f077c7cf1110e8985767336a29f 100644 (file)
--- a/Documentation/user/running.itely
+++ b/Documentation/user/running.itely
@@ -94,11 +94,13 @@ on the command-line, and include
 at the top of the @code{.ly} file.
 
 @item -f,--format=@var{format}
-which formats should be written.  Choices are @code{svg}, @code{ps},
-@code{pdf}, @code{png}, @code{tex}, @code{dvi}.
+which formats should be written.  Choices for @code{format} are
+@code{svg}, @code{ps}, @code{pdf}, @code{png}, @code{tex}, @code{dvi}.
+
+Example: @code{lilypond -fpng filename.ly}
 
 @item -b,--backend=@var{format}
-the output format to use for the back-end.  Choices are
+the output format to use for the back-end.  Choices for @code{format} are
 @table @code
 @item tex
 for @TeX{} output, to be processed with La@TeX{}.  If present, the file
@@ -137,6 +139,8 @@ This mode is used by default by lilypond-book.
 @cindex Scheme dump
 @end table
 
+Example: @code{lilypond -bsvg filename.ly}
+
 @cindex output format, setting
 
 @item -d,--define-default=@var{var}=@var{val}

diff --git a/THANKS b/THANKS
index 5b0def30cf1551a4bf91e29840ce2aabd8fd63b5..3172cbcd22493dca1d774631d7f67ea40a85dc96 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -24,13 +24,16 @@ Mike Amundsen
 BUG HUNTERS/SUGGESTIONS
 
 Alard de Boer
+Arvid Grøtting
 Bertalan Fodor
 Benjamin Drung
 Cameron Horsburgh
 Carl Sorensen
 Christian Hitz
 David Bobroff
+Daniel Johnson
 Eduardo Vieira
+Frédéric Chiasson
 Georg Dummer
 Jay Anderson
 Jean-Marie Mouchel
@@ -40,17 +43,22 @@ Luc Wehli
 Maarten Hijzelendoorn 
 Matthijs Frankeno
 Martijn Vromans
+Marnen Laibow-Koser
 Mirosław Doroszewski
 Nicolas Sceaux
 Orm Finnendahl
 Phillip Kirlin
 Ralph Palmer
 Rick Hansen
+Rune Zedeler
+Ruud van Silfhout
 Sean Reed
 Steven Weber
+Tomas Sauer
 Thomas Scharkowski
 Trevor Bača
 Werner Lemberg
+Wilbert Berendsen
 Yota Moteuchi