correct line ending errors
merge different doc changes