Skip to content

Commit 7de795d

Browse files
committed
Merge branch 'main' into ETR-chrisda
2 parents 562dbc2 + 4231fe5 commit 7de795d

11 files changed

+27
-27
lines changed

exchange/exchange-ps/exchange/New-ApplicationAccessPolicy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ You need to be assigned permissions before you can run this cmdlet. Although thi
3535

3636
You can create a limited number of policies in your organization based on a fixed amount of space. If your organization runs out of space for these policies, you'll see the error: "The total size of App Access Policies exceeded the limit." To maximize the number of policies and reduce the amount of space that's consumed by the policies, set a one space character description for the policy. This method will allow approximately 300 policies (versus a previous limit of 100 policies).
3737

38-
While scope-based resource access like Mail.Read or Calendar.Read is effective to ensure that the application can only read email or events within a mailbox and not do anything else, application access policies allow admins to enforce limits that are based on a list of mailboxes. For example, apps developed for one country shouldn't have access to data from other countries. Or, or a CRM integration application should only access calendars in the Sales organization and no other departments.
38+
While scope-based resource access like Mail.Read or Calendar.Read is effective to ensure that the application can only read email or events within a mailbox and not do anything else, application access policies allow admins to enforce limits that are based on a list of mailboxes. For example, apps developed for one country/region shouldn't have access to data from other countries/regions. Or, or a CRM integration application should only access calendars in the Sales organization and no other departments.
3939

4040
Every API request using the Outlook REST APIs or Microsoft Graph APIs to a target mailbox done by an application is verified using the following rules (in the same order):
4141

exchange/exchange-ps/exchange/New-DeviceConditionalAccessRule.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -862,7 +862,7 @@ Accept wildcard characters: False
862862
```
863863

864864
### -MoviesRating
865-
The MoviesRating parameter species the maximum or most restrictive rating of movies that are allowed on devices. You specify the country rating system to use with the RegionRatings parameter.
865+
The MoviesRating parameter species the maximum or most restrictive rating of movies that are allowed on devices. You specify the country/region rating system to use with the RegionRatings parameter.
866866

867867
Valid values for the MoviesRating parameter are:
868868

@@ -1177,7 +1177,7 @@ Accept wildcard characters: False
11771177
```
11781178

11791179
### -RegionRatings
1180-
The RegionRatings parameter specifies the rating system (country) to use for movie and television ratings with the MoviesRating and TVShowsRating parameters.
1180+
The RegionRatings parameter specifies the rating system (country/region) to use for movie and television ratings with the MoviesRating and TVShowsRating parameters.
11811181

11821182
Valid values for the RegionRating parameter are:
11831183

@@ -1272,7 +1272,7 @@ Accept wildcard characters: False
12721272
```
12731273

12741274
### -TVShowsRating
1275-
The TVShowsRating parameter species the maximum or most restrictive rating of television shows that are allowed on devices. You specify the country rating system to use with the RegionRatings parameter.
1275+
The TVShowsRating parameter species the maximum or most restrictive rating of television shows that are allowed on devices. You specify the country/region rating system to use with the RegionRatings parameter.
12761276

12771277
Valid values for the TVShowsRating parameter are:
12781278

exchange/exchange-ps/exchange/New-DeviceConfigurationRule.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@ Accept wildcard characters: False
836836
```
837837

838838
### -MoviesRating
839-
The MoviesRating parameter species the maximum or most restrictive rating of movies that are allowed on devices. You specify the country rating system to use with the RegionRatings parameter.
839+
The MoviesRating parameter species the maximum or most restrictive rating of movies that are allowed on devices. You specify the country/region rating system to use with the RegionRatings parameter.
840840

841841
Valid values for the MoviesRating parameter are:
842842

