Update docs

Note that this reflects changes incorporated in #799.