merged changes from previous incarnation of this branch
svn merge -r56197:56494 https://svn.boost.org/svn/boost/sandbox-branches/birbacher/fix_documentation@56494 .