What Are Some Bible Verses That Tell Us About Our Discipline?

I know this may open up a huge discussion but I'm looking for some verses dealing with discipline. Not necessarily punishment. I know people get those confused.
Hebrews 12:1-15 is a good passage on discipline. God uses persecution that Satan and the world intends against us as discipline to benefit us: to share in His holiness.