Merge pull request #458 from abobov/master

Fix example in Javadoc for ResultActions.andExpect()

spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java

@@ -36,7 +36,7 @@ public interface ResultActions {
 	 *
 	 * mockMvc.perform(get("/person/1"))
 	 *   .andExpect(status.isOk())
-	 *   .andExpect(content().mimeType(MediaType.APPLICATION_JSON))
+	 *   .andExpect(content().contentType(MediaType.APPLICATION_JSON))
 	 *   .andExpect(jsonPath("$.person.name").value("Jason"));
 	 *
 	 * mockMvc.perform(post("/form"))