Skip to content

Commit db8ef59

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into mdb-mask-secrets
2 parents 02cabd8 + b331504 commit db8ef59

284 files changed

Lines changed: 627 additions & 536 deletions

File tree

Some content is hidden

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ REST API settings:
113113
#### Upload your files
114114

115115
1. Store the UI folder files in your blob container.
116-
2. [Use Azure Storage Explorer to manage Azure managed disks](/azure/virtual-machines/disks-use-storage-explorer-managed-disks) and access permissions.
116+
2. [Use Azure Storage Explorer to manage Azure Managed Disks](/azure/virtual-machines/disks-use-storage-explorer-managed-disks) and access permissions.
117117

118118
### Configure Azure AD B2C
119119

articles/app-service/configure-language-php.md

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -348,31 +348,33 @@ As an alternative to using a `.user.ini` file, you can use [`ini_set()`](https:/
348348

349349
::: zone pivot="platform-linux"
350350

351+
This section applies to directives with a change mode of `PHP_INI_USER`, `PHP_INI_PERDIR`, or `PHP_INI_ALL`. For directives that require change mode `PHP_INI_SYSTEM`, see [Customize PHP_INI_SYSTEM directives](#customize-php_ini_system-directives).
352+
351353
To customize `PHP_INI_USER`, `PHP_INI_PERDIR`, and `PHP_INI_ALL` directives for Linux web apps, such as `upload_max_filesize` and `expose_php`, use a custom *.ini* file. You can create it in an [SSH session](configure-linux-open-ssh-session.md). First, set up the directory:
352354

353355
1. Go to your Kudu site. To get the random hash and region values, in your app **Overview**, copy **Default domain**.
354356
1. On the top menu, select **Debug console**, then **Bash** or **SSH**.
355-
1. In Bash or SSH, go to your `/home/site/wwwroot` directory.
357+
1. In Bash or SSH, go to your `/home/site` directory.
356358
1. Create a directory called `ini` (for example, `mkdir ini`).
357359
1. Change the current working directory to the `ini` folder that you created.
358360

359361
Next, create an *.ini* file where you add your settings. This example uses `extensions.ini`. There are no file editors such as Vi, Vim, or Nano, so use `Echo` to add the settings to the file. Change the `upload_max_filesize` value from `2M` to `50M`. Use the following command to add the setting and create an `extensions.ini` file if one doesn't already exist:
360362

361363
```bash
362-
/home/site/wwwroot/ini>echo "upload_max_filesize=50M" >> extensions.ini
363-
/home/site/wwwroot/ini>cat extensions.ini
364+
/home/site/ini>echo "upload_max_filesize=50M" >> extensions.ini
365+
/home/site/ini>cat extensions.ini
364366

365367
upload_max_filesize=50M
366368

367-
/home/site/wwwroot/ini>
369+
/home/site/ini>
368370
```
369371

370372
In the Azure portal, add an application setting to scan the `ini` directory that you just created to apply the change for `upload_max_filesize`:
371373

372374
1. Go to the [Azure portal](https://portal.azure.com) and select your App Service Linux PHP application.
373375
1. Go to **Settings** > **Environment variables**.
374376
1. Select **+ Add**.
375-
1. For **Name** enter *PHP_INI_SCAN_DIR* and for **Value**, enter `:/home/site/wwwroot/ini`.
377+
1. For **Name** enter *PHP_INI_SCAN_DIR* and for **Value**, enter `:/home/site/ini`.
376378
1. Select **Apply**, then **Apply** again. Confirm your changes.
377379

378380
> Make sure to include the colon (:) when appending custom paths to PHP_INI_SCAN_DIR. Omitting it will result in NGINX returning a 404 error.
@@ -403,7 +405,7 @@ For example, to change the value of [`expose_php`](https://php.net/manual/ini.co
403405
```bash
404406
cd /home/site
405407
mkdir ini
406-
echo "expose_php = Off" >> ini/setting.ini
408+
echo "expose_php = Off" >> ini/settings.ini
407409
```
408410

409411
For the changes to take effect, restart the app.
@@ -412,7 +414,9 @@ For the changes to take effect, restart the app.
412414

413415
::: zone pivot="platform-linux"
414416

415-
To customize `PHP_INI_SYSTEM` directives, you can't use the *.htaccess* approach. App Service provides a separate mechanism that uses the `PHP_INI_SCAN_DIR` app setting.
417+
This section applies to directives with a change mode of `PHP_INI_SYSTEM`. If your changes don't take effect after following the previous section, verify the directive's [change mode](https://www.php.net/manual/ini.list.php) before proceeding.
418+
419+
To customize `PHP_INI_SYSTEM` directives, use the `PHP_INI_SCAN_DIR` app setting.
416420

417421
First, run the following command to add an app setting called `PHP_INI_SCAN_DIR`:
418422

@@ -434,7 +438,7 @@ For example, to change the value of [`expose_php`](https://php.net/manual/ini.co
434438
```bash
435439
cd /home/site
436440
mkdir ini
437-
echo "expose_php = Off" >> ini/setting.ini
441+
echo "expose_php = Off" >> ini/settings.ini
438442
```
439443

440444
For the changes to take effect, restart the app.

articles/app-service/overview-authentication-authorization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Authentication and Authorization
33
description: Learn about the built-in authentication and authorization support in Azure App Service and Azure Functions, and how it can help secure your app.
44
ms.assetid: b7151b57-09e5-4c77-a10c-375a262f17e5
5-
ms.topic: conceptual
5+
ms.topic: concept-article
66
ms.date: 03/28/2025
77
ms.update-cycle: 1095-days
88
ms.reviewer: mahender

articles/application-gateway/quick-create-cli.md

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: application-gateway
66
author: mbender-ms
77
ms.service: azure-application-gateway
88
ms.topic: quickstart
9-
ms.date: 05/30/2024
9+
ms.date: 02/25/2026
1010
ms.author: mbender
1111
ms.custom:
1212
- mvc
@@ -76,6 +76,19 @@ az network public-ip create \
7676
--sku Standard
7777
```
7878

79+
## Create a network security group
80+
81+
Create a network security group with [az network nsg create](/cli/azure/network/nsg#az-network-nsg-create). The default rules in the network security group block all inbound access from the internet.
82+
83+
```azurecli-interactive
84+
az network nsg create \
85+
--resource-group myResourceGroupAG \
86+
--name myNSG
87+
```
88+
89+
> [!NOTE]
90+
> The default rules of the network security group block all inbound access from the internet, including SSH. To connect to the virtual machine, use Azure Bastion. For more information, see [Quickstart: Deploy Azure Bastion with default settings](../bastion/quickstart-host-portal.md).
91+
7992
## Create the backend servers
8093

8194
A backend can have NICs, virtual machine scale sets, public IP addresses, internal IP addresses, fully qualified domain names (FQDN), and multitenant backends like Azure App Service. In this example, you create two virtual machines to use as backend servers for the application gateway. You also install NGINX on the virtual machines to test the application gateway.
@@ -137,12 +150,14 @@ for i in `seq 1 2`; do
137150
--resource-group myResourceGroupAG \
138151
--name myNic$i \
139152
--vnet-name myVNet \
140-
--subnet myBackendSubnet
153+
--subnet myBackendSubnet \
154+
--network-security-group myNSG
141155
az vm create \
142156
--resource-group myResourceGroupAG \
143157
--name myVM$i \
144158
--nics myNic$i \
145159
--image Ubuntu2204 \
160+
--public-ip-address "" \
146161
--admin-username azureuser \
147162
--generate-ssh-keys \
148163
--custom-data cloud-init.txt

articles/application-gateway/quick-create-portal.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: In this quickstart, you learn how to use the Azure portal to create
55
services: application-gateway
66
author: mbender-ms
77
ms.author: mbender
8-
ms.date: 09/04/2024
8+
ms.date: 02/25/2026
99
ms.topic: quickstart
1010
ms.service: azure-application-gateway
1111
ms.custom:
@@ -182,11 +182,14 @@ To create a backend subnet:
182182
- **Public inbound ports**: None.
183183
4. Accept the other defaults and then select **Next: Disks**.
184184
5. Accept the **Disks** tab defaults and then select **Next: Networking**.
185-
6. On the **Networking** tab, verify that **myVNet** is selected for the **Virtual network** and the **Subnet** is set to **myBackendSubnet**. Accept the other defaults and then select **Next: Management**.<br>Application Gateway can communicate with instances outside of the virtual network that it's in, but you need to ensure there's IP connectivity.
185+
6. On the **Networking** tab, verify that **myVNet** is selected for the **Virtual network** and the **Subnet** is set to **myBackendSubnet**. For **Public IP**, select **None**. Accept the other defaults and then select **Next: Management**.<br>Application Gateway can communicate with instances outside of the virtual network that it's in, but you need to ensure there's IP connectivity.
186186
7. Select **Next: Monitoring** and set **Boot diagnostics** to **Disable**. Accept the other defaults and then select **Review + create**.
187187
8. On the **Review + create** tab, review the settings, correct any validation errors, and then select **Create**.
188188
9. Wait for the virtual machine creation to complete before continuing.
189189

190+
> [!NOTE]
191+
> The default rules of the network security group block all inbound access from the internet, including RDP. To connect to the virtual machine, use Azure Bastion. For more information, see [Quickstart: Deploy Azure Bastion with default settings](../bastion/quickstart-host-portal.md).
192+
190193
### Install IIS for testing
191194

192195
In this example, you install IIS on the virtual machines to verify Azure created the application gateway successfully.

articles/azure-cache-for-redis/cache-best-practices-scale.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Best practices for scaling
33
description: Learn how to scale your Azure Cache for Redis.
44

55

6-
ms.topic: conceptual
6+
ms.topic: best-practice
77
ms.custom:
88
- ignite-2024
99
ms.date: 04/12/2024

articles/azure-cache-for-redis/cache-how-to-scale.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Scale an Azure Cache for Redis instance
33
description: Learn how to scale your Azure Cache for Redis instances using the Azure portal, and tools such as Azure PowerShell, and Azure CLI
4-
ms.topic: conceptual
4+
ms.topic: how-to
55
ms.date: 07/01/2024
66
appliesto:
77
- ✅ Azure Cache for Redis

articles/azure-cache-for-redis/cache-troubleshoot-server.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Troubleshoot server issues
33
description: See links to troubleshooting issues caused by conditions on an Azure Cache for Redis server or the virtual machines that host it.
4-
ms.topic: conceptual
4+
ms.topic: concept-article
55
ms.date: 04/10/2025
66
appliesto:
77
- ✅ Azure Cache for Redis

articles/azure-cache-for-redis/redis-cache-bicep-provision.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Deploy Azure Cache for Redis using Bicep
33
description: Learn how to use Bicep to deploy an Azure Cache for Redis resource.
44
ms.date: 05/18/2025
5-
ms.topic: conceptual
5+
ms.topic: how-to
66
ms.custom:
77
- subject-armqs
88
- devx-track-bicep

articles/azure-functions/durable/durable-functions-create-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Create Durable Functions using the Azure portal
33
description: Learn how to install the Durable Functions extension for Azure Functions for portal development.
4-
ms.topic: conceptual
4+
ms.topic: how-to
55
ms.date: 04/10/2020
66
ms.reviewer: azfuncdf
77
ms.devlang: csharp

0 commit comments

Comments
 (0)