Update documentation to match the state at 0.9.6 _and_ the recent changes.