Skip to content

Commit 469dd7e

Browse files
authored
feat: Update repo READMEs and affected files (#783)
This commit removes the CHANGELOG file from the repository, as it was not being used. The README and CONTRIBUTING files have been streamlined, and now more accurately reflect the user flow when contributing. Some GitHub templates have been updated to reflect these changes, and also include relative links instead of axiomatic blobs, which will make finding and updating links easier in the future.
1 parent be0a1e7 commit 469dd7e

File tree

7 files changed

+44
-71
lines changed

7 files changed

+44
-71
lines changed

.github/ISSUE_TEMPLATE/1-feature_request.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: Feature request
33
about: Suggest an idea for this project
44
title: ""
5-
labels: ""
5+
labels: "enhancement"
66
assignees: ""
77
---
88

.github/ISSUE_TEMPLATE/2-bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: Bug report
33
about: Create a report to help us improve
44
title: ""
5-
labels: ""
5+
labels: "bug"
66
assignees: ""
77
---
88

.github/pull_request_template.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ Before merging a pull request, run through this checklist and mark each as compl
2626
- [ ] I have rebased my branch onto main
2727
- [ ] I have ensured my PR is targeting the main branch and pulling from my branch from my own fork
2828
- [ ] 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)
29+
- [ ] I have ensured that documentation content adheres to [the style guide](/documentation/style-guide.md)
3030
- [ ] If the change involves potentially sensitive changes[^1], I have assessed the possible impact
3131
- [ ] If applicable, I have added tests that prove my fix is effective or that my feature works
3232
- [ ] 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)
33+
- [ ] If applicable, I have updated [`README.md`](/README.md)
3434

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.
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](/documentation/style-guide.md) for guidance about placeholder content.

CHANGELOG.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,36 @@
11
# Contributing guidelines
22

3-
The following is a set of guidelines for community contributions to this project.
4-
5-
We really appreciate your desire to contribute!
3+
The following are a set of guidelines for contributing to this project. We appreciate your desire to get involved!
64

75
If you are an F5 employee, see the following additional guidance on [Maintainers etiquette](/documentation/maintainers-etiquette.md).
86

97
## Table of contents
108

