fixing merge conflict

Author: aahill

articles/ai-services/computer-vision/language-support.md

@@ -258,7 +258,7 @@ The latest [Multimodal embeddings](./concept-image-retrieval.md) model supports
 | Norwegian             | `no`          | ✅ |  |
 | Nyanja                | `ny`          | ✅ |  |
 | Occitan               | `oc`          | ✅ |  |
-| Oriya                 | `or`          | ✅ |  |
+| Odia                  | `or`          | ✅ |  |
 | Oromo                 | `om`          | ✅ |  |
 | Pashto                | `ps`          | ✅ |  |
 | Persian               | `fa`          | ✅ |  |

articles/ai-services/computer-vision/use-case-alt-text.md

@@ -21,7 +21,7 @@ Alt text, or alternative text, is an HTML attribute added to the `<img>` tag
 
 `<img src="elephant.jpg" alt="An elephant in a grassland.">`
 
-Alt text enables website owners to describe an image in plain text. These image descriptions improve accessibility by enabling screen readers such as Microsoft Narrator, JAWS, and NVDA to accurately communicate image content to their vision-impaired and blind users.
+Alt text enables website owners to describe an image in plain text. These image descriptions improve accessibility by enabling screen readers such as Microsoft Narrator, JAWS, and NVDA to accurately communicate image content to their users who are blind or with visual impairment.
 
 Alt text is also vital for image search engine optimization (SEO). It helps search engines understand the visual content in your images. The search engine is then better able to include and rank your website in search results when users search for the content in your website.  
 

articles/ai-services/containers/docker-compose-recipe.md

@@ -7,7 +7,7 @@ author: aahill
 manager: nitinme
 ms.service: azure-ai-services
 ms.topic: how-to
-ms.date: 02/22/2024
+ms.date: 11/06/2024
 ms.author: aahi
 
 # SME: Brendan Walsh

articles/ai-services/content-safety/whats-new.md

@@ -45,7 +45,7 @@ The groundedness detection API includes a correction feature that automatically
 
 ### New features are GA
 
-The Prompt Shields API and groundedness detection API are now generally available (GA). Follow a quickstart to try them out.
+The Prompt Shields API and Protected Material for text API are now generally available (GA). Follow a quickstart to try them out.
 * [Prompt Shields quickstart](/azure/ai-services/content-safety/quickstart-jailbreak)
 * [Protected Material quickstart](/azure/ai-services/content-safety/quickstart-protected-material?tabs=curl)
 ## July 2024

articles/ai-services/create-account-bicep.md

@@ -5,7 +5,7 @@ keywords: Azure AI services, cognitive solutions, cognitive intelligence, cognit
 author: eric-urban
 ms.service: azure-ai-services
 ms.topic: quickstart
-ms.date: 8/1/2024
+ms.date: 11/06/2024
 ms.author: eur
 ms.custom:
   - subject-armqs

articles/ai-services/document-intelligence/language-support/prebuilt.md

@@ -173,7 +173,7 @@ Azure AI Document Intelligence models provide multilingual document processing s
 | • Korean (`ko`) | Korea (`kr`)|
 | • Latvian (`lv`) | Latvia (`lv`)|
 | • Lithuanian (`lt`) | Lithuania (`lt`)|
-| • Macedonian (`mk`) | Macedonia (`mk`)|
+| • Macedonian (`mk`) | North Macedonia (`mk`)|
 | • Malay (`ms`) | Malaysia (`ms`)|
 | • Norwegian (`nb`) | Norway (`no`)|
 | • Polish (`pl`) | Poland (`pl`)|

articles/ai-services/luis/client-libraries-rest-api.md

@@ -2,12 +2,12 @@
 title: "Quickstart: Language Understanding (LUIS) SDK client libraries and REST API"
 description: Create and query a LUIS app with the LUIS SDK client libraries and REST API.
 ms.topic: quickstart
-ms.date: 01/19/2024
+ms.date: 11/06/2024
 ms.service: azure-ai-language
-ms.author: aahi
+ms.author: jboback
 manager: nitinme
 ms.subservice: azure-ai-luis
-author: aahill
+author: jboback
 keywords: Azure, artificial intelligence, ai, natural language processing, nlp, LUIS, azure luis, natural language understanding, ai chatbot, chatbot maker,  understanding natural language
 ms.devlang: csharp
 # ms.devlang: csharp, javascript, python

articles/ai-services/luis/concepts/entities.md

@@ -3,13 +3,13 @@ title: Entities
 titleSuffix: Azure AI services
 description: Entities concepts
 #services: cognitive-services
-ms.author: aahi
-author: aahill
+ms.author: jboback
+author: jboback
 manager: nitinme
 ms.service: azure-ai-language
 ms.subservice: azure-ai-luis
 ms.topic: conceptual
-ms.date: 01/19/2024
+ms.date: 11/06/2024
 ---
 
 # Entity types
@@ -23,10 +23,10 @@ An entity is an item or an element that is relevant to the user's intent. Entiti
 | Utterance | Intent predicted | Entities extracted | Explanation |
 |--|--|--|--|
 | Hello, how are you? | Greeting | - | Nothing to extract. |
-| I want to order a small pizza | orderPizza | 'small' | 'Size' entity is extracted as 'small'. |
-| Turn off bedroom light | turnOff | 'bedroom' | 'Room' entity is extracted as 'bedroom'. |
-| Check balance in my savings account ending in 4406 | checkBalance | 'savings', '4406' | 'accountType' entity is extracted as 'savings' and 'accountNumber' entity is extracted as '4406'. |
-| Buy 3 tickets to New York | buyTickets | '3', 'New York' | 'ticketsCount' entity is extracted as '3' and 'Destination' entity is extracted as 'New York". |
+| I want to order a small pizza | orderPizza | 'small' | 'Size' entity is extracted as 'small.' |
+| Turn-off bedroom light | turnOff | 'bedroom' | 'Room' entity is extracted as 'bedroom.' |
+| Check balance in my savings account ending in 4406 | checkBalance | 'savings', '4406' | 'accountType' entity is extracted as 'savings' and 'accountNumber' entity is extracted as '4406.' |
+| Buy 3 tickets to New York | buyTickets | '3', 'New York' | 'ticketsCount' entity is extracted as '3' and 'Destination' entity is extracted as 'New York." |
 
 Entities are optional but recommended. You don't need to create entities for every concept in your app, only when:
 

articles/ai-services/luis/index.yml

@@ -5,9 +5,9 @@ summary: Learn how Language Understanding enables your applications to understan
 
 metadata:
   ms.topic: landing-page
-  ms.date: 01/19/2024
-  ms.author: aahi
-  author: aahill
+  ms.date: 11/06/2024
+  ms.author: jboback
+  author: jboback
   manager: nitinme
   ms.service: azure-ai-language
   ms.subservice: azure-ai-luis

articles/ai-services/luis/luis-container-howto.md

@@ -3,13 +3,13 @@ title: Install and run Docker containers for LUIS
 titleSuffix: Azure AI services
 description: Use the LUIS container to load your trained or published app, and gain access to its predictions on-premises.
 #services: cognitive-services
-author: aahill
+author: jboback
 manager: nitinme
 ms.service: azure-ai-language
 ms.subservice: azure-ai-luis
 ms.topic: how-to
-ms.date: 01/19/2024
-ms.author: aahi
+ms.date: 11/06/2024
+ms.author: jboback
 keywords: on-premises, Docker, container
 ---