Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond into dev/jmandereau

* 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond:
  Misc small administrative changes.
  Remove remaining "user manual" strings.
  Small reminders and formatting tweaks.

Conflicts:
Please use @w{...} when @version{} is not followed by a white space
character.

	Documentation/user/fundamental.itely
	Documentation/user/macros.itexi
	Documentation/user/tutorial.itely
	Documentation/user/working.itely

diff --combined Documentation/user/fundamental.itely
index 1ccf9bcf02ccd731e9e2289c91e7dd478cec2d01,89a0d051cdce21a6236a3f18eff14b396534a684..f9f9343f5f4e141663235d1ad910b329aca6ac1f
--- 1/Documentation/user/fundamental.itely
--- 2/Documentation/user/fundamental.itely
+++ b/Documentation/user/fundamental.itely
@@@ -40,7 -40,7 +40,7 @@@ description of the input format, see @r
  A basic example of a lilypond input file is
  
  @example
 -\version "@version{}"
 +\version @w{"@version{}"}
  \score @{
    @var{...compound music expression...}  % all the music goes here!
    \header @{ @}
@@@ -1589,7 -1589,7 +1589,7 @@@ engraver is removed from a context it c
  output.  This is a crude way of modifying the output, but it
  can sometimes be useful.
  
- @subsubsection Changing a single context
+ @subsubheading Changing a single context
  
  To remove an engraver from a single context we use the
  @code{\with} command placed immediately after the context creation 
@@@ -1670,7 -1670,7 +1670,7 @@@ the notes in all the voices on that sta
  >>
  @end lilypond
  
- @subsubsection Changing all contexts of the same type
+ @subsubheading Changing all contexts of the same type
  
  The examples above show how to remove or add engravers to
  individual contexts.  It is also possible to remove or add 
@@@ -1739,7 -1739,7 +1739,7 @@@ cello.  In this case, we would start wi
  soprano part).
  
  @example
 -\version "2.11.38"
 +\version @w{"@version{}"}
  melody = \relative c' @{
    \clef treble
    \key c \major
@@@ -1767,7 -1767,7 +1767,7 @@@ text = \lyricmode @
  Now we want to add a cello part.  Let's look at the @q{Notes only} example:
  
  @example
 -\version "2.11.38"
 +\version @w{"@version{}"}
  melody = \relative c' @{
    \clef treble
    \key c \major
@@@ -1804,7 -1804,7 +1804,7 @@@ celli normally use bass clef.  We'll al
  different notes.
  
  @example
 -\version "2.11.38"
 +\version @w{"@version{}"}
  sopranoMusic = \relative c' @{
    \clef treble
    \key c \major
@@@ -1873,7 -1873,7 +1873,7 @@@ This looks a bit messy; the indentatio
  easily fixed.  Here's the complete soprano and cello template.
  
  @lilypond[quote,verbatim,ragged-right]
 -\version "2.11.37"
 +\version "2.11.38"
  sopranoMusic = \relative c' {
    \clef treble
    \key c \major
@@@ -1921,6 -1921,7 +1921,6 @@@ from Handel's Messiah
  
  @c The following should appear as music without code
  @lilypond[quote,ragged-right]
 -\version "2.11.38"
  global = { \key d \major \time 4/4 }
  sopMusic = \relative c'' {
    \clef "treble"
@@@ -2192,7 -2193,7 +2192,7 @@@ music definitions and one to define th
  and key:
  
  @example
 -\version "2.11.38"
 +\version @w{"@version{}"}
  \header @{
    title = "Jesu, meine Freude"
    composer = "J S Bach"