aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/field_mask.proto
diff options
context:
space:
mode:
authorstone4774 <25053818+stone4774@users.noreply.github.com>2018-03-22 11:16:34 +0800
committerGitHub <noreply@github.com>2018-03-22 11:16:34 +0800
commitc99f5278eb8dad6f42def88ce8b5a3453f6df4a8 (patch)
treec3cd284ec9d2981f61da266d040935b73275b5c4 /src/google/protobuf/field_mask.proto
parentd053271deebe0efcd41729991b1f3d618b638ad5 (diff)
parented4321d1cb33199984118d801956822842771e7e (diff)
downloadprotobuf-c99f5278eb8dad6f42def88ce8b5a3453f6df4a8.tar.gz
protobuf-c99f5278eb8dad6f42def88ce8b5a3453f6df4a8.tar.bz2
protobuf-c99f5278eb8dad6f42def88ce8b5a3453f6df4a8.zip
Merge branch 'master' into fixbug_enum2json2
Diffstat (limited to 'src/google/protobuf/field_mask.proto')
-rw-r--r--src/google/protobuf/field_mask.proto4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/field_mask.proto b/src/google/protobuf/field_mask.proto
index eb96ba00..76e09f39 100644
--- a/src/google/protobuf/field_mask.proto
+++ b/src/google/protobuf/field_mask.proto
@@ -243,8 +243,8 @@ option go_package = "google.golang.org/genproto/protobuf/field_mask;field_mask";
//
// ## Field Mask Verification
//
-// The implementation of the all the API methods, which have any FieldMask type
-// field in the request, should verify the included field paths, and return
+// The implementation of any API method which has a FieldMask type field in the
+// request should verify the included field paths, and return an
// `INVALID_ARGUMENT` error if any path is duplicated or unmappable.
message FieldMask {
// The set of field mask paths.