diff --git a/documentation/current/contribute/documentation.wiki b/documentation/current/contribute/documentation.wiki
index 17a5d1a1..f4542e21 100644
--- a/documentation/current/contribute/documentation.wiki
+++ b/documentation/current/contribute/documentation.wiki
@@ -1,6 +1,7 @@
[[Property:title|How to contribute to documentation]]
[[Property:link_title|To documentation]]
[[Property:weight|1]]
+[[Property:uuid|aab3d23e-ef56-4324-b885-067b14a3009b]]
= Current documentation system =
* The documentation is written using wikitext syntax.
diff --git a/documentation/current/contribute/index.wiki b/documentation/current/contribute/index.wiki
index 2f3cb208..1b3266e0 100644
--- a/documentation/current/contribute/index.wiki
+++ b/documentation/current/contribute/index.wiki
@@ -2,6 +2,7 @@
[[Property:description|How to contribute]]
[[Property:link_title|Contribute]]
[[Property:weight|6]]
+[[Property:uuid|1d95e4f1-6583-4415-b9eb-b2a3606b18c7]]
= How to contribute to Eiffel ? =
diff --git a/documentation/current/eiffel/Examples/example-sleep.wiki b/documentation/current/eiffel/Examples/example-sleep.wiki
index 676e452a..c3003c3b 100644
--- a/documentation/current/eiffel/Examples/example-sleep.wiki
+++ b/documentation/current/eiffel/Examples/example-sleep.wiki
@@ -1,53 +1,54 @@
-[[Property:title|Example: Sleep]]
-[[Property:weight|0]]
-==Description==
-
-Write a program that does the following in this order:
-# Input an amount of time to sleep in whatever units are most natural for your language (milliseconds, seconds, ticks, etc.). This unit should be noted in comments or in a description.
-# Print "Sleeping..."
-# Sleep the main thread for the given amount of time.
-# Print "Awake!"
-# End.
-
-==Notes==
-
-The feature sleep is defined in the library class EXECUTION_ENVIRONMENT. So the demonstration class APPLICATION inherits from EXECUTION_ENVIRONMENT in order to make sleep available.
-
-sleep takes an argument which declares the number of nanoseconds to suspend the thread's execution.
-
-==Source==
-
-Problem description from [http://rosettacode.org/wiki/Sleep Rosetta Code]
-
-==Solution==
-
-
-class
- APPLICATION
-inherit
- EXECUTION_ENVIRONMENT
-create
- make
-feature -- Initialization
- make
- -- Sleep for a given number of nanoseconds.
- do
- print ("Enter a number of nanoseconds: ")
- io.read_integer_64
- print ("Sleeping...%N")
- sleep (io.last_integer_64)
- print ("Awake!%N")
- end
-end
-
-
-
-==Output (sleeping 10 seconds)==
-
-
-Enter a number of nanoseconds: 10000000000
-Sleeping...
-Awake!
-
-
-
+[[Property:title|Example: Sleep]]
+[[Property:weight|0]]
+[[Property:uuid|a846db1c-2096-43a9-bb8b-a233c9e21421]]
+==Description==
+
+Write a program that does the following in this order:
+# Input an amount of time to sleep in whatever units are most natural for your language (milliseconds, seconds, ticks, etc.). This unit should be noted in comments or in a description.
+# Print "Sleeping..."
+# Sleep the main thread for the given amount of time.
+# Print "Awake!"
+# End.
+
+==Notes==
+
+The feature sleep is defined in the library class EXECUTION_ENVIRONMENT. So the demonstration class APPLICATION inherits from EXECUTION_ENVIRONMENT in order to make sleep available.
+
+sleep takes an argument which declares the number of nanoseconds to suspend the thread's execution.
+
+==Source==
+
+Problem description from [http://rosettacode.org/wiki/Sleep Rosetta Code]
+
+==Solution==
+
+
+class
+ APPLICATION
+inherit
+ EXECUTION_ENVIRONMENT
+create
+ make
+feature -- Initialization
+ make
+ -- Sleep for a given number of nanoseconds.
+ do
+ print ("Enter a number of nanoseconds: ")
+ io.read_integer_64
+ print ("Sleeping...%N")
+ sleep (io.last_integer_64)
+ print ("Awake!%N")
+ end
+end
+
+
+
+==Output (sleeping 10 seconds)==
+
+
+Enter a number of nanoseconds: 10000000000
+Sleeping...
+Awake!
+
+
+
diff --git a/documentation/current/eiffel/Language_reference/index.wiki b/documentation/current/eiffel/Language_reference/index.wiki
index 794863e5..a0aabc78 100644
--- a/documentation/current/eiffel/Language_reference/index.wiki
+++ b/documentation/current/eiffel/Language_reference/index.wiki
@@ -1,5 +1,6 @@
[[Property:title|Language reference]]
[[Property:link_title|Language]]
[[Property:weight|3]]
+[[Property:uuid|17412f30-0451-4b2b-bdec-578ca2e619a6]]
diff --git a/documentation/current/eiffel/Overview/index.wiki b/documentation/current/eiffel/Overview/index.wiki
index 2092f1e1..98bdaaab 100644
--- a/documentation/current/eiffel/Overview/index.wiki
+++ b/documentation/current/eiffel/Overview/index.wiki
@@ -1,4 +1,5 @@
[[Property:title|Eiffel Overview]]
[[Property:link_title|Overview]]
[[Property:weight|1]]
+[[Property:uuid|f65e67ed-0990-4638-b8f8-0fc85c28f0d8]]
diff --git a/documentation/current/eiffel/Tutorials/index.wiki b/documentation/current/eiffel/Tutorials/index.wiki
index cab64a1a..3c0050c0 100644
--- a/documentation/current/eiffel/Tutorials/index.wiki
+++ b/documentation/current/eiffel/Tutorials/index.wiki
@@ -1,4 +1,5 @@
[[Property:title|Eiffel Tutorials]]
[[Property:link_title|Tutorials]]
[[Property:weight|2]]
+[[Property:uuid|f443f10d-9dbc-4d6b-b9fb-c59af76abde9]]
diff --git a/documentation/current/eiffelstudio/getting_started/index.wiki b/documentation/current/eiffelstudio/getting_started/index.wiki
index be1655c5..7a2edfa5 100644
--- a/documentation/current/eiffelstudio/getting_started/index.wiki
+++ b/documentation/current/eiffelstudio/getting_started/index.wiki
@@ -1,4 +1,5 @@
-[[Property:title|Getting started]]
-[[Property:description|Getting started with EiffelStudio]]
-[[Property:weight|1]]
-
+[[Property:title|Getting started]]
+[[Property:description|Getting started with EiffelStudio]]
+[[Property:weight|1]]
+[[Property:uuid|ebcde1cb-df4a-44d0-aa9a-0df2d2fc0eb5]]
+
diff --git a/documentation/current/faqs/index.wiki b/documentation/current/faqs/index.wiki
index 5fb3a73a..c0f6cabc 100644
--- a/documentation/current/faqs/index.wiki
+++ b/documentation/current/faqs/index.wiki
@@ -2,6 +2,7 @@
[[Property:description|Frequently Asked Questions]]
[[Property:link_title|FAQs]]
[[Property:weight|5]]
+[[Property:uuid|e604c263-249d-48d2-8238-b3d027ed04dd]]
Frequently Asked Questions
diff --git a/documentation/current/index.wiki b/documentation/current/index.wiki
index 67118470..0f3b4c35 100644
--- a/documentation/current/index.wiki
+++ b/documentation/current/index.wiki
@@ -1,25 +1,25 @@
-[[Property:title|Documentation]]
-[[Property:description|Central repository of information about Eiffel and the products and technologies of Eiffel Software]]
-[[Property:weight|10]]
-[[Property:uuid|68b37685-64e9-f564-9258-29e709a55f44]]
-= Documentation =
-
-This is the Eiffel documentation site, where you will find all you need to unleash the power of Eiffel. It is organized as a set of '''books''':
-
-* The [[Eiffel|Eiffel Book]]. Eiffel is the language, but also a comprehensive method of quality software development. The Eiffel Book includes:
-** [[Eiffel Overview|Eiffel overview]]: to get a general idea of what Eiffel is about (or to refresh your view if you haven’t followed Eiffel recently.
-** [[Eiffel Tutorials|Eiffel tutorials]]: step-by-step presentation of Eiffel concepts and constructs. There are
-** [[Language reference|Language reference]]: construct-by-construct description, for when you need a precise specification of a particular mechanism.
-** [[Technical papers about Eiffel|Eiffel technical papers]]: tutorial presentations of specific Eiffel highlights, such as void safety and SCOOP (the concurrency mechanism).
-* The [[EiffelStudio|EiffelStudio Book]]. EiffelStudio is the multi-platform IDE (interactive development environment) supporting Eiffel development: compilation, execution, browsing, metrics, graphics-based design etc. The EiffelStudio book includes:
-** [[Introducing EiffelStudio|EiffelStudio overview]]
-** [[Setup and installation|EiffelStudio installation instructions]]
-** [[EiffelStudio tutorials|EiffelStudio Tutorial]]
-** [[Technical papers about EiffelStudio|EiffelStudio technical papers]] on specific EiffelStudio concepts and tools
-* The [[Solutions|Solutions Book]]. EiffelStudio comes with myriad libraries, packages and tools to help your development. The Solutions Book includes:
-** Libraries (data structures, graphics, networking…)
-** Packages
-** Tools
-* The [[Glossary|Glossary Book]]: clear definitions of the precise concepts (feature, routine, attribute, contract…) underlying Eiffel.
-* The [[FAQs|FAQs Book]]: everything you always wanted to ask about Eiffel, from whether it is available in open source (hint: yes, it is) to what books and articles are available (hint: lots).
-
+[[Property:title|Documentation]]
+[[Property:description|Central repository of information about Eiffel and the products and technologies of Eiffel Software]]
+[[Property:weight|10]]
+[[Property:uuid|c8ebc23f-325c-46e1-89c3-ff2fd52649e4]]
+= Documentation =
+
+This is the Eiffel documentation site, where you will find all you need to unleash the power of Eiffel. It is organized as a set of '''books''':
+
+* The [[Eiffel|Eiffel Book]]. Eiffel is the language, but also a comprehensive method of quality software development. The Eiffel Book includes:
+** [[Eiffel Overview|Eiffel overview]]: to get a general idea of what Eiffel is about (or to refresh your view if you haven’t followed Eiffel recently.
+** [[Eiffel Tutorials|Eiffel tutorials]]: step-by-step presentation of Eiffel concepts and constructs. There are
+** [[Language reference|Language reference]]: construct-by-construct description, for when you need a precise specification of a particular mechanism.
+** [[Technical papers about Eiffel|Eiffel technical papers]]: tutorial presentations of specific Eiffel highlights, such as void safety and SCOOP (the concurrency mechanism).
+* The [[EiffelStudio|EiffelStudio Book]]. EiffelStudio is the multi-platform IDE (interactive development environment) supporting Eiffel development: compilation, execution, browsing, metrics, graphics-based design etc. The EiffelStudio book includes:
+** [[Introducing EiffelStudio|EiffelStudio overview]]
+** [[Setup and installation|EiffelStudio installation instructions]]
+** [[EiffelStudio tutorials|EiffelStudio Tutorial]]
+** [[Technical papers about EiffelStudio|EiffelStudio technical papers]] on specific EiffelStudio concepts and tools
+* The [[Solutions|Solutions Book]]. EiffelStudio comes with myriad libraries, packages and tools to help your development. The Solutions Book includes:
+** Libraries (data structures, graphics, networking…)
+** Packages
+** Tools
+* The [[Glossary|Glossary Book]]: clear definitions of the precise concepts (feature, routine, attribute, contract…) underlying Eiffel.
+* The [[FAQs|FAQs Book]]: everything you always wanted to ask about Eiffel, from whether it is available in open source (hint: yes, it is) to what books and articles are available (hint: lots).
+