Merge branch 'MicrosoftDocs:main' into tozimmergren-caf-modernize-mig…

…ration

.docutune/config/docutune-unattended.json

@@ -5,7 +5,7 @@
     "maxInFlightFiles": 200
   },
   "pullRequest": {
-    "title": "[BULK] [DocuTune-Remediation] - Scheduled execution to fix known issues in CAF",
+    "title": "[DO NOT MERGE] [DocuTune-Remediation] - Test of DocuTune scheduled execution in CAF - PLEASE IGNORE",
     "batchSize": 0,
     "maxBatches": 100,
     "body": "",

SECURITY.md

@@ -2,7 +2,7 @@
 
 ## Security
 
-Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [`Microsoft`](https://github.com/microsoft), [`Azure`](https://github.com/Azure), [`DotNet`](https://github.com/dotnet), [`AspNet`](https://github.com/aspnet), [`Xamarin`](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
 
 If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/opensource/security/definition), please report it to us as described below.
 
@@ -18,7 +18,7 @@ You should receive a response within 24 hours. If for some reason you do not, pl
 
 Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
 
-  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Type of issue (e.g. buffer overflow, SQL injection, or cross-site scripting)
   * Full paths of source file(s) related to the manifestation of the issue
   * The location of the affected source code (tag/branch/commit or direct URL)
   * Any special configuration required to reproduce the issue

docs/get-started/migrate.md

@@ -19,7 +19,7 @@ Proper alignment of business and IT stakeholders helps overcome migration roadbl
 
 This article also helps you implement proper governance and management processes. Use this guide to streamline the processes and materials required to align an overall migration effort.
 
-If your migration scenario is atypical, you can get a personalized assessment of your organization's migration readiness by using the [strategic migration and readiness tool (SMART) assessment](/assessments/Strategic-Migration-Assessment/). Use it to identify the guidance that best aligns to your current needs.
+If your migration scenario is atypical, you can get a personalized assessment of your organization's migration readiness by using the [Strategic Migration Assessment and Readiness Tool (SMART)](/assessments/Strategic-Migration-Assessment/). Use it to identify the guidance that best aligns to your current needs.
 
 ## Get started
 
@@ -244,4 +244,4 @@ The Cloud Adoption Framework is a lifecycle solution that helps you begin a migr
 | Cloud governance team | Use the [Govern methodology](../govern/index.md) to continue to improve governance processes, policies, and disciplines. |
 | Cloud operations team | Build on the [Manage methodology](../manage/index.md) to provide richer operations in Azure. |
 
-If your migration scenario is atypical, you can get a personalized assessment of your organization's migration readiness by using the [strategic migration and readiness tool (SMART) assessment](/assessments/Strategic-Migration-Assessment/). The answers you provide help identify which guidance aligns best with your current needs.
+If your migration scenario is atypical, you can get a personalized assessment of your organization's migration readiness by using the [Strategic Migration Assessment and Readiness Tool (SMART)](/assessments/Strategic-Migration-Assessment/). The answers you provide help identify which guidance aligns best with your current needs.

docs/get-started/what-is-azure.md

@@ -30,7 +30,7 @@ The server racks, or clusters, are chosen to run virtualized hardware instances
 
 Each instance of the fabric controller is connected to another set of servers running cloud orchestration software, typically known as the front end. The front end hosts the web services, RESTful APIs, and internal Azure databases, which are used for all functions in the cloud.
 
-For example, the front end hosts the services that handle customer requests. The requests allocate Azure resources and services such as [virtual machines](/azure/virtual-machines/), and [Azure Cosmos DB](/azure/cosmos-db/introduction). First, the front end validates and verifies if the user is authorized to allocate the requested resources. If so, the front end checks a database to locate a server rack with sufficient capacity, which instructs the fabric controller to allocate the resource.
+For example, the front end hosts the services that handle customer requests. The requests allocate Azure resources and services such as [Azure Virtual Machines](/azure/virtual-machines/), and [Azure Cosmos DB](/azure/cosmos-db/introduction). First, the front end validates and verifies if the user is authorized to allocate the requested resources. If so, the front end checks a database to locate a server rack with sufficient capacity, which instructs the fabric controller to allocate the resource.
 
 Azure is a huge collection of servers and networking hardware, which runs a complex set of distributed applications. These applications orchestrate the configuration and operation of virtualized hardware and software on those servers. The orchestration of these servers is what makes Azure so powerful. With Azure, users don't have to maintain and upgrade their hardware as Azure does this behind the scenes.
 

docs/get-started/whats-new.md

@@ -5,7 +5,7 @@ author: Zimmergren
 ms.author: tozimmergren
 ms.date: 10/06/2023
 ms.topic: conceptual
-ms.custom: UpdateFrequency.5
+ms.custom: UpdateFrequency.5, historical
 ---
 
 # What's new in the Microsoft Cloud Adoption Framework for Azure
@@ -109,7 +109,7 @@ In this three-part series about SAP applications, learn how to [identify SAP dat
 
 ### SAP workload storage on Azure
 
-Learn about the platform-level SLAs for various high-availability deployment options. See the [storage types]( /azure/cloud-adoption-framework/scenarios/sap/eslz-business-continuity-and-disaster-recovery#storage-for-sap-workloads) that are available for an HA and DR setup for SAP workloads on Azure. Learn about their configuration details and about non-Azure storage service options.
+Learn about the platform-level SLAs for various high-availability deployment options. See the [storage types](/azure/cloud-adoption-framework/scenarios/sap/eslz-business-continuity-and-disaster-recovery#storage-for-sap-workloads) that are available for an HA and DR setup for SAP workloads on Azure. Learn about their configuration details and about storage options outside of Azure.
 
 ### Automated Azure VMware Solution implementation options
 
@@ -164,17 +164,17 @@ We encourage you to review these updates and incorporate them into your App Serv
 
 ## December 2022
 
-### Defense cloud adoption scenario
+### Cloud adoption scenario for defense
 
-The Defense cloud adoption scenario provides universal guidance to help mission owners accelerate digital transformation. The guidance is impartial to country/region and collects best practices from our experience working with defense organizations around the world. Mission owners face unique challenges that are uncommon in other sectors. The Defense cloud adoption scenario provides recommendations to help navigate those challenges so mission owners can focus on meeting mission objectives.
+The cloud adoption scenario for defense provides universal guidance to help mission owners accelerate digital transformation. The guidance is impartial to country/region and collects best practices from our experience working with defense organizations around the world. Mission owners face unique challenges that are uncommon in other sectors. The defense scenario provides recommendations to help navigate those challenges so mission owners can focus on meeting mission objectives.
 
-We invite you to [explore the Defense cloud adoption scenario](../scenarios/defense/index.md) and return to this content regularly throughout your journey. The content highlights critical areas of focus but also refers you to other documentation for deeper technical insight. The result should be a secure, scalable, and governed environment that is tailored to mission needs.
+We invite you to [explore the defense scenario](../scenarios/defense/index.md) and return to this content regularly throughout your journey. The content highlights critical areas of focus but also refers you to other documentation for deeper technical insight. The result should be a secure, scalable, and governed environment that is tailored to mission needs.
 
 ### HPC landing zone accelerator
 
 High-performance computing (HPC) on Azure is the complete set of Azure resources (compute, networking, and storage) integrated with workload orchestration services. HPC on Azure supports applications that provide advanced analytics, graphic-intensive visualizations, and scalable rendering. HPC can run complex simulations for organizations in multiple industries such as manufacturing, energy, and finance.
 
-The HPC landing zone accelerator modernizes HPC workloads on Azure by offering global regulatory compliance, next-generation machine-learning tools, and a well-architected framework for best practices. The landing zone accelerator also provides industry-specific architecture references and automation solutions that help you start your HPC journey on Azure.
+The HPC landing zone accelerator modernizes HPC workloads on Azure by offering global regulatory compliance, next-generation machine-learning tools, and a framework for architectural best practices. The landing zone accelerator also provides industry-specific architecture references and automation solutions that help you start your HPC journey on Azure.
 
 Use the following links to get started with HPC on Azure:
 

docs/govern/resource-consistency/business-constraints.md

@@ -22,7 +22,7 @@ Consider using the following Azure Policies if you have data residency restricti
 - The [SQL Database should avoid using GRS backup redundancy policy](https://ms.portal.azure.com/#view/Microsoft_Azure_Policy/PolicyDetailBlade/definitionId/%2Fproviders%2FMicrosoft.Authorization%2FpolicyDefinitions%2Fb219b9cf-f672-4f96-9ab0-f5a3ac5e1c13) restricts using the default geo-redundant storage for backups for SQL databases.
 - The [Azure Cosmos DB allowed locations policy](https://portal.azure.com/#blade/Microsoft_Azure_Policy/PolicyDetailBlade/definitionId/%2Fproviders%2FMicrosoft.Authorization%2FpolicyDefinitions%2F0473574d-2d43-4217-aefe-941fcdf7e684) enables you to restrict the locations to which your organization can deploy Cosmos DB.
 
-TODO: The allowed locations Azure Policy restricts where all resources can be created. Are there granular policies or controls for data resources themselves (Sql, Cosmos, etc.), or is the above policy what customers use?
+<!-- TODO: The allowed locations Azure Policy restricts where all resources can be created. Are there granular policies or controls for data resources themselves (SQL, cosmos, etc.), or is the above policy what customers use? -->
 
 ## Redundant data storage
 

docs/govern/resource-consistency/index.md

@@ -14,7 +14,7 @@ Resource consistency is one of the Five Disciplines of Cloud Governance within t
 
 ## Governed vs. ungoverned resources
 
-[Gartner defines IT Governance](https://www.gartner.com/en/information-technology/glossary/it-governance) "... as the processes that ensure the effective and efficient use of IT in enabling an organization to achieve its goals." A resource can be considered governed if the processes are in place to ensure compliance with business standards. Resources that aren't in compliance are necessarily ungoverned resources, as there are no processes in place to remediate and make them compliant.
+[Gartner defines IT governance](https://www.gartner.com/en/information-technology/glossary/it-governance) as "the processes that ensure the effective and efficient use of IT in enabling an organization to achieve its goals." A resource can be considered governed if the processes are in place to ensure compliance with business standards. Resources that aren't in compliance are necessarily ungoverned resources, as there are no processes in place to remediate and make them compliant.
 
 Examples of ungoverned resources regarding the resource consistency discipline include:
 

docs/govern/resource-consistency/naming.md

@@ -17,18 +17,18 @@ Well-defined naming conventions  provide consistency, prevent naming clashes and
 - Environment
 - Azure region
 
-For example, a public IP resource for a production SharePoint workload in the West US region might be pip-sharepoint-prod-westus-001.
+For example, a public IP resource for a production SharePoint workload in the West US region might be `pip-sharepoint-prod-westus-001`.
 
 ![Diagram that shows the components of an Azure resource name.](../../_images/ready/resource-naming.png)
 
 *Diagram 1: Components of an Azure resource name from [Define your naming convention](../../ready/azure-best-practices/resource-naming.md).*
 
-Naming rules and restrictions, such as scope, name length, or valid characters, differ by resource type in Azure. The example in the table below illustrates how resources have differing constraints. 
+Naming rules and restrictions, such as scope, name length, or valid characters, differ by resource type in Azure. The example in the table below illustrates how resources have differing constraints.
 
 | Entity | Scope | Length | Valid Characters |
 | --- | --- | --- | --- |
-| Microsoft.Storage.storageAccounts | global | 3-24 | Lowercase letters and numbers. |
-| Microsoft.Network.virtualNetworks | resource group | 2-64 | Alphanumerics, underscores, periods, and hyphens. <br />Start with alphanumeric. End alphanumeric or underscore. |
+| `Microsoft.Storage/storageAccounts` | global | 3-24 | Lowercase letters and numbers. |
+| `Microsoft.Network/virtualNetworks` | resource group | 2-64 | Alphanumerics, underscores, periods, and hyphens. <br />Start with alphanumeric. End alphanumeric or underscore. |
 
 *Table 1: Example resource rules and restrictions*
 
@@ -49,7 +49,7 @@ Use the following resources to understand the components of a good naming conven
 
 Azure Policy can be used to enforce and audit compliance of your naming standards. Because there are no pre-defined standards for naming, there are no built-in policies to enforce naming. You can create custom policies to enforce the standards you determine.
 
-The following snippet from a [custom policy example in Azure Samples](https://github.com/Azure-Samples/Governance/blob/master/src/policy/naming-convention/policy.json) denies an Azure virtual machine deployment based on a naming standard.
+The following snippet from a [custom policy example in `Azure-Samples`](https://github.com/Azure-Samples/Governance/blob/master/src/policy/naming-convention/policy.json) denies an Azure virtual machine deployment based on a naming standard.
 
 ```json
 {