feat: Fix file references post merge resolution

ADubhlaoich · ADubhlaoich · commit f6fc6606adfd · 2025-05-29T11:56:25.000+01:00
diff --git a/content/ngf/how-to/_index.md b/content/ngf/how-to/_index.md
@@ -1,5 +1,5 @@
 ---
 title: "How-to guides"
 url: /nginx-gateway-fabric/how-to/
-weight: 500
+weight: 550
 ---
diff --git a/content/ngf/how-to/data-plane-configuration.md b/content/ngf/how-to/data-plane-configuration.md
@@ -180,7 +180,7 @@ When installed using the Helm chart, the NginxProxy resource is named `<release-
 
 **For a full list of configuration options that can be set, see the `NginxProxy spec` in the [API reference]({{< ref "/ngf/reference/api.md" >}}).**
 
-{{< note >}} Some global configuration also requires an [associated policy]({{< ref "/ngf/overview/custom-policies.md" >}}) to fully enable a feature (such as [tracing]({{< ref "/ngf/how-to/monitoring/tracing.md" >}}), for example). {{< /note >}}
+{{< note >}} Some global configuration also requires an [associated policy]({{< ref "/ngf/overview/custom-policies.md" >}}) to fully enable a feature (such as [tracing]({{< ref "/ngf/monitoring/tracing.md" >}}), for example). {{< /note >}}
 
 ---
 
diff --git a/content/ngf/install/_index.md b/content/ngf/install/_index.md
@@ -1,5 +1,5 @@
 ---
-title: "Installation"
+title: "Install"
 url: /nginx-gateway-fabric/install/
 weight: 300
 ---
diff --git a/content/ngf/install/control-plane-certs.md b/content/ngf/install/control-plane-certs.md
@@ -44,7 +44,7 @@ helm install \
   --set crds.enabled=true
 ```
 
-This also enables Gateway API features for cert-manager, which can be useful for [securing your workload traffic]({{< ref "/ngf/how-to/traffic-security/integrating-cert-manager.md" >}}).
+This also enables Gateway API features for cert-manager, which can be useful for [securing your workload traffic]({{< ref "/ngf/traffic-security/integrating-cert-manager.md" >}}).
 
 ## Create the CA issuer
 
