Skip to content

Commit f8de18e

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into nfs-30-support-for-blob-storage
2 parents 54252f2 + 7b157d9 commit f8de18e

14 files changed

Lines changed: 119 additions & 96 deletions

articles/app-service/configure-ssl-certificate-in-code.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.custom:
1717

1818
[!INCLUDE [app-service-managed-certificate](./includes/managed-certs/managed-certs-note.md)]
1919

20-
In your application code, you can access both [public key certificates and certificates that contain a private key that you add to Azure App Service.](configure-ssl-certificate.md). Your app code might act as a client and access an external service that requires certificate authentication. It might also need to perform cryptographic tasks. This article shows how to use public or private certificates in your application code.
20+
In your application code, you can access both [public key certificates and certificates that contain a private key that you add to Azure App Service.](configure-ssl-certificate.md). Your app code might act as a client and access an external service that requires certificate authentication. It might also need to perform cryptographic tasks. This article shows how to use publicly or privately signed certificates in your application code.
2121

2222
This approach to using certificates in your code makes use of the Transport Layer Security (TLS) functionality in App Service, which requires your app to be in the Basic tier or higher. If your app is in the Free or Shared tier, you can [include the certificate file in your app repository](#load-a-certificate-from-a-file).
2323

@@ -111,7 +111,7 @@ For languages that don't support or offer insufficient support for the Windows c
111111

112112
## Load a certificate from a file
113113

114-
If you need to load a certificate file that you upload manually, it's better to upload the certificate by using [File Transfer Protocol Secure (FTPS)](deploy-ftp.md) instead of [Git](deploy-local-git.md), for example. Keep sensitive data like a private certificate out of source control.
114+
If you need to load a certificate file that you upload manually, it's better to upload the certificate by using [File Transfer Protocol Secure (FTPS)](deploy-ftp.md) instead of [Git](deploy-local-git.md), for example. Keep sensitive data like certificate private keys out of source control.
115115

116116
ASP.NET and ASP.NET Core on Windows must access the certificate store even if you load a certificate from a file. To load a certificate file in a Windows .NET app, load the current user profile with the following command in <a target="_blank" href="https://shell.azure.com" >Cloud Shell</a>:
117117

@@ -140,7 +140,7 @@ To see how to load a TLS/SSL certificate from a file in Node.js, PHP, Python, or
140140

141141
The `WEBSITE_LOAD_CERTIFICATES` app setting makes the specified certificates accessible to your Windows or Linux custom containers (including built-in Linux containers) as files. The files are found under the following directories:
142142

143-
| Container platform | Public certificates | Private certificates |
143+
| Container platform | Public certificate files (no private key) | Certificate files that include a private key |
144144
| - | - | - |
145145
| Windows container | `C:\appservice\certificates\public` | `C:\appservice\certificates\private` |
146146
| Linux container | `/var/ssl/certs` | `/var/ssl/private` |

articles/app-service/overview-hosting-plans.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ The pricing tier of an App Service plan determines what App Service features you
3535
| Category | Tiers | Description |
3636
|:-|:-|:-|
3737
| Shared compute | Free, Shared | Free and Shared, the two base tiers, run an app on the same Azure VM as other App Service apps, including apps of other customers. These tiers allocate CPU quotas to each app that runs on the shared resources. The resources can't scale out. These tiers are intended for only development and testing purposes. |
38-
| Dedicated compute | Basic, Standard, Premium, PremiumV2, PremiumV3, PremiumV4 | The Basic, Standard, Premium, PremiumV2, PremiumV3, and PremiumV4 tiers run apps on dedicated Azure VMs. Only apps in the same App Service plan share the same compute resources. The higher the tier, the more VM instances that are available to you for scale-out. |
38+
| Dedicated compute | Basic, Standard, Premium, PremiumV2, PremiumV3, PremiumV4 | The Basic, Standard, Premium, PremiumV2, PremiumV3, and PremiumV4 tiers run apps on dedicated Azure VMs. Only apps in the same App Service plan share the same compute resources (and those resources aren't shared with other customers). The higher the tier, the more VM instances that are available to you for scale-out. |
3939
| Isolated | IsolatedV2 | The IsolatedV2 tier runs dedicated Azure VMs on dedicated Azure virtual networks. This tier provides network isolation on top of compute isolation to your apps. It provides the maximum scale-out capabilities. |
4040

4141
Each tier also provides a specific subset of App Service features. These features include custom domains and TLS/SSL certificates, autoscaling, deployment slots, backups, Azure Traffic Manager integration, and more. The higher the tier, the more features that are available. To find out which features are supported in each pricing tier, see the [App Service plan details](https://azure.microsoft.com/pricing/details/app-service/windows/#pricing).
Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
11
---
2-
title: Connect to SMTP from Azure Logic Apps
3-
description: Automate tasks and workflows that send email through your SMTP (Simple Mail Transfer Protocol) account using Azure Logic Apps.
2+
title: Connect to SMTP from Workflows
3+
description: Connect to SMTP (Simple Mail Transfer Protocol) accounts from integration workflows in Azure Logic Apps.
44
services: logic-apps
55
ms.suite: integration
6-
ms.reviewer: estfan, azla
6+
ms.reviewers: estfan, azla
77
ms.topic: how-to
8-
ms.date: 02/19/2025
8+
ms.update-cycle: 1095-days
9+
ms.date: 03/11/2026
10+
# Customer intent: As an integration developer who works with Azure Logic Apps, I want to connect my logic app workflows to
911
---
1012

11-
# Connect to your SMTP account from Azure Logic Apps
13+
# Connect to your SMTP account from workflows in Azure Logic Apps
1214

13-
[!INCLUDE [logic-apps-sku-consumption](~/reusable-content/ce-skilling/azure/includes/logic-apps-sku-consumption.md)]
15+
[!INCLUDE [logic-apps-sku-consumption](../logic-apps/includes/logic-apps-sku-consumption.md)]
1416

1517
With Azure Logic Apps and the Simple Mail Transfer Protocol (SMTP) connector,
1618
you can create automated tasks and workflows that send email from your SMTP account.
1719
You can also have other actions use the output from SMTP actions. For example,
18-
after your SMTP sends an email, you can notify your team in Slack with the Slack connector.
19-
If you're new to logic apps, review [What is Azure Logic Apps?](../logic-apps/logic-apps-overview.md)
20+
after your SMTP sends an email, you can notify your team in Slack with the Slack connector.
2021

2122
## Prerequisites
2223

23-
* An Azure account and subscription. If you don't have an Azure subscription,
24-
[sign up for a free Azure account](https://azure.microsoft.com/pricing/purchase-options/azure-account?cid=msft_learn).
24+
* An Azure account and subscription. [Get a free Azure account](https://azure.microsoft.com/pricing/purchase-options/azure-account?cid=msft_learn).
2525

2626
* Your SMTP account and user credentials
2727

28-
Your credentials authorize your logic app to create
28+
Your credentials authorize your logic app workflow to create
2929
a connection and access your SMTP account.
3030

31-
* Basic knowledge about how to create logic apps
31+
* Basic knowledge about how to create logic app workflows
3232

3333
* The logic app where you want to access your SMTP account.
34-
To use an SMTP action, start your logic app with a trigger,
34+
To use an SMTP action, start your logic app workflow with any trigger,
3535
such as a Salesforce trigger, if you have a Salesforce account.
3636

37-
For example, you can start your logic app with the
37+
For example, you can start your logic app workflow with the
3838
**When a record is created** Salesforce trigger.
3939
This trigger fires each time that a new record,
4040
such as a lead, is created in Salesforce.
4141
You can then follow this trigger with the SMTP
4242
**Send Email** action. That way, when the new
43-
record is created, your logic app sends an email
43+
record is created, your logic app workflow sends an email
4444
from your SMTP account about the new record.
4545

4646
## Connector reference
@@ -51,8 +51,7 @@ For more technical details about this connector, such as triggers, actions, and
5151

5252
[!INCLUDE [Create connection general intro](../../includes/connectors-create-connection-general-intro.md)]
5353

54-
1. Sign in to the [Azure portal](https://portal.azure.com),
55-
and open your logic app resource and workflow in the designer, if not open already.
54+
1. In the [Azure portal](https://portal.azure.com), open your logic app resource and workflow in the designer.
5655

5756
1. [Follow these general steps to add the **SMTP** action that you want](/azure/logic-apps/create-workflow-with-trigger-or-action#add-action).
5857

@@ -71,8 +70,8 @@ and open your logic app resource and workflow in the designer, if not open alrea
7170

7271
1. Save your logic app or continue building your logic app's workflow.
7372

74-
## Next steps
73+
## Related content
7574

76-
* [Managed connectors for Azure Logic Apps](/connectors/connector-reference/connector-reference-logicapps-connectors)
77-
* [Built-in connectors for Azure Logic Apps](built-in.md)
78-
* [What are connectors in Azure Logic Apps](introduction.md)
75+
- [Managed connectors for Azure Logic Apps](/connectors/connector-reference/connector-reference-logicapps-connectors)
76+
- [Built-in connectors for Azure Logic Apps](built-in.md)
77+
- [What are connectors in Azure Logic Apps](introduction.md)

articles/logic-apps/export-standard-logic-app-to-visual-studio-code.md

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
---
2-
title: Export Standard logic apps to Visual Studio Code
3-
description: Download your Standard logic app and workflows from the Azure portal into Visual Studio Code.
2+
title: Export Standard Workflows to Visual Studio Code
3+
description: Download and export Standard logic app workflows from the Azure portal to Visual Studio Code.
44
ms.suite: integration
55
services: logic-apps
66
author: wsilveiranz
77
ms.author: wsilveira
8-
ms.reviewer: estfan, azla
8+
ms.reviewers: estfan, azla
99
ms.topic: how-to
10-
ms.date: 02/20/2025
11-
# As an Azure Logic Apps developer, I want to export my Standard logic app and workflows from the Azure portal into Visual Studio Code.
10+
ms.update-cycle: 365-days
11+
ms.date: 03/11/2026
12+
# As an Azure Logic Apps developer, I want to export my Standard logic app and workflows from the Azure portal to Visual Studio Code.
1213
---
1314

1415
# Export Standard logic apps from Azure portal to Visual Studio Code
1516

16-
[!INCLUDE [logic-apps-sku-standard](../../includes/logic-apps-sku-standard.md)]
17+
[!INCLUDE [logic-apps-sku-standard](includes/logic-apps-sku-standard.md)]
1718

1819
If you work on Standard logic app workflows using the Azure portal, you might find yourself wanting to use Visual Studio Code instead at some point. When you switch to Visual Studio Code and install the Azure Logic Apps (Standard) extension, you get the expanded benefits available only with the extension, for example:
1920

@@ -61,7 +62,7 @@ This guide shows how to download your Standard logic app as a zip file package f
6162

6263
1. In the Azure window, on the **Workspace** toolbar, open the **Azure Logic Apps** menu, and select **Create new logic app workspace from package...**.
6364

64-
:::image type="content" source="media/export-standard-logic-app-to-visual-studio-code/create-workspace-from-package.png" alt-text="Screenshot shows Visual Studio Code, Azure window, and Workspace toolbar with selected button for Azure Logic Apps, and selected option for Create new logic app workspace from package.":::
65+
:::image type="content" source="media/export-standard-logic-app-to-visual-studio-code/create-workspace-from-package.png" alt-text="Screenshot shows Visual Studio Code, Azure window, Workspace toolbar with selected button for Azure Logic Apps, and selected option for Create new logic app workspace from package.":::
6566

6667
The **Create New Logic App Workspace from Package** prompt window opens so you can select the zip file package that you want to import.
6768

@@ -71,7 +72,9 @@ This guide shows how to download your Standard logic app as a zip file package f
7172

7273
You're now prompted to select the folder where you want to create your workspace.
7374

74-
1. From the prompt list, select **Browse**. Find and select the local repository folder where you want to create your workspace. When you're done, choose **Select**. Follow the additional prompts to continue creating your workspace.
75+
1. From the prompt list, select **Browse**. Find and select the local repository folder where you want to create your workspace. When you're done, choose **Select**.
76+
77+
1. Follow the subsequent prompts to continue creating your workspace.
7578

7679
1. Enter a name to use for your workspace.
7780

@@ -107,6 +110,6 @@ If you have connections that use a managed identity, make sure that you update t
107110

108111
## Related content
109112

110-
For more information about managing your Standard logic app project in Visual Studio Code, see the following documentation:
113+
For more information about managing your Standard logic app project in Visual Studio Code, see:
111114

112115
- [Create Standard logic app workflow in single-tenant Azure Logic Apps using Visual Studio Code](/azure/logic-apps/create-single-tenant-workflows-visual-studio-code)

articles/logic-apps/logic-apps-enterprise-integration-edifact.md

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
---
2-
title: Exchange EDIFACT messages in B2B workflows
3-
description: Exchange EDIFACT messages between partners by creating workflows with Azure Logic Apps and Enterprise Integration Pack.
2+
title: Exchange EDIFACT Messages in B2B Workflows
3+
description: Exchange EDIFACT messages between partners for B2B workflows in Azure Logic Apps.
44
services: logic-apps
55
ms.suite: integration
66
author: divyaswarnkar
77
ms.author: divswa
8-
ms.reviewer: estfan, azla
8+
ms.reviewers: estfan, azla
99
ms.topic: how-to
10-
ms.date: 02/10/2025
10+
ms.update-cycle: 1095-days
11+
ms.date: 03/11/2026
1112
ms.custom: sfi-image-nochange
13+
# Customer intent: As a B2B integration developer who works with Azure Logic Apps, I want to set up message communication between trading partners in enterprise workflows.
1214
---
1315

14-
# Exchange EDIFACT messages using workflows in Azure Logic Apps
16+
# Exchange EDIFACT messages for B2B workflows in Azure Logic Apps
1517

1618
To send and receive EDIFACT messages in workflows that you create using Azure Logic Apps, use the **EDIFACT** connector, which provides operations that support and manage EDIFACT communication.
1719

@@ -57,7 +59,7 @@ The **EDIFACT** built-in connector has the following actions, which are similar
5759

5860
## Prerequisites
5961

60-
* An Azure account and subscription. If you don't have a subscription yet, [sign up for a free Azure account](https://azure.microsoft.com/pricing/purchase-options/azure-account?cid=msft_learn).
62+
* An Azure account and subscription. [Get a free Azure account](https://azure.microsoft.com/pricing/purchase-options/azure-account?cid=msft_learn).
6163

6264
* An [integration account resource](./enterprise-integration/create-integration-account.md) where you define and store artifacts, such as trading partners, agreements, certificates, and so on, for use in your enterprise integration and B2B workflows. This resource has to meet the following requirements:
6365

@@ -254,15 +256,15 @@ The **EDIFACT** managed connector action named **Decode EDIFACT message** action
254256

255257
* Split Interchange as transaction sets - suspend interchange on error.
256258

257-
The decoding action splits the interchange into transaction sets and parses each transaction set. If one or more transaction sets in the interchange fail validation, the action outputs all the transaction sets in that interchange to `badMessages`.
259+
The decoding action splits the interchange into transaction sets and parses each transaction set. If one or more transaction sets in the interchange fail validation, the action outputs the transaction sets in that interchange to `badMessages`.
258260

259261
* Preserve Interchange - suspend transaction sets on error.
260262

261263
The decoding action preserves the interchange and processes the entire batched interchange. The action outputs only those transaction sets that fail validation to `badMessages`, and outputs the remaining transactions sets to `goodMessages`.
262264

263265
* Preserve Interchange - suspend interchange on error.
264266

265-
The decoding action preserves the interchange and processes the entire batched interchange. If one or more transaction sets in the interchange fail validation, the action outputs all the transaction sets in that interchange to `badMessages`.
267+
The decoding action preserves the interchange and processes the entire batched interchange. If one or more transaction sets in the interchange fail validation, the action outputs the transaction sets in that interchange to `badMessages`.
266268

267269
* Generate a technical acknowledgment, functional acknowledgment, or both, if configured.
268270

@@ -380,6 +382,6 @@ To handle an EDIFACT document or process an EDIFACT message that has a UN2.5 seg
380382

381383
![Screenshot showing the Azure portal with an EDIFACT agreement's "sendAgreement" section in the JSON editor, and the "schemaReferences" section is highlighted.](./media/logic-apps-enterprise-integration-edifact/agreement-send-schema-references.png)
382384

383-
## Next steps
385+
## Related content
384386

385-
* [EDIFACT message settings](logic-apps-enterprise-integration-edifact-message-settings.md)
387+
- [EDIFACT message settings](logic-apps-enterprise-integration-edifact-message-settings.md)

articles/logic-apps/move-logic-app-resources.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
---
2-
title: Move logic apps across subscriptions, resource groups, or regions
2+
title: Move Logic Apps to Other Subscriptions, Resource Groups, or Regions
33
description: Migrate logic apps or integration accounts to other Azure subscriptions, resource groups, or locations (regions).
44
services: logic-apps
55
ms.suite: integration
6-
ms.reviewer: estfan, azla
6+
ms.reviewers: estfan, azla
77
ms.topic: how-to
8-
ms.date: 02/19/2025
8+
ms.update-cycle: 365-days
9+
ms.date: 03/11/2026
10+
# Customer intent: As a developer who works with Azure Logic Apps, I want to move or migrate my logic app resources to other Azure resource groups, subscriptions, or regions.
911
---
1012

1113
# Move logic app resources to other Azure resource groups, regions, or subscriptions
@@ -78,7 +80,7 @@ When you want to move a logic app to a different region, your options depend on
7880

7981
* If you created and deployed your logic app by using continuous integration (CI) and continuous delivery (CD) tools, such as Azure Pipelines in Azure DevOps, you can deploy your app to another region by using those tools.
8082

81-
For more information about deployment templates for logic apps, see these topics:
83+
For more information about deployment templates for logic apps, see these articles:
8284

8385
* [Overview: Automate deployment for Azure Logic Apps by using Azure Resource Manager templates](../logic-apps/logic-apps-azure-resource-manager-templates-overview.md)
8486
* [Find, open, and download your logic app from the Azure portal into Visual Studio](../logic-apps/manage-logic-apps-with-visual-studio.md)
@@ -99,7 +101,7 @@ The template that you get from Visual Studio includes only the resource definiti
99101

100102
1. In the [Azure portal](https://portal.azure.com), find and open your integration account.
101103

102-
1. On your integration account's menu, under **Settings**, select **Export template**.
104+
1. On the integration account sidebar, under **Settings**, select **Export template**.
103105

104106
1. On the toolbar, select **Download**, and save the template.
105107

0 commit comments

Comments
 (0)