Small doc updates, merging changes from old SVN tree.