Skip to content

Commit 3ab8c22

Browse files
authored
Merge pull request #200213 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 068dff9 + 96360a1 commit 3ab8c22

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

articles/active-directory/manage-apps/tutorial-manage-certificates-for-federated-single-sign-on.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Using the information in this tutorial, an administrator of the application lear
3939

4040
## Auto-generated certificate for gallery and non-gallery applications
4141

42-
When you add a new application from the gallery and configure a SAML-based sign-on (by selecting **Single sign-on** > **SAML** from the application overview page), Azure AD generates a certificate for the application that is valid for three years. To download the active certificate as a security certificate (**.cer**) file, return to that page (**SAML-based sign-on**) and select a download link in the **SAML Signing Certificate** heading. You can choose between the raw (binary) certificate or the Base64 (base 64-encoded text) certificate. For gallery applications, this section might also show a link to download the certificate as federation metadata XML (an **.xml** file), depending on the requirement of the application.
42+
When you add a new application from the gallery and configure a SAML-based sign-on (by selecting **Single sign-on** > **SAML** from the application overview page), Azure AD generates a self-signed certificate for the application that is valid for three years. To download the active certificate as a security certificate (**.cer**) file, return to that page (**SAML-based sign-on**) and select a download link in the **SAML Signing Certificate** heading. You can choose between the raw (binary) certificate or the Base64 (base 64-encoded text) certificate. For gallery applications, this section might also show a link to download the certificate as federation metadata XML (an **.xml** file), depending on the requirement of the application.
4343

4444
You can also download an active or inactive certificate by selecting the **SAML Signing Certificate** heading's **Edit** icon (a pencil), which displays the **SAML Signing Certificate** page. Select the ellipsis (**...**) next to the certificate you want to download, and then choose which certificate format you want. You have the additional option to download the certificate in privacy-enhanced mail (PEM) format. This format is identical to Base64 but with a **.pem** file name extension, which isn't recognized in Windows as a certificate format.
4545

articles/active-directory/managed-identities-azure-resources/managed-identities-faq.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,9 @@ Moving a user-assigned managed identity to a different resource group isn't supp
148148

149149
Managed identity tokens are cached by the underlying Azure infrastructure for performance and resiliency purposes: the back-end services for managed identities maintain a cache per resource URI for around 24 hours. It can take several hours for changes to a managed identity's permissions to take effect, for example. Today, it is not possible to force a managed identity's token to be refreshed before its expiry. For more information, see [Limitation of using managed identities for authorization](managed-identity-best-practice-recommendations.md#limitation-of-using-managed-identities-for-authorization).
150150

151+
### What happens to tokens after a managed identity is deleted?
152+
When a managed identity is deleted, an Azure resource that was previously associated with that identity can no longer request new tokens for that identity. Tokens that were issued before the identity was deleted will still be valid until their original expiry. Some target endpoints' authorization systems may carry out additional checks in the directory for the identity, in which case the request will fail as the object can't be found. However some systems, like Azure RBAC, will continue to accept requests from that token until it expires.
153+
151154
## Next steps
152155

153156
- Learn [how managed identities work with virtual machines](how-managed-identities-work-vm.md)

articles/defender-for-iot/organizations/how-to-investigate-all-enterprise-sensor-detections-in-a-device-inventory.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
2-
title: Learn about devices discovered by all enterprise sensors
2+
title: Learn about devices discovered by all sensors
33
description: Use the device inventory in the on-premises management console to get a comprehensive view of device information from connected sensors. Use import, export, and filtering tools to manage this information.
44
ms.date: 11/09/2021
55
ms.topic: how-to
66
---
77

8-
# Investigate all enterprise sensor detections in the device inventory
8+
# Investigate all sensor detections in the device inventory
99

1010
You can view device information from connected sensors by using the *device inventory* in the on-premises management console. This feature gives you a comprehensive view of all network information. Use import, export, and filtering tools to manage this information. The status information about the connected sensor versions also appears.
1111

@@ -50,9 +50,9 @@ The Defender for IoT Device Inventory displays an extensive range of device attr
5050
Public internet IP addresses, multicast groups, and broadcast groups aren't considered inventory devices.
5151
Devices that have been inactive for more than 60 days are classified as inactive Inventory devices.
5252

53-
## Integrate data into the enterprise device inventory
53+
## Integrate data into the device inventory
5454

55-
Data integration capabilities let you enhance the data in the device inventory with information from other enterprise resources. These sources include CMDBs, DNS, firewalls, and Web APIs.
55+
Data integration capabilities let you enhance the data in the device inventory with information from other resources. These sources include CMDBs, DNS, firewalls, and Web APIs.
5656

5757
You can use this information to learn. For example:
5858

@@ -78,7 +78,7 @@ You can integrate data by either:
7878

7979
- Running customized scripts that Defender for IoT provides
8080

81-
:::image type="content" source="media/how-to-work-with-asset-inventory-information/enterprise-data-integrator-graph.png" alt-text="Diagram of the enterprise data integrator.":::
81+
:::image type="content" source="media/how-to-work-with-asset-inventory-information/enterprise-data-integrator-graph.png" alt-text="Diagram of the data integrator.":::
8282

8383
You can work with Defender for IoT technical support to set up your system to receive Web API queries.
8484

@@ -102,7 +102,7 @@ To add data manually:
102102

103103
6. In the upper-right corner of the **Device Inventory** window, select :::image type="icon" source="media/how-to-work-with-asset-inventory-information/menu-icon-device-inventory.png" border="false":::, select **Import Manual Input Columns**, and browse to the CSV file. The new data appears in the **Device Inventory** table.
104104

105-
To integrate data from other enterprise entities:
105+
To integrate data from other entities:
106106

107107
1. In the upper-right corner of the **Device Inventory** window, select :::image type="icon" source="media/how-to-work-with-asset-inventory-information/menu-icon-device-inventory.png" border="false"::: and select **Export All Device Inventory**.
108108

articles/postgresql/single-server/overview-single-server.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ ms.date: 11/30/2021
1313

1414
[Azure Database for PostgreSQL](./overview.md) powered by the PostgreSQL community edition is available in three deployment modes:
1515

16-
- Single Server
17-
- Flexible Server
18-
- Hyperscale (Citus)
16+
- [Single Server](./overview-single-server.md)
17+
- [Flexible Server](../flexible-server/overview.md)
18+
- [Hyperscale (Citus)](../hyperscale/overview.md)
1919

2020
In this article, we will provide an overview and introduction to core concepts of single server deployment model. To learn about flexible server deployment mode, see [flexible server overview](../flexible-server/overview.md) and Hyperscale (Citus) Overview respectively.
2121

0 commit comments

Comments
 (0)