Skip to content

Commit 4909a1c

Browse files
authored
Merge pull request #200524 from MicrosoftDocs/main
4 P.M. Publish for Sunday, 6/5/2022
2 parents ced4d0e + e6e1f6e commit 4909a1c

File tree

82 files changed

+203
-177
lines changed

Some content is hidden

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

82 files changed

+203
-177
lines changed

articles/active-directory/fundamentals/recover-from-deletions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ The most frequent scenarios for application deletion are:
108108

109109

110110

111-
When you delete an application, the application registration by default enters the soft-delete state. To understand the relationship between application registrations and service principals, see [Apps & service principals in Azure AD - Microsoft identity platform](../develop/app-objects-and-service-principals.md).
111+
When you delete an application, the application registration by default enters the soft-delete state. To understand the relationship between application registrations and service principals, see [Apps & service principals in Azure AD - Microsoft identity platform](/azure/active-directory/develop/app-objects-and-service-principals).
112112

113113

114114

@@ -143,7 +143,7 @@ For details on restoring soft deleted Microsoft 365 Groups, see the following do
143143

144144
### Applications
145145

146-
Applications have two objects, the application registration and the service principle. For more information on the differences between the registration and the service principal, see [Apps & service principals in Azure AD.](/develop/app-objects-and-service-principals.md)
146+
Applications have two objects, the application registration and the service principle. For more information on the differences between the registration and the service principal, see [Apps & service principals in Azure AD.](/azure/active-directory/develop/app-objects-and-service-principals)
147147

148148
To restore an application from the Azure portal, select App registrations, then deleted applications. Select the application registration to restore, and then select Restore app registration.
149149

articles/active-directory/governance/access-reviews-application-preparation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ The integration patterns listed above are applicable to third party SaaS applica
7070
Now that you have identified the integration pattern for the application, check the application as represented in Azure AD is ready for review.
7171

7272
1. In the Azure portal, click **Azure Active Directory**, click **Enterprise Applications**, and check whether your application is on the [list of enterprise applications](../manage-apps/view-applications-portal.md) in your Azure AD tenant.
73-
1. If the application is not already listed, then check if the application is available the [application gallery](../manage-apps/overview-application-gallery.md) for applications that can be integrated for federated SSO or provisioning. If it is in the gallery, then use the [tutorials](../saas-apps/tutorial-list.md) to configure the application for federation, and if it supports provisioning, also [configure the application](/app-provisioning/configure-automatic-user-provisioning-portal.md) for provisioning.
73+
1. If the application is not already listed, then check if the application is available the [application gallery](../manage-apps/overview-application-gallery.md) for applications that can be integrated for federated SSO or provisioning. If it is in the gallery, then use the [tutorials](../saas-apps/tutorial-list.md) to configure the application for federation, and if it supports provisioning, also [configure the application](/azure/active-directory/app-provisioning/configure-automatic-user-provisioning-portal) for provisioning.
7474
1. One the application is in the list of enterprise applications in your tenant, select the application from the list.
7575
1. Change to the **Properties** tab. Verify that the **User assignment required?** option is set to **Yes**. If it's set to **No**, all users in your directory, including external identities, can access the application, and you can't review access to the application.
7676

articles/aks/dapr.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ az k8s-extension delete --resource-group myResourceGroup --cluster-name myAKSClu
262262
[az-provider-register]: /cli/azure/provider#az-provider-register
263263
[sample-application]: ./quickstart-dapr.md
264264
[k8s-version-support-policy]: ./supported-kubernetes-versions.md?tabs=azure-cli#kubernetes-version-support-policy
265-
[arc-k8s-cluster]: ../azure-arc/kubernetes/quickstart-connect-cluster.md
265+
[arc-k8s-cluster]: /azure/azure-arc/kubernetes/quickstart-connect-cluster
266266
[update-extension]: ./cluster-extensions.md#update-extension-instance
267267
[install-cli]: /cli/azure/install-azure-cli
268268

