According to Merriam-Webster, discipline is punishment. Big help there! *lol*

Soaul hit the nail on the head. Discipline is training. Punishment is a means employed to facilitate training when other methods have failed to achieve the desired result.