Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-aadroles-portal-entra-admin-center

Author: rolyon

articles/active-directory/includes/automatic-redemption-include.md

@@ -52,7 +52,7 @@ The following table shows the consent prompt behavior for source tenant users wh
 | ![Icon for clear check mark.](../media/automatic-redemption-include/icon-check-mark-clear.png) | ![Icon for check mark.](../media/automatic-redemption-include/icon-check-mark.png) | Not suppressed |
 | ![Icon for clear check mark.](../media/automatic-redemption-include/icon-check-mark-clear.png) | ![Icon for clear check mark.](../media/automatic-redemption-include/icon-check-mark-clear.png) | Not suppressed |
 | **Inbound** | **Outbound** |  |
-| ![Icon for check mark.](../media/automatic-redemption-include/icon-check-mark.png) | ![Icon for check mark.](../media/automatic-redemption-include/icon-check-mark.png) | Suppressed |
+| ![Icon for check mark.](../media/automatic-redemption-include/icon-check-mark.png) | ![Icon for check mark.](../media/automatic-redemption-include/icon-check-mark.png) | Not suppressed |
 | ![Icon for check mark.](../media/automatic-redemption-include/icon-check-mark.png) | ![Icon for clear check mark.](../media/automatic-redemption-include/icon-check-mark-clear.png) | Not suppressed |
 | ![Icon for clear check mark.](../media/automatic-redemption-include/icon-check-mark-clear.png) | ![Icon for check mark.](../media/automatic-redemption-include/icon-check-mark.png) | Not suppressed |
 | ![Icon for clear check mark.](../media/automatic-redemption-include/icon-check-mark-clear.png) | ![Icon for clear check mark.](../media/automatic-redemption-include/icon-check-mark-clear.png) | Not suppressed |

articles/stream-analytics/set-up-cicd-pipeline.md

@@ -6,7 +6,7 @@ author: alexlzx
 ms.author: zhenxilin
 ms.service: stream-analytics
 ms.topic: how-to
-ms.date: 12/27/2022
+ms.date: 09/08/2023
 ---
 
 # Use Azure DevOps to create a CI/CD pipeline for a Stream Analytics job
@@ -80,9 +80,14 @@ Use following steps if you need to use hosted-Linux agent:
 2. On the **Tasks** page, select the plus sign next to **Agent job 1**. Search for **Command line**.
 
 3. Give the task a **Display name** and enter the following script. Modify the script with your repository name and project name.
+    
+    > [!NOTE]
+    > It's highly recommended to use the `build --v2` to generate ARM template for deployment. The new ARM template has fewer parameters while preserving the same functionality as the previous version.
+    >
+    > Please note that the older ARM template will soon be deprecated, only templates created using `build --v2` will receive updates and bug fixes.
 
    ```bash
-   azure-streamanalytics-cicd build -project $(projectRootPath)/asaproj.json -outputpath $(projectRootPath)/$(outputPath)/$(deployPath)
+   azure-streamanalytics-cicd build --v2 -project $(projectRootPath)/asaproj.json -outputpath $(projectRootPath)/$(outputPath)/$(deployPath)
    ```
 
    The image uses a Stream Analytics Visual Studio Code project as an example.
@@ -168,6 +173,11 @@ Open a web browser and navigate to your Azure Stream Analytics Visual Studio Cod
 
 ### Add deploy tasks
 
+> [!NOTE]
+> The `Override template parameters` is not applicable for ARM --v2 builds since parameters are passed as objects. To address this, it's recommended to include a PowerShell script in your pipeline to read the parameter file as JSON and make the necessary parameter modifications.
+>
+> For more guidance on adding the PowerShell script, please refer to [ConvertFrom-Json](https://learn.microsoft.com/powershell/module/microsoft.powershell.utility/convertfrom-json) and [Update Object in JSON file](https://stackoverflow.com/questions/65753594/update-object-in-json-file-using-powershell).
+
 1. From the tasks dropdown, select **Deploy job to test environment**.
 
 2. Select the **+** next to **Agent job** and search for **ARM template deployment**. Enter the following parameters:

articles/virtual-machines/linux/imaging.md

@@ -1,14 +1,14 @@
 ---
 title: Overview of creating Linux images for Azure
 description: How to bring your Linux VM images or create new images to use in Azure.
-author: danielsollondon
+author: cynthn
 ms.service: virtual-machines
 ms.subservice: imaging
 ms.collection: linux
 ms.topic: overview
 ms.workload: infrastructure
-ms.date: 06/22/2020
-ms.author: danis
+ms.date: 09/01/2023
+ms.author: cynthn
 ms.reviewer: cynthn
 
 ---
@@ -55,9 +55,9 @@ These are [prerequisites](./create-upload-generic.md) for creating an image.
 
 
 ### Specialized images
-These are images that are completely configured and do not require VM or special parameters. The platform will just turn the VM on and you will need to handle uniqueness within the VM, like setting a hostname, to avoid DNS conflicts on the same VNET. 
+These are images that are completely configured and don't require VM or special parameters. The platform will just turn the VM on and you will need to handle uniqueness within the VM, like setting a hostname, to avoid DNS conflicts on the same VNET. 
 
-Provisioning agents are not required for these images, however you may want to have extension handling capabilities. You can install the Linux Agent but disable the provisioning option. Even though you do not need a provisioning agent, the image must fulfill [prerequisites](./create-upload-generic.md)  for Azure Images.
+Provisioning agents aren't required for these images, however you may want to have extension handling capabilities. You can install the Linux Agent but disable the provisioning option. Even though you don't need a provisioning agent, the image must fulfill [prerequisites](./create-upload-generic.md)  for Azure Images.
 
 
 ## Image storage options
@@ -69,7 +69,7 @@ When bringing your Linux image you have two options:
 
 ### Managed images
 
-Managed images can be used to create multiple VMs, but they have a lot of limitations. Managed images can only be created from a generalized source (VM or VHD). They can only be used to create VMs in the same region and they can't be shared across subscriptions and tenants.
+Managed images can be used to create multiple VMs, but they have many limitations. Managed images can only be created from a generalized source (VM or VHD). They can only be used to create VMs in the same region and they can't be shared across subscriptions and tenants.
 
 Managed images can be used for development and test environments, where you need a couple of simple generalized images to use within single region and subscription. 
 
@@ -101,7 +101,9 @@ If you still need to create your own image, ensure it meets the [image prerequis
 - [CentOS-based Distributions](create-upload-centos.md)
 - [Debian Linux](debian-create-upload-vhd.md)
 - [Flatcar Container Linux](flatcar-create-upload-vhd.md)
+- [FreeBSD](freebsd-intro-on-azure.md)
 - [Oracle Linux](oracle-create-upload-vhd.md)
+- [OpenBSD](create-upload-openbsd.md)
 - [Red Hat Enterprise Linux](redhat-create-upload-vhd.md)
 - [SLES & openSUSE](suse-create-upload-vhd.md)
 - [Ubuntu](create-upload-ubuntu.md)