Update documentation

This patch updates the documentation with changes from commit
638c12dba424cd00e22c8d15f8ea8aa9fb9233bb.