Skip to content

Commit 9566787

Browse files
authored
Merge branch 'main' into otel
2 parents 7348b97 + 28bcfd9 commit 9566787

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
lines changed

.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

content/ngf/how-to/data-plane-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ spec:
199199
mode: ProxyProtocol
200200
trustedAddresses:
201201
- type: CIDR
202-
value "76.89.90.11/24"
202+
value: "76.89.90.11/24"
203203
EOF
204204
```
205205

content/nim/admin-guide/license/report-usage-connected-deployment.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ To allow NGINX Instance Manager to report usage data to F5, make sure port `443`
3939

4040
### Configure NGINX Plus to report usage to NGINX Instance Manager
4141

42-
To configure NGINX Plus (R33 and later) to report usage data to NGINX Instance Manger:
42+
To configure NGINX Plus (R33 and later) to report usage data to NGINX Instance Manager:
4343

4444
{{< include "licensing-and-reporting/configure-nginx-plus-report-to-nim.md" >}}
4545

@@ -74,4 +74,4 @@ If you prefer submitting usage reports to F5 manually, follow these steps:
7474

7575
## Error log location and monitoring {#log-monitoring}
7676

77-
{{< include "licensing-and-reporting/log-location-and-monitoring.md" >}}
77+
{{< include "licensing-and-reporting/log-location-and-monitoring.md" >}}

content/nim/deploy/vm-bare-metal/install-nim-deprecated.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ To install NGINX Instance Manager, you need to add the official repository to pu
278278
{{<tabs name="upgrade_nim">}}
279279
{{%tab name="CentOS, RHEL, RPM-Based"%}}
280280
281-
1. To upgrade to the latest version of the Instance Manger, run the following command:
281+
1. To upgrade to the latest version of the Instance Manager, run the following command:
282282
283283
```bash
284284
sudo yum update -y nms-instance-manager

content/nim/disconnected/report-usage-disconnected-deployment.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Before submitting usage data to F5, first configure NGINX Plus to report telemet
2525

2626
### Configure NGINX Plus to report usage to NGINX Instance Manager
2727

28-
To configure NGINX Plus (R33 and later) to report usage data to NGINX Instance Manger:
28+
To configure NGINX Plus (R33 and later) to report usage data to NGINX Instance Manager:
2929

3030
{{< include "licensing-and-reporting/configure-nginx-plus-report-to-nim.md" >}}
3131

@@ -182,4 +182,4 @@ To upload the the usage acknowledgement:
182182

183183
## Error log location and monitoring {#log-monitoring}
184184

185-
{{< include "licensing-and-reporting/log-location-and-monitoring.md" >}}
185+
{{< include "licensing-and-reporting/log-location-and-monitoring.md" >}}

content/nim/system-configuration/secure-traffic.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ To generate the necessary certificates, follow these steps. You can modify these
136136
}
137137

138138
make_server() {
139-
echo "Creating nginx-manger certificate and key"
139+
echo "Creating nginx-manager certificate and key"
140140
openssl req \
141141
-new \
142142
-nodes \

content/nms/acm/tutorials/aws-deploy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ Follow the steps in the [Set Up a Developer Portal Environment]({{< ref "/nms/ac
227227

228228
## Terminal Access Using Session Manager (Optional) {#session-manager}
229229

230-
AWS allows you to enable SSH traffic to a specific Source IP Address which is much safer than exposing it to everyone on the internet. Even though exposing it to one IP may be good enough, it might not be sufficient for your company policy. It is possible to completely disable SSH traffic yet still have terminal access to your EC2 Instances. There are different ways of doing this, and one way covered here is using [AWS System Manager Session Manger](https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager.html).
230+
AWS allows you to enable SSH traffic to a specific Source IP Address which is much safer than exposing it to everyone on the internet. Even though exposing it to one IP may be good enough, it might not be sufficient for your company policy. It is possible to completely disable SSH traffic yet still have terminal access to your EC2 Instances. There are different ways of doing this, and one way covered here is using [AWS System Manager Session Manager](https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager.html).
231231

232232
There are two methods of gaining terminal access via Session Manager:
233233

content/solutions/about-subscription-licenses.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ In environments where NGINX Plus instances cannot access the internet, you'll ne
8888
8989
#### Configure NGINX Plus to report usage to NGINX Instance Manager
9090
91-
To configure NGINX Plus R33 or later to report usage data to NGINX Instance Manger:
91+
To configure NGINX Plus R33 or later to report usage data to NGINX Instance Manager:
9292
9393
{{< include "licensing-and-reporting/configure-nginx-plus-report-to-nim.md" >}}
9494
@@ -162,7 +162,7 @@ For detailed instructions on installing or upgrading NGINX App Protect DoS, visi
162162
## Watch instructional videos
163163

164164
### Submit usage reports in a connected environment
165-
{{< youtube id="mnTJ1oYnZpk" >}}
165+
{{< youtube id="PDnacyh2RUw" >}}
166166

167167
### Submit usage reports in a disconnected environment
168168
{{< youtube id="4wIM21bR9-g" >}}

0 commit comments

Comments
 (0)