Skip to content

Commit a312861

Browse files
authored
Merge pull request #302823 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 e9f5ce4 + 52c2096 commit a312861

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

articles/app-service/overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Whether you're a student, a small business, a startup, or an enterprise, App Ser
3535
- **Command-line friendly**: Deploy using command line tools you already use, such as Maven, Gradle, Azure Developer CLI, Azure CLI, and Azure PowerShell.
3636
- **Scalability**: Automatically scale your applications based on demand.
3737
- **Global reach**: Deploy your apps in data centers around the world.
38-
- **Application templates**: Choose from an extensive list of application templates in the [Azure Marketplace](https://azure.microsoft.com/marketplace/), such as WordPress, Joomla, and Drupal.
38+
- **Application templates**: Choose from an extensive list of application templates in the [Azure Marketplace](https://azure.microsoft.com/marketplace/), such as WordPress, Joomla, Django , Node.js and Drupal.
3939
- **Social sign-in support**: Turn-key social sign-in with [Google](configure-authentication-provider-google.md), [Facebook](configure-authentication-provider-facebook.md), [X](configure-authentication-provider-twitter.md), and [Microsoft accounts](configure-authentication-provider-microsoft.md).
4040

4141
### Enterprises
@@ -51,4 +51,4 @@ For information about which Azure compute services best fit your scenario, see [
5151

5252
## Next Steps
5353

54-
- [Getting started with Azure App Service](getting-started.md)
54+
- [Getting started with Azure App Service](getting-started.md)

articles/operator-nexus/howto-virtual-machine-image.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Ensure you have an operational Azure Container Registry (ACR) and Docker install
3434

3535
* Ensure your Virtual Network Function (VNF) image is in qcow2 format that can boot with cloud-init.
3636

37-
* You need to configure the bootloader, kernel, and init system in your image to enable a text-based serial console. This configuration is required to enable console support for your virtual machine (VM). Make sure the serial port settings on your system and terminal match to establish proper communication.
37+
* You need to configure the bootloader, kernel, and init system in your image to enable both serial connectivity and text-based console. Use both GRUB_TERMINAL="console serial" and kernel cmdline settings. This configuration is required to enable serial access for troubleshooting deployment issues and console support for your virtual machine (VM) after deployment. Make sure the serial port settings on your system and terminal match to establish proper communication.
3838

3939
* You need to ensure your VM image supports cloud-init version 2, enabling advanced configuration options during the VM initialization process.
4040

0 commit comments

Comments
 (0)