Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into diskBilling

Author: roygara

.openpublishing.redirection.azure-monitor.json

@@ -9385,6 +9385,11 @@
             "redirect_url": "/visualstudio/containers/overview-local-process-kubernetes",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/docker/index.yml",
+            "redirect_url": "/dotnet/architecture/microservices/container-docker-introduction/docker-defined",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/vs-azure-tools-docker-edit-and-refresh.md",
             "redirect_url": "/visualstudio/docker/vs-azure-tools-docker-edit-and-refresh",

.openpublishing.redirection.json

@@ -218,45 +218,46 @@ Akamai Enterprise Application Access supports SAML federation with cloud IdPs li
    ```xml
    <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
    <TrustFrameworkPolicy
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns="http://schemas.microsoft.com/online/cpim/schemas/2013/06"
-    PolicySchemaVersion="0.3.0.0"
-    TenantId="fabrikam.onmicrosoft.com"
-    PolicyId="B2C_1A_signup_signin_saml"
-    PublicPolicyUri="http://fabrikam.onmicrosoft.com/B2C_1A_signup_signin_saml">
-    <BasePolicy>
-      <TenantId>fabrikam.onmicrosoft.com</TenantId>
-      <PolicyId>B2C_1A_TrustFrameworkExtensions</PolicyId>
-    </BasePolicy>
-
-    <UserJourneys>
-      <UserJourney Id="SignUpOrSignIn">
-        <OrchestrationSteps>
-          <OrchestrationStep Order="7" Type="SendClaims" CpimIssuerTechnicalProfileReferenceId="AkamaiSaml2AssertionIssuer"/>
-        </OrchestrationSteps>
-      </UserJourney>
-    </UserJourneys>
-    <RelyingParty>
-      <DefaultUserJourney ReferenceId="SignUpOrSignIn" />
-      <TechnicalProfile Id="PolicyProfile">
-        <DisplayName>PolicyProfile</DisplayName>
-        <Protocol Name="SAML2"/>
-        <OutputClaims>
-          <OutputClaim ClaimTypeReferenceId="displayName" />
-          <OutputClaim ClaimTypeReferenceId="givenName" />
-          <OutputClaim ClaimTypeReferenceId="surname" />
-          <OutputClaim ClaimTypeReferenceId="email" DefaultValue="" />
-          <OutputClaim ClaimTypeReferenceId="identityProvider" DefaultValue="" />
-          <OutputClaim ClaimTypeReferenceId="objectId" PartnerClaimType="objectId"/>
-        </OutputClaims>
-        <SubjectNamingInfo ClaimType="objectId" ExcludeAsClaim="true"/>
-      </TechnicalProfile>
-    </RelyingParty>
-    </TrustFrameworkPolicy>
-    ```
-  >[!NOTE]
-  >You can follow this same process to implement other types of flows, for example, sign-in, password reset, or profile editing flows.
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+     xmlns="http://schemas.microsoft.com/online/cpim/schemas/2013/06"
+     PolicySchemaVersion="0.3.0.0"
+     TenantId="fabrikam.onmicrosoft.com"
+     PolicyId="B2C_1A_signup_signin_saml"
+     PublicPolicyUri="http://fabrikam.onmicrosoft.com/B2C_1A_signup_signin_saml">
+     <BasePolicy>
+       <TenantId>fabrikam.onmicrosoft.com</TenantId>
+       <PolicyId>B2C_1A_TrustFrameworkExtensions</PolicyId>
+     </BasePolicy>
+
+     <UserJourneys>
+       <UserJourney Id="SignUpOrSignIn">
+         <OrchestrationSteps>
+           <OrchestrationStep Order="7" Type="SendClaims" CpimIssuerTechnicalProfileReferenceId="AkamaiSaml2AssertionIssuer"/>
+         </OrchestrationSteps>
+       </UserJourney>
+     </UserJourneys>
+     <RelyingParty>
+       <DefaultUserJourney ReferenceId="SignUpOrSignIn" />
+       <TechnicalProfile Id="PolicyProfile">
+         <DisplayName>PolicyProfile</DisplayName>
+         <Protocol Name="SAML2"/>
+         <OutputClaims>
+           <OutputClaim ClaimTypeReferenceId="displayName" />
+           <OutputClaim ClaimTypeReferenceId="givenName" />
+           <OutputClaim ClaimTypeReferenceId="surname" />
+           <OutputClaim ClaimTypeReferenceId="email" DefaultValue="" />
+           <OutputClaim ClaimTypeReferenceId="identityProvider" DefaultValue="" />
+           <OutputClaim ClaimTypeReferenceId="objectId" PartnerClaimType="objectId"/>
+         </OutputClaims>
+         <SubjectNamingInfo ClaimType="objectId" ExcludeAsClaim="true"/>
+       </TechnicalProfile>
+     </RelyingParty>
+   </TrustFrameworkPolicy>
+   ```
+
+   >[!NOTE]
+   >You can follow this same process to implement other types of flows, for example, sign-in, password reset, or profile editing flows.
 
 ### Step 4 - Upload your policy
 

articles/active-directory-b2c/partner-akamai-secure-hybrid-access.md

@@ -401,11 +401,11 @@ You can manage IP network rules for Azure AI services resources through the Azur
 
    ```azurepowershell-interactive
    $parameters = @{
-    "ResourceGroupName" = "myresourcegroup"
-    "Name" = "myaccount"
-    }
-    (Get-AzCognitiveServicesAccountNetworkRuleSet @parameters).IPRules
-    ```
+     "ResourceGroupName" = "myresourcegroup"
+     "Name" = "myaccount"
+   }
+   (Get-AzCognitiveServicesAccountNetworkRuleSet @parameters).IPRules
+   ```
 
 1. Add a network rule for an individual IP address.
 

