Changes

''Self-discipline'' refers to the training that one gives one's self to accomplish a certain task or to adopt a particular pattern of behaviour. For example, denying oneself of an extravagant pleasure in order to accomplish a more demanding charitable deed. Thus, self-discipline is the assertion of [[free will]] over more base desires, and is usually understood to be a synonym of 'self mastery'. Self-discipline is to some extent a substitute for motivation, when one uses reason to determine a best course of action that opposes one's desires.  

''Self-discipline'' refers to the training that one gives one's self to accomplish a certain task or to adopt a particular pattern of behaviour. For example, denying oneself of an extravagant pleasure in order to accomplish a more demanding charitable deed. Thus, self-discipline is the assertion of [[free will]] over more base desires, and is usually understood to be a synonym of 'self mastery'. Self-discipline is to some extent a substitute for motivation, when one uses reason to determine a best course of action that opposes one's desires.  

An ''[[academic discipline]]'' refers to a body of [[knowledge]] that is being given to - or has been received by - a disciple. The term may then denotes a 'sphere of knowledge' that an [[individual]] has chosen to specialise in. In an institute of higher learning, the term 'discipline' is often a synonym of [[faculty]]'.

An ''academic discipline'' refers to a body of [[knowledge]] that is being given to - or has been received by - a disciple. The term may then denotes a 'sphere of knowledge' that an [[individual]] has chosen to specialise in. In an institute of higher learning, the term 'discipline' is often a synonym of [[faculty]]'.

==Etymology==

==Etymology==

[a. F. discipline (OF. also dece-, dese-, desce-, 11th c. in Hatz.-Darm.), ad. L. discipl{imac}na instruction of disciples, tuition, for discipul{imac}na, f. discipulus pupil, DISCIPLE. Etymologically, discipline, as pertaining to the disciple or scholar, is antithetical to doctrine, the property of the doctor or teacher; hence, in the history of the words, doctrine is more concerned with abstract theory, and discipline with practice or exercise.]  

[a. F. discipline (OF. also dece-, dese-, desce-, 11th c. in Hatz.-Darm.), ad. L. discipl{imac}na instruction of disciples, tuition, for discipul{imac}na, f. discipulus pupil, DISCIPLE. Etymologically, discipline, as pertaining to the disciple or scholar, is antithetical to doctrine, the property of the doctor or teacher; hence, in the history of the words, doctrine is more concerned with abstract theory, and discipline with practice or exercise.]