Merge pull request #10603 from deannagarcia/3.19.x

Fix codespell errors

.github/workflows/codespell.yml

@@ -13,4 +13,4 @@ jobs:
         with:
           check_filenames: true
           skip: ./.git,./conformance/third_party,*.snk,*.pb,*.pb.cc,*.pb.h,./src/google/protobuf/testdata,./objectivec/Tests,./python/compatibility_tests/v2.5.0/tests/google/protobuf/internal,./.github/workflows/codespell.yml
-          ignore_words_list: "alow,alse,ba,cleare,copyable,cloneable,dedup,dur,errorprone,files',fo,fundementals,hel,importd,inout,leapyear,nd,nin,ois,ons,parseable,process',te,testof,ue,unparseable,wasn,wee,gae,keyserver,objext,od,optin,sur"
+          ignore_words_list: "alow,alse,ba,cleare,copyable,cloneable,dedup,dur,errorprone,falsy,files',fo,fundementals,hel,importd,inout,leapyear,nd,nin,ois,ons,parseable,process',ro,te,testof,ue,unparseable,wasn,wee,gae,keyserver,objext,od,optin,sur"

conformance/conformance_test.h

@@ -124,7 +124,7 @@ class ForkPipeRunner : public ConformanceTestRunner {
 //    class MyConformanceTestSuite : public ConformanceTestSuite {
 //     public:
 //      void RunSuiteImpl() {
-//        // INSERT ACTURAL TESTS.
+//        // INSERT ACTUAL TESTS.
 //      }
 //    };
 //

csharp/src/Google.Protobuf/Reflection/ExtensionCollection.cs

@@ -93,7 +93,7 @@ public IList<FieldDescriptor> GetExtensionsInDeclarationOrder(MessageDescriptor
 
         /// <summary>
         /// Returns a readonly list of all the extensions define in this type that extend 
-        /// the provided descriptor type in accending field order
+        /// the provided descriptor type in ascending field order
         /// </summary>
         public IList<FieldDescriptor> GetExtensionsInNumberOrder(MessageDescriptor descriptor)
         {

objectivec/GPBCodedInputStream.h

@@ -220,7 +220,7 @@ CF_EXTERN_C_END
 /**
  * Moves the limit to the given byte offset starting at the current location.
  *
- * @exception GPBCodedInputStreamException If the requested bytes exceeed the
+ * @exception GPBCodedInputStreamException If the requested bytes exceed the
  *            current limit.
  *
  * @param byteLimit The number of bytes to move the limit, offset to the current

python/google/protobuf/internal/message_test.py

@@ -2166,7 +2166,7 @@ def testMapIteration(self):
 
   def testMapItems(self):
     # Map items used to have strange behaviors when use c extension. Because
-    # [] may reorder the map and invalidate any exsting iterators.
+    # [] may reorder the map and invalidate any existing iterators.
     # TODO(jieluo): Check if [] reordering the map is a bug or intended
     # behavior.
     msg = map_unittest_pb2.TestMap()

src/google/protobuf/descriptor.h

@@ -881,7 +881,7 @@ class PROTOBUF_EXPORT FieldDescriptor : private internal::SymbolBase {
 
   // formats the default value appropriately and returns it as a string.
   // Must have a default value to call this. If quote_string_type is true, then
-  // types of CPPTYPE_STRING whill be surrounded by quotes and CEscaped.
+  // types of CPPTYPE_STRING will be surrounded by quotes and CEscaped.
   std::string DefaultValueAsString(bool quote_string_type) const;
 
   // Helper function that returns the field type name for DebugString.

src/google/protobuf/text_format.cc

@@ -975,7 +975,7 @@ class TextFormat::Parser::ParserImpl {
   }
 
   // Consumes an identifier and saves its value in the identifier parameter.
-  // Returns false if the token is not of type IDENTFIER.
+  // Returns false if the token is not of type IDENTIFIER.
   bool ConsumeIdentifier(std::string* identifier) {
     if (LookingAtType(io::Tokenizer::TYPE_IDENTIFIER)) {
       *identifier = tokenizer_.current().text;
@@ -2272,7 +2272,7 @@ class MapEntryMessageComparator {
 namespace internal {
 class MapFieldPrinterHelper {
  public:
-  // DynamicMapSorter::Sort cannot be used because it enfores syncing with
+  // DynamicMapSorter::Sort cannot be used because it enforces syncing with
   // repeated field.
   static bool SortMap(const Message& message, const Reflection* reflection,
                       const FieldDescriptor* field,

update_version.py

@@ -67,7 +67,7 @@ def RewriteXml(filename, rewriter, add_xml_prefix=True):
   # document.toxml() always prepend the XML version without inserting new line.
   # We wants to preserve as much of the original formatting as possible, so we
   # will remove the default XML version and replace it with our custom one when
-  # whever necessary.
+  # whenever necessary.
   content = document.toxml().replace('<?xml version="1.0" ?>', '')
   file_handle = open(filename, 'wb')
   if add_xml_prefix: