Pick up the 2.1 doc

I believe I have integrated all the info you requested, also got rid of all the ??queries.

branch master, doc/source/Manual.rst