Refs #4100, #4041, #4077, fix docs in last commit.