Problem: man page example code was truncated at any '@'

Solution: correctly end only for defined tags (@discuss, @end).
Generated documentation
Merge pull request #803 from hintjens/master

Problem: man page example code was truncated at any '@'
Problem: some dangling use of deprecated methods

Solution: replace with un-deprecated usage.
Merge pull request #804 from hintjens/master

Small cleanups