diff --git a/documentation/current/guide/index.wiki b/documentation/current/guide/index.wiki
index 5b19bb85..1102b44b 100644
--- a/documentation/current/guide/index.wiki
+++ b/documentation/current/guide/index.wiki
@@ -99,7 +99,7 @@ A few times a year, we send out an email newsletter containing announcements of
===Object-oriented Software Construction, 2nd Edition===
-There is no better place to gain an in-depth understanding of the Eiffel software development method than Object-oriented Software Construction, 2nd Edition, by Bertrand Meyer, published by Prentice Hall. It is the world's most complete guide to building great object-oriented software.
+There is no better place to gain an in-depth understanding of the Eiffel software development method than [http://www.eiffel.com/doc/oosc/ Object-oriented Software Construction, 2nd Edition], by Bertrand Meyer, published by Prentice Hall. It is the world's most complete guide to building great object-oriented software.
----
diff --git a/documentation/current/method/index.wiki b/documentation/current/method/index.wiki
index 4f44f4ed..846a4e09 100644
--- a/documentation/current/method/index.wiki
+++ b/documentation/current/method/index.wiki
@@ -6,7 +6,7 @@
Here you can learn about the Eiffel development method and Eiffel the language.
-At the heart of the Eiffel Development Framework is the Eiffel method. Everything else, the language, the tools, the libraries exist because of the method.
+At the heart of the Eiffel Development Framework is the Eiffel method. Everything else -- the language, the tools, the libraries -- exists because of the method.
In order for us to communicate effectively about the activities of the method we must have some way to record the products of those activities. That is what Eiffel the language does for us ... with the added benefit that, ultimately, we implement whole running software systems in the language.
diff --git a/documentation/current/solutions/concurrent-computing/eiffelthread/eiffelthread-class-reference.wiki b/documentation/current/solutions/concurrent-computing/eiffelthread/eiffelthread-class-reference.wiki
new file mode 100644
index 00000000..28b1905a
--- /dev/null
+++ b/documentation/current/solutions/concurrent-computing/eiffelthread/eiffelthread-class-reference.wiki
@@ -0,0 +1,8 @@
+[[Property:title|EiffelThread Class Reference]]
+[[Property:weight|0]]
+[[Property:uuid|e1d3e50a-e67a-a375-7165-8a7856b7b969]]
+
+==View the [[ref:libraries/thread/reference/index|EiffelThread Class Reference]]==
+
+
+
diff --git a/documentation/current/solutions/concurrent-computing/eiffelthread/eiffelthread-tutorial/index.wiki b/documentation/current/solutions/concurrent-computing/eiffelthread/eiffelthread-tutorial/index.wiki
new file mode 100644
index 00000000..438b8629
--- /dev/null
+++ b/documentation/current/solutions/concurrent-computing/eiffelthread/eiffelthread-tutorial/index.wiki
@@ -0,0 +1,5 @@
+[[Property:title|EiffelThread Tutorial]]
+[[Property:weight|-1]]
+[[Property:uuid|c1965bc3-23cf-25d6-02c1-717b7035d41c]]
+== EiffelThread Library Tutorial==
+
diff --git a/documentation/current/solutions/concurrent-computing/eiffelthread/eiffelthread-tutorial/thread-library-overview.wiki b/documentation/current/solutions/concurrent-computing/eiffelthread/eiffelthread-tutorial/thread-library-overview.wiki
index 273a0551..87c384f3 100644
--- a/documentation/current/solutions/concurrent-computing/eiffelthread/eiffelthread-tutorial/thread-library-overview.wiki
+++ b/documentation/current/solutions/concurrent-computing/eiffelthread/eiffelthread-tutorial/thread-library-overview.wiki
@@ -1,7 +1,7 @@
[[Property:title|Thread library overview]]
[[Property:weight|1]]
[[Property:uuid|2bdeeb91-1917-f443-ebfc-4f877107edd7]]
-This is only a quick overview of the [[EiffelThread Library|Thread library]] . The reference of this library should give all its content.
+This is only a quick overview of the EiffelThread Library. The class reference for this library should give its complete interface.
==Creating and launching threads: the class THREAD (deferred)==
diff --git a/documentation/current/solutions/concurrent-computing/eiffelthread/index.wiki b/documentation/current/solutions/concurrent-computing/eiffelthread/index.wiki
index 86ba4456..9c33d5fa 100644
--- a/documentation/current/solutions/concurrent-computing/eiffelthread/index.wiki
+++ b/documentation/current/solutions/concurrent-computing/eiffelthread/index.wiki
@@ -2,12 +2,5 @@
[[Property:weight|0]]
[[Property:uuid|d1e4c873-3e04-f49a-f6d2-6b9845f1e109]]
The EiffelThread library includes the main components needed to build multithreaded systems.
-See:
-* [[EiffelThread: Introduction|Introduction]]
-* [[Thread library overview|Library description]]
-* [[Multithread FAQ|FAQ]]
-
-
-
diff --git a/documentation/current/solutions/concurrent-computing/index.wiki b/documentation/current/solutions/concurrent-computing/index.wiki
index da78f160..4047e180 100644
--- a/documentation/current/solutions/concurrent-computing/index.wiki
+++ b/documentation/current/solutions/concurrent-computing/index.wiki
@@ -1,8 +1,8 @@
-[[Property:title|Multi-threading]]
+[[Property:title|Multi-threading Solutions]]
[[Property:link_title|Concurrent computing]]
[[Property:weight|-10]]
[[Property:uuid|7c7a399a-076f-fd13-9b5f-f110c212e2e8]]
-== Multi-threading ==
-* [[Threads|Threads tutorial]]
-* EiffelThread class reference
+== Multi-threading Solutions ==
+
+
diff --git a/documentation/current/solutions/dates-and-times/eiffeltime/eiffeltime-class-reference.wiki b/documentation/current/solutions/dates-and-times/eiffeltime/eiffeltime-class-reference.wiki
new file mode 100644
index 00000000..2f0cf641
--- /dev/null
+++ b/documentation/current/solutions/dates-and-times/eiffeltime/eiffeltime-class-reference.wiki
@@ -0,0 +1,5 @@
+[[Property:title|EiffelTime Class Reference]]
+[[Property:weight|2]]
+[[Property:uuid|ab08dc65-7d32-f681-d7de-e391081736eb]]
+==View the [[ref:libraries/time/reference/index|EiffelTime Class Reference]]==
+
diff --git a/documentation/current/solutions/dates-and-times/eiffeltime/eiffeltime-tutorial/index.wiki b/documentation/current/solutions/dates-and-times/eiffeltime/eiffeltime-tutorial/index.wiki
index bcd3ac23..7cc71416 100644
--- a/documentation/current/solutions/dates-and-times/eiffeltime/eiffeltime-tutorial/index.wiki
+++ b/documentation/current/solutions/dates-and-times/eiffeltime/eiffeltime-tutorial/index.wiki
@@ -1,5 +1,4 @@
-[[Property:title|EiffelTime]]
-[[Property:link_title|EiffelTime Tutorial]]
+[[Property:title|EiffelTime Tutorial]]
[[Property:weight|0]]
[[Property:uuid|2c1bfedd-d515-cd6b-bd22-b06326fc98d8]]
The library EiffelTime is built on three notions of time. The absolute notion (for example, what time is it? 3:45 p.m.) is used for events. It may be useful also to deal with an interval between two events (the meeting is between 3:45 p.m. and 6:00 p.m.). Finally EiffelTime has the notion of duration, which is the length of an interval (the meeting will take 2:15). The notion of absolute is linked with duration by the use of an origin.
diff --git a/documentation/current/solutions/dates-and-times/eiffeltime/index.wiki b/documentation/current/solutions/dates-and-times/eiffeltime/index.wiki
index 9b9f0a4e..21ef76c3 100644
--- a/documentation/current/solutions/dates-and-times/eiffeltime/index.wiki
+++ b/documentation/current/solutions/dates-and-times/eiffeltime/index.wiki
@@ -1,16 +1,5 @@
-[[Property:title|EiffelTime Library]]
-[[Property:link_title|EiffelTime]]
+[[Property:title|EiffelTime]]
[[Property:weight|9]]
[[Property:uuid|3d96626f-11f3-67a2-dec6-69f7faf4a8d6]]
-Type: Library
-Platform: Any
-
-
-See:
-* [[EiffelTime|Content]]
-* [[ref:libraries/time/reference/index|Reference]]
-
-
-
-
+==EiffelTime Class Library==
diff --git a/documentation/current/solutions/gui-building/eiffelbuild/index.wiki b/documentation/current/solutions/gui-building/eiffelbuild/index.wiki
index d4ba11a2..467effd6 100644
--- a/documentation/current/solutions/gui-building/eiffelbuild/index.wiki
+++ b/documentation/current/solutions/gui-building/eiffelbuild/index.wiki
@@ -1,17 +1,5 @@
[[Property:title|EiffelBuild]]
[[Property:weight|0]]
[[Property:uuid|2af28db0-bc8f-daa6-daf2-18b08a11b606]]
-Type: Tool
-Platform: Any
-Version: 5.4
-Availability: Student and Enterprise versions.
-
-See:
-* [[EiffelBuild Introduction|Introduction]]
-* [[EiffelBuild How To's|How To's]]
-* [[EiffelBuild Reference|Reference]]
-* [[EiffelBuild Version History|Version History]]
-
-
-
+EiffelBuild is the high-level interface builder by Eiffel Software which allows you to develop graphical user interface (GUI) applications simply and quickly.
diff --git a/documentation/current/solutions/gui-building/eiffelvision-2/eiffelvision-2-class-reference.wiki b/documentation/current/solutions/gui-building/eiffelvision-2/eiffelvision-2-class-reference.wiki
new file mode 100644
index 00000000..f8195afb
--- /dev/null
+++ b/documentation/current/solutions/gui-building/eiffelvision-2/eiffelvision-2-class-reference.wiki
@@ -0,0 +1,5 @@
+[[Property:title|EiffelVision 2 Class Reference]]
+[[Property:weight|2]]
+[[Property:uuid|bb50444f-5fd1-9136-a224-0ce37d3bd856]]
+==View the [[ref:libraries/vision2/reference/index|EiffelVision 2 Class Reference]] ==
+
diff --git a/documentation/current/solutions/gui-building/eiffelvision-2/eiffelvision-introduction.wiki b/documentation/current/solutions/gui-building/eiffelvision-2/eiffelvision-introduction.wiki
index 1d11a47b..c4b16b37 100644
--- a/documentation/current/solutions/gui-building/eiffelvision-2/eiffelvision-introduction.wiki
+++ b/documentation/current/solutions/gui-building/eiffelvision-2/eiffelvision-introduction.wiki
@@ -4,9 +4,7 @@
The EiffelVision library offers an object-oriented framework for graphical user interface (GUI) development. Using EiffelVision, developers can access all necessary GUI components, called [[Widgets|widgets]] (buttons, windows, list views) as well as truly graphical elements such as points, lines, arcs, polygons and the like -- to develop a modern, functional and good-looking graphical interactive application.
EiffelVision has played a major role at Eiffel Software and provided numerous Eiffel projects with a powerful, portable graphics development platform. EiffelStudio is totally reliant on EiffelVision for its graphical elements and overall interaction with the user.
-* [[EiffelVision Interface Content|Content]]
-* [[EiffelVision 2 Samples|Samples]]
-* [[ref:libraries/vision2/reference/index|Reference]]
+
==Scope==
@@ -29,7 +27,7 @@ The lower tier serves for the implementation of the upper tier, but can also be
As stated before, the library has undergone some drastic changes since the previous release. Names have been changed to improve consistency. Contracts are added wherever possible. Following is a summary of the other re-engineered aspects of the library:
* Taking full advantage of the '''agent''' mechanism of Eiffel, [[Events|events]] are now triggered through '''action sequences''' (lists of actions) that will be executed in order. This system does not require separate classes to be written for each event, however the command pattern can still be used if desired.
* The [[EiffelVision Pick and Drop|pick-and-drop]] mechanism now relies on the Eiffel type system. A '''stone''' (some transportable object) is now any Eiffel class and can always be dropped on a widget that accepts the type (or a more general type) of that stone.
-* [[Containers|containers]] ( [[Widgets|widgets]] that contain other [[Widgets|widgets]] ) are now derived from [[EiffelBase Introduction|EiffelBase]] classes. For example you can now insert [[Widgets|widgets]] in any position and iterate over them.
+* [[Containers|containers]] ( [[Widgets|widgets]] that contain other [[Widgets|widgets]] ) are now derived from [[EiffelBase]] classes. For example you can now insert [[Widgets|widgets]] in any position and iterate over them.
==Design==
@@ -37,7 +35,7 @@ EiffelVision provides programmers with high-level classes, that provide all mech
The abstract design has been derived from an analysis of user interfaces. Therefore we have classes with names like MENU, WINDOW, BUTTON, LINE or POLYGON. The features of these classes are simple, clearly defined properties or commands, like the feature `minimize' (a command) on WINDOW or `text' (a property of type STRING) on BUTTON.
-{{note| '''Note''': all class names in EiffelVision are pre-pended with EV_ to avoid name clashes with existing classes. BUTTON hence becomes EV_BUTTON, etc. }}
+{{note| All class names in EiffelVision are pre-pended with EV_ to avoid name clashes with existing classes. BUTTON hence becomes EV_BUTTON, etc. }}
==Properties==
diff --git a/documentation/current/solutions/gui-building/eiffelvision-2/eiffelvision-library-reference-manual/index.wiki b/documentation/current/solutions/gui-building/eiffelvision-2/eiffelvision-library-reference-manual/index.wiki
index 9aac2431..a13f4317 100644
--- a/documentation/current/solutions/gui-building/eiffelvision-2/eiffelvision-library-reference-manual/index.wiki
+++ b/documentation/current/solutions/gui-building/eiffelvision-2/eiffelvision-library-reference-manual/index.wiki
@@ -1,5 +1,4 @@
-[[Property:title|EiffelVision Interface Content]]
-[[Property:link_title|EiffelVision Library Reference Manual]]
+[[Property:title|EiffelVision Library Reference Manual]]
[[Property:weight|1]]
[[Property:uuid|b343b38b-c8b2-4247-072d-ecc1bc3e387a]]
EiffelVision 2 is a platform independent Graphical User Interface (GUI) library that allows easy, simultaneous development of Windowed applications for both Windows & Unix based platforms. Heavily relying on EiffelBase library, EiffelVision 2 has been designed primarily with ease of use in mind. By reusing EiffelBase structures, existing, as well as new Eiffel users will find EiffelVision to be surprising intuitive and easy to use. In no time, users will be producing good-looking Windowed application skeletons, of which will run on a multitude of platforms with no manipulation of code.
diff --git a/documentation/current/solutions/gui-building/eiffelvision-2/index.wiki b/documentation/current/solutions/gui-building/eiffelvision-2/index.wiki
index da403b8f..26ccd840 100644
--- a/documentation/current/solutions/gui-building/eiffelvision-2/index.wiki
+++ b/documentation/current/solutions/gui-building/eiffelvision-2/index.wiki
@@ -1,16 +1,7 @@
[[Property:title|EiffelVision 2]]
[[Property:weight|10]]
[[Property:uuid|c72b1a5c-9cbf-f8c8-a4c2-619e392799b0]]
-Type: Library
-Platform: Any
-
-See:
-* [[EiffelVision Introduction|Introduction]]
-* [[EiffelVision Interface Content|Content]]
-* [[EiffelVision 2 Samples|Samples]]
-* [[ref:libraries/vision2/reference/index|Reference]]
-* [[Revisions and Bug Fixes|Release notes]]
-
+==EiffelVision 2 Library==
diff --git a/documentation/current/solutions/gui-building/index.wiki b/documentation/current/solutions/gui-building/index.wiki
index f505ea82..30b7c2fd 100644
--- a/documentation/current/solutions/gui-building/index.wiki
+++ b/documentation/current/solutions/gui-building/index.wiki
@@ -3,13 +3,6 @@
[[Property:weight|-14]]
[[Property:uuid|df3cec75-5fe4-7b6b-c5f3-f07932857e70]]
== Graphical user interface solutions ==
-* [[EiffelBuild|EiffelBuild]]
-** [[EiffelBuild How To's|EiffelBuild How To's]]
-** [[EiffelBuild Reference|EiffelBuild Reference]]
-* [[EiffelVision 2 Library|EiffelVision 2]]
-** [[EiffelVision Introduction|EiffelVision 2 introduction]]
-** [[EiffelVision Interface Content|EiffelVision 2 tutorial]]
-** EiffelVision 2 class reference
-** [[EiffelVision 2 Samples|EiffelVision 2 samples]]
+Eiffel provides platform independent graphical user interface facilities. EiffelVision 2 is a library of classes for building graphical user interfaces. EiffelBuild is a tool that automatically puts together the EiffelVision 2 classes that you need to achieve a certain effect.
diff --git a/documentation/current/solutions/networking/eiffelnet/eiffelnet-tutorial/index.wiki b/documentation/current/solutions/networking/eiffelnet/eiffelnet-tutorial/index.wiki
index 68529068..c0a967b9 100644
--- a/documentation/current/solutions/networking/eiffelnet/eiffelnet-tutorial/index.wiki
+++ b/documentation/current/solutions/networking/eiffelnet/eiffelnet-tutorial/index.wiki
@@ -1,5 +1,4 @@
-[[Property:title|EiffelNet]]
-[[Property:link_title|EiffelNet Tutorial]]
+[[Property:title|EiffelNet Tutorial]]
[[Property:weight|0]]
[[Property:uuid|09679e98-4d5c-d2af-439b-00b28c6cfe4b]]
* [[What is EiffelNet|Introduction]]