From: Keith OHara <k-ohara5a5a@oco.net>
Date: Sat, 15 Oct 2011 20:59:14 +0000 (-0700)
Subject: Doc: Update examples of extraNatural
X-Git-Tag: release/2.15.15-1~43
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=fb04880077ab1b4107815ab50b171a97e2fd3772;p=lilypond.git

Doc: Update examples of extraNatural
---

diff --git a/Documentation/learning/fundamental.itely b/Documentation/learning/fundamental.itely
index ae7b467c25..33ce20619c 100644
--- a/Documentation/learning/fundamental.itely
+++ b/Documentation/learning/fundamental.itely
@@ -1762,11 +1762,11 @@ So this turns off extra naturals in one staff:
 @lilypond[quote,verbatim,ragged-right]
 <<
   \new Staff \relative c'' {
-    ais2 aes
+    aeses2 aes
   }
   \new Staff \relative c'' {
     \set Staff.extraNatural = ##f
-    ais2 aes
+    aeses2 aes
   }
 >>
 @end lilypond
@@ -1777,11 +1777,11 @@ and this turns them off in all staves:
 @lilypond[quote,verbatim,ragged-right]
 <<
   \new Staff \relative c'' {
-    ais2 aes
+    aeses2 aes
   }
   \new Staff \relative c'' {
     \set Score.extraNatural = ##f
-    ais2 aes
+    aeses2 aes
   }
 >>
 @end lilypond
@@ -1852,12 +1852,12 @@ like this:
 <<
   \new Staff {
     \relative c'' {
-      gis4 ges aes ais
+      gisis4 gis aeses aes
     }
   }
   \new Staff \with { extraNatural = ##f } {
     \relative c'' {
-      gis4 ges aes ais
+      gisis4 gis aeses aes
     }
   }
 >>
@@ -1895,7 +1895,7 @@ throughout the @code{\score} or @code{\book} block in which the
 \score {
   \new Staff {
     \relative c'' {
-      cis4 e d ces
+      cisis4 e d cis
     }
   }
   \layout {
@@ -1915,12 +1915,12 @@ within the score:
   <<
     \new Staff {
       \relative c'' {
-        gis4 ges aes ais
+        gisis4 gis aeses aes
       }
     }
     \new Staff {
       \relative c'' {
-        gis4 ges aes ais
+        gisis4 gis aeses aes
       }
     }
   >>
diff --git a/scm/define-context-properties.scm b/scm/define-context-properties.scm
index e9acd96907..b85c5ac5f8 100644
--- a/scm/define-context-properties.scm
+++ b/scm/define-context-properties.scm
@@ -225,8 +225,7 @@ function for explicit key changes.  @samp{\\override} of the
      (extendersOverRests ,boolean? "Whether to continue extenders as
 they cross a rest.")
      (extraNatural ,boolean? "Whether to typeset an extra natural sign
-before accidentals changing from a non-natural to another
-non-natural.")
+before accidentals that reduce the effect of a previous alteration.")
 
 
      (figuredBassAlterationDirection ,ly:dir? "Where to put alterations