bushi (lit. "arms-man") which came into use during the Edo period in Japan, is a term used to describe a warrior.