Skip to content

Commit 80e2d9d

Browse files
authored
Merge pull request #234149 from MicrosoftDocs/main
4/11/2023 PM Publish
2 parents 0b9fd07 + bf3f215 commit 80e2d9d

File tree

172 files changed

+3033
-894
lines changed

Some content is hidden

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

172 files changed

+3033
-894
lines changed

articles/active-directory/enterprise-users/clean-up-unmanaged-azure-ad-accounts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Run the following cmdlets:
6262

6363
To identify unmanaged Azure AD accounts, run:
6464

65-
* `Connect-MgGraph -Scope User.ReadAll`
65+
* `Connect-MgGraph -Scope User.Read.All`
6666
* `Get-MsIdUnmanagedExternalUser`
6767

6868
To reset unmanaged Azure AD account redemption status, run:

articles/active-directory/fundamentals/whats-new.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ For more information about Microsoft cloud settings for B2B collaboration., see:
171171
### Modernizing Terms of Use Experiences
172172

173173
**Type:** Plan for Change
174-
**Service category:** Access Reviews
174+
**Service category:** Terms of use
175175
**Product capability:** AuthZ/Access Delegation
176176

177177
Starting July 2023, we're modernizing the following Terms of Use end user experiences with an updated PDF viewer, and moving the experiences from https://account.activedirectory.windowsazure.com to https://myaccount.microsoft.com:

articles/aks/limit-egress-traffic.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ az group create --name $RG --location $LOC
321321

322322
Create a virtual network with two subnets to host the AKS cluster and the Azure Firewall. Each will have their own subnet. Let's start with the AKS network.
323323

324-
```
324+
```azurecli
325325
# Dedicated virtual network with AKS subnet
326326
327327
az network vnet create \
@@ -560,7 +560,7 @@ If you used authorized IP ranges for the cluster on the previous step, you must
560560

561561
Add another IP address to the approved ranges with the following command
562562

563-
```bash
563+
```azurecli
564564
# Retrieve your IP address
565565
CURRENT_IP=$(dig @resolver1.opendns.com ANY myip.opendns.com +short)
566566

