Merge with trunk.

svn path=/branches/doc/tools/build/v2/; revision=44810
Update 'more' links.

svn path=/branches/doc/tools/build/v2/; revision=44996