Skip to content

Commit 6ff0e5f

Browse files
authored
Merge pull request MicrosoftDocs#3516 from MicrosoftDocs/master
Merge Master to Live. See commits for details.
2 parents ddb3da9 + a526446 commit 6ff0e5f

File tree

7 files changed

+60
-31
lines changed

7 files changed

+60
-31
lines changed

.openpublishing.publish.config.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,6 @@
265265
"template_folder": "_themes.pdf"
266266
}
267267
},
268-
"need_generate_pdf": false,
269268
"need_generate_intellisense": false,
270269
"enable_incremental_build": false,
271270
"dependent_packages": [

exchange/docs-conceptual/office-365-scc/connect-to-scc-powershell/connect-to-scc-powershell.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ description: "Learn how to connect to Security & Compliance Center PowerShell."
1717
Office 365 Security & Compliance Center PowerShell allows you to manage your Office 365 Security & Compliance Center settings from the command line. You use Windows PowerShell on your local computer to create a remote PowerShell session to the Security & Compliance Center. It's a simple three-step process where you enter your Office 365 credentials, provide the required connection settings, and then import the Security & Compliance Center cmdlets into your local Windows PowerShell session so that you can use them.
1818

1919
> [!NOTE]
20-
> If you want to use multi-factor authentication (MFA) to connect to Security & Compliance Center PowerShell, or if your organization uses federated authentication, you need to download and use the Exchange Online Remote PowerShell Module. For more information, see [Connect to Office 365 Security & Compliance Center PowerShell using multi-factor authentication](mfa-connect-to-scc-powershell.md). For some features (for example, mailbox archiving), the Security & Compliance Center links to existing functionality in the Exchange admin center (EAC). To use PowerShell with these features, you need to connect to Exchange Online instead of the Security & Compliance Center. For more information, see [Connect to Exchange Online PowerShell](../../exchange-online/connect-to-exchange-online-powershell/connect-to-exchange-online-powershell.md).
20+
> The procedures in this topic won't work if: <br/>• Your account uses multi-factor authentication (MFA). <br/>• Your organization uses federated authentication. <br/>• A location condition in an Azure Active Directory conditional access policy restricts your access to trusted IPs. <br/> In these scenarions, you need to download and use the Exchange Online Remote PowerShell Module to connect to Security & Compliance Center PowerShell. For instructions, see [Connect to Office 365 Security & Compliance Center PowerShell using multi-factor authentication](mfa-connect-to-scc-powershell.md). <br/><br/> Some features in the Security & Compliance Center (for example, mailbox archiving) link to existing functionality in the Exchange admin center (EAC). To use PowerShell with these features, you need to connect to Exchange Online PowerShell instead of Security & Compliance Center PowerShell. For instructions, see [Connect to Exchange Online PowerShell](../../exchange-online/connect-to-exchange-online-powershell/connect-to-exchange-online-powershell.md). <br/><br/>
2121
2222
For more information about the Security & Compliance Center, see [Office 365 Security & Compliance Center](https://go.microsoft.com/fwlink/p/?LinkId=627054).
2323

@@ -59,31 +59,31 @@ For more information about the Security & Compliance Center, see [Office 365 Sec
5959
6060
1. On your local computer, open Windows PowerShell and run the following command:
6161
62-
```
63-
$UserCredential = Get-Credential
64-
```
62+
```
63+
$UserCredential = Get-Credential
64+
```
6565
66-
In the **Windows PowerShell Credential Request** dialog box that appears, type your work or school account and password, and then click **OK**.
66+
In the **Windows PowerShell Credential Request** dialog box that appears, type your work or school account and password, and then click **OK**.
6767
6868
2. Run the following command:
6969
70-
```
71-
$Session = New-PSSession -ConfigurationName Microsoft.Exchange -ConnectionUri https://ps.compliance.protection.outlook.com/powershell-liveid/ -Credential $UserCredential -Authentication Basic -AllowRedirection
72-
```
70+
```
71+
$Session = New-PSSession -ConfigurationName Microsoft.Exchange -ConnectionUri https://ps.compliance.protection.outlook.com/powershell-liveid/ -Credential $UserCredential -Authentication Basic -AllowRedirection
72+
```
7373
74-
**Notes**:
74+
**Notes**:
7575
76-
- For Office 365 Germany, use the _ConnectionUri_ value: `https://ps.compliance.protection.outlook.de/powershell-liveid/`.
76+
- For Office 365 Germany, use the _ConnectionUri_ value: `https://ps.compliance.protection.outlook.de/powershell-liveid/`.
7777
78-
- For Office 365 Government Community Cloud High (GCC High), use the _ConnectionUri_ value: `https://ps.compliance.protection.office365.us/powershell-liveid/
78+
- For Office 365 Government Community Cloud High (GCC High), use the _ConnectionUri_ value: `https://ps.compliance.protection.office365.us/powershell-liveid/
7979
80-
- If you want to connect to Security & Compliance Center PowerShell in the same window as an active Exchange Online PowerShell connection, you need to add the Prefix parameter and value (for example, `-Prefix "CC"`) to the end of this command to prevent cmdlet name collisions (both environments share some cmdlets with the same names).
80+
- If you want to connect to Security & Compliance Center PowerShell in the same window as an active Exchange Online PowerShell connection, you need to add the Prefix parameter and value (for example, `-Prefix "CC"`) to the end of this command to prevent cmdlet name collisions (both environments share some cmdlets with the same names).
8181
8282
3. Run the following command:
8383
84-
```
85-
Import-PSSession $Session -DisableNameChecking
86-
```
84+
```
85+
Import-PSSession $Session -DisableNameChecking
86+
```
8787
8888
> [!NOTE]
8989
> Be sure to disconnect the remote PowerShell session when you're finished. If you close the Windows PowerShell window without disconnecting the session, you could use up all the remote PowerShell sessions available to you, and you'll need to wait for the sessions to expire. To disconnect the remote PowerShell session, run the following command.
@@ -108,9 +108,9 @@ If you receive errors, check the following requirements:
108108
109109
- The **New-PSSession** command (Step 2) might fail to connect if your client IP address changes during the connection request. This can happen if your organization uses a source network address translation (SNAT) pool that contains multiple IP addresses. The connection error looks like this:
110110
111-
`The request for the Windows Remote Shell with ShellId <ID> failed because the shell was not found on the server. Possible causes are: the specified ShellId is incorrect or the shell no longer exists on the server. Provide the correct ShellId or create a new shell and retry the operation.`
111+
`The request for the Windows Remote Shell with ShellId <ID> failed because the shell was not found on the server. Possible causes are: the specified ShellId is incorrect or the shell no longer exists on the server. Provide the correct ShellId or create a new shell and retry the operation.`
112112
113-
To fix the issue, use an SNAT pool that contains a single IP address, or force the use of a specific IP address for connections to the Security & Compliance Center PowerShell endpoint.
113+
To fix the issue, use an SNAT pool that contains a single IP address, or force the use of a specific IP address for connections to the Security & Compliance Center PowerShell endpoint.
114114
115115
## See also
116116

exchange/exchange-ps/exchange/advanced-threat-protection/Set-AntiPhishPolicy.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ Set-AntiPhishPolicy -Identity <AntiPhishPolicyIdParameter>
3535
[-EnableSimilarUsersSafetyTips <$true | $false>]
3636
[-EnableTargetedDomainsProtection <$true | $false>]
3737
[-EnableTargetedUserProtection <$true | $false>]
38+
[-EnableUnauthenticatedSender <$true | $false>]
3839
[-EnableUnusualCharactersSafetyTips <$true | $false>]
3940
[-ExcludedDomains <MultiValuedProperty>]
4041
[-ExcludedSenders <MultiValuedProperty>]
@@ -324,6 +325,25 @@ Accept pipeline input: False
324325
Accept wildcard characters: False
325326
```
326327
328+
### -EnableUnauthenticatedSender
329+
The EnableUnauthenticatedSender parameter specifies whether to apply a "?" symbol in Outlook's sender card if the sender fails authentication checks. Valid values are:
330+
331+
- $true: Apply the "?" symbol.
332+
333+
- $false: Do not apply the "?" symbol.
334+
335+
```yaml
336+
Type: $true | $false
337+
Parameter Sets: (All)
338+
Aliases:
339+
Applicable: Exchange Online, Exchange Online Protection
340+
Required: False
341+
Position: Named
342+
Default value: True
343+
Accept pipeline input: False
344+
Accept wildcard characters: False
345+
```
346+
327347
### -EnableUnusualCharactersSafetyTips
328348
The EnableUnusualCharactersSafetyTips parameter specifies whether to enable safety tips that are shown to recipients in messages for unusual characters in domain and user impersonation detections. Valid values are:
329349

exchange/exchange-ps/exchange/mailboxes/Get-MailboxFolderPermission.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,13 @@ Get-MailboxFolderPermission -Identity [email protected]:\Marketing\Reports -User
4444

4545
This example returns the permissions for the same folder in John's mailbox, but only for the user Ayla.
4646

47+
### -------------------------- Example 3 --------------------------
48+
```
49+
Get-MailboxFolderPermission -Identity [email protected]:\Calendar -User [email protected]
50+
```
51+
52+
This example returns the permissions for the Calendar folder in John's mailbox, but only for the user Ayla.
53+
4754
## PARAMETERS
4855

4956
### -Identity

sharepoint/sharepoint-ps/sharepoint-server/Install-SPSolution.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,6 @@ This example deploys the installed SharePoint solution contoso_solution.wsp in t
5656

5757
### ------------------EXAMPLE 2------------------
5858
```
59-
Install-SPSolution -Identity contoso_solution.wsp -GACDeployment -AddtoLatestVersion $true
60-
```
61-
62-
This example deploys the installed SharePoint solution contoso_solution.wsp in the farm within the latest version directories and specifies that global assembly cache (GAC) can be deployed for the new SharePoint solution.
63-
64-
### ------------------EXAMPLE 3------------------
65-
```
6659
Install-SPSolution -Identity contoso_solution.wsp -GACDeployment -CompatibilityLevel {14,15}
6760
```
6861

skype/skype-ps/skype/New-CsOnlineApplicationInstance.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,21 @@ New-CsOnlineApplicationInstance [-UserPrincipalName] <string> [[-ApplicationId]
2121
```
2222

2323
## DESCRIPTION
24-
This cmdlet is used to create an application instance in Azure Active Directory.
24+
This cmdlet is used to create an application instance in Azure Active Directory. This same cmdlet is also run when creating a new resource account using Teams Admin Center.
2525

2626
## EXAMPLES
2727

2828
### -------------------------- Example 1 --------------------------
2929
```powershell
30-
New-CsOnlineApplicationInstance -UserPrincipalName [email protected] -ApplicationId 4092daf3-a649-47f2-856e-e2902218cf9d -DisplayName "AppInstance01"
30+
New-CsOnlineApplicationInstance -UserPrincipalName [email protected] -ApplicationId ce933385-9390-45d1-9512-c8d228074e07 -DisplayName "AppInstance01"
3131
```
3232

33-
This example creates a new application instance with UserPrincipalName "[email protected]", ApplicationId "4092daf3-a649-47f2-856e-e2902218cf9d", DisplayName "AppInstance01" for the tenant.
33+
This example creates a new application instance for an Auto Attendant with UserPrincipalName "[email protected]", ApplicationId "ce933385-9390-45d1-9512-c8d228074e07", DisplayName "AppInstance01" for the tenant.
34+
35+
The application ID's that you need to use while creating the application instances are:
36+
37+
Auto Attendant: ce933385-9390-45d1-9512-c8d228074e07
38+
Call Queue: 11cd3e2e-fccb-42ad-ad00-878b93575e07
3439

3540
## PARAMETERS
3641

skype/skype-ps/skype/Set-CsOnlineApplicationInstance.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,22 @@ Set-CsOnlineApplicationInstance [-Identity] <string> [[-OnpremPhoneNumber] <stri
2121
```
2222

2323
## DESCRIPTION
24-
This cmdlet is used to update an application instance in Azure Active Directory.
24+
This cmdlet is used to update an application instance in Azure Active Directory. This same cmdlet is also run when creating a new resource account using Teams Admin Center.
2525

2626

2727
## EXAMPLES
2828

2929
### -------------------------- Example 1 --------------------------
3030
```powershell
31-
Set-CsOnlineApplicationInstance -Identity [email protected] -OnpremPhoneNumber tel:+14250000000 -ApplicationId d08bb60d-d198-4ee5-80d5-03e000aa4290 -DisplayName "AppInstance01"
31+
Set-CsOnlineApplicationInstance -Identity [email protected] -OnpremPhoneNumber tel:+14250000000 -ApplicationId ce933385-9390-45d1-9512-c8d228074e07 -DisplayName "AppInstance01"
3232
```
3333

34-
This example shows updating OnpremPhoneNumber, ApplicationId, DisplayName information for an existing application instance with Identity "[email protected]".
34+
This example shows updating OnpremPhoneNumber, ApplicationId, DisplayName information for an existing Auto Attendant application instance with Identity "[email protected]".
35+
36+
The following are the application ID's for each type of application instance types:
37+
38+
Auto Attendant: ce933385-9390-45d1-9512-c8d228074e07
39+
Call Queue: 11cd3e2e-fccb-42ad-ad00-878b93575e07
3540

3641
## PARAMETERS
3742

0 commit comments

Comments
 (0)