@@ -1151,7 +1151,7 @@ Accept wildcard characters: False
11511151
```
11521152

11531153
### -RegionRatings
1154-
The RegionRatings parameter specifies the rating system (country) to use for movie and television ratings with the MoviesRating and TVShowsRating parameters.
1154+
The RegionRatings parameter specifies the rating system (country/region) to use for movie and television ratings with the MoviesRating and TVShowsRating parameters.
11551155

11561156
Valid values for the RegionRating parameter are:
11571157

@@ -1246,7 +1246,7 @@ Accept wildcard characters: False
12461246
```
12471247

12481248
### -TVShowsRating
1249-
The TVShowsRating parameter species the maximum or most restrictive rating of television shows that are allowed on devices. You specify the country rating system to use with the RegionRatings parameter.
1249+
The TVShowsRating parameter species the maximum or most restrictive rating of television shows that are allowed on devices. You specify the country/region rating system to use with the RegionRatings parameter.
12501250

12511251
Valid values for the TVShowsRating parameter are:
12521252

exchange/exchange-ps/exchange/Set-DeviceConditionalAccessRule.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@ Accept wildcard characters: False
855855
```
856856

857857
### -MoviesRating
858-
The MoviesRating parameter species the maximum or most restrictive rating of movies that are allowed on devices. You specify the country rating system to use with the RegionRatings parameter.
858+
The MoviesRating parameter species the maximum or most restrictive rating of movies that are allowed on devices. You specify the country/region rating system to use with the RegionRatings parameter.
859859

860860
Valid values for the MoviesRating parameter are:
861861

@@ -1170,7 +1170,7 @@ Accept wildcard characters: False
11701170
```
11711171

11721172
### -RegionRatings
1173-
The RegionRatings parameter specifies the rating system (country) to use for movie and television ratings with the MoviesRating and TVShowsRating parameters.
1173+
The RegionRatings parameter specifies the rating system (country/region) to use for movie and television ratings with the MoviesRating and TVShowsRating parameters.
11741174

11751175
Valid values for the RegionRating parameter are:
11761176

@@ -1265,7 +1265,7 @@ Accept wildcard characters: False
12651265
```
12661266

12671267
### -TVShowsRating
1268-
The TVShowsRating parameter species the maximum or most restrictive rating of television shows that are allowed on devices. You specify the country rating system to use with the RegionRatings parameter.
1268+
The TVShowsRating parameter species the maximum or most restrictive rating of television shows that are allowed on devices. You specify the country/region rating system to use with the RegionRatings parameter.
12691269

12701270
Valid values for the TVShowsRating parameter are:
12711271

exchange/exchange-ps/exchange/Set-DeviceConfigurationRule.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ Accept wildcard characters: False
829829
```
830830

831831
### -MoviesRating
832-
The MoviesRating parameter species the maximum or most restrictive rating of movies that are allowed on devices. You specify the country rating system to use with the RegionRatings parameter.
832+
The MoviesRating parameter species the maximum or most restrictive rating of movies that are allowed on devices. You specify the country/region rating system to use with the RegionRatings parameter.
833833

834834
Valid values for the MoviesRating parameter are:
835835

@@ -1144,7 +1144,7 @@ Accept wildcard characters: False
11441144
```
11451145

11461146
### -RegionRatings
1147-
The RegionRatings parameter specifies the rating system (country) to use for movie and television ratings with the MoviesRating and TVShowsRating parameters.
1147+
The RegionRatings parameter specifies the rating system (country/region) to use for movie and television ratings with the MoviesRating and TVShowsRating parameters.
11481148

11491149
Valid values for the RegionRating parameter are:
11501150

@@ -1239,7 +1239,7 @@ Accept wildcard characters: False
12391239
```
12401240

12411241
### -TVShowsRating
1242-
The TVShowsRating parameter species the maximum or most restrictive rating of television shows that are allowed on devices. You specify the country rating system to use with the RegionRatings parameter.
1242+
The TVShowsRating parameter species the maximum or most restrictive rating of television shows that are allowed on devices. You specify the country/region rating system to use with the RegionRatings parameter.
12431243