@@ -194,4 +194,4 @@ nginx-gateway-ca   kubernetes.io/tls   3      15s
 server-tls         kubernetes.io/tls   3      8s
 ```
 
-**You can now [install NGINX Gateway Fabric]({{< ref "/ngf/installation/installing-ngf" >}}).**
+You can now [install NGINX Gateway Fabric]({{< ref "/ngf/install/" >}}).
diff --git a/content/ngf/install/deploy-data-plane.md b/content/ngf/install/deploy-data-plane.md
@@ -19,7 +19,7 @@ A single GatewayClass can have multiple Gateways: each Gateway will create a sep
 
 ## Before you begin
 
-- [Install]({{< ref "/ngf/installation/" >}}) NGINX Gateway Fabric.
+- [Install]({{< ref "/ngf/install/" >}}) NGINX Gateway Fabric.
 
 ## Create a Gateway
 
@@ -236,7 +236,7 @@ Annotations:              annotationKey: annotationValue
 
 For more guides on routing traffic to applications and more information on Data Plane configuration, check out the following resources:
 
-- [Routing traffic to applications]({{< ref "/ngf/how-to/traffic-management/routing-traffic-to-your-app.md" >}})
-- [Application routes using HTTP matching conditions]({{< ref "/ngf/how-to/traffic-management/advanced-routing.md" >}})
+- [Routing traffic to applications]({{< ref "/ngf/traffic-management/routing-traffic-to-your-app.md" >}})
+- [Application routes using HTTP matching conditions]({{< ref "/ngf/traffic-management/advanced-routing.md" >}})
 - [Data plane configuration]({{< ref "/ngf/how-to/data-plane-configuration.md" >}})
 - [API reference]({{< ref "/ngf/reference/api.md" >}})
diff --git a/content/ngf/install/helm.md b/content/ngf/install/helm.md
@@ -19,7 +19,7 @@ To complete this guide, you'll need to install:
 
 - [kubectl](https://kubernetes.io/docs/tasks/tools/), a command-line tool for managing Kubernetes clusters.
 - [Helm 3.0 or later](https://helm.sh/docs/intro/install/), for deploying and managing applications on Kubernetes.
-- If deploying into a production environment, we highly recommend [installing custom certificates]({{< ref "/ngf/installation/installing-ngf/control-plane-certs.md" >}}) for securing the connection between the NGINX Gateway Fabric control plane and NGINX data plane Pods. **This should be done _before_ you install NGINX Gateway Fabric.** The default certificates are self-signed and will expire after 3 years.
+- If deploying into a production environment, we highly recommend [installing custom certificates]({{< ref "/ngf/install/control-plane-certs.md" >}}) for securing the connection between the NGINX Gateway Fabric control plane and NGINX data plane Pods. **This should be done _before_ you install NGINX Gateway Fabric.** The default certificates are self-signed and will expire after 3 years.
 
 {{< important >}} If you’d like to use NGINX Plus, some additional setup is also required: {{</ important >}}
 
@@ -184,7 +184,7 @@ Secret before upgrading. Follow the steps in the [Before you begin](#before-you-
 
 {{< tip >}} For guidance on zero downtime upgrades, see the [Delay Pod Termination](#configure-delayed-pod-termination-for-zero-downtime-upgrades) section below. {{< /tip >}}
 
-{{< note >}} To upgrade from version 1.x to 2.x, please refer to this [guide]({{< ref "/ngf/upgrading-ngf.md" >}}). {{< /note >}}
+{{< note >}} To upgrade from version 1.x to 2.x, please refer to this [guide]({{< ref "/ngf/install/upgrade-2.0.md" >}}). {{< /note >}}
 
 To upgrade NGINX Gateway Fabric and get the latest features and improvements, take the following steps:
 
diff --git a/content/ngf/install/manifests.md b/content/ngf/install/manifests.md
@@ -18,7 +18,7 @@ Learn how to install, upgrade, and uninstall NGINX Gateway Fabric using Kubernet
 To complete this guide, you'll need to install:
 
 - [kubectl](https://kubernetes.io/docs/tasks/tools/), a command-line interface for managing Kubernetes clusters.
-- If deploying into a production environment, we highly recommend [installing custom certificates]({{< ref "/ngf/installation/installing-ngf/control-plane-certs.md" >}}) for securing the connection between the NGINX Gateway Fabric control plane and NGINX data plane Pods. **This should be done _before_ you install NGINX Gateway Fabric.** The default certificates are self-signed and will expire after 3 years.
+- If deploying into a production environment, we highly recommend [installing custom certificates]({{< ref "/ngf/install/control-plane-certs.md" >}}) for securing the connection between the NGINX Gateway Fabric control plane and NGINX data plane Pods. **This should be done _before_ you install NGINX Gateway Fabric.** The default certificates are self-signed and will expire after 3 years.
 
 {{< important >}} If you’d like to use NGINX Plus, some additional setup is also required: {{</ important >}}
 
@@ -211,7 +211,7 @@ Secret before upgrading. Follow the steps in the [Before you begin](#before-you-
 
 {{< tip >}} For guidance on zero downtime upgrades, see the [Delay Pod Termination](#configure-delayed-pod-termination-for-zero-downtime-upgrades) section. {{</ tip >}}
 
-{{< note >}} To upgrade from version 1.x to 2.x, please refer to this [guide]({{< ref "/ngf/upgrading-ngf.md" >}}). {{< /note >}}
+{{< note >}} To upgrade from version 1.x to 2.x, please refer to this [guide]({{< ref "/ngf/install/upgrade-2.0.md" >}}). {{< /note >}}
 
 To upgrade NGINX Gateway Fabric and get the latest features and improvements, take the following steps:
 
diff --git a/content/ngf/install/upgrade-2.0.md b/content/ngf/install/upgrade-2.0.md
@@ -44,7 +44,7 @@ Next, install the latest stable release of NGINX Gateway Fabric in the `nginx-ga
 helm install ngf oci://ghcr.io/nginx/charts/nginx-gateway-fabric --create-namespace -n nginx-gateway
 ```
 
-For additional customization options during the helm installation process, take a look at [Installation with Helm]({{< ref "/ngf/installation/installing-ngf/helm.md" >}}).
+For additional customization options during the helm installation process, take a look at [Installation with Helm]({{< ref "/ngf/install/helm.md" >}}).
 
 {{% /tab %}}
 
@@ -64,7 +64,7 @@ Next, install the latest stable release of NGINX Gateway Fabric in the `nginx-ga
 kubectl apply -f https://raw.githubusercontent.com/nginx/nginx-gateway-fabric/v{{< version-ngf >}}/deploy/default/deploy.yaml
 ```
 
-For additional customization options during the installation process using manifests, take a look at [Installation with Manifests]({{< ref "/ngf/installation/installing-ngf/manifests.md" >}}).
+For additional customization options during the installation process using manifests, take a look at [Installation with Manifests]({{< ref "/ngf/install/manifests.md" >}}).
 
 {{% /tab %}}
 
@@ -89,7 +89,7 @@ For detailed instructions on how to modify these settings, refer to the [Configu
 ### Key links for the version 2.x update
 
 - To read more on [modifying data plane configuration]({{< ref "/ngf/how-to/data-plane-configuration.md" >}}).
-- To learn more about [deploying a Gateway for data plane instances]({{< ref "/ngf/installation/installing-ngf/deploy-data-plane.md" >}}).
-- To adding secure [authentication to control plane and data planes]({{< ref "/ngf/installation/installing-ngf/control-plane-certs.md" >}}).
+- To learn more about [deploying a Gateway for data plane instances]({{< ref "/ngf/install/deploy-data-plane.md" >}}).
+- To adding secure [authentication to control plane and data planes]({{< ref "/ngf/install/control-plane-certs.md" >}}).
 - To read more about [architecture changes]({{< ref "/ngf/overview/gateway-architecture.md" >}}).
 - For detailed [API reference]({{< ref "/ngf/reference/api.md" >}}).
diff --git a/content/ngf/overview/gateway-architecture.md b/content/ngf/overview/gateway-architecture.md
@@ -240,7 +240,7 @@ The figure shows:
 - A _Kubernetes cluster_.
 - Users _Cluster Operator_, _Application Developer A_, _B_ and _C_. These users interact with the cluster through the Kubernetes API by creating Kubernetes objects.
 - _Clients A_, _B_, and _C_ connect to _Applications A_, _B_, and _C_ respectively, which the developers have deployed.
-- The _NGF Pod_, [deployed by _Cluster Operator_]({{< ref "/ngf/installation">}}) in the namespace _nginx-gateway_. For scalability and availability, you can have multiple replicas. The _NGF_ container interacts with the Kubernetes API to retrieve the most up-to-date Gateway API resources created within the cluster. When a new Gateway resource is provisioned, the control plane dynamically creates and manages a corresponding NGINX data plane Deployment and Service. It watches the Kubernetes API and dynamically configures these _NGINX_ deployments based on the Gateway API resources, ensuring proper alignment between the cluster state and the NGINX configuration.
+- The _NGF Pod_, [deployed by _Cluster Operator_]({{< ref "/ngf/install/">}}) in the namespace _nginx-gateway_. For scalability and availability, you can have multiple replicas. The _NGF_ container interacts with the Kubernetes API to retrieve the most up-to-date Gateway API resources created within the cluster. When a new Gateway resource is provisioned, the control plane dynamically creates and manages a corresponding NGINX data plane Deployment and Service. It watches the Kubernetes API and dynamically configures these _NGINX_ deployments based on the Gateway API resources, ensuring proper alignment between the cluster state and the NGINX configuration.
 - The _NGINX Pod_ consists of an NGINX container and the integrated NGINX agent, which securely communicates with the control plane over gRPC. The control plane translates Gateway API resources into NGINX configuration, and sends the configuration to the agent.
 - Gateways _Gateway AB_ and _Gateway C_, created by _Cluster Operator_, request points where traffic can be translated to Services within the cluster. _Gateway AB_, includes a listener with a hostname `*.example.com`. _Gateway C_, includes a listener with a hostname `*.other-example.com`. Application Developers have the ability to attach their application's routes to the _Gateway AB_ if their application's hostname matches `*.example.com`, or to _Gateway C_ if their application's hostname matches `*.other-example.com`
 - _Application A_ with two pods deployed in the _applications_ namespace by _Application Developer A_. To expose the application to its clients (_Clients A_) via the host `a.example.com`, _Application Developer A_ creates _HTTPRoute A_ and attaches it to `Gateway AB`.
