Merge pull request #1322 from msysyamamoto:fix-javadoc

* pr/1322:
  Update copyright header
  Fix Javadoc in ContentResultMatchers

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -127,7 +127,7 @@ public class ContentResultMatchers {
 	 * Assert the response body content with a Hamcrest {@link Matcher}.
 	 * <pre class="code">
 	 * mockMvc.perform(get("/path"))
-	 *   .andExpect(content(containsString("text")));
+	 *   .andExpect(content().string(containsString("text")));
 	 * </pre>
 	 */
 	public ResultMatcher string(final Matcher<? super String> matcher) {