Skip to content

Commit 26402a3

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into dtlactivitylog0410
2 parents f427ce8 + 59e2d9d commit 26402a3

File tree

161 files changed

+1558
-788
lines changed

Some content is hidden

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

161 files changed

+1558
-788
lines changed

.openpublishing.redirection.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@
533533
},
534534
{
535535
"source_path": "articles/site-recovery/vmware-physical-mobility-service-install-manual.md",
536-
"redirect_url": "/azure/site-recovery/vmware-physical-mobility-service-overview#install-mobility-agent-through-ui",
536+
"redirect_url": "/azure/site-recovery/vmware-physical-mobility-service-overview#install-the-mobility-service-using-ui",
537537
"redirect_document_id": false
538538
},
539539
{

articles/active-directory/manage-apps/common-scenarios.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Identity can only be your control plane if it can connect everything across clou
8585

8686
- [Application management](https://docs.microsoft.com/azure/active-directory/manage-apps/index)
8787
- [Application provisioning](https://docs.microsoft.com/azure/active-directory/app-provisioning/user-provisioning)
88-
- [Hybrid secure access]()
88+
- [Hybrid secure access](https://docs.microsoft.com/azure/active-directory/manage-apps/secure-hybrid-access)
8989
- [Identity governance](https://docs.microsoft.com/azure/active-directory/governance/identity-governance-overview)
9090
- [Microsoft identity platform](https://docs.microsoft.com/azure/active-directory/develop/v2-overview)
9191
- [Identity security](https://docs.microsoft.com/azure/active-directory/conditional-access/index)

articles/active-directory/saas-apps/icims-tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ In this tutorial, you'll learn how to integrate ICIMS with Azure Active Director
2727
* Enable your users to be automatically signed-in to ICIMS with their Azure AD accounts.
2828
* Manage your accounts in one central location - the Azure portal.
2929

30-
To learn more about SaaS app integration with Azure AD, see [What is application access and single sign-on with Azure Active Directory](https://docs.microsoft.com/azure/active-directory/what-is-single-sign-on).
30+
To learn more about SaaS app integration with Azure AD, see [What is application access and single sign-on with Azure Active Directory](https://docs.microsoft.com/azure/active-directory/manage-apps/what-is-single-sign-on).
3131

3232
## Prerequisites
3333

@@ -147,7 +147,7 @@ When you click the ICIMS tile in the Access Panel, you should be automatically s
147147

148148
- [ List of Tutorials on How to Integrate SaaS Apps with Azure Active Directory ](https://docs.microsoft.com/azure/active-directory/active-directory-saas-tutorial-list)
149149

150-
- [What is application access and single sign-on with Azure Active Directory? ](https://docs.microsoft.com/azure/active-directory/what-is-single-sign-on)
150+
- [What is application access and single sign-on with Azure Active Directory? ](https://docs.microsoft.com/azure/active-directory/manage-apps/what-is-single-sign-on)
151151

152152
- [What is conditional access in Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/conditional-access/overview)
153153

articles/active-directory/saas-apps/opsgenie-tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ In this tutorial, you'll learn how to integrate OpsGenie with Azure Active Direc
2626
* Enable your users to be automatically signed-in to OpsGenie with their Azure AD accounts.
2727
* Manage your accounts in one central location - the Azure portal.
2828

29-
To learn more about SaaS app integration with Azure AD, see [What is application access and single sign-on with Azure Active Directory](https://docs.microsoft.com/azure/active-directory/what-is-single-sign-on).
29+
To learn more about SaaS app integration with Azure AD, see [What is application access and single sign-on with Azure Active Directory](https://docs.microsoft.com/azure/active-directory/manage-apps/what-is-single-sign-on).
3030

3131
## Prerequisites
3232

@@ -192,7 +192,7 @@ When you click the OpsGenie tile in the Access Panel, you should be automaticall
192192

193193
- [ List of Tutorials on How to Integrate SaaS Apps with Azure Active Directory ](https://docs.microsoft.com/azure/active-directory/active-directory-saas-tutorial-list)
194194

195-
- [What is application access and single sign-on with Azure Active Directory? ](https://docs.microsoft.com/azure/active-directory/what-is-single-sign-on)
195+
- [What is application access and single sign-on with Azure Active Directory? ](https://docs.microsoft.com/azure/active-directory/manage-apps/what-is-single-sign-on)
196196

197197
- [What is conditional access in Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/conditional-access/overview)
198198

articles/api-management/api-management-configuration-repository-git.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ To view and configure your Git configuration settings, you can click the **Secur
5151
>
5252
>
5353
54-
For information on enabling or disabling Git access using the REST API, see [Enable or disable Git access using the REST API](/rest/api/apimanagement/2019-01-01/tenantaccess?EnableGit).
54+
For information on enabling or disabling Git access using the REST API, see [Enable or disable Git access using the REST API](/rest/api/apimanagement/2019-12-01/tenantaccess?EnableGit).
5555

5656
## To save the service configuration to the Git repository
5757

@@ -63,7 +63,7 @@ After a few moments the configuration is saved, and the configuration status of
6363

6464
Once the configuration is saved to the repository, it can be cloned.
6565

66-
For information on performing this operation using the REST API, see [Commit configuration snapshot using the REST API](/rest/api/apimanagement/2019-01-01/tenantaccess?CommitSnapshot).
66+
For information on performing this operation using the REST API, see [Commit configuration snapshot using the REST API](/rest/api/apimanagement/2019-12-01/tenantaccess?CommitSnapshot).
6767

6868
## To clone the repository to your local machine
6969

@@ -137,7 +137,7 @@ git push
137137

138138
Once your local changes are committed and pushed to the server repository, you can deploy them to your API Management service instance.
139139

140-
For information on performing this operation using the REST API, see [Deploy Git changes to configuration database using the REST API](https://docs.microsoft.com/rest/api/apimanagement/2019-01-01/tenantconfiguration).
140+
For information on performing this operation using the REST API, see [Deploy Git changes to configuration database using the REST API](https://docs.microsoft.com/rest/api/apimanagement/2019-12-01/tenantconfiguration).
141141

142142
## File and folder structure reference of local Git repository
143143

@@ -167,9 +167,9 @@ These files can be created, deleted, edited, and managed on your local file syst
167167
> [!NOTE]
168168
> The following entities are not contained in the Git repository and cannot be configured using Git.
169169
>
170-
> * [Users](https://docs.microsoft.com/rest/api/apimanagement/2019-01-01/user)
171-
> * [Subscriptions](https://docs.microsoft.com/rest/api/apimanagement/2019-01-01/subscription)
172-
> * [Named Values](https://docs.microsoft.com/rest/api/apimanagement/2019-01-01/property)
170+
> * [Users](https://docs.microsoft.com/rest/api/apimanagement/2019-12-01/user)
171+
> * [Subscriptions](https://docs.microsoft.com/rest/api/apimanagement/2019-12-01/subscription)
172+
> * [Named Values](https://docs.microsoft.com/rest/api/apimanagement/2019-12-01/property)
173173
> * Developer portal entities other than styles
174174
>
175175
@@ -217,14 +217,14 @@ The final setting, `$ref-policy`, maps to the global policy statements file for
217217
### apis folder
218218
The `apis` folder contains a folder for each API in the service instance, which contains the following items.
219219

220-
* `apis\<api name>\configuration.json` - this is the configuration for the API and contains information about the backend service URL and the operations. This is the same information that would be returned if you were to call [Get a specific API](https://docs.microsoft.com/rest/api/apimanagement/2019-01-01/apis/get) with `export=true` in `application/json` format.
220+
* `apis\<api name>\configuration.json` - this is the configuration for the API and contains information about the backend service URL and the operations. This is the same information that would be returned if you were to call [Get a specific API](https://docs.microsoft.com/rest/api/apimanagement/2019-12-01/apis/get) with `export=true` in `application/json` format.
221221
* `apis\<api name>\api.description.html` - this is the description of the API and corresponds to the `description` property of the [API entity](https://docs.microsoft.com/java/api/com.microsoft.azure.storage.table.entityproperty).
222222
* `apis\<api name>\operations\` - this folder contains `<operation name>.description.html` files that map to the operations in the API. Each file contains the description of a single operation in the API, which maps to the `description` property of the [operation entity](https://docs.microsoft.com/rest/api/visualstudio/operations/list#operationproperties) in the REST API.
223223

224224
### groups folder
225225
The `groups` folder contains a folder for each group defined in the service instance.
226226

227-
* `groups\<group name>\configuration.json` - this is the configuration for the group. This is the same information that would be returned if you were to call the [Get a specific group](https://docs.microsoft.com/rest/api/apimanagement/2019-01-01/group/get) operation.
227+
* `groups\<group name>\configuration.json` - this is the configuration for the group. This is the same information that would be returned if you were to call the [Get a specific group](https://docs.microsoft.com/rest/api/apimanagement/2019-12-01/group/get) operation.
228228
* `groups\<group name>\description.html` - this is the description of the group and corresponds to the `description` property of the [group entity](https://docs.microsoft.com/rest/api/apimanagement/apimanagementrest/azure-api-management-rest-api-group-entity).
229229

230230
### policies folder
@@ -244,7 +244,7 @@ The `portalStyles` folder contains configuration and style sheets for developer
244244
### products folder
245245
The `products` folder contains a folder for each product defined in the service instance.
246246

247-
* `products\<product name>\configuration.json` - this is the configuration for the product. This is the same information that would be returned if you were to call the [Get a specific product](https://docs.microsoft.com/rest/api/apimanagement/2019-01-01/product/get) operation.
247+
* `products\<product name>\configuration.json` - this is the configuration for the product. This is the same information that would be returned if you were to call the [Get a specific product](https://docs.microsoft.com/rest/api/apimanagement/2019-12-01/product/get) operation.
248248
* `products\<product name>\product.description.html` - this is the description of the product and corresponds to the `description` property of the [product entity](https://docs.microsoft.com/rest/api/apimanagement/apimanagementrest/azure-api-management-rest-api-product-entity) in the REST API.
249249

250250
### templates

articles/api-management/api-management-howto-add-products.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Developers must first subscribe to a product to get access to the API. When they
8181
4. Choose an API and click **Select**.
8282

8383
> [!TIP]
84-
> You can create or update user's subscription to a *Product* with custom subscription keys [through REST API](https://docs.microsoft.com/rest/api/apimanagement/2019-01-01/subscription/createorupdate) or PowerShell command.
84+
> You can create or update user's subscription to a *Product* with custom subscription keys [through REST API](https://docs.microsoft.com/rest/api/apimanagement/2019-12-01/subscription/createorupdate) or PowerShell command.
8585
8686
## Next steps
8787

articles/api-management/api-management-howto-app-insights.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Before you can use Azure Application Insights, you first need to create an insta
4848
![App Insights logger](media/api-management-howto-app-insights/apim-app-insights-logger-2.png)
4949

5050
> [!NOTE]
51-
> Behind the scene, a [Logger](https://docs.microsoft.com/rest/api/apimanagement/2019-01-01/logger/createorupdate) entity is created in your API Management instance, containing the Instrumentation Key of the Application Insights instance.
51+
> Behind the scene, a [Logger](https://docs.microsoft.com/rest/api/apimanagement/2019-12-01/logger/createorupdate) entity is created in your API Management instance, containing the Instrumentation Key of the Application Insights instance.
5252
5353
## Enable Application Insights logging for your API
5454

@@ -67,7 +67,7 @@ Before you can use Azure Application Insights, you first need to create an insta
6767
> Overriding the default value **0** in the **First bytes of body** field may significantly decrease the performance of your APIs.
6868
6969
> [!NOTE]
70-
> Behind the scene, a [Diagnostic](https://docs.microsoft.com/rest/api/apimanagement/2019-01-01/diagnostic/createorupdate) entity named 'applicationinsights' is created at the API level.
70+
> Behind the scene, a [Diagnostic](https://docs.microsoft.com/rest/api/apimanagement/2019-12-01/diagnostic/createorupdate) entity named 'applicationinsights' is created at the API level.
7171
7272
| Setting name | Value type | Description |
7373
|-------------------------------------|-----------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|

articles/api-management/api-management-howto-create-or-invite-developers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.author: apimpm
1717
---
1818
# How to manage user accounts in Azure API Management
1919

20-
In API Management, developers are the users of the APIs that you expose using API Management. This guide shows to how to create and invite developers to use the APIs and products that you make available to them with your API Management instance. For information on managing user accounts programmatically, see the [User entity](https://docs.microsoft.com/rest/api/apimanagement/2019-01-01/user) documentation in the [API Management REST](/rest/api/apimanagement/) reference.
20+
In API Management, developers are the users of the APIs that you expose using API Management. This guide shows to how to create and invite developers to use the APIs and products that you make available to them with your API Management instance. For information on managing user accounts programmatically, see the [User entity](https://docs.microsoft.com/rest/api/apimanagement/2019-12-01/user) documentation in the [API Management REST](/rest/api/apimanagement/) reference.
2121

2222
[!INCLUDE [premium-dev-standard-basic.md](../../includes/api-management-availability-premium-dev-standard-basic.md)]
2323

articles/api-management/api-management-howto-disaster-recovery-backup-restore.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ Replace `{tenant id}`, `{application id}`, and `{redirect uri}` using the follow
127127
128128
## Calling the backup and restore operations
129129

130-
The REST APIs are [Api Management Service - Backup](/rest/api/apimanagement/2019-01-01/apimanagementservice/backup) and [Api Management Service - Restore](/rest/api/apimanagement/2019-01-01/apimanagementservice/restore).
130+
The REST APIs are [Api Management Service - Backup](/rest/api/apimanagement/2019-12-01/apimanagementservice/backup) and [Api Management Service - Restore](/rest/api/apimanagement/2019-12-01/apimanagementservice/restore).
131131

132132
Before calling the "backup and restore" operations described in the following sections, set the authorization request header for your REST call.
133133

articles/api-management/api-management-howto-log-event-hubs.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ This article is a companion to the [Integrate Azure API Management with Event Hu
2626
For detailed steps on how to create an event hub and get connection strings that you need to send and receive events to and from the Event Hub, see [Create an Event Hubs namespace and an event hub using the Azure portal](https://docs.microsoft.com/azure/event-hubs/event-hubs-create).
2727

2828
## Create an API Management logger
29-
Now that you have an Event Hub, the next step is to configure a [Logger](https://docs.microsoft.com/rest/api/apimanagement/2019-01-01/logger) in your API Management service so that it can log events to the Event Hub.
29+
Now that you have an Event Hub, the next step is to configure a [Logger](https://docs.microsoft.com/rest/api/apimanagement/2019-12-01/logger) in your API Management service so that it can log events to the Event Hub.
3030

31-
API Management loggers are configured using the [API Management REST API](https://aka.ms/apimapi). For detailed request examples, see [how to create Loggers](https://docs.microsoft.com/rest/api/apimanagement/2019-01-01/logger/createorupdate).
31+
API Management loggers are configured using the [API Management REST API](https://aka.ms/apimapi). For detailed request examples, see [how to create Loggers](https://docs.microsoft.com/rest/api/apimanagement/2019-12-01/logger/createorupdate).
3232

3333
## Configure log-to-eventhubs policies
3434

@@ -61,7 +61,7 @@ Click **Save** to save the updated policy configuration. As soon as it is saved
6161
* [Receive messages with EventProcessorHost](../event-hubs/event-hubs-dotnet-standard-getstarted-receive-eph.md)
6262
* [Event Hubs programming guide](../event-hubs/event-hubs-programming-guide.md)
6363
* Learn more about API Management and Event Hubs integration
64-
* [Logger entity reference](https://docs.microsoft.com/rest/api/apimanagement/2019-01-01/logger)
64+
* [Logger entity reference](https://docs.microsoft.com/rest/api/apimanagement/2019-12-01/logger)
6565
* [log-to-eventhub policy reference](https://docs.microsoft.com/azure/api-management/api-management-advanced-policies#log-to-eventhub)
6666
* [Monitor your APIs with Azure API Management, Event Hubs, and Moesif](api-management-log-to-eventhub-sample.md)
6767
* Learn more about [integration with Azure Application Insights](api-management-howto-app-insights.md)

0 commit comments

Comments
 (0)