Merge in more updates for docs (we are just going to check them all in so that users...