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

timlt · timlt · commit da97baf290f4 · 2019-11-11T09:18:43.000-08:00
diff --git a/articles/active-directory/develop/app-registrations-training-guide-for-app-registrations-legacy-users.md b/articles/active-directory/develop/app-registrations-training-guide-for-app-registrations-legacy-users.md
diff --git a/articles/container-registry/container-registry-auth-aci.md b/articles/container-registry/container-registry-auth-aci.md
@@ -1,5 +1,5 @@
 ---
-title: Authenticate with Azure Container Registry from Azure Container Instances
+title: Access Azure Container Registry from Container Instances
 description: Learn how to provide access to images in your private container registry from Azure Container Instances by using an Azure Active Directory service principal.
 services: container-registry
 author: dlepow
diff --git a/articles/container-registry/container-registry-geo-replication.md b/articles/container-registry/container-registry-geo-replication.md
@@ -1,6 +1,6 @@
 ---
 title: Geo-replicating an Azure container registry
-description: Get started creating and managing geo-replicated Azure container registries.
+description: Get started creating and managing a geo-replicated Azure container registry, which enables the registry to serve multiple regions with multi-master regional replicas.
 services: container-registry
 author: stevelas
 manager: gwallace
@@ -116,7 +116,7 @@ In the preceding example, Contoso consolidated two registries down to one, addin
  
 A Docker client that pushes an image to a geo-replicated registry may not push all image layers and its manifest to a single replicated region. This may occur because Azure Traffic Manager routes registry requests to the network-closest replicated registry. If the registry has two *nearby* replication regions, image layers and the manifest could be distributed to the two sites, and the push operation fails when the manifest is validated. This problem occurs because of the way the DNS name of the registry is resolved on some Linux hosts. This issue doesn't occur on Windows, which provides a client-side DNS cache.
  
