Ready to do the tagging for 4.11-RELEASE.

Approved by: re (implicit)
Remove unnecessary parts for the release.
2026-10-30 12:25:10 +01:00 · 2005-01-21 13:12:41 +00:00 · 2005-01-21 11:20:40 +00:00 · 2005-01-21 11:16:10 +00:00 · 2005-01-21 06:46:33 +00:00 · 2005-01-21 06:43:18 +00:00
143 changed files with 27257 additions and 24119 deletions
@@ -4,7 +4,7 @@
 The compilation of software known as FreeBSD is distributed under the
 following terms:

-Copyright (C) 1992-2004 The FreeBSD Project. All rights reserved.
+Copyright (C) 1992-2005 The FreeBSD Project. All rights reserved.

 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -554,7 +554,7 @@ update:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Updating ${.CURDIR} from cvs repository" ${CVSROOT}
 	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR}; cvs -R -q update -rRELENG_4 -P -d
+	cd ${.CURDIR}; cvs -R -q update -rRELENG_4_11 -P -d
 .endif

 #
@@ -8,6 +8,9 @@ A reverse chronology since 4.0 was released is included, followed by
 the common items quick how-tos, followed by entries for versions of
 -current prior to 4.0 Release.

+20050124:
+	FreeBSD 4.11-RELEASE.
+
 20040527:
 	FreeBSD 4.10-RELEASE.

@@ -381,27 +381,27 @@ mconvert(union VALUETYPE *p, struct magic *m)
 		return 1;
 	case STRING:
 		{
-			int n;
+			size_t len;

 			/* Null terminate and eat *trailing* return */
 			p->s[sizeof(p->s) - 1] = '\0';
-			n = strlen(p->s) - 1;
-			if (p->s[n] == '\n')
-				p->s[n] = '\0';
+			len = strlen(p->s);
+			if (len-- && p->s[len] == '\n')
+				p->s[len] = '\0';
 			return 1;
 		}
 	case PSTRING:
 		{
 			char *ptr1 = p->s, *ptr2 = ptr1 + 1;
-			int n = *p->s;
-			if (n >= sizeof(p->s))
-				n = sizeof(p->s) - 1;
-			while (n--)
+			size_t len = *p->s;
+			if (len >= sizeof(p->s))
+				len = sizeof(p->s) - 1;
+			while(len--)
 				*ptr1++ = *ptr2++;
 			*ptr1 = '\0';
-			n = strlen(p->s) - 1;
-			if (p->s[n] == '\n')
-				p->s[n] = '\0';
+			len = strlen(p->s);
+			if (len-- && p->s[len] == '\n')
+				p->s[len] = '0';
 			return 1;
 		}
 	case BESHORT:
@@ -460,7 +460,7 @@ wt*)
 	;;

 # Individual slices.
-aacd*s*|ad*s*|ar*s*|afd*s*|amrd*s*|da*s*|fla*s*|idad*s*|md*s*|mlxd*s*|pst*s*|twed*s*|vn*s*|wd*s*|wfd*s*)
+aacd*s*|ad*s*|ar*s*|afd*s*|amrd*s*|da*s*|fla*s*|idad*s*|ipsd*s*|md*s*|mlxd*s*|pst*s*|twed*s*|vn*s*|wd*s*|wfd*s*)
 	umask $disk_umask
 	case $i in
 	aacd*s*) name=aacd; chr=151;;
@@ -471,6 +471,7 @@ aacd*s*|ad*s*|ar*s*|afd*s*|amrd*s*|da*s*|fla*s*|idad*s*|md*s*|mlxd*s*|pst*s*|twe
 	da*s*) name=da;  chr=13;;
 	fla*s*) name=fla; chr=102;;
 	idad*s*) name=idad; chr=109;;
+	ipsd*s*) name=ipsd; chr=176;;
 	md*s*) name=md;  chr=95;;
 	mlxd*s*) name=mlxd; chr=131;;
 	pst*s*) name=pst; chr=168;;
@@ -480,7 +481,7 @@ aacd*s*|ad*s*|ar*s*|afd*s*|amrd*s*|da*s*|fla*s*|idad*s*|md*s*|mlxd*s*|pst*s*|twe
 	wfd*s*) name=wfd; chr=87;;
 	esac
 	case $i in
-	aacd*s*|amrd*s*|idad*s*|mlxd*s*|twed*s*)
+	aacd*s*|amrd*s*|idad*s*|ips*s*|mlxd*s*|twed*s*)
 		unit=`expr $i : '....\([0-9]*\)s'`
 		slice=`expr $i : '....[0-9]*s\([0-9]*\)'`
 		part=`expr $i : '....[0-9]*s[0-9]*\(.*\)'`
@@ -645,7 +646,7 @@ fd*)
 	umask 77
 	;;

-aacd*|ad*|ar*|afd*|amrd*|da*|fla*|idad*|md*|mlxd*|pst*|twed*|vn*|wd*|wfd*)
+aacd*|ad*|ar*|afd*|amrd*|da*|fla*|idad*|ips*|md*|mlxd*|pst*|twed*|vn*|wd*|wfd*)
 	umask $disk_umask
 	case $i in
 	aacd*) name=aacd; chr=151;;
@@ -656,6 +657,7 @@ aacd*|ad*|ar*|afd*|amrd*|da*|fla*|idad*|md*|mlxd*|pst*|twed*|vn*|wd*|wfd*)
 	da*) name=da;  chr=13;;
 	fla*) name=fla; chr=102;;
 	idad*) name=idad; chr=109;;
+	ipsd*) name=ipsd; char=176;;
 	md*) name=md; chr=95;;
 	mlxd*) name=mlxd; chr=131;;
 	pst*) name=pst; chr=168;;
@@ -665,7 +667,7 @@ aacd*|ad*|ar*|afd*|amrd*|da*|fla*|idad*|md*|mlxd*|pst*|twed*|vn*|wd*|wfd*)
 	wfd*) name=wfd; chr=87;;
 	esac
 	case $i in
-	aacd*|amrd*|idad*|mlxd*|twed*)
+	aacd*|amrd*|idad*|ipsd*|mlxd*|twed*)
 		unit=`expr $i : '....\(.*\)'`
 		;;
 	afd*|fla*|pst*|wfd*)
@@ -1892,6 +1894,11 @@ aac*)
 	ln -fs aac$unit hpn$unit
 	;;

+ips*)
+	unit=`expr $i : 'ips\(.*\)'`
+	mknod ips$unit c 175 `unit2minor $unit`
+	;;
+
 mlx*)
 	unit=`expr $i : 'mlx\(.*\)'`
 	mknod mlx$unit c 130 `unit2minor $unit`
@@ -370,8 +370,8 @@ esac
 # after a system crash.
 #
 rm -f /tmp/.X*-lock
-rm -fr /tmp/.X11-unix
-mkdir -m 1777 /tmp/.X11-unix
+rm -fr /tmp/.X11-unix /tmp/.ICE-unix /tmp/.font-unix /tmp/.XIM-unix
+mkdir -m 1777 /tmp/.X11-unix /tmp/.ICE-unix /tmp/.font-unix /tmp/.XIM-unix

 # Snapshot any kernel -c changes back to disk here <someday>.
 # This has changed with ELF and /kernel.config.
@@ -569,6 +569,15 @@ draw:
 	if (redraw_menu) {
 	    getyx(list, old_y, old_x);
 	    wclear(list);
+
+    	    /*
+	     * Re-draw a box around the list items.  It is required
+	     * if amount of list items is smaller than height of listbox.
+	     * Otherwise un-redrawn field will be filled with default
+	     * screen attributes instead of dialog attributes.
+	     */
+	    draw_box(dialog, box_y, box_x, list_height + 2, list_width + 2, menubox_border_attr, menubox_attr);
+
 	    for (i = 0; i < max_choice; i++)
 		print_item(list, items[(scroll + i) * 3], items[(scroll + i) * 3 + 1], status[scroll + i], i, i == choice, DREF(ditems, scroll + i), list_width, item_x, check_x);
 	    print_arrows(dialog, scroll, list_height, item_no, box_x, box_y, check_x + 4, cur_x, cur_y);
@@ -54,8 +54,8 @@
 .ds doc-default-operating-system FreeBSD\~4.11
 .
 .\" FreeBSD releases not found in doc-common
-.\" .ds doc-operating-system-FreeBSD-4.11   4.11
-.\" .ds doc-operating-system-FreeBSD-5.4    5.4
+.ds doc-operating-system-FreeBSD-4.11   4.11
+.ds doc-operating-system-FreeBSD-5.4    5.4
 .
 .ec
 .
@@ -16,4 +16,5 @@ powerpc
 sparc64
 standards
 threads
+usb
 www
@@ -29,6 +29,8 @@
 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
+ *
+ * $FreeBSD$
 */

 #if defined(LIBC_SCCS) && !defined(lint)
@@ -143,6 +145,7 @@ const char *const sys_errlist[] = {
 	"Value too large to be stored in data type", /* 84 - EOVERFLOW */
 	"Operation canceled",			/* 85 - ECANCELED */
 	"Illegal byte sequence",		/* 86 - EILSEQ */
+	"Attribute not found",			/* 87 - ENOATTR */
 };
 int errno;
 const int sys_nerr = sizeof(sys_errlist) / sizeof(sys_errlist[0]);
@@ -32,7 +32,7 @@
 .\"     @(#)syslog.3	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD$
 .\"
-.Dd June 4, 1993
+.Dd December 30, 2004
 .Dt SYSLOG 3
 .Os
 .Sh NAME
@@ -205,6 +205,8 @@ etc.
 The mail system.
 .It Dv LOG_NEWS
 The network news system.
+.It Dv LOG_NTP
+The network time protocol system.
 .It Dv LOG_SECURITY
 Security subsystems, such as
 .Xr ipfw 4 .
@@ -32,7 +32,7 @@
 .\"     @(#)intro.2	8.5 (Berkeley) 2/27/95
 .\" $FreeBSD$
 .\"
-.Dd February 27, 1995
+.Dd January 12, 2005
 .Dt INTRO 2
 .Os
 .Sh NAME
@@ -451,6 +451,8 @@ The scheduled operation was canceled.
 While decoding a multibyte character the function came along an
 invalid or an incomplete sequence of bytes or the given wide
 character is invalid.
+.It Er 87 ENOATTR Em "Attribute not found" .
+The specified extended attribute does not exist.
 .El
 .Sh DEFINITIONS
 .Bl -tag -width Ds
@@ -32,7 +32,7 @@
 .\"     @(#)stat.2	8.4 (Berkeley) 5/1/95
 .\" $FreeBSD$
 .\"
-.Dd May 1, 1995
+.Dd November 15, 2004
 .Dt STAT 2
 .Os
 .Sh NAME
@@ -115,6 +115,24 @@ struct stat {
 };
 .Ed
 .Pp
+The fields of
+.Vt "struct stat"
+related to the file system are as follows:
+.Bl -tag -width ".Va st_nlink"
+.It Va st_dev
+The numeric ID of the device containing the file.
+.It Va st_ino
+The file's inode number.
+.It Va st_nlink
+The number of hard links to the file.
+.El
+.Pp
+The
+.Va st_dev
+and
+.Va st_ino
+fields together identify the file uniquely within the system.
+.Pp
 The time-related fields of
 .Fa struct stat
 are as follows:
@@ -165,14 +183,28 @@ The size-related fields of the
 .Fa struct stat
 are as follows:
 .Bl -tag -width XXXst_blksize
-.It st_blksize
+.It Va st_size
+The file size in bytes.
+.It Va st_blksize
 The optimal I/O block size for the file.
-.It st_blocks
+.It Va st_blocks
 The actual number of blocks allocated for the file in 512-byte units.
 As short symbolic links are stored in the inode, this number may
 be zero.
 .El
 .Pp
+The access-related fields of
+.Vt "struct stat"
+are as follows:
+.Bl -tag -width ".Va st_mode"
+.It Va st_uid
+The user ID of the file's owner.
+.It Va st_gid
+The group ID of the file.
+.It Va st_mode
+Status of the file (see below).
+.El
+.Pp
 The status information word
 .Fa st_mode
 has the following bits:
@@ -199,6 +231,32 @@ For a list of access modes, see
 .Xr access 2
 and
 .Xr chmod 2 .
+The following macros are available to test whether a
+.Va st_mode
+value passed in the
+.Ar m
+argument corresponds to a file of the specified type:
+.Bl -tag -width ".Fn S_ISFIFO m"
+.It Fn S_ISBLK m
+Test for a block special file.
+.It Fn S_ISCHR m
+Test for a character special file.
+.It Fn S_ISDIR m
+Test for a directory.
+.It Fn S_ISFIFO m
+Test for a pipe or FIFO special file.
+.It Fn S_ISLNK m
+Test for a symbolic link.
+.It Fn S_ISREG m
+Test for a regular file.
+.It Fn S_ISSOCK m
+Test for a socket.
+.It Fn S_ISWHT m
+Test for a whiteout.
+.El
+.Pp
+The macros evaluate to a non-zero value if the test is true
+or to the value 0 if the test is false.
 .Sh RETURN VALUES
 .Rv -std
 .Sh COMPATIBILITY
@@ -302,6 +302,8 @@ MakeDev(struct chunk *c1, const char *path)
 	cmaj = 102, p += 3;
    else if (!strncmp(p, "idad", 4))
 	cmaj = 109, p += 4;
+    else if (!strncmp(p, "ipsd", 4))
+	cmaj = 176, p += 4;
    else if (!strncmp(p, "mlxd", 4))
 	cmaj = 131, p += 4;
    else if (!strncmp(p, "amrd", 4))
@@ -488,7 +488,7 @@ Collapse_Disk(struct disk *d)
 #ifdef PC98
 static char * device_list[] = {"wd", "aacd", "ad", "da", "afd", "fla", "idad", "mlxd", "amrd", "twed", "ar", "fd", 0};
 #else
-static char * device_list[] = {"aacd", "ad", "da", "afd", "fla", "idad", "mlxd", "amrd", "twed", "ar", "fd", 0};
+static char * device_list[] = {"aacd", "ad", "da", "afd", "fla", "idad", "ipsd", "mlxd", "amrd", "twed", "ar", "fd", 0};
 #endif

 int qstrcmp(const void* a, const void* b) {
@@ -39,7 +39,6 @@ sed	\
 	-e '/	sf	/d' \
 	-e '/	sis	/d' \
 	-e '/	ste	/d' \
-	-e '/	wx	/d' \
 	-e '/gzip/d' \
 	-e '/	sl	/d' \
 	-e '/ppp/d' \
@@ -35,3 +35,4 @@

 #drv	filename	floppy	type	description
 txp	if_txp		2	network	"3Com 3XP Typhoon/Sidewinder (3CR990) NIC"
+em	if_em		2	network "Intel PRO/1000 adapter Gigabit Ethernet Card (``Wiseman'')"
@@ -11,17 +11,10 @@
 -->

 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mlists;
-<!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
-%trademarks;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
-
 ]>

 <article>
@@ -47,6 +40,7 @@
      <year>2002</year>
      <year>2003</year>
      <year>2004</year>
+      <year>2005</year>
      <holder role="mailto:[email protected]">The FreeBSD Documentation Project</holder>
    </copyright>

@@ -139,36 +133,7 @@
 ]]>

 <![ %release.type.snapshot [
-
-    <para>(20 May 2004) A security problem was discovered
-      in <application>CVS</application> but the release notes
-      did not state that since it was very late in the release cycle.
-      &os; &release.prev; includes a fix for it and is not vulnerable.
-      For the details, see the security advisory
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:10.cvs.asc">FreeBSD-SA-04:10</ulink>.</para>
-
-    <para>(23 May 2004) As a side effect of closing a security problem
-      related to &man.msync.2;, the <literal>MS_INVALIDATE</literal>
-      flag no longer guarantees that all pages in the range are
-      invalidated.  This can cause problems when pages are backed by a remote file
-      (e.g. via NFS) where other machines can write to the permanent storage since
-      the local pages not being invalidated might then contain stale data.  The
-      security problem being addressed is a strictly local exploit, and only
-      allows a local user to block the writing of data to a file under certain
-      circumstances.  Users who require the old semantics of
-      <literal>MS_INVALIDATE</literal> and are not concerned with
-      the security issue being fixed can set the
-      <literal>vm.old_msync</literal> sysctl to <literal>1</literal>
-      which will revert to the old (insecure) behavior.</para>
-
-    <para>(25 May 2004) The &man.twe.4; driver was recently updated by the
-      vendor.  Problems have been reported in rare circumstances under
-      conditions that are hard to reproduce.  Work is ongoing to isolate
-      these problems and determine their source.</para>
-
-    <para>(27 May 2004) The &man.bfe.4; driver for Broadcom BCM4401
-      based Fast Ethernet adapters has been added but the release notes
-      did not mention that.</para>
+    <para>No news.</para>
 ]]>
  </sect1>
 </article>
@@ -1,12 +1,8 @@
 <!-- $FreeBSD$ -->

 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mlists;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
@@ -176,17 +176,15 @@
    that can boot from IDE disks and CDROMs. Check the machine
    specific section for details.</para>

-    <para>&os; 4.0 and later can be booted from the
-    distribution CDROM.  Earlier versions needed booting from a
-    2 disk floppy set.</para>
-
    <para>In order to be bootable the root partition (partition a)
    must be at offset 0 of the disk drive. This means you have to 
    use the installer's partitioning menu and start with assigning 
    partition a at offset 0 to the root partition. Subsequently layout
    the rest of the partitions to your liking. If you do not adhere
    to this rule the install will proceed just fine, but the system
