Skip to content

Commit 5f5bd4c

Browse files
committed
Merge branch 'main' into ngf-release-2.0
2 parents 69746b9 + 0e1197d commit 5f5bd4c

File tree

872 files changed

+13062
-10390
lines changed

Some content is hidden

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

872 files changed

+13062
-10390
lines changed
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"ssg": "hugo",
3+
"mode": "hosted",
4+
"build": {
5+
"install_command": "[ -f package.json ] && npm i",
6+
"build_command": "hugo --destination public --baseURL / --noTimes",
7+
"output_path": "public",
8+
"environment_variables": [
9+
{
10+
"key": "HUGO_CACHEDIR",
11+
"value": "/usr/local/__site/src/.hugo_cache/"
12+
}
13+
],
14+
"preserved_paths": "node_modules/,.hugo_cache/,resources/",
15+
"preserve_output": false,
16+
"include_git": true,
17+
"manually_configure_urls": false,
18+
"hugo_version": "0.134.3",
19+
"ruby_version": "2.7.3",
20+
"node_version": "18",
21+
"deno_version": "1.40.2"
22+
}
23+
}

.cloudcannon/schemas/nms/policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ Confirm the policy is being enforced:
153153

154154
<!-- Add troubleshooting steps for issues users might encounter and can self-solve. The purpose of this section is to deflect customer calls to Support. -->
155155

156-
For help resolving common issues when setting up and configuring the policy, follow the steps in this section. If you cannot find a solution to your specific issue, reach out to [NGINX Customer Support]({{< relref "support/contact-support.md" >}}) for assistance.
156+
For help resolving common issues when setting up and configuring the policy, follow the steps in this section. If you cannot find a solution to your specific issue, reach out to [NGINX Customer Support]({{< ref "support/contact-support.md" >}}) for assistance.
157157

158158
### Issue 1
159159

.gitattributes

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Set the default behavior for correcting line endings,
22
# in case people don't have core.autocrlf set.
33
* text=auto
4-
4+
.github/workflows/update_from_nginx_documentation.yml merge=ours
5+
.gitattributes merge=ours
File renamed without changes.
File renamed without changes.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
name: Story task
3+
about: This template is for a story or task, encompassing a single work item for completion
4+
title: ""
5+
labels: "documentation"
6+
projects: ["nginxinc/32"]
7+
assignees: ""
8+
---
9+
10+
*Remove italicized directions as relevant to reduce noise in the issue description.*
11+
12+
## Overview
13+
14+
*Written as a user story*.
15+
16+
**As a** <user>, **I want** <thing>, **So I can** <action>.
17+
18+
## Description
19+
20+
*Add the finer details of what this task involves and is trying to accomplish. A problem well defined is half-solved*.
21+
22+
## Acceptance criteria
23+
24+
*Add any exacting acceptance criteria for the task to be complete. Start with known hard requirements, since they may create blockers.*
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
---
2+
name: Epic overview
3+
about: This template is for planning an epic, which is a large body of effort involving multiple stories or tasks
4+
title: ""
5+
labels: "epic, documentation"
6+
projects: ["nginxinc/32"]
7+
assignees: ""
8+
---
9+
10+
*Remove italicized directions as relevant to reduce noise in the issue description.*
11+
12+
## Description
13+
14+
*Write a high-level description of what the body of work for this epic includes.*
15+
16+
## Goals
17+
18+
*Describe the intent of the epic and what the intended impact is for this effort.*
19+
20+
## User stories
21+
22+
*Add a user story for relevant persona to this epic, who are the stakeholders*.
23+
24+
**As a** <user>,
25+
**I want** <thing>,
26+
**So I can** <action>.
27+
28+
**As a** <user>,
29+
**I want** <thing>,
30+
**So I can** <action>.
31+
32+
## Tasks
33+
34+
*Create a simple list of tasks necessary for this epic. Finer details should be kept to sub-issues/tasks/stories.*
35+
36+
- Example task 1
37+
- Example task 1
38+
- Example task 1
39+
- Example task 1
40+
- Example task 1
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
---
2+
name: Content release plan
3+
about: This template is for a content release plan, typically tied to a product release
4+
title: " v#.# content release plan"
5+
labels: "documentation"
6+
projects: ["nginxinc/32"]
7+
assignees: ""
8+
---
9+
10+
*Remove italicized directions as relevant to reduce noise in the issue description.*
11+
12+
## Overview
13+
14+
- **Product name**:
15+
- **Release date**:
16+
17+
A content release plan establishes and tracks the documentation work for a product related to a release.
18+
19+
Add tickets to this content release plan as sub-issues, and update it as you go along.
20+
21+
## Description
22+
23+
*Write a high-level summary of changes expected in this release*.
24+
25+
## User stories
26+
27+
**As a** technical writer,
28+
**I want** a content release plan for my product,
29+
**So I can** ensure correct content is released alongside the latest version of the product.
30+
31+
**As a** product owner,
32+
**I want** a content release plan for my product,
33+
**So I can** ensure the product team includes documentation as part of changes to the product.
34+
35+
## Tasks
36+
37+
*Create a simple list of tasks necessary for this content plan. Finer details can be kept to sub-issues.*
38+
*Each task item should have a 1:1 relationship with a documentation item, which could be an engineering issue.*
39+
40+
- [ ] Update changelog/release notes
41+
- [ ] Update version reference information (Such as technical specifications, version shortcodes)
42+
- [ ] Update any other documentation impacted by changes in this release
43+
- Additional task 1
44+
- Additional task 2

.github/workflows/fossa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ jobs:
2525
uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2 # v4.2.2
2626

2727
- name: Scan
28-
uses: fossas/fossa-action@93a52ecf7c3ac7eb40f5de77fd69b1a19524de94 # v1.5.0
28+
uses: fossas/fossa-action@c0a7d013f84c8ee5e910593186598625513cc1e4 # v1.6.0
2929
with:
3030
api-key: ${{ secrets.FOSSA_TOKEN }}

.github/workflows/notification.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
}
4343
4444
- name: Send notification
45-
uses: 8398a7/action-slack@28ba43ae48961b90635b50953d216767a6bea486 # v3.16.2
45+
uses: 8398a7/action-slack@1750b5085f3ec60384090fb7c52965ef822e869e # v3.18.0
4646
with:
4747
status: custom
4848
custom_payload: |

0 commit comments

Comments
 (0)