nginx · ADubhlaoich · Jun 4, 2025 · May 26, 2025 · May 26, 2025 · May 29, 2025
diff --git a/content/includes/ngf/installation/install-gateway-api-experimental-features.md b/content/includes/ngf/installation/install-gateway-api-experimental-features.md
@@ -17,7 +17,7 @@ kubectl kustomize "https://github.com/nginx/nginx-gateway-fabric/config/crd/gate
 To enable experimental features on NGINX Gateway Fabric:
 
 Using Helm: Set `nginxGateway.gwAPIExperimentalFeatures.enable` to true. An example can be found
-in the [Installation with Helm]({{< ref "/ngf/installation/installing-ngf/helm.md#custom-installation-options" >}}) guide.
+in the [Installation with Helm]({{< ref "/ngf/install/helm.md#custom-installation-options" >}}) guide.
 
 Using Kubernetes manifests: Add the `--gateway-api-experimental-features` command-line flag to the deployment manifest args.
-An example can be found in the [Installation with Kubernetes manifests]({{< ref "/ngf/installation/installing-ngf/manifests.md#3-deploy-nginx-gateway-fabric" >}}) guide.
+An example can be found in the [Installation with Kubernetes manifests]({{< ref "/ngf/install/manifests.md#3-deploy-nginx-gateway-fabric" >}}) guide.
diff --git a/content/includes/ngf/installation/nginx-plus/docker-registry-secret.md b/content/includes/ngf/installation/nginx-plus/docker-registry-secret.md
@@ -2,7 +2,7 @@
 docs: "DOCS-000"
 ---
 
-{{< note >}} If you would rather pull the NGINX Plus image and push to a private registry, you can skip this specific step and instead follow [this step]({{< ref "/ngf/installation/nginx-plus-jwt.md#pulling-an-image-for-local-use" >}}). {{< /note >}}
+{{< note >}} If you would rather pull the NGINX Plus image and push to a private registry, you can skip this specific step and instead follow [this step]({{< ref "/ngf/install/nginx-plus.md#pulling-an-image-for-local-use" >}}). {{< /note >}}
 
 If the `nginx-gateway` namespace does not yet exist, create it:
 

diff --git a/content/ngf/releases.md → content/ngf/changelog.md b/content/ngf/releases.md → content/ngf/changelog.md
@@ -1,7 +1,7 @@
 ---
-title: Releases
+title: Changelog
 description: "NGINX Gateway Fabric releases."
-weight: 800
+weight: 900
 toc: true
 type: reference
 product: NGF

diff --git a/content/ngf/get-started.md b/content/ngf/get-started.md
@@ -10,7 +10,7 @@ docs: DOCS-000
 {{< important >}}
 This document is for trying out NGINX Gateway Fabric, and not intended for a production environment. 
 
-For standard deployments, you should read the [Install NGINX Gateway Fabric]({{< ref "/ngf/installation/installing-ngf" >}}) section.
+For standard deployments, you should read the [Install NGINX Gateway Fabric]({{< ref "/ngf/install/" >}}) section.
 {{< /important >}}
 
 This is a guide for getting started with NGINX Gateway Fabric. It explains how to:
@@ -467,6 +467,6 @@ Request ID: 1b5c8f3a4532ea7d7510cf14ffeb27af
 
 ## See also
 
-- [Install NGINX Gateway Fabric]({{< ref "/ngf/installation/installing-ngf/" >}}), for additional ways to install NGINX Gateway Fabric
+- [Install NGINX Gateway Fabric]({{< ref "/ngf/install/" >}}), for additional ways to install NGINX Gateway Fabric
 - [How-to guides]({{< ref "/ngf/how-to/" >}}), for configuring your cluster
-- [Traffic management]({{< ref "/ngf/how-to/traffic-management/" >}}), for more in-depth traffic management configuration
+- [Traffic management]({{< ref "/ngf/traffic-management/" >}}), for more in-depth traffic management configuration
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/control-plane-configuration.md b/content/ngf/how-to/control-plane-configuration.md
@@ -13,7 +13,7 @@ Learn how to dynamically update the NGINX Gateway Fabric control plane configura
 
 NGINX Gateway Fabric can dynamically update the control plane configuration without restarting. The control plane configuration is stored in the NginxGateway custom resource, created during the installation of NGINX Gateway Fabric.
 
