Project import generated by Copybara.

PiperOrigin-RevId: 598824953
Change-Id: I0478cf318232b10bf71bf0c7f05ec426c1aa232e

Author: Protocol Buffer Team

content/editions/overview.md

@@ -216,8 +216,8 @@ apply when no setting is made within the same scope (field, enum value). Any
 features not explicitly set conform to the behavior defined in the edition
 version used for the .proto file.
 
-The following code sample shows some features being set at the file, message,
-and enum level. The settings are in the highlighted lines:
+The following code sample shows some features being set at the file, field, and
+enum level. The settings are in the highlighted lines:
 
 ```proto {highlight="lines:3,7,16"}
 edition = "2023";

content/news/2024-01-05.md

@@ -0,0 +1,44 @@
++++
+title = "Changes announced January 5, 2024"
+linkTitle = "January 5, 2024"
+toc_hide = "true"
+description = "Changes announced for Protocol Buffers on January 5, 2024."
+type = "docs"
++++
+
+This topic covers breaking changes in Ruby and Python in the 26.x line.
+
+## Ruby Breaking Changes
+
+### Freeze Is Now Recursive in Ruby
+
+Starting in the 26.x line, when freeze is applied it will be applied
+recursively, affecting all sub-messages, maps, and repeated fields.
+
+## Python Breaking Changes
+
+### Removing Deprecated APIs
+
+In the 26.x release, the following deprecated APIs will be removed:
+
+*   [`AddFileDescriptor`](https://googleapis.dev/python/protobuf/latest/google/protobuf/descriptor_pool.html#google.protobuf.descriptor_pool.DescriptorPool.AddFileDescriptor)
+*   [`AddDescriptor`](https://googleapis.dev/python/protobuf/latest/google/protobuf/descriptor_pool.html#google.protobuf.descriptor_pool.DescriptorPool.AddDescriptor)
+*   [`AddEnumDescriptor`](https://googleapis.dev/python/protobuf/latest/google/protobuf/descriptor_pool.html#google.protobuf.descriptor_pool.DescriptorPool.AddEnumDescriptor)
+*   [`AddExtensionDescriptor`](https://googleapis.dev/python/protobuf/latest/google/protobuf/descriptor_pool.html#google.protobuf.descriptor_pool.DescriptorPool.AddExtensionDescriptor)
+*   [`AddServiceDescriptor`](https://googleapis.dev/python/protobuf/latest/google/protobuf/descriptor_pool.html#google.protobuf.descriptor_pool.DescriptorPool.AddServiceDescriptor)
+
+### Rejecting Extend Repeated Field with None Iterable
+
+Starting in the 26.x release, extending repeated fields with a `None` iterable
+will be rejected (it will raise a `TypeError`). For example,
+`m.repeated_int32.extend(None)` will be rejected.
+
+### Removing RegisterExtension in message class
+
+Starting in the 26.x release,
+[`RegisterExtension`](https://googleapis.dev/python/protobuf/latest/google/protobuf/descriptor_pb2.html#google.protobuf.descriptor_pb2.DescriptorProto.ExtensionRange.RegisterExtension)
+will be removed. You can access extensions in Python using the `Extensions`
+property on message objects.
+
+This affects both pure Python and the C++ implementation of Python, but not upb
+Python.

content/news/_index.md

@@ -9,6 +9,8 @@ no_list = "true"
 News topics provide information about past events and changes with Protocol
 Buffers, and plans for upcoming changes.
 
+*   [January 5, 2024](/news/2024-01-05) - Breaking
+    changes in the 26.x line for Ruby and Python
 *   [December 27, 2023](/news/2023-12-27) - Breaking
     changes in the 26.x line for Ruby, PHP, Python, and upb
 *   [December 13, 2023](/news/2023-12-13) - Breaking

content/programming-guides/proto2.md

@@ -863,9 +863,9 @@ the following rules:
 *   For `string`, `bytes`, and message fields, `optional` is compatible with
     `repeated`. Given serialized data of a repeated field as input, clients that
     expect this field to be `optional` will take the last input value if it's a
-    primitive type field or merge all input elements if it's a message type
-    field. Note that this is **not** generally safe for numeric types, including
-    bools and enums. Repeated fields of numeric types can be serialized in the
+    scalar type field or merge all input elements if it's a message type field.
+    Note that this is **not** generally safe for numeric types, including bools
+    and enums. Repeated fields of numeric types can be serialized in the
     [packed](/programming-guides/encoding#packed) format,
     which will not be parsed correctly when an `optional` field is expected.
 *   Changing a default value is generally OK, as long as you remember that
@@ -998,7 +998,9 @@ message UserContent {
       full_name: ".kittens.kitten_videos",
       type: ".kittens.Video",
       repeated: true
-    }
+    },
+    // Ensures all field numbers in this extension range are declarations.
+    verification = DECLARATION
   ];
 }
 ```
