Merge pull request magento#137 from magento-devdocs/fix-links2

Add variable to links for MerchDocs, remove release notes draft

src/_data/toc/release-notes.yml

@@ -125,15 +125,6 @@ pages:
     - label: Product Recommendations
       url: /recommendations/release-notes.html
       versionless: true
-
-    - label: Payment Services
-      url: /payment-services/release-notes.html
-      versionless: true
-      children: 
-
-        - label: Hotfixes
-          url: /payment-services/hotfix-release-notes.html
-          versionless: true
 
     - label: Sales Channels
       children:

src/payment-services/configure-payments.md

@@ -3,13 +3,13 @@ group: payment-services
 title: Configure Payment Services
 ---
 
-After you install Payment Services, you can easily configure it from [within the Admin](https://docs.magento.com/user-guide/payment-services/configure-payments.html) or via the Command Line Interface (CLI).
+After you install Payment Services, you can easily configure it from [within the Admin]({{ site.user_guide_url }}/user-guide/payment-services/configure-payments.html) or via the Command Line Interface (CLI).
 
 ## Configure data export
 
 Payment Services combines order data exported from Magento Open Source and Adobe Commerce with aggregated payment data from payment providers to create useful reports. The Payment Services extension uses indexers to efficiently collect all of the necessary data for the reports.
 
-See [our user guide](https://docs.magento.com/user-guide/payment-services/order-payment-status#data-used-in-the-report.html) to learn about the data used in Payment Services reporting.
+See [our user guide]({{ site.user_guide_url }}/user-guide/payment-services/order-payment-status#data-used-in-the-report.html) to learn about the data used in Payment Services reporting.
 
 ### Set indexers
 
@@ -32,7 +32,7 @@ bin/magento indexer:set-mode schedule sales_order_data_exporter sales_order_stat
 {:.bs-callout-tip}
 If you don't specify any indexers in your command, all indexers are updated to the same value. If you want to change a specific indexer you must list it in your command.
 
-See [Configure indexers]({{ site.baseurl }}{{ site.gdeurl }}/config-guide/cli/config-cli-subcommands-index.html#configure-indexers) in [Manage the Indexers]({{ site.baseurl }}{{ site.gdeurl }}/config-guide/cli/config-cli-subcommands-index.html) to learn more about manually changing the mode of an indexer or [Index management](https://docs.magento.com/user-guide/system/index-management.html#change-the-index-mode) to learn how to to change it in the Admin.
+See [Configure indexers]({{ site.baseurl }}{{ site.gdeurl }}/config-guide/cli/config-cli-subcommands-index.html#configure-indexers) in [Manage the Indexers]({{ site.baseurl }}{{ site.gdeurl }}/config-guide/cli/config-cli-subcommands-index.html) to learn more about manually changing the mode of an indexer or [Index management]({{ site.user_guide_url }}/user-guide/system/index-management.html#change-the-index-mode) to learn how to to change it in the Admin.
 
 ### Manually reindex data
 

src/payment-services/index.md

@@ -13,17 +13,17 @@ Payment Services is:
 *  Designed to meet all your payments needs
 *  Self-contained within the Admin
 
-See a full list of features and more detailed information in the [user guide](https://docs.magento.com/user-guide/payment-services/index.html).
+See a full list of features and more detailed information in the [user guide]({{ site.user_guide_url }}/user-guide/payment-services/index.html).
 
 ## Availability
 
 Payment Services is available for some supported Magento versions.
 
-See [Lifecycle policy](https://devdocs.magento.com/release/lifecycle-policy.html) and [Upcoming releases](https://devdocs.magento.com/release/) for more release and version-specific information.
+See [Lifecycle policy]({{ site.baseurl }}/release/lifecycle-policy.html) and [Upcoming releases]({{ site.baseurl }}/release/) for more release and version-specific information.
 
 ## Get started
 
-Onboarding and setting up Payment Services is completed in [just a few steps](https://docs.magento.com/user-guide/payment-services/index.html#get-started).
+Onboarding and setting up Payment Services is completed in [just a few steps]({{ site.user_guide_url }}/user-guide/payment-services/index.html#get-started).
 
 This onboarding flow diagram shows the general process, for both the user and the internal system, for onboarding Payment Services.
 
@@ -34,5 +34,5 @@ _Onboarding flow (click to zoom)_
 
 Payment Services is designed to be the simplest payments system you've ever used. Got questions about features, implementation, configuration, fee structure, extensibility, or reporting? We've got you covered.
 
-*  [MerchDocs (user guide)](https://docs.magento.com/payment-services/payments.html)---See our Payment Services-related user guide documentation.
+*  [MerchDocs (user guide)]({{ site.user_guide_url }}/payment-services/payments.html)---See our Payment Services-related user guide documentation.
 *  [Help center](https://support.magento.com/hc/en-us)---See our Payment Services-related knowledgebase and [submit Support tickets](https://support.magento.com/hc/en-us/articles/360000913794#submit-ticket) for extra help.

src/payment-services/install-payments.md

@@ -5,7 +5,7 @@ title: Install Payment Services
 
 The Payment Services extension for Adobe Commerce and Magento Open Source can be installed with Composer keys, which are linked to the Magento ID ([mageid]({{ page.baseurl }}/marketplace/sellers/profile-personal.html#field-descriptions)) provided in the signup process. Composer uses these keys during the initial installation of {{site.data.var.ee}}, or in situations in which the Composer keys were not previously saved to the `auth.json` file.
 
-See [Get your authentication keys](https://devdocs.magento.com/guides/v2.4/install-gde/prereq/connect-auth.html) for more information about obtaining Composer keys.
+See [Get your authentication keys]({{ site.baseurl }}{{ site.gdeurl }}/install-gde/prereq/connect-auth.html) for more information about obtaining Composer keys.
 
 There are two ways to install this extension---for [{{site.data.var.ece}}](#magento-commerce-cloud) or [On-premises](#on-premises) installations. These methods require you to use the Command Line Interface (CLI).
 
@@ -103,7 +103,7 @@ To see which Composer keys are configured:
    cat /path/to/auth.json
    ```
 
-1. See [which keys are associated with your Magento ID](https://devdocs.magento.com/guides/v2.4/install-gde/prereq/connect-auth.html).
+1. See [which keys are associated with your Magento ID]({{ site.baseurl }}{{ site.gdeurl }}/install-gde/prereq/connect-auth.html).
 
 ### Not enough memory for PHP
 

src/payment-services/security.md

@@ -5,4 +5,4 @@ title: Security
 
 Security is of the utmost concern in Payment Services. No private or Payment Card Industry (PCI) regulated information is passed across your services.
 
-See [Security](https://docs.magento.com/user-guide/payment-services/security.html) in the user guide for more information.
+See [Security]({{ site.user_guide_url }}/user-guide/payment-services/security.html) in the user guide for more information.