merge conflicts

Author: batamig

articles/active-directory-b2c/json-transformations.md

@@ -68,6 +68,7 @@ The following example generates a JSON string based on the claim value of "email
   <InputClaims>
     <InputClaim ClaimTypeReferenceId="email" TransformationClaimType="personalizations.0.to.0.email" />
     <InputClaim ClaimTypeReferenceId="otp" TransformationClaimType="personalizations.0.dynamic_template_data.otp" />
+    <InputClaim ClaimTypeReferenceId="email" TransformationClaimType="personalizations.0.dynamic_template_data.verify-email" />
   </InputClaims>
   <InputParameters>
     <InputParameter Id="template_id" DataType="string" Value="d-4c56ffb40fa648b1aa6822283df94f60"/>
@@ -464,4 +465,4 @@ Output claim:
 
 ## Next steps
 
-- Find more [claims transformation samples](https://github.com/azure-ad-b2c/unit-tests/tree/main/claims-transformation/json) on the Azure AD B2C community GitHub repo
+- Find more [claims transformation samples](https://github.com/azure-ad-b2c/unit-tests/tree/main/claims-transformation/json) on the Azure AD B2C community GitHub repo

articles/active-directory/develop/sample-v2-code.md

@@ -76,7 +76,6 @@ The following samples show public client desktop applications that access the Mi
 > | Language/<br/>Platform | Code sample(s) <br/> on GitHub | Auth<br/> libraries | Auth flow |
 > | ------- | -------- | ------------- | -------------- |
 > | .NET Core | &#8226; [Call Microsoft Graph](https://github.com/Azure-Samples/ms-identity-dotnet-desktop-tutorial/tree/master/1-Calling-MSGraph/1-1-AzureAD) <br/> &#8226; [Call Microsoft Graph with token cache](https://github.com/Azure-Samples/ms-identity-dotnet-desktop-tutorial/tree/master/2-TokenCache) <br/> &#8226; [Call Micrsoft Graph with custom web UI HTML](https://github.com/Azure-Samples/ms-identity-dotnet-desktop-tutorial/tree/master/3-CustomWebUI/3-1-CustomHTML) <br/> &#8226; [Call Microsoft Graph with custom web browser](https://github.com/Azure-Samples/ms-identity-dotnet-desktop-tutorial/tree/master/3-CustomWebUI/3-2-CustomBrowser) <br/> &#8226; [Sign in users with device code flow](https://github.com/Azure-Samples/ms-identity-dotnet-desktop-tutorial/tree/master/4-DeviceCodeFlow) | MSAL.NET |&#8226; Authorization code with PKCE <br/> &#8226; Device code |
-> | .NET | &#8226; [Call Microsoft Graph with daemon console](https://github.com/Azure-Samples/active-directory-dotnetcore-daemon-v2/tree/master/1-Call-MSGraph) <br/> &#8226; [Call web API with daemon console](https://github.com/Azure-Samples/active-directory-dotnetcore-daemon-v2/blob/master/2-Call-OwnApi/README.md) | MSAL.NET | Authorization code with PKCE |
 > | .NET | [Invoke protected API with integrated Windows authentication](https://github.com/azure-samples/active-directory-dotnet-iwa-v2) | MSAL.NET | Integrated Windows authentication |
 > | Java | [Call Microsoft Graph](https://github.com/Azure-Samples/ms-identity-msal-java-samples/tree/main/2.%20Client-Side%20Scenarios/Integrated-Windows-Auth-Flow) | MSAL Java | Integrated Windows authentication |
 > | Node.js | [Sign in users](https://github.com/Azure-Samples/ms-identity-javascript-nodejs-desktop) | MSAL Node | Authorization code with PKCE |

articles/aks/cluster-configuration.md

@@ -31,9 +31,9 @@ By using `containerd` for AKS nodes, pod startup latency improves and node resou
 `Containerd` works on every GA version of Kubernetes in AKS, and in every upstream kubernetes version above v1.19, and supports all Kubernetes and AKS features.
 
 > [!IMPORTANT]
-> Clusters with Linux node pools created on Kubernetes v1.19 or greater default to `containerd` for its container runtime. Clusters with node pools on a earlier supported Kubernetes versions receive Docker for their container runtime. Linux node pools will be updated to `containerd` once the node pool Kubernetes version is updated to a version that supports `containerd`. You can still use Docker node pools and clusters on versions below 1.23, but Docker is no longer supported as of September 2022.
+> Clusters with Linux node pools created on Kubernetes v1.19 or greater default to `containerd` for its container runtime. Clusters with node pools on a earlier supported Kubernetes versions receive Docker for their container runtime. Linux node pools will be updated to `containerd` once the node pool Kubernetes version is updated to a version that supports `containerd`. 
 > 
-> Using `containerd` with Windows Server 2019 node pools is generally available, and will be the only container runtime option in Kubernetes 1.21 and greater. For more details, see [Add a Windows Server node pool with `containerd`][/learn/aks-add-np-containerd].
+> Using `containerd` with Windows Server 2019 node pools is generally available, and will be the only container runtime option in Kubernetes 1.21 and greater. You can still use Docker node pools and clusters on versions below 1.23, but Docker is no longer supported as of September 2022. For more details, see [Add a Windows Server node pool with `containerd`][aks-add-np-containerd].
 > 
 > It is highly recommended to test your workloads on AKS node pools with `containerd` prior to using clusters with a Kubernetes version that supports `containerd` for your node pools.
 
@@ -232,4 +232,4 @@ az aks show -n aks -g myResourceGroup --query "oidcIssuerProfile.issuerUrl" -ots
 [az-feature-register]: /cli/azure/feature#az_feature_register
 [az-feature-list]: /cli/azure/feature#az_feature_list
 [az-provider-register]: /cli/azure/provider#az_provider_register
-[aks-add-np-containerd]: windows-container-cli.md#add-a-windows-server-node-pool-with-containerd
+[aks-add-np-containerd]: ./learn/quick-windows-container-deploy-cli.md#add-a-windows-server-node-pool-with-containerd

articles/api-management/api-management-howto-aad-b2c.md

@@ -19,7 +19,7 @@ Azure Active Directory B2C is a cloud identity management solution for consumer-
 In this tutorial, you'll learn the configuration required in your API Management service to integrate with Azure Active Directory B2C. As noted later in this article, if you are using the deprecated legacy developer portal, some steps will differ.
 
 > [!IMPORTANT]
-> * This article has been updated with steps to configure an Azure AD B2C app using the Microsoft Authentication Library ([MSAL](../active-directory/develop/msal-overview.md)) v2.0. 
+> * This article has been updated with steps to configure an Azure AD B2C app using the Microsoft Authentication Library ([MSAL](../active-directory/develop/msal-overview.md)). 
 > * If you previously configured an Azure AD B2C app for user sign-in using the Azure AD Authentication Library (ADAL), we recommend that you [migrate to MSAL](#migrate-to-msal).
 
 For information about enabling access to the developer portal by using classic Azure Active Directory, see [How to authorize developer accounts using Azure Active Directory](api-management-howto-aad.md).

articles/availability-zones/migrate-app-service.md

@@ -5,7 +5,7 @@ description: Learn how to migrate Azure App Service to availability zone support
 author: anaharris-ms
 ms.service: app-service
 ms.topic: conceptual
-ms.date: 06/07/2022
+ms.date: 08/03/2022
 ms.author: anaharris
 ms.reviewer: jordanselig
 ms.custom: references_regions
@@ -45,6 +45,7 @@ Availability zone support is a property of the App Service plan. The following a
   - France Central
   - UK South
   - Japan East
+  - East Asia
   - Southeast Asia
   - Australia East
 - Availability zones can only be specified when creating a **new** App Service plan. A pre-existing App Service plan can't be converted to use availability zones.
@@ -146,4 +147,4 @@ There's no additional cost associated with enabling availability zones. Pricing
 > [Overview of autoscale in Microsoft Azure](../azure-monitor/autoscale/autoscale-overview.md)
 
 > [!div class="nextstepaction"]
-> [Manage disaster recovery](../app-service/manage-disaster-recovery.md)
+> [Manage disaster recovery](../app-service/manage-disaster-recovery.md)

articles/azure-arc/data/toc.yml

@@ -116,72 +116,6 @@ items:
           href: troubleshoot-guide.md
         - name: Get logs
           href: troubleshooting-get-logs.md
-- name: Azure Arc-enabled PostgreSQL Hyperscale (preview) 
-  items:
-    - name: Overview
-      items:
-        - name: What is Azure Arc-enabled PostgreSQL Hyperscale
-          href: what-is-azure-arc-enabled-postgres-hyperscale.md
-        - name: Limitations
-          href: limitations-postgresql-hyperscale.md
-    - name: Quickstarts
-      items:
-        - name: Supported versions
-          href: supported-versions-postgres-hyperscale.md
-        - name: Create PostgreSQL Hyperscale server group (CLI)
-          href: create-postgresql-hyperscale-server-group.md
-        - name: Create PostgreSQL Hyperscale server group (portal)
-          href: create-postgresql-hyperscale-server-group-azure-portal.md
-        - name: Create PostgreSQL Hyperscale server group (Azure Data Studio)
-          href: create-postgresql-hyperscale-server-group-azure-data-studio.md
-        - name: Create PostgreSQL Hyperscale server group - Kubernetes native tools
-          href: create-postgresql-hyperscale-server-group-kubernetes-native-tools.md
-        - name: Connect
-          href: get-connection-endpoints-and-connection-strings-postgres-hyperscale.md
-    - name: Concepts
-      items:
-        - name: Distribute data
-          href: concepts-distributed-postgres-hyperscale.md
-        - name: Server group placement
-          href: postgresql-hyperscale-server-group-placement-on-kubernetes-cluster-nodes.md
-    - name: How-to
-      items:
-        - name: Manage
-          items:
-            - name: Backup & restore
-              href: backup-restore-postgresql-hyperscale.md
-            - name: Change PostgreSQL port
-              href: change-postgresql-port.md
-            - name: Configure & scale
-              items:
-                - name: Show configuration
-                  href: show-configuration-postgresql-hyperscale-server-group.md
-                - name: Scale out|in worker nodes
-                  href: scale-out-in-postgresql-hyperscale-server-group.md
-                - name: Scale up|down memory & vCores
-                  href: scale-up-down-postgresql-hyperscale-server-group-using-cli.md
-                - name: Configure server parameters
-                  href: configure-server-parameters-postgresql-hyperscale.md
-            - name: Delete
-              href: delete-postgresql-hyperscale-server-group.md
-            - name: List server groups
-              href: list-server-groups-postgres-hyperscale.md
-            - name: Monitoring, log analytics, billing information (portal)
-              href: monitoring-log-analytics-azure-portal-postgresql.md
-            - name: Secure
-              href: configure-security-postgres-hyperscale.md
-            - name: Manage server group (Azure Data Studio)
-              href: manage-postgresql-hyperscale-server-group-with-azure-data-studio.md
-            - name: Use PostgreSQL extensions
-              href: using-extensions-in-postgresql-hyperscale-server-group.md
-        - name: Migrate
-          items:
-            - name: Migrate PostgreSQL data into a PostgreSQL Hyperscale server group
-              href: migrate-postgresql-data-into-postgresql-hyperscale-server-group.md
-            - name: Import the sample database AdventureWorks
-              href: restore-adventureworks-sample-db-into-postgresql-hyperscale-server-group.md
-        - name: Troubleshoot
-          href: troubleshoot-postgresql-hyperscale-server-group.md
 - name: Azure Arc-enabled SQL Managed Instance
   items:
     - name: Overview

articles/azure-netapp-files/configure-network-features.md

@@ -12,16 +12,19 @@ ms.service: azure-netapp-files
 ms.workload: storage
 ms.tgt_pltfrm: na
 ms.topic: how-to
-ms.date: 12/09/2021
+ms.date: 08/03/2021
 ms.custom: references_regions
 ms.author: anfdocs
 ---
 # Configure network features for an Azure NetApp Files volume
 
-The **Network Features** functionality is available for public preview.  This functionality enables you to indicate whether you want to use VNet features for an Azure NetApp Files volume. With this functionality, you can set the option to ***Standard*** or ***Basic***. You can specify the setting when you create a new NFS, SMB, or dual-protocol volume. See [Guidelines for Azure NetApp Files network planning](azure-netapp-files-network-topologies.md) for details about network features.
+The **Network Features** functionality enables you to indicate whether you want to use VNet features for an Azure NetApp Files volume. With this functionality, you can set the option to ***Standard*** or ***Basic***. You can specify the setting when you create a new NFS, SMB, or dual-protocol volume. See [Guidelines for Azure NetApp Files network planning](azure-netapp-files-network-topologies.md) for details about network features.
 
 This article helps you understand the options and shows you how to configure network features.
 
+>[!IMPORTANT]
+>The **Network Features** functionality is currently in public preview. It is not available in Azure Government regions. See [supported regions](azure-netapp-files-network-topologies.md#supported-regions) for a full list. 
+
 ## Options for network features 
 
 Two settings are available for network features: 

articles/azure-netapp-files/faq-nfs.md

@@ -6,7 +6,7 @@ ms.workload: storage
 ms.topic: conceptual
 author: b-hchen
 ms.author: anfdocs
-ms.date: 10/19/2021
+ms.date: 08/02/2022
 ---
 # NFS FAQs for Azure NetApp Files
 
@@ -50,6 +50,40 @@ For example, if a client mounting a volume becomes unresponsive or crashes beyon
 
 A grace period defines a period of special processing in which clients can try to reclaim their locking state during a server recovery. The default timeout for the leases is 30 seconds with a grace period of 45 seconds. After that time, the client's lease will be released. 
 
+## Oracle dNFS
+
+### Are there any Oracle patches with dNFS?
+
+Customers using Oracle 19c and higher must ensure they **are patched for Oracle bug 32931941**. Most of the patch bundles currently in use by Oracle customers do **\*not\*** include this patch. The patch has only been included in a subset of recent patch bundles.
+
+If a database is exposed to this bug, network interruptions are highly likely to result in fractured block corruption. Network interruptions include events such as storage endpoint relocation, volume relocation, and storage service maintenance events. The corruption may not necessarily be detected immediately.
+
+This is not a bug on ONTAP or the Azure NetApp Files service itself. It is the result of an Oracle dNFS bug. The response to an NFS IO during a certain networking interruption or reconfiguration events is mishandled. The database will erroneously write a block that was being updated as it was written. In some cases, the corrupted block will be silently corrected by a later overwrite of that same block. If not, it will eventually be detected by Oracle database processes. An error should be logged in the Alert logs, and the Oracle instance is likely to terminate. In addition, dbv and RMAN operations can detect the corruption.
+
+Oracle publishes [document 1495104.1](https://support.oracle.com/knowledge/Oracle%20Cloud/1495104_1.html), which is continually updated with recommended dNFS patches. If your database uses dNFS, ensure the DBA team is checking for updates in this document.
+
+### Are there any patches required for use of Oracle dNFS with NFSv4.1?
+
+If your databases are using Oracle dNFS with NFSv4.1, they **need to be patched for Oracle bugs 33132050 and 33676296**. You may have to request a backport for other versions of Oracle. For example, at the time of writing, these patches are available for 19.11, but not yet 19.3. If you cite these bug numbers in the support case, Oracle's support engineers will know what to do.
+
+This requirement applies to ONTAP-based systems and services in general, which includes both on-premises ONTAP and Azure NetApp Files.
+
+Examples of the potential problems if these patches are not applied:
+
+1. Database hangs on backend storage endpoint moves.
+1. Database hangs on Azure NetApp Files service maintenance events.
+1. Brief Oracle hangs during normal operation that may or may not be noticeable.
+1. Slow Oracle shutdowns: if you monitor the shutdown process, you'll see pauses that could add up to minutes of delays as dNFS I/O times out.
+1. Incorrect dNFS reply caching behavior on reads that will hang a database.
+
+The patches include a change in dNFS session management and NFS reply caching that resolves these problems.
+
+**If you cannot patch for these two bugs**, you _must not_ use dNFS with NFSv4.1. You can either disable dNFS or switch to NFSv3. 
+
+### Can I use multipathing with Oracle dNFS and NFSv4.1?
+
+dNFS will not work with multiple paths when using NFSv4.1. If you need multiple paths, you will have to use NFSv3. dNFS requires cluster-wide `clientID` and `sessionID` trunking for NFSv4.1 to work with multiple paths, and this is not supported by Azure NetApp Files. The result when trying to use this is a hang during dNFS startup
+
 ## Next steps  
 
 - [Microsoft Azure ExpressRoute FAQs](../expressroute/expressroute-faqs.md)

articles/azure-resource-manager/bicep/linter-rule-use-stable-resource-identifier.md

@@ -2,7 +2,7 @@
 title: Linter rule - use stable resource identifier
 description: Linter rule - use stable resource identifier
 ms.topic: conceptual
-ms.date: 07/21/2022
+ms.date: 08/03/2022
 ---
 
 # Linter rule - use stable resource identifier
@@ -21,9 +21,10 @@ The following example fails this test because `utcNow()` is used in the resource
 
 ```bicep
 param location string = resourceGroup().location
+param time string = utcNow()
 
 resource sa 'Microsoft.Storage/storageAccounts@2021-09-01' = {
-  name: 'store${toLower(utcNow())}'
+  name: 'store${toLower(time)}'
   location: location
   sku: {
     name: 'Standard_LRS'

articles/azure-resource-manager/bicep/linter.md

@@ -64,6 +64,18 @@ The following screenshot shows the linter in the command line. The output from t
 
 You can integrate these checks as a part of your CI/CD pipelines. You can use a GitHub action to attempt a bicep build. Errors will fail the pipelines.
 
+## Silencing false positives
+
+Sometimes a rule can have false positives. For example you may need to include a link to a blob storage directly without using the [environment()](./bicep-functions-deployment.md#environment) function.
+In this case you can disable the warning for one line only, not the entire document, by adding `#disable-next-line <rule name>` before the line with the warning.
+
+```bicep
+#disable-next-line no-hardcoded-env-urls //Direct download link to my toolset
+scriptDownloadUrl: 'https://mytools.blob.core.windows.net/...'
+```
+
+It is good practice to add a comment explaining why the rule does not apply to this line.
+
 ## Next steps
 
 - For more information about customizing the linter rules, see [Add custom settings in the Bicep config file](bicep-config-linter.md).