Skip to content

Commit 69bc658

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-master
2 parents 7d56f90 + 817fc81 commit 69bc658

File tree

77 files changed

+283
-327
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+283
-327
lines changed

articles/active-directory/devices/hybrid-azuread-join-plan.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ As a first planning step, you should review your environment and determine wheth
7777

7878
- Hybrid Azure AD join is not supported on Windows down-level devices when using credential roaming or user profile roaming or mandatory profile.
7979

80+
- Server Core OS doesn't support any type of device registration.
81+
8082
### OS imaging considerations
8183
- If you are relying on the System Preparation Tool (Sysprep) and if you are using a **pre-Windows 10 1809** image for installation, make sure that image is not from a device that is already registered with Azure AD as Hybrid Azure AD join.
8284

articles/app-service/containers/configure-custom-container.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,8 @@ The following lists show supported and unsupported Docker Compose configuration
156156
157157
Using a custom container with VNet integration may require additional container configuration. See [Integrate your app with an Azure Virtual Network](../web-sites-integrate-with-vnet.md).
158158
159+
[!INCLUDE [robots933456](../../../includes/app-service-web-configure-robots933456.md)]
160+
159161
## Next steps
160162
161163
> [!div class="nextstepaction"]

articles/app-service/containers/configure-language-dotnetcore.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,8 @@ az webapp config appsettings set --name <app-name> --resource-group <resource-gr
165165

166166
[!INCLUDE [Open SSH session in browser](../../../includes/app-service-web-ssh-connect-builtin-no-h.md)]
167167

168+
[!INCLUDE [robots933456](../../../includes/app-service-web-configure-robots933456.md)]
169+
168170
## Next steps
169171

170172
> [!div class="nextstepaction"]

articles/app-service/containers/configure-language-java.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -638,6 +638,8 @@ Patches and fixes for major security vulnerabilities will be released as soon as
638638
639639
If a supported Java runtime will be retired, Azure developers using the affected runtime will be given a deprecation notice at least six months before the runtime is retired.
640640
641+
[!INCLUDE [robots933456](../../../includes/app-service-web-configure-robots933456.md)]
642+
641643
## Next steps
642644
643645
Visit the [Azure for Java Developers](/java/azure/) center to find Azure quickstarts, tutorials, and Java reference documentation.

