Skip to content

Commit feaa70b

Browse files
authored
Merge pull request #57176 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 b545113 + 2f67204 commit feaa70b

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

articles/azure-resource-manager/resource-group-template-functions-resource.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,10 @@ The following [example template](https://github.com/Azure/azure-docs-json-sample
114114
"type": "string",
115115
"defaultValue": "southcentralus"
116116
},
117-
"requestContent": {
117+
"accountSasProperties": {
118118
"type": "object",
119119
"defaultValue": {
120120
"signedServices": "b",
121-
"signedResourceType": "c",
122121
"signedPermission": "r",
123122
"signedExpiry": "2018-08-20T11:00:00Z",
124123
"signedResourceTypes": "s"
@@ -160,7 +159,7 @@ The following [example template](https://github.com/Azure/azure-docs-json-sample
160159
},
161160
"accountSAS": {
162161
"type": "object",
163-
"value": "[listAccountSas(parameters('storagename'), '2018-02-01', parameters('requestContent'))]"
162+
"value": "[listAccountSas(parameters('storagename'), '2018-02-01', parameters('accountSasProperties'))]"
164163
}
165164
}
166165
}

articles/service-fabric-mesh/service-fabric-mesh-faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Ask questions, get answers from Microsoft engineers, and report issues in the [s
2121

2222
**What is the cost of participating in the preview?**
2323

24-
There are no charges for deploying applications or containers to the Mesh preview currently. However, we encourage you to to delete the resources you deploy and not leave them running unless you're actively testing them.
24+
There are no charges for deploying applications or containers to the Mesh preview currently. However, we encourage you to delete the resources you deploy and not leave them running unless you're actively testing them.
2525

2626
**Is there a quota limit of the number of cores and RAM?**
2727

articles/site-recovery/vmware-azure-manage-configuration-server.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Manage the configuration server for VMware and physical server disaster recovery with Azure Site Recovery | Microsoft Docs
3-
description: This article describes how to manage an existing configuration server for disaster recovery of VMware VMs and physical servers to Azure with Azure Site RecoveryS.
3+
description: This article describes how to manage an existing configuration server for disaster recovery of VMware VMs and physical servers to Azure with Azure Site Recovery.
44
author: rayne-wiselman
55
manager: carmonm
66
ms.service: site-recovery
@@ -133,10 +133,10 @@ You run update rollups to update the configuration server. Updates can be applie
133133
- If you run 9.7, 9.8, 9.9, or 9.10, you can upgrade directly to 9.11.
134134
- If you run 9.6 or earlier and you want to upgrade to 9.11, you must first upgrade to version 9.7. before 9.11.
135135
136-
Links to update rollups for upgrading to all versions of the configuration server are available in the [wiki updates page](https://social.technet.microsoft.com/wiki/contents/articles/38544.azure-site-recovery-service-updates.aspx).
136+
Links to update rollups for upgrading to all versions of the configuration server are available in the [Azure updates page](https://azure.microsoft.com/updates/?product=site-recovery).
137137
138138
> [!IMPORTANT]
139-
> With every new version 'N' of an Azure Site Recovery componenet that is released, all versions below 'N-4' is considered out of support. It is always advisable to upgrade to the latest versions available.
139+
> With every new version 'N' of an Azure Site Recovery component that is released, all versions below 'N-4' is considered out of support. It is always advisable to upgrade to the latest versions available.
140140
141141
Upgrade the server as follows:
142142

0 commit comments

Comments
 (0)