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 8bb8cef9260a059ecbdd2b83a14ecf9e3593293e..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.14.0"
+@c \version "2.16.0"
 
 
 @node Updating files with convert-ly
@@ -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.
@@ -134,6 +137,14 @@ 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. @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
 to the output.  Specifying this option suppresses this.
@@ -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. @option{--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