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

[8.10] Fixes "Enrol"/"Enroll" typo (backport #5805) #5812

Merged
merged 3 commits into from
Sep 11, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 11, 2024

Fixes #5794 - the British English form of "Enrol" (instead of "Enroll") was used in Get started with CSPM docs


This is an automatic backport of pull request #5805 done by Mergify.

(cherry picked from commit 2815edd)

# Conflicts:
#	docs/cloud-native-security/cspm-get-started-gcp.asciidoc
#	docs/serverless/cloud-native-security/cspm-get-started-gcp.mdx
#	docs/serverless/cloud-native-security/cspm-get-started.mdx
Copy link
Author

mergify bot commented Sep 11, 2024

Cherry-pick of 2815edd has failed:

On branch mergify/bp/8.10/pr-5805
Your branch is up to date with 'origin/8.10'.

You are currently cherry-picking commit 2815edd9.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   docs/cloud-native-security/cspm-get-started-aws.asciidoc

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   docs/cloud-native-security/cspm-get-started-gcp.asciidoc
	deleted by us:   docs/serverless/cloud-native-security/cspm-get-started-gcp.mdx
	deleted by us:   docs/serverless/cloud-native-security/cspm-get-started.mdx

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link

A documentation preview will be available soon.

Request a new doc build by commenting
  • Rebuild this PR: run docs-build
  • Rebuild this PR and all Elastic docs: run docs-build rebuild

run docs-build is much faster than run docs-build rebuild. A rebuild should only be needed in rare situations.

If your PR continues to fail for an unknown reason, the doc build pipeline may be broken. Elastic employees can check the pipeline status here.

@benironside benironside merged commit e3339a7 into 8.10 Sep 11, 2024
4 checks passed
@mergify mergify bot deleted the mergify/bp/8.10/pr-5805 branch September 11, 2024 20:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant