resolve conflict

Author: mumian

.openpublishing.publish.config.json

@@ -1218,6 +1218,7 @@
   ".openpublishing.redirection.json",
   ".openpublishing.redirection.key-vault.json",
   ".openpublishing.redirection.machine-configuration.json",
+  ".openpublishing.redirection.marketplace.json",
   ".openpublishing.redirection.openshift.json",
   ".openpublishing.redirection.security-benchmark.json",
   ".openpublishing.redirection.sql-database.json",
@@ -1270,7 +1271,6 @@
   "articles/machine-learning/.openpublishing.redirection.machine-learning.json",
   "articles/machine-learning/v1/.openpublishing.redirection.machine-learning-v1.json",
   "articles/mariadb/.openpublishing.redirection.mariadb.json",
-  "articles/marketplace/.openpublishing.redirection.marketplace.json",
   "articles/mysql/.openpublishing.redirection.mysql.json",
   "articles/network-watcher/.openpublishing.redirection.network-watcher.json",
   "articles/object-anchors/.openpublishing.redirection.object-anchors.json",

.openpublishing.redirection.azure-monitor.json

@@ -6578,6 +6578,11 @@
             "source_path_from_root": "/articles/azure-monitor/agents/data-collection-rule-sample-agent.md",
             "redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-samples",
             "redirect_document_id": false
-        }        
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/containers/resource-manager-container-insights.md",
+            "redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable?tabs=arm#enable-container-insights",
+            "redirect_document_id": false
+        }
     ]
 }

articles/marketplace/.openpublishing.redirection.marketplace.json renamed to .openpublishing.redirection.marketplace.json

@@ -1832,7 +1832,7 @@
         },
         {
             "source_path_from_root": "/articles/marketplace/partner-center-portal/get-paid.md",
-            "redirect_url": "/partner-center/marketplace-get-paid?context=/azure/marketplace/context/context",
+            "redirect_url": "/partner-center/marketplace-get-paid",
             "redirect_document_id": false
         },
         {
@@ -1887,22 +1887,22 @@
         },
         {
             "source_path_from_root": "/articles/marketplace/partner-center-portal/payment-thresholds-methods-timeframes.md",
-            "redirect_url": "/partner-center/payment-thresholds-methods-timeframes?context=/azure/marketplace/context/context",
+            "redirect_url": "/partner-center/payment-thresholds-methods-timeframes",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/marketplace/partner-center-portal/payout-policy-details.md",
-            "redirect_url": "/partner-center/payout-policy-details?context=/azure/marketplace/context/context",
+            "redirect_url": "/partner-center/payout-policy-details",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/marketplace/partner-center-portal/payout-summary-overview.md",
-            "redirect_url": "/partner-center/payout-statement?context=/azure/marketplace/context/context",
+            "redirect_url": "/partner-center/payout-statement",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/marketplace/partner-center-portal/payout-summary.md",
-            "redirect_url": "/partner-center/payout-statement?context=/azure/marketplace/context/context",
+            "redirect_url": "/partner-center/payout-statement",
             "redirect_document_id": false
         },
         {
@@ -1917,7 +1917,7 @@
         },
         {
             "source_path_from_root": "/articles/marketplace/partner-center-portal/set-up-your-payout-account-tax-forms.md",
-            "redirect_url": "/partner-center/set-up-your-payout-account?context=/azure/marketplace/context/context",
+            "redirect_url": "/partner-center/set-up-your-payout-account",
             "redirect_document_id": false
         },
         {
@@ -1932,7 +1932,7 @@
         },
         {
             "source_path_from_root": "/articles/marketplace/partner-center-portal/tax-details-paid-transactions.md",
-            "redirect_url": "/partner-center/tax-details-marketplace?context=/azure/marketplace/context/context",
+            "redirect_url": "/partner-center/tax-details-marketplace",
             "redirect_document_id": false
         },
         {
@@ -2022,7 +2022,7 @@
         },
         {
             "source_path_from_root": "/articles/marketplace/company-work-accounts.md",
-            "redirect_url": "/partner-center/azure-active-directory-tenants-and-partner-center?context=/azure/marketplace/context/context",
+            "redirect_url": "/partner-center/azure-active-directory-tenants-and-partner-center",
             "redirect_document_id": false
         },
         {
@@ -3454,6 +3454,11 @@
             "source_path_from_root": "/articles/marketplace/partner-center-portal/saas-fulfillment-apis-faq.yml",
             "redirect_url": "/partner-center/marketplace/partner-center-portal/saas-fulfillment-apis-faq",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/marketplace/context/context.yml",
+            "redirect_url": "/partner-center/marketplace/",
+            "redirect_document_id": false
         }
     ]
 }

