Skip to content

Commit fb784fc

Browse files
authored
Merge pull request #108625 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 4dfbcd5 + bfd9e96 commit fb784fc

File tree

8 files changed

+26
-17
lines changed

8 files changed

+26
-17
lines changed

articles/active-directory/develop/quickstart-v2-ios.md

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -267,25 +267,30 @@ self.applicationContext!.acquireToken(with: parameters) { (result, error) in /*
267267
Apps shouldn't require their users to sign in every time they request a token. If the user has already signed in, this method allows apps to request tokens silently.
268268
269269
```swift
270-
guard let account = try self.applicationContext!.allAccounts().first else { return }
271-
272-
let silentParams = MSALSilentTokenParameters(scopes: kScopes, account: account)
273-
self.applicationContext!.acquireTokenSilent(with: silentParams) { (result, error) in /* Add your handling logic */}
270+
self.applicationContext!.getCurrentAccount(with: nil) { (currentAccount, previousAccount, error) in
271+
272+
guard let account = currentAccount else {
273+
return
274+
}
275+
276+
let silentParams = MSALSilentTokenParameters(scopes: self.kScopes, account: account)
277+
self.applicationContext!.acquireTokenSilent(with: silentParams) { (result, error) in /* Add your handling logic */}
278+
}
274279
```
275280
276281
> |Where: ||
277282
> |---------|---------|
278283
> | `scopes` | Contains the scopes being requested (that is, `[ "user.read" ]` for Microsoft Graph or `[ "<Application ID URL>/scope" ]` for custom Web APIs (`api://<Application ID>/access_as_user`) |
279-
> | `account` | The account a token is being requested for. This quickstart is about a single account application. If you want to build a multi-account app you'll need to define logic to identify which account to use for token requests using `applicationContext.account(forHomeAccountId: self.homeAccountId)` |
284+
> | `account` | The account a token is being requested for. This quickstart is about a single account application. If you want to build a multi-account app you'll need to define logic to identify which account to use for token requests using `accountsFromDeviceForParameters:completionBlock:` and passing correct `accountIdentifier` |
280285
281286
## Next steps
282287
283-
Try out the iOS tutorial for a complete step-by-step guide on building applications, including a complete explanation of this quickstart.
288+
Try out the tutorial for iOS and macOS for a complete step-by-step guide on building applications, including a complete explanation of this quickstart.
284289
285290
### Learn how to create the application used in this quickstart
286291
287292
> [!div class="nextstepaction"]
288-
> [Call Graph API iOS tutorial](https://docs.microsoft.com/azure/active-directory/develop/guidedsetups/active-directory-ios)
293+
> [Call Graph API tutorial for iOS and macOS](https://docs.microsoft.com/azure/active-directory/develop/guidedsetups/active-directory-ios)
289294
290295
[!INCLUDE [Help and support](../../../includes/active-directory-develop-help-support-include.md)]
291296

articles/api-management/configure-custom-domain.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ When configuring DNS for your custom domain name, you have two options:
9090
- Configure an A-record that points to your API Management gateway IP address.
9191

9292
> [!NOTE]
93-
> Although the API Managment instance IP address is static, it may change in a few scenarios. Because of this it's recommended to use CNAME when configuring custom domain. Take that into consideration when choosing DNS configuration method. Read more in the [API Management FAQ](api-management-faq.md#how-can-i-secure-the-connection-between-the-api-management-gateway-and-my-back-end-services).
93+
> Although the API Managment instance IP address is static, it may change in a few scenarios. Because of this it's recommended to use CNAME when configuring custom domain. Take that into consideration when choosing DNS configuration method. Read more in the [the IP documentation article](api-management-howto-ip-addresses.md#changes-to-the-ip-addresses) and the [API Management FAQ](api-management-faq.md#how-can-i-secure-the-connection-between-the-api-management-gateway-and-my-back-end-services).
9494
9595
## Next steps
9696

articles/azure-monitor/app/create-new-resource.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ When your app has been created, a new pane opens. This pane is where you see per
3737

3838
## Copy the instrumentation key
3939

40-
The instrumentation key identifies the resource that you want to associate your telemetry data with. You will need copy to add the instrumentation key to your application's code.
40+
The instrumentation key identifies the resource that you want to associate your telemetry data with. You will need to copy the instrumentation key and add it to your application's code.
4141

4242
![Click and copy the instrumentation key](./media/create-new-resource/instrumentation-key.png)
4343

articles/azure-monitor/app/ilogger.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ The code in step 2 configures `ApplicationInsightsLoggerProvider`. The following
7474
```csharp
7575
public class ValuesController : ControllerBase
7676
{
77-
private readonly `ILogger` _logger;
77+
private readonly ILogger _logger;
7878

7979
public ValuesController(ILogger<ValuesController> logger)
8080
{
@@ -155,7 +155,7 @@ public class Program
155155
```csharp
156156
public class Startup
157157
{
158-
private readonly `ILogger` _logger;
158+
private readonly ILogger _logger;
159159

160160
public Startup(IConfiguration configuration, ILogger<Startup> logger)
161161
{

articles/azure-monitor/app/website-monitoring.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ If you plan to continue on to work with additional quickstarts or with the tutor
122122
> [!NOTE]
123123
> If you used an existing resource group the instructions below will not work and you will need to just delete the individual Application Insights resource. Keep in mind anytime you delete a resource group all underyling resources that are members of that group will be deleted.
124124
125-
1. From the left-hand menu in the Azure portal, click **Resource groups** and then click **myResourceGroup**.
125+
1. In the left menu in the Azure portal, click **Resource groups**, and then click **myResourceGroup** or the name of your temporary resource group.
126126
2. On your resource group page, click **Delete**, type **myResourceGroup** in the text box, and then click **Delete**.
127127
128128
## Next steps

articles/cosmos-db/consistency-levels-across-apis.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ When using Cassandra API or Azure Cosmos DB’s API for MongoDB, applications ge
2121

2222
Unlike Azure Cosmos DB, Apache Cassandra does not natively provide precisely defined consistency guarantees. Instead, Apache Cassandra provides a write consistency level and a read consistency level, to enable the high availability, consistency, and latency tradeoffs. When using Azure Cosmos DB’s Cassandra API:
2323

24-
* The write consistency level of Apache Cassandra is mapped to the default consistency level configured on your Azure Cosmos account.
24+
* The write consistency level of Apache Cassandra is mapped to the default consistency level configured on your Azure Cosmos account. Consistency for a write operation (CL) can't be changed on a per-request basis.
2525

2626
* Azure Cosmos DB will dynamically map the read consistency level specified by the Cassandra client driver to one of the Azure Cosmos DB consistency levels configured dynamically on a read request.
2727

@@ -39,7 +39,7 @@ While using Azure Cosmos DB’s API for MongoDB:
3939

4040
* The write concern is mapped to the default consistency level configured on your Azure Cosmos account.
4141

42-
* Azure Cosmos DB will dynamically map the read concern specified by the MongoDB client driver to one of the Azure Cosmos DB consistency levels that is configured dynamically on a read request.
42+
* Azure Cosmos DB will dynamically map the read concern specified by the MongoDB client driver to one of the Azure Cosmos DB consistency levels that is configured dynamically on a read request.
4343

4444
* You can annotate a specific region associated with your Azure Cosmos account as "Master" by making the region as the first writable region.
4545

articles/data-factory/source-control.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ The configuration pane shows the following GitHub repository settings:
136136
|:--- |:--- |:--- |
137137
| **Repository Type** | The type of the Azure Repos code repository. | GitHub |
138138
| **Use GitHub Enterprise** | Checkbox to select GitHub Enterprise | unselected (default) |
139-
| **GitHub Enterprise URL** | The GitHub Enterprise root URL. For example: https://github.mydomain.com. Required only if **Use GitHub Enterprise** is selected | `<your GitHub enterprise url>` |
139+
| **GitHub Enterprise URL** | The GitHub Enterprise root URL (must be HTTPS for local GitHub Enterprise server). For example: https://github.mydomain.com. Required only if **Use GitHub Enterprise** is selected | `<your GitHub enterprise url>` |
140140
| **GitHub account** | Your GitHub account name. This name can be found from https:\//github.com/{account name}/{repository name}. Navigating to this page prompts you to enter GitHub OAuth credentials to your GitHub account. | `<your GitHub account name>` |
141141
| **Repository Name** | Your GitHub code repository name. GitHub accounts contain Git repositories to manage your source code. You can create a new repository or use an existing repository that's already in your account. | `<your repository name>` |
142142
| **Collaboration branch** | Your GitHub collaboration branch that is used for publishing. By default, it's master. Change this setting in case you want to publish resources from another branch. | `<your collaboration branch>` |

articles/virtual-network/virtual-network-manage-peering.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,13 @@ Before creating a peering, familiarize yourself with the requirements and constr
5656
In addition to forwarding traffic to an on-premises network, a VPN gateway can forward network traffic between virtual networks that are peered with the virtual network the gateway is in, without the virtual networks needing to be peered with each other. Using a VPN gateway to forward traffic is useful when you want to use a VPN gateway in a hub (see the hub and spoke example described for **Allow forwarded traffic**) virtual network to route traffic between spoke virtual networks that aren't peered with each other. To learn more about allowing use of a gateway for transit, see [Configure a VPN gateway for transit in a virtual network peering](../vpn-gateway/vpn-gateway-peering-gateway-transit.md?toc=%2fazure%2fvirtual-network%2ftoc.json). This scenario requires implementing user-defined routes that specify the virtual network gateway as the next hop type. Learn about [user-defined routes](virtual-networks-udr-overview.md#user-defined). You can only specify a VPN gateway as a next hop type in a user-defined route, you cannot specify an ExpressRoute gateway as the next hop type in a user-defined route.
5757

5858
- **Use remote gateways:** Check this box to allow traffic from this virtual network to flow through a virtual network gateway attached to the virtual network you're peering with. For example, the virtual network you're peering with has a VPN gateway attached that enables communication to an on-premises network. Checking this box allows traffic from this virtual network to flow through the VPN gateway attached to the peered virtual network. If you check this box, the peered virtual network must have a virtual network gateway attached to it and must have the **Allow gateway transit** checkbox checked. If you leave this box unchecked (default), traffic from the peered virtual network can still flow to this virtual network, but cannot flow through a virtual network gateway attached to this virtual network.
59-
Only one peering for this virtual network can have this setting enabled.
59+
60+
Only one peering for this virtual network can have this setting enabled.
6061

61-
You cannot use remote gateways if you already have a gateway configured in your virtual network. To learn more about using a gateway for transit, see [Configure a VPN gateway for transit in a virtual network peering](../vpn-gateway/vpn-gateway-peering-gateway-transit.md?toc=%2fazure%2fvirtual-network%2ftoc.json)
62+
You can't use remote gateways if you already have a gateway configured in your virtual network. To learn more about using a gateway for transit, see [Configure a VPN gateway for transit in a virtual network peering](../vpn-gateway/vpn-gateway-peering-gateway-transit.md?toc=%2fazure%2fvirtual-network%2ftoc.json)
63+
64+
> [!NOTE]
65+
> If you use a Virtual Network Gateway to send on-premises traffic transitively to a peered VNet, the peered VNet IP range for the on-premises VPN device must be set to 'interesting' traffic. Otherwise, your on-premises resources won't be able to communicate with resources in the peered VNet.
6266
6367
6. Select **OK** to add the peering to the virtual network you selected.
6468

0 commit comments

Comments
 (0)