Skip to content

Commit 18c96ce

Browse files
joedrfIvan Porta
authored andcommitted
found a couple of small docs updates we could make (#1919)
Signed-off-by: Joe Fuller <[email protected]> Signed-off-by: Ivan Porta <[email protected]>
1 parent 2ee0bfc commit 18c96ce

File tree

18 files changed

+25
-25
lines changed

18 files changed

+25
-25
lines changed

linkerd.io/content/2-edge/reference/proxy-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ instead of their original destination. This will inform Linkerd to override the
5252
endpoint selection of the ingress container and to perform its own endpoint
5353
selection, enabling features such as per-route metrics and traffic splitting.
5454

55-
The proxy can be made to run in `ingress` mode by using the `linkerd.io/inject:
55+
The proxy can be configured to run in `ingress` mode by using the `linkerd.io/inject:
5656
ingress` annotation rather than the default `linkerd.io/inject: enabled`
5757
annotation. This can also be done with the `--ingress` flag in the `inject` CLI
5858
command:

linkerd.io/content/2.10/reference/proxy-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ instead of their original destination. This will inform Linkerd to override the
4646
endpoint selection of the ingress container and to perform its own endpoint
4747
selection, enabling features such as per-route metrics and traffic splitting.
4848

49-
The proxy can be made to run in `ingress` mode by used the `linkerd.io/inject:
49+
The proxy can be configured to run in `ingress` mode by used the `linkerd.io/inject:
5050
ingress` annotation rather than the default `linkerd.io/inject: enabled`
5151
annotation. This can also be done with the `--ingress` flag in the `inject` CLI
5252
command:

linkerd.io/content/2.11/reference/proxy-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ instead of their original destination. This will inform Linkerd to override the
4646
endpoint selection of the ingress container and to perform its own endpoint
4747
selection, enabling features such as per-route metrics and traffic splitting.
4848

49-
The proxy can be made to run in `ingress` mode by used the `linkerd.io/inject:
49+
The proxy can be configured to run in `ingress` mode by used the `linkerd.io/inject:
5050
ingress` annotation rather than the default `linkerd.io/inject: enabled`
5151
annotation. This can also be done with the `--ingress` flag in the `inject` CLI
5252
command:

linkerd.io/content/2.12/reference/proxy-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ instead of their original destination. This will inform Linkerd to override the
5252
endpoint selection of the ingress container and to perform its own endpoint
5353
selection, enabling features such as per-route metrics and traffic splitting.
5454

55-
The proxy can be made to run in `ingress` mode by using the `linkerd.io/inject:
55+
The proxy can be configured to run in `ingress` mode by using the `linkerd.io/inject:
5656
ingress` annotation rather than the default `linkerd.io/inject: enabled`
5757
annotation. This can also be done with the `--ingress` flag in the `inject` CLI
5858
command:

linkerd.io/content/2.13/reference/proxy-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ instead of their original destination. This will inform Linkerd to override the
5252
endpoint selection of the ingress container and to perform its own endpoint
5353
selection, enabling features such as per-route metrics and traffic splitting.
5454

55-
The proxy can be made to run in `ingress` mode by using the `linkerd.io/inject:
55+
The proxy can be configured to run in `ingress` mode by using the `linkerd.io/inject:
5656
ingress` annotation rather than the default `linkerd.io/inject: enabled`
5757
annotation. This can also be done with the `--ingress` flag in the `inject` CLI
5858
command:

linkerd.io/content/2.14/reference/proxy-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ instead of their original destination. This will inform Linkerd to override the
5252
endpoint selection of the ingress container and to perform its own endpoint
5353
selection, enabling features such as per-route metrics and traffic splitting.
5454

55-
The proxy can be made to run in `ingress` mode by using the `linkerd.io/inject:
55+
The proxy can be configured to run in `ingress` mode by using the `linkerd.io/inject:
5656
ingress` annotation rather than the default `linkerd.io/inject: enabled`
5757
annotation. This can also be done with the `--ingress` flag in the `inject` CLI
5858
command:

linkerd.io/content/2.15/reference/proxy-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ instead of their original destination. This will inform Linkerd to override the
5252
endpoint selection of the ingress container and to perform its own endpoint
5353
selection, enabling features such as per-route metrics and traffic splitting.
5454

55-
The proxy can be made to run in `ingress` mode by using the `linkerd.io/inject:
55+
The proxy can be configured to run in `ingress` mode by using the `linkerd.io/inject:
5656
ingress` annotation rather than the default `linkerd.io/inject: enabled`
5757
annotation. This can also be done with the `--ingress` flag in the `inject` CLI
5858
command:

linkerd.io/content/2.16/reference/proxy-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ instead of their original destination. This will inform Linkerd to override the
5252
endpoint selection of the ingress container and to perform its own endpoint
5353
selection, enabling features such as per-route metrics and traffic splitting.
5454

55-
The proxy can be made to run in `ingress` mode by using the `linkerd.io/inject:
55+
The proxy can be configured to run in `ingress` mode by using the `linkerd.io/inject:
5656
ingress` annotation rather than the default `linkerd.io/inject: enabled`
5757
annotation. This can also be done with the `--ingress` flag in the `inject` CLI
5858
command:

linkerd.io/content/2.17/reference/proxy-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ instead of their original destination. This will inform Linkerd to override the
5252
endpoint selection of the ingress container and to perform its own endpoint
5353
selection, enabling features such as per-route metrics and traffic splitting.
5454

55-
The proxy can be made to run in `ingress` mode by using the `linkerd.io/inject:
55+
The proxy can be configured to run in `ingress` mode by using the `linkerd.io/inject:
5656
ingress` annotation rather than the default `linkerd.io/inject: enabled`
5757
annotation. This can also be done with the `--ingress` flag in the `inject` CLI
5858
command:

linkerd.io/data/cli/2-10.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ AnnotationsReference:
6262
- Description: Used to configure the outbound TCP connection timeout in the proxy
6363
Name: config.linkerd.io/proxy-outbound-connect-timeout
6464
- Description: The proxy sidecar will stay alive for at least the given period before
65-
receiving SIGTERM signal from Kubernetes but no longer than pod's `terminationGracePeriodSeconds`.
65+
receiving SIGTERM signal from Kubernetes but no longer than the pod's `terminationGracePeriodSeconds`.
6666
If not provided, it will be defaulted to `0`
6767
Name: config.alpha.linkerd.io/proxy-wait-before-exit-seconds
6868
CLIReference:

0 commit comments

Comments
 (0)