Update documentation

This patch updates the documentation with changes from commit
cb84425449d083939ce3e548ec8f1dc6bd735d05.