Merge pull request #39 from Logofile/sync

Project import generated by Copybara.

Author: Logofile

content/programming-guides/encoding.md

@@ -204,7 +204,7 @@ Signed Original | Encoded As
 Using some bit tricks, it's cheap to convert `n` into its ZigZag representation:
 
 ```
-(n + n) ^ -(n < 0) - (n < 0)
+((n + n) ^ -(n < 0)) - (n < 0)
 ```
 
 Here, we assume that the boolean `n < 0` is converted into an integer 1 if true

content/programming-guides/proto.md content/programming-guides/proto2.mdcontent/programming-guides/proto.md renamed to content/programming-guides/proto2.md

@@ -6,6 +6,8 @@ linkTitle: "Language Guide (proto 2)"
 no_list: "true"
 type: docs
 description: "This topic covers how to use the version 2 of Protocol Buffers in your project. It contains language-agnostic content. For information specific to the language you're using, see the corresponding documentation for your language."
+aliases: 
+  - /programming-guides/proto/
 ---
 
 This guide describes how to use the protocol buffer language to structure your

content/reference/cpp/cpp-generated.md

@@ -267,17 +267,19 @@ The compiler will generate the following accessor methods:
     whatever value is written into the given string.
 -   `void clear_foo()`: Clears the value of the field. After calling this,
     `has_foo()` will return `false` and `foo()` will return the default value.
--   `void set_allocated_foo(string* value)`: Sets the `string` object to the
-    field and frees the previous field value if it exists. If the `string`
-    pointer is not `NULL`, the message takes ownership of the allocated `string`
-    object and `has_foo()` will return `true`. The message is free to delete the
-    allocated `string` object at any time, so references to the object may be
-    invalidated. Otherwise, if the `value` is `NULL`, the behavior is the same
-    as calling `clear_foo()`.
--   `string* release_foo()`: Releases the ownership of the field and returns the
-    pointer of the `string` object. After calling this, caller takes the
-    ownership of the allocated `string` object, `has_foo()` will return `false`,
-    and `foo()` will return the default value.
+-   `void set_allocated_foo(string* value)`:
+    Sets the `string`
+    object to the field and frees the previous field value if it exists. If the
+    `string` pointer is not `NULL`, the message takes ownership of the allocated
+    `string` object and `has_foo()` will return `true`. The message is free to
+    delete the allocated `string` object at any time, so references to the
+    object may be invalidated. Otherwise, if the `value` is `NULL`, the behavior
+    is the same as calling `clear_foo()`.
+-   `string* release_foo()`:
+    Releases the
+    ownership of the field and returns the pointer of the `string` object. After
+    calling this, caller takes the ownership of the allocated `string` object,
+    `has_foo()` will return `false`, and `foo()` will return the default value.
 
 ### Singular String Fields (proto3) {#proto3_string}
 
@@ -309,16 +311,18 @@ The compiler will generate the following accessor methods:
     return whatever value is written into the given string.
 -   `void clear_foo()`: Clears the value of the field. After calling this,
     `foo()` will return the empty string/empty bytes.
--   `void set_allocated_foo(string* value)`: Sets the `string` object to the
-    field and frees the previous field value if it exists. If the `string`
-    pointer is not `NULL`, the message takes ownership of the allocated `string`
-    object. The message is free to delete the allocated `string` object at any
-    time, so references to the object may be invalidated. Otherwise, if the
-    `value` is `NULL`, the behavior is the same as calling `clear_foo()`.
--   `string* release_foo()`: Releases the ownership of the field and returns the
-    pointer of the `string` object. After calling this, caller takes the
-    ownership of the allocated `string` object and `foo()` will return the empty
-    string/empty bytes.
+-   `void set_allocated_foo(string* value)`:
+    Sets the `string`
+    object to the field and frees the previous field value if it exists. If the
+    `string` pointer is not `NULL`, the message takes ownership of the allocated
+    `string` object. The message is free to delete the allocated `string` object
+    at any time, so references to the object may be invalidated. Otherwise, if
+    the `value` is `NULL`, the behavior is the same as calling `clear_foo()`.
+-   `string* release_foo()`:
+    Releases the
+    ownership of the field and returns the pointer of the `string` object. After
+    calling this, caller takes the ownership of the allocated `string` object
+    and `foo()` will return the empty string/empty bytes.
 
 ### Singular Enum Fields (proto2) {#enum_field}
 

