Merge pull request #256158 from MicrosoftDocs/repo_sync_working_branch

Taojunshen · web-flow · commit d902235c0bac · 2023-10-26T00:34:24.000+08: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/event-grid/includes/schema-app-configuration.md b/articles/event-grid/includes/schema-app-configuration.md
@@ -18,6 +18,8 @@ Event Grid uses [event subscriptions](../concepts.md#event-subscriptions) to rou
 | ---------- | ----------- |
 | Microsoft.AppConfiguration.KeyValueModified | Raised when a key-value is created or replaced. |
 | Microsoft.AppConfiguration.KeyValueDeleted | Raised when a key-value is deleted. |
+| Microsoft.AppConfiguration.SnapshotCreated | Raised when a snapshot is created. |
+| Microsoft.AppConfiguration.SnapshotModified | Raised when a snapshot is modified. |
 
 ## Event schema
 
@@ -54,11 +56,22 @@ An event has the following top-level data:
 
 The data object has the following properties:
 
+### Key-value event
+
 | Property | Type | Description |
 | -------- | ---- | ----------- |
 | `key` | string | The key of the key-value that was modified or deleted. |
 | `label` | string | The label, if any, of the key-value that was modified or deleted. |
 | `etag` | string | For `KeyValueModified` the etag of the new key-value. For `KeyValueDeleted` the etag of the key-value that was deleted. |
+| `syncToken` | string | The sync token representing the server state after the key-value event. |
+
+### Snapshot event
+
+| Property | Type | Description |
+| -------- | ---- | ----------- |
+| `name` | string | The name of the snapshot that was created or modified. |
+| `etag` | string | For `SnapshotCreated` the etag of the new snapshot. For `SnapshotModified` the etag of the snapshot that was modified. |
+| `syncToken` | string | The sync token representing the server state after the snapshot event. |
 
 ## Example event
 
@@ -82,7 +95,7 @@ The following example shows the schema of a key-value modified event:
 }]
 ```
 
-The schema for a key-value deleted event is similar: 
+The following example shows the schema of a key-value deleted event: 
 
 ```json
 [{
@@ -100,6 +113,45 @@ The schema for a key-value deleted event is similar:
   "metadataVersion": "1"
 }]
 ```
+
+The following example shows the schema of a snapshot created event:
+
+```json
+[{
+  "id": "84e17ea4-66db-4b54-8050-df8f7763f87b",
+  "topic": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testrg/providers/microsoft.appconfiguration/configurationstores/contoso",
+  "subject": "https://contoso.azconfig.io/snapshots/Foo",
+  "data": {
+    "Name": "Foo",
+    "etag": "FnUExLaj2moIi4tJX9AXn9sakm0",
+    "syncToken": "zAJw6V16=Njo1IzUxNjQ2NzM=;sn=5164673"
+  },
+  "eventType": "Microsoft.AppConfiguration.SnapshotCreated",
+  "eventTime": "2023-09-02T20:05:03Z",
+  "dataVersion": "1",
+  "metadataVersion": "1"
+}]
+```
+
+The following example shows the schema of a snapshot modified event:
+
+```json
+[{
+  "id": "84e17ea4-66db-4b54-8050-df8f7763f87b",
+  "topic": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testrg/providers/microsoft.appconfiguration/configurationstores/contoso",
+  "subject": "https://contoso.azconfig.io/snapshots/Foo",
+  "data": {
+    "name": "Foo",
+    "label": "FizzBuzz",
+    "etag": "FnUExLaj2moIi4tJX9AXn9sakm0",
+    "syncToken": "zAJw6V16=Njo1IzUxNjQ2NzM=;sn=5164673"
+  },
+  "eventType": "Microsoft.AppConfiguration.SnapshotModified",
+  "eventTime": "2023-09-03T20:05:03Z",
+  "dataVersion": "1",
+  "metadataVersion": "1"
+}]
+```
 # [Cloud event schema](#tab/cloud-event-schema)
 
 The following example shows the schema of a key-value modified event: 
@@ -120,7 +172,7 @@ The following example shows the schema of a key-value modified event:
 }]
 ```
 
