Index: include/clang/Basic/DiagnosticSemaKinds.td
===================================================================
--- include/clang/Basic/DiagnosticSemaKinds.td	(revision 157307)
+++ include/clang/Basic/DiagnosticSemaKinds.td	(working copy)
@@ -4313,8 +4313,8 @@
   def err_lambda_unevaluated_operand : Error<
     "lambda expression in an unevaluated operand">;
   def ext_lambda_implies_void_return : ExtWarn<
-    "C++11 requires lambda with omitted result type to consist of a single "
-    "return statement">,
+    "C++11 requires a lambda expression with omitted result type to consist "
+    "solely of a return statement">,
     InGroup<LambdaExtensions>;
   def err_lambda_return_init_list : Error<
     "cannot deduce lambda return type from initializer list">;
Index: test/SemaCXX/uninitialized.cpp
===================================================================
--- test/SemaCXX/uninitialized.cpp	(revision 157307)
+++ test/SemaCXX/uninitialized.cpp	(working copy)
@@ -210,6 +210,6 @@
 
 // Test lambda expressions with -Wuninitialized
 int test_lambda() {
-  auto f1 = [] (int x, int y) { int z; return x + y + z; }; // expected-warning {{C++11 requires lambda with omitted result type to consist of a single return statement}} expected-warning{{variable 'z' is uninitialized when used here}} expected-note {{initialize the variable 'z' to silence this warning}}
+  auto f1 = [] (int x, int y) { int z; return x + y + z; }; // expected-warning {{C++11 requires a lambda expression with omitted result type to consist solely of a return statement}} expected-warning{{variable 'z' is uninitialized when used here}} expected-note {{initialize the variable 'z' to silence this warning}}
   return f1(1, 2);
 }