--- a/jdk/src/linux/doc/man/apt.1	Thu Apr 30 15:04:39 2009 -0700
+++ b/jdk/src/linux/doc/man/apt.1	Mon May 04 18:28:26 2009 -0700
@@ -1,5 +1,3 @@
-.'" t
-."
 ." Copyright 2004-2006 Sun Microsystems, Inc.  All Rights Reserved.
 ." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 ."
@@ -20,10 +18,9 @@
 ." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
 ." CA 95054 USA or visit www.sun.com if you need additional information or
 ." have any questions.
-." 
-." `
-.TH apt 1 "05 Aug 2006"
-." Generated by html2roff
+."
+.TH apt 1 "04 May 2009"
+." Generated from HTML by html2man (author: Eric Armstrong)
 
 .LP
 .SH "NAME"
@@ -41,12 +38,15 @@
 .LP
 Options may be in any order. For a discussion of parameters which apply to a specific option, see OPTIONS below.
 .LP
+.RS 3
 .TP 3
 sourcefiles 
 Zero or more source files to be processed. 
 .TP 3
 @files 
 One or more files that list source files or other options 
+.RE
+
 .LP
 .SH "DESCRIPTION"
 .LP
@@ -60,19 +60,19 @@
 .fi
 http://java.sun.com/javase/6/docs/technotes/guides/apt/GettingStarted.html
 .LP
+.RS 3
 .TP 3
 Note: 
-\f2The functionality of \fP\f2apt\fP has been subsumed by the annotation\-processing infrastructure that is now part of the \f2javac\fP tool [
-.na
-\f2Solaris and Linux\fP @
-.fi
-http://java.sun.com/javase/6/docs/technotes/tools/solaris/javac.html] [Windows] and standardized for use by all Java compilers. This new infrastructure relies on the language model and annotation\-processing APIs that are now part of the Java Platform. It is recommended that new annotation processor development be based on the new APIs and the \f2javac\fP tool. 
+\f2The functionality of \fP\f2apt\fP has been subsumed by the annotation\-processing infrastructure that is now part of the \f2javac(1)\fP tool and standardized for use by all Java compilers. This new infrastructure relies on the language model and annotation\-processing APIs that are now part of the Java Platform. It is recommended that new annotation processor development be based on the new APIs and the \f2javac\fP tool. 
+.RE
+
 .LP
 .SH "OPTIONS"
 .LP
 .SS 
 apt specific options
 .LP
+.RS 3
 .TP 3
 \-s dir 
 Specify the directory root under which processor\-generated source files will be placed; files are placed in subdirectories based on package namespace. 
@@ -91,17 +91,21 @@
 .TP 3
 \-factory classname 
 Name of annotation processor factory to use; bypasses default discovery process 
+.RE
+
 .LP
 .SS 
 Options shared with javac
 .LP
+.RS 3
 .TP 3
 \-d dir 
 Specify where to place processor and javac generated class files 
 .TP 3
-\-cp path or \-classpath
-path 
+\-cp path or \-classpath path 
 Specify where to find user class files and annotation processor factories. If \f2\-factorypath\fP is given, the classpath is not searched for factories. 
+.RE
+
 .LP
 .LP
 Consult the javac(1) man page for information on \f2javac\fP options.
@@ -115,24 +119,11 @@
 .LP
 .RS 3
 .TP 2
-*
-javac: [
-.na
-\f2Solaris and Linux\fP @
-.fi
-http://java.sun.com/javase/6/docs/technotes/tools/solaris/javac.html] [Windows] 
-.TP 2
-*
-java: [
-.na
-\f2Solaris\fP @
-.fi
-http://java.sun.com/javase/6/docs/technotes/tools/solaris/java.html] [
-.na
-\f2Linux\fP @
-.fi
-http://java.sun.com/javase/6/docs/technotes/tools/linux/java.html] [Windows] 
+o
+javac(1), java(1) 
 .RE
 
 .LP
+
+.LP