diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/breakpoints/breakpoint-editing.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/breakpoints/breakpoint-editing.wiki
index 2f10e300..ace7ace6 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/breakpoints/breakpoint-editing.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/breakpoints/breakpoint-editing.wiki
@@ -53,10 +53,7 @@ Note that any existing breakpoint can be referenced by an implicit tag with ''"'
[[Image:breakpoint-dialog-when-hits]]
-{{seealso|
-[[Breakpoint commands|Breakpoint commands]]
-[[Breakpoint information command|Breakpoint information command]]
-}}
+{{seealso| [[Breakpoint commands|Breakpoint commands]], [[Breakpoint information command|Breakpoint information command]] }}
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/breakpoints/index.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/breakpoints/index.wiki
index 1f7d4b6e..55eefefe 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/breakpoints/index.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/breakpoints/index.wiki
@@ -3,8 +3,8 @@
[[Property:uuid|6ed5890a-9b23-210a-5640-cee348d6e27e]]
* [[Breakpoints: Introduction|Introduction]]
* [[Breakpoint editing|Breakpoint menu]]
-* [[Image:16x16--breakpoints-enable-icon]] [[Image:16x16--breakpoints-disable-icon]] [[Image:breakpoints-delete-icon]] [[Breakpoint commands|Breakpoint commands]]
-* [[Image:tool-breakpoints-icon]] [[Breakpoint information command|Breakpoint information command]]
+* [[Breakpoint commands|Breakpoint commands]] [[Image:16x16--breakpoints-enable-icon]] [[Image:16x16--breakpoints-disable-icon]] [[Image:breakpoints-delete-icon]]
+* [[Breakpoint information command|Breakpoint information command]] [[Image:tool-breakpoints-icon]]
* [[Breakpoint menu|Conditional breakpoints]]
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/execution-commands/execute-one-line-time.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/execution-commands/execute-one-line-time.wiki
index b3dd7f84..6722e7b8 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/execution-commands/execute-one-line-time.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/execution-commands/execute-one-line-time.wiki
@@ -7,9 +7,7 @@ If an application was stopped, it attempts to execute the instruction located on
It is accessible through the '''project''' toolbar ( [[Image:debug-step-over-icon]] ) or through the '''debug''' menu.
-{{seealso|
-[[Eiffel Debugger Execution: Introduction|Execution commands]]
-[[Generating executables|Compiling in Workbench mode]] }}
+{{seealso| [[Eiffel Debugger Execution: Introduction|Execution commands]], [[Generating executables|Compiling in Workbench mode]] }}
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/execution-commands/pause-application.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/execution-commands/pause-application.wiki
index 6c0b001e..f293644d 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/execution-commands/pause-application.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/execution-commands/pause-application.wiki
@@ -7,9 +7,6 @@ This gives access to dynamic information concerning the application, such as the
It is accessible through the '''project''' toolbar ( [[Image:debug-pause-icon]] ) or through the '''debug''' menu.
-{{seealso|
-[[Eiffel Debugger Execution: Introduction|Execution commands]] }}
-
-
+{{seealso| [[Eiffel Debugger Execution: Introduction|Execution commands]] }}
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/execution-commands/run-finalized-executable.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/execution-commands/run-finalized-executable.wiki
index 14838ec2..1cbb3031 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/execution-commands/run-finalized-executable.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/execution-commands/run-finalized-executable.wiki
@@ -1,15 +1,13 @@
[[Property:title|Run a finalized executable]]
[[Property:weight|-11]]
[[Property:uuid|a69ab49a-2bd1-a405-837c-b3e629fa5394]]
-As opposed to other execution commands, this command launches an application compiled in finalized mode. This has the same effect as running the application in the EIFGENs/target_name/F_code directory from a console prompt.
+As opposed to other execution commands, this command launches an application compiled in finalized mode. This has the same effect as running the application in the EIFGENs/target_name/F_code directory from a console prompt.
No debugging is possible with this command, but it lets you test the real speed of your program without any overhead.
It is accessible through the '''project''' toolbar ( [[Image:debug-run-finalized-icon]] ) or through the '''project''' menu.
-{{seealso|
-[[Eiffel Debugger Execution: Introduction|Execution commands]]
-[[Generating executables|Compiling in finalized mode]] }}
+{{seealso| [[Eiffel Debugger Execution: Introduction|Execution commands]], [[Generating executables|Compiling in finalized mode]] }}
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/execution-commands/run-without-breakpoints.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/execution-commands/run-without-breakpoints.wiki
index 91ac7e06..2ae92750 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/execution-commands/run-without-breakpoints.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/execution-commands/run-without-breakpoints.wiki
@@ -5,9 +5,8 @@ This command launches an application compiled in Workbench mode. The application
It is accessible through the '''project''' toolbar ( [[Image:debug-run-without-breakpoint-icon]] ) or through the '''debug''' menu.
-{{seealso|
-[[Eiffel Debugger Execution: Introduction|Execution commands]]
-[[Generating executables|Compiling in Workbench mode]] }}
+{{seealso| [[Eiffel Debugger Execution: Introduction|Execution commands]], [[Generating executables|Compiling in Workbench mode]] }}
+
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/execution-commands/step-feature.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/execution-commands/step-feature.wiki
index 8827a4dc..741fbaad 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/execution-commands/step-feature.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/execution-commands/step-feature.wiki
@@ -7,9 +7,7 @@ If an application was stopped, it attempts to enter the feature located on the e
It is accessible through the '''project''' toolbar ( [[Image:debug-step-into-icon]] ) or through the '''debug''' menu.
-{{seealso|
-[[Eiffel Debugger Execution: Introduction|Execution commands]]
-[[Generating executables|Compiling in Workbench mode]] }}
+{{seealso| [[Eiffel Debugger Execution: Introduction|Execution commands]], [[Generating executables|Compiling in Workbench mode]] }}
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/execution-commands/step-out-feature.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/execution-commands/step-out-feature.wiki
index 09774032..0e94aab1 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/execution-commands/step-out-feature.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/execution-commands/step-out-feature.wiki
@@ -7,10 +7,7 @@ If an application was stopped, it attempts to exit the feature where the applica
It is accessible through the '''project''' toolbar ( [[Image:debug-step-out-icon]] ) or through the '''debug''' menu.
-{{seealso|
-[[Eiffel Debugger Execution: Introduction|Execution commands]]
-[[Generating executables|Compiling in Workbench mode]] }}
-
+{{seealso| [[Eiffel Debugger Execution: Introduction|Execution commands]], [[Generating executables|Compiling in Workbench mode]] }}
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/execution-commands/stop-debugged-application.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/execution-commands/stop-debugged-application.wiki
index 93340ac9..b0cb8567 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/execution-commands/stop-debugged-application.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/debugger/execution-commands/stop-debugged-application.wiki
@@ -5,8 +5,8 @@ This command kills the debugged application, if any. This stops the debugging se
It is accessible through the '''project''' toolbar ( [[Image:debug-stop-icon]] ) or through the '''debug''' menu.
-{{seealso|
-[[Eiffel Debugger Execution: Introduction|Execution commands]] }}
+{{seealso| [[Eiffel Debugger Execution: Introduction|Execution commands]] }}
+
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/metrics-tool/definitions/units.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/metrics-tool/definitions/units.wiki
index 3d46eff8..d7372579 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/metrics-tool/definitions/units.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/metrics-tool/definitions/units.wiki
@@ -3,13 +3,13 @@
[[Property:uuid|fa08d5aa-7ea4-e7bb-bb59-e4982a583976]]
Metrics will be expressed in units, such as Line (numbers of source lines) or Feature (number of features).
-{{note| '''Unit rule:''' The definition of any metric must specify an associated unit. }}
+{{definition|Unit rule|The definition of any metric must specify an associated unit. }}
Different metrics may be marked with the same unit; for example metrics such as number of non-comment lines and number of comment lines may both be marked with the unit Line.
Whenever we need to express ratios of one measurement to another, as in computing the average number of features per class by dividing the number of features by the number of classes, we will use a specific unit, Ratio:
-{{note| '''"Ratio unit"''': The name Ratio denotes a predefined unit, whose values are arbitrary real numbers, expressed either as numbers or in percentage style (as in 35.3%). }}
+{{definition|Ratio unit|The name Ratio denotes a predefined unit, whose values are arbitrary real numbers, expressed either as numbers or in percentage style (as in 35.3%). }}
As a result of this choice, we will consider every division to yield a result of unit, Ratio.