merge main to this

.github/PULL_REQUEST_TEMPLATE.md

@@ -11,7 +11,7 @@ Add a changelog entry for this PR by answering the following questions:
       - [ ] Other, please clarify
   2. When are you targeting to deploy the new service/feature to public regions? Please provide the date or, if the date is not yet available, the month.
   3. When do you expect to publish the swagger? Please provide date or, the the date is not yet available, the month.
-  4. If updating an existing version, please select the specific langauge SDKs and CLIs that must be refreshed after the swagger is published.
+  4. If updating an existing version, please select the specific language SDKs and CLIs that must be refreshed after the swagger is published.
       - [ ] SDK of .NET (need service team to ensure code readiness)
       - [ ] SDK of Python
       - [ ] SDK of Java

.github/comment.yml

@@ -48,7 +48,7 @@
       openapiHub: https://portal.azure-devex-tools.com
     keywords:
       - "I have reviewed the [documentation](https://aka.ms/ameonboard) for the workflow."
-    onOpenedComments: "Hi, @${PRAuthor} Thanks for your PR. I am workflow bot for review process. Here are some small tips. </br> <li> Please ensure to do self-check against checklists in first PR comment.</li> <li> PR assignee is the person auto-assigned and responsible for your current PR reviewing and merging. </li>   <li> For specs comparison cross API versions,  Use [API Specs Comparison Report Generator](${openapiHub}/tools/diff?pr=${owner}/${repo}/${PRNumber})</li>  <li> If there is CI failure(s), to fix CI error(s) is mandatory for PR merging; or you need to provide justification in PR comment for explanation. [How to fix?](https://github.com/Azure/azure-rest-api-specs/blob/main/documentation/ci-fix.md)</li></br> Any feedback about review process or workflow bot, pls contact swagger and tools team. vsswagger@microsoft.com"
+    onOpenedComments: "Hi, @${PRAuthor} Thanks for your PR. I am workflow bot for review process. Here are some small tips. </br> <li> Please ensure to do self-check against checklists in first PR comment.</li> <li> PR assignee is the person auto-assigned and responsible for your current PR reviewing and merging. </li>   <li> For specs comparison cross API versions,  Use [API Specs Comparison Report Generator](${openapiHub}/tools/diff?pr=${owner}/${repo}/${PRNumber})</li>  <li> If there is CI failure(s), to fix CI error(s) is mandatory for PR merging; or you need to provide justification in PR comment for explanation. [How to fix?](https://github.com/Azure/azure-rest-api-specs/blob/main/documentation/ci-fix.md)</li></br> Any feedback about review process or workflow bot, pls contact swagger and tools team. vscswagger@microsoft.com"
 
 - rule:
     type: PROpen

.github/pull_request_assignment.yml

@@ -145,6 +145,12 @@
     reviewers:
       - weidongxu-microsoft
 
+- rule:
+    paths: 
+      - "specification/securityinsights/**"
+    reviewers:
+      - dw511214992
+
 
 - rule:
     paths:

custom-words.txt

@@ -1185,6 +1185,7 @@ marketplacecatalog
 marketplaceordering
 maxclients
 maxcoordinates
+MAXDOP
 MAXERRORS
 maxfragmentationmemory
 maximumblobsize
@@ -2479,6 +2480,22 @@ loadtest
 xvalue
 yvalue
 servermetrics
+napt
+Napt
+NAPT
+Plmn
+IMSI
+UE's
+Preemptable
+Ambr
+AMBR
+rfsp
+Rfsp
+snssai
+Snssai
+NSSAI
+Tbps
+Vuln
 IAASVM
 Quickbase
 Smartsheet

specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2021-08-01/examples/ApiManagementGetPrivateLinkGroupResource.json

@@ -9,16 +9,16 @@
   "responses": {
     "200": {
       "body": {
-        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/privateLinkResources/privateLinkSubResourceName",
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1/privateLinkResources/Gateway",
         "name": "Gateway",
         "type": "Microsoft.ApiManagement/service/privateLinkResources",
         "properties": {
           "groupId": "Gateway",
           "requiredMembers": [
-            "Gateway_west_us"
+            "Gateway"
           ],
           "requiredZoneNames": [
-            "privateLink.azure.api.net"
+            "privateLink.azure-api.net"
           ]
         }
       }

specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2021-08-01/examples/ApiManagementListPrivateLinkGroupResources.json

@@ -16,10 +16,10 @@
             "properties": {
               "groupId": "Gateway",
               "requiredMembers": [
-                "Gateway_west_us"
+                "Gateway"
               ],
               "requiredZoneNames": [
-                "privateLink.azure.api.net"
+                "privateLink.azure-api.net"
               ]
             }
           }