Skip to content

Commit 7aaaf3c

Browse files
authored
Merge pull request #127500 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 1902e8a + 23e5925 commit 7aaaf3c

File tree

6 files changed

+24
-42
lines changed

6 files changed

+24
-42
lines changed

articles/automation/update-management/update-mgmt-enable-template.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ It is important to understand the following configuration details if you are new
145145
"location": "[parameters('location')]",
146146
"properties": {
147147
"sku": {
148-
"name": "[parameters('sku')]",
148+
"name": "[parameters('sku')]"
149149
},
150150
"retentionInDays": "[parameters('dataRetention')]",
151151
"features": {
@@ -187,7 +187,7 @@ It is important to understand the following configuration details if you are new
187187
"sku": {
188188
"name": "Basic"
189189
}
190-
},
190+
}
191191
},
192192
{
193193
"apiVersion": "2020-03-01-preview",

articles/cognitive-services/form-recognizer/concept-business-cards.md

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,39 +15,40 @@ ms.author: pafarley
1515

1616
# Business card concepts
1717

18-
Azure Form Recognizer can analyze and extract key value pairs from business cards using one of its prebuilt models. The Business Card API combines powerful Optical Character Recognition (OCR) capabilities with our Business Card Understanding model to extract key information from business cards in English. It extracts personal contact info, company name, job title, and more. The Prebuilt Business Card API is publicly available in the Form Recognizer v2.1 preview.
18+
Azure Form Recognizer can analyze and extract contact information from business cards using one of its prebuilt models. The Business Card API combines powerful Optical Character Recognition (OCR) capabilities with our Business Card Understanding model to extract key information from business cards in English. It extracts personal contact info, company name, job title, and more. The Prebuilt Business Card API is publicly available in the Form Recognizer v2.1 preview.
1919

2020
## What does the Business Card API do?
2121

2222
The Business Card API extracts key fields from business cards and returns them in an organized JSON response.
2323

2424
![Contoso itemized image from FOTT + JSON output](./media/business-card-english.jpg)
2525

26-
### Fields Extracted:
27-
* Contact Names
28-
* First Name
29-
* Last Name
30-
* Company Names
26+
### Fields extracted:
27+
28+
* Contact names
29+
* First names
30+
* Last names
31+
* Company names
3132
* Departments
32-
* Job Titles
33+
* Job titles
3334
* Emails
3435
* Websites
3536
* Addresses
36-
* Phone Numbers
37-
* Mobile Phones
37+
* Phone numbers
38+
* Mobile phones
3839
* Faxes
39-
* Work Phones
40-
* Other Phones
40+
* Work phones
41+
* Other phones
4142

42-
The Business Card API also returns all recognized text from the Business Card. This OCR output is included in the JSON response.
43+
The Business Card API can also return all recognized text from the Business Card. This OCR output is included in the JSON response.
4344

4445
### Input Requirements
4546

4647
[!INCLUDE [input reqs](./includes/input-requirements-receipts.md)]
4748

4849
## The Analyze Business Card operation
4950

50-
The [Analyze Business Card](https://westcentralus.dev.cognitive.microsoft.com/docs/services/form-recognizer-api-v2-1-preview-1/operations/AnalyzeBusinessCardAsync) takes an image or PDF of a business card as the input and extracts the values of interest and text. The call returns a response header field called `Operation-Location`. The `Operation-Location` value is a URL that contains the Result ID to be used in the next step.
51+
The [Analyze Business Card](https://westcentralus.dev.cognitive.microsoft.com/docs/services/form-recognizer-api-v2-1-preview-1/operations/AnalyzeBusinessCardAsync) takes an image or PDF of a business card as the input and extracts the values of interest. The call returns a response header field called `Operation-Location`. The `Operation-Location` value is a URL that contains the Result ID to be used in the next step.
5152

5253
|Response header| Result URL |
5354
|:-----|:----|
@@ -59,19 +60,16 @@ The second step is to call the [Get Analyze Business Card Result](https://westce
5960

6061
|Field| Type | Possible values |
6162
|:-----|:----:|:----|
62-
|status | string | notStarted: The analysis operation has not started. |
63-
| | | running: The analysis operation is in progress. |
64-
| | | failed: The analysis operation has failed. |
65-
| | | succeeded: The analysis operation has succeeded. |
63+
|status | string | notStarted: The analysis operation has not started.<br /><br />running: The analysis operation is in progress.<br /><br />failed: The analysis operation has failed.<br /><br />succeeded: The analysis operation has succeeded.|
6664

67-
When the **status** field has the **succeeded** value, the JSON response will include the business card understanding and text recognition results. The business card understanding result is organized as a dictionary of named field values, where each value contains the extracted text, normalized value, bounding box, confidence and corresponding word elements. The text recognition result is organized as a hierarchy of lines and words, with text, bounding box and confidence information.
65+
When the **status** field has the **succeeded** value, the JSON response will include the business card understanding and optional text recognition results, if requested. The business card understanding result is organized as a dictionary of named field values, where each value contains the extracted text, normalized value, bounding box, confidence and corresponding word elements. The text recognition result is organized as a hierarchy of lines and words, with text, bounding box and confidence information.
6866

6967
![sample business card output](./media/business-card-results.png)
7068

7169
### Sample JSON output
7270

7371
See the following example of a successful JSON response:
74-
The "readResults" node contains all of the recognized text. Text is organized by page, then by line, then by individual words. The "documentResults" node contains the business-card-specific values that the model discovered. This is where you'll find useful key/value pairs like the first name, last name, company name and more.
72+
The "readResults" node contains all of the recognized text. Text is organized by page, then by line, then by individual words. The "documentResults" node contains the business-card-specific values that the model discovered. This is where you'll find useful contact information like the first name, last name, company name and more.
7573

7674
```json
7775
{
@@ -392,4 +390,3 @@ The Business Card API also powers the [AIBuilder Business Card Processing featur
392390
- Learn about the [Form Recognizer REST API](https://westcentralus.dev.cognitive.microsoft.com/docs/services/form-recognizer-api-v2-1-preview-1/operations/AnalyzeBusinessCardAsync)
393391
- Learn more about [Form Recognizer](overview.md)
394392

395-

articles/machine-learning/data-science-virtual-machine/reference-deprecation.md

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,3 @@ Existing DSVM provisioned images in your subscription will continue to operate a
4646
>
4747
> ARM templates that have not been updated with the new DSVM image details will fail to to deploy after the retirement date.
4848
49-
## Mitigating upcoming retirements
50-
51-
In this section, we discuss mitigation to upcoming retirements.
52-
53-
### Upgrade Windows 2016 DSVM
54-
55-
In order to migrate a data disk from your existing Windows 2016 DSVM to a Windows 2019 DSVM, take the following steps:
56-
57-
1. Create a new Windows 2019 DSVM, following the instructions shown [here](./provision-vm.md#create-your-dsvm).
58-
1. Detach existing data disks from your Windows 2016 image using [these instructions](../../virtual-machines/windows/detach-disk.md).
59-
1. Attach the disk from the previous step to your Windows 2019 image using [these instructions](../../virtual-machines/windows/attach-disk-ps.md#attach-an-existing-data-disk-to-a-vm).
60-
61-
### Upgrade Ubuntu 16.04 DSVM
62-
63-
We recommend upgrading existing Ubuntu 16.04 DSVMs to the [Ubuntu 18.04 DSVM edition](./dsvm-ubuntu-intro.md).

articles/storage/common/storage-use-azurite.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ If you're using the Azure SDKs, start Azurite with the `--oauth basic and --cert
324324

325325
### Well-known storage account and key
326326

327-
Azurite accepts the same well-known account and key used by the legacy Azure storage emulator.
327+
Azurite accepts the same well-known account and key used by the legacy Azure Storage Emulator.
328328

329329
- Account name: `devstoreaccount1`
330330
- Account key: `Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==`
@@ -558,5 +558,5 @@ Contributions and suggestions for Azurite are welcome. Go to the Azurite [GitHub
558558

559559
## Next steps
560560

561-
- [Use the Azure storage emulator for development and testing](storage-use-emulator.md) documents the legacy Azure storage emulator, which is being superseded by Azurite.
561+
- [Use the Azure Storage Emulator for development and testing](storage-use-emulator.md) documents the legacy Azure Storage Emulator, which is being superseded by Azurite.
562562
- [Configure Azure Storage connection strings](storage-configure-connection-string.md) explains how to assemble a valid Azure Storage connection string.

articles/time-series-insights/time-series-insights-update-query-data-csharp.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ms.custom: seodec18
1818
This C# example demonstrates how to query data from the [Gen2 Data Access APIs](https://docs.microsoft.com/rest/api/time-series-insights/reference-data-access-overview) in Azure Time Series Insights Gen2 environments.
1919

2020
> [!TIP]
21-
> View Gen2 C# code samples at [https://github.com/Azure-Samples/Azure-Time-Series-Insights](https://github.com/Azure-Samples/Azure-Time-Series-Insights/tree/master/gen1-sample/csharp-tsi-gen1-sample).
21+
> View Gen2 C# code samples at [https://github.com/Azure-Samples/Azure-Time-Series-Insights](https://github.com/Azure-Samples/Azure-Time-Series-Insights/tree/master/gen2-sample/csharp-tsi-gen2-sample).
2222
2323
## Summary
2424

@@ -66,7 +66,7 @@ Alternatively, add each package using [NuGet 2.12+](https://www.nuget.org/). For
6666

6767
## C# sample code
6868

69-
Please refer to the [Azure Time Series Insights](https://github.com/Azure-Samples/Azure-Time-Series-Insights/blob/master/gen1-sample/csharp-tsi-gen1-sample/Program.cs) repo to access the C# sample code.
69+
Please refer to the [Azure Time Series Insights](https://github.com/Azure-Samples/Azure-Time-Series-Insights/tree/master/gen2-sample/csharp-tsi-gen2-sample) repo to access the C# sample code.
7070

7171
> [!NOTE]
7272
>

articles/virtual-machines/linux/tutorial-monitor.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,4 +190,4 @@ In this tutorial, you configured and viewed performance of your VM. You learned
190190
Advance to the next tutorial to learn about Azure Security Center.
191191

192192
> [!div class="nextstepaction"]
193-
> [Manage VM security](../../security/fundamentals/overview.md)
193+
> [Manage VM security](tutorial-azure-security.md)

0 commit comments

Comments
 (0)