rose-ana: Update documentation to reflect recent changes.
Merge remote branch 'upstream/master' into rose-ana-doc

Conflicts:
	doc/rose-configuration.html
Merge pull request #541 from steoxley/rose-ana-doc

rose-ana: Update documentation to reflect recent changes.