Merge pull request #253143 from MicrosoftDocs/main

Merge main to live, 4 AM

Author: v-ccolin

articles/active-directory/app-provisioning/skip-out-of-scope-deletions.md

@@ -59,10 +59,10 @@ Copy the Response into a text file. It looks like the JSON text shown, with valu
 Here's the JSON block to add to the mapping. 
 
 ```json
-        {
-            "key": "SkipOutOfScopeDeletions",
-            "value": "True"
-        }
+{
+  "key": "SkipOutOfScopeDeletions",
+  "value": "True"
+}
 ```
 
 ## Step 4: Update the secrets endpoint with the SkipOutOfScopeDeletions flag

articles/active-directory/manage-apps/restore-application.md

@@ -122,33 +122,12 @@ Replace ID with the object ID of the service principal that you want to restore.
 
 :::zone pivot="ms-graph"
 
-1. To restore the enterprise application, run the following query:
+To restore the enterprise application, run the following query:
 
-   # [HTTP](#tab/http)
    ```http
    POST https://graph.microsoft.com/v1.0/directory/deletedItems/{id}/restore
    ```
 
-   # [C#](#tab/csharp)
-   [!INCLUDE [sample-code](~/microsoft-graph/api-reference/v1.0/includes/snippets/csharp/restore-directory-deleteditem-csharp-snippets.md)]
-   
-   # [JavaScript](#tab/javascript)
-   [!INCLUDE [sample-code](~/microsoft-graph/api-reference/v1.0/includes/snippets/javascript/restore-directory-deleteditem-javascript-snippets.md)]
-   
-   # [Java](#tab/java)
-   [!INCLUDE [sample-code](~/microsoft-graph/api-reference/v1.0/includes/snippets/java/restore-directory-deleteditem-java-snippets.md)]
-   
-   # [Go](#tab/go)
-   [!INCLUDE [sample-code](~/microsoft-graph/api-reference/v1.0/includes/snippets/go/restore-directory-deleteditem-go-snippets.md)]
-   
-   # [PowerShell](#tab/powershell)
-   [!INCLUDE [sample-code](~/microsoft-graph/api-reference/v1.0/includes/snippets/powershell/restore-directory-deleteditem-powershell-snippets.md)]
-   
-   # [PHP](#tab/php)
-   [!INCLUDE [sample-code](~/microsoft-graph/api-reference/v1.0/includes/snippets/php/restore-directory-deleteditem-php-snippets.md)]
-   
-   ---
-
 Replace ID with the object ID of the service principal that you want to restore.
 
 :::zone-end

articles/ai-services/LUIS/luis-tutorial-node-import-utterances-csv.md

@@ -67,22 +67,22 @@ The column entries that contain the utterances in the CSV have to be parsed into
 For example, the entry for "Turn on the lights" maps to this JSON:
 
 ```json
+{
+    "text": "Turn on the lights",
+    "intentName": "TurnOn",
+    "entityLabels": [
         {
-            "text": "Turn on the lights",
-            "intentName": "TurnOn",
-            "entityLabels": [
-                {
-                    "entityName": "Operation",
-                    "startCharIndex": 5,
-                    "endCharIndex": 6
-                },
-                {
-                    "entityName": "Device",
-                    "startCharIndex": 12,
-                    "endCharIndex": 17
-                }
-            ]
+            "entityName": "Operation",
+            "startCharIndex": 5,
+            "endCharIndex": 6
+        },
+        {
+            "entityName": "Device",
+            "startCharIndex": 12,
+            "endCharIndex": 17
         }
+    ]
+}
 ```
 
 In this example, the `intentName` comes from the user request under the **Request** column heading in the CSV file, and the `entityName` comes from the other columns with key information. For example, if there's an entry for **Operation** or **Device**, and that string also occurs in the actual request, then it can be labeled as an entity. The following code demonstrates this parsing process. You can copy or [download](https://github.com/Azure-Samples/cognitive-services-language-understanding/blob/master/examples/build-app-programmatically-csv/_parse.js) it and save it to `_parse.js`.

articles/ai-services/language-service/text-analytics-for-health/concepts/relation-extraction.md

@@ -24,33 +24,33 @@ Text Analytics for health features relation extraction, which is used to  identi
 Relation extraction output contains URI references and assigned roles of the entities of the relation type. For example, in the following JSON:
 
 ```json
-                "relations": [
-                    {
-                        "relationType": "DosageOfMedication",
-                        "entities": [
-                            {
-                                "ref": "#/results/documents/0/entities/0",
-                                "role": "Dosage"
-                            },
-                            {
-                                "ref": "#/results/documents/0/entities/1",
-                                "role": "Medication"
-                            }
-                        ]
-                    },
-                    {
-                        "relationType": "RouteOfMedication",
-                        "entities": [
-                            {
-                                "ref": "#/results/documents/0/entities/1",
-                                "role": "Medication"
-                            },
-                            {
-                                "ref": "#/results/documents/0/entities/2",
-                                "role": "Route"
-                            }
-                        ]
-...
+"relations": [
+    {
+        "relationType": "DosageOfMedication",
+        "entities": [
+            {
+                "ref": "#/results/documents/0/entities/0",
+                "role": "Dosage"
+            },
+            {
+                "ref": "#/results/documents/0/entities/1",
+                "role": "Medication"
+            }
+        ]
+    },
+    {
+        "relationType": "RouteOfMedication",
+        "entities": [
+            {
+                "ref": "#/results/documents/0/entities/1",
+                "role": "Medication"
+            },
+            {
+                "ref": "#/results/documents/0/entities/2",
+                "role": "Route"
+            }
+        ]
+    }
 ]
 ```
 