content/reference/protobuf/proto2-spec.md

@@ -144,7 +144,8 @@ package foo.bar;
 
 Options can be used in proto files, messages, enums and services. An option can
 be a protobuf defined option or a custom option. For more information, see
-[Options](/programming-guides/proto#options) in the language guide.
+[Options](/programming-guides/proto#options) in the
+language guide.
 
 ```
 option = "option" optionName  "=" constant ";"
@@ -340,6 +341,37 @@ message Outer {
 }
 ```
 
+None of the entities declared inside a message may have conflicting names. All
+of the following are prohibited:
+
+```
+message MyMessage {
+  optional string foo = 1;
+  message foo {}
+}
+
+message MyMessage {
+  optional string foo = 1;
+  oneof foo {
+    string bar = 2;
+  }
+}
+
+message MyMessage {
+  optional string foo = 1;
+  extend Extendable {
+    optional string foo = 2;
+  }
+}
+
+message MyMessage {
+  optional string foo = 1;
+  enum E {
+    foo = 0;
+  }
+}
+```
+
 ### Extend
 
 If a message in the same or imported .proto file has reserved a range for

content/reference/protobuf/proto3-spec.md

@@ -146,7 +146,8 @@ package foo.bar;
 
 Options can be used in proto files, messages, enums and services. An option can
 be a protobuf defined option or a custom option. For more information, see
-[Options](/programming-guides/proto3#options) in the language guide.
+[Options](/programming-guides/proto3#options) in the
+language guide.
 
 ```
 option = "option" optionName  "=" constant ";"
@@ -292,6 +293,30 @@ message Outer {
 }
 ```
 
+None of the entities declared inside a message may have conflicting names. All
+of the following are prohibited:
+
+```
+message MyMessage {
+  optional string foo = 1;
+  message foo {}
+}
+
+message MyMessage {
+  optional string foo = 1;
+  oneof foo {
+    string bar = 2;
+  }
+}
+
+message MyMessage {
+  optional string foo = 1;
+  enum E {
+    foo = 0;
+  }
+}
+```
+
 ### Service Definition {#service_definition}
 
 ```

content/reference/python/python-generated.md

@@ -133,7 +133,7 @@ can refer to it as `Foo.Bar`.
 ## Well Known Types {#wkt}
 
 Protocol buffers provides a number of
-[well-known types](/reference/protobuf/google.protobuf.md)
+[well-known types](/reference/protobuf/google.protobuf)
 that you can use in your .proto files along with your own message types. Some
 WKT messages have special methods in addition to the usual protocol buffer
 message methods, as they subclass both
@@ -950,7 +950,7 @@ generic services are deprecated. (Note that prior to 2.4.0, the option defaults
 to `true`)
 
 RPC systems based on `.proto`-language service definitions should provide
-[plugins](/reference/cpp/api-docs/google.protobuf.compiler.plugin.pb.md)
+[plugins](/reference/cpp/api-docs/google.protobuf.compiler.plugin.pb)
 to generate code appropriate for the system. These plugins are likely to require
 that abstract services are disabled, so that they can generate their own classes
 of the same names. Plugins are new in version 2.3.0 (January 2010).
@@ -1017,7 +1017,7 @@ implementations of `RpcChannel` and
 
 ## Plugin Insertion Points {#plugins}
 
-[Code generator plugins](/reference/cpp/api-docs/google.protobuf.compiler.plugin.pb.md)
+[Code generator plugins](/reference/cpp/api-docs/google.protobuf.compiler.plugin)
 which want to extend the output of the Python code generator may insert code of
 the following types using the given insertion point names.