Merge doc changes from trunk

svn path=; revision=84743