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

diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index 257c915e5763bdf4aeba0acadc843cf467ede1b5..b3b9b694c514d98882e30aadc1f3fe38c2ea9e31 100644 (file)
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -33,8 +33,8 @@ Program reference manual.
 That manual
 lists all different variables, functions and options available in
 LilyPond.  It is written as a HTML document, which is available
-@uref{http://@/lilypond@/.org/@/doc/@/v2.8/@/Documentation/@/user/@/
-lilypond@/-internals/,on@/-line},
+@c leave the @uref as one long line.
+@uref{http://@/lilypond@/.org/@/doc/@/v2.10/@/Documentation/@/user/@/lilypond@/-internals/,on@/-line},
 but is also included with the LilyPond documentation package.
 
 There are four areas where the default settings may be changed:

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index 975f4bdb87aaced4740590276f919b873462d9f1..aca868d8eff38afec7f30bca02059b2bc0587bba 100644 (file)
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -915,7 +915,7 @@ vary from system to system.  On occasion, this manual refers to
 initialization and example files.  Throughout this manual, we refer to
 input files relative to the top-directory of the source archive.  For
 example, @file{input/@/test/@/bla@/.ly} may refer to the file
-@file{lilypond@/-2.8.0/@/input/@/test/@/bla@/.ly}.  On binary packages
+@file{lilypond@/-2.10.0/@/input/@/test/@/bla@/.ly}.  On binary packages
 for the Unix platform, the documentation and examples can typically be
 found somewhere below @file{/usr/@/share/@/doc/@/lilypond/}.
 Initialization files, for example @file{scm/@/lily@/.scm}, or

diff --git a/THANKS b/THANKS
index 3172cbcd22493dca1d774631d7f67ea40a85dc96..19ea30a79f0ca7027c213f2bbe67dfe79dd751e3 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -36,6 +36,7 @@ Eduardo Vieira
 Frédéric Chiasson
 Georg Dummer
 Jay Anderson
+James Kilfinger
 Jean-Marie Mouchel
 Kazuhiro Suzuki
 Laura Conrad