Merge remote-tracking branch 'origin/master' into translation

[lilypond.git] / Documentation / usage / updating.itely

diff --git a/Documentation/usage/updating.itely b/Documentation/usage/updating.itely
index 73e042c706ebaee1adcde6303b5d8c93ed2502ac..18eae26ab6fd206ede7639e2c6959d0895e16e8c 100644 (file)
--- a/Documentation/usage/updating.itely
+++ b/Documentation/usage/updating.itely
@@ -8,7 +8,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.12.0"
+@c \version "2.16.0"
 
 
 @node Updating files with convert-ly
@@ -78,8 +78,8 @@ convert-ly -e myfile.ly
 
 @noindent
 in the directory containing the file.  This will upgrade
-@code{myfile.ly} in-place and preserve the original file in
-@code{myfile.ly~}.
+@file{myfile.ly} in-place and preserve the original file in
+@file{myfile.ly~}.
 
 @warning{@command{convert-ly} always converts up to the last
 syntax change handled by it.  This means that the @code{\version}
@@ -121,10 +121,13 @@ The program is invoked as follows:
 convert-ly [@var{option}]@dots{} @var{filename}@dots{}
 @end example
 
-
 The following options can be given:
 
 @table @code
+@item -d,--diff-version-update
+update the @code{\version} to the latest or, if this is greater, do
+nothing.
+
 @item -e,--edit
 Apply the conversions direct to the input file, modifying it
 in-place.
@@ -132,7 +135,15 @@ in-place.
 @item -f,--from=@var{from-patchlevel}
 Set the version to convert from.  If this is not set, @command{convert-ly}
 will guess this, on the basis of @code{\version} strings in the file.
-E.g. @code{--from=2.10.25}
+E.g. @option{--from=2.10.25}
+
+@item -h, --help
+Print usage help.
+
+@item -l @var{loglevel}, --loglevel=@var{loglevel}
+Set the output verbosity to @var{loglevel}. Possible values, in upper
+case, are @code{PROGRESS} (the default), @code{NONE}, @code{WARNING},
+@code{ERROR} and @code{DEBUG}.
 
 @item -n,--no-version
 Normally, @command{convert-ly} adds a @code{\version} indicator
@@ -141,12 +152,14 @@ to the output.  Specifying this option suppresses this.
 @item -s, --show-rules
 Show all known conversions and exit.
 
-@item --to=@var{to-patchlevel}
-Set the goal version of the conversion.  It defaults to the latest
-available version.  E.g. @code{--to=2.12.2}
+@item -t, --to=@var{to-patchlevel}
+Explicitly set which @code{\version} to convert to, otherwise the
+default is the most current value.
+
+@example
+convert-ly --to=2.14.1 myfile.ly
+@end example
 
-@item -h, --help
-Print usage help.
 @end table
 
 To upgrade LilyPond fragments in texinfo files, use
@@ -177,7 +190,7 @@ convert-ly """D:/My Scores/Ode.ly""" > "D:/My Scores/new Ode.ly"
 If the simple @command{convert-ly -e *.ly} command fails because the
 expanded command line becomes too long, the @command{convert-ly}
 command may be placed in a loop instead.  This example for UNIX
-will upgrade all @code{.ly} files in the current directory
+will upgrade all @file{.ly} files in the current directory
 
 @example
 for f in *.ly; do convert-ly -e $f; done;