-If this problem occurs, one solution is to apply a client-side DNS cache such as `dnsmasq` on the Linux host. This helps ensure that the registry's name is resolved consistently. If you're using a Linux VM in Azure to push to a registry, see options in [DNS Name Resolution options for Linux virtual machines in Azure](https://docs.microsoft.com/azure/virtual-machines/linux/azure-dns).
+If this problem occurs, one solution is to apply a client-side DNS cache such as `dnsmasq` on the Linux host. This helps ensure that the registry's name is resolved consistently. If you're using a Linux VM in Azure to push to a registry, see options in [DNS Name Resolution options for Linux virtual machines in Azure](../virtual-machines/linux/azure-dns.md).
 
 To optimize DNS resolution to the closest replica when pushing images, configure a geo-replicated registry in the same Azure regions as the source of the push operations, or the closest region when working outside of Azure.
 
diff --git a/articles/container-registry/container-registry-get-started-azure-cli.md b/articles/container-registry/container-registry-get-started-azure-cli.md
@@ -1,5 +1,5 @@
 ---
-title: Quickstart - Create a private Docker registry in Azure - Azure CLI
+title: Quickstart - Create registry - Azure CLI - Azure Container Registry
 description: Quickly learn to create a private Docker container registry with the Azure CLI.
 services: container-registry
 author: dlepow
diff --git a/articles/container-registry/container-registry-get-started-portal.md b/articles/container-registry/container-registry-get-started-portal.md
@@ -1,6 +1,6 @@
 ---
-title: Quickstart - Create a private Docker registry in Azure - Azure portal
-description: Quickly learn to create a private Docker container registry with the Azure portal.
+title: Quickstart - Create registry in portal - Azure Container Registry
+description: Quickly learn to create a private Docker registry in Azure Container Registry with the Azure portal.
 services: container-registry
 author: dlepow
 manager: gwallace
diff --git a/articles/container-registry/container-registry-get-started-powershell.md b/articles/container-registry/container-registry-get-started-powershell.md
@@ -1,6 +1,6 @@
 ﻿---
-title: Quickstart - Create a private Docker registry in Azure - PowerShell
-description: Quickly learn to create a private Docker container registry in Azure with PowerShell.
+title: Quickstart - Create registry - Powershell - Azure Container Registry
+description: Quickly learn to create a private Docker registry in Azure Container Registry with PowerShell
 services: container-registry
 author: dlepow
 manager: gwallace
diff --git a/articles/container-registry/container-registry-image-formats.md b/articles/container-registry/container-registry-image-formats.md
@@ -1,6 +1,6 @@
 ---
 title: Azure Container Registry content formats
-description: Learn about supported content formats in Azure Container Registry.
+description: Learn about content formats supported by Azure Container Registry, including Docker-compatible container images, Helm charts, OCI images, and OCI artifacts.
 services: container-registry
 author: dlepow
 manager: gwallace
diff --git a/articles/container-registry/container-registry-image-tag-version.md b/articles/container-registry/container-registry-image-tag-version.md
@@ -1,6 +1,6 @@
 ---
 title: Tag and version images in Azure Container Registry
-description: Best practices for tagging and versioning Docker container images
+description: Best practices for tagging and versioning Docker container images when pushing images to and pulling images from an Azure container registry
 services: container-registry
 author: stevelasker
 
diff --git a/articles/container-registry/container-registry-quickstart-task-cli.md b/articles/container-registry/container-registry-quickstart-task-cli.md
@@ -1,5 +1,5 @@
 ---
-title: Quickstart - Build and run a container image in Azure Container Registry
+title: Quickstart - Build & run container image in Azure Container Registry
 description: Quickly run tasks with Azure Container Registry to build and run a container image on-demand, in the cloud.
 services: container-registry
 author: dlepow
diff --git a/articles/container-registry/container-registry-repositories.md b/articles/container-registry/container-registry-repositories.md
@@ -1,6 +1,6 @@
 ---
 title: Azure Container Registry repositories in the Azure portal
-description: How to view Azure Container Registry repositories in the Azure portal.
+description: Use the Azure portal to view Azure Container Registry repositories, which host Docker container images and other supported artifacts.
 services: container-registry
 author: cristy
 manager: gwallace
diff --git a/articles/container-registry/container-registry-tasks-cross-registry-authentication.md b/articles/container-registry/container-registry-tasks-cross-registry-authentication.md
@@ -1,6 +1,6 @@
 ---
-title: Cross-registry authentication in an Azure Container Registry task
-description: Enable a managed identity for Azure Resources in an Azure Container Registry (ACR) task to allow the task to access another private container registry.
+title: Cross-registry authentication from Azure Container Registry task
+description: Configure an Azure Container Registry Task (ACR Task) to access another private Azure container registry by using a managed identity for Azure Resources
 services: container-registry
 author: dlepow
 
diff --git a/articles/container-registry/container-registry-tasks-multi-step.md b/articles/container-registry/container-registry-tasks-multi-step.md
@@ -1,6 +1,6 @@
 ---
-title: Automate image build, test, and patch with Azure Container Registry multi-step tasks
-description: An introduction to multi-step tasks, a feature of ACR Tasks in Azure Container Registry that provides task-based workflows for building, testing, and patching container images in the cloud.
+title: Multi-step task to build, test & patch image - Azure Container Registry
+description: Introduction to multi-step tasks, a feature of ACR Tasks in Azure Container Registry that provides task-based workflows for building, testing, and patching container images in the cloud.
 services: container-registry
 author: dlepow
 manager: gwallace
diff --git a/articles/container-registry/container-registry-tasks-overview.md b/articles/container-registry/container-registry-tasks-overview.md
@@ -1,5 +1,5 @@
 ---
-title: Automate building and patching container images with Azure Container Registry Tasks (ACR Tasks)
+title: Azure Container Registry Tasks - overview
 description: An introduction to ACR Tasks, a suite of features in Azure Container Registry that provides secure, automated container image build, management, and patching in the cloud.
 services: container-registry
 author: dlepow
diff --git a/articles/container-registry/container-registry-tasks-scheduled.md b/articles/container-registry/container-registry-tasks-scheduled.md
@@ -1,6 +1,6 @@
 ---
-title: Schedule Azure Container Registry tasks
-description: Set timers to run an Azure Container Registry task on a defined schedule.
+title: Schedule Azure Container Registry Tasks
+description: Learn how to run an Azure Container Registry Task on a defined schedule by setting one or more timer triggers
 services: container-registry
 author: dlepow
 manager: gwallace
@@ -12,7 +12,7 @@ ms.author: danlep
 ---
 # Run an ACR task on a defined schedule
 
-This article shows you how to run an [ACR task](container-registry-tasks-overview.md) on a schedule. Schedule a task by setting up one or more *timer triggers*.
+This article shows you how to run an [ACR Task](container-registry-tasks-overview.md) on a schedule. Schedule a task by setting up one or more *timer triggers*.
 
 Scheduling a task is useful for scenarios like the following:
 
diff --git a/articles/container-registry/container-registry-tutorial-base-image-update.md b/articles/container-registry/container-registry-tutorial-base-image-update.md
@@ -1,5 +1,5 @@
 ---
-title: Tutorial - Automate container image builds on base image update - Azure Container Registry Tasks
+title: Tutorial - Trigger image build on base image update - Azure Container Registry
 description: In this tutorial, you learn how to configure an Azure Container Registry Task to automatically trigger container image builds in the cloud when a base image is updated.
 services: container-registry
 author: dlepow
diff --git a/articles/container-registry/container-registry-tutorial-build-task.md b/articles/container-registry/container-registry-tutorial-build-task.md
@@ -1,5 +1,5 @@
 ---
-title: Tutorial - Automate container image builds - Azure Container Registry Tasks
+title: Tutorial - Build image on code commit - Azure Container Registry Tasks
 description: In this tutorial, you learn how to configure an Azure Container Registry Task to automatically trigger container image builds in the cloud when you commit source code to a Git repository.
 services: container-registry
 author: dlepow
diff --git a/articles/container-registry/container-registry-tutorial-deploy-app.md b/articles/container-registry/container-registry-tutorial-deploy-app.md
@@ -1,5 +1,5 @@
 ---
-title: Tutorial - Deploy app from geo-replicated Docker registry in Azure
+title: Tutorial - Deploy app from geo-replicated Azure Container Registry
 description: Deploy a Linux-based web app to two different Azure regions using a container image from a geo-replicated Azure container registry. Part two of a three-part series.
 services: container-registry
 author: dlepow
diff --git a/articles/container-registry/container-registry-tutorial-deploy-update.md b/articles/container-registry/container-registry-tutorial-deploy-update.md
@@ -1,6 +1,6 @@
 ---
-title: Tutorial - Push updated container image to regional Azure app deployments
-description: Push a modified Docker image to your geo-replicated Azure container registry, then see the changes automatically deployed to web apps running in multiple regions. Part three of a three-part series.
+title: Tutorial - Push update to geo-replicated Azure Container Registry
+description: Push an updated Docker image to your geo-replicated Azure container registry, then see the changes automatically deployed to web apps running in multiple regions. Part three of a three-part series.
 services: container-registry
 author: dlepow
 manager: gwallace
diff --git a/articles/container-registry/container-registry-tutorial-multistep-task.md b/articles/container-registry/container-registry-tutorial-multistep-task.md
@@ -1,5 +1,5 @@
 ---
-title: Tutorial - Multi-step container tasks - Azure Container Registry Tasks
+title: Tutorial - Multi-step task workflow - Azure Container Registry Tasks
 description: In this tutorial, you learn how to configure an Azure Container Registry Task to automatically trigger a multi-step workflow to build, run, and push container images in the cloud when you commit source code to a Git repository.
 services: container-registry
 author: dlepow
diff --git a/articles/container-registry/container-registry-tutorial-prepare-registry.md b/articles/container-registry/container-registry-tutorial-prepare-registry.md
@@ -1,5 +1,5 @@
 ---
-title: Tutorial - Create a geo-replicated Docker registry in Azure
+title: Tutorial - Create a geo-replicated Azure Container Registry
 description: Create an Azure container registry, configure geo-replication, prepare a Docker image, and deploy it to the registry. Part one of a three-part series.
 services: container-registry
 author: dlepow
diff --git a/articles/container-registry/container-registry-tutorial-quick-task.md b/articles/container-registry/container-registry-tutorial-quick-task.md
@@ -1,5 +1,5 @@
 ---
-title: Tutorial - Build container images in the cloud - Azure Container Registry Tasks
+title: Tutorial - Quick container image build - Azure Container Registry Tasks
 description: In this tutorial, you learn how to build a Docker container image in Azure with Azure Container Registry Tasks (ACR Tasks), then deploy it to Azure Container Instances.
 services: container-registry
 author: dlepow
diff --git a/articles/container-registry/container-registry-vnet.md b/articles/container-registry/container-registry-vnet.md
@@ -1,5 +1,5 @@
 ---
-title: Restrict access to an Azure container registry from a virtual network
+title: Restrict access to Azure Container Registry with a virtual network
 description: Allow access to an Azure container registry only from resources in an Azure virtual network or from public IP address ranges.
 services: container-registry
 author: dlepow
@@ -50,7 +50,7 @@ If instead you need to set up access rules for resources to reach a container re
 
 ## About network rules for a container registry
 
-An Azure container registry by default accepts connections over the internet from hosts on any network. With a virtual network, you can allow only Azure resources such as an AKS cluster or Azure VM to securely access the registry, without crossing a network boundary. You can also configure network firewall rules to whitelist specific public internet IP address ranges. 
+An Azure container registry by default accepts connections over the internet from hosts on any network. With a virtual network, you can allow only Azure resources such as an AKS cluster or Azure VM to securely access the registry, without crossing a network boundary. You can also configure network firewall rules to allow only specific public internet IP address ranges. 
 
 To limit access to a registry, first change the default action of the registry so that it denies all network connections. Then, add network access rules. Clients granted access via the network rules must continue to [authenticate to the container registry](https://docs.microsoft.com/azure/container-registry/container-registry-authentication) and be authorized to access the data.
 
diff --git a/articles/service-fabric/service-fabric-backuprestoreservice-quickstart-azurecluster.md b/articles/service-fabric/service-fabric-backuprestoreservice-quickstart-azurecluster.md
@@ -124,21 +124,6 @@ First you need to enable the _backup and restore service_ in your cluster. Get t
 
 4. Once you have updated your cluster template with the preceding changes, apply them and let the deployment/upgrade complete. Once complete, the _backup and restore service_ starts running in your cluster. The Uri of this service is `fabric:/System/BackupRestoreService` and the service can be located under system service section in the Service Fabric explorer. 
 
-### Using Service Fabric Explorer
-
-1. Make sure Advanced Mode is enabled.
-
-    ![Enable Advanced Mode][2]
-
-2. Select an application and go to action. Click Enable/Update Application Backup.
-
-    ![Enable Application Backup][3] 
-
-3. Finally, select the desired policy and click Enable Backup.
-
-    ![Select Policy][4]
-
-
 ## Enabling periodic backup for Reliable Stateful service and Reliable Actors
 Let's walk through steps to enable periodic backup for Reliable Stateful service and Reliable Actors. These steps assume
 - That the cluster is setup using X.509 security with _backup and restore service_.
@@ -222,6 +207,17 @@ $url = "https://mysfcluster.southcentralus.cloudapp.azure.com:19080/Applications
 Invoke-WebRequest -Uri $url -Method Post -Body $body -ContentType 'application/json' -CertificateThumbprint '1b7ebe2174649c45474a4819dafae956712c31d3'
 ``` 
 
+#### Using Service Fabric Explorer
+
+1. Select an application and go to action. Click Enable/Update Application Backup.
+
+    ![Enable Application Backup][3]
+
+2. Finally, select the desired policy and click Enable Backup.
+
+    ![Select Policy][4]
+
+
 ### Verify that periodic backups are working
 
 After enabling backup at the application level, all partitions belonging to Reliable Stateful services and Reliable Actors under the application will start getting backed-up periodically as per the associated backup policy. 
@@ -308,7 +304,6 @@ To view backups in Service Fabric Explorer, navigate to a partition and select t
 
 [0]: ./media/service-fabric-backuprestoreservice/partition-backedup-health-event-azure.png
 [1]: ./media/service-fabric-backuprestoreservice/enable-backup-restore-service-with-portal.png
-[2]: ./media/service-fabric-backuprestoreservice/advanced-mode.png
 [3]: ./media/service-fabric-backuprestoreservice/enable-app-backup.png
 [4]: ./media/service-fabric-backuprestoreservice/enable-application-backup.png
 [5]: ./media/service-fabric-backuprestoreservice/backup-enumeration.png
diff --git a/articles/service-fabric/service-fabric-backuprestoreservice-quickstart-standalonecluster.md b/articles/service-fabric/service-fabric-backuprestoreservice-quickstart-standalonecluster.md
@@ -113,19 +113,7 @@ First you need to enable the _backup and restore service_ in your cluster. Get t
 
 4. Once you have updated your cluster configuration file with the preceding changes, apply them and let the deployment/upgrade complete. Once complete, the _backup and restore service_ starts running in your cluster. The Uri of this service is `fabric:/System/BackupRestoreService` and the service can be located under system service section in the Service Fabric explorer. 
 
-### Using Service Fabric Explorer
 
-1. Make sure Advanced Mode is enabled.
-
-    ![Enable Advanced Mode][2]
-
-2. Select an application and go to action. Click Enable/Update Application Backup.
-
-    ![Enable Application Backup][3] 
-
-3. Finally, select the desired policy and click Enable Backup.
-
-    ![Select Policy][4]
 
 ## Enabling periodic backup for Reliable Stateful service and Reliable Actors
 Let's walk through steps to enable periodic backup for Reliable Stateful service and Reliable Actors. These steps assume
@@ -204,6 +192,16 @@ $url = "http://localhost:19080/Applications/SampleApp/$/EnableBackup?api-version
 Invoke-WebRequest -Uri $url -Method Post -Body $body -ContentType 'application/json'
 ``` 
 
+#### Using Service Fabric Explorer
+
+1. Select an application and go to action. Click Enable/Update Application Backup.
+
+    ![Enable Application Backup][3] 
+
+2. Finally, select the desired policy and click Enable Backup.
+
+    ![Select Policy][4]
+
 ### Verify that periodic backups are working
 
 After enabling backup for the application, all partitions belonging to Reliable Stateful services and Reliable Actors under the application will start getting backed-up periodically as per the associated backup policy.
@@ -288,8 +286,6 @@ To view backups in Service Fabric Explorer, navigate to a partition and select t
 - [Backup restore REST API reference](https://docs.microsoft.com/rest/api/servicefabric/sfclient-index-backuprestore)
 
 [0]: ./media/service-fabric-backuprestoreservice/partition-backedup-health-event.png
-[2]: ./media/service-fabric-backuprestoreservice/advanced-mode.png
 [3]: ./media/service-fabric-backuprestoreservice/enable-app-backup.png
 [4]: ./media/service-fabric-backuprestoreservice/enable-application-backup.png
-[5]: ./media/service-fabric-backuprestoreservice/backup-enumeration.png
-
+[5]: ./media/service-fabric-backuprestoreservice/backup-enumeration.png
diff --git a/articles/service-fabric/service-fabric-visualizing-your-cluster.md b/articles/service-fabric/service-fabric-visualizing-your-cluster.md
@@ -125,7 +125,11 @@ Image store viewer is a feature offered if using Native Image Store that allows
 ![Service Fabric Explorer cluster map][sfx-imagestore]
 
 ## Backup and Restore
-Service Fabric Explorer offers the ability to interface with [Backup and Restore](./service-fabric-reliable-services-backup-restore.md). The following operations are possible:
+Service Fabric Explorer offers the ability to interface with [Backup and Restore](./service-fabric-reliable-services-backup-restore.md). In order to see Backup and Restore features in SFX, advanced mode must be enabled.
+
+![Enable advanced mode][0]
+ 
+The following operations are possible:
 
 * Create, edit, and delete a Backup Policy.
 * Enable and disable Backup for an application, service, or partition.
@@ -147,3 +151,4 @@ For more on the Backup and Restore service, see the [REST API reference](https:/
 [sfx-create-app-instance]: ./media/service-fabric-visualizing-your-cluster/sfx-create-app-instance.png
 [sfx-eventstore]: ./media/service-fabric-diagnostics-eventstore/eventstore.png
 [sfx-imagestore]: ./media/service-fabric-visualizing-your-cluster/sfx-image-store.png
+[0]: ./media/service-fabric-backuprestoreservice/advanced-mode.png
