Merge pull request #106555 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: rmca14

articles/active-directory-b2c/code-samples.md

@@ -42,5 +42,4 @@ The following tables provide links to samples for applications including iOS, An
 
 | Sample | Description |
 |--------| ----------- |
-| [javascript-msal-singlepageapp](https://github.com/Azure-Samples/active-directory-b2c-javascript-msal-singlepageapp) | A single page application (SPA) calling a Web API. Authentication is done with Azure AD B2C by leveraging MSAL.js. |
-| [javascript-hellojs-singlepageapp](https://github.com/Azure-Samples/active-directory-b2c-javascript-hellojs-singlepageapp) | A single page app, implemented with an ASP.NET Web API backend, that signs up & signs in users using Azure AD B2C and calls the web API using OAuth 2.0 access tokens. |
+| [javascript-msal-singlepageapp](https://github.com/Azure-Samples/active-directory-b2c-javascript-msal-singlepageapp) | A single page application (SPA) calling a Web API. Authentication is done with Azure AD B2C by using MSAL.js. |

articles/active-directory-b2c/implicit-flow-single-page-application.md

@@ -239,12 +239,12 @@ GET https://{tenant}.b2clogin.com/{tenant}.onmicrosoft.com/{policy}/oauth2/v2.0/
 
 ## Next steps
 
-### Code sample: hello.js with Azure AD B2C
+### Code sample: Azure AD B2C with Microsoft Authentication Library for JavaScript
 
-[Single-page application built on hello.js with Azure AD B2C][github-hello-js-example] (GitHub)
+[Single-page application built with msal.js for Azure AD B2C][github-msal-js-example] (GitHub)
 
-This sample on GitHub is intended to help get you started with Azure AD B2C in a simple web application built on [hello.js][github-hello-js] and using pop-up-style authentication.
+This sample on GitHub is intended to help get you started to Azure AD B2C in a simple web application built with [msal.js][github-msal-js] and using pop-up-style authentication.
 
 <!-- Links - EXTERNAL -->
-[github-hello-js-example]: https://github.com/Azure-Samples/active-directory-b2c-javascript-hellojs-singlepageapp
-[github-hello-js]: https://github.com/MrSwitch/hello.js
+[github-msal-js-example]: https://github.com/Azure-Samples/active-directory-b2c-javascript-msal-singlepageapp
+[github-msal-js]: https://github.com/AzureAD/microsoft-authentication-library-for-js

articles/active-directory-domain-services/tutorial-configure-password-hash-sync.md

@@ -77,6 +77,8 @@ With Azure AD Connect installed and configured to synchronize with Azure AD, now
     # Define the Azure AD Connect connector names and import the required PowerShell module
     $azureadConnector = "<CASE SENSITIVE AZURE AD CONNECTOR NAME>"
     $adConnector = "<CASE SENSITIVE AD DS CONNECTOR NAME>"
+    
+    Import-Module "C:\Program Files\Microsoft Azure AD Sync\Bin\ADSync\ADSync.psd1"
     Import-Module "C:\Program Files\Microsoft Azure Active Directory Connect\AdSyncConfig\AdSyncConfig.psm1"
 
     # Create a new ForceFullPasswordSync configuration parameter object then

articles/active-directory/develop/quickstart-v2-javascript.md

@@ -81,9 +81,11 @@ In this quickstart, you use a code sample to learn how a JavaScript single-page
 > [Download the code sample]()
 
 > [!div renderon="docs"]
+
 > #### Step 3: Configure your JavaScript app
 >
-> In the *JavaScriptSPA* folder, edit *authConfig.js*, and set the `clientID` and `authority` values under `msalConfig`.
+> In the *JavaScriptSPA* folder, edit *authConfig.js*, and set the `clientID`, `authority` and `redirectUri` values under `msalConfig`.
+>
 > ```javascript
 >
 >  // Config object to be passed to Msal on creation
@@ -96,10 +98,10 @@ In this quickstart, you use a code sample to learn how a JavaScript single-page
 >    cache: {
 >      cacheLocation: "sessionStorage", // This configures where your cache will be stored
 >      storeAuthStateInCookie: false, // Set this to "true" if you are having issues on IE11 or Edge
->      forceRefresh: false // Set this to "true" to skip a cached token and go to the server to get a new
 >    }
 >  };  
-> ```
+>
+>```
 
 > [!div renderon="portal"]
 > > [!NOTE]
@@ -123,6 +125,27 @@ In this quickstart, you use a code sample to learn how a JavaScript single-page
 > We have configured your project with values of your app's properties. 
 
 > [!div renderon="docs"]
+> 
+> Then, still in the same folder, edit *graphConfig.js* file to set the `graphMeEndpoint` and `graphMeEndpoint` for the `apiConfig` object.
+> ```javascript
+>   // Add here the endpoints for MS Graph API services you would like to use.
+>   const graphConfig = {
+>     graphMeEndpoint: "Enter_the_Graph_Endpoint_Herev1.0/me",
+>     graphMailEndpoint: "Enter_the_Graph_Endpoint_Herev1.0/me/messages"
+>   };
+>
+>   // Add here scopes for access token to be used at MS Graph API endpoints.
+>   const tokenRequest = {
+>       scopes: ["Mail.Read"]
+>   };
+> ```
+>
+
+> [!div renderon="docs"]
+>
+> Where:
+> - *\<Enter_the_Graph_Endpoint_Here>* is the endpoint that API calls will be made against. For the main or global Microsoft Graph API service, simply enter `https://graph.microsoft.com`. For more information, see [National cloud deployment](https://docs.microsoft.com/graph/deployments)
+>
 > #### Step 4: Run the project
 
 Run the project with a web server by using [Node.js](https://nodejs.org/en/download/):
@@ -154,7 +177,6 @@ The MSAL library signs in users and requests the tokens that are used to access
 > [!TIP]
 > You can replace the preceding version with the latest released version under [MSAL.js releases](https://github.com/AzureAD/microsoft-authentication-library-for-js/releases).
 
-
 Alternatively, if you have Node.js installed, you can download the latest version through Node.js Package Manager (npm):
 
 ```batch
@@ -176,7 +198,6 @@ The quickstart code also shows how to initialize the MSAL library:
     cache: {
       cacheLocation: "sessionStorage", // This configures where your cache will be stored
       storeAuthStateInCookie: false, // Set this to "true" if you are having issues on IE11 or Edge
-      forceRefresh: false // Set this to "true" to skip a cached token and go to the server to get a new
     }
   };  
 
@@ -227,7 +248,7 @@ MSAL uses three methods to acquire tokens: `acquireTokenRedirect`, `acquireToken
 The `acquireTokenSilent` method handles token acquisitions and renewal without any user interaction. After the `loginRedirect` or `loginPopup` method is executed for the first time, `acquireTokenSilent` is the method commonly used to obtain tokens that are used to access protected resources for subsequent calls. Calls to request or renew tokens are made silently.
 
 ```javascript
-// Add scopes for the access token to be used at Microsoft Graph API endpoints.
+
 const tokenRequest = {
     scopes: ["Mail.Read"]
 };

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

@@ -110,6 +110,7 @@ The following samples show how to protect a web API with the Microsoft identity
 | ![This image shows the ASP.NET Core logo](media/sample-v2-code/logo_NETcore.png)</p>ASP.NET Core 2.2 | ASP.NET Core web API (service) of [dotnet-native-aspnetcore-v2](https://aka.ms/msidentity-aspnetcore-webapi-calls-msgraph)  |
 | ![This image shows the ASP.NET logo](media/sample-v2-code/logo_NET.png)</p>ASP.NET MVC | Web API (service) of [ms-identity-aspnet-webapi-onbehalfof](https://github.com/Azure-Samples/ms-identity-aspnet-webapi-onbehalfof) |
 | ![This image shows the Java logo](media/sample-v2-code/logo_java.png) | Web API (service) of [ms-identity-java-webapi](https://github.com/Azure-Samples/ms-identity-java-webapi) |
+| ![This image shows the Node.js logo](media/sample-v2-code/logo_nodejs.png) | Web API (service) of [active-directory-javascript-nodejs-webapi-v2](https://github.com/Azure-Samples/active-directory-javascript-nodejs-webapi-v2) |
 
 ## Azure Functions as web APIs
 

articles/active-directory/saas-apps/amazon-web-service-tutorial.md

@@ -334,7 +334,10 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
 	![Screenshot of Settings section, with On highlighted](./media/amazon-web-service-tutorial/provisioning2.png)
 
 > [!NOTE]
-> Provisioning service will only import roles from AWS to Azure AD. This service will not provision users and groups from Azure AD back to AWS.
+> The provisioning service imports roles only from AWS to Azure AD. The service does not provision users and groups from Azure AD to AWS.
+
+> [!NOTE]
+> After you save the provisioning credentials, you must wait for the initial sync cycle to run. Sync usually takes around 40 minutes to finish. You can see the status at the bottom of the **Provisioning** page, under **Current Status**.
 
 ### Create Amazon Web Services (AWS) test user
 
@@ -394,4 +397,4 @@ When you click the Amazon Web Services (AWS) tile in the Access Panel, you shoul
 [38]: ./media/amazon-web-service-tutorial/tutorial_amazonwebservices_createnewaccesskey.png
 [39]: ./media/amazon-web-service-tutorial/tutorial_amazonwebservices_provisioning_automatic.png
 [40]: ./media/amazon-web-service-tutorial/tutorial_amazonwebservices_provisioning_testconnection.png
-[41]: ./media/amazon-web-service-tutorial/tutorial_amazonwebservices_provisioning_on.png
+[41]: ./media/amazon-web-service-tutorial/tutorial_amazonwebservices_provisioning_on.png

articles/aks/operator-best-practices-storage.md

@@ -71,7 +71,7 @@ When you need to attach storage to pods, you use persistent volumes. These persi
 
 ![Persistent volume claims in an Azure Kubernetes Services (AKS) cluster](media/concepts-storage/persistent-volume-claims.png)
 
-A persistent volume claim (PVC) lets you dynamically create storage as needed. The underlying Azure disks are created as pods request them. In the pod definition, you request a volume to be created and attached to a designed mount path
+A persistent volume claim (PVC) lets you dynamically create storage as needed. The underlying Azure disks are created as pods request them. In the pod definition, you request a volume to be created and attached to a designated mount path.
 
 For the concepts on how to dynamically create and use volumes, see [Persistent Volumes Claims][aks-concepts-storage-pvcs].
 

articles/backup/backup-configure-vault.md

@@ -47,7 +47,7 @@ The data that's available for backup depends on where the agent is installed.
 If your machine has limited internet access, ensure that firewall settings on the machine or proxy allow the following URLs and IP addresses:
 
 * URLs
-    * `www\.msftncsi.com`
+    * `www.msftncsi.com`
     * `*.Microsoft.com`
     * `*.WindowsAzure.com`
     * `*.microsoftonline.com`

articles/cognitive-services/QnAMaker/How-To/edit-knowledge-base.md

@@ -36,7 +36,7 @@ QnA Maker allows you to manage the content of your knowledge base by providing a
     |Delete URL|You can delete existing URLs by selecting the delete icon, the trash can.|
     |Refresh content|If you want your knowledge base to crawl the latest content of existing URLs, select the **Refresh** checkbox. This will update the knowledge base with latest URL content once. This is not setting a regular schedule of updates.|
     |Add file|You can add a supported file document to be part of a knowledge base, by selecting **Manage knowledge base**, then selecting **+ Add File**|
-    |Import|You can also import any existing knowledge base by selecting **Ímport Knowledge base** button. |
+    |Import|You can also import any existing knowledge base by selecting **Import Knowledge base** button. |
     |Update|Updating of knowledge base depends on **management pricing tier** used while creating QnA Maker service associated with your knowledge base. You can also update the management tier from Azure portal if required.
 
 1. Once you are done making changes to the knowledge base, select **Save and train** in the top right corner of the page in order to persist the changes.    

articles/data-factory/control-flow-webhook-activity.md

@@ -112,6 +112,11 @@ Azure Data Factory will pass an additional property “callBackUri” in the bod
 
 The webhook activity itself fails when the call to the custom endpoint fails. Any error message can be added into the body of the callback and used in a subsequent activity.
 
+Further for every REST API call the client will timeout if the endpoint doesn't respond in 1 min. This is standard http best practice. 
+To fix this issue, you need to implement 202 pattern in this case where the endpoint will return 202 (Accepted) and the client will poll.
+
+The 1 min timeout on the request doesn't have anything to do with the activity timeout. That will be used to wait for the callbackUri.
+
 The body passed back to the callback URI should be valid JSON. You must set the Content-Type header to `application/json`.
 
 When you use the "Report status on callback" option, you must add the following snippet to the body when making the callback: