Skip to content

Commit 3d5bddf

Browse files
authored
Merge pull request #58031 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 bc75450 + 3254766 commit 3d5bddf

File tree

10 files changed

+29
-32
lines changed

10 files changed

+29
-32
lines changed

articles/active-directory/hybrid/how-to-connect-pta-quick-start.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ms.author: billmath
2424
Azure Active Directory (Azure AD) Pass-through Authentication allows your users to sign in to both on-premises and cloud-based applications by using the same passwords. Pass-through Authentication signs users in by validating their passwords directly against on-premises Active Directory.
2525

2626
>[!IMPORTANT]
27-
>If you are migrating from AD FS (or other federation technologies) to Pass-through Authentication, we highly recommend that you follow our detailed deployment guide published [here](https://github.com/Identity-Deployment-Guides/Identity-Deployment-Guides/blob/master/Authentication/Migrating%20from%20Federated%20Authentication%20to%20Pass-through%20Authentication.docx).
27+
>If you are migrating from AD FS (or other federation technologies) to Pass-through Authentication, we highly recommend that you follow our detailed deployment guide published [here](https://aka.ms/adfstoPTADPDownload).
2828
2929
Follow these instructions to deploy Pass-through Authentication on your tenant:
3030

articles/azure-databricks/databricks-stream-from-eventhubs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ After you have finished running the tutorial, you can terminate the cluster. To
363363

364364
![Stop a Databricks cluster](./media/databricks-stream-from-eventhubs/terminate-databricks-cluster.png "Stop a Databricks cluster")
365365

366-
If you do not manually terminate the cluster it will automatically stop, provided you selected the **Terminate after __ minutes of inactivity** checkbox while creating the cluster. In such a case, the cluster will automatically stop if it has been inactive for the specified time.
366+
If you do not manually terminate the cluster it will automatically stop, provided you selected the **Terminate after \_\_ minutes of inactivity** checkbox while creating the cluster. In such a case, the cluster will automatically stop if it has been inactive for the specified time.
367367

368368
## Next steps
369369
In this tutorial, you learned how to:

articles/cost-management/cost-mgt-best-practices.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ Azure Cost Management gives you the tools to plan for, analyze and reduce your s
2121
Cost management is an organizational problem and should be an ongoing practice that begins before you spend money on cloud resources. To successfully implement cost management and optimize costs, your organization must:
2222

2323
- Be prepared with the proper tools for success
24-
- Accountable for costs
24+
- Be accountable for costs
2525
- Take appropriate action to optimize spending
2626

2727
Three key groups, outlined below, must be aligned in your organization to make sure that you successfully manage costs.
2828

29-
- **Finance** - People responsible for approving budge requests across the organization based on cloud spending forecasts. They pay the corresponding bill and assign costs to various teams to drive accountability.
29+
- **Finance** - People responsible for approving budget requests across the organization based on cloud spending forecasts. They pay the corresponding bill and assign costs to various teams to drive accountability.
3030
- **Managers** - Business decision makers in an organization that need to understand cloud spending to find the best spending results.
3131
- **App teams** - Engineers managing cloud resources on a day-to-day basis, developing services to meet the organization's needs. These teams need the flexibility to deliver the most value in their defined budgets.
3232

@@ -41,7 +41,7 @@ Comprehensive, up-front planning allows you to tailor cloud usage to your specif
4141
- What business problem am I solving?
4242
- What usage patterns do I expect from my resources?
4343

44-
Your answers will help you select offer that's right for you. They determine the infrastructure to use and how it's used to maximize your Azure efficiency.
44+
Your answers will help you select the offerings that are right for you. They determine the infrastructure to use and how it's used to maximize your Azure efficiency.
4545

4646
#### Visibility
4747

@@ -57,7 +57,7 @@ Act to reduce your spending. Make the most of it based on the findings gathered
5757

5858
#### Iteration
5959

60-
Everyone in your organization must engage in the cost management lifecycle. They need to stay involved in on an ongoing basis to optimize costs. Be rigorous about this iterative process and make it a key tenant of responsible cloud governance in your organization.
60+
Everyone in your organization must engage in the cost management lifecycle. They need to stay involved on an ongoing basis to optimize costs. Be rigorous about this iterative process and make it a key tenet of responsible cloud governance in your organization.
6161

6262
![Key principles](./media/cost-mgt-best-practices/principles.png)
6363

@@ -100,7 +100,7 @@ To learn more about the various options, visit [How to buy Azure](https://azure.
100100

101101
## Estimate the cost of your solution
102102

103-
Before you deploy any infrastructure, assess how much your solution will cost. The assessment will help you create a budget for your organization for the workload, up-front. Then you can use budget over time to benchmark the validity of your initial estimation. And you can compare it with the actual cost of your deployed solution.
103+
Before you deploy any infrastructure, assess how much your solution will cost. The assessment will help you create a budget for your organization for the workload, up-front. Then you can use a budget over time to benchmark the validity of your initial estimation. And you can compare it with the actual cost of your deployed solution.
104104

105105
### Azure pricing calculator
106106

@@ -120,7 +120,7 @@ Keep informed about how your organization's costs evolve over time. Use the foll
120120

121121
### Organize and tag your resources
122122

123-
Organize your resources with cost in mind. As you create subscriptions and resource groups, think about the teams that are responsible for associated costs. Make sure your reporting keeps your organization in mind. Subscriptions and resource groups provide good buckets to organize and attribute spending across your organization. Tags provide a good way to attribute cost. You can use tags as a filter. And you can use them to group by when you analyze data and investigate costs. Enterprise Agreement customers also can create departments and place subscriptions under them. Cost-based organization in Azure helps keep the relevant people in your organization accountable for reducing their team's spending.
123+
Organize your resources with cost in mind. As you create subscriptions and resource groups, think about the teams that are responsible for associated costs. Make sure your reporting keeps your organization in mind. Subscriptions and resource groups provide good buckets to organize and attribute spending across your organization. Tags provide a good way to attribute cost. You can use tags as a filter. And you can use them to group by when you analyze data and investigate costs. Enterprise Agreement customers can also create departments and place subscriptions under them. Cost-based organization in Azure helps keep the relevant people in your organization accountable for reducing their team's spending.
124124

125125
### Use cost analysis
126126

@@ -152,7 +152,7 @@ Use the following ways to optimize spending.
152152

153153
### Cut out waste
154154

155-
After you've deployed your infrastructure in Azure, it's important to make sure it is being used. The easiest way to start saving immediately is to review your resources and remove any that aren't being used. From there, you should determine your resources are being used as efficiently as possible.
155+
After you've deployed your infrastructure in Azure, it's important to make sure it is being used. The easiest way to start saving immediately is to review your resources and remove any that aren't being used. From there, you should determine if your resources are being used as efficiently as possible.
156156

157157
#### Azure Advisor
158158

@@ -172,13 +172,13 @@ Azure has many discounts that your organization should take advantage of to save
172172

173173
#### Azure Reservations
174174

175-
Azure Reservations allow you to you prepay for one-year or three-years of virtual machine or SQL Database compute capacity. Pre-paying will allow you to get a discount on the resources you use. Azure reservations can significantly reduce your virtual machine or SQL database compute costs — up to 72 percent on pay-as-you-go priceswith one-year or three-year upfront commitment. Reservations provide a billing discount and don't affect the runtime state of your virtual machines or SQL databases.
175+
Azure Reservations allow you to prepay for one-year or three-years of virtual machine or SQL Database compute capacity. Pre-paying will allow you to get a discount on the resources you use. Azure reservations can significantly reduce your virtual machine or SQL database compute costs — up to 72 percent on pay-as-you-go prices with one-year or three-year upfront commitment. Reservations provide a billing discount and don't affect the runtime state of your virtual machines or SQL databases.
176176

177177
For more information, see [What are Azure Reservations?](../billing/billing-save-compute-costs-reservations.md).
178178

179179
#### Use Azure Hybrid Benefit
180180

181-
If you already have Windows Server or SQL Server licenses in your on-premises deployments, you can use the Azure Hybrid Benefit program to save in Azure. With the Windows Server benefit, each license covers the cost of the OS (up to two virtual machines), and you only pay for base compute costs. You can use existing SQL Server licenses to save up to 55 percent on vCore-based SQL Database options. options include SQL Server in Azure Virtual Machines and SQL Server Integration Services.
181+
If you already have Windows Server or SQL Server licenses in your on-premises deployments, you can use the Azure Hybrid Benefit program to save in Azure. With the Windows Server benefit, each license covers the cost of the OS (up to two virtual machines), and you only pay for base compute costs. You can use existing SQL Server licenses to save up to 55 percent on vCore-based SQL Database options. Options include SQL Server in Azure Virtual Machines and SQL Server Integration Services.
182182

183183
For more information, see [Azure Hybrid Benefit savings calculator](https://azure.microsoft.com/pricing/hybrid-benefit/).
184184

articles/data-explorer/node-ingest-data.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ kustoClient.execute(kustoDatabse, query, (err, results) => {
146146
Sign in to [https://dataexplorer.azure.com](https://dataexplorer.azure.com) and connect to your cluster. Run the following command in your database to see if there were any ingestion failures in the last four hours. Replace the database name before running.
147147

148148
```Kusto
149-
.show ingestion failures
150-
| where FailedOn > ago(4h) and Database == "<DatabaseName>"
149+
.show ingestion failures
150+
| where FailedOn > ago(4h) and Database == "<DatabaseName>"
151151
```
152152

153153
Run the following command to view the status of all ingestion operations in the last four hours. Replace the database name before running.
@@ -169,4 +169,4 @@ If you plan to follow our other quickstarts and tutorials, keep the resources yo
169169
## Next steps
170170

171171
> [!div class="nextstepaction"]
172-
> [Write queries](write-queries.md)
172+
> [Write queries](write-queries.md)

articles/firewall/tutorial-firewall-deploy-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Now create the jump and workload virtual machines, and place them in the appropr
115115

116116
Repeat this process to create another virtual machine named **Srv-Work**.
117117

118-
Use the information in the following table to configure the the Srv-Work virtual machine. The rest of the configuration is the same as the Srv-Jump virtual machine.
118+
Use the information in the following table to configure the Srv-Work virtual machine. The rest of the configuration is the same as the Srv-Jump virtual machine.
119119

120120
|Setting |Value |
121121
|---------|---------|

articles/media-services/previous/media-services-inserting-ads-on-client-side.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ A VAST file specifies what ad or ads to display. The following XML is an example
7171
<ClickTracking id="Spare"></ClickTracking>
7272
</VideoClicks>
7373
<MediaFiles>
74-
<MediaFile apiFramework="Windows Media" id="windows_progressive_200" maintainAspectRatio="true" scaleable="true" delivery="progressive" bitrate="200" width="400" height="300" type="video/x-ms-wmv">
74+
<MediaFile apiFramework="Windows Media" id="windows_progressive_200" maintainAspectRatio="true" scalable="true" delivery="progressive" bitrate="200" width="400" height="300" type="video/x-ms-wmv">
7575
<![CDATA[http://www.myserver.com/media/myad_200_4x3.wmv]]>
7676
</MediaFile>
77-
<MediaFile apiFramework="Windows Media" id="windows_progressive_300" maintainAspectRatio="true" scaleable="true" delivery="progressive" bitrate="300" width="400" height="300" type="video/x-ms-wmv">
77+
<MediaFile apiFramework="Windows Media" id="windows_progressive_300" maintainAspectRatio="true" scalable="true" delivery="progressive" bitrate="300" width="400" height="300" type="video/x-ms-wmv">
7878
<![CDATA[http://www.myserver.com/media/myad_300_4x3.wmv]]>
7979
</MediaFile>
8080
</MediaFiles>
@@ -190,16 +190,16 @@ A VMAP file allows you to specify when ad breaks occur, how long each break is,
190190
<Linear>
191191
<Duration>00:00:32</Duration>
192192
<MediaFiles>
193-
<MediaFile apiFramework="Windows Media" id="windows_progressive_200" maintainAspectRatio="true" scaleable="true" delivery="progressive" bitrate="200" width="400" height="300" type="video/x-ms-wmv">
193+
<MediaFile apiFramework="Windows Media" id="windows_progressive_200" maintainAspectRatio="true" scalable="true" delivery="progressive" bitrate="200" width="400" height="300" type="video/x-ms-wmv">
194194
<![CDATA[http://smf.blob.core.windows.net/samples/ads/media/XBOX_HD_DEMO_700_1_000_200_4x3.wmv]]>
195195
</MediaFile>
196-
<MediaFile apiFramework="Windows Media" id="windows_progressive_300" maintainAspectRatio="true" scaleable="true" delivery="progressive" bitrate="300" width="400" height="300" type="video/x-ms-wmv">
196+
<MediaFile apiFramework="Windows Media" id="windows_progressive_300" maintainAspectRatio="true" scalable="true" delivery="progressive" bitrate="300" width="400" height="300" type="video/x-ms-wmv">
197197
<![CDATA[http://smf.blob.core.windows.net/samples/ads/media/XBOX_HD_DEMO_700_2_000_300_4x3.wmv]]>
198198
</MediaFile>
199-
<MediaFile apiFramework="Windows Media" id="windows_progressive_500" maintainAspectRatio="true" scaleable="true" delivery="progressive" bitrate="500" width="400" height="300" type="video/x-ms-wmv">
199+
<MediaFile apiFramework="Windows Media" id="windows_progressive_500" maintainAspectRatio="true" scalable="true" delivery="progressive" bitrate="500" width="400" height="300" type="video/x-ms-wmv">
200200
<![CDATA[http://smf.blob.core.windows.net/samples/ads/media/XBOX_HD_DEMO_700_1_000_500_4x3.wmv]]>
201201
</MediaFile>
202-
<MediaFile apiFramework="Windows Media" id="windows_progressive_700" maintainAspectRatio="true" scaleable="true" delivery="progressive" bitrate="700" width="400" height="300" type="video/x-ms-wmv">
202+
<MediaFile apiFramework="Windows Media" id="windows_progressive_700" maintainAspectRatio="true" scalable="true" delivery="progressive" bitrate="700" width="400" height="300" type="video/x-ms-wmv">
203203
<![CDATA[http://smf.blob.core.windows.net/samples/ads/media/XBOX_HD_DEMO_700_2_000_700_4x3.wmv]]>
204204
</MediaFile>
205205
</MediaFiles>

articles/search/search-howto-large-index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ As data volumes grow or processing needs change, you might find that simple [reb
1717

1818
As a first step towards meeting increased demands, we recommend that you increase the [scale and capacity](search-capacity-planning.md) within the limits of your existing service.
1919

20-
A second step, if you can use [indexers](search-indexer-overview.md), adds mechanisms for scaleable indexing. Indexers come with a built-in scheduler that allows you to parcel out indexing at regular intervals or extend processing beyond the 24-hour window. Additionally, when paired with data source definitions, indexers help you achieve a form of parallelism by partitioning data and using schedules to execute in parallel.
20+
A second step, if you can use [indexers](search-indexer-overview.md), adds mechanisms for scalable indexing. Indexers come with a built-in scheduler that allows you to parcel out indexing at regular intervals or extend processing beyond the 24-hour window. Additionally, when paired with data source definitions, indexers help you achieve a form of parallelism by partitioning data and using schedules to execute in parallel.
2121

2222
### Scheduled indexing for large data sets
2323

articles/sql-data-warehouse/release-notes-october-2018.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: craigg
77
ms.service: sql-data-warehouse
88
ms.topic: conceptual
99
ms.component: manage
10-
ms.date: 11/11/2018
10+
ms.date: 11/14/2018
1111
ms.author: mausher
1212
ms.reviewer: twounder
1313
---
@@ -44,11 +44,8 @@ SQL Data Warehouse (SQL DW) now enables enhanced insights into analytical worklo
4444
- [sys.dm_pdw_waits](https://docs.microsoft.com/sql/relational-databases/system-dynamic-management-views/sys-dm-pdw-waits-transact-sql)
4545
- [sys.dm_pdw_sql_requests](https://docs.microsoft.com/sql/relational-databases/system-dynamic-management-views/sys-dm-pdw-sql-requests-transact-sql)
4646

47-
## Instant Data Movement
48-
In addition to Shuffle, Instant Data Movement now extends to Broadcast and Partition move.
49-
50-
## Scale Up Column Store: Columnstore metadata memory management (SQL Server)
51-
Optimized memory management for column store metadata
47+
## Columnstore memory management
48+
As the number of compressed column store row groups increases, the memory required to manage the internal column segment metadata for those rowgroups increases. As a result, query performance and queries executed against some of the Columnstore Dynamic Management Views (DMVs) can degrade. Improvements have made in this release to optimize the size of the internal metadata for these cases, leading to improved experience and performance for such queries.
5249

5350
## Azure Data Lake Storage Gen2 integration (GA)
5451
Azure SQL Data Warehouse (SQL DW) now has native integration with Azure Data Lake Storage Gen2. Customers can now load data using external tables from ABFS into SQL DW. This functionality enables customers to integrate with their data lakes in Data Lake Storage Gen2.
@@ -82,4 +79,4 @@ Now that you know a bit about SQL Data Warehouse, learn how to quickly [create a
8279
[Twitter]: https://twitter.com/hashtag/SQLDW
8380
[Videos]: https://azure.microsoft.com/documentation/videos/index/?services=sql-data-warehouse
8481
[create a SQL Data Warehouse]: ./create-data-warehouse-portal.md
85-
[Azure glossary]: ../azure-glossary-cloud-terminology.md
82+
[Azure glossary]: ../azure-glossary-cloud-terminology.md

articles/storage/blobs/storage-blob-scalable-app-download-files.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public static void Main(string[] args)
5656
UploadFilesAsync().GetAwaiter().GetResult();
5757

5858
// Uncomment the following line to enable downloading of files from the storage account. This is commented out
59-
// initially to support the tutorial at https://docs.microsoft.com/azure/storage/blobs/storage-blob-scaleable-app-download-files.
59+
// initially to support the tutorial at https://docs.microsoft.com/azure/storage/blobs/storage-blob-scalable-app-download-files.
6060
// DownloadFilesAsync().GetAwaiter().GetResult();
6161
}
6262
catch (Exception ex)
@@ -67,7 +67,7 @@ public static void Main(string[] args)
6767
finally
6868
{
6969
// The following function will delete the container and all files contained in them. This is commented out initially
70-
// As the tutorial at https://docs.microsoft.com/azure/storage/blobs/storage-blob-scaleable-app-download-files has you upload only for one tutorial and download for the other.
70+
// As the tutorial at https://docs.microsoft.com/azure/storage/blobs/storage-blob-scalable-app-download-files has you upload only for one tutorial and download for the other.
7171
if (!exception)
7272
{
7373
// DeleteExistingContainersAsync().GetAwaiter().GetResult();

0 commit comments

Comments
 (0)