Skip to content

Commit 72b1fe1

Browse files
authored
Merge pull request #245762 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 a716cc3 + 88f5fd1 commit 72b1fe1

File tree

7 files changed

+29
-22
lines changed

7 files changed

+29
-22
lines changed

articles/active-directory/manage-apps/grant-admin-consent.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,11 @@ https://login.microsoftonline.com/{organization}/adminconsent?client_id={client-
8080
where:
8181

8282
- `{client-id}` is the application's client ID (also known as app ID).
83-
- `{organization}` is the tenant ID or any verified domain name of the tenant you want to consent the application in. You can use the value `common`, which will cause the consent to happen in the home tenant of the user you sign in with.
83+
- `{organization}` is the tenant ID or any verified domain name of the tenant you want to consent the application in. You can use the value `organizations`, which will cause the consent to happen in the home tenant of the user you sign in with.
8484

8585
As always, carefully review the permissions an application requests before granting consent.
8686

87+
For more information on constructing the tenant-wide admin consent URL, see [Admin consent on the Microsoft identity platform](../develop/v2-admin-consent.md).
8788

8889
:::zone-end
8990

articles/active-directory/manage-apps/home-realm-discovery-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ The json object is an example HRD policy definition:
110110
{
111111
"AccelerateToFederatedDomain":true,
112112
"PreferredDomain":"federated.example.edu",
113-
"AllowCloudPasswordValidation":false,
113+
"AllowCloudPasswordValidation":false
114114
}
115115
}
116116
```

articles/active-directory/saas-apps/ms-confluence-jira-plugin-adminguide.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Note the following information before you install the plug-in:
5959

6060
The plug-in supports the following versions of Jira and Confluence:
6161

62-
* Jira Core and Software: 6.0 to 9.8.1
62+
* Jira Core and Software: 6.0 to 9.10.0
6363
* Jira Service Desk: 3.0.0 to 4.22.1.
6464
* JIRA also supports 5.2. For more details, click [Microsoft Azure Active Directory single sign-on for JIRA 5.2](./jira52microsoft-tutorial.md).
6565
* Confluence: 5.0 to 5.10.
@@ -129,7 +129,7 @@ JIRA:
129129
|Plugin Version | Release Notes | Supported JIRA versions |
130130
|-----------------|-------------------------------------------------------------------------------------------|-------------------------------------|
131131
| 1.0.20 | Bug Fixes: | Jira Core and Software: |
132-
| | JIRA SAML SSO add-on redirects to incorrect URL from mobile browser. | 7.0.0 to 9.8.1 |
132+
| | JIRA SAML SSO add-on redirects to incorrect URL from mobile browser. | 7.0.0 to 9.10.0 |
133133
| | The mark log section after enabling the JIRA plugin. | |
134134
| | The last login date for a user doesn't update when user signs in via SSO. | |
135135
| | | |
@@ -207,7 +207,7 @@ No. The plug-in supports only on-premises versions of Jira and Confluence.
207207

208208
The plug-in supports these versions:
209209

210-
* Jira Core and Software: 6.0 to 9.8.1.
210+
* Jira Core and Software: 6.0 to 9.10.0
211211
* Jira Service Desk: 3.0.0 to 4.22.1.
212212
* JIRA also supports 5.2. For more details, click [Microsoft Azure Active Directory single sign-on for JIRA 5.2](./jira52microsoft-tutorial.md).
213213
* Confluence: 5.0 to 5.10.

articles/ai-services/openai/how-to/function-calling.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,10 @@ if response_message.get("function_call"):
125125
available_functions = {
126126
"search_hotels": search_hotels,
127127
}
128+
function_to_call = available_functions[function_name]
129+
128130
function_args = json.loads(response_message["function_call"]["arguments"])
129-
function_response = fuction_to_call(**function_args)
131+
function_response = function_to_call(**function_args)
130132

131133
# Add the assistant response and function response to the messages
132134
messages.append( # adding assistant response to messages
@@ -209,4 +211,4 @@ To learn more about our recommendations on how to use Azure OpenAI models respon
209211

210212
* [Learn more about Azure OpenAI](../overview.md).
211213
* For more examples on working with functions, check out the [Azure OpenAI Samples GitHub repository](https://aka.ms/oai/function-samples)
212-
* Get started with the GPT-35-Turbo model with [the GPT-35-Turbo quickstart](../chatgpt-quickstart.md).
214+
* Get started with the GPT-35-Turbo model with [the GPT-35-Turbo quickstart](../chatgpt-quickstart.md).

articles/ai-services/openai/use-your-data-quickstart.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: 'Use your own data with Azure OpenAI service'
2+
title: 'Use your own data with Azure OpenAI Service'
33
titleSuffix: Azure OpenAI
44
description: Use this article to import and use your data in Azure OpenAI.
55
services: cognitive-services

articles/aks/csi-storage-drivers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ The Container Storage Interface (CSI) is a standard for exposing arbitrary block
1212

1313
The CSI storage driver support on AKS allows you to natively use:
1414

15-
- [**Azure Disks**](azure-disk-csi.md) can be used to create a Kubernetes *DataDisk* resource. Disks can use Azure Premium Storage, backed by high-performance SSDs, or Azure Standard Storage, backed by regular HDDs or Standard SSDs. For most production and development workloads, use Premium Storage. Azure Disks are mounted as *ReadWriteOnce* and are only available to one node in AKS. For storage volumes that can be accessed by multiple pods simultaneously, use Azure Files.
15+
- [**Azure Disks**](azure-disk-csi.md) can be used to create a Kubernetes *DataDisk* resource. Disks can use Azure Premium Storage, backed by high-performance SSDs, or Azure Standard Storage, backed by regular HDDs or Standard SSDs. For most production and development workloads, use Premium Storage. Azure Disks are mounted as *ReadWriteOnce* and are only available to one node in AKS. For storage volumes that can be accessed by multiple nodes simultaneously, use Azure Files.
1616
- [**Azure Files**](azure-files-csi.md) can be used to mount an SMB 3.0/3.1 share backed by an Azure storage account to pods. With Azure Files, you can share data across multiple nodes and pods. Azure Files can use Azure Standard storage backed by regular HDDs or Azure Premium storage backed by high-performance SSDs.
1717
- [**Azure Blob storage**](azure-blob-csi.md) can be used to mount Blob storage (or object storage) as a file system into a container or pod. Using Blob storage enables your cluster to support applications that work with large unstructured datasets like log file data, images or documents, HPC, and others. Additionally, if you ingest data into [Azure Data Lake storage](../storage/blobs/data-lake-storage-introduction.md), you can directly mount and use it in AKS without configuring another interim filesystem.
1818

articles/azure-maps/set-map-style-ios-sdk.md

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,20 @@ title: Set a map style in iOS maps | Microsoft Azure Maps
33
description: Learn two ways of setting the style of a map. See how to use the Azure Maps iOS SDK in either the layout file or the activity class to adjust the style.
44
author: dubiety
55
ms.author: yuchungchen
6-
ms.date: 10/22/2021
6+
ms.date: 07/22/2023
77
ms.topic: how-to
88
ms.service: azure-maps
99
services: azure-maps
1010
---
1111

1212
# Set map style in the iOS SDK (Preview)
1313

14-
This article shows you two ways to set map styles using the Azure Maps iOS SDK. Azure Maps has six different maps styles to choose from. For more information about supported map styles, see [supported map styles in Azure Maps](supported-map-styles.md).
14+
This article shows you two ways to set map styles using the Azure Maps iOS SDK. Azure Maps has six different maps styles to choose from. For more information about supported map styles, see [supported map styles in Azure Maps].
1515

1616
## Prerequisites
1717

18-
Be sure to complete the steps in the [Quickstart: Create an iOS app](quick-ios-app.md) document.
19-
20-
> [!IMPORTANT]
21-
> The procedure in this section requires an Azure Maps account in Gen 1 or Gen 2 pricing tier. For more information on pricing tiers, see [Choose the right pricing tier in Azure Maps](choose-pricing-tier.md).
18+
- Complete the [Create an iOS app] quickstart.
19+
- An [Azure Maps account].
2220

2321
## Set map style in the map control init
2422

@@ -74,7 +72,7 @@ map.setCameraOptions([
7472
])
7573
```
7674

