My opinion......

Discipline comes from within. It is you developing control and other things you and your Master seek for you. Discipline feels good and satisfying.

Punishment comes from another when your own self discipline fails. It feels bad, physically and/ or emotionally.

i know they aren't the dictionary defenitions, but it's the way i view the words.