-NginxGateway is deployed in the same namespace as the controller (Default: `nginx-gateway`). The resource's default name is based on your [installation method]({{< ref "/ngf/installation/installing-ngf" >}}):
+NginxGateway is deployed in the same namespace as the controller (Default: `nginx-gateway`). The resource's default name is based on your [installation method]({{< ref "/ngf/install/" >}}):
 
 - Helm: `<release-name>-config`
 - Manifests: `nginx-gateway-config`

diff --git a/content/ngf/how-to/data-plane-configuration.md b/content/ngf/how-to/data-plane-configuration.md
@@ -178,7 +178,9 @@ By default, an `NginxProxy` resource is created in the same namespace where NGIN
 
 When installed using the Helm chart, the NginxProxy resource is named `<release-name>-proxy-config` and is created in the release Namespace.
 
-{{< 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 >}}
+**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/monitoring/tracing.md" >}}), for example). {{< /note >}}
 
 ---
 
@@ -272,7 +274,7 @@ of a few arguments. {{</ note >}}
 
 ### Run NGINX Gateway Fabric with NGINX in debug mode
 
-To run NGINX Gateway Fabric with NGINX in debug mode, follow the [installation document]({{< ref "/ngf/installation/installing-ngf" >}}) with these additional steps:
+To run NGINX Gateway Fabric with NGINX in debug mode, after[installation]({{< ref "/ngf/install/" >}}), follow these additional steps:
 
 Using Helm: Set `nginx.debug` to true.
 

diff --git a/content/ngf/how-to/monitoring/_index.md b/content/ngf/how-to/monitoring/_index.md
diff --git a/content/ngf/how-to/traffic-management/_index.md b/content/ngf/how-to/traffic-management/_index.md
diff --git a/content/ngf/how-to/traffic-security/_index.md b/content/ngf/how-to/traffic-security/_index.md
diff --git a/content/ngf/install/_index.md b/content/ngf/install/_index.md
@@ -0,0 +1,5 @@
+---
+title: "Install"
+url: /nginx-gateway-fabric/install/
+weight: 300
+---
diff --git a/...t/ngf/installation/building-the-images.md → content/ngf/install/build-image.md b/...t/ngf/installation/building-the-images.md → content/ngf/install/build-image.md
@@ -1,6 +1,6 @@
 ---
 title: Build NGINX Gateway Fabric
-weight: 500
+weight: 400
 toc: true
 type: how-to
 product: NGF
@@ -9,7 +9,7 @@ docs: DOCS-1431
 
 ## Overview
 
-While most users will install NGINX Gateway Fabric [with Helm]({{< ref "/ngf/installation/installing-ngf/helm.md" >}}) or [Kubernetes manifests]({{< ref "/ngf/installation/installing-ngf/manifests.md" >}}), manually building the [NGINX Gateway Fabric and NGINX images]({{< ref "/ngf/overview/gateway-architecture.md#the-nginx-gateway-fabric-pod" >}}) can be helpful for testing and development purposes. Follow the steps in this document to build the NGINX Gateway Fabric and NGINX images.
+While most users will install NGINX Gateway Fabric [with Helm]({{< ref "/ngf/install/helm.md" >}}) or [Kubernetes manifests]({{< ref "/ngf/install/manifests.md" >}}), manually building the [NGINX Gateway Fabric and NGINX images]({{< ref "/ngf/overview/gateway-architecture.md#the-nginx-gateway-fabric-pod" >}}) can be helpful for testing and development purposes. Follow the steps in this document to build the NGINX Gateway Fabric and NGINX images.
 
 ---
 

diff --git a/...ion/installing-ngf/control-plane-certs.md → content/ngf/install/control-plane-certs.md b/...ion/installing-ngf/control-plane-certs.md → content/ngf/install/control-plane-certs.md
@@ -1,23 +1,28 @@
 ---
-title: Add secure authentication to the control and data planes
-weight: 300
+title: Add certificates for secure authentication
+weight: 100
 toc: true
-type: how-to
-product: NGF
-docs: DOCS-0000
+nd-content-type: how-to
+nd-product: NGF
 ---
 
