Merge pull request #1828 from hydephp/clean-up-the-navigation-documentation

[2.x] Clean up the navigation documentation

Author: emmadesilva