Merge remote branch 'origin/master' into release/unstable

[lilypond.git] / Documentation / notation / world.itely

diff --git a/Documentation/notation/world.itely b/Documentation/notation/world.itely
index 1863feb7cde621adb546caf86dabd52fb5b630e7..920650c5dc3153fa076e2efbaf15ebe9761dd80d 100644 (file)
--- a/Documentation/notation/world.itely
+++ b/Documentation/notation/world.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
-@c \version "2.14.0"
+@c \version "2.16.0"
 
 @node World music
 @section World music
@@ -280,7 +280,7 @@ maqam.
 Here is one suggested grouping that maps the more common maqams to
 key signatures:
 
-@multitable @columnfractions 0.1 0.1 0.1 0.6
+@multitable @columnfractions 0.15 0.1 0.1 0.6
 @headitem maqam group
   @tab key
   @tab finalis
@@ -342,7 +342,7 @@ Notation Reference:
 @ref{Key signature}.
 
 Learning Manual:
-@rlearning{Accidentals and key signatures}.
+@rlearning{Pitches and key signatures}.
 
 Internals Reference:
 @rinternals{KeySignature}.
@@ -532,7 +532,7 @@ Western scales and modes: @notation{koma} (1/9 of a tone),
 @notation{artık ikili} (12/9 or 13/9 of a tone).
 
 From a modern notational point of view it is convenient to
-use the standard Western staff notes (c, d, e, ...) with
+use the standard Western staff notes (c, d, e, @dots{}) with
 special accidentals that raise or lower notes by intervals
 of 1/9, 4/9, 5/9 and 8/9 of a tone.  These accidentals are
 defined in the file @file{makam.ly}.