Skip to content

Commit 9eddba9

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into continuous-integration-deployment
2 parents 29b86a1 + 55e3069 commit 9eddba9

File tree

80 files changed

+691
-505
lines changed

Some content is hidden

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

80 files changed

+691
-505
lines changed

articles/active-directory/cloud-provisioning/what-is-cloud-provisioning.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ The following table provides a comparison between Azure AD Connect and Azure AD
5757
| Support for writeback (passwords, devices, groups) || |
5858
| Azure AD Domain Services support|| |
5959
| Exchange hybrid configuration || |
60+
| Support for more than 50,000 objects per AD domain || |
6061

6162
## Next steps
6263

articles/active-directory/conditional-access/technical-reference.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,10 @@ Key applications that are included in the Office 365 (preview) client app:
8282
- Microsoft Teams
8383
- Office 365 Yammer
8484
- Office portal
85+
- Microsoft Forms
86+
- Microsoft Power Automate
87+
- Microsoft Planner
88+
- Microsoft PowerApps
8589

8690
### Other applications
8791

articles/active-directory/develop/quickstart-v2-javascript.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ var msalConfig = {
8888
auth: {
8989
clientId: "Enter_the_Application_Id_here",
9090
authority: "https://login.microsoftonline.com/Enter_the_Tenant_info_here",
91-
redirectURI: "http://localhost:30662/"
91+
redirectUri: "http://localhost:30662/"
9292
},
9393
cache: {
9494
cacheLocation: "localStorage",

articles/active-directory/hybrid/how-to-connect-install-prerequisites.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ To learn more, see:
7575
### SQL Server used by Azure AD Connect
7676
* Azure AD Connect requires a SQL Server database to store identity data. By default a SQL Server 2012 Express LocalDB (a light version of SQL Server Express) is installed. SQL Server Express has a 10GB size limit that enables you to manage approximately 100,000 objects. If you need to manage a higher volume of directory objects, you need to point the installation wizard to a different installation of SQL Server. The type of SQL Server installation can impact the [performance of Azure AD Connect](https://docs.microsoft.com/azure/active-directory/hybrid/plan-connect-performance-factors#sql-database-factors).
7777
* If you use a different installation of SQL Server, then these requirements apply:
78-
* Azure AD Connect supports all versions of Microsoft SQL Server from 2008 R2 (with latest Service Pack) to SQL Server 2019. Microsoft Azure SQL Database is **not supported** as a database.
78+
* Azure AD Connect supports all versions of Microsoft SQL Server from 2012 (with latest Service Pack) to SQL Server 2019. Microsoft Azure SQL Database is **not supported** as a database.
7979
* You must use a case-insensitive SQL collation. These collations are identified with a \_CI_ in their name. It is **not supported** to use a case-sensitive collation, identified by \_CS_ in their name.
8080
* You can only have one sync engine per SQL instance. It is **not supported** to share a SQL instance with FIM/MIM Sync, DirSync, or Azure AD Sync.
8181

articles/api-management/api-management-howto-api-inspector.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,12 @@ In this tutorial, you learn how to:
4444
4. Select **GetSpeakers** operation.
4545
5. Make sure to include an HTTP header named **Ocp-Apim-Trace** with the value set to **true**.
4646

47-
> [!NOTE]
48-
> If Ocp-Apim-Subscription-Key is not automatically populated, you can retrieve it by going to the Developer Portal and exposing the keys on the profile page.
47+
> [!NOTE]
48+
> * If Ocp-Apim-Subscription-Key is not automatically populated, you can retrieve it by going to the Developer Portal and exposing the keys on the profile page.
49+
> * To get a trace when the Ocp-Apim-Trace HTTP header is used, the **Allow tracing** setting for the subscription key must be enabled. To configure the **Allow tracing** setting, under **API Management** in the left menu, select **Subscriptions**.
50+
> ![Allow tracing on the API Management Subscriptions pane](media/api-management-howto-api-inspector/allowtracing.png)
4951
50-
6. Click **"Send"** to make an API call.
52+
6. Click **Send** to make an API call.
5153
7. Wait for the call to complete.
5254
8. Go to the **Trace** tab in the **API console**. You can click any of the following links to jump to detailed trace info: **inbound**, **backend**, **outbound**.
5355

articles/api-management/api-management-howto-deploy-self-hosted-gateway-to-docker.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ This article provides the steps for deploying self-hosted Azure API Management g
3030
- [Provision a gateway resource in your API Management instance](api-management-howto-provision-self-hosted-gateway.md)
3131

3232
> [!NOTE]
33-
> Self-hosted gateway is packaged as a Linux-based Docker container.
33+
> Self-hosted gateway is packaged as a x86-64 Linux-based Docker container.
3434
3535
## Deploy the self-hosted gateway to Docker
3636

83.6 KB
Loading

articles/app-service/environment/intro.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ ASEs are isolated to running only a single customer's applications and are alway
3737
* Multiple ASEs can be used to scale horizontally. For more information, see [how to set up a geo-distributed app footprint](app-service-app-service-environment-geo-distributed-scale.md).
3838
* ASEs can be used to configure security architecture, as shown in the AzureCon Deep Dive. To see how the security architecture shown in the AzureCon Deep Dive was configured, see the [article on how to implement a layered security architecture](app-service-app-service-environment-layered-security.md) with App Service environments.
3939
* Apps running on ASEs can have their access gated by upstream devices, such as web application firewalls (WAFs). For more information, see [Web application firewall (WAF)][AppGW].
40+
* App Service Environments can be deployed into Availability Zones (AZ) using zone pinning. See [App Service Environment Support for Availability Zones][ASEAZ] for more details.
4041

4142
## Dedicated environment ##
4243

@@ -98,3 +99,4 @@ ASEv1 uses a different pricing model from ASEv2. In ASEv1, you pay for each vCPU
9899
[Kudu]: https://azure.microsoft.com/resources/videos/super-secret-kudu-debug-console-for-azure-web-sites/
99100
[ASEWAF]: app-service-app-service-environment-web-application-firewall.md
100101
[AppGW]: ../../application-gateway/waf-overview.md
102+
[ASEAZ]: https://azure.github.io/AppService/2019/12/12/App-Service-Environment-Support-for-Availability-Zones.html

articles/application-gateway/application-gateway-ssl-policy-overview.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,17 @@ Application Gateway supports the following cipher suites from which you can choo
9393
> [!NOTE]
9494
> SSL cipher suites used for the connection are also based on the type of the certificate being used. In client to application gateway connections, the cipher suites used are based on the type of server certificates on the application gateway listener. In application gateway to backend pool connections, the cipher suites used are based on the type of server certificates on the backend pool servers.
9595
96+
## Known issue
97+
Application Gateway v2 does not currently support the following ciphers:
98+
- DHE-RSA-AES128-GCM-SHA256
99+
- DHE-RSA-AES128-SHA
100+
- DHE-RSA-AES256-GCM-SHA384
101+
- DHE-RSA-AES256-SHA
102+
- DHE-DSS-AES128-SHA256
103+
- DHE-DSS-AES128-SHA
104+
- DHE-DSS-AES256-SHA256
105+
- DHE-DSS-AES256-SHA
106+
96107
## Next steps
97108

98109
If you want to learn to configure an SSL policy, see [Configure SSL policy on an application gateway](application-gateway-configure-ssl-policy-powershell.md).

articles/automation/oms-solution-updatemgmt-sccmintegration.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
---
2-
title: Target Updates using SCCM Collections in Azure Automation - Update Management
3-
description: This article is intended to help you configure System Center Configuration Manager with this solution to manage updates of SCCM managed computers.
2+
title: Use Azure Update Management with Configuration Manager clients
3+
description: This article is intended to help you configure Microsoft Endpoint Configuration Manager with this solution to deploy software updates to ConfigMgr clients.
44
services: automation
55
ms.subservice: update-management
66
ms.date: 03/19/2018
77
ms.topic: conceptual
88
---
99

10-
# Integrate System Center Configuration Manager with Update Management
10+
# Deploy updates to Microsoft Endpoint Configuration Manager clients with Update Management
1111

12-
Customers who have invested in System Center Configuration Manager to manage PCs, servers, and mobile devices also rely on its strength and maturity in managing software updates as part of their software update management (SUM) cycle.
12+
Customers who have invested in Microsoft Endpoint Configuration Manager to manage PCs, servers, and mobile devices also rely on its strength and maturity in managing software updates as part of their software update management (SUM) cycle.
1313

14-
You can report and update managed Windows servers by creating and pre-staging software update deployments in Configuration Manager, and get detailed status of completed update deployments using the [Update Management solution](automation-update-management.md). If you use Configuration Manager for update compliance reporting but not for managing update deployments with your Windows servers, you can continue reporting to Configuration Manager while security updates are managed with the Update Management solution.
14+
You can report and update managed Windows servers by creating and pre-staging software update deployments in Configuration Manager, and get detailed status of completed update deployments using the [Update Management solution](automation-update-management.md). If you use Configuration Manager for update compliance reporting but not for managing update deployments with your Windows servers, you can continue reporting to Configuration Manager while security updates are managed with the Update Management solution.
1515

1616
## Prerequisites
1717

1818
* You must have the [Update Management solution](automation-update-management.md) added to your Automation account.
19-
* Windows servers currently managed by your System Center Configuration Manager environment also need to report to the Log Analytics workspace that also has the Update Management solution enabled.
20-
* This feature is enabled in System Center Configuration Manager current branch version 1606 and higher. To integrate your Configuration Manager central administration site or a stand-alone primary site with Azure Monitor logs and import collections, review [Connect Configuration Manager to Azure Monitor logs](../azure-monitor/platform/collect-sccm.md).
19+
* Windows servers currently managed by your Configuration Manager environment also need to report to the Log Analytics workspace that also has the Update Management solution enabled.
20+
* This feature is enabled in Configuration Manager current branch version 1606 and higher. To integrate your Configuration Manager central administration site or a stand-alone primary site with Azure Monitor logs and import collections, review [Connect Configuration Manager to Azure Monitor logs](../azure-monitor/platform/collect-sccm.md).
2121
* Windows agents must either be configured to communicate with a Windows Server Update Services (WSUS) server or have access to Microsoft Update if they don't receive security updates from Configuration Manager.
2222

2323
How you manage clients hosted in Azure IaaS with your existing Configuration Manager environment primarily depends on the connection you have between Azure datacenters and your infrastructure. This connection affects any design changes you may need to make to your Configuration Manager infrastructure and related cost to support those necessary changes. To understand what planning considerations you need to evaluate before proceeding, review [Configuration Manager on Azure - Frequently Asked Questions](/sccm/core/understand/configuration-manager-on-azure#networking).

0 commit comments

Comments
 (0)