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

Fix typos in traits doc #434

Merged
merged 1 commit into from
Feb 14, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions docs/traits.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ The following is a list of common traits that can be configured by the end users
It's enabled by default on vanilla Kubernetes/Openshift profiles.

| knative
| Knative (Kubernetes, Openshift)
| Knative (Kubernetes, OpenShift)
| Creates Knative resources to run the integration instead of the standard Kubernetes resources.
+
+
Expand All @@ -85,7 +85,7 @@ The following is a list of common traits that can be configured by the end users
!===

| istio
| Knative (Kubernetes, Openshift)
| Knative (Kubernetes, OpenShift)
| Allows to configure outbound traffic for Istio.
+
+
Expand Down Expand Up @@ -165,7 +165,7 @@ The following is a list of common traits that can be configured by the end users
! The protocol to use, either `http` or `https` (default `https` for OpenShift)

! jolokia.host
! The Hostaddress to which the Jolokia agent should bind to. If `"\*"` or `"0.0.0.0"` is given, the servers binds to every network interface (default `"*"`).
! The Host address to which the Jolokia agent should bind to. If `"\*"` or `"0.0.0.0"` is given, the servers binds to every network interface (default `"*"`).

! jolokia.port
! The Jolokia endpoint port (default `8778`).
Expand All @@ -192,7 +192,7 @@ The following is a list of common traits that can be configured by the end users
! Mandate the client certificate contains a client flag in the extended key usage section, applicable when `protocol` is `https` and `use-ssl-client-authentication` is `true` (default `true` for OpenShift).

! jolokia.options
! A comma-separared list of additional Jolokia options as defined in https://jolokia.org/reference/html/agents.html#agent-jvm-config[JVM agent configuration options], e.g.: `keystore=...,executor=...`
! A comma-separated list of additional Jolokia options as defined in https://jolokia.org/reference/html/agents.html#agent-jvm-config[JVM agent configuration options], e.g.: `keystore=...,executor=...`

!===

Expand Down Expand Up @@ -240,10 +240,10 @@ There are also platform traits that **normally should not be configured** by the
!===

! owner.target-annotations
! The annotations to be transfered (A comma-separared list of label keys)
! The annotations to be transferred (A comma-separated list of label keys)

! owner.target-labels
! The labels to be transfered (A comma-separared list of label keys)
! The labels to be transferred (A comma-separated list of label keys)

!===

Expand Down