Merge remote-tracking branch 'origin/translation'

[lilypond.git] / Documentation / usage.tely

diff --git a/Documentation/usage.tely b/Documentation/usage.tely
index 0ce6002b62fa2a60ed69dc8ee11b6da306336a7e..f4cce23c110835a2a009b35f227860557a2b477d 100644 (file)
--- a/Documentation/usage.tely
+++ b/Documentation/usage.tely
@@ -3,7 +3,8 @@
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 
     When revising a translation, copy the HEAD committish of the
-    version that you are working on.  See TRANSLATION for details.
+    version that you are working on.  For details, see the Contributors'
+    Guide, node Updating translation committishes..
 @end ignore
 
 @setfilename lilypond-usage.info
@@ -20,7 +21,7 @@ LilyPond version @version{}.  In addition, it suggests some
 
 @c `Usage' was born 1999-10-10 with git commit c82c30c...
 @macro copyrightDeclare
-Copyright @copyright{} 1999--2009 by the authors.
+Copyright @copyright{} 1999--2014 by the authors.
 @end macro
 
 @set FDL
@@ -49,7 +50,7 @@ Copyright @copyright{} 1999--2009 by the authors.
 * Running lilypond::               Operation.
 * Updating files with convert-ly:: Updating input files.
 * lilypond-book::                  Integrating text and music.
-* Converting from other formats::  Converting to lilypond source format.
+* External programs::              Mixing LilyPond and other programs.
 * Suggestions for writing files::  Best practices and effective bug-fixing.
 
 Appendices
@@ -64,11 +65,12 @@ Appendices
 
 @contents
 
+@allowcodebreaks false
 
 @include usage/running.itely
 @include usage/updating.itely
 @include usage/lilypond-book.itely
-@include usage/converters.itely
+@include usage/external.itely
 @include usage/suggestions.itely
 
 @include fdl.itexi