Merge pull request #216969 from MicrosoftDocs/repo_sync_working_branch

huypub · web-flow · commit ec9842666e7d · 2022-11-03T09:44:28.000-07:00
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
diff --git a/articles/active-directory-b2c/identity-provider-azure-ad-single-tenant.md b/articles/active-directory-b2c/identity-provider-azure-ad-single-tenant.md
@@ -81,7 +81,7 @@ If you want to get the `family_name` and `given_name` claims from Azure AD, you
 1. Select **Add optional claim**.
 1. For the **Token type**, select **ID**.
 1. Select the optional claims to add, `family_name` and `given_name`.
-1. Select **Add**. If **Turn on the Microsoft Graph email permission (required for claims to appear in token)** appears, enable it, and then select **Add** again.
+1. Select **Add**. If **Turn on the Microsoft Graph profile permission (required for claims to appear in token)** appears, enable it, and then select **Add** again.
 
 ## [Optional] Verify your app authenticity
 
diff --git a/articles/active-directory/conditional-access/concept-conditional-access-grant.md b/articles/active-directory/conditional-access/concept-conditional-access-grant.md
@@ -161,7 +161,6 @@ The following client apps are confirmed to support this setting:
 - Microsoft Teams
 - Microsoft To Do
 - Microsoft Word
-- Microsoft Power Apps
 - Microsoft Field Service (Dynamics 365)
 - MultiLine for Intune
 - Nine Mail - Email and Calendar