-The schema for a key-value deleted event is similar: 
+The following example shows the schema of a key-value deleted event: 
 
 ```json
 [{
@@ -138,6 +190,41 @@ The schema for a key-value deleted event is similar:
 }]
 ```
 
+The following example shows the schema of a snapshot created event: 
+
+```json
+[{
+  "source": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testrg/providers/microsoft.appconfiguration/configurationstores/contoso",
+  "subject": "https://contoso.azconfig.io/kvsnapshots/Foo",
+  "type": "Microsoft.AppConfiguration.SnapshotCreated",
+  "time": "2023-09-02T20:05:03.0000000Z",
+  "id": "84e17ea4-66db-4b54-8050-df8f7763f87b",
+  "data": {
+    "name": "Foo",
+    "etag": "FnUExLaj2moIi4tJX9AXn9sakm0",
+    "syncToken": "zAJw6V16=Njo1IzUxNjQ2NzM=;sn=5164673"
+  },
+  "specversion": "1.0"
+}]
+```
+
+The following example shows the schema of a snapshot modified event: 
+
+```json
+[{
+  "source": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/testrg/providers/microsoft.appconfiguration/configurationstores/contoso",
+  "subject": "https://contoso.azconfig.io/snapshots/Foo",
+  "type": "Microsoft.AppConfiguration.SnapshotModified",
+  "time": "2023-09-03T20:05:03.0000000Z",
+  "id": "84e17ea4-66db-4b54-8050-df8f7763f87b",
+  "data": {
+    "name": "Foo",
+    "etag": "FnUExLaj2moIi4tJX9AXn9sakm0",
+    "syncToken": "zAJw6V16=Njo1IzUxNjQ2NzM=;sn=5164673"
+  },
+  "specversion": "1.0"
+}]
+```
 ---
 
 
diff --git a/articles/event-grid/mqtt-routing-filtering.md b/articles/event-grid/mqtt-routing-filtering.md
@@ -59,9 +59,9 @@ If you send a non-JSON payload that is still UFT-8, it will be serialized as a J
 You can use the following filter to filter all the messages that include the word “Contoso”:
 ```azurecli-interactive
 "advancedFilters": [{
-    "operatorType": "`StringContains` ",
+    "operatorType": "StringContains",
     "key": "data",
-    "value": “Contoso”
+    "value": "Contoso"
 }]
 ```
 
@@ -82,9 +82,9 @@ You can use the following filter to filter all the messages coming from your cli
 
 ```azurecli-interactive
 "advancedFilters": [{"
-    operatorType": "`StringContains` ",
-    "key": "`clienttype`", 
-    "value": “sensor”
+    operatorType": "StringContains",
+    "key": "clienttype", 
+    "value": "sensor"
 }]
 ```
 
