switching PC
Merge branch 'ja-jp' of github.com:jhotta/documentation into ja-jp