Merge documentation fixes