From 703dff731d624539cd1fd7f02849548c2ff40d61 Mon Sep 17 00:00:00 2001 From: Chuck Daminato Date: Wed, 1 Jun 2022 13:03:22 -0400 Subject: [PATCH 01/10] Docs/ingress controller 2.4.x (#3975) * Copy 2.3.x directory for upcoming 2.4.x release * Documenting --term-delay parameter This was introduced in https://github.com/Kong/kubernetes-ingress-controller/pull/2494 and should be released as part of v2.4.0 * Make 2.4.x latest version * remove duplicate directory for 2.4.x; move 2.3.x to /src/; create 2.3.x and 2.4.x navigation files * set 2.4.x filter on term-delay * backticks for cli flags so they render accurately; capitalization/punctuation * Fix if_version space rendering Co-authored-by: lena.larionova Co-authored-by: Michael Heap Co-authored-by: lena-larionova <54370747+lena-larionova@users.noreply.github.com> --- app/_data/docs_nav_kic_2.3.x.yml | 262 +++++++++--------- app/_data/docs_nav_kic_2.4.x.yml | 134 +++++++++ app/_data/kong_versions.yml | 4 + app/_plugins/blocks/kong_version_block.rb | 23 +- .../2.3.x/references/cli-arguments.md | 80 ------ docs/single-sourced-versions.md | 8 +- .../concepts/custom-resources.md | 0 .../concepts/deployment.md | 0 .../concepts/design.md | 0 .../concepts/ha-and-scaling.md | 0 .../concepts/ingress-classes.md | 0 .../concepts/ingress-versions.md | 0 .../concepts/k4k8s-with-kong-enterprise.md | 0 .../concepts/security.md | 0 .../deployment/admission-webhook.md | 0 .../deployment/aks.md | 0 .../deployment/eks.md | 0 .../deployment/gke.md | 0 .../deployment/k4k8s-enterprise.md | 0 .../deployment/k4k8s.md | 0 .../deployment/kong-enterprise.md | 0 .../deployment/minikube.md | 0 .../deployment/overview.md | 0 .../examples/001_multiple-services.yaml | 0 .../kubernetes-ingress-controller}/faq.md | 0 .../guides/cert-manager.md | 0 .../guides/configure-acl-plugin.md | 0 .../guides/configuring-custom-entities.md | 0 .../guides/configuring-fallback-service.md | 0 .../guides/configuring-health-checks.md | 0 .../guides/configuring-https-redirect.md | 0 .../guides/getting-started-istio.md | 0 .../guides/getting-started.md | 0 .../guides/overview.md | 0 .../guides/preserve-client-ip.md | 0 .../guides/prometheus-grafana.md | 0 .../guides/redis-rate-limiting.md | 0 .../guides/setting-up-custom-plugins.md | 0 .../guides/upgrade.md | 0 .../guides/upstream-mtls.md | 0 .../using-consumer-credential-resource.md | 0 .../guides/using-external-service.md | 0 .../guides/using-gateway-api.md | 0 .../guides/using-ingress-with-grpc.md | 0 .../guides/using-kong-with-knative.md | 0 .../using-kongclusterplugin-resource.md | 0 .../guides/using-kongingress-resource.md | 0 .../guides/using-kongplugin-resource.md | 0 .../guides/using-mtls-auth-plugin.md | 0 .../guides/using-oidc-plugin.md | 0 .../guides/using-rewrites.md | 0 .../guides/using-tcpingress.md | 0 .../guides/using-udpingress.md | 0 .../kubernetes-ingress-controller}/index.md | 0 .../references/annotations.md | 0 .../references/cli-arguments.md | 85 ++++++ .../references/custom-resources.md | 0 .../references/plugin-compatibility.md | 0 .../references/prometheus.md | 0 .../references/version-compatibility.md | 0 .../troubleshooting.md | 0 61 files changed, 382 insertions(+), 214 deletions(-) create mode 100644 app/_data/docs_nav_kic_2.4.x.yml delete mode 100644 app/kubernetes-ingress-controller/2.3.x/references/cli-arguments.md rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/concepts/custom-resources.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/concepts/deployment.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/concepts/design.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/concepts/ha-and-scaling.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/concepts/ingress-classes.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/concepts/ingress-versions.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/concepts/k4k8s-with-kong-enterprise.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/concepts/security.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/deployment/admission-webhook.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/deployment/aks.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/deployment/eks.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/deployment/gke.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/deployment/k4k8s-enterprise.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/deployment/k4k8s.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/deployment/kong-enterprise.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/deployment/minikube.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/deployment/overview.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/examples/001_multiple-services.yaml (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/faq.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/guides/cert-manager.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/guides/configure-acl-plugin.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/guides/configuring-custom-entities.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/guides/configuring-fallback-service.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/guides/configuring-health-checks.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/guides/configuring-https-redirect.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/guides/getting-started-istio.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/guides/getting-started.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/guides/overview.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/guides/preserve-client-ip.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/guides/prometheus-grafana.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/guides/redis-rate-limiting.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/guides/setting-up-custom-plugins.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/guides/upgrade.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/guides/upstream-mtls.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/guides/using-consumer-credential-resource.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/guides/using-external-service.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/guides/using-gateway-api.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/guides/using-ingress-with-grpc.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/guides/using-kong-with-knative.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/guides/using-kongclusterplugin-resource.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/guides/using-kongingress-resource.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/guides/using-kongplugin-resource.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/guides/using-mtls-auth-plugin.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/guides/using-oidc-plugin.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/guides/using-rewrites.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/guides/using-tcpingress.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/guides/using-udpingress.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/index.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/references/annotations.md (100%) create mode 100644 src/kubernetes-ingress-controller/references/cli-arguments.md rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/references/custom-resources.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/references/plugin-compatibility.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/references/prometheus.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/references/version-compatibility.md (100%) rename {app/kubernetes-ingress-controller/2.3.x => src/kubernetes-ingress-controller}/troubleshooting.md (100%) diff --git a/app/_data/docs_nav_kic_2.3.x.yml b/app/_data/docs_nav_kic_2.3.x.yml index 3a9ff8fa0c24..9b917a7025fe 100644 --- a/app/_data/docs_nav_kic_2.3.x.yml +++ b/app/_data/docs_nav_kic_2.3.x.yml @@ -1,130 +1,134 @@ -- title: Introduction - icon: /assets/images/icons/documentation/icn-kubernetes-color.svg - url: /kubernetes-ingress-controller/ - absolute_url: true - items: - - text: FAQ - url: /faq - - text: Changelog - url: https://github.com/Kong/kubernetes-ingress-controller/blob/main/CHANGELOG.md - absolute_url: true - target_blank: true +product: kubernetes-ingress-controller +release: 2.3.x +generate: true +items: + - title: Introduction + icon: /assets/images/icons/documentation/icn-kubernetes-color.svg + url: /kubernetes-ingress-controller/ + absolute_url: true + items: + - text: FAQ + url: /faq + - text: Changelog + url: https://github.com/Kong/kubernetes-ingress-controller/blob/main/CHANGELOG.md + absolute_url: true + target_blank: true -- title: Concepts - icon: /assets/images/icons/documentation/icn-kubernetes-color.svg - items: - - text: Architecture - url: /concepts/design - - text: Custom Resources - url: /concepts/custom-resources - - text: Deployment Methods - url: /concepts/deployment - - text: Kong for Kubernetes with Kong Enterprise - url: /concepts/k4k8s-with-kong-enterprise - - text: High-Availability and Scaling - url: /concepts/ha-and-scaling - - text: Resource Classes - url: /concepts/ingress-classes - - text: Security - url: /concepts/security - - text: Ingress Resource API Versions - url: /concepts/ingress-versions -- title: Deployment - icon: /assets/images/icons/documentation/icn-kubernetes-color.svg - url: /deployment/overview - items: - - text: Kong Ingress on Minikube - url: /deployment/minikube - - text: Kong for Kubernetes - url: /deployment/k4k8s - - text: Kong for Kubernetes Enterprise - url: /deployment/k4k8s-enterprise - - text: Kong for Kubernetes with Kong Enterprise - url: /deployment/kong-enterprise - - text: Kong Ingress on AKS - url: /deployment/aks - - text: Kong Ingress on EKS - url: /deployment/eks - - text: Kong Ingress on GKE - url: /deployment/gke - - text: Admission Controller - url: /deployment/admission-webhook -- title: Guides - icon: /assets/images/icons/documentation/icn-kubernetes-color.svg - url: /guides/overview - items: - - text: Getting Started with KIC - url: /guides/getting-started - - text: Upgrading from previous versions - url: /guides/upgrade - - text: Getting Started using Istio - url: /guides/getting-started-istio - - text: Using Custom Resources - items: - - text: Using the KongPlugin Resource - url: /guides/using-kongplugin-resource - - text: Using the KongIngress Resource - url: /guides/using-kongingress-resource - - text: Using KongConsumer and KongCredential Resources - url: /guides/using-consumer-credential-resource - - text: Using the KongClusterPlugin Resource - url: /guides/using-kongclusterplugin-resource - - text: Using the TCPIngress Resource - url: /guides/using-tcpingress - - text: Using the UDPIngress Resource - url: /guides/using-udpingress - - text: Using the ACL and JWT Plugins - url: /guides/configure-acl-plugin - - text: Using cert-manager with Kong - url: /guides/cert-manager - - text: Configuring a Fallback Service - url: /guides/configuring-fallback-service - - text: Using an External Service - url: /guides/using-external-service - - text: Configuring HTTPS Redirects for Services - url: /guides/configuring-https-redirect - - text: Using Redis for Rate Limiting - url: /guides/redis-rate-limiting - - text: Integrate KIC with Prometheus/Grafana - url: /guides/prometheus-grafana - - text: Configuring Circuit-Breaker and Health-Checking - url: /guides/configuring-health-checks - - text: Setting up a Custom Plugin - url: /guides/setting-up-custom-plugins - - text: Using Ingress with gRPC - url: /guides/using-ingress-with-grpc - - text: Setting up Upstream mTLS - url: /guides/upstream-mtls - - text: Exposing a TCP-based Service - url: /guides/using-tcpingress - - text: Exposing a UDP-based Service - url: /guides/using-udpingress - - text: Using the mTLS Auth Plugin - url: /guides/using-mtls-auth-plugin - - text: Configuring Custom Entities - url: /guides/configuring-custom-entities - - text: Using the OpenID Connect Plugin - url: /guides/using-oidc-plugin - - text: Rewriting Hosts and Paths - url: /guides/using-rewrites - - text: Preserving Client IP Address - url: /guides/preserve-client-ip - - text: Using Gateway API - url: /guides/using-gateway-api -- title: References - icon: /assets/images/icons/documentation/icn-kubernetes-color.svg - items: - - text: KIC Annotations - url: /references/annotations - - text: CLI Arguments - url: /references/cli-arguments - - text: Custom Resource Definitions - url: /references/custom-resources - - text: Plugin Compatibility - url: /references/plugin-compatibility - - text: Version Compatibility - url: /references/version-compatibility - - text: Troubleshooting - url: /troubleshooting - - text: Prometheus Metrics - url: /references/prometheus + - title: Concepts + icon: /assets/images/icons/documentation/icn-kubernetes-color.svg + items: + - text: Architecture + url: /concepts/design + - text: Custom Resources + url: /concepts/custom-resources + - text: Deployment Methods + url: /concepts/deployment + - text: Kong for Kubernetes with Kong Enterprise + url: /concepts/k4k8s-with-kong-enterprise + - text: High-Availability and Scaling + url: /concepts/ha-and-scaling + - text: Resource Classes + url: /concepts/ingress-classes + - text: Security + url: /concepts/security + - text: Ingress Resource API Versions + url: /concepts/ingress-versions + - title: Deployment + icon: /assets/images/icons/documentation/icn-kubernetes-color.svg + url: /deployment/overview + items: + - text: Kong Ingress on Minikube + url: /deployment/minikube + - text: Kong for Kubernetes + url: /deployment/k4k8s + - text: Kong for Kubernetes Enterprise + url: /deployment/k4k8s-enterprise + - text: Kong for Kubernetes with Kong Enterprise + url: /deployment/kong-enterprise + - text: Kong Ingress on AKS + url: /deployment/aks + - text: Kong Ingress on EKS + url: /deployment/eks + - text: Kong Ingress on GKE + url: /deployment/gke + - text: Admission Controller + url: /deployment/admission-webhook + - title: Guides + icon: /assets/images/icons/documentation/icn-kubernetes-color.svg + url: /guides/overview + items: + - text: Getting Started with KIC + url: /guides/getting-started + - text: Upgrading from previous versions + url: /guides/upgrade + - text: Getting Started using Istio + url: /guides/getting-started-istio + - text: Using Custom Resources + items: + - text: Using the KongPlugin Resource + url: /guides/using-kongplugin-resource + - text: Using the KongIngress Resource + url: /guides/using-kongingress-resource + - text: Using KongConsumer and KongCredential Resources + url: /guides/using-consumer-credential-resource + - text: Using the KongClusterPlugin Resource + url: /guides/using-kongclusterplugin-resource + - text: Using the TCPIngress Resource + url: /guides/using-tcpingress + - text: Using the UDPIngress Resource + url: /guides/using-udpingress + - text: Using the ACL and JWT Plugins + url: /guides/configure-acl-plugin + - text: Using cert-manager with Kong + url: /guides/cert-manager + - text: Configuring a Fallback Service + url: /guides/configuring-fallback-service + - text: Using an External Service + url: /guides/using-external-service + - text: Configuring HTTPS Redirects for Services + url: /guides/configuring-https-redirect + - text: Using Redis for Rate Limiting + url: /guides/redis-rate-limiting + - text: Integrate KIC with Prometheus/Grafana + url: /guides/prometheus-grafana + - text: Configuring Circuit-Breaker and Health-Checking + url: /guides/configuring-health-checks + - text: Setting up a Custom Plugin + url: /guides/setting-up-custom-plugins + - text: Using Ingress with gRPC + url: /guides/using-ingress-with-grpc + - text: Setting up Upstream mTLS + url: /guides/upstream-mtls + - text: Exposing a TCP-based Service + url: /guides/using-tcpingress + - text: Exposing a UDP-based Service + url: /guides/using-udpingress + - text: Using the mTLS Auth Plugin + url: /guides/using-mtls-auth-plugin + - text: Configuring Custom Entities + url: /guides/configuring-custom-entities + - text: Using the OpenID Connect Plugin + url: /guides/using-oidc-plugin + - text: Rewriting Hosts and Paths + url: /guides/using-rewrites + - text: Preserving Client IP Address + url: /guides/preserve-client-ip + - text: Using Gateway API + url: /guides/using-gateway-api + - title: References + icon: /assets/images/icons/documentation/icn-kubernetes-color.svg + items: + - text: KIC Annotations + url: /references/annotations + - text: CLI Arguments + url: /references/cli-arguments + - text: Custom Resource Definitions + url: /references/custom-resources + - text: Plugin Compatibility + url: /references/plugin-compatibility + - text: Version Compatibility + url: /references/version-compatibility + - text: Troubleshooting + url: /troubleshooting + - text: Prometheus Metrics + url: /references/prometheus diff --git a/app/_data/docs_nav_kic_2.4.x.yml b/app/_data/docs_nav_kic_2.4.x.yml new file mode 100644 index 000000000000..7996e731885d --- /dev/null +++ b/app/_data/docs_nav_kic_2.4.x.yml @@ -0,0 +1,134 @@ +product: kubernetes-ingress-controller +release: 2.4.x +generate: true +items: + - title: Introduction + icon: /assets/images/icons/documentation/icn-kubernetes-color.svg + url: /kubernetes-ingress-controller/ + absolute_url: true + items: + - text: FAQ + url: /faq + - text: Changelog + url: https://github.com/Kong/kubernetes-ingress-controller/blob/main/CHANGELOG.md + absolute_url: true + target_blank: true + + - title: Concepts + icon: /assets/images/icons/documentation/icn-kubernetes-color.svg + items: + - text: Architecture + url: /concepts/design + - text: Custom Resources + url: /concepts/custom-resources + - text: Deployment Methods + url: /concepts/deployment + - text: Kong for Kubernetes with Kong Enterprise + url: /concepts/k4k8s-with-kong-enterprise + - text: High-Availability and Scaling + url: /concepts/ha-and-scaling + - text: Resource Classes + url: /concepts/ingress-classes + - text: Security + url: /concepts/security + - text: Ingress Resource API Versions + url: /concepts/ingress-versions + - title: Deployment + icon: /assets/images/icons/documentation/icn-kubernetes-color.svg + url: /deployment/overview + items: + - text: Kong Ingress on Minikube + url: /deployment/minikube + - text: Kong for Kubernetes + url: /deployment/k4k8s + - text: Kong for Kubernetes Enterprise + url: /deployment/k4k8s-enterprise + - text: Kong for Kubernetes with Kong Enterprise + url: /deployment/kong-enterprise + - text: Kong Ingress on AKS + url: /deployment/aks + - text: Kong Ingress on EKS + url: /deployment/eks + - text: Kong Ingress on GKE + url: /deployment/gke + - text: Admission Controller + url: /deployment/admission-webhook + - title: Guides + icon: /assets/images/icons/documentation/icn-kubernetes-color.svg + url: /guides/overview + items: + - text: Getting Started with KIC + url: /guides/getting-started + - text: Upgrading from previous versions + url: /guides/upgrade + - text: Getting Started using Istio + url: /guides/getting-started-istio + - text: Using Custom Resources + items: + - text: Using the KongPlugin Resource + url: /guides/using-kongplugin-resource + - text: Using the KongIngress Resource + url: /guides/using-kongingress-resource + - text: Using KongConsumer and KongCredential Resources + url: /guides/using-consumer-credential-resource + - text: Using the KongClusterPlugin Resource + url: /guides/using-kongclusterplugin-resource + - text: Using the TCPIngress Resource + url: /guides/using-tcpingress + - text: Using the UDPIngress Resource + url: /guides/using-udpingress + - text: Using the ACL and JWT Plugins + url: /guides/configure-acl-plugin + - text: Using cert-manager with Kong + url: /guides/cert-manager + - text: Configuring a Fallback Service + url: /guides/configuring-fallback-service + - text: Using an External Service + url: /guides/using-external-service + - text: Configuring HTTPS Redirects for Services + url: /guides/configuring-https-redirect + - text: Using Redis for Rate Limiting + url: /guides/redis-rate-limiting + - text: Integrate KIC with Prometheus/Grafana + url: /guides/prometheus-grafana + - text: Configuring Circuit-Breaker and Health-Checking + url: /guides/configuring-health-checks + - text: Setting up a Custom Plugin + url: /guides/setting-up-custom-plugins + - text: Using Ingress with gRPC + url: /guides/using-ingress-with-grpc + - text: Setting up Upstream mTLS + url: /guides/upstream-mtls + - text: Exposing a TCP-based Service + url: /guides/using-tcpingress + - text: Exposing a UDP-based Service + url: /guides/using-udpingress + - text: Using the mTLS Auth Plugin + url: /guides/using-mtls-auth-plugin + - text: Configuring Custom Entities + url: /guides/configuring-custom-entities + - text: Using the OpenID Connect Plugin + url: /guides/using-oidc-plugin + - text: Rewriting Hosts and Paths + url: /guides/using-rewrites + - text: Preserving Client IP Address + url: /guides/preserve-client-ip + - text: Using Gateway API + url: /guides/using-gateway-api + - title: References + icon: /assets/images/icons/documentation/icn-kubernetes-color.svg + items: + - text: KIC Annotations + url: /references/annotations + - text: CLI Arguments + url: /references/cli-arguments + - text: Custom Resource Definitions + url: /references/custom-resources + - text: Plugin Compatibility + url: /references/plugin-compatibility + - text: Version Compatibility + url: /references/version-compatibility + - text: Troubleshooting + url: /troubleshooting + - text: Prometheus Metrics + url: /references/prometheus diff --git a/app/_data/kong_versions.yml b/app/_data/kong_versions.yml index 5f581fcd0186..20864ea55d40 100644 --- a/app/_data/kong_versions.yml +++ b/app/_data/kong_versions.yml @@ -502,3 +502,7 @@ release: "2.3.x" version: "2.3.0" edition: "kubernetes-ingress-controller" +- + release: "2.4.x" + version: "2.4.0" + edition: "kubernetes-ingress-controller" diff --git a/app/_plugins/blocks/kong_version_block.rb b/app/_plugins/blocks/kong_version_block.rb index 6336dcf252cd..f2cebb1b640b 100644 --- a/app/_plugins/blocks/kong_version_block.rb +++ b/app/_plugins/blocks/kong_version_block.rb @@ -1,3 +1,4 @@ +# Language: Ruby, Level: Level 3 # frozen_string_literal: true # Generates a named anchor and wrapping tag from a string. @@ -14,7 +15,7 @@ def initialize(tag_name, markup, tokens) super end - def render(context) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength + def render(context) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity contents = super current_version = to_version(context.environments.first['page']['kong_version']) @@ -37,10 +38,23 @@ def render(context) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength return '' unless current_version <= version end - # Remove the leading and trailing whitespace and return + # Table rows (starts newline then |, ends with | then newline) need + # special handline + is_table_row = /^\n\s*\|/.match(contents) && /\|\s*\n$/.match(contents) + + # Remove the leading whitespace and return # We can't use .strip as that removes all leading whitespace, # including indentation - contents.sub(/^\n/, '').sub(/\n$/, '') + contents = contents.sub(/^\n/, '') + + # Remove the trailing whitespace + # But ONLY if it's not a table row + contents = contents.sub(/\n$/, '') unless is_table_row + + # If it's not a table row, put the \n that we removed in pre_render back + contents = "\n#{contents}\n" unless is_table_row || @params[:inline] + + contents end def to_version(input) @@ -55,7 +69,8 @@ def to_version(input) # Replace double line breaks when using if_version when # combined with 
 blocks. This is usually in code samples
   page.content = page.content.gsub(/\n(\s*{% if_version)/, '\1')
+  page.content = page.content.gsub("{% endif_version %}\n\n", "{% endif_version %}\n")
 
   # Also allow for a newline after endif_version when in a table
-  page.content = page.content.gsub("{% endif_version %}\n\n|", "{% endif_version %}\n|")
+  page.content = page.content.gsub("{% endif_version %}\n|", '{% endif_version %}|')
 end
diff --git a/app/kubernetes-ingress-controller/2.3.x/references/cli-arguments.md b/app/kubernetes-ingress-controller/2.3.x/references/cli-arguments.md
deleted file mode 100644
index d371e14e9376..000000000000
--- a/app/kubernetes-ingress-controller/2.3.x/references/cli-arguments.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-title: CLI Arguments
----
-
-Various settings and configurations of the controller can be tweaked
-using CLI flags.
-
-## Environment variables
-
-Each flag defined in the table below can also be configured using
-an environment variable. The name of the environment variable is `CONTROLLER_`
-string followed by the name of flag in uppercase.
-
-For example, `--ingress-class` can be configured using the following
-environment variable:
-
-```
-CONTROLLER_INGRESS_CLASS=kong-foobar
-```
-
-It is recommended that all the configuration is done via environment variables
-and not CLI flags.
-
-## Flags
-
-Following table describes all the flags that are available:
-
-| Flag                                   | Type               | Description                                                                                                                                         | Default                           |
-|----------------------------------------|--------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------|
-| --admission-webhook-cert               | `string`           | admission server PEM certificate value                                                                                                              |                                   |
-| --admission-webhook-cert-file          | `string`           | admission server PEM certificate file path; if both this and the cert value is unset a default is provided.                                         | `/admission-webhook/tls.crt`      |
-| --admission-webhook-key                | `string`           | admission server PEM private key value                                                                                                              |                                   |
-| --admission-webhook-key-file           | `string`           | admission server PEM private key file path; if both this and the key value is unset a default is provided.                                          | `/admission-webhook/tls.key`      |
-| --admission-webhook-listen             | `string`           | The address to start admission controller on (ip:port).  Setting it to 'off' disables the admission controller.                                     | `"off"`                           |
-| --anonymous-reports                    | `string`           | Send anonymized usage data to help improve Kong                                                                                                     | `true`                            |
-| --apiserver-host                       | `string`           | The Kubernetes API server URL. If not set, the controller will use cluster config discovery.                                                        |                                   |
-| --apiserver-qps                        | `int`              | The Kubernetes API server queries per second limit.                                                                                                 | `100`                             |
-| --apiserver-burst                      | `int`              | The Kubernetes API server burst queries limit, to temporarily exceed the --apiserver-qps limit.                                                     | `300`                             |
-| --enable-controller-ingress-extensionsv1beta1 | `boolean` | Enable the extensions/v1beta1 Ingress controller.                                  | `true`                        |
-| --enable-controller-ingress-networkingv1      | `boolean` | Enable the networking.k8s.io/v1 Ingress controller.                                | `true`                         |
-| --enable-controller-ingress-networkingv1beta1 | `boolean` | Enable the networking.k8s.io/v1beta1 Ingress controller.                           | `true`                        |
-| --enable-controller-knativeingress            | `boolean` | Enable the KnativeIngress controller.                                                                 | `true`                         |
-| --enable-controller-kongclusterplugin         | `boolean` | Enable the KongClusterPlugin controller.                                                              | `true`                         |
-| --enable-controller-kongconsumer              | `boolean` | Enable the KongConsumer controller.                                                                   | `true`                         |
-| --enable-controller-kongingress               | `boolean` | Enable the KongIngress controller.                                                                    | `true`                         |
-| --enable-controller-kongplugin                | `boolean` | Enable the KongPlugin controller.                                                                     | `true`                         |
-| --enable-controller-service                   | `boolean` | Enable the Service controller.                                                                        | `true`                         |
-| --enable-controller-tcpingress                | `boolean` | Enable the TCPIngress controller.                                                                     | `true`                         |
-| --enable-controller-udpingress                | `boolean` | Enable the UDPIngress controller.                                                                     | `true`                         |
-| --dump-config                          | `boolean`          | Enable config dumps via web interface host:10256/debug/config                                                                                       | `false`                           |
-| --dump-sensitive-config                | `boolean`          | Include credentials and TLS secrets in configs exposed with --dump-config                                                                           | `false`                           |
-| --election-id                          | `string`           | Election id to use for status update.                                                                                                               | `"5b374a9e.konghq.com"`           |
-| --election-namespace                   | `string`           | Namespace to use for election ConfigMap. Only necessary for development environments running outside a Kubernetes cluster.                          | |
-| --enable-reverse-sync                  | `boolean`          | Send configuration to Kong even if the configuration checksum has not changed since previous update.                                                | `false`                           |
-| --health-probe-bind-address            | `string`           | The address the probe endpoint binds to.                                                                                                            | `":10254"`                        |
-| --help                                 | `boolean`          | help for this command                                                                                                                               | `false`                           |
-| --ingress-class                        | `string`           | Name of the ingress class to route through this controller.                                                                                         | `"kong"`                          |
-| --kong-admin-ca-cert                   | `string`           | PEM-encoded CA certificate to verify Kong's Admin SSL certificate.                                                                                  |                                   |
-| --kong-admin-ca-cert-file              | `string`           | Path to PEM-encoded CA certificate file to verify Kong's Admin SSL certificate.                                                                     |                                   |
-| --kong-admin-concurrency               | `int`              | Max number of concurrent requests sent to Kong's Admin API.                                                                                         | `10`                              |
-| --kong-admin-filter-tag                | `strings`          | The tag used to manage and filter entities in Kong. This flag can be specified multiple times to specify multiple tags.                             | `[managed-by-ingress-controller]` |
-| --kong-admin-header                    | `strings`          | add a header (key:value) to every Admin API call, this flag can be used multiple times to specify multiple headers                                  |                                   |
-| --kong-admin-tls-server-name           | `string`           | SNI name to use to verify the certificate presented by Kong in TLS.                                                                                 |                                   |
-| --kong-admin-tls-skip-verify           | `boolean`          | Disable verification of TLS certificate of Kong's Admin endpoint.                                                                                   | `false`                           |
-| --kong-admin-token                     | `string`           | The Kong Enterprise RBAC token used by the controller.                                                                                              |                                   |
-| --kong-admin-url                       | `string`           | The Kong Admin URL to connect to in the format "protocol://address:port".                                                                           | `"http://localhost:8001"`         |
-| --kong-custom-entities-secret          | `string`           | A Secret containing custom entities for DB-less mode, in "namespace/name" format                                                                    |                                   |
-| --kong-workspace                       | `string`           | Kong Enterprise workspace to configure. Leave this empty if not using Kong workspaces.                                                              |                                   |
-| --kubeconfig                           | `string`           | Path to the kubeconfig file.                                                                                                                        |                                   |
-| --log-format                           | `string`           | Format of logs of the controller. Allowed values are text and json.                                                                                 | `"text"`                          |
-| --log-level                            | `string`           | Level of logging for the controller. Allowed values are trace, debug, info, warn, error, fatal and panic.                                           | `"info"`                          |
-| --metrics-bind-address                 | `string`           | The address the metric endpoint binds to.                                                                                                           | `":10255"`                        |
-| --profiling                            | `boolean`          | Enable profiling via web interface host:10256/debug/pprof/                                                                                          | `false`                           |
-| --proxy-sync-seconds                   | `float32`          | Define the rate (in seconds) in which configuration updates will be applied to the Kong Admin API.                                                  | `3`                               |
-| --proxy-timeout-seconds                | `float32`          | Define the rate (in seconds) in which the timeout configuration will be applied to the Kong client.                                                 | `10`                              |
-| --publish-service                      | `string`           | Service fronting Ingress resources in "namespace/name" format. The controller will update Ingress status information with this Service's endpoints. |                                   |
-| --publish-status-address               | `strings`          | User-provided addresses in comma-separated string format, for use in lieu of "publish-service" when that Service lacks useful address information.  |                                   |
-| --sync-period                          | `duration`         | Relist and confirm cloud resources this often                                                                                                       | `48h`                             |
-| --update-status                        | `boolean`          | Indicates if the ingress controller should update the status of resources (e.g. IP/Hostname for v1.Ingress, e.t.c.)                                 | `true`                            |
-| --watch-namespace                      | `strings`          | Namespace(s) to watch for Kubernetes resources. Defaults to all namespaces. To watch multiple namespaces, use a comma-separated list of namespaces. | `all`                             |
diff --git a/docs/single-sourced-versions.md b/docs/single-sourced-versions.md
index ba63cb7c6402..b6309bdb4f4a 100644
--- a/docs/single-sourced-versions.md
+++ b/docs/single-sourced-versions.md
@@ -152,4 +152,10 @@ When working with tables, the filter expects new lines before and after `if_vers
 | Test1 | Works       | Shows  |
 ```
 
-The above will be rendered as a single table
\ No newline at end of file
+The above will be rendered as a single table.
+
+If using `if_version` in a sentence, specify `inline:true` like so:
+
+```
+Hello {% if_version eq:1.0.0 inline:true %}everyone in the {% endif_version %} world
+```
\ No newline at end of file
diff --git a/app/kubernetes-ingress-controller/2.3.x/concepts/custom-resources.md b/src/kubernetes-ingress-controller/concepts/custom-resources.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/concepts/custom-resources.md
rename to src/kubernetes-ingress-controller/concepts/custom-resources.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/concepts/deployment.md b/src/kubernetes-ingress-controller/concepts/deployment.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/concepts/deployment.md
rename to src/kubernetes-ingress-controller/concepts/deployment.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/concepts/design.md b/src/kubernetes-ingress-controller/concepts/design.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/concepts/design.md
rename to src/kubernetes-ingress-controller/concepts/design.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/concepts/ha-and-scaling.md b/src/kubernetes-ingress-controller/concepts/ha-and-scaling.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/concepts/ha-and-scaling.md
rename to src/kubernetes-ingress-controller/concepts/ha-and-scaling.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/concepts/ingress-classes.md b/src/kubernetes-ingress-controller/concepts/ingress-classes.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/concepts/ingress-classes.md
rename to src/kubernetes-ingress-controller/concepts/ingress-classes.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/concepts/ingress-versions.md b/src/kubernetes-ingress-controller/concepts/ingress-versions.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/concepts/ingress-versions.md
rename to src/kubernetes-ingress-controller/concepts/ingress-versions.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/concepts/k4k8s-with-kong-enterprise.md b/src/kubernetes-ingress-controller/concepts/k4k8s-with-kong-enterprise.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/concepts/k4k8s-with-kong-enterprise.md
rename to src/kubernetes-ingress-controller/concepts/k4k8s-with-kong-enterprise.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/concepts/security.md b/src/kubernetes-ingress-controller/concepts/security.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/concepts/security.md
rename to src/kubernetes-ingress-controller/concepts/security.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/deployment/admission-webhook.md b/src/kubernetes-ingress-controller/deployment/admission-webhook.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/deployment/admission-webhook.md
rename to src/kubernetes-ingress-controller/deployment/admission-webhook.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/deployment/aks.md b/src/kubernetes-ingress-controller/deployment/aks.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/deployment/aks.md
rename to src/kubernetes-ingress-controller/deployment/aks.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/deployment/eks.md b/src/kubernetes-ingress-controller/deployment/eks.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/deployment/eks.md
rename to src/kubernetes-ingress-controller/deployment/eks.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/deployment/gke.md b/src/kubernetes-ingress-controller/deployment/gke.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/deployment/gke.md
rename to src/kubernetes-ingress-controller/deployment/gke.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/deployment/k4k8s-enterprise.md b/src/kubernetes-ingress-controller/deployment/k4k8s-enterprise.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/deployment/k4k8s-enterprise.md
rename to src/kubernetes-ingress-controller/deployment/k4k8s-enterprise.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/deployment/k4k8s.md b/src/kubernetes-ingress-controller/deployment/k4k8s.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/deployment/k4k8s.md
rename to src/kubernetes-ingress-controller/deployment/k4k8s.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/deployment/kong-enterprise.md b/src/kubernetes-ingress-controller/deployment/kong-enterprise.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/deployment/kong-enterprise.md
rename to src/kubernetes-ingress-controller/deployment/kong-enterprise.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/deployment/minikube.md b/src/kubernetes-ingress-controller/deployment/minikube.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/deployment/minikube.md
rename to src/kubernetes-ingress-controller/deployment/minikube.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/deployment/overview.md b/src/kubernetes-ingress-controller/deployment/overview.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/deployment/overview.md
rename to src/kubernetes-ingress-controller/deployment/overview.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/examples/001_multiple-services.yaml b/src/kubernetes-ingress-controller/examples/001_multiple-services.yaml
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/examples/001_multiple-services.yaml
rename to src/kubernetes-ingress-controller/examples/001_multiple-services.yaml
diff --git a/app/kubernetes-ingress-controller/2.3.x/faq.md b/src/kubernetes-ingress-controller/faq.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/faq.md
rename to src/kubernetes-ingress-controller/faq.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/guides/cert-manager.md b/src/kubernetes-ingress-controller/guides/cert-manager.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/guides/cert-manager.md
rename to src/kubernetes-ingress-controller/guides/cert-manager.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/guides/configure-acl-plugin.md b/src/kubernetes-ingress-controller/guides/configure-acl-plugin.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/guides/configure-acl-plugin.md
rename to src/kubernetes-ingress-controller/guides/configure-acl-plugin.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/guides/configuring-custom-entities.md b/src/kubernetes-ingress-controller/guides/configuring-custom-entities.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/guides/configuring-custom-entities.md
rename to src/kubernetes-ingress-controller/guides/configuring-custom-entities.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/guides/configuring-fallback-service.md b/src/kubernetes-ingress-controller/guides/configuring-fallback-service.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/guides/configuring-fallback-service.md
rename to src/kubernetes-ingress-controller/guides/configuring-fallback-service.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/guides/configuring-health-checks.md b/src/kubernetes-ingress-controller/guides/configuring-health-checks.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/guides/configuring-health-checks.md
rename to src/kubernetes-ingress-controller/guides/configuring-health-checks.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/guides/configuring-https-redirect.md b/src/kubernetes-ingress-controller/guides/configuring-https-redirect.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/guides/configuring-https-redirect.md
rename to src/kubernetes-ingress-controller/guides/configuring-https-redirect.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/guides/getting-started-istio.md b/src/kubernetes-ingress-controller/guides/getting-started-istio.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/guides/getting-started-istio.md
rename to src/kubernetes-ingress-controller/guides/getting-started-istio.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/guides/getting-started.md b/src/kubernetes-ingress-controller/guides/getting-started.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/guides/getting-started.md
rename to src/kubernetes-ingress-controller/guides/getting-started.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/guides/overview.md b/src/kubernetes-ingress-controller/guides/overview.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/guides/overview.md
rename to src/kubernetes-ingress-controller/guides/overview.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/guides/preserve-client-ip.md b/src/kubernetes-ingress-controller/guides/preserve-client-ip.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/guides/preserve-client-ip.md
rename to src/kubernetes-ingress-controller/guides/preserve-client-ip.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/guides/prometheus-grafana.md b/src/kubernetes-ingress-controller/guides/prometheus-grafana.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/guides/prometheus-grafana.md
rename to src/kubernetes-ingress-controller/guides/prometheus-grafana.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/guides/redis-rate-limiting.md b/src/kubernetes-ingress-controller/guides/redis-rate-limiting.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/guides/redis-rate-limiting.md
rename to src/kubernetes-ingress-controller/guides/redis-rate-limiting.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/guides/setting-up-custom-plugins.md b/src/kubernetes-ingress-controller/guides/setting-up-custom-plugins.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/guides/setting-up-custom-plugins.md
rename to src/kubernetes-ingress-controller/guides/setting-up-custom-plugins.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/guides/upgrade.md b/src/kubernetes-ingress-controller/guides/upgrade.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/guides/upgrade.md
rename to src/kubernetes-ingress-controller/guides/upgrade.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/guides/upstream-mtls.md b/src/kubernetes-ingress-controller/guides/upstream-mtls.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/guides/upstream-mtls.md
rename to src/kubernetes-ingress-controller/guides/upstream-mtls.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/guides/using-consumer-credential-resource.md b/src/kubernetes-ingress-controller/guides/using-consumer-credential-resource.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/guides/using-consumer-credential-resource.md
rename to src/kubernetes-ingress-controller/guides/using-consumer-credential-resource.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/guides/using-external-service.md b/src/kubernetes-ingress-controller/guides/using-external-service.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/guides/using-external-service.md
rename to src/kubernetes-ingress-controller/guides/using-external-service.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/guides/using-gateway-api.md b/src/kubernetes-ingress-controller/guides/using-gateway-api.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/guides/using-gateway-api.md
rename to src/kubernetes-ingress-controller/guides/using-gateway-api.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/guides/using-ingress-with-grpc.md b/src/kubernetes-ingress-controller/guides/using-ingress-with-grpc.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/guides/using-ingress-with-grpc.md
rename to src/kubernetes-ingress-controller/guides/using-ingress-with-grpc.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/guides/using-kong-with-knative.md b/src/kubernetes-ingress-controller/guides/using-kong-with-knative.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/guides/using-kong-with-knative.md
rename to src/kubernetes-ingress-controller/guides/using-kong-with-knative.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/guides/using-kongclusterplugin-resource.md b/src/kubernetes-ingress-controller/guides/using-kongclusterplugin-resource.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/guides/using-kongclusterplugin-resource.md
rename to src/kubernetes-ingress-controller/guides/using-kongclusterplugin-resource.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/guides/using-kongingress-resource.md b/src/kubernetes-ingress-controller/guides/using-kongingress-resource.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/guides/using-kongingress-resource.md
rename to src/kubernetes-ingress-controller/guides/using-kongingress-resource.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/guides/using-kongplugin-resource.md b/src/kubernetes-ingress-controller/guides/using-kongplugin-resource.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/guides/using-kongplugin-resource.md
rename to src/kubernetes-ingress-controller/guides/using-kongplugin-resource.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/guides/using-mtls-auth-plugin.md b/src/kubernetes-ingress-controller/guides/using-mtls-auth-plugin.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/guides/using-mtls-auth-plugin.md
rename to src/kubernetes-ingress-controller/guides/using-mtls-auth-plugin.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/guides/using-oidc-plugin.md b/src/kubernetes-ingress-controller/guides/using-oidc-plugin.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/guides/using-oidc-plugin.md
rename to src/kubernetes-ingress-controller/guides/using-oidc-plugin.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/guides/using-rewrites.md b/src/kubernetes-ingress-controller/guides/using-rewrites.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/guides/using-rewrites.md
rename to src/kubernetes-ingress-controller/guides/using-rewrites.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/guides/using-tcpingress.md b/src/kubernetes-ingress-controller/guides/using-tcpingress.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/guides/using-tcpingress.md
rename to src/kubernetes-ingress-controller/guides/using-tcpingress.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/guides/using-udpingress.md b/src/kubernetes-ingress-controller/guides/using-udpingress.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/guides/using-udpingress.md
rename to src/kubernetes-ingress-controller/guides/using-udpingress.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/index.md b/src/kubernetes-ingress-controller/index.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/index.md
rename to src/kubernetes-ingress-controller/index.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/references/annotations.md b/src/kubernetes-ingress-controller/references/annotations.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/references/annotations.md
rename to src/kubernetes-ingress-controller/references/annotations.md
diff --git a/src/kubernetes-ingress-controller/references/cli-arguments.md b/src/kubernetes-ingress-controller/references/cli-arguments.md
new file mode 100644
index 000000000000..889d83c694ed
--- /dev/null
+++ b/src/kubernetes-ingress-controller/references/cli-arguments.md
@@ -0,0 +1,85 @@
+---
+title: CLI Arguments
+---
+
+Various settings and configurations of the controller can be tweaked
+using CLI flags.
+
+## Environment variables
+
+Each flag defined in the table below can also be configured using
+an environment variable. The name of the environment variable is `CONTROLLER_`
+string followed by the name of flag in uppercase.
+
+For example, `--ingress-class` can be configured using the following
+environment variable:
+
+```
+CONTROLLER_INGRESS_CLASS=kong-foobar
+```
+
+It is recommended that all the configuration is done via environment variables
+and not CLI flags.
+
+## Flags
+
+Following table describes all the flags that are available:
+
+| Flag                                   | Type               | Description                                                                                                                                         | Default                           |
+|----------------------------------------|--------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------|
+| `--admission-webhook-cert`               | `string`           | Admission server PEM certificate. value                                                                                                              |                                   |
+| `--admission-webhook-cert-file`          | `string`           | Admission server PEM certificate file path; if both this and the cert value is unset a default is provided.                                         | `/admission-webhook/tls.crt`      |
+| `--admission-webhook-key`                | `string`           | Admission server PEM private key value                                                                                                              |                                   |
+| `--admission-webhook-key-file`           | `string`           | Admission server PEM private key file path; if both this and the key value is unset a default is provided.                                          | `/admission-webhook/tls.key`      |
+| `--admission-webhook-listen`             | `string`           | The address to start admission controller on (ip:port).  Setting it to `off` disables the admission controller.                                     | `"off"`                           |
+| `--anonymous-reports`                    | `string`           | Send anonymized usage data to help improve Kong.                                                                                                     | `true`                            |
+| `--apiserver-burst`                      | `int`              | The Kubernetes API server burst queries limit, to temporarily exceed the `--apiserver-qps` limit.                                                     | `300`                             |
+| `--apiserver-host`                       | `string`           | The Kubernetes API server URL. If not set, the controller will use cluster config discovery.                                                        |                                   |
+| `--apiserver-qps`                        | `int`              | The Kubernetes API server queries per second limit.                                                                                                 | `100`                             |
+| `--dump-config`                          | `boolean`          | Enable config dumps via web interface `host:10256/debug/config`.                                                                                       | `false`                           |
+| `--dump-sensitive-config`                | `boolean`          | Include credentials and TLS secrets in configs exposed with `--dump-config`.                                                                           | `false`                           |
+| `--election-id`                          | `string`           | Election id to use for status update.                                                                                                               | `"5b374a9e.konghq.com"`           |
+| `--election-namespace`                   | `string`           | Namespace to use for election ConfigMap. Only necessary for development environments running outside a Kubernetes cluster.                          | |
+| `--enable-controller-ingress-extensionsv1beta1` | `boolean` | Enable the extensions/v1beta1 Ingress controller.                                  | `true`                        |
+| `--enable-controller-ingress-networkingv1`      | `boolean` | Enable the networking.k8s.io/v1 Ingress controller.                                | `true`                         |
+| `--enable-controller-ingress-networkingv1beta1` | `boolean` | Enable the networking.k8s.io/v1beta1 Ingress controller.                           | `true`                        |
+| `--enable-controller-knativeingress`            | `boolean` | Enable the KnativeIngress controller.                                                                 | `true`                         |
+| `--enable-controller-kongclusterplugin`         | `boolean` | Enable the KongClusterPlugin controller.                                                              | `true`                         |
+| `--enable-controller-kongconsumer`              | `boolean` | Enable the KongConsumer controller.                                                                   | `true`                         |
+| `--enable-controller-kongingress`               | `boolean` | Enable the KongIngress controller.                                                                    | `true`                         |
+| `--enable-controller-kongplugin`                | `boolean` | Enable the KongPlugin controller.                                                                     | `true`                         |
+| `--enable-controller-service`                   | `boolean` | Enable the Service controller.                                                                        | `true`                         |
+| `--enable-controller-tcpingress`                | `boolean` | Enable the TCPIngress controller.                                                                     | `true`                         |
+| `--enable-controller-udpingress`                | `boolean` | Enable the UDPIngress controller.                                                                     | `true`                         |
+| `--enable-reverse-sync`                  | `boolean`          | Send configuration to Kong even if the configuration checksum has not changed since previous update.                                                | `false`                           |
+| `--health-probe-bind-address`            | `string`           | The address the probe endpoint binds. to.                                                                                                            | `":10254"`                        |
+| `--help`                                 | `boolean`          | Help for this command.                                                                                                                               | `false`                           |
+| `--ingress-class`                        | `string`           | Name of the ingress class to route through this controller.                                                                                         | `"kong"`                          |
+| `--kong-admin-ca-cert`                   | `string`           | PEM-encoded CA certificate to verify Kong's Admin SSL certificate.                                                                                  |                                   |
+| `--kong-admin-ca-cert-file`              | `string`           | Path to PEM-encoded CA certificate file to verify Kong's Admin SSL certificate.                                                                     |                                   |
+| `--kong-admin-concurrency`               | `int`              | Max number of concurrent requests sent to Kong's Admin API.                                                                                         | `10`                              |
+| `--kong-admin-filter-tag`                | `strings`          | The tag used to manage and filter entities in Kong. This flag can be specified multiple times to specify multiple tags.                             | `[managed-by-ingress-controller]` |
+| `--kong-admin-header`                    | `strings`          | Add a header (key:value) to every Admin API call, this flag can be used multiple times to specify multiple headers.                                  |                                   |
+| `--kong-admin-tls-server-name`           | `string`           | SNI name to use to verify the certificate presented by Kong in TLS.                                                                                 |                                   |
+| `--kong-admin-tls-skip-verify`           | `boolean`          | Disable verification of TLS certificate of Kong's Admin endpoint.                                                                                   | `false`                           |
+| `--kong-admin-token`                     | `string`           | The Kong Enterprise RBAC token used by the controller.                                                                                              |                                   |
+| `--kong-admin-url`                       | `string`           | The Kong Admin URL to connect to in the format "protocol://address:port".                                                                           | `"http://localhost:8001"`         |
+| `--kong-custom-entities-secret`          | `string`           | A Secret containing custom entities for DB-less mode, in "namespace/name" format.                                                                    |                                   |
+| `--kong-workspace`                       | `string`           | Kong Enterprise workspace to configure. Leave this empty if not using Kong workspaces.                                                              |                                   |
+| `--kubeconfig`                           | `string`           | Path to the kubeconfig file.                                                                                                                        |                                   |
+| `--log-format`                           | `string`           | Format of logs of the controller. Allowed values are text and json.                                                                                 | `"text"`                          |
+| `--log-level`                            | `string`           | Level of logging for the controller. Allowed values are trace, debug, info, warn, error, fatal and panic.                                           | `"info"`                          |
+| `--metrics-bind-address`                 | `string`           | The address the metric endpoint binds to.                                                                                                           | `":10255"`                        |
+| `--profiling`                            | `boolean`          | Enable profiling via web interface `host:10256/debug/pprof/`.                                                                                          | `false`                           |
+| `--proxy-sync-seconds`                   | `float32`          | Define the rate (in seconds) in which configuration updates will be applied to the Kong Admin API.                                                  | `3`                               |
+| `--proxy-timeout-seconds`                | `float32`          | Define the rate (in seconds) in which the timeout configuration will be applied to the Kong client.                                                 | `10`                              |
+| `--publish-service`                      | `string`           | Service fronting Ingress resources in "namespace/name" format. The controller will update Ingress status information with this Service's endpoints. |                                   |
+| `--publish-status-address`               | `strings`          | User-provided addresses in comma-separated string format, for use in lieu of "publish-service" when that Service lacks useful address information.  |                                   |
+| `--sync-period`                          | `duration`         | Relist and confirm cloud resources this often.                                                                                                       | `48h`                             |
+
+{% if_version gte: 2.4.x %}
+| `--term-delay`                           | `duration`         | The time delay to sleep before SIGTERM or SIGINT shuts down the Ingress Controller.                                                              | `0s`                              |
+{% endif_version %}
+
+| `--update-status`                        | `boolean`          | Indicates if the ingress controller should update the status of resources (e.g. IP/Hostname for v1.Ingress, e.t.c.).                                 | `true`                            |
+| `--watch-namespace`                      | `strings`          | Namespace(s) to watch for Kubernetes resources. Defaults to all namespaces. To watch multiple namespaces, use a comma-separated list of namespaces. | `all`                             |
diff --git a/app/kubernetes-ingress-controller/2.3.x/references/custom-resources.md b/src/kubernetes-ingress-controller/references/custom-resources.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/references/custom-resources.md
rename to src/kubernetes-ingress-controller/references/custom-resources.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/references/plugin-compatibility.md b/src/kubernetes-ingress-controller/references/plugin-compatibility.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/references/plugin-compatibility.md
rename to src/kubernetes-ingress-controller/references/plugin-compatibility.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/references/prometheus.md b/src/kubernetes-ingress-controller/references/prometheus.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/references/prometheus.md
rename to src/kubernetes-ingress-controller/references/prometheus.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/references/version-compatibility.md b/src/kubernetes-ingress-controller/references/version-compatibility.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/references/version-compatibility.md
rename to src/kubernetes-ingress-controller/references/version-compatibility.md
diff --git a/app/kubernetes-ingress-controller/2.3.x/troubleshooting.md b/src/kubernetes-ingress-controller/troubleshooting.md
similarity index 100%
rename from app/kubernetes-ingress-controller/2.3.x/troubleshooting.md
rename to src/kubernetes-ingress-controller/troubleshooting.md

From 30669160d05152fb5647df8e491f1838c6f66cbf Mon Sep 17 00:00:00 2001
From: Travis Raines <571832+rainest@users.noreply.github.com>
Date: Thu, 16 Jun 2022 11:45:32 -0700
Subject: [PATCH 02/10] doc(kic) update compatibility table for 2.4

---
 .../references/version-compatibility.md       | 35 ++++++++-----------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/kubernetes-ingress-controller/references/version-compatibility.md b/src/kubernetes-ingress-controller/references/version-compatibility.md
index 04b4c8eafea2..803752199fd4 100644
--- a/src/kubernetes-ingress-controller/references/version-compatibility.md
+++ b/src/kubernetes-ingress-controller/references/version-compatibility.md
@@ -11,13 +11,8 @@ those versions' documentation.
 
 By Kong, we are here referring to the official distribution of the Open-Source Kong Gateway.
 
-| {{site.kic_product_name}} |            1.3.x            |            2.0.x            |            2.1.x            |            2.2.x            |            2.3.x            |
+| {{site.kic_product_name}} |            2.0.x            |            2.1.x            |            2.2.x            |            2.3.x            |            2.4.x            |
 |:--------------------------|:---------------------------:|:---------------------------:|:---------------------------:|:---------------------------:|:---------------------------:|
-| Kong 1.0.x                |  |  |  |  |  |
-| Kong 1.1.x                |  |  |  |  |  |
-| Kong 1.2.x                |  |  |  |  |  |
-| Kong 1.3.x                |  |  |  |  |  |
-| Kong 1.4.x                |  |  |  |  |  |
 | Kong 1.5.x                |  |  |  |  |  |
 | Kong 2.0.x                |  |  |  |  |  |
 | Kong 2.1.x                |  |  |  |  |  |
@@ -27,15 +22,15 @@ By Kong, we are here referring to the official distribution of the Open-Source K
 | Kong 2.5.x                |  |  |  |  |  |
 | Kong 2.6.x                |  |  |  |  |  |
 | Kong 2.7.x                |  |  |  |  |  |
+| Kong 2.8.x                |  |  |  |  |  |
 
 ## Kong Enterprise
 
 Kong Enterprise is the official enterprise distribution, which includes all
 other enterprise functionality, built on top of the Open-Source Kong Gateway.
 
-| {{site.kic_product_name}} |            1.3.x            |            2.0.x            |            2.1.x            |            2.2.x            |            2.3.x            |
+| {{site.kic_product_name}} |            2.0.x            |            2.1.x            |            2.2.x            |            2.3.x            |            2.4.x            |
 |:--------------------------|:---------------------------:|:---------------------------:|:---------------------------:|:---------------------------:|:---------------------------:|
-| Kong Enterprise 1.3.x     |  |  |  |  |  |
 | Kong Enterprise 1.5.x     |  |  |  |  |  |
 | Kong Enterprise 2.1.x     |  |  |  |  |  |
 | Kong Enterprise 2.2.x     |  |  |  |  |  |
@@ -44,22 +39,21 @@ other enterprise functionality, built on top of the Open-Source Kong Gateway.
 | Kong Enterprise 2.5.x     |  |  |  |  |  |
 | Kong Enterprise 2.6.x     |  |  |  |  |  |
 | Kong Enterprise 2.7.x     |  |  |  |  |  |
+| Kong Enterprise 2.8.x     |  |  |  |  |  |
 
 ## Kubernetes
 
-| {{site.kic_product_name}} |            1.3.x            |            2.0.x            |            2.1.x            |            2.2.x            |            2.3.x            |
+| {{site.kic_product_name}} |            2.0.x            |            2.1.x            |            2.2.x            |            2.3.x            |            2.4.x            |
 |:--------------------------|:---------------------------:|:---------------------------:|:---------------------------:|:---------------------------:|:---------------------------:|
-| Kubernetes 1.13           |  |  |  |  |  |
-| Kubernetes 1.14           |  |  |  |  |  |
-| Kubernetes 1.15           |  |  |  |  |  |
-| Kubernetes 1.16           |  |  |  |  |  |
+| Kubernetes 1.16           |  |  |  |  |  |
 | Kubernetes 1.17           |  |  |  |  |  |
 | Kubernetes 1.18           |  |  |  |  |  |
 | Kubernetes 1.19           |  |  |  |  |  |
 | Kubernetes 1.20           |  |  |  |  |  |
 | Kubernetes 1.21           |  |  |  |  |  |
-| Kubernetes 1.22           |  |  |  |  |  |
-| Kubernetes 1.23           |  |  |  |  |  |
+| Kubernetes 1.22           |  |  |  |  |  |
+| Kubernetes 1.23           |  |  |  |  |  |
+| Kubernetes 1.24           |  |  |  |  |  |
 
 ## Istio
 
@@ -67,14 +61,15 @@ The {{site.kic_product_name}} can be integrated with an [Istio Service Mesh][ist
 
 For each {{site.kic_product_name}} release, tests are run to verify this documentation with upcoming versions of KIC and Istio. The following table lists the tested combinations:
 
-| {{site.kic_product_name}} |            1.3.x            |            2.0.x            |            2.1.x            |            2.2.x            |            2.3.x            |
+| {{site.kic_product_name}} |            2.0.x            |            2.1.x            |            2.2.x            |            2.3.x            |            2.4.x            |
 |:--------------------------|:---------------------------:|:---------------------------:|:---------------------------:|:---------------------------:|:---------------------------:|
-| Istio 1.6                 |  |  |  |  |  |
-| Istio 1.7                 |  |  |  |  |  |
 | Istio 1.8                 |  |  |  |  |  |
-| Istio 1.9                 |  |  |  |  |  |
-| Istio 1.10                |  |  |  |  |  |
+| Istio 1.9                 |  |  |  |  |  |
+| Istio 1.10                |  |  |  |  |  |
 | Istio 1.11                |  |  |  |  |  |
+| Istio 1.12                |  |  |  |  |  |
+| Istio 1.13                |  |  |  |  |  |
+| Istio 1.14                |  |  |  |  |  |
 
 [istio]:https://istio.io
 [istio-guide]:/kubernetes-ingress-controller/{{page.kong_version}}/guides/getting-started-istio/

From 975f04eec172dc2ec1a8b4f1b2fadd7369f81b58 Mon Sep 17 00:00:00 2001
From: Travis Raines <571832+rainest@users.noreply.github.com>
Date: Thu, 16 Jun 2022 11:51:05 -0700
Subject: [PATCH 03/10] doc(kic) add 2.4 Gateway limitations

---
 .../guides/using-gateway-api.md                           | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/kubernetes-ingress-controller/guides/using-gateway-api.md b/src/kubernetes-ingress-controller/guides/using-gateway-api.md
index 0dbb8ae76ecc..32fe62c11de0 100644
--- a/src/kubernetes-ingress-controller/guides/using-gateway-api.md
+++ b/src/kubernetes-ingress-controller/guides/using-gateway-api.md
@@ -201,8 +201,16 @@ Hostname: echo-758859bbfb-cnfmx
 The KIC Gateway API alpha is a work in progress, and not all features of
 Gateway APIs are supported. In particular:
 
+{% if_version lte: 2.3.x %}
 - HTTPRoute is the only supported route type. TCPRoute, UDPRoute, and TLSRoute
   are not yet implemented.
 - HTTPRoute does not yet support multiple backendRefs. You cannot distribute
   requests across multiple Services.
+{% endif_version %}
 - queryParam matches matches are not supported.
+{% if_version gte: 2.4.x %}
+- Gateway Listener configuration does not support TLSConfig. You will not be
+  able to load certificates for HTTPRoutes and TLSRoutes via Gateway
+  configuration, and must either accept the default Kong certificate or add
+  certificates and SNI resources manually via the admin API in DB-backed mode.
+{% endif_version %}

From f4e65586d610f22ffdeefc88f3e180bd96566ced Mon Sep 17 00:00:00 2001
From: Travis Raines <571832+rainest@users.noreply.github.com>
Date: Thu, 16 Jun 2022 11:52:56 -0700
Subject: [PATCH 04/10] doc(kic) add --skip-ca-certificates

---
 src/kubernetes-ingress-controller/references/cli-arguments.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/kubernetes-ingress-controller/references/cli-arguments.md b/src/kubernetes-ingress-controller/references/cli-arguments.md
index 889d83c694ed..cb94ce48746f 100644
--- a/src/kubernetes-ingress-controller/references/cli-arguments.md
+++ b/src/kubernetes-ingress-controller/references/cli-arguments.md
@@ -75,6 +75,10 @@ Following table describes all the flags that are available:
 | `--proxy-timeout-seconds`                | `float32`          | Define the rate (in seconds) in which the timeout configuration will be applied to the Kong client.                                                 | `10`                              |
 | `--publish-service`                      | `string`           | Service fronting Ingress resources in "namespace/name" format. The controller will update Ingress status information with this Service's endpoints. |                                   |
 | `--publish-status-address`               | `strings`          | User-provided addresses in comma-separated string format, for use in lieu of "publish-service" when that Service lacks useful address information.  |                                   |
+
+{% if_version gte: 2.4.x %}
+| `--skip-ca-certificates`                 | `boolean`          | Disable CA certificate handling. When using multiple controllers for separate workspaces in the same Kong instance, all but one controller should have this set to `true` | `false`     |
+{% endif_version %}
 | `--sync-period`                          | `duration`         | Relist and confirm cloud resources this often.                                                                                                       | `48h`                             |
 
 {% if_version gte: 2.4.x %}

From d65e69c8f034391ad5e8a17cbfffde73d2888726 Mon Sep 17 00:00:00 2001
From: Travis Raines <571832+rainest@users.noreply.github.com>
Date: Thu, 16 Jun 2022 13:26:09 -0700
Subject: [PATCH 05/10] doc(kic) improve copy for 2.4 updates

Co-authored-by: lena-larionova <54370747+lena-larionova@users.noreply.github.com>
---
 src/kubernetes-ingress-controller/guides/using-gateway-api.md | 4 ++--
 src/kubernetes-ingress-controller/references/cli-arguments.md | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/kubernetes-ingress-controller/guides/using-gateway-api.md b/src/kubernetes-ingress-controller/guides/using-gateway-api.md
index 32fe62c11de0..8952f8ca675c 100644
--- a/src/kubernetes-ingress-controller/guides/using-gateway-api.md
+++ b/src/kubernetes-ingress-controller/guides/using-gateway-api.md
@@ -209,8 +209,8 @@ Gateway APIs are supported. In particular:
 {% endif_version %}
 - queryParam matches matches are not supported.
 {% if_version gte: 2.4.x %}
-- Gateway Listener configuration does not support TLSConfig. You will not be
-  able to load certificates for HTTPRoutes and TLSRoutes via Gateway
+- Gateway Listener configuration does not support TLSConfig. You can't
+  load certificates for HTTPRoutes and TLSRoutes via Gateway
   configuration, and must either accept the default Kong certificate or add
   certificates and SNI resources manually via the admin API in DB-backed mode.
 {% endif_version %}
diff --git a/src/kubernetes-ingress-controller/references/cli-arguments.md b/src/kubernetes-ingress-controller/references/cli-arguments.md
index cb94ce48746f..a137a12b6315 100644
--- a/src/kubernetes-ingress-controller/references/cli-arguments.md
+++ b/src/kubernetes-ingress-controller/references/cli-arguments.md
@@ -77,7 +77,7 @@ Following table describes all the flags that are available:
 | `--publish-status-address`               | `strings`          | User-provided addresses in comma-separated string format, for use in lieu of "publish-service" when that Service lacks useful address information.  |                                   |
 
 {% if_version gte: 2.4.x %}
-| `--skip-ca-certificates`                 | `boolean`          | Disable CA certificate handling. When using multiple controllers for separate workspaces in the same Kong instance, all but one controller should have this set to `true` | `false`     |
+| `--skip-ca-certificates`                 | `boolean`          | Disable CA certificate handling. When using multiple controllers for separate workspaces in the same Kong instance, all but one controller should have this set to `true`. | `false`     |
 {% endif_version %}
 | `--sync-period`                          | `duration`         | Relist and confirm cloud resources this often.                                                                                                       | `48h`                             |
 

From 69ec9f6ac11e6b46f6d7596f4bb2acd5656fce6b Mon Sep 17 00:00:00 2001
From: "lena.larionova" 
Date: Thu, 16 Jun 2022 15:01:20 -0700
Subject: [PATCH 06/10] add kic terms to dictionary file

---
 .github/styles/kong/dictionary.txt | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/.github/styles/kong/dictionary.txt b/.github/styles/kong/dictionary.txt
index cb5779835352..1798d704592e 100644
--- a/.github/styles/kong/dictionary.txt
+++ b/.github/styles/kong/dictionary.txt
@@ -11,9 +11,12 @@ CloudFormation
 Cognito
 config
 configs
+conntrack
 cors
 Curity
 Datadog
+datagram
+datagrams
 dataplane
 dataplanes
 dbless
@@ -37,6 +40,8 @@ https
 inbounds
 ini
 io
+iptables
+Istio
 jq
 json
 JsonPath
@@ -44,13 +49,18 @@ jwk
 jwks
 jwt
 Keycloak
+kiali
+Knative
 kong
 Kong/kong
 Konnect
 kubectl
+kubeconfig
 kubernetes
 Kuma
 kumactl
+kustomization
+Kustomize
 Loggly
 loopback
 lua
@@ -61,6 +71,7 @@ Moesif
 MongoDB
 namespace
 namespaces
+namespaced
 Netlify
 Nginx
 observability
@@ -71,6 +82,10 @@ passthrough
 PayPal
 plaintext
 PowerShell
+prepend
+prepends
+prepended
+profiler
 Prometheus
 Protobuf
 proxied
@@ -78,12 +93,15 @@ proxying
 redis
 referenceable
 repo
+routable
 runtime
 runtimes
 deduplication
 deduplicate
 sandboxing
 serializer
+serverless
+snis
 ssl
 stderr
 stdin
@@ -92,6 +110,7 @@ Bagdi
 subcommand
 sudo
 Syslog
+tcpdump
 transcoder
 ttl
 txt

From 22182a737cb87ad8818345b7eaa4345c29f07cc2 Mon Sep 17 00:00:00 2001
From: "lena.larionova" 
Date: Thu, 16 Jun 2022 15:03:01 -0700
Subject: [PATCH 07/10] temporarily commend out k8s rule until we improve it
 for headers

---
 .github/styles/kong/Terms.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/styles/kong/Terms.yml b/.github/styles/kong/Terms.yml
index b2f0d3f9f69c..f30a4efe1d49 100644
--- a/.github/styles/kong/Terms.yml
+++ b/.github/styles/kong/Terms.yml
@@ -13,7 +13,7 @@ swap:
   file name: filename
   hashicorp: HashiCorp
   kong: Kong
-  '(?:kubernetes|k8s)': Kubernetes
+  # '(?:kubernetes|k8s)': Kubernetes
   kong gateway: "{{site.base_gateway}}"
   Konnect: "{{site.konnect_short_name}}"
   Konnect Cloud: "{{site.konnect_saas}}"

From 4dc8172a47f40926353cc382014debb54e3ee01e Mon Sep 17 00:00:00 2001
From: "lena.larionova" 
Date: Thu, 16 Jun 2022 15:03:49 -0700
Subject: [PATCH 08/10] fix spelling; remove reference to kong enterprise k8s,
 which doesn't exist now

---
 .../concepts/deployment.md                    | 25 ++++++-------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/kubernetes-ingress-controller/concepts/deployment.md b/src/kubernetes-ingress-controller/concepts/deployment.md
index e2917072e20e..66a2bef2d66f 100644
--- a/src/kubernetes-ingress-controller/concepts/deployment.md
+++ b/src/kubernetes-ingress-controller/concepts/deployment.md
@@ -7,9 +7,9 @@ based on uses-cases. This document explains various components involved
 and choices one can make as per the specific use-case.
 
 - [**Kubernetes Resources**](#kubernetes-resources):
-  Various Kubernetes resouces required to run the {{site.kic_product_name}}.
+  Various Kubernetes resources required to run the {{site.kic_product_name}}.
 - [**Deployment options**](#deployment-options):
-  A high-level explanantion of choices that one should consider and customize
+  A high-level explanation of choices that one should consider and customize
   the deployment to best serve a specific use case.
 
 ## Kubernetes Resources
@@ -137,10 +137,10 @@ of all the domains that Kong should be proxying, to route the traffic to Kong.
 The {{site.kic_product_name}} can run with or without a database.
 If a database is being deployed, then following resources are required:
 
-- A `StatefulSet` which runs a Postgresql pod backed with a `PersistentVolume`
+- A `StatefulSet` which runs a PostgreSQL pod backed with a `PersistentVolume`
   to store Kong's configuration.
-- An internal `Service` which resolves to the Postgresql pod. This ensures
-  that Kong can find the Postgresql instance using DNS inside
+- An internal `Service` which resolves to the PostgreSQL pod. This ensures
+  that Kong can find the PostgreSQL instance using DNS inside
   the Kubernetes cluster.
 - A batch `Job` to run schema migrations. This is required to be executed once
   to install bootstrap Kong's database schema.
@@ -257,7 +257,7 @@ There are a few different ways of accomplishing this:
   Use the annotation on Ingress and Custom resources to segment
   the Ingress resources between multiple Ingress Controllers.
   **Warning!**
-  When you use another Ingress Controler, which is default for cluster
+  When you use another Ingress Controller, which is default for cluster
   (without set any `kubernetes.io/ingress.class`), be aware of using default `kong`
   ingress class. There is special behavior of the default `kong` ingress class,
   where any ingress resource that is not annotated is picked up.
@@ -277,23 +277,12 @@ There are a few different ways of accomplishing this:
 
 The {{site.kic_product_name}} is compatible with a variety of runtimes:
 
-### Kong Gateway (OSS)
+### {{site.ce_product_name}}
 
 This is the [Open-Source Gateway](https://github.com/kong/kong) runtime.
 The Ingress Controller is primarily developed against releases of the
 open-source gateway.
 
-### Kong Enterprise K8S
-
-If you are a Kong Enterprise customer you have access to Enterprise K8s in
-addition to OSS.
-
-Kong Enterprise K8S is a package that takes the open-source Kong Gateway and
-adds enterprise-only plugins to it.
-
-You simply need to deploy Kong Enterprise K8S instead of the Open-Source
-Gateway in-order to take full-advantage of enterprise plugins.
-
 ### Kong Enterprise
 
 The {{site.kic_product_name}} is also compatible with the full-blown version of

From 8b17b79f544f07262a8ea801752170c3a8506d7b Mon Sep 17 00:00:00 2001
From: "lena.larionova" 
Date: Thu, 16 Jun 2022 15:05:06 -0700
Subject: [PATCH 09/10] fix spelling; change whitelist to allowlist, the plugin
 params changes many versions ago

---
 .../guides/configure-acl-plugin.md                   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/kubernetes-ingress-controller/guides/configure-acl-plugin.md b/src/kubernetes-ingress-controller/guides/configure-acl-plugin.md
index 2621ca0feedf..143be706e9ee 100644
--- a/src/kubernetes-ingress-controller/guides/configure-acl-plugin.md
+++ b/src/kubernetes-ingress-controller/guides/configure-acl-plugin.md
@@ -506,7 +506,7 @@ Via: kong/2.0.2
 
 ## Adding ACL's
 
-The JWT plugin doesn't provide the ability to authroize a given issuer to a
+The JWT plugin doesn't provide the ability to authorize a given issuer to a
 given ingress. To do this we need to use the ACL plugin. Let's create an admin
 ACL config
 
@@ -518,13 +518,13 @@ metadata:
   name: admin-acl
 plugin: acl
 config:
-  whitelist: ['app-admin']
+  allowlist: ['app-admin']
 " | kubectl apply -f -
 ```
 
 Then let's create a user ACL config. We want our admin to be able to access
 the same resources as the user, so let's make sure we include them in the
-whitelist.
+allowlist.
 
 ```bash
 $ echo "
@@ -534,7 +534,7 @@ metadata:
   name: plain-user-acl
 plugin: acl
 config:
-  whitelist: ['app-user','app-admin']
+  allowlist: ['app-user','app-admin']
 " | kubectl apply -f -
 ```
 
@@ -584,7 +584,7 @@ credentials:
 " | kubectl apply -f -
 ```
 
-The last thing to configure is the ingress to use the new plguins. Note, if you
+The last thing to configure is the ingress to use the new plugins. Note, if you
 set more than one ACL plugin, the last one supplied will be the only one
 evaluated.
 
@@ -721,7 +721,7 @@ Server: kong/2.0.2
 {"message":"You cannot consume this service"}
 ```
 
-The `plain-user` user is not in the `admin-acl` whitelist, and is therefore
+The `plain-user` user is not in the `admin-acl` allowlist, and is therefore
 unauthorized to access the resource
 
 ```bash

From de1edde86d0c5c15ec3211479f23ea6ed8d1a472 Mon Sep 17 00:00:00 2001
From: "lena.larionova" 
Date: Thu, 16 Jun 2022 15:06:47 -0700
Subject: [PATCH 10/10] fix spelling; clean up formatting; replace 'Kong
 Gateway' with variables

---
 .../concepts/custom-resources.md              |   6 +-
 .../concepts/design.md                        |   2 +-
 .../concepts/ha-and-scaling.md                |   6 +-
 .../concepts/ingress-classes.md               |   4 +-
 .../concepts/k4k8s-with-kong-enterprise.md    |  10 +-
 .../deployment/admission-webhook.md           |  16 +-
 .../deployment/aks.md                         |   2 +-
 .../deployment/eks.md                         |   2 +-
 .../deployment/gke.md                         |   2 +-
 .../deployment/k4k8s-enterprise.md            |   2 +-
 .../deployment/k4k8s.md                       |   2 +-
 .../deployment/kong-enterprise.md             |   2 +-
 .../deployment/overview.md                    |   4 +-
 src/kubernetes-ingress-controller/faq.md      |   2 +-
 .../guides/cert-manager.md                    |   2 +-
 .../guides/configuring-health-checks.md       |   4 +-
 .../guides/getting-started-istio.md           |  74 ++++----
 .../guides/getting-started.md                 |   4 +-
 .../guides/prometheus-grafana.md              |  10 +-
 .../guides/redis-rate-limiting.md             |   2 +-
 .../guides/setting-up-custom-plugins.md       |   2 +-
 .../guides/upgrade.md                         |  18 +-
 .../guides/upstream-mtls.md                   |   2 +-
 .../guides/using-kong-with-knative.md         |   6 +-
 .../guides/using-mtls-auth-plugin.md          |   4 +-
 .../guides/using-oidc-plugin.md               |   2 +-
 .../guides/using-udpingress.md                |  28 +--
 .../references/annotations.md                 |  22 +--
 .../references/cli-arguments.md               |   6 +-
 .../references/plugin-compatibility.md        | 159 +++++++++---------
 .../references/prometheus.md                  |   4 +-
 .../references/version-compatibility.md       |   6 +-
 .../troubleshooting.md                        |   4 +-
 33 files changed, 210 insertions(+), 211 deletions(-)

diff --git a/src/kubernetes-ingress-controller/concepts/custom-resources.md b/src/kubernetes-ingress-controller/concepts/custom-resources.md
index 39f02e7357f7..062569bd3065 100644
--- a/src/kubernetes-ingress-controller/concepts/custom-resources.md
+++ b/src/kubernetes-ingress-controller/concepts/custom-resources.md
@@ -93,7 +93,7 @@ KongClusterPlugin with the same name.
 
 _This resource requires the `kubernetes.io/ingress.class` annotation. Its value
 must match the value of the controller's `--ingress-class` argument, which is
-"kong" by default._
+`kong` by default._
 
 This custom resource configures `Consumers` in Kong.
 Every `KongConsumer` resource in Kubernetes directly translates to a
@@ -103,7 +103,7 @@ Every `KongConsumer` resource in Kubernetes directly translates to a
 
 _This resource requires the `kubernetes.io/ingress.class` annotation. Its value
 must match the value of the controller's `--ingress-class` argument, which is
-"kong" by default._
+`kong` by default._
 
 This Custom Resource is used for exposing non-HTTP
 and non-GRPC services running inside Kubernetes to
@@ -117,7 +117,7 @@ It is very similar to the Ingress resource that ships with Kubernetes.
 
 _This resource requires the `kubernetes.io/ingress.class` annotation. Its value
 must match the value of the controller's `--ingress-class` argument, which is
-"kong" by default._
+`kong` by default._
 
 This Custom Resource is used for exposing [UDP][udp] services
 running inside Kubernetes to the outside world via Kong.
diff --git a/src/kubernetes-ingress-controller/concepts/design.md b/src/kubernetes-ingress-controller/concepts/design.md
index 9cdaf9d1e402..cd220dba32da 100644
--- a/src/kubernetes-ingress-controller/concepts/design.md
+++ b/src/kubernetes-ingress-controller/concepts/design.md
@@ -37,7 +37,7 @@ proxy all the traffic.
 The following figure describes the mapping between Kubernetes concepts
 to Kong's configuration:
 
-![translating k8s to kong](/assets/images/docs/kubernetes-ingress-controller/k8s-to-kong.png "Translating k8s resources to Kong")
+![translating Kubernetes to Kong](/assets/images/docs/kubernetes-ingress-controller/k8s-to-kong.png "Translating k8s resources to Kong")
 
 Let's go through how Kubernetes resources are being mapped to Kong's
 configuration:
diff --git a/src/kubernetes-ingress-controller/concepts/ha-and-scaling.md b/src/kubernetes-ingress-controller/concepts/ha-and-scaling.md
index 61fc5baddfe3..2a15701c6eff 100644
--- a/src/kubernetes-ingress-controller/concepts/ha-and-scaling.md
+++ b/src/kubernetes-ingress-controller/concepts/ha-and-scaling.md
@@ -12,7 +12,7 @@ service disruption.
 The {{site.kic_product_name}} is composed of two parts: 1. Kong, which handles
 the requests, 2. Controller, which configures Kong dynamically.
 
-Kong itself can be deployed in a Highly available manner by deploying
+Kong itself can be deployed in a highly-available manner by deploying
 multiple instances (or pods). Kong nodes are state-less, meaning a Kong pod
 can be terminated and restarted at any point of time.
 
@@ -20,7 +20,7 @@ The controller itself can be stateful or stateless, depending on if a database
 is being used or not.
 
 If a database is not used, then the Controller and Kong are deployed as
-colocated containers in the same pod and each controller configures the Kong
+co-located containers in the same pod and each controller configures the Kong
 container that it is running with.
 
 For cases when a database is necessary, the Controllers can be deployed
@@ -48,7 +48,7 @@ The name of the ConfigMap is derived from the value of election-id CLI flag
 (default: `ingress-controller-leader`) and
 ingress-class (default: `kong`) as: "-".
 For example, the default ConfigMap that is used for leader election will
-be "ingress-controller-leader-kong", and it will be present in the same
+be `ingress-controller-leader-kong`, and it will be present in the same
 namespace that the controller is deployed in.
 
 ## Scaling
diff --git a/src/kubernetes-ingress-controller/concepts/ingress-classes.md b/src/kubernetes-ingress-controller/concepts/ingress-classes.md
index 38d51d16e907..7061da404d18 100644
--- a/src/kubernetes-ingress-controller/concepts/ingress-classes.md
+++ b/src/kubernetes-ingress-controller/concepts/ingress-classes.md
@@ -40,11 +40,11 @@ that matches the controller.
 
 ### Adding class information to resources
 
-Most resources use a [kubernetes.io/ingress-class annotation][class-annotation]
+Most resources use a [`kubernetes.io/ingress-class` annotation][class-annotation]
 to indicate their class. There are several exceptions:
 
 - v1 Ingress resources have a [dedicated `ingressClassName` field][ingress-class-name].
-- Knative Services [use the class specifed][knative-class] by the
+- Knative Services [use the class specified][knative-class] by the
   `ingress.class` key of the Knative installation's `config-network` ConfigMap.
   You can optionally [override this on a per-Service basis][knative-override]
   by adding a `networking.knative.dev/ingress.class` annotation to the Service.
diff --git a/src/kubernetes-ingress-controller/concepts/k4k8s-with-kong-enterprise.md b/src/kubernetes-ingress-controller/concepts/k4k8s-with-kong-enterprise.md
index 1f7e6c733f35..7c54f33d19f1 100644
--- a/src/kubernetes-ingress-controller/concepts/k4k8s-with-kong-enterprise.md
+++ b/src/kubernetes-ingress-controller/concepts/k4k8s-with-kong-enterprise.md
@@ -3,7 +3,7 @@ title: Kong for Kubernetes with Kong Enterprise
 ---
 
 Kong for Kubernetes is a {{site.kic_product_name}} built on top
-of Open-Source Kong Gateway.
+of Open-Source {{site.base_gateway}}.
 
 If you are an Enterprise customer, you have an option of running the
 [Enterprise version](/gateway/latest/install-and-run/kubernetes/)
@@ -20,7 +20,7 @@ Kubernetes with Kong Enterprise.
 As seen in the diagram below, this deployment consists of
 Kong for Kubernetes deployed in Kubernetes, and is hooked up with
 a database. If there are services running outside Kubernetes,
-a regular Kong Gateway proxy can be deployed there and connected to the
+a regular {{site.base_gateway}} proxy can be deployed there and connected to the
 same database. This provides a single pane of visibility of
 all services that are running in your infrastructure.
 
@@ -28,16 +28,16 @@ all services that are running in your infrastructure.
 
 In this deployment model, the database for Kong can be hosted anywhere.
 It can be a managed DBaaS service like Amazon RDS, Google Cloud
-SQL or a Postgres instance managed in-house or even an instance
+SQL or a PostgreSQL instance managed in-house or even an instance
 deployed on Kubernetes.
 If you are following this model, please keep in mind the following:
-- It is recommended to not deploy Postgres on Kubernetes,
+- It is recommended to not deploy PostgreSQL on Kubernetes,
   due to the fact that running stateful applications on Kubernetes
   is challenging to get right.
 - Ensure that you have the same image/package of Kong Enterprise
   running across the fleet. This means that all Kong instances that are
   connected to the same database must use the
-  same version of kong enteprise package.
+  same version of Kong Enterprise package.
 
 [This guide](/kubernetes-ingress-controller/{{page.kong_version}}/deployment/kong-enterprise)
 walks through the setup of the above architecture.
diff --git a/src/kubernetes-ingress-controller/deployment/admission-webhook.md b/src/kubernetes-ingress-controller/deployment/admission-webhook.md
index c6ef027fd7d2..a10c5427bb97 100644
--- a/src/kubernetes-ingress-controller/deployment/admission-webhook.md
+++ b/src/kubernetes-ingress-controller/deployment/admission-webhook.md
@@ -14,10 +14,10 @@ and enable the admission controller.
 Please note that this requires {{site.kic_product_name}} >= 0.6 to be
 already installed in the cluster.
 
-## tldr;
+## Set up with a script
 
 If you are using the stock YAML manifests to install and setup Kong for
-Kubernetes, then you can setup the admission webhook using a single command:
+Kubernetes, then you can set up the admission webhook using a single command:
 
 ```bash
 curl -sL https://bit.ly/install-kong-admission-webhook | bash
@@ -29,7 +29,7 @@ work.
 
 ## Create a certificate for the admission controller
 
-Kuberentes API-server makes an HTTPS call to the Admission Controller to verify
+Kubernetes API-server makes an HTTPS call to the Admission Controller to verify
 if the custom resource is valid or not. For this to work, Kubernetes API-server
 needs to trust the CA certificate that is used to sign Admission Controller's
 TLS certificate.
@@ -44,7 +44,7 @@ in the default case is `kong-validation-webhook.kong.svc`.
 
 ### Using self-signed certificate
 
-Use openssl to generate a self-signed certificate:
+Use `openssl` to generate a self-signed certificate:
 
 ```bash
 $ openssl req -x509 -newkey rsa:2048 -keyout tls.key -out tls.crt -days 365  \
@@ -68,7 +68,7 @@ on how to generate a certificate using the in-built CA.
 ### Create the secret
 
 Next, create a Kubernetes secret object based on the key and certificate that
-was generatd in the previous steps.
+was generated in the previous steps.
 Here, we assume that the PEM-encoded certificate is stored in a file named
 `tls.crt` and private key is stored in `tls.key`.
 
@@ -94,7 +94,7 @@ deployment.extensions/ingress-kong patched
 ## Enable the validating admission
 
 If you are using Kubernetes CA to generate the certificate, you don't need
-to supply a CA certificate (in the `caBunde` param)
+to supply a CA certificate (in the `caBunde` parameter)
 as part of the Validation Webhook configuration
 as the API-server already trusts the internal CA.
 
@@ -175,11 +175,11 @@ exists a consumer in Kong with the same username.
 
 ### Verify incorrect KongPlugins
 
-Try to create the folowing KongPlugin resource.
+Try to create the following KongPlugin resource.
 The `foo` config property does not exist in the configuration definition and
 hence the Admission Controller returns back an error.
 If you remove the `foo: bar` configuration line, the plugin will be
-created succesfully.
+created successfully.
 
 ```bash
 $ echo "
diff --git a/src/kubernetes-ingress-controller/deployment/aks.md b/src/kubernetes-ingress-controller/deployment/aks.md
index 091a1ee63e03..1c62c9b3a7cf 100644
--- a/src/kubernetes-ingress-controller/deployment/aks.md
+++ b/src/kubernetes-ingress-controller/deployment/aks.md
@@ -51,7 +51,7 @@ $ helm install kong/kong --generate-name --set ingressController.installCRDs=fal
 ## Setup environment variables
 
 Next, we will setup an environment variable with the IP address at which
-Kong is accessible. This will be used to actually send reqeusts into the
+Kong is accessible. This will be used to actually send requests into the
 Kubernetes cluster.
 
 Execute the following command to get the IP address at which Kong is accessible:
diff --git a/src/kubernetes-ingress-controller/deployment/eks.md b/src/kubernetes-ingress-controller/deployment/eks.md
index cec4c4c9274f..b4269db41b90 100644
--- a/src/kubernetes-ingress-controller/deployment/eks.md
+++ b/src/kubernetes-ingress-controller/deployment/eks.md
@@ -51,7 +51,7 @@ $ helm install kong/kong --generate-name --set ingressController.installCRDs=fal
 ## Setup environment variables
 
 Next, create an environment variable with the IP address at which
-Kong is accesssible. This IP address sends requests to the
+Kong is accessible. This IP address sends requests to the
 Kubernetes cluster.
 
 Execute the following command to get the IP address at which Kong is accessible:
diff --git a/src/kubernetes-ingress-controller/deployment/gke.md b/src/kubernetes-ingress-controller/deployment/gke.md
index c72a775dae79..7e5684dafb64 100644
--- a/src/kubernetes-ingress-controller/deployment/gke.md
+++ b/src/kubernetes-ingress-controller/deployment/gke.md
@@ -103,7 +103,7 @@ $ helm install kong/kong --generate-name --set ingressController.installCRDs=fal
 ## Setup environment variables
 
 Next, we will setup an environment variable with the IP address at which
-Kong is accesssible. This will be used to actually send reqeusts into the
+Kong is accessible. This will be used to actually send requests into the
 Kubernetes cluster.
 
 Execute the following command to get the IP address at which Kong is accessible:
diff --git a/src/kubernetes-ingress-controller/deployment/k4k8s-enterprise.md b/src/kubernetes-ingress-controller/deployment/k4k8s-enterprise.md
index 09faf6e9f75e..789eb5348486 100644
--- a/src/kubernetes-ingress-controller/deployment/k4k8s-enterprise.md
+++ b/src/kubernetes-ingress-controller/deployment/k4k8s-enterprise.md
@@ -46,7 +46,7 @@ your choice:
 
 ### YAML manifests
 
-Execute the following to install Kong for Kubernetes Enteprise using YAML
+Execute the following to install Kong for Kubernetes Enterprise using YAML
 manifests:
 
 ```bash
diff --git a/src/kubernetes-ingress-controller/deployment/k4k8s.md b/src/kubernetes-ingress-controller/deployment/k4k8s.md
index bbabcd43c76f..b57e1d5b58db 100644
--- a/src/kubernetes-ingress-controller/deployment/k4k8s.md
+++ b/src/kubernetes-ingress-controller/deployment/k4k8s.md
@@ -3,7 +3,7 @@ title: Kong for Kubernetes
 ---
 
 Kong for Kubernetes is an Ingress Controller based on the
-Open-Source Kong Gateway. It consists of two components:
+Open-Source {{site.base_gateway}}. It consists of two components:
 
 - **Kong**: the Open-Source Gateway
 - **Controller**: a daemon process that integrates with the
diff --git a/src/kubernetes-ingress-controller/deployment/kong-enterprise.md b/src/kubernetes-ingress-controller/deployment/kong-enterprise.md
index b2ed58be6bb4..8a792b480f0c 100644
--- a/src/kubernetes-ingress-controller/deployment/kong-enterprise.md
+++ b/src/kubernetes-ingress-controller/deployment/kong-enterprise.md
@@ -111,7 +111,7 @@ It will take a few minutes to roll out the updated deployment and once the new
 `ingress-kong` pod is up and running, you should be able to log into the Kong Manager UI.
 
 As you follow along with other guides on how to use your newly deployed the {{site.kic_product_name}},
-you will be able to browse Kong Manager and see changes reflectded in the UI as Kong's
+you will be able to browse Kong Manager and see changes reflected in the UI as Kong's
 configuration changes.
 
 ## Using Kong for Kubernetes with Kong Enterprise
diff --git a/src/kubernetes-ingress-controller/deployment/overview.md b/src/kubernetes-ingress-controller/deployment/overview.md
index e2266e16feaf..6296e6b6abe8 100644
--- a/src/kubernetes-ingress-controller/deployment/overview.md
+++ b/src/kubernetes-ingress-controller/deployment/overview.md
@@ -17,7 +17,7 @@ The {{site.kic_product_name}} can be installed on a local, managed
 or any Kubernetes cluster which supports a service of type `LoadBalancer`.
 
 As explained in the [deployment document](/kubernetes-ingress-controller/{{page.kong_version}}/concepts/deployment), there
-are a vareity of configurations and runtimes for the {{site.kic_product_name}}.
+are a variety of configurations and runtimes for the {{site.kic_product_name}}.
 
 The following sections detail on deployment steps for all the different
 runtimes:
@@ -26,7 +26,7 @@ runtimes:
 
 
 Kong for Kubernetes is an Ingress Controller based on the
-Open-Source Kong Gateway. It consists of two components:
+Open-Source {{site.base_gateway}}. It consists of two components:
 
 - **Kong**: the Open-Source Gateway
 - **Controller**: a daemon process that integrates with the
diff --git a/src/kubernetes-ingress-controller/faq.md b/src/kubernetes-ingress-controller/faq.md
index a566066cc1e1..853194049fea 100644
--- a/src/kubernetes-ingress-controller/faq.md
+++ b/src/kubernetes-ingress-controller/faq.md
@@ -15,7 +15,7 @@ such as conntrack entries for iptables DNAT.
 
 ### Is it possible to create consumers using the Admin API?
 
-From version 0.5.0 onwards, the {{site.kic_product_name}} tags each entity
+From version 0.5.0 onward, the {{site.kic_product_name}} tags each entity
 that it manages inside Kong's database and only manages the entities that
 it creates.
 This means that if consumers and credentials are created dynamically, they
diff --git a/src/kubernetes-ingress-controller/guides/cert-manager.md b/src/kubernetes-ingress-controller/guides/cert-manager.md
index b28f4402b779..1917ffd2e1b2 100644
--- a/src/kubernetes-ingress-controller/guides/cert-manager.md
+++ b/src/kubernetes-ingress-controller/guides/cert-manager.md
@@ -11,7 +11,7 @@ Any ACME-based CA can be used in-place of Let's Encrypt as well.
 You will need the following:
 
 - Kubernetes cluster that can provision an IP address that is routable from
-  the Internet. If you don't have one, you can use GKE or any managed k8s
+  the Internet. If you don't have one, you can use GKE or any managed Kubernetes
   cloud offering.
 - A domain name for which you control the DNS records.
   This is necessary so that
diff --git a/src/kubernetes-ingress-controller/guides/configuring-health-checks.md b/src/kubernetes-ingress-controller/guides/configuring-health-checks.md
index 5557636635f1..27dc724fff9e 100644
--- a/src/kubernetes-ingress-controller/guides/configuring-health-checks.md
+++ b/src/kubernetes-ingress-controller/guides/configuring-health-checks.md
@@ -312,7 +312,7 @@ $ curl -i $PROXY_IP/foo/status/500
 ```
 
 Now, sending the following request will fail for about 15 seconds,
-the duration it will take active healthchecks to re-classify
+the duration it will take active health checks to re-classify
 the httpbin pod as healthy again.
 
 ```bash
@@ -352,5 +352,5 @@ when passive health-checks marked it unhealthy.
 Scale the `httpbin` and `ingress-kong` deployments and observe how
 multiple pods change the outcome of the above demo.
 
-Read more about health-checks and ciruit breaker in Kong's
+Read more about health-checks and circuit breaker in Kong's
 [documentation](/gateway/latest/reference/health-checks-circuit-breakers).
diff --git a/src/kubernetes-ingress-controller/guides/getting-started-istio.md b/src/kubernetes-ingress-controller/guides/getting-started-istio.md
index 7703f2781cf3..725672846d40 100644
--- a/src/kubernetes-ingress-controller/guides/getting-started-istio.md
+++ b/src/kubernetes-ingress-controller/guides/getting-started-istio.md
@@ -2,7 +2,7 @@
 title: Running the Kubernetes Ingress Controller with Istio
 ---
 
-This guide walks you through deploying {{site.base_gateway}} with {{site.kic_product_name}} 
+This guide walks you through deploying {{site.base_gateway}} with {{site.kic_product_name}}
 as the gateway for [Istio][istio] as your service mesh solution.
 
 See the [version compatibility reference][compat] for the
@@ -44,19 +44,19 @@ This guide shows how to:
 * [cURL][curl] version 7.x.x
 
 You can use a managed cluster from a cloud provider, such as [AWS (EKS)][eks],
-[Google Cloud (GKE)][gke], or [Azure (AKS)][aks], or you can work locally with 
+[Google Cloud (GKE)][gke], or [Azure (AKS)][aks], or you can work locally with
 tools such as [Minikube][minikube] or [Microk8s][microk8s].
 
 Your Kubernetes cluster must provision
   `LoadBalancer` type [Services][svc]. Cloud providers generally
   automate `LoadBalancer` type `Service` provisioning with their default
-  settings, but if you run your cluster elsewhere you might need to check 
+  settings, but if you run your cluster elsewhere you might need to check
   the relevant documentation for details. See also the Kubernetes documentation  
   for [external load balancers][svc-lb].
 
 Some of the `kubectl` calls in this guide assume your test
-  cluster is the current default cluster context. To check, or for more 
-  information, see the Kubernetes documentation on 
+  cluster is the current default cluster context. To check, or for more
+  information, see the Kubernetes documentation on
   [configuring access to multiple clusters][contexts].
 
 [kubectl]:https://kubernetes.io/docs/tasks/tools/#kubectl
@@ -73,8 +73,8 @@ Some of the `kubectl` calls in this guide assume your test
 
 ### Download and verify Istio
 
-This guide shows how to install with [istioctl][istioctl], 
-because it's the community recommended method. The [Istio installation guides][istio-install] 
+This guide shows how to install with [`istioctl`][istioctl],
+because it's the community recommended method. The [Istio installation guides][istio-install]
 explain alternative deployment mechanisms.
 
 You can also explore the
@@ -88,9 +88,9 @@ You can also explore the
     curl -s -L https://istio.io/downloadIstio | ISTIO_VERSION=1.11.2 sh -
     ```
 
-    The response includes instructions to set up the `istioctl` program locally and perform 
-    pre-check validation of the Istio installation. 
-    
+    The response includes instructions to set up the `istioctl` program locally and perform
+    pre-check validation of the Istio installation.
+
 1.  Make sure to add `istioctl` to your shell's path:
 
     ```console
@@ -111,8 +111,8 @@ Kubernetes cluster to ensure Istio will deploy to it properly:
 
 ### Deploy Istio
 
-Istio provides [configuration profiles][istio-profiles] to let you customize your Istio 
-deployment, and default profiles are included with the installation. This guide works with 
+Istio provides [configuration profiles][istio-profiles] to let you customize your Istio
+deployment, and default profiles are included with the installation. This guide works with
 the `demo` profile, which is meant for testing and evaluation.
 
 Deploy Istio with the `demo` profile:
@@ -150,8 +150,8 @@ control program for Istio -- to manage the pods and add them to the mesh network
 
 ### Deploy {{site.base_gateway}} and {{site.kic_product_name}}
 
-The [Kong Helm Chart][chart] deploys a Pod that includes containers for 
-{{site.base_gateway}} and {{site.kic_product_name}}. Here's how to deploy it 
+The [Kong Helm Chart][chart] deploys a Pod that includes containers for
+{{site.base_gateway}} and {{site.kic_product_name}}. Here's how to deploy it
 to the Istio-enabled `kong-istio` namespace.
 
 1.  Make sure you have the Kong Helm repository configured locally:
@@ -167,12 +167,12 @@ to the Istio-enabled `kong-istio` namespace.
     ```
 
 1.  Verify that Kong containers are deployed and the Istio sidecar container is injected
-properly: 
+properly:
 
     ```console
     kubectl describe pod -n kong-istio -l app.kubernetes.io/instance=kong-istio
     ```
-    The output should look like: 
+    The output should look like:
 
     ```console
     Events:
@@ -202,10 +202,10 @@ properly:
 
 ### Deploy BookInfo example application
 
-The Istio [BookInfo][bookinfo] application provides a basic example that lets 
+The Istio [BookInfo][bookinfo] application provides a basic example that lets
 you explore and evaluate Istio's mesh features.
 
-As in previous steps, you create a namespace, add the appropriate label, and 
+As in previous steps, you create a namespace, add the appropriate label, and
 then deploy.
 
 1.  Create the namespace:
@@ -226,7 +226,7 @@ then deploy.
     ```console
     kubectl -n bookinfo apply -f istio-1.11.2/samples/bookinfo/platform/kube/bookinfo.yaml
     ```
-    
+
     The response should look like:
 
     ```console
@@ -254,9 +254,9 @@ then deploy.
 
 [bookinfo]:https://istio.io/latest/docs/examples/bookinfo/
 
-### Access BookInfo externally through Kong Gateway
+### Access BookInfo externally through {{site.base_gateway}}
 
-At this point the BookInfo application is available only internally. Here's how 
+At this point the BookInfo application is available only internally. Here's how
 to expose it as a service with [Ingress][ingress].
 
 1.  Save the following as `bookinfo-ingress.yaml`:
@@ -287,7 +287,7 @@ to expose it as a service with [Ingress][ingress].
     kubectl apply -f bookinfo-ingress.yaml
     ```
 
-1.  To make HTTP requests using Kong Gateway as ingress, you need the IP address of the 
+1.  To make HTTP requests using {{site.base_gateway}} as ingress, you need the IP address of the
 load balancer. Get the `LoadBalancer` address and store it in a local `PROXY_IP`
 environment variable:
 
@@ -295,10 +295,10 @@ environment variable:
     export PROXY_IP=$(kubectl -n kong-istio get svc kong-istio-kong-proxy -o=jsonpath='{.status.loadBalancer.ingress[0].ip}')
     ```
 
-    If you're running your cluster on AWS, specify `.hostname` instead of `.ip`. This is because the AWS load balancer 
+    If you're running your cluster on AWS, specify `.hostname` instead of `.ip`. This is because the AWS load balancer
     provides only a DNS name. This can also happen with other cluster providers.
 
-    Make sure to check that the value of `$PROXY_IP` is the value of the external host. 
+    Make sure to check that the value of `$PROXY_IP` is the value of the external host.
     You can check with `kubectl get svc kong-istio-kong-proxy`.
 
 1.  Make an external connection request:
@@ -306,7 +306,7 @@ environment variable:
     ```console
     curl -s -v http://$PROXY_IP | head -4
     ```
-    
+
     The response should look like:
 
     ```console
@@ -393,7 +393,7 @@ service. The plugin adds rate limiting to the `BookInfo` application and limits
     < ratelimit-reset: 2
     ```
 
-For more examples of Kong features to add to your environment, see the 
+For more examples of Kong features to add to your environment, see the
 [available guides][kic-guides].
 
 [kongplugin]:/kubernetes-ingress-controller/{{page.kong_version}}/guides/using-kongplugin-resource/
@@ -403,12 +403,12 @@ For more examples of Kong features to add to your environment, see the
 ### Mesh network observability with Kiali
 
 For observability, Istio includes a web console called [Kiali][kiali] that can
-provide [topology][kiali-topology], [health][kiali-health], and 
+provide [topology][kiali-topology], [health][kiali-health], and
 [other features][kiali-features] to provide insights
 into your application traffic.
 
-You also need a Prometheus metrics server, and Grafana for visualization dashboards. 
-Istio includes these as addons. Here's what to do:
+You also need a Prometheus metrics server, and Grafana for visualization dashboards.
+Istio includes these as add-ons. Here's what to do:
 
 1.  Install Prometheus:
 
@@ -469,25 +469,25 @@ Istio includes these as addons. Here's what to do:
     COUNT=25 ; until [ $COUNT -le 0 ]; do curl -s -o /dev/null http://$PROXY_IP ; ((COUNT--)); done
     ```
 
-1.  In a production environment, you'd access the Kiali dashboard through the Kong 
-ingress. But this sample version of Kiali is meant for exploring only internal traffic on the 
-cluster. You can instead use the [port-forwarding][k8s-port-forwarding] functionality that `istioctl` 
+1.  In a production environment, you'd access the Kiali dashboard through the Kong
+ingress. But this sample version of Kiali is meant for exploring only internal traffic on the
+cluster. You can instead use the [port-forwarding][k8s-port-forwarding] functionality that `istioctl`
 provides.
 
-    In a new terminal, run: 
+    In a new terminal, run:
 
     ```console
     istioctl dashboard kiali
     ```
 
-    This runs a `port-forward` to Kiali in the background and opens it in your web browser. 
+    This runs a `port-forward` to Kiali in the background and opens it in your web browser.
     The response should look like:
 
     ```console
     http://localhost:20001/kiali
     ```
 
-    If http://localhost:20001/kiali doesn't open automatically 
+    If http://localhost:20001/kiali doesn't open automatically
 in your browser, navigate manually to the address.
 
 You're now connected to Kiali and have a window into the traffic moving across
@@ -501,9 +501,9 @@ topology for your `BookInfo` application's web requests:
 - Select the three dots button in the top-right corner of _Graph Overview_ and select _Show full graph_.
 - Select `kong-istio` alongside `bookinfo` in the _Namespace_ diagram.
 
-You should see a connection graph that shows connections from the {{site.base_gateway}} 
+You should see a connection graph that shows connections from the {{site.base_gateway}}
 deployed at the edge of your cluster down to the backend BookInfo application.
-The graph demonstrates some of the fundamental capabilities of Istio, and you can 
+The graph demonstrates some of the fundamental capabilities of Istio, and you can
 explore further with Kiali. For more information, see the
 [Kiali Documentation][kiali-docs].
 
diff --git a/src/kubernetes-ingress-controller/guides/getting-started.md b/src/kubernetes-ingress-controller/guides/getting-started.md
index 5a3e2200b79f..b7d8f79f7e17 100644
--- a/src/kubernetes-ingress-controller/guides/getting-started.md
+++ b/src/kubernetes-ingress-controller/guides/getting-started.md
@@ -228,8 +228,8 @@ of the Ingress rules defined in `demo-example-com` resource.
 ## Using plugins on Services
 
 Kong Ingress allows plugins to be executed on a service level, meaning
-Kong will execute a plugin whenever a request is sent to a specific k8s service,
-no matter which Ingress path it came from.
+Kong will execute a plugin whenever a request is sent to a specific Kubernetes
+service, no matter which Ingress path it came from.
 
 Create a KongPlugin resource:
 
diff --git a/src/kubernetes-ingress-controller/guides/prometheus-grafana.md b/src/kubernetes-ingress-controller/guides/prometheus-grafana.md
index 245630e2a314..062cbe3c5637 100644
--- a/src/kubernetes-ingress-controller/guides/prometheus-grafana.md
+++ b/src/kubernetes-ingress-controller/guides/prometheus-grafana.md
@@ -23,7 +23,7 @@ You’ll need a few things before we can start:
   purpose of this tutorial. We are running a GKE Kubernetes cluster v1.12.x.
 - **Helm**: We will be using [Helm](https://helm.sh/)
   to install all of our components.
-  Tiller should be installed on your k8s cluster and
+  Tiller should be installed on your Kubernetes cluster and
   Helm CLI should be available on your workstation.
   You can follow Helm’s quickstart guide to set up helm.
 
@@ -36,10 +36,10 @@ These settings are not meant for production usage.
 
 If you already have the [Prometheus
 Operator](https://github.com/prometheus-operator/prometheus-operator) and
-Grafana installed in your cluster, you can skip these steps. 
+Grafana installed in your cluster, you can skip these steps.
 
 {:.note}
-> **Note:** The Prometheus Operator is required, as the {{site.kic_product_name}} 
+> **Note:** The Prometheus Operator is required, as the {{site.kic_product_name}}
 uses its PodMonitor custom resource to configure scrape rules.
 
 ### Prometheus and Grafana
@@ -78,7 +78,7 @@ grafana:
       kic-dash:
         gnetId: 15662
         datasource: Prometheus
-  
+
 ```
 
 To install Prometheus and Grafana, execute the following, specifying the path
@@ -109,7 +109,7 @@ By default, kube-prometheus-stack [selects ServiceMonitors and PodMonitors by a
 
 ### Enable Prometheus plugin in Kong
 
-We will enable the Promtheus plugin in Kong at the global level, meaning
+We will enable the Prometheus plugin in Kong at the global level, meaning
 each request that flows into the Kubernetes cluster gets tracked in Prometheus:
 
 ```bash
diff --git a/src/kubernetes-ingress-controller/guides/redis-rate-limiting.md b/src/kubernetes-ingress-controller/guides/redis-rate-limiting.md
index 1188ee2ae34c..238d5bc311af 100644
--- a/src/kubernetes-ingress-controller/guides/redis-rate-limiting.md
+++ b/src/kubernetes-ingress-controller/guides/redis-rate-limiting.md
@@ -185,7 +185,7 @@ service/redis created
 ```
 
 Once this is deployed, let's update our KongClusterPlugin configuration to use
-Redis as a datastore rather than each Kong node storing the counter information
+Redis as a data store rather than each Kong node storing the counter information
 in-memory:
 
 ```bash
diff --git a/src/kubernetes-ingress-controller/guides/setting-up-custom-plugins.md b/src/kubernetes-ingress-controller/guides/setting-up-custom-plugins.md
index 5794eb186dd9..726207be1cb8 100644
--- a/src/kubernetes-ingress-controller/guides/setting-up-custom-plugins.md
+++ b/src/kubernetes-ingress-controller/guides/setting-up-custom-plugins.md
@@ -90,7 +90,7 @@ Notable changes:
 - The plugin code is mounted into the pod via `volumeMounts` and `volumes`
   configuration property.
 - `KONG_PLUGINS` environment variable is set to include the custom plugin
-  alongwith all the plugins that come in Kong by default.
+  along with all the plugins that come in Kong by default.
 - `KONG_LUA_PACKAGE_PATH` environment variable directs Kong to look
   for plugins in the directory where we are mounting them.
 
diff --git a/src/kubernetes-ingress-controller/guides/upgrade.md b/src/kubernetes-ingress-controller/guides/upgrade.md
index 29999777edff..63334452bff7 100644
--- a/src/kubernetes-ingress-controller/guides/upgrade.md
+++ b/src/kubernetes-ingress-controller/guides/upgrade.md
@@ -44,12 +44,12 @@ did not apply correctly to Kong upstreams. 2.1.x CRDs fix these fields:
 * `healthchecks.active.unhealthy.timeout` is now
   `healthchecks.active.unhealthy.timeouts`
 
-Before upgrading, review your KongIngresses to see if you use either of the old 
-fields. You will need to manually re-add them with the new field name after 
-upgrading. 
+Before upgrading, review your KongIngresses to see if you use either of the old
+fields. You will need to manually re-add them with the new field name after
+upgrading.
 
-Kubernetes does not allow unknown fields in CRDs. Since the old fields don't 
-exist in 2.1, Kubernetes will strip the old field and its value after updating. 
+Kubernetes does not allow unknown fields in CRDs. Since the old fields don't
+exist in 2.1, Kubernetes will strip the old field and its value after updating.
 There is no automated way to copy the old values into the new field.
 
 Helm does not update CRDs automatically, and 2.1 includes changes to the
@@ -81,7 +81,7 @@ Mechanically the `helm upgrade` is backwards compatible, but the KIC 2.0.x relea
 includes some breaking changes for options and controller operations:
 
 - Several controller manager flags were [removed or changed](#flag-changes)
-- The [format of controller manager logs](#logging-differences) has changed, 
+- The [format of controller manager logs](#logging-differences) has changed,
 and logs are now produced by multiple controllers instead of one
 - The admission webhook now requires clients that support TLS 1.2 or later.
 See the [KIC Changelog][changelog] for all changes in this release.
@@ -184,7 +184,7 @@ With the v2.0.x release, these independent controllers can be individually
 enabled or disabled with the new `--enable-controller-{NAME}` flags provided
 for the controller manager.
 
-Autonegotiation of the Ingress API version (for example, `extensions/v1beta1` or
+Auto-negotiation of the Ingress API version (for example, `extensions/v1beta1` or
 `networking/v1`) has been disabled and you now have to set
 **exactly one** option for these specific controllers:
 
@@ -293,7 +293,7 @@ helm repo update
 {% endnavtab %}
 {% navtab Response %}
 
-```shell
+```
 Hang tight while we grab the latest from your chart repositories...
 ...Successfully got an update from the "kong" chart repository
 Update Complete. ⎈Happy Helming!⎈
@@ -305,7 +305,7 @@ Update Complete. ⎈Happy Helming!⎈
 ### Perform the upgrade
 
 Run the following command, specifying the old release name, the namespace where
-you've configured Kong Gateway, and the existing `values.yaml` configuration file:
+you've configured {{site.base_gateway}}, and the existing `values.yaml` configuration file:
 
 ```shell
 $ helm upgrade ${YOUR_RELEASE_NAME} kong/kong \
diff --git a/src/kubernetes-ingress-controller/guides/upstream-mtls.md b/src/kubernetes-ingress-controller/guides/upstream-mtls.md
index 9170ea88789e..f00d21ddebb5 100644
--- a/src/kubernetes-ingress-controller/guides/upstream-mtls.md
+++ b/src/kubernetes-ingress-controller/guides/upstream-mtls.md
@@ -10,7 +10,7 @@ Kong and a Service and not Kong and a client or consumer.
 
 ## What is mTLS?
 
-Mutual authentication refers to two-way authencation, where the client and
+Mutual authentication refers to two-way authentication, where the client and
 server, both can authenticate themselves to the other party.
 
 With mutual TLS authentication, client and server both present TLS
diff --git a/src/kubernetes-ingress-controller/guides/using-kong-with-knative.md b/src/kubernetes-ingress-controller/guides/using-kong-with-knative.md
index 053678ae472d..d6356816812b 100644
--- a/src/kubernetes-ingress-controller/guides/using-kong-with-knative.md
+++ b/src/kubernetes-ingress-controller/guides/using-kong-with-knative.md
@@ -18,7 +18,7 @@ address or DNS name will certainly keep things simpler and easy for you.
 
 ## Install Knative
 
-If you don't have knative installed, you need to install Knative:
+If you don't have Knative installed, you need to install Knative:
 
 ```
 kubectl apply --filename https://github.com/knative/serving/releases/download/knative-v1.1.0/serving-crds.yaml
@@ -151,7 +151,7 @@ Via: kong/1.4.3
 Hello Go Sample v1!
 ```
 
-The request is served by Knative and from the response HTTP headeres,
+The request is served by Knative and from the response HTTP headers,
 we can tell that the request was proxied by Kong.
 
 The first request will also take longer to complete as Knative will spin
@@ -161,7 +161,7 @@ We can see how Kong observed this latency and recorded it in the
 If you perform subsequent requests,
 they should complete much faster.
 
-## Plugins for knative services
+## Plugins for Knative services
 
 Let's now execute a plugin for our new Knative service.
 
diff --git a/src/kubernetes-ingress-controller/guides/using-mtls-auth-plugin.md b/src/kubernetes-ingress-controller/guides/using-mtls-auth-plugin.md
index bc1903233444..9579e9e13a57 100644
--- a/src/kubernetes-ingress-controller/guides/using-mtls-auth-plugin.md
+++ b/src/kubernetes-ingress-controller/guides/using-mtls-auth-plugin.md
@@ -50,14 +50,14 @@ The secret resource must have a few properties:
 - It must have an `id` data property which contains a random UUID.
 - It must have a `kubernetes.io/ingress.class` annotation whose value matches
   the value of the controller's `--ingress-class` argument. By default, that
-  value is "kong".
+  value is `kong`.
 
 Note that a self-signed CA certificate is being used for the purpose of this
 guide. You should use your own CA certificate that is backed by
 your PKI infrastructure.
 
 **This example is used to show the YAML format of a `Secret` resource for the CA certificate. DO NOT directly use the certificate here.
-You should use your own CA certificate, or generate a self-signed certificate for testing.** To generate self-signed CA certificates using OpenSSL, follow these instructions: 
+You should use your own CA certificate, or generate a self-signed certificate for testing.** To generate self-signed CA certificates using OpenSSL, follow these instructions:
 ```bash
 openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -sha256 -days 365 -nodes\
  -subj "/C=US/ST=California/L=San Francisco/O=Kong/OU=Org/CN=www.example.com"
diff --git a/src/kubernetes-ingress-controller/guides/using-oidc-plugin.md b/src/kubernetes-ingress-controller/guides/using-oidc-plugin.md
index 00746914f7e0..80b0cf821c32 100644
--- a/src/kubernetes-ingress-controller/guides/using-oidc-plugin.md
+++ b/src/kubernetes-ingress-controller/guides/using-oidc-plugin.md
@@ -101,7 +101,7 @@ You should see landing page same as httpbin.org.
 Now we are going to protect our dummy service with OpenID Connect
 protocol using Google as our identity provider.
 
-First, setup an Oauth 2.0 application in
+First, setup an OAuth 2.0 application in
 [Google](https://developers.google.com/identity/protocols/oauth2/openid-connect).
 
 Once you have setup your application in Google, use the client ID and client
diff --git a/src/kubernetes-ingress-controller/guides/using-udpingress.md b/src/kubernetes-ingress-controller/guides/using-udpingress.md
index d94add24b4de..6cf8681d85b4 100644
--- a/src/kubernetes-ingress-controller/guides/using-udpingress.md
+++ b/src/kubernetes-ingress-controller/guides/using-udpingress.md
@@ -4,7 +4,7 @@ title: UDPIngress with Kong Gateway
 
 This guide walks you through deploying a simple [Service][svc] that
 listens for [UDP datagrams][udp], and exposes this service outside
-of the cluster using Kong Gateway.
+of the cluster using {{site.base_gateway}}.
 
 [svc]:https://kubernetes.io/docs/concepts/services-networking/service/
 [udp]:https://datatracker.ietf.org/doc/html/rfc768
@@ -39,7 +39,7 @@ Follow the [deployment](/kubernetes-ingress-controller/{{page.kong_version}}/dep
 the {{site.kic_product_name}} on your Kubernetes cluster.
 
 > **Note**: This feature is compatible with:
-> * Kong Gateway versions 2.0.0 and above.
+> * {{site.base_gateway}} versions 2.0.0 and above.
 > * Kong Ingress Controller versions 2.0.0 and above.
 
 ## Create a namespace
@@ -110,7 +110,7 @@ data:
     }
 ```
 
-This simple configuration tells our CoreDNS pods to forward all DNS requests to [nameservers][nameservers] present in `/etc/resolv.conf`.
+This simple configuration tells our CoreDNS pods to forward all DNS requests to [name servers][nameservers] present in `/etc/resolv.conf`.
 
 By default, `/etc/resolve.conf` points to the standard kube-dns service provided by the cluster.
 
@@ -187,7 +187,7 @@ running, you can move on to the next sections: exposing the pods through
 
 A Kubernetes [Service][svc] is a fundamental network abstraction layer
 that allows you to load-balance traffic to pods in the cluster. `Services` are
-ultimately the DNS names that the Kong Gateway will be routing our UDP traffic to.
+ultimately the DNS names that the {{site.base_gateway}} will be routing our UDP traffic to.
 
 The following manifest exposes the CoreDNS Deployment from the previous section via a service.
 
@@ -227,10 +227,10 @@ DNS server outside of the cluster using Kong's `UDPIngress` resource.
 
 The Kong Kubernetes Ingress Controller (KIC) doesn't have a
 mechanism to automatically enable new UDP ports for exposing your
-Kubernetes UDP `Services`, so you need to explicitly configure Kong Gateway to expose
+Kubernetes UDP `Services`, so you need to explicitly configure {{site.base_gateway}} to expose
 these ports prior to deploying any `UDPIngress` resources.
 
-If you're maintaining a `values.yaml` configuration for your Helm deployment of Kong Gateway,
+If you're maintaining a `values.yaml` configuration for your Helm deployment of {{site.base_gateway}},
 add a section under `udpProxy` to enable the new UDP listener:
 
 ```yaml
@@ -249,9 +249,9 @@ Once you've made the necessary configurations you can apply your changes:
 $ helm upgrade --namespace {NAMESPACE} --version {CHART_VERSION} -f values.yaml {RELEASE_NAME} kong/kong
 ```
 
-Replace `{NAMESPACE}`, `{CHART_VERSION}` and `{RELEASE_NAME}` with the values you deployed Kong Gateway with.
+Replace `{NAMESPACE}`, `{CHART_VERSION}` and `{RELEASE_NAME}` with the values you deployed {{site.base_gateway}} with.
 
-Alternatively, if you are using command line flags to deploy and manage Kong Gateway,
+Alternatively, if you are using command line flags to deploy and manage {{site.base_gateway}},
 the same configuration can be achieved with flags:
 
 ```shell
@@ -264,12 +264,12 @@ $ helm upgrade --namespace {NAMESPACE} --version {CHART_VERSION} {RELEASE_NAME}
 ```
 
 Watch the services using `kubectl get services` and wait for the `LoadBalancer` service to be ready for the Gateway.
-Once the service up, Kong Gateway is ready to serve UDP traffic on the external port `9999`
+Once the service up, {{site.base_gateway}} is ready to serve UDP traffic on the external port `9999`
 using `UDPIngress` resources.
 
 ## Deploying UDPIngress
 
-Now that Kong Gateway is listening on `9999`, you can create a `UDPIngress` resource which will attach
+Now that {{site.base_gateway}} is listening on `9999`, you can create a `UDPIngress` resource which will attach
 the CoreDNS service to that port so you can make DNS requests to it from outside the cluster.
 
 Save the following file as `coredns-udpingress.yaml`:
@@ -290,7 +290,7 @@ spec:
     port: 9999
 ```
 
-This configuration binds the Kong Gateway port `9999` to the `Service` port `53` for our DNS server.
+This configuration binds the {{site.base_gateway}} port `9999` to the `Service` port `53` for our DNS server.
 
 Apply the `coredns-udpingress.yaml` manifests:
 
@@ -298,7 +298,7 @@ Apply the `coredns-udpingress.yaml` manifests:
 $ kubectl apply -f coredns-udpingress.yaml
 ```
 
-You can now make DNS requests via Kong Gateway.
+You can now make DNS requests via {{site.base_gateway}}.
 
 ## Verification
 
@@ -306,7 +306,7 @@ Now that setup is complete, all that's left to do is verify that everything is w
 by making a DNS request to our CoreDNS server.
 
 > **Note:** This example assumes you have the `dig` command available on your local
- system. If you don't, refer to your operating system documentation for a similar DNS 
+ system. If you don't, refer to your operating system documentation for a similar DNS
  lookup tool.
 
 First, retrieve the IP address of the UDP load balancer service that we
@@ -350,4 +350,4 @@ konghq.com.		30	IN	A	34.83.126.248
 Verify that the `{KONG_UDP_ENDPOINT}` in the `SERVER` section of the response above ends
 up being equal to your `${KONG_UDP_ENDPOINT}` value.
 
-Now you're equipped to route UDP traffic into your Kubernetes cluster with Kong Gateway! 
+Now you're equipped to route UDP traffic into your Kubernetes cluster with {{site.base_gateway}}!
diff --git a/src/kubernetes-ingress-controller/references/annotations.md b/src/kubernetes-ingress-controller/references/annotations.md
index 8a1412aa183e..7f3220eb1ea7 100644
--- a/src/kubernetes-ingress-controller/references/annotations.md
+++ b/src/kubernetes-ingress-controller/references/annotations.md
@@ -26,7 +26,7 @@ Following annotations are supported on Ingress resources:
 | [`konghq.com/override`](#konghqcomoverride) | Control other routing attributes via `KongIngress` resource. |
 
 `kubernetes.io/ingress.class` is normally required, and its value should match
-the value of the `--ingress-class` controller argument ("kong" by default).
+the value of the `--ingress-class` controller argument (`kong` by default).
 
 ## Service resource
 
@@ -44,7 +44,7 @@ Following annotations are supported on Service resources:
 
 ## KongConsumer resource
 
-Following annotaitons are supported on KongConsumer resources:
+Following annotations are supported on KongConsumer resources:
 
 | Annotation name | Description |
 |-----------------|-------------|
@@ -52,7 +52,7 @@ Following annotaitons are supported on KongConsumer resources:
 | [`konghq.com/plugins`](#konghqcomplugins) | Run plugins for a specific consumer |
 
 `kubernetes.io/ingress.class` is normally required, and its value should match
-the value of the `--ingress-class` controller argument ("kong" by default).
+the value of the `--ingress-class` controller argument (`kong` by default).
 
 Setting the `--process-classless-kong-consumer` controller flag removes that requirement:
 when enabled, the controller will process KongConsumers with no
@@ -66,11 +66,11 @@ KongConsumer resources by default.
 ### kubernetes.io/ingress.class
 
 {:.note}
-> Kubernetes versions after 1.18 introduced the new `ingressClassName` 
-field to the Ingress spec and 
-[deprecated the `kubernetes.io/ingress.class` annotation](https://kubernetes.io/docs/concepts/services-networking/ingress/#deprecated-annotation). 
-Ingress resources should now use the `ingressClassName` field. 
-Kong resources (KongConsumer, TCPIngress, etc.) 
+> Kubernetes versions after 1.18 introduced the new `ingressClassName`
+field to the Ingress spec and
+[deprecated the `kubernetes.io/ingress.class` annotation](https://kubernetes.io/docs/concepts/services-networking/ingress/#deprecated-annotation).
+Ingress resources should now use the `ingressClassName` field.
+Kong resources (KongConsumer, TCPIngress, etc.)
 still use the `kubernetes.io/ingress.class` annotation.
 
 If you have multiple Ingress controllers in a single cluster,
@@ -331,9 +331,9 @@ konghq.com/methods: "GET,POST"
 > Available since controller 1.1
 
 Sets the `snis` match criteria on the Kong route associated with this Ingress.
-When using route-attached plugins that execute during the certificate 
-phase (for example, [Mutual TLS Authentication](/hub/kong-inc/mtls-auth/)), 
-the `snis` annotation allows route matching based on the server name 
+When using route-attached plugins that execute during the certificate
+phase (for example, [Mutual TLS Authentication](/hub/kong-inc/mtls-auth/)),
+the `snis` annotation allows route matching based on the server name
 indication information sent in a client's TLS handshake.
 
 Sample usage:
diff --git a/src/kubernetes-ingress-controller/references/cli-arguments.md b/src/kubernetes-ingress-controller/references/cli-arguments.md
index a137a12b6315..6ac65c6c5bd9 100644
--- a/src/kubernetes-ingress-controller/references/cli-arguments.md
+++ b/src/kubernetes-ingress-controller/references/cli-arguments.md
@@ -31,7 +31,7 @@ Following table describes all the flags that are available:
 | `--admission-webhook-cert-file`          | `string`           | Admission server PEM certificate file path; if both this and the cert value is unset a default is provided.                                         | `/admission-webhook/tls.crt`      |
 | `--admission-webhook-key`                | `string`           | Admission server PEM private key value                                                                                                              |                                   |
 | `--admission-webhook-key-file`           | `string`           | Admission server PEM private key file path; if both this and the key value is unset a default is provided.                                          | `/admission-webhook/tls.key`      |
-| `--admission-webhook-listen`             | `string`           | The address to start admission controller on (ip:port).  Setting it to `off` disables the admission controller.                                     | `"off"`                           |
+| `--admission-webhook-listen`             | `string`           | The address to start admission controller on (`ip:port`).  Setting it to `off` disables the admission controller.                                     | `"off"`                           |
 | `--anonymous-reports`                    | `string`           | Send anonymized usage data to help improve Kong.                                                                                                     | `true`                            |
 | `--apiserver-burst`                      | `int`              | The Kubernetes API server burst queries limit, to temporarily exceed the `--apiserver-qps` limit.                                                     | `300`                             |
 | `--apiserver-host`                       | `string`           | The Kubernetes API server URL. If not set, the controller will use cluster config discovery.                                                        |                                   |
@@ -41,8 +41,8 @@ Following table describes all the flags that are available:
 | `--election-id`                          | `string`           | Election id to use for status update.                                                                                                               | `"5b374a9e.konghq.com"`           |
 | `--election-namespace`                   | `string`           | Namespace to use for election ConfigMap. Only necessary for development environments running outside a Kubernetes cluster.                          | |
 | `--enable-controller-ingress-extensionsv1beta1` | `boolean` | Enable the extensions/v1beta1 Ingress controller.                                  | `true`                        |
-| `--enable-controller-ingress-networkingv1`      | `boolean` | Enable the networking.k8s.io/v1 Ingress controller.                                | `true`                         |
-| `--enable-controller-ingress-networkingv1beta1` | `boolean` | Enable the networking.k8s.io/v1beta1 Ingress controller.                           | `true`                        |
+| `--enable-controller-ingress-networkingv1`      | `boolean` | Enable the `networking.k8s.io/v1` Ingress controller.                                | `true`                         |
+| `--enable-controller-ingress-networkingv1beta1` | `boolean` | Enable the `networking.k8s.io/v1beta1` Ingress controller.                           | `true`                        |
 | `--enable-controller-knativeingress`            | `boolean` | Enable the KnativeIngress controller.                                                                 | `true`                         |
 | `--enable-controller-kongclusterplugin`         | `boolean` | Enable the KongClusterPlugin controller.                                                              | `true`                         |
 | `--enable-controller-kongconsumer`              | `boolean` | Enable the KongConsumer controller.                                                                   | `true`                         |
diff --git a/src/kubernetes-ingress-controller/references/plugin-compatibility.md b/src/kubernetes-ingress-controller/references/plugin-compatibility.md
index a88f61972cad..9908009c3642 100644
--- a/src/kubernetes-ingress-controller/references/plugin-compatibility.md
+++ b/src/kubernetes-ingress-controller/references/plugin-compatibility.md
@@ -15,91 +15,90 @@ non-default configuration for
 
 |  Plugin                 |  Kong                         |  Kong (DB-less)               |
 |-------------------------|-------------------------------|-------------------------------|
-|  acl                    |    |    |
-|  aws-lambda             |    |    |
-|  azure-functions        |    |    |
-|  basic-auth             |    |    |
-|  bot-detection          |    |    |
-|  correlation-id         |    |    |
-|  cors                   |    |    |
-|  datadog                |    |    |
-|  file-log               |    |    |
-|  hmac-auth              |    |    |
-|  http-log               |    |    |
-|  ip-restriction         |    |    |
-|  jwt                    |    |    |
-|  key-auth               |    |    |
-|  oauth2                 |    |    |
-|  post-function          |    |    |
-|  pre-function           |    |    |
-|  prometheus             |    |    |
-|  proxy-cache            |    |    |
-|  rate-limiting          |    |    |
-|  request-termination    |    |    |
-|  request-transformer    |    |    |
-|  response-ratelimiting  |    |    |
-|  response-transformer   |    |    |
-|  syslog                 |    |    |
-|  tcp-log                |    |    |
-|  udp-log                |    |    |
-|  zipkin                 |    |    |
+|  `acl`                    |    |    |
+|  `aws-lambda`             |    |    |
+|  `azure-functions`        |    |    |
+|  `basic-auth`             |    |    |
+|  `bot-detection`          |    |    |
+|  `correlation-id`         |    |    |
+|  `cors`                   |    |    |
+|  `datadog`                |    |    |
+|  `file-log`               |    |    |
+|  `hmac-auth`              |    |    |
+|  `http-log`               |    |    |
+|  `ip-restriction`         |    |    |
+|  `jwt`                    |    |    |
+|  `key-auth`               |    |    |
+|  `oauth2 `                |    |    |
+|  `post-function`          |    |    |
+|  `pre-function`           |    |    |
+|  `prometheus`             |    |    |
+|  `proxy-cache`            |    |    |
+|  `rate-limiting`          |    |    |
+|  `request-termination`    |    |    |
+|  `request-transformer`    |    |    |
+|  `response-ratelimiting`  |    |    |
+|  `response-transformer`   |    |    |
+|  `syslog`                 |    |    |
+|  `tcp-log`                |    |    |
+|  `udp-log`                |    |    |
+|  `zipkin`                 |    |    |
 
 ## Kong Enterprise
 
 |  Plugin                          |  Kong Enterprise                           |  Kong Enterprise (DB-less)                |
 |----------------------------------|--------------------------------------------|-------------------------------------------|
-|  acl                             |                 |                |
-|  aws-lambda                      |                 |                |
-|  azure-functions                 |                 |                |
-|  basic-auth                      |                 |                |
-|  bot-detection                   |                 |                |
-|  correlation-id                  |                 |                |
-|  cors                            |                 |                |
-|  datadog                         |                 |                |
-|  file-log                        |                 |                |
-|  hmac-auth                       |                 |                |
-|  http-log                        |                 |                |
-|  ip-restriction                  |                 |                |
-|  jwt                             |                 |                |
-|  key-auth                        |                 |                |
-|  oauth2                          |                 |                |
-|  post-function                   |                 |                |
-|  pre-function                    |                 |                |
-|  prometheus                      |                 |                |
-|  proxy-cache                     |                 |                |
-|  rate-limiting                   |                 |                |
-|  request-termination             |                 |                |
-|  request-transformer             |                 |                |
-|  response-ratelimiting           |                 |                |
-|  response-transformer            |                 |                |
-|  syslog                          |                 |                |
-|  tcp-log                         |                 |                |
-|  udp-log                         |                 |                |
-|  zipkin                          |                 |                |
-|  application-registration        |                 |  1  |
-|  canary release                  |                 |                |
-|  collector                       |                 |                |
-|  degraphql                       |                 |                |
-|  exit-transformer                |                 |                |
-|  forward-proxy                   |                 |                |
-|  graphql-proxy-cache-advanced    |                 |                |
-|  graphql-rate-limiting-advanced  |                 |                |
-|  jwt-signer                      |                 |                |
-|  kafka-log                       |                 |                |
-|  kafka-upstream                  |                 |                |
-|  key-auth-enc                    |                 |                |
-|  ldap-auth-advanced              |                 |                |
-|  mtls-auth                       |                 |                |
-|  oauth2-introspection            |                 |                |
-|  openid-connect                  |                 |                |
-|  proxy-cache-advanced            |                 |                |
-|  rate-limiting-advanced          |                 |                |
-|  request-transformer-advanced    |                 |                |
-|  request-validator               |                 |                |
-|  response-transformer-advanced   |                 |                |
-|  route-transformer-advanced      |                 |                |
-|  statsd-advanced                 |                 |  2  |
-|  vault-auth                      |                 |                |
+|  `acl`                             |                 |                |
+|  `aws-lambda`                      |                 |                |
+|  `azure-functions`                 |                 |                |
+|  `basic-auth`                      |                 |                |
+|  `bot-detection`                   |                 |                |
+|  `correlation-id`                  |                 |                |
+|  `cors`                            |                 |                |
+|  `datadog`                         |                 |                |
+|  `file-log`                        |                 |                |
+|  `hmac-auth`                       |                 |                |
+|  `http-log`                        |                 |                |
+|  `ip-restriction`                  |                 |                |
+|  `jwt`                             |                 |                |
+|  `key-auth`                        |                 |                |
+|  `oauth2`                          |                 |                |
+|  `post-function`                   |                 |                |
+|  `pre-function`                    |                 |                |
+|  `prometheus`                      |                 |                |
+|  `proxy-cache`                     |                 |                |
+|  `rate-limiting`                   |                 |                |
+|  `request-termination`             |                 |                |
+|  `request-transformer`             |                 |                |
+|  `response-ratelimiting`           |                 |                |
+|  `response-transformer`            |                 |                |
+|  `syslog`                          |                 |                |
+|  `tcp-log`                         |                 |                |
+|  `udp-log`                         |                 |                |
+|  `zipkin`                          |                 |                |
+|  `application-registration`        |                 |  1  |
+|  `canary`                          |                 |                |
+|  `degraphql`                       |                 |                |
+|  `exit-transformer`                |                 |                |
+|  `forward-proxy`                   |                 |                |
+|  `graphql-proxy-cache-advanced`    |                 |                |
+|  `graphql-rate-limiting-advanced`  |                 |                |
+|  `jwt-signer`                      |                 |                |
+|  `kafka-log`                       |                 |                |
+|  `kafka-upstream`                  |                 |                |
+|  `key-auth-enc`                    |                 |                |
+|  `ldap-auth-advanced`              |                 |                |
+|  `mtls-auth`                       |                 |                |
+|  `oauth2-introspection`            |                 |                |
+|  `openid-connect`                  |                 |                |
+|  `proxy-cache-advanced`            |                 |                |
+|  `rate-limiting-advanced`          |                 |                |
+|  `request-transformer-advanced`    |                 |                |
+|  `request-validator`               |                 |                |
+|  `response-transformer-advanced`   |                 |                |
+|  `route-transformer-advanced`      |                 |                |
+|  `statsd-advanced`                 |                 |  2  |
+|  `vault-auth`                      |                 |                |
 
 1 Only used with Dev Portal
 
diff --git a/src/kubernetes-ingress-controller/references/prometheus.md b/src/kubernetes-ingress-controller/references/prometheus.md
index 5e1a338eab48..de732d859c4c 100644
--- a/src/kubernetes-ingress-controller/references/prometheus.md
+++ b/src/kubernetes-ingress-controller/references/prometheus.md
@@ -2,10 +2,10 @@
 title: Prometheus metrics
 ---
 
-{{site.kic_product_name}}, as well as Kong Gateway, both expose Prometheus metrics, under certain conditions:
+{{site.kic_product_name}}, as well as {{site.base_gateway}}, both expose Prometheus metrics, under certain conditions:
 
 * {{site.kic_product_name}}, since version 2.0, exposes Prometheus metrics for configuration updates.
-* Kong Gateway can expose Prometheus metrics for served requests, if the [Prometheus plugin][prom-plugin] is enabled. See the [Using KongPlugin resource guide][kongplugin-guide] for information on how to enable a plugin. Also, we provide a specific [guide for integration with Prometheus and Grafana][grafana-guide] as well.
+* {{site.base_gateway}} can expose Prometheus metrics for served requests, if the [Prometheus plugin][prom-plugin] is enabled. See the [Using KongPlugin resource guide][kongplugin-guide] for information on how to enable a plugin. Also, we provide a specific [guide for integration with Prometheus and Grafana][grafana-guide] as well.
 
 This document is a reference for the former type.
 
diff --git a/src/kubernetes-ingress-controller/references/version-compatibility.md b/src/kubernetes-ingress-controller/references/version-compatibility.md
index 803752199fd4..3f85362a68a4 100644
--- a/src/kubernetes-ingress-controller/references/version-compatibility.md
+++ b/src/kubernetes-ingress-controller/references/version-compatibility.md
@@ -9,7 +9,7 @@ those versions' documentation.
 
 ## Kong
 
-By Kong, we are here referring to the official distribution of the Open-Source Kong Gateway.
+By Kong, we are here referring to the official distribution of the Open-Source {{site.base_gateway}}.
 
 | {{site.kic_product_name}} |            2.0.x            |            2.1.x            |            2.2.x            |            2.3.x            |            2.4.x            |
 |:--------------------------|:---------------------------:|:---------------------------:|:---------------------------:|:---------------------------:|:---------------------------:|
@@ -27,7 +27,7 @@ By Kong, we are here referring to the official distribution of the Open-Source K
 ## Kong Enterprise
 
 Kong Enterprise is the official enterprise distribution, which includes all
-other enterprise functionality, built on top of the Open-Source Kong Gateway.
+other enterprise functionality, built on top of the Open-Source {{site.base_gateway}}.
 
 | {{site.kic_product_name}} |            2.0.x            |            2.1.x            |            2.2.x            |            2.3.x            |            2.4.x            |
 |:--------------------------|:---------------------------:|:---------------------------:|:---------------------------:|:---------------------------:|:---------------------------:|
@@ -57,7 +57,7 @@ other enterprise functionality, built on top of the Open-Source Kong Gateway.
 
 ## Istio
 
-The {{site.kic_product_name}} can be integrated with an [Istio Service Mesh][istio] to use Kong Gateway as an ingress gateway for application traffic into the mesh network. See an example of this in the [Istio Guide][istio-guide].
+The {{site.kic_product_name}} can be integrated with an [Istio Service Mesh][istio] to use {{site.base_gateway}} as an ingress gateway for application traffic into the mesh network. See an example of this in the [Istio Guide][istio-guide].
 
 For each {{site.kic_product_name}} release, tests are run to verify this documentation with upcoming versions of KIC and Istio. The following table lists the tested combinations:
 
diff --git a/src/kubernetes-ingress-controller/troubleshooting.md b/src/kubernetes-ingress-controller/troubleshooting.md
index e8e6628e319a..91ee79999850 100644
--- a/src/kubernetes-ingress-controller/troubleshooting.md
+++ b/src/kubernetes-ingress-controller/troubleshooting.md
@@ -278,7 +278,7 @@ container to a local system for review with
 [Wireshark](https://www.wireshark.org/).
 
 Note that you will typically need to temporarily disable TLS to inspect
-application-layer traffic. If you have acces to the server's private keys you
+application-layer traffic. If you have access to the server's private keys you
 can [decrypt TLS](https://wiki.wireshark.org/TLS#TLS_Decryption), though this
 does not work if the session uses an ephemeral cipher (neither the controller
 nor Kong proxy have support for dumping session secrets).
@@ -292,4 +292,4 @@ information on memory and CPU consumption within the program.
 To enable profiling and access it, set `CONTROLLER_PROFILING=true` in the
 controller container environment (`ingressController.env.profiling: true` using
 the Helm chart), wait for the Deployment to restart, run `kubectl
-port-forward  10256:10256`, and visit http://localhost:10256/debug/pprof/
+port-forward  10256:10256`, and visit `http://localhost:10256/debug/pprof/`.