Merge branch 'main' into HennaAbbas-patch-1

Author: rosieyohannan

.vale.ini

@@ -18,4 +18,8 @@ experimental = YES
 attribute-missing = drop
 
 [*.adoc]
-BasedOnStyles = circleci-docs, Vale, Readability, Openly, AsciiDoc
+BasedOnStyles = circleci-docs, Vale, Readability, Openly, AsciiDoc
+
+[**/nav.adoc]
+circleci-docs.XrefTitleCase = NO
+circleci-docs.ListPunctuation = NO

docs/guides/modules/ROOT/nav.adoc

@@ -119,7 +119,7 @@
 *** xref:execution-runner:install-machine-runner-3-on-linux.adoc[Install machine runner 3 on Linux]
 *** xref:execution-runner:install-machine-runner-3-on-macos.adoc[Install machine runner 3 on macOS]
 *** xref:execution-runner:install-machine-runner-3-on-windows.adoc[Install machine runner 3 on Windows]
-*** xref:execution-runner:install-machine-runner-3-on-docker.adoc[Install on Docker]
+*** xref:execution-runner:install-machine-runner-3-on-docker.adoc[Install machine runner 3 on Docker]
 *** xref:execution-runner:machine-runner-3-manual-installation.adoc[Manual install on Linux and macOS]
 *** xref:execution-runner:machine-runner-3-manual-installation-on-windows.adoc[Manual install on Windows]
 *** xref:execution-runner:migrate-from-launch-agent-to-machine-runner-3-on-linux.adoc[Migrate from launch agent to machine runner 3 on Linux]

docs/guides/modules/execution-runner/pages/install-machine-runner-3-on-docker.adoc

@@ -8,9 +8,9 @@
 This page describes how to install CircleCI's machine runner 3 with the Docker executor. If you are looking to set up self-hosted runners in a private Kubernetes cluster, visit the <<container-runner-installation#,Container runner>> page.
 
 ****
-xref:container-runner.adoc[Container runner] is the **recommended method** for self-hosted runner Docker installation. The instructions on this page are for a simple Docker setup using machine runner 3.
+xref:container-runner.adoc[Container Runner] is the **recommended method** for self-hosted runner Docker installation. The instructions on this page are for a simple Docker setup using machine runner 3.
 
-Container runner is the recommended approach for running containerized jobs on self-hosted runners. Container runner offers the ability to seamlessly define, publish, and use custom Docker images during job execution. Container runner also h as the ability to manage dependencies or libraries through custom Docker images instead of enumerating dependencies as part of `steps` in the `.circleci/config.yml` file.
+Container runner is the recommended approach for running containerized jobs on self-hosted runners. Container runner offers the ability to seamlessly define, publish, and use custom Docker images during job execution. Container runner also has the ability to manage dependencies or libraries through custom Docker images instead of enumerating dependencies as part of `steps` in the `.circleci/config.yml` file.
 ****
 
 [#machine-approach-with-docker]
@@ -36,7 +36,20 @@ include::ROOT:partial$runner/terms.adoc[]
 [#create-namespace-and-resource-class]
 === 1. Create namespace and resource class
 
+[tabs]
+====
+Web app installation::
++
+--
+include::ROOT:partial$runner/install-with-web-app-steps.adoc[]
+--
+
+CLI installation::
++
+--
 include::ROOT:partial$runner/install-with-cli-steps.adoc[]
+--
+====
 
 === 2. Create a Dockerfile that extends the machine runner 3 image
 
@@ -111,7 +124,7 @@ include::ROOT:partial$runner/machine-runner-example.adoc[]
 [#additional-resources]
 == Additional resources
 
-- xref:install-machine-runner-3-on-linux.adoc[Machine runner 3 Linux package installation]
-- xref:install-machine-runner-3-on-macos.adoc[Machine runner 3 macOS Homebrew installation]
-- xref:install-machine-runner-3-on-windows.adoc[Machine runner 3 Windows installation]
-- xref:machine-runner-3-configuration-reference.adoc[Machine runner 3 configuration reference]
+- xref:install-machine-runner-3-on-linux.adoc[Machine Runner 3 Linux Package Installation]
+- xref:install-machine-runner-3-on-macos.adoc[Machine Runner 3 macOS Homebrew Installation]
+- xref:install-machine-runner-3-on-windows.adoc[Machine Runner 3 Windows Installation]
+- xref:machine-runner-3-configuration-reference.adoc[Machine Runner 3 Configuration Reference]

styles/circleci-docs/XrefTitleCase.yml

@@ -13,7 +13,7 @@ script: |
   // Words that should not be capitalized in title case (unless first/last word)
   // Articles, coordinating conjunctions, and short prepositions only
   lowercase_words := ["a", "an", "the", "and", "but", "or", "for", "nor", "so", "yet",
-                      "at", "by", "in", "of", "on", "to", "up", "as", "via", "per"]
+                      "at", "by", "in", "of", "on", "to", "up", "as", "via", "per", "macos"]
 
   for i, line in lines {
     // Find all xref patterns: xref:path[Link Text]