1 files changed, 18 insertions, 18 deletions
diff --git a/src/lib/libc/string/strpbrk.3 b/src/lib/libc/string/strpbrk.3
index 8578546c05..9e13c42ad0 100644
--- a/src/lib/libc/string/strpbrk.3
+++ b/src/lib/libc/string/strpbrk.3
@@ -1,3 +1,5 @@
+.\"     $OpenBSD: strpbrk.3,v 1.9 2011/07/25 00:38:53 schwarze Exp $
+.\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -13,11 +15,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,10 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)strpbrk.3     5.4 (Berkeley) 6/29/91
+.Dd $Mdocdate: July 25 2011 $
-.\"     $Id: strpbrk.3,v 1.1.1.1 1995/10/18 08:42:23 deraadt Exp $
-.\"
-.Dd June 29, 1991
 .Dt STRPBRK 3
 .Os
 .Sh NAME
@@ -49,8 +44,7 @@
 .Sh DESCRIPTION
 The
 .Fn strpbrk
-function
+function locates in the NUL-terminated string
-locates in the null-terminated string
 .Fa s
 the first occurrence of any character in the string
 .Fa charset
@@ -58,23 +52,29 @@ and returns a pointer to this character.
 If no characters from
 .Fa charset
 occur anywhere in
-.Fa s
+.Fa s ,
 .Fn strpbrk
-returns NULL.
+returns
+.Dv NULL .
 .Sh SEE ALSO
-.Xr index 3 ,
 .Xr memchr 3 ,
-.Xr rindex 3 ,
 .Xr strchr 3 ,
 .Xr strcspn 3 ,
 .Xr strrchr 3 ,
 .Xr strsep 3 ,
 .Xr strspn 3 ,
 .Xr strstr 3 ,
-.Xr strtok 3
+.Xr strtok 3 ,
+.Xr wcspbrk 3
 .Sh STANDARDS
 The
 .Fn strpbrk
-function
+function conforms to
-conforms to
 .St -ansiC .
+.Sh HISTORY
+The
+.Fn strpbrk
+function first appeared in
+.At III
+and was reimplemented for
+.Bx 4.3 Tahoe .

diff --git a/src/lib/libc/string/strpbrk.3 b/src/lib/libc/string/strpbrk.3 index 8578546c05..9e13c42ad0 100644 --- a/src/lib/libc/string/strpbrk.3 +++ b/src/lib/libc/string/strpbrk.3
@@ -1,3 +1,5 @@
		1	.\" $OpenBSD: strpbrk.3,v 1.9 2011/07/25 00:38:53 schwarze Exp $
		2	.\"
1	.\" Copyright (c) 1990, 1991 The Regents of the University of California.	3	.\" Copyright (c) 1990, 1991 The Regents of the University of California.
2	.\" All rights reserved.	4	.\" All rights reserved.
3	.\"	5	.\"
@@ -13,11 +15,7 @@
13	.\" 2. Redistributions in binary form must reproduce the above copyright	15	.\" 2. Redistributions in binary form must reproduce the above copyright
14	.\" notice, this list of conditions and the following disclaimer in the	16	.\" notice, this list of conditions and the following disclaimer in the
15	.\" documentation and/or other materials provided with the distribution.	17	.\" documentation and/or other materials provided with the distribution.
16	.\" 3. All advertising materials mentioning features or use of this software	18	.\" 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	19	.\" may be used to endorse or promote products derived from this software
22	.\" without specific prior written permission.	20	.\" without specific prior written permission.
23	.\"	21	.\"
@@ -33,10 +31,7 @@
33	.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF	31	.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
34	.\" SUCH DAMAGE.	32	.\" SUCH DAMAGE.
35	.\"	33	.\"
36	.\" from: @(#)strpbrk.3 5.4 (Berkeley) 6/29/91	34	.Dd $Mdocdate: July 25 2011 $
37	.\" $Id: strpbrk.3,v 1.1.1.1 1995/10/18 08:42:23 deraadt Exp $
38	.\"
39	.Dd June 29, 1991
40	.Dt STRPBRK 3	35	.Dt STRPBRK 3
41	.Os	36	.Os
42	.Sh NAME	37	.Sh NAME
@@ -49,8 +44,7 @@
49	.Sh DESCRIPTION	44	.Sh DESCRIPTION
50	The	45	The
51	.Fn strpbrk	46	.Fn strpbrk
52	function	47	function locates in the NUL-terminated string
53	locates in the null-terminated string
54	.Fa s	48	.Fa s
55	the first occurrence of any character in the string	49	the first occurrence of any character in the string
56	.Fa charset	50	.Fa charset
@@ -58,23 +52,29 @@ and returns a pointer to this character.
58	If no characters from	52	If no characters from
59	.Fa charset	53	.Fa charset
60	occur anywhere in	54	occur anywhere in
61	.Fa s	55	.Fa s ,
62	.Fn strpbrk	56	.Fn strpbrk
63	returns NULL.	57	returns
		58	.Dv NULL .
64	.Sh SEE ALSO	59	.Sh SEE ALSO
65	.Xr index 3 ,
66	.Xr memchr 3 ,	60	.Xr memchr 3 ,
67	.Xr rindex 3 ,
68	.Xr strchr 3 ,	61	.Xr strchr 3 ,
69	.Xr strcspn 3 ,	62	.Xr strcspn 3 ,
70	.Xr strrchr 3 ,	63	.Xr strrchr 3 ,
71	.Xr strsep 3 ,	64	.Xr strsep 3 ,
72	.Xr strspn 3 ,	65	.Xr strspn 3 ,
73	.Xr strstr 3 ,	66	.Xr strstr 3 ,
74	.Xr strtok 3	67	.Xr strtok 3 ,
		68	.Xr wcspbrk 3
75	.Sh STANDARDS	69	.Sh STANDARDS
76	The	70	The
77	.Fn strpbrk	71	.Fn strpbrk
78	function	72	function conforms to
79	conforms to
80	.St -ansiC .	73	.St -ansiC .
		74	.Sh HISTORY
		75	The
		76	.Fn strpbrk
		77	function first appeared in
		78	.At III
		79	and was reimplemented for
		80	.Bx 4.3 Tahoe .