Skip to content

Commit 3ec0ec7

Browse files
authored
Merge pull request #203407 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)
2 parents c48f200 + 81318d6 commit 3ec0ec7

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

articles/app-service/samples-bicep.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ To learn about the Bicep syntax and properties for App Services resources, see [
1717

1818
| Deploying an app | Description |
1919
|-|-|
20-
| [App Service plan and basic Linux app](https://github.com/Azure/bicep/tree/main/docs/examples/101/web-app-linux) | Deploys an App Service app that is configured for Linux. |
21-
| [App Service plan and basic Windows app](https://github.com/Azure/bicep/tree/main/docs/examples/101/web-app-windows) | Deploys an App Service app that is configured for Windows. |
20+
| [App Service plan and basic Linux app](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.web/webapp-basic-linux) | Deploys an App Service app that is configured for Linux. |
21+
| [App Service plan and basic Windows app](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.web/webapp-basic-windows) | Deploys an App Service app that is configured for Windows. |
2222
| [Website with container](https://github.com/Azure/bicep/tree/main/docs/examples/101/website-with-container) | Deploys a website from a docker image configured for Linux. |
2323
| **Configuring an app** | **Description** |
2424
| [App with conditional logging](https://github.com/Azure/bicep/tree/main/docs/examples/201/web-app-conditional-log)| Deploys an App Service app with a conditional for logging enablement. |
25-
| [App with log analytics module](https://github.com/Azure/bicep/tree/main/docs/examples/201/web-app-loganalytics-mod)| Deploys an App Service app with log analytics. |
26-
| [App with regional VNet integration](https://github.com/Azure/bicep/tree/main/docs/examples/101/app-service-regional-vnet-integration)| Deploys an App Service app with regional VNet integration enabled. |
25+
| [App with log analytics module](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.web/web-app-loganalytics)| Deploys an App Service app with log analytics. |
26+
| [App with regional VNet integration](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.web/app-service-regional-vnet-integration)| Deploys an App Service app with regional VNet integration enabled. |
2727
|**App with connected resources**| **Description** |
2828
| [App with CosmosDB](https://github.com/Azure/bicep/tree/main/docs/examples/101/cosmosdb-webapp)| Deploys an App Service app on Linux with CosmosDB. |
29-
| [App with MySQL](https://github.com/Azure/bicep/tree/main/docs/examples/101/webapp-managed-mysql)| Deploys an App Service app on Windows with Azure Database for MySQL. |
30-
| [App with a database in Azure SQL Database](https://github.com/Azure/bicep/tree/main/docs/examples/201/web-app-sql-database)| Deploys an App Service app and a database in Azure SQL Database at the Basic service level. |
31-
| [App connected to a backend webapp](https://github.com/Azure/bicep/tree/main/docs/examples/101/webapp-privateendpoint-vnet-injection)| Deploys two web apps (frontend and backend) securely connected together with VNet injection and Private Endpoint. |
32-
| [App with a database, managed identity, and monitoring](https://github.com/Azure/bicep/tree/main/docs/examples/301/web-app-managed-identity-sql-db)| Deploys an App Service App with a database, managed identity, and monitoring. |
29+
| [App with MySQL](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.web/webapp-managed-mysql)| Deploys an App Service app on Windows with Azure Database for MySQL. |
30+
| [App with a database in Azure SQL Database](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.web/web-app-sql-database)| Deploys an App Service app and a database in Azure SQL Database at the Basic service level. |
31+
| [App connected to a backend webapp](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.web/webapp-privateendpoint-vnet-injection)| Deploys two web apps (frontend and backend) securely connected together with VNet injection and Private Endpoint. |
32+
| [App with a database, managed identity, and monitoring](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.web/web-app-managed-identity-sql-db)| Deploys an App Service App with a database, managed identity, and monitoring. |
3333
|**App Service Environment**| **Description** |
34-
| [Create an App Service environment v2](https://github.com/Azure/bicep/tree/main/docs/examples/201/web-app-asev2-create) | Creates an App Service environment v2 in your virtual network. |
35-
| | |
34+
| [Create an App Service environment v2](https://github.com/Azure/azure-quickstart-templates/tree/master/quickstarts/microsoft.web/web-app-asev2-create) | Creates an App Service environment v2 in your virtual network. |
35+
| | |

articles/cost-management-billing/manage/mca-section-invoice.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ The total charges for using 100 TB of data in this scenario is **180.5**
194194

195195
#### You have multiple billing profiles.
196196

197-
Now, let's assume you created another billing profile and used 50 GB through subscriptions that are billed to the first billing profile and 50 GB through subscriptions that are billed to the second billing profile, here's how much you would be charged.
197+
Now, let's assume you created another billing profile and used 50 TB through subscriptions that are billed to the first billing profile and 50 TB through subscriptions that are billed to the second billing profile, here's how much you would be charged.
198198

199199
`Charges for the first billing profile`
200200

@@ -233,4 +233,4 @@ If you need help, [contact support](https://portal.azure.com/?#blade/Microsoft_A
233233

234234
- [Create an additional Azure subscription for Microsoft Customer Agreement](create-subscription.md)
235235
- [Manage billing roles in the Azure portal](understand-mca-roles.md#manage-billing-roles-in-the-azure-portal)
236-
- [Get billing ownership of Azure subscriptions from users in other billing accounts](mca-request-billing-ownership.md)
236+
- [Get billing ownership of Azure subscriptions from users in other billing accounts](mca-request-billing-ownership.md)

articles/storage/blobs/lifecycle-management-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ Some data is expected to expire days or months after creation. You can configure
292292

293293
### Delete data with blob index tags
294294

295-
Some data should only be expired if explicitly marked for deletion. You can configure a lifecycle management policy to expire data that are tagged with blob index key/value attributes. The following example shows a policy that deletes all block blobs tagged with `Project = Contoso`. To learn more about blob index, see [Manage and find data on Azure Blob Storage with blob index (Preview)](storage-manage-find-blobs.md).
295+
Some data should only be expired if explicitly marked for deletion. You can configure a lifecycle management policy to expire data that are tagged with blob index key/value attributes. The following example shows a policy that deletes all block blobs tagged with `Project = Contoso`. To learn more about blob index, see [Manage and find data on Azure Blob Storage with blob index](storage-manage-find-blobs.md).
296296

297297
```json
298298
{

0 commit comments

Comments
 (0)