Skip to content

Commit cf7b534

Browse files
authored
Merge pull request #230641 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 07cd4c7 + c7aeb69 commit cf7b534

File tree

24 files changed

+58
-35
lines changed

24 files changed

+58
-35
lines changed

articles/active-directory/authentication/concept-system-preferred-multifactor-authentication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ System-preferred MFA can be enabled only for a single group, which can be a dyna
5050
Use the following API endpoint to enable **systemCredentialPreferences** and include or exclude groups:
5151

5252
```
53-
https://graph.microsoft.com/beta/authenticationMethodsPolicy
53+
https://graph.microsoft.com/beta/policies/authenticationMethodsPolicy
5454
```
5555

5656
>[!NOTE]

articles/active-directory/fundamentals/users-default-permissions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Applications | <ul><li>Register (create) new applications<li>Enumerate the list
4040
Devices</li></ul> | <ul><li>Enumerate the list of all devices<li>Read all properties of devices<li>Manage all properties of owned devices</li></ul> | No permissions | No permissions
4141
Organization | <ul><li>Read all company information<li>Read all domains<li>Read configuration of certificate-based authentication<li>Read all partner contracts</li></ul> | <ul><li>Read company display name<li>Read all domains<li>Read configuration of certificate-based authentication</li></ul> | <ul><li>Read company display name<li>Read all domains</li></ul>
4242
Roles and scopes | <ul><li>Read all administrative roles and memberships<li>Read all properties and membership of administrative units</li></ul> | No permissions | No permissions
43-
Subscriptions | <ul><li>Read all subscriptions<li>Enable service plan memberships</li></ul> | No permissions | No permissions
43+
Subscriptions | <ul><li>Read all licensing subscriptions<li>Enable service plan memberships</li></ul> | No permissions | No permissions
4444
Policies | <ul><li>Read all properties of policies<li>Manage all properties of owned policies</li></ul> | No permissions | No permissions
4545

4646
## Restrict member users' default permissions

articles/active-directory/manage-apps/configure-admin-consent-workflow.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ To enable the admin consent workflow and choose reviewers:
5252

5353
1. Select **Save**. It can take up to an hour for the workflow to become enabled.
5454

55-
> [!NOTE]
56-
> You can add or remove reviewers for this workflow by modifying the **Select admin consent requests reviewers** list. A current limitation of this feature is that a reviewer can retain the ability to review requests that were made while they were designated as a reviewer.
55+
> [!NOTE]
56+
> You can add or remove reviewers for this workflow by modifying the **Who can review admin consent requests** list. A current limitation of this feature is that a reviewer can retain the ability to review requests that were made while they were designated as a reviewer.
5757
5858
## Configure the admin consent workflow using Microsoft Graph
5959

0 Bytes
Loading

articles/active-directory/saas-apps/confluencemicrosoft-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ As of now, following versions of Confluence are supported:
6060

6161
- Confluence: 5.0 to 5.10
6262
- Confluence: 6.0.1 to 6.15.9
63-
- Confluence: 7.0.1 to 7.20.0
63+
- Confluence: 7.0.1 to 8.1.0
6464

6565
> [!NOTE]
6666
> Please note that our Confluence Plugin also works on Ubuntu Version 16.04

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

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ The plug-in supports the following versions of Jira and Confluence:
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.
6666
* Confluence: 6.0.1 to 6.15.9.
67-
* Confluence: 7.0.1 to 7.20.0.
67+
* Confluence: 7.0.1 to 8.1.0.
6868

6969
## Installation
7070

@@ -124,6 +124,7 @@ The following image shows the configuration screen in both Jira and Confluence:
124124

125125
* For App proxy setup , follow the steps on the [Azure AD App Proxy Documentation](../app-proxy/what-is-application-proxy.md).
126126
## Release Notes
127+
JIRA:
127128

