Merge pull request #267421 from MicrosoftDocs/main

2/27/2024 AM Publish

Author: Taojunshen

articles/ai-services/openai/how-to/use-web-app.md

@@ -33,7 +33,7 @@ Along with Azure OpenAI Studio, APIs and SDKs, you can also use the available st
 
 ## Web app customization
 
-You can customize the app's frontend and backend logic. For example, you could change the icon that appears in the center of the app by updating `/frontend/src/assets/Contoso.svg` and then redeploying the app [using the Azure CLI](https://github.com/microsoft/sample-app-aoai-chatGPT#deploy-with-the-azure-cli).  See the source code for the web app, and more information on [GitHub](https://github.com/microsoft/sample-app-aoai-chatGPT).
+You can customize the app's frontend and backend logic. The app provides several [environment variables](https://github.com/microsoft/sample-app-aoai-chatGPT#common-customization-scenarios-eg-updating-the-default-chat-logo-and-headers) for common customization scenarios such as changing the icon in the app. See the source code for the web app, and more information on [GitHub](https://github.com/microsoft/sample-app-aoai-chatGPT).
 
 When customizing the app, we recommend:
 
@@ -43,7 +43,7 @@ When customizing the app, we recommend:
 
 - When you rotate API keys for your Azure OpenAI or Azure AI Search resource, be sure to update the app settings for each of your deployed apps to use the new keys.
 
