jocularity vs diversion

jocularity and diversion both are nouns.

Word	Noun	Adjective	Verb	Adverb
jocularity	Yes	No	No	No
diversion	Yes	No	No	No

As nouns, diversion is a hypernym of jocularity; that is, diversion is a word with a broader meaning than jocularity:

Other hypernyms of jocularity include recreation.

jocularity (noun)	diversion (noun)
activity characterized by good humor	an activity that diverts or amuses or stimulates
fun characterized by humor	a turning aside (of your course or attention or concern)
a feeling of facetious merriment	an attack calculated to draw enemy defense away from the point of the principal attack