128129
|Plugin Version | Release Notes | Supported JIRA versions |
129130
|-----------------|-------------------------------------------------------------------------------------------|-------------------------------------|
@@ -143,7 +144,20 @@ The following image shows the configuration screen in both Jira and Confluence:
143144
| | We have now resolved the security fix in this version. This will protect you from user impersonation vulnerability.| |
144145
| | JIRA Service Desk logout issue is resolved. | |
145146

146-
147+
Confluence:
148+
149+
|Plugin Version | Release Notes | Supported JIRA versions |
150+
|-----------------|-------------------------------------------------------------------------------------------|-------------------------------------|
151+
| 6.3.9 | Bug Fixes: | Confluence Server: 7.20.3 to 8.1.0 |
152+
| | System Error: Metadata link cannot be configured on SSO plugins. | |
153+
| | | |
154+
| 6.3.8 | New Feature: | Confluence Server: 5.0 to 7.20.1 |
155+
| | Application Proxy Support - Checkbox on the configure plugin screen to toggle the App Proxy mode so as to make the Reply URL editable as per the need to point it to the proxy server URL | |
156+
| | | |
157+
| 6.3.7 | Bug Fixes: | Confluence Server: 5.0 to 7.19.0 |
158+
| | "Force Login" functionality allows the IT admins to force the Azure AD authentication to users. This way users will not see the username and password box and they will be forced to use SSO. | |
159+
| | "Force Login" is configurable from the plugin | |
160+
| | You can pass the domain string to Azure AD so that Azure AD can directly redirect the user to your Federation server.| |
147161

148162
## Troubleshooting
149163

@@ -198,7 +212,7 @@ The plug-in supports these versions:
198212
* JIRA also supports 5.2. For more details, click [Microsoft Azure Active Directory single sign-on for JIRA 5.2](./jira52microsoft-tutorial.md).
199213
* Confluence: 5.0 to 5.10.
200214
* Confluence: 6.0.1 to 6.15.9.
201-
* Confluence: 7.0.1 to 7.20.0.
215+
* Confluence: 7.0.1 to 8.1.0.
202216

203217
### Is the plug-in free or paid?
204218

articles/api-management/self-hosted-gateway-settings-reference.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ This article provides a reference for required and optional settings that are us
6060
| Name | Description | Required | Default |
6161
| ------------- | ------------- | ------------- | ----|
6262
| certificates.local.ca.enabled | Indication whether or not to the self-hosted gateway should use local CA certificates that are mounted. It's required to run the self-hosted gateway as root or with user ID 1001. | No | `false` |
63-
| net.server.tls.ciphers.allowed-suites | Comma-separated list of ciphers to use for TLS connection between API client and the self-hosted gateway. | No | N/A |
64-
| net.client.tls.ciphers.allowed-suites | Comma-separated list of ciphers to use for TLS connection between the self-hosted gateway and the backend. | No | N/A |
63+
| net.server.tls.ciphers.allowed-suites | Comma-separated list of ciphers to use for TLS connection between API client and the self-hosted gateway. | No | `TLS_AES_256_GCM_SHA384,TLS_CHACHA20_POLY1305_SHA256,TLS_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_DHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384,TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,TLS_DHE_RSA_WITH_AES_256_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_CBC_SHA256,TLS_RSA_WITH_AES_128_CBC_SHA256,TLS_RSA_WITH_AES_256_CBC_SHA,TLS_RSA_WITH_AES_128_CBC_SHA` |
64+
| net.client.tls.ciphers.allowed-suites | Comma-separated list of ciphers to use for TLS connection between the self-hosted gateway and the backend. | No | `TLS_AES_256_GCM_SHA384,TLS_CHACHA20_POLY1305_SHA256,TLS_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_DHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384,TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,TLS_DHE_RSA_WITH_AES_256_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_CBC_SHA256,TLS_RSA_WITH_AES_128_CBC_SHA256,TLS_RSA_WITH_AES_256_CBC_SHA,TLS_RSA_WITH_AES_128_CBC_SHA` |
6565