@@ -1777,7 +1779,7 @@ value.
       <td>Wrapper types</td>
       <td>various types</td>
       <td><code>2, "2", "foo", true, "true", null, 0, ...</code></td>
-      <td>Wrappers use the same representation in JSON as the wrapped primitive
+      <td>Wrappers use the same representation in JSON as the wrapped scalar
         type, except that <code>null</code> is allowed and preserved during data
         conversion and transfer.
       </td>
@@ -2016,6 +2018,13 @@ enum Data {
 }
 ```
 
+The C++ code to read the `string_name` option might look something like this:
+
+```cpp
+const absl::string_view foo = proto2::GetEnumDescriptor<Data>()
+    ->FindValueByName("DATA_DISPLAY")->options().GetExtension(string_name);
+```
+
 See [Custom Options](#customoptions) to see how to apply custom options to enum
 values and to fields.
 

content/reference/java/java-proto-names.md

@@ -70,51 +70,3 @@ will be placed in a separate `.java` file. This makes it much easier to move
 messages from one `.proto` file to another. There is also an outer Java class
 generated for the `.proto` file itself. (The legend above explains how this
 outer class name is generated.)
-
-## Mutable API Message Names { #mutable-api-message-names }
-
-The names for protos generated by the Java mutable API are outlined in the
-following sections.
-
-{{% alert title="Note" color="note" %}}
-Java mutable API names will be generated only when the
-`java_mutable_proto_library` target is built.
-{{% /alert %}}
-
-{{% alert title="Warning" color="warning" %}} Java
-proto1 is deprecated. go/java-proto1-deprecation describes when proto1 API is
-still generated. Users should avoid proto1 and use proto2 api.
-{{% /alert %}}
-
-### Proto2 Message Names { #proto2-message-names }
-
-java_api_version | (java_multiple_files, java_multiple_files_mutable_package) | java_package | java_outer_classname | java_alt_api_package | Proto2 Mutable message name
-:--------------: | :--------------------------------------------------------: | ------------ | -------------------- | -------------------- | ---------------------------
-\-               | (true, defined)                                            | -            | -                    | -                    | `$java_multiple_files_mutable_package.$message`
-1                | !(true, defined)                                           | Undefined    | Undefined            | Undefined            | `com.google.protos.$package.proto2api.Mutable$Filename.$message`
-1                | !(true, defined)                                           | Undefined    | Undefined            | Defined              | `$java_alt_api_package.Mutable$Filename.$message`
-1                | !(true, defined)                                           | Undefined    | Defined              | Undefined            | `com.google.protos.$package.proto2api.Mutable$java_outer_classname.$message`
-1                | !(true, defined)                                           | Undefined    | Defined              | Defined              | `$java_alt_api_package.Mutable$java_outer_classname.$message`
-1                | !(true, defined)                                           | Defined      | Undefined            | Undefined            | `$java_package.proto2api.Mutable$Filename.$message`
-1                | !(true, defined)                                           | Defined      | Undefined            | Defined              | `$java_alt_api_package.Mutable$Filename.$message`
-1                | !(true, defined)                                           | Defined      | Defined              | Undefined            | `$java_package.proto2api.Mutable$java_outer_classname.$message`
-1                | !(true, defined)                                           | Defined      | Defined              | Defined              | `$java_alt_api_package.Mutable$java_outer_classname.$message`
-2                | !(true, defined)                                           | Undefined    | Undefined            | -                    | `com.google.protos.$package.Mutable$Filename.$message`
-2                | !(true, defined)                                           | Undefined    | Defined              | -                    | `com.google.protos.$package..Mutable$java_outer_classname.$message`
-2                | !(true, defined)                                           | Defined      | Undefined            | -                    | `$java_package.Mutable$Filename.$message`
-2                | !(true, defined)                                           | Defined      | Defined              | -                    | `$java_package.Mutable$java_outer_classname.$message`
-
-**Legend**
-
-*   \- means either setting or not setting the option will not change the
-    generated full message name.
-*   `$message` is the actual name of the proto message.
-*   All other `$names` are the values of the corresponding proto2 file options
-    defined in the proto file.
-
-### Proto1 Message Names { #proto1-message-names }
-
-{{% alert title="Warning" color="warning" %}} Java
-proto1 is deprecated. go/java-proto1-deprecation describes when proto1 API is
-still generated and describes its message names. Users should avoid proto1 and
-use the proto2 api. {{% /alert %}}

content/reference/protobuf/proto2-spec.md

@@ -53,16 +53,16 @@ groupName = capitalLetter { letter | decimalDigit | "_" }
 
 ```
 intLit     = decimalLit | octalLit | hexLit
