Skip to content

Commit 7fc2d19

Browse files
chrisdachrisda
committed
Merge branch 'master' into ChrisdaCopyOfQinezh-test
2 parents 6e8973c + 87b389c commit 7fc2d19

File tree

7 files changed

+919
-4
lines changed

7 files changed

+919
-4
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
@@ -22,7 +22,7 @@ description: "Learn about using the Exchange Online V2 module in scripts and oth
2222
> [!NOTE]
2323
> This feature is currently in Public Preview, and is available in the Preview release of Exchange Online PowerShell V2 Module.
2424
25-
To install the Preview release of the EXO V2 module, run the following command:
25+
To install the Preview release of the EXO V2 module, run the same [steps to install the stable version](exchange-online-powershell-v2.md#install-and-maintain-the-exchange-online-powershell-v2-module) but instead step 4 run the following command:
2626

2727
```powershell
2828
Install-Module -Name ExchangeOnlineManagement -RequiredVersion 2.0.3-Preview -AllowPrerelease
@@ -43,7 +43,7 @@ The following examples show how to use the Exchange Online PowerShell V2 module
4343
- Connect using a local certificate:
4444

4545
```powershell
46-
Connect-ExchangeOnline -CertificateFilePath "C:\Users\johndoe\Desktop\automation-cert.pfx" -AppID "36ee4c6c-0812-40a2-b820-b22ebd02bce3" -Organization "contosoelectronics.onmicrosoft.com"
46+
Connect-ExchangeOnline -CertificateFilePath "C:\Users\johndoe\Desktop\automation-cert.pfx" -CertificatePassword (ConvertTo-SecureString -String "<My Password>" -AsPlainText -Force) -AppID "36ee4c6c-0812-40a2-b820-b22ebd02bce3" -Organization "contosoelectronics.onmicrosoft.com"
4747
```
4848

4949
- Connect using a certificate thumbprint:
@@ -200,7 +200,7 @@ Azure AD has more than 50 admin roles available. For app-only authentication in
200200
- Security reader
201201
- Security administrator
202202
- Helpdesk administrator
203-
- Exchange Service administrator
203+
- Exchange administrator
204204
- Global Reader
205205

206206
1. In the Azure AD portal under **Manage Azure Active Directory**, click **View**.

‎exchange/docs-conceptual/exchange-online-powershell-v2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ You can download the EXO V2 module from the PowerShell gallery [here](https://ww
9999
100100
### Install the EXO V2 module
101101

102-
To install the EXO V2 module for the first time, run the following commands:
102+
To install the EXO V2 module for the first time, complete the following steps:
103103

104104
1. Install or update the PowerShellGet module as described in [Installing PowerShellGet](https://docs.microsoft.com/powershell/scripting/gallery/installing-psget).
105105

‎skype/skype-ps/skype/Get-CsTeamsCortanaPolicy.md

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
---
2+
external help file: Microsoft.Rtc.Management.Hosted.dll-help.xml
3+
online version: https://docs.microsoft.com/powershell/module/skype/get-csteamscortanapolicy
4+
applicable: Skype for Business Online
5+
title: Get-CsTeamsCortanaPolicy
6+
schema: 2.0.0
7+
manager: amehta
8+
author: akshbhat
9+
ms.author: akshbhat
10+
ms.reviewer:
11+
---
12+
13+
# Get-CsTeamsCortanaPolicy
14+
15+
## SYNOPSIS
16+
The CsTeamsCortanaPolicy cmdlets enable administrators to control settings for Cortana voice assistant in Microsoft Teams.
17+
18+
## SYNTAX
19+
20+
### Identity (Default)
21+
```
22+
Get-CsTeamsCortanaPolicy [-Tenant <System.Guid>] [[-Identity] <XdsIdentity>] [-LocalStore] [<CommonParameters>]
23+
```
24+
25+
### Filter
26+
```
27+
Get-CsTeamsCortanaPolicy [-Tenant <System.Guid>] [-Filter <String>] [-LocalStore] [<CommonParameters>]
28+
```
29+
30+
## DESCRIPTION
31+
32+
The CsTeamsCortanaPolicy cmdlets enable administrators to control settings for Cortana voice assistant in Microsoft Teams. Specifically, if a user can use Cortana voice assistant in Microsoft Teams and determines Cortana invocation behavior via CortanaVoiceInvocationMode parameter -
33+
34+
* Disabled - Cortana voice assistant is disabled
35+
* PushToTalkUserOverride - Cortana voice assistant is enabled but without wake-word ("Hey Cortana") invocation
36+
* WakeWordPushToTalkUserOverride - Cortana voice assistant is enabled with wake-word ("Hey Cortana") invocation on devices where wake-word is supported
37+
38+
## EXAMPLES
39+
40+
### Example 1
41+
```powershell
42+
PS C:\> Get-CsTeamsCortanaPolicy
43+
```
44+
In the first example, the Get-CsTeamsCortanaPolicy cmdlet is called without specifying any additional parameters. This causes the Get-CsTeamsCortanaPolicy cmdlet to return a collection of all the Cortana voice assistant policies configured for use in your organization.
45+
46+
## PARAMETERS
47+
48+
### -Filter
49+
50+
Enables you to use wildcards when specifying the policy (or policies) to be retrieved. For example, this syntax returns all the policies that have been configured at the site scope: -Filter "site:". This syntax returns all the policies that have been configured at the per-user scope: -Filter "tag:".
51+
You cannot use both the Filter and the Identity parameters in the same command.
52+
53+
```yaml
54+
Type: String
55+
Parameter Sets: Filter
56+
Aliases:
57+
58+
Required: False
59+
Position: Named
60+
Default value: None
61+
Accept pipeline input: False
62+
Accept wildcard characters: False
63+
```
64+
65+
### -Identity
66+
67+
Unique identifier for the policy to be returned. To return the global policy, use this syntax: -Identity global. To return a policy configured at the site scope, use syntax similar to this: -Identity "site:Redmond". To return a policy configured at the service scope, use syntax similar to this: -Identity "Registrar:atl-cs-001.litwareinc.com".
68+
69+
Policies can also be configured at the per-user scope. To return one of these policies, use syntax similar to this: -Identity "SalesDepartmentPolicy".
70+
If this parameter is not included then all of Cortana voice assistant policies configured for use in your organization will be returned.
71+
72+
```yaml
73+
Type: XdsIdentity
74+
Parameter Sets: Identity
75+
Aliases:
76+
77+
Required: False
78+
Position: 1
79+
Default value: None
80+
Accept pipeline input: False
81+
Accept wildcard characters: False
82+
```
83+
84+
### -LocalStore
85+
86+
Retrieves the Cortana voice assistant policy data from the local replica of the Central Management store rather than from the Central Management store itself.
87+
88+
```yaml
89+
Type: SwitchParameter
90+
Parameter Sets: (All)
91+
Aliases:
92+
93+
Required: False
94+
Position: Named
95+
Default value: None
96+
Accept pipeline input: False
97+
Accept wildcard characters: False
98+
```
99+
100+
### -Tenant
101+
102+
Globally unique identifier (GUID) of the Skype for Business Online tenant account whose Cortana voice assistant policies are being returned.
103+
104+
```yaml
105+
Type: System.Guid
106+
Parameter Sets: (All)
107+
Aliases:
108+
109+
Required: False
110+
Position: Named
111+
Default value: None
112+
Accept pipeline input: False
113+
Accept wildcard characters: False
114+
```
115+
116+
### CommonParameters
117+
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
118+
119+
## INPUTS
120+
121+
### None
122+
123+
## OUTPUTS
124+
125+
### System.Object
126+
## NOTES
127+
128+
## RELATED LINKS

‎skype/skype-ps/skype/Grant-CsTeamsCortanaPolicy.md

Lines changed: 185 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,185 @@
1+
---
2+
external help file: Microsoft.Rtc.Management.Hosted.dll-help.xml
3+
online version: https://docs.microsoft.com/powershell/module/skype/get-csteamscortanapolicy
4+
applicable: Skype for Business Online
5+
title: Grant-CsTeamsCortanaPolicy
6+
schema: 2.0.0
7+
manager: amehta
8+
author: akshbhat
9+
ms.author: akshbhat
10+
ms.reviewer:
11+
---
12+
13+
# Grant-CsTeamsCortanaPolicy
14+
15+
## SYNOPSIS
16+
The CsTeamsCortanaPolicy cmdlets enable administrators to control settings for Cortana voice assistant in Microsoft Teams.
17+
18+
## SYNTAX
19+
20+
### Identity (Default)
21+
```
22+
Grant-CsTeamsCortanaPolicy [[-Identity] <UserIdParameter>] [-PolicyName] <String> [-Tenant <System.Guid>]
23+
[-DomainController <Fqdn>] [-PassThru] [-WhatIf] [-Confirm] [<CommonParameters>]
24+
```
25+
26+
### GrantToTenant
27+
```
28+
Grant-CsTeamsCortanaPolicy [-PolicyName] <String> [-Tenant <System.Guid>] [-DomainController <Fqdn>]
29+
[-PassThru] [-Global] [-WhatIf] [-Confirm] [<CommonParameters>]
30+
```
31+
32+
## DESCRIPTION
33+
34+
The CsTeamsCortanaPolicy cmdlets enable administrators to control settings for Cortana voice assistant in Microsoft Teams. Specifically, these specify if a user can use Cortana voice assistant in Microsoft Teams and Cortana invocation behavior via CortanaVoiceInvocationMode parameter -
35+
* Disabled - Cortana voice assistant is disabled
36+
* PushToTalkUserOverride - Cortana voice assistant is enabled but without wake-word ("Hey Cortana") invocation
37+
* WakeWordPushToTalkUserOverride - Cortana voice assistant is enabled with wake-word ("Hey Cortana") invocation on devices where wake-word is supported
38+
39+
This cmdlet lets you assign a Teams Cortana policy at the per-user scope.
40+
41+
## EXAMPLES
42+
43+
### Example 1
44+
```powershell
45+
PS C:\> Grant-CsTeamsCortanaPolicy -identity "Ken Myer" -PolicyName MyCortanaPolicy
46+
```
47+
48+
In this example, a user with identity "Ken Myer" is being assigned the MyCortanaPolicy
49+
50+
## PARAMETERS
51+
52+
### -Confirm
53+
Prompts you for confirmation before running the cmdlet.
54+
55+
```yaml
56+
Type: SwitchParameter
57+
Parameter Sets: (All)
58+
Aliases: cf
59+
60+
Required: False
61+
Position: Named
62+
Default value: None
63+
Accept pipeline input: False
64+
Accept wildcard characters: False
65+
```
66+
67+
### -DomainController
68+
69+
```yaml
70+
Type: Fqdn
71+
Parameter Sets: (All)
72+
Aliases:
73+
74+
Required: False
75+
Position: Named
76+
Default value: None
77+
Accept pipeline input: False
78+
Accept wildcard characters: False
79+
```
80+
81+
### -Global
82+
83+
```yaml
84+
Type: SwitchParameter
85+
Parameter Sets: GrantToTenant
86+
Aliases:
87+
88+
Required: False
89+
Position: Named
90+
Default value: None
91+
Accept pipeline input: False
92+
Accept wildcard characters: False
93+
```
94+
95+
### -Identity
96+
Indicates the identity of the user account the policy should be assigned to. User identities can be specified using one of four formats: 1) the user's SIP address; 2) the user principal name (UPN); 3) the user's ___domain name and logon name, in the form ___domain\logon (for example, litwareinc\kenmyer); and, 4) the user's Active Directory display name (for example, Ken Myer). User Identities can also be referenced by using the user's Active Directory distinguished name.
97+
98+
```yaml
99+
Type: UserIdParameter
100+
Parameter Sets: Identity
101+
Aliases:
102+
103+
Required: False
104+
Position: 0
105+
Default value: None
106+
Accept pipeline input: True (ByPropertyName, ByValue)
107+
Accept wildcard characters: False
108+
```
109+
110+
### -PassThru
111+
112+
```yaml
113+
Type: SwitchParameter
114+
Parameter Sets: (All)
115+
Aliases:
116+
117+
Required: False
118+
Position: Named
119+
Default value: None
120+
Accept pipeline input: False
121+
Accept wildcard characters: False
122+
```
123+
124+
### -PolicyName
125+
The name of the custom policy that is being assigned to the user. To remove a specific assignment and fall back to the default tenant policy, you can assign to $Null.
126+
127+
```yaml
128+
Type: String
129+
Parameter Sets: (All)
130+
Aliases:
131+
132+
Required: True
133+
Position: 1
134+
Default value: None
135+
Accept pipeline input: False
136+
Accept wildcard characters: False
137+
```
138+
139+
### -Tenant
140+
Globally unique identifier (GUID) of the tenant account whose external user communication policy are being created. For example:
141+
-Tenant "38aad667-af54-4397-aaa7-e94c79ec2308"
142+
You can return your tenant ID by running this command:
143+
Get-CsTenant | Select-Object DisplayName, TenantID
144+
145+
```yaml
146+
Type: System.Guid
147+
Parameter Sets: (All)
148+
Aliases:
149+
150+
Required: False
151+
Position: Named
152+
Default value: None
153+
Accept pipeline input: False
154+
Accept wildcard characters: False
155+
```
156+
157+
### -WhatIf
158+
Shows what would happen if the cmdlet runs.
159+
The cmdlet is not run.
160+
161+
```yaml
162+
Type: SwitchParameter
163+
Parameter Sets: (All)
164+
Aliases: wi
165+
166+
Required: False
167+
Position: Named
168+
Default value: None
169+
Accept pipeline input: False
170+
Accept wildcard characters: False
171+
```
172+
173+
### CommonParameters
174+
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
175+
176+
## INPUTS
177+
178+
### Microsoft.Rtc.Management.AD.UserIdParameter
179+
180+
## OUTPUTS
181+
182+
### System.Object
183+
## NOTES
184+
185+
## RELATED LINKS

0 commit comments

Comments
 (0)