Merge branch 'ehilgendorf-cloud-provider' into 'main'

Provide examples and clarify how MachineOptions work for the MachineDriver

See merge request https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/4768

Merged-by: Fiona Neill <fneill@gitlab.com>
Approved-by: Fiona Neill <fneill@gitlab.com>
Reviewed-by: Fiona Neill <fneill@gitlab.com>
Co-authored-by: Edward Hilgendorf <ehilgendorf@gitlab.com>

Author: Fiona Neill

docs/configuration/advanced-configuration.md

@@ -637,8 +637,8 @@ The following parameters define the Docker Machine-based autoscaling feature. Fo
 | `OffPeakIdleTime`   | Deprecated: Like `IdleTime`, but for _Off Peak_ time periods. |
 | `MaxBuilds`         | Maximum job (build) count before machine is removed. |
 | `MachineName`       | Name of the machine. It **must** contain `%s`, which is replaced with a unique machine identifier. |
-| `MachineDriver`     | Docker Machine `driver`. View details in the [Docker Machine configuration section](autoscale.md#supported-cloud-providers). |
-| `MachineOptions`    | Docker Machine options. View details in the [Docker Machine configuration section](autoscale.md#supported-cloud-providers). |
+| `MachineDriver`     | Docker Machine `driver`. View details in the [Cloud Providers Section in the Docker Machine configuration](autoscale.md#supported-cloud-providers). |
+| `MachineOptions`    |  Docker Machine options for the MachineDriver. For more information, see [Supported Cloud Providers). For more information about all options for AWS, see the [AWS](https://gitlab.com/gitlab-org/ci-cd/docker-machine/-/blob/main/docs/drivers/aws.md) and [GCP](https://gitlab.com/gitlab-org/ci-cd/docker-machine/-/blob/main/docs/drivers/gce.md) projects in the Docker Machine repository. |
 
 ### The `[[runners.machine.autoscaling]]` sections
 

docs/executors/docker_machine.md

@@ -55,8 +55,8 @@ installed in the same machine:
       - Read [GitLab Runner MachineOptions](../configuration/advanced-configuration.md#the-runnersmachine-section)
 1. The **first time** you're using Docker Machine, it is best to manually execute the
    `docker-machine create ...` command with your [Docker Machine Driver](https://gitlab.com/gitlab-org/ci-cd/docker-machine/-/tree/main/drivers).
-   Run this command alongside with the options that you intend to configure in the
-   [GitLab Runner MachineOptions](../configuration/advanced-configuration.md#the-runnersmachine-section) section.
+   Run this command with the options that you intend to configure in the
+   [MachineOptions](../configuration/advanced-configuration.md#the-runnersmachine-section) under the `[runners.machine]` section.
    This will set up the Docker Machine environment properly and will also be a good
    validation of the specified options. After this, you can destroy the machine with
    `docker-machine rm [machine_name]` and start the runner.