Patches inlined:
string9f
trochej@hipster:/code$ diff -u illumos-gate/usr/src/man/man9f/string.9f illumos-gate-6168/usr/src/man/man9f/string.9f
--- illumos-gate/usr/src/man/man9f/string.9f 2015-08-19 15:47:17.058137967 +0200
+++ illumos-gate-6168/usr/src/man/man9f/string.9f 2015-09-08 09:40:33.574573018 +0200
@@ -176,9 +176,10 @@
terminating null character, stopping after the null character has been copied.
The \fBstrncpy()\fR function copies exactly \fIn\fR bytes, truncating \fIs2\fR
or adding null characters to \fIs1\fR if necessary. The result will not be
-null-terminated if the length of \fIs2\fR is \fIn\fR or more. Each function
-returns \fIs1\fR. If copying takes place between objects that overlap, the
-behavior of \fBstrcpy()\fR, \fBstrncpy()\fR, and \fBstrlcpy()\fR is undefined.
+null-terminated if the length of \fIs2\fR is \fIn\fR or more. Both \fBstrcpy()\fR
+and \fBstrncpy()\fR functions return \fIs1\fR. If copying takes place between
+objects that overlap, the behavior of \fBstrcpy()\fR, \fBstrncpy()\fR,
+and \fBstrlcpy()\fR is undefined.
.sp
.LP
The \fBstrlcpy()\fR function copies at most \fIdstsize\fR\(mi1 characters
string3c
trochej@hipster:/code$ diff -u illumos-gate/usr/src/man/man3c/string.3c illumos-gate-6168/usr/src/man/man3c/string.3c
--- illumos-gate/usr/src/man/man3c/string.3c 2015-08-19 15:47:16.665050894 +0200
+++ illumos-gate-6168/usr/src/man/man3c/string.3c 2015-09-08 09:39:48.058169427 +0200
@@ -285,9 +285,10 @@
terminating null character, stopping after the null character has been copied.
The \fBstrncpy()\fR function copies exactly \fIn\fR bytes, truncating \fIs2\fR
or adding null characters to \fIs1\fR if necessary. The result will not be
-null-terminated if the length of \fIs2\fR is \fIn\fR or more. Each function
-returns \fIs1\fR. If copying takes place between objects that overlap, the
-behavior of \fBstrcpy()\fR, \fBstrncpy()\fR, and \fBstrlcpy()\fR is undefined.
+null-terminated if the length of \fIs2\fR is \fIn\fR or more. Both \fBstrcpy()\fR
+and \fBstrncpy()\fR functions return \fIs1\fR. If copying takes place between
+objects that overlap, the behavior of \fBstrcpy()\fR, \fBstrncpy()\fR,
+and \fBstrlcpy()\fR is undefined.
.LP
The \fBstrlcpy()\fR function copies at most \fIdstsize\fR\(mi1 characters
(\fIdstsize\fR being the size of the string buffer \fIdst\fR) from \fIsrc\fR