This paper reports on two years' research into the effects of computer use on the pedagogical content knowledge of pre-service social studies students. Over the last five years, the pre-service master's degree program described here has infused...