Merged r26237 and r26238 from trunk.
The command used was: svn merge -r26236:r26238 svn+ssh://bugman@.../svn/relax/trunk .
This will be used to construct a better formatted HTML copy of the user manual for http://www.nmr-relax.com/manual/index.html.
Authored by: bugman 2014-10-10
Parent: [r26238]
Child: [r26240]
