Doctrine 1

Documentation fixes in several chapters