Skip to content

Commit 6bf8551

Browse files
authored
Merge pull request #232208 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 12528d6 + acf49f2 commit 6bf8551

11 files changed

+22
-11
lines changed

articles/active-directory/develop/single-sign-out-saml-protocol.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,12 @@ Per section 3.7 of the [SAML 2.0 core specification](http://docs.oasis-open.org/
4848
The `Issuer` element in a `LogoutRequest` must exactly match one of the **ServicePrincipalNames** in the cloud service in Azure AD. Typically, this is set to the **App ID URI** that is specified during application registration.
4949

5050
### NameID
51-
The value of the `NameID` element must exactly match the `NameID` of the user that is being signed out.
51+
The value of the `NameID` element must exactly match the `NameID` of the user that is being signed out.
52+
53+
> [!NOTE]
54+
> During SAML logout request, the `NameID` value is not considered by Azure Active Directory.
55+
> If a single user session is active, Azure Active Directory will automatically select that session and the SAML logout will proceed.
56+
> If multiple user sessions are active, Azure Active Directory will enumerate the active sessions for user selection. After user selection, the SAML logout will proceed.
5257
5358
## LogoutResponse
5459
Azure AD sends a `LogoutResponse` in response to a `LogoutRequest` element. The following excerpt shows a sample `LogoutResponse`.

articles/active-directory/hybrid/reference-connect-sync-attributes-synchronized.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ In this case, start with the list of attributes in this topic and identify those
158158
| targetAddress |X |X | | |
159159
| telephoneAssistant |X |X | | |
160160
| telephoneNumber |X |X | | |
161-
| thumbnailphoto |X |X | |synced only once from Azure AD to Exchange Online after which Exchange Online becomes source of authority for this attribute and any later changes can't be synced from on-premises. See ([KB](https://support.microsoft.com/help/3062745/user-photos-aren-t-synced-from-the-on-premises-environment-to-exchange)) for more.|
161+
| thumbnailphoto |X |X | |Synced to M365 profile photo periodically. Admins can set the frequency of the sync by changing the Azure AD Connect value. Please note that if users change their photo both on-premises and in cloud in a time span that is less than the Azure AD Connect value, we do not guarantee that the latest photo will be served.|
162162
| title |X |X | | |
163163
| unauthOrig |X |X |X | |
164164
| usageLocation |X | | |mechanical property. The user’s country/region. Used for license assignment. |
@@ -240,7 +240,7 @@ In this case, start with the list of attributes in this topic and identify those
240240
| targetAddress |X |X | | |
241241
| telephoneAssistant |X |X | | |
242242
| telephoneNumber |X |X | | |
243-
| thumbnailphoto |X |X | |synced only once from Azure AD to Exchange Online after which Exchange Online becomes source of authority for this attribute and any later changes can't be synced from on-premises. See ([KB](https://support.microsoft.com/help/3062745/user-photos-aren-t-synced-from-the-on-premises-environment-to-exchange)) for more.|
243+
| thumbnailphoto |X |X | |Synced to M365 profile photo periodically. Admins can set the frequency of the sync by changing the Azure AD Connect value. Please note that if users change their photo both on-premises and in cloud in a time span that is less than the Azure AD Connect value, we do not guarantee that the latest photo will be served.|
244244
| title |X |X | | |
245245
| unauthOrig |X |X |X | |
246246
| url |X |X | | |
@@ -291,7 +291,7 @@ In this case, start with the list of attributes in this topic and identify those
291291
| st |X |X | | |
292292
| streetAddress |X |X | | |
293293
| telephoneNumber |X |X | | |
294-
| thumbnailphoto |X |X | |synced only once from Azure AD to Exchange Online after which Exchange Online becomes source of authority for this attribute and any later changes can't be synced from on-premises. See ([KB](https://support.microsoft.com/help/3062745/user-photos-aren-t-synced-from-the-on-premises-environment-to-exchange)) for more.|
294+
| thumbnailphoto |X |X | |Synced to M365 profile photo periodically. Admins can set the frequency of the sync by changing the Azure AD Connect value. Please note that if users change their photo both on-premises and in cloud in a time span that is less than the Azure AD Connect value, we do not guarantee that the latest photo will be served.|
295295
| title |X |X | | |
296296
| usageLocation |X | | |mechanical property. The user’s country/region. Used for license assignment. |
297297
| userPrincipalName |X | | |UPN is the login ID for the user. Most often the same as [mail] value. |

articles/app-service/monitor-instances-health-check.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ In addition to configuring the Health check options, you can also configure the
4949
| App setting name | Allowed values | Description |
5050
|-|-|-|
5151
|`WEBSITE_HEALTHCHECK_MAXPINGFAILURES` | 2 - 10 | The required number of failed requests for an instance to be deemed unhealthy and removed from the load balancer. For example, when set to `2`, your instances will be removed after `2` failed pings. (Default value is `10`) |
52-
|`WEBSITE_HEALTHCHECK_MAXUNHEALTHYWORKERPERCENT` | 1 - 100 | By default, no more than half of the instances will be excluded from the load balancer at one time to avoid overwhelming the remaining healthy instances. For example, if an App Service Plan is scaled to four instances and three are unhealthy, two will be excluded. The other two instances (one healthy and one unhealthy) will continue to receive requests. In the worst-case scenario where all instances are unhealthy, none will be excluded. <br /> To override this behavior, set app setting to a value between `0` and `100`. A higher value means more unhealthy instances will be removed (default value is `50`). |
52+
|`WEBSITE_HEALTHCHECK_MAXUNHEALTHYWORKERPERCENT` | 1 - 100 | By default, no more than half of the instances will be excluded from the load balancer at one time to avoid overwhelming the remaining healthy instances. For example, if an App Service Plan is scaled to four instances and three are unhealthy, two will be excluded. The other two instances (one healthy and one unhealthy) will continue to receive requests. In the worst-case scenario where all instances are unhealthy, none will be excluded. <br /> To override this behavior, set app setting to a value between `1` and `100`. A higher value means more unhealthy instances will be removed (default value is `50`). |
5353

5454
#### Authentication and security
5555

articles/data-factory/create-self-hosted-integration-runtime.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ Here are details of the application's actions and arguments:
204204
|`-EnableLocalFolderPathValidation`|| Enable security validation to disable access to file system of the local machine. |
205205
|`-eesp`,<br/>`-EnableExecuteSsisPackage`|| Enable SSIS package execution on self-hosted IR node.|
206206
|`-desp`,<br/>`-DisableExecuteSsisPackage`|| Disable SSIS package execution on self-hosted IR node.|
207-
|`-gesp`,<br/>`-GetExecuteSsisPackage`|| Get the value if ExecuteSsisPackage option is enabled on self-hosted IR node.|
207+
|`-gesp`,<br/>`-GetExecuteSsisPackage`|| Get the value if ExecuteSsisPackage option is enabled on self-hosted IR node.<br/> If the returned value is true, then ExecuteSSISPackage is enabled; If the returned value is false or null, then ExecuteSSISPackage is disabled.|
208208

209209
## Install and register a self-hosted IR from Microsoft Download Center
210210

articles/defender-for-cloud/deploy-vulnerability-assessment-defender-vulnerability-management.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ You can learn more by watching this video from the Defender for Cloud in the Fie
3737

3838
- [Microsoft Defender for Servers](episode-five.md)
3939

40-
## Availability
40+
## Availability
4141

4242
|Aspect|Details|
4343
|----|:----|

articles/dms/known-issues-troubleshooting-dms.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ When you try to connect to source in the Azure Database Migration service projec
8282
| ------------- | ------------- |
8383
| When using [ExpressRoute](https://azure.microsoft.com/services/expressroute/), Azure Database Migration Service [requires](./tutorial-sql-server-to-azure-sql.md) provisioning three service endpoints on the Virtual Network subnet associated with the service:<br> -- Service Bus endpoint<br> -- Storage endpoint<br> -- Target database endpoint (e.g. SQL endpoint, Azure Cosmos DB endpoint)<br><br><br><br><br> | [Enable](./tutorial-sql-server-to-azure-sql.md) the required service endpoints for ExpressRoute connectivity between source and Azure Database Migration Service. <br><br><br><br><br><br><br><br> |
8484

85-
## Lock wait timeout error when migrating a MySQL database to Azure DB for MySQL
85+
## Lock wait timeout error when migrating a MySQL database to Azure Database for MySQL
8686

8787
When you migrate a MySQL database to an Azure Database for MySQL instance via Azure Database Migration Service, the migration fails with following lock wait timeout error:
8888

articles/healthcare-apis/azure-api-for-fhir/customer-managed-key.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ You can also enter the key URI here:
4747
> Ensure all permissions for Azure Key Vault are set appropriately. For more information, see [Add an access policy to your Azure Key Vault instance](../../cosmos-db/how-to-setup-cmk.md#add-access-policy).
4848
Additionally, ensure that the soft delete is enabled in the properties of the Key Vault. Not completing these steps will result in a deployment error. For more information, see [Verify if soft delete is enabled on a key vault and enable soft delete](../../key-vault/general/key-vault-recovery.md?tabs=azure-portal#verify-if-soft-delete-is-enabled-on-a-key-vault-and-enable-soft-delete).
4949

50+
> [!NOTE]
51+
> Using customer-managed keys in Brazil South and East Asia regions requires an Enterprise Application ID generated by Microsoft. You can request Enterprise Application ID by creating a one-time support ticket through the Azure portal. After receiving the Application ID, follow [the instructions to register the application](/azure/cosmos-db/how-to-setup-cross-tenant-customer-managed-keys?tabs=azure-portal#the-customer-grants-the-service-providers-app-access-to-the-key-in-the-key-vault).
52+
53+
5054
For existing FHIR accounts, you can view the key encryption choice (**Service-managed key** or **Customer-managed key**) in the **Database** blade as shown below. The configuration option can't be modified once it's selected. However, you can modify and update your key.
5155

5256
:::image type="content" source="media/bring-your-own-key/bring-your-own-key-database.png" alt-text="Database":::

articles/healthcare-apis/fhir/use-postman.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,4 +164,6 @@ In this article, you learned how to access the FHIR service in Azure Health Data
164164
>[!div class="nextstepaction"]
165165
>[What is FHIR service?](overview.md)
166166
167+
168+
For a starter collection of sample Postman queries, please see our [samples repo](https://github.com/Azure-Samples/azure-health-data-services-samples/tree/main/samples/sample-postman-queries) on Github.
167169
FHIR&#174; is a registered trademark of [HL7](https://hl7.org/fhir/) and is used with the permission of HL7.

articles/load-balancer/load-balancer-custom-probe-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ The **AzureLoadBalancer** service tag identifies this source IP address in your
157157

158158
In addition to load balancer health probes, the [following operations use this IP address](../virtual-network/what-is-ip-address-168-63-129-16.md):
159159

160-
* Enables the VM Agent to communicating with the platform to signal it is in a “Ready” state
160+
* Enables the VM Agent to communicate with the platform to signal it is in a “Ready” state
161161

162162
* Enables communication with the DNS virtual server to provide filtered name resolution to customers that don't define custom DNS servers. This filtering ensures that customers can only resolve the hostnames of their deployment.
163163
* Enables the VM to obtain a dynamic IP address from the DHCP service in Azure.

articles/mysql/flexible-server/how-to-data-in-replication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ The results should appear similar to the following. Make sure to note the binary
171171

172172
All Data-in replication functions are done by stored procedures. You can find all procedures at [Data-in replication Stored Procedures](../reference-stored-procedures.md). The stored procedures can be run in the MySQL shell or MySQL Workbench.
173173

174-
To link two servers and start replication, login to the target replica server in the Azure DB for MySQL service and set the external instance as the source server. This is done by using the `mysql.az_replication_change_master` stored procedure on the Azure DB for MySQL server.
174+
To link two servers and start replication, login to the target replica server in the Azure Database for MySQL service and set the external instance as the source server. This is done by using the `mysql.az_replication_change_master` stored procedure on the Azure Database for MySQL server.
175175

176176
```sql
177177
CALL mysql.az_replication_change_master('<master_host>', '<master_user>', '<master_password>', <master_port>, '<master_log_file>', <master_log_pos>, '<master_ssl_ca>');

0 commit comments

Comments
 (0)