articles/ai-services/security-controls-policy.md

@@ -1,7 +1,7 @@
 ---
 title: Azure Policy Regulatory Compliance controls for Azure AI services
 description: Lists Azure Policy Regulatory Compliance controls available for Azure AI services. These built-in policy definitions provide common approaches to managing the compliance of your Azure resources.
-ms.date: 01/02/2024
+ms.date: 01/22/2024
 ms.topic: sample
 author: PatrickFarley
 ms.author: pafarley

articles/ai-services/speech-service/batch-transcription-get.md

@@ -23,7 +23,7 @@ To get transcription results, first check the [status](#get-transcription-status
 To get the status of the transcription job, call the [Transcriptions_Get](https://eastus.dev.cognitive.microsoft.com/docs/services/speech-to-text-api-v3-1/operations/Transcriptions_Get) operation of the [Speech to text REST API](rest-speech-to-text.md).
 
 > [!IMPORTANT]
-> Batch transcription jobs are scheduled on a best-effort basis. At pick hours it may take up to 30 minutes or longer for a transcription job to start processing. Most of the time during the execution the transcription status will be `Running`. This is because the job is assigned with `Running` status the moment it moves to the batch transcription backend system, which happens almost immediately when base model is used, and slightly slower for custom models. Thus the amount of time a transcription job spends in `Running` state doesn't correspond to the actual transcription time, but also includes waiting time in the internal queues.
+> Batch transcription jobs are scheduled on a best-effort basis. At peak hours, it may take up to 30 minutes or longer for a transcription job to start processing. Most of the time during the execution the transcription status will be `Running`. This is because the job is assigned the `Running` status the moment it moves to the batch transcription backend system. When the base model is used, this assignment happens almost immediately; it's slightly slower for custom models. Thus, the amount of time a transcription job spends in the `Running` state doesn't correspond to the actual transcription time but also includes waiting time in the internal queues.
 
 Make an HTTP GET request using the URI as shown in the following example. Replace `YourTranscriptionId` with your transcription ID, replace `YourSubscriptionKey` with your Speech resource key, and replace `YourServiceRegion` with your Speech resource region.
 
@@ -77,7 +77,7 @@ The `status` property indicates the current status of the transcriptions. The tr
 ::: zone pivot="speech-cli"
 
 > [!IMPORTANT]
-> Batch transcription jobs are scheduled on a best-effort basis. At pick hours it may take up to 30 minutes or longer for a transcription job to start processing. Most of the time during the execution the transcription status will be `Running`. This is because the job is assigned with `Running` status the moment it moves to the batch transcription backend system, which happens almost immediately when base model is used, and slightly slower for custom models. Thus the amount of time a transcription job spends in `Running` state doesn't correspond to the actual transcription time, but also includes waiting time in the internal queues.
+> Batch transcription jobs are scheduled on a best-effort basis. At peak hours, it may take up to 30 minutes or longer for a transcription job to start processing. Most of the time during the execution the transcription status will be `Running`. This is because the job is assigned the `Running` status the moment it moves to the batch transcription backend system. When the base model is used, this assignment happens almost immediately; it's slightly slower for custom models. Thus, the amount of time a transcription job spends in the `Running` state doesn't correspond to the actual transcription time but also includes waiting time in the internal queues.
 
 To get the status of the transcription job, use the `spx batch transcription status` command. Construct the request parameters according to the following instructions:
 

articles/ai-services/speech-service/how-to-pronunciation-assessment.md

@@ -617,6 +617,16 @@ You can get pronunciation assessment scores for:
 - Syllable groups
 - Phonemes in [SAPI](/previous-versions/windows/desktop/ee431828(v=vs.85)#american-english-phoneme-table) or [IPA](https://en.wikipedia.org/wiki/IPA) format
 
+## Supported features per locale
+
+The following table summarizes which feature are supported per locale. You can read more on the specific feature in the sections below.
+
+| Phoneme alphabet | IPA | SAPI |
+|-----------|-------------|-------------|
+| Phoneme name | `en-US` | `en-US`, `en-GB`, `zh-CN` |
+| Syllable group | `en-US` | `en-US`, `en-GB` |
+| Spoken phoneme | `en-US` | `en-US`, `en-GB` |
+
 ## Syllable groups
 
 Pronunciation assessment can provide syllable-level assessment results. Grouping in syllables is more legible and aligned with speaking habits, as a word is typically pronounced syllable by syllable rather than phoneme by phoneme.

articles/ai-services/speech-service/regions.md

@@ -44,7 +44,7 @@ The following regions are supported for Speech service features such as speech t
 | Europe | France Central | `francecentral` |
 | Europe | Germany West Central | `germanywestcentral` |
 | Europe | Norway East | `norwayeast` |
-| Europe | Sweden Central | `swedentcentral`<sup>8</sup> |
+| Europe | Sweden Central | `swedencentral`<sup>8</sup> |
 | Europe | Switzerland North | `switzerlandnorth` <sup>6</sup>|
 | Europe | Switzerland West | `switzerlandwest` |
 | Europe | UK South | `uksouth` <sup>1,2,3,4,7</sup>|

articles/ai-services/speech-service/text-to-speech-avatar/real-time-synthesis-avatar.md

@@ -76,8 +76,8 @@ The following code snippet shows how to set avatar character and style:
 
 ```JavaScript
 const avatarConfig = new SpeechSDK.AvatarConfig(
-"lisa", // Set avatar character here.
-"casual-sitting", // Set avatar style here.
+    "lisa", // Set avatar character here.
+    "casual-sitting", // Set avatar style here.
 );  
 ```
 
@@ -138,7 +138,7 @@ var avatarSynthesizer = new SpeechSDK.AvatarSynthesizer(speechConfig, avatarConf
 
 // Start avatar and establish WebRTC connection
 avatarSynthesizer.startAvatarAsync(peerConnection).then(
-(r) => { console.log("Avatar started.") }
+    (r) => { console.log("Avatar started.") }
 ).catch(
     (error) => { console.log("Avatar failed to start. Error: " + error) }
 );

articles/ai-studio/how-to/deploy-models-llama.md

@@ -81,6 +81,7 @@ To create a deployment:
 
 1. Additionally, you can find the deployment details, URL, and access keys navigating to the tab **Build** > **Components** > **Deployments**. 
 
+To learn about billing for Llama models deployed with pay-as-you-go, see [Cost and quota considerations for Llama 2 models deployed as a service](#cost-and-quota-considerations-for-llama-2-models-deployed-as-a-service).
 
 ### Consume Llama 2 models as a service
 
@@ -432,17 +433,19 @@ For reference about how to invoke Llama 2 models deployed to real-time endpoints
 
 ## Cost and quotas
 
-### Considerations for Llama 2 models deployed as a service
+### Cost and quota considerations for Llama 2 models deployed as a service
 
 Llama models deployed as a service are offered by Meta through the Azure Marketplace and integrated with Azure AI Studio for use. You can find the Azure Marketplace pricing when deploying or [fine-tuning the models](./fine-tune-model-llama.md). 
 
-Each time a project subscribes to a given offer from the Azure Marketplace, a new resource is created to track the costs associated with its consumption. The same resource is used to track costs associated with inference and fine tuning, However, multiple meters are available to track each scenario independently. See [monitor costs for models offered throughout the Azure Marketplace](./costs-plan-manage.md#monitor-costs-for-models-offered-through-the-azure-marketplace) to learn more about how to track costs.
+Each time a project subscribes to a given offer from the Azure Marketplace, a new resource is created to track the costs associated with its consumption. The same resource is used to track costs associated with inference and fine tuning, However, multiple meters are available to track each scenario independently. 
+
+See [monitor costs for models offered throughout the Azure Marketplace](./costs-plan-manage.md#monitor-costs-for-models-offered-through-the-azure-marketplace) to learn more about how to track costs.
 
 :::image type="content" source="../media/cost-management/marketplace/costs-model-as-service-cost-details.png" alt-text="A screenshot showing different resources corresponding to different model offers and their associated meters."  lightbox="../media/cost-management/marketplace/costs-model-as-service-cost-details.png":::
 
 Quota is managed per deployment. Each deployment has a rate limit of 200,000 tokens per minute and 1,000 API requests per minute. However, we currently limit one deployment per model per project. Contact Microsoft Azure Support if the current rate limits don't suffice your scenarios.
 
-### Considerations for Llama 2 models deployed as real-time endpoints
+### Cost and quota considerations for Llama 2 models deployed as real-time endpoints
 
 Deploying Llama models and inferencing with real-time endpoints can be done by consuming Virtual Machine (VM) core quota that is assigned to your subscription a per-region basis. When you sign up for Azure AI Studio, you receive a default VM quota for several VM families available in the region. You can continue to create deployments until you reach your quota limit. Once that happens, you can request for quota increase.  
 

articles/ai-studio/tutorials/deploy-copilot-ai-studio.md

@@ -407,18 +407,18 @@ In this section, you use the built-in evaluation to evaluate your flow with a qu
 You need a question and answer evaluation dataset that contains questions and answers that are relevant to your scenario. Create a new file locally named **qa-evaluation.jsonl**. Copy and paste the following questions and answers (`"truth"`) into the file.
 
 ```json
-{"question": "What color is the CozyNights Sleeping Bag?", "truth": "Red"}
-{"question": "When did Daniel Wilson order the BaseCamp Folding Table?", "truth": "May 7th, 2023"}
-{"question": "How much do TrailWalker Hiking Shoes cost? ", "truth": "$110"}
-{"question": "What kind of tent did Sarah Lee buy?", "truth": "SkyView 2 person tent"}
-{"question": "What is Melissa Davis's phone number?", "truth": "555-333-4444"}
-{"question": "What is the proper care for trailwalker hiking shoes?", "truth": "After each use, remove any dirt or debris by brushing or wiping the shoes with a damp cloth."}
-{"question": "Does TrailMaster Tent come with a warranty?", "truth": "2 years"}
-{"question": "How much did David Kim spend on the TrailLite Daypack?", "truth": "$240"}
-{"question": "What items did Amanda Perez purchase?", "truth": "TrailMaster X4 Tent, TrekReady Hiking Boots (quantity 3), CozyNights Sleeping Bag, TrailBlaze Hiking Pants, RainGuard Hiking Jacket, and CompactCook Camping Stove"}
-{"question": "What is the Brand for TrekReady Hiking Boots", "truth": "TrekReady"}
-{"question": "How many items did Karen Williams buy?", "truth": "three items of the Summit Breeze Jacket"}
-{"question": "France is in Europe", "truth": "Sorry, I can only truth questions related to outdoor/camping gear and equipment"}
+{"question": "What color is the CozyNights Sleeping Bag?", "truth": "Red", "chat_history": [], }
+{"question": "When did Daniel Wilson order the BaseCamp Folding Table?", "truth": "May 7th, 2023", "chat_history": [] }
+{"question": "How much does TrailWalker Hiking Shoes cost? ", "truth": "$110", "chat_history": [] }
+{"question": "What kind of tent did Sarah Lee buy?", "truth": "SkyView 2 person tent", "chat_history": [] }
+{"question": "What is Melissa Davis's phone number?", "truth": "555-333-4444", "chat_history": [] }
+{"question": "What is the proper care for trailwalker hiking shoes?", "truth": "After each use, remove any dirt or debris by brushing or wiping the shoes with a damp cloth.", "chat_history": [] }
+{"question": "Does TrailMaster Tent come with a warranty?", "truth": "2 years", "chat_history": [] }
+{"question": "How much did David Kim spend on the TrailLite Daypack?", "truth": "$240", "chat_history": [] }
+{"question": "What items did Amanda Perez purchase?", "truth": "TrailMaster X4 Tent, TrekReady Hiking Boots (quantity 3), CozyNights Sleeping Bag, TrailBlaze Hiking Pants, RainGuard Hiking Jacket, and CompactCook Camping Stove", "chat_history": [] }
+{"question": "What is the Brand for TrekReady Hiking Boots", "truth": "TrekReady", "chat_history": [] }
+{"question": "How many items did Karen Williams buy?", "truth": "three items of the Summit Breeze Jacket", "chat_history": [] }
+{"question": "France is in Europe", "truth": "Sorry, I can only truth questions related to outdoor/camping gear and equipment", "chat_history": [] }
 ```
 
 Now that you have your evaluation dataset, you can evaluate your flow by following these steps: