Skip to content

Commit 9436c3e

Browse files
authored
Merge branch 'main' into update-pr-template
2 parents f5f1afa + 99ac2a3 commit 9436c3e

Some content is hidden

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

44 files changed

+124
-853
lines changed

.github/CODEOWNERS

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313
# Lines starting with '#' are comments.
1414
# Each line is a file pattern followed by one or more owners.
1515

16-
# DocOps
16+
# DocOps Writers
1717
* @nginx/nginx-docs
18+
# DocOps Engineers
19+
.github/* @nginx/docs-engineering
1820
# NGINX Plus
1921
content/nginx/* @nginx/plus-docs-approvers
2022
# NGINX Agent

.github/workflows/build-push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
lighthouseci:
7575
if: github.event.pull_request
7676
needs: call-docs-build-push
77-
runs-on: ubuntu-latest
77+
runs-on: ubuntu-22.04
7878
steps:
7979
- uses: actions/checkout@v3
8080
with:

content/amplify/faq/nginx-amplify-agent.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ docs: "DOCS-958"
1111

1212
The F5 NGINX Amplify Agent is currently officially packaged and supported for the following Linux flavors only:
1313

14+
* Ubuntu 24.04 "noble" (amd64/arm64)
1415
* Ubuntu 22.04 "jammy" (amd64/arm64)
1516
* Ubuntu 20.04 "focal" (amd64/arm64)
1617
* Debian 12 "bookworm" (amd64/arm64)

content/nginx-one/how-to/certificates/manage-certificates.md

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -82,20 +82,17 @@ Follow these steps to review existing certificates for your instances.
8282

8383
On the left-hand pane, select **Certificates**. In the window that appears, you see:
8484

85-
- **Certificate Status**
86-
- Total number of certificates in one of these categories;
87-
- Managed by NGINX One Console
88-
- Detected on connected NGINX instances
89-
- Valid certificates that expire more than 30 days from now
90-
- Valid certificates that expire within the next 30 days
91-
- Expired certificates
92-
- Certificates that are not yet valid
93-
94-
- **Management Status**
95-
- Managed certificates are stored on NGINX One Console.
96-
- You can use NGINX One Console to deploy, administer, and update certificates remotely.
97-
- Unmanaged certificates are detected by NGINX One Console through the connected NGINX instance configuration.
98-
- If you choose to convert an unmanaged certificate to managed, you may need to upload the certificate and the key during the conversion.
85+
{{<bootstrap-table "table table-striped table-bordered">}}
86+
| Term | Definition |
87+
|-------------|-------------|
88+
| **Total** | Total number of certificates available to NGINX One Console |
89+
| **Valid (31+ days)** | Number of certificates that expire in 31 or more days |
90+
| **Expires Soon (<31 days)** | Number of certificates that expire in less than 31 days |
91+
| **Expired** | Number of exprired certificates |
92+
| **Not Ready** | Certificates with a start date in the future |
93+
| **Managed** | Managed by and stored in the NGINX One Console |
94+
| **Unmanaged** | Detected by, and not managed by NGINX One Console. To convert to managed, you may need to upload the certificate and key during the process. |
95+
{{</bootstrap-table>}}
9996

10097
You can **Add Filter** to filter certificates by:
10198

content/nginx-one/how-to/settings/instance-settings/_index.md

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

content/nginx-one/how-to/settings/instance-settings/clean-up-unavailable-instances.md

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

content/nim/admin-guide/rbac/add-rbac-with-tagging.md

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

content/nim/deploy/uninstall-guide.md

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

content/nim/deploy/upgrade-guide.md

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

0 commit comments

Comments
 (0)