[illumos-gate merge]release-20170608

commit 79809f9cf402f130667349b2d4007ecd65d63c6f
    8269 dtrace stddev aggregation is normalized incorrectly
commit 22c8b9583d07895c16549075a53668d7bc988cf3
    8108 zdb -l fails to read labels 2 and 3
commit 0255edcc85fc0cd1dda0e49bcd52eb66c06a1b16
    8056 zfs send size estimate is inaccurate for some zvols
commit dbfd9f930004c390a2ce2cf850c71b4f880eef9c
    8156 dbuf_evict_notify() does not need dbuf_evict_lock
commit 690031d326342fa4ea28b5e80f1ad6a16281519d
    8168 NULL pointer dereference in zfs_create()
commit 7c4ab494ff60bbbcc0889e71388ae63e903bbf57
    8276 rpcbind leaks memory due to libumem per thread caching.
commit f176a0a4cd61cbd708a7f25dc30d221f4d5902ba
    8270 dnlc_reverse_lookup() is unsafe at any speed
commit 72d3dbb9ab4481606cb93caca98ba3b3a8eb6ce2
    8300 fix man page issues found by mandoc 1.14.1
commit cb4d790db8fe85bce9f9647fe4e1bdc274c7af1c
    8337 gss: misleading-indentation
commit f53522305c07915a44e86f2455cc62e7aac27037
    8324 more: misleading-indentation

	Conflicts:
	usr/src/uts/common/fs/lookup.c
	usr/src/man/man3c/thrd_equal.3c

1 files changed, 9 insertions, 8 deletions

diff --git a/usr/src/man/man3c/thrd_create.3c b/usr/src/man/man3c/thrd_create.3c
index ffaf9bf11c..fd31e740b7 100644
--- a/usr/src/man/man3c/thrd_create.3c
+++ b/usr/src/man/man3c/thrd_create.3c
@@ -39,11 +39,11 @@ When a thread is created, it begins its execution at the function
 with the argument
 .Fa arg .
 A created thread has access to all global data within a process;
-however, it has its own private stack. Currently 32-bit processes have a
-default stack of 1 megabyte, while 64-bit systems have a default stack
-size of 2 megabytes. In addition, newly created threads inherit the
-signal mask of the thread which created them; however, they do not
-inherit any pending signals.
+however, it has its own private stack.
+Currently 32-bit processes have a default stack of 1 megabyte, while 64-bit
+systems have a default stack size of 2 megabytes.
+In addition, newly created threads inherit the signal mask of the thread which
+created them; however, they do not inherit any pending signals.
 .Pp
 Once created, a thread will continue to execute until either, it returns
 from its initial function, the thread explicitly calls
@@ -51,9 +51,9 @@ from its initial function, the thread explicitly calls
 or the process itself terminates, such as with a call to
 .Xr exit 2 .
 When the initial function returns, it behaves as though a call to
-.Xr thrd_exit
+.Xr thrd_exit 3C
 was made, and, if the thread has not been detached with a call to
-.Xr thrd_detach,
+.Xr thrd_detach 3C ,
 the exit status remains available and the corresponding thread ID will
 not be reused until a process calls
 .Xr thrd_join 3C .
@@ -74,7 +74,8 @@ function returns
 .Sy thrd_success .
 If insufficient memory was available, then
 .Sy thrd_nomem
-is returned. Otherwise,
+is returned.
+Otherwise,
 .Sy thrd_error
 is returned, indicating that a non-memory related error.
 .Sh INTERFACE STABILITY