diff --git a/rse/doc/org.eclipse.dstore.doc.isv/.cvsignore b/rse/doc/org.eclipse.dstore.doc.isv/.cvsignore
index 092357e47d3..4ec109d13fd 100755
--- a/rse/doc/org.eclipse.dstore.doc.isv/.cvsignore
+++ b/rse/doc/org.eclipse.dstore.doc.isv/.cvsignore
@@ -1 +1,6 @@
-bin
+bin
+index
+build.xml
+temp.bin.log
+temp.options.txt
+temp.convert.txt
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/aaa-how-to-add-things.txt b/rse/doc/org.eclipse.dstore.doc.isv/aaa-how-to-add-things.txt
index aaf41262711..d73e72b8e5c 100755
--- a/rse/doc/org.eclipse.dstore.doc.isv/aaa-how-to-add-things.txt
+++ b/rse/doc/org.eclipse.dstore.doc.isv/aaa-how-to-add-things.txt
@@ -1,23 +1,29 @@
-Last revised May 31, 2006
-(This file is for information only; it is not included in the release.)
-
-To add new plug-ins you need to make changes in several places in
-this doc plug-in:
-
-1) options.txt
-- the plug-in's source folder(s) must be included on the -sourcepath
-- code of required plug-ins must be added on the -classpath (the JAR(s)for non-JARed plug-ins and <plugin>/@dot for JARed plug-ins
-- the API package names must be included in the (alphabetical) package list at the end of the file
-- note that the @sep@ token is replaced during build by the appropriate separator character for the build platform.
-
-2) buildDoc.xml
-- add a line in convertSchemaToHtml target to handle a new plug-ins extension point schemas
-
-Adding new extension points:
-
-1) reference/extension-points/index.html
-- add a line for each extension point
-
-2) topics_Reference.xml
-- add a line for each extension point
+Last revised July 27, 2006
+(This file is for information only; it is not included in the release.)
+
+See also
+  http://wiki.eclipse.org/index.php/How_to_add_things_to_the_Eclipse_doc
+with the following exceptions:
+- platformOptions.txt    -> options.txt
+- overview-platform.html -> /reference/misc/overview-rse.html
+
+To add new plug-ins you need to make changes in several places in
+this doc plug-in:
+
+1) options.txt
+- the plug-in's source folder(s) must be included on the -sourcepath
+- code of required plug-ins must be added on the -classpath (the JAR(s)for non-JARed plug-ins and <plugin>/@dot for JARed plug-ins
+- the API package names must be included in the (alphabetical) package list at the end of the file
+- note that the @sep@ token is replaced during build by the appropriate separator character for the build platform.
+
+2) buildDoc.xml
+- add a line in convertSchemaToHtml target to handle a new plug-ins extension point schemas
+
+Adding new extension points:
+
+1) reference/extension-points/index.html
+- add a line for each extension point
+
+2) topics_Reference.xml
+- add a line for each extension point
 - add a line for each API package
