Merge pull request #190211 from JnHs/jh-arc-term0322

hmacgregor1 · web-flow · commit 25ad7bc5d627 · 2022-03-01T20:42:55.000-08:00
clean up terminology
diff --git a/articles/azure-arc/data/connectivity.md b/articles/azure-arc/data/connectivity.md
@@ -50,7 +50,7 @@ Some Azure-attached services are only available when they can be directly reache
 |**Automatic upgrades and patching**|Supported<br/>The data controller must either have direct access to the Microsoft Container Registry (MCR) or the container images need to be pulled from MCR and pushed to a local, private container registry that the data controller has access to.|Supported|
 |**Automatic backup and restore**|Supported<br/>Automatic local backup and restore.|Supported<br/>In addition to automated local backup and restore, you can _optionally_ send backups to Azure blob storage for long-term, off-site retention.|
 |**Monitoring**|Supported<br/>Local monitoring using Grafana and Kibana dashboards.|Supported<br/>In addition to local monitoring dashboards, you can _optionally_ send monitoring data and logs to Azure Monitor for at-scale monitoring of multiple sites in one place. |
-|**Authentication**|Use local username/password for data controller and dashboard authentication. Use SQL and Postgres logins or Active Directory (AD is not currently supported) for connectivity to database instances.  Use K8s authentication providers for authentication to the Kubernetes API.|In addition to or instead of the authentication methods for the indirectly connected mode, you can _optionally_ use Azure Active Directory.|
+|**Authentication**|Use local username/password for data controller and dashboard authentication. Use SQL and Postgres logins or Active Directory (AD is not currently supported) for connectivity to database instances.  Use Kubernetes authentication providers for authentication to the Kubernetes API.|In addition to or instead of the authentication methods for the indirectly connected mode, you can _optionally_ use Azure Active Directory.|
 |**Role-based access control (RBAC)**|Use Kubernetes RBAC on Kubernetes API. Use SQL and Postgres RBAC for database instances.|You can use Azure Active Directory and Azure RBAC. **Pending availability in directly connected mode**|
 
 ## Connectivity requirements
diff --git a/articles/azure-arc/data/create-complete-managed-instance-directly-connected.md b/articles/azure-arc/data/create-complete-managed-instance-directly-connected.md
@@ -1,5 +1,5 @@
 ---
-title: Quickstart - Deploy Azure Arc-enable data services - directly connected mode - Azure portal
+title: Quickstart - Deploy Azure Arc-enabled data services - directly connected mode - Azure portal
 description: Demonstrates how to deploy Azure Arc-enabled data services from beginning, including a Kubernetes cluster. Finishes with an instance of Azure SQL Managed Instance.
 author: MikeRayMSFT
 ms.author: mikeray
@@ -10,11 +10,11 @@ ms.date: 12/09/2021
 ms.custom: template-quickstart 
 ---
 
-# Quickstart: Deploy Azure Arc-enable data services - directly connected mode - Azure portal
+# Quickstart: Deploy Azure Arc-enabled data services - directly connected mode - Azure portal
 
 This article demonstrates how to deploy Azure Arc-enabled data services in directly connected mode from the Azure portal.
 
-To deploy in indirectly connected mode, see [Quickstart: Deploy Azure Arc-enable data services - indirectly connected mode - Azure CLI](create-complete-managed-instance-indirectly-connected.md).
+To deploy in indirectly connected mode, see [Quickstart: Deploy Azure Arc-enabled data services - indirectly connected mode - Azure CLI](create-complete-managed-instance-indirectly-connected.md).
 
 When you complete the steps in this article, you will have:
 
diff --git a/articles/azure-arc/data/create-complete-managed-instance-indirectly-connected.md b/articles/azure-arc/data/create-complete-managed-instance-indirectly-connected.md
@@ -1,5 +1,5 @@
 ---
-title: Quickstart - Deploy Azure Arc-enable data services - indirectly connected mode - Azure CLI
+title: Quickstart - Deploy Azure Arc-enabled data services - indirectly connected mode - Azure CLI
 description: Demonstrates how to deploy Azure Arc-enabled data services in indirectly connected mode from beginning, including a Kubernetes cluster. Uses Azure CLI. Finishes with an instance of Azure SQL Managed Instance.
 author: MikeRayMSFT
 ms.author: mikeray
@@ -10,11 +10,11 @@ ms.date: 12/09/2021
 ms.custom: template-quickstart , devx-track-azurecli
 ---
 
