Commit 4e28e638ea016f5a5b35ba952d9f06a1108d6b5e

Russell Belfer 2013-06-13T15:27:30

Clarify some docs and minor reordering This simplifies some documentation and hopefully makes a couple of things easier to read. Also, this rearrages the order in this branch so that the overall diff against the trunk will hopefully be a bit cleaner.