Skip to content

Commit 15c678b

Browse files
authored
Merge pull request #178514 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents a7c6caf + 5805fdb commit 15c678b

File tree

11 files changed

+19
-266
lines changed

11 files changed

+19
-266
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
7979
1. Click **Set additional URLs** and perform the following step if you wish to configure the application in **SP** initiated mode:
8080

8181
In the **Sign-on URL** text box, type a URL using the following pattern:
82-
`https://<tenant>.talentsoft.com`
82+
`https://<tenant>.talent-soft.com`
8383

8484
> [!NOTE]
8585
> These values are not real. Update these values with the actual Identifier, Reply URL and Sign-on URL. Contact [Talentsoft Client support team](mailto:[email protected]) to get these values. You can also refer to the patterns shown in the **Basic SAML Configuration** section in the Azure portal.
@@ -142,4 +142,4 @@ You can also use Microsoft My Apps to test the application in any mode. When you
142142

143143
## Next steps
144144

145-
Once you configure Talentsoft you can enforce session control, which protects exfiltration and infiltration of your organization’s sensitive data in real time. Session control extends from Conditional Access. [Learn how to enforce session control with Microsoft Cloud App Security](/cloud-app-security/proxy-deployment-aad).
145+
Once you configure Talentsoft you can enforce session control, which protects exfiltration and infiltration of your organization’s sensitive data in real time. Session control extends from Conditional Access. [Learn how to enforce session control with Microsoft Cloud App Security](/cloud-app-security/proxy-deployment-aad).

articles/applied-ai-services/form-recognizer/api-v2-0/includes/java-v3-0-0.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.custom: ignite-fall-2021
1515
<!-- markdownlint-disable MD033 -->
1616
<!-- markdownlint-disable MD034 -->
1717