12441244
Valid values for the TVShowsRating parameter are:
12451245

exchange/exchange-ps/exchange/Set-TextMessagingAccount.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ Accept wildcard characters: False
104104
```
105105

106106
### -CountryRegionId
107-
The CountryRegionId parameter specifies the country that your mobile phone is registered in. Although this parameter accepts any valid ISO 3166-1 two-letter country code value (for example, AU for Australia), the following values correspond to the country selections that are available in the text messaging settings in Outlook on the web (formerly known as Outlook Web App):
107+
The CountryRegionId parameter specifies the country/region that your mobile phone is registered in. Although this parameter accepts any valid ISO 3166-1 two-letter country code value (for example, AU for Australia), the following values correspond to the country/region selections that are available in the text messaging settings in Outlook on the web (formerly known as Outlook Web App):
108108

109109
- US
110110
- CA
@@ -165,7 +165,7 @@ Accept wildcard characters: False
165165
```
166166

167167
### -MobileOperatorId
168-
The MobileOperatorId parameter specifies the mobile operator (carrier) for your phone. Although this parameter accepts any random number, the following values correspond to the country and mobile operator selections that are available in the text messaging settings in Outlook on the web (formerly known as Outlook Web App):
168+
The MobileOperatorId parameter specifies the mobile operator (carrier) for your phone. Although this parameter accepts any random number, the following values correspond to the country/region and mobile operator selections that are available in the text messaging settings in Outlook on the web (formerly known as Outlook Web App):
169169

170170
United States:
171171

skype/skype-ps/skype/Set-CsOnlineEnhancedEmergencyServiceDisclaimer.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ ms.reviewer:
1414

1515
## SYNOPSIS
1616
When using Microsoft Teams PSTN Calling Services you need to record your organization's acceptance of the enhanced emergency service terms and conditions. This is done per
17-
country and it needs to be done before you can provide PSTN calling services to Microsoft Teams users in the country.
17+
country/region and it needs to be done before you can provide PSTN calling services to Microsoft Teams users in the country/region.
1818

19-
You can record your organization's acceptance using the Set-CsOnlineEnhancedEmergencyServiceDisclaimer cmdlet at any time. If you haven't accepted it for a given country
19+
You can record your organization's acceptance using the Set-CsOnlineEnhancedEmergencyServiceDisclaimer cmdlet at any time. If you haven't accepted it for a given country/region
2020
you will be prompted to do so by warning information in the Teams PS Module, when you try to assign a phone number to a Microsoft Teams user, or in the Teams admin center,
21-
when you create an emergency address in a country.
21+
when you create an emergency address in a country/region.
2222

23-
Any tenant administrator can accept the terms and conditions and it only needs to be done once per country.
23+
Any tenant administrator can accept the terms and conditions and it only needs to be done once per country/region.
2424

2525
As the output the cmdlet will show the emergency service disclaimer and that it has been accepted. You can use Get-CsOnlineEnhancedEmergencyServiceDisclaimer to see the status of the emergency service disclaimer.
2626

