Skip to content

Commit b89d123

Browse files
authored
Merge pull request #98528 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 f2d14db + 668fd56 commit b89d123

File tree

5 files changed

+9
-18
lines changed

5 files changed

+9
-18
lines changed

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

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,7 @@ Before you install Azure AD Connect, there are a few things that you need.
5252
>[!IMPORTANT]
5353
>Installing Azure AD Connect on small business server, server essentials, or server core is not supported.
5454
55-
* Azure AD Connect must be installed on Windows Server 2008 R2 or later. This server must be domain joined and may be a domain controller or a member server.
56-
* If you install Azure AD Connect on Windows Server 2008 R2, then make sure to apply the latest hotfixes from Windows Update. The installation is not able to start with an unpatched server.
57-
* If you plan to use the feature **password synchronization**, then the Azure AD Connect server must be on Windows Server 2008 R2 SP1 or later.
58-
* If you plan to use a **group managed service account**, then the Azure AD Connect server must be on Windows Server 2012 or later.
59-
* The Azure AD Connect server must have [.NET Framework 4.5.1](#component-prerequisites) or later and [Microsoft PowerShell 3.0](#component-prerequisites) or later installed.
55+
* Azure AD Connect must be installed on Windows Server 2012 or later. This server must be domain joined and may be a domain controller or a member server.
6056
* The Azure AD Connect server must not have PowerShell Transcription Group Policy enabled if you are using Azure AD Connect wizard to manage ADFS configuration. You can enable PowerShell transcription if you are using Azure AD Connect wizard to manage sync configuration.
6157
* If Active Directory Federation Services is being deployed, the servers where AD FS or Web Application Proxy are installed must be Windows Server 2012 R2 or later. [Windows remote management](#windows-remote-management) must be enabled on these servers for remote installation.
6258
* If Active Directory Federation Services is being deployed, you need [SSL Certificates](#ssl-certificate-requirements).
@@ -138,22 +134,17 @@ Azure AD Connect depends on Microsoft PowerShell and .NET Framework 4.5.1. You n
138134
* Windows Server 2012R2
139135
* Microsoft PowerShell is installed by default. No action is required.
140136
* .NET Framework 4.5.1 and later releases are offered through Windows Update. Make sure you have installed the latest updates to Windows Server in the Control Panel.
141-
* Windows Server 2008 R2 and Windows Server 2012
137+
* Windows Server 2012
142138
* The latest version of Microsoft PowerShell is available in **Windows Management Framework 4.0**, available on [Microsoft Download Center](https://www.microsoft.com/downloads).
143139
* .NET Framework 4.5.1 and later releases are available on [Microsoft Download Center](https://www.microsoft.com/downloads).
144140

145141

146142
### Enable TLS 1.2 for Azure AD Connect
147143
Prior to version 1.1.614.0, Azure AD Connect by default uses TLS 1.0 for encrypting the communication between the sync engine server and Azure AD. You can change this by configuring .NET applications to use TLS 1.2 by default on the server. More information about TLS 1.2 can be found in [Microsoft Security Advisory 2960358](https://technet.microsoft.com/security/advisory/2960358).
148144

149-
1. TLS 1.2 cannot be enabled prior to Windows Server 2008 R2 or earlier. Make sure you have the .NET 4.5.1 hotfix installed for your operating system, see [Microsoft Security Advisory 2960358](https://technet.microsoft.com/security/advisory/2960358). You might have this hotfix or a later release installed on your server already.
150-
2. If you use Windows Server 2008 R2, then make sure TLS 1.2 is enabled. On Windows Server 2012 server and later versions, TLS 1.2 should already be enabled.
145+
1. Make sure you have the .NET 4.5.1 hotfix installed for your operating system, see [Microsoft Security Advisory 2960358](https://technet.microsoft.com/security/advisory/2960358). You might have this hotfix or a later release installed on your server already.
151146
```
152-
[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.2]
153-
[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.2\Client] "DisabledByDefault"=dword:00000000 "Enabled"=dword:00000001
154-
[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.2\Server] "DisabledByDefault"=dword:00000000 "Enabled"=dword:00000001
155-
```
156-
3. For all operating systems, set this registry key and restart the server.
147+
2. For all operating systems, set this registry key and restart the server.
157148
```
158149
HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\.NETFramework\v4.0.30319
159150
"SchUseStrongCrypto"=dword:00000001

articles/active-directory/hybrid/reference-connect-version-history.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Not all releases of Azure AD Connect will be made available for auto upgrade. Th
3535

3636
## 1.4.38.0
3737
### Release status
38-
12/6/2019: Release for download. Not available through auto-upgrade.
38+
12/9/2019: Release for download. Not available through auto-upgrade.
3939
### New features and improvements
4040
- We updated Password Hash Sync for Azure AD Domain Services to properly account for padding in Kerberos hashes. This will provide a performance improvement during password synchronization from AAD to Azure AD Domain Services.
4141
- We added support for reliable sessions between the authentication agent and service bus.

articles/api-management/api-management-howto-protect-backend-with-aad.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,9 @@ In this example, the Developer Console is the client-app. The following steps de
146146

147147
1. Select **Create**.
148148

149-
1. Go back to the **Settings** page of your client-app.
149+
1. Go back to your client-app and select **Authentication**.
150150

151-
1. Select **Reply URLs**, and paste the **redirect_url** in the first row. In this example, you replaced `https://localhost` with the URL in the first row.
151+
1. Under **Redirect URIs**, select the type as **Web**, paste the **redirect_url** under **Redirect URI**, and then save.
152152

153153
Now that you have configured an OAuth 2.0 authorization server, the Developer Console can obtain access tokens from Azure AD.
154154

articles/storage/files/storage-sync-files-planning.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ If you are using an on-premises backup solution, backups should be performed on
222222
> Bare-metal (BMR) restore can cause unexpected results and is not currently supported.
223223
224224
> [!Note]
225-
> With Version 9 of the Azure File SYnc agent, VSS snapshots (including Previous Versions tab) are now supported on volumes which have cloud tiering enabled. However, you must enable previous version compatibility through PowerShell. [Learn how](storage-files-deployment-guide.md).
225+
> With Version 9 of the Azure File Sync agent, VSS snapshots (including Previous Versions tab) are now supported on volumes which have cloud tiering enabled. However, you must enable previous version compatibility through PowerShell. [Learn how](storage-files-deployment-guide.md).
226226
227227
### Encryption solutions
228228
Support for encryption solutions depends on how they are implemented. Azure File Sync is known to work with:

includes/virtual-machines-common-sizes-general.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ General purpose VM sizes provide balanced CPU-to-memory ratio. Ideal for testing
1616

1717
- The Av2-series VMs can be deployed on a variety of hardware types and processors. A-series VMs have CPU performance and memory configurations best suited for entry level workloads like development and test. The size is throttled, based upon the hardware, to offer consistent processor performance for the running instance, regardless of the hardware it is deployed on. To determine the physical hardware on which this size is deployed, query the virtual hardware from within the Virtual Machine.
1818

19-
Example use cases include development and test servers, low traffic web servers, small to medium databases, proof-of-concepts, and code repositories.
19+
Example use cases include development and test servers, low traffic web servers, small to medium databases, proofs-of-concept, and code repositories.
2020

2121
- Dv2-series, a follow-on to the original D-series, features a more powerful CPU and optimal CPU-to-memory configuration making them suitable for most production workloads. The Dv2-series is about 35% faster than the D-series. Dv2-series runs on the Intel® Xeon® 8171M 2.1GHz (Skylake), Intel® Xeon® E5-2673 v4 2.3 GHz (Broadwell), or the Intel® Xeon® E5-2673 v3 2.4 GHz (Haswell) processors with the Intel Turbo Boost Technology 2.0. The Dv2-series has the same memory and disk configurations as the D-series.
2222

0 commit comments

Comments
 (0)