diff --git a/csharp/src/Google.Protobuf.Test/testprotos.pb b/csharp/src/Google.Protobuf.Test/testprotos.pb
index 8fb22bcc89..d399cd7572 100644
Binary files a/csharp/src/Google.Protobuf.Test/testprotos.pb and b/csharp/src/Google.Protobuf.Test/testprotos.pb differ
diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Any.pb.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Any.pb.cs
index b72a050ea6..535d47793e 100644
--- a/csharp/src/Google.Protobuf/WellKnownTypes/Any.pb.cs
+++ b/csharp/src/Google.Protobuf/WellKnownTypes/Any.pb.cs
@@ -69,7 +69,7 @@ namespace Google.Protobuf.WellKnownTypes {
   ///       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()
@@ -79,7 +79,7 @@ namespace Google.Protobuf.WellKnownTypes {
   ///       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)
@@ -99,7 +99,7 @@ namespace Google.Protobuf.WellKnownTypes {
   /// 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/csharp/src/Google.Protobuf/WellKnownTypes/Api.pb.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Api.pb.cs
index c524031e34..f76b09eac7 100644
--- a/csharp/src/Google.Protobuf/WellKnownTypes/Api.pb.cs
+++ b/csharp/src/Google.Protobuf/WellKnownTypes/Api.pb.cs
@@ -964,7 +964,7 @@ namespace Google.Protobuf.WellKnownTypes {
   /// 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/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.pb.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.pb.cs
index e6d57afd55..ce6915b7ec 100644
--- a/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.pb.cs
+++ b/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.pb.cs
@@ -128,7 +128,7 @@ namespace Google.Protobuf.WellKnownTypes {
   /// [`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.
   /// </summary>
   public sealed partial class Timestamp : pb::IMessage<Timestamp>