Pushed changes from the Wiki version of this doc.