updating articles for Azure Gov

Author: rayne-wiselman

articles/migrate/common-questions-appliance.md

@@ -2,7 +2,7 @@
 title: Azure Migrate appliance FAQ
 description: Get answers to common questions about the Azure Migrate appliance.
 ms.topic: conceptual
-ms.date: 03/09/2020
+ms.date: 04/15/2020
 ---
 
 # Azure Migrate appliance: Common questions
@@ -26,6 +26,15 @@ Here's more information about the Azure Migrate appliance:
 
 [Learn more](migrate-appliance.md) about the appliance.
 
+## How can I deploy the appliance?
+
+The appliance can be deployed as follows:
+
+- Using a template for VMware VMs and Hyper-V VMs (OVA template for VMware or VHD for Hyper-V).
+- If you don't want to use a template, or you're in Azure Government, you can deploy the appliance for VMware or Hyper-V using a PowerShell script.
+- For physical servers, you always deploy the appliance using a script.
+
+
 ## How does the appliance connect to Azure?
 
 The appliance can connect over the internet or by using Azure ExpressRoute with public/Microsoft peering.
@@ -40,11 +49,8 @@ When you use the downloaded template to create the appliance VM, you can add com
 
 ## What network connectivity is required?
 
-See the following articles for information about network connectivity requirements for the Azure Migrate appliance:
 
