Merge branch 'sputnik-ga' of https://github.com/vladvino/azure-docs-pr into sputnik-ga

Author: vladvino

articles/api-management/TOC.yml

@@ -103,9 +103,9 @@
             - name: Provision a self-hosted gateway
               href: api-management-howto-provision-self-hosted-gateway.md
             - name: Deploy a self-hosted gateway to Azure Kubernetes Service
-              href: api-management-howto-deploy-self-hosted-gateway-to-aks.md
+              href: how-to-deploy-self-hosted-gateway-azure-kubernetes-service.md
             - name: Deploy a self-hosted gateway to Kubernetes
-              href: api-management-howto-deploy-self-hosted-gateway-to-k8s.md
+              href: how-to-deploy-self-hosted-gateway-kubernetes.md
             - name: Deploy a self-hosted gateway to Docker
               href: api-management-howto-deploy-self-hosted-gateway-to-docker.md
             - name: Configure custom domain for self-hosted gateway
@@ -221,9 +221,9 @@
             - name: Log requests with Azure Application Insights
               href: api-management-howto-app-insights.md
             - name: Configure cloud metrics and logs for self-hosted gateway
-              href: api-management-howto-configure-cloud-metrics-and-logs.md
+              href: how-to-configure-cloud-metrics-logs.md
             - name: Configure local metrics and logs for self-hosted gateway
-              href: api-management-howto-configure-local-metrics-and-logs.md
+              href: how-to-configure-local-metrics-logs.md
             - name: Log requests with Azure Application Insights
               href: api-management-howto-app-insights.md
             - name: Set up DR using backup/restore

articles/api-management/api-management-howto-deploy-self-hosted-gateway-to-docker.md

@@ -19,7 +19,7 @@ ms.author: apimpm
 This article provides the steps for deploying self-hosted gateway component of Azure API Management to a Docker environment.
 
 > [!NOTE]
-> Hosting self-hosted gateway in Docker is best suited for evaluation and development use cases. Kubernetes is recommended for production use. See [this](api-management-howto-deploy-self-hosted-gateway-to-k8s.md) document to learn how to deploy self-hosted gateway to Kubernetes.
+> Hosting self-hosted gateway in Docker is best suited for evaluation and development use cases. Kubernetes is recommended for production use. See [this](how-to-deploy-self-hosted-gateway-kubernetes.md) document to learn how to deploy self-hosted gateway to Kubernetes.
 
 ## Prerequisites
 

articles/api-management/api-management-howto-provision-self-hosted-gateway.md

@@ -46,5 +46,5 @@ Now the gateway resource has been provisioned in your API Management instance. Y
 ## Next steps
 
 * To learn more about the self-hosted gateway, see [Azure API Management self-hosted gateway overview](self-hosted-gateway-overview.md)
-* Learn more about how to [Deploy a self-hosted gateway to Kubernetes](api-management-howto-deploy-self-hosted-gateway-to-k8s.md)
+* Learn more about how to [Deploy a self-hosted gateway to Kubernetes](how-to-deploy-self-hosted-gateway-kubernetes.md)
 * Learn more about how to [Deploy a self-hosted gateway to Docker](api-management-howto-deploy-self-hosted-gateway-to-docker.md)

articles/api-management/api-management-howto-configure-cloud-metrics-and-logs.md renamed to articles/api-management/how-to-configure-cloud-metrics-logs.md

@@ -18,7 +18,7 @@ ms.author: apimpm
 
 # Configure cloud metrics and logs for Azure API Management self-hosted gateway
 
-This article provides details for configuring cloud metrics and logs for [Azure API Management self-hosted gateway](./self-hosted-gateway-overview.md).
+This article provides details for configuring cloud metrics and logs for the [self-hosted gateway](./self-hosted-gateway-overview.md).
 
 The self-hosted gateway has to be associated with an API management service and requires outbound TCP/IP connectivity to Azure on port 443. The gateway leverages the outbound connection to send telemetry to Azure, if configured to do so. 
 
@@ -54,14 +54,14 @@ The self-hosted gateway currently emits the following metrics through Azure Moni
 
 ## Logs
 
-The self-hosted gateway currently does not send [diagnostic logs](https://docs.microsoft.com/azure/api-management/api-management-howto-use-azure-monitor#diagnostic-logs) to the cloud. However, it is possible to [configure and persist logs locally](./api-management-howto-configure-local-metrics-and-logs.md) where the self-hosted gateway is deployed. 
+The self-hosted gateway currently does not send [diagnostic logs](https://docs.microsoft.com/azure/api-management/api-management-howto-use-azure-monitor#diagnostic-logs) to the cloud. However, it is possible to [configure and persist logs locally](how-to-configure-local-metrics-logs.md) where the self-hosted gateway is deployed. 
 
 If a gateway is deployed in [Azure Kubernetes Service](https://azure.microsoft.com/services/kubernetes-service/), you can enable [Azure Monitor for containers](https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-overview) to collect logs from your containers and view them in Log Analytics. 
 
 
 ## Next steps
 
 * To learn more about the self-hosted gateway, see [Azure API Management self-hosted gateway overview](self-hosted-gateway-overview.md)
-* Learn about [configuring and persisting logs locally](api-management-howto-configure-local-metrics-and-logs.md)
+* Learn about [configuring and persisting logs locally](how-to-configure-local-metrics-logs.md)
 
 

articles/api-management/api-management-howto-configure-local-metrics-and-logs.md renamed to articles/api-management/how-to-configure-local-metrics-logs.md

@@ -18,7 +18,7 @@ ms.author: apimpm
 
 # Configure local metrics and logs for Azure API Management self-hosted gateway
 
-This article provides details for configuring local metrics and logs for [Azure API Management self-hosted gateway](./self-hosted-gateway-overview.md). For configuring cloud metrics and logs, see [this article](api-management-howto-configure-cloud-metrics-and-logs.md). 
+This article provides details for configuring local metrics and logs for the [self-hosted gateway](./self-hosted-gateway-overview.md). For configuring cloud metrics and logs, see [this article](how-to-configure-cloud-metrics-logs.md). 
 
 ## Metrics
 The self-hosted gateway supports [StatsD](https://github.com/statsd/statsd), which has become a unifying protocol for metrics collection and aggregation. This section walks through the steps for deploying StatsD to Kubernetes, configuring the gateway to emit metrics via StatsD, and using [Prometheus](https://prometheus.io/) to monitor the metrics. 
@@ -232,5 +232,5 @@ Here is a sample configuration of local logging:
 ## Next steps
 
 * To learn more about the self-hosted gateway, see [Azure API Management self-hosted gateway overview](self-hosted-gateway-overview.md)
-* Learn about [configuring and persisting logs in the cloud](api-management-howto-configure-local-metrics-and-logs.md)
+* Learn about [configuring and persisting logs in the cloud](how-to-configure-local-metrics-logs.md)
 

articles/api-management/api-management-howto-deploy-self-hosted-gateway-to-aks.md renamed to articles/api-management/how-to-deploy-self-hosted-gateway-azure-kubernetes-service.md

@@ -25,10 +25,10 @@ This article provides the steps for deploying self-hosted gateway component of A
 - [Create an Azure Kubernetes cluster](../aks/kubernetes-walkthrough-portal.md)
 - [Provision a gateway resource in your API Management instance](api-management-howto-provision-self-hosted-gateway.md).
 
-## Deploy the gateway to AKS
+## Deploy the self-hosted gateway to AKS
 
 1. Select **Gateways** from under **Settings**.
-2. Select the gateway resource you intend to deploy.
+2. Select the self-hosted gateway resource you intend to deploy.
 3. Select **Deployment**.
 4. Note that a new token in the **Token** text box was autogenerated for you using the default **Expiry** and **Secret Key** values. Adjust either or both if desired and select **Generate** to create a new token.
 5. Make sure **Kubernetes** is selected under **Deployment scripts**.
@@ -40,20 +40,20 @@ This article provides the steps for deploying self-hosted gateway component of A
 ```console
     kubectl apply -f <gateway-name>.yaml
 ```
-10. Execute the command. The command instructs your AKS cluster to run the container, using self-hosted gateway's image downloaded from the Microsoft Container Registry, and to configure the container to expose HTTP (8080) and HTTPS (443) ports.
-11. Run the below command to check the gateway pod is running. Note that your pod name will be different.
+11. Execute the command. The command instructs your AKS cluster to run the container, using self-hosted gateway's image downloaded from the Microsoft Container Registry, and to configure the container to expose HTTP (8080) and HTTPS (443) ports.
+12. Run the below command to check the gateway pod is running. Note that your pod name will be different.
 ```console
 kubectl get pods
 NAME                                   READY     STATUS    RESTARTS   AGE
 contoso-apim-gateway-59f5fb94c-s9stz   1/1       Running   0          1m
 ```
-12. Run the below command to check the gateway service is running. Note that your service name and IP addresses will be different.
+13. Run the below command to check the gateway service is running. Note that your service name and IP addresses will be different.
 ```console
 kubectl get services
 NAME             TYPE        CLUSTER-IP      EXTERNAL-IP   PORT(S)                      AGE
 contosogateway   NodePort    10.110.230.87   <none>        80:32504/TCP,443:30043/TCP   1m
 ```
-13. Go back to the Azure portal and confirm that gateway node you just deployed is reporting healthy status.
+14. Go back to the Azure portal and confirm that gateway node you just deployed is reporting healthy status.
 
 > [!TIP]
 > Use <code>kubectl logs <gateway-pod-name></code> command to view a snapshot of self-hosted gateway log.
@@ -62,8 +62,8 @@ contosogateway   NodePort    10.110.230.87   <none>        80:32504/TCP,443:3004
 
 * To learn more about the self-hosted gateway, see [Azure API Management self-hosted gateway overview](self-hosted-gateway-overview.md)
 * Learn more about [Azure Kubernetes Service](https://docs.microsoft.com/azure/aks/intro-kubernetes)
-* Learn [how to configure and persist logs in the cloud](api-management-howto-configure-local-metrics-and-logs.md)
-* * Learn [how to configure and persist logs locally](api-management-howto-configure-local-metrics-and-logs.md)
+* Learn [how to configure and persist logs in the cloud](how-to-configure-cloud-metrics-logs.md)
+* * Learn [how to configure and persist logs locally](how-to-configure-local-metrics-logs.md)
 
 
 

articles/api-management/api-management-howto-deploy-self-hosted-gateway-to-k8s.md renamed to articles/api-management/how-to-deploy-self-hosted-gateway-kubernetes.md

@@ -106,7 +106,7 @@ To learn about storage in Kubernetes follow this [link](https://kubernetes.io/do
 ### Local logs and metrics
 Self-hosted gateway sends telemetry to [Azure Monitor](api-management-howto-use-azure-monitor.md) and [Azure Application Insights](api-management-howto-app-insights.md) per configuration settings in the associated API Management service.
 When [connectivity to Azure](self-hosted-gateway-overview.md#connectivity-to-azure) is temporarily lost, the flow of telemetry to Azure is interrupted and the data is lost for the duration of the outage.
-Consider [setting up local monitoring](api-management-howto-configure-local-metrics-and-logs.md) to ensure ability to observe the API traffic and prevent telemetry loss during Azure connectivity outages.
+Consider [setting up local monitoring](how-to-configure-local-metrics-logs.md) to ensure ability to observe the API traffic and prevent telemetry loss during Azure connectivity outages.
 
 ## Next steps
 

articles/api-management/self-hosted-gateway-overview.md

@@ -79,4 +79,4 @@ When connectivity is restored, each self-hosted gateway affected by the outage w
 
 -   [Read a whitepaper for additional background on this topic](https://aka.ms/hybrid-and-multi-cloud-api-management)
 -   [Deploy self-hosted gateway to Docker](api-management-howto-deploy-self-hosted-gateway-to-docker.md)
--   [Deploy self-hosted gateway to Kubernetes](api-management-howto-deploy-self-hosted-gateway-to-k8s.md)
+-   [Deploy self-hosted gateway to Kubernetes](how-to-deploy-self-hosted-gateway-kubernetes.md)