Merge pull request #237360 from MicrosoftDocs/repo_sync_working_branch

Resolve syncing conflicts from repo_sync_working_branch to main

Author: huypub

.gitattributes

@@ -6,6 +6,9 @@
 *.c text
 *.h text
 
+# Include Markdown in the GitHub language breakdown statistics
+*.md linguist-detectable
+
 # Denote all files that are truly binary and should not be modified.
 *.gif   binary
 *.ico   binary

articles/active-directory/develop/reply-url.md

@@ -35,6 +35,8 @@ The Azure Active Directory (Azure AD) application model specifies these restrict
     * `https://contoso.com/abc` is returned as `https://contoso.com/abc`
     * `https://contoso.com/abc/response-oidc` is returned as `https://contoso.com/abc/response-oidc`
 
+* Redirect URIs do not support special characters - `! $ ' ( ) , ;`
+
 ## Maximum number of redirect URIs
 
 This table shows the maximum number of redirect URIs you can add to an app registration in the Microsoft identity platform.

articles/batch/create-pool-ephemeral-os-disk.md

@@ -37,7 +37,23 @@ The `EphemeralOSDiskSettings` property isn't set by default. You must set this p
 
 The following example shows how to create a Batch pool where the nodes use ephemeral OS disks and not managed disks.
 
-### Batch .NET API
+### Code examples
+
+This code snippet shows how to create a pool with ephemeral OS disks using Azure Batch Python SDK with the Ephemeral OS disk using the temporary disk (cache).
+
+```python
+virtual_machine_configuration=batch.models.VirtualMachineConfiguration(
+    image_reference=image_ref_to_use,
+    node_agent_sku_id=node_sku_id,
+    os_disk=batch.models.OSDisk(
+        ephemeral_os_disk_settings=batch.models.DiffDiskSettings(
+            placement=batch.models.DiffDiskPlacement.cache_disk
+        )
+    )
+)
+```
+
+This is the same code snippet but for creating a pool with ephemeral OS disks using the Azure Batch .NET SDK and C#. 
 
 ```csharp
 VirtualMachineConfiguration virtualMachineConfiguration = new VirtualMachineConfiguration(

articles/cosmos-db/how-to-migrate-desktop-tool.md

@@ -161,7 +161,7 @@ Next, create a target database and container on the Azure Cosmos DB for NoSQL ac
 
 Now, migrate data from a JSON array to the newly created Azure Cosmos DB for NoSQL container.
 
-1. Navigate to an empty directory on your local machine. Within that directory, create a new file named **migration-settings.json**.
+1. Navigate to an empty directory on your local machine. Within that directory, create a new file named **migrationsettings.json**.
 
 1. Within the JSON file, create a new empty JSON object:
 
@@ -236,9 +236,9 @@ Now, migrate data from a JSON array to the newly created Azure Cosmos DB for NoS
     }
     ```
 
-1. **Save** the **migration-settings.json** file.
+1. **Save** the **migrationsettings.json** file.
 
-1. Open a new terminal
+1. Open a new terminal and navigate to the directory containing your **migrationsettings.json** file.
 
 1. Run the desktop data migration tool using the `dmt` command.
 
@@ -249,12 +249,6 @@ Now, migrate data from a JSON array to the newly created Azure Cosmos DB for NoS
     > [!NOTE]
     > If you did not add the installation path to your `PATH` environment variable, you may need to specify the full path to the `dmt` executable.
 
-1. The tool asks for the path to the settings file. Enter the **migration-settings.json** filename here.
-
-    ```output
-    Path to settings file? (leave empty to skip):
-    ```
-
 1. The tool now outputs the sources and sinks used by the migration.
 
     ```output

articles/cosmos-db/partial-document-update-getting-started.md

@@ -335,34 +335,46 @@ this.patchDocument = function (documentLink, patchSpec, options, callback) {
 > [!NOTE]
 > Find the definition of `validateOptionsAndCallback` in the [.js DocDbWrapperScript](https://github.com/Azure/azure-cosmosdb-js-server/blob/1dbe69893d09a5da29328c14ec087ef168038009/utils/DocDbWrapperScript.js#L289) on GitHub.
 
-Sample parameter for patch operation:
+Sample stored procedure for patch operation:
 
 ```javascript
