Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into fixSharedStatement

roygara · roygara · commit 961869a96da6 · 2021-11-19T09:26:25.000-08:00
diff --git a/articles/active-directory/authentication/how-to-authentication-sms-supported-apps.md b/articles/active-directory/authentication/how-to-authentication-sms-supported-apps.md
@@ -6,7 +6,7 @@ services: active-directory
 ms.service: active-directory
 ms.subservice: authentication
 ms.topic: conceptual
-ms.date: 06/28/2021
+ms.date: 11/19/2021
 ms.author: justinha
 author: aanjusingh
 manager: daveba
@@ -24,15 +24,14 @@ SMS-based authentication is available to Microsoft apps integrated with the Micr
 | Office 365- Microsoft Online Services* | ● |   |
 | Microsoft One Note | ● |   |
 | Microsoft Teams | ● | ● |
-| Microsoft Intune/ Company portal | ● | ● |
+| Microsoft Intune Company portal | ● | ● |
 | My Apps Portal | ● |Not available|
 | Microsoft Forms | ● |Not available|
 | Microsoft Edge | ● |   |
 | Microsoft Power BI | ● |   |
 | Microsoft Stream | ● |   |
 | Microsoft Power Apps | ● |   |
 | Microsoft Azure | ● | ● |
-| Microsoft Authenticator |   | ● |
 | Azure Virtual Desktop | ● |  | 
 
 *_SMS sign-in isn't available for office applications, such as Word, Excel, etc., when accessed directly on the web, but is available when accessed through the [Office 365 web app](https://www.office.com)_
diff --git a/articles/azure-resource-manager/bicep/install.md b/articles/azure-resource-manager/bicep/install.md
@@ -2,7 +2,7 @@
 title: Set up Bicep development and deployment environments
 description: How to configure Bicep development and deployment environments
 ms.topic: conceptual
-ms.date: 11/18/2021
+ms.date: 11/19/2021
 ms.custom: devx-track-azurepowershell, devx-track-azurecli
 ---
 
@@ -97,6 +97,8 @@ bicep --version
 
 The following methods install the Bicep CLI and add it to your PATH. You must manually install for any use other than Azure CLI.
 
