From 6aa300d733b696628f0c80d3ede10f1676527c1a Mon Sep 17 00:00:00 2001
From: Masayasu Yamamoto <m2yamamoto@gmail.com>
Date: Thu, 9 Feb 2017 21:33:56 +0900
Subject: [PATCH 1/2] Fix Javadoc in ContentResultMatchers

Closes gh-1322
---
 .../test/web/servlet/result/ContentResultMatchers.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
index 1a1e57c4388..e85c3e85462 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
@@ -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) {

From 75b18d7b7bf46a9cd8a5f9fb4c58adffec2a2cd4 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Thu, 9 Feb 2017 16:05:57 +0100
Subject: [PATCH 2/2] Update copyright header

---
 .../test/web/servlet/result/ContentResultMatchers.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
index e85c3e85462..b3bcfd9ff6d 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
+++ b/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.