annotations update 2.5 prt 2
Merge pull request #124 from gwenonacouch/stage

annotations update 2.5 prt 2
annotations updated for 2.5manual prt 3
Merge pull request #125 from gwenonacouch/stage

annotations updated for 2.5manual prt 3 + added missing chapters
2.5 edits to upgrade section
2.5 edits to upgrade section
annotations update 2.5 dev guide
Merge pull request #126 from gwenonacouch/stage

annotations update 2.5 dev guide
updated zoom examples in 2.1,1.2,2.5 (and 3.0)
updated zoom examples in 2.1,1.2,2.5 (and 3.0)
CCBC-412: Update documentation about configuration cache
2.5 update; moved user-defined ports to after install section
CCBC-424: mention brew update before brew install
Merge pull request #127 from mnunberg/stage

CCBC-412: Update documentation about configuration cache