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 cdc2b0fe308d2176db5f4a2afd0fcfa7100e9ed8..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}.