--- a/src/linux/doc/man/appletviewer.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/appletviewer.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH appletviewer 1 "10 May 2011"
+.TH appletviewer 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -40,7 +40,10 @@
 .na
 \f2AppletViewer Tags\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/appletviewertags.html.
+http://docs.oracle.com/javase/7/docs/technotes/tools/appletviewertags.html.
+.LP
+.LP
+\f3Note:\fP The \f3appletviewer\fP is intended for development purposes only. See About Sample / Test Applications and Code for more information.
 .LP
 .LP
 \f3Note:\fP The \f3appletviewer\fP requires encoded URLs according to the escaping mechanism defined in RFC2396. Only encoded URLs are supported. However, file names must be unencoded, as specified in RFC2396.

--- a/src/linux/doc/man/apt.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/apt.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH apt 1 "10 May 2011"
+.TH apt 1 "16 Mar 2012"
 
 .LP
 .SH "NAME"
@@ -60,7 +60,7 @@
 .na
 \f4Getting Started with \fP\f4apt\fP. @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/apt/GettingStarted.html
+http://docs.oracle.com/javase/7/docs/technotes/guides/apt/GettingStarted.html
 .LP
 .SH "OPTIONS"
 .LP

--- a/src/linux/doc/man/extcheck.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/extcheck.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH extcheck 1 "10 May 2011"
+.TH extcheck 1 "16 Mar 2012"
 
 .LP
 .SH "Name"

--- a/src/linux/doc/man/idlj.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/idlj.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH idlj 1 "10 May 2011"
+.TH idlj 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -47,7 +47,7 @@
 .na
 \f2OMG IDL to Java Language Language Mapping Specification\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/idl/mapping/jidlMapping.html. Some previous releases of the IDL\-to\-Java compiler were named \f2idltojava\fP.
+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/mapping/jidlMapping.html. Some previous releases of the IDL\-to\-Java compiler were named \f2idltojava\fP.
 .LP
 .SS 
 Emitting Client and Server Bindings
@@ -110,14 +110,14 @@
 .na
 \f2org.omg.PortableServer.Servant\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/org/omg/PortableServer/Servant.html and implements the \f2InvokeHandler\fP interface and the operations interface associated with the IDL interface the skeleton implements.
+http://docs.oracle.com/javase/7/docs/api/org/omg/PortableServer/Servant.html and implements the \f2InvokeHandler\fP interface and the operations interface associated with the IDL interface the skeleton implements.
 .LP
 .LP
 The \f2PortableServer\fP module for the 
 .na
 \f2Portable Object Adapter (POA)\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/idl/POA.html defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior.
+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/POA.html defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior.
 .LP
 .LP
 Another option for the Inheritance Model is to use the \f2\-oldImplBase\fP flag in order to generate server\-side bindings that are compatible with versions of the Java programming language prior to J2SE 1.4. Note that using the \f2\-oldImplBase\fP flag is non\-standard: these APIs are being deprecated. You would use this flag ONLY for compatibility with existing servers written in J2SE 1.3. In that case, you would need to modify an existing MAKEFILE to add the \f2\-oldImplBase\fP flag to the \f2idlj\fP compiler, otherwise POA\-based server\-side mappings will be generated. To generate server\-side bindings that are backwards compatible:
@@ -295,7 +295,7 @@
 .na
 \f2Setting the Classpath\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/index.html#general.
+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#general.
 .LP
 .SS 
 Emitting Bindings for Include Files

--- a/src/linux/doc/man/jar.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/jar.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jar 1 "10 May 2011"
+.TH jar 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -98,7 +98,7 @@
 .na
 \f2JAR file specification\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR%20Manifest for details explaining how the jar tool stores meta\-information in the manifest file. 
+http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR%20Manifest for details explaining how the jar tool stores meta\-information in the manifest file. 
 .LP
 If a jar file should include \f2name\ :\ value\fP pairs contained in an existing manifest file, specify that file using the \f2\-m\fP option:
 .LP
@@ -158,7 +158,7 @@
 .na
 \f2JarIndex\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Index, which allows application class loaders to load classes more efficiently from jar files. If an application or applet is bundled into multiple jar files,\  only the necessary jar files will be downloaded and opened to load classes. This performance optimization is enabled by running \f2jar\fP with the \f2\-i\fPoption. It will generate package location information for the specified main jar file and all the jar files it depends on, which need to be specified in the \f2Class\-Path\fP attribute of the main jar file's manifest.
+http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Index, which allows application class loaders to load classes more efficiently from jar files. If an application or applet is bundled into multiple jar files,\  only the necessary jar files will be downloaded and opened to load classes. This performance optimization is enabled by running \f2jar\fP with the \f2\-i\fPoption. It will generate package location information for the specified main jar file and all the jar files it depends on, which need to be specified in the \f2Class\-Path\fP attribute of the main jar file's manifest.
 .LP
 .nf
 \f3
@@ -192,7 +192,7 @@
 .na
 \f2Java Tutorial\fP @
 .fi
-http://download.oracle.com/javase/tutorial/deployment/jar.
+http://docs.oracle.com/javase/tutorial/deployment/jar.
 .LP
 .SH "OPTIONS"
 .LP
@@ -266,7 +266,7 @@
 .na
 \f2JAR Files\fP @
 .fi
-http://download.oracle.com/javase/tutorial/deployment/jar/ trail in the Java Tutorial  for examples of using the \f4\-m\fP option. 
+http://docs.oracle.com/javase/tutorial/deployment/jar/ trail in the Java Tutorial  for examples of using the \f4\-m\fP option. 
 .TP 3
 e 
 Sets \f2entrypoint\fP as the application entry point for stand\-alone applications bundled into executable jar file. The use of this option creates or overrides the \f2Main\-Class\fP attribute value in the manifest file. This option can be used during creation of jar file or while updating the jar file. This option specifies the application entry point without editing or creating the manifest file.
@@ -553,25 +553,25 @@
 .na
 \f2The Jar Overview\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/jar/jarGuide.html
+http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jarGuide.html
 .LP
 .LP
 .na
 \f2The Jar File Specification\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html
+http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html
 .LP
 .LP
 .na
 \f2The JarIndex Spec\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Index
+http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Index
 .LP
 .LP
 .na
 \f2Jar Tutorial\fP @
 .fi
-http://download.oracle.com/javase/tutorial/deployment/jar/index.html
+http://docs.oracle.com/javase/tutorial/deployment/jar/index.html
 .LP
 .LP
 pack200(1)

--- a/src/linux/doc/man/jarsigner.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/jarsigner.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jarsigner 1 "10 May 2011"
+.TH jarsigner 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -147,7 +147,7 @@
 .na
 \f2How to Implement a Provider for the Java Cryptography Architecture\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider.html.
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider.html.
 .LP
 .LP
 Applications can choose different \f2types\fP of keystore implementations from different providers, using the "getInstance" factory method supplied in the \f2KeyStore\fP class. A keystore type defines the storage and data format of the keystore information, and the algorithms used to protect private keys in the keystore and the integrity of the keystore itself. Keystore implementations of different types are not compatible.
@@ -208,7 +208,7 @@
 .na
 \f2KeyTool and JarSigner\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#KeyToolJarSigner section of the Java PKCS#11 Reference Guide for details.
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#KeyToolJarSigner section of the Java PKCS#11 Reference Guide for details.
 .LP
 .SS 
 Supported Algorithms
@@ -513,7 +513,7 @@
 .na
 \f2Appendix A\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard signature algorithm names. This algorithm must be compatible with the private key used to sign the JAR file. If this option is not specified, SHA1withDSA, SHA256withRSA, or SHA256withECDSA will be used depending on the type of private key. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed. 
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard signature algorithm names. This algorithm must be compatible with the private key used to sign the JAR file. If this option is not specified, SHA1withDSA, SHA256withRSA, or SHA256withECDSA will be used depending on the type of private key. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed. 
 .TP 3
 \-digestalg algorithm 
 Specifies the name of the message digest algorithm to use when digesting the entries of a jar file.
@@ -523,7 +523,7 @@
 .na
 \f2Appendix A\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard message digest algorithm names. If this option is not specified, SHA256 will be used. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed. 
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard message digest algorithm names. If this option is not specified, SHA256 will be used. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed. 
 .TP 3
 \-signedjar file 
 Specifies the name to be used for the signed JAR file.
@@ -608,7 +608,7 @@
 .na
 \f2configuration attributes table\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#ATTRS. For example, the following command lists the contents of the PKCS#11 keystore provider instance with name suffix \f2SmartCard\fP: 
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#ATTRS. For example, the following command lists the contents of the PKCS#11 keystore provider instance with name suffix \f2SmartCard\fP: 
 .nf
 \f3
 .fl
@@ -1037,6 +1037,7 @@
 The following table explains how JAR files that were signed in JDK 1.1.x are treated in the Java 2 platform.
 .LP
 .LP
