Changeset 4175

Timestamp:

Mar 14, 2008, 9:47:48 AM (15 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #949: Installation documentation has incorrect information about which Java version to use

Location:

branches/2.6-stable

Files:

• build.xml (modified) (1 diff)
• doc/src/docbook/admindoc/installation_upgrade.xml (modified) (1 diff)
• doc/src/docbook/appendix/base.config.xml (modified) (1 diff)
• doc/src/docbook/appendix/jobagent.properties.xml (modified) (1 diff)
• doc/src/docbook/userdoc/webclient.xml (modified) (2 diffs)

branches/2.6-stable/build.xml

@@ -1322 +1322 @@
       
       <header><![CDATA[${base.version}: ${TODAY}]]></header>
-      <link href="http://java.sun.com/j2se/1.5/docs/api"/>
+      <link href="http://java.sun.com/javase/6/docs/api"/>
       <link href="http://www.hibernate.org/hib_docs/v3/api"/>
       <link href="http://www.jdom.org/docs/apidocs/" />

branches/2.6-stable/doc/src/docbook/admindoc/installation_upgrade.xml

@@ -632 +632 @@
         <listitem>
           <para>
-            Download and install Java SDK 1.5, available from
-            <ulink url="http://java.sun.com/" />. Make sure that you
-            download the JDK version (<emphasis>not</emphasis> the JRE
-            version). <command>Java 6 is currently not
-            supported</command> (this will change starting with
-            BASE version 2.5 whereafter only Java 6 will be supported).
+            Download and install Java SDK 1.6, available from
+            <ulink url="http://java.sun.com/" />. Earlier versions
+            may work (eq. 1.5), but are not supported.
           </para>
         </listitem>

branches/2.6-stable/doc/src/docbook/appendix/base.config.xml

@@ -443 +443 @@
         <para>
         The priority to give to jobs. The priority is a value between 1 and 10. 
-        See <ulink url="http://java.sun.com/j2se/1.5.0/docs/api/java/lang/Thread.html"
-        >http://java.sun.com/j2se/1.5.0/docs/api/java/lang/Thread.html</ulink> 
+        See <ulink url="http://java.sun.com/javase/6/docs/api/java/lang/Thread.html"
+        >http://java.sun.com/javase/6/docs/api/java/lang/Thread.html</ulink> 
         for more information about thread priorities.
         </para>

branches/2.6-stable/doc/src/docbook/appendix/jobagent.properties.xml

@@ -323 +323 @@
       A thread priority is associated with each slot. The priority
       is a value between 1 and 10 as defined by the 
-      <ulink url="http://java.sun.com/j2se/1.5.0/docs/api/java/lang/Thread.html"
+      <ulink url="http://java.sun.com/javase/6/docs/api/java/lang/Thread.html"
         ><classname>java.lang.Thread</classname></ulink> class.
     </para>

branches/2.6-stable/doc/src/docbook/userdoc/webclient.xml

@@ -696 +696 @@
                 We support all formatting options supported by the Java
                 language. For more information see:
-                <ulink url="http://java.sun.com/j2se/1.5.0/docs/api/java/text/SimpleDateFormat.html">SimpleDateFormat documentation</ulink>
+                <ulink url="http://java.sun.com/javase/6/docs/api/java/text/SimpleDateFormat.html">SimpleDateFormat documentation</ulink>
                 The most useful format patterns are:
                 </para>
@@ -726 +726 @@
                 We support all formatting options supported by the Java
                 language. For more information see:
-                <ulink url="http://java.sun.com/j2se/1.5.0/docs/api/java/text/SimpleDateFormat.html">SimpleDateFormat documentations</ulink>
+                <ulink url="http://java.sun.com/javase/6/docs/api/java/text/SimpleDateFormat.html">SimpleDateFormat documentations</ulink>
                 The most useful time-format patterns are:
                 </para>