Skip to content

Commit 33fd9dc

Browse files
authored
Merge branch 'MicrosoftDocs:main' into main
2 parents d8b5386 + bf0c333 commit 33fd9dc

File tree

519 files changed

+2444
-8542
lines changed

Some content is hidden

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

519 files changed

+2444
-8542
lines changed

articles/api-management/api-management-policies.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ More information about policies:
2222
+ [Policy overview](api-management-howto-policies.md)
2323
+ [Set or edit policies](set-edit-policies.md)
2424
+ [Policy expressions](api-management-policy-expressions.md)
25+
+ [Policy snippets repo](https://github.com/Azure/api-management-policy-snippets)
26+
+ [Azure API Management policy toolkit](https://github.com/Azure/azure-api-management-policy-toolkit/)
2527
+ [Author policies using Microsoft Copilot in Azure](/azure/copilot/author-api-management-policies?toc=%2Fazure%2Fapi-management%2Ftoc.json&bc=/azure/api-management/breadcrumb/toc.json)
2628

2729
> [!IMPORTANT]

articles/api-management/api-management-policy-expressions.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -247,11 +247,12 @@ The `context` variable is implicitly available in every policy [expression](api-
247247

248248
For more information working with policies, see:
249249

250-
+ [Policies in API Management](api-management-howto-policies.md)
251-
+ [Tutorial: Transform and protect APIs](transform-api.md)
252-
+ [Policy reference](./api-management-policies.md) for a full list of policy statements and their settings
253-
+ [Policy snippets repo](https://github.com/Azure/api-management-policy-snippets)
254-
+ [Author policies using Microsoft Copilot in Azure](/azure/copilot/author-api-management-policies?toc=%2Fazure%2Fapi-management%2Ftoc.json&bc=/azure/api-management/breadcrumb/toc.json)
250+
* [Policies in API Management](api-management-howto-policies.md)
251+
* [Tutorial: Transform and protect APIs](transform-api.md)
252+
* [Policy reference](./api-management-policies.md) for a full list of policy statements and their settings
253+
* [Policy snippets repo](https://github.com/Azure/api-management-policy-snippets)
254+
* [Azure API Management policy toolkit](https://github.com/Azure/azure-api-management-policy-toolkit/)
255+
* [Author policies using Microsoft Copilot in Azure](/azure/copilot/author-api-management-policies?toc=%2Fazure%2Fapi-management%2Ftoc.json&bc=/azure/api-management/breadcrumb/toc.json)
255256

256257
For more information:
257258

articles/api-management/set-edit-policies.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ More information about policies:
2323
* [Policy overview](api-management-howto-policies.md)
2424
* [Policy reference](api-management-policies.md) for a full list of policy statements and their settings
2525
* [Policy snippets repo](https://github.com/Azure/api-management-policy-snippets)
26+
* [Azure API Management policy toolkit](https://github.com/Azure/azure-api-management-policy-toolkit/)
27+
* [Author policies using Microsoft Copilot in Azure](/azure/copilot/author-api-management-policies?toc=%2Fazure%2Fapi-management%2Ftoc.json&bc=/azure/api-management/breadcrumb/toc.json)
28+
2629

2730
## Prerequisites
2831

@@ -230,8 +233,9 @@ To modify the policy evaluation order using the policy editor:
230233

231234
For more information about working with policies, see:
232235

233-
+ [Tutorial: Transform and protect APIs](transform-api.md)
234-
+ [Set or edit policies](set-edit-policies.md)
235-
+ [Policy reference](./api-management-policies.md) for a full list of policy statements and their settings
236-
+ [Policy snippets repo](https://github.com/Azure/api-management-policy-snippets)
237-
+ [Author policies using Microsoft Copilot in Azure](/azure/copilot/author-api-management-policies?toc=%2Fazure%2Fapi-management%2Ftoc.json&bc=/azure/api-management/breadcrumb/toc.json)
236+
* [Tutorial: Transform and protect APIs](transform-api.md)
237+
* [Set or edit policies](set-edit-policies.md)
238+
* [Policy reference](./api-management-policies.md)
239+
* [Policy snippets repo](https://github.com/Azure/api-management-policy-snippets)
240+
* [Azure API Management policy toolkit](https://github.com/Azure/azure-api-management-policy-toolkit/)
241+
* [Author policies using Microsoft Copilot in Azure](/azure/copilot/author-api-management-policies?toc=%2Fazure%2Fapi-management%2Ftoc.json&bc=/azure/api-management/breadcrumb/toc.json)

articles/app-service/app-service-undelete.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.topic: article
88
ms.custom: devx-track-azurepowershell
99
---
1010

11-
# Restore deleted App Service app Using PowerShell
11+
# Restore Deleted App Service App Using PowerShell
1212

1313
If you happened to accidentally delete your app in Azure App Service, you can restore it using the commands from the [Az PowerShell module](/powershell/azure/).
1414

articles/app-service/provision-resource-terraform.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ resource "azurerm_linux_web_app" "webapp" {
7474
location = azurerm_resource_group.rg.location
7575
resource_group_name = azurerm_resource_group.rg.name
7676
service_plan_id = azurerm_service_plan.appserviceplan.id
77+
depends_on = [azurerm_service_plan.appserviceplan]
7778
https_only = true
7879
site_config {
7980
minimum_tls_version = "1.2"

articles/app-service/toc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -403,11 +403,11 @@
403403
href: deploy-intelligent-apps.md
404404
- name: WordPress
405405
items:
406+
- name: WordPress overview
407+
href: overview-wordpress.md
406408
- name: WordPress architecture
407409
displayName: WordPress on App Service architecture
408410
href: /azure/architecture/example-scenario/infrastructure/wordpress-app-service
409-
- name: WordPress overview
410-
href: overview-wordpress.md
411411
- name: Deploy WordPress
412412
displayName: Create a WordPress site
413413
href: quickstart-wordpress.md

articles/azure-app-configuration/enable-dynamic-configuration-aspnet-netfx.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,12 +164,12 @@ Add the following key-values to the App Configuration store and leave **Label**
164164

165165
If you use the Windows command prompt, run the following command:
166166
```console
167-
setx ConnectionString "connection-string-of-your-app-configuration-store"
167+
setx ConnectionString "<connection-string-of-your-app-configuration-store>"
168168
```
169169

170170
If you use Windows PowerShell, run the following command:
171171
```powershell
172-
$Env:ConnectionString = "connection-string-of-your-app-configuration-store"
172+
$Env:ConnectionString = "<connection-string-of-your-app-configuration-store>"
173173
```
174174

175175
1. Restart Visual Studio to allow the change to take effect.

articles/azure-app-configuration/enable-dynamic-configuration-azure-functions-csharp.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,19 +184,19 @@ Azure Functions support running [in-process](../azure-functions/functions-dotnet
184184
1. Set an environment variable named **ConnectionString**, and set it to the access key to your app configuration store. If you use the Windows command prompt, run the following command and restart the command prompt to allow the change to take effect:
185185

186186
```console
187-
setx ConnectionString "connection-string-of-your-app-configuration-store"
187+
setx ConnectionString "<connection-string-of-your-app-configuration-store>"
188188
```
189189

190190
If you use Windows PowerShell, run the following command:
191191

192192
```powershell
193-
$Env:ConnectionString = "connection-string-of-your-app-configuration-store"
193+
$Env:ConnectionString = "<connection-string-of-your-app-configuration-store>"
194194
```
195195

196196
If you use macOS or Linux, run the following command:
197197

198198
```console
199-
export ConnectionString='connection-string-of-your-app-configuration-store'
199+
export ConnectionString='<connection-string-of-your-app-configuration-store>'
200200
```
201201

202202
2. To test your function, press F5. If prompted, accept the request from Visual Studio to download and install **Azure Functions Core (CLI)** tools. You might also need to enable a firewall exception so that the tools can handle HTTP requests.

articles/azure-app-configuration/enable-dynamic-configuration-dotnet-background-service.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -177,19 +177,19 @@ You use the [.NET command-line interface (CLI)](/dotnet/core/tools/) to create a
177177
If you use the Windows command prompt, run the following command and restart the command prompt to allow the change to take effect:
178178
179179
```cmd
180-
setx Endpoint "endpoint-of-your-app-configuration-store"
180+
setx Endpoint "<endpoint-of-your-app-configuration-store>"
181181
```
182182
183183
If you use PowerShell, run the following command:
184184
185185
```powershell
186-
$Env:Endpoint = "endpoint-of-your-app-configuration-store"
186+
$Env:Endpoint = "<endpoint-of-your-app-configuration-store>"
187187
```
188188
189189
If you use macOS or Linux, run the following command:
190190
191191
```bash
192-
export Endpoint='endpoint-of-your-app-configuration-store'
192+
export Endpoint='<endpoint-of-your-app-configuration-store>'
193193
```
194194
195195
### [Connection string](#tab/connection-string)
@@ -198,19 +198,19 @@ You use the [.NET command-line interface (CLI)](/dotnet/core/tools/) to create a
198198
If you use the Windows command prompt, run the following command and restart the command prompt to allow the change to take effect:
199199
200200
```cmd
201-
setx ConnectionString "connection-string-of-your-app-configuration-store"
201+
setx ConnectionString "<connection-string-of-your-app-configuration-store>"
202202
```
203203
204204
If you use PowerShell, run the following command:
205205
206206
```powershell
207-
$Env:ConnectionString = "connection-string-of-your-app-configuration-store"
207+
$Env:ConnectionString = "<connection-string-of-your-app-configuration-store>"
208208
```
209209
210210
If you use macOS or Linux, run the following command:
211211
212212
```bash
213-
export ConnectionString='connection-string-of-your-app-configuration-store'
213+
export ConnectionString='<connection-string-of-your-app-configuration-store>'
214214
```
215215
---
216216

articles/azure-app-configuration/enable-dynamic-configuration-dotnet-core-push-refresh.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,31 +185,31 @@ The `ProcessPushNotification` method takes in a `PushNotification` object contai
185185
To build and run the app locally using the Windows command prompt, run the following command and restart the command prompt to allow the change to take effect:
186186

187187
```console
188-
setx AppConfigurationConnectionString "connection-string-of-your-app-configuration-store"
188+
setx AppConfigurationConnectionString "<connection-string-of-your-app-configuration-store>"
189189
```
190190

191191
### [PowerShell](#tab/powershell)
192192

193193
If you use Windows PowerShell, run the following command:
194194

195195
```powershell
196-
$Env:AppConfigurationConnectionString = "connection-string-of-your-app-configuration-store"
196+
$Env:AppConfigurationConnectionString = "<connection-string-of-your-app-configuration-store>"
197197
```
198198

199199
### [macOS](#tab/unix)
200200

201201
If you use macOS, run the following command:
202202

203203
```console
204-
export AppConfigurationConnectionString='connection-string-of-your-app-configuration-store'
204+
export AppConfigurationConnectionString='<connection-string-of-your-app-configuration-store>'
205205
```
206206

207207
### [Linux](#tab/linux)
208208

209209
If you use Linux, run the following command:
210210

211211
```console
212-
export AppConfigurationConnectionString='connection-string-of-your-app-configuration-store'
212+
export AppConfigurationConnectionString='<connection-string-of-your-app-configuration-store>'
213213
```
214214

215215
---

0 commit comments

Comments
 (0)