Skip to content

Commit 8baa6c3

Browse files
authored
Merge branch 'master' into master
2 parents 7f84539 + a44033d commit 8baa6c3

File tree

6 files changed

+17
-6
lines changed

6 files changed

+17
-6
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,9 @@ For a detailed visual flow about creating applications in Azure AD, see <https:/
9797
- Exchange administrator
9898
- Global Reader
9999

100+
> [!NOTE]
101+
> The Global administrator and Exchange administrator roles provide the necessary permissions for any Exchange-related tasks, including recipient management and protection features (anti-spam, anti-malware, etc). The Security administrator role doesn't not have the necessary permissions for these same Exchange-related tasks.
102+
100103
## Appendix
101104

102105
## Step 1: Register the application in Azure AD

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,13 +310,13 @@ For detailed syntax and parameter information, see [Update-Module](/powershell/m
310310
- x64:
311311

312312
```powershell
313-
Set-ItemProperty -Path 'HKLM:\SOFTWARE\Wow6432Node\Microsoft.NetFramework\v4.0.30319' -Name 'SchUseStrongCrypto' -Type DWord -Value '1'
313+
Set-ItemProperty -Path 'HKLM:\SOFTWARE\Wow6432Node\Microsoft\.NETFramework\v4.0.30319' -Name 'SchUseStrongCrypto' -Type DWord -Value '1'
314314
```
315315
316316
- x86
317317
318318
```powershell
319-
Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft.NetFramework\v4.0.30319' -Name 'SchUseStrongCrypto' -Type DWord -Value '1'
319+
Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\.NETFramework\v4.0.30319' -Name 'SchUseStrongCrypto' -Type DWord -Value '1'
320320
```
321321
322322
For more information, see [SchUseStrongCrypto](/dotnet/framework/network-programming/tls#schusestrongcrypto).

exchange/exchange-ps/exchange/Get-InboxRule.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,6 @@ Accept wildcard characters: False
151151
```
152152

153153
### -IncludeHidden
154-
This parameter works only in on-premises Exchange.
155-
156154
The IncludeHidden switch specifies whether to include hidden Inbox rules in the results. You don't need to specify a value with this switch.
157155

158156
```yaml

exchange/exchange-ps/exchange/New-Mailbox.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1068,7 +1068,7 @@ Accept wildcard characters: False
10681068
### -MicrosoftOnlineServicesID
10691069
This parameter is available only in the cloud-based service.
10701070

1071-
The MicrosoftOnlineServicesID parameter specifies the user ID for the object. This parameter only applies to objects in the cloud-based service. It isn't available for on-premises deployments.
1071+
The MicrosoftOnlineServicesID parameter specifies the user ID for the object. This parameter applies only to objects in the cloud-based service and is used instead of the UserPrincipalName parameter. The MicrosoftOnlineServicesID parameter isn't available in on-premises deployments.
10721072

10731073
```yaml
10741074
Type: WindowsLiveId
@@ -1224,6 +1224,8 @@ This parameter is available only in on-premises Exchange.
12241224

12251225
The UserPrincipalName parameter specifies the logon name for the user account. The UPN uses an email address format: `username@domain`. Typically, the domain value is the domain where the user account resides.
12261226

1227+
In the cloud-based service, use the MicrosoftOnlineServicesID parameter instead.
1228+
12271229
```yaml
12281230
Type: String
12291231
Parameter Sets: User, Arbitration, AuditLog, RemoteArchive

skype/skype-ps/skype/Set-CsTeamsCallingPolicy.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,13 @@ PS C:\> Set-CsTeamsCallingPolicy -Identity Global -AllowPrivateCalling $true
4141

4242
Sets the value of the parameter AllowPrivateCalling, which controls whether or not users can leverage calling functionality in Microsoft Teams, in the global (default) tenant CallingPolicy.
4343

44+
### Example 2
45+
```
46+
PS C:\> Set-CsTeamsCallingPolicy -Identity HRPolicy -LiveCaptionsEnabledTypeForCalling disabled
47+
```
48+
49+
Sets the value of the parameter LiveCaptionsEnabledTypeForCalling, which controls whether real-time captions are available for the user in Teams calls, in a custom CallingPolicy called HRPolicy.
50+
4451
## PARAMETERS
4552

4653
### -AllowWebPSTNCalling
@@ -62,7 +69,7 @@ Accept wildcard characters: False
6269
Controls interop calling capabilities.
6370
Turning this on will allow Skype for Business users to have one-on-one calls with Teams users and vice-versa.
6471
65-
[!NOTE] This parameter is disabled.
72+
Note: This parameter is disabled.
6673
6774
```yaml
6875
Type: Boolean

teams/teams-ps/teams/New-Team.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ This example creates a team, adds three members to it, and creates three channel
8585
The MailNickName parameter specifies the alias for the associated Office 365 Group.
8686
This value will be used for the mail enabled object and will be used as PrimarySmtpAddress for this Office 365 Group.
8787
The value of the MailNickName parameter has to be unique across your tenant.
88+
Note: If Microsoft 365 groups naming policies are enabled in your tenant, this parameter is required and must also comply with the naming policy.
8889

8990
For more details about the naming conventions see here: [New-UnifiedGroup](https://docs.microsoft.com/powershell/module/exchange/new-unifiedgroup#parameters), Parameter: -Alias.
9091

0 commit comments

Comments
 (0)