Merge pull request #314574 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)

Author: Taojunshen

articles/app-service/app-service-key-vault-references.md

@@ -90,6 +90,9 @@ After you grant permissions to the user-assigned identity, follow these steps:
 
 This setting applies to all Key Vault references for the app.
 
+> [!TIP]
+> If you want to revert your app to use the system-assigned identity, set the value to `SystemAssigned` instead of the Resource ID.
+
 ## <a name = "rotation"></a> Understand rotation
 
 If the secret version isn't specified in the reference, the app uses the latest version that exists in the key vault. When newer versions become available, such as with rotation, the app is automatically updated and begins using the latest version within 24 hours.

articles/app-service/reference-app-settings.md

@@ -306,7 +306,7 @@ APACHE_RUN_GROUP | RUN sed -i 's!User ${APACHE_RUN_GROUP}!Group www-data!g' /etc
 > | `WORDPRESS_ADMIN_EMAIL` | Deployment only | Not applicable | Not applicable | WordPress admin email. |
 > | `WORDPRESS_ADMIN_PASSWORD` | Deployment only | Not applicable | Not applicable | WordPress admin password. This setting is only for deployment purposes. Modifying this value has no effect on the WordPress installation. To change the WordPress admin password, see [Reset your password](https://wordpress.org/support/article/resetting-your-password/#to-change-your-password). |
 > | `WORDPRESS_ADMIN_USER` | Deployment only | Not applicable | Not applicable|WordPress admin username. |
-> | `WORDPRESS_ADMIN_LOCALE_CODE` | Deployment only | Not applicable | Not applicable | Database username used to connect to WordPress. |
+> | `WORDPRESS_LOCALE_CODE` | Deployment only | `en_US` | Not applicable | WordPress localization code for site language. |
 
 ## Domain and DNS
 

includes/vpn-gateway-vwan-azure-vpn-client-optional.md

@@ -18,12 +18,25 @@ To work with VPN client profile configuration files (xml files), use the followi
 
 1. Locate the profile configuration file and open it using the editor of your choice.
 1. Using the examples in the following sections, modify the file as necessary, then save your changes.
-1. Import the file to configure the Azure VPN client. You can import the file for the Azure VPN Client using these methods:
-
-   * **Azure VPN Client interface**: Open the Azure VPN Client and select **+** and then **Import**. Locate the modified .xml file. Configure any additional settings in the Azure VPN Client interface (if necessary), then select **Save**.
-
-   * **Command-line prompt**: Place the appropriate downloaded configuration xml file in the *%userprofile%\AppData\Local\Packages\Microsoft.AzureVpn_8wekyb3d8bbwe\LocalState* folder, then run the command that corresponds to the configuration file name. For example, `azurevpn -i azurevpnconfig_aad.xml`. To force the import, use the `-f` switch.
-
+1. Import the file to configure the Azure VPN Client:
+   - **Windows**
+     - **Azure VPN Client interface**: Open the Azure VPN Client and select **+** and then **Import**. Locate the modified .xml file. Configure any additional settings in the Azure VPN Client interface (if necessary), then select **Save**.
+     - **Command-line prompt**: Place the appropriate downloaded configuration xml file in the *%userprofile%\AppData\Local\Packages\Microsoft.AzureVpn_8wekyb3d8bbwe\LocalState* folder, then run the command that corresponds to the configuration file name. For example, `azurevpn -i azurevpnconfig_aad.xml`. To force the import, use the `-f` switch.
+   - **macOS**
+     - **Azure VPN Client interface**: Open the Azure VPN Client and select **Import**. Locate the modified .xml file. Configure any additional settings in the Azure VPN Client interface (if necessary), then select **Save**.
+     - **Command-line prompt**: Modify the following code snippet to distribute your configuration file. Execute it with privileges using `sudo sh ./script.sh`. A restart may be needed if Azure VPN CLient has been started in the user session already.
+       ```bash
+       #!/bin/sh
+
+       # Change this path
+       sourcePath="UPDATE THIS PATH TO YOUR XML"
+       profileName="Azure VPN"
+       
+       # These lines do not need changing
+       consoleuser=$(ls -l /dev/console | awk '{ print $3 }')
+       filePath="/Users/$consoleuser/Library/Containers/com.microsoft.AzureVpnMac/Data/Library/Application Support/com.microsoft.AzureVpnMac/$profileName.AzureVpnProfile.xml"
+       cp $sourcePath $filePath
+       ```
 ## DNS
 
 ### Add DNS suffixes