Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-includes-active-directory-cleanup-v14

Author: rolyon

articles/ai-services/openai/includes/use-your-data-common-variables.md

@@ -16,7 +16,7 @@ To successfully make a call against Azure OpenAI, you need the following variabl
 |--------------------------|-------------|
 | `AZURE_OPENAI_ENDPOINT`               | This value can be found in the **Keys & Endpoint** section when examining your Azure OpenAI resource from the Azure portal. Alternatively, you can find the value in **Azure AI studio** > **Chat playground** > **Code view**. An example endpoint is: `https://my-resoruce.openai.azure.com`.|
 | `AZURE_OPENAI_API_KEY` | This value can be found in **Resource management** > **Keys & Endpoint** section when examining your Azure OpenAI resource from the Azure portal. You can use either `KEY1` or `KEY2`. Always having two keys allows you to securely rotate and regenerate keys without causing a service disruption. |
-| `AZURE_OPEN_AI_DEPLOYMENT_ID` | This value corresponds to the custom name you chose for your deployment when you deployed a model. This value can be found under **Resource Management** > **Deployments** in the Azure portal or alternatively under **Management** > **Deployments** in Azure AI studio.|
+| `AZURE_OPENAI_DEPLOYMENT_ID` | This value corresponds to the custom name you chose for your deployment when you deployed a model. This value can be found under **Resource Management** > **Deployments** in the Azure portal or alternatively under **Management** > **Deployments** in Azure AI studio.|
 | `AZURE_AI_SEARCH_ENDPOINT` | This value can be found in the **Overview** section when examining your Azure AI Search resource from the Azure portal. |
 | `AZURE_AI_SEARCH_API_KEY` | This value can be found in the **Settings** > **Keys** section when examining your Azure AI Search resource from the Azure portal. You can use either the primary admin key or secondary admin key. Always having two keys allows you to securely rotate and regenerate keys without causing a service disruption. |
 | `AZURE_AI_SEARCH_INDEX` | This value corresponds to the name of the index you created to store your data. You can find it in the **Overview** section when examining your Azure AI Search resource from the Azure portal. |
@@ -56,7 +56,7 @@ setx AZURE_AI_SEARCH_INDEX REPLACE_WITH_YOUR_INDEX_NAME_HERE
 ```
 
 ```powershell
-[System.Environment]::SetEnvironmentVariable('AZURE_OPEN_AI_DEPLOYMENT_ID', 'REPLACE_WITH_YOUR_AOAI_DEPLOYMENT_VALUE_HERE', 'User')
+[System.Environment]::SetEnvironmentVariable('AZURE_OPENAI_DEPLOYMENT_ID', 'REPLACE_WITH_YOUR_AOAI_DEPLOYMENT_VALUE_HERE', 'User')
 ```
 
 ```powershell
@@ -80,7 +80,7 @@ export AZURE_OPENAI_ENDPOINT=REPLACE_WITH_YOUR_AOAI_ENDPOINT_VALUE_HERE
 export AZURE_OPENAI_API_KEY=REPLACE_WITH_YOUR_AOAI_KEY_VALUE_HERE
 ```
 ```Bash
-export AZURE_OPEN_AI_DEPLOYMENT_ID=REPLACE_WITH_YOUR_AOAI_DEPLOYMENT_VALUE_HERE
+export AZURE_OPENAI_DEPLOYMENT_ID=REPLACE_WITH_YOUR_AOAI_DEPLOYMENT_VALUE_HERE
 ```
 ```Bash
 export AZURE_AI_SEARCH_ENDPOINT=REPLACE_WITH_YOUR_AZURE_SEARCH_RESOURCE_VALUE_HERE

articles/ai-services/openai/includes/use-your-data-dotnet.md

@@ -5,7 +5,7 @@ author: travisw
 ms.author: travisw
 ms.service: azure-ai-openai
 ms.topic: include
-ms.date: 08/29/2023
+ms.date: 03/07/2024
 ---
 
 [!INCLUDE [Set up required variables](./use-your-data-common-variables.md)]
@@ -24,10 +24,10 @@ using static System.Environment;
 
 string azureOpenAIEndpoint = GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT");
 string azureOpenAIKey = GetEnvironmentVariable("AZURE_OPENAI_API_KEY");
+string deploymentName = GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_ID");
 string searchEndpoint = GetEnvironmentVariable("AZURE_AI_SEARCH_ENDPOINT");
 string searchKey = GetEnvironmentVariable("AZURE_AI_SEARCH_API_KEY");
 string searchIndex = GetEnvironmentVariable("AZURE_AI_SEARCH_INDEX");
