Merge branch 'main' into ngf-release-2.0

Author: ADubhlaoich

_banners/eos-cltr.md

@@ -0,0 +1,8 @@
+{{< banner "warning" "End of Sale Notice:" >}}
+  <br>
+  F5 NGINX is announcing the <strong>End of Sale (EoS)</strong> for NGINX Controller Application Delivery Module, <strong>effective January 1, 2024</strong>.
+  <br><br>
+  F5 maintains generous lifecycle policies that allow customers to continue support and receive product updates. Existing NGINX Controller Application Delivery customers can continue to use the product past the EoS date. <strong>License renewals are not available after September 30, 2024.</strong>
+  <br><br>
+  See our <a href="https://my.f5.com/manage/s/article/K000137993">End of Sale announcement</a> for more details
+{{</ banner >}}

_banners/eos-mesh.md

@@ -0,0 +1,8 @@
+{{< banner "warning" "End of Sale Notice:" >}}
+  <br>
+  F5 NGINX is announcing the <strong>End of Sale (EoS)</strong> for NGINX Management Suite API Connectivity Manager Module, <strong>effective January 1, 2024</strong>.
+  <br><br>
+  F5 maintains generous lifecycle policies that allow customers to continue support and receive product updates. Existing API Connectivity Manager Module customers can continue to use the product past the EoS date. <strong>License renewals are not available after September 30, 2024.</strong>
+  <br><br>
+  See our <a href="https://my.f5.com/manage/s/article/K000137989">End of Sale announcement</a> for more details.
+{{</ banner >}}

_banners/upgrade-r33.md

@@ -0,0 +1,5 @@
+{{< banner "caution" "NGINX Plus R33 requires NGINX Instance Manager 2.18 or later" >}}
+  If your NGINX data plane instances are running NGINX Plus R33 or later, you must upgrade to NGINX Instance Manager 2.18 or later to support usage reporting. NGINX Plus R33 instances must report usage data to the F5 licensing endpoint or NGINX Instance Manager. Otherwise, they will stop processing traffic. 
+  <br><br>
+  For more details about usage reporting and enforcement, see [About solution licenses](../../../../solutions/about-subscription-licenses)
+{{</ banner >}}

content/controller/_index.md

@@ -5,8 +5,11 @@ title: F5 NGINX Controller
 weight: 2100
 cascade:
   logo: "NGINX-Controller-product-icon-RGB.svg"
-  type: "ctlr-eos"
   noindex: true
+  banner:
+    enabled: true
+    type: deprecation
+    md: _banners/eos-cltr.md
 url: /nginx-controller/
 ---
 

content/mesh/_index.md

@@ -5,9 +5,12 @@ description: 'NGINX Service Mesh is a fully integrated lightweight service mesh
   environments.
 
   '
+url: /nginx-service-mesh/
 cascade:
-  type: mesh-eos
   noindex: true
-url: /nginx-service-mesh/
+  banner:
+    enabled: true
+    type: deprecation
+    md: _banners/eos-mesh.md
 ---
 

content/nginx-one/how-to/staged-configs/import-export-staged-config.md

@@ -36,8 +36,6 @@ When you work with such archives, consider the following:
 - Do _not_ unpack archives directly to your NGINX configuration directories. You do not want to accidentally overwrite existing configuration files.
 - The files are set to a default file permission mode of 0644.
 - Do not include files with secrets or personally identifying information.
-- We ignore hidden files.
-  - If you import or export such files in archives, NGINX One Console does not include those files.
 - The size of the archive is limited to 5 MB.  The size of all uncompressed files in the archive is limited to 10 MB.
 
 {{< tip >}}

content/nginx/admin-guide/installing-nginx/installing-nginx-plus-amazon-web-services.md

@@ -30,8 +30,8 @@ To quickly set up an NGINX Plus environment on AWS:
 
     Click the **Continue to Subscribe** button to proceed to the **Launch on EC2** page.
 
