Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into vm-toc

halkazwini · halkazwini · commit 3f7ebd8fa672 · 2023-06-21T11:39:05.000-05:00
diff --git a/articles/communication-services/concepts/numbers/sub-eligibility-number-capability.md b/articles/communication-services/concepts/numbers/sub-eligibility-number-capability.md
@@ -120,6 +120,8 @@ The following tables summarize current availability:
 | :---------------- | :-------- | :------------------- | :------------------- | :------------- | :--------------- |
 | France            | Local**     | -        | -        | Public Preview | Public Preview\* |
 | France           | Toll-Free**     | -        | -        | Public Preview | Public Preview\* |
+| Norway           | Local**     | -        | -        | Public Preview | Public Preview\* |
+| Norway           | Toll-Free | -        | -        | Public Preview | Public Preview\* |
 |  France, Germany, Netherlands, United Kingdom, Australia, Switzerland, Sweden, Italy, Spain, Denmark, Ireland, Portugal, Poland, Austria, Lithuania, Latvia, Estonia              | Alphanumeric Sender ID  \***  | Public Preview      | -        | -  | - |
 
 \* Please refer to [Inbound calling capabilities page](../telephony/inbound-calling-capabilities.md) for details.
@@ -301,6 +303,8 @@ The following tables summarize current availability:
 | Denmark           | Local     | -        | -        | Public Preview | Public Preview\* |
 | Italy   | Toll-Free** | - | - | General Availability | General Availability\* |
 | Italy   | Local**     | - | - | General Availability | General Availability\* |
+| Norway           | Local**     | -        | -        | Public Preview | Public Preview\* |
+| Norway           | Toll-Free | -        | -        | Public Preview | Public Preview\* |
 |  Sweden, Germany, Netherlands, United Kingdom, Australia, France, Switzerland, Italy, Spain, Denmark, Ireland, Portugal, Poland, Austria, Lithuania, Latvia, Estonia              | Alphanumeric Sender ID  \**  | Public Preview      | -        | -  | - |
 
 \* Please refer to [Inbound calling capabilities page](../telephony/inbound-calling-capabilities.md) for details.
diff --git a/articles/defender-for-cloud/defender-for-containers-vulnerability-assessment-azure.md b/articles/defender-for-cloud/defender-for-containers-vulnerability-assessment-azure.md
@@ -3,7 +3,7 @@ title: Identify vulnerabilities in Azure Container Registry with Microsoft Defen
 description: Learn how to use Defender for Containers to scan images in your Azure Container Registry to find vulnerabilities.
 author: dcurwin
 ms.author: dacurwin
-ms.date: 06/14/2023
+ms.date: 06/21/2023
 ms.topic: how-to
 ms.custom: ignite-2022, build-2023
 ---
