Merge pull request #256788 from MicrosoftDocs/main

10/31/2023 AM Publish

Author: Taojunshen

.openpublishing.redirection.json

@@ -24661,6 +24661,16 @@
             "redirect_url": "/azure/load-balancer/upgrade-basic-standard-with-powershell",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/energy-data-services/reliability-energy-data-services.md",
+            "redirect_url": "/azure/reliability/reliability-energy-data-services",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/deployment-environments/concept-environments-reliability-availability.md",
+            "redirect_url": "/azure/reliability/reliability-deployment-environments",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/spring-apps/how-to-enable-redundancy-and-disaster-recovery.md",
             "redirect_url": "/azure/reliability/reliability-spring-apps",
@@ -24835,6 +24845,6 @@
             "source_path_from_root": "/articles/orbital/delete-contact.md",
 	    "redirect_url": "/azure/orbital/spacecraft-object",
             "redirect_document_id": false
-        },
+        }
     ]
 }

.openpublishing.redirection.reliability.json

@@ -1,9 +1,5 @@
 {
   "redirections": [
-    {
-      "source_path_from_root": "/articles/reliability/reliability-energy-data-services.md",
-      "redirect_url": "/azure/energy-data-services/reliability-energy-data-services",
-      "redirect_document_id": true
-    }
+   
   ]
 }

README.md