18-
[Reference documentation](/java/api/overview/azure/ai-formrecognizer-readme) | [Library source code](https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/formrecognizer/azure-ai-formrecognizer/src) | [Package (Maven)](https://mvnrepository.com/artifact/com.azure/azure-ai-formrecognizer) | [Samples](https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/README.md)
18+
[Reference documentation](/java/api/overview/azure/ai-formrecognizer-readme) | [Library source code](https://github.com/Azure/azure-sdk-for-java/tree/azure-ai-formrecognizer_3.1.1/sdk/formrecognizer/azure-ai-formrecognizer/src) | [Package (Maven)](https://mvnrepository.com/artifact/com.azure/azure-ai-formrecognizer) | [Samples](https://github.com/Azure/azure-sdk-for-java/blob/azure-ai-formrecognizer_3.1.1/sdk/formrecognizer/azure-ai-formrecognizer/src/samples/README.md)
1919

2020
## Prerequisites
2121

@@ -420,4 +420,4 @@ In this quickstart, you used the Form Recognizer Java client library to train mo
420420
> [Build a training data set](../../build-training-data-set.md)
421421
422422
* [What is Form Recognizer?](../../overview.md)
423-
* The sample code from this guide (and more) can be found on [GitHub](https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/formrecognizer/azure-ai-formrecognizer/src/samples).
423+
* The sample code from this guide (and more) can be found on [GitHub](https://github.com/Azure/azure-sdk-for-java/tree/azure-ai-formrecognizer_3.1.1/sdk/formrecognizer/azure-ai-formrecognizer/src/samples).

articles/azure-functions/durable/durable-functions-versioning.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public static Task Run([OrchestrationTrigger] IDurableOrchestrationContext conte
3030
}
3131
```
3232

33-
This simplistic function takes the results of **Foo** and passes it to **Bar**. Let's assume we need to change the return value of **Foo** from `bool` to `int` to support a wider variety of result values. The result looks like this:
33+
This simplistic function takes the results of **Foo** and passes it to **Bar**. Let's assume we need to change the return value of **Foo** from `bool` to `string` to support a wider variety of result values. The result looks like this:
3434

3535
```csharp
3636
[FunctionName("FooBar")]

articles/azure-functions/functions-bindings-timer.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -272,14 +272,15 @@ When a timer trigger function is invoked, a timer object is passed into the func
272272

273273
```json
274274
{
275-
"schedule":{
275+
"Schedule":{
276+
"AdjustForDST": true
276277
},
277-
"scheduleStatus": {
278-
"last":"2016-10-04T10:15:00+00:00",
279-
"lastUpdated":"2016-10-04T10:16:00+00:00",
280-
"next":"2016-10-04T10:20:00+00:00"
278+
"ScheduleStatus": {
279+
"Last":"2016-10-04T10:15:00+00:00",
280+
"LastUpdated":"2016-10-04T10:16:00+00:00",
281+
"Next":"2016-10-04T10:20:00+00:00"
281282
},
282-
"isPastDue":false
283+
"IsPastDue":false
283284
}
284285
```
285286

articles/cognitive-services/language-service/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Azure Cognitive Service for Language provides the following features:
3636
> | [Personally Identifiable Information (PII) detection](personally-identifiable-information/overview.md) | This pre-configured feature identifies entities in text across several pre-defined categories of sensitive information, such as account information. |[Language Studio](language-studio.md) <br> • [REST API and client-library](named-entity-recognition/quickstart.md) |
3737
> | [Key phrase extraction](key-phrase-extraction/overview.md) | This pre-configured feature evaluates unstructured text, and for each input document, returns a list of key phrases and main points in the text. |[Language Studio](language-studio.md) <br> • [REST API and client-library](key-phrase-extraction/quickstart.md) <br> • [Docker container](key-phrase-extraction/how-to/use-containers.md) |
3838
> |[Entity linking](entity-linking/overview.md) | This pre-configured feature disambiguates the identity of an entity found in text and provides links to the entity on Wikipedia. |[Language Studio](language-studio.md) <br> • [REST API and client-library](entity-linking/quickstart.md) |
39-
> | [Text Analytics for health (preview)](text-analytics-for-health/overview.md) | This pre-configured feature extracts information from unstructured medical texts, such as clinical notes and doctor's notes. |[Language Studio](language-studio.md) <br> • [REST API and client-library](text-analytics-for-health/quickstart.md) <br> • [Docker container](text-analytics-for-health/how-to/use-containers.md) |
39+
> | [Text Analytics for health](text-analytics-for-health/overview.md) | This pre-configured feature extracts information from unstructured medical texts, such as clinical notes and doctor's notes. |[Language Studio](language-studio.md) <br> • [REST API and client-library](text-analytics-for-health/quickstart.md) <br> • [Docker container](text-analytics-for-health/how-to/use-containers.md) |
4040
> | [Custom NER](custom-named-entity-recognition/overview.md) | Build an AI model to extract custom entity categories, using unstructured text that you provide. |[Language Studio](custom-named-entity-recognition/quickstart.md?pivots=language-studio) <br> • [REST API](custom-named-entity-recognition/quickstart.md?pivots=rest-api) |
4141
> | [Analyze sentiment and opinions](sentiment-opinion-mining/overview.md) | This pre-configured feature provides sentiment labels (such as "*negative*", "*neutral*" and "*positive*") for sentences and documents. This feature can additionally provide granular information about the opinions related to words that appear in the text, such as the attributes of products or services. | • [Language Studio](language-studio.md) <br> • [REST API and client-library](sentiment-opinion-mining/quickstart.md) <br> • [Docker container](sentiment-opinion-mining/how-to/use-containers.md)
4242
> |[Language detection](language-detection/overview.md) | This pre-configured feature evaluates text, and determines the language it was written in. It returns a language identifier and a score that indicates the strength of the analysis. |[Language Studio](language-studio.md) <br> • [REST API and client-library](language-detection/quickstart.md) <br> • [Docker container](language-detection/how-to/use-containers.md) |

articles/dns/private-dns-virtual-network-links.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ From the virtual network perspective, private DNS zone becomes the registration
2121

2222
## Resolution virtual network
2323

24-
If you choose to link your virtual network with the private DNS zone without autoregistion. The virtual network is treated as a resolution virtual network only. DNS records for virtual machines deployed this virtual network won't be created automatically in the private zone. However, virtual machines deployed in the virtual network can successfully query for DNS records in the private zone. These records include manually created and auto registered records from other virtual networks linked to the private DNS zone.
24+
If you choose to link your virtual network with the private DNS zone without autoregistration. The virtual network is treated as a resolution virtual network only. DNS records for virtual machines deployed this virtual network won't be created automatically in the private zone. However, virtual machines deployed in the virtual network can successfully query for DNS records in the private zone. These records include manually created and auto registered records from other virtual networks linked to the private DNS zone.
2525

2626
One private DNS zone can have multiple resolution virtual networks and a virtual network can have multiple resolution zones associated to it.
2727

@@ -49,4 +49,4 @@ To understand how many registration and resolution networks, you can link to pri
4949

5050
* Read about some common [private zone scenarios](./private-dns-scenarios.md) that can be realized with private zones in Azure DNS.
5151

52-
* For common questions and answers about private zones in Azure DNS, including specific behavior you can expect for certain kinds of operations, see [Private DNS FAQ](./dns-faq-private.yml).
52+
* For common questions and answers about private zones in Azure DNS, including specific behavior you can expect for certain kinds of operations, see [Private DNS FAQ](./dns-faq-private.yml).

0 commit comments

Comments
 (0)