Doc: Added note to CG about Staves vs Staffs

Also changed one staffs/staves entry in web
Minor formatting corrections/improvements to CG and Web

diff --git a/Documentation/contributor/doc-work.itexi b/Documentation/contributor/doc-work.itexi
index 8ea3065e35d2c7689afc310f3a9e569b5456ae10..29642b71ab4a09d053ede1db9b32184ffc1ee2c4 100644 (file)
--- a/Documentation/contributor/doc-work.itexi
+++ b/Documentation/contributor/doc-work.itexi
@@ -1139,23 +1139,24 @@ Enter commands with @@funindex, i.e.
 @end example
 
 @noindent
-do not bother with the @@code@{@} (they are added automatically).
+Do not bother with the @@code@{@} (they are added automatically).
 These items are added to both the command index and the unified
-index.
+index.  Both index commands should go in front of the actual material.
 
-Both index commands should go in front of the actual material.
-
-@@cindex entries should not be capitalized, ie
+@item
+@@cindex entries should not be capitalized, i.e.
 
 @example
 @@cindex time signature
 @end example
 
 @noindent
-is preferred instead of @qq{Time signature},   Only use capital
-letters for musical terms which demand them, like D.S. al Fine.
+is preferred instead of @qq{Time signature}.  Only use capital
+letters for musical terms which demand them, e.g.
+@qq{D.S. al Fine}.
 
-For scheme functions, only include the final part, i.e.,
+@item
+For scheme function index entries, only include the final part, i.e.
 
 @example
 @@funindex modern-voice-cautionary
@@ -1164,27 +1165,30 @@ For scheme functions, only include the final part, i.e.,
 @end example
 
 @item
-Preferred terms:
-
-@itemize
+Use American spelling.  LilyPond's internal property
+names use this convention.
 
 @item
-In general, use the American spellings.  The internal lilypond
-property names use this spelling.
+Here is a list of preferred terms to be used:
 
-@item
-List of specific terms:
+@emph{Simultaneous} NOT concurrent.
 
-@example
-canceled
-simultaneous    NOT concurrent
-measure: the unit of music
-bar line: the symbol delimiting a measure   NOT barline
-note head   NOT notehead
-chord construct   NOT chord (when referring to <>)
-@end example
+@emph{Measure}: the unit of music.
+
+@emph{Bar line}: the symbol delimiting a measure NOT barline.
+
+@emph{Note head} NOT notehead.
+
+@emph{Chord construct} NOT just chord (when referring to < ... >)
+
+@emph{Staves} NOT Staffs:
+
+@noindent
+Phrases such as
+@q{multiple @@internalsref@{Staff@}s}
+should be rephrased to
+@q{multiple @@internalsref@{Staff@} contexts}.
 
-@end itemize
 
 @end itemize
 

diff --git a/Documentation/notation/spacing.itely b/Documentation/notation/spacing.itely
index 20d4e2b87c01fec423f2822bc72a739d17ededca..27c9e17c5030450b681aa347062788414002b453 100644 (file)
--- a/Documentation/notation/spacing.itely
+++ b/Documentation/notation/spacing.itely
@@ -1975,7 +1975,7 @@ c^"This text is placed close to the previous text"
 By default, outside-staff objects are placed only to avoid
 a horizontal collision with previously-positioned grobs.  This
 can lead to situations in which objects are placed very close to each
-other horizontally.  The vertical spacing between staffs can
+other horizontally.  The vertical spacing between staves can
 also be set so that outside staff objects are interleaved.
 Setting @code{outside-staff-horizontal-padding}
 causes an object to be offset vertically so that such a situation

diff --git a/Documentation/web/news.itexi b/Documentation/web/news.itexi
index ad881d728ee366f5b80394e16702fb6c326d1a67..2b21e435dc68b8cfcafb80db86fdee9e5d082bde 100644 (file)
--- a/Documentation/web/news.itexi
+++ b/Documentation/web/news.itexi
@@ -2347,10 +2347,9 @@ from the order that they were defined. (@ref{Old downloads})
 @newsItem
 @subsubheading 2.5.23 released - @emph{May 6, 2005}
 This release has a couple of small bugfixes, and a new feature. It is
-now possible to start and stop the StaffSymbol, during a piece of
-music, by doing \stopStaff \startStaff. This can be used to produce
-Ossia
-staves. (@ref{Changes},
+now possible to start and stop the @code{StaffSymbol}, during a piece of
+music, by doing @code{\stopStaff \startStaff}. This can be used to
+produce Ossia staves. (@ref{Changes},
 @ref{Old downloads})
 @newsEnd