-function () {
+function patchDemo() {
     var doc = {
-      "id": "exampleDoc",
-      "field1": {
-         "field2": 10,
-         "field3": 20
-      }
-   };
-   var isAccepted = __.createDocument(__.getSelfLink(), doc, (err, doc) => {
-         if (err) throw err;
-         var patchSpec = [
-            {"op": "add", "path": "/field1/field2", "value": 20}, 
-            {"op": "remove", "path": "/field1/field3"}
-         ];
-         isAccepted = __.patchDocument(doc._self, patchSpec, (err, doc) => {
-               if (err) throw err;
-               else {
-                  getContext().getResponse().setBody(docPatched);
-               }
-            }
-         }
-         if(!isAccepted) throw new Error("patch was't accepted")
-      }
-   }
-   if(!isAccepted) throw new Error("create wasn't accepted")
+        "id": "exampleDoc",
+        "fields": {
+            "field1": "exampleString",
+            "field2": 20,
+            "field3": 40
+        }
+    };
+    
+    var isAccepted = __.createDocument(__.getSelfLink(), doc, (err, doc) => {
+        if (err) {
+            throw err;
+        }
+        else {
+            getContext().getResponse().setBody("Example document successfully created.");
+            
+            var patchSpec = [
+                { "op": "add", "path": "/fields/field1", "value": "newExampleString" },
+                { "op": "remove", "path": "/fields/field2" },
+                { "op": "incr", "path": "/fields/field3", "value": 10 }
+            ];
+            
+            var isAccepted = __.patchDocument(doc._self, patchSpec, (err, doc) => {
+                if (err) {
+                    throw err;
+                }
+                else {
+                    getContext().getResponse().appendBody(" Example document successfully patched.");
+                }
+            });
+            
+            if (!isAccepted) throw new Error("Patch wasn't accepted");
+        }
+    });
+
+    if (!isAccepted) throw new Error("Create wasn't accepted.");
 }
 ```
 

articles/sentinel/sap/deploy-sap-btp-solution.md

@@ -16,12 +16,6 @@ This article describes how to deploy the Microsoft Sentinel Solution for SAP® B
 
 ## Prerequisites
 
-### Fill in the sign-up form
-
-To get started, **first [complete the sign-up form](https://forms.microsoft.com/pages/responsepage.aspx?id=v4j5cvGGr0GRqy180BHbR5CavmNiVgxCqhcQeRrOyvxUM0Q3NVdHU1hWNjMzQkM3RVNNNldTR1hYOS4u)** so that we can provision your subscription with access to the preview. We’ll send a confirmation email once your subscription is active.
-
-### Additional prerequisites
-
 Before you begin, verify that:
 
 - The Microsoft Sentinel solution is enabled. 
@@ -55,7 +49,7 @@ Before you begin, verify that:
     - **uaa.clientsecret**: `682323d2-42a0-45db-a939-74639efde986$gR3x3ohHTB8iyYSKHW0SNIWG4G0tQkkMdBwO7lKhwcQ=`
     - **uaa.url**: `https://915a0312trial.authentication.us10.hana.ondemand.com`
 
-1. Log into the Azure portal with the [solution preview feature flag](https://portal.azure.com/?feature.loadTemplateSolutions=true). 
+1. Log into the [Azure portal](https://portal.azure.com/). 
 1. Navigate to the **Microsoft Sentinel** service.
 1. Select **Content hub**, and in the search bar, search for *BTP*.
 1. Select **Sentinel Solution for SAP BTP**.
@@ -106,4 +100,4 @@ However, while this guide explains how to enable the audit log retrieval using t
 In this article, you learned how to deploy the Microsoft Sentinel Solution® for SAP BTP.
 > 
 > - [Learn how to enable the security content](../sentinel-solutions-deploy.md#analytics-rule)
-> - [Review the solution's security content](sap-btp-security-content.md)
+> - [Review the solution's security content](sap-btp-security-content.md)

articles/virtual-machines/windows/run-command.md

@@ -127,7 +127,7 @@ Invoke-AzVMRunCommand -ResourceGroupName '<myResourceGroup>' -Name '<myVMName>'
 
 Listing the run commands or showing the details of a command requires the `Microsoft.Compute/locations/runCommands/read` permission on Subscription Level. The built-in [Reader](../../role-based-access-control/built-in-roles.md#reader) role and higher levels have this permission.
 
-Running a command requires the `Microsoft.Compute/virtualMachines/runCommand/write` permission. The [Virtual Machine Contributor](../../role-based-access-control/built-in-roles.md#virtual-machine-contributor) role and higher levels have this permission.
+Running a command requires the `Microsoft.Compute/virtualMachines/runCommands/write` permission. The [Virtual Machine Contributor](../../role-based-access-control/built-in-roles.md#virtual-machine-contributor) role and higher levels have this permission.
 
 You can use one of the [built-in roles](../../role-based-access-control/built-in-roles.md) or create a [custom role](../../role-based-access-control/custom-roles.md) to use Run Command.