merge from hg for git doc