77-
Often it is desirable to focus the map over a set of data. A bounding box can be calculated from features using the `BoundingBox.fromData(_:)` method and can be passed into the `bounds` option of the map camera. When setting a map view based on a bounding box, it's often useful to specify a `padding` value to account for the point size of data points being rendered as bubbles or symbols. The following code shows how to set all optional camera options when using a bounding box to set the position of the camera.
75+
Often it's desirable to focus the map over a set of data. A bounding box can be calculated from features using the `BoundingBox.fromData(_:)` method and can be passed into the `bounds` option of the map camera. When setting a map view based on a bounding box, it's often useful to specify a `padding` value to account for the point size of data points being rendered as bubbles or symbols. The following code shows how to set all optional camera options when using a bounding box to set the position of the camera.
7876

7977
```swift
8078
//Set the camera of the map using a bounding box.
@@ -90,16 +88,16 @@ map.setCameraBoundsOptions([
9088
])
9189
```
9290

93-
The aspect ratio of a bounding box may not be the same as the aspect ratio of the map, as such the map will often show the full bounding box area, but will often only be tight vertically or horizontally.
91+
The aspect ratio of a bounding box may not be the same as the aspect ratio of the map, as such the map often shows the full bounding box area, and are often only tight vertically or horizontally.
9492

