fix merge issues

chrisakker · chrisakker · commit 3a1a25401b0b · 2023-06-29T15:57:49.000-07:00
diff --git a/docs/http/clusters.conf b/docs/http/clusters.conf
@@ -1,4 +1,4 @@
-# NGINX LB for K8s HTTP configuration, for L7 load balancing
+# NGINX Loadbalancer for K8s HTTP configuration, for L7 load balancing
 # Chris Akker, Apr 2023
 # HTTP Proxy and load balancing
 # MultiCluster Load Balancing with http split clients 0-100%
diff --git a/docs/http/prometheus.conf b/docs/http/prometheus.conf
@@ -1,4 +1,4 @@
-# NGINX LB for K8s - Prometheus configuration, for HTTP scraper page
+# NGINX Loadbalancer for K8s - Prometheus configuration, for HTTP scraper page
 # Chris Akker, Apr 2023
 # https://www.nginx.com/blog/how-to-visualize-nginx-plus-with-prometheus-and-grafana/
 #
diff --git a/docs/http/zonesync.conf b/docs/http/zonesync.conf
@@ -1,8 +1,8 @@
+# NGINX Loadbalancer for Kubernetes
 # NGINX Zone Sync configuration, for KVstore split
 # Chris Akker, Apr 2023
 # Stream Zone Sync block
 # 2 NGINX Plus nodes 
-# NGINX Loadbalancer for Kubernetes
 # https://docs.nginx.com/nginx/admin-guide/high-availability/zone_sync/
 #
 #### zonesync.conf

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# NGINX LB for K8s HTTP configuration, for L7 load balancing`
	`1`	`+# NGINX Loadbalancer for K8s HTTP configuration, for L7 load balancing`
`2`	`2`	`# Chris Akker, Apr 2023`
`3`	`3`	`# HTTP Proxy and load balancing`
`4`	`4`	`# MultiCluster Load Balancing with http split clients 0-100%`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# NGINX LB for K8s - Prometheus configuration, for HTTP scraper page`
	`1`	`+# NGINX Loadbalancer for K8s - Prometheus configuration, for HTTP scraper page`
`2`	`2`	`# Chris Akker, Apr 2023`
`3`	`3`	`# https://www.nginx.com/blog/how-to-visualize-nginx-plus-with-prometheus-and-grafana/`
`4`	`4`	`#`