Skip to content

Commit 4aadb83

Browse files
authored
Merge branch 'main' into staged
2 parents 28a5e33 + 3c76f43 commit 4aadb83

File tree

609 files changed

+10380
-8160
lines changed

Some content is hidden

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

609 files changed

+10380
-8160
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

.github/CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ content/nap-waf/* @nginx/nap-docs-approvers
3030
data/nap-waf/* @nginx/nap-docs-approvers
3131

3232
# NGINXaaS for Azure
33-
content/nginxaas-azure/* @nginx/n4a-docs
34-
content/includes/nginxaas-azure/* @nginx/n4a-docs
33+
content/nginxaas-azure/* @nginx/n4a-docs-approvers
34+
content/includes/nginxaas-azure/* @nginx/n4a-docs-approvers
3535

3636
# NGINX Gateway Fabric
3737
content/ngf/* @nginx/nginx-gateway-fabric

.github/workflows/coveo.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
COVEO_API_KEY: ${{secrets[matrix.env_api_key]}}
3030
COVEO_SEARCH_HUB: "HUB_ES_Nginx_Docs_And_Org"
3131
run: |
32-
RESPONSE=$(curl -w "\nHTTP_CODE: %{http_code}" -s -X POST "https://${{matrix.env_coveo_org_id}}.org.coveo.com/rest/search/v2/token" \
32+
RESPONSE=$(curl -w "\nHTTP_CODE: %{http_code}" -s -X POST "https://platform.cloud.coveo.com/rest/search/v2/token?organizationId=${{matrix.env_coveo_org_id}}" \
3333
-H "Accept: application/json" \
3434
-H "Content-Type: application/json" \
3535
-H "Authorization: Bearer ${COVEO_API_KEY}" \
@@ -49,6 +49,7 @@ jobs:
4949
5050
if [ $STATUS_CODE -ne 200 ]; then
5151
echo "Error: HTTP request failed with status $STATUS_CODE"
52+
echo "$RESPONSE"
5253
exit 1
5354
fi
5455
if [ "$SEARCH_TOKEN" == "null" ]; then

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

.github/workflows/ossf_scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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@5f8171a638ada777af81d42b55959a643bb29017 # v3.28.12
59+
uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
6060
with:
6161
sarif_file: results.sarif

CLOSED_CONTRIBUTIONS.md

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
# Contributing guidelines for closed content
2+
3+
This document describes the process for authoring "closed content", which is content of a sensitive nature that cannot be publicised before release.
4+
5+
Sensitive content might include:
6+
7+
- Security content, including personally identifying information (PII).
8+
- Content / features that are not yet ready to be announced.
9+
10+
We work in public by default, so this process should only be used on a case by case basis by F5 employees.
11+
12+
For standard content releases, review the [Contributing guidelines](/CONTRIBUTING.md).
13+
14+
## Overview
15+
16+
This repository (https://github.com/nginx/documentation) is where we work by default. It has a one-way sync to an internal repository, used for closed content.
17+
18+
The process is as follows:
19+
20+
- Add the closed repository as a remote
21+
- Create a remote branch with the prefix `internal/` in the closed repository
22+
- Open a pull request in the closed repository to get previews and request feedback
23+
- Once all stakeholders are happy with changes, close the pull request in the closed repository
24+
- Merge the changes from the remote (Closed) repository branch with a new branch in the open repository
25+
- Open a new pull request in the open repository, where it can be merged
26+
27+
You can get the URL through our internal communication channels: it will be represented in the following steps as `<closed-URL>`.
28+
29+
## Steps
30+
31+
To create closed content, add the closed repository as a remote to the main repository, then fetch.
32+
33+
```shell
34+
cd documentation
35+
git remote add internal [email protected]:<closed-url>.git
36+
git fetch
37+
```
38+
39+
Check out the remote `main` branch, and use it to create a feature branch. **Ensure that you prefix all branch names with `internal/`**
40+
41+
```shell
42+
git checkout internal/main
43+
git checkout -b internal/feature
44+
```
45+
46+
Once you've finished with your work, commit it and push it to the internal repository:
47+
48+
```shell
49+
git add .
50+
git commit
51+
git push internal
52+
```
53+
54+
Open a pull request when you are ready to receive feedback from stakeholders.
55+
56+
After any iterative work, close the pull request. Since the closed repository is a mirror of the open one, we do not merge changes to it.
57+
58+
Change back to the origin `main` branch, create a new branch, merge your internal branch and push to origin.
59+
60+
```shell
61+
git checkout main
62+
git checkout -b feature
63+
git merge internal/internal/feature
64+
git push origin
65+
```
66+
67+
Once the content changes have been merged in the open repository, they will synchronize back to the closed repository.

CONTRIBUTING.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ If you are an F5 employee, see the following additional guidance [For F5 Employe
1515
- Review our Documentation [style guide](./templates/style-guide.md)
1616
- Review our [Contributing guidelines for writers](./CONTRIBUTING_DOCS.md)
1717
- [Issue Lifecycle](#issue-lifecycle)
18-
- [Content edited elsewhere](#content-edited-elsewhere)
18+
- [Additional NGINX documentation](#additional-nginx-documentation)
1919
- [F5 Contributor License Agreement (CLA)](#f5-contributor-license-agreement)
2020

2121
## Report a bug
@@ -92,7 +92,6 @@ This repository does not include all of the source content for the NGINX documen
9292
- [nginx.org](https://github.com/nginx/nginx.org) - source for https://nginx.org
9393
- [NGINX Unit](https://github.com/nginx/unit) - source for https://unit.nginx.org
9494
- [NGINX Ingress Controller](https://github.com/nginxinc/kubernetes-ingress/) - source for https://docs.nginx.com/nginx-ingress-controller
95-
- [NGINX Agent](https://github.com/nginx/agent) - source for https://docs.nginx.com/nginx-agent
9695

9796
In those repositories, you can find documentation source code in the `docs` or `site` subdirectories.
9897

CONTRIBUTING_DOCS.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,17 +81,18 @@ Close every section with a horizontal line by using three dashes: `---`.
8181

8282
### How to format internal links
8383

84-
Internal links should use Hugo [ref and relref shortcodes](https://gohugo.io/content-management/cross-references/).
84+
Internal links should use Hugo shortcodes [ref](https://gohugo.io/methods/shortcode/ref/#article) (for absolute paths) and [relref](https://gohugo.io/methods/shortcode/relref/#article) (for relative paths).
85+
Please note that we favor absolute paths, as these are easier to maintain.
8586

86-
- Although file extensions are optional for Hugo, we include them as best practice for page anchors.
87-
- Relative paths are preferred, but just the filename is permissible.
87+
- Although file extensions (such as `.md`) are optional for Hugo, we include them as best practice for page anchors.
88+
- We prefer relative paths.
8889
- Paths without a leading forward slash (`/`) are first resolved relative to the current page, then the remainder of the website.
8990

9091
Here are two examples:
9192

9293
```md
9394
To install <software>, refer to the [installation instructions]({{< ref "install.md" >}}).
94-
To install <integation>, refer to the [integration instructions]({{< relref "/integration/thing.md#section" >}}).
95+
To install <integation>, refer to the [integration instructions]({{< ref "/integration/thing.md#section" >}}).
9596
```
9697

9798
### How to add images

0 commit comments

Comments
 (0)