Discipline vs Punishment

This is a bit late in completion as I'm very poorly but anyway it needs to done.
The great thing about words is people not only argue about the appropriateness of them but often about the exact means as there are many in English that a very similar but not completely the same.

 Miss Kitty makes a very good point.

A punishment is the imposition of an undesirable or unpleasant outcome upon a group or individual, meted out by an authority—in contexts ranging from child discipline to criminal law—as a response and deterrent to a particular action or behaviour that is deemed undesirable or unacceptable. Of itself it doesn't include guidance, being essentially  reactive - you break a window, you receive legal sanctions for criminal damage such as a fine or community order.
To discipline implies active steps around teaching and training appropriate conduct, attitude and behaviour but when a rule is broken, a sanction is applied to deter the person from repeating.  This can and for me does include forfeits, lines and spanking.