-Sample source code for Azure OpenAI On Your Data web app is available on [GitHub](https://github.com/microsoft/sample-app-aoai-chatGPT). Source code is provided "as is" and as a sample only. Customers are responsible for all customization and implementation of their web apps using Azure OpenAI On Your Data. 
+Sample source code for the web app is available on [GitHub](https://github.com/microsoft/sample-app-aoai-chatGPT). Source code is provided "as is" and as a sample only. Customers are responsible for all customization and implementation of their web apps. 
 
 ### Updating the web app
 

articles/ai-services/openai/quotas-limits.md

@@ -10,7 +10,7 @@ ms.custom:
   - ignite-2023
   - references_regions
 ms.topic: conceptual
-ms.date: 02/06/2024
+ms.date: 02/27/2024
 ms.author: mbullwin
 ---
 
@@ -53,7 +53,7 @@ The default quota for models varies by model and region. Default quota limits ar
 
 | Region           | Text-Embedding-Ada-002   | text-embedding-3-small   | text-embedding-3-large   | GPT-35-Turbo   | GPT-35-Turbo-1106   | GPT-35-Turbo-16K   | GPT-35-Turbo-Instruct   | GPT-4   | GPT-4-32K   | GPT-4-Turbo   | GPT-4-Turbo-V   | Babbage-002   | Babbage-002 - finetune   | Davinci-002   | Davinci-002 - finetune   | GPT-35-Turbo - finetune   | GPT-35-Turbo-1106 - finetune   |
 |:-----------------|:-------------------------|:-------------------------|:-------------------------|:---------------|:--------------------|:-------------------|:------------------------|:--------|:------------|:--------------|:----------------|:--------------|:-------------------------|:--------------|:-------------------------|:--------------------------|:-------------------------------|
-| australiaeast    | 350 K                    | -                        | -                        | 300 K          | 120 K               | 300 K              | -                       | 40 K    | 80 K        | 80 K          | -               | -             | -                        | -             | -                        | -                         | -                              |
+| australiaeast    | 350 K                    | -                        | -                        | 300 K          | 120 K               | 300 K              | -                       | 40 K    | 80 K        | 80 K          | 30 K            | -             | -                        | -             | -                        | -                         | -                              |
 | brazilsouth      | 350 K                    | -                        | -                        | -              | -                   | -                  | -                       | -       | -           | -             | -               | -             | -                        | -             | -                        | -                         | -                              |
 | canadaeast       | 350 K                    | 350 K                    | 350 K                    | 300 K          | 120 K               | 300 K              | -                       | 40 K    | 80 K        | 80 K          | -               | -             | -                        | -             | -                        | -                         | -                              |
 | eastus           | 240 K                    | 350 K                    | 350 K                    | 240 K          | -                   | 240 K              | 240 K                   | -       | -           | 80 K          | -               | -             | -                        | -             | -                        | -                         | -                              |
@@ -71,7 +71,6 @@ The default quota for models varies by model and region. Default quota limits ar
 | westeurope       | 240 K                    | -                        | -                        | 240 K          | -                   | -                  | -                       | -       | -           | -             | -               | -             | -                        | -             | -                        | -                         | -                              |
 | westus           | 350 K                    | -                        | -                        | -              | 120 K               | -                  | -                       | -       | -           | 80 K          | 30 K            | -             | -                        | -             | -                        | -                         | -                              |
 
-
 ### General best practices to remain within rate limits
 
 To minimize issues related to rate limits, it's a good idea to use the following techniques:

articles/aks/howto-deploy-java-wls-app.md

@@ -475,13 +475,14 @@ Use the following steps to build the image:
    This command should produce output similar to the following example:
 
    ```output
-   /auxiliary/models/dbmodel.yaml
-   /auxiliary/models/archive.zip
    /auxiliary/models/model.properties
+   /auxiliary/models/dbmodel.yaml
    /auxiliary/models/model.yaml
-   /auxiliary/weblogic-deploy/VERSION.txt
-   /auxiliary/weblogic-deploy/LICENSE.txt
+   /auxiliary/models/archive.zip
+   /auxiliary/models/appmodel.yaml
    /auxiliary/Dockerfile
+   /auxiliary/weblogic-deploy/LICENSE.txt
+   /auxiliary/weblogic-deploy/VERSION.txt
    ```
 
 1. Use the following steps to push the auxiliary image to Azure Container Registry:

articles/app-service/manage-backup.md

@@ -36,10 +36,10 @@ There are two types of backups in App Service. Automatic backups made for your a
 | Linked database | Not backed up. | The following linked databases can be backed up: [SQL Database](/azure/azure-sql/database/), [Azure Database for MySQL](../mysql/index.yml), [Azure Database for PostgreSQL](../postgresql/index.yml), [MySQL in-app](https://azure.microsoft.com/blog/mysql-in-app-preview-app-service/). |
 | [Storage account](../storage/index.yml) required | No. | Yes. |
 | Backup frequency | Hourly, not configurable. | Configurable. |
-| Retention | 30 days, not configurable. <br>- Days 1-3: hourly backups retained.<br>- Days 4-14: every 3 hourly backup retained.<br>- Days 15-30: every 6 hourly backup retained. | 0-30 days or indefinite. |
+| Retention | 30 days, not configurable. <br>- Days 1-3: hourly backups retained.<br>- Days 4-14: every third hourly backup retained.<br>- Days 15-30: every sixth hourly backup retained. | 0-30 days or indefinite. |
 | Downloadable | No. | Yes, as Azure Storage blobs. |
 | Partial backups | Not supported. | Supported. |
-| Back up over VNet | Not supported. | Supported. |
+| Backups over VNet | Not supported. | Supported. |
 
 <!-- - No file copy errors due to file locks. -->
 
@@ -54,7 +54,7 @@ There are two types of backups in App Service. Automatic backups made for your a
 
     :::image type="content" source="./media/manage-backup/open-backups-page.png" alt-text="Screenshot that shows how to open the backups page.":::
 
-1. Select the automatic backup or custom backup to restore by clicking its **Restore** link.
+1. Select the automatic backup or custom backup to restore by selecting its **Restore** link.
 
     :::image type="content" source="./media/manage-backup/click-restore-link.png" alt-text="Screenshot that shows how to select the restore link.":::
 
@@ -66,7 +66,7 @@ There are two types of backups in App Service. Automatic backups made for your a
 
 1. You can choose to restore your site configuration under **Advanced options**.
 
-1. Click **Restore**.
+1. Select **Restore**.
 
 # [Azure CLI](#tab/cli)
 
@@ -137,7 +137,7 @@ There are two types of backups in App Service. Automatic backups made for your a
     >
     >
 
-1. Click **Configure**.
+1. Select **Configure**.
 
     Once the storage account and container is configured, you can initiate an on-demand backup at any time. On-demand backups are retained indefinitely.
 
@@ -170,21 +170,21 @@ To restore a database that's included in a custom backup:
 
 For troubleshooting information, see [Why is my linked database not backed up](#why-is-my-linked-database-not-backed-up).
 
-## Back up and restore over Azure Virtual Network (preview)
+## Back up and restore over Azure Virtual Network
 
 With [custom backups](#create-a-custom-backup), you can back up your app's files and configuration data to a firewall-protected storage account if the following requirements are fulfilled:
 
 - The app is [integrated with a virtual network](overview-vnet-integration.md), or the app is in a v3 [App Service environment](environment/app-service-app-service-environment-intro.md).
-- The storage account has [granted access from the virtual network](../storage/common/storage-network-security.md#grant-access-from-a-virtual-network) that the app is integrated with, or that the v3 App Service environment is created with.
+- The storage account [allows access from the virtual network](../storage/common/storage-network-security.md#grant-access-from-a-virtual-network) that the app is integrated with, or that the v3 App Service environment is created with.
 
 To back up and restore over Azure Virtual Network:
 
 1. When configuring [custom backups](#create-a-custom-backup), select **Backup/restore over virtual network integration**. 
 1. Save your settings by selecting **Configure**.
 
-If you don't see the checkbox, or if the checkbox is disabled, verify that you have fulfilled the aforementioned requirements. 
+If you don't see the checkbox, or if the checkbox is disabled, verify that your resources fulfill the requirements. 
 
-Once the configuration is saved, any manual, scheduled backup, or restore is made through the virtual network. If you make changes to the app, the virtual network, or the storage account that prevent the app from accessing the storage account through the virtual network, the backup or restore operations will fail.
+Once the configuration is saved, any manual, scheduled backup, or restore is made through the virtual network. If you make changes to the app, the virtual network, or the storage account that prevent the app from accessing the storage account through the virtual network, the backup or restore operations fail.
 
 <a name="partialbackups"></a>
 
@@ -225,7 +225,7 @@ Run backups the same way you would normally do it, [custom on-demand](#create-a-
 
 ## How backups are stored
 
-After you have made one or more backups for your app, the backups are visible on the **Containers** page of your storage account, and your app. In the storage account, each backup consists of a`.zip` file that contains the backup data and an `.xml` file that contains a manifest of the `.zip` file contents. You can unzip and browse these files if you want to access your backups without actually performing an app restore.
+After you make one or more backups for your app, the backups are visible on the **Containers** page of your storage account, and your app. In the storage account, each backup consists of a`.zip` file that contains the backup data and an `.xml` file that contains a manifest of the `.zip` file contents. You can unzip and browse these files if you want to access your backups without actually performing an app restore.
 
 The database backup for the app is stored in the root of the .zip file. For SQL Database, this is a BACPAC file (no file extension) and can be imported. To create a database in Azure SQL Database based on the BACPAC export, see [Import a BACPAC file to create a database in Azure SQL Database](/azure/azure-sql/database/database-import).
 
@@ -248,7 +248,7 @@ The **Backups** page shows you the status of each backup. To get log details reg
 | A network-related or instance-specific error occurred while establishing a connection to SQL Server. The server was not found or was not accessible. Verify that the instance name is correct and that SQL Server is configured to allow remote connections. (provider: Named Pipes Provider, error: 40 - Could not open a connection to SQL Server). | Check that the connection string is valid. Allow the app's [outbound IPs](overview-inbound-outbound-ips.md) in the database server settings. |
 | Cannot open server "\<name>" requested by the login. The login failed. | Check that the connection string is valid. |
 | Missing mandatory parameters for valid Shared Access Signature. | Delete the backup schedule and reconfigure it. |
-| SSL connection is required. Please specify SSL options and retry when trying to connect. | SSL connectivity to Azure Database for MySQL and Azure Database for PostgreSQL isn't supported for database backups. Use the native backup feature in the respective database instead. |
+| SSL connection is required. Specify SSL options and retry when trying to connect. | SSL connectivity to Azure Database for MySQL and Azure Database for PostgreSQL isn't supported for database backups. Use the native backup feature in the respective database instead. |
 
 ## Automate with scripts
 
@@ -318,23 +318,23 @@ The following table shows which app configuration is restored when you choose to
 
 A custom backup (on-demand backup or scheduled backup) includes all content and configuration that's included in an [automatic backup](#whats-included-in-an-automatic-backup), plus any linked database, up to the allowable maximum size.
 
-When [backing up over an Azure Virtual Network](#back-up-and-restore-over-azure-virtual-network-preview), you can't [back up the linked database](#back-up-and-restore-a-linked-database).
+When [backing up over an Azure Virtual Network](#back-up-and-restore-over-azure-virtual-network), you can't [back up the linked database](#back-up-and-restore-a-linked-database).
 
 #### Why is my linked database not backed up?
 
 Linked databases are backed up only for custom backups, up to the allowable maximum size. If the maximum backup size (10 GB) or the maximum database size (4 GB) is exceeded, your backup fails. Here are a few common reasons why your linked database isn't backed up: 
 
-* Backups of [TLS enabled Azure Database for MySQL](../mysql/concepts-ssl-connection-security.md) isn't supported. If a backup is configured, you'll encounter backup failures.
-* Backups of [TLS enabled Azure Database for PostgreSQL](../postgresql/concepts-ssl-connection-security.md) isn't supported. If a backup is configured, you'll encounter backup failures.
-* In-app MySQL databases are automatically backed up without any configuration. If you make manual settings for in-app MySQL databases, such as adding connection strings, the backups may not work correctly.
+* Backups of [TLS enabled Azure Database for MySQL](../mysql/concepts-ssl-connection-security.md) isn't supported. If a backup is configured, you get backup failures.
+* Backups of [TLS enabled Azure Database for PostgreSQL](../postgresql/concepts-ssl-connection-security.md) isn't supported. If a backup is configured, you get backup failures.
+* In-app MySQL databases are automatically backed up without any configuration. If you make manual settings for in-app MySQL databases, such as adding connection strings, the backups might not work correctly.
 
 #### What happens if the backup size exceeds the allowable maximum?
 
 Automatic backups can't be restored if the backup size exceeds the maximum size. Similarly, custom backups fail if the maximum backup size or the maximum database size is exceeded. To reduce your storage size, consider moving files like logs, images, audio, and videos to Azure Storage, for example.
 
 #### Can I use a storage account that has security features enabled?
 
-You can back up to a firewall-protected storage account if it's part of the same virtual network topology as your app. See [Back up and restore over Azure Virtual Network (preview)](#back-up-and-restore-over-azure-virtual-network-preview).
+You can back up to a firewall-protected storage account if it's part of the same virtual network topology as your app. See [Back up and restore over Azure Virtual Network](#back-up-and-restore-over-azure-virtual-network).
 
 #### How do I restore to an app in a different subscription?
 
@@ -353,11 +353,11 @@ The steps are the same as in [How do I restore to an app in a different subscrip
 
 #### Where are the automatic backups stored?
 
-Automatic backups are simple and stored in the same datacenter as the App Service and should not be relied upon as your disaster recovery plan.
+Automatic backups are simple and stored in the same datacenter as the App Service and shouldn't be relied upon as your disaster recovery plan.
 
 #### How do I stop the automatic backup?
 
-You cannot stop automatic backup. The automatic backup is stored on the platform and has no effect on the underlying app instance or its storage.
+You can't stop automatic backups. The automatic backup is stored on the platform and has no effect on the underlying app instance or its storage.
 
 
 <a name="nextsteps"></a>

articles/application-gateway/application-gateway-faq.yml

@@ -607,5 +607,5 @@ sections:
 
 additionalContent: |
     ## Next steps
-    * To learn more about Application Gateway, see [What is Azure Application Gateway?](overview.md).
+    * To learn more about Application Gateway, see [What is Azure Application Gateway](overview.md).
     * To learn about TLS termination and end-to-end TLS with Application Gateway, see [Enable end-to-end TLS on Azure Application Gateway](ssl-overview.md).