Skip to content

Commit e2a1070

Browse files
authored
Merge branch 'master' into jicwang/add-meeting-invite-language-v2
2 parents 225ae48 + d7258a8 commit e2a1070

File tree

6 files changed

+8
-30
lines changed

6 files changed

+8
-30
lines changed

exchange/exchange-ps/exchange/New-QuarantinePolicy.md

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -61,17 +61,6 @@ This example creates a new quarantine policy named ContosoTag with the same perm
6161

6262
To assign Limited access permissions, use the value 106. To assign Full access permissions, use the value 236.
6363

64-
### Example 2
65-
```powershell
66-
$LimitedAccess = New-QuarantinePermissions -PermissionToBlockSender $true -PermissionToDelete $true -PermissionToPreview $true -PermissionToRequestRelease $true
67-
68-
New-QuarantinePolicy -Name LimitedAccess -EndUserQuarantinePermissions $LimitedAccess
69-
```
70-
71-
This example creates a new quarantine policy named LimitedAccess with the same permissions as Limited access preset permissions group.
72-
73-
The first command uses the New-QuarantinePermissions cmdlet to store the permissions object in a variable. The second command uses the variable for the value of the EndUserQuarantinePermissions parameter.
74-
7564
## PARAMETERS
7665

7766
### -Name
@@ -204,11 +193,7 @@ Accept wildcard characters: False
204193
```
205194
206195
### -EndUserQuarantinePermissions
207-
The EndUserQuarantinePermissionsValue parameter specifies the end-user permissions for the quarantine policy.
208-
209-
A value for this parameter requires the New-QuarantinePermissions cmdlet. Store the results of the New-QuarantinePermissions command in a variable (for example, `$Perms = New-QuarantinePermissions <permissions>`) and then use the variable name (`$Perms`) for this parameter. For more information, see [New-QuarantinePermissions](https://docs.microsoft.com/powershell/module/exchange/new-quarantinepermissions).
210-
211-
Don't use this parameter with the EndUserQuarantinePermissionsValue parameter.
196+
This parameter is reserved for internal Microsoft use.
212197
213198
```yaml
214199
Type: QuarantinePermissions

exchange/exchange-ps/exchange/Set-ExternalInOutlook.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,3 +136,5 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
136136
## NOTES
137137

138138
## RELATED LINKS
139+
140+
[Set-OrganizationConfig](https://docs.microsoft.com/powershell/module/exchange/set-organizationconfig)

exchange/exchange-ps/exchange/Set-OrganizationConfig.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ Set-OrganizationConfig -ShortenEventScopeDefault <ShortenEventScopeMode>
8181
[-EwsEnabled <Boolean>]
8282
[-ExchangeNotificationEnabled <Boolean>]
8383
[-ExchangeNotificationRecipients <MultiValuedProperty>]
84-
[-ExternalInOutlookEnabled <Boolean>]
8584
[-FindTimeAttendeeAuthenticationEnabled <Boolean>]
8685
[-FindTimeAutoScheduleDisabled <Boolean>]
8786
[-FindTimeLockPollForAttendeesEnabled <Boolean>]
@@ -3320,3 +3319,5 @@ To see the return types, which are also known as output types, that this cmdlet
33203319
## NOTES
33213320

33223321
## RELATED LINKS
3322+
3323+
[Set-OrganizationConfig](https://docs.microsoft.com/powershell/module/exchange/set-organizationconfig)

exchange/exchange-ps/exchange/Set-QuarantinePolicy.md

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,6 @@ This example configures the following permissions in the quarantine policy named
7070

7171
### Example 2
7272
```powershell
73-
$Perms = New-QuarantinePermissions -PermissionToDelete $true
74-
Set-QuarantinePolicy -Identity CustomAccess -EndUserQuarantinePermissions $Perms
75-
```
76-
77-
This example has the same result as the previous example, but uses the EndUserQuarantinePermissions parameter instead.
78-
79-
### Example 3
80-
```powershell
8173
Get-QuarantinePolicy -QuarantinePolicyType GlobalQuarantinePolicy | Set-QuarantinePolicy -MultiLanguageSetting ('English','ChineseSimplified','French') -MultiLanguageCustomDisclaimer ('For more information, contact the Help Desk.','有关更多信息,请联系服务台','Pour plus d'informations, contactez le service d'assistance.') -MultiLanguageSenderName ('Contoso administrator','Contoso管理员','Administrateur Contoso') -OrganizationBrandingEnabled $true
8274
```
8375

@@ -225,9 +217,7 @@ Accept wildcard characters: False
225217
```
226218
227219
### -EndUserQuarantinePermissions
228-
A value for this parameter requires the New-QuarantinePermissions cmdlet. Store the results of the New-QuarantinePermissions command in a variable (for example, `$Perms = New-QuarantinePermissions <permissions>`) and then use the variable name (`$Perms`) for this parameter. For more information, see [New-QuarantinePermissions](https://docs.microsoft.com/powershell/module/exchange/new-quarantinepermissions).
229-
230-
Don't use this parameter with the EndUserQuarantinePermissionsValue parameter.
220+
This parameter is reserved for internal Microsoft use.
231221
232222
```yaml
233223
Type: QuarantinePermissions

teams/teams-ps/teams/New-CsGroupPolicyAssignment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ The group policy assignment rank is set at the time a policy is assigned to a gr
2828

2929
Once a group policy assignment is created, the policy assignment will be propagated to the members of the group, including users that are added to the group after the assignment was created. Propagation time of the initial policy assignments to members of the group varies based on the number of users in the group. Propagation time for subsequent group membership changes also varies based on the number of users being added or removed from the group. For large groups, propagation to all members may take 24 hours or more. When using group policy assignment, the recommended maximum group membership size is 50,000 users per group.
3030

31-
> [!NOTES]
31+
> [!NOTE]
3232
> - Group policy assignment support is available only for the following policy types:
3333
TeamsAppSetupPolicy (App Setup policies), TeamsCallingPolicy (Calling policies), TeamsCallParkPolicy (Call park policies), TeamsChannelsPolicy, TeamsComplianceRecordingPolicy, TenantDialPlan, TeamsEducationAssignmentsAppPolicy, TeamsMeetingBroadcastPolicy (Live Events policies), TeamsMeetingPolicy (Meeting policies), TeamsMessagingPolicy (Messaging policies), TeamsShiftsPolicy, TeamsUpdateManagementPolicy.
3434
> - A given policy type can be assigned to at most 64 groups, across policy instances for that type.

teams/teams-ps/teams/Set-CsPhoneNumberAssignment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ This cmdlet will assign a phone number to a user or a resource account (online a
2424
```powershell
2525
Set-CsPhoneNumberAssignment -Identity <String> -PhoneNumber <String> -PhoneNumberType <String> -LocationId <String> [<CommonParameters>]
2626
```
27-
27+
2828
### Attribute
2929
```powershell
3030
Set-CsPhoneNumberAssignment -Identity <String> -EnterpriseVoice <Boolean> [<CommonParameters>]

0 commit comments

Comments
 (0)