11-
- [Report a Bug](#report-a-bug)
12-
- [Suggest a Feature or Enhancement](#suggest-a-feature-or-enhancement)
13-
- [Open a Discussion](#open-a-discussion)
9+
- [Create an issue](#create-an-issue)
10+
- [Start a discussion](#start-a-discussion)
1411
- [Submit a pull request](#submit-a-pull-request)
15-
- [Issue Lifecycle](#issue-lifecycle)
12+
- [Issue lifecycle](#issue-lifecycle)
1613
- [Additional NGINX documentation](#additional-nginx-documentation)
1714
- [F5 Contributor License Agreement (CLA)](#f5-contributor-license-agreement)
1815

19-
## Report a bug
16+
## Create an issue
17+
18+
One way to contribute to the project is by [creating an issue](https://github.com/nginx/documentation/issues/new/choose).
19+
20+
The two most common are enhancements and bug reports. When using the issue templates, they will be automatically labelled.
21+
22+
- An enhancement is an improvement of some kind, such as a new document or additional detail for a product feature
23+
- A bug report draws attention to an issue in documentation, such as an incorrect command or outdated information
2024

21-
To report a bug, open an issue on GitHub with the label `bug` using the
22-
available bug report issue template. Before reporting a bug, make sure the
23-
issue has not already been reported.
25+
Before creating an issue, please check there is [no existing issue](https://github.com/nginx/documentation/issues?q=is%3Aissue) for the topic.
2426

25-
## Suggest a feature or enhancement
27+
We encourage discussions within issues, since they act as a source of contextual truth and are linked to pull requests.
2628

27-
To suggest a feature or enhancement, open an issue on GitHub with the label
28-
`feature` or `enhancement` using the available feature request issue template.
29-
Please ensure the feature or enhancement has not already been suggested.
29+
## Start a discussion
3030

31-
## Open a Discussion
31+
We encourage you to use [GitHub Discussions](https://github.com/nginx/documentation/discussions) for conversations with the community and maintainers.
3232

33-
If you want to start a conversation with the community and maintainers,
34-
we encourage you to use
35-
[GitHub Discussions](https://github.com/nginx/documentation/discussions).
33+
If you'd like to discuss something NGINX-related that doesn't involve documentation, you should go to the [NGINX Community Forum](https://community.nginx.org/).
3634

3735
## Submit a pull request
3836

@@ -66,7 +64,6 @@ This repository does not include all of the source content for the NGINX documen
6664
- [NGINX Open Source](https://github.com/nginx/nginx) - source for [NGINX changelog](https://nginx.org/en/CHANGES)
6765
- [nginx.org](https://github.com/nginx/nginx.org) - source for https://nginx.org
6866
- [NGINX Unit](https://github.com/nginx/unit) - source for https://unit.nginx.org
69-
- [NGINX Ingress Controller](https://github.com/nginxinc/kubernetes-ingress/) - source for https://docs.nginx.com/nginx-ingress-controller
7067

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

README.md

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,28 @@
44
[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](https://github.com/nginxinc/template-repository/main/CODE_OF_CONDUCT.md)
55
![Commercial Support](https://badgen.net/badge/support/commercial/green?icon=awesome)
66

7-
<!-- These are the "repo [status badge](https://www.repostatus.org/)s" and the community support badges -->
8-
97
# NGINX documentation
108

9+
This repository contains the user documentation for NGINX's products, as well as the requirements to build and publish the documentation website.
10+
11+
Documentation is written in [Markdown](https://daringfireball.net/projects/markdown/basics), then transformed into HTML using the [Hugo](https://gohugo.io/) static site generator.
12+
1113
If you want to contribute to [F5 NGINX documentation](https://docs.nginx.com), you've come to the right place. We've organized a series of README-type files to help you get started:
1214

1315
- [Contributing](/CONTRIBUTING.md) describes how you can contribute to our documentation.
14-
- [Contributing guidelines for experts](/CONTRIBUTING_DOCS.md) describes how you can contribute (and check your work) with Hugo, our static site generator
1516
- [Code of Conduct](/CODE_OF_CONDUCT.md) describes expectations in the NGINX open source community.
1617
- [License](/LICENSE) shows the license associated with work on this repository.
1718
- [Security](/SECURITY.md) describes the procedures we would like you to follow if you find a security issue.
1819
- [Support](/SUPPORT.md) lists how you can get support as a customer or a community member.
1920

20-
## Explanation
21-
22-
This repository contains user documentation for NGINX's products, as well as the requirements for linting, building, and publishing the documentation.
23-
24-
Our documentation is written in Markdown, specifically the [Goldmark](https://github.com/yuin/goldmark) Markdown parser.
25-
We build our docs using [Hugo](https://gohugo.io) and host them in custom URLs on Azure.
21+
You may also find the [documentation folder](/documentation/) for the repository interesting: it's where we store our process information.
2622

2723
## License
2824

2925
[BSD 2-Clause "Simplified" License](/LICENSE)
3026

3127
&copy; [F5, Inc.](https://www.f5.com/) 2025
3228

33-
3429
## Credits
3530

3631
- [The Good Docs Project](https://www.thegooddocsproject.dev/), whose templates we've adapted for our use.

documentation/writing-hugo.md

Lines changed: 17 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,50 +4,35 @@ This page describes our guidelines on using [Hugo](https://gohugo.io/) to write
44

55
You will need [git](https://git-scm.com/) to interact with the repository and files: the content itself is written in Markdown.
66

7-
Our workflow is to develop content locally, then submit a pull request once we've done our initial draft and editing passes.
7+
Our workflow is to develop content locally, then [submit a pull request](/documentation/git-conventions.md) once we've done our initial draft and editing passes.
88

99
For guidance around how to write content, please check [the style guide](/documentation/style-guide.md).
1010

1111
## Setup
1212

13-
You will need to install Hugo _or_ Docker to build and preview docs in your local development environment.
13+
You will need to install Hugo _or_ Docker to build or preview documentation in your local development environment.
1414

15-
Read the [Hugo installation instructions](https://gohugo.io/getting-started/installing/) for more information.
15+
Read the [Hugo installation instructions](https://gohugo.io/getting-started/installing/) for more information: we are currently running [Hugo v0.147.8](https://github.com/gohugoio/hugo/releases/tag/v0.147.8) in production.
1616

1717
If you have [Docker](https://www.docker.com/get-started/) installed, there are fallbacks for all requirements in the [Makefile](Makefile), meaning you don't need to install them.
1818

19-
- [Installing Hugo](https://gohugo.io/getting-started/installing/)
20-
- **NOTE**: We are currently running [Hugo v0.147.8](https://github.com/gohugoio/hugo/releases/tag/v0.147.8) in production.
21-
- [Installing markdownlint-cli](https://github.com/igorshubovych/markdownlint-cli?tab=readme-ov-file#installation)
22-
- [Installing markdown-link-check](https://github.com/tcort/markdown-link-check?tab=readme-ov-file#installation)
19+
## Build the documentation locally
2320

24-
The configuration files are as follows:
25-
26-
- *Hugo*: `config/default/config.toml`
27-
- *markdownlint-cli*: `.markdownlint.json`
28-
- *markdown-link-check* `md-linkcheck-config.json`
29-
30-
## Develop documentation locally
31-
32-
To build the documentation website locally, use the `make` command in the documentation folder.
33-
34-
First ensure you have the latest version of the Hugo theme with:
21+
To build the website locally, first ensure you have the latest version of the Hugo theme with:
3522

3623
`make hugo-update`
3724

38-
Once you've updated the theme, you can use these targets:
25+
You can then use the other `make` commands: *watch* is most commmon when working on documentation.
3926

4027
| Target | Description |
4128
| ------------------- | --------------------------------------------------------------------------- |
4229
| _make watch_ | Runs a local Hugo server, allowing for changes to be previewed in a browser. |
4330
| _make drafts_ | Runs a local Hugo server, rendering documents marked with `draft: true` in their metadata.|
44-
| _make docs_ | Builds the documentation in the local `public/` directory. |
45-
| _make clean_ | Removes the local `public` directory |
46-
| _make hugo-get_ | Updates the go module file with the latest version of the theme. |
47-
| _make hugo-tidy_ | Removes unnecessary dependencies from the go module file. |
48-
| _make hugo-update_ | Runs the hugo-get and hugo-tidy targets in sequence. |
49-
| _make lint-markdown_ | Runs [markdownlint](https://github.com/DavidAnson/markdownlint) on the content folder. |
50-
| _make link-check_ | Runs [markdown-link-check](https://github.com/tcort/markdown-link-check) on all Markdown files. |
31+
| _make docs_ | Builds the documentation in the local `public/` directory. |
32+
| _make clean_ | Removes the local `public` directory |
33+
| _make hugo-get_ | Updates the go module file with the latest version of the theme. |
34+
| _make hugo-tidy_ | Removes unnecessary dependencies from the go module file. |
35+
| _make hugo-update_ | Runs the hugo-get and hugo-tidy targets in sequence. |
5136

5237
## Add new documentation
5338

@@ -67,9 +52,10 @@ This new page will be created with the default how-to archetype. To use a specif
6752

6853
Our archetypes [currently include](/archetypes/) the following:
6954

70-
- `default` (How-to instructions, general use)
71-
- `concept`(An explanation of one implementation detail and some use cases)
72-
- `tutorial` (An in-depth set of how-to instructions, referencing concepts)
55+
- `default` - How-to instructions, general use
56+
- `concept` - An explanation of one implementation detail and some use cases
57+
- `tutorial` - An in-depth set of how-to instructions, referencing concepts
58+
- `landing-page` - A special archetype for the landing page of a documentation set, with a unique layout
7359

7460
These archetypes are adapted from some existing [templates](/templates/): please [file an issue](https://github.com/nginx/documentation/issues/new?template=1-feature_request.md) if you would like a new archetype.
7561

@@ -165,11 +151,11 @@ An example of this can be seen in [/content/ngf/get-started.md](https://github.c
165151
Use the `img` shortcode to add images to documentation pages. It has the same parameters as the Hugo [figure shortcode](https://gohugo.io/content-management/shortcodes/#figure).
166152

167153
1. Add the image to the `/static/img` directory.
168-
1. Add the `img` shortcode:
154+
2. Add the `img` shortcode:
169155
- `{{< img src="<img-file.png>" alt="<Alternative text>">}}`
170156
- Do not include a forward slash at the beginning of the file path or it will [break the image](https://gohugo.io/functions/relurl/#input-begins-with-a-slash).
171157

172-
> **Important**: We have strict guidelines for using images. Review them in our [style guide](/templates/style-guide.md#guidelines-for-screenshots).
158+
> **Important**: We have strict guidelines for using images. Review them in our [style guide](/documentation/style-guide.md#guidelines-for-screenshots).
173159
174160

175161
### How to use Hugo includes

0 commit comments

Comments
 (0)