Skip to content

Commit 284b316

Browse files
authored
Merge pull request #235394 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 502bd81 + 14ae146 commit 284b316

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

articles/active-directory/fundamentals/how-to-customize-branding.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ The branding elements are called out in the following example. Text descriptions
5555

5656
1. **Favicon**: Small icon that appears on the left side of the browser tab.
5757
1. **Header logo**: Space across the top of the web page, below the web browser navigation area.
58-
1. **Background image** and **page background color**: The entire space behind the sign-in box.
58+
1. **Background image**: The entire space behind the sign-in box.
59+
1. **Page background color**: The entire space behind the sign-in box.
5960
1. **Banner logo**: The logo that appears in the upper-left corner of the sign-in box.
6061
1. **Username hint and text**: The text that appears before a user enters their information.
6162
1. **Sign-in page text**: Additional text you can add below the username field.

articles/app-service/quickstart-java.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ adobe-target-content: ./quickstart-java-uiex
4444
## Next steps
4545

4646
> [!div class="nextstepaction"]
47-
> [Connect to Azure DB for PostgreSQL with Java](../postgresql/connect-java.md)
47+
> [Connect to Azure Database for PostgreSQL with Java](../postgresql/connect-java.md)
4848
4949
> [!div class="nextstepaction"]
5050
> [Set up CI/CD](deploy-continuous-deployment.md)

articles/azure-sql-edge/data-retention-cleanup.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ services: sql-edge
1717

1818
Data Retention can enabled on the database and any of the underlying tables individually, allowing users to create flexible aging policies for their tables and databases. Applying data retention is simple: it requires only one parameter to be set during table creation or as part of an alter table operation.
1919

20-
After data retention policy is defiend for a database and the underlying table, a background time timer task runs to remove any obsolete records from the table enabled for data retention. Identification of matching rows and their removal from the table occur transparently, in the background task that is scheduled and run by the system. Age condition for the table rows is checked based on the column used as the `filter_column` in the table definition. If retention period, for example, is set to one week, table rows eligible for cleanup satisfy either of the following condition:
20+
After data retention policy is defined for a database and the underlying table, a background timer task runs to remove any obsolete records from the table enabled for data retention. Identification of matching rows and their removal from the table occur transparently, in the background task that is scheduled and run by the system. Age condition for the table rows is checked based on the column used as the `filter_column` in the table definition. If retention period, for example, is set to one week, table rows eligible for cleanup satisfy either of the following condition:
2121

2222
- If the filter column uses DATETIMEOFFSET data type then the condition is `filter_column < DATEADD(WEEK, -1, SYSUTCDATETIME())`
2323
- Else then the condition is `filter_column < DATEADD(WEEK, -1, SYSDATETIME())`
@@ -28,7 +28,7 @@ Data retention cleanup operation comprises of two phases.
2828
- Discovery Phase - In this phase the cleanup operation identifies all the tables within the user databases to build a list for cleanup. Discovery runs once a day.
2929
- Cleanup Phase - In this phase, cleanup is run against all tables with finite data retention, identified in the discovery phase. If the cleanup operation cannot be performed on a table, then that table is skipped in the current run and will be retried in the next iteration. The following principles are used during cleanup
3030
- If an obsolete row is locked by another transaction, that row is skipped.
31-
- Clean up runs with a default 5 seconds lock timeout setting. If the locks cannot be acquired on the tables within the timeout window, the table is skipped in the current run and will be retried in the next iteration.
31+
- Cleanup runs with a default 5 seconds lock timeout setting. If the locks cannot be acquired on the tables within the timeout window, the table is skipped in the current run and will be retried in the next iteration.
3232
- If there is an error during cleanup of a table, that table is skipped and will be picked up in the next iteration.
3333

3434
## Manual cleanup
@@ -81,4 +81,4 @@ Additionally, a new ring buffer type named `RING_BUFFER_DATA_RETENTION_CLEANUP`
8181

8282
## Next Steps
8383
- [Data Retention Policy](data-retention-overview.md)
84-
- [Enable and Disable Data Retention Policies](data-retention-enable-disable.md)
84+
- [Enable and Disable Data Retention Policies](data-retention-enable-disable.md)

0 commit comments

Comments
 (0)