summaryrefslogtreecommitdiffstats
path: root/share/man
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-04-11 14:24:19 -0300
committerRenato Botelho <renato@netgate.com>2016-04-11 14:24:19 -0300
commit1179a0fb444b0c4221644c27445b51619e5e6584 (patch)
tree34609b465d64ad6e0ad1fe61081c9593f7567178 /share/man
parent35c5ac13568041a87ad1608c84da3ef363431f80 (diff)
parentc7d52025209c6c0c1673d61a541812bd623ad64f (diff)
downloadFreeBSD-src-1179a0fb444b0c4221644c27445b51619e5e6584.zip
FreeBSD-src-1179a0fb444b0c4221644c27445b51619e5e6584.tar.gz
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'share/man')
-rw-r--r--share/man/man4/iscsi_initiator.42
-rw-r--r--share/man/man9/kqueue.92
2 files changed, 2 insertions, 2 deletions
diff --git a/share/man/man4/iscsi_initiator.4 b/share/man/man4/iscsi_initiator.4
index a391e08..3e38bcd 100644
--- a/share/man/man4/iscsi_initiator.4
+++ b/share/man/man4/iscsi_initiator.4
@@ -57,7 +57,7 @@ instead.
The
.Nm
implements the kernel side of the Internet SCSI (iSCSI) network
-protocol standard, the user land companion is
+protocol standard, the userland companion is
.Xr iscontrol 8 ,
and permits access to remote
.Em virtual
diff --git a/share/man/man9/kqueue.9 b/share/man/man9/kqueue.9
index 29ae5f7..0e9b043 100644
--- a/share/man/man9/kqueue.9
+++ b/share/man/man9/kqueue.9
@@ -372,7 +372,7 @@ The function
will not be called, and the
.Vt knote
will not be returned on the next scan.
-Using this function could leak user land resources if a process uses the
+Using this function could leak userland resources if a process uses the
.Vt knote
to track resources.
.Pp
OpenPOWER on IntegriCloud