document renaming fixed #1066
Merge branch 'doc_overhaul' into testing
merging