Skip to content

Commit 0f98dd1

Browse files
authored
Merge branch 'main' into reliablity-remove-workload-migrate
2 parents d33cb6c + 479997f commit 0f98dd1

File tree

1,913 files changed

+22650
-14549
lines changed

Some content is hidden

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

1,913 files changed

+22650
-14549
lines changed

.openpublishing.publish.config.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
},
7171
{
7272
"path_to_root": "azure_cli_scripts",
73-
"url": "https://github.com/Azure-Samples/azure-cli-samples",
73+
"url": "https://github.com/ggailey777/azure-cli-samples",
7474
"branch": "master",
7575
"branch_mapping": {}
7676
},
@@ -626,6 +626,12 @@
626626
"branch": "main",
627627
"branch_mapping": {}
628628
},
629+
{
630+
"path_to_root": "app-service-agentic-semantic-kernel-java",
631+
"url": "https://github.com/Azure-Samples/app-service-agentic-semantic-kernel-java",
632+
"branch": "main",
633+
"branch_mapping": {}
634+
},
629635
{
630636
"path_to_root": "playwright-testing-service",
631637
"url": "https://github.com/microsoft/playwright-testing-service",

.openpublishing.redirection.json

Lines changed: 15 additions & 335 deletions
Large diffs are not rendered by default.

articles/active-directory-b2c/page-layout.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: CelesteDG
99
ms.service: azure-active-directory
1010

1111
ms.topic: reference
12-
ms.date: 06/12/2025
12+
ms.date: 07/09/2025
1313
ms.author: kengaderdus
1414
ms.subservice: b2c
1515

@@ -65,6 +65,9 @@ Azure AD B2C page layout uses the following versions of the [jQuery library](htt
6565

6666
## Self-asserted page (selfasserted)
6767

68+
**2.1.36**
69+
- The CAPTCHA input now displays French accented characters correctly. This update resolves previous font encoding and localization errors that affected character rendering
70+
6871
**2.1.35**
6972
- Enhanced CAPTCHA error handling now ensures that any validation failures—such as “unmatched challenge”—returned by the backend are consistently captured and displayed in the UI.
7073

@@ -227,6 +230,9 @@ Azure AD B2C page layout uses the following versions of the [jQuery library](htt
227230
> [!TIP]
228231
> If you localize your page to support multiple locales, or languages in a user flow. The [localization IDs](localization-string-ids.md) article provides the list of localization IDs that you can use for the page version you select.
229232
233+
**2.1.24**
234+
- This release resolves issues with French accents in the CAPTCHA input. Accented characters now appear correctly, and font and encoding limitations no longer affect their display. All French-specific characters show as intended.
235+
230236
**2.1.23**
231237
- Enhanced CAPTCHA error handling now ensures that any validation failures—such as “unmatched challenge”—returned by the backend are consistently captured and displayed in the UI.
232238

@@ -330,6 +336,9 @@ Azure AD B2C page layout uses the following versions of the [jQuery library](htt
330336

331337
## MFA page (multifactor)
332338

339+
**1.2.22**
340+
- This release resolves issues with French accents in the CAPTCHA input. Accented characters now appear correctly, and font and encoding limitations no longer affect their display. All French-specific characters show as intended.
341+
333342
**1.2.21**
334343
- Enhanced CAPTCHA error handling now ensures that any validation failures—such as “unmatched challenge”—returned by the backend are consistently captured and displayed in the UI.
335344

articles/active-directory-b2c/partner-trusona.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ In this scenario, Trusona acts as an Identity Provider (IdP) for Azure AD B2C to
7575

7676
## Step 1: Onboard with Trusona Authentication Cloud
7777

78-
1. Sign in to the [Trusona Portal](https://portal.trusona.io).
78+
1. Sign in to the [Trusona Portal](https://portal.trusona.com/).
7979
2. From the left navigation panel, select **Settings**
8080
3. In the Settings menu, select the slider to **Enable OIDC**.
8181
4. Select the appropriate **Inputs** and provide the **Redirect URL** `https://{your-tenant-name}.b2clogin.com/{your-tenant-name}.onmicrosoft.com/oauth2/authresp`.

articles/active-directory-b2c/partner-whoiam.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ The following diagram shows the implementation architecture.
6060

6161
* [Key Vault](https://azure.microsoft.com/services/key-vault/): Store passwords
6262
* [App Service](https://azure.microsoft.com/services/app-service/): Host the BRIMS API and admin portal services
63-
* [Microsoft Entra ID](https://azure.microsoft.com/services/active-directory/): Authenticate administrative users for the portal
63+
* [Microsoft Entra ID](https://www.microsoft.com/en-us/security/business/identity-access/microsoft-entra-id): Authenticate administrative users for the portal
6464
* [Azure Cosmos DB](https://azure.microsoft.com/services/cosmos-db/): Store and retrieve settings
6565
* [Application Insights overview](/azure/azure-monitor/app/app-insights-overview) (optional): Sign in to the API and the portal
6666

articles/active-directory-b2c/service-limits.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: CelesteDG
88
ms.service: azure-active-directory
99

1010
ms.topic: reference
11-
ms.date: 05/11/2024
11+
ms.date: 07/15/2025
1212
ms.subservice: b2c
1313
zone_pivot_groups: b2c-policy-type
1414

@@ -197,6 +197,7 @@ As a protection for our customers, Microsoft places some restrictions on telepho
197197
| 228 | Togo | 10 | 30 |
198198
| 233 | Ghana| 10 | 30 |
199199
| 234 | Nigeria | 20 | 100 |
200+
| 235 | Chad | 10 | 30 |
200201
| 236 | Central African Republic  | 10 | 30 |
201202
| 238 | Cape Verde | 10 | 30 |
202203
| 249 | Sudan | 10 | 30 |
@@ -212,6 +213,7 @@ As a protection for our customers, Microsoft places some restrictions on telepho
212213
| 265 | Malawi  | 10 | 30 |
213214
| 373 | Moldova | 20 | 100 |
214215
| 375 | Belarus   | 10 | 30 |
216+
| 381 | Serbia | 50 | 200 |
215217
| 386 | Slovenia | 10 | 50 |
216218
| 501 | Belize| 10 | 30 |
217219
| 502 | Guatemala | 10 | 50
@@ -236,10 +238,13 @@ As a protection for our customers, Microsoft places some restrictions on telepho
236238
| 95 | Myanmar (Burma) | 10 | 30 |
237239
| 961 | Lebanon  | 10 | 30 |
238240
| 963 | Syria  | 10 | 30 |
241+
| 964 | Iraq | 50 | 200 |
239242
| 967 | Yemen |10 | 30 |
240243
| 970 | State of Palestine| 10 | 30 |
241244
| 972 | Israel  | 50 | 200 |
245+
| 975 | Bhutan | 20 | 100 |
242246
| 976 | Mongolia  | 10 | 30 |
247+
| 977 | Nepal | 20 | 100 |
243248
| 992 | Tajikistan | 10 | 30 |
244249
| 993 | Turkmenistan | 10 | 30 |
245250
| 994 | Azerbaijan | 50 | 200 |

articles/api-management/TOC.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,16 +133,16 @@
133133
href: api-management-configuration-repository-git.md
134134
- name: DevOps and CI/CD
135135
href: devops-api-development-templates.md
136-
- name: Resiliency
136+
- name: Resiliency and reliability
137137
items:
138-
- name: High availability features
138+
- name: Reliability in API Management
139139
displayName: reliability, resilience, resiliency
140-
href: high-availability.md
140+
href: /azure/reliability/reliability-api-management?toc=%2Fazure%2Fapi-management%2Ftoc.json&bc=/azure/api-management/breadcrumb/toc.json
141141
- name: Deploy to multiple Azure regions
142142
href: api-management-howto-deploy-multi-region.md
143143
- name: Enable availability zones
144144
displayName: zonal, zone-redundant
145-
href: ../reliability/migrate-api-mgt.md?toc=%2Fazure%2Fapi-management%2Ftoc.json&bc=/azure/api-management/breadcrumb/toc.json
145+
href: enable-availability-zone-support.md
146146
- name: Set up DR using backup/restore
147147
displayName: disaster, recovery
148148
href: api-management-howto-disaster-recovery-backup-restore.md
@@ -246,14 +246,14 @@
246246
href: openai-compatible-llm-api.md
247247
- name: Import Google Gemini API
248248
href: openai-compatible-google-gemini-api.md
249+
- name: Import Amazon Bedrock API
250+
href: amazon-bedrock-passthrough-llm-api.md
249251
- name: Expose REST API as MCP server
250252
href: export-rest-mcp-server.md
251253
- name: Semantic caching for Azure OpenAI API requests
252254
href: azure-openai-enable-semantic-caching.md
253255
- name: Authenticate and authorize to Azure OpenAI
254256
href: api-management-authenticate-authorize-azure-openai.md
255-
- name: Protect Azure OpenAI keys
256-
href: /semantic-kernel/deploy/use-ai-apis-with-api-management?toc=%2Fazure%2Fapi-management%2Ftoc.json&bc=/azure/api-management/breadcrumb/toc.json
257257
- name: Manage APIs with policies
258258
items:
259259
- name: API Management policies overview
@@ -680,6 +680,8 @@
680680
href: breaking-changes/git-configuration-retirement-march-2025.md
681681
- name: Direct management API retirement (March 2025)
682682
href: breaking-changes/direct-management-api-retirement-march-2025.md
683+
- name: Managed certificates suspension (August 2025)
684+
href: breaking-changes/managed-certificates-suspension-august-2025.md
683685
- name: ADAL-based identity provider retirement (September 2025)
684686
href: breaking-changes/identity-provider-adal-retirement-sep-2025.md
685687
- name: CAPTCHA endpoint update (September 2025)

0 commit comments

Comments
 (0)