diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index aa43b076c392..e690691f9593 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-17  Jonathan Wakely  <jwakely@redhat.com>
+
+	* doc/extend.texi (C++ Attributes): Correct description of
+	warn_unused type attribute.
+
 2016-02-17  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
 
 	* config/rs6000/altivec.md (*altivec_lvxl_<mode>_internal): Output
diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi
index 78017fe41c2e..476d089add3b 100644
--- a/gcc/doc/extend.texi
+++ b/gcc/doc/extend.texi
@@ -20313,7 +20313,7 @@ types.
 
 This attribute is appropriate for types which just represent a value,
 such as @code{std::string}; it is not appropriate for types which
-control a resource, such as @code{std::mutex}.
+control a resource, such as @code{std::lock_guard}.
 
 This attribute is also accepted in C, but it is unnecessary because C
 does not have constructors or destructors.