Skip to content

Commit 756414b

Browse files
chrisdachrisda
committed
Merge branch 'master' into SupRevAct-chrisda
2 parents 44ad13d + 9a96bb5 commit 756414b

File tree

1,013 files changed

+5657
-4622
lines changed

Some content is hidden

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

1,013 files changed

+5657
-4622
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@ _themes*/
77
.local/
88

99
.openpublishing.buildcore.ps1
10+
**/node_modules
11+
12+
\.idea/

‎exchange/docs-conceptual/exchange-server/exchange-management-shell.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ A benefit of remote PowerShell is that you can use Windows PowerShell on a local
4343

4444
For details, see the following topics:
4545

46-
- [Exchange 2016 system requirements](https://technet.microsoft.com/library/aa996719(v=exchg.160).aspx)
46+
- [Exchange 2019 system requirements](https://docs.microsoft.com/en-us/Exchange/plan-and-deploy/system-requirements?view=exchserver-2019)
47+
48+
- [Exchange 2016 system requirements](https://docs.microsoft.com/en-us/Exchange/plan-and-deploy/system-requirements?view=exchserver-2016)
4749

4850
- [Exchange 2013 system requirements](https://technet.microsoft.com/library/aa996719(v=exchg.150).aspx)
4951

@@ -76,4 +78,4 @@ The following table provides links to topics that can help you learn about and u
7678
|[Find the permissions required to run any Exchange cmdlet](find-exchange-cmdlet-permissions.md)|Find the permissions you need to run a specific cmdlet, or one or more parameters on the cmdlet.|
7779
|[Exchange cmdlet syntax](exchange-cmdlet-syntax.md)|Learn about the structure and syntax of cmdlets in Exchange PowerShell.|
7880
|[Recipient filters in Exchange Management Shell commands](recipient-filters/recipient-filters.md)|Learn about recipient filters in the Exchange Management Shell.|
79-
|[Use Update-ExchangeHelp to update Exchange PowerShell help topics on Exchange servers](use-update-exchangehelp.md)|Learn how to use Update-ExchangeHelp to update help for Exchange cmdlet reference topics on Exchange servers.|
81+
|[Use Update-ExchangeHelp to update Exchange PowerShell help topics on Exchange servers](use-update-exchangehelp.md)|Learn how to use Update-ExchangeHelp to update help for Exchange cmdlet reference topics on Exchange servers.|

‎exchange/docs-conceptual/exchange-server/open-the-exchange-management-shell.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ When you open the Exchange Management Shell you can perform administrative tasks
3030
> [!TIP]
3131
> Having problems? Ask for help in the Exchange forums. Visit the forums at: [Exchange Server](https://go.microsoft.com/fwlink/p/?linkId=60612), [Exchange Online](https://go.microsoft.com/fwlink/p/?linkId=267542), or [Exchange Online Protection](https://go.microsoft.com/fwlink/p/?linkId=285351).
3232
33-
## Open the Exchange Management Shell in Windows 10
33+
## Open the Exchange Management Shell in Windows Server 2016 or Windows 10
3434

35-
Click **Start** > **All Apps** > **Microsoft Exchange Server 2016 \>** **Exchange Management Shell**.
35+
Click **Start** > **Microsoft Exchange Server 2016 \>** **Exchange Management Shell**.
3636

3737
## Open the Exchange Management Shell in Windows Server 2012 R2 or Windows 8.1
3838

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

Lines changed: 0 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,21 @@ For information about the parameter sets in the Syntax section below, see Exchan
2020
```
2121
Set-AntiPhishPolicy -Identity <AntiPhishPolicyIdParameter>
2222
[-AdminDisplayName <Basic | High>]
23-
[-AntiSpoofEnforcementType <AntiSpoofEnforcementType>]
2423
[-AuthenticationFailAction <MoveToJmf | Quarantine>]
2524
[-Confirm]
2625
[-EnableAntispoofEnforcement <$true | $false>]
2726
[-EnableAuthenticationSafetyTip <$true | $false>]
2827
[-EnableAuthenticationSoftPassSafetyTip <$true | $false>]
2928
[-Enabled <$true | $false>]
3029
[-EnableMailboxIntelligence <$true | $false>]
31-
[-EnableMailboxIntelligenceProtection <$true | $false>]
3230
[-EnableOrganizationDomainsProtection <$true | $false>]
3331
[-EnableSimilarDomainsSafetyTips <$true | $false>]
3432
[-EnableSimilarUsersSafetyTips <$true | $false>]
35-
[-EnableSuspiciousSafetyTip <$true | $false>]
3633
[-EnableTargetedDomainsProtection <$true | $false>]
3734
[-EnableTargetedUserProtection <$true | $false>]
3835
[-EnableUnusualCharactersSafetyTips <$true | $false>]
3936
[-ExcludedDomains <MultiValuedProperty>]
4037
[-ExcludedSenders <MultiValuedProperty>]
41-
[-ImpersonationProtectionState <Default | Automatic | Manual | Off>]
42-
[-MailboxIntelligenceProtectionAction <NoAction | MoveToJmf | Redirect | Quarantine | Delete | BccMessage>]
43-
[-MailboxIntelligenceProtectionActionRecipients <MultiValuedProperty>]
4438
[-MakeDefault]
4539
[-PhishThresholdLevel <Int32>]
4640
[-TargetedDomainActionRecipients <MultiValuedProperty>]
@@ -103,21 +97,6 @@ Accept pipeline input: False
10397
Accept wildcard characters: False
10498
```
10599
106-
### -AntiSpoofEnforcementType
107-
{{Fill AntiSpoofEnforcementType Description}}
108-
109-
```yaml
110-
Type: Basic | High
111-
Parameter Sets: (All)
112-
Aliases:
113-
Applicable: Exchange Online, Exchange Online Protection
114-
Required: False
115-
Position: Named
116-
Default value: None
117-
Accept pipeline input: False
118-
Accept wildcard characters: False
119-
```
120-
121100
### -AuthenticationFailAction
122101
The AuthenticationFailAction parameter specifies the action to take when the message fails composite authentication. Valid values are:
123102
@@ -247,21 +226,6 @@ Accept pipeline input: False
247226
Accept wildcard characters: False
248227
```
249228
250-
### -EnableMailboxIntelligenceProtection
251-
{{Fill EnableMailboxIntelligenceProtection Description}}
252-
253-
```yaml
254-
Type: $true | $false
255-
Parameter Sets: (All)
256-
Aliases:
257-
Applicable: Exchange Online, Exchange Online Protection
258-
Required: False
259-
Position: Named
260-
Default value: None
261-
Accept pipeline input: False
262-
Accept wildcard characters: False
263-
```
264-
265229
### -EnableOrganizationDomainsProtection
266230
The EnableOrganizationDomainsProtection parameter specifies whether to enable domain impersonation protection for all registered domains in the Office 365 organization. Valid values are:
267231
@@ -319,21 +283,6 @@ Accept pipeline input: False
319283
Accept wildcard characters: False
320284
```
321285
322-
### -EnableSuspiciousSafetyTip
323-
{{Fill EnableSuspiciousSafetyTip Description}}
324-
325-
```yaml
326-
Type: $true | $false
327-
Parameter Sets: (All)
328-
Aliases:
329-
Applicable: Exchange Online, Exchange Online Protection
330-
Required: False
331-
Position: Named
332-
Default value: None
333-
Accept pipeline input: False
334-
Accept wildcard characters: False
335-
```
336-
337286
### -EnableTargetedDomainsProtection
338287
The EnableTargetedDomainsProtection parameter specifies whether to enable domain impersonation protection for a list of specified domains. Valid values are:
339288
@@ -421,51 +370,6 @@ Accept pipeline input: False
421370
Accept wildcard characters: False
422371
```
423372
424-
### -ImpersonationProtectionState
425-
{{Fill ImpersonationProtectionState Description}}
426-
427-
```yaml
428-
Type: Default | Automatic | Manual | Off
429-
Parameter Sets: (All)
430-
Aliases:
431-
Applicable: Exchange Online, Exchange Online Protection
432-
Required: False
433-
Position: Named
434-
Default value: None
435-
Accept pipeline input: False
436-
Accept wildcard characters: False
437-
```
438-
439-
### -MailboxIntelligenceProtectionAction
440-
{{Fill MailboxIntelligenceProtectionAction Description}}
441-
442-
```yaml
443-
Type: NoAction | MoveToJmf | Redirect | Quarantine | Delete | BccMessage
444-
Parameter Sets: (All)
445-
Aliases:
446-
Applicable: Exchange Online, Exchange Online Protection
447-
Required: False
448-
Position: Named
449-
Default value: None
450-
Accept pipeline input: False
451-
Accept wildcard characters: False
452-
```
453-
454-
### -MailboxIntelligenceProtectionActionRecipients
455-
{{Fill MailboxIntelligenceProtectionActionRecipients Description}}
456-
457-
```yaml
458-
Type: MultiValuedProperty
459-
Parameter Sets: (All)
460-
Aliases:
461-
Applicable: Exchange Online, Exchange Online Protection
462-
Required: False
463-
Position: Named
464-
Default value: None
465-
Accept pipeline input: False
466-
Accept wildcard characters: False
467-
```
468-
469373
### -MakeDefault
470374
{{Fill MakeDefault Description}}
471375

‎exchange/exchange-ps/exchange/client-access/Get-CASMailboxPlan.md

Lines changed: 28 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,23 @@ monikerRange: "exchonline-ps"
1111
## SYNOPSIS
1212
This cmdlet is available only in the cloud-based service.
1313

14-
Use the Get-CASMailboxPlan cmdlet to view Client Access services (CAS) mailbox plans in the cloud-based organization.
14+
Use the Get-CASMailboxPlan cmdlet to view Client Access services (CAS) mailbox plans in cloud-based organizations.
1515

1616
For information about the parameter sets in the Syntax section below, see Exchange cmdlet syntax (https://technet.microsoft.com/library/bb123552.aspx).
1717

1818
## SYNTAX
1919

2020
```
21-
Get-CASMailboxPlan [[-Identity] <MailboxPlanIdParameter>] [-Credential <PSCredential>]
22-
[-DomainController <Fqdn>] [-Filter <String>] [-IgnoreDefaultScope]
23-
[-ResultSize <Unlimited>] [-SortBy <String>] [<CommonParameters>]
21+
Get-CASMailboxPlan [[-Identity] <MailboxPlanIdParameter>]
22+
[-Credential <PSCredential>]
23+
[-Filter <String>]
24+
[-IgnoreDefaultScope]
25+
[-ResultSize <Unlimited>]
26+
[-SortBy <String>] [<CommonParameters>]
2427
```
2528

2629
## DESCRIPTION
27-
CAS mailbox plans control client access settings for all mailboxes that have the plans assigned to them (for example, Exchange ActiveSync, POP, IMAP, and Outlook on the web settings).
30+
A CAS mailbox plan is tied to the corresponding mailbox plan that has the same name (and display name). Like mailbox plans, CAS mailbox plans correspond to license types, and are applied to a mailbox when you license the user. The availability of a CAS mailbox plan is determined by your selections when you enroll in the service and the age of your organization.
2831

2932
You need to be assigned permissions before you can run this cmdlet. Although this topic lists all parameters for the cmdlet, you may not have access to some parameters if they're not included in the permissions assigned to you. To find the permissions required to run any cmdlet or parameter in your organization, see Find the permissions required to run any Exchange cmdlet (https://technet.microsoft.com/library/mt432940.aspx).
3033

@@ -42,32 +45,42 @@ This example returns a summary list of all CAS mailbox plans in the organization
4245
Get-CASMailboxPlan -Identity ExchangeOnlineEnterprise
4346
```
4447

45-
This example returns detailed information about the CAS mailbox plan named ExchangeOnlineEnterprise.
48+
This example returns detailed information about the specified CAS mailbox plan.
4649

4750
## PARAMETERS
4851

49-
### -Credential
50-
The Credential parameter specifies the user name and password that's used to run this command. Typically, you use this parameter in scripts or when you need to provide different credentials that have the required permissions.
52+
### -Identity
53+
The Identity parameter specifies the CAS mailbox plan that you want to view. You can use any value that uniquely identifies the CAS mailbox plan. For example:
5154

52-
This parameter requires the creation and passing of a credential object. This credential object is created by using the Get-Credential cmdlet. For more information, see Get-Credential (https://go.microsoft.com/fwlink/p/?linkId=142122).
55+
- Name
56+
57+
- Display Name
58+
59+
- Distinguished name (DN)
60+
61+
- GUID
62+
63+
The display name and name of the CAS mailbox plan is the same as the corresponding mailbox plan (for example, ExchangeOnlineEnterprise and ExchangeOnlineEnterprise-\<GUID\>).
5364

5465
```yaml
55-
Type: PSCredential
66+
Type: MailboxPlanIdParameter
5667
Parameter Sets: (All)
5768
Aliases:
5869
Applicable: Exchange Online
5970
Required: False
60-
Position: Named
71+
Position: 1
6172
Default value: None
62-
Accept pipeline input: False
73+
Accept pipeline input: True
6374
Accept wildcard characters: False
6475
```
6576
66-
### -DomainController
67-
This parameter is reserved for internal Microsoft use.
77+
### -Credential
78+
The Credential parameter specifies the user name and password that's used to run this command. Typically, you use this parameter in scripts or when you need to provide different credentials that have the required permissions.
79+
80+
This parameter requires the creation and passing of a credential object. This credential object is created by using the Get-Credential cmdlet. For more information, see Get-Credential (https://go.microsoft.com/fwlink/p/?linkId=142122).
6881
6982
```yaml
70-
Type: Fqdn
83+
Type: PSCredential
7184
Parameter Sets: (All)
7285
Aliases:
7386
Applicable: Exchange Online
@@ -95,31 +108,6 @@ Accept pipeline input: False
95108
Accept wildcard characters: False
96109
```
97110
98-
### -Identity
99-
The Identity parameter specifies the CAS mailbox plan that you want to view. You can use any value that uniquely identifies the CAS mailbox plan. For example:
100-
101-
- Name
102-
103-
- Display Name
104-
105-
- Distinguished name (DN)
106-
107-
- GUID
108-
109-
Typically, the name of the CAS mailbox plan is the same as the corresponding mailbox plan (for example, ExchangeOnlineEnterprise).
110-
111-
```yaml
112-
Type: MailboxPlanIdParameter
113-
Parameter Sets: (All)
114-
Aliases:
115-
Applicable: Exchange Online
116-
Required: False
117-
Position: 1
118-
Default value: None
119-
Accept pipeline input: True
120-
Accept wildcard characters: False
121-
```
122-
123111
### -IgnoreDefaultScope
124112
This parameter is reserved for internal Microsoft use.
125113

0 commit comments

Comments
 (0)