Skip to content

Commit a2ff385

Browse files
authored
Merge pull request #20903 from irvifa/fix-notes
Fix note indentation since it's causing the CSS to break.
2 parents 8f2710f + 380add9 commit a2ff385

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

content/en/docs/concepts/services-networking/ingress.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,10 @@ path types:
134134
to the list of labels in the path split by the `/` separator. A request is a
135135
match for path _p_ if every _p_ is an element-wise prefix of _p_ of the
136136
request path.
137-
{{< note >}}
138-
If the last element of the path is a substring of the
139-
last element in request path, it is not a match (for example:
140-
`/foo/bar` matches`/foo/bar/baz`, but does not match `/foo/barbaz`).
141-
{{< /note >}}
137+
138+
{{< note >}}
139+
If the last element of the path is a substring of the last element in request path, it is not a match (for example: `/foo/bar` matches`/foo/bar/baz`, but does not match `/foo/barbaz`).
140+
{{< /note >}}
142141

143142
#### Multiple Matches
144143
In some cases, multiple paths within an Ingress will match a request. In those

content/en/docs/concepts/workloads/controllers/deployment.md

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,9 @@ In this example:
5353
In this case, you simply select a label that is defined in the Pod template (`app: nginx`).
5454
However, more sophisticated selection rules are possible,
5555
as long as the Pod template itself satisfies the rule.
56+
5657
{{< note >}}
57-
The `.spec.selector.matchLabels` field is a map of {key,value} pairs. A single {key,value} in the `matchLabels` map
58-
is equivalent to an element of `matchExpressions`, whose key field is "key" the operator is "In",
59-
and the values array contains only "value".
60-
All of the requirements, from both `matchLabels` and `matchExpressions`, must be satisfied in order to match.
58+
The `.spec.selector.matchLabels` field is a map of {key,value} pairs. A single {key,value} in the `matchLabels` map is equivalent to an element of `matchExpressions`, whose key field is "key" the operator is "In", and the values array contains only "value". All of the requirements, from both `matchLabels` and `matchExpressions`, must be satisfied in order to match.
6159
{{< /note >}}
6260

6361
* The `template` field contains the following sub-fields:
@@ -73,10 +71,9 @@ In this example:
7371

7472
1. Create the Deployment by running the following command:
7573

76-
{{< note >}}
77-
You may specify the `--record` flag to write the command executed in the resource annotation `kubernetes.io/change-cause`. It is useful for future introspection.
78-
For example, to see the commands executed in each Deployment revision.
79-
{{< /note >}}
74+
{{< note >}}
75+
You may specify the `--record` flag to write the command executed in the resource annotation `kubernetes.io/change-cause`. It is useful for future introspection. For example, to see the commands executed in each Deployment revision.
76+
{{< /note >}}
8077

8178
```shell
8279
kubectl apply -f https://k8s.io/examples/controllers/nginx-deployment.yaml
@@ -409,9 +406,7 @@ rolled back.
409406
```
410407

411408
{{< note >}}
412-
The Deployment controller stops the bad rollout automatically, and stops scaling up the new
413-
ReplicaSet. This depends on the rollingUpdate parameters (`maxUnavailable` specifically) that you have specified.
414-
Kubernetes by default sets the value to 25%.
409+
The Deployment controller stops the bad rollout automatically, and stops scaling up the new ReplicaSet. This depends on the rollingUpdate parameters (`maxUnavailable` specifically) that you have specified. sKubernetes by default sets the value to 25%.
415410
{{< /note >}}
416411

417412
* Get the description of the Deployment:

0 commit comments

Comments
 (0)