Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into natportalnote

Author: asudbring

articles/media-services/index.yml

@@ -1,51 +1,123 @@
-### YamlMime:YamlDocument
-documentType: LandingData
-title: Azure Media Services Documentation
+### YamlMime:Hub
+
+title: Azure Media Services documentation # < 60 chars
+summary: Azure Media Services is a cloud-based media workflow platform that enables you to build solutions that require encoding, packaging, content-protection, and live event broadcasting.  
+# brand: aspnet | azure | dotnet | dynamics | m365 | ms-graph | office | power-platform | sql | sql-server | vs | visual-studio | windows | xamarin
+brand: azure
+
 metadata:
-  title: Azure Media Services Documentation | Microsoft Docs
-  description:  Azure Media Services is a cloud-based platform that enables you to build solutions that achieve broadcast-quality video streaming, enhance accessibility and distribution, analyze content, and much more. 
+  title: Azure Media Services documentation # Required; page title displayed in search results. Include the brand. < 60 chars.
+  description: Azure Media Services is a cloud-based media workflow platfo/lrm that enables you to build solutions that require encoding, packaging, content-protection, and live event broadcasting. 
   services: media-services
-  author: juliako
-  manager: femila
-  ms.service: media-services
-  ms.tgt_pltfrm: na
-  ms.devlang: na
-  ms.topic: landing-page
-  ms.date: 03/11/2019
-  ms.author: juliako
-abstract:
-  description: Azure Media Services is a cloud-based media workflow platform that enables you to build solutions that require encoding, packaging, content-protection, and live event broadcasting. Azure Media Services integrates seamlessly with the Azure CDN to scale delivery with CDN services from Akamai and Verizon, enabling customers to select the right solution for their needs—for example, for load balance across content delivery networks. Azure Media Services Video Indexer enables you to extract metadata and insights using AI with the built-in video and audio analyzer presets. You can easily improve accuracy by training the provided AI models with your own content using the Video Indexer API. 
+  ms.service: media-services #Required; service per approved list. service slug assigned to your service by ACOM.
+  ms.subservice: 
+  ms.topic: hub-page # Required
+  ms.collection: collection
+  author: Juliako #Required; your GitHub user alias, with coacrrect capitalization.
+  ms.author: juliako #Required; microsoft alias of author; optional team alias.
+  ms.date: 07//2020 #Required; mm/dd/yyyy format.
+
+# highlightedContent section (optional)
+# Maximum of 8 items
+highlightedContent:
+# itemType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
+  items:
+    # Card
+    - title: About Azure Media Services v3
+      itemType: overview
+      url: ./latest/media-services-overview.md
+    # Card
+    - title: Azure Media Services v3 concepts 
+      itemType: concept
+      url: ./latest/concepts-overview.md
+    - title: About Azure Media Services Video Indexer
+      itemType: overview
+      url: ./video-indexer/video-indexer-overview.md    
+    - title: Compare Media Services v3 presets and Video Indexer
+      itemType: concept
+      url: ./video-indexer/compare-video-indexer-with-media-services-presets.md    
+    - title: About Azure Media Services v2 (legacy)
+      itemType: overview
+      url: ./previous/media-services-overview.md  
+    - title: Migrate Media Services v2 to v3
+      itemType: concept
+      url: ./latest/migrate-from-v2-to-v3.md      
+    - title: Azure Media Services specifications
+      itemType: concept
+      url: media-services-specifications-live-timed-metadata.md
+
+conceptualContent: 
+# itemType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | whats-new
+  items: 
+    - title: Develop with Media Services v3 API
+      links:
+          - url: ./latest/media-services-apis-overview.md
+            itemType: concept
+            text: Develop with Media Services v3
+          - url: https://docs.microsoft.com/samples/browse/?products=azure-media-services
+            itemType: sample
+            text: Code samples
+            
+    - title: Stream live 
+      links: 
+        - url: ./latest/live-streaming-overview.md 
+          itemType: concept
+          text: Live streaming 
+        - url: ./latest/recommended-on-premises-live-encoders.md
+          itemType: concept
+          text: Recommended live streaming encoders
+        - url: ./latest/stream-live-tutorial-with-api.md
+          itemType: tutorial
+          text: Stream live
+
+    - title: Stream on demand
+      links:
+        - url: ./latest/assets-concept.md 
+          itemType: concept
+          text: Uploading
+        - url: ./latest/encoding-concept.md 
+          itemType: concept
+          text: Encoding   
+        - url: ./latest/stream-files-tutorial-with-rest.md
+          itemType: tutorial        
+          text: Encode remote file and stream
+        - url: ./latest/stream-files-tutorial-with-api.md
+          itemType: tutorial   
+          text: Encode uploaded file and stream
 
