diff options
| author | Jan Tattermusch <jtattermusch@google.com> | 2015-04-17 10:20:35 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2015-04-17 10:20:35 -0700 |
| commit | b36420addb9e1453bd60b2379a4ecf106283b7c3 (patch) | |
| tree | 906e0c84dd4f93c303a19402aefc4d2f249adba9 | |
| parent | b6555b1da0cf3b00fcfd139f4465861268a44ed2 (diff) | |
| download | protobuf-b36420addb9e1453bd60b2379a4ecf106283b7c3.tar.gz protobuf-b36420addb9e1453bd60b2379a4ecf106283b7c3.tar.bz2 protobuf-b36420addb9e1453bd60b2379a4ecf106283b7c3.zip | |
one more fix to csharp_umbrella_namespace comment
| -rw-r--r-- | src/google/protobuf/descriptor.proto | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/google/protobuf/descriptor.proto b/src/google/protobuf/descriptor.proto index e039e112..33e8a322 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. |