userland: Fix several typos and minor errors
- duplicate words - typos - references to old versions of FreeBSD Reviewed by: imp, benno
This commit is contained in:
parent
5e717fc60d
commit
56640efcbe
@ -485,7 +485,7 @@ wr_rdbuf(char *out, int outcnt)
|
|||||||
int cnt;
|
int cnt;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* while there is data to copy copy into the write buffer. when the
|
* while there is data to copy into the write buffer. when the
|
||||||
* write buffer fills, flush it to the archive and continue
|
* write buffer fills, flush it to the archive and continue
|
||||||
*/
|
*/
|
||||||
while (outcnt > 0) {
|
while (outcnt > 0) {
|
||||||
|
@ -39,39 +39,39 @@ notify 11 {
|
|||||||
#
|
#
|
||||||
# How network VF works with hn(4) on Hyper-V in non-transparent mode:
|
# How network VF works with hn(4) on Hyper-V in non-transparent mode:
|
||||||
#
|
#
|
||||||
# - Each network VF has a cooresponding hn(4).
|
# - Each network VF has a corresponding hn(4).
|
||||||
# - The network VF and the it's cooresponding hn(4) have the same hardware
|
# - The network VF and the it's corresponding hn(4) have the same hardware
|
||||||
# address.
|
# address.
|
||||||
# - Once the network VF is up, e.g. ifconfig VF up:
|
# - Once the network VF is up, e.g. ifconfig VF up:
|
||||||
# o All of the transmission should go through the network VF.
|
# o All of the transmission should go through the network VF.
|
||||||
# o Most of the reception goes through the network VF.
|
# o Most of the reception goes through the network VF.
|
||||||
# o Small amount of reception may go through the cooresponding hn(4).
|
# o Small amount of reception may go through the corresponding hn(4).
|
||||||
# This reception will happen, even if the the cooresponding hn(4) is
|
# This reception will happen, even if the corresponding hn(4) is
|
||||||
# down. The cooresponding hn(4) will change the reception interface
|
# down. The corresponding hn(4) will change the reception interface
|
||||||
# to the network VF, so that network layer and application layer will
|
# to the network VF, so that network layer and application layer will
|
||||||
# be tricked into thinking that these packets were received by the
|
# be tricked into thinking that these packets were received by the
|
||||||
# network VF.
|
# network VF.
|
||||||
# o The cooresponding hn(4) pretends the physical link is down.
|
# o The corresponding hn(4) pretends the physical link is down.
|
||||||
# - Once the network VF is down or detached:
|
# - Once the network VF is down or detached:
|
||||||
# o All of the transmission should go through the cooresponding hn(4).
|
# o All of the transmission should go through the corresponding hn(4).
|
||||||
# o All of the reception goes through the cooresponding hn(4).
|
# o All of the reception goes through the corresponding hn(4).
|
||||||
# o The cooresponding hn(4) fallbacks to the original physical link
|
# o The corresponding hn(4) fallbacks to the original physical link
|
||||||
# detection logic.
|
# detection logic.
|
||||||
#
|
#
|
||||||
# All these features are mainly used to help live migration, during which
|
# All these features are mainly used to help live migration, during which
|
||||||
# the network VF will be detached, while the network communication to the
|
# the network VF will be detached, while the network communication to the
|
||||||
# VM must not be cut off. In order to reach this level of live migration
|
# VM must not be cut off. In order to reach this level of live migration
|
||||||
# transparency, we use failover mode lagg(4) with the network VF and the
|
# transparency, we use failover mode lagg(4) with the network VF and the
|
||||||
# cooresponding hn(4) attached to it.
|
# corresponding hn(4) attached to it.
|
||||||
#
|
#
|
||||||
# To ease user configuration for both network VF and non-network VF, the
|
# To ease user configuration for both network VF and non-network VF, the
|
||||||
# lagg(4) will be created by the following rules, and the configuration
|
# lagg(4) will be created by the following rules, and the configuration
|
||||||
# of the cooresponding hn(4) will be applied to the lagg(4) automatically.
|
# of the corresponding hn(4) will be applied to the lagg(4) automatically.
|
||||||
#
|
#
|
||||||
# NOTE:
|
# NOTE:
|
||||||
# If live migration is not needed at all, the following rules could be
|
# If live migration is not needed at all, the following rules could be
|
||||||
# commented out, and the network VF interface could be used exclusively.
|
# commented out, and the network VF interface could be used exclusively.
|
||||||
# Most often the cooresponding hn(4) could be completely ignored.
|
# Most often the corresponding hn(4) could be completely ignored.
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
# Default workflow for the network VF bringup:
|
# Default workflow for the network VF bringup:
|
||||||
|
@ -30,7 +30,6 @@ KEYPRINT=9b5feee6d69f170e3dd0a2c8e469ddbd64f13f978f2f3aede40c98633216c330
|
|||||||
# REFUSE korean polish portuguese russian ukrainian vietnamese
|
# REFUSE korean polish portuguese russian ukrainian vietnamese
|
||||||
|
|
||||||
# List of INDEX files to build and the DESCRIBE file to use for each
|
# List of INDEX files to build and the DESCRIBE file to use for each
|
||||||
#INDEX INDEX-9 DESCRIBE.9
|
|
||||||
#INDEX INDEX-10 DESCRIBE.10
|
#INDEX INDEX-10 DESCRIBE.10
|
||||||
#INDEX INDEX-11 DESCRIBE.11
|
#INDEX INDEX-11 DESCRIBE.11
|
||||||
INDEX INDEX-12 DESCRIBE.12
|
INDEX INDEX-12 DESCRIBE.12
|
||||||
|
@ -67,7 +67,7 @@
|
|||||||
# /conf/T/M/remount
|
# /conf/T/M/remount
|
||||||
# The contents of the file is a mount command. E.g. if
|
# The contents of the file is a mount command. E.g. if
|
||||||
# /conf/1.2.3.4/foo/remount contains "mount -o ro /dev/ad0s3",
|
# /conf/1.2.3.4/foo/remount contains "mount -o ro /dev/ad0s3",
|
||||||
# then /dev/ad0s3 will be be mounted on /conf/1.2.3.4/foo/
|
# then /dev/ad0s3 will be mounted on /conf/1.2.3.4/foo/
|
||||||
#
|
#
|
||||||
# /conf/T/M/remount_optional
|
# /conf/T/M/remount_optional
|
||||||
# If this file exists, then failure to execute the mount
|
# If this file exists, then failure to execute the mount
|
||||||
|
@ -1542,7 +1542,7 @@ debug()
|
|||||||
# is created.
|
# is created.
|
||||||
#
|
#
|
||||||
# update `file' has changed and needs to be backed up.
|
# update `file' has changed and needs to be backed up.
|
||||||
# If `cur' exists, it is copied to to `back'
|
# If `cur' exists, it is copied to `back'
|
||||||
# and then `file' is copied to `cur'.
|
# and then `file' is copied to `cur'.
|
||||||
#
|
#
|
||||||
# remove `file' is no longer being tracked by the backups
|
# remove `file' is no longer being tracked by the backups
|
||||||
|
@ -224,7 +224,7 @@ add_ctype_range(wchar_t end)
|
|||||||
* A word about widths: if the width mask is specified, then libc
|
* A word about widths: if the width mask is specified, then libc
|
||||||
* unconditionally honors it. Otherwise, it assumes printable
|
* unconditionally honors it. Otherwise, it assumes printable
|
||||||
* characters have width 1, and non-printable characters have width
|
* characters have width 1, and non-printable characters have width
|
||||||
* -1 (except for NULL which is special with with 0). Hence, we have
|
* -1 (except for NULL which is special with width 0). Hence, we have
|
||||||
* no need to inject defaults here -- the "default" unset value of 0
|
* no need to inject defaults here -- the "default" unset value of 0
|
||||||
* indicates that libc should use its own logic in wcwidth as described.
|
* indicates that libc should use its own logic in wcwidth as described.
|
||||||
*/
|
*/
|
||||||
|
@ -261,7 +261,7 @@ dorespond(int *msgvec)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Modify the subject we are replying to to begin with Re: if
|
* Modify the message subject to begin with "Re:" if
|
||||||
* it does not already.
|
* it does not already.
|
||||||
*/
|
*/
|
||||||
char *
|
char *
|
||||||
|
@ -37,7 +37,7 @@ strnsubst(char **str, const char *match, const char *replstr, size_t maxsize)
|
|||||||
if (s1 == NULL)
|
if (s1 == NULL)
|
||||||
return;
|
return;
|
||||||
/*
|
/*
|
||||||
* If maxsize is 0 then set it to to the length of s1, because we have
|
* If maxsize is 0 then set it to the length of s1, because we have
|
||||||
* to duplicate s1. XXX we maybe should double-check whether the match
|
* to duplicate s1. XXX we maybe should double-check whether the match
|
||||||
* appears in s1. If it doesn't, then we also have to set the length
|
* appears in s1. If it doesn't, then we also have to set the length
|
||||||
* to the length of s1, to avoid modifying the argument. It may make
|
* to the length of s1, to avoid modifying the argument. It may make
|
||||||
|
@ -748,7 +748,7 @@ login_negotiate(struct connection *conn, struct pdu *request)
|
|||||||
/*
|
/*
|
||||||
* RFC 3720, 10.13.5. Status-Class and Status-Detail, says
|
* RFC 3720, 10.13.5. Status-Class and Status-Detail, says
|
||||||
* the redirection SHOULD be accepted by the initiator before
|
* the redirection SHOULD be accepted by the initiator before
|
||||||
* authentication, but MUST be be accepted afterwards; that's
|
* authentication, but MUST be accepted afterwards; that's
|
||||||
* why we're doing it here and not earlier.
|
* why we're doing it here and not earlier.
|
||||||
*/
|
*/
|
||||||
redirected = login_target_redirect(conn, request);
|
redirected = login_target_redirect(conn, request);
|
||||||
|
@ -2121,7 +2121,7 @@ cd9660_add_generic_bootimage(iso9660_disk *diskStructure, const char *bootimage)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (diskStructure->verbose_level > 0) {
|
if (diskStructure->verbose_level > 0) {
|
||||||
printf("Generic boot image image has size %lld\n",
|
printf("Generic boot image has size %lld\n",
|
||||||
(long long)stbuf.st_size);
|
(long long)stbuf.st_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -761,10 +761,10 @@ main(int argc, char **argv)
|
|||||||
|
|
||||||
setproctitle("master");
|
setproctitle("master");
|
||||||
/*
|
/*
|
||||||
* We always want a master to have a clean way to to shut nfsd down
|
* We always want a master to have a clean way to shut nfsd down
|
||||||
* (with unregistration): if the master is killed, it unregisters and
|
* (with unregistration): if the master is killed, it unregisters and
|
||||||
* kills all children. If we run for UDP only (and so do not have to
|
* kills all children. If we run for UDP only (and so do not have to
|
||||||
* loop waiting waiting for accept), we instead make the parent
|
* loop waiting for accept), we instead make the parent
|
||||||
* a "server" too. start_server will not return.
|
* a "server" too. start_server will not return.
|
||||||
*/
|
*/
|
||||||
if (!tcpflag)
|
if (!tcpflag)
|
||||||
|
@ -883,7 +883,7 @@ test_nfslock(const struct file_lock *fl, struct file_lock **conflicting_fl)
|
|||||||
* While this seems to be intuitively wrong, it is required for proper
|
* While this seems to be intuitively wrong, it is required for proper
|
||||||
* Posix semantics during unlock. It is absolutely imperative to not
|
* Posix semantics during unlock. It is absolutely imperative to not
|
||||||
* unlock the main lock before the two child locks are established. Thus,
|
* unlock the main lock before the two child locks are established. Thus,
|
||||||
* one has be be able to create duplicate locks over an existing lock
|
* one has to be able to create duplicate locks over an existing lock
|
||||||
* 2) It currently accepts duplicate locks from the same id,pid
|
* 2) It currently accepts duplicate locks from the same id,pid
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user