Skip to content

Commit 9ee3846

Browse files
authored
Merge pull request #42813 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 59131d8 + 9247509 commit 9ee3846

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

articles/azure-policy/policy-effects.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -279,9 +279,9 @@ related resources to match and the template deployment to execute.
279279
- For _Subscription_, queries the entire subscription for the related resource.
280280
- Default is _ResourceGroup_.
281281
- **ExistenceCondition** (optional)
282-
- If not specified, any related resource of **type** satisfies the effect and does not trigger the audit.
282+
- If not specified, any related resource of **type** satisfies the effect and does not trigger the deployment.
283283
- Uses the same language as the policy rule for the **if** condition, but is evaluated against each related resource individually.
284-
- If any matching related resource evaluates to true, the effect is satisfied and does not trigger the audit.
284+
- If any matching related resource evaluates to true, the effect is satisfied and does not trigger the deployment.
285285
- Can use [field()] to check equivalence with values in the **if** condition.
286286
- As an example, this could be used to validate that the parent resource (in the **if** condition) is in the same resource location as the matching related resource.
287287
- **Deployment** [required]
@@ -347,4 +347,4 @@ not, then a deployment to enable it is executed.
347347

348348
Now that you have a deeper understanding of policy definition effects, review the policy samples:
349349

350-
- Review more examples at [Azure Policy samples](json-samples.md).
350+
- Review more examples at [Azure Policy samples](json-samples.md).

articles/backup/backup-azure-restore-files-from-vm.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.author: pullabhk
1212
---
1313
# Recover files from Azure virtual machine backup
1414

15-
Azure Backup provides the capability to restore [Azure virtual machines (VMs) and disks](./backup-azure-arm-restore-vms.md) from Azure VM backups, also known as restore points. This article explains how to recover files and folders from an Azure VM backup. Restoring files and folders is available only for Azure VMs deployed using the Resource Manager model and protected to a Recovery services vault.
15+
Azure Backup provides the capability to restore [Azure virtual machines (VMs) and disks](./backup-azure-arm-restore-vms.md) from Azure VM backups, also known as recovery points. This article explains how to recover files and folders from an Azure VM backup. Restoring files and folders is available only for Azure VMs deployed using the Resource Manager model and protected to a Recovery services vault.
1616

1717
> [!Note]
1818
> This feature is available for Azure VMs deployed using the Resource Manager model and protected to a Recovery Services vault.
@@ -21,7 +21,7 @@ Azure Backup provides the capability to restore [Azure virtual machines (VMs) an
2121
2222
## Mount the volume and copy files
2323

24-
To restore files or folders from the restore point, go to the virtual machine and choose to the restore point.
24+
To restore files or folders from the recovery point, go to the virtual machine and choose the desired recovery point.
2525

2626
1. Sign into the [Azure portal](http://portal.Azure.com) and in the left-hand menu, click **Virtual machines**. From the list of virtual machines, select the virtual machine to open that virtual machine's dashboard.
2727

articles/key-vault/key-vault-access-behind-firewall.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ For all key vault object (keys and secrets) management and cryptographic operati
5757
| Operations including cryptographic operations on keys; creating, reading, updating, and deleting keys and secrets; setting or getting tags and other attributes on key vault objects (keys or secrets) |**Global:**<br> &lt;vault-name&gt;.vault.azure.net:443<br><br> **Azure China:**<br> &lt;vault-name&gt;.vault.azure.cn:443<br><br> **Azure US Government:**<br> &lt;vault-name&gt;.vault.usgovcloudapi.net:443<br><br> **Azure Germany:**<br> &lt;vault-name&gt;.vault.microsoftazure.de:443 |
5858

5959
## IP address ranges
60-
The Key Vault service uses other Azure resources like PaaS infrastructure. So it's not possible to provide a specific range of IP addresses that Key Vault service endpoints will have at any particular time. If your firewall supports only IP address ranges, refer to the [Microsoft Azure Datacenter IP Ranges](https://www.microsoft.com/download/details.aspx?id=41653) document. For authentication and identity (Azure Active Directory), your application must be able to connect to the endpoints described in [Authentication and identity addresses](https://support.office.com/article/Office-365-URLs-and-IP-address-ranges-8548a211-3fe7-47cb-abb1-355ea5aa88a2).
60+
The Key Vault service uses other Azure resources like PaaS infrastructure. So it's not possible to provide a specific range of IP addresses that Key Vault service endpoints will have at any particular time. If your firewall supports only IP address ranges, refer to the [Microsoft Azure Datacenter IP Ranges](https://www.microsoft.com/download/details.aspx?id=41653) document. Authentication and Identity (Azure Active Directory) is a global service and may fail over to other regions or move traffic without notice. In this scenario, all of the IP ranges listed in [Authentication and Identity IP Addresses](https://support.office.com/article/Office-365-URLs-and-IP-address-ranges-8548a211-3fe7-47cb-abb1-355ea5aa88a2#bkmk_identity_ip) should be added to the firewall.
6161

6262
## Next steps
6363
If you have questions about Key Vault, visit the [Azure Key Vault Forums](https://social.msdn.microsoft.com/forums/azure/home?forum=AzureKeyVault).

0 commit comments

Comments
 (0)