Merge branch 'master' of ssh+git://gpercival@git.sv.gnu.org/srv/git/lilypond

diff --git a/Documentation/user/advanced-notation.itely b/Documentation/user/advanced-notation.itely
index 31b4a75c31535f6e661224eebfcc6f92f2a481ce..19f9bd5bc58e39bcc718da8509337e5381bcfca4 100644 (file)
--- a/Documentation/user/advanced-notation.itely
+++ b/Documentation/user/advanced-notation.itely
@@ -34,7 +34,8 @@ This section explains how to include text (with various formatting) in
 your scores.
 
 @cindex Text, other languages
-To write non-ascii text (such as characters from other languages), simply
+To write accented and special text (such as characters from other languages),
+simply
 insert the characters directly into the lilypond file.  The file must be
 saved as UTF-8.  For more information, see @ref{Text encoding}.
 

diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely
index 117e1199ff5a7f92971cbb0be29e8c1b096cf790..f17aad795354deecdd2287ea314c1602964ca4e6 100644 (file)
--- a/Documentation/user/instrument-notation.itely
+++ b/Documentation/user/instrument-notation.itely
@@ -815,7 +815,7 @@ glyph.
 
 
 To enter lyrics with characters from non-English languages, or with
-non-ascii characters (such as the heart symbol or slanted quotes),
+accented and special characters (such as the heart symbol or slanted quotes),
 simply insert the characters directly into the input file and save
 it with utf-8 encoding.  See @ref{Text encoding} for more info.