CORE-4716: more documentation fixes