aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/descriptor.proto
diff options
context:
space:
mode:
authorJan Tattermusch <jtattermusch@google.com>2015-04-16 15:32:36 -0700
committerJan Tattermusch <jtattermusch@google.com>2015-04-16 15:32:36 -0700
commitabcde243fe613246aa3d7c0bec21569c0639c95d (patch)
tree97b040622d54051fc14c928043a2ff7e05a4a43e /src/google/protobuf/descriptor.proto
parent2c2f76c50f7122f2c3f4adbde021ad4f110cd066 (diff)
downloadprotobuf-abcde243fe613246aa3d7c0bec21569c0639c95d.tar.gz
protobuf-abcde243fe613246aa3d7c0bec21569c0639c95d.tar.bz2
protobuf-abcde243fe613246aa3d7c0bec21569c0639c95d.zip
Fixed comment for csharp_umbrella_namespace (nest_classes has been removed)
Diffstat (limited to 'src/google/protobuf/descriptor.proto')
-rw-r--r--src/google/protobuf/descriptor.proto3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/google/protobuf/descriptor.proto b/src/google/protobuf/descriptor.proto
index 81c8d99f..b16a1630 100644
--- a/src/google/protobuf/descriptor.proto
+++ b/src/google/protobuf/descriptor.proto
@@ -356,8 +356,7 @@ message FileOptions {
// A nested namespace for the umbrella class. Helpful for name collisions caused by
// umbrella_classname conflicting with an existing type. This will be automatically
- // set to 'Proto' if a collision is detected with types being generated. This value
- // is ignored when nest_classes == true
+ // 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.