diff --git a/articles/active-directory/hybrid/migrate-from-federation-to-cloud-authentication.md b/articles/active-directory/hybrid/migrate-from-federation-to-cloud-authentication.md
@@ -402,7 +402,7 @@ To learn how to verify or turn on this feature, see [Sync userPrincipalName upda
 
 We recommend that you roll over the Kerberos decryption key at least every 30 days to align with the way that Active Directory domain members submit password changes. There is no associated device attached to the AZUREADSSO computer account object, so you must perform the rollover manually.
 
-See FAQ [How do I roll over the Kerberos decryption key of the AZUREADSSO computer account?](how-to-connect-sso.md).
+See FAQ [How do I roll over the Kerberos decryption key of the AZUREADSSO computer account?](how-to-connect-sso-faq.yml#how-can-i-roll-over-the-kerberos-decryption-key-of-the--azureadsso--computer-account-).
 
 ### Monitoring and logging
 
diff --git a/articles/aks/open-service-mesh-uninstall-add-on.md b/articles/aks/open-service-mesh-uninstall-add-on.md
@@ -32,6 +32,9 @@ After the OSM add-on is disabled, use `osm uninstall cluster-wide-resources` to
 osm uninstall cluster-wide-resources
 ```
 
+> [!NOTE]
+> For version 1.1, the command is `osm uninstall mesh --delete-cluster-wide-resources`
+
 > [!IMPORTANT]
 > You must remove these additional resources after you disable the OSM add-on. Leaving these resources on your cluster may cause issues if you enable the OSM add-on again in the future.
 
diff --git a/articles/aks/use-multiple-node-pools.md b/articles/aks/use-multiple-node-pools.md
@@ -48,7 +48,7 @@ To get started, create an AKS cluster with a single node pool. The following exa
 # Create a resource group in East US
 az group create --name myResourceGroup --location eastus
 
-# Create a basic single-node AKS cluster
+# Create a basic single-node pool AKS cluster
 az aks create \
     --resource-group myResourceGroup \
     --name myAKSCluster \
diff --git a/articles/azure-functions/functions-bindings-timer.md b/articles/azure-functions/functions-bindings-timer.md
@@ -45,7 +45,7 @@ public static void Run([TimerTrigger("0 */5 * * * *")]TimerInfo myTimer, ILogger
 
 # [Isolated process](#tab/isolated-process)
 
-:::code language="csharp" source="~/azure-functions-dotnet-worker/samples/Extensions/Timer/TimerFunction.cs" range="12-18":::
+:::code language="csharp" source="~/azure-functions-dotnet-worker/samples/Extensions/Timer/TimerFunction.cs" range="11-17":::
 
 
 # [C# Script](#tab/csharp-script)
diff --git a/articles/azure-functions/functions-identity-based-connections-tutorial-2.md b/articles/azure-functions/functions-identity-based-connections-tutorial-2.md
@@ -93,7 +93,7 @@ You've granted your function app access to the service bus namespace using manag
 
     | Name      | Value  | Description |
     | ------------ | ---------------- | ----------- |
-    | **ServiceBusConnection__fullyQualifiedNamespace** | <SERVICE_BUS_NAMESPACE>.servicebus.windows.net | This setting connections your function app to the Service Bus use identity-based connections instead of secrets. |
+    | **ServiceBusConnection__fullyQualifiedNamespace** | <SERVICE_BUS_NAMESPACE>.servicebus.windows.net | This setting connects your function app to the Service Bus using an identity-based connection instead of secrets. |
 
 1. After you create the two settings, select **Save** > **Confirm**.
 
diff --git a/articles/azure-resource-manager/management/resource-name-rules.md b/articles/azure-resource-manager/management/resource-name-rules.md
@@ -688,7 +688,7 @@ In the following tables, the term alphanumeric refers to:
 > | Entity | Scope | Length | Valid Characters |
 > | --- | --- | --- | --- |
 > | deployments | resource group | 1-64 | Alphanumerics, underscores, parentheses, hyphens, and periods. |
-> | resourcegroups | subscription | 1-90 | Underscores, hyphens, periods, and letters or digits as defined by the [Char.IsLetterOrDigit](/dotnet/api/system.char.isletterordigit) function.<br><br>Valid characters are members of the following categories in [UnicodeCategory](/dotnet/api/system.globalization.unicodecategory):<br>**UppercaseLetter**,<br>**LowercaseLetter**,<br>**TitlecaseLetter**,<br>**ModifierLetter**,<br>**OtherLetter**,<br>**DecimalDigitNumber**.<br><br>Can't end with period. |
+> | resourcegroups | subscription | 1-90 | Underscores, hyphens, periods, parentheses, and letters or digits as defined by the [Char.IsLetterOrDigit](/dotnet/api/system.char.isletterordigit) function.<br><br>Valid characters are members of the following categories in [UnicodeCategory](/dotnet/api/system.globalization.unicodecategory):<br>**UppercaseLetter**,<br>**LowercaseLetter**,<br>**TitlecaseLetter**,<br>**ModifierLetter**,<br>**OtherLetter**,<br>**DecimalDigitNumber**.<br><br>Can't end with period. |
 > | tagNames | resource | 1-512 | Can't use:<br>`<>%&\?/` or control characters |
 > | tagNames / tagValues | tag name | 1-256 | All characters. |
 > | templateSpecs | resource group | 1-90 | Alphanumerics, underscores, parentheses, hyphens, and periods. |
diff --git a/articles/governance/policy/concepts/definition-structure.md b/articles/governance/policy/concepts/definition-structure.md
@@ -1025,7 +1025,7 @@ Azure Policy supports the following types of effect:
 - **Deny**: generates an event in the activity log and fails the request
 - **DeployIfNotExists**: deploys a related resource if it doesn't already exist
 - **Disabled**: doesn't evaluate resources for compliance to the policy rule
-- **Modify**: adds, updates, or removes the defined tags from a resource or subscription
+- **Modify**: adds, updates, or removes the defined set of fields in the request
 - **EnforceOPAConstraint** (deprecated): configures the Open Policy Agent admissions controller with
   Gatekeeper v3 for self-managed Kubernetes clusters on Azure
 - **EnforceRegoPolicy** (deprecated): configures the Open Policy Agent admissions controller with
diff --git a/articles/openshift/howto-add-update-pull-secret.md b/articles/openshift/howto-add-update-pull-secret.md
@@ -149,7 +149,7 @@ First, modify the Samples Operator configuration file. Then, you can run the fol
 oc edit configs.samples.operator.openshift.io/cluster -o yaml
 ```
 
-Change the `spec.architectures.managementState` and `status.architecture.managementState` values from `Removed` to `Managed`. 
+Change the `spec.architectures.managementState` value from `Removed` to `Managed`. 
 
 The following YAML snippet shows only the relevant sections of the edited YAML file:
 
@@ -164,13 +164,6 @@ spec:
   architectures:
   - x86_64
   managementState: Managed
-status:
-  architectures:
-
-  ...
-
-  managementState: Managed
-  version: 4.3.27
 ```
 
 Second, run the following command to edit the Operator Hub configuration file:  
@@ -179,7 +172,7 @@ Second, run the following command to edit the Operator Hub configuration file:
 oc edit operatorhub cluster -o yaml
 ```
 
-Change the `Spec.Sources.Disabled` and `Status.Sources.Disabled` values from `true` to `false` for any sources you want enabled.
+Change the `Spec.Sources.Disabled` value from `true` to `false` for any sources you want enabled.
 
 The following YAML snippet shows only the relevant sections of the edited YAML file:
 
@@ -194,18 +187,6 @@ Spec:
     Name:      certified-operators
     Disabled:  false
     Name:      redhat-operators
-Status:
-  Sources:
-    Disabled:  false
-    Name:      certified-operators
-    Status:    Success
-    Disabled:  false
-    Name:      community-operators
-    Status:    Success
-    Disabled:  false
-    Name:      redhat-operators
-    Status:    Success
-Events:        <none>
 ```
 
 Save the file to apply your edits.
diff --git a/articles/openshift/howto-service-principal-credential-rotation.md b/articles/openshift/howto-service-principal-credential-rotation.md
@@ -88,7 +88,7 @@ To check the expiration date of service principal credentials run the following:
 # Service principal expiry in ISO 8601 UTC format
 SP_ID=$(az aro show --name MyManagedCluster --resource-group MyResourceGroup \
     --query servicePrincipalProfile.clientId -o tsv)
-az ad sp credential list --id $SP_ID --query "[].endDate" -o tsv
+az ad app credential list --id $SP_ID --query "[].endDate" -o tsv
 ```
 If the service principal credentials are expired please update using one of the two credential rotation methods.
 
diff --git a/articles/storage/common/storage-use-azcopy-v10.md b/articles/storage/common/storage-use-azcopy-v10.md
@@ -4,7 +4,7 @@ description: AzCopy is a command-line utility that you can use to copy data to,
 author: normesta
 ms.service: storage
 ms.topic: how-to
-ms.date: 09/23/2022
+ms.date: 09/29/2022
 ms.author: normesta
 ms.subservice: common
 ms.custom: contperf-fy21q2
@@ -147,20 +147,34 @@ To obtain the link, run this command:
 
 | Operating system  | Command |
 |--------|-----------|
-| **Linux** | `curl -s -D- https://aka.ms/downloadazcopy-v10-linux | grep ^Location` |
-| **Windows (PowerShell Core 7)** | `(Invoke-WebRequest https://aka.ms/downloadazcopy-v10-windows -MaximumRedirection 0 -ErrorAction silentlycontinue -SkipHttpErrorCheck).headers.location[0]` |
-| **Windows (PowerShell 5.1)** | `(Invoke-WebRequest https://aka.ms/downloadazcopy-v10-windows -MaximumRedirection 0 -ErrorAction silentlycontinue ).headers.location` |
-
+| **Linux** | `curl -s -D- https://aka.ms/downloadazcopy-v10-linux \| grep ^Location` |
+| **Windows PowerShell** | `(Invoke-WebRequest -Uri https://aka.ms/downloadazcopy-v10-windows -MaximumRedirection 0 -ErrorAction SilentlyContinue).headers.location` |
+| **PowerShell 6.1+** | `(Invoke-WebRequest -Uri https://aka.ms/downloadazcopy-v10-windows -MaximumRedirection 0 -ErrorAction SilentlyContinue -SkipHttpErrorCheck).headers.location` |
 
 > [!NOTE]
 > For Linux, `--strip-components=1` on the `tar` command removes the top-level folder that contains the version name, and instead extracts the binary directly into the current folder. This allows the script to be updated with a new version of `azcopy` by only updating the `wget` URL.
 
 The URL appears in the output of this command. Your script can then download AzCopy by using that URL.
 
-| Operating system  | Command |
-|--------|-----------|
-| **Linux** | `wget -O azcopy_v10.tar.gz https://aka.ms/downloadazcopy-v10-linux && tar -xf azcopy_v10.tar.gz --strip-components=1` |
-| **Windows** | `Invoke-WebRequest https://azcopyvnext.azureedge.net/release20190517/azcopy_windows_amd64_10.1.2.zip -OutFile azcopyv10.zip <<Unzip here>>` |
+**Linux**
+```bash
+wget -O azcopy_v10.tar.gz https://aka.ms/downloadazcopy-v10-linux && tar -xf azcopy_v10.tar.gz --strip-components=1
+```
+**Windows PowerShell** 
+```PowerShell
+Invoke-WebRequest -Uri 'https://azcopyvnext.azureedge.net/release20220315/azcopy_windows_amd64_10.14.1.zip' -OutFile 'azcopyv10.zip'
+Expand-archive -Path '.\azcopyv10.zip' -Destinationpath '.\'
+$AzCopy = (Get-ChildItem -path '.\' -Recurse -File -Filter 'azcopy.exe').FullName
+# Invoke AzCopy 
+& $AzCopy
+```
+**PowerShell 6.1+**
+```PowerShell
+Invoke-WebRequest -Uri 'https://azcopyvnext.azureedge.net/release20220315/azcopy_windows_amd64_10.14.1.zip' -OutFile 'azcopyv10.zip'
+$AzCopy = (Expand-archive -Path '.\azcopyv10.zip' -Destinationpath '.\' -PassThru | where-object {$_.Name -eq 'azcopy.exe'}).FullName
+# Invoke AzCopy
+& $AzCopy
+``` 
 
 #### Escape special characters in SAS tokens
 
diff --git a/articles/virtual-machines/resize-vm.md b/articles/virtual-machines/resize-vm.md
@@ -184,6 +184,19 @@ $virtualMachines | Start-AzVM
 ```
 
 ---
+## Limitations
+
+You can't resize a VM size that has a local temp disk to a VM size with no local temp disk and vice versa.
+
+The only combinations allowed for resizing are:
+
+- VM (with local temp disk) -> VM (with local temp disk); and
+- VM (with no local temp disk) -> VM (with no local temp disk).
+
+If interested in a work around, please see [How do I migrate from a VM size with local temp disk to a VM size with no local temp disk?](azure-vms-no-temp-disk.yml#how-do-i-migrate-from-a-vm-size-with-local-temp-disk-to-a-vm-size-with-no-local-temp-disk---)
+
+
+
 
 ## Next steps
 
