--- Libc/Libc-1725.40.4/string/FreeBSD/string.3
+++ Libc/Libc-594.9.1/string/FreeBSD/string.3
@@ -11,6 +11,10 @@
 .\" 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
+.\"    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.
@@ -28,149 +32,83 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)string.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: src/lib/libc/string/string.3,v 1.14 2007/01/09 00:28:12 imp Exp $
+.\" $FreeBSD: src/lib/libc/string/string.3,v 1.13 2002/10/19 13:41:22 tjr Exp $
 .\"
 .Dd December 11, 1993
 .Dt STRING 3
 .Os
 .Sh NAME
-.Nm index ,
-.Nm rindex ,
 .Nm stpcpy ,
+.Nm strcat ,
+.Nm strncat ,
+.Nm strchr ,
+.Nm strrchr ,
+.Nm strcmp ,
+.Nm strncmp ,
 .Nm strcasecmp ,
-.Nm strcat ,
-.Nm strchr ,
-.Nm strcmp ,
+.Nm strncasecmp ,
 .Nm strcpy ,
-.Nm strcspn ,
+.Nm strncpy ,
 .Nm strerror ,
 .Nm strlen ,
-.Nm strncasecmp ,
-.Nm strncat ,
-.Nm strncmp ,
-.Nm strncpy ,
 .Nm strpbrk ,
-.Nm strrchr ,
 .Nm strsep ,
 .Nm strspn ,
+.Nm strcspn ,
 .Nm strstr ,
-.Nm strtok
+.Nm strtok ,
+.Nm index ,
+.Nm rindex
 .Nd string specific functions
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
-.In strings.h
-.Ft char *
-.Fo index
-.Fa "const char *s"
-.Fa "int c"
-.Fc
-.Ft char *
-.Fo rindex
-.Fa "const char *s"
-.Fa "int c"
-.Fc
-.Ft int
-.Fo strcasecmp
-.Fa "const char *s1"
-.Fa "const char *s2"
-.Fc
-.Ft int
-.Fo strncasecmp
-.Fa "const char *s1"
-.Fa "const char *s2"
-.Fa "size_t n"
-.Fc
 .In string.h
 .Ft char *
-.Fo stpcpy
-.Fa "char *dst"
-.Fa "const char *src"
-.Fc
+.Fn stpcpy "char *dst" "const char *src"
 .Ft char *
-.Fo strcat
-.Fa "char *restrict s1"
-.Fa "const char *restrict s2"
-.Fc
+.Fn strcat "char *s" "const char * append"
 .Ft char *
-.Fo strchr
-.Fa "const char *s"
-.Fa "int c"
-.Fc
+.Fn strncat "char *s" "const char *append" "size_t count"
+.Ft char *
+.Fn strchr "const char *s" "int c"
+.Ft char *
+.Fn strrchr "const char *s" "int c"
 .Ft int
-.Fo strcmp
-.Fa "const char *s1"
-.Fa "const char *s2"
-.Fc
+.Fn strcmp "const char *s1" "const char *s2"
+.Ft int
+.Fn strncmp "const char *s1" "const char *s2" "size_t count"
+.Ft int
+.Fn strcasecmp "const char *s1" "const char *s2"
+.Ft int
+.Fn strncasecmp "const char *s1" "const char *s2" "size_t count"
 .Ft char *
-.Fo strcpy
-.Fa "char *restrict s1"
-.Fa "const char *restrict s2"
-.Fc
+.Fn strcpy "char *dst" "const char *src"
+.Ft char *
+.Fn strncpy "char *dst" "const char *src" "size_t count"
+.Ft char *
+.Fn strerror "int errno"
 .Ft size_t
-.Fo strcspn
-.Fa "const char *s1"
-.Fa "const char *s2"
-.Fc
+.Fn strlen "const char *s"
 .Ft char *
-.Fo strerror
-.Fa "int errnum"
-.Fc
+.Fn strpbrk "const char *s" "const char *charset"
+.Ft char *
+.Fn strsep "char **stringp" "const char *delim"
 .Ft size_t
-.Fo strlen
-.Fa "const char *s"
-.Fc
+.Fn strspn "const char *s" "const char *charset"
+.Ft size_t
+.Fn strcspn "const char *s" "const char *charset"
 .Ft char *
-.Fo strncat
-.Fa "char *restrict s1"
-.Fa "const char *restrict s2"
-.Fa "size_t n"
-.Fc
-.Ft int
-.Fo strncmp
-.Fa "const char *s1"
-.Fa "const char *s2"
-.Fa "size_t n"
-.Fc
+.Fn strstr "const char *big" "const char *little"
 .Ft char *
-.Fo strncpy
-.Fa "char *restrict s1"
-.Fa "const char *restrict s2"
-.Fa "size_t n"
-.Fc
+.Fn strtok "char *s" "const char *delim"
 .Ft char *
-.Fo strpbrk
-.Fa "const char *s1"
-.Fa "const char *s2"
-.Fc
+.Fn index "const char *s" "int c"
 .Ft char *
-.Fo strrchr
-.Fa "const char *s"
-.Fa "int c"
-.Fc
-.Ft char *
-.Fo strsep
-.Fa "char **stringp"
-.Fa "const char *delim"
-.Fc
-.Ft size_t
-.Fo strspn
-.Fa "const char *s1"
-.Fa "const char *s2"
-.Fc
-.Ft char *
-.Fo strstr
-.Fa "const char *s1"
-.Fa "const char *s2"
-.Fc
-.Ft char *
-.Fo strtok
-.Fa "char *restrict s1"
-.Fa "const char *restrict s2"
-.Fc
+.Fn rindex "const char *s" "int c"
 .Sh DESCRIPTION
 The string
-functions manipulate strings that are terminated by a
+functions manipulate strings terminated by a
 null byte.
 .Pp
 See the specific manual pages for more information.