Merge pull request #1204 from MicrosoftDocs/main

11/1/2024 AM Publish

Author: Daidihuang

articles/ai-services/openai/faq.yml

@@ -162,6 +162,10 @@ sections:
           Where can I find out what region a model is available in?
         answer: |
           Consult the Azure OpenAI [model availability guide](./concepts/models.md#model-summary-table-and-region-availability) for region availability.
+      - question: |
+          What are the SLAs (Service Level Agreements) in Azure OpenAI?
+        answer:
+          We do offer an Availability SLA for all resources and a Latency SLA for Provisioned-Managed Deployments. For more information about the SLA for Azure OpenAI Service, see the [Service Level Agreements (SLA) for Online Services page](https://azure.microsoft.com/support/legal/sla/cognitive-services/v1_1/). 
       - question: |
           How do I enable fine-tuning? Create a custom model is greyed out in Azure AI Studio.  
         answer: |
@@ -173,11 +177,7 @@ sections:
       - question: |
           What is the maximum number of fine-tuned models I can create?
         answer: |
-          100
-      - question: |
-          What are the SLAs for API responses in Azure OpenAI?
-        answer:
-          We don't have a defined API response time Service Level Agreement (SLA) at this time. For more information about the SLA for Azure OpenAI Service, see the [Service Level Agreements (SLA) for Online Services page](https://azure.microsoft.com/support/legal/sla/cognitive-services/v1_1/).  
+          100  
       - question: |
           Why was my fine-tuned model deployment deleted? 
         answer:

articles/machine-learning/how-to-managed-network.md

@@ -71,6 +71,16 @@ Part of Azure Machine Learning studio runs locally in the client's web browser,
 
 For more information on creating a private endpoint or service endpoint, see the [Connect privately to a storage account](/azure/storage/common/storage-private-endpoints) and [Service Endpoints](/azure/virtual-network/virtual-network-service-endpoints-overview) articles.
 
+### Secured associated resources
+
+If you add the following services to the virtual network by using either a service endpoint or a private endpoint (disabling the public access), allow trusted Microsoft services to access these services:
+
+| Service | Endpoint information | Allow trusted information |
+| ----- | ----- | ----- |
+| __Azure Key Vault__| [Service endpoint](/azure/key-vault/general/overview-vnet-service-endpoints)</br>[Private endpoint](/azure/key-vault/general/private-link-service) | [Allow trusted Microsoft services to bypass this firewall](how-to-secure-workspace-vnet.md#secure-azure-key-vault) |
+| __Azure Storage Account__ | [Service and private endpoint](how-to-secure-workspace-vnet.md?tabs=se#secure-azure-storage-accounts)</br>[Private endpoint](how-to-secure-workspace-vnet.md?tabs=pe#secure-azure-storage-accounts) | [Grant access from Azure resource instances](/azure/storage/common/storage-network-security#grant-access-from-azure-resource-instances)</br>__or__</br>[Grant access to trusted Azure services](/azure/storage/common/storage-network-security#grant-access-to-trusted-azure-services) |
+| __Azure Container Registry__ | [Private endpoint](/azure/container-registry/container-registry-private-link) | [Allow trusted services](/azure/container-registry/allow-access-trusted-services) |
+
 ## Prerequisites
 
 Before following the steps in this article, make sure you have the following prerequisites:

articles/search/hybrid-search-how-to-query.md

@@ -431,7 +431,7 @@ In this section, compare the responses between single vector search and simple h
 {
     "@search.score": 0.8399121,
     "HotelId": "49",
-    "HotelName": "Old Carrabelle Hotel",
+    "HotelName": "Swirling Currents Hotel",
     "Description": "Spacious rooms, glamorous suites and residences, rooftop pool, walking access to shopping, dining, entertainment and the city center.",
     "Category": "Luxury",
     "Address": {
@@ -446,7 +446,7 @@ In this section, compare the responses between single vector search and simple h
 {
     "@search.score": 0.032786883413791656,
     "HotelId": "49",
-    "HotelName": "Old Carrabelle Hotel",
+    "HotelName": "Swirling Currents Hotel",
     "Description": "Spacious rooms, glamorous suites and residences, rooftop pool, walking access to shopping, dining, entertainment and the city center.",
     "Category": "Luxury",
     "Address": {

articles/search/hybrid-search-overview.md

@@ -96,7 +96,7 @@ A response from the above query might look like this:
             "@search.score": 0.03333333507180214,
             "@search.rerankerScore": 2.5229012966156006,
             "HotelId": "49",
-            "HotelName": "Old Carrabelle Hotel",
+            "HotelName": "Swirling Currents Hotel",
             "Description": "Spacious rooms, glamorous suites and residences, rooftop pool, walking access to shopping, dining, entertainment and the city center.",
             "Category": "Luxury",
             "Address": {
@@ -108,7 +108,7 @@ A response from the above query might look like this:
             "@search.score": 0.032522473484277725,
             "@search.rerankerScore": 2.111117362976074,
             "HotelId": "48",
-            "HotelName": "Nordick's Motel",
+            "HotelName": "Nordick's Valley Motel",
             "Description": "Only 90 miles (about 2 hours) from the nation's capital and nearby most everything the historic valley has to offer.  Hiking? Wine Tasting? Exploring the caverns?  It's all nearby and we have specially priced packages to help make our B&B your home base for fun while visiting the valley.",
             "Category": "Boutique",
             "Address": {

articles/search/includes/quickstarts/dotnet.md

@@ -186,7 +186,7 @@ When uploading documents, you must use an [IndexDocumentsBatch](/dotnet/api/azur
                 new Hotel()
                 {
                     HotelId = "1",
-                    HotelName = "Secret Point Motel",
+                    HotelName = "Stay-Kay City Hotel",
                     Description = "The hotel is ideally located on the main commercial artery of the city in the heart of New York. A few minutes away is Time's Square and the historic centre of the city, as well as other places of interest that make New York one of America's most attractive and cosmopolitan cities.",
                     DescriptionFr = "L'hôtel est idéalement situé sur la principale artère commerciale de la ville en plein cœur de New York. A quelques minutes se trouve la place du temps et le centre historique de la ville, ainsi que d'autres lieux d'intérêt qui font de New York l'une des villes les plus attractives et cosmopolites de l'Amérique.",
                     Category = "Boutique",
@@ -207,7 +207,7 @@ When uploading documents, you must use an [IndexDocumentsBatch](/dotnet/api/azur
                 new Hotel()
                 {
                     HotelId = "2",
-                    HotelName = "Twin Dome Motel",
+                    HotelName = "Old Century Hotel",
                     Description = "The hotel is situated in a  nineteenth century plaza, which has been expanded and renovated to the highest architectural standards to create a modern, functional and first-class hotel in which art and unique historical elements coexist with the most modern comforts.",
                     DescriptionFr = "L'hôtel est situé dans une place du XIXe siècle, qui a été agrandie et rénovée aux plus hautes normes architecturales pour créer un hôtel moderne, fonctionnel et de première classe dans lequel l'art et les éléments historiques uniques coexistent avec le confort le plus moderne.",
                     Category = "Boutique",
@@ -228,7 +228,7 @@ When uploading documents, you must use an [IndexDocumentsBatch](/dotnet/api/azur
                 new Hotel()
                 {
                     HotelId = "3",
-                    HotelName = "Triple Landscape Hotel",
+                    HotelName = "Gastronomic Landscape Hotel",
                     Description = "The Hotel stands out for its gastronomic excellence under the management of William Dough, who advises on and oversees all of the Hotel’s restaurant services.",
                     DescriptionFr = "L'hôtel est situé dans une place du XIXe siècle, qui a été agrandie et rénovée aux plus hautes normes architecturales pour créer un hôtel moderne, fonctionnel et de première classe dans lequel l'art et les éléments historiques uniques coexistent avec le confort le plus moderne.",
                     Category = "Resort and Spa",
@@ -249,9 +249,9 @@ When uploading documents, you must use an [IndexDocumentsBatch](/dotnet/api/azur
                 new Hotel()
                 {
                     HotelId = "4",
-                    HotelName = "Sublime Cliff Hotel",
-                    Description = "Sublime Cliff Hotel is located in the heart of the historic center of Sublime in an extremely vibrant and lively area within short walking distance to the sites and landmarks of the city and is surrounded by the extraordinary beauty of churches, buildings, shops and monuments. Sublime Cliff is part of a lovingly restored 1800 palace.",
-                    DescriptionFr = "Le sublime Cliff Hotel est situé au coeur du centre historique de sublime dans un quartier extrêmement animé et vivant, à courte distance de marche des sites et monuments de la ville et est entouré par l'extraordinaire beauté des églises, des bâtiments, des commerces et Monuments. Sublime Cliff fait partie d'un Palace 1800 restauré avec amour.",
+                    HotelName = "Sublime Palace Hotel",
+                    Description = "Sublime Palace Hotel is located in the heart of the historic center of Sublime in an extremely vibrant and lively area within short walking distance to the sites and landmarks of the city and is surrounded by the extraordinary beauty of churches, buildings, shops and monuments. Sublime Palace is part of a lovingly restored 1800 palace.",
+                    DescriptionFr = "Le Sublime Palace Hotel est situé au coeur du centre historique de sublime dans un quartier extrêmement animé et vivant, à courte distance de marche des sites et monuments de la ville et est entouré par l'extraordinaire beauté des églises, des bâtiments, des commerces et Monuments. Sublime Palace fait partie d'un Palace 1800 restauré avec amour.",
                     Category = "Boutique",
                     Tags = new[] { "concierge", "view", "24-hour front desk service" },
                     ParkingIncluded = true,

articles/search/includes/quickstarts/java.md

@@ -342,7 +342,7 @@ When uploading documents, you must use an [IndexDocumentsBatch](/java/api/com.az
 
         var hotel = new Hotel();
         hotel.hotelId = "1";
-        hotel.hotelName = "Secret Point Motel";
+        hotel.hotelName = "Stay-Kay City Hotel";
         hotel.description = "The hotel is ideally located on the main commercial artery of the city in the heart of New York. A few minutes away is Time's Square and the historic centre of the city, as well as other places of interest that make New York one of America's most attractive and cosmopolitan cities.";
         hotel.descriptionFr = "L'hôtel est idéalement situé sur la principale artère commerciale de la ville en plein cœur de New York. A quelques minutes se trouve la place du temps et le centre historique de la ville, ainsi que d'autres lieux d'intérêt qui font de New York l'une des villes les plus attractives et cosmopolites de l'Amérique.";
         hotel.category = "Boutique";
@@ -360,7 +360,7 @@ When uploading documents, you must use an [IndexDocumentsBatch](/java/api/com.az
 
         hotel = new Hotel();
         hotel.hotelId = "2";
-        hotel.hotelName = "Twin Dome Motel";
+        hotel.hotelName = "Old Century Hotel";
         hotel.description = "The hotel is situated in a  nineteenth century plaza, which has been expanded and renovated to the highest architectural standards to create a modern, functional and first-class hotel in which art and unique historical elements coexist with the most modern comforts.";
         hotel.descriptionFr = "L'hôtel est situé dans une place du XIXe siècle, qui a été agrandie et rénovée aux plus hautes normes architecturales pour créer un hôtel moderne, fonctionnel et de première classe dans lequel l'art et les éléments historiques uniques coexistent avec le confort le plus moderne.";
         hotel.category = "Boutique";
@@ -378,7 +378,7 @@ When uploading documents, you must use an [IndexDocumentsBatch](/java/api/com.az
 
         hotel = new Hotel();
         hotel.hotelId = "3";
-        hotel.hotelName = "Triple Landscape Hotel";
+        hotel.hotelName = "Gastronomic Landscape Hotel";
         hotel.description = "The Hotel stands out for its gastronomic excellence under the management of William Dough, who advises on and oversees all of the Hotel’s restaurant services.";
         hotel.descriptionFr = "L'hôtel est situé dans une place du XIXe siècle, qui a été agrandie et rénovée aux plus hautes normes architecturales pour créer un hôtel moderne, fonctionnel et de première classe dans lequel l'art et les éléments historiques uniques coexistent avec le confort le plus moderne.";
         hotel.category = "Resort and Spa";
@@ -396,9 +396,9 @@ When uploading documents, you must use an [IndexDocumentsBatch](/java/api/com.az
 
         hotel = new Hotel();
         hotel.hotelId = "4";
-        hotel.hotelName = "Sublime Cliff Hotel";
-        hotel.description = "Sublime Cliff Hotel is located in the heart of the historic center of Sublime in an extremely vibrant and lively area within short walking distance to the sites and landmarks of the city and is surrounded by the extraordinary beauty of churches, buildings, shops and monuments. Sublime Cliff is part of a lovingly restored 1800 palace.";
-        hotel.descriptionFr = "Le sublime Cliff Hotel est situé au coeur du centre historique de sublime dans un quartier extrêmement animé et vivant, à courte distance de marche des sites et monuments de la ville et est entouré par l'extraordinaire beauté des églises, des bâtiments, des commerces et Monuments. Sublime Cliff fait partie d'un Palace 1800 restauré avec amour.";
+        hotel.hotelName = "Sublime Palace Hotel";
+        hotel.description = "Sublime Palace Hotel is located in the heart of the historic center of Sublime in an extremely vibrant and lively area within short walking distance to the sites and landmarks of the city and is surrounded by the extraordinary beauty of churches, buildings, shops and monuments. Sublime Palace is part of a lovingly restored 1800 palace.";
+        hotel.descriptionFr = "Le Sublime Palace Hotel est situé au coeur du centre historique de sublime dans un quartier extrêmement animé et vivant, à courte distance de marche des sites et monuments de la ville et est entouré par l'extraordinaire beauté des églises, des bâtiments, des commerces et Monuments. Sublime Palace fait partie d'un Palace 1800 restauré avec amour.";
         hotel.category = "Boutique";
         hotel.tags = new String[] { "concierge", "view", "24-hour front desk service" };
         hotel.parkingIncluded = true;

articles/search/includes/quickstarts/javascript.md

@@ -339,7 +339,7 @@ Document inputs might be rows in a database, blobs in Blob storage, or, as in th
     "value": [
         {
             "HotelId": "1",
-            "HotelName": "Secret Point Motel",
+            "HotelName": "Stay-Kay City Hotel",
             "Description": "The hotel is ideally located on the main commercial artery of the city in the heart of New York. A few minutes away is Time's Square and the historic centre of the city, as well as other places of interest that make New York one of America's most attractive and cosmopolitan cities.",
             "Description_fr": "L'hôtel est idéalement situé sur la principale artère commerciale de la ville en plein cœur de New York. A quelques minutes se trouve la place du temps et le centre historique de la ville, ainsi que d'autres lieux d'intérêt qui font de New York l'une des villes les plus attractives et cosmopolites de l'Amérique.",
             "Category": "Boutique",
@@ -356,7 +356,7 @@ Document inputs might be rows in a database, blobs in Blob storage, or, as in th
         },
         {
             "HotelId": "2",
-            "HotelName": "Twin Dome Motel",
+            "HotelName": "Old Century Hotel",
             "Description": "The hotel is situated in a  nineteenth century plaza, which has been expanded and renovated to the highest architectural standards to create a modern, functional and first-class hotel in which art and unique historical elements coexist with the most modern comforts.",
             "Description_fr": "L'hôtel est situé dans une place du XIXe siècle, qui a été agrandie et rénovée aux plus hautes normes architecturales pour créer un hôtel moderne, fonctionnel et de première classe dans lequel l'art et les éléments historiques uniques coexistent avec le confort le plus moderne.",
             "Category": "Boutique",
@@ -373,7 +373,7 @@ Document inputs might be rows in a database, blobs in Blob storage, or, as in th
         },
         {
             "HotelId": "3",
-            "HotelName": "Triple Landscape Hotel",
+            "HotelName": "Gastronomic Landscape Hotel",
             "Description": "The Hotel stands out for its gastronomic excellence under the management of William Dough, who advises on and oversees all of the Hotel’s restaurant services.",
             "Description_fr": "L'hôtel est situé dans une place du XIXe siècle, qui a été agrandie et rénovée aux plus hautes normes architecturales pour créer un hôtel moderne, fonctionnel et de première classe dans lequel l'art et les éléments historiques uniques coexistent avec le confort le plus moderne.",
             "Category": "Resort and Spa",
@@ -390,9 +390,9 @@ Document inputs might be rows in a database, blobs in Blob storage, or, as in th
         },
         {
             "HotelId": "4",
-            "HotelName": "Sublime Cliff Hotel",
-            "Description": "Sublime Cliff Hotel is located in the heart of the historic center of Sublime in an extremely vibrant and lively area within short walking distance to the sites and landmarks of the city and is surrounded by the extraordinary beauty of churches, buildings, shops and monuments. Sublime Cliff is part of a lovingly restored 1800 palace.",
-            "Description_fr": "Le sublime Cliff Hotel est situé au coeur du centre historique de sublime dans un quartier extrêmement animé et vivant, à courte distance de marche des sites et monuments de la ville et est entouré par l'extraordinaire beauté des églises, des bâtiments, des commerces et Monuments. Sublime Cliff fait partie d'un Palace 1800 restauré avec amour.",
+            "HotelName": "Sublime Palace Hotel",
+            "Description": "Sublime Palace Hotel is located in the heart of the historic center of Sublime in an extremely vibrant and lively area within short walking distance to the sites and landmarks of the city and is surrounded by the extraordinary beauty of churches, buildings, shops and monuments. Sublime Palace is part of a lovingly restored 1800 palace.",
+            "Description_fr": "Le Sublime Palace Hotel est situé au coeur du centre historique de sublime dans un quartier extrêmement animé et vivant, à courte distance de marche des sites et monuments de la ville et est entouré par l'extraordinaire beauté des églises, des bâtiments, des commerces et Monuments. Sublime Palace fait partie d'un Palace 1800 restauré avec amour.",
             "Category": "Boutique",
             "Tags": ["concierge", "view", "24-hour front desk service"],
             "ParkingIncluded": true,
@@ -520,7 +520,7 @@ searchOptions = {
     searchFields: ["HotelName"]
 };
 
-searchResults = await searchClient.search("sublime cliff", searchOptions);
+searchResults = await searchClient.search("Sublime Palace", searchOptions);
 for await (const result of searchResults.results) {
     console.log(`${JSON.stringify(result.document)}`);
 }