Skip to content

Commit b743e36

Browse files
authored
Merge pull request #13396 from MicrosoftDocs/chrisda
Redo of #12673
2 parents 8836050 + 408a167 commit b743e36

8 files changed

Lines changed: 14 additions & 13 deletions

exchange/exchange-ps/ExchangePowerShell/Get-PerimeterConfig.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Get-PerimeterConfig [[-Identity] <OrganizationIdParameter>]
2727
```
2828

2929
## DESCRIPTION
30-
If you have an on-premises email system, you can use the Set-PerimeterConfig cmdlet to add the IP addresses of your gateway servers to cloud-based safelists (also known as whitelists) to make sure that messages sent from your on-premises email system aren't treated as spam.
30+
If you have an on-premises email system, you can use the Set-PerimeterConfig cmdlet to add the IP addresses of your gateway servers to cloud-based safelists to make sure that messages sent from your on-premises email system aren't treated as spam.
3131

3232
## EXAMPLES
3333

exchange/exchange-ps/ExchangePowerShell/Set-PerimeterConfig.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Set-PerimeterConfig [[-Identity] <OrganizationIdParameter>]
3030
```
3131

3232
## DESCRIPTION
33-
If you have an on-premises email system, you can use the Set-PerimeterConfig cmdlet to add the IP addresses of your gateway servers to cloud-based safelists (also known as whitelists) to make sure that messages sent from your on-premises email system aren't treated as spam.
33+
If you have an on-premises email system, you can use the Set-PerimeterConfig cmdlet to add the IP addresses of your gateway servers to cloud-based safelists to make sure that messages sent from your on-premises email system aren't treated as spam.
3434

3535
## EXAMPLES
3636

teams/teams-ps/MicrosoftTeams/New-CsOnlineLisCivicAddress.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ Accept wildcard characters: False
312312
313313
> Applicable: Microsoft Teams
314314
315-
Specifies the angular distance of a place north or south of the earth's equator using the decimal degrees format. Required for all countries except Australia and Japan where it's optional.
315+
Specifies the angular distance of a place north or south of the earth's equator using the decimal degrees format. Required for all countries/regions except Australia and Japan where it's optional.
316316
317317
```yaml
318318
Type: String
@@ -330,7 +330,7 @@ Accept wildcard characters: False
330330
331331
> Applicable: Microsoft Teams
332332
333-
Specifies the angular distance of a place east or west of the meridian at Greenwich, England, using the decimal degrees format. Required for all countries except Australia and Japan where it's optional.
333+
Specifies the angular distance of a place east or west of the meridian at Greenwich, England, using the decimal degrees format. Required for all countries/regions except Australia and Japan where it's optional.
334334
335335
```yaml
336336
Type: String

