Skip to content

Commit c39e931

Browse files
authored
Merge pull request #93347 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 200fbf6 + 79869c3 commit c39e931

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

articles/app-service/environment/create-ilb-ase.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ This article shows you how to create an ILB ASE. For an overview on the ASE, see
2727

2828
## Overview
2929

30-
You can deploy an ASE with an internet-accessible endpoint or with an IP address in your VNet. To set the IP address to a VNet address, the ASE must be deployed with an ILB. When you deploy your ASE with an ILB, you must provide the name of your ASE. The name of your ASE is used in the domain suffix for the apps in your ASE. The domain suffix for your ILB ASE is <ASE name>.appservicewebsites.net. Apps that are made in an ILB ASE are not put in the public DNS.
30+
You can deploy an ASE with an internet-accessible endpoint or with an IP address in your VNet. To set the IP address to a VNet address, the ASE must be deployed with an ILB. When you deploy your ASE with an ILB, you must provide the name of your ASE. The name of your ASE is used in the domain suffix for the apps in your ASE. The domain suffix for your ILB ASE is <ASE name>.appserviceenvironment.net. Apps that are made in an ILB ASE are not put in the public DNS.
3131

3232
Earlier versions of the ILB ASE required you to provide a domain suffix and a default certificate for HTTPS connections. The domain suffix is no longer collected at ILB ASE creation and a default certificate is also no longer collected. When you create an ILB ASE now, the default certificate is provided by Microsoft and is trusted by the browser. You are still able to set custom domain names on apps in your ASE and set certificates on those custom domain names.
3333

@@ -103,9 +103,10 @@ When you use an External VIP, the DNS is managed by Azure. Any app created in yo
103103
To configure your DNS:
104104

105105
- create a zone for *<ASE name>.appserviceenvironment.net*
106-
- create an A record in that zone that points * to the ILB IP address
106+
- create an A record in that zone that points * to the ILB IP address
107+
- create an A record in that zone that points @ to the ILB IP address
107108
- create a zone in *<ASE name>.appserviceenvironment.net* named scm
108-
- create an A record in the scm zone that points to the ILB IP address
109+
- create an A record in the scm zone that points * to the ILB IP address
109110

110111
## Publish with an ILB ASE
111112

articles/azure-functions/functions-how-to-azure-devops.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ steps:
8888
8989
#### Python
9090
91-
You can use the following sample to create a YAML file to build a Python app. Python is supported only for Linux Azure Functions.
91+
You can use the following sample to create a YAML file to build a Python app. Python is supported only for Linux Azure Functions. The YAML for Python 3.7 can be built by replacing all the instances of 3.6 with 3.7 in this YAML.
9292
9393
```yaml
9494
pool:

articles/marketplace/partner-center-portal/create-new-saas-offer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ The Standard Contract can be found here: https://go.microsoft.com/fwlink/?linkid
191191

192192
#### Terms of use
193193

194-
If your license terms are different from the Standard Contract, you can elect to enter your own legal terms of use here. You can also enter up to 10,000 characters of text in this field. If your terms of use require a longer description, enter a single URL link into this field where your additional license terms can be found. It will display to customers as an active link.
194+
If your license terms are different from the Standard Contract, you can elect to enter your own legal terms of use here. These can be entered as plain text or as a single URL linking to your license terms.
195195

196196
Customers are required to accept these terms before they can try your app.
197197

0 commit comments

Comments
 (0)