I think what I'm describing might fit into the "generous, considerate" part of the definition you cite. The senses I associate with the two words are probably

I think what I'm describing might fit into the "generous, considerate" part of the definition you cite. The senses I associate with the two words are probably more connotations than denotations, though.