articles/app-service/getting-started.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ zone_pivot_groups: app-service-getting-started-stacks
1717
| Action | Resources |
1818
| --- | --- |
1919
| **Create your first .NET app** | Using one of the following tools:<br><br>- [Visual Studio](./quickstart-dotnetcore.md?tabs=net60&pivots=development-environment-vs)<br>- [Visual Studio Code](./quickstart-dotnetcore.md?tabs=net60&pivots=development-environment-vscode)<br>- [Command line](./quickstart-dotnetcore.md?tabs=net60&pivots=development-environment-cli)<br>- [Azure PowerShell](./quickstart-dotnetcore.md?tabs=net60&pivots=development-environment-ps)<br>- [Azure portal](./quickstart-dotnetcore.md?tabs=net60&pivots=development-environment-azure-portal) |
20-
| **Deploy your app** | <br>-[Configure ASP.NET](./configure-language-dotnet-framework.md)<br>- [Configure ASP.NET core](./configure-language-dotnetcore.md?pivots=platform-linux)<br>- [GitHub actions](./deploy-github-actions.md) |
20+
| **Deploy your app** | - [Configure ASP.NET](./configure-language-dotnet-framework.md)<br>- [Configure ASP.NET core](./configure-language-dotnetcore.md?pivots=platform-linux)<br>- [GitHub actions](./deploy-github-actions.md) |
2121
| **Monitor your app**| - [Log stream](./troubleshoot-diagnostic-logs.md#stream-logs)<br>- [Diagnose and solve tool](./overview-diagnostics.md)|
2222
| **Add domains & certificates** |- [Map a custom domain](./app-service-web-tutorial-custom-domain.md?tabs=root%2Cazurecli)<br>- [Add SSL certificate](./configure-ssl-certificate.md)|
2323
| **Connect to a database** | - [.NET with Azure SQL Database](./app-service-web-tutorial-dotnet-sqldatabase.md)<br>- [.NET Core with Azure SQL DB](./tutorial-dotnetcore-sqldb-app.md)|
@@ -69,7 +69,7 @@ zone_pivot_groups: app-service-getting-started-stacks
6969
| Action | Resources |
7070
| --- | --- |
7171
| **Create your first PHP app** | Using one of the following tools:<br><br>- [Linux - CLI](./quickstart-php.md?tabs=cli&pivots=platform-linux)<br>- [Linux - Azure portal](./quickstart-php.md?tabs=portal&pivots=platform-linux) |
72-
| **Deploy your app** | <br>- [Configure PHP](./configure-language-php.md?pivots=platform-linux)<br>- [Deploy via FTP](./deploy-ftp.md?tabs=portal)|
72+
| **Deploy your app** | - [Configure PHP](./configure-language-php.md?pivots=platform-linux)<br>- [Deploy via FTP](./deploy-ftp.md?tabs=portal)|
7373
| **Monitor your app**|- [Troubleshoot with Azure Monitor](./tutorial-troubleshoot-monitor.md)<br>- [Log stream](./troubleshoot-diagnostic-logs.md#stream-logs)<br>- [Diagnose and solve tool](./overview-diagnostics.md)|
7474
| **Add domains & certificates** |- [Map a custom domain](./app-service-web-tutorial-custom-domain.md?tabs=root%2Cazurecli)<br>- [Add SSL certificate](./configure-ssl-certificate.md)|
7575
| **Connect to a database** | - [MySQL with PHP](./tutorial-php-mysql-app.md)|

articles/application-gateway/ingress-controller-install-new.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,10 +245,8 @@ Kubernetes. We'll use it to install the `application-gateway-kubernetes-ingress`
245245
sed -i "s|<applicationGatewayName>|${applicationGatewayName}|g" helm-config.yaml
246246
sed -i "s|<identityResourceId>|${identityResourceId}|g" helm-config.yaml
247247
sed -i "s|<identityClientId>|${identityClientId}|g" helm-config.yaml
248-
249-
# You can further modify the helm config to enable/disable features
250-
nano helm-config.yaml
251248
```
249+
252250
253251
> [!NOTE]
254252
> **For deploying to Sovereign Clouds (e.g., Azure Government)**, the `appgw.environment` configuration parameter must be added and set to the appropriate value as documented below.

articles/applied-ai-services/form-recognizer/containers/form-recognizer-disconnected-containers.md

Lines changed: 4 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.subservice: forms-recognizer
77
author: laujan
88
manager: nitinme
99
ms.topic: reference
10-
ms.date: 02/10/2023
10+
ms.date: 03/02/2023
1111
ms.author: lajanuar
1212
monikerRange: 'form-recog-2.1.0'
1313
recommendations: false
@@ -33,32 +33,7 @@ Before attempting to run a Docker container in an offline environment, make sure
3333

3434
## Request access to use containers in disconnected environments
3535

36-
Complete and submit the [request form](https://aka.ms/csdisconnectedcontainers) to request access to the containers disconnected from the Internet.
37-
38-
[!INCLUDE [Request access to public preview](../../../../includes/cognitive-services-containers-request-access.md)]
39-
40-
Access is limited to customers that meet the following requirements:
41-
42-
* Your organization should be identified as strategic customer or partner with Microsoft.
43-
* Disconnected containers are expected to run fully offline, hence your use cases must meet one of the following or similar requirements:
44-
* Environment or device(s) with zero connectivity to internet.
45-
* Remote location that occasionally has internet access.
46-
* Organization under strict regulation of not sending any kind of data back to cloud.
47-
* Application completed as instructed - Pay close attention to guidance provided throughout the application to ensure you provide all the necessary information required for approval.
48-
49-
## Create a new resource and purchase a commitment plan
50-
51-
1. Create a new [Form Recognizer resource](https://portal.azure.com/#create/Microsoft.CognitiveServicesFormRecognizer) in the Azure portal.
52-
53-
1. Enter the applicable information to create your resource. Be sure to select **Commitment tier disconnected containers** as your pricing tier.
54-
55-
> [!NOTE]
56-
>
57-
> * You will only see the option to purchase a commitment tier if you have been approved by Microsoft.
58-
59-
:::image type="content" source="../media/create-resource-offline-container.png" alt-text="A screenshot showing resource creation on the Azure portal.":::
60-
61-
1. Select **Review + Create** at the bottom of the page. Review the information, and select **Create**.
36+
Before you can use Form Recognizer containers in disconnected environments, you must first fill out and [submit a request form](../../../cognitive-services/containers/disconnected-containers.md#request-access-to-use-containers-in-disconnected-environments) and [purchase a commitment plan](../../../cognitive-services/containers/disconnected-containers.md#purchase-a-commitment-plan-to-use-containers-in-disconnected-environments).
6237

6338
## Gather required parameters
6439

@@ -246,16 +221,6 @@ This usage-logs endpoint returns a JSON response similar to the following exampl
246221
}
247222
```
248223

249-
### Purchase a different commitment plan for disconnected containers
250-
251-
Commitment plans for disconnected containers have a calendar year commitment period. When you purchase a plan, you're charged the full price immediately. During the commitment period, you can't change your commitment plan, however you can purchase more unit(s) at a pro-rated price for the remaining days in the year. You have until midnight (UTC) on the last day of your commitment, to end a commitment plan.
252-
253-
You can choose a different commitment plan in the **Commitment tier pricing** settings of your resource under the **Resource Management** section.
254-
255-
### End a commitment plan
256-
257-
If you decide that you don't want to continue purchasing a commitment plan, you can set your resource's auto-renewal to **Do not auto-renew**. Your commitment plan expires on the displayed commitment end date. After this date, you won't be charged for the commitment plan. You can continue using the Azure resource to make API calls, charged at pay-as-you-go pricing. You have until midnight (UTC) on the last day of the year to end a commitment plan for disconnected containers. If you cancel at or before that time, there are no charges for the next year.
258-
259224
## Troubleshooting
260225

261226
Run the container with an output mount and logging enabled. These settings enable the container generates log files that are helpful for troubleshooting issues that occur while starting or running the container.
@@ -265,4 +230,5 @@ Run the container with an output mount and logging enabled. These settings enabl
265230
266231
## Next steps
267232

268-
[Deploy the Sample Labeling tool to an Azure Container Instance (ACI)](../deploy-label-tool.md#deploy-with-azure-container-instances-aci)
233+
* [Deploy the Sample Labeling tool to an Azure Container Instance (ACI)](../deploy-label-tool.md#deploy-with-azure-container-instances-aci)
234+
* [Change or end a commitment plan](../../../cognitive-services/containers/disconnected-containers.md#purchase-a-different-commitment-plan-for-disconnected-containers)

articles/azure-arc/data/includes/azure-arc-data-preview-release.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@ ms.service: azure-arc
55
ms.topic: include
66
ms.date: 12/7/2022
77
---
8-
<!---
9-
At this time, a test or preview build is not available for the next release.
10-
-->
118

9+
At this time, a test or preview build is not available for the next release.
1210

11+
<!---
1312
April 2023 preview release is now available.
1413
1514
|Component|Value|
@@ -45,3 +44,4 @@ April 2023 preview release is now available.
4544
- Arc SQL Server | Azure Policy to enable best practices assessment at scale
4645
- Arc PostgreSQL | Ensure postgres extensions work per database/role.
4746
- Arc PostgreSQL | Upload metrics/logs to Azure Monitor
47+
-->

0 commit comments

Comments
 (0)