Skip to content

Commit 14258f8

Browse files
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into pauljewell-js-download
2 parents 95cad96 + 6e7a4bc commit 14258f8

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

articles/app-service/tutorial-multi-container-app.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ To connect the WordPress app to this new MySQL server, you'll configure a few Wo
203203
To make these changes, use the [az webapp config appsettings set](/cli/azure/webapp/config/appsettings#az-webapp-config-appsettings-set) command in Cloud Shell. App settings are case-sensitive and space-separated.
204204

205205
```azurecli-interactive
206-
az webapp config appsettings set --resource-group myResourceGroup --name <app-name> --settings WORDPRESS_DB_HOST="<mysql-server-name>.mysql.database.azure.com" WORDPRESS_DB_USER="adminuser@<mysql-server-name>" WORDPRESS_DB_PASSWORD="My5up3rStr0ngPaSw0rd!" WORDPRESS_DB_NAME="wordpress" MYSQL_SSL_CA="BaltimoreCyberTrustroot.crt.pem"
206+
az webapp config appsettings set --resource-group myResourceGroup --name <app-name> --settings WORDPRESS_DB_HOST="<mysql-server-name>.mysql.database.azure.com" WORDPRESS_DB_USER="adminuser" WORDPRESS_DB_PASSWORD="My5up3rStr0ngPaSw0rd!" WORDPRESS_DB_NAME="wordpress" MYSQL_SSL_CA="BaltimoreCyberTrustroot.crt.pem"
207207
```
208208

209209
When the app setting has been created, Cloud Shell shows information similar to the following example:
@@ -218,7 +218,7 @@ When the app setting has been created, Cloud Shell shows information similar to
218218
{
219219
"name": "WORDPRESS_DB_USER",
220220
"slotSetting": false,
221-
"value": "adminuser@&lt;mysql-server-name&gt;"
221+
"value": "adminuser"
222222
},
223223
{
224224
"name": "WORDPRESS_DB_NAME",
@@ -424,7 +424,7 @@ When the app setting has been created, Cloud Shell shows information similar to
424424
{
425425
"name": "WORDPRESS_DB_USER",
426426
"slotSetting": false,
427-
"value": "adminuser@&lt;mysql-server-name&gt;"
427+
"value": "adminuser"
428428
},
429429
{
430430
"name": "WP_REDIS_HOST",

articles/backup/back-up-azure-stack-hyperconverged-infrastructure-virtual-machines.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.author: v-amallick
1010

1111
# Back up Azure Stack HCI virtual machines with Azure Backup Server
1212

13-
This article explains how to back up virtual machines on Azure Stack HCI using Microsoft Azure Backup Server (MABS).
13+
This article describes how to back up virtual machines on Azure Stack HCI using Microsoft Azure Backup Server (MABS).
1414

1515
## Supported scenarios
1616

@@ -57,13 +57,13 @@ These are the prerequisites for backing up virtual machines with MABS:
5757

5858
2. Set up the MABS protection agent on the server or each cluster node.
5959

60-
3. In the MABS Administrator console, select **Protection** > **Create protection group** to open the **Create New Protection Group** wizard.
60+
3. On the MABS Administrator console, select **Protection** > **Create protection group** to open the **Create New Protection Group** wizard.
6161

6262
4. On the **Select Group Members** page, select the VMs you want to protect from the host servers on which they're located. We recommend you put all VMs that will have the same protection policy into one protection group. To make efficient use of space, enable colocation. Colocation allows you to locate data from different protection groups on the same disk or tape storage, so that multiple data sources have a single replica and recovery point volume.
6363

6464
5. On the **Select Data Protection Method** page, specify a protection group name. Select **I want short-term protection using Disk** and select **I want online protection** if you want to back up data to Azure using the Azure Backup service.
6565

66-
6. In **Specify Short-Term Goals** > **Retention range**, specify how long you want to retain disk data. In **Synchronization frequency**, specify how often incremental backups of the data should run. Alternatively, instead of selecting an interval for incremental backups you can enable **Just before a recovery point**. With this setting enabled, MABS will run an express full backup just before each scheduled recovery point.
66+
6. On **Specify Short-Term Goals** > **Retention range**, specify how long you want to retain disk data. In **Synchronization frequency**, specify how often incremental backups of the data should run. Alternatively, instead of selecting an interval for incremental backups you can enable **Just before a recovery point**. With this setting enabled, MABS will run an express full backup just before each scheduled recovery point.
6767

6868
> [!NOTE]
6969
>If you're protecting application workloads, recovery points are created in accordance with Synchronization frequency, provided the application supports incremental backups. If it doesn't, then MABS runs an express full backup, instead of an incremental backup, and creates recovery points in accordance with the express backup schedule.<br></br>The backup process doesn't back up the checkpoints associated with VMs.

articles/governance/management-groups/overview.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Organize your resources with management groups - Azure Governance
33
description: Learn about the management groups, how their permissions work, and how to use them.
4-
ms.date: 05/25/2022
4+
ms.date: 01/03/2023
55
ms.topic: overview
66
author: timwarner-msft
77
ms.author: timwarner
@@ -257,11 +257,9 @@ There are limitations that exist when using custom roles on management groups.
257257
restriction is in place as there's a latency issue with updating the data plane resource
258258
providers. This latency issue is being worked on and these actions will be disabled from the role
259259
definition to reduce any risks.
260-
- The Azure Resource Manager doesn't validate the management group's existence in the role
260+
- Azure Resource Manager doesn't validate the management group's existence in the role
261261
definition's assignable scope. If there's a typo or an incorrect management group ID listed, the
262262
role definition is still created.
263-
- Role assignment of a role with _dataActions_ isn't supported. Create the role assignment at the
264-
subscription scope instead.
265263

266264
> [!IMPORTANT]
267265
> Adding a management group to `AssignableScopes` is currently in preview. This preview version is

0 commit comments

Comments
 (0)