Fixing broken links and typos

[kkeirstead]

Summary

Release Notes Entry

[jander-msft]

/backport to release/7.x

[github-actions]

Started backporting to release/7.x: https://github.com/dotnet/dotnet-monitor/actions/runs/3252611494

[github-actions]

@jander-msft backporting to release/7.x failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Fixed ScenarioState name
Applying: Update collectionrules-get.md
Using index info to reconstruct a base tree...
A	documentation/api/collectionrules-get.md
Falling back to patching base and 3-way merge...
Auto-merging documentation/api/collectionrules-individual.md
Applying: Update collectionrules-list.md
Using index info to reconstruct a base tree...
A	documentation/api/collectionrules-list.md
Falling back to patching base and 3-way merge...
Auto-merging documentation/api/collectionrules-all.md
CONFLICT (content): Merge conflict in documentation/api/collectionrules-all.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 Update collectionrules-list.md
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

[wiktork]

/backport to release/7.x

[github-actions]

Started backporting to release/7.x: https://github.com/dotnet/dotnet-monitor/actions/runs/3689376781

[github-actions]

@wiktork backporting to release/7.x failed, the patch most likely resulted in conflicts.

Please backport manually using one of the below commands, followed by git am --continue once the merge conflict has been resolved.

PowerShell

(Invoke-WebRequest "https://github.com/dotnet/dotnet-monitor/commit/e0f12a26c962efb67a9a9b28787dd890bba78a05.patch").Content | git am --3way --ignore-whitespace --exclude="documentation/**.md" --keep-non-patch

Bash

curl -sSL "https://github.com/dotnet/dotnet-monitor/commit/e0f12a26c962efb67a9a9b28787dd890bba78a05.patch" | git am --3way --ignore-whitespace --exclude="documentation/**.md" --keep-non-patch

---

git am error output:

$ git am --3way --ignore-whitespace --exclude="documentation/**.md" --keep-non-patch changes.patch

Applying: Fixing broken links and typos (#2672)
Using index info to reconstruct a base tree...
M	src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/Runners/AppRunner.cs
M	src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/TestAppScenarios.cs
M	src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/LoggingExtensions.cs
M	src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/ScenarioHelpers.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/ScenarioHelpers.cs
Auto-merging src/Tests/Microsoft.Diagnostics.Monitoring.UnitTestApp/LoggingExtensions.cs
Auto-merging src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/TestAppScenarios.cs
Auto-merging src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/Runners/AppRunner.cs
CONFLICT (content): Merge conflict in src/Tests/Microsoft.Diagnostics.Monitoring.TestCommon/Runners/AppRunner.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fixing broken links and typos (#2672)
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128