Skip to content

Commit e141a8a

Browse files
chrisdachrisda
authored
Merge pull request MicrosoftDocs#4332 from MicrosoftDocs/chrisda
Chrisda to Master
2 parents f4b1d63 + 91678c3 commit e141a8a

14 files changed

+130
-61
lines changed

‎.openpublishing.redirection.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,67 @@
11
{
22
"redirections": [
33
{
4-
"source_path": "exchange/exchange-ps/exchange/policy-and-compliance-dlp/New-DlpEdmSschema.md",
4+
"source_path": "exchange/virtual-folder/exchange/policy-and-compliance-dlp/New-DlpEdmSschema.md",
55
"redirect_url": "https://docs.microsoft.com/powershell/module/exchange/policy-and-compliance-dlp/new-dlpedmschema",
66
"redirect_document_id": true
77
},
88
{
9-
"source_path": "exchange/exchange-ps/exchange/policy-and-compliance-retention/Get-TeamsRetentionCompliancePolicy.md",
9+
"source_path": "exchange/virtual-folder/exchange/policy-and-compliance-retention/Get-TeamsRetentionCompliancePolicy.md",
1010
"redirect_url": "https://docs.microsoft.com/powershell/module/exchange/policy-and-compliance-retention/get-retentioncompliancepolicy",
1111
"redirect_document_id": true
1212
},
1313
{
14-
"source_path": "exchange/exchange-ps/exchange/policy-and-compliance-retention/Get-TeamsRetentionComplianceRule.md",
14+
"source_path": "exchange/virtual-folder/exchange/policy-and-compliance-retention/Get-TeamsRetentionComplianceRule.md",
1515
"redirect_url": "https://docs.microsoft.com/powershell/module/exchange/policy-and-compliance-retention/get-retentioncompliancerule",
1616
"redirect_document_id": true
1717
},
1818
{
19-
"source_path": "exchange/exchange-ps/exchange/policy-and-compliance-retention/New-TeamsRetentionCompliancePolicy.md",
19+
"source_path": "exchange/virtual-folder/exchange/policy-and-compliance-retention/New-TeamsRetentionCompliancePolicy.md",
2020
"redirect_url": "https://docs.microsoft.com/powershell/module/exchange/policy-and-compliance-retention/new-retentioncompliancepolicy",
2121
"redirect_document_id": true
2222
},
2323
{
24-
"source_path": "exchange/exchange-ps/exchange/policy-and-compliance-retention/New-TeamsRetentionComplianceRule.md",
24+
"source_path": "exchange/virtual-folder/exchange/policy-and-compliance-retention/New-TeamsRetentionComplianceRule.md",
2525
"redirect_url": "https://docs.microsoft.com/powershell/module/exchange/policy-and-compliance-retention/new-retentioncompliancerule",
2626
"redirect_document_id": true
2727
},
2828
{
29-
"source_path": "exchange/exchange-ps/exchange/policy-and-compliance-retention/Remove-TeamsRetentionCompliancePolicy.md",
29+
"source_path": "exchange/virtual-folder/exchange/policy-and-compliance-retention/Remove-TeamsRetentionCompliancePolicy.md",
3030
"redirect_url": "https://docs.microsoft.com/powershell/module/exchange/policy-and-compliance-retention/remove-retentioncompliancepolicy",
3131
"redirect_document_id": true
3232
},
3333
{
34-
"source_path": "exchange/exchange-ps/exchange/policy-and-compliance-retention/Remove-TeamsRetentionComplianceRule.md",
34+
"source_path": "exchange/virtual-folder/exchange/policy-and-compliance-retention/Remove-TeamsRetentionComplianceRule.md",
3535
"redirect_url": "https://docs.microsoft.com/powershell/module/exchange/policy-and-compliance-retention/remove-retentioncompliancerule",
3636
"redirect_document_id": true
3737
},
3838
{
39-
"source_path": "exchange/exchange-ps/exchange/policy-and-compliance-retention/Set-TeamsRetentionCompliancePolicy.md",
39+
"source_path": "exchange/virtual-folder/exchange/policy-and-compliance-retention/Set-TeamsRetentionCompliancePolicy.md",
4040
"redirect_url": "https://docs.microsoft.com/powershell/module/exchange/policy-and-compliance-retention/set-retentioncompliancepolicy",
4141
"redirect_document_id": true
4242
},
4343
{
44-
"source_path": "exchange/exchange-ps/exchange/policy-and-compliance-retention/Set-TeamsRetentionComplianceRule.md",
44+
"source_path": "exchange/virtual-folder/exchange/policy-and-compliance-retention/Set-TeamsRetentionComplianceRule.md",
4545
"redirect_url": "https://docs.microsoft.com/powershell/module/exchange/policy-and-compliance-retention/set-retentioncompliancerule",
4646
"redirect_document_id": true
4747
},
4848
{
49-
"source_path": "exchange/exchange-ps/exchange/policy-and-compliance-dlp/Get-DlpComplianceRuleV2.md",
49+
"source_path": "exchange/virtual-folder/exchange/policy-and-compliance-dlp/Get-DlpComplianceRuleV2.md",
5050
"redirect_url": "https://docs.microsoft.com/powershell/module/exchange/policy-and-compliance-dlp/get-dlpcompliancerule",
5151
"redirect_document_id": true
5252
},
5353
{
54-
"source_path": "exchange/exchange-ps/exchange/policy-and-compliance-dlp/New-DlpComplianceRuleV2.md",
54+
"source_path": "exchange/virtual-folder/exchange/policy-and-compliance-dlp/New-DlpComplianceRuleV2.md",
5555
"redirect_url": "https://docs.microsoft.com/powershell/module/exchange/policy-and-compliance-dlp/new-dlpcompliancerule",
5656
"redirect_document_id": true
5757
},
5858
{
59-
"source_path": "exchange/exchange-ps/exchange/policy-and-compliance-dlp/Remove-DlpComplianceRuleV2.md",
59+
"source_path": "exchange/virtual-folder/exchange/policy-and-compliance-dlp/Remove-DlpComplianceRuleV2.md",
6060
"redirect_url": "https://docs.microsoft.com/powershell/module/exchange/policy-and-compliance-dlp/remove-dlpcompliancerule",
6161
"redirect_document_id": true
6262
},
6363
{
64-
"source_path": "exchange/exchange-ps/exchange/policy-and-compliance-dlp/Set-DlpComplianceRuleV2.md",
64+
"source_path": "exchange/virtual-folder/exchange/policy-and-compliance-dlp/Set-DlpComplianceRuleV2.md",
6565
"redirect_url": "https://docs.microsoft.com/powershell/module/exchange/policy-and-compliance-dlp/set-dlpcompliancerule",
6666
"redirect_document_id": true
6767
}

‎exchange/docfx.json

Lines changed: 42 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
"build": {
33
"content": [
44
{
5-
"files": ["**/*.md"],
5+
"files": [
6+
"**/*.md"
7+
],
68
"src": "docs-conceptual",
79
"version": "exchange-ps",
810
"dest": "exchange",
@@ -12,26 +14,41 @@
1214
"README.md",
1315
"LICENSE",
1416
"LICENSE-CODE",
15-
"ThirdPartyNotices"]
17+
"ThirdPartyNotices"
18+
]
1619
},
1720
{
18-
"files": ["toc.yml"],
21+
"files": [
22+
"toc.yml"
23+
],
1924
"src": "docs-conceptual",
2025
"version": "exchange-ps",
2126
"dest": "exchange/exchange-ps"
2227
},
2328
{
24-
"files": ["**/*.md"],
25-
"src": "exchange-ps",
26-
"version": "exchange-ps",
27-
"dest": "module"
28-
},
29-
{
30-
"files": ["toc.yml"],
31-
"src": "exchange-ps",
32-
"version": "exchange-ps",
33-
"dest": "module/exchange-ps"
34-
}
29+
"files": [
30+
"**/*.md"
31+
],
32+
"src": "exchange-ps",
33+
"version": "exchange-ps",
34+
"dest": "module"
35+
},
36+
{
37+
"files": [
38+
"toc.yml"
39+
],
40+
"src": "exchange-ps",
41+
"version": "exchange-ps",
42+
"dest": "module/exchange-ps"
43+
},
44+
{
45+
"files": [
46+
"**/*.md"
47+
],
48+
"src": "virtual-folder",
49+
"version": "exchange-ps",
50+
"dest": "module"
51+
}
3552
],
3653
"resource": [
3754
{
@@ -54,20 +71,22 @@
5471
"overwrite": [],
5572
"externalReference": [],
5673
"globalMetadata": {
57-
"author" : "chrisda",
58-
"ms.author" : "chrisda",
59-
"manager" : "serdars",
60-
"ms.date" : "09/25/2017",
61-
"ms.topic" : "reference",
62-
"ms.service" : "exchange-powershell",
63-
"ms.devlang" : "powershell",
74+
"author": "chrisda",
75+
"ms.author": "chrisda",
76+
"manager": "serdars",
77+
"ms.date": "09/25/2017",
78+
"ms.topic": "reference",
79+
"ms.service": "exchange-powershell",
80+
"ms.devlang": "powershell",
6481
"feedback_system": "GitHub",
6582
"feedback_github_repo": "MicrosoftDocs/office-docs-powershell",
6683
"feedback_product_url": "https://github.com/MicrosoftDocs/office-docs-powershell/issues"
6784
},
6885
"fileMetadata": {
69-
"apiPlatform":{
70-
"exchange-ps/exchange/**/*.md" : [ "powershell" ]
86+
"apiPlatform": {
87+
"exchange-ps/exchange/**/*.md": [
88+
"powershell"
89+
]
7190
}
7291
},
7392
"template": [],

‎exchange/exchange-ps/exchange/client-access/Set-CASMailbox.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1205,7 +1205,7 @@ Valid values for this parameter are:
12051205
12061206
- $true: Authenticated SMTP is disabled for the mailbox.
12071207
1208-
- $false: Authenticated SMTP is enaled for the mailbox.
1208+
- $false: Authenticated SMTP is enabled for the mailbox.
12091209
12101210
- blank ($null): This is the default value. The authenticated SMTP setting for the mailbox is controlled by the corresponding SmtpClientAuthenticationDisabled parameter on the Set-TransportConfig cmdlet for the whole organization. By default, authenticated SMTP is enabled for the organization ($false), which means authenticated SMTP is also enabled for the mailbox.
12111211

‎exchange/exchange-ps/exchange/client-access/Set-MailboxCalendarConfiguration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -954,7 +954,7 @@ The WorkingHoursTimeZone parameter specifies the time zone that's used by the Wo
954954
955955
A valid value for this parameter is a supported time zone key name (for example, "Pacific Standard Time").
956956
957-
To see the available values, run the following command: $TimeZone = Get-ChildItem "HKLM:\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Time zones" | foreach {Get-ItemProperty $\_.PSPath}; $TimeZone | sort Display | Format-Table -Auto PSChildname,Display
957+
To see the available values, run the following command: `$TimeZone = Get-ChildItem "HKLM:\Software\Microsoft\Windows NT\CurrentVersion\Time zones" | foreach {Get-ItemProperty $\_.PSPath}; $TimeZone | sort Display | Format-Table -Auto PSChildname,Display`.
958958

959959
If the value contains spaces, enclose the value in quotation marks ("). The default value is the time zone setting of the Exchange server.
960960

‎exchange/exchange-ps/exchange/client-access/Set-MailboxRegionalConfiguration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ The TimeZone parameter specifies the time zone for the mailbox.
218218
219219
A valid value for this parameter is a supported time zone key name (for example, "Pacific Standard Time").
220220
221-
To see the available values, run the following command: $TimeZone = Get-ChildItem "HKLM:\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Time zones" | foreach {Get-ItemProperty $\_.PSPath}; $TimeZone | sort Display | Format-Table -Auto PSChildname,Display
221+
To see the available values, run the following command: `$TimeZone = Get-ChildItem "HKLM:\Software\Microsoft\Windows NT\CurrentVersion\Time zones" | foreach {Get-ItemProperty $\_.PSPath}; $TimeZone | sort Display | Format-Table -Auto PSChildname,Display`.
222222

223223
If the value contains spaces, enclose the value in quotation marks ("). The default value is the time zone setting of the Exchange server.
224224

‎exchange/exchange-ps/exchange/client-access/Set-OwaMailboxPolicy.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ Default value: True
233233
Accept pipeline input: False
234234
Accept wildcard characters: False
235235
```
236+
236237
### -ActiveSyncIntegrationEnabled
237238
The ActiveSyncIntegrationEnabled parameter specifies whether to enable or disable Exchange ActiveSync settings in Outlook on the web. Valid values are:
238239

‎exchange/exchange-ps/exchange/mailboxes/Disable-InboxRule.md

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,13 @@ For information about the parameter sets in the Syntax section below, see [Excha
2121
## SYNTAX
2222

2323
```
24-
Disable-InboxRule [-Identity] <InboxRuleIdParameter> [-AlwaysDeleteOutlookRulesBlob] [-Confirm]
25-
[-DomainController <Fqdn>] [-Force] [-Mailbox <MailboxIdParameter>] [-WhatIf] [<CommonParameters>]
24+
Disable-InboxRule [-Identity] <InboxRuleIdParameter>
25+
[-AlwaysDeleteOutlookRulesBlob]
26+
[-Confirm]
27+
[-DomainController <Fqdn>]
28+
[-Force]
29+
[-Mailbox <MailboxIdParameter>]
30+
[-WhatIf] [<CommonParameters>]
2631
```
2732

2833
## DESCRIPTION
@@ -42,7 +47,15 @@ This example disables the Inbox rule MoveAnnouncements in the mailbox Joe@Contos
4247
## PARAMETERS
4348

4449
### -Identity
45-
The Identity parameter specifies the name of the Inbox rule to be disabled.
50+
The Identity parameter specifies the Inbox rule that you want to disable. You can use any value that uniquely identifies the rule. For example:
51+
52+
- Name
53+
54+
- RuleIdentity property (for example, 16752869479666417665).
55+
56+
- Exchange Online: `<mailbox alias>\<RuleIdentity>` (for example, `rzaher\16752869479666417665`.
57+
58+
- On-premises Exchange: `<mailbox canonical name>\<RuleIdentity>` (for example, `contoso.com/Users/Rick Zaher\16752869479666417665`).
4659

4760
```yaml
4861
Type: InboxRuleIdParameter

‎exchange/exchange-ps/exchange/mailboxes/Enable-InboxRule.md

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,13 @@ For information about the parameter sets in the Syntax section below, see [Excha
2121
## SYNTAX
2222

2323
```
24-
Enable-InboxRule [-Identity] <InboxRuleIdParameter> [-AlwaysDeleteOutlookRulesBlob] [-Confirm]
25-
[-DomainController <Fqdn>] [-Force] [-Mailbox <MailboxIdParameter>] [-WhatIf] [<CommonParameters>]
24+
Enable-InboxRule [-Identity] <InboxRuleIdParameter>
25+
[-AlwaysDeleteOutlookRulesBlob]
26+
[-Confirm]
27+
[-DomainController <Fqdn>]
28+
[-Force]
29+
[-Mailbox <MailboxIdParameter>]
30+
[-WhatIf] [<CommonParameters>]
2631
```
2732

2833
## DESCRIPTION
@@ -42,7 +47,15 @@ This example enables the Inbox rule named Move To Junk Mail in the mailbox that
4247
## PARAMETERS
4348

4449
### -Identity
45-
The Identity parameter specifies the display name or GUID of the Inbox rule.
50+
The Identity parameter specifies the Inbox rule that you want to enable. You can use any value that uniquely identifies the rule. For example:
51+
52+
- Name
53+
54+
- RuleIdentity property (for example, 16752869479666417665).
55+
56+
- Exchange Online: `<mailbox alias>\<RuleIdentity>` (for example, `rzaher\16752869479666417665`.
57+
58+
- On-premises Exchange: `<mailbox canonical name>\<RuleIdentity>` (for example, `contoso.com/Users/Rick Zaher\16752869479666417665`).
4659

4760
```yaml
4861
Type: InboxRuleIdParameter
@@ -57,7 +70,7 @@ Accept wildcard characters: False
5770
```
5871
5972
### -AlwaysDeleteOutlookRulesBlob
60-
The AlwaysDeleteOutlookRulesBlob parameter suppresses a warning that end users or administrators get if they use Outlook Web App or Windows PowerShell to modify Inbox rules.
73+
The AlwaysDeleteOutlookRulesBlob switch hides a warning message when end users or administrators use Outlook on the web or PowerShell to modify Inbox rules. You don't need to specify a value with this switch.
6174
6275
```yaml
6376
Type: SwitchParameter

‎exchange/exchange-ps/exchange/mailboxes/Get-InboxRule.md

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,22 @@ For information about the parameter sets in the Syntax section below, see [Excha
2121
## SYNTAX
2222

2323
```
24-
Get-InboxRule [[-Identity] <InboxRuleIdParameter>] [-DescriptionTimeFormat <String>]
25-
[-DescriptionTimeZone <ExTimeZoneValue>] [-DomainController <Fqdn>] [-Mailbox <MailboxIdParameter>]
26-
[-IncludeHidden] [-BypassScopeCheck] [-SweepRules] [<CommonParameters>]
24+
Get-InboxRule [[-Identity] <InboxRuleIdParameter>]
25+
[-DescriptionTimeFormat <String>]
26+
[-DescriptionTimeZone <ExTimeZoneValue>]
27+
[-DomainController <Fqdn>]
28+
[-Mailbox <MailboxIdParameter>]
29+
[-IncludeHidden]
30+
[-BypassScopeCheck]
31+
[-SweepRules]
32+
[<CommonParameters>]
2733
```
2834

2935
## DESCRIPTION
3036
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://docs.microsoft.com/powershell/exchange/exchange-server/find-exchange-cmdlet-permissions).
3137

38+
**Note**: This cmdlet doesn't work for members of View-Only Organization Management role group in Exchange Online or the Global Reader role in Azure Active Directory.
39+
3240
## EXAMPLES
3341

3442
### -------------------------- Example 1 --------------------------
@@ -69,7 +77,7 @@ The DescriptionTimeZone parameter specifies time zone that's used for time value
6977
7078
A valid value for this parameter is a supported time zone key name (for example, "Pacific Standard Time").
7179
72-
To see the available values, run the following command: $TimeZone = Get-ChildItem "HKLM:\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Time zones" | foreach {Get-ItemProperty $\_.PSPath}; $TimeZone | sort Display | Format-Table -Auto PSChildname,Display
80+
To see the available values, run the following command: `$TimeZone = Get-ChildItem "HKLM:\Software\Microsoft\Windows NT\CurrentVersion\Time zones" | foreach {Get-ItemProperty $\_.PSPath}; $TimeZone | sort Display | Format-Table -Auto PSChildname,Display`.
7381

7482
If the value contains spaces, enclose the value in quotation marks ("). The default value is the time zone setting of the Exchange server.
7583

@@ -109,9 +117,9 @@ The Identity parameter specifies the Inbox rule that you want to view. You can u
109117

110118
- RuleIdentity property (for example, 16752869479666417665).
111119

112-
- Exchange Online: \<mailbox alias\>\\\<RuleIdentity\> (for example, rzaher\\16752869479666417665.
120+
- Exchange Online: `<mailbox alias>\<RuleIdentity>` (for example, `rzaher\16752869479666417665`.
113121

114-
- On-premises Exchange: \<mailbox canonical name\>\\\<RuleIdentity\> (for example, contoso.com/Users/Rick Zaher\\16752869479666417665.
122+
- On-premises Exchange: `<mailbox canonical name>\<RuleIdentity>` (for example, `contoso.com/Users/Rick Zaher\16752869479666417665`).
115123

116124
```yaml
117125
Type: InboxRuleIdParameter

‎exchange/exchange-ps/exchange/mailboxes/Remove-InboxRule.md

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,13 @@ For information about the parameter sets in the Syntax section below, see [Excha
2121
## SYNTAX
2222

2323
```
24-
Remove-InboxRule [-Identity] <InboxRuleIdParameter> [-AlwaysDeleteOutlookRulesBlob] [-Confirm]
25-
[-DomainController <Fqdn>] [-Force] [-Mailbox <MailboxIdParameter>] [-WhatIf] [<CommonParameters>]
24+
Remove-InboxRule [-Identity] <InboxRuleIdParameter>
25+
[-AlwaysDeleteOutlookRulesBlob]
26+
[-Confirm]
27+
[-DomainController <Fqdn>]
28+
[-Force]
29+
[-Mailbox <MailboxIdParameter>]
30+
[-WhatIf] [<CommonParameters>]
2631
```
2732

2833
## DESCRIPTION
@@ -49,7 +54,15 @@ This example removes all Inbox rules from the mailbox [email protected].
4954
## PARAMETERS
5055

5156
### -Identity
52-
The Identity parameter specifies the name of the Inbox rule to be removed.
57+
The Identity parameter specifies the Inbox rule that you want to remove. You can use any value that uniquely identifies the rule. For example:
58+
59+
- Name
60+
61+
- RuleIdentity property (for example, 16752869479666417665).
62+
63+
- Exchange Online: `<mailbox alias>\<RuleIdentity>` (for example, `rzaher\16752869479666417665`.
64+
65+
- On-premises Exchange: `<mailbox canonical name>\<RuleIdentity>` (for example, `contoso.com/Users/Rick Zaher\16752869479666417665`).
5366

5467
```yaml
5568
Type: InboxRuleIdParameter
@@ -64,7 +77,7 @@ Accept wildcard characters: False
6477
```
6578
6679
### -AlwaysDeleteOutlookRulesBlob
67-
The AlwaysDeleteOutlookRulesBlob parameter suppresses a warning that end users or administrators get if they use Outlook Web App or Windows PowerShell to modify Inbox rules.
80+
The AlwaysDeleteOutlookRulesBlob switch hides a warning message when end users or administrators use Outlook on the web or PowerShell to modify Inbox rules. You don't need to specify a value with this switch.
6881
6982
```yaml
7083
Type: SwitchParameter

0 commit comments

Comments
 (0)