sync with latest documentation changes from upstream