combine deployment overviews

Author: rosieyohannan

.vscode/settings.json

@@ -0,0 +1,12 @@
+{
+  "vale.server.enabled": true,
+  "vale.server.path": "vale",
+  "vale.server.onSave": true,
+  "vale.server.onType": false,
+  "vale.server.lintOnOpen": true,
+  "files.associations": {
+    "*.adoc": "asciidoc"
+  },
+  "vale.server.workspaceFolder": "${workspaceFolder}",
+  "vale.server.configuration": "${workspaceFolder}/.vale.ini"
+}

docs/guides/modules/ROOT/nav.adoc

@@ -160,8 +160,7 @@
 *** xref:test:troubleshoot-test-splitting.adoc[Troubleshoot test splitting]
 
 * Deploy with CircleCI
-** xref:deploy:deployment-overview.adoc[Overview of deployment on CircleCI]
-** xref:deploy:deploys-overview.adoc[CircleCI deploys overview]
+** xref:deploy:deployment-overview.adoc[Deployment and deploy management]
 ** Setup
 *** xref:deploy:configure-deploy-markers.adoc[Configure deploy markers]
 *** xref:deploy:set-up-rollbacks.adoc[Rollbacks]

docs/guides/modules/deploy/pages/configure-deploy-markers.adoc

@@ -9,7 +9,7 @@ This tutorial shows how to add a deploy marker step to your workflow config. Dep
 
 Deploy markers provide a lightweight way to log your deployments without requiring a you to install the CircleCI release agent. If you install deploy markers, as described in this guide, you will also be able to use the xref:set-up-rollbacks.adoc[CircleCI rollback feature].
 
-For a full guide to CircleCI's deploys features and functionality, refer to the xref:set-up-circleci-deploys.adoc[Set up CircleCI deploys] guide.
+For a full guide to CircleCI's deploys features and functionality, refer to the xref:deployment-overview.adoc[Deployment and deploy management] guide.
 
 == Prerequisites
 
@@ -291,6 +291,22 @@ To manually create an environment integration, follow these steps:
 If you plan to only use deploy markers, as opposed to the Kubernetes agent, feel free to choose the `custom` type.
 **You do not need to continue with installing a release agent at this point**, but you will need to reference this environment integration name as part of your config when adding the `log release` step below.
 
+== Manual configuration of automatically detected deploys
+
+If you have some link:https://circleci.com/changelog/auto-generated-deploy-markers-are-being-sunset/[automatically detected deploy markers] you can consider manually configuring them. CircleCI no longer automatically creates deploy markers for you.
+
+Some points to consider when manually configuring an automatically detected deploy are as follows:
+
+* If you change a component name that was originally autodetected by CircleCI, we create a new component and the history **will not** carry over. If you do not update the component name, the history **will** carry over.
+
+* If your environment integration has an autogenerated name, you can edit the name as follows:
+. In the link:https://circleci.com/app/home[CircleCI web app], select your organization.
+. Select **Deploys** in the sidebar.
+. Select the **Environments** tab.
+. Find your environment and select cog icon image:guides:ROOT:icons/settings.svg[settings icon, role="no-border"] to enter the environment integration settings page.
+. Select **Edit**.
+. Enter a new name and select btn:[Update].
+
 == Next steps
 
 By following the steps in this guide, you have added a deploy marker to your CircleCI configuration.