Skip to content

Commit 153043a

Browse files
authored
Merge branch 'master' into application-access-policy
2 parents 4cd7e38 + 8945661 commit 153043a

File tree

107 files changed

+1118
-955
lines changed

Some content is hidden

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

107 files changed

+1118
-955
lines changed

.openpublishing.publish.config.json

Lines changed: 29 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,15 @@
1212
"Conceptual": "Content",
1313
"ManagedReference": "Content",
1414
"RestApi": "Content",
15-
"AzurePsModulePage": "Content"
15+
"PowershellModule": "Content",
16+
"PowershellCmdlet": "Content"
1617
},
1718
"build_entry_point": "docs",
1819
"template_folder": "_themes",
1920
"version": 0,
20-
"customized_template_paths": [
21-
"_dependentPackages/azurecli.plugins/azurecli"
22-
],
2321
"customized_tasks": {
2422
"docset_prebuild": [
25-
"_dependentPackages/CommonPlugins/tools/PowerShellReference.ps1"
23+
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
2624
]
2725
},
2826
"monikerPath": [
@@ -41,17 +39,15 @@
4139
"Conceptual": "Content",
4240
"ManagedReference": "Content",
4341
"RestApi": "Content",
44-
"AzurePsModulePage": "Content"
42+
"PowershellModule": "Content",
43+
"PowershellCmdlet": "Content"
4544
},
4645
"build_entry_point": "docs",
4746
"template_folder": "_themes",
4847
"version": 0,
49-
"customized_template_paths": [
50-
"_dependentPackages/azurecli.plugins/azurecli"
51-
],
5248
"customized_tasks": {
5349
"docset_prebuild": [
54-
"_dependentPackages/CommonPlugins/tools/PowerShellReference.ps1"
50+
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
5551
]
5652
},
5753
"monikerPath": [
@@ -70,17 +66,15 @@
7066
"Conceptual": "Content",
7167
"ManagedReference": "Content",
7268
"RestApi": "Content",
73-
"AzurePsModulePage": "Content"
69+
"PowershellModule": "Content",
70+
"PowershellCmdlet": "Content"
7471
},
7572
"build_entry_point": "docs",
7673
"template_folder": "_themes",
7774
"version": 0,
78-
"customized_template_paths": [
79-
"_dependentPackages/azurecli.plugins/azurecli"
80-
],
8175
"customized_tasks": {
8276
"docset_prebuild": [
83-
"_dependentPackages/CommonPlugins/tools/PowerShellReference.ps1"
77+
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
8478
]
8579
},
8680
"monikerPath": [
@@ -99,17 +93,15 @@
9993
"Conceptual": "Content",
10094
"ManagedReference": "Content",
10195
"RestApi": "Content",
102-
"AzurePsModulePage": "Content"
96+
"PowershellModule": "Content",
97+
"PowershellCmdlet": "Content"
10398
},
10499
"build_entry_point": "docs",
105100
"template_folder": "_themes",
106101
"version": 0,
107-
"customized_template_paths": [
108-
"_dependentPackages/azurecli.plugins/azurecli"
109-
],
110102
"customized_tasks": {
111103
"docset_prebuild": [
112-
"_dependentPackages/CommonPlugins/tools/PowerShellReference.ps1"
104+
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
113105
]
114106
},
115107
"monikerPath": [
@@ -128,17 +120,15 @@
128120
"Conceptual": "Content",
129121
"ManagedReference": "Content",
130122
"RestApi": "Content",
131-
"AzurePsModulePage": "Content"
123+
"PowershellModule": "Content",
124+
"PowershellCmdlet": "Content"
132125
},
133126
"build_entry_point": "docs",
134127
"template_folder": "_themes",
135128
"version": 0,
136-
"customized_template_paths": [
137-
"_dependentPackages/azurecli.plugins/azurecli"
138-
],
139129
"customized_tasks": {
140130
"docset_prebuild": [
141-
"_dependentPackages/CommonPlugins/tools/PowerShellReference.ps1"
131+
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
142132
]
143133
},
144134
"monikerPath": [
@@ -157,17 +147,15 @@
157147
"Conceptual": "Content",
158148
"ManagedReference": "Content",
159149
"RestApi": "Content",
160-
"AzurePsModulePage": "Content"
150+
"PowershellModule": "Content",
151+
"PowershellCmdlet": "Content"
161152
},
162153
"build_entry_point": "docs",
163154
"template_folder": "_themes",
164155
"version": 0,
165-
"customized_template_paths": [
166-
"_dependentPackages/azurecli.plugins/azurecli"
167-
],
168156
"customized_tasks": {
169157
"docset_prebuild": [
170-
"_dependentPackages/CommonPlugins/tools/PowerShellReference.ps1"
158+
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
171159
]
172160
},
173161
"monikerPath": [
@@ -186,17 +174,15 @@
186174
"Conceptual": "Content",
187175
"ManagedReference": "Content",
188176
"RestApi": "Content",
189-
"AzurePsModulePage": "Content"
177+
"PowershellModule": "Content",
178+
"PowershellCmdlet": "Content"
190179
},
191180
"build_entry_point": "docs",
192181
"template_folder": "_themes",
193182
"version": 0,
194-
"customized_template_paths": [
195-
"_dependentPackages/azurecli.plugins/azurecli"
196-
],
197183
"customized_tasks": {
198184
"docset_prebuild": [
199-
"_dependentPackages/CommonPlugins/tools/PowerShellReference.ps1"
185+
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
200186
]
201187
},
202188
"monikerPath": [
@@ -215,17 +201,15 @@
215201
"Conceptual": "Content",
216202
"ManagedReference": "Content",
217203
"RestApi": "Content",
218-
"AzurePsModulePage": "Content"
204+
"PowershellModule": "Content",
205+
"PowershellCmdlet": "Content"
219206
},
220207
"build_entry_point": "docs",
221208
"template_folder": "_themes",
222209
"version": 0,
223-
"customized_template_paths": [
224-
"_dependentPackages/azurecli.plugins/azurecli"
225-
],
226210
"customized_tasks": {
227211
"docset_prebuild": [
228-
"_dependentPackages/CommonPlugins/tools/PowerShellReference.ps1"
212+
"_dependentPackages/MAML2Yaml/tools/Run.ps1"
229213
]
230214
},
231215
"monikerPath": [
@@ -263,17 +247,11 @@
263247
"need_generate_intellisense": false,
264248
"dependent_packages": [
265249
{
266-
"path_to_root": "_dependentPackages/azurecli.plugins",
267-
"id": "opbuild.templates.azurecli",
268-
"version": "latest",
269-
"nuget_feed": "https://www.myget.org/F/op/api/v2"
270-
},
271-
{
272-
"path_to_root": "_dependentPackages/CommonPlugins",
250+
"id": "Microsoft.DocAsCode.MAML2Yaml",
251+
"nuget_feed": "https://www.myget.org/F/op/api/v2",
252+
"path_to_root": "_dependentPackages/MAML2Yaml",
273253
"target_framework": "net45",
274-
"version": "latest",
275-
"id": "Microsoft.OpenPublishing.CommonPlugins",
276-
"nuget_feed": "https://www.myget.org/F/op/api/v2"
254+
"version": "latest"
277255
}
278256
]
279-
}
257+
}

