Merge pull request #111405 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)

Author: huypub

articles/active-directory/hybrid/how-to-connect-pta-faq.md

@@ -116,7 +116,7 @@ If you are migrating from AD FS (or other federation technologies) to Pass-throu
 
 ## Can I use Pass-through Authentication in a multi-forest Active Directory environment?
 
-Yes. Multi-forest environments are supported if there are forest trusts between your Active Directory forests and if name suffix routing is correctly configured.
+Yes. Multi-forest environments are supported if there are forest trusts (two-way) between your Active Directory forests and if name suffix routing is correctly configured.
 
 ## Does Pass-through Authentication provide load balancing across multiple Authentication Agents?
 

articles/active-directory/hybrid/tshoot-connect-objectsync.md

@@ -58,11 +58,6 @@ When UserPrincipalName (UPN)/Alternate Login ID suffix is not verified with the
 
 ![Azure AD replaces UPN](media/tshoot-connect-objectsync/objsynch2.png)
 
-### Changing UPN Suffix from one federated domain to another federated domain
-Azure Active Directory does not allow the synchronization of UserPrincipalName (UPN)/Alternate Login ID suffix change from one federated domain to another federated domain. This applies to domains, that are verified with the Azure AD Tenant and have the Authentication Type as Federated.
-
-![No UPN synch from one federated domain to another](media/tshoot-connect-objectsync/objsynch3.png) 
-
 ### Azure AD Tenant DirSync Feature ‘SynchronizeUpnForManagedUsers’ is disabled
 When the Azure AD Tenant DirSync Feature ‘SynchronizeUpnForManagedUsers’ is disabled, Azure Active Directory does not allow synchronization updates to UserPrincipalName/Alternate Login ID for licensed user accounts with managed authentication.
 

articles/active-directory/manage-apps/application-proxy-wildcard.md

@@ -113,7 +113,7 @@ The wildcard application is represented with just one tile in the [MyApps panel]
 
 ### Kerberos constrained delegation
 
-For applications using [kerberos constrained delegation (KCD) as the SSO method](application-proxy-configure-single-sign-on-with-kcd.md), the SPN listed for the SSO method may also need a wildcard. For example, the SPN could be: `HTTP/*.adventure-works.com`. You still need to have the individual SPNs configured on your backend servers (for example, `http://expenses.adventure-works.com and HTTP/travel.adventure-works.com`).
+For applications using [kerberos constrained delegation (KCD) as the SSO method](application-proxy-configure-single-sign-on-with-kcd.md), the SPN listed for the SSO method may also need a wildcard. For example, the SPN could be: `HTTP/*.adventure-works.com`. You still need to have the individual SPNs configured on your backend servers (for example, `HTTP/expenses.adventure-works.com and HTTP/travel.adventure-works.com`).
 
 ## Scenario 1: General wildcard application
 

articles/azure-government/documentation-government-services-media.md

@@ -44,10 +44,6 @@ The "Azure Media Indexer 2 Preview" Azure Media Analytics media processor is not
 
 There is no CDN integration with streaming endpoints in Azure Government DCs.
 
-### Live encoding
-
-Live encoding is not available in Azure Government.
-
 ## Next steps
 
 For supplemental information and updates, subscribe to the

articles/azure-monitor/app/api-filtering-sampling.md

@@ -485,13 +485,41 @@ The following sample initializer sets cloud role name to every tracked telemetry
 ```csharp
 public void Initialize(ITelemetry telemetry)
 {
-    if(string.IsNullOrEmpty(telemetry.Context.Cloud.RoleName))
+    if (string.IsNullOrEmpty(telemetry.Context.Cloud.RoleName))
     {
         telemetry.Context.Cloud.RoleName = "MyCloudRoleName";
     }
 }
 ```
 