@@ -134,10 +134,10 @@ To create a rule:
 
 1. From the recommendations detail page for [Container registry images should have vulnerability findings resolved-(powered by Qualys)](https://portal.azure.com/#blade/Microsoft_Azure_Security/RecommendationsBlade/assessmentKey/dbd0cb49-b563-45e7-9724-889e799fa648), select **Disable rule**.
 1. Select the relevant scope.
-1. Define your criteria.
-1. Select **Apply rule**.
 
     :::image type="content" source="./media/defender-for-containers-vulnerability-assessment-azure/disable-rule.png" alt-text="Screenshot showing how to create a disable rule for VA findings on registry." lightbox="media/defender-for-containers-vulnerability-assessment-azure/disable-rule.png":::
+1. Define your criteria.
+1. Select **Apply rule**.
 
 1. To view, override, or delete a rule:
     1. Select **Disable rule**.
diff --git a/articles/defender-for-cloud/media/defender-for-containers-vulnerability-assessment-azure/disable-rule.png b/articles/defender-for-cloud/media/defender-for-containers-vulnerability-assessment-azure/disable-rule.png
diff --git a/articles/defender-for-cloud/upcoming-changes.md b/articles/defender-for-cloud/upcoming-changes.md
@@ -24,6 +24,7 @@ If you're looking for the latest release notes, you can find them in the [What's
 | [DevOps Resource Deduplication for Defender for DevOps](#devops-resource-deduplication-for-defender-for-devops) | July 2023 |
 | [General availability release of agentless container posture in Defender CSPM](#general-availability-ga-release-of-agentless-container-posture-in-defender-cspm) | July 2023 |
 | [Business model and pricing updates for Defender for Cloud plans](#business-model-and-pricing-updates-for-defender-for-cloud-plans) | July 2023 |
+| [Recommendation set to be released for GA: Running container images should have vulnerability findings resolved (powered by Microsoft Defender Vulnerability Management)](#recommendation-set-to-be-released-for-ga-running-container-images-should-have-vulnerability-findings-resolved-powered-by-microsoft-defender-vulnerability-management) | July 2023 |
 | [Change to the Log Analytics daily cap](#change-to-the-log-analytics-daily-cap) | September 2023 |
 
 ### Replacing the "Key Vaults should have purge protection enabled" recommendation with combined recommendation "Key Vaults should have deletion protection enabled". 
@@ -107,6 +108,8 @@ With this release, the recommendation `Container registry images should have vul
 
 Customers with both Defender for Containers plan and Defender CSPM plan should [disable the Qualys recommendation](tutorial-security-policy.md#disable-a-security-recommendation), to avoid multiple reports for the same images with potential impact on secure score. If you're currently using the sub-assesment API or Azure Resource Graph or continuous export, you should also update your requests to the new schema used by the MDVM recommendation prior to disabling the Qualys recommendation and using MDVM results instead.
 
+If you are also using our public preview offering for Windows containers vulnerability assessment powered by Qualys, and you would like to continue using it, you need to [disable Linux findings](https://learn.microsoft.com/azure/defender-for-cloud/defender-for-containers-vulnerability-assessment-azure#disable-specific-findings) using disable rules rather than disable the registry recommendation.
+
 Learn more about [Agentless Containers Posture in Defender CSPM](concept-agentless-containers.md).
 
 ### Business model and pricing updates for Defender for Cloud plans
@@ -135,6 +138,23 @@ Existing customers of Defender for Key-Vault, Defender for Azure Resource Manage
 
 For more information on all of these plans, check out the [Defender for Cloud pricing page](https://azure.microsoft.com/pricing/details/defender-for-cloud/?v=17.23h) 
 
+### Recommendation set to be released for GA: Running container images should have vulnerability findings resolved (powered by Microsoft Defender Vulnerability Management) 
+
+**Estimated date for change: July 2023**
+
+The recommendation `Running container images should have vulnerability findings resolved (powered by Microsoft Defender Vulnerability Management)` is set to be released as GA (General Availability):
+
+|Recommendation | Description | Assessment Key|
+|--|--|--| 
+| Running container images should have vulnerability findings resolved (powered by Microsoft Defender Vulnerability Management) | Container image vulnerability assessment scans your registry for commonly known vulnerabilities (CVEs) and provides a detailed vulnerability report for each image. This recommendation provides visibility to vulnerable images currently running in your Kubernetes clusters. Remediating vulnerabilities in container images that are currently running is key to improving your security posture, significantly reducing the attack surface for your containerized workloads. | c609cf0f-71ab-41e9-a3c6-9a1f7fe1b8d5
+
+ Customers with both Defender for the Containers plan and Defender CSPM plan should [disable the Qualys running containers recommendation](https://learn.microsoft.com/azure/defender-for-cloud/tutorial-security-policy#disable-a-security-recommendation), to avoid multiple reports for the same images with potential impact on the secure score.
+
+If you're currently using the sub-assesment API or Azure Resource Graph or continuous export, you should also update your requests to the new schema used by the MDVM recommendation prior to disabling the Qualys recommendation and use MDVM results instead.
+
+If you are also using our public preview offering for Windows containers vulnerability assessment powered by Qualys, and you would like to continue using it, you need to [disable Linux findings](https://learn.microsoft.com/azure/defender-for-cloud/defender-for-containers-vulnerability-assessment-azure#disable-specific-findings) using disable rules rather than disable the runtime recommendation.
+
+Learn more about [Agentless Containers Posture in Defender CSPM](concept-agentless-containers.md).
 
 ### Change to the Log Analytics daily cap
 
@@ -160,7 +180,7 @@ Starting on September 18, 2023 the Log Analytics Daily Cap will no longer exclud
 
 At that time, all billable data types will be capped if the daily cap is met. This change improves your ability to fully contain costs from higher-than-expected data ingestion.
 
-Learn more about [workspaces with Microsoft Defender for Cloud](../azure-monitor/logs/daily-cap.md#workspaces-with-microsoft-defender-for-cloud)
+Learn more about [workspaces with Microsoft Defender for Cloud](../azure-monitor/logs/daily-cap.md#workspaces-with-microsoft-defender-for-cloud).
 
 ## Next steps
 
diff --git a/articles/virtual-desktop/install-office-on-wvd-master-image.md b/articles/virtual-desktop/install-office-on-wvd-master-image.md
@@ -1,17 +1,17 @@
 ---
-title: Install Office on a master VHD image - Azure
-description: How to install and customize Office on a Azure Virtual Desktop master image to Azure.
+title: Install Office on a custom VHD image - Azure
+description: How to install and customize Office on a Azure Virtual Desktop custom image to Azure.
 author: Heidilohr
 ms.topic: how-to
 ms.date: 05/02/2019
 ms.author: helohr
 manager: femila
 ---
-# Install Office on a master VHD image
+# Install Office on a custom VHD image
 
-This article tells you how to install Microsoft 365 Apps for enterprise, OneDrive, and other common applications on a master virtual hard disk (VHD) image for upload to Azure. If your users need to access certain line of business (LOB) applications, we recommend you install them after completing the instructions in this article.
+This article tells you how to install Microsoft 365 Apps for enterprise, OneDrive, and other common applications on a custom virtual hard disk (VHD) image for upload to Azure. If your users need to access certain line of business (LOB) applications, we recommend you install them after completing the instructions in this article.
 
-This article assumes you've already created a virtual machine (VM). If not, see [Prepare and customize a master VHD image](set-up-customize-master-image.md#create-a-vm)
+This article assumes you've already created a virtual machine (VM). If not, see [Prepare and customize a custom VHD image](set-up-customize-master-image.md#create-a-vm)
 
 This article also assumes you have elevated access on the VM, whether it's provisioned in Azure or Hyper-V Manager. If not, see [Elevate access to manage all Azure subscription and management groups](../role-based-access-control/elevate-access-global-admin.md).
 
@@ -87,6 +87,7 @@ After installing Office, you can update the default Office behavior. Run the fol
 ```cmd
 rem Mount the default user registry hive
 reg load HKU\TempDefault C:\Users\Default\NTUSER.DAT
+rem Disable the option for Office Insider under File > Account.
 rem Must be executed with default registry hive mounted.
 reg add HKU\TempDefault\SOFTWARE\Policies\Microsoft\office\16.0\common /v InsiderSlabBehavior /t REG_DWORD /d 2 /f
 rem Set Outlook's Cached Exchange Mode behavior
@@ -98,7 +99,7 @@ reg add "HKU\TempDefault\software\policies\microsoft\office\16.0\outlook\cached
 rem Unmount the default user registry hive
 reg unload HKU\TempDefault
 
-rem Set the Office Update UI behavior.
+rem Set the Office Update UI behavior for updates.
 reg add HKLM\SOFTWARE\Policies\Microsoft\office\16.0\common\officeupdate /v hideupdatenotifications /t REG_DWORD /d 1 /f
 reg add HKLM\SOFTWARE\Policies\Microsoft\office\16.0\common\officeupdate /v hideenabledisableupdates /t REG_DWORD /d 1 /f
 ```
@@ -157,4 +158,4 @@ For help with installing Microsoft Teams, see [Use Microsoft Teams on Azure Virt
 
 ## Next steps
 
-Now that you've added Office to the image, you can continue to customize your master VHD image. See [Prepare and customize a master VHD image](set-up-customize-master-image.md).
+Now that you've added Office to the image, you can continue to customize your custom VHD image. See [Prepare and customize a custom VHD image](set-up-customize-master-image.md).
diff --git a/articles/virtual-desktop/virtual-desktop-fall-2019/diagnostics-log-analytics-2019.md b/articles/virtual-desktop/virtual-desktop-fall-2019/diagnostics-log-analytics-2019.md
@@ -66,53 +66,33 @@ The following example queries show how the diagnostics feature generates a repor
 
 This first example shows connection activities initiated by users with supported remote desktop clients:
 
-```powershell
+```kusto
 WVDActivityV1_CL
-
 | where Type_s == "Connection"
-
 | join kind=leftouter (
-
     WVDErrorV1_CL
-
     | summarize Errors = makelist(pack('Time', Time_t, 'Code', ErrorCode_s , 'CodeSymbolic', ErrorCodeSymbolic_s, 'Message', ErrorMessage_s, 'ReportedBy', ReportedBy_s , 'Internal', ErrorInternal_s )) by ActivityId_g
-
     ) on $left.Id_g  == $right.ActivityId_g 
-
 | join  kind=leftouter (
-
     WVDCheckpointV1_CL
-
     | summarize Checkpoints = makelist(pack('Time', Time_t, 'ReportedBy', ReportedBy_s, 'Name', Name_s, 'Parameters', Parameters_s) ) by ActivityId_g
-
     ) on $left.Id_g  == $right.ActivityId_g
-
 |project-away ActivityId_g, ActivityId_g1
 ```
 
 This next example query shows management activities by admins on tenants:
 
-```powershell
+```kusto
 WVDActivityV1_CL
-
 | where Type_s == "Management"
-
 | join kind=leftouter (
-
     WVDErrorV1_CL
-
     | summarize Errors = makelist(pack('Time', Time_t, 'Code', ErrorCode_s , 'CodeSymbolic', ErrorCodeSymbolic_s, 'Message', ErrorMessage_s, 'ReportedBy', ReportedBy_s , 'Internal', ErrorInternal_s )) by ActivityId_g
-
     ) on $left.Id_g  == $right.ActivityId_g 
-
 | join  kind=leftouter (
-
     WVDCheckpointV1_CL
-
     | summarize Checkpoints = makelist(pack('Time', Time_t, 'ReportedBy', ReportedBy_s, 'Name', Name_s, 'Parameters', Parameters_s) ) by ActivityId_g
-
     ) on $left.Id_g  == $right.ActivityId_g
-
 |project-away ActivityId_g, ActivityId_g1
 ```
 
