Merge branch 'master' of git://git.sv.gnu.org/lilypond

[lilypond.git] / Documentation / user / templates.itely

diff --git a/Documentation/user/templates.itely b/Documentation/user/templates.itely
index e09a6bdb168cf8e4dbb06edce262f2e23c622482..f5517998aae7ad160e43ad4dd60d7ad9f3633e5d 100644 (file)
--- a/Documentation/user/templates.itely
+++ b/Documentation/user/templates.itely
@@ -891,7 +891,7 @@ global = {
   \override Voice.NoteHead #'style = #'default
   \override Voice.Rest #'style = #'default
 
-  % FIXME: setting printKeyCancellation back to #t must not
+  % TODO: setting printKeyCancellation back to #t must not
   % occur in the first bar after the incipit.  Dto. for forceClef.
   % Therefore, we need an extra \skip.
   \skip 1*1
@@ -1079,7 +1079,7 @@ bassusLyrics = \lyricmode {
       \override Slur #'transparent = ##t
 
       % Comment in the below "\remove" command to allow line
-      % breaking also at those barlines where a note overlaps
+      % breaking also at those bar lines where a note overlaps
       % into the next bar.  The command is commented out in this
       % short example score, but especially for large scores, you
       % will typically yield better line breaking and thus improve
@@ -1155,7 +1155,7 @@ is within a @code{\transpose} section.
 @c   - maybe ask Amelie Zapf to clean it up, or whether I should just
 @c     make whatever changes I feel like.
 
-@c FIXME: produces a warning ; key change merge.
+@c TODO: produces a warning ; key change merge.
 @c The `line-width' argument is for the \header.
 
 @lilypond[quote,verbatim,ragged-right,line-width]