Merge pull request #924 from bbarenblat/master

Correct spelling

src/google/protobuf/compiler/java/java_message.cc

@@ -1356,7 +1356,7 @@ void ImmutableMessageGenerator::GenerateAnyMethods(io::Printer* printer) {
     "    throws com.google.protobuf.InvalidProtocolBufferException {\n"
     "  if (!is(clazz)) {\n"
     "    throw new com.google.protobuf.InvalidProtocolBufferException(\n"
-    "        \"Type of the Any messsage does not match the given class.\");\n"
+    "        \"Type of the Any message does not match the given class.\");\n"
     "  }\n"
     "  if (cachedUnpackValue != null) {\n"
     "    return (T) cachedUnpackValue;\n"

src/google/protobuf/map_lite_test_util.h

@@ -47,7 +47,7 @@ class MapLiteTestUtil {
   // Set every field in the message to a default value.
   static void SetMapFieldsInitialized(protobuf_unittest::TestMapLite* message);
 
-  // Modify all the map fields of the messsage (which should already have been
+  // Modify all the map fields of the message (which should already have been
   // initialized with SetMapFields()).
   static void ModifyMapFields(protobuf_unittest::TestMapLite* message);
 

src/google/protobuf/map_test_util.h

@@ -49,7 +49,7 @@ class MapTestUtil {
   // Set every field in the message to a default value.
   static void SetMapFieldsInitialized(unittest::TestMap* message);
 
-  // Modify all the map fields of the messsage (which should already have been
+  // Modify all the map fields of the message (which should already have been
   // initialized with SetMapFields()).
   static void ModifyMapFields(unittest::TestMap* message);
 

src/google/protobuf/map_test_util_impl.h

@@ -64,7 +64,7 @@ class MapTestUtilImpl {
   template <typename MapMessage>
   static void SetMapFieldsInitialized(MapMessage* message);
 
-  // Modify all the map fields of the messsage (which should already have been
+  // Modify all the map fields of the message (which should already have been
   // initialized with SetMapFields()).
   template <typename EnumType, EnumType enum_value, typename MapMessage>
   static void ModifyMapFields(MapMessage* message);

src/google/protobuf/test_util.h

@@ -65,7 +65,7 @@ class TestUtil {
   static void SetOneof2(unittest::TestOneof2* message);
 
   // Use the repeated versions of the set_*() accessors to modify all the
-  // repeated fields of the messsage (which should already have been
+  // repeated fields of the message (which should already have been
   // initialized with Set*Fields()).  Set*Fields() itself only tests
   // the add_*() accessors.
   static void ModifyRepeatedFields(unittest::TestAllTypes* message);

src/google/protobuf/test_util_lite.h

@@ -52,7 +52,7 @@ class TestUtilLite {
   static void SetPackedExtensions(unittest::TestPackedExtensionsLite* message);
 
   // Use the repeated versions of the set_*() accessors to modify all the
-  // repeated fields of the messsage (which should already have been
+  // repeated fields of the message (which should already have been
   // initialized with Set*Fields()).  Set*Fields() itself only tests
   // the add_*() accessors.
   static void ModifyRepeatedFields(unittest::TestAllTypesLite* message);

src/google/protobuf/util/internal/protostream_objectsource.cc

@@ -806,7 +806,7 @@ Status ProtoStreamObjectSource::RenderField(
           ow->RenderString(field_name, enum_value->name());
         }
       } else {
-        GOOGLE_LOG(INFO) << "Unkown enum skipped: " << field->type_url();
+        GOOGLE_LOG(INFO) << "Unknown enum skipped: " << field->type_url();
       }
       break;
     }