Skip to content

Commit

Permalink
feat: Fix issues caused by merge resolution, remove gerund filenames
Browse files Browse the repository at this point in the history
  • Loading branch information
ADubhlaoich committed Oct 9, 2024
1 parent fa6cb74 commit bb55b2a
Show file tree
Hide file tree
Showing 13 changed files with 7 additions and 187 deletions.
4 changes: 2 additions & 2 deletions site/content/contribute/dev-environment-setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Ubuntu is the recommended operating system for development, as it comes with mos

To begin this task, you will require the following:

- A [working NGINX Agent instance]({{< ref "/installation-upgrade/install.md" >}}).
- A [working NGINX Agent instance]({{< ref "/install-upgrade/install.md" >}}).
- A [Go installation](https://go.dev/dl/) of version 1.22.2 or newer.
- A [Protocol Buffer Compiler](https://grpc.io/docs/protoc-installation/) installation.

Expand All @@ -29,7 +29,7 @@ git clone [email protected]:nginx/agent.git

Read [Cloning a repository](https://docs.github.com/en/repositories/creating-and-managing-repositories/cloning-a-repository) for more information

Follow the steps in the [Installation]({{< relref "/installation-upgrade/install.md" >}}) topic to install NGINX Agent.
Follow the steps in the [Installation]({{< relref "/install-upgrade/install.md" >}}) topic to install NGINX Agent.

## Install prerequisite packages
Depending on the operating system distribution, it may be necessary to install the following packages in order to build NGINX Agent.
Expand Down
2 changes: 1 addition & 1 deletion site/content/contribute/start-mock-interface.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ The mock interface is useful when developing NGINX Agent, as it allows you to vi

To begin this task, you will require the following:

- A [working NGINX Agent instance]({{< ref "/installation-upgrade/install.md" >}}).
- A [working NGINX Agent instance]({{< ref "/install-upgrade/install.md" >}}).
- A [Go installation](https://go.dev/dl/) of version 1.22.2 or newer.
- A [go-swagger](https://goswagger.io/go-swagger/install/) installation.

Expand Down
2 changes: 1 addition & 1 deletion site/content/how-to/export-metrics.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ This document describes how to export the metrics data from F5 NGINX Agent.

To begin this task, you will require the following:

- A [working NGINX Agent instance]({{< ref "/installation-upgrade/install.md" >}}).
- A [working NGINX Agent instance]({{< ref "/install-upgrade/install.md" >}}).
-
-

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ docs: DOCS-000

## Overview

The F5 NGINX Agent repository includes [Dockerfiles](https://github.com/nginx/agent/tree/main/scripts/docker) that can be used to [build custom container images]({{< relref "installation-upgrade/container-environments/docker-images.md" >}}). Images are created with an NGINX Open Source or NGINX Plus instance and are available for various operating systems.
The F5 NGINX Agent repository includes [Dockerfiles](https://github.com/nginx/agent/tree/main/scripts/docker) that can be used to [build custom container images]({{< relref "/install-upgrade/container-environments/docker-images.md" >}}). Images are created with an NGINX Open Source or NGINX Plus instance and are available for various operating systems.

See the [Technical Specifications]({{< relref "/technical-specifications.md#container-support" >}}) for a list of supported operationg systems.

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ This topic describes how to migrate from F5 NGINX Agent v2 to NGINX Agent v3.

To begin this task, you will require the following:

- A [working NGINX Agent instance]({{< ref "/installation-upgrade/install.md" >}}).
- A [working NGINX Agent instance]({{< ref "/install-upgrade/install.md" >}}).
-
-

Expand Down
File renamed without changes.
File renamed without changes.
180 changes: 0 additions & 180 deletions site/content/installation-upgrade/getting-started.md

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ docs: "DOCS-909"

## Overview

The NGINX Agent repository includes [Dockerfiles](https://github.com/nginx/agent/tree/main/scripts/docker) that can be used to [build custom container images]({{< relref "installation-upgrade/container-environments/docker-images.md" >}}). Images are created with an NGINX Open Source or NGINX Plus instance and are available for various operating systems.
The NGINX Agent repository includes [Dockerfiles](https://github.com/nginx/agent/tree/main/scripts/docker) that can be used to [build custom container images]({{< relref "/v2/installation-upgrade/container-environments/docker-images.md" >}}). Images are created with an NGINX Open Source or NGINX Plus instance and are available for various operating systems.

See the [Technical Specifications]({{< relref "/technical-specifications.md#container-support" >}}) for a list of supported operationg systems.

Expand Down

0 comments on commit bb55b2a

Please sign in to comment.