Merge branch 'main' into feature-rbac-n1c

Author: ADubhlaoich

.github/CODEOWNERS

@@ -29,6 +29,10 @@ content/nap-dos/*           @nginx/dos-docs-approvers
 content/nap-waf/*           @nginx/nap-docs-approvers
 data/nap-waf/*              @nginx/nap-docs-approvers
 
+# NGINXaaS for Azure 
+content/nginxaas-azure/*          @nginx/n4a-docs
+content/includes/nginxaas-azure/* @nginx/n4a-docs
+
 # NGINX Gateway Fabric
 content/ngf/*               @nginx/nginx-gateway-fabric
 content/includes/ngf/*      @nginx/nginx-gateway-fabric

CONTRIBUTING_DOCS.md

@@ -64,7 +64,7 @@ We have templates for the following types of documentation:
 
 ## How to format docs
 
-### Basic markdown formatting
+### Basic Markdown formatting
 
 There are multiple ways to format text: for consistency and clarity, these are our conventions:
 
@@ -152,6 +152,25 @@ Here are some other shortcodes:
 - `readfile`: Include the content of another file in the current file, which can be in an arbitrary location.
 - `bootstrap-table`: formats a table using Bootstrap classes; accepts any bootstrap table classes as additional arguments, e.g. `{{< bootstrap-table "table-bordered table-hover" }}`
 
+### How to use Hugo includes
+
+As mentioned above, [Hugo includes](https://gohugo.io/contribute/documentation/#include) are a custom shortcode that allows you to reference reusable content stored in the [`/content/includes` directory](https://github.com/nginx/documentation/tree/main/content/includes).
+
+For example, if the [`controller/add-existing-instance.md`](https://github.com/nginx/documentation/blob/main/content/includes/controller/add-existing-instance.md) file contains instructions on adding an instance to the NGINX Controller, you can reuse it on multiple pages by adding:
+
+```md
+{{< include "controller/add-existing-instance.md" >}}
+```
+
+The `controller/add-existing-instance.md` file is included in the following pages on the NGINX Docs Site:
+
+- [Add an NGINX App Protect Instance](https://github.com/nginx/documentation/blob/main/content/controller/infrastructure/instances/add-nap-instance.md?plain=1#L35)
+- [Manage Your NGINX Instances](https://github.com/nginx/documentation/blob/main/content/controller/infrastructure/instances/manage-instances.md?plain=1#L29)
+- [Trial NGINX Controller with NGINX Plus](https://github.com/nginx/documentation/blob/main/content/controller/admin-guides/install/try-nginx-controller.md?plain=1#L277)
+- [Trial NGINX Controller with App Security](https://github.com/nginx/documentation/blob/main/content/controller/admin-guides/install/try-nginx-controller-app-sec.md?plain=1#L290)
+
+This ensures that content is defined once and referenced in multiple places without duplication.
+
 ## Linting
 
 To run the markdownlint check, run the following command, which uses the .markdownlint.yaml file to specify rules. For `<content>`, specify the path to your Markdown files:

content/nginx-one/getting-started.md

@@ -7,26 +7,26 @@ product: NGINX One
 docs: DOCS-1393
 ---
 
-This guide provides step-by-step instructions on how to activate and start using the F5 NGINX One Console. NGINX One is a management console for monitoring and managing NGINX data plane instances.
+This guide provides step-by-step instructions on how to activate and start using F5 NGINX One Console. NGINX One is a management console for monitoring and managing NGINX data plane instances.
 
 ## Enable the NGINX One service {#enable-nginx-one}
 
 To get started using NGINX One, enable the service on F5 Distributed Cloud.
 
-1. Log in to the [F5 Distributed Console](https://www.f5.com/cloud/products/distributed-cloud-console).
+1. Log in to [F5 Distributed Console](https://www.f5.com/cloud/products/distributed-cloud-console).
 1. Select **NGINX One** from the list of services.
 1. Select **Enable Service**.
-1. After the service has been enabled, select **Visit Service** to load the NGINX One console.
+1. After the service has been enabled, select **Visit Service** to load NGINX One Console.
 
 ---
 
 ## Add your NGINX instances to NGINX One
 
-Next, add your NGINX instances to NGINX One. You'll need to create a data plane key and then install the NGINX Agent on each instance you want to monitor.
+Next, add your NGINX instances to NGINX One. You'll need to create a data plane key and then install NGINX Agent on each instance you want to monitor.
 
 ### Add an instance
 
-Depending on whether this is your first time using the NGINX One console or you've used it before, follow the appropriate steps to add an instance:
+Depending on whether this is your first time using NGINX One Console or you've used it before, follow the appropriate steps to add an instance:
 
 - **For first-time users:** On the welcome screen, select **Add Instance**.
 - **For returning users:** If you've added instances previously and want to add more, select **Instances** on the left menu, then select **Add Instance**.
@@ -51,17 +51,17 @@ Data plane keys expire after one year. You can change this expiration date later
 
 ### Install NGINX Agent
 
-After entering your data plane key, you'll see a `curl` command similar to the one below. Copy and run this command on each NGINX instance to install the NGINX Agent. Once installed, the NGINX Agent typically registers with NGINX One within a few seconds.
+After entering your data plane key, you'll see a `curl` command similar to the one below. Copy and run this command on each NGINX instance to install NGINX Agent. Once installed, NGINX Agent typically registers with NGINX One within a few seconds.
 
 {{<call-out "important" "Connecting to NGINX One" >}}
-The NGINX Agent must be able to establish a connection to the NGINX One Console's Agent endpoint (`agent.connect.nginx.com`). Ensure that any firewall rules you have in place for your NGINX hosts allows network traffic to port `443` for all of the following IPs:
+NGINX Agent must be able to establish a connection to NGINX One Console's Agent endpoint (`agent.connect.nginx.com`). Ensure that any firewall rules you have in place for your NGINX hosts allows network traffic to port `443` for all of the following IPs:
 
 - `3.135.72.139`
 - `3.133.232.50`
 - `52.14.85.249`
 {{</call-out>}}
 
-To install the NGINX Agent on an NGINX instance:
+To install NGINX Agent on an NGINX instance:
 
 1. **Check if NGINX is running and start it if it's not:**
 
@@ -79,7 +79,7 @@ To install the NGINX Agent on an NGINX instance:
 
 2. **Install NGINX Agent:**
 
-    Next, use the `curl` command provided to you to install the NGINX Agent:
+    Next, use the `curl` command provided to you to install NGINX Agent:
 
     ``` shell
     curl https://agent.connect.nginx.com/nginx-agent/install | DATA_PLANE_KEY="YOUR_DATA_PLANE_KEY" sh -s -- -y
@@ -105,11 +105,11 @@ If you followed the [Installation and upgrade](https://docs.nginx.com/nginx-agen
 
 <span style="display: inline-block; margin-top: 20px;" >
 
-{{<call-out "note" "Note: NGINX Agent poll interval" >}} We recommend keeping `dataplane.status.poll_interval` between `30s` and `60s` in the NGINX Agent config (`/etc/nginx-agent/nginx-agent.conf`). If the interval is set above `60s`, the NGINX One Console may report incorrect instance statuses.{{</call-out>}}
+{{<call-out "note" "Note: NGINX Agent poll interval" >}} We recommend keeping `dataplane.status.poll_interval` between `30s` and `60s` in the NGINX Agent config (`/etc/nginx-agent/nginx-agent.conf`). If the interval is set above `60s`, NGINX One Console may report incorrect instance statuses.{{</call-out>}}
 
 <br>
 
-<i class="fa fa-check-circle" aria-hidden="true"></i> Make sure your Linux operating system is listed below. The installation script for the NGINX Agent is compatible with these distributions and versions.
+<i class="fa fa-check-circle" aria-hidden="true"></i> Make sure your Linux operating system is listed below. The installation script for NGINX Agent is compatible with these distributions and versions.
 
 #### NGINX Agent installation script: supported distributions
 
@@ -136,7 +136,7 @@ If you followed the [Installation and upgrade](https://docs.nginx.com/nginx-agen
 
 ## Enable NGINX metrics reporting
 
-In order for the NGINX One console to show specific traffic and system metrics, you need to enable the appropriate API on your NGINX data plane instances. The sections below provide step-by-step instructions for both NGINX Plus and NGINX Open Source (OSS).
+In order for NGINX One Console to show specific traffic and system metrics, you need to enable the appropriate API on your NGINX data plane instances. The sections below provide step-by-step instructions for both NGINX Plus and NGINX Open Source (OSS).
 
 ### Enable NGINX Plus API
 
@@ -154,7 +154,7 @@ After connecting your NGINX instances to NGINX One, you can monitor their perfor
 
 ### Log in to NGINX One
 
-1. Log in to the [F5 Distributed Console](https://www.f5.com/cloud/products/distributed-cloud-console).
+1. Log in to [F5 Distributed Console](https://www.f5.com/cloud/products/distributed-cloud-console).
 1. Select **NGINX One > Visit Service**.
 
 ### Overview of the NGINX One dashboard
@@ -172,7 +172,7 @@ Navigating the dashboard:
 **NGINX One dashboard metrics**
 | Metric | Description | Details |
 |---|---|---|
-| <i class="fas fa-heartbeat"></i> **Instance availability** | Understand the operational status of your NGINX instances. | - **Online**: The NGINX instance is actively connected and functioning properly. <br> - **Offline**: The NGINX Agent is connected but the NGINX instance isn't running, isn't installed, or can't communicate with the NGINX Agent. <br> - **Unavailable**: The connection between the NGINX Agent and NGINX One has been lost or the instance has been decommissioned. <br> - **Unknown**: The current state can't be determined at the moment. |
+| <i class="fas fa-heartbeat"></i> **Instance availability** | Understand the operational status of your NGINX instances. | - **Online**: The NGINX instance is actively connected and functioning properly. <br> - **Offline**: NGINX Agent is connected but the NGINX instance isn't running, isn't installed, or can't communicate with NGINX Agent. <br> - **Unavailable**: The connection between NGINX Agent and NGINX One has been lost or the instance has been decommissioned. <br> - **Unknown**: The current state can't be determined at the moment. |
 | <i class="fas fa-code-branch"></i> **NGINX versions by instance** | See which NGINX versions are in use across your instances. | |
 | <i class="fas fa-desktop"></i> **Operating systems** | Find out which operating systems your instances are running on. | |
 | <i class="fas fa-certificate"></i> **Certificates** | Monitor the status of your SSL certificates to know which are expiring soon and which are still valid. | |

content/nginx/deployment-guides/setting-up-nginx-demo-environment.md

@@ -4,7 +4,7 @@ description: Configure NGINX Open Source as a web server and F5 NGINX Plus as a
 docs: DOCS-462
 doctypes:
 - task
-title: Setting Up an NGINX Demo Environment
+title: Setting up an NGINX demo environment
 toc: true
 weight: 100
 ---
@@ -19,7 +19,7 @@ This guide assumes you have already provisioned a number of host systems (physic
 Some commands require `root` privilege. If appropriate for your environment, prefix commands with the `sudo` command.
 
 <span id="nginx-oss"></span>
-## Configuring NGINX Open Source for Web Serving
+## Configuring NGINX Open Source for web serving
 
 The steps in this section configure an NGINX Open Source instance as a web server to return a page like the following, which specifies the server name, address, and other information. The page is defined in the <span style="white-space: nowrap; font-weight:bold;">demo-index.html</span> configuration file you create in Step 4 below.
 
@@ -188,7 +188,7 @@ If you are using these instructions to satisfy the prerequisites for one of our
    ```
 
 <span id="nginx-plus"></span>
-## Configuring NGINX Plus for Load Balancing
+## Configuring NGINX Plus for load balancing
 
 The steps in this section configure an NGINX Plus instance to load balance requests across the group of NGINX Open Source web servers you configured in the [previous section](#nginx-oss).
 
@@ -272,7 +272,7 @@ Repeat these instructions on each instance. Alternatively, you can configure one
 
    Directive documentation: [include](http://nginx.org/en/docs/ngx_core_module.html#include)
 
-### Revision History
+### Revision history
 
 - Version 2 (April 2019) – Generalized instructions for use with deployment guides
 - Version 1 (April 2018) – Initial version

content/nginxaas-azure/changelog.md

@@ -3,6 +3,8 @@ title: "Changelog"
 weight: 900
 toc: true
 docs: "DOCS-870"
+url: /nginxaas/azure/changelog/
+
 ---
 
 Learn about the latest updates, new features, and resolved bugs in F5 NGINX as a Service for Azure.

content/nginxaas-azure/faq.md

@@ -4,6 +4,8 @@ weight: 800
 categories: ["concepts"]
 toc: true
 docs: "DOCS-881"
+url: /nginxaas/azure/faq/
+
 ---
 
 Common questions about F5 NGINX as a Service for Azure (NGINXaaS).

content/nginxaas-azure/known-issues.md

@@ -3,6 +3,8 @@ title: "Known issues"
 weight: 1000
 toc: true
 docs: "DOCS-871"
+url: /nginxaas/azure/known-issues/
+
 ---
 
 List of known issues in the latest release of F5 NGINX as a Service for Azure (NGINXaaS).

content/nim/nginx-app-protect/setup-waf-config-management.md

@@ -30,8 +30,6 @@ Complete the following prerequisites before proceeding with this guide.
 
 ### Limitations
 
-{{<important>}}App Protect WAF Config management is currently not supported when [deploying Instance Manager on Kubernetes]({{<relref "/nim/deploy/kubernetes/deploy-using-helm.md" >}}).{{</important>}}
-
 Instance Manager does not support the following NGINX App Protect features:
 
 - [Policies with external references](https://docs.nginx.com/nginx-app-protect/configuration-guide/configuration/#external-references)
@@ -254,7 +252,7 @@ You will need to use your NGINX repo certificates to setup automatic retrieval o
     <summary>Example request</summary>
 
     ```shell
-    curl -X POST 'https://{{NMS_FQDN}}//api/platform/v1/certs'  \
+    curl -X POST 'https://{{NMS_FQDN}}/api/platform/v1/certs'  \
         --header "Authorization: Bearer <access token>"      \
         --header "Content-Type: application/json"                \
         [email protected]
@@ -374,7 +372,7 @@ You will need to use the [Instance Manager REST API]({{< relref "/nim/fundamenta
 <summary>Attack Signatures Example</summary>
 
 ```shell
-curl -X POST 'https://{{NMS_FQDN}}//api/platform/v1/security/attack-signatures' \
+curl -X POST 'https://{{NMS_FQDN}}/api/platform/v1/security/attack-signatures' \
     --header "Authorization: Bearer <access token>"      \
     --form 'revisionTimestamp="2022.11.16"'                 \
     --form 'filename=@"/attack-signatures.tgz"'
@@ -386,7 +384,7 @@ curl -X POST 'https://{{NMS_FQDN}}//api/platform/v1/security/attack-signatures'
 <summary>Threat Campaigns Example</summary>
 
 ```shell
-curl -X POST 'https://{{NMS_FQDN}}//api/platform/v1/security/threat-campaigns' \
+curl -X POST 'https://{{NMS_FQDN}}/api/platform/v1/security/threat-campaigns' \
     --header "Authorization: Bearer <access token>"      \
     --form 'revisionTimestamp="2022.11.15"'                 \
     --form 'filename=@"/threat-campaigns.tgz"'

go.mod

@@ -2,4 +2,4 @@ module github.com/nginxinc/docs
 
 go 1.19
 
-require github.com/nginxinc/nginx-hugo-theme v0.41.22 // indirect
+require github.com/nginxinc/nginx-hugo-theme v0.42.1 // indirect

go.sum

@@ -1,2 +1,2 @@
-github.com/nginxinc/nginx-hugo-theme v0.41.22 h1:Gb/OLbpumNqp8vOPkZzO2GmgPDRd1yr2tWHWUBHg8BA=
-github.com/nginxinc/nginx-hugo-theme v0.41.22/go.mod h1:DPNgSS5QYxkjH/BfH4uPDiTfODqWJ50NKZdorguom8M=
+github.com/nginxinc/nginx-hugo-theme v0.42.1 h1:SYj7R7fKPYwtbQobTcJWy/ZWQxa5tlHCSJfU2dxYXxY=
+github.com/nginxinc/nginx-hugo-theme v0.42.1/go.mod h1:DPNgSS5QYxkjH/BfH4uPDiTfODqWJ50NKZdorguom8M=