diff --git a/articles/hdinsight/selective-logging-analysis.md b/articles/hdinsight/selective-logging-analysis.md
@@ -41,7 +41,7 @@ For instructions on how to create an HDInsight cluster, see [Get started with Az
 
 ## Enable or disable logs by using a script action for multiple tables and log types
 
-1. Go to **Script actions** in your cluster and select **Submit now** to start the process of creating a script action. 
+1. Go to **Script actions** in your cluster and select **Submit new** to start the process of creating a script action. 
 
     :::image type="content" source="./media/hdinsight-hadoop-oms-selective-log-analytics-tutorial/select-submit-script-action.png" alt-text="Screenshot that shows the button for starting the process of creating a script action.":::
 
diff --git a/articles/load-balancer/load-balancer-outbound-connections.md b/articles/load-balancer/load-balancer-outbound-connections.md
@@ -85,7 +85,7 @@ A public IP assigned to a VM is a 1:1 relationship (rather than 1: many) and imp
 In Azure, virtual machines created in a virtual network without explicit outbound connectivity defined are assigned a default outbound public IP address. This IP address enables outbound connectivity from the resources to the Internet. This access is referred to as [default outbound access](../virtual-network/ip-services/default-outbound-access.md).  This method of access is **not recommended** as it is insecure and the IP addresses are subject to change.
 
 >[!Important]
->On September 30, 2025, default outbound access for new deployments will be retired. For more information, see the [official announcement](https://azure.microsoft.com/updates/upgrade-to-standard-sku-public-ip-addresses-in-azure-by-30-september-2025-basic-sku-will-be-retired/).  It is reccomended to use one the explict forms of connectivity as shown in options 1-3 above.
+>On September 30, 2025, default outbound access for new deployments will be retired. For more information, see the [official announcement](https://azure.microsoft.com/updates/upgrade-to-standard-sku-public-ip-addresses-in-azure-by-30-september-2025-basic-sku-will-be-retired/).  It is recommended to use one the explict forms of connectivity as shown in options 1-3 above.
 
 ### What are SNAT ports?
 
diff --git a/articles/machine-learning/how-to-authenticate-batch-endpoint.md b/articles/machine-learning/how-to-authenticate-batch-endpoint.md
@@ -131,7 +131,7 @@ In this case, we want to execute a batch endpoint using a service principal alre
 
 # [Azure CLI](#tab/cli)
 
-1. Create a secret to use for authentication as explained at [Option 32: Create a new client secret](../active-directory/develop/howto-create-service-principal-portal.md#option-3-create-a-new-client-secret).
+1. Create a secret to use for authentication as explained at [Option 3: Create a new client secret](../active-directory/develop/howto-create-service-principal-portal.md#option-3-create-a-new-client-secret).
 1. To authenticate using a service principal, use the following command. For more details see [Sign in with Azure CLI](/cli/azure/authenticate-azure-cli).
 
     ```azurecli
diff --git a/articles/machine-learning/how-to-mltable.md b/articles/machine-learning/how-to-mltable.md
@@ -209,7 +209,7 @@ You can choose to save the MLTable yaml file to a cloud storage, or you can also
 ```python
 # save the data loading steps in an MLTable file to a cloud storage
 # NOTE: the tbl object was defined in the previous snippet.
-tbl.save(save_path_dirc= "azureml://subscriptions/<subid>/resourcegroups/<rgname>/workspaces/<wsname>/datastores/<name>/paths/titanic", collocated=True, show_progress=True, allow_copy_errors=False, overwrite=True)
+tbl.save(path="azureml://subscriptions/<subid>/resourcegroups/<rgname>/workspaces/<wsname>/datastores/<name>/paths/titanic", colocated=True, show_progress=True, overwrite=True)
 ```
 
 ```python
@@ -219,10 +219,9 @@ tbl.save("./titanic")
 ```
 
 > [!IMPORTANT]
-> - If collocated == True, then we will copy the data to the same folder with MLTable yaml file if they are not currently collocated, and we will use relative paths in MLTable yaml.
-> - If collocated == False, we will not move the data and we will use absolute paths for cloud data and use relative paths for local data.
-> - We don’t support this parameter combination: data is in local, collocated == False, `save_path_dirc` is a cloud directory. Please upload your local data to cloud and use the cloud data paths for MLTable instead.
-> - Parameters `show_progress` (default as True), `allow_copy_errors` (default as False), `overwrite`(default as True) are optional.
+> - If colocated == True, then we will copy the data to the same folder with MLTable yaml file if they are not currently colocated, and we will use relative paths in MLTable yaml.
+> - If colocated == False, we will not move the data and we will use absolute paths for cloud data and use relative paths for local data.
+> - We don’t support this parameter combination: data is in local, colocated == False, `path` targets a cloud directory. Please upload your local data to cloud and use the cloud data paths for MLTable instead.
 >
 
 
