Edit
The Edo Jidai, also known as the Tokugawa Jidai, was a time period in the history of feudal Japan from the year 1603 until 1867. It took place after the Sengoku Jidai and during this time Japan was unified and ruled by the Tokugawa shogunate, which closed the country to any foreign influence. The period ended with the Boshin War and the Meiji Restoration, events typically viewed as the start of modern Japan.
During the Edo period most samurai traditions and customs were refined to the extent that can be seen today in contemporary modern Japan.
1