-    will not be bootable from the freshly installed disk.</para>
+    will not be bootable from the freshly installed disk.  Note that fdisk
+    is not used on &os; running on Alpha, disks are directly
+    labeled using disklabel.</para>

    <para>If you don't have/want a local disk drive you can boot via
    the Ethernet.  This assumes an Ethernet adapter/chip that is
@@ -1709,7 +1707,10 @@ cd0: 250.000MB/s transfers (250.000MHz, offset 12)</programlisting>
  
      <para>AS600 has one Qlogic SCSI chip dedicated to the internal devices 
      whereas the other Qlogic SCSI chip is dedicated to external SCSI devices.
-      </para>
+      Keep the card, which apart from the two SCSI interfaces also houses 
+      the Ethernet chip by the way, in the DEC-recommended, topmost, 32bit 
+      PCI slot. You get machine checks if you plug it into one of the 64 bit
+      slots.</para>
  
      <para>In AS500 DIMMs are installed in sets of 4, in <quote>physically 
      interleaved</quote> layout. So, a bank of 4 DIMMs is <emphasis>not</emphasis>
@@ -11,6 +11,7 @@
    <year>2002</year>
    <year>2003</year>
    <year>2004</year>
+    <year>2005</year>
    <holder role="mailto:[email protected]">The FreeBSD Documentation Project</holder>
  </copyright>
 </articleinfo>
@@ -1,12 +1,8 @@
 <!-- $FreeBSD$ -->

 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mlists;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
@@ -1,12 +1,8 @@
 <!-- $FreeBSD$ -->

 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mlists;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
@@ -1,12 +1,8 @@
 <!-- $FreeBSD$ -->

 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mlists;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
@@ -1,14 +1,8 @@
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mlists;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
-<!ENTITY % misc PUBLIC  "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
-%misc;
 ]>

 <article>
@@ -25,6 +19,7 @@
      <year>2002</year>
      <year>2003</year>
      <year>2004</year>
+      <year>2005</year>
      <holder role="mailto:[email protected]">The FreeBSD Documentation Project</holder>
    </copyright>
  </articleinfo>
@@ -1,12 +1,8 @@
 <!-- $FreeBSD$ -->

 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mlists;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
@@ -3,7 +3,7 @@

  <pubdate>$FreeBSD$</pubdate>

-  <corpauthor>The FreeBSD Project</corpauthor>
+  <corpauthor>The &os; Project</corpauthor>

  <copyright>
    <year>2000</year>
@@ -11,7 +11,8 @@
    <year>2002</year>
    <year>2003</year>
    <year>2004</year>
-    <holder role="mailto:[email protected]">The FreeBSD Documentation Project</holder>
+    <year>2005</year>
+    <holder role="mailto:[email protected]">The &os; Documentation Project</holder>
  </copyright>

  <abstract>
@@ -59,7 +60,7 @@
 </sect1>

 <!--
-	The "What's New" section of the release notes. 
+	The "What's New" section of the release notes.

 	Guidelines for new entries:

@@ -91,49 +92,99 @@
  <sect2 id="security">
    <title>Security Advisories</title>

-    <para></para>
+    <para>A programming error in the &os; Linux binary
+      compatibility which allows a local attacker to read
+      or write portions of the kernel memory has been fixed.
+      For more details, see security advisory
+      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:13.linux.asc">FreeBSD-SA-04:13.linux</ulink>.</para>

+    <para>Various remotely-exploitable vulnerabilities of
+      <application>CVS</application>'s server mode including double-free,
+      integer overflow, and buffer overflow which can result
+      in information disclosure, denial-of-service, and/or possibly
+      arbitrary code execution, have been fixed via an upgrade
+      to <application>CVS</application> 1.11.17.
+      For more details, see security advisory
+      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:14.cvs.asc">FreeBSD-SA-04:14</ulink>.</para>
+
+    <para>A bug in the &man.fetch.1; utility which allows
+      a malicious HTTP server to cause arbitrary portions of the client's
+      memory to be overwritten, has been fixed.
+      For more information, see security advisory
+      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:16.fetch.asc">FreeBSD-SA-04:16</ulink>.</para>
+
+    <para>A bug in &man.procfs.5; and &man.linprocfs.5;
+      which could cause a malicious local user could perform a local
+      denial of service attack by causing a system panic, or the user
+      could read parts of kernel memory, has been fixed.
+      For more information, see security advisory
+      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:17.procfs.asc">FreeBSD-SA-04:17</ulink>.</para>
  </sect2>

  <sect2 id="kernel">
    <title>Kernel Changes</title>

    <para arch="i386">The &man.cp.4; driver has been added for Cronyx Tau-PCI
-      synchronous serial adapters.
-    </para>
+      synchronous serial adapters.</para>
+
+    <para arch="alpha">The &man.em.4; driver has been added to the kernel
+      on the installation media.</para>

    <para>A bug in &man.mmap.2; that pages marked as <literal>PROT_NONE</literal>
      may become readable under certain circumstances, has been fixed.</para>

+    <para>Bugs in <function>vm_object_madvise()</function>,
+      <function>vm_object_sync()</function>, and
+      <function>contigmalloc()</function>
+      functions in the &os; virtual memory subsystem have been fixed.
+      The bugs in <function>vm_object_madvise()</function>
+      and <function>vm_object_sync()</function> could
+      cause memory corruption in a variety of contexts, and
+      one in <function>contigmalloc()</function>
+      could cause a system panic.</para>
+
 <!-- Above this line, kernel changes ordered by manpage/variable name -->

    <sect3 id="proc">
      <title>Platform-Specific Hardware Support</title>

+      <para arch="i386">The &man.pbio.4; driver,
+	which supports direct access to
+	the Intel 8255A programmable peripheral interface (PPI)
+	chip running in mode 0 (simple I/O) has been added.</para>
+
      <para arch="alpha">Support for the floppy interface is broken on
        DS10-class systems.  The kernel probes the hardware correctly but
-        the floppy does not work properly.  Booting and installing from 
+        the floppy does not work properly.  Booting and installing from
        floppies is not affected.
      </para>

    </sect3>

-    <sect3 id="boot">
-      <title>Boot Loader Changes</title>
-
-      <para></para>
-
-<!-- Above this line, order boot loader changes by manpage/variable name-->
-
-    </sect3>
-
    <sect3 id="net-if">
      <title>Network Interface Support</title>

+      <para>The &man.axe.4; driver, which supports
+	ASIX Electronics AX88172 USB 2.0 Ethernet chipset
+	has been added.</para>
+
+      <para>The &man.bge.4; driver now supports BCM5750
+	and BCM5751.</para>
+
+      <para>The &man.em.4; driver now supports 82541ER and 82546GB
+	dual port PCI Express adapter.</para>
+
+      <para>The &man.ixgb.4; driver, which supports PCI Gigabit
+	Ethernet adapters based on the Intel 82597EX Ethernet
+	controller chips, has been added.</para>
+
      <para>The &man.ng.hub.4; Netgraph node type, which supports
        a simple packet distribution that acts like an Ethernet hub
        has been added.</para>

+      <para>A bug of jumbo frame handling in the &man.sk.4; driver
+	has been fixed.</para>
+
      <para>The &man.vr.4; driver now supports &man.polling.4;.</para>

      <para>The per-interface &man.polling.4; support has been
@@ -143,6 +194,11 @@
 	now also support this capability and it can be controlled
 	via &man.ifconfig.8;.</para>

+      <para>A system panic which occurs
+	when <varname>net.inet.ip.rtexpire</varname> and/or
+	<varname>net.inet6.ip6.rtexpire</varname> are set to
+	<literal>0</literal> has been fixed.
+
 <!-- Above this line, order network driver changes by manpage/variable name-->

    </sect3>
@@ -153,39 +209,53 @@
      <para>The random ephemeral port allocation, which come from OpenBSD
 	has been implemented.  This is enabled by default and can be disabled
 	using the <varname>net.inet.ip.portrange.randomized</varname>
-	sysctl.</para>
+	sysctl.  Note that the randomization can lead to extremely
+	fast port reuse at high connection rates, which is causing
+	problems for some users.  To retain the security advantage
+	of random ports and ensure correct operation, it is disabled
+	during periods of high connection rates.
+	More specifically, when the connection rate exceeds
+	the value of the <varname>net.inet.ip.portrange.randomcps</varname> sysctl
+	(<literal>10</literal> by default), the randomization will be disabled for
+	seconds specified in the
+	<varname>net.inet.ip.portrange.randomtime</varname> sysctl
+	(<literal>45</literal> by default).</para>

      <para>&man.ipfw.4; now supports lookup tables.  This feature is
        useful for handling large sparse address sets.</para>

+      <para>&man.ipnat.8; now allows redirect rules to work for
+	non-TCP/UDP packets.</para>
+
+      <para>The <literal>RST</literal>
+	handling of the &os; TCP stack has been improved
+	to make reset attacks as difficult as possible while
+	maintaining compatibility with the widest range of TCP stacks.
+	The algorithm is as follows.  For connections in the
+	<literal>ESTABLISHED</literal>
+	state, only resets with sequence numbers exactly matching
+	<varname>last_ack_sent</varname> will cause a reset,
+	all other segments will
+	be silently dropped. For connections in all other states,
+	a reset anywhere in the window will cause the connection
+	to be reset.  All other segments will be silently dropped.
+	Note that this breaks the RFC 793 specification and you
+	can still disable this and use the conventional behavior
+	by setting a new sysctl <varname>net.inet.tcp.insecure_rst</varname>
+	to <literal>1</literal>.</para>
    </sect3>

    <sect3 id="disks">
      <title>Disks and Storage</title>

-      <para></para>
+      <para>The &man.ips.4; driver, which supports IBM/Adaptec ServeRAID controller
+	has been added.</para>

-    </sect3>
-
-    <sect3 id="fs">
-      <title>File Systems</title>
-
-      <para></para>
-
-    </sect3>
-
-    <sect3 id="pccard">
-      <title>PCCARD Support</title>
-
-      <para></para>
-
-    </sect3>
-
-    <sect3 id="mm">
-      <title>Multimedia Support</title>
-
-      <para></para>
+      <para>The &man.mpt.4; driver now supports LSI Logic FC929X
+	Dual 2Gb/s Fibre Channel card.</para>

+      <para>The &man.trm.4; driver now supports the DC395U2W adapters
+	and problems under heavy load have been fixed.</para>
    </sect3>
  </sect2>

@@ -194,17 +264,31 @@

    <para>The &man.cron.8 daemon now accepts two new options,
      <option>-j</option> and <option>-J</option>, to enable
-      time jitter for jobs to run as unpriviliged users and the
+      time jitter for jobs to run as unprivileged users and the
      superuser, respectively.  Time jitter means that &man.cron.8
      will sleep for a small random period of time in the specified
      range before executing a job.  This feature is intended to
      smooth load peaks appearing when a lot of jobs are scheduled
      for a particular moment.</para>

-      <para>The LQM, Link Quality Monitoring support in &man.ppp.8;
-	has been reimplemented.  The LQM, which is described
-	in RFC 1989, allows PPP to keep track of the quality
-	of a running connection.</para>
+    <para>The &man.fwcontrol.8; now supports a <option>-m</option>
+      option to set the default <literal>fwmem</literal> target.</para>
+
+    <para>The <option>-C 60</option> option is now used
+      in the default <varname>$inetd_flags</varname> variable
+      in <filename>/etc/rc.conf</filename>.</para>
+
+    <para>The <application>libc</application> now supports
+      &man.eui64.3; functions.</para>
+
+    <para>The &man.ngctl.8; now supports <command>dot</command> command to
+      produce a <application>GraphViz</application> (.dot)
+      of the entire Netgraph.</para>
+
+    <para>The LQM, Link Quality Monitoring support in &man.ppp.8;
+      has been reimplemented.  The LQM, which is described
+      in RFC 1989, allows PPP to keep track of the quality
+      of a running connection.</para>

    <para>The userland &man.ppp.8; implementation now supports a <quote>set rad_alive
 	<replaceable>N</replaceable></quote> command
@@ -214,6 +298,18 @@
    <para>A bug in &man.rarpd.8; that prevents it from working properly
      when a interface has more than one IP address has been fixed.</para>

+    <para>&man.syslogd.8; now supports <literal>LOG_NTP</literal>
+      facility.</para>
+
+    <para>Several off-by-one errors and potential buffer
+      overruns in &man.pax.1; have been fixed.</para>
+
+    <para>&man.whois.1; now supports NORID (Norwegian top level registry)
+      handles, the German whois nameserver, and a <option>-k</option> flag
+      for querying <hostid role="fqdn">whois.krnic.net</hostid>
+      (the National Internet Development Agency of Korea)
+      which hold details of IP address allocations within Korea.</para>
+
 <!-- Above this line, order userland changes by manpage/variable name-->

  </sect2>
@@ -221,23 +317,49 @@
  <sect2 id="contrib">
    <title>Contributed Software</title>

-    <para><application>sendmail</application> has been updated from 
-      version 8.12.11 to version 8.13.1.</para> 
+    <para><application>CVS</application> has been updated from
+      version 1.11.5 to version 1.11.17.</para>

-  </sect2>
+    <para><application>sendmail</application> has been updated from
+      version 8.12.11 to version 8.13.1.</para>

-  <sect2 id="ports">
-    <title>Ports/Packages Collection Infrastructure</title>
-
-    <para></para>
+    <para><application>GNU patch</application> source files in
+      <filename>src/contrib/patch</filename> has been removed.
+      &os; have used the &man.patch.1; sources
+      in <filename>src/gnu/usr.bin/patch</filename> for nearly seven years.</para>

+    <para>The timezone database has been updated from the
+      <application>tzdata2004e</application> release to the
+      <application>tzdata2004g</application> release.</para>
  </sect2>

  <sect2 id="releng">
    <title>Release Engineering and Integration</title>

-    <para></para>
+    <para>The supported release of <application>GNOME</application>
+      has been updated from 2.6 to 2.8.2.
+      The list of changes for each component can be found at
+      <ulink url="http://mail.gnome.org/archives/gnome-announce-list/2004-December/msg00026.html">
+	http://mail.gnome.org/archives/gnome-announce-list/2004-December/msg00026.html</ulink>.</para>

+    <para>The supported release of <application>KDE</application>
+      has been updated from 3.2.2 to 3.3.2.</para>
+
+    <para>The supported userland package for Linux binary compatibility
+      has been updated from <filename role="package">linux_base-6</filename>
+      (based on Red Hat Linux 7.1)
+      to <filename role="package">linux_base-8</filename>
+      (based on Red Hat Linux 8.0).</para>
+
+    <para>The supported release of <application>X Window System</application>
+      has been updated to <application>XFree86</application> 4.4.0.
+      Note that Xorg X11R6.8.1 is also available in the FreeBSD Ports Collection
+      (<filename role="package">x11/xorg</filename>).</para>
+
+    <para>The <varname>NOSECURE</varname> variable in <filename>make.conf</filename>
+      has been removed because it is broken and no longer supported.
+      If you had been using the <varname>NOSECURE</varname>,
+      please now use the <varname>NOCRYPT</varname> instead.</para>
  </sect2>
 </sect1>

@@ -298,4 +420,3 @@
      files.</para>
  </important>
 </sect1>
-
@@ -1,12 +1,8 @@
 <!-- $FreeBSD$ -->

 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
-%man;
-<!ENTITY % authors PUBLIC  "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
-%authors;
-<!ENTITY % mlists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
-%mlists;
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+%articles.ent;
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
 %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
@@ -35,16 +35,6 @@
 		  (list (list "HREF" "mailto:[email protected]"))
                  (literal "[email protected]"))
                (literal ">.")
