Merge branch 'master' of git://git.sv.gnu.org/lilypond

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index dc8a5298337e7680cbb3085a36d011719214fe2c..29fca60d35c6ef0165e68bc6e3a5f8e80d7b90dc 100644 (file)
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -203,11 +203,15 @@ Appendices
 @node LilyPond command index
 @appendix LilyPond command index
 
+This index does blah blah blah.
+
 @printindex ky
 
 @node LilyPond index
 @appendix LilyPond index
 
+In contrast, this index does blaz blaz blaz.
+
 @printindex cp
 
 @bye

diff --git a/Documentation/user/tweaks.itely b/Documentation/user/tweaks.itely
index 19eb1ef6f5ea77331f5a1934f4b10bd393bdf2ee..7698e32f74beec66a2de099a7658c1f7474f291c 100644 (file)
--- a/Documentation/user/tweaks.itely
+++ b/Documentation/user/tweaks.itely
@@ -2082,7 +2082,8 @@ should be used to move them.
 Let's now see how the properties in the previous section can
 help to resolve overlapping notation.
 
-@subheading @code{padding} property
+@c FIXME: formatting
+@subheading @code{padding}
 @cindex padding property
 
 The @code{padding} property can be set to increase
@@ -2119,7 +2120,7 @@ their @code{outside-staff-priority}, then that object and all
 objects outside it are moved.
  
 
-@subheading left-padding and right-padding properties
+@subheading @code{left-padding} and @code{right-padding}
 @cindex left-padding property
 @cindex right-padding property