Skip to content

Commit f4c74f8

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into vpnps1
2 parents ea38bc4 + 2b524ae commit f4c74f8

File tree

53 files changed

+1067
-951
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1067
-951
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24113,6 +24113,11 @@
2411324113
"redirect_url": "/azure/private-link/create-private-endpoint-portal",
2411424114
"redirect_document_id": false
2411524115
},
24116+
{
24117+
"source_path_from_root": "/articles/aks/use-multiple-node-pools.md",
24118+
"redirect_url": "/azure/aks/create-node-pools",
24119+
"redirect_document_id": false
24120+
},
2411624121
{
2411724122
"source_path_from_root": "/articles/reliability/migrate-app-service.md",
2411824123
"redirect_url": "/azure/reliability/reliability-app-service",

articles/active-directory/conditional-access/concept-conditional-access-cloud-apps.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,9 @@ When a Conditional Access policy targets the Microsoft Admin Portals cloud app,
155155

156156
Other Microsoft admin portals will be added over time.
157157

158+
> [!IMPORTANT]
159+
> Microsoft Admin Poratls (preview) is not currently supported in Government clouds.
160+
158161
> [!NOTE]
159162
> The Microsoft Admin Portals app applies to interactive sign-ins to the listed admin portals only. Sign-ins to the underlying resources or services like Microsoft Graph or Azure Resource Manager APIs are not covered by this application. Those resources are protected by the [Microsoft Azure Management](#microsoft-azure-management) app. This enables customers to move along the MFA adoption journey for admins without impacting automation that relies on APIs and PowerShell. When you are ready, Microsoft recommends using a [policy requiring administrators perform MFA always](howto-conditional-access-policy-admin-mfa.md) for comprehensive protection.
160163

articles/active-directory/conditional-access/how-to-policy-mfa-admin-portals.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ ms.collection: M365-identity-device-management
1919

2020
Microsoft recommends securing access to any Microsoft admin portals like Microsoft Entra, Microsoft 365, Exchange, and Azure. Using the [Microsoft Admin Portals (Preview)](concept-conditional-access-cloud-apps.md#microsoft-admin-portals-preview) app organizations can control interactive access to Microsoft admin portals.
2121

22+
> [!IMPORTANT]
23+
> Microsoft Admin Poratls (preview) is not currently supported in Government clouds.
24+
2225
## User exclusions
2326
[!INCLUDE [active-directory-policy-exclusions](../../../includes/active-directory-policy-exclude-user.md)]
2427

articles/advisor/advisor-reference-operational-excellence-recommendations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ Learn more about [Kubernetes service - EnableClusterAutoscaler (Enable the Clust
180180

181181
Some of the subnets for this cluster's node pools are full and cannot take any more worker nodes. Using the Azure CNI plugin requires to reserve IP addresses for each node and all the pods for the node at node provisioning time. If there is not enough IP address space in the subnet, no worker nodes can be deployed. Additionally, the AKS cluster cannot be upgraded if the node subnet is full.
182182

183-
Learn more about [Kubernetes service - NodeSubnetIsFull (The AKS node pool subnet is full)](../aks/use-multiple-node-pools.md#add-a-node-pool-with-a-unique-subnet).
183+
Learn more about [Kubernetes service - NodeSubnetIsFull (The AKS node pool subnet is full)](../aks/create-node-pools.md#add-a-node-pool-with-a-unique-subnet).
184184

185185
### Disable the Application Routing Addon
186186

articles/ai-services/openai/includes/dall-e-studio.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: nitinme
77
ms.service: cognitive-services
88
ms.subservice: openai
99
ms.topic: include
10-
ms.date: 04/04/2023
10+
ms.date: 08/04/2023
1111
keywords:
1212
---
1313

@@ -27,19 +27,19 @@ Use this guide to get started generating images with Azure OpenAI in your browse
2727

2828
Navigate to Azure OpenAI Studio at <a href="https://oai.azure.com/" target="_blank">https://oai.azure.com/</a> and sign in with the credentials associated with your OpenAI resource. During or after the sign-in workflow, select the appropriate directory, Azure subscription, and Azure OpenAI resource.
2929

30-
From the Azure OpenAI Studio landing page, select **DALL·E 2 playground** to use the image generation APIs.
30+
From the Azure OpenAI Studio landing page, select **DALL·E (Preview) playground** to use the image generation APIs.
3131

3232
## Try out image generation
3333

34-
Start exploring Azure OpenAI capabilities with a no-code approach through the DALL-E 2 playground. Enter your image prompt into the text box and select **Generate**. When the AI-generated image is ready, it will appear on the page.
34+
Start exploring Azure OpenAI capabilities with a no-code approach through the DALL·E (Preview) playground. Enter your image prompt into the text box and select **Generate**. When the AI-generated image is ready, it will appear on the page.
3535

3636
> [!NOTE]
3737
> The image generation APIs come with a content moderation filter. If the service recognizes your prompt as harmful content, it won't return a generated image. For more information, see the [content filter](../concepts/content-filter.md) guide.
3838
3939
:::image type="content" source="../media/quickstarts/dall-e-studio.png" alt-text="Screenshot of the Azure OpenAI Studio landing page." lightbox="../media/quickstarts/dall-e-studio.png":::
4040

4141

42-
In the DALL-E 2 playground, you can also view Python and cURL code samples, which are pre-filled according to your settings. Select **View code** near the top of the page. You can use this code to write an application that completes the same task.
42+
In the DALL·E (Preview) playground, you can also view Python and cURL code samples, which are pre-filled according to your settings. Select **View code** near the top of the page. You can use this code to write an application that completes the same task.
4343

4444
## Clean up resources
4545

137 KB
Loading
51.6 KB
Loading
1.35 MB
Loading
-45.1 KB
Loading
54.4 KB
Loading

0 commit comments

Comments
 (0)