+#### Add information from HttpContext
+
+The following sample initializer reads data from the [`HttpContext`](https://docs.microsoft.com/aspnet/core/fundamentals/http-context?view=aspnetcore-3.1) and appends it to a `RequestTelemetry` instance. The `IHttpContextAccessor` is automatically provided through constructor dependency injection.
+
+```csharp
+public class HttpContextRequestTelemetryInitializer : ITelemetryInitializer
+{
+    private readonly IHttpContextAccessor httpContextAccessor;
+
+    public HttpContextRequestTelemetryInitializer(IHttpContextAccessor httpContextAccessor)
+    {
+        this.httpContextAccessor =
+            httpContextAccessor ??
+            throw new ArgumentNullException(nameof(httpContextAccessor));
+    }
+
+    public void Initialize(ITelemetry telemetry)
+    {
+        var requestTelemetry = telemetry as RequestTelemetry;
+        if (requestTelemetry == null) return;
+
+        var claims = this.httpContextAccessor.HttpContext.User.Claims;
+        Claim oidClaim = claims.FirstOrDefault(claim => claim.Type == "oid");
+        requestTelemetry.Properties.Add("UserOid", oidClaim?.Value);
+    }
+}
+```
+
 ## ITelemetryProcessor and ITelemetryInitializer
 
 What's the difference between telemetry processors and telemetry initializers?

articles/cognitive-services/QnAMaker/How-To/set-up-qnamaker-service-azure.md

@@ -83,7 +83,7 @@ Endpoint keys can be managed from the [QnA Maker portal](https://qnamaker.ai).
     >[!NOTE]
     >Refresh your keys if you think they've been compromised. This may require corresponding changes to your client application or bot code.
 
-### Upgrade QnA Maker SKU
+## Upgrade QnA Maker SKU
 
 When you want to have more questions and answers in your knowledge base, beyond your current tier, upgrade your QnA Maker service pricing tier.
 
@@ -97,7 +97,7 @@ To upgrade the QnA Maker management SKU:
 
     ![QnA Maker pricing](../media/qnamaker-how-to-upgrade-qnamaker/qnamaker-pricing-page.png)
 
-### Upgrade App Service
+## Upgrade App Service
 
  When your knowledge base needs to serve more requests from your client app, upgrade your App Service pricing tier.
 
@@ -107,7 +107,7 @@ Go to the App Service resource in the Azure portal, and select the **Scale up**
 
 ![QnA Maker App Service scale](../media/qnamaker-how-to-upgrade-qnamaker/qnamaker-appservice-scale.png)
 
-### Upgrade the Azure Cognitive Search service
+## Upgrade the Azure Cognitive Search service
 
 If you plan to have many knowledge bases, upgrade your Azure Cognitive Search service pricing tier.
 
@@ -213,4 +213,4 @@ If you delete any of the Azure resources used for your QnA Maker knowledge bases
 Learn more about the [App service](../../../app-service/index.yml) and [Search service](../../../search/index.yml).
 
 > [!div class="nextstepaction"]
-> [Create and publish a knowledge base](../Quickstarts/create-publish-knowledge-base.md)
+> [Create and publish a knowledge base](../Quickstarts/create-publish-knowledge-base.md)

articles/container-registry/container-registry-helm-repos.md

@@ -72,18 +72,21 @@ helm create hello-world
 As a basic example, change directory to the `templates` folder and first delete the contents there:
 
 ```console
+cd hello-world/templates
 rm -rf *
 ```
 
 In the `templates` folder, create a file called `configmap.yaml` with the following contents:
 
-```yml
+```console
+cat <<EOF > configmap.yaml
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: hello-world-configmap
 data:
   myvalue: "Hello World"
+EOF
 ```
 
 For more about creating and running this example, see [Getting Started](https://helm.sh/docs/chart_template_guide/getting_started/) in the Helm Docs.

articles/event-hubs/event-hubs-java-get-started-send.md

@@ -311,7 +311,8 @@ For different types of build environments, you can explicitly obtain the latest
 
            System.out.println("End of sample");
        }
-    ```
+   }
+   ```
 3. Create one more class called `EventProcessor`, using the following code:
 
     ```java

articles/event-hubs/get-started-java-send-v2.md

@@ -45,7 +45,7 @@ The Java client library for Event Hubs is available in the [Maven Central Reposi
 
 ### Write code to send messages to the event hub
 
-For the following sample, first create a new Maven project for a console/shell application in your favorite Java development environment. Add a class named `SimpleSend`, and add the following code to the class:
+For the following sample, first create a new Maven project for a console/shell application in your favorite Java development environment. Add a class named `Sender`, and add the following code to the class:
 
 ```java
 import com.azure.messaging.eventhubs.*;

articles/openshift/howto-using-azure-redhat-openshift.md

@@ -64,7 +64,19 @@ The `az aro` extension allows you to create, access, and delete Azure Red Hat Op
    aro                                0.3.0
    ...
    ```
-  
+
+### Get a Red Hat pull secret (optional)
+
+A Red Hat pull secret enables your cluster to access Red Hat container registries and additional content. Using a pull secret is optional but recommended.
+
+To get your pull secret:
+
+1. Go to https://cloud.redhat.com/openshift/install/azure/aro-provisioned.
+1. Log in to your Red Hat account, or create a new Red Hat account by using your business email; accept the terms and conditions.
+1. Select **Download pull secret**.
+
+Save the *pull-secret.txt* file somewhere safe; you will use the file each time you create a cluster.
+
 ### Create a virtual network containing two empty subnets
 
 Follow these steps to create a virtual network containing two empty subnets.
@@ -75,15 +87,7 @@ Follow these steps to create a virtual network containing two empty subnets.
    LOCATION=eastus        #the location of your cluster
    RESOURCEGROUP="v4-$LOCATION"    #the name of the resource group where you want to create your cluster
    CLUSTER=cluster        #the name of your cluster
-   PULL_SECRET="<optional-pull-secret>"
    ```
-   >[!NOTE]
-   > The optional pull secret enables your cluster to access Red Hat container registries along with additional content.
-   >
-   > Access your pull secret by navigating to https://cloud.redhat.com/openshift/install/azure/installer-provisioned and clicking *Copy Pull Secret*.
-   >
-   > You will need to log in to your Red Hat account, or create a new Red Hat account with your business email and accept the terms and conditions.
- 
 
 2. Create a resource group for your cluster.
 
@@ -139,7 +143,7 @@ az aro create \
   --worker-subnet "$CLUSTER-worker" \
   --cluster-resource-group "aro-$CLUSTER" \
   --domain "$CLUSTER" \
-  --pull-secret "$PULL_SECRET"
+  --pull-secret @pull-secret.txt
 ```
 
 >[!NOTE]