Update to current documentation
Merge pull request #2331 from adrianspeyer/patch-14

Update to current documentation