@@ -276,4 +276,4 @@ az k8s-extension delete --resource-group myResourceGroup --cluster-name myAKSClu
276276
[dapr-oss-support]: https://docs.dapr.io/operations/support/support-release-policy/
277277
[dapr-supported-version]: https://docs.dapr.io/operations/support/support-release-policy/#supported-versions
278278
[dapr-troubleshooting]: https://docs.dapr.io/operations/troubleshooting/common_issues/
279-
[supported-cloud-regions]: https://azure.microsoft.com/global-infrastructure/services/?products=azure-arc
279+
[supported-cloud-regions]: https://azure.microsoft.com/global-infrastructure/services/?products=azure-arc

articles/app-service/quickstart-python-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ Having issues? [Let us know](https://aka.ms/FlaskCLIQuickstartHelp).
149149
## Next steps
150150

151151
> [!div class="nextstepaction"]
152-
> [Tutorial: Python (Django) web app with PostgreSQL](/azure/developer/python/tutorial-python-postgresql-app-portal)
152+
> [Tutorial: Python (Django) web app with PostgreSQL](/azure/app-service/tutorial-python-postgresql-app)
153153
154154
> [!div class="nextstepaction"]
155155
> [Configure Python app](configure-language-python.md)

articles/app-service/troubleshoot-dotnet-visual-studio.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ The tutorial assumes you're using Visual Studio 2019.
3333
The streaming logs feature only works for applications that target .NET Framework 4 or later.
3434

3535
## <a name="sitemanagement"></a>App configuration and management
36-
Visual Studio provides access to a subset of the app management functions and configuration settings available in the [Azure portal](https://go.microsoft.com/fwlink/?LinkId=529715). In this section, you'll see what's available by using **Server Explorer**. To see the latest Azure integration features, try out **Cloud Explorer** also. You can open both windows from the **View** menu.
36+
Visual Studio provides access to a subset of the app management functions and configuration settings available in the [Azure portal](/rest/api/appservice/web-apps). In this section, you'll see what's available by using **Server Explorer**. To see the latest Azure integration features, try out **Cloud Explorer** also. You can open both windows from the **View** menu.
3737

3838
1. If you aren't already signed in to Azure in Visual Studio, right-click **Azure** and select Connect to **Microsoft Azure Subscription** in **Server Explorer**.
3939

@@ -684,4 +684,4 @@ For more information about analyzing web server logs, see the following resource
684684
The Microsoft TechNet website includes a [Using Failed Request Tracing](https://www.iis.net/learn/troubleshoot/using-failed-request-tracing) section, which may be helpful for understanding how to use these logs. However, this documentation focuses mainly on configuring failed request tracing in IIS, which you can't do in Azure App Service.
685685
686686
[GetStarted]: quickstart-dotnetcore.md?pivots=platform-windows
687-
[GetStartedWJ]: https://github.com/Azure/azure-webjobs-sdk/wiki
687+
[GetStartedWJ]: https://github.com/Azure/azure-webjobs-sdk/wiki

articles/azure-australia/azure-key-vault.md

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,6 @@ Access to Key Vaults should be explicitly restricted to the minimum set of netwo
6767

6868
Key Vault supports BYOK. BYOK enables users to import keys from their existing key infrastructures. The BYOK toolset supports the secure transfer and import of keys from an external HSM (for example, keys generated with an offline workstation) into Key Vault.
6969

70-
Go to the Microsoft Download Center and [download the Azure Key Vault BYOK toolset](https://www.microsoft.com/download/details.aspx?id=45345) for Australia. The package name to download and its corresponding SHA-256 package hash are:
71-
72-
|Package Name|SHA-256 Hash|
73-
|---|---|
74-
|KeyVault-BYOK-Tools-Australia.zip|CD0FB7365053DEF8C35116D7C92D203C64A3D3EE2452A025223EEB166901C40A|
75-
|
76-
7770
### Key Vault auditing and logging
7871

7972
The ACSC requires Commonwealth entities to use the appropriate Azure services to undertake real-time monitoring and reporting on their Azure workloads.
@@ -168,4 +161,4 @@ SSE is used for managed disks but customer-managed keys are not supported. Encr
168161

169162
Review the article on [Identity Federation](identity-federation.md)
170163

171-
Review additional Azure Key Vault documentation and tutorials in the [Reference Library](reference-library.md)
164+
Review additional Azure Key Vault documentation and tutorials in the [Reference Library](reference-library.md)

0 commit comments

Comments
 (0)