self-discipline vs discipline

self-discipline and discipline both are nouns.

Word	Noun	Adjective	Verb	Adverb
self-discipline	Yes	No	No	No
discipline	Yes	No	Yes	No

As nouns, discipline is a hypernym of self-discipline; that is, discipline is a word with a broader meaning than self-discipline:

self-discipline (noun)	discipline (noun)
the act of denying yourself; controlling your impulses	training to improve strength or self-control
the trait of practicing self discipline	the act of disciplining
	the trait of being well behaved
	a branch of knowledge
	a system of rules of conduct or method of practice

self-discipline (verb)	discipline (verb)
	punish in order to gain control or enforce obedience
	develop (a child's or animal's) behavior by instruction and practice; especially to teach self-control