svn commit: r195733 - in stable/7/share/man/man4: . man4.i386

[Dag-Erling Smorgrav]

Author: des
Date: Fri Jul 17 07:07:38 2009
New Revision: 195733
URL: http://svn.freebsd.org/changeset/base/195733

Log:
  merge r181967: delete duplicate ichwd(4)

Deleted:
  stable/7/share/man/man4/man4.i386/ichwd.4
Modified:
  stable/7/share/man/man4/   (props changed)
  stable/7/share/man/man4/ichwd.4
  stable/7/share/man/man4/man4.i386/Makefile

Modified: stable/7/share/man/man4/ichwd.4
==============================================================================
--- stable/7/share/man/man4/ichwd.4	Fri Jul 17 02:28:27 2009	(r195732)
+++ stable/7/share/man/man4/ichwd.4	Fri Jul 17 07:07:38 2009	(r195733)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 23, 2007
+.Dd August 20, 2008
 .Dt ICHWD 4
 .Os
 .Sh NAME
@@ -50,12 +50,29 @@ The
 .Nm
 driver provides
 .Xr watchdog 4
-support for the watchdog interrupt timer present in
-the Intel ICH motherboard chipsets.
+support for the watchdog interrupt timer present on
+all Intel ICH motherboard chipsets.
+.Pp
+The ICH WDT counts down in ticks of approximately 0.6 seconds; the
+exact value depends on hardware quality and environmental factors.
+Supported watchdog intervals range from 2 to 63 ticks.
+.Pp
+Note that on some ICH-based systems, the WDT may be present but
+disabled, either in hardware or by the BIOS.
+The
+.Nm
+driver attempts to detect this condition and will refuse to attach if
+it believes the WDT is disabled.
 .Sh SEE ALSO
 .Xr watchdog 4 ,
 .Xr watchdog 8 ,
-.Xr watchdogd 8
+.Xr watchdogd 8,
+.Xr watchdog 9
+.Rs
+.%T Using the Intel ICH Family Watchdog Timer (WDT)
+.%R Intel Application Note AP-725
+.%O Document Number 292273-001
+.Re
 .Sh HISTORY
 The
 .Nm
@@ -65,8 +82,9 @@ driver first appeared in
 .An -nosplit
 The
 .Nm
-driver was originally written by
-.An Wm. Daryl Hawkins
-of Texas A&M University.
+driver was written by
+.An Wm. Daryl Hawkins Aq dhawkins at tamu.edu
+of Texas A&M University and
+.An Dag-Erling Sm\(/orgrav Aq des at FreeBSD.org .
 This manual page was written by
 .An Dag-Erling Sm\(/orgrav Aq des at FreeBSD.org .

Modified: stable/7/share/man/man4/man4.i386/Makefile
==============================================================================
--- stable/7/share/man/man4/man4.i386/Makefile	Fri Jul 17 02:28:27 2009	(r195732)
+++ stable/7/share/man/man4/man4.i386/Makefile	Fri Jul 17 07:07:38 2009	(r195733)
@@ -25,7 +25,6 @@ MAN=	acpi_aiboost.4 \
 	ex.4 \
 	fe.4 \
 	glxsb.4 \
-	ichwd.4 \
 	ie.4 \
 	io.4 \
 	linux.4 \