Merge branch 'main' into ResourceMergePrecedence

CONTRIBUTING.md

@@ -186,12 +186,10 @@ issue](https://github.com/open-telemetry/opentelemetry-specification/issues/165)
 
 ## Style Guide
 
-This project includes a
-[`.editorconfig`](https://github.com/open-telemetry/opentelemetry-dotnet/blob/master/.editorconfig)
-file which is supported by all the IDEs/editor mentioned above. It works with
-the IDE/editor only and does not affect the actual build of the project.
+This project includes a [`.editorconfig`](./.editorconfig) file which is
+supported by all the IDEs/editor mentioned above. It works with the IDE/editor
+only and does not affect the actual build of the project.
 
-This repository also includes [stylecop ruleset
-files](https://github.com/open-telemetry/opentelemetry-dotnet/tree/master/build).
+This repository also includes stylecop ruleset files under the `./build` folder.
 These files are used to configure the _StyleCop.Analyzers_ which runs during
 build. Breaking the rules will result in a build failure.

docs/docfx.json

@@ -28,6 +28,7 @@
     "resource": [
       {
         "files": [
+          ".editorconfig",
           "docs/**.cs",
           "examples/**.cs",
           "src/**.cs"

src/OpenTelemetry.Instrumentation.SqlClient/SqlClientInstrumentationOptions.cs

@@ -108,7 +108,7 @@ public class SqlClientInstrumentationOptions
         /// <para><see cref="Activity"/>: the activity being enriched.</para>
         /// <para>string: the name of the event.</para>
         /// <para>object: the raw <c>SqlCommand</c> object from which additional information can be extracted to enrich the activity.</para>
-        /// <para>See also: <a href="https://github.com/open-telemetry/opentelemetry-dotnet/tree/master/src/OpenTelemetry.Instrumentation.SqlClient#Enrich">example</a>.</para>
+        /// <para>See also: <a href="https://github.com/open-telemetry/opentelemetry-dotnet/tree/main/src/OpenTelemetry.Instrumentation.SqlClient#Enrich">example</a>.</para>
         /// </remarks>
         /// <example>
         /// <code>