Doc: Add changes entries, and update NR for fix to 849.

diff --git a/Documentation/changes.tely b/Documentation/changes.tely
index 7941e85c2762acbd7328ebca349e1a357c75572f..3e60eb5879a8fe2fc8bb77e336a1538869cfb39a 100644 (file)
--- a/Documentation/changes.tely
+++ b/Documentation/changes.tely
@@ -66,12 +66,19 @@ which scares away people.
 
 @end ignore
 
+@item
+Funk-style and Walker-style shape notes have been added.
+
+@item
+Rests will no longer keep a staff alive if @code{\RemoveEmptyStaffContext}
+is used.
+
 @item
 New option @code{-dinclude-settings=INCLUDEFILE.ly}, which causes lilypond
 to include the given file before the score is processed. This allows the
 user to change global settings without the need to change the score itself.
 That way, several different editions/version (e.g. different page sizes)
-can be generated from a file without having to modify the score for each 
+can be generated from a file without having to modify the score for each
 version.
 
 @item

diff --git a/Documentation/notation/staff.itely b/Documentation/notation/staff.itely
index cd7ce287da5f5267ddfd05e71f1f6c096d21a3e7..55bea3c9af6b3b913fd18e6edc5b8109a09427e1 100644 (file)
--- a/Documentation/notation/staff.itely
+++ b/Documentation/notation/staff.itely
@@ -738,7 +738,7 @@ Score}.  By default, this command hides and removes all empty
 staves in a score except for those in the first system.
 
 @warning{A staff is considered empty when it contains only
-multi-measure rests, skips, spacer rests, or a combination of these
+multi-measure rests, rests, skips, spacer rests, or a combination of these
 elements.}
 
 @lilypond[verbatim,quote,ragged-right]