articles/app-service/containers/configure-language-nodejs.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,8 @@ When a working Node.js app behaves differently in App Service or has errors, try
268268
- Certain web frameworks may use custom startup scripts when running in production mode.
269269
- Run your app in App Service in development mode. For example, in [MEAN.js](https://meanjs.org/), you can set your app to development mode in runtime by [setting the `NODE_ENV` app setting](../configure-common.md?toc=%2fazure%2fapp-service%2fcontainers%2ftoc.json#configure-app-settings).
270270

271+
[!INCLUDE [robots933456](../../../includes/app-service-web-configure-robots933456.md)]
272+
271273
## Next steps
272274

273275
> [!div class="nextstepaction"]

articles/app-service/containers/configure-language-php.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -201,15 +201,7 @@ When a working PHP app behaves differently in App Service or has errors, try the
201201
- Certain web frameworks may use custom startup scripts when running in production mode.
202202
- Run your app in App Service in debug mode. For example, in [Laravel](https://meanjs.org/), you can configure your app to output debug messages in production by [setting the `APP_DEBUG` app setting to `true`](../configure-common.md?toc=%2fazure%2fapp-service%2fcontainers%2ftoc.json#configure-app-settings).
203203

204-
### robots933456
205-
206-
You may see the following message in the container logs:
207-
208-
```
209-
2019-04-08T14:07:56.641002476Z "-" - - [08/Apr/2019:14:07:56 +0000] "GET /robots933456.txt HTTP/1.1" 404 415 "-" "-"
210-
```
211-
212-
You can safely ignore this message. `/robots933456.txt` is a dummy URL path that App Service uses to check if the container is capable of serving requests. A 404 response simply indicates that the path doesn't exist, but it lets App Service know that the container is healthy and ready to respond to requests.
204+
[!INCLUDE [robots933456](../../../includes/app-service-web-configure-robots933456.md)]
213205

214206
## Next steps
215207

articles/app-service/containers/configure-language-ruby.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,8 @@ az webapp config appsettings set --name <app-name> --resource-group <resource-gr
144144

145145
[!INCLUDE [Open SSH session in browser](../../../includes/app-service-web-ssh-connect-builtin-no-h.md)]
146146

147+
[!INCLUDE [robots933456](../../../includes/app-service-web-configure-robots933456.md)]
148+
147149
## Next steps
148150

149151
> [!div class="nextstepaction"]

articles/application-gateway/overview.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: vhorne
66
ms.service: application-gateway
77
ms.topic: overview
88
ms.custom: mvc
9-
ms.date: 11/23/2019
9+
ms.date: 03/03/2020
1010
ms.author: victorh
1111
#Customer intent: As an IT administrator, I want to learn about Azure Application Gateways and what I can use them for.
1212
---
@@ -36,15 +36,15 @@ Application gateway supports SSL/TLS termination at the gateway, after which tra
3636

3737
## Autoscaling
3838

39-
Application Gateway or WAF deployments under Standard_v2 or WAF_v2 SKU support autoscaling and can scale up or down based on changing traffic load patterns. Autoscaling also removes the requirement to choose a deployment size or instance count during provisioning. For more information about the Application Gateway Standard_v2 and WAF_v2 features, see [Autoscaling v2 SKU](application-gateway-autoscaling-zone-redundant.md).
39+
Application Gateway Standard_v2 supports autoscaling and can scale up or down based on changing traffic load patterns. Autoscaling also removes the requirement to choose a deployment size or instance count during provisioning. For more information about the Application Gateway Standard_v2 features, see [Autoscaling v2 SKU](application-gateway-autoscaling-zone-redundant.md).
4040

4141
## Zone redundancy
4242

43-
An Application Gateway or WAF deployments under Standard_v2 or WAF_v2 SKU can span multiple Availability Zones, offering better fault resiliency and removing the need to provision separate Application Gateways in each zone.
43+
An Application Gateway Standard_v2 can span multiple Availability Zones, offering better fault resiliency and removing the need to provision separate Application Gateways in each zone.
4444

4545
## Static VIP
4646

47-
The application gateway VIP on Standard_v2 or WAF_v2 SKU supports static VIP type exclusively. This ensures that the VIP associated with application gateway doesn't change even over the lifetime of the Application Gateway.
47+
The application gateway Standard_v2 SKU supports static VIP type exclusively. This ensures that the VIP associated with application gateway doesn't change even over the lifetime of the Application Gateway.
4848

4949
## Web application firewall
5050

@@ -72,7 +72,7 @@ For more information, see [URL-based routing with Application Gateway](https://d
7272

7373
## Multiple-site hosting
7474

75-
Multiple-site hosting enables you to configure more than one web site on the same application gateway instance. This feature allows you to configure a more efficient topology for your deployments by adding up to 100 web sites to one Application Gateway, or 40 for WAF (for optimal performance). Each web site can be directed to its own pool. For example, application gateway can serve traffic for `contoso.com` and `fabrikam.com` from two server pools called ContosoServerPool and FabrikamServerPool.
75+
Multiple-site hosting enables you to configure more than one web site on the same application gateway instance. This feature allows you to configure a more efficient topology for your deployments by adding up to 100 web sites to one Application Gateway (for optimal performance). Each web site can be directed to its own pool. For example, application gateway can serve traffic for `contoso.com` and `fabrikam.com` from two server pools called ContosoServerPool and FabrikamServerPool.
7676

7777
Requests for `http://contoso.com` are routed to ContosoServerPool, and `http://fabrikam.com` are routed to FabrikamServerPool.
7878

@@ -132,9 +132,9 @@ For more information, see [Rewrite HTTP headers](rewrite-http-headers.md).
132132

133133
## Sizing
134134

135-
Application Gateway Standard_v2 and WAF_v2 SKU can be configured for autoscaling or fixed size deployments. These SKUs don't offer different instance sizes. For more information on v2 performance and pricing, see [Autoscaling v2 SKU](https://docs.microsoft.com/azure/application-gateway/application-gateway-autoscaling-zone-redundant#pricing).
135+
Application Gateway Standard_v2 can be configured for autoscaling or fixed size deployments. This SKU doesn't offer different instance sizes. For more information on v2 performance and pricing, see [Autoscaling v2 SKU](https://docs.microsoft.com/azure/application-gateway/application-gateway-autoscaling-zone-redundant#pricing).
136136

137-
The Application Gateway Standard and WAF SKU is currently offered in three sizes: **Small**, **Medium**, and **Large**. Small instance sizes are intended for development and testing scenarios.
137+
The Application Gateway Standard is offered in three sizes: **Small**, **Medium**, and **Large**. Small instance sizes are intended for development and testing scenarios.
138138

139139
For a complete list of application gateway limits, see [Application Gateway service limits](../azure-resource-manager/management/azure-subscription-service-limits.md?toc=%2fazure%2fapplication-gateway%2ftoc.json#application-gateway-limits).
140140

articles/azure-functions/TOC.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,10 +425,10 @@
425425
- name: Overview
426426
href: functions-bindings-signalr-service.md
427427
displayName: SignalR Service
428-
- name: Overview
428+
- name: Input
429429
href: functions-bindings-signalr-service-input.md
430430
displayName: SignalR Service
431-
- name: Overview
431+
- name: Output
432432
href: functions-bindings-signalr-service-output.md
433433
displayName: SignalR Service
434434
- name: Table storage

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ steps:
4242
arguments: '--configuration Release --output publish_output'
4343
projects: '*.csproj'
4444
publishWebProjects: false
45-
modifyOutputPath: true
45+
modifyOutputPath: false
4646
zipAfterPublish: false
4747
- task: ArchiveFiles@2
4848
displayName: "Archive files"

0 commit comments

Comments
 (0)