Skip to content

Commit d1affb3

Browse files
KateyanneKateyanne
authored
Merge branch 'master' into patch-246
2 parents 1ba1353 + a2ba77f commit d1affb3

File tree

105 files changed

+898
-873
lines changed

Some content is hidden

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

105 files changed

+898
-873
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/Get-AutoSensitivityLabelPolicy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
external help file: Microsoft.Exchange.TransportMailflow-Help.xml
33
online version: https://docs.microsoft.com/powershell/module/exchange/get-autosensitivitylabelpolicy
44
applicable: Office 365 Security & Compliance Center
5-
title: Get-Label
5+
title: Get-AutoSensitivityLabelPolicy
66
schema: 2.0.0
77
author: chrisda
88
ms.author: chrisda

‎exchange/exchange-ps/exchange/Get-AutoSensitivityLabelRule.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
external help file: Microsoft.Exchange.TransportMailflow-Help.xml
33
online version: https://docs.microsoft.com/powershell/module/exchange/get-autosensitivitylabelrule
44
applicable: Office 365 Security & Compliance Center
5-
title: Get-Label
5+
title: Get-AutoSensitivityLabelRule
66
schema: 2.0.0
77
author: chrisda
88
ms.author: chrisda

0 commit comments

Comments
 (0)