Merge branch 'master' into system-reqs-support

Author: jeff-matthews

src/_data/main-nav.yml

@@ -66,7 +66,7 @@
       versionless: true
 
     - label: Software Update Guide
-      url: /comp-mgr/bk-compman-upgrade-guide.html
+      url: https://experienceleague.adobe.com/docs/commerce-operations/upgrade-guide/overview.html
 
     - label: Configuration Guide
       url: /config-guide/bk-config-guide.html

src/_data/toc/software-update-guide.yml

@@ -94,10 +94,6 @@ pages:
          url: /comp-mgr/patching/composer.html
          children:
 
-    - label: Update the updater application
-      url: /comp-mgr/updater/update-updater.html
-      include_versions: ["2.3"]
-
     - label: Troubleshooting
       children:
 

src/_includes/config/setup-cron_2.3_how-to.md

@@ -40,9 +40,9 @@ A sample follows:
 {%
 include note.html
 type='info'
-content='The `update/cron.php` file exists in [Composer](https://glossary.magento.com/composer)- and [archive-based](https://magento.com/tech-resources/download) Magento installations. It does not exist if you installed Magento by cloning the [Magento 2 git repository](https://github.com/magento/magento2/).
+content='The `update/cron.php` file exists in [Composer](https://glossary.magento.com/composer)- and [archive-based](https://magento.com/tech-resources/download) installations. It does not exist in git-based installations.
 
-In [Composer-based installations](https://glossary.magento.com/composer), Magento creates the `update/` directory when you run `composer create-project`. Running `composer install` does not create the `update/` directory (if it did not exist before). See [Recreate the Magento updater](https://devdocs.magento.com/guides/v2.3/comp-mgr/updater/update-updater.html).'
+In [Composer-based installations](https://glossary.magento.com/composer), running the `composer create-project` command creates an `update/` directory. Running the `composer install` command does not create the `update/` directory (if it did not exist before).'
 %}
 
 Starting in Magento version 2.3.4, cron tasks are categorized into two groups:

src/_includes/layout/page-header.html

@@ -18,14 +18,6 @@
   </div>
   {% endif %}
 
-  {% if page.url contains "guides/v2.4/comp-mgr/" %}
-  <div class="message-banner">
-    You must install and configure Elasticsearch 7.6.x before upgrading to {{ site.data.var.ee }} or
-    {{ site.data.var.ce }} 2.4.0. See <a href="{{ page.baseurl }}/comp-mgr/prereq/prereq-elasticsearch.html">Check the
-      catalog search engine</a> for details.
-  </div>
-  {% endif %}
-
   {% if page.url contains "config-guide/multi-master/" or page.url contains "cloud/docker/docker-split-db" %}
   <div class="message-banner">
     The split database feature was <a

src/cloud/requirements/cloud-requirements.md

@@ -113,7 +113,7 @@ For development and testing, we recommend the following:
 
    You can enable and test individual features, new extensions, and third-party integration on different environments prior to merging into a single environment.
 
-*  Verify [`magento setup:install`]({{ site.baseurl }}/guides/v2.3/install-gde/install/cli/install-cli-install.html) and [`magento setup:upgrade`]({{ site.baseurl }}/guides/v2.3/comp-mgr/cli/cli-upgrade.html) commands work during the build and deploy process and that any extensions and customizations compile correctly in [Production mode]({{ site.baseurl }}/guides/v2.3/config-guide/bootstrap/magento-modes.html#production-mode)
+*  Verify [`magento setup:install`]({{ site.baseurl }}/guides/v2.3/install-gde/install/cli/install-cli-install.html) and [`magento setup:upgrade`](https://experienceleague.adobe.com/docs/commerce-operations/upgrade-guide/implementation/perform-upgrade.html) commands work during the build and deploy process and that any extensions and customizations compile correctly in [Production mode]({{ site.baseurl }}/guides/v2.3/config-guide/bootstrap/magento-modes.html#production-mode)
 
    You can set an environment variable or enter a CLI command for this specific mode.
 

src/extensions/inventory-management/index.md

@@ -138,7 +138,7 @@ For the latest, update your metapackage version:
 
 See the following guides for more information on upgrades:
 
-*  [Software Update Guide]({{site.baseurl}}/guides/v2.4/comp-mgr/bk-compman-upgrade-guide.html)
+*  [Software Update Guide](https://experienceleague.adobe.com/docs/commerce-operations/upgrade-guide/overview.html)
 *  [Enable or disable modules]({{site.baseurl}}/guides/v2.4/install-gde/install/cli/install-cli-subcommands-enable.html)
 
 ## Additional information

src/guides/v2.3/comp-mgr/bk-compman-upgrade-guide.md

@@ -3,6 +3,7 @@ group: software-update-guide
 title: Commerce upgrade overview
 functional_areas:
   - Upgrade
+redirect_to: https://experienceleague.adobe.com/docs/commerce-operations/upgrade-guide/overview.html
 ---
 
 <!-- Topic variables
@@ -49,18 +50,17 @@ Related topics
 Complete the tasks discussed in [Prerequisites].
 
  {:.bs-callout-info}
-See the [Upgrade Compatibility Tool ALPHA]({{site.baseurl}}/upgrade-compatibility-tool/introduction.html) page for more information about the new Magento command line tool that helps you update your Magento software.
+See the [Upgrade Compatibility Tool](https://experienceleague.adobe.com/docs/commerce-operations/upgrade-guide/upgrade-compatibility-tool/overview.html) page for more information about the new Magento command line tool that helps you update your Magento software.
 
 <!-- ABBREVIATIONS -->
 
 *[contributing developer]: A developer who contributes code to the Magento 2 CE codebase
 *[contributing developers]: Developers who contribute code to the Magento 2 CE codebase
 
-[command line]: {{ page.baseurl }}/comp-mgr/cli/cli-upgrade.html
+[command line]: https://experienceleague.adobe.com/docs/commerce-operations/upgrade-guide/implementation/perform-upgrade.html
 [Composer]: {{ page.baseurl }}/install-gde/composer.html
 [Migration Guide]: {{ page.baseurl }}/migration/bk-migration-guide.html
-[Prerequisites]: {{ page.baseurl }}/comp-mgr/prereq/prereq_compman.html
+[Prerequisites]: https://experienceleague.adobe.com/docs/commerce-operations/upgrade-guide/prepare/prerequisites.html
 [Shared account]: {{ site.user_guide_url }}/magento/magento-account-share.html
-
-[Upgrade from Open Source to Commerce]: {{ page.baseurl }}/comp-mgr/cli/cli-upgrade.html#manage-packages
-[upgrade the software manually]: {{ page.baseurl }}/comp-mgr/cli/dev_update-magento.html
+[Upgrade from Open Source to Commerce]: https://experienceleague.adobe.com/docs/commerce-operations/upgrade-guide/implementation/perform-upgrade.html
+[upgrade the software manually]: https://experienceleague.adobe.com/docs/commerce-operations/upgrade-guide/developer/git-installs.html

src/guides/v2.3/comp-mgr/cli/cli-rc1-samp.md

@@ -3,6 +3,7 @@ group: software-update-guide
 title: Command-line upgrade with sample data
 functional_areas:
   - Upgrade
+redirect_to: https://experienceleague.adobe.com/docs/commerce-operations/upgrade-guide/implementation/perform-upgrade.html
 ---
 
 {%include install/sampledata/sample-data-rc1-cli.md %}

src/guides/v2.3/comp-mgr/cli/cli-upgrade.md

@@ -3,6 +3,7 @@ group: software-update-guide
 title: Upgrade Commerce
 functional_areas:
   - Upgrade
+redirect_to: https://experienceleague.adobe.com/docs/commerce-operations/upgrade-guide/implementation/perform-upgrade.html
 ---
 
 <!-- Topic variables
@@ -22,7 +23,7 @@ Instead, see [Update Magento][] for upgrade instructions.
 
 Complete the following prerequisites to prepare your environment before starting the upgrade process:
 
--  **Determine whether your current catalog search engine is supported**-Avoid significant upgrade errors by ensuring your search engine complies with 2.3 requirements. See [Check the catalog search engine] for more details.
+-  **Determine whether your current catalog search engine is supported**-Avoid significant upgrade errors by ensuring your search engine complies with 2.3 requirements. See [Verify Elasticsearch is installed] for more details.
 -  **Complete the Update and upgrade checklist**—To avoid possible errors during installation or upgrading, complete the [Update and upgrade checklist].
 -  **Set the `pub/` directory root**—See [Modify docroot to improve security][] for more details.
 -  **Check PHP and environment settings**—Verify that your PHP and other environment settings are compatible with the [system requirements].
@@ -243,7 +244,7 @@ If the application fails with a  `We're sorry, an error has occurred while gener
 <!-- Link definitions -->
 
 [custom composer plugin]: https://github.com/magento/composer-root-update-plugin
-[custom maintenance mode page]: {{ page.baseurl }}/comp-mgr/trouble/cman/maint-mode.html
+[custom maintenance mode page]: https://experienceleague.adobe.com/docs/commerce-operations/upgrade-guide/troubleshooting/maintenance-mode-options.html
 [Enable or disable maintenance mode]: {{ page.baseurl }}/install-gde/install/cli/install-cli-subcommands-maint.html
 [file system ownership and permissions]: {{ page.baseurl }}/install-gde/prereq/file-system-perms.html
 [metapackage]: https://glossary.magento.com/metapackage
@@ -253,4 +254,4 @@ If the application fails with a  `We're sorry, an error has occurred while gener
 [Upgrade using the custom composer plugin]: upgrade-with-plugin.html
 [Upgrade using the script]: upgrade-with-script.html
 [Modify docroot to improve security]: {{ page.baseurl }}/install-gde/tutorials/change-docroot-to-pub.html
-[Check the catalog search engine]: {{ site.baseurl }}{{ site.gdeurl }}/comp-mgr/prereq/prereq-elasticsearch.html
+[Verify Elasticsearch is installed]: https://experienceleague.adobe.com/docs/commerce-operations/upgrade-guide/prepare/prerequisites.html

src/guides/v2.3/comp-mgr/cli/dev_update-magento.md

@@ -5,9 +5,10 @@ functional_areas:
   - Upgrade
 redirect_from:
   - guides/v2.3/install-gde/install/cli/dev_update-magento.html
+redirect_to: https://experienceleague.adobe.com/docs/commerce-operations/upgrade-guide/developer/git-installs.html
 ---
 
-This topic discusses how a contributing developer can update Magento without reinstalling it. To perform an upgrade if you're *not* a contributing developer, see [Updating the Magento application and components]({{ page.baseurl }}/comp-mgr/bk-compman-upgrade-guide.html).
+This topic discusses how a contributing developer can update Magento without reinstalling it. To perform an upgrade if you're *not* a contributing developer, see [Updating the Magento application and components](https://experienceleague.adobe.com/docs/commerce-operations/upgrade-guide/overview.html).
 
 To update the Magento software if you are a contributing developer: