Skip to content

Commit 7be9d71

Browse files
authored
Merge pull request #289476 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 5d8d76b + 6701853 commit 7be9d71

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed

articles/automation/shared-resources/variables.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ from automationassets import AutomationAssetNotFound
196196

197197
# get a variable
198198
value = automationassets.get_automation_variable("test-variable")
199-
print value
199+
print(value)
200200

201201
# set a variable (value can be int/bool/string)
202202
automationassets.set_automation_variable("test-variable", True)
@@ -207,7 +207,7 @@ automationassets.set_automation_variable("test-variable", "test-string")
207207
try:
208208
value = automationassets.get_automation_variable("nonexisting variable")
209209
except AutomationAssetNotFound:
210-
print ("variable not found")
210+
print("variable not found")
211211
```
212212

213213
---

articles/azure-resource-manager/management/tag-support.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -825,8 +825,8 @@ To get the same data as a file of comma-separated values, download [tag-support.
825825
> | Resource type | Supports tags | Tag in cost report |
826826
> | ------------- | ----------- | ----------- |
827827
> | availabilitySets | Yes | Yes |
828-
> | capacityReservationGroups | Yes | Yes |
829-
> | capacityReservationGroups / capacityReservations | Yes | Yes |
828+
> | capacityReservationGroups | No | No |
829+
> | capacityReservationGroups / capacityReservations | No | No |
830830
> | cloudServices | Yes | Yes |
831831
> | cloudServices / networkInterfaces | No | No |
832832
> | cloudServices / publicIPAddresses | No | No |

articles/virtual-desktop/host-pool-management-approaches.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.date: 10/01/2024
1010
# Host pool management approaches for Azure Virtual Desktop
1111

1212
> [!IMPORTANT]
13-
> Host pools with a session host configuration for Azure Virtual Desktop are currently in PREVIEW. This preview is provided as-is, with all faults and as available, and are excluded from the service-level agreements (SLAs) or any limited warranties Microsoft provides for Azure services in general availability.
13+
> Host pools with a session host configuration for Azure Virtual Desktop are currently in PREVIEW. This preview is provided as-is, with all faults and as available, and are excluded from the service-level agreements (SLAs) or any limited warranties Microsoft provides for Azure services in general availability. To register for the limited preview, complete this form: [https://forms.office.com/r/ZziQRGR1Lz](https://forms.office.com/r/ZziQRGR1Lz).
1414
>
1515
> See the [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/) for legal terms that apply to Azure features that are in beta, preview, or otherwise not yet released into general availability.
1616

articles/virtual-desktop/session-host-update-diagnostics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.date: 10/01/2024
1010
# Example diagnostic queries for session host update in Azure Virtual Desktop
1111

1212
> [!IMPORTANT]
13-
> Session host update for Azure Virtual Desktop is currently in PREVIEW. This preview is provided as-is, with all faults and as available, and are excluded from the service-level agreements (SLAs) or any limited warranties Microsoft provides for Azure services in general availability.
13+
> Session host update for Azure Virtual Desktop is currently in PREVIEW. This preview is provided as-is, with all faults and as available, and are excluded from the service-level agreements (SLAs) or any limited warranties Microsoft provides for Azure services in general availability. To register for the limited preview, complete this form: [https://forms.office.com/r/ZziQRGR1Lz](https://forms.office.com/r/ZziQRGR1Lz).
1414
>
1515
> See the [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/) for legal terms that apply to Azure features that are in beta, preview, or otherwise not yet released into general availability.
1616

articles/virtual-desktop/session-host-update.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.date: 10/01/2024
1010
# Session host update for Azure Virtual Desktop (preview)
1111

1212
> [!IMPORTANT]
13-
> Session host update for Azure Virtual Desktop is currently in PREVIEW. This preview is provided as-is, with all faults and as available, and are excluded from the service-level agreements (SLAs) or any limited warranties Microsoft provides for Azure services in general availability.
13+
> Session host update for Azure Virtual Desktop is currently in PREVIEW. This preview is provided as-is, with all faults and as available, and are excluded from the service-level agreements (SLAs) or any limited warranties Microsoft provides for Azure services in general availability. To register for the limited preview, complete this form: [https://forms.office.com/r/ZziQRGR1Lz](https://forms.office.com/r/ZziQRGR1Lz).
1414
>
1515
> See the [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/) for legal terms that apply to Azure features that are in beta, preview, or otherwise not yet released into general availability.
1616

articles/virtual-desktop/set-up-golden-image.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: bterkaly
99
---
1010
# Create a golden image in Azure
1111
This article will walk you through how to use the Azure portal to create a custom image to use for your Azure Virtual Desktop session hosts. This custom image, which we'll call a "golden image," contains all apps and configuration settings you want to apply to your deployment.
12-
There are other approaches to customizing your session hosts, such as using device management tools like [Microsoft Intune](/mem/intune/fundamentals/azure-virtual-desktop-multi-session) or automating your image build using tools like [Azure Image Builder](/azure/virtual-machines/windows/image-builder-virtual-desktop) with [Azure DevOps](/azure/devops/pipelines/get-started/key-pipelines-concepts?view=azure-devops&preserve-view=true). Which strategy works best depends on the complexity and size of your planned Azure Virtual Desktop environment and your current application deployment processes.
12+
There are other approaches to customizing your session hosts, such as using device management tools like [Microsoft Intune](/mem/intune/fundamentals/what-is-intune) or automating your image build using tools like [Azure Image Builder](/azure/virtual-machines/windows/image-builder-virtual-desktop) with [Azure DevOps](/azure/devops/pipelines/get-started/key-pipelines-concepts?view=azure-devops&preserve-view=true). Which strategy works best depends on the complexity and size of your planned Azure Virtual Desktop environment and your current application deployment processes.
1313
## Create an image from an Azure VM
1414
When creating a new VM for your golden image, make sure to choose an OS that's in the list of [supported virtual machine OS images](prerequisites.md#operating-systems-and-licenses). We recommend using a Windows 10 or 11 multi-session (with or without Microsoft 365) or Windows Server image for pooled host pools. We recommend using Windows 10 or 11 Enterprise images for personal host pools. You can use either Generation 1 or Generation 2 VMs; Gen 2 VMs support features that aren't supported for Gen 1 machines. Learn more about Generation 1 and Generation 2 VMs at [Support for generation 2 VMs on Azure](/azure/virtual-machines/generation-2).
1515
> [!IMPORTANT]

articles/virtual-desktop/troubleshoot-session-host-update.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.date: 10/01/2024
1010
# Troubleshoot session host update in Azure Virtual Desktop
1111

1212
> [!IMPORTANT]
13-
> Session host update for Azure Virtual Desktop is currently in PREVIEW. This preview is provided as-is, with all faults and as available, and are excluded from the service-level agreements (SLAs) or any limited warranties Microsoft provides for Azure services in general availability.
13+
> Session host update for Azure Virtual Desktop is currently in PREVIEW. This preview is provided as-is, with all faults and as available, and are excluded from the service-level agreements (SLAs) or any limited warranties Microsoft provides for Azure services in general availability. To register for the limited preview, complete this form: [https://forms.office.com/r/ZziQRGR1Lz](https://forms.office.com/r/ZziQRGR1Lz).
1414
>
1515
> See the [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/) for legal terms that apply to Azure features that are in beta, preview, or otherwise not yet released into general availability.
1616

articles/virtual-network/virtual-network-service-endpoint-policies-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ Virtual networks and Azure Storage accounts can be in the same or different subs
144144

145145
- You can only deploy service endpoint policies on virtual networks deployed through the Azure Resource Manager deployment model.
146146

147-
- Virtual networks must be in the same region as the service endpoint policy.
147+
- Virtual networks must be in the same region and subscription as the service endpoint policy.
148148

149149
- You can only apply service endpoint policy on a subnet if service endpoints are configured for the Azure services listed in the policy.
150150

0 commit comments

Comments
 (0)