Merge branch 'MicrosoftDocs:main' into main

gmndrg · web-flow · commit 8886b4c84ac6 · 2022-10-20T14:54:03.000-06:00
diff --git a/articles/active-directory/cloud-sync/plan-cloud-sync-topologies.md b/articles/active-directory/cloud-sync/plan-cloud-sync-topologies.md
@@ -29,7 +29,6 @@ The information below should be kept in mind, when selecting a solution.
 
 - Users and groups must be uniquely identified across all forests
 - Matching across forests doesn't occur with cloud sync
-- A user or group must be represented only once across all forests
 - The source anchor for objects is chosen automatically.  It uses ms-DS-ConsistencyGuid if present, otherwise ObjectGUID is used.
 - You can't change the attribute that is used for source anchor.
 
diff --git a/articles/confidential-ledger/authentication-azure-ad.md b/articles/confidential-ledger/authentication-azure-ad.md
@@ -24,7 +24,7 @@ To do so, the client performs a two-steps process:
 Azure confidential ledger then executes the request on behalf of the security principal for which Azure AD issued the access token. All authorization checks are performed using this identity.
 
 In most cases, the recommendation is to use one of Azure confidential ledger SDKs to access the service programmatically, as they remove much of the hassle of implementing the
-flow above (and much more). See, for example, the [Python client library](https://pypi.org/project/azure-confidentialledger/) and [.NET client library](/dotnet/api/overview/azure/storage.confidentialledger-readme-pre).
+flow above (and much more). See, for example, the [Python client library](https://pypi.org/project/azure-confidentialledger/) and [.NET client library](/dotnet/api/azure.security.confidentialledger).
 
 The main authenticating scenarios are:
 
@@ -84,7 +84,7 @@ For detailed steps on registering an Azure confidential ledger application with
 
 At the end of registration, the application owner gets the following values:
 
-- An **Application ID** (also known as the AAD Client ID or appID)
+- An **Application ID** (also known as the Azure Active Directory Client ID or appID)
 - An **authentication key** (also known as the shared secret).
 
 The application must present both these values to Azure Active Directory to get a token.
@@ -108,4 +108,4 @@ This flow is called the[OAuth2 token exchange flow](https://tools.ietf.org/html/
 - [Integrating applications with Azure Active Directory](../active-directory/develop/quickstart-register-app.md)
 - [Use portal to create an Azure AD application and service principal that can access resources](../active-directory/develop/howto-create-service-principal-portal.md)
 - [Create an Azure service principal with the Azure CLI](/cli/azure/create-an-azure-service-principal-azure-cli).
-- [Authenticating Azure confidential ledger nodes](authenticate-ledger-nodes.md)
+- [Authenticating Azure confidential ledger nodes](authenticate-ledger-nodes.md)
diff --git a/articles/confidential-ledger/faq.yml b/articles/confidential-ledger/faq.yml
@@ -58,7 +58,7 @@ sections:
       - question: |
           How can I manage users on a ledger?
         answer: |
-          You can manage users on a ledger through the portal or one of the available SDKs: [python](https://pypi.org/project/azure-confidentialledger/), [.NET](/dotnet/api/overview/azure/security.confidentialledger-readme-pre), or [Java (preview)](/java/api/overview/azure/data-confidentialledger-readme?view=azure-java-preview).
+          You can manage users on a ledger through the portal or one of the available SDKs: [python](https://pypi.org/project/azure-confidentialledger/), [.NET](/dotnet/api/overview/azure/security.confidentialledger-readme), or [Java (preview)](/java/api/overview/azure/data-confidentialledger-readme?view=azure-java-preview).
 
       - question: |
           Can Microsoft help me manage users on a ledger I have created?
diff --git a/articles/confidential-ledger/quickstart-net.md b/articles/confidential-ledger/quickstart-net.md
@@ -18,7 +18,7 @@ Get started with the Azure confidential ledger client library for .NET. [Azure c
 
 Azure confidential ledger client library resources:
 
-[API reference documentation](/dotnet/api/overview/azure/security.confidentialledger-readme-pre) | [Library source code](https://github.com/Azure/azure-sdk-for-net/tree/main/sdk/confidentialledger/Azure.Security.ConfidentialLedger) | [Package (NuGet)](https://www.nuget.org/packages/Azure.Security.ConfidentialLedger/1.0.0)
+[API reference documentation](/dotnet/api/overview/azure/security.confidentialledger-readme) | [Library source code](https://github.com/Azure/azure-sdk-for-net/tree/main/sdk/confidentialledger/Azure.Security.ConfidentialLedger) | [Package (NuGet)](https://www.nuget.org/packages/Azure.Security.ConfidentialLedger/1.0.0)
 
 ## Prerequisites
 
@@ -68,7 +68,7 @@ dotnet add package Azure.Identity
 
 ## Object model
 
-The Azure confidential ledger client library for .NET allows you to create an immutable ledger entry in the service.  The [Code examples](#code-examples) section shows how to create a write to the ledger and retrieve the transaction id.
+The Azure confidential ledger client library for .NET allows you to create an immutable ledger entry in the service.  The [Code examples](#code-examples) section shows how to create a write to the ledger and retrieve the transaction ID.
 
 ## Code examples
 
diff --git a/articles/cosmos-db/linux-emulator.md b/articles/cosmos-db/linux-emulator.md
@@ -325,7 +325,7 @@ When reporting an issue with the Linux emulator, provide as much information as
 - Description of the workload
 - Sample of the database/collection and item used
 - Include the console output from starting the Docker container for the emulator in attached mode
-- Send all of the above to [Azure Cosmos DB team](mailto:cdbportalfeedback@microsoft.com).
+- Post feedback on our [Azure Cosmos DB Q&A forums](/answers/topics/azure-cosmos-db.html).
 
 ## Next steps
 
diff --git a/articles/hdinsight/benefits-of-migrating-to-hdinsight-40.md b/articles/hdinsight/benefits-of-migrating-to-hdinsight-40.md
@@ -237,7 +237,7 @@ Hive metastore operation takes much time and thus slow down Hive compilation. In
 
 ## Troubleshooting guide
 
-[HDInsight 3.6 to 4.0 troubleshooting guide for Hive workloads](./interactive-query/interactive-query-troubleshoot-migrate-36-to-40.md) provides answers to common issues faced when migrating Hive workloads from HDInsight 3.6 to HDInsight 4.0.
+[HDInsight 3.6 to 4.0 troubleshooting guide for Hive workloads](/azure/hdinsight/interactive-query/interactive-query-troubleshoot-migrate-36-to-40) provides answers to common issues faced when migrating Hive workloads from HDInsight 3.6 to HDInsight 4.0.
 
 ## References
 
@@ -255,5 +255,5 @@ https://hadoop.apache.org/docs/r3.1.1/hadoop-project-dist/hadoop-common/release/
 
 ## Further reading
 
-* [HDInsight 4.0 Announcement](./hdinsight-version-release.md)
-* [HDInsight 4.0 deep dive](https://azure.microsoft.com/blog/deep-dive-into-azure-hdinsight-4-0.md)
+* [HDInsight 4.0 Announcement](/azure/hdinsight/hdinsight-version-release)
+* [HDInsight 4.0 deep dive](https://azure.microsoft.com/blog/deep-dive-into-azure-hdinsight-4-0/)
diff --git a/articles/hdinsight/hdinsight-overview-before-you-start.md b/articles/hdinsight/hdinsight-overview-before-you-start.md
@@ -19,7 +19,7 @@ HDInsight have two options to configure the databases in the clusters.
  
 During cluster creation, default configuration will use internal database. Once the cluster is created, customer can’t change the database type.  Hence, it's recommended to create and use the external database. You can create custom databases for Ambari, Hive, and Ranger.
 
-For more information, see how to [Set up HDInsight clusters with a custom Ambari DB](./hdinsight-custom-ambari-db.md)
+For more information, see how to [Set up HDInsight clusters with a custom Ambari DB](/azure/hdinsight/hdinsight-custom-ambari-db)
           
 ## Keep your clusters up to date
 
@@ -29,10 +29,10 @@ As part of the best practices, we recommend you keep your clusters updated on re
 
 HDInsight release happens every 30 to 60 days. It's always good to move to the latest release as early possible. The recommended maximum duration for cluster upgrades is less than six months.
 
-For more information, see how to [Migrate HDInsight cluster to a newer version](./hdinsight-upgrade-cluster.md)
+For more information, see how to [Migrate HDInsight cluster to a newer version](/azure/hdinsight/hdinsight-upgrade-cluster)
 
 ## Next steps
 
 * [Create Apache Hadoop cluster in HDInsight](./hadoop/apache-hadoop-linux-create-cluster-get-started-portal.md)
 * [Create Apache Spark cluster - Portal](./spark/apache-spark-jupyter-spark-sql-use-portal.md)
-* [Enterprise security in Azure HDInsight](./domain-joined/hdinsight-security-overview.md)
+* [Enterprise security in Azure HDInsight](./domain-joined/hdinsight-security-overview.md)
diff --git a/articles/key-vault/general/tutorial-javascript-virtual-machine.md b/articles/key-vault/general/tutorial-javascript-virtual-machine.md
@@ -104,7 +104,7 @@ az keyvault set-policy --name "<your-unique-keyvault-name>" --object-id "<system
 
 ## Log in to the VM
 
-To sign in to the virtual machine, follow the instructions in [Connect and sign in to an Azure virtual machine running Linux](/azure-docs-archive-pr/virtual-machines/linux/login-using-aad) or [Connect and sign in to an Azure virtual machine running Windows](../../virtual-machines/windows/connect-logon.md).
+To sign in to the virtual machine, follow the instructions in [Connect and sign in to an Azure virtual machine running Linux](/azure/virtual-machines/linux-vm-connect) or [Connect and sign in to an Azure virtual machine running Windows](../../virtual-machines/windows/connect-logon.md).
 
 
 To log into a Linux VM, you can use the ssh command with the \<publicIpAddress\> given in the [Create a virtual machine](#create-a-virtual-machine) step:
diff --git a/articles/key-vault/general/tutorial-net-virtual-machine.md b/articles/key-vault/general/tutorial-net-virtual-machine.md
@@ -128,7 +128,7 @@ Set-AzKeyVaultAccessPolicy -ResourceGroupName <YourResourceGroupName> -VaultName
 
 ## Sign in to the virtual machine
 
-To sign in to the virtual machine, follow the instructions in [Connect and sign in to an Azure Windows virtual machine](../../virtual-machines/windows/connect-logon.md) or [Connect and sign in to an Azure Linux virtual machine](/azure-docs-archive-pr/virtual-machines/linux/login-using-aad).
+To sign in to the virtual machine, follow the instructions in [Connect and sign in to an Azure Windows virtual machine](../../virtual-machines/windows/connect-logon.md) or [Connect and sign in to an Azure Linux virtual machine](/azure/virtual-machines/linux-vm-connect).
 
 ## Set up the console app
 
diff --git a/articles/key-vault/general/tutorial-python-virtual-machine.md b/articles/key-vault/general/tutorial-python-virtual-machine.md
@@ -104,7 +104,7 @@ az keyvault set-policy --name "<your-unique-keyvault-name>" --object-id "<system
 
 ## Log in to the VM
 
-To sign in to the virtual machine, follow the instructions in [Connect and sign in to an Azure virtual machine running Linux](/azure-docs-archive-pr/virtual-machines/linux/login-using-aad) or [Connect and sign in to an Azure virtual machine running Windows](../../virtual-machines/windows/connect-logon.md).
+To sign in to the virtual machine, follow the instructions in [Connect and sign in to an Azure virtual machine running Linux](/azure/virtual-machines/linux-vm-connect) or [Connect and sign in to an Azure virtual machine running Windows](../../virtual-machines/windows/connect-logon.md).
 
 
 To log into a Linux VM, you can use the ssh command with the \<publicIpAddress\> given in the [Create a virtual machine](#create-a-virtual-machine) step:
diff --git a/articles/machine-learning/concept-compute-instance.md b/articles/machine-learning/concept-compute-instance.md
@@ -7,8 +7,8 @@ ms.service: machine-learning
 ms.subservice: core
 ms.custom: event-tier1-build-2022
 ms.topic: conceptual
-ms.author: sgilley
-author: sdgilley
+ms.author: shoja
+author: shouryaj
 ms.reviewer: sgilley
 ms.date: 10/19/2022
 #Customer intent: As a data scientist, I want to know what a compute instance is and how to use it for Azure Machine Learning.
diff --git a/articles/machine-learning/concept-compute-target.md b/articles/machine-learning/concept-compute-target.md
@@ -6,8 +6,8 @@ services: machine-learning
 ms.service: machine-learning
 ms.subservice: core
 ms.topic: conceptual
-ms.author: sgilley
-author: sdgilley
+ms.author: vijetaj
+author: vijetajo
 ms.reviewer: sgilley
 ms.date: 10/19/2022
 ms.custom: ignite-fall-2021, event-tier1-build-2022, cliv2
diff --git a/articles/machine-learning/concept-workspace.md b/articles/machine-learning/concept-workspace.md
@@ -7,8 +7,9 @@ ms.service: machine-learning
 ms.subservice: core
 ms.custom: event-tier1-build-2022, ignite-2022
 ms.topic: conceptual
-ms.author: sgilley
-author: sdgilley
+ms.author: deeikele
+author: deeikele
+ms.reviewer: sgilley
 ms.date: 08/26/2022
 #Customer intent: As a data scientist, I want to understand the purpose of a workspace for Azure Machine Learning.
 ---
diff --git a/articles/machine-learning/how-to-create-attach-compute-cluster.md b/articles/machine-learning/how-to-create-attach-compute-cluster.md
@@ -7,8 +7,8 @@ ms.service: machine-learning
 ms.subservice: core
 ms.topic: how-to
 ms.custom: devx-track-azurecli, cliv2, sdkv1, event-tier1-build-2022
-ms.author: sgilley
-author: sdgilley
+ms.author: vijetaj
+author: vijetajo
 ms.reviewer: sgilley
 ms.date: 10/19/2022
 ---
diff --git a/articles/machine-learning/how-to-create-attach-compute-studio.md b/articles/machine-learning/how-to-create-attach-compute-studio.md
@@ -3,8 +3,8 @@ title: Manage training & deploy computes (studio)
 titleSuffix: Azure Machine Learning
 description: Use studio to manage training and deployment compute resources (compute targets) for machine learning.
 services: machine-learning
-author: sdgilley
-ms.author: sgilley
+author: vijetajo 
+ms.author: vijetaj
 ms.reviewer: sgilley
 ms.service: machine-learning
 ms.subservice: core
diff --git a/articles/machine-learning/how-to-create-text-labeling-projects.md b/articles/machine-learning/how-to-create-text-labeling-projects.md
@@ -2,8 +2,9 @@
 title: Set up text labeling project
 titleSuffix: Azure Machine Learning
 description: Create a project to label text using the data labeling tool. Specify either a single label or multiple labels to be applied to each piece of text.
-author: sdgilley
-ms.author: sgilley
+author: kvijaykannan 
+ms.author: vkann 
+ms.reviewer: sgilley
 ms.service: machine-learning
 ms.subservice: mldata
 ms.topic: how-to
diff --git a/articles/machine-learning/how-to-label-data.md b/articles/machine-learning/how-to-label-data.md
@@ -2,8 +2,9 @@
 title: Labeling images and text documents
 title.suffix: Azure Machine Learning
 description: Use data labeling tools to rapidly label text or label images for a Machine Learning in a data labeling project.
-author: sdgilley
-ms.author: sgilley
+author: kvijaykannan 
+ms.author: vkann 
+ms.reviewer: sgilley
 ms.service: machine-learning
 ms.subservice: mldata
 ms.topic: how-to
diff --git a/articles/machine-learning/how-to-manage-workspace.md b/articles/machine-learning/how-to-manage-workspace.md
@@ -5,8 +5,9 @@ description: Learn how to manage Azure Machine Learning workspaces in the Azure
 services: machine-learning
 ms.service: machine-learning
 ms.subservice: core
-ms.author: sgilley
-author: sdgilley
+ms.author: deeikele
+author: deeikele
+ms.reviewer: sgilley
 ms.date: 09/21/2022
 ms.topic: how-to
 ms.custom: fasttrack-edit, FY21Q4-aml-seo-hack, contperf-fy21q4, sdkv2, event-tier1-build-2022, ignite-2022
diff --git a/articles/sentinel/automate-responses-with-playbooks.md b/articles/sentinel/automate-responses-with-playbooks.md
@@ -311,9 +311,9 @@ The following recommended playbooks, and other similar playbooks are available t
 
 - **Notification playbooks** are triggered when an alert or incident is created and send a notification to a configured destination:
 
-    - [Post a message in a Microsoft Teams channel](https://github.com/Azure/Azure-Sentinel/tree/master/Solutions/Teams/Playbooks/Post-Message-Teams)
+    - [Post a message in a Microsoft Teams channel](https://github.com/Azure/Azure-Sentinel/tree/master/Solutions/SentinelSOARessentials/Playbooks/Post-Message-Teams)
     - [Send an Outlook email notification](https://github.com/Azure/Azure-Sentinel/tree/master/Playbooks/Incident-Email-Notification)
-    - [Post a message in a Slack channel](https://github.com/Azure/Azure-Sentinel/tree/master/Playbooks/Post-Message-Slack)
+    - [Post a message in a Slack channel](https://github.com/Azure/Azure-Sentinel/tree/master/Solutions/SentinelSOARessentials/Playbooks/Post-Message-Slack)
 
 - **Blocking playbooks** are triggered when an alert or incident is created, gather entity information like the account, IP address, and host, and blocks them from further actions:
 
diff --git a/articles/virtual-machines/image-builder-overview.md b/articles/virtual-machines/image-builder-overview.md
@@ -94,6 +94,7 @@ The VM Image Builder service is available in the following regions:
 - East Asia
 - Korea Central
 - South Africa North
+- Qatar Central
 - USGov Arizona (public preview)
 - USGov Virginia (public preview)
 
diff --git a/articles/virtual-machines/linux/disk-encryption-linux.md b/articles/virtual-machines/linux/disk-encryption-linux.md
@@ -188,7 +188,7 @@ To disable the encryption, see [Disable encryption and remove the encryption ext
 
 You can enable disk encryption on an existing or running Linux VM in Azure by using the [Resource Manager template](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.compute/encrypt-running-linux-vm-without-aad).
 
-1. Click **Deploy to Azure** on the Azure quickstart template.
+1. Click **Deploy to Azure** on the Azure Quickstart Template.
 
 2. Select the subscription, resource group, resource group location, parameters, legal terms, and agreement. Click **Create** to enable encryption on the existing or running VM.
 
@@ -219,7 +219,7 @@ The **EncryptFormatAll** parameter reduces the time for Linux data disks to be e
  >If you're setting this parameter while updating encryption settings, it might lead to a reboot before the actual encryption. In this case, you will also want to remove the disk you don't want formatted from the fstab file. Similarly, you should add the partition you want encrypt-formatted to the fstab file before initiating the encryption operation. 
 
 ### EncryptFormatAll criteria
-The parameter goes though all partitions and encrypts them as long as they meet **all** of the criteria below:
+The parameter goes through all partitions and encrypts them as long as they meet **all** of the criteria below:
 - Is not a root/OS/boot partition
 - Is not already encrypted
 - Is not a BEK volume
@@ -333,7 +333,7 @@ You can add a new data disk using [az vm disk attach](add-disk.md), or [through
 
 ### Enable encryption on a newly added disk with Azure CLI
 
- If the VM was previously encrypted with "All" then the --volume-type parameter should remain "All". All includes both OS and data disks. If the VM was previously encrypted with a volume type of "OS", then the --volume-type parameter should be changed to "All" so that both the OS and the new data disk will be included. If the VM was encrypted with only the volume type of "Data", then it can remain "Data" as demonstrated below. Adding and attaching a new data disk to a VM is not sufficient preparation for encryption. The newly attached disk must also be formatted and properly mounted within the VM prior to enabling encryption. On Linux the disk must be mounted in /etc/fstab with a [persistent block device name](/azure-docs-test-baseline-pr/virtual-machines/linux/troubleshoot-device-names-problems).  
+ If the VM was previously encrypted with "All" then the --volume-type parameter should remain "All". All includes both OS and data disks. If the VM was previously encrypted with a volume type of "OS", then the --volume-type parameter should be changed to "All" so that both the OS and the new data disk will be included. If the VM was encrypted with only the volume type of "Data", then it can remain "Data" as demonstrated below. Adding and attaching a new data disk to a VM is not sufficient preparation for encryption. The newly attached disk must also be formatted and properly mounted within the VM prior to enabling encryption. On Linux the disk must be mounted in /etc/fstab with a [persistent block device name](/troubleshoot/azure/virtual-machines/troubleshoot-device-names-problems).  
 
 In contrast to PowerShell syntax, the CLI does not require the user to provide a unique sequence version when enabling encryption. The CLI automatically generates and uses its own unique sequence version value.
 
@@ -449,7 +449,7 @@ Azure Disk Encryption does not work for the following Linux scenarios, features,
 
 - Encrypting basic tier VM or VMs created through the classic VM creation method.
 - Disabling encryption on an OS drive or data drive of a Linux VM when the OS drive is encrypted.
-- Encrypting the OS drive for Linux virtual machine scale sets.
+- Encrypting the OS drive for Linux Virtual Machine Scale Sets.
 - Encrypting custom images on Linux VMs.
 - Integration with an on-premises key management system.
 - Azure Files (shared file system).
diff --git a/articles/virtual-machines/linux/image-builder-json.md b/articles/virtual-machines/linux/image-builder-json.md
