Skip to content

Commit 3573693

Browse files
authored
Merge pull request #284883 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 5a0c983 + 9cbd34f commit 3573693

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

articles/virtual-machines/auto-shutdown-vm.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ Sign in to the [Azure portal](https://portal.azure.com/).
2222
2. In the virtual machine's detail page, select "Auto-shutdown" under the **Operations** section.
2323
3. In the "Auto-shutdown" configuration screen, toggle the switch to "On."
2424
4. Set the time you want the virtual machine to shut down.
25-
5. Select "Save" to save the auto-shutdown configuration.
25+
5. If you want to receive notification before shutdown, select "Yes" in the "Send notification before shutdown" option and provide details in "Email Address" or "Webhook URL" as per your choice.
26+
6. Select "Save" to save the auto-shutdown configuration.
2627

2728
### [Azure CLI](#tab/azure-cli)
2829

articles/virtual-machines/azure-compute-gallery.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ There are limits, per subscription, for deploying resources using Azure Compute
4949
- 1,000 image definitions, per subscription, per region
5050
- 10,000 image versions, per subscription, per region
5151
- 100 replicas per image version however 50 replicas should be sufficient for most use cases
52-
- Any disk attached to the image must be less than or equal to 1 TB in size
52+
- Any disk attached to the image must be less than or equal to 2 TB in size
5353
- Resource move isn't supported for Azure compute gallery resources
5454

5555
For more information, see [Check resource usage against limits](../networking/check-usage-against-limits.md) for examples on how to check your current usage.

articles/virtual-machines/enable-nvme-interface.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ For more information about enabling the NVMe interface on virtual machines creat
2626
| Almalinux 8.x (currently 8.7) | almalinux: almalinux:8-gen2: latest |
2727
| Almalinux 9.x (currently 9.1) | almalinux: almalinux:9-gen2: latest |
2828
| Debian 11 | Debian: debian-11:11-gen2: latest |
29+
| Debian 12 | Debian: debian-12:12-gen2: latest
2930
| RHEL 7.9 | RedHat: RHEL:79-gen2: latest |
3031
| RHEL 8.6 | RedHat: RHEL:86-gen2: latest |
3132
| RHEL 8.7 | RedHat: RHEL:87-gen2: latest |

articles/virtual-machines/linux/tutorial-lemp-stack.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ Results:
643643

644644
The following example creates a VM named `$MY_VM_NAME` and creates SSH keys if they don't already exist in a default key location. The command also sets `$MY_VM_USERNAME` as an administrator user name.
645645

646-
To improve the security of Linux virtual machines in Azure, you can integrate with Azure Active Directory authentication. Now you can use Azure AD as a core authentication platform. You can also SSH into the Linux VM by using Azure AD and OpenSSH certificate-based authentication. This functionality allows organizations to manage access to VMs with Azure role-based access control and Conditional Access policies.
646+
To improve the security of Linux virtual machines in Azure, you can integrate with Microsoft Entra ID authentication. Now you can use Microsoft Entra ID as a core authentication platform. You can also SSH into the Linux VM by using Microsoft Entra ID and OpenSSH certificate-based authentication. This functionality allows organizations to manage access to VMs with Azure role-based access control and Conditional Access policies.
647647

648648
Create a VM with the [az vm create](/cli/azure/vm#az-vm-create) command.
649649

@@ -708,7 +708,7 @@ done
708708
```
709709

710710
<!--
711-
## Assign Azure AD RBAC for Azure AD login for Linux Virtual Machine
711+
## Assign Microsoft Entra ID RBAC for Microsoft Entra ID login for Linux Virtual Machine
712712
The below command uses [az role assignment create](https://learn.microsoft.com/cli/azure/role/assignment#az-role-assignment-create) to assign the `Virtual Machine Administrator Login` role to the VM for your current Azure user.
713713
```bash
714714
export MY_RESOURCE_GROUP_ID=$(az group show --resource-group $MY_RESOURCE_GROUP_NAME --query id -o tsv)
@@ -743,15 +743,15 @@ Results:
743743

744744
<!--
745745
## Export the SSH configuration for use with SSH clients that support OpenSSH
746-
Login to Azure Linux VMs with Azure AD supports exporting the OpenSSH certificate and configuration. That means you can use any SSH clients that support OpenSSH-based certificates to sign in through Azure AD. The following example exports the configuration for all IP addresses assigned to the VM:
746+
Login to Azure Linux VMs with Microsoft Entra ID supports exporting the OpenSSH certificate and configuration. That means you can use any SSH clients that support OpenSSH-based certificates to sign in through Microsoft Entra ID. The following example exports the configuration for all IP addresses assigned to the VM:
747747
```bash
748748
az ssh config --file ~/.ssh/azure-config --name $MY_VM_NAME --resource-group $MY_RESOURCE_GROUP_NAME
749749
```
750750
-->
751751

752-
## Enable Azure AD login for a Linux Virtual Machine in Azure
752+
## Enable Microsoft Entra ID login for a Linux Virtual Machine in Azure
753753

754-
The following installs the extension to enable Azure AD login for a Linux VM. VM extensions are small applications that provide post-deployment configuration and automation tasks on Azure virtual machines.
754+
The following installs the extension to enable Microsoft Entra ID login for a Linux VM. VM extensions are small applications that provide post-deployment configuration and automation tasks on Azure virtual machines.
755755

756756
```bash
757757
az vm extension set \

0 commit comments

Comments
 (0)