Skip to content

Commit 265f1d6

Browse files
PMEds28PMEds28
authored
Merge pull request #97475 from MicrosoftDocs/master
Merge Master to Live, 3 AM
2 parents 3d4917e + f68a57e commit 265f1d6

File tree

96 files changed

+257
-837
lines changed

Some content is hidden

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

96 files changed

+257
-837
lines changed

‎articles/aks/kubernetes-draft.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ This article shows you how to use Draft package and run an application on AKS.
2222
* An Azure subscription. If you don't have an Azure subscription, you can create a [free account](https://azure.microsoft.com/free).
2323
* [Azure CLI installed](/cli/azure/install-azure-cli?view=azure-cli-latest).
2424
* Docker installed and configured. Docker provides packages that configure Docker on a [Mac][docker-for-mac], [Windows][docker-for-windows], or [Linux][docker-for-linux] system.
25-
* [Helm installed](https://github.com/helm/helm/blob/master/docs/install.md).
25+
* [Helm installed](https://github.com/helm/helm#install).
2626
* [Draft installed][draft-documentation].
2727

2828
## Create an Azure Kubernetes Service cluster

‎articles/app-service/app-service-authentication-how-to.md

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
11
---
2-
title: Advanced usage of authentication and authorization - Azure App Service | Microsoft Docs
3-
description: Shows how to customize authentication and authorization in App Service, and get user claims and different tokens.
4-
services: app-service
5-
documentationcenter: ''
6-
author: cephalin
7-
manager: gwallace
8-
editor: ''
9-
10-
ms.service: app-service
11-
ms.workload: mobile
12-
ms.tgt_pltfrm: na
2+
title: Advanced usage of AuthN/AuthO
3+
description: Learn to customize the authentication and authorization feature in App Service for different scenarios, and get user claims and different tokens.
134
ms.topic: article
145
ms.date: 10/24/2019
15-
ms.author: cephalin
166
ms.custom: seodec18
177
---
188

‎articles/app-service/app-service-best-practices.md

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
---
2-
title: Best Practices - Azure App Service
3-
description: Learn best practices and troubleshooting for Azure App Service.
4-
services: app-service
5-
documentationcenter: ''
2+
title: Best Practices
3+
description: Learn best practices and the common troubleshooting scenarios for your app running in Azure App Service.
64
author: dariagrigoriu
7-
manager: erikre
8-
editor: mollybos
95

106
ms.assetid: f3359464-fa44-4f4a-9ea6-7821060e8d0d
11-
ms.service: app-service
12-
ms.workload: na
13-
ms.tgt_pltfrm: na
147
ms.topic: article
158
ms.date: 07/01/2016
169
ms.author: dariac

‎articles/app-service/app-service-configure-premium-tier.md

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,10 @@
11
---
2-
title: Configure PremiumV2 tier - Azure App Service | Microsoft Docs
2+
title: Configure PremiumV2 tier
33
description: Learn how to better performance for your web, mobile, and API app in Azure App Service by scaling to the new PremiumV2 pricing tier.
44
keywords: app service, azure app service, scale, scalable, app service plan, app service cost
5-
services: app-service
6-
documentationcenter: ''
7-
author: cephalin
8-
manager: cfowler
9-
editor: ''
10-
115
ms.assetid: ff00902b-9858-4bee-ab95-d3406018c688
12-
ms.service: app-service
13-
ms.workload: na
14-
ms.tgt_pltfrm: na
156
ms.topic: article
167
ms.date: 07/25/2018
17-
ms.author: cephalin
188
ms.custom: seodec18
199

2010
---

‎articles/app-service/app-service-hybrid-connections.md

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
---
2-
title: "Hybrid connections - Azure App Service | Microsoft Docs"
3-
description: "How to create and use Hybrid Connections to access resources in disparate networks"
4-
services: app-service
5-
documentationcenter: ''
2+
title: Hybrid connections
3+
description: Learn how to create and use hybrid connections in Azure App Service to access resources in disparate networks.
64
author: ccompy
7-
manager: stefsch
8-
editor: ''
95

106
ms.assetid: 66774bde-13f5-45d0-9a70-4e9536a4f619
11-
ms.service: app-service
12-
ms.workload: na
13-
ms.tgt_pltfrm: na
147
ms.topic: article
158
ms.date: 06/06/2019
169
ms.author: ccompy

‎articles/app-service/app-service-ip-restrictions.md

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
---
2-
title: "Restrict access - Azure App Service | Microsoft Docs"
3-
description: "How to use Access Restrictions with Azure App Service"
2+
title: Restrict access for IP addresses
3+
description: Learn how to secure your app in Azure App Service by explicitly whitelisting client IP addresses or address ranges.
44
author: ccompy
5-
manager: stefsch
6-
editor: ''
7-
services: app-service\web
8-
documentationcenter: ''
95

106
ms.assetid: 3be1f4bd-8a81-4565-8a56-528c037b24bd
11-
ms.service: app-service-web
12-
ms.workload: web
13-
ms.tgt_pltfrm: na
147
ms.topic: article
158
ms.date: 06/06/2019
169
ms.author: ccompy

‎articles/app-service/app-service-key-vault-references.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
---
2-
title: Key Vault references - Azure App Service | Microsoft Docs
3-
description: Conceptual reference and setup guide for Azure Key Vault references in Azure App Service and Azure Functions
4-
services: app-service
2+
title: Use Key Vault references
3+
description: Learn how to set up Azure App Service and Azure Functions to use Azure Key Vault references. Make Key Vault secrets available to your application code.
54
author: mattchenderson
6-
manager: jeconnoc
7-
editor: ''
85

9-
ms.service: app-service
10-
ms.tgt_pltfrm: na
116
ms.topic: article
127
ms.date: 10/09/2019
138
ms.author: mahender

‎articles/app-service/app-service-plan-manage.md

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,10 @@
11
---
2-
title: Manage App Service plan - Azure | Microsoft Docs
3-
description: Learn how to perform different tasks to manage an App Service plan.
2+
title: Manage App Service plan
3+
description: Learn how to perform different tasks to manage an App Service plan, such as create, move, scale, and delete.
44
keywords: app service, azure app service, scale, app service plan, change, create, manage, management
5-
services: app-service
6-
documentationcenter: ''
7-
author: cephalin
8-
manager: gwallace
9-
editor: ''
10-
115
ms.assetid: 4859d0d5-3e3c-40cc-96eb-f318b2c51a3d
12-
ms.service: app-service
13-
ms.workload: na
14-
ms.tgt_pltfrm: na
156
ms.topic: article
167
ms.date: 10/24/2019
17-
ms.author: cephalin
188
ms.custom: seodec18
199

2010
---

‎articles/app-service/app-service-security-controls.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
---
2-
title: Security controls for Azure App Service
3-
description: A checklist of security controls for evaluating Azure App Service
4-
services: app-service
5-
documentationcenter: ''
2+
title: Security controls
3+
description: Find a checklist of security controls for evaluating Azure App Service for your organization.
64
author: msmbaldwin
7-
manager: rkarlin
8-
ms.service: app-service
95

106
ms.topic: conceptual
117
ms.date: 09/04/2019

‎articles/app-service/app-service-undelete.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
---
2-
title: Restore deleted App Service apps - Azure App Service
3-
description: Learn how to restore a deleted App Service app using PowerShell.
2+
title: Restore deleted apps
3+
description: Learn how to restore a deleted app in Azure App Service. Avoid the headache of an accidentally deleted app.
44
author: btardif
55
ms.author: byvinyal
66
ms.date: 9/23/2019
77
ms.topic: article
8-
ms.service: app-service
98
---
109

1110
# Restore deleted App Service app Using PowerShell

0 commit comments

Comments
 (0)