Merge pull request #1003 from andytaylor/master

small doc/example fixes
partial revert of cleberts commit https://github.com/hornetq/hornetq/commit/afc39fdddcb54df420985f081d4a2613c11abe84