Incorported user manual changes suggested by Matt Reid
Merge branch 'v0-8' into v1-0

Conflicts:
	doc/user_manual.adoc