1 files changed, 6 insertions, 14 deletions
diff --git a/src/lib/libc/string/strstr.3 b/src/lib/libc/string/strstr.3
index 24fdf540ed..47777dd89f 100644
--- a/src/lib/libc/string/strstr.3
+++ b/src/lib/libc/string/strstr.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,8 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)strstr.3      5.3 (Berkeley) 6/29/91
+.\"     $OpenBSD: strstr.3,v 1.6 2003/06/02 20:18:38 millert Exp $
-.\"     $Id: strstr.3,v 1.1.1.1 1995/10/18 08:42:23 deraadt Exp $
 .\"
 .Dd June 29, 1991
 .Dt STRSTR 3
@@ -49,8 +44,7 @@
 .Sh DESCRIPTION
 The
 .Fn strstr
-function
+function locates the first occurrence of the null-terminated string
-locates the first occurrence of the null-terminated string
 .Fa little
 in the null-terminated string
 .Fa big .
@@ -65,15 +59,14 @@ if
 occurs nowhere in
 .Fa big ,
 .Fn strstr
-returns NULL;
+returns
+.Dv NULL ;
 otherwise
 .Fn strstr
 returns a pointer to the first character of the first occurrence of
 .Fa little .
 .Sh SEE ALSO
-.Xr index 3 ,
 .Xr memchr 3 ,
-.Xr rindex 3 ,
 .Xr strchr 3 ,
 .Xr strcspn 3 ,
 .Xr strpbrk 3 ,
@@ -84,6 +77,5 @@ returns a pointer to the first character of the first occurrence of
 .Sh STANDARDS
 The
 .Fn strstr
-function
+function conforms to
-conforms to
 .St -ansiC .

diff --git a/src/lib/libc/string/strstr.3 b/src/lib/libc/string/strstr.3 index 24fdf540ed..47777dd89f 100644 --- a/src/lib/libc/string/strstr.3 +++ b/src/lib/libc/string/strstr.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,8 +29,7 @@
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: @(#)strstr.3 5.3 (Berkeley) 6/29/91	32	.\" $OpenBSD: strstr.3,v 1.6 2003/06/02 20:18:38 millert Exp $
37	.\" $Id: strstr.3,v 1.1.1.1 1995/10/18 08:42:23 deraadt Exp $
38	.\"	33	.\"
39	.Dd June 29, 1991	34	.Dd June 29, 1991
40	.Dt STRSTR 3	35	.Dt STRSTR 3
@@ -49,8 +44,7 @@
49	.Sh DESCRIPTION	44	.Sh DESCRIPTION
50	The	45	The
51	.Fn strstr	46	.Fn strstr
52	function	47	function locates the first occurrence of the null-terminated string
53	locates the first occurrence of the null-terminated string
54	.Fa little	48	.Fa little
55	in the null-terminated string	49	in the null-terminated string
56	.Fa big .	50	.Fa big .
@@ -65,15 +59,14 @@ if
65	occurs nowhere in	59	occurs nowhere in
66	.Fa big ,	60	.Fa big ,
67	.Fn strstr	61	.Fn strstr
68	returns NULL;	62	returns
		63	.Dv NULL ;
69	otherwise	64	otherwise
70	.Fn strstr	65	.Fn strstr
71	returns a pointer to the first character of the first occurrence of	66	returns a pointer to the first character of the first occurrence of
72	.Fa little .	67	.Fa little .
73	.Sh SEE ALSO	68	.Sh SEE ALSO
74	.Xr index 3 ,
75	.Xr memchr 3 ,	69	.Xr memchr 3 ,
76	.Xr rindex 3 ,
77	.Xr strchr 3 ,	70	.Xr strchr 3 ,
78	.Xr strcspn 3 ,	71	.Xr strcspn 3 ,
79	.Xr strpbrk 3 ,	72	.Xr strpbrk 3 ,
@@ -84,6 +77,5 @@ returns a pointer to the first character of the first occurrence of
84	.Sh STANDARDS	77	.Sh STANDARDS
85	The	78	The
86	.Fn strstr	79	.Fn strstr
87	function	80	function conforms to
88	conforms to
89	.St -ansiC .	81	.St -ansiC .