Docs after efischer edited, but before merging with @adamjsteward's stuff.