Copy bits of the docs from master and port to this branch