Skip to content

Commit 2078d43

Browse files
authored
Merge branch 'master' into patch-189
2 parents 24ea6ac + 78ea4bf commit 2078d43

26 files changed

+168
-154
lines changed

.openpublishing.publish.config.json

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -234,39 +234,33 @@
234234
}
235235
],
236236
"notification_subscribers": [],
237+
"sync_notification_subscribers": [],
237238
"branches_to_filter": [],
238239
"git_repository_branch_open_to_public_contributors": "master",
239240
"skip_source_output_uploading": false,
240241
"need_preview_pull_request": true,
242+
"enable_incremental_build": false,
241243
"contribution_branch_mappings": {},
242244
"dependent_repositories": [
243245
{
244246
"path_to_root": "_themes",
245247
"url": "https://github.com/Microsoft/templates.docs.msft",
246248
"branch": "master",
247249
"branch_mapping": {}
248-
},
249-
{
250-
"path_to_root": "_themes.pdf",
251-
"url": "https://github.com/Microsoft/templates.docs.msft.pdf",
252-
"branch": "master",
253-
"branch_mapping": {}
254250
}
255251
],
256252
"branch_target_mapping": {
257253
"live": [
258-
"Publish",
259-
"Pdf"
254+
"Publish"
260255
]
261256
},
262-
"need_generate_pdf_url_template": true,
257+
"need_generate_pdf_url_template": false,
263258
"targets": {
264259
"Pdf": {
265260
"template_folder": "_themes.pdf"
266261
}
267262
},
268263
"need_generate_intellisense": false,
269-
"enable_incremental_build": false,
270264
"dependent_packages": [
271265
{
272266
"path_to_root": "_dependentPackages/azurecli.plugins",
@@ -282,4 +276,4 @@
282276
"nuget_feed": "https://www.myget.org/F/op/api/v2"
283277
}
284278
]
285-
}
279+
}

