Merge pull request #101172 from craigcaseyMSFT/vcraic0114a

PRMerger14 · web-flow · commit f0b0a30f6e2e · 2020-01-14T15:32:43.000-08:00
fix broken links from CATS report
diff --git a/articles/aks/azure-disk-customer-managed-keys.md b/articles/aks/azure-disk-customer-managed-keys.md
@@ -185,6 +185,6 @@ Review [best practices for AKS cluster security][best-practices-security]
 [az-extension-update]: /cli/azure/extension#az-extension-update
 [best-practices-security]: /azure/aks/operator-best-practices-cluster-security
 [byok-azure-portal]: /azure/storage/common/storage-encryption-keys-portal
-[customer-managed-keys]: /azure/virtual-machines/windows/disk-encryption#customer-managed-keys-public-preview
+[customer-managed-keys]: /azure/virtual-machines/windows/disk-encryption#customer-managed-keys
 [key-vault-generate]: /azure/key-vault/key-vault-manage-with-cli2
 [supported-regions]: /azure/virtual-machines/windows/disk-encryption#supported-scenarios-and-restrictions
diff --git a/articles/automation/automation-dsc-config-data-at-scale.md b/articles/automation/automation-dsc-config-data-at-scale.md
@@ -54,7 +54,7 @@ to generate MOF files
 and
 [upload the MOF files to Azure Automation](/azure/automation/tutorial-configure-servers-desired-state#create-and-upload-a-configuration-to-azure-automation).
 Then register your servers from either
-[on-premises](/azure/automation/automation-dsc-onboarding#physicalvirtual-windows-machines-on-premises-or-in-a-cloud-other-than-azureaws)
+[on-premises](/azure/automation/automation-dsc-onboarding#physicalvirtual-windows-machines-on-premises-or-in-a-cloud-other-than-azure-including-aws-ec2-instances)
 or [in Azure](/azure/automation/automation-dsc-onboarding#azure-virtual-machines)
 to pull configurations.
 
diff --git a/articles/automation/automation-dsc-config-from-server.md b/articles/automation/automation-dsc-config-from-server.md
@@ -51,7 +51,7 @@ to generate MOF files
 and
 [upload the MOF files to Azure Automation](/azure/automation/tutorial-configure-servers-desired-state#create-and-upload-a-configuration-to-azure-automation).
 Then register your servers from either
-[on-premises](/azure/automation/automation-dsc-onboarding#physicalvirtual-windows-machines-on-premises-or-in-a-cloud-other-than-azureaws)
+[on-premises](/azure/automation/automation-dsc-onboarding#physicalvirtual-windows-machines-on-premises-or-in-a-cloud-other-than-azure-including-aws-ec2-instances)
 or [in Azure](/azure/automation/automation-dsc-onboarding#azure-virtual-machines)
 to pull configurations.
 
diff --git a/articles/automation/automation-dsc-configuration-based-on-stig.md b/articles/automation/automation-dsc-configuration-based-on-stig.md
@@ -49,7 +49,7 @@ to generate MOF files
 and
 [upload the MOF files to Azure Automation](/azure/automation/tutorial-configure-servers-desired-state#create-and-upload-a-configuration-to-azure-automation).
 Then register your servers from either
-[on-premises](/azure/automation/automation-dsc-onboarding#physicalvirtual-windows-machines-on-premises-or-in-a-cloud-other-than-azureaws)
+[on-premises](/azure/automation/automation-dsc-onboarding#physicalvirtual-windows-machines-on-premises-or-in-a-cloud-other-than-azure-including-aws-ec2-instances)
 or [in Azure](/azure/automation/automation-dsc-onboarding#azure-virtual-machines)
 to pull configurations.
 
diff --git a/articles/automation/automation-dsc-create-composite.md b/articles/automation/automation-dsc-create-composite.md
@@ -69,7 +69,7 @@ to generate MOF files
 and
 [upload the MOF files to Azure Automation](/azure/automation/tutorial-configure-servers-desired-state#create-and-upload-a-configuration-to-azure-automation).
 Then register your servers from either
-[on-premises](/azure/automation/automation-dsc-onboarding#physicalvirtual-windows-machines-on-premises-or-in-a-cloud-other-than-azureaws)
+[on-premises](/azure/automation/automation-dsc-onboarding#physicalvirtual-windows-machines-on-premises-or-in-a-cloud-other-than-azure-including-aws-ec2-instances)
 or [in Azure](/azure/automation/automation-dsc-onboarding#azure-virtual-machines)
 to pull configurations.
 The latest update to the project has also published
diff --git a/articles/automation/automation-solution-vm-management.md b/articles/automation/automation-solution-vm-management.md
@@ -27,7 +27,7 @@ The following are limitations with the current solution:
 > [!NOTE]
 > If you are using the solution for classic VMs, then all your VMs will be processed sequentially per cloud service. Virtual machines are still processed in parallel across different cloud services. If you have more than 20 VMs per cloud service, we recommend creating multiple schedules with the parent runbook **ScheduledStartStop_Parent** and specify 20 VMs per schedule. In the schedule properties, specify as a comma-separated list, VM names in the **VMList** parameter. Otherwise, if the Automation job for this solution runs more than three hours it is temporarily unloaded or stopped per the [fair share](automation-runbook-execution.md#fair-share) limit.
 >
-> Azure Cloud Solution Provider (Azure CSP) subscriptions support only the Azure Resource Manager model, non-Azure Resource Manager services are not available in the program. When the Start/Stop solution runs you may receive errors as it has cmdlets to manage classic resources. To learn more about CSP, see [Available services in CSP subscriptions](https://docs.microsoft.com/azure/cloud-solution-provider/overview/azure-csp-available-services#comments). If you use a CSP subscription, you should modify the [**External_EnableClassicVMs**](#variables) variable to **False** after deployment.
+> Azure Cloud Solution Provider (Azure CSP) subscriptions support only the Azure Resource Manager model, non-Azure Resource Manager services are not available in the program. When the Start/Stop solution runs you may receive errors as it has cmdlets to manage classic resources. To learn more about CSP, see [Available services in CSP subscriptions](https://docs.microsoft.com/azure/cloud-solution-provider/overview/azure-csp-available-services). If you use a CSP subscription, you should modify the [**External_EnableClassicVMs**](#variables) variable to **False** after deployment.
 
 [!INCLUDE [azure-monitor-log-analytics-rebrand](../../includes/azure-monitor-log-analytics-rebrand.md)]
 
diff --git a/articles/automation/manage-runas-account.md b/articles/automation/manage-runas-account.md
@@ -27,7 +27,7 @@ There are two types of Run As Accounts:
   * Must be a co-administrator on the subscription to create or renew
 
   > [!NOTE]
-  > Azure Cloud Solution Provider (Azure CSP) subscriptions support only the Azure Resource Manager model, non-Azure Resource Manager services are not available in the program. When using a CSP subscription the Azure Classic Run As Account does not get created. The Azure Run As Account still gets created. To learn more about CSP subscriptions, see [Available services in CSP subscriptions](https://docs.microsoft.com/azure/cloud-solution-provider/overview/azure-csp-available-services#comments).
+  > Azure Cloud Solution Provider (Azure CSP) subscriptions support only the Azure Resource Manager model, non-Azure Resource Manager services are not available in the program. When using a CSP subscription the Azure Classic Run As Account does not get created. The Azure Run As Account still gets created. To learn more about CSP subscriptions, see [Available services in CSP subscriptions](https://docs.microsoft.com/azure/cloud-solution-provider/overview/azure-csp-available-services).
 
   > [!NOTE]
   > The service principal for a Run as Account does not have permissions to read Azure Active Directory by default. If you want to add permissions to read or manage Azure Active directory, you'll need to grant that permission on the service principal under **API permissions**. To learn more, see [Add permissions to access web APIs](../active-directory/develop/quickstart-configure-app-access-web-apis.md#add-permissions-to-access-web-apis).
diff --git a/articles/backup/backup-azure-security-feature-cloud.md b/articles/backup/backup-azure-security-feature-cloud.md
@@ -245,7 +245,7 @@ While backing up Azure Virtual Machines, you also have the option to encrypt you
 
 ### Backup of managed disk VM encrypted using customer managed keys
 
-Azure Backup allows you to back up Azure Virtual Machines containing disks encrypted using customer managed keys. For details, refer to [Encryption of managed disks with customer managed keys](https://docs.microsoft.com//azure/virtual-machines/windows/disk-encryption#customer-managed-keys-public-preview).
+Azure Backup allows you to back up Azure Virtual Machines containing disks encrypted using customer managed keys. For details, refer to [Encryption of managed disks with customer managed keys](https://docs.microsoft.com/azure/virtual-machines/windows/disk-encryption#customer-managed-keys).
 
 ### Backup of encrypted VMs
 

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ The following are limitations with the current solution:`
`27`	`27`	`> [!NOTE]`
`28`	`28`	> If you are using the solution for classic VMs, then all your VMs will be processed sequentially per cloud service. Virtual machines are still processed in parallel across different cloud services. If you have more than 20 VMs per cloud service, we recommend creating multiple schedules with the parent runbook ScheduledStartStop_Parent and specify 20 VMs per schedule. In the schedule properties, specify as a comma-separated list, VM names in the VMList parameter. Otherwise, if the Automation job for this solution runs more than three hours it is temporarily unloaded or stopped per the [fair share](automation-runbook-execution.md#fair-share) limit.
`29`	`29`	`>`
`30`		-> Azure Cloud Solution Provider (Azure CSP) subscriptions support only the Azure Resource Manager model, non-Azure Resource Manager services are not available in the program. When the Start/Stop solution runs you may receive errors as it has cmdlets to manage classic resources. To learn more about CSP, see [Available services in CSP subscriptions](https://docs.microsoft.com/azure/cloud-solution-provider/overview/azure-csp-available-services#comments). If you use a CSP subscription, you should modify the [External_EnableClassicVMs](#variables) variable to False after deployment.
	`30`	+> Azure Cloud Solution Provider (Azure CSP) subscriptions support only the Azure Resource Manager model, non-Azure Resource Manager services are not available in the program. When the Start/Stop solution runs you may receive errors as it has cmdlets to manage classic resources. To learn more about CSP, see [Available services in CSP subscriptions](https://docs.microsoft.com/azure/cloud-solution-provider/overview/azure-csp-available-services). If you use a CSP subscription, you should modify the [External_EnableClassicVMs](#variables) variable to False after deployment.
`31`	`31`
`32`	`32`	`[!INCLUDE [azure-monitor-log-analytics-rebrand](../../includes/azure-monitor-log-analytics-rebrand.md)]`
`33`	`33`