discipline vs trait

discipline and trait both are nouns.

Word	Noun	Adjective	Verb	Adverb
discipline	Yes	No	Yes	No
trait	Yes	No	No	No

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

discipline (noun)	trait (noun)
training to improve strength or self-control	a distinguishing feature of your personal nature
the act of disciplining
the trait of being well behaved
a branch of knowledge
a system of rules of conduct or method of practice

discipline (verb)	trait (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