start tidy up of core service install doc

Author: rosieyohannan

jekyll/_cci2/server-3-install-prerequisites.adoc

@@ -49,7 +49,7 @@ Download and install the following software before continuing:
 
 | KOTS: https://github.com/replicatedhq/kots/releases/download/v1.65.0/kots_darwin_amd64.tar.gz[Mac] or https://github.com/replicatedhq/kots/releases/download/v1.65.0/kots_linux_amd64.tar.gz[Linux].
 | {kotsversion} *
-| Replicated Kubernetes Application Management
+| Replicated Kubernetes Application Management. KOTS is a `kubectl` https://kubernetes.io/docs/tasks/extend-kubectl/kubectl-plugins/[plugin].
 | Once you have extracted `kots` from the tar.gz (`tar zxvf kots_linux_amd64.tar.gz`), run `sudo mv kots /usr/local/bin/kubectl-kots` to install it. Mac users will need to grant a security exception.
 
 

jekyll/_cci2/server-3-install.adoc

@@ -15,46 +15,45 @@ version:
 
 Before you begin with the CircleCI server v3.x core services installation phase, ensure all xref:server-3-install-prerequisites.adoc[prerequisites] are met.
 
-NOTE: In the following sections replace any items or credentials displayed between `< >` with your details.
-
 .Installation Experience Flow Chart Phase 2
 image::server-install-flow-chart-phase2.png[Flow chart showing the installation flow for server 3.x with phase 2 highlighted]
 
+NOTE: In the following sections replace any items or credentials displayed between `< >` with your details.
+
 toc::[]
 
 == Phase 2: Core services installation
-CircleCI server v3.x uses https://kots.io[KOTS] from https://www.replicated.com/[Replicated] to manage and distribute server v3.x. KOTS is a `kubectl` https://kubernetes.io/docs/tasks/extend-kubectl/kubectl-plugins/[plugin].
-To install the latest version, you can run `curl \https://kots.io/install | bash`.
-
-Ensure you are running the minimum KOTS version ({kotsversion}) by running the command:
+CircleCI server v3.x uses https://kots.io[KOTS] from https://www.replicated.com/[Replicated] for installation management and distribution. .
 
+. Ensure you are running the minimum KOTS version ({kotsversion}) by running the command:
++
 ```bash
 kubectl kots version
 ```
-
++
 NOTE: The KOTS command will open up a tunnel to the admin console. If running on Windows inside WSL2, the port is not available on the host machine. Turning WSL off and back on should resolve the issue. For more information, please see
 https://github.com/microsoft/WSL/issues/4199.
 
-From the terminal run (if you are installing behind a proxy see https://circleci.com/docs/2.0/server-3-install/#installing-behind-an-http-proxy[Installing behind HTTP Proxy]):
-
+. From the terminal run (if you are installing behind a proxy see https://circleci.com/docs/2.0/server-3-install/#installing-behind-an-http-proxy[Installing behind HTTP Proxy]):
++
 ```bash
 kubectl kots install circleci-server
 ```
-
-You will be prompted for a:
-
++
+You will be prompted for:
++
 * namespace for the deployment
 * password for the KOTS admin console
 
-When complete, you should be provided with a URL to access the KOTS admin console, usually `\http://localhost:8800`.
+. When complete, you should be provided with a URL to access the KOTS admin console, usually `\http://localhost:8800`.
 
-NOTE: If you need to get back to the KOTS admin console at a later date you can run: `kubectl kots admin-console -n <YOUR_CIRCLECI_NAMESPACE>`
+TIP: If you need to get back to the KOTS admin console at a later date you can run: `kubectl kots admin-console -n <YOUR_CIRCLECI_NAMESPACE>`
 
-NOTE: Once you have created your namespace, we recommend setting your `kubectl` context too with the following command: `kubectl config set-context --current --namespace <namespace>`
+TIP: Once you have created your namespace, we recommend setting your `kubectl` context too with the following command: `kubectl config set-context --current --namespace <namespace>`
 
-=== Installing behind an HTTP Proxy
+=== Installing behind an HTTP Proxy (optional)
 
-If you wish to install CircleCI server behind a proxy, the following command structure should be used (for more information see the KOTS docs https://kots.io/kotsadm/installing/online-install/#proxies[here]):
+If you wish to install CircleCI server behind a proxy, the following command structure should be used for step 2 above (for more information see the KOTS docs https://kots.io/kotsadm/installing/online-install/#proxies[here]):
 
 ```bash
 kubectl kots install circleci-server --http-proxy <YOUR_HTTP_PROXY_URI> --https-proxy <https-proxy> --no-proxy <YOUR_NO_PROXY_LIST>
@@ -65,12 +64,12 @@ The load balancer endpoints must be added to the no-proxy list for the following
 For further information see the https://circleci.com//docs/2.0/server-3-operator-proxy/index.html[Configuring a Proxy] guide.
 
 === Frontend Settings
-Frontend settings control the web application specific aspects of the CircleCI system.
+Frontend settings control the web-application-specific aspects of the CircleCI system.
 
 .Frontend Settings
 image::server-3-frontend-settings.png[Screenshot showing frontend settings]
 
-Complete the fields described below. You can either supply a private key and certificate, or check the box that allows Let's Encrypt or https://docs.aws.amazon.com/acm/latest/userguide/acm-overview.html[AWS Certificate Manager (ACM)] to automatically request and manage certificates for you. You can also disable TLS termination at this point, but the system will still need to be accessed over HTTPS.
+Complete the fields described below. You can either supply a private key and certificate, or check the box that allows https://letsencrypt.org/[Let's Encrypt] or https://docs.aws.amazon.com/acm/latest/userguide/acm-overview.html[AWS Certificate Manager (ACM)] to automatically request and manage certificates for you. You can also disable TLS termination at this point, but the system will still need to be accessed over HTTPS.
 
 ==== Using ACM TLS Certificates
 
@@ -89,11 +88,11 @@ You will need to reroute your DNS records to the new loadbalancer once you have
 
 NOTE: If you are selecting the option to use private load balancers, the Let's Encrypt option will no longer work and become unavailable.
 
-* *Domain Name (required)* - Enter the domain name you specified when creating your Frontend TLS key and certificate.
+* *CircleCI Domain Name (required)* - Enter the domain name you specified when creating your Frontend TLS key and certificate.
 
-* *Frontend Replicas (optional)* - Used to increase the amount of traffic that can be handled by the frontend.
+* *Frontend Replicas* - Used to increase the amount of traffic that can be handled by the frontend.
 
-* *Frontend TLS Private Key (required)* - You created this during your pre-requisite steps. You can retrieve this value with the following command:
+* *Frontend TLS Private Key (required)* - You created this during your prerequisite steps. You can retrieve this value with the following command:
 +
 ```bash
 cat /etc/letsencrypt/live/<CIRCLECI_SERVER_DOMAIN>/privkey.pem