articles/ai-services/cognitive-services-virtual-networks.md

@@ -191,7 +191,7 @@ The following steps are needed to get the required information to connect your c
 1. Get your container registry ID.
 
     ```azurecli-interactive
-    az acr show --resource-group cogserv-container-rg --name pattyregistry --query "id" --o table
+    az acr show --resource-group cogserv-container-rg --name pattyregistry --query "id" --output table
     ```
 
     Save the output for the scope parameter value, `<acrId>`, in the next step. It looks like:

articles/ai-services/containers/azure-kubernetes-recipe.md

@@ -212,47 +212,45 @@ The semantic schema of a document type is described via the fields it contains.
 
 * Currency: Currency amount with optional currency unit. A value, for example: ```InvoiceTotal: $123.45```
 
-    ```json
-    {
-        "amount": 123.45,
-        "currencySymbol": "$"
-    }
-        ```
+  ```json
+  {
+      "amount": 123.45,
+      "currencySymbol": "$"
+  }
+  ```
 
 * Address: Parsed address. For example: ```ShipToAddress: 123 Main St., Redmond, WA 98052```
 
-```json
-    {
-    "poBox": "PO Box 12",
-    "houseNumber": "123",
-    "streetName": "Main St.",
-    "city": "Redmond",
-    "state": "WA",
-    "postalCode": "98052",
-    "countryRegion": "USA",
-    "streetAddress": "123 Main St."
-    }
-
-```
+  ```json
+  {
+  "poBox": "PO Box 12",
+  "houseNumber": "123",
+  "streetName": "Main St.",
+  "city": "Redmond",
+  "state": "WA",
+  "postalCode": "98052",
+  "countryRegion": "USA",
+  "streetAddress": "123 Main St."
+  }
+  ```
 
 #### Structured types
 
 * Array: List of fields of the same type
 
-```json
-"Items": {
-    "type": "array",
-    "valueArray": [
-
-    ]
-}
-
-```
+  ```json
+  "Items": {
+      "type": "array",
+      "valueArray": [
+  
+      ]
+  }
+  ```
 
 * Object: Named list of subfields of potentially different types
 
-```json
-"InvoiceTotal": {
+  ```json
+  "InvoiceTotal": {
     "type": "currency",
     "valueCurrency": {
         "currencySymbol": "$",
@@ -281,8 +279,8 @@ The semantic schema of a document type is described via the fields it contains.
             "length": 7
         }
     ]
-}
-```
+  }
+  ```
 
 ## Next steps
 

articles/ai-services/document-intelligence/concept-analyze-document-response.md

@@ -1,5 +1,5 @@
 ---
-title: Azure resources - question answering
+title: Azure resources - custom question answering
 description: Question answering uses several Azure sources, each with a different purpose. Understanding how they are used individually allows you to plan for and select the correct pricing tier or know when to change your pricing tier. Understanding how they are used in combination allows you to find and fix problems when they occur.
 ms.service: azure-ai-language
 ms.topic: conceptual
@@ -9,14 +9,14 @@ ms.date: 12/19/2023
 ms.custom: language-service-question-answering
 ---
 
-# Azure resources for question answering
+# Azure resources for custom question answering
 
-Question answering uses several Azure sources, each with a different purpose. Understanding how they are used individually allows you to plan for and select the correct pricing tier or know when to change your pricing tier. Understanding how resources are used _in combination_ allows you to find and fix problems when they occur.
+Custom question answering uses several Azure sources, each with a different purpose. Understanding how they are used individually allows you to plan for and select the correct pricing tier or know when to change your pricing tier. Understanding how resources are used _in combination_ allows you to find and fix problems when they occur.
 
 ## Resource planning
 
 > [!TIP]
