Merge branch 'auto-deploy-with-space' into 'master'

Rename "autodeploy" to "auto deploy"

Closes #25999

See merge request !8289

6 files changed, 8 insertions, 8 deletions

diff --git a/doc/ci/README.md b/doc/ci/README.md
index 6a9495f8892..dd14698e9cd 100644
--- a/doc/ci/README.md
+++ b/doc/ci/README.md
@@ -23,7 +23,7 @@
 - [CI/CD pipelines settings](../user/project/pipelines/settings.md)
 - [Review Apps](review_apps/index.md)
 - [Git submodules](git_submodules.md) Using Git submodules in your CI jobs
-- [Autodeploy](autodeploy/index.md)
+- [Auto deploy](autodeploy/index.md)
 
 ## Breaking changes
 
diff --git a/doc/ci/autodeploy/img/auto_deploy_button.png b/doc/ci/autodeploy/img/auto_deploy_button.png
new file mode 100644
index 00000000000..423e76a6cda
--- /dev/null
+++ b/doc/ci/autodeploy/img/auto_deploy_button.png
diff --git a/doc/ci/autodeploy/img/auto_deploy_dropdown.png b/doc/ci/autodeploy/img/auto_deploy_dropdown.png
new file mode 100644
index 00000000000..957870ec8c7
--- /dev/null
+++ b/doc/ci/autodeploy/img/auto_deploy_dropdown.png
diff --git a/doc/ci/autodeploy/img/autodeploy_button.png b/doc/ci/autodeploy/img/autodeploy_button.png
deleted file mode 100644
index 9e2cd57a0ba..00000000000
--- a/doc/ci/autodeploy/img/autodeploy_button.png
+++ /dev/null
diff --git a/doc/ci/autodeploy/img/autodeploy_dropdown.png b/doc/ci/autodeploy/img/autodeploy_dropdown.png
deleted file mode 100644
index d2733de83df..00000000000
--- a/doc/ci/autodeploy/img/autodeploy_dropdown.png
+++ /dev/null
diff --git a/doc/ci/autodeploy/index.md b/doc/ci/autodeploy/index.md
index 9c79d8c457e..630207ffa09 100644
--- a/doc/ci/autodeploy/index.md
+++ b/doc/ci/autodeploy/index.md
@@ -1,8 +1,8 @@
-# Autodeploy
+# Auto deploy
 
 > [Introduced][mr-8135] in GitLab 8.15.
 
-Autodeploy is an easy way to configure GitLab CI for the deployment of your
+Auto deploy is an easy way to configure GitLab CI for the deployment of your
 application. GitLab Community maintains a list of `.gitlab-ci.yml`
 templates for various infrastructure providers and deployment scripts
 powering them. These scripts are responsible for packaging your application,
@@ -15,7 +15,7 @@ deployment.
 
 ## Supported templates
 
-The list of supported autodeploy templates is available [here][autodeploy-templates].
+The list of supported auto deploy templates is available [here][auto-deploy-templates].
 
 ## Configuration
 
@@ -24,17 +24,17 @@ credentials. For example, if you want to deploy to OpenShift you have to
 enable [Kubernetes service][kubernetes-service].
 1. Configure GitLab Runner to use Docker or Kubernetes executor with
 [privileged mode enabled][docker-in-docker].
-1. Navigate to the "Project" tab and click "Set up autodeploy" button.
-   ![Autodeploy button](img/autodeploy_button.png)
+1. Navigate to the "Project" tab and click "Set up auto deploy" button.
+   ![Auto deploy button](img/auto_deploy_button.png)
 1. Select a template.
-  ![Dropdown with autodeploy templates](img/autodeploy_dropdown.png)
+  ![Dropdown with auto deploy templates](img/auto_deploy_dropdown.png)
 1. Commit your changes and create a merge request.
 1. Test your deployment configuration using a [Review App][review-app] that was
 created automatically for you.
 
 [mr-8135]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8135
 [project-services]: ../../project_services/project_services.md
-[autodeploy-templates]: https://gitlab.com/gitlab-org/gitlab-ci-yml/tree/master/autodeploy
+[auto-deploy-templates]: https://gitlab.com/gitlab-org/gitlab-ci-yml/tree/master/autodeploy
 [kubernetes-service]: ../../project_services/kubernetes.md
 [docker-in-docker]: ../docker/using_docker_build.md#use-docker-in-docker-executor
 [review-app]: ../review_apps/index.md