Skip to content

Commit 00f5907

Browse files
authored
Merge branch 'MicrosoftDocs:main' into vabachu/update-dtv2-host-json
2 parents 6bcb4c6 + 5f56526 commit 00f5907

File tree

270 files changed

+5240
-3505
lines changed

Some content is hidden

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

270 files changed

+5240
-3505
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/network-watcher/nsg-flow-logs-rest.md",
5+
"redirect_url": "/previous-versions/azure/network-watcher/nsg-flow-logs-rest",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path": "articles/automation/update-management/configure-alerts.md",
510
"redirect_url": "/azure/update-manager/manage-alerts",

articles/active-directory-b2c/enable-authentication-wpf-desktop-app-options.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,4 +129,4 @@ During the [desktop app registration](configure-authentication-sample-wpf-deskto
129129

130130
## Next steps
131131

132-
- To learn more, see [MSAL for .NET, UWP, NetCore, and Xamarin configuration options](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/wiki).
132+
- To learn more, see [MSAL for .NET, UWP and NetCore configuration options](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/wiki).

articles/active-directory-b2c/index-mobile.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,3 @@ landingContent:
5050
links:
5151
- text: iOS (Objective-C)
5252
url: https://github.com/Azure-Samples/active-directory-b2c-ios-native-appauth
53-
- text: Xamarin native
54-
url: https://github.com/Azure-Samples/active-directory-b2c-xamarin-native

articles/active-directory-b2c/integrate-with-app-code-samples.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ The following tables provide links to samples for applications including iOS, An
4747
| [ios-native-appauth](https://github.com/Azure-Samples/active-directory-b2c-ios-native-appauth) | A sample that shows how you can use a third-party library to build an iOS application in Objective-C that authenticates Microsoft identity users to our Azure AD B2C identity service. |
4848
| [android-native-appauth](https://github.com/Azure-Samples/active-directory-b2c-android-native-appauth) | A sample that shows how you can use a third-party library to build an Android application that authenticates Microsoft identity users to our B2C identity service and calls a web API using OAuth 2.0 access tokens. |
4949
| [dotnet-desktop](https://github.com/Azure-Samples/active-directory-b2c-dotnet-desktop) | A sample that shows how a Windows Desktop .NET (WPF) application can sign in a user using Azure AD B2C, get an access token using MSAL.NET and call an API. |
50-
| [xamarin-native](https://github.com/Azure-Samples/active-directory-b2c-xamarin-native) | A simple Xamarin Forms app showcasing how to use MSAL to authenticate users via Azure Active Directory B2C, and access a Web API with the resulting tokens. |
5150

5251
## Console/Daemon apps
5352

articles/api-management/add-api-manually.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: api-management
55
author: dlepow
66

77
ms.service: azure-api-management
8-
ms.topic: tutorial
8+
ms.topic: how-to
99
ms.date: 06/30/2022
1010
ms.author: danlep
1111
ms.custom: fasttrack-edit, devdivchpfy22
@@ -18,7 +18,7 @@ ms.custom: fasttrack-edit, devdivchpfy22
1818

1919
This article shows steps to add an API manually to the API Management instance. When you want to mock the API, you can create a blank API or define it manually. For details about mocking an API, see [Mock API responses](mock-api-responses.md).
2020

21-
If you want to import an existing API, see [related topics](#related-topics) section.
21+
If you want to import an existing API, see [related content](#related-content) section.
2222

2323
In this article, we create a blank API and specify [httpbin.org](https://httpbin.org) (a public testing service) as a backend API.
2424

@@ -119,8 +119,3 @@ Test the operation in the Azure portal. You can also test it in the **Developer
119119
[!INCLUDE [api-management-navigate-to-instance.md](../../includes/api-management-append-apis.md)]
120120

121121
[!INCLUDE [api-management-define-api-topics.md](../../includes/api-management-define-api-topics.md)]
122-
123-
## Next steps
124-
125-
> [!div class="nextstepaction"]
126-
> [Transform and protect a published API](transform-api.md)

articles/api-management/api-management-debug-policies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ If there is an error during policy execution, you will see the details of the er
6868
> Remember to exit the debug session by clicking the **Stop** button when you are finished.
6969
7070

71-
## Next steps
71+
## Related content
7272

7373
+ Learn more about the [API Management extension for Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-apimanagement).
7474
+ Report issues in the [GitHub repository](https://github.com/Microsoft/vscode-apimanagement)

articles/api-management/api-management-howto-configure-custom-domain-gateway.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@ Add a custom domain certificate (.PFX) file to your API Management instance, or
5656

5757
> [!NOTE]
5858
> If clients connecting to the self-hosted gateway using the custom domain expect to be presented with all intermediate certificates in the chain, you must upload individual CA certificates to your API Management Service and associate them with the self-hosted gateway. For instructions on how to achieve this, see [Create custom CA for self-hosted gateway](api-management-howto-ca-certificates.md#create-custom-ca-for-self-hosted-gateway) .
59-
## Next steps
59+
## Related content
6060

6161
[Upgrade and scale your service](upgrade-and-scale.md)

articles/api-management/api-management-howto-configure-notifications.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Recipients of email notifications from API Management could be affected when you
112112

113113
* **DKIM authentication** - To generate a valid signature for DKIM for email authentication, API Management requires the private key associated with the domain of the originating email address. However, it is currently not possible to upload this private key in API Management. Therefore, to assign a valid signature, API Management uses the private key associated with the `mail.windowsazure.com` domain.
114114

115-
## Next steps
115+
## Related content
116116

117117
* [Overview of the developer portal](api-management-howto-developer-portal.md).
118118
* [How to create and use groups to manage developer accounts](api-management-howto-create-groups.md)

articles/api-management/api-management-howto-create-subscriptions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ To take the steps in this article, the prerequisites are as follows:
4242

4343
After you create the subscription, it appears in the list on the **Subscriptions** page. Two API keys are provided to access the APIs. One key is primary, and one is secondary.
4444

45-
## Next steps
45+
## Related content
4646
Get more information on API Management:
4747

4848
+ Learn other [concepts](api-management-terminology.md) in API Management.

articles/api-management/api-management-howto-deploy-multi-region.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ This section provides considerations for multi-region deployments when the API M
180180

181181
* **Internal VNet mode** - Private HTTP traffic isn't routed or load-balanced to the regional gateways by default. Users own the routing and are responsible for bringing their own solution to manage routing and private load balancing across multiple regions.
182182

183-
## Next steps
183+
## Related content
184184

185185
* Learn more about configuring API Management for [high availability](high-availability.md).
186186

0 commit comments

Comments
 (0)