diff --git a/documentation/current/eiffelstudio/eiffelstudio-how-tos/eiffelstudio-starting-project/eiffelstudio-creating-new-project.wiki b/documentation/current/eiffelstudio/eiffelstudio-how-tos/eiffelstudio-starting-project/eiffelstudio-creating-new-project.wiki
index ce2cc0a3..a5fe5852 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-how-tos/eiffelstudio-starting-project/eiffelstudio-creating-new-project.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-how-tos/eiffelstudio-starting-project/eiffelstudio-creating-new-project.wiki
@@ -9,7 +9,7 @@ Under '''Create project''', several options are offered, which depend on the pla
* '''Basic application''' is the most basic new project that can be generated. It only includes the [[EiffelBase Library|base library]] and by default only creates the frame of the project. This is the ideal choice to start a textual (console) application, or to discover Eiffel. Indeed, the project is very light and includes only things that are essential in any project. It is available on all platforms.
* '''.NET application''' has by default all essential components to start a project targeting the Microsoft .NET platform. Of course, it is only available on Windows, and only if you have chosen to install the .NET support during the installation.
* '''Vision2 application''' creates a new project that includes the [[EiffelVision Introduction|Eiffel Vision2 library]] . This is the perfect choice to start a platform-independent graphic application, or even any graphic application, since EiffelVision2 is easier to use than platform-specific libraries. This option is available on all platforms.
-* '''WEL application''' generates a project using the [[WEL Library|Windows Eiffel Library(WEL)]] . This option is recommended for projects needing advanced Windows features, or Windows applications that are time-critical, since the graphic functionality provided by WEL is more efficient than the one provided by Vision2, which on the other hand provides a platform-independent abstract interface. This wizard is only available on Windows.
+* '''WEL application''' generates a project using the [[WEL|Windows Eiffel Library(WEL)]] . This option is recommended for projects needing advanced Windows features, or Windows applications that are time-critical, since the graphic functionality provided by WEL is more efficient than the one provided by Vision2, which on the other hand provides a platform-independent abstract interface. This wizard is only available on Windows.
All those options are also available in the ''' File'''/ '''New project...''' menu. This pops up a dialog with all the options to generate a new project: [[Image:create-a-project]]
{{tip| '''Tip''': If you checked the "Don't show this dialog at startup" checkbox in the start-up dialog but want to get it back, you can use the [[Discardable dialogs|Preferences dialog]] to reset the default value. }}
diff --git a/documentation/current/guide/index.wiki b/documentation/current/guide/index.wiki
index 5b5c1647..ec9f64a7 100644
--- a/documentation/current/guide/index.wiki
+++ b/documentation/current/guide/index.wiki
@@ -9,6 +9,14 @@ These pages are the official documentation pages for the products and technologi
The documentation is organized into virtual books. Each book covers an important aspect of the world of Eiffel.
+* [[Guide]] -- Guide to Eiffel Information
+* [[Why Eiffel?]] -- Why Eiffel?
+* [[Method]] -- The Eiffel Method and Language
+* [[EiffelStudio]] -- The EiffelStudio Interactive Development Environment
+* [[Solutions]] -- Eiffel Solutions, Technologies, and Class Libraries
+* [[Windows]] -- Eiffel with Microsoft Windows
+* [[Community]] -- Community Contributions
+
There are also important sources of information on Eiffel external to these documentation pages.
Sources of information on Eiffel include:
diff --git a/documentation/current/platform-specifics/microsoft-windows/index.wiki b/documentation/current/platform-specifics/microsoft-windows/index.wiki
index babfe555..1cd6c1d6 100644
--- a/documentation/current/platform-specifics/microsoft-windows/index.wiki
+++ b/documentation/current/platform-specifics/microsoft-windows/index.wiki
@@ -4,7 +4,7 @@
[[Property:uuid|b6513eee-a12c-1f9f-4257-b08d2e18cef4]]
== Eiffel with Microsoft Windows ==
- Primary source for Eiffel platform specific support for Microsoft Windows
+Primary source for Eiffel platform specific support for Microsoft Windows
* [[.NET| Eiffel for .NET documentation]]
** [[.NET Installation instructions|Installation instructions]]
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/index.wiki b/documentation/current/platform-specifics/microsoft-windows/wel/index.wiki
index ea4ef3db..a063a530 100644
--- a/documentation/current/platform-specifics/microsoft-windows/wel/index.wiki
+++ b/documentation/current/platform-specifics/microsoft-windows/wel/index.wiki
@@ -1,15 +1,15 @@
-[[Property:title|WEL Library]]
-[[Property:link_title|WEL]]
+[[Property:title|WEL]]
[[Property:weight|-13]]
[[Property:uuid|a8f57de5-a0eb-262e-a825-95a706392640]]
+==WEL (Windows Eiffel Library)==
+
Type: Library
Platform: Windows
-See:
-* [[WEL Interface Content|Content]]
-* [[WEL Samples|Samples]]
-* [[ref:libraries/wel/reference/index|Reference]]
-
+WEL is an encapsulation of the Win32 Application Programming Interface (API), and provides users with a powerful means of creating Win32 Applications.
+==Getting started with WEL==
+If you are new to WEL, then the best place to begin is the [[Tutorial|tutorial]] which is a series of samples demonstrating the development of a simple WEL system.
+Also take a look at [[WEL Common Concepts|WEL common concepts]] for details of some common concepts used in WEL programming.
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-common-concepts/common-message-hooks.wiki b/documentation/current/platform-specifics/microsoft-windows/wel/wel-common-concepts/common-message-hooks.wiki
index c6798dd5..3709fe06 100644
--- a/documentation/current/platform-specifics/microsoft-windows/wel/wel-common-concepts/common-message-hooks.wiki
+++ b/documentation/current/platform-specifics/microsoft-windows/wel/wel-common-concepts/common-message-hooks.wiki
@@ -11,7 +11,7 @@ Each WEL library component implements a set of routines for processing the most
An on_paint message corresponds to the Wm_paint message generated by Windows whenever it needs to re-paint a window, and if you look at the feature, you can see that the arguments are a [[ref:libraries/wel/reference/wel_paint_dc_chart|WEL_PAINT_DC]] and a[[ref:libraries/wel/reference/wel_rect_chart| WEL_RECT]] . which are relevant to this message. By redefining this feature (and others as required), your code will be able to respond appropriately to windows events.
-{{note| '''Note'''. See [[Tutorial Step 2|step2]] in the [[Tutorial|tutorial]] for a simple demonstration involving the re-definition of on_left_button_down. }}
+{{note| '''Note'''. See [[Tutorial Step 2|step2]] in the [[WEL Tutorial|tutorial]] for a simple demonstration involving the re-definition of on_left_button_down. }}
For different messages received by a control, the arguments will differ (sometimes there are none), but those arguments will always be relevant to the message. For example, on_menu_command from [[ref:libraries/wel/reference/wel_composite_window_chart|WEL_COMPOSITE_WINDOW]] has an INTEGER as an argument, the value of which is a unique menu identifier.
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-common-concepts/inheriting-wel-application.wiki b/documentation/current/platform-specifics/microsoft-windows/wel/wel-common-concepts/inheriting-wel-application.wiki
index a47bf018..16cb4bf8 100644
--- a/documentation/current/platform-specifics/microsoft-windows/wel/wel-common-concepts/inheriting-wel-application.wiki
+++ b/documentation/current/platform-specifics/microsoft-windows/wel/wel-common-concepts/inheriting-wel-application.wiki
@@ -3,7 +3,7 @@
[[Property:uuid|e6b092c9-dfb1-7bf1-67fc-647d047b6a01]]
For most WEL applications that you write, you will need to inherit [[ref:libraries/wel/reference/wel_application_chart|WEL_APPLICATION]] .
-{{note| '''Note'''. See [[Tutorial Step 1|step1]] in the [[Tutorial|tutorial]] for a simple demonstration of how to do this }}
+{{note| '''Note'''. See [[Tutorial Step 1|step1]] in the [[WEL Tutorial|tutorial]] for a simple demonstration of how to do this }}
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-common-concepts/redefining-main-window.wiki b/documentation/current/platform-specifics/microsoft-windows/wel/wel-common-concepts/redefining-main-window.wiki
index c1436752..758a9373 100644
--- a/documentation/current/platform-specifics/microsoft-windows/wel/wel-common-concepts/redefining-main-window.wiki
+++ b/documentation/current/platform-specifics/microsoft-windows/wel/wel-common-concepts/redefining-main-window.wiki
@@ -3,7 +3,7 @@
[[Property:uuid|f7bfd5d0-86ef-5387-ba79-5461a516bcf6]]
When you inherit [[ref:/libraries/wel/reference/wel_application_chart|WEL_APPLICATION]] , you will need to implement the deferred feature main_window as a once function. This will be the main window of your application, and can be any descendent of [[ref:libraries/wel/reference/wel_composite_window_chart|WEL_COMPOSITE_WINDOW]] .
-{{note| '''Note'''. See [[Tutorial Step 2|step2]] in the [[Tutorial|tutorial]] for a simple demonstration of how to do this. }}
+{{note| '''Note'''. See [[Tutorial Step 2|step2]] in the [[WEL Tutorial|tutorial]] for a simple demonstration of how to do this. }}
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/index.wiki b/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/index.wiki
index d2c69b9e..1b47b0c2 100644
--- a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/index.wiki
+++ b/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/index.wiki
@@ -1,5 +1,4 @@
-[[Property:title|Controls]]
-[[Property:link_title|controls cluster]]
+[[Property:title|controls cluster]]
[[Property:weight|1]]
[[Property:uuid|622aa1e2-75a6-4b2e-ac1a-44f1e7be6a3b]]
==Overview==
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/index.wiki b/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/index.wiki
index 22f56cf0..381f0bf9 100644
--- a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/index.wiki
+++ b/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/index.wiki
@@ -6,9 +6,9 @@ WEL is an encapsulation of the Win32 Application Programming Interface (API), an
==Components==
The WEL library includes the following clusters:
-* [[Wel: Windows|windows]] cluster containing classes representing available windows types
-* [[Controls|controls]] cluster containing classes representing available controls
-* [[Standard Dialogs|stddlgs]] cluster containing classes representing standard Win32 dialogs
+* [[windows cluster|windows]] cluster containing classes representing available windows types
+* [[controls cluster|controls]] cluster containing classes representing available controls
+* [[stddlgs cluster|stddlgs]] cluster containing classes representing standard Win32 dialogs
* consts cluster which contains constants used by WEL
* gdi cluster which contains classes allowing access to WIN32 Graphics Device Interfaces
* gdistock cluster which contains standard Graphic Device Interfaces used by WEL
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/index.wiki b/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/index.wiki
index 894d74f1..3c4852cd 100644
--- a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/index.wiki
+++ b/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/index.wiki
@@ -2,14 +2,6 @@
[[Property:link_title|stddlgs cluster]]
[[Property:weight|2]]
[[Property:uuid|0af8dcbf-ed31-51d7-885c-c677090f0633]]
-This cluster contains different standard dialogs provided by WEL as listed below:
-* [[WEL_CHOOSE_COLOR_DIALOG|WEL_CHOOSE_COLOR_DIALOG]]
-* [[WEL_CHOOSE_FOLDER_DIALOG|WEL_CHOOSE_FOLDER_DIALOG]]
-* [[WEL_CHOOSE_FONT_DIALOG|WEL_CHOOSE_FONT_DIALOG]]
-* [[WEL_OPEN_FILE_DIALOG|WEL_OPEN_FILE_DIALOG]]
-* [[WEL_PRINT_DIALOG|WEL_PRINT_DIALOG]]
-* [[WEL_SAVE_FILE_DIALOG|WEL_SAVE_FILE_DIALOG]]
-
-
+This cluster contains different standard dialogs provided by WEL.
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/windows-cluster.wiki b/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/windows-cluster.wiki
index 54a4e1c9..86318037 100644
--- a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/windows-cluster.wiki
+++ b/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/windows-cluster.wiki
@@ -1,5 +1,4 @@
-[[Property:title|Wel: Windows]]
-[[Property:link_title|windows cluster]]
+[[Property:title|windows cluster]]
[[Property:weight|-1]]
[[Property:uuid|dc1af280-2e91-713c-751f-e88ce87197cf]]
This cluster contains the different types of windows available to a [[ref:/libraries/wel/reference/wel_application_chart|WEL_APPLICATION]] .
@@ -15,7 +14,7 @@ The following effective window types are available:
* [[ref:/libraries/wel/reference/wel_frame_window_chart|WEL_FRAME_WINDOW]]
* [[ref:/libraries/wel/reference/wel_control_window_chart|WEL_CONTROL_WINDOW]]
-{{note| '''Note:''' A WEL application must contain at least one window. See the WEL [[Tutorial|Tutorial]] for details of how to set up your first window within a [[ref:/libraries/wel/reference/wel_application_chart|WEL_APPLICATION]] . }}
+{{note| '''Note:''' A WEL application must contain at least one window. See the [[WEL Tutorial]] for details of how to set up your first window within a [[ref:/libraries/wel/reference/wel_application_chart|WEL_APPLICATION]] . }}
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/controls-sample.wiki b/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/controls-sample.wiki
index c0d78ac2..8dc84c45 100644
--- a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/controls-sample.wiki
+++ b/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/controls-sample.wiki
@@ -1,5 +1,4 @@
-[[Property:title|Wel Sample: Controls]]
-[[Property:link_title|Controls Sample]]
+[[Property:title|Controls Sample]]
[[Property:weight|-11]]
[[Property:uuid|7f9a091f-61af-9ea2-18c3-469573ba14f3]]
[[Image:controls|controls]]
@@ -17,7 +16,7 @@ To compile the example:
==Running==
-After launching the program, an empty window will be displayed. There are numerous menus in the window, each relating to a different type of [[Controls|control]] . Each menu has "Create" and "Delete" along with a other options specific to each control. By selecting these menu options, controls will be created and modified as demonstrated in the above illustration.
+After launching the program, an empty window will be displayed. There are numerous menus in the window, each relating to a different type of [[Controls cluster|control]]. Each menu has "Create" and "Delete" along with a other options specific to each control. By selecting these menu options, controls will be created and modified as demonstrated in the above illustration.
==Under the Hood==
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/index.wiki b/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/index.wiki
index 369325c7..3ad498d9 100644
--- a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/index.wiki
+++ b/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/index.wiki
@@ -1,46 +1,8 @@
[[Property:title|WEL Samples]]
[[Property:weight|4]]
[[Property:uuid|f6df9869-52b7-0d10-dd0c-52796f631998]]
-There are a large number of samples provided with the WEL library, each designed to demonstrate different functionality. The samples available are listed below:
-* [[Tutorial|Tutorial]]
-{{note| '''Note''': If you are new to WEL programming, this is the recommended place to start. }}
-** [[Tutorial Step 1|Step1]]
-** [[Tutorial Step 2|Step2]]
-** [[Tutorial Step 3|Step3]]
-** [[Tutorial Step 4|Step4]]
-** [[Tutorial Step 5|Step5]]
-** [[Tutorial Step 6|Step6]]
-** [[Tutorial Step 7|Step7]]
-** [[Tutorial Step 8|Step8]]
-
-* [[Hello World|Hello]]
-* [[Bmpview|Bmpview]]
-* [[Brushes|Brushes]]
-* [[Common Controls|Comctrls]]
-* [[Commands|Commands]]
-* [[Wel Sample: Controls|Controls]]
-* [[Ctlcolor|Ctlcolor]]
-* [[Cursors|Cursors]]
-* [[Disk Space|Diskspace]]
-* [[Fontenum|Fontenum]]
-* [[Fun|Fun]]
-* [[Header Control|Header_ctrl]]
-* [[List View|List_view]]
-* [[Magnify|Magnify]]
-* [[MDI (Multiple Document Interface)|Mdi]]
-* [[Wel Sample: Menus|Menus]]
-* [[Minimal|Minimal]]
-* [[Pizza|Pizza]]
-* [[Printer|Printer]]
-* [[Rich Edit|Richedit]]
-* [[Split Area|Split Area]]
-* [[Wel Sample: Standard Dialogs|Stddlgs]]
-* [[Timer|Timer]]
-* [[Wel Sample: Tree View|Tree_view]]
-* [[Wel Sample: Windows|Windows]]
-* [[Xcell|Xcell]]
-* [[XY Co-ordinates|Xy]]
-
+There are a large number of samples provided with the WEL library, each designed to demonstrate different functionality. The samples available are listed below.
+{{note| '''Note''': If you are new to WEL programming, the recommended place to start is the set of samples called the [[WEL Tutorial]]. }}
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/standard-dialogs-sample.wiki b/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/standard-dialogs-sample.wiki
index b996977c..58098bd6 100644
--- a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/standard-dialogs-sample.wiki
+++ b/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/standard-dialogs-sample.wiki
@@ -1,5 +1,4 @@
-[[Property:title|Wel Sample: Standard Dialogs]]
-[[Property:link_title|Standard Dialogs Sample]]
+[[Property:title|Standard Dialogs Sample]]
[[Property:weight|6]]
[[Property:uuid|0d706af1-8c76-64b3-5907-0d9effb2bb8f]]
[[Image:stddlgs|stddlgs]]
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/tree-view-sample.wiki b/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/tree-view-sample.wiki
index 0a31fcce..352ae725 100644
--- a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/tree-view-sample.wiki
+++ b/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/tree-view-sample.wiki
@@ -1,5 +1,4 @@
-[[Property:title|Wel Sample: Tree View]]
-[[Property:link_title|Tree View Sample]]
+[[Property:title|Tree View Sample]]
[[Property:weight|8]]
[[Property:uuid|31c64f11-3aa4-cfff-b9f3-09027acfc143]]
[[Image:tree-view--tree-view|tree_view]]
diff --git a/documentation/current/solutions/basic-computing/eiffelbase/index.wiki b/documentation/current/solutions/basic-computing/eiffelbase/index.wiki
index 2f83a2dc..8445d210 100644
--- a/documentation/current/solutions/basic-computing/eiffelbase/index.wiki
+++ b/documentation/current/solutions/basic-computing/eiffelbase/index.wiki
@@ -1,13 +1,11 @@
[[Property:title|EiffelBase]]
[[Property:weight|1]]
[[Property:uuid|0153c1de-bf88-fa0d-52a5-e50ffcc4e8c8]]
- Type: Library
- Platform: Any
- Availability: Open Source, IFFEL License.
+==The EiffelBase Library==
-==The EiffelBase Class Library==
+Type: Library
+Platform: Any
+Availability: Open Source, IFFEL License.
The EiffelBase class library, covered by the open-source IFFEL license, is one of the principal contributions of Eiffel: a library of fundamental structures and algorithms covering the basics of computing, and resulting from a "Linnaean" effort at a general-purpose taxonomy of computing structures. EiffelBase is one of the most carefully designed and extensively used libraries in the object-oriented industry.
-
-
diff --git a/documentation/current/solutions/basic-computing/index.wiki b/documentation/current/solutions/basic-computing/index.wiki
index 708cd91b..5218a415 100644
--- a/documentation/current/solutions/basic-computing/index.wiki
+++ b/documentation/current/solutions/basic-computing/index.wiki
@@ -6,5 +6,3 @@
Eiffel solutions for everyday computing needs.
-
-
diff --git a/documentation/current/solutions/concurrent-computing/eiffelthread/eiffelthread-tutorial/compilation-multithreaded-systems.wiki b/documentation/current/solutions/concurrent-computing/eiffelthread/eiffelthread-tutorial/compilation-multithreaded-systems.wiki
index 7dbace23..48ba2780 100644
--- a/documentation/current/solutions/concurrent-computing/eiffelthread/eiffelthread-tutorial/compilation-multithreaded-systems.wiki
+++ b/documentation/current/solutions/concurrent-computing/eiffelthread/eiffelthread-tutorial/compilation-multithreaded-systems.wiki
@@ -5,7 +5,7 @@
* Set the option multithreaded in the project settings under Advanced.
* Do not use a non-multi-threaded precompiled library. The corresponding multi-threaded libraries of base, WEL and Vision2 should be located in $ISE_EIFFEL/precomp/spec/$PLATFORM/ with the mt prefix.
* You may want to include the thread library (located at "$ISE_EIFFEL/library/thread") to your project. This setting can be done in [[Group Options| the groups section of the project settings window]] .
-* When using external C libraries, be sure that they are MT-safe: on the platforms where the Eiffel Threads are available. For example [[WEL Library|Wel]] and [[EiffelNet Library|Net]] multi-threaded libraries can be recognized by the `mt' prefix.
+* When using external C libraries, be sure that they are MT-safe: on the platforms where the Eiffel Threads are available. For example [[WEL]] and [[EiffelNet]] multi-threaded libraries can be recognized by the `mt' prefix.
==Compilation==
@@ -18,7 +18,7 @@ The C files that you link with a multi-threaded Eiffel application must be compi
* If you are using CECIL in multi-threaded mode, you must compile your C files with the same defined symbols as those used to compile the generated C-code in multi-threaded mode.
* Threaded code can safely refer to unsafe code ONLY from the initial thread.
-{{note|'''Note''': if you use the libraries Net and MEL in multi-threaded mode, you should use libmtnet. a and libmtmel. a. When using MEL, you have to be aware that Motif 1. 2 is not threaded-safe (i.e not reentrant). Motif 2. x is threaded-safe.}}
+{{note|If you use the libraries EiffelNet and MEL in multi-threaded mode, you should use libmtnet. a and libmtmel. a. When using MEL, you have to be aware that Motif 1. 2 is not threaded-safe (i.e not reentrant). Motif 2. x is threaded-safe.}}
==Thread Safe Eiffel libraries==
diff --git a/documentation/current/solutions/concurrent-computing/eiffelthread/index.wiki b/documentation/current/solutions/concurrent-computing/eiffelthread/index.wiki
index 9c33d5fa..e1edd94d 100644
--- a/documentation/current/solutions/concurrent-computing/eiffelthread/index.wiki
+++ b/documentation/current/solutions/concurrent-computing/eiffelthread/index.wiki
@@ -1,6 +1,10 @@
[[Property:title|EiffelThread]]
[[Property:weight|0]]
[[Property:uuid|d1e4c873-3e04-f49a-f6d2-6b9845f1e109]]
-The EiffelThread library includes the main components needed to build multithreaded systems.
+==EiffelThread Library==
+Type: Library
+Platform: Any
+
+The EiffelThread library includes the main components needed to build multithreaded systems.
diff --git a/documentation/current/solutions/database-access/eiffelstore/index.wiki b/documentation/current/solutions/database-access/eiffelstore/index.wiki
index ed7f1fd4..968f12ac 100644
--- a/documentation/current/solutions/database-access/eiffelstore/index.wiki
+++ b/documentation/current/solutions/database-access/eiffelstore/index.wiki
@@ -1,9 +1,10 @@
[[Property:title|EiffelStore]]
[[Property:weight|1]]
[[Property:uuid|f43ab3e6-4551-632a-384b-4964d1436730]]
+==EiffelStore Library==
+
Type: Library
Platform: Any
EiffelStore provides facilities for interfacing an application with various DataBase Management Systems (DBMS). It contains a powerful set of classes grouped into layers representing different levels of abstraction.
-
diff --git a/documentation/current/solutions/dates-and-times/eiffeltime/index.wiki b/documentation/current/solutions/dates-and-times/eiffeltime/index.wiki
index 21ef76c3..38241800 100644
--- a/documentation/current/solutions/dates-and-times/eiffeltime/index.wiki
+++ b/documentation/current/solutions/dates-and-times/eiffeltime/index.wiki
@@ -1,5 +1,8 @@
[[Property:title|EiffelTime]]
[[Property:weight|9]]
[[Property:uuid|3d96626f-11f3-67a2-dec6-69f7faf4a8d6]]
-==EiffelTime Class Library==
+==EiffelTime Library==
+
+Type: Library
+Platform: Any
diff --git a/documentation/current/solutions/dates-and-times/index.wiki b/documentation/current/solutions/dates-and-times/index.wiki
index 4963cfd0..a9fb3826 100644
--- a/documentation/current/solutions/dates-and-times/index.wiki
+++ b/documentation/current/solutions/dates-and-times/index.wiki
@@ -2,8 +2,7 @@
[[Property:link_title|Dates and times]]
[[Property:weight|-13]]
[[Property:uuid|082fd8e1-b531-6cf1-3409-9cd9bc6483ad]]
-== Date and time manipulation ==
-* [[EiffelTime Library|EiffelTime]]
-** [[EiffelTime|EiffelTime tutorial]]
-** EiffelTime class reference
+== Date and time manipulation solutions==
+
+
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 c4b16b37..2a8742f8 100644
--- a/documentation/current/solutions/gui-building/eiffelvision-2/eiffelvision-introduction.wiki
+++ b/documentation/current/solutions/gui-building/eiffelvision-2/eiffelvision-introduction.wiki
@@ -20,7 +20,7 @@ The two tiers play complementary roles:
* At the top level, EiffelVision provides fully portable graphics.
* At the lower level, platform-specific libraries cover the graphical mechanisms of graphics platforms such as Windows and GTK.
-The lower tier serves for the implementation of the upper tier, but can also be used independently. For example [[WEL Introduction|WEL]] has had a resounding success with Windows developers who need an advanced mechanism for building Windows-specific graphical applications, taking advantage of every facility of the Windows API (Application Programming Interface) and of the Eiffel approach, but do not need portability on the client side. The GEL library is a '''wrapper''' library, automatically generated from the entire GTK API by a tool named '''The Gote Converter'''.
+The lower tier serves for the implementation of the upper tier, but can also be used independently. For example [[WEL]] has had a resounding success with Windows developers who need an advanced mechanism for building Windows-specific graphical applications, taking advantage of every facility of the Windows API (Application Programming Interface) and of the Eiffel approach, but do not need portability on the client side. The GEL library is a '''wrapper''' library, automatically generated from the entire GTK API by a tool named '''The Gote Converter'''.
==Features==
diff --git a/documentation/current/solutions/gui-building/eiffelvision-2/index.wiki b/documentation/current/solutions/gui-building/eiffelvision-2/index.wiki
index 26ccd840..2fa90669 100644
--- a/documentation/current/solutions/gui-building/eiffelvision-2/index.wiki
+++ b/documentation/current/solutions/gui-building/eiffelvision-2/index.wiki
@@ -3,5 +3,7 @@
[[Property:uuid|c72b1a5c-9cbf-f8c8-a4c2-619e392799b0]]
==EiffelVision 2 Library==
+Type: Library
+Platform: Any
diff --git a/documentation/current/solutions/networking/eiffelnet/index.wiki b/documentation/current/solutions/networking/eiffelnet/index.wiki
index f0b730fa..84d8357d 100644
--- a/documentation/current/solutions/networking/eiffelnet/index.wiki
+++ b/documentation/current/solutions/networking/eiffelnet/index.wiki
@@ -1,7 +1,10 @@
[[Property:title|EiffelNet]]
[[Property:weight|4]]
[[Property:uuid|80fbd984-da52-b573-6282-33f499d67ab5]]
-==EiffelNet Class Library==
+==EiffelNet Library==
+
+Type: Library
+Platform: Any
A library providing classes that facilitate network communication through sockets.
diff --git a/documentation/current/solutions/other-languages/eiffel2java/index.wiki b/documentation/current/solutions/other-languages/eiffel2java/index.wiki
index a540d029..0e38347f 100644
--- a/documentation/current/solutions/other-languages/eiffel2java/index.wiki
+++ b/documentation/current/solutions/other-languages/eiffel2java/index.wiki
@@ -1,10 +1,8 @@
[[Property:title|Eiffel2Java]]
[[Property:weight|4]]
[[Property:uuid|009ed581-1141-7db0-74bb-a9cbca15b904]]
+==The Eiffel2Java Library==
+
Type: Library
-Platform: Any
-
-==The Eiffel2Java Class Library==
-
-
+Platform: Any
diff --git a/documentation/current/solutions/web-technology/eiffelweb/index.wiki b/documentation/current/solutions/web-technology/eiffelweb/index.wiki
index f27a3ab1..64df62e7 100644
--- a/documentation/current/solutions/web-technology/eiffelweb/index.wiki
+++ b/documentation/current/solutions/web-technology/eiffelweb/index.wiki
@@ -1,7 +1,7 @@
[[Property:title|EiffelWeb]]
[[Property:weight|1]]
[[Property:uuid|b8a31d00-8ecb-7e32-df14-d92c91019826]]
-==EiffelWeb Class Library==
+==EiffelWeb Library==
Type: Library
Platform: Any