Undo the external contributions we have accepted to the well-known types For legal reasons we unfortunately cannot accept any external contributions to the well-known type protos, so this change reverts the small number of changes we have received so far. PiperOrigin-RevId: 517211904
diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index 92fa138..af22782 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml
@@ -24,4 +24,4 @@ with: check_filenames: true skip: ./.git,./third_party,./conformance/third_party,*.snk,*.pb,*.pb.cc,*.pb.h,*.pb.cs,*-upb.h,*-upb.c,./src/google/protobuf/testdata,./objectivec/Tests,./python/compatibility_tests/v2.5.0/tests/google/protobuf/internal,./.github/workflows/codespell.yml - ignore_words_list: "alow,alse,atleast,ba,chec,cleare,copyable,couldn,cloneable,crate,dedup,dur,errorprone,falsy,files',fo,fundementals,hel,importd,inout,leapyear,nd,nin,ois,ons,parseable,process',ro,te,testof,ue,unparseable,wasn,wee,gae,keyserver,objext,od,optin,streem,sur,falsy,cleary" + ignore_words_list: "alow,alse,atleast,ba,chec,cleare,copyable,couldn,cloneable,crate,dedup,dur,errorprone,falsy,files',fo,fundementals,hel,importd,inherting,inout,leapyear,nd,nin,ois,ons,parseable,process',ro,te,testof,ue,unparseable,wasn,wee,gae,keyserver,objext,od,optin,streem,sur,falsy,cleary"
diff --git a/objectivec/GPBAny.pbobjc.h b/objectivec/GPBAny.pbobjc.h index d5378f4..f4efbb2 100644 --- a/objectivec/GPBAny.pbobjc.h +++ b/objectivec/GPBAny.pbobjc.h
@@ -74,7 +74,7 @@ * foo = any.unpack(Foo.getDefaultInstance()); * } * - * Example 3: Pack and unpack a message in Python. + * Example 3: Pack and unpack a message in Python. * * foo = Foo(...) * any = Any() @@ -84,7 +84,7 @@ * any.Unpack(foo) * ... * - * Example 4: Pack and unpack a message in Go + * Example 4: Pack and unpack a message in Go * * foo := &pb.Foo{...} * any, err := anypb.New(foo) @@ -104,7 +104,7 @@ * name "y.z". * * JSON - * + * ==== * The JSON representation of an `Any` value uses the regular * representation of the deserialized, embedded message, with an * additional field `\@type` which contains the type URL. Example:
diff --git a/objectivec/GPBApi.pbobjc.h b/objectivec/GPBApi.pbobjc.h index 9c7e75a..e5554a1 100644 --- a/objectivec/GPBApi.pbobjc.h +++ b/objectivec/GPBApi.pbobjc.h
@@ -245,7 +245,7 @@ * The mixin construct implies that all methods in `AccessControl` are * also declared with same name and request/response types in * `Storage`. A documentation generator or annotation processor will - * see the effective `Storage.GetAcl` method after inheriting + * see the effective `Storage.GetAcl` method after inherting * documentation and annotations as follows: * * service Storage {
diff --git a/objectivec/GPBTimestamp.pbobjc.h b/objectivec/GPBTimestamp.pbobjc.h index 2614e44..510ecc0 100644 --- a/objectivec/GPBTimestamp.pbobjc.h +++ b/objectivec/GPBTimestamp.pbobjc.h
@@ -132,7 +132,7 @@ * [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with * the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use * the Joda Time's [`ISODateTimeFormat.dateTime()`]( - * http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D + * http://joda-time.sourceforge.net/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime() * ) to obtain a formatter capable of generating timestamps in this format. **/ GPB_FINAL @interface GPBTimestamp : GPBMessage
diff --git a/src/google/protobuf/any.proto b/src/google/protobuf/any.proto index 561da0c..c892431 100644 --- a/src/google/protobuf/any.proto +++ b/src/google/protobuf/any.proto
@@ -68,7 +68,7 @@ // foo = any.unpack(Foo.getDefaultInstance()); // } // -// Example 3: Pack and unpack a message in Python. +// Example 3: Pack and unpack a message in Python. // // foo = Foo(...) // any = Any() @@ -78,7 +78,7 @@ // any.Unpack(foo) // ... // -// Example 4: Pack and unpack a message in Go +// Example 4: Pack and unpack a message in Go // // foo := &pb.Foo{...} // any, err := anypb.New(foo) @@ -98,7 +98,7 @@ // name "y.z". // // JSON -// +// ==== // The JSON representation of an `Any` value uses the regular // representation of the deserialized, embedded message, with an // additional field `@type` which contains the type URL. Example:
diff --git a/src/google/protobuf/api.proto b/src/google/protobuf/api.proto index afc9cc1..4222351 100644 --- a/src/google/protobuf/api.proto +++ b/src/google/protobuf/api.proto
@@ -166,7 +166,7 @@ // The mixin construct implies that all methods in `AccessControl` are // also declared with same name and request/response types in // `Storage`. A documentation generator or annotation processor will -// see the effective `Storage.GetAcl` method after inheriting +// see the effective `Storage.GetAcl` method after inherting // documentation and annotations as follows: // // service Storage {
diff --git a/src/google/protobuf/timestamp.proto b/src/google/protobuf/timestamp.proto index 2fb527c..fd0bc07 100644 --- a/src/google/protobuf/timestamp.proto +++ b/src/google/protobuf/timestamp.proto
@@ -127,7 +127,7 @@ // [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with // the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use // the Joda Time's [`ISODateTimeFormat.dateTime()`]( -// http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D +// http://joda-time.sourceforge.net/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime() // ) to obtain a formatter capable of generating timestamps in this format. // message Timestamp {