Skip to content

Commit c0263a3

Browse files
authored
Merge pull request #59999 from dfitzmau/ocp-glines-conscious-lang-machines
ocp-glines-conscious-lang-machines: Updated the concious lang. sectio…
2 parents 2cdeafd + 17a2494 commit c0263a3

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

contributing_to_docs/doc_guidelines.adoc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,10 +434,10 @@ To assist with the removal of the problematic word "master" from the documentati
434434
|===
435435
|Branch |Control plane node reference
436436

437-
|`main` and `enterprise-4.9`
437+
|`main`, `enterprise-4.9`, and later enterprise versions
438438
|Control plane node
439439

440-
|`enterprise-4.8` and earlier
440+
|`enterprise-4.8` and earlier enterprise versions
441441
|Control plane (also known as master) node
442442

443443
|`enterprise-3.11`
@@ -447,6 +447,8 @@ To assist with the removal of the problematic word "master" from the documentati
447447

448448
You can replace "node" in the preceding examples with "machine", "host", or another suitable description.
449449

450+
In general text, use the term "control plane machine" in place of "master machine"; use the term "compute machine" in place of "worker machine". Be mindful of certain valid code entities, such as `master` role, `worker` role, and `infra` role.
451+
450452
[NOTE]
451453
====
452454
If you are cherry picking from `main` to `enterprise-4.8` or earlier, you must manually cherry pick to include the “(also known as master)” phrasing. This is required only if the phrase “control plane” is introduced for the first time in an assembly or module.

0 commit comments

Comments
 (0)