From caaa194f737ab263aab3abbafc7c4f8e737e5ec1 Mon Sep 17 00:00:00 2001
From: Graham Percival <graham@percival-music.ca>
Date: Sat, 28 Aug 2004 03:05:07 +0000
Subject: [PATCH] minor editing.

---
 ChangeLog                         |  2 ++
 Documentation/user/examples.itely | 20 +++++++++++++++-----
 Documentation/user/tutorial.itely | 15 ++++++++++-----
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1dcbb79727..fb45b7e89f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* Documentation/user/tutorial.itely: minor editing.
 
+	* Documentation/user/examples.itely: tiny editing.
+
 2004-08-28  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
 	* Documentation/user/advanced.itely: removed.
diff --git a/Documentation/user/examples.itely b/Documentation/user/examples.itely
index 2279fed2a5..c1ef81bf82 100644
--- a/Documentation/user/examples.itely
+++ b/Documentation/user/examples.itely
@@ -298,7 +298,7 @@ c4 c g c
 bassWords = \lyrics { ho4 ho ho ho }
 
 \score { 
-	  \context StaffGroup <<
+	  \context ChoirStaff <<
 	      \context Lyrics = sopranos { s1 }
 	      \context Staff = women <<
 		  \context Voice = sopranos { \voiceOne << \global \sopMusic >> }
@@ -692,10 +692,20 @@ violin concerto as TchaikovskyPI, whereas perhaps you wish to print
 }
 
 \score {
-   {
-  c'4
-  }
-} 
+   \header {
+      piece = "piece1"
+      opus = "opus1"
+    }
+  { c'4 }
+}
+
+\score {
+   \header {
+      piece = "piece2"
+      opus = "opus2"
+    }
+  { c'4 }
+}
 
 @end lilypond
 
diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 8c2a9deee4..eccf55c0f6 100644
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -48,7 +48,7 @@ reference.
 * More staves::                 
 * Adding articulation marks to notes::  
 * Combining notes into chords::  
-* Basic rhythmical commands::   
+* Advanced rhythmic commands::   
 * Commenting input files::      
 * Printing lyrics::             
 * A lead sheet::                
@@ -867,8 +867,8 @@ r4 <c e g>8\>( <c e g> <c e g> <c f a>8\!)
 
 
 
-@node Basic rhythmical commands
-@section Basic rhythmical commands
+@node Advanced rhythmic commands
+@section Advanced rhythmic commands
 
 @cindex pickup
 @cindex anacruse
@@ -938,7 +938,7 @@ ignored.  The following fragment shows possible uses for comments
 
 @example
 % notes for twinkle twinkle follow
-c4 c g' g a a
+c4 c g' g a a g2
 
 %@{
     This line, and the notes below
@@ -949,6 +949,11 @@ c4 c g' g a a
 %@}
 @end example
 
+@c  FIXME
+@c   This is good info, but I wouldn't call it a comment.  IMO it should
+@c   be moved somewhere else.  I don't know exactly where yet, but I'll
+@c   resolve it soon.  -GP
+
 @cindex versioning
 
 There is a special statement that is a kind of comment.  The @code{\version}
@@ -961,7 +966,7 @@ To mark a file for version 2.1.17, use
 
 @noindent
 These annotations make future upgrades of LilyPond go more
-smoothly. Changes in the syntax are handled with a special program,
+smoothly.  Changes in the syntax are handled with a special program,
 @file{convert-ly} (see @ref{Invoking convert-ly}), and it uses
 @code{\version} to determine what rules to apply.
 
-- 
2.39.5