Discipline vs Punishment

When did discipline become all about punishment?  This article suggests that it’s more about conditioning and training.  Read on to learn more about discipline vs. punishment.