Merge pull request #107305 from dlepow/acrfix4

[ACR] TOC and sku update

Author: GitHubber17

articles/container-registry/TOC.yml

@@ -80,7 +80,7 @@
       items:
       - name: Limit access with virtual network (preview)
         href: container-registry-vnet.md
-      - name: Integrate with Azure Private Link
+      - name: Integrate with Azure Private Link (preview)
         href: container-registry-private-link.md
       - name: Access behind a firewall
         href: container-registry-firewall-access-rules.md
@@ -104,7 +104,7 @@
         href: container-registry-repository-scoped-permissions.md
       - name: Content trust
         href: container-registry-content-trust.md
-      - name: Image scanning with Security Center (preview)
+      - name: Image scanning with Security Center
         href: ../security-center/azure-container-registry-integration.md?toc=/azure/container-registry/toc.json&bc=/azure/container-registry/breadcrumb/toc.json
       - name: Encrypt registry data (preview)
         href: container-registry-customer-managed-keys.md

articles/container-registry/container-registry-private-link.md

@@ -13,7 +13,10 @@ You can [configure DNS settings](../private-link/private-endpoint-overview.md#dn
 
 This feature is available in the **Premium** container registry service tier. For information about registry service tiers and limits, see [Azure Container Registry SKUs](container-registry-skus.md).
 
-## Limitations
+> [!IMPORTANT]
+> This feature is currently in preview, and some [limitations](#preview-limitations) apply. Previews are made available to you on the condition that you agree to the [supplemental terms of use][terms-of-use]. Some aspects of this feature may change prior to general availability (GA).
+
+## Preview limitations
 
 * Currently, you can't set up a private link with a private endpoint on a [geo-replicated registry](container-registry-geo-replication.md). 
 
@@ -367,7 +370,8 @@ To clean up your resources in the portal, navigate to your resource group. Once
 * To learn more about Private Link, see the [Azure Private Link](../private-link/private-link-overview.md) documentation.
 * An alternative to private link is to set up network access rules to restrict registry access. To learn more, see [Restrict access to an Azure container registry using an Azure virtual network or firewall rules](container-registry-vnet.md).
 
-<!-- LINKS - External -->
+<!-- LINKS - external -->
+[terms-of-use]: https://azure.microsoft.com/support/legal/preview-supplemental-terms
 [docker-linux]: https://docs.docker.com/engine/installation/#supported-platforms
 [docker-login]: https://docs.docker.com/engine/reference/commandline/login/
 [docker-mac]: https://docs.docker.com/docker-for-mac/

includes/container-registry-limits.md

@@ -6,7 +6,7 @@ author: dlepow
 
 ms.service: container-registry
 ms.topic: include
-ms.date: 11/05/2019
+ms.date: 03/11/2020
 ms.author: danlep
 ms.custom: include file
 ---
@@ -23,6 +23,8 @@ ms.custom: include file
 | Geo-replication | N/A | N/A | [Supported][geo-replication] |
 | Content trust | N/A | N/A | [Supported][content-trust] |
 | Virtual network access | N/A | N/A | [Preview][vnet] |
+| Private link integration | N/A | N/A | [Preview][plink] |
+| Customer-managed keys | N/A | N/A | [Preview][cmk] |
 | Repository-scoped permissions | N/A | N/A | [Preview][token]|
 | • Tokens | N/A | N/A | 20,000 |
 | • Scope maps | N/A | N/A | 20,000 |
@@ -44,4 +46,6 @@ ms.custom: include file
 [geo-replication]: ../articles/container-registry/container-registry-geo-replication.md
 [content-trust]: ../articles/container-registry/container-registry-content-trust.md
 [vnet]: ../articles/container-registry/container-registry-vnet.md
+[plink]: ../articles/container-registry/container-registry-private-link.md
+[cmk]: ../articles/container-registry/container-registry-customer-managed-keys.md
 [token]: ../articles/container-registry/container-registry-repository-scoped-permissions.md