summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McDonald <danmcd@joyent.com>2022-03-02 19:09:00 -0500
committerDan McDonald <danmcd@joyent.com>2022-03-02 19:09:00 -0500
commitf8af5357f5f9557f19ab9d1a49c876314d204933 (patch)
tree8def18499216224a06982a3630210428347766dd
parent5bf057ab83d7ae324a3a533488eac62ad732860c (diff)
parentbaa22ad418cce79952b33085344de5a3d4cc3193 (diff)
downloadillumos-joyent-f8af5357f5f9557f19ab9d1a49c876314d204933.tar.gz
Merge commit 'refs/changes/11/2011/13' of https://code.illumos.org/illumos-gate into ipd4
-rw-r--r--usr/src/man/man1/diff.112
-rw-r--r--usr/src/man/man5/bhyve_config.52
-rw-r--r--usr/src/man/man7/resource_controls.74
3 files changed, 9 insertions, 9 deletions
diff --git a/usr/src/man/man1/diff.1 b/usr/src/man/man1/diff.1
index 678c378891..11be316331 100644
--- a/usr/src/man/man1/diff.1
+++ b/usr/src/man/man1/diff.1
@@ -369,7 +369,7 @@ directory file with a filename that is the same as the last component of the
non-directory file.
.Sh USAGE
See
-.Xr largefile 5
+.Xr largefile 7
for the description of the behavior of
.Nm
when encountering files greater than or equal to 2 Gbyte
@@ -424,7 +424,7 @@ diff -r dir1/x/date.out dir2/x/date.out
.Ed
.Sh ENVIRONMENT VARIABLES
See
-.Xr environ 5
+.Xr environ 7
for descriptions of the following environment variables that affect the
execution of
.Nm :
@@ -461,10 +461,10 @@ is
.Xr ed 1 ,
.Xr pr 1 ,
.Xr sdiff 1 ,
-.Xr attributes 5 ,
-.Xr environ 5 ,
-.Xr largefile 5 ,
-.Xr standards 5
+.Xr attributes 7 ,
+.Xr environ 7 ,
+.Xr largefile 7 ,
+.Xr standards 7
.Sh NOTES
Editing scripts produced under the
.Fl e
diff --git a/usr/src/man/man5/bhyve_config.5 b/usr/src/man/man5/bhyve_config.5
index 8f5a2f7892..5e9caa9857 100644
--- a/usr/src/man/man5/bhyve_config.5
+++ b/usr/src/man/man5/bhyve_config.5
@@ -25,7 +25,7 @@
.\"
.\" Portions Copyright 2022 OmniOS Community Edition (OmniOSce) Association.
.\"
-.Dd September 25, 2021
+.Dd February 26, 2022
.Dt BHYVE_CONFIG 5
.Os
.Sh NAME
diff --git a/usr/src/man/man7/resource_controls.7 b/usr/src/man/man7/resource_controls.7
index 274964fd05..34392538bc 100644
--- a/usr/src/man/man7/resource_controls.7
+++ b/usr/src/man/man7/resource_controls.7
@@ -1100,10 +1100,10 @@ Interface Stability Evolving
.BR FSS (4),
.BR project (5),
.BR attributes (7),
-.BR pooladm (8),
-.BR poolcfg (8),
.BR privileges (7),
.BR zones (7),
+.BR pooladm (8),
+.BR poolcfg (8),
.BR projadd (8),
.BR projmod (8),
.BR rctladm (8)