+When installing manually, select a location that is different than the one managed by Azure CLI. All of the following examples use a location named **bicep** or **.bicep**. This location won't conflict with the location managed by Azure CLI, which uses **.azure**.
+
 - [Linux](#linux)
 - [macOS](#macos)
 - [Windows](#windows)
@@ -185,7 +187,7 @@ bicep --help
 
 ## Install on air-gapped cloud
 
-To install Bicep CLI in an air-gapped environment, you need to download the Bicep CLI executable manually and save it to a certain location.
+The `bicep install` and `bicep upgrade` commands don't work in an air-gapped environment. To install Bicep CLI in an air-gapped environment, you need to download the Bicep CLI executable manually and save it to **.azure/bin**. This location is where the instance managed by Azure CLI is installed.
 
 - **Linux**
 
@@ -202,8 +204,6 @@ To install Bicep CLI in an air-gapped environment, you need to download the Bice
     1. Download **bicep-win-x64.exe** from the [Bicep release page](https://github.com/Azure/bicep/releases/latest/) in a non-air-gapped environment.
     1. Copy the executable to the **%UserProfile%/.azure/bin** directory on an air-gapped machine.
 
-Note `bicep install` and `bicep upgrade` commands don't work in an air-gapped environment.
-
 ## Install the nightly builds
 
 If you'd like to try the latest pre-release bits of Bicep before they're released, see [Install nightly builds](https://github.com/Azure/bicep/blob/main/docs/installing-nightly.md).
diff --git a/articles/azure-resource-manager/bicep/installation-troubleshoot.md b/articles/azure-resource-manager/bicep/installation-troubleshoot.md
@@ -2,7 +2,7 @@
 title: Troubleshoot problems with Bicep installation
 description: How to resolve errors and problems with your Bicep installation.
 ms.topic: conceptual
-ms.date: 11/18/2021
+ms.date: 11/19/2021
 ---
 
 # Troubleshoot Bicep installation
@@ -61,20 +61,27 @@ For other **macOS** installations, use:
 
 See [User and Workspace Settings](https://code.visualstudio.com/docs/getstarted/settings) for configuring Visual Studio Code settings.
 
-## Two versions of Bicep CLI installed
+## Multiple versions of Bicep CLI installed
 
 If you manually install the Bicep CLI to more than one location, you may notice unexpected behavior such as the Bicep CLI not updating when you run the [upgrade command](bicep-cli.md#upgrade). Or, you may notice that running `az bicep version` returns one version, but `bicep --version` returns a different version.
 
-To resolve this issue, you can either update both locations, or delete one location and add the other location to your path.
+To resolve this issue, you can either update all locations, or select one location to maintain and delete the other locations.
 
-To **keep both installation locations**, use `az bicep upgrade` to update one version. For the other version, use the same method you used earlier to [manually install the Bicep CLI](install.md#install-manually).
+First, open your command prompt (not PowerShell), and run `where bicep`. This command returns the locations of your Bicep installations. If you're using the instance of Bicep CLI that is managed by Azure CLI, you won't see this installation because it's not added to the PATH. If `where bicep` returns only one location, it may be that the conflicting versions you're seeing is between the manual installation and the Azure CLI installation.
+
+To **keep all installation locations**, use the same method you used earlier to [manually install the Bicep CLI](install.md#install-manually) for all locations you want to maintain. If you're using Azure CLI, run `az bicep upgrade` to update that version.
 
 To **keep only one installation location**, use the following steps:
 
-1. Open your command prompt (not PowerShell), and run `where bicep`. This command returns the location of the Bicep installation.
-1. Delete the installation that was returned in the previous step.
-1. Remove the location from your **PATH** environment variable.
-1. Add your other installation location to the **PATH** variable. For Windows, the location maintained by Azure CLI is `%USERPROFILE%\.Azure\bin`.
+1. Delete the files for the installations you don't want to keep.
+1. Remove those locations from your **PATH** environment variable.
+
+If you have both a **manual installation and the instance managed by Azure CLI**, you can combine your usage to one instance.
+
+1. Delete the manual installation location.
+1. Add the location of the Bicep CLI installed by Azure CLI to the **PATH** variable. For Windows, the location maintained by Azure CLI is `%USERPROFILE%\.Azure\bin`.
+
+After adding the Azure CLI instance to the PATH, you can use that version with either `az bicep` or `bicep`.
 
 ## Next steps
 
diff --git a/articles/azure-sql/database/service-tier-hyperscale.md b/articles/azure-sql/database/service-tier-hyperscale.md
@@ -99,7 +99,7 @@ Page servers are systems representing a scaled-out storage engine.  Each page se
 
 ### Log service
 
-The log service accepts transaction log records from the primary compute replica, persists them in a durable cache, and forwards the log records to the rest of compute replicas (so they can update their caches) as well as the relevant page server(s), so that the data can be updated there. In this way, all data changes from the primary compute replica are propagated through the log service to all the secondary compute replicas and page servers. Finally, transaction log records are pushed out to long-term storage in Azure Storage, which is a virtually infinite storage repository. This mechanism removes the need for frequent log truncation. The log service also has local memory and SSD caches to speed up access to log records.
+The log service accepts transaction log records from the primary compute replica, persists them in a durable cache, and forwards the log records to the rest of compute replicas (so they can update their caches) as well as the relevant page server(s), so that the data can be updated there. In this way, all data changes from the primary compute replica are propagated through the log service to all the secondary compute replicas and page servers. Finally, transaction log records are pushed out to long-term storage in Azure Storage, which is a virtually infinite storage repository. This mechanism removes the need for frequent log truncation. The log service also has local memory and SSD caches to speed up access to log records. The log on hyperscale is practically infinite with the restriction that a single transaction cannot generate more than 1TB of log.
 
 ### Azure storage
 
diff --git a/articles/cost-management-billing/manage/billing-subscription-transfer.md b/articles/cost-management-billing/manage/billing-subscription-transfer.md
@@ -8,7 +8,7 @@ tags: billing,top-support-issue
 ms.service: cost-management-billing
 ms.subservice: billing
 ms.topic: how-to
-ms.date: 02/05/2021
+ms.date: 11/17/2021
 ms.author: banders
 ms.custom: contperf-fy21q1
 ---
@@ -23,6 +23,8 @@ If you're an Enterprise Agreement (EA) customer, your enterprise administrator c
 
 Only the billing administrator of an account can transfer ownership of a subscription.
 
+When you send or accept transfer request, you agree to terms and conditions. For more information, see [Transfer terms and conditions](subscription-transfer.md#transfer-terms-and-conditions).
+
 ## Transfer billing ownership of an Azure subscription
 
 1. Sign in to the [Azure portal](https://portal.azure.com) as an administrator of the billing account that has the subscription that you want to transfer. If you're not sure if you're and administrator, or if you need to determine who is, see [Determine account billing administrator](add-change-subscription-administrator.md#whoisaa).
diff --git a/articles/cost-management-billing/manage/mca-request-billing-ownership.md b/articles/cost-management-billing/manage/mca-request-billing-ownership.md
@@ -7,7 +7,7 @@ tags: billing
 ms.service: cost-management-billing
 ms.subservice: billing
 ms.topic: how-to
-ms.date: 11/09/2021
+ms.date: 11/17/2021
 ms.author: banders
 ---
 
@@ -28,6 +28,8 @@ This process contains the following tasks, which we’ll guide you through step
 2. Review/approve transfer request
 3. Check transfer request status
 
+When you send or accept transfer request, you agree to terms and conditions. For more information, see [Transfer terms and conditions](subscription-transfer.md#transfer-terms-and-conditions).
+
 Before you begin, make sure that the person you're requesting billing ownership from has one of the following roles:
 
 - For a Microsoft Customer Agreement, the person must have an owner or contributor role for the billing account or for the relevant billing profile or invoice section. For more information, see [billing roles and tasks](understand-mca-roles.md#invoice-section-roles-and-tasks).
diff --git a/articles/cost-management-billing/manage/mpa-request-ownership.md b/articles/cost-management-billing/manage/mpa-request-ownership.md
@@ -6,7 +6,7 @@ tags: billing
 ms.service: cost-management-billing
 ms.subservice: billing
 ms.topic: how-to
-ms.date: 09/15/2021
+ms.date: 11/17/2021
 ms.author: banders
 ---
 
@@ -20,6 +20,8 @@ To request the billing ownership, you must have **Global Admin** or **Admin Agen
 
 This article applies to billing accounts for Microsoft Partner Agreements. These accounts are created for Cloud Solution Providers (CSPs) to manage billing for their customers in the new commerce experience. The new experience is only available for partners, who have at least one customer that has accepted a Microsoft Customer Agreement (MCA) and has an Azure Plan. [Check if you have access to a Microsoft Partner Agreement](#check-access-to-a-microsoft-partner-agreement).
 
+When you send or accept transfer request, you agree to terms and conditions. For more information, see [Transfer terms and conditions](subscription-transfer.md#transfer-terms-and-conditions).
+
 ## Prerequisites
 
 1. Establish [reseller relationship](/partner-center/request-a-relationship-with-a-customer) with the customer. Check [CSP Regional Authorization Overview](/partner-center/regional-authorization-overview) to ensure both customer and Partner tenant are within the same authorized regions.
diff --git a/articles/cost-management-billing/manage/subscription-transfer.md b/articles/cost-management-billing/manage/subscription-transfer.md
@@ -7,7 +7,7 @@ tags: billing
 ms.service: cost-management-billing
 ms.subservice: billing
 ms.topic: conceptual
-ms.date: 10/12/2021
+ms.date: 11/17/2021
 ms.author: banders
 ms.custom:
 ---
@@ -102,6 +102,22 @@ Microsoft doesn't provide a tool to automatically move resources between subscri
 
 Read the following sections to learn more about other considerations before you start a product transfer.
 
+### Transfer terms and conditions
+
+When you send or accept a transfer you agree to terms and conditions. The following information provides additional details.
+
+#### Send transfer
+
+When you send a transfer request, must select the **Send transfer request** option. By making the selection you also agree to the following terms and conditions:
+
+_By sending this transfer request, you acknowledge and agree that the selected items will transfer to your account as of the Transition Date (date when the transfer completed successfully). You will be responsible to Microsoft for all ongoing, scheduled billings related to the transfer items as of the Transition Date; provided that Microsoft will move any prepaid subscriptions (including reserved instances) to your account. You agree that you may not cancel any prepaid subscriptions transferred to your account._
+
+#### Transfer acceptance
+
+When you accept a transfer, must select the **Review + validate** option. By making the selection you also agree to the following terms and conditions:
+
+_By accepting this transfer request, you acknowledge and agree that the indicated items will transfer to the nominated destination account as of the Transition Date (date when the transfer completed successfully). Any prepaid subscriptions, if selected, (including reserved instances) will be moved to the destination account and, as of the Transition Date, you will no longer be responsible to Microsoft for ongoing payment obligations (if any) related to the transfer items._
+
 ### Resources transfer with subscriptions
 
 When only billing ownership is changing, then resources aren't affected. However, when you do a resource move or change the service tenant, then resources could be affected.
