From b36420addb9e1453bd60b2379a4ecf106283b7c3 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Fri, 17 Apr 2015 10:20:35 -0700 Subject: [PATCH] one more fix to csharp_umbrella_namespace comment --- src/google/protobuf/descriptor.proto | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/google/protobuf/descriptor.proto b/src/google/protobuf/descriptor.proto index e039e1121d..33e8a32235 100644 --- a/src/google/protobuf/descriptor.proto +++ b/src/google/protobuf/descriptor.proto @@ -354,9 +354,11 @@ message FileOptions { // Namespace for generated classes; defaults to the package. optional string csharp_namespace = 37; - // A nested namespace for the umbrella class. Helpful for name collisions caused by - // its name conflicting with an existing type. This will be automatically - // set to 'Proto' if a collision is detected with types being generated. + // A nested namespace for the umbrella class, which contains metadata about + // all the messages within the file. This option is helpful for name + // collisions between the umbrella class and an existing type. This will be + // automatically set to 'Proto' if a collision is detected with types being + // generated. optional string csharp_umbrella_namespace = 38; // The parser stores options it doesn't recognize here. See above.