Which of these sentences explains the difference between convergent evolution and adaptive radiation?

Convergent evolution is when two completely separate organisms share a similar environment, and develop similar characteristics because of it, even through they did not both originally have this characteristic. 

Parallel evolution is when a characteristic is present in a common ancestor, inherited in two or more lineages descendant from that ancestry, and continues to develop similarly in those descendant lineages.