bar space line.

diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index 6576a993d0412fddf2bae7124100da9bf6102039..13030bc702ab018014de27b581040e778e7d641b 100644 (file)
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -1361,7 +1361,7 @@ Contexts can have properties, which are usually named in
 @code{studlyCaps}.  They mostly control the translation from
 music to notatino, eg. @code{localKeySignature} (for determining
 whether to print accidentals), @code{measurePosition} (for
-determining when to print a barline).  Context properties can
+determining when to print a bar line).  Context properties can
 change value over time while interpreting a piece of music;
 @code{measurePosition} is an obvious example of
 this.  Context properties are modified with @code{\set}.

diff --git a/Documentation/user/expressive.itely b/Documentation/user/expressive.itely
index 1c27bd1a0f8dbc45dcc6744da5f52e762f03dc30..87d205d3d1514464359c23577713729a82dabe86 100644 (file)
--- a/Documentation/user/expressive.itely
+++ b/Documentation/user/expressive.itely
@@ -237,8 +237,8 @@ example:
 A hairpin normally starts at the left edge of the beginning note
 and ends on the right edge of the ending note.  If the ending note
 falls on the downbeat, the hairpin ends on the immediately
-preceding barline.  This may be modified by setting the
-@code{hairpinToBarline} property,
+preceding bar line.  This may be modified by setting the
+@code{hairpinToBar line} property,
 @cindex Hairpin
 
 @lilypond[quote,ragged-right,fragment,verbatim,relative=2]

diff --git a/Documentation/user/policy.txt b/Documentation/user/policy.txt
index 20b2d09382cab49a016f0536c38191d0d95bc86c..72401dc2cf3978b267b6fe11921412822e71213a 100644 (file)
--- a/Documentation/user/policy.txt
+++ b/Documentation/user/policy.txt
@@ -115,6 +115,8 @@ main docs
     - list of specific terms:
 canceled
 simultaenous    NOT concurrent
+measure: the unit of music
+bar line: the symbol delimiting a measure
 
 
 

diff --git a/Documentation/user/rhythms.itely b/Documentation/user/rhythms.itely
index eaa218fcccec2c60d5bbefee9f8fbd60b25fcfa5..c00b26c1b50fab80245886276591d564bb83ed61 100644 (file)
--- a/Documentation/user/rhythms.itely
+++ b/Documentation/user/rhythms.itely
@@ -1623,7 +1623,6 @@ Snippets: @lsrdir{rhythms}
 @unnumberedsubsubsec Bar lines
 
 @cindex Bar lines
-@cindex Barlines
 @funindex \bar
 @cindex measure lines
 @cindex repeat bars

diff --git a/Documentation/user/spacing.itely b/Documentation/user/spacing.itely
index 2c874d6bb7467673a3eff504407a8c40a1ce1b70..3f91ccb39db1b95947c4cd6958c91af4cbec417a 100644 (file)
--- a/Documentation/user/spacing.itely
+++ b/Documentation/user/spacing.itely
@@ -725,9 +725,9 @@ sections without notes (note that it does not scan for rests; it scans for
 the absence of notes.  This is so that single-staff polyphony with rests in one
 of the parts does not throw off the @code{Page_turn_engraver}).  When it finds
 a sufficiently long section without notes, the @code{Page_turn_engraver} will
-insert an @code{\allowPageTurn} at the final barline in that section, unless
-there is a @q{special} barline (such as a double bar), in which case the
-@code{\allowPageTurn} will be inserted at the final @q{special} barline in
+insert an @code{\allowPageTurn} at the final bar line in that section, unless
+there is a @q{special} bar line (such as a double bar), in which case the
+@code{\allowPageTurn} will be inserted at the final @q{special} bar line in
 the section.
 
 @funindex minimumPageTurnLength

diff --git a/Documentation/user/staff.itely b/Documentation/user/staff.itely
index 83fe965754c3efb8e68a8458517d2f226c7bd8df..b4312b46ab91eb0dd5db1442cf26a8080e614331 100644 (file)
--- a/Documentation/user/staff.itely
+++ b/Documentation/user/staff.itely
@@ -62,7 +62,7 @@ at the left, and bar lines are connected between the staves.
 @end lilypond
 
 @item
-In a @internalsref{StaffGroup}, the barlines will be drawn through
+In a @internalsref{StaffGroup}, the bar lines will be drawn through
 all the staves, but the group is started with a bracket.
 
 @lilypond[verbatim,ragged-right,quote]
@@ -101,9 +101,9 @@ bar lines are not connected.
 In addition to these four staff group types, other groupings can
 be produced by changing various properties. E.g., the
 @q{Mensurstriche} layout common in Renaissance music, with
-barlines running between but not through the staves, can be
+bar lines running between but not through the staves, can be
 produced from a @code{StaffGroup} or @code{GrandStaff} context if
-the barlines are made transparent in the @code{Staff} itself, with
+the bar lines are made transparent in the @code{Staff} itself, with
 the command @code{\override Staff.BarLine #'transparent = ##t}
 
 @cindex staff, nested

diff --git a/Documentation/user/templates.itely b/Documentation/user/templates.itely
index 0e0f99a14b627b5a230f1721d4990e5624a475d0..f5517998aae7ad160e43ad4dd60d7ad9f3633e5d 100644 (file)
--- a/Documentation/user/templates.itely
+++ b/Documentation/user/templates.itely
@@ -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

diff --git a/Documentation/user/vocal.itely b/Documentation/user/vocal.itely
index 282fe54396b158083197a6e76cd123cbcd01c38a..288c55adbe3d9705a7b04839ea825f7e47be08b8 100644 (file)
--- a/Documentation/user/vocal.itely
+++ b/Documentation/user/vocal.itely
@@ -44,7 +44,8 @@ not perform such calculations by default; to enable it, use
 \override Score.PaperColumn #'keep-inside-line = ##t
 @end example
 
-To make lyrics avoid barlines as well, use
+To make lyrics avoid bar lines as well, use
+
 @example
 \layout @{
   \context @{