Internal change
PiperOrigin-RevId: 590998510
diff --git a/src/google/protobuf/descriptor.proto b/src/google/protobuf/descriptor.proto
index ebb92c6..1d9876e 100644
--- a/src/google/protobuf/descriptor.proto
+++ b/src/google/protobuf/descriptor.proto
@@ -576,10 +576,6 @@
reserved 4, 5, 6;
- // NOTE: Do not set the option in .proto files. Always use the maps syntax
- // instead. The option should only be implicitly set by the proto compiler
- // parser.
- //
// Whether the message is an automatically generated map entry type for the
// maps field.
//
@@ -597,6 +593,10 @@
// use a native map in the target language to hold the keys and values.
// The reflection APIs in such implementations still need to work as
// if the field is a repeated message field.
+ //
+ // NOTE: Do not set the option in .proto files. Always use the maps syntax
+ // instead. The option should only be implicitly set by the proto compiler
+ // parser.
optional bool map_entry = 7;
reserved 8; // javalite_serializable
@@ -1104,7 +1104,7 @@
// location.
//
// Each element is a field number or an index. They form a path from
- // the root FileDescriptorProto to the place where the definition occurs.
+ // the root FileDescriptorProto to the place where the definition appears.
// For example, this path:
// [ 4, 3, 2, 7, 1 ]
// refers to:
