Update to current documentation
Merge pull request #2332 from adrianspeyer/patch-15

Update to current documentation