-decimalLit = ( "1" ... "9" ) { decimalDigit }
-octalLit   = "0" { octalDigit }
-hexLit     = "0" ( "x" | "X" ) hexDigit { hexDigit }
+decimalLit = [-] ( "1" ... "9" ) { decimalDigit }
+octalLit   = [-] "0" { octalDigit }
+hexLit     = [-] "0" ( "x" | "X" ) hexDigit { hexDigit }
 ```
 
 ### Floating-point Literals
 
 ```
-floatLit = ( decimals "." [ decimals ] [ exponent ] | decimals exponent | "."decimals [ exponent ] ) | "inf" | "nan"
-decimals  = decimalDigit { decimalDigit }
+floatLit = [-] ( decimals "." [ decimals ] [ exponent ] | decimals exponent | "."decimals [ exponent ] ) | "inf" | "nan"
+decimals  = [-] decimalDigit { decimalDigit }
 exponent  = ( "e" | "E" ) [ "+" | "-" ] decimals
 ```
 

content/reference/protobuf/proto3-spec.md

@@ -50,16 +50,16 @@ enumType = [ "." ] { ident "." } enumName
 
 ```
 intLit     = decimalLit | octalLit | hexLit
-decimalLit = ( "1" ... "9" ) { decimalDigit }
-octalLit   = "0" { octalDigit }
-hexLit     = "0" ( "x" | "X" ) hexDigit { hexDigit }
+decimalLit = [-] ( "1" ... "9" ) { decimalDigit }
+octalLit   = [-] "0" { octalDigit }
+hexLit     = [-] "0" ( "x" | "X" ) hexDigit { hexDigit }
 ```
 
 ### Floating-point Literals
 
 ```
-floatLit = ( decimals "." [ decimals ] [ exponent ] | decimals exponent | "."decimals [ exponent ] ) | "inf" | "nan"
-decimals  = decimalDigit { decimalDigit }
+floatLit = [-] ( decimals "." [ decimals ] [ exponent ] | decimals exponent | "."decimals [ exponent ] ) | "inf" | "nan"
+decimals  = [-] decimalDigit { decimalDigit }
 exponent  = ( "e" | "E" ) [ "+" | "-" ] decimals
 ```