-## Overview
+By default, NGINX Gateway Fabric installs self-signed certificates to secure the connection between the NGINX Gateway Fabric control plane and the NGINX data plane pods. These certificates are created by a `cert-generator` job when NGINX Gateway Fabric is first installed. 
 
-By default, NGINX Gateway Fabric installs self-signed certificates to secure the connection between the NGINX Gateway Fabric control plane and the NGINX data plane pods. These certificates are created by a `cert-generator` job when NGINX Gateway Fabric is first installed. However, because these certificates are self-signed and will expire after 3 years, it is recommended to use a solution such as [cert-manager](https://cert-manager.io) to create and manage these certificates in a production environment.
+However, because these certificates are self-signed and will expire after 3 years, we recommend a solution such as [cert-manager](https://cert-manager.io) to create and manage these certificates in a production environment.
 
-This guide will step through how to install and use `cert-manager` to secure this connection. **This should be done _before_ you install NGINX Gateway Fabric.**
+This guide will step through how to install and use `cert-manager` to secure this connection. 
+
+{{< caution >}}
+
+These steps should be completed before you install NGINX Gateway Fabric.
+
+{{< /caution >}}
 
 ---
 
 ## Before you begin
 
-You need:
+To complete this guide, you will need the following prerequisites:
 
 - Administrator access to a Kubernetes cluster.
 - [Helm](https://helm.sh) and [kubectl](https://kubernetes.io/docs/tasks/tools/#kubectl) must be installed locally.
@@ -44,7 +49,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
 
@@ -180,7 +185,7 @@ Specify the Secret name using the `agent-tls-secret` command-line argument.
 
 {{</tabs>}}
 
-## Final steps
+## Confirm the Secrets have been created
 
 You should see the Secrets created in the `nginx-gateway` namespace:
 
@@ -194,4 +199,10 @@ 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/" >}}).
+
+## Next steps
+
+- [Install NGINX Gateway Fabric with Helm]({{< ref "/ngf/install/helm.md" >}})
+- [Install NGINX Gateway Fabric with Manifests]({{< ref "/ngf/install/manifests.md" >}})
+- [Install NGINX Gateway Fabric with NGINX Plus]({{< ref "/ngf/install/nginx-plus.md" >}})
diff --git a/...ation/installing-ngf/deploy-data-plane.md → content/ngf/install/deploy-data-plane.md b/...ation/installing-ngf/deploy-data-plane.md → content/ngf/install/deploy-data-plane.md
@@ -1,6 +1,6 @@
 ---
 title: Deploy a Gateway for data plane instances
-weight: 500
+weight: 600
 toc: true
 type: how-to
 product: NGF
@@ -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/...t/ngf/installation/installing-ngf/helm.md → content/ngf/install/helm.md b/...t/ngf/installation/installing-ngf/helm.md → content/ngf/install/helm.md
@@ -1,9 +1,9 @@
 ---
-title: Installation with Helm
-weight: 100
+title: Install NGINX Gateway Fabric with Helm
+weight: 200
 toc: true
-type: how-to
-product: NGF
+nd-content-type: how-to
+nd-product: NGF
 docs: DOCS-1430
 ---
 
@@ -15,11 +15,11 @@ Learn how to install, upgrade, and uninstall NGINX Gateway Fabric in a Kubernete
 
 ## Before you begin
 
-To complete this guide, you'll need to install:
+To complete this guide, you will need:
 
 - [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.
+- [Add certificates for secure authentication]({{< ref "/ngf/install/control-plane-certs.md" >}}) in a production environment.
 
 {{< important >}} If you’d like to use NGINX Plus, some additional setup is also required: {{</ important >}}
 
@@ -40,7 +40,7 @@ To complete this guide, you'll need to install:
 
 {{< include "/ngf/installation/nginx-plus/nginx-plus-secret.md" >}}
 
-{{< note >}} For more information on why this is needed and additional configuration options, including how to report to NGINX Instance Manager instead, see the [NGINX Plus Image and JWT Requirement]({{< ref "/ngf/installation/nginx-plus-jwt.md" >}}) document. {{< /note >}}
+{{< note >}} For more information on why this is needed and additional configuration options, including how to report to NGINX Instance Manager instead, see the [NGINX Plus Image and JWT Requirement]({{< ref "/ngf/install/nginx-plus.md" >}}) document. {{< /note >}}
 
 </details>
 
@@ -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:
 
@@ -259,7 +259,7 @@ To upgrade from NGINX OSS to NGINX Plus, update the Helm command to include the
 
 {{< note >}} If applicable, replace the F5 Container registry `private-registry.nginx.com` with your internal registry for your NGINX Plus image, and replace `nginx-plus-registry-secret` with your Secret name containing the registry credentials.{{< /note >}}
 
-{{< important >}} Ensure that you [Create the required JWT Secrets]({{< ref "/ngf/installation/nginx-plus-jwt.md" >}}) before installing.{{< /important >}}
+{{< important >}} Ensure that you [Create the required JWT Secrets]({{< ref "/ngf/install/nginx-plus.md" >}}) before installing.{{< /important >}}
 
 ```shell
 helm upgrade ngf oci://ghcr.io/nginx/charts/nginx-gateway-fabric  --set nginx.image.repository=private-registry.nginx.com/nginx-gateway-fabric/nginx-plus --set nginx.plus=true --set nginx.imagePullSecret=nginx-plus-registry-secret -n nginx-gateway
@@ -316,8 +316,6 @@ For additional information on configuring and understanding the behavior of cont
 
 {{</see-also>}}
 
----
-
 ## Uninstall NGINX Gateway Fabric
 
 Follow these steps to uninstall NGINX Gateway Fabric and Gateway API from your Kubernetes cluster:
@@ -345,8 +343,9 @@ Follow these steps to uninstall NGINX Gateway Fabric and Gateway API from your K
 
    - {{< include "/ngf/installation/uninstall-gateway-api-resources.md" >}}
 
----
+## Next steps
 
-## Additional configuration
+- [Deploy a Gateway for data plane instances]({{< ref "/ngf/install/deploy-data-plane.md" >}})
+- [Routing traffic to applications]({{< ref "/ngf/traffic-management/routing-traffic-to-your-app.md" >}})
 
 For a full list of the Helm Chart configuration parameters, read [the NGINX Gateway Fabric Helm Chart](https://github.com/nginx/nginx-gateway-fabric/blob/v{{< version-ngf >}}/charts/nginx-gateway-fabric/README.md#configuration).
diff --git a/.../installation/installing-ngf/manifests.md → content/ngf/install/manifests.md b/.../installation/installing-ngf/manifests.md → content/ngf/install/manifests.md
@@ -1,5 +1,5 @@
 ---
-title: Installation with Manifests
+title: Install NGINX Gateway Fabric with Manifests
 weight: 200
 toc: true
 type: how-to
@@ -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.
+- [Add certificates for secure authentication]({{< ref "/ngf/install/control-plane-certs.md" >}}) in a production environment.
 
 {{< important >}} If you’d like to use NGINX Plus, some additional setup is also required: {{</ important >}}
 
@@ -39,7 +39,7 @@ To complete this guide, you'll need to install:
 
 {{< include "/ngf/installation/nginx-plus/nginx-plus-secret.md" >}}
 
-{{< note >}} For more information on why this is needed and additional configuration options, including how to report to NGINX Instance Manager instead, see the [NGINX Plus Image and JWT Requirement]({{< ref "/ngf/installation/nginx-plus-jwt.md" >}}) document. {{< /note >}}
+{{< note >}} For more information on why this is needed and additional configuration options, including how to report to NGINX Instance Manager instead, see the [NGINX Plus Image and JWT Requirement]({{< ref "/ngf/install/nginx-plus.md" >}}) document. {{< /note >}}
 
 </details>
 
@@ -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:
 
@@ -305,3 +305,8 @@ Follow these steps to uninstall NGINX Gateway Fabric and Gateway API from your K
 1. **Remove the Gateway API resources:**
 
    - {{< include "/ngf/installation/uninstall-gateway-api-resources.md" >}}
+
+## Next steps
+
+- [Deploy a Gateway for data plane instances]({{< ref "/ngf/install/deploy-data-plane.md" >}})
+- [Routing traffic to applications]({{< ref "/ngf/traffic-management/routing-traffic-to-your-app.md" >}})