resolve merge conflicts

Author: laujan

articles/ai-services/content-understanding/concepts/analyzer-templates.md

@@ -26,7 +26,7 @@ The following analyzer templates are available for use in the [Azure AI Foundry
 |Template| Description|
 | ----|----|----|
 |Document analysis |Analyze documents to extract text, layout, structured fields, and more.|
-|Text analysis |Analyze texts and extract structured fields.|
+|Invoice Analysi |Analyze invoice as prebuilt template and extract structured fields and tables.|
 
    :::image type="content" source="../media/analyzer-template/scenario-template-document.png" alt-text="Screenshot of document analyzer template.":::
 

articles/ai-services/content-understanding/service-limits.md

@@ -69,11 +69,11 @@ The following limits apply as of version 2024-12-01-preview.
 
 | Property | Document | Image | Text | Audio | Video |
 | --- | --- | --- | --- | --- | --- |
-| Max fields | 50 | 10 | 10 | 10 | 10 |
+| Max fields | 50 | 50 | 50 | 50 | 50 |
 | Max classify field categories | 300 | 300 | 300 | 300 | 300 |
 | Supported generation methods | extract | generate<br>classify | generate<br>classify | generate<br>classify | generate<br>classify |
 
-* The *Max fields* limit includes all named fields. For example, a list of strings counts as one field, while a group with string and number subfields counts as three fields. To extract beyond default limits, contact us at [email protected].
+* The *Max fields* limit includes all named fields. For example, a list of strings counts as one field, while a group with string and number subfields counts as three fields. To extend the limit for documents fields up to 100, contact us at `[email protected]`.
 * The *Max classify field categories* limit is the total number of categories across all fields using the `classify` generation method.
 * The generation method currently applies only to basic fields.
 
@@ -83,7 +83,7 @@ The following limits apply as of version 2024-12-01-preview.
 | --- | --- | --- | --- | --- | --- |
 | Basic | No *boolean* | No *date*, *time* | *string* | *string* | No *date*, *time* |
 | List | N/A | No *date*, *time* | *string* | *string* | No *date*, *time* |
-| Group | N/A | No *date*, *time* | N/A | N/A | No *date*, *time* |
+| Group | N/A | No *date*, *time* |*string* | *string* | No *date*, *time* |
 | Table | No *boolean* | No *date*, *time* | *string* | *string* | No *date*, *time* |
 | Fixed table | No *boolean* | N/A | N/A | N/A | N/A |
 

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

@@ -41,4 +41,5 @@ The Content Understanding **2024-12-01-preview** REST API is now available. This
   * Add download code samples for quick setup added.
 
 ## November 2024
-Welcome! The Azure AI Content Understanding API version `2024-12-01-preview` is now in public preview. This version allows you to generate a structured representation of content tailored to specific tasks from various modalities or formats. Content Understanding uses a defined schema to extract content suitable for processing by large language models and subsequent applications.
+
+Welcome! The Azure AI Content Understanding API version `2024-12-01-preview` is now in public preview. This version allows you to generate a structured representation of content tailored to specific tasks from various modalities or formats. Content Understanding uses a defined schema to extract content suitable for processing by large language models and subsequent applications.