@@ -20,7 +20,11 @@ To install the necessary tools, follow the instructions for [Install content aut
 
 ## License
 
-Please refer to [LICENSE](LICENSE), [LICENSE-CODE](LICENSE-CODE), and [ThirdPartyNotices](ThirdPartyNotices.md) for all Licensing information.
+For all licensing information, refer to:
+
+- [LICENSE](LICENSE)
+- [LICENSE-CODE](LICENSE-CODE)
+- [ThirdPartyNotices](ThirdPartyNotices.md)
 
 ## Code of Conduct
 

articles/active-directory-b2c/custom-domain.md

@@ -22,6 +22,7 @@ zone_pivot_groups: b2c-policy-type
 This article describes how to enable custom domains in your redirect URLs for Azure Active Directory B2C (Azure AD B2C). By using a verified custom domain, you've benefits such as: 
 
 - It provides a more seamless user experience. From the user's perspective, they remain in your domain during the sign in process rather than redirecting to the Azure AD B2C default domain *<tenant-name>.b2clogin.com*.
+-  By staying in the same domain for your application during sign-in, you mitigate the impact of [third-party cookie blocking](/azure/active-directory/develop/reference-third-party-cookies-spas). 
 
 - You increase the number of objects (user accounts and applications) you can create in your Azure AD B2C tenant from the default 1.25 million to 5.25 million. 
 

articles/active-directory-b2c/faq.yml

@@ -8,10 +8,10 @@ metadata:
   ms.service: active-directory
   ms.workload: identity
   ms.topic: faq
-  ms.date: 07/13/2023
+  ms.date: 10/31/2023
   ms.author: godonnell
   ms.subservice: B2C
-  ms.custom: b2c-support, has-azure-ad-ps-ref
+  ms.custom: b2c-support, has-azure-ad-ps-ref,azure-ad-ref-level-one-done
 title: 'Azure AD B2C: Frequently asked questions (FAQ)'
 summary: This page answers frequently asked questions about the Azure Active Directory B2C (Azure AD B2C). Keep checking back for updates.
 

articles/active-directory-b2c/force-password-reset.md

@@ -9,10 +9,10 @@ manager: CelesteDG
 ms.service: active-directory
 ms.workload: identity
 ms.topic: how-to
-ms.date: 06/26/2023
+ms.date: 10/31/2023
 ms.author: kengaderdus
 ms.subservice: B2C
-ms.custom: b2c-support, has-azure-ad-ps-ref
+ms.custom: b2c-support, has-azure-ad-ps-ref,azure-ad-ref-level-one-done
 zone_pivot_groups: b2c-policy-type
 ---
 
@@ -171,3 +171,4 @@ Update-MgDomain -DomainId $domainId -BodyParameter $params
 ## Next steps
 
 Set up a [self-service password reset](add-password-reset-policy.md).
+

articles/ai-services/openai/concepts/content-filter.md

@@ -294,6 +294,9 @@ When annotations are enabled as shown in the code snippet below, the following i
 
 Annotations are currently in preview for Completions and Chat Completions (GPT models); the following code snippet shows how to use annotations in preview:
 
+# [Python](#tab/python)
+
+
 ```python
 # Note: The openai-python library support for Azure OpenAI is in preview.
 # os.getenv() for the endpoint and key assumes that you are using environment variables.
@@ -413,6 +416,72 @@ except openai.error.InvalidRequestError as e:
 
 ```
 
+# [JavaScript](#tab/javascrit)
+
+[Azure OpenAI JavaScript SDK source code & samples](https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/openai/openai)
+
+```javascript
+
+import { OpenAIClient, AzureKeyCredential } from "@azure/openai";
+
+// Load the .env file if it exists
+import * as dotenv from "dotenv";
+dotenv.config();
+
+// You will need to set these environment variables or edit the following values
+const endpoint = process.env["ENDPOINT"] || "<endpoint>";
+const azureApiKey = process.env["AZURE_API_KEY"] || "<api key>";
+
+const messages = [
+  { role: "system", content: "You are a helpful assistant. You will talk like a pirate." },
+  { role: "user", content: "Can you help me?" },
+  { role: "assistant", content: "Arrrr! Of course, me hearty! What can I do for ye?" },
+  { role: "user", content: "What's the best way to train a parrot?" },
+];
+
+export async function main() {
+  console.log("== Get completions Sample ==");
+
+  const client = new OpenAIClient(endpoint, new AzureKeyCredential(azureApiKey));
+  const deploymentId = "text-davinci-003";
+  const events = await client.listChatCompletions(deploymentId, messages, { maxTokens: 128 });
+
+  for await (const event of events) {
+    for (const choice of event.choices) {
+      console.log(choice.message);
+      if (!choice.contentFilterResults) {
+        console.log("No content filter is found");
+        return;
+      }
+      if (choice.contentFilterResults.error) {
+        console.log(
+          `Content filter ran into the error ${choice.contentFilterResults.error.code}: ${choice.contentFilterResults.error.message}`
+        );
+      } else {
+        const { hate, sexual, selfHarm, violence } = choice.contentFilterResults;
+        console.log(
+          `Hate category is filtered: ${hate?.filtered} with ${hate?.severity} severity`
+        );
+        console.log(
+          `Sexual category is filtered: ${sexual?.filtered} with ${sexual?.severity} severity`
+        );
+        console.log(
+          `Self-harm category is filtered: ${selfHarm?.filtered} with ${selfHarm?.severity} severity`
+        );
+        console.log(
+          `Violence category is filtered: ${violence?.filtered} with ${violence?.severity} severity`
+        );
+      }
+    }
+  }
+}
+
+main().catch((err) => {
+  console.error("The sample encountered an error:", err);
+});
+```
+---
+
 For details on the inference REST API endpoints for Azure OpenAI and how to create Chat and Completions please follow [Azure OpenAI Service REST API reference guidance](../reference.md). Annotations are returned for all scenarios when using `2023-06-01-preview`.
 
 ### Example scenario: An input prompt containing content that is classified at a filtered category and severity level is sent to the completions API

articles/ai-services/openai/reference.md

@@ -59,6 +59,7 @@ POST https://{your-resource-name}.openai.azure.com/openai/deployments/{deploymen
 - `2023-06-01-preview` [Swagger spec](https://github.com/Azure/azure-rest-api-specs/blob/main/specification/cognitiveservices/data-plane/AzureOpenAI/inference/preview/2023-06-01-preview/inference.json)
 - `2023-07-01-preview` [Swagger spec](https://github.com/Azure/azure-rest-api-specs/blob/main/specification/cognitiveservices/data-plane/AzureOpenAI/inference/preview/2023-07-01-preview/inference.json)
 - `2023-08-01-preview` [Swagger spec](https://github.com/Azure/azure-rest-api-specs/blob/main/specification/cognitiveservices/data-plane/AzureOpenAI/inference/preview/2023-08-01-preview/inference.json)
+- `2023-09-01-preview` [Swagger spec](https://github.com/Azure/azure-rest-api-specs/blob/main/specification/cognitiveservices/data-plane/AzureOpenAI/inference/preview/2023-09-01-preview/inference.json)
 
 **Request body**
 

articles/aks/concepts-security.md

@@ -62,7 +62,7 @@ Node authorization is a special-purpose authorization mode that specifically aut
 
 ### Node deployment
 
-Nodes are deployed onto a private virtual network subnet, with no public IP addresses assigned. For troubleshooting and management purposes, SSH is enabled by default and only accessible using the internal IP address. Disabling SSH is during cluster and node pool creation, or for an existing cluster or node pool is in preview. See [Manage SSH access][manage-ssh-access] for more information. 
+Nodes are deployed onto a private virtual network subnet, with no public IP addresses assigned. For troubleshooting and management purposes, SSH is enabled by default and only accessible using the internal IP address. Disabling SSH during cluster and node pool creation, or for an existing cluster or node pool, is in preview. See [Manage SSH access][manage-ssh-access] for more information. 
 
 ### Node storage
 
@@ -172,4 +172,4 @@ For more information on core Kubernetes and AKS concepts, see:
 [network-policy]: use-network-policies.md
 [microsoft-vulnerability-management-aks]: concepts-vulnerability-management.md
 [aks-vulnerability-management-nodes]: concepts-vulnerability-management.md#worker-nodes
-[manage-ssh-access]: manage-ssh-node-access.md
+[manage-ssh-access]: manage-ssh-node-access.md

articles/application-gateway/for-containers/troubleshooting-guide.md

@@ -71,7 +71,8 @@ Logs can be collected from the ALB Controller by using the _kubectl logs_ comman
     You should see the following if the pod is primary: `successfully acquired lease azure-alb-system/alb-controller-leader-election`
 
 2. Collect the logs
-    Logs from ALB Controller will be returned in JSON format.
+
+   Logs from ALB Controller will be returned in JSON format.
 
     Execute the following kubectl command, replacing the name with the pod name returned in step 1:
     ```bash