pulled in docs/manual changes