-            (make element gi: "p"
-                  attributes: (list (list "align" "center"))
-              (make element gi: "small"  
-                (literal "All users of FreeBSD ")
-		(literal (entity-text "release.branch"))
-		(literal " should subscribe to the ")
-                (literal "<")
-		(create-link (list (list "HREF" "mailto:[email protected]"))
-                  (literal "[email protected]"))
-                (literal "> mailing list.")))

            (make element gi: "p"
                  attributes: (list (list "align" "center"))
@@ -1,14 +0,0 @@
-# $FreeBSD$
-# Original revision: 1.6
-
-RELN_ROOT?= ${.CURDIR}/../..
-
-SUBDIR = alpha
-SUBDIR+= amd64
-SUBDIR+= ia64
-SUBDIR+= i386
-SUBDIR+= sparc64
-SUBDIR+= pc98
-
-.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
-.include "${DOC_PREFIX}/share/mk/doc.project.mk"
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Original revision: 1.3
-
-.ifdef NO_LANGCODE_IN_DESTDIR
-DESTDIR?=	${DOCDIR}/hardware/${.CURDIR:T}
-.else
-DESTDIR?=	${DOCDIR}/ja_JP.eucJP/hardware/${.CURDIR:T}
-.endif
-
-# Force include of the autogenerated catalog.  It has to be set
-# directly in the CATALOG variable since doc.docbook.mk check if each
-# catalog file exist for the other *CATALOG variables, and
-# catalog-auto does not exist yet when that check is performed,
-# causing catalog-auto not to be added to CATALOGS which breaks the
-# build.
-CATALOGS+=	-c ${DEV-AUTODIR}/catalog-auto
@@ -1,24 +0,0 @@
-# $FreeBSD$
-# Original revision: 1.7
-
-RELN_ROOT?= ${.CURDIR}/../../..
-
-DOC?= article
-FORMATS?= html
-INSTALL_COMPRESSED?= gz
-INSTALL_ONLY_COMPRESSED?=
-
-JADEFLAGS+=	-V %generate-article-toc%
-
-# SGML content
-SRCS+=	article.sgml
-#SRCS+=	proc-alpha.sgml
-SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/dev.sgml
-SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.sgml
-SRCS+=	../../share/sgml/dev-auto-ja.sgml
-
-.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
-.include "${DOC_PREFIX}/share/mk/doc.project.mk"
@@ -1,29 +0,0 @@
-<!--
-    $FreeBSD$
-    Original revision: 1.6
-->
-
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % devauto-ja PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//JA">
-%devauto-ja;
-<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN">
-%devauto;
-<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
-
-<!-- Architecture-specific customization -->
-
-<!ENTITY arch "alpha">
-<!ENTITY arch.print "Alpha/AXP">
-
-]>
-
-<article>
-  &artheader;
-  &sect.intro;
-<!--  &sect.proc.alpha; -->
-  &sect.dev;
-</article>
@@ -1,19 +0,0 @@
-<!--
-    $FreeBSD$
-    Original revision: 1.5
-->
-
-<articleinfo>
-  <title>&os;/&arch; &release.current; ハードウェアノート</title>
-
-  <corpauthor>The FreeBSD Documentation Project</corpauthor>
-
-  <copyright>
-    <year>2000</year>
-    <year>2001</year>
-    <year>2002</year>
-    <year>2003</year>
-    <year>2004</year>
-    <holder role="mailto:[email protected]">The FreeBSD Documentation Project</holder>
-  </copyright>
-</articleinfo>
@@ -1,19 +0,0 @@
-<!-- -*- sgml -*- -->
-<!--
-    $FreeBSD$
-    Original revision: 1.5
-->
-
-<!-- Text constants which probably don't need to be changed.-->
-
-<!-- Files to be included -->
-
-<!ENTITY artheader SYSTEM "../common/artheader.sgml">
-<!ENTITY sect.intro SYSTEM "../common/intro.sgml">
-<!ENTITY sect.proc.alpha SYSTEM "../alpha/proc-alpha.sgml">
-<!ENTITY sect.proc.amd64 SYSTEM "../amd64/proc-amd64.sgml">
-<!ENTITY sect.proc.i386 SYSTEM "../i386/proc-i386.sgml">
-<!ENTITY sect.proc.ia64 SYSTEM "../ia64/proc-ia64.sgml">
-<!ENTITY sect.proc.sparc64 SYSTEM "../sparc64/proc-sparc64.sgml">
-<!ENTITY sect.proc.pc98 SYSTEM "../pc98/proc-pc98.sgml">
-<!ENTITY sect.dev SYSTEM "../common/dev.sgml">
@@ -1,24 +0,0 @@
-# $FreeBSD$
-# Original revision: 1.6
-
-RELN_ROOT?= ${.CURDIR}/../../..
-
-DOC?= article
-FORMATS?= html
-INSTALL_COMPRESSED?= gz
-INSTALL_ONLY_COMPRESSED?=
-
-JADEFLAGS+=	-V %generate-article-toc%
-
-# SGML content
-SRCS+=	article.sgml 
-SRCS+=	proc-i386.sgml 
-SRCS+=	../common/hw.ent
-SRCS+=	../common/artheader.sgml
-SRCS+=	../common/dev.sgml
-SRCS+=	${DEV-AUTODIR}/catalog-auto
-SRCS+=	${DEV-AUTODIR}/dev-auto.sgml
-SRCS+=	../../share/sgml/dev-auto-ja.sgml
-
-.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
-.include "${DOC_PREFIX}/share/mk/doc.project.mk"
@@ -1,29 +0,0 @@
-<!--
-    $FreeBSD$
-    Original revision: 1.6
-->
-
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
-%articles.ent;
-<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
-%release;
-<!ENTITY % devauto-ja PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//JA">
-%devauto-ja;
-<!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN">
-%devauto;
-<!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
-
-<!-- Architecture-specific customization -->
-
-<!ENTITY arch "i386">
-<!ENTITY arch.print "i386">
-
-]>
-
-<article>
-  &artheader;
-  &sect.intro;
-  &sect.proc.i386;
-  &sect.dev;
-</article>
@@ -6,7 +6,7 @@

 <!-- Version of the OS we're describing.  This needs to be updated
     with each new release. -->
-<!ENTITY release.current "4.10-STABLE">
+<!ENTITY release.current "4.11-RELEASE">

 <!-- The previous version used for comparison in the "What's New"
     section.  For -CURRENT, we might point back to the last
@@ -14,27 +14,27 @@
 <!ENTITY release.prev "4.10-RELEASE">

 <!-- The next version to be released, usually used for snapshots. -->
-<!ENTITY release.next "4.11-RELEASE">
+<!ENTITY release.next "4.12-RELEASE">

 <!-- The name of this branch. -->
 <!ENTITY release.branch "4-STABLE">

 <!-- The URL for obtaining this version of FreeBSD. -->
