Skip to content

Commit 81becee

Browse files
authored
Merge pull request #101025 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents b4b297f + e42c110 commit 81becee

File tree

7 files changed

+9
-8
lines changed

7 files changed

+9
-8
lines changed

articles/active-directory/conditional-access/howto-conditional-access-policy-location.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ With the location condition in Conditional Access, you can control access to you
2727
1. Give your location a name.
2828
1. Choose **IP ranges** if you know the specific externally accessible IPv4 address ranges that make up that location or **Countries/Regions**.
2929
1. Provide the **IP ranges** or select the **Countries/Regions** for the location you are specifying.
30-
* If you chose Countries/Regions, you can optionally choose to include unknown areas.
30+
* If you choose Countries/Regions, you can optionally choose to include unknown areas.
3131
1. Choose **Save**
3232

3333
More information about the location condition in Conditional Access can be found in the article,

articles/azure-maps/traffic-coverage.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ However, Maps does not have the same level of information and accuracy for all c
4242
|Hong Kong SAR |||
4343
|India |||
4444
|Indonesia |||
45+
|Kazakhstan |||
4546
|Macao SAR |||
4647
|Malaysia |||
4748
|New Zealand |||

articles/firewall/tutorial-hybrid-ps.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ This article requires that you run PowerShell locally. You must have the Azure P
4747

4848
There are three key requirements for this scenario to work correctly:
4949

50-
- A User Defined Route (UDR) on the spoke subnet that points to the Azure Firewall IP address as the default gateway. BGP route propagation must be **Disabled** on this route table.
50+
- A User Defined Route (UDR) on the spoke subnet that points to the Azure Firewall IP address as the default gateway. Virtual network gateway route propagation must be **Disabled** on this route table.
5151
- A UDR on the hub gateway subnet must point to the firewall IP address as the next hop to the spoke networks.
5252

5353
No UDR is required on the Azure Firewall subnet, as it learns routes from BGP.
@@ -350,7 +350,7 @@ Set-AzVirtualNetwork
350350
351351
#Now create the default route
352352
353-
#Create a table, with BGP route propagation disabled
353+
#Create a table, with BGP route propagation disabled. The property is now called "Virtual network gateway route propagation," but the API still refers to the parameter as "DisableBgpRoutePropagation."
354354
$routeTableSpokeDG = New-AzRouteTable `
355355
-Name 'UDR-DG' `
356356
-ResourceGroupName $RG1 `

articles/hdinsight/hdinsight-release-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ This release applies both for HDInsight 3.6 and 4.0. HDInsight release is made a
2828
### TLS 1.2 enforcement
2929
Transport Layer Security (TLS) and Secure Sockets Layer (SSL) are cryptographic protocols that provide communications security over a computer network. Learn more about [TLS](https://en.wikipedia.org/wiki/Transport_Layer_Security#SSL_1.0.2C_2.0_and_3.0). HDInsight uses TLS 1.2 on public HTTPs endpoints but TLS 1.1 is still supported for backward compatibility.
3030

31-
From this release, cusotmers can opt-in TLS 1.2 enformence for all connections through TLS 1.2. A new property **minSupportedTlsVersion** is introduced via Azure Resource Manager template for cluster creation. If the property is not set, the cluster still supports 1.0, 1.1 and 1.2, same as today's behavior. Customers can set the value for this property to "1.2", which means that the cluster only supports TLS 1.2 and above.
31+
With this release, customers can opt into TLS 1.2 only for all connections through the public cluster endpoint. To support this, the new property **minSupportedTlsVersion** is introduced and can be specified during cluster creation. If the property is not set, the cluster still supports TLS 1.0, 1.1 and 1.2, which is the same as today's behavior. Customers can set the value for this property to "1.2", which means that the cluster only supports TLS 1.2 and above.
3232

3333
### Bring your own key for disk encryption
3434
All managed disks in HDInsight are protected with Azure Storage Service Encryption (SSE). Data on those disks is encrypted by Microsoft-managed keys by default. Starting from this release, you can Bring Your Own Key (BYOK) for disk encryption and manage it using Azure Key Vault. BYOK encryption is a one-step configuration during cluster creation with no additional cost. Just register HDInsight as a managed identity with Azure Key Vault and add the encryption key when you create your cluster.

articles/machine-learning/how-to-troubleshoot-deployment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ Local web service deployments require a working Docker installation on your loca
346346
347347
348348
myenv = Environment.from_conda_specification(name="env", file_path="myenv.yml")
349-
myenv.docker.base_image = NONE
349+
myenv.docker.base_image = None
350350
myenv.docker.base_dockerfile = "FROM mcr.microsoft.com/azureml/base:intelmpi2018.3-ubuntu16.04\nRUN apt-get update && apt-get install vim -y"
351351
inference_config = InferenceConfig(entry_script="score.py", environment=myenv)
352352
package = Model.package(ws, [model], inference_config)

articles/security/benchmarks/introduction.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ The Azure Security Benchmark includes a collection of high-impact security recom
2424

2525
The Azure Security Benchmark documentation specifies security controls and service recommendations.
2626

27-
- **Security Controls**: The Azure Security Benchmark recommendations are categorized by security controls. Security controls represent high-level vendor-agnostic security requirements, such as network security and data protection. Each security control has a set of security recommendations and instructions that help you implment those recommendations.
27+
- **Security Controls**: The Azure Security Benchmark recommendations are categorized by security controls. Security controls represent high-level vendor-agnostic security requirements, such as network security and data protection. Each security control has a set of security recommendations and instructions that help you implement those recommendations.
2828
- **Service Recommendations**: When available, benchmark recommendations for Azure services will include Azure Security Benchmark recommendations that are tailored specifically for that service.
2929

3030
The terms "Control", "Benchmark", and "Baseline" are used often in the Azure Security Benchmark documentation and it's important to understand how Azure uses those terms.
@@ -35,4 +35,4 @@ The terms "Control", "Benchmark", and "Baseline" are used often in the Azure Sec
3535
| Benchmark | A **benchmark** contains security recommendations for a specific technology, such as Azure. The recommendations are categorized by the control to which they belong. | The Azure Security benchmark comprises the security recommendations specific to the Azure platform |
3636
| Baseline | A **baseline** is the security requirements for an organization. The security requirements are based on benchmark recommendations. Each organization decides which benchmark recommendations to include in their baseline. | The Contoso company creates its security baseline by choosing to require specific recommendations in the Azure Security Benchmark. |
3737

38-
We welcome your feedback on the Azure Security Benchmark! We encourage you to provide comments in the feedback area below. If you prefer to share your input more privately with the Azure Security Benchmark team, you are welcome to fill out the form at https://aka.ms/AzSecBenchmark
38+
We welcome your feedback on the Azure Security Benchmark! We encourage you to provide comments in the feedback area below. If you prefer to share your input more privately with the Azure Security Benchmark team, you are welcome to fill out the form at https://aka.ms/AzSecBenchmark

articles/security/fundamentals/ad-passwordless.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ Passwordless authentication is the wave of the future and the path to a more sec
305305

306306
* Deploy Microsoft Authenticator App for mobility.
307307

308-
* Deploy Windows Hello for Business (1903: stay current).
308+
* Deploy Windows Hello for Business (1909: stay current).
309309

310310
* Deploy FIDO2 devices for users who can't use phones.
311311

0 commit comments

Comments
 (0)