CTL:
First, I note that I also possess advanced academic degrees. And I have studied the subject matter extensively.
Secondly, I must say boldly that I agree with you. You are linguistically correct in noting the true definition of “discipline”. I confess that I was using the word in its usual spoken vernacular. And, you are correct – punishment is not discipline.