-<!ENTITY release.url "http://snapshots.jp.FreeBSD.org/">
+<!ENTITY release.url "ftp://ftp.FreeBSD.org/">

 <!-- The type of release (usually this will be either "snapshot"
     or "release" -->
-<!ENTITY release.type "snapshot">
-<!ENTITY % release.type.snapshot "INCLUDE">
-<!ENTITY % release.type.release "IGNORE">
+<!ENTITY release.type "release">
+<!ENTITY % release.type.snapshot "IGNORE">
+<!ENTITY % release.type.release "INCLUDE">

 <!-- The manpaths for man page references -->
 <!ENTITY release.man.url "http://www.FreeBSD.org/cgi/man.cgi">
 <!ENTITY release.manpath.xfree86       "4.4.0">
-<!ENTITY release.manpath.xorg          "6.7.0">
-<!ENTITY release.manpath.netbsd        "1.6.2">
+<!ENTITY release.manpath.xorg          "6.8.1">
+<!ENTITY release.manpath.netbsd        "2.0">
 <!ENTITY release.manpath.freebsd-ports "Ports">
-<!ENTITY release.manpath.freebsd       "4.10-stable">
+<!ENTITY release.manpath.freebsd       "4.11-RELEASE">

 <!-- Text constants which probably don't need to be changed.-->

@@ -39,6 +39,7 @@ aac	aac		2	disk	"Adaptec AAC RAID"
 an	if_an		2	network	"Aironet 4500/4800 802.11 PCMCIA/ISA/PCI card"
 em	if_em		2	network	"Intel(R) PRO/1000 Gigabit Ethernet"
 ida	ida		2	disk	"Compaq Smart RAID"
+ips	ips		2	disk	"IBM ServeRAID"
 mlx	mlx		2	disk	"Mylex DAC960 family RAID"
 pst	pst		2	disk	"Promise SuperTrak RAID"
 wi	if_wi		2	network	"Lucent WaveLAN/IEEE 802.11 PCMCIA card"
@@ -72,7 +72,7 @@ CDROM_SET_1="${CDROM_SET_1} devel/pcre"
 if [ "X${PKG_ARCH}" = "Xalpha" ]; then
 CDROM_SET_1="${CDROM_SET_1} emulators/osf1_base"
 elif [ "X${PKG_ARCH}" = "Xi386" ]; then
-CDROM_SET_1="${CDROM_SET_1} emulators/linux_base"
+CDROM_SET_1="${CDROM_SET_1} emulators/linux_base-8"
 fi
 CDROM_SET_1="${CDROM_SET_1} mail/exim"
 CDROM_SET_1="${CDROM_SET_1} mail/postfix"
@@ -98,42 +98,57 @@ CDROM_SET_1="${CDROM_SET_1} x11/XFree86-4-clients"
 CDROM_SET_1="${CDROM_SET_1} x11/XFree86-4-documents"
 CDROM_SET_1="${CDROM_SET_1} x11/XFree86-4-libraries"
 CDROM_SET_1="${CDROM_SET_1} x11/XFree86-4-manuals"
+if [ "X${PKG_WINDOW}" = "Xgnome" ]; then
 CDROM_SET_1="${CDROM_SET_1} x11/gnome2-lite"
+elif [ "X${PKG_WINDOW}" = "Xkde" ]; then
 CDROM_SET_1="${CDROM_SET_1} x11/kde-lite"
+fi
 CDROM_SET_1="${CDROM_SET_1} www/links"

 # This is the set of "people really want these" packages.  Please add to
 # this list.
 CDROM_SET_1="${CDROM_SET_1} astro/xearth"
 CDROM_SET_1="${CDROM_SET_1} editors/emacs"
-CDROM_SET_1="${CDROM_SET_1} editors/vim-lite"
 CDROM_SET_1="${CDROM_SET_1} editors/vim"
+CDROM_SET_1="${CDROM_SET_1} editors/vim-lite"
 CDROM_SET_1="${CDROM_SET_1} emulators/mtools"
+CDROM_SET_1="${CDROM_SET_1} graphics/gimp"
 CDROM_SET_1="${CDROM_SET_1} graphics/xv"
 CDROM_SET_1="${CDROM_SET_1} irc/xchat2"
 CDROM_SET_1="${CDROM_SET_1} mail/fetchmail"
 CDROM_SET_1="${CDROM_SET_1} mail/mutt"
 CDROM_SET_1="${CDROM_SET_1} mail/pine4"
-CDROM_SET_1="${CDROM_SET_1} misc/screen"
-CDROM_SET_1="${CDROM_SET_1} net/cvsup"
+CDROM_SET_1="${CDROM_SET_1} mail/popd"
+CDROM_SET_1="${CDROM_SET_1} mail/xfmail"
+CDROM_SET_1="${CDROM_SET_1} misc/bsdiff"
+CDROM_SET_1="${CDROM_SET_1} net/cvsup-without-gui"
 CDROM_SET_1="${CDROM_SET_1} net/rsync"
 CDROM_SET_1="${CDROM_SET_1} net/samba"
 CDROM_SET_1="${CDROM_SET_1} news/slrn"
 CDROM_SET_1="${CDROM_SET_1} news/tin"
 CDROM_SET_1="${CDROM_SET_1} print/a2ps-letter"
+if [ "X${PKG_ARCH}" = "Xi386" ]; then
+CDROM_SET_1="${CDROM_SET_1} print/acroread"
+fi
 CDROM_SET_1="${CDROM_SET_1} print/apsfilter"
 CDROM_SET_1="${CDROM_SET_1} print/ghostscript-gnu-nox11"
 CDROM_SET_1="${CDROM_SET_1} print/gv"
 CDROM_SET_1="${CDROM_SET_1} print/psutils-letter"
-CDROM_SET_1="${CDROM_SET_1} security/sudo"
 if [ "X${PKG_ARCH}" = "Xi386" ]; then
 CDROM_SET_1="${CDROM_SET_1} security/freebsd-update"
 fi
+CDROM_SET_1="${CDROM_SET_1} security/portaudit"
+CDROM_SET_1="${CDROM_SET_1} security/sudo"
 CDROM_SET_1="${CDROM_SET_1} shells/bash2"
 CDROM_SET_1="${CDROM_SET_1} shells/pdksh"
 CDROM_SET_1="${CDROM_SET_1} shells/zsh"
 CDROM_SET_1="${CDROM_SET_1} sysutils/portupgrade"
 CDROM_SET_1="${CDROM_SET_1} www/lynx"
+CDROM_SET_1="${CDROM_SET_1} www/mozilla"
+if [ "X${PKG_ARCH}" = "Xi386" ]; then
+CDROM_SET_1="${CDROM_SET_1} www/opera"
+fi
+CDROM_SET_1="${CDROM_SET_1} x11/rxvt"

 # VERY common build dependencies
 CDROM_SET_1="${CDROM_SET_1} archivers/unzip"
@@ -153,11 +168,9 @@ fi

 ## Start of set for CDROM #3
 CDROM_SET_3="${CDROM_SET_3} editors/xemacs21"
-CDROM_SET_3="${CDROM_SET_3} graphics/gimp1"
 CDROM_SET_3="${CDROM_SET_3} lang/gnat"
-CDROM_SET_3="${CDROM_SET_3} net/cvsup-without-gui"
+CDROM_SET_3="${CDROM_SET_3} net/cvsup"
 CDROM_SET_3="${CDROM_SET_3} print/teTeX"
-CDROM_SET_3="${CDROM_SET_3} security/portaudit"
 CDROM_SET_3="${CDROM_SET_3} textproc/docproj-jadetex"

 ## End of set for CDROM #3
@@ -78,6 +78,7 @@ static struct _devname {
    { DEVICE_TYPE_DISK, 	"mlxd%d",	"Mylex RAID disk",	131, 65538, 8, 4			},
    { DEVICE_TYPE_DISK, 	"amrd%d",	"AMI MegaRAID drive",	133, 65538, 8, 4			},
    { DEVICE_TYPE_DISK, 	"idad%d",	"Compaq RAID array",	109, 65538, 8, 4			},
+    { DEVICE_TYPE_DISK, 	"ipsd%d",	"IBM ServeRAID array",	176, 65538, 8, 4			},
    { DEVICE_TYPE_DISK, 	"twed%d",	"3ware ATA RAID array",	147, 65538, 8, 4			},
    { DEVICE_TYPE_DISK, 	"aacd%d",	"Adaptec FSA RAID array", 151, 65538, 8, 4			},
    { DEVICE_TYPE_FLOPPY,	"fd%d",		"floppy drive unit A",	9, 0, 64, 4				},
@@ -81,6 +81,7 @@ static char *descrs[] = {
    "accessibility", "Ports to help disabled users.",
    "afterstep", "Ports to support the AfterStep window manager.",
    "applications", "User application software.",
+    "arabic", "Ported software for Arab countries.",
    "archivers", "Utilities for archiving and unarchiving data.",
    "astro", "Applications related to astronomy.",
    "audio", "Audio utilities - most require a supported sound card.",
@@ -93,6 +94,7 @@ static char *descrs[] = {
    "databases", "Database software.",
    "deskutils", "Various Desktop utilities.",
    "devel", "Software development utilities and libraries.",
+    "dns", "Domain Name Service tools.",
    "documentation", "Document preparation utilities.",
    "editors", "Common text editors.",
    "elisp", "Things related to Emacs Lisp.",
@@ -123,6 +125,7 @@ static char *descrs[] = {
    "misc", "Miscellaneous utilities.",
    "multimedia", "Multimedia software.",
    "net", "Networking utilities.",
+    "net-mgmt", "Network Management",
    "news", "USENET News support software.",
    "numeric", "Mathematical computation software.",
    "offix", "An office automation suite of sorts.",
@@ -133,6 +136,7 @@ static char *descrs[] = {
    "picobsd", "Ports to support PicoBSD.",
    "pilot", "Software support for the 3Com Palm Pilot(tm) series.",
    "plan9", "Software from the Plan9 operating system.",
+    "polish", "Ported software for the Polish market.",
    "portuguese", "Ported software for the Portuguese market.",
    "print", "Utilities for dealing with printing.",
    "printing", "Utilities for dealing with printing.",
@@ -141,6 +145,7 @@ static char *descrs[] = {
    "ruby", "Software related to the Ruby language.",
    "russian", "Ported software for the Russian market.",
    "science", "Scientific software.",
+    "scheme", "Software related to the Scheme language.",
    "security", "System security software.",
    "shells", "Various shells (tcsh, bash, etc).",
    "sysutils", "Various system utilities.",
@@ -150,6 +155,7 @@ static char *descrs[] = {
    "tcl81", "TCL v8.1 and packages that depend on it.",
    "tcl82", "TCL v8.2 and packages that depend on it.",
    "tcl83", "TCL v8.3 and packages that depend on it.",
+    "tcl84", "TCL v8.4 and packages that depend on it.",
    "textproc", "Text processing/search utilities.",
    "tk41", "Tk4.1 and packages that depend on it.",
    "tk42", "Tk4.2 and packages that depend on it.",
@@ -168,6 +174,7 @@ static char *descrs[] = {
    "x11-fm", "X Window System based file managers.",
    "x11-fonts", "X Window System fonts and font utilities.",
    "x11-servers", "X Window System servers.",
+    "x11-themes", "X Window System themes.",
    "x11-toolkits", "X Window System based development toolkits.",
    "x11-wm", "X Window System window managers.",
    "zope", "Software related to the Zope platform.",
@@ -512,6 +512,8 @@ DMenu MenuMediaFTP = {
 	VAR_FTP_PATH "=ftp://ftp.au.freebsd.org" },
      { " Australia #2","ftp2.au.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp2.au.freebsd.org" },
+      { " Australia #3","ftp3.au.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp3.au.freebsd.org" },

      { "Austria","ftp.at.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.at.freebsd.org" },
@@ -535,6 +537,8 @@ DMenu MenuMediaFTP = {

      { "Canada",	"ftp.ca.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.ca.freebsd.org" },
+      { " Canada #2",	"ftp2.ca.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp2.ca.freebsd.org" },

      { "China",	"ftp.cn.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.cn.freebsd.org" },
@@ -568,6 +572,8 @@ DMenu MenuMediaFTP = {
 	VAR_FTP_PATH "=ftp://ftp5.fr.freebsd.org" },
      { " France #6",	"ftp6.fr.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp6.fr.freebsd.org" },
+      { " France #7",	"ftp7.fr.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp7.fr.freebsd.org" },
      { " France #8",	"ftp8.fr.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp8.fr.freebsd.org" },

@@ -585,6 +591,8 @@ DMenu MenuMediaFTP = {
 	VAR_FTP_PATH "=ftp://ftp6.de.freebsd.org" },
      { " Germany #7",	"ftp7.de.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp7.de.freebsd.org" },
+      { " Germany #8",	"ftp8.de.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp8.de.freebsd.org" },

      { "Greece",	"ftp.gr.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.gr.freebsd.org" },
@@ -600,6 +608,9 @@ DMenu MenuMediaFTP = {
      { "Iceland",	"ftp.is.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.is.freebsd.org" },

+      { "Indonesia",	"ftp.id.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp.id.freebsd.org" },
+
      { "Ireland",	"ftp.ie.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.ie.freebsd.org" },
      { " Ireland #2",	"ftp2.ie.freebsd.org", NULL, dmenuSetVariable, NULL,
@@ -722,10 +733,28 @@ DMenu MenuMediaFTP = {
 	VAR_FTP_PATH "=ftp://ftp3.tw.freebsd.org" },
      { " Taiwan #4",   "ftp4.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp4.tw.freebsd.org" },
+      { " Taiwan #5",   "ftp5.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp5.tw.freebsd.org" },
      { " Taiwan #6",   "ftp6.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp6.tw.freebsd.org" },
+      { " Taiwan #7",   "ftp7.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp7.tw.freebsd.org" },
+      { " Taiwan #8",   "ftp8.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp8.tw.freebsd.org" },
+      { " Taiwan #9",   "ftp9.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp9.tw.freebsd.org" },
+      { " Taiwan #10",  "ftp10.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp10.tw.freebsd.org" },
      { " Taiwan #11",   "ftp11.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp11.tw.freebsd.org" },
+      { " Taiwan #12",   "ftp12.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp12.tw.freebsd.org" },
+      { " Taiwan #13",   "ftp13.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp13.tw.freebsd.org" },
+      { " Taiwan #14",   "ftp14.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp14.tw.freebsd.org" },
+      { " Taiwan #15",   "ftp15.tw.freebsd.org", NULL, dmenuSetVariable, NULL,
+	VAR_FTP_PATH "=ftp://ftp15.tw.freebsd.org" },

      { "Turkey",	"ftp.tr.freebsd.org", NULL, dmenuSetVariable, NULL,
 	VAR_FTP_PATH "=ftp://ftp.tr.freebsd.org" },
@@ -96,7 +96,7 @@ was configured to use an interrupt that was not registered in the
 BIOS for use with the ISA bus.
 .It Fl x
 Print full channel statistics.
-This options prints additinal counters,
+This options prints additional counters,
 but with less precision than with the
 .Fl s
 option.
@@ -165,7 +165,7 @@ This is the channel name for the Tau32-PCI family of Cronyx adapters.
 .It Ar value
 A non-zero value will set the data rate to a given value
 in asynchronous mode,
-and will set the date rate and internal clock source of synchronization
+and will set the data rate and internal clock source of synchronization
 in synchronous mode.
 A zero value is equivalent to specifying the
 .Cm extclock
@@ -327,7 +327,7 @@ Invert the receive clock signals.
 Invert the transmit clock signals.
 .It Sm Cm higain No = Bro Cm on , off Brc Sm
 (E1 only.)
-In of state the sensitivity is -12 dB.
+In off state the sensitivity is -12 dB.
 Turn on/off increasing the E1 receiver's non-linear sensitivity to -30dB.
 This allows increasing of the line distance.
 .It Sm Cm cablen No = Bro Cm on , off Brc Sm
@@ -111,7 +111,6 @@ ports-all
 #ports-net-mgmt
 #ports-news
 #ports-palm
-#ports-picobsd
 #ports-polish
 #ports-portuguese
 #ports-print
@@ -1,7 +1,7 @@
 # $FreeBSD$
 #
 # This file contains all of the "CVSup collections" that make up the
-# FreeBSD-stable source tree.
+# FreeBSD-4.11 source tree.
 #
 # CVSup (CVS Update Protocol) allows you to download the latest CVS
 # tree (or any branch of development therefrom) to your system easily
@@ -51,7 +51,7 @@
 *default host=CHANGE_THIS.FreeBSD.org
 *default base=/usr
 *default prefix=/usr
-*default release=cvs tag=RELENG_4
+*default release=cvs tag=RELENG_4_11
 *default delete use-rel-suffix

 # If your network link is a T1 or faster, comment out the following line.
@@ -348,7 +348,7 @@ l l.
 386 device drivers	Don Ahn, Sean Fagan and Tim Tucker
 HCX device drivers	Harris Corporation
 Kernel enhancements	Robert Elz, Peter Ivanov, Ian Johnstone, Piers Lauder,
-	John Lions, Tim Long, Chris Maltby, Greg Rose and John Wainwright 
+	John Lions, Tim Long, Chris Maltby, Greg Rose and John Wainwright
 ISO-9660 filesystem	Pace Willisson, Atsushi Murai
 .TE
 .TS
@@ -489,7 +489,7 @@ lock(1)	Bob Toxen	yacc(1)	Robert Paul Corbett
 Introduction
 .PP
 The major new facilities available in the 4.4BSD release are
-a new virtual memory system, 
+a new virtual memory system,
 the addition of ISO/OSI networking support,
 a new virtual filesystem interface supporting filesystem stacking,
 a freely redistributable implementation of NFS,
@@ -633,7 +633,7 @@ We have also added a memory-based filesystem that runs in
 pageable memory, allowing large temporary filesystems without
 requiring dedicated physical memory.
 .PP
-The local ``fast filesystem'' has been enhanced to do 
+The local ``fast filesystem'' has been enhanced to do
 clustering which allows large pieces of files to be
 allocated contiguously resulting in near doubling
 of filesystem throughput.
@@ -851,7 +851,7 @@ donating their MICROVAXII port to 4.3BSD.
 Drivers for the MICROVAXII were done by Rick Macklem
 at the University of Guelph.
 Sam Leffler provided valuable assistance and advice with many projects.
-Keith Sklower coordinated with William Nesheim and J. Q. Johnson at Cornell, 
+Keith Sklower coordinated with William Nesheim and J. Q. Johnson at Cornell,
 and Chris Torek and James O'Toole at the University of Maryland
 to do the Xerox Network Systems implementation.
 Robert Elz at the University of Melbourne contributed greatly
@@ -865,7 +865,7 @@ and had time left to write rdist.
 George Goble was invaluable in shaking out the bugs on his
 production systems long before we were confident enough to
 inflict it on our users.
-Bill Shannon at Sun Microsystems has been helpful in 
+Bill Shannon at Sun Microsystems has been helpful in
 providing us with bug fixes and improvements.
 Tom Ferrin, in his capacity as Board Member of Usenix Association,
 handled the logistics of large-scale reproduction
@@ -877,8 +877,8 @@ an ever increasing mail, news, and uucp load.
 .LP
 Numerous others contributed their time and energy in creating
 the user contributed software for the release.
-As always, we are grateful to the UNIX user community for 
-encouragement and support. 
+As always, we are grateful to the UNIX user community for
+encouragement and support.
 .LP
 Once again, the financial support of the Defense Advanced Research
 Projects Agency is gratefully acknowledged.
@@ -921,8 +921,8 @@ to support formatting of non-DEC peripherals.
 Numerous others contributed their time and energy in organizing
 the user software for release, while many groups of people on
 campus suffered patiently through the low spots of development.
-As always, we are grateful to the UNIX user community for 
-encouragement and support. 
+As always, we are grateful to the UNIX user community for
+encouragement and support.
 .LP
 Once again, the financial support of the Defense Advanced Research
 Projects Agency is gratefully acknowledged.
@@ -1040,7 +1040,7 @@ Special thanks to Bill Munson of DEC who helped by augmenting
 our computing facility
 and to Eric Allman for carefully proofreading the
 ``last'' draft of the manual and finding the bugs which we knew were
-there but couldn't see. 
+there but couldn't see.
 .LP
 We dedicate this to the memory of David Sakrison, late chairman of our
 department, who gave his support to the establishment of our VAX
@@ -1142,7 +1142,7 @@ D. A. Nowitz,
 L. Wehr,
 and
 P. J. Weinberger.
-We appreciate also 
+We appreciate also
 the effective advice and criticism of
 T. A. Dolotta,
 A. G. Fraser,
@@ -1275,7 +1275,7 @@ to keep them from contaminating
 the more staid information of URM section 1.
 .LP
 Miscellaneous collection of information necessary for
-writing in various specialized languages such as character codes, 
+writing in various specialized languages such as character codes,
 macro packages for typesetting, etc is contained in URM section 7.
 .LP
 System calls are entries into the BSD kernel.
@@ -1316,7 +1316,7 @@ The name of the entry is in the upper corners of its pages,
 together with the section number.
 Entries within each section are alphabetized.
 The page numbers of each entry start at 1;
-it is infeasible to number consecutively the pages of 
+it is infeasible to number consecutively the pages of
 a document like this that is republished in many variant forms.
 .LP
 All entries are based on a common format;
@@ -1394,7 +1394,7 @@ See ``\s-1UNIX\s+1 for Beginners'' in (USD:1) for a
 more complete introduction to the system.
 .LP
 .I
-Logging in.\ \ 
+Logging in.\ \
 .R
 Almost any ASCII terminal capable of
 full duplex operation and generating
@@ -1455,7 +1455,7 @@ discusses the login sequence in more detail, and
 discusses terminal I/O.
 .LP
 .I
-Logging out.\ \ 
+Logging out.\ \
 .R
 There are three ways to log out:
 .IP
@@ -1473,7 +1473,7 @@ lack the necessary hardware to detect that the phone has been hung up.
 Ask your system administrator if this is a problem on your machine.
 .LP
 .I
-How to communicate through your terminal.\ \ 
+How to communicate through your terminal.\ \
 .R
 When you type characters, a gnome deep in the system
 gathers your characters and saves them in a secret place.
@@ -1571,7 +1571,7 @@ command can be used to change these defaults.
 can be used to set the tab stops automatically when necessary.
 .LP
 .I
-How to run a program; the shells.\ \ 
+How to run a program; the shells.\ \
 .R
 When you have successfully logged in, a program
 called a shell is listening to your terminal.
@@ -1587,7 +1587,7 @@ commands except that they are kept in a directory where the shell can find them.
 The command name is always the first word on an input line;
 it and its arguments are separated from one another by spaces.
 .LP
-When a program terminates, the shell will ordinarily regain control and type 
+When a program terminates, the shell will ordinarily regain control and type
 a prompt at you to show that it is ready for another command.
 .LP
 The shells have many other capabilities, that are described in detail in
@@ -1620,7 +1620,7 @@ You can change from one shell to the other by using the
 command, which takes effect at your next login.
 .LP
 .I
-The current directory.\ \ 
+The current directory.\ \
 .R
 \s-1UNIX\s+1 has a file system arranged as a hierarchy of directories.
 When the system administrator gave you a user name,
@@ -1639,7 +1639,7 @@ were endowed with at login) use
 .IR cd (1).
 .LP
 .I
-Path names.\ \ 
+Path names.\ \
 .R
 To refer to files not in the current directory, you must use a path name.
 Full path names begin with ``/\|'', the name of the root directory of the
@@ -1676,7 +1676,7 @@ Important commands that modify the contents of files are
 and
 .IR rm (1),
 which respectively copy, move (i.e. rename) and remove files.
-To find out the status of files or directories, use 
+To find out the status of files or directories, use
 .IR ls (1).
 See
 .IR mkdir (1)
@@ -1692,7 +1692,7 @@ that discusses system calls, even if you do not intend
 to deal with the system at that level.
 .LP
 .I
-Writing a program.\ \ 
+Writing a program.\ \
 .R
 To enter the text of a source program into a \s-1UNIX\s+1 file,
 use the standard display editor
@@ -1729,7 +1729,7 @@ or for a more terse description
 .IR execve (2).
 .LP
 .I
-Text processing.\ \ 
+Text processing.\ \
 .R
 Almost all text is entered through an editor such as
 .IR vi (1),
@@ -1761,7 +1761,7 @@ and
 .IR Groff (1)
 converts documents to postscript for output to a
 Laserwriter or Phototypesetter.
-It is similar to 
+It is similar to
 .IR nroff (1),
 and often works from exactly the same source text.
 It was used to produce this manual.
@@ -1773,7 +1773,7 @@ It provides the advantages of a hard-copy terminal
 even when using a display terminal.
 .LP
 .I
-Status inquiries.\ \ 
+Status inquiries.\ \
 .R
 Various commands exist to provide you with useful information.
 .IR w (1)
@@ -1785,7 +1785,7 @@ will list the files in your directory or give
 summary information about particular files.
 .LP
 .I
-Surprises.\ \ 
+Surprises.\ \
 .R
 Certain commands provide inter-user communication.
 Even if you do not plan to use them, it would be
@@ -77,6 +77,7 @@ MAN=	aac.4 \
 	ip.4 \
 	ip6.4 \
 	ipfirewall.4 \
+	ips.4 \
 	ipsec.4 \
 	isp.4 \
 	ispfw.4 \
@@ -97,6 +98,7 @@ MAN=	aac.4 \
 	mlx.4 \
 	mly.4 \
 	mouse.4 \
+	mpt.4 \
 	mtio.4 \
 	multicast.4 \
 	my.4 \
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
-.Dd February 22, 2001
+.Dd January 4, 2005
 .Dt AAC 4
 .Os
 .Sh NAME
@@ -37,8 +37,8 @@
 .Sh DESCRIPTION
 The
 .Nm
-driver provides support for the Adaptec AAC family SCSI Ultra2 and Ultra160
-RAID controllers.
+driver provides support for the Adaptec AAC family SATA, SCSI Ultra2
+and Ultra160 RAID controllers.
 These controllers support RAID 0, 1, 5, 10, and volume sets.
 They have four channels in the add-in version
 or 1-2 channels in the motherboard integrated version,
@@ -48,14 +48,14 @@ Supported controllers include:
 .It
 AAC-364
 .It
+Adaptec SATA RAID 2410SA
+.It
+Adaptec SATA RAID 2810SA
+.It
 Adaptec SCSI RAID 2120S
 .It
 Adaptec SCSI RAID 2200S
 .It
-Adaptec SCSI RAID 2410SA
-.It
-Adaptec SCSI RAID 2810SA
-.It
 Adaptec SCSI RAID 5400S
 .It
 Dell CERC SATA RAID 2
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 23, 2000
+.Dd January 4, 2005
 .Dt AMR 4
 .Os
 .Sh NAME
@@ -42,35 +42,35 @@ Supported controllers include:
 .Pp
 .Bl -bullet -compact
 .It
-MegaRAID 320-1
+AMI/LSI MegaRAID 320-1
 .It
-MegaRAID 320-2
+AMI/LSI MegaRAID 320-2
 .It
-MegaRAID Series 418
+AMI MegaRAID Series 418
 .It
-MegaRAID Enterprise 1200 (Series 428)
+AMI MegaRAID Enterprise 1200 (Series 428)
 .It
-MegaRAID Enterprise 1300 (Series 434)
+AMI MegaRAID Enterprise 1300 (Series 434)
 .It
-MegaRAID Enterprise 1400 (Series 438)
+AMI MegaRAID Enterprise 1400 (Series 438)
 .It
-MegaRAID Enterprise 1500 (Series 467)
+AMI MegaRAID Enterprise 1500 (Series 467)
 .It
-MegaRAID Enterprise 1600 (Series 471)
+AMI MegaRAID Enterprise 1600 (Series 471)
 .It
-MegaRAID Elite 1500 (Series 467)
+AMI MegaRAID Elite 1500 (Series 467)
 .It
-MegaRAID Elite 1600 (Series 493)
+AMI MegaRAID Elite 1600 (Series 493)
 .It
-MegaRAID Elite 1650 (Series 4xx)
+AMI MegaRAID Elite 1650 (Series 4xx)
 .It
-MegaRAID Express 100 (Series 466WS)
+AMI MegaRAID Express 100 (Series 466WS)
 .It
-MegaRAID Express 200 (Series 466)
+AMI MegaRAID Express 200 (Series 466)
 .It
-MegaRAID Express 300 (Series 490)
+AMI MegaRAID Express 300 (Series 490)
 .It
-MegaRAID Express 500 (Series 475)
+AMI MegaRAID Express 500 (Series 475)
 .It
 Dell PERC
 .It
@@ -57,7 +57,7 @@ support.
 .Pp
 The PCMCIA Aironet cards require PCCARD support, including the
 kernel
-.Xr pccard 4 
+.Xr pccard 4
 driver support and the
 .Xr pccardd 8
 daemon.
@@ -82,7 +82,7 @@ Some drives may use a non-standard, vendor-specific encoding scheme for
 the timer value.
 In such a case the driver will log a message to that effect
 (timer value is vendor-specific);
-consult the drive's documentation for the value to use in the 
+consult the drive's documentation for the value to use in the
 tunable parameter.
 .El
 .Sh DESCRIPTION
@@ -178,9 +178,9 @@ at a later time when the system is up and running, see
 .Xr atacontrol 8 .
 .Pp
 The driver attempts to set the maximum performance transfer mode on your disk
-drives by selecting the highest possible DMA mode. However the 
+drives by selecting the highest possible DMA mode. However the
 .Nm
-driver sometimes issue the message 
+driver sometimes issue the message
 "DMA limited to UDMA33, non-ATA66 cable or device",
 if the cable is ATA66 (or above) compliant, it is because the other device
 on this channel states it can only accept upto UDMA2/ATA33 signals.
@@ -31,12 +31,12 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 27, 2001
+.Dd December 18, 2004
 .Dt BGE 4
 .Os
 .Sh NAME
 .Nm bge
-.Nd "Broadcom BCM570x PCI gigabit ethernet adapter driver"
+.Nd "Broadcom BCM570x/5721/5750/5751 PCI Gigabit Ethernet adapter driver"
 .Sh SYNOPSIS
 .Cd "device miibus"
 .Cd "device bge"
@@ -44,8 +44,8 @@
 The
 .Nm
 driver provides support for various NICs based on the Broadcom BCM570x
-family of gigabit ethernet controller chips, including the
-following:
+5721, 5750 and 5751 families of Gigabit Ethernet controller chips,
+including the following:
 .Pp
 .Bl -bullet -compact
 .It
@@ -119,7 +119,7 @@ or
 .Cm half-duplex
 modes.
 .It Cm 100baseTX
-Set 100Mbps (fast ethernet) operation.
+Set 100Mbps (Fast Ethernet) operation.
 The
 .Xr ifconfig 8
 .Ic mediaopt
@@ -133,7 +133,7 @@ Set 1000baseTX operation over twisted pair.  Only
 .Cm full-duplex
 mode is supported.
 .It Cm 1000baseSX
-Set 1000Mbps (gigabit ethernet) operation.
+Set 1000Mbps (Gigabit Ethernet) operation.
 Both
 .Cm full-duplex
 and
@@ -178,7 +178,7 @@ of the sysctl variable
 and that some
 .Nm ipfw
 actions such as
-.Nm divert 
+.Nm divert
 do not apply to bridged packets.
 It might be useful to have a rule of the form
 .Pp
@@ -401,7 +401,7 @@ After that, the
 .Nm
 driver defaults to using 6 byte commands (assuming the protocol the drive
 speaks claims to support 6 byte commands), until one fails with a
-.Tn SCSI 
+.Tn SCSI
 ILLEGAL REQUEST error.  Then it tries the 10 byte version of the command to
 see if that works instead.  Users can change the default via per-drive
 sysctl variables and loader tunables.  The variable names are the same in
@@ -409,7 +409,7 @@ both instances:
 .Pp
 .Va kern.cam.cd.%d.minimum_cmd_size
 .Pp
-Where 
+Where
 .Dq %d
 is the unit number of the drive in question.  Valid minimum command sizes
 are 6 and 10.  Any value above 6 will be rounded to 10, and any value below
@@ -42,7 +42,7 @@
 The
 .Nm
 device is a simple console device which just reads from and writes to
-an allocated buffer for input and output respectivly.
+an allocated buffer for input and output respectively.
 It is of no use by itself and it is supposed that the buffer is accessed
 via a bus like
 .Xr firewire 4
@@ -51,17 +51,20 @@ or
 for interaction.
 .Pp
 The buffer consists of 4 channels.
-There are 2 ports, one for the console tty and other is GDB ports then each port
-has an input channel and an output channel.
-.Sh EXAMPLE
+There are 2 ports, one for the console TTY and another is GDB port,
+then each port has an input channel and an output channel.
+.Sh EXAMPLES
 If you want to run
 .Xr getty 8
-on dcons, insert the following line into 
+on
+.Nm ,
+insert the following line into
 .Xr /etc/ttys 5
-and
-send a HUP signal to
+and send a
+.Dv HUP
+signal to
 .Xr init 8
-using 
+using
 .Xr kill 1 .
 .Bd -literal -offset indent
 dcons	"/usr/libexec/getty std.9600"	vt100	on  secure
@@ -70,12 +73,14 @@ dcons	"/usr/libexec/getty std.9600"	vt100	on  secure
 Once the
 .Xr fwochi 4
 device is initialized to allow physical access,
-the buffer can be accessed from another host via a FireWire bus using the
+the buffer can be accessed from another host via a
+.Xr firewire 4
+bus using the
 .Xr dconschat 8
-application. See
+application.
+See
 .Xr dconschat 8
 for more details.
-.Pp
 .Sh FILES
 .Bl -tag -width indent -compact
 .It Pa /dev/dcons
@@ -92,5 +97,6 @@ for more details.
 .Sh AUTHORS
 .An Hidetoshi Shimokawa Aq [email protected]
 .Sh BUGS
-This driver is still under development.
+This driver is
+.Ud .
 .Pp
@@ -36,7 +36,6 @@
 .Cd device dcons_crom
 .Cd device dcons
 .Cd device firewire
-.Pp
 .Sh DESCRIPTION
 The
 .Nm
@@ -46,18 +45,19 @@ through the Configuration ROM of
 .Xr firewire 4 .
 This address is supposed to be used by
 .Xr dconschat 8 .
-.El
 .Sh SEE ALSO
 .Xr dcons 4 ,
 .Xr firewire 4 ,
 .Xr fwohci 4 ,
 .Xr dconschat 8 ,
-.Xr fwcontrol 8 .
+.Xr fwcontrol 8
 .Sh AUTHORS
 .An Hidetoshi Shimokawa Aq [email protected]
 .Sh BUGS
-If you load dcons_crom.ko manually after the system is booted, you may
+If you load
+.Pa dcons_crom.ko
+manually after the system is booted, you may
 have to initiate a bus reset using
-.Dq Nm fwcontrol -r
+.Dq Nm fwcontrol Fl r
 to update the Configuration ROM.
 .Pp
@@ -1,6 +1,6 @@
 .\" Copyright (c) 2001-2004, Intel Corporation
 .\" All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions are met:
 .\"
@@ -31,21 +31,22 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 24, 2004
+.Dd January 5, 2005
 .Dt EM 4
 .Os
 .Sh NAME
 .Nm em
-.Nd "Intel(R) PRO/1000 gigabit Ethernet driver for the FreeBSD operating system"
+.Nd "Intel(R) PRO/1000 Gigabit Ethernet adapter driver"
 .Sh SYNOPSIS
 .Cd "device em"
 .Sh DESCRIPTION
 The
 .Nm
 driver provides support for PCI gigabit Ethernet adapters based on
-the Intel 82540, 82541, 82542, 82543, 82544, 82545, 82546, and 82547 Ethernet 
-controller chips. The driver does not support Transmit/Receive checksum 
-offload and Jumbo Frames on 82542-based adapters. 
+the Intel 82540, 82541, 82541ER, 82542, 82543, 82544, 82545, 82546,
+82546GB and 82547 Ethernet controller chips.
+The driver does not support Transmit/Receive checksum
+offload and Jumbo Frames on 82542-based adapters.
 For a list of supported adapters, see the
 .Pa README
 included with the driver.
@@ -25,7 +25,7 @@
 .\" $FreeBSD$
 .\"
 .\"
-.Dd November 8, 2002
+.Dd December 14, 2004
 .Dt FWE 4
 .Os
 .Sh NAME
@@ -37,13 +37,12 @@
 .Pp
 or
 .Pp
-.Cd "device fwe"
 .Cd "device firewire"
-.Cd "device fwohci"
+.Cd "device fwe"
 .Sh DESCRIPTION
 The
 .Nm
-driver provides non-standard ethernet emulation over FireWire (IEEE 1394).
+driver provides non-standard Ethernet emulation over FireWire (IEEE 1394).
 .Pp
 .Xr firewire 4
 and
@@ -68,7 +67,7 @@ The
 device driver first appeared in
 .Fx 5.0 .
 .Sh BUGS
-This driver emulates ethernet in a very adhoc way and it does not reserve a
+This driver emulates Ethernet in a very adhoc way and it does not reserve a
 stream channel using an isochronous manager.
 Note that this driver uses a protocol which is very different from RFC 2734
 (IPv4 over IEEE 1394).
@@ -37,7 +37,7 @@
 .Os
 .Sh NAME
 .Nm fwohci
-.Nd OHCI firewire chipset device driver
+.Nd OHCI FireWire chipset device driver
 .Sh SYNOPSIS
 .Cd "kldload firewire"
 .Pp
@@ -47,7 +47,7 @@ or
 .Sh DESCRIPTION
 The
 .Nm
-driver provides support for PCI/CardBus firewire interface cards.
+driver provides support for PCI/CardBus FireWire interface cards.
 The driver supports the following IEEE 1394 OHCI chipsets.
 .Pp
 .Bl -item
@@ -25,14 +25,13 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 8, 2004
+.Dd Jan 12, 2005
 .Dt IPS 4
 .Os
 .Sh NAME
 .Nm ips
 .Nd IBM/Adaptec ServeRAID controller driver
 .Sh SYNOPSIS
-.Cd device scbus
 .Cd device ips
 .Sh DESCRIPTION
 The
@@ -59,7 +58,7 @@ In some cases, the
 driver can have difficulties attaching during
 the system initialization period.
 To avoid these difficulties, set the
-.Va hw.ips.0.disable
+.Va hw.ips.0.disabled
 tunable to 1.
 It will prevent the driver from attaching.
 .Sh HARDWARE
@@ -1,6 +1,6 @@
 .\" Copyright (c) 2001-2004, Intel Corporation
 .\" All rights reserved.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions are met:
 .\"
@@ -35,7 +35,7 @@
 .Dt IXGB 4
 .Os
 .Sh NAME
-.Nm ixgb 
+.Nm ixgb
 .Nd "Intel(R) PRO/10GbE Ethernet driver for the FreeBSD operating system"
 .Sh SYNOPSIS
 .Cd "device ixgb"
@@ -98,7 +98,9 @@ issue to
 The
 .Nm
 device driver first appeared in
-.Fx 4.8 .
+.Fx 4.11
+and
+.Fx 5.3 .
 .Sh AUTHORS
 The
 .Nm
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 26, 2003 
+.Dd August 26, 2003
 .Dt ARL 4 i386
 .Os
 .Sh NAME
@@ -41,18 +41,18 @@
 .Sh DESCRIPTION
 The
 .Nm
-driver provides support for Aironet Arlan 655 
+driver provides support for Aironet Arlan 655
 wireless network adapters.
 The Arlan 655 series adapters operate at 354kbps, 512kbps, 1Mbps and 2Mbps.
 .Pp
-The Aironet Arlan 655 devices support Aironet TMA, Aironet Non-TMA 
+The Aironet Arlan 655 devices support Aironet TMA, Aironet Non-TMA
 and PSP operating modes.
 .Pp
 By default, the
 .Nm
 driver configures the Aironet Arlan 655 card for TMA operation.
 .Pp
-To set up Radio Network parameters, use 
+To set up Radio Network parameters, use
 .Xr arlcontrol 8 .
 .Sh SEE ALSO
 .Xr arp 4 ,
@@ -69,12 +69,12 @@ you must use a 4-byte even hexadecimal digit value and it must start with
 .Pp
 You can change
 .Ar channel
-for current 
+for current
 .Ar country
 only through
-.Xr ifconfig 8 . 
+.Xr ifconfig 8 .
 You must use
-.Xr arlcontrol 8 
+.Xr arlcontrol 8
 for changing
 .Ar country .
 .Pp
@@ -90,10 +90,10 @@ The
 .Nm
 driver was initially written by
 .An Ivan Sharov Aq [email protected] .
-.Aq [email protected] 
+.Aq [email protected]
 wrote the arlcontrol utility and added ioctl support to the driver.
 .An Stanislav Svirid Aq [email protected]
-ported this driver to the new ISA architecture, merged some al driver changes, 
+ported this driver to the new ISA architecture, merged some al driver changes,
 fixed some bugs and made it a module.
 .An Yuri Kurenkov Aq [email protected]
 wrote this manpage.
@@ -37,7 +37,7 @@ For most PC-9801-55, -92 and compatibles:
 .Cd "device ct0 at isa?"
 .Pp
 For ELECOM bus-master
-.Tn SCSI 
+.Tn SCSI
 adapters:
 .Cd "device ct0 at isa? flags=0x30000"
 .Pp
@@ -57,50 +57,50 @@ For adapters with SMIT transfer mode to enable SMIT transfer:
 meaning:
 .Bl -tag -offset indent -compact -width 0x000000
 .It 0x00000
-DMA transfer mode for an NEC PC-9801-55, -92 (or 
-compatibles), ICM IF-2660, Midori-Denshi MDC-554NA, or 
+DMA transfer mode for an NEC PC-9801-55, -92 (or
+compatibles), ICM IF-2660, Midori-Denshi MDC-554NA, or
 Logitec LHA-N151
 .It 0x10000
 DMA transfer mode for an I-O DATA SC-98II
 .It 0x20000
-bus-master transfer mode for a TEXA HA-55BS2, its 
+bus-master transfer mode for a TEXA HA-55BS2, its
 successors, or Midori-Denshi MDC-926R
 .It 0x30000
-bus-master transfer mode for an ELECOM bus-master SCSI 
+bus-master transfer mode for an ELECOM bus-master SCSI
 adapter
 .It 0x40000
 SMIT transfer mode (for supported adapters only)
 .It 0x50000
-bus-master transfer mode for a Logitec LHA-20x series, 
+bus-master transfer mode for a Logitec LHA-20x series,
 ICM IF-2766, IF-2766ET, IF-2767 or IF-2769
 .Sh DESCRIPTION
 The
 .Nm
-driver provides access to the 
-.Tn SCSI 
+driver provides access to the
+.Tn SCSI
 bus connected to a WD33C93[ABC] based host adapter.
 The following adapters are supported:
 .Pp
 .Bl -bullet -compact
 .It
-NEC PC-9801-55, 92 and compatibles, 
+NEC PC-9801-55, 92 and compatibles,
 .It
-ELECOM bus-master 
-.Tn SCSI 
-adapters, 
+ELECOM bus-master
+.Tn SCSI
+adapters,
 .It
-I-O DATA SC-98II, 
+I-O DATA SC-98II,
 .It
-ICM IF-2660, IF-2766, IF-2766ET, IF-2767 and IF-2769, 
+ICM IF-2660, IF-2766, IF-2766ET, IF-2767 and IF-2769,
 .It
-Logitec LHA-N151 and LHA-20x series, 
+Logitec LHA-N151 and LHA-20x series,
 .It
-Midori-Denshi MDC-554NA and MDC-926R, 
+Midori-Denshi MDC-554NA and MDC-926R,
 .It
-TEXA HA-55BS2 and its later models, and 
+TEXA HA-55BS2 and its later models, and
 .It
-SMIT transfer type 
-.Tn SCSI 
+SMIT transfer type
+.Tn SCSI
 host adapters.
 .El
 .Sh SEE ALSO
@@ -133,6 +133,6 @@ driver was written by
 .Pp
 This manual page was written by
 .An -nosplit
-.An Noriaki MITSUNAGA Aq [email protected] 
+.An Noriaki MITSUNAGA Aq [email protected]
 and
 .An Hideyuki KURASHINA Aq [email protected] .
@@ -1,5 +1,5 @@
 .\" Written by Denis I. Timofeev, 2002.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -8,7 +8,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.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -182,7 +182,7 @@ The
 contains the maximum rate (in bits/s) of the multicast data packets forwarded
 on that vif.
 Value of 0 means no limit.
-The 
+The
 .Dq vif_local_address
 contains the local IP address of the corresponding local interface.
 The
@@ -393,7 +393,7 @@ to preserve backward compatibility (binary and API),
 and at the same time to allow user-level processes to take advantage of
 the new features (if the kernel supports them).
 .Pp
-One of the mechanisms that allows us to preserve the backward 
+One of the mechanisms that allows us to preserve the backward
 compatibility is a sort of negotiation
 between the user-level process and the kernel:
 .Bl -enum
@@ -707,7 +707,7 @@ the following:
 *
 * Measurement works as follows:
 *
- * For >= measurements: 
+ * For >= measurements:
 * The first packet marks the start of a measurement interval.
 * During an interval we count packets and bytes, and when we
 * pass the threshold we deliver an upcall and we are done.
@@ -860,7 +860,7 @@ indicate the particular measured values.
 However, because of the way
 the particular intervals are measured, the user should be careful how
 bu_measured.b_time is used.
-For example, if the 
+For example, if the
 filter is installed to trigger an upcall if the number of packets
 is >= 1, then
 .Dq bu_measured
@@ -1,11 +1,11 @@
 .\" Copyright (c) 2001-2002 Packet Design, LLC.
 .\" All rights reserved.
-.\" 
+.\"
 .\" Subject to the following obligations and disclaimer of warranty,
 .\" use and redistribution of this software, in source or object code
 .\" forms, with or without modifications are expressly permitted by
 .\" Packet Design; provided, however, that:
-.\" 
+.\"
 .\"    (i)  Any and all reproductions of the source or object code
 .\"         must include the copyright notice above and the following
 .\"         disclaimer of warranties; and
@@ -13,7 +13,7 @@
 .\"         Packet Design trademarks, including the mark "PACKET DESIGN"
 .\"         on advertising, endorsements, or otherwise except as such
 .\"         appears in the above copyright notice or in the software.
-.\" 
+.\"
 .\" THIS SOFTWARE IS BEING PROVIDED BY PACKET DESIGN "AS IS", AND
 .\" TO THE MAXIMUM EXTENT PERMITTED BY LAW, PACKET DESIGN MAKES NO
 .\" REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING
@@ -36,11 +36,11 @@
 .Sh DESCRIPTION
 The
 .Nm
-driver provides access to the 
+driver provides access to the
 .Tn SCSI
-bus connected to a PC-Card 
+bus connected to a PC-Card
 .Tn SCSI
-host adapter based on a Ninja SCSI-3 controller by Workbit. 
+host adapter based on a Ninja SCSI-3 controller by Workbit.
 The following adapters are known to work:
 .Pp
 .Bl -bullet -compact
@@ -37,8 +37,8 @@ Include this line in the kernel config file:
 .Pp
 .Sh DESCRIPTION
 This driver is for the Promise Supertrak SX6000 ATA hardware RAID controller.
-It supports (in hardware) RAID levels 0, 1, 0+1, 3, 5 and JBOD on up to 
-6 ATA disk drives, including automatic rebuild and hotswap, and supports 
+It supports (in hardware) RAID levels 0, 1, 0+1, 3, 5 and JBOD on up to
+6 ATA disk drives, including automatic rebuild and hotswap, and supports
 signalling disk status on LED's on Promise Superswap disk enclosures.
 The Supertrak lines of controllers does not support non-disk devices.
 .Pp
@@ -40,7 +40,7 @@ This driver acts as a shim to connect pci serial ports to the
 .Xr sio 4
 driver.
 .Pp
-The list of supported devices is in 
+The list of supported devices is in
 .Em src/sys/dev/puc/pucdata.c.
 Support for new cards should be added there.
 .Pp
@@ -1,5 +1,5 @@
 .\" Written by Denis I. Timofeev, 2003.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -8,7 +8,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.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -59,7 +59,7 @@ MELCO IFC-SC
 RATOC REX-5536, REX-5536AM, REX-5536M, REX-9836A
 .El
 .Pp
-Note that the Adaptec 2920C is supported by the 
+Note that the Adaptec 2920C is supported by the
 .Sy ahc
 driver.
 .Sh SEE ALSO
@@ -343,7 +343,7 @@ Enable
 .Tn TCP
 bandwidth delay product limiting.  An attempt will be made to calculate
 the bandwidth delay product for each individual TCP connection and limit
-the amount of inflight data being transmitted to avoid building up 
+the amount of inflight data being transmitted to avoid building up
 unnecessary packets in the network.  This option is recommended if you
 are serving a lot of data over connections with high bandwidth-delay
 products, such as modems, GigE links, and fast long-haul WANs, and/or
@@ -371,7 +371,7 @@ network while still being able to specify huge internal TCP buffers.
 .It tcp.inflight_stab
 The bandwidth delay product algorithm requires a slightly larger window
 then it otherwise calculates for stability.  This parameter determines the
-extra window in maximal packets / 10.  The default value of 20 represents 
+extra window in maximal packets / 10.  The default value of 20 represents
 2 maximal packets.  Reducing this value is not recommended but you may
 come across a situation with very slow links where the ping time
 reduction of the default inflight code is not sufficient.  If this case
@@ -12,11 +12,6 @@
 .\" 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 Jason L. Wright
-.\" 4. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -36,7 +36,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 21, 2001
+.Dd January 12, 2005
 .Dt UPLCOM 4
 .Os
 .Sh NAME
@@ -62,6 +62,8 @@ ELECOM UC-SGT
 .It
 HAL Corporation Crossam2+USB IR commander
 .It
+Hama USB RS-232 Serial Adapter
+.It
 IOGEAR UC-232A
 .It
 I/O DATA USB-RSAQ
@@ -32,7 +32,7 @@
 .Nm kernel.conf
 .Nd configuration for legacy devices
 .Sh DESCRIPTION
-The 
+The
 .Nm
 file contains configuration entries created by the USERCONFIG mechanism.
 This is typically used to force I/O port, memory and IRQ settings for
@@ -1807,7 +1807,7 @@ daemon at boot time.
 .It Va usbd_flags
 .Pq Vt str
 If
-.Va usbd_enable 
+.Va usbd_enable
 is set to
 .Dq Li YES ,
 these are the flags passed to the
@@ -39,7 +39,7 @@ Create a huge partition called /FreeBSD.
 8-12GB is recommended.
 This partition will contain nearly all the development environment,
 including the CVS tree, broken-out source, and possibly even object files.
-You are going to export this partition to your other machines via a 
+You are going to export this partition to your other machines via a
 READ-ONLY NFS export so do not mix it with other more security-sensitive
 partitions.
 .Pp
@@ -96,7 +96,7 @@ checkout -P
 .Ed
 .Pp
 Now use cvs to checkout a -STABLE source tree and a -CURRENT source tree,
-as well as ports and docs, to create your initial source environment. 
+as well as ports and docs, to create your initial source environment.
 Keeping the broken-out source and ports in /FreeBSD allows you to export
 it to other machines via read-only NFS.
 This also means you only need to edit/maintain files in one place and all
@@ -139,7 +139,7 @@ ln -s /FreeBSD/obj obj
 .Ed
 .Pp
 Alternatively you may chose simply to leave /usr/obj in /usr.  If your
-/usr is large enough this will work, but I do not recommend it for 
+/usr is large enough this will work, but I do not recommend it for
 safety reasons (/usr/obj is constantly being modified, /usr is not).
 .Pp
 Note that exporting /usr/obj via read-only NFS to your other boxes will
@@ -262,7 +262,7 @@ make buildkernel KERNCONF=KERNELNAME
 .Pp
 .Sy WARNING!
 If you are familiar with the old config/cd/make method of building
-a -STABLE kernel, note that the config method will put the build 
+a -STABLE kernel, note that the config method will put the build
 environment in /usr/src/sys/compile/KERNELNAME instead of in /usr/obj.
 .Pp
 Building a -CURRENT kernel
@@ -376,7 +376,7 @@ Many developers choose to maintain a local branch of
 to test patches or build a custom distribution.
 This can be done with CVS or another source code management system
 (SubVersion, Perforce, BitKeeper) with its own repository.
-Since the main 
+Since the main
 .Fx
 tree is based on CVS, the former is convenient.
 .Pp
@@ -62,7 +62,7 @@ a firewall in the sample firewall section below.
 .Sh IPFW KERNEL CONFIGURATION
 You do not need to create a customer kernel to use the IP firewalling features.
 If you enable firewalling in your
-.Em /etc/rc.conf 
+.Em /etc/rc.conf
 (see below), the ipfw kernel module will be loaded automatically.  However,
 if you are paranoid you can compile IPFW directly into the
 .Fx
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 18, 2004
+.Dd December 17, 2004
 .Dt PORTS 7
 .Os
 .Sh NAME
@@ -118,9 +118,9 @@ listed in
 and
 .Va PATCH_SITES .
 See
-.Va FETCH_CMD
+.Va FETCH_CMD , MASTER_SITE_OVERRIDE
 and
-.Va MASTER_SITE_OVERRIDE .
+.Va MASTER_SITE_BACKUP .
 .It Cm checksum
 Verify that the fetched distfile's checksum matches the one the port was
 tested against.
@@ -380,6 +380,26 @@ If set, go to the master
 site for all files.
 .It Va MASTER_SITE_OVERRIDE
 Try going to these sites for all files and patches, first.
+.It Va MASTER_SITE_BACKUP
+Try going to these sites for all files and patches, last.
+.It Va MASTER_SITE_INDEX
+Where to get
+.Pa INDEX
+source built on
+.Fx
+cluster (for
+.Cm fetchindex
+target).
+Defaults to
+.Pa http://www.FreeBSD.org/ports/ .
+.It Va FETCHINDEX
+Command to get
+.Pa INDEX
+(for
+.Cm fetchindex
+target).
+Defaults to
+.Dq Nm fetch Fl am .
 .It Va NOCLEANDEPENDS
 If defined, do not let
 .Cm clean
@@ -565,11 +565,11 @@ effect data reception (downloading).
 Adjusting
 .Va net.inet.tcp.inflight_stab
 is not recommended.
-This parameter defaults to 20, representing 2 maximal packets added   
+This parameter defaults to 20, representing 2 maximal packets added
 to the bandwidth delay product window calculation.  The additional
 window is required to stabilize the algorithm and improve responsiveness
 to changing conditions, but it can also result in higher ping times
-over slow links (though still much lower then you would get without 
+over slow links (though still much lower then you would get without
 the inflight algorithm).  In such cases you may
 wish to try reducing this parameter to 15, 10, or 5, and you may also
 have to reduce
@@ -581,7 +581,7 @@ The
 .Va net.inet.ip.portrange.*
 sysctls control the port number ranges automatically bound to TCP and UDP
 sockets.  There are three ranges:  A low range, a default range, and a
-high range, selectable via an IP_PORTRANGE setsockopt() call.  Most 
+high range, selectable via an IP_PORTRANGE setsockopt() call.  Most
 network programs use the default range which is controlled by
 .Va net.inet.ip.portrange.first
 and
@@ -81,7 +81,7 @@ loaded using TFTP or NFS.
 In phase 3, the kernel again uses DHCP or BOOTP to acquire
 configuration information, and proceeds to mount the
 root filesystem and start operation.  The boot
-scripts recognize a diskless startup and peform 
+scripts recognize a diskless startup and peform
 the actions found in
 .Pa /etc/rc.d/initdiskless
 and
@@ -154,7 +154,7 @@ A properly initialized root partition.
 The script
 .Pa /usr/share/examples/diskless/clone_root
 can help in creating it, using the server's root partition
-as a reference.  If you are just starting out you should 
+as a reference.  If you are just starting out you should
 simply use the server's own root directory,
 .Pa / ,
 and not try to clone it.
@@ -87,7 +87,7 @@ are two prominent examples of protocols where you generally only want to
 send 10 byte commands.)  Then, if it gets an ILLEGAL REQUEST error back
 from a 6 byte MODE SENSE or MODE SELECT command, it attempts to send the 10
 byte version of the command instead.  The only reason you would need a
-quirk is if your drive uses a protocol (e.g. 
+quirk is if your drive uses a protocol (e.g.
 .Tn SCSI )
 that typically doesn't have a problem with 6 byte commands.
 .El
@@ -152,7 +152,7 @@ rather then block.
 Note that
 .Dv M_WAITOK
 is defined to be 0, meaning that blocking operation is the default.
-Also note that 
+Also note that
 .Dv M_NOWAIT
 is required when running in an interrupt context.
 .It Dv M_ASLEEP
@@ -232,7 +232,7 @@ MALLOC(buf, struct foo_buf *, sizeof *buf, M_FOOBUF, M_NOWAIT);
 .Fn malloc ,
 .Fn realloc ,
 and
-.Fn reallocf 
+.Fn reallocf
 return a kernel virtual address that is suitably aligned for storage of
 any type of object, or
 .Dv NULL
@@ -517,12 +517,18 @@ identifycpu(void)
 		"EV3",			/* 1 */
 		"EV4 (21064)",		/* 2 */
 		"Simulation",		/* 3 */
-		"LCA Family",		/* 4 */
+		"LCA (21066/21068)",	/* 4 */
 		"EV5 (21164)",		/* 5 */
 		"EV45 (21064A)",	/* 6 */
 		"EV56 (21164A)",	/* 7 */
 		"EV6 (21264)",		/* 8 */
-		"PCA56 (21164PC)"	/* 9 */
+		"PCA56 (21164PC)",	/* 9 */
+		"PCA57 (21164PC)",	/* 10 */
+		"EV67 (21264A)",	/* 11 */
+		"EV68CB (21264C)",	/* 12 */
+		"EV68AL (21264B)",	/* 13 */
+		"EV68CX (21264D)",	/* 14 */
+		"EV7 (21364)"		/* 15 */  
 	};

 	/*
@@ -147,8 +147,8 @@ device		ste		# Sundance ST201 (D-Link DFE-550TX)
 device		tl		# Texas Instruments ThunderLAN
 device		vr		# VIA Rhine, Rhine II
 device		wb		# Winbond W89C840F
-device		wx		# Intel Gigabit Ethernet Card (``Wiseman'')
 device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
+device		em		# Intel PRO/1000 adapter Gigabit Ethernet Card (``Wiseman'')

 # Pseudo devices - the number indicates how many units to allocated.
 pseudo-device	loop		# Network loopback
@@ -342,6 +342,8 @@ dev/dpt/dpt_scsi.c	optional dpt
 dev/dpt/dpt_eisa.c	optional dpt eisa
 dev/dpt/dpt_pci.c	optional dpt pci
 dev/ed/if_ed_pci.c	optional ed pci
+dev/em/if_em.c		optional em
+dev/em/if_em_hw.c	optional em
 dev/ep/if_ep.c		optional ep
 dev/ep/if_ep_isa.c	optional ep isa
 dev/ep/if_ep_eisa.c	optional ep eisa
@@ -394,6 +396,11 @@ dev/ida/ida.c		optional ida
 dev/ida/ida_disk.c	optional ida
 dev/ida/ida_eisa.c	optional ida eisa
 dev/ida/ida_pci.c	optional ida pci
+dev/ips/ips.c		optional ips
+dev/ips/ips_pci.c	optional ips pci
+dev/ips/ips_disk.c	optional ips
+dev/ips/ips_commands.c	optional ips
+dev/ips/ips_ioctl.c	optional ips
 dev/isp/isp_freebsd.c	optional isp
 dev/isp/isp.c		optional isp
 dev/isp/isp_pci.c	optional isp
@@ -107,8 +107,6 @@ dev/ed/if_ed.c			optional	ed
 dev/ed/if_ed_isa.c		optional	ed isa
 dev/ed/if_ed_pccard.c		optional	ed card
 dev/eisa/eisaconf.c		optional	eisa
-dev/em/if_em.c			optional	em
-dev/em/if_em_hw.c		optional	em
 dev/fb/fb.c			optional	fb
 dev/fb/fb.c			optional	vga
 dev/fb/splash.c			optional	splash
@@ -99,8 +99,6 @@ dev/ed/if_ed.c			optional	ed
 dev/ed/if_ed_cbus.c		optional	ed isa
 dev/ed/if_ed_pccard.c		optional	ed card
 dev/eisa/eisaconf.c		optional	eisa
-dev/em/if_em.c			optional	em
-dev/em/if_em_hw.c		optional	em
 dev/fb/fb.c			optional	fb
 dev/fb/fb.c			optional	gdc
 dev/fb/splash.c			optional	splash
@@ -160,6 +160,7 @@ maj 	name		comments
 173	*devctl		Devd control device <imp>
 174	pciwd		Berkshire Watchdog PCI <[email protected]>
 175	ips		IBM/Adaptec ServeRAID (control device)
+176	ipsd		IBM/Adaptec ServeRAID (disk device)
 180	nvidia		NVIDIA (nvidiaN/nvidiactl) <mdodd>
 181	casm		HP/Compaq ProLiant Advanced Server Management <peter>
 183	*smapi		SMAPI BIOS interface <mdodd>
@@ -36,7 +36,7 @@

 TYPE="FreeBSD"
 REVISION="4.11"
-BRANCH="STABLE"
+BRANCH="RELEASE"
 RELEASE="${REVISION}-${BRANCH}"
 VERSION="${TYPE} ${RELEASE}"

@@ -3578,7 +3578,8 @@ asr_intr (
                        break;

                case I2O_SCSI_DSC_CHECK_CONDITION:
-                        ccb->ccb_h.status |= CAM_REQ_CMP|CAM_AUTOSNS_VALID;
+                        ccb->ccb_h.status |= CAM_SCSI_STATUS_ERROR |
+                            CAM_AUTOSNS_VALID;
                        break;

                case I2O_SCSI_DSC_BUSY:
@@ -1035,7 +1035,7 @@ ata_command(struct ata_device *atadev, u_int8_t command,
    }

    /* only use 48bit addressing if needed because of the overhead */
-    if ((lba > 268435455 || count > 256) && atadev->param &&
+    if ((lba >= 268435455 || count > 256) && atadev->param &&
 	atadev->param->support.address48) {
 	ATA_OUTB(atadev->channel->r_io, ATA_FEATURE, (feature>>8) & 0xff);
 	ATA_OUTB(atadev->channel->r_io, ATA_FEATURE, feature);
@@ -161,6 +161,8 @@ static struct bge_type bge_devs[] = {
 		"Broadcom BCM5705M Gigabit Ethernet" },
 	{ BCOM_VENDORID, BCOM_DEVICEID_BCM5705M_ALT,
 		"Broadcom BCM5705M Gigabit Ethernet" },
+	{ BCOM_VENDORID, BCOM_DEVICEID_BCM5721,
+		"Broadcom BCM5721 Gigabit Ethernet" },
 	{ BCOM_VENDORID, BCOM_DEVICEID_BCM5750,
 		"Broadcom BCM5750 Gigabit Ethernet" },
 	{ BCOM_VENDORID, BCOM_DEVICEID_BCM5750M,
@@ -1859,6 +1859,7 @@ struct bge_status_block {
 #define BCOM_DEVICEID_BCM5704S		0x16A8
 #define BCOM_DEVICEID_BCM5705		0x1653
 #define BCOM_DEVICEID_BCM5705K		0x1654
+#define BCOM_DEVICEID_BCM5721		0x1659
 #define BCOM_DEVICEID_BCM5705M		0x165D
 #define BCOM_DEVICEID_BCM5705M_ALT	0x165E
 #define BCOM_DEVICEID_BCM5750		0x1676
@@ -268,10 +268,9 @@ static struct
    { 0x0e11, 0x409B, CISS_BOARD_SA5,	"HP Smart Array 642" },
    { 0x0e11, 0x409C, CISS_BOARD_SA5,	"HP Smart Array 6400" },
    { 0x0e11, 0x409D, CISS_BOARD_SA5,	"HP Smart Array 6400 EM" },
-    { 0x0e11, 0x409E, CISS_BOARD_SA5,	"HP Smart Array 6422" },
-    { 0x103C, 0x3210, CISS_BOARD_SA5,	"HP Smart Array V100" },
    { 0x103C, 0x3220, CISS_BOARD_SA5,	"HP Smart Array" },
    { 0x103C, 0x3222, CISS_BOARD_SA5,	"HP Smart Array" },
+    { 0x103C, 0x3225, CISS_BOARD_SA5,	"HP Smart Array P600" },
    { 0x103C, 0x3230, CISS_BOARD_SA5,	"HP Smart Array" },
    { 0x103C, 0x3231, CISS_BOARD_SA5,	"HP Smart Array" },
    { 0x103C, 0x3232, CISS_BOARD_SA5,	"HP Smart Array" },
@@ -51,7 +51,7 @@ struct adapter *em_adapter_list = NULL;
 *  Driver version
 *********************************************************************/

-char em_driver_version[] = "1.7.35";
+char em_driver_version[] = "1.7.42";


 /*********************************************************************
@@ -80,6 +80,7 @@ static em_vendor_info_t em_vendor_info_array[] =
        { 0x8086, 0x1011, PCI_ANY_ID, PCI_ANY_ID, 0},
        { 0x8086, 0x1012, PCI_ANY_ID, PCI_ANY_ID, 0},
        { 0x8086, 0x1013, PCI_ANY_ID, PCI_ANY_ID, 0},
+        { 0x8086, 0x1014, PCI_ANY_ID, PCI_ANY_ID, 0},
        { 0x8086, 0x1015, PCI_ANY_ID, PCI_ANY_ID, 0},
        { 0x8086, 0x1016, PCI_ANY_ID, PCI_ANY_ID, 0},
        { 0x8086, 0x1017, PCI_ANY_ID, PCI_ANY_ID, 0},
@@ -99,6 +100,7 @@ static em_vendor_info_t em_vendor_info_array[] =
        { 0x8086, 0x107A, PCI_ANY_ID, PCI_ANY_ID, 0},
        { 0x8086, 0x107B, PCI_ANY_ID, PCI_ANY_ID, 0},
        { 0x8086, 0x107C, PCI_ANY_ID, PCI_ANY_ID, 0},
+        { 0x8086, 0x108A, PCI_ANY_ID, PCI_ANY_ID, 0},
        /* required last entry */
        { 0, 0, 0, 0, 0}
 };
@@ -2712,8 +2714,20 @@ em_enable_intr(struct adapter * adapter)
 static void
 em_disable_intr(struct adapter *adapter)
 {
-	E1000_WRITE_REG(&adapter->hw, IMC, 
-			(0xffffffff & ~E1000_IMC_RXSEQ));
+	/*
+	 * The first version of 82542 had an errata where when link was forced it
+	 * would stay up even up even if the cable was disconnected.  Sequence errors
+	 * were used to detect the disconnect and then the driver would unforce the link.
+	 * This code in the in the ISR.  For this to work correctly the Sequence error 
+	 * interrupt had to be enabled all the time.
+	 */
+
+	if (adapter->hw.mac_type == em_82542_rev2_0)
+	    E1000_WRITE_REG(&adapter->hw, IMC, 
+	        (0xffffffff & ~E1000_IMC_RXSEQ));
+	else
+	    E1000_WRITE_REG(&adapter->hw, IMC, 
+	        0xffffffff);
 	return;
 }

@@ -511,8 +511,8 @@ fxp_attach(device_t dev)
 	 * Determine whether we must use the 503 serial interface.
 	 */
 	fxp_read_eeprom(sc, &data, 6, 1);
-	if ((data & FXP_PHY_DEVICE_MASK) != 0 &&
-	    (data & FXP_PHY_SERIAL_ONLY))
+	if (sc->revision <= FXP_REV_82557 && (data & FXP_PHY_DEVICE_MASK) != 0
+	    && (data & FXP_PHY_SERIAL_ONLY))
 		sc->flags |= FXP_FLAG_SERIAL_MEDIA;

 	/*
@@ -23,10 +23,10 @@
 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
+ *
+ * $FreeBSD$
 */

-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");

 #include <dev/ips/ips.h>
 #include <sys/stat.h>
@@ -40,12 +40,20 @@ static d_ioctl_t ips_ioctl;
 MALLOC_DEFINE(M_IPSBUF, "ipsbuf","IPS driver buffer");

 static struct cdevsw ips_cdevsw = {
-	.d_version =	D_VERSION,
-	.d_flags =	D_NEEDGIANT,
-	.d_open =	ips_open,
-	.d_close =	ips_close,
-	.d_ioctl =	ips_ioctl,
-	.d_name =	"ips",
+	ips_open,
+	ips_close,
+	noread,
+	nowrite,
+	ips_ioctl,
+	nopoll,
+	nommap,
+	nostrategy,
+	"ips",
+	175,
+	nodump,
+	nopsize,
+	0,
+	-1
 };

 static const char* ips_adapter_name[] = {
@@ -68,14 +76,14 @@ static const char* ips_adapter_name[] = {
 };


-static int ips_open(struct cdev *dev, int flags, int fmt, struct thread *td)
+static int ips_open(dev_t dev, int flags, int fmt, struct proc *p)
 {
 	ips_softc_t *sc = dev->si_drv1;
 	sc->state |= IPS_DEV_OPEN;
        return 0;
 }

-static int ips_close(struct cdev *dev, int flags, int fmt, struct thread *td)
+static int ips_close(dev_t dev, int flags, int fmt, struct proc *p)
 {
 	ips_softc_t *sc = dev->si_drv1;
 	sc->state &= ~IPS_DEV_OPEN;
@@ -83,7 +91,7 @@ static int ips_close(struct cdev *dev, int flags, int fmt, struct thread *td)
        return 0;
 }

-static int ips_ioctl(struct cdev *dev, u_long command, caddr_t addr, int32_t flags, struct thread *td)
+static int ips_ioctl(dev_t dev, u_long command, caddr_t addr, int32_t flags, struct proc *p)
 {
 	ips_softc_t *sc;

@@ -112,7 +120,6 @@ static __inline__ int ips_cmdqueue_free(ips_softc_t *sc)
 		for(i = 0; i < sc->max_cmds; i++){

 			command = &sc->commandarray[i];
-			sema_destroy(&command->cmd_sema);

 			if(command->command_phys_addr == 0)
 				continue;
@@ -154,7 +161,6 @@ static __inline__ int ips_cmdqueue_init(ips_softc_t *sc)
 			goto error;
 		}

-		sema_init(&command->cmd_sema, 0, "IPS Command Semaphore");
 		SLIST_INSERT_HEAD(&sc->free_cmd_list, command, next);	
 	}
 	sc->state &= ~IPS_OFFLINE;
@@ -264,9 +270,6 @@ void ips_insert_free_cmd(ips_softc_t *sc, ips_command_t *command)
 	intrmask_t mask;
 	mask = splbio();

-	if (sema_value(&command->cmd_sema) != 0)
-		panic("ips: command returned non-zero semaphore");
-
 	SLIST_INSERT_HEAD(&sc->free_cmd_list, command, next);
 	(sc->used_commands)--;
 	splx(mask);
@@ -402,8 +405,6 @@ int ips_adapter_init(ips_softc_t *sc)
 				/* maxsegsize*/	IPS_COMMAND_LEN + 
 						    IPS_MAX_SG_LEN,
 				/* flags     */	0,
-				/* lockfunc  */ busdma_lock_mutex,
-				/* lockarg   */ &Giant,
 				&sc->command_dmatag) != 0) {
                device_printf(sc->dev, "can't alloc command dma tag\n");
 		goto error;
@@ -419,8 +420,6 @@ int ips_adapter_init(ips_softc_t *sc)
 				/* numsegs   */	IPS_MAX_SG_ELEMENTS,
 				/* maxsegsize*/	IPS_MAX_IOBUF_SIZE,
 				/* flags     */	0,
-				/* lockfunc  */ busdma_lock_mutex,
-				/* lockarg   */ &Giant,
 				&sc->sg_dmatag) != 0) {
 		device_printf(sc->dev, "can't alloc SG dma tag\n");
 		goto error;
@@ -463,8 +462,9 @@ int ips_adapter_init(ips_softc_t *sc)
 		device_printf(sc->dev, "failed to initialize command buffers\n");
 		goto error;
 	}
-        sc->device_file = make_dev(&ips_cdevsw, device_get_unit(sc->dev), UID_ROOT, GID_OPERATOR,
-                                        S_IRUSR | S_IWUSR, "ips%d", device_get_unit(sc->dev));
+        sc->device_file = make_dev(&ips_cdevsw, device_get_unit(sc->dev),
+	    UID_ROOT, GID_OPERATOR, S_IRUSR | S_IWUSR, "ips%d",
+	    device_get_unit(sc->dev));
 	sc->device_file->si_drv1 = sc;
 	ips_diskdev_init(sc);
 	sc->timer = timeout(ips_timeout, sc, 10*hz);
@@ -622,8 +622,6 @@ static int ips_copperhead_queue_init(ips_softc_t *sc)
 				/* numsegs   */	1,
 				/* maxsegsize*/	sizeof(ips_copper_queue_t),
 				/* flags     */	0,
-				/* lockfunc  */ busdma_lock_mutex,
-				/* lockarg   */ &Giant,
 				&dmatag) != 0) {
                device_printf(sc->dev, "can't alloc dma tag for statue queue\n");
 		error = ENOMEM;
@@ -37,10 +37,8 @@
 #include <sys/conf.h>
 #include <sys/types.h>
 #include <sys/queue.h>
-#include <sys/bio.h>
+#include <sys/buf.h>
 #include <sys/malloc.h>
-#include <sys/mutex.h>
-#include <sys/sema.h>
 #include <sys/time.h>

 #include <machine/bus_memio.h>
@@ -48,8 +46,8 @@
 #include <sys/rman.h>
 #include <machine/resource.h>

-#include <dev/pci/pcireg.h>
-#include <dev/pci/pcivar.h>
+#include <pci/pcireg.h>
+#include <pci/pcivar.h>

 MALLOC_DECLARE(M_IPSBUF);

@@ -205,7 +203,7 @@ MALLOC_DECLARE(M_IPSBUF);
 /* this is ugly.  It zeros the end elements in an ips_command_t struct starting with the status element */
 #define clear_ips_command(command)	bzero(&((command)->status), (unsigned long)(&(command)[1])-(unsigned long)&((command)->status))

-#define ips_read_request(iobuf)		((iobuf)->bio_cmd == BIO_READ)
+#define ips_read_request(iobuf)		((iobuf)->b_flags & B_READ)

 #define COMMAND_ERROR(status)		(((status)->fields.basic_status & 0x0f) >= IPS_MIN_ERROR)

@@ -382,7 +380,6 @@ typedef struct ips_command{
 	bus_dmamap_t		command_dmamap;
 	void *			command_buffer;
 	u_int32_t		command_phys_addr;/*WARNING! must be changed if 64bit addressing ever used*/	
-	struct sema		cmd_sema;
 	ips_cmd_status_t	status;
 	SLIST_ENTRY(ips_command)	next;
 	bus_dma_tag_t		data_dmatag;
@@ -414,7 +411,7 @@ typedef struct ips_softc{
 	bus_dma_tag_t		command_dmatag;
 	bus_dma_tag_t		sg_dmatag;
        device_t                dev;
-        struct cdev *device_file;
+        dev_t			device_file;
 	struct callout_handle	timer;
 	u_int16_t		adapter_type;
 	ips_adapter_info_t	adapter_info;
@@ -434,8 +431,7 @@ typedef struct ips_softc{
        void                    (* ips_adapter_intr)(void *sc);
 	void			(* ips_issue_cmd)(ips_command_t *command);
 	ips_copper_queue_t *	copper_queue;
-	struct mtx		queue_mtx;
-	struct bio_queue_head	queue;
+	struct buf_queue_head	queue;

 }ips_softc_t;

@@ -443,7 +439,7 @@ typedef struct ips_softc{
 extern int ips_ioctl_request(ips_softc_t *sc, u_long ioctl_cmd, caddr_t addr, 
 				int32_t flags);
 /* function defines from ips_disk.c */
-extern void ipsd_finish(struct bio *iobuf);
+extern void ipsd_finish(struct buf *iobuf);

 /* function defines from ips_commands.c */
 extern int ips_flush_cache(ips_softc_t *sc);
Author	SHA1	Message	Date
Ken Smith	a84f9c8c4d	Ready to do the tagging for 4.11-RELEASE. Approved by: re (implicit)	2005-01-21 13:12:41 +00:00
Hiroki Sato	672c020ccb	Remove unnecessary parts for the release. Approved by: re (implicitly)	2005-01-21 11:20:40 +00:00
Hiroki Sato	1ad8babf96	New release notes: XFree86 4.4.0. Update release notes: - Move pbio(4) to the platform specific section. - more port randomization related sysctl: net.inet.ip.portrange.randomcps net.inet.ip.portrange.randomtime - net.inet.tcp.insecure_rst=1 is required for RFC 793. Approved by: re (implicitly)	2005-01-21 11:16:10 +00:00
Hiroki Sato	53887285f9	- Use &os;. - Remove empty sections. Approved by: re (implicitly)	2005-01-21 06:46:33 +00:00
Hiroki Sato	6600f49b59	New release notes: CVS 1.11.17. Approved by: re (implicitly)	2005-01-21 06:43:18 +00:00
Hiroki Sato	a09a226a43	New release notes: pbio(4) added, axe(4) added, bge(4) BCM5750/BCM5751 support, kernel panic when net.inet.ip.rtexpire=0 fixed, ipnat(8) non-TCP/UDP packets redirect rules support, trm(4) update, fwcontrol(8) -m option, $inetd_flags now includes "-C 60", libc eui64(3) functions support, ngctl(8) dot command, pax(1) bugfixes, and whois(1) improvements. Approved by: re (implicitly)	2005-01-21 06:34:29 +00:00
Hiroki Sato	3945a8c709	New release notes: fixes of vm_object_*() and contigmalloc(), em(4) 82541ER and 82546GB support, ixgb(4) added, sk(4) jumbo frame handling fix, net.inet.tcp.insecure_rst sysctl, ips(4) added, mpt(4) FC929X support, and linux_base-8 used by default. Approved by: re (implicitly)	2005-01-21 05:37:58 +00:00
Paul Saab	1b82bcc329	MFC rev 1.57: Remove 6422, V100 and add the P600. Approved by: re (kensmith)	2005-01-21 05:28:00 +00:00
Hiroki Sato	cfe58f08a5	New release notes: Gnome 2.8.2 and KDE 3.3.2. Approved by: re (implicitly)	2005-01-21 04:51:09 +00:00
Hiroki Sato	cd7892f523	New release notes: SA-04:13, SA-04:14, SA-04:16, and SA-04:17. Approved by: re (implicitly)	2005-01-21 04:44:30 +00:00
Hiroki Sato	6ed973283d	Bump &release.manpath.netbsd; to 2.0. Approved by: re (implicitly)	2005-01-21 04:05:59 +00:00
Hiroki Sato	dea4a87bd1	- Bump the copyright year. - Simplify %foo; entities in the preamble. - Trim old information. Approved by: re (implicitly)	2005-01-21 02:52:24 +00:00
Hiroki Sato	99b361af69	Bump &release.*; for 4.11R. Approved by: re (implicitly)	2005-01-21 02:44:36 +00:00
Ken Smith	35391b0ab8	MFS revision 1.749.2.175 date: 2005/01/17 09:37:27; author: scottl; state: Exp; lines: +1 -0 Add tap(4) to LINT PR: kern/44260 Submitted by: Matthias Andree Approved by: re (scottl)	2005-01-19 18:24:17 +00:00
Ken Smith	7c378b035f	MFS of v1.55.2.10: MFC revision 1.105: date: 2002/09/07 04:59:49; author: peter; state: Exp; lines: +1 -0 Supposedly linux has added a 6th syscall arg register (%ebp). I am not 100% sure if this is enough, but it will not harm anything. This appears to fix some breakage with the emulation of linux's mmap2(). When that function became available recently the linux executables started using it which broke installing the emulators/linux_base-8 port. Pointer from: akiyama Approved by: re (scottl)	2005-01-19 18:13:40 +00:00
Christian Brueffer	84311d7439	MFC: rev. 1.10 - list the Hama USB RS-232 Serial Adapter as supported - bump .Dd Approved by: re (kensmith)	2005-01-18 19:11:11 +00:00
Ken Smith	89cf65c9b8	Almost ready for RC3 builds. Approved by: re (implicit)	2005-01-14 21:53:38 +00:00
Scott Long	ff056c2ab1	Merge the ips driver bits. Tags were slid on the files that were added to the RELENG_4 branch. This commit covers the files that existed and were merely changed. Approved by: re	2005-01-14 03:07:41 +00:00
Ken Smith	7207f98338	Regen from syscalls.master revision 1.30.2.8.8.1 Approved by: re (scottl)	2005-01-14 00:09:55 +00:00
Ken Smith	01ca612ace	MFS of some Linux emulation fixes. From the log message of the MFC: kensmith 2005-01-12 16:34:55 UTC FreeBSD src repository Modified files: (Branch: RELENG_4) lib/libc/gen errlst.c lib/libc/sys intro.2 sys/nfs nfs_subs.c sys/sys errno.h sys/i386/linux linux_dummy.c linux_machdep.c syscalls.master Log: This is a partial MFC of the current RELENG_5 Linux emulation, which became necessary due to the plans for using linux_base-8 for the 4.11 release. Among other things running "/compat/linux/bin/ls -l" dumped core because it tried to use completely non-existent system calls. We don't actually implement the system calls it's trying to use but we at least need to have something in place that returns an error code. Things being added: - wrapper for mmap2(2) from sys/compat/linux/linux_machdep.c v1.31 sys/compat/linux/linux_dummy.c v1.35 - add dummy entries for fadvise64(2) and xattr(2) family of syscalls from sys/compat/linux/linux_dummy.c v1.37 - add ENOATTR error code because that is what the xattr(2) family of syscalls returns, which in turn required tweaking the error code translation table in the NFS server code[1]. - add $FreeBSD$ token to lib/libc/gen/errlst.c so it passes pre-commit check script... [1] Noticed by rwatson. Requested by: nectar Reviewed by: nectar, sobomax, re@ Tested by: nectar, ceri Versions being MFS-ed: src/lib/libc/gen/errlst.c 1.2.2.1 src/lib/libc/sys/intro.2 1.21.2.8 and 1.21.2.9 src/sys/i386/linux/linux_dummy.c 1.21.2.9 src/sys/i386/linux/linux_machdep.c 1.6.2.6 src/sys/i386/linux/syscalls.master 1.30.2.9 src/sys/nfs/nfs_subs.c 1.90.2.4 src/sys/sys/errno.h 1.14.2.3 Approved by: re (scottl)	2005-01-14 00:07:56 +00:00
Ken Smith	56fa421a15	MFS revision 1.50.2.48 date: 2005/01/11 18:25:01; author: kensmith; state: Exp; lines: +1 -1 MFC of an off-by-one fix sos made to HEAD in v1.96 of ata-chipset.c and v1.50 of ata-lowlevel.c. From his log message: Log: Compensate for off by one bugs in disk firmware for 48BIT addressing cutover. Requested by: marck Glanced at by: sos Approved by: re (scottl)	2005-01-13 23:03:12 +00:00
Ken Smith	2e85ae4673	MFC v1.1.2.39: The package set configuration for 4.11-RELEASE. Approved by: re (scottl)	2005-01-13 22:54:59 +00:00
SUZUKI Shinsuke	3c5c01cc50	MFC: Rev. 1.71 fixed an unexpected addr/port matching failure in IPv6 SA management PR: kern/72393 Approved by: re (kensmith)	2005-01-13 22:47:18 +00:00
Eric Anholt	20a58379dd	MFS: Remove and recreate with correct permissions/owner three additional X socket directories. Approved by: re (kensmith)	2005-01-13 22:09:17 +00:00
Ian Dowse	c1fc798db7	MFC: 1.6; When searching for a suitable block of memory on the free list, skip blocks that are too big by a factor of two or greater. Approved by: re (kensmith)	2005-01-13 22:06:57 +00:00
cvs2svn	52101c3a7e	This commit was manufactured by cvs2svn to create branch 'RELENG_4_11'.	2005-01-13 01:01:11 +00:00
Alexey Zelkin	d372cbc1e8	MFC: rev 1.40, fix redraw of checklist box while specifiyng manual dialog size Approved by: re (kensmith)	2005-01-12 21:01:20 +00:00
Ceri Davies	bfe60c7f04	MFC r1.17: Add a usb category for USB PRs. Approved by: re (kensmith)	2005-01-12 20:07:19 +00:00
Maxime Henrion	f2466b8548	Merge if_fxp.c:1.221 from HEAD to RELENG_5: date: 2005/01/04 19:30:14; author: mux; state: Exp; lines: +1 -1 Allow fxp(4) cards with a revision id of 0 to use the 82503 serial interface as well. This is not an expected revision id per the datasheet, but unfortunately there are such cards out there with a 82557 chipset, and they want to use the 82503. PR: kern/75739 Reported by: Andre Albsmeier <[email protected]> Approved by: re (kensmith)	2005-01-12 13:29:03 +00:00
Christian Brueffer	4e2f30561f	MFC: rev. 1.17 - add new supported chips: 82541ER and 82546GB - change .Nd to look better (no need to mention FreeBSD there) - bump .Dd Approved by: re (kensmith)	2005-01-12 11:24:30 +00:00
Christian Brueffer	89ce5d04a2	MFC: rev. 1.30 - some SATA controllers were erroneously marked as SCSI, correct that - move those controllers into the right place - mention that the driver supports SATA - bump .Dd Approved by: re (kensmith)	2005-01-12 11:23:46 +00:00
Christian Brueffer	27476a4f5a	MFC: - add vendor names for the MegaRAID cards, since LSI aquired the AMI storage devision some time ago - bump .Dd Approved by: re (kensmith)	2005-01-12 11:23:15 +00:00
Ken Smith	f492c7a6d2	MFC v1.252.2.74 Sync list of ftp sites with current reality. Approved by: re (implicit)	2005-01-12 03:59:26 +00:00
Vinod Kashyap	5e90ebc723	Merged from RELENG_4, changes related to the 9.1.5.2 release of twa on the 3ware website. Reviewed by:re Approved by:re MFC after:4 days	2005-01-10 23:55:09 +00:00
Wilko Bulte	088d027cc7	MFC: Document slot specific location for base I/O board on AS600. Thanks to: Charles Smeijer for getting me my AS600. Approved by: re / kensmith (blanket)	2005-01-07 21:14:08 +00:00
Wilko Bulte	21face7b5d	MFC: Note that fdisk is not used on Alpha. Remove outdated info on install media. Submitted by: "William H. Magill" <[email protected]> Approved by: re / kensmith (blanket)	2005-01-07 19:49:27 +00:00
Julian Elischer	788b83c80f	MFC: ehci.c 1.5.4.13 Fix a bug where an aborted command was removed from the > queue but not from the hardware's cache of it, leading to the > hardware DMAing into "freed" memory buffers. (leading to crashes when > a usb ransaction was timed, but but eventually happenned) > > along with an associated change to ehcivar.h Approved by: re (ken)	2005-01-07 19:23:07 +00:00
Marius Strobl	4ff6474464	Merge from RELENG_4: 1.3.2.4 Fix a mis-merge in the MFC of rev. 1.64 in rev. 1.3.2.3; the following change wasn't included: - Set the CAM status to CAM_SCSI_STATUS_ERROR rather than CAM_REQ_CMP in case of a CHECK CONDITION. Approved by: re (kensmith)	2005-01-07 15:15:19 +00:00
Doug White	5aaac9b285	MF 1.19.2.13: Fix locking/better IFF_OACTIVE handling (by jmg). Correct detected RAM sizing for 88E8001 parts. Fix off-by-one in VPD data read. Correct handling of jumbo frames for Yukon based devices. Approved by: re Committed on behalf of: bz	2005-01-07 04:52:22 +00:00
Mike Silbersack	4cf393bc35	MFC revs 1.235 and 1.264; Improve the security of RST handling, and add a sysctl which can fall back to the old method. Approved by: re	2005-01-05 08:46:10 +00:00
Kirill Ponomarev	e3aa7b06bc	MFC: Remove trailing spaces. Approved by: re (kensmith)	2005-01-05 08:41:23 +00:00
Tony Ackerman	1aaf832ab0	Added device id support for Intel 82541ER and 82546GB dual port PCI Express adapter. Corrected a workaround that should only be applied to one adapter. Workaround was causing device hangs when incorrectly applied to other adapters. Approved by: re	2005-01-04 23:55:03 +00:00
Josef El-Rayes	494de3e294	MFC fixes to string modification code into RELENG_4_11. Approved by: re Discussed on: re, secteam Pointed out by: kensmith, cperciva Pointy hat: josef	2005-01-04 12:17:37 +00:00
Maxim Sobolev	d3da343a40	MFC: add support for FC929X and add missed mpt(4) manpage. Approved by: re	2005-01-03 16:39:20 +00:00
Kirill Ponomarev	7c2b2199f5	MFC: rev 1.24 date: 2004/12/30 13:09:34; author: krion; state: Exp; lines: +3 -1 Add LOG_NTP facility. Submitted by: Kurt Jaeger <pi at complx dot LF dot net> Approved by: ru MFC after: 3 days Approved by: re (kensmith)	2005-01-02 09:03:14 +00:00
Ken Smith	5cfc82abb3	Ready for RC2... Approved by: re (implicit)	2005-01-02 06:42:14 +00:00
Mike Silbersack	427cb6c8fd	MFC of port randomization rate-based disabling: in_pcb.c rev 1.157 in_pcb.h rev 1.79 ip_input.c rev 1.293 ip_var.h rev 1.93 Approved by: re	2005-01-02 05:03:16 +00:00
Maxim Sobolev	598282ec8f	Complete 2005 transition. Approved by: re	2005-01-01 23:24:04 +00:00
Ken Smith	ecab39b16c	MFC of rev 1.329 of vm_object.c: date: 2004/07/28 18:23:08; author: alc; state: Exp; lines: +2 -2 Correct a very old error in both vm_object_madvise() (originating in vm/vm_object.c revision 1.88) and vm_object_sync() (originating in vm/vm_map.c revision 1.36): When descending a chain of backing objects, both use the wrong object's backing offset. Consequently, both may operate on the wrong pages. Quoting Matt, "This could be responsible for all of the sporatic madvise oddness that has been reported over the years." Reviewed by: Matt Dillon Reviewed by: alc Helped by: DFly vm_map.c rev 1.31, vm_object.c rev 1.17 Approved by: re (scottl)	2005-01-01 19:54:00 +00:00
Julian Elischer	d53d301616	MFC a change from Dragonfly. contigmalloc was not respecting the fact that other processes may have a page marker as busy for IO but otherwise free. It just took it as free.. Approved by: re (ken)	2005-01-01 10:29:04 +00:00
Warner Losh	3637dc0593	MFC: 2005 Approved by: re@ (kensmith)	2004-12-31 19:16:33 +00:00
Ken Smith	16afe00491	MFC of revision 1.80.2.21, which was MFC of rev 1.103: date: 2004/12/22 04:45:49; author: kensmith; state: Exp; lines: +7 -0 MFC rev 1.103: date: 2004/11/03 18:26:06; author: kensmith; state: Exp; lines: +7 -0 Update the list of package names/descriptions. Approved by: re (scottl)	2004-12-30 21:39:35 +00:00
Christian Brueffer	00004d3d3e	MFC: rev. 1.7 Fix typos. Approved by: re (kensmith)	2004-12-30 02:55:16 +00:00
Christian Brueffer	616b9b4592	MFC: rev. 1.6 + 1.7 The ixgb(4) driver actually first appeared in 5.3 and the upcoming 4.11. Approved by: re (kensmith)	2004-12-29 21:45:17 +00:00
Maxime Henrion	a5689e9fc7	Merge if_fxp.c:1.220 from HEAD to RELENG_4_11: date: 2004/12/20 10:18:21; author: mux; state: Exp; lines: +2 -2 Only try to use the 82503 serial interface for the 82557 chipsets. The datasheet says it is only valid for such chipsets and shouldn't be used with others. This fixes some 82559 based cards which otherwise only work at 10Mbit. MFC after: 5 days Tested by: krion Approved by: re (kensmith)	2004-12-29 10:33:03 +00:00
Wilko Bulte	2ca8ad93ea	Add missing Alpha CPU models. Approved by: re (kensmith)	2004-12-27 18:50:59 +00:00
Wilko Bulte	b68959d6b2	em(4) is now available in the installation kernel. Approved by: re (kensmith)	2004-12-25 13:48:31 +00:00
Wilko Bulte	0ed4117fd6	replace wx(4) by em(4) now that em works OK on Alpha. Approved by: re (kensmith) / blanket	2004-12-24 22:48:59 +00:00
Wilko Bulte	7b24683892	wx is removed from GENERIC so it can go from dokern.sh as well. Approved by: re (kensmith) / blanket	2004-12-24 22:46:51 +00:00
Wilko Bulte	2da4750852	add em(4) as a module Approved by: re (kensmith) / blanket	2004-12-24 22:44:38 +00:00
Wilko Bulte	0e6870c21a	move em(4) to MI section Approved by: re (scottl)	2004-12-24 22:37:01 +00:00
Wilko Bulte	ef45c2bac3	move if_em from MD to MI Approved by: re (scottl)	2004-12-24 22:35:53 +00:00
Mike Silbersack	b4eab319b1	MFC rev 1.259; accept RSTs when our window is closed. Approved by: re	2004-12-23 22:08:20 +00:00
Yaroslav Tykhiy	007cd988ab	MFC: S_IS* macros; some well-known struct stat fields. Approved by: re (kensmith) Encouraged by: roam	2004-12-23 07:03:19 +00:00
Christian Brueffer	dc91dc3fc2	MFC: rev. 1.33 Nuke ports-picobsd, it was thrown out a while ago. Approved by: re (kensmith)	2004-12-22 19:48:42 +00:00
Ken Smith	1f06fd7254	MFC v 1.1.2.37 Adjustments for disc1 package set to make it fit as of 4.11RC1. Approved by: re (scottl)	2004-12-22 06:26:08 +00:00
Kirill Ponomarev	2d028e843b	MFC: rev 1.48 Introduce new variables FETCHINDEX, MASTER_SITE_INDEX and add description for MASTER_SITE_BACKUP. Approved by: re (kensmith)	2004-12-21 08:33:14 +00:00
Christian Brueffer	172993189c	MFC: rev. 1.11 Properly capitalize FireWire Approved by: re (kensmith)	2004-12-20 21:47:48 +00:00
Christian Brueffer	8cbb2bd53c	MFC: rev. 1.6 - remove nonexistant "device fwohci" - sort SYNOPSIS devices - capitalize Ethernet - bump .Dd Approved by: re (kensmith)	2004-12-20 21:47:09 +00:00
Christian Brueffer	9d72e45d98	MFC: rev. 1.4 Assorted markup, spelling, and grammar fixes. Approved by: re (kensmith)	2004-12-20 21:46:19 +00:00
Christian Brueffer	dae1a46598	MFC: rev. 1.5 Assorted markup, spelling, and grammar fixes. Approved by: re (kensmith)	2004-12-20 21:45:39 +00:00
Christian Brueffer	78582b1c5f	MFC: rev. 1.14 - 1.16 - Properly capitalize Gigabit Ethernet. - First update for the 5721/5750/5751 chips. Approved by: re (kensmith)	2004-12-20 20:07:19 +00:00
Paul Saab	ae4c32a4c1	MFC: 5721 Support Approved by: re	2004-12-20 18:58:15 +00:00
Boris Popov	ba478b5b5b	MFS: Initialize olen value passed to sysctl. Approved by: re	2004-12-19 15:24:22 +00:00
Christian Brueffer	797c627590	MFC: rev. 1.6 Remove clauses 3 and 4 of the license. Approved by: re (kensmith)	2004-12-19 10:37:14 +00:00
Ken Smith	25ed376446	MFC v1.2.2.26: Uncomment entries under the "not found in doc-common" section. Thanks to: jkoshy Requested by: ru Approved by: re (implicit)	2004-12-19 05:04:28 +00:00
cvs2svn	8d94620d78	This commit was manufactured by cvs2svn to create branch 'RELENG_4_11'.	2004-12-18 19:12:08 +00:00
Gleb Smirnoff	ecc9da252c	MFC 1.32: Note that send(2) is no longer applicable to divert(4) sockets. Approved by: re (kensmith)	2004-12-18 09:30:32 +00:00
Ken Smith	1ebd54dc13	Update tag used when doing a cvs update. Reminded by: ru Approved by: re (implicit)	2004-12-17 13:41:58 +00:00
Ken Smith	9a619c24fe	Add 4.11 to releases not found in doc-common. Requested by: ru Approved by: re (implicit)	2004-12-17 13:15:08 +00:00
Ken Smith	2700c9511d	Ready for RC1 builds. Approved by: re (implicit)	2004-12-17 06:49:43 +00:00
Ken Smith	8adeb5ea7b	Bump __FreeBSD_version for 4.11-RELEASE. Approved by: re (implicit)	2004-12-17 06:47:44 +00:00
Ken Smith	664e539c55	Adjust comment at the top to explicitly say FreeBSD-4.11. Approved by: re (implicit) Suggested by: cperciva	2004-12-17 06:37:50 +00:00
Ken Smith	fb40c863c0	Update tag to RELENG_4_11. Approved by: re (implicit)	2004-12-17 06:33:55 +00:00
cvs2svn	b0f916ae0c	This commit was manufactured by cvs2svn to create branch 'RELENG_4_11'.	2004-12-17 04:33:44 +00:00
cvs2svn	f75af3eaf5	This commit was manufactured by cvs2svn to create branch 'RELENG_4_11'.	2004-12-13 13:58:44 +00:00
cvs2svn	9f89468396	This commit was manufactured by cvs2svn to create branch 'RELENG_4_11'.	2004-12-06 14:39:45 +00:00
cvs2svn	31d8b16f9b	This commit was manufactured by cvs2svn to create branch 'RELENG_4_11'.	2004-11-16 20:51:46 +00:00
cvs2svn	5d5c995d23	This commit was manufactured by cvs2svn to create branch 'RELENG_4_11'.	2003-07-19 16:52:17 +00:00
cvs2svn	ebdd70512c	This commit was manufactured by cvs2svn to create branch 'RELENG_4_11'.	2002-08-06 08:24:47 +00:00