Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of docs: Fix spelling errors across various pages on the site into release/1.16.x #18537

Conversation

hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #18533 to be assessed for backporting due to the inclusion of the label backport/1.16.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@blake
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


This commit fixes numerous spelling errors across the site and also removes unnecessary whitespace that was present in the edited files.

These changes are best viewed with 'hide whitespace changes' enabled.

Description

Testing & Reproduction steps

Links

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/docs/blake/fix-spelling-errors-aug23/typically-neutral-bluegill branch from 6126ed2 to 985b2f5 Compare August 21, 2023 16:54
@hashicorp-cla
Copy link

hashicorp-cla commented Aug 21, 2023

CLA assistant check
All committers have signed the CLA.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto approved Consul Bot automated PR

@blake blake marked this pull request as ready for review August 21, 2023 16:56
@blake blake force-pushed the backport/docs/blake/fix-spelling-errors-aug23/typically-neutral-bluegill branch from d046d14 to 19f8280 Compare August 21, 2023 17:35
@blake blake requested a review from a team as a code owner August 21, 2023 17:35
@blake blake enabled auto-merge (squash) August 21, 2023 17:36
This commit fixes numerous spelling errors across the site and also
removes unnecessary whitespace that was present in the edited files.
@blake blake force-pushed the backport/docs/blake/fix-spelling-errors-aug23/typically-neutral-bluegill branch from 19f8280 to 2a05352 Compare August 24, 2023 00:21
@blake blake added the type/docs Documentation needs to be created/updated/clarified label Aug 24, 2023
@blake blake merged commit 1b95173 into release/1.16.x Aug 24, 2023
50 checks passed
@blake blake deleted the backport/docs/blake/fix-spelling-errors-aug23/typically-neutral-bluegill branch August 24, 2023 00:27
absolutelightning pushed a commit that referenced this pull request Sep 4, 2023
…to release/1.16.x (#18520)

resolve conflict

Co-authored-by: temp <[email protected]>

Backport of bug: prevent go routine leakage due to existing DeferCheck into release/1.16.x (#18565)

* backport of commit 06d4c72

* backport of commit 42c37bb

---------

Co-authored-by: cskh <[email protected]>

fix for , non presence of consul-version meta (#18464) (#18561)

* fix for #18406 , non presence of consul-version meta

Co-authored-by: Vijay <[email protected]>

[BACKPORT] 1.16.x manual backport of OSS->CE branch (#18549)

Backport of NET-5382 & PLAT-1159: Do not trigger workflow if only doc files are in commit history into release/1.16.x (#18570)

backport of commit c833fcc

Co-authored-by: NiniOak <[email protected]>

Backport of docs: Fix spelling errors across various pages on the site into release/1.16.x (#18537)

docs: Fix spelling errors across various pages on the site (#18533)

This commit fixes numerous spelling errors across the site and also
removes unnecessary whitespace that was present in the edited files.

Co-authored-by: Blake Covarrubias <[email protected]>

Backport of Fix broken link on sameness group page into release/1.16.x (#18588)

backport of commit 05dd1a8

Co-authored-by: Tu Nguyen <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type/docs Documentation needs to be created/updated/clarified
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants