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

Updated the DocBook sources with the latest changes from the existing docs