From ecf29571061337e6fbd70283f0a6ad0202e94b24 Mon Sep 17 00:00:00 2001
From: Jisi Liu <jisi.liu@gmail.com>
Date: Wed, 18 Oct 2017 14:21:22 -0700
Subject: Update descriptor protos

---
 csharp/src/Google.Protobuf/Reflection/Descriptor.cs    | 3 ++-
 csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'csharp/src')

diff --git a/csharp/src/Google.Protobuf/Reflection/Descriptor.cs b/csharp/src/Google.Protobuf/Reflection/Descriptor.cs
index 8c37ba86..6aad0e99 100644
--- a/csharp/src/Google.Protobuf/Reflection/Descriptor.cs
+++ b/csharp/src/Google.Protobuf/Reflection/Descriptor.cs
@@ -3478,7 +3478,8 @@ namespace Google.Protobuf.Reflection {
         = pb::FieldCodec.ForMessage(7994, global::Google.Protobuf.Reflection.UninterpretedOption.Parser);
     private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> uninterpretedOption_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption>();
     /// <summary>
-    /// The parser stores options it doesn't recognize here. See above.
+    /// The parser stores options it doesn't recognize here.
+    /// See the documentation for the "Options" section above.
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> UninterpretedOption {
diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs b/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs
index ef3bc10a..ee4561ff 100644
--- a/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs
+++ b/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs
@@ -239,6 +239,12 @@ namespace Google.Protobuf.WellKnownTypes {
   ///
   /// Note that oneof type names ("test_oneof" in this case) cannot be used in
   /// paths.
+  ///
+  /// ## 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
+  /// `INVALID_ARGUMENT` error if any path is duplicated or unmappable.
   /// </summary>
   public sealed partial class FieldMask : pb::IMessage<FieldMask> {
     private static readonly pb::MessageParser<FieldMask> _parser = new pb::MessageParser<FieldMask>(() => new FieldMask());
-- 
cgit v1.2.3