Updated documentation to correspond to the current trunk