1 files changed, 11 insertions, 17 deletions
diff --git a/src/lib/libc/string/memmove.3 b/src/lib/libc/string/memmove.3
index 24422e7971..c6e3912669 100644
--- a/src/lib/libc/string/memmove.3
+++ b/src/lib/libc/string/memmove.3
@@ -13,11 +13,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"
@@ -33,15 +29,14 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)memmove.3     5.5 (Berkeley) 6/29/91
+.\"     $OpenBSD: memmove.3,v 1.7 2007/05/31 19:19:32 jmc Exp $
-.\"     $Id: memmove.3,v 1.1.1.1 1995/10/18 08:42:21 deraadt Exp $
 .\"
-.Dd June 29, 1991
+.Dd $Mdocdate: May 31 2007 $
 .Dt MEMMOVE 3
 .Os
 .Sh NAME
 .Nm memmove
-.Nd copy byte string
+.Nd copy bytes
 .Sh SYNOPSIS
 .Fd #include <string.h>
 .Ft void *
@@ -49,14 +44,13 @@
 .Sh DESCRIPTION
 The
 .Fn memmove
-function
+function copies
-copies
 .Fa len
-bytes from string
+bytes from buffer
 .Fa src
-to string
+to buffer
 .Fa dst .
-The two strings may overlap;
+The two buffers may overlap;
 the copy is always done in a non-destructive manner.
 .Sh RETURN VALUES
 The
@@ -67,10 +61,10 @@ function returns the original value of
 .Xr bcopy 3 ,
 .Xr memccpy 3 ,
 .Xr memcpy 3 ,
-.Xr strcpy 3
+.Xr strcpy 3 ,
+.Xr strlcpy 3
 .Sh STANDARDS
 The
 .Fn memmove
-function
+function conforms to
-conforms to
 .St -ansiC .

diff --git a/src/lib/libc/string/memmove.3 b/src/lib/libc/string/memmove.3 index 24422e7971..c6e3912669 100644 --- a/src/lib/libc/string/memmove.3 +++ b/src/lib/libc/string/memmove.3
@@ -13,11 +13,7 @@
13	.\" 2. Redistributions in binary form must reproduce the above copyright	13	.\" 2. Redistributions in binary form must reproduce the above copyright
14	.\" notice, this list of conditions and the following disclaimer in the	14	.\" notice, this list of conditions and the following disclaimer in the
15	.\" documentation and/or other materials provided with the distribution.	15	.\" documentation and/or other materials provided with the distribution.
16	.\" 3. All advertising materials mentioning features or use of this software	16	.\" 3. Neither the name of the University nor the names of its contributors
17	.\" must display the following acknowledgement:
18	.\" This product includes software developed by the University of
19	.\" California, Berkeley and its contributors.
20	.\" 4. Neither the name of the University nor the names of its contributors
21	.\" may be used to endorse or promote products derived from this software	17	.\" may be used to endorse or promote products derived from this software
22	.\" without specific prior written permission.	18	.\" without specific prior written permission.
23	.\"	19	.\"
@@ -33,15 +29,14 @@
33	.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF	29	.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
34	.\" SUCH DAMAGE.	30	.\" SUCH DAMAGE.
35	.\"	31	.\"
36	.\" from: @(#)memmove.3 5.5 (Berkeley) 6/29/91	32	.\" $OpenBSD: memmove.3,v 1.7 2007/05/31 19:19:32 jmc Exp $
37	.\" $Id: memmove.3,v 1.1.1.1 1995/10/18 08:42:21 deraadt Exp $
38	.\"	33	.\"
39	.Dd June 29, 1991	34	.Dd $Mdocdate: May 31 2007 $
40	.Dt MEMMOVE 3	35	.Dt MEMMOVE 3
41	.Os	36	.Os
42	.Sh NAME	37	.Sh NAME
43	.Nm memmove	38	.Nm memmove
44	.Nd copy byte string	39	.Nd copy bytes
45	.Sh SYNOPSIS	40	.Sh SYNOPSIS
46	.Fd #include <string.h>	41	.Fd #include <string.h>
47	.Ft void *	42	.Ft void *
@@ -49,14 +44,13 @@
49	.Sh DESCRIPTION	44	.Sh DESCRIPTION
50	The	45	The
51	.Fn memmove	46	.Fn memmove
52	function	47	function copies
53	copies
54	.Fa len	48	.Fa len
55	bytes from string	49	bytes from buffer
56	.Fa src	50	.Fa src
57	to string	51	to buffer
58	.Fa dst .	52	.Fa dst .
59	The two strings may overlap;	53	The two buffers may overlap;
60	the copy is always done in a non-destructive manner.	54	the copy is always done in a non-destructive manner.
61	.Sh RETURN VALUES	55	.Sh RETURN VALUES
62	The	56	The
@@ -67,10 +61,10 @@ function returns the original value of
67	.Xr bcopy 3 ,	61	.Xr bcopy 3 ,
68	.Xr memccpy 3 ,	62	.Xr memccpy 3 ,
69	.Xr memcpy 3 ,	63	.Xr memcpy 3 ,
70	.Xr strcpy 3	64	.Xr strcpy 3 ,
		65	.Xr strlcpy 3
71	.Sh STANDARDS	66	.Sh STANDARDS
72	The	67	The
73	.Fn memmove	68	.Fn memmove
74	function	69	function conforms to
75	conforms to
76	.St -ansiC .	70	.St -ansiC .