Skip to content

Commit 3096bdd

Browse files
authored
Merge branch 'main' into NLB-6885-add-azure-cli-doc
2 parents 14e8629 + 8c22cf1 commit 3096bdd

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

content/nginx-one/nginx-configs/config-sync-groups/manage-config-sync-groups.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,4 +333,4 @@ Monitor the **Config Sync Status** column. It can help you ensure that your conf
333333

334334
- [Create and manage data plane keys]({{< ref "/nginx-one/connect-instances/create-manage-data-plane-keys.md" >}})
335335
- [Add an NGINX instance]({{< ref "/nginx-one/connect-instances/add-instance.md" >}})
336-
- [Updating the NGINX configuration with an NGINX One Console Config Sync Group push fails (My F5 Knowledge article)]((https://my.f5.com/manage/s/article/K000154659)
336+
- [Updating the NGINX configuration with an NGINX One Console Config Sync Group push fails (My F5 Knowledge article)](https://my.f5.com/manage/s/article/K000154659)

content/nginx/admin-guide/basic-functionality/managing-configuration-files.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ type:
99
- how-to
1010
---
1111

12-
NGINX and NGINX Plus are similar to other services in using a text‑based configuration file with a precise format. By default the file is named **nginx.conf** and for NGINX Plus is placed in the `**/etc/nginx**` directory.
12+
Similar to other services, NGINX and NGINX Plus use a text‑based configuration file with a precise format. By default the file is named **nginx.conf** and for NGINX Plus is placed in the `/etc/nginx` directory.
1313

14-
For NGINX Open Source, the location depends on the package system used to install NGINX and the operating system. It is typically one of `**/usr/local/nginx/conf**`, `**/etc/nginx**`, or `**/usr/local/etc/nginx**`.
14+
For NGINX Open Source, the location depends on the package system used to install NGINX and the operating system. It is typically one of `/usr/local/nginx/conf`, `/etc/nginx`, or `/usr/local/etc/nginx`.
1515

1616
## Directives
1717
The configuration file consists of _directives_ and their parameters. Simple (single‑line) directives end with a semicolon ( `;` ). Other directives act as “containers” which group together related directives. Containers are enclosed in curly braces ( `{}` ) and are often referred to as _blocks_. Here are some examples of simple directives.

content/nic/configuration/global-configuration/configmap-resource.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ that make sense for your setup:
2828
client-max-body-size: "2m"
2929
```
3030

31-
See the section [Summary of ConfigMap Keys](#summary-of-configmap-keys) for the explanation of the available ConfigMap keys (such as `proxy-connect-timeout` in this example).
31+
See the section [Summary of ConfigMap Keys](#configmap-keys) for the explanation of the available ConfigMap keys (such as `proxy-connect-timeout` in this example).
3232

3333
1. Create a new (or update the existing) ConfigMap resource:
3434

content/nic/releases.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@ nd-docs: DOCS-616
1010

1111
15 Sept 2025
1212

13-
This Nginx Ingress Controller release focuses on enhancing performance, simplifying configurations, and improving security to better support modern application needs. Highlights of this release are:
14-
15-
- NGINX Content Cache Using Policies which adds policy configuration that enables proxy caching.
16-
- Support for Kubernetes `StatefulSet` object has been added which can also be use to provide persistent storage for cached content.
17-
- Auto-Adjusting Incompatible Proxy Buffer Directive Values, we’ve added a new `--enable-directive-autoadjust` parameter. When enabled, this feature automatically resolves common proxy buffer configuration dependencies that could cause issues during NGINX reloads.
18-
- Server Name Indication (SNI) Support in JWT Policies, users can now configure `sniName` and `sniEnabled` for scenarios where the remote server requires SNI to serve the correct certificate.
13+
This NGINX Ingress Controller release focuses on enhancing performance, simplifying configurations, and improving security to better support modern application needs. The highlights of this release are as follows:
14+
- NGINX Content Cache using policies: This new feature introduces policy configurations that enable proxy caching.
15+
- Support for Kubernetes `StatefulSet` Objects: Added support for Kubernetes `StatefulSet` objects, which can also be used to provide persistent storage for cached content.
16+
- Auto-Adjusting incompatible proxy buffer directive values: A new `-enable-directive-autoadjust` parameter has been added. When enabled, this feature automatically resolves common proxy buffer configuration dependencies that could cause issues during NGINX reloads.
17+
- Server Name Indication (SNI) support in JWT Policies: Users can now configure sniName and sniEnabled for scenarios where the remote server requires SNI to present the correct certificate
1918

2019
### <i class="fa-solid fa-rocket"></i> Features
2120
- [8005](https://github.com/nginx/kubernetes-ingress/pull/8005) Add nginx content cache as NIC cache policy

0 commit comments

Comments
 (0)