Skip to content

Commit 15145fa

Browse files
authored
Merge pull request #77306 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 b487491 + 18b913a commit 15145fa

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

articles/active-directory/authentication/concept-password-ban-bad.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Each of the above passwords does not specifically match the banned password "abc
7474

7575
Substring matching is used on the normalized password to check for the user’s first and last name as well as the tenant name (note that tenant name matching is not done when validating passwords on an Active Directory domain controller).
7676

77-
Example: assume that we have a user John Doe that wants to reset his password to “J0hn123fb”. After normalization, this password would become “john123fb”. Substring matching finds that the password contains the user’s first name “John”. Even though “J0hn123fb” was not specifically on either banned password list, substring matching found “John" in the password. Therefore this password would be rejected.
77+
Example: assume that we have a user, Pol, who wants to reset their password to “P0l123fb”. After normalization, this password would become “pol123fb”. Substring matching finds that the password contains the user’s first name “Pol”. Even though “P0l123fb” was not specifically on either banned password list, substring matching found “Pol" in the password. Therefore this password would be rejected.
7878

7979
#### Score Calculation
8080

articles/aks/acs-aks-migration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ACS and AKS differ in some key areas that affect migration. Before any migration
2424
* Unmanaged disks must be converted before you can attach them to AKS nodes.
2525
* Custom `StorageClass` objects for Azure disks must be changed from `unmanaged` to `managed`.
2626
* Any `PersistentVolumes` should use `kind: Managed`.
27-
* AKS supports supports [multiple node pools](https://docs.microsoft.com/en-us/azure/aks/use-multiple-node-pools) (currently in preview).
27+
* AKS supports [multiple node pools](https://docs.microsoft.com/azure/aks/use-multiple-node-pools) (currently in preview).
2828
* Nodes based on Windows Server are currently in [preview in AKS](https://azure.microsoft.com/blog/kubernetes-on-azure/).
2929
* AKS supports a limited set of [regions](https://docs.microsoft.com/azure/aks/quotas-skus-regions).
3030
* AKS is a managed service with a hosted Kubernetes control plane. You might need to modify your applications if you've previously modified the configuration of your ACS masters.

articles/azure-monitor/platform/agents-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Microsoft Azure provides multiple ways to collect different types of data from v
2525
This article describes the differences between them and their capabilities in order for you to determine which one will support your IT service management or general monitoring requirements.
2626

2727
## Azure Diagnostic extension
28-
The [Azure Diagnostics extension](../../azure-monitor/platform/diagnostics-extension-overview.md) (commonly referred to as the Windows Azure Diagnostic (WAD) or Linux Azure Diagnostic (LAD) extension), which has been provided for Azure Cloud Services since it became generally available in 2010, is an agent that delivers simple collection of diagnostic data from an Azure compute resource like a VM, and persist it to Azure storage. Once in storage, you chose to view with one of several available tools, such as [Server Explorer in Visual Studio](/visualstudio/azure/vs-azure-tools-storage-resources-server-explorer-browse-manage) and [Azure Storage Explorer](../../vs-azure-tools-storage-manage-with-storage-explorer.md).
28+
The [Azure Diagnostics extension](../../azure-monitor/platform/diagnostics-extension-overview.md) (commonly referred to as the Windows Azure Diagnostic (WAD) or Linux Azure Diagnostic (LAD) extension), which has been provided for Azure Cloud Services since it became generally available in 2010, is an agent that delivers simple collection of diagnostic data from an Azure compute resource like a VM, and persist it to Azure storage. Once in storage, you choose to view with one of several available tools, such as [Server Explorer in Visual Studio](/visualstudio/azure/vs-azure-tools-storage-resources-server-explorer-browse-manage) and [Azure Storage Explorer](../../vs-azure-tools-storage-manage-with-storage-explorer.md).
2929

3030
You can choose to collect:
3131

@@ -54,7 +54,7 @@ For advanced monitoring where you need to do more than collect metrics and a sub
5454
The Log Analytics agent should be used when you want to:
5555

5656
* Collect data from a variety of sources both within Azure, other cloud providers, and on-premises resources.
57-
* Using one of the Azure Monitor monitoring solutions such as [Azure Monitor for VMs](../insights/vminsights-overview.md), [Azure Monitor for containers](../insights/container-insights-overview.md), etc.
57+
* Use one of the Azure Monitor monitoring solutions such as [Azure Monitor for VMs](../insights/vminsights-overview.md), [Azure Monitor for containers](../insights/container-insights-overview.md), etc.
5858
* Use one of the other Azure management services such as [Azure Security Center](../../security-center/security-center-intro.md), [Azure Automation](../../automation/automation-intro.md), etc.
5959

6060
Previously, several Azure services were bundled as the *Operations Management Suite*, and as a result the Log Analytics agent is shared across services including Azure Security Center and Azure Automation. This includes the full set of features they offer, delivering comprehensive management of your Azure VMs through their lifecycle. Some examples of this are:

articles/hdinsight/hdinsight-restrict-outbound-traffic.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ There are several dependencies that require inbound traffic. The inbound managem
2121

2222
The HDInsight outbound traffic dependencies are almost entirely defined with FQDNs, which don't have static IP addresses behind them. The lack of static addresses means that Network Security Groups (NSGs) can't be used to lock down the outbound traffic from a cluster. The addresses change often enough that one can't set up rules based on the current name resolution and use that to set up NSG rules.
2323

24-
The solution to securing outbound addresses is to use a firewall device that can control outbound traffic based on domain names. Azure Firewall can restrict outbound HTTP and HTTPS traffic based on the FQDN of the destination.
24+
The solution to securing outbound addresses is to use a firewall device that can control outbound traffic based on domain names. Azure Firewall can restrict outbound HTTP and HTTPS traffic based on the FQDN of the destination or [FQDN tags](https://docs.microsoft.com/azure/firewall/fqdn-tags).
2525

2626
## Configuring Azure Firewall with HDInsight
2727

@@ -74,7 +74,7 @@ On the **Add application rule collection** screen, complete the following steps:
7474
1. Enter `https:443` under **Protocol:Port** and `sqm.telemetry.microsoft.com` under **Target FQDNS**.
7575
1. If your cluster is backed by WASB and you are not using the service endpoints above, then add a rule for WASB:
7676
1. In the **Target FQDNs** section, provide a **Name**, and set **Source addresses** to `*`.
77-
1. Enter `wasb` under **Protocol:Port** and `*` under **Target FQDNS**.
77+
1. Enter `http` or [https] depending on if you are using wasb:// or wasbs:// under **Protocol:Port** and the storage account url under **Target FQDNS**.
7878
1. Click **Add**.
7979

8080
![Title: Enter application rule collection details](./media/hdinsight-restrict-outbound-traffic/hdinsight-restrict-outbound-traffic-add-app-rule-collection-details.png)

articles/sql-database/saas-multitenantdb-get-started-deploy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ To complete this tutorial, make sure the following prerequisites are completed:
5252
### Plan the names
5353

5454
In the steps of this section, you provide a *user* value that is used to ensure resource names are globally unique, and a name for the *resource group* which contains all the resources created by a deployment of the app. For a person named *Ann Finley*, we suggest:
55-
- *User:* **af1** *(Her initials, plus a digit. Use a different value (e.g. af2) if you deploy the app a second time.)*
55+
- *User:* **af1** *(Their initials, plus a digit. Use a different value (e.g. af2) if you deploy the app a second time.)*
5656
- *Resource group:* **wingtip-mt-af1** *(wingtip-mt indicates this is the sharded multi-tenant app. Appending the user name af1 correlates the resource group name with the names of the resources it contains.)*
5757

5858
Choose your names now, and write them down.

articles/sql-database/sql-database-tutorial-predictive-model-deploy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ In this article, you'll learn how to:
2929
> * Create a stored procedure that makes predictions using the model
3030
> * Execute the model with new data
3131
32-
In [part one](sql-database-tutorial-predictive-model-prepare-data.md), you learned how how to import a sample database into an Azure SQL database, and then prepare the data to be used for training a predictive model in R.
32+
In [part one](sql-database-tutorial-predictive-model-prepare-data.md), you learned how to import a sample database into an Azure SQL database, and then prepare the data to be used for training a predictive model in R.
3333

3434
In [part two](sql-database-tutorial-predictive-model-build-compare.md), you learned how to create and train multiple models, and then choose the most accurate one.
3535

articles/sql-database/sql-database-tutorial-predictive-model-prepare-data.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ In [part three](sql-database-tutorial-predictive-model-deploy.md), you'll learn
4040

4141
* Azure SQL Database Server with Machine Learning Services enabled - During the public preview, Microsoft will onboard you and enable machine learning for your existing or new databases. Follow the steps in [Sign up for the preview](sql-database-machine-learning-services-overview.md#signup).
4242

43-
* RevoScaleR package - See [RevoScaleR](https://docs.microsoft.com/en-us/sql/advanced-analytics/r/ref-r-revoscaler?view=sql-server-2017#versions-and-platforms) for options to install this package locally.
43+
* RevoScaleR package - See [RevoScaleR](https://docs.microsoft.com/sql/advanced-analytics/r/ref-r-revoscaler?view=sql-server-2017#versions-and-platforms) for options to install this package locally.
4444

4545
* R IDE - This tutorial uses [RStudio Desktop](https://www.rstudio.com/products/rstudio/download/).
4646

@@ -56,7 +56,7 @@ The sample dataset used in this tutorial has been saved to a **.bacpac** databas
5656

5757
1. Download the file [TutorialDB.bacpac](https://sqlchoice.blob.core.windows.net/sqlchoice/static/TutorialDB.bacpac).
5858

59-
1. Follow the directions in [Import a BACPAC file to create an Azure SQL database](https://docs.microsoft.com/en-us/azure/sql-database/sql-database-import), using these details:
59+
1. Follow the directions in [Import a BACPAC file to create an Azure SQL database](https://docs.microsoft.com/azure/sql-database/sql-database-import), using these details:
6060

6161
* Import from the **TutorialDB.bacpac** file you downloaded
6262
* During the public preview, choose the **Gen5/vCore** configuration for the new database

0 commit comments

Comments
 (0)