-string deploymentName = GetEnvironmentVariable("AZURE_OPEN_AI_DEPLOYMENT_ID");
 
 
 var client = new OpenAIClient(new Uri(azureOpenAIEndpoint), new AzureKeyCredential(azureOpenAIKey));
@@ -130,10 +130,10 @@ using static System.Environment;
 
 string azureOpenAIEndpoint = GetEnvironmentVariable("AZURE_OPENAI_ENDPOINT");
 string azureOpenAIKey = GetEnvironmentVariable("AZURE_OPENAI_API_KEY");
+string deploymentName = GetEnvironmentVariable("AZURE_OPENAI_DEPLOYMENT_ID");
 string searchEndpoint = GetEnvironmentVariable("AZURE_AI_SEARCH_ENDPOINT");
 string searchKey = GetEnvironmentVariable("AZURE_AI_SEARCH_API_KEY");
 string searchIndex = GetEnvironmentVariable("AZURE_AI_SEARCH_INDEX");
-string deploymentName = GetEnvironmentVariable("AZURE_OPEN_AI_DEPLOYMENT_ID");
 
 
 var client = new OpenAIClient(new Uri(azureOpenAIEndpoint), new AzureKeyCredential(azureOpenAIKey));

articles/ai-services/openai/includes/use-your-data-go.md

@@ -5,7 +5,7 @@ author: travisw
 ms.author: travisw
 ms.service: azure-ai-openai
 ms.topic: include
-ms.date: 08/29/2023
+ms.date: 03/07/2024
 ---
 
 [!INCLUDE [Set up required variables](./use-your-data-common-variables.md)]
