Skip to content

Commit ddf5601

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into newremotesupportupdate
2 parents b7e01c2 + f75f860 commit ddf5601

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,17 +156,17 @@ Prior to version 1.1.614.0, Azure AD Connect by default uses TLS 1.0 for encrypt
156156
When using Azure AD Connect to deploy Active Directory Federation Services or the Web Application Proxy, check these requirements:
157157
158158
* If the target server is domain joined, then ensure that Windows Remote Managed is enabled
159-
* In an elevated PSH command window, use command `Enable-PSRemoting –force`
159+
* In an elevated PowerShell command window, use command `Enable-PSRemoting –force`
160160
* If the target server is a non-domain joined WAP machine, then there are a couple of additional requirements
161161
* On the target machine (WAP machine):
162162
* Ensure the winrm (Windows Remote Management / WS-Management) service is running via the Services snap-in
163-
* In an elevated PSH command window, use command `Enable-PSRemoting –force`
163+
* In an elevated PowerShell command window, use command `Enable-PSRemoting –force`
164164
* On the machine on which the wizard is running (if the target machine is non-domain joined or untrusted domain):
165-
* In an elevated PSH command window, use the command `Set-Item WSMan:\localhost\Client\TrustedHosts –Value <DMZServerFQDN> -Force –Concatenate`
165+
* In an elevated PowerShell command window, use the command `Set-Item WSMan:\localhost\Client\TrustedHosts –Value <DMZServerFQDN> -Force –Concatenate`
166166
* In Server Manager:
167167
* add DMZ WAP host to machine pool (server manager -> Manage -> Add Servers...use DNS tab)
168168
* Server Manager All Servers tab: right click WAP server and choose Manage As..., enter local (not domain) creds for the WAP machine
169-
* To validate remote PSH connectivity, in the Server Manager All Servers tab: right click WAP server and choose Windows PowerShell. A remote PSH session should open to ensure remote PowerShell sessions can be established.
169+
* To validate remote PowerShell connectivity, in the Server Manager All Servers tab: right click WAP server and choose Windows PowerShell. A remote PowerShell session should open to ensure remote PowerShell sessions can be established.
170170
171171
### TLS/SSL Certificate Requirements
172172
* It’s strongly recommended to use the same TLS/SSL certificate across all nodes of your AD FS farm and all Web Application proxy servers.

articles/active-directory/users-groups-roles/directory-assign-admin-roles.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -759,10 +759,7 @@ Can read and manage compliance configuration and reports in Azure AD and Office
759759
| microsoft.azure.supportTickets/allEntities/allTasks | Create and manage Azure support tickets. |
760760
| microsoft.office365.webPortal/allEntities/basic/read | Read basic properties on all resources in microsoft.office365.webPortal. |
761761
| microsoft.office365.complianceManager/allEntities/allTasks | Manage all aspects of Office 365 Compliance Manager |
762-
| microsoft.office365.exchange/allEntities/allTasks | Manage all aspects of Exchange Online. |
763762
| microsoft.office365.serviceHealth/allEntities/allTasks | Read and configure Office 365 Service Health. |
764-
| microsoft.office365.sharepoint/allEntities/allTasks | Create and delete all resources, and read and update standard properties in microsoft.office365.sharepoint. |
765-
| microsoft.office365.skypeForBusiness/allEntities/allTasks | Manage all aspects of Skype for Business Online. |
766763
| microsoft.office365.supportTickets/allEntities/allTasks | Create and manage Office 365 support tickets. |
767764

768765
### Compliance Data Administrator permissions
@@ -782,10 +779,7 @@ Creates and manages compliance content.
782779
| microsoft.azure.supportTickets/allEntities/allTasks | Create and manage Azure support tickets. |
783780
| microsoft.office365.webPortal/allEntities/basic/read | Read basic properties on all resources in microsoft.office365.webPortal. |
784781
| microsoft.office365.complianceManager/allEntities/allTasks | Manage all aspects of Office 365 Compliance Manager |
785-
| microsoft.office365.exchange/allEntities/allTasks | Manage all aspects of Exchange Online. |
786782
| microsoft.office365.serviceHealth/allEntities/allTasks | Read and configure Office 365 Service Health. |
787-
| microsoft.office365.sharepoint/allEntities/allTasks | Create and delete all resources, and read and update standard properties in microsoft.office365.sharepoint. |
788-
| microsoft.office365.skypeForBusiness/allEntities/allTasks | Manage all aspects of Skype for Business Online. |
789783
| microsoft.office365.supportTickets/allEntities/allTasks | Create and manage Office 365 support tickets. |
790784

791785
### Conditional Access Administrator permissions

0 commit comments

Comments
 (0)