[ja]Update chapter2

applied all missing commits to ja tree