Pedagogy: The knowledge of how to communicate and teach content. Lacking in pedagogy makes any instruction ineffective.
Content knowledge: Understanding of your content. Also, understanding what it looks like to have procedural and conceptual understanding of your content area.
The intersection of these 3 areas is where innovative and highly effective teaching takes place. This is the goal for any teacher who wants to provide instruction that creates 21st century learners.