Wordsmithing.

Conflicts:
	userGuide/en/chapters/05-document-management.markdown
Merge branch 'master' into props-fixes