@@ -34,7 +34,7 @@ Set-CsOnlineEnhancedEmergencyServiceDisclaimer -CountryOrRegion <String> [-Versi
3434
## DESCRIPTION
3535
You must run this cmdlet prior to assigning Microsoft Calling Plan phone numbers and locations to voice enabled users or accept the similar disclaimer in the Teams admin center.
3636

37-
Microsoft Calling Plan phone numbers are available in several countries, see [Country and region availability for Audio Conferencing and Calling Plans](https://learn.microsoft.com/MicrosoftTeams/country-and-region-availability-for-audio-conferencing-and-calling-plans/country-and-region-availability-for-audio-conferencing-and-calling-plans)
37+
Microsoft Calling Plan phone numbers are available in several countries/regions, see [Country and region availability for Audio Conferencing and Calling Plans](https://learn.microsoft.com/MicrosoftTeams/country-and-region-availability-for-audio-conferencing-and-calling-plans/country-and-region-availability-for-audio-conferencing-and-calling-plans)
3838

3939

4040
## EXAMPLES

teams/teams-ps/teams/Get-CsOnlineTelephoneNumberCountry.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.reviewer: julienp
1313
# Get-CsOnlineTelephoneNumberCountry
1414

1515
## SYNOPSIS
16-
Use the `Get-CsOnlineTelephoneNumberCountry` cmdlet to get the list of supported countries to search and acquire new telephone numbers. The telephone numbers can then be used to set up calling features for users and services in your organization.
16+
Use the `Get-CsOnlineTelephoneNumberCountry` cmdlet to get the list of supported countries or regions to search and acquire new telephone numbers. The telephone numbers can then be used to set up calling features for users and services in your organization.
1717

1818
## SYNTAX
1919

@@ -22,7 +22,7 @@ PS C:\> Get-CsOnlineTelephoneNumberCountry [<CommonParameters>]
2222
```
2323
## DESCRIPTION
2424

25-
Use the `Get-CsOnlineTelephoneNumberCountry` cmdlet to get the list of supported countries to search and acquire new telephone numbers. The telephone numbers can then be used to set up calling features for users and services in your organization.
25+
Use the `Get-CsOnlineTelephoneNumberCountry` cmdlet to get the list of supported countries or regions to search and acquire new telephone numbers. The telephone numbers can then be used to set up calling features for users and services in your organization.
2626

2727
## EXAMPLES
2828

teams/teams-ps/teams/Get-CsOnlineTelephoneNumberType.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.reviewer: julienp
1313
# Get-CsOnlineTelephoneNumberType
1414

1515
## SYNOPSIS
16-
Use the `Get-CsOnlineTelephoneNumberType` cmdlet to get the list of supported telephone number offerings in a given country. The telephone numbers can then be used to set up calling features for users and services in your organization.
16+
Use the `Get-CsOnlineTelephoneNumberType` cmdlet to get the list of supported telephone number offerings in a given country or region. The telephone numbers can then be used to set up calling features for users and services in your organization.
1717

1818
## SYNTAX
1919

@@ -23,7 +23,7 @@ Get-CsOnlineTelephoneNumberType [-Country] <CountryCode> [<CommonParameters>]
2323

2424
## DESCRIPTION
2525

26-
Use the `Get-CsOnlineTelephoneNumberType` cmdlet to get the list of supported telephone number offerings in a given country. The `NumberType` field in the response is used to indicate the capabilities of a given offering. The telephone numbers can then be used to set up calling features for users and services in your organization.
26+
Use the `Get-CsOnlineTelephoneNumberType` cmdlet to get the list of supported telephone number offerings in a given country or region. The `NumberType` field in the response is used to indicate the capabilities of a given offering. The telephone numbers can then be used to set up calling features for users and services in your organization.
2727

2828

2929
## EXAMPLES
@@ -78,7 +78,7 @@ This example returns the list of supported NumberTypes in Canada.
7878
## PARAMETERS
7979

8080
### Country
81-
Specifies the country that the number offerings belong. The country code uses ISO 3166 standard and the list of supported countries can be found by calling `Get-CsOnlineTelephoneNumberCountry`.
81+
Specifies the country or region that the number offerings belong. The country code uses ISO 3166 standard and the list of supported countries or regions can be found by calling `Get-CsOnlineTelephoneNumberCountry`.
8282

8383
```yaml
8484
Type: String

teams/teams-ps/teams/Get-CsPhoneNumberAssignment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ The ID of the CivicAddress assigned to the phone number.
406406
The ISO country code assigned to the phone number.
407407
408408
### IsoSubDivision
409-
The subdivision within the country assigned to the phone number, for example, the state for US phone numbers.
409+
The subdivision within the country/region assigned to the phone number, for example, the state for US phone numbers.
410410
411411
### LocationId
412412
The ID of the Location assigned to the phone number.

0 commit comments

Comments
 (0)