git: 1c8e08bc68 - main - Improve English terms.
Ceri Davies
ceri at FreeBSD.org
Sun Jun 13 12:49:41 UTC 2021
The branch main has been updated by ceri:
URL: https://cgit.FreeBSD.org/doc/commit/?id=1c8e08bc687f675074651b8caf0d5df743b0ef48
commit 1c8e08bc687f675074651b8caf0d5df743b0ef48
Author: Ceri Davies <ceri at FreeBSD.org>
AuthorDate: 2021-06-13 12:43:32 +0000
Commit: Ceri Davies <ceri at FreeBSD.org>
CommitDate: 2021-06-13 12:43:32 +0000
Improve English terms.
---
.../en/articles/committers-guide/_index.adoc | 2 +-
.../en/articles/filtering-bridges/_index.adoc | 2 +-
.../en/articles/linux-emulation/_index.adoc | 2 +-
.../content/en/books/handbook/disks/_index.adoc | 18 ++++-----
.../en/books/handbook/firewalls/_index.adoc | 43 +++++++++++-----------
5 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc
index 63f2db466e..8cc8a8beeb 100644
--- a/documentation/content/en/articles/committers-guide/_index.adoc
+++ b/documentation/content/en/articles/committers-guide/_index.adoc
@@ -2456,7 +2456,7 @@ Subscribers to {dev-commits-doc-all}, {dev-commits-ports-all} or {dev-commits-sr
+
[NOTE]
======
-If your e-mail system uses SPF with strict rules, you should whitelist `mx2.FreeBSD.org` from SPF checks.
+If your e-mail system uses SPF with strict rules, you should exclude `mx2.FreeBSD.org` from SPF checks.
======
+
Due to the severe load dealing with SPAM places on the central mail servers that do the mailing list processing, the front-end server does do some basic checks and will drop some messages based on these checks. At the moment proper DNS information for the connecting host is the only check in place but that may change. Some people blame these checks for bouncing valid email. To have these checks turned off for your email, create a file named [.filename]#~/.spam_lover# on `freefall.FreeBSD.org`.
diff --git a/documentation/content/en/articles/filtering-bridges/_index.adoc b/documentation/content/en/articles/filtering-bridges/_index.adoc
index c729c8f934..4f54b24ace 100644
--- a/documentation/content/en/articles/filtering-bridges/_index.adoc
+++ b/documentation/content/en/articles/filtering-bridges/_index.adoc
@@ -216,7 +216,7 @@ add pass ip from any to any in via xl0
add pass tcp from any to any 22 in via fxp0 setup keep-state
# Allow SMTP only towards the mail server
add pass tcp from any to relay 25 in via fxp0 setup keep-state
-# Allow zone transfers only by the slave name server [dns2.nic.it]
+# Allow zone transfers only by the secondary name server [dns2.nic.it]
add pass tcp from 193.205.245.8 to ns 53 in via fxp0 setup keep-state
# Pass ident probes. It is better than waiting for them to timeout
add pass tcp from any to any 113 in via fxp0 setup keep-state
diff --git a/documentation/content/en/articles/linux-emulation/_index.adoc b/documentation/content/en/articles/linux-emulation/_index.adoc
index 6512d55b80..e9d86ae201 100644
--- a/documentation/content/en/articles/linux-emulation/_index.adoc
+++ b/documentation/content/en/articles/linux-emulation/_index.adoc
@@ -1399,7 +1399,7 @@ DragonflyBSD has expressed some interest in porting the 2.6 improvements.
Generally, as Linux(R) develops we would like to keep up with their development, implementing newly added syscalls.
Splice comes to mind first.
-Some already implemented syscalls are also heavily crippled, for example `mremap` and others.
+Some already implemented syscalls are also suboptimal, for example `mremap` and others.
Some performance improvements can also be made, finer grained locking and others.
[[team]]
diff --git a/documentation/content/en/books/handbook/disks/_index.adoc b/documentation/content/en/books/handbook/disks/_index.adoc
index 238c075973..5390274807 100644
--- a/documentation/content/en/books/handbook/disks/_index.adoc
+++ b/documentation/content/en/books/handbook/disks/_index.adoc
@@ -2228,7 +2228,7 @@ The HAST project was sponsored by The FreeBSD Foundation with support from http:
=== HAST Operation
-HAST provides synchronous block-level replication between two physical machines: the _primary_, also known as the _master_ node, and the _secondary_, or _slave_ node.
+HAST provides synchronous block-level replication between two physical machines: the _primary_ nodeand the _secondary_ node.
These two machines together are referred to as a cluster.
Since HAST works in a primary-secondary configuration, it allows only one of the cluster nodes to be active at any given time.
@@ -2271,7 +2271,7 @@ Users who prefer to statically build `GEOM_GATE` support into the kernel should
options GEOM_GATE
....
-The following example describes how to configure two nodes in master-slave/primary-secondary operation using HAST to replicate the data between the two.
+The following example describes how to configure two nodes in primary-secondary operation using HAST to replicate the data between the two.
The nodes will be called `hasta`, with an IP address of `172.16.0.1`, and `hastb`, with an IP address of `172.16.0.2`.
Both nodes will have a dedicated hard drive [.filename]#/dev/ad6# of the same size for HAST operation.
The HAST pool, sometimes referred to as a resource or the GEOM provider in [.filename]#/dev/hast/#, will be called `test`.
@@ -2372,7 +2372,7 @@ To accomplish this task, the Common Address Redundancy Protocol (CARP) is used t
CARP allows multiple hosts on the same network segment to share an IP address.
Set up CARP on both nodes of the cluster according to the documentation available in crossref:advanced-networking[carp,“Common Address Redundancy Protocol (CARP)”].
In this example, each node will have its own management IP address and a shared IP address of _172.16.0.254_.
-The primary HAST node of the cluster must be the master CARP node.
+The primary HAST node of the cluster must be the primary CARP node.
The HAST pool created in the previous section is now ready to be exported to the other hosts on the network.
This can be accomplished by exporting it through NFS or Samba, using the shared IP address _172.16.0.254_.
@@ -2390,14 +2390,14 @@ notify 30 {
match "system" "IFNET";
match "subsystem" "carp0";
match "type" "LINK_UP";
- action "/usr/local/sbin/carp-hast-switch master";
+ action "/usr/local/sbin/carp-hast-switch primary";
};
notify 30 {
match "system" "IFNET";
match "subsystem" "carp0";
match "type" "LINK_DOWN";
- action "/usr/local/sbin/carp-hast-switch slave";
+ action "/usr/local/sbin/carp-hast-switch secondary";
};
....
@@ -2429,7 +2429,7 @@ Here is an example of an automated failover script:
# The names of the HAST resources, as listed in /etc/hast.conf
resources="test"
-# delay in mounting HAST resource after becoming master
+# delay in mounting HAST resource after becoming primary
# make your best guess
delay=3
@@ -2440,7 +2440,7 @@ name="carp-hast"
# end of user configurable stuff
case "$1" in
- master)
+ primary)
logger -p $log -t $name "Switching to primary provider for ${resources}."
sleep ${delay}
@@ -2482,7 +2482,7 @@ case "$1" in
;;
- slave)
+ secondary)
logger -p $log -t $name "Switching to secondary provider for ${resources}."
# Switch roles for the HAST resources
@@ -2504,7 +2504,7 @@ case "$1" in
esac
....
-In a nutshell, the script takes these actions when a node becomes master:
+In a nutshell, the script takes these actions when a node becomes primary:
* Promotes the HAST pool to primary on the other node.
* Checks the file system under the HAST pool.
diff --git a/documentation/content/en/books/handbook/firewalls/_index.adoc b/documentation/content/en/books/handbook/firewalls/_index.adoc
index 47429914bc..a70334c309 100644
--- a/documentation/content/en/books/handbook/firewalls/_index.adoc
+++ b/documentation/content/en/books/handbook/firewalls/_index.adoc
@@ -795,13 +795,13 @@ This example removes all entries older than 24 hours:
Not to be confused with the spamd daemon which comes bundled with spamassassin, package:mail/spamd[] can be configured with PF to provide an outer defense against SPAM.
This spamd hooks into the PF configuration using a set of redirections.
-Spammers tend to send a large number of messages, and SPAM is mainly sent from a few spammer friendly networks and a large number of hijacked machines, both of which are reported to _blacklists_ fairly quickly.
+Spammers tend to send a large number of messages, and SPAM is mainly sent from a few spammer friendly networks and a large number of hijacked machines, both of which are reported to _blocklists_ fairly quickly.
-When an SMTP connection from an address in a blacklist is received, spamd presents its banner and immediately switches to a mode where it answers SMTP traffic one byte at a time.
+When an SMTP connection from an address in a blocklist is received, spamd presents its banner and immediately switches to a mode where it answers SMTP traffic one byte at a time.
This technique, which is intended to waste as much time as possible on the spammer's end, is called _tarpitting_.
The specific implementation which uses one byte SMTP replies is often referred to as _stuttering_.
-This example demonstrates the basic procedure for setting up spamd with automatically updated blacklists.
+This example demonstrates the basic procedure for setting up spamd with automatically updated blocklists.
Refer to the man pages which are installed with package:mail/spamd[] for more information.
[.procedure]
@@ -845,13 +845,12 @@ One of the first lines in the configuration file that does not begin with a `#`
[.programlisting]
....
all:\
- :traplist:whitelist:
+ :traplist:allowlist:
....
+
-This entry adds the desired blacklists, separated by colons (`:`).
-To use a whitelist to subtract addresses from a blacklist, add the name of the whitelist _immediately_ after the name of that blacklist. For example: `:blacklist:whitelist:`.
+This entry adds the desired blocklists, separated by colons (`:`). To use an allowlist to subtract addresses from a blocklist, add the name of the allowlist _immediately_ after the name of that blocklist. For example: `:blocklist:allowlist:`.
+
-This is followed by the specified blacklist's definition:
+This is followed by the specified blocklist's definition:
+
[.programlisting]
....
@@ -862,26 +861,26 @@ traplist:\
:file=www.openbsd.org/spamd/traplist.gz
....
+
-where the first line is the name of the blacklist and the second line specifies the list type.
-The `msg` field contains the message to display to blacklisted senders during the SMTP dialogue.
+where the first line is the name of the blocklist and the second line specifies the list type.
+The `msg` field contains the message to display to blocklisted senders during the SMTP dialogue.
The `method` field specifies how spamd-setup fetches the list data; supported methods are `http`, `ftp`, from a `file` in a mounted file system, and via `exec` of an external program.
Finally, the `file` field specifies the name of the file spamd expects to receive.
+
-The definition of the specified whitelist is similar, but omits the `msg` field since a message is not needed:
+The definition of the specified allowlist is similar, but omits the `msg` field since a message is not needed:
+
[.programlisting]
....
-whitelist:\
+allowlist:\
:white:\
:method=file:\
- :file=/var/mail/whitelist.txt
+ :file=/var/mail/allowlist.txt
....
+
[TIP]
====
*Choose Data Sources with Care:* +
-Using all the blacklists in the sample [.filename]#spamd.conf# will blacklist large blocks of the Internet.
+Using all the blocklists in the sample [.filename]#spamd.conf# will block large blocks of the Internet.
Administrators need to edit the file to create an optimal configuration which uses applicable data sources and, when necessary, uses custom lists.
====
+
@@ -929,7 +928,7 @@ Refer to the spamd man page for descriptions of additional related parameters.
....
Behind the scenes, the spamdb database tool and the spamlogd whitelist updater perform essential functions for the greylisting feature.
-spamdb is the administrator's main interface to managing the black, grey, and white lists via the contents of the [.filename]#/var/db/spamdb# database.
+spamdb is the administrator's main interface to managing the block, grey, and allow lists via the contents of the [.filename]#/var/db/spamdb# database.
[[pftut-hygiene]]
==== Network Hygiene
@@ -2493,7 +2492,7 @@ All rules that follow the `[local]` section are treated as local rules (which is
When a `[remote]` section is encountered, all rules that follow it are handled as remote machine rules.
Seven fields define a rule separated by either tabs or spaces.
-The first four fields identify the traffic that should be blacklisted.
+The first four fields identify the traffic that should be blocklisted.
The three fields that follow define backlistd's behavior.
Wildcards are denoted as asterisks (`*`), matching anything in this field.
The first field defines the location.
@@ -2529,7 +2528,7 @@ block in
pass out
....
-For separate blacklists, an anchor name can be used in this field.
+For separate blocklists, an anchor name can be used in this field.
In other cases, the wildcard will suffice.
When a name starts with a hyphen (`-`) it means that an anchor with the default rule name prepended should be used.
A modified example from the above using the hyphen would look like this:
@@ -2539,7 +2538,7 @@ A modified example from the above using the hyphen would look like this:
ssh stream * * -ssh 3 24h
....
-With such a rule, any new blacklist rules are added to an anchor called `blacklistd-ssh`.
+With such a rule, any new blocklist rules are added to an anchor called `blacklistd-ssh`.
To block whole subnets for a single rule violation, a `/` in the rule name can be used.
This causes the remaining portion of the name to be interpreted as the mask to be applied to the address specified in the rule.
@@ -2558,11 +2557,11 @@ IPv4 and IPv6 treat /24 differently, that is the reason why `*` cannot be used i
This rule defines that if any one host in that network is misbehaving, everything else on that network will be blocked, too.
-The sixth field, called `nfail`, sets the number of login failures required to blacklist the remote IP in question.
+The sixth field, called `nfail`, sets the number of login failures required to blocklist the remote IP in question.
When a wildcard is used at this position, it means that blocks will never happen.
In the example rule above, a limit of three is defined meaning that after three attempts to log into SSH on one connection, the IP is blocked.
-The last field in a blacklistd rule definition specifies how long a host is blacklisted.
+The last field in a blacklistd rule definition specifies how long a host is blocklisted.
The default unit is seconds, but suffixes like `m`, `h`, and `d` can also be specified for minutes, hours, and days, respectively.
The example rule in its entirety means that after three times authenticating to SSH will result in a new PF block rule for that host.
@@ -2588,7 +2587,7 @@ The fields for type, protocol and owner are identically interpreted as in the lo
The name fields is different though: the equal sign (`=`) in a remote rule tells blacklistd to use the value from the matching local rule.
It means that the firewall rule entry is taken and the `/25` prefix (a netmask of `255.255.255.128`) is added.
-When a connection from that address range is blacklisted, the entire subnet is affected.
+When a connection from that address range is blocklisted, the entire subnet is affected.
A PF anchor name can also be used here, in which case blacklistd will add rules for this address block to the anchor of that name.
The default table is used when a wildcard is specified.
@@ -2623,7 +2622,7 @@ That is all that is needed to make these programs talk to blacklistd.
=== Blacklistd Management
Blacklistd provides the user with a management utility called man:blacklistctl[8].
-It displays blocked addresses and networks that are blacklisted by the rules defined in man:blacklistd.conf[5].
+It displays blocked addresses and networks that are blocklisted by the rules defined in man:blacklistd.conf[5].
To see the list of currently blocked hosts, use `dump` combined with `-b` like this.
[source,shell]
@@ -2638,7 +2637,7 @@ There are more attempts listed than are allowed because SSH allows a client to t
A connection that is currently going on is not stopped by blacklistd.
The last connection attempt is listed in the `last access` column of the output.
-To see the remaining time that this host will be on the blacklist, add `-r` to the previous command.
+To see the remaining time that this host will be on the blocklist, add `-r` to the previous command.
[source,shell]
....
More information about the dev-commits-doc-all
mailing list