\ No newline at end of file
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/build.properties b/rse/doc/org.eclipse.dstore.doc.isv/build.properties
index f8178df1644..8788dc44d04 100755
--- a/rse/doc/org.eclipse.dstore.doc.isv/build.properties
+++ b/rse/doc/org.eclipse.dstore.doc.isv/build.properties
@@ -1,21 +1,22 @@
-###############################################################################
-# Copyright (c) 2000, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = META-INF/,\
-               about.html,\
-               book.css,\
-               notices.html,\
-               plugin.properties,\
-               plugin.xml,\
-               toc.html,\
-               toc.xml,\
-               guide/,\
-               reference/
-customBuildCallbacks = customBuildCallbacks.xml
+###############################################################################
+# Copyright (c) 2000, 2006 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+bin.includes = META-INF/,\
+               about.html,\
+               book.css,\
+               notices.html,\
+               plugin.properties,\
+               plugin.xml,\
+               toc.html,\
+               toc.xml,\
+               guide/,\
+               index/,\
+               reference/
+customBuildCallbacks = customBuildCallbacks.xml
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/buildDoc.xml b/rse/doc/org.eclipse.dstore.doc.isv/buildDoc.xml
index e99ebdf0196..1a676795247 100755
--- a/rse/doc/org.eclipse.dstore.doc.isv/buildDoc.xml
+++ b/rse/doc/org.eclipse.dstore.doc.isv/buildDoc.xml
@@ -1,66 +1,131 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="RSE DStore ISV Doc Build" default="all" basedir=".">
-
-	<target name="init">
-		<available file="${basedir}/index" property="index.present" />
-	</target>
-
-	<target name="all" depends="init" unless="index.present">
-		<antcall target="convertSchemaToHtml" />
-		<antcall target="generateJavadoc" />
-		<antcall target="build.index" />
-	</target>
-
-	<target name="build.index" description="Builds search index for the plug-in: org.eclipse.dstore.doc.isv" if="eclipse.running">
-		<help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}" />
-	</target>
-
-	<target name="convertSchemaToHtml" if="eclipse.running">
-		<property name="dest" value="reference/extension-points" />
-		<record name="${basedir}/temp.convert.txt" action="start" />
-		<!-- pde.convertSchemaToHTML manifest="../org.eclipse.dstore.core/plugin.xml" destination="${dest}" / -->
-		<record name="${basedir}/temp.convert.txt" action="stop" />
-	</target>
-
-	<target name="getJavadocPath">
-		<available file="${java.home}/../bin/javadoc.exe" property="javadoc" value="${java.home}/../bin/javadoc.exe" />
-		<available file="${java.home}/../bin/javadoc" property="javadoc" value="${java.home}/../bin/javadoc" />
-		<available file="/usr/bin/javadoc" property="javadoc" value="/usr/bin/javadoc" />
-	</target>
-
-	<target name="generateJavadoc" depends="getJavadocPath" if="javadoc">
-		<!--scrub isv plugin directories of any preexisting api doc content-->
-		<delete dir="reference/api" />
-		<mkdir dir="reference/api" />
-
-		<condition property="sep" value=":">
-			<os family="unix" />
-		</condition>
-		<condition property="sep" value=";">
-			<os family="windows" />
-		</condition>
-
-		<copy file="options.txt" tofile="temp.options.txt" />
-		<replace file="${basedir}/temp.options.txt" token="@sep@" value="${sep}" />
-		<replace file="${basedir}/temp.options.txt" token="@rt@" value="${bootclasspath}" />
-
-		<exec dir="." executable="${javadoc}" output="temp.bin.log">
-			<arg line="@${basedir}/temp.options.txt -J-Xmx1000M" />
-		</exec>
-	</target>
-
-</project>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="RSE DStore ISV Doc Build" default="all" basedir=".">
+
+	<target name="init">
+		<available file="${basedir}/index" property="index.present" />
+		<path id="path_bootclasspath">
+			<fileset dir="${java.home}/lib">
+				<include name="*.jar"/>
+			</fileset>
+		</path>
+		<property name="bootclasspath" refid="path_bootclasspath"/>
+		<condition property="safeBaseLocation"
+			value="${baseLocation}"
+			else="${eclipse.home}">
+			<isset property="baseLocation"/>
+		</condition>
+	</target>
+
+	<target name="computeClasspath" unless="javadoc.classpath">
+		<!-- Construct the javadoc classpath and store it in a property. -->
+		<echo level="info" message="Computing classpath ..."/>
+		
+		<!-- Add platform dependencies required by your plug-in here.
+			 Note that this pattern expects GMF and its dependencies to have 
+			 been installed into the platform directory structure, as is
+			 the case during the build. -->
+		<patternset id="platform.classpath.pattern">
+			<include name="**/org.eclipse.core*.jar"/>
+			<include name="**/org.eclipse.core*/**/*.jar"/>
+			<include name="**/org.eclipse.compare*.jar"/>
+			<include name="**/org.eclipse.debug.core*.jar"/>
+			<include name="**/org.eclipse.debug.ui*.jar"/>
+			<include name="**/org.eclipse.search*.jar"/>
+        	<include name="**/org.eclipse.swt*.jar"/>
+        	<include name="**/org.eclipse.swt*/**/*.jar"/>
+        	<include name="**/org.eclipse.ui*.jar"/>
+        	<include name="**/org.eclipse.ui*/**/*.jar"/>
+        	<include name="**/org.eclipse.update*.jar"/>
+        	<include name="**/org.eclipse.update*/**/*.jar"/>
+        	<include name="**/org.eclipse.osgi*.jar"/>
+        	<include name="**/org.eclipse.osgi*/**/*.jar"/>
+        	<include name="**/org.eclipse.equinox*.jar"/>
+        	<include name="**/org.eclipse.equinox*/**/*.jar"/>
+        	<include name="**/org.eclipse.jface*.jar"/>
+        	<include name="**/org.eclipse.jface*/**/*.jar"/>
+        	<include name="**/org.eclipse.text*.jar"/>
+        	<include name="**/org.eclipse.text*/**/*.jar"/>
+        	<include name="**/org.eclipse.team*.jar"/>
+        	<include name="**/org.eclipse.team*/**/*.jar"/>
+        	<include name="**/org.junit*.jar"/>
+        	<include name="**/org.junit*/**/*.jar"/>
+			<include name="**/com.ibm.icu*.jar"/>
+			<include name="**/com.jcraft.jsch*.jar"/>
+		</patternset>
+			
+		<pathconvert property="javadoc.classpath">
+			<path>				
+				<fileset dir="${safeBaseLocation}">
+					<patternset refid="platform.classpath.pattern"/>
+		    	</fileset>
+			</path>
+		</pathconvert>
+		<echo level="info" message="Done computing classpath."/>
+		<echo level="info" message="Bootclasspath is: ${bootclasspath}"/>
+		<echo level="info" message="Classpath is: ${javadoc.classpath}"/>
+	</target>
+
+	<target name="all" depends="init" unless="index.present">
+		<antcall target="convertSchemaToHtml" />
+		<antcall target="generateJavadoc" />
+		<antcall target="build.index" />
+	</target>
+
+	<target name="build.index" description="Builds search index for the plug-in: org.eclipse.dstore.doc.isv" if="eclipse.running">
+		<help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}" />
+	</target>
+
+	<target name="convertSchemaToHtml" if="eclipse.running">
+		<property name="dest" value="reference/extension-points" />
+		<record name="${basedir}/temp.convert.txt" action="start" />
+		<!-- pde.convertSchemaToHTML manifest="../org.eclipse.dstore.core/plugin.xml" destination="${dest}" / -->
+		<record name="${basedir}/temp.convert.txt" action="stop" />
+	</target>
+
+	<target name="getJavadocPath">
+		<available file="${java.home}/../bin/javadoc.exe" property="javadoc" value="${java.home}/../bin/javadoc.exe" />
+		<available file="${java.home}/../bin/javadoc" property="javadoc" value="${java.home}/../bin/javadoc" />
+		<available file="/usr/bin/javadoc" property="javadoc" value="/usr/bin/javadoc" />
+	</target>
+
+	<target name="generateJavadoc" depends="getJavadocPath,computeClasspath" if="javadoc">
+		<property name="optionsFile" value="temp.options.txt" />
+		<copy file="options.txt" tofile="${optionsFile}" overwrite="true" />
+		
+		<condition property="argsListDelimiter" value=":">
+			<os family="unix" />
+		</condition>
+		<condition property="argsListDelimiter" value=";">
+			<os family="windows" />
+		</condition>
+
+		<replaceregexp file="${basedir}/${optionsFile}" flags="g" match="(\r\n?|\n);" replace="${argsListDelimiter}" />
+		<replace file="${basedir}/${optionsFile}" token="@rt@" value="${bootclasspath}${argsListDelimiter}${javadoc.classpath}" />
+		<replace file="${basedir}/${optionsFile}" token="@baseLocation@" value="${safeBaseLocation}" />
+
+		<!--scrub isv plugin directories of any preexisting api doc content-->
+		<delete dir="reference/api" />
+		<mkdir dir="reference/api" />
+
+		<echo message="sep = ${argsListDelimiter}"/>
+		<echo message="javadoc = ${javadoc}"/>
+		<exec dir="." executable="${javadoc}" output="temp.bin.log">
+			<arg line="@${basedir}/${optionsFile} -J-Xmx1000M" />
+		</exec>
+	</target>
+
+</project>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/options.txt b/rse/doc/org.eclipse.dstore.doc.isv/options.txt
index 6381ee059bb..10a15d4846b 100755
--- a/rse/doc/org.eclipse.dstore.doc.isv/options.txt
+++ b/rse/doc/org.eclipse.dstore.doc.isv/options.txt
@@ -1,21 +1,22 @@
--charset "iso-8859-1"
--sourcepath "../org.eclipse.dstore.core/src@sep@../org.eclipse.dstore.extra/src"
--d reference/api
--classpath @rt@
--breakiterator
--use
--splitIndex
--windowtitle "Remote System Explorer DataStore API Specification"
--doctitle "Remote System Explorer DataStore API Specification"
--header "<b>Remote System Explorer DataStore</b><br>Release 1.0"
--bottom '<font size="-1"><p><a href="{@docRoot}/../misc/api-usage-rules.html">Guidelines for using DataStore APIs</a>.</p></font>'
--link http://java.sun.com/j2se/1.4.2/docs/api
--linkoffline ../org.eclipse.rse.doc.isv/reference/api ..
-
-org.eclipse.dstore.core.model
-org.eclipse.dstore.core.client
-org.eclipse.dstore.core.server
-org.eclipse.dstore.core.util
-org.eclipse.dstore.core.util.ssl
-org.eclipse.dstore.core.java
+-charset "iso-8859-1"
+-sourcepath "../org.eclipse.dstore.core/src
+;../org.eclipse.dstore.extra/src"
+-d reference/api
+-classpath @rt@
+-breakiterator
+-use
+-splitIndex
+-windowtitle "Remote System Explorer DataStore API Specification"
+-doctitle "Remote System Explorer DataStore API Specification"
+-header "<b>Remote System Explorer DataStore</b><br>Release 1.0"
+-bottom '<font size="-1"><p><a href="{@docRoot}/../misc/api-usage-rules.html">Guidelines for using DataStore APIs</a>.</p></font>'
+-link http://java.sun.com/j2se/1.4.2/docs/api
+-linkoffline ../org.eclipse.rse.doc.isv/reference/api ..
+
+org.eclipse.dstore.core.model
+org.eclipse.dstore.core.client
+org.eclipse.dstore.core.server
+org.eclipse.dstore.core.util
+org.eclipse.dstore.core.util.ssl
+org.eclipse.dstore.core.java
 org.eclipse.dstore.core.miners.miner
\ No newline at end of file
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/reference/.cvsignore b/rse/doc/org.eclipse.dstore.doc.isv/reference/.cvsignore
new file mode 100644
index 00000000000..eedd89b455e
--- /dev/null
+++ b/rse/doc/org.eclipse.dstore.doc.isv/reference/.cvsignore
@@ -0,0 +1 @@
+api