Skip to content

Commit 48b077f

Browse files
authored
Merge pull request #50318 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 c891757 + e718bdf commit 48b077f

File tree

6 files changed

+11
-9
lines changed

6 files changed

+11
-9
lines changed

articles/active-directory/devices/hybrid-azuread-join-plan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ If your environment has managed domains, hybrid Azure AD join supports:
122122

123123
- Pass Through Authentication (PTA) with Seamless Single Sign On (SSO)
124124

125-
- Password Has Sync (PHS) with Seamless Single Sign On (SSO)
125+
- Password Hash Sync (PHS) with Seamless Single Sign On (SSO)
126126

127127
Beginning with version 1.1.819.0, Azure AD Connect provides you with a wizard to configure hybrid Azure AD join. The wizard enables you to significantly simplify the configuration process. For more information, see:
128128

articles/aks/acs-aks-migration.md

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

1515
# Migrating from Azure Container Service (ACS) to Azure Kubernetes Service (AKS)
1616

17-
This goal of this document is to help you plan and execute a successful migration between Azure Container Service with Kubernetes (ACS) and Azure Kubernetes Service (AKS). This guide details the differences between ACS and AKS, provides an overview of the migration process, and should help you make key decisions.
17+
The goal of this document is to help you plan and execute a successful migration between Azure Container Service with Kubernetes (ACS) and Azure Kubernetes Service (AKS). This guide details the differences between ACS and AKS, provides an overview of the migration process, and should help you make key decisions.
1818

1919
## Differences between ACS and AKS
2020

2121
ACS and AKS differ in some key areas that impact migration. You should review and plan to address the following differences before any migration.
2222

23-
* AKS nodes use Managed Disks
23+
* AKS nodes use [Managed Disks](../virtual-machines/windows/managed-disks-overview.md)
2424
* Unmanaged disks will need to be converted before they can be attached to AKS nodes
2525
* Custom `StorageClass` objects for Azure disks will need to be changed from `unmanaged` to `managed`
2626
* Any `PersistentVolumes` will need to use `kind: Managed`

articles/log-analytics/log-analytics-create-pipeline-datacollector-api.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ We are using a classic ETL-type logic to design our pipeline. The architecture w
3838

3939
This article will not cover how to create data or [upload it to an Azure Blob Storage account](../storage/blobs/storage-upload-process-images.md). Rather, we pick the flow up as soon as a new file is uploaded to the blob. From here:
4040

41-
1. A process will detect that new data has been uploaded. Our example uses uses an [Azure Logic App](../logic-apps/logic-apps-overview.md), which has available a trigger to detect new data being uploaded to a blob.
41+
1. A process will detect that new data has been uploaded. Our example uses an [Azure Logic App](../logic-apps/logic-apps-overview.md), which has available a trigger to detect new data being uploaded to a blob.
4242

4343
2. A processor reads this new data and converts it to JSON, the format required by Log Analytics. In this example, we use an [Azure Function](../azure-functions/functions-overview.md) as a lightweight, cost-efficient way of executing our processing code. The function is kicked off by the same Logic App that we used to detect a the new data.
4444

@@ -169,4 +169,4 @@ This article presented a working prototype, the logic behind which can be applie
169169

170170

171171
## Next steps
172-
Learn more about the [Data Collector API](log-analytics-data-collector-api.md) to write data to Log Analytics from any REST API client.
172+
Learn more about the [Data Collector API](log-analytics-data-collector-api.md) to write data to Log Analytics from any REST API client.

articles/sql-database/sql-database-automatic-tuning.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ For an overview of how automatic tuning works and for typical usage scenarios, s
5959

6060
Automatic tuning options available in Azure SQL Database are:
6161
1. **CREATE INDEX** - identifies indexes that may improve performance of your workload, creates indexes, and automatically verifies that performance of queries has improved.
62-
2. **DROP INDEX** - identifies redundant and duplicate indexes daily, and indexes that were not used for a long time (>90 days). Note that this option is not compatible with applications using partition switching and index hints.
62+
2. **DROP INDEX** - identifies redundant and duplicate indexes daily, except for unique indexes, and indexes that were not used for a long time (>90 days). Note that this option is not compatible with applications using partition switching and index hints.
6363
3. **FORCE LAST GOOD PLAN** - identifies SQL queries using execution plan that is slower than the previous good plan, and queries using the last known good plan instead of the regressed plan.
6464

6565
Automatic tuning identifies **CREATE INDEX**, **DROP INDEX**, and **FORCE LAST GOOD PLAN** recommendations that can optimize your database performance and shows them in [Azure portal](sql-database-advisor-portal.md), and exposes them through [T-SQL](https://docs.microsoft.com/sql/t-sql/statements/alter-database-transact-sql-set-options?view=azuresqldb-current) and [REST API](https://docs.microsoft.com/rest/api/sql/serverautomatictuning).

articles/sql-database/sql-database-connect-query-dotnet-visual-studio.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ To complete this quickstart, make sure you have the following:
5050
3. Select **Console App** and enter *sqltest* for the project name.
5151
4. Click **OK** to create and open the new project in Visual Studio
5252
4. In Solution Explorer, right-click **sqltest** and click **Manage NuGet Packages**.
53-
5. On the **Browse**, search for ```System.Data.SqlClient``` and, when found, select it.
53+
5. On the **Browse** tab, search for ```System.Data.SqlClient``` and, when found, select it.
5454
6. In the **System.Data.SqlClient** page, click **Install**.
5555
7. When the install completes, review the changes and then click **OK** to close the **Preview** window.
5656
8. If a **License Acceptance** window appears, click **I Accept**.

articles/virtual-machines/linux/using-cloud-init.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ Cloud-init also works across distributions. For example, you don't use **apt-get
2828

2929
We are actively working with our endorsed Linux distro partners in order to have cloud-init enabled images available in the Azure marketplace. These images will make your cloud-init deployments and configurations work seamlessly with VMs and VM Scale Sets (VMSS). The following table outlines the current cloud-init enabled images availability on the Azure platform:
3030

31-
| Publisher | Offer | SKU | Version | cloud-init ready
32-
|:--- |:--- |:--- |:--- |:--- |:--- |
31+
| Publisher | Offer | SKU | Version | cloud-init ready |
32+
|:--- |:--- |:--- |:--- |:--- |
33+
|Canonical |UbuntuServer |18.04-LTS |latest |yes |
34+
|Canonical |UbuntuServer |17.10 |latest |yes |
3335
|Canonical |UbuntuServer |16.04-LTS |latest |yes |
3436
|Canonical |UbuntuServer |14.04.5-LTS |latest |yes |
3537
|CoreOS |CoreOS |Stable |latest |yes |

0 commit comments

Comments
 (0)