Pull request: all: fix some typos

Merge in DNS/adguard-home from fix-typos to master

Squashed commit of the following:

commit d6a79ea60fea9e9f8bebbe845f403787b93e6f66
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Aug 17 15:54:09 2021 +0300

    all: fix some typos
This commit is contained in:
Ainar Garipov 2021-08-17 15:58:40 +03:00
parent f8fe4b310f
commit d2c9052dde
2 changed files with 11 additions and 10 deletions

View File

@ -232,7 +232,7 @@ Deactivate DNSStubListener and update DNS server address. Create a new file: `/
DNS=127.0.0.1 DNS=127.0.0.1
DNSStubListener=no DNSStubListener=no
Specifying "127.0.0.1" as DNS server address is necessry because otherwise the nameserver will be "127.0.0.53" which doesn't work without DNSStubListener. Specifying "127.0.0.1" as DNS server address is necessary because otherwise the nameserver will be "127.0.0.53" which doesn't work without DNSStubListener.
Activate another resolv.conf file: Activate another resolv.conf file:
@ -421,7 +421,8 @@ Enable DHCP server algorithm:
DHCP leases are used in several ways by DNS module. DHCP leases are used in several ways by DNS module.
* For "A" DNS reqeust we reply with an IP address leased by our DHCP server. * For "A" DNS request we reply with an IP address leased by our DHCP server.
< A bills-notebook.lan. < A bills-notebook.lan.
> A bills-notebook.lan. = 192.168.1.100 > A bills-notebook.lan. = 192.168.1.100
@ -564,7 +565,7 @@ Request:
"gateway_ip":"192.169.56.1", "gateway_ip":"192.169.56.1",
"subnet_mask":"255.255.255.0", "subnet_mask":"255.255.255.0",
"range_start":"192.169.56.100", "range_start":"192.169.56.100",
"range_end":"192.169.56.200", // Note: first 3 octects must match "range_start" "range_end":"192.169.56.200", // Note: first 3 octets must match "range_start"
"lease_duration":60, "lease_duration":60,
}, },
"v6":{ "v6":{

View File

@ -57,7 +57,7 @@ Optional environment:
default value is `1`. default value is `1`.
* `DIST_DIR`: the directory to build a release into. The default value is * `DIST_DIR`: the directory to build a release into. The default value is
`dist`. `dist`.
* `GO`: set an alternarive name for the Go compiler. * `GO`: set an alternative name for the Go compiler.
* `SIGN`: `0` to not sign the resulting packages, `1` to sign. The default * `SIGN`: `0` to not sign the resulting packages, `1` to sign. The default
value is `1`. value is `1`.
* `VERBOSE`: `1` to be verbose, `2` to also print environment. This script * `VERBOSE`: `1` to be verbose, `2` to also print environment. This script
@ -70,7 +70,7 @@ Optional environment:
### `clean.sh`: Cleanup ### `clean.sh`: Cleanup
Optional environment: Optional environment:
* `GO`: set an alternarive name for the Go compiler. * `GO`: set an alternative name for the Go compiler.
Required environment: Required environment:
* `DIST_DIR`: the directory where a release has previously been built. * `DIST_DIR`: the directory where a release has previously been built.
@ -82,7 +82,7 @@ Optional environment:
reproducible builds. reproducible builds.
* `GOARM`: ARM processor options for the Go compiler. * `GOARM`: ARM processor options for the Go compiler.
* `GOMIPS`: ARM processor options for the Go compiler. * `GOMIPS`: ARM processor options for the Go compiler.
* `GO`: set an alternarive name for the Go compiler. * `GO`: set an alternative name for the Go compiler.
* `OUT`: output binary name. * `OUT`: output binary name.
* `PARALLELISM`: set the maximum number of concurrently run build commands * `PARALLELISM`: set the maximum number of concurrently run build commands
(that is, compiler, linker, etc.). (that is, compiler, linker, etc.).
@ -98,7 +98,7 @@ Required environment:
### `go-deps.sh`: Install Backend Dependencies ### `go-deps.sh`: Install Backend Dependencies
Optional environment: Optional environment:
* `GO`: set an alternarive name for the Go compiler. * `GO`: set an alternative name for the Go compiler.
* `VERBOSE`: verbosity level. `1` shows every command that is run and every * `VERBOSE`: verbosity level. `1` shows every command that is run and every
Go package that is processed. `2` also shows subcommands and environment. Go package that is processed. `2` also shows subcommands and environment.
The default value is `0`, don't be verbose. The default value is `0`, don't be verbose.
@ -110,14 +110,14 @@ Don't forget to run `make go-tools` once first!
Optional environment: Optional environment:
* `EXIT_ON_ERROR`: if set to `0`, don't exit the script after the first * `EXIT_ON_ERROR`: if set to `0`, don't exit the script after the first
encountered error. The default value is `1`. encountered error. The default value is `1`.
* `GO`: set an alternarive name for the Go compiler. * `GO`: set an alternative name for the Go compiler.
* `VERBOSE`: verbosity level. `1` shows every command that is run. `2` also * `VERBOSE`: verbosity level. `1` shows every command that is run. `2` also
shows subcommands. The default value is `0`, don't be verbose. shows subcommands. The default value is `0`, don't be verbose.
### `go-test.sh`: Run Backend Tests ### `go-test.sh`: Run Backend Tests
Optional environment: Optional environment:
* `GO`: set an alternarive name for the Go compiler. * `GO`: set an alternative name for the Go compiler.
* `RACE`: set to `0` to not use the Go race detector. The default value is * `RACE`: set to `0` to not use the Go race detector. The default value is
`1`, use the race detector. `1`, use the race detector.
* `TIMEOUT_FLAGS`: set timeout flags for tests. The default value is * `TIMEOUT_FLAGS`: set timeout flags for tests. The default value is
@ -133,7 +133,7 @@ Installs the Go static analysis and other tools into `${PWD}/bin`. Either add
directly, or use the commands through `make` (for example, `make go-lint`). directly, or use the commands through `make` (for example, `make go-lint`).
Optional environment: Optional environment:
* `GO`: set an alternarive name for the Go compiler. * `GO`: set an alternative name for the Go compiler.
### `version.sh`: Generate And Print The Current Version ### `version.sh`: Generate And Print The Current Version