* scm/midi.scm (instrument-names-alist),

	Documentation/user/appendices.itely: Correct spelling of shakuhachi

diff --git a/ChangeLog b/ChangeLog
index 813fc293f313b659388ccde348ebb3352982b6ad..630881a902307e878502452dbb1ef4a169d4a4f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-23  Mats Bengtsson  <mabe@drongo.s3.kth.se>
+
+       * scm/midi.scm (instrument-names-alist),
+       Documentation/user/appendices.itely: Correct spelling of shakuhachi
+
 2003-10-14  Mats Bengtsson  <mabe@drongo.s3.kth.se>
 
        * input/test/temporary-stave.ly (texidoc): New example based on an

diff --git a/Documentation/user/appendices.itely b/Documentation/user/appendices.itely
index 47d6268056d121e8d030be58932a0cb641eb1e40..ebf19abfdbeb9a6372d833c454c6be201f1c34d6 100644 (file)
--- a/Documentation/user/appendices.itely
+++ b/Documentation/user/appendices.itely
@@ -52,7 +52,7 @@
 "guitar harmonics"          "recorder"             "melodic tom"
 "acoustic bass"             "pan flute"            "synth drum"
 "electric bass (finger)"    "blown bottle"         "reverse cymbal"
-"electric bass (pick)"      "skakuhachi"           "guitar fret noise"
+"electric bass (pick)"      "shakuhachi"           "guitar fret noise"
 "fretless bass"             "whistle"              "breath noise"
 "slap bass 1"               "ocarina"              "seashore"
 "slap bass 2"               "lead 1 (square)"      "bird tweet"

diff --git a/scm/midi.scm b/scm/midi.scm
index be4b3dc720807a9541bea7cb82e06a18bd6f01f5..0bf117a2f928a46a271f9dec7d32ba1e8772dd5b 100644 (file)
--- a/scm/midi.scm
+++ b/scm/midi.scm
@@ -156,7 +156,7 @@
          ("recorder" . ,(- 75 1))
          ("pan flute" . ,(- 76 1))
          ("blown bottle" . ,(- 77 1))
-         ("skakuhachi" . ,(- 78 1))
+         ("shakuhachi" . ,(- 78 1))
          ("whistle" . ,(- 79 1))
          ("ocarina" . ,(- 80 1))