-3. Select the type of launch by clicking the appropriate tab (**1‑Click Launch***, **Manual Launch**, or **Service Catalog**). Choose the desired options for billing, instance size, and so on, and click the **Accept Software Terms…** button.
-4. When configuring the firewall rules, add a rule to accept web traffic on TCP ports 80 and 443 (this happens automatically if you launch from the **1‑Click Launch** tab).
+3. Select the type of launch by clicking the appropriate tab ({{<nb>}}**1-Click Launch**{{</nb>}}, {{<nb>}}**Manual Launch**{{</nb>}}, or {{<nb>}}**Service Catalog**{{</nb>}}). Choose the desired options for billing, instance size, and so on, and click the {{<nb>}}**Accept Software Terms…**{{</nb>}} button.
+4. When configuring the firewall rules, add a rule to accept web traffic on TCP ports 80 and 443 (this happens automatically if you launch from the {{<nb>}}**1-Click Launch**{{</nb>}} tab).
 5. As soon as the new EC2 instance launches, NGINX Plus starts automatically and serves a default **index.html** page. To view the page, use a web browser to access the public DNS name of the new instance. You can also check the status of the NGINX Plus server by logging into the EC2 instance and running this command:
 
 	```nginx

content/nginx/admin-guide/monitoring/new-relic-plugin.md

@@ -33,7 +33,7 @@ Download the [plug‑in and installation instructions](https://docs.newrelic.com
 
 ## Configuring the Plug‑In
 
-The configuration file for the NGINX plug‑in is **/etc/nginx‑nr‑agent/nginx‑nr‑agent.ini**. The minimal configuration includes:
+The configuration file for the NGINX plug‑in is {{<nb>}}**/etc/nginx-nr-agent/nginx-nr-agent.ini**{{</nb>}}. The minimal configuration includes:
 
 - Your New Relic license key in the `newrelic_license_key` statement in the `global` section.
 
@@ -44,7 +44,7 @@ The configuration file for the NGINX plug‑in is **/etc/nginx&#8209;nr&#8209;ag
 
 You can include the optional `http_user` and `http_pass` statements to set HTTP basic authentication credentials in cases where the corresponding location is protected by the NGINX [auth_basic](https://nginx.org/en/docs/http/ngx_http_auth_basic_module.html#auth_basic) directive.
 
-The default log file is **/var/log/nginx&#8209;nr&#8209;agent.log**.
+The default log file is {{<nb>}}**/var/log/nginx-nr-agent.log**{{</nb>}}.
 
 ## Running the Plug‑In
 

content/nginx/deployment-guides/amazon-web-services/high-availability-keepalived.md

@@ -96,8 +96,8 @@ Allocate an Elastic IP address and remember its ID. For detailed instructions, s
 
 The NGINX Plus HA solution uses two scripts, which are invoked by `keepalived`:
 
-- **nginx‑ha‑check** – Determines the health of NGINX Plus.
-- **nginx‑ha‑notify** – Moves the Elastic IP address when a state transition happens, for example when the backup instance becomes the primary.
+- {{<nb>}}**nginx-ha-check**{{</nb>}} – Determines the health of NGINX Plus.
+- {{<nb>}}**nginx-ha-notify**{{</nb>}} – Moves the Elastic IP address when a state transition happens, for example when the backup instance becomes the primary.
 
 1. Create a directory for the scripts, if it doesn’t already exist.
 
@@ -121,7 +121,7 @@ The NGINX Plus HA solution uses two scripts, which are invoked by `keepalived`:
 There are two configuration files for the HA solution:
 
 - **keepalived.conf** – The main configuration file for `keepalived`, slightly different for each NGINX Plus instance.
-- **nginx&#8209;ha&#8209;notify** – The script you downloaded in [Step 4](#ha-aws_ha-scripts), with several user‑defined variables.
+- {{<nb>}}**nginx-ha-notify**{{</nb>}} – The script you downloaded in [Step 4](#ha-aws_ha-scripts), with several user‑defined variables.
 
 <span id="ha-aws_keepalived-conf-file"></span>
 ### Creating keepalived.conf
@@ -158,8 +158,8 @@ You must change values for the following configuration keywords. As you do so, a
 
 - `script` in the `chk_nginx_service` block – The script that sends health checks to NGINX Plus.
 
-  - On Ubuntu systems, **/usr/lib/keepalived/nginx&#8209;ha&#8209;check**
-  - On CentOS systems, **/usr/libexec/keepalived/nginx&#8209;ha&#8209;check**
+  - On Ubuntu systems, {{<nb>}}**/usr/lib/keepalived/nginx-ha-check**{{</nb>}}
+  - On CentOS systems, {{<nb>}}**/usr/libexec/keepalived/nginx-ha-check**{{</nb>}}
 
 - `priority` – The value that controls which instance becomes primary, with a higher value meaning a higher priority. Use `101` for the primary instance and `100` for the backup.
 
@@ -171,13 +171,13 @@ You must change values for the following configuration keywords. As you do so, a
 
 - `notify` – The script that is invoked during a state transition.
 
-  - On Ubuntu systems, **/usr/lib/keepalived/nginx&#8209;ha&#8209;notify**
-  - On CentOS systems, **/usr/libexec/keepalived/nginx&#8209;ha&#8209;notify**
+  - On Ubuntu systems, {{<nb>}}**/usr/lib/keepalived/nginx-ha-notify**{{</nb>}}
+  - On CentOS systems, {{<nb>}}**/usr/libexec/keepalived/nginx-ha-notify**{{</nb>}}
 
 <span id="ha-aws_nginx-ha-notify-script"></span>
 ### Creating nginx-ha-notify
 
-Modify the user‑defined variables section of the **nginx&#8209;ha&#8209;notify** script, replacing each `<value>` placeholder with the value specified in the list below:
+Modify the user‑defined variables section of the {{<nb>}}**nginx-ha-notify**{{</nb>}} script, replacing each `<value>` placeholder with the value specified in the list below:
 
 ```none
 export AWS_ACCESS_KEY_ID=<value>
