diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/compiler/compiler-history/eiffelstudio-5-compiler-history/index.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/compiler/compiler-history/eiffelstudio-5-compiler-history/index.wiki
new file mode 100644
index 00000000..a6402f47
--- /dev/null
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/compiler/compiler-history/eiffelstudio-5-compiler-history/index.wiki
@@ -0,0 +1,6 @@
+[[Property:title|EiffelStudio 5 compiler history]]
+[[Property:link_title|5.x]]
+[[Property:weight|15]]
+[[Property:uuid|6fc4449c-889f-521d-4f80-69245fbd5f54]]
+
+
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/compiler/compiler-history/eiffelstudio-6-compiler-history/index.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/compiler/compiler-history/eiffelstudio-6-compiler-history/index.wiki
new file mode 100644
index 00000000..5c25de80
--- /dev/null
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/compiler/compiler-history/eiffelstudio-6-compiler-history/index.wiki
@@ -0,0 +1,6 @@
+[[Property:title|EiffelStudio 6 compiler history]]
+[[Property:link_title|6.x]]
+[[Property:weight|14]]
+[[Property:uuid|62e7ba4a-0db5-1e46-0097-73313657a7ca]]
+
+
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-release-notes/eiffelstudio-6-release-notes/index.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-release-notes/eiffelstudio-6-release-notes/index.wiki
new file mode 100644
index 00000000..b84b1aea
--- /dev/null
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-release-notes/eiffelstudio-6-release-notes/index.wiki
@@ -0,0 +1,6 @@
+[[Property:title|EiffelStudio 6 release notes]]
+[[Property:link_title|6.x]]
+[[Property:weight|14]]
+[[Property:uuid|e06af7f1-dab6-85ec-0688-0b48c3f2e88b]]
+
+
diff --git a/documentation/current/solutions/other-languages/eiffel2java/eiffel2java-tutorial.wiki b/documentation/current/solutions/other-languages/eiffel2java/eiffel2java-tutorial.wiki
index 28f10dea..023fd94e 100644
--- a/documentation/current/solutions/other-languages/eiffel2java/eiffel2java-tutorial.wiki
+++ b/documentation/current/solutions/other-languages/eiffel2java/eiffel2java-tutorial.wiki
@@ -12,15 +12,6 @@ The Java interface allows you to call Java routines or attributes from your Eiff
 * The environment variable CLASSPATH should defined (check with the JDK documentation on how to do so) and that it contains the Java classes you want to access.
 * The environment variables should be setup correctly. See $ISE_EIFFEL\library\Eiffel2Java\README.txt for information how to do this.
 
-===Borland users===
-
-On Windows, the JDK includes a set of C libraries which have been compiled for the Microsoft C compiler. Before being able to use the JDK from Eiffel you need to perform the following operation:
-# In $JDK_HOME\lib, rename javai.lib into javai.lib.microsoft
-# From the DOS command prompt and in the directory $JDK_HOME\lib, launch the following command <br/>
-<code lang=text>
-%ISE_EIFFEL%\bcc55\bin\implib javai.lib..\bin\javai.dll</code>
-
-
 ===Limitations===
 * In this version, you can only use one JNI environment.
 * Only one thread can interact with the Java Virtual Machine (JVM).