Skip to content

Commit fa41a56

Browse files
authored
Merge pull request #96240 from MicrosoftDocs/master
Merge master to live Sunday 4:00 PM
2 parents 5cfe977 + 250ad8e commit fa41a56

File tree

5 files changed

+34
-22
lines changed

5 files changed

+34
-22
lines changed

articles/azure-databricks/TOC.yml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -573,10 +573,10 @@
573573
- name: Load Data
574574
href: /azure/databricks/spark/latest/spark-sql/language-manual/load-data
575575
maintainContext: true
576-
- name: Merge Into (Delta Lake on AzureDatabricks
576+
- name: Merge Into (Delta Lake on Azure Databricks
577577
href: /azure/databricks/spark/latest/spark-sql/language-manual/merge-into
578578
maintainContext: true
579-
- name: Optimize (Delta Lake on AzureDatabricks
579+
- name: Optimize (Delta Lake on Azure Databricks
580580
href: /azure/databricks/spark/latest/spark-sql/language-manual/optimize
581581
maintainContext: true
582582
- name: Refresh Table
@@ -714,9 +714,9 @@
714714
- name: Advanced MLlib example
715715
href: /azure/databricks/applications/machine-learning/mllib/advanced-mllib
716716
maintainContext: true
717-
- name: Auto ML
717+
- name: AutoML
718718
items:
719-
- name: Auto ML overview
719+
- name: AutoML overview
720720
href: /azure/databricks/applications/machine-learning/automl/index
721721
maintainContext: true
722722
- name: Hyperopt
@@ -920,7 +920,7 @@
920920
- name: Tumor/Normal pipeline
921921
href: /azure/databricks/applications/genomics/secondary/tumor-normal-pipeline
922922
maintainContext: true
923-
- name: Variant annotation using Pipe Tansformer
923+
- name: Variant annotation using Pipe Transformer
924924
href: /azure/databricks/applications/genomics/secondary/variant-annotation-pipe
925925
maintainContext: true
926926
- name: Variant annotation methods
@@ -1256,7 +1256,7 @@
12561256
- name: Set executor log level
12571257
href: /azure/databricks/kb/execution/set-executor-log-level
12581258
maintainContext: true
1259-
- name: Seralized task is too large
1259+
- name: Serialized task is too large
12601260
href: /azure/databricks/kb/execution/spark-serialized-task-is-too-large
12611261
maintainContext: true
12621262
- name: Jobs
@@ -1367,7 +1367,7 @@
13671367
- name: Notebook autosave fails due to file size limits
13681368
href: /azure/databricks/kb/notebooks/notebook-autosave
13691369
maintainContext: true
1370-
- name: Can't run notebook after cancelling streaming cell
1370+
- name: Can't run notebook after canceling streaming cell
13711371
href: /azure/databricks/kb/notebooks/streaming-notebook-stuck
13721372
maintainContext: true
13731373
- name: Troubleshoot cancel command
@@ -1392,7 +1392,7 @@
13921392
- name: Command fails after installing Bokeh
13931393
href: /azure/databricks/kb/python/python-cmd-fails-tornado-version
13941394
maintainContext: true
1395-
- name: Command cancelled due to library conflict
1395+
- name: Command canceled due to library conflict
13961396
href: /azure/databricks/kb/python/python-command-cancelled
13971397
maintainContext: true
13981398
- name: Command fails with AttributeError
@@ -1610,6 +1610,12 @@
16101610
- name: Supported runtime releases
16111611
href: /azure/databricks/release-notes/runtime/supported
16121612
maintainContext: true
1613+
- name: Databricks Runtime 6.2
1614+
href: /azure/databricks/release-notes/runtime/6.2
1615+
maintainContext: true
1616+
- name: Databricks Runtime 6.2 ML
1617+
href: /azure/databricks/release-notes/runtime/6.2ml
1618+
maintainContext: true
16131619
- name: Databricks Runtime 6.1
16141620
href: /azure/databricks/release-notes/runtime/6.1
16151621
maintainContext: true
@@ -1717,4 +1723,4 @@
17171723
href: https://azure.microsoft.com/regions/services/
17181724
- name: Support options
17191725
href: https://azure.microsoft.com/support/options/
1720-
1726+

articles/governance/policy/toc.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,14 @@
331331
href: /dotnet/api/microsoft.azure.management.resourcemanager.models.policyassignment
332332
- name: Policy Definitions
333333
href: /dotnet/api/microsoft.azure.management.resourcemanager.models.policydefinition
334+
- name: Azure SDK for Python
335+
items:
336+
- name: Policy
337+
href: /python/api/azure-mgmt-resource/azure.mgmt.resource.policy
338+
- name: Policy client
339+
href: /python/api/azure-mgmt-resource/azure.mgmt.resource.policyclient
340+
- name: Policy Insights
341+
href: /python/api/azure-mgmt-policyinsights/azure.mgmt.policyinsights
334342
- name: REST
335343
items:
336344
- name: Events

articles/media-services/video-indexer/live-stream-analysis.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.author: juliako
1515

1616
# Live stream analysis with Video Indexer
1717

18-
Azure Media Services Video Indexer is an Azure service designed to extract deep insights from video and audio files offline. This is to analyze a given media file already created in advance. However, for some use cases it's important to get the media insights from a live feed as quick as possible to unlock operational and other use cases pressed in time. For example, such rich metadata on a live stream could be used by content producers to automate TV production,. For example, the [Endemol Shine Group](https://customers.microsoft.com/story/esg-media-telecommunications-azure), where journalists of a newsroom searched the live feeds to build notification services based on the content.
18+
Azure Media Services Video Indexer is an Azure service designed to extract deep insights from video and audio files offline. This is to analyze a given media file already created in advance. However, for some use cases it's important to get the media insights from a live feed as quick as possible to unlock operational and other use cases pressed in time. For example, such rich metadata on a live stream could be used by content producers to automate TV production.
1919

2020
A solution described in this article, allows customers to use Video Indexer in near real-time resolutions on live feeds. The delay in indexing can be as low as four minutes using this solution, depending on the chunks of data being indexed, the input resolution, the type of content and the compute powered used for this process.
2121

articles/media-services/video-indexer/toc.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
items:
1616
- name: Use Video Indexer API
1717
href: video-indexer-use-apis.md
18-
- name: Samples
19-
items:
20-
- name: Live stream analysis
21-
href: live-stream-analysis.md
2218
- name: Concepts
2319
items:
2420
- name: Overview
@@ -29,6 +25,8 @@
2925
href: manage-multiple-tenants.md
3026
- name: Language identification model
3127
href: language-identification-model.md
28+
- name: Live stream analysis
29+
href: live-stream-analysis.md
3230
- name: Customizing content models
3331
items:
3432
- name: Overview

docfx.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -198,10 +198,10 @@
198198
"articles/governance/policy/**/*.md": "DCtheGeek",
199199
"articles/governance/management-groups/**/*.md": "rthorn17",
200200
"articles/governance/resource-graph/**/*.md": "DCtheGeek",
201-
"articles/ansible/*.*/*.md": "TomArcherMsft",
202-
"articles/chef/*.*/*.md": "TomArcherMsft",
203-
"articles/jenkins/*.*/*.md": "TomArcherMsft",
204-
"articles/terraform/*.*/*.md": "TomArcherMsft",
201+
"articles/ansible/**/*.md": "TomArcherMsft",
202+
"articles/chef/**/*.md": "TomArcherMsft",
203+
"articles/jenkins/**/*.md": "TomArcherMsft",
204+
"articles/terraform/**/*.md": "TomArcherMsft",
205205
"articles/lighthouse/**/*.md": "JnHs",
206206
"articles/azure-resource-manager/**/*.md": "tfitzmac"
207207
},
@@ -406,10 +406,10 @@
406406
"articles/governance/management-groups/**/*.md": "governance",
407407
"articles/governance/resource-graph/**/*.md": "resource-graph",
408408
"articles/industry/**/*.md": "azure-industry",
409-
"articles/ansible/*.*/*.md": "ansible",
410-
"articles/chef/*.*/*.md": "chef",
411-
"articles/jenkins/*.*/*.md": "jenkins",
412-
"articles/terraform/*.*/*.md": "terraform",
409+
"articles/ansible/**/*.md": "ansible",
410+
"articles/chef/**/*.md": "chef",
411+
"articles/jenkins/**/*.md": "jenkins",
412+
"articles/terraform/**/*.md": "terraform",
413413
"articles/lighthouse/**/*.md": "lighthouse",
414414
"articles/azure-resource-manager/**/*.md": "azure-resource-manager"
415415
},

0 commit comments

Comments
 (0)