-# Quickstart: Deploy Azure Arc-enable data services - indirectly connected mode - Azure CLI
+# Quickstart: Deploy Azure Arc-enabled data services - indirectly connected mode - Azure CLI
 
 This article demonstrates how to deploy Azure Arc-enabled data services in indirectly connected mode from with the Azure CLI.
 
-To deploy in directly connected mode, see [Quickstart: Deploy Azure Arc-enable data services - directly connected mode - Azure portal](create-complete-managed-instance-directly-connected.md).
+To deploy in directly connected mode, see [Quickstart: Deploy Azure Arc-enabled data services - directly connected mode - Azure portal](create-complete-managed-instance-directly-connected.md).
 
 When you complete the steps in this article, you will have:
 
diff --git a/articles/azure-arc/data/create-data-controller-direct-cli.md b/articles/azure-arc/data/create-data-controller-direct-cli.md
@@ -122,7 +122,7 @@ You can verify the status of the deployment of Azure Arc-enabled data services e
 #### Check status from Azure portal
 
 1. Log in to the Azure portal and browse to the resource group where the Kubernetes connected cluster resource is located.
-1. Select the Azure Arc-enabled kubernetes cluster (Type = "Kubernetes - Azure Arc") where the extension was deployed.
+1. Select the Azure Arc-enabled Kubernetes cluster (Type = "Kubernetes - Azure Arc") where the extension was deployed.
 1. In the navigation on the left side, under **Settings**, select **Extensions**.
 1. The portal shows the extension that was created earlier in an installed state.
 
diff --git a/articles/azure-arc/data/create-data-controller-direct-prerequisites.md b/articles/azure-arc/data/create-data-controller-direct-prerequisites.md
@@ -20,7 +20,7 @@ At a high level, the prerequisites for creating Azure Arc data controller in **d
 1. Have access to your Kubernetes cluster. If you do not have a Kubernetes cluster, you can create a test/demonstration cluster on Azure Kubernetes Service (AKS). 
 1. Connect Kubernetes cluster to Azure using Azure Arc-enabled Kubernetes.
 
-Follow the instructions at [Quickstart: Deploy Azure Arc-enable data services - directly connected mode - Azure portal](create-complete-managed-instance-directly-connected.md) 
+Follow the instructions at [Quickstart: Deploy Azure Arc-enabled data services - directly connected mode - Azure portal](create-complete-managed-instance-directly-connected.md) 
 
 ## Connect Kubernetes cluster to Azure using Azure Arc-enabled Kubernetes
 
