Skip to content

Commit e19abce

Browse files
committed
Merge remote-tracking branch 'origin' into agent-release-3.0
2 parents e4732a0 + 4dd3142 commit e19abce

File tree

208 files changed

+12414
-2347
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

208 files changed

+12414
-2347
lines changed

.github/CODEOWNERS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ content/nap-dos/* @nginx/dos-docs-approvers
2929
content/nap-waf/* @nginx/nap-docs-approvers
3030
data/nap-waf/* @nginx/nap-docs-approvers
3131

32+
# NGINXaaS for Azure
33+
content/nginxaas-azure/* @nginx/n4a-docs
34+
content/includes/nginxaas-azure/* @nginx/n4a-docs
35+
3236
# NGINX Gateway Fabric
3337
content/ngf/* @nginx/nginx-gateway-fabric
3438
content/includes/ngf/* @nginx/nginx-gateway-fabric

.github/labeler.yml

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
# Label PRs based on modified file paths (v5 format)
2+
# https://github.com/actions/labeler
3+
4+
# General documentation
5+
6+
documentation:
7+
- changed-files:
8+
- any-glob-to-any-file:
9+
- 'content/**'
10+
- 'assets/**'
11+
- 'static/**'
12+
- 'data/**'
13+
14+
# Product labels
15+
16+
product/agent:
17+
- changed-files:
18+
- any-glob-to-any-file:
19+
- 'content/agent/**'
20+
- 'content/includes/agent/**'
21+
22+
product/amplify:
23+
- changed-files:
24+
- any-glob-to-any-file: 'content/amplify/**'
25+
26+
product/controller:
27+
- changed-files:
28+
- any-glob-to-any-file:
29+
- 'content/controller/**'
30+
- 'content/includes/controller/**'
31+
32+
product/mesh:
33+
- changed-files:
34+
- any-glob-to-any-file: 'content/mesh/**'
35+
36+
product/modsec-waf:
37+
- changed-files:
38+
- any-glob-to-any-file: 'content/modsec-waf/**'
39+
40+
product/nap-dos:
41+
- changed-files:
42+
- any-glob-to-any-file:
43+
- 'content/nap-dos/**'
44+
- 'content/includes/nap-dos/**'
45+
46+
product/nap-waf:
47+
- changed-files:
48+
- any-glob-to-any-file:
49+
- 'content/nap-waf/**'
50+
- 'content/includes/nap-waf/**'
51+
52+
product/ngf:
53+
- changed-files:
54+
- any-glob-to-any-file:
55+
- 'content/ngf/**'
56+
- 'content/includes/ngf/**'
57+
58+
product/nginx-plus:
59+
- changed-files:
60+
- any-glob-to-any-file:
61+
- 'content/nginx/**'
62+
- 'content/includes/nginx-plus/**'
63+
64+
product/nginx-one:
65+
- changed-files:
66+
- any-glob-to-any-file:
67+
- 'content/nginx-one/**'
68+
- 'content/includes/nginx-one/**'
69+
70+
product/nginxaas:
71+
- changed-files:
72+
- any-glob-to-any-file:
73+
- 'content/nginxaas-azure/**'
74+
- 'content/includes/nginxaas-azure/**'
75+
76+
product/nim:
77+
- changed-files:
78+
- any-glob-to-any-file:
79+
- 'content/nim/**'
80+
- 'content/includes/nim/**'
81+
82+
product/nms:
83+
- changed-files:
84+
- any-glob-to-any-file:
85+
- 'content/nms/**'
86+
- 'content/includes/nms/**'
87+
88+
product/unit:
89+
- changed-files:
90+
- any-glob-to-any-file:
91+
- 'content/unit/**'
92+
- 'content/includes/unit/**'
93+
94+
# Other labels
95+
96+
process documentation:
97+
- changed-files:
98+
- any-glob-to-any-file:
99+
- 'templates/**'
100+
- '*.md'
101+
- 'LICENSE'
102+
103+
tooling:
104+
- changed-files:
105+
- any-glob-to-any-file:
106+
- 'layouts/**'
107+
- '.github/**'
108+
- '.cloudcannon/**'
109+
- 'styles/**'
110+
- 'layouts/**'
111+
- 'config/**'
112+
- 'archetypes/**'
113+
- '*.yml'
114+
- '*.yaml'
115+
- '*.json'
116+
- '*.ts'
117+
- '*.sh'
118+
- '*.js'
119+
- 'Makefile'
120+
- '.vale.ini'
121+
- '.gitignore'
122+
- '.gitattributes'

.github/pull_request_template.md

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,15 @@ Closes #ISSUE
2121

2222
Before merging a pull request, run through this checklist and mark each as complete.
2323

24-
- [ ] I have read the [contributing guidelines](/CONTRIBUTING.md)
24+
- [ ] I have read the [contributing guidelines](https://github.com/nginx/documentation/blob/main/CONTRIBUTING.md)
2525
- [ ] I have signed the [F5 Contributor License Agreement (CLA)](https://github.com/f5/.github/blob/main/CLA/cla-markdown.md)
26-
- [ ] I have ensured that documentation content adheres to [the style guide](/templates/style-guide.md)
27-
- [ ] If the change involves potentially sensitive changes, I have assessed the possible impact
28-
- [ ] If applicable, I have added tests that prove my fix is effective or that my feature works
29-
- [ ] If applicable, I have checked that any relevant tests pass after adding my changes
30-
- [ ] I have updated any relevant documentation ([`README.md`](/README.md) and [`CHANGELOG.md`](/CHANGELOG.md))
3126
- [ ] I have rebased my branch onto main
32-
- [ ] I will ensure my PR is targeting the main branch and pulling from my branch from my own fork
33-
34-
Potentially sensitive changes include anything involving code, personally identify information (PII), live URLs or significant amounts of new or revised documentation.
27+
- [ ] I have ensured my PR is targeting the main branch and pulling from my branch from my own fork
28+
- [ ] I have ensured that the commit messages adhere to [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/#summary)
29+
- [ ] I have ensured that documentation content adheres to [the style guide](https://github.com/nginx/documentation/blob/main/templates/style-guide.md)
30+
- [ ] If the change involves potentially sensitive changes[^1], I have assessed the possible impact
31+
- [ ] If applicable, I have added tests that prove my fix is effective or that my feature works
32+
- [ ] I have ensured that existing tests pass after adding my changes
33+
- [ ] If applicable, I have updated [`README.md`](https://github.com/nginx/documentation/blob/main/README.md) and [`CHANGELOG.md`](https://github.com/nginx/documentation/blob/main/CHANGELOG.md)
3534

36-
Please refer to [our style guide](/templates/style-guide.md) for guidance about placeholder content.
35+
[^1]: Potentially sensitive changes include anything involving code, personally identify information (PII), live URLs or significant amounts of new or revised documentation. Please refer to [our style guide](https://github.com/nginx/documentation/blob/main/templates/style-guide.md) for guidance about placeholder content.

.github/workflows/build-push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
uses: nginxinc/docs-actions/.github/workflows/docs-build-push.yml@9c59fab05a8131f4d691ba6ea2b6a119f3ef832a # v1.0.7
6060
with:
6161
production_url_path: ""
62-
preview_url_path: "/previews/docs"
62+
preview_url_path: "${{ vars.PREVIEW_URL_PATH }}"
6363
docs_source_path: "public"
6464
docs_build_path: "./"
6565
doc_type: "hugo"

.github/workflows/labeler.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: PR Labeler
2+
3+
on:
4+
- pull_request_target
5+
6+
permissions:
7+
contents: read # Required to read the labeler.yml file
8+
pull-requests: write # Required to apply labels to PRs
9+
10+
jobs:
11+
label:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Apply labels based on file paths
15+
uses: actions/labeler@v5
16+
with:
17+
repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/linkchecker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
uses: azure/login@a65d910e8af852a8061c627c456678983e180302 # v2.2.0
7373
with:
7474
creds: ${{secrets.AZURE_CREDENTIALS_DOCS}}
75-
75+
7676
- name: Retrieve secrets from Keyvault
7777
if: env.isProduction != 'true'
7878
id: keyvault
@@ -104,7 +104,7 @@ jobs:
104104
# Run LinkChecker
105105
- name: Run LinkChecker on ${{ matrix.doc_paths }}
106106
continue-on-error: ${{ env.isProduction != 'true' }}
107-
uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
107+
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
108108
with:
109109
timeout_minutes: 10
110110
max_attempts: 3

.github/workflows/ossf_scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
persist-credentials: false
3535

3636
- name: Run analysis
37-
uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
37+
uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
3838
with:
3939
results_file: results.sarif
4040
results_format: sarif
@@ -56,6 +56,6 @@ jobs:
5656

5757
# Upload the results to GitHub's code scanning dashboard.
5858
- name: Upload SARIF results to code scanning
59-
uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
59+
uses: github/codeql-action/upload-sarif@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
6060
with:
6161
sarif_file: results.sarif

CONTRIBUTING_DOCS.md

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ We have templates for the following types of documentation:
6464

6565
## How to format docs
6666

67-
### Basic markdown formatting
67+
### Basic Markdown formatting
6868

6969
There are multiple ways to format text: for consistency and clarity, these are our conventions:
7070

@@ -152,6 +152,25 @@ Here are some other shortcodes:
152152
- `readfile`: Include the content of another file in the current file, which can be in an arbitrary location.
153153
- `bootstrap-table`: formats a table using Bootstrap classes; accepts any bootstrap table classes as additional arguments, e.g. `{{< bootstrap-table "table-bordered table-hover" }}`
154154

155+
### How to use Hugo includes
156+
157+
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).
158+
159+
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:
160+
161+
```md
162+
{{< include "controller/add-existing-instance.md" >}}
163+
```
164+
165+
The `controller/add-existing-instance.md` file is included in the following pages on the NGINX Docs Site:
166+
167+
- [Add an NGINX App Protect Instance](https://github.com/nginx/documentation/blob/main/content/controller/infrastructure/instances/add-nap-instance.md?plain=1#L35)
168+
- [Manage Your NGINX Instances](https://github.com/nginx/documentation/blob/main/content/controller/infrastructure/instances/manage-instances.md?plain=1#L29)
169+
- [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)
170+
- [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)
171+
172+
This ensures that content is defined once and referenced in multiple places without duplication.
173+
155174
## Linting
156175

157176
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:

archetypes/concept.md

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
---
2+
# We use sentence case and present imperative tone
3+
title: "{{ replace .Name "-" " " | title }}"
4+
# Weights are assigned in increments of 100: determines sorting order
5+
weight: i00
6+
# Creates a table of contents and sidebar, useful for large documents
7+
toc: false
8+
# Types have a 1:1 relationship with Hugo archetypes, so you shouldn't need to change this
9+
type: concept
10+
# Intended for internal catalogue and search, case sensitive:
11+
# Agent, N4Azure, NIC, NIM, NGF, NAP-DOS, NAP-WAF, NGINX One, NGINX+, Solutions, Unit
12+
product:
13+
---
14+
15+
[//]: # "These are Markdown comments to guide you through document structure. Remove them as you go, as well as any unnecessary sections."
16+
[//]: # "Use underscores for _italics_, and double asterisks for **bold**."
17+
[//]: # "Backticks are for `monospace`, used sparingly and reserved mostly for executable names - they can cause formatting problems. Avoid them in tables: use italics instead."
18+
19+
[//]: # "Begin each document with a sentence or two explaining what the purpose of the guide is, and what high-level actions to expect. No need to adhere precisely the example text given anywhere in this template."
20+
21+
This guide provides an overview of <concept>, which is used <for/in> <action 1>, <action 2> and <action 3>.
22+
23+
It is an example of a <other concept>, and is closely related to <third concept>.
24+
25+
---
26+
27+
## Background
28+
29+
[//]: # "Explain what the concept is. If possible, relate it to another commonly known concept or software."
30+
[//]: # "This relates the new idea to the reader using their existing knowledge, helping their understanding of it and thus what its purpose is in context."
31+
32+
---
33+
34+
## Use cases
35+
36+
[//]: # "Name the individual use case sections after the actual use case itself, e.g 'Route traffic between applications'"
37+
38+
### Use case 1
39+
40+
[//]: # "A description for a use case should be a high level outline of a particular problem, then explain how the subject concept is the solution for the issue."
41+
42+
[//]: # "If it helps, include a diagram of some kind. Ensure your description provides all the context required, however: a diagram is an aid to explain things, not a replacement."
43+
44+
```mermaid
45+
# You can use Mermaid to draw diagrams in a codeblock with mermaid as the language.
46+
# Read their documentation for usage: https://mermaid.js.org/intro/
47+
```
48+
49+
Starting from the <top/left> of the diagram, you can see that <thing> is connected to <other thing>: this relationship is established when configuring <parameter> as part of <file name>.
50+
51+
[//]: # "End a particular use case section with links to other pages, such as instructional documentation, other concepts, or reference information (Such as API specifications)."
52+
53+
- [Additional reading 1](some-external-link)
54+
- [Additional reading 2]({{< ref "/some/internal/link.md" >}})
55+
- Additional reading 3
56+
57+
### Use case 2
58+
59+
---
60+
61+
## Conclusion
62+
63+
[//]: # "Summarize everything that the reader will have learned by reading this entire concept document."
64+
[//]: # "It should fulfill the promise made by the introductory paragraph at the top of the document."
65+
[//]: # "Since each use case provides links to additional documents, you may not need to link to more,"
66+
[//]: # "or even include the final 'See also' section."
67+
68+
---
69+
70+
## See also
71+
72+
[//]: # "Link to related documents, such as concepts, reference material or similar use cases."

0 commit comments

Comments
 (0)