articles/ai-services/speech-service/speech-synthesis-markup-pronunciation.md

@@ -234,7 +234,7 @@ The following content types are supported for the `interpret-as` and `format` at
 | `ordinal`  | None | The text is spoken as an ordinal number. The speech synthesis engine pronounces:<br /><br />`Select the <say-as interpret-as="ordinal">3rd</say-as> option`<br /><br />As "Select the third option."|
 | `number_digit`  | None | The text is spoken as a sequence of individual digits. The speech synthesis engine pronounces:<br /><br />`<say-as interpret-as="number_digit">123456789</say-as>`<br /><br />As "1 2 3 4 5 6 7 8 9." |
 | `fraction`   | None | The text is spoken as a fractional number. The speech synthesis engine pronounces:<br /><br /> `<say-as interpret-as="fraction">3/8</say-as> of an inch`<br /><br />As "three eighths of an inch."  |
-| `date` | dmy, mdy, ymd, ydm, ym, my, md, dm, d, m, y | The text is spoken as a date. The `format` attribute specifies the date's format (*d=day, m=month, and y=year*). The speech synthesis engine pronounces:<br /><br />`Today is <say-as interpret-as="date" format="mdy">10-19-2016</say-as>`<br /><br />As "Today is October nineteenth two thousand sixteen." |
+| `date` | dmy, mdy, ymd, ydm, ym, my, md, dm, d, m, y | The text is spoken as a date. The `format` attribute specifies the date's format (*d=day, m=month, and y=year*). The speech synthesis engine pronounces:<br /><br />`Today is <say-as interpret-as="date">10-12-2016</say-as>`<br /><br />As "Today is October twelfth two thousand sixteen."<br />Pronounces:<br /><br />`Today is <say-as interpret-as="date" format="dmy">10-12-2016</say-as>`<br /><br />As "Today is December tenth two thousand sixteen." |
 | `time`  | hms12, hms24  | The text is spoken as a time. The `format` attribute specifies whether the time is specified by using a 12-hour clock (hms12) or a 24-hour clock (hms24). Use a colon to separate numbers representing hours, minutes, and seconds. Here are some valid time examples: 12:35, 1:14:32, 08:15, and 02:50:45. The speech synthesis engine pronounces:<br /><br />`The train departs at <say-as interpret-as="time" format="hms12">4:00am</say-as>`<br /><br />As "The train departs at four A M." |
 | `duration` | hms, hm, ms   | The text is spoken as a duration. The `format` attribute specifies the duration's format (*h=hour, m=minute, and s=second*). The speech synthesis engine pronounces:<br /><br />`<say-as interpret-as="duration">01:18:30</say-as>`<br /><br /> As "one hour eighteen minutes and thirty seconds".<br />Pronounces:<br /><br />`<say-as interpret-as="duration" format="ms">01:18</say-as>`<br /><br /> As "one minute and eighteen seconds".<br />This tag is only supported on English and Spanish. |
 | `telephone` |  None | The text is spoken as a telephone number. The speech synthesis engine pronounces:<br /><br />`The number is <say-as interpret-as="telephone">(888) 555-1212</say-as>`<br /><br />As "My number is area code eight eight eight five five five one two one two." |

articles/aks/image-cleaner.md

@@ -97,7 +97,8 @@ Image Cleaner generates an `ImageList` containing nonrunning and vulnerable imag
       name: imagelist
     spec:
       images:
-        - docker.io/library/alpine:3.7.3   # You can also use "*" to specify all non-running images
+        - docker.io/library/alpine:3.7.3
+    // You can also use "*" to specify all non-running images
     ```
 
 2. Apply the `ImageList` to your cluster using the `kubectl apply` command.

articles/azure-maps/how-to-manage-pricing-tier.md

@@ -46,26 +46,26 @@ To change your pricing tier from Gen1 to Gen2 in the ARM template, update `prici
 :::image type="content" source="./media/how-to-manage-pricing-tier/arm-template.png" border="true" alt-text="Screenshot of an ARM template that demonstrates updating pricingTier to G2 and kind to Gen2.":::
 
 ```json
-        "pricingTier": { 
-            "type": "string", 
-            "allowedValues":[ 
-                "G2"
-            ], 
-            "defaultValue": "G2",
-            "metadata": { 
-                "description": "The pricing tier SKU for the account." 
-            } 
-        }, 
-        "kind": { 
-            "type": "string", 
-            "allowedValues":[ 
-                "Gen2" 
-            ], 
-            "defaultValue": "Gen2", 
-            "metadata": { 
-                "description": "The pricing tier for the account." 
-            } 
-        } 
+  "pricingTier": { 
+      "type": "string", 
+      "allowedValues":[ 
+          "G2"
+      ], 
+      "defaultValue": "G2",
+      "metadata": { 
+          "description": "The pricing tier SKU for the account." 
+      } 
+  }, 
+  "kind": { 
+      "type": "string", 
+      "allowedValues":[ 
+          "Gen2" 
+      ], 
+      "defaultValue": "Gen2", 
+      "metadata": { 
+          "description": "The pricing tier for the account." 
+      } 
+  } 
 ```
 :::code language="json" source="~/quickstart-templates/quickstarts/microsoft.maps/maps-create/azuredeploy.json" range="27-46":::
 --->