fixing links to new docs

rayne-wiselman · rayne-wiselman · commit 05a89cef04e2 · 2020-01-08T18:31:31.000+02:00
diff --git a/articles/migrate/common-questions-appliance.md b/articles/migrate/common-questions-appliance.md
@@ -35,9 +35,9 @@ When you create the appliance VM using the downloaded template, you can add comp
 ## What network connectivity is needed?
 
 Review the following:
-- Appliance VMware assessment: [URL](migrate-support-matrix-vmware.md#assessment-url-access-requirements) and [port](migrate-support-matrix-vmware.md#assessment-port-requirements) access requirements.
-- Appliance agentless VMware migration: [URL](migrate-support-matrix-vmware.md#agentless-migration-url-access-requirements) and [port](migrate-support-matrix-vmware.md#agentless-migration-port-requirements) access requirements.
-- Appliance Hyper-V assessment: [URL](migrate-support-matrix-hyper-v.md#assessment-appliance-url-access) and [port](migrate-support-matrix-hyper-v.md#assessment-port-requirements) access requirements.
+- VMware assessment using the Azure Migrate appliance: [URL](migrate-appliance.md#url-access) and [port](migrate-support-matrix-vmware.md#port-access) access requirements.
+- VMware agentless migration using the Azure Migrate appliance: [URL](migrate-appliance.md#url-access) and [port](migrate-support-matrix-vmware-migration.md#agentless-ports) access requirements.
+- Hyper-V assessment using the Azure Migrate appliance: [URL](migrate-appliance.md#url-access) and [port](migrate-support-matrix-hyper-v.md#port-access) access requirements.
 
 
 ## What data does the appliance collect?
diff --git a/articles/migrate/how-to-discover-applications.md b/articles/migrate/how-to-discover-applications.md
@@ -1,11 +1,8 @@
 ---
-title: Discover apps, roles, and features installed on on-premises servers using Azure Migrate Server Assessment
-description: Describes how to discover apps, roles, and features on on-premises servers using Azure Migrate Server Assessment.
-author: snehaamicrosoft
-ms.service: azure-migrate
+title: Discover apps, roles, and features on on-premises servers with Azure Migrate 
+description: Learn how to discover apps, roles, and features on on-premises servers with zure Migrate Server Assessment.
 ms.topic: article
 ms.date: 11/20/2019
-ms.author: snehaa
 ---
 
 # Discover machine apps, roles, and features
@@ -25,14 +22,14 @@ App discovery using Azure Migrate: Server Assessment is agentless. Nothing needs
 1. Review the [support limitations](migrate-support-matrix-vmware.md#application-discovery) for app-level discovery.
 2. Make sure you've [created](how-to-add-tool-first-time.md) an Azure Migrate project.
 3. If you've already created a project, make sure you've [added](how-to-assess.md) the Azure Migrate: Server Assessment tool.
-4. Check the [VMware requirements](migrate-support-matrix-vmware.md#assessment-vcenter-server-requirements) for discovering and assessing VMware VMs with the Azure Migrate appliance.
-4. Check the [requirements](migrate-support-matrix-vmware.md#assessment-appliance-requirements) for deploying the Azure Migrate appliance.
+4. Check the [VMware requirements](migrate-support-matrix-vmware.md#vmware-requirements) for discovering and assessing VMware VMs with the Azure Migrate appliance.
+4. Check the [requirements](migrate-appliance.md) for deploying the Azure Migrate appliance.
 
 ## Prepare for app discovery
 
-1. [Prepare for appliance deployment](https://docs.microsoft.com/azure/migrate/tutorial-prepare-vmware). Preparation includes verifying appliance settings, and setting up an account that the appliance will use to access vCenter Server.
+1. [Prepare for appliance deployment](tutorial-prepare-vmware.md). Preparation includes verifying appliance settings, and setting up an account that the appliance will use to access vCenter Server.
 2. Make sure you have a user account (one each for Windows and Linux servers) with administrator permissions for machines on which you want to discover apps, roles, and features.
-3. [Deploy the VMware appliance](how-to-set-up-appliance-vmware.md) to start discovery. To deploy the appliance, you download and import an OVA template into VMware to create the appliance as a VMware VM. You configure the appliance and then register it with Azure Migrate.
+3. [Deploy the Azure Migrate appliance](how-to-set-up-appliance-vmware.md) to start discovery. To deploy the appliance, you download and import an OVA template into VMware to create the appliance as a VMware VM. You configure the appliance and then register it with Azure Migrate.
 2. As you deploy the appliance, to start continuous discovery you specify the following:
     - The name of the vCenter Server to which you want to connect.
     - Credentials that you created for the appliance to connect to vCenter Server.
diff --git a/articles/migrate/how-to-set-up-appliance-hyper-v.md b/articles/migrate/how-to-set-up-appliance-hyper-v.md
@@ -1,11 +1,8 @@
 ---
 title: Set up an Azure Migrate appliance for Hyper-V
 description: Learn how to set up an Azure Migrate appliance to assess and migrate Hyper-V VMs.
-author: rayne-wiselman
-ms.service: azure-migrate
 ms.topic: article
 ms.date: 11/19/2019
-ms.author: raynew
 ---
 
 
@@ -78,7 +75,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-support-matrix-hyper-v.md#assessment-appliance-url-access).
+Make sure that the appliance VM can connect to [Azure URLs](migrate-appliance.md#url-access).
 
 ## Configure the appliance
 
diff --git a/articles/migrate/how-to-set-up-appliance-physical.md b/articles/migrate/how-to-set-up-appliance-physical.md
@@ -87,7 +87,7 @@ The script will launch the appliance web application when it finishes successful
 
 ### Verify appliance access to Azure
 
-Make sure that the appliance VM can connect to the required [Azure URLs](migrate-support-matrix-hyper-v.md#assessment-appliance-url-access).
+Make sure that the appliance VM can connect to the required [Azure URLs](migrate-appliance.md#url-access).
 
 ## Configure the appliance
 
diff --git a/articles/migrate/how-to-set-up-appliance-vmware.md b/articles/migrate/how-to-set-up-appliance-vmware.md
@@ -1,11 +1,8 @@
 ---
 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.
-author: rayne-wiselman
-ms.service: azure-migrate
 ms.topic: article
 ms.date: 11/18/2019
-ms.author: raynew
 ---
 
 
@@ -69,7 +66,7 @@ will be hosted.
 
 ### Verify appliance access to Azure
 
-Make sure that the appliance VM can connect to [Azure URLs](migrate-support-matrix-vmware.md#assessment-url-access-requirements).
+Make sure that the appliance VM can connect to [Azure URLs](migrate-appliance.md#url-access).
 
 
 ## Configure the appliance
@@ -111,7 +108,7 @@ The appliance needs to connect to vCenter Server to discover the configuration a
 
 ### Specify vCenter Server details
 1. In **Specify vCenter Server details**, specify the name (FQDN) or IP address of the vCenter Server. You can leave the default port, or specify a custom port on which your vCenter Server listens.
-2. In **User name** and **Password**, specify the read-only account credentials that the appliance will use to discover VMs on the vCenter server. Make sure that the account has the [required permissions for discovery](migrate-support-matrix-vmware.md#assessment-vcenter-server-permissions). You can scope the discovery by limiting access to the vCenter account accordingly; learn more about scoping discovery [here](tutorial-assess-vmware.md#set-the-scope-of-discovery).
+2. In **User name** and **Password**, specify the read-only account credentials that the appliance will use to discover VMs on the vCenter server. You can scope the discovery by limiting access to the vCenter account accordingly; learn more about scoping discovery [here](tutorial-assess-vmware.md#set-the-scope-of-discovery).
 3. Click **Validate connection** to make sure that the appliance can connect to vCenter Server.
 
 ### Specify VM credentials
diff --git a/articles/migrate/migrate-support-matrix-hyper-v-migration.md b/articles/migrate/migrate-support-matrix-hyper-v-migration.md
@@ -48,7 +48,25 @@ You can select up to 10 VMs at once for replication. If you want to migrate more
 | **Azure Site Recovery** | You can't replicate using Azure Migrate Server Migration if the VM is enabled for replication with Azure Site Recovery.
 | **Ports** | Outbound connections on HTTPS port 443 to send VM replication data.
 
+## Azure VM requirements
 
+All on-premises VMs replicated to Azure must meet the Azure VM requirements summarized in this table. When Site Recovery runs a prerequisites check for replication, the check will fail if some of the requirements aren't met.
+
+**Component** | **Requirements** | **Details**
+--- | --- | ---
+Guest operating system | Verifies supported VMware VM operating systems for migration.<br/> You can migrate any workload running on a supported operating system. | Check fails if unsupported.
+Guest operating system architecture | 64-bit. | Check fails if unsupported.
+Operating system disk size | Up to 2,048 GB. | Check fails if unsupported.
+Operating system disk count | 1 | Check fails if unsupported.
+Data disk count | 64 or less. | Check fails if unsupported.
+Data disk size | Up to 4,095 GB | Check fails if unsupported.
+Network adapters | Multiple adapters are supported. |
+Shared VHD | Not supported. | Check fails if unsupported.
+FC disk | Not supported. | Check fails if unsupported.
+BitLocker | Not supported. | BitLocker must be disabled before you enable replication for a machine.
+VM name | From 1 to 63 characters.<br/> Restricted to letters, numbers, and hyphens.<br/><br/> The machine name must start and end with a letter or number. |  Update the value in the machine properties in Site Recovery.
+Connect after migration-Windows | To connect to Azure VMs running Windows after migration:<br/> - Before migration enables RDP on the on-premises VM. Make sure that TCP, and UDP rules are added for the **Public** profile, and that RDP is allowed in **Windows Firewall** > **Allowed Apps**, for all profiles.<br/> For site-to-site VPN access, enable RDP and allow RDP in **Windows Firewall** -> **Allowed apps and features** for **Domain and Private** networks. In addition, check that the operating system's SAN policy is set to **OnlineAll**. [Learn more](prepare-for-migration.md). |
+Connect after migration-Linux | To connect to Azure VMs after migration using SSH:<br/> Before migration, on the on-premises machine, check that the Secure Shell service is set to Start, and that firewall rules allow an SSH connection.<br/> After failover, on the Azure VM, allow incoming connections to the SSH port for the network security group rules on the failed over VM, and for the Azure subnet to which it's connected. In addition, add a public IP address for the VM. |  
 
 ## Next steps
 
diff --git a/articles/migrate/migrate-support-matrix-vmware-migration.md b/articles/migrate/migrate-support-matrix-vmware-migration.md
@@ -111,6 +111,7 @@ The table summarizes VMware VM support for VMware VMs you want to migrate using
 
 
 
+
 ## Agent-based-replication appliance 
 
 When you set up the replication appliance using the OVA template provided in the Azure Migrate hub, the appliance runs Windows Server 2016 and complies with the support requirements. If you set up the replication appliance manually on a physical server, then make sure that it complies with the requirements.
diff --git a/articles/migrate/toc.yml b/articles/migrate/toc.yml
@@ -54,19 +54,19 @@
   items:
   - name: Support matrices
     items:
-    - name: Support matrix for Azure Migrate
+    - name: General support 
       href: migrate-support-matrix.md
-    - name: Support matrix for VMware assessment
+    - name: VMware assessment support
       href: migrate-support-matrix-vmware.md
-    - name: Support matrix for VMware migration
+    - name: VMware migration support
       href: migrate-support-matrix-vmware-migration.md
-    - name: Support matrix for Hyper-V assessment 
+    - name: Hyper-V assessment support
       href: migrate-support-matrix-hyper-v.md
-    - name: Support matrix for Hyper-V migration
-      name: migrate-support-matrix-hyper-v-migration.md
-    - name: Support matrix for physical server assessment 
+    - name: Hyper-V migration support
+      href: migrate-support-matrix-hyper-v-migration.md
+    - name: Physical server assessment support
       href: migrate-support-matrix-physical.md
-    - name: Support matrix for physical server migration
+    - name: Physical server migration support
       href: migrate-support-matrix-physical-migration.md
     - name: Azure Migrate appliance requirements
       href: migrate-appliance.md
@@ -119,16 +119,16 @@
     href: prepare-for-migration.md
   - name: Delete an Azure Migrate project
     href: how-to-delete-project.md
-- name: Scale assessment and migration
-  items:
-  - name: Assess large numbers of VMware VMs
-    href: scale-vmware-assessment.md
-  - name: Assess large numbers of Hyper-V VMs
-    href: scale-hyper-v-assessment.md
-  - name: Automate migration of large number of VMs
-    href: how-to-migrate-at-scale.md
-  - name: Migration examples (Contoso series)
-    href: contoso-migration-overview.md
+  - name: Scale assessment and migration
+    items:
+    - name: Assess large numbers of VMware VMs
+      href: scale-vmware-assessment.md
+    - name: Assess large numbers of Hyper-V VMs
+      href: scale-hyper-v-assessment.md
+    - name: Automate migration of large number of VMs
+      href: how-to-migrate-at-scale.md
+    - name: Migration examples (Contoso series)
+      href: contoso-migration-overview.md
 - name: Troubleshoot
   items:
   - name: Troubleshoot Azure Migrate
diff --git a/articles/migrate/tutorial-assess-hyper-v.md b/articles/migrate/tutorial-assess-hyper-v.md
@@ -140,7 +140,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-support-matrix-hyper-v.md#assessment-appliance-url-access).
+Make sure that the appliance VM can connect to [Azure URLs](migrate-appliance.md#url-access).
 
 ### Configure the appliance
 
diff --git a/articles/migrate/tutorial-assess-physical.md b/articles/migrate/tutorial-assess-physical.md
@@ -1,12 +1,8 @@
 ---
 title: Assess physical servers for migration to Azure with Azure Migrate Server Assessment
 description: Describes how to assess on-premises physical servers for migration to Azure using Azure Migrate Server Assessment.
-author: rayne-wiselman
-manager: carmonm
-ms.service: azure-migrate
 ms.topic: tutorial
 ms.date: 11/18/2019
-ms.author: raynew
 ---
 
 # Assess physical servers with Azure Migrate: Server Assessment
@@ -136,7 +132,7 @@ In case of any issues, you can access the script logs at C:\ProgramData\Microsof
 
 ### Verify appliance access to Azure
 
-Make sure that the appliance can connect to [Azure URLs](migrate-support-matrix-physical.md#assessment-appliance-url-access).
+Make sure that the appliance can connect to [Azure URLs](migrate-appliance.md#url-access).
 
 
 ### Configure the appliance
diff --git a/articles/migrate/tutorial-assess-vmware.md b/articles/migrate/tutorial-assess-vmware.md
@@ -125,7 +125,7 @@ Import the downloaded file, and create a VM:
 
 ### Verify appliance access to Azure
 
-Make sure that the appliance VM can connect to [Azure URLs](migrate-support-matrix-vmware.md#assessment-url-access-requirements).
+Make sure that the appliance VM can connect to [Azure URLs](migrate-appliance.md#url-access).
 
 ### Configure the appliance
 
@@ -167,7 +167,7 @@ The appliance needs to connect to vCenter Server to discover the configuration a
 1. In **Specify vCenter Server details**, specify the name (FQDN) or IP address of the vCenter Server instance. You can leave the default port or specify a custom port on which vCenter Server listens.
 1. In **User name** and **Password**, specify the vCenter Server account credentials that the appliance will use to discover VMs on the vCenter Server instance. 
 
-   Make sure that the account has the [required permissions for discovery](migrate-support-matrix-vmware.md#assessment-vcenter-server-permissions). You can [scope the discovery](tutorial-assess-vmware.md#set-the-scope-of-discovery) by limiting access to the vCenter account.
+   Make sure that the account has the [required permissions for discovery](migrate-support-matrix-vmware.md#vmware-requirements). You can [scope the discovery](tutorial-assess-vmware.md#set-the-scope-of-discovery) by limiting access to the vCenter account.
 1. Select **Validate connection** to make sure that the appliance can connect to vCenter Server.
 
 ### Specify VM credentials
diff --git a/articles/migrate/tutorial-migrate-hyper-v.md b/articles/migrate/tutorial-migrate-hyper-v.md
@@ -117,7 +117,7 @@ Install the downloaded setup file (AzureSiteRecoveryProvider.exe) on each releva
     - Specify the proxy name as **http://ip-address**, or **http://FQDN**. HTTPS proxy servers aren't supported.
    
 
-6. Make sure that the provider can reach the [required URLs](migrate-support-matrix-hyper-v.md#migration-hyper-v-host-url-access).
+6. Make sure that the provider can reach the [required URLs](migrate-support-matrix-hyper-v-migration.md#hyper-v-hosts).
 7. In **Registration**, after the host is registered, click **Finish**.
 
 ## Replicate Hyper-V VMs
@@ -150,7 +150,7 @@ With discovery completed, you can begin replication of Hyper-V VMs to Azure.
 
     ![Target settings](./media/tutorial-migrate-hyper-v/target-settings.png)
 
-10. In **Compute**, review the VM name, size, OS disk type, and availability set. VMs must conform with [Azure requirements](migrate-support-matrix-vmware.md#agentless-migration-vmware-vm-requirements).
+10. In **Compute**, review the VM name, size, OS disk type, and availability set. VMs must conform with [Azure requirements](migrate-support-matrix-hyper-v-migration.md#azure-vm-requirements).
 
     - **VM size**: If you're using assessment recommendations, the VM size dropdown will contain the recommended size. Otherwise Azure Migrate picks a size based on the closest match in the Azure subscription. Alternatively, pick a manual size in **Azure VM size**. 
     - **OS disk**: Specify the OS (boot) disk for the VM. The OS disk is the disk that has the operating system bootloader and installer. 
diff --git a/articles/migrate/tutorial-migrate-physical-virtual-machines.md b/articles/migrate/tutorial-migrate-physical-virtual-machines.md
@@ -118,9 +118,8 @@ Make sure machines comply with requirements for migration to Azure.
 > [!NOTE]
 > Agent-based migration with Azure Migrate Server Migration is based on features of the Azure Site Recovery service. Some requirements might link to Site Recovery documentation.
 
-1. [Verify](migrate-support-matrix-vmware.md#agent-based-migration-vmware-server-requirements) server requirements.
-2. [Verify](migrate-support-matrix-vmware.md#agent-based-migration-vmware-vm-requirements) VM support requirements for migration.
-3. Verify VM settings. On-premises VMs you replicate to Azure must comply with [Azure VM requirements](migrate-support-matrix-vmware.md#azure-vm-requirements).
+1. [Verify](migrate-support-matrix-physical-migration.md#physical-server-requirements) physical server requirements.
+2. Verify VM settings. On-premises machines that you replicate to Azure must comply with [Azure VM requirements](migrate-support-matrix-physical-migration.md#azure-vm-requirements).
 
 
 ### Prepare a machine for the replication appliance
@@ -130,7 +129,7 @@ Azure Migrate Server Migration uses a replication appliance to replicate machine
 - **Configuration server**: The configuration server coordinates communications between on-premises and Azure, and manages data replication.
 - **Process server**: The process server acts as a replication gateway. It receives replication data; optimizes it with caching, compression, and encryption, and sends it to a cache storage account in Azure. 
 
-Before you start, you need to prepare a Windows Server 2016 machine to host the replication appliance. The machine should comply with [these requirements](migrate-support-matrix-vmware.md#agent-based-migration-replication-appliance-requirements). The appliance shouldn't be installed on a source machine you want to protect.
+Before you start, you need to prepare a Windows Server 2016 machine to host the replication appliance. The machine should comply with [these requirements](migrate-replication-appliance.md). The appliance shouldn't be installed on a source machine you want to protect.
 
 
 ## Add the Azure Migrate Server Migration tool
@@ -283,7 +282,7 @@ Now, select machines for migration.
 
     ![Target settings](./media/tutorial-migrate-physical-virtual-machines/target-settings.png)
 
-12. In **Compute**, review the VM name, size, OS disk type, and availability set. VMs must conform with [Azure requirements](migrate-support-matrix-vmware.md#azure-vm-requirements).
+12. In **Compute**, review the VM name, size, OS disk type, and availability set. VMs must conform with [Azure requirements](migrate-support-matrix-physical-migration.md#azure-vm-requirements).
 
     - **VM size**: By default, Azure Migrate Server Migration picks a size based on the closest match in the Azure subscription. Alternatively, pick a manual size in **Azure VM size**. 
     - **OS disk**: Specify the OS (boot) disk for the VM. The OS disk is the disk that has the operating system bootloader and installer. 
diff --git a/articles/migrate/tutorial-prepare-hyper-v.md b/articles/migrate/tutorial-prepare-hyper-v.md
diff --git a/articles/migrate/tutorial-prepare-physical.md b/articles/migrate/tutorial-prepare-physical.md
diff --git a/articles/migrate/tutorial-prepare-vmware.md b/articles/migrate/tutorial-prepare-vmware.md

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,7 @@ The table summarizes VMware VM support for VMware VMs you want to migrate using`
`111`	`111`
`112`	`112`
`113`	`113`
	`114`	`+`
`114`	`115`	`## Agent-based-replication appliance`
`115`	`116`
`116`	`117`	`When you set up the replication appliance using the OVA template provided in the Azure Migrate hub, the appliance runs Windows Server 2016 and complies with the support requirements. If you set up the replication appliance manually on a physical server, then make sure that it complies with the requirements.`