Happiness = fulfilled desires; Contentment = No desires


A content person is at peace, a happy person is just passing through a phase which lasts till the next set of desires take control.