Updates to the 2.6.0 manual
Merge pull request #45 from jmaas/master

Updates to the 2.6.0 manual