update wording
Merge branch 'japanese' into gh-pages
generate the HTML document