9593
### Animate map view
9694

9795
When setting the camera options of the map, animation options can also be used to create a transition between the current map view and the next. These options specify the type of animation and duration it should take to move the camera.
9896

9997
| Option | Description |
10098
|--------|-------------|
101-
| `animationDuration(_ duration: Double)` | Specifies how long the camera will animate between the views in milliseconds (ms). |
102-
| `animationType(_ animationType: AnimationType)` | Specifies the type of animation transition to perform.<br/><br/> - `.jump` - an immediate change.<br/> - `.ease` - gradual change of the camera's settings.<br/> - `.fly` - gradual change of the camera's settings following an arc resembling flight. |
99+
| `animationDuration(_ duration: Double)` | Specifies how long the camera animates between the views in milliseconds (ms). |
100+
| `animationType(_ animationType: AnimationType)` | Specifies the type of animation transition to perform.<br><br> - `.jump` - an immediate change.<br> - `.ease` - gradual change of the camera's settings.<br> - `.fly` - gradual change of the camera's settings following an arc resembling flight. |
103101

104102
The following code shows how to animate the map view using a `.fly` animation over a duration of three seconds.
105103

@@ -112,13 +110,19 @@ map.setCameraOptions([
112110
])
113111
```
114112

115-
The following demonstrates the above code animating the map view from New York to Seattle.
113+
The following animation demonstrates the above code animating the map view from New York to Seattle.
116114

117115
:::image type="content" source="./media/ios-sdk/set-map-style-ios/ios-animate-camera.gif" alt-text="Map animating the camera from New York to Seattle.":::
118116

119117
## Additional information
120118

121119
See the following articles for more code samples to add to your maps:
122120

123-
- [Add a symbol layer](add-symbol-layer-ios.md)
124-
- [Add a bubble layer](add-bubble-layer-map-ios.md)
121+
- [Add a symbol layer]
122+
- [Add a bubble layer]
123+
124+
[Add a bubble layer]: add-bubble-layer-map-ios.md
125+
[Add a symbol layer]: add-symbol-layer-ios.md
126+
[Azure Maps account]: https://azure.microsoft.com/services/azure-maps
127+
[Create an iOS app]: quick-ios-app.md
128+
[supported map styles in Azure Maps]: supported-map-styles.md

0 commit comments

Comments
 (0)