-> "Knowledge base" and "project" are equivalent terms in question answering and can be used interchangeably.
+> "Knowledge base" and "project" are equivalent terms in custom question answering and can be used interchangeably.
 
 When you first develop a project, in the prototype phase, it is common to have a single resource for both testing and production.
 
@@ -32,7 +32,7 @@ Typically there are three parameters you need to consider:
 
 * **The throughput you need**:
 
-    * The throughput for question answering is currently capped at 10 text records per second for both management APIs and prediction APIs.
+    * The throughput for custom question answering is currently capped at 10 text records per second for both management APIs and prediction APIs.
 
     * This should also influence your **Azure AI Search** SKU selection, see more details [here](../../../../search/search-sku-tier.md). Additionally, you may need to adjust Azure AI Search [capacity](../../../../search/search-capacity-planning.md) with replicas.
 
@@ -45,7 +45,7 @@ Typically there are three parameters you need to consider:
 
     For example, if your tier has 15 allowed indexes, you can publish 14 projects of the same language (one index per published project). The 15th index is used for all the projects for authoring and testing. If you choose to have projects in different languages, then you can only publish seven projects.
 
-* **Number of documents as sources**: There are no limits to the number of documents you can add as sources in question answering.
+* **Number of documents as sources**: There are no limits to the number of documents you can add as sources in custom question answering.
 
 The following table gives you some high-level guidelines.
 
@@ -58,10 +58,10 @@ The following table gives you some high-level guidelines.
 ## Recommended settings
 
 
-The throughput for question answering is currently capped at 10 text records per second for both management APIs and prediction APIs. To target 10 text records per second for your service, we recommend the S1 (one instance) SKU of Azure AI Search.
+The throughput for custom question answering is currently capped at 10 text records per second for both management APIs and prediction APIs. To target 10 text records per second for your service, we recommend the S1 (one instance) SKU of Azure AI Search.
 
 
-## Keys in question answering
+## Keys in custom question answering
 
 Your custom question answering feature deals with two kinds of keys: **authoring keys** and **Azure AI Search keys** used to access the service in the customer’s subscription.
 
@@ -70,7 +70,7 @@ Use these keys when making requests to the service through APIs.
 |Name|Location|Purpose|
 |--|--|--|
 |Authoring/Subscription key|[Azure portal](https://azure.microsoft.com/free/cognitive-services/)|These keys are used to access the Language service APIs). These APIs let you edit the questions and answers in your project, and publish your project. These keys are created when you create a new resource.<br><br>Find these keys on the **Azure AI services** resource on the **Keys and Endpoint** page.|
-|Azure AI Search Admin Key|[Azure portal](../../../../search/search-security-api-keys.md)|These keys are used to communicate with the Azure AI Search service deployed in the user’s Azure subscription. When you associate an Azure AI Search resource with the custom question answering feature, the admin key is automatically passed to question answering. <br><br>You can find these keys on the **Azure AI Search** resource on the **Keys** page.|
+|Azure AI Search Admin Key|[Azure portal](../../../../search/search-security-api-keys.md)|These keys are used to communicate with the Azure AI Search service deployed in the user’s Azure subscription. When you associate an Azure AI Search resource with the custom question answering feature, the admin key is automatically passed to custom question answering. <br><br>You can find these keys on the **Azure AI Search** resource on the **Keys** page.|
 
 ### Find authoring keys in the Azure portal
 
@@ -79,7 +79,7 @@ You can view and reset your authoring keys from the Azure portal, where you adde
 1. Go to the language resource in the Azure portal and select the resource that has the *Azure AI services* type:
 
     > [!div class="mx-imgBorder"]
-    > ![Screenshot of question answering resource list.](../../../qnamaker/media/qnamaker-how-to-setup-service/resources-created-question-answering.png)
+    > ![Screenshot of custom question answering resource list.](../../../qnamaker/media/qnamaker-how-to-setup-service/resources-created-question-answering.png)
 
 2. Go to **Keys and Endpoint**:
 
@@ -92,7 +92,7 @@ In custom question answering, both the management and the prediction services ar
 
 ## Resource purposes
 
-Each Azure resource created with Custom question answering feature has a specific purpose:
+Each Azure resource created with custom question answering feature has a specific purpose:
 
 * Language resource (Also referred to as a Text Analytics resource depending on the context of where you are evaluating the resource.)
 * Azure AI Search resource
@@ -120,4 +120,4 @@ With custom question answering, you have a choice to set up your service for pro
 
 ## Next steps
 
-* Learn about the question answering [projects](../How-To/manage-knowledge-base.md)
+* Learn about the custom question answering [projects](../How-To/manage-knowledge-base.md)