fixing merge conflict

Author: batamig

.openpublishing.redirection.json

@@ -1,5 +1,10 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/ai-studio/how-to/commitment-tier.md",
+      "redirect_url": "/azure/ai-services/commitment-tier.md",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/storage/files/files-samples-dotnet-v11.md",
       "redirect_url": "/previous-versions/azure/storage/files/files-samples-dotnet-v11",
@@ -4569,6 +4574,16 @@
       "source_path_from_root": "/articles/virtual-network/how-to-create-encryption-cli.md",
       "redirect_url": "/azure/virtual-network/how-to-create-encryption",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/virtual-network/tutorial-filter-network-traffic-powershell.md",
+      "redirect_url": "/azure/virtual-network/tutorial-filter-network-traffic",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/virtual-network/tutorial-filter-network-traffic-cli.md",
+      "redirect_url": "/azure/virtual-network/tutorial-filter-network-traffic",
+      "redirect_document_id": false
     }
   ]
 }

.openpublishing.redirection.sentinel.json

@@ -1,5 +1,10 @@
 {
     "redirections": [
+        {
+            "source_path": "articles/sentinel/notebooks-troubleshoot.md",
+            "redirect_url": "/azure/sentinel/notebooks-hunt",
+            "redirect_document_id": true
+        },
         {
             "source_path": "articles/sentinel/detect-threats-built-in.md#use-analytics-rule-templates",
             "redirect_url": "/azure/sentinel/create-analytics-rule-from-template",

CODEOWNERS

@@ -15,3 +15,7 @@
 /articles/mariadb @tynevi @thomps23
 /articles/mysql @tynevi @thomps23
 /articles/managed-instance-apache-cassandra @tynevi @thomps23
+/articles/virtual-machines @jasonwhowell @thomps23
+/articles/virtual-machines-scale-sets @jasonwhowell @thomps23
+/articles/container-instances @jasonwhowell @thomps23
+/articles/service-fabric @jasonwhowell @thomps23

articles/ai-services/.openpublishing.redirection.ai-services.json

@@ -115,6 +115,11 @@
             "redirect_url": "/azure/ai-services/translator/document-translation/reference/rest-api-guide",
             "redirect_document_id": false
           },
+          {
+            "source_path_from_root": "/articles/ai-services/openai/how-to/monitoring.md",
+            "redirect_url": "/azure/ai-services/openai/how-to/monitor-openai",
+            "redirect_document_id": false
+          },
           {
             "source_path_from_root": "/articles/ai-services/openai/how-to/prepare-dataset.md",
             "redirect_url": "/azure/ai-services/openai/concepts/fine-tuning-considerations",

articles/ai-services/computer-vision/how-to/specify-detection-model.md

@@ -37,13 +37,19 @@ You should be familiar with the concept of AI face detection. If you aren't, see
 
 The different face detection models are optimized for different tasks. See the following table for an overview of the differences.
 
-
-| Model | Description | Performance notes   | Attributes  | Landmarks |
-|---------|------------|-------------------|-------------|--|
-|**detection_01** | Default choice for all face detection operations. | Not optimized for small, side-view, or blurry faces.                                                     | Returns main face attributes (head pose, glasses, and so on) if they're specified in the detect call. | Returns face landmarks if they're specified in the detect call. |
-|**detection_02** | Released in May 2019 and available optionally in all face detection operations.   | Improved accuracy on small, side-view, and blurry faces.  | Doesn't return face attributes. | Doesn't return face landmarks.     |
-|**detection_03** | Released in February 2021 and available optionally in all face detection operations.                   | Further improved accuracy, including on smaller faces (64x64 pixels) and rotated face orientations.       | Returns mask, blur, and head pose attributes if they're specified in the detect call. | Returns face landmarks if they're specified in the detect call. |
-
+| Model | Description | Performance notes | Landmarks |
+|-------|-------------|-------------------|-----------|
+|**detection_01** | Default choice for all face detection operations. | Not optimized for small, side-view, or blurry faces. | Returns face landmarks if they're specified in the detect call. |
+|**detection_02** | Released in May 2019 and available optionally in all face detection operations. | Improved accuracy on small, side-view, and blurry faces. | Doesn't return face landmarks. |
+|**detection_03** | Released in February 2021 and available optionally in all face detection operations. | Further improved accuracy, including on smaller faces (64x64 pixels) and rotated face orientations. | Returns face landmarks if they're specified in the detect call. |
+
+Attributes are a set of features that can optionally be detected if they're specified in the detect call:
+
+| Model | accessories | blur | exposure | glasses | headPose | mask | noise | occlusion | qualityForRecognition |
+|-------|:-----------:|:----:|:--------:|:-------:|:--------:|:----:|:-----:|:---------:|:---------------------:|
+|**detection_01** | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | | ✔️ | ✔️ | ✔️ (for recognition_03 or 04) |
+|**detection_02** | | | | | | | | | |
+|**detection_03** | | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | | ✔️ | ✔️ (for recognition_03 or 04) |
 
 The best way to compare the performances of the detection models is to use them on a sample dataset. We recommend calling the [Detect] API on a variety of images, especially images of many faces or of faces that are difficult to see, using each detection model. Pay attention to the number of faces that each model returns.
 

articles/ai-services/computer-vision/whats-new.md

@@ -18,6 +18,18 @@ ms.author: pafarley
 
 Learn what's new in Azure AI Vision. Check this page to stay up to date with new features, enhancements, fixes, and documentation updates. 
 
+## August 2024
+
+### New detectable Face attributes
+
+The glasses, occlusion, blur, and exposure attributes are available with the latest Detection 03 model. See [Specify a face detection model](./how-to/specify-detection-model.md) for more details.
+
+## May 2024
+
+### New Face SDK 1.0.0-beta.1 (breaking changes)
+
+The Face SDK was rewritten in version 1.0.0-beta.1 to better meet the guidelines and design principles of Azure SDKs. C#, Python, Java, and JavaScript are the supported languages. Follow the [QuickStart](./quickstarts-sdk/identity-client-library.md) to get started.
+
 ## February 2024
 
 #### Multimodal embeddings GA: new multi-language model

articles/ai-services/content-safety/overview.md

@@ -156,7 +156,7 @@ To use the Content Safety APIs, you must create your Azure AI Content Safety res
 | France Central | ✅ | | | |✅ | | ✅|
 | West Europe | ✅ | ✅ |✅ | |✅ | |✅ |
 | Japan East | ✅ | | | |✅ | |✅ |
-| Australia East| ✅ | ✅ | | |✅ | ✅| ✅|
+| Australia East| ✅ |  | | |✅ | ✅| ✅|
 | USGov Arizona | ✅ | | | | | | |
 | USGov Virginia | ✅ | | | | | | |
 

articles/ai-services/content-safety/quickstart-groundedness.md

@@ -69,8 +69,9 @@ Create a new Python file named _quickstart.py_. Open the new file in your prefer
     ```Python
     import http.client
     import json
-    
-    conn = http.client.HTTPSConnection("<endpoint>/contentsafety/text:detectGroundedness?api-version=2024-02-15-preview")
+
+    endpoint = "<your_custom_subdomain>.cognitiveservices.azure.com"
+    conn = http.client.HTTPSConnection(endpoint)
     payload = json.dumps({
       "domain": "Generic",
       "task": "QnA",
@@ -81,7 +82,7 @@ Create a new Python file named _quickstart.py_. Open the new file in your prefer
       "groundingSources": [
         "I'm 21 years old and I need to make a decision about the next two years of my life. Within a week. I currently work for a bank that requires strict sales goals to meet. IF they aren't met three times (three months) you're canned. They pay me 10/hour and it's not unheard of to get a raise in 6ish months. The issue is, **I'm not a salesperson**. That's not my personality. I'm amazing at customer service, I have the most positive customer service \"reports\" done about me in the short time I've worked here. A coworker asked \"do you ask for people to fill these out? you have a ton\". That being said, I have a job opportunity at Chase Bank as a part time teller. What makes this decision so hard is that at my current job, I get 40 hours and Chase could only offer me 20 hours/week. Drive time to my current job is also 21 miles **one way** while Chase is literally 1.8 miles from my house, allowing me to go home for lunch. I do have an apartment and an awesome roommate that I know wont be late on his portion of rent, so paying bills with 20hours a week isn't the issue. It's the spending money and being broke all the time.\n\nI previously worked at Wal-Mart and took home just about 400 dollars every other week. So I know i can survive on this income. I just don't know whether I should go for Chase as I could definitely see myself having a career there. I'm a math major likely going to become an actuary, so Chase could provide excellent opportunities for me **eventually**."
       ],
-      "reasoning": false
+      "reasoning": False
     })
     headers = {
       'Ocp-Apim-Subscription-Key': '<your_subscription_key>',

articles/ai-services/document-intelligence/concept-custom-generative.md

@@ -90,7 +90,7 @@ Field extraction custom generative model `2024-07-31-preview` version is only av
 
 * **Field Description**. Provide more contextual information in description to help clarify the field that needs to be extracted. Examples include location in the document, potential field labels it can be associated with, and ways to differentiate with other terms that could be ambiguous.
 
-* **Variation**. Custom generative models can generalize across different document templates of the same document type. As a best practice, create a single model for all variations of a document type. Ideally, include a visual template for each type, especially for ones that
+* **Variation**. Custom generative models can generalize across different document templates of the same document type. As a best practice, create a single model for all variations of a document type. Ideally, include a visual template for each type, especially for ones that involve distinct formatting or structural elements, to improve the model's accuracy and consistency in generating or processing documents.
 
 ## Service guidance
 

articles/ai-services/document-intelligence/concept-mortgage-documents.md

@@ -26,6 +26,8 @@ The Document Intelligence Mortgage models use powerful Optical Character Recogni
 **Supported document types:**
 
 * Uniform Residential Loan Application (Form 1003)
+* Uniform Residential Appraisal Report (Form 1004)
+* Verification of employment form (Form 1005)
 * Uniform Underwriting and Transmittal Summary (Form 1008)
 * Closing Disclosure form
 
@@ -38,7 +40,7 @@ Document Intelligence v4.0 (2024-07-31-preview) supports the following tools, ap
 
 | Feature | Resources | Model ID |
 |----------|-------------|-----------|
-|**Mortgage model**|&bullet; [**Document Intelligence Studio**](https://formrecognizer.appliedai.azure.com)</br>&bullet;  [**REST API**](/rest/api/aiservices/operation-groups?view=rest-aiservices-v4.0%20(2024-07-31-preview)&preserve-view=true)</br>&bullet;  [**C# SDK**](quickstarts/get-started-sdks-rest-api.md?view=doc-intel-4.0.0&preserve-view=true)</br>&bullet;  [**Python SDK**](quickstarts/get-started-sdks-rest-api.md?view=doc-intel-4.0.0&preserve-view=true)</br>&bullet;  [**Java SDK**](quickstarts/get-started-sdks-rest-api.md?view=doc-intel-4.0.0&preserve-view=true)</br>&bullet;  [**JavaScript SDK**](quickstarts/get-started-sdks-rest-api.md?view=doc-intel-4.0.0&preserve-view=true)|**&bullet; prebuilt-mortgage.us.1003</br>&bullet; prebuilt-mortgage.us.1008</br>&bullet; prebuilt-mortgage.us.closingDisclosure**|
+|**Mortgage model**|&bullet; [**Document Intelligence Studio**](https://formrecognizer.appliedai.azure.com)</br>&bullet;  [**REST API**](/rest/api/aiservices/operation-groups?view=rest-aiservices-v4.0%20(2024-07-31-preview)&preserve-view=true)</br>&bullet;  [**C# SDK**](quickstarts/get-started-sdks-rest-api.md?view=doc-intel-4.0.0&preserve-view=true)</br>&bullet;  [**Python SDK**](quickstarts/get-started-sdks-rest-api.md?view=doc-intel-4.0.0&preserve-view=true)</br>&bullet;  [**Java SDK**](quickstarts/get-started-sdks-rest-api.md?view=doc-intel-4.0.0&preserve-view=true)</br>&bullet;  [**JavaScript SDK**](quickstarts/get-started-sdks-rest-api.md?view=doc-intel-4.0.0&preserve-view=true)|**&bullet; prebuilt-mortgage.us.1003</br>&bullet; prebuilt-mortgage.us.1004</br>&bullet; prebuilt-mortgage.us.1005</br>&bullet; prebuilt-mortgage.us.1008</br>&bullet; prebuilt-mortgage.us.closingDisclosure**|
 ::: moniker-end
 
 ## Input requirements
@@ -126,74 +128,6 @@ The following are the fields extracted from a 1003 URLA form in the JSON output
 |`Property.MixedUseProperty`|`selectionGroup`|Is the property a mixed-use property?|:selected: NO:unselected: YES|
 |`Property.ManufacturedHome`|`selectionGroup`|Is the property a manufactured home?|:selected: NO:unselected: YES|
 
-## [2024-02-29-preview](#tab/2024-02-29-preview)
-
-
-### Supported languages and locales
-
-
-
-| Supported Languages | Details |
-|:--------------------|:-------:|
-|English|United States (`en-US`)|
-
-
-### Supported document fields
-
-#### mortgage.us.1003
-
-| Field | Type | Description | Example |
-|:------|:-----|:------------|:--------|
-|`LenderLoanNumber`|`string`|Lender loan number or universal loan identifier|10Bx939c5543TqA1144M999143X38|
-|`AgencyCaseNumber`|`string`|Agency case number|115894|
-|`Borrower`|`object`|||
-|`Borrower.Name`|`string`|Borrower's full name as written on the form|Gwen Stacy|
-|`Borrower.SocialSecurityNumber`|`string`|Borrower's social security number|557-99-7283|
-|`Borrower.BirthDate`|`date`|Borrower's date of birth|11/07/1989|
-|`Borrower.CitizenshipType`|`selectionGroup`|Borrower's citizenship|:selected: U.S. Citizen<br>:unselected: Permanent Resident Alien<br>:unselected: Non-Permanent Resident Alien|
-|`Borrower.CreditApplicationType`|`selectionGroup`|Borrower's credit type|:selected: I'm applying for individual credit.<br>:unselected: I'm applying for joint credit.|
-|`Borrower.NumberOfBorrowers`|`integer`|Total number of borrowers|1|
-|`Borrower.MaritalStatus`|`selectionGroup`|Borrower's marital status|:selected: Married<br>:unselected: Separated<br>:unselected: Unmarried|
-|`Borrower.NumberOfDependents`|`integer`|Total number of borrower's dependents|2|
-|`Borrower.DependentsAges`|`string`|Age of borrower's dependents|10, 11|
-|`Borrower.HomePhoneNumber`|`phoneNumber`|Borrower's home phone number|(818) 246-8900|
-|`Borrower.CellPhoneNumber`|`phoneNumber`|Borrower's cell phone number|(831) 728-4766|
-|`Borrower.WorkPhoneNumber`|`phoneNumber`|Borrower's work phone number|(987) 213-5674|
-|`Borrower.CurrentAddress`|`address`|Borrower's current address|1634 W Glenoaks Blvd<br>Glendale CA 91201 United States|
-|`Borrower.YearsInCurrentAddress`|`integer`|Years in current address|1|
-|`Borrower.MonthsInCurrentAddress`|`integer`|Months in current address|1|
-|`Borrower.CurrentHousingExpenseType`|`selectionGroup`|Borrower's housing expense type|:unselected: No primary housing expense:selected: Own:unselected: Rent|
-|`Borrower.CurrentMonthlyRent`|`number`|Borrower's monthly rent|1,600.00|
-|`Borrower.SignedDate`|`date`|Borrower's signature date|03/16/2021|
-|`CoBorrower`|`object`|||
-|`CoBorrower.Names`|`string`|Coborrowers' names|Peter Parker<br>Mary Jane Watson|
-|`CoBorrower.SignedDate`|`date`|Coborrower's signature date|03/16/2021|
-|`CurrentEmployment`|`object`|||
-|`CurrentEmployment.DoesNotApply`|`boolean`|Checkbox state of 'Doesn't apply'|:selected:|
-|`CurrentEmployment.EmployerName`|`string`|Borrower's employer or business name|Spider Wb Corp.|
-|`CurrentEmployment.EmployerPhoneNumber`|`phoneNumber`|Borrower's employer phone number|(390) 353-2474|
-|`CurrentEmployment.EmployerAddress`|`address`|Borrower's employer address|3533 Band Ave<br>Glendale CA 92506 United States|
-|`CurrentEmployment.PositionOrTitle`|`string`|Borrower's position or title|Language Teacher|
-|`CurrentEmployment.StartDate`|`date`|Borrower's employment start date|01/08/2020|
-|`CurrentEmployment.GrossMonthlyIncomeTotal`|`number`|Borrower's gross monthly income total|4,254.00|
-|`Loan`|`object`|||
-|`Loan.Amount`|`number`|Loan amount|156,000.00|
-|`Loan.PurposeType`|`selectionGroup`|Loan purpose type|:unselected: Purchase:selected: Refinance:unselected: Other|
-|`Loan.OtherPurpose`|`string`|Other loan purpose type|Construction|
-|`Loan.RefinanceType`|`selectionGroup`|Loan refinance type|:selected: No Cash Out<br>:unselected: Limited Cash Out<br>:unselected: Cash Out|
-|`Loan.RefinanceProgramType`|`selectionGroup`|Loan refinance program type|:unselected: Full Documentation:selected: Interest Rate Reduction<br>:unselected: Streamlined without Appraisal<br>:unselected: Other|
-|`Loan.OtherRefinanceProgram`|`string`|Other loan refinance program type|Cash-out refinance|
-|`Property`|`object`|||
-|`Property.Address`|`address`|Property address|1634 W Glenoaks Blvd<br>Glendale CA 91201 Los Angeles|
-|`Property.NumberOfUnits`|`integer`|Number of units|1|
-|`Property.Value`|`number`|Property value|200,000.00|
-|`Property.OccupancyStatus`|`selectionGroup`|Property occupancy status|:selected: Primary Residence<br>:unselected: Second Home<br>:unselected: Investment Property|
-|`Property.IsFhaSecondaryResidence`|`boolean`|Checkbox state of '`FHA` Secondary Residence'|:unselected:|
-|`Property.MixedUseProperty`|`selectionGroup`|Is the property a mixed-use property?|:selected: NO:unselected: YES|
-|`Property.ManufacturedHome`|`selectionGroup`|Is the property a manufactured home?|:selected: NO:unselected: YES|
-
-
-The 1003 URLA key-value pairs and line items extracted are in the `documentResults` section of the JSON output.
 
 ## Field extraction 1004 Uniform Residential Appraisal Report (URAR)
 The following are the fields extracted from a 1004 URAR form in the JSON output response.
@@ -404,4 +338,4 @@ The mortgage closing disclosure key-value pairs and line items extracted are in
 * Try processing your own forms and documents with the [Document Intelligence Studio](https://formrecognizer.appliedai.azure.com/studio).
 
 * Complete a [Document Intelligence quickstart](quickstarts/get-started-sdks-rest-api.md?view=doc-intel-3.0.0&preserve-view=true) and get started creating a document processing app in the development language of your choice.
- 
+