master -> main (#14729)

Various fixes

Signed-off-by: Matt Klein <mklein@lyft.com>

Mirrored from https://github.com/envoyproxy/envoy @ 17e815122ff53d0ac6cb2d64cdbf1bfc547bb7e8

API_VERSIONING.md

@@ -105,7 +105,7 @@ Envoy will support at most three major versions of any API package at all times:
   for the next stable major version. This is only generated when the current stable major version
   requires a breaking change at the next cycle, e.g. a deprecation or field rename. This release
   candidate is mechanically generated via the
-  [protoxform](https://github.com/envoyproxy/envoy/tree/master/tools/protoxform) tool from the
+  [protoxform](https://github.com/envoyproxy/envoy/tree/main/tools/protoxform) tool from the
   current stable major version, making use of annotations such as `deprecated = true`. This is not a
   human editable artifact.
 
@@ -161,7 +161,7 @@ methods, depending on whether the change is mechanical or manual.
 ## Mechanical breaking changes
 
 Field deprecations, renames, etc. are mechanical changes that are supported by the
-[protoxform](https://github.com/envoyproxy/envoy/tree/master/tools/protoxform) tool. These are
+[protoxform](https://github.com/envoyproxy/envoy/tree/main/tools/protoxform) tool. These are
 guided by [annotations](STYLE.md#api-annotations).
 
 ## Manual breaking changes

CONTRIBUTING.md

@@ -9,7 +9,7 @@ changes. They may be as part of a larger implementation PR. Please follow the st
 process for validating build/test sanity of `api/` before submitting a PR.
 
 *Note: New .proto files should be added to
-[BUILD](https://github.com/envoyproxy/envoy/blob/master/api/versioning/BUILD) in order to get the RSTs generated.*
+[BUILD](https://github.com/envoyproxy/envoy/blob/main/api/versioning/BUILD) in order to get the RSTs generated.*
 
 ## Documentation changes
 

README.md

@@ -9,9 +9,9 @@ blog post for more information on the universal data plane concept.
 # Repository structure
 
 The API tree can be found at two locations:
-* https://github.com/envoyproxy/envoy/tree/master/api - canonical read/write home for the APIs.
+* https://github.com/envoyproxy/envoy/tree/main/api - canonical read/write home for the APIs.
 * https://github.com/envoyproxy/data-plane-api - read-only mirror of
-  https://github.com/envoyproxy/envoy/tree/master/api, providing the ability to consume the data
+  https://github.com/envoyproxy/envoy/tree/main/api, providing the ability to consume the data
   plane APIs without the Envoy implementation.
 
 # Further API reading

envoy/api/v2/core/protocol.proto

@@ -201,7 +201,7 @@ message Http2ProtocolOptions {
   // Still under implementation. DO NOT USE.
   //
   // Allows metadata. See [metadata
-  // docs](https://github.com/envoyproxy/envoy/blob/master/source/docs/h2_metadata.md) for more
+  // docs](https://github.com/envoyproxy/envoy/blob/main/source/docs/h2_metadata.md) for more
   // information.
   bool allow_metadata = 6;
 

envoy/config/core/v3/protocol.proto

@@ -266,7 +266,7 @@ message Http2ProtocolOptions {
   // Still under implementation. DO NOT USE.
   //
   // Allows metadata. See [metadata
-  // docs](https://github.com/envoyproxy/envoy/blob/master/source/docs/h2_metadata.md) for more
+  // docs](https://github.com/envoyproxy/envoy/blob/main/source/docs/h2_metadata.md) for more
   // information.
   bool allow_metadata = 6;
 

envoy/config/core/v4alpha/protocol.proto

@@ -273,7 +273,7 @@ message Http2ProtocolOptions {
   // Still under implementation. DO NOT USE.
   //
   // Allows metadata. See [metadata
-  // docs](https://github.com/envoyproxy/envoy/blob/master/source/docs/h2_metadata.md) for more
+  // docs](https://github.com/envoyproxy/envoy/blob/main/source/docs/h2_metadata.md) for more
   // information.
   bool allow_metadata = 6;