exchange/docfx.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@
2828
},
2929
{
3030
"files": [
31-
"**/*.md"
31+
"**/*.yml"
32+
],
33+
"exclude": [
34+
"toc.yml"
3235
],
3336
"src": "exchange-ps",
3437
"version": "exchange-ps",
@@ -85,7 +88,7 @@
8588
},
8689
"fileMetadata": {
8790
"apiPlatform": {
88-
"exchange-ps/exchange/**/*.md": [
91+
"exchange-ps/exchange/**/*.yml": [
8992
"powershell"
9093
]
9194
}

exchange/exchange-ps/exchange/Disable-MailUser.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,6 @@ Accept wildcard characters: False
129129
```
130130
131131
### -IgnoreLegalHold
132-
**Note**: This parameter is not available or functional on users objects in Exchange Online.
133-
134132
The IgnoreLegalHold switch specifies whether to ignore the legal hold status of the user. When you disable or remove the user, the user's cloud-based mailbox that's on legal hold is also disabled or removed. You don't need to specify a value with this switch.
135133
136134
After you disable or remove a mailbox, you can't include it in a discovery search. When you disable a mailbox, the mailbox is disconnected from the user account. Disconnected mailboxes and removed mailboxes are permanently deleted from the mailbox database after the deleted mailbox retention period expires. However, you can also remove a mailbox and purge it immediately from the mailbox database. Check with your organization's legal or Human Resources department before you disable or remove a mailbox that's on legal hold.

exchange/exchange-ps/exchange/Disable-Mailbox.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ Accept wildcard characters: False
260260
```
261261
262262
### -IgnoreLegalHold
263-
**Note**: This parameter is not available or functional on users objects in Exchange Online.
263+
This parameter is available only in on-premises Exchange.
264264
265265
The IgnoreLegalHold switch specifies whether to ignore the legal hold status of the user. When you disable or remove the user, the user's cloud-based mailbox that's on legal hold is also disabled or removed. You don't need to specify a value with this switch.
266266
@@ -270,7 +270,7 @@ After you disable or remove a mailbox, you can't include it in a discovery searc
270270
Type: SwitchParameter
271271
Parameter Sets: (All)
272272
Aliases:
273-
Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online
273+
Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019
274274

275275
Required: False
276276
Position: Named

exchange/exchange-ps/exchange/Enable-OutlookAnywhere.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ This cmdlet can be successfully run only if the RPC over HTTP proxy Windows netw
5454

5555
When you run this cmdlet, it can take as long as an hour for the settings to become effective, depending on how long it takes for Active Directory to replicate.
5656

57+
For more information about the different authentication methods that you can see in this article, see [Understanding HTTP Authentication](https://docs.microsoft.com/dotnet/framework/wcf/feature-details/understanding-http-authentication).
58+
5759
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/find-exchange-cmdlet-permissions).
5860

5961
## EXAMPLES

exchange/exchange-ps/exchange/Get-SiteMailbox.md

Lines changed: 42 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
---
22
external help file: Microsoft.Exchange.RolesAndAccess-Help.xml
33
online version: https://docs.microsoft.com/powershell/module/exchange/get-sitemailbox
4-
applicable: Exchange Server 2013, Exchange Server 2016, Exchange Server 2019
4+
applicable: Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online
55
title: Get-SiteMailbox
66
schema: 2.0.0
77
author: chrisda
88
ms.author: chrisda
99
ms.reviewer:
10-
monikerRange: "exchserver-ps-2013 || exchserver-ps-2016 || exchserver-ps-2019"
10+
monikerRange: "exchserver-ps-2013 || exchserver-ps-2016 || exchserver-ps-2019 || exchonline-ps"
1111
---
1212

1313
# Get-SiteMailbox
1414

1515
## SYNOPSIS
16-
This cmdlet is available only in on-premises Exchange. Site mailboxes were removed from Exchange Online and SharePoint Online in 2017.
16+
This cmdlet is available in on-premises Exchange and in the cloud-based service. Some parameters and settings may be exclusive to one environment or the other.
17+
18+
Site mailboxes were deprecated in Exchange Online and SharePoint Online in 2017. For more information, see [Deprecation of Site Mailboxes](https://techcommunity.microsoft.com/t5/microsoft-sharepoint-blog/deprecation-of-site-mailboxes/ba-p/93028).
1719

1820
Use the Get-SiteMailbox cmdlet to view information about site mailboxes. This cmdlet is primarily used by Microsoft SharePoint and Exchange to display information to users in the user interface. However, you may find it helpful for discovering information such as the site mailbox's owners, members, and lifecycle status.
1921

@@ -61,6 +63,34 @@ This example queries for site mailboxes that are marked for deletion and removes
6163

6264
## PARAMETERS
6365

66+
### -Identity
67+
The Identity parameter specifies the identity of the site mailbox. You can use any value that uniquely identifies the mailbox. For example:
68+
69+
- Name
70+
71+
- Alias
72+
73+
- Distinguished name (DN)
74+
75+
- Canonical DN
76+
77+
- Email address
78+
79+
- GUID
80+
81+
```yaml
82+
Type: RecipientIdParameter
83+
Parameter Sets: (All)
84+
Aliases:
85+
Applicable: Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online
86+
87+
Required: False
88+
Position: 1
89+
Default value: None
90+
Accept pipeline input: True
91+
Accept wildcard characters: False
92+
```
93+
6494
### -Anr
6595
The Anr parameter specifies a string on which to perform an ambiguous name resolution (ANR) search. You can specify a partial string and search for objects with an attribute that matches that string. The default attributes searched are:
6696
@@ -78,7 +108,7 @@ The Anr parameter specifies a string on which to perform an ambiguous name resol
78108
Type: String
79109
Parameter Sets: (All)
80110
Aliases:
81-
Applicable: Exchange Server 2013, Exchange Server 2016, Exchange Server 2019
111+
Applicable: Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online
82112

83113
Required: False
84114
Position: Named
@@ -96,7 +126,7 @@ If you run the command without this parameter, and you aren't a member or owner
96126
Type: SwitchParameter
97127
Parameter Sets: (All)
98128
Aliases:
99-
Applicable: Exchange Server 2013, Exchange Server 2016, Exchange Server 2019
129+
Applicable: Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online
100130

101131
Required: False
102132
Position: Named
@@ -106,6 +136,8 @@ Accept wildcard characters: False
106136
```
107137
108138
### -DeletedSiteMailbox
139+
This parameter is available only in on-premises Exchange.
140+
109141
The DeletedSiteMailbox switch returns site mailboxes that have been marked for pending deletion. You don't need to specify a value with this switch.
110142
111143
When the lifecycle application in SharePoint closes a site mailbox, the site mailbox is retained for the period specified in the lifecycle policy in the closed state. The mailbox can then be reactivated by an end user or by a SharePoint administrator. After the retention period, the Exchange site mailbox that's housed in the mailbox database will have its name prepended with MDEL: to indicate that it has been marked for deletion. To free storage space and the alias, use the Remove-Mailbox cmdlet to manually remove these site mailboxes from the mailbox database.
@@ -124,6 +156,8 @@ Accept wildcard characters: False
124156
```
125157
126158
### -DomainController
159+
This parameter is available only in on-premises Exchange.
160+
127161
The DomainController parameter specifies the domain controller that's used by this cmdlet to read data from or write data to Active Directory. You identify the domain controller by its fully qualified domain name (FQDN). For example, dc01.contoso.com.
128162
129163
```yaml
@@ -139,35 +173,9 @@ Accept pipeline input: False
139173
Accept wildcard characters: False
140174
```
141175
142-
### -Identity
143-
The Identity parameter specifies the identity of the site mailbox. You can use any value that uniquely identifies the mailbox. For example:
144-
145-
- Name
146-
147-
- Alias
148-
149-
- Distinguished name (DN)
150-
151-
- Canonical DN
152-
153-
- Email address
154-
155-
- GUID
156-
157-
```yaml
158-
Type: RecipientIdParameter
159-
Parameter Sets: (All)
160-
Aliases:
161-
Applicable: Exchange Server 2013, Exchange Server 2016, Exchange Server 2019
162-
163-
Required: False
164-
Position: 1
165-
Default value: None
166-
Accept pipeline input: True
167-
Accept wildcard characters: False
168-
```
169-
170176
### -ReadFromDomainController
177+
This parameter is available only in on-premises Exchange.
178+
171179
The ReadFromDomainController switch specifies that information should be read from a domain controller in the user's domain. If you run the command Set-AdServerSettings -ViewEntireForest $true to include all objects in the forest and you don't use the ReadFromDomainController switch, it's possible that information will be read from a global catalog that has outdated information. When you use the ReadFromDomainController switch, multiple reads might be necessary to get the information. You don't have to specify a value with this switch.
172180
173181
By default, the recipient scope is set to the domain that hosts your Exchange servers.
@@ -192,7 +200,7 @@ The ResultSize parameter specifies the maximum number of results to return. If y
192200
Type: Unlimited
193201
Parameter Sets: (All)
194202
Aliases:
195-
Applicable: Exchange Server 2013, Exchange Server 2016, Exchange Server 2019
203+
Applicable: Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online
196204

197205
Required: False
198206
Position: Named

0 commit comments

Comments
 (0)