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 --cc Documentation/user/fundamental.itely
Simple merge