Changes in JavaGuide 3-5

As requested, here a single pull request for all my changes.