@@ -223,7 +223,7 @@ Check the state on the backup instance, confirming that it has transitioned to `
 <span id="ha-aws_troubleshooting"></span>
 ## Troubleshooting
 
-If the solution doesn’t work as expected, check the `keepalived` logs, which are written to **/var/log/syslog**. Also, you can manually run the commands that invoke the `awscli` utility in the **nginx&#8209;ha&#8209;notify** script to check that the utility is working properly.
+If the solution doesn’t work as expected, check the `keepalived` logs, which are written to **/var/log/syslog**. Also, you can manually run the commands that invoke the `awscli` utility in the {{<nb>}}**nginx-ha-notify**{{</nb>}} script to check that the utility is working properly.
 
 <span id="ha-aws_caveats"></span>
 ## Caveats

content/nginx/deployment-guides/amazon-web-services/high-availability-network-load-balancer.md

@@ -291,7 +291,7 @@ Configure NGINX Plus instances as load balancers. These distribute requests to
 
 Use the *Step‑by‑step* instructions in our deployment guide, [Setting Up an NGINX Demo Environment]({{< ref "/nginx/deployment-guides/setting-up-nginx-demo-environment.md" >}}).
 
-Repeat the instructions on both **ngx&#8209;plus&#8209;1** and **ngx&#8209;plus&#8209;2**.
+Repeat the instructions on both {{<nb>}}**ngx-plus-1**{{</nb>}} and {{<nb>}}**ngx-plus-2**{{</nb>}}.
 
 <span id="create-instances-automated"></span>
 ### Automate instance setup with Packer and Terraform
@@ -317,7 +317,7 @@ To run the scripts, follow these instructions:
 
 3. Set your AWS credentials in the Packer and Terraform scripts:
 
-   - For Packer, set your credentials in the `variables` block in <span style="text-decoration: underline;">both</span> **packer/ngx&#8209;oss/packer.json** and **packer/ngx&#8209;plus/packer.json**:
+   - For Packer, set your credentials in the `variables` block in <span style="text-decoration: underline;">both</span> {{<nb>}}**packer/ngx-oss/packer.json**{{</nb>}} and {{<nb>}}**packer/ngx-plus/packer.json**{{</nb>}}:
 
      ```none
      "variables": {