Maintaining both trunk and 4.2.0 branches of the docs are starting to become a bit of a pain given the number of updates.  David only updated the 4.2.0 branch for his inheritance table work, so they are already out of sync.  I propose that for now, we only update the 4.2.0 branch, and then copy that branch back into trunk once 4.2.0 ships.  Can we agree on that?