various documentation fixes

Applied to stable per @pcarlisle