@@ -48,7 +48,7 @@ ms.date: 08/29/2023
    
    func main() {
    	azureOpenAIKey := os.Getenv("AZURE_OPENAI_API_KEY")
-   	modelDeploymentID := os.Getenv("AZURE_OPEN_AI_DEPLOYMENT_ID")
+   	modelDeploymentID := os.Getenv("AZURE_OPENAI_DEPLOYMENT_ID")
    
    	// Ex: "https://<your-azure-openai-host>.openai.azure.com"
    	azureOpenAIEndpoint := os.Getenv("AZURE_OPENAI_ENDPOINT")

articles/ai-services/openai/includes/use-your-data-javascript.md

@@ -41,10 +41,10 @@ const { OpenAIClient, AzureKeyCredential } = require("@azure/openai");
 // Set the Azure and AI Search values from environment variables
 const endpoint = process.env["AZURE_OPENAI_ENDPOINT"];
 const azureApiKey = process.env["AZURE_OPENAI_API_KEY"];
+const deploymentId = process.env["AZURE_OPENAI_DEPLOYMENT_ID"];
 const searchEndpoint = process.env["AZURE_AI_SEARCH_ENDPOINT"];
 const searchKey = process.env["AZURE_AI_SEARCH_API_KEY"];
 const searchIndex = process.env["AZURE_AI_SEARCH_INDEX"];
-const deploymentId = process.env["AZURE_OPEN_AI_DEPLOYMENT_ID"];
 
 
 async function main(){

articles/ai-services/openai/includes/use-your-data-python.md

@@ -5,7 +5,7 @@ author: mrbullwinkle #travisw
 ms.author: mbullwin #travisw
 ms.service: azure-ai-openai
 ms.topic: include
-ms.date: 11/09/2023
+ms.date: 03/07/2024
 ---
 
 [!INCLUDE [Set up required variables](./use-your-data-common-variables.md)]
@@ -82,12 +82,12 @@ pip install python-dotenv
 
        openai.requestssession = session
 
-   aoai_deployment_id = os.environ.get("AZURE_OPEN_AI_DEPLOYMENT_ID")
+   aoai_deployment_id = os.environ.get("AZURE_OPENAI_DEPLOYMENT_ID")
    setup_byod(aoai_deployment_id)
 
    completion = openai.ChatCompletion.create(
        messages=[{"role": "user", "content": "What are the differences between Azure Machine Learning and Azure AI services?"}],
-       deployment_id=os.environ.get("AZURE_OPEN_AI_DEPLOYMENT_ID"),
+       deployment_id=os.environ.get("AZURE_OPENAI_DEPLOYMENT_ID"),
        dataSources=[  # camelCase is intentional, as this is the format the API expects
            {
                "type": "AzureCognitiveSearch",
@@ -113,7 +113,7 @@ dotenv.load_dotenv()
 
 endpoint = os.environ.get("AZURE_OPENAI_ENDPOINT")
 api_key = os.environ.get("AZURE_OPENAI_API_KEY")
-deployment = os.environ.get("AZURE_OPEN_AI_DEPLOYMENT_ID")
+deployment = os.environ.get("AZURE_OPENAI_DEPLOYMENT_ID")
 
 client = openai.AzureOpenAI(
     base_url=f"{endpoint}/openai/deployments/{deployment}/extensions",

articles/ai-services/openai/includes/use-your-data-rest.md

@@ -5,7 +5,7 @@ author: aahill
 ms.author: aahi
 ms.service: azure-ai-openai
 ms.topic: include
-ms.date: 08/11/2023
+ms.date: 03/07/2024
 ---
 
 [!INCLUDE [Set up required variables](./use-your-data-common-variables.md)]
@@ -20,26 +20,26 @@ To trigger a response from the model, you should end with a user message indicat
 > There are several parameters you can use to change the model's response, such as `temperature` or `top_p`. See the [reference documentation](../reference.md#completions-extensions) for more information.
 
 ```bash
-curl -i -X POST $AZURE_OPENAI_ENDPOINT/openai/deployments/$AZURE_OPEN_AI_DEPLOYMENT_ID/extensions/chat/completions?api-version=2023-06-01-preview \
+curl -i -X POST $AZURE_OPENAI_ENDPOINT/openai/deployments/$AZURE_OPENAI_DEPLOYMENT_ID/chat/completions?api-version=2024-02-15-preview \
 -H "Content-Type: application/json" \
 -H "api-key: $AZURE_OPENAI_API_KEY" \
 -d \
 '
 {
-    "dataSources": [
+    "data_sources": [
         {
             "type": "AzureCognitiveSearch",
             "parameters": {
                 "endpoint": "'$AZURE_AI_SEARCH_ENDPOINT'",
                 "key": "'$AZURE_AI_SEARCH_API_KEY'",
-                "indexName": "'$AZURE_AI_SEARCH_INDEX'"
+                "index_name": "'$AZURE_AI_SEARCH_INDEX'"
             }
         }
     ],
     "messages": [
         {
             "role": "user",
-            "content": "What are the differences between Azure Machine Learning and Azure AI services?"
+            "content": "Tell me an interesting fact"
         }
     ]
 }
@@ -51,26 +51,37 @@ curl -i -X POST $AZURE_OPENAI_ENDPOINT/openai/deployments/$AZURE_OPEN_AI_DEPLOYM
 ```json
 {
     "id": "12345678-1a2b-3c4e5f-a123-12345678abcd",
-    "model": "",
-    "created": 1684304924,
-    "object": "chat.completion",
+    "model": "gpt-4",
+    "created": 1709835345,
+    "object": "extensions.chat.completion",
     "choices": [
         {
             "index": 0,
-            "messages": [
-                {
-                    "role": "tool",
-                    "content": "{\"citations\": [{\"content\": \"\\nAzure AI services are cloud-based artificial intelligence (AI) services...\", \"id\": null, \"title\": \"What is Azure AI services\", \"filepath\": null, \"url\": null, \"metadata\": {\"chunking\": \"orignal document size=250. Scores=0.4314117431640625 and 1.72564697265625.Org Highlight count=4.\"}, \"chunk_id\": \"0\"}], \"intent\": \"[\\\"Learn about Azure AI services.\\\"]\"}",
-                    "end_turn": false
-                },
-                {
-                    "role": "assistant",
-                    "content": " \nAzure AI services are cloud-based artificial intelligence (AI) services that help developers build cognitive intelligence into applications without having direct AI or data science skills or knowledge. [doc1]. Azure Machine Learning is a cloud service for accelerating and managing the machine learning project lifecycle. [doc1].",
-                    "end_turn": true
+            "finish_reason": "stop",
+            "message": {
+                "role": "assistant",
+                "content": "An interesting fact from the retrieved document is... [doc1].",
+                "end_turn": true,
+                "context": {
+                    "citations": [
+                        {
+                            "content": "...",
+                            "title": "...",
+                            "url": "https://mysearch.blob.core.windows.net/xyz/001.txt",
+                            "filepath": "001.txt",
+                            "chunk_id": "0"
+                        }
+                    ],
+                    "intent": "[\"Interesting facts\"]"
                 }
-            ]
+            }
         }
-    ]
+    ],
+    "usage": {
+        "prompt_tokens": 3779,
+        "completion_tokens": 105,
+        "total_tokens": 3884
+    }
 }
 ```
 

articles/peering-service/azure-portal.md

@@ -56,7 +56,7 @@ Sign in to the [Azure portal](https://portal.azure.com).
 
 1. Select the **provider backup peering location** as the next closest to your network location. A peering service will be active via the backup peering location only in the event of failure of primary peering service location for disaster recovery. If **None** is selected, internet is the default failover route in the event of primary peering service location failure.
 
-1. Under the **Prefixes** section, select **Create new prefix**. In **Name**, enter a name for the prefix resource. Enter the prefixes that are associated with the service provider in **Prefix**. In **Prefix key**, enter the prefix key that was given to you by your provider (ISP or IXP). This key allows Microsoft to validate the prefix and provider who have allocated your IP prefix. If your provider is a Route Server partner, you can create all of your prefixes with the same Peering Service prefix key.
+1. Under the **Prefixes** section, select **Create new prefix**. In **Name**, enter a name for the prefix resource. Enter the prefixes that are associated with the service provider in **Prefix**. In **Prefix key**, enter the prefix key that was given to you by your provider (ISP or IXP). This key allows Microsoft to validate the prefix and provider who allocated your IP prefix. If your provider is a Route Server partner, you can create all of your prefixes with the same Peering Service prefix key.
 
     :::image type="content" source="./media/azure-portal/peering-service-configuration.png" alt-text="Screenshot of the Configuration tab of Create a peering service connection in Azure portal."::: 
 
@@ -70,7 +70,7 @@ Sign in to the [Azure portal](https://portal.azure.com).
 
     :::image type="content" source="./media/azure-portal/peering-service-prefix-validation.png" alt-text="Screenshot shows the validation status of the prefixes." lightbox="./media/azure-portal/peering-service-prefix-validation.png":::
 
-If the validation fails, one of the following error messages is displayed:
+If the validation fails, you might see one of the following error messages:
 
    - Invalid Peering Service prefix, the prefix should be valid format, only IPv4 prefix is supported currently.
    - Prefix wasn't received from Peering Service provider, contact Peering Service provider.
@@ -104,7 +104,7 @@ Review the [Technical requirements for Peering Service prefixes](../internet-pee
 
     :::image type="content" source="./media/azure-portal/peering-service-delete.png" alt-text="Screenshot of deleting a Peering Service in Azure portal.":::
 
-## Modifying the primary or backup peering location
+## Modify the primary or backup peering location
 
 If you would like to change the primary or backup peering location in your Peering Service, reach out to [email protected]. Provide the resource ID of the peering service to modify, and the new primary and backup locations you'd like to be configured.
 

articles/virtual-machines/linux/faq.yml

@@ -6,7 +6,7 @@ metadata:
   ms.service: virtual-machines
   ms.collection: linux
   ms.topic: faq
-  ms.date: 05/08/2019
+  ms.date: 03/06/2024
   ms.author: jushiman
 title: Frequently asked question about Linux Virtual Machines
 summary: |
@@ -114,9 +114,9 @@ sections:
           What are the password requirements when creating a VM?
         answer: |
           There are varying password length requirements, depending on the tool you are using:
-           - Portal - between 12 - 72 characters
-           - PowerShell - between 8 - 123 characters
-           - CLI - between 12 - 123 characters
+           - Azure portal - between 12 - 72 characters
+           - Azure PowerShell - between 8 - 123 characters
+           - Azure CLI - between 12 - 123 characters
            - Azure Resource Manager (ARM) templates - 12 - 72 characters and control characters are not allowed
            
           

articles/virtual-machines/windows/faq.yml

@@ -6,7 +6,7 @@ metadata:
   ms.service: virtual-machines
   ms.collection: windows
   ms.topic: faq
-  ms.date: 05/08/2019
+  ms.date: 03/06/2024
   ms.author: jushiman
 title: Frequently asked question about Windows Virtual Machines
 summary: |
@@ -21,7 +21,7 @@ sections:
         answer: |
           All subscribers can run server software on an Azure virtual machine. For information about the support policy for running Microsoft server software in Azure, see [Microsoft server software support for Azure Virtual Machines](https://support.microsoft.com/kb/2721672).
           
-          Certain versions of Windows 7, Windows 8.1, and Windows 10 are available to MSDN Azure benefit subscribers and MSDN Dev and Test Pay-As-You-Go subscribers, for development and test tasks. For details, including instructions and limitations, see [Windows Client images for MSDN subscribers](/azure/virtual-machines/windows/client-images). 
+          Certain versions of Windows 7, Windows 8.1, and Windows 10 are available to MSDN Azure benefit subscribers and MSDN Dev and Test Pay-As-You-Go subscribers, for development and test tasks. For details, including instructions and limitations, see [Windows Client images for MSDN subscribers](client-images.md). 
           
       - question: |
           How much storage can I use with a virtual machine?
@@ -140,9 +140,9 @@ sections:
           What are the password requirements when creating a VM?
         answer: |
           There are varying password length requirements, depending on the tool you are using:
-           - Portal - between 12 - 123 characters
-           - PowerShell - between 8 - 123 characters
-           - CLI - between 12 - 123
+           - Azure portal - between 12 - 123 characters
+           - Azure PowerShell - between 8 - 123 characters
+           - Azure CLI - between 12 - 123
           
           * Have lower characters
           * Have upper characters