-- **VMware assessment**: [URL access](migrate-appliance.md#url-access) and [port access](migrate-support-matrix-vmware.md#port-access)
-- **VMware agentless migration**: [URL access](migrate-appliance.md#url-access) and [port access](migrate-support-matrix-vmware-migration.md#agentless-ports)
-- **Hyper-V assessment**: [URL access](migrate-appliance.md#url-access) and [port access](migrate-support-matrix-hyper-v.md#port-access)
+The appliance needs access to Azure URLs. [Review](migrate-appliance.md#url-access) the URL list.
 
 ## What data does the appliance collect?
 

articles/migrate/common-questions-discovery-assessment.md

@@ -2,7 +2,7 @@
 title: Questions about discovery, assessment, and dependency analysis in Azure Migrate
 description: Get answers to common questions about discovery, assessment, and dependency analysis in Azure Migrate.
 ms.topic: conceptual
-ms.date: 02/17/2020
+ms.date: 04/15/2020
 
 ---
 
@@ -15,10 +15,17 @@ This article answers common questions about discovery, assessment, and dependenc
 - Questions about [server migration](common-questions-server-migration.md)
 - Get questions answered in the [Azure Migrate forum](https://aka.ms/AzureMigrateForum)
 
+
+## What geographies are supported for discovery and assessment with Azure Migrate?
+
+Review the supported geographies for [public](migrate-support-matrix.md#supported-geographies-(public-cloud)) and [government clouds](migrate-support-matrix.md#supported-geographies-(azure-government)).
+
+
 ## How many VMs can I discover with an appliance?
 
 You can discover up to 10,000 VMware VMs, up to 5,000 Hyper-V VMs, and up to 250 physical servers by using a single appliance. If you have more machines, read about [scaling a Hyper-V assessment](scale-hyper-v-assessment.md), [scaling a VMware assessment](scale-vmware-assessment.md), or [scaling a physical server assessment](scale-physical-assessment.md).
 
+
 ## The size of my VM changed. Can I run an assessment again?
 
 The Azure Migrate appliance continuously collects information about the on-premises environment.  An assessment is a point-in-time snapshot of on-premises VMs. If you change the settings on a VM that you want to assess, use the recalculate option to update the assessment with the latest changes.

articles/migrate/common-questions-server-migration.md

@@ -14,6 +14,10 @@ This article answers common questions about the Azure Migrate: Server Migration
 - Questions about [discovery, assessment, and dependency visualization](common-questions-discovery-assessment.md)
 - Get questions answered in the [Azure Migrate forum](https://aka.ms/AzureMigrateForum)
 
+## What geographies are supported for migration with Azure Migrate?
+
+Review the supported geographies for [public](migrate-support-matrix.md#supported-geographies-(public-cloud)) and [government clouds](migrate-support-matrix.md#supported-geographies-(azure-government)).
+
 ## How does agentless VMware replication work?
 
 The agentless replication method for VMware uses VMware snapshots and VMware Changed Block Tracking (CBT).

articles/migrate/concepts-assessment-calculation.md

@@ -13,6 +13,9 @@ This article provides an overview of assessments in the [Azure Migrate:Server As
 
 An assessment with the Server Assessment tool measures the readiness, and estimates the impact, of migrating on-premises servers to Azure.
 
+> [!NOTE]
+> In Azure Government, review the [supported target](migrate-support-matrix.md#supported-geographies-(azure-government)) assessment locations. Note that VM size recommendations in assessments will use the VM series specifically for Government Cloud regions.
+
 ## Types of assessments
 
 Assessments you create with Server Assessment are a point-in-time snapshot of data. Server Assessment provides two types of assessments.
@@ -177,7 +180,7 @@ After the machine is marked as ready for Azure, Server Assessment makes sizing r
 If you use performance-basing sizing, Server Assessment making sizing recommendations as follows:
 
 - Server Assessment considers the performance history of the machine to identify the VM size and disk type in Azure.
-- If servers have been imported using a CSV file, the values you specify are used. This method is especially helpful if you've over-allocated the on-premises machine, utilization is actually low, and you want to right-size the VM in Azure to save costs. 
+- If servers have been imported using a CSV file, the values you specify are used. This method is especially helpful if you've over-allocated the on-premises machine, utilization is low, and you want to right-size the VM in Azure to save costs. 
 - If you don't want to use the performance data, reset the sizing criteria to as-is on-premises, as described in the previous section.
 
 #### Calculate storage sizing

articles/migrate/concepts-dependency-visualization.md

@@ -2,7 +2,7 @@
 title: Dependency analysis in Azure Migrate Server Assessment
 description: Describes how to use dependency analysis for assessment using Azure Migrate Server Assessment.
 ms.topic: conceptual
-ms.date: 03/11/2020
+ms.date: 04/15/2020
 ---
 
 # Dependency analysis

articles/migrate/deploy-appliance-script.md

@@ -10,10 +10,20 @@ ms.date: 03/23/2020
 
 This article describes how to set up the [Azure Migrate appliance](deploy-appliance.md) using a PowerShell installer script.
 
-The script provides:
-- An alternative to setting up the appliance using an OVA template, for assessment and agentless migration of VMware VMs.
-- An alternative to setting up the appliance using a VHD template, for assessment and migration of Hyper-V VMs.
-- For assessment of physical servers (or VMs that you want to migrate as physical servers), the script is the only method for setting up the appliance.
+
+You can deploy the appliance using a couple of methods:
+
+
+- Using a template for VMware VMs (OVA) or Hyper-V VMs (VHD).
+- Using a script. This is the method described in this article. The script provides:
+    - An alternative to setting up the appliance using an OVA template, for assessment and agentless migration of VMware VMs.
+    - An alternative to setting up the appliance using a VHD template, for assessment and migration of Hyper-V VMs.
+    - For assessment of physical servers (or VMs that you want to migrate as physical servers), the script is the only method for setting up the appliance.
+    - A way to deploy the appliance in Azure Government.
+
+
+After creating the appliance, you verify that it can connect to Azure Migrate. You then configure the appliance for the first time, and register it with the Azure Migrate project.
+
 
 ## Prerequisites
 

articles/migrate/how-to-add-tool-first-time.md

@@ -1,15 +1,11 @@
 ---
 title: Add an assessment/migration tool in Azure Migrate
 description: Describes how to create an Azure Migrate project and add an assessment/migration tool.
-author: rayne-wiselman
-ms.service: azure-migrate
-ms.topic: article
-ms.date: 11/19/2019
-ms.author: raynew
+ms.topic: how-to
+ms.date: 04/16/2020
 ---
 
 
-
 # Add an assessment/migration tool for the first time
 
 This article describes how to add an assessment or migration tool to an [Azure Migrate](migrate-overview.md) project for the first time.  
@@ -20,7 +16,7 @@ Azure Migrate provides a central hub to track discovery, assessment and migratio
 Set up a new Azure Migrate project in an Azure subscription, and add a tool.
 
 - An Azure Migrate project is used to store discovery, assessment, and migration metadata collected from the environment you're assessing or migrating. 
-- In a project you can track discovered assets, and orchestrate assessment and migration.
+- In a project you can track discovered assets, and orchestrate assessment, and migration.
 
 1. In the Azure portal > **All services**, search for **Azure Migrate**.
 2. Under **Services**, select **Azure Migrate**.
@@ -34,28 +30,14 @@ Set up a new Azure Migrate project in an Azure subscription, and add a tool.
 
 1. In **Discover, assess and migrate servers**, click **Add tools**.
 2. In **Migrate project**, select your Azure subscription, and create a resource group if you don't have one.
-3. In **Project Details**, specify the project name, and geography in which you want to create the project. 
+3. In **Project Details**, specify the project name, and geography in which you want to create the project.  Review supported geographies for [public](migrate-support-matrix.md#supported-geographies-(public-cloud)) and [government clouds](migrate-support-matrix.md#supported-geographies-(azure-government)).
 
     ![Create an Azure Migrate project](./media/how-to-add-tool-first-time/migrate-project.png)
 
-    You can create an Azure Migrate project in any of these geographies.
-
-   **Geography** | **Storage location region**
-    --- | ---
-    Asia   | Southeast Asia or East Asia
-    Europe | North Europe or West Europe
-    Japan  | Japan East or Japan West
-    United Kingdom | UK South or UK West
-    United States | Central US or West US 2
-    Canada | Canada Central
-    India  | India Central or India South
-    Australia | Australia SouthEast
-
-    The geography specified for the project is only used to store the metadata gathered from on-premises VMs. You can select any target region for the actual migration.
-
-    If you want to specify a specific region within a geography for deploying the migrate project and its associated resources (Policy restrictions in your subscription may allow deploying of Azure resources only to a specific Azure region), you can use the below API to create a migrate project. Specify the Subscription ID, Resource group name, Migrate project name along with location(any of the Azure regions mentioned in the table where Azure Migrate is deployed.)
+    - The geography specified for the project is only used to store the metadata gathered from on-premises VMs. You can select any target region for the actual migration.
+    - If you need to deploy a project within a specific region in a geography, use the following API to create a project. Specify the subscription ID, resource group name, and project name, along with the location (review the geographies/regions for [public](migrate-support-matrix.md#supported-geographies-(public-cloud)) and [government clouds](migrate-support-matrix.md#supported-geographies-(azure-government)).
 
-    `PUT /subscriptions/<subid>/resourceGroups/<rg>/providers/Microsoft.Migrate/MigrateProjects/<mymigrateprojectname>?api-version=2018-09-01-preview "{location: 'centralus', properties: {}}"`   
+        `PUT /subscriptions/<subid>/resourceGroups/<rg>/providers/Microsoft.Migrate/MigrateProjects/<mymigrateprojectname>?api-version=2018-09-01-preview "{location: 'centralus', properties: {}}"`   
 
 
 4. Click **Next**, and add an assessment or migration tool.
@@ -65,9 +47,9 @@ Set up a new Azure Migrate project in an Azure subscription, and add a tool.
 
 5. In **Select assessment tool**, add an assessment tool. If you don't need an assessment tool, select **Skip adding an assessment tool for now** > **Next**. 
 2. In **Select migration tool**, add a migration tool as required. If you don't need a migration tool right now, select **Skip adding a migration tool for now** > **Next**.
-3. In **Review + add tools**, review the settings and click **Add tools**.
+3. In **Review + add tools**, review the settings, and click **Add tools**.
 
-After creating the project you can select additional tools for assessment and migration of servers and workloads, databases, and web apps.
+After creating the project, you can select additional tools for assessment and migration of servers and workloads, databases, and web apps.
 
 ## Create additional projects
 

articles/migrate/how-to-set-up-appliance-hyper-v.md

@@ -8,12 +8,16 @@ ms.date: 03/23/2020
 
 # Set up an appliance for Hyper-V VMs
 
-This article describes how to set up the Azure Migrate appliance for assessment of Hyper-V VMs with the [Azure Migrate:Server Assessment](migrate-services-overview.md#azure-migrate-server-assessment-tool) tool.
+Follow this article to set up the Azure Migrate appliance for assessment of Hyper-V VMs with the [Azure Migrate:Server Assessment](migrate-services-overview.md#azure-migrate-server-assessment-tool) tool.
 
 The [Azure Migrate appliance](migrate-appliance.md)  is a lightweight appliance used by Azure Migrate:Server Assessment/Migration to discover on-premises Hyper-V VMs, and send VM metadata/performance data to Azure.
 
-You can set up the Azure Migrate appliance for Hyper-V VM assessment using a VHD template that you download, or using a PowerShell installation script. This article describes how to set up the appliance using the VHD template. If you want to set up the appliance using the script, follow the instructions in [this article](deploy-appliance-script.md).
+You can deploy the appliance using a couple of methods:
 
+- Set up on a Hyper-V VM using a downloaded VHD. This is the method described in this article.
+- Set up on a Hyper-V VM or physical machine with a PowerShell installer script. [This method](migrate-appliance-script.md) should be used if you can't set up a VM using a VHD, or if you're in Azure Government.
+
+After creating the appliance, you check that it can connect to Azure Migrate:Server Assessment, configure it for the first time, and register it with the Azure Migrate project.
 
 ## Appliance deployment (VHD)
 
@@ -69,7 +73,7 @@ Import the downloaded file, and create the VM.
 
 ### Verify appliance access to Azure
 
-Make sure that the appliance VM can connect to [Azure URLs](migrate-appliance.md#url-access).
+Make sure that the appliance VM can connect to Azure URLs for [public](migrate-appliance.md#public-cloud-urls) and [government](migrate-appliance.md#government-cloud-urls) clouds.
 
 ## Configure the appliance
 

articles/migrate/how-to-set-up-appliance-physical.md

@@ -1,11 +1,9 @@
 ---
 title: Set up an Azure Migrate appliance for physical servers
 description: Learn how to set up an Azure Migrate appliance for physical server assessment.
-author: rayne-wiselman
 ms.service: azure-migrate
 ms.topic: article
-ms.date: 11/19/2019
-ms.author: raynew
+ms.date: 04/15/2020
 ---
 
 
@@ -74,14 +72,14 @@ Run the script as follows:
     ```
 The script will launch the appliance web application when it finishes successfully.
 
-In case of any issues, you can access the script logs at C:\ProgramData\Microsoft Azure\Logs\AzureMigrateScenarioInstaller_<em>Timestamp</em>.log for troubleshooting.
+If you come across any issues, you can access the script logs at C:\ProgramData\Microsoft Azure\Logs\AzureMigrateScenarioInstaller_<em>Timestamp</em>.log for troubleshooting.
 
 > [!NOTE]
 > Please do not execute the Azure Migrate installer script on an existing Azure Migrate appliance.
 
 ### Verify appliance access to Azure
 
-Make sure that the appliance VM can connect to the required [Azure URLs](migrate-appliance.md#url-access).
+Make sure that the appliance VM can connect to Azure URLs for [public](migrate-appliance.md#public-cloud-urls) and [government](migrate-appliance.md#government-cloud-urls) clouds.
 
 ## Configure the appliance
 
@@ -116,7 +114,7 @@ Set up the appliance for the first time.
 Connect from the appliance to physical servers, and start the discovery.
 
 1. Click **Add Credentials** to specify the account credentials that the appliance will use to discover servers.  
-2. Specify the **Operating System**,  friendly name for the credentials, **Username** and **Password** and click **Add**.
+2. Specify the **Operating System**,  a friendly name for the credentials, and the username and password. Then click **Add**.
 You can add one set of credentials each for Windows and Linux servers.
 4. Click **Add server**, and specify server details- FQDN/IP address and friendly name of credentials (one entry per row) to connect to the server.
 3. Click **Validate**. After validation, the list of servers that can be discovered is shown.

articles/migrate/how-to-set-up-appliance-vmware.md

@@ -2,17 +2,22 @@
 title: Set up an Azure Migrate appliance for VMware 
 description: Learn how to set up an Azure Migrate appliance to assess and migrate VMware VMs.
 ms.topic: article
-ms.date: 03/23/2020
+ms.date: 04/16/2020
 ---
 
 
 # Set up an appliance for VMware VMs
 
-This article describes how to set up the Azure Migrate appliance for assessment with the [Azure Migrate:Server Assessment](migrate-services-overview.md#azure-migrate-server-assessment-tool) tool, and for agentless migration using the [Azure Migrate:Server Migration](migrate-services-overview.md#azure-migrate-server-migration-tool) tool.
+Follow this article to set up the Azure Migrate appliance for assessment with the [Azure Migrate:Server Assessment](migrate-services-overview.md#azure-migrate-server-assessment-tool) tool, and for agentless migration using the [Azure Migrate:Server Migration](migrate-services-overview.md#azure-migrate-server-migration-tool) tool.
 
 The [Azure Migrate appliance](migrate-appliance.md) is a lightweight appliance used by Azure Migrate:Server Assessment and Server Migration to discover on-premises VMware VMs, send VM metadata/performance data to Azure, and for replication of VMware VMs during agentless migration.
 
-You can set up the Azure Migrate appliance for VMware VM assessment using an OVA template that you download, or using a PowerShell installation script. This article describes how to set up the appliance using the OVA template. If you want to set up the appliance using the script, follow the instructions in [this article](deploy-appliance-script.md).
+You can deploy the appliance using a couple of methods:
+
+- Set up on a VMware VM using a downloaded OVA template. This is the method described in this article.
+- Set up on a VMware VM or physical machine with a PowerShell installer script. [This method](migrate-appliance-script.md) should be used if you can't set up a VM using an OVA template, or if you're in Azure government.
+
+After creating the appliance, you check that it can connect to Azure Migrate:Server Assessment, configure it for the first time, and register it with the Azure Migrate project.
 
 
 ## Appliance deployment (OVA)
@@ -59,9 +64,9 @@ will be hosted.
 9. Review and confirm the settings, then click **Finish**.
 
 
-### Verify appliance access to Azure
+## Verify appliance access to Azure
 
-Make sure that the appliance VM can connect to [Azure URLs](migrate-appliance.md#url-access).
+Make sure that the appliance VM can connect to Azure URLs for [public](migrate-appliance.md#public-cloud-urls) and [government](migrate-appliance.md#government-cloud-urls) clouds.
 
 
 ## Configure the appliance