frottage vs masturbation

frottage and masturbation both are nouns.

Word	Noun	Adjective	Verb	Adverb
frottage	Yes	No	No	No
masturbation	Yes	No	No	No

As nouns, masturbation is a hypernym of frottage; that is, masturbation is a word with a broader meaning than frottage:

frottage: masturbation by rubbing against another person (as in a crowd)
masturbation: manual stimulation of the genital organs (of yourself or another) for sexual pleasure

Other hypernyms of frottage include onanism.

frottage (noun)	masturbation (noun)
masturbation by rubbing against another person (as in a crowd)	manual stimulation of the genital organs (of yourself or another) for sexual pleasure