exchange/docfx.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"content": [
44
{
55
"files": [
6-
"**/*.md"
6+
"**/*.md",
7+
"**/*.yml"
78
],
89
"src": "docs-conceptual",
910
"version": "exchange-ps",

exchange/docs-conceptual/filters-v2.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ The following operators are fully supported for all string formats in the EXO V2
5151
- -not
5252
- -lt
5353
- -gt
54+
- -like
55+
- -notlike
5456

5557
The -like and -notlike operators are limited in using wildcards (*). Specifically, you can only use wildcards at the beginning of a string value, at the end of a string value, or both.
5658

exchange/docs-conceptual/index.md

Lines changed: 0 additions & 93 deletions
This file was deleted.

exchange/docs-conceptual/index.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
### YamlMime:Landing
2+
3+
title: Exchange PowerShell documentation # < 60 chars
4+
summary: Learn about the Exchange PowerShell environments that are available in on-premises Exchange and Microsoft 365. # < 160 chars
5+
6+
metadata:
7+
title: Exchange PowerShell documentation # Required; page title displayed in search results. Include the brand. < 60 chars.
8+
description: Learn about the Exchange PowerShell environments that are available in on-premises Exchange and Microsoft 365. # Required; article description that is displayed in search results. < 160 chars.
9+
services: exchange-online
10+
ms.service: exchange-online #Required; service per approved list. service slug assigned to your service by ACOM.
11+
ms.subservice: subservice # Optional; Remove if no subservice is used.
12+
ms.topic: landing-page # Required
13+
ms.assetid: 9983a964-f642-4fcd-856b-452a172bcd4e
14+
manager: dansimp
15+
author: chrisda #Required; your GitHub user alias, with correct capitalization.
16+
ms.author: chrisda #Required; microsoft alias of author; optional team alias.
17+
ms.date: 07/10/2020 #Required; mm/dd/yyyy format.
18+
19+
# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | sample | tutorial | video | whats-new
20+
21+
landingContent:
22+
# Cards and links should be based on top customer tasks or top subjects
23+
# Start card title with a verb
24+
# Card (optional)
25+
- title: About Exchange PowerShell
26+
linkLists:
27+
- linkListType: overview
28+
links:
29+
- text: Exchange Server PowerShell
30+
url: /powershell/exchange/exchange-management-shell
31+
- text: Exchange Online PowerShell
32+
url: /powershell/exchange/exchange-online-powershell
33+
- text: Security & Compliance Center PowerShell
34+
url: /powershell/exchange/scc-powershell
35+
- text: Exchange Online Protection PowerShell
36+
url: /powershell/exchange/exchange-online-protection-powershell

exchange/docs-conceptual/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
- name: Home
2-
href: index.md
2+
href: index.yml
33
items:
44
- name: Exchange Server PowerShell
55
href: exchange-management-shell.md

exchange/exchange-ps/exchange/Get-MailDetailATPReport.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ monikerRange: "exchonline-ps || eop-ps"
1515
## SYNOPSIS
1616
This cmdlet is available only in the cloud-based service.
1717

18-
Use the Get-MailDetailATPReport cmdlet to list details about Exchange Online Protection and Advanced Threat protection (ATP) detections in your cloud-based organization for the last 30 days.
18+
Use the Get-MailDetailATPReport cmdlet to list details about Exchange Online Protection and Advanced Threat protection (ATP) detections in your cloud-based organization for the last 10 days.
1919

2020
**Note**: We recommend that you use the Exchange Online PowerShell V2 module to connect to Exchange Online PowerShell. For instructions, see [Use the Exchange Online PowerShell V2 module](https://docs.microsoft.com/powershell/exchange/exchange-online-powershell-v2).
2121

exchange/exchange-ps/exchange/Set-Label.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,14 @@ You need to be assigned permissions in the Security & Compliance Center before y
5353
Set-Label -Identity "Label1" -LocaleSettings '{"localeKey":"DisplayName","Settings":[{"Key":"en-us","Value":"English display name"},{"Key":"de-de","Value":"Deutscher Anzeigename"},{"Key":"es-es","Value":"Nombre para mostrar en Español"}]}','{"localeKey":"tooltip","Settings":[{"Key":"en-us","Value":"This is an example label"},{"Key":"de-de","Value":"Dies ist ein Beispieletikett"},{"Key":"es-es","Value":"Esta es una etiqueta de ejemplo"}]}'
5454
```
5555

56-
This example sets the localized label name for "Label1" in different languages (English, German, and Spanish).
56+
This example sets the localized label name and label Tooltips for "Label1" in different languages (English, German, and Spanish).
57+
58+
### Example 2
59+
```powershell
60+
Set-Label -Identity "Label1" -LocaleSettings '{"localeKey":"DisplayName","Settings":[{"Key":"en-us","Value":""},{"Key":"de-de","Value":""},{"Key":"es-es","Value":""}]}','{"localeKey":"tooltip","Settings":[{"Key":"en-us","Value":""},{"Key":"de-de","Value":""},{"Key":"es-es","Value":""}]}'
61+
```
62+
63+
This example removes the localized label name and label Tooltips for "Label1" in different languages (English, German, and Spanish).
5764

5865
## PARAMETERS
5966

@@ -200,12 +207,14 @@ Accept wildcard characters: False
200207
```
201208
202209
### -LocaleSettings
203-
The LocaleSettings parameter specifies one or more localized label name or label Tooltips in different languages. Regions include all region codes supported in Office Client applications. Valid values use the following syntax (JSON):
210+
The LocaleSettings parameter specifies one or more localized label name and label Tooltips in different languages. Regions include all region codes supported in Office Client applications. Valid values use the following syntax (JSON):
204211
205212
- Label display names: `{"localeKey":"DisplayName","Settings":[{"Key":"en-us","Value":"English display name"},{"Key":"de-de","Value":"Deutscher Anzeigename"},{"Key":"es-es","Value":"Nombre para mostrar en Español"}]}`
206213

207214
- Label Tooltips: `{"localeKey":"Tooltip","Settings":[{"Key":"en-us","Value":"English Tooltip"},{"Key":"de-de","Value":"Deutscher Tooltip"},{"Key":"es-es","Value":"Tooltip Español"}]}`
208215

216+
To remove a language, you will have to give an empty value for that corresponding language.
217+
209218
```yaml
210219
Type: MultiValuedProperty
211220
Parameter Sets: (All)

exchange/exchange-ps/exchange/Set-RegulatoryComplianceUI.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ monikerRange: "o365scc-ps"
1313
This cmdlet is available only in the Security & Compliance Center. For more information, see [Security & Compliance Center PowerShell](https://docs.microsoft.com/powershell/exchange/scc-powershell)
1414
.
1515

16-
Use the Set-RegulatoryComplianceUI cmdlet to enable or disable regulatory compliance UI in the Security & Compliance Center (enable or disable the preservation lock checkbox for retention policies and the immutable label checkbox for retention labels).
16+
Use the Set-RegulatoryComplianceUI cmdlet to display the UI option in retention label settings to mark content as a regulatory record.
1717

1818
For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://docs.microsoft.com/powershell/exchange/exchange-cmdlet-syntax).
1919

@@ -33,16 +33,16 @@ You need to be assigned permissions in the Security & Compliance Center before y
3333
Set-RegulatoryComplianceUI -Enabled $true
3434
```
3535

36-
This example enables the regulatory compliance UI.
36+
This example displays the UI option in retention label settings to mark content as a regulatory record.
3737

3838
## PARAMETERS
3939

4040
### -Enabled
41-
The Enabled parameter specifies whether to enable or disable regulatory compliance UI. Valid values are:
41+
The Enabled parameter specifies whether to show or hide the UI option in retention label settings to mark content as a regulatory record. Valid values are:
4242

43-
$true: The preservation lock checkbox is displayed for retention policies and the immutable label checkbox is displayed for retention labels.
43+
$true: The option to mark content as a regulatory record is visible in the UI for retention label settings.
4444

45-
$false: The preservation lock checkbox is not displayed for retention policies and the immutable label checkbox is not displayed for retention labels. This is the default value.
45+
$false: The option to mark content as a regulatory record is not visible in the UI for retention label settings. This is the default value.
4646

4747
```yaml
4848
Type: Boolean

officewebapps/docfx.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"overwrite": [],
5454
"externalReference": [],
5555
"globalMetadata": {
56-
"author" : "kenwith",
56+
"author" : "serdarsoysal",
5757
"ms.author" : "mikeplum",
5858
"manager" : "laurawi",
5959
"ms.date" : "11/28/2017",
@@ -68,4 +68,4 @@
6868
"template": [],
6969
"dest": "officewebapps-ps"
7070
}
71-
}
71+
}

0 commit comments

Comments
 (0)