Skip to content

Commit 6869d7e

Browse files
authored
Merge pull request #49624 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 2a89728 + 80716fc commit 6869d7e

4 files changed

+5
-5
lines changed

articles/azure-stack/azure-stack-app-service-release-notes-update-three.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ For customers wishing to migrate to contained database for existing Azure App Se
8080
>
8181
>
8282
83-
1. Add [database to an Availability group](https://docs.microsoft.com/sql/database-engine/availability-groups/windows/availability-group-add-a-database)
83+
1. Add [AppService databases (appservice_hosting and appservice_metering) to an Availability group](https://docs.microsoft.com/sql/database-engine/availability-groups/windows/availability-group-add-a-database)
8484

8585
1. Enable contained database
8686
```sql

articles/logic-apps/logic-apps-architectures-enterprise-integration-with-queues-events.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ The architecture has the following components:
3838
- **Connectors**. Logic Apps uses [connectors](https://docs.microsoft.com/azure/connectors/apis-list) to connect to commonly used services. Logic Apps already has hundreds of different connectors, but you can also create a custom connector.
3939
- **Azure Service Bus**. [Service Bus](https://docs.microsoft.com/en-us/azure/service-bus-messaging/service-bus-messaging-overview) provides secure and reliable messaging. Messaging can be used to decouple applications and integrate with other message-based systems.
4040
- **Azure Event Grid**. [Event Grid](https://docs.microsoft.com/azure/event-grid/overview) is a serverless platform that's used to publish and deliver application events.
41-
- **IP address**. The Azure API Management service has a fixed public [IP address](https://docs.microsoft.com/azure/virtual-network/virtual-network-ip-addresses-overview-arm) and a domain name. The domain name is a subdomain of azure-api.net, such as contoso.azure-api.net. Logic Apps and Service Bus also have a public IP address. However, in this architecture, we restrict access for calling Logic Apps endpoints to only the IP address of API Management (for security). Calls to Service Bus are secured by a shared access signature (SAS).
41+
- **IP address**. The Azure API Management service has a fixed public [IP address](https://docs.microsoft.com/azure/virtual-network/virtual-network-ip-addresses-overview-arm) and a domain name. The default domain name is a subdomain of azure-api.net, such as contoso.azure-api.net, but [custom domains](https://docs.microsoft.com/azure/api-management/configure-custom-domain) can also be configured. Logic Apps and Service Bus also have a public IP address. However, in this architecture, we restrict access for calling Logic Apps endpoints to only the IP address of API Management (for security). Calls to Service Bus are secured by a shared access signature (SAS).
4242
- **Azure DNS**. [Azure DNS](https://docs.microsoft.com/azure/dns/) is a hosting service for DNS domains. Azure DNS provides name resolution by using the Microsoft Azure infrastructure. By hosting your domains in Azure, you can manage your DNS records by using the same credentials, APIs, tools, and billing that you use for your other Azure services. To use a custom domain name (like contoso.com), create DNS records that map the custom domain name to the IP address. For more information, see [Configure a custom domain name in API Management](https://docs.microsoft.com/en-us/azure/api-management/configure-custom-domain).
4343
- **Azure Active Directory (Azure AD)**. Use [Azure AD](https://docs.microsoft.com/azure/active-directory/) or another identity provider for authentication. Azure AD provides authentication for accessing API endpoints by passing a [JSON Web Token for API Management](https://docs.microsoft.com/azure/api-management/policies/authorize-request-based-on-jwt-claims) to validate. Azure AD can secure access to the API Management Developer portal (Standard and Premium tiers only).
4444

@@ -125,4 +125,4 @@ Event Grid secures event delivery through a validation code. If you use Logic Ap
125125

126126
## Next steps
127127

128-
- Learn about [simple enterprise integration](logic-apps-architectures-simple-enterprise-integration.md).
128+
- Learn about [simple enterprise integration](logic-apps-architectures-simple-enterprise-integration.md).

articles/logic-apps/logic-apps-architectures-simple-enterprise-integration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ The architecture has the following components:
3434
- **Azure API Management Developer portal**. Each instance of Azure API Management comes with access to the [Developer portal](https://docs.microsoft.com/azure/api-management/api-management-customize-styles). The API Management Developer portal gives you access to documentation and code samples. You can test APIs in the Developer portal.
3535
- **Azure Logic Apps**. [Logic Apps](https://docs.microsoft.com/azure/logic-apps/logic-apps-overview) is a serverless platform that's used to build enterprise workflow and integration.
3636
- **Connectors**. Logic Apps uses [connectors](https://docs.microsoft.com/azure/connectors/apis-list) to connect to commonly used services. Logic Apps already has hundreds of different connectors, but you can also create a custom connector.
37-
- **IP address**. The Azure API Management service has a fixed public [IP address](https://docs.microsoft.com/azure/virtual-network/virtual-network-ip-addresses-overview-arm) and a domain name. The domain name is a subdomain of azure-api.net, such as contoso.azure-api.net. Logic Apps and Service Bus also have a public IP address. However, in this architecture, we restrict access for calling Logic Apps endpoints to only the IP address of API Management (for security). Calls to Service Bus are secured by a shared access signature (SAS).
37+
- **IP address**. The Azure API Management service has a fixed public [IP address](https://docs.microsoft.com/azure/virtual-network/virtual-network-ip-addresses-overview-arm) and a domain name. The default domain name is a subdomain of azure-api.net, such as contoso.azure-api.net, but [custom domains](https://docs.microsoft.com/azure/api-management/configure-custom-domain) can also be configured. Logic Apps and Service Bus also have a public IP address. However, in this architecture, we restrict access for calling Logic Apps endpoints to only the IP address of API Management (for security). Calls to Service Bus are secured by a shared access signature (SAS).
3838
- **Azure DNS**. [Azure DNS](https://docs.microsoft.com/azure/dns/) is a hosting service for DNS domains. Azure DNS provides name resolution by using the Microsoft Azure infrastructure. By hosting your domains in Azure, you can manage your DNS records by using the same credentials, APIs, tools, and billing that you use for your other Azure services. To use a custom domain name like contoso.com, create DNS records that map the custom domain name to the IP address. For more information, see [Configure a custom domain name in API Management](https://docs.microsoft.com/en-us/azure/api-management/configure-custom-domain).
3939
- **Azure Active Directory (Azure AD)**. Use [Azure AD](https://docs.microsoft.com/azure/active-directory/) or another identity provider for authentication. Azure AD provides authentication for accessing API endpoints by passing a [JSON Web Token for API Management](https://docs.microsoft.com/azure/api-management/policies/authorize-request-based-on-jwt-claims) to validate. Azure AD can secure access to the API Management Developer portal (Standard and Premium tiers only).
4040

articles/virtual-machines/scripts/virtual-machines-windows-powershell-sample-create-iis-using-dsc.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ This script uses the following commands to create the deployment. Each item in t
4646
|---|---|
4747
| [New-AzureRmResourceGroup](/powershell/module/azurerm.resources/new-azurermresourcegroup) | Creates a resource group in which all resources are stored. |
4848
| [New-AzureRmVM](/powershell/module/azurerm.compute/new-azurermvm) | Creates the virtual machine and connects it to the network card, virtual network, subnet, and network security group. This command also opens port 80 and sets the administrative credentials. |
49-
| [Set-AzureRmVMExtension](/powershell/module/azurerm.compute/set-azurermvmextension) | Add a VM extension to the virtual machine. In this sample, the custom script extension is used to install IIS. |
49+
| [Set-AzureRmVMExtension](/powershell/module/azurerm.compute/set-azurermvmextension) | Add a VM extension to the virtual machine. In this sample, the DSC extension is used to install IIS. |
5050
|[Remove-AzureRmResourceGroup](/powershell/module/azurerm.resources/remove-azurermresourcegroup) | Removes a resource group and all resources contained within. |
5151

5252
## Next steps

0 commit comments

Comments
 (0)