Skip to content

Commit 1e2c23c

Browse files
authored
Merge branch 'master' into chrisda
2 parents 21b6086 + 555df68 commit 1e2c23c

File tree

3 files changed

+22
-23
lines changed

3 files changed

+22
-23
lines changed

exchange/docs-conceptual/app-only-auth-powershell-v2.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ROBOTS: NOINDEX, NOFOLLOW
1717
description: "Learn about using the Exchange Online V2 module in scripts and other long-running tasks with Modern Authentication and app-only authentication."
1818
---
1919

20-
# App-only authentication in the EXO V2 module
20+
# App-only authentication for unattended scripts in the EXO V2 module
2121

2222
> [!NOTE]
2323
> This feature is currently in Public Preview, and is available in the Preview release of Exchange Online PowerShell V2 Module.
@@ -31,7 +31,7 @@ Install-Module -Name ExchangeOnlineManagement -RequiredVersion 2.0.3-Preview -Al
3131
To update from an earlier version of the of the EXO V2 module, run the following command:
3232

3333
```powershell
34-
Update-Module -Name ExchangeOnlineManagement -AllowPrerelease
34+
Update-Module -Name ExchangeOnlineManagement -RequiredVersion 2.0.3-Preview -AllowPrerelease
3535
```
3636

3737
Auditing and reporting scenarios in Exchange Online often involve scripts that run unattended. In most cases, these unattended scripts access Exchange Online PowerShell using Basic authentication (a username and password). Even when the connection to Exchange Online PowerShell uses Modern authentication, the credentials are stored in a local file or a secret vault that's access at run-time.
@@ -103,7 +103,7 @@ For a detailed visual flow bout creating applications in Azure AD, see <https://
103103
- Security reader
104104
- Security administrator
105105
- Helpdesk administrator
106-
- Exchange Service administrator
106+
- Exchange administrator
107107
- Global Reader
108108
109109
## Appendix

exchange/exchange-ps/exchange/New-Label.md

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

2424
```
25-
New-Label [-Name] <String> -DisplayName <String>
25+
New-Label [-Name] <String> -DisplayName <String> -Tooltip <String>
2626
[-AdvancedSettings <PswsHashtable>]
2727
[-ApplyContentMarkingFooterAlignment <Microsoft.Office.CompliancePolicy.Tasks.FlattenLabelActionUtils+ContentAlignment>]
2828
[-ApplyContentMarkingFooterEnabled <System.Boolean>]
@@ -74,7 +74,6 @@ New-Label [-Name] <String> -DisplayName <String>
7474
[-SiteAndGroupProtectionBlockAccess <System.Boolean>]
7575
[-SiteAndGroupProtectionEnabled <System.Boolean>]
7676
[-SiteAndGroupProtectionPrivacy <Microsoft.Office.CompliancePolicy.PolicyConfiguration.AccessType>]
77-
[-Tooltip <String>]
7877
[-WhatIf]
7978
[<CommonParameters>]
8079
```
@@ -125,6 +124,22 @@ Accept pipeline input: False
125124
Accept wildcard characters: False
126125
```
127126
127+
### -Tooltip
128+
The ToolTip parameter specifies the default tooltip and sensitivity label description that's seen by users. It the value contains spaces, enclose the value in quotation marks (").
129+
130+
```yaml
131+
Type: String
132+
Parameter Sets: (All)
133+
Aliases:
134+
Applicable: Office 365 Security & Compliance Center
135+
136+
Required: True
137+
Position: Named
138+
Default value: None
139+
Accept pipeline input: False
140+
Accept wildcard characters: False
141+
```
142+
128143
### -AdvancedSettings
129144
The AdvancedSettings parameter enables client-specific features and capabilities on the sensitivity label. The settings that you configure with this parameter only affect apps that are designed for the setting. For more information, see [How to configure advanced settings for the client by using Security & Compliance Center PowerShell](https://docs.microsoft.com/azure/information-protection/rms-client/clientv2-admin-guide-customizations#how-to-configure-advanced-settings-for-the-client-by-using-office-365-security--compliance-center-powershell).
130145
@@ -1087,22 +1102,6 @@ Accept pipeline input: False
10871102
Accept wildcard characters: False
10881103
```
10891104

1090-
### -Tooltip
1091-
The ToolTip parameter specifies the default tooltip and sensitivity label description that's seen by users. It the value contains spaces, enclose the value in quotation marks (").
1092-
1093-
```yaml
1094-
Type: String
1095-
Parameter Sets: (All)
1096-
Aliases:
1097-
Applicable: Office 365 Security & Compliance Center
1098-
1099-
Required: False
1100-
Position: Named
1101-
Default value: None
1102-
Accept pipeline input: False
1103-
Accept wildcard characters: False
1104-
```
1105-
11061105
### -WhatIf
11071106
The WhatIf switch doesn't work in Office 365 Security & Compliance Center PowerShell.
11081107

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ You need to be assigned permissions in the Security & Compliance Center before y
5050

5151
### Example 1
5252
```powershell
53-
Set-Label -Identity General -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"}]}'
53+
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 "General" in different languages (English, German, and Spanish).
56+
This example sets the localized label name for "Label1" in different languages (English, German, and Spanish).
5757

5858
## PARAMETERS
5959

0 commit comments

Comments
 (0)