diff --git a/articles/azure-arc/data/create-data-controller-indirect-cli.md b/articles/azure-arc/data/create-data-controller-indirect-cli.md
@@ -80,7 +80,7 @@ The following sections provide instructions for specific types of Kubernetes pla
 - [Google Cloud Kubernetes Engine Service (GKE)](#create-on-google-cloud-kubernetes-engine-service-gke)
 
 > [!TIP]
-> If you have no Kubernetes cluster, you can create one on Azure. Follow the instructions at [Quickstart: Deploy Azure Arc-enable data services - directly connected mode - Azure portal](create-complete-managed-instance-directly-connected.md) to walk through the entire process. 
+> If you have no Kubernetes cluster, you can create one on Azure. Follow the instructions at [Quickstart: Deploy Azure Arc-enabled data services - directly connected mode - Azure portal](create-complete-managed-instance-directly-connected.md) to walk through the entire process. 
 >
 > Then follow the instructions under [Create on Azure Kubernetes Service (AKS)](#create-on-azure-kubernetes-service-aks).
 
diff --git a/articles/azure-arc/data/create-sql-managed-instance.md b/articles/azure-arc/data/create-sql-managed-instance.md
@@ -27,7 +27,7 @@ To create a SQL Managed Instance, use `az sql mi-arc create`. See the following
 
 > [!NOTE]
 >  Starting with the February release, a ReadWriteMany (RWX) capable storage class needs to be specified for backups. Learn more about [access modes](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes)
-If no storage class is specified for backups, the default storage class in kubernetes is used and if this is not RWX capable, the Arc SQL Managed Instance installation may not succeed.
+If no storage class is specified for backups, the default storage class in Kubernetes is used and if this is not RWX capable, the Arc SQL Managed Instance installation may not succeed.
 
 
 
diff --git a/articles/azure-arc/data/plan-azure-arc-data-services.md b/articles/azure-arc/data/plan-azure-arc-data-services.md
@@ -27,7 +27,7 @@ In order to experience Azure Arc-enabled data services, you will need to complet
 1. [Install client tools](install-client-tools.md).
 1. Access a Kubernetes cluster.
 
-   For demonstration, testing, and validation purposes, you can use an Azure Kubernetes Service cluster. To create a cluster, follow the instructions at [Quickstart: Deploy Azure Arc-enable data services - directly connected mode - Azure portal](create-complete-managed-instance-directly-connected.md) to walk through the entire process.
+   For demonstration, testing, and validation purposes, you can use an Azure Kubernetes Service cluster. To create a cluster, follow the instructions at [Quickstart: Deploy Azure Arc-enabled data services - directly connected mode - Azure portal](create-complete-managed-instance-directly-connected.md) to walk through the entire process.
 
 1. [Create Azure Arc data controller in direct connectivity mode (prerequisites)](create-data-controller-direct-prerequisites.md).
 
diff --git a/articles/azure-arc/data/point-in-time-restore.md b/articles/azure-arc/data/point-in-time-restore.md
@@ -91,7 +91,7 @@ You can also restore a database to a point in time from Azure Data Studio as fol
 
 ### Monitor progress
 
-When a restore is initiated, a task is created in the kubernetes cluster that executes the actual restore operations of full, differential, and log backups. The progress of this activity can be monitored from your kubernetes cluster as follows:
+When a restore is initiated, a task is created in the Kubernetes cluster that executes the actual restore operations of full, differential, and log backups. The progress of this activity can be monitored from your Kubernetes cluster as follows:
 
 ```console
 kubectl get sqlmirestoretask -n <namespace>
diff --git a/articles/azure-arc/data/view-arc-data-services-inventory-in-azure-portal.md b/articles/azure-arc/data/view-arc-data-services-inventory-in-azure-portal.md
@@ -13,27 +13,30 @@ ms.topic: how-to
 
 # Inventory of Arc enabled data services
 
+You can view your Azure Arc-enabled data services in the Azure portal or in your Kubernetes cluster.
 
 ## View resources in Azure portal
 
-After you upload your [metrics, logs](upload-metrics-and-logs-to-azure-monitor.md), or [usage](view-billing-data-in-azure.md), you can view your Azure Arc-enabled SQL managed instances or Azure Arc-enabled Postgres Hyperscale server groups in Azure portal. To view your resource in the [portal](https://portal.azure.com) follow these steps:
+After you upload your [metrics, logs](upload-metrics-and-logs-to-azure-monitor.md), or [usage](view-billing-data-in-azure.md), you can view your Azure Arc-enabled SQL managed instances or Azure Arc-enabled Postgres Hyperscale server groups in the Azure portal. To view your resource in the [Azure portal](https://portal.azure.com), follow these steps:
 
 1. Go to **All services**.
 1. Search for your database instance type.
 1. Add the type to your favorites.
 1. In the left menu, select the instance type.
 1. View your instances in the same view as your other Azure SQL or Azure PostgreSQL Hyperscale resources (use filters for a granular view).
 
-## View resources in your kubernetes cluster
+## View resources in your Kubernetes cluster
 
 If the Azure Arc data controller is deployed in **indirect** connectivity mode, you can run the below command to get a list of all the Azure Arc SQL managed instances:
+
 ```
 az sql mi-arc list --k8s-namespace <namespace> --use-k8s
 #Example
 az sql mi-arc list --k8s-namespace arc --use-k8s
 ```
 
 If the Azure Arc data controller is deployed in **direct** connectivity mode, you can run the below command to get a list of all the Azure Arc SQL managed instances:
+
 ```
 az sql mi-arc list --resource-group <resourcegroup>
 #Example
diff --git a/articles/azure-arc/data/view-data-controller-in-azure-portal.md b/articles/azure-arc/data/view-data-controller-in-azure-portal.md
@@ -11,21 +11,20 @@ ms.date: 11/03/2021
 ms.topic: how-to
 ---
 
-# View Azure Arc data controller resource in Azure portal
+# View Azure Arc data controller resource in the Azure portal
 
-To view the Azure Arc data controller in your Azure portal, one of usage/metrics/logs data from your kubernetes cluster must be exported and uploaded to Azure. 
+To view the Azure Arc data controller in the  Azure portal, you must export at least one type of data (usage data, metrics, or logs) from your Kubernetes cluster and upload it to Azure.
 
 ## Direct connected mode
-If the Azure Arc data controller is deployed in **direct** connected mode, usage data is automatically uploaded to Azure, and the kubernetes resources are projected into Azure.
 
-## Indirect connected mode
-In the **indirect** connected mode, you must export and upload at least one of usage data, metrics, or logs to Azure as described in [Upload usage data, metrics, and logs to Azure](upload-metrics-and-logs-to-azure-monitor.md). This action creates the appropriate resources in Azure.
+If the Azure Arc data controller is deployed in **direct** connected mode, usage data is automatically uploaded to Azure, and the Kubernetes resources are projected into Azure.
 
-## Azure Portal
+## Indirect connected mode
 
-After you complete your first [metrics or logs upload to Azure](upload-metrics-and-logs-to-azure-monitor.md) or [uploaded usage](view-billing-data-in-azure.md), you can see the Azure Arc data controller and any Azure Arc-enabled SQL managed instances or Azure Arc-enabled Postgres Hyperscale server resources in the Azure portal.
+In the **indirect** connected mode, you must export and upload at least one type of data (usage data, metrics, or logs) to Azure. For more information on this process, see [Upload usage data, metrics, and logs to Azure](upload-metrics-and-logs-to-azure-monitor.md). This action creates the appropriate resources in Azure.
 
-Open the Azure portal using the URL:  [https://portal.azure.com](https://portal.azure.com).
+## Azure portal
 
-Search for your data controller by name in the search bar and click on it.
+After you complete your first [metrics or logs upload to Azure](upload-metrics-and-logs-to-azure-monitor.md) or [usage data upload](view-billing-data-in-azure.md), you can see the Azure Arc data controller and any Azure Arc-enabled SQL managed instances or Azure Arc-enabled Postgres Hyperscale server resources in the [Azure portal](https://portal.azure.com).
 
+To find your data controller, search for it by name in the search bar and then select it.
diff --git a/articles/azure-arc/kubernetes/conceptual-agent-overview.md b/articles/azure-arc/kubernetes/conceptual-agent-overview.md
@@ -43,7 +43,7 @@ The following steps are involved in connecting a Kubernetes cluster to Azure Arc
         | `deployment.apps/extension-manager` | Installs and manages lifecycle of extension helm charts |
         | `deployment.apps/kube-aad-proxy` | Used for authentication of requests sent to the cluster using Cluster Connect |
         | `deployment.apps/clusterconnect-agent` | Reverse proxy agent that enables Cluster Connect feature to provide access to `apiserver` of cluster. Optional component deployed only if `cluster-connect` feature is enabled on the cluster   |
-        | `deployment.apps/guard` | Authentication and authorization webhook server used for AAD RBAC feature. Optional component deployed only if `azure-rbac` feature is enabled on the cluster   |
+        | `deployment.apps/guard` | Authentication and authorization webhook server used for Azure Active Directory (Azure AD) RBAC. Optional component deployed only if `azure-rbac` feature is enabled on the cluster   |
 
 1. Once all the Azure Arc-enabled Kubernetes agent pods are in `Running` state, verify that your cluster connected to Azure Arc. You should see:
     * An Azure Arc-enabled Kubernetes resource in [Azure Resource Manager](../../azure-resource-manager/management/overview.md). Azure tracks this resource as a projection of the customer-managed Kubernetes cluster, not the actual Kubernetes cluster itself.
diff --git a/articles/azure-arc/kubernetes/troubleshooting.md b/articles/azure-arc/kubernetes/troubleshooting.md
@@ -141,7 +141,7 @@ az connectedk8s connect -n AzureArcTest -g AzureArcTest
 Ensure that you have the latest helm version installed before proceeding.
 This operation might take a while...
 
-Please check if the azure-arc namespace was deployed and run 'kubectl get pods -n azure-arc' to check if all the pods are in running state. A possible cause for pods stuck in pending state could be insufficientresources on the kubernetes cluster to onboard to arc.
+Please check if the azure-arc namespace was deployed and run 'kubectl get pods -n azure-arc' to check if all the pods are in running state. A possible cause for pods stuck in pending state could be insufficientresources on the Kubernetes cluster to onboard to arc.
 ValidationError: Unable to install helm release: Error: customresourcedefinitions.apiextensions.k8s.io "connectedclusters.arc.azure.com" not found
 ```
 
@@ -301,9 +301,9 @@ Some other aspects to consider:
 
 With these actions accomplished you can either [re-create a flux configuration](./tutorial-use-gitops-flux2.md) which will install the flux extension automatically or you can re-install the flux extension manually.
 
-### Flux v2 - Installing the `microsoft.flux` extension in a cluster with AAD Pod Identity enabled
+### Flux v2 - Installing the `microsoft.flux` extension in a cluster with Azure AD Pod Identity enabled
 
-If you attempt to install the Flux extension in a cluster that has AAD Pod Identity enabled, an error may occur in the extension-agent pod.
+If you attempt to install the Flux extension in a cluster that has Azure Active Directory (Azure AD) Pod Identity enabled, an error may occur in the extension-agent pod.
 
 ```console
 {"Message":"2021/12/02 10:24:56 Error: in getting auth header : error {adal: Refresh request failed. Status Code = '404'. Response body: no azure identity found for request clientID <REDACTED>\n}","LogType":"ConfigAgentTrace","LogLevel":"Information","Environment":"prod","Role":"ClusterConfigAgent","Location":"westeurope","ArmId":"/subscriptions/<REDACTED>/resourceGroups/<REDACTED>/providers/Microsoft.Kubernetes/managedclusters/<REDACTED>","CorrelationId":"","AgentName":"FluxConfigAgent","AgentVersion":"0.4.2","AgentTimestamp":"2021/12/02 10:24:56"}
@@ -317,7 +317,7 @@ The extension status also returns as "Failed".
 
 The issue is that the extension-agent pod is trying to get its token from IMDS on the cluster in order to talk to the extension service in Azure; however, this token request is being intercepted by pod identity ([details here](../../aks/use-azure-ad-pod-identity.md)). 
 
-The workaround is to create an `AzurePodIdentityException` that will tell AAD Pod Identity to ignore the token requests from flux-extension pods.
+The workaround is to create an `AzurePodIdentityException` that will tell Azure AD Pod Identity to ignore the token requests from flux-extension pods.
 
 ```console
 apiVersion: aadpodidentity.k8s.io/v1
diff --git a/articles/azure-arc/kubernetes/tutorial-use-gitops-flux2.md b/articles/azure-arc/kubernetes/tutorial-use-gitops-flux2.md
@@ -28,7 +28,7 @@ To manage GitOps through the Azure CLI or the Azure portal, you need the followi
 
 * An Azure Arc-enabled Kubernetes connected cluster that's up and running.
   
-  [Learn how to Azure Arc-enable a Kubernetes cluster](./quickstart-connect-cluster.md). If you need to connect through an outbound proxy, then assure you [install the Arc agents with proxy settings](./quickstart-connect-cluster.md?tabs=azure-cli#connect-using-an-outbound-proxy-server).
+  [Learn how to connect a Kubernetes cluster to  Azure Arc](./quickstart-connect-cluster.md). If you need to connect through an outbound proxy, then assure you [install the Arc agents with proxy settings](./quickstart-connect-cluster.md?tabs=azure-cli#connect-using-an-outbound-proxy-server).
 * Read and write permissions on the `Microsoft.Kubernetes/connectedClusters` resource type.
 
 ### For Azure Kubernetes Service clusters
@@ -654,7 +654,7 @@ Arguments
     --timeout                      : Maximum time to reconcile the source before timing out.
 
 Auth Arguments
-    --local-auth-ref --local-ref   : Local reference to a kubernetes secret in the configuration
+    --local-auth-ref --local-ref   : Local reference to a Kubernetes secret in the configuration
                                      namespace to use for communication to the source.
 
 Bucket Auth Arguments
diff --git a/articles/azure-arc/servers/manage-agent.md b/articles/azure-arc/servers/manage-agent.md
diff --git a/articles/azure-arc/vmware-vsphere/manage-access-to-arc-vmware-resources.md b/articles/azure-arc/vmware-vsphere/manage-access-to-arc-vmware-resources.md

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ The following sections provide instructions for specific types of Kubernetes pla`
`80`	`80`	`- [Google Cloud Kubernetes Engine Service (GKE)](#create-on-google-cloud-kubernetes-engine-service-gke)`
`81`	`81`
`82`	`82`	`> [!TIP]`
`83`		`-> If you have no Kubernetes cluster, you can create one on Azure. Follow the instructions at [Quickstart: Deploy Azure Arc-enable data services - directly connected mode - Azure portal](create-complete-managed-instance-directly-connected.md) to walk through the entire process.`
	`83`	`+> If you have no Kubernetes cluster, you can create one on Azure. Follow the instructions at [Quickstart: Deploy Azure Arc-enabled data services - directly connected mode - Azure portal](create-complete-managed-instance-directly-connected.md) to walk through the entire process.`
`84`	`84`	`>`
`85`	`85`	`> Then follow the instructions under [Create on Azure Kubernetes Service (AKS)](#create-on-azure-kubernetes-service-aks).`
`86`	`86`