6666
## How to configure settings
6767

articles/cognitive-services/Computer-vision/concept-describe-images-40.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.custom: seodec18, ignite-2022, references_regions
1515
---
1616

1717
# Image captions (version 4.0 preview)
18-
Image captions in Image Analysis 4.0 (preview) are available through the Caption and Dense Captions features.
18+
Image captions in Image Analysis 4.0 (preview) are available through the **Caption** and **Dense Captions** features.
1919

2020
Caption generates a one sentence description for all image contents. Dense Captions provides more detail by generating one sentence descriptions of up to 10 regions of the image in addition to describing the whole image. Dense Captions also returns bounding box coordinates of the described image regions. Both these features use the latest groundbreaking Florence based AI models.
2121

@@ -35,7 +35,7 @@ Try out the image captioning features quickly and easily in your browser using V
3535
> [!div class="nextstepaction"]
3636
> [Try Vision Studio](https://portal.vision.cognitive.azure.com/)
3737
38-
## Caption example
38+
## Caption and Dense Captions examples
3939

4040
#### [Caption](#tab/image)
4141

articles/cognitive-services/openai/includes/create-resource-cli.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.subservice: openai
99
ms.custom: devx-track-azurecli
1010
ms.topic: include
1111
ms.date: 6/30/2022
12-
keywords:
12+
keywords:
1313
---
1414

1515
## Prerequisites
@@ -44,8 +44,7 @@ az cognitiveservices account create \
4444
--kind OpenAI \
4545
--sku s0 \
4646
--subscription 00000000-0000-0000-0000-000000000000
47-
```
48-
47+
```
4948

5049
## Retrieve information from your resource
5150
Once your resource has been created, you can use the Azure CLI to find useful information about your service such as your REST API endpoint base URL and the access keys. Below are examples on how to do both. You can find the full [reference documentation here](/cli/azure/cognitiveservices/account?view=azure-cli-latest&preserve-view=true).
@@ -70,11 +69,12 @@ Once your resource has been created, you can use the Azure CLI to find useful in
7069

7170
To deploy a model, you can use the Azure CLI to run the following command to deploy an instance of text-curie-001. In this example, we deploy a model called MyModel. Make sure to update with your own values. You don't need to change the `model-version`, `model-format` or `scale-settings-scale-type` values. You can find the full [reference documentation here](/cli/azure/cognitiveservices/account/deployment?view=azure-cli-latest&preserve-view=true).
7271

72+
7373
```azurecli
7474
az cognitiveservices account deployment create \
7575
-g $myResourceGroupName \
7676
-n $myResourceName \
77-
-deployment-name MyModel \
77+
--deployment-name MyModel \
7878
--model-name text-curie-001 \
7979
--model-version "1" \
8080
--model-format OpenAI \
@@ -104,3 +104,4 @@ az cognitiveservices account delete \
104104
--name MyOpenAIResource \
105105
-g OAIResourceGroup
106106
```
107+

articles/communication-services/concepts/troubleshooting-info.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ The Azure Communication Services Calling SDK uses the following error codes to h
323323
| 480 | Remote client endpoint not registered. | Ensure that the remote endpoint is available. |
324324
| 481 | Failed to handle incoming call. | File a support request through the Azure portal. |
325325
| 487 | Call canceled, locally declined, ended due to an endpoint mismatch issue, or failed to generate media offer. | Expected behavior. |
326-
| 490, 491, 496, 487, 498 | Local endpoint network issues. | Check your network. |
326+
| 490, 491, 496, 497, 498 | Local endpoint network issues. | Check your network. |
327327
| 500, 503, 504 | Communication Services infrastructure error. | File a support request through the Azure portal. |
328328
| 603 | Call globally declined by remote Communication Services participant | Expected behavior. |
329329

0 commit comments

Comments
 (0)