fix merged miss
Merge branch 'refs/heads/japanese' into gh-pages
generate the HTML document