teams/teams-ps/MicrosoftTeams/New-CsTenantNetworkSubnet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ New-CsTenantNetworkSubnet -MaskBits <int> -SubnetID <string> [-Description <stri
3333
## DESCRIPTION
3434
Each internal subnet may only be associated with one site. Tenant network subnet is used for Location Based Routing. IP subnets at the location where Teams endpoints can connect to the network must be defined and associated to a defined network in order to enforce toll bypass. Multiple subnets may be associated with the same network site, but multiple sites may not be associated with a same subnet. This association of subnets enables Location-Based routing to locate the endpoints geographically to determine if a given PSTN call should be allowed. Both IPv4 and IPv6 subnets are supported. When determining if a Teams endpoint is located at a site an IPv6 address will be checked for a match first.
3535

36-
When the client is sending the network subnet, please make sure we have already whitelisted the IP address by running this command-let, otherwise the request will be rejected. If you are only adding the IPv4 address by running this command-let, but your client are only sending and IPv6 address, it will be rejected.
36+
When the client is sending the network subnet, please make sure we have already safelisted the IP address by running this command-let, otherwise the request will be rejected. If you are only adding the IPv4 address by running this command-let, but your client are only sending and IPv6 address, it will be rejected.
3737

3838
## EXAMPLES
3939

teams/teams-ps/MicrosoftTeams/Set-CsOnlineLisCivicAddress.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ Set-CsOnlineLisCivicAddress -CivicAddressId <Guid> [-CompanyName <String>] [-Com
3333
Use the `Set-CsOnlineLisCivicAddress` cmdlet to modify limited fields of an existing civic address.
3434

3535
Editing address using this cmdlet is restricted to the following countries/regions:
36-
Australia, Brazil, Canada, Croatia, Czech Republic, Estonia, Hong Kong, Hungary, Israel, Japan, Latvia, Lithuania, Mexico, New Zealand, Poland, Puerto Rico, Romania, Singapore, South Korea, Slovenia, South Africa, United States.
36+
Australia, Brazil, Canada, Croatia, Czech Republic, Estonia, Hong Kong SAR, Hungary, Israel, Japan, Latvia, Lithuania, Mexico, New Zealand, Poland, Puerto Rico, Romania, Singapore, South Korea, Slovenia, South Africa, United States.
3737

38-
If the user runs this cmdlet on one of the unsupported countries, it may interfere with number assignment and potentially is against regulatory requirements, so public use of the API is limited to the above countries/regions.
38+
If the user runs this cmdlet on one of the unsupported countries/regions, it may interfere with number assignment and potentially is against regulatory requirements, so public use of the API is limited to the above countries/regions.
3939

4040
> [!NOTE]
41-
> This cmdlet is only available for public use with limited countries and certain fields. The remaining countries and fields are for Microsoft internal use only.
41+
> This cmdlet is only available for public use with limited countries/regions and certain fields. The remaining countries/regions and fields are for Microsoft internal use only.
4242
4343
## EXAMPLES
4444

@@ -188,7 +188,7 @@ Accept wildcard characters: False
188188
> Applicable: Microsoft Teams
189189
190190
Specifies a new country or region for the civic address.
191-
For public use, restricted to the following countries:
191+
For public use, restricted to the following countries/regions:
192192
193193
**AU, BR, CA, HR, CZ, EE, HK, HU, IL, JP, LV, LT, MX, NZ, PL, PR, RO, SG, KR, SI, ZA, US**
194194

teams/teams-ps/MicrosoftTeams/Set-CsOnlineVoicemailUserSettings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ The following languages are supported:
260260
- "sl-SI" (Slovenian - Slovenia)
261261
- "sv-SE" (Swedish - Sweden)
262262
- "th-TH" (Thai - Thailand)
263-
- "tr-TR" (Turkish - Turkey)
263+
- "tr-TR" (Turkish - Türkiye)
264264
- "vi-VN" (Vietnamese - Viet Nam)
265265
- "zh-CN" (Chinese - Simplified, PRC)
266266
- "zh-TW" (Chinese - Traditional, Taiwan)

teams/teams-ps/MicrosoftTeams/Set-CsTenantFederationConfiguration.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ $list.add("fabrikam.com")
189189
Set-CsTenantFederationConfiguration -AllowedTrialTenantDomains $list
190190
```
191191

192-
Using the `AllowedTrialTenantDomains` parameter, you can whitelist specific "trial-only" tenant domains, while keeping the `ExternalAccessWithTrialTenants` set to `Blocked`. Example 13 shows how you can set or replace domains in the Allowed Trial Tenant Domains using a List collection object.
192+
Using the `AllowedTrialTenantDomains` parameter, you can safelist specific "trial-only" tenant domains, while keeping the `ExternalAccessWithTrialTenants` set to `Blocked`. Example 13 shows how you can set or replace domains in the Allowed Trial Tenant Domains using a List collection object.
193193
First, a List collection is created and domains are added to it, then, simply include the `AllowedTrialTenantDomains` parameter and set the parameter value to the List object.
194194
When this command completes, the Allowed Trial Tenant Domains list will be replaced with those domains.
195195

@@ -284,9 +284,10 @@ Accept wildcard characters: False
284284
285285
> Applicable: Microsoft Teams
286286
287-
You can whitelist specific "trial-only" tenant domains, while keeping the `ExternalAccessWithTrialTenants` set to `Blocked`. This will allow you to protect your organization against majority of tenants that don't have any paid subscriptions, while still being able to collaborate externally with those trusted trial-tenants in the list.
287+
You can safelist specific "trial-only" tenant domains, while keeping the `ExternalAccessWithTrialTenants` set to `Blocked`. This will allow you to protect your organization against majority of tenants that don't have any paid subscriptions, while still being able to collaborate externally with those trusted trial-tenants in the list.
288288

289289
Note:
290+
290291
- The list supports up to maximum 4k domains.
291292
- If `ExternalAccessWithTrialTenants` is set to `Allowed`, then the `AllowedTrialTenantDomains` list will not be checked.
292293
- Any domain in this list that belongs to a tenant with paid subscriptions will be ignored.

teams/teams-ps/MicrosoftTeams/Set-CsTenantTrustedIPAddress.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ External trusted IPs are the Internet external IPs of the enterprise network and
3636

3737
Both IPv4 and IPv6 trusted IP addresses are supported.
3838

39-
When the client is sending the trusted IP address, please make sure we have already whitelisted the IP address by running this command-let, otherwise the request will be rejected. If you are only adding the IPv4 address by running this command-let, but your client are only sending and IPv6 address, it will be rejected.
39+
When the client is sending the trusted IP address, please make sure we have already safelisted the IP address by running this command-let, otherwise the request will be rejected. If you are only adding the IPv4 address by running this command-let, but your client are only sending and IPv6 address, it will be rejected.
4040

4141
## EXAMPLES
4242

0 commit comments

Comments
 (0)