Discipline vs. Punishment

Is there a difference between discipline and punishment? Are they one and the same? The Bible says in Proverbs 13:24, "Whoever spares the rod hates their children, but the one who loves their children is careful to discipline them".