+.TS
 .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
 .de 35
 .ps \n(.s
@@ -1519,6 +1520,7 @@
 .rm g+
 .rm h+
 .rm i+
+.TE
 .if \n-(b.=0 .nr c. \n(.c-\n(d.-42
 
 .LP
@@ -1556,11 +1558,11 @@
 .na
 \f4Security\fP @
 .fi
-http://download.oracle.com/javase/tutorial/security/index.html trail of the 
+http://docs.oracle.com/javase/tutorial/security/index.html trail of the 
 .na
 \f4Java Tutorial\fP @
 .fi
-http://download.oracle.com/javase/tutorial/index.html for examples of the use of the \f3jarsigner\fP tool 
+http://docs.oracle.com/javase/tutorial/index.html for examples of the use of the \f3jarsigner\fP tool 
 .RE
 
 .LP

--- a/src/linux/doc/man/java.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/java.1	Fri Mar 16 15:20:53 2012 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
 ." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 ."
 ." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH java 1 "10 May 2011"
+.TH java 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -96,7 +96,7 @@
 .na
 \f2Server\-Class Machine Detection\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html 
 .TP 3
 \-server 
 Select the Java HotSpot Server VM. On a 64\-bit capable jdk only the Java Hotspot Server VM is supported so the \-server option is implicit.
@@ -106,7 +106,7 @@
 .na
 \f2Server\-Class Machine Detection\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html 
 .TP 3
 \-agentlib:libname[=options] 
 Load native agent library \f2libname\fP, e.g.
@@ -125,14 +125,14 @@
 .na
 \f2JVMTI Agent Command Line Options\fP @
 .fi
-http://download.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting. 
+http://docs.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting. 
 .TP 3
 \-agentpath:pathname[=options] 
 Load a native agent library by full pathname. For more information, see 
 .na
 \f2JVMTI Agent Command Line Options\fP @
 .fi
-http://download.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting. 
+http://docs.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting. 
 .TP 3
 \-classpath classpath 
 .TP 3
@@ -153,7 +153,7 @@
 .na
 \f2Setting the Class Path\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/index.html#classpath. 
+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#classpath. 
 .TP 3
 \-Dproperty=value 
 Set a system property value. 
@@ -172,21 +172,6 @@
 \-enableassertions[:<package name>"..." | :<class name> ] 
 .TP 3
 \-ea[:<package name>"..." | :<class name> ] 
-Enable assertions. Assertions are disabled by default.
-.br
-.br
-With no arguments, \f3enableassertions\fP or \f3\-ea\fP enables assertions. With one argument ending in \f2"..."\fP, the switch enables assertions in the specified package and any subpackages. If the argument is simply \f2"..."\fP, the switch enables assertions in the unnamed package in the current working directory. With one argument not ending in \f2"..."\fP, the switch enables assertions in the specified class.
-.br
-.br
-If a single command line contains multiple instances of these switches, they are processed in order before loading any classes. So, for example, to run a program with assertions enabled only in package \f2com.wombat.fruitbat\fP (and any subpackages), the following command could be used: 
-.nf
-\f3
-.fl
-java \-ea:com.wombat.fruitbat... <Main Class>
-.fl
-\fP
-.fi
-The \f3\-enableassertions\fP and \f3\-ea\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-enablesystemassertions\fP below. 
 .TP 3
 \-disableassertions[:<package name>"..." | :<class name> ] 
 .TP 3
@@ -206,6 +191,21 @@
 \fP
 .fi
 The \f3\-disableassertions\fP and \f3\-da\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-disablesystemassertions\fP below. 
+Enable assertions. Assertions are disabled by default.
+.br
+.br
+With no arguments, \f3enableassertions\fP or \f3\-ea\fP enables assertions. With one argument ending in \f2"..."\fP, the switch enables assertions in the specified package and any subpackages. If the argument is simply \f2"..."\fP, the switch enables assertions in the unnamed package in the current working directory. With one argument not ending in \f2"..."\fP, the switch enables assertions in the specified class.
+.br
+.br
+If a single command line contains multiple instances of these switches, they are processed in order before loading any classes. So, for example, to run a program with assertions enabled only in package \f2com.wombat.fruitbat\fP (and any subpackages), the following command could be used: 
+.nf
+\f3
+.fl
+java \-ea:com.wombat.fruitbat... <Main Class>
+.fl
+\fP
+.fi
+The \f3\-enableassertions\fP and \f3\-ea\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-enablesystemassertions\fP below. 
 .TP 3
 \-enablesystemassertions 
 .TP 3
@@ -217,12 +217,15 @@
 \-dsa 
 Disables asserts in all system classes. 
 .TP 3
+\-help or \-? 
+Display usage information and exit. 
+.TP 3
 \-jar 
 Execute a program encapsulated in a JAR file. The first argument is the name of a JAR file instead of a startup class name. In order for this option to work, the manifest of the JAR file must contain a line of the form \f3Main\-Class: \fP\f4classname\fP. Here, \f2classname\fP identifies the class having the \f2public\ static\ void\ main(String[]\ args)\fP method that serves as your application's starting point. See the jar(1) and the Jar trail of the 
 .na
 \f2Java Tutorial\fP @
 .fi
-http://download.oracle.com/javase/tutorial/deployment/jar for information about working with Jar files and Jar\-file manifests.
+http://docs.oracle.com/javase/tutorial/deployment/jar for information about working with Jar files and Jar\-file manifests.\ 
 .br
 .br
 When you use this option, the JAR file is the source of all user classes, and other user class path settings are ignored.
@@ -232,14 +235,14 @@
 .na
 \f2Java Archive (JAR) Files\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/jar/index.html. 
+http://docs.oracle.com/javase/7/docs/technotes/guides/jar/index.html. 
 .TP 3
 \-javaagent:jarpath[=options] 
 Load a Java programming language agent, see 
 .na
 \f2java.lang.instrument\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/java/lang/instrument/package\-summary.html. 
+http://docs.oracle.com/javase/7/docs/api/java/lang/instrument/package\-summary.html. 
 .TP 3
 \-jre\-restrict\-search 
 Include user\-private JREs in the version search. 
@@ -247,6 +250,12 @@
 \-no\-jre\-restrict\-search 
 Exclude user\-private JREs in the version search. 
 .TP 3
+\-showversion 
+Display version information and continue. (See also \f3\-version\fP.) 
+.TP 3
+\-splash:imagepath 
+Show splash screen with image specified by \f2imagepath\fP. 
+.TP 3
 \-verbose 
 .TP 3
 \-verbose:class 
@@ -259,7 +268,7 @@
 Report information about use of native methods and other Java Native Interface activity. 
 .TP 3
 \-version 
-Display version information and exit. 
+Display version information and exit. (See also \f3\-showversion\fP.) 
 .TP 3
 \-version:release 
 Specifies that the version specified by \f2release\fP is required by the class or jar file specified on the command line. If the version of the java command invoked does not meet this specification and an appropriate implementation is found on the system, the appropriate implementation will be used.
@@ -280,20 +289,6 @@
 .br
 .br
 See the following NOTES section for important policy information on the use of this option. 
-.TP 3
-\-showversion 
-Display version information and continue. 
-.TP 3
-\-? 
-.TP 3
-\-help 
-Display usage information and exit. 
-.TP 3
-\-splash:imagepath 
-Show splash screen with image specified by \f2imagepath\fP. 
-.TP 3
-\-X 
-Display information about non\-standard options and exit. 
 .RE
 
 .LP
@@ -302,6 +297,9 @@
 .LP
 .RS 3
 .TP 3
+\-X 
+Display information about non\-standard options and exit. 
+.TP 3
 \-Xint 
 Operate in interpreted\-only mode. Compilation to native code is disabled, and all bytecodes are executed by the interpreter. The performance benefits offered by the Java HotSpot VMs' adaptive compiler will not be present in this mode. 
 .TP 3
@@ -335,12 +333,15 @@
 .br
 Always use a local file system for storage of this file to avoid stalling the JVM due to network latency. The file may be truncated in the case of a full file system and logging will continue on the truncated file. This option overrides \f2\-verbose:gc\fP if both are given on the command line. 
 .TP 3
+\-Xmnsize or \-XX:NewSize 
+Sets the size of the young generation (nursery). Similar to the \f3\-Xns\fP flag of JRockit. 
+.TP 3
 \-Xmsn 
 Specify the initial size, in bytes, of the memory allocation pool. This value must be a multiple of 1024 greater than 1MB. Append the letter \f2k\fP or \f2K\fP to indicate kilobytes, or \f2m\fP or \f2M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration. For more information, see 
 .na
 \f2HotSpot Ergonomics\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html
+http://docs.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html
 .br
 .br
 Examples: 
@@ -363,7 +364,7 @@
 .na
 \f2HotSpot Ergonomics\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html
+http://docs.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html
 .br
 .br
 Examples: 
@@ -414,16 +415,117 @@
 \-Xssn 
 Set thread stack size. 
 .TP 3
+\-XX:AllocationPrefetchStyle=n 
+Sets the style of prefetch used during allocation. default=2.
+.br
+This option is similar to the \f3\-XX:+UseAllocPrefetch\fP flag of JRockit. 
+.TP 3
+\-XX:+AggressiveOpts 
+Enables aggressive optimization.
+.br
+This option is similar to the \f3\-XXaggressive\fP flag of JRockit. The type and level of optimization varies between Jrockit and HotSpot, and between releases. Therefore it is not directly comparable between JVMs. 
+.TP 3
+\-XX:+|\-DisableAttachMechanism 
+This option specifies whether tools (such as \f2jmap\fP and \f2jconsole\fP) are allowed to attach to the JVM. By default, this feature is disabled. That is, attaching is enabled. Example usage: 
+.nf
+\f3
+.fl
+      java \-XX:+DisableAttachMechanism
+.fl
+\fP
+.fi
+.TP 3
+\-XXLargePageSizeInBytes=n 
+This option is similar to the \f3\-XX:MaxLargePageSize\fP flag of JRockit. 
+.TP 3
+\-XX:MaxGCPauseMillis=n 
+Sets a target for the maximum GC pause time.
+.br
+This option is similar to the \f3\-Xpausetarget\fP flag of JRockit. This is a soft goal, and the JVMs will both do their best effort to achieve it.
+.br
+In Jrockit, the default value is 500ms. In HotSpot, there is no maximum value set by default. 
+.TP 3
+\-XX:NewSize 
+Sets the size of the young generation (nursery). Sames as \f3\-Xmn\fP\f4size\fP. 
+.TP 3
+\-XX:ParallelGCThreads=n 
+Sets the number of GC threads in the parallel collectors.
+.br
+This option is similar to the \f3\-Xxgcthreads=n\fP flag of JRockit. 
+.TP 3
+\-XX:PredictedClassLoadCount=n 
+This option requires that the \f3UnlockExperimentalVMOptions\fP flag be set first. Use the \f3PredictedClassLoadCount\fP flag if your application loads a lot of classes, and especially if \f3class.forName()\fP is used heavily. The recommended value is the number of classes loaded as shown in the output from \f3\-verbose:class\fP.
+.br
+Example usage: 
+.nf
+\f3
+.fl
+      java \-XX:+UnlockExperimentalVMOptions \-XX:PredictedClassLoadCount=60013
+.fl
+\fP
+.fi
+.TP 3
+\-XX:+PrintCompilation 
+Prints verbose output from the HotSpot dynamic runtime compiler.
+.br
+This option is similar to the \f3\-Xverbose:opt\fP flag of JRockit. 
+.TP 3
+\-XX:+PrintGCDetails \-XX:+PrintGCTimeStamps 
+Prints garbage collection output along with time stamps.
+.br
+This option is similar to the \f3\-Xverbose:gcpause\fP flag of JRockit. 
+.TP 3
+\-XX:SoftRefLRUPolicyMSPerMB=0 
+This flag enables aggressive processing of software references. Use this flag if HotSpot GC is impacted by the software reference count. 
+.TP 3
+\-XX:TLABSize=n 
+Thread local allocation buffers (TLAB) are enabled by default in HotSpot and JRockit. HotSpot automatically sizes TLABs based on allocation patterns. The \f3\-XX:TLABSize\fP option allows fine\-tuning the size of TLABs.
+.br
+In JRockit, TLAB sizes are set with the \f3\-XX:tlasize:min=\fP\f2n\fP\f3,preferred=\fP\f2nn\fP flag. For example, 
+.nf
+\f3
+.fl
+      \-XX:tlasize:min=4k,preferred=2048k
+.fl
+\fP
+.fi
+.TP 3
+\-XX:+UnlockCommercialFeatures 
+Use this flag to actively unlock the use of commercial features. Commercial features are the products "Oracle Java SE Advanced", or "Oracle Java SE Suite", as defined at 
+.na
+\f2the Oracle Java SE Products web page\fP @
+.fi
+http://www.oracle.com/technetwork/java/javase/terms/products/index.html.
+.br
+If this flag is not specified, the default is to run the Java virtual machine without the commercial features being available. Once they are enabled, it is not possible to disable their use at runtime. 
+.TP 3
 \-XX:+UseAltSigs 
 The VM uses \f2SIGUSR1\fP and \f2SIGUSR2\fP by default, which can sometimes conflict with applications that signal\-chain \f2SIGUSR1\fP and \f2SIGUSR2\fP. The \f2\-XX:+UseAltSigs\fP option will cause the VM to use signals other than \f2SIGUSR1\fP and \f2SIGUSR2\fP as the default. 
-.RE
-
+.TP 3
+\-XX:+|\-UseCompressedOops 
+Enables compressed references in 64\-bit JVMs.
+.br
+This option is true by default.
+.br
+This option is similar to the \f3\-XxcompressedRefs\fP flag of JRockit. 
+.TP 3
+\-XX:+UseConcMarkSweepGC or \-XX:+UseG1GC 
+These flags enable either the Concurrent Mark Sweep (CMS) or the G1 garbage collectors.
+.br
+These options are similar to the \f3\-XgcPrio:pausetime\fP flag of JRockit. 
+.TP 3
+\-XX:+|\-UseLargePages 
+Use this flag to enable large page support. Large pages are enabled by default on Solaris.
+.br
+This option is similar to the \f3\-Xlargepages\fP flag of JRockit. 
+.TP 3
+\-XX:+UseParallelOldGC 
+Enables the parallel garbage collectors, which are optimized for throughput and average response time.
+.br
+This option is similar to the \f3\-Xgc:genpar\fP flag of JRockit. 
+.SH "NOTES" 
 .LP
-.SH "NOTES"
-.LP
-.LP
-The \f3\-version:\fP\f2release\fP command line option places no restrictions on the complexity of the release specification. However, only a restricted subset of the possible release specifications represent sound policy and only these are fully supported. These policies are:
-.LP
+The \f3\-version:\fP\f2release\fP command line option places no restrictions on the complexity of the release specification. However, only a restricted subset of the possible release specifications represent sound policy and only these are fully supported. These policies are: 
 .RS 3
 .TP 3
 1.
@@ -461,13 +563,9 @@
 .fi
 Similar to item 2. this is useful when a change was introduced in a release (1.7) but also made available in updates to previous releases. 
 .RE
-
-.LP
-.SH "EXIT STATUS"
+.SH "EXIT STATUS" 
 .LP
-.LP
-The following exit values are generally returned by the launcher, typically when the launcher is called with the wrong arguments, serious errors, or exceptions thrown from the Java Virtual Machine. However, a Java application may choose to return any value using the API call \f2System.exit(exitValue)\fP.
-.LP
+The following exit values are generally returned by the launcher, typically when the launcher is called with the wrong arguments, serious errors, or exceptions thrown from the Java Virtual Machine. However, a Java application may choose to return any value using the API call \f2System.exit(exitValue)\fP. 
 .RS 3
 .TP 2
 o
@@ -476,10 +574,7 @@
 o
 \f2>0\fP: An error occurred 
 .RE
-
-.LP
-.SH "SEE ALSO"
-.LP
+.SH "SEE ALSO" 
 .RS 3
 .TP 2
 o
@@ -498,13 +593,13 @@
 .na
 \f2The Java Extensions Framework\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/extensions/index.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/extensions/index.html 
 .TP 2
 o
 .na
 \f2Security Features\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/index.html. 
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/index.html. 
 .TP 2
 o
 .na
@@ -512,6 +607,7 @@
 .fi
 http://java.sun.com/docs/hotspot/VMOptions.html. 
 .RE
+.RE
 
 .LP
  

--- a/src/linux/doc/man/javac.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/javac.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH javac 1 "10 May 2011"
+.TH javac 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -190,25 +190,25 @@
 .RS 3
 .TP 3
 1.3 
-The compiler does \f2not\fP support assertions, generics, or other language features introduced after JDK 1.3. 
+The compiler does \f2not\fP support assertions, generics, or other language features introduced after Java SE 1.3. 
 .TP 3
 1.4 
-The compiler accepts code containing assertions, which were introduced in JDK 1.4. 
+The compiler accepts code containing assertions, which were introduced in Java SE 1.4. 
 .TP 3
 1.5 
-The compiler accepts code containing generics and other language features introduced in JDK 5. 
+The compiler accepts code containing generics and other language features introduced in Java SE 5. 
 .TP 3
 5 
 Synonym for 1.5. 
 .TP 3
 1.6 
-This is the default value. No language changes were introduced in Java SE 6. However, encoding errors in source files are now reported as errors, instead of warnings, as previously. 
+No language changes were introduced in Java SE 6. However, encoding errors in source files are now reported as errors instead of warnings as in previous releases of Java SE. 
 .TP 3
 6 
 Synonym for 1.6. 
 .TP 3
 1.7 
-The compiler accepts code with features introduced in JDK 7. 
+This is the default value. The compiler accepts code with features introduced in Java SE 7. 
 .TP 3
 7 
 Synonym for 1.7. 
@@ -243,9 +243,8 @@
 .RS 3
 .TP 3
 \-target version 
-Generate class files that target a specified version of the VM. Class files will run on the specified target and on later versions, but not on earlier versions of the VM. Valid targets are \f31.1\fP \f31.2\fP \f31.3\fP \f31.4\fP \f31.5\fP (also \f35\fP) \f31.6\fP (also \f36\fP) and \f31.7\fP (also \f37\fP).
-.br
-.br
+Generate class files that target a specified version of the VM. Class files will run on the specified target and on later versions, but not on earlier versions of the VM. Valid targets are \f31.1\fP, \f31.2\fP, \f31.3\fP, \f31.4\fP, \f31.5\fP (also \f35\fP), \f31.6\fP (also \f36\fP), and \f31.7\fP (also \f37\fP). 
+.LP
 The default for \f3\-target\fP depends on the value of \f3\-source\fP: 
 .RS 3
 .TP 2
@@ -259,6 +258,12 @@
 If \-source is \f31.3\fP, the value of \-target is \f31.4\fP 
 .TP 2
 o
+If \-source is \f31.5\fP, the value of \-target is \f31.7\fP 
+.TP 2
+o
+If \-source is \f31.6\fP, the value of \-target is \f31.7\fP 
+.TP 2
+o
 For \f3all other values\fP of \-source, the value of \f3\-target\fP is the value of \f3\-source\fP. 
 .RE
 .TP 3
@@ -563,11 +568,10 @@
 .nf
 \f3
 .fl
-% javac AnnoProc.java
+% \fP\f3javac AnnoProc.java\fP
 .fl
-% javac \-cp . \-Xlint:processing \-processor AnnoProc \-proc:only AnnosWithoutProcessors.java
+% \f3javac \-cp . \-Xlint:processing \-processor AnnoProc \-proc:only AnnosWithoutProcessors.java\fP
 .fl
-\fP
 .fi
 When the compiler runs the annotation processor against the source file \f2AnnosWithoutProcessors.java\fP, it generates the following warning:
 .br
@@ -1135,7 +1139,7 @@
 Cross\-Compilation Example
 .LP
 .LP
-Here we use \f3javac\fP to compile code that will run on a 1.6 VM.
+The following example uses \f3javac\fP to compile code that will run on a 1.6 VM.
 .LP
 .nf
 \f3
@@ -1174,7 +1178,7 @@
 .na
 \f2The javac Guide\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/javac/index.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/javac/index.html 
 .TP 2
 o
 java(1) \- the Java Application Launcher 
@@ -1198,7 +1202,7 @@
 .na
 \f2The Java Extensions Framework\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/extensions/index.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/extensions/index.html 
 .RE
 
 .LP

--- a/src/linux/doc/man/javadoc.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/javadoc.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH javadoc 1 "10 May 2011"
+.TH javadoc 1 "16 Mar 2012"
 .SH "Name"
 javadoc \- The Java API Documentation Generator
 .LP
@@ -111,7 +111,7 @@
 .na
 \f2How Classes Are Found\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html. Generally speaking, classes you create must either be loaded as an extension or in the Javadoc tool's class path.
+http://docs.oracle.com/javase/7/docs/technotes/tools/findingclasses.html. Generally speaking, classes you create must either be loaded as an extension or in the Javadoc tool's class path.
 .SS 
 Javadoc Doclets
 .LP
@@ -122,7 +122,7 @@
 .na
 \f2Javadoc Doclets\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/index.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/index.html 
 .TP 2
 o
 The \f2\-doclet\fP command\-line option 
@@ -137,7 +137,7 @@
 .na
 \f2Javadoc Enhancements\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/index.html for details about improvements added in Javadoc. 
+http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/index.html for details about improvements added in Javadoc. 
 .TP 2
 o
 .na
@@ -206,7 +206,7 @@
 .na
 \f21.3\fP @
 .fi
-http://download.oracle.com/javase/1.3/docs/tooldocs/solaris/javadoc.html#referencedclasses.) When the Javadoc tool is run, it should load into memory all of the referenced classes in javadoc's bootclasspath and classpath. (The Javadoc tool prints a "Class not found" warning for referenced classes not found.) The Javadoc tool can derive enough information from the .class files to determine their existence and the fully\-qualified names of their members. 
+http://docs.oracle.com/javase/1.3/docs/tooldocs/solaris/javadoc.html#referencedclasses.) When the Javadoc tool is run, it should load into memory all of the referenced classes in javadoc's bootclasspath and classpath. (The Javadoc tool prints a "Class not found" warning for referenced classes not found.) The Javadoc tool can derive enough information from the .class files to determine their existence and the fully\-qualified names of their members. 
 .LP
 .TP 3
 external referenced classes 
@@ -338,14 +338,14 @@
 .na
 \f2Package Summary\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/java/applet/package\-summary.html. 
+http://docs.oracle.com/javase/7/docs/api/java/applet/package\-summary.html. 
 .TP 2
 o
 Copies the first sentence of the package comment to the top of the package summary page. It also adds the package name and this first sentence to the list of packages on the overview page, as shown in 
 .na
 \f2Overview Summary\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/overview\-summary.html. The end\-of\-sentence is determined by the same rules used for the end of the first sentence of class and member main descriptions. 
+http://docs.oracle.com/javase/7/docs/api/overview\-summary.html. The end\-of\-sentence is determined by the same rules used for the end of the first sentence of class and member main descriptions. 
 .RE
 .SS 
 Overview Comment File
@@ -372,7 +372,7 @@
 .na
 \f2Overview Summary\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/overview\-summary.html. 
+http://docs.oracle.com/javase/7/docs/api/overview\-summary.html. 
 .TP 2
 o
 Copies the first sentence of the overview comment to the top of the overview summary page. 
@@ -828,6 +828,7 @@
 .LP
 The current tags are:
 .LP
+.TS
 .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
 .de 35
 .ps \n(.s
@@ -1036,6 +1037,7 @@
 .nr T. 1
 .T# 1
 .35
+.TE
 .if \n-(b.=0 .nr c. \n(.c-\n(d.-42
 .LP
 For custom tags, see the \-tag option.
@@ -1091,7 +1093,7 @@
 .na
 \f2The @deprecated tag\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/deprecation/index.html.
+http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/deprecation/index.html.
 .LP
 .RS 3
 .TP 3
@@ -1469,6 +1471,7 @@
 Of course the advantage of providing shorter, "partially\-qualified" names is that they are shorter to type and there is less clutter in the source code. The following table shows the different forms of the name, where \f2Class\fP can be a class or interface, \f2Type\fP can be a class, interface, array, or primitive, and \f2method\fP can be a method or constructor. 
 .LP
 .LP
+.TS
 .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
 .de 35
 .ps \n(.s
@@ -1699,6 +1702,7 @@
 .rm b+
 .rm c+
 .rm d+
+.TE
 .if \n-(b.=0 .nr c. \n(.c-\n(d.-58
 .LP
 The following notes apply to the above table: 
@@ -1747,6 +1751,7 @@
 Use \-noqualifier to globally remove the package names.
 .br
 .LP
+.TS
 .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
 .de 35
 .ps \n(.s
@@ -2093,6 +2098,7 @@
 .rm g+
 .rm h+
 .rm i+
+.TE
 .if \n-(b.=0 .nr c. \n(.c-\n(d.-28
 .LP
 \f3Examples of @see\fP
@@ -2160,7 +2166,7 @@
 .na
 \f2Documenting Serializable Fields and Data for a Class\fP @
 .fi
-http://download.oracle.com/javase/7/docs/platform/serialization/spec/serial\-arch.html," Section 1.6 of the \f2Java Object Serialization Specification\fP. Also see the 
+http://docs.oracle.com/javase/7/docs/platform/serialization/spec/serial\-arch.html," Section 1.6 of the \f2Java Object Serialization Specification\fP. Also see the 
 .na
 \f2Serialization FAQ\fP @
 .fi
@@ -2253,7 +2259,7 @@
 .na
 \f2Constant Field Values\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/constant\-values.html page. 
+http://docs.oracle.com/javase/7/docs/api/constant\-values.html page. 
 .LP
 .TP 3
 @version\  version\-text 
@@ -2541,6 +2547,7 @@
 .LP
 The options are:
 .LP
+.TS
 .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
 .de 35
 .ps \n(.s
@@ -2809,6 +2816,7 @@
 .rm a+
 .rm b+
 .rm c+
+.TE
 .if \n-(b.=0 .nr c. \n(.c-\n(d.-127
 .LP
 Options shown in \f2italic\fP are the Javadoc core options, which are provided by the front end of the Javadoc tool and are available to all doclets. The standard doclet itself provides the non\-italic options.
@@ -2946,7 +2954,7 @@
 .na
 \f2class path\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/index.html#general documentation for specifying \f2classpathlist\fP.
+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#general documentation for specifying \f2classpathlist\fP.
 .br
 .br
 If \f2\-sourcepath\fP is omitted, the Javadoc tool uses \f2\-classpath\fP to find the source files as well as class files (for backward compatibility). Therefore, if you want to search for source and class files in separate paths, use both \f2\-sourcepath\fP and \f2\-classpath\fP.
@@ -2966,7 +2974,7 @@
 .na
 \f2How Classes Are Found\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html.  
+http://docs.oracle.com/javase/7/docs/technotes/tools/findingclasses.html.  
 .br
 .br
 As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP (a Java program cannot tell the difference between the two invocations).
@@ -3005,7 +3013,7 @@
 .na
 \f2How Classes Are Found\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles. for more details. Separate directories in \f2classpathlist\fP with colons (:).  
+http://docs.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles. for more details. Separate directories in \f2classpathlist\fP with colons (:).  
 .TP 3
 \-extdirs\  dirlist 
 Specifies the directories where extension classes reside. These are any classes that use the Java Extension mechanism. The extdirs is part of the search path the Javadoc tool will use to look up source and class files. See \f2\-classpath\fP (above) for more details. Separate directories in \f2dirlist\fP with colons (:).  
@@ -3021,7 +3029,7 @@
 .na
 \f2java.text.BreakIterator\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/java/text/BreakIterator.html to determine the end of the first sentence for English (all other locales already use \f2BreakIterator\fP), rather than an English language, locale\-specific algorithm. By \f2first sentence\fP, we mean the first sentence in the main description of a package, class or member. This sentence is copied to the package, class or member summary, and to the alphabetic index.
+http://docs.oracle.com/javase/7/docs/api/java/text/BreakIterator.html to determine the end of the first sentence for English (all other locales already use \f2BreakIterator\fP), rather than an English language, locale\-specific algorithm. By \f2first sentence\fP, we mean the first sentence in the main description of a package, class or member. This sentence is copied to the package, class or member summary, and to the alphabetic index.
 .br
 .br
 From JDK 1.2 forward, the BreakIterator class is already used to determine the end of sentence for all languages but English. Therefore, the \f2\-breakiterator\fP option has no effect except for English from 1.2 forward. English has its own default algorithm: 
@@ -3203,13 +3211,13 @@
 .br
 \f3Example using absolute links to the external docs\fP \- Let us say you want to link to the \f2java.lang\fP, \f2java.io\fP and other Java Platform packages at 
 .na
-\f2http://download.oracle.com/javase/7/docs/api/\fP @
+\f2http://docs.oracle.com/javase/7/docs/api/\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/. The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other options, such as \f2\-sourcepath\fP and \f2\-d\fP, are not shown.) 
+http://docs.oracle.com/javase/7/docs/api/. The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other options, such as \f2\-sourcepath\fP and \f2\-d\fP, are not shown.) 
 .nf
 \f3
 .fl
-  % \fP\f3javadoc \-link http://download.oracle.com/javase/7/docs/api/ com.mypackage\fP
+  % \fP\f3javadoc \-link http://docs.oracle.com/javase/7/docs/api/ com.mypackage\fP
 .fl
 .fi
 \f3Example using relative links to the external docs\fP \- Let us say you have two packages whose docs are generated in different runs of the Javadoc tool, and those docs are separated by a relative path. In this example, the packages are \f2com.apipackage\fP, an API, and \f2com.spipackage\fP, an SPI (Service Provide Interface). You want the documentation to reside in \f2docs/api/com/apipackage\fP and \f2docs/spi/com/spipackage\fP. Assuming the API package documentation is already generated, and that \f2docs\fP is the current directory, you would document the SPI package with links to the API documentation by running: 
@@ -3259,9 +3267,9 @@
 .br
 For example, the package list for the Java SE 6 API is located at 
 .na
-\f2http://download.oracle.com/javase/7/docs/api/package\-list\fP @
+\f2http://docs.oracle.com/javase/7/docs/api/package\-list\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/package\-list. and starts as follows: 
+http://docs.oracle.com/javase/7/docs/api/package\-list. and starts as follows: 
 .nf
 \f3
 .fl
@@ -3328,15 +3336,15 @@
 You can specify multiple \f2\-linkoffline\fP options in a given javadoc run. (Prior to 1.2.2, it could be specified only once.)
 .br
 .br
-\f3Example using absolute links to the external docs\fP \- Let us say you want to link to the \f2java.lang\fP, \f2java.io\fP and other Java SE Platform packages at \f2http://download.oracle.com/javase/7/docs/api/\fP, but your shell does not have web access. You could open the \f2package\-list\fP file in a browser at 
+\f3Example using absolute links to the external docs\fP \- Let us say you want to link to the \f2java.lang\fP, \f2java.io\fP and other Java SE Platform packages at \f2http://docs.oracle.com/javase/7/docs/api/\fP, but your shell does not have web access. You could open the \f2package\-list\fP file in a browser at 
 .na
-\f2http://download.oracle.com/javase/7/docs/api/package\-list\fP @
+\f2http://docs.oracle.com/javase/7/docs/api/package\-list\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/package\-list, save it to a local directory, and point to this local copy with the second argument, \f2packagelistLoc\fP. In this example, the package list file has been saved to the current directory "\f2.\fP" . The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other necessary options, such as \f2\-sourcepath\fP, are not shown.) 
+http://docs.oracle.com/javase/7/docs/api/package\-list, save it to a local directory, and point to this local copy with the second argument, \f2packagelistLoc\fP. In this example, the package list file has been saved to the current directory "\f2.\fP" . The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other necessary options, such as \f2\-sourcepath\fP, are not shown.) 
 .nf
 \f3
 .fl
-% \fP\f3javadoc \-linkoffline http://download.oracle.com/javase/7/docs/api/ . com.mypackage\fP
+% \fP\f3javadoc \-linkoffline http://docs.oracle.com/javase/7/docs/api/ . com.mypackage\fP
 .fl
 .fi
 \f3Example using relative links to the external docs\fP \- It's not very common to use \f2\-linkoffline\fP with relative paths, for the simple reason that \f2\-link\fP usually suffices. When using \f2\-linkoffline\fP, the \f2package\-list\fP file is generally local, and when using relative links, the file you are linking to is also generally local. So it is usually unnecessary to give a different path for the two arguments to \f2\-linkoffline\fP. When the two arguments are identical, you can use \f2\-link\fP. See the \f2\-link\fP relative example.
@@ -3687,7 +3695,7 @@
 .na
 \f2Taglet Overview\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/taglet/overview.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/taglet/overview.html 
 .RE
 Taglets are useful for block or inline tags. They can have any number of arguments and implement custom behavior, such as making text bold, formatting bullets, writing out the text to a file, or starting other processes.
 .br
@@ -3900,7 +3908,7 @@
 .na
 \f2Standard Doclet\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/standard\-doclet.html#runningprogrammatically.
+http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/standard\-doclet.html#runningprogrammatically.
 .LP
 \f3Running Doclets\fP \- The instructions given below are for invoking the standard HTML doclet. To invoke a custom doclet, use the \-doclet and \-docletpath options. For full, working examples of running a particular doclet, see the 
 .na
@@ -4215,12 +4223,12 @@
 .na
 \f2Setting the Class Path\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/index.html#general 
+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#general 
 .TP 2
 o
 .na
 \f2How Javac and Javadoc Find Classes\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles (tools.jar) 
+http://docs.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles (tools.jar) 
 .RE
  

--- a/src/linux/doc/man/javah.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/javah.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH javah 1 "10 May 2011"
+.TH javah 1 "16 Mar 2012"
 
 .LP
 .SH "Name"

--- a/src/linux/doc/man/javap.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/javap.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH javap 1 "10 May 2011"
+.TH javap 1 "16 Mar 2012"
 
 .LP
 .SH "Name"

--- a/src/linux/doc/man/javaws.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/javaws.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH javaws 1 "10 May 2011"
+.TH javaws 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -208,7 +208,7 @@
 .na
 \f2System\- and User\-Level Properties\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/properties.html.
+http://docs.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/properties.html.
 .LP
 .SH "MORE INFORMATION"
 .LP
@@ -217,6 +217,6 @@
 .na
 \f2Java Web Start\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/javaws/index.html.
+http://docs.oracle.com/javase/7/docs/technotes/guides/javaws/index.html.
 .LP
  

--- a/src/linux/doc/man/jcmd.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/jcmd.1	Fri Mar 16 15:20:53 2012 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
 ." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 ."
 ." This code is free software; you can redistribute it and/or modify it
@@ -19,27 +19,27 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jcmd 1 "22 Novembre 2011"
+.TH jcmd 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
 jcmd \- Diagnostic Command
-.br
-
+.LP
+.LP
+\f3jcmd\fP is a utility to send diagnostic command requests to a running Java Virtual Machine.
 .LP
 .SH "SYNOPSIS"
 .LP
 .nf
 \f3
 .fl
-\fP\f3jcmd\fP [ option ]
+    \fP\f3jcmd\fP [ option ] 
 .fl
-\f3jcmd\fP <\fIpid\fR | \fImain class\fR> PerfCounter.print
+    \f3jcmd\fP <\f2pid\fP | \f2main class\fP> PerfCounter.print
 .fl
-\f3jcmd\fP <\fIpid\fR | \fImain class\fR> \fIcommand\fR [\fIarguments\fR]
+    \f3jcmd\fP <\f2pid\fP | \f2main class\fP> \f2command\fP [\f2arguments\fP]
 .fl
-\f3jcmd\fP <\fIpid\fR | \fImain class\fR> -f \fIfile\fR
-.fl
+    \f3jcmd\fP <\f2pid\fP | \f2main class\fP> \-f \f2file\fP
 .fl
 .fi
 
@@ -47,12 +47,23 @@
 .SH "DESCRIPTION"
 .LP
 .LP
-\f3jcmd\fP is a utility to send diagnostic command requests to a Java 
-Virtual Machine supporting this feature. Used without arguments or with the \-l option, jcmd prints the list of running Java processes with their process id, their main class and their command line arguments. When a process id is specified on the command line, jcmd sends the diagnostic command request to the process with this id. When a main class is specified on the command line, jcmd sends the diagnostic command request to all Java processes with this main class. With the PerfCounter.print argument, jcmd prints the performance counters available on the targeted Java process(es). With the \-f option, jcmd sends to the targeted Java process(es) the diagnostic commands stored in the file \fIfile\fR.
+\f3jcmd\fP is a utility to send diagnostic command requests to a Java Virtual Machine supporting this feature.
+.LP
+.LP
+Used without arguments or with the \-l option, jcmd prints the list of running Java processes with their process id, their main class and their command line arguments.
+.LP
+.LP
+When a process id is specified on the command line, jcmd sends the diagnostic command request to the process with this id.
+.LP
 .LP
-\fP
-.fi
-
+When a main class is specified on the command line, jcmd sends the diagnostic command request to all Java processes with this main class.
+.LP
+.LP
+With the PerfCounter.print argument, jcmd prints the performance counters available on the targeted Java process(es).
+.LP
+.LP
+With the \-f option, jcmd sends to the targeted Java process(es) the diagnostic commands stored in the file \f2file\fP.
+.LP
 .SH "OPTIONS"
 .LP
 .LP
@@ -61,17 +72,15 @@
 .RS 3
 .TP 3
 \-l 
-prints the list of running Java processes with their process id, their
-main class and their command line arguments. 
+Prints the list of running Java processes with their process id, their main class and their command line arguments. 
+.br
 .TP 3
 \-h 
-prints a help message.
-.br
+Prints a help message. 
 .br
 .TP 3
 \-help 
-prints a help message
-.br
+Prints a help message. 
 .RE
 
 .LP
@@ -79,39 +88,26 @@
 .LP
 .RS 3
 .TP 3
-\fIpid\fR
-Identifies the process which will receive the diagnostic command requests. The process must be a Java process. To get a list of Java processes running on a machine, jps(1) or jcmd(1) may be used. 
-.RE
-.LP
-.RS 3
+pid 
+Identifies the process that receives the diagnostic command requests. The process must be a Java process. To get a list of Java processes running on a machine, use jps(1) or jcmd(1). 
+.br
 .TP 3
-\fImain class\fR
-Main class of the process which will receive the diagnostic command requests. If several running Java processes share this main class, the diagnostic command request will be sent to all these processes. To get a list of Java processes running on a machine, jps(1) or jcmd(1) may be used. 
-.RE
-.RS 3
+main class 
+Main class of the process that receives the diagnostic command requests. If several running Java processes share this main class, the diagnostic command request is sent to all these processes. To get a list of Java processes running on a machine, use jps(1) or jcmd(1). 
+.br
 .TP 3
-\fIcommand\fR [\fIarguments\fR]
-Invoke the diagnostic command called \fIcommand\fR on the targeted Java
-process(es). The list of available diagnostic commands for a given
-process can be obtained by invoking the 'help' command on this process.
-Each diagnostic command has its own set of \fIarguments\fR which can be 
-obtained by invoking the 'help' command followed by the command name.
-.RE
-.RS 3
+command [arguments] 
+Invoke the diagnostic command called \f2command\fP on the targeted Java process(es). The list of available diagnostic commands for a given process can be obtained by invoking the \f3help\fP command on this process. Each diagnostic command has its own set of \f2arguments\fP, which can be obtained by invoking the \f3help\fP command followed by the command name. 
+.br
 .TP 3
-\fIPerfCounter.print\fR
-Print the performance counters available on the targeted Java
-process(es). The list of performance counters may vary with the Java
-process.
-.RE
-.RS 3
+Counter.print 
+Print the performance counters available on the targeted Java process(es). The list of performance counters may vary with the Java process. 
+.br
 .TP 3
-\fI-f file\fR
-Read commands from \fIfile\fR and invoke them on the targeted Java
-process(es). In  \fIfile\fR, each command must be written on a single line. 
-Lines starting with # are ignored. Processing of \fIfile\fR ends when
-all lines have been invoked or when a line containing the 'stop' keyword
-is read.
+\-f file 
+Read commands from \f2file\fP and invoke them on the targeted Java process(es). In \f2file\fP, each command must be written on a single line. Lines starting with # are ignored. Processing of \f2file\fP ends when all lines have been invoked or when a line containing the \f3stop\fP keyword is read. 
+.RE
+
 .LP
 .SH "SEE ALSO"
 .LP
@@ -121,4 +117,8 @@
 jps(1) 
 .RE
 
+.LP
+.LP
+jps(1)
+.LP
  

--- a/src/linux/doc/man/jconsole.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/jconsole.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jconsole 1 "10 May 2011"
+.TH jconsole 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -52,21 +52,21 @@
 .na
 \f2JMX Monitoring and Management\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/management/agent.html for details. 
+http://docs.oracle.com/javase/7/docs/technotes/guides/management/agent.html for details. 
 .TP 2
 o
 \f2host\fP:\f2port\fP Name of the host system on which the Java VM is running and the port number specified by the system property \f2com.sun.management.jmxremote.port\fP when the Java VM was started. See 
 .na
 \f2JMX Monitoring and Management\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/management/agent.html for details. 
+http://docs.oracle.com/javase/7/docs/technotes/guides/management/agent.html for details. 
 .TP 2
 o
 \f2jmxUrl\fP Address of the JMX agent to be connected to as described in 
 .na
 \f2JMXServiceURL\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/javax/management/remote/JMXServiceURL.html. 
+http://docs.oracle.com/javase/7/docs/api/javax/management/remote/JMXServiceURL.html. 
 .RE
 .RE
 
@@ -103,7 +103,7 @@
 .na
 \f2com.sun.tools.jconsole.JConsolePlugin\fP @
 .fi
-http://download.oracle.com/javase/7/docs/jdk/api/jconsole/spec/com/sun/tools/jconsole/JConsolePlugin.html class. 
+http://docs.oracle.com/javase/7/docs/jdk/api/jconsole/spec/com/sun/tools/jconsole/JConsolePlugin.html class. 
 .TP 3
 \-version 
 Output version information and exit. 
@@ -124,13 +124,13 @@
 .na
 \f2Using JConsole\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/management/jconsole.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/management/jconsole.html 
 .TP 2
 o
 .na
 \f2Monitoring and Management for Java Platform\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/management/index.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/management/index.html 
 .RE
 
 .LP

--- a/src/linux/doc/man/jdb.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/jdb.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jdb 1 "10 May 2011"
+.TH jdb 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -58,7 +58,7 @@
 .na
 \f2Java Platform Debugger Architecture\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/jpda/index.html that provides inspection and debugging of a local or remote Java Virtual Machine.
+http://docs.oracle.com/javase/7/docs/technotes/guides/jpda/index.html that provides inspection and debugging of a local or remote Java Virtual Machine.
 .LP
 .SS 
 Starting a jdb Session
@@ -122,7 +122,7 @@
 .na
 \f2documentation\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/jpda/conninv.html on these connection options. For information on starting a J2SE 1.4.2 or early VM for use with \f3jdb\fP see the 
+http://docs.oracle.com/javase/7/docs/technotes/guides/jpda/conninv.html on these connection options. For information on starting a J2SE 1.4.2 or early VM for use with \f3jdb\fP see the 
 .na
 \f21.4.2 documentation\fP @
 .fi
@@ -301,7 +301,7 @@
 .na
 \f2documentation\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/jpda/conninv.html on these connection alternatives.
+http://docs.oracle.com/javase/7/docs/technotes/guides/jpda/conninv.html on these connection alternatives.
 .LP
 .SS 
 Options Forwarded to Debuggee Process

--- a/src/linux/doc/man/jhat.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/jhat.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jhat 1 "10 May 2011"
+.TH jhat 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -67,7 +67,7 @@
 .na
 \f2HotSpotDiagnosticMXBean\fP @
 .fi
-http://download.oracle.com/javase/7/docs/jre/api/management/extension/com/sun/management/HotSpotDiagnosticMXBean.html at runtime; 
+http://docs.oracle.com/javase/7/docs/jre/api/management/extension/com/sun/management/HotSpotDiagnosticMXBean.html at runtime; 
 .TP 2
 o
 Heap dump will be generated when OutOfMemoryError is thrown by specifying \-XX:+HeapDumpOnOutOfMemoryError VM option; 

--- a/src/linux/doc/man/jinfo.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/jinfo.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jinfo 1 "10 May 2011"
+.TH jinfo 1 "16 Mar 2012"
 
 .LP
 .SH "Name"

--- a/src/linux/doc/man/jmap.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/jmap.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jmap 1 "10 May 2011"
+.TH jmap 1 "16 Mar 2012"
 
 .LP
 .SH "Name"

--- a/src/linux/doc/man/jps.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/jps.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jps 1 "10 May 2011"
+.TH jps 1 "16 Mar 2012"
 
 .LP
 .SH "Name"

--- a/src/linux/doc/man/jrunscript.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/jrunscript.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jrunscript 1 "10 May 2011"
+.TH jrunscript 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -182,6 +182,6 @@
 .na
 \f2jsdocs\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/share/jsdocs/allclasses\-noframe.html.
+http://docs.oracle.com/javase/7/docs/technotes/tools/share/jsdocs/allclasses\-noframe.html.
 .LP
  

--- a/src/linux/doc/man/jsadebugd.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/jsadebugd.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jsadebugd 1 "10 May 2011"
+.TH jsadebugd 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -62,7 +62,7 @@
 .na
 \f2rmiregistry\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/index.html#rmi must be started with:
+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#rmi must be started with:
 .LP
 .nf
 \f3
@@ -102,7 +102,7 @@
 .na
 \f2rmiregistry\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/index.html#rmi 
+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#rmi 
 .RE
 
 .LP

--- a/src/linux/doc/man/jstack.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/jstack.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jstack 1 "10 May 2011"
+.TH jstack 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -106,7 +106,7 @@
 .na
 \f2ownable synchronizers\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/java/util/concurrent/locks/AbstractOwnableSynchronizer.html. 
+http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/locks/AbstractOwnableSynchronizer.html. 
 .TP 3
 \-m 
 prints mixed mode (both Java and native C/C++ frames) stack trace. 

--- a/src/linux/doc/man/jstat.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/jstat.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jstat 1 "10 May 2011"
+.TH jstat 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -160,6 +160,7 @@
 .br
 .br
 .LP
+.TS
 .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
 .de 35
 .ps \n(.s
@@ -667,6 +668,7 @@
 .rm j+
 .rm k+
 .rm l+
+.TE
 .if \n-(b.=0 .nr c. \n(.c-\n(d.-52
 .TP 3
 \-h n 
@@ -692,6 +694,7 @@
 \-class Option
 .LP
 .LP
+.TS
 .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
 .de 35
 .ps \n(.s
@@ -888,6 +891,7 @@
 .rm a+
 .rm b+
 .rm c+
+.TE
 .if \n-(b.=0 .nr c. \n(.c-\n(d.-21
 
 .LP
@@ -895,6 +899,7 @@
 \-compiler Option
 .LP
 .LP
+.TS
 .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
 .de 35
 .ps \n(.s
@@ -1186,6 +1191,7 @@
 .rm d+
 .rm e+
 .rm f+
+.TE
 .if \n-(b.=0 .nr c. \n(.c-\n(d.-29
 
 .LP
@@ -1193,6 +1199,7 @@
 \-gc Option
 .LP
 .LP
+.TS
 .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
 .de 35
 .ps \n(.s
@@ -1788,6 +1795,7 @@
 .rm l+
 .rm m+
 .rm n+
+.TE
 .if \n-(b.=0 .nr c. \n(.c-\n(d.-63
 
 .LP
@@ -1795,6 +1803,7 @@
 \-gccapacity Option
 .LP
 .LP
+.TS
 .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
 .de 35
 .ps \n(.s
@@ -2427,6 +2436,7 @@
 .rm m+
 .rm n+
 .rm o+
+.TE
 .if \n-(b.=0 .nr c. \n(.c-\n(d.-67
 
 .LP
@@ -2437,6 +2447,7 @@
 This option displays the same summary of garbage collection statistics as the \f3\-gcutil\fP option, but includes the causes of the last garbage collection event and (if applicable) the current garbage collection event. In addition to the columns listed for \f3\-gcutil\fP, this option adds the following columns:
 .LP
 .LP
+.TS
 .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
 .de 35
 .ps \n(.s
@@ -2580,6 +2591,7 @@
 .35
 .rm a+
 .rm b+
+.TE
 .if \n-(b.=0 .nr c. \n(.c-\n(d.-13
 
 .LP
@@ -2587,6 +2599,7 @@
 \-gcnew Option
 .LP
 .LP
+.TS
 .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
 .de 35
 .ps \n(.s
@@ -3034,6 +3047,7 @@
 .rm h+
 .rm i+
 .rm j+
+.TE
 .if \n-(b.=0 .nr c. \n(.c-\n(d.-47
 
 .LP
@@ -3041,6 +3055,7 @@
 \-gcnewcapacity Option
 .LP
 .LP
+.TS
 .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
 .de 35
 .ps \n(.s
@@ -3488,6 +3503,7 @@
 .rm h+
 .rm i+
 .rm j+
+.TE
 .if \n-(b.=0 .nr c. \n(.c-\n(d.-47
 
 .LP
@@ -3495,6 +3511,7 @@
 \-gcold Option
 .LP
 .LP
+.TS
 .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
 .de 35
 .ps \n(.s
@@ -3831,6 +3848,7 @@
 .rm e+
 .rm f+
 .rm g+
+.TE
 .if \n-(b.=0 .nr c. \n(.c-\n(d.-35
 
 .LP
@@ -3838,6 +3856,7 @@
 \-gcoldcapacity Option
 .LP
 .LP
+.TS
 .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
 .de 35
 .ps \n(.s
@@ -4174,6 +4193,7 @@
 .rm e+
 .rm f+
 .rm g+
+.TE
 .if \n-(b.=0 .nr c. \n(.c-\n(d.-35
 
 .LP
@@ -4181,6 +4201,7 @@
 \-gcpermcapacity Option
 .LP
 .LP
+.TS
 .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
 .de 35
 .ps \n(.s
@@ -4517,6 +4538,7 @@
 .rm e+
 .rm f+
 .rm g+
+.TE
 .if \n-(b.=0 .nr c. \n(.c-\n(d.-35
 
 .LP
@@ -4524,6 +4546,7 @@
 \-gcutil Option
 .LP
 .LP
+.TS
 .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
 .de 35
 .ps \n(.s
@@ -4934,6 +4957,7 @@
 .rm g+
 .rm h+
 .rm i+
+.TE
 .if \n-(b.=0 .nr c. \n(.c-\n(d.-43
 
 .LP
@@ -4941,6 +4965,7 @@
 \-printcompilation Option
 .LP
 .LP
+.TS
 .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
 .de 35
 .ps \n(.s
@@ -5129,6 +5154,7 @@
 .rm a+
 .rm b+
 .rm c+
+.TE
 .if \n-(b.=0 .nr c. \n(.c-\n(d.-19
 
 .LP

--- a/src/linux/doc/man/jstatd.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/jstatd.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jstatd 1 "10 May 2011"
+.TH jstatd 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -92,7 +92,7 @@
 .na
 \f2Policy File Syntax\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html.
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html.
 .LP
 .LP
 The following policy file will allow the \f3jstatd\fP server to run without any security exceptions. This policy is less liberal then granting all permissions to all codebases, but is more liberal than a policy that grants the minimal permissions to run the \f3jstatd\fP server.
@@ -250,7 +250,7 @@
 .na
 \f2rmiregistry\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/index.html#rmi \- the Java Remote Object Registry 
+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#rmi \- the Java Remote Object Registry 
 .RE
 
 .LP

--- a/src/linux/doc/man/jvisualvm.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/jvisualvm.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jvisualvm 1 "10 May 2011"
+.TH jvisualvm 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -94,7 +94,7 @@
 .na
 \f2Java VisualVM in Java SE platform documentation\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/visualvm/index.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/visualvm/index.html 
 .RE
 
 .LP

--- a/src/linux/doc/man/keytool.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/keytool.1	Fri Mar 16 15:20:53 2012 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1998-2011 keytool tool, Oracle and/or its affiliates. All rights reserved.
 ." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 ."
 ." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH keytool 1 "10 May 2011"
+.TH keytool 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -202,7 +202,7 @@
 .na
 \f2Java Cryptography Architecture API Specification & Reference\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA for a full list of \f2\-keyalg\fP and \f2\-sigalg\fP you can choose from.
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA for a full list of \f2\-keyalg\fP and \f2\-sigalg\fP you can choose from.
 .LP
 .SS 
 Common Options
@@ -278,6 +278,7 @@
 Currently keytool supports these named extensions (case\-insensitive):
 .LP
 .LP
+.TS
 .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
 .de 35
 .ps \n(.s
@@ -678,11 +679,12 @@
 .rm h+
 .rm i+
 .rm j+
+.TE
 .if \n-(b.=0 .nr c. \n(.c-\n(d.-38
 
 .LP
 .LP
-For name as OID, value is the HEX dumped DER encoding of the extnValue for the extension excluding the OCTET STRING type and length bytes. Any extra character other than standard HEX numbers (0\-9, a\-f, A\-F) are ignored in the HEX string. Therefore, both \f2"01:02:03:04"\fP and \f2"01020304"\fP are accepted as identical values. If there's no value, the extension has an empty value field then.
+For name as OID, value is the HEX dumped DER encoding of the extnValue for the extension excluding the OCTET STRING type and length bytes. Any extra character other than standard HEX numbers (0\-9, a\-f, A\-F) are ignored in the HEX string. Therefore, both \f2"01:02:03:04"\fP and \f2"01020304"\fP are accepted as identical values. If there is no value, the extension has an empty value field then.
 .LP
 .LP
 A special name \f2'honored'\fP, used in \f2\-gencert\fP only, denotes how the extensions included in the certificate request should be honored. The value for this name is a comma separated list of \f2"all"\fP (all requested extensions are honored), \f2"name{:[critical|non\-critical]}"\fP (the named extension is honored, but using a different isCritical attribute) and \f2"\-name"\fP (used with all, denotes an exception). Requested extensions are not honored by default.
@@ -929,7 +931,7 @@
 .na
 \f2JSSE Reference Guide\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/jsse/JSSERefGuide.html for more information. 
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/jsse/JSSERefGuide.html for more information. 
 .LP
 \f3Note\fP: This option can be used independently of a keystore.  
 .TP 3
@@ -1106,7 +1108,7 @@
 Importing the Certificate Reply from the CA
 .LP
 .LP
-Once you've imported a certificate authenticating the public key of the CA you submitted your certificate signing request to (or there's already such a certificate in the "cacerts" file), you can import the certificate reply and thereby replace your self\-signed certificate with a certificate chain. This chain is the one returned by the CA in response to your request (if the CA reply is a chain), or one constructed (if the CA reply is a single certificate) using the certificate reply and trusted certificates that are already available in the keystore where you import the reply or in the "cacerts" keystore file.
+Once you've imported a certificate authenticating the public key of the CA you submitted your certificate signing request to (or there is already such a certificate in the "cacerts" file), you can import the certificate reply and thereby replace your self\-signed certificate with a certificate chain. This chain is the one returned by the CA in response to your request (if the CA reply is a chain), or one constructed (if the CA reply is a single certificate) using the certificate reply and trusted certificates that are already available in the keystore where you import the reply or in the "cacerts" keystore file.
 .LP
 .LP
 For example, suppose you sent your certificate signing request to VeriSign. You can then import the reply via the following, which assumes the returned certificate is named "VSMarkJ.cer":
@@ -1289,7 +1291,7 @@
 .na
 \f2How to Implement a Provider for the Java Cryptography Architecture\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider.html. 
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider.html. 
 .LP
 Applications can choose different \f2types\fP of keystore implementations from different providers, using the "getInstance" factory method supplied in the \f2KeyStore\fP class. A keystore type defines the storage and data format of the keystore information, and the algorithms used to protect private/secret keys in the keystore and the integrity of the keystore itself. Keystore implementations of different types are not compatible. 
 .LP
@@ -1702,11 +1704,11 @@
 .na
 \f4Security\fP @
 .fi
-http://download.oracle.com/javase/tutorial/security/index.html trail of the 
+http://docs.oracle.com/javase/tutorial/security/index.html trail of the 
 .na
 \f4Java Tutorial\fP @
 .fi
-http://download.oracle.com/javase/tutorial/ for examples of the use of \f3keytool\fP 
+http://docs.oracle.com/javase/tutorial/ for examples of the use of \f3keytool\fP 
 .RE
 
 .LP

--- a/src/linux/doc/man/native2ascii.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/native2ascii.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH native2ascii 1 "10 May 2011"
+.TH native2ascii 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -60,7 +60,7 @@
 .na
 \f4Supported Encodings\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html document.
+http://docs.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html document.
 .br
 .br
 .TP 3

--- a/src/linux/doc/man/orbd.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/orbd.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH orbd 1 "10 May 2011"
+.TH orbd 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -33,7 +33,7 @@
 .na
 \f2Naming Service\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html
+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html
 .LP
 .SH "SYNOPSIS"
 .LP
@@ -69,7 +69,7 @@
 .na
 \f2Naming Service\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html.
+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html.
 .LP
 .SH "OPTIONS"
 .LP
@@ -133,11 +133,11 @@
 .na
 \f2CORBA objects\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlGlossary.html#CORBA%20object to be named by means of binding a name to an object reference. The 
+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlGlossary.html#CORBA%20object to be named by means of binding a name to an object reference. The 
 .na
 \f2name binding\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlGlossary.html#name%20binding may be stored in the naming service, and a client may supply the name to obtain the desired object reference.
+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlGlossary.html#name%20binding may be stored in the naming service, and a client may supply the name to obtain the desired object reference.
 .LP
 .LP
 Prior to running a client or a server, you will start ORBD. ORBD includes a persistent Naming Service and a transient Naming Service, both of which are an implementation of the COS Naming Service.
@@ -216,7 +216,7 @@
 .na
 \f2Naming Service\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html.
+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html.
 .LP
 .SH "Server Manager"
 .LP
@@ -231,7 +231,7 @@
 .na
 \f2sample tutorial\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlExample.html for our demonstration, you would run the \f2idlj\fP compiler and \f2javac\fP compiler as shown in the tutorial. To run the Server Manager, follow these steps for running the application:
+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlExample.html for our demonstration, you would run the \f2idlj\fP compiler and \f2javac\fP compiler as shown in the tutorial. To run the Server Manager, follow these steps for running the application:
 .LP
 .LP
 Start \f2orbd\fP.
@@ -354,7 +354,7 @@
 .na
 \f2Naming Service\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html
+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html
 .br
 .TP 2
 o

--- a/src/linux/doc/man/pack200.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/pack200.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH pack200 1 "10 May 2011"
+.TH pack200 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -310,13 +310,13 @@
 .na
 \f2Java SE Documentation\fP @
 .fi
-http://download.oracle.com/javase/7/docs/index.html 
+http://docs.oracle.com/javase/7/docs/index.html 
 .TP 2
 o
 .na
 \f2Java Deployment Guide \- Pack200\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/pack200.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/pack200.html 
 .TP 2
 o
 jar(1) \- Java Archive Tool 

--- a/src/linux/doc/man/policytool.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/policytool.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH policytool 1 "10 May 2011"
+.TH policytool 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -28,19 +28,21 @@
 \f3policytool\fP reads and writes a plain text policy file based on user input via the utility GUI.   
 .SH "SYNOPSIS"
 .LP
-.RS 3
-.TP 3
-\  
-.TP 3
-Run the policytool Administrator's utility 
-\f4policytool\fP 
-.TP 3
-Run policytool and load the specified policy file 
-\f4policytool\fP\f2[\-file\ \fP\f2filename\fP\f2]\fP 
-.TP 3
-\  
-.TP 3
-where: 
+.LP
+Run the policytool Administrator's utility
+.LP
+.LP
+\f4policytool\fP
+.LP
+.LP
+Run policytool and load the specified policy file
+.LP
+.LP
+\f4policytool\fP\f2[\-file\ \fP\f2filename\fP\f2]\fP
+.LP
+.LP
+where:
+.LP
 .RS 3
 .TP 3
 file 
@@ -49,41 +51,54 @@
 filename 
 The file name 
 .RE
-.SH "DESCRIPTION" 
+
+.LP
+.SH "DESCRIPTION"
+.LP
 .LP
 \f3policytool\fP is a GUI that allows users to create and manage policy files. For details, see 
 .na
 \f2the Policytool Users Guide\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyGuide.html.  
-.SH "OPTIONS" 
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/PolicyGuide.html. 
+.LP
+.SH "OPTIONS"
+.LP
 .RS 3
 .TP 3
 file 
 Loads \f2filename\fP. 
-.SH "SEE ALSO" 
+.RE
+
+.LP
+.SH "SEE ALSO"
+.LP
 .na
 \f2Default Policy Implementation and Syntax\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/PolicyFiles.html
 .br
+
+.LP
 .na
 \f2Policy Tool Users' Guide\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/PolicyGuide.html
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/PolicyGuide.html
 .br
+
+.LP
 .na
 \f2Security Permissions\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/permissions.html
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/permissions.html
 .br
+
+.LP
 .na
 \f2Security Overview\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/overview/jsoverview.html
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/overview/jsoverview.html
 .br
-.RE
-.RE
 
 .LP
  

--- a/src/linux/doc/man/rmic.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/rmic.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH rmic 1 "10 May 2011"
+.TH rmic 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -170,7 +170,7 @@
 .na
 \f2Portable Object Adapter\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/idl/POA.html (POA) defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior. Based on the OMG IDL to Java Language Mapping Specification, CORBA V 2.3.1 ptc/00\-01\-08.pdf. 
+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/POA.html (POA) defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior. Based on the OMG IDL to Java Language Mapping Specification, CORBA V 2.3.1 ptc/00\-01\-08.pdf. 
 .RE
 .TP 3
 \-J 
@@ -222,6 +222,6 @@
 .na
 \f2CLASSPATH\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/index.html#classpath
+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#classpath
 .LP
  

--- a/src/linux/doc/man/rmid.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/rmid.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH rmid 1 "10 May 2011"
+.TH rmid 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -46,11 +46,11 @@
 .na
 \f2Java RMI Specification\fP @
 .fi
-http://download.oracle.com/javase/7/docs/platform/rmi/spec/rmiTOC.html and 
+http://docs.oracle.com/javase/7/docs/platform/rmi/spec/rmiTOC.html and 
 .na
 \f2Activation tutorials\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/rmi/activation/overview.html for details on how to write programs that use activatable remote objects.
+http://docs.oracle.com/javase/7/docs/technotes/guides/rmi/activation/overview.html for details on how to write programs that use activatable remote objects.
 .LP
 .LP
 The daemon can be started by executing the \f2rmid\fP command, and specifying a security policy file, as follows:
@@ -323,6 +323,6 @@
 .na
 \f2CLASSPATH\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/index.html#classpath, java(1)
+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#classpath, java(1)
 .LP
  

--- a/src/linux/doc/man/rmiregistry.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/rmiregistry.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH rmiregistry 1 "10 May 2011"
+.TH rmiregistry 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -76,8 +76,8 @@
 .na
 \f2java.rmi.registry.LocateRegistry\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/java/rmi/registry/LocateRegistry.html and 
+http://docs.oracle.com/javase/7/docs/api/java/rmi/registry/LocateRegistry.html and 
 .na
 \f2java.rmi.Naming\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/java/rmi/Naming.html  
+http://docs.oracle.com/javase/7/docs/api/java/rmi/Naming.html  

--- a/src/linux/doc/man/schemagen.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/schemagen.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH schemagen 1 "10 May 2011"
+.TH schemagen 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -120,7 +120,7 @@
 .na
 \f2Java Architecture for XML Binding (JAXB)\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/xml/jaxb/index.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/xml/jaxb/index.html 
 .RE
 
 .LP

--- a/src/linux/doc/man/serialver.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/serialver.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH serialver 1 "10 May 2011"
+.TH serialver 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -92,6 +92,6 @@
 .na
 \f2java.io.ObjectStreamClass\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/java/io/ObjectStreamClass.html
+http://docs.oracle.com/javase/7/docs/api/java/io/ObjectStreamClass.html
 .LP
  

--- a/src/linux/doc/man/servertool.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/servertool.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH servertool 1 "10 May 2011"
+.TH servertool 1 "16 Mar 2012"
 
 .LP
 .SH "Name"

--- a/src/linux/doc/man/tnameserv.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/tnameserv.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH tnameserv 1 "10 May 2011"
+.TH tnameserv 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -30,7 +30,7 @@
 .na
 \f2Java IDL Naming Service Included with ORBD\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html topic.
+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/jidlNaming.html topic.
 .LP
 .LP
 Topics in this section include:
@@ -120,11 +120,11 @@
 .na
 \f2The Hello World Example Using RMI\-IIOP\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/rmi\-iiop/rmiiiopexample.html. You could also use the command line options \f2\-ORBInitialPort\fP \f2nameserverport#\fP and \f2\-ORBInitialHost\fP \f2nameserverhostname\fP to tell the client and server where to find the Naming Service. 
+http://docs.oracle.com/javase/7/docs/technotes/guides/rmi\-iiop/rmiiiopexample.html. You could also use the command line options \f2\-ORBInitialPort\fP \f2nameserverport#\fP and \f2\-ORBInitialHost\fP \f2nameserverhostname\fP to tell the client and server where to find the Naming Service. 
 .na
 \f2Java IDL: Running the Hello World Example on TWO Machines\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/idl/tutorial/jidl2machines.html shows one way of doing this using the command line option.
+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/tutorial/jidl2machines.html shows one way of doing this using the command line option.
 .LP
 .LP
 For example, suppose the Transient Naming Service, \f2tnameserv\fP is running on port 1050 on host \f2nameserverhost\fP. The client is running on host \f2clienthost\fP and the server is running on host \f2serverhost\fP.
@@ -279,7 +279,7 @@
 .fl
         ctx.rebind(name1, objref);
 .fl
-        System.out.println("plans rebind sucessful!");
+        System.out.println("plans rebind successful!");
 .fl
 
 .fl
@@ -315,7 +315,7 @@
 .fl
         ctx2.rebind(name3, objref);
 .fl
-        System.out.println("schedule rebind sucessful!");
+        System.out.println("schedule rebind successful!");
 .fl
 
 .fl
@@ -325,7 +325,7 @@
 .fl
         ctx2.rebind(name4, objref);
 .fl
-        System.out.println("calender rebind sucessful!");
+        System.out.println("calender rebind successful!");
 .fl
 
 .fl
@@ -395,7 +395,7 @@
 .fi
 
 .LP
-The following code obtains the intial naming context. 
+The following code obtains the initial naming context. 
 .nf
 \f3
 .fl

--- a/src/linux/doc/man/unpack200.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/unpack200.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH unpack200 1 "10 May 2011"
+.TH unpack200 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -126,13 +126,13 @@
 .na
 \f2Java SE Documentation\fP @
 .fi
-http://download.oracle.com/javase/7/docs/index.html 
+http://docs.oracle.com/javase/7/docs/index.html 
 .TP 2
 o
 .na
 \f2Java Deployment Guide \- Pack200\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/pack200.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/pack200.html 
 .TP 2
 o
 jar(1) \- Java Archive Tool 

--- a/src/linux/doc/man/wsgen.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/wsgen.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH wsgen 1 "10 May 2011"
+.TH wsgen 1 "16 Mar 2012"
 .SH "Name"
 wsgen \- Java(TM) API for XML Web Services (JAX\-WS) 2.0
 .LP
@@ -77,6 +77,7 @@
 The following table lists the \f2wsgen\fP options.
 .br
 .LP
+.TS
 .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
 .de 35
 .ps \n(.s
@@ -564,6 +565,7 @@
 .rm i+
 .rm j+
 .rm k+
+.TE
 .if \n-(b.=0 .nr c. \n(.c-\n(d.-53
 
 .LP

--- a/src/linux/doc/man/wsimport.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/wsimport.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH wsimport 1 "10 May 2011"
+.TH wsimport 1 "16 Mar 2012"
 .SH "Name"
 wsimport \- Java(TM) API for XML Web Services (JAX\-WS) 2.0
 .LP
@@ -88,6 +88,7 @@
 .LP
 The following table lists the \f2wsimport\fP options.
 .LP
+.TS
 .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
 .de 35
 .ps \n(.s
@@ -675,6 +676,7 @@
 .rm l+
 .rm m+
 .rm n+
+.TE
 .if \n-(b.=0 .nr c. \n(.c-\n(d.-66
 .LP
 Multiple JAX\-WS and JAXB binding files can be specified using \f2\-b\fP option and they can be used to customize various things like package names, bean names, etc. More information on JAX\-WS and JAXB binding files can be found in the 
@@ -685,6 +687,7 @@
 .LP
 The following table lists \f2wsimport\fP non\-standard options:
 .LP
+.TS
 .if \n+(b.=1 .nr d. \n(.c-\n(c.-1
 .de 35
 .ps \n(.s
@@ -959,6 +962,7 @@
 .rm d+
 .rm e+
 .rm f+
+.TE
 .if \n-(b.=0 .nr c. \n(.c-\n(d.-26
 
 .LP

--- a/src/linux/doc/man/xjc.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/linux/doc/man/xjc.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH xjc 1 "10 May 2011"
+.TH xjc 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -290,7 +290,7 @@
 .na
 \f2Java Architecture for XML Binding (JAXB)\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/xml/jaxb/index.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/xml/jaxb/index.html 
 .RE
 
 .LP

--- a/src/solaris/doc/sun/man/man1/appletviewer.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/solaris/doc/sun/man/man1/appletviewer.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH appletviewer 1 "10 May 2011"
+.TH appletviewer 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -40,7 +40,10 @@
 .na
 \f2AppletViewer Tags\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/appletviewertags.html.
+http://docs.oracle.com/javase/7/docs/technotes/tools/appletviewertags.html.
+.LP
+.LP
+\f3Note:\fP The \f3appletviewer\fP is intended for development purposes only. See About Sample / Test Applications and Code for more information.
 .LP
 .LP
 \f3Note:\fP The \f3appletviewer\fP requires encoded URLs according to the escaping mechanism defined in RFC2396. Only encoded URLs are supported. However, file names must be unencoded, as specified in RFC2396.

--- a/src/solaris/doc/sun/man/man1/apt.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/solaris/doc/sun/man/man1/apt.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH apt 1 "10 May 2011"
+.TH apt 1 "16 Mar 2012"
 
 .LP
 .SH "NAME"
@@ -60,7 +60,7 @@
 .na
 \f4Getting Started with \fP\f4apt\fP. @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/apt/GettingStarted.html
+http://docs.oracle.com/javase/7/docs/technotes/guides/apt/GettingStarted.html
 .LP
 .SH "OPTIONS"
 .LP

--- a/src/solaris/doc/sun/man/man1/extcheck.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/solaris/doc/sun/man/man1/extcheck.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH extcheck 1 "10 May 2011"
+.TH extcheck 1 "16 Mar 2012"
 
 .LP
 .SH "Name"

--- a/src/solaris/doc/sun/man/man1/idlj.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/solaris/doc/sun/man/man1/idlj.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH idlj 1 "10 May 2011"
+.TH idlj 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -47,7 +47,7 @@
 .na
 \f2OMG IDL to Java Language Language Mapping Specification\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/idl/mapping/jidlMapping.html. Some previous releases of the IDL\-to\-Java compiler were named \f2idltojava\fP.
+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/mapping/jidlMapping.html. Some previous releases of the IDL\-to\-Java compiler were named \f2idltojava\fP.
 .LP
 .SS 
 Emitting Client and Server Bindings
@@ -110,14 +110,14 @@
 .na
 \f2org.omg.PortableServer.Servant\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/org/omg/PortableServer/Servant.html and implements the \f2InvokeHandler\fP interface and the operations interface associated with the IDL interface the skeleton implements.
+http://docs.oracle.com/javase/7/docs/api/org/omg/PortableServer/Servant.html and implements the \f2InvokeHandler\fP interface and the operations interface associated with the IDL interface the skeleton implements.
 .LP
 .LP
 The \f2PortableServer\fP module for the 
 .na
 \f2Portable Object Adapter (POA)\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/idl/POA.html defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior.
+http://docs.oracle.com/javase/7/docs/technotes/guides/idl/POA.html defines the native \f2Servant\fP type. In the Java programming language, the \f2Servant\fP type is mapped to the Java \f2org.omg.PortableServer.Servant\fP class. It serves as the base class for all POA servant implementations and provides a number of methods that may be invoked by the application programmer, as well as methods which are invoked by the POA itself and may be overridden by the user to control aspects of servant behavior.
 .LP
 .LP
 Another option for the Inheritance Model is to use the \f2\-oldImplBase\fP flag in order to generate server\-side bindings that are compatible with versions of the Java programming language prior to J2SE 1.4. Note that using the \f2\-oldImplBase\fP flag is non\-standard: these APIs are being deprecated. You would use this flag ONLY for compatibility with existing servers written in J2SE 1.3. In that case, you would need to modify an existing MAKEFILE to add the \f2\-oldImplBase\fP flag to the \f2idlj\fP compiler, otherwise POA\-based server\-side mappings will be generated. To generate server\-side bindings that are backwards compatible:
@@ -295,7 +295,7 @@
 .na
 \f2Setting the Classpath\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/index.html#general.
+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#general.
 .LP
 .SS 
 Emitting Bindings for Include Files

--- a/src/solaris/doc/sun/man/man1/jar.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/solaris/doc/sun/man/man1/jar.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jar 1 "10 May 2011"
+.TH jar 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -98,7 +98,7 @@
 .na
 \f2JAR file specification\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR%20Manifest for details explaining how the jar tool stores meta\-information in the manifest file. 
+http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR%20Manifest for details explaining how the jar tool stores meta\-information in the manifest file. 
 .LP
 If a jar file should include \f2name\ :\ value\fP pairs contained in an existing manifest file, specify that file using the \f2\-m\fP option:
 .LP
@@ -158,7 +158,7 @@
 .na
 \f2JarIndex\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Index, which allows application class loaders to load classes more efficiently from jar files. If an application or applet is bundled into multiple jar files,\  only the necessary jar files will be downloaded and opened to load classes. This performance optimization is enabled by running \f2jar\fP with the \f2\-i\fPoption. It will generate package location information for the specified main jar file and all the jar files it depends on, which need to be specified in the \f2Class\-Path\fP attribute of the main jar file's manifest.
+http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Index, which allows application class loaders to load classes more efficiently from jar files. If an application or applet is bundled into multiple jar files,\  only the necessary jar files will be downloaded and opened to load classes. This performance optimization is enabled by running \f2jar\fP with the \f2\-i\fPoption. It will generate package location information for the specified main jar file and all the jar files it depends on, which need to be specified in the \f2Class\-Path\fP attribute of the main jar file's manifest.
 .LP
 .nf
 \f3
@@ -192,7 +192,7 @@
 .na
 \f2Java Tutorial\fP @
 .fi
-http://download.oracle.com/javase/tutorial/deployment/jar.
+http://docs.oracle.com/javase/tutorial/deployment/jar.
 .LP
 .SH "OPTIONS"
 .LP
@@ -266,7 +266,7 @@
 .na
 \f2JAR Files\fP @
 .fi
-http://download.oracle.com/javase/tutorial/deployment/jar/ trail in the Java Tutorial  for examples of using the \f4\-m\fP option. 
+http://docs.oracle.com/javase/tutorial/deployment/jar/ trail in the Java Tutorial  for examples of using the \f4\-m\fP option. 
 .TP 3
 e 
 Sets \f2entrypoint\fP as the application entry point for stand\-alone applications bundled into executable jar file. The use of this option creates or overrides the \f2Main\-Class\fP attribute value in the manifest file. This option can be used during creation of jar file or while updating the jar file. This option specifies the application entry point without editing or creating the manifest file.
@@ -553,25 +553,25 @@
 .na
 \f2The Jar Overview\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/jar/jarGuide.html
+http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jarGuide.html
 .LP
 .LP
 .na
 \f2The Jar File Specification\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html
+http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html
 .LP
 .LP
 .na
 \f2The JarIndex Spec\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Index
+http://docs.oracle.com/javase/7/docs/technotes/guides/jar/jar.html#JAR_Index
 .LP
 .LP
 .na
 \f2Jar Tutorial\fP @
 .fi
-http://download.oracle.com/javase/tutorial/deployment/jar/index.html
+http://docs.oracle.com/javase/tutorial/deployment/jar/index.html
 .LP
 .LP
 pack200(1)

--- a/src/solaris/doc/sun/man/man1/jarsigner.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/solaris/doc/sun/man/man1/jarsigner.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jarsigner 1 "10 May 2011"
+.TH jarsigner 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -147,7 +147,7 @@
 .na
 \f2How to Implement a Provider for the Java Cryptography Architecture\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider.html.
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/crypto/HowToImplAProvider.html.
 .LP
 .LP
 Applications can choose different \f2types\fP of keystore implementations from different providers, using the "getInstance" factory method supplied in the \f2KeyStore\fP class. A keystore type defines the storage and data format of the keystore information, and the algorithms used to protect private keys in the keystore and the integrity of the keystore itself. Keystore implementations of different types are not compatible.
@@ -208,7 +208,7 @@
 .na
 \f2KeyTool and JarSigner\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#KeyToolJarSigner section of the Java PKCS#11 Reference Guide for details.
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#KeyToolJarSigner section of the Java PKCS#11 Reference Guide for details.
 .LP
 .SS 
 Supported Algorithms
@@ -513,7 +513,7 @@
 .na
 \f2Appendix A\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard signature algorithm names. This algorithm must be compatible with the private key used to sign the JAR file. If this option is not specified, SHA1withDSA, SHA256withRSA, or SHA256withECDSA will be used depending on the type of private key. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed. 
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard signature algorithm names. This algorithm must be compatible with the private key used to sign the JAR file. If this option is not specified, SHA1withDSA, SHA256withRSA, or SHA256withECDSA will be used depending on the type of private key. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed. 
 .TP 3
 \-digestalg algorithm 
 Specifies the name of the message digest algorithm to use when digesting the entries of a jar file.
@@ -523,7 +523,7 @@
 .na
 \f2Appendix A\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard message digest algorithm names. If this option is not specified, SHA256 will be used. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed. 
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/crypto/CryptoSpec.html#AppA of the Java Cryptography Architecture for a list of standard message digest algorithm names. If this option is not specified, SHA256 will be used. There must either be a statically installed provider supplying an implementation of the specified algorithm or the user must specify one with the \f2\-providerClass\fP option, otherwise the command will not succeed. 
 .TP 3
 \-signedjar file 
 Specifies the name to be used for the signed JAR file.
@@ -608,7 +608,7 @@
 .na
 \f2configuration attributes table\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#ATTRS. For example, the following command lists the contents of the PKCS#11 keystore provider instance with name suffix \f2SmartCard\fP: 
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/p11guide.html#ATTRS. For example, the following command lists the contents of the PKCS#11 keystore provider instance with name suffix \f2SmartCard\fP: 
 .nf
 \f3
 .fl
@@ -1558,11 +1558,11 @@
 .na
 \f4Security\fP @
 .fi
-http://download.oracle.com/javase/tutorial/security/index.html trail of the 
+http://docs.oracle.com/javase/tutorial/security/index.html trail of the 
 .na
 \f4Java Tutorial\fP @
 .fi
-http://download.oracle.com/javase/tutorial/index.html for examples of the use of the \f3jarsigner\fP tool 
+http://docs.oracle.com/javase/tutorial/index.html for examples of the use of the \f3jarsigner\fP tool 
 .RE
 
 .LP

--- a/src/solaris/doc/sun/man/man1/java.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/solaris/doc/sun/man/man1/java.1	Fri Mar 16 15:20:53 2012 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
 ." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 ."
 ." This code is free software; you can redistribute it and/or modify it
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH java 1 "10 May 2011"
+.TH java 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -96,7 +96,7 @@
 .na
 \f2Server\-Class Machine Detection\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html 
 .TP 3
 \-server 
 Select the Java HotSpot Server VM. On a 64\-bit capable jdk only the Java Hotspot Server VM is supported so the \-server option is implicit.
@@ -106,7 +106,7 @@
 .na
 \f2Server\-Class Machine Detection\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server\-class.html 
 .TP 3
 \-agentlib:libname[=options] 
 Load native agent library \f2libname\fP, e.g.
@@ -125,14 +125,14 @@
 .na
 \f2JVMTI Agent Command Line Options\fP @
 .fi
-http://download.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting. 
+http://docs.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting. 
 .TP 3
 \-agentpath:pathname[=options] 
 Load a native agent library by full pathname. For more information, see 
 .na
 \f2JVMTI Agent Command Line Options\fP @
 .fi
-http://download.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting. 
+http://docs.oracle.com/javase/7/docs/platform/jvmti/jvmti.html#starting. 
 .TP 3
 \-classpath classpath 
 .TP 3
@@ -153,7 +153,7 @@
 .na
 \f2Setting the Class Path\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/index.html#classpath. 
+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#classpath. 
 .TP 3
 \-Dproperty=value 
 Set a system property value. 
@@ -172,21 +172,6 @@
 \-enableassertions[:<package name>"..." | :<class name> ] 
 .TP 3
 \-ea[:<package name>"..." | :<class name> ] 
-Enable assertions. Assertions are disabled by default.
-.br
-.br
-With no arguments, \f3enableassertions\fP or \f3\-ea\fP enables assertions. With one argument ending in \f2"..."\fP, the switch enables assertions in the specified package and any subpackages. If the argument is simply \f2"..."\fP, the switch enables assertions in the unnamed package in the current working directory. With one argument not ending in \f2"..."\fP, the switch enables assertions in the specified class.
-.br
-.br
-If a single command line contains multiple instances of these switches, they are processed in order before loading any classes. So, for example, to run a program with assertions enabled only in package \f2com.wombat.fruitbat\fP (and any subpackages), the following command could be used: 
-.nf
-\f3
-.fl
-java \-ea:com.wombat.fruitbat... <Main Class>
-.fl
-\fP
-.fi
-The \f3\-enableassertions\fP and \f3\-ea\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-enablesystemassertions\fP below. 
 .TP 3
 \-disableassertions[:<package name>"..." | :<class name> ] 
 .TP 3
@@ -206,6 +191,21 @@
 \fP
 .fi
 The \f3\-disableassertions\fP and \f3\-da\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-disablesystemassertions\fP below. 
+Enable assertions. Assertions are disabled by default.
+.br
+.br
+With no arguments, \f3enableassertions\fP or \f3\-ea\fP enables assertions. With one argument ending in \f2"..."\fP, the switch enables assertions in the specified package and any subpackages. If the argument is simply \f2"..."\fP, the switch enables assertions in the unnamed package in the current working directory. With one argument not ending in \f2"..."\fP, the switch enables assertions in the specified class.
+.br
+.br
+If a single command line contains multiple instances of these switches, they are processed in order before loading any classes. So, for example, to run a program with assertions enabled only in package \f2com.wombat.fruitbat\fP (and any subpackages), the following command could be used: 
+.nf
+\f3
+.fl
+java \-ea:com.wombat.fruitbat... <Main Class>
+.fl
+\fP
+.fi
+The \f3\-enableassertions\fP and \f3\-ea\fP switches apply to \f2all\fP class loaders and to system classes (which do not have a class loader). There is one exception to this rule: in their no\-argument form, the switches do \f2not\fP apply to system. This makes it easy to turn on asserts in all classes except for system classes. A separate switch is provided to enable asserts in all system classes; see \f3\-enablesystemassertions\fP below. 
 .TP 3
 \-enablesystemassertions 
 .TP 3
@@ -217,12 +217,15 @@
 \-dsa 
 Disables asserts in all system classes. 
 .TP 3
+\-help or \-? 
+Display usage information and exit. 
+.TP 3
 \-jar 
 Execute a program encapsulated in a JAR file. The first argument is the name of a JAR file instead of a startup class name. In order for this option to work, the manifest of the JAR file must contain a line of the form \f3Main\-Class: \fP\f4classname\fP. Here, \f2classname\fP identifies the class having the \f2public\ static\ void\ main(String[]\ args)\fP method that serves as your application's starting point. See the jar(1) and the Jar trail of the 
 .na
 \f2Java Tutorial\fP @
 .fi
-http://download.oracle.com/javase/tutorial/deployment/jar for information about working with Jar files and Jar\-file manifests.
+http://docs.oracle.com/javase/tutorial/deployment/jar for information about working with Jar files and Jar\-file manifests.\ 
 .br
 .br
 When you use this option, the JAR file is the source of all user classes, and other user class path settings are ignored.
@@ -232,14 +235,14 @@
 .na
 \f2Java Archive (JAR) Files\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/jar/index.html. 
+http://docs.oracle.com/javase/7/docs/technotes/guides/jar/index.html. 
 .TP 3
 \-javaagent:jarpath[=options] 
 Load a Java programming language agent, see 
 .na
 \f2java.lang.instrument\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/java/lang/instrument/package\-summary.html. 
+http://docs.oracle.com/javase/7/docs/api/java/lang/instrument/package\-summary.html. 
 .TP 3
 \-jre\-restrict\-search 
 Include user\-private JREs in the version search. 
@@ -247,6 +250,12 @@
 \-no\-jre\-restrict\-search 
 Exclude user\-private JREs in the version search. 
 .TP 3
+\-showversion 
+Display version information and continue. (See also \f3\-version\fP.) 
+.TP 3
+\-splash:imagepath 
+Show splash screen with image specified by \f2imagepath\fP. 
+.TP 3
 \-verbose 
 .TP 3
 \-verbose:class 
@@ -259,7 +268,7 @@
 Report information about use of native methods and other Java Native Interface activity. 
 .TP 3
 \-version 
-Display version information and exit. 
+Display version information and exit. (See also \f3\-showversion\fP.) 
 .TP 3
 \-version:release 
 Specifies that the version specified by \f2release\fP is required by the class or jar file specified on the command line. If the version of the java command invoked does not meet this specification and an appropriate implementation is found on the system, the appropriate implementation will be used.
@@ -280,20 +289,6 @@
 .br
 .br
 See the following NOTES section for important policy information on the use of this option. 
-.TP 3
-\-showversion 
-Display version information and continue. 
-.TP 3
-\-? 
-.TP 3
-\-help 
-Display usage information and exit. 
-.TP 3
-\-splash:imagepath 
-Show splash screen with image specified by \f2imagepath\fP. 
-.TP 3
-\-X 
-Display information about non\-standard options and exit. 
 .RE
 
 .LP
@@ -302,6 +297,9 @@
 .LP
 .RS 3
 .TP 3
+\-X 
+Display information about non\-standard options and exit. 
+.TP 3
 \-Xint 
 Operate in interpreted\-only mode. Compilation to native code is disabled, and all bytecodes are executed by the interpreter. The performance benefits offered by the Java HotSpot VMs' adaptive compiler will not be present in this mode. 
 .TP 3
@@ -335,12 +333,15 @@
 .br
 Always use a local file system for storage of this file to avoid stalling the JVM due to network latency. The file may be truncated in the case of a full file system and logging will continue on the truncated file. This option overrides \f2\-verbose:gc\fP if both are given on the command line. 
 .TP 3
+\-Xmnsize or \-XX:NewSize 
+Sets the size of the young generation (nursery). Similar to the \f3\-Xns\fP flag of JRockit. 
+.TP 3
 \-Xmsn 
 Specify the initial size, in bytes, of the memory allocation pool. This value must be a multiple of 1024 greater than 1MB. Append the letter \f2k\fP or \f2K\fP to indicate kilobytes, or \f2m\fP or \f2M\fP to indicate megabytes. The default value is chosen at runtime based on system configuration. For more information, see 
 .na
 \f2HotSpot Ergonomics\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html
+http://docs.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html
 .br
 .br
 Examples: 
@@ -363,7 +364,7 @@
 .na
 \f2HotSpot Ergonomics\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html
+http://docs.oracle.com/javase/7/docs/technotes/guides/vm/gc\-ergonomics.html
 .br
 .br
 Examples: 
@@ -414,16 +415,117 @@
 \-Xssn 
 Set thread stack size. 
 .TP 3
+\-XX:AllocationPrefetchStyle=n 
+Sets the style of prefetch used during allocation. default=2.
+.br
+This option is similar to the \f3\-XX:+UseAllocPrefetch\fP flag of JRockit. 
+.TP 3
+\-XX:+AggressiveOpts 
+Enables aggressive optimization.
+.br
+This option is similar to the \f3\-XXaggressive\fP flag of JRockit. The type and level of optimization varies between Jrockit and HotSpot, and between releases. Therefore it is not directly comparable between JVMs. 
+.TP 3
+\-XX:+|\-DisableAttachMechanism 
+This option specifies whether tools (such as \f2jmap\fP and \f2jconsole\fP) are allowed to attach to the JVM. By default, this feature is disabled. That is, attaching is enabled. Example usage: 
+.nf
+\f3
+.fl
+      java \-XX:+DisableAttachMechanism
+.fl
+\fP
+.fi
+.TP 3
+\-XXLargePageSizeInBytes=n 
+This option is similar to the \f3\-XX:MaxLargePageSize\fP flag of JRockit. 
+.TP 3
+\-XX:MaxGCPauseMillis=n 
+Sets a target for the maximum GC pause time.
+.br
+This option is similar to the \f3\-Xpausetarget\fP flag of JRockit. This is a soft goal, and the JVMs will both do their best effort to achieve it.
+.br
+In Jrockit, the default value is 500ms. In HotSpot, there is no maximum value set by default. 
+.TP 3
+\-XX:NewSize 
+Sets the size of the young generation (nursery). Sames as \f3\-Xmn\fP\f4size\fP. 
+.TP 3
+\-XX:ParallelGCThreads=n 
+Sets the number of GC threads in the parallel collectors.
+.br
+This option is similar to the \f3\-Xxgcthreads=n\fP flag of JRockit. 
+.TP 3
+\-XX:PredictedClassLoadCount=n 
+This option requires that the \f3UnlockExperimentalVMOptions\fP flag be set first. Use the \f3PredictedClassLoadCount\fP flag if your application loads a lot of classes, and especially if \f3class.forName()\fP is used heavily. The recommended value is the number of classes loaded as shown in the output from \f3\-verbose:class\fP.
+.br
+Example usage: 
+.nf
+\f3
+.fl
+      java \-XX:+UnlockExperimentalVMOptions \-XX:PredictedClassLoadCount=60013
+.fl
+\fP
+.fi
+.TP 3
+\-XX:+PrintCompilation 
+Prints verbose output from the HotSpot dynamic runtime compiler.
+.br
+This option is similar to the \f3\-Xverbose:opt\fP flag of JRockit. 
+.TP 3
+\-XX:+PrintGCDetails \-XX:+PrintGCTimeStamps 
+Prints garbage collection output along with time stamps.
+.br
+This option is similar to the \f3\-Xverbose:gcpause\fP flag of JRockit. 
+.TP 3
+\-XX:SoftRefLRUPolicyMSPerMB=0 
+This flag enables aggressive processing of software references. Use this flag if HotSpot GC is impacted by the software reference count. 
+.TP 3
+\-XX:TLABSize=n 
+Thread local allocation buffers (TLAB) are enabled by default in HotSpot and JRockit. HotSpot automatically sizes TLABs based on allocation patterns. The \f3\-XX:TLABSize\fP option allows fine\-tuning the size of TLABs.
+.br
+In JRockit, TLAB sizes are set with the \f3\-XX:tlasize:min=\fP\f2n\fP\f3,preferred=\fP\f2nn\fP flag. For example, 
+.nf
+\f3
+.fl
+      \-XX:tlasize:min=4k,preferred=2048k
+.fl
+\fP
+.fi
+.TP 3
+\-XX:+UnlockCommercialFeatures 
+Use this flag to actively unlock the use of commercial features. Commercial features are the products "Oracle Java SE Advanced", or "Oracle Java SE Suite", as defined at 
+.na
+\f2the Oracle Java SE Products web page\fP @
+.fi
+http://www.oracle.com/technetwork/java/javase/terms/products/index.html.
+.br
+If this flag is not specified, the default is to run the Java virtual machine without the commercial features being available. Once they are enabled, it is not possible to disable their use at runtime. 
+.TP 3
 \-XX:+UseAltSigs 
 The VM uses \f2SIGUSR1\fP and \f2SIGUSR2\fP by default, which can sometimes conflict with applications that signal\-chain \f2SIGUSR1\fP and \f2SIGUSR2\fP. The \f2\-XX:+UseAltSigs\fP option will cause the VM to use signals other than \f2SIGUSR1\fP and \f2SIGUSR2\fP as the default. 
-.RE
-
+.TP 3
+\-XX:+|\-UseCompressedOops 
+Enables compressed references in 64\-bit JVMs.
+.br
+This option is true by default.
+.br
+This option is similar to the \f3\-XxcompressedRefs\fP flag of JRockit. 
+.TP 3
+\-XX:+UseConcMarkSweepGC or \-XX:+UseG1GC 
+These flags enable either the Concurrent Mark Sweep (CMS) or the G1 garbage collectors.
+.br
+These options are similar to the \f3\-XgcPrio:pausetime\fP flag of JRockit. 
+.TP 3
+\-XX:+|\-UseLargePages 
+Use this flag to enable large page support. Large pages are enabled by default on Solaris.
+.br
+This option is similar to the \f3\-Xlargepages\fP flag of JRockit. 
+.TP 3
+\-XX:+UseParallelOldGC 
+Enables the parallel garbage collectors, which are optimized for throughput and average response time.
+.br
+This option is similar to the \f3\-Xgc:genpar\fP flag of JRockit. 
+.SH "NOTES" 
 .LP
-.SH "NOTES"
-.LP
-.LP
-The \f3\-version:\fP\f2release\fP command line option places no restrictions on the complexity of the release specification. However, only a restricted subset of the possible release specifications represent sound policy and only these are fully supported. These policies are:
-.LP
+The \f3\-version:\fP\f2release\fP command line option places no restrictions on the complexity of the release specification. However, only a restricted subset of the possible release specifications represent sound policy and only these are fully supported. These policies are: 
 .RS 3
 .TP 3
 1.
@@ -461,13 +563,9 @@
 .fi
 Similar to item 2. this is useful when a change was introduced in a release (1.7) but also made available in updates to previous releases. 
 .RE
-
-.LP
-.SH "EXIT STATUS"
+.SH "EXIT STATUS" 
 .LP
-.LP
-The following exit values are generally returned by the launcher, typically when the launcher is called with the wrong arguments, serious errors, or exceptions thrown from the Java Virtual Machine. However, a Java application may choose to return any value using the API call \f2System.exit(exitValue)\fP.
-.LP
+The following exit values are generally returned by the launcher, typically when the launcher is called with the wrong arguments, serious errors, or exceptions thrown from the Java Virtual Machine. However, a Java application may choose to return any value using the API call \f2System.exit(exitValue)\fP. 
 .RS 3
 .TP 2
 o
@@ -476,10 +574,7 @@
 o
 \f2>0\fP: An error occurred 
 .RE
-
-.LP
-.SH "SEE ALSO"
-.LP
+.SH "SEE ALSO" 
 .RS 3
 .TP 2
 o
@@ -498,13 +593,13 @@
 .na
 \f2The Java Extensions Framework\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/extensions/index.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/extensions/index.html 
 .TP 2
 o
 .na
 \f2Security Features\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/security/index.html. 
+http://docs.oracle.com/javase/7/docs/technotes/guides/security/index.html. 
 .TP 2
 o
 .na
@@ -512,6 +607,7 @@
 .fi
 http://java.sun.com/docs/hotspot/VMOptions.html. 
 .RE
+.RE
 
 .LP
  

--- a/src/solaris/doc/sun/man/man1/javac.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/solaris/doc/sun/man/man1/javac.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH javac 1 "10 May 2011"
+.TH javac 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -190,25 +190,25 @@
 .RS 3
 .TP 3
 1.3 
-The compiler does \f2not\fP support assertions, generics, or other language features introduced after JDK 1.3. 
+The compiler does \f2not\fP support assertions, generics, or other language features introduced after Java SE 1.3. 
 .TP 3
 1.4 
-The compiler accepts code containing assertions, which were introduced in JDK 1.4. 
+The compiler accepts code containing assertions, which were introduced in Java SE 1.4. 
 .TP 3
 1.5 
-The compiler accepts code containing generics and other language features introduced in JDK 5. 
+The compiler accepts code containing generics and other language features introduced in Java SE 5. 
 .TP 3
 5 
 Synonym for 1.5. 
 .TP 3
 1.6 
-This is the default value. No language changes were introduced in Java SE 6. However, encoding errors in source files are now reported as errors, instead of warnings, as previously. 
+No language changes were introduced in Java SE 6. However, encoding errors in source files are now reported as errors instead of warnings as in previous releases of Java SE. 
 .TP 3
 6 
 Synonym for 1.6. 
 .TP 3
 1.7 
-The compiler accepts code with features introduced in JDK 7. 
+This is the default value. The compiler accepts code with features introduced in Java SE 7. 
 .TP 3
 7 
 Synonym for 1.7. 
@@ -243,9 +243,8 @@
 .RS 3
 .TP 3
 \-target version 
-Generate class files that target a specified version of the VM. Class files will run on the specified target and on later versions, but not on earlier versions of the VM. Valid targets are \f31.1\fP \f31.2\fP \f31.3\fP \f31.4\fP \f31.5\fP (also \f35\fP) \f31.6\fP (also \f36\fP) and \f31.7\fP (also \f37\fP).
-.br
-.br
+Generate class files that target a specified version of the VM. Class files will run on the specified target and on later versions, but not on earlier versions of the VM. Valid targets are \f31.1\fP, \f31.2\fP, \f31.3\fP, \f31.4\fP, \f31.5\fP (also \f35\fP), \f31.6\fP (also \f36\fP), and \f31.7\fP (also \f37\fP). 
+.LP
 The default for \f3\-target\fP depends on the value of \f3\-source\fP: 
 .RS 3
 .TP 2
@@ -259,6 +258,12 @@
 If \-source is \f31.3\fP, the value of \-target is \f31.4\fP 
 .TP 2
 o
+If \-source is \f31.5\fP, the value of \-target is \f31.7\fP 
+.TP 2
+o
+If \-source is \f31.6\fP, the value of \-target is \f31.7\fP 
+.TP 2
+o
 For \f3all other values\fP of \-source, the value of \f3\-target\fP is the value of \f3\-source\fP. 
 .RE
 .TP 3
@@ -563,11 +568,10 @@
 .nf
 \f3
 .fl
-% javac AnnoProc.java
+% \fP\f3javac AnnoProc.java\fP
 .fl
-% javac \-cp . \-Xlint:processing \-processor AnnoProc \-proc:only AnnosWithoutProcessors.java
+% \f3javac \-cp . \-Xlint:processing \-processor AnnoProc \-proc:only AnnosWithoutProcessors.java\fP
 .fl
-\fP
 .fi
 When the compiler runs the annotation processor against the source file \f2AnnosWithoutProcessors.java\fP, it generates the following warning:
 .br
@@ -1135,7 +1139,7 @@
 Cross\-Compilation Example
 .LP
 .LP
-Here we use \f3javac\fP to compile code that will run on a 1.6 VM.
+The following example uses \f3javac\fP to compile code that will run on a 1.6 VM.
 .LP
 .nf
 \f3
@@ -1174,7 +1178,7 @@
 .na
 \f2The javac Guide\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/javac/index.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/javac/index.html 
 .TP 2
 o
 java(1) \- the Java Application Launcher 
@@ -1198,7 +1202,7 @@
 .na
 \f2The Java Extensions Framework\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/extensions/index.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/extensions/index.html 
 .RE
 
 .LP

--- a/src/solaris/doc/sun/man/man1/javadoc.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/solaris/doc/sun/man/man1/javadoc.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH javadoc 1 "10 May 2011"
+.TH javadoc 1 "16 Mar 2012"
 .SH "Name"
 javadoc \- The Java API Documentation Generator
 .LP
@@ -111,7 +111,7 @@
 .na
 \f2How Classes Are Found\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html. Generally speaking, classes you create must either be loaded as an extension or in the Javadoc tool's class path.
+http://docs.oracle.com/javase/7/docs/technotes/tools/findingclasses.html. Generally speaking, classes you create must either be loaded as an extension or in the Javadoc tool's class path.
 .SS 
 Javadoc Doclets
 .LP
@@ -122,7 +122,7 @@
 .na
 \f2Javadoc Doclets\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/index.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/index.html 
 .TP 2
 o
 The \f2\-doclet\fP command\-line option 
@@ -137,7 +137,7 @@
 .na
 \f2Javadoc Enhancements\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/index.html for details about improvements added in Javadoc. 
+http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/index.html for details about improvements added in Javadoc. 
 .TP 2
 o
 .na
@@ -206,7 +206,7 @@
 .na
 \f21.3\fP @
 .fi
-http://download.oracle.com/javase/1.3/docs/tooldocs/solaris/javadoc.html#referencedclasses.) When the Javadoc tool is run, it should load into memory all of the referenced classes in javadoc's bootclasspath and classpath. (The Javadoc tool prints a "Class not found" warning for referenced classes not found.) The Javadoc tool can derive enough information from the .class files to determine their existence and the fully\-qualified names of their members. 
+http://docs.oracle.com/javase/1.3/docs/tooldocs/solaris/javadoc.html#referencedclasses.) When the Javadoc tool is run, it should load into memory all of the referenced classes in javadoc's bootclasspath and classpath. (The Javadoc tool prints a "Class not found" warning for referenced classes not found.) The Javadoc tool can derive enough information from the .class files to determine their existence and the fully\-qualified names of their members. 
 .LP
 .TP 3
 external referenced classes 
@@ -338,14 +338,14 @@
 .na
 \f2Package Summary\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/java/applet/package\-summary.html. 
+http://docs.oracle.com/javase/7/docs/api/java/applet/package\-summary.html. 
 .TP 2
 o
 Copies the first sentence of the package comment to the top of the package summary page. It also adds the package name and this first sentence to the list of packages on the overview page, as shown in 
 .na
 \f2Overview Summary\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/overview\-summary.html. The end\-of\-sentence is determined by the same rules used for the end of the first sentence of class and member main descriptions. 
+http://docs.oracle.com/javase/7/docs/api/overview\-summary.html. The end\-of\-sentence is determined by the same rules used for the end of the first sentence of class and member main descriptions. 
 .RE
 .SS 
 Overview Comment File
@@ -372,7 +372,7 @@
 .na
 \f2Overview Summary\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/overview\-summary.html. 
+http://docs.oracle.com/javase/7/docs/api/overview\-summary.html. 
 .TP 2
 o
 Copies the first sentence of the overview comment to the top of the overview summary page. 
@@ -1093,7 +1093,7 @@
 .na
 \f2The @deprecated tag\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/deprecation/index.html.
+http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/deprecation/index.html.
 .LP
 .RS 3
 .TP 3
@@ -2166,7 +2166,7 @@
 .na
 \f2Documenting Serializable Fields and Data for a Class\fP @
 .fi
-http://download.oracle.com/javase/7/docs/platform/serialization/spec/serial\-arch.html," Section 1.6 of the \f2Java Object Serialization Specification\fP. Also see the 
+http://docs.oracle.com/javase/7/docs/platform/serialization/spec/serial\-arch.html," Section 1.6 of the \f2Java Object Serialization Specification\fP. Also see the 
 .na
 \f2Serialization FAQ\fP @
 .fi
@@ -2259,7 +2259,7 @@
 .na
 \f2Constant Field Values\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/constant\-values.html page. 
+http://docs.oracle.com/javase/7/docs/api/constant\-values.html page. 
 .LP
 .TP 3
 @version\  version\-text 
@@ -2954,7 +2954,7 @@
 .na
 \f2class path\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/index.html#general documentation for specifying \f2classpathlist\fP.
+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#general documentation for specifying \f2classpathlist\fP.
 .br
 .br
 If \f2\-sourcepath\fP is omitted, the Javadoc tool uses \f2\-classpath\fP to find the source files as well as class files (for backward compatibility). Therefore, if you want to search for source and class files in separate paths, use both \f2\-sourcepath\fP and \f2\-classpath\fP.
@@ -2974,7 +2974,7 @@
 .na
 \f2How Classes Are Found\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html.  
+http://docs.oracle.com/javase/7/docs/technotes/tools/findingclasses.html.  
 .br
 .br
 As a special convenience, a class path element containing a basename of \f2*\fP is considered equivalent to specifying a list of all the files in the directory with the extension \f2.jar\fP or \f2.JAR\fP (a Java program cannot tell the difference between the two invocations).
@@ -3013,7 +3013,7 @@
 .na
 \f2How Classes Are Found\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles. for more details. Separate directories in \f2classpathlist\fP with colons (:).  
+http://docs.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles. for more details. Separate directories in \f2classpathlist\fP with colons (:).  
 .TP 3
 \-extdirs\  dirlist 
 Specifies the directories where extension classes reside. These are any classes that use the Java Extension mechanism. The extdirs is part of the search path the Javadoc tool will use to look up source and class files. See \f2\-classpath\fP (above) for more details. Separate directories in \f2dirlist\fP with colons (:).  
@@ -3029,7 +3029,7 @@
 .na
 \f2java.text.BreakIterator\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/java/text/BreakIterator.html to determine the end of the first sentence for English (all other locales already use \f2BreakIterator\fP), rather than an English language, locale\-specific algorithm. By \f2first sentence\fP, we mean the first sentence in the main description of a package, class or member. This sentence is copied to the package, class or member summary, and to the alphabetic index.
+http://docs.oracle.com/javase/7/docs/api/java/text/BreakIterator.html to determine the end of the first sentence for English (all other locales already use \f2BreakIterator\fP), rather than an English language, locale\-specific algorithm. By \f2first sentence\fP, we mean the first sentence in the main description of a package, class or member. This sentence is copied to the package, class or member summary, and to the alphabetic index.
 .br
 .br
 From JDK 1.2 forward, the BreakIterator class is already used to determine the end of sentence for all languages but English. Therefore, the \f2\-breakiterator\fP option has no effect except for English from 1.2 forward. English has its own default algorithm: 
@@ -3211,13 +3211,13 @@
 .br
 \f3Example using absolute links to the external docs\fP \- Let us say you want to link to the \f2java.lang\fP, \f2java.io\fP and other Java Platform packages at 
 .na
-\f2http://download.oracle.com/javase/7/docs/api/\fP @
+\f2http://docs.oracle.com/javase/7/docs/api/\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/. The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other options, such as \f2\-sourcepath\fP and \f2\-d\fP, are not shown.) 
+http://docs.oracle.com/javase/7/docs/api/. The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other options, such as \f2\-sourcepath\fP and \f2\-d\fP, are not shown.) 
 .nf
 \f3
 .fl
-  % \fP\f3javadoc \-link http://download.oracle.com/javase/7/docs/api/ com.mypackage\fP
+  % \fP\f3javadoc \-link http://docs.oracle.com/javase/7/docs/api/ com.mypackage\fP
 .fl
 .fi
 \f3Example using relative links to the external docs\fP \- Let us say you have two packages whose docs are generated in different runs of the Javadoc tool, and those docs are separated by a relative path. In this example, the packages are \f2com.apipackage\fP, an API, and \f2com.spipackage\fP, an SPI (Service Provide Interface). You want the documentation to reside in \f2docs/api/com/apipackage\fP and \f2docs/spi/com/spipackage\fP. Assuming the API package documentation is already generated, and that \f2docs\fP is the current directory, you would document the SPI package with links to the API documentation by running: 
@@ -3267,9 +3267,9 @@
 .br
 For example, the package list for the Java SE 6 API is located at 
 .na
-\f2http://download.oracle.com/javase/7/docs/api/package\-list\fP @
+\f2http://docs.oracle.com/javase/7/docs/api/package\-list\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/package\-list. and starts as follows: 
+http://docs.oracle.com/javase/7/docs/api/package\-list. and starts as follows: 
 .nf
 \f3
 .fl
@@ -3336,15 +3336,15 @@
 You can specify multiple \f2\-linkoffline\fP options in a given javadoc run. (Prior to 1.2.2, it could be specified only once.)
 .br
 .br
-\f3Example using absolute links to the external docs\fP \- Let us say you want to link to the \f2java.lang\fP, \f2java.io\fP and other Java SE Platform packages at \f2http://download.oracle.com/javase/7/docs/api/\fP, but your shell does not have web access. You could open the \f2package\-list\fP file in a browser at 
+\f3Example using absolute links to the external docs\fP \- Let us say you want to link to the \f2java.lang\fP, \f2java.io\fP and other Java SE Platform packages at \f2http://docs.oracle.com/javase/7/docs/api/\fP, but your shell does not have web access. You could open the \f2package\-list\fP file in a browser at 
 .na
-\f2http://download.oracle.com/javase/7/docs/api/package\-list\fP @
+\f2http://docs.oracle.com/javase/7/docs/api/package\-list\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/package\-list, save it to a local directory, and point to this local copy with the second argument, \f2packagelistLoc\fP. In this example, the package list file has been saved to the current directory "\f2.\fP" . The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other necessary options, such as \f2\-sourcepath\fP, are not shown.) 
+http://docs.oracle.com/javase/7/docs/api/package\-list, save it to a local directory, and point to this local copy with the second argument, \f2packagelistLoc\fP. In this example, the package list file has been saved to the current directory "\f2.\fP" . The following command generates documentation for the package \f2com.mypackage\fP with links to the Java SE Platform packages. The generated documentation will contain links to the \f2Object\fP class, for example, in the class trees. (Other necessary options, such as \f2\-sourcepath\fP, are not shown.) 
 .nf
 \f3
 .fl
-% \fP\f3javadoc \-linkoffline http://download.oracle.com/javase/7/docs/api/ . com.mypackage\fP
+% \fP\f3javadoc \-linkoffline http://docs.oracle.com/javase/7/docs/api/ . com.mypackage\fP
 .fl
 .fi
 \f3Example using relative links to the external docs\fP \- It's not very common to use \f2\-linkoffline\fP with relative paths, for the simple reason that \f2\-link\fP usually suffices. When using \f2\-linkoffline\fP, the \f2package\-list\fP file is generally local, and when using relative links, the file you are linking to is also generally local. So it is usually unnecessary to give a different path for the two arguments to \f2\-linkoffline\fP. When the two arguments are identical, you can use \f2\-link\fP. See the \f2\-link\fP relative example.
@@ -3695,7 +3695,7 @@
 .na
 \f2Taglet Overview\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/taglet/overview.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/taglet/overview.html 
 .RE
 Taglets are useful for block or inline tags. They can have any number of arguments and implement custom behavior, such as making text bold, formatting bullets, writing out the text to a file, or starting other processes.
 .br
@@ -3908,7 +3908,7 @@
 .na
 \f2Standard Doclet\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/javadoc/standard\-doclet.html#runningprogrammatically.
+http://docs.oracle.com/javase/7/docs/technotes/guides/javadoc/standard\-doclet.html#runningprogrammatically.
 .LP
 \f3Running Doclets\fP \- The instructions given below are for invoking the standard HTML doclet. To invoke a custom doclet, use the \-doclet and \-docletpath options. For full, working examples of running a particular doclet, see the 
 .na
@@ -4223,12 +4223,12 @@
 .na
 \f2Setting the Class Path\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/index.html#general 
+http://docs.oracle.com/javase/7/docs/technotes/tools/index.html#general 
 .TP 2
 o
 .na
 \f2How Javac and Javadoc Find Classes\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles (tools.jar) 
+http://docs.oracle.com/javase/7/docs/technotes/tools/findingclasses.html#srcfiles (tools.jar) 
 .RE
  

--- a/src/solaris/doc/sun/man/man1/javah.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/solaris/doc/sun/man/man1/javah.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH javah 1 "10 May 2011"
+.TH javah 1 "16 Mar 2012"
 
 .LP
 .SH "Name"

--- a/src/solaris/doc/sun/man/man1/javap.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/solaris/doc/sun/man/man1/javap.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH javap 1 "10 May 2011"
+.TH javap 1 "16 Mar 2012"
 
 .LP
 .SH "Name"

--- a/src/solaris/doc/sun/man/man1/javaws.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/solaris/doc/sun/man/man1/javaws.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH javaws 1 "10 May 2011"
+.TH javaws 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -208,7 +208,7 @@
 .na
 \f2System\- and User\-Level Properties\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/properties.html.
+http://docs.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/properties.html.
 .LP
 .SH "MORE INFORMATION"
 .LP
@@ -217,6 +217,6 @@
 .na
 \f2Java Web Start\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/javaws/index.html.
+http://docs.oracle.com/javase/7/docs/technotes/guides/javaws/index.html.
 .LP
  

--- a/src/solaris/doc/sun/man/man1/jcmd.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/solaris/doc/sun/man/man1/jcmd.1	Fri Mar 16 15:20:53 2012 -0700
@@ -1,4 +1,4 @@
-." Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+." Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
 ." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 ."
 ." This code is free software; you can redistribute it and/or modify it
@@ -19,27 +19,27 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jcmd 1 "22 Novembre 2011"
+.TH jcmd 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
 jcmd \- Diagnostic Command
-.br
-
+.LP
+.LP
+\f3jcmd\fP is a utility to send diagnostic command requests to a running Java Virtual Machine.
 .LP
 .SH "SYNOPSIS"
 .LP
 .nf
 \f3
 .fl
-\fP\f3jcmd\fP [ option ]
+    \fP\f3jcmd\fP [ option ] 
 .fl
-\f3jcmd\fP <\fIpid\fR | \fImain class\fR> PerfCounter.print
+    \f3jcmd\fP <\f2pid\fP | \f2main class\fP> PerfCounter.print
 .fl
-\f3jcmd\fP <\fIpid\fR | \fImain class\fR> \fIcommand\fR [\fIarguments\fR]
+    \f3jcmd\fP <\f2pid\fP | \f2main class\fP> \f2command\fP [\f2arguments\fP]
 .fl
-\f3jcmd\fP <\fIpid\fR | \fImain class\fR> -f \fIfile\fR
-.fl
+    \f3jcmd\fP <\f2pid\fP | \f2main class\fP> \-f \f2file\fP
 .fl
 .fi
 
@@ -47,12 +47,23 @@
 .SH "DESCRIPTION"
 .LP
 .LP
-\f3jcmd\fP is a utility to send diagnostic command requests to a Java 
-Virtual Machine supporting this feature. Used without arguments or with the \-l option, jcmd prints the list of running Java processes with their process id, their main class and their command line arguments. When a process id is specified on the command line, jcmd sends the diagnostic command request to the process with this id. When a main class is specified on the command line, jcmd sends the diagnostic command request to all Java processes with this main class. With the PerfCounter.print argument, jcmd prints the performance counters available on the targeted Java process(es). With the \-f option, jcmd sends to the targeted Java process(es) the diagnostic commands stored in the file \fIfile\fR.
+\f3jcmd\fP is a utility to send diagnostic command requests to a Java Virtual Machine supporting this feature.
+.LP
+.LP
+Used without arguments or with the \-l option, jcmd prints the list of running Java processes with their process id, their main class and their command line arguments.
+.LP
+.LP
+When a process id is specified on the command line, jcmd sends the diagnostic command request to the process with this id.
+.LP
 .LP
-\fP
-.fi
-
+When a main class is specified on the command line, jcmd sends the diagnostic command request to all Java processes with this main class.
+.LP
+.LP
+With the PerfCounter.print argument, jcmd prints the performance counters available on the targeted Java process(es).
+.LP
+.LP
+With the \-f option, jcmd sends to the targeted Java process(es) the diagnostic commands stored in the file \f2file\fP.
+.LP
 .SH "OPTIONS"
 .LP
 .LP
@@ -61,17 +72,15 @@
 .RS 3
 .TP 3
 \-l 
-prints the list of running Java processes with their process id, their
-main class and their command line arguments. 
+Prints the list of running Java processes with their process id, their main class and their command line arguments. 
+.br
 .TP 3
 \-h 
-prints a help message.
-.br
+Prints a help message. 
 .br
 .TP 3
 \-help 
-prints a help message
-.br
+Prints a help message. 
 .RE
 
 .LP
@@ -79,39 +88,26 @@
 .LP
 .RS 3
 .TP 3
-\fIpid\fR
-Identifies the process which will receive the diagnostic command requests. The process must be a Java process. To get a list of Java processes running on a machine, jps(1) or jcmd(1) may be used. 
-.RE
-.LP
-.RS 3
+pid 
+Identifies the process that receives the diagnostic command requests. The process must be a Java process. To get a list of Java processes running on a machine, use jps(1) or jcmd(1). 
+.br
 .TP 3
-\fImain class\fR
-Main class of the process which will receive the diagnostic command requests. If several running Java processes share this main class, the diagnostic command request will be sent to all these processes. To get a list of Java processes running on a machine, jps(1) or jcmd(1) may be used. 
-.RE
-.RS 3
+main class 
+Main class of the process that receives the diagnostic command requests. If several running Java processes share this main class, the diagnostic command request is sent to all these processes. To get a list of Java processes running on a machine, use jps(1) or jcmd(1). 
+.br
 .TP 3
-\fIcommand\fR [\fIarguments\fR]
-Invoke the diagnostic command called \fIcommand\fR on the targeted Java
-process(es). The list of available diagnostic commands for a given
-process can be obtained by invoking the 'help' command on this process.
-Each diagnostic command has its own set of \fIarguments\fR which can be 
-obtained by invoking the 'help' command followed by the command name.
-.RE
-.RS 3
+command [arguments] 
+Invoke the diagnostic command called \f2command\fP on the targeted Java process(es). The list of available diagnostic commands for a given process can be obtained by invoking the \f3help\fP command on this process. Each diagnostic command has its own set of \f2arguments\fP, which can be obtained by invoking the \f3help\fP command followed by the command name. 
+.br
 .TP 3
-\fIPerfCounter.print\fR
-Print the performance counters available on the targeted Java
-process(es). The list of performance counters may vary with the Java
-process.
-.RE
-.RS 3
+Counter.print 
+Print the performance counters available on the targeted Java process(es). The list of performance counters may vary with the Java process. 
+.br
 .TP 3
-\fI-f file\fR
-Read commands from \fIfile\fR and invoke them on the targeted Java
-process(es). In  \fIfile\fR, each command must be written on a single line. 
-Lines starting with # are ignored. Processing of \fIfile\fR ends when
-all lines have been invoked or when a line containing the 'stop' keyword
-is read.
+\-f file 
+Read commands from \f2file\fP and invoke them on the targeted Java process(es). In \f2file\fP, each command must be written on a single line. Lines starting with # are ignored. Processing of \f2file\fP ends when all lines have been invoked or when a line containing the \f3stop\fP keyword is read. 
+.RE
+
 .LP
 .SH "SEE ALSO"
 .LP
@@ -121,4 +117,8 @@
 jps(1) 
 .RE
 
+.LP
+.LP
+jps(1)
+.LP
  

--- a/src/solaris/doc/sun/man/man1/jconsole.1	Fri Mar 02 12:24:35 2012 +0200
+++ b/src/solaris/doc/sun/man/man1/jconsole.1	Fri Mar 16 15:20:53 2012 -0700
@@ -19,7 +19,7 @@
 ." or visit www.oracle.com if you need additional information or have any
 ." questions.
 ."
-.TH jconsole 1 "10 May 2011"
+.TH jconsole 1 "16 Mar 2012"
 
 .LP
 .SH "Name"
@@ -52,21 +52,21 @@
 .na
 \f2JMX Monitoring and Management\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/management/agent.html for details. 
+http://docs.oracle.com/javase/7/docs/technotes/guides/management/agent.html for details. 
 .TP 2
 o
 \f2host\fP:\f2port\fP Name of the host system on which the Java VM is running and the port number specified by the system property \f2com.sun.management.jmxremote.port\fP when the Java VM was started. See 
 .na
 \f2JMX Monitoring and Management\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/management/agent.html for details. 
+http://docs.oracle.com/javase/7/docs/technotes/guides/management/agent.html for details. 
 .TP 2
 o
 \f2jmxUrl\fP Address of the JMX agent to be connected to as described in 
 .na
 \f2JMXServiceURL\fP @
 .fi
-http://download.oracle.com/javase/7/docs/api/javax/management/remote/JMXServiceURL.html. 
+http://docs.oracle.com/javase/7/docs/api/javax/management/remote/JMXServiceURL.html. 
 .RE
 .RE
 
@@ -103,7 +103,7 @@
 .na
 \f2com.sun.tools.jconsole.JConsolePlugin\fP @
 .fi
-http://download.oracle.com/javase/7/docs/jdk/api/jconsole/spec/com/sun/tools/jconsole/JConsolePlugin.html class. 
+http://docs.oracle.com/javase/7/docs/jdk/api/jconsole/spec/com/sun/tools/jconsole/JConsolePlugin.html class. 
 .TP 3
 \-version 
 Output version information and exit. 
@@ -124,13 +124,13 @@
 .na
 \f2Using JConsole\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/management/jconsole.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/management/jconsole.html 
 .TP 2
 o
 .na
 \f2Monitoring and Management for Java Platform\fP @
 .fi
-http://download.oracle.com/javase/7/docs/technotes/guides/management/index.html 
+http://docs.oracle.com/javase/7/docs/technotes/guides/management/index.html 
 .RE
 
 .LP