Skip to content

Commit a07f996

Browse files
ADubhlaoichADubhlaoich
committed
fix: Merge reconciliation
1 parent 040d60c commit a07f996

File tree

6 files changed

+44
-56
lines changed

6 files changed

+44
-56
lines changed

‎content/nap-dos/_index.md‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,16 @@ Running natively on NGINX Plus and NGINX Ingress Controller, F5 DoS for NGINX is
2828
[//]: # "One card will take full width page: two will take half width each. Three will stack like an inverse pyramid."
2929
[//]: # "Some examples of content could be the latest release note, the most common install path, and a popular new feature."
3030

31-
{{<card-layout>}}
32-
{{<card-section showAsCards="true" isFeaturedSection="true">}}
33-
{{<card title="Deployment" titleUrl="/nginx-app-protect-dos/deployment-guide/learn-about-deployment/">}}
34-
Read how to install and upgrade F5 DoS for NGINX
35-
{{</card>}}
36-
<!-- The titleURL and icon are both optional -->
37-
<!-- Lucide icon names can be found at https://lucide.dev/icons/ -->
38-
{{<card title="Troubleshooting" titleUrl="/nginx-app-protect-dos/troubleshooting-guide/how-to-troubleshoot/">}}
39-
Learn how to debug F5 DoS for NGINX
40-
{{</card>}}
41-
{{<card title="Releases" titleUrl="/nginx-app-protect-dos/releases/" icon="clock-alert">}}
42-
Review changelogs for F5 DoS for NGINX
43-
{{</card>}}
44-
{{</card-section>}}
45-
{{</card-layout>}}
31+
{{<card-section showAsCards="true" isFeaturedSection="true">}}
32+
{{<card title="Deployment" titleUrl="/nginx-app-protect-dos/deployment-guide/learn-about-deployment/">}}
33+
Read how to install and upgrade F5 DoS for NGINX
34+
{{</card>}}
35+
<!-- The titleURL and icon are both optional -->
36+
<!-- Lucide icon names can be found at https://lucide.dev/icons/ -->
37+
{{<card title="Troubleshooting" titleUrl="/nginx-app-protect-dos/troubleshooting-guide/how-to-troubleshoot/">}}
38+
Learn how to debug F5 DoS for NGINX
39+
{{</card>}}
40+
{{<card title="Releases" titleUrl="/nginx-app-protect-dos/releases/" icon="clock-alert">}}
41+
Review changelogs for F5 DoS for NGINX
42+
{{</card>}}
43+
{{</card-section>}}

‎content/nginx-one/_index.md‎

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -74,34 +74,32 @@ F5 NGINX One Console makes it easy to manage NGINX instances across locations an
7474
## NGINX One components
7575
[//]: # "You can add any extra content for the page here, such as additional cards, diagrams or text."
7676

77-
{{<card-layout>}}
78-
{{< card-section title="Kubernetes Solutions">}}
79-
{{< card title="NGINX Ingress Controller" titleUrl="/nginx-ingress-controller/" brandIcon="NGINX-Ingress-Controller-product-icon.svg">}}
80-
Kubernetes traffic management with API gateway, identity, and observability features.
81-
{{</ card >}}
82-
{{< card title="NGINX Gateway Fabric" titleUrl="/nginx-gateway-fabric" brandIcon="NGINX-Gateway-Fabric-product-icon.svg">}}
83-
Next generation Kubernetes connectivity using the Gateway API.
84-
{{</ card >}}
85-
{{</ card-section >}}
86-
{{< card-section title="Local Console Option">}}
87-
{{< card title="NGINX Instance Manager" titleUrl="/nginx-instance-manager" brandIcon="NGINX-Instance-Manager-product-icon.svg">}}
88-
Track and control NGINX Open Source and NGINX Plus instances.
89-
{{</ card >}}
90-
{{</ card-section >}}
91-
{{< card-section title="Modern App Delivery">}}
92-
{{< card title="NGINX Plus" titleUrl="/nginx/" brandIcon="NGINX-Plus-product-icon.svg">}}
93-
The all-in-one load balancer, reverse proxy, web server, content cache, and API gateway.
94-
{{</ card >}}
95-
{{< card title="NGINX Open Source" titleUrl="https://nginx.org" brandIcon="NGINX-Open-Source-product-icon.svg">}}
96-
The open source all-in-one load balancer, content cache, and web server
97-
{{</ card >}}
98-
{{</ card-section >}}
99-
{{< card-section title="Security">}}
100-
{{< card title="NGINX App Protect WAF" titleUrl="/nginx-app-protect-waf" brandIcon="NGINX-App-Protect-WAF-product-icon.svg">}}
101-
Lightweight, high-performance, advanced protection against Layer 7 attacks on your apps and APIs.
102-
{{</ card >}}
103-
{{< card title="F5 DoS for NGINX" titleUrl="/nginx-app-protect-dos" brandIcon="NGINX-App-Protect-DoS-product-icon.svg">}}
104-
Defend, adapt, and mitigate against Layer 7 denial-of-service attacks on your apps and APIs.
105-
{{</ card >}}
106-
{{</ card-section >}}
107-
{{</card-layout>}}
77+
{{< card-section title="Kubernetes Solutions">}}
78+
{{< card title="NGINX Ingress Controller" titleUrl="/nginx-ingress-controller/" brandIcon="NGINX-Ingress-Controller-product-icon.svg">}}
79+
Kubernetes traffic management with API gateway, identity, and observability features.
80+
{{</ card >}}
81+
{{< card title="NGINX Gateway Fabric" titleUrl="/nginx-gateway-fabric" brandIcon="NGINX-Gateway-Fabric-product-icon.svg">}}
82+
Next generation Kubernetes connectivity using the Gateway API.
83+
{{</ card >}}
84+
{{</ card-section >}}
85+
{{< card-section title="Local Console Option">}}
86+
{{< card title="NGINX Instance Manager" titleUrl="/nginx-instance-manager" brandIcon="NGINX-Instance-Manager-product-icon.svg">}}
87+
Track and control NGINX Open Source and NGINX Plus instances.
88+
{{</ card >}}
89+
{{</ card-section >}}
90+
{{< card-section title="Modern App Delivery">}}
91+
{{< card title="NGINX Plus" titleUrl="/nginx/" brandIcon="NGINX-Plus-product-icon.svg">}}
92+
The all-in-one load balancer, reverse proxy, web server, content cache, and API gateway.
93+
{{</ card >}}
94+
{{< card title="NGINX Open Source" titleUrl="https://nginx.org" brandIcon="NGINX-Open-Source-product-icon.svg">}}
95+
The open source all-in-one load balancer, content cache, and web server
96+
{{</ card >}}
97+
{{</ card-section >}}
98+
{{< card-section title="Security">}}
99+
{{< card title="NGINX App Protect WAF" titleUrl="/nginx-app-protect-waf" brandIcon="NGINX-App-Protect-WAF-product-icon.svg">}}
100+
Lightweight, high-performance, advanced protection against Layer 7 attacks on your apps and APIs.
101+
{{</ card >}}
102+
{{< card title="F5 DoS for NGINX" titleUrl="/nginx-app-protect-dos" brandIcon="NGINX-App-Protect-DoS-product-icon.svg">}}
103+
Defend, adapt, and mitigate against Layer 7 denial-of-service attacks on your apps and APIs.
104+
{{</ card >}}
105+
{{</ card-section >}}

‎content/nic/installation/integrations/app-protect-dos/installation.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,7 @@ Follow these steps to build the NGINX Controller Image with F5 DoS for NGINX.
8383
| **debian-image-nap-dos-plus** | Builds a Debian-based image with NGINX Plus, [F5 DoS for NGINX](/nginx-app-protect-dos/), and [NGINX App Protect WAF](/nginx-app-protect/). | Debian |
8484
| **ubi-image-dos-plus** | Builds a UBI-based image with NGINX Plus and the [F5 DoS for NGINX](/nginx-app-protect-dos/) module. | OpenShift |
8585
| **ubi-image-nap-dos-plus** | Builds a UBI-based image with NGINX Plus, [F5 DoS for NGINX](/nginx-app-protect-dos/), and [NGINX App Protect WAF](/nginx-app-protect/). | OpenShift |
86-
{{</bootstrap-table>}}
8786
88-
<br>
8987
9088
{{< call-out "note" >}} For the complete list of _Makefile_ targets and customizable variables, see the [Build NGINX Ingress Controller]({{< ref "/nic/installation/build-nginx-ingress-controller.md#makefile-details" >}}) topic. {{< /call-out>}}
9189

‎content/nic/installation/integrations/app-protect-waf-v5/installation.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ Create Docker image for NGINX Ingress Controller (Alpine with NGINX Plus, NGINX
9292
| **debian-image-nap-v5-plus** | Builds a Debian-based image with NGINX Plus and the [NGINX App Protect WAF v5](/nginx-app-protect-waf/v5/) module. | Debian |
9393
| **ubi-image-nap-v5-plus** | Builds a UBI-based image with NGINX Plus and the [NGINX App Protect WAF v5](/nginx-app-protect-waf/v5/) module. | OpenShift |
9494
| **ubi-image-nap-dos-v5-plus** | Builds a UBI-based image with NGINX Plus, [NGINX App Protect WAF v5](/nginx-app-protect-waf/v5/), and [F5 DoS for NGINX](/nginx-app-protect-dos/). | OpenShift |
95-
{{</bootstrap-table>}}
9695
9796
9897
{{< call-out "note" >}} For the complete list of _Makefile_ targets and customizable variables, see the [Build NGINX Ingress Controller]({{< ref "/nic/installation/build-nginx-ingress-controller.md#makefile-details" >}}) guide. {{< /call-out>}}

‎content/nic/installation/integrations/app-protect-waf/installation.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,6 @@ Follow these steps to build the NGINX Controller Image with NGINX App Protect WA
7474
| **debian-image-nap-dos-plus** | Builds a Debian-based image with NGINX Plus, [NGINX App Protect WAF](/nginx-app-protect-waf/), and [F5 DoS for NGINX](/nginx-app-protect-dos/) | Debian |
7575
| **ubi-image-nap-plus** | Builds a UBI-based image with NGINX Plus and the [NGINX App Protect WAF](/nginx-app-protect-waf/) module. | OpenShift |
7676
| **ubi-image-nap-dos-plus** | Builds a UBNI-based image with NGINX Plus, [NGINX App Protect WAF](/nginx-app-protect-waf/), and [F5 DoS for NGINX](/nginx-app-protect-dos/). | OpenShift |
77-
{{</bootstrap-table>}}
78-
79-
<br>
8077
8178
{{< call-out "note" >}} For the complete list of _Makefile_ targets and customizable variables, see the [Build NGINX Ingress Controller]({{< ref "/nic/installation/build-nginx-ingress-controller.md#makefile-details" >}}) topic. {{< /call-out>}}
8279

‎content/waf/_index.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ Defend your applications and APIs with a software security solution that seamles
2424

2525
## Featured content
2626

27-
{{<card-layout>}}
28-
{{<card-section showAsCards="true" isFeaturedSection="true">}}
27+
{{<card-section showAsCards="true" isFeaturedSection="true">}}
2928
{{<card title="Overview" titleUrl="/waf/fundamentals/overview">}}
3029
Learn about how F5 WAF for NGINX works and how it can be used to protect your applications
3130
{{</card>}}
@@ -35,5 +34,4 @@ Defend your applications and APIs with a software security solution that seamles
3534
{{<card title="Changelog" titleUrl="/waf/changelog" icon="clock-alert">}}
3635
Review the latest changes and improvements to F5 WAF for NGINX
3736
{{</card>}}
38-
{{</card-section>}}
39-
{{</card-layout>}}
37+
{{</card-section>}}

0 commit comments

Comments
 (0)