Terminology style updates for the rest of the security book

[bergerhoffer]

No description provided.

[openshift-docs-preview-bot]

The preview will be available shortly at:

• https://term-updates-[security-2](https://issues.redhat.com/browse/security-2)--ocpdocs.netlify.com/

[jboxman]

A few comments for your review. Thanks!

Feedback incorporated

[bergerhoffer]

/cherrypick enterprise-4.7

[bergerhoffer]

/cherrypick enterprise-4.6

[bergerhoffer]

/cherrypick enterprise-4.5

[openshift-cherrypick-robot]

@bergerhoffer: new pull request created: #27839

In response to this:

/cherrypick enterprise-4.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[bergerhoffer]

/cherrypick enterprise-4.4

[openshift-cherrypick-robot]

@bergerhoffer: new pull request created: #27840

In response to this:

/cherrypick enterprise-4.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[openshift-cherrypick-robot]

@bergerhoffer: #27486 failed to apply on top of branch "enterprise-4.4":

Applying: Terminology style updates for the rest of the security book
Using index info to reconstruct a base tree...
M	modules/about-etcd-encryption.adoc
M	modules/auth-allowing-javascript-access-api-server.adoc
M	modules/builds-adding-input-secrets-configmaps.adoc
M	modules/builds-input-secrets-configmaps.adoc
M	modules/customize-certificates-add-service-serving-apiservice.adoc
M	modules/customize-certificates-add-service-serving-configmap.adoc
M	modules/customize-certificates-add-service-serving-crd.adoc
M	modules/customize-certificates-add-service-serving-mutating-webhook.adoc
M	modules/customize-certificates-add-service-serving-validating-webhook.adoc
M	modules/customize-certificates-add-service-serving.adoc
M	modules/customize-certificates-replace-default-router.adoc
M	modules/customize-certificates-rotate-service-serving.adoc
M	modules/disabling-etcd-encryption.adoc
M	modules/enabling-etcd-encryption.adoc
M	modules/security-build-inputs.adoc
M	modules/security-monitoring-events.adoc
A	security/certificate_types_descriptions/ingress-certificates.adoc
A	security/certificate_types_descriptions/proxy-certificates.adoc
A	security/certificate_types_descriptions/service-ca-certificates.adoc
A	security/certificate_types_descriptions/user-provided-certificates-for-default-ingress.adoc
M	security/container_security/security-platform.adoc
Falling back to patching base and 3-way merge...
Auto-merging security/container_security/security-platform.adoc
CONFLICT (modify/delete): security/certificate_types_descriptions/user-provided-certificates-for-default-ingress.adoc deleted in HEAD and modified in Terminology style updates for the rest of the security book. Version Terminology style updates for the rest of the security book of security/certificate_types_descriptions/user-provided-certificates-for-default-ingress.adoc left in tree.
CONFLICT (modify/delete): security/certificate_types_descriptions/service-ca-certificates.adoc deleted in HEAD and modified in Terminology style updates for the rest of the security book. Version Terminology style updates for the rest of the security book of security/certificate_types_descriptions/service-ca-certificates.adoc left in tree.
CONFLICT (modify/delete): security/certificate_types_descriptions/ingress-certificates.adoc deleted in HEAD and modified in Terminology style updates for the rest of the security book. Version Terminology style updates for the rest of the security book of security/certificate_types_descriptions/ingress-certificates.adoc left in tree.
Auto-merging modules/security-monitoring-events.adoc
Auto-merging modules/security-build-inputs.adoc
CONFLICT (content): Merge conflict in modules/security-build-inputs.adoc
Auto-merging modules/proxy-certificates.adoc
CONFLICT (content): Merge conflict in modules/proxy-certificates.adoc
Auto-merging modules/enabling-etcd-encryption.adoc
Auto-merging modules/disabling-etcd-encryption.adoc
Auto-merging modules/customize-certificates-rotate-service-serving.adoc
CONFLICT (content): Merge conflict in modules/customize-certificates-rotate-service-serving.adoc
Auto-merging modules/customize-certificates-replace-default-router.adoc
Auto-merging modules/customize-certificates-add-service-serving.adoc
Auto-merging modules/customize-certificates-add-service-serving-validating-webhook.adoc
Auto-merging modules/customize-certificates-add-service-serving-mutating-webhook.adoc
Auto-merging modules/customize-certificates-add-service-serving-crd.adoc
Auto-merging modules/customize-certificates-add-service-serving-configmap.adoc
Auto-merging modules/customize-certificates-add-service-serving-apiservice.adoc
Auto-merging modules/builds-input-secrets-configmaps.adoc
CONFLICT (content): Merge conflict in modules/builds-input-secrets-configmaps.adoc
Auto-merging modules/builds-adding-input-secrets-configmaps.adoc
CONFLICT (content): Merge conflict in modules/builds-adding-input-secrets-configmaps.adoc
Auto-merging modules/auth-allowing-javascript-access-api-server.adoc
Auto-merging modules/about-etcd-encryption.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Terminology style updates for the rest of the security book
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".

In response to this:

/cherrypick enterprise-4.4

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[openshift-cherrypick-robot]

@bergerhoffer: new pull request created: #27841

In response to this:

/cherrypick enterprise-4.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.