Re-synced updates in the previous HTML documentaton into the DocBook version
Merge pull request #209 from johan162/master

Re-synced some late updates in the official docs back to the DocBook version