It appears to that there are some mistaken differences between the linux
and solaris versions of java.html that ought to be brought into sync.
For example, corrections in one file have no been made in the other,
such as "s loaders" in one files appears as "class loaders" in the other.

We should figure out what the substantive differences are and either try
to combine these two files into a single file (like the other tools) or make
the only differences be due only to the actual Solaris/Linux differences.

% cd /default/main/sunDeveloper/javaSunCom/WORKAREA/draft/j2se/1.5.0/docs/tooldocs
% diff linux/java.html solaris/java.html

47,51c47,48
< specified class, and invoking that class's <b>main</b> method.
< <p>
< The method must be declared public and static, must not
< return any value, and must accept a String array as a parameter.
< The method declaration must look like the following:
---
> specified class, and invoking that class's <b>main</b> method. The
> method declaration must look like the following:

55c52,54
< By default, the first non-option argument is the name
---
> The method must be declared public and static, it must not
> return any value, and it must accept a String array as a
> parameter. By default, the first non-option argument is the name

86c85
< <dt><b>-hotspot</b>
---
> <dt><b>-client</b>

116c115
< <a href=../solaris/classpath.html>Setting the Class Path</a>.
---
> <a href=classpath.html>Setting the Class Path</a>.

119a119
>

124c124,127
< environment if available.<P>
---
> environment. On Solaris these correspond to the ILP32 and LP64
> data models, respectively. The <b>-d64</b> option may only be used
> on 64-bit Solaris systems.
> <P>

129,131c132,134
< In IA64 and AMD64 environments, the default is -d64.
< In I586 environments, the default is -d32.
< This is subject to change in a future release.
---
> If neither <b>-d32</b> nor <b>-d64</b> is specified, the
> default is to run in a 32-bit environment. This is subject to
> change in a future release.

153c156
< <p>The <b>-enableassertions</b> and <b>-ea</b> switches apply to <i>all</i> s loaders and to system classes
---
> <p>The <b>-enableassertions</b> and <b>-ea</b> switches apply to <i>all</i> class loaders and to system classes

161c164
< <dt><b>-disableassertions</b><i>[:&lt;package name&gt;"..." | :&lt;class ; ]</i>
---
> <dt><b>-disableassertions</b><i>[:&lt;package name&gt;"..." | :&lt;class name&gt; ]</i>

168c171
< <tt>"..."</tt>, the switch disables assertions in the unnamed package in the rent
---
> <tt>"..."</tt>, the switch disables assertions in the unnamed package in the current

174c177
< be used: <PRE>java -ea:com.wombat.fruitbat... -da:com.wombat.fruitbat.Brickbat lt;Main Class&gt;
---
> be used: <PRE>java -ea:com.wombat.fruitbat... -da:com.wombat.fruitbat.Brickbat &lt;Main Class&gt;

176c179
< <p>The <b>-disableassertions</b> and <b>-da</b> switches apply to <i>all</i> ss loaders and to system classes
---
> <p>The <b>-disableassertions</b> and <b>-da</b> switches apply to <i>all</i> class loaders and to system classes
194a198
>

206c210
< the <a href="../solaris/jar.html">Jar tool reference page</a> and
---
> the <a href="jar.html">Jar tool reference page</a> and

265c269
< proceeds as a foreground task until completed.
---
> proceeds as a foreground task until completed.

270a275
>

290c295
< <p>
---
> <p>

300c305
< <p>
---
> <p>

318,322c323,328
< Enable the incremental garbage collector. The incremental
< garbage collector, which is off by default, will eliminate
< occasional garbage-collection pauses during program execution.
< However, it can lead to a roughly 10% decrease in overall
< GC performance.
---
> Enable the incremental garbage collector. The incremental garbage
> collector, which is off by default, will reduce the occasional long
> garbage-collection pauses during program execution. The incremental
> garbage collector will at times execute concurrently with the
> program and during such times will reduce the processor capacity
> available to the program.

354c360,364
< <tt>M</tt> to indicate megabytes. The default value is 64MB. Examples:
---
> <tt>M</tt> to indicate megabytes. The default value is 64MB.
> The upper limit for this value will be approximately 4000m
> on Solaris 7 and Solaris 8 SPARC platforms and 2000m on Solaris 2.6
> and x86 platforms, minus overhead amounts.
> Examples:

377a388
>

413c424,431
< <dt>
---
>
> <p>
> <dt><b>-XX:+UseAltSigs</b>
> <dd>The VM uses <tt>SIGUSR1</tt> and <tt>SIGUSR2</tt> by default,
> which can sometimes conflict with applications that signal-chain
> <tt>SIGUSR1</tt> and <tt>SIGUSR2</tt>. The <tt>-XX:+UseAltSigs</tt>
> option will cause the VM to use signals other than
> <tt>SIGUSR1</tt> and <tt>SIGUSR2</tt> as the default.

421,424c439,442
< <li><a href=../solaris/javac.html>javac - the Java programming language compiler</a>
< <li><a href=../solaris/jdb.html>jdb - Java Application Debugger</a>
< <li><a href=../solaris/javah.html>javah - C Header and Stub File Generator</a>
< <li><a href=../solaris/jar.html>jar - JAR Archive Tool</a>
---
> <li><a href=javac.html>javac - the Java programming language compiler</a>
> <li><a href=jdb.html>jdb - Java Application Debugger</a>
> <li><a href=javah.html>javah - C Header and Stub File Generator</a>
> <li><a href=jar.html>jar - JAR Archive Tool</a>

430d447
<