-sections:
+    - title: Encrypt content
+      links:
+          - url: ./latest/content-protection-overview.md 
+            itemType: concept
+            text: Protection
+          - url: ./latest/protect-with-aes128.md
+            itemType: tutorial
+            text: Encrypt dynamically with AES-128        
+          - url: ./latest/protect-with-drm.md
+            itemType: tutorial
+            text: Encrypt dynamically with DRM
+            
+    - title: Analyze content
+      links:
+          - url: ./latest/analyzing-video-audio-files-concept.md
+            itemType: concept
+            text: Media analytics
+          - url: ./latest/analyze-videos-tutorial-with-api.md
+            itemType: tutorial
+            text: Analyze videos            
+                     
+additionalContent:
+  sections:
+    - items:      
+      - title: Azure Storage
+        summary: Learn about block blobs and containers
+        url: https://docs.microsoft.com/azure/storage/        
+      - title: CDN
+        summary: Use the power of the Azure CDN to stream content at scale with services from Akamai and Verizon or load balance across multiple content delivery networks
+        url: https://docs.microsoft.com/azure/cdn         
+      - title: Event Grid
+        summary: Learn how to use Azure Event Grid to react to relevant events     
+        url: https://docs.microsoft.com/azure/event-grid/
+        
 
-  - items:
-    - type: list
-      style: cards
-      className: cardsM
-      columns: 2
-      items:
-        - href: /azure/media-services/latest/
-          html: <p>Encode, package, protect your content, stream videos on-demand, broadcast live, analyze with Media Services v3.</p>
-          image:
-            src: /azure/media-services/latest/media/index/AMSIcons-encoding.svg
-          title: Azure Media Services v3 
-        - href: /azure/media-services/previous/
-          html: <p>Encode, package, protect and more. This is the legacy service that is in maintenance. Customers are encouraged to migrate to Media Services v3 where new features and enhancements are being made.</p>          
-          image:
-            src:
-          title: Azure Media Services v2 (legacy)
-        - href: /azure/cdn/
-          html: <p>Use the power of the Azure CDN to stream content at scale with services from Akamai and Verizon or load balance across multiple content delivery networks.</p>
-          image:
-            src: /azure/cdn/media/index/cdn.svg
-          title: CDN
-        - href: https://amp.azure.net/libs/amp/latest/docs/index.html
-          html: <p>Play back media content from Microsoft Azure Media Services on a wide variety of browsers and devices.</p>
-          image:
-            src: /azure/media-services/latest/media/index/AMSIcons-Player.svg
-          title: Azure Media Player
-        - href: /azure/media-services/video-indexer/
-          html: <p>Extract the insights from your video and audio files using Video Indexer.</p>
-          image:
-            src: media/index/AMSIcons-media_analytics.svg
-          title: Azure Media Services Video Indexer
+  

articles/sql-database/transparent-data-encryption-byok-azure-sql-remove-tde-protector.md

@@ -10,7 +10,7 @@ ms.topic: conceptual
 author: jaszymas
 ms.author: jaszymas
 ms.reviewer: vanto
-ms.date: 02/12/2020
+ms.date: 02/24/2020
 ---
 # Remove a Transparent Data Encryption (TDE) protector using PowerShell
 
@@ -37,11 +37,11 @@ For installation, see [Install Azure CLI](/cli/azure/install-azure-cli).
 
 This how-to guide describes how to respond to a potentially compromised TDE protector for an Azure SQL Database or Data Warehouse that is using TDE with customer-managed keys in Azure Key Vault - Bring Your Own Key (BYOK) support. To learn more about BYOK support for TDE, see the [overview page](transparent-data-encryption-byok-azure-sql.md).
 
-The following procedures should only be done in extreme cases or in test environments. Review the how-to guide carefully, as deleting actively used TDE protectors from Azure Key Vault can result in **data loss**.
+The following procedures should only be done in extreme cases or in test environments. Review the how-to guide carefully, as deleting actively used TDE protectors from Azure Key Vault will result in **database unavailability**.
 
 If a key is ever suspected to be compromised, such that a service or user had unauthorized access to the key, it’s best to delete the key.
 
-Keep in mind that once the TDE protector is deleted in Key Vault, **all connections to the encrypted databases under the server are blocked, and these databases go offline and get dropped within 24 hours**. Old backups encrypted with the compromised key are no longer accessible.
+Keep in mind that once the TDE protector is deleted in Key Vault, in up to 10 minutes all encrypted databases will start denying all connections with the corresponding error message and change its state to [Inaccessible](https://docs.microsoft.com/azure/sql-database/transparent-data-encryption-byok-azure-sql#inaccessible-tde-protector).
 
 The following steps outline how to check the TDE Protector thumbprints still in use by Virtual Log Files